From 9aad8d683dc6feca0487ccbf74d129906f262739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 14 Oct 2021 16:25:07 +0200
Subject: [PATCH 0001/1748] common.sh: printStackTrace() and assertFail()

---
 scripts/common.sh | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/scripts/common.sh b/scripts/common.sh
index b3a5f82e48..1ace4d5deb 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -33,12 +33,45 @@ else
     function printLog() { echo "$(tput setaf 3)$1$(tput sgr0)"; }
 fi
 
+function printStackTrace
+{
+    printWarning ""
+    printWarning "Stack trace:"
+
+    local frame=1
+    while caller "$frame" > /dev/null
+    do
+        local lineNumber file function
+
+        # `caller` returns something that could already be printed as a stacktrace but we can make
+        # it more readable by rearranging the components.
+        # NOTE: This assumes that paths do not contain spaces.
+        lineNumber=$(caller "$frame" | cut --delimiter " " --field 1)
+        function=$(caller "$frame" | cut --delimiter " " --field 2)
+        file=$(caller "$frame" | cut --delimiter " " --field 3)
+        >&2 printf "    %s:%d in function %s()\n" "$file" "$lineNumber" "$function"
+
+        ((frame++))
+    done
+}
+
 function fail()
 {
     printError "$@"
     return 1
 }
 
+function assertFail()
+{
+    printError ""
+    (( $# == 0 )) && printError "Assertion failed."
+    (( $# == 1 )) && printError "Assertion failed: $1"
+    printStackTrace
+
+    # Intentionally using exit here because assertion failures are not supposed to be handled.
+    exit 2
+}
+
 function msg_on_error()
 {
     local error_message

From b85172b0557c3bb6624d39479d7a6cffac4f141f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 14 Oct 2021 18:43:04 +0200
Subject: [PATCH 0002/1748] common.sh: Print the source code from locations
 indicated in the stack trace

---
 scripts/common.sh | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index 1ace4d5deb..6d70a0840c 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -19,6 +19,10 @@
 # (c) 2016-2019 solidity contributors.
 # ------------------------------------------------------------------------------
 
+# Save the initial working directory so that printStackTrace() can access it even if the sourcing
+# changes directory. The paths returned by `caller` are relative to it.
+_initial_work_dir=$(pwd)
+
 if [ "$CIRCLECI" ]
 then
     export TERM="${TERM:-xterm}"
@@ -41,7 +45,7 @@ function printStackTrace
     local frame=1
     while caller "$frame" > /dev/null
     do
-        local lineNumber file function
+        local lineNumber line file function
 
         # `caller` returns something that could already be printed as a stacktrace but we can make
         # it more readable by rearranging the components.
@@ -49,7 +53,23 @@ function printStackTrace
         lineNumber=$(caller "$frame" | cut --delimiter " " --field 1)
         function=$(caller "$frame" | cut --delimiter " " --field 2)
         file=$(caller "$frame" | cut --delimiter " " --field 3)
+
+        # Paths in the output from `caller` can be relative or absolute (depends on how the path
+        # with which the script was invoked) and if they're relative, they're not necessarily
+        # relative to the current working dir. This is a heuristic that will work if they're absolute,
+        # relative to current dir, or relative to the dir that was current when the script started.
+        # If neither works, it gives up.
+        line=$(
+            {
+                tail "--lines=+${lineNumber}" "$file" ||
+                tail "--lines=+${lineNumber}" "${_initial_work_dir}/${file}"
+            } 2> /dev/null |
+            head --lines=1 |
+            sed -e 's/^[[:space:]]*//'
+        ) || line="<failed to find source line>"
+
         >&2 printf "    %s:%d in function %s()\n" "$file" "$lineNumber" "$function"
+        >&2 printf "        %s\n" "$line"
 
         ((frame++))
     done

From 3b1b9a0bfb166e94d5690ee72c5f79f7d4d23dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 14 Oct 2021 16:50:14 +0200
Subject: [PATCH 0003/1748] common.sh: Adjust formatting in msg_on_error() and
 add stack trace

---
 scripts/common.sh | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index 6d70a0840c..da5b2d2ef0 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -138,24 +138,30 @@ function msg_on_error()
         rm "$stdout_file" "$stderr_file"
         return 0
     else
-        printError "Command failed: $SOLC ${command[*]}"
+        printError ""
+        printError "Command failed: ${error_message}"
+        printError "    command: $SOLC ${command[*]}"
         if [[ -s "$stdout_file" ]]
         then
-            printError "stdout:"
+            printError "--- stdout ---"
+            printError "-----------"
             >&2 cat "$stdout_file"
+            printError "--------------"
         else
-            printError "stdout: <EMPTY>"
+            printError "    stdout: <EMPTY>"
         fi
         if [[ -s "$stderr_file" ]]
         then
-            printError "stderr:"
+            printError "--- stderr ---"
             >&2 cat "$stderr_file"
+            printError "--------------"
         else
-            printError "stderr: <EMPTY>"
+            printError "    stderr: <EMPTY>"
         fi
 
-        printError "$error_message"
         rm "$stdout_file" "$stderr_file"
+
+        printStackTrace
         return 1
     fi
 }

From 0280c8d00ec4756605dc83a8c8c0d9455f24f8cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 14 Oct 2021 18:39:59 +0200
Subject: [PATCH 0004/1748] Use fail and assertFail where appropriate in
 command-line tests

---
 scripts/common.sh    |  7 ++++++-
 test/cmdlineTests.sh | 37 ++++++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index da5b2d2ef0..6d9b0a3ba8 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -19,6 +19,9 @@
 # (c) 2016-2019 solidity contributors.
 # ------------------------------------------------------------------------------
 
+# The fail() function defined below requires set -e to be enabled.
+set -e
+
 # Save the initial working directory so that printStackTrace() can access it even if the sourcing
 # changes directory. The paths returned by `caller` are relative to it.
 _initial_work_dir=$(pwd)
@@ -78,6 +81,8 @@ function printStackTrace
 function fail()
 {
     printError "$@"
+
+    # Using return rather than exit lets the invoking code handle the failure by suppressing the exit code.
     return 1
 }
 
@@ -120,7 +125,7 @@ function msg_on_error()
                 shift
                 ;;
             *)
-                fail "Invalid option for msg_on_error: $1"
+                assertFail "Invalid option for msg_on_error: $1"
                 ;;
         esac
     done
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 1304da8af8..59c29ca453 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -92,7 +92,7 @@ echo "Using solc binary at ${SOLC}"
 INTERACTIVE=true
 if ! tty -s || [ "$CI" ]
 then
-    INTERACTIVE=""
+    INTERACTIVE=false
 fi
 
 # extend stack size in case we run via ASAN
@@ -123,7 +123,7 @@ function update_expectation {
 
 function ask_expectation_update
 {
-    if [[ $INTERACTIVE != "" ]]
+    if [[ $INTERACTIVE == true ]]
     then
         local newExpectation="${1}"
         local expectationFile="${2}"
@@ -142,12 +142,13 @@ function ask_expectation_update
                     e*) "$editor" "$expectationFile"; break;;
                     u*) update_expectation "$newExpectation" "$expectationFile"; break;;
                     s*) return;;
-                    q*) exit 1;;
+                    q*) fail;;
                 esac
             done
         fi
     else
-        exit 1
+        [[ $INTERACTIVE == false ]] || assertFail
+        fail
     fi
 }
 
@@ -252,7 +253,7 @@ EOF
         printError "Incorrect exit code. Expected $exit_code_expected but got $exitCode."
 
         [[ $exit_code_expectation_file != "" ]] && ask_expectation_update "$exitCode" "$exit_code_expectation_file"
-        [[ $exit_code_expectation_file == "" ]] && exit 1
+        [[ $exit_code_expectation_file == "" ]] && fail
     fi
 
     if [[ "$(cat "$stdout_path")" != "${stdout_expected}" ]]
@@ -266,7 +267,7 @@ EOF
         printError "When running $solc_command"
 
         [[ $stdout_expectation_file != "" ]] && ask_expectation_update "$(cat "$stdout_path")" "$stdout_expectation_file"
-        [[ $stdout_expectation_file == "" ]] && exit 1
+        [[ $stdout_expectation_file == "" ]] && fail
     fi
 
     if [[ "$(cat "$stderr_path")" != "${stderr_expected}" ]]
@@ -280,7 +281,7 @@ EOF
         printError "When running $solc_command"
 
         [[ $stderr_expectation_file != "" ]] && ask_expectation_update "$(cat "$stderr_path")" "$stderr_expectation_file"
-        [[ $stderr_expectation_file == "" ]] && exit 1
+        [[ $stderr_expectation_file == "" ]] && fail
     fi
 
     rm "$stdout_path" "$stderr_path"
@@ -300,10 +301,10 @@ function test_solc_assembly_output()
     if [ -z "$empty" ]
     then
         printError "Incorrect assembly output. Expected: "
-        echo -e "${expected}"
+        >&2 echo -e "${expected}"
         printError "with arguments ${solc_args[*]}, but got:"
-        echo "${output}"
-        exit 1
+        >&2 echo "${output}"
+        fail
     fi
 }
 
@@ -373,7 +374,7 @@ printTask "Running general commandline tests..."
         then
             printError "Ambiguous input. Found input files in multiple formats:"
             echo -e "${inputFiles}"
-            exit 1
+            fail
         fi
 
         # Use printf to get rid of the trailing newline
@@ -475,7 +476,8 @@ echo "Done."
 
 printTask "Testing library checksum..."
 echo '' | msg_on_error --no-stdout "$SOLC" - --link --libraries a=0x90f20564390eAe531E810af625A22f51385Cd222
-echo '' | "$SOLC" - --link --libraries a=0x80f20564390eAe531E810af625A22f51385Cd222 &>/dev/null && exit 1
+echo '' | "$SOLC" - --link --libraries a=0x80f20564390eAe531E810af625A22f51385Cd222 &>/dev/null && \
+    fail "solc --link did not reject a library address with an invalid checksum."
 
 printTask "Testing long library names..."
 echo '' | msg_on_error --no-stdout "$SOLC" - --link --libraries aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylonglibraryname=0x90f20564390eAe531E810af625A22f51385Cd222
@@ -503,7 +505,8 @@ SOLTMPDIR=$(mktemp -d)
     # First time it works
     echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
     # Second time it fails
-    echo 'contract C {}' | "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create" 2>/dev/null && exit 1
+    echo 'contract C {}' | "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create" 2>/dev/null && \
+        fail "solc did not refuse to overwrite $SOLTMPDIR/non-existing-stuff-to-create."
     # Unless we force
     echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --overwrite --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
 )
@@ -517,8 +520,8 @@ printTask "Testing assemble, yul, strict-assembly and optimize..."
 
     # Test options above in conjunction with --optimize.
     # Using both, --assemble and --optimize should fail.
-    echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null && exit 1
-    echo '{}' | "$SOLC" - --yul --optimize &>/dev/null && exit 1
+    echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null && fail "solc --assemble --optimize did not fail as expected."
+    echo '{}' | "$SOLC" - --yul --optimize &>/dev/null && fail "solc --yul --optimize did not fail as expected."
 
     # Test yul and strict assembly output
     # Non-empty code results in non-empty binary representation with optimizations turned off,
@@ -563,8 +566,8 @@ SOLTMPDIR=$(mktemp -d)
     cd "$SOLTMPDIR"
     if ! "$REPO_ROOT/scripts/ASTImportTest.sh"
     then
-        rm -rf "$SOLTMPDIR"
-        exit 1
+        rm -r "$SOLTMPDIR"
+        fail
     fi
 )
 rm -r "$SOLTMPDIR"

From d8464101724016dc4f16bababf2994ab7df22c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 14 Oct 2021 20:57:15 +0200
Subject: [PATCH 0005/1748] yul.rst: Clarify that linkersymbol() accepts but
 does not require a fully qualified library name

---
 docs/yul.rst | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index 0a90a28250..9aad572c82 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -959,10 +959,13 @@ to ``loadimmutable("name")`` in the runtime code.
 
 linkersymbol
 ^^^^^^^^^^^^
-
-The function ``linkersymbol("fq_library_name")`` is a placeholder for an address literal to be
-substituted by the linker. Its first and only argument must be a string literal and represents the
-fully qualified library name used with the ``--libraries`` option.
+The function ``linkersymbol("library_id")`` is a placeholder for an address literal to be substituted
+by the linker.
+Its first and only argument must be a string literal and uniquely represents the address to be inserted.
+Identifiers can be arbitrary but when the compiler produces Yul code from Solidity sources,
+it uses a library name qualified with the name of the source unit that defines that library.
+To link the code with a particular library address, the same identifier must be provided to the
+``--libraries`` option on the command line.
 
 For example this code
 

From 9f48b7419ccc31dd1239933d916eb3b23e55481d Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 14 Oct 2021 16:18:20 +0200
Subject: [PATCH 0006/1748] Do not use named function labels if function names
 are not unique.

---
 Changelog.md                                  |   1 +
 libyul/backends/evm/AsmCodeGen.cpp            |   4 +-
 libyul/backends/evm/EVMCodeTransform.cpp      |  16 +-
 libyul/backends/evm/EVMCodeTransform.h        |  11 +-
 libyul/backends/evm/EVMObjectCompiler.cpp     |   2 +-
 .../inline_assembly_function_name_clash/args  |   1 +
 .../inline_assembly_function_name_clash/err   |   5 +
 .../input.sol                                 |  18 ++
 .../output                                    | 168 ++++++++++++++++++
 .../yul_function_name_clashes/args            |   1 +
 .../yul_function_name_clashes/err             |   1 +
 .../yul_function_name_clashes/input.yul       |  17 ++
 .../yul_function_name_clashes/output          |  66 +++++++
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../input.yul                                 |  17 ++
 .../output                                    |  93 ++++++++++
 .../inlineAssembly/function_name_clash.sol    |  13 ++
 18 files changed, 429 insertions(+), 7 deletions(-)
 create mode 100644 test/cmdlineTests/inline_assembly_function_name_clash/args
 create mode 100644 test/cmdlineTests/inline_assembly_function_name_clash/err
 create mode 100644 test/cmdlineTests/inline_assembly_function_name_clash/input.sol
 create mode 100644 test/cmdlineTests/inline_assembly_function_name_clash/output
 create mode 100644 test/cmdlineTests/yul_function_name_clashes/args
 create mode 100644 test/cmdlineTests/yul_function_name_clashes/err
 create mode 100644 test/cmdlineTests/yul_function_name_clashes/input.yul
 create mode 100644 test/cmdlineTests/yul_function_name_clashes/output
 create mode 100644 test/cmdlineTests/yul_function_name_clashes_different_params/args
 create mode 100644 test/cmdlineTests/yul_function_name_clashes_different_params/err
 create mode 100644 test/cmdlineTests/yul_function_name_clashes_different_params/input.yul
 create mode 100644 test/cmdlineTests/yul_function_name_clashes_different_params/output
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol

diff --git a/Changelog.md b/Changelog.md
index ddfe1648e3..8e1a2d55f5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,7 @@ Bugfixes:
  * Commandline Interface: Don't return zero exit code when writing linked files to disk fails.
  * SMTChecker: Fix internal error in magic type access (``block``, ``msg``, ``tx``).
  * TypeChecker: Fix internal error when using user defined value types in public library functions.
+ * Yul Assembler: Fix internal error when function names are not unique.
  * Yul IR Generator: Do not output empty switches/if-bodies for empty contracts.
 
 
diff --git a/libyul/backends/evm/AsmCodeGen.cpp b/libyul/backends/evm/AsmCodeGen.cpp
index 5c7865c017..6ef1429061 100644
--- a/libyul/backends/evm/AsmCodeGen.cpp
+++ b/libyul/backends/evm/AsmCodeGen.cpp
@@ -52,7 +52,9 @@ void CodeGenerator::assemble(
 		builtinContext,
 		_optimizeStackAllocation,
 		_identifierAccessCodeGen,
-		_useNamedLabelsForFunctions
+			_useNamedLabelsForFunctions ?
+			CodeTransform::UseNamedLabels::YesAndForceUnique :
+			CodeTransform::UseNamedLabels::Never
 	);
 	transform(_parsedData);
 	if (!transform.stackErrors().empty())
diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index 38eecc245b..531fd1b92f 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -52,7 +52,7 @@ CodeTransform::CodeTransform(
 	EVMDialect const& _dialect,
 	BuiltinContext& _builtinContext,
 	ExternalIdentifierAccess::CodeGenerator _identifierAccessCodeGen,
-	bool _useNamedLabelsForFunctions,
+	UseNamedLabels _useNamedLabelsForFunctions,
 	shared_ptr<Context> _context,
 	vector<TypedName> _delayedReturnVariables,
 	optional<AbstractAssembly::LabelID> _functionExitLabel
@@ -405,8 +405,12 @@ void CodeTransform::operator()(FunctionDefinition const& _function)
 	if (!m_allowStackOpt)
 		subTransform.setupReturnVariablesAndFunctionExit();
 
+	subTransform.m_assignedNamedLabels = move(m_assignedNamedLabels);
+
 	subTransform(_function.body);
 
+	m_assignedNamedLabels = move(subTransform.m_assignedNamedLabels);
+
 	m_assembly.setSourceLocation(originLocationOf(_function));
 	if (!subTransform.m_stackErrors.empty())
 	{
@@ -585,8 +589,16 @@ void CodeTransform::createFunctionEntryID(FunctionDefinition const& _function)
 	if (_function.debugData)
 		astID = _function.debugData->astID;
 
+	bool nameAlreadySeen = !m_assignedNamedLabels.insert(_function.name).second;
+
+	if (m_useNamedLabelsForFunctions == UseNamedLabels::YesAndForceUnique)
+		yulAssert(!nameAlreadySeen);
+
 	m_context->functionEntryIDs[&scopeFunction] =
-		m_useNamedLabelsForFunctions ?
+		(
+			m_useNamedLabelsForFunctions != UseNamedLabels::Never &&
+			!nameAlreadySeen
+		) ?
 		m_assembly.namedLabel(
 			_function.name.str(),
 			_function.parameters.size(),
diff --git a/libyul/backends/evm/EVMCodeTransform.h b/libyul/backends/evm/EVMCodeTransform.h
index 8a605b4722..bad9a357ff 100644
--- a/libyul/backends/evm/EVMCodeTransform.h
+++ b/libyul/backends/evm/EVMCodeTransform.h
@@ -64,6 +64,10 @@ struct CodeTransformContext
 class CodeTransform
 {
 public:
+	/// Use named labels for functions 1) Yes and check that the names are unique
+	/// 2) For none of the functions 3) for the first function of each name.
+	enum class UseNamedLabels { YesAndForceUnique, Never, ForFirstFunctionOfEachName };
+
 	/// Create the code transformer.
 	/// @param _identifierAccessCodeGen used to generate code for identifiers external to the inline assembly
 	/// As a side-effect of its construction, translates the Yul code and appends it to the
@@ -78,7 +82,7 @@ class CodeTransform
 		BuiltinContext& _builtinContext,
 		bool _allowStackOpt = false,
 		ExternalIdentifierAccess::CodeGenerator const& _identifierAccessCodeGen = {},
-		bool _useNamedLabelsForFunctions = false
+		UseNamedLabels _useNamedLabelsForFunctions = UseNamedLabels::Never
 	): CodeTransform(
 		_assembly,
 		_analysisInfo,
@@ -108,7 +112,7 @@ class CodeTransform
 		EVMDialect const& _dialect,
 		BuiltinContext& _builtinContext,
 		ExternalIdentifierAccess::CodeGenerator _identifierAccessCodeGen,
-		bool _useNamedLabelsForFunctions,
+		UseNamedLabels _useNamedLabelsForFunctions,
 		std::shared_ptr<Context> _context,
 		std::vector<TypedName> _delayedReturnVariables,
 		std::optional<AbstractAssembly::LabelID> _functionExitLabel
@@ -193,7 +197,8 @@ class CodeTransform
 	EVMDialect const& m_dialect;
 	BuiltinContext& m_builtinContext;
 	bool const m_allowStackOpt = true;
-	bool const m_useNamedLabelsForFunctions = false;
+	UseNamedLabels const m_useNamedLabelsForFunctions = UseNamedLabels::Never;
+	std::set<YulString> m_assignedNamedLabels;
 	ExternalIdentifierAccess::CodeGenerator m_identifierAccessCodeGen;
 	std::shared_ptr<Context> m_context;
 
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index a526bf218c..e41a683872 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -72,7 +72,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		context,
 		_optimize,
 		{},
-		true /* _useNamedLabelsForFunctions */
+		CodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
 	};
 	transform(*_object.code);
 	if (!transform.stackErrors().empty())
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/args b/test/cmdlineTests/inline_assembly_function_name_clash/args
new file mode 100644
index 0000000000..4299d023e8
--- /dev/null
+++ b/test/cmdlineTests/inline_assembly_function_name_clash/args
@@ -0,0 +1 @@
+--experimental-via-ir --combined-json function-debug-runtime --pretty-json --json-indent 4
\ No newline at end of file
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/err b/test/cmdlineTests/inline_assembly_function_name_clash/err
new file mode 100644
index 0000000000..5284ffe5ca
--- /dev/null
+++ b/test/cmdlineTests/inline_assembly_function_name_clash/err
@@ -0,0 +1,5 @@
+Warning: SPDX license identifier not provided in source file. Before publishing, consider adding a comment containing "SPDX-License-Identifier: <SPDX-License>" to each source file. Use "SPDX-License-Identifier: UNLICENSED" for non-open-source code. Please see https://spdx.org for more information.
+--> inline_assembly_function_name_clash/input.sol
+
+Warning: Source file does not specify required compiler version!
+--> inline_assembly_function_name_clash/input.sol
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/input.sol b/test/cmdlineTests/inline_assembly_function_name_clash/input.sol
new file mode 100644
index 0000000000..55032c56ed
--- /dev/null
+++ b/test/cmdlineTests/inline_assembly_function_name_clash/input.sol
@@ -0,0 +1,18 @@
+contract C {
+  uint x;
+  modifier m() {
+    uint t;
+    assembly {
+      function f() -> x { x := 8 }
+      t := f()
+    }
+    x = t;
+    _;
+  }
+  function f() m m public returns (uint r) {
+    assembly { function f() -> x { x := 1 } r := f() }
+  }
+  function g() m m public returns (uint r) {
+    assembly { function f() -> x { x := 2 } r := f() }
+  }
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/output b/test/cmdlineTests/inline_assembly_function_name_clash/output
new file mode 100644
index 0000000000..00192f8f44
--- /dev/null
+++ b/test/cmdlineTests/inline_assembly_function_name_clash/output
@@ -0,0 +1,168 @@
+{
+    "contracts":
+    {
+        "inline_assembly_function_name_clash/input.sol:C":
+        {
+            "function-debug-runtime":
+            {
+                "abi_decode_tuple_":
+                {
+                    "entryPoint": 216,
+                    "parameterSlots": 2,
+                    "returnSlots": 0
+                },
+                "abi_encode_t_uint256_to_t_uint256_fromStack":
+                {
+                    "entryPoint": 250,
+                    "parameterSlots": 2,
+                    "returnSlots": 0
+                },
+                "abi_encode_tuple_t_uint256__to_t_uint256__fromStack":
+                {
+                    "entryPoint": 265,
+                    "parameterSlots": 2,
+                    "returnSlots": 1
+                },
+                "allocate_unbounded":
+                {
+                    "entryPoint": 196,
+                    "parameterSlots": 0,
+                    "returnSlots": 1
+                },
+                "cleanup_t_uint256":
+                {
+                    "entryPoint": 240,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "convert_t_uint256_to_t_uint256":
+                {
+                    "entryPoint": 391,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "fun_f_25":
+                {
+                    "entryPoint": 658,
+                    "id": 25,
+                    "parameterSlots": 0,
+                    "returnSlots": 1
+                },
+                "fun_f_25_inner":
+                {
+                    "entryPoint": 624,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "fun_g_36":
+                {
+                    "entryPoint": 874,
+                    "id": 36,
+                    "parameterSlots": 0,
+                    "returnSlots": 1
+                },
+                "fun_g_36_inner":
+                {
+                    "entryPoint": 840,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "identity":
+                {
+                    "entryPoint": 381,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "modifier_m_17":
+                {
+                    "entryPoint": 470,
+                    "id": 14,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "modifier_m_19":
+                {
+                    "entryPoint": 547,
+                    "id": 14,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "modifier_m_28":
+                {
+                    "entryPoint": 686,
+                    "id": 14,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "modifier_m_30":
+                {
+                    "entryPoint": 763,
+                    "id": 14,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "prepare_store_t_uint256":
+                {
+                    "entryPoint": 425,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74":
+                {
+                    "entryPoint": 292,
+                    "parameterSlots": 0,
+                    "returnSlots": 0
+                },
+                "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb":
+                {
+                    "entryPoint": 206,
+                    "parameterSlots": 0,
+                    "returnSlots": 0
+                },
+                "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
+                {
+                    "entryPoint": 211,
+                    "parameterSlots": 0,
+                    "returnSlots": 0
+                },
+                "shift_left_0":
+                {
+                    "entryPoint": 302,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "shift_right_224_unsigned":
+                {
+                    "entryPoint": 183,
+                    "parameterSlots": 1,
+                    "returnSlots": 1
+                },
+                "update_byte_slice_32_shift_0":
+                {
+                    "entryPoint": 315,
+                    "parameterSlots": 2,
+                    "returnSlots": 1
+                },
+                "update_storage_value_offset_0t_uint256_to_t_uint256":
+                {
+                    "entryPoint": 435,
+                    "parameterSlots": 2,
+                    "returnSlots": 0
+                },
+                "usr$f":
+                {
+                    "entryPoint": 493,
+                    "parameterSlots": 0,
+                    "returnSlots": 1
+                },
+                "zero_value_for_split_t_uint256":
+                {
+                    "entryPoint": 297,
+                    "parameterSlots": 0,
+                    "returnSlots": 1
+                }
+            }
+        }
+    },
+    "version": "<VERSION REMOVED>"
+}
diff --git a/test/cmdlineTests/yul_function_name_clashes/args b/test/cmdlineTests/yul_function_name_clashes/args
new file mode 100644
index 0000000000..903cc6eb41
--- /dev/null
+++ b/test/cmdlineTests/yul_function_name_clashes/args
@@ -0,0 +1 @@
+--strict-assembly --debug-info none
\ No newline at end of file
diff --git a/test/cmdlineTests/yul_function_name_clashes/err b/test/cmdlineTests/yul_function_name_clashes/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/yul_function_name_clashes/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/yul_function_name_clashes/input.yul b/test/cmdlineTests/yul_function_name_clashes/input.yul
new file mode 100644
index 0000000000..0ede2d25e3
--- /dev/null
+++ b/test/cmdlineTests/yul_function_name_clashes/input.yul
@@ -0,0 +1,17 @@
+object "object" {
+    code {
+        let a
+        let b
+        {
+            function z() -> y
+            { y := calldataload(0) }
+            a := z()
+        }
+        {
+            function z() -> y
+            { y := calldataload(0x20) }
+            b := z()
+        }
+        sstore(a, b)
+    }
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/yul_function_name_clashes/output b/test/cmdlineTests/yul_function_name_clashes/output
new file mode 100644
index 0000000000..8a7bec7909
--- /dev/null
+++ b/test/cmdlineTests/yul_function_name_clashes/output
@@ -0,0 +1,66 @@
+
+======= yul_function_name_clashes/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code {
+        let a
+        let b
+        {
+            function z() -> y
+            { y := calldataload(0) }
+            a := z()
+        }
+        {
+            function z() -> y
+            { y := calldataload(0x20) }
+            b := z()
+        }
+        sstore(a, b)
+    }
+}
+
+
+Binary representation:
+600080600f565b60008035905090565b60156006565b91506025565b6000602035905090565b602b601b565b90508082555050
+
+Text representation:
+  0x00
+  dup1
+  jump(tag_2)
+tag_1:
+  0x00
+  dup1
+  calldataload
+  swap1
+  pop
+  swap1
+  jump	// out
+tag_2:
+  tag_4
+  tag_1
+  jump	// in
+tag_4:
+  swap2
+  pop
+  jump(tag_6)
+tag_5:
+  0x00
+  0x20
+  calldataload
+  swap1
+  pop
+  swap1
+  jump	// out
+tag_6:
+  tag_8
+  tag_5
+  jump	// in
+tag_8:
+  swap1
+  pop
+  dup1
+  dup3
+  sstore
+  pop
+  pop
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/args b/test/cmdlineTests/yul_function_name_clashes_different_params/args
new file mode 100644
index 0000000000..2c89c24e0a
--- /dev/null
+++ b/test/cmdlineTests/yul_function_name_clashes_different_params/args
@@ -0,0 +1 @@
+--strict-assembly
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/err b/test/cmdlineTests/yul_function_name_clashes_different_params/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/yul_function_name_clashes_different_params/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/input.yul b/test/cmdlineTests/yul_function_name_clashes_different_params/input.yul
new file mode 100644
index 0000000000..e27ca014ab
--- /dev/null
+++ b/test/cmdlineTests/yul_function_name_clashes_different_params/input.yul
@@ -0,0 +1,17 @@
+object "object" {
+    code {
+        let a
+        let b
+        {
+            function z() -> y
+            { y := calldataload(0) }
+            a := z()
+        }
+        {
+            function z(r) -> y
+            { y := calldataload(r) }
+            b := z(0x70)
+        }
+        sstore(a, b)
+    }
+}
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/output b/test/cmdlineTests/yul_function_name_clashes_different_params/output
new file mode 100644
index 0000000000..f3dc843405
--- /dev/null
+++ b/test/cmdlineTests/yul_function_name_clashes_different_params/output
@@ -0,0 +1,93 @@
+
+======= yul_function_name_clashes_different_params/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code {
+        let a
+        let b
+        {
+            function z() -> y
+            { y := calldataload(0) }
+            a := z()
+        }
+        {
+            function z(r) -> y
+            { y := calldataload(r) }
+            b := z(0x70)
+        }
+        sstore(a, b)
+    }
+}
+
+
+Binary representation:
+600080600f565b60008035905090565b60156006565b91506026565b600081359050919050565b602e6070601b565b90508082555050
+
+Text representation:
+    /* "yul_function_name_clashes_different_params/input.yul":37:42   */
+  0x00
+    /* "yul_function_name_clashes_different_params/input.yul":51:56   */
+  dup1
+    /* "yul_function_name_clashes_different_params/input.yul":79:133   */
+  jump(tag_2)
+tag_1:
+    /* "yul_function_name_clashes_different_params/input.yul":95:96   */
+  0x00
+    /* "yul_function_name_clashes_different_params/input.yul":129:130   */
+  dup1
+    /* "yul_function_name_clashes_different_params/input.yul":116:131   */
+  calldataload
+    /* "yul_function_name_clashes_different_params/input.yul":111:131   */
+  swap1
+  pop
+    /* "yul_function_name_clashes_different_params/input.yul":79:133   */
+  swap1
+  jump	// out
+tag_2:
+    /* "yul_function_name_clashes_different_params/input.yul":151:154   */
+  tag_4
+  tag_1
+  jump	// in
+tag_4:
+    /* "yul_function_name_clashes_different_params/input.yul":146:154   */
+  swap2
+  pop
+    /* "yul_function_name_clashes_different_params/input.yul":187:242   */
+  jump(tag_6)
+tag_5:
+    /* "yul_function_name_clashes_different_params/input.yul":204:205   */
+  0x00
+    /* "yul_function_name_clashes_different_params/input.yul":238:239   */
+  dup2
+    /* "yul_function_name_clashes_different_params/input.yul":225:240   */
+  calldataload
+    /* "yul_function_name_clashes_different_params/input.yul":220:240   */
+  swap1
+  pop
+    /* "yul_function_name_clashes_different_params/input.yul":187:242   */
+  swap2
+  swap1
+  pop
+  jump	// out
+tag_6:
+    /* "yul_function_name_clashes_different_params/input.yul":260:267   */
+  tag_8
+    /* "yul_function_name_clashes_different_params/input.yul":262:266   */
+  0x70
+    /* "yul_function_name_clashes_different_params/input.yul":260:267   */
+  tag_5
+  jump	// in
+tag_8:
+    /* "yul_function_name_clashes_different_params/input.yul":255:267   */
+  swap1
+  pop
+    /* "yul_function_name_clashes_different_params/input.yul":296:297   */
+  dup1
+    /* "yul_function_name_clashes_different_params/input.yul":293:294   */
+  dup3
+    /* "yul_function_name_clashes_different_params/input.yul":286:298   */
+  sstore
+    /* "yul_function_name_clashes_different_params/input.yul":27:304   */
+  pop
+  pop
diff --git a/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol b/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
new file mode 100644
index 0000000000..21fbdb28af
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
@@ -0,0 +1,13 @@
+contract C {
+  function f() public pure returns (uint r) {
+    assembly { function f() -> x { x := 1 } r := f() }
+  }
+  function g() public pure returns (uint r) {
+    assembly { function f() -> x { x := 2 } r := f() }
+  }
+}
+// ====
+// compileViaYul: also
+// ----
+// f() -> 1
+// g() -> 2

From 2278673936f6f5aa8a243443d66680c9f6a9be0e Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Tue, 19 Oct 2021 10:54:54 -0400
Subject: [PATCH 0007/1748] Fix formatting

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index fadc252fc1..a7bfbbe448 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -18,7 +18,7 @@ and multi-signature wallets.
 
 When deploying contracts, you should use the latest released
 version of Solidity. Apart from exceptional cases, only the latest version receives
-`security fixes<https://github.com/ethereum/solidity/security/policy#supported-versions>`.
+`security fixes <https://github.com/ethereum/solidity/security/policy#supported-versions>`_.
 Furthermore, breaking changes as well as
 new features are introduced regularly. We currently use
 a 0.x version number `to indicate this fast pace of change <https://semver.org/#spec-item-4>`_.

From 92f3d749e2077528a3625cc81a09a119fbb776a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 21 Oct 2021 16:51:37 +0200
Subject: [PATCH 0008/1748] CI: Store yul-phaser as an artifact too

---
 .circleci/config.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a859b84640..266218bafc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -91,10 +91,14 @@ defaults:
       path: upload/
 
   # compiled tool executable target
-  - artifacts_tools: &artifacts_tools
+  - artifact_solidity_upgrade: &artifact_solidity_upgrade
       path: build/tools/solidity-upgrade
       destination: solidity-upgrade
 
+  - artifact_yul_phaser: &artifact_yul_phaser
+      path: build/tools/yul-phaser
+      destination: yul-phaser
+
   # compiled executable targets
   - artifacts_executables: &artifacts_executables
       root: build
@@ -447,7 +451,8 @@ jobs:
       - checkout
       - run: *run_build
       - store_artifacts: *artifacts_solc
-      - store_artifacts: *artifacts_tools
+      - store_artifacts: *artifact_solidity_upgrade
+      - store_artifacts: *artifact_yul_phaser
       - persist_to_workspace: *artifacts_executables
 
   # x64 ASAN build, for testing for memory related bugs
@@ -644,7 +649,8 @@ jobs:
             - /usr/local/Homebrew
       - run: *run_build
       - store_artifacts: *artifacts_solc
-      - store_artifacts: *artifacts_tools
+      - store_artifacts: *artifact_solidity_upgrade
+      - store_artifacts: *artifact_yul_phaser
       - persist_to_workspace:
           root: .
           paths:

From 921d04451b823bc59f53b18be3476057f7a19c6b Mon Sep 17 00:00:00 2001
From: Gyeonghun Park <gp112795@gmail.com>
Date: Fri, 22 Oct 2021 10:00:26 +0900
Subject: [PATCH 0009/1748] Fix typo in ir-breaking-changes.rst

---
 docs/ir/ir-breaking-changes.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ir/ir-breaking-changes.rst b/docs/ir/ir-breaking-changes.rst
index 8afbc58c3e..fb971410a8 100644
--- a/docs/ir/ir-breaking-changes.rst
+++ b/docs/ir/ir-breaking-changes.rst
@@ -268,7 +268,7 @@ In the new code generator, function pointers use the AST IDs of the functions as
 calls through function pointers always have to use an internal dispatch function that uses the ``switch`` statement to select
 the right function.
 
-The ID ``0`` is reserved for uninitialized function pointers which then cause a panic in the disptach function when called.
+The ID ``0`` is reserved for uninitialized function pointers which then cause a panic in the dispatch function when called.
 
 In the old code generator, internal function pointers are initialized with a special function that always causes a panic.
 This causes a storage write at construction time for internal function pointers in storage.

From ab31437f2efdbbeb56e04796cef29bab087d14fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 20 Oct 2021 11:56:52 +0200
Subject: [PATCH 0010/1748] Add a PR check that runs hardhat tests using the
 built compiler binary

---
 .circleci/config.yml | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a859b84640..d086c672b5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -840,6 +840,32 @@ jobs:
             npm --version
             test/externalTests/solc-js/solc-js.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
 
+  t_ems_ext_hardhat:
+    docker:
+      - image: circleci/node
+    environment:
+      TERM: xterm
+      HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
+    steps:
+      - checkout
+      - attach_workspace:
+          at: /tmp/workspace
+      - run: git clone --depth 1 https://github.com/nomiclabs/hardhat.git
+      - run:
+          name: Install dependencies
+          command: |
+            cd hardhat
+            yarn
+      - run:
+          name: Run hardhat-core test suite
+          command: |
+            HARDHAT_TESTS_SOLC_VERSION=$(scripts/get_version.sh)
+            export HARDHAT_TESTS_SOLC_VERSION
+
+            # NOTE: This is expected to work without running `yarn build` first.
+            cd hardhat/packages/hardhat-core
+            yarn test
+
   t_ems_ext:
     parameters:
       project:
@@ -1110,6 +1136,7 @@ workflows:
       # Emscripten build and tests that take 15 minutes or less
       - b_ems: *workflow_trigger_on_tags
       - t_ems_solcjs: *workflow_emscripten
+      - t_ems_ext_hardhat: *workflow_emscripten
 
       - t_ems_ext:
           <<: *workflow_emscripten

From 0e71c12c56af1b6ca3bcbc5f0c7772ee89dfb490 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 22 Oct 2021 18:02:12 +0200
Subject: [PATCH 0011/1748] CI: Refactor the gitter notification templates into
 a reusable command

---
 .circleci/config.yml | 74 +++++++++++++++++++++++++++-----------------
 1 file changed, 45 insertions(+), 29 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a859b84640..73f658b1e4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -30,6 +30,44 @@ parameters:
 orbs:
   win: circleci/windows@2.2.0
 
+commands:
+  gitter_notify:
+    description: "Posts a notification to the main room on Gitter (if not running on a PR)."
+    parameters:
+      event:
+        type: enum
+        enum: ["failure", "success"]
+      condition:
+        type: string
+    steps:
+      - run:
+          name: "Gitter notification"
+          command: |
+            [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ Nightly job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see ${CIRCLE_BUILD_URL} for details."
+            [[ "<< parameters.event >>" == "success" ]] && message=" ✅ Nightly job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see ${CIRCLE_BUILD_URL} for details."
+
+            curl "https://api.gitter.im/v1/rooms/${GITTER_NOTIFY_ROOM_ID}/chatMessages" \
+              --request POST \
+              --include \
+              --header "Content-Type: application/json" \
+              --header "Accept: application/json" \
+              --header "Authorization: Bearer ${GITTER_API_TOKEN}" \
+              --data "{\"text\":\"${message}\"}"
+
+  gitter_notify_failure:
+    description: "Posts a failure notification to the main room on Gitter (if not running on a PR)."
+    steps:
+      - gitter_notify:
+          event: failure
+          condition: on_fail
+
+  gitter_notify_success:
+    description: "Posts a success notification to the main room on Gitter (if not running on a PR)."
+    steps:
+      - gitter_notify:
+          event: success
+          condition: on_success
+
 defaults:
 
   # --------------------------------------------------------------------------
@@ -263,28 +301,6 @@ defaults:
       requires:
         - b_win_release
 
-  # --------------------------------------------------------------------------
-  # Notification Templates
-  - gitter_notify_failure: &gitter_notify_failure
-      name: Gitter notify failure
-      command: >-
-        curl -X POST -i
-        -i -H "Content-Type: application/json"
-        -H "Accept: application/json"
-        -H "Authorization: Bearer $GITTER_API_TOKEN" "https://api.gitter.im/v1/rooms/$GITTER_NOTIFY_ROOM_ID/chatMessages"
-        -d '{"text":" ❌ Nightly job **'$CIRCLE_JOB'** failed on **'$CIRCLE_BRANCH'**. Please see '$CIRCLE_BUILD_URL' for details."}'
-      when: on_fail
-
-  - gitter_notify_success: &gitter_notify_success
-      name: Gitter notify success
-      command: >-
-        curl -X POST -i
-        -i -H "Content-Type: application/json"
-        -H "Accept: application/json"
-        -H "Authorization: Bearer $GITTER_API_TOKEN" "https://api.gitter.im/v1/rooms/$GITTER_NOTIFY_ROOM_ID/chatMessages"
-        -d '{"text":" ✅ Nightly job **'$CIRCLE_JOB'** succeeded on **'$CIRCLE_BRANCH'**. Please see '$CIRCLE_BUILD_URL' for details."}'
-      when: on_success
-
 # -----------------------------------------------------------------------------------------------
 jobs:
 
@@ -502,7 +518,7 @@ jobs:
     steps:
       - checkout
       - run: *run_build
-      - run: *gitter_notify_failure
+      - gitter_notify_failure
       - store_artifacts: *artifacts_solc
       - persist_to_workspace: *artifacts_executables
 
@@ -595,8 +611,8 @@ jobs:
             git clone https://github.com/ethereum/solidity-fuzzing-corpus /tmp/solidity-fuzzing-corpus
             mkdir -p test_results
             scripts/regressions.py -o test_results
-      - run: *gitter_notify_failure
-      - run: *gitter_notify_success
+      - gitter_notify_failure
+      - gitter_notify_success
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
 
@@ -807,7 +823,7 @@ jobs:
       - when:
           condition: true
           <<: *steps_soltest
-      - run: *gitter_notify_failure
+      - gitter_notify_failure
 
   t_ubu_ubsan_clang_cli:
     docker:
@@ -816,7 +832,7 @@ jobs:
       - when:
           condition: true
           <<: *steps_cmdline_tests
-      - run: *gitter_notify_failure
+      - gitter_notify_failure
 
   t_ems_solcjs:
     docker:
@@ -874,8 +890,8 @@ jobs:
       - when:
           condition: <<parameters.gitter_notify>>
           steps:
-            - run: *gitter_notify_failure
-            - run: *gitter_notify_success
+            - gitter_notify_failure
+            - gitter_notify_success
 
   b_win: &b_win
     executor:

From a4fce301df22fb41dfe9410d987640e1c08b5b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 22 Oct 2021 20:47:25 +0200
Subject: [PATCH 0012/1748] CI: Use markdown link syntax in gitter messages

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 73f658b1e4..1c359ac812 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -43,8 +43,8 @@ commands:
       - run:
           name: "Gitter notification"
           command: |
-            [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ Nightly job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see ${CIRCLE_BUILD_URL} for details."
-            [[ "<< parameters.event >>" == "success" ]] && message=" ✅ Nightly job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see ${CIRCLE_BUILD_URL} for details."
+            [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ Nightly job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
+            [[ "<< parameters.event >>" == "success" ]] && message=" ✅ Nightly job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
 
             curl "https://api.gitter.im/v1/rooms/${GITTER_NOTIFY_ROOM_ID}/chatMessages" \
               --request POST \

From 3387e134d79aa5850042a1c468c0e3b701930463 Mon Sep 17 00:00:00 2001
From: Adam Bliss <abliss@gmail.com>
Date: Sun, 24 Oct 2021 08:22:34 -0400
Subject: [PATCH 0013/1748] Fix typo compiler->constructor.

---
 docs/control-structures.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 1de35cf6bc..49e66537d3 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -288,7 +288,7 @@ which only need to be created if there is a dispute.
     re-created at the same address after having been destroyed. Yet, it is possible
     for that newly created contract to have a different deployed bytecode even
     though the creation bytecode has been the same (which is a requirement because
-    otherwise the address would change). This is due to the fact that the compiler
+    otherwise the address would change). This is due to the fact that the constructor
     can query external state that might have changed between the two creations
     and incorporate that into the deployed bytecode before it is stored.
 

From cf005368d801ac54c76da071b21d023ed8dcadc2 Mon Sep 17 00:00:00 2001
From: shikharvashistha <shikharvashistha@yandex.com>
Date: Fri, 24 Sep 2021 04:25:20 +0000
Subject: [PATCH 0014/1748] Added different colors for warning & error

Co-authored-by: shikharvashistha <shikharvashistha@yandex.com>
Co-authored-by: cameel <kamil.sliwak@codepoets.it>
---
 Changelog.md                             |  1 +
 liblangutil/Exceptions.cpp               | 15 +++++++++++++++
 liblangutil/Exceptions.h                 |  2 ++
 liblangutil/SourceReferenceFormatter.cpp | 21 +++++++++++++++++----
 liblangutil/SourceReferenceFormatter.h   |  2 +-
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 69c3573fcb..2ab1bb0377 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Language Features:
 Compiler Features:
  * Commandline Interface: Accept nested brackets in step sequences passed to ``--yul-optimizations``.
  * Commandline Interface: Add ``--debug-info`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
+ * Commandline Interface: Use different colors when printing errors, warnings and infos.
  * SMTChecker: Output values for ``block.*``, ``msg.*`` and ``tx.*`` variables that are present in the called functions.
  * Standard JSON: Accept nested brackets in step sequences passed to ``settings.optimizer.details.yulDetails.optimizerSteps``.
  * Standard JSON: Add ``settings.debug.debugInfo`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
diff --git a/liblangutil/Exceptions.cpp b/liblangutil/Exceptions.cpp
index 34aa698033..a410a98635 100644
--- a/liblangutil/Exceptions.cpp
+++ b/liblangutil/Exceptions.cpp
@@ -23,6 +23,9 @@
 
 #include <liblangutil/Exceptions.h>
 
+#include <boost/algorithm/string/case_conv.hpp>
+#include <boost/algorithm/string/trim.hpp>
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
@@ -71,3 +74,15 @@ Error::Error(
 	if (!_description.empty())
 		*this << util::errinfo_comment(_description);
 }
+
+optional<Error::Severity> Error::severityFromString(string _input)
+{
+	boost::algorithm::to_lower(_input);
+	boost::algorithm::trim(_input);
+
+	for (Severity severity: {Severity::Error, Severity::Warning, Severity::Info})
+		if (_input == formatErrorSeverityLowercase(severity))
+			return severity;
+
+	return nullopt;
+}
diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
index 6946ff463d..0c8f03cb94 100644
--- a/liblangutil/Exceptions.h
+++ b/liblangutil/Exceptions.h
@@ -258,6 +258,8 @@ class Error: virtual public util::Exception
 		solAssert(false, "");
 	}
 
+	static std::optional<Severity> severityFromString(std::string _input);
+
 private:
 	ErrorId m_errorId;
 	Type m_type;
diff --git a/liblangutil/SourceReferenceFormatter.cpp b/liblangutil/SourceReferenceFormatter.cpp
index 623e13dd1a..0edd551b8b 100644
--- a/liblangutil/SourceReferenceFormatter.cpp
+++ b/liblangutil/SourceReferenceFormatter.cpp
@@ -65,9 +65,21 @@ AnsiColorized SourceReferenceFormatter::frameColored() const
 	return AnsiColorized(m_stream, m_colored, {BOLD, BLUE});
 }
 
-AnsiColorized SourceReferenceFormatter::errorColored() const
+AnsiColorized SourceReferenceFormatter::errorColored(optional<Error::Severity> _severity) const
 {
-	return AnsiColorized(m_stream, m_colored, {BOLD, RED});
+	// We used to color messages of any severity as errors so this seems like a good default
+	// for cases where severity cannot be determined.
+	char const* textColor = RED;
+
+	if (_severity.has_value())
+		switch (_severity.value())
+		{
+		case Error::Severity::Error: textColor = RED; break;
+		case Error::Severity::Warning: textColor = YELLOW; break;
+		case Error::Severity::Info: textColor = WHITE; break;
+		}
+
+	return AnsiColorized(m_stream, m_colored, {BOLD, textColor});
 }
 
 AnsiColorized SourceReferenceFormatter::messageColored() const
@@ -164,9 +176,10 @@ void SourceReferenceFormatter::printSourceLocation(SourceReference const& _ref)
 void SourceReferenceFormatter::printExceptionInformation(SourceReferenceExtractor::Message const& _msg)
 {
 	// exception header line
-	errorColored() << _msg.severity;
+	optional<Error::Severity> severity = Error::severityFromString(_msg.severity);
+	errorColored(severity) << _msg.severity;
 	if (m_withErrorIds && _msg.errorId.has_value())
-		errorColored() << " (" << _msg.errorId.value().error << ")";
+		errorColored(severity) << " (" << _msg.errorId.value().error << ")";
 	messageColored() << ": " << _msg.primary.message << '\n';
 
 	printSourceLocation(_msg.primary);
diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
index 5bac03a9af..e18400b60a 100644
--- a/liblangutil/SourceReferenceFormatter.h
+++ b/liblangutil/SourceReferenceFormatter.h
@@ -87,7 +87,7 @@ class SourceReferenceFormatter
 private:
 	util::AnsiColorized normalColored() const;
 	util::AnsiColorized frameColored() const;
-	util::AnsiColorized errorColored() const;
+	util::AnsiColorized errorColored(std::optional<langutil::Error::Severity> _severity) const;
 	util::AnsiColorized messageColored() const;
 	util::AnsiColorized secondaryColored() const;
 	util::AnsiColorized highlightColored() const;

From cc80f5e99245ec4789621cfabf2a122520a6a246 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Oct 2021 10:40:45 +0200
Subject: [PATCH 0015/1748] Add missing condition to gitter_notify command

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7344d12916..00c7223d5e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -42,6 +42,7 @@ commands:
     steps:
       - run:
           name: "Gitter notification"
+          when: << parameters.condition >>
           command: |
             [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ Nightly job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
             [[ "<< parameters.event >>" == "success" ]] && message=" ✅ Nightly job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."

From fa48abf4f19b033a335107e970211fb4c9fccdad Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:42:05 +0200
Subject: [PATCH 0016/1748] Add new info functions

---
 liblangutil/ErrorReporter.cpp     |  5 +++++
 liblangutil/ErrorReporter.h       |  2 ++
 liblangutil/UniqueErrorReporter.h | 14 ++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/liblangutil/ErrorReporter.cpp b/liblangutil/ErrorReporter.cpp
index 02487034ac..f99247b328 100644
--- a/liblangutil/ErrorReporter.cpp
+++ b/liblangutil/ErrorReporter.cpp
@@ -261,3 +261,8 @@ void ErrorReporter::info(
 {
 	error(_error, Error::Type::Info, _location, _description);
 }
+
+void ErrorReporter::info(ErrorId _error, string const& _description)
+{
+	error(_error, Error::Type::Info, SourceLocation(), _description);
+}
diff --git a/liblangutil/ErrorReporter.h b/liblangutil/ErrorReporter.h
index 6f91f0713b..67fc76e831 100644
--- a/liblangutil/ErrorReporter.h
+++ b/liblangutil/ErrorReporter.h
@@ -72,6 +72,8 @@ class ErrorReporter
 		std::string const& _description
 	);
 
+	void info(ErrorId _error, std::string const& _description);
+
 	void declarationError(
 		ErrorId _error,
 		SourceLocation const& _location,
diff --git a/liblangutil/UniqueErrorReporter.h b/liblangutil/UniqueErrorReporter.h
index 8867205681..fd91b87dc6 100644
--- a/liblangutil/UniqueErrorReporter.h
+++ b/liblangutil/UniqueErrorReporter.h
@@ -61,6 +61,20 @@ class UniqueErrorReporter
 		m_errorReporter.warning(_error, _description);
 	}
 
+	void info(ErrorId _error, SourceLocation const& _location, std::string const& _description)
+	{
+		if (!seen(_error, _location, _description))
+		{
+			m_errorReporter.info(_error, _location, _description);
+			markAsSeen(_error, _location, _description);
+		}
+	}
+
+	void info(ErrorId _error, std::string const& _description)
+	{
+		m_errorReporter.info(_error, _description);
+	}
+
 	bool seen(ErrorId _error, SourceLocation const& _location, std::string const& _description) const
 	{
 		if (m_seenErrors.count({_error, _location}))

From 9a87680d21668e37a0d3acbf160c760e8177d4af Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:44:33 +0200
Subject: [PATCH 0017/1748] Add invariant to the solver results

---
 libsmtutil/CHCSmtLib2Interface.cpp |  5 ++---
 libsmtutil/CHCSmtLib2Interface.h   |  4 +++-
 libsmtutil/CHCSolverInterface.h    |  4 ++--
 libsmtutil/Z3CHCInterface.cpp      | 10 +++++-----
 libsmtutil/Z3CHCInterface.h        |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index 48fdbd3281..630eb06193 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -87,7 +87,7 @@ void CHCSmtLib2Interface::addRule(Expression const& _expr, std::string const& /*
 	);
 }
 
-pair<CheckResult, CHCSolverInterface::CexGraph> CHCSmtLib2Interface::query(Expression const& _block)
+tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Interface::query(Expression const& _block)
 {
 	string accumulated{};
 	swap(m_accumulatedOutput, accumulated);
@@ -118,8 +118,7 @@ pair<CheckResult, CHCSolverInterface::CexGraph> CHCSmtLib2Interface::query(Expre
 	else
 		result = CheckResult::ERROR;
 
-	// TODO collect invariants or counterexamples.
-	return {result, {}};
+	return {result, Expression(true), {}};
 }
 
 void CHCSmtLib2Interface::declareVariable(string const& _name, SortPointer const& _sort)
diff --git a/libsmtutil/CHCSmtLib2Interface.h b/libsmtutil/CHCSmtLib2Interface.h
index 460895e3b3..a7dfb76928 100644
--- a/libsmtutil/CHCSmtLib2Interface.h
+++ b/libsmtutil/CHCSmtLib2Interface.h
@@ -44,7 +44,9 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 
 	void addRule(Expression const& _expr, std::string const& _name) override;
 
-	std::pair<CheckResult, CexGraph> query(Expression const& _expr) override;
+	/// Takes a function application _expr and checks for reachability.
+	/// @returns solving result, an invariant, and counterexample graph, if possible.
+	std::tuple<CheckResult, Expression, CexGraph> query(Expression const& _expr) override;
 
 	void declareVariable(std::string const& _name, SortPointer const& _sort) override;
 
diff --git a/libsmtutil/CHCSolverInterface.h b/libsmtutil/CHCSolverInterface.h
index 2032553451..8385c1c401 100644
--- a/libsmtutil/CHCSolverInterface.h
+++ b/libsmtutil/CHCSolverInterface.h
@@ -54,8 +54,8 @@ class CHCSolverInterface
 	};
 
 	/// Takes a function application _expr and checks for reachability.
-	/// @returns solving result and a counterexample graph, if possible.
-	virtual std::pair<CheckResult, CexGraph> query(
+	/// @returns solving result, an invariant, and counterexample graph, if possible.
+	virtual std::tuple<CheckResult, Expression, CexGraph> query(
 		Expression const& _expr
 	) = 0;
 
diff --git a/libsmtutil/Z3CHCInterface.cpp b/libsmtutil/Z3CHCInterface.cpp
index 1196b27ff8..82dca48788 100644
--- a/libsmtutil/Z3CHCInterface.cpp
+++ b/libsmtutil/Z3CHCInterface.cpp
@@ -77,7 +77,7 @@ void Z3CHCInterface::addRule(Expression const& _expr, string const& _name)
 	}
 }
 
-pair<CheckResult, CHCSolverInterface::CexGraph> Z3CHCInterface::query(Expression const& _expr)
+tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> Z3CHCInterface::query(Expression const& _expr)
 {
 	CheckResult result;
 	try
@@ -93,15 +93,15 @@ pair<CheckResult, CHCSolverInterface::CexGraph> Z3CHCInterface::query(Expression
 			if (m_version >= tuple(4, 8, 8, 0))
 			{
 				auto proof = m_solver.get_answer();
-				return {result, cexGraph(proof)};
+				return {result, Expression(true), cexGraph(proof)};
 			}
 			break;
 		}
 		case z3::check_result::unsat:
 		{
 			result = CheckResult::UNSATISFIABLE;
-			// TODO retrieve invariants.
-			break;
+			auto invariants = m_z3Interface->fromZ3Expr(m_solver.get_answer());
+			return {result, move(invariants), {}};
 		}
 		case z3::check_result::unknown:
 		{
@@ -125,7 +125,7 @@ pair<CheckResult, CHCSolverInterface::CexGraph> Z3CHCInterface::query(Expression
 			result = CheckResult::ERROR;
 	}
 
-	return {result, {}};
+	return {result, Expression(true), {}};
 }
 
 void Z3CHCInterface::setSpacerOptions(bool _preProcessing)
diff --git a/libsmtutil/Z3CHCInterface.h b/libsmtutil/Z3CHCInterface.h
index a0e4bfa671..5a768f65cb 100644
--- a/libsmtutil/Z3CHCInterface.h
+++ b/libsmtutil/Z3CHCInterface.h
@@ -43,7 +43,7 @@ class Z3CHCInterface: public CHCSolverInterface
 
 	void addRule(Expression const& _expr, std::string const& _name) override;
 
-	std::pair<CheckResult, CexGraph> query(Expression const& _expr) override;
+	std::tuple<CheckResult, Expression, CexGraph> query(Expression const& _expr) override;
 
 	Z3Interface* z3Interface() const { return m_z3Interface.get(); }
 

From 1d659777699bf7f5e22526334e7ae1d46e0b4715 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:45:15 +0200
Subject: [PATCH 0018/1748] Adjust Z3Interface::fromZ3 for the extra cases

---
 libsmtutil/SolverInterface.h | 60 ++++++++++++++++++++++++++++++++++++
 libsmtutil/Z3Interface.cpp   | 46 +++++++++++++++++++++------
 2 files changed, 97 insertions(+), 9 deletions(-)

diff --git a/libsmtutil/SolverInterface.h b/libsmtutil/SolverInterface.h
index 87ee78013b..ca4c497ded 100644
--- a/libsmtutil/SolverInterface.h
+++ b/libsmtutil/SolverInterface.h
@@ -23,7 +23,9 @@
 
 #include <libsolutil/Common.h>
 #include <libsolutil/Numeric.h>
+#include <libsolutil/CommonData.h>
 
+#include <range/v3/algorithm/all_of.hpp>
 #include <range/v3/view.hpp>
 
 #include <cstdio>
@@ -305,6 +307,64 @@ class Expression
 		);
 	}
 
+	static bool sameSort(std::vector<Expression> const& _args)
+	{
+		if (_args.empty())
+			return true;
+
+		auto sort = _args.front().sort;
+		return ranges::all_of(
+			_args,
+			[&](auto const& _expr){ return _expr.sort->kind == sort->kind; }
+		);
+	}
+
+	static Expression mkAnd(std::vector<Expression> _args)
+	{
+		smtAssert(!_args.empty(), "");
+		smtAssert(sameSort(_args), "");
+
+		auto sort = _args.front().sort;
+		if (sort->kind == Kind::BitVector)
+			return Expression("bvand", std::move(_args), sort);
+
+		smtAssert(sort->kind == Kind::Bool, "");
+		return Expression("and", std::move(_args), Kind::Bool);
+	}
+
+	static Expression mkOr(std::vector<Expression> _args)
+	{
+		smtAssert(!_args.empty(), "");
+		smtAssert(sameSort(_args), "");
+
+		auto sort = _args.front().sort;
+		if (sort->kind == Kind::BitVector)
+			return Expression("bvor", std::move(_args), sort);
+
+		smtAssert(sort->kind == Kind::Bool, "");
+		return Expression("or", std::move(_args), Kind::Bool);
+	}
+
+	static Expression mkPlus(std::vector<Expression> _args)
+	{
+		smtAssert(!_args.empty(), "");
+		smtAssert(sameSort(_args), "");
+
+		auto sort = _args.front().sort;
+		smtAssert(sort->kind == Kind::BitVector || sort->kind == Kind::Int, "");
+		return Expression("+", std::move(_args), sort);
+	}
+
+	static Expression mkMul(std::vector<Expression> _args)
+	{
+		smtAssert(!_args.empty(), "");
+		smtAssert(sameSort(_args), "");
+
+		auto sort = _args.front().sort;
+		smtAssert(sort->kind == Kind::BitVector || sort->kind == Kind::Int, "");
+		return Expression("*", std::move(_args), sort);
+	}
+
 	friend Expression operator!(Expression _a)
 	{
 		if (_a.sort->kind == Kind::BitVector)
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
index 03105a172c..3a5c75bf32 100644
--- a/libsmtutil/Z3Interface.cpp
+++ b/libsmtutil/Z3Interface.cpp
@@ -279,6 +279,19 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 	if (_expr.is_const() || _expr.is_var())
 		return Expression(_expr.to_string(), {}, sort);
 
+	if (_expr.is_quantifier())
+	{
+		string quantifierName;
+		if (_expr.is_exists())
+			quantifierName = "exists";
+		else if (_expr.is_forall())
+			quantifierName = "forall";
+		else if (_expr.is_lambda())
+			quantifierName = "lambda";
+		else
+			smtAssert(false, "");
+		return Expression(quantifierName, {fromZ3Expr(_expr.body())}, sort);
+	}
 	smtAssert(_expr.is_app(), "");
 	vector<Expression> arguments;
 	for (unsigned i = 0; i < _expr.num_args(); ++i)
@@ -290,33 +303,44 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 	else if (_expr.is_not())
 		return !arguments[0];
 	else if (_expr.is_and())
-		return arguments[0] && arguments[1];
+		return Expression::mkAnd(arguments);
 	else if (_expr.is_or())
-		return arguments[0] || arguments[1];
+		return Expression::mkOr(arguments);
 	else if (_expr.is_implies())
 		return Expression::implies(arguments[0], arguments[1]);
 	else if (_expr.is_eq())
+	{
+		smtAssert(arguments.size() == 2, "");
 		return arguments[0] == arguments[1];
+	}
 	else if (kind == Z3_OP_ULT || kind == Z3_OP_SLT)
 		return arguments[0] < arguments[1];
-	else if (kind == Z3_OP_ULEQ || kind == Z3_OP_SLEQ)
+	else if (kind == Z3_OP_LE || kind == Z3_OP_ULEQ || kind == Z3_OP_SLEQ)
 		return arguments[0] <= arguments[1];
 	else if (kind == Z3_OP_GT || kind == Z3_OP_SGT)
 		return arguments[0] > arguments[1];
-	else if (kind == Z3_OP_UGEQ || kind == Z3_OP_SGEQ)
+	else if (kind == Z3_OP_GE || kind == Z3_OP_UGEQ || kind == Z3_OP_SGEQ)
 		return arguments[0] >= arguments[1];
 	else if (kind == Z3_OP_ADD)
-		return arguments[0] + arguments[1];
+		return Expression::mkPlus(arguments);
 	else if (kind == Z3_OP_SUB)
+	{
+		smtAssert(arguments.size() == 2, "");
 		return arguments[0] - arguments[1];
+	}
 	else if (kind == Z3_OP_MUL)
-		return arguments[0] * arguments[1];
+		return Expression::mkMul(arguments);
 	else if (kind == Z3_OP_DIV)
+	{
+		smtAssert(arguments.size() == 2, "");
 		return arguments[0] / arguments[1];
+	}
 	else if (kind == Z3_OP_MOD)
 		return arguments[0] % arguments[1];
 	else if (kind == Z3_OP_XOR)
 		return arguments[0] ^ arguments[1];
+	else if (kind == Z3_OP_BNOT)
+		return !arguments[0];
 	else if (kind == Z3_OP_BSHL)
 		return arguments[0] << arguments[1];
 	else if (kind == Z3_OP_BLSHR)
@@ -324,9 +348,11 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 	else if (kind == Z3_OP_BASHR)
 		return Expression::ashr(arguments[0], arguments[1]);
 	else if (kind == Z3_OP_INT2BV)
-		smtAssert(false, "");
+		return Expression::int2bv(arguments[0], _expr.get_sort().bv_size());
 	else if (kind == Z3_OP_BV2INT)
-		smtAssert(false, "");
+		return Expression::bv2int(arguments[0]);
+	else if (kind == Z3_OP_EXTRACT)
+		return Expression("extract", arguments, sort);
 	else if (kind == Z3_OP_SELECT)
 		return Expression::select(arguments[0], arguments[1]);
 	else if (kind == Z3_OP_STORE)
@@ -342,7 +368,9 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 		return Expression::tuple_constructor(Expression(sortSort), arguments);
 	}
 	else if (kind == Z3_OP_DT_ACCESSOR)
-		smtAssert(false, "");
+		return Expression("dt_accessor_" + _expr.decl().name().str(), arguments, sort);
+	else if (kind == Z3_OP_DT_IS)
+		return Expression("dt_is", {arguments.at(0)}, sort);
 	else if (kind == Z3_OP_UNINTERPRETED)
 		return Expression(_expr.decl().name().str(), arguments, fromZ3Sort(_expr.get_sort()));
 

From ce72d7cd262478871a9dd199681a005f00f0f8bb Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:46:45 +0200
Subject: [PATCH 0019/1748] Add ExpressionFormatter which translates an
 smtutil::Expression into a Solidity-like expression string

---
 libsolidity/formal/ExpressionFormatter.cpp | 184 +++++++++++++++++++++
 libsolidity/formal/ExpressionFormatter.h   |  41 +++++
 2 files changed, 225 insertions(+)
 create mode 100644 libsolidity/formal/ExpressionFormatter.cpp
 create mode 100644 libsolidity/formal/ExpressionFormatter.h

diff --git a/libsolidity/formal/ExpressionFormatter.cpp b/libsolidity/formal/ExpressionFormatter.cpp
new file mode 100644
index 0000000000..2591328f84
--- /dev/null
+++ b/libsolidity/formal/ExpressionFormatter.cpp
@@ -0,0 +1,184 @@
+/*
+	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 <libsolidity/formal/ExpressionFormatter.h>
+
+#include <libsolutil/Algorithms.h>
+#include <libsolutil/CommonData.h>
+
+#include <boost/algorithm/string.hpp>
+
+#include <range/v3/algorithm/for_each.hpp>
+
+#include <map>
+#include <vector>
+#include <string>
+
+using namespace std;
+using boost::algorithm::starts_with;
+using namespace solidity;
+using namespace solidity::util;
+using namespace solidity::smtutil;
+using namespace solidity::frontend::smt;
+
+namespace solidity::frontend::smt
+{
+
+namespace
+{
+
+string formatDatatypeAccessor(smtutil::Expression const& _expr, vector<string> const& _args)
+{
+	auto const& op = _expr.name;
+
+	// This is the most complicated part of the translation.
+	// Datatype accessor means access to a field of a datatype.
+	// In our encoding, datatypes are used to encode:
+	// - arrays/mappings as the tuple (array, length)
+	// - structs as the tuple (<member1>, ..., <memberK>)
+	// - hash and signature functions as the tuple (keccak256, sha256, ripemd160, ecrecover),
+	//   where each element is an array emulating an UF
+	// - abi.* functions as the tuple (<abiCall1>, ..., <abiCallK>).
+	if (op == "dt_accessor_keccak256")
+		return "keccak256";
+	if (op == "dt_accessor_sha256")
+		return "sha256";
+	if (op == "dt_accessor_ripemd160")
+		return "ripemd160";
+	if (op == "dt_accessor_ecrecover")
+		return "ecrecover";
+
+	string accessorStr = "accessor_";
+	// Struct members have suffix "accessor_<memberName>".
+	string type = op.substr(op.rfind(accessorStr) + accessorStr.size());
+	solAssert(_expr.arguments.size() == 1, "");
+
+	if (type == "length")
+		return _args.at(0) + ".length";
+	if (type == "array")
+		return _args.at(0);
+
+	if (
+		starts_with(type, "block") ||
+		starts_with(type, "msg") ||
+		starts_with(type, "tx") ||
+		starts_with(type, "abi")
+	)
+		return type;
+
+	if (starts_with(type, "t_function_abi"))
+		return type;
+
+	return _args.at(0) + "." + type;
+}
+
+string formatGenericOp(smtutil::Expression const& _expr, vector<string> const& _args)
+{
+	return _expr.name + "(" + boost::algorithm::join(_args, ", ") + ")";
+}
+
+string formatInfixOp(string const& _op, vector<string> const& _args)
+{
+	return "(" + boost::algorithm::join(_args, " " + _op + " ") + ")";
+}
+
+string formatArrayOp(smtutil::Expression const& _expr, vector<string> const& _args)
+{
+	if (_expr.name == "select")
+	{
+		auto const& a0 = _args.at(0);
+		static set<string> const ufs{"keccak256", "sha256", "ripemd160", "ecrecover"};
+		if (ufs.count(a0) || starts_with(a0, "t_function_abi"))
+			return _args.at(0) + "(" + _args.at(1) + ")";
+		return _args.at(0) + "[" + _args.at(1) + "]";
+	}
+	if (_expr.name == "store")
+		return "(" + _args.at(0) + "[" + _args.at(1) + "] := " + _args.at(2) + ")";
+	return formatGenericOp(_expr, _args);
+}
+
+string formatUnaryOp(smtutil::Expression const& _expr, vector<string> const& _args)
+{
+	if (_expr.name == "not")
+		return "!" + _args.at(0);
+	// Other operators such as exists may end up here.
+	return formatGenericOp(_expr, _args);
+}
+
+}
+
+smtutil::Expression substitute(smtutil::Expression _from, map<string, string> const& _subst)
+{
+	// TODO For now we ignore nested quantifier expressions,
+	// but we should support them in the future.
+	if (_from.name == "forall" || _from.name == "exists")
+		return smtutil::Expression(true);
+	if (_subst.count(_from.name))
+		_from.name = _subst.at(_from.name);
+	for (auto& arg: _from.arguments)
+		arg = substitute(arg, _subst);
+	return _from;
+}
+
+string toSolidityStr(smtutil::Expression const& _expr)
+{
+	auto const& op = _expr.name;
+
+	auto const& args = _expr.arguments;
+	auto strArgs = util::applyMap(args, [](auto const& _arg) { return toSolidityStr(_arg); });
+
+	// Constant or variable.
+	if (args.empty())
+		return op;
+
+	if (starts_with(op, "dt_accessor"))
+		return formatDatatypeAccessor(_expr, strArgs);
+
+	// Infix operators with format replacements.
+	static map<string, string> const infixOps{
+		{"and", "&&"},
+		{"or", "||"},
+		{"implies", "=>"},
+		{"=", "="},
+		{">", ">"},
+		{">=", ">="},
+		{"<", "<"},
+		{"<=", "<="},
+		{"+", "+"},
+		{"-", "-"},
+		{"*", "*"},
+		{"/", "/"},
+		{"div", "/"},
+		{"mod", "%"}
+	};
+	// Some of these (and, or, +, *) may have >= 2 arguments from z3.
+	if (infixOps.count(op))
+		return formatInfixOp(infixOps.at(op), strArgs);
+
+	static set<string> const arrayOps{"select", "store", "const_array"};
+	if (arrayOps.count(op))
+		return formatArrayOp(_expr, strArgs);
+
+	if (args.size() == 1)
+		return formatUnaryOp(_expr, strArgs);
+
+	// Other operators such as bv2int, int2bv may end up here.
+	return op + "(" + boost::algorithm::join(strArgs, ", ") + ")";
+}
+
+}
diff --git a/libsolidity/formal/ExpressionFormatter.h b/libsolidity/formal/ExpressionFormatter.h
new file mode 100644
index 0000000000..3efbeb781f
--- /dev/null
+++ b/libsolidity/formal/ExpressionFormatter.h
@@ -0,0 +1,41 @@
+/*
+	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
+
+#pragma once
+
+/**
+ * Formats SMT expressions into Solidity-like strings.
+ */
+
+#include <libsolidity/formal/Predicate.h>
+
+#include <map>
+#include <string>
+
+namespace solidity::frontend::smt
+{
+
+/// @returns another smtutil::Expressions where every term in _from
+/// may be replaced if it is in the substitution map _subst.
+smtutil::Expression substitute(smtutil::Expression _from, std::map<std::string, std::string> const& _subst);
+
+/// @returns a Solidity-like expression string built from _expr.
+/// This is done at best-effort and is not guaranteed to always create a perfect Solidity expression string.
+std::string toSolidityStr(smtutil::Expression const& _expr);
+
+}

From 9bcd2c18e42d29b4698103493ced4099e156ec5c Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:48:15 +0200
Subject: [PATCH 0020/1748] Add expression substitution to Predicate

---
 libsolidity/formal/Predicate.cpp | 52 ++++++++++++++++++++++++++++++++
 libsolidity/formal/Predicate.h   | 21 +++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
index 23aa7590e0..6e0eb4f3b9 100644
--- a/libsolidity/formal/Predicate.cpp
+++ b/libsolidity/formal/Predicate.cpp
@@ -26,10 +26,13 @@
 #include <libsolidity/ast/TypeProvider.h>
 
 #include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string.hpp>
+
 #include <range/v3/view.hpp>
 #include <utility>
 
 using namespace std;
+using boost::algorithm::starts_with;
 using namespace solidity;
 using namespace solidity::smtutil;
 using namespace solidity::frontend;
@@ -198,6 +201,11 @@ bool Predicate::isInterface() const
 	return m_type == PredicateType::Interface;
 }
 
+bool Predicate::isNondetInterface() const
+{
+	return m_type == PredicateType::NondetInterface;
+}
+
 string Predicate::formatSummaryCall(
 	vector<smtutil::Expression> const& _args,
 	langutil::CharStreamProvider const& _charStreamProvider,
@@ -418,6 +426,50 @@ pair<vector<optional<string>>, vector<VariableDeclaration const*>> Predicate::lo
 	return {formatExpressions(outValuesInScope, outTypes), localVarsInScope};
 }
 
+map<string, string> Predicate::expressionSubstitution(smtutil::Expression const& _predExpr) const
+{
+	map<string, string> subst;
+	string predName = functor().name;
+
+	solAssert(contextContract(), "");
+	auto const& stateVars = SMTEncoder::stateVariablesIncludingInheritedAndPrivate(*contextContract());
+
+	auto nArgs = _predExpr.arguments.size();
+
+	// The signature of an interface predicate is
+	// interface(this, abiFunctions, cryptoFunctions, blockchainState, stateVariables).
+	// An invariant for an interface predicate is a contract
+	// invariant over its state, for example `x <= 0`.
+	if (isInterface())
+	{
+		solAssert(starts_with(predName, "interface"), "");
+		subst[_predExpr.arguments.at(0).name] = "address(this)";
+		solAssert(nArgs == stateVars.size() + 4, "");
+		for (size_t i = nArgs - stateVars.size(); i < nArgs; ++i)
+			subst[_predExpr.arguments.at(i).name] = stateVars.at(i - 4)->name();
+	}
+	// The signature of a nondet interface predicate is
+	// nondet_interface(error, this, abiFunctions, cryptoFunctions, blockchainState, stateVariables, blockchainState', stateVariables').
+	// An invariant for a nondet interface predicate is a reentrancy property
+	// over the pre and post state variables of a contract, where pre state vars
+	// are represented by the variable's name and post state vars are represented
+	// by the primed variable's name, for example
+	// `(x <= 0) => (x' <= 100)`.
+	else if (isNondetInterface())
+	{
+		solAssert(starts_with(predName, "nondet_interface"), "");
+		subst[_predExpr.arguments.at(0).name] = "<errorCode>";
+		subst[_predExpr.arguments.at(1).name] = "address(this)";
+		solAssert(nArgs == stateVars.size() * 2 + 6, "");
+		for (size_t i = nArgs - stateVars.size(), s = 0; i < nArgs; ++i, ++s)
+			subst[_predExpr.arguments.at(i).name] = stateVars.at(s)->name() + "'";
+		for (size_t i = nArgs - (stateVars.size() * 2 + 1), s = 0; i < nArgs - (stateVars.size() + 1); ++i, ++s)
+			subst[_predExpr.arguments.at(i).name] = stateVars.at(s)->name();
+	}
+
+	return subst;
+}
+
 vector<optional<string>> Predicate::formatExpressions(vector<smtutil::Expression> const& _exprs, vector<Type const*> const& _types) const
 {
 	solAssert(_exprs.size() == _types.size(), "");
diff --git a/libsolidity/formal/Predicate.h b/libsolidity/formal/Predicate.h
index 7357c9beba..16af42f45f 100644
--- a/libsolidity/formal/Predicate.h
+++ b/libsolidity/formal/Predicate.h
@@ -21,6 +21,8 @@
 #include <libsolidity/formal/SymbolicVariables.h>
 #include <libsolidity/formal/SymbolicVariables.h>
 
+#include <libsolidity/ast/AST.h>
+
 #include <libsmtutil/Sorts.h>
 
 #include <map>
@@ -143,6 +145,9 @@ class Predicate
 	/// @returns true if this predicate represents an interface.
 	bool isInterface() const;
 
+	/// @returns true if this predicate represents a nondeterministic interface.
+	bool isNondetInterface() const;
+
 	PredicateType type() const { return m_type; }
 
 	/// @returns a formatted string representing a call to this predicate
@@ -168,6 +173,10 @@ class Predicate
 	/// @returns the values of the local variables used by this predicate.
 	std::pair<std::vector<std::optional<std::string>>, std::vector<VariableDeclaration const*>> localVariableValues(std::vector<smtutil::Expression> const& _args) const;
 
+	/// @returns a substitution map from the arguments of _predExpr
+	/// to a Solidity-like expression.
+	std::map<std::string, std::string> expressionSubstitution(smtutil::Expression const& _predExpr) const;
+
 private:
 	/// @returns the formatted version of the given SMT expressions. Those expressions must be SMT constants.
 	std::vector<std::optional<std::string>> formatExpressions(std::vector<smtutil::Expression> const& _exprs, std::vector<Type const*> const& _types) const;
@@ -208,4 +217,16 @@ class Predicate
 	std::vector<ScopeOpener const*> const m_scopeStack;
 };
 
+struct PredicateCompare
+{
+	bool operator()(Predicate const* lhs, Predicate const* rhs) const
+	{
+		// We cannot use m_node->id() because different predicates may
+		// represent the same program node.
+		// We use the symbolic name since it is unique per predicate and
+		// the order does not really matter.
+		return lhs->functor().name < rhs->functor().name;
+	}
+};
+
 }

From d554824f70ecef2d79442d655188c995f970a228 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:49:00 +0200
Subject: [PATCH 0021/1748] Add Invariants which traverses the proof and
 collects invariants for the given predicates

---
 libsolidity/formal/Invariants.cpp | 86 +++++++++++++++++++++++++++++++
 libsolidity/formal/Invariants.h   | 37 +++++++++++++
 2 files changed, 123 insertions(+)
 create mode 100644 libsolidity/formal/Invariants.cpp
 create mode 100644 libsolidity/formal/Invariants.h

diff --git a/libsolidity/formal/Invariants.cpp b/libsolidity/formal/Invariants.cpp
new file mode 100644
index 0000000000..9dad0722cd
--- /dev/null
+++ b/libsolidity/formal/Invariants.cpp
@@ -0,0 +1,86 @@
+/*
+	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 <libsolidity/formal/Invariants.h>
+
+#include <libsolidity/formal/ExpressionFormatter.h>
+#include <libsolidity/formal/SMTEncoder.h>
+
+#include <libsolutil/Algorithms.h>
+
+#include <boost/algorithm/string.hpp>
+
+using namespace std;
+using boost::algorithm::starts_with;
+using namespace solidity;
+using namespace solidity::smtutil;
+using namespace solidity::frontend::smt;
+
+namespace solidity::frontend::smt
+{
+
+map<Predicate const*, set<string>> collectInvariants(
+	smtutil::Expression const& _proof,
+	set<Predicate const*> const& _predicates,
+	ModelCheckerInvariants const& _invariantsSetting
+)
+{
+	set<string> targets;
+	if (_invariantsSetting.has(InvariantType::Contract))
+		targets.insert("interface_");
+	if (_invariantsSetting.has(InvariantType::Reentrancy))
+		targets.insert("nondet_interface_");
+
+	map<string, pair<smtutil::Expression, smtutil::Expression>> equalities;
+	// Collect equalities where one of the sides is a predicate we're interested in.
+	BreadthFirstSearch<smtutil::Expression const*>{{&_proof}}.run([&](auto&& _expr, auto&& _addChild) {
+		if (_expr->name == "=")
+			for (auto const& t: targets)
+			{
+				auto arg0 = _expr->arguments.at(0);
+				auto arg1 = _expr->arguments.at(1);
+				if (starts_with(arg0.name, t))
+					equalities.insert({arg0.name, {arg0, move(arg1)}});
+				else if (starts_with(arg1.name, t))
+					equalities.insert({arg1.name, {arg1, move(arg0)}});
+			}
+		for (auto const& arg: _expr->arguments)
+			_addChild(&arg);
+	});
+
+	map<Predicate const*, set<string>> invariants;
+	for (auto pred: _predicates)
+	{
+		auto predName = pred->functor().name;
+		if (!equalities.count(predName))
+			continue;
+
+		solAssert(pred->contextContract(), "");
+
+		auto const& [predExpr, invExpr] = equalities.at(predName);
+
+		static set<string> const ignore{"true", "false"};
+		auto r = substitute(invExpr, pred->expressionSubstitution(predExpr));
+		// No point in reporting true/false as invariants.
+		if (!ignore.count(r.name))
+			invariants[pred].insert(toSolidityStr(r));
+	}
+	return invariants;
+}
+
+}
diff --git a/libsolidity/formal/Invariants.h b/libsolidity/formal/Invariants.h
new file mode 100644
index 0000000000..b6459fccd4
--- /dev/null
+++ b/libsolidity/formal/Invariants.h
@@ -0,0 +1,37 @@
+/*
+	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
+
+#pragma once
+
+#include <libsolidity/formal/ModelCheckerSettings.h>
+#include <libsolidity/formal/Predicate.h>
+
+#include <map>
+#include <set>
+#include <string>
+
+namespace solidity::frontend::smt
+{
+
+std::map<Predicate const*, std::set<std::string>> collectInvariants(
+	smtutil::Expression const& _proof,
+	std::set<Predicate const*> const& _predicates,
+	ModelCheckerInvariants const& _invariantsSettings
+);
+
+}

From bc90533c93626b92598c19c249a84e77dfdc15da Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:50:00 +0200
Subject: [PATCH 0022/1748] Add invariants to ModelCheckerSettings

---
 libsolidity/formal/ModelCheckerSettings.cpp | 34 +++++++++++++++++++++
 libsolidity/formal/ModelCheckerSettings.h   | 27 ++++++++++++++++
 2 files changed, 61 insertions(+)

diff --git a/libsolidity/formal/ModelCheckerSettings.cpp b/libsolidity/formal/ModelCheckerSettings.cpp
index 207894d398..8fe3a21203 100644
--- a/libsolidity/formal/ModelCheckerSettings.cpp
+++ b/libsolidity/formal/ModelCheckerSettings.cpp
@@ -25,6 +25,40 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
+map<string, InvariantType> const ModelCheckerInvariants::validInvariants{
+	{"contract", InvariantType::Contract},
+	{"reentrancy", InvariantType::Reentrancy}
+};
+
+std::optional<ModelCheckerInvariants> ModelCheckerInvariants::fromString(string const& _invs)
+{
+	set<InvariantType> chosenInvs;
+	if (_invs == "default")
+	{
+		// The default is that no invariants are reported.
+	}
+	else if (_invs == "all")
+		for (auto&& v: validInvariants | ranges::views::values)
+			chosenInvs.insert(v);
+	else
+		for (auto&& t: _invs | ranges::views::split(',') | ranges::to<vector<string>>())
+		{
+			if (!validInvariants.count(t))
+				return {};
+			chosenInvs.insert(validInvariants.at(t));
+		}
+
+	return ModelCheckerInvariants{chosenInvs};
+}
+
+bool ModelCheckerInvariants::setFromString(string const& _inv)
+{
+	if (!validInvariants.count(_inv))
+		return false;
+	invariants.insert(validInvariants.at(_inv));
+	return true;
+}
+
 using TargetType = VerificationTargetType;
 map<string, TargetType> const ModelCheckerTargets::targetStrings{
 	{"constantCondition", TargetType::ConstantCondition},
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index a01985fcb1..5623b2a193 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -87,6 +87,31 @@ struct ModelCheckerEngine
 	bool operator==(ModelCheckerEngine const& _other) const noexcept { return bmc == _other.bmc && chc == _other.chc; }
 };
 
+enum class InvariantType { Contract, Reentrancy };
+
+struct ModelCheckerInvariants
+{
+	/// Adds the default targets, that is, all except underflow and overflow.
+	static ModelCheckerInvariants Default() { return *fromString("default"); }
+	/// Adds all targets, including underflow and overflow.
+	static ModelCheckerInvariants All() { return *fromString("all"); }
+
+	static std::optional<ModelCheckerInvariants> fromString(std::string const& _invs);
+
+	bool has(InvariantType _inv) const { return invariants.count(_inv); }
+
+	/// @returns true if the @p _target is valid,
+	/// and false otherwise.
+	bool setFromString(std::string const& _target);
+
+	static std::map<std::string, InvariantType> const validInvariants;
+
+	bool operator!=(ModelCheckerInvariants const& _other) const noexcept { return !(*this == _other); }
+	bool operator==(ModelCheckerInvariants const& _other) const noexcept { return invariants == _other.invariants; }
+
+	std::set<InvariantType> invariants;
+};
+
 enum class VerificationTargetType { ConstantCondition, Underflow, Overflow, UnderOverflow, DivByZero, Balance, Assert, PopEmptyArray, OutOfBounds };
 
 struct ModelCheckerTargets
@@ -123,6 +148,7 @@ struct ModelCheckerSettings
 	/// might prefer the precise encoding.
 	bool divModNoSlacks = false;
 	ModelCheckerEngine engine = ModelCheckerEngine::None();
+	ModelCheckerInvariants invariants = ModelCheckerInvariants::Default();
 	bool showUnproved = false;
 	smtutil::SMTSolverChoice solvers = smtutil::SMTSolverChoice::All();
 	ModelCheckerTargets targets = ModelCheckerTargets::Default();
@@ -135,6 +161,7 @@ struct ModelCheckerSettings
 			contracts == _other.contracts &&
 			divModNoSlacks == _other.divModNoSlacks &&
 			engine == _other.engine &&
+			invariants == _other.invariants &&
 			showUnproved == _other.showUnproved &&
 			solvers == _other.solvers &&
 			targets == _other.targets &&

From 49e7627bd3d2aca5cb6b9ab9f20d8e3a1daa4db1 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:50:41 +0200
Subject: [PATCH 0023/1748] Use invariants in CHC

---
 libsolidity/CMakeLists.txt |  4 +++
 libsolidity/formal/CHC.cpp | 68 +++++++++++++++++++++++++++++++-------
 libsolidity/formal/CHC.h   |  9 +++--
 3 files changed, 66 insertions(+), 15 deletions(-)

diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index a1cb68c35c..7e3791eab0 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -108,6 +108,10 @@ set(sources
 	formal/CHC.h
 	formal/EncodingContext.cpp
 	formal/EncodingContext.h
+	formal/ExpressionFormatter.cpp
+	formal/ExpressionFormatter.h
+	formal/Invariants.cpp
+	formal/Invariants.h
 	formal/ModelChecker.cpp
 	formal/ModelChecker.h
 	formal/ModelCheckerSettings.cpp
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index f0072313b7..b75a975dfe 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -23,6 +23,7 @@
 #endif
 
 #include <libsolidity/formal/ArraySlicePredicate.h>
+#include <libsolidity/formal/Invariants.h>
 #include <libsolidity/formal/PredicateInstance.h>
 #include <libsolidity/formal/PredicateSort.h>
 #include <libsolidity/formal/SymbolicTypes.h>
@@ -32,15 +33,17 @@
 #include <libsmtutil/CHCSmtLib2Interface.h>
 #include <libsolutil/Algorithms.h>
 
-#include <range/v3/algorithm/for_each.hpp>
-
-#include <range/v3/view/enumerate.hpp>
-#include <range/v3/view/reverse.hpp>
-
 #ifdef HAVE_Z3_DLOPEN
 #include <z3_version.h>
 #endif
 
+#include <boost/algorithm/string.hpp>
+
+#include <range/v3/algorithm/for_each.hpp>
+#include <range/v3/view.hpp>
+#include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/reverse.hpp>
+
 #include <charconv>
 #include <queue>
 
@@ -971,6 +974,7 @@ void CHC::resetSourceAnalysis()
 	m_safeTargets.clear();
 	m_unsafeTargets.clear();
 	m_unprovedTargets.clear();
+	m_invariants.clear();
 	m_functionTargetIds.clear();
 	m_verificationTargets.clear();
 	m_queryPlaceholders.clear();
@@ -1128,8 +1132,8 @@ void CHC::defineInterfacesAndSummaries(SourceUnit const& _source)
 		if (auto const* contract = dynamic_cast<ContractDefinition const*>(node.get()))
 		{
 			string suffix = contract->name() + "_" + to_string(contract->id());
-			m_interfaces[contract] = createSymbolicBlock(interfaceSort(*contract, state()), "interface_" + uniquePrefix() + "_" + suffix, PredicateType::Interface, contract);
-			m_nondetInterfaces[contract] = createSymbolicBlock(nondetInterfaceSort(*contract, state()), "nondet_interface_" + uniquePrefix() + "_" + suffix, PredicateType::NondetInterface, contract);
+			m_interfaces[contract] = createSymbolicBlock(interfaceSort(*contract, state()), "interface_" + uniquePrefix() + "_" + suffix, PredicateType::Interface, contract, contract);
+			m_nondetInterfaces[contract] = createSymbolicBlock(nondetInterfaceSort(*contract, state()), "nondet_interface_" + uniquePrefix() + "_" + suffix, PredicateType::NondetInterface, contract, contract);
 			m_constructorSummaries[contract] = createConstructorBlock(*contract, "summary_constructor");
 
 			for (auto const* var: stateVariablesIncludingInheritedAndPrivate(*contract))
@@ -1527,11 +1531,12 @@ void CHC::addRule(smtutil::Expression const& _rule, string const& _ruleName)
 	m_interface->addRule(_rule, _ruleName);
 }
 
-pair<CheckResult, CHCSolverInterface::CexGraph> CHC::query(smtutil::Expression const& _query, langutil::SourceLocation const& _location)
+tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query(smtutil::Expression const& _query, langutil::SourceLocation const& _location)
 {
 	CheckResult result;
+	smtutil::Expression invariant(true);
 	CHCSolverInterface::CexGraph cex;
-	tie(result, cex) = m_interface->query(_query);
+	tie(result, invariant, cex) = m_interface->query(_query);
 	switch (result)
 	{
 	case CheckResult::SATISFIABLE:
@@ -1546,8 +1551,9 @@ pair<CheckResult, CHCSolverInterface::CexGraph> CHC::query(smtutil::Expression c
 			spacer->setSpacerOptions(false);
 
 			CheckResult resultNoOpt;
+			smtutil::Expression invariantNoOpt(true);
 			CHCSolverInterface::CexGraph cexNoOpt;
-			tie(resultNoOpt, cexNoOpt) = m_interface->query(_query);
+			tie(resultNoOpt, invariantNoOpt, cexNoOpt) = m_interface->query(_query);
 
 			if (resultNoOpt == CheckResult::SATISFIABLE)
 				cex = move(cexNoOpt);
@@ -1568,7 +1574,7 @@ pair<CheckResult, CHCSolverInterface::CexGraph> CHC::query(smtutil::Expression c
 		m_errorReporter.warning(1218_error, _location, "CHC: Error trying to invoke SMT solver.");
 		break;
 	}
-	return {result, cex};
+	return {result, invariant, cex};
 }
 
 void CHC::verificationTargetEncountered(
@@ -1715,6 +1721,34 @@ void CHC::checkVerificationTargets()
 			" Consider increasing the timeout per query."
 		);
 
+	if (!m_settings.invariants.invariants.empty())
+	{
+		string msg;
+		for (auto pred: m_invariants | ranges::views::keys)
+		{
+			ASTNode const* node = pred->programNode();
+			string what;
+			if (auto contract = dynamic_cast<ContractDefinition const*>(node))
+				what = contract->fullyQualifiedName();
+			else
+				solAssert(false, "");
+
+			string invType;
+			if (pred->type() == PredicateType::Interface)
+				invType = "Contract invariant(s)";
+			else if (pred->type() == PredicateType::NondetInterface)
+				invType = "Reentrancy property(ies)";
+			else
+				solAssert(false, "");
+
+			msg += invType + " for " + what + ":\n";
+			for (auto const& inv: m_invariants.at(pred))
+				msg += inv + "\n";
+		}
+		if (!msg.empty())
+			m_errorReporter.info(1180_error, msg);
+	}
+
 	// There can be targets in internal functions that are not reachable from the external interface.
 	// These are safe by definition and are not even checked by the CHC engine, but this information
 	// must still be reported safe by the BMC engine.
@@ -1748,9 +1782,19 @@ void CHC::checkAndReportTarget(
 	createErrorBlock();
 	connectBlocks(_target.value, error(), _target.constraints);
 	auto const& location = _target.errorNode->location();
-	auto const& [result, model] = query(error(), location);
+	auto [result, invariant, model] = query(error(), location);
 	if (result == CheckResult::UNSATISFIABLE)
+	{
 		m_safeTargets[_target.errorNode].insert(_target.type);
+		set<Predicate const*> predicates;
+		for (auto const* pred: m_interfaces | ranges::views::values)
+			predicates.insert(pred);
+		for (auto const* pred: m_nondetInterfaces | ranges::views::values)
+			predicates.insert(pred);
+		map<Predicate const*, set<string>> invariants = collectInvariants(invariant, predicates, m_settings.invariants);
+		for (auto pred: invariants | ranges::views::keys)
+			m_invariants[pred] += move(invariants.at(pred));
+	}
 	else if (result == CheckResult::SATISFIABLE)
 	{
 		solAssert(!_satMsg.empty(), "");
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index 24b27c55b9..d9e27a89cc 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -245,9 +245,9 @@ class CHC: public SMTEncoder
 	//@{
 	/// Adds Horn rule to the solver.
 	void addRule(smtutil::Expression const& _rule, std::string const& _ruleName);
-	/// @returns <true, empty> if query is unsatisfiable (safe).
-	/// @returns <false, model> otherwise.
-	std::pair<smtutil::CheckResult, smtutil::CHCSolverInterface::CexGraph> query(smtutil::Expression const& _query, langutil::SourceLocation const& _location);
+	/// @returns <true, invariant, empty> if query is unsatisfiable (safe).
+	/// @returns <false, Expression(true), model> otherwise.
+	std::tuple<smtutil::CheckResult, smtutil::Expression, smtutil::CHCSolverInterface::CexGraph> query(smtutil::Expression const& _query, langutil::SourceLocation const& _location);
 
 	void verificationTargetEncountered(ASTNode const* const _errorNode, VerificationTargetType _type, smtutil::Expression const& _errorCondition);
 
@@ -378,6 +378,9 @@ class CHC: public SMTEncoder
 	std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> m_unsafeTargets;
 	/// Targets not proved.
 	std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> m_unprovedTargets;
+
+	/// Inferred invariants.
+	std::map<Predicate const*, std::set<std::string>, PredicateCompare> m_invariants;
 	//@}
 
 	/// Control-flow.

From d419c30ca67e6a3a95a1ed646f14ea8cc11e551e Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 13 Oct 2021 16:21:12 +0200
Subject: [PATCH 0024/1748] Add errorCode list to invariants report

---
 libsolidity/formal/CHC.cpp                  | 14 ++++++++++++++
 libsolidity/formal/ModelCheckerSettings.cpp | 11 +++++++++++
 libsolidity/formal/ModelCheckerSettings.h   |  2 ++
 3 files changed, 27 insertions(+)

diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index b75a975dfe..bfdb0b4289 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -31,6 +31,7 @@
 #include <libsolidity/ast/TypeProvider.h>
 
 #include <libsmtutil/CHCSmtLib2Interface.h>
+#include <liblangutil/CharStreamProvider.h>
 #include <libsolutil/Algorithms.h>
 
 #ifdef HAVE_Z3_DLOPEN
@@ -1745,6 +1746,19 @@ void CHC::checkVerificationTargets()
 			for (auto const& inv: m_invariants.at(pred))
 				msg += inv + "\n";
 		}
+		if (msg.find("<errorCode>") != string::npos)
+		{
+			set<unsigned> seenErrors;
+			msg += "<errorCode> = 0 -> no errors\n";
+			for (auto const& target: verificationTargets)
+				if (!seenErrors.count(target.errorId))
+				{
+					seenErrors.insert(target.errorId);
+					string loc = string(m_charStreamProvider.charStream(*target.errorNode->location().sourceName).text(target.errorNode->location()));
+					msg += "<errorCode> = " + to_string(target.errorId) + " -> " + ModelCheckerTargets::targetTypeToString.at(target.type) + " at " + loc + "\n";
+
+				}
+		}
 		if (!msg.empty())
 			m_errorReporter.info(1180_error, msg);
 	}
diff --git a/libsolidity/formal/ModelCheckerSettings.cpp b/libsolidity/formal/ModelCheckerSettings.cpp
index 8fe3a21203..274571a154 100644
--- a/libsolidity/formal/ModelCheckerSettings.cpp
+++ b/libsolidity/formal/ModelCheckerSettings.cpp
@@ -71,6 +71,17 @@ map<string, TargetType> const ModelCheckerTargets::targetStrings{
 	{"outOfBounds", TargetType::OutOfBounds}
 };
 
+map<TargetType, string> const ModelCheckerTargets::targetTypeToString{
+	{TargetType::ConstantCondition, "Constant condition"},
+	{TargetType::Underflow, "Underflow"},
+	{TargetType::Overflow, "Overflow"},
+	{TargetType::DivByZero, "Division by zero"},
+	{TargetType::Balance, "Insufficient balance"},
+	{TargetType::Assert, "Assertion failed"},
+	{TargetType::PopEmptyArray, "Empty array pop"},
+	{TargetType::OutOfBounds, "Out of bounds access"}
+};
+
 std::optional<ModelCheckerTargets> ModelCheckerTargets::fromString(string const& _targets)
 {
 	set<TargetType> chosenTargets;
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index 5623b2a193..3d137044a8 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -131,6 +131,8 @@ struct ModelCheckerTargets
 
 	static std::map<std::string, VerificationTargetType> const targetStrings;
 
+	static std::map<VerificationTargetType, std::string> const targetTypeToString;
+
 	bool operator!=(ModelCheckerTargets const& _other) const noexcept { return !(*this == _other); }
 	bool operator==(ModelCheckerTargets const& _other) const noexcept { return targets == _other.targets; }
 

From 3118fb366656a4af2066ab75b77aaefcf2bee25e Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:51:22 +0200
Subject: [PATCH 0025/1748] Add invariants option to CLI and JSON

---
 libsolidity/interface/StandardCompiler.cpp | 23 +++++++++++++++++++++-
 solc/CommandLineParser.cpp                 | 21 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 66f5dc4e54..da28cf29f2 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -445,7 +445,7 @@ std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
 
 std::optional<Json::Value> checkModelCheckerSettingsKeys(Json::Value const& _input)
 {
-	static set<string> keys{"contracts", "divModNoSlacks", "engine", "showUnproved", "solvers", "targets", "timeout"};
+	static set<string> keys{"contracts", "divModNoSlacks", "engine", "invariants", "showUnproved", "solvers", "targets", "timeout"};
 	return checkKeys(_input, keys, "modelChecker");
 }
 
@@ -987,6 +987,27 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.modelCheckerSettings.engine = *engine;
 	}
 
+	if (modelCheckerSettings.isMember("invariants"))
+	{
+		auto const& invariantsArray = modelCheckerSettings["invariants"];
+		if (!invariantsArray.isArray())
+			return formatFatalError("JSONError", "settings.modelChecker.invariants must be an array.");
+
+		ModelCheckerInvariants invariants;
+		for (auto const& i: invariantsArray)
+		{
+			if (!i.isString())
+				return formatFatalError("JSONError", "Every invariant type in settings.modelChecker.invariants must be a string.");
+			if (!invariants.setFromString(i.asString()))
+				return formatFatalError("JSONError", "Invalid model checker invariants requested.");
+		}
+
+		if (invariants.invariants.empty())
+			return formatFatalError("JSONError", "settings.modelChecker.invariants must be a non-empty array.");
+
+		ret.modelCheckerSettings.invariants = invariants;
+	}
+
 	if (modelCheckerSettings.isMember("showUnproved"))
 	{
 		auto const& showUnproved = modelCheckerSettings["showUnproved"];
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 6b1fc1526e..22d92d4630 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -78,6 +78,7 @@ static string const g_strMetadataLiteral = "metadata-literal";
 static string const g_strModelCheckerContracts = "model-checker-contracts";
 static string const g_strModelCheckerDivModNoSlacks = "model-checker-div-mod-no-slacks";
 static string const g_strModelCheckerEngine = "model-checker-engine";
+static string const g_strModelCheckerInvariants = "model-checker-invariants";
 static string const g_strModelCheckerShowUnproved = "model-checker-show-unproved";
 static string const g_strModelCheckerSolvers = "model-checker-solvers";
 static string const g_strModelCheckerTargets = "model-checker-targets";
@@ -801,6 +802,13 @@ General Information)").c_str(),
 			po::value<string>()->value_name("all,bmc,chc,none")->default_value("none"),
 			"Select model checker engine."
 		)
+		(
+			g_strModelCheckerInvariants.c_str(),
+			po::value<string>()->value_name("default,all,contract,reentrancy")->default_value("default"),
+			"Select whether to report inferred contract inductive invariants."
+			" Multiple types of invariants can be selected at the same time, separated by a comma and no spaces."
+			" By default no invariants are reported."
+		)
 		(
 			g_strModelCheckerShowUnproved.c_str(),
 			"Show all unproved targets separately."
@@ -1253,6 +1261,18 @@ bool CommandLineParser::processArgs()
 		m_options.modelChecker.settings.engine = *engine;
 	}
 
+	if (m_args.count(g_strModelCheckerInvariants))
+	{
+		string invsStr = m_args[g_strModelCheckerInvariants].as<string>();
+		optional<ModelCheckerInvariants> invs = ModelCheckerInvariants::fromString(invsStr);
+		if (!invs)
+		{
+			serr() << "Invalid option for --" << g_strModelCheckerInvariants << ": " << invsStr << endl;
+			return false;
+		}
+		m_options.modelChecker.settings.invariants = *invs;
+	}
+
 	if (m_args.count(g_strModelCheckerShowUnproved))
 		m_options.modelChecker.settings.showUnproved = true;
 
@@ -1288,6 +1308,7 @@ bool CommandLineParser::processArgs()
 		m_args.count(g_strModelCheckerContracts) ||
 		m_args.count(g_strModelCheckerDivModNoSlacks) ||
 		m_args.count(g_strModelCheckerEngine) ||
+		m_args.count(g_strModelCheckerInvariants) ||
 		m_args.count(g_strModelCheckerShowUnproved) ||
 		m_args.count(g_strModelCheckerSolvers) ||
 		m_args.count(g_strModelCheckerTargets) ||

From 37215ffcfdb0889bffd1cde4b2bbb472394484d8 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:51:55 +0200
Subject: [PATCH 0026/1748] Add SMTCheckerTest isoltest option to ignore
 invariants

---
 libsolidity/formal/ModelCheckerSettings.h |  1 +
 test/libsolidity/SMTCheckerTest.cpp       | 10 ++++++++++
 test/libsolidity/SMTCheckerTest.h         |  2 ++
 3 files changed, 13 insertions(+)

diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index 3d137044a8..e3e93fcf40 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -95,6 +95,7 @@ struct ModelCheckerInvariants
 	static ModelCheckerInvariants Default() { return *fromString("default"); }
 	/// Adds all targets, including underflow and overflow.
 	static ModelCheckerInvariants All() { return *fromString("all"); }
+	static ModelCheckerInvariants None() { return {{}}; }
 
 	static std::optional<ModelCheckerInvariants> fromString(std::string const& _invs);
 
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 5606b0bfe3..3b6b8e1b80 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -19,6 +19,8 @@
 #include <test/libsolidity/SMTCheckerTest.h>
 #include <test/Common.h>
 
+#include <range/v3/action/remove_if.hpp>
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
@@ -67,6 +69,14 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	else
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT counterexample choice."));
 
+	auto const& ignoreInv = m_reader.stringSetting("SMTIgnoreInv", "no");
+	if (ignoreInv == "no")
+		m_modelCheckerSettings.invariants = ModelCheckerInvariants::All();
+	else if (ignoreInv == "yes")
+		m_modelCheckerSettings.invariants = ModelCheckerInvariants::None();
+	else
+		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT invariant choice."));
+
 	auto const& ignoreOSSetting = m_reader.stringSetting("SMTIgnoreOS", "none");
 	for (string const& os: ignoreOSSetting | ranges::views::split(',') | ranges::to<vector<string>>())
 	{
diff --git a/test/libsolidity/SMTCheckerTest.h b/test/libsolidity/SMTCheckerTest.h
index 9cc4e57519..54d23c74fb 100644
--- a/test/libsolidity/SMTCheckerTest.h
+++ b/test/libsolidity/SMTCheckerTest.h
@@ -49,6 +49,8 @@ class SMTCheckerTest: public SyntaxTest
 		Set in m_modelCheckerSettings.
 	SMTIgnoreCex: `yes`, `no`, where the default is `no`.
 		Set in m_ignoreCex.
+	SMTIgnoreInv: `yes`, `no`, where the default is `no`.
+		Set in m_modelCheckerSettings.
 	SMTShowUnproved: `yes`, `no`, where the default is `yes`.
 		Set in m_modelCheckerSettings.
 	SMTSolvers: `all`, `cvc4`, `z3`, `none`, where the default is `all`.

From a104443ac1a3f811c83157d7b1dc296c787e7ae2 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:52:16 +0200
Subject: [PATCH 0027/1748] Adjust errors script to also look for infos

---
 scripts/error_codes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 9290211a28..fe9c73b04b 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -125,7 +125,7 @@ def find_files(top_dir, sub_dirs, extensions):
 
 def find_ids_in_test_file(file_name):
     source = read_file(file_name)
-    pattern = r"^// (.*Error|Warning) \d\d\d\d:"
+    pattern = r"^// (.*Error|Warning|Info) \d\d\d\d:"
     return {m.group(0)[-5:-1] for m in re.finditer(pattern, source, flags=re.MULTILINE)}
 
 

From 2cbd496576ec790d9a1fec89d140c385d60c6009 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:52:44 +0200
Subject: [PATCH 0028/1748] Adjust ModelCheckerSettings in tools tests

---
 test/solc/CommandLineParser.cpp | 4 ++++
 test/tools/fuzzer_common.cpp    | 1 +
 2 files changed, 5 insertions(+)

diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 3b2998ce12..663bf022c6 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -149,6 +149,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			"--model-checker-contracts=contract1.yul:A,contract2.yul:B",
 			"--model-checker-div-mod-no-slacks",
 			"--model-checker-engine=bmc",
+			"--model-checker-invariants=contract,reentrancy",
 			"--model-checker-show-unproved",
 			"--model-checker-solvers=z3,smtlib2",
 			"--model-checker-targets=underflow,divByZero",
@@ -212,6 +213,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			{{{"contract1.yul", {"A"}}, {"contract2.yul", {"B"}}}},
 			true,
 			{true, false},
+			{{InvariantType::Contract, InvariantType::Reentrancy}},
 			true,
 			{false, true, true},
 			{{VerificationTargetType::Underflow, VerificationTargetType::DivByZero}},
@@ -285,6 +287,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 				"contract2.yul:B",
 			"--model-checker-div-mod-no-slacks", // Ignored in assembly mode
 			"--model-checker-engine=bmc",  // Ignored in assembly mode
+			"--model-checker-invariants=contract,reentrancy",  // Ignored in assembly mode
 			"--model-checker-show-unproved", // Ignored in assembly mode
 			"--model-checker-solvers=z3,smtlib2", // Ignored in assembly mode
 			"--model-checker-targets="     // Ignored in assembly mode
@@ -375,6 +378,7 @@ BOOST_AUTO_TEST_CASE(standard_json_mode_options)
 			"contract2.yul:B",
 		"--model-checker-div-mod-no-slacks", // Ignored in Standard JSON mode
 		"--model-checker-engine=bmc",      // Ignored in Standard JSON mode
+		"--model-checker-invariants=contract,reentrancy",      // Ignored in Standard JSON mode
 		"--model-checker-show-unproved",      // Ignored in Standard JSON mode
 		"--model-checker-solvers=z3,smtlib2", // Ignored in Standard JSON mode
 		"--model-checker-targets="         // Ignored in Standard JSON mode
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 332b9fc04d..82066bf527 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -106,6 +106,7 @@ void FuzzerUtil::testCompiler(
 			frontend::ModelCheckerContracts::Default(),
 			/*divModWithSlacks*/true,
 			frontend::ModelCheckerEngine::All(),
+			frontend::ModelCheckerInvariants::All(),
 			/*showUnproved=*/false,
 			smtutil::SMTSolverChoice::All(),
 			frontend::ModelCheckerTargets::Default(),

From 38b0cf7f9cbb29761c0cbc8d5f197daeeb094047 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:53:03 +0200
Subject: [PATCH 0029/1748] SMTChecker tests

---
 .../array_members/array_push_string_literal.sol                | 3 ++-
 .../length_1d_assignment_2d_storage_to_storage.sol             | 2 ++
 .../array_members/length_1d_copy_2d_storage_to_memory.sol      | 1 +
 .../array_members/length_1d_mapping_array_1.sol                | 1 +
 .../smtCheckerTests/array_members/length_1d_struct_array_1.sol | 1 +
 .../array_members/length_1d_struct_array_2d_1.sol              | 1 +
 .../smtCheckerTests/array_members/length_function_call.sol     | 1 +
 .../array_members/length_same_after_assignment.sol             | 1 +
 .../array_members/length_same_after_assignment_2.sol           | 1 +
 .../array_members/length_same_after_assignment_2_fail.sol      | 1 +
 .../array_members/length_same_after_assignment_3.sol           | 1 +
 .../array_members/length_same_after_assignment_3_fail.sol      | 2 ++
 .../smtCheckerTests/array_members/push_as_lhs_1d.sol           | 2 +-
 .../smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol   | 3 ++-
 .../smtCheckerTests/array_members/push_overflow_1_safe.sol     | 1 +
 .../push_overflow_1_safe_no_overflow_assumption.sol            | 1 +
 .../push_overflow_2_safe_no_overflow_assumption.sol            | 2 ++
 .../smtCheckerTests/array_members/push_push_no_args_2_fail.sol | 1 +
 .../array_members/push_storage_ref_unsafe_aliasing.sol         | 1 +
 .../smtCheckerTests/blockchain_state/balance_non_zero_2.sol    | 1 +
 .../smtCheckerTests/blockchain_state/balance_receive.sol       | 1 +
 .../smtCheckerTests/blockchain_state/balance_receive_2.sol     | 1 +
 .../smtCheckerTests/blockchain_state/balance_receive_4.sol     | 3 ++-
 .../smtCheckerTests/blockchain_state/balance_receive_5.sol     | 1 +
 .../smtCheckerTests/blockchain_state/balance_receive_calls.sol | 2 ++
 .../blockchain_state/balance_receive_ext_calls.sol             | 1 +
 .../blockchain_state/balance_receive_ext_calls_2.sol           | 1 +
 .../blockchain_state/balance_receive_ext_calls_mutex.sol       | 1 +
 .../smtCheckerTests/blockchain_state/balance_spend.sol         | 1 +
 .../smtCheckerTests/blockchain_state/free_function_1.sol       | 2 ++
 .../smtCheckerTests/blockchain_state/free_function_2.sol       | 1 +
 .../smtCheckerTests/blockchain_state/library_internal_1.sol    | 2 ++
 .../smtCheckerTests/blockchain_state/library_internal_2.sol    | 1 +
 .../smtCheckerTests/blockchain_state/this_does_not_change.sol  | 2 ++
 .../blockchain_state/this_does_not_change_external_call.sol    | 2 ++
 .../blockchain_state/this_does_not_change_internal_call.sol    | 1 +
 .../control_flow/branches_inside_modifiers_1.sol               | 1 +
 .../control_flow/branches_inside_modifiers_2.sol               | 1 +
 .../control_flow/branches_inside_modifiers_3.sol               | 1 +
 .../control_flow/branches_inside_modifiers_4.sol               | 1 +
 .../branches_with_return/branches_in_modifiers.sol             | 1 +
 .../branches_with_return/branches_in_modifiers_2.sol           | 2 +-
 .../control_flow/branches_with_return/triple_nested_if.sol     | 1 +
 .../crypto_functions_same_input_over_state_same_output.sol     | 1 +
 test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol | 1 +
 .../smtCheckerTests/external_calls/call_reentrancy_view.sol    | 2 ++
 test/libsolidity/smtCheckerTests/external_calls/call_safe.sol  | 1 +
 test/libsolidity/smtCheckerTests/external_calls/external.sol   | 1 +
 .../external_calls/external_call_from_constructor_2.sol        | 1 +
 .../smtCheckerTests/external_calls/external_hash.sol           | 1 +
 .../external_calls/external_hash_known_code_pure.sol           | 1 +
 .../external_calls/external_hash_known_code_state.sol          | 1 +
 .../external_hash_known_code_state_reentrancy_2.sol            | 2 ++
 .../external_hash_known_code_state_reentrancy_3.sol            | 1 +
 .../smtCheckerTests/external_calls/external_reentrancy_3.sol   | 2 ++
 .../external_calls/external_reentrancy_crypto.sol              | 1 +
 .../smtCheckerTests/external_calls/external_safe.sol           | 1 +
 test/libsolidity/smtCheckerTests/external_calls/mutex.sol      | 1 +
 .../smtCheckerTests/external_calls/staticcall_mutex.sol        | 1 +
 .../smtCheckerTests/external_calls/staticcall_mutex_2.sol      | 1 +
 .../external_calls/staticcall_reentrancy_view.sol              | 1 +
 .../smtCheckerTests/functions/functions_external_1.sol         | 2 ++
 .../smtCheckerTests/functions/functions_external_2.sol         | 2 ++
 .../smtCheckerTests/functions/functions_external_3.sol         | 1 +
 .../functions/functions_identifier_nested_tuple_1.sol          | 1 +
 .../smtCheckerTests/functions/functions_recursive_indirect.sol | 1 +
 test/libsolidity/smtCheckerTests/functions/getters/array_1.sol | 1 +
 test/libsolidity/smtCheckerTests/functions/getters/array_2.sol | 1 +
 .../smtCheckerTests/functions/getters/array_of_structs_1.sol   | 1 +
 .../functions/getters/nested_arrays_mappings_1.sol             | 1 +
 .../functions/getters/nested_arrays_mappings_10.sol            | 1 +
 .../functions/getters/nested_arrays_mappings_2.sol             | 1 +
 .../functions/getters/nested_arrays_mappings_3.sol             | 1 +
 .../functions/getters/nested_arrays_mappings_4.sol             | 1 +
 .../functions/getters/nested_arrays_mappings_5.sol             | 1 +
 .../functions/getters/nested_arrays_mappings_6.sol             | 1 +
 .../functions/getters/nested_arrays_mappings_7.sol             | 1 +
 .../functions/getters/nested_arrays_mappings_8.sol             | 1 +
 .../functions/getters/nested_arrays_mappings_9.sol             | 1 +
 .../smtCheckerTests/functions/getters/static_array.sol         | 1 +
 .../libsolidity/smtCheckerTests/functions/getters/struct_3.sol | 1 +
 .../functions/internal_call_with_assertion_1.sol               | 2 ++
 .../functions/internal_call_with_assertion_1_fail.sol          | 1 +
 .../functions/internal_multiple_calls_with_assertion_1.sol     | 1 +
 .../internal_multiple_calls_with_assertion_1_fail.sol          | 1 +
 .../smtCheckerTests/functions/super_function_assert.sol        | 1 +
 test/libsolidity/smtCheckerTests/functions/this_state.sol      | 1 +
 .../smtCheckerTests/functions/virtual_function_assert.sol      | 1 +
 .../functions/virtual_function_called_by_constructor.sol       | 2 ++
 .../inheritance/base_contract_assertion_fail_1.sol             | 1 +
 .../inheritance/base_contract_assertion_fail_9.sol             | 1 +
 .../inheritance/constructor_uses_function_base.sol             | 1 +
 .../smtCheckerTests/inheritance/diamond_super_3.sol            | 1 +
 .../inheritance/implicit_constructor_hierarchy.sol             | 1 +
 .../inheritance/implicit_only_constructor_hierarchy.sol        | 1 +
 .../libsolidity/smtCheckerTests/invariants/state_machine_1.sol | 1 +
 .../modifier_inside_branch_assignment_multi_branches.sol       | 1 +
 .../smtCheckerTests/modifiers/modifier_overflow.sol            | 1 +
 .../smtCheckerTests/modifiers/modifier_overriding_4.sol        | 1 +
 .../smtCheckerTests/modifiers/modifier_two_invocations_2.sol   | 1 +
 .../modifiers/modifier_virtual_static_call_2.sol               | 1 +
 .../natspec/safe_assert_false_positive_pure.sol                | 1 +
 .../operators/assignment_contract_member_variable.sol          | 1 +
 .../operators/assignment_contract_member_variable_array.sol    | 1 +
 .../operators/assignment_contract_member_variable_array_3.sol  | 1 +
 .../operators/assignment_module_contract_member_variable.sol   | 1 +
 .../smtCheckerTests/operators/compound_bitwise_or_uint_2.sol   | 1 +
 .../smtCheckerTests/operators/conditional_assignment_6.sol     | 2 ++
 test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol | 1 +
 .../smtCheckerTests/operators/delete_array_index.sol           | 1 +
 .../smtCheckerTests/operators/delete_array_index_2d.sol        | 1 +
 test/libsolidity/smtCheckerTests/operators/delete_function.sol | 1 +
 .../smtCheckerTests/operators/index_access_side_effect.sol     | 1 +
 .../smtCheckerTests/operators/unary_add_array_push_2.sol       | 1 +
 test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol     | 3 +++
 test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol     | 1 +
 .../smtCheckerTests/overflow/signed_guard_sub_overflow.sol     | 1 +
 test/libsolidity/smtCheckerTests/special/msg_value_3.sol       | 1 +
 .../smtCheckerTests/special/msg_vars_chc_internal.sol          | 3 ++-
 test/libsolidity/smtCheckerTests/try_catch/try_4.sol           | 1 +
 test/libsolidity/smtCheckerTests/try_catch/try_5.sol           | 1 +
 .../smtCheckerTests/try_catch/try_multiple_returned_values.sol | 1 +
 .../smtCheckerTests/try_catch/try_public_var_mapping.sol       | 2 ++
 test/libsolidity/smtCheckerTests/typecast/address_literal.sol  | 1 +
 test/libsolidity/smtCheckerTests/types/address_call.sol        | 2 ++
 test/libsolidity/smtCheckerTests/types/address_staticcall.sol  | 1 +
 .../smtCheckerTests/types/array_aliasing_memory_3.sol          | 1 +
 test/libsolidity/smtCheckerTests/types/array_branch_3d.sol     | 1 +
 test/libsolidity/smtCheckerTests/types/array_branches_3d.sol   | 1 +
 .../smtCheckerTests/types/array_branches_3d_show_unproved.sol  | 1 +
 .../smtCheckerTests/types/array_mapping_aliasing_2.sol         | 1 +
 .../smtCheckerTests/types/array_static_mapping_aliasing_1.sol  | 1 +
 .../smtCheckerTests/types/array_static_mapping_aliasing_2.sol  | 1 +
 .../libsolidity/smtCheckerTests/types/enum_explicit_values.sol | 1 +
 .../libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol | 1 +
 .../libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol | 3 +++
 test/libsolidity/smtCheckerTests/types/mapping_4.sol           | 1 +
 .../smtCheckerTests/types/static_array_length_5.sol            | 1 +
 .../smtCheckerTests/types/struct/struct_state_constructor.sol  | 1 +
 .../libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol | 1 +
 test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol       | 3 +++
 141 files changed, 169 insertions(+), 6 deletions(-)

diff --git a/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol b/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol
index 55b2160c44..5ed512278b 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol
@@ -13,6 +13,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
-// Warning 6328: (139-161): CHC: Assertion violation happens here.
+// Warning 6328: (139-161): CHC: Assertion violation happens here.\nCounterexample:\ndata = [0x62]\n\nTransaction trace:\nC.constructor()\nState: data = []\nC.g()
 // Warning 6328: (263-290): CHC: Assertion violation happens here.\nCounterexample:\ndata = [0x01]\n\nTransaction trace:\nC.constructor()\nState: data = []\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol
index 4796e3a817..2940383991 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol
@@ -16,4 +16,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 0)\n!(arr2.length <= 0)\n(((arr.length + ((- 1) * arr2.length)) <= 0) && ((arr2.length + ((- 1) * arr.length)) <= 0))\n(((arr2[0].length + ((- 1) * arr[0].length)) >= 0) && ((arr2[0].length + ((- 1) * arr[0].length)) <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol
index 5ad65991a2..468f34257a 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol
@@ -17,3 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol
index c6e695f243..48e0f73bf2 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol
@@ -7,3 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(true && (map[1].length <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol
index 3ab2187411..833caa24f8 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol
@@ -11,3 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(((s1.arr.length + ((- 1) * s2.arr.length)) >= 0) && ((s1.arr.length + ((- 1) * s2.arr.length)) <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
index cd9b6690d5..71571d9448 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
@@ -21,3 +21,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(s1.arr.length <= 0)\n!(s2.arr.length <= 0)\n(((s2.arr[0].length + ((- 1) * s1.arr[0].length)) <= 0) && ((s1.arr[0].length + ((- 1) * s2.arr[0].length)) <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol b/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol
index a51c7aa7d6..c96d53047c 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(arr.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol
index 5756c7affc..4f1cf701b4 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol
@@ -15,3 +15,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol
index 525c704e11..66dad84128 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol
@@ -23,3 +23,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 2)\n!(arr.length <= 3)\n!(arr[2].length <= 3)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
index 086224a11d..0023906fef 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
@@ -27,3 +27,4 @@ contract C {
 // Warning 6328: (291-317): CHC: Assertion violation happens here.
 // Warning 6328: (321-347): CHC: Assertion violation happens here.
 // Warning 6328: (351-374): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 2)\n!(arr.length <= 3)\n!(arr[2].length <= 3)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol
index 78a020e056..caafcbd397 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol
@@ -28,3 +28,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 7)\n!(arr.length <= 8)\n((arr[5].length <= 0) && (arr[8].length <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
index f4d5c889c6..062b668c38 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
@@ -25,8 +25,10 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (319-345): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
 // Warning 6328: (349-375): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
 // Warning 6328: (379-402): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
 // Warning 6328: (406-432): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 3)\n!(arr.length <= 5)\n!(arr.length <= 7)\n!(arr.length <= 8)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
index 5920a4e747..30f194eb7c 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
@@ -18,4 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (199-229): CHC: Assertion violation happens here.\nCounterexample:\nb = [1]\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.g()
+// Warning 6328: (199-229): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
index 6b23ac1d4a..ad3ba78234 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
@@ -12,5 +12,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
-// Warning 6328: (204-230): CHC: Assertion violation happens here.
+// Warning 6328: (204-230): CHC: Assertion violation happens here.\nCounterexample:\nb = [0, 0]\nlength = 2\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol
index 0a440e7a41..930736ce8d 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol
@@ -8,4 +8,5 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreInv: yes
 // ----
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol
index 6992ca1e40..9cc3f2e375 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(!((x[x.length] := 23)[0] >= 43) && !((x[x.length] := 23)[0] <= 41))\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
index 1b241745a1..60b11c91a6 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
@@ -11,4 +11,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(x.length >= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
index c29c34f626..dcda253ce4 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
@@ -10,6 +10,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (90-116): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[[0]]]\nlast = 0\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
 // Warning 6328: (170-186): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
index 43eebddcfb..87b9d92bf3 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
@@ -12,6 +12,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6368: (188-192): CHC: Out of bounds access happens here.\nCounterexample:\na = []\nb = [32]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
 // Warning 6368: (188-195): CHC: Out of bounds access happens here.\nCounterexample:\n\nb = [32]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol
index 100f11066e..f88eab0bf4 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol
@@ -11,3 +11,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (153-188): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor(){ msg.value: 101 }\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n!((:var 0).balances[address(this)] <= 100)\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol
index ea5947d01e..fc4719cefd 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol
@@ -16,3 +16,4 @@ contract C {
 // ----
 // Warning 6328: (132-188): CHC: Assertion violation happens here.
 // Warning 6328: (269-324): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n((prevBalance + ((- 1) * (:var 1).balances[address(this)])) <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
index c561179ec1..c4714e2e3b 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
@@ -17,3 +17,4 @@ contract C {
 // ----
 // Warning 4984: (266-272): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639926, once = true\n\nTransaction trace:\nC.constructor(){ msg.value: 28100 }\nState: x = 115792089237316195423570985008687907853269984665640564039457584007913129639926, once = false\nC.f(){ msg.value: 8 }
 // Warning 6328: (235-273): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, once = true\n\nTransaction trace:\nC.constructor(){ msg.value: 0 }\nState: x = 0, once = false\nC.f(){ msg.value: 8 }
+// Info 1180: Contract invariant(s) for :C:\nonce\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
index 183e60d95e..e8f750d07a 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
@@ -15,7 +15,8 @@ contract C {
 // Warning 4984: (82-85): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (154-160): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (212-218): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (180-219): CHC: Assertion violation happens here.\nCounterexample:\nc = 1\n\nTransaction trace:\nC.constructor()\nState: c = 0\nC.f(){ msg.value: 11 }\nState: c = 1\nC.inv()
+// Warning 6328: (180-219): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n(((11 * c) + ((- 1) * (:var 1).balances[address(this)])) <= 0)\n
 // Warning 2661: (82-85): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (154-160): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (212-218): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol
index e703c65c38..1885a60c81 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol
@@ -12,3 +12,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (122-158): CHC: Assertion violation happens here.\nCounterexample:\nsum = 0\n\nTransaction trace:\nC.constructor()\nState: sum = 0\nC.inv()
+// Info 1180: Contract invariant(s) for :C:\n((sum + ((- 1) * (:var 1).balances[address(this)])) <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol
index 3bc5699978..263a90b08d 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol
@@ -20,7 +20,9 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (173-208): CHC: Assertion violation happens here.\nCounterexample:\nonce = true\n\nTransaction trace:\nC.constructor()\nState: once = false\nC.f(){ msg.value: 10 }
 // Warning 6328: (321-356): CHC: Assertion violation happens here.\nCounterexample:\nonce = true\n\nTransaction trace:\nC.constructor()\nState: once = false\nC.f(){ msg.value: 10 }\n    C.g() -- internal call
 // Warning 6328: (469-504): CHC: Assertion violation happens here.\nCounterexample:\nonce = true\n\nTransaction trace:\nC.constructor()\nState: once = false\nC.f(){ msg.value: 10 }\n    C.g() -- internal call\n        C.h() -- internal call
+// Info 1180: Contract invariant(s) for :C:\n((:var 1).balances[address(this)] >= 0)\nonce\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
index 6144056a89..e46dfda34b 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
@@ -15,4 +15,5 @@ contract C {
 // ----
 // Warning 1218: (131-165): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (131-165): CHC: Assertion violation might happen here.
+// Info 1180: Reentrancy property(ies) for :C:\n(!(<errorCode> >= 2) && (((:var 0).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) >= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
 // Warning 4661: (131-165): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
index e0da57fb29..28c4734bd4 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
@@ -12,3 +12,4 @@ contract C {
 // ----
 // Warning 9302: (82-93): Return value of low-level calls not used.
 // Warning 6328: (97-131): CHC: Assertion violation happens here.
+// Info 1180: Reentrancy property(ies) for :C:\n((((:var 1).balances[address(this)] + ((- 1) * (:var 0).balances[address(this)])) <= 0) && !(<errorCode> >= 2))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
index 59c1234295..559f67e193 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
@@ -22,3 +22,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (277-310): CHC: Assertion violation happens here.
+// Info 1180: Reentrancy property(ies) for :C:\n((!lock || (((:var 3).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) <= 0)) && !(<errorCode> = 1) && (lock' || !lock) && (!lock || (((:var 3).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) >= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance < x)\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
index 72755cc35d..1e4ec7a32a 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
@@ -19,4 +19,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (280-314): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n((!(c <= 1) || !((:var 1).balances[address(this)] <= 91)) && !((:var 1).balances[address(this)] <= 82) && (!(c <= 0) || !((:var 1).balances[address(this)] <= 100)))\n
 // Warning 1236: (175-190): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol
index 9b40afa2e2..260d3c942b 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol
@@ -13,3 +13,5 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// ----
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
index 6c3d120260..50081bc5aa 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
@@ -20,4 +20,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (258-274): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
 // Warning 1236: (33-46): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol
index 4f7497625f..9df3aa27a0 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol
@@ -16,3 +16,5 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// ----
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
index 8fca1916fb..f32652da97 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
@@ -23,4 +23,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (315-331): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
 // Warning 1236: (87-100): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol
index 7e233950c2..0b66b27919 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol
@@ -9,4 +9,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(((address(this) + ((- 1) * t)) <= 0) && ((address(this) + ((- 1) * t)) >= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
index f3abd33c9d..0b5136dcab 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
@@ -16,4 +16,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(((address(this) + ((- 1) * t)) <= 0) && ((address(this) + ((- 1) * t)) >= 0))\nReentrancy property(ies) for :C:\n((!(<errorCode> >= 2) || !((t + ((- 1) * address(this))) = 0)) && (!((t + ((- 1) * address(this))) <= 0) || ((t' + ((- 1) * address(this))) <= 0)) && (!((t + ((- 1) * address(this))) >= 0) || ((address(this) + ((- 1) * t')) <= 0)))\n(((<errorCode> <= 0) || !((t + ((- 1) * address(this))) = 0)) && (!((t + ((- 1) * address(this))) <= 0) || ((t' + ((- 1) * address(this))) <= 0)) && (!((t + ((- 1) * address(this))) >= 0) || ((address(this) + ((- 1) * t')) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this) == t)\n<errorCode> = 2 -> Assertion failed at assert(a == t)\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol
index 3c7b1214ed..0ffe434693 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol
@@ -14,3 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(((t + ((- 1) * address(this))) >= 0) && ((t + ((- 1) * address(this))) <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
index 0976371681..21f1f5c7f2 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (327-341): CHC: Assertion violation happens here.\nCounterexample:\nx = 7\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
+// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 7))\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
index 458c78081b..bf1da4275e 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (333-347): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
+// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 3))\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
index b8323501cd..ace158bb9f 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (326-340): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
+// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 3))\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
index 81f8b3d7cb..44910fa62c 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
@@ -24,3 +24,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (333-347): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 7))\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
index aa8199cd0a..32d647762d 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
@@ -24,3 +24,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (70-84): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.test()
+// Info 1180: Contract invariant(s) for :C:\n(x = 0)\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
index 4241fa9e29..9765fc1f91 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
@@ -44,5 +44,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.test()\n    C.reset_if_overflow() -- internal call
-// Warning 6328: (502-519): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\noldx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(1)\nState: x = 1\nC.test()\n    C.reset_if_overflow() -- internal call
+// Warning 6328: (502-519): CHC: Assertion violation happens here.
 // Warning 6328: (615-629): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(10)\nState: x = 10\nC.test()\n    C.reset_if_overflow() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
index 9ca87a4b07..09ee2b2b24 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
@@ -18,3 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n((c <= 0) && (a <= 0) && (b <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
index aae296695a..228f9d5809 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
@@ -37,3 +37,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(((erc + ((- 1) * ecrecover(tuple_constructor(h, v, r, s)))) <= 0) && ((erc + ((- 1) * ecrecover(tuple_constructor(h, v, r, s)))) >= 0))\n(((kec + ((- 1) * keccak256(data))) >= 0) && ((kec + ((- 1) * keccak256(data))) <= 0))\n(((rip + ((- 1) * ripemd160(data))) <= 0) && ((rip + ((- 1) * ripemd160(data))) >= 0))\n(((sha + ((- 1) * sha256(data))) <= 0) && ((sha + ((- 1) * sha256(data))) >= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
index 4352a7e95b..a310939246 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 9302: (218-234): Return value of low-level calls not used.
+// Info 1180: Reentrancy property(ies) for :C:\n((!lock || ((x' + ((- 1) * x)) = 0)) && (<errorCode> <= 0) && (lock' || !lock))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
index 69c2e29532..f0f844fff3 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
@@ -10,7 +10,9 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 2519: (106-112): This declaration shadows an existing declaration.
 // Warning 2072: (106-112): Unused local variable.
 // Warning 2072: (114-131): Unused local variable.
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && ((<errorCode> <= 0) || !(x <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
index 33791dd0d5..09d3a25922 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
@@ -10,3 +10,4 @@ contract C {
 // ----
 // Warning 2072: (57-63): Unused local variable.
 // Warning 2072: (65-82): Unused local variable.
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && ((<errorCode> <= 0) || !(x <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external.sol b/test/libsolidity/smtCheckerTests/external_calls/external.sol
index 8dd0f404a2..659329e0b8 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external.sol
@@ -18,3 +18,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (167-181): CHC: Assertion violation happens here.
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Overflow at ++x\n<errorCode> = 3 -> Assertion failed at assert(x < 10)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
index cfd56271ba..3fbdd8511b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
@@ -14,3 +14,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (87-101): CHC: Assertion violation happens here.\nCounterexample:\nz = 2\n_x = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: z = 2\nC.g(0)
+// Info 1180: Contract invariant(s) for :C:\n(!(z >= 3) && !(z <= 1))\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
index 3464874c85..8f5b162a0d 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
@@ -28,3 +28,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (390-412): CHC: Assertion violation happens here.
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(sig_1 == sig_2)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
index e1273a2997..2e837478d8 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
@@ -30,3 +30,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (398-420): CHC: Assertion violation happens here.
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(sig_1 == sig_2)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
index ecf7ff5adf..317400e1d1 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
@@ -36,3 +36,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (495-532): CHC: Assertion violation happens here.
+// Info 1180: Reentrancy property(ies) for :C:\n(((owner + ((- 1) * owner')) >= 0) && !(<errorCode> = 1) && ((owner + ((- 1) * owner')) <= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(owner == address(0) || y != z)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
index a90e87cb3d..be9f698e15 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
@@ -38,6 +38,8 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreInv: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 2018: (33-88): Function state mutability can be restricted to view
 // Warning 6328: (367-381): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
index 83ab8873b3..e5259c6c44 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
@@ -41,3 +41,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n((insidef || (z <= 0)) && (y <= 0))\nReentrancy property(ies) for :C:\n((!insidef || !(<errorCode> >= 2)) && (!(y <= 0) || (y' <= 0)) && (insidef' || !insidef))\n((!insidef || !(<errorCode> >= 3)) && (insidef' || !insidef))\n<errorCode> = 0 -> no errors\n<errorCode> = 2 -> Assertion failed at assert(z == y)\n<errorCode> = 3 -> Assertion failed at assert(prevOwner == owner)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
index ff2cd7c857..590133a784 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
@@ -28,5 +28,7 @@ contract C is A {
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTIgnoreInv: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (154-168): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
index 98f6d80be7..627f797630 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
@@ -28,4 +28,5 @@ contract C {
 // ----
 // Warning 1218: (302-333): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (302-333): CHC: Assertion violation might happen here.
+// Info 1180: Contract invariant(s) for :C:\n(((kec + ((- 1) * keccak256(data))) >= 0) && ((kec + ((- 1) * keccak256(data))) <= 0))\nReentrancy property(ies) for :C:\n((!((kec + ((- 1) * keccak256(data))) >= 0) || ((kec' + ((- 1) * keccak256(data'))) >= 0)) && (!((kec + ((- 1) * keccak256(data))) <= 0) || ((kec' + ((- 1) * keccak256(data'))) <= 0)))\n((!(<errorCode> = 1) || !((kec + ((- 1) * keccak256(data))) = 0)) && (!((kec + ((- 1) * keccak256(data))) <= 0) || ((kec' + ((- 1) * keccak256(data'))) <= 0)) && (!((kec + ((- 1) * keccak256(data))) >= 0) || ((kec' + ((- 1) * keccak256(data'))) >= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(_kec == kec)\n<errorCode> = 2 -> Assertion failed at assert(kec == keccak256(_data))\n
 // Warning 4661: (302-333): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
index a2b0f1363c..5921189b7a 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
@@ -17,3 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(x >= 11)\nReentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!(x <= 10) || !(<errorCode> >= 3)) && (!(x <= 10) || !(x' >= 11)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Overflow at ++x\n<errorCode> = 3 -> Assertion failed at assert(x < 11)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/mutex.sol
index 977115ec01..79b5ac1538 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/mutex.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/mutex.sol
@@ -26,4 +26,5 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreInv: yes
 // ----
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
index 30f4392c54..b7fa571972 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 9302: (218-240): Return value of low-level calls not used.
+// Info 1180: Reentrancy property(ies) for :C:\n((!lock || (<errorCode> <= 0)) && (lock' || !lock))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
index bccf18caf2..f87cf5f743 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
@@ -24,3 +24,4 @@ contract C {
 // ----
 // Warning 9302: (212-234): Return value of low-level calls not used.
 // Warning 2018: (164-271): Function state mutability can be restricted to view
+// Info 1180: Reentrancy property(ies) for :C:\n(<errorCode> <= 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
index 96a73cb5d3..ee9e571890 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
@@ -15,3 +15,4 @@ contract C {
 // Warning 2072: (106-112): Unused local variable.
 // Warning 2072: (114-131): Unused local variable.
 // Warning 2018: (72-188): Function state mutability can be restricted to view
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
index 6887c00db6..ace2d56f29 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
@@ -16,4 +16,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!(x <= 0) || !(<errorCode> >= 2)) && (!(x <= 0) || (x' <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == y)\n<errorCode> = 2 -> Assertion failed at assert(x == y)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
index bc2fa2dc35..5efcb2da1b 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
@@ -22,5 +22,7 @@ contract C
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (234-253): CHC: Assertion violation happens here.
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!((map[1] + ((- 1) * map[0])) <= 0) || ((map'[1] + ((- 1) * map'[0])) <= 0)) && !(<errorCode> = 2) && (!((map[1] + ((- 1) * map[0])) >= 0) || ((map'[0] + ((- 1) * map'[1])) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol
index 93273800e8..d83970977b 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol
@@ -18,3 +18,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> >= 2)\n(<errorCode> <= 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol
index 2afe4b1ffa..fb3228aca9 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol
@@ -14,3 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 1))\n
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol b/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol
index 8b4218b454..530b469009 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol
@@ -23,3 +23,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(a <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
index b3f6cad02d..421c4fd4f0 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
@@ -16,3 +16,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (187-201): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0, 0, 0]\ny = 0\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0, 0, 0]\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
index d4e1dc1473..ebc7877f0a 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
@@ -20,3 +20,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (242-256): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n!(a[2].length <= 3)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol
index 5a9b13aff6..5038294ed5 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol
@@ -15,3 +15,4 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :D:\n(items[1][2][3].y <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
index b90bc412a8..30907bd673 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
@@ -17,3 +17,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (210-224): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
index 7fa0381b62..56032d9d5f 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
@@ -20,3 +20,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (256-270): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n!(m[0][1].length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
index f1afc6e805..c3a3d660de 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
@@ -21,3 +21,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (274-288): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n!(m[0][1].length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol
index 97cc03919c..0083f92d89 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol
@@ -24,3 +24,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n!(m[0][1].length <= 2)\n!(m[0][1][2].length <= 3)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
index 4aca89ef77..43047758ef 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
@@ -19,3 +19,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (260-274): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n!(m[0][1].length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
index ce22da600c..2e8abe5dcd 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (354-368): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n!(m[0][1].length <= 2)\n!(m[0][1][2].length <= 3)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol
index 3ad4d94ae8..d7964552d6 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol
@@ -19,3 +19,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(m[0][1][2].length <= 3)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
index 5c5af070ea..fc4c9efcf9 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
@@ -16,3 +16,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (192-206): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
index 1a0f9a7991..0b2b6fadf7 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
@@ -18,3 +18,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (232-246): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n!(m[0].length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
index 8df8edad48..be6bc23834 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
@@ -16,3 +16,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (218-232): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol b/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
index d77ab04e3c..d66545e437 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
@@ -13,3 +13,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (162-184): CHC: Assertion violation happens here.\nCounterexample:\nx = [42, 1]\n\nTransaction trace:\nC.constructor()\nState: x = [42, 1]\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n!(x.length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
index ddeaa655b2..ea433b7863 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
@@ -22,3 +22,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (307-326): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n!(m.b.length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol
index 3083327005..c3c231ede5 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol
@@ -19,5 +19,7 @@ contract C{
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Info 1180: Contract invariant(s) for :C:\n!(x >= 2)\n(!(x <= 0) && !(x >= 2))\n(!(x >= 2) && !(x <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
index 1fe537aade..d067795ac8 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
@@ -26,3 +26,4 @@ contract C{
 // Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
 // Warning 6328: (187-201): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
 // Warning 6328: (212-226): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
+// Info 1180: Contract invariant(s) for :C:\n!(x >= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
index 3f17744fb6..4bca2544e1 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
@@ -21,3 +21,4 @@ contract C{
 // SMTEngine: all
 // ----
 // Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Info 1180: Contract invariant(s) for :C:\n!(x <= 0)\n!(x >= 2)\n(!(x <= 0) && !(x >= 2))\n
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
index f03e1b4ebc..c0f524e106 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
@@ -24,3 +24,4 @@ contract C{
 // Warning 6328: (49-63): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor(0)
 // Warning 6328: (105-119): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()
 // Warning 6328: (151-165): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call\n    C.g() -- internal call
+// Info 1180: Contract invariant(s) for :C:\n!(x <= 0)\n!(x >= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol b/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
index 58d541a8a4..85e97661ce 100644
--- a/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
+++ b/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
@@ -31,3 +31,4 @@ contract D is C {
 // ----
 // Warning 6328: (205-219): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.proxy()\n    C.f() -- internal call\n        A.f() -- internal call
 // Warning 6328: (328-342): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()\nState: x = 0\nA.proxy()\n    D.f() -- internal call\n        C.f() -- internal call\n            A.f() -- internal call
+// Info 1180: Contract invariant(s) for :A:\n((x = 0) || (x = 2))\nContract invariant(s) for :D:\n((x = 0) || (x = 2))\n
diff --git a/test/libsolidity/smtCheckerTests/functions/this_state.sol b/test/libsolidity/smtCheckerTests/functions/this_state.sol
index 4d69e4815e..126add6406 100644
--- a/test/libsolidity/smtCheckerTests/functions/this_state.sol
+++ b/test/libsolidity/smtCheckerTests/functions/this_state.sol
@@ -13,3 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 2))\n
diff --git a/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol b/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
index 4c4a8b2461..4c5e381310 100644
--- a/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
+++ b/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
@@ -20,3 +20,4 @@ contract C is A {
 // SMTEngine: all
 // ----
 // Warning 6328: (227-241): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.proxy()\n    C.f() -- internal call
+// Info 1180: Contract invariant(s) for :A:\n((x >= 0) && (x <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
index 17f3daa794..0117f9b49d 100644
--- a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
@@ -23,6 +23,8 @@ contract C is A {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (199-214): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nA.constructor()\nState: x = 2\nA.i()
 // Warning 6328: (387-401): CHC: Assertion violation happens here.\nCounterexample:\nx = 10\n\nTransaction trace:\nC.constructor()\nState: x = 10\nC.i()
+// Info 1180: Contract invariant(s) for :A:\n(!(x <= 1) && !(x >= 3))\nContract invariant(s) for :C:\n(!(x >= 11) && !(x <= 9))\n
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
index c86ea3e596..1f05d11765 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
@@ -16,3 +16,4 @@ contract C is B {
 // SMTEngine: all
 // ----
 // Warning 6328: (52-66): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, x = 0\nC.g()\n    B.f() -- internal call\nState: y = 0, x = 1\nB.f()
+// Info 1180: Contract invariant(s) for :B:\n(x <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
index f97bae5cd1..a87a8eeb68 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
@@ -30,3 +30,4 @@ contract C is B {
 // ----
 // Warning 6328: (62-76): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nB.f()\n    A.f() -- internal call\n        C.v() -- internal call
 // Warning 6328: (131-145): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()\n    A.v() -- internal call
+// Info 1180: Contract invariant(s) for :A:\n(x = 0)\n
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol
index e70d372304..0a4599a3d1 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol
@@ -18,3 +18,4 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(!(y <= 41) && !(y >= 43))\n
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
index 959e53d45f..b8487e3212 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
@@ -33,3 +33,4 @@ contract E is C,D {
 // SMTEngine: all
 // ----
 // Warning 6328: (379-394): CHC: Assertion violation happens here.\nCounterexample:\nx = 111\n\nTransaction trace:\nE.constructor()\nState: x = 0\nE.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
+// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 111))\nContract invariant(s) for :D:\n((x = 0) || (x = 101))\nContract invariant(s) for :E:\n((x = 0) || (x = 111))\nContract invariant(s) for :B:\n((x = 0) || (x = 101))\n
diff --git a/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol b/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
index 1490276912..59d0423028 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
@@ -16,3 +16,4 @@ contract C is B {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(!(x <= 1) && !(x >= 3))\n
diff --git a/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol b/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol
index 2b1de17cb2..653bb23b70 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol
@@ -20,3 +20,4 @@ contract C is B {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1180: Contract invariant(s) for :A:\n(x <= 0)\nContract invariant(s) for :C:\n(x <= 0)\nContract invariant(s) for :B:\n(x <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol b/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
index beafa4af09..91b96f78c0 100644
--- a/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
+++ b/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
@@ -32,3 +32,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(x >= 7)\n
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
index 9a578cf897..d3467d0b89 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
@@ -35,3 +35,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (540-554): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, owner = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, owner = 0x0\nC.g(1){ msg.sender: 0x0 }
+// Info 1180: Contract invariant(s) for :C:\n(owner <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol
index 13a83ee551..25141b8bf3 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
index 7da8d0f6a5..39be35cb6d 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
@@ -39,3 +39,4 @@ contract D is B,C {
 // Warning 6328: (160-174): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nB.constructor()\nState: x = 0\nA.f()
 // Warning 6328: (193-207): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.f()
 // Warning 6328: (226-240): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nD.constructor()\nState: x = 0\nA.f()
+// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 2))\nContract invariant(s) for :D:\n((x = 0) || (x = 3))\nContract invariant(s) for :B:\n((x = 0) || (x = 1))\n
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
index 0a63ed321d..5641e2812b 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
@@ -17,3 +17,4 @@ contract C
 // SMTEngine: all
 // ----
 // Warning 6328: (76-90): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n(x = 3)\n
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
index 4bd8f328f7..43d41f755b 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
@@ -21,3 +21,4 @@ contract C is A {
 // SMTEngine: all
 // ----
 // Warning 6328: (83-98): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n((x >= 0) && (x <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol b/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
index 11fcbf6f67..ed160d95c2 100644
--- a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
+++ b/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
@@ -28,3 +28,4 @@ contract C {
 // Warning 2018: (33-335): Function state mutability can be restricted to view
 // Warning 2018: (457-524): Function state mutability can be restricted to pure
 // Warning 6328: (135-150): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n(y <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
index 3331b57de9..284f9bcbd5 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
@@ -29,3 +29,4 @@ contract A {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (392-408): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :A:\n(((x = (- 2)) && (y = (- 2))) || ((x = 0) && (y = 0)))\n(((x = 0) && (y = 0)) || ((x = (- 2)) && (y = (- 2))))\n
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
index 3df77d2fb0..292eab85d2 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
@@ -13,3 +13,4 @@ contract A {
 // SMTEngine: all
 // ----
 // Warning 6328: (124-146): CHC: Assertion violation happens here.\nCounterexample:\na = []\n\nTransaction trace:\nA.constructor()\nState: a = []\nA.f()
+// Info 1180: Contract invariant(s) for :A:\n(a.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
index fac19a6ff6..7a925d1341 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
@@ -30,3 +30,4 @@ contract A {
 // Warning 6328: (311-328): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
 // Warning 6368: (422-426): CHC: Out of bounds access happens here.\nCounterexample:\na = [0, 0]\nu = []\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
 // Warning 6328: (415-432): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
+// Info 1180: Contract invariant(s) for :A:\n!(a.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
index d1387ee8ef..e4b7646861 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
@@ -30,3 +30,4 @@ contract A {
 // ----
 // Warning 6328: (AASource:159-178): CHC: Assertion violation happens here.\nCounterexample:\nx = (- 1), y = (- 2)\n\nTransaction trace:\nA.constructor()\nState: x = 0, y = 0\nA.a()\nState: x = (- 2), y = (- 2)\nA.a()
 // Warning 6328: (AASource:370-386): CHC: Assertion violation happens here.\nCounterexample:\nx = 8, y = (- 2)\n\nTransaction trace:\nA.constructor()\nState: x = 0, y = 0\nA.a()
+// Info 1180: Contract invariant(s) for AASource:A:\n(((x = (- 2)) && (y = (- 2))) || ((x = 0) && (y = 0)))\n(((x = 0) && (y = 0)) || ((x = (- 2)) && (y = (- 2))))\n
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol
index 17c812aec7..9b27a277b9 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol
@@ -19,3 +19,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(s.x.length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
index 58afa2413d..e37d3f84c2 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
@@ -22,5 +22,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 2072: (255-261): Unused local variable.
+// Info 1180: Reentrancy property(ies) for :C:\n((!(x <= 2) || !(x' >= 3)) && (<errorCode> <= 0) && (!(x' <= 0) || !(x >= 2)))\n((!(x' <= 0) || ((x' + ((- 1) * x)) = 0)) && (<errorCode> <= 0) && (!(x' >= 3) || ((x' + ((- 1) * x)) = 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol
index bda1c07f28..32f2526cc6 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol
@@ -17,3 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(true && !(a.length <= 2))\n(true && !(a[2].length <= 3))\n
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
index ea9c4f55ae..4f90011158 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
@@ -20,4 +20,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n
 // Warning 6838: (154-155): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
index b0ec97d98d..80a692429d 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
@@ -27,4 +27,5 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (315-335): CHC: Assertion violation might happen here.
+// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 1)\n
 // Warning 4661: (315-335): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function.sol b/test/libsolidity/smtCheckerTests/operators/delete_function.sol
index f40a02c935..63dad1ab0b 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_function.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_function.sol
@@ -28,4 +28,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n
 // Warning 6838: (262-263): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
index 6de2c9c616..ae526775f9 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
@@ -23,4 +23,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (335-354): CHC: Assertion violation might happen here.
+// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n!(a.length <= 3)\n
 // Warning 4661: (335-354): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol
index 0c2fdba6f9..b1cef5e40b 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol
@@ -18,3 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(data.length <= 1)\n!(data[1].d.length <= 3)\n
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
index 8997abbe63..ee57f069d4 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
@@ -18,7 +18,10 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 4984: (112-115): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 3944: (181-184): CHC: Underflow (resulting value less than 0) might happen here.
 // Warning 6368: (259-263): CHC: Out of bounds access happens here.\nCounterexample:\na = [0], l = 1\n = 0\n\nTransaction trace:\nC.constructor()\nState: a = [], l = 0\nC.p()\nState: a = [0], l = 1\nC.r()
 // Warning 2661: (112-115): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4144: (181-184): BMC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol
index 6adc6273c8..d331abef7b 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol
@@ -21,3 +21,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n((l + ((- 1) * a.length)) <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
index afaeb54483..b28b6598c7 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
@@ -6,5 +6,6 @@ contract C  {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 4984: (96-101): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.\nCounterexample:\n\nx = 0\ny = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, (- 57896044618658097711785492504343953926634992332820282019728792003956564819968))
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_3.sol b/test/libsolidity/smtCheckerTests/special/msg_value_3.sol
index 8d35e17542..79302b1429 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_3.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_3.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\nlock\n
diff --git a/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
index b7984d21ef..475cc2291e 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
@@ -8,6 +8,7 @@ contract C {
 		sender = msg.sender;
 		sig = msg.sig;
 		value = msg.value;
+		require(value == 42);
 
 		g();
 	}
@@ -28,4 +29,4 @@ contract C {
 // ====
 // SMTEngine: chc
 // ----
-// Warning 6328: (621-644): CHC: Assertion violation happens here.\nCounterexample:\ndata = [0x26, 0x12, 0x1f, 0xf0], sender = 0x0, sig = 0x26121ff0, value = 0\n\nTransaction trace:\nC.constructor()\nState: data = [], sender = 0x0, sig = 0x0, value = 0\nC.f(){ msg.data: [0x26, 0x12, 0x1f, 0xf0], msg.sender: 0x0, msg.sig: 0x26121ff0, msg.value: 0 }\n    C.g() -- internal call
+// Warning 6328: (645-668): CHC: Assertion violation happens here.\nCounterexample:\ndata = [0x26, 0x12, 0x1f, 0xf0], sender = 0x0, sig = 0x26121ff0, value = 42\n\nTransaction trace:\nC.constructor()\nState: data = [], sender = 0x0, sig = 0x0, value = 0\nC.f(){ msg.data: [0x26, 0x12, 0x1f, 0xf0], msg.sender: 0x0, msg.sig: 0x26121ff0, msg.value: 42 }\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_4.sol b/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
index 6988906a27..0abf62df8e 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
@@ -28,4 +28,5 @@ contract C {
 // Warning 1218: (178-192): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (178-192): CHC: Assertion violation might happen here.
 // Warning 6328: (318-332): CHC: Assertion violation happens here.
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 2)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n<errorCode> = 2 -> Assertion failed at assert(x == 0)\n<errorCode> = 3 -> Assertion failed at assert(x == 1)\n
 // Warning 4661: (178-192): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_5.sol b/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
index 6c9b776c4e..236a26f1bd 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
@@ -26,3 +26,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (315-329): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 2)\n((!(x' >= 100) || ((x' + ((- 1) * x)) = 0)) && !(<errorCode> = 1))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x < 100)\n<errorCode> = 2 -> Assertion failed at assert(x == 0)\n<errorCode> = 3 -> Assertion failed at assert(x == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
index 80ebe0d933..abef4c76a4 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
@@ -25,3 +25,4 @@ contract C {
 // Warning 6328: (185-199): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\nx = 1\nc = false\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()\n    d.d() -- untrusted external call
 // Warning 6328: (273-283): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\nx = 1\nc = true\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()\n    d.d() -- untrusted external call
 // Warning 6328: (393-407): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 3)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n<errorCode> = 2 -> Assertion failed at assert(!c)\n<errorCode> = 3 -> Assertion failed at assert(x == 0)\n<errorCode> = 4 -> Assertion failed at assert(x == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
index 3048558e78..0854dedd17 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
@@ -19,5 +19,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (280-300): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n(!(m[0][1] >= 43) && !(m[0][1] <= 41))\n
diff --git a/test/libsolidity/smtCheckerTests/typecast/address_literal.sol b/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
index d56275fedc..40540bb511 100644
--- a/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (454-468): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0\na = 0x0\nb = 0x01\nc = 0x0\nd = 0x0\ne = 0x12345678\n\nTransaction trace:\nC.constructor()\nState: x = 0x0\nC.g()
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/address_call.sol b/test/libsolidity/smtCheckerTests/types/address_call.sol
index 568ab91e1d..8ea3894827 100644
--- a/test/libsolidity/smtCheckerTests/types/address_call.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_call.sol
@@ -19,6 +19,8 @@ contract C
 // EVMVersion: >spuriousDragon
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTIgnoreInv: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 2072: (127-166): Unused local variable.
 // Warning 2072: (191-207): Unused local variable.
diff --git a/test/libsolidity/smtCheckerTests/types/address_staticcall.sol b/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
index 40d867fa0d..11b862a10c 100644
--- a/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
@@ -20,3 +20,4 @@ contract C
 // ----
 // Warning 2072: (191-207): Unused local variable.
 // Warning 6328: (233-248): CHC: Assertion violation happens here.
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> >= 2)\n!(<errorCode> >= 3)\n!(<errorCode> >= 4)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(success)\n<errorCode> = 2 -> Assertion failed at assert(x == 0)\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n<errorCode> = 4 -> Assertion failed at assert(localMap[0] == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol
index 36b851ff3e..7e89f1c9d0 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol
@@ -28,3 +28,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!(array.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
index c13842daaf..fad9d2bbac 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
@@ -23,3 +23,4 @@ contract C
 // Warning 6368: (177-184): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-187): CHC: Out of bounds access might happen here.
 // Warning 6328: (170-192): CHC: Assertion violation happens here.\nCounterexample:\nc = [[[0]]]\nb = false\n\nTransaction trace:\nC.constructor()\nState: c = [[[0]]]\nC.f(false)
+// Info 1180: Contract invariant(s) for :C:\n!(c.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
index ebd28101d5..b2fd913278 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
@@ -22,3 +22,4 @@ contract C
 // Warning 6368: (152-162): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-184): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-187): CHC: Out of bounds access might happen here.
+// Info 1180: Contract invariant(s) for :C:\n!(c.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
index 6ec629c9f6..689fc045d9 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
@@ -23,3 +23,4 @@ contract C
 // Warning 6368: (152-162): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-184): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-187): CHC: Out of bounds access might happen here.
+// Info 1180: Contract invariant(s) for :C:\n!(c.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
index 07e09a9e82..dd0d8e004e 100644
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
@@ -43,3 +43,4 @@ contract C
 // Warning 6368: (850-869): CHC: Out of bounds access happens here.
 // Warning 6328: (936-956): CHC: Assertion violation happens here.
 // Warning 6368: (1029-1043): CHC: Out of bounds access might happen here.
+// Info 1180: Contract invariant(s) for :C:\n!(severalMaps8.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
index cde229e4fa..f415cfd955 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
@@ -28,3 +28,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (456-487): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n!(severalMaps3d.length <= 1)\n!(severalMaps8.length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
index 8ebd7025d8..f9aa3a650d 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
@@ -33,3 +33,4 @@ contract C
 // Warning 6328: (860-880): CHC: Assertion violation happens here.
 // Warning 6368: (936-952): CHC: Out of bounds access might happen here.
 // Warning 6368: (936-955): CHC: Out of bounds access might happen here.
+// Info 1180: Contract invariant(s) for :C:\n!(severalMaps8.length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol b/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol
index fda74030ea..edc35f8029 100644
--- a/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol
+++ b/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol
@@ -11,3 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n((d = 0) || (d = 1))\n
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol
index 2aee190425..6a24c1e9c9 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol
@@ -7,3 +7,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :c:\n!(data2.length <= 5)\n
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
index 941cfd2372..b55293231f 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
@@ -30,5 +30,8 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
+// Warning 6368: (374-381): CHC: Out of bounds access might happen here.
 // Warning 6368: (456-462): CHC: Out of bounds access happens here.
+// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 4)\n
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_4.sol b/test/libsolidity/smtCheckerTests/types/mapping_4.sol
index c5b0357401..ba6688cd5f 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_4.sol
@@ -10,3 +10,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1180: Contract invariant(s) for :C:\n!map[true]\n
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
index f632f3bc83..e3ab2189c9 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
@@ -11,3 +11,4 @@ contract C {
 // ----
 // Warning 6328: (95-115): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.f()
 // Warning 6328: (134-154): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.f()
+// Info 1180: Contract invariant(s) for :C:\n(!(a.length <= 1) && !(a.length >= 3))\n
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol
index 7c31c616c2..986781b771 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Contract invariant(s) for :C:\n(!(s.x <= 41) && !(s.x >= 43))\n
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol
index f1b1281621..60b3054022 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol
@@ -12,3 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> >= 2)\n(<errorCode> <= 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2)\n<errorCode> = 2 -> Assertion failed at assert(y == 3)\n
diff --git a/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol b/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
index 52ea828007..120348a046 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
@@ -6,5 +6,8 @@ contract C {
 		assert(m[a] != 0); // should fail
 	}
 }
+// ====
+// SMTEngine: all
+// SMTIgnoreInv: yes
 // ----
 // Warning 6328: (134-151): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)

From 4f823c63422ddc1080a31807321ec342f2b1a4d5 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:53:14 +0200
Subject: [PATCH 0030/1748] CLI and JSON tests

---
 .../model_checker_invariants_all/args         |  1 +
 .../model_checker_invariants_all/err          | 15 +++++++++++
 .../model_checker_invariants_all/input.sol    | 12 +++++++++
 .../model_checker_invariants_contract/args    |  1 +
 .../model_checker_invariants_contract/err     |  2 ++
 .../input.sol                                 |  8 ++++++
 .../args                                      |  1 +
 .../err                                       | 15 +++++++++++
 .../input.sol                                 | 12 +++++++++
 .../model_checker_invariants_reentrancy/args  |  1 +
 .../model_checker_invariants_reentrancy/err   | 10 +++++++
 .../input.sol                                 |  9 +++++++
 .../model_checker_invariants_wrong/args       |  1 +
 .../model_checker_invariants_wrong/err        |  1 +
 .../model_checker_invariants_wrong/exit       |  1 +
 .../model_checker_invariants_wrong/input.sol  |  8 ++++++
 .../input.json                                | 23 ++++++++++++++++
 .../output.json                               |  7 +++++
 .../input.json                                | 27 +++++++++++++++++++
 .../output.json                               | 27 +++++++++++++++++++
 .../input.json                                | 24 +++++++++++++++++
 .../output.json                               | 17 ++++++++++++
 .../input.json                                | 23 ++++++++++++++++
 .../output.json                               |  1 +
 .../input.json                                | 23 ++++++++++++++++
 .../output.json                               |  1 +
 .../input.json                                | 23 ++++++++++++++++
 .../output.json                               |  1 +
 28 files changed, 295 insertions(+)
 create mode 100644 test/cmdlineTests/model_checker_invariants_all/args
 create mode 100644 test/cmdlineTests/model_checker_invariants_all/err
 create mode 100644 test/cmdlineTests/model_checker_invariants_all/input.sol
 create mode 100644 test/cmdlineTests/model_checker_invariants_contract/args
 create mode 100644 test/cmdlineTests/model_checker_invariants_contract/err
 create mode 100644 test/cmdlineTests/model_checker_invariants_contract/input.sol
 create mode 100644 test/cmdlineTests/model_checker_invariants_contract_reentrancy/args
 create mode 100644 test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
 create mode 100644 test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol
 create mode 100644 test/cmdlineTests/model_checker_invariants_reentrancy/args
 create mode 100644 test/cmdlineTests/model_checker_invariants_reentrancy/err
 create mode 100644 test/cmdlineTests/model_checker_invariants_reentrancy/input.sol
 create mode 100644 test/cmdlineTests/model_checker_invariants_wrong/args
 create mode 100644 test/cmdlineTests/model_checker_invariants_wrong/err
 create mode 100644 test/cmdlineTests/model_checker_invariants_wrong/exit
 create mode 100644 test/cmdlineTests/model_checker_invariants_wrong/input.sol
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_contract/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_contract/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_reentrancy/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_wrong_key/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_wrong_type/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json

diff --git a/test/cmdlineTests/model_checker_invariants_all/args b/test/cmdlineTests/model_checker_invariants_all/args
new file mode 100644
index 0000000000..389acc6478
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_all/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-invariants all
diff --git a/test/cmdlineTests/model_checker_invariants_all/err b/test/cmdlineTests/model_checker_invariants_all/err
new file mode 100644
index 0000000000..47bc04256e
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_all/err
@@ -0,0 +1,15 @@
+Warning: Return value of low-level calls not used.
+ --> model_checker_invariants_all/input.sol:6:3:
+  |
+6 | 		_a.call("");
+  | 		^^^^^^^^^^^
+
+Info: Contract invariant(s) for model_checker_invariants_all/input.sol:test:
+(x <= 0)
+Reentrancy property(ies) for model_checker_invariants_all/input.sol:test:
+(!(x <= 0) || (x' <= 0))
+((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
+((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+<errorCode> = 0 -> no errors
+<errorCode> = 1 -> Assertion failed at assert(x < 10)
+<errorCode> = 3 -> Assertion failed at assert(x < 10)
diff --git a/test/cmdlineTests/model_checker_invariants_all/input.sol b/test/cmdlineTests/model_checker_invariants_all/input.sol
new file mode 100644
index 0000000000..f8601cf4f4
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_all/input.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract test {
+	uint x;
+    function f(address _a) public {
+		_a.call("");
+		assert(x < 10);
+    }
+	function g() public view {
+		assert(x < 10);
+	}
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_invariants_contract/args b/test/cmdlineTests/model_checker_invariants_contract/args
new file mode 100644
index 0000000000..e856a73b9c
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_contract/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-invariants contract
diff --git a/test/cmdlineTests/model_checker_invariants_contract/err b/test/cmdlineTests/model_checker_invariants_contract/err
new file mode 100644
index 0000000000..a5277bebf9
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_contract/err
@@ -0,0 +1,2 @@
+Info: Contract invariant(s) for model_checker_invariants_contract/input.sol:test:
+(x <= 0)
diff --git a/test/cmdlineTests/model_checker_invariants_contract/input.sol b/test/cmdlineTests/model_checker_invariants_contract/input.sol
new file mode 100644
index 0000000000..3a857d4848
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_contract/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract test {
+	uint x;
+    function f() public view {
+		assert(x < 10);
+    }
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/args b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/args
new file mode 100644
index 0000000000..90591a5ae2
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-invariants contract,reentrancy
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
new file mode 100644
index 0000000000..372143657c
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
@@ -0,0 +1,15 @@
+Warning: Return value of low-level calls not used.
+ --> model_checker_invariants_contract_reentrancy/input.sol:6:3:
+  |
+6 | 		_a.call("");
+  | 		^^^^^^^^^^^
+
+Info: Contract invariant(s) for model_checker_invariants_contract_reentrancy/input.sol:test:
+(x <= 0)
+Reentrancy property(ies) for model_checker_invariants_contract_reentrancy/input.sol:test:
+(!(x <= 0) || (x' <= 0))
+((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
+((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+<errorCode> = 0 -> no errors
+<errorCode> = 1 -> Assertion failed at assert(x < 10)
+<errorCode> = 3 -> Assertion failed at assert(x < 10)
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol
new file mode 100644
index 0000000000..f8601cf4f4
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract test {
+	uint x;
+    function f(address _a) public {
+		_a.call("");
+		assert(x < 10);
+    }
+	function g() public view {
+		assert(x < 10);
+	}
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_invariants_reentrancy/args b/test/cmdlineTests/model_checker_invariants_reentrancy/args
new file mode 100644
index 0000000000..904defe84b
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_reentrancy/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-invariants reentrancy
diff --git a/test/cmdlineTests/model_checker_invariants_reentrancy/err b/test/cmdlineTests/model_checker_invariants_reentrancy/err
new file mode 100644
index 0000000000..a2fd6075af
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_reentrancy/err
@@ -0,0 +1,10 @@
+Warning: Return value of low-level calls not used.
+ --> model_checker_invariants_reentrancy/input.sol:6:3:
+  |
+6 | 		_a.call("");
+  | 		^^^^^^^^^^^
+
+Info: Reentrancy property(ies) for model_checker_invariants_reentrancy/input.sol:test:
+((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+<errorCode> = 0 -> no errors
+<errorCode> = 1 -> Assertion failed at assert(x < 10)
diff --git a/test/cmdlineTests/model_checker_invariants_reentrancy/input.sol b/test/cmdlineTests/model_checker_invariants_reentrancy/input.sol
new file mode 100644
index 0000000000..f21d4d4c8f
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_reentrancy/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract test {
+	uint x;
+    function f(address _a) public {
+		_a.call("");
+		assert(x < 10);
+    }
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_invariants_wrong/args b/test/cmdlineTests/model_checker_invariants_wrong/args
new file mode 100644
index 0000000000..ae601a0444
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_wrong/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-invariants what
diff --git a/test/cmdlineTests/model_checker_invariants_wrong/err b/test/cmdlineTests/model_checker_invariants_wrong/err
new file mode 100644
index 0000000000..1dc94780db
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_wrong/err
@@ -0,0 +1 @@
+Invalid option for --model-checker-invariants: what
diff --git a/test/cmdlineTests/model_checker_invariants_wrong/exit b/test/cmdlineTests/model_checker_invariants_wrong/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_wrong/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/model_checker_invariants_wrong/input.sol b/test/cmdlineTests/model_checker_invariants_wrong/input.sol
new file mode 100644
index 0000000000..17bf3b749c
--- /dev/null
+++ b/test/cmdlineTests/model_checker_invariants_wrong/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract test {
+	uint x;
+	function g() public view {
+		assert(x < 10);
+	}
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract/input.json b/test/cmdlineTests/standard_model_checker_invariants_contract/input.json
new file mode 100644
index 0000000000..d47c93de2a
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					uint x;
+					function f() public view {
+						assert(x < 10);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"invariants": ["contract"]
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
new file mode 100644
index 0000000000..1cd236baf0
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
@@ -0,0 +1,7 @@
+{"errors":[{"component":"general","errorCode":"1180","formattedMessage":"Info: Contract invariant(s) for A:test:
+(x <= 0)
+
+
+","message":"Contract invariant(s) for A:test:
+(x <= 0)
+","severity":"info","type":"Info"}],"sources":{"A":{"id":0}}}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json
new file mode 100644
index 0000000000..56139e6a5a
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json
@@ -0,0 +1,27 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					uint x;
+					function f(address _a) public {
+						_a.call(\"\");
+						assert(x < 10);
+					}
+					function g() public view {
+						assert(x < 10);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"invariants": ["contract", "reentrancy"]
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
new file mode 100644
index 0000000000..433648d0b9
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
@@ -0,0 +1,27 @@
+{"errors":[{"component":"general","errorCode":"9302","formattedMessage":"Warning: Return value of low-level calls not used.
+ --> A:7:7:
+  |
+7 | \t\t\t\t\t\t_a.call(\"\");
+  | \t\t\t\t\t\t^^^^^^^^^^^
+
+","message":"Return value of low-level calls not used.","severity":"warning","sourceLocation":{"end":143,"file":"A","start":132},"type":"Warning"},{"component":"general","errorCode":"1180","formattedMessage":"Info: Contract invariant(s) for A:test:
+(x <= 0)
+Reentrancy property(ies) for A:test:
+(!(x <= 0) || (x' <= 0))
+((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
+((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+<errorCode> = 0 -> no errors
+<errorCode> = 1 -> Assertion failed at assert(x < 10)
+<errorCode> = 3 -> Assertion failed at assert(x < 10)
+
+
+","message":"Contract invariant(s) for A:test:
+(x <= 0)
+Reentrancy property(ies) for A:test:
+(!(x <= 0) || (x' <= 0))
+((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
+((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+<errorCode> = 0 -> no errors
+<errorCode> = 1 -> Assertion failed at assert(x < 10)
+<errorCode> = 3 -> Assertion failed at assert(x < 10)
+","severity":"info","type":"Info"}],"sources":{"A":{"id":0}}}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/input.json b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/input.json
new file mode 100644
index 0000000000..1f98000b0e
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/input.json
@@ -0,0 +1,24 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					uint x;
+					function f(address _a) public {
+						_a.call(\"\");
+						assert(x < 10);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"invariants": ["reentrancy"]
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
new file mode 100644
index 0000000000..4158c3ae10
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
@@ -0,0 +1,17 @@
+{"errors":[{"component":"general","errorCode":"9302","formattedMessage":"Warning: Return value of low-level calls not used.
+ --> A:7:7:
+  |
+7 | \t\t\t\t\t\t_a.call(\"\");
+  | \t\t\t\t\t\t^^^^^^^^^^^
+
+","message":"Return value of low-level calls not used.","severity":"warning","sourceLocation":{"end":143,"file":"A","start":132},"type":"Warning"},{"component":"general","errorCode":"1180","formattedMessage":"Info: Reentrancy property(ies) for A:test:
+((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+<errorCode> = 0 -> no errors
+<errorCode> = 1 -> Assertion failed at assert(x < 10)
+
+
+","message":"Reentrancy property(ies) for A:test:
+((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+<errorCode> = 0 -> no errors
+<errorCode> = 1 -> Assertion failed at assert(x < 10)
+","severity":"info","type":"Info"}],"sources":{"A":{"id":0}}}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_key/input.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_key/input.json
new file mode 100644
index 0000000000..e8ee6aba63
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_key/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					uint x;
+					function f() public view {
+						assert(x < 10);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"invariants": ["what"]
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json
new file mode 100644
index 0000000000..7758b29ca2
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Invalid model checker invariants requested.","message":"Invalid model checker invariants requested.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_type/input.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_type/input.json
new file mode 100644
index 0000000000..54fc96d46c
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_type/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					uint x;
+					function f() public view {
+						assert(x < 10);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"invariants": [2]
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json
new file mode 100644
index 0000000000..5ad18a3b1c
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"Every invariant type in settings.modelChecker.invariants must be a string.","message":"Every invariant type in settings.modelChecker.invariants must be a string.","severity":"error","type":"JSONError"}]}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/input.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/input.json
new file mode 100644
index 0000000000..f7522e6e5e
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					uint x;
+					function f() public view {
+						assert(x < 10);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"invariants": 2
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json
new file mode 100644
index 0000000000..b4fba3576b
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json
@@ -0,0 +1 @@
+{"errors":[{"component":"general","formattedMessage":"settings.modelChecker.invariants must be an array.","message":"settings.modelChecker.invariants must be an array.","severity":"error","type":"JSONError"}]}

From d04ad57ee79ace9722ccac0122928f5836a5940b Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:53:20 +0200
Subject: [PATCH 0031/1748] Docs

---
 docs/smtchecker.rst         | 19 ++++++++++++++++++-
 docs/using-the-compiler.rst |  2 ++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index a9732d05ee..791659897e 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -412,7 +412,7 @@ is already "locked", so it would not be possible to change the value of ``x``,
 regardless of what the unknown called code does.
 
 If we "forget" to use the ``mutex`` modifier on function ``set``, the
-SMTChecker is able to synthesize the behavior of the externally called code so
+SMTChecker is able to synthesize the behaviour of the externally called code so
 that the assertion fails:
 
 .. code-block:: text
@@ -518,6 +518,23 @@ which has the following form:
         "source2.sol": ["contract2", "contract3"]
     }
 
+Reported Inferred Inductive Invariants
+======================================
+
+For properties that were proved safe with the CHC engine,
+the SMTChecker can retrieve inductive invariants that were inferred by the Horn
+solver as part of the proof.
+Currently two types of invariants can be reported to the user:
+
+- Contract Invariants: these are properties over the contract's state variables
+  that are true before and after every possible transaction that the contract may ever run. For example, ``x >= y``, where ``x`` and ``y`` are a contract's state variables.
+- Reentrancy Properties: they represent the behavior of the contract
+  in the presence of external calls to unknown code. These properties can express a relation
+  between the value of the state variables before and after the external call, where the external call is free to do anything, including making reentrant calls to the analyzed contract. Primed variables represent the state variables' values after said external call. Example: ``lock -> x = x'``.
+
+The user can choose the type of invariants to be reported using the CLI option ``--model-checker-invariants "contract,reentrancy"`` or as an array in the field ``settings.modelChecker.invariants`` in the :ref:`JSON input<compiler-api>`.
+By default the SMTChecker does not report invariants.
+
 Division and Modulo With Slack Variables
 ========================================
 
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 88da5d5e69..c6c40cacc0 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -418,6 +418,8 @@ Input Description
           "divModWithSlacks": true,
           // Choose which model checker engine to use: all (default), bmc, chc, none.
           "engine": "chc",
+          // Choose which types of invariants should be reported to the user: contract, reentrancy.
+          "invariants": ["contract", "reentrancy"],
           // Choose whether to output all unproved targets. The default is `false`.
           "showUnproved": true,
           // Choose which solvers should be used, if available.

From 902a2e232bc2907f198f706d0faa2d758e58efb0 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 6 Oct 2021 11:53:30 +0200
Subject: [PATCH 0032/1748] Changelog

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index e79b13e6ef..c5211922d6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
  * Commandline Interface: Add ``--debug-info`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
  * Commandline Interface: Use different colors when printing errors, warnings and infos.
  * SMTChecker: Output values for ``block.*``, ``msg.*`` and ``tx.*`` variables that are present in the called functions.
+ * SMTChecker: Report contract invariants and reentrancy properties. This can be enabled via the CLI option ``--model-checker-invariants`` or the Standard JSON option ``settings.modelChecker.invariants``.
  * Standard JSON: Accept nested brackets in step sequences passed to ``settings.optimizer.details.yulDetails.optimizerSteps``.
  * Standard JSON: Add ``settings.debug.debugInfo`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
 

From f588dd34a9bcf2faeeeaec57f741a0f7f12158ee Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 26 Oct 2021 14:56:13 +0200
Subject: [PATCH 0033/1748] Sort bugfixes in changelog

---
 Changelog.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c5211922d6..c709229424 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,15 +16,15 @@ Compiler Features:
 
 Bugfixes:
  * Code Generator: Fix constructor source mappings for immutables.
+ * Commandline Interface: Disallow ``--error-recovery`` option outside of the compiler mode.
+ * Commandline Interface: Don't return zero exit code when writing linked files to disk fails.
  * Commandline Interface: Fix extra newline character being appended to sources passed through standard input, affecting their hashes.
  * Commandline Interface: Report output selection options unsupported by the selected input mode instead of ignoring them.
- * Commandline Interface: Don't return zero exit code when writing linked files to disk fails.
- * Commandline Interface: Disallow ``--error-recovery`` option outside of the compiler mode.
+ * Commandline Interface: When linking only accept exact matches for library names passed to the ``--libraries`` option. Library names not prefixed with a file name used to match any library with that name.
  * SMTChecker: Fix internal error in magic type access (``block``, ``msg``, ``tx``).
  * TypeChecker: Fix internal error when using user defined value types in public library functions.
  * Yul Assembler: Fix internal error when function names are not unique.
  * Yul IR Generator: Do not output empty switches/if-bodies for empty contracts.
- * Commandline Interface: When linking only accept exact matches for library names passed to the ``--libraries`` option. Library names not prefixed with a file name used to match any library with that name.
 
 
 

From b8aed7ca867c1b9cc7ae02f7b129082b9c218e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 25 Oct 2021 12:59:55 +0200
Subject: [PATCH 0034/1748] Run external tests on latest upstream code where
 possible

---
 test/externalTests/ens.sh      | 2 +-
 test/externalTests/zeppelin.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index a19ce859d6..90c96d5a50 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -33,7 +33,7 @@ function ens_test
     export OPTIMIZER_LEVEL=1
     export CONFIG="truffle-config.js"
 
-    truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/ens.git master_080
+    truffle_setup "$SOLJSON" https://github.com/ensdomains/ens.git master
 
     # Use latest Truffle. Older versions crash on the output from 0.8.0.
     force_truffle_version ^5.1.55
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 8d8cb48457..97da3d47bf 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -33,7 +33,7 @@ function zeppelin_test
     OPTIMIZER_LEVEL=1
     CONFIG="truffle-config.js"
 
-    truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/openzeppelin-contracts.git master_080
+    truffle_setup "$SOLJSON" https://github.com/OpenZeppelin/openzeppelin-contracts.git master
     run_install "$SOLJSON" install_fn
 
     truffle_run_test "$SOLJSON" compile_fn test_fn

From 14210825b1fd31c2a1ac6f983d4129c4ec9c8619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 25 Oct 2021 13:10:15 +0200
Subject: [PATCH 0035/1748] externalTests/README: Recommend using upstream
 repository directly when possible

---
 test/externalTests/README.md | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/test/externalTests/README.md b/test/externalTests/README.md
index a6c160846a..76e39a79b0 100644
--- a/test/externalTests/README.md
+++ b/test/externalTests/README.md
@@ -13,16 +13,17 @@ these projects *can* be upgraded at all.
 ### Recommended workflow
 
 #### Adding a new external project
-1. Create a fork of the upstream repository in https://github.com/solidity-external-tests/. If the
-    project consists of several repositories, fork them all.
-2. Remove all the branches except for main one (`master`, `develop`, `main`, etc). This branch is
-    going to be always kept up to date with the upstream repository and should not contain any extra
-    commits.
+1. If the upstream code cannot be compiled without modifications, create a fork of the repository
+   in https://github.com/solidity-external-tests/.
+2. In our fork, remove all the branches except for main one (`master`, `develop`, `main`, etc).
+    This branch is going to be always kept up to date with the upstream repository and should not
+    contain any extra commits.
     - If the project is not up to date with the latest compiler version but has a branch that is,
         try to use that branch instead.
-3. Create a new branch named after the main branch and the compiler version from our `develop`
-    branch. E.g. if the latest Solidity version is 0.7.5 and the main branch of the external project
-    is called `master`, create `master_070`. This is where we will be adding our own commits.
+3. In our fork, create a new branch named after the main branch and the compiler version from our
+ `develop` branch.
+     E.g. if the latest Solidity version is 0.7.5 and the main branch of the external project
+     is called `master`, create `master_070`. This is where we will be adding our own commits.
 4. Create a script for compiling/testing the project and put it in `test/externalTests/` in the
     Solidity repository.
     - The script should apply workarounds necessary to make the project actually use the compiler
@@ -39,12 +40,12 @@ these projects *can* be upgraded at all.
     and add necessary workarounds there. Continuing the example above, the new branch would be
     called `master_080` and should be rebased on top of `master_070`.
     - The fewer commits in these branches, the better. Ideally, any changes needed to make the compiler
-        work should be submitted upstream and our branches should just be tracking the main upstream
-        branch without any extra commits.
+        work should be submitted upstream and our scripts should be using the upstream repository
+        directly.
 
 #### Updating external projects for a PR that introduces breaking changes in the compiler
 If a PR to our `breaking` branch introduces changes that will make an external project no longer
-compile or pass its tests, the fork needs to be modified:
+compile or pass its tests, the fork needs to be modified (or created if it does not yet exist):
 - If a branch specific to the compiler version from `breaking` does not exist yet:
     1. Create the branch. It should be based on the version-specific branch used on `develop`.
     2. Make your PR modify the project script in `test/externalScripts/` to use the new branch.
@@ -84,7 +85,7 @@ to use the updated copies of the branches and can be discarded aferwards without
 When a non-backwards-compatible version becomes the most recent release, `breaking` branch
 gets merged into `develop` which automatically results in a switch to the newer version-specific
 branches if they exist. If no changes on our part were necessary, it is completely fine to keep using
-e.g. the `master_060` of an external project in in Solidity 0.8.x.
+e.g. the `master_060` of an external project in Solidity 0.8.x.
 
 Since each project is handled separately, this approach may result in a mix of version-specific branches
 between different external projects. For example, in one project we could could have `master_050` on

From 9428dbc94fe43c0132d1ed6c37cf755fe9855723 Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Mon, 25 Oct 2021 11:58:49 +0100
Subject: [PATCH 0036/1748] Moved storage size assert to TypeChecker from
 DeclarationTypeChecker

---
 Changelog.md                                              | 2 ++
 libsolidity/analysis/DeclarationTypeChecker.cpp           | 1 -
 libsolidity/analysis/TypeChecker.cpp                      | 8 ++++++++
 libsolidity/analysis/TypeChecker.h                        | 1 +
 .../userDefinedValueType/forward_reference_array.sol      | 4 ++++
 5 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_array.sol

diff --git a/Changelog.md b/Changelog.md
index c709229424..ff183e22b2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -23,6 +23,8 @@ Bugfixes:
  * Commandline Interface: When linking only accept exact matches for library names passed to the ``--libraries`` option. Library names not prefixed with a file name used to match any library with that name.
  * SMTChecker: Fix internal error in magic type access (``block``, ``msg``, ``tx``).
  * TypeChecker: Fix internal error when using user defined value types in public library functions.
+ * TypeChecker: Fix internal error when using arrays and structs with user defined value types before declaration.
+ * TypeChecker: Improved error message for constant variables with (nested) mapping types.
  * Yul Assembler: Fix internal error when function names are not unique.
  * Yul IR Generator: Do not output empty switches/if-bodies for empty contracts.
 
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index b015939e21..d531fd77fa 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -289,7 +289,6 @@ void DeclarationTypeChecker::endVisit(ArrayTypeName const& _typeName)
 		return;
 	}
 
-	solAssert(baseType->storageBytes() != 0, "Illegal base type of storage size zero for array.");
 	if (Expression const* length = _typeName.length())
 	{
 		optional<rational> lengthValue;
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index f11756b25b..0b5f97719b 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1220,6 +1220,14 @@ void TypeChecker::endVisit(RevertStatement const& _revert)
 		m_errorReporter.typeError(1885_error, errorCall.expression().location(), "Expression has to be an error.");
 }
 
+void TypeChecker::endVisit(ArrayTypeName const& _typeName)
+{
+	solAssert(
+		_typeName.baseType().annotation().type &&
+		_typeName.baseType().annotation().type->storageBytes() != 0,
+		"Illegal base type of storage size zero for array."
+	);
+}
 
 bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
 {
diff --git a/libsolidity/analysis/TypeChecker.h b/libsolidity/analysis/TypeChecker.h
index bf50392042..f0820d930e 100644
--- a/libsolidity/analysis/TypeChecker.h
+++ b/libsolidity/analysis/TypeChecker.h
@@ -119,6 +119,7 @@ class TypeChecker: private ASTConstVisitor
 	void endVisit(InheritanceSpecifier const& _inheritance) override;
 	void endVisit(ModifierDefinition const& _modifier) override;
 	bool visit(FunctionDefinition const& _function) override;
+	void endVisit(ArrayTypeName const& _typeName) override;
 	bool visit(VariableDeclaration const& _variable) override;
 	/// We need to do this manually because we want to pass the bases of the current contract in
 	/// case this is a base constructor call.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_array.sol b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_array.sol
new file mode 100644
index 0000000000..884fb2b5d6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_array.sol
@@ -0,0 +1,4 @@
+contract C {
+    Left[] pu1;
+}
+type Left is bytes2;

From 51009c005d0934f6e32e77fa0277ad847defb69e Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Tue, 26 Oct 2021 18:31:13 +0200
Subject: [PATCH 0037/1748] Moved a canBeStored assert for struct members to
 TypeChecker

This is to avoid a assert from failing for forward declared user defined value types.
---
 libsolidity/analysis/DeclarationTypeChecker.cpp        |  1 -
 libsolidity/analysis/TypeChecker.cpp                   | 10 ++++++++++
 libsolidity/analysis/TypeChecker.h                     |  1 +
 .../userDefinedValueType/forward_reference_struct.sol  |  3 +++
 4 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_struct.sol

diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index d531fd77fa..d5392ef84b 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -100,7 +100,6 @@ bool DeclarationTypeChecker::visit(StructDefinition const& _struct)
 		m_recursiveStructSeen = false;
 		member->accept(*this);
 		solAssert(member->annotation().type, "");
-		solAssert(member->annotation().type->canBeStored(), "Type cannot be used in struct.");
 		if (m_recursiveStructSeen)
 			hasRecursiveChild = true;
 	}
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 0b5f97719b..83a9da55c7 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -621,6 +621,16 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
 	return false;
 }
 
+void TypeChecker::endVisit(StructDefinition const& _struct)
+{
+	for (auto const& member: _struct.members())
+		solAssert(
+			member->annotation().type &&
+			member->annotation().type->canBeStored(),
+			"Type cannot be used in struct."
+		);
+}
+
 void TypeChecker::visitManually(
 	ModifierInvocation const& _modifier,
 	vector<ContractDefinition const*> const& _bases
diff --git a/libsolidity/analysis/TypeChecker.h b/libsolidity/analysis/TypeChecker.h
index f0820d930e..ba445ffbb0 100644
--- a/libsolidity/analysis/TypeChecker.h
+++ b/libsolidity/analysis/TypeChecker.h
@@ -121,6 +121,7 @@ class TypeChecker: private ASTConstVisitor
 	bool visit(FunctionDefinition const& _function) override;
 	void endVisit(ArrayTypeName const& _typeName) override;
 	bool visit(VariableDeclaration const& _variable) override;
+	void endVisit(StructDefinition const& _struct) override;
 	/// We need to do this manually because we want to pass the bases of the current contract in
 	/// case this is a base constructor call.
 	void visitManually(ModifierInvocation const& _modifier, std::vector<ContractDefinition const*> const& _bases);
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_struct.sol b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_struct.sol
new file mode 100644
index 0000000000..b99cff215f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_struct.sol
@@ -0,0 +1,3 @@
+struct S { U u; }
+contract C { S s; }
+type U is address;

From 8815d6f5f09a0e4bd54190ab148f5ca3659a7c02 Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Tue, 26 Oct 2021 18:29:46 +0200
Subject: [PATCH 0038/1748] Moved a check related to constants to TypeChecker

And added a proper error message when constant types containing (nested) mapping types are used.
---
 .../analysis/DeclarationTypeChecker.cpp        | 18 ++++++++++--------
 libsolidity/analysis/TypeChecker.cpp           |  9 +++++++++
 libsolidity/ast/Types.h                        |  2 ++
 .../constantEvaluator/type_reference.sol       |  1 -
 .../type_reference_in_contract.sol             |  1 -
 .../syntaxTests/constants/mapping_constant.sol |  2 +-
 .../syntaxTests/constants/struct_constant.sol  |  2 +-
 .../const_struct_with_mapping.sol              |  2 +-
 .../105_constant_input_parameter.sol           |  1 -
 .../171_assignment_to_const_array_vars.sol     |  2 +-
 .../173_constant_struct.sol                    |  2 +-
 .../nameAndTypeResolution/constant_mapping.sol |  4 +---
 .../constant_nested_mapping.sol                |  2 +-
 .../parsing/location_specifiers_for_params.sol |  1 -
 ...reference_constant_variable_declaration.sol |  2 ++
 15 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_constant_variable_declaration.sol

diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index d5392ef84b..076155366b 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -437,14 +437,16 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 		type = TypeProvider::withLocation(ref, typeLoc, isPointer);
 	}
 
-	if (_variable.isConstant() && !type->isValueType())
-	{
-		bool allowed = false;
-		if (auto arrayType = dynamic_cast<ArrayType const*>(type))
-			allowed = arrayType->isByteArray();
-		if (!allowed)
-			m_errorReporter.fatalDeclarationError(9259_error, _variable.location(), "Constants of non-value type not yet implemented.");
-	}
+	if (
+		_variable.isConstant() &&
+		!dynamic_cast<UserDefinedValueType const*>(type) &&
+		type->containsNestedMapping()
+	)
+		m_errorReporter.fatalDeclarationError(
+			3530_error,
+			_variable.location(),
+			"The type contains a (nested) mapping and therefore cannot be a constant."
+		);
 
 	_variable.annotation().type = type;
 }
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 83a9da55c7..05fdc489bb 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -530,6 +530,15 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
 	}
 	if (_variable.isConstant())
 	{
+		if (!varType->isValueType())
+		{
+			bool allowed = false;
+			if (auto arrayType = dynamic_cast<ArrayType const*>(varType))
+				allowed = arrayType->isByteArray();
+			if (!allowed)
+				m_errorReporter.fatalTypeError(9259_error, _variable.location(), "Constants of non-value type not yet implemented.");
+		}
+
 		if (!_variable.value())
 			m_errorReporter.typeError(4266_error, _variable.location(), "Uninitialized \"constant\" variable.");
 		else if (!*_variable.value()->annotation().isPure)
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 334e69ba15..b08694820b 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1124,6 +1124,8 @@ class UserDefinedValueType: public Type
 	bool containsNestedMapping() const override
 	{
 		solAssert(nameable(), "Called for a non nameable type.");
+		// DeclarationTypeChecker::endVisit(VariableDeclaration const&)
+		// assumes that this will never be true.
 		solAssert(!underlyingType().containsNestedMapping(), "");
 		return false;
 	}
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol b/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
index 4ad0a0c4b4..585c005f62 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
@@ -1,4 +1,3 @@
 int[L] constant L = 6;
 // ----
 // TypeError 5462: (4-5): Invalid array length, expected integer literal or constant expression.
-// DeclarationError 9259: (0-21): Constants of non-value type not yet implemented.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol b/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
index 7ce1a7ad39..9073f6ac16 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
@@ -3,4 +3,3 @@ contract C {
 }
 // ----
 // TypeError 5462: (21-22): Invalid array length, expected integer literal or constant expression.
-// DeclarationError 9259: (17-38): Constants of non-value type not yet implemented.
diff --git a/test/libsolidity/syntaxTests/constants/mapping_constant.sol b/test/libsolidity/syntaxTests/constants/mapping_constant.sol
index 5821d0d569..4d80fb43e3 100644
--- a/test/libsolidity/syntaxTests/constants/mapping_constant.sol
+++ b/test/libsolidity/syntaxTests/constants/mapping_constant.sol
@@ -1,3 +1,3 @@
 mapping(uint => uint) constant b = b;
 // ----
-// DeclarationError 9259: (0-36): Constants of non-value type not yet implemented.
+// DeclarationError 3530: (0-36): The type contains a (nested) mapping and therefore cannot be a constant.
diff --git a/test/libsolidity/syntaxTests/constants/struct_constant.sol b/test/libsolidity/syntaxTests/constants/struct_constant.sol
index 42f4584ed4..8d750beb6a 100644
--- a/test/libsolidity/syntaxTests/constants/struct_constant.sol
+++ b/test/libsolidity/syntaxTests/constants/struct_constant.sol
@@ -1,4 +1,4 @@
 struct S { uint x; }
 S constant s;
 // ----
-// DeclarationError 9259: (21-33): Constants of non-value type not yet implemented.
+// TypeError 9259: (21-33): Constants of non-value type not yet implemented.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol b/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
index 2ee03b09ea..f8e0896c3f 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
@@ -5,4 +5,4 @@ contract C {
     S public constant e = 0x1212121212121212121212121212121212121212;
 }
 // ----
-// DeclarationError 9259: (71-135): Constants of non-value type not yet implemented.
+// DeclarationError 3530: (71-135): The type contains a (nested) mapping and therefore cannot be a constant.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
index cac87c3ddc..aaf6f620a6 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
@@ -3,4 +3,3 @@ contract test {
 }
 // ----
 // DeclarationError 1788: (31-55): The "constant" keyword can only be used for state variables or variables at file level.
-// DeclarationError 9259: (31-55): Constants of non-value type not yet implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
index cb39b004b2..81b9eab8a7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
@@ -2,4 +2,4 @@ contract C {
     uint[3] constant x = [uint(1), 2, 3];
 }
 // ----
-// DeclarationError 9259: (17-53): Constants of non-value type not yet implemented.
+// TypeError 9259: (17-53): Constants of non-value type not yet implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
index b9b798431e..d32dd2768f 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
@@ -3,4 +3,4 @@ contract C {
     S constant x = S(5, new uint[](4));
 }
 // ----
-// DeclarationError 9259: (52-86): Constants of non-value type not yet implemented.
+// TypeError 9259: (52-86): Constants of non-value type not yet implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
index 12d2d9105d..7539a99cbe 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
@@ -1,7 +1,5 @@
 contract C {
-    // This should probably have a better error message at some point.
-    // Constant mappings should not be possible in general.
     mapping(uint => uint) constant x;
 }
 // ----
-// DeclarationError 9259: (148-180): Constants of non-value type not yet implemented.
+// DeclarationError 3530: (17-49): The type contains a (nested) mapping and therefore cannot be a constant.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
index fcc8a432b0..81e6e6b152 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
@@ -5,4 +5,4 @@ contract C {
     S public constant c;
 }
 // ----
-// DeclarationError 9259: (71-90): Constants of non-value type not yet implemented.
+// DeclarationError 3530: (71-90): The type contains a (nested) mapping and therefore cannot be a constant.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
index 8e1ca503c0..7d3dd56405 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
@@ -3,4 +3,3 @@ contract Foo {
 }
 // ----
 // DeclarationError 1788: (30-55): The "constant" keyword can only be used for state variables or variables at file level.
-// DeclarationError 9259: (30-55): Constants of non-value type not yet implemented.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_constant_variable_declaration.sol b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_constant_variable_declaration.sol
new file mode 100644
index 0000000000..a459698a70
--- /dev/null
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/forward_reference_constant_variable_declaration.sol
@@ -0,0 +1,2 @@
+MyInt constant x = MyInt.wrap(20);
+type MyInt is int;

From 61519da4f0091dd2dfd421b6654dc78e9440ff6e Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 27 Oct 2021 14:16:50 +0200
Subject: [PATCH 0039/1748] Fix wrong path to isoltest in docs

---
 docs/contributing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index ffb1d345c5..4844eaae3c 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -212,7 +212,7 @@ editing of failing contracts using your preferred text editor. Let's try to brea
     // ----
     // DeclarationError: (36-52): Identifier already declared.
 
-Running ``./build/test/isoltest`` again results in a test failure:
+Running ``./build/test/tools/isoltest`` again results in a test failure:
 
 .. code-block:: text
 

From dce13fbb6a48c1a62672fa9e057772bafbdf3828 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 25 Oct 2021 16:35:51 +0200
Subject: [PATCH 0040/1748] Fix use-after-free bug.

---
 libyul/ControlFlowSideEffectsCollector.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libyul/ControlFlowSideEffectsCollector.cpp b/libyul/ControlFlowSideEffectsCollector.cpp
index 047480f144..f907f83f5b 100644
--- a/libyul/ControlFlowSideEffectsCollector.cpp
+++ b/libyul/ControlFlowSideEffectsCollector.cpp
@@ -212,7 +212,8 @@ ControlFlowSideEffectsCollector::ControlFlowSideEffectsCollector(
 			if (calledSideEffects->canRevert)
 				sideEffects.canRevert = true;
 
-			for (YulString callee: util::valueOrDefault(m_functionCalls, _function))
+			set<YulString> emptySet;
+			for (YulString callee: util::valueOrDefault(m_functionCalls, _function, emptySet))
 				_recurse(callee, _recurse);
 		};
 		for (auto const& call: calls)

From eb2425bd7c14db2d98ca06a50586ecc8093b0652 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 27 Oct 2021 18:02:26 +0200
Subject: [PATCH 0041/1748] isoltest: Fix gas tests always being enforced
 regardless of evm version

---
 test/tools/IsolTestOptions.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/tools/IsolTestOptions.cpp b/test/tools/IsolTestOptions.cpp
index 7f00e88f67..d2323ec166 100644
--- a/test/tools/IsolTestOptions.cpp
+++ b/test/tools/IsolTestOptions.cpp
@@ -60,7 +60,6 @@ IsolTestOptions::IsolTestOptions():
 	CommonOptions(description)
 {
 	enforceViaYul = true;
-	enforceGasTest = (evmVersion() == langutil::EVMVersion{});
 }
 
 void IsolTestOptions::addOptions()
@@ -84,6 +83,8 @@ bool IsolTestOptions::parse(int _argc, char const* const* _argv)
 		return false;
 	}
 
+	enforceGasTest = enforceGasTest || (evmVersion() == langutil::EVMVersion{});
+
 	return res;
 }
 

From a0394316274b9811be7d3c98c0ce687dfcb10e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 27 Oct 2021 18:20:04 +0200
Subject: [PATCH 0042/1748] isoltest: Do not try to enforce gas costs when
 ABIEncoderV1 is used

---
 test/tools/IsolTestOptions.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/tools/IsolTestOptions.cpp b/test/tools/IsolTestOptions.cpp
index d2323ec166..cdd1b85ab1 100644
--- a/test/tools/IsolTestOptions.cpp
+++ b/test/tools/IsolTestOptions.cpp
@@ -83,7 +83,7 @@ bool IsolTestOptions::parse(int _argc, char const* const* _argv)
 		return false;
 	}
 
-	enforceGasTest = enforceGasTest || (evmVersion() == langutil::EVMVersion{});
+	enforceGasTest = enforceGasTest || (evmVersion() == langutil::EVMVersion{} && !useABIEncoderV1);
 
 	return res;
 }

From f4421f1b695ce4798927f30896743408319eddb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 27 Oct 2021 19:52:36 +0200
Subject: [PATCH 0043/1748] Disable metadata in syntax tests

---
 test/libsolidity/SyntaxTest.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 2a70c35ab4..4998b628b3 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -77,6 +77,8 @@ void SyntaxTest::setupCompiler()
 		OptimiserSettings::full() :
 		OptimiserSettings::minimal()
 	);
+	compiler().setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
+	compiler().setMetadataHash(CompilerStack::MetadataHash::None);
 }
 
 void SyntaxTest::parseAndAnalyze()

From 79ffa16a61dc866f500551ab2213ad2387f38d9c Mon Sep 17 00:00:00 2001
From: David Dzhalaev <72649244+DavidRomanovizc@users.noreply.github.com>
Date: Fri, 22 Oct 2021 00:41:22 +0300
Subject: [PATCH 0044/1748] Improve error message for contract size limit error

---
 libsolidity/interface/CompilerStack.cpp              |  5 ++++-
 test/libsolidity/syntaxTests/bytecode_too_large.sol  |  6 ++++--
 .../syntaxTests/bytecode_too_large_abiencoder_v1.sol | 12 ++++++++++++
 .../syntaxTests/bytecode_too_large_byzantium.sol     | 10 ++++++++++
 .../syntaxTests/bytecode_too_large_homestead.sol     |  9 +++++++++
 5 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol
 create mode 100644 test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol
 create mode 100644 test/libsolidity/syntaxTests/bytecode_too_large_homestead.sol

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 9fa3cb1645..9ec3a402e6 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -83,6 +83,7 @@
 #include <utility>
 #include <map>
 #include <limits>
+#include <string>
 
 using namespace std;
 using namespace solidity;
@@ -1248,7 +1249,9 @@ void CompilerStack::assemble(
 		m_errorReporter.warning(
 			5574_error,
 			_contract.location(),
-			"Contract code size exceeds 24576 bytes (a limit introduced in Spurious Dragon). "
+			"Contract code size is "s +
+			to_string(compiledContract.runtimeObject.bytecode.size()) +
+			" bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). "
 			"This contract may not be deployable on mainnet. "
 			"Consider enabling the optimizer (with a low \"runs\" value!), "
 			"turning off revert strings, or using libraries."
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large.sol b/test/libsolidity/syntaxTests/bytecode_too_large.sol
index 58446e0daf..55d637bfbd 100644
--- a/test/libsolidity/syntaxTests/bytecode_too_large.sol
+++ b/test/libsolidity/syntaxTests/bytecode_too_large.sol
@@ -1,3 +1,5 @@
+pragma abicoder v2;
+
 contract test {
     function f() public pure returns (string memory ret) {
         // 27000 bytes long data
@@ -5,6 +7,6 @@ contract test {
     }
 }
 // ====
-// EVMVersion: >=spuriousDragon
+// EVMVersion: >byzantium
 // ----
-// Warning 5574: (0-27133): Contract code size exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (21-27154): Contract code size is 27199 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol b/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol
new file mode 100644
index 0000000000..69dc7ebd0c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol
@@ -0,0 +1,12 @@
+pragma abicoder v1;
+
+contract test {
+    function f() public pure returns (string memory ret) {
+        // 27000 bytes long data
+        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
+    }
+}
+// ====
+// EVMVersion: >byzantium
+// ----
+// Warning 5574: (21-27154): Contract code size is 27209 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol b/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol
new file mode 100644
index 0000000000..a95ed192a3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol
@@ -0,0 +1,10 @@
+contract test {
+    function f() public pure returns (string memory ret) {
+        // 27000 bytes long data
+        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
+    }
+}
+// ====
+// EVMVersion: =byzantium
+// ----
+// Warning 5574: (0-27133): Contract code size is 27227 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large_homestead.sol b/test/libsolidity/syntaxTests/bytecode_too_large_homestead.sol
new file mode 100644
index 0000000000..946f5e8b41
--- /dev/null
+++ b/test/libsolidity/syntaxTests/bytecode_too_large_homestead.sol
@@ -0,0 +1,9 @@
+contract test {
+    function f() public pure returns (string memory ret) {
+        // 27000 bytes long data
+        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
+    }
+}
+// ====
+// EVMVersion: =homestead
+// ----

From 464ac18a1f451430d1e2e7f1090a2671237e27d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 28 Oct 2021 16:39:51 +0200
Subject: [PATCH 0045/1748] Rename negation_bug.yul to negation_bug.sol

---
 .../semanticTests/viaYul/{negation_bug.yul => negation_bug.sol}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/libsolidity/semanticTests/viaYul/{negation_bug.yul => negation_bug.sol} (100%)

diff --git a/test/libsolidity/semanticTests/viaYul/negation_bug.yul b/test/libsolidity/semanticTests/viaYul/negation_bug.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/negation_bug.yul
rename to test/libsolidity/semanticTests/viaYul/negation_bug.sol

From 60ba3b307fd5e16cd0f68f0533e982a66ce5877b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 28 Oct 2021 17:34:57 +0200
Subject: [PATCH 0046/1748] isolate_tests: Fix typo in script description

---
 scripts/isolate_tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/isolate_tests.py b/scripts/isolate_tests.py
index 1e2170e828..4abe6a0bd4 100755
--- a/scripts/isolate_tests.py
+++ b/scripts/isolate_tests.py
@@ -134,7 +134,7 @@ def extract_and_write(path, language):
 if __name__ == '__main__':
     script_description = (
         "Reads Solidity, C++ or RST source files and extracts compilable solidity and yul code blocks from them. "
-        "Can be used to generate test cases to validade code examples. "
+        "Can be used to generate test cases to validate code examples. "
     )
 
     parser = ArgumentParser(description=script_description)

From fd66f13dc0ca8052eb3bf1dedf5afb6ed8c14399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 28 Oct 2021 19:08:06 +0200
Subject: [PATCH 0047/1748] soltest.sh: Fix typo in a comment

---
 .circleci/soltest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/soltest.sh b/.circleci/soltest.sh
index 4f9bd8a81d..1814b87280 100755
--- a/.circleci/soltest.sh
+++ b/.circleci/soltest.sh
@@ -46,7 +46,7 @@ source "${REPODIR}/scripts/common.sh"
 # Test result output directory (CircleCI is reading test results from here)
 mkdir -p test_results
 
-# in case we run with ASAN enabled, we must increase stck size.
+# in case we run with ASAN enabled, we must increase stack size.
 ulimit -s 16384
 
 get_logfile_basename() {

From 8e208f23cba81f965b178a076de2e2f4c144a70d Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 28 Oct 2021 16:25:43 +0200
Subject: [PATCH 0048/1748] Fix assignment of return variables from modifiers.

---
 Changelog.md                                      |  3 +++
 libsolidity/codegen/ir/IRGenerator.cpp            |  4 ++--
 .../function_modifier_return_reference.sol        | 15 +++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol

diff --git a/Changelog.md b/Changelog.md
index ff183e22b2..4cfbe6637a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -29,6 +29,9 @@ Bugfixes:
  * Yul IR Generator: Do not output empty switches/if-bodies for empty contracts.
 
 
+Important Bugfixes in Experimental Features:
+ * Yul IR Generator: Changes to function return variables referenced in modifier invocation arguments were not properly forwarded if there was more than one return variable.
+
 
 ### 0.8.9 (2021-09-29)
 
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 44cd534ff1..b17b33c03f 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -438,7 +438,7 @@ string IRGenerator::generateModifier(
 		for (size_t i = 0; i < retParamsIn.size(); ++i)
 		{
 			retParams.emplace_back(m_context.newYulVariable());
-			assignRetParams += retParams.back() + " := " + retParamsIn[i] + "\n";
+			assignRetParams += retParams.at(i) + " := " + retParamsIn.at(i) + "\n";
 		}
 		t("retParams", joinHumanReadable(retParams));
 		t("assignRetParams", assignRetParams);
@@ -529,7 +529,7 @@ string IRGenerator::generateFunctionWithModifierInner(FunctionDefinition const&
 		for (size_t i = 0; i < retParams.size(); ++i)
 		{
 			retParamsIn.emplace_back(m_context.newYulVariable());
-			assignRetParams += retParams.back() + " := " + retParamsIn[i] + "\n";
+			assignRetParams += retParams.at(i) + " := " + retParamsIn.at(i) + "\n";
 		}
 		vector<string> params = retParamsIn;
 		for (auto const& varDecl: _function.parameters())
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol
new file mode 100644
index 0000000000..1da6c011d1
--- /dev/null
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol
@@ -0,0 +1,15 @@
+contract C {
+    modifier m1(uint value) {
+        _;
+    }
+    modifier m2(uint value) {
+        _;
+    }
+
+    function f() public m1(x = 2) m2(y = 3) returns (uint x, uint y) {
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// f() -> 2, 3

From 7683442ce27c083c5f51484ba9322c0678339406 Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Mon, 1 Nov 2021 10:24:08 +0100
Subject: [PATCH 0049/1748] Semantic test for high level call to precompiles.

Because of the extcodesize check, the high level call will fail. Even though the low level call can
succeed and return data.
---
 .../precompile_extcodesize_check.sol          | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol

diff --git a/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol b/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
new file mode 100644
index 0000000000..7a9025e26c
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
@@ -0,0 +1,25 @@
+interface Identity {
+    function selectorAndAppendValue(uint value) external pure returns (uint);
+}
+contract C {
+    Identity constant i = Identity(address(0x0004));
+    function testHighLevel() external pure returns (bool) {
+        // Should fail because `extcodesize(4) = 0`
+        i.selectorAndAppendValue(5);
+        return true;
+    }
+    function testLowLevel() external view returns (uint value) {
+        (bool success, bytes memory ret) =
+            address(4).staticcall(
+                abi.encodeWithSelector(Identity.selectorAndAppendValue.selector, uint(5))
+            );
+        value = abi.decode(ret, (uint));
+    }
+
+}
+// ====
+// compileViaYul: also
+// EVMVersion: >=constantinople
+// ----
+// testHighLevel() -> FAILURE
+// testLowLevel() -> 0xc76596d400000000000000000000000000000000000000000000000000000000

From d6c461ed618849fcad037974455d65aa4e09c9e0 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 5 Oct 2021 18:46:49 +0200
Subject: [PATCH 0050/1748] Use side effects of user-defined functions in other
 optimizer steps.

---
 libyul/optimiser/ConditionalSimplifier.cpp   |  9 +++++-
 libyul/optimiser/ConditionalSimplifier.h     | 14 +++++-----
 libyul/optimiser/ConditionalUnsimplifier.cpp |  9 +++++-
 libyul/optimiser/ConditionalUnsimplifier.h   | 13 +++++----
 libyul/optimiser/DeadCodeEliminator.cpp      |  9 ++++--
 libyul/optimiser/DeadCodeEliminator.h        | 11 ++++++--
 libyul/optimiser/Semantics.cpp               | 29 ++++++++++++++++----
 libyul/optimiser/Semantics.h                 | 26 ++++++++++++------
 8 files changed, 88 insertions(+), 32 deletions(-)

diff --git a/libyul/optimiser/ConditionalSimplifier.cpp b/libyul/optimiser/ConditionalSimplifier.cpp
index ea32949ed7..3a2e8aa4e4 100644
--- a/libyul/optimiser/ConditionalSimplifier.cpp
+++ b/libyul/optimiser/ConditionalSimplifier.cpp
@@ -19,6 +19,7 @@
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/AST.h>
 #include <libyul/optimiser/NameCollector.h>
+#include <libyul/ControlFlowSideEffectsCollector.h>
 #include <libsolutil/CommonData.h>
 
 using namespace std;
@@ -26,6 +27,12 @@ using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
 
+void ConditionalSimplifier::run(OptimiserStepContext& _context, Block& _ast)
+{
+	ControlFlowSideEffectsCollector sideEffects(_context.dialect, _ast);
+	ConditionalSimplifier{_context.dialect, sideEffects.functionSideEffects()}(_ast);
+}
+
 void ConditionalSimplifier::operator()(Switch& _switch)
 {
 	visit(*_switch.expression);
@@ -65,7 +72,7 @@ void ConditionalSimplifier::operator()(Block& _block)
 				if (
 					holds_alternative<Identifier>(*_if.condition) &&
 					!_if.body.statements.empty() &&
-					TerminationFinder(m_dialect).controlFlowKind(_if.body.statements.back()) !=
+					TerminationFinder(m_dialect, &m_functionSideEffects).controlFlowKind(_if.body.statements.back()) !=
 						TerminationFinder::ControlFlow::FlowOut
 				)
 				{
diff --git a/libyul/optimiser/ConditionalSimplifier.h b/libyul/optimiser/ConditionalSimplifier.h
index e41ee579cc..57a6696c4b 100644
--- a/libyul/optimiser/ConditionalSimplifier.h
+++ b/libyul/optimiser/ConditionalSimplifier.h
@@ -44,7 +44,6 @@ namespace solidity::yul
  *
  * Future features:
  *  - allow replacements by "1"
- *  - take termination of user-defined functions into account
  *
  * Works best with SSA form and if dead code removal has run before.
  *
@@ -54,20 +53,21 @@ class ConditionalSimplifier: public ASTModifier
 {
 public:
 	static constexpr char const* name{"ConditionalSimplifier"};
-	static void run(OptimiserStepContext& _context, Block& _ast)
-	{
-		ConditionalSimplifier{_context.dialect}(_ast);
-	}
+	static void run(OptimiserStepContext& _context, Block& _ast);
 
 	using ASTModifier::operator();
 	void operator()(Switch& _switch) override;
 	void operator()(Block& _block) override;
 
 private:
-	explicit ConditionalSimplifier(Dialect const& _dialect):
-		m_dialect(_dialect)
+	explicit ConditionalSimplifier(
+		Dialect const& _dialect,
+		std::map<YulString, ControlFlowSideEffects> const& _sideEffects
+	):
+		m_dialect(_dialect), m_functionSideEffects(_sideEffects)
 	{}
 	Dialect const& m_dialect;
+	std::map<YulString, ControlFlowSideEffects> const& m_functionSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/ConditionalUnsimplifier.cpp b/libyul/optimiser/ConditionalUnsimplifier.cpp
index f522654d43..752e06918b 100644
--- a/libyul/optimiser/ConditionalUnsimplifier.cpp
+++ b/libyul/optimiser/ConditionalUnsimplifier.cpp
@@ -20,6 +20,7 @@
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
 #include <libyul/optimiser/NameCollector.h>
+#include <libyul/ControlFlowSideEffectsCollector.h>
 #include <libsolutil/CommonData.h>
 
 using namespace std;
@@ -27,6 +28,12 @@ using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
 
+void ConditionalUnsimplifier::run(OptimiserStepContext& _context, Block& _ast)
+{
+	ControlFlowSideEffectsCollector sideEffects(_context.dialect, _ast);
+	ConditionalUnsimplifier{_context.dialect, sideEffects.functionSideEffects()}(_ast);
+}
+
 void ConditionalUnsimplifier::operator()(Switch& _switch)
 {
 	visit(*_switch.expression);
@@ -78,7 +85,7 @@ void ConditionalUnsimplifier::operator()(Block& _block)
 					YulString condition = std::get<Identifier>(*_if.condition).name;
 					if (
 						holds_alternative<Assignment>(_stmt2) &&
-						TerminationFinder(m_dialect).controlFlowKind(_if.body.statements.back()) !=
+						TerminationFinder(m_dialect, &m_functionSideEffects).controlFlowKind(_if.body.statements.back()) !=
 							TerminationFinder::ControlFlow::FlowOut
 					)
 					{
diff --git a/libyul/optimiser/ConditionalUnsimplifier.h b/libyul/optimiser/ConditionalUnsimplifier.h
index 975011b957..8025b661b9 100644
--- a/libyul/optimiser/ConditionalUnsimplifier.h
+++ b/libyul/optimiser/ConditionalUnsimplifier.h
@@ -33,20 +33,21 @@ class ConditionalUnsimplifier: public ASTModifier
 {
 public:
 	static constexpr char const* name{"ConditionalUnsimplifier"};
-	static void run(OptimiserStepContext& _context, Block& _ast)
-	{
-		ConditionalUnsimplifier{_context.dialect}(_ast);
-	}
+	static void run(OptimiserStepContext& _context, Block& _ast);
 
 	using ASTModifier::operator();
 	void operator()(Switch& _switch) override;
 	void operator()(Block& _block) override;
 
 private:
-	explicit ConditionalUnsimplifier(Dialect const& _dialect):
-		m_dialect(_dialect)
+	explicit ConditionalUnsimplifier(
+		Dialect const& _dialect,
+		std::map<YulString, ControlFlowSideEffects> const& _sideEffects
+	):
+		m_dialect(_dialect), m_functionSideEffects(_sideEffects)
 	{}
 	Dialect const& m_dialect;
+	std::map<YulString, ControlFlowSideEffects> const& m_functionSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/DeadCodeEliminator.cpp b/libyul/optimiser/DeadCodeEliminator.cpp
index 6a279487f8..ad127a9108 100644
--- a/libyul/optimiser/DeadCodeEliminator.cpp
+++ b/libyul/optimiser/DeadCodeEliminator.cpp
@@ -22,6 +22,7 @@
 #include <libyul/optimiser/DeadCodeEliminator.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
+#include <libyul/ControlFlowSideEffectsCollector.h>
 #include <libyul/AST.h>
 
 #include <libevmasm/SemanticInformation.h>
@@ -36,7 +37,11 @@ using namespace solidity::yul;
 
 void DeadCodeEliminator::run(OptimiserStepContext& _context, Block& _ast)
 {
-	DeadCodeEliminator{_context.dialect}(_ast);
+	ControlFlowSideEffectsCollector sideEffects(_context.dialect, _ast);
+	DeadCodeEliminator{
+		_context.dialect,
+		sideEffects.functionSideEffects()
+	}(_ast);
 }
 
 void DeadCodeEliminator::operator()(ForLoop& _for)
@@ -49,7 +54,7 @@ void DeadCodeEliminator::operator()(Block& _block)
 {
 	TerminationFinder::ControlFlow controlFlowChange;
 	size_t index;
-	tie(controlFlowChange, index) = TerminationFinder{m_dialect}.firstUnconditionalControlFlowChange(_block.statements);
+	tie(controlFlowChange, index) = TerminationFinder{m_dialect, &m_functionSideEffects}.firstUnconditionalControlFlowChange(_block.statements);
 
 	// Erase everything after the terminating statement that is not a function definition.
 	if (controlFlowChange != TerminationFinder::ControlFlow::FlowOut && index != std::numeric_limits<size_t>::max())
diff --git a/libyul/optimiser/DeadCodeEliminator.h b/libyul/optimiser/DeadCodeEliminator.h
index d47bf86ea8..98202fc943 100644
--- a/libyul/optimiser/DeadCodeEliminator.h
+++ b/libyul/optimiser/DeadCodeEliminator.h
@@ -31,12 +31,15 @@ namespace solidity::yul
 {
 struct Dialect;
 struct OptimiserStepContext;
+struct ControlFlowSideEffects;
 
 /**
  * Optimisation stage that removes unreachable code
  *
  * Unreachable code is any code within a block which is preceded by a
- * leave, return, invalid, break, continue, selfdestruct or revert.
+ * leave, return, invalid, break, continue, selfdestruct or revert or
+ * a call to a user-defined function that never returns (either due to
+ * recursion or a call to return / revert / stop).
  *
  * Function definitions are retained as they might be called by earlier
  * code and thus are considered reachable.
@@ -57,9 +60,13 @@ class DeadCodeEliminator: public ASTModifier
 	void operator()(Block& _block) override;
 
 private:
-	DeadCodeEliminator(Dialect const& _dialect): m_dialect(_dialect) {}
+	DeadCodeEliminator(
+		Dialect const& _dialect,
+		std::map<YulString, ControlFlowSideEffects> const& _sideEffects
+	): m_dialect(_dialect), m_functionSideEffects(_sideEffects) {}
 
 	Dialect const& m_dialect;
+	std::map<YulString, ControlFlowSideEffects> const& m_functionSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
index bdd08710eb..12349394a0 100644
--- a/libyul/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@@ -182,8 +182,19 @@ pair<TerminationFinder::ControlFlow, size_t> TerminationFinder::firstUncondition
 TerminationFinder::ControlFlow TerminationFinder::controlFlowKind(Statement const& _statement)
 {
 	if (
+		holds_alternative<VariableDeclaration>(_statement) &&
+		std::get<VariableDeclaration>(_statement).value &&
+		containsNonContinuingFunctionCall(*std::get<VariableDeclaration>(_statement).value)
+	)
+		return ControlFlow::Terminate;
+	else if (
+		holds_alternative<Assignment>(_statement) &&
+		containsNonContinuingFunctionCall(*std::get<Assignment>(_statement).value)
+	)
+		return ControlFlow::Terminate;
+	else if (
 		holds_alternative<ExpressionStatement>(_statement) &&
-		isTerminatingBuiltin(std::get<ExpressionStatement>(_statement))
+		containsNonContinuingFunctionCall(std::get<ExpressionStatement>(_statement).expression)
 	)
 		return ControlFlow::Terminate;
 	else if (holds_alternative<Break>(_statement))
@@ -196,10 +207,18 @@ TerminationFinder::ControlFlow TerminationFinder::controlFlowKind(Statement cons
 		return ControlFlow::FlowOut;
 }
 
-bool TerminationFinder::isTerminatingBuiltin(ExpressionStatement const& _exprStmnt)
+bool TerminationFinder::containsNonContinuingFunctionCall(Expression const& _expr)
 {
-	if (holds_alternative<FunctionCall>(_exprStmnt.expression))
-		if (auto instruction = toEVMInstruction(m_dialect, std::get<FunctionCall>(_exprStmnt.expression).functionName.name))
-			return evmasm::SemanticInformation::terminatesControlFlow(*instruction);
+	if (auto functionCall = std::get_if<FunctionCall>(&_expr))
+	{
+		for (auto const& arg: functionCall->arguments)
+			if (containsNonContinuingFunctionCall(arg))
+				return true;
+
+		if (auto builtin = m_dialect.builtin(functionCall->functionName.name))
+			return !builtin->controlFlowSideEffects.canContinue;
+		else if (m_functionSideEffects && m_functionSideEffects->count(functionCall->functionName.name))
+			return !m_functionSideEffects->at(functionCall->functionName.name).canContinue;
+	}
 	return false;
 }
diff --git a/libyul/optimiser/Semantics.h b/libyul/optimiser/Semantics.h
index 75ea401515..32b9c9b582 100644
--- a/libyul/optimiser/Semantics.h
+++ b/libyul/optimiser/Semantics.h
@@ -205,22 +205,31 @@ class MovableChecker: public SideEffectsCollector
 	std::set<YulString> m_variableReferences;
 };
 
+struct ControlFlowSideEffects;
 
 /**
  * Helper class to find "irregular" control flow.
- * This includes termination, break and continue.
+ * This includes termination, break, continue and leave.
+ * In general, it is applied only to "simple" statements. The control-flow
+ * of loops, switches and if statements is always "FlowOut" with the assumption
+ * that the caller will descend into them.
  */
 class TerminationFinder
 {
 public:
-	// TODO check all uses of TerminationFinder!
+	/// "Terminate" here means that there is no continuing control-flow.
+	/// If this is applied to a function that can revert or stop, but can also
+	/// exit regularly, the property is set to "FlowOut".
 	enum class ControlFlow { FlowOut, Break, Continue, Terminate, Leave };
 
-	TerminationFinder(Dialect const& _dialect): m_dialect(_dialect) {}
+	TerminationFinder(
+		Dialect const& _dialect,
+		std::map<YulString, ControlFlowSideEffects> const* _functionSideEffects = nullptr
+	): m_dialect(_dialect), m_functionSideEffects(_functionSideEffects) {}
 
 	/// @returns the index of the first statement in the provided sequence
 	/// that is an unconditional ``break``, ``continue``, ``leave`` or a
-	/// call to a terminating builtin function.
+	/// call to a terminating function.
 	/// If control flow can continue at the end of the list,
 	/// returns `FlowOut` and ``size_t(-1)``.
 	/// The function might return ``FlowOut`` even though control
@@ -233,13 +242,14 @@ class TerminationFinder
 	/// This function could return FlowOut even if control flow never continues.
 	ControlFlow controlFlowKind(Statement const& _statement);
 
-	/// @returns true if the expression statement is a direct
-	/// call to a builtin terminating function like
-	/// ``stop``, ``revert`` or ``return``.
-	bool isTerminatingBuiltin(ExpressionStatement const& _exprStmnt);
+	/// @returns true if the expression contains a
+	/// call to a terminating function, i.e. a function that does not have
+	/// a regular "flow out" control-flow (it might also be recursive).
+	bool containsNonContinuingFunctionCall(Expression const& _expr);
 
 private:
 	Dialect const& m_dialect;
+	std::map<YulString, ControlFlowSideEffects> const* m_functionSideEffects;
 };
 
 }

From 3996d0a34363d1b8b489b40aac204ec1adf11cb4 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 25 Oct 2021 16:54:29 +0200
Subject: [PATCH 0051/1748] Update tests.

---
 .../dead_code_user_functions.yul              | 44 +++++++++++++++++++
 .../function_after_revert.yul                 |  6 +--
 .../fullSuite/name_cleaner_reserved.yul       |  8 ++--
 ...nusedFunctionParameterPruner_recursion.yul | 16 ++++---
 4 files changed, 61 insertions(+), 13 deletions(-)
 create mode 100644 test/libyul/yulOptimizerTests/deadCodeEliminator/dead_code_user_functions.yul

diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/dead_code_user_functions.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/dead_code_user_functions.yul
new file mode 100644
index 0000000000..00293d71d1
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/deadCodeEliminator/dead_code_user_functions.yul
@@ -0,0 +1,44 @@
+{
+    switch calldataload(0)
+    case 0 {
+        recursive()
+        sstore(0, 1)
+    }
+    case 1 {
+        terminating()
+        sstore(0, 7)
+    }
+    case 2 {
+        reverting()
+        sstore(0, 7)
+    }
+
+
+    function recursive()
+    {
+        recursive()
+    }
+    function terminating()
+    {
+        return(0, 0)
+    }
+    function reverting()
+    {
+        revert(0, 0)
+    }
+}
+// ----
+// step: deadCodeEliminator
+//
+// {
+//     switch calldataload(0)
+//     case 0 { recursive() }
+//     case 1 { terminating() }
+//     case 2 { reverting() }
+//     function recursive()
+//     { recursive() }
+//     function terminating()
+//     { return(0, 0) }
+//     function reverting()
+//     { revert(0, 0) }
+// }
diff --git a/test/libyul/yulOptimizerTests/deadCodeEliminator/function_after_revert.yul b/test/libyul/yulOptimizerTests/deadCodeEliminator/function_after_revert.yul
index d5df28fb09..a75636b760 100644
--- a/test/libyul/yulOptimizerTests/deadCodeEliminator/function_after_revert.yul
+++ b/test/libyul/yulOptimizerTests/deadCodeEliminator/function_after_revert.yul
@@ -5,9 +5,7 @@
 
     function fun()
     {
-        return(1, 1)
-
-        pop(sub(10, 5))
+        sstore(0, 1)
     }
 
     pop(add(1, 1))
@@ -19,5 +17,5 @@
 //     fun()
 //     revert(0, 0)
 //     function fun()
-//     { return(1, 1) }
+//     { sstore(0, 1) }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul b/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul
index 576f5abb90..851ccbce2a 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul
@@ -1,11 +1,11 @@
 {
 	// This function name can be shortened, the other cannot.
 	function nonmstore_(x) {
-		nonmstore_(x)
+		if calldataload(0) { nonmstore_(x) }
 		sstore(10, calldataload(2))
 	}
 	function mstore_(x) -> y {
-		let t3_3_ := mstore_(x)
+		if calldataload(0) { let t3_3_ := mstore_(x) }
 		y := 8
 		sstore(y, calldataload(y))
 	}
@@ -22,12 +22,12 @@
 //     }
 //     function nonmstore(x)
 //     {
-//         nonmstore(x)
+//         if calldataload(0) { nonmstore(x) }
 //         sstore(10, calldataload(2))
 //     }
 //     function mstore_(x) -> y
 //     {
-//         pop(mstore_(x))
+//         if calldataload(0) { pop(mstore_(x)) }
 //         y := 8
 //         sstore(y, calldataload(y))
 //     }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul
index 69b4517eb3..c3b75e84ee 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul
@@ -5,7 +5,9 @@
     sstore(1, l)
     function f(a, b, c) -> x, y, z
     {
-        x, y, z := f(1, 2, 3)
+        if calldataload(0) {
+            x, y, z := f(1, 2, 3)
+        }
         x := add(x, 1)
     }
 }
@@ -21,9 +23,13 @@
 //     }
 //     function f() -> x, y, z
 //     {
-//         let x_1, y_1, z_1 := f()
-//         y := y_1
-//         z := z_1
-//         x := add(x_1, 1)
+//         if calldataload(0)
+//         {
+//             let x_1, y_1, z_1 := f()
+//             x := x_1
+//             y := y_1
+//             z := z_1
+//         }
+//         x := add(x, 1)
 //     }
 // }

From 7f7c5ca171b33d1bcbbebfdbc5c887509d60fdf9 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 2 Nov 2021 11:50:37 +0100
Subject: [PATCH 0052/1748] New tests.

---
 .../side_effects_of_functions.yul             | 38 +++++++++++++++++++
 .../side_effects_of_functions.yul             | 38 +++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 test/libyul/yulOptimizerTests/conditionalSimplifier/side_effects_of_functions.yul
 create mode 100644 test/libyul/yulOptimizerTests/conditionalUnsimplifier/side_effects_of_functions.yul

diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/side_effects_of_functions.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/side_effects_of_functions.yul
new file mode 100644
index 0000000000..c448fdf023
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/conditionalSimplifier/side_effects_of_functions.yul
@@ -0,0 +1,38 @@
+{
+    function recursive() { recursive() }
+    function terminating() { stop() }
+    function maybeReverting() { if calldataload(0) { revert(0, 0) } }
+
+    let a := calldataload(7)
+    if a { recursive() }
+
+    a := calldataload(a)
+    if a { maybeReverting() }
+
+    a := calldataload(a)
+    if a { terminating() }
+
+    sstore(0, a)
+}
+// ----
+// step: conditionalSimplifier
+//
+// {
+//     function recursive()
+//     { recursive() }
+//     function terminating()
+//     { stop() }
+//     function maybeReverting()
+//     {
+//         if calldataload(0) { revert(0, 0) }
+//     }
+//     let a := calldataload(7)
+//     if a { recursive() }
+//     a := 0
+//     a := calldataload(a)
+//     if a { maybeReverting() }
+//     a := calldataload(a)
+//     if a { terminating() }
+//     a := 0
+//     sstore(0, a)
+// }
diff --git a/test/libyul/yulOptimizerTests/conditionalUnsimplifier/side_effects_of_functions.yul b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/side_effects_of_functions.yul
new file mode 100644
index 0000000000..25e17d75ac
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/conditionalUnsimplifier/side_effects_of_functions.yul
@@ -0,0 +1,38 @@
+{
+    function recursive() { recursive() }
+    function terminating() { stop() }
+    function maybeReverting() { if calldataload(0) { revert(0, 0) } }
+
+    let a := calldataload(7)
+    if a { recursive() }
+    a := 0
+
+    a := calldataload(a)
+    if a { maybeReverting() }
+
+    a := calldataload(a)
+    if a { terminating() }
+    a := 0
+
+    sstore(0, a)
+}
+// ----
+// step: conditionalUnsimplifier
+//
+// {
+//     function recursive()
+//     { recursive() }
+//     function terminating()
+//     { stop() }
+//     function maybeReverting()
+//     {
+//         if calldataload(0) { revert(0, 0) }
+//     }
+//     let a := calldataload(7)
+//     if a { recursive() }
+//     a := calldataload(a)
+//     if a { maybeReverting() }
+//     a := calldataload(a)
+//     if a { terminating() }
+//     sstore(0, a)
+// }

From be6fb5f3d658f914a60dc99016165ced956a6519 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 2 Nov 2021 11:54:10 +0100
Subject: [PATCH 0053/1748] Changelog entry.

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 4cfbe6637a..c724693eeb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ Compiler Features:
  * SMTChecker: Report contract invariants and reentrancy properties. This can be enabled via the CLI option ``--model-checker-invariants`` or the Standard JSON option ``settings.modelChecker.invariants``.
  * Standard JSON: Accept nested brackets in step sequences passed to ``settings.optimizer.details.yulDetails.optimizerSteps``.
  * Standard JSON: Add ``settings.debug.debugInfo`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
+ * Yul Optimizer: Take control-flow side-effects of user-defined functions into account in various optimizer steps.
 
 
 Bugfixes:

From 93c1fe68789ae23c610570c70685d0c6a9aa8a12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 11 Oct 2021 13:03:51 +0200
Subject: [PATCH 0054/1748] Treat --help, --license and --version as separate
 input modes

---
 solc/CommandLineInterface.cpp      | 64 +++++++++++++++++++++++----
 solc/CommandLineInterface.h        |  2 +
 solc/CommandLineParser.cpp         | 69 +++++++++++-------------------
 solc/CommandLineParser.h           | 28 ++++--------
 test/solc/CommandLineInterface.cpp | 39 ++++++++++++++++-
 test/solc/CommandLineParser.cpp    | 62 +++++++++++++--------------
 6 files changed, 159 insertions(+), 105 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 6c24b7742b..e86381bf3f 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -23,6 +23,7 @@
  */
 #include <solc/CommandLineInterface.h>
 
+#include "license.h"
 #include "solidity/BuildInfo.h"
 
 #include <libsolidity/interface/Version.h>
@@ -405,6 +406,13 @@ bool CommandLineInterface::readInputFiles()
 {
 	solAssert(!m_standardJsonInput.has_value(), "");
 
+	if (
+		m_options.input.mode == InputMode::Help ||
+		m_options.input.mode == InputMode::License ||
+		m_options.input.mode == InputMode::Version
+	)
+		return true;
+
 	m_fileReader.setBasePath(m_options.input.basePath);
 
 	if (m_fileReader.basePath() != "")
@@ -573,8 +581,18 @@ void CommandLineInterface::createJson(string const& _fileName, string const& _js
 
 bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
 {
-	CommandLineParser parser(sout(/* _markAsUsed */ false), serr(/* _markAsUsed */ false));
-	bool success = parser.parse(_argc, _argv, isatty(fileno(stdin)));
+	CommandLineParser parser(serr(/* _markAsUsed */ false));
+
+	if (isatty(fileno(stdin)) && _argc == 1)
+	{
+		// If the terminal is taking input from the user, provide more user-friendly output.
+		CommandLineParser::printHelp(sout());
+
+		// In this case we want to exit with an error but not display any error message.
+		return false;
+	}
+
+	bool success = parser.parse(_argc, _argv);
 	if (!success)
 		return false;
 	m_hasOutput = m_hasOutput || parser.hasOutput();
@@ -587,6 +605,15 @@ bool CommandLineInterface::processInput()
 {
 	switch (m_options.input.mode)
 	{
+	case InputMode::Help:
+		CommandLineParser::printHelp(sout());
+		return false;
+	case InputMode::License:
+		printLicense();
+		return true;
+	case InputMode::Version:
+		printVersion();
+		return true;
 	case InputMode::StandardJson:
 	{
 		solAssert(m_standardJsonInput.has_value(), "");
@@ -611,6 +638,19 @@ bool CommandLineInterface::processInput()
 	return false;
 }
 
+void CommandLineInterface::printVersion()
+{
+	sout() << "solc, the solidity compiler commandline interface" << endl;
+	sout() << "Version: " << solidity::frontend::VersionString << endl;
+}
+
+void CommandLineInterface::printLicense()
+{
+	sout() << otherLicenses << endl;
+	// This is a static variable generated by cmake from LICENSE.txt
+	sout() << licenseText << endl;
+}
+
 bool CommandLineInterface::compile()
 {
 	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
@@ -845,16 +885,24 @@ void CommandLineInterface::handleAst()
 
 bool CommandLineInterface::actOnInput()
 {
-	if (m_options.input.mode == InputMode::StandardJson || m_options.input.mode == InputMode::Assembler)
+	switch (m_options.input.mode)
+	{
+	case InputMode::Help:
+	case InputMode::License:
+	case InputMode::Version:
+	case InputMode::StandardJson:
+	case InputMode::Assembler:
 		// Already done in "processInput" phase.
-		return true;
-	else if (m_options.input.mode == InputMode::Linker)
+		break;
+	case InputMode::Linker:
 		writeLinkedFiles();
-	else
-	{
-		solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+		break;
+	case InputMode::Compiler:
+	case InputMode::CompilerWithASTImport:
 		outputCompilationResults();
+		break;
 	}
+
 	return !m_outputFailed;
 }
 
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 1ca40568cc..e99ed1c07e 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -66,6 +66,8 @@ class CommandLineInterface
 	std::optional<std::string> const& standardJsonInput() const { return m_standardJsonInput; }
 
 private:
+	void printVersion();
+	void printLicense();
 	bool compile();
 	bool link();
 	void writeLinkedFiles();
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 22d92d4630..c3448ff8fa 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -16,8 +16,6 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include "license.h"
-
 #include <solc/CommandLineParser.h>
 #include <libyul/optimiser/Suite.h>
 #include <liblangutil/EVMVersion.h>
@@ -36,19 +34,12 @@ namespace po = boost::program_options;
 namespace solidity::frontend
 {
 
-ostream& CommandLineParser::sout()
-{
-	m_hasOutput = true;
-	return m_sout;
-}
-
 ostream& CommandLineParser::serr()
 {
 	m_hasOutput = true;
 	return m_serr;
 }
 
-#define cout
 #define cerr
 
 static string const g_strAllowPaths = "allow-paths";
@@ -147,26 +138,6 @@ static map<InputMode, string> const g_inputModeName = {
 	{InputMode::Linker, "linker"},
 };
 
-void CommandLineParser::printVersionAndExit()
-{
-	sout() <<
-		"solc, the solidity compiler commandline interface" <<
-		endl <<
-		"Version: " <<
-		solidity::frontend::VersionString <<
-		endl;
-	exit(EXIT_SUCCESS);
-}
-
-void CommandLineParser::printLicenseAndExit()
-{
-	sout() << otherLicenses << endl;
-	// This is a static variable generated by cmake from LICENSE.txt
-	sout() << licenseText << endl;
-	exit(EXIT_SUCCESS);
-}
-
-
 bool CommandLineParser::checkMutuallyExclusive(vector<string> const& _optionNames)
 {
 	if (countEnabledOptions(_optionNames) > 1)
@@ -297,11 +268,11 @@ OptimiserSettings CommandLineOptions::optimiserSettings() const
 	return settings;
 }
 
-bool CommandLineParser::parse(int _argc, char const* const* _argv, bool _interactiveTerminal)
+bool CommandLineParser::parse(int _argc, char const* const* _argv)
 {
 	m_hasOutput = false;
 
-	if (!parseArgs(_argc, _argv, _interactiveTerminal))
+	if (!parseArgs(_argc, _argv))
 		return false;
 
 	return processArgs();
@@ -482,6 +453,10 @@ bool CommandLineParser::parseOutputSelection()
 
 		switch (_mode)
 		{
+		case InputMode::Help:
+		case InputMode::License:
+		case InputMode::Version:
+			solAssert(false);
 		case InputMode::Compiler:
 		case InputMode::CompilerWithASTImport:
 			return contains(compilerModeOutputs, _outputName);
@@ -847,7 +822,7 @@ po::positional_options_description CommandLineParser::positionalOptionsDescripti
 	return filesPositions;
 }
 
-bool CommandLineParser::parseArgs(int _argc, char const* const* _argv, bool _interactiveTerminal)
+bool CommandLineParser::parseArgs(int _argc, char const* const* _argv)
 {
 	po::options_description allOptions = optionsDescription();
 	po::positional_options_description filesPositions = positionalOptionsDescription();
@@ -866,18 +841,6 @@ bool CommandLineParser::parseArgs(int _argc, char const* const* _argv, bool _int
 		return false;
 	}
 
-	if (m_args.count(g_strHelp) || (_interactiveTerminal && _argc == 1))
-	{
-		sout() << allOptions;
-		return false;
-	}
-
-	if (m_args.count(g_strVersion))
-		printVersionAndExit();
-
-	if (m_args.count(g_strLicense))
-		printLicenseAndExit();
-
 	po::notify(m_args);
 
 	return true;
@@ -886,6 +849,9 @@ bool CommandLineParser::parseArgs(int _argc, char const* const* _argv, bool _int
 bool CommandLineParser::processArgs()
 {
 	if (!checkMutuallyExclusive({
+		g_strHelp,
+		g_strLicense,
+		g_strVersion,
 		g_strStandardJSON,
 		g_strLink,
 		g_strAssemble,
@@ -895,7 +861,13 @@ bool CommandLineParser::processArgs()
 	}))
 		return false;
 
-	if (m_args.count(g_strStandardJSON) > 0)
+	if (m_args.count(g_strHelp) > 0)
+		m_options.input.mode = InputMode::Help;
+	else if (m_args.count(g_strLicense) > 0)
+		m_options.input.mode = InputMode::License;
+	else if (m_args.count(g_strVersion) > 0)
+		m_options.input.mode = InputMode::Version;
+	else if (m_args.count(g_strStandardJSON) > 0)
 		m_options.input.mode = InputMode::StandardJson;
 	else if (m_args.count(g_strAssemble) > 0 || m_args.count(g_strStrictAssembly) > 0 || m_args.count(g_strYul) > 0)
 		m_options.input.mode = InputMode::Assembler;
@@ -906,6 +878,13 @@ bool CommandLineParser::processArgs()
 	else
 		m_options.input.mode = InputMode::Compiler;
 
+	if (
+		m_options.input.mode == InputMode::Help ||
+		m_options.input.mode == InputMode::License ||
+		m_options.input.mode == InputMode::Version
+	)
+		return true;
+
 	map<string, set<InputMode>> validOptionInputModeCombinations = {
 		// TODO: This should eventually contain all options.
 		{g_strErrorRecovery, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index ad525ea3b2..27a64c7b94 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -48,6 +48,9 @@ namespace solidity::frontend
 
 enum class InputMode
 {
+	Help,
+	License,
+	Version,
 	Compiler,
 	CompilerWithASTImport,
 	StandardJson,
@@ -230,34 +233,28 @@ struct CommandLineOptions
 
 /// Parses the command-line arguments and produces a filled-out CommandLineOptions structure.
 /// Validates provided values and prints error messages in case of errors.
-///
-/// The class is also responsible for handling options that only result in printing informational
-/// text, without the need to invoke the compiler - printing usage banner, version or license.
 class CommandLineParser
 {
 public:
-	explicit CommandLineParser(std::ostream& _sout, std::ostream& _serr):
-		m_sout(_sout),
+	explicit CommandLineParser(std::ostream& _serr):
 		m_serr(_serr)
 	{}
 
 	/// Parses the command-line arguments and fills out the internal CommandLineOptions structure.
-	/// Performs validation and prints error messages. If requested, prints usage banner, version
-	/// or license.
-	/// @param interactiveTerminal specifies whether the terminal is taking input from the user.
-	/// This is used to determine whether to provide more user-friendly output in some situations.
-	/// E.g. whether to print help text when no arguments are provided.
+	/// Performs validation and prints error messages.
 	/// @return true if there were no validation errors when parsing options and the
 	/// CommandLineOptions structure has been fully initialized. false if there were errors - in
 	/// this case CommandLineOptions may be only partially filled out. May also return false if
 	/// there is not further processing necessary and the program should just exit.
-	bool parse(int _argc, char const* const* _argv, bool _interactiveTerminal);
+	bool parse(int _argc, char const* const* _argv);
 
 	CommandLineOptions const& options() const { return m_options; }
 
 	/// Returns true if the parser has written anything to any of its output streams.
 	bool hasOutput() const { return m_hasOutput; }
 
+	static void printHelp(std::ostream& _out) { _out << optionsDescription(); }
+
 private:
 	/// @returns a specification of all named command-line options accepted by the compiler.
 	/// The object can be used to parse command-line arguments or to generate the help screen.
@@ -270,7 +267,7 @@ class CommandLineParser
 	/// Uses boost::program_options to parse the command-line arguments and leaves the result in @a m_args.
 	/// Also handles the arguments that result in information being printed followed by immediate exit.
 	/// @returns false if parsing fails due to syntactical errors or the arguments not matching the description.
-	bool parseArgs(int _argc, char const* const* _argv, bool _interactiveTerminal);
+	bool parseArgs(int _argc, char const* const* _argv);
 
 	/// Validates parsed arguments stored in @a m_args and fills out the internal CommandLineOptions
 	/// structure.
@@ -294,20 +291,13 @@ class CommandLineParser
 	bool parseOutputSelection();
 
 	bool checkMutuallyExclusive(std::vector<std::string> const& _optionNames);
-	[[noreturn]] void printVersionAndExit();
-	[[noreturn]] void printLicenseAndExit();
 	size_t countEnabledOptions(std::vector<std::string> const& _optionNames) const;
 	static std::string joinOptionNames(std::vector<std::string> const& _optionNames, std::string _separator = ", ");
 
-	/// Returns the stream that should receive normal output. Sets m_hasOutput to true if the
-	/// stream has ever been used.
-	std::ostream& sout();
-
 	/// Returns the stream that should receive error output. Sets m_hasOutput to true if the
 	/// stream has ever been used.
 	std::ostream& serr();
 
-	std::ostream& m_sout;
 	std::ostream& m_serr;
 	bool m_hasOutput = false;
 
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 3d1fce7d2b..739213e8f2 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -29,6 +29,8 @@
 
 #include <libsolutil/JSON.h>
 
+#include <boost/algorithm/string.hpp>
+
 #include <range/v3/view/transform.hpp>
 
 #include <map>
@@ -110,9 +112,42 @@ namespace solidity::frontend::test
 
 BOOST_AUTO_TEST_SUITE(CommandLineInterfaceTest)
 
+BOOST_AUTO_TEST_CASE(help)
+{
+	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({"solc", "--help"}, "", /* _processInput */ true);
+
+	BOOST_TEST(!result.success);
+	BOOST_TEST(boost::starts_with(result.stdoutContent, "solc, the Solidity commandline compiler."));
+	BOOST_TEST(result.stderrContent == "");
+	BOOST_TEST(result.options.input.mode == InputMode::Help);
+}
+
+BOOST_AUTO_TEST_CASE(license)
+{
+	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({"solc", "--license"}, "", /* _processInput */ true);
+
+	BOOST_TEST(result.success);
+	BOOST_TEST(boost::starts_with(result.stdoutContent, "Most of the code is licensed under GPLv3"));
+	BOOST_TEST(result.stderrContent == "");
+	BOOST_TEST(result.options.input.mode == InputMode::License);
+}
+
+BOOST_AUTO_TEST_CASE(version)
+{
+	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({"solc", "--version"}, "", /* _processInput */ true);
+
+	BOOST_TEST(result.success);
+	BOOST_TEST(boost::ends_with(result.stdoutContent, "Version: " + solidity::frontend::VersionString + "\n"));
+	BOOST_TEST(result.stderrContent == "");
+	BOOST_TEST(result.options.input.mode == InputMode::Version);
+}
+
 BOOST_AUTO_TEST_CASE(multiple_input_modes)
 {
-	array<string, 6> inputModeOptions = {
+	array<string, 9> inputModeOptions = {
+		"--help",
+		"--license",
+		"--version",
 		"--standard-json",
 		"--link",
 		"--assemble",
@@ -122,7 +157,7 @@ BOOST_AUTO_TEST_CASE(multiple_input_modes)
 	};
 	string expectedMessage =
 		"The following options are mutually exclusive: "
-		"--standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast. "
+		"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast. "
 		"Select at most one.\n";
 
 	for (string const& mode1: inputModeOptions)
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 663bf022c6..a9ba08d817 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -30,8 +30,6 @@
 #include <libsmtutil/SolverInterface.h>
 #include <libsolidity/interface/Version.h>
 
-#include <boost/algorithm/string.hpp>
-
 #include <map>
 #include <optional>
 #include <ostream>
@@ -48,16 +46,12 @@ using namespace solidity::yul;
 namespace
 {
 
-optional<CommandLineOptions> parseCommandLine(vector<string> const& _commandLine, ostream& _stdout, ostream& _stderr)
+optional<CommandLineOptions> parseCommandLine(vector<string> const& _commandLine, ostream& _stderr)
 {
 	vector<char const*> argv = test::makeArgv(_commandLine);
 
-	CommandLineParser cliParser(_stdout, _stderr);
-	bool success = cliParser.parse(
-		static_cast<int>(_commandLine.size()),
-		argv.data(),
-		false // interactiveTerminal
-	);
+	CommandLineParser cliParser(_stderr);
+	bool success = cliParser.parse(static_cast<int>(_commandLine.size()), argv.data());
 
 	if (!success)
 		return nullopt;
@@ -81,24 +75,34 @@ BOOST_AUTO_TEST_CASE(no_options)
 	expectedOptions.modelChecker.initialize = true;
 	expectedOptions.modelChecker.settings = {};
 
-	stringstream sout, serr;
-	optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, sout, serr);
+	stringstream serr;
+	optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, serr);
 
-	BOOST_TEST(sout.str() == "");
 	BOOST_TEST(serr.str() == "");
 	BOOST_REQUIRE(parsedOptions.has_value());
 	BOOST_TEST(parsedOptions.value() == expectedOptions);
 }
 
-BOOST_AUTO_TEST_CASE(help)
+BOOST_AUTO_TEST_CASE(help_license_version)
 {
-	stringstream sout, serr;
-	optional<CommandLineOptions> parsedOptions = parseCommandLine({"solc", "--help"}, sout, serr);
+	map<string, InputMode> expectedModePerOption = {
+		{"--help", InputMode::Help},
+		{"--license", InputMode::License},
+		{"--version", InputMode::Version},
+	};
 
-	BOOST_TEST(serr.str() == "");
-	BOOST_TEST(boost::starts_with(sout.str(), "solc, the Solidity commandline compiler."));
-	BOOST_TEST(sout.str().find("Usage: solc [options] [input_file...]") != string::npos);
-	BOOST_TEST(!parsedOptions.has_value());
+	for (auto const& [option, expectedMode]: expectedModePerOption)
+	{
+		stringstream serr;
+		optional<CommandLineOptions> parsedOptions = parseCommandLine({"solc", option}, serr);
+
+		CommandLineOptions expectedOptions;
+		expectedOptions.input.mode = expectedMode;
+
+		BOOST_TEST(serr.str() == "");
+		BOOST_REQUIRE(parsedOptions.has_value());
+		BOOST_TEST(parsedOptions.value() == expectedOptions);
+	}
 }
 
 BOOST_AUTO_TEST_CASE(cli_mode_options)
@@ -220,10 +224,9 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			5,
 		};
 
-		stringstream sout, serr;
-		optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, sout, serr);
+		stringstream serr;
+		optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, serr);
 
-		BOOST_TEST(sout.str() == "");
 		BOOST_TEST(serr.str() == "");
 		BOOST_REQUIRE(parsedOptions.has_value());
 		BOOST_TEST(parsedOptions.value() == expectedOptions);
@@ -337,10 +340,9 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 			expectedOptions.optimizer.expectedExecutionsPerDeployment = 1000;
 		}
 
-		stringstream sout, serr;
-		optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, sout, serr);
+		stringstream serr;
+		optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, serr);
 
-		BOOST_TEST(sout.str() == "");
 		BOOST_TEST(serr.str() == "Warning: Yul is still experimental. Please use the output with care.\n");
 		BOOST_REQUIRE(parsedOptions.has_value());
 		BOOST_TEST(parsedOptions.value() == expectedOptions);
@@ -406,10 +408,9 @@ BOOST_AUTO_TEST_CASE(standard_json_mode_options)
 	expectedOptions.compiler.combinedJsonRequests->abi = true;
 	expectedOptions.compiler.combinedJsonRequests->binary = true;
 
-	stringstream sout, serr;
-	optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, sout, serr);
+	stringstream serr;
+	optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, serr);
 
-	BOOST_TEST(sout.str() == "");
 	BOOST_TEST(serr.str() == "");
 	BOOST_REQUIRE(parsedOptions.has_value());
 	BOOST_TEST(parsedOptions.value() == expectedOptions);
@@ -426,11 +427,10 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 	for (auto const& [optionName, inputModes]: invalidOptionInputModeCombinations)
 		for (string const& inputMode: inputModes)
 		{
-			stringstream sout, serr;
+			stringstream serr;
 			vector<string> commandLine = {"solc", optionName, "file", inputMode};
-			optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, sout, serr);
+			optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, serr);
 
-			BOOST_TEST(sout.str() == "");
 			BOOST_TEST(serr.str() == "The following options are not supported in the current input mode: " + optionName + "\n");
 			BOOST_REQUIRE(!parsedOptions.has_value());
 		}

From a1c9c1e2b5bbe87e70a7179353b305c80fba34eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 11 Oct 2021 13:17:01 +0200
Subject: [PATCH 0055/1748] CommandLineInterface: Merge processInput() and
 actOnInput()

- The distinction between them is not as clear-cut as it should be. For example processInput() prints output in assembly mode.
---
 solc/CommandLineInterface.cpp | 47 +++++++++++------------------------
 solc/CommandLineInterface.h   |  5 +---
 solc/main.cpp                 |  3 +--
 test/solc/Common.cpp          |  6 ++++-
 4 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index e86381bf3f..1358dd484c 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -610,10 +610,10 @@ bool CommandLineInterface::processInput()
 		return false;
 	case InputMode::License:
 		printLicense();
-		return true;
+		break;
 	case InputMode::Version:
 		printVersion();
-		return true;
+		break;
 	case InputMode::StandardJson:
 	{
 		solAssert(m_standardJsonInput.has_value(), "");
@@ -621,21 +621,25 @@ bool CommandLineInterface::processInput()
 		StandardCompiler compiler(m_fileReader.reader(), m_options.formatting.json);
 		sout() << compiler.compile(move(m_standardJsonInput.value())) << endl;
 		m_standardJsonInput.reset();
-		return true;
+		break;
 	}
 	case InputMode::Assembler:
-	{
-		return assemble(m_options.assembly.inputLanguage, m_options.assembly.targetMachine);
-	}
+		if (!assemble(m_options.assembly.inputLanguage, m_options.assembly.targetMachine))
+			return false;
+		break;
 	case InputMode::Linker:
-		return link();
+		if (!link())
+			return false;
+		writeLinkedFiles();
+		break;
 	case InputMode::Compiler:
 	case InputMode::CompilerWithASTImport:
-		return compile();
+		if (!compile())
+			return false;
+		outputCompilationResults();
 	}
 
-	solAssert(false, "");
-	return false;
+	return !m_outputFailed;
 }
 
 void CommandLineInterface::printVersion()
@@ -883,29 +887,6 @@ void CommandLineInterface::handleAst()
 	}
 }
 
-bool CommandLineInterface::actOnInput()
-{
-	switch (m_options.input.mode)
-	{
-	case InputMode::Help:
-	case InputMode::License:
-	case InputMode::Version:
-	case InputMode::StandardJson:
-	case InputMode::Assembler:
-		// Already done in "processInput" phase.
-		break;
-	case InputMode::Linker:
-		writeLinkedFiles();
-		break;
-	case InputMode::Compiler:
-	case InputMode::CompilerWithASTImport:
-		outputCompilationResults();
-		break;
-	}
-
-	return !m_outputFailed;
-}
-
 bool CommandLineInterface::link()
 {
 	solAssert(m_options.input.mode == InputMode::Linker, "");
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index e99ed1c07e..ee50574682 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -55,11 +55,8 @@ class CommandLineInterface
 	bool parseArguments(int _argc, char const* const* _argv);
 	/// Read the content of all input files and initialize the file reader.
 	bool readInputFiles();
-	/// Parse the files and create source code objects
+	/// Parse the files, create source code objects, print the output.
 	bool processInput();
-	/// Perform actions on the input depending on provided compiler arguments
-	/// @returns true on success.
-	bool actOnInput();
 
 	CommandLineOptions const& options() const { return m_options; }
 	FileReader const& fileReader() const { return m_fileReader; }
diff --git a/solc/main.cpp b/solc/main.cpp
index 1299e25644..874ee13ca8 100644
--- a/solc/main.cpp
+++ b/solc/main.cpp
@@ -65,8 +65,7 @@ int main(int argc, char** argv)
 		bool success =
 			cli.parseArguments(argc, argv) &&
 			cli.readInputFiles() &&
-			cli.processInput() &&
-			cli.actOnInput();
+			cli.processInput();
 
 		return success ? 0 : 1;
 	}
diff --git a/test/solc/Common.cpp b/test/solc/Common.cpp
index 28263e21e8..8e40c1af63 100644
--- a/test/solc/Common.cpp
+++ b/test/solc/Common.cpp
@@ -70,6 +70,10 @@ string test::stripPreReleaseWarning(string const& _stderrContent)
 		R"(Warning( \(3805\))?: This is a pre-release compiler version, please do not use it in production\.\n)"
 		R"((\n)?)"
 	};
+	static regex const noOutputRegex{
+		R"(Compiler run successful, no output requested\.\n)"
+	};
 
-	return regex_replace(_stderrContent, preReleaseWarningRegex, "");
+	string output = regex_replace(_stderrContent, preReleaseWarningRegex, "");
+	return regex_replace(move(output), noOutputRegex, "");
 }

From 0417db0f6a8474468a74515edddcf6d27c5ba977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 11 Oct 2021 13:30:08 +0200
Subject: [PATCH 0056/1748] Don't return an error from --help

---
 solc/CommandLineInterface.cpp      | 2 +-
 test/solc/CommandLineInterface.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 1358dd484c..9d22799106 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -607,7 +607,7 @@ bool CommandLineInterface::processInput()
 	{
 	case InputMode::Help:
 		CommandLineParser::printHelp(sout());
-		return false;
+		break;
 	case InputMode::License:
 		printLicense();
 		break;
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 739213e8f2..0269ec462f 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -116,7 +116,7 @@ BOOST_AUTO_TEST_CASE(help)
 {
 	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({"solc", "--help"}, "", /* _processInput */ true);
 
-	BOOST_TEST(!result.success);
+	BOOST_TEST(result.success);
 	BOOST_TEST(boost::starts_with(result.stdoutContent, "solc, the Solidity commandline compiler."));
 	BOOST_TEST(result.stderrContent == "");
 	BOOST_TEST(result.options.input.mode == InputMode::Help);

From 285528f407990112c5f52a3dc3c15d819b551eb4 Mon Sep 17 00:00:00 2001
From: Derek Brans <dbrans@gmail.com>
Date: Tue, 2 Nov 2021 20:27:32 -0500
Subject: [PATCH 0057/1748] Added the BigSur 11.6 in the supported os list

---
 scripts/install_deps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
index 6a9c12f3f7..7540c8bdf9 100755
--- a/scripts/install_deps.sh
+++ b/scripts/install_deps.sh
@@ -93,8 +93,8 @@ case $(uname -s) in
             10.15)
                 echo "Installing solidity dependencies on macOS 10.15 Catalina."
                 ;;
-            11.0 | 11.1 | 11.2 | 11.3 | 11.4 | 11.5)
-                echo "Installing solidity dependencies on macOS 11.0 / 11.1 / 11.2 / 11.3 / 11.4 / 11.5 Big Sur."
+            11.0 | 11.1 | 11.2 | 11.3 | 11.4 | 11.5 | 11.6)
+                echo "Installing solidity dependencies on macOS 11.0 / 11.1 / 11.2 / 11.3 / 11.4 / 11.5 / 11.6 Big Sur."
                 ;;
             *)
                 echo "Unsupported macOS version."

From e40cf92b1d34120506c648a7abc1db7734d65f4c Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 20 Oct 2021 16:21:34 +0200
Subject: [PATCH 0058/1748] [SMTChecker] Merge all entry points for a target

---
 libsolidity/formal/CHC.cpp                    | 27 ++++++++++---------
 libsolidity/formal/CHC.h                      |  4 ++-
 .../model_checker_invariants_all/err          |  1 -
 .../err                                       |  1 -
 .../output.json                               |  2 --
 .../external_reentrancy_crypto.sol            |  2 +-
 .../base_contract_assertion_fail_1.sol        |  2 +-
 .../implicit_constructor_hierarchy.sol        |  3 +--
 .../operators/conditional_assignment_5.sol    |  4 ++-
 .../operators/conditional_assignment_6.sol    |  2 +-
 10 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index bfdb0b4289..c0a92264e6 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1623,28 +1623,23 @@ void CHC::checkVerificationTargets()
 	// Also, all possible contexts in which an external function can be called has been recorded (m_queryPlaceholders).
 	// Here we combine every context in which an external function can be called with all possible verification conditions
 	// in its call graph. Each such combination forms a unique verification target.
-	vector<CHCVerificationTarget> verificationTargets;
+	map<unsigned, vector<CHCQueryPlaceholder>> targetEntryPoints;
 	for (auto const& [function, placeholders]: m_queryPlaceholders)
 	{
 		auto functionTargets = transactionVerificationTargetsIds(function);
 		for (auto const& placeholder: placeholders)
 			for (unsigned id: functionTargets)
-			{
-				auto const& target = m_verificationTargets.at(id);
-				verificationTargets.push_back(CHCVerificationTarget{
-					{target.type, placeholder.fromPredicate, placeholder.constraints && placeholder.errorExpression == target.errorId},
-					target.errorId,
-					target.errorNode
-				});
-			}
+				targetEntryPoints[id].push_back(placeholder);
 	}
 
 	set<unsigned> checkedErrorIds;
-	for (auto const& target: verificationTargets)
+	for (auto const& [targetId, placeholders]: targetEntryPoints)
 	{
 		string errorType;
 		ErrorId errorReporterId;
 
+		auto const& target = m_verificationTargets.at(targetId);
+
 		if (target.type == VerificationTargetType::PopEmptyArray)
 		{
 			solAssert(dynamic_cast<FunctionCall const*>(target.errorNode), "");
@@ -1692,7 +1687,7 @@ void CHC::checkVerificationTargets()
 		else
 			solAssert(false, "");
 
-		checkAndReportTarget(target, errorReporterId, errorType + " happens here.", errorType + " might happen here.");
+		checkAndReportTarget(target, placeholders, errorReporterId, errorType + " happens here.", errorType + " might happen here.");
 		checkedErrorIds.insert(target.errorId);
 	}
 
@@ -1750,7 +1745,7 @@ void CHC::checkVerificationTargets()
 		{
 			set<unsigned> seenErrors;
 			msg += "<errorCode> = 0 -> no errors\n";
-			for (auto const& target: verificationTargets)
+			for (auto const& [id, target]: m_verificationTargets)
 				if (!seenErrors.count(target.errorId))
 				{
 					seenErrors.insert(target.errorId);
@@ -1785,6 +1780,7 @@ void CHC::checkVerificationTargets()
 
 void CHC::checkAndReportTarget(
 	CHCVerificationTarget const& _target,
+	vector<CHCQueryPlaceholder> const& _placeholders,
 	ErrorId _errorReporterId,
 	string _satMsg,
 	string _unknownMsg
@@ -1794,7 +1790,12 @@ void CHC::checkAndReportTarget(
 		return;
 
 	createErrorBlock();
-	connectBlocks(_target.value, error(), _target.constraints);
+	for (auto const& placeholder: _placeholders)
+		connectBlocks(
+			placeholder.fromPredicate,
+			error(),
+			placeholder.constraints && placeholder.errorExpression == _target.errorId
+		);
 	auto const& location = _target.errorNode->location();
 	auto [result, invariant, model] = query(error(), location);
 	if (result == CheckResult::UNSATISFIABLE)
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index d9e27a89cc..1c74aa650b 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -252,11 +252,13 @@ class CHC: public SMTEncoder
 	void verificationTargetEncountered(ASTNode const* const _errorNode, VerificationTargetType _type, smtutil::Expression const& _errorCondition);
 
 	void checkVerificationTargets();
-	// Forward declaration. Definition is below.
+	// Forward declarations. Definitions are below.
 	struct CHCVerificationTarget;
+	struct CHCQueryPlaceholder;
 	void checkAssertTarget(ASTNode const* _scope, CHCVerificationTarget const& _target);
 	void checkAndReportTarget(
 		CHCVerificationTarget const& _target,
+		std::vector<CHCQueryPlaceholder> const& _placeholders,
 		langutil::ErrorId _errorReporterId,
 		std::string _satMsg,
 		std::string _unknownMsg = ""
diff --git a/test/cmdlineTests/model_checker_invariants_all/err b/test/cmdlineTests/model_checker_invariants_all/err
index 47bc04256e..2f028037bc 100644
--- a/test/cmdlineTests/model_checker_invariants_all/err
+++ b/test/cmdlineTests/model_checker_invariants_all/err
@@ -7,7 +7,6 @@ Warning: Return value of low-level calls not used.
 Info: Contract invariant(s) for model_checker_invariants_all/input.sol:test:
 (x <= 0)
 Reentrancy property(ies) for model_checker_invariants_all/input.sol:test:
-(!(x <= 0) || (x' <= 0))
 ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
 ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
 <errorCode> = 0 -> no errors
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
index 372143657c..fad76665e4 100644
--- a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
+++ b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
@@ -7,7 +7,6 @@ Warning: Return value of low-level calls not used.
 Info: Contract invariant(s) for model_checker_invariants_contract_reentrancy/input.sol:test:
 (x <= 0)
 Reentrancy property(ies) for model_checker_invariants_contract_reentrancy/input.sol:test:
-(!(x <= 0) || (x' <= 0))
 ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
 ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
 <errorCode> = 0 -> no errors
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
index 433648d0b9..f5ced72531 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
@@ -7,7 +7,6 @@
 ","message":"Return value of low-level calls not used.","severity":"warning","sourceLocation":{"end":143,"file":"A","start":132},"type":"Warning"},{"component":"general","errorCode":"1180","formattedMessage":"Info: Contract invariant(s) for A:test:
 (x <= 0)
 Reentrancy property(ies) for A:test:
-(!(x <= 0) || (x' <= 0))
 ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
 ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
 <errorCode> = 0 -> no errors
@@ -18,7 +17,6 @@ Reentrancy property(ies) for A:test:
 ","message":"Contract invariant(s) for A:test:
 (x <= 0)
 Reentrancy property(ies) for A:test:
-(!(x <= 0) || (x' <= 0))
 ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
 ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
 <errorCode> = 0 -> no errors
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
index 627f797630..2a79e6c4d2 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
@@ -25,8 +25,8 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreInv: yes
 // ----
 // Warning 1218: (302-333): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (302-333): CHC: Assertion violation might happen here.
-// Info 1180: Contract invariant(s) for :C:\n(((kec + ((- 1) * keccak256(data))) >= 0) && ((kec + ((- 1) * keccak256(data))) <= 0))\nReentrancy property(ies) for :C:\n((!((kec + ((- 1) * keccak256(data))) >= 0) || ((kec' + ((- 1) * keccak256(data'))) >= 0)) && (!((kec + ((- 1) * keccak256(data))) <= 0) || ((kec' + ((- 1) * keccak256(data'))) <= 0)))\n((!(<errorCode> = 1) || !((kec + ((- 1) * keccak256(data))) = 0)) && (!((kec + ((- 1) * keccak256(data))) <= 0) || ((kec' + ((- 1) * keccak256(data'))) <= 0)) && (!((kec + ((- 1) * keccak256(data))) >= 0) || ((kec' + ((- 1) * keccak256(data'))) >= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(_kec == kec)\n<errorCode> = 2 -> Assertion failed at assert(kec == keccak256(_data))\n
 // Warning 4661: (302-333): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
index 1f05d11765..0fd5086025 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
@@ -15,5 +15,5 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (52-66): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, x = 0\nC.g()\n    B.f() -- internal call\nState: y = 0, x = 1\nB.f()
+// Warning 6328: (52-66): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, x = 0\nC.g()\n    B.f() -- internal call
 // Info 1180: Contract invariant(s) for :B:\n(x <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol b/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
index 59d0423028..c8b2f96c58 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
@@ -15,5 +15,4 @@ contract C is B {
 // ====
 // SMTEngine: all
 // SMTSolvers: z3
-// ----
-// Info 1180: Contract invariant(s) for :C:\n(!(x <= 1) && !(x >= 3))\n
+// SMTIgnoreInv: yes
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
index 24be3cd8ea..dd467f8532 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
@@ -25,4 +25,6 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 2072: (249-255): Unused local variable.
-// Warning 6328: (271-295): CHC: Assertion violation happens here.
+// Warning 1218: (271-295): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (271-295): CHC: Assertion violation might happen here.
+// Warning 4661: (271-295): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
index e37d3f84c2..3b89e1afb2 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
@@ -25,4 +25,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 2072: (255-261): Unused local variable.
-// Info 1180: Reentrancy property(ies) for :C:\n((!(x <= 2) || !(x' >= 3)) && (<errorCode> <= 0) && (!(x' <= 0) || !(x >= 2)))\n((!(x' <= 0) || ((x' + ((- 1) * x)) = 0)) && (<errorCode> <= 0) && (!(x' >= 3) || ((x' + ((- 1) * x)) = 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
+// Info 1180: Reentrancy property(ies) for :C:\n((!(x' <= 0) || ((x' + ((- 1) * x)) = 0)) && (<errorCode> <= 0) && (!(x' >= 3) || ((x' + ((- 1) * x)) = 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n

From b2c9b69de2292c0a7c05bdc3cae6fcfe46d86383 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 13 Aug 2021 00:37:23 +0200
Subject: [PATCH 0059/1748] Enable for IR code generation with stack
 optimization > homestead.

---
 libyul/AssemblyStack.h                    |  4 +--
 libyul/backends/evm/EVMObjectCompiler.cpp | 41 ++++++++++++++---------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/libyul/AssemblyStack.h b/libyul/AssemblyStack.h
index 950265ca48..743d76dc66 100644
--- a/libyul/AssemblyStack.h
+++ b/libyul/AssemblyStack.h
@@ -139,9 +139,9 @@ class AssemblyStack: public langutil::CharStreamProvider
 private:
 	bool analyzeParsed();
 	bool analyzeParsed(yul::Object& _object);
-
+public:
 	void compileEVM(yul::AbstractAssembly& _assembly, bool _optimize) const;
-
+private:
 	void optimize(yul::Object& _object, bool _isCreation);
 
 	Language m_language = Language::Assembly;
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index e41a683872..c85c1ae921 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -23,6 +23,7 @@
 
 #include <libyul/backends/evm/EVMCodeTransform.h>
 #include <libyul/backends/evm/EVMDialect.h>
+#include <libyul/backends/evm/OptimizedEVMCodeTransform.h>
 
 #include <libyul/Object.h>
 #include <libyul/Exceptions.h>
@@ -62,19 +63,29 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 
 	yulAssert(_object.analysisInfo, "No analysis info.");
 	yulAssert(_object.code, "No code.");
-	// We do not catch and re-throw the stack too deep exception here because it is a YulException,
-	// which should be native to this part of the code.
-	CodeTransform transform{
-		m_assembly,
-		*_object.analysisInfo,
-		*_object.code,
-		m_dialect,
-		context,
-		_optimize,
-		{},
-		CodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
-	};
-	transform(*_object.code);
-	if (!transform.stackErrors().empty())
-		BOOST_THROW_EXCEPTION(transform.stackErrors().front());
+	if (_optimize && m_dialect.evmVersion().canOverchargeGasForCall())
+	{
+
+		auto stackErrors = OptimizedEVMCodeTransform::run(m_assembly, *_object.analysisInfo, *_object.code, m_dialect, context);
+		if (!stackErrors.empty())
+			BOOST_THROW_EXCEPTION(stackErrors.front());
+	}
+	else
+	{
+		// We do not catch and re-throw the stack too deep exception here because it is a YulException,
+		// which should be native to this part of the code.
+		CodeTransform transform{
+			m_assembly,
+			*_object.analysisInfo,
+			*_object.code,
+			m_dialect,
+			context,
+			_optimize,
+			{},
+			CodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
+		};
+		transform(*_object.code);
+		if (!transform.stackErrors().empty())
+			BOOST_THROW_EXCEPTION(transform.stackErrors().front());
+	}
 }

From 4229369180d2ba0001aa1d4254eb188703d59ff8 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 12 Aug 2021 17:17:21 +0200
Subject: [PATCH 0060/1748] Compatibility with StackCompressor and
 StackLimitEvader.

---
 libsolidity/codegen/ir/IRGenerator.cpp |   3 -
 libyul/optimiser/StackCompressor.cpp   | 130 ++++++++++++++++++++-----
 libyul/optimiser/StackLimitEvader.cpp  |  43 ++++++++
 libyul/optimiser/StackLimitEvader.h    |  20 ++++
 libyul/optimiser/Suite.cpp             |  38 +++++---
 5 files changed, 193 insertions(+), 41 deletions(-)

diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index b17b33c03f..c2bb0c3cf3 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -1069,9 +1069,6 @@ string IRGenerator::dispatchRoutine(ContractDefinition const& _contract)
 
 string IRGenerator::memoryInit(bool _useMemoryGuard)
 {
-	// TODO: Remove once we have made sure it is safe, i.e. after "Yul memory objects lite".
-	//       Also restore the tests removed in the commit that adds this comment.
-	_useMemoryGuard = false;
 	// This function should be called at the beginning of the EVM call frame
 	// and thus can assume all memory to be zero, including the contents of
 	// the "zero memory area" (the position CompilerUtils::zeroPointer points to).
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index a57d9738b4..2deef5234a 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -27,6 +27,13 @@
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/Semantics.h>
 
+#include <libyul/backends/evm/ControlFlowGraphBuilder.h>
+#include <libyul/backends/evm/StackHelpers.h>
+#include <libyul/backends/evm/StackLayoutGenerator.h>
+
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
+
 #include <libyul/CompilabilityChecker.h>
 
 #include <libyul/AST.h>
@@ -162,6 +169,50 @@ void eliminateVariables(
 	UnusedPruner::runUntilStabilised(_dialect, _node, _allowMSizeOptimization);
 }
 
+void eliminateVariables(
+	Dialect const& _dialect,
+	Block& _block,
+	vector<StackLayoutGenerator::StackTooDeep> const& _unreachables,
+	bool _allowMSizeOptimization
+)
+{
+	RematCandidateSelector selector{_dialect};
+	selector(_block);
+	std::map<YulString, size_t> candidates;
+	for (auto [cost, candidatesWithCost]: selector.candidates())
+		for (auto candidate: candidatesWithCost)
+			candidates[get<0>(candidate)] = cost;
+
+	set<YulString> varsToEliminate;
+
+	// TODO: this currently ignores the fact that variables may reference other variables we want to eliminate.
+	for (auto const& unreachable: _unreachables)
+	{
+		map<size_t, vector<YulString>> suitableCandidates;
+		size_t neededSlots = unreachable.deficit;
+		for (auto varName: unreachable.variableChoices)
+		{
+			if (varsToEliminate.count(varName))
+				--neededSlots;
+			else if (size_t* cost = util::valueOrNullptr(candidates, varName))
+				if (!util::contains(suitableCandidates[*cost], varName))
+					suitableCandidates[*cost].emplace_back(varName);
+		}
+		for (auto candidatesByCost: suitableCandidates)
+		{
+			for (auto candidate: candidatesByCost.second)
+				if (neededSlots--)
+					varsToEliminate.emplace(candidate);
+				else
+					break;
+			if (!neededSlots)
+				break;
+		}
+	}
+	Rematerialiser::run(_dialect, _block, std::move(varsToEliminate), true);
+	UnusedPruner::runUntilStabilised(_dialect, _block, _allowMSizeOptimization);
+}
+
 }
 
 bool StackCompressor::run(
@@ -176,39 +227,66 @@ bool StackCompressor::run(
 		_object.code->statements.size() > 0 && holds_alternative<Block>(_object.code->statements.at(0)),
 		"Need to run the function grouper before the stack compressor."
 	);
+	bool usesOptimizedCodeGenerator = false;
+	if (auto evmDialect = dynamic_cast<EVMDialect const*>(&_dialect))
+		usesOptimizedCodeGenerator =
+			_optimizeStackAllocation &&
+			evmDialect->evmVersion().canOverchargeGasForCall() &&
+			evmDialect->providesObjectAccess();
 	bool allowMSizeOptimzation = !MSizeFinder::containsMSize(_dialect, *_object.code);
-	for (size_t iterations = 0; iterations < _maxIterations; iterations++)
+	if (usesOptimizedCodeGenerator)
 	{
-		map<YulString, int> stackSurplus = CompilabilityChecker(_dialect, _object, _optimizeStackAllocation).stackDeficit;
-		if (stackSurplus.empty())
-			return true;
-
-		if (stackSurplus.count(YulString{}))
-		{
-			yulAssert(stackSurplus.at({}) > 0, "Invalid surplus value.");
-			eliminateVariables(
-				_dialect,
-				std::get<Block>(_object.code->statements.at(0)),
-				static_cast<size_t>(stackSurplus.at({})),
-				allowMSizeOptimzation
-			);
-		}
-
+		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object);
+		unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, _dialect, *_object.code);
+		Block& mainBlock = std::get<Block>(_object.code->statements.at(0));
+		if (
+			auto stackTooDeepErrors = StackLayoutGenerator::reportStackTooDeep(*cfg, YulString{});
+			!stackTooDeepErrors.empty()
+		)
+			eliminateVariables(_dialect, mainBlock, stackTooDeepErrors, allowMSizeOptimzation);
 		for (size_t i = 1; i < _object.code->statements.size(); ++i)
 		{
 			auto& fun = std::get<FunctionDefinition>(_object.code->statements[i]);
-			if (!stackSurplus.count(fun.name))
-				continue;
-
-			yulAssert(stackSurplus.at(fun.name) > 0, "Invalid surplus value.");
-			eliminateVariables(
-				_dialect,
-				fun,
-				static_cast<size_t>(stackSurplus.at(fun.name)),
-				allowMSizeOptimzation
-			);
+			if (
+				auto stackTooDeepErrors = StackLayoutGenerator::reportStackTooDeep(*cfg, fun.name);
+				!stackTooDeepErrors.empty()
+			)
+				eliminateVariables(_dialect, fun.body, stackTooDeepErrors, allowMSizeOptimzation);
 		}
 	}
+	else
+		for (size_t iterations = 0; iterations < _maxIterations; iterations++)
+		{
+			map<YulString, int> stackSurplus = CompilabilityChecker(_dialect, _object, _optimizeStackAllocation).stackDeficit;
+			if (stackSurplus.empty())
+				return true;
+
+			if (stackSurplus.count(YulString{}))
+			{
+				yulAssert(stackSurplus.at({}) > 0, "Invalid surplus value.");
+				eliminateVariables(
+					_dialect,
+					std::get<Block>(_object.code->statements.at(0)),
+					static_cast<size_t>(stackSurplus.at({})),
+					allowMSizeOptimzation
+				);
+			}
+
+			for (size_t i = 1; i < _object.code->statements.size(); ++i)
+			{
+				auto& fun = std::get<FunctionDefinition>(_object.code->statements[i]);
+				if (!stackSurplus.count(fun.name))
+					continue;
+
+				yulAssert(stackSurplus.at(fun.name) > 0, "Invalid surplus value.");
+				eliminateVariables(
+					_dialect,
+					fun,
+					static_cast<size_t>(stackSurplus.at(fun.name)),
+					allowMSizeOptimzation
+				);
+			}
+		}
 	return false;
 }
 
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index 1c7903b1f8..b77bd4f388 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -21,14 +21,18 @@
 #include <libyul/optimiser/FunctionDefinitionCollector.h>
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/optimiser/StackToMemoryMover.h>
+#include <libyul/backends/evm/ControlFlowGraphBuilder.h>
 #include <libyul/backends/evm/EVMDialect.h>
+#include <libyul/AsmAnalysis.h>
 #include <libyul/AST.h>
+#include <libyul/CompilabilityChecker.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Object.h>
 #include <libyul/Utilities.h>
 #include <libsolutil/Algorithms.h>
 #include <libsolutil/CommonData.h>
 
+#include <range/v3/range/conversion.hpp>
 #include <range/v3/view/concat.hpp>
 #include <range/v3/view/take.hpp>
 
@@ -114,6 +118,45 @@ u256 literalArgumentValue(FunctionCall const& _call)
 }
 }
 
+void StackLimitEvader::run(
+	OptimiserStepContext& _context,
+	Object& _object
+)
+{
+	auto const* evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
+	yulAssert(
+		evmDialect && evmDialect->providesObjectAccess(),
+		"StackLimitEvader can only be run on objects using the EVMDialect with object access."
+	);
+	if (evmDialect && evmDialect->evmVersion().canOverchargeGasForCall())
+	{
+		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(*evmDialect, _object);
+		unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, *evmDialect, *_object.code);
+		run(_context, _object, StackLayoutGenerator::reportStackTooDeep(*cfg));
+	}
+	else
+		run(_context, _object, CompilabilityChecker{
+			_context.dialect,
+			_object,
+			true
+		}.unreachableVariables);
+
+}
+
+void StackLimitEvader::run(
+	OptimiserStepContext& _context,
+	Object& _object,
+	map<YulString, vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
+)
+{
+	map<YulString, set<YulString>> unreachableVariables;
+	for (auto&& [function, stackTooDeepErrors]: _stackTooDeepErrors)
+		// TODO: choose wisely.
+		for (auto const& stackTooDeepError: stackTooDeepErrors)
+			unreachableVariables[function] += stackTooDeepError.variableChoices | ranges::views::take(stackTooDeepError.deficit) | ranges::to<set<YulString>>;
+	run(_context, _object, unreachableVariables);
+}
+
 void StackLimitEvader::run(
 	OptimiserStepContext& _context,
 	Object& _object,
diff --git a/libyul/optimiser/StackLimitEvader.h b/libyul/optimiser/StackLimitEvader.h
index 4fc351f73a..ae2d31c375 100644
--- a/libyul/optimiser/StackLimitEvader.h
+++ b/libyul/optimiser/StackLimitEvader.h
@@ -22,6 +22,7 @@
 #pragma once
 
 #include <libyul/optimiser/OptimiserStep.h>
+#include <libyul/backends/evm/StackLayoutGenerator.h>
 
 namespace solidity::yul
 {
@@ -61,6 +62,25 @@ class StackLimitEvader
 		Object& _object,
 		std::map<YulString, std::set<YulString>> const& _unreachableVariables
 	);
+	/// @a _stackTooDeepErrors can be determined by the StackLayoutGenerator.
+	/// Can only be run on the EVM dialect with objects.
+	/// Abort and do nothing, if no ``memoryguard`` call or several ``memoryguard`` calls
+	/// with non-matching arguments are found, or if any of the @a _stackTooDeepErrors
+	/// are contained in a recursive function.
+	static void run(
+		OptimiserStepContext& _context,
+		Object& _object,
+		std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
+	);
+	/// Determines stack too deep errors using the appropriate code generation backend.
+	/// Can only be run on the EVM dialect with objects.
+	/// Abort and do nothing, if no ``memoryguard`` call or several ``memoryguard`` calls
+	/// with non-matching arguments are found, or if any of the unreachable variables
+	/// are contained in a recursive function.
+	static void run(
+		OptimiserStepContext& _context,
+		Object& _object
+	);
 };
 
 }
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 5525e17d20..bd81f7c0b4 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -95,6 +95,12 @@ void OptimiserSuite::run(
 	set<YulString> const& _externallyUsedIdentifiers
 )
 {
+	EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect);
+	bool usesOptimizedCodeGenerator =
+		_optimizeStackAllocation &&
+		evmDialect &&
+		evmDialect->evmVersion().canOverchargeGasForCall() &&
+		evmDialect->providesObjectAccess();
 	set<YulString> reservedIdentifiers = _externallyUsedIdentifiers;
 	reservedIdentifiers += _dialect.fixedFunctionNames();
 
@@ -121,24 +127,32 @@ void OptimiserSuite::run(
 
 	// We ignore the return value because we will get a much better error
 	// message once we perform code generation.
-	StackCompressor::run(
-		_dialect,
-		_object,
-		_optimizeStackAllocation,
-		stackCompressorMaxIterations
-	);
+	if (!usesOptimizedCodeGenerator)
+		StackCompressor::run(
+			_dialect,
+			_object,
+			_optimizeStackAllocation,
+			stackCompressorMaxIterations
+		);
 	suite.runSequence("fDnTOc g", ast);
 
-	if (EVMDialect const* dialect = dynamic_cast<EVMDialect const*>(&_dialect))
+	if (evmDialect)
 	{
 		yulAssert(_meter, "");
-		ConstantOptimiser{*dialect, *_meter}(ast);
-		if (dialect->providesObjectAccess() && _optimizeStackAllocation)
-			StackLimitEvader::run(suite.m_context, _object, CompilabilityChecker{
+		ConstantOptimiser{*evmDialect, *_meter}(ast);
+		if (usesOptimizedCodeGenerator)
+		{
+			StackCompressor::run(
 				_dialect,
 				_object,
-				_optimizeStackAllocation
-			}.unreachableVariables);
+				_optimizeStackAllocation,
+				stackCompressorMaxIterations
+			);
+			if (evmDialect->providesObjectAccess())
+				StackLimitEvader::run(suite.m_context, _object);
+		}
+		else if (evmDialect->providesObjectAccess() && _optimizeStackAllocation)
+			StackLimitEvader::run(suite.m_context, _object);
 	}
 	else if (dynamic_cast<WasmDialect const*>(&_dialect))
 	{

From 1a0605c5940b769179667ca9c2b858c0d6502b17 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 Sep 2021 17:01:40 +0200
Subject: [PATCH 0061/1748] Update tests.

---
 libyul/AssemblyStack.h                        |    4 +-
 .../output                                    |   26 +-
 .../output                                    |   26 +-
 .../output                                    |   26 +-
 .../debug_info_in_yul_snippet_escaping/output |   68 +-
 test/cmdlineTests/exp_base_literal/output     |    4 +-
 .../function_debug_info_via_yul/output        |   15 +-
 .../output                                    |   22 +-
 .../ir_compiler_subobjects/output             |   61 +-
 .../output                                    |   13 +-
 .../output                                    |    9 +-
 .../keccak_optimization_low_runs/output       |    9 +-
 test/cmdlineTests/name_simplifier/output      |   11 +-
 test/cmdlineTests/object_compiler/output      |    6 +-
 .../cmdlineTests/optimizer_array_sload/output |   11 +-
 test/cmdlineTests/revert_strings/output       |    4 +-
 .../output.json                               | 1014 +++++++++--------
 .../output.json                               |   26 +-
 .../output.json                               |   26 +-
 .../output.json                               |   26 +-
 .../output.json                               |   58 +-
 .../standard_ewasm_requested/output.json      |   18 +-
 .../output.json                               |    4 +-
 .../standard_ir_requested/output.json         |    4 +-
 .../standard_viair_requested/output.json      |   12 +-
 .../standard_yul_optimiserSteps/output.json   |    4 +-
 .../standard_yul_optimized/output.json        |    4 +-
 .../standard_yul_stack_opt/output.json        |    6 +-
 .../strict_asm_optimizer_steps/output         |   21 +-
 test/cmdlineTests/viair_abicoder_v1/output    |    4 +-
 test/cmdlineTests/viair_subobjects/output     |   61 +-
 test/cmdlineTests/yul_optimize_runs/output    |    8 +-
 test/cmdlineTests/yul_optimizer_steps/output  |    4 +-
 .../output                                    |    4 +-
 .../yul_string_format_ascii/output.json       |    4 +-
 .../output.json                               |    4 +-
 .../output.json                               |    4 +-
 .../yul_string_format_ascii_long/output.json  |    4 +-
 .../yul_string_format_hex/output.json         |    4 +-
 test/cmdlineTests/yul_verbatim_msize/output   |    4 +-
 .../abiEncoderV1/abi_decode_v2_storage.sol    |    2 +-
 .../abi_encode_calldata_slice.sol             |    4 +-
 .../struct/struct_storage_ptr.sol             |    2 +-
 .../abi_encode_calldata_slice.sol             |    4 +-
 .../abiEncoderV2/abi_encode_v2.sol            |    2 +-
 ...2_in_function_inherited_in_v1_contract.sol |    2 +-
 ...ode_v2_in_modifier_used_in_v1_contract.sol |    2 +-
 .../abiEncoderV2/calldata_array.sol           |    2 +-
 .../abiEncoderV2/storage_array_encoding.sol   |    4 +-
 .../abi_decode_simple_storage.sol             |    2 +-
 .../arrays_complex_from_and_to_storage.sol    |    2 +-
 .../array/byte_array_storage_layout.sol       |    2 +-
 .../array/byte_array_transitional_2.sol       |    2 +-
 .../array/bytes_length_member.sol             |    2 +-
 .../copying/array_copy_calldata_storage.sol   |    2 +-
 .../copying/array_copy_cleanup_uint128.sol    |    2 +-
 .../copying/array_copy_cleanup_uint40.sol     |    2 +-
 .../copying/array_copy_clear_storage.sol      |    2 +-
 .../array_copy_clear_storage_packed.sol       |    4 +-
 .../copying/array_copy_different_packing.sol  |    2 +-
 .../copying/array_copy_including_array.sol    |    4 +-
 .../array/copying/array_copy_nested_array.sol |    2 +-
 ...ay_copy_storage_storage_different_base.sol |    2 +-
 ..._storage_storage_different_base_nested.sol |    2 +-
 .../array_copy_storage_storage_dyn_dyn.sol    |    2 +-
 ...y_copy_storage_storage_dynamic_dynamic.sol |    2 +-
 ...ay_copy_storage_storage_static_dynamic.sol |    2 +-
 ...ray_copy_storage_storage_static_static.sol |    2 +-
 .../array_copy_storage_storage_struct.sol     |    2 +-
 .../array_copy_storage_to_memory_nested.sol   |    2 +-
 .../copying/array_copy_target_leftover.sol    |    2 +-
 .../copying/array_copy_target_leftover2.sol   |    2 +-
 .../copying/array_copy_target_simple.sol      |    2 +-
 .../copying/array_copy_target_simple_2.sol    |    2 +-
 .../array_nested_calldata_to_storage.sol      |    8 +-
 .../array_nested_memory_to_storage.sol        |    4 +-
 .../array_of_struct_calldata_to_storage.sol   |    2 +-
 .../array_of_struct_memory_to_storage.sol     |    2 +-
 ..._containing_arrays_calldata_to_storage.sol |    2 +-
 ...ts_containing_arrays_memory_to_storage.sol |    2 +-
 .../array_storage_multi_items_per_slot.sol    |    2 +-
 .../copying/arrays_from_and_to_storage.sol    |    2 +-
 .../array/copying/bytes_inside_mappings.sol   |    4 +-
 .../copying/bytes_storage_to_storage.sol      |   10 +-
 .../calldata_array_dynamic_to_storage.sol     |    2 +-
 .../copy_byte_array_in_struct_to_storage.sol  |    4 +-
 .../copying/copy_byte_array_to_storage.sol    |    2 +-
 .../copying/copy_function_storage_array.sol   |    2 +-
 .../array/copying/copy_removes_bytes_data.sol |    2 +-
 .../memory_dyn_2d_bytes_to_storage.sol        |    2 +-
 .../array/copying/storage_memory_nested.sol   |    2 +-
 .../copying/storage_memory_nested_bytes.sol   |    2 +-
 .../storage_memory_nested_from_pointer.sol    |    2 +-
 .../copying/storage_memory_nested_struct.sol  |    2 +-
 .../copying/storage_memory_packed_dyn.sol     |    2 +-
 .../array/create_memory_array.sol             |    2 +-
 .../array/delete/bytes_delete_element.sol     |    2 +-
 .../delete/delete_storage_array_packed.sol    |    2 +-
 .../array/dynamic_array_cleanup.sol           |    2 +-
 .../array/dynamic_arrays_in_storage.sol       |    2 +-
 .../array/dynamic_multi_array_cleanup.sol     |    2 +-
 .../array/fixed_array_cleanup.sol             |    2 +-
 .../array/fixed_arrays_as_return_type.sol     |    2 +-
 .../array/function_array_cross_calls.sol      |    2 +-
 .../array/pop/array_pop_array_transition.sol  |    2 +-
 .../array/pop/array_pop_uint16_transition.sol |    2 +-
 .../array/pop/array_pop_uint24_transition.sol |    2 +-
 .../array/pop/byte_array_pop_copy_long.sol    |    2 +-
 .../pop/byte_array_pop_long_storage_empty.sol |    2 +-
 ...ray_pop_long_storage_empty_garbage_ref.sol |    2 +-
 .../array/pop/byte_array_pop_masking_long.sol |    2 +-
 .../semanticTests/array/push/array_push.sol   |    2 +-
 .../push/array_push_nested_from_calldata.sol  |    2 +-
 .../array/push/array_push_packed_array.sol    |    2 +-
 .../array/push/array_push_struct.sol          |    2 +-
 .../push/array_push_struct_from_calldata.sol  |    2 +-
 .../array/push/byte_array_push_transition.sol |    2 +-
 .../array/push/nested_bytes_push.sol          |    2 +-
 .../array/push/push_no_args_2d.sol            |    4 +-
 .../array/push/push_no_args_bytes.sol         |    2 +-
 .../semanticTests/array/reusing_memory.sol    |    2 +-
 .../constructor/arrays_in_constructors.sol    |    2 +-
 .../bytes_in_constructors_packer.sol          |    2 +-
 .../constructor/no_callvalue_check.sol        |    2 +-
 .../events/event_dynamic_array_storage.sol    |    2 +-
 .../events/event_dynamic_array_storage_v2.sol |    2 +-
 .../event_dynamic_nested_array_storage_v2.sol |    2 +-
 .../events/event_indexed_mixed.sol            |    2 +-
 .../events/event_indexed_string.sol           |    2 +-
 .../externalContracts/FixedFeeRegistrar.sol   |    6 +-
 .../externalContracts/deposit_contract.sol    |   10 +-
 .../externalContracts/prbmath_signed.sol      |   22 +-
 .../externalContracts/prbmath_unsigned.sol    |   22 +-
 .../externalContracts/ramanujan_pi.sol        |    4 +-
 .../semanticTests/externalContracts/snark.sol |    2 +-
 .../externalContracts/strings.sol             |   12 +-
 .../functionCall/failed_create.sol            |    4 +-
 .../mapping_array_internal_argument.sol       |    2 +-
 .../functionTypes/store_function.sol          |    2 +-
 .../immutable/multi_creation.sol              |    2 +-
 .../address_overload_resolution.sol           |    4 +-
 ...d_function_calldata_calldata_interface.sol |    2 +-
 ...ted_function_calldata_memory_interface.sol |    2 +-
 .../keccak_yul_optimization.sol               |    4 +-
 .../interface_inheritance_conversions.sol     |    6 +-
 .../salted_create/salted_create.sol           |    2 +-
 .../salted_create_with_value.sol              |    2 +-
 .../storage/packed_storage_structs_bytes.sol  |    2 +-
 ...ta_struct_with_nested_array_to_storage.sol |    2 +-
 .../conversion/recursive_storage_memory.sol   |    2 +-
 .../structs/memory_structs_nested_load.sol    |    2 +-
 ...truct_containing_bytes_copy_and_delete.sol |    2 +-
 .../semanticTests/structs/struct_copy.sol     |    4 +-
 .../structs/struct_copy_via_local.sol         |    2 +-
 .../struct_delete_storage_nested_small.sol    |    2 +-
 .../struct_delete_storage_with_array.sol      |    2 +-
 ...truct_delete_storage_with_arrays_small.sol |    2 +-
 .../struct_memory_to_storage_function_ptr.sol |    2 +-
 .../semanticTests/structs/structs.sol         |    2 +-
 .../userDefinedValueType/calldata.sol         |    4 +-
 .../calldata_to_storage.sol                   |    6 +-
 .../userDefinedValueType/erc20.sol            |   14 +-
 .../memory_to_storage.sol                     |    6 +-
 ...cost_abstraction_comparison_elementary.sol |    8 +-
 ...ost_abstraction_comparison_userdefined.sol |    8 +-
 .../various/destructuring_assignment.sol      |    2 +-
 .../semanticTests/various/erc20.sol           |   14 +-
 .../skip_dynamic_types_for_structs.sol        |    2 +-
 .../various/staticcall_for_view_and_pure.sol  |    4 +-
 .../various/swap_in_storage_overwrite.sol     |    2 +-
 .../viaYul/array_memory_index_access.sol      |    2 +-
 .../viaYul/array_storage_index_access.sol     |   16 +-
 .../array_storage_index_boundary_test.sol     |    4 +-
 .../array_storage_index_zeroed_test.sol       |    8 +-
 .../viaYul/array_storage_length_access.sol    |    4 +-
 .../viaYul/array_storage_push_empty.sol       |    4 +-
 ...rray_storage_push_empty_length_address.sol |    6 +-
 .../viaYul/array_storage_push_pop.sol         |    6 +-
 test/libyul/EVMCodeTransformTest.cpp          |   17 +-
 .../early_push_on_deep_swap.yul               |   54 +
 test/libyul/evmCodeTransform/literal_loop.yul |   74 ++
 .../nonempty_initial_layout.yul               |   17 +
 .../evmCodeTransform/stackReuse/for_1.yul     |   27 +-
 .../evmCodeTransform/stackReuse/for_2.yul     |   34 +-
 .../stackReuse/function_argument_reuse.yul    |   42 +-
 ...ction_argument_reuse_without_retparams.yul |   48 +-
 .../stackReuse/function_call.yul              |   57 +-
 .../stackReuse/function_many_arguments.yul    |  172 ++-
 .../stackReuse/function_params.yul            |   15 +-
 .../function_params_and_retparams.yul         |   29 +-
 ...ction_params_and_retparams_partly_used.yul |   53 +-
 .../stackReuse/function_retparam.yul          |   21 +-
 .../stackReuse/function_retparam_block.yul    |   30 +-
 .../function_retparam_declaration.yul         |   29 +-
 .../stackReuse/function_retparam_for.yul      |   39 +-
 .../stackReuse/function_retparam_if.yul       |   46 +-
 .../stackReuse/function_retparam_leave.yul    |   28 +-
 .../stackReuse/function_retparam_read.yul     |   39 +-
 .../function_retparam_unassigned.yul          |   24 +-
 .../function_retparam_unassigned_multiple.yul |   32 +-
 .../stackReuse/function_trivial.yul           |   11 +-
 .../function_with_body_embedded.yul           |   43 +-
 .../stackReuse/functions_multi_return.yul     |  107 +-
 .../libyul/evmCodeTransform/stackReuse/if.yul |   31 +-
 .../stackReuse/last_use_in_nested_block.yul   |   14 +-
 .../multi_reuse_same_variable_name.yul        |   41 +-
 .../stackReuse/multi_reuse_single_slot.yul    |   26 +-
 .../multi_reuse_single_slot_nested.yul        |   26 +-
 .../reuse_on_decl_assign_not_same_scope.yul   |   14 +-
 .../reuse_on_decl_assign_to_last_used.yul     |   15 +-
 ...reuse_on_decl_assign_to_last_used_expr.yul |   21 +-
 .../reuse_on_decl_assign_to_not_last_used.yul |   15 +-
 .../stackReuse/reuse_slots.yul                |   42 +-
 .../stackReuse/reuse_slots_function.yul       |   69 +-
 .../reuse_slots_function_with_gaps.yul        |   77 +-
 .../stackReuse/reuse_too_deep_slot.yul        |  180 +--
 .../stackReuse/single_var.yul                 |    6 +-
 .../stackReuse/single_var_assigned.yul        |    6 +-
 .../single_var_assigned_plus_code.yul         |   17 +-
 ...ngle_var_assigned_plus_code_and_reused.yul |   22 +-
 .../evmCodeTransform/stackReuse/smoke.yul     |    2 +
 .../evmCodeTransform/stackReuse/switch.yul    |   53 +-
 test/libyul/evmCodeTransform/stub.yul         |   86 ++
 .../objectCompiler/long_object_name.yul       |   10 +-
 .../objectCompiler/nested_optimizer.yul       |   14 +-
 .../objectCompiler/simple_optimizer.yul       |   10 +-
 .../yulOptimizerTests/fullSuite/aztec.yul     |   90 +-
 .../fullSuite/stack_compressor_msize.yul      |   29 +-
 .../stackCompressor/inlineInBlock.yul         |    2 +
 .../stackCompressor/inlineInFunction.yul      |    2 +
 .../stackCompressor/unusedPrunerWithMSize.yul |    2 +
 test/libyul/yulStackLayout/literal_loop.yul   |   69 ++
 232 files changed, 2381 insertions(+), 1807 deletions(-)
 create mode 100644 test/libyul/evmCodeTransform/early_push_on_deep_swap.yul
 create mode 100644 test/libyul/evmCodeTransform/literal_loop.yul
 create mode 100644 test/libyul/evmCodeTransform/nonempty_initial_layout.yul
 create mode 100644 test/libyul/evmCodeTransform/stub.yul
 create mode 100644 test/libyul/yulStackLayout/literal_loop.yul

diff --git a/libyul/AssemblyStack.h b/libyul/AssemblyStack.h
index 743d76dc66..950265ca48 100644
--- a/libyul/AssemblyStack.h
+++ b/libyul/AssemblyStack.h
@@ -139,9 +139,9 @@ class AssemblyStack: public langutil::CharStreamProvider
 private:
 	bool analyzeParsed();
 	bool analyzeParsed(yul::Object& _object);
-public:
+
 	void compileEVM(yul::AbstractAssembly& _assembly, bool _optimize) const;
-private:
+
 	void optimize(yul::Object& _object, bool _isCreation);
 
 	Language m_language = Language::Assembly;
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
index 31b0ae463b..1b90e94a31 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
@@ -66,7 +66,7 @@ IR:
 object "C_6" {
     code {
         /// @src 0:60:101  "contract C {..."
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_6()
@@ -97,7 +97,7 @@ object "C_6" {
     object "C_6_deployed" {
         code {
             /// @src 0:60:101  "contract C {..."
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
@@ -182,11 +182,12 @@ object "C_6" {
     code {
         {
             /// @src 0:60:101  "contract C {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("C_6_deployed")
-            codecopy(128, dataoffset("C_6_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("C_6_deployed")
+            codecopy(_1, dataoffset("C_6_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_all/input.sol"
@@ -194,15 +195,16 @@ object "C_6" {
         code {
             {
                 /// @src 0:60:101  "contract C {..."
-                mstore(64, 128)
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(128, _1)
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        return(_1, _2)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
index 4d7210d373..86968e71b4 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
@@ -66,7 +66,7 @@ IR:
 object "C_6" {
     code {
         /// @src 0:60:101
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_6()
@@ -97,7 +97,7 @@ object "C_6" {
     object "C_6_deployed" {
         code {
             /// @src 0:60:101
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
@@ -181,11 +181,12 @@ object "C_6" {
     code {
         {
             /// @src 0:60:101
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("C_6_deployed")
-            codecopy(128, dataoffset("C_6_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("C_6_deployed")
+            codecopy(_1, dataoffset("C_6_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_location_only/input.sol"
@@ -193,15 +194,16 @@ object "C_6" {
         code {
             {
                 /// @src 0:60:101
-                mstore(64, 128)
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(128, _1)
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        return(_1, _2)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
index 0c0fbfa1e2..6a87b0b461 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
@@ -63,7 +63,7 @@ IR:
 object "C_6" {
     code {
 
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_6()
@@ -90,7 +90,7 @@ object "C_6" {
     object "C_6_deployed" {
         code {
 
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
@@ -171,26 +171,28 @@ Optimized IR:
 object "C_6" {
     code {
         {
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("C_6_deployed")
-            codecopy(128, dataoffset("C_6_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("C_6_deployed")
+            codecopy(_1, dataoffset("C_6_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_none/input.sol"
     object "C_6_deployed" {
         code {
             {
-                mstore(64, 128)
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(128, _1)
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        return(_1, _2)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
index b595a771e7..ae3ee1735e 100644
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
@@ -11,7 +11,7 @@ IR:
 object "C_2" {
     code {
         /// @src 0:265:278  "contract C {}"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_2()
@@ -42,7 +42,7 @@ object "C_2" {
     object "C_2_deployed" {
         code {
             /// @src 0:265:278  "contract C {}"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
 
@@ -82,11 +82,12 @@ object "C_2" {
     code {
         {
             /// @src 0:265:278  "contract C {}"
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("C_2_deployed")
-            codecopy(128, dataoffset("C_2_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("C_2_deployed")
+            codecopy(_1, dataoffset("C_2_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
@@ -94,7 +95,7 @@ object "C_2" {
         code {
             {
                 /// @src 0:265:278  "contract C {}"
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
         }
@@ -115,7 +116,7 @@ IR:
 object "D_27" {
     code {
         /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_D_27()
@@ -146,7 +147,7 @@ object "D_27" {
     object "D_27_deployed" {
         code {
             /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
@@ -372,7 +373,7 @@ object "D_27" {
         object "C_2" {
             code {
                 /// @src 0:265:278  "contract C {}"
-                mstore(64, 128)
+                mstore(64, memoryguard(128))
                 if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
                 constructor_C_2()
@@ -403,7 +404,7 @@ object "D_27" {
             object "C_2_deployed" {
                 code {
                     /// @src 0:265:278  "contract C {}"
-                    mstore(64, 128)
+                    mstore(64, memoryguard(128))
 
                     revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
 
@@ -448,11 +449,12 @@ object "D_27" {
     code {
         {
             /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("D_27_deployed")
-            codecopy(128, dataoffset("D_27_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("D_27_deployed")
+            codecopy(_1, dataoffset("D_27_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
@@ -460,26 +462,25 @@ object "D_27" {
         code {
             {
                 /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-                mstore(64, 128)
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
                         /// @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..."
-                        let _2 := datasize("C_2")
-                        let _3 := add(/** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ 128, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _2)
-                        if or(gt(_3, 0xffffffffffffffff), lt(_3, /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ 128))
-                        /// @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..."
-                        { panic_error_0x41() }
-                        datacopy(/** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ 128, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ dataoffset("C_2"), _2)
-                        if iszero(create(/** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ _1, 128, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _2))
+                        let _3 := datasize("C_2")
+                        let _4 := add(_1, _3)
+                        if or(gt(_4, 0xffffffffffffffff), lt(_4, _1)) { panic_error_0x41() }
+                        datacopy(_1, dataoffset("C_2"), _3)
+                        if iszero(create(/** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ _2, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _1, sub(_4, _1)))
                         {
                             /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
                             let pos := mload(64)
-                            returndatacopy(pos, _1, returndatasize())
+                            returndatacopy(pos, _2, returndatasize())
                             revert(pos, returndatasize())
                         }
                         mstore(add(allocate_memory_array_string(), 32), "/*")
@@ -539,11 +540,12 @@ object "D_27" {
             code {
                 {
                     /// @src 0:265:278  "contract C {}"
-                    mstore(64, 128)
+                    let _1 := memoryguard(0x80)
+                    mstore(64, _1)
                     if callvalue() { revert(0, 0) }
-                    let _1 := datasize("C_2_deployed")
-                    codecopy(128, dataoffset("C_2_deployed"), _1)
-                    return(128, _1)
+                    let _2 := datasize("C_2_deployed")
+                    codecopy(_1, dataoffset("C_2_deployed"), _2)
+                    return(_1, _2)
                 }
             }
             /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
@@ -551,7 +553,7 @@ object "D_27" {
                 code {
                     {
                         /// @src 0:265:278  "contract C {}"
-                        mstore(64, 128)
+                        mstore(64, memoryguard(0x80))
                         revert(0, 0)
                     }
                 }
diff --git a/test/cmdlineTests/exp_base_literal/output b/test/cmdlineTests/exp_base_literal/output
index 9c3efdc1f2..77893da189 100644
--- a/test/cmdlineTests/exp_base_literal/output
+++ b/test/cmdlineTests/exp_base_literal/output
@@ -11,7 +11,7 @@ IR:
 object "C_81" {
     code {
         /// @src 0:82:370  "contract C {..."
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_81()
@@ -42,7 +42,7 @@ object "C_81" {
     object "C_81_deployed" {
         code {
             /// @src 0:82:370  "contract C {..."
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
diff --git a/test/cmdlineTests/function_debug_info_via_yul/output b/test/cmdlineTests/function_debug_info_via_yul/output
index 8b952a9e97..5af245ce4a 100644
--- a/test/cmdlineTests/function_debug_info_via_yul/output
+++ b/test/cmdlineTests/function_debug_info_via_yul/output
@@ -4,20 +4,7 @@
     "function_debug_info_via_yul/input.sol:C":
     {
       "function-debug": {},
-      "function-debug-runtime":
-      {
-        "abi_encode_uint256":
-        {
-          "parameterSlots": 2,
-          "returnSlots": 1
-        },
-        "calldata_array_index_access_uint256_dyn_calldata":
-        {
-          "entryPoint": 168,
-          "parameterSlots": 2,
-          "returnSlots": 1
-        }
-      }
+      "function-debug-runtime": {}
     }
   },
   "version": "<VERSION REMOVED>"
diff --git a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
index 12c61e7838..330e208f45 100644
--- a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
+++ b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
@@ -11,11 +11,12 @@ object "C_7" {
     code {
         {
             /// @src 0:82:117  "contract C {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("C_7_deployed")
-            codecopy(128, dataoffset("C_7_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("C_7_deployed")
+            codecopy(_1, dataoffset("C_7_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"ir_compiler_inheritance_nosubobjects/input.sol"
@@ -23,7 +24,7 @@ object "C_7" {
         code {
             {
                 /// @src 0:82:117  "contract C {..."
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
         }
@@ -44,11 +45,12 @@ object "D_10" {
     code {
         {
             /// @src 0:118:137  "contract D is C {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("D_10_deployed")
-            codecopy(128, dataoffset("D_10_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("D_10_deployed")
+            codecopy(_1, dataoffset("D_10_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"ir_compiler_inheritance_nosubobjects/input.sol"
@@ -56,7 +58,7 @@ object "D_10" {
         code {
             {
                 /// @src 0:118:137  "contract D is C {..."
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
         }
diff --git a/test/cmdlineTests/ir_compiler_subobjects/output b/test/cmdlineTests/ir_compiler_subobjects/output
index 8c23c8ad75..fbedf38db8 100644
--- a/test/cmdlineTests/ir_compiler_subobjects/output
+++ b/test/cmdlineTests/ir_compiler_subobjects/output
@@ -11,11 +11,12 @@ object "C_3" {
     code {
         {
             /// @src 0:82:95  "contract C {}"
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("C_3_deployed")
-            codecopy(128, dataoffset("C_3_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("C_3_deployed")
+            codecopy(_1, dataoffset("C_3_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"ir_compiler_subobjects/input.sol"
@@ -23,7 +24,7 @@ object "C_3" {
         code {
             {
                 /// @src 0:82:95  "contract C {}"
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
         }
@@ -44,11 +45,12 @@ object "D_16" {
     code {
         {
             /// @src 0:96:165  "contract D {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("D_16_deployed")
-            codecopy(128, dataoffset("D_16_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("D_16_deployed")
+            codecopy(_1, dataoffset("D_16_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"ir_compiler_subobjects/input.sol"
@@ -56,35 +58,35 @@ object "D_16" {
         code {
             {
                 /// @src 0:96:165  "contract D {..."
-                mstore(64, 128)
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        /// @src 0:149:156  "new C()"
-                        let _2 := datasize("C_3")
-                        let _3 := add(/** @src 0:96:165  "contract D {..." */ 128, /** @src 0:149:156  "new C()" */ _2)
-                        if or(gt(_3, 0xffffffffffffffff), lt(_3, /** @src 0:96:165  "contract D {..." */ 128))
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
                         /// @src 0:149:156  "new C()"
+                        let _3 := datasize("C_3")
+                        let _4 := add(_1, _3)
+                        if or(gt(_4, 0xffffffffffffffff), lt(_4, _1))
                         {
                             /// @src 0:96:165  "contract D {..."
-                            mstore(_1, shl(224, 0x4e487b71))
+                            mstore(_2, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
-                            revert(_1, 0x24)
+                            revert(_2, 0x24)
                         }
                         /// @src 0:149:156  "new C()"
-                        datacopy(/** @src 0:96:165  "contract D {..." */ 128, /** @src 0:149:156  "new C()" */ dataoffset("C_3"), _2)
-                        if iszero(create(/** @src 0:96:165  "contract D {..." */ _1, 128, /** @src 0:149:156  "new C()" */ _2))
+                        datacopy(_1, dataoffset("C_3"), _3)
+                        if iszero(create(/** @src 0:96:165  "contract D {..." */ _2, /** @src 0:149:156  "new C()" */ _1, sub(_4, _1)))
                         {
                             /// @src 0:96:165  "contract D {..."
                             let pos := mload(64)
-                            returndatacopy(pos, _1, returndatasize())
+                            returndatacopy(pos, _2, returndatasize())
                             revert(pos, returndatasize())
                         }
-                        return(mload(64), _1)
+                        return(mload(64), _2)
                     }
                 }
                 revert(0, 0)
@@ -95,11 +97,12 @@ object "D_16" {
             code {
                 {
                     /// @src 0:82:95  "contract C {}"
-                    mstore(64, 128)
+                    let _1 := memoryguard(0x80)
+                    mstore(64, _1)
                     if callvalue() { revert(0, 0) }
-                    let _1 := datasize("C_3_deployed")
-                    codecopy(128, dataoffset("C_3_deployed"), _1)
-                    return(128, _1)
+                    let _2 := datasize("C_3_deployed")
+                    codecopy(_1, dataoffset("C_3_deployed"), _2)
+                    return(_1, _2)
                 }
             }
             /// @use-src 0:"ir_compiler_subobjects/input.sol"
@@ -107,7 +110,7 @@ object "D_16" {
                 code {
                     {
                         /// @src 0:82:95  "contract C {}"
-                        mstore(64, 128)
+                        mstore(64, memoryguard(0x80))
                         revert(0, 0)
                     }
                 }
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
index 930899aead..34b72f8b8e 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
@@ -23,15 +23,16 @@ object "D_12" {
         code {
             {
                 /// @src 0:82:161  "contract D {..."
-                mstore(64, 128)
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(128, _1)
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        return(_1, _2)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
index da6540fa78..cc95451e6d 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
@@ -11,11 +11,12 @@ object "D_8" {
     code {
         {
             /// @src 0:82:153  "contract D {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("D_8_deployed")
-            codecopy(128, dataoffset("D_8_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("D_8_deployed")
+            codecopy(_1, dataoffset("D_8_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"ir_with_assembly_no_memoryguard_runtime/input.sol"
diff --git a/test/cmdlineTests/keccak_optimization_low_runs/output b/test/cmdlineTests/keccak_optimization_low_runs/output
index 25b678ee04..f5df14027a 100644
--- a/test/cmdlineTests/keccak_optimization_low_runs/output
+++ b/test/cmdlineTests/keccak_optimization_low_runs/output
@@ -11,11 +11,12 @@ object "C_7" {
     code {
         {
             /// @src 0:62:285  "contract C {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("C_7_deployed")
-            codecopy(128, dataoffset("C_7_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("C_7_deployed")
+            codecopy(_1, dataoffset("C_7_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"keccak_optimization_low_runs/input.sol"
diff --git a/test/cmdlineTests/name_simplifier/output b/test/cmdlineTests/name_simplifier/output
index 44852d1a82..57a4cb594b 100644
--- a/test/cmdlineTests/name_simplifier/output
+++ b/test/cmdlineTests/name_simplifier/output
@@ -11,11 +11,12 @@ object "C_59" {
     code {
         {
             /// @src 0:346:625  "contract C {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("C_59_deployed")
-            codecopy(128, dataoffset("C_59_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("C_59_deployed")
+            codecopy(_1, dataoffset("C_59_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"name_simplifier/input.sol"
@@ -23,7 +24,7 @@ object "C_59" {
         code {
             {
                 /// @src 0:346:625  "contract C {..."
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 if iszero(lt(calldatasize(), 4))
                 {
                     let _1 := 0
diff --git a/test/cmdlineTests/object_compiler/output b/test/cmdlineTests/object_compiler/output
index eb8a3286e1..93d7b77955 100644
--- a/test/cmdlineTests/object_compiler/output
+++ b/test/cmdlineTests/object_compiler/output
@@ -23,7 +23,7 @@ object "MyContract" {
 
 
 Binary representation:
-33600055600b806011600039806000f3fe60005460005260206000f3
+33600055600b8060106000396000f3fe60005460005260206000f3
 
 Text representation:
     /* "object_compiler/input.yul":128:136   */
@@ -34,15 +34,13 @@ Text representation:
   sstore
     /* "object_compiler/input.yul":240:259   */
   dataSize(sub_0)
-  dup1
     /* "object_compiler/input.yul":217:238   */
+  dup1
   dataOffset(sub_0)
     /* "object_compiler/input.yul":125:126   */
   0x00
     /* "object_compiler/input.yul":205:260   */
   codecopy
-    /* "object_compiler/input.yul":275:294   */
-  dup1
     /* "object_compiler/input.yul":125:126   */
   0x00
     /* "object_compiler/input.yul":265:295   */
diff --git a/test/cmdlineTests/optimizer_array_sload/output b/test/cmdlineTests/optimizer_array_sload/output
index 448b0badc6..8404525f8c 100644
--- a/test/cmdlineTests/optimizer_array_sload/output
+++ b/test/cmdlineTests/optimizer_array_sload/output
@@ -11,11 +11,12 @@ object "Arraysum_34" {
     code {
         {
             /// @src 0:80:429  "contract Arraysum {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("Arraysum_34_deployed")
-            codecopy(128, dataoffset("Arraysum_34_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("Arraysum_34_deployed")
+            codecopy(_1, dataoffset("Arraysum_34_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"optimizer_array_sload/input.sol"
@@ -23,7 +24,7 @@ object "Arraysum_34" {
         code {
             {
                 /// @src 0:80:429  "contract Arraysum {..."
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 if iszero(lt(calldatasize(), 4))
                 {
                     let _1 := 0
diff --git a/test/cmdlineTests/revert_strings/output b/test/cmdlineTests/revert_strings/output
index 9ca27eac47..d13f9f4e5e 100644
--- a/test/cmdlineTests/revert_strings/output
+++ b/test/cmdlineTests/revert_strings/output
@@ -11,7 +11,7 @@ IR:
 object "C_15" {
     code {
         /// @src 0:59:147  "contract C {..."
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_15()
@@ -57,7 +57,7 @@ object "C_15" {
     object "C_15_deployed" {
         code {
             /// @src 0:59:147  "contract C {..."
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index 3b25e108a8..d8877a82ba 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -1,297 +1,298 @@
 {"contracts":{"C":{"C":{"evm":{"assembly":"    /* \"C\":79:428  contract C... */
-  mstore(0x40, 0xa0)
-  jumpi(tag_2, iszero(callvalue))
-  0x00
+  0xa0
   dup1
-  revert
-tag_2:
+  0x40
+  mstore
+  jumpi(tag_5, callvalue)
+  0x1f
   bytecodeSize
   codesize
   dup2
   swap1
   sub
-  0xa0
-  0x1f
+  swap2
   dup3
   add
   not(0x1f)
   and
-  dup2
+  dup4
   add
-  swap1
+  swap2
   sub(shl(0x40, 0x01), 0x01)
-  dup3
+  dup4
   gt
-  swap1
-  dup3
+  dup5
+  dup5
   lt
   or
-  iszero
   tag_3
   jumpi
-  mstore(0x00, shl(0xe0, 0x4e487b71))
-  mstore(0x04, 0x41)
-  revert(0x00, 0x24)
-tag_3:
+  dup1
+  dup5
+  swap3
+  0x20
+  swap5
   0x40
   mstore
-  dup1
-  dup3
-  0xa0
+  dup4
   codecopy
-  0x20
   dup2
+  add
+  sub
   slt
-  iszero
-  tag_4
-  jumpi
-  0x00
-  dup1
-  revert
-tag_4:
-  pop
-  pop
   tag_5
-  mload(0xa0)
+  jumpi
+  mload
     /* \"C\":147:149  42 */
   mstore(0x80, 0x2a)
     /* \"C\":203:219  stateVar = _init */
   0x00
     /* \"C\":79:428  contract C... */
   sstore
-    /* \"C\":175:223  constructor(int _init)... */
-  jump
-    /* \"C\":79:428  contract C... */
-tag_5:
   mload(0x40)
   dataSize(sub_0)
-  dup1
+  swap1
+  dup2
   dataOffset(sub_0)
-  dup4
+  dup3
   codecopy
   mload(0x80)
-  dup3
+  dup2
   assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-  dup1
-  dup3
   return
+tag_5:
+  pop
+  0x00
+  dup1
+  revert
+tag_3:
+  pop
+  pop
+  pop
+  pop
+  mstore(0x00, shl(0xe0, 0x4e487b71))
+  mstore(0x04, 0x41)
+  revert(0x00, 0x24)
 stop
 
 sub_0: assembly {
         /* \"C\":79:428  contract C... */
       mstore(0x40, 0x80)
-      jumpi(tag_8, lt(calldatasize, 0x04))
+      jumpi(tag_1, iszero(lt(calldatasize, 0x04)))
+      0x00
+      dup1
+      revert
+    tag_1:
       0x00
       dup1
       calldataload
       0xe0
       shr
+      dup1
       0x26121ff0
-      dup2
       eq
-      tag_10
+      tag_3
       jumpi
+      dup1
       0x793816ec
-      dup2
       eq
-      tag_11
+      tag_5
       jumpi
       0x9942ec6f
-      dup2
       eq
-      tag_12
+      tag_7
       jumpi
-      jump(tag_9)
-    tag_10:
-      jumpi(tag_13, iszero(callvalue))
-      dup2
-      dup3
+      pop
+      0x00
+      dup1
       revert
-    tag_13:
-      tag_14
+    tag_7:
+      jumpi(tag_9, callvalue)
+      pop
+      tag_11
       calldatasize
-      tag_1
+      tag_12
       jump\t// in
-    tag_14:
-        /* \"C\":279:298  constVar + immutVar */
+    tag_11:
+      tag_13
+        /* \"C\":375:378  int */
+      tag_14
       tag_15
-        /* \"C\":290:298  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":279:298  constVar + immutVar */
-      tag_4
       jump\t// in
-    tag_15:
+    tag_14:
         /* \"C\":79:428  contract C... */
       mload(0x40)
-      dup2
+      swap1
       dup2
       mstore
-      0x20
-      dup2
-      return
-    tag_11:
-      jumpi(tag_17, iszero(callvalue))
+      swap1
       dup2
+      swap1
+      0x20
       dup3
+      add
+      swap1
+      jump
+    tag_13:
+      sub
+      swap1
+      return
+    tag_9:
+      dup1
       revert
-    tag_17:
-      tag_18
+    tag_5:
+      pop
+      jumpi(tag_9, callvalue)
+      tag_13
+      swap1
+      tag_20
       calldatasize
-      tag_1
+      tag_12
       jump\t// in
-    tag_18:
-      dup2
+    tag_20:
       sload
       mload(0x40)
-      dup2
+      swap1
       dup2
       mstore
-      0x20
-      dup2
-      return
-    tag_12:
-      jumpi(tag_20, iszero(callvalue))
+      swap1
       dup2
+      swap1
+      0x20
       dup3
-      revert
-    tag_20:
-      tag_21
+      add
+      swap1
+      jump
+    tag_3:
+      pop
+      jumpi(tag_9, callvalue)
+      pop
+      tag_23
       calldatasize
-      tag_1
+      tag_12
       jump\t// in
-    tag_21:
-        /* \"C\":375:378  int */
-      tag_15
-      tag_6
+    tag_23:
+      tag_13
+        /* \"C\":279:298  constVar + immutVar */
+      tag_14
+        /* \"C\":290:298  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+        /* \"C\":279:298  constVar + immutVar */
+      tag_26
       jump\t// in
         /* \"C\":79:428  contract C... */
-    tag_9:
-      pop
-      pop
-    tag_8:
-      0x00
-      dup1
-      revert
-    tag_1:
+    tag_12:
       0x00
+      swap1
       not(0x03)
-      dup3
       add
       slt
-      iszero
-      tag_26
+      tag_27
       jumpi
+      jump\t// out
+    tag_27:
+      pop
       0x00
       dup1
       revert
-    tag_26:
-      pop
-      jump\t// out
         /* \"C\":117:119  41 */
-    tag_3:
+    tag_29:
+      pop
       mstore(0x00, shl(0xe0, 0x4e487b71))
       mstore(0x04, 0x11)
       revert(0x00, 0x24)
-    tag_4:
-      0x00
+    tag_26:
       sub(shl(0xff, 0x01), 0x2a)
-      dup3
+      dup2
       sgt
       0x01
       and
-      iszero
-      tag_31
+      tag_30
       jumpi
-      tag_31
-      tag_3
-      jump\t// in
     tag_31:
-      pop
       0x29
       add
       swap1
       jump\t// out
-    tag_5:
+    tag_30:
+      tag_32
+      tag_29
+      jump\t// in
+    tag_32:
+      jump(tag_31)
+    tag_33:
       0x00
-      dup1
-      dup3
+      dup2
       slt
       dup1
       iszero
       sub(shl(0xff, 0x01), 0x01)
-      dup5
+      dup4
       swap1
       sub
-      dup6
+      dup5
       sgt
       and
-      iszero
       tag_34
       jumpi
-      tag_34
-      tag_3
-      jump\t// in
-    tag_34:
+    tag_35:
       shl(0xff, 0x01)
-      dup4
+      dup3
       swap1
       sub
-      dup5
+      dup4
       slt
-      dup2
       and
-      iszero
       tag_36
       jumpi
-      tag_36
-      tag_3
-      jump\t// in
+      add
+      swap1
+      jump\t// out
     tag_36:
-      pop
-      pop
+      tag_38
+      tag_29
+      jump\t// in
+    tag_38:
       add
       swap1
       jump\t// out
+    tag_34:
+      tag_39
+      tag_29
+      jump\t// in
+    tag_39:
+      jump(tag_35)
         /* \"C\":304:341  modifier m()... */
-    tag_6:
-      0x00
+    tag_15:
         /* \"C\":79:428  contract C... */
+      0x00
       dup1
       sload
-        /* \"C\":304:341  modifier m()... */
-      dup2
+        /* \"C\":117:119  41 */
+      0x01
       swap1
       sub(shl(0xff, 0x01), 0x01)
         /* \"C\":79:428  contract C... */
       dup2
       eq
-      iszero
-      tag_39
+      tag_40
       jumpi
-      tag_39
-      tag_3
-      jump\t// in
-    tag_39:
-        /* \"C\":117:119  41 */
-      0x01
+        /* \"C\":304:341  modifier m()... */
+    tag_41:
         /* \"C\":79:428  contract C... */
       add
-      dup1
-      dup3
+      swap1
+      dup2
+      dup2
       sstore
         /* \"C\":403:407  this */
       address
         /* \"C\":403:411  this.f() */
       extcodesize
-      tag_40
+      iszero
+      tag_42
       jumpi
         /* \"C\":79:428  contract C... */
-      dup2
-      dup3
-      revert
-        /* \"C\":403:411  this.f() */
-    tag_40:
-        /* \"C\":79:428  contract C... */
       mload(0x40)
       shl(0xe4, 0x026121ff)
         /* \"C\":403:411  this.f() */
@@ -309,196 +310,239 @@ sub_0: assembly {
         /* \"C\":403:411  this.f() */
       gas
       staticcall
-      dup1
-      tag_41
-      jumpi
-        /* \"C\":79:428  contract C... */
-      mload(0x40)
-      returndatasize
-      dup6
+      swap2
       dup3
-      returndatacopy
-      returndatasize
-      dup2
-      revert
-        /* \"C\":403:411  this.f() */
-    tag_41:
-        /* \"C\":79:428  contract C... */
-      dup4
-        /* \"C\":403:411  this.f() */
-      dup2
       iszero
-      tag_42
+      tag_44
       jumpi
-      returndatasize
-        /* \"C\":79:428  contract C... */
-      0x1f
-      add
-      not(0x1f)
+      dup1
+      swap3
+      tag_46
+      jumpi
+        /* \"C\":304:341  modifier m()... */
+    tag_47:
+        /* \"C\":392:411  stateVar + this.f() */
+      pop
+      pop
+      tag_48
+      swap1
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      tag_49
+        /* \"C\":392:411  stateVar + this.f() */
+      swap3
+      tag_33
+      jump\t// in
+    tag_48:
+        /* \"C\":414:422  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      swap1
+      tag_33
+      jump\t// in
+    tag_49:
+        /* \"C\":304:341  modifier m()... */
+      swap1
+      jump\t// out
+        /* \"C\":403:411  this.f() */
+    tag_46:
+        /* \"C\":79:428  contract C... */
+      swap1
+      swap2
+      pop
+        /* \"C\":403:411  this.f() */
+      returndatasize
+        /* \"C\":79:428  contract C... */
+      0x1f
+      add
+      not(0x1f)
       and
-      dup4
+      dup3
       add
+      swap1
       0xffffffffffffffff
-      dup2
-      gt
-      dup5
       dup3
+      gt
+      dup4
+      dup4
       lt
       or
-      iszero
-      tag_43
+      tag_50
       jumpi
-      shl(0xe0, 0x4e487b71)
-      dup7
-      mstore
-      0x41
+      pop
+      swap2
         /* \"C\":403:411  this.f() */
-      0x04
+      tag_52
+        /* \"C\":392:411  stateVar + this.f() */
+      tag_48
         /* \"C\":79:428  contract C... */
-      mstore
-      0x24
-      dup7
-      revert
-    tag_43:
+      swap3
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      tag_49
+        /* \"C\":79:428  contract C... */
+      swap5
       0x40
       mstore
         /* \"C\":403:411  this.f() */
-      tag_44
       returndatasize
-      dup5
+      dup2
       add
-      dup5
-      tag_7
-      jump\t// in
-    tag_44:
       swap1
+      tag_53
+      jump\t// in
+    tag_52:
+      swap2
+      dup2
+      swap4
       pop
-    tag_42:
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_45
+      jump(tag_47)
+        /* \"C\":79:428  contract C... */
+    tag_50:
+      shl(0xe0, 0x4e487b71)
       dup2
-      dup6
-      tag_5
-      jump\t// in
-    tag_45:
+      mstore
+      0x41
+        /* \"C\":403:411  this.f() */
+      0x04
+        /* \"C\":79:428  contract C... */
+      mstore
+      0x24
       swap5
       pop
+        /* \"C\":117:119  41 */
+      swap3
       pop
       pop
       pop
+        /* \"C\":79:428  contract C... */
+      revert
+        /* \"C\":403:411  this.f() */
+    tag_44:
+        /* \"C\":79:428  contract C... */
+      swap4
       pop
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_46
-        /* \"C\":414:422  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      pop
+      pop
+      pop
+      mload(0x40)
+      swap1
+      returndatasize
+      swap1
       dup3
-      tag_5
-      jump\t// in
-    tag_46:
-        /* \"C\":336:337  _ */
+      returndatacopy
+      returndatasize
+      swap1
+      revert
+        /* \"C\":403:411  this.f() */
+    tag_42:
+        /* \"C\":79:428  contract C... */
       swap2
       pop
       pop
-        /* \"C\":304:341  modifier m()... */
+      dup1
+      revert
+    tag_40:
+      tag_54
+      tag_29
+      jump\t// in
+    tag_54:
+      jump(tag_41)
+    tag_53:
       swap1
-      jump\t// out
-        /* \"C\":79:428  contract C... */
-    tag_7:
-      0x00
+      dup2
       0x20
-      dup3
-      dup5
+      swap2
       sub
       slt
-      iszero
-      tag_48
+      tag_55
       jumpi
-      0x00
-      dup1
-      revert
-    tag_48:
-      pop
       mload
-      swap2
       swap1
-      pop
       jump\t// out
+    tag_55:
+      pop
+      pop
+      0x00
+      dup1
+      revert
 
     auxdata: <AUXDATA REMOVED>
 }
 "}}},"D":{"D":{"evm":{"assembly":"    /* \"D\":91:166  contract D is C(3)... */
-  mstore(0x40, 0xa0)
-  jumpi(tag_2, iszero(callvalue))
-  0x00
+  0xa0
   dup1
-  revert
-tag_2:
+  0x40
+  mstore
+  jumpi(tag_5, callvalue)
+  0x1f
   bytecodeSize
   codesize
   dup2
   swap1
   sub
-  0xa0
-  0x1f
+  swap2
   dup3
   add
   not(0x1f)
   and
-  dup2
+  dup4
   add
-  swap1
+  swap2
   sub(shl(0x40, 0x01), 0x01)
-  dup3
+  dup4
   gt
-  swap1
-  dup3
+  dup5
+  dup5
   lt
   or
-  iszero
   tag_3
   jumpi
-  mstore(0x00, shl(0xe0, 0x4e487b71))
-  mstore(0x04, 0x41)
-  revert(0x00, 0x24)
-tag_3:
+  dup1
+  dup5
+  swap3
+  0x20
+  swap5
   0x40
   mstore
-  dup1
-  dup3
-  0xa0
+  dup4
   codecopy
-  0x20
   dup2
+  add
+  sub
   slt
-  iszero
-  tag_4
-  jumpi
-  0x00
-  dup1
-  revert
-tag_4:
-  pop
-  pop
   tag_5
-  mload(0xa0)
-  tag_1
+  jumpi
+  tag_7
+  swap1
+  mload
+  tag_8
   jump\t// in
-tag_5:
+tag_7:
   mload(0x40)
   dataSize(sub_0)
-  dup1
+  swap1
+  dup2
   dataOffset(sub_0)
-  dup4
+  dup3
   codecopy
   mload(0x80)
-  dup3
+  dup2
   assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-  dup1
-  dup3
   return
+tag_5:
+  pop
+  0x00
+  dup1
+  revert
+tag_3:
+  pop
+  pop
+  pop
+  pop
+  mstore(0x00, shl(0xe0, 0x4e487b71))
+  mstore(0x04, 0x41)
+  revert(0x00, 0x24)
     /* \"D\":113:164  constructor(int _init2)... */
-tag_1:
+tag_8:
     /* \"C\":147:149  42 */
   mstore(0x80, 0x2a)
     /* \"D\":107:108  3 */
@@ -512,9 +556,22 @@ tag_1:
   sgt
   0x01
   and
-  iszero
-  tag_8
+  tag_9
   jumpi
+    /* \"D\":107:108  3 */
+  0x03
+    /* \"D\":91:166  contract D is C(3)... */
+  add
+    /* \"C\":203:219  stateVar = _init */
+  0x00
+    /* \"D\":91:166  contract D is C(3)... */
+  sstore
+    /* \"D\":113:164  constructor(int _init2)... */
+  jump\t// out
+    /* \"D\":91:166  contract D is C(3)... */
+tag_9:
+  pop
+  pop
   shl(0xe0, 0x4e487b71)
     /* \"C\":203:219  stateVar = _init */
   0x00
@@ -526,234 +583,226 @@ tag_1:
   0x00
     /* \"D\":91:166  contract D is C(3)... */
   revert
-tag_8:
-    /* \"D\":107:108  3 */
-  0x03
-    /* \"D\":91:166  contract D is C(3)... */
-  add
-    /* \"C\":203:219  stateVar = _init */
-  0x00
-    /* \"D\":91:166  contract D is C(3)... */
-  sstore
-    /* \"D\":113:164  constructor(int _init2)... */
-  jump\t// out
 stop
 
 sub_0: assembly {
         /* \"D\":91:166  contract D is C(3)... */
       mstore(0x40, 0x80)
-      jumpi(tag_8, lt(calldatasize, 0x04))
+      jumpi(tag_1, iszero(lt(calldatasize, 0x04)))
+      0x00
+      dup1
+      revert
+    tag_1:
       0x00
       dup1
       calldataload
       0xe0
       shr
+      dup1
       0x26121ff0
-      dup2
       eq
-      tag_10
+      tag_3
       jumpi
+      dup1
       0x793816ec
-      dup2
       eq
-      tag_11
+      tag_5
       jumpi
       0x9942ec6f
-      dup2
       eq
-      tag_12
+      tag_7
       jumpi
-      jump(tag_9)
-    tag_10:
-      jumpi(tag_13, iszero(callvalue))
-      dup2
-      dup3
+      pop
+      0x00
+      dup1
       revert
-    tag_13:
-      tag_14
+    tag_7:
+      jumpi(tag_9, callvalue)
+      pop
+      tag_11
       calldatasize
-      tag_1
+      tag_12
       jump\t// in
-    tag_14:
-        /* \"C\":279:298  constVar + immutVar */
+    tag_11:
+      tag_13
+        /* \"C\":375:378  int */
+      tag_14
       tag_15
-        /* \"C\":290:298  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":279:298  constVar + immutVar */
-      tag_4
       jump\t// in
-    tag_15:
+    tag_14:
         /* \"D\":91:166  contract D is C(3)... */
       mload(0x40)
-      dup2
+      swap1
       dup2
       mstore
-      0x20
-      dup2
-      return
-    tag_11:
-      jumpi(tag_17, iszero(callvalue))
+      swap1
       dup2
+      swap1
+      0x20
       dup3
+      add
+      swap1
+      jump
+    tag_13:
+      sub
+      swap1
+      return
+    tag_9:
+      dup1
       revert
-    tag_17:
-      tag_18
+    tag_5:
+      pop
+      jumpi(tag_9, callvalue)
+      tag_13
+      swap1
+      tag_20
       calldatasize
-      tag_1
+      tag_12
       jump\t// in
-    tag_18:
-      dup2
+    tag_20:
       sload
       mload(0x40)
+      swap1
       dup2
-      dup2
-      mstore
-      0x20
-      dup2
-      return
-    tag_12:
-      jumpi(tag_20, iszero(callvalue))
-      dup2
+      mstore
+      swap1
+      dup2
+      swap1
+      0x20
       dup3
-      revert
-    tag_20:
-      tag_21
+      add
+      swap1
+      jump
+    tag_3:
+      pop
+      jumpi(tag_9, callvalue)
+      pop
+      tag_23
       calldatasize
-      tag_1
+      tag_12
       jump\t// in
-    tag_21:
-        /* \"C\":375:378  int */
-      tag_15
-      tag_6
+    tag_23:
+      tag_13
+        /* \"C\":279:298  constVar + immutVar */
+      tag_14
+        /* \"C\":290:298  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+        /* \"C\":279:298  constVar + immutVar */
+      tag_26
       jump\t// in
         /* \"D\":91:166  contract D is C(3)... */
-    tag_9:
-      pop
-      pop
-    tag_8:
-      0x00
-      dup1
-      revert
-    tag_1:
+    tag_12:
       0x00
+      swap1
       not(0x03)
-      dup3
       add
       slt
-      iszero
-      tag_26
+      tag_27
       jumpi
+      jump\t// out
+    tag_27:
+      pop
       0x00
       dup1
       revert
-    tag_26:
-      pop
-      jump\t// out
         /* \"C\":117:119  41 */
-    tag_3:
+    tag_29:
+      pop
       mstore(0x00, shl(0xe0, 0x4e487b71))
       mstore(0x04, 0x11)
       revert(0x00, 0x24)
-    tag_4:
-      0x00
+    tag_26:
       sub(shl(0xff, 0x01), 0x2a)
-      dup3
+      dup2
       sgt
       0x01
       and
-      iszero
-      tag_31
+      tag_30
       jumpi
-      tag_31
-      tag_3
-      jump\t// in
     tag_31:
-      pop
       0x29
       add
       swap1
       jump\t// out
-    tag_5:
+    tag_30:
+      tag_32
+      tag_29
+      jump\t// in
+    tag_32:
+      jump(tag_31)
+    tag_33:
       0x00
-      dup1
-      dup3
+      dup2
       slt
       dup1
       iszero
       sub(shl(0xff, 0x01), 0x01)
-      dup5
+      dup4
       swap1
       sub
-      dup6
+      dup5
       sgt
       and
-      iszero
       tag_34
       jumpi
-      tag_34
-      tag_3
-      jump\t// in
-    tag_34:
+    tag_35:
       shl(0xff, 0x01)
-      dup4
+      dup3
       swap1
       sub
-      dup5
+      dup4
       slt
-      dup2
       and
-      iszero
       tag_36
       jumpi
-      tag_36
-      tag_3
-      jump\t// in
+      add
+      swap1
+      jump\t// out
     tag_36:
-      pop
-      pop
+      tag_38
+      tag_29
+      jump\t// in
+    tag_38:
       add
       swap1
       jump\t// out
+    tag_34:
+      tag_39
+      tag_29
+      jump\t// in
+    tag_39:
+      jump(tag_35)
         /* \"C\":304:341  modifier m()... */
-    tag_6:
-      0x00
+    tag_15:
         /* \"D\":91:166  contract D is C(3)... */
+      0x00
       dup1
       sload
-        /* \"C\":304:341  modifier m()... */
-      dup2
+        /* \"C\":117:119  41 */
+      0x01
       swap1
       sub(shl(0xff, 0x01), 0x01)
         /* \"D\":91:166  contract D is C(3)... */
       dup2
       eq
-      iszero
-      tag_39
+      tag_40
       jumpi
-      tag_39
-      tag_3
-      jump\t// in
-    tag_39:
-        /* \"C\":117:119  41 */
-      0x01
+        /* \"C\":304:341  modifier m()... */
+    tag_41:
         /* \"D\":91:166  contract D is C(3)... */
       add
-      dup1
-      dup3
+      swap1
+      dup2
+      dup2
       sstore
         /* \"C\":403:407  this */
       address
         /* \"C\":403:411  this.f() */
       extcodesize
-      tag_40
+      iszero
+      tag_42
       jumpi
         /* \"D\":91:166  contract D is C(3)... */
-      dup2
-      dup3
-      revert
-        /* \"C\":403:411  this.f() */
-    tag_40:
-        /* \"D\":91:166  contract D is C(3)... */
       mload(0x40)
       shl(0xe4, 0x026121ff)
         /* \"C\":403:411  this.f() */
@@ -771,121 +820,160 @@ sub_0: assembly {
         /* \"C\":403:411  this.f() */
       gas
       staticcall
+      swap2
+      dup3
+      iszero
+      tag_44
+      jumpi
       dup1
-      tag_41
+      swap3
+      tag_46
       jumpi
-        /* \"D\":91:166  contract D is C(3)... */
-      mload(0x40)
-      returndatasize
-      dup6
-      dup3
-      returndatacopy
-      returndatasize
-      dup2
-      revert
+        /* \"C\":304:341  modifier m()... */
+    tag_47:
+        /* \"C\":392:411  stateVar + this.f() */
+      pop
+      pop
+      tag_48
+      swap1
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      tag_49
+        /* \"C\":392:411  stateVar + this.f() */
+      swap3
+      tag_33
+      jump\t// in
+    tag_48:
+        /* \"C\":414:422  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      swap1
+      tag_33
+      jump\t// in
+    tag_49:
+        /* \"C\":304:341  modifier m()... */
+      swap1
+      jump\t// out
         /* \"C\":403:411  this.f() */
-    tag_41:
+    tag_46:
         /* \"D\":91:166  contract D is C(3)... */
-      dup4
+      swap1
+      swap2
+      pop
         /* \"C\":403:411  this.f() */
-      dup2
-      iszero
-      tag_42
-      jumpi
       returndatasize
         /* \"D\":91:166  contract D is C(3)... */
       0x1f
       add
       not(0x1f)
       and
-      dup4
+      dup3
       add
+      swap1
       0xffffffffffffffff
-      dup2
-      gt
-      dup5
       dup3
+      gt
+      dup4
+      dup4
       lt
       or
-      iszero
-      tag_43
+      tag_50
       jumpi
-      shl(0xe0, 0x4e487b71)
-      dup7
-      mstore
-      0x41
+      pop
+      swap2
         /* \"C\":403:411  this.f() */
-      0x04
+      tag_52
+        /* \"C\":392:411  stateVar + this.f() */
+      tag_48
         /* \"D\":91:166  contract D is C(3)... */
-      mstore
-      0x24
-      dup7
-      revert
-    tag_43:
+      swap3
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      tag_49
+        /* \"D\":91:166  contract D is C(3)... */
+      swap5
       0x40
       mstore
         /* \"C\":403:411  this.f() */
-      tag_44
       returndatasize
-      dup5
+      dup2
       add
-      dup5
-      tag_7
-      jump\t// in
-    tag_44:
       swap1
+      tag_53
+      jump\t// in
+    tag_52:
+      swap2
+      dup2
+      swap4
       pop
-    tag_42:
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_45
+      jump(tag_47)
+        /* \"D\":91:166  contract D is C(3)... */
+    tag_50:
+      shl(0xe0, 0x4e487b71)
       dup2
-      dup6
-      tag_5
-      jump\t// in
-    tag_45:
+      mstore
+      0x41
+        /* \"C\":403:411  this.f() */
+      0x04
+        /* \"D\":91:166  contract D is C(3)... */
+      mstore
+      0x24
       swap5
       pop
+        /* \"C\":117:119  41 */
+      swap3
       pop
       pop
       pop
+        /* \"D\":91:166  contract D is C(3)... */
+      revert
+        /* \"C\":403:411  this.f() */
+    tag_44:
+        /* \"D\":91:166  contract D is C(3)... */
+      swap4
       pop
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_46
-        /* \"C\":414:422  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      pop
+      pop
+      pop
+      mload(0x40)
+      swap1
+      returndatasize
+      swap1
       dup3
-      tag_5
-      jump\t// in
-    tag_46:
-        /* \"C\":336:337  _ */
+      returndatacopy
+      returndatasize
+      swap1
+      revert
+        /* \"C\":403:411  this.f() */
+    tag_42:
+        /* \"D\":91:166  contract D is C(3)... */
       swap2
       pop
       pop
-        /* \"C\":304:341  modifier m()... */
+      dup1
+      revert
+    tag_40:
+      tag_54
+      tag_29
+      jump\t// in
+    tag_54:
+      jump(tag_41)
+    tag_53:
       swap1
-      jump\t// out
-        /* \"D\":91:166  contract D is C(3)... */
-    tag_7:
-      0x00
+      dup2
       0x20
-      dup3
-      dup5
+      swap2
       sub
       slt
-      iszero
-      tag_48
+      tag_55
       jumpi
-      0x00
-      dup1
-      revert
-    tag_48:
-      pop
       mload
-      swap2
       swap1
-      pop
       jump\t// out
+    tag_55:
+      pop
+      pop
+      0x00
+      dup1
+      revert
 
     auxdata: <AUXDATA REMOVED>
 }
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
index 3c630bb2d6..1fa8928e1f 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
@@ -72,7 +72,7 @@ sub_0: assembly {
 object \"C_6\" {
     code {
         /// @src 0:60:101  \"contract C {...\"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_6()
@@ -103,7 +103,7 @@ object \"C_6\" {
     object \"C_6_deployed\" {
         code {
             /// @src 0:60:101  \"contract C {...\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
@@ -187,11 +187,12 @@ object \"C_6\" {
     code {
         {
             /// @src 0:60:101  \"contract C {...\"
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize(\"C_6_deployed\")
-            codecopy(128, dataoffset(\"C_6_deployed\"), _1)
-            return(128, _1)
+            let _2 := datasize(\"C_6_deployed\")
+            codecopy(_1, dataoffset(\"C_6_deployed\"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:\"C\"
@@ -199,15 +200,16 @@ object \"C_6\" {
         code {
             {
                 /// @src 0:60:101  \"contract C {...\"
-                mstore(64, 128)
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(128, _1)
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        return(_1, _2)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
index 1f728995dd..e427b7fe10 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
@@ -72,7 +72,7 @@ sub_0: assembly {
 object \"C_6\" {
     code {
         /// @src 0:60:101
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_6()
@@ -103,7 +103,7 @@ object \"C_6\" {
     object \"C_6_deployed\" {
         code {
             /// @src 0:60:101
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
@@ -186,11 +186,12 @@ object \"C_6\" {
     code {
         {
             /// @src 0:60:101
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize(\"C_6_deployed\")
-            codecopy(128, dataoffset(\"C_6_deployed\"), _1)
-            return(128, _1)
+            let _2 := datasize(\"C_6_deployed\")
+            codecopy(_1, dataoffset(\"C_6_deployed\"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:\"C\"
@@ -198,15 +199,16 @@ object \"C_6\" {
         code {
             {
                 /// @src 0:60:101
-                mstore(64, 128)
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(128, _1)
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        return(_1, _2)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
index 8d19f60a3e..e81f461d2f 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
@@ -69,7 +69,7 @@ sub_0: assembly {
 object \"C_6\" {
     code {
 
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_6()
@@ -96,7 +96,7 @@ object \"C_6\" {
     object \"C_6_deployed\" {
         code {
 
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
@@ -176,26 +176,28 @@ object \"C_6\" {
 object \"C_6\" {
     code {
         {
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize(\"C_6_deployed\")
-            codecopy(128, dataoffset(\"C_6_deployed\"), _1)
-            return(128, _1)
+            let _2 := datasize(\"C_6_deployed\")
+            codecopy(_1, dataoffset(\"C_6_deployed\"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:\"C\"
     object \"C_6_deployed\" {
         code {
             {
-                mstore(64, 128)
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(128, _1)
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        return(_1, _2)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index 7a77d60f40..6a105aadde 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -10,7 +10,7 @@
 object \"C_54\" {
     code {
         /// @src 0:79:435  \"contract C...\"
-        mstore(64, 160)
+        mstore(64, memoryguard(160))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         let _1 := copy_arguments_for_constructor_20_object_C_54()
@@ -161,7 +161,7 @@ object \"C_54\" {
     object \"C_54_deployed\" {
         code {
             /// @src 0:79:435  \"contract C...\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
@@ -592,30 +592,31 @@ object \"C_54\" {
     code {
         {
             /// @src 0:79:435  \"contract C...\"
-            mstore(64, 160)
+            let _1 := memoryguard(0xa0)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
             let programSize := datasize(\"C_54\")
             let argSize := sub(codesize(), programSize)
-            let newFreePtr := add(160, and(add(argSize, 31), not(31)))
-            if or(gt(newFreePtr, sub(shl(64, 1), 1)), lt(newFreePtr, 160))
+            let newFreePtr := add(_1, and(add(argSize, 31), not(31)))
+            if or(gt(newFreePtr, sub(shl(64, 1), 1)), lt(newFreePtr, _1))
             {
                 mstore(/** @src -1:-1:-1 */ 0, /** @src 0:79:435  \"contract C...\" */ shl(224, 0x4e487b71))
                 mstore(4, 0x41)
                 revert(/** @src -1:-1:-1 */ 0, /** @src 0:79:435  \"contract C...\" */ 0x24)
             }
             mstore(64, newFreePtr)
-            codecopy(160, programSize, argSize)
-            if slt(argSize, 32)
+            codecopy(_1, programSize, argSize)
+            if slt(sub(add(_1, argSize), _1), 32)
             {
                 revert(/** @src -1:-1:-1 */ 0, 0)
             }
             /// @src 0:79:435  \"contract C...\"
-            constructor_C(mload(160))
-            let _1 := mload(64)
-            let _2 := datasize(\"C_54_deployed\")
-            codecopy(_1, dataoffset(\"C_54_deployed\"), _2)
-            setimmutable(_1, \"8\", mload(128))
-            return(_1, _2)
+            constructor_C(mload(_1))
+            let _2 := mload(64)
+            let _3 := datasize(\"C_54_deployed\")
+            codecopy(_2, dataoffset(\"C_54_deployed\"), _3)
+            setimmutable(_2, \"8\", mload(128))
+            return(_2, _3)
         }
         /// @ast-id 20 @src 0:182:230  \"constructor(int _init)...\"
         function constructor_C(var_init)
@@ -631,7 +632,7 @@ object \"C_54\" {
         code {
             {
                 /// @src 0:79:435  \"contract C...\"
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 if iszero(lt(calldatasize(), 4))
                 {
                     let _1 := 0
@@ -774,7 +775,7 @@ object \"C_54\" {
 object \"D_72\" {
     code {
         /// @src 1:91:166  \"contract D is C(3)...\"
-        mstore(64, 160)
+        mstore(64, memoryguard(160))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         let _1 := copy_arguments_for_constructor_71_object_D_72()
@@ -993,7 +994,7 @@ object \"D_72\" {
     object \"D_72_deployed\" {
         code {
             /// @src 1:91:166  \"contract D is C(3)...\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
@@ -1424,30 +1425,31 @@ object \"D_72\" {
     code {
         {
             /// @src 1:91:166  \"contract D is C(3)...\"
-            mstore(64, 160)
+            let _1 := memoryguard(0xa0)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
             let programSize := datasize(\"D_72\")
             let argSize := sub(codesize(), programSize)
-            let newFreePtr := add(160, and(add(argSize, 31), not(31)))
-            if or(gt(newFreePtr, sub(shl(64, 1), 1)), lt(newFreePtr, 160))
+            let newFreePtr := add(_1, and(add(argSize, 31), not(31)))
+            if or(gt(newFreePtr, sub(shl(64, 1), 1)), lt(newFreePtr, _1))
             {
                 mstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(224, 0x4e487b71))
                 mstore(4, 0x41)
                 revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ 0x24)
             }
             mstore(64, newFreePtr)
-            codecopy(160, programSize, argSize)
-            if slt(argSize, 32)
+            codecopy(_1, programSize, argSize)
+            if slt(sub(add(_1, argSize), _1), 32)
             {
                 revert(/** @src -1:-1:-1 */ 0, 0)
             }
             /// @src 1:91:166  \"contract D is C(3)...\"
-            constructor_D(mload(160))
-            let _1 := mload(64)
-            let _2 := datasize(\"D_72_deployed\")
-            codecopy(_1, dataoffset(\"D_72_deployed\"), _2)
-            setimmutable(_1, \"8\", mload(128))
-            return(_1, _2)
+            constructor_D(mload(_1))
+            let _2 := mload(64)
+            let _3 := datasize(\"D_72_deployed\")
+            codecopy(_2, dataoffset(\"D_72_deployed\"), _3)
+            setimmutable(_2, \"8\", mload(128))
+            return(_2, _3)
         }
         /// @ast-id 71 @src 1:113:164  \"constructor(int _init2)...\"
         function constructor_D(var_init2)
@@ -1471,7 +1473,7 @@ object \"D_72\" {
         code {
             {
                 /// @src 1:91:166  \"contract D is C(3)...\"
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 if iszero(lt(calldatasize(), 4))
                 {
                     let _1 := 0
diff --git a/test/cmdlineTests/standard_ewasm_requested/output.json b/test/cmdlineTests/standard_ewasm_requested/output.json
index c70693bc64..a8ab1fd0bf 100644
--- a/test/cmdlineTests/standard_ewasm_requested/output.json
+++ b/test/cmdlineTests/standard_ewasm_requested/output.json
@@ -17,7 +17,7 @@
     (local $z3 i64)
     (local $_1 i64)
     (block $label_
-        (local.set $p (call $u256_to_i32_726))
+        (local.set $p (call $u256_to_i32_716))
         (local.set $r (i32.add (local.get $p) (i32.const 64)))
         (if (i32.lt_u (local.get $r) (local.get $p)) (then
             (unreachable)))
@@ -30,14 +30,14 @@
         (call $eth.getCallValue (i32.const 0))
         (local.set $z3 (i64.load (i32.const 8)))
         (if (i32.eqz (i64.eqz (i64.or (i64.or (i64.const 0) (i64.const 0)) (i64.or (local.get $z3) (i64.load (i32.const 0)))))) (then
-            (call $eth.revert (call $to_internal_i32ptr) (call $u256_to_i32_344))))
+            (call $eth.revert (call $to_internal_i32ptr_334) (call $u256_to_i32_333))))
         (local.set $_1 (datasize \"C_3_deployed\"))
-        (call $eth.codeCopy (call $to_internal_i32ptr_348) (call $u256_to_i32 (dataoffset \"C_3_deployed\")) (call $u256_to_i32 (local.get $_1)))
-        (call $eth.finish (call $to_internal_i32ptr_348) (call $u256_to_i32 (local.get $_1)))
+        (call $eth.codeCopy (call $to_internal_i32ptr) (call $u256_to_i32 (dataoffset \"C_3_deployed\")) (call $u256_to_i32 (local.get $_1)))
+        (call $eth.finish (call $to_internal_i32ptr) (call $u256_to_i32 (local.get $_1)))
     )
 )
 
-(func $u256_to_i32_344
+(func $u256_to_i32_333
     (result i32)
     (local $v i32)
     (local $_1 i64)
@@ -68,7 +68,7 @@
     (local.get $v)
 )
 
-(func $u256_to_i32_726
+(func $u256_to_i32_716
     (result i32)
     (local $v i32)
     (block $label__3
@@ -82,12 +82,12 @@
     (local.get $v)
 )
 
-(func $to_internal_i32ptr
+(func $to_internal_i32ptr_334
     (result i32)
     (local $r i32)
     (local $p i32)
     (block $label__4
-        (local.set $p (call $u256_to_i32_344))
+        (local.set $p (call $u256_to_i32_333))
         (local.set $r (i32.add (local.get $p) (i32.const 64)))
         (if (i32.lt_u (local.get $r) (local.get $p)) (then
             (unreachable)))
@@ -96,7 +96,7 @@
     (local.get $r)
 )
 
-(func $to_internal_i32ptr_348
+(func $to_internal_i32ptr
     (result i32)
     (local $r i32)
     (local $v i32)
diff --git a/test/cmdlineTests/standard_irOptimized_requested/output.json b/test/cmdlineTests/standard_irOptimized_requested/output.json
index 78499140c3..c56849339d 100644
--- a/test/cmdlineTests/standard_irOptimized_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_requested/output.json
@@ -9,7 +9,7 @@
 object \"C_7\" {
     code {
         /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue()
         {
             revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
@@ -29,7 +29,7 @@ object \"C_7\" {
     object \"C_7_deployed\" {
         code {
             /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
             if iszero(lt(calldatasize(), 4))
             {
                 let selector := shift_right_224_unsigned(calldataload(0))
diff --git a/test/cmdlineTests/standard_ir_requested/output.json b/test/cmdlineTests/standard_ir_requested/output.json
index 2da612abc6..59f07f768c 100644
--- a/test/cmdlineTests/standard_ir_requested/output.json
+++ b/test/cmdlineTests/standard_ir_requested/output.json
@@ -10,7 +10,7 @@
 object \"C_7\" {
     code {
         /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_7()
@@ -41,7 +41,7 @@ object \"C_7\" {
     object \"C_7_deployed\" {
         code {
             /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
diff --git a/test/cmdlineTests/standard_viair_requested/output.json b/test/cmdlineTests/standard_viair_requested/output.json
index 4bf34fd7af..b72923f484 100644
--- a/test/cmdlineTests/standard_viair_requested/output.json
+++ b/test/cmdlineTests/standard_viair_requested/output.json
@@ -10,7 +10,7 @@
 object \"C_3\" {
     code {
         /// @src 0:79:92  \"contract C {}\"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_3()
@@ -41,7 +41,7 @@ object \"C_3\" {
     object \"C_3_deployed\" {
         code {
             /// @src 0:79:92  \"contract C {}\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
 
@@ -79,7 +79,7 @@ object \"C_3\" {
 object \"D_16\" {
     code {
         /// @src 0:93:146  \"contract D { function f() public { C c = new C(); } }\"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_D_16()
@@ -110,7 +110,7 @@ object \"D_16\" {
     object \"D_16_deployed\" {
         code {
             /// @src 0:93:146  \"contract D { function f() public { C c = new C(); } }\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
@@ -212,7 +212,7 @@ object \"D_16\" {
         object \"C_3\" {
             code {
                 /// @src 0:79:92  \"contract C {}\"
-                mstore(64, 128)
+                mstore(64, memoryguard(128))
                 if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
                 constructor_C_3()
@@ -243,7 +243,7 @@ object \"D_16\" {
             object \"C_3_deployed\" {
                 code {
                     /// @src 0:79:92  \"contract C {}\"
-                    mstore(64, 128)
+                    mstore(64, memoryguard(128))
 
                     revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
 
diff --git a/test/cmdlineTests/standard_yul_optimiserSteps/output.json b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
index 3caeed8dbf..4071589cbe 100644
--- a/test/cmdlineTests/standard_yul_optimiserSteps/output.json
+++ b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
@@ -1,10 +1,12 @@
-{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":17:18   */
+{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":38:39   */
   0x00
     /* \"A\":11:19   */
   dup1
   mload
     /* \"A\":20:40   */
   sstore
+    /* \"A\":0:42   */
+  stop
 ","bytecode":{"functionDebugData":{},"generatedSources":[],"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"}},"ir":"object \"object\" {
     code {
         let x := mload(0)
diff --git a/test/cmdlineTests/standard_yul_optimized/output.json b/test/cmdlineTests/standard_yul_optimized/output.json
index a5217c6729..371a0816b6 100644
--- a/test/cmdlineTests/standard_yul_optimized/output.json
+++ b/test/cmdlineTests/standard_yul_optimized/output.json
@@ -1,10 +1,12 @@
 {"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":17:18   */
   0x00
-  dup1
     /* \"A\":11:19   */
+  dup1
   mload
     /* \"A\":20:40   */
   sstore
+    /* \"A\":0:42   */
+  stop
 ","bytecode":{"functionDebugData":{},"generatedSources":[],"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"}},"ir":"object \"object\" {
     code {
         let x := mload(0)
diff --git a/test/cmdlineTests/standard_yul_stack_opt/output.json b/test/cmdlineTests/standard_yul_stack_opt/output.json
index 0fd77310ed..f041adaa86 100644
--- a/test/cmdlineTests/standard_yul_stack_opt/output.json
+++ b/test/cmdlineTests/standard_yul_stack_opt/output.json
@@ -1,17 +1,15 @@
 {"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":16:17   */
   0x01
-  dup1
     /* \"A\":27:28   */
   0x00
     /* \"A\":20:32   */
   sstore
-  pop
     /* \"A\":50:51   */
   0x02
-  dup1
     /* \"A\":61:63   */
   0x20
     /* \"A\":54:67   */
   sstore
-  pop
+    /* \"A\":0:72   */
+  stop
 "}}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
diff --git a/test/cmdlineTests/strict_asm_optimizer_steps/output b/test/cmdlineTests/strict_asm_optimizer_steps/output
index bf9f34e7a4..0f7a59b977 100644
--- a/test/cmdlineTests/strict_asm_optimizer_steps/output
+++ b/test/cmdlineTests/strict_asm_optimizer_steps/output
@@ -25,7 +25,7 @@ object "C_6" {
 
 
 Binary representation:
-60806040523415600e57600080fd5b600e601c600039600e6000f3fe60806040523615600055600080fd
+608060405234601557600e601b600039600e6000f35b600080fdfe60806040523615600055600080fd
 
 Text representation:
     /* "strict_asm_optimizer_steps/input.yul":45:48   */
@@ -37,17 +37,8 @@ Text representation:
     /* "strict_asm_optimizer_steps/input.yul":61:72   */
   callvalue
     /* "strict_asm_optimizer_steps/input.yul":58:89   */
-  iszero
   tag_1
   jumpi
-    /* "strict_asm_optimizer_steps/input.yul":85:86   */
-  0x00
-    /* "strict_asm_optimizer_steps/input.yul":82:83   */
-  dup1
-    /* "strict_asm_optimizer_steps/input.yul":75:87   */
-  revert
-    /* "strict_asm_optimizer_steps/input.yul":58:89   */
-tag_1:
     /* "strict_asm_optimizer_steps/input.yul":138:162   */
   dataSize(sub_0)
     /* "strict_asm_optimizer_steps/input.yul":110:136   */
@@ -62,6 +53,13 @@ tag_1:
   0x00
     /* "strict_asm_optimizer_steps/input.yul":172:207   */
   return
+    /* "strict_asm_optimizer_steps/input.yul":73:89   */
+tag_1:
+    /* "strict_asm_optimizer_steps/input.yul":85:86   */
+  0x00
+    /* "strict_asm_optimizer_steps/input.yul":75:87   */
+  dup1
+  revert
 stop
 
 sub_0: assembly {
@@ -81,8 +79,7 @@ sub_0: assembly {
       sstore
         /* "strict_asm_optimizer_steps/input.yul":576:577   */
       0x00
-        /* "strict_asm_optimizer_steps/input.yul":573:574   */
-      dup1
         /* "strict_asm_optimizer_steps/input.yul":566:578   */
+      dup1
       revert
 }
diff --git a/test/cmdlineTests/viair_abicoder_v1/output b/test/cmdlineTests/viair_abicoder_v1/output
index a23730702e..cedda56dcc 100644
--- a/test/cmdlineTests/viair_abicoder_v1/output
+++ b/test/cmdlineTests/viair_abicoder_v1/output
@@ -11,7 +11,7 @@ IR:
 object "test_11" {
     code {
         /// @src 0:79:169  "contract test {..."
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_test_11()
@@ -42,7 +42,7 @@ object "test_11" {
     object "test_11_deployed" {
         code {
             /// @src 0:79:169  "contract test {..."
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
diff --git a/test/cmdlineTests/viair_subobjects/output b/test/cmdlineTests/viair_subobjects/output
index eef7d27e86..4b388665cf 100644
--- a/test/cmdlineTests/viair_subobjects/output
+++ b/test/cmdlineTests/viair_subobjects/output
@@ -17,11 +17,12 @@ object "C_3" {
     code {
         {
             /// @src 0:82:95  "contract C {}"
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("C_3_deployed")
-            codecopy(128, dataoffset("C_3_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("C_3_deployed")
+            codecopy(_1, dataoffset("C_3_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"viair_subobjects/input.sol"
@@ -29,7 +30,7 @@ object "C_3" {
         code {
             {
                 /// @src 0:82:95  "contract C {}"
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
         }
@@ -56,11 +57,12 @@ object "D_16" {
     code {
         {
             /// @src 0:96:165  "contract D {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
-            let _1 := datasize("D_16_deployed")
-            codecopy(128, dataoffset("D_16_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("D_16_deployed")
+            codecopy(_1, dataoffset("D_16_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"viair_subobjects/input.sol"
@@ -68,35 +70,35 @@ object "D_16" {
         code {
             {
                 /// @src 0:96:165  "contract D {..."
-                mstore(64, 128)
+                let _1 := memoryguard(0x80)
+                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        /// @src 0:149:156  "new C()"
-                        let _2 := datasize("C_3")
-                        let _3 := add(/** @src 0:96:165  "contract D {..." */ 128, /** @src 0:149:156  "new C()" */ _2)
-                        if or(gt(_3, 0xffffffffffffffff), lt(_3, /** @src 0:96:165  "contract D {..." */ 128))
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
                         /// @src 0:149:156  "new C()"
+                        let _3 := datasize("C_3")
+                        let _4 := add(_1, _3)
+                        if or(gt(_4, 0xffffffffffffffff), lt(_4, _1))
                         {
                             /// @src 0:96:165  "contract D {..."
-                            mstore(_1, shl(224, 0x4e487b71))
+                            mstore(_2, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
-                            revert(_1, 0x24)
+                            revert(_2, 0x24)
                         }
                         /// @src 0:149:156  "new C()"
-                        datacopy(/** @src 0:96:165  "contract D {..." */ 128, /** @src 0:149:156  "new C()" */ dataoffset("C_3"), _2)
-                        if iszero(create(/** @src 0:96:165  "contract D {..." */ _1, 128, /** @src 0:149:156  "new C()" */ _2))
+                        datacopy(_1, dataoffset("C_3"), _3)
+                        if iszero(create(/** @src 0:96:165  "contract D {..." */ _2, /** @src 0:149:156  "new C()" */ _1, sub(_4, _1)))
                         {
                             /// @src 0:96:165  "contract D {..."
                             let pos := mload(64)
-                            returndatacopy(pos, _1, returndatasize())
+                            returndatacopy(pos, _2, returndatasize())
                             revert(pos, returndatasize())
                         }
-                        return(mload(64), _1)
+                        return(mload(64), _2)
                     }
                 }
                 revert(0, 0)
@@ -107,11 +109,12 @@ object "D_16" {
             code {
                 {
                     /// @src 0:82:95  "contract C {}"
-                    mstore(64, 128)
+                    let _1 := memoryguard(0x80)
+                    mstore(64, _1)
                     if callvalue() { revert(0, 0) }
-                    let _1 := datasize("C_3_deployed")
-                    codecopy(128, dataoffset("C_3_deployed"), _1)
-                    return(128, _1)
+                    let _2 := datasize("C_3_deployed")
+                    codecopy(_1, dataoffset("C_3_deployed"), _2)
+                    return(_1, _2)
                 }
             }
             /// @use-src 0:"viair_subobjects/input.sol"
@@ -119,7 +122,7 @@ object "D_16" {
                 code {
                     {
                         /// @src 0:82:95  "contract C {}"
-                        mstore(64, 128)
+                        mstore(64, memoryguard(0x80))
                         revert(0, 0)
                     }
                 }
diff --git a/test/cmdlineTests/yul_optimize_runs/output b/test/cmdlineTests/yul_optimize_runs/output
index 4c98ec30eb..b95184440d 100644
--- a/test/cmdlineTests/yul_optimize_runs/output
+++ b/test/cmdlineTests/yul_optimize_runs/output
@@ -21,20 +21,18 @@ object "RunsTest1" {
 
 
 Binary representation:
-602480600d600039806000f3fe7fabc1234500000000000000000000000000000000000000000000000000000000600055
+602580600c6000396000f3fe7fabc123450000000000000000000000000000000000000000000000000000000060005500
 
 Text representation:
     /* "yul_optimize_runs/input.yul":106:125   */
   dataSize(sub_0)
-  dup1
     /* "yul_optimize_runs/input.yul":83:104   */
+  dup1
   dataOffset(sub_0)
     /* "yul_optimize_runs/input.yul":80:81   */
   0x00
     /* "yul_optimize_runs/input.yul":71:126   */
   codecopy
-    /* "yul_optimize_runs/input.yul":145:164   */
-  dup1
     /* "yul_optimize_runs/input.yul":80:81   */
   0x00
     /* "yul_optimize_runs/input.yul":135:165   */
@@ -48,4 +46,6 @@ sub_0: assembly {
       0x00
         /* "yul_optimize_runs/input.yul":270:288   */
       sstore
+        /* "yul_optimize_runs/input.yul":208:298   */
+      stop
 }
diff --git a/test/cmdlineTests/yul_optimizer_steps/output b/test/cmdlineTests/yul_optimizer_steps/output
index 8e4cc7e88f..a88ce164ac 100644
--- a/test/cmdlineTests/yul_optimizer_steps/output
+++ b/test/cmdlineTests/yul_optimizer_steps/output
@@ -11,7 +11,7 @@ object "C_7" {
     code {
         {
             /// @src 0:80:112  "contract C..."
-            mstore(64, 128)
+            mstore(64, memoryguard(0x80))
             if callvalue()
             {
                 revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
@@ -30,7 +30,7 @@ object "C_7" {
         code {
             {
                 /// @src 0:80:112  "contract C..."
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
             }
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
diff --git a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
index 63f08a35dd..cc67ca5bcb 100644
--- a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
+++ b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
@@ -11,7 +11,7 @@ object "C_6" {
     code {
         {
             /// @src 0:60:103  "contract C..."
-            mstore(64, 128)
+            mstore(64, memoryguard(0x80))
             if callvalue()
             {
                 revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
@@ -121,7 +121,7 @@ object "C_6" {
         code {
             {
                 /// @src 0:60:103  "contract C..."
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 if iszero(lt(calldatasize(), 4))
                 {
                     let selector := shift_right_unsigned(calldataload(0))
diff --git a/test/cmdlineTests/yul_string_format_ascii/output.json b/test/cmdlineTests/yul_string_format_ascii/output.json
index ae7a926fe7..2354929e40 100644
--- a/test/cmdlineTests/yul_string_format_ascii/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii/output.json
@@ -10,7 +10,7 @@
 object \"C_11\" {
     code {
         /// @src 0:78:164  \"contract C { function f() external pure returns (string memory) { return \\\"abcabc\\\"; } }\"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_11()
@@ -41,7 +41,7 @@ object \"C_11\" {
     object \"C_11_deployed\" {
         code {
             /// @src 0:78:164  \"contract C { function f() external pure returns (string memory) { return \\\"abcabc\\\"; } }\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json b/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
index 59a93a7bfe..84e9ff2713 100644
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
@@ -10,7 +10,7 @@
 object \"C_11\" {
     code {
         /// @src 0:78:158  \"contract C { function f() external pure returns (bytes32) { return \\\"abcabc\\\"; } }\"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_11()
@@ -41,7 +41,7 @@ object \"C_11\" {
     object \"C_11_deployed\" {
         code {
             /// @src 0:78:158  \"contract C { function f() external pure returns (bytes32) { return \\\"abcabc\\\"; } }\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json b/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
index 79d35a3389..716a1cc6e6 100644
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
@@ -10,7 +10,7 @@
 object \"C_11\" {
     code {
         /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0x61626364; } }\"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_11()
@@ -41,7 +41,7 @@ object \"C_11\" {
     object \"C_11_deployed\" {
         code {
             /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0x61626364; } }\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
diff --git a/test/cmdlineTests/yul_string_format_ascii_long/output.json b/test/cmdlineTests/yul_string_format_ascii_long/output.json
index 932a5c28ca..1f52e103be 100644
--- a/test/cmdlineTests/yul_string_format_ascii_long/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_long/output.json
@@ -10,7 +10,7 @@
 object \"C_11\" {
     code {
         /// @src 0:78:243  \"contract C { function f() external pure returns (string memory) { return \\\"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\\\"; } }\"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_11()
@@ -41,7 +41,7 @@ object \"C_11\" {
     object \"C_11_deployed\" {
         code {
             /// @src 0:78:243  \"contract C { function f() external pure returns (string memory) { return \\\"abcdabcdcafecafeabcdabcdcafecafeffffzzzzoooo0123456789,.<,>.?:;'[{]}|`~!@#$%^&*()-_=+\\\"; } }\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
diff --git a/test/cmdlineTests/yul_string_format_hex/output.json b/test/cmdlineTests/yul_string_format_hex/output.json
index da8f873a31..04166a7601 100644
--- a/test/cmdlineTests/yul_string_format_hex/output.json
+++ b/test/cmdlineTests/yul_string_format_hex/output.json
@@ -10,7 +10,7 @@
 object \"C_11\" {
     code {
         /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }\"
-        mstore(64, 128)
+        mstore(64, memoryguard(128))
         if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
 
         constructor_C_11()
@@ -41,7 +41,7 @@ object \"C_11\" {
     object \"C_11_deployed\" {
         code {
             /// @src 0:78:159  \"contract C { function f() external pure returns (bytes4) { return 0xaabbccdd; } }\"
-            mstore(64, 128)
+            mstore(64, memoryguard(128))
 
             if iszero(lt(calldatasize(), 4))
             {
diff --git a/test/cmdlineTests/yul_verbatim_msize/output b/test/cmdlineTests/yul_verbatim_msize/output
index 5f67aa85ec..991fcbdb0c 100644
--- a/test/cmdlineTests/yul_verbatim_msize/output
+++ b/test/cmdlineTests/yul_verbatim_msize/output
@@ -14,7 +14,7 @@ object "object" {
 
 
 Binary representation:
-612000515061616002600055
+61200051506161600260005500
 
 Text representation:
     /* "yul_verbatim_msize/input.yul":125:131   */
@@ -30,3 +30,5 @@ Text representation:
   0x00
     /* "yul_verbatim_msize/input.yul":162:174   */
   sstore
+    /* "yul_verbatim_msize/input.yul":0:176   */
+  stop
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index 4161cb7d84..06f9bcbbfc 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
@@ -24,6 +24,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
-// gas irOptimized: 203522
+// gas irOptimized: 203312
 // gas legacy: 206084
 // gas legacyOptimized: 203068
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 61b8f38103..ddd536a380 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // compileViaYul: also
 // ----
 // test_bytes() ->
-// gas irOptimized: 394829
+// gas irOptimized: 377545
 // gas legacy: 423563
 // gas legacyOptimized: 331391
 // test_uint256() ->
-// gas irOptimized: 553331
+// gas irOptimized: 528726
 // gas legacy: 591392
 // gas legacyOptimized: 456137
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index 458c11893f..8fe170e917 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -26,6 +26,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 167615
+// gas irOptimized: 167580
 // gas legacy: 169475
 // gas legacyOptimized: 167397
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 7b7854c230..3a4a23fef7 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -61,10 +61,10 @@ contract C {
 // compileViaYul: also
 // ----
 // test_bytes() ->
-// gas irOptimized: 394829
+// gas irOptimized: 377545
 // gas legacy: 423563
 // gas legacyOptimized: 331391
 // test_uint256() ->
-// gas irOptimized: 553331
+// gas irOptimized: 528726
 // gas legacy: 591392
 // gas legacyOptimized: 456137
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index d475ffa19f..3e96976981 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -53,6 +53,6 @@ contract C {
 // f2() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f4() -> 0x20, 0x160, 0x1, 0x80, 0xc0, 0x2, 0x3, "abc", 0x7, 0x40, 0x2, 0x2, 0x3
-// gas irOptimized: 113296
+// gas irOptimized: 113361
 // gas legacy: 114900
 // gas legacyOptimized: 112606
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index bf57dbe6f2..b730f3588d 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -32,6 +32,6 @@ contract C is B {
 // compileViaYul: also
 // ----
 // test() -> 77
-// gas irOptimized: 121699
+// gas irOptimized: 120044
 // gas legacy: 155221
 // gas legacyOptimized: 111678
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
index 7fceb59352..7832ef601e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
@@ -40,5 +40,5 @@ contract C is B {
 // compileViaYul: also
 // ----
 // test() -> 5, 10
-// gas irOptimized: 88225
+// gas irOptimized: 87578
 // gas legacy: 99137
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 2841ef243d..bf42f87761 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -21,6 +21,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 177581
+// gas irOptimized: 172204
 // gas legacy: 141900
 // gas legacyOptimized: 121788
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index 12f12ef29c..1f836bfafa 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -19,10 +19,10 @@ contract C {
 // compileViaYul: also
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 181123
+// gas irOptimized: 180925
 // gas legacy: 184929
 // gas legacyOptimized: 181504
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112627
+// gas irOptimized: 112535
 // gas legacy: 115468
 // gas legacyOptimized: 112988
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index cbdaa381f3..b6c6ad5f03 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -11,6 +11,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
-// gas irOptimized: 135996
+// gas irOptimized: 135918
 // gas legacy: 137190
 // gas legacyOptimized: 136082
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index 596e76a669..e8d5670598 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -14,7 +14,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 189239
+// gas irOptimized: 189910
 // gas legacy: 211149
 // gas legacyOptimized: 206054
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
index 2514896605..2c238a54b0 100644
--- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
@@ -47,7 +47,7 @@ contract c {
 // gas legacyOptimized: 58606
 // storageEmpty -> 0
 // test_long() -> 67
-// gas irOptimized: 90759
+// gas irOptimized: 89148
 // gas legacy: 103590
 // gas legacyOptimized: 101044
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index a4403c3d7f..31879057a7 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -19,6 +19,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0
-// gas irOptimized: 165224
+// gas irOptimized: 158143
 // gas legacy: 189715
 // gas legacyOptimized: 184472
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index aaf990ef68..bb4e21e16f 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -15,7 +15,7 @@ contract c {
 // ----
 // getLength() -> 0
 // set(): 1, 2 -> true
-// gas irOptimized: 110439
+// gas irOptimized: 110433
 // gas legacy: 110726
 // gas legacyOptimized: 110567
 // getLength() -> 68
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
index 4795624b41..2a401cd87d 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -22,7 +22,7 @@ contract c {
 // compileViaYul: also
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
-// gas irOptimized: 650971
+// gas irOptimized: 650669
 // gas legacy: 694515
 // gas legacyOptimized: 694013
 // retrieve() -> 9, 28, 9, 28, 4, 3, 32
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
index 91ae6913f8..3449cdc2d8 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
@@ -23,6 +23,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> true
-// gas irOptimized: 92843
+// gas irOptimized: 92740
 // gas legacy: 93035
 // gas legacyOptimized: 92257
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
index 2b74d52e46..73abd2cf7a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
@@ -48,6 +48,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> true
-// gas irOptimized: 153927
+// gas irOptimized: 153260
 // gas legacy: 155961
 // gas legacyOptimized: 153588
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
index f8dea7bbec..e90cf7e58f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
@@ -15,6 +15,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0
-// gas irOptimized: 135145
+// gas irOptimized: 135098
 // gas legacy: 135313
 // gas legacyOptimized: 134548
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
index b9e80c1d71..bd596b86c2 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
@@ -42,11 +42,11 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0
-// gas irOptimized: 92855
+// gas irOptimized: 92800
 // gas legacy: 93006
 // gas legacyOptimized: 92261
 // g() -> 0
 // h() -> 0
-// gas irOptimized: 92922
+// gas irOptimized: 92862
 // gas legacy: 93028
 // gas legacyOptimized: 92303
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 1cfbd17332..81607a2643 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -21,6 +21,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 212669
+// gas irOptimized: 212571
 // gas legacy: 221883
 // gas legacyOptimized: 220734
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index 2a58b92569..4f70232509 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -37,12 +37,12 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x02000202
-// gas irOptimized: 4660920
+// gas irOptimized: 4652092
 // gas legacy: 4578341
 // gas legacyOptimized: 4548354
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4491908
+// gas irOptimized: 4483169
 // gas legacy: 4410769
 // gas legacyOptimized: 4382531
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index deb9404e35..0e05c4ea8e 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -15,6 +15,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
-// gas irOptimized: 690506
+// gas irOptimized: 690205
 // gas legacy: 686268
 // gas legacyOptimized: 685688
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
index cee96209a7..cad3c9d492 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
@@ -19,6 +19,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 5, 4
-// gas irOptimized: 226130
+// gas irOptimized: 225956
 // gas legacy: 233801
 // gas legacyOptimized: 232816
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
index fcec284cc7..4a475ac559 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -24,6 +24,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 3, 4
-// gas irOptimized: 190944
+// gas irOptimized: 190480
 // gas legacy: 195353
 // gas legacyOptimized: 192441
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
index 05e0383784..202b3ad264 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
@@ -17,7 +17,7 @@ contract c {
 // ----
 // setData1(uint256,uint256,uint256): 10, 5, 4 ->
 // copyStorageStorage() ->
-// gas irOptimized: 111488
+// gas irOptimized: 111426
 // gas legacy: 109278
 // gas legacyOptimized: 109268
 // getData2(uint256): 5 -> 10, 4
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
index 167e2740e2..3b8fe6212a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
@@ -20,6 +20,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 5, 4
-// gas irOptimized: 272806
+// gas irOptimized: 272736
 // gas legacy: 270834
 // gas legacyOptimized: 269960
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
index 3b2ddbde11..d2d7f4e486 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
@@ -14,6 +14,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 9, 4
-// gas irOptimized: 123172
+// gas irOptimized: 123162
 // gas legacy: 123579
 // gas legacyOptimized: 123208
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
index 8d438013a5..c865b82280 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
@@ -18,6 +18,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 8, 0
-// gas irOptimized: 236016
+// gas irOptimized: 236090
 // gas legacy: 234695
 // gas legacyOptimized: 234103
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
index 35776b6a1f..db26b4d472 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
@@ -19,7 +19,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 4, 5
-// gas irOptimized: 239134
+// gas irOptimized: 238826
 // gas legacy: 238736
 // gas legacyOptimized: 237159
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
index 62f1ee7155..3b2815526b 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
@@ -17,6 +17,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
-// gas irOptimized: 161746
+// gas irOptimized: 161780
 // gas legacy: 162278
 // gas legacyOptimized: 159955
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index 537924f14e..1daa061a52 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -20,6 +20,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 132180
+// gas irOptimized: 129167
 // gas legacy: 186406
 // gas legacyOptimized: 166126
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
index 36b387971e..b42b84dfe7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
@@ -22,6 +22,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x04000000000000000000000000000000000000000000000000, 0x0, 0x0
-// gas irOptimized: 93855
+// gas irOptimized: 93858
 // gas legacy: 97451
 // gas legacyOptimized: 94200
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index b0387042f7..c87f70244c 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -22,6 +22,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
-// gas irOptimized: 294958
+// gas irOptimized: 294772
 // gas legacy: 303653
 // gas legacyOptimized: 301999
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index 893fbdba3b..c39f802757 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -22,6 +22,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
-// gas irOptimized: 274022
+// gas irOptimized: 273963
 // gas legacy: 276381
 // gas legacyOptimized: 275453
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
index 78f1bef9f9..3cc9c9bd9f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
@@ -38,10 +38,10 @@ contract c {
 // compileViaYul: true
 // ----
 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 181755
+// gas irOptimized: 181308
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 158111
+// gas irOptimized: 157901
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 135282
+// gas irOptimized: 135108
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
-// gas irOptimized: 111460
+// gas irOptimized: 111428
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index 707e250564..826d48b2ba 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -40,12 +40,12 @@ contract Test {
 // compileViaYul: also
 // ----
 // test() -> 24
-// gas irOptimized: 227254
+// gas irOptimized: 227167
 // gas legacy: 227133
 // gas legacyOptimized: 226547
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 133753
+// gas irOptimized: 133621
 // gas legacy: 134295
 // gas legacyOptimized: 133383
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
index 27f81692c9..b3d950ffa8 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
@@ -17,4 +17,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
-// gas irOptimized: 121194
+// gas irOptimized: 121048
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
index 6f11f6c662..2fe2715876 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
@@ -19,4 +19,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 10, 11, 12
-// gas irOptimized: 119201
+// gas irOptimized: 119149
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
index 970a5dcedf..7d4e1f845f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
@@ -23,4 +23,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
-// gas irOptimized: 330385
+// gas irOptimized: 328592
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
index e4ff169f42..0b1d71bdf2 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 3, 3, 3, 1
-// gas irOptimized: 183411
+// gas irOptimized: 183316
diff --git a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
index e23efb6660..de38034fd3 100644
--- a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
@@ -15,6 +15,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 1, 2, 3
-// gas irOptimized: 132580
+// gas irOptimized: 132298
 // gas legacy: 134619
 // gas legacyOptimized: 131940
diff --git a/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
index cee56c23bd..dadbceadcb 100644
--- a/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
@@ -12,7 +12,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // set(uint24[]): 0x20, 18, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 -> 18
-// gas irOptimized: 99873
+// gas irOptimized: 99616
 // gas legacy: 103563
 // gas legacyOptimized: 101397
 // data(uint256): 7 -> 8
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
index dd5f2a86ae..809ef247d5 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -7,11 +7,11 @@ contract c {
 // compileViaYul: also
 // ----
 // set(uint256): 1, 2 -> true
-// gas irOptimized: 110678
+// gas irOptimized: 110699
 // gas legacy: 111091
 // gas legacyOptimized: 110736
 // set(uint256): 2, 2, 3, 4, 5 -> true
-// gas irOptimized: 177635
+// gas irOptimized: 177659
 // gas legacy: 178021
 // gas legacyOptimized: 177666
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index fb4e2159d8..87974f053a 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -19,25 +19,25 @@ contract c {
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 125470
+// gas irOptimized: 121741
 // gas legacy: 124364
 // gas legacyOptimized: 119898
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 134121
+// gas irOptimized: 130733
 // gas legacy: 135431
 // gas legacyOptimized: 130829
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 141217
+// gas irOptimized: 137732
 // gas legacy: 142238
 // gas legacyOptimized: 137518
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 158957
+// gas irOptimized: 152352
 // gas legacy: 160728
 // gas legacyOptimized: 152168
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 419485
+// gas irOptimized: 406089
 // gas legacy: 423017
 // gas legacyOptimized: 406021
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
index 7fba61c2ce..7c0b3bdbbd 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
@@ -11,6 +11,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
-// gas irOptimized: 111204
+// gas irOptimized: 111161
 // gas legacy: 111565
 // gas legacyOptimized: 111347
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index 6bb47d9d98..ed0fe8f5f4 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -37,11 +37,11 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179947
+// gas irOptimized: 179952
 // gas legacy: 180694
 // gas legacyOptimized: 180088
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 107322
+// gas irOptimized: 107332
 // gas legacy: 107895
 // gas legacyOptimized: 107254
 // h() -> 0x40, 0x60, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index 26332e6f2a..b73f3dc448 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -48,6 +48,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0xff
-// gas irOptimized: 121438
+// gas irOptimized: 121145
 // gas legacy: 128035
 // gas legacyOptimized: 123476
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_storage_array.sol
index 2401d90d9f..8448d2e69b 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_storage_array.sol
@@ -18,6 +18,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 7
-// gas irOptimized: 126212
+// gas irOptimized: 126552
 // gas legacy: 205196
 // gas legacyOptimized: 204987
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
index 2532c04af2..b8ec0d97f2 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -9,7 +9,7 @@ contract c {
 // compileViaYul: also
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
-// gas irOptimized: 177396
+// gas irOptimized: 177417
 // gas legacy: 177656
 // gas legacyOptimized: 177496
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index 5cb657afec..3d4623b79d 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -20,6 +20,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 3
-// gas irOptimized: 131095
+// gas irOptimized: 129916
 // gas legacy: 130307
 // gas legacyOptimized: 129363
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
index 9f325200d1..ec58360cd8 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -19,6 +19,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 207030
+// gas irOptimized: 207785
 // gas legacy: 212325
 // gas legacyOptimized: 211486
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index 5749e3ad8b..f94b442f36 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -13,6 +13,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
-// gas irOptimized: 202750
+// gas irOptimized: 202840
 // gas legacy: 204459
 // gas legacyOptimized: 203437
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
index 8893bd94d4..ece6f7969f 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
@@ -20,6 +20,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 207030
+// gas irOptimized: 207785
 // gas legacy: 212330
 // gas legacyOptimized: 211491
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
index 2e1a2cc3c5..556fb5a61b 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
@@ -26,6 +26,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 11, 0x0c, 1, 0x15, 22, 4
-// gas irOptimized: 291923
+// gas irOptimized: 291850
 // gas legacy: 293516
 // gas legacyOptimized: 290263
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index caf1e1dfd4..abcd72ee10 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -15,6 +15,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 2, 3, 4
-// gas irOptimized: 114568
+// gas irOptimized: 114120
 // gas legacy: 126449
 // gas legacyOptimized: 120902
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
index adc51585a7..8072526abc 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array.sol
@@ -20,6 +20,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> "A", 8, 4, "B"
-// gas irOptimized: 140716
+// gas irOptimized: 130594
 // gas legacy: 121398
 // gas legacyOptimized: 115494
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index f3c4a87b47..149e8768d7 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -18,6 +18,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test1() -> true
-// gas irOptimized: 230748
+// gas irOptimized: 225894
 // gas legacy: 255577
 // gas legacyOptimized: 248611
diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
index 36a2eca416..82c8d6b6cc 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
@@ -16,4 +16,4 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0, 0, 0
-// gas irOptimized: 91245
+// gas irOptimized: 91098
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index 46e3606ba0..9f4be21192 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -16,7 +16,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 520360
+// gas irOptimized: 519848
 // gas legacy: 521773
 // gas legacyOptimized: 517048
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index f95a93a223..2587442d59 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -44,7 +44,7 @@ contract c {
 // ----
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
-// gas irOptimized: 104851
+// gas irOptimized: 104355
 // gas legacy: 108571
 // gas legacyOptimized: 100417
 // getLengths() -> 48, 49
diff --git a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
index 7d7f4188b3..6aecbde32d 100644
--- a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
@@ -18,7 +18,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() -> 8
-// gas irOptimized: 123113
+// gas irOptimized: 122528
 // gas legacy: 121756
 // gas legacyOptimized: 120687
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index c5a63fa3a2..dd131f287f 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -13,7 +13,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 465690
+// gas irOptimized: 465585
 // gas legacy: 471460
 // gas legacyOptimized: 467520
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index ab9ae16406..5e30621af2 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -21,6 +21,6 @@ contract B {
 // compileViaYul: also
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 120848
+// gas irOptimized: 130328
 // gas legacy: 235199
 // gas legacyOptimized: 133119
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 6545dc9002..95cb52f112 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -45,6 +45,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 297690
+// gas irOptimized: 302321
 // gas legacy: 462080
 // gas legacyOptimized: 294938
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index 9788b61368..f2a98f9938 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -25,7 +25,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 1, 2, 3
-// gas irOptimized: 2272395
+// gas irOptimized: 2271482
 // gas legacy: 2273722
 // gas legacyOptimized: 2262396
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index 3ad0d8f32f..4be29a15d3 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -20,7 +20,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 38, 28, 18
-// gas irOptimized: 192323
+// gas irOptimized: 188649
 // gas legacy: 189780
 // gas legacyOptimized: 178870
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index dc3b2a8616..08a4031745 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -20,7 +20,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 20, 10
-// gas irOptimized: 161105
+// gas irOptimized: 159175
 // gas legacy: 159459
 // gas legacyOptimized: 153281
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index 2b893c668a..387d21872c 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -12,6 +12,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
-// gas irOptimized: 111157
+// gas irOptimized: 109503
 // gas legacy: 127309
 // gas legacyOptimized: 124136
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index bf605984b0..c911b1b7c3 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -18,7 +18,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> true
-// gas irOptimized: 205254
+// gas irOptimized: 196545
 // gas legacy: 229864
 // gas legacyOptimized: 210964
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index 09e65f0c57..38c0c84d63 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -17,7 +17,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() ->
-// gas irOptimized: 146450
+// gas irOptimized: 142640
 // gas legacy: 165363
 // gas legacyOptimized: 159446
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index ca59097221..6d314fb27e 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -12,6 +12,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 109314
+// gas irOptimized: 108493
 // gas legacy: 126187
 // gas legacyOptimized: 123261
diff --git a/test/libsolidity/semanticTests/array/push/array_push.sol b/test/libsolidity/semanticTests/array/push/array_push.sol
index 83cceeb56b..e8ec366391 100644
--- a/test/libsolidity/semanticTests/array/push/array_push.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push.sol
@@ -18,6 +18,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 5, 4, 3, 3
-// gas irOptimized: 111289
+// gas irOptimized: 111317
 // gas legacy: 111838
 // gas legacyOptimized: 111128
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
index 39f99a9bd7..a4be5ad901 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -14,6 +14,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
-// gas irOptimized: 113393
+// gas irOptimized: 113267
 // gas legacy: 113686
 // gas legacyOptimized: 113499
diff --git a/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol b/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
index 72ab9ea148..04f9544a91 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
@@ -16,6 +16,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 1, 2, 3, 4
-// gas irOptimized: 93200
+// gas irOptimized: 93017
 // gas legacy: 92798
 // gas legacyOptimized: 92062
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
index 03a2c53b3f..60e317770f 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
@@ -22,6 +22,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 2, 3, 4, 5
-// gas irOptimized: 137074
+// gas irOptimized: 136894
 // gas legacy: 147484
 // gas legacyOptimized: 146456
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index 272b179e90..f6da6a3985 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -18,6 +18,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
-// gas irOptimized: 139100
+// gas irOptimized: 138785
 // gas legacy: 145150
 // gas legacyOptimized: 139171
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 86ef51a810..78c817d446 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -17,6 +17,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0
-// gas irOptimized: 185231
+// gas irOptimized: 176848
 // gas legacy: 218028
 // gas legacyOptimized: 205124
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index f1a245ce4b..262ba724a5 100644
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
@@ -15,6 +15,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() ->
-// gas irOptimized: 179867
+// gas irOptimized: 179590
 // gas legacy: 180620
 // gas legacyOptimized: 180403
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index fe6138a4a1..8df809acd9 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -29,14 +29,14 @@ contract C {
 // ----
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
-// gas irOptimized: 114151
+// gas irOptimized: 112555
 // gas legacy: 108234
 // gas legacyOptimized: 102245
 // l() -> 1
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
-// gas irOptimized: 119535
+// gas irOptimized: 116427
 // gas legacy: 107780
 // gas legacyOptimized: 96331
 // l() -> 2
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 093d3aa5a6..defbf41499 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -23,7 +23,7 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 191389
+// gas irOptimized: 184507
 // gas legacy: 184991
 // gas legacyOptimized: 180608
 // l() -> 70
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index 7ae96a3d68..7d2b4d9957 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -26,6 +26,6 @@ contract Main {
 // compileViaYul: also
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 113954
+// gas irOptimized: 113776
 // gas legacy: 126852
 // gas legacyOptimized: 114079
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index c55ce061d1..63c2acbb50 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 458295
+// gas irOptimized: 456873
 // gas legacy: 590939
 // gas legacyOptimized: 448582
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index c0123af139..d4d41d80c2 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 312176
+// gas irOptimized: 308702
 // gas legacy: 429173
 // gas legacyOptimized: 298384
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index 3bf97c49ba..3fdbb07854 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -19,6 +19,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 123090
+// gas irOptimized: 123037
 // gas legacy: 123226
 // gas legacyOptimized: 123092
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index 2da24603ef..b5db5ca2b1 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
@@ -15,6 +15,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 114816
+// gas irOptimized: 114746
 // gas legacy: 116393
 // gas legacyOptimized: 114415
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
index 8e02a5bfc7..f833ba37a7 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
@@ -16,6 +16,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 114816
+// gas irOptimized: 114746
 // gas legacy: 116393
 // gas legacyOptimized: 114415
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
index f9e773b757..552444dd8b 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
@@ -17,6 +17,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
-// gas irOptimized: 185564
+// gas irOptimized: 185444
 // gas legacy: 187621
 // gas legacyOptimized: 184551
diff --git a/test/libsolidity/semanticTests/events/event_indexed_mixed.sol b/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
index d3971c1e91..47aca1e2ab 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
@@ -13,6 +13,6 @@ contract C {
 // ----
 // deposit() ->
 // ~ emit E(uint256,uint256,uint256,bytes): #0x02, 0x01, 0x03, 0x60, 0x03, "def"
-// gas irOptimized: 23685
+// gas irOptimized: 23709
 // gas legacy: 24342
 // gas legacyOptimized: 23753
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index a411da3c62..d35db93c46 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -19,6 +19,6 @@ contract C {
 // ----
 // deposit() ->
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
-// gas irOptimized: 353515
+// gas irOptimized: 343396
 // gas legacy: 390742
 // gas legacyOptimized: 376774
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index b7be3cf057..9205de434d 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -76,12 +76,12 @@ contract FixedFeeRegistrar is Registrar {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 433748
+// gas irOptimized: 425623
 // gas legacy: 936897
-// gas legacyOptimized: 491019
+// gas legacyOptimized: 490983
 // reserve(string), 69 ether: 0x20, 3, "abc" ->
 // ~ emit Changed(string): #0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
-// gas irOptimized: 46070
+// gas irOptimized: 45967
 // gas legacy: 46842
 // gas legacyOptimized: 46091
 // owner(string): 0x20, 3, "abc" -> 0x1212121212121212121212121212120000000012
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 81efd35666..f054497e98 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -178,7 +178,7 @@ contract DepositContract is IDepositContract, ERC165 {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1657475
+// gas irOptimized: 1558013
 // gas legacy: 2580394
 // gas legacyOptimized: 1775403
 // supportsInterface(bytes4): 0x0 -> 0
@@ -186,27 +186,27 @@ contract DepositContract is IDepositContract, ERC165 {
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 122599
+// gas irOptimized: 122169
 // gas legacy: 150465
 // gas legacyOptimized: 122798
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 122599
+// gas irOptimized: 122169
 // gas legacy: 150465
 // gas legacyOptimized: 122798
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 122606
+// gas irOptimized: 122148
 // gas legacy: 150475
 // gas legacyOptimized: 122811
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 122606
+// gas irOptimized: 122148
 // gas legacy: 150475
 // gas legacyOptimized: 122811
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index 77be503012..01d2403a6d 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -50,46 +50,46 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1965559
+// gas irOptimized: 1924584
 // gas legacy: 2602700
 // gas legacyOptimized: 1874490
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
-// gas irOptimized: 22244
+// gas irOptimized: 22137
 // gas legacy: 22767
 // gas legacyOptimized: 22282
 // exp(int256): 3141592653589793238 -> 23140692632779268978
-// gas irOptimized: 24358
+// gas irOptimized: 24545
 // gas legacy: 25203
 // gas legacyOptimized: 24357
 // exp2(int256): 3141592653589793238 -> 8824977827076287620
-// gas irOptimized: 24125
+// gas irOptimized: 24257
 // gas legacy: 24864
 // gas legacyOptimized: 24110
 // gm(int256,int256): 3141592653589793238, 88714123 -> 16694419339601
-// gas irOptimized: 23057
+// gas irOptimized: 22970
 // gas legacy: 23228
 // gas legacyOptimized: 22683
 // log10(int256): 3141592653589793238 -> 4971498726941338506
-// gas irOptimized: 30112
+// gas irOptimized: 30609
 // gas legacy: 32934
 // gas legacyOptimized: 30323
 // log2(int256): 3141592653589793238 -> 1651496129472318782
-// gas irOptimized: 28300
+// gas irOptimized: 28819
 // gas legacy: 31067
 // gas legacyOptimized: 28426
 // mul(int256,int256): 3141592653589793238, 88714123 -> 278703637
-// gas irOptimized: 22335
+// gas irOptimized: 22225
 // gas legacy: 22807
 // gas legacyOptimized: 22295
 // pow(int256,uint256): 3141592653589793238, 5 -> 306019684785281453040
-// gas irOptimized: 22861
+// gas irOptimized: 22635
 // gas legacy: 23508
 // gas legacyOptimized: 22921
 // sqrt(int256): 3141592653589793238 -> 1772453850905516027
-// gas irOptimized: 22702
+// gas irOptimized: 22650
 // gas legacy: 22802
 // gas legacyOptimized: 22422
 // benchmark(int256): 3141592653589793238 -> 998882724338592125, 1000000000000000000, 1000000000000000000
-// gas irOptimized: 37899
+// gas irOptimized: 36630
 // gas legacy: 36673
 // gas legacyOptimized: 34729
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 8a096f5242..c31664c859 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -50,46 +50,46 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1769431
+// gas irOptimized: 1778342
 // gas legacy: 2356230
 // gas legacyOptimized: 1746528
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
-// gas irOptimized: 22047
+// gas irOptimized: 22004
 // gas legacy: 22497
 // gas legacyOptimized: 22010
 // exp(uint256): 3141592653589793238 -> 23140692632779268978
-// gas irOptimized: 24234
+// gas irOptimized: 24444
 // gas legacy: 25104
 // gas legacyOptimized: 24258
 // exp2(uint256): 3141592653589793238 -> 8824977827076287620
-// gas irOptimized: 24063
+// gas irOptimized: 24198
 // gas legacy: 24814
 // gas legacyOptimized: 24062
 // gm(uint256,uint256): 3141592653589793238, 88714123 -> 16694419339601
-// gas irOptimized: 23036
+// gas irOptimized: 22950
 // gas legacy: 23269
 // gas legacyOptimized: 22724
 // log10(uint256): 3141592653589793238 -> 0x44fe4fc084a52b8a
-// gas irOptimized: 29892
+// gas irOptimized: 30269
 // gas legacy: 32898
 // gas legacyOptimized: 29925
 // log2(uint256): 3141592653589793238 -> 1651496129472318782
-// gas irOptimized: 27822
+// gas irOptimized: 28235
 // gas legacy: 30986
 // gas legacyOptimized: 28001
 // mul(uint256,uint256): 3141592653589793238, 88714123 -> 278703637
-// gas irOptimized: 22094
+// gas irOptimized: 22048
 // gas legacy: 22604
 // gas legacyOptimized: 22090
 // pow(uint256,uint256): 3141592653589793238, 5 -> 306019684785281453040
-// gas irOptimized: 22565
+// gas irOptimized: 22406
 // gas legacy: 23245
 // gas legacyOptimized: 22646
 // sqrt(uint256): 3141592653589793238 -> 1772453850905516027
-// gas irOptimized: 22720
+// gas irOptimized: 22672
 // gas legacy: 22820
 // gas legacyOptimized: 22440
 // benchmark(uint256): 3141592653589793238 -> 998882724338592125, 1000000000000000000, 1000000000000000000
-// gas irOptimized: 36587
+// gas irOptimized: 35603
 // gas legacy: 35385
 // gas legacyOptimized: 33449
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index 2c9376b220..1fc85adff7 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -35,10 +35,10 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 528041
+// gas irOptimized: 465357
 // gas legacy: 733634
 // gas legacyOptimized: 479606
 // prb_pi() -> 3141592656369545286
-// gas irOptimized: 63027
+// gas irOptimized: 57478
 // gas legacy: 98903
 // gas legacyOptimized: 75735
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 7a7b956956..8f6b939fdf 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -297,6 +297,6 @@ contract Test {
 // pair() -> true
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 101054
+// gas irOptimized: 95261
 // gas legacy: 114094
 // gas legacyOptimized: 83670
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 1fa79f382d..238ed21840 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -51,26 +51,26 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 778254
+// gas irOptimized: 702619
 // gas legacy: 1188228
 // gas legacyOptimized: 750416
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
-// gas irOptimized: 22734
+// gas irOptimized: 22660
 // gas legacy: 23190
 // gas legacyOptimized: 22508
 // roundtrip(string): 0x20, 11, "hello world" -> 0x20, 11, "hello world"
-// gas irOptimized: 23513
+// gas irOptimized: 23408
 // gas legacy: 23820
 // gas legacyOptimized: 23123
 // utf8len(string): 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" -> 4 # Input: "😃😃😃😃" #
-// gas irOptimized: 24266
+// gas irOptimized: 24026
 // gas legacy: 25716
 // gas legacyOptimized: 24115
 // multiconcat(string,uint256): 0x40, 3, 11, "hello world" -> 0x20, 0x58, 0x68656c6c6f20776f726c6468656c6c6f20776f726c6468656c6c6f20776f726c, 0x6468656c6c6f20776f726c6468656c6c6f20776f726c6468656c6c6f20776f72, 49027192869463622675296414541903001712009715982962058146354235762728281047040 # concatenating 3 times #
-// gas irOptimized: 28958
+// gas irOptimized: 28440
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 2235661
+// gas irOptimized: 2040067
 // gas legacy: 4381235
 // gas legacyOptimized: 2317529
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index b4e7efbb58..b50890f559 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -18,7 +18,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 219233
+// gas irOptimized: 220113
 // gas legacy: 288299
 // gas legacyOptimized: 177933
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
@@ -26,7 +26,7 @@ contract C {
 // f(uint256): 20 -> FAILURE
 // x() -> 1
 // stack(uint256): 1023 -> FAILURE
-// gas irOptimized: 349023
+// gas irOptimized: 345821
 // gas legacy: 535367
 // gas legacyOptimized: 354656
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index 5d4f25a39f..f01a590eb3 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -20,7 +20,7 @@ contract test {
 // compileViaYul: also
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
-// gas irOptimized: 112020
+// gas irOptimized: 111965
 // gas legacy: 113806
 // gas legacyOptimized: 111781
 // get(uint8): 1 -> 21, 22, 42, 43
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index ddebc11b7c..c2678a91de 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -28,6 +28,6 @@ contract C {
 // compileViaYul: also
 // ----
 // t() -> 9
-// gas irOptimized: 99010
+// gas irOptimized: 99186
 // gas legacy: 159083
 // gas legacyOptimized: 108916
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index a183069846..cd5992ce6e 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -29,7 +29,7 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 127613
+// gas irOptimized: 127592
 // gas legacy: 151590
 // gas legacyOptimized: 125422
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
index 651ac994ee..0dc9845f4d 100644
--- a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
+++ b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
@@ -23,8 +23,8 @@ contract D {
 // compileViaYul: also
 // ----
 // f() -> 1
-// gas irOptimized: 78722
+// gas irOptimized: 77164
 // gas legacy: 115012
 // g() -> 5
-// gas irOptimized: 78811
+// gas irOptimized: 77231
 // gas legacy: 115558
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
index 85b1fca3bb..e012accafe 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
@@ -25,5 +25,5 @@ contract B {
 // compileViaYul: also
 // ----
 // g() -> 42
-// gas irOptimized: 84629
+// gas irOptimized: 80945
 // gas legacy: 125609
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index b4f03446ce..4105577f05 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -25,6 +25,6 @@ contract B {
 // compileViaYul: also
 // ----
 // g() -> 42
-// gas irOptimized: 105784
+// gas irOptimized: 111913
 // gas legacy: 185181
 // gas legacyOptimized: 114726
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
index 88ead1eb3d..85a93b3dc8 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
@@ -26,10 +26,10 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0xcdb56c384a9682c600315e3470157a4cf7638d0d33e9dae5c40ffd2644fc5a80
-// gas irOptimized: 22306
+// gas irOptimized: 22239
 // gas legacy: 23385
 // gas legacyOptimized: 23092
 // g() -> 0xcdb56c384a9682c600315e3470157a4cf7638d0d33e9dae5c40ffd2644fc5a80
-// gas irOptimized: 21287
+// gas irOptimized: 21277
 // gas legacy: 21462
 // gas legacyOptimized: 21256
diff --git a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
index 70f52d4c6c..11cb938320 100644
--- a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
+++ b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
@@ -37,10 +37,10 @@ contract C {
 // compileViaYul: also
 // ----
 // convertParent() -> 1
-// gas irOptimized: 87655
+// gas irOptimized: 85640
 // convertSubA() -> 1, 2
-// gas irOptimized: 88451
+// gas irOptimized: 86395
 // gas legacy: 99303
 // convertSubB() -> 1, 3
-// gas irOptimized: 88385
+// gas irOptimized: 86338
 // gas legacy: 99237
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create.sol b/test/libsolidity/semanticTests/salted_create/salted_create.sol
index 064159de37..5374d23521 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create.sol
@@ -22,6 +22,6 @@ contract A {
 // ----
 // different_salt() -> true
 // same_salt() -> true
-// gas irOptimized: 98438948
+// gas irOptimized: 98438914
 // gas legacy: 98439116
 // gas legacyOptimized: 98438970
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 2e386ee454..17edaf3eb4 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -22,6 +22,6 @@ contract A {
 // compileViaYul: also
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 270255
+// gas irOptimized: 273275
 // gas legacy: 422885
 // gas legacyOptimized: 287856
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
index 2fdff6c561..caa3858877 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
@@ -46,6 +46,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> true
-// gas irOptimized: 135141
+// gas irOptimized: 134587
 // gas legacy: 136036
 // gas legacyOptimized: 133480
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
index 3587d8e17c..7b84033d87 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
-// gas irOptimized: 203716
+// gas irOptimized: 203397
 // gas legacy: 209194
 // gas legacyOptimized: 203583
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
index 93b63ff5c1..0d0aba8c8f 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
@@ -25,6 +25,6 @@ contract CopyTest {
 // compileViaYul: also
 // ----
 // run() -> 2, 23, 42
-// gas irOptimized: 195077
+// gas irOptimized: 193980
 // gas legacy: 186016
 // gas legacyOptimized: 184668
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
index f48c548078..12ec4ca181 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
@@ -69,7 +69,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // load() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
-// gas irOptimized: 111174
+// gas irOptimized: 111179
 // gas legacy: 112999
 // gas legacyOptimized: 110881
 // store() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index 070fcf920d..a677b5be8d 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -25,7 +25,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133819
+// gas irOptimized: 133752
 // gas legacy: 134436
 // gas legacyOptimized: 133879
 // test(uint256): 32 -> "3"
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index ccaaeaa52d..0bbb6489e9 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -38,12 +38,12 @@ contract c {
 // compileViaYul: also
 // ----
 // set(uint256): 7 -> true
-// gas irOptimized: 109985
+// gas irOptimized: 110011
 // gas legacy: 110616
 // gas legacyOptimized: 110006
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // copy(uint256,uint256): 7, 8 -> true
-// gas irOptimized: 118701
+// gas irOptimized: 118707
 // gas legacy: 119166
 // gas legacyOptimized: 118622
 // retrieve(uint256): 7 -> 1, 3, 4, 2
diff --git a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
index 441584a5e3..21757ea407 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
@@ -21,6 +21,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> true
-// gas irOptimized: 110144
+// gas irOptimized: 110186
 // gas legacy: 110627
 // gas legacyOptimized: 109706
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
index 8385396287..bc18d31922 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
@@ -33,4 +33,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 0, 0, 0
-// gas irOptimized: 117388
+// gas irOptimized: 117289
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index 14e170a4c6..e759520b47 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -44,7 +44,7 @@ contract C {
 // compileViaYul: also
 // ----
 // f() ->
-// gas irOptimized: 121704
+// gas irOptimized: 121618
 // gas legacy: 122132
 // gas legacyOptimized: 121500
 // g() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
index 6425c0d373..6f88df3949 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
@@ -27,4 +27,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 0
-// gas irOptimized: 112160
+// gas irOptimized: 111896
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
index caa2b693fe..fe791a68dd 100644
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
+++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
@@ -32,6 +32,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 42, 23, 34, 42, 42
-// gas irOptimized: 110592
+// gas irOptimized: 110966
 // gas legacy: 112021
 // gas legacyOptimized: 110548
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index 46b596e398..b56a2ec229 100644
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ b/test/libsolidity/semanticTests/structs/structs.sol
@@ -32,7 +32,7 @@ contract test {
 // ----
 // check() -> false
 // set() ->
-// gas irOptimized: 134389
+// gas irOptimized: 134335
 // gas legacy: 135277
 // gas legacyOptimized: 134064
 // check() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 3596d2c992..1927b25192 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -51,11 +51,11 @@ contract C {
 // compileViaYul: also
 // ----
 // test_f() -> true
-// gas irOptimized: 122887
+// gas irOptimized: 122509
 // gas legacy: 126168
 // gas legacyOptimized: 123199
 // test_g() -> true
-// gas irOptimized: 96673
+// gas irOptimized: 95980
 // gas legacy: 101311
 // gas legacyOptimized: 96566
 // addresses(uint256): 0 -> 0x18
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
index 9827d6cd13..433d1969c6 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
@@ -25,18 +25,18 @@ contract C {
 // ----
 // s() -> 0, 0, 0x00, 0
 // f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 ->
-// gas irOptimized: 44860
+// gas irOptimized: 44786
 // gas legacy: 47200
 // gas legacyOptimized: 44923
 // s() -> 1, 0xff, 0x6162000000000000000000000000000000000000000000000000000000000000, 15
 // g(uint16[]): 0x20, 3, 1, 2, 3 -> 0x20, 3, 1, 2, 3
-// gas irOptimized: 69306
+// gas irOptimized: 69097
 // gas legacy: 75466
 // gas legacyOptimized: 74255
 // small(uint256): 0 -> 1
 // small(uint256): 1 -> 2
 // h(bytes2[]): 0x20, 3, "ab", "cd", "ef" -> 0x20, 3, "ab", "cd", "ef"
-// gas irOptimized: 69510
+// gas irOptimized: 69174
 // gas legacy: 75156
 // gas legacyOptimized: 74342
 // l(uint256): 0 -> 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index 155a4bd87f..4db14ff739 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -115,33 +115,33 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 462361
+// gas irOptimized: 442239
 // gas legacy: 861547
 // gas legacyOptimized: 420959
 // totalSupply() -> 20
-// gas irOptimized: 23378
+// gas irOptimized: 23415
 // gas legacy: 23653
 // gas legacyOptimized: 23368
 // transfer(address,uint256): 2, 5 -> true
 // ~ emit Transfer(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x05
-// gas irOptimized: 48503
+// gas irOptimized: 48471
 // gas legacy: 49572
 // gas legacyOptimized: 48575
 // decreaseAllowance(address,uint256): 2, 0 -> true
 // ~ emit Approval(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x00
-// gas irOptimized: 26327
+// gas irOptimized: 26275
 // gas legacy: 27204
 // gas legacyOptimized: 26317
 // decreaseAllowance(address,uint256): 2, 1 -> FAILURE, hex"4e487b71", 0x11
-// gas irOptimized: 24040
+// gas irOptimized: 24042
 // gas legacy: 24506
 // gas legacyOptimized: 24077
 // transfer(address,uint256): 2, 14 -> true
 // ~ emit Transfer(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x0e
-// gas irOptimized: 28603
+// gas irOptimized: 28571
 // gas legacy: 29672
 // gas legacyOptimized: 28675
 // transfer(address,uint256): 2, 2 -> FAILURE, hex"4e487b71", 0x11
-// gas irOptimized: 24052
+// gas irOptimized: 24071
 // gas legacy: 24492
 // gas legacyOptimized: 24074
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
index e1a7c1c5b1..04e9936823 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
@@ -25,18 +25,18 @@ contract C {
 // ----
 // s() -> 0, 0, 0x00, 0
 // f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 ->
-// gas irOptimized: 44551
+// gas irOptimized: 44536
 // gas legacy: 46213
 // gas legacyOptimized: 44671
 // s() -> 1, 0xff, 0x6162000000000000000000000000000000000000000000000000000000000000, 15
 // g(uint16[]): 0x20, 3, 1, 2, 3 -> 0x20, 3, 1, 2, 3
-// gas irOptimized: 69671
+// gas irOptimized: 69555
 // gas legacy: 76557
 // gas legacyOptimized: 74834
 // small(uint256): 0 -> 1
 // small(uint256): 1 -> 2
 // h(bytes2[]): 0x20, 3, "ab", "cd", "ef" -> 0x20, 3, "ab", "cd", "ef"
-// gas irOptimized: 69928
+// gas irOptimized: 69617
 // gas legacy: 76238
 // gas legacyOptimized: 74921
 // l(uint256): 0 -> 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
index d7b9db30b1..d2d46c7088 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
@@ -20,18 +20,18 @@ contract C {
 // compileViaYul: also
 // ----
 // getX() -> 0
-// gas irOptimized: 23353
+// gas irOptimized: 23379
 // gas legacy: 23479
 // gas legacyOptimized: 23311
 // setX(int256): 5 ->
-// gas irOptimized: 43511
+// gas irOptimized: 43510
 // gas legacy: 43724
 // gas legacyOptimized: 43516
 // getX() -> 5
-// gas irOptimized: 23353
+// gas irOptimized: 23379
 // gas legacy: 23479
 // gas legacyOptimized: 23311
 // add(int256,int256): 200, 99 -> 299
-// gas irOptimized: 21794
+// gas irOptimized: 21764
 // gas legacy: 22394
 // gas legacyOptimized: 21813
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
index 29038a8617..44d87c397c 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
@@ -21,18 +21,18 @@ contract C {
 // compileViaYul: also
 // ----
 // getX() -> 0
-// gas irOptimized: 23353
+// gas irOptimized: 23379
 // gas legacy: 23608
 // gas legacyOptimized: 23311
 // setX(int256): 5 ->
-// gas irOptimized: 43511
+// gas irOptimized: 43510
 // gas legacy: 43724
 // gas legacyOptimized: 43516
 // getX() -> 5
-// gas irOptimized: 23353
+// gas irOptimized: 23379
 // gas legacy: 23608
 // gas legacyOptimized: 23311
 // add(int256,int256): 200, 99 -> 299
-// gas irOptimized: 21794
+// gas irOptimized: 21764
 // gas legacy: 22523
 // gas legacyOptimized: 21813
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index b8a314d32c..ee6f7690db 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -36,6 +36,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 240334
+// gas irOptimized: 240685
 // gas legacy: 240358
 // gas legacyOptimized: 239682
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index 6e7487ee57..204e620d62 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -98,33 +98,33 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 459547
+// gas irOptimized: 437697
 // gas legacy: 833310
 // gas legacyOptimized: 416135
 // totalSupply() -> 20
-// gas irOptimized: 23378
+// gas irOptimized: 23415
 // gas legacy: 23524
 // gas legacyOptimized: 23368
 // transfer(address,uint256): 2, 5 -> true
 // ~ emit Transfer(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x05
-// gas irOptimized: 48503
+// gas irOptimized: 48471
 // gas legacy: 49317
 // gas legacyOptimized: 48491
 // decreaseAllowance(address,uint256): 2, 0 -> true
 // ~ emit Approval(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x00
-// gas irOptimized: 26327
+// gas irOptimized: 26275
 // gas legacy: 27012
 // gas legacyOptimized: 26275
 // decreaseAllowance(address,uint256): 2, 1 -> FAILURE, hex"4e487b71", 0x11
-// gas irOptimized: 24040
+// gas irOptimized: 24042
 // gas legacy: 24467
 // gas legacyOptimized: 24056
 // transfer(address,uint256): 2, 14 -> true
 // ~ emit Transfer(address,address,uint256): #0x1212121212121212121212121212120000000012, #0x02, 0x0e
-// gas irOptimized: 28603
+// gas irOptimized: 28571
 // gas legacy: 29417
 // gas legacyOptimized: 28591
 // transfer(address,uint256): 2, 2 -> FAILURE, hex"4e487b71", 0x11
-// gas irOptimized: 24052
+// gas irOptimized: 24071
 // gas legacy: 24453
 // gas legacyOptimized: 24053
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index a8e9ce1ed8..8ef472136a 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -22,6 +22,6 @@ contract C {
 // compileViaYul: also
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178952
+// gas irOptimized: 178953
 // gas legacy: 180890
 // gas legacyOptimized: 179609
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index 33afcb66f8..ab6d6e59a0 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -38,10 +38,10 @@ contract D {
 // f() -> 0x1 # This should work, next should throw #
 // gas legacy: 103844
 // fview() -> FAILURE
-// gas irOptimized: 98438630
+// gas irOptimized: 98438627
 // gas legacy: 98438803
 // gas legacyOptimized: 98438596
 // fpure() -> FAILURE
-// gas irOptimized: 98438630
+// gas irOptimized: 98438627
 // gas legacy: 98438803
 // gas legacyOptimized: 98438597
diff --git a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
index 12e491968b..c8398b2bf3 100644
--- a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
@@ -30,7 +30,7 @@ contract c {
 // x() -> 0, 0
 // y() -> 0, 0
 // set() ->
-// gas irOptimized: 109734
+// gas irOptimized: 109733
 // gas legacy: 109732
 // gas legacyOptimized: 109682
 // x() -> 1, 2
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
index 83aefbc61c..b603fb7864 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
@@ -28,7 +28,7 @@ contract C {
 // index(uint256): 10 -> true
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
-// gas irOptimized: 151952
+// gas irOptimized: 138441
 // gas legacy: 248854
 // gas legacyOptimized: 152638
 // accessIndex(uint256,int256): 10, 1 -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index 5241f29c07..24d0e9f145 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -18,33 +18,33 @@ contract C {
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
-// gas irOptimized: 3041780
+// gas irOptimized: 3032986
 // gas legacy: 3071205
 // gas legacyOptimized: 3011873
 // test_indices(uint256): 5 ->
-// gas irOptimized: 368208
+// gas irOptimized: 367642
 // gas legacy: 369241
 // gas legacyOptimized: 366149
 // test_indices(uint256): 10 ->
 // test_indices(uint256): 15 ->
-// gas irOptimized: 73803
+// gas irOptimized: 72860
 // test_indices(uint256): 0xFF ->
-// gas irOptimized: 3455818
+// gas irOptimized: 3438610
 // gas legacy: 3514167
 // gas legacyOptimized: 3398107
 // test_indices(uint256): 1000 ->
-// gas irOptimized: 18383600
+// gas irOptimized: 18318372
 // gas legacy: 18617999
 // gas legacyOptimized: 18178944
 // test_indices(uint256): 129 ->
-// gas irOptimized: 2742698
+// gas irOptimized: 2733570
 // gas legacy: 2772735
 // gas legacyOptimized: 2716547
 // test_indices(uint256): 128 ->
-// gas irOptimized: 434013
+// gas irOptimized: 426682
 // gas legacy: 467272
 // gas legacyOptimized: 418424
 // test_indices(uint256): 1 ->
-// gas irOptimized: 363418
+// gas irOptimized: 363074
 // gas legacy: 363407
 // gas legacyOptimized: 361811
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
index 4b377ec2da..975130c517 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
@@ -18,11 +18,11 @@ contract C {
 // test_boundary_check(uint256,uint256): 1, 1 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
-// gas irOptimized: 139319
+// gas irOptimized: 137849
 // gas legacy: 131830
 // gas legacyOptimized: 112054
 // test_boundary_check(uint256,uint256): 256, 255 -> 0
-// gas irOptimized: 141481
+// gas irOptimized: 140028
 // gas legacy: 134149
 // gas legacyOptimized: 114233
 // test_boundary_check(uint256,uint256): 256, 0xFFFF -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index 870f339fc0..b2e0cb5467 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -54,18 +54,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131736
+// gas irOptimized: 131197
 // gas legacy: 132367
 // gas legacyOptimized: 129586
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 175795
+// gas irOptimized: 174805
 // gas legacy: 177329
 // gas legacyOptimized: 172224
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 199485
+// gas irOptimized: 198055
 // gas legacy: 201954
 // gas legacyOptimized: 194604
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 6123320
+// gas irOptimized: 6098185
 // gas legacy: 6163149
 // gas legacyOptimized: 6029474
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
index 47b75c08ea..c5af584495 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
@@ -14,11 +14,11 @@ contract C {
 // set_get_length(uint256): 10 -> 10
 // set_get_length(uint256): 20 -> 20
 // set_get_length(uint256): 0xFF -> 0xFF
-// gas irOptimized: 96934
+// gas irOptimized: 96690
 // gas legacy: 126722
 // gas legacyOptimized: 107818
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1221706
+// gas irOptimized: 1217857
 // gas legacy: 1702119
 // gas legacyOptimized: 1398420
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
index 05970805f9..5c7c4cba84 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
@@ -13,11 +13,11 @@ contract C {
 // compileViaYul: also
 // ----
 // pushEmpty(uint256): 128
-// gas irOptimized: 414881
+// gas irOptimized: 412570
 // gas legacy: 417287
 // gas legacyOptimized: 399048
 // pushEmpty(uint256): 256
-// gas irOptimized: 706405
+// gas irOptimized: 702558
 // gas legacy: 715083
 // gas legacyOptimized: 688908
 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
index 06e00f6db9..5e5d1c962c 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
@@ -18,15 +18,15 @@ contract C {
 // set_get_length(uint256): 10 -> 10
 // set_get_length(uint256): 20 -> 20
 // set_get_length(uint256): 0 -> 0
-// gas irOptimized: 77961
+// gas irOptimized: 77628
 // gas legacy: 77730
 // gas legacyOptimized: 77162
 // set_get_length(uint256): 0xFF -> 0xFF
-// gas irOptimized: 143348
+// gas irOptimized: 141805
 // gas legacy: 678237
 // gas legacyOptimized: 115104
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1824725
+// gas irOptimized: 1801672
 // gas legacy: 9873774
 // gas legacyOptimized: 1398546
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
index 7cc1f9e544..e802e3687b 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
@@ -15,15 +15,15 @@ contract C {
 // set_get_length(uint256): 1 -> 0
 // set_get_length(uint256): 10 -> 0
 // set_get_length(uint256): 20 -> 0
-// gas irOptimized: 86888
+// gas irOptimized: 86331
 // gas legacy: 85822
 // gas legacyOptimized: 83608
 // set_get_length(uint256): 0xFF -> 0
-// gas irOptimized: 828783
+// gas irOptimized: 821881
 // gas legacy: 810327
 // gas legacyOptimized: 786258
 // set_get_length(uint256): 0xFFF -> 0
-// gas irOptimized: 12951675
+// gas irOptimized: 12841093
 // gas legacy: 12649059
 // gas legacyOptimized: 12267870
 // set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
index 38ef5ad39d..8986acc1b0 100644
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ b/test/libyul/EVMCodeTransformTest.cpp
@@ -20,6 +20,10 @@
 #include <test/libyul/Common.h>
 
 #include <libyul/AssemblyStack.h>
+#include <libyul/backends/evm/EthAssemblyAdapter.h>
+#include <libyul/backends/evm/EVMObjectCompiler.h>
+
+#include <libevmasm/Assembly.h>
 
 #include <liblangutil/SourceReferenceFormatter.h>
 
@@ -61,7 +65,18 @@ TestCase::TestResult EVMCodeTransformTest::run(ostream& _stream, string const& _
 		return TestResult::FatalError;
 	}
 
-	m_obtainedResult = evmasm::disassemble(stack.assemble(AssemblyStack::Machine::EVM).bytecode->bytecode, "\n");
+	evmasm::Assembly assembly;
+	EthAssemblyAdapter adapter(assembly);
+	EVMObjectCompiler::compile(
+		*stack.parserResult(),
+		adapter,
+		EVMDialect::strictAssemblyForEVMObjects(EVMVersion{}),
+		m_stackOpt
+	);
+
+	std::ostringstream output;
+	output << assembly;
+	m_obtainedResult = output.str();
 
 	return checkResult(_stream, _linePrefix, _formatted);
 }
diff --git a/test/libyul/evmCodeTransform/early_push_on_deep_swap.yul b/test/libyul/evmCodeTransform/early_push_on_deep_swap.yul
new file mode 100644
index 0000000000..5e119cc73f
--- /dev/null
+++ b/test/libyul/evmCodeTransform/early_push_on_deep_swap.yul
@@ -0,0 +1,54 @@
+{
+    extcodecopy(div(div(call(call(gas(),0x10000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000, 0x1000000000000000000000000000000000000000000000000000, 0x10000000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000000, 0x1000000000000000000000000000000000000000000000000000000), 0x10000000000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000000000, 0x1000000000000000000000000000000000000000000000000000000000, 0x10000000000000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000000000000, 0x1000000000000000000000000000000000000000000000000000000000000),0x10000000000000000000000000000000000000000000000000000000000000),0x100000000000000000000000000000000000000000000000000000000000000), 0x1000000000000000000000000000000000000000000000000000000000000000, 0x1000000000000000000000000000000000000000000000000000000000000001, 0x100000000000000000000000000000000000000000000000000000000000001)
+}
+// ====
+// stackOptimization: true
+// ----
+//     /* "":1027:1092   */
+//   0x0100000000000000000000000000000000000000000000000000000000000001
+//     /* "":959:1025   */
+//   0x1000000000000000000000000000000000000000000000000000000000000001
+//     /* "":891:957   */
+//   0x1000000000000000000000000000000000000000000000000000000000000000
+//     /* "":823:888   */
+//   0x0100000000000000000000000000000000000000000000000000000000000000
+//     /* "":757:821   */
+//   0x10000000000000000000000000000000000000000000000000000000000000
+//     /* "":692:755   */
+//   0x01000000000000000000000000000000000000000000000000000000000000
+//     /* "":628:690   */
+//   0x100000000000000000000000000000000000000000000000000000000000
+//     /* "":565:626   */
+//   0x010000000000000000000000000000000000000000000000000000000000
+//     /* "":503:563   */
+//   0x1000000000000000000000000000000000000000000000000000000000
+//     /* "":442:501   */
+//   0x0100000000000000000000000000000000000000000000000000000000
+//     /* "":382:440   */
+//   0x10000000000000000000000000000000000000000000000000000000
+//     /* "":322:379   */
+//   0x01000000000000000000000000000000000000000000000000000000
+//     /* "":264:320   */
+//   0x100000000000000000000000000000000000000000000000000000
+//     /* "":207:262   */
+//   0x010000000000000000000000000000000000000000000000000000
+//     /* "":151:205   */
+//   0x1000000000000000000000000000000000000000000000000000
+//     /* "":96:149   */
+//   0x0100000000000000000000000000000000000000000000000000
+//     /* "":42:94   */
+//   0x10000000000000000000000000000000000000000000000000
+//     /* "":36:41   */
+//   gas
+//     /* "":31:380   */
+//   call
+//     /* "":26:756   */
+//   call
+//     /* "":22:822   */
+//   div
+//     /* "":18:889   */
+//   div
+//     /* "":6:1093   */
+//   extcodecopy
+//     /* "":0:1095   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/literal_loop.yul b/test/libyul/evmCodeTransform/literal_loop.yul
new file mode 100644
index 0000000000..d743836cbc
--- /dev/null
+++ b/test/libyul/evmCodeTransform/literal_loop.yul
@@ -0,0 +1,74 @@
+object "main" {
+	code {
+		codecopy(0, dataoffset("deployed"), datasize("deployed"))
+		return(0, datasize("deployed"))
+	}
+	object "deployed" {
+		code {
+			for {}
+			add(delegatecall(delegatecall(call(selfbalance(), 0x0, 0x0, 0x0, 0x0, 0x0, 0x0), 0x0, 0x0, 0x0, 0x0, 0x0), 0x0, 0x0, 0x0, 0x0, 0x0),0x0)
+			{}
+			{}
+		}
+	}
+}
+// ====
+// stackOptimization: true
+// ----
+//     /* "":62:82   */
+//   dataSize(sub_0)
+//     /* "":38:60   */
+//   dataOffset(sub_0)
+//     /* "":35:36   */
+//   0x00
+//     /* "":26:83   */
+//   codecopy
+//     /* "":96:116   */
+//   dataSize(sub_0)
+//     /* "":93:94   */
+//   0x00
+//     /* "":86:117   */
+//   return
+// stop
+//
+// sub_0: assembly {
+//         /* "":164:300   */
+//     tag_1:
+//         /* "":296:299   */
+//       0x00
+//         /* "":199:212   */
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       dup1
+//       selfbalance
+//         /* "":194:243   */
+//       call
+//         /* "":181:269   */
+//       delegatecall
+//         /* "":168:295   */
+//       delegatecall
+//         /* "":164:300   */
+//       add
+//       tag_2
+//       jumpi
+//         /* "":154:312   */
+//     tag_3:
+//       stop
+//         /* "":310:312   */
+//     tag_2:
+//         /* "":304:306   */
+//       jump(tag_1)
+// }
diff --git a/test/libyul/evmCodeTransform/nonempty_initial_layout.yul b/test/libyul/evmCodeTransform/nonempty_initial_layout.yul
new file mode 100644
index 0000000000..eb1a787c06
--- /dev/null
+++ b/test/libyul/evmCodeTransform/nonempty_initial_layout.yul
@@ -0,0 +1,17 @@
+{
+    if 0x2000000000000000000000000000000000000000000000000000000000 {}
+}
+// ====
+// stackOptimization: true
+// ----
+//     /* "":9:69   */
+//   0x2000000000000000000000000000000000000000000000000000000000
+//     /* "":6:72   */
+//   tag_1
+//   jumpi
+//     /* "":0:74   */
+// tag_2:
+//   stop
+//     /* "":70:72   */
+// tag_1:
+//   jump(tag_2)
diff --git a/test/libyul/evmCodeTransform/stackReuse/for_1.yul b/test/libyul/evmCodeTransform/stackReuse/for_1.yul
index e2f4ba128e..b02710598f 100644
--- a/test/libyul/evmCodeTransform/stackReuse/for_1.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/for_1.yul
@@ -2,18 +2,15 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x0
-// POP
-// JUMPDEST
-// PUSH1 0x1
-// ISZERO
-// PUSH1 0x11
-// JUMPI
-// PUSH1 0x3
-// POP
-// JUMPDEST
-// PUSH1 0x3
-// JUMP
-// JUMPDEST
-// PUSH1 0x2
-// POP
+//     /* "":17:18   */
+//   0x00
+//     /* "":6:20   */
+//   pop
+//     /* "":27:41   */
+// tag_1:
+//     /* "":38:39   */
+//   0x03
+//     /* "":27:41   */
+//   pop
+//     /* "":23:26   */
+//   jump(tag_1)
diff --git a/test/libyul/evmCodeTransform/stackReuse/for_2.yul b/test/libyul/evmCodeTransform/stackReuse/for_2.yul
index f1f7460d48..37d372fb99 100644
--- a/test/libyul/evmCodeTransform/stackReuse/for_2.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/for_2.yul
@@ -2,21 +2,19 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x0
-// JUMPDEST
-// PUSH1 0x1
-// ISZERO
-// PUSH1 0x14
-// JUMPI
-// PUSH1 0x8
-// SWAP1
-// POP
-// PUSH1 0x3
-// POP
-// JUMPDEST
-// PUSH1 0x2
-// JUMP
-// JUMPDEST
-// POP
-// PUSH1 0x2
-// POP
+//     /* "":17:18   */
+//   0x00
+//     /* "":6:20   */
+//   pop
+//     /* "":27:48   */
+// tag_1:
+//     /* "":34:35   */
+//   0x08
+//     /* "":36:46   */
+//   pop
+//     /* "":45:46   */
+//   0x03
+//     /* "":27:48   */
+//   pop
+//     /* "":23:26   */
+//   jump(tag_1)
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse.yul b/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse.yul
index 13048c020a..96637da89f 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse.yul
@@ -4,25 +4,23 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x17
-// JUMP
-// JUMPDEST
-// ADDRESS
-// POP
-// DUP3
-// DUP2
-// SSTORE
-// POP
-// CALLVALUE
-// POP
-// PUSH1 0x0
-// DUP2
-// SWAP1
-// POP
-// JUMPDEST
-// SWAP3
-// SWAP2
-// POP
-// POP
-// JUMP
-// JUMPDEST
+//     /* "":0:88   */
+//   stop
+//     /* "":6:86   */
+// tag_1:
+//   swap2
+//   swap1
+//   swap2
+//     /* "":37:46   */
+//   address
+//     /* "":33:47   */
+//   pop
+//     /* "":48:60   */
+//   sstore
+//     /* "":65:76   */
+//   callvalue
+//     /* "":61:77   */
+//   pop
+//     /* "":6:86   */
+//   swap1
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul b/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul
index d1f6b5bdc8..385c253df5 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul
@@ -7,23 +7,31 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x17
-// JUMP
-// JUMPDEST
-// DUP1
-// PUSH1 0x80
-// MSTORE
-// POP
-// PUSH1 0x0
-// CALLDATALOAD
-// ISZERO
-// PUSH1 0x13
-// JUMPI
-// DUP1
-// DUP2
-// SSTORE
-// JUMPDEST
-// POP
-// JUMPDEST
-// JUMP
-// JUMPDEST
+//     /* "":0:88   */
+//   stop
+//     /* "":4:86   */
+// tag_1:
+//     /* "":34:38   */
+//   0x80
+//     /* "":27:42   */
+//   mstore
+//     /* "":63:64   */
+//   0x00
+//     /* "":50:65   */
+//   calldataload
+//     /* "":47:82   */
+//   tag_2
+//   jumpi
+//     /* "":21:86   */
+// tag_3:
+//     /* "":4:86   */
+//   pop
+//   jump	// out
+//     /* "":66:82   */
+// tag_2:
+//     /* "":68:80   */
+//   dup1
+//   sstore
+//     /* "":66:82   */
+//   codesize
+//   jump(tag_3)
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_call.yul b/test/libyul/evmCodeTransform/stackReuse/function_call.yul
index c14ccff365..1abc8d8aff 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_call.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_call.yul
@@ -6,28 +6,35 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x9
-// PUSH1 0x2
-// PUSH1 0x1
-// PUSH1 0xD
-// JUMP
-// JUMPDEST
-// PUSH1 0x15
-// JUMP
-// JUMPDEST
-// POP
-// POP
-// PUSH1 0x0
-// JUMPDEST
-// SWAP1
-// JUMP
-// JUMPDEST
-// PUSH1 0x1F
-// PUSH1 0x4
-// PUSH1 0x3
-// PUSH1 0xD
-// JUMP
-// JUMPDEST
-// SWAP1
-// POP
-// POP
+//     /* "":15:22   */
+//   tag_1
+//     /* "":20:21   */
+//   0x02
+//     /* "":17:18   */
+//   0x01
+//     /* "":15:22   */
+//   tag_2
+//   jump	// in
+// tag_1:
+//     /* "":62:69   */
+//   pop
+//   tag_3
+//     /* "":67:68   */
+//   0x04
+//     /* "":64:65   */
+//   0x03
+//     /* "":62:69   */
+//   tag_2
+//   jump	// in
+// tag_3:
+//     /* "":0:71   */
+//   stop
+//     /* "":27:52   */
+// tag_2:
+//   pop
+//   pop
+//     /* "":47:48   */
+//   0x00
+//     /* "":27:52   */
+//   swap1
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_many_arguments.yul b/test/libyul/evmCodeTransform/stackReuse/function_many_arguments.yul
index aa4567a906..17ccdd3caf 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_many_arguments.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_many_arguments.yul
@@ -25,92 +25,86 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x80
-// JUMP
-// JUMPDEST
-// DUP1
-// PUSH2 0x100
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x120
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x140
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x160
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x180
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x1A0
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x1C0
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x1E0
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x200
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x220
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x240
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x260
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x280
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x2A0
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x2C0
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x2E0
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x300
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x320
-// MSTORE
-// POP
-// DUP1
-// PUSH2 0x340
-// MSTORE
-// POP
-// PUSH1 0x0
-// DUP2
-// SWAP1
-// POP
-// JUMPDEST
-// SWAP2
-// SWAP1
-// POP
-// JUMP
-// JUMPDEST
+//     /* "":0:662   */
+//   stop
+//     /* "":6:660   */
+// tag_1:
+//     /* "":130:136   */
+//   0x0100
+//     /* "":123:141   */
+//   mstore
+//     /* "":157:163   */
+//   0x0120
+//     /* "":150:168   */
+//   mstore
+//     /* "":184:190   */
+//   0x0140
+//     /* "":177:195   */
+//   mstore
+//     /* "":211:217   */
+//   0x0160
+//     /* "":204:222   */
+//   mstore
+//     /* "":238:244   */
+//   0x0180
+//     /* "":231:249   */
+//   mstore
+//     /* "":265:271   */
+//   0x01a0
+//     /* "":258:276   */
+//   mstore
+//     /* "":292:298   */
+//   0x01c0
+//     /* "":285:303   */
+//   mstore
+//     /* "":319:325   */
+//   0x01e0
+//     /* "":312:330   */
+//   mstore
+//     /* "":346:352   */
+//   0x0200
+//     /* "":339:357   */
+//   mstore
+//     /* "":373:379   */
+//   0x0220
+//     /* "":366:385   */
+//   mstore
+//     /* "":401:407   */
+//   0x0240
+//     /* "":394:413   */
+//   mstore
+//     /* "":429:435   */
+//   0x0260
+//     /* "":422:441   */
+//   mstore
+//     /* "":457:463   */
+//   0x0280
+//     /* "":450:469   */
+//   mstore
+//     /* "":485:491   */
+//   0x02a0
+//     /* "":478:497   */
+//   mstore
+//     /* "":513:519   */
+//   0x02c0
+//     /* "":506:525   */
+//   mstore
+//     /* "":541:547   */
+//   0x02e0
+//     /* "":534:553   */
+//   mstore
+//     /* "":569:575   */
+//   0x0300
+//     /* "":562:581   */
+//   mstore
+//     /* "":597:603   */
+//   0x0320
+//     /* "":590:609   */
+//   mstore
+//     /* "":625:631   */
+//   0x0340
+//     /* "":618:637   */
+//   mstore
+//     /* "":6:660   */
+//   swap1
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_params.yul b/test/libyul/evmCodeTransform/stackReuse/function_params.yul
index 60139bb769..e8d9bb30cc 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_params.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_params.yul
@@ -4,11 +4,10 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x8
-// JUMP
-// JUMPDEST
-// POP
-// POP
-// JUMPDEST
-// JUMP
-// JUMPDEST
+//     /* "":0:28   */
+//   stop
+//     /* "":6:26   */
+// tag_1:
+//   pop
+//   pop
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams.yul b/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams.yul
index 3228637dc5..5292034005 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams.yul
@@ -8,17 +8,18 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x10
-// JUMP
-// JUMPDEST
-// POP
-// POP
-// POP
-// POP
-// PUSH1 0x0
-// PUSH1 0x0
-// JUMPDEST
-// SWAP1
-// SWAP2
-// JUMP
-// JUMPDEST
+//     /* "":212:254   */
+//   stop
+//     /* "":218:252   */
+// tag_1:
+//   pop
+//   pop
+//   pop
+//   pop
+//     /* "":247:248   */
+//   0x00
+//     /* "":244:245   */
+//   0x00
+//     /* "":218:252   */
+//   swap2
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams_partly_used.yul b/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams_partly_used.yul
index 089892a66a..d0fc0506f8 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams_partly_used.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_params_and_retparams_partly_used.yul
@@ -4,28 +4,31 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x1E
-// JUMP
-// JUMPDEST
-// POP
-// PUSH1 0x3
-// SWAP1
-// POP
-// POP
-// POP
-// POP
-// PUSH1 0x0
-// PUSH1 0x0
-// PUSH1 0x9
-// PUSH1 0x2
-// SWAP2
-// POP
-// DUP2
-// DUP2
-// MSTORE
-// POP
-// JUMPDEST
-// SWAP1
-// SWAP2
-// JUMP
-// JUMPDEST
+//     /* "":0:80   */
+//   stop
+//     /* "":6:78   */
+// tag_1:
+//   pop
+//   pop
+//   pop
+//   pop
+//     /* "":32:33   */
+//   0x00
+//     /* "":6:78   */
+//   swap1
+//     /* "":44:45   */
+//   0x03
+//     /* "":46:56   */
+//   pop
+//     /* "":55:56   */
+//   0x09
+//     /* "":57:63   */
+//   swap1
+//     /* "":62:63   */
+//   0x02
+//     /* "":64:76   */
+//   dup1
+//   swap3
+//   mstore
+//     /* "":6:78   */
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam.yul
index 4dde5208b4..bee0d3f635 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_retparam.yul
@@ -4,13 +4,14 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0xC
-// JUMP
-// JUMPDEST
-// PUSH1 0x0
-// PUSH1 0x0
-// JUMPDEST
-// SWAP1
-// SWAP2
-// JUMP
-// JUMPDEST
+//     /* "":0:32   */
+//   stop
+//     /* "":6:30   */
+// tag_1:
+//     /* "":25:26   */
+//   0x00
+//     /* "":22:23   */
+//   0x00
+//     /* "":6:30   */
+//   swap2
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_block.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_block.yul
index 3c1d90bd3d..5a9e7704e6 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_block.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_retparam_block.yul
@@ -4,15 +4,21 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0xD
-// JUMP
-// JUMPDEST
-// ADDRESS
-// POP
-// PUSH1 0x0
-// CALLVALUE
-// POP
-// JUMPDEST
-// SWAP1
-// JUMP
-// JUMPDEST
+//     /* "":0:65   */
+//   stop
+//     /* "":6:63   */
+// tag_1:
+//     /* "":22:23   */
+//   0x00
+//     /* "":6:63   */
+//   swap1
+//     /* "":30:39   */
+//   address
+//     /* "":26:40   */
+//   pop
+//     /* "":47:58   */
+//   callvalue
+//     /* "":43:59   */
+//   pop
+//     /* "":6:63   */
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_declaration.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_declaration.yul
index fe99402f49..97bffac381 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_declaration.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_retparam_declaration.yul
@@ -4,15 +4,20 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0xD
-// JUMP
-// JUMPDEST
-// ADDRESS
-// POP
-// PUSH1 0x0
-// CALLVALUE
-// POP
-// JUMPDEST
-// SWAP1
-// JUMP
-// JUMPDEST
+//     /* "":0:65   */
+//   stop
+//     /* "":6:63   */
+// tag_1:
+//     /* "":22:23   */
+//   0x00
+//     /* "":6:63   */
+//   swap1
+//     /* "":30:39   */
+//   address
+//     /* "":26:40   */
+//   pop
+//     /* "":50:61   */
+//   callvalue
+//     /* "":6:63   */
+//   pop
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_for.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_for.yul
index 7dcb39c100..c18fb7c37e 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_for.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_retparam_for.yul
@@ -4,24 +4,21 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x19
-// JUMP
-// JUMPDEST
-// ADDRESS
-// POP
-// PUSH1 0x0
-// CALLVALUE
-// POP
-// JUMPDEST
-// PUSH1 0x0
-// ISZERO
-// PUSH1 0x15
-// JUMPI
-// JUMPDEST
-// PUSH1 0xA
-// JUMP
-// JUMPDEST
-// JUMPDEST
-// SWAP1
-// JUMP
-// JUMPDEST
+//     /* "":0:78   */
+//   stop
+//     /* "":6:76   */
+// tag_1:
+//     /* "":22:23   */
+//   0x00
+//     /* "":6:76   */
+//   swap1
+//     /* "":30:39   */
+//   address
+//     /* "":26:40   */
+//   pop
+//     /* "":51:62   */
+//   callvalue
+//     /* "":47:63   */
+//   pop
+//     /* "":6:76   */
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_if.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_if.yul
index bd882240ff..08dda5a3bc 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_if.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_retparam_if.yul
@@ -4,20 +4,32 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x14
-// JUMP
-// JUMPDEST
-// ADDRESS
-// POP
-// PUSH1 0x0
-// PUSH1 0x1
-// ISZERO
-// PUSH1 0x10
-// JUMPI
-// CALLVALUE
-// POP
-// JUMPDEST
-// JUMPDEST
-// SWAP1
-// JUMP
-// JUMPDEST
+//     /* "":0:70   */
+//   stop
+//     /* "":6:68   */
+// tag_1:
+//     /* "":22:23   */
+//   0x00
+//     /* "":6:68   */
+//   swap1
+//     /* "":44:45   */
+//   0x01
+//     /* "":30:39   */
+//   address
+//     /* "":26:40   */
+//   pop
+//     /* "":41:66   */
+//   tag_2
+//   jumpi
+//     /* "":24:68   */
+// tag_3:
+//     /* "":6:68   */
+//   jump	// out
+//     /* "":46:66   */
+// tag_2:
+//     /* "":52:63   */
+//   callvalue
+//     /* "":48:64   */
+//   pop
+//     /* "":46:66   */
+//   jump(tag_3)
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_leave.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_leave.yul
index 2e16c05d58..9ac0c00bf8 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_leave.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_retparam_leave.yul
@@ -4,17 +4,17 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x10
-// JUMP
-// JUMPDEST
-// ADDRESS
-// POP
-// PUSH1 0x0
-// PUSH1 0xD
-// JUMP
-// CALLVALUE
-// POP
-// JUMPDEST
-// SWAP1
-// JUMP
-// JUMPDEST
+//     /* "":0:67   */
+//   stop
+//     /* "":6:65   */
+// tag_1:
+//     /* "":22:23   */
+//   0x00
+//     /* "":6:65   */
+//   swap1
+//     /* "":30:39   */
+//   address
+//     /* "":26:40   */
+//   pop
+//     /* "":41:46   */
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_read.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_read.yul
index d8440b86e9..fcc8278e67 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_read.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_retparam_read.yul
@@ -4,18 +4,27 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x11
-// JUMP
-// JUMPDEST
-// ADDRESS
-// POP
-// PUSH1 0x0
-// DUP1
-// PUSH1 0x0
-// SSTORE
-// CALLVALUE
-// POP
-// JUMPDEST
-// SWAP1
-// JUMP
-// JUMPDEST
+//     /* "":0:74   */
+//   stop
+//     /* "":6:72   */
+// tag_1:
+//     /* "":22:23   */
+//   0x00
+//     /* "":6:72   */
+//   swap1
+//     /* "":30:39   */
+//   address
+//     /* "":26:40   */
+//   pop
+//     /* "":41:53   */
+//   dup2
+//     /* "":48:49   */
+//   0x00
+//     /* "":41:53   */
+//   sstore
+//     /* "":58:69   */
+//   callvalue
+//     /* "":54:70   */
+//   pop
+//     /* "":6:72   */
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned.yul
index c20158eae3..1cc19a4641 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned.yul
@@ -4,13 +4,17 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0xB
-// JUMP
-// JUMPDEST
-// CALLVALUE
-// POP
-// PUSH1 0x0
-// JUMPDEST
-// SWAP1
-// JUMP
-// JUMPDEST
+//     /* "":0:46   */
+//   stop
+//     /* "":6:44   */
+// tag_1:
+//     /* "":22:23   */
+//   0x00
+//     /* "":6:44   */
+//   swap1
+//     /* "":30:41   */
+//   callvalue
+//     /* "":26:42   */
+//   pop
+//     /* "":6:44   */
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned_multiple.yul b/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned_multiple.yul
index d9e80547ed..e44e3b4372 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned_multiple.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_retparam_unassigned_multiple.yul
@@ -4,17 +4,21 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x11
-// JUMP
-// JUMPDEST
-// CALLVALUE
-// POP
-// PUSH1 0x0
-// PUSH1 0x0
-// PUSH1 0x0
-// JUMPDEST
-// SWAP1
-// SWAP2
-// SWAP3
-// JUMP
-// JUMPDEST
+//     /* "":0:52   */
+//   stop
+//     /* "":6:50   */
+// tag_1:
+//     /* "":25:26   */
+//   0x00
+//     /* "":28:29   */
+//   0x00
+//     /* "":22:23   */
+//   0x00
+//     /* "":6:50   */
+//   swap3
+//     /* "":36:47   */
+//   callvalue
+//     /* "":32:48   */
+//   pop
+//     /* "":6:50   */
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_trivial.yul b/test/libyul/evmCodeTransform/stackReuse/function_trivial.yul
index 2c803e85fd..3d6286efdb 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_trivial.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_trivial.yul
@@ -4,9 +4,8 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x6
-// JUMP
-// JUMPDEST
-// JUMPDEST
-// JUMP
-// JUMPDEST
+//     /* "":0:22   */
+//   stop
+//     /* "":4:20   */
+// tag_1:
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_with_body_embedded.yul b/test/libyul/evmCodeTransform/stackReuse/function_with_body_embedded.yul
index 60f287734e..f8480bc91e 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_with_body_embedded.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_with_body_embedded.yul
@@ -9,27 +9,22 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x3
-// PUSH1 0x17
-// JUMP
-// JUMPDEST
-// PUSH1 0x0
-// DUP2
-// POP
-// PUSH1 0x3
-// SWAP2
-// POP
-// DUP2
-// SWAP1
-// POP
-// JUMPDEST
-// SWAP3
-// SWAP2
-// POP
-// POP
-// JUMP
-// JUMPDEST
-// PUSH1 0x7
-// SWAP1
-// POP
-// POP
+//     /* "":15:16   */
+//   0x03
+//     /* "":177:183   */
+//   pop
+//     /* "":182:183   */
+//   0x07
+//     /* "":0:185   */
+//   stop
+//     /* "":21:172   */
+// tag_1:
+//   swap1
+//   pop
+//     /* "":153:159   */
+//   pop
+//     /* "":158:159   */
+//   0x03
+//     /* "":21:172   */
+//   swap1
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul b/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul
index 6189e1614a..df8b961840 100644
--- a/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul
@@ -10,51 +10,62 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x14
-// JUMP
-// JUMPDEST
-// POP
-// POP
-// PUSH1 0x0
-// JUMPDEST
-// SWAP1
-// JUMP
-// JUMPDEST
-// PUSH1 0x0
-// PUSH1 0x0
-// JUMPDEST
-// SWAP1
-// SWAP2
-// JUMP
-// JUMPDEST
-// PUSH1 0x1E
-// PUSH1 0x2
-// PUSH1 0x1
-// PUSH1 0x3
-// JUMP
-// JUMPDEST
-// PUSH1 0x28
-// PUSH1 0x4
-// PUSH1 0x3
-// PUSH1 0x3
-// JUMP
-// JUMPDEST
-// SWAP1
-// POP
-// POP
-// PUSH1 0x31
-// PUSH1 0xB
-// JUMP
-// JUMPDEST
-// PUSH1 0x37
-// PUSH1 0xB
-// JUMP
-// JUMPDEST
-// SWAP2
-// POP
-// SWAP2
-// POP
-// POP
-// POP
-// PUSH1 0x7
-// POP
+//     /* "":74:81   */
+//   tag_1
+//     /* "":79:80   */
+//   0x02
+//     /* "":76:77   */
+//   0x01
+//     /* "":74:81   */
+//   tag_2
+//   jump	// in
+// tag_1:
+//     /* "":91:98   */
+//   pop
+//   tag_3
+//     /* "":96:97   */
+//   0x04
+//     /* "":93:94   */
+//   0x03
+//     /* "":91:98   */
+//   tag_2
+//   jump	// in
+// tag_3:
+//     /* "":115:118   */
+//   pop
+//   tag_4
+//   tag_5
+//   jump	// in
+// tag_4:
+//     /* "":131:134   */
+//   pop
+//   pop
+//   tag_6
+//   tag_5
+//   jump	// in
+// tag_6:
+//     /* "":139:154   */
+//   pop
+//   pop
+//     /* "":153:154   */
+//   0x07
+//     /* "":0:156   */
+//   stop
+//     /* "":6:31   */
+// tag_2:
+//   pop
+//   pop
+//     /* "":26:27   */
+//   0x00
+//     /* "":6:31   */
+//   swap1
+//   jump	// out
+//     /* "":36:60   */
+// tag_5:
+//     /* "":55:56   */
+//   0x00
+//     /* "":52:53   */
+//   0x00
+//     /* "":36:60   */
+//   swap2
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/if.yul b/test/libyul/evmCodeTransform/stackReuse/if.yul
index a407bb54ce..cf0b2a044b 100644
--- a/test/libyul/evmCodeTransform/stackReuse/if.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/if.yul
@@ -3,15 +3,22 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x0
-// MLOAD
-// DUP1
-// ISZERO
-// PUSH1 0xA
-// JUMPI
-// DUP1
-// POP
-// JUMPDEST
-// POP
-// PUSH1 0x3
-// POP
+//     /* "":72:73   */
+//   0x00
+//     /* "":66:74   */
+//   mload
+//     /* "":75:94   */
+//   dup1
+//   tag_1
+//   jumpi
+//     /* "":55:107   */
+// tag_2:
+//     /* "":95:105   */
+//   pop
+//     /* "":104:105   */
+//   0x03
+//     /* "":55:107   */
+//   stop
+//     /* "":80:94   */
+// tag_1:
+//   jump(tag_2)
diff --git a/test/libyul/evmCodeTransform/stackReuse/last_use_in_nested_block.yul b/test/libyul/evmCodeTransform/stackReuse/last_use_in_nested_block.yul
index 1fc780d219..49ffb3971b 100644
--- a/test/libyul/evmCodeTransform/stackReuse/last_use_in_nested_block.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/last_use_in_nested_block.yul
@@ -2,9 +2,11 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x0
-// DUP1
-// POP
-// POP
-// PUSH1 0x1
-// POP
+//     /* "":11:12   */
+//   0x00
+//     /* "":15:21   */
+//   pop
+//     /* "":33:34   */
+//   0x01
+//     /* "":0:36   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_same_variable_name.yul b/test/libyul/evmCodeTransform/stackReuse/multi_reuse_same_variable_name.yul
index 88d42510ca..3404dc5362 100644
--- a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_same_variable_name.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/multi_reuse_same_variable_name.yul
@@ -2,22 +2,25 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x0
-// MLOAD
-// PUSH1 0x1
-// PUSH1 0x6
-// SWAP1
-// POP
-// DUP1
-// SWAP2
-// POP
-// POP
-// PUSH1 0x2
-// DUP1
-// SWAP2
-// POP
-// PUSH1 0x4
-// SWAP1
-// POP
-// POP
-// POP
+//     /* "":17:18   */
+//   0x00
+//     /* "":11:19   */
+//   mload
+//     /* "":22:32   */
+//   pop
+//     /* "":31:32   */
+//   0x01
+//     /* "":33:39   */
+//   pop
+//     /* "":38:39   */
+//   0x06
+//     /* "":51:61   */
+//   pop
+//     /* "":60:61   */
+//   0x02
+//     /* "":69:75   */
+//   pop
+//     /* "":74:75   */
+//   0x04
+//     /* "":0:79   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot.yul b/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot.yul
index ba0ad96e7e..a80e66c10e 100644
--- a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot.yul
@@ -2,13 +2,19 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x1
-// PUSH1 0x6
-// SWAP1
-// POP
-// POP
-// PUSH1 0x2
-// PUSH1 0x4
-// SWAP1
-// POP
-// POP
+//     /* "":11:12   */
+//   0x01
+//     /* "":13:19   */
+//   pop
+//     /* "":18:19   */
+//   0x06
+//     /* "":20:30   */
+//   pop
+//     /* "":29:30   */
+//   0x02
+//     /* "":31:37   */
+//   pop
+//     /* "":36:37   */
+//   0x04
+//     /* "":0:39   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot_nested.yul b/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot_nested.yul
index b064fcc20a..db87835023 100644
--- a/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot_nested.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/multi_reuse_single_slot_nested.yul
@@ -2,13 +2,19 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x1
-// PUSH1 0x6
-// SWAP1
-// POP
-// POP
-// PUSH1 0x2
-// PUSH1 0x4
-// SWAP1
-// POP
-// POP
+//     /* "":11:12   */
+//   0x01
+//     /* "":13:19   */
+//   pop
+//     /* "":18:19   */
+//   0x06
+//     /* "":22:32   */
+//   pop
+//     /* "":31:32   */
+//   0x02
+//     /* "":33:39   */
+//   pop
+//     /* "":38:39   */
+//   0x04
+//     /* "":0:43   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_not_same_scope.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_not_same_scope.yul
index fe50cb9973..9be91989d0 100644
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_not_same_scope.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_not_same_scope.yul
@@ -8,10 +8,10 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x5
-// DUP1
-// DUP1
-// DUP2
-// SSTORE
-// POP
-// POP
+//     /* "":15:16   */
+//   0x05
+//     /* "":126:138   */
+//   dup1
+//   sstore
+//     /* "":0:146   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used.yul
index 5e4cfd0931..11e77c6269 100644
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used.yul
@@ -6,11 +6,10 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x5
-// DUP1
-// SWAP1
-// POP
-// DUP1
-// DUP2
-// SSTORE
-// POP
+//     /* "":15:16   */
+//   0x05
+//     /* "":74:86   */
+//   dup1
+//   sstore
+//     /* "":0:88   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used_expr.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used_expr.yul
index 89a82f65c5..214020ccdc 100644
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used_expr.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_last_used_expr.yul
@@ -6,13 +6,14 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x5
-// PUSH1 0x2
-// DUP2
-// ADD
-// SWAP1
-// POP
-// DUP1
-// DUP2
-// SSTORE
-// POP
+//     /* "":37:38   */
+//   0x02
+//     /* "":15:16   */
+//   0x05
+//     /* "":30:39   */
+//   add
+//     /* "":82:94   */
+//   dup1
+//   sstore
+//     /* "":0:96   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_not_last_used.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_not_last_used.yul
index 7c7cdfd558..e3002f34d9 100644
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_not_last_used.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/reuse_on_decl_assign_to_not_last_used.yul
@@ -6,10 +6,11 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x5
-// DUP1
-// DUP2
-// DUP2
-// SSTORE
-// POP
-// POP
+//     /* "":15:16   */
+//   0x05
+//     /* "":21:31   */
+//   dup1
+//     /* "":107:119   */
+//   sstore
+//     /* "":0:121   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_slots.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_slots.yul
index 44b9166703..13decd3231 100644
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_slots.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/reuse_slots.yul
@@ -2,22 +2,26 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x0
-// PUSH1 0x0
-// PUSH1 0x0
-// PUSH1 0x0
-// POP
-// PUSH1 0x2
-// SWAP2
-// POP
-// PUSH1 0x3
-// DUP4
-// DUP4
-// MSTORE
-// DUP2
-// DUP2
-// MSTORE
-// POP
-// POP
-// POP
-// POP
+//     /* "":2:16   */
+//   0x00
+//   dup1
+//   dup1
+//   dup1
+//     /* "":17:27   */
+//   pop
+//   swap2
+//   swap1
+//   pop
+//     /* "":26:27   */
+//   0x02
+//     /* "":28:38   */
+//   swap1
+//     /* "":37:38   */
+//   0x03
+//     /* "":39:51   */
+//   swap2
+//   mstore
+//     /* "":52:64   */
+//   mstore
+//     /* "":0:66   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul
index f5e855a464..a7a8b1a02c 100644
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul
@@ -5,36 +5,39 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x12
-// JUMP
-// JUMPDEST
-// PUSH1 0x0
-// PUSH1 0x0
-// PUSH1 0x0
-// PUSH1 0x0
-// JUMPDEST
-// SWAP1
-// SWAP2
-// SWAP3
-// SWAP4
-// JUMP
-// JUMPDEST
-// PUSH1 0x18
-// PUSH1 0x3
-// JUMP
-// JUMPDEST
-// POP
-// PUSH1 0x2
-// SWAP2
-// POP
-// PUSH1 0x3
-// DUP4
-// DUP4
-// MSTORE
-// DUP2
-// DUP2
-// MSTORE
-// POP
-// POP
-// POP
-// POP
+//     /* "":58:61   */
+//   tag_1
+//   tag_2
+//   jump	// in
+// tag_1:
+//     /* "":62:73   */
+//   pop
+//   swap2
+//   swap1
+//   pop
+//     /* "":72:73   */
+//   0x02
+//     /* "":74:85   */
+//   swap1
+//     /* "":84:85   */
+//   0x03
+//     /* "":86:99   */
+//   swap2
+//   mstore
+//     /* "":100:113   */
+//   mstore
+//     /* "":0:115   */
+//   stop
+//     /* "":6:35   */
+// tag_2:
+//     /* "":25:26   */
+//   0x00
+//     /* "":28:29   */
+//   0x00
+//     /* "":31:32   */
+//   0x00
+//     /* "":22:23   */
+//   0x00
+//     /* "":6:35   */
+//   swap4
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul
index 36800b2042..888bccf7d3 100644
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul
@@ -9,42 +9,41 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x5
-// PUSH1 0x6
-// PUSH1 0x7
-// DUP2
-// DUP4
-// MSTORE
-// PUSH1 0x1B
-// JUMP
-// JUMPDEST
-// PUSH1 0x0
-// PUSH1 0x0
-// PUSH1 0x0
-// PUSH1 0x0
-// JUMPDEST
-// SWAP1
-// SWAP2
-// SWAP3
-// SWAP4
-// JUMP
-// JUMPDEST
-// PUSH1 0x21
-// PUSH1 0xC
-// JUMP
-// JUMPDEST
-// SWAP6
-// POP
-// SWAP4
-// POP
-// POP
-// DUP1
-// DUP3
-// MSTORE
-// POP
-// POP
-// DUP2
-// DUP2
-// MSTORE
-// POP
-// POP
+//     /* "":106:107   */
+//   0x05
+//     /* "":118:119   */
+//   0x06
+//     /* "":130:131   */
+//   0x07
+//     /* "":136:150   */
+//   swap2
+//   mstore
+//     /* "":207:210   */
+//   tag_1
+//   tag_2
+//   jump	// in
+// tag_1:
+//     /* "":211:224   */
+//   swap4
+//   swap1
+//   swap3
+//   swap2
+//   pop
+//   mstore
+//     /* "":225:237   */
+//   mstore
+//     /* "":0:239   */
+//   stop
+//     /* "":155:184   */
+// tag_2:
+//     /* "":174:175   */
+//   0x00
+//     /* "":177:178   */
+//   0x00
+//     /* "":180:181   */
+//   0x00
+//     /* "":171:172   */
+//   0x00
+//     /* "":155:184   */
+//   swap4
+//   jump	// out
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_too_deep_slot.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_too_deep_slot.yul
index badcc0969a..2adfe7892b 100644
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_too_deep_slot.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/reuse_too_deep_slot.yul
@@ -33,78 +33,108 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x7
-// PUSH1 0x42
-// DUP16
-// PUSH1 0x0
-// SSTORE
-// PUSH1 0x43
-// DUP2
-// PUSH1 0x1
-// MSTORE
-// DUP1
-// PUSH1 0x1
-// MSTORE
-// POP
-// POP
-// DUP15
-// PUSH1 0x1
-// SSTORE
-// DUP14
-// PUSH1 0x1
-// SSTORE
-// DUP13
-// PUSH1 0x1
-// SSTORE
-// DUP12
-// PUSH1 0x1
-// SSTORE
-// DUP11
-// PUSH1 0x1
-// SSTORE
-// DUP10
-// PUSH1 0x1
-// SSTORE
-// DUP9
-// PUSH1 0x1
-// SSTORE
-// DUP8
-// PUSH1 0x1
-// SSTORE
-// DUP7
-// PUSH1 0x1
-// SSTORE
-// DUP6
-// PUSH1 0x1
-// SSTORE
-// DUP5
-// PUSH1 0x1
-// SSTORE
-// DUP4
-// PUSH1 0x1
-// SSTORE
-// DUP3
-// PUSH1 0x1
-// SSTORE
-// DUP2
-// PUSH1 0x1
-// SSTORE
-// DUP1
-// PUSH1 0x1
-// SSTORE
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
-// POP
+//     /* "":15:16   */
+//   0x07
+//     /* "":94:121   */
+//   verbatimbytecode_6042
+//     /* "":280:291   */
+//   swap15
+//     /* "":287:288   */
+//   0x00
+//     /* "":280:291   */
+//   swap15
+//   swap2
+//   swap15
+//   swap14
+//   swap3
+//   swap14
+//   swap13
+//   swap4
+//   swap13
+//   swap12
+//   swap5
+//   swap12
+//   swap11
+//   swap6
+//   swap11
+//   swap10
+//   swap7
+//   swap10
+//   swap9
+//   swap8
+//   swap9
+//   sstore
+//     /* "":370:396   */
+//   verbatimbytecode_6043
+//     /* "":514:527   */
+//   swap1
+//     /* "":521:522   */
+//   0x01
+//     /* "":514:527   */
+//   mstore
+//     /* "":539:540   */
+//   0x01
+//     /* "":532:545   */
+//   mstore
+//     /* "":653:654   */
+//   0x01
+//     /* "":646:659   */
+//   sstore
+//     /* "":671:672   */
+//   0x01
+//     /* "":664:677   */
+//   sstore
+//     /* "":689:690   */
+//   0x01
+//     /* "":682:695   */
+//   sstore
+//     /* "":707:708   */
+//   0x01
+//     /* "":700:713   */
+//   sstore
+//     /* "":725:726   */
+//   0x01
+//     /* "":718:731   */
+//   sstore
+//     /* "":743:744   */
+//   0x01
+//     /* "":736:749   */
+//   sstore
+//     /* "":761:762   */
+//   0x01
+//     /* "":754:767   */
+//   sstore
+//     /* "":779:780   */
+//   0x01
+//     /* "":772:785   */
+//   sstore
+//     /* "":797:798   */
+//   0x01
+//     /* "":790:803   */
+//   sstore
+//     /* "":815:816   */
+//   0x01
+//     /* "":808:822   */
+//   sstore
+//     /* "":834:835   */
+//   0x01
+//     /* "":827:841   */
+//   sstore
+//     /* "":853:854   */
+//   0x01
+//     /* "":846:860   */
+//   sstore
+//     /* "":872:873   */
+//   0x01
+//     /* "":865:879   */
+//   sstore
+//     /* "":891:892   */
+//   0x01
+//     /* "":884:898   */
+//   sstore
+//     /* "":910:911   */
+//   0x01
+//     /* "":903:917   */
+//   sstore
+//     /* "":0:919   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/single_var.yul b/test/libyul/evmCodeTransform/stackReuse/single_var.yul
index 06957305e7..09a0d6feeb 100644
--- a/test/libyul/evmCodeTransform/stackReuse/single_var.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/single_var.yul
@@ -2,5 +2,7 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x0
-// POP
+//     /* "":2:7   */
+//   0x00
+//     /* "":0:9   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned.yul b/test/libyul/evmCodeTransform/stackReuse/single_var_assigned.yul
index 6bc5f504f2..ed497467d5 100644
--- a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/single_var_assigned.yul
@@ -2,5 +2,7 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x1
-// POP
+//     /* "":11:12   */
+//   0x01
+//     /* "":0:14   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code.yul b/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code.yul
index 9fdccea853..bec4c834ff 100644
--- a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code.yul
@@ -2,8 +2,15 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x1
-// POP
-// PUSH1 0x4
-// PUSH1 0x3
-// MSTORE
+//     /* "":11:12   */
+//   0x01
+//     /* "":13:25   */
+//   pop
+//     /* "":23:24   */
+//   0x04
+//     /* "":20:21   */
+//   0x03
+//     /* "":13:25   */
+//   mstore
+//     /* "":0:27   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code_and_reused.yul b/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code_and_reused.yul
index 2d66c74db7..b9a814700a 100644
--- a/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code_and_reused.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/single_var_assigned_plus_code_and_reused.yul
@@ -2,11 +2,17 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x1
-// PUSH1 0x4
-// PUSH1 0x3
-// MSTORE
-// DUP1
-// MLOAD
-// POP
-// POP
+//     /* "":11:12   */
+//   0x01
+//     /* "":23:24   */
+//   0x04
+//     /* "":20:21   */
+//   0x03
+//     /* "":13:25   */
+//   mstore
+//     /* "":30:38   */
+//   mload
+//     /* "":26:39   */
+//   pop
+//     /* "":0:41   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/smoke.yul b/test/libyul/evmCodeTransform/stackReuse/smoke.yul
index 0a212e9ca6..aa46f7a4a5 100644
--- a/test/libyul/evmCodeTransform/stackReuse/smoke.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/smoke.yul
@@ -2,3 +2,5 @@
 // ====
 // stackOptimization: true
 // ----
+//     /* "":0:2   */
+//   stop
diff --git a/test/libyul/evmCodeTransform/stackReuse/switch.yul b/test/libyul/evmCodeTransform/stackReuse/switch.yul
index 480343dcc3..f72d80fad0 100644
--- a/test/libyul/evmCodeTransform/stackReuse/switch.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/switch.yul
@@ -2,25 +2,34 @@
 // ====
 // stackOptimization: true
 // ----
-// PUSH1 0x0
-// DUP1
-// PUSH1 0x0
-// DUP2
-// EQ
-// PUSH1 0x11
-// JUMPI
-// PUSH1 0x3
-// SWAP2
-// POP
-// PUSH1 0x18
-// JUMP
-// JUMPDEST
-// PUSH1 0x2
-// POP
-// PUSH1 0x3
-// POP
-// JUMPDEST
-// POP
-// POP
-// PUSH1 0x9
-// POP
+//     /* "":11:12   */
+//   0x00
+//     /* "":27:28   */
+//   0x00
+//     /* "":22:54   */
+//   eq
+//   tag_1
+//   jumpi
+//     /* "":13:73   */
+// tag_2:
+//     /* "":70:71   */
+//   0x03
+//     /* "":63:73   */
+//   pop
+//     /* "":13:73   */
+// tag_3:
+//     /* "":83:84   */
+//   0x09
+//     /* "":13:73   */
+//   stop
+//     /* "":29:54   */
+// tag_1:
+//     /* "":40:41   */
+//   0x02
+//     /* "":42:52   */
+//   pop
+//     /* "":51:52   */
+//   0x03
+//     /* "":29:54   */
+//   pop
+//   jump(tag_3)
diff --git a/test/libyul/evmCodeTransform/stub.yul b/test/libyul/evmCodeTransform/stub.yul
new file mode 100644
index 0000000000..a11cad44c9
--- /dev/null
+++ b/test/libyul/evmCodeTransform/stub.yul
@@ -0,0 +1,86 @@
+{
+            fun_c()
+            function fun_c()
+            {
+                switch iszero(calldataload(0))
+                case 0 { }
+                default {
+                    if calldataload(1)
+                    {
+                        leave
+                    }
+                    if calldataload(2)
+                    {
+                        revert(0, 0)
+                    }
+                }
+                revert(0, 0)
+            }
+}
+// ====
+// stackOptimization: true
+// ----
+//     /* "":14:21   */
+//   tag_1
+//   tag_2
+//   jump	// in
+// tag_1:
+//     /* "":0:460   */
+//   stop
+//     /* "":34:458   */
+// tag_2:
+//     /* "":108:109   */
+//   0x00
+//     /* "":95:110   */
+//   calldataload
+//     /* "":88:111   */
+//   iszero
+//     /* "":133:134   */
+//   0x00
+//     /* "":128:138   */
+//   eq
+//   tag_3
+//   jumpi
+//     /* "":81:415   */
+// tag_4:
+//     /* "":201:202   */
+//   0x01
+//     /* "":188:203   */
+//   calldataload
+//     /* "":185:277   */
+//   tag_5
+//   jumpi
+//     /* "":81:415   */
+// tag_6:
+//     /* "":301:316   */
+//   pop
+//     /* "":314:315   */
+//   0x02
+//     /* "":301:316   */
+//   calldataload
+//     /* "":298:397   */
+//   tag_7
+//   jumpi
+//     /* "":81:415   */
+// tag_8:
+// tag_9:
+//     /* "":442:443   */
+//   0x00
+//     /* "":432:444   */
+//   dup1
+//   revert
+//     /* "":337:397   */
+// tag_7:
+//     /* "":373:374   */
+//   0x00
+//     /* "":363:375   */
+//   dup1
+//   revert
+//     /* "":224:277   */
+// tag_5:
+//     /* "":250:255   */
+//   jump	// out
+//     /* "":135:138   */
+// tag_3:
+//   pop
+//   jump(tag_9)
diff --git a/test/libyul/objectCompiler/long_object_name.yul b/test/libyul/objectCompiler/long_object_name.yul
index ad8266d1e5..67ef5e4072 100644
--- a/test/libyul/objectCompiler/long_object_name.yul
+++ b/test/libyul/objectCompiler/long_object_name.yul
@@ -16,10 +16,14 @@ object "t" {
 //   0x00
 //     /* "source":23:147   */
 //   sstore
+//     /* "source":19:150   */
+//   stop
 // stop
 //
 // sub_0: assembly {
+//         /* "source":272:274   */
+//       stop
 // }
-// Bytecode: 6000600055fe
-// Opcodes: PUSH1 0x0 PUSH1 0x0 SSTORE INVALID
-// SourceMappings: 33:113:0:-:0;30:1;23:124
+// Bytecode: 600160005500fe
+// Opcodes: PUSH1 0x1 PUSH1 0x0 SSTORE STOP INVALID
+// SourceMappings: 33:113:0:-:0;30:1;23:124;19:131
diff --git a/test/libyul/objectCompiler/nested_optimizer.yul b/test/libyul/objectCompiler/nested_optimizer.yul
index e6f8b1f238..7b972286f4 100644
--- a/test/libyul/objectCompiler/nested_optimizer.yul
+++ b/test/libyul/objectCompiler/nested_optimizer.yul
@@ -20,22 +20,26 @@ object "a" {
 // Assembly:
 //     /* "source":48:49   */
 //   0x00
-//   dup1
 //     /* "source":35:50   */
+//   dup1
 //   calldataload
 //     /* "source":107:127   */
 //   sstore
+//     /* "source":20:131   */
+//   stop
 // stop
 //
 // sub_0: assembly {
 //         /* "source":188:189   */
 //       0x00
-//       dup1
 //         /* "source":175:190   */
+//       dup1
 //       calldataload
 //         /* "source":253:273   */
 //       sstore
+//         /* "source":158:279   */
+//       stop
 // }
-// Bytecode: 6000803555fe
-// Opcodes: PUSH1 0x0 DUP1 CALLDATALOAD SSTORE INVALID
-// SourceMappings: 48:1:0:-:0;;35:15;107:20
+// Bytecode: 600080355500fe
+// Opcodes: PUSH1 0x0 DUP1 CALLDATALOAD SSTORE STOP INVALID
+// SourceMappings: 48:1:0:-:0;35:15;;107:20;20:111
diff --git a/test/libyul/objectCompiler/simple_optimizer.yul b/test/libyul/objectCompiler/simple_optimizer.yul
index cf7658ea00..47fa6553ab 100644
--- a/test/libyul/objectCompiler/simple_optimizer.yul
+++ b/test/libyul/objectCompiler/simple_optimizer.yul
@@ -10,11 +10,13 @@
 // Assembly:
 //     /* "source":26:27   */
 //   0x00
-//   dup1
 //     /* "source":13:28   */
+//   dup1
 //   calldataload
 //     /* "source":79:99   */
 //   sstore
-// Bytecode: 6000803555
-// Opcodes: PUSH1 0x0 DUP1 CALLDATALOAD SSTORE
-// SourceMappings: 26:1:0:-:0;;13:15;79:20
+//     /* "source":0:101   */
+//   stop
+// Bytecode: 600080355500
+// Opcodes: PUSH1 0x0 DUP1 CALLDATALOAD SSTORE STOP
+// SourceMappings: 26:1:0:-:0;13:15;;79:20;0:101
diff --git a/test/libyul/yulOptimizerTests/fullSuite/aztec.yul b/test/libyul/yulOptimizerTests/fullSuite/aztec.yul
index ae1ca7848b..2b22055794 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/aztec.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/aztec.yul
@@ -237,87 +237,85 @@
 //     {
 //         mstore(0x80, 7673901602397024137095011250362199966051872585513276903826533215767972925880)
 //         mstore(0xa0, 8489654445897228341090914135473290831551238522473825886865492707826370766375)
-//         let _1 := calldataload(0x04)
-//         let notes := add(0x04, _1)
-//         let m := calldataload(0x24)
+//         let notes := add(0x04, calldataload(0x04))
 //         let n := calldataload(notes)
-//         let _2 := 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001
-//         let challenge := mod(calldataload(0x44), _2)
-//         if gt(m, n)
+//         if gt(calldataload(0x24), n)
 //         {
 //             mstore(0x00, 404)
 //             revert(0x00, 0x20)
 //         }
 //         let kn := calldataload(add(calldatasize(), not(191)))
-//         mstore(0x2a0, caller())
+//         let _1 := 0x2a0
+//         mstore(_1, caller())
 //         mstore(0x2c0, kn)
-//         mstore(0x2e0, m)
-//         kn := mulmod(sub(_2, kn), challenge, _2)
+//         mstore(0x2e0, calldataload(0x24))
+//         kn := mulmod(sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, kn), mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
 //         hashCommitments(notes, n)
 //         let b := add(0x300, shl(7, n))
 //         let i := 0
 //         for { } lt(i, n) { i := add(i, 0x01) }
 //         {
-//             let _3 := add(_1, mul(i, 0xc0))
-//             let noteIndex := add(_3, 0x24)
+//             let noteIndex := add(add(calldataload(0x04), mul(i, 0xc0)), 0x24)
 //             let k := 0
-//             let a := calldataload(add(_3, 0x44))
-//             let c := challenge
-//             let _4 := add(i, 0x01)
-//             switch eq(_4, n)
+//             let a := calldataload(add(add(calldataload(0x04), mul(i, 0xc0)), 0x44))
+//             let c := mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
+//             let _2 := add(i, 0x01)
+//             switch eq(_2, n)
 //             case 1 {
 //                 k := kn
-//                 if eq(m, n) { k := sub(_2, kn) }
+//                 if eq(calldataload(0x24), n)
+//                 {
+//                     k := sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, kn)
+//                 }
 //             }
 //             case 0 { k := calldataload(noteIndex) }
 //             validateCommitment(noteIndex, k, a)
-//             switch gt(_4, m)
+//             switch gt(_2, calldataload(0x24))
 //             case 1 {
-//                 kn := addmod(kn, sub(_2, k), _2)
-//                 let x := mod(mload(0), _2)
-//                 k := mulmod(k, x, _2)
-//                 a := mulmod(a, x, _2)
-//                 c := mulmod(challenge, x, _2)
+//                 kn := addmod(kn, sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, k), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
+//                 let x := mod(mload(0), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
+//                 k := mulmod(k, x, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
+//                 a := mulmod(a, x, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
+//                 c := mulmod(mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), x, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
 //                 mstore(0, keccak256(0, 0x20))
 //             }
-//             case 0 { kn := addmod(kn, k, _2) }
-//             let _5 := 0x40
-//             calldatacopy(0xe0, add(_3, 164), _5)
-//             calldatacopy(0x20, add(_3, 100), _5)
-//             let _6 := 0x120
-//             mstore(_6, sub(_2, c))
-//             let _7 := 0x60
-//             mstore(_7, k)
+//             case 0 {
+//                 kn := addmod(kn, k, 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)
+//             }
+//             calldatacopy(0xe0, add(add(calldataload(0x04), mul(i, 0xc0)), 164), 0x40)
+//             calldatacopy(0x20, add(add(calldataload(0x04), mul(i, 0xc0)), 100), 0x40)
+//             mstore(0x120, sub(0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001, c))
+//             mstore(0x60, k)
 //             mstore(0xc0, a)
-//             let result := call(gas(), 7, 0, 0xe0, _7, 0x1a0, _5)
-//             let result_1 := and(result, call(gas(), 7, 0, 0x20, _7, _6, _5))
-//             let _8 := 0x160
-//             let result_2 := and(result_1, call(gas(), 7, 0, 0x80, _7, _8, _5))
-//             let result_3 := and(result_2, call(gas(), 6, 0, _6, 0x80, _8, _5))
-//             result := and(result_3, call(gas(), 6, 0, _8, 0x80, b, _5))
-//             if eq(i, m)
+//             let result := call(gas(), 7, 0, 0xe0, 0x60, 0x1a0, 0x40)
+//             let result_1 := and(result, call(gas(), 7, 0, 0x20, 0x60, 0x120, 0x40))
+//             let result_2 := and(result_1, call(gas(), 7, 0, 0x80, 0x60, 0x160, 0x40))
+//             let result_3 := and(result_2, call(gas(), 6, 0, 0x120, 0x80, 0x160, 0x40))
+//             result := and(result_3, call(gas(), 6, 0, 0x160, 0x80, b, 0x40))
+//             if eq(i, calldataload(0x24))
 //             {
 //                 mstore(0x260, mload(0x20))
-//                 mstore(0x280, mload(_5))
+//                 mstore(0x280, mload(0x40))
 //                 mstore(0x1e0, mload(0xe0))
 //                 mstore(0x200, sub(0x30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd47, mload(0x100)))
 //             }
-//             if gt(i, m)
+//             if gt(i, calldataload(0x24))
 //             {
-//                 mstore(_7, c)
-//                 let result_4 := and(result, call(gas(), 7, 0, 0x20, _7, 0x220, _5))
-//                 let result_5 := and(result_4, call(gas(), 6, 0, 0x220, 0x80, 0x260, _5))
-//                 result := and(result_5, call(gas(), 6, 0, 0x1a0, 0x80, 0x1e0, _5))
+//                 mstore(0x60, c)
+//                 let _3 := 0x220
+//                 let result_4 := and(result, call(gas(), 7, 0, 0x20, 0x60, _3, 0x40))
+//                 let result_5 := and(result_4, call(gas(), 6, 0, _3, 0x80, 0x260, 0x40))
+//                 result := and(result_5, call(gas(), 6, 0, 0x1a0, 0x80, 0x1e0, 0x40))
 //             }
 //             if iszero(result)
 //             {
 //                 mstore(0, 400)
 //                 revert(0, 0x20)
 //             }
-//             b := add(b, _5)
+//             b := add(b, 0x40)
 //         }
-//         if lt(m, n) { validatePairing() }
-//         if iszero(eq(mod(keccak256(0x2a0, add(b, not(671))), _2), challenge))
+//         if lt(calldataload(0x24), n) { validatePairing() }
+//         if iszero(eq(mod(keccak256(_1, add(b, not(671))), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001), mod(calldataload(0x44), 0x30644e72e131a029b85045b68181585d2833e84879b9709143e1f593f0000001)))
 //         {
 //             mstore(0, 404)
 //             revert(0, 0x20)
diff --git a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
index b417991c27..d670f002fc 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
@@ -33,25 +33,30 @@
 	sstore(0,0)
 	sstore(3,1)
 }
+// ====
+// EVMVersion: >homestead
 // ----
 // step: fullSuite
 //
 // {
 //     {
-//         let _1 := gt(not(gcd(10, 15)), 1)
-//         let _2 := gcd(10, 15)
-//         let _3 := not(0)
-//         let _4 := lt(or(1, add(gcd(10, 15), _3)), 1)
-//         let _5 := gcd(10, 15)
-//         let _6 := gcd(10, 15)
-//         pop(keccak256(gcd(10, 15), or(gt(not(gcd(10, 15)), 1), 1)))
-//         mstore(lt(or(gt(1, or(or(gt(or(or(or(gt(or(gt(_3, _6), 1), _5), _4), _2), 1), 1), _1), 1)), 1), 1), 1)
-//         sstore(not(gcd(10, 15)), 1)
+//         let _1 := 1
+//         let _2 := 15
+//         let _3 := 10
+//         let _4 := gt(not(gcd(_3, _2)), _1)
+//         let _5 := gcd(_3, _2)
+//         let _6 := not(0)
+//         let _7 := lt(or(_1, add(gcd(_3, _2), _6)), _1)
+//         let _8 := gcd(_3, _2)
+//         let _9 := gcd(_3, _2)
+//         pop(keccak256(gcd(_3, _2), or(gt(not(gcd(_3, _2)), _1), _1)))
+//         mstore(lt(or(gt(_1, or(or(gt(or(or(or(gt(or(gt(_6, _9), _1), _8), _7), _5), _1), _1), _4), _1)), _1), _1), _1)
+//         sstore(not(gcd(_3, _2)), _1)
 //         sstore(0, 0)
-//         sstore(2, 1)
-//         extcodecopy(1, msize(), 1, 1)
+//         sstore(2, _1)
+//         extcodecopy(_1, msize(), _1, _1)
 //         sstore(0, 0)
-//         sstore(3, 1)
+//         sstore(3, _1)
 //     }
 //     function gcd(_a, _b) -> out
 //     {
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul b/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul
index 4ff0561571..382bd201d6 100644
--- a/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul
+++ b/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul
@@ -3,6 +3,8 @@
   let y := calldataload(calldataload(9))
   mstore(y, add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(y, 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1))
 }
+// ====
+// EVMVersion: =homestead
 // ----
 // step: stackCompressor
 //
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul b/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
index f237ea8bbc..ed85fe7b85 100644
--- a/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
+++ b/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
@@ -5,6 +5,8 @@
     mstore(y, add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(y, 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1))
   }
 }
+// ====
+// EVMVersion: =homestead
 // ----
 // step: stackCompressor
 //
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul b/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul
index 7e3acd9b62..dc10737ad9 100644
--- a/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul
+++ b/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul
@@ -18,6 +18,8 @@
         extcodecopy(1, msize(), 1, 1)
     }
 }
+// ====
+// EVMVersion: =homestead
 // ----
 // step: stackCompressor
 //
diff --git a/test/libyul/yulStackLayout/literal_loop.yul b/test/libyul/yulStackLayout/literal_loop.yul
new file mode 100644
index 0000000000..841c410626
--- /dev/null
+++ b/test/libyul/yulStackLayout/literal_loop.yul
@@ -0,0 +1,69 @@
+{
+			for {}
+			add(delegatecall(delegatecall(call(gas(), 0x0, 0x0, 0x0, 0x0, 0x0, 0x0), 0x0, 0x0, 0x0, 0x0, 0x0), 0x0, 0x0, 0x0, 0x0, 0x0),0x0)
+			{}
+			{}
+}
+// ----
+// digraph CFG {
+// nodesep=0.7;
+// node[shape=box];
+//
+// Entry [label="Entry"];
+// Entry -> Block0;
+// Block0 [label="\
+// [ ]\l\
+// [ ]\l\
+// "];
+// Block0 -> Block0Exit [arrowhead=none];
+// Block0Exit [label="Jump" shape=oval];
+// Block0Exit -> Block1;
+//
+// Block1 [label="\
+// [ ]\l\
+// [ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 ]\l\
+// gas\l\
+// [ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 TMP[gas, 0] ]\l\
+// [ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 TMP[gas, 0] ]\l\
+// call\l\
+// [ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 TMP[call, 0] ]\l\
+// [ 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 0x00 TMP[call, 0] ]\l\
+// delegatecall\l\
+// [ 0x00 0x00 0x00 0x00 0x00 0x00 TMP[delegatecall, 0] ]\l\
+// [ 0x00 0x00 0x00 0x00 0x00 0x00 TMP[delegatecall, 0] ]\l\
+// delegatecall\l\
+// [ 0x00 TMP[delegatecall, 0] ]\l\
+// [ 0x00 TMP[delegatecall, 0] ]\l\
+// add\l\
+// [ TMP[add, 0] ]\l\
+// [ TMP[add, 0] ]\l\
+// "];
+// Block1 -> Block1Exit;
+// Block1Exit [label="{ TMP[add, 0]| { <0> Zero | <1> NonZero }}" shape=Mrecord];
+// Block1Exit:0 -> Block2;
+// Block1Exit:1 -> Block3;
+//
+// Block2 [label="\
+// [ ]\l\
+// [ ]\l\
+// "];
+// Block2Exit [label="MainExit"];
+// Block2 -> Block2Exit;
+//
+// Block3 [label="\
+// [ ]\l\
+// [ ]\l\
+// "];
+// Block3 -> Block3Exit [arrowhead=none];
+// Block3Exit [label="Jump" shape=oval];
+// Block3Exit -> Block4;
+//
+// Block4 [label="\
+// [ ]\l\
+// [ ]\l\
+// "];
+// Block4 -> Block4Exit [arrowhead=none];
+// Block4Exit [label="BackwardsJump" shape=oval];
+// Block4Exit -> Block1;
+//
+// }

From 28ae31655651512575d816dd898e22051db158f0 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 1 Nov 2021 14:19:33 +0100
Subject: [PATCH 0062/1748] Named function labels.

---
 libyul/backends/evm/EVMObjectCompiler.cpp     |  10 +-
 .../evm/OptimizedEVMCodeTransform.cpp         |  38 +-
 .../backends/evm/OptimizedEVMCodeTransform.h  |  12 +-
 .../function_debug_info_via_yul/output        |  15 +-
 .../output.json                               | 360 +++++++++---------
 .../stackReuse/function_call.yul              |  10 +-
 .../stackReuse/functions_multi_return.yul     |  22 +-
 .../stackReuse/reuse_slots_function.yul       |   6 +-
 .../reuse_slots_function_with_gaps.yul        |   6 +-
 test/libyul/evmCodeTransform/stub.yul         |   6 +-
 10 files changed, 260 insertions(+), 225 deletions(-)

diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index c85c1ae921..bede32d174 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -65,8 +65,14 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 	yulAssert(_object.code, "No code.");
 	if (_optimize && m_dialect.evmVersion().canOverchargeGasForCall())
 	{
-
-		auto stackErrors = OptimizedEVMCodeTransform::run(m_assembly, *_object.analysisInfo, *_object.code, m_dialect, context);
+		auto stackErrors = OptimizedEVMCodeTransform::run(
+			m_assembly,
+			*_object.analysisInfo,
+			*_object.code,
+			m_dialect,
+			context,
+			OptimizedEVMCodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
+		);
 		if (!stackErrors.empty())
 			BOOST_THROW_EXCEPTION(stackErrors.front());
 	}
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index ca57c59d27..08987b5654 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -44,7 +44,7 @@ vector<StackTooDeepError> OptimizedEVMCodeTransform::run(
 	Block const& _block,
 	EVMDialect const& _dialect,
 	BuiltinContext& _builtinContext,
-	bool _useNamedLabelsForFunctions
+	UseNamedLabels _useNamedLabelsForFunctions
 )
 {
 	std::unique_ptr<CFG> dfg = ControlFlowGraphBuilder::build(_analysisInfo, _dialect, _block);
@@ -170,15 +170,35 @@ void OptimizedEVMCodeTransform::operator()(CFG::Assignment const& _assignment)
 OptimizedEVMCodeTransform::OptimizedEVMCodeTransform(
 	AbstractAssembly& _assembly,
 	BuiltinContext& _builtinContext,
-	bool _useNamedLabelsForFunctions,
+	UseNamedLabels _useNamedLabelsForFunctions,
 	CFG const& _dfg,
 	StackLayout const& _stackLayout
 ):
 	m_assembly(_assembly),
 	m_builtinContext(_builtinContext),
-	m_useNamedLabelsForFunctions(_useNamedLabelsForFunctions),
 	m_dfg(_dfg),
-	m_stackLayout(_stackLayout)
+	m_stackLayout(_stackLayout),
+	m_functionLabels([&](){
+		map<CFG::FunctionInfo const*, AbstractAssembly::LabelID> functionLabels;
+		set<YulString> assignedFunctionNames;
+		for (Scope::Function const* function: m_dfg.functions)
+		{
+			CFG::FunctionInfo const& functionInfo = m_dfg.functionInfo.at(function);
+			bool nameAlreadySeen = !assignedFunctionNames.insert(function->name).second;
+			if (_useNamedLabelsForFunctions == UseNamedLabels::YesAndForceUnique)
+				yulAssert(!nameAlreadySeen);
+			bool useNamedLabel = _useNamedLabelsForFunctions != UseNamedLabels::Never && !nameAlreadySeen;
+			functionLabels[&functionInfo] = useNamedLabel ?
+				m_assembly.namedLabel(
+					function->name.str(),
+					function->arguments.size(),
+					function->returns.size(),
+					functionInfo.debugData ? functionInfo.debugData->astID : nullopt
+				) :
+				m_assembly.newLabelId();
+		}
+		return functionLabels;
+	}())
 {
 }
 
@@ -191,15 +211,7 @@ void OptimizedEVMCodeTransform::assertLayoutCompatibility(Stack const& _currentS
 
 AbstractAssembly::LabelID OptimizedEVMCodeTransform::getFunctionLabel(Scope::Function const& _function)
 {
-	CFG::FunctionInfo const& functionInfo = m_dfg.functionInfo.at(&_function);
-	if (!m_functionLabels.count(&functionInfo))
-		m_functionLabels[&functionInfo] = m_useNamedLabelsForFunctions ? m_assembly.namedLabel(
-			functionInfo.function.name.str(),
-			functionInfo.function.arguments.size(),
-			functionInfo.function.returns.size(),
-			{}
-		) : m_assembly.newLabelId();
-	return m_functionLabels[&functionInfo];
+	return m_functionLabels.at(&m_dfg.functionInfo.at(&_function));
 }
 
 void OptimizedEVMCodeTransform::validateSlot(StackSlot const& _slot, Expression const& _expression)
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.h b/libyul/backends/evm/OptimizedEVMCodeTransform.h
index 48819251ae..ed03c14530 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.h
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.h
@@ -43,13 +43,17 @@ struct StackLayout;
 class OptimizedEVMCodeTransform
 {
 public:
+	/// Use named labels for functions 1) Yes and check that the names are unique
+	/// 2) For none of the functions 3) for the first function of each name.
+	enum class UseNamedLabels { YesAndForceUnique, Never, ForFirstFunctionOfEachName };
+
 	[[nodiscard]] static std::vector<StackTooDeepError> run(
 		AbstractAssembly& _assembly,
 		AsmAnalysisInfo& _analysisInfo,
 		Block const& _block,
 		EVMDialect const& _dialect,
 		BuiltinContext& _builtinContext,
-		bool _useNamedLabelsForFunctions = false
+		UseNamedLabels _useNamedLabelsForFunctions
 	);
 
 	/// Generate code for the function call @a _call. Only public for using with std::visit.
@@ -62,7 +66,7 @@ class OptimizedEVMCodeTransform
 	OptimizedEVMCodeTransform(
 		AbstractAssembly& _assembly,
 		BuiltinContext& _builtinContext,
-		bool _useNamedLabelsForFunctions,
+		UseNamedLabels _useNamedLabelsForFunctions,
 		CFG const& _dfg,
 		StackLayout const& _stackLayout
 	);
@@ -70,6 +74,7 @@ class OptimizedEVMCodeTransform
 	/// Assert that it is valid to transition from @a _currentStack to @a _desiredStack.
 	/// That is @a _currentStack matches each slot in @a _desiredStack that is not a JunkSlot exactly.
 	static void assertLayoutCompatibility(Stack const& _currentStack, Stack const& _desiredStack);
+
 	/// @returns The label of the entry point of the given @a _function.
 	/// Creates and stores a new label, if none exists already.
 	AbstractAssembly::LabelID getFunctionLabel(Scope::Function const& _function);
@@ -94,13 +99,12 @@ class OptimizedEVMCodeTransform
 
 	AbstractAssembly& m_assembly;
 	BuiltinContext& m_builtinContext;
-	bool m_useNamedLabelsForFunctions = true;
 	CFG const& m_dfg;
 	StackLayout const& m_stackLayout;
 	Stack m_stack;
 	std::map<yul::FunctionCall const*, AbstractAssembly::LabelID> m_returnLabels;
 	std::map<CFG::BasicBlock const*, AbstractAssembly::LabelID> m_blockLabels;
-	std::map<CFG::FunctionInfo const*, AbstractAssembly::LabelID> m_functionLabels;
+	std::map<CFG::FunctionInfo const*, AbstractAssembly::LabelID> const m_functionLabels;
 	/// Set of blocks already generated. If any of the contained blocks is ever jumped to, m_blockLabels should
 	/// contain a jump label for it.
 	std::set<CFG::BasicBlock const*> m_generated;
diff --git a/test/cmdlineTests/function_debug_info_via_yul/output b/test/cmdlineTests/function_debug_info_via_yul/output
index 5af245ce4a..495c82d5be 100644
--- a/test/cmdlineTests/function_debug_info_via_yul/output
+++ b/test/cmdlineTests/function_debug_info_via_yul/output
@@ -4,7 +4,20 @@
     "function_debug_info_via_yul/input.sol:C":
     {
       "function-debug": {},
-      "function-debug-runtime": {}
+      "function-debug-runtime":
+      {
+        "abi_encode_uint256":
+        {
+          "parameterSlots": 2,
+          "returnSlots": 1
+        },
+        "calldata_array_index_access_uint256_dyn_calldata":
+        {
+          "entryPoint": 152,
+          "parameterSlots": 2,
+          "returnSlots": 1
+        }
+      }
     }
   },
   "version": "<VERSION REMOVED>"
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index d8877a82ba..0c529109ae 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -3,7 +3,7 @@
   dup1
   0x40
   mstore
-  jumpi(tag_5, callvalue)
+  jumpi(tag_6, callvalue)
   0x1f
   bytecodeSize
   codesize
@@ -25,7 +25,7 @@
   dup5
   lt
   or
-  tag_3
+  tag_4
   jumpi
   dup1
   dup5
@@ -40,7 +40,7 @@
   add
   sub
   slt
-  tag_5
+  tag_6
   jumpi
   mload
     /* \"C\":147:149  42 */
@@ -60,12 +60,12 @@
   dup2
   assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
   return
-tag_5:
+tag_6:
   pop
   0x00
   dup1
   revert
-tag_3:
+tag_4:
   pop
   pop
   pop
@@ -78,11 +78,11 @@ stop
 sub_0: assembly {
         /* \"C\":79:428  contract C... */
       mstore(0x40, 0x80)
-      jumpi(tag_1, iszero(lt(calldatasize, 0x04)))
+      jumpi(tag_8, iszero(lt(calldatasize, 0x04)))
       0x00
       dup1
       revert
-    tag_1:
+    tag_8:
       0x00
       dup1
       calldataload
@@ -91,35 +91,35 @@ sub_0: assembly {
       dup1
       0x26121ff0
       eq
-      tag_3
+      tag_10
       jumpi
       dup1
       0x793816ec
       eq
-      tag_5
+      tag_12
       jumpi
       0x9942ec6f
       eq
-      tag_7
+      tag_14
       jumpi
       pop
       0x00
       dup1
       revert
-    tag_7:
-      jumpi(tag_9, callvalue)
+    tag_14:
+      jumpi(tag_16, callvalue)
       pop
-      tag_11
+      tag_18
       calldatasize
-      tag_12
+      tag_1
       jump\t// in
-    tag_11:
-      tag_13
+    tag_18:
+      tag_19
         /* \"C\":375:378  int */
-      tag_14
-      tag_15
+      tag_20
+      tag_6
       jump\t// in
-    tag_14:
+    tag_20:
         /* \"C\":79:428  contract C... */
       mload(0x40)
       swap1
@@ -133,23 +133,23 @@ sub_0: assembly {
       add
       swap1
       jump
-    tag_13:
+    tag_19:
       sub
       swap1
       return
-    tag_9:
+    tag_16:
       dup1
       revert
-    tag_5:
+    tag_12:
       pop
-      jumpi(tag_9, callvalue)
-      tag_13
+      jumpi(tag_16, callvalue)
+      tag_19
       swap1
-      tag_20
+      tag_24
       calldatasize
-      tag_12
+      tag_1
       jump\t// in
-    tag_20:
+    tag_24:
       sload
       mload(0x40)
       swap1
@@ -163,64 +163,64 @@ sub_0: assembly {
       add
       swap1
       jump
-    tag_3:
+    tag_10:
       pop
-      jumpi(tag_9, callvalue)
+      jumpi(tag_16, callvalue)
       pop
-      tag_23
+      tag_27
       calldatasize
-      tag_12
+      tag_1
       jump\t// in
-    tag_23:
-      tag_13
+    tag_27:
+      tag_19
         /* \"C\":279:298  constVar + immutVar */
-      tag_14
+      tag_20
         /* \"C\":290:298  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":279:298  constVar + immutVar */
-      tag_26
+      tag_4
       jump\t// in
         /* \"C\":79:428  contract C... */
-    tag_12:
+    tag_1:
       0x00
       swap1
       not(0x03)
       add
       slt
-      tag_27
+      tag_30
       jumpi
       jump\t// out
-    tag_27:
+    tag_30:
       pop
       0x00
       dup1
       revert
         /* \"C\":117:119  41 */
-    tag_29:
+    tag_3:
       pop
       mstore(0x00, shl(0xe0, 0x4e487b71))
       mstore(0x04, 0x11)
       revert(0x00, 0x24)
-    tag_26:
+    tag_4:
       sub(shl(0xff, 0x01), 0x2a)
       dup2
       sgt
       0x01
       and
-      tag_30
+      tag_32
       jumpi
-    tag_31:
+    tag_33:
       0x29
       add
       swap1
       jump\t// out
-    tag_30:
-      tag_32
-      tag_29
-      jump\t// in
     tag_32:
-      jump(tag_31)
-    tag_33:
+      tag_34
+      tag_3
+      jump\t// in
+    tag_34:
+      jump(tag_33)
+    tag_5:
       0x00
       dup2
       slt
@@ -233,9 +233,9 @@ sub_0: assembly {
       dup5
       sgt
       and
-      tag_34
+      tag_35
       jumpi
-    tag_35:
+    tag_36:
       shl(0xff, 0x01)
       dup3
       swap1
@@ -243,27 +243,27 @@ sub_0: assembly {
       dup4
       slt
       and
-      tag_36
+      tag_37
       jumpi
       add
       swap1
       jump\t// out
-    tag_36:
-      tag_38
-      tag_29
+    tag_37:
+      tag_39
+      tag_3
       jump\t// in
-    tag_38:
+    tag_39:
       add
       swap1
       jump\t// out
-    tag_34:
-      tag_39
-      tag_29
+    tag_35:
+      tag_40
+      tag_3
       jump\t// in
-    tag_39:
-      jump(tag_35)
+    tag_40:
+      jump(tag_36)
         /* \"C\":304:341  modifier m()... */
-    tag_15:
+    tag_6:
         /* \"C\":79:428  contract C... */
       0x00
       dup1
@@ -275,10 +275,10 @@ sub_0: assembly {
         /* \"C\":79:428  contract C... */
       dup2
       eq
-      tag_40
+      tag_41
       jumpi
         /* \"C\":304:341  modifier m()... */
-    tag_41:
+    tag_42:
         /* \"C\":79:428  contract C... */
       add
       swap1
@@ -290,7 +290,7 @@ sub_0: assembly {
         /* \"C\":403:411  this.f() */
       extcodesize
       iszero
-      tag_42
+      tag_43
       jumpi
         /* \"C\":79:428  contract C... */
       mload(0x40)
@@ -313,38 +313,38 @@ sub_0: assembly {
       swap2
       dup3
       iszero
-      tag_44
+      tag_45
       jumpi
       dup1
       swap3
-      tag_46
+      tag_47
       jumpi
         /* \"C\":304:341  modifier m()... */
-    tag_47:
+    tag_48:
         /* \"C\":392:411  stateVar + this.f() */
       pop
       pop
-      tag_48
+      tag_49
       swap1
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_49
+      tag_50
         /* \"C\":392:411  stateVar + this.f() */
       swap3
-      tag_33
+      tag_5
       jump\t// in
-    tag_48:
+    tag_49:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       swap1
-      tag_33
+      tag_5
       jump\t// in
-    tag_49:
+    tag_50:
         /* \"C\":304:341  modifier m()... */
       swap1
       jump\t// out
         /* \"C\":403:411  this.f() */
-    tag_46:
+    tag_47:
         /* \"C\":79:428  contract C... */
       swap1
       swap2
@@ -366,18 +366,18 @@ sub_0: assembly {
       dup4
       lt
       or
-      tag_50
+      tag_51
       jumpi
       pop
       swap2
         /* \"C\":403:411  this.f() */
-      tag_52
+      tag_53
         /* \"C\":392:411  stateVar + this.f() */
-      tag_48
+      tag_49
         /* \"C\":79:428  contract C... */
       swap3
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_49
+      tag_50
         /* \"C\":79:428  contract C... */
       swap5
       0x40
@@ -387,16 +387,16 @@ sub_0: assembly {
       dup2
       add
       swap1
-      tag_53
+      tag_7
       jump\t// in
-    tag_52:
+    tag_53:
       swap2
       dup2
       swap4
       pop
-      jump(tag_47)
+      jump(tag_48)
         /* \"C\":79:428  contract C... */
-    tag_50:
+    tag_51:
       shl(0xe0, 0x4e487b71)
       dup2
       mstore
@@ -416,7 +416,7 @@ sub_0: assembly {
         /* \"C\":79:428  contract C... */
       revert
         /* \"C\":403:411  this.f() */
-    tag_44:
+    tag_45:
         /* \"C\":79:428  contract C... */
       swap4
       pop
@@ -433,20 +433,20 @@ sub_0: assembly {
       swap1
       revert
         /* \"C\":403:411  this.f() */
-    tag_42:
+    tag_43:
         /* \"C\":79:428  contract C... */
       swap2
       pop
       pop
       dup1
       revert
-    tag_40:
+    tag_41:
       tag_54
-      tag_29
+      tag_3
       jump\t// in
     tag_54:
-      jump(tag_41)
-    tag_53:
+      jump(tag_42)
+    tag_7:
       swap1
       dup2
       0x20
@@ -472,7 +472,7 @@ sub_0: assembly {
   dup1
   0x40
   mstore
-  jumpi(tag_5, callvalue)
+  jumpi(tag_6, callvalue)
   0x1f
   bytecodeSize
   codesize
@@ -494,7 +494,7 @@ sub_0: assembly {
   dup5
   lt
   or
-  tag_3
+  tag_4
   jumpi
   dup1
   dup5
@@ -509,14 +509,14 @@ sub_0: assembly {
   add
   sub
   slt
-  tag_5
+  tag_6
   jumpi
-  tag_7
+  tag_8
   swap1
   mload
-  tag_8
+  tag_1
   jump\t// in
-tag_7:
+tag_8:
   mload(0x40)
   dataSize(sub_0)
   swap1
@@ -528,12 +528,12 @@ tag_7:
   dup2
   assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
   return
-tag_5:
+tag_6:
   pop
   0x00
   dup1
   revert
-tag_3:
+tag_4:
   pop
   pop
   pop
@@ -542,7 +542,7 @@ tag_3:
   mstore(0x04, 0x41)
   revert(0x00, 0x24)
     /* \"D\":113:164  constructor(int _init2)... */
-tag_8:
+tag_1:
     /* \"C\":147:149  42 */
   mstore(0x80, 0x2a)
     /* \"D\":107:108  3 */
@@ -588,11 +588,11 @@ stop
 sub_0: assembly {
         /* \"D\":91:166  contract D is C(3)... */
       mstore(0x40, 0x80)
-      jumpi(tag_1, iszero(lt(calldatasize, 0x04)))
+      jumpi(tag_8, iszero(lt(calldatasize, 0x04)))
       0x00
       dup1
       revert
-    tag_1:
+    tag_8:
       0x00
       dup1
       calldataload
@@ -601,35 +601,35 @@ sub_0: assembly {
       dup1
       0x26121ff0
       eq
-      tag_3
+      tag_10
       jumpi
       dup1
       0x793816ec
       eq
-      tag_5
+      tag_12
       jumpi
       0x9942ec6f
       eq
-      tag_7
+      tag_14
       jumpi
       pop
       0x00
       dup1
       revert
-    tag_7:
-      jumpi(tag_9, callvalue)
+    tag_14:
+      jumpi(tag_16, callvalue)
       pop
-      tag_11
+      tag_18
       calldatasize
-      tag_12
+      tag_1
       jump\t// in
-    tag_11:
-      tag_13
+    tag_18:
+      tag_19
         /* \"C\":375:378  int */
-      tag_14
-      tag_15
+      tag_20
+      tag_6
       jump\t// in
-    tag_14:
+    tag_20:
         /* \"D\":91:166  contract D is C(3)... */
       mload(0x40)
       swap1
@@ -643,23 +643,23 @@ sub_0: assembly {
       add
       swap1
       jump
-    tag_13:
+    tag_19:
       sub
       swap1
       return
-    tag_9:
+    tag_16:
       dup1
       revert
-    tag_5:
+    tag_12:
       pop
-      jumpi(tag_9, callvalue)
-      tag_13
+      jumpi(tag_16, callvalue)
+      tag_19
       swap1
-      tag_20
+      tag_24
       calldatasize
-      tag_12
+      tag_1
       jump\t// in
-    tag_20:
+    tag_24:
       sload
       mload(0x40)
       swap1
@@ -673,64 +673,64 @@ sub_0: assembly {
       add
       swap1
       jump
-    tag_3:
+    tag_10:
       pop
-      jumpi(tag_9, callvalue)
+      jumpi(tag_16, callvalue)
       pop
-      tag_23
+      tag_27
       calldatasize
-      tag_12
+      tag_1
       jump\t// in
-    tag_23:
-      tag_13
+    tag_27:
+      tag_19
         /* \"C\":279:298  constVar + immutVar */
-      tag_14
+      tag_20
         /* \"C\":290:298  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":279:298  constVar + immutVar */
-      tag_26
+      tag_4
       jump\t// in
         /* \"D\":91:166  contract D is C(3)... */
-    tag_12:
+    tag_1:
       0x00
       swap1
       not(0x03)
       add
       slt
-      tag_27
+      tag_30
       jumpi
       jump\t// out
-    tag_27:
+    tag_30:
       pop
       0x00
       dup1
       revert
         /* \"C\":117:119  41 */
-    tag_29:
+    tag_3:
       pop
       mstore(0x00, shl(0xe0, 0x4e487b71))
       mstore(0x04, 0x11)
       revert(0x00, 0x24)
-    tag_26:
+    tag_4:
       sub(shl(0xff, 0x01), 0x2a)
       dup2
       sgt
       0x01
       and
-      tag_30
+      tag_32
       jumpi
-    tag_31:
+    tag_33:
       0x29
       add
       swap1
       jump\t// out
-    tag_30:
-      tag_32
-      tag_29
-      jump\t// in
     tag_32:
-      jump(tag_31)
-    tag_33:
+      tag_34
+      tag_3
+      jump\t// in
+    tag_34:
+      jump(tag_33)
+    tag_5:
       0x00
       dup2
       slt
@@ -743,9 +743,9 @@ sub_0: assembly {
       dup5
       sgt
       and
-      tag_34
+      tag_35
       jumpi
-    tag_35:
+    tag_36:
       shl(0xff, 0x01)
       dup3
       swap1
@@ -753,27 +753,27 @@ sub_0: assembly {
       dup4
       slt
       and
-      tag_36
+      tag_37
       jumpi
       add
       swap1
       jump\t// out
-    tag_36:
-      tag_38
-      tag_29
+    tag_37:
+      tag_39
+      tag_3
       jump\t// in
-    tag_38:
+    tag_39:
       add
       swap1
       jump\t// out
-    tag_34:
-      tag_39
-      tag_29
+    tag_35:
+      tag_40
+      tag_3
       jump\t// in
-    tag_39:
-      jump(tag_35)
+    tag_40:
+      jump(tag_36)
         /* \"C\":304:341  modifier m()... */
-    tag_15:
+    tag_6:
         /* \"D\":91:166  contract D is C(3)... */
       0x00
       dup1
@@ -785,10 +785,10 @@ sub_0: assembly {
         /* \"D\":91:166  contract D is C(3)... */
       dup2
       eq
-      tag_40
+      tag_41
       jumpi
         /* \"C\":304:341  modifier m()... */
-    tag_41:
+    tag_42:
         /* \"D\":91:166  contract D is C(3)... */
       add
       swap1
@@ -800,7 +800,7 @@ sub_0: assembly {
         /* \"C\":403:411  this.f() */
       extcodesize
       iszero
-      tag_42
+      tag_43
       jumpi
         /* \"D\":91:166  contract D is C(3)... */
       mload(0x40)
@@ -823,38 +823,38 @@ sub_0: assembly {
       swap2
       dup3
       iszero
-      tag_44
+      tag_45
       jumpi
       dup1
       swap3
-      tag_46
+      tag_47
       jumpi
         /* \"C\":304:341  modifier m()... */
-    tag_47:
+    tag_48:
         /* \"C\":392:411  stateVar + this.f() */
       pop
       pop
-      tag_48
+      tag_49
       swap1
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_49
+      tag_50
         /* \"C\":392:411  stateVar + this.f() */
       swap3
-      tag_33
+      tag_5
       jump\t// in
-    tag_48:
+    tag_49:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       swap1
-      tag_33
+      tag_5
       jump\t// in
-    tag_49:
+    tag_50:
         /* \"C\":304:341  modifier m()... */
       swap1
       jump\t// out
         /* \"C\":403:411  this.f() */
-    tag_46:
+    tag_47:
         /* \"D\":91:166  contract D is C(3)... */
       swap1
       swap2
@@ -876,18 +876,18 @@ sub_0: assembly {
       dup4
       lt
       or
-      tag_50
+      tag_51
       jumpi
       pop
       swap2
         /* \"C\":403:411  this.f() */
-      tag_52
+      tag_53
         /* \"C\":392:411  stateVar + this.f() */
-      tag_48
+      tag_49
         /* \"D\":91:166  contract D is C(3)... */
       swap3
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_49
+      tag_50
         /* \"D\":91:166  contract D is C(3)... */
       swap5
       0x40
@@ -897,16 +897,16 @@ sub_0: assembly {
       dup2
       add
       swap1
-      tag_53
+      tag_7
       jump\t// in
-    tag_52:
+    tag_53:
       swap2
       dup2
       swap4
       pop
-      jump(tag_47)
+      jump(tag_48)
         /* \"D\":91:166  contract D is C(3)... */
-    tag_50:
+    tag_51:
       shl(0xe0, 0x4e487b71)
       dup2
       mstore
@@ -926,7 +926,7 @@ sub_0: assembly {
         /* \"D\":91:166  contract D is C(3)... */
       revert
         /* \"C\":403:411  this.f() */
-    tag_44:
+    tag_45:
         /* \"D\":91:166  contract D is C(3)... */
       swap4
       pop
@@ -943,20 +943,20 @@ sub_0: assembly {
       swap1
       revert
         /* \"C\":403:411  this.f() */
-    tag_42:
+    tag_43:
         /* \"D\":91:166  contract D is C(3)... */
       swap2
       pop
       pop
       dup1
       revert
-    tag_40:
+    tag_41:
       tag_54
-      tag_29
+      tag_3
       jump\t// in
     tag_54:
-      jump(tag_41)
-    tag_53:
+      jump(tag_42)
+    tag_7:
       swap1
       dup2
       0x20
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_call.yul b/test/libyul/evmCodeTransform/stackReuse/function_call.yul
index 1abc8d8aff..507b354413 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_call.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_call.yul
@@ -7,15 +7,15 @@
 // stackOptimization: true
 // ----
 //     /* "":15:22   */
-//   tag_1
+//   tag_2
 //     /* "":20:21   */
 //   0x02
 //     /* "":17:18   */
 //   0x01
 //     /* "":15:22   */
-//   tag_2
+//   tag_1
 //   jump	// in
-// tag_1:
+// tag_2:
 //     /* "":62:69   */
 //   pop
 //   tag_3
@@ -24,13 +24,13 @@
 //     /* "":64:65   */
 //   0x03
 //     /* "":62:69   */
-//   tag_2
+//   tag_1
 //   jump	// in
 // tag_3:
 //     /* "":0:71   */
 //   stop
 //     /* "":27:52   */
-// tag_2:
+// tag_1:
 //   pop
 //   pop
 //     /* "":47:48   */
diff --git a/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul b/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul
index df8b961840..1ce02483dc 100644
--- a/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/functions_multi_return.yul
@@ -11,37 +11,37 @@
 // stackOptimization: true
 // ----
 //     /* "":74:81   */
-//   tag_1
+//   tag_3
 //     /* "":79:80   */
 //   0x02
 //     /* "":76:77   */
 //   0x01
 //     /* "":74:81   */
-//   tag_2
+//   tag_1
 //   jump	// in
-// tag_1:
+// tag_3:
 //     /* "":91:98   */
 //   pop
-//   tag_3
+//   tag_4
 //     /* "":96:97   */
 //   0x04
 //     /* "":93:94   */
 //   0x03
 //     /* "":91:98   */
-//   tag_2
+//   tag_1
 //   jump	// in
-// tag_3:
+// tag_4:
 //     /* "":115:118   */
 //   pop
-//   tag_4
 //   tag_5
+//   tag_2
 //   jump	// in
-// tag_4:
+// tag_5:
 //     /* "":131:134   */
 //   pop
 //   pop
 //   tag_6
-//   tag_5
+//   tag_2
 //   jump	// in
 // tag_6:
 //     /* "":139:154   */
@@ -52,7 +52,7 @@
 //     /* "":0:156   */
 //   stop
 //     /* "":6:31   */
-// tag_2:
+// tag_1:
 //   pop
 //   pop
 //     /* "":26:27   */
@@ -61,7 +61,7 @@
 //   swap1
 //   jump	// out
 //     /* "":36:60   */
-// tag_5:
+// tag_2:
 //     /* "":55:56   */
 //   0x00
 //     /* "":52:53   */
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul
index a7a8b1a02c..13e3065ccc 100644
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function.yul
@@ -6,10 +6,10 @@
 // stackOptimization: true
 // ----
 //     /* "":58:61   */
-//   tag_1
 //   tag_2
+//   tag_1
 //   jump	// in
-// tag_1:
+// tag_2:
 //     /* "":62:73   */
 //   pop
 //   swap2
@@ -29,7 +29,7 @@
 //     /* "":0:115   */
 //   stop
 //     /* "":6:35   */
-// tag_2:
+// tag_1:
 //     /* "":25:26   */
 //   0x00
 //     /* "":28:29   */
diff --git a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul b/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul
index 888bccf7d3..f1cde362ae 100644
--- a/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/reuse_slots_function_with_gaps.yul
@@ -19,10 +19,10 @@
 //   swap2
 //   mstore
 //     /* "":207:210   */
-//   tag_1
 //   tag_2
+//   tag_1
 //   jump	// in
-// tag_1:
+// tag_2:
 //     /* "":211:224   */
 //   swap4
 //   swap1
@@ -35,7 +35,7 @@
 //     /* "":0:239   */
 //   stop
 //     /* "":155:184   */
-// tag_2:
+// tag_1:
 //     /* "":174:175   */
 //   0x00
 //     /* "":177:178   */
diff --git a/test/libyul/evmCodeTransform/stub.yul b/test/libyul/evmCodeTransform/stub.yul
index a11cad44c9..ef7cd668c1 100644
--- a/test/libyul/evmCodeTransform/stub.yul
+++ b/test/libyul/evmCodeTransform/stub.yul
@@ -21,14 +21,14 @@
 // stackOptimization: true
 // ----
 //     /* "":14:21   */
-//   tag_1
 //   tag_2
+//   tag_1
 //   jump	// in
-// tag_1:
+// tag_2:
 //     /* "":0:460   */
 //   stop
 //     /* "":34:458   */
-// tag_2:
+// tag_1:
 //     /* "":108:109   */
 //   0x00
 //     /* "":95:110   */

From e9708105a40845083a8ee83e03848975ea6dfb28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 21 Oct 2021 17:11:18 +0200
Subject: [PATCH 0063/1748] CI: Remove superfluous/unused test_ dicts

---
 .circleci/config.yml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 00c7223d5e..b53999f2a8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -219,14 +219,6 @@ defaults:
       parallelism: 6
       <<: *steps_soltest_all
 
-  - test_asan: &test_asan
-      <<: *test_ubuntu2004
-      <<: *steps_soltest
-
-  - test_ubuntu2004_clang_cli: &test_ubuntu2004_clang_cli
-      docker:
-        - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
-      <<: *steps_cmdline_tests
 
   # --------------------------------------------------------------------------
   # Workflow Templates
@@ -806,7 +798,7 @@ jobs:
     <<: *steps_cmdline_tests
 
   t_ubu_asan:
-    <<: *test_asan
+    <<: *test_ubuntu2004
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0

From 9aafbf1092e434e4ed2491db3e1babb7cf50df99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 21 Oct 2021 17:12:03 +0200
Subject: [PATCH 0064/1748] CI: Replace `test_` dicts with `base_` ones and
 make their steps explicit

---
 .circleci/config.yml | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b53999f2a8..82c860bb7b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -170,7 +170,7 @@ defaults:
       destination: test_results/
 
   # --------------------------------------------------------------------------
-  # Tests Templates
+  # Step Templates
 
   # store_test_results helper
   - store_test_results: &store_test_results
@@ -181,6 +181,9 @@ defaults:
         - checkout
         - attach_workspace:
             at: build
+        # NOTE: Different build jobs produce different soltest executables (release/debug,
+        # clang/gcc, windows/linux/macos, etc.). The executable used by these steps comes from the
+        # attached workspace and we only see the items added to the workspace by jobs we depend on.
         - run: *run_soltest
         - store_test_results: *store_test_results
         - store_artifacts: *artifacts_test_results
@@ -203,22 +206,20 @@ defaults:
         - store_test_results: *store_test_results
         - store_artifacts: *artifacts_test_results
 
-  - test_ubuntu1604_clang: &test_ubuntu1604_clang
+  # --------------------------------------------------------------------------
+  # Base Image Templates
+
+  - base_ubuntu1604_clang: &base_ubuntu1604_clang
       docker:
         - image: << pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image >>
-      <<: *steps_soltest
 
-  - test_ubuntu2004_clang: &test_ubuntu2004_clang
+  - base_ubuntu2004_clang: &base_ubuntu2004_clang
       docker:
         - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
-      <<: *steps_soltest
 
-  - test_ubuntu2004: &test_ubuntu2004
+  - base_ubuntu2004: &base_ubuntu2004
       docker:
         - image: << pipeline.parameters.ubuntu-2004-docker-image >>
-      parallelism: 6
-      <<: *steps_soltest_all
-
 
   # --------------------------------------------------------------------------
   # Workflow Templates
@@ -551,7 +552,8 @@ jobs:
       - persist_to_workspace: *artifacts_executables
 
   t_ubu_codecov:
-    <<: *test_ubuntu2004
+    <<: *base_ubuntu2004
+    parallelism: 6
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 1
@@ -598,7 +600,7 @@ jobs:
       - persist_to_workspace: *artifacts_executables_ossfuzz
 
   t_ubu_ossfuzz: &t_ubu_ossfuzz
-    <<: *test_ubuntu1604_clang
+    <<: *base_ubuntu1604_clang
     steps:
       - checkout
       - attach_workspace:
@@ -739,7 +741,9 @@ jobs:
           destination: docs-html
 
   t_ubu_soltest: &t_ubu_soltest
-    <<: *test_ubuntu2004
+    <<: *base_ubuntu2004
+    parallelism: 6
+    <<: *steps_soltest_all
 
   t_archlinux_soltest: &t_archlinux_soltest
       docker:
@@ -772,12 +776,15 @@ jobs:
 
 
   t_ubu_clang_soltest: &t_ubu_clang_soltest
-    <<: *test_ubuntu2004_clang
+    <<: *base_ubuntu2004_clang
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
+    <<: *steps_soltest
 
   t_ubu_release_soltest: &t_ubu_release_soltest
+    # NOTE: This definition is identical to t_ubu_soltest_all but in the workflow we make it depend on
+    # a different job (b_ubu_release) so the workspace it attaches contains a different executable.
     <<: *t_ubu_soltest
 
   t_ubu_cli: &t_ubu_cli
@@ -798,20 +805,23 @@ jobs:
     <<: *steps_cmdline_tests
 
   t_ubu_asan:
-    <<: *test_ubuntu2004
+    <<: *base_ubuntu2004
+    parallelism: 6
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
       SOLTEST_FLAGS: --no-smt
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
+    <<: *steps_soltest
 
   t_ubu_asan_clang:
-    <<: *test_ubuntu2004_clang
+    <<: *base_ubuntu2004_clang
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
       SOLTEST_FLAGS: --no-smt
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
+    <<: *steps_soltest
 
   t_ubu_ubsan_clang:
     environment:

From 9c96234724d40c760c6708c44d8ff5150dd06d24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 21 Oct 2021 17:37:05 +0200
Subject: [PATCH 0065/1748] CI: Define a `base_` dict for every image and set
 default values for some env variables there

---
 .circleci/config.yml | 267 ++++++++++++++++++++++---------------------
 1 file changed, 135 insertions(+), 132 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 82c860bb7b..97b61107f7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -212,14 +212,93 @@ defaults:
   - base_ubuntu1604_clang: &base_ubuntu1604_clang
       docker:
         - image: << pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image >>
+      environment:
+        TERM: xterm
 
   - base_ubuntu2004_clang: &base_ubuntu2004_clang
       docker:
         - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
+      environment:
+        TERM: xterm
+        CC: clang
+        CXX: clang++
+        MAKEFLAGS: -j 3
+
+  - base_ubuntu2004_clang_xlarge: &base_ubuntu2004_clang_xlarge
+      <<: *base_ubuntu2004_clang
+      resource_class: xlarge
+      environment:
+        TERM: xterm
+        CC: clang
+        CXX: clang++
+        MAKEFLAGS: -j 10
 
   - base_ubuntu2004: &base_ubuntu2004
       docker:
         - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+      environment:
+        TERM: xterm
+
+  - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
+      <<: *base_ubuntu2004
+      resource_class: xlarge
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 10
+
+  - base_buildpack_focal: &base_buildpack_focal
+      docker:
+        - image: buildpack-deps:focal
+      environment:
+        TERM: xterm
+
+  - base_buildpack_latest: &base_buildpack_latest
+      docker:
+        - image: buildpack-deps:latest
+      environment:
+        TERM: xterm
+
+  - base_archlinux: &base_archlinux
+      docker:
+        - image: archlinux:base
+      environment:
+        TERM: xterm
+
+  - base_win_powershell: &base_win_powershell
+      executor:
+        name: win/default
+        shell: powershell.exe
+
+  - base_win_cmd: &base_win_cmd
+      executor:
+        name: win/default
+        shell: cmd.exe
+
+  - base_osx: &base_osx
+      macos:
+        xcode: "11.0.0"
+      environment:
+        TERM: xterm
+
+  - base_ems_xlarge: &base_ems_xlarge
+      docker:
+        - image: << pipeline.parameters.emscripten-docker-image >>
+      resource_class: xlarge
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 10
+
+  - base_python: &base_python
+      docker:
+        - image: circleci/python:3.6
+      environment:
+        TERM: xterm
+
+  - base_node_latest: &base_node_latest
+      docker:
+        - image: circleci/node
+      environment:
+        TERM: xterm
 
   # --------------------------------------------------------------------------
   # Workflow Templates
@@ -303,10 +382,7 @@ defaults:
 jobs:
 
   chk_spelling:
-    docker:
-      - image: circleci/python:3.6
-    environment:
-      TERM: xterm
+    <<: *base_python
     steps:
       - checkout
       - attach_workspace:
@@ -320,10 +396,7 @@ jobs:
           command: ~/.local/bin/codespell -S "*.enc,.git,Dockerfile*" -I ./scripts/codespell_whitelist.txt
 
   chk_docs_examples:
-    docker:
-      - image: circleci/node
-    environment:
-      TERM: xterm
+    <<: *base_node_latest
     steps:
       - checkout
       - attach_workspace:
@@ -336,8 +409,7 @@ jobs:
           command: ./test/docsCodeStyle.sh
 
   chk_coding_style:
-    docker:
-      - image: buildpack-deps:focal
+    <<: *base_buildpack_focal
     steps:
       - checkout
       - run:
@@ -354,8 +426,7 @@ jobs:
           command: ./scripts/check_symlinks.sh
 
   chk_errorcodes:
-    docker:
-      - image: circleci/python:3.6
+    <<: *base_python
     steps:
       - checkout
       - run:
@@ -363,8 +434,7 @@ jobs:
           command: ./scripts/error_codes.py --check
 
   chk_pylint:
-    docker:
-      - image: buildpack-deps:focal
+    <<: *base_buildpack_focal
     steps:
       - checkout
       - run:
@@ -379,8 +449,7 @@ jobs:
           command: ./scripts/pylint_all.py
 
   chk_antlr_grammar:
-    docker:
-      - image: buildpack-deps:focal
+    <<: *base_buildpack_focal
     steps:
       - checkout
       - run:
@@ -391,10 +460,7 @@ jobs:
           command: ./scripts/test_antlr_grammar.sh
 
   chk_buglist:
-    docker:
-      - image: circleci/node
-    environment:
-      TERM: xterm
+    <<: *base_node_latest
     steps:
       - checkout
       - run:
@@ -408,10 +474,7 @@ jobs:
           command: ./test/buglistTests.js
 
   chk_proofs:
-    docker:
-      - image: buildpack-deps:latest
-    environment:
-      TERM: xterm
+    <<: *base_buildpack_latest
     steps:
       - checkout
       - run:
@@ -423,17 +486,13 @@ jobs:
       - run: *run_proofs
 
   chk_docs_pragma_min_version:
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-docker-image >>
-    environment:
-      TERM: xterm
+    <<: *base_ubuntu2004
     steps:
       - checkout
       - run: *run_docs_pragma_min_version
 
   t_pyscripts_ubu:
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+    <<: *base_ubuntu2004
     steps:
       - checkout
       - run:
@@ -441,9 +500,7 @@ jobs:
           command: python3 test/pyscriptTests.py
 
   t_pyscripts_win:
-    executor:
-      name: win/default
-      shell: powershell.exe
+    <<: *base_win_powershell
     steps:
       - run: git config --global core.autocrlf false
       - checkout
@@ -452,11 +509,7 @@ jobs:
           command: python.exe test/pyscriptTests.py
 
   b_ubu: &b_ubu
-    resource_class: xlarge
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-docker-image >>
-    environment:
-      MAKEFLAGS: -j 10
+    <<: *base_ubuntu2004_xlarge
     steps:
       - checkout
       - run: *run_build
@@ -467,7 +520,7 @@ jobs:
 
   # x64 ASAN build, for testing for memory related bugs
   b_ubu_asan: &b_ubu_asan
-    <<: *b_ubu
+    <<: *base_ubuntu2004_xlarge
     environment:
       CMAKE_OPTIONS: -DSANITIZE=address
       MAKEFLAGS: -j 10
@@ -479,13 +532,7 @@ jobs:
       - persist_to_workspace: *artifacts_executables
 
   b_ubu_clang: &b_ubu_clang
-    resource_class: xlarge
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
-    environment:
-      CC: clang
-      CXX: clang++
-      MAKEFLAGS: -j 10
+    <<: *base_ubuntu2004_clang_xlarge
     steps:
       - checkout
       - run: *run_build
@@ -493,8 +540,7 @@ jobs:
       - persist_to_workspace: *artifacts_executables
 
   b_ubu_asan_clang: &b_ubu_asan_clang
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
+    <<: *base_ubuntu2004_clang
     environment:
       CC: clang
       CXX: clang++
@@ -507,8 +553,7 @@ jobs:
       - persist_to_workspace: *artifacts_executables
 
   b_ubu_ubsan_clang: &b_ubu_ubsan_clang
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
+    <<: *base_ubuntu2004_clang
     environment:
       CC: clang
       CXX: clang++
@@ -528,7 +573,7 @@ jobs:
       MAKEFLAGS: -j 10
 
   b_ubu_static:
-    <<: *b_ubu
+    <<: *base_ubuntu2004_xlarge
     environment:
       MAKEFLAGS: -j 10
       CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DUSE_CVC4=OFF -DSOLC_STATIC_STDLIBS=ON
@@ -541,7 +586,7 @@ jobs:
       - store_artifacts: *artifacts_solc
 
   b_ubu_codecov:
-    <<: *b_ubu
+    <<: *base_ubuntu2004_xlarge
     environment:
       COVERAGE: ON
       CMAKE_BUILD_TYPE: Debug
@@ -576,7 +621,7 @@ jobs:
   # Builds in C++20 mode and uses debug build in order to speed up.
   # Do *NOT* store any artifacts or workspace as we don't run tests on this build.
   b_ubu_cxx20:
-    <<: *b_ubu
+    <<: *base_ubuntu2004_xlarge
     environment:
       CMAKE_BUILD_TYPE: Debug
       CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20 -DUSE_CVC4=OFF
@@ -586,13 +631,7 @@ jobs:
       - run: *run_build
 
   b_ubu_ossfuzz: &b_ubu_ossfuzz
-    docker:
-      - image: << pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image >>
-    environment:
-      CC: clang
-      CXX: clang++
-      TERM: xterm
-      MAKEFLAGS: -j 3
+    <<: *base_ubuntu1604_clang
     steps:
       - checkout
       - run: *setup_prerelease_commit_hash
@@ -617,8 +656,7 @@ jobs:
       - store_artifacts: *artifacts_test_results
 
   b_archlinux:
-    docker:
-      - image: archlinux:base
+    <<: *base_archlinux
     environment:
       TERM: xterm
       MAKEFLAGS: -j 3
@@ -633,8 +671,7 @@ jobs:
       - persist_to_workspace: *artifacts_executables
 
   b_osx:
-    macos:
-      xcode: "11.0.0"
+    <<: *base_osx
     environment:
       TERM: xterm
       CMAKE_BUILD_TYPE: Release
@@ -670,8 +707,7 @@ jobs:
             - build/test/tools/solfuzzer
 
   t_osx_soltest:
-    macos:
-      xcode: "11.0.0"
+    <<: *base_osx
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
@@ -688,10 +724,7 @@ jobs:
       - store_artifacts: *artifacts_test_results
 
   t_osx_cli:
-    macos:
-      xcode: "11.0.0"
-    environment:
-      TERM: xterm
+    <<: *base_osx
     steps:
       - checkout
       - restore_cache:
@@ -703,12 +736,7 @@ jobs:
       - store_artifacts: *artifacts_test_results
 
   b_ems:
-    resource_class: xlarge
-    docker:
-      - image: << pipeline.parameters.emscripten-docker-image >>
-    environment:
-      MAKEFLAGS: -j 10
-      TERM: xterm
+    <<: *base_ems_xlarge
     steps:
       - checkout
       - run:
@@ -728,8 +756,7 @@ jobs:
             - version.txt
 
   b_docs:
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+    <<: *base_ubuntu2004
     steps:
       - checkout
       - run: *setup_prerelease_commit_hash
@@ -746,27 +773,25 @@ jobs:
     <<: *steps_soltest_all
 
   t_archlinux_soltest: &t_archlinux_soltest
-      docker:
-        - image: archlinux:base
-      environment:
-        EVM: << pipeline.parameters.evm-version >>
-        OPTIMIZE: 0
-        TERM: xterm
-        # For Archlinux we do not have prebuilt docker images and we would need to build evmone from source,
-        # thus we forgo semantics tests to speed things up.
-        SOLTEST_FLAGS: --no-semantic-tests
-      steps:
-        - run:
-            name: Install runtime dependencies
-            command: |
-              pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake z3 cvc4 git openssh tar
-        - when:
-            condition: true
-            <<: *steps_soltest
+    <<: *base_archlinux
+    environment:
+      EVM: << pipeline.parameters.evm-version >>
+      OPTIMIZE: 0
+      TERM: xterm
+      # For Archlinux we do not have prebuilt docker images and we would need to build evmone from source,
+      # thus we forgo semantics tests to speed things up.
+      SOLTEST_FLAGS: --no-semantic-tests
+    steps:
+      - run:
+          name: Install runtime dependencies
+          command: |
+            pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake z3 cvc4 git openssh tar
+      - when:
+          condition: true
+          <<: *steps_soltest
 
   t_ubu_soltest_enforce_yul: &t_ubu_soltest_enforce_yul
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+    <<: *base_ubuntu2004
     environment:
       EVM: << pipeline.parameters.evm-version >>
       SOLTEST_FLAGS: --enforce-via-yul
@@ -774,7 +799,6 @@ jobs:
       TERM: xterm
     <<: *steps_soltest
 
-
   t_ubu_clang_soltest: &t_ubu_clang_soltest
     <<: *base_ubuntu2004_clang
     environment:
@@ -788,17 +812,14 @@ jobs:
     <<: *t_ubu_soltest
 
   t_ubu_cli: &t_ubu_cli
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-docker-image >>
-    environment:
-      TERM: xterm
+    <<: *base_ubuntu2004
     <<: *steps_cmdline_tests
 
   t_ubu_release_cli: &t_ubu_release_cli
     <<: *t_ubu_cli
 
   t_ubu_asan_cli:
-    <<: *t_ubu_cli
+    <<: *base_ubuntu2004
     environment:
       TERM: xterm
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
@@ -824,10 +845,9 @@ jobs:
     <<: *steps_soltest
 
   t_ubu_ubsan_clang:
+    <<: *base_ubuntu2004_clang
     environment:
       EVM: << pipeline.parameters.evm-version >>
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
     steps:
       - when:
           condition: true
@@ -835,8 +855,7 @@ jobs:
       - gitter_notify_failure
 
   t_ubu_ubsan_clang_cli:
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
+    <<: *base_ubuntu2004_clang
     steps:
       - when:
           condition: true
@@ -844,10 +863,7 @@ jobs:
       - gitter_notify_failure
 
   t_ems_solcjs:
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-docker-image >>
-    environment:
-      TERM: xterm
+    <<: *base_ubuntu2004
     steps:
       - checkout
       - attach_workspace:
@@ -866,8 +882,7 @@ jobs:
             test/externalTests/solc-js/solc-js.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
 
   t_ems_ext_hardhat:
-    docker:
-      - image: circleci/node
+    <<: *base_node_latest
     environment:
       TERM: xterm
       HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
@@ -929,9 +944,7 @@ jobs:
             - gitter_notify_success
 
   b_win: &b_win
-    executor:
-      name: win/default
-      shell: powershell.exe
+    <<: *base_win_powershell
     steps:
       # NOTE: Not disabling git's core.autocrlf here because we want to build using the typical Windows config.
       - checkout
@@ -966,9 +979,7 @@ jobs:
       FORCE_RELEASE: ON
 
   t_win: &t_win
-    executor:
-      name: win/default
-      shell: powershell.exe
+    <<: *base_win_powershell
     steps:
       # NOTE: Git's default core.autocrlf is fine for running soltest. We get additional coverage
       # for files using CRLF that way.
@@ -988,8 +999,7 @@ jobs:
     <<: *t_win
 
   b_bytecode_ubu:
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+    <<: *base_ubuntu2004
     steps:
       - checkout
       - attach_workspace:
@@ -1009,10 +1019,7 @@ jobs:
             - bytecode-report-ubuntu-cli.txt
 
   b_bytecode_osx:
-    macos:
-      xcode: "11.0.0"
-    environment:
-      TERM: xterm
+    <<: *base_osx
     steps:
       - checkout
       - attach_workspace:
@@ -1032,9 +1039,7 @@ jobs:
             - bytecode-report-osx-cli.txt
 
   b_bytecode_win:
-    executor:
-      name: win/default
-      shell: cmd.exe
+    <<: *base_win_cmd
     steps:
       # NOTE: For bytecode generation we need the input files to be byte-for-byte identical on all
       # platforms so line ending conversions must absolutely be disabled.
@@ -1057,8 +1062,7 @@ jobs:
             - bytecode-report-windows-cli.txt
 
   b_bytecode_ems:
-    docker:
-      - image: circleci/node:16
+    <<: *base_node_latest
     environment:
       SOLC_EMSCRIPTEN: "On"
     steps:
@@ -1074,8 +1078,7 @@ jobs:
             - bytecode-report-emscripten.txt
 
   t_bytecode_compare:
-    docker:
-      - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+    <<: *base_ubuntu2004
     environment:
       REPORT_FILES: |
         bytecode-report-emscripten.txt

From c76a8a738dc0274f4623deccf0b2453dbac1b772 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 21 Oct 2021 17:56:50 +0200
Subject: [PATCH 0066/1748] CI: Tweak some job names to better reflect what
 they run

---
 .circleci/config.yml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 97b61107f7..e2ba6e2d09 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -491,7 +491,7 @@ jobs:
       - checkout
       - run: *run_docs_pragma_min_version
 
-  t_pyscripts_ubu:
+  t_ubu_pyscripts:
     <<: *base_ubuntu2004
     steps:
       - checkout
@@ -499,7 +499,7 @@ jobs:
           name: Python unit tests
           command: python3 test/pyscriptTests.py
 
-  t_pyscripts_win:
+  t_win_pyscripts:
     <<: *base_win_powershell
     steps:
       - run: git config --global core.autocrlf false
@@ -767,7 +767,7 @@ jobs:
           path: docs/_build/html/
           destination: docs-html
 
-  t_ubu_soltest: &t_ubu_soltest
+  t_ubu_soltest_all: &t_ubu_soltest_all
     <<: *base_ubuntu2004
     parallelism: 6
     <<: *steps_soltest_all
@@ -806,10 +806,10 @@ jobs:
       OPTIMIZE: 0
     <<: *steps_soltest
 
-  t_ubu_release_soltest: &t_ubu_release_soltest
+  t_ubu_release_soltest_all: &t_ubu_release_soltest_all
     # NOTE: This definition is identical to t_ubu_soltest_all but in the workflow we make it depend on
     # a different job (b_ubu_release) so the workspace it attaches contains a different executable.
-    <<: *t_ubu_soltest
+    <<: *t_ubu_soltest_all
 
   t_ubu_cli: &t_ubu_cli
     <<: *base_ubuntu2004
@@ -825,7 +825,7 @@ jobs:
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
     <<: *steps_cmdline_tests
 
-  t_ubu_asan:
+  t_ubu_asan_soltest:
     <<: *base_ubuntu2004
     parallelism: 6
     environment:
@@ -835,7 +835,7 @@ jobs:
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
     <<: *steps_soltest
 
-  t_ubu_asan_clang:
+  t_ubu_asan_clang_soltest:
     <<: *base_ubuntu2004_clang
     environment:
       EVM: << pipeline.parameters.evm-version >>
@@ -844,7 +844,7 @@ jobs:
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
     <<: *steps_soltest
 
-  t_ubu_ubsan_clang:
+  t_ubu_ubsan_clang_soltest:
     <<: *base_ubuntu2004_clang
     environment:
       EVM: << pipeline.parameters.evm-version >>
@@ -978,7 +978,7 @@ jobs:
     environment:
       FORCE_RELEASE: ON
 
-  t_win: &t_win
+  t_win_soltest: &t_win_soltest
     <<: *base_win_powershell
     steps:
       # NOTE: Git's default core.autocrlf is fine for running soltest. We get additional coverage
@@ -995,8 +995,8 @@ jobs:
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
 
-  t_win_release:
-    <<: *t_win
+  t_win_release_soltest:
+    <<: *t_win_soltest
 
   b_bytecode_ubu:
     <<: *base_ubuntu2004
@@ -1128,8 +1128,8 @@ workflows:
       - chk_errorcodes: *workflow_trigger_on_tags
       - chk_antlr_grammar: *workflow_trigger_on_tags
       - chk_docs_pragma_min_version: *workflow_trigger_on_tags
-      - t_pyscripts_ubu: *workflow_trigger_on_tags
-      - t_pyscripts_win: *workflow_trigger_on_tags
+      - t_ubu_pyscripts: *workflow_trigger_on_tags
+      - t_win_pyscripts: *workflow_trigger_on_tags
 
       # build-only
       - b_docs: *workflow_trigger_on_tags
@@ -1151,7 +1151,7 @@ workflows:
       # Ubuntu build and tests
       - b_ubu: *workflow_trigger_on_tags
       - t_ubu_cli: *workflow_ubuntu2004
-      - t_ubu_soltest: *workflow_ubuntu2004
+      - t_ubu_soltest_all: *workflow_ubuntu2004
       - t_ubu_soltest_enforce_yul: *workflow_ubuntu2004
       - b_ubu_clang: *workflow_trigger_on_tags
       - t_ubu_clang_soltest: *workflow_ubuntu2004_clang
@@ -1159,7 +1159,7 @@ workflows:
       # Ubuntu fake release build and tests
       - b_ubu_release: *workflow_trigger_on_tags
       - t_ubu_release_cli: *workflow_ubuntu2004_release
-      - t_ubu_release_soltest: *workflow_ubuntu2004_release
+      - t_ubu_release_soltest_all: *workflow_ubuntu2004_release
 
       # Emscripten build and tests that take 15 minutes or less
       - b_ems: *workflow_trigger_on_tags
@@ -1222,8 +1222,8 @@ workflows:
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
       - b_win_release: *workflow_trigger_on_tags
-      - t_win: *workflow_win
-      - t_win_release: *workflow_win_release
+      - t_win_soltest: *workflow_win
+      - t_win_release_soltest: *workflow_win_release
 
       # Bytecode comparison:
       - b_bytecode_ubu:
@@ -1267,13 +1267,13 @@ workflows:
       # ASan build and tests
       - b_ubu_asan: *workflow_trigger_on_tags
       - b_ubu_asan_clang: *workflow_trigger_on_tags
-      - t_ubu_asan: *workflow_ubuntu2004_asan
-      - t_ubu_asan_clang: *workflow_ubuntu2004_asan_clang
+      - t_ubu_asan_soltest: *workflow_ubuntu2004_asan
+      - t_ubu_asan_clang_soltest: *workflow_ubuntu2004_asan_clang
       - t_ubu_asan_cli: *workflow_ubuntu2004_asan
 
       # UBSan build and tests
       - b_ubu_ubsan_clang: *workflow_trigger_on_tags
-      - t_ubu_ubsan_clang: *workflow_ubuntu2004_ubsan_clang
+      - t_ubu_ubsan_clang_soltest: *workflow_ubuntu2004_ubsan_clang
       - t_ubu_ubsan_clang_cli: *workflow_ubuntu2004_ubsan_clang
 
       # Emscripten build and tests that take more than 15 minutes to execute

From dff280cadc6ec83e39e1bdabc2673d56ab528f95 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 3 Nov 2021 15:40:54 +0100
Subject: [PATCH 0067/1748] Fix ICE in CHC when using gas in the function
 options

---
 Changelog.md                                             | 1 +
 libsolidity/formal/CHC.cpp                               | 4 ++--
 .../external_calls/external_call_with_gas_1.sol          | 9 +++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_with_gas_1.sol

diff --git a/Changelog.md b/Changelog.md
index c724693eeb..e17420b679 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -23,6 +23,7 @@ Bugfixes:
  * Commandline Interface: Report output selection options unsupported by the selected input mode instead of ignoring them.
  * Commandline Interface: When linking only accept exact matches for library names passed to the ``--libraries`` option. Library names not prefixed with a file name used to match any library with that name.
  * SMTChecker: Fix internal error in magic type access (``block``, ``msg``, ``tx``).
+ * SMTChecker: Fix internal error in the CHC engine when passing gas in the function options.
  * TypeChecker: Fix internal error when using user defined value types in public library functions.
  * TypeChecker: Fix internal error when using arrays and structs with user defined value types before declaration.
  * TypeChecker: Improved error message for constant variables with (nested) mapping types.
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index c0a92264e6..76a5ded998 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -791,8 +791,8 @@ void CHC::externalFunctionCall(FunctionCall const& _funCall)
 				valueIndex = i;
 				break;
 			}
-		solAssert(valueIndex, "");
-		state().addBalance(state().thisAddress(), 0 - expr(*callOptions->options().at(*valueIndex)));
+		if (valueIndex)
+			state().addBalance(state().thisAddress(), 0 - expr(*callOptions->options().at(*valueIndex)));
 	}
 
 	auto preCallState = vector<smtutil::Expression>{state().state()} + currentStateVariables();
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_gas_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_gas_1.sol
new file mode 100644
index 0000000000..86cbbe9b5a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_gas_1.sol
@@ -0,0 +1,9 @@
+library L {
+	function f() public view {
+		(bool success, ) = address(10).staticcall{gas: 3}("");
+		require(success);
+	}
+}
+// ====
+// SMTEngine: all
+// ----

From 45b87d41f7aabcde14ec87b96ccef61bf6622f4d Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 3 Nov 2021 16:38:36 +0100
Subject: [PATCH 0068/1748] Add missing changelog entry.

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index c724693eeb..f92e20c7e6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ Compiler Features:
  * SMTChecker: Report contract invariants and reentrancy properties. This can be enabled via the CLI option ``--model-checker-invariants`` or the Standard JSON option ``settings.modelChecker.invariants``.
  * Standard JSON: Accept nested brackets in step sequences passed to ``settings.optimizer.details.yulDetails.optimizerSteps``.
  * Standard JSON: Add ``settings.debug.debugInfo`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
+ * Yul EVM Code Transform: Switch to new optimized code transform when compiling via Yul with enabled optimizer.
  * Yul Optimizer: Take control-flow side-effects of user-defined functions into account in various optimizer steps.
 
 

From 0cbb297c7bf7a81b54ec7c429e65367a78e901d6 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 2 Nov 2021 11:07:52 +0100
Subject: [PATCH 0069/1748] Non-interactive mode for yulopti.

---
 test/tools/yulopti.cpp | 42 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 752aaafa6c..da5ae4871e 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -162,6 +162,36 @@ class YulOpti
 		}
 	}
 
+	int runSteps(string source, string steps)
+	{
+		if (!parse(source))
+			return 1;
+
+		set<YulString> reservedIdentifiers;
+		*m_ast = std::get<yul::Block>(Disambiguator(m_dialect, *m_analysisInfo)(*m_ast));
+		m_analysisInfo.reset();
+		m_nameDispenser = make_shared<NameDispenser>(m_dialect, *m_ast, reservedIdentifiers);
+
+		OptimiserStepContext context{
+			m_dialect,
+			*m_nameDispenser,
+			reservedIdentifiers,
+			solidity::frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
+		};
+
+		map<char, string> const& abbreviationMap = OptimiserSuite::stepAbbreviationToNameMap();
+		for (char stepAbbreviation: steps)
+			if (auto abbreviationAndName = util::valueOrNullptr(abbreviationMap, stepAbbreviation))
+				OptimiserSuite::allSteps().at(*abbreviationAndName)->run(context, *m_ast);
+			else
+			{
+				cerr << "Unknown optimizer step." << endl;
+				return 1;
+			}
+		cout << AsmPrinter{m_dialect}(*m_ast) << endl;
+		return 0;
+	}
+
 	void runInteractive(string source)
 	{
 		bool disambiguated = false;
@@ -256,6 +286,11 @@ Allowed options)",
 			po::value<string>(),
 			"input file"
 		)
+		(
+			"steps",
+			po::value<string>(),
+			"steps to execute non-interactively"
+		)
 		("help", "Show this help screen.");
 
 	// All positional options should be interpreted as input files
@@ -292,7 +327,12 @@ Allowed options)",
 	}
 
 	if (arguments.count("input-file"))
-		YulOpti{}.runInteractive(input);
+	{
+		if (arguments.count("steps"))
+			return YulOpti{}.runSteps(input, arguments["steps"].as<string>());
+		else
+			YulOpti{}.runInteractive(input);
+	}
 	else
 		cout << options;
 

From 95c973d6c2b12d39f1014d45f686c80d6aafb786 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 3 Nov 2021 12:12:37 +0100
Subject: [PATCH 0070/1748] Refactoring of optimiser suite and yulopti.

---
 libyul/optimiser/Suite.cpp |   7 +-
 libyul/optimiser/Suite.h   |  17 +-
 test/tools/yulopti.cpp     | 319 ++++++++++++++++++++-----------------
 3 files changed, 183 insertions(+), 160 deletions(-)

diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index bd81f7c0b4..32ea08dbe1 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -111,7 +111,10 @@ void OptimiserSuite::run(
 	)(*_object.code));
 	Block& ast = *_object.code;
 
-	OptimiserSuite suite(_dialect, reservedIdentifiers, Debug::None, ast, _expectedExecutionsPerDeployment);
+	NameDispenser dispenser{_dialect, ast, reservedIdentifiers};
+	OptimiserStepContext context{_dialect, dispenser, reservedIdentifiers, _expectedExecutionsPerDeployment};
+
+	OptimiserSuite suite(context, Debug::None);
 
 	// Some steps depend on properties ensured by FunctionHoister, BlockFlattener, FunctionGrouper and
 	// ForLoopInitRewriter. Run them first to be able to run arbitrary sequences safely.
@@ -162,7 +165,7 @@ void OptimiserSuite::run(
 			ast.statements.erase(ast.statements.begin());
 	}
 
-	suite.m_dispenser.reset(ast);
+	dispenser.reset(ast);
 	NameSimplifier::run(suite.m_context, ast);
 	VarNameCleaner::run(suite.m_context, ast);
 
diff --git a/libyul/optimiser/Suite.h b/libyul/optimiser/Suite.h
index 9b38ce542f..3c85fc559a 100644
--- a/libyul/optimiser/Suite.h
+++ b/libyul/optimiser/Suite.h
@@ -59,6 +59,8 @@ class OptimiserSuite
 		PrintStep,
 		PrintChanges
 	};
+	OptimiserSuite(OptimiserStepContext& _context, Debug _debug = Debug::None): m_context(_context), m_debug(_debug) {}
+
 	/// The value nullopt for `_expectedExecutionsPerDeployment` represents creation code.
 	static void run(
 		Dialect const& _dialect,
@@ -82,20 +84,7 @@ class OptimiserSuite
 	static std::map<char, std::string> const& stepAbbreviationToNameMap();
 
 private:
-	OptimiserSuite(
-		Dialect const& _dialect,
-		std::set<YulString> const& _externallyUsedIdentifiers,
-		Debug _debug,
-		Block& _ast,
-		std::optional<size_t> expectedExecutionsPerDeployment
-	):
-		m_dispenser{_dialect, _ast, _externallyUsedIdentifiers},
-		m_context{_dialect, m_dispenser, _externallyUsedIdentifiers, expectedExecutionsPerDeployment},
-		m_debug(_debug)
-	{}
-
-	NameDispenser m_dispenser;
-	OptimiserStepContext m_context;
+	OptimiserStepContext& m_context;
 	Debug m_debug;
 };
 
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index da5ae4871e..5c4f00f0a9 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -76,58 +76,66 @@ namespace po = boost::program_options;
 class YulOpti
 {
 public:
-	void printErrors()
+	static void printErrors(CharStream const& _charStream, ErrorList const& _errors)
 	{
 		SourceReferenceFormatter{
 			cerr,
-			SingletonCharStreamProvider(*m_charStream),
+			SingletonCharStreamProvider(_charStream),
 			true,
 			false
-		}.printErrorInformation(m_errors);
+		}.printErrorInformation(_errors);
 	}
 
-	bool parse(string const& _input)
+	void parse(string const& _input)
 	{
-		ErrorReporter errorReporter(m_errors);
-		m_charStream = make_shared<CharStream>(_input, "");
-		m_ast = yul::Parser(errorReporter, m_dialect).parse(*m_charStream);
-		if (!m_ast || !errorReporter.errors().empty())
+		ErrorList errors;
+		ErrorReporter errorReporter(errors);
+		CharStream _charStream(_input, "");
+		try
 		{
-			cerr << "Error parsing source." << endl;
-			printErrors();
-			return false;
+			m_ast = yul::Parser(errorReporter, m_dialect).parse(_charStream);
+			if (!m_ast || !errorReporter.errors().empty())
+			{
+				cerr << "Error parsing source." << endl;
+				printErrors(_charStream, errors);
+				throw std::runtime_error("Could not parse source.");
+			}
+			m_analysisInfo = make_unique<yul::AsmAnalysisInfo>();
+			AsmAnalyzer analyzer(
+				*m_analysisInfo,
+				errorReporter,
+				m_dialect
+			);
+			if (!analyzer.analyze(*m_ast) || !errorReporter.errors().empty())
+			{
+				cerr << "Error analyzing source." << endl;
+				printErrors(_charStream, errors);
+				throw std::runtime_error("Could not analyze source.");
+			}
 		}
-		m_analysisInfo = make_shared<yul::AsmAnalysisInfo>();
-		AsmAnalyzer analyzer(
-			*m_analysisInfo,
-			errorReporter,
-			m_dialect
-		);
-		if (!analyzer.analyze(*m_ast) || !errorReporter.errors().empty())
+		catch(...)
 		{
-			cerr << "Error analyzing source." << endl;
-			printErrors();
-			return false;
+			cerr << "Fatal error during parsing: " << endl;
+			printErrors(_charStream, errors);
+			throw;
 		}
-		return true;
 	}
 
 	void printUsageBanner(
-		map<char, string> const& _optimizationSteps,
 		map<char, string> const& _extraOptions,
 		size_t _columns
 	)
 	{
 		yulAssert(_columns > 0);
-
+		auto const& optimiserSteps = OptimiserSuite::stepAbbreviationToNameMap();
 		auto hasShorterString = [](auto const& a, auto const& b) { return a.second.size() < b.second.size(); };
 		size_t longestDescriptionLength = std::max(
-			max_element(_optimizationSteps.begin(), _optimizationSteps.end(), hasShorterString)->second.size(),
+			max_element(optimiserSteps.begin(), optimiserSteps.end(), hasShorterString)->second.size(),
 			max_element(_extraOptions.begin(), _extraOptions.end(), hasShorterString)->second.size()
 		);
 
 		vector<string> overlappingAbbreviations =
-			ranges::views::set_intersection(_extraOptions | ranges::views::keys, _optimizationSteps | ranges::views::keys) |
+			ranges::views::set_intersection(_extraOptions | ranges::views::keys, optimiserSteps | ranges::views::keys) |
 			ranges::views::transform([](char _abbreviation){ return string(1, _abbreviation); }) |
 			ranges::to<vector>();
 
@@ -141,7 +149,7 @@ class YulOpti
 		);
 
 		vector<tuple<char, string>> sortedOptions =
-			ranges::views::concat(_optimizationSteps, _extraOptions) |
+			ranges::views::concat(optimiserSteps, _extraOptions) |
 			ranges::to<vector<tuple<char, string>>>() |
 			ranges::actions::sort([](tuple<char, string> const& _a, tuple<char, string> const& _b) {
 				return (
@@ -162,54 +170,28 @@ class YulOpti
 		}
 	}
 
-	int runSteps(string source, string steps)
+	void disambiguate()
 	{
-		if (!parse(source))
-			return 1;
-
-		set<YulString> reservedIdentifiers;
 		*m_ast = std::get<yul::Block>(Disambiguator(m_dialect, *m_analysisInfo)(*m_ast));
 		m_analysisInfo.reset();
-		m_nameDispenser = make_shared<NameDispenser>(m_dialect, *m_ast, reservedIdentifiers);
-
-		OptimiserStepContext context{
-			m_dialect,
-			*m_nameDispenser,
-			reservedIdentifiers,
-			solidity::frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
-		};
-
-		map<char, string> const& abbreviationMap = OptimiserSuite::stepAbbreviationToNameMap();
-		for (char stepAbbreviation: steps)
-			if (auto abbreviationAndName = util::valueOrNullptr(abbreviationMap, stepAbbreviation))
-				OptimiserSuite::allSteps().at(*abbreviationAndName)->run(context, *m_ast);
-			else
-			{
-				cerr << "Unknown optimizer step." << endl;
-				return 1;
-			}
+		m_nameDispenser.reset(*m_ast);
+	}
+
+	void runSteps(string _source, string _steps)
+	{
+		parse(_source);
+		disambiguate();
+		OptimiserSuite{m_context}.runSequence(_steps, *m_ast);
 		cout << AsmPrinter{m_dialect}(*m_ast) << endl;
-		return 0;
 	}
 
-	void runInteractive(string source)
+	void runInteractive(string _source, bool _disambiguated = false)
 	{
-		bool disambiguated = false;
+		bool disambiguated = _disambiguated;
 		while (true)
 		{
-			cout << "----------------------" << endl;
-			cout << source << endl;
-			if (!parse(source))
-				return;
-			set<YulString> reservedIdentifiers;
-			if (!disambiguated)
-			{
-				*m_ast = std::get<yul::Block>(Disambiguator(m_dialect, *m_analysisInfo)(*m_ast));
-				m_analysisInfo.reset();
-				m_nameDispenser = make_shared<NameDispenser>(m_dialect, *m_ast, reservedIdentifiers);
-				disambiguated = true;
-			}
-			map<char, string> const& abbreviationMap = OptimiserSuite::stepAbbreviationToNameMap();
+			parse(_source);
+			disambiguated = disambiguated || (disambiguate(), true);
 			map<char, string> const& extraOptions = {
 				// QUIT starts with a non-letter character on purpose to get it to show up on top of the list
 				{'#', ">>> QUIT <<<"},
@@ -217,104 +199,159 @@ class YulOpti
 				{';', "StackCompressor"}
 			};
 
-			printUsageBanner(abbreviationMap, extraOptions, 4);
+			printUsageBanner(extraOptions, 4);
 			cout << "? ";
 			cout.flush();
-			// TODO: handle EOF properly.
 			char option = static_cast<char>(readStandardInputChar());
 			cout << ' ' << option << endl;
 
-			OptimiserStepContext context{
-				m_dialect,
-				*m_nameDispenser,
-				reservedIdentifiers,
-				solidity::frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
-			};
-
-			auto abbreviationAndName = abbreviationMap.find(option);
-			if (abbreviationAndName != abbreviationMap.end())
+			try
 			{
-				OptimiserStep const& step = *OptimiserSuite::allSteps().at(abbreviationAndName->second);
-				step.run(context, *m_ast);
+				switch (option)
+				{
+					case 4:
+					case '#':
+						return;
+					case ',':
+						VarNameCleaner::run(m_context, *m_ast);
+						// VarNameCleaner destroys the unique names guarantee of the disambiguator.
+						disambiguated = false;
+						break;
+					case ';':
+					{
+						Object obj;
+						obj.code = m_ast;
+						StackCompressor::run(m_dialect, obj, true, 16);
+						break;
+					}
+					default:
+						OptimiserSuite{m_context}.runSequence(
+							std::string_view(&option, 1),
+							*m_ast
+						);
+				}
+				_source = AsmPrinter{m_dialect}(*m_ast);
 			}
-			else switch (option)
-			{
-			case '#':
-				return;
-			case ',':
-				VarNameCleaner::run(context, *m_ast);
-				// VarNameCleaner destroys the unique names guarantee of the disambiguator.
-				disambiguated = false;
-				break;
-			case ';':
+			catch (...)
 			{
-				Object obj;
-				obj.code = m_ast;
-				StackCompressor::run(m_dialect, obj, true, 16);
-				break;
+				cerr << endl << "Exception during optimiser step:" << endl;
+				cerr << boost::current_exception_diagnostic_information() << endl;
 			}
-			default:
-				cerr << "Unknown option." << endl;
-			}
-			source = AsmPrinter{m_dialect}(*m_ast);
+			cout << "----------------------" << endl;
+			cout << _source << endl;
 		}
 	}
 
 private:
-	ErrorList m_errors;
-	shared_ptr<CharStream> m_charStream;
 	shared_ptr<yul::Block> m_ast;
 	Dialect const& m_dialect{EVMDialect::strictAssemblyForEVMObjects(EVMVersion{})};
-	shared_ptr<AsmAnalysisInfo> m_analysisInfo;
-	shared_ptr<NameDispenser> m_nameDispenser;
+	unique_ptr<AsmAnalysisInfo> m_analysisInfo;
+	set<YulString> const m_reservedIdentifiers = {};
+	NameDispenser m_nameDispenser{m_dialect, m_reservedIdentifiers};
+	OptimiserStepContext m_context{
+		m_dialect,
+		m_nameDispenser,
+		m_reservedIdentifiers,
+		solidity::frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
+	};
 };
 
 int main(int argc, char** argv)
 {
-	po::options_description options(
-		R"(yulopti, yul optimizer exploration tool.
-Usage: yulopti [Options] <file>
-Reads <file> as yul code and applies optimizer steps to it,
-interactively read from stdin.
-
-Allowed options)",
-		po::options_description::m_default_line_length,
-		po::options_description::m_default_line_length - 23);
-	options.add_options()
-		(
-			"input-file",
-			po::value<string>(),
-			"input file"
-		)
-		(
-			"steps",
-			po::value<string>(),
-			"steps to execute non-interactively"
-		)
-		("help", "Show this help screen.");
-
-	// All positional options should be interpreted as input files
-	po::positional_options_description filesPositions;
-	filesPositions.add("input-file", 1);
-
-	po::variables_map arguments;
 	try
 	{
+		bool nonInteractive = false;
+		po::options_description options(
+			R"(yulopti, yul optimizer exploration tool.
+	Usage: yulopti [Options] <file>
+	Reads <file> as yul code and applies optimizer steps to it,
+	interactively read from stdin.
+	In non-interactive mode a list of steps has to be provided.
+	If <file> is -, yul code is read from stdin and run non-interactively.
+
+	Allowed options)",
+			po::options_description::m_default_line_length,
+			po::options_description::m_default_line_length - 23);
+		options.add_options()
+			(
+				"input-file",
+				po::value<string>(),
+				"input file"
+			)
+			(
+				"steps",
+				po::value<string>(),
+				"steps to execute non-interactively"
+			)
+			(
+				"non-interactive,n",
+				po::bool_switch(&nonInteractive)->default_value(false),
+				"stop after executing the provided steps"
+			)
+			("help,h", "Show this help screen.");
+
+		// All positional options should be interpreted as input files
+		po::positional_options_description filesPositions;
+		filesPositions.add("input-file", 1);
+
+		po::variables_map arguments;
 		po::command_line_parser cmdLineParser(argc, argv);
 		cmdLineParser.options(options).positional(filesPositions);
 		po::store(cmdLineParser.run(), arguments);
+		po::notify(arguments);
+
+		if (arguments.count("help"))
+		{
+			cout << options;
+			return 0;
+		}
+
+		string input;
+		if (arguments.count("input-file"))
+		{
+			string filename = arguments["input-file"].as<string>();
+			if (filename == "-")
+			{
+				nonInteractive = true;
+				input = readUntilEnd(cin);
+			}
+			else
+				input = readFileAsString(arguments["input-file"].as<string>());
+		}
+		else
+		{
+			cout << options;
+			return 1;
+		}
+
+		if (nonInteractive && !arguments.count("steps"))
+		{
+			cout << options;
+			return 1;
+		}
+
+		YulOpti yulOpti;
+		bool disambiguated = false;
+		if (!nonInteractive)
+			cout << input << endl;
+		if (arguments.count("steps"))
+		{
+			string sequence = arguments["steps"].as<string>();
+			if (!nonInteractive)
+				cout << "----------------------" << endl;
+			yulOpti.runSteps(input, sequence);
+			disambiguated = true;
+		}
+		if (!nonInteractive)
+			yulOpti.runInteractive(input, disambiguated);
+
+		return 0;
 	}
 	catch (po::error const& _exception)
 	{
 		cerr << _exception.what() << endl;
 		return 1;
 	}
-
-	string input;
-	try
-	{
-		input = readFileAsString(arguments["input-file"].as<string>());
-	}
 	catch (FileNotFound const& _exception)
 	{
 		cerr << "File not found:" << _exception.comment() << endl;
@@ -325,16 +362,10 @@ Allowed options)",
 		cerr << "Not a regular file:" << _exception.comment() << endl;
 		return 1;
 	}
-
-	if (arguments.count("input-file"))
+	catch(...)
 	{
-		if (arguments.count("steps"))
-			return YulOpti{}.runSteps(input, arguments["steps"].as<string>());
-		else
-			YulOpti{}.runInteractive(input);
+		cerr << endl << "Exception:" << endl;
+		cerr << boost::current_exception_diagnostic_information() << endl;
+		return 1;
 	}
-	else
-		cout << options;
-
-	return 0;
 }

From b4a527039faa4517ab94a5fdb49be67b330c002d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20L=C3=B3pez?= <plafhz@outlook.com>
Date: Wed, 3 Nov 2021 20:21:31 -0300
Subject: [PATCH 0071/1748] fixed example address payable

---
 docs/types/value-types.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index c02eea8a9e..f849f3f7eb 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -241,7 +241,7 @@ and to send Ether (in units of wei) to a payable address using the ``transfer``
 .. code-block:: solidity
     :force:
 
-    address payable x = address(0x123);
+    address payable x = payable(0x123);
     address myAddress = address(this);
     if (x.balance < 10 && myAddress.balance >= 10) x.transfer(10);
 

From 8e87c176715ae559cb3dc135a411936638fb762a Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 4 Nov 2021 11:44:31 +0100
Subject: [PATCH 0072/1748] Remove old compatibility patch to soljson.js.

---
 Changelog.md                   | 4 ++++
 scripts/ci/build_emscripten.sh | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f92e20c7e6..b02bb80c30 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -31,6 +31,10 @@ Bugfixes:
  * Yul IR Generator: Do not output empty switches/if-bodies for empty contracts.
 
 
+Build System:
+ * Remove obsolete compatibility workaround for emscripten builds.
+
+
 Important Bugfixes in Experimental Features:
  * Yul IR Generator: Changes to function return variables referenced in modifier invocation arguments were not properly forwarded if there was more than one return variable.
 
diff --git a/scripts/ci/build_emscripten.sh b/scripts/ci/build_emscripten.sh
index f4b8d734df..7eac2486f8 100755
--- a/scripts/ci/build_emscripten.sh
+++ b/scripts/ci/build_emscripten.sh
@@ -68,10 +68,6 @@ emcmake cmake \
 	-DTESTS=0 \
   ..
 make soljson
-# Patch soljson.js for backwards compatibility.
-# TODO: remove this with 0.7.
-# "viiiii" encodes the signature of the callback function.
-sed -i -e 's/addFunction(func,sig){/addFunction(func,sig){sig=sig||"viiiii";/' libsolc/soljson.js
 
 cd ..
 mkdir -p upload

From a0dee79ad2ec1b0e943e0a2180984e1443cc5661 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 4 Nov 2021 11:53:45 +0100
Subject: [PATCH 0073/1748] Remove install_deps script.

---
 docs/installing-solidity.rst |  15 +-
 scripts/Dockerfile           |   3 +-
 scripts/install_deps.sh      | 400 -----------------------------------
 3 files changed, 3 insertions(+), 415 deletions(-)
 delete mode 100755 scripts/install_deps.sh

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index ea415f0219..dbfa7a4c58 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -411,24 +411,13 @@ in Visual Studio 2019 Build Tools or Visual Studio 2019:
 .. _Visual Studio 2019: https://www.visualstudio.com/vs/
 .. _Visual Studio 2019 Build Tools: https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2019
 
-Dependencies Helper Script
---------------------------
-
-We have a helper script which you can use to install all required external dependencies
-on macOS, Windows and on numerous Linux distros.
-
-.. code-block:: bash
-
-    ./scripts/install_deps.sh
-
-Or, on Windows:
+We have a helper script which you can use to install all required external dependencies:
 
 .. code-block:: bat
 
     scripts\install_deps.ps1
 
-Note that the latter command will install ``boost`` and ``cmake`` to the ``deps`` subdirectory, while the former command
-will attempt to install the dependencies globally.
+This will install ``boost`` and ``cmake`` to the ``deps`` subdirectory.
 
 Clone the Repository
 --------------------
diff --git a/scripts/Dockerfile b/scripts/Dockerfile
index 2b2de1e27d..3a1c6a5a7c 100644
--- a/scripts/Dockerfile
+++ b/scripts/Dockerfile
@@ -6,8 +6,7 @@ MAINTAINER chriseth <chris@ethereum.org>
 WORKDIR /solidity
 
 # Build dependencies
-ADD /scripts/install_deps.sh /solidity/scripts/install_deps.sh
-RUN ./scripts/install_deps.sh
+RUN apk update && apk add boost-dev boost-static build-base cmake git
 
 #Copy working directory on travis to the image
 COPY / $WORKDIR
diff --git a/scripts/install_deps.sh b/scripts/install_deps.sh
deleted file mode 100755
index 7540c8bdf9..0000000000
--- a/scripts/install_deps.sh
+++ /dev/null
@@ -1,400 +0,0 @@
-#!/usr/bin/env sh
-
-#------------------------------------------------------------------------------
-# Shell script for installing pre-requisite packages for solidity on a
-# variety of Linux and other UNIX-derived platforms.
-#
-# This is an "infrastucture-as-code" alternative to the manual build
-# instructions pages which we previously maintained at:
-# https://docs.soliditylang.org/en/latest/installing-solidity.html
-#
-# The aim of this script is to simplify things down to the following basic
-# flow for all supported operating systems:
-#
-# - git clone --recursive
-# - ./scripts/install_deps.sh
-# - cmake && make
-#
-# TODO - There is no support here yet for cross-builds in any form, only
-# native builds.  Expanding the functionality here to cover the mobile,
-# wearable and SBC platforms covered by doublethink and EthEmbedded would
-# also bring in support for Android, iOS, watchOS, tvOS, Tizen, Sailfish,
-# Maemo, MeeGo and Yocto.
-#
-# The documentation for solidity is hosted at:
-#
-# https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# 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/>
-#
-# (c) 2016 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-# Check for 'uname' and abort if it is not available.
-uname -v > /dev/null 2>&1 || { echo >&2 "ERROR - solidity requires 'uname' to identify the platform."; exit 1; }
-
-# See http://unix.stackexchange.com/questions/92199/how-can-i-reliably-get-the-operating-systems-name
-detect_linux_distro() {
-    if [ "$(command -v lsb_release)" ]; then
-        DISTRO=$(lsb_release -is)
-    elif [ -f /etc/os-release ]; then
-        # extract 'foo' from NAME=foo, only on the line with NAME=foo
-        DISTRO=$(sed -n -e 's/^NAME="\?\([^"]*\)"\?$/\1/p' /etc/os-release)
-    elif [ -f /etc/centos-release ]; then
-        DISTRO=CentOS
-    else
-        DISTRO=''
-    fi
-    echo "$DISTRO"
-}
-
-case $(uname -s) in
-
-#------------------------------------------------------------------------------
-# macOS
-#------------------------------------------------------------------------------
-
-    Darwin)
-        case $(sw_vers -productVersion | awk -F . '{print $1"."$2}') in
-            10.9)
-                echo "Installing solidity dependencies on OS X 10.9 Mavericks."
-                ;;
-            10.10)
-                echo "Installing solidity dependencies on OS X 10.10 Yosemite."
-                ;;
-            10.11)
-                echo "Installing solidity dependencies on OS X 10.11 El Capitan."
-                ;;
-            10.12)
-                echo "Installing solidity dependencies on macOS 10.12 Sierra."
-                ;;
-            10.13)
-                echo "Installing solidity dependencies on macOS 10.13 High Sierra."
-                ;;
-            10.14)
-                echo "Installing solidity dependencies on macOS 10.14 Mojave."
-                ;;
-            10.15)
-                echo "Installing solidity dependencies on macOS 10.15 Catalina."
-                ;;
-            11.0 | 11.1 | 11.2 | 11.3 | 11.4 | 11.5 | 11.6)
-                echo "Installing solidity dependencies on macOS 11.0 / 11.1 / 11.2 / 11.3 / 11.4 / 11.5 / 11.6 Big Sur."
-                ;;
-            *)
-                echo "Unsupported macOS version."
-                echo "We only support Mavericks, Yosemite, El Capitan, Sierra, High Sierra, Mojave, Catalina, and Big Sur."
-                exit 1
-                ;;
-        esac
-
-        # Check for Homebrew install and abort if it is not installed.
-        brew -v > /dev/null 2>&1 || { echo >&2 "ERROR - solidity requires a Homebrew install.  See https://brew.sh."; exit 1; }
-        brew update
-        brew install boost
-        brew install cmake
-        if [ "$CI" = true ]; then
-            brew upgrade cmake
-        else
-            brew upgrade
-        fi
-
-        ;;
-
-#------------------------------------------------------------------------------
-# FreeBSD
-#------------------------------------------------------------------------------
-
-    FreeBSD)
-        echo "Installing solidity dependencies on FreeBSD."
-        echo "ERROR - 'install_deps.sh' doesn't have FreeBSD support yet."
-        echo "Please let us know if you see this error message, and we can work out what is missing."
-        echo "Drop us a message at https://gitter.im/ethereum/solidity-dev."
-        exit 1
-        ;;
-
-#------------------------------------------------------------------------------
-# Linux
-#------------------------------------------------------------------------------
-
-    Linux)
-        case $(detect_linux_distro) in
-
-#------------------------------------------------------------------------------
-# Arch Linux
-#------------------------------------------------------------------------------
-
-            Arch*|ManjaroLinux)
-                #Arch
-                echo "Installing solidity dependencies on Arch Linux."
-
-                # All our dependencies can be found in the Arch Linux official repositories.
-                # See https://wiki.archlinux.org/index.php/Official_repositories
-                sudo pacman -Syu \
-                    base-devel \
-                    boost \
-                    cmake \
-                    git \
-                    cvc4
-                ;;
-
-#------------------------------------------------------------------------------
-# Alpine Linux
-#------------------------------------------------------------------------------
-
-            "Alpine Linux")
-                #Alpine
-                echo "Installing solidity dependencies on Alpine Linux."
-
-                # All our dependencies can be found in the Alpine Linux official repositories.
-                # See https://pkgs.alpinelinux.org/
-
-                apk update
-                apk add boost-dev boost-static build-base cmake git
-
-                ;;
-
-#------------------------------------------------------------------------------
-# Debian
-#------------------------------------------------------------------------------
-
-            Debian*|Raspbian)
-                #Debian
-                # shellcheck disable=SC1091
-                . /etc/os-release
-                install_z3=""
-                case $VERSION_ID in
-                    8)
-                        #jessie
-                        echo "Installing solidity dependencies on Debian Jesse (8.x)."
-                        ;;
-                    9)
-                        #stretch
-                        echo "Installing solidity dependencies on Debian Stretch (9.x)."
-                        install_z3="libz3-dev"
-                        ;;
-                    10)
-                        #buster
-                        echo "Installing solidity dependencies on Debian Buster (10.x)."
-                        install_z3="libz3-dev"
-                        ;;
-                    *)
-                        #other Debian
-                        echo "Installing solidity dependencies on unknown Debian version."
-                        echo "ERROR - This might not work, but we are trying anyway."
-                        echo "Drop us a message at https://gitter.im/ethereum/solidity-dev"
-                        install_z3="libz3-dev"
-                        ;;
-                esac
-
-                # Install "normal packages"
-                sudo apt-get -y update
-                sudo apt-get -y install \
-                    build-essential \
-                    cmake \
-                    g++ \
-                    gcc \
-                    git \
-                    libboost-all-dev \
-                    unzip \
-                    "$install_z3"
-
-
-                ;;
-
-#------------------------------------------------------------------------------
-# Fedora
-#------------------------------------------------------------------------------
-
-            Fedora)
-                #Fedora
-                echo "Installing solidity dependencies on Fedora."
-
-                # Install "normal packages"
-                # See https://fedoraproject.org/wiki/Package_management_system.
-                dnf install \
-                    autoconf \
-                    automake \
-                    boost-devel \
-                    boost-static \
-                    cmake \
-                    gcc \
-                    gcc-c++ \
-                    git \
-                    libtool
-
-                ;;
-
-#------------------------------------------------------------------------------
-# OpenSUSE
-#------------------------------------------------------------------------------
-
-            "openSUSE project")
-                #openSUSE
-                echo "Installing solidity dependencies on openSUSE."
-                echo "ERROR - 'install_deps.sh' doesn't have openSUSE support yet."
-                echo "See https://docs.soliditylang.org/en/latest/installing-solidity.html for manual instructions."
-                echo "If you would like to get 'install_deps.sh' working for openSUSE, that would be fantastic."
-                echo "See https://github.com/ethereum/webthree-umbrella/issues/552."
-                exit 1
-                ;;
-#------------------------------------------------------------------------------
-# Ubuntu
-#
-#------------------------------------------------------------------------------
-
-            Ubuntu|LinuxMint|Pop)
-                #LinuxMint is a distro on top of Ubuntu.
-                #Ubuntu
-                install_z3=""
-                case $(lsb_release -cs) in
-                    trusty|qiana|rebecca|rafaela|rosa)
-                        echo "Installing solidity dependencies on Ubuntu Trusty Tahr (14.04)."
-                        echo "Or, you may also be running Linux Mint Qiana / Rebecca / Rafaela / Rosa (base: Ubuntu Trusty Tahr (14.04).)"
-                        ;;
-                    xenial|sarah|serena|sonya|sylvia)
-                        echo "Installing solidity dependencies on Ubuntu Xenial Xerus (16.04)."
-                        echo "Or, you may also be running Linux Mint Sarah / Serena / Sonya / Sylvia (base: Ubuntu Xenial Xerus (16.04).)"
-                        install_z3="libz3-dev"
-                        ;;
-                    bionic)
-                        echo "Installing solidity dependencies."
-                        install_z3="libz3-dev"
-                        ;;
-                    focal)
-                        echo "Installing solidity dependencies."
-                        install_z3="libz3-dev"
-                        ;;
-                    hirsute)
-                        echo "Installing solidity dependencies."
-                        install_z3="libz3-dev"
-                        ;;
-                    betsy)
-                        #do not try anything for betsy.
-                        echo "Linux Mint Betsy is not supported at the moment as it runs off of Debian."
-                        echo "We only support Sylvia, Sonya, Serena, Sarah, Rosa, Rafaela, Rebecca, and Qiana."
-                        echo "See https://docs.soliditylang.org/en/latest/installing-solidity.html for manual instructions."
-                        echo "If you would like to get your distro working, that would be fantastic."
-                        echo "Drop us a message at https://gitter.im/ethereum/solidity-dev."
-                        exit 1
-                        ;;
-                    *)
-                        #other Ubuntu
-                        echo "ERROR - Unknown or unsupported Ubuntu version ($(lsb_release -cs))"
-                        echo "ERROR - This might not work, but we are trying anyway."
-                        echo "Please drop us a message at https://gitter.im/ethereum/solidity-dev."
-                        echo "We only support Trusty, Xenial, Bionic, Focal, and Hirsute."
-                        install_z3="libz3-dev"
-                        ;;
-                esac
-
-                sudo apt-get -y update
-                sudo apt-get -y install \
-                    build-essential \
-                    cmake \
-                    git \
-                    libboost-all-dev \
-                    "$install_z3"
-                if [ "$CI" = true ]; then
-                    # install Z3 from PPA if the distribution does not provide it
-                    if ! dpkg -l libz3-dev > /dev/null 2>&1
-                    then
-                        sudo apt-add-repository -y ppa:hvr/z3
-                        sudo apt-get -y update
-                        sudo apt-get -y install libz3-dev
-                    fi
-                fi
-                ;;
-
-#------------------------------------------------------------------------------
-# CentOS
-# CentOS needs some more testing. This is the general idea of packages
-# needed, but some tweaking/improvements can definitely happen
-#------------------------------------------------------------------------------
-            CentOS*)
-                echo "Attention: CentOS 7 is currently not supported!";
-                # FIXME: read -p and [[ ]] are bash features but our shebang says we're using sh
-                # shellcheck disable=SC2039
-                read -p "This script will heavily modify your system in order to allow for compilation of Solidity. Are you sure? [Y/N]" -n 1 -r
-                # shellcheck disable=SC2039
-                if [[ $REPLY =~ ^[Yy]$ ]]; then
-                    # Make Sure we have the EPEL repos
-                    sudo yum -y install epel-release
-                    # Get g++ 4.8
-                    sudo rpm --import http://linuxsoft.cern.ch/cern/slc6X/i386/RPM-GPG-KEY-cern
-                    wget -O /etc/yum.repos.d/slc6-devtoolset.repo http://linuxsoft.cern.ch/cern/devtoolset/slc6-devtoolset.repo
-                    sudo yum -y install devtoolset-2-gcc devtoolset-2-gcc-c++ devtoolset-2-binutils
-
-                    # Enable the devtoolset2 usage so global gcc/g++ become the 4.8 one.
-                    # As per https://gist.github.com/stephenturner/e3bc5cfacc2dc67eca8b, what you should do afterwards is
-                    # to add this line:
-                    # source /opt/rh/devtoolset-2/enable
-                    # to your bashrc so that this happens automatically at login
-                    scl enable devtoolset-2 bash
-
-                    # Get cmake
-                    sudo yum -y remove cmake
-                    sudo yum -y install cmake3
-                    sudo ln -s /usr/bin/cmake3 /usr/bin/cmake
-
-                    # Get latest boost thanks to this guy: http://vicendominguez.blogspot.de/2014/04/boost-c-library-rpm-packages-for-centos.html
-                    sudo yum -y remove boost-devel
-                    sudo wget https://bintray.com/vicendominguez/CentOS6/rpm -O /etc/yum.repos.d/bintray-vicendominguez-CentOS6.repo
-                    sudo yum install boost-devel
-                else
-                    echo "Aborted CentOS Solidity Dependency Installation";
-                    exit 1
-                fi
-
-                ;;
-
-
-
-
-            *)
-
-#------------------------------------------------------------------------------
-# Other (unknown) Linux
-# Major and medium distros which we are missing would include Mint, CentOS,
-# RHEL, Raspbian, Cygwin, OpenWrt, gNewSense, Trisquel and SteamOS.
-#------------------------------------------------------------------------------
-
-                #other Linux
-                echo "ERROR - Unsupported or unidentified Linux distro."
-                echo "See https://docs.soliditylang.org/en/latest/installing-solidity.html for manual instructions."
-                echo "If you would like to get your distro working, that would be fantastic."
-                echo "Drop us a message at https://gitter.im/ethereum/solidity-dev."
-                exit 1
-                ;;
-        esac
-        ;;
-
-#------------------------------------------------------------------------------
-# Other platform (not Linux, FreeBSD or macOS).
-# Not sure what might end up here?
-# Maybe OpenBSD, NetBSD, AIX, Solaris, HP-UX?
-#------------------------------------------------------------------------------
-
-    *)
-        #other
-        echo "ERROR - Unsupported or unidentified operating system."
-        echo "See https://docs.soliditylang.org/en/latest/installing-solidity.html for manual instructions."
-        echo "If you would like to get your operating system working, that would be fantastic."
-        echo "Drop us a message at https://gitter.im/ethereum/solidity-dev."
-        ;;
-esac

From 99aa18c4f3d033422394902789a50c076fbdbad6 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 2 Nov 2021 17:48:59 +0100
Subject: [PATCH 0074/1748] Refactor: Only return output.

---
 .../backends/evm/ControlFlowGraphBuilder.cpp  | 22 +++++++++----------
 libyul/backends/evm/ControlFlowGraphBuilder.h |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index 7e57b82571..66ee9fcd59 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -176,9 +176,9 @@ StackSlot ControlFlowGraphBuilder::operator()(Expression const& _expression)
 
 StackSlot ControlFlowGraphBuilder::operator()(FunctionCall const& _call)
 {
-	CFG::Operation const& operation = visitFunctionCall(_call);
-	yulAssert(operation.output.size() == 1, "");
-	return operation.output.front();
+	Stack const& output = visitFunctionCall(_call);
+	yulAssert(output.size() == 1, "");
+	return output.front();
 }
 
 void ControlFlowGraphBuilder::operator()(VariableDeclaration const& _varDecl)
@@ -219,8 +219,8 @@ void ControlFlowGraphBuilder::operator()(ExpressionStatement const& _exprStmt)
 	yulAssert(m_currentBlock, "");
 	std::visit(util::GenericVisitor{
 		[&](FunctionCall const& _call) {
-			CFG::Operation const& operation = visitFunctionCall(_call);
-			yulAssert(operation.output.empty(), "");
+			Stack const& output = visitFunctionCall(_call);
+			yulAssert(output.empty(), "");
 		},
 		[&](auto const&) { yulAssert(false, ""); }
 	}, _exprStmt.expression);
@@ -418,7 +418,7 @@ void ControlFlowGraphBuilder::operator()(FunctionDefinition const& _function)
 }
 
 
-CFG::Operation const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _call)
+Stack const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _call)
 {
 	yulAssert(m_scope, "");
 	yulAssert(m_currentBlock, "");
@@ -439,7 +439,7 @@ CFG::Operation const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall co
 			}) | ranges::to<Stack>,
 			// operation
 			move(builtinCall)
-		});
+		}).output;
 	}
 	else
 	{
@@ -456,7 +456,7 @@ CFG::Operation const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall co
 			}) | ranges::to<Stack>,
 			// operation
 			CFG::FunctionCall{_call.debugData, function, _call}
-		});
+		}).output;
 	}
 }
 
@@ -464,9 +464,9 @@ Stack ControlFlowGraphBuilder::visitAssignmentRightHandSide(Expression const& _e
 {
 	return std::visit(util::GenericVisitor{
 		[&](FunctionCall const& _call) -> Stack {
-			CFG::Operation const& operation = visitFunctionCall(_call);
-			yulAssert(_expectedSlotCount == operation.output.size(), "");
-			return operation.output;
+			Stack const& output = visitFunctionCall(_call);
+			yulAssert(_expectedSlotCount == output.size(), "");
+			return output;
 		},
 		[&](auto const& _identifierOrLiteral) -> Stack {
 			yulAssert(_expectedSlotCount == 1, "");
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.h b/libyul/backends/evm/ControlFlowGraphBuilder.h
index f99a879f6c..8a6ec07c58 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.h
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.h
@@ -57,7 +57,7 @@ class ControlFlowGraphBuilder
 		AsmAnalysisInfo const& _analysisInfo,
 		Dialect const& _dialect
 	);
-	CFG::Operation const& visitFunctionCall(FunctionCall const&);
+	Stack const& visitFunctionCall(FunctionCall const&);
 	Stack visitAssignmentRightHandSide(Expression const& _expression, size_t _expectedSlotCount);
 
 	Scope::Function const& lookupFunction(YulString _name) const;

From 929ed094ce5e8ab2561dcfe95a689007edd87c95 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 4 Nov 2021 13:38:21 +0100
Subject: [PATCH 0075/1748] Register functions earlier.

---
 .../backends/evm/ControlFlowGraphBuilder.cpp  | 32 ++++++++++++-------
 libyul/backends/evm/ControlFlowGraphBuilder.h |  1 +
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index 66ee9fcd59..df271bb8d8 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -239,6 +239,9 @@ void ControlFlowGraphBuilder::operator()(ExpressionStatement const& _exprStmt)
 void ControlFlowGraphBuilder::operator()(Block const& _block)
 {
 	ScopedSaveAndRestore saveScope(m_scope, m_info.scopes.at(&_block).get());
+	for (auto const& statement: _block.statements)
+		if (auto const* function = get_if<FunctionDefinition>(&statement))
+			registerFunction(*function);
 	for (auto const& statement: _block.statements)
 		std::visit(*this, statement);
 }
@@ -386,11 +389,26 @@ void ControlFlowGraphBuilder::operator()(FunctionDefinition const& _function)
 	Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_function.name));
 	m_graph.functions.emplace_back(&function);
 
+	CFG::FunctionInfo& functionInfo = m_graph.functionInfo.at(&function);
+
+	ControlFlowGraphBuilder builder{m_graph, m_info, m_dialect};
+	builder.m_currentFunction = &functionInfo;
+	builder.m_currentBlock = functionInfo.entry;
+	builder(_function.body);
+	builder.m_currentBlock->exit = CFG::BasicBlock::FunctionReturn{debugDataOf(_function), &functionInfo};
+}
+
+void ControlFlowGraphBuilder::registerFunction(FunctionDefinition const& _function)
+{
+	yulAssert(m_scope, "");
+	yulAssert(m_scope->identifiers.count(_function.name), "");
+	Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_function.name));
+
 	yulAssert(m_info.scopes.at(&_function.body), "");
 	Scope* virtualFunctionScope = m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()).get();
 	yulAssert(virtualFunctionScope, "");
 
-	auto&& [it, inserted] = m_graph.functionInfo.emplace(std::make_pair(&function, CFG::FunctionInfo{
+	bool inserted = m_graph.functionInfo.emplace(std::make_pair(&function, CFG::FunctionInfo{
 		_function.debugData,
 		function,
 		&m_graph.makeBlock(debugDataOf(_function.body)),
@@ -406,18 +424,10 @@ void ControlFlowGraphBuilder::operator()(FunctionDefinition const& _function)
 				_retVar.debugData
 			};
 		}) | ranges::to<vector>
-	}));
-	yulAssert(inserted, "");
-	CFG::FunctionInfo& functionInfo = it->second;
-
-	ControlFlowGraphBuilder builder{m_graph, m_info, m_dialect};
-	builder.m_currentFunction = &functionInfo;
-	builder.m_currentBlock = functionInfo.entry;
-	builder(_function.body);
-	builder.m_currentBlock->exit = CFG::BasicBlock::FunctionReturn{debugDataOf(_function), &functionInfo};
+	})).second;
+	yulAssert(inserted);
 }
 
-
 Stack const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _call)
 {
 	yulAssert(m_scope, "");
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.h b/libyul/backends/evm/ControlFlowGraphBuilder.h
index 8a6ec07c58..2a99cfe5ba 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.h
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.h
@@ -57,6 +57,7 @@ class ControlFlowGraphBuilder
 		AsmAnalysisInfo const& _analysisInfo,
 		Dialect const& _dialect
 	);
+	void registerFunction(FunctionDefinition const& _function);
 	Stack const& visitFunctionCall(FunctionCall const&);
 	Stack visitAssignmentRightHandSide(Expression const& _expression, size_t _expectedSlotCount);
 

From e7deedb7074ef8c68a49b30ef5e7503cf3eeca00 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 4 Nov 2021 11:17:28 +0100
Subject: [PATCH 0076/1748] Pass emscripten linker options only when linking.

---
 Changelog.md                    |  1 +
 cmake/EthCompilerSettings.cmake | 26 ++++++++++++++------------
 libsolc/CMakeLists.txt          |  2 +-
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b02bb80c30..80bd749c7e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -32,6 +32,7 @@ Bugfixes:
 
 
 Build System:
+ * Pass linker-only emscripten options only when linking.
  * Remove obsolete compatibility workaround for emscripten builds.
 
 
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 0695c56a31..25c32f8896 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -111,39 +111,41 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 			# http://stackoverflow.com/questions/21617158/how-to-silence-unused-command-line-argument-error-with-clang-without-disabling-i
 			add_compile_options(-Qunused-arguments)
 		elseif(EMSCRIPTEN)
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --memory-init-file 0")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} --memory-init-file 0")
 			# Leave only exported symbols as public and aggressively remove others
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fdata-sections -ffunction-sections -fvisibility=hidden")
 			# Optimisation level
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3")
 			# Re-enable exception catching (optimisations above -O1 disable it)
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s DISABLE_EXCEPTION_CATCHING=0")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s DISABLE_EXCEPTION_CATCHING=0")
 			# Remove any code related to exit (such as atexit)
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXIT_RUNTIME=0")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXIT_RUNTIME=0")
 			# Remove any code related to filesystem access
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s FILESYSTEM=0")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s FILESYSTEM=0")
 			# Allow memory growth, but disable some optimisations
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ALLOW_MEMORY_GROWTH=1")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ALLOW_MEMORY_GROWTH=1")
 			# Disable eval()
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s DYNAMIC_EXECUTION=0")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s DYNAMIC_EXECUTION=0")
 			# Disable greedy exception catcher
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s NODEJS_CATCH_EXIT=0")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s NODEJS_CATCH_EXIT=0")
 			# Abort if linking results in any undefined symbols
 			# Note: this is on by default in the CMake Emscripten module which we aren't using
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ERROR_ON_UNDEFINED_SYMBOLS=1")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ERROR_ON_UNDEFINED_SYMBOLS=1")
 			# Disallow deprecated emscripten build options.
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s STRICT=1")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s STRICT=1")
 			# Export the Emscripten-generated auxiliary methods which are needed by solc-js.
 			# Which methods of libsolc itself are exported is specified in libsolc/CMakeLists.txt.
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap','addFunction','removeFunction','UTF8ToString','lengthBytesUTF8','stringToUTF8','setValue']")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXTRA_EXPORTED_RUNTIME_METHODS=['cwrap','addFunction','removeFunction','UTF8ToString','lengthBytesUTF8','stringToUTF8','setValue']")
 			# Build for webassembly target.
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s WASM=1")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s WASM=1")
 			# Set webassembly build to synchronous loading.
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s WASM_ASYNC_COMPILATION=0")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s WASM_ASYNC_COMPILATION=0")
 			# Output a single js file with the wasm binary embedded as base64 string.
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s SINGLE_FILE=1")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s SINGLE_FILE=1")
 			# Allow new functions to be added to the wasm module via addFunction.
-			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s ALLOW_TABLE_GROWTH=1")
+			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ALLOW_TABLE_GROWTH=1")
 			# Disable warnings about not being pure asm.js due to memory growth.
 			set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-almost-asm")
 		endif()
diff --git a/libsolc/CMakeLists.txt b/libsolc/CMakeLists.txt
index 36dee4e249..776b97ca50 100644
--- a/libsolc/CMakeLists.txt
+++ b/libsolc/CMakeLists.txt
@@ -2,7 +2,7 @@ if (EMSCRIPTEN)
 	# Specify which functions to export in soljson.js.
 	# Note that additional Emscripten-generated methods needed by solc-js are
 	# defined to be exported in cmake/EthCompilerSettings.cmake.
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_solidity_license\",\"_solidity_version\",\"_solidity_compile\",\"_solidity_alloc\",\"_solidity_free\",\"_solidity_reset\"]'")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXPORTED_FUNCTIONS='[\"_solidity_license\",\"_solidity_version\",\"_solidity_compile\",\"_solidity_alloc\",\"_solidity_free\",\"_solidity_reset\"]'")
 	add_executable(soljson libsolc.cpp libsolc.h)
 	target_link_libraries(soljson PRIVATE solidity)
 else()

From dd8f12760b0ef6630a40d3a4d5eec6a3aadbe95f Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 4 Nov 2021 15:40:57 +0100
Subject: [PATCH 0077/1748] Introduce forEach for yul ast nodes.

---
 libyul/CMakeLists.txt                         |  2 -
 libyul/ControlFlowSideEffectsCollector.cpp    |  2 -
 libyul/optimiser/ASTWalker.h                  | 31 +++++++++++++
 libyul/optimiser/DataFlowAnalyzer.cpp         | 26 +++++------
 .../optimiser/FunctionDefinitionCollector.cpp | 36 ---------------
 .../optimiser/FunctionDefinitionCollector.h   | 44 -------------------
 libyul/optimiser/NameCollector.cpp            | 26 ++++++++---
 libyul/optimiser/NameCollector.h              | 22 ++++------
 libyul/optimiser/SSATransform.cpp             | 22 +++-------
 libyul/optimiser/StackLimitEvader.cpp         |  4 +-
 libyul/optimiser/StackToMemoryMover.cpp       |  4 +-
 11 files changed, 79 insertions(+), 140 deletions(-)
 delete mode 100644 libyul/optimiser/FunctionDefinitionCollector.cpp
 delete mode 100644 libyul/optimiser/FunctionDefinitionCollector.h

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 30b97b5f78..3c980fbb85 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -140,8 +140,6 @@ add_library(yul
 	optimiser/FullInliner.h
 	optimiser/FunctionCallFinder.cpp
 	optimiser/FunctionCallFinder.h
-	optimiser/FunctionDefinitionCollector.cpp
-	optimiser/FunctionDefinitionCollector.h
 	optimiser/FunctionGrouper.cpp
 	optimiser/FunctionGrouper.h
 	optimiser/FunctionHoister.cpp
diff --git a/libyul/ControlFlowSideEffectsCollector.cpp b/libyul/ControlFlowSideEffectsCollector.cpp
index f907f83f5b..bdcf70a783 100644
--- a/libyul/ControlFlowSideEffectsCollector.cpp
+++ b/libyul/ControlFlowSideEffectsCollector.cpp
@@ -18,8 +18,6 @@
 
 #include <libyul/ControlFlowSideEffectsCollector.h>
 
-#include <libyul/optimiser/FunctionDefinitionCollector.h>
-
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
 
diff --git a/libyul/optimiser/ASTWalker.h b/libyul/optimiser/ASTWalker.h
index 107658dfc1..cd98a90cad 100644
--- a/libyul/optimiser/ASTWalker.h
+++ b/libyul/optimiser/ASTWalker.h
@@ -102,4 +102,35 @@ class ASTModifier
 	}
 };
 
+namespace detail
+{
+template <
+	typename Node,
+	typename Visitor,
+	typename Base = std::conditional_t<std::is_const_v<Node>, ASTWalker, ASTModifier>
+>
+struct ForEach: Base
+{
+	template<typename Callable>
+	ForEach(Callable&& _visitor): visitor(std::forward<Callable>(_visitor)) {}
+
+	using Base::operator();
+	void operator()(Node& _node) override
+	{
+		visitor(_node);
+		Base::operator()(_node);
+	}
+
+	Visitor visitor;
+};
+}
+
+/// Helper function that traverses the AST and calls the visitor for each
+/// node of a specific type.
+template<typename Node, typename Entry, typename Visitor>
+void forEach(Entry&& _entry, Visitor&& _visitor)
+{
+	detail::ForEach<Node, std::decay_t<Visitor>>{std::forward<Visitor>(_visitor)}(std::forward<Entry>(_entry));
+}
+
 }
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index c6d9decaf6..af25cde592 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -45,9 +45,9 @@ DataFlowAnalyzer::DataFlowAnalyzer(
 	Dialect const& _dialect,
 	map<YulString, SideEffects> _functionSideEffects
 ):
-m_dialect(_dialect),
-m_functionSideEffects(std::move(_functionSideEffects)),
-m_knowledgeBase(_dialect, m_value)
+	m_dialect(_dialect),
+	m_functionSideEffects(std::move(_functionSideEffects)),
+	m_knowledgeBase(_dialect, m_value)
 {
 	if (auto const* builtin = _dialect.memoryStoreFunction(YulString{}))
 		m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
@@ -123,9 +123,7 @@ void DataFlowAnalyzer::operator()(If& _if)
 
 	joinKnowledge(storage, memory);
 
-	Assignments assignments;
-	assignments(_if.body);
-	clearValues(assignments.names());
+	clearValues(assignedVariableNames(_if.body));
 }
 
 void DataFlowAnalyzer::operator()(Switch& _switch)
@@ -140,11 +138,10 @@ void DataFlowAnalyzer::operator()(Switch& _switch)
 		(*this)(_case.body);
 		joinKnowledge(storage, memory);
 
-		Assignments assignments;
-		assignments(_case.body);
-		assignedVariables += assignments.names();
+		set<YulString> variables = assignedVariableNames(_case.body);
+		assignedVariables += variables;
 		// This is a little too destructive, we could retain the old values.
-		clearValues(assignments.names());
+		clearValues(variables);
 		clearKnowledgeIfInvalidated(_case.body);
 	}
 	for (auto& _case: _switch.cases)
@@ -190,10 +187,9 @@ void DataFlowAnalyzer::operator()(ForLoop& _for)
 	AssignmentsSinceContinue assignmentsSinceCont;
 	assignmentsSinceCont(_for.body);
 
-	Assignments assignments;
-	assignments(_for.body);
-	assignments(_for.post);
-	clearValues(assignments.names());
+	set<YulString> assignedVariables =
+		assignedVariableNames(_for.body) + assignedVariableNames(_for.post);
+	clearValues(assignedVariables);
 
 	// break/continue are tricky for storage and thus we almost always clear here.
 	clearKnowledgeIfInvalidated(*_for.condition);
@@ -205,7 +201,7 @@ void DataFlowAnalyzer::operator()(ForLoop& _for)
 	clearValues(assignmentsSinceCont.names());
 	clearKnowledgeIfInvalidated(_for.body);
 	(*this)(_for.post);
-	clearValues(assignments.names());
+	clearValues(assignedVariables);
 	clearKnowledgeIfInvalidated(*_for.condition);
 	clearKnowledgeIfInvalidated(_for.post);
 	clearKnowledgeIfInvalidated(_for.body);
diff --git a/libyul/optimiser/FunctionDefinitionCollector.cpp b/libyul/optimiser/FunctionDefinitionCollector.cpp
deleted file mode 100644
index dff57a32aa..0000000000
--- a/libyul/optimiser/FunctionDefinitionCollector.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-	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/>.
-*/
-
-#include <libyul/optimiser/FunctionDefinitionCollector.h>
-#include <libyul/AST.h>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-
-map<YulString, FunctionDefinition const*> FunctionDefinitionCollector::run(Block const& _block)
-{
-	FunctionDefinitionCollector functionDefinitionCollector;
-	functionDefinitionCollector(_block);
-	return functionDefinitionCollector.m_functionDefinitions;
-}
-
-void FunctionDefinitionCollector::operator()(FunctionDefinition const& _functionDefinition)
-{
-	m_functionDefinitions[_functionDefinition.name] = &_functionDefinition;
-	ASTWalker::operator()(_functionDefinition);
-}
diff --git a/libyul/optimiser/FunctionDefinitionCollector.h b/libyul/optimiser/FunctionDefinitionCollector.h
deleted file mode 100644
index c9828aced3..0000000000
--- a/libyul/optimiser/FunctionDefinitionCollector.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-	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/>.
-*/
-/**
- * AST walker that finds all function definitions and stores them into a map indexed by the function names.
- */
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-
-#include <map>
-
-namespace solidity::yul
-{
-
-/**
- * AST walker that finds all function definitions and stores them into a map indexed by the function names.
- *
- * Prerequisite: Disambiguator
- */
-class FunctionDefinitionCollector: ASTWalker
-{
-public:
-	static std::map<YulString, FunctionDefinition const*> run(Block const& _block);
-private:
-	using ASTWalker::operator();
-	void operator()(FunctionDefinition const& _functionDefinition) override;
-	std::map<YulString, FunctionDefinition const*> m_functionDefinitions;
-};
-
-}
diff --git a/libyul/optimiser/NameCollector.cpp b/libyul/optimiser/NameCollector.cpp
index 69e627fbb5..eca509f43c 100644
--- a/libyul/optimiser/NameCollector.cpp
+++ b/libyul/optimiser/NameCollector.cpp
@@ -78,13 +78,6 @@ map<YulString, size_t> ReferencesCounter::countReferences(Expression const& _exp
 	return counter.references();
 }
 
-void Assignments::operator()(Assignment const& _assignment)
-{
-	for (auto const& var: _assignment.variableNames)
-		m_names.emplace(var.name);
-}
-
-
 void AssignmentsSinceContinue::operator()(ForLoop const& _forLoop)
 {
 	m_forLoopDepth++;
@@ -109,3 +102,22 @@ void AssignmentsSinceContinue::operator()(FunctionDefinition const&)
 {
 	yulAssert(false, "");
 }
+
+std::set<YulString> solidity::yul::assignedVariableNames(Block const& _code)
+{
+	std::set<YulString> names;
+	forEach<Assignment const>(_code, [&](Assignment const& _assignment) {
+		for (auto const& var: _assignment.variableNames)
+			names.emplace(var.name);
+	});
+	return names;
+}
+
+map<YulString, FunctionDefinition const*> solidity::yul::allFunctionDefinitions(Block const& _block)
+{
+	std::map<YulString, FunctionDefinition const*> result;
+	forEach<FunctionDefinition const>(_block, [&](FunctionDefinition const& _function) {
+		result[_function.name] = &_function;
+	});
+	return result;
+}
diff --git a/libyul/optimiser/NameCollector.h b/libyul/optimiser/NameCollector.h
index 17afcec1b1..8c9dc14ff8 100644
--- a/libyul/optimiser/NameCollector.h
+++ b/libyul/optimiser/NameCollector.h
@@ -91,20 +91,6 @@ class ReferencesCounter: public ASTWalker
 	std::map<YulString, size_t> m_references;
 };
 
-/**
- * Specific AST walker that finds all variables that are assigned to.
- */
-class Assignments: public ASTWalker
-{
-public:
-	using ASTWalker::operator ();
-	void operator()(Assignment const& _assignment) override;
-
-	std::set<YulString> const& names() const { return m_names; }
-private:
-	std::set<YulString> m_names;
-};
-
 /**
  * Collects all names from a given continue statement on onwards.
  *
@@ -130,4 +116,12 @@ class AssignmentsSinceContinue: public ASTWalker
 	std::set<YulString> m_names;
 };
 
+/// @returns the names of all variables that are assigned to inside @a _code.
+/// (ignores variable declarations)
+std::set<YulString> assignedVariableNames(Block const& _code);
+
+/// @returns all function definitions anywhere in the AST.
+/// Requires disambiguated source.
+std::map<YulString, FunctionDefinition const*> allFunctionDefinitions(Block const& _block);
+
 }
diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp
index f0ce68c921..d86e6fbee1 100644
--- a/libyul/optimiser/SSATransform.cpp
+++ b/libyul/optimiser/SSATransform.cpp
@@ -196,12 +196,7 @@ void IntroduceControlFlowSSA::operator()(ForLoop& _for)
 {
 	yulAssert(_for.pre.statements.empty(), "For loop init rewriter not run.");
 
-	Assignments assignments;
-	assignments(_for.body);
-	assignments(_for.post);
-
-
-	for (auto const& var: assignments.names())
+	for (auto const& var: assignedVariableNames(_for.body) + assignedVariableNames(_for.post))
 		if (m_variablesInScope.count(var))
 			m_variablesToReassign.insert(var);
 
@@ -359,11 +354,7 @@ void PropagateValues::operator()(ForLoop& _for)
 {
 	yulAssert(_for.pre.statements.empty(), "For loop init rewriter not run.");
 
-	Assignments assignments;
-	assignments(_for.body);
-	assignments(_for.post);
-
-	for (auto const& var: assignments.names())
+	for (auto const& var: assignedVariableNames(_for.body) + assignedVariableNames(_for.post))
 		m_currentVariableValues.erase(var);
 
 	visit(*_for.condition);
@@ -389,11 +380,10 @@ void PropagateValues::operator()(Block& _block)
 void SSATransform::run(OptimiserStepContext& _context, Block& _ast)
 {
 	TypeInfo typeInfo(_context.dialect, _ast);
-	Assignments assignments;
-	assignments(_ast);
-	IntroduceSSA{_context.dispenser, assignments.names(), typeInfo}(_ast);
-	IntroduceControlFlowSSA{_context.dispenser, assignments.names(), typeInfo}(_ast);
-	PropagateValues{assignments.names()}(_ast);
+	set<YulString> assignedVariables = assignedVariableNames(_ast);
+	IntroduceSSA{_context.dispenser, assignedVariables, typeInfo}(_ast);
+	IntroduceControlFlowSSA{_context.dispenser, assignedVariables, typeInfo}(_ast);
+	PropagateValues{assignedVariables}(_ast);
 }
 
 
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index b77bd4f388..b4b9d5469a 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -18,8 +18,8 @@
 #include <libyul/optimiser/StackLimitEvader.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/optimiser/FunctionCallFinder.h>
-#include <libyul/optimiser/FunctionDefinitionCollector.h>
 #include <libyul/optimiser/NameDispenser.h>
+#include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/StackToMemoryMover.h>
 #include <libyul/backends/evm/ControlFlowGraphBuilder.h>
 #include <libyul/backends/evm/EVMDialect.h>
@@ -193,7 +193,7 @@ void StackLimitEvader::run(
 		if (_unreachableVariables.count(function))
 			return;
 
-	map<YulString, FunctionDefinition const*> functionDefinitions = FunctionDefinitionCollector::run(*_object.code);
+	map<YulString, FunctionDefinition const*> functionDefinitions = allFunctionDefinitions(*_object.code);
 
 	MemoryOffsetAllocator memoryOffsetAllocator{_unreachableVariables, callGraph.functionCalls, functionDefinitions};
 	uint64_t requiredSlots = memoryOffsetAllocator.run();
diff --git a/libyul/optimiser/StackToMemoryMover.cpp b/libyul/optimiser/StackToMemoryMover.cpp
index dcc5f45f6e..4256809236 100644
--- a/libyul/optimiser/StackToMemoryMover.cpp
+++ b/libyul/optimiser/StackToMemoryMover.cpp
@@ -15,7 +15,7 @@
 	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include <libyul/optimiser/StackToMemoryMover.h>
-#include <libyul/optimiser/FunctionDefinitionCollector.h>
+#include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
@@ -87,7 +87,7 @@ void StackToMemoryMover::run(
 		_context,
 		memoryOffsetTracker,
 		util::applyMap(
-			FunctionDefinitionCollector::run(_block),
+			allFunctionDefinitions(_block),
 			util::mapTuple([](YulString _name, FunctionDefinition const* _funDef) {
 				return make_pair(_name, _funDef->returnVariables);
 			}),

From 25c41546ee03f9567d67068dcc636c09367e9a32 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 3 Nov 2021 11:08:45 +0100
Subject: [PATCH 0078/1748] Function reference resolver.

---
 libyul/CMakeLists.txt                |  2 +
 libyul/FunctionReferenceResolver.cpp | 60 ++++++++++++++++++++++++++++
 libyul/FunctionReferenceResolver.h   | 48 ++++++++++++++++++++++
 3 files changed, 110 insertions(+)
 create mode 100644 libyul/FunctionReferenceResolver.cpp
 create mode 100644 libyul/FunctionReferenceResolver.h

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 3c980fbb85..039e24ea91 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -40,6 +40,8 @@ add_library(yul
 	Dialect.cpp
 	Dialect.h
 	Exceptions.h
+	FunctionReferenceResolver.cpp
+	FunctionReferenceResolver.h
 	Object.cpp
 	Object.h
 	ObjectParser.cpp
diff --git a/libyul/FunctionReferenceResolver.cpp b/libyul/FunctionReferenceResolver.cpp
new file mode 100644
index 0000000000..5df94237a3
--- /dev/null
+++ b/libyul/FunctionReferenceResolver.cpp
@@ -0,0 +1,60 @@
+/*
+	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 <libyul/FunctionReferenceResolver.h>
+
+#include <libyul/AST.h>
+#include <libsolutil/CommonData.h>
+
+#include <range/v3/view/reverse.hpp>
+
+using namespace std;
+using namespace solidity::yul;
+using namespace solidity::util;
+
+FunctionReferenceResolver::FunctionReferenceResolver(Block const& _ast)
+{
+	(*this)(_ast);
+	yulAssert(m_scopes.empty());
+}
+
+void FunctionReferenceResolver::operator()(FunctionCall const& _functionCall)
+{
+	for (auto&& scope: m_scopes | ranges::views::reverse)
+		if (FunctionDefinition const** function = util::valueOrNullptr(scope, _functionCall.functionName.name))
+		{
+			m_functionReferences[&_functionCall] = *function;
+			break;
+		}
+
+	// If we did not find anything, it was a builtin call.
+
+	ASTWalker::operator()(_functionCall);
+}
+
+void FunctionReferenceResolver::operator()(Block const& _block)
+{
+	m_scopes.emplace_back();
+	for (auto const& statement: _block.statements)
+		if (auto const* function = get_if<FunctionDefinition>(&statement))
+			m_scopes.back()[function->name] = function;
+
+	ASTWalker::operator()(_block);
+
+	m_scopes.pop_back();
+}
diff --git a/libyul/FunctionReferenceResolver.h b/libyul/FunctionReferenceResolver.h
new file mode 100644
index 0000000000..8c1385adb6
--- /dev/null
+++ b/libyul/FunctionReferenceResolver.h
@@ -0,0 +1,48 @@
+/*
+	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
+
+#pragma once
+
+#include <libyul/optimiser/ASTWalker.h>
+
+namespace solidity::yul
+{
+
+/**
+ * Resolves references to user-defined functions in function calls.
+ * Assumes the code is correct, i.e. does not check for references to be valid or unique.
+ *
+ * Be careful not to iterate over the result - it is not deterministic.
+ */
+class FunctionReferenceResolver: private ASTWalker
+{
+public:
+	explicit FunctionReferenceResolver(Block const& _ast);
+	std::map<FunctionCall const*, FunctionDefinition const*> const& references() const { return m_functionReferences; }
+
+private:
+	using ASTWalker::operator();
+	void operator()(FunctionCall const& _functionCall) override;
+	void operator()(Block const& _block) override;
+
+	std::map<FunctionCall const*, FunctionDefinition const*> m_functionReferences;
+	std::vector<std::map<YulString, FunctionDefinition const*>> m_scopes;
+};
+
+
+}

From 776ae466bcadda76fdffd976faa835f39995305a Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 3 Nov 2021 15:00:37 +0100
Subject: [PATCH 0079/1748] Control flow side effects on non-disambiguated
 source.

---
 libyul/ControlFlowSideEffectsCollector.cpp    | 108 ++++++++++--------
 libyul/ControlFlowSideEffectsCollector.h      |  39 ++++---
 libyul/optimiser/ConditionalSimplifier.cpp    |   6 +-
 libyul/optimiser/ConditionalSimplifier.h      |   6 +-
 libyul/optimiser/ConditionalUnsimplifier.cpp  |   6 +-
 libyul/optimiser/DeadCodeEliminator.cpp       |   2 +-
 libyul/optimiser/DeadCodeEliminator.h         |   8 +-
 test/libyul/ControlFlowSideEffectsTest.cpp    |  21 ++--
 .../nondisambiguated.yul                      |  19 +++
 9 files changed, 128 insertions(+), 87 deletions(-)
 create mode 100644 test/libyul/controlFlowSideEffects/nondisambiguated.yul

diff --git a/libyul/ControlFlowSideEffectsCollector.cpp b/libyul/ControlFlowSideEffectsCollector.cpp
index bdcf70a783..6e96712a08 100644
--- a/libyul/ControlFlowSideEffectsCollector.cpp
+++ b/libyul/ControlFlowSideEffectsCollector.cpp
@@ -20,6 +20,7 @@
 
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
+#include <libyul/FunctionReferenceResolver.h>
 
 #include <libsolutil/Common.h>
 #include <libsolutil/CommonData.h>
@@ -35,16 +36,15 @@ using namespace solidity::yul;
 
 ControlFlowBuilder::ControlFlowBuilder(Block const& _ast)
 {
-	for (auto const& statement: _ast.statements)
-		if (auto const* function = get_if<FunctionDefinition>(&statement))
-			(*this)(*function);
+	m_currentNode = newNode();
+	(*this)(_ast);
 }
 
 void ControlFlowBuilder::operator()(FunctionCall const& _functionCall)
 {
 	walkVector(_functionCall.arguments | ranges::views::reverse);
 	newConnectedNode();
-	m_currentNode->functionCall = _functionCall.functionName.name;
+	m_currentNode->functionCall = &_functionCall;
 }
 
 void ControlFlowBuilder::operator()(If const& _if)
@@ -78,7 +78,9 @@ void ControlFlowBuilder::operator()(Switch const& _switch)
 void ControlFlowBuilder::operator()(FunctionDefinition const& _function)
 {
 	ScopedSaveAndRestore currentNode(m_currentNode, nullptr);
-	yulAssert(!m_leave && !m_break && !m_continue, "Function hoister has not been used.");
+	ScopedSaveAndRestore leave(m_leave, nullptr);
+	ScopedSaveAndRestore _break(m_break, nullptr);
+	ScopedSaveAndRestore _continue(m_continue, nullptr);
 
 	FunctionFlow flow;
 	flow.exit = newNode();
@@ -90,7 +92,7 @@ void ControlFlowBuilder::operator()(FunctionDefinition const& _function)
 
 	m_currentNode->successors.emplace_back(flow.exit);
 
-	m_functionFlows[_function.name] = move(flow);
+	m_functionFlows[&_function] = move(flow);
 
 	m_leave = nullptr;
 }
@@ -164,14 +166,17 @@ ControlFlowSideEffectsCollector::ControlFlowSideEffectsCollector(
 	Block const& _ast
 ):
 	m_dialect(_dialect),
-	m_cfgBuilder(_ast)
+	m_cfgBuilder(_ast),
+	m_functionReferences(FunctionReferenceResolver{_ast}.references())
 {
-	for (auto&& [name, flow]: m_cfgBuilder.functionFlows())
+	for (auto&& [function, flow]: m_cfgBuilder.functionFlows())
 	{
 		yulAssert(!flow.entry->functionCall);
-		m_processedNodes[name] = {};
-		m_pendingNodes[name].push_front(flow.entry);
-		m_functionSideEffects[name] = {false, false, false};
+		yulAssert(function);
+		m_processedNodes[function] = {};
+		m_pendingNodes[function].push_front(flow.entry);
+		m_functionSideEffects[function] = {false, false, false};
+		m_functionCalls[function] = {};
 	}
 
 	// Process functions while we have progress. For now, we are only interested
@@ -180,8 +185,8 @@ ControlFlowSideEffectsCollector::ControlFlowSideEffectsCollector(
 	while (progress)
 	{
 		progress = false;
-		for (auto const& functionName: m_pendingNodes | ranges::views::keys)
-			if (processFunction(functionName))
+		for (FunctionDefinition const* function: m_pendingNodes | ranges::views::keys)
+			if (processFunction(*function))
 				progress = true;
 	}
 
@@ -190,57 +195,64 @@ ControlFlowSideEffectsCollector::ControlFlowSideEffectsCollector(
 	// If we have not set `canContinue` by now, the function's exit
 	// is not reachable.
 
-	for (auto&& [functionName, calls]: m_functionCalls)
+	// Now it is sufficient to handle the reachable function calls (`m_functionCalls`),
+	// we do not have to consider the control-flow graph anymore.
+	for (auto&& [function, calls]: m_functionCalls)
 	{
-		ControlFlowSideEffects& sideEffects = m_functionSideEffects[functionName];
-		auto _visit = [&, visited = std::set<YulString>{}](YulString _function, auto&& _recurse) mutable {
-			if (sideEffects.canTerminate && sideEffects.canRevert)
+		yulAssert(function);
+		ControlFlowSideEffects& functionSideEffects = m_functionSideEffects[function];
+		auto _visit = [&, visited = std::set<FunctionDefinition const*>{}](FunctionDefinition const& _function, auto&& _recurse) mutable {
+			// Worst side-effects already, stop searching.
+			if (functionSideEffects.canTerminate && functionSideEffects.canRevert)
 				return;
-			if (!visited.insert(_function).second)
+			if (!visited.insert(&_function).second)
 				return;
 
-			ControlFlowSideEffects const* calledSideEffects = nullptr;
-			if (BuiltinFunction const* f = _dialect.builtin(_function))
-				calledSideEffects = &f->controlFlowSideEffects;
-			else
-				calledSideEffects = &m_functionSideEffects.at(_function);
-
-			if (calledSideEffects->canTerminate)
-				sideEffects.canTerminate = true;
-			if (calledSideEffects->canRevert)
-				sideEffects.canRevert = true;
-
-			set<YulString> emptySet;
-			for (YulString callee: util::valueOrDefault(m_functionCalls, _function, emptySet))
-				_recurse(callee, _recurse);
+			for (FunctionCall const* call: m_functionCalls.at(&_function))
+			{
+				ControlFlowSideEffects const& calledSideEffects = sideEffects(*call);
+				if (calledSideEffects.canTerminate)
+					functionSideEffects.canTerminate = true;
+				if (calledSideEffects.canRevert)
+					functionSideEffects.canRevert = true;
+
+				if (m_functionReferences.count(call))
+					_recurse(*m_functionReferences.at(call), _recurse);
+			}
 		};
-		for (auto const& call: calls)
-			_visit(call, _visit);
+		_visit(*function, _visit);
 	}
+}
 
+map<YulString, ControlFlowSideEffects> ControlFlowSideEffectsCollector::functionSideEffectsNamed() const
+{
+	map<YulString, ControlFlowSideEffects> result;
+	for (auto&& [function, sideEffects]: m_functionSideEffects)
+		yulAssert(result.insert({function->name, sideEffects}).second);
+	return result;
 }
 
-bool ControlFlowSideEffectsCollector::processFunction(YulString _name)
+bool ControlFlowSideEffectsCollector::processFunction(FunctionDefinition const& _function)
 {
 	bool progress = false;
-	while (ControlFlowNode const* node = nextProcessableNode(_name))
+	while (ControlFlowNode const* node = nextProcessableNode(_function))
 	{
-		if (node == m_cfgBuilder.functionFlows().at(_name).exit)
+		if (node == m_cfgBuilder.functionFlows().at(&_function).exit)
 		{
-			m_functionSideEffects[_name].canContinue = true;
+			m_functionSideEffects[&_function].canContinue = true;
 			return true;
 		}
 		for (ControlFlowNode const* s: node->successors)
-			recordReachabilityAndQueue(_name, s);
+			recordReachabilityAndQueue(_function, s);
 
 		progress = true;
 	}
 	return progress;
 }
 
-ControlFlowNode const* ControlFlowSideEffectsCollector::nextProcessableNode(YulString _functionName)
+ControlFlowNode const* ControlFlowSideEffectsCollector::nextProcessableNode(FunctionDefinition const& _function)
 {
-	std::list<ControlFlowNode const*>& nodes = m_pendingNodes[_functionName];
+	std::list<ControlFlowNode const*>& nodes = m_pendingNodes[&_function];
 	auto it = ranges::find_if(nodes, [this](ControlFlowNode const* _node) {
 		return !_node->functionCall || sideEffects(*_node->functionCall).canContinue;
 	});
@@ -252,22 +264,22 @@ ControlFlowNode const* ControlFlowSideEffectsCollector::nextProcessableNode(YulS
 	return node;
 }
 
-ControlFlowSideEffects const& ControlFlowSideEffectsCollector::sideEffects(YulString _functionName) const
+ControlFlowSideEffects const& ControlFlowSideEffectsCollector::sideEffects(FunctionCall const& _call) const
 {
-	if (auto const* builtin = m_dialect.builtin(_functionName))
+	if (auto const* builtin = m_dialect.builtin(_call.functionName.name))
 		return builtin->controlFlowSideEffects;
 	else
-		return m_functionSideEffects.at(_functionName);
+		return m_functionSideEffects.at(m_functionReferences.at(&_call));
 }
 
 void ControlFlowSideEffectsCollector::recordReachabilityAndQueue(
-	YulString _functionName,
+	FunctionDefinition const& _function,
 	ControlFlowNode const* _node
 )
 {
 	if (_node->functionCall)
-		m_functionCalls[_functionName].insert(*_node->functionCall);
-	if (m_processedNodes[_functionName].insert(_node).second)
-		m_pendingNodes.at(_functionName).push_front(_node);
+		m_functionCalls[&_function].insert(_node->functionCall);
+	if (m_processedNodes[&_function].insert(_node).second)
+		m_pendingNodes.at(&_function).push_front(_node);
 }
 
diff --git a/libyul/ControlFlowSideEffectsCollector.h b/libyul/ControlFlowSideEffectsCollector.h
index f130294bae..a4ab2bfae7 100644
--- a/libyul/ControlFlowSideEffectsCollector.h
+++ b/libyul/ControlFlowSideEffectsCollector.h
@@ -34,8 +34,8 @@ struct Dialect;
 struct ControlFlowNode
 {
 	std::vector<ControlFlowNode const*> successors;
-	/// Name of the called function if the node calls a function.
-	std::optional<YulString> functionCall;
+	/// Function call AST node, if present.
+	FunctionCall const* functionCall = nullptr;
 };
 
 /**
@@ -56,7 +56,7 @@ class ControlFlowBuilder: private ASTWalker
 	/// Computes the control-flows of all function defined in the block.
 	/// Assumes the functions are hoisted to the topmost block.
 	explicit ControlFlowBuilder(Block const& _ast);
-	std::map<YulString, FunctionFlow> const& functionFlows() const { return m_functionFlows; }
+	std::map<FunctionDefinition const*, FunctionFlow> const& functionFlows() const { return m_functionFlows; }
 
 private:
 	using ASTWalker::operator();
@@ -79,12 +79,14 @@ class ControlFlowBuilder: private ASTWalker
 	ControlFlowNode const* m_break = nullptr;
 	ControlFlowNode const* m_continue = nullptr;
 
-	std::map<YulString, FunctionFlow> m_functionFlows;
+	std::map<FunctionDefinition const*, FunctionFlow> m_functionFlows;
 };
 
 
 /**
- * Requires: Disambiguator, Function Hoister.
+ * Computes control-flow side-effects for user-defined functions.
+ * Source does not have to be disambiguated, unless you want the side-effects
+ * based on function names.
  */
 class ControlFlowSideEffectsCollector
 {
@@ -94,36 +96,43 @@ class ControlFlowSideEffectsCollector
 		Block const& _ast
 	);
 
-	std::map<YulString, ControlFlowSideEffects> const& functionSideEffects() const
+	std::map<FunctionDefinition const*, ControlFlowSideEffects> const& functionSideEffects() const
 	{
 		return m_functionSideEffects;
 	}
+	/// Returns the side effects by function name, requires unique function names.
+	std::map<YulString, ControlFlowSideEffects> functionSideEffectsNamed() const;
 private:
 
 	/// @returns false if nothing could be processed.
-	bool processFunction(YulString _name);
+	bool processFunction(FunctionDefinition const& _function);
 
 	/// @returns the next pending node of the function that is not
 	/// a function call to a function that might not continue.
 	/// De-queues the node or returns nullptr if no such node is found.
-	ControlFlowNode const* nextProcessableNode(YulString _functionName);
+	ControlFlowNode const* nextProcessableNode(FunctionDefinition const& _function);
 
 	/// @returns the side-effects of either a builtin call or a user defined function
 	/// call (as far as already computed).
-	ControlFlowSideEffects const& sideEffects(YulString _functionName) const;
+	ControlFlowSideEffects const& sideEffects(FunctionCall const& _call) const;
 
 	/// Queues the given node to be processed (if not already visited)
 	/// and if it is a function call, records that `_functionName` calls
 	/// `*_node->functionCall`.
-	void recordReachabilityAndQueue(YulString _functionName, ControlFlowNode const* _node);
+	void recordReachabilityAndQueue(FunctionDefinition const& _function, ControlFlowNode const* _node);
 
 	Dialect const& m_dialect;
 	ControlFlowBuilder m_cfgBuilder;
-	std::map<YulString, ControlFlowSideEffects> m_functionSideEffects;
-	std::map<YulString, std::list<ControlFlowNode const*>> m_pendingNodes;
-	std::map<YulString, std::set<ControlFlowNode const*>> m_processedNodes;
-	/// `x` is in `m_functionCalls[y]` if a direct call to `x` is reachable inside `y`
-	std::map<YulString, std::set<YulString>> m_functionCalls;
+	/// Function references, but only for calls to user-defined functions.
+	std::map<FunctionCall const*, FunctionDefinition const*> m_functionReferences;
+	/// Side effects of user-defined functions, is being constructod.
+	std::map<FunctionDefinition const*, ControlFlowSideEffects> m_functionSideEffects;
+	/// Control flow nodes still to process, per function.
+	std::map<FunctionDefinition const*, std::list<ControlFlowNode const*>> m_pendingNodes;
+	/// Control flow nodes already processed, per function.
+	std::map<FunctionDefinition const*, std::set<ControlFlowNode const*>> m_processedNodes;
+	/// Set of reachable function calls nodes in each function (including calls to builtins).
+	std::map<FunctionDefinition const*, std::set<FunctionCall const*>> m_functionCalls;
 };
 
 
diff --git a/libyul/optimiser/ConditionalSimplifier.cpp b/libyul/optimiser/ConditionalSimplifier.cpp
index 3a2e8aa4e4..62d36520a2 100644
--- a/libyul/optimiser/ConditionalSimplifier.cpp
+++ b/libyul/optimiser/ConditionalSimplifier.cpp
@@ -29,8 +29,10 @@ using namespace solidity::util;
 
 void ConditionalSimplifier::run(OptimiserStepContext& _context, Block& _ast)
 {
-	ControlFlowSideEffectsCollector sideEffects(_context.dialect, _ast);
-	ConditionalSimplifier{_context.dialect, sideEffects.functionSideEffects()}(_ast);
+	ConditionalSimplifier{
+		_context.dialect,
+		ControlFlowSideEffectsCollector{_context.dialect, _ast}.functionSideEffectsNamed()
+	}(_ast);
 }
 
 void ConditionalSimplifier::operator()(Switch& _switch)
diff --git a/libyul/optimiser/ConditionalSimplifier.h b/libyul/optimiser/ConditionalSimplifier.h
index 57a6696c4b..5df56476a3 100644
--- a/libyul/optimiser/ConditionalSimplifier.h
+++ b/libyul/optimiser/ConditionalSimplifier.h
@@ -62,12 +62,12 @@ class ConditionalSimplifier: public ASTModifier
 private:
 	explicit ConditionalSimplifier(
 		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> const& _sideEffects
+		std::map<YulString, ControlFlowSideEffects> _sideEffects
 	):
-		m_dialect(_dialect), m_functionSideEffects(_sideEffects)
+		m_dialect(_dialect), m_functionSideEffects(move(_sideEffects))
 	{}
 	Dialect const& m_dialect;
-	std::map<YulString, ControlFlowSideEffects> const& m_functionSideEffects;
+	std::map<YulString, ControlFlowSideEffects> m_functionSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/ConditionalUnsimplifier.cpp b/libyul/optimiser/ConditionalUnsimplifier.cpp
index 752e06918b..ef640ed7c9 100644
--- a/libyul/optimiser/ConditionalUnsimplifier.cpp
+++ b/libyul/optimiser/ConditionalUnsimplifier.cpp
@@ -30,8 +30,10 @@ using namespace solidity::util;
 
 void ConditionalUnsimplifier::run(OptimiserStepContext& _context, Block& _ast)
 {
-	ControlFlowSideEffectsCollector sideEffects(_context.dialect, _ast);
-	ConditionalUnsimplifier{_context.dialect, sideEffects.functionSideEffects()}(_ast);
+	ConditionalUnsimplifier{
+		_context.dialect,
+		ControlFlowSideEffectsCollector{_context.dialect, _ast}.functionSideEffectsNamed()
+	}(_ast);
 }
 
 void ConditionalUnsimplifier::operator()(Switch& _switch)
diff --git a/libyul/optimiser/DeadCodeEliminator.cpp b/libyul/optimiser/DeadCodeEliminator.cpp
index ad127a9108..af84546843 100644
--- a/libyul/optimiser/DeadCodeEliminator.cpp
+++ b/libyul/optimiser/DeadCodeEliminator.cpp
@@ -40,7 +40,7 @@ void DeadCodeEliminator::run(OptimiserStepContext& _context, Block& _ast)
 	ControlFlowSideEffectsCollector sideEffects(_context.dialect, _ast);
 	DeadCodeEliminator{
 		_context.dialect,
-		sideEffects.functionSideEffects()
+		sideEffects.functionSideEffectsNamed()
 	}(_ast);
 }
 
diff --git a/libyul/optimiser/DeadCodeEliminator.h b/libyul/optimiser/DeadCodeEliminator.h
index 98202fc943..2c166a8361 100644
--- a/libyul/optimiser/DeadCodeEliminator.h
+++ b/libyul/optimiser/DeadCodeEliminator.h
@@ -23,6 +23,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/YulString.h>
+#include <libyul/ControlFlowSideEffects.h>
 
 #include <map>
 #include <set>
@@ -31,7 +32,6 @@ namespace solidity::yul
 {
 struct Dialect;
 struct OptimiserStepContext;
-struct ControlFlowSideEffects;
 
 /**
  * Optimisation stage that removes unreachable code
@@ -62,11 +62,11 @@ class DeadCodeEliminator: public ASTModifier
 private:
 	DeadCodeEliminator(
 		Dialect const& _dialect,
-		std::map<YulString, ControlFlowSideEffects> const& _sideEffects
-	): m_dialect(_dialect), m_functionSideEffects(_sideEffects) {}
+		std::map<YulString, ControlFlowSideEffects> _sideEffects
+	): m_dialect(_dialect), m_functionSideEffects(move(_sideEffects)) {}
 
 	Dialect const& m_dialect;
-	std::map<YulString, ControlFlowSideEffects> const& m_functionSideEffects;
+	std::map<YulString, ControlFlowSideEffects> m_functionSideEffects;
 };
 
 }
diff --git a/test/libyul/ControlFlowSideEffectsTest.cpp b/test/libyul/ControlFlowSideEffectsTest.cpp
index aff3c564d9..ce6c18c358 100644
--- a/test/libyul/ControlFlowSideEffectsTest.cpp
+++ b/test/libyul/ControlFlowSideEffectsTest.cpp
@@ -22,6 +22,7 @@
 #include <test/libyul/Common.h>
 
 #include <libyul/Object.h>
+#include <libyul/AST.h>
 #include <libyul/ControlFlowSideEffects.h>
 #include <libyul/ControlFlowSideEffectsCollector.h>
 #include <libyul/backends/evm/EVMDialect.h>
@@ -61,19 +62,15 @@ TestCase::TestResult ControlFlowSideEffectsTest::run(ostream& _stream, string co
 	if (!obj.code)
 		BOOST_THROW_EXCEPTION(runtime_error("Parsing input failed."));
 
-	std::map<YulString, ControlFlowSideEffects> sideEffects =
-		ControlFlowSideEffectsCollector(
-			EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
-			*obj.code
-		).functionSideEffects();
-
-	std::map<std::string, std::string> controlFlowSideEffectsStr;
-	for (auto&& [fun, effects]: sideEffects)
-		controlFlowSideEffectsStr[fun.str()] = toString(effects);
-
+	ControlFlowSideEffectsCollector sideEffects(
+		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
+		*obj.code
+	);
 	m_obtainedResult.clear();
-	for (auto&& [functionName, effect]: controlFlowSideEffectsStr)
-		m_obtainedResult += functionName + (effect.empty() ? ":" : ": " + effect) + "\n";
+	forEach<FunctionDefinition const>(*obj.code, [&](FunctionDefinition const& _fun) {
+		string effectStr = toString(sideEffects.functionSideEffects().at(&_fun));
+		m_obtainedResult += _fun.name.str() + (effectStr.empty() ? ":" : ": " + effectStr) + "\n";
+	});
 
 	return checkResult(_stream, _linePrefix, _formatted);
 }
diff --git a/test/libyul/controlFlowSideEffects/nondisambiguated.yul b/test/libyul/controlFlowSideEffects/nondisambiguated.yul
new file mode 100644
index 0000000000..c3ed84bda1
--- /dev/null
+++ b/test/libyul/controlFlowSideEffects/nondisambiguated.yul
@@ -0,0 +1,19 @@
+{
+    function a() {
+        {
+            function b() { if calldataloda(0) { return(0, 0) } }
+            b()
+        }
+        {
+            function b() { revert(0, 0) }
+            b()
+        }
+    }
+    function b() {
+        leave
+        revert(0, 0)
+    }
+}
+// ----
+// a: can revert
+// b: can continue

From 766d10b848684596e4fd6af026fa16d45b10ad18 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 3 Nov 2021 17:12:58 +0100
Subject: [PATCH 0080/1748] Tests.

---
 .../controlFlowSideEffects/nondisambiguated.yul    | 14 +++++++++-----
 test/libyul/controlFlowSideEffects/recursion.yul   |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/test/libyul/controlFlowSideEffects/nondisambiguated.yul b/test/libyul/controlFlowSideEffects/nondisambiguated.yul
index c3ed84bda1..4cc68c140e 100644
--- a/test/libyul/controlFlowSideEffects/nondisambiguated.yul
+++ b/test/libyul/controlFlowSideEffects/nondisambiguated.yul
@@ -1,7 +1,7 @@
 {
     function a() {
         {
-            function b() { if calldataloda(0) { return(0, 0) } }
+            function b() { if calldataload(0) { return(0, 0) } }
             b()
         }
         {
@@ -9,11 +9,15 @@
             b()
         }
     }
-    function b() {
-        leave
-        revert(0, 0)
+    {
+        function b() {
+            leave
+            revert(0, 0)
+        }
     }
 }
 // ----
-// a: can revert
+// a: can terminate, can revert
+// b: can terminate, can continue
+// b: can revert
 // b: can continue
diff --git a/test/libyul/controlFlowSideEffects/recursion.yul b/test/libyul/controlFlowSideEffects/recursion.yul
index c4176d502b..69cd4a2da8 100644
--- a/test/libyul/controlFlowSideEffects/recursion.yul
+++ b/test/libyul/controlFlowSideEffects/recursion.yul
@@ -31,7 +31,7 @@
 // b: can revert
 // c:
 // d:
-// reg: can continue
 // x:
 // y:
 // z:
+// reg: can continue

From 0ee131c937f48116c69cc0276abb1f24da6d999e Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 4 Nov 2021 15:09:48 +0100
Subject: [PATCH 0081/1748] Update emscripten Dockerfile.

---
 .../docker/buildpack-deps/Dockerfile.emscripten    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 790a29634b..9a3ca36af4 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -26,10 +26,14 @@
 # contains a Makefile in the docker/ subdirectory that can be used to create the
 # required base image using:
 #
-#   make version=2.0.12 build
+#   make version=2.0.33 build
 #
-FROM emscripten/emsdk:2.0.12 AS base
-LABEL version="6"
+# Note that emscripten is supposed to automatically install to $(em-config CACHE)/sysroot, but
+# apparently this currently breaks due to conflicting compatibility headers.
+# Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
+# dependencies automatically.
+FROM emscripten/emsdk:2.0.33 AS base
+LABEL version="7"
 
 ADD emscripten.jam /usr/src
 RUN set -ex; \
@@ -39,8 +43,8 @@ RUN set -ex; \
 	mkdir build; \
 	cd build; \
 	emcmake cmake \
+		-DCMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot/usr \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
-		-DCMAKE_INSTALL_PREFIX=/emsdk/upstream/emscripten/system \
 		-DZ3_BUILD_LIBZ3_SHARED=OFF \
 		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF \
 		-DZ3_BUILD_TEST_EXECUTABLES=OFF \
@@ -63,5 +67,5 @@ RUN set -ex; \
 	./b2 toolset=emscripten link=static variant=release threading=single runtime-link=static \
 		--with-system --with-filesystem --with-test --with-program_options \
 		cxxflags="-s DISABLE_EXCEPTION_CATCHING=0 -Wno-unused-local-typedef -Wno-variadic-macros -Wno-c99-extensions -Wno-all" \
-	       --prefix=/emsdk/upstream/emscripten/system install; \
+	       --prefix=$(em-config CACHE)/sysroot/usr install; \
 	rm -r /usr/src/boost_1_75_0

From affeff18f5afbf4f27750179b3cb5ef07cadc0cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 30 Sep 2021 20:38:28 +0200
Subject: [PATCH 0082/1748] Don't ignore output selection in assembly mode

---
 Changelog.md                                  |  1 +
 solc/CommandLineInterface.cpp                 | 50 +++++++----
 solc/CommandLineParser.cpp                    | 17 ++++
 .../args                                      |  1 +
 .../evm_to_wasm_output_selection_asm_only/err |  1 +
 .../input.yul                                 |  4 +
 .../output                                    |  2 +
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../input.yul                                 |  4 +
 .../output                                    | 87 +++++++++++++++++++
 .../strict_asm_output_selection_asm_only/args |  1 +
 .../strict_asm_output_selection_asm_only/err  |  1 +
 .../input.yul                                 |  4 +
 .../output                                    | 12 +++
 .../strict_asm_output_selection_bin_only/args |  1 +
 .../strict_asm_output_selection_bin_only/err  |  1 +
 .../input.yul                                 |  4 +
 .../output                                    |  5 ++
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../input.yul                                 |  4 +
 .../output                                    |  2 +
 .../strict_asm_output_selection_invalid/err   |  2 +-
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../input.yul                                 |  4 +
 .../output                                    |  7 ++
 test/solc/CommandLineParser.cpp               |  8 ++
 29 files changed, 213 insertions(+), 16 deletions(-)
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_asm_only/args
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_asm_only/err
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_asm_only/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_asm_only/output
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_bin_only/args
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_bin_only/err
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_bin_only/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_bin_only/output
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_only/args
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_only/err
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_only/output
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/args
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/output

diff --git a/Changelog.md b/Changelog.md
index 80bd749c7e..97fd17763f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Language Features:
 Compiler Features:
  * Commandline Interface: Accept nested brackets in step sequences passed to ``--yul-optimizations``.
  * Commandline Interface: Add ``--debug-info`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
+ * Commandline Interface: Support ``--asm``, ``--bin``, ``--ir-optimized`` and ``--ewasm`` output selection options in assembler mode.
  * Commandline Interface: Use different colors when printing errors, warnings and infos.
  * SMTChecker: Output values for ``block.*``, ``msg.*`` and ``tx.*`` variables that are present in the called functions.
  * SMTChecker: Report contract invariants and reentrancy properties. This can be enabled via the CLI option ``--model-checker-invariants`` or the Standard JSON option ``settings.modelChecker.invariants``.
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 9d22799106..49aa1b87f1 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -1042,34 +1042,54 @@ bool CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 
 		yul::AssemblyStack& stack = assemblyStacks[src.first];
 
-		sout() << endl << "Pretty printed source:" << endl;
-		sout() << stack.print() << endl;
+		if (m_options.compiler.outputs.irOptimized)
+		{
+			// NOTE: This actually outputs unoptimized code when the optimizer is disabled but
+			// 'ir' output in StandardCompiler works the same way.
+			sout() << endl << "Pretty printed source:" << endl;
+			sout() << stack.print() << endl;
+		}
 
 		if (_language != yul::AssemblyStack::Language::Ewasm && _targetMachine == yul::AssemblyStack::Machine::Ewasm)
 		{
 			stack.translate(yul::AssemblyStack::Language::Ewasm);
 			stack.optimize();
 
-			sout() << endl << "==========================" << endl;
-			sout() << endl << "Translated source:" << endl;
-			sout() << stack.print() << endl;
+			// TODO: This isn't ewasm but it's only present when we're doing Yul->EWASM translation.
+			// It should get its own output flag in the future.
+			if (m_options.compiler.outputs.ewasm)
+			{
+				sout() << endl << "==========================" << endl;
+				sout() << endl << "Translated source:" << endl;
+				sout() << stack.print() << endl;
+			}
 		}
 
 		yul::MachineAssemblyObject object;
 		object = stack.assemble(_targetMachine);
 		object.bytecode->link(m_options.linker.libraries);
 
-		sout() << endl << "Binary representation:" << endl;
-		if (object.bytecode)
-			sout() << object.bytecode->toHex() << endl;
-		else
-			serr() << "No binary representation found." << endl;
+		if (m_options.compiler.outputs.binary)
+		{
+			sout() << endl << "Binary representation:" << endl;
+			if (object.bytecode)
+				sout() << object.bytecode->toHex() << endl;
+			else
+				serr() << "No binary representation found." << endl;
+		}
 
-		sout() << endl << "Text representation:" << endl;
-		if (!object.assembly.empty())
-			sout() << object.assembly << endl;
-		else
-			serr() << "No text representation found." << endl;
+		solAssert(_targetMachine == yul::AssemblyStack::Machine::Ewasm || _targetMachine == yul::AssemblyStack::Machine::EVM, "");
+		if (
+			(_targetMachine == yul::AssemblyStack::Machine::EVM && m_options.compiler.outputs.asm_) ||
+			(_targetMachine == yul::AssemblyStack::Machine::Ewasm && m_options.compiler.outputs.ewasm)
+		)
+		{
+			sout() << endl << "Text representation:" << endl;
+			if (!object.assembly.empty())
+				sout() << object.assembly << endl;
+			else
+				serr() << "No text representation found." << endl;
+		}
 	}
 
 	return true;
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index c3448ff8fa..4bb5dfce63 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -450,6 +450,12 @@ bool CommandLineParser::parseOutputSelection()
 			CompilerOutputs::componentMap() |
 			ranges::views::keys |
 			ranges::to<set>();
+		static set<string> const assemblerModeOutputs = {
+			CompilerOutputs::componentName(&CompilerOutputs::asm_),
+			CompilerOutputs::componentName(&CompilerOutputs::binary),
+			CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
+			CompilerOutputs::componentName(&CompilerOutputs::ewasm),
+		};
 
 		switch (_mode)
 		{
@@ -461,6 +467,7 @@ bool CommandLineParser::parseOutputSelection()
 		case InputMode::CompilerWithASTImport:
 			return contains(compilerModeOutputs, _outputName);
 		case InputMode::Assembler:
+			return contains(assemblerModeOutputs, _outputName);
 		case InputMode::StandardJson:
 		case InputMode::Linker:
 			return false;
@@ -472,6 +479,16 @@ bool CommandLineParser::parseOutputSelection()
 	for (auto&& [optionName, outputComponent]: CompilerOutputs::componentMap())
 		m_options.compiler.outputs.*outputComponent = (m_args.count(optionName) > 0);
 
+	if (m_options.input.mode == InputMode::Assembler && m_options.compiler.outputs == CompilerOutputs{})
+	{
+		// In assembly mode keep the default outputs enabled for backwards-compatibility.
+		// TODO: Remove this (must be done in a breaking release).
+		m_options.compiler.outputs.asm_ = true;
+		m_options.compiler.outputs.binary = true;
+		m_options.compiler.outputs.irOptimized = true;
+		m_options.compiler.outputs.ewasm = true;
+	}
+
 	vector<string> unsupportedOutputs;
 	for (auto&& [optionName, outputComponent]: CompilerOutputs::componentMap())
 		if (m_options.compiler.outputs.*outputComponent && !outputSupported(m_options.input.mode, optionName))
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args
new file mode 100644
index 0000000000..f390384981
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args
@@ -0,0 +1 @@
+--assemble --optimize --yul-dialect evm --machine ewasm --asm
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul
new file mode 100644
index 0000000000..4fa5ef66f8
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output
new file mode 100644
index 0000000000..d0cb60f39b
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output
@@ -0,0 +1,2 @@
+
+======= evm_to_wasm_output_selection_asm_only/input.yul (Ewasm) =======
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args
new file mode 100644
index 0000000000..48a844213a
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args
@@ -0,0 +1 @@
+--assemble --optimize --yul-dialect evm --machine ewasm --ewasm
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul
new file mode 100644
index 0000000000..4fa5ef66f8
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
new file mode 100644
index 0000000000..5f9a6c0fb2
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
@@ -0,0 +1,87 @@
+
+======= evm_to_wasm_output_selection_ewasm_only/input.yul (Ewasm) =======
+
+==========================
+
+Translated source:
+object "object" {
+    code {
+        function main()
+        {
+            let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(0))), 32)
+            let y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(0, 32)))))
+            i64.store(0:i32, y)
+            i64.store(i32.add(0:i32, 8:i32), y)
+            i64.store(i32.add(0:i32, 16:i32), y)
+            i64.store(i32.add(0:i32, 24:i32), y)
+            i64.store(32:i32, y)
+            i64.store(i32.add(32:i32, 8:i32), y)
+            i64.store(i32.add(32:i32, 16:i32), y)
+            let hi_1 := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(42))), 32)
+            i64.store(i32.add(32:i32, 24:i32), i64.or(hi_1, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(42, 32))))))
+            eth.storageStore(0:i32, 32:i32)
+        }
+        function bswap16(x:i32) -> y:i32
+        {
+            y := i32.or(i32.and(i32.shl(x, 8:i32), 0xff00:i32), i32.and(i32.shr_u(x, 8:i32), 0xff:i32))
+        }
+        function bswap32(x:i32) -> y:i32
+        {
+            let hi:i32 := i32.shl(bswap16(x), 16:i32)
+            y := i32.or(hi, bswap16(i32.shr_u(x, 16:i32)))
+        }
+    }
+}
+
+
+Text representation:
+(module
+    (import "ethereum" "storageStore" (func $eth.storageStore (param i32 i32)))
+    (memory $memory (export "memory") 1)
+    (export "main" (func $main))
+
+(func $main
+    (local $hi i64)
+    (local $y i64)
+    (local $hi_1 i64)
+    (block $label_
+        (local.set $hi (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 0)))) (i64.const 32)))
+        (local.set $y (i64.or (local.get $hi) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 0) (i64.const 32)))))))
+        (i64.store (i32.const 0) (local.get $y))
+        (i64.store (i32.add (i32.const 0) (i32.const 8)) (local.get $y))
+        (i64.store (i32.add (i32.const 0) (i32.const 16)) (local.get $y))
+        (i64.store (i32.add (i32.const 0) (i32.const 24)) (local.get $y))
+        (i64.store (i32.const 32) (local.get $y))
+        (i64.store (i32.add (i32.const 32) (i32.const 8)) (local.get $y))
+        (i64.store (i32.add (i32.const 32) (i32.const 16)) (local.get $y))
+        (local.set $hi_1 (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 42)))) (i64.const 32)))
+        (i64.store (i32.add (i32.const 32) (i32.const 24)) (i64.or (local.get $hi_1) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 42) (i64.const 32)))))))
+        (call $eth.storageStore (i32.const 0) (i32.const 32))
+    )
+)
+
+(func $bswap16
+    (param $x i32)
+    (result i32)
+    (local $y i32)
+    (block $label__1
+        (local.set $y (i32.or (i32.and (i32.shl (local.get $x) (i32.const 8)) (i32.const 65280)) (i32.and (i32.shr_u (local.get $x) (i32.const 8)) (i32.const 255))))
+
+    )
+    (local.get $y)
+)
+
+(func $bswap32
+    (param $x i32)
+    (result i32)
+    (local $y i32)
+    (local $hi i32)
+    (block $label__2
+        (local.set $hi (i32.shl (call $bswap16 (local.get $x)) (i32.const 16)))
+        (local.set $y (i32.or (local.get $hi) (call $bswap16 (i32.shr_u (local.get $x) (i32.const 16)))))
+
+    )
+    (local.get $y)
+)
+
+)
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/args b/test/cmdlineTests/strict_asm_output_selection_asm_only/args
new file mode 100644
index 0000000000..eff0311702
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_asm_only/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --asm
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/err b/test/cmdlineTests/strict_asm_output_selection_asm_only/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_asm_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_asm_only/input.yul
new file mode 100644
index 0000000000..4fa5ef66f8
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_asm_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/output b/test/cmdlineTests/strict_asm_output_selection_asm_only/output
new file mode 100644
index 0000000000..abe2143d3f
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_asm_only/output
@@ -0,0 +1,12 @@
+
+======= strict_asm_output_selection_asm_only/input.yul (EVM) =======
+
+Text representation:
+    /* "strict_asm_output_selection_asm_only/input.yul":15:17   */
+  0x2a
+    /* "strict_asm_output_selection_asm_only/input.yul":29:30   */
+  0x00
+    /* "strict_asm_output_selection_asm_only/input.yul":22:34   */
+  sstore
+    /* "strict_asm_output_selection_asm_only/input.yul":0:36   */
+  stop
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/args b/test/cmdlineTests/strict_asm_output_selection_bin_only/args
new file mode 100644
index 0000000000..73ca2cca29
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_bin_only/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --bin
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/err b/test/cmdlineTests/strict_asm_output_selection_bin_only/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_bin_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_bin_only/input.yul
new file mode 100644
index 0000000000..4fa5ef66f8
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_bin_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/output b/test/cmdlineTests/strict_asm_output_selection_bin_only/output
new file mode 100644
index 0000000000..3ffa826b87
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_bin_only/output
@@ -0,0 +1,5 @@
+
+======= strict_asm_output_selection_bin_only/input.yul (EVM) =======
+
+Binary representation:
+602a60005500
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/args b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/args
new file mode 100644
index 0000000000..bb147ae337
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --ewasm
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/err b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul
new file mode 100644
index 0000000000..4fa5ef66f8
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/output b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/output
new file mode 100644
index 0000000000..f90f049aaa
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/output
@@ -0,0 +1,2 @@
+
+======= strict_asm_output_selection_ewasm_only/input.yul (EVM) =======
diff --git a/test/cmdlineTests/strict_asm_output_selection_invalid/err b/test/cmdlineTests/strict_asm_output_selection_invalid/err
index 736eb2c8a6..9c91044829 100644
--- a/test/cmdlineTests/strict_asm_output_selection_invalid/err
+++ b/test/cmdlineTests/strict_asm_output_selection_invalid/err
@@ -1 +1 @@
-The following outputs are not supported in assembler mode: --abi, --asm, --asm-json, --bin, --bin-runtime, --devdoc, --ewasm, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
+The following outputs are not supported in assembler mode: --abi, --asm-json, --bin-runtime, --devdoc, --hashes, --ir, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/args b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/args
new file mode 100644
index 0000000000..90b16d1f0e
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --ir-optimized
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/input.yul
new file mode 100644
index 0000000000..4fa5ef66f8
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/output b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/output
new file mode 100644
index 0000000000..1fa4b72c7e
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/output
@@ -0,0 +1,7 @@
+
+======= strict_asm_output_selection_ir_optimized_only/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code { { sstore(0, 42) } }
+}
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index a9ba08d817..dd5696c688 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -297,6 +297,10 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 				"underflow,"
 				"divByZero",
 			"--model-checker-timeout=5",   // Ignored in assembly mode
+			"--asm",
+			"--bin",
+			"--ir-optimized",
+			"--ewasm",
 		};
 		commandLine += assemblyOptions;
 		if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
@@ -333,6 +337,10 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		};
 		expectedOptions.formatting.coloredOutput = false;
 		expectedOptions.formatting.withErrorIds = true;
+		expectedOptions.compiler.outputs.asm_ = true;
+		expectedOptions.compiler.outputs.binary = true;
+		expectedOptions.compiler.outputs.irOptimized = true;
+		expectedOptions.compiler.outputs.ewasm = true;
 		if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
 		{
 			expectedOptions.optimizer.enabled = true;

From 1a19d9a5cf75b3677baf7c5a85cd5e9500d8a4fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 3 Nov 2021 17:01:48 +0100
Subject: [PATCH 0083/1748] New CLI output in assembly mode: `--ewasm-ir`

---
 Changelog.md                                  |  2 +-
 solc/CommandLineInterface.cpp                 |  4 +--
 solc/CommandLineParser.cpp                    | 11 ++++--
 solc/CommandLineParser.h                      |  2 ++
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../input.yul                                 |  4 +++
 .../output                                    | 34 +++++++++++++++++++
 .../output                                    | 33 ------------------
 .../output_selection_ewasm_ir_only/args       |  1 +
 .../output_selection_ewasm_ir_only/err        |  1 +
 .../output_selection_ewasm_ir_only/exit       |  1 +
 .../output_selection_ewasm_ir_only/input.sol  |  4 +++
 .../args                                      |  2 +-
 .../standard_cli_output_selection_invalid/err |  2 +-
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../input.yul                                 |  4 +++
 .../output                                    |  2 ++
 test/solc/CommandLineParser.cpp               |  4 +++
 20 files changed, 73 insertions(+), 42 deletions(-)
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/args
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/err
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/input.yul
 create mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/output
 create mode 100644 test/cmdlineTests/output_selection_ewasm_ir_only/args
 create mode 100644 test/cmdlineTests/output_selection_ewasm_ir_only/err
 create mode 100644 test/cmdlineTests/output_selection_ewasm_ir_only/exit
 create mode 100644 test/cmdlineTests/output_selection_ewasm_ir_only/input.sol
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/args
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/err
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/output

diff --git a/Changelog.md b/Changelog.md
index 97fd17763f..3f7ea97c56 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,7 +7,7 @@ Language Features:
 Compiler Features:
  * Commandline Interface: Accept nested brackets in step sequences passed to ``--yul-optimizations``.
  * Commandline Interface: Add ``--debug-info`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
- * Commandline Interface: Support ``--asm``, ``--bin``, ``--ir-optimized`` and ``--ewasm`` output selection options in assembler mode.
+ * Commandline Interface: Support ``--asm``, ``--bin``, ``--ir-optimized``, ``--ewasm`` and ``--ewasm-ir`` output selection options in assembler mode.
  * Commandline Interface: Use different colors when printing errors, warnings and infos.
  * SMTChecker: Output values for ``block.*``, ``msg.*`` and ``tx.*`` variables that are present in the called functions.
  * SMTChecker: Report contract invariants and reentrancy properties. This can be enabled via the CLI option ``--model-checker-invariants`` or the Standard JSON option ``settings.modelChecker.invariants``.
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 49aa1b87f1..1d069f9251 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -1055,9 +1055,7 @@ bool CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 			stack.translate(yul::AssemblyStack::Language::Ewasm);
 			stack.optimize();
 
-			// TODO: This isn't ewasm but it's only present when we're doing Yul->EWASM translation.
-			// It should get its own output flag in the future.
-			if (m_options.compiler.outputs.ewasm)
+			if (m_options.compiler.outputs.ewasmIR)
 			{
 				sout() << endl << "==========================" << endl;
 				sout() << endl << "Translated source:" << endl;
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 4bb5dfce63..9356c96625 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -446,15 +446,17 @@ bool CommandLineParser::parseOutputSelection()
 {
 	static auto outputSupported = [](InputMode _mode, string_view _outputName)
 	{
-		static set<string> const compilerModeOutputs =
+		static set<string> const compilerModeOutputs = (
 			CompilerOutputs::componentMap() |
 			ranges::views::keys |
-			ranges::to<set>();
+			ranges::to<set>()
+		) - set<string>{CompilerOutputs::componentName(&CompilerOutputs::ewasmIR)};
 		static set<string> const assemblerModeOutputs = {
 			CompilerOutputs::componentName(&CompilerOutputs::asm_),
 			CompilerOutputs::componentName(&CompilerOutputs::binary),
 			CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
 			CompilerOutputs::componentName(&CompilerOutputs::ewasm),
+			CompilerOutputs::componentName(&CompilerOutputs::ewasmIR),
 		};
 
 		switch (_mode)
@@ -487,6 +489,7 @@ bool CommandLineParser::parseOutputSelection()
 		m_options.compiler.outputs.binary = true;
 		m_options.compiler.outputs.irOptimized = true;
 		m_options.compiler.outputs.ewasm = true;
+		m_options.compiler.outputs.ewasmIR = true;
 	}
 
 	vector<string> unsupportedOutputs;
@@ -709,6 +712,7 @@ General Information)").c_str(),
 		(CompilerOutputs::componentName(&CompilerOutputs::ir).c_str(), "Intermediate Representation (IR) of all contracts (EXPERIMENTAL).")
 		(CompilerOutputs::componentName(&CompilerOutputs::irOptimized).c_str(), "Optimized intermediate Representation (IR) of all contracts (EXPERIMENTAL).")
 		(CompilerOutputs::componentName(&CompilerOutputs::ewasm).c_str(), "Ewasm text representation of all contracts (EXPERIMENTAL).")
+		(CompilerOutputs::componentName(&CompilerOutputs::ewasmIR).c_str(), "Intermediate representation (IR) converted to a form that can be translated directly into Ewasm text representation (EXPERIMENTAL).")
 		(CompilerOutputs::componentName(&CompilerOutputs::signatureHashes).c_str(), "Function signature hashes of the contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::natspecUser).c_str(), "Natspec user documentation of all contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::natspecDev).c_str(), "Natspec developer documentation of all contracts.")
@@ -923,11 +927,12 @@ bool CommandLineParser::processArgs()
 	if (!checkMutuallyExclusive({g_strColor, g_strNoColor}))
 		return false;
 
-	array<string, 8> const conflictingWithStopAfter{
+	array<string, 9> const conflictingWithStopAfter{
 		CompilerOutputs::componentName(&CompilerOutputs::binary),
 		CompilerOutputs::componentName(&CompilerOutputs::ir),
 		CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
 		CompilerOutputs::componentName(&CompilerOutputs::ewasm),
+		CompilerOutputs::componentName(&CompilerOutputs::ewasmIR),
 		g_strGas,
 		CompilerOutputs::componentName(&CompilerOutputs::asm_),
 		CompilerOutputs::componentName(&CompilerOutputs::asmJson),
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 27a64c7b94..a1d13c6907 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -78,6 +78,7 @@ struct CompilerOutputs
 			{"ir", &CompilerOutputs::ir},
 			{"ir-optimized", &CompilerOutputs::irOptimized},
 			{"ewasm", &CompilerOutputs::ewasm},
+			{"ewasm-ir", &CompilerOutputs::ewasmIR},
 			{"hashes", &CompilerOutputs::signatureHashes},
 			{"userdoc", &CompilerOutputs::natspecUser},
 			{"devdoc", &CompilerOutputs::natspecDev},
@@ -97,6 +98,7 @@ struct CompilerOutputs
 	bool ir = false;
 	bool irOptimized = false;
 	bool ewasm = false;
+	bool ewasmIR = false;
 	bool signatureHashes = false;
 	bool natspecUser = false;
 	bool natspecDev = false;
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/args b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/args
new file mode 100644
index 0000000000..7c6526b562
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/args
@@ -0,0 +1 @@
+--assemble --optimize --yul-dialect evm --machine ewasm --ewasm-ir
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/err b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/input.yul b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/input.yul
new file mode 100644
index 0000000000..4fa5ef66f8
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/output b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/output
new file mode 100644
index 0000000000..3124db17da
--- /dev/null
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/output
@@ -0,0 +1,34 @@
+
+======= evm_to_wasm_output_selection_ewasm_ir_only/input.yul (Ewasm) =======
+
+==========================
+
+Translated source:
+object "object" {
+    code {
+        function main()
+        {
+            let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(0))), 32)
+            let y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(0, 32)))))
+            i64.store(0:i32, y)
+            i64.store(i32.add(0:i32, 8:i32), y)
+            i64.store(i32.add(0:i32, 16:i32), y)
+            i64.store(i32.add(0:i32, 24:i32), y)
+            i64.store(32:i32, y)
+            i64.store(i32.add(32:i32, 8:i32), y)
+            i64.store(i32.add(32:i32, 16:i32), y)
+            let hi_1 := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(42))), 32)
+            i64.store(i32.add(32:i32, 24:i32), i64.or(hi_1, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(42, 32))))))
+            eth.storageStore(0:i32, 32:i32)
+        }
+        function bswap16(x:i32) -> y:i32
+        {
+            y := i32.or(i32.and(i32.shl(x, 8:i32), 0xff00:i32), i32.and(i32.shr_u(x, 8:i32), 0xff:i32))
+        }
+        function bswap32(x:i32) -> y:i32
+        {
+            let hi:i32 := i32.shl(bswap16(x), 16:i32)
+            y := i32.or(hi, bswap16(i32.shr_u(x, 16:i32)))
+        }
+    }
+}
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
index 5f9a6c0fb2..e8b3062605 100644
--- a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
+++ b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
@@ -1,39 +1,6 @@
 
 ======= evm_to_wasm_output_selection_ewasm_only/input.yul (Ewasm) =======
 
-==========================
-
-Translated source:
-object "object" {
-    code {
-        function main()
-        {
-            let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(0))), 32)
-            let y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(0, 32)))))
-            i64.store(0:i32, y)
-            i64.store(i32.add(0:i32, 8:i32), y)
-            i64.store(i32.add(0:i32, 16:i32), y)
-            i64.store(i32.add(0:i32, 24:i32), y)
-            i64.store(32:i32, y)
-            i64.store(i32.add(32:i32, 8:i32), y)
-            i64.store(i32.add(32:i32, 16:i32), y)
-            let hi_1 := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(42))), 32)
-            i64.store(i32.add(32:i32, 24:i32), i64.or(hi_1, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(42, 32))))))
-            eth.storageStore(0:i32, 32:i32)
-        }
-        function bswap16(x:i32) -> y:i32
-        {
-            y := i32.or(i32.and(i32.shl(x, 8:i32), 0xff00:i32), i32.and(i32.shr_u(x, 8:i32), 0xff:i32))
-        }
-        function bswap32(x:i32) -> y:i32
-        {
-            let hi:i32 := i32.shl(bswap16(x), 16:i32)
-            y := i32.or(hi, bswap16(i32.shr_u(x, 16:i32)))
-        }
-    }
-}
-
-
 Text representation:
 (module
     (import "ethereum" "storageStore" (func $eth.storageStore (param i32 i32)))
diff --git a/test/cmdlineTests/output_selection_ewasm_ir_only/args b/test/cmdlineTests/output_selection_ewasm_ir_only/args
new file mode 100644
index 0000000000..bccff6085e
--- /dev/null
+++ b/test/cmdlineTests/output_selection_ewasm_ir_only/args
@@ -0,0 +1 @@
+--optimize --ewasm-ir
diff --git a/test/cmdlineTests/output_selection_ewasm_ir_only/err b/test/cmdlineTests/output_selection_ewasm_ir_only/err
new file mode 100644
index 0000000000..52dd265b5d
--- /dev/null
+++ b/test/cmdlineTests/output_selection_ewasm_ir_only/err
@@ -0,0 +1 @@
+The following outputs are not supported in compiler mode: --ewasm-ir.
diff --git a/test/cmdlineTests/output_selection_ewasm_ir_only/exit b/test/cmdlineTests/output_selection_ewasm_ir_only/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/output_selection_ewasm_ir_only/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/output_selection_ewasm_ir_only/input.sol b/test/cmdlineTests/output_selection_ewasm_ir_only/input.sol
new file mode 100644
index 0000000000..9755e16e71
--- /dev/null
+++ b/test/cmdlineTests/output_selection_ewasm_ir_only/input.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0
+pragma solidity *;
+
+contract C {}
diff --git a/test/cmdlineTests/standard_cli_output_selection_invalid/args b/test/cmdlineTests/standard_cli_output_selection_invalid/args
index f2deb3847f..538c870972 100644
--- a/test/cmdlineTests/standard_cli_output_selection_invalid/args
+++ b/test/cmdlineTests/standard_cli_output_selection_invalid/args
@@ -1 +1 @@
---ast-compact-json --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --ewasm --hashes --userdoc --devdoc --metadata --storage-layout
+--ast-compact-json --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --ewasm --ewasm-ir --hashes --userdoc --devdoc --metadata --storage-layout
diff --git a/test/cmdlineTests/standard_cli_output_selection_invalid/err b/test/cmdlineTests/standard_cli_output_selection_invalid/err
index d6ed4d572c..e9d24e61d4 100644
--- a/test/cmdlineTests/standard_cli_output_selection_invalid/err
+++ b/test/cmdlineTests/standard_cli_output_selection_invalid/err
@@ -1 +1 @@
-The following outputs are not supported in standard JSON mode: --abi, --asm, --asm-json, --ast-compact-json, --bin, --bin-runtime, --devdoc, --ewasm, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
+The following outputs are not supported in standard JSON mode: --abi, --asm, --asm-json, --ast-compact-json, --bin, --bin-runtime, --devdoc, --ewasm, --ewasm-ir, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/args b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/args
new file mode 100644
index 0000000000..647c63654c
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/args
@@ -0,0 +1 @@
+--strict-assembly --optimize --ewasm-ir
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/err b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/input.yul
new file mode 100644
index 0000000000..4fa5ef66f8
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/input.yul
@@ -0,0 +1,4 @@
+{
+    let x := 42
+    sstore(0, x)
+}
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/output b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/output
new file mode 100644
index 0000000000..8026a6e83e
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/output
@@ -0,0 +1,2 @@
+
+======= strict_asm_output_selection_ewasm_ir_only/input.yul (EVM) =======
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index dd5696c688..23ea1efb16 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -198,7 +198,9 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			true, true, true, true, true,
 			true, true, true, true, true,
 			true, true, true, true, true,
+			true,
 		};
+		expectedOptions.compiler.outputs.ewasmIR = false;
 		expectedOptions.compiler.estimateGas = true;
 		expectedOptions.compiler.combinedJsonRequests = {
 			true, true, true, true, true,
@@ -301,6 +303,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 			"--bin",
 			"--ir-optimized",
 			"--ewasm",
+			"--ewasm-ir",
 		};
 		commandLine += assemblyOptions;
 		if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
@@ -341,6 +344,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		expectedOptions.compiler.outputs.binary = true;
 		expectedOptions.compiler.outputs.irOptimized = true;
 		expectedOptions.compiler.outputs.ewasm = true;
+		expectedOptions.compiler.outputs.ewasmIR = true;
 		if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
 		{
 			expectedOptions.optimizer.enabled = true;

From a7688a0eafcbc528f4a9d66e497a50e3712c4ca0 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 4 Nov 2021 19:24:12 +0100
Subject: [PATCH 0084/1748] Update emscripten to version 2.0.33.

---
 .circleci/config.yml        | 4 ++--
 Changelog.md                | 1 +
 scripts/build_emscripten.sh | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e2ba6e2d09..9e5862cab0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,8 +21,8 @@ parameters:
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:c26a7ffc9fc243a4ec3105b9dc1edcdd964ad0e9665c83172b7ebda74bbf3021"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-6
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:092da5817bc032c91a806b4f73db2a1a31e5cc4c066d94d43eedd9f365df7154"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-7
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:9ffcd0944433fe100e9433f2aa9ba5c21e096e758ad8a05a4a76feaed3d1f463"
   evm-version:
     type: string
     default: london
diff --git a/Changelog.md b/Changelog.md
index 80bd749c7e..56a30bdaef 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -34,6 +34,7 @@ Bugfixes:
 Build System:
  * Pass linker-only emscripten options only when linking.
  * Remove obsolete compatibility workaround for emscripten builds.
+ * Update emscripten to version 2.0.33.
 
 
 Important Bugfixes in Experimental Features:
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 667d63708d..7b8510026c 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -34,7 +34,7 @@ else
     BUILD_DIR="$1"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-6
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-7
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:092da5817bc032c91a806b4f73db2a1a31e5cc4c066d94d43eedd9f365df7154 \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:9ffcd0944433fe100e9433f2aa9ba5c21e096e758ad8a05a4a76feaed3d1f463 \
     ./scripts/ci/build_emscripten.sh "$BUILD_DIR"

From b4f98b41bc9424be1d2cb659deaa9255b51cf3f2 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 5 Nov 2021 13:03:13 +0100
Subject: [PATCH 0085/1748] Minor fix to forEach on Yul AST nodes.

---
 libyul/optimiser/ASTWalker.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libyul/optimiser/ASTWalker.h b/libyul/optimiser/ASTWalker.h
index cd98a90cad..b937f7eae4 100644
--- a/libyul/optimiser/ASTWalker.h
+++ b/libyul/optimiser/ASTWalker.h
@@ -111,8 +111,7 @@ template <
 >
 struct ForEach: Base
 {
-	template<typename Callable>
-	ForEach(Callable&& _visitor): visitor(std::forward<Callable>(_visitor)) {}
+	ForEach(Visitor& _visitor): visitor(_visitor) {}
 
 	using Base::operator();
 	void operator()(Node& _node) override
@@ -121,7 +120,7 @@ struct ForEach: Base
 		Base::operator()(_node);
 	}
 
-	Visitor visitor;
+	Visitor& visitor;
 };
 }
 
@@ -130,7 +129,7 @@ struct ForEach: Base
 template<typename Node, typename Entry, typename Visitor>
 void forEach(Entry&& _entry, Visitor&& _visitor)
 {
-	detail::ForEach<Node, std::decay_t<Visitor>>{std::forward<Visitor>(_visitor)}(std::forward<Entry>(_entry));
+	detail::ForEach<Node, Visitor&>{_visitor}(_entry);
 }
 
 }

From 83308184f20f811d438df1bddc3921e7982279bd Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 5 Nov 2021 17:46:32 +0100
Subject: [PATCH 0086/1748] Remove outdated install_deps scripts.

---
 scripts/install_deps.bat     | 61 ----------------------
 scripts/install_deps.cmake   | 99 ------------------------------------
 scripts/install_static_z3.sh | 11 ----
 3 files changed, 171 deletions(-)
 delete mode 100644 scripts/install_deps.bat
 delete mode 100644 scripts/install_deps.cmake
 delete mode 100644 scripts/install_static_z3.sh

diff --git a/scripts/install_deps.bat b/scripts/install_deps.bat
deleted file mode 100644
index 61f7022a5e..0000000000
--- a/scripts/install_deps.bat
+++ /dev/null
@@ -1,61 +0,0 @@
-@ECHO OFF
-
-REM ---------------------------------------------------------------------------
-REM Batch file for installing pre-requisite packages for solidity on
-REM Windows platforms.  That is implemented using CMake targets which
-REM extract pre-built ZIPs hosted on GitHub into "deps\install_deps".
-REM
-REM See https://github.com/ethereum/cpp-dependencies
-REM
-REM The CMake files then point into that directory as an alternative
-REM to the Homebrew, PPA or other global package server locations
-REM available on Linux and UNIX platforms.
-REM
-REM The lack of a standard C++ packaging system for Windows is problematic
-REM for us, and we have considered various options for improving the
-REM situation, such as the following:
-REM
-REM     See "Windows - Add support for Chocolatey packages"
-REM     https://github.com/ethereum/webthree-umbrella/issues/345
-REM
-REM     See "Windows - Try to use NuGet C++ packages"
-REM     https://github.com/ethereum/webthree-umbrella/issues/509
-REM
-REM     See "CM - Can we switch to NuGet delivery for our external dependencies"
-REM     https://github.com/ethereum/webthree-umbrella/issues/376
-REM
-REM Another possible option, which would benefit build robustness on
-REM multiple platforms, not just Windows, is to add dependencies as
-REM git-submodules (or downloading on demand) so that we aren'targets
-REM depend on platform-specific packaging systems at all.  We have
-REM already done just that for LLVM within evmjit.  The downside of
-REM that approach is that those dependencies then need to be
-REM built-from-source, which adds time to the build process.  It
-REM gives us an unbeatable degree of control, though, because we
-REM then perfectly control versioning and build flags for the binaries
-REM for those packages.
-REM
-REM The documentation for solidity is hosted at:
-REM
-REM https://docs.soliditylang.org
-REM
-REM ---------------------------------------------------------------------------
-REM This file is part of solidity.
-REM
-REM solidity is free software: you can redistribute it and/or modify
-REM it under the terms of the GNU General Public License as published by
-REM the Free Software Foundation, either version 3 of the License, or
-REM (at your option) any later version.
-REM
-REM solidity is distributed in the hope that it will be useful,
-REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM GNU General Public License for more details.
-REM
-REM You should have received a copy of the GNU General Public License
-REM along with solidity.  If not, see <http://www.gnu.org/licenses/>
-REM
-REM Copyright (c) 2016 solidity contributors.
-REM ---------------------------------------------------------------------------
-
-cmake -P scripts\install_deps.cmake
diff --git a/scripts/install_deps.cmake b/scripts/install_deps.cmake
deleted file mode 100644
index d90d4ec32b..0000000000
--- a/scripts/install_deps.cmake
+++ /dev/null
@@ -1,99 +0,0 @@
-get_filename_component(ROOT_DIR "${CMAKE_CURRENT_LIST_DIR}/../deps" ABSOLUTE)
-
-set(CACHE_DIR "${ROOT_DIR}/cache")
-set(PACKAGES_DIR "${ROOT_DIR}/packages")
-
-function(download URL DST_FILE STATUS)
-  set(TMP_FILE "${DST_FILE}.part")
-
-  get_filename_component(FILE_NAME ${DST_FILE} NAME)
-  if (NOT EXISTS ${DST_FILE})
-    message("Downloading ${FILE_NAME}")
-    file(DOWNLOAD ${URL} ${TMP_FILE} SHOW_PROGRESS STATUS DOWNLOAD_STATUS)
-    list(GET DOWNLOAD_STATUS 0 STATUS_CODE)
-    if (STATUS_CODE EQUAL 0)
-      file(RENAME ${TMP_FILE} ${DST_FILE})
-    else()
-      file(REMOVE ${TMP_FILE})
-      list(GET DOWNLOAD_STATUS 1 ERROR_MSG)
-
-      message("ERROR! Downloading '${FILE_NAME}' failed.")
-      message(STATUS "URL:   ${URL}")
-      message(STATUS "Error: ${STATUS_CODE} ${ERROR_MSG}")
-      set(STATUS FALSE PARENT_SCOPE)
-      return()
-    endif()
-  else()
-    message("Using cached ${FILE_NAME}")
-  endif()
-  set(STATUS TRUE PARENT_SCOPE)
-endfunction(download)
-
-function(download_and_unpack PACKAGE_URL DST_DIR)
-  get_filename_component(FILE_NAME ${PACKAGE_URL} NAME)
-
-  set(DST_FILE "${CACHE_DIR}/${FILE_NAME}")
-  set(TMP_FILE "${DST_FILE}.part")
-
-  file(MAKE_DIRECTORY ${CACHE_DIR})
-  file(MAKE_DIRECTORY ${DST_DIR})
-
-  download(${PACKAGE_URL} ${DST_FILE} STATUS)
-
-  if (STATUS)
-    message("Unpacking ${FILE_NAME} to ${DST_DIR}")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf ${DST_FILE}
-      WORKING_DIRECTORY ${DST_DIR})
-  endif()
-endfunction(download_and_unpack)
-
-# Packs installed package binaries and headers into an archive.
-function(create_package NAME DIR)
-  message("Creating package ${NAME}")
-  file(MAKE_DIRECTORY ${PACKAGES_DIR})
-
-  # To create an archive without addicional top level directory
-  # (like package-X.Y.Z) we need to know all top level files/dirs.
-  # Usually it is just "win64" dir.
-  file(GLOB TOP_FILES RELATIVE ${DIR} "${DIR}/*")
-
-  set(PACKAGE_FILE "${PACKAGES_DIR}/${NAME}.tar.gz")
-  execute_process(COMMAND ${CMAKE_COMMAND} -E
-    tar -czf ${PACKAGE_FILE} ${TOP_FILES}
-    WORKING_DIRECTORY ${DIR})
-endfunction(create_package)
-
-# Downloads the source code of the package and unpacks it to dedicated 'src'
-# dir. Also creates 'build' and 'install' dir to be used by a build script.
-function(prepare_package_source NAME VERSION URL)
-  set(PACKAGE_NAME "${NAME}-${VERSION}")
-
-  set(PACKAGE_DIR "${CACHE_DIR}/${PACKAGE_NAME}")
-  set(SOURCE_DIR "${PACKAGE_DIR}/src")
-  set(BUILD_DIR "${PACKAGE_DIR}/build")
-  set(INSTALL_DIR "${PACKAGE_DIR}/install")
-
-  if (NOT EXISTS ${SOURCE_DIR})
-    download_and_unpack(${URL} ${PACKAGE_DIR} STATUS)
-    file(GLOB ORIG_SOURCE_DIR_NAME "${PACKAGE_DIR}/*")
-    file(RENAME ${ORIG_SOURCE_DIR_NAME} ${SOURCE_DIR})
-  endif()
-
-  file(MAKE_DIRECTORY ${BUILD_DIR})
-  file(MAKE_DIRECTORY ${INSTALL_DIR})
-
-  # Export names and dirs to be used by a package-specific build script.
-  set(PACKAGE_NAME ${PACKAGE_NAME} PARENT_SCOPE)
-  set(SOURCE_DIR   ${SOURCE_DIR}   PARENT_SCOPE)
-  set(BUILD_DIR    ${BUILD_DIR}    PARENT_SCOPE)
-  set(INSTALL_DIR  ${INSTALL_DIR}  PARENT_SCOPE)
-endfunction()
-
-set(INSTALL_DIR "${ROOT_DIR}/install")
-set(SERVER "https://github.com/ethereum/cpp-dependencies/releases/download/vs2017/")
-
-function(download_and_install PACKAGE_NAME)
-  download_and_unpack("${SERVER}${PACKAGE_NAME}.tar.gz" ${INSTALL_DIR})
-endfunction(download_and_install)
-
-download_and_install("boost-1.67.0")
diff --git a/scripts/install_static_z3.sh b/scripts/install_static_z3.sh
deleted file mode 100644
index 304ef410cf..0000000000
--- a/scripts/install_static_z3.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-set -eu
-
-git clone --depth 1 --branch z3-4.8.7 https://github.com/Z3Prover/z3.git
-cd z3
-mkdir build
-cd build
-LDFLAGS="-static" cmake -DZ3_BUILD_LIBZ3_SHARED=OFF ..
-make -j 4
-make install
\ No newline at end of file

From 063d00adc88c397230f31ff1803a1502b78af452 Mon Sep 17 00:00:00 2001
From: Shivam Rajput <75530356+phyBrackets@users.noreply.github.com>
Date: Sun, 7 Nov 2021 10:41:48 +0530
Subject: [PATCH 0087/1748] 0.y.z makes more sense than 0.x for the current
 version.

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index a7bfbbe448..476cd86117 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -21,7 +21,7 @@ version of Solidity. Apart from exceptional cases, only the latest version recei
 `security fixes <https://github.com/ethereum/solidity/security/policy#supported-versions>`_.
 Furthermore, breaking changes as well as
 new features are introduced regularly. We currently use
-a 0.x version number `to indicate this fast pace of change <https://semver.org/#spec-item-4>`_.
+a 0.y.z version number `to indicate this fast pace of change <https://semver.org/#spec-item-4>`_.
 
 .. warning::
 

From c6775bc01f59c04796bf4d15db9ec2ccd72710a2 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Sun, 7 Nov 2021 21:27:56 +0000
Subject: [PATCH 0088/1748] Include picosha2 in the license header

---
 cmake/templates/license.h.in | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/cmake/templates/license.h.in b/cmake/templates/license.h.in
index 65276d8b4c..6cdd2bb8a8 100644
--- a/cmake/templates/license.h.in
+++ b/cmake/templates/license.h.in
@@ -6,9 +6,34 @@ static std::string const otherLicenses{R"(Most of the code is licensed under GPL
 parts are as follows:
 
 libkeccak-tiny:
+  The file libsolutil/Keccak256.cpp incorporates libkeccak-tiny.
+
   A single-file implementation of SHA-3 and SHAKE implemented by David Leon Gil
   License: CC0, attribution kindly requested. Blame taken too, but not liability.
 
+picosha2:
+  The file libsolutil/picosha2.h is imported.
+
+  Copyright (C) 2017 okdshin
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+
 jsoncpp:
   The JsonCpp library's source code, including accompanying documentation,
   tests and demonstration applications, are licensed under the following

From be552683c93ca8830a793ccd7805c7ad2e370228 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 8 Nov 2021 10:58:28 +0100
Subject: [PATCH 0089/1748] Remove incorrect outer block from for loop init
 rewriter documentation.

---
 docs/internals/optimizer.rst | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 93179c0418..28c342902d 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -429,11 +429,9 @@ is transformed to
 
 .. code-block:: text
 
-    {
-        Init...
-        for {} C { Post... } {
-            Body...
-        }
+    Init...
+    for {} C { Post... } {
+        Body...
     }
 
 This eases the rest of the optimization process because we can ignore

From aa4d3cabf1e698bf871877d66d88d4bb48139611 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 8 Nov 2021 13:22:23 +0100
Subject: [PATCH 0090/1748] Clarify ``pure``.

---
 docs/contracts/functions.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index 7d1ce72565..ff49e4f281 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -222,6 +222,9 @@ Pure Functions
 --------------
 
 Functions can be declared ``pure`` in which case they promise not to read from or modify the state.
+In particular, it should be possible to evaluate a ``pure`` function at compile-time given
+only its inputs and ``msg.data``, but without any knowledge of the current blockchain state.
+This means that reading from ``immutable`` variables can be a non-pure operation.
 
 .. note::
   If the compiler's EVM target is Byzantium or newer (default) the opcode ``STATICCALL`` is used,

From a1aa9d2d90f2f7e7390408e9005d62c7159d4bd4 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 27 Oct 2021 17:26:44 +0200
Subject: [PATCH 0091/1748] Skip extcodesize check if return data is expected.

---
 Changelog.md                                  |   1 +
 libsolidity/codegen/ExpressionCompiler.cpp    |  18 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   |  20 +-
 .../output.json                               | 190 ++++++++++++++++++
 .../output.json                               |  32 +--
 .../abi_encode_calldata_slice.sol             |   4 +-
 .../struct/struct_storage_ptr.sol             |   2 +-
 .../abi_encode_calldata_slice.sol             |   4 +-
 ...2_in_function_inherited_in_v1_contract.sol |   2 +-
 ...ode_v2_in_modifier_used_in_v1_contract.sol |   2 +-
 .../abiEncoderV2/calldata_array.sol           |   2 +-
 .../arithmetics/check_var_init.sol            |   2 +-
 .../array/fixed_arrays_as_return_type.sol     |   2 +-
 .../array/function_array_cross_calls.sol      |   2 +-
 .../semanticTests/array/reusing_memory.sol    |   2 +-
 .../constructor/arrays_in_constructors.sol    |   2 +-
 .../bytes_in_constructors_packer.sol          |   2 +-
 .../constructor_function_complex.sol          |   2 +-
 .../freeFunctions/new_operator.sol            |   2 +-
 .../creation_function_call_no_args.sol        |   2 +-
 .../functionCall/failed_create.sol            |   4 +-
 .../functionTypes/store_function.sol          |   2 +-
 .../immutable/multi_creation.sol              |   2 +-
 .../address_overload_resolution.sol           |   4 +-
 ...d_function_calldata_calldata_interface.sol |   2 +-
 ...ted_function_calldata_memory_interface.sol |   2 +-
 .../inheritance/member_notation_ctor.sol      |   4 +-
 .../interface_inheritance_conversions.sol     |   4 +-
 .../salted_create_with_value.sol              |   2 +-
 .../semanticTests/smoke/alignment.sol         |   2 +-
 .../various/code_access_content.sol           |   2 +-
 .../various/code_access_create.sol            |   2 +-
 .../various/external_types_in_calls.sol       |   2 +-
 .../skip_dynamic_types_for_structs.sol        |   2 +-
 .../various/staticcall_for_view_and_pure.sol  |   6 +-
 35 files changed, 270 insertions(+), 67 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f020044370..54088143b4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ Language Features:
 
 
 Compiler Features:
+ * Code Generator: Skip existence check for external contract if return data is expected. In this case, the ABI decoder will revert if the contract does not exist.
  * Commandline Interface: Accept nested brackets in step sequences passed to ``--yul-optimizations``.
  * Commandline Interface: Add ``--debug-info`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
  * Commandline Interface: Use different colors when printing errors, warnings and infos.
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 731cf1a41a..07d37c4c58 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -2630,9 +2630,21 @@ void ExpressionCompiler::appendExternalFunctionCall(
 	// Check the target contract exists (has code) for non-low-level calls.
 	if (funKind == FunctionType::Kind::External || funKind == FunctionType::Kind::DelegateCall)
 	{
-		m_context << Instruction::DUP1 << Instruction::EXTCODESIZE << Instruction::ISZERO;
-		m_context.appendConditionalRevert(false, "Target contract does not contain code");
-		existenceChecked = true;
+		size_t encodedHeadSize = 0;
+		for (auto const& t: returnTypes)
+			encodedHeadSize += t->decodingType()->calldataHeadSize();
+		// We do not need to check extcodesize if we expect return data, since if there is no
+		// code, the call will return empty data and the ABI decoder will revert.
+		if (
+			encodedHeadSize == 0 ||
+			!haveReturndatacopy ||
+			m_context.revertStrings() >= RevertStrings::Debug
+		)
+		{
+			m_context << Instruction::DUP1 << Instruction::EXTCODESIZE << Instruction::ISZERO;
+			m_context.appendConditionalRevert(false, "Target contract does not contain code");
+			existenceChecked = true;
+		}
 	}
 
 	if (_functionType.gasSet())
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 6d7ee86f53..85b21bbdcd 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2451,8 +2451,10 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 			appendCode() << "mstore(add(" << m_utils.allocateUnboundedFunction() << "() , " << to_string(returnInfo.estimatedReturnSize) << "), 0)\n";
 	}
 
-	Whiskers templ(R"(if iszero(extcodesize(<address>)) { <revertNoCode>() }
-
+	Whiskers templ(R"(
+		<?checkExtcodesize>
+			if iszero(extcodesize(<address>)) { <revertNoCode>() }
+		</checkExtcodesize>
 		// storage for arguments and returned data
 		let <pos> := <allocateUnbounded>()
 		mstore(<pos>, <shl28>(<funSel>))
@@ -2477,6 +2479,18 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 		}
 	)");
 	templ("revertNoCode", m_utils.revertReasonIfDebugFunction("Target contract does not contain code"));
+
+	// We do not need to check extcodesize if we expect return data: If there is no
+	// code, the call will return empty data and the ABI decoder will revert.
+	size_t encodedHeadSize = 0;
+	for (auto const& t: returnInfo.returnTypes)
+		encodedHeadSize += t->decodingType()->calldataHeadSize();
+	bool const checkExtcodesize =
+		encodedHeadSize == 0 ||
+		!m_context.evmVersion().supportsReturndata() ||
+		m_context.revertStrings() >= RevertStrings::Debug;
+	templ("checkExtcodesize", checkExtcodesize);
+
 	templ("pos", m_context.newYulVariable());
 	templ("end", m_context.newYulVariable());
 	if (_functionCall.annotation().tryCall)
@@ -2532,6 +2546,8 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 		u256 gasNeededByCaller = evmasm::GasCosts::callGas(m_context.evmVersion()) + 10;
 		if (funType.valueSet())
 			gasNeededByCaller += evmasm::GasCosts::callValueTransferGas;
+		if (!checkExtcodesize)
+			gasNeededByCaller += evmasm::GasCosts::callNewAccountGas; // we never know
 		templ("gas", "sub(gas(), " + formatNumber(gasNeededByCaller) + ")");
 	}
 	// Order is important here, STATICCALL might overlap with DELEGATECALL.
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index 0c529109ae..773637b321 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -289,6 +289,19 @@ sub_0: assembly {
       address
         /* \"C\":403:411  this.f() */
       extcodesize
+      tag_40
+      jumpi
+        /* \"C\":79:428  contract C... */
+      dup2
+      dup3
+      revert
+        /* \"C\":403:411  this.f() */
+    tag_40:
+        /* \"C\":79:428  contract C... */
+        /* \"C\":403:407  this */
+      address
+        /* \"C\":403:411  this.f() */
+      extcodesize
       iszero
       tag_43
       jumpi
@@ -316,6 +329,8 @@ sub_0: assembly {
       tag_45
       jumpi
       dup1
+      tag_41
+      tag_40
       swap3
       tag_47
       jumpi
@@ -344,12 +359,22 @@ sub_0: assembly {
       swap1
       jump\t// out
         /* \"C\":403:411  this.f() */
+    tag_41:
+    tag_40:
     tag_47:
         /* \"C\":79:428  contract C... */
       swap1
       swap2
       pop
         /* \"C\":403:411  this.f() */
+      dup2
+      iszero
+      tag_42
+      jumpi
+      dup2
+      iszero
+      tag_41
+      jumpi
       returndatasize
         /* \"C\":79:428  contract C... */
       0x1f
@@ -366,6 +391,10 @@ sub_0: assembly {
       dup4
       lt
       or
+      iszero
+      tag_43
+      iszero
+      tag_42
       tag_51
       jumpi
       pop
@@ -379,26 +408,56 @@ sub_0: assembly {
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       tag_50
         /* \"C\":79:428  contract C... */
+      mstore
+      0x24
+      dup7
+      revert
+    tag_43:
+      mstore
+      0x24
+      dup7
+      revert
+    tag_42:
       swap5
       0x40
       mstore
         /* \"C\":403:411  this.f() */
+      tag_44
+      tag_43
       returndatasize
       dup2
       add
       swap1
       tag_7
       jump\t// in
+    tag_44:
+      swap1
+    tag_43:
+      swap1
     tag_53:
       swap2
       dup2
       swap4
       pop
+    tag_42:
+        /* \"C\":392:411  stateVar + this.f() */
+      tag_45
+    tag_41:
+        /* \"C\":392:411  stateVar + this.f() */
+      tag_44
       jump(tag_48)
         /* \"C\":79:428  contract C... */
     tag_51:
       shl(0xe0, 0x4e487b71)
       dup2
+      dup6
+      tag_5
+      jump\t// in
+    tag_45:
+      dup6
+      tag_5
+      jump\t// in
+    tag_44:
       mstore
       0x41
         /* \"C\":403:411  this.f() */
@@ -422,12 +481,30 @@ sub_0: assembly {
       pop
       pop
       pop
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      tag_46
+        /* \"C\":414:422  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      tag_45
+        /* \"C\":414:422  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
       pop
       mload(0x40)
       swap1
       returndatasize
       swap1
       dup3
+      tag_5
+      jump\t// in
+    tag_46:
+        /* \"C\":336:337  _ */
+      tag_5
+      jump\t// in
+    tag_45:
+        /* \"C\":336:337  _ */
       returndatacopy
       returndatasize
       swap1
@@ -453,6 +530,10 @@ sub_0: assembly {
       swap2
       sub
       slt
+      iszero
+      tag_48
+      iszero
+      tag_47
       tag_55
       jumpi
       mload
@@ -464,6 +545,20 @@ sub_0: assembly {
       0x00
       dup1
       revert
+    tag_48:
+      pop
+      mload
+      swap2
+      swap1
+      pop
+      jump\t// out
+    tag_47:
+      pop
+      mload
+      swap2
+      swap1
+      pop
+      jump\t// out
 
     auxdata: <AUXDATA REMOVED>
 }
@@ -799,6 +894,19 @@ sub_0: assembly {
       address
         /* \"C\":403:411  this.f() */
       extcodesize
+      tag_40
+      jumpi
+        /* \"D\":91:166  contract D is C(3)... */
+      dup2
+      dup3
+      revert
+        /* \"C\":403:411  this.f() */
+    tag_40:
+        /* \"D\":91:166  contract D is C(3)... */
+        /* \"C\":403:407  this */
+      address
+        /* \"C\":403:411  this.f() */
+      extcodesize
       iszero
       tag_43
       jumpi
@@ -826,6 +934,8 @@ sub_0: assembly {
       tag_45
       jumpi
       dup1
+      tag_41
+      tag_40
       swap3
       tag_47
       jumpi
@@ -854,12 +964,22 @@ sub_0: assembly {
       swap1
       jump\t// out
         /* \"C\":403:411  this.f() */
+    tag_41:
+    tag_40:
     tag_47:
         /* \"D\":91:166  contract D is C(3)... */
       swap1
       swap2
       pop
         /* \"C\":403:411  this.f() */
+      dup2
+      iszero
+      tag_42
+      jumpi
+      dup2
+      iszero
+      tag_41
+      jumpi
       returndatasize
         /* \"D\":91:166  contract D is C(3)... */
       0x1f
@@ -876,6 +996,10 @@ sub_0: assembly {
       dup4
       lt
       or
+      iszero
+      tag_43
+      iszero
+      tag_42
       tag_51
       jumpi
       pop
@@ -889,26 +1013,56 @@ sub_0: assembly {
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       tag_50
         /* \"D\":91:166  contract D is C(3)... */
+      mstore
+      0x24
+      dup7
+      revert
+    tag_43:
+      mstore
+      0x24
+      dup7
+      revert
+    tag_42:
       swap5
       0x40
       mstore
         /* \"C\":403:411  this.f() */
+      tag_44
+      tag_43
       returndatasize
       dup2
       add
       swap1
       tag_7
       jump\t// in
+    tag_44:
+      swap1
+    tag_43:
+      swap1
     tag_53:
       swap2
       dup2
       swap4
       pop
+    tag_42:
+        /* \"C\":392:411  stateVar + this.f() */
+      tag_45
+    tag_41:
+        /* \"C\":392:411  stateVar + this.f() */
+      tag_44
       jump(tag_48)
         /* \"D\":91:166  contract D is C(3)... */
     tag_51:
       shl(0xe0, 0x4e487b71)
       dup2
+      dup6
+      tag_5
+      jump\t// in
+    tag_45:
+      dup6
+      tag_5
+      jump\t// in
+    tag_44:
       mstore
       0x41
         /* \"C\":403:411  this.f() */
@@ -931,6 +1085,16 @@ sub_0: assembly {
       swap4
       pop
       pop
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      tag_46
+        /* \"C\":414:422  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      tag_45
+        /* \"C\":414:422  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
       pop
       pop
       mload(0x40)
@@ -938,6 +1102,14 @@ sub_0: assembly {
       returndatasize
       swap1
       dup3
+      tag_5
+      jump\t// in
+    tag_46:
+        /* \"C\":336:337  _ */
+      tag_5
+      jump\t// in
+    tag_45:
+        /* \"C\":336:337  _ */
       returndatacopy
       returndatasize
       swap1
@@ -963,6 +1135,10 @@ sub_0: assembly {
       swap2
       sub
       slt
+      iszero
+      tag_48
+      iszero
+      tag_47
       tag_55
       jumpi
       mload
@@ -974,6 +1150,20 @@ sub_0: assembly {
       0x00
       dup1
       revert
+    tag_48:
+      pop
+      mload
+      swap2
+      swap1
+      pop
+      jump\t// out
+    tag_47:
+      pop
+      mload
+      swap2
+      swap1
+      pop
+      jump\t// out
 
     auxdata: <AUXDATA REMOVED>
 }
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index 6a105aadde..2acd68ff75 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -526,7 +526,6 @@ object \"C_54\" {
                 let expr_46_address := convert_t_contract$_C_$54_to_t_address(expr_45_address)
                 let expr_46_functionSelector := 0x26121ff0
                 /// @src 0:410:418  \"this.f()\"
-                if iszero(extcodesize(expr_46_address)) { revert_error_0cc013b6b3b6beabea4e3a74a6d380f0df81852ca99887912475e1f66b2a2c20() }
 
                 // storage for arguments and returned data
                 let _10 := allocate_unbounded()
@@ -640,7 +639,7 @@ object \"C_54\" {
                     case 0x26121ff0 {
                         if callvalue() { revert(_1, _1) }
                         abi_decode(calldatasize())
-                        let ret := /** @src 0:286:305  \"constVar + immutVar\" */ checked_add_int256_566(/** @src 0:297:305  \"immutVar\" */ loadimmutable(\"8\"))
+                        let ret := /** @src 0:286:305  \"constVar + immutVar\" */ checked_add_int256_556(/** @src 0:297:305  \"immutVar\" */ loadimmutable(\"8\"))
                         /// @src 0:79:435  \"contract C...\"
                         let memPos := mload(64)
                         return(memPos, sub(abi_encode_int256(memPos, ret), memPos))
@@ -664,7 +663,7 @@ object \"C_54\" {
                         if callvalue() { revert(_1, _1) }
                         abi_decode(calldatasize())
                         let memPos_3 := mload(64)
-                        return(memPos_3, sub(abi_encode_int256_565(memPos_3), memPos_3))
+                        return(memPos_3, sub(abi_encode_int256_555(memPos_3), memPos_3))
                     }
                 }
                 revert(0, 0)
@@ -673,7 +672,7 @@ object \"C_54\" {
             {
                 if slt(add(dataEnd, not(3)), 0) { revert(0, 0) }
             }
-            function abi_encode_int256_565(headStart) -> tail
+            function abi_encode_int256_555(headStart) -> tail
             {
                 tail := add(headStart, 32)
                 mstore(headStart, /** @src 0:124:126  \"41\" */ 0x29)
@@ -690,7 +689,7 @@ object \"C_54\" {
                 mstore(4, 0x11)
                 revert(0, 0x24)
             }
-            function checked_add_int256_566(y) -> sum
+            function checked_add_int256_556(y) -> sum
             {
                 if and(1, sgt(y, sub(shl(255, 1), 42))) { panic_error_0x11() }
                 sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 0:79:435  \"contract C...\" */ y)
@@ -712,13 +711,6 @@ object \"C_54\" {
                 let ret := add(_3, 1)
                 sstore(_2, ret)
                 /// @src 0:410:418  \"this.f()\"
-                if iszero(extcodesize(/** @src 0:410:414  \"this\" */ address()))
-                /// @src 0:410:418  \"this.f()\"
-                {
-                    /// @src 0:79:435  \"contract C...\"
-                    revert(_2, _2)
-                }
-                /// @src 0:410:418  \"this.f()\"
                 let _4 := /** @src 0:79:435  \"contract C...\" */ mload(64)
                 /// @src 0:410:418  \"this.f()\"
                 mstore(_4, /** @src 0:79:435  \"contract C...\" */ shl(228, 0x026121ff))
@@ -1359,7 +1351,6 @@ object \"D_72\" {
                 let expr_46_address := convert_t_contract$_C_$54_to_t_address(expr_45_address)
                 let expr_46_functionSelector := 0x26121ff0
                 /// @src 0:410:418  \"this.f()\"
-                if iszero(extcodesize(expr_46_address)) { revert_error_0cc013b6b3b6beabea4e3a74a6d380f0df81852ca99887912475e1f66b2a2c20() }
 
                 // storage for arguments and returned data
                 let _10 := allocate_unbounded()
@@ -1481,7 +1472,7 @@ object \"D_72\" {
                     case 0x26121ff0 {
                         if callvalue() { revert(_1, _1) }
                         abi_decode(calldatasize())
-                        let ret := /** @src 0:286:305  \"constVar + immutVar\" */ checked_add_int256_566(/** @src 0:297:305  \"immutVar\" */ loadimmutable(\"8\"))
+                        let ret := /** @src 0:286:305  \"constVar + immutVar\" */ checked_add_int256_556(/** @src 0:297:305  \"immutVar\" */ loadimmutable(\"8\"))
                         /// @src 1:91:166  \"contract D is C(3)...\"
                         let memPos := mload(64)
                         return(memPos, sub(abi_encode_int256(memPos, ret), memPos))
@@ -1505,7 +1496,7 @@ object \"D_72\" {
                         if callvalue() { revert(_1, _1) }
                         abi_decode(calldatasize())
                         let memPos_3 := mload(64)
-                        return(memPos_3, sub(abi_encode_int256_565(memPos_3), memPos_3))
+                        return(memPos_3, sub(abi_encode_int256_555(memPos_3), memPos_3))
                     }
                 }
                 revert(0, 0)
@@ -1514,7 +1505,7 @@ object \"D_72\" {
             {
                 if slt(add(dataEnd, not(3)), 0) { revert(0, 0) }
             }
-            function abi_encode_int256_565(headStart) -> tail
+            function abi_encode_int256_555(headStart) -> tail
             {
                 tail := add(headStart, 32)
                 mstore(headStart, /** @src 0:124:126  \"41\" */ 0x29)
@@ -1531,7 +1522,7 @@ object \"D_72\" {
                 mstore(4, 0x11)
                 revert(0, 0x24)
             }
-            function checked_add_int256_566(y) -> sum
+            function checked_add_int256_556(y) -> sum
             {
                 if and(1, sgt(y, sub(shl(255, 1), 42))) { panic_error_0x11() }
                 sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 1:91:166  \"contract D is C(3)...\" */ y)
@@ -1553,13 +1544,6 @@ object \"D_72\" {
                 let ret := add(_3, 1)
                 sstore(_2, ret)
                 /// @src 0:410:418  \"this.f()\"
-                if iszero(extcodesize(/** @src 0:410:414  \"this\" */ address()))
-                /// @src 0:410:418  \"this.f()\"
-                {
-                    /// @src 1:91:166  \"contract D is C(3)...\"
-                    revert(_2, _2)
-                }
-                /// @src 0:410:418  \"this.f()\"
                 let _4 := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(64)
                 /// @src 0:410:418  \"this.f()\"
                 mstore(_4, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index ddd536a380..947f5cb234 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -61,9 +61,9 @@ contract C {
 // ----
 // test_bytes() ->
 // gas irOptimized: 377545
-// gas legacy: 423563
+// gas legacy: 418955
 // gas legacyOptimized: 331391
 // test_uint256() ->
 // gas irOptimized: 528726
-// gas legacy: 591392
+// gas legacy: 586784
 // gas legacyOptimized: 456137
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index 8fe170e917..886d9dfd90 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -27,5 +27,5 @@ contract C {
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
 // gas irOptimized: 167580
-// gas legacy: 169475
+// gas legacy: 169347
 // gas legacyOptimized: 167397
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 3a4a23fef7..f75eecfb59 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -62,9 +62,9 @@ contract C {
 // ----
 // test_bytes() ->
 // gas irOptimized: 377545
-// gas legacy: 423563
+// gas legacy: 418955
 // gas legacyOptimized: 331391
 // test_uint256() ->
 // gas irOptimized: 528726
-// gas legacy: 591392
+// gas legacy: 586784
 // gas legacyOptimized: 456137
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index b730f3588d..49b93cbbcd 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -33,5 +33,5 @@ contract C is B {
 // ----
 // test() -> 77
 // gas irOptimized: 120044
-// gas legacy: 155221
+// gas legacy: 155093
 // gas legacyOptimized: 111678
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
index 7832ef601e..28658089ad 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
@@ -41,4 +41,4 @@ contract C is B {
 // ----
 // test() -> 5, 10
 // gas irOptimized: 87578
-// gas legacy: 99137
+// gas legacy: 98881
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index bf42f87761..131430aa56 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -22,5 +22,5 @@ contract C {
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
 // gas irOptimized: 172204
-// gas legacy: 141900
+// gas legacy: 141644
 // gas legacyOptimized: 121788
diff --git a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
index f8e4ca2a4a..7e3edc127a 100644
--- a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
+++ b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
@@ -18,4 +18,4 @@ contract D {
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x11
 // g(), 100 wei -> 1
-// gas legacy: 101918
+// gas legacy: 101790
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 5e30621af2..063e0bf9c0 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -22,5 +22,5 @@ contract B {
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
 // gas irOptimized: 130328
-// gas legacy: 235199
+// gas legacy: 234943
 // gas legacyOptimized: 133119
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 95cb52f112..6edae71981 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -46,5 +46,5 @@ contract C {
 // ----
 // test() -> 5, 6, 7
 // gas irOptimized: 302321
-// gas legacy: 462080
+// gas legacy: 452172
 // gas legacyOptimized: 294938
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index 7d2b4d9957..a8a534b920 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -27,5 +27,5 @@ contract Main {
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
 // gas irOptimized: 113776
-// gas legacy: 126852
+// gas legacy: 126596
 // gas legacyOptimized: 114079
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 63c2acbb50..7016e6c6ec 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -27,5 +27,5 @@ contract Creator {
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
 // gas irOptimized: 456873
-// gas legacy: 590939
+// gas legacy: 590683
 // gas legacyOptimized: 448582
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index d4d41d80c2..1aba4c7c47 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -27,5 +27,5 @@ contract Creator {
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
 // gas irOptimized: 308702
-// gas legacy: 429173
+// gas legacy: 428917
 // gas legacyOptimized: 298384
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
index 78466f3f0b..f1043f559b 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
@@ -19,4 +19,4 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 16
-// gas legacy: 103744
+// gas legacy: 103488
diff --git a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
index 1694b64d5d..0e89c75604 100644
--- a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
@@ -15,4 +15,4 @@ contract D {
 // compileViaYul: also
 // ----
 // f() -> 2
-// gas legacy: 101754
+// gas legacy: 101626
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
index 8546c775e8..0ab6fe0c3c 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
@@ -13,4 +13,4 @@ contract D {
 // compileViaYul: also
 // ----
 // f() -> 2
-// gas legacy: 101727
+// gas legacy: 101599
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index b50890f559..49c6a80a97 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -19,7 +19,7 @@ contract C {
 // ----
 // constructor(), 20 wei
 // gas irOptimized: 220113
-// gas legacy: 288299
+// gas legacy: 294569
 // gas legacyOptimized: 177933
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
 // x() -> 1
@@ -27,7 +27,7 @@ contract C {
 // x() -> 1
 // stack(uint256): 1023 -> FAILURE
 // gas irOptimized: 345821
-// gas legacy: 535367
+// gas legacy: 483942
 // gas legacyOptimized: 354656
 // x() -> 1
 // stack(uint256): 10 -> 693016686122178122849713379390321835634789309880
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index c2678a91de..9200bd1205 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -29,5 +29,5 @@ contract C {
 // ----
 // t() -> 9
 // gas irOptimized: 99186
-// gas legacy: 159083
+// gas legacy: 158955
 // gas legacyOptimized: 108916
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index cd5992ce6e..d4300cfe13 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -30,7 +30,7 @@ contract C {
 // ----
 // f() -> 3, 7, 5
 // gas irOptimized: 127592
-// gas legacy: 151590
+// gas legacy: 151334
 // gas legacyOptimized: 125422
 // x() -> 7
 // y() -> 5
diff --git a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
index 0dc9845f4d..8c9c6195c5 100644
--- a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
+++ b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
@@ -24,7 +24,7 @@ contract D {
 // ----
 // f() -> 1
 // gas irOptimized: 77164
-// gas legacy: 115012
+// gas legacy: 114884
 // g() -> 5
 // gas irOptimized: 77231
-// gas legacy: 115558
+// gas legacy: 115430
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
index e012accafe..7322e5f96b 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
@@ -26,4 +26,4 @@ contract B {
 // ----
 // g() -> 42
 // gas irOptimized: 80945
-// gas legacy: 125609
+// gas legacy: 125481
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index 4105577f05..9b5f9778ca 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -26,5 +26,5 @@ contract B {
 // ----
 // g() -> 42
 // gas irOptimized: 111913
-// gas legacy: 185181
+// gas legacy: 185053
 // gas legacyOptimized: 114726
diff --git a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
index 9a095cc21d..a400531ca8 100644
--- a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
+++ b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
@@ -22,6 +22,6 @@ contract A {
 // compileViaYul: also
 // ----
 // g(int256): -1 -> -1
-// gas legacy: 103622
+// gas legacy: 103494
 // g(int256): 10 -> 10
-// gas legacy: 103250
+// gas legacy: 103122
diff --git a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
index 11cb938320..5dfeb9a69d 100644
--- a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
+++ b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
@@ -40,7 +40,7 @@ contract C {
 // gas irOptimized: 85640
 // convertSubA() -> 1, 2
 // gas irOptimized: 86395
-// gas legacy: 99303
+// gas legacy: 99047
 // convertSubB() -> 1, 3
 // gas irOptimized: 86338
-// gas legacy: 99237
+// gas legacy: 98981
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 17edaf3eb4..2d1070e2a8 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -23,5 +23,5 @@ contract A {
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
 // gas irOptimized: 273275
-// gas legacy: 422885
+// gas legacy: 422501
 // gas legacyOptimized: 287856
diff --git a/test/libsolidity/semanticTests/smoke/alignment.sol b/test/libsolidity/semanticTests/smoke/alignment.sol
index 1434734615..80c69bb438 100644
--- a/test/libsolidity/semanticTests/smoke/alignment.sol
+++ b/test/libsolidity/semanticTests/smoke/alignment.sol
@@ -27,5 +27,5 @@ contract D {
 // stateDecimal() -> right(42)
 // stateBytes() -> left(0x4200ef)
 // internalStateDecimal() -> 0x20
-// gas legacy: 101807
+// gas legacy: 101679
 // update(bool,uint256,bytes32): false, -23, left(0x2300ef) -> false, -23, left(0x2300ef)
diff --git a/test/libsolidity/semanticTests/various/code_access_content.sol b/test/libsolidity/semanticTests/various/code_access_content.sol
index 3f8d56587d..39ac71b540 100644
--- a/test/libsolidity/semanticTests/various/code_access_content.sol
+++ b/test/libsolidity/semanticTests/various/code_access_content.sol
@@ -42,4 +42,4 @@ contract C {
 // testRuntime() -> true
 // gas legacy: 101579
 // testCreation() -> true
-// gas legacy: 102137
+// gas legacy: 102009
diff --git a/test/libsolidity/semanticTests/various/code_access_create.sol b/test/libsolidity/semanticTests/various/code_access_create.sol
index c32135fe5f..ce0d6305db 100644
--- a/test/libsolidity/semanticTests/various/code_access_create.sol
+++ b/test/libsolidity/semanticTests/various/code_access_create.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 7
-// gas legacy: 102392
+// gas legacy: 102264
diff --git a/test/libsolidity/semanticTests/various/external_types_in_calls.sol b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
index 229e93fc16..1b50465b4f 100644
--- a/test/libsolidity/semanticTests/various/external_types_in_calls.sol
+++ b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
@@ -27,5 +27,5 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 9, 7
-// gas legacy: 130016
+// gas legacy: 129760
 // t2() -> 9
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 8ef472136a..25d7b3c78d 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -23,5 +23,5 @@ contract C {
 // ----
 // g() -> 2, 6
 // gas irOptimized: 178953
-// gas legacy: 180890
+// gas legacy: 180762
 // gas legacyOptimized: 179609
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index ab6d6e59a0..cc910826bd 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -36,12 +36,12 @@ contract D {
 // compileViaYul: also
 // ----
 // f() -> 0x1 # This should work, next should throw #
-// gas legacy: 103844
+// gas legacy: 103716
 // fview() -> FAILURE
 // gas irOptimized: 98438627
-// gas legacy: 98438803
+// gas legacy: 98438801
 // gas legacyOptimized: 98438596
 // fpure() -> FAILURE
 // gas irOptimized: 98438627
-// gas legacy: 98438803
+// gas legacy: 98438801
 // gas legacyOptimized: 98438597

From 31c504c5baa24898f71790e42f4a626c15dca3a1 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 28 Oct 2021 12:35:06 +0200
Subject: [PATCH 0092/1748] Add test for extcodesize check.

---
 .../external_call_at_construction_time.sol    | 28 +++++++++++++
 .../external_call_to_nonexisting.sol          | 36 +++++++++++++++++
 ...ernal_call_to_nonexisting_debugstrings.sol | 39 +++++++++++++++++++
 .../precompile_extcodesize_check.sol          | 11 +++++-
 4 files changed, 113 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
 create mode 100644 test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
 create mode 100644 test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol

diff --git a/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol b/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
new file mode 100644
index 0000000000..d5b0d09740
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
@@ -0,0 +1,28 @@
+pragma solidity >= 0.6.0;
+
+// This tests skipping the extcodesize check.
+
+contract T {
+    constructor() { this.f(); }
+    function f() external {}
+}
+contract U {
+    constructor() { this.f(); }
+    function f() external returns (uint) {}
+}
+
+contract C {
+    function f(uint c) external returns (uint) {
+        if (c == 0) new T();
+        else if (c == 1) new U();
+        return 1 + c;
+    }
+}
+
+// ====
+// EVMVersion: >=byzantium
+// compileViaYul: also
+// ----
+// f(uint256): 0 -> FAILURE
+// f(uint256): 1 -> FAILURE
+// f(uint256): 2 -> 3
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
new file mode 100644
index 0000000000..9546f10986
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -0,0 +1,36 @@
+// This tests skipping the extcodesize check.
+
+interface I {
+    function a() external pure;
+    function b() external;
+    function c() external payable;
+    function x() external returns (uint);
+    function y() external returns (string memory);
+}
+contract C {
+    I i = I(address(0xcafecafe));
+    constructor() payable {}
+    function f(uint c) external returns (uint) {
+        if (c == 0) i.a();
+        else if (c == 1) i.b();
+        else if (c == 2) i.c();
+        else if (c == 3) i.c{value: 1}();
+        else if (c == 4) i.x();
+        else if (c == 5) i.y();
+        return 1 + c;
+    }
+}
+
+// ====
+// compileViaYul: also
+// ----
+// constructor(), 1 ether ->
+// gas legacy: 465314
+// gas legacyOptimized: 510004
+// f(uint256): 0 -> FAILURE
+// f(uint256): 1 -> FAILURE
+// f(uint256): 2 -> FAILURE
+// f(uint256): 3 -> FAILURE
+// f(uint256): 4 -> FAILURE
+// f(uint256): 5 -> FAILURE
+// f(uint256): 6 -> 7
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
new file mode 100644
index 0000000000..ca635d3108
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -0,0 +1,39 @@
+pragma solidity >= 0.6.0;
+
+// This tests skipping the extcodesize check.
+
+interface I {
+    function a() external pure;
+    function b() external;
+    function c() external payable;
+    function x() external returns (uint);
+    function y() external returns (string memory);
+}
+contract C {
+    I i = I(address(0xcafecafe));
+    constructor() payable {}
+    function f(uint c) external returns (uint) {
+        if (c == 0) i.a();
+        else if (c == 1) i.b();
+        else if (c == 2) i.c();
+        else if (c == 3) i.c{value: 1}();
+        else if (c == 4) i.x();
+        else if (c == 5) i.y();
+        return 1 + c;
+    }
+}
+
+// ====
+// EVMVersion: >=byzantium
+// compileViaYul: also
+// revertStrings: debug
+// ----
+// constructor(), 1 ether ->
+// gas legacyOptimized: 510004
+// f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
+// f(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
+// f(uint256): 2 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
+// f(uint256): 3 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
+// f(uint256): 4 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
+// f(uint256): 5 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
+// f(uint256): 6 -> 7
diff --git a/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol b/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
index 7a9025e26c..c07adb9094 100644
--- a/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
+++ b/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
@@ -1,13 +1,21 @@
 interface Identity {
     function selectorAndAppendValue(uint value) external pure returns (uint);
 }
+interface ReturnMoreData {
+    function f(uint value) external pure returns (uint, uint, uint);
+}
 contract C {
     Identity constant i = Identity(address(0x0004));
     function testHighLevel() external pure returns (bool) {
-        // Should fail because `extcodesize(4) = 0`
+        // Works because the extcodesize check is skipped
+        // and the precompiled contract returns actual data.
         i.selectorAndAppendValue(5);
         return true;
     }
+    function testHighLevel2() external pure returns (uint, uint, uint) {
+        // Fails because the identity contract does not return enough data.
+        return ReturnMoreData(address(4)).f(2);
+    }
     function testLowLevel() external view returns (uint value) {
         (bool success, bytes memory ret) =
             address(4).staticcall(
@@ -23,3 +31,4 @@ contract C {
 // ----
 // testHighLevel() -> FAILURE
 // testLowLevel() -> 0xc76596d400000000000000000000000000000000000000000000000000000000
+// testHighLevel2() -> FAILURE

From f320a95dd9be698df9fa7a3c12a7efc1a22a1521 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 2 Nov 2021 12:04:31 +0100
Subject: [PATCH 0093/1748] Update documentation.

---
 docs/control-structures.rst              | 11 ++++++++++-
 docs/introduction-to-smart-contracts.rst | 21 +++++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 49e66537d3..84b65918d3 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -114,10 +114,19 @@ otherwise, the ``value`` option would not be available.
 Due to the fact that the EVM considers a call to a non-existing contract to
 always succeed, Solidity uses the ``extcodesize`` opcode to check that
 the contract that is about to be called actually exists (it contains code)
-and causes an exception if it does not.
+and causes an exception if it does not. This check is skipped if the return
+data will be decoded after the call and thus the ABI decoder will catch the
+case of a non-existing contract.
+
 Note that this check is not performed in case of :ref:`low-level calls <address_related>` which
 operate on addresses rather than contract instances.
 
+.. note::
+    Be careful when using high-level calls to
+    :ref:`precompiled contracts <precompiledContracts>`,
+    since the compiler considers them non-existing according to the
+    above logic even though they execute code and can return data.
+
 Function calls also cause exceptions if the called contract itself
 throws an exception or goes out of gas.
 
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index c22d4e6fa9..d19a0decf8 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -565,3 +565,24 @@ contracts, the Ether is forever lost.
 If you want to deactivate your contracts, you should instead **disable** them
 by changing some internal state which causes all functions to revert. This
 makes it impossible to use the contract, as it returns Ether immediately.
+
+
+.. index:: ! precompiled contracts, ! precompiles, ! contract;precompiled
+
+.. _precompiledContracts:
+
+Precompiled Contracts
+=====================
+
+There is a small set of contract addresses that are special:
+The address range between ``1`` and (including) ``8`` contains
+"precompiled contracts" that can be called as any other contract
+but their behaviour (and their gas consumption) is not defined
+by EVM code stored at that address (they do not contain code)
+but instead is implemented in the EVM execution environment itself.
+
+Different EVM-compatible chains might use a different set of
+precompiled contracts. It might also be possible that new
+precompiled contracts are added to the Ethereum main chain in the future,
+but you can reasonabyly expect them to always be in the range between
+``1`` and ``0xffff`` (inclusive).
\ No newline at end of file

From 080c7245aebdb4e7ab1d2b2f3a6194244eda976f Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 4 Nov 2021 18:20:10 +0100
Subject: [PATCH 0094/1748] Update tests.

---
 .../output.json                               | 312 +++---------------
 .../abi_encode_calldata_slice.sol             |   8 +-
 .../struct/struct_storage_ptr.sol             |   4 +-
 .../abi_encode_calldata_slice.sol             |   8 +-
 ...2_in_function_inherited_in_v1_contract.sol |   4 +-
 ...ode_v2_in_modifier_used_in_v1_contract.sol |   2 +-
 .../abiEncoderV2/calldata_array.sol           |   4 +-
 .../array/fixed_arrays_as_return_type.sol     |   4 +-
 .../array/function_array_cross_calls.sol      |   4 +-
 .../semanticTests/array/reusing_memory.sol    |   4 +-
 .../constructor/arrays_in_constructors.sol    |   4 +-
 .../bytes_in_constructors_packer.sol          |   4 +-
 .../external_call_at_construction_time.sol    |   2 -
 ...ernal_call_to_nonexisting_debugstrings.sol |   2 -
 .../functionCall/failed_create.sol            |   8 +-
 .../precompile_extcodesize_check.sol          |   4 +-
 .../functionTypes/store_function.sol          |   4 +-
 .../immutable/multi_creation.sol              |   4 +-
 .../address_overload_resolution.sol           |   4 +-
 ...d_function_calldata_calldata_interface.sol |   2 +-
 ...ted_function_calldata_memory_interface.sol |   4 +-
 .../interface_inheritance_conversions.sol     |   6 +-
 .../salted_create_with_value.sol              |   4 +-
 .../skip_dynamic_types_for_structs.sol        |   4 +-
 .../various/staticcall_for_view_and_pure.sol  |   8 +-
 25 files changed, 95 insertions(+), 323 deletions(-)

diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index 773637b321..1c3999afcf 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -285,40 +285,18 @@ sub_0: assembly {
       dup2
       dup2
       sstore
-        /* \"C\":403:407  this */
-      address
-        /* \"C\":403:411  this.f() */
-      extcodesize
-      tag_40
-      jumpi
-        /* \"C\":79:428  contract C... */
-      dup2
-      dup3
-      revert
-        /* \"C\":403:411  this.f() */
-    tag_40:
-        /* \"C\":79:428  contract C... */
-        /* \"C\":403:407  this */
-      address
-        /* \"C\":403:411  this.f() */
-      extcodesize
-      iszero
-      tag_43
-      jumpi
-        /* \"C\":79:428  contract C... */
       mload(0x40)
       shl(0xe4, 0x026121ff)
         /* \"C\":403:411  this.f() */
       dup2
       mstore
       0x20
-        /* \"C\":79:428  contract C... */
+        /* \"C\":403:407  this */
       dup2
         /* \"C\":403:411  this.f() */
       0x04
-        /* \"C\":79:428  contract C... */
-      dup2
         /* \"C\":403:407  this */
+      dup2
       address
         /* \"C\":403:411  this.f() */
       gas
@@ -326,55 +304,43 @@ sub_0: assembly {
       swap2
       dup3
       iszero
-      tag_45
+      tag_43
       jumpi
       dup1
-      tag_41
-      tag_40
       swap3
-      tag_47
+      tag_45
       jumpi
         /* \"C\":304:341  modifier m()... */
-    tag_48:
+    tag_46:
         /* \"C\":392:411  stateVar + this.f() */
       pop
       pop
-      tag_49
+      tag_47
       swap1
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_50
+      tag_48
         /* \"C\":392:411  stateVar + this.f() */
       swap3
       tag_5
       jump\t// in
-    tag_49:
+    tag_47:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       swap1
       tag_5
       jump\t// in
-    tag_50:
+    tag_48:
         /* \"C\":304:341  modifier m()... */
       swap1
       jump\t// out
         /* \"C\":403:411  this.f() */
-    tag_41:
-    tag_40:
-    tag_47:
+    tag_45:
         /* \"C\":79:428  contract C... */
       swap1
       swap2
       pop
         /* \"C\":403:411  this.f() */
-      dup2
-      iszero
-      tag_42
-      jumpi
-      dup2
-      iszero
-      tag_41
-      jumpi
       returndatasize
         /* \"C\":79:428  contract C... */
       0x1f
@@ -391,73 +357,39 @@ sub_0: assembly {
       dup4
       lt
       or
-      iszero
-      tag_43
-      iszero
-      tag_42
-      tag_51
+      tag_49
       jumpi
       pop
       swap2
         /* \"C\":403:411  this.f() */
-      tag_53
+      tag_51
         /* \"C\":392:411  stateVar + this.f() */
-      tag_49
+      tag_47
         /* \"C\":79:428  contract C... */
       swap3
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_50
+      tag_48
         /* \"C\":79:428  contract C... */
-      mstore
-      0x24
-      dup7
-      revert
-    tag_43:
-      mstore
-      0x24
-      dup7
-      revert
-    tag_42:
       swap5
       0x40
       mstore
         /* \"C\":403:411  this.f() */
-      tag_44
-      tag_43
       returndatasize
       dup2
       add
       swap1
       tag_7
       jump\t// in
-    tag_44:
-      swap1
-    tag_43:
-      swap1
-    tag_53:
+    tag_51:
       swap2
       dup2
       swap4
       pop
-    tag_42:
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_45
-    tag_41:
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_44
-      jump(tag_48)
+      jump(tag_46)
         /* \"C\":79:428  contract C... */
-    tag_51:
+    tag_49:
       shl(0xe0, 0x4e487b71)
       dup2
-      dup6
-      tag_5
-      jump\t// in
-    tag_45:
-      dup6
-      tag_5
-      jump\t// in
-    tag_44:
       mstore
       0x41
         /* \"C\":403:411  this.f() */
@@ -475,53 +407,27 @@ sub_0: assembly {
         /* \"C\":79:428  contract C... */
       revert
         /* \"C\":403:411  this.f() */
-    tag_45:
+    tag_43:
         /* \"C\":79:428  contract C... */
       swap4
       pop
       pop
       pop
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_46
-        /* \"C\":414:422  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_45
-        /* \"C\":414:422  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
       pop
       mload(0x40)
       swap1
       returndatasize
       swap1
       dup3
-      tag_5
-      jump\t// in
-    tag_46:
-        /* \"C\":336:337  _ */
-      tag_5
-      jump\t// in
-    tag_45:
-        /* \"C\":336:337  _ */
       returndatacopy
       returndatasize
       swap1
-      revert
-        /* \"C\":403:411  this.f() */
-    tag_43:
-        /* \"C\":79:428  contract C... */
-      swap2
-      pop
-      pop
-      dup1
       revert
     tag_41:
-      tag_54
+      tag_52
       tag_3
       jump\t// in
-    tag_54:
+    tag_52:
       jump(tag_42)
     tag_7:
       swap1
@@ -530,35 +436,17 @@ sub_0: assembly {
       swap2
       sub
       slt
-      iszero
-      tag_48
-      iszero
-      tag_47
-      tag_55
+      tag_53
       jumpi
       mload
       swap1
       jump\t// out
-    tag_55:
+    tag_53:
       pop
       pop
       0x00
       dup1
       revert
-    tag_48:
-      pop
-      mload
-      swap2
-      swap1
-      pop
-      jump\t// out
-    tag_47:
-      pop
-      mload
-      swap2
-      swap1
-      pop
-      jump\t// out
 
     auxdata: <AUXDATA REMOVED>
 }
@@ -890,40 +778,18 @@ sub_0: assembly {
       dup2
       dup2
       sstore
-        /* \"C\":403:407  this */
-      address
-        /* \"C\":403:411  this.f() */
-      extcodesize
-      tag_40
-      jumpi
-        /* \"D\":91:166  contract D is C(3)... */
-      dup2
-      dup3
-      revert
-        /* \"C\":403:411  this.f() */
-    tag_40:
-        /* \"D\":91:166  contract D is C(3)... */
-        /* \"C\":403:407  this */
-      address
-        /* \"C\":403:411  this.f() */
-      extcodesize
-      iszero
-      tag_43
-      jumpi
-        /* \"D\":91:166  contract D is C(3)... */
       mload(0x40)
       shl(0xe4, 0x026121ff)
         /* \"C\":403:411  this.f() */
       dup2
       mstore
       0x20
-        /* \"D\":91:166  contract D is C(3)... */
+        /* \"C\":403:407  this */
       dup2
         /* \"C\":403:411  this.f() */
       0x04
-        /* \"D\":91:166  contract D is C(3)... */
-      dup2
         /* \"C\":403:407  this */
+      dup2
       address
         /* \"C\":403:411  this.f() */
       gas
@@ -931,55 +797,43 @@ sub_0: assembly {
       swap2
       dup3
       iszero
-      tag_45
+      tag_43
       jumpi
       dup1
-      tag_41
-      tag_40
       swap3
-      tag_47
+      tag_45
       jumpi
         /* \"C\":304:341  modifier m()... */
-    tag_48:
+    tag_46:
         /* \"C\":392:411  stateVar + this.f() */
       pop
       pop
-      tag_49
+      tag_47
       swap1
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_50
+      tag_48
         /* \"C\":392:411  stateVar + this.f() */
       swap3
       tag_5
       jump\t// in
-    tag_49:
+    tag_47:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       swap1
       tag_5
       jump\t// in
-    tag_50:
+    tag_48:
         /* \"C\":304:341  modifier m()... */
       swap1
       jump\t// out
         /* \"C\":403:411  this.f() */
-    tag_41:
-    tag_40:
-    tag_47:
+    tag_45:
         /* \"D\":91:166  contract D is C(3)... */
       swap1
       swap2
       pop
         /* \"C\":403:411  this.f() */
-      dup2
-      iszero
-      tag_42
-      jumpi
-      dup2
-      iszero
-      tag_41
-      jumpi
       returndatasize
         /* \"D\":91:166  contract D is C(3)... */
       0x1f
@@ -996,73 +850,39 @@ sub_0: assembly {
       dup4
       lt
       or
-      iszero
-      tag_43
-      iszero
-      tag_42
-      tag_51
+      tag_49
       jumpi
       pop
       swap2
         /* \"C\":403:411  this.f() */
-      tag_53
+      tag_51
         /* \"C\":392:411  stateVar + this.f() */
-      tag_49
+      tag_47
         /* \"D\":91:166  contract D is C(3)... */
       swap3
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_50
+      tag_48
         /* \"D\":91:166  contract D is C(3)... */
-      mstore
-      0x24
-      dup7
-      revert
-    tag_43:
-      mstore
-      0x24
-      dup7
-      revert
-    tag_42:
       swap5
       0x40
       mstore
         /* \"C\":403:411  this.f() */
-      tag_44
-      tag_43
       returndatasize
       dup2
       add
       swap1
       tag_7
       jump\t// in
-    tag_44:
-      swap1
-    tag_43:
-      swap1
-    tag_53:
+    tag_51:
       swap2
       dup2
       swap4
       pop
-    tag_42:
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_45
-    tag_41:
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_44
-      jump(tag_48)
+      jump(tag_46)
         /* \"D\":91:166  contract D is C(3)... */
-    tag_51:
+    tag_49:
       shl(0xe0, 0x4e487b71)
       dup2
-      dup6
-      tag_5
-      jump\t// in
-    tag_45:
-      dup6
-      tag_5
-      jump\t// in
-    tag_44:
       mstore
       0x41
         /* \"C\":403:411  this.f() */
@@ -1080,21 +900,11 @@ sub_0: assembly {
         /* \"D\":91:166  contract D is C(3)... */
       revert
         /* \"C\":403:411  this.f() */
-    tag_45:
+    tag_43:
         /* \"D\":91:166  contract D is C(3)... */
       swap4
       pop
       pop
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_46
-        /* \"C\":414:422  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_45
-        /* \"C\":414:422  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
       pop
       pop
       mload(0x40)
@@ -1102,31 +912,15 @@ sub_0: assembly {
       returndatasize
       swap1
       dup3
-      tag_5
-      jump\t// in
-    tag_46:
-        /* \"C\":336:337  _ */
-      tag_5
-      jump\t// in
-    tag_45:
-        /* \"C\":336:337  _ */
       returndatacopy
       returndatasize
       swap1
-      revert
-        /* \"C\":403:411  this.f() */
-    tag_43:
-        /* \"D\":91:166  contract D is C(3)... */
-      swap2
-      pop
-      pop
-      dup1
       revert
     tag_41:
-      tag_54
+      tag_52
       tag_3
       jump\t// in
-    tag_54:
+    tag_52:
       jump(tag_42)
     tag_7:
       swap1
@@ -1135,35 +929,17 @@ sub_0: assembly {
       swap2
       sub
       slt
-      iszero
-      tag_48
-      iszero
-      tag_47
-      tag_55
+      tag_53
       jumpi
       mload
       swap1
       jump\t// out
-    tag_55:
+    tag_53:
       pop
       pop
       0x00
       dup1
       revert
-    tag_48:
-      pop
-      mload
-      swap2
-      swap1
-      pop
-      jump\t// out
-    tag_47:
-      pop
-      mload
-      swap2
-      swap1
-      pop
-      jump\t// out
 
     auxdata: <AUXDATA REMOVED>
 }
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 947f5cb234..e54c39d322 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // compileViaYul: also
 // ----
 // test_bytes() ->
-// gas irOptimized: 377545
+// gas irOptimized: 373483
 // gas legacy: 418955
-// gas legacyOptimized: 331391
+// gas legacyOptimized: 326783
 // test_uint256() ->
-// gas irOptimized: 528726
+// gas irOptimized: 524664
 // gas legacy: 586784
-// gas legacyOptimized: 456137
+// gas legacyOptimized: 451529
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index 886d9dfd90..19d9b1b9a4 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -26,6 +26,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 167580
+// gas irOptimized: 167446
 // gas legacy: 169347
-// gas legacyOptimized: 167397
+// gas legacyOptimized: 167269
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index f75eecfb59..53aeb89499 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -61,10 +61,10 @@ contract C {
 // compileViaYul: also
 // ----
 // test_bytes() ->
-// gas irOptimized: 377545
+// gas irOptimized: 373483
 // gas legacy: 418955
-// gas legacyOptimized: 331391
+// gas legacyOptimized: 326783
 // test_uint256() ->
-// gas irOptimized: 528726
+// gas irOptimized: 524664
 // gas legacy: 586784
-// gas legacyOptimized: 456137
+// gas legacyOptimized: 451529
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index 49b93cbbcd..953fa79455 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -32,6 +32,6 @@ contract C is B {
 // compileViaYul: also
 // ----
 // test() -> 77
-// gas irOptimized: 120044
+// gas irOptimized: 119931
 // gas legacy: 155093
-// gas legacyOptimized: 111678
+// gas legacyOptimized: 111550
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
index 28658089ad..1531183555 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
@@ -40,5 +40,5 @@ contract C is B {
 // compileViaYul: also
 // ----
 // test() -> 5, 10
-// gas irOptimized: 87578
+// gas irOptimized: 87337
 // gas legacy: 98881
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 131430aa56..11fccbb610 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -21,6 +21,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 172204
+// gas irOptimized: 171964
 // gas legacy: 141644
-// gas legacyOptimized: 121788
+// gas legacyOptimized: 121532
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 063e0bf9c0..3b0a73d006 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -21,6 +21,6 @@ contract B {
 // compileViaYul: also
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 130328
+// gas irOptimized: 130097
 // gas legacy: 234943
-// gas legacyOptimized: 133119
+// gas legacyOptimized: 132863
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 6edae71981..9c78c12070 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -45,6 +45,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 302321
+// gas irOptimized: 290947
 // gas legacy: 452172
-// gas legacyOptimized: 294938
+// gas legacyOptimized: 285017
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index a8a534b920..ee1a57b1ee 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -26,6 +26,6 @@ contract Main {
 // compileViaYul: also
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 113776
+// gas irOptimized: 113581
 // gas legacy: 126596
-// gas legacyOptimized: 114079
+// gas legacyOptimized: 113823
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 7016e6c6ec..7885b24a34 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 456873
+// gas irOptimized: 456668
 // gas legacy: 590683
-// gas legacyOptimized: 448582
+// gas legacyOptimized: 448326
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 1aba4c7c47..434b926fc6 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 308702
+// gas irOptimized: 308497
 // gas legacy: 428917
-// gas legacyOptimized: 298384
+// gas legacyOptimized: 298128
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol b/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
index d5b0d09740..2fb2f266d7 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
@@ -1,5 +1,3 @@
-pragma solidity >= 0.6.0;
-
 // This tests skipping the extcodesize check.
 
 contract T {
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index ca635d3108..f426e628eb 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -1,5 +1,3 @@
-pragma solidity >= 0.6.0;
-
 // This tests skipping the extcodesize check.
 
 interface I {
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 49c6a80a97..54cd9f06a5 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -18,17 +18,17 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 220113
+// gas irOptimized: 218775
 // gas legacy: 294569
-// gas legacyOptimized: 177933
+// gas legacyOptimized: 174699
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
 // x() -> 1
 // f(uint256): 20 -> FAILURE
 // x() -> 1
 // stack(uint256): 1023 -> FAILURE
-// gas irOptimized: 345821
+// gas irOptimized: 296769
 // gas legacy: 483942
-// gas legacyOptimized: 354656
+// gas legacyOptimized: 298807
 // x() -> 1
 // stack(uint256): 10 -> 693016686122178122849713379390321835634789309880
 // x() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol b/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
index c07adb9094..b82c5f9b7d 100644
--- a/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
+++ b/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
@@ -26,9 +26,9 @@ contract C {
 
 }
 // ====
-// compileViaYul: also
 // EVMVersion: >=constantinople
+// compileViaYul: also
 // ----
-// testHighLevel() -> FAILURE
+// testHighLevel() -> true
 // testLowLevel() -> 0xc76596d400000000000000000000000000000000000000000000000000000000
 // testHighLevel2() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index 9200bd1205..dab82918a5 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -28,6 +28,6 @@ contract C {
 // compileViaYul: also
 // ----
 // t() -> 9
-// gas irOptimized: 99186
+// gas irOptimized: 99064
 // gas legacy: 158955
-// gas legacyOptimized: 108916
+// gas legacyOptimized: 108788
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index d4300cfe13..2f74c17f55 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -29,8 +29,8 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 127592
+// gas irOptimized: 127387
 // gas legacy: 151334
-// gas legacyOptimized: 125422
+// gas legacyOptimized: 125166
 // x() -> 7
 // y() -> 5
diff --git a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
index 8c9c6195c5..6a9ff7c31a 100644
--- a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
+++ b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
@@ -23,8 +23,8 @@ contract D {
 // compileViaYul: also
 // ----
 // f() -> 1
-// gas irOptimized: 77164
+// gas irOptimized: 77051
 // gas legacy: 114884
 // g() -> 5
-// gas irOptimized: 77231
+// gas irOptimized: 77106
 // gas legacy: 115430
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
index 7322e5f96b..ed28477b2a 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
@@ -25,5 +25,5 @@ contract B {
 // compileViaYul: also
 // ----
 // g() -> 42
-// gas irOptimized: 80945
+// gas irOptimized: 80813
 // gas legacy: 125481
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index 9b5f9778ca..46992694e3 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -25,6 +25,6 @@ contract B {
 // compileViaYul: also
 // ----
 // g() -> 42
-// gas irOptimized: 111913
+// gas irOptimized: 111781
 // gas legacy: 185053
-// gas legacyOptimized: 114726
+// gas legacyOptimized: 114598
diff --git a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
index 5dfeb9a69d..95f831e243 100644
--- a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
+++ b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
@@ -37,10 +37,10 @@ contract C {
 // compileViaYul: also
 // ----
 // convertParent() -> 1
-// gas irOptimized: 85640
+// gas irOptimized: 85524
 // convertSubA() -> 1, 2
-// gas irOptimized: 86395
+// gas irOptimized: 86155
 // gas legacy: 99047
 // convertSubB() -> 1, 3
-// gas irOptimized: 86338
+// gas irOptimized: 86098
 // gas legacy: 98981
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 2d1070e2a8..e8fe016874 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -22,6 +22,6 @@ contract A {
 // compileViaYul: also
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 273275
+// gas irOptimized: 272947
 // gas legacy: 422501
-// gas legacyOptimized: 287856
+// gas legacyOptimized: 287472
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 25d7b3c78d..cad181c8f4 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -22,6 +22,6 @@ contract C {
 // compileViaYul: also
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178953
+// gas irOptimized: 178835
 // gas legacy: 180762
-// gas legacyOptimized: 179609
+// gas legacyOptimized: 179481
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index cc910826bd..1950f7a4d7 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -38,10 +38,10 @@ contract D {
 // f() -> 0x1 # This should work, next should throw #
 // gas legacy: 103716
 // fview() -> FAILURE
-// gas irOptimized: 98438627
+// gas irOptimized: 98438625
 // gas legacy: 98438801
-// gas legacyOptimized: 98438596
+// gas legacyOptimized: 98438594
 // fpure() -> FAILURE
-// gas irOptimized: 98438627
+// gas irOptimized: 98438626
 // gas legacy: 98438801
-// gas legacyOptimized: 98438597
+// gas legacyOptimized: 98438595

From ed907561ebe51be903d8e76742b7b7b93901b489 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 25 Oct 2021 14:30:15 +0200
Subject: [PATCH 0095/1748] externalTests: Enable `set -e` in external tests

---
 test/externalTests/colony.sh          | 3 +++
 test/externalTests/ens.sh             | 3 +++
 test/externalTests/gnosis-v2.sh       | 3 +++
 test/externalTests/gnosis.sh          | 3 +++
 test/externalTests/solc-js/solc-js.sh | 3 +++
 test/externalTests/zeppelin.sh        | 3 +++
 6 files changed, 18 insertions(+)

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index c807f9022b..ef06f1d7b0 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -18,6 +18,9 @@
 #
 # (c) 2019 solidity contributors.
 #------------------------------------------------------------------------------
+
+set -e
+
 source scripts/common.sh
 source test/externalTests/common.sh
 
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 90c96d5a50..e3bdb229a5 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -18,6 +18,9 @@
 #
 # (c) 2019 solidity contributors.
 #------------------------------------------------------------------------------
+
+set -e
+
 source scripts/common.sh
 source test/externalTests/common.sh
 
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index 19ff3edcb8..338b2418f6 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -18,6 +18,9 @@
 #
 # (c) 2020 solidity contributors.
 #------------------------------------------------------------------------------
+
+set -e
+
 source scripts/common.sh
 source test/externalTests/common.sh
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index f8ca999d62..a8a50782d5 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -18,6 +18,9 @@
 #
 # (c) 2019 solidity contributors.
 #------------------------------------------------------------------------------
+
+set -e
+
 source scripts/common.sh
 source test/externalTests/common.sh
 
diff --git a/test/externalTests/solc-js/solc-js.sh b/test/externalTests/solc-js/solc-js.sh
index 3762ba7a2f..fa0d7ccee3 100755
--- a/test/externalTests/solc-js/solc-js.sh
+++ b/test/externalTests/solc-js/solc-js.sh
@@ -18,6 +18,9 @@
 #
 # (c) 2019 solidity contributors.
 #------------------------------------------------------------------------------
+
+set -e
+
 source scripts/common.sh
 source test/externalTests/common.sh
 
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 97da3d47bf..ca90d46f44 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -18,6 +18,9 @@
 #
 # (c) 2019 solidity contributors.
 #------------------------------------------------------------------------------
+
+set -e
+
 source scripts/common.sh
 source test/externalTests/common.sh
 

From bc2402e76f94cf4ec343d4873adc1485b9ccd720 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Oct 2021 12:50:30 +0200
Subject: [PATCH 0096/1748] externalTests: Use named tmp dirs

---
 test/externalTests/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index bc24cd1d1e..f015b5fd76 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -251,7 +251,7 @@ function external_test
 
     printTask "Testing $name..."
     echo "==========================="
-    DIR=$(mktemp -d)
+    DIR=$(mktemp -d -t "ext-test-${name}-XXXXXX")
     (
         if [ -z "$main_fn" ]; then
             printError "Test main function not defined."

From fc224f74c7fbff547714a59470fab0d2b1410168 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 28 Oct 2021 15:30:31 +0200
Subject: [PATCH 0097/1748] Evaluate absolute paths for imports in 'parsing'
 stage

---
 Changelog.md                                  |  1 +
 libsolidity/interface/CompilerStack.cpp       | 26 ++++---
 libsolidity/interface/CompilerStack.h         |  4 +-
 .../args                                      |  1 +
 .../input.json                                | 12 ++++
 .../output.json                               | 67 +++++++++++++++++++
 .../not_existing_import_parseOnly.json        |  1 +
 7 files changed, 101 insertions(+), 11 deletions(-)
 create mode 100644 test/cmdlineTests/standard_parsing_import_absolute_paths/args
 create mode 100644 test/cmdlineTests/standard_parsing_import_absolute_paths/input.json
 create mode 100644 test/cmdlineTests/standard_parsing_import_absolute_paths/output.json

diff --git a/Changelog.md b/Changelog.md
index ff183e22b2..aad7b2a53a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
  * Commandline Interface: Accept nested brackets in step sequences passed to ``--yul-optimizations``.
  * Commandline Interface: Add ``--debug-info`` option for selecting how much extra debug information should be included in the produced EVM assembly and Yul code.
  * Commandline Interface: Use different colors when printing errors, warnings and infos.
+ * JSON AST: Set absolute paths of imports earlier, in the ``parsing`` stage.
  * SMTChecker: Output values for ``block.*``, ``msg.*`` and ``tx.*`` variables that are present in the called functions.
  * SMTChecker: Report contract invariants and reentrancy properties. This can be enabled via the CLI option ``--model-checker-invariants`` or the Standard JSON option ``settings.modelChecker.invariants``.
  * Standard JSON: Accept nested brackets in step sequences passed to ``settings.optimizer.details.yulDetails.optimizerSteps``.
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 9fa3cb1645..27e0f9d3ae 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -350,8 +350,22 @@ bool CompilerStack::parse()
 		else
 		{
 			source.ast->annotation().path = path;
+
+			for (auto const& import: ASTNode::filteredNodes<ImportDirective>(source.ast->nodes()))
+			{
+				solAssert(!import->path().empty(), "Import path cannot be empty.");
+
+				// The current value of `path` is the absolute path as seen from this source file.
+				// We first have to apply remappings before we can store the actual absolute path
+				// as seen globally.
+				import->annotation().absolutePath = applyRemapping(util::absolutePath(
+					import->path(),
+					path
+				), path);
+			}
+
 			if (m_stopAfter >= ParsedAndImported)
-				for (auto const& newSource: loadMissingSources(*source.ast, path))
+				for (auto const& newSource: loadMissingSources(*source.ast))
 				{
 					string const& newPath = newSource.first;
 					string const& newContents = newSource.second;
@@ -1091,7 +1105,7 @@ string const& CompilerStack::Source::ipfsUrl() const
 	return ipfsUrlCached;
 }
 
-StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast, std::string const& _sourcePath)
+StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast)
 {
 	solAssert(m_stackState < ParsedAndImported, "");
 	StringMap newSources;
@@ -1100,14 +1114,8 @@ StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast, std::string
 		for (auto const& node: _ast.nodes())
 			if (ImportDirective const* import = dynamic_cast<ImportDirective*>(node.get()))
 			{
-				solAssert(!import->path().empty(), "Import path cannot be empty.");
+				string const& importPath = *import->annotation().absolutePath;
 
-				string importPath = util::absolutePath(import->path(), _sourcePath);
-				// The current value of `path` is the absolute path as seen from this source file.
-				// We first have to apply remappings before we can store the actual absolute path
-				// as seen globally.
-				importPath = applyRemapping(importPath, _sourcePath);
-				import->annotation().absolutePath = importPath;
 				if (m_sources.count(importPath) || newSources.count(importPath))
 					continue;
 
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index c97581a651..3609662e02 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -392,9 +392,9 @@ class CompilerStack: public langutil::CharStreamProvider
 	void findAndReportCyclicContractDependencies();
 
 	/// Loads the missing sources from @a _ast (named @a _path) using the callback
-	/// @a m_readFile and stores the absolute paths of all imports in the AST annotations.
+	/// @a m_readFile
 	/// @returns the newly loaded sources.
-	StringMap loadMissingSources(SourceUnit const& _ast, std::string const& _path);
+	StringMap loadMissingSources(SourceUnit const& _ast);
 	std::string applyRemapping(std::string const& _path, std::string const& _context);
 	void resolveImports();
 
diff --git a/test/cmdlineTests/standard_parsing_import_absolute_paths/args b/test/cmdlineTests/standard_parsing_import_absolute_paths/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_parsing_import_absolute_paths/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_parsing_import_absolute_paths/input.json b/test/cmdlineTests/standard_parsing_import_absolute_paths/input.json
new file mode 100644
index 0000000000..9ec5150b45
--- /dev/null
+++ b/test/cmdlineTests/standard_parsing_import_absolute_paths/input.json
@@ -0,0 +1,12 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "/project/../C.sol": {"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\nimport \"../L.sol\";"},
+        "/lib/L.sol": {"content": "//SPDX-License-Identifier: GPL-2.0\npragma solidity >=0.0;\n"}
+    },
+    "settings": {
+        "stopAfter": "parsing",
+        "remappings": [":/project/=/lib/"],
+        "outputSelection": {"*": {"": ["ast"]}}
+    }
+}
diff --git a/test/cmdlineTests/standard_parsing_import_absolute_paths/output.json b/test/cmdlineTests/standard_parsing_import_absolute_paths/output.json
new file mode 100644
index 0000000000..1982561ef2
--- /dev/null
+++ b/test/cmdlineTests/standard_parsing_import_absolute_paths/output.json
@@ -0,0 +1,67 @@
+{
+    "sources":
+    {
+        "/lib/L.sol":
+        {
+            "ast":
+            {
+                "absolutePath": "/lib/L.sol",
+                "id": 2,
+                "license": "GPL-2.0",
+                "nodeType": "SourceUnit",
+                "nodes":
+                [
+                    {
+                        "id": 1,
+                        "literals":
+                        [
+                            "solidity",
+                            ">=",
+                            "0.0"
+                        ],
+                        "nodeType": "PragmaDirective",
+                        "src": "35:22:0"
+                    }
+                ],
+                "src": "35:23:0"
+            },
+            "id": 0
+        },
+        "/project/../C.sol":
+        {
+            "ast":
+            {
+                "absolutePath": "/project/../C.sol",
+                "id": 5,
+                "license": "GPL-2.0",
+                "nodeType": "SourceUnit",
+                "nodes":
+                [
+                    {
+                        "id": 3,
+                        "literals":
+                        [
+                            "solidity",
+                            ">=",
+                            "0.0"
+                        ],
+                        "nodeType": "PragmaDirective",
+                        "src": "35:22:1"
+                    },
+                    {
+                        "absolutePath": "/lib/L.sol",
+                        "file": "../L.sol",
+                        "id": 4,
+                        "nameLocation": "-1:-1:-1",
+                        "nodeType": "ImportDirective",
+                        "src": "58:18:1",
+                        "symbolAliases": [],
+                        "unitAlias": ""
+                    }
+                ],
+                "src": "35:41:1"
+            },
+            "id": 1
+        }
+    }
+}
diff --git a/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json b/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
index a42a10aed4..a36c59fffb 100644
--- a/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
+++ b/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
@@ -5,6 +5,7 @@
   "nodes":
   [
     {
+      "absolutePath": "notexisting.sol",
       "file": "notexisting.sol",
       "id": 1,
       "nameLocation": "28:11:1",

From 7ccdbd5b08e51b43eef791f0495fee215bc0c791 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 28 Oct 2021 11:58:47 +0200
Subject: [PATCH 0098/1748] Use consistent syntax for Bash function
 declarations

---
 scripts/check_style.sh                        |  2 +-
 scripts/ci/build_ossfuzz.sh                   |  4 ++--
 scripts/ci/docker_upgrade.sh                  |  6 +++--
 scripts/common.sh                             | 24 +++++++++----------
 scripts/common_cmdline.sh                     |  3 ++-
 scripts/docker_deploy_manual.sh               |  2 +-
 scripts/docs_version_pragma_check.sh          |  8 +++----
 .../bytecode_reports_for_modified_binaries.sh |  6 ++---
 scripts/soltest.sh                            |  3 ++-
 scripts/test_antlr_grammar.sh                 |  6 ++---
 scripts/tests.sh                              |  3 ++-
 .../docker-scripts/rebuild_tags.sh            |  9 ++++---
 scripts/yul_coverage.sh                       |  6 +++--
 test/cmdlineTests.sh                          |  4 ++--
 test/docsCodeStyle.sh                         |  8 +++----
 test/externalTests/common.sh                  |  6 +++--
 test/stopAfterParseTests.sh                   |  2 +-
 17 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 78b0aa23c2..601981b5cb 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -35,7 +35,7 @@ then
     exit 1
 fi
 
-function preparedGrep()
+function preparedGrep
 {
     git grep -nIE "$1" -- '*.h' '*.cpp' | grep -v "${EXCLUDE_FILES_JOINED}"
     return $?
diff --git a/scripts/ci/build_ossfuzz.sh b/scripts/ci/build_ossfuzz.sh
index f208c9b7fe..1240b6877f 100755
--- a/scripts/ci/build_ossfuzz.sh
+++ b/scripts/ci/build_ossfuzz.sh
@@ -5,7 +5,7 @@ ROOTDIR="/root/project"
 BUILDDIR="${ROOTDIR}/build"
 mkdir -p "${BUILDDIR}" && mkdir -p "$BUILDDIR/deps"
 
-generate_protobuf_bindings()
+function generate_protobuf_bindings
 {
   cd "${ROOTDIR}"/test/tools/ossfuzz
   # Generate protobuf C++ bindings
@@ -15,7 +15,7 @@ generate_protobuf_bindings()
   done
 }
 
-build_fuzzers()
+function build_fuzzers
 {
   cd "${BUILDDIR}"
   cmake .. -DCMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}" \
diff --git a/scripts/ci/docker_upgrade.sh b/scripts/ci/docker_upgrade.sh
index 29e80354a1..a9c7acaf28 100755
--- a/scripts/ci/docker_upgrade.sh
+++ b/scripts/ci/docker_upgrade.sh
@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 set -e
 
-function error() {
+function error
+{
   echo >&2 "ERROR: ${1} Aborting." && false
 }
 
-function warning() {
+function warning
+{
   echo >&2 "WARNING: ${1}"
 }
 
diff --git a/scripts/common.sh b/scripts/common.sh
index 6d9b0a3ba8..3e40754a61 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -29,15 +29,15 @@ _initial_work_dir=$(pwd)
 if [ "$CIRCLECI" ]
 then
     export TERM="${TERM:-xterm}"
-    function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; }
-    function printError() { >&2 echo "$(tput setaf 1)$1$(tput setaf 7)"; }
-    function printWarning() { >&2 echo "$(tput setaf 11)$1$(tput setaf 7)"; }
-    function printLog() { echo "$(tput setaf 3)$1$(tput setaf 7)"; }
+    function printTask { echo "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; }
+    function printError { >&2 echo "$(tput setaf 1)$1$(tput setaf 7)"; }
+    function printWarning { >&2 echo "$(tput setaf 11)$1$(tput setaf 7)"; }
+    function printLog { echo "$(tput setaf 3)$1$(tput setaf 7)"; }
 else
-    function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
-    function printError() { >&2 echo "$(tput setaf 1)$1$(tput sgr0)"; }
-    function printWarning() { >&2 echo "$(tput setaf 11)$1$(tput sgr0)"; }
-    function printLog() { echo "$(tput setaf 3)$1$(tput sgr0)"; }
+    function printTask { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
+    function printError { >&2 echo "$(tput setaf 1)$1$(tput sgr0)"; }
+    function printWarning { >&2 echo "$(tput setaf 11)$1$(tput sgr0)"; }
+    function printLog { echo "$(tput setaf 3)$1$(tput sgr0)"; }
 fi
 
 function printStackTrace
@@ -78,7 +78,7 @@ function printStackTrace
     done
 }
 
-function fail()
+function fail
 {
     printError "$@"
 
@@ -86,7 +86,7 @@ function fail()
     return 1
 }
 
-function assertFail()
+function assertFail
 {
     printError ""
     (( $# == 0 )) && printError "Assertion failed."
@@ -97,7 +97,7 @@ function assertFail()
     exit 2
 }
 
-function msg_on_error()
+function msg_on_error
 {
     local error_message
     local no_stdout=false
@@ -171,7 +171,7 @@ function msg_on_error()
     fi
 }
 
-safe_kill()
+function safe_kill
 {
     local PID=${1}
     local NAME=${2:-${1}}
diff --git a/scripts/common_cmdline.sh b/scripts/common_cmdline.sh
index 15d93f562c..3efeadc03d 100644
--- a/scripts/common_cmdline.sh
+++ b/scripts/common_cmdline.sh
@@ -22,7 +22,8 @@
 YULARGS=(--strict-assembly)
 FULLARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,hashes,metadata,opcodes,srcmap,srcmap-runtime,userdoc")
 OLDARGS=(--optimize --combined-json "abi,asm,ast,bin,bin-runtime,devdoc,interface,metadata,opcodes,srcmap,srcmap-runtime,userdoc")
-function compileFull()
+
+function compileFull
 {
     local expected_exit_code=0
     local expect_output='none'
diff --git a/scripts/docker_deploy_manual.sh b/scripts/docker_deploy_manual.sh
index 18d2228d0e..12d3e5ff45 100755
--- a/scripts/docker_deploy_manual.sh
+++ b/scripts/docker_deploy_manual.sh
@@ -28,7 +28,7 @@ else
     date -u +"nightly.%Y.%-m.%-d" > prerelease.txt
 fi
 
-tag_and_push()
+function tag_and_push
 {
     docker tag "$image:$1" "$image:$2"
     docker push "$image:$2"
diff --git a/scripts/docs_version_pragma_check.sh b/scripts/docs_version_pragma_check.sh
index d16645da8e..d56bed3a19 100755
--- a/scripts/docs_version_pragma_check.sh
+++ b/scripts/docs_version_pragma_check.sh
@@ -36,7 +36,7 @@ source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
 developmentVersion=$("$REPO_ROOT/scripts/get_version.sh")
 
-function versionGreater()
+function versionGreater
 {
     v1=$1
     v2=$2
@@ -58,7 +58,7 @@ function versionGreater()
     return 1
 }
 
-function versionEqual()
+function versionEqual
 {
     if [[ "$1" == "$2" ]]
     then
@@ -67,7 +67,7 @@ function versionEqual()
     return 1
 }
 
-function getAllAvailableVersions()
+function getAllAvailableVersions
 {
     allVersions=()
     local allListedVersions
@@ -85,7 +85,7 @@ function getAllAvailableVersions()
     done
 }
 
-function findMinimalVersion()
+function findMinimalVersion
 {
     local f=$1
     local greater=false
diff --git a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
index 3401c127f7..69d6a34d01 100755
--- a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
+++ b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
@@ -50,14 +50,14 @@
 # FIXME: Can't use set -u because the old Bash on macOS treats empty arrays as unbound variables
 set -eo pipefail
 
-die()
+function die
 {
     # shellcheck disable=SC2059
     >&2 printf "ERROR: $1\n" "${@:2}"
     exit 1
 }
 
-get_reported_solc_version()
+function get_reported_solc_version
 {
     local solc_binary="$1"
 
@@ -70,7 +70,7 @@ get_reported_solc_version()
     echo "$version_banner" | tail -n 1 | sed -n -E 's/^Version: (.*)$/\1/p'
 }
 
-validate_reported_version()
+function validate_reported_version
 {
     local reported_version="$1"
     local expected_version_and_commit="$2"
diff --git a/scripts/soltest.sh b/scripts/soltest.sh
index e9b6de979f..e15aeb9bf5 100755
--- a/scripts/soltest.sh
+++ b/scripts/soltest.sh
@@ -8,7 +8,8 @@ BOOST_OPTIONS=()
 SOLTEST_OPTIONS=()
 SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
 
-usage() {
+function usage
+{
 	echo 2>&1 "
 Usage: $0 [options] [soltest-options]
 Runs BOOST C++ unit test program, soltest.
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
index 97aaa3b933..5745f01be3 100755
--- a/scripts/test_antlr_grammar.sh
+++ b/scripts/test_antlr_grammar.sh
@@ -20,7 +20,7 @@ SGR_BLUE="\033[34m"
 vt_cursor_up() { echo -ne "\033[A"; }
 vt_cursor_begin_of_line() { echo -ne "\r"; }
 
-download_antlr4()
+function download_antlr4
 {
   if [[ ! -e "$ANTLR_JAR" ]]
   then
@@ -28,7 +28,7 @@ download_antlr4()
   fi
 }
 
-prepare_workdir()
+function prepare_workdir
 {
   mkdir -p "${ROOT_DIR}/build/deps"
   mkdir -p "${WORKDIR}"
@@ -51,7 +51,7 @@ javac -classpath "${ANTLR_JAR}" "${WORKDIR}/src/"*.java -d "${WORKDIR}/target/"
 
 # Run tests
 failed_count=0
-test_file()
+function test_file
 {
   local SOL_FILE
   SOL_FILE="$(${READLINK}  -m "${1}")"
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 964d006680..029be16291 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -38,7 +38,8 @@ source "${REPO_ROOT}/scripts/common.sh"
 WORKDIR=$(mktemp -d)
 CMDLINE_PID=
 
-cleanup() {
+function cleanup
+{
     # ensure failing commands don't cause termination during cleanup (especially within safe_kill)
     set +e
 
diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index 18c922c06d..eaca0c7307 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -38,7 +38,8 @@ ORANGE='\033[0;33m'
 CYAN='\033[0;36m'
 RESET='\033[0m'
 
-function generate_bytecode_report() {
+function generate_bytecode_report
+{
   rm -rf /tmp/report.txt
 
   local EXIT_STATUS
@@ -74,7 +75,8 @@ function generate_bytecode_report() {
     echo -e "${RED}FAILURE${RESET}"
   fi
 }
-function clean_git_checkout() {
+function clean_git_checkout
+{
   git submodule deinit --all -q
   git reset --hard HEAD --quiet
   git clean -f -d -x --quiet
@@ -82,7 +84,8 @@ function clean_git_checkout() {
   git submodule init -q
   git submodule update -q
 }
-function process_tag() {
+function process_tag
+{
   local TAG=$1
   cd /src
   # Checkout the historic commit instead of the tag directly.
diff --git a/scripts/yul_coverage.sh b/scripts/yul_coverage.sh
index 02b9a04764..b2b16675c5 100755
--- a/scripts/yul_coverage.sh
+++ b/scripts/yul_coverage.sh
@@ -83,7 +83,8 @@ for arg in "$@"; do
   esac
 done
 
-show_output_if() {
+function show_output_if
+{
   local VAR=${1}
   if [ -n "${VAR}" ]; then
     echo "${SOL_FILE}"
@@ -102,7 +103,8 @@ if [ ! -f "${SOLC}" ]; then
   exit 1
 fi
 
-test_file() {
+function test_file
+{
   local SOL_FILE
   local OUTPUT
   SOL_FILE=${1}
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 59c29ca453..2076eb993e 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -154,7 +154,7 @@ function ask_expectation_update
 
 # General helper function for testing SOLC behaviour, based on file name, compile opts, exit code, stdout and stderr.
 # An failure is expected.
-function test_solc_behaviour()
+function test_solc_behaviour
 {
     local filename="${1}"
     local solc_args
@@ -288,7 +288,7 @@ EOF
 }
 
 
-function test_solc_assembly_output()
+function test_solc_assembly_output
 {
     local input="${1}"
     local expected="${2}"
diff --git a/test/docsCodeStyle.sh b/test/docsCodeStyle.sh
index 33b787e25f..675828d7e1 100755
--- a/test/docsCodeStyle.sh
+++ b/test/docsCodeStyle.sh
@@ -10,11 +10,11 @@ REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
 
 if [ "$CIRCLECI" ]
 then
-    function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; }
-    function printError() { echo "$(tput setaf 1)$1$(tput setaf 7)"; }
+    function printTask { echo "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; }
+    function printError { echo "$(tput setaf 1)$1$(tput setaf 7)"; }
 else
-    function printTask() { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
-    function printError() { echo "$(tput setaf 1)$1$(tput sgr0)"; }
+    function printTask { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
+    function printError { echo "$(tput setaf 1)$1$(tput sgr0)"; }
 fi
 
 printTask "Checking docs examples style"
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index f015b5fd76..4e28d233f2 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -187,7 +187,8 @@ function run_test
     $test_fn
 }
 
-function optimizer_settings_for_level {
+function optimizer_settings_for_level
+{
     local level="$1"
 
     case "$level" in
@@ -201,7 +202,8 @@ function optimizer_settings_for_level {
     esac
 }
 
-function truffle_compiler_settings {
+function truffle_compiler_settings
+{
     local solc_path="$1"
     local level="$2"
     local evm_version="$3"
diff --git a/test/stopAfterParseTests.sh b/test/stopAfterParseTests.sh
index a100146b06..503c435792 100755
--- a/test/stopAfterParseTests.sh
+++ b/test/stopAfterParseTests.sh
@@ -15,7 +15,7 @@ FILETMP=$(mktemp -d)
 cd "$FILETMP" || exit 1
 
 
-function testFile()
+function testFile
 {
 	set +e
 	ALLOUTPUT=$($SOLC --combined-json ast --pretty-json "$@" --stop-after parsing 2>&1)

From b57c0a0b81253b2bc484df8b9fd01847d1663cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 25 Oct 2021 14:29:43 +0200
Subject: [PATCH 0099/1748] externalTests: Refactor to be more explicit and
 easier to adjust for special cases

---
 test/externalTests/colony.sh          | 25 ++++++--
 test/externalTests/common.sh          | 90 +++++++++++----------------
 test/externalTests/ens.sh             | 23 +++++--
 test/externalTests/gnosis-v2.sh       | 22 +++++--
 test/externalTests/gnosis.sh          | 23 +++++--
 test/externalTests/solc-js/solc-js.sh |  1 -
 test/externalTests/zeppelin.sh        | 28 ++++++---
 7 files changed, 127 insertions(+), 85 deletions(-)

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index ef06f1d7b0..43b452ec4d 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -27,24 +27,37 @@ source test/externalTests/common.sh
 verify_input "$1"
 SOLJSON="$1"
 
-function install_fn { yarn; git submodule update --init; }
 function compile_fn { yarn run provision:token:contracts; }
 function test_fn { yarn run test:contracts; }
 
 function colony_test
 {
-    OPTIMIZER_LEVEL=3
-    CONFIG="truffle.js"
+    local repo="https://github.com/solidity-external-tests/colonyNetwork.git"
+    local branch=develop_080
+    local config_file="truffle.js"
+    local min_optimizer_level=3
+    local max_optimizer_level=3
 
-    truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/colonyNetwork.git develop_080
-    run_install "$SOLJSON" install_fn
+    setup_solcjs "$DIR" "$SOLJSON"
+    download_project "$repo" "$branch" "$DIR"
+
+    replace_version_pragmas
+    force_truffle_solc_modules "$SOLJSON"
+    force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
+    yarn
+    git submodule update --init
 
     cd lib
     rm -Rf dappsys
     git clone https://github.com/solidity-external-tests/dappsys-monolithic.git -b master_080 dappsys
     cd ..
 
-    truffle_run_test "$SOLJSON" compile_fn test_fn
+    replace_version_pragmas
+    force_truffle_solc_modules "$SOLJSON"
+
+    for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
+        truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
+    done
 }
 
 external_test ColonyNetworks colony_test
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 4e28d233f2..8f9b5d39ef 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -22,6 +22,8 @@ set -e
 
 # Requires "${REPO_ROOT}/scripts/common.sh" to be included before.
 
+CURRENT_EVM_VERSION=london
+
 function verify_input
 {
     if [ ! -f "$1" ]; then
@@ -51,8 +53,8 @@ function setup_solcjs
 {
     local dir="$1"
     local soljson="$2"
-    local branch="$3"
-    local path="$4"
+    local branch="${3:-master}"
+    local path="${4:-solc/}"
 
     cd "$dir"
     printLog "Setting up solc-js..."
@@ -86,16 +88,6 @@ function force_truffle_version
     sed -i 's/"truffle":\s*".*"/"truffle": "'"$version"'"/g' package.json
 }
 
-function truffle_setup
-{
-    local soljson="$1"
-    local repo="$2"
-    local branch="$3"
-
-    setup_solcjs "$DIR" "$soljson" "master" "solc"
-    download_project "$repo" "$branch" "$DIR"
-}
-
 function replace_version_pragmas
 {
     # Replace fixed-version pragmas (part of Consensys best practice).
@@ -131,7 +123,7 @@ function force_truffle_compiler_settings
     local config_file="$1"
     local solc_path="$2"
     local level="$3"
-    local evm_version="$4"
+    local evm_version="${4:-"$CURRENT_EVM_VERSION"}"
 
     printLog "Forcing Truffle compiler settings..."
     echo "-------------------------------------"
@@ -147,30 +139,18 @@ function force_truffle_compiler_settings
     echo "module.exports['compilers'] = $(truffle_compiler_settings "$solc_path" "$level" "$evm_version");" >> "$config_file"
 }
 
-function verify_compiler_version
+function truffle_verify_compiler_version
 {
     local solc_version="$1"
+    local full_solc_version="$2"
 
-    printLog "Verify that the correct version ($solc_version) of the compiler was used to compile the contracts..."
-    grep -e "$solc_version" -r build/contracts > /dev/null
-}
-
-function clean
-{
-    rm -rf build || true
+    printLog "Verify that the correct version (${solc_version}/${full_solc_version}) of the compiler was used to compile the contracts..."
+    grep "$full_solc_version" --with-filename --recursive build/contracts || fail "Wrong compiler version detected."
 }
 
-function run_install
+function truffle_clean
 {
-    local soljson="$1"
-    local init_fn="$2"
-    printLog "Running install function..."
-
-    replace_version_pragmas
-    force_truffle_solc_modules "$soljson"
-    force_truffle_compiler_settings "$CONFIG" "${DIR}/solc" "$OPTIMIZER_LEVEL" london
-
-    $init_fn
+    rm -rf build/
 }
 
 function run_test
@@ -219,31 +199,35 @@ function truffle_compiler_settings
     echo "}"
 }
 
-function truffle_run_test
+function compile_and_run_test
 {
-    local soljson="$1"
-    local compile_fn="$2"
-    local test_fn="$3"
+    local compile_fn="$1"
+    local test_fn="$2"
+    local verify_fn="$3"
 
-    replace_version_pragmas
-    force_truffle_solc_modules "$soljson"
+    printLog "Running compile function..."
+    $compile_fn
+    $verify_fn "$SOLCVERSION_SHORT" "$SOLCVERSION"
 
-    for level in $(seq "$OPTIMIZER_LEVEL" 3)
-    do
-        clean
-        force_truffle_compiler_settings "$CONFIG" "${DIR}/solc" "$level" london
-
-        printLog "Running compile function..."
-        $compile_fn
-        verify_compiler_version "$SOLCVERSION"
-
-        if [[ "$COMPILE_ONLY" == 1 ]]; then
-            printLog "Skipping test function..."
-        else
-            printLog "Running test function..."
-            $test_fn
-        fi
-    done
+    if [[ "$COMPILE_ONLY" == 1 ]]; then
+        printLog "Skipping test function..."
+    else
+        printLog "Running test function..."
+        $test_fn
+    fi
+}
+
+function truffle_run_test
+{
+    local config_file="$1"
+    local solc_path="$2"
+    local optimizer_level="$3"
+    local compile_fn="$4"
+    local test_fn="$5"
+
+    truffle_clean
+    force_truffle_compiler_settings "$config_file" "$solc_path" "$optimizer_level"
+    compile_and_run_test compile_fn test_fn truffle_verify_compiler_version
 }
 
 function external_test
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index e3bdb229a5..f6a17d6a8f 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -27,16 +27,19 @@ source test/externalTests/common.sh
 verify_input "$1"
 export SOLJSON="$1"
 
-function install_fn { npm install; }
 function compile_fn { npx truffle compile; }
 function test_fn { npm run test; }
 
 function ens_test
 {
-    export OPTIMIZER_LEVEL=1
-    export CONFIG="truffle-config.js"
+    local repo="https://github.com/ensdomains/ens.git"
+    local branch=master
+    local config_file="truffle-config.js"
+    local min_optimizer_level=1
+    local max_optimizer_level=3
 
-    truffle_setup "$SOLJSON" https://github.com/ensdomains/ens.git master
+    setup_solcjs "$DIR" "$SOLJSON"
+    download_project "$repo" "$branch" "$DIR"
 
     # Use latest Truffle. Older versions crash on the output from 0.8.0.
     force_truffle_version ^5.1.55
@@ -44,9 +47,17 @@ function ens_test
     # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json
     rm -f package-lock.json
 
-    run_install "$SOLJSON" install_fn
+    replace_version_pragmas
+    force_truffle_solc_modules "$SOLJSON"
+    force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
+    npm install
 
-    truffle_run_test "$SOLJSON" compile_fn test_fn
+    replace_version_pragmas
+    force_truffle_solc_modules "$SOLJSON"
+
+    for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
+        truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
+    done
 }
 
 external_test Ens ens_test
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index 338b2418f6..f3aab6d34d 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -33,10 +33,14 @@ function test_fn { npm test; }
 
 function gnosis_safe_test
 {
-    OPTIMIZER_LEVEL=2
-    CONFIG="truffle-config.js"
+    local repo="https://github.com/solidity-external-tests/safe-contracts.git"
+    local branch=v2_080
+    local config_file="truffle-config.js"
+    local min_optimizer_level=2
+    local max_optimizer_level=3
 
-    truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/safe-contracts.git v2_080
+    setup_solcjs "$DIR" "$SOLJSON"
+    download_project "$repo" "$branch" "$DIR"
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
     sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7_080"|g' package.json
@@ -44,9 +48,17 @@ function gnosis_safe_test
     # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json
     rm -f package-lock.json
 
-    run_install "$SOLJSON" install_fn
+    replace_version_pragmas
+    force_truffle_solc_modules "$SOLJSON"
+    force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
+    npm install --package-lock
 
-    truffle_run_test "$SOLJSON" compile_fn test_fn
+    replace_version_pragmas
+    force_truffle_solc_modules "$SOLJSON"
+
+    for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
+        truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
+    done
 }
 
 external_test Gnosis-Safe gnosis_safe_test
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index a8a50782d5..7507a1b48e 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -27,25 +27,36 @@ source test/externalTests/common.sh
 verify_input "$1"
 SOLJSON="$1"
 
-function install_fn { npm install --package-lock; }
 function compile_fn { npx truffle compile; }
 function test_fn { npm test; }
 
 function gnosis_safe_test
 {
-    OPTIMIZER_LEVEL=2
-    CONFIG="truffle-config.js"
+    local repo="https://github.com/solidity-external-tests/safe-contracts.git"
+    local branch=development_080
+    local config_file="truffle-config.js"
+    local min_optimizer_level=2
+    local max_optimizer_level=3
 
-    truffle_setup "$SOLJSON" https://github.com/solidity-external-tests/safe-contracts.git development_080
+    setup_solcjs "$DIR" "$SOLJSON"
+    download_project "$repo" "$branch" "$DIR"
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
 
     # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json
     rm -f package-lock.json
 
-    run_install "$SOLJSON" install_fn
+    replace_version_pragmas
+    force_truffle_solc_modules "$SOLJSON"
+    force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
+    npm install --package-lock
 
-    truffle_run_test "$SOLJSON" compile_fn test_fn
+    replace_version_pragmas
+    force_truffle_solc_modules "$SOLJSON"
+
+    for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
+        truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
+    done
 }
 
 external_test Gnosis-Safe gnosis_safe_test
diff --git a/test/externalTests/solc-js/solc-js.sh b/test/externalTests/solc-js/solc-js.sh
index fa0d7ccee3..a3b24db9ec 100755
--- a/test/externalTests/solc-js/solc-js.sh
+++ b/test/externalTests/solc-js/solc-js.sh
@@ -28,7 +28,6 @@ verify_version_input "$1" "$2"
 SOLJSON="$1"
 VERSION="$2"
 
-function install_fn { echo "Nothing to install."; }
 function compile_fn { echo "Nothing to compile."; }
 function test_fn { npm test; }
 
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index ca90d46f44..f665c9d621 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -27,19 +27,31 @@ source test/externalTests/common.sh
 verify_input "$1"
 SOLJSON="$1"
 
-function install_fn { npm install; }
 function compile_fn { npx truffle compile; }
 function test_fn { npm run test; }
 
 function zeppelin_test
 {
-    OPTIMIZER_LEVEL=1
-    CONFIG="truffle-config.js"
-
-    truffle_setup "$SOLJSON" https://github.com/OpenZeppelin/openzeppelin-contracts.git master
-    run_install "$SOLJSON" install_fn
-
-    truffle_run_test "$SOLJSON" compile_fn test_fn
+    local repo="https://github.com/OpenZeppelin/openzeppelin-contracts.git"
+    local branch=master
+    local config_file="truffle-config.js"
+    local min_optimizer_level=1
+    local max_optimizer_level=3
+
+    setup_solcjs "$DIR" "$SOLJSON"
+    download_project "$repo" "$branch" "$DIR"
+
+    replace_version_pragmas
+    force_truffle_solc_modules "$SOLJSON"
+    force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
+    npm install
+
+    replace_version_pragmas
+    force_truffle_solc_modules "$SOLJSON"
+
+    for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
+        truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
+    done
 }
 
 external_test Zeppelin zeppelin_test

From 7b7cc081db7d252dbe6a805c304219cfe399c0e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Oct 2021 15:00:34 +0200
Subject: [PATCH 0100/1748] externalTests: Helper for neutralizing package
 locks

---
 test/externalTests/common.sh    | 8 ++++++++
 test/externalTests/ens.sh       | 4 +---
 test/externalTests/gnosis-v2.sh | 4 +---
 test/externalTests/gnosis.sh    | 4 +---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 8f9b5d39ef..038036159e 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -96,6 +96,14 @@ function replace_version_pragmas
     find . test -name '*.sol' -type f -print0 | xargs -0 sed -i -E -e 's/pragma solidity [^;]+;/pragma solidity >=0.0;/'
 }
 
+function neutralize_package_lock
+{
+    # Remove lock files (if they exist) to prevent them from overriding our changes in package.json
+    printLog "Removing package lock files..."
+    rm --force --verbose yarn.lock
+    rm --force --verbose package-lock.json
+}
+
 function force_truffle_solc_modules
 {
     local soljson="$1"
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index f6a17d6a8f..de49e1ee3c 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -44,9 +44,7 @@ function ens_test
     # Use latest Truffle. Older versions crash on the output from 0.8.0.
     force_truffle_version ^5.1.55
 
-    # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json
-    rm -f package-lock.json
-
+    neutralize_package_lock
     replace_version_pragmas
     force_truffle_solc_modules "$SOLJSON"
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index f3aab6d34d..6e9c5e02b1 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -45,9 +45,7 @@ function gnosis_safe_test
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
     sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7_080"|g' package.json
 
-    # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json
-    rm -f package-lock.json
-
+    neutralize_package_lock
     replace_version_pragmas
     force_truffle_solc_modules "$SOLJSON"
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 7507a1b48e..5730b34956 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -43,9 +43,7 @@ function gnosis_safe_test
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
 
-    # Remove the lock file (if it exists) to prevent it from overriding our changes in package.json
-    rm -f package-lock.json
-
+    neutralize_package_lock
     replace_version_pragmas
     force_truffle_solc_modules "$SOLJSON"
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"

From c090ff9d833a113113af8db75f174daddae7c281 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Oct 2021 15:39:19 +0200
Subject: [PATCH 0101/1748] externalTests: Neutralize npm hooks instead of
 replacing pragmas twice

- This also has the nice effect of stopping projects from trying to compile contracts during installation
---
 test/externalTests/colony.sh    | 3 +--
 test/externalTests/common.sh    | 8 ++++++++
 test/externalTests/ens.sh       | 3 +--
 test/externalTests/gnosis-v2.sh | 3 +--
 test/externalTests/gnosis.sh    | 3 +--
 test/externalTests/zeppelin.sh  | 3 +--
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 43b452ec4d..33526f58e8 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -41,8 +41,7 @@ function colony_test
     setup_solcjs "$DIR" "$SOLJSON"
     download_project "$repo" "$branch" "$DIR"
 
-    replace_version_pragmas
-    force_truffle_solc_modules "$SOLJSON"
+    neutralize_package_json_hooks
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
     yarn
     git submodule update --init
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 038036159e..cee846a5b9 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -104,6 +104,14 @@ function neutralize_package_lock
     rm --force --verbose package-lock.json
 }
 
+function neutralize_package_json_hooks
+{
+    printLog "Disabling package.json hooks..."
+    [[ -f package.json ]] || fail "package.json not found"
+    sed -i 's|"prepublish": *".*"|"prepublish": ""|g' package.json
+    sed -i 's|"prepare": *".*"|"prepare": ""|g' package.json
+}
+
 function force_truffle_solc_modules
 {
     local soljson="$1"
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index de49e1ee3c..5ec6306588 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -45,8 +45,7 @@ function ens_test
     force_truffle_version ^5.1.55
 
     neutralize_package_lock
-    replace_version_pragmas
-    force_truffle_solc_modules "$SOLJSON"
+    neutralize_package_json_hooks
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
     npm install
 
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index 6e9c5e02b1..e8593aa610 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -46,8 +46,7 @@ function gnosis_safe_test
     sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7_080"|g' package.json
 
     neutralize_package_lock
-    replace_version_pragmas
-    force_truffle_solc_modules "$SOLJSON"
+    neutralize_package_json_hooks
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
     npm install --package-lock
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 5730b34956..95a1ecd497 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -44,8 +44,7 @@ function gnosis_safe_test
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
 
     neutralize_package_lock
-    replace_version_pragmas
-    force_truffle_solc_modules "$SOLJSON"
+    neutralize_package_json_hooks
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
     npm install --package-lock
 
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index f665c9d621..750be3229c 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -41,8 +41,7 @@ function zeppelin_test
     setup_solcjs "$DIR" "$SOLJSON"
     download_project "$repo" "$branch" "$DIR"
 
-    replace_version_pragmas
-    force_truffle_solc_modules "$SOLJSON"
+    neutralize_package_json_hooks
     force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
     npm install
 

From 0745279f1562d1d7efb2707c74d046f129c74c4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 27 Oct 2021 16:26:52 +0200
Subject: [PATCH 0102/1748] externalTests: Generalize
 force_truffle_solc_modules and make it use symlinks instead of redownloading
 solc-js

---
 test/externalTests/colony.sh    |  2 +-
 test/externalTests/common.sh    | 29 +++++++++++++----------------
 test/externalTests/ens.sh       |  2 +-
 test/externalTests/gnosis-v2.sh |  2 +-
 test/externalTests/gnosis.sh    |  2 +-
 test/externalTests/zeppelin.sh  |  2 +-
 6 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 33526f58e8..e32385af65 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -52,7 +52,7 @@ function colony_test
     cd ..
 
     replace_version_pragmas
-    force_truffle_solc_modules "$SOLJSON"
+    force_solc_modules "${DIR}/solc"
 
     for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
         truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index cee846a5b9..dbda3c3f46 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -112,25 +112,22 @@ function neutralize_package_json_hooks
     sed -i 's|"prepare": *".*"|"prepare": ""|g' package.json
 }
 
-function force_truffle_solc_modules
+function force_solc_modules
 {
-    local soljson="$1"
+    local custom_solcjs_path="${1:-solc/}"
+
+    [[ -d node_modules/ ]] || assertFail
 
-    # Replace solc package by v0.5.0 and then overwrite with current version.
-    printLog "Forcing solc version for all Truffle modules..."
-    for d in node_modules node_modules/truffle/node_modules
+    printLog "Replacing all installed solc-js with a link to the latest version..."
+    soljson_binaries=$(find node_modules -type f -path "*/solc/soljson.js")
+    for soljson_binary in $soljson_binaries
     do
-    (
-        if [ -d "$d" ]; then
-            cd $d
-            rm -rf solc
-            git clone --depth 1 -b master https://github.com/ethereum/solc-js.git solc
-            cp "$soljson" solc/soljson.js
-
-            cd solc
-            npm install
-        fi
-    )
+        local solc_module_path
+        solc_module_path=$(dirname "$soljson_binary")
+
+        printLog "Found and replaced solc-js in $solc_module_path"
+        rm -r "$solc_module_path"
+        ln -s "$custom_solcjs_path" "$solc_module_path"
     done
 }
 
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 5ec6306588..bbdc573e21 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -50,7 +50,7 @@ function ens_test
     npm install
 
     replace_version_pragmas
-    force_truffle_solc_modules "$SOLJSON"
+    force_solc_modules "${DIR}/solc"
 
     for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
         truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index e8593aa610..d92bcc1868 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -51,7 +51,7 @@ function gnosis_safe_test
     npm install --package-lock
 
     replace_version_pragmas
-    force_truffle_solc_modules "$SOLJSON"
+    force_solc_modules "${DIR}/solc"
 
     for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
         truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 95a1ecd497..b6d9ab0bcb 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -49,7 +49,7 @@ function gnosis_safe_test
     npm install --package-lock
 
     replace_version_pragmas
-    force_truffle_solc_modules "$SOLJSON"
+    force_solc_modules "${DIR}/solc"
 
     for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
         truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 750be3229c..1e23bb7ae5 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -46,7 +46,7 @@ function zeppelin_test
     npm install
 
     replace_version_pragmas
-    force_truffle_solc_modules "$SOLJSON"
+    force_solc_modules "${DIR}/solc"
 
     for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
         truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn

From df85d2640652060ba967c8e4ba00d8116cb1a447 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 8 Nov 2021 15:56:09 +0100
Subject: [PATCH 0103/1748] Update ir-breaking-changes and make it visible.

---
 docs/conf.py                          |  2 +-
 docs/index.rst                        |  1 +
 docs/{ir => }/ir-breaking-changes.rst | 54 ++++++++++++++++++++++-----
 3 files changed, 46 insertions(+), 11 deletions(-)
 rename docs/{ir => }/ir-breaking-changes.rst (82%)

diff --git a/docs/conf.py b/docs/conf.py
index b75eb966da..5fa2e6ab5d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -91,7 +91,7 @@ def setup(sphinx):
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ['_build', 'contracts', 'types', 'examples', 'grammar', 'ir']
+exclude_patterns = ['_build', 'contracts', 'types', 'examples', 'grammar']
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
diff --git a/docs/index.rst b/docs/index.rst
index 476cd86117..60b3d61fac 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -136,6 +136,7 @@ Contents
 
    using-the-compiler.rst
    analysing-compilation-output.rst
+   ir-breaking-changes.rst
 
 .. toctree::
    :maxdepth: 2
diff --git a/docs/ir/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
similarity index 82%
rename from docs/ir/ir-breaking-changes.rst
rename to docs/ir-breaking-changes.rst
index fb971410a8..c1f6deb57f 100644
--- a/docs/ir/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -5,8 +5,26 @@
 Solidity IR-based Codegen Changes
 *********************************
 
-This section highlights the main differences between the old and the IR-based codegen,
-along with the reasoning behind the changes and how to update affected code.
+Solidity can generate EVM bytecode in two different ways:
+Either directly from Solidity to EVM opcodes ("old codegen") or through
+an intermediate representation ("IR") in Yul ("new codegen" or "IR-based codegen").
+
+The IR-based code generator was introduced with an aim to not only allow
+code generation to be more transparent and auditable but also
+to enable more powerful optimization passes that span across functions.
+
+Currently, the IR-based code generator is still marked experimental,
+but it supports all language features and has received a lot of testing,
+so we consider it almost ready for production use.
+
+You can enable it on the command line using ``--experimental-via-ir``
+or with the option ``{"viaIR": true}`` in standard-json and we
+encourage everyone to try it out!
+
+For several reasons, there are tiny semantic differences between the old
+and the IR-based code generator, mostly in areas where we would not
+expect people to rely on this behaviour anyway.
+This section highlights the main differences between the old and the IR-based codegen.
 
 Semantic Only Changes
 =====================
@@ -14,8 +32,13 @@ Semantic Only Changes
 This section lists the changes that are semantic-only, thus potentially
 hiding new and different behavior in existing code.
 
-- When storage structs are deleted, every storage slot that contains a member of the struct is set to zero entirely. Formally, padding space was left untouched.
-  Consequently, if the padding space within a struct is used to store data (e.g. in the context of a contract upgrade), you have to be aware that ``delete`` will now also clear the added member (while it wouldn't have been cleared in the past).
+- When storage structs are deleted, every storage slot that contains
+  a member of the struct is set to zero entirely. Formerly, padding space
+  was left untouched.
+  Consequently, if the padding space within a struct is used to store data
+  (e.g. in the context of a contract upgrade), you have to be aware that
+  ``delete`` will now also clear the added member (while it wouldn't
+  have been cleared in the past).
 
   .. code-block:: solidity
 
@@ -132,7 +155,10 @@ This causes differences in some contracts, for example:
   Previously, ``y`` would be set to 0. This is due to the fact that we would first initialize state variables: First, ``x`` is set to 0, and when initializing ``y``, ``f()`` would return 0 causing ``y`` to be 0 as well.
   With the new rules, ``y`` will be set to 42. We first initialize ``x`` to 0, then call A's constructor which sets ``x`` to 42. Finally, when initializing ``y``, ``f()`` returns 42 causing ``y`` to be 42.
 
-- Copying ``bytes`` arrays from memory to storage is implemented in a different way. The old code generator always copies full words, while the new one cuts the byte array after its end. The old behaviour can lead to dirty data being copied after the end of the array (but still in the same storage slot).
+- Copying ``bytes`` arrays from memory to storage is implemented in a different way.
+  The old code generator always copies full words, while the new one cuts the byte
+  array after its end. The old behaviour can lead to dirty data being copied after
+  the end of the array (but still in the same storage slot).
   This causes differences in some contracts, for example:
 
   .. code-block:: solidity
@@ -155,8 +181,10 @@ This causes differences in some contracts, for example:
           }
       }
 
-  Previously ``f()`` would return ``0x6465616462656566313564656164000000000000000000000000000000000010`` (it has correct length, and correct first 8 elements, but then it contains dirty data which was set via assembly).
-  Now it is returning ``0x6465616462656566000000000000000000000000000000000000000000000010`` (it has correct length, and correct elements, but does not contain superfluous data).
+  Previously ``f()`` would return ``0x6465616462656566313564656164000000000000000000000000000000000010``
+  (it has correct length, and correct first 8 elements, but then it contains dirty data which was set via assembly).
+  Now it is returning ``0x6465616462656566000000000000000000000000000000000000000000000010`` (it has
+  correct length, and correct elements, but does not contain superfluous data).
 
   .. index:: ! evaluation order; expression
 
@@ -183,7 +211,8 @@ This causes differences in some contracts, for example:
 
   .. index:: ! evaluation order; function arguments
 
-  On the other hand, function argument expressions are evaluated in the same order by both code generators with the exception of the global functions ``addmod`` and ``mulmod``.
+  On the other hand, function argument expressions are evaluated in the same order
+  by both code generators with the exception of the global functions ``addmod`` and ``mulmod``.
   For example:
 
   .. code-block:: solidity
@@ -227,11 +256,15 @@ This causes differences in some contracts, for example:
   - Old code generator: ``aMod = 0`` and ``mMod = 2``
   - New code generator: ``aMod = 4`` and ``mMod = 0``
 
-- The new code generator imposes a hard limit of ``type(uint64).max`` (``0xffffffffffffffff``) for the free memory pointer. Allocations that would increase its value beyond this limit revert. The old code generator does not have this limit.
+- The new code generator imposes a hard limit of ``type(uint64).max``
+  (``0xffffffffffffffff``) for the free memory pointer. Allocations that would
+  increase its value beyond this limit revert. The old code generator does not
+  have this limit.
 
   For example:
 
   .. code-block:: solidity
+      :force:
 
       // SPDX-License-Identifier: GPL-3.0
       pragma solidity >0.8.0;
@@ -264,7 +297,7 @@ The old code generator uses code offsets or tags for values of internal function
 these offsets are different at construction time and after deployment and the values can cross this border via storage.
 Because of that, both offsets are encoded at construction time into the same value (into different bytes).
 
-In the new code generator, function pointers use the AST IDs of the functions as values. Since calls via jumps are not possible,
+In the new code generator, function pointers use internal IDs that are allocated in sequence. Since calls via jumps are not possible,
 calls through function pointers always have to use an internal dispatch function that uses the ``switch`` statement to select
 the right function.
 
@@ -280,6 +313,7 @@ Cleanup
 
 The old code generator only performs cleanup before an operation whose result could be affected by the values of the dirty bits.
 The new code generator performs cleanup after any operation that can result in dirty bits.
+The hope is that the optimizer will be powerful enough to eliminate redundant cleanup operations.
 
 For example:
 

From 45c9dbe1743c0e5cd5a3f42a97ce7afda977ff5a Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 8 Nov 2021 13:06:20 +0100
Subject: [PATCH 0104/1748] Sort changelog and set release date.

---
 Changelog.md              | 12 ++++++------
 docs/bugs_by_version.json |  4 ++++
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 174c59356c..ee463b25cd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.10 (unreleased)
+### 0.8.10 (2021-11-09)
 
 Language Features:
  * Inline Assembly: Support ``.address`` and ``.selector`` on external function pointers to access their address and function selector.
@@ -28,23 +28,23 @@ Bugfixes:
  * Commandline Interface: When linking only accept exact matches for library names passed to the ``--libraries`` option. Library names not prefixed with a file name used to match any library with that name.
  * SMTChecker: Fix internal error in magic type access (``block``, ``msg``, ``tx``).
  * SMTChecker: Fix internal error in the CHC engine when passing gas in the function options.
- * TypeChecker: Fix internal error when using user defined value types in public library functions.
  * TypeChecker: Fix internal error when using arrays and structs with user defined value types before declaration.
+ * TypeChecker: Fix internal error when using user defined value types in public library functions.
  * TypeChecker: Improved error message for constant variables with (nested) mapping types.
  * Yul Assembler: Fix internal error when function names are not unique.
  * Yul IR Generator: Do not output empty switches/if-bodies for empty contracts.
 
 
+Important Bugfixes in Experimental Features:
+ * Yul IR Generator: Changes to function return variables referenced in modifier invocation arguments were not properly forwarded if there was more than one return variable.
+
+
 Build System:
  * Pass linker-only emscripten options only when linking.
  * Remove obsolete compatibility workaround for emscripten builds.
  * Update emscripten to version 2.0.33.
 
 
-Important Bugfixes in Experimental Features:
- * Yul IR Generator: Changes to function return variables referenced in modifier invocation arguments were not properly forwarded if there was more than one return variable.
-
-
 ### 0.8.9 (2021-09-29)
 
 Important Bugfixes:
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 4324b8339e..6385af1707 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1544,6 +1544,10 @@
         ],
         "released": "2021-01-27"
     },
+    "0.8.10": {
+        "bugs": [],
+        "released": "2021-11-09"
+    },
     "0.8.2": {
         "bugs": [
             "SignedImmutables",

From 75fd7fa93e1059aed362093191feb3e27804d465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 21 Oct 2021 18:40:55 +0200
Subject: [PATCH 0105/1748] CI: Modify notification steps to be silent in PRs

---
 .circleci/config.yml | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9e5862cab0..b7d501c719 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,7 +31,7 @@ orbs:
   win: circleci/windows@2.2.0
 
 commands:
-  gitter_notify:
+  gitter_notify_unless_pr:
     description: "Posts a notification to the main room on Gitter (if not running on a PR)."
     parameters:
       event:
@@ -44,6 +44,8 @@ commands:
           name: "Gitter notification"
           when: << parameters.condition >>
           command: |
+            [[ $CI_PULL_REQUEST == "" ]] || { echo "Running on a PR - notification skipped."; exit 0; }
+
             [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ Nightly job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
             [[ "<< parameters.event >>" == "success" ]] && message=" ✅ Nightly job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
 
@@ -55,17 +57,17 @@ commands:
               --header "Authorization: Bearer ${GITTER_API_TOKEN}" \
               --data "{\"text\":\"${message}\"}"
 
-  gitter_notify_failure:
+  gitter_notify_failure_unless_pr:
     description: "Posts a failure notification to the main room on Gitter (if not running on a PR)."
     steps:
-      - gitter_notify:
+      - gitter_notify_unless_pr:
           event: failure
           condition: on_fail
 
-  gitter_notify_success:
+  gitter_notify_success_unless_pr:
     description: "Posts a success notification to the main room on Gitter (if not running on a PR)."
     steps:
-      - gitter_notify:
+      - gitter_notify_unless_pr:
           event: success
           condition: on_success
 
@@ -562,9 +564,9 @@ jobs:
     steps:
       - checkout
       - run: *run_build
-      - gitter_notify_failure
       - store_artifacts: *artifacts_solc
       - persist_to_workspace: *artifacts_executables
+      - gitter_notify_failure_unless_pr
 
   b_ubu_release: &b_ubu_release
     <<: *b_ubu
@@ -650,10 +652,10 @@ jobs:
             git clone https://github.com/ethereum/solidity-fuzzing-corpus /tmp/solidity-fuzzing-corpus
             mkdir -p test_results
             scripts/regressions.py -o test_results
-      - gitter_notify_failure
-      - gitter_notify_success
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
+      - gitter_notify_failure_unless_pr
+      - gitter_notify_success_unless_pr
 
   b_archlinux:
     <<: *base_archlinux
@@ -852,7 +854,7 @@ jobs:
       - when:
           condition: true
           <<: *steps_soltest
-      - gitter_notify_failure
+      - gitter_notify_failure_unless_pr
 
   t_ubu_ubsan_clang_cli:
     <<: *base_ubuntu2004_clang
@@ -860,7 +862,7 @@ jobs:
       - when:
           condition: true
           <<: *steps_cmdline_tests
-      - gitter_notify_failure
+      - gitter_notify_failure_unless_pr
 
   t_ems_solcjs:
     <<: *base_ubuntu2004
@@ -940,8 +942,8 @@ jobs:
       - when:
           condition: <<parameters.gitter_notify>>
           steps:
-            - gitter_notify_failure
-            - gitter_notify_success
+            - gitter_notify_failure_unless_pr
+            - gitter_notify_success_unless_pr
 
   b_win: &b_win
     <<: *base_win_powershell

From 205e05b8f12cdd754adea2850055751fb201709b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 21 Oct 2021 18:46:04 +0200
Subject: [PATCH 0106/1748] CI: Add gitter failure notifications to all jobs

---
 .circleci/config.yml | 60 ++++++++++++++++++++++++++++++--------------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b7d501c719..72434ea15c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -189,6 +189,7 @@ defaults:
         - run: *run_soltest
         - store_test_results: *store_test_results
         - store_artifacts: *artifacts_test_results
+        - gitter_notify_failure_unless_pr
 
   - steps_soltest_all: &steps_soltest_all
       steps:
@@ -198,6 +199,7 @@ defaults:
         - run: *run_soltest_all
         - store_test_results: *store_test_results
         - store_artifacts: *artifacts_test_results
+        - gitter_notify_failure_unless_pr
 
   - steps_cmdline_tests: &steps_cmdline_tests
       steps:
@@ -207,6 +209,7 @@ defaults:
         - run: *run_cmdline_tests
         - store_test_results: *store_test_results
         - store_artifacts: *artifacts_test_results
+        - gitter_notify_failure_unless_pr
 
   # --------------------------------------------------------------------------
   # Base Image Templates
@@ -396,6 +399,7 @@ jobs:
       - run:
           name: Check spelling
           command: ~/.local/bin/codespell -S "*.enc,.git,Dockerfile*" -I ./scripts/codespell_whitelist.txt
+      - gitter_notify_failure_unless_pr
 
   chk_docs_examples:
     <<: *base_node_latest
@@ -409,6 +413,7 @@ jobs:
       - run:
           name: Test Docs examples
           command: ./test/docsCodeStyle.sh
+      - gitter_notify_failure_unless_pr
 
   chk_coding_style:
     <<: *base_buildpack_focal
@@ -426,6 +431,7 @@ jobs:
       - run:
           name: Check for broken symlinks
           command: ./scripts/check_symlinks.sh
+      - gitter_notify_failure_unless_pr
 
   chk_errorcodes:
     <<: *base_python
@@ -434,6 +440,7 @@ jobs:
       - run:
           name: Check for error codes
           command: ./scripts/error_codes.py --check
+      - gitter_notify_failure_unless_pr
 
   chk_pylint:
     <<: *base_buildpack_focal
@@ -449,6 +456,7 @@ jobs:
       - run:
           name: Linting Python Scripts
           command: ./scripts/pylint_all.py
+      - gitter_notify_failure_unless_pr
 
   chk_antlr_grammar:
     <<: *base_buildpack_focal
@@ -460,6 +468,7 @@ jobs:
       - run:
           name: Run tests
           command: ./scripts/test_antlr_grammar.sh
+      - gitter_notify_failure_unless_pr
 
   chk_buglist:
     <<: *base_node_latest
@@ -474,6 +483,7 @@ jobs:
       - run:
           name: Test buglist
           command: ./test/buglistTests.js
+      - gitter_notify_failure_unless_pr
 
   chk_proofs:
     <<: *base_buildpack_latest
@@ -486,12 +496,14 @@ jobs:
             apt-get -qy install python3-pip
             pip3 install --user z3-solver
       - run: *run_proofs
+      - gitter_notify_failure_unless_pr
 
   chk_docs_pragma_min_version:
     <<: *base_ubuntu2004
     steps:
       - checkout
       - run: *run_docs_pragma_min_version
+      - gitter_notify_failure_unless_pr
 
   t_ubu_pyscripts:
     <<: *base_ubuntu2004
@@ -500,6 +512,7 @@ jobs:
       - run:
           name: Python unit tests
           command: python3 test/pyscriptTests.py
+      - gitter_notify_failure_unless_pr
 
   t_win_pyscripts:
     <<: *base_win_powershell
@@ -509,6 +522,7 @@ jobs:
       - run:
           name: Python unit tests
           command: python.exe test/pyscriptTests.py
+      - gitter_notify_failure_unless_pr
 
   b_ubu: &b_ubu
     <<: *base_ubuntu2004_xlarge
@@ -519,6 +533,7 @@ jobs:
       - store_artifacts: *artifact_solidity_upgrade
       - store_artifacts: *artifact_yul_phaser
       - persist_to_workspace: *artifacts_executables
+      - gitter_notify_failure_unless_pr
 
   # x64 ASAN build, for testing for memory related bugs
   b_ubu_asan: &b_ubu_asan
@@ -532,6 +547,7 @@ jobs:
       - run: *run_build
       - store_artifacts: *artifacts_solc
       - persist_to_workspace: *artifacts_executables
+      - gitter_notify_failure_unless_pr
 
   b_ubu_clang: &b_ubu_clang
     <<: *base_ubuntu2004_clang_xlarge
@@ -540,6 +556,7 @@ jobs:
       - run: *run_build
       - store_artifacts: *artifacts_solc
       - persist_to_workspace: *artifacts_executables
+      - gitter_notify_failure_unless_pr
 
   b_ubu_asan_clang: &b_ubu_asan_clang
     <<: *base_ubuntu2004_clang
@@ -553,6 +570,7 @@ jobs:
       - run: *run_build
       - store_artifacts: *artifacts_solc
       - persist_to_workspace: *artifacts_executables
+      - gitter_notify_failure_unless_pr
 
   b_ubu_ubsan_clang: &b_ubu_ubsan_clang
     <<: *base_ubuntu2004_clang
@@ -586,6 +604,7 @@ jobs:
           name: strip binary
           command: strip build/solc/solc
       - store_artifacts: *artifacts_solc
+      - gitter_notify_failure_unless_pr
 
   b_ubu_codecov:
     <<: *base_ubuntu2004_xlarge
@@ -597,6 +616,7 @@ jobs:
       - checkout
       - run: *run_build
       - persist_to_workspace: *artifacts_executables
+      - gitter_notify_failure_unless_pr
 
   t_ubu_codecov:
     <<: *base_ubuntu2004
@@ -619,6 +639,7 @@ jobs:
           name: "Coverage: All"
           command: codecov --flags all --gcov-root build
       - store_artifacts: *artifacts_test_results
+      - gitter_notify_failure_unless_pr
 
   # Builds in C++20 mode and uses debug build in order to speed up.
   # Do *NOT* store any artifacts or workspace as we don't run tests on this build.
@@ -631,6 +652,7 @@ jobs:
     steps:
       - checkout
       - run: *run_build
+      - gitter_notify_failure_unless_pr
 
   b_ubu_ossfuzz: &b_ubu_ossfuzz
     <<: *base_ubuntu1604_clang
@@ -639,6 +661,7 @@ jobs:
       - run: *setup_prerelease_commit_hash
       - run: *run_build_ossfuzz
       - persist_to_workspace: *artifacts_executables_ossfuzz
+      - gitter_notify_failure_unless_pr
 
   t_ubu_ossfuzz: &t_ubu_ossfuzz
     <<: *base_ubuntu1604_clang
@@ -671,6 +694,7 @@ jobs:
       - run: *run_build
       - store_artifacts: *artifacts_solc
       - persist_to_workspace: *artifacts_executables
+      - gitter_notify_failure_unless_pr
 
   b_osx:
     <<: *base_osx
@@ -707,6 +731,7 @@ jobs:
             - build/solc/solc
             - build/test/soltest
             - build/test/tools/solfuzzer
+      - gitter_notify_failure_unless_pr
 
   t_osx_soltest:
     <<: *base_osx
@@ -724,6 +749,7 @@ jobs:
       - run: *run_soltest
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
+      - gitter_notify_failure_unless_pr
 
   t_osx_cli:
     <<: *base_osx
@@ -736,6 +762,7 @@ jobs:
           at: .
       - run: *run_cmdline_tests
       - store_artifacts: *artifacts_test_results
+      - gitter_notify_failure_unless_pr
 
   b_ems:
     <<: *base_ems_xlarge
@@ -756,6 +783,7 @@ jobs:
           paths:
             - soljson.js
             - version.txt
+      - gitter_notify_failure_unless_pr
 
   b_docs:
     <<: *base_ubuntu2004
@@ -768,6 +796,7 @@ jobs:
       - store_artifacts:
           path: docs/_build/html/
           destination: docs-html
+      - gitter_notify_failure_unless_pr
 
   t_ubu_soltest_all: &t_ubu_soltest_all
     <<: *base_ubuntu2004
@@ -850,19 +879,11 @@ jobs:
     <<: *base_ubuntu2004_clang
     environment:
       EVM: << pipeline.parameters.evm-version >>
-    steps:
-      - when:
-          condition: true
-          <<: *steps_soltest
-      - gitter_notify_failure_unless_pr
+    <<: *steps_soltest
 
   t_ubu_ubsan_clang_cli:
     <<: *base_ubuntu2004_clang
-    steps:
-      - when:
-          condition: true
-          <<: *steps_cmdline_tests
-      - gitter_notify_failure_unless_pr
+    <<: *steps_cmdline_tests
 
   t_ems_solcjs:
     <<: *base_ubuntu2004
@@ -882,6 +903,7 @@ jobs:
             node --version
             npm --version
             test/externalTests/solc-js/solc-js.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
+      - gitter_notify_failure_unless_pr
 
   t_ems_ext_hardhat:
     <<: *base_node_latest
@@ -907,6 +929,7 @@ jobs:
             # NOTE: This is expected to work without running `yarn build` first.
             cd hardhat/packages/hardhat-core
             yarn test
+      - gitter_notify_failure_unless_pr
 
   t_ems_ext:
     parameters:
@@ -918,9 +941,6 @@ jobs:
       nodejs_version:
         type: integer
         default: 14
-      gitter_notify:
-        type: boolean
-        default: no
     docker:
       - image: circleci/node:<<parameters.nodejs_version>>
     environment:
@@ -939,11 +959,7 @@ jobs:
           name: External <<parameters.project>> tests
           command: |
             test/externalTests/<<parameters.project>>.sh /tmp/workspace/soljson.js
-      - when:
-          condition: <<parameters.gitter_notify>>
-          steps:
-            - gitter_notify_failure_unless_pr
-            - gitter_notify_success_unless_pr
+      - gitter_notify_failure_unless_pr
 
   b_win: &b_win
     <<: *base_win_powershell
@@ -974,6 +990,7 @@ jobs:
           paths:
             - .\solc\*\solc.exe
             - .\test\*\soltest.exe
+      - gitter_notify_failure_unless_pr
 
   b_win_release:
     <<: *b_win
@@ -996,6 +1013,7 @@ jobs:
           command: .circleci/soltest.ps1
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
+      - gitter_notify_failure_unless_pr
 
   t_win_release_soltest:
     <<: *t_win_soltest
@@ -1019,6 +1037,7 @@ jobs:
           paths:
             - bytecode-report-ubuntu-json.txt
             - bytecode-report-ubuntu-cli.txt
+      - gitter_notify_failure_unless_pr
 
   b_bytecode_osx:
     <<: *base_osx
@@ -1039,6 +1058,7 @@ jobs:
           paths:
             - bytecode-report-osx-json.txt
             - bytecode-report-osx-cli.txt
+      - gitter_notify_failure_unless_pr
 
   b_bytecode_win:
     <<: *base_win_cmd
@@ -1062,6 +1082,7 @@ jobs:
           paths:
             - bytecode-report-windows-json.txt
             - bytecode-report-windows-cli.txt
+      - gitter_notify_failure_unless_pr
 
   b_bytecode_ems:
     <<: *base_node_latest
@@ -1078,6 +1099,7 @@ jobs:
           root: .
           paths:
             - bytecode-report-emscripten.txt
+      - gitter_notify_failure_unless_pr
 
   t_bytecode_compare:
     <<: *base_ubuntu2004
@@ -1114,6 +1136,7 @@ jobs:
           # NOTE: store_artifacts does not support the 'when' attribute.
           # Fortunately when the artifact does not exist it just says "No artifact files found" and ignores it.
           path: all-bytecode-reports.zip
+      - gitter_notify_failure_unless_pr
 
 workflows:
   version: 2
@@ -1284,4 +1307,3 @@ workflows:
           <<: *workflow_emscripten
           name: t_ems_test_ext_colony
           project: colony
-          gitter_notify: yes

From 9fb77b139cdca101b6582e63f466771e679ecc7b Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 9 Nov 2021 13:25:00 +0100
Subject: [PATCH 0107/1748] Keep canonical form of Yul code at all times.

---
 libyul/optimiser/BlockFlattener.cpp           | 12 ++++++++++++
 libyul/optimiser/BlockFlattener.h             |  2 +-
 libyul/optimiser/CircularReferencesPruner.cpp |  2 ++
 libyul/optimiser/ExpressionJoiner.cpp         |  4 +++-
 libyul/optimiser/FunctionGrouper.h            |  2 +-
 libyul/optimiser/OptimizerUtilities.h         |  2 ++
 libyul/optimiser/Suite.cpp                    |  2 +-
 libyul/optimiser/UnusedPruner.cpp             |  7 +++++++
 libyul/optimiser/UnusedPruner.h               |  4 +---
 9 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/libyul/optimiser/BlockFlattener.cpp b/libyul/optimiser/BlockFlattener.cpp
index bcbe19c18d..0bb828ee5a 100644
--- a/libyul/optimiser/BlockFlattener.cpp
+++ b/libyul/optimiser/BlockFlattener.cpp
@@ -43,3 +43,15 @@ void BlockFlattener::operator()(Block& _block)
 		}
 	);
 }
+
+void BlockFlattener::run(OptimiserStepContext&, Block& _ast)
+{
+	BlockFlattener flattener;
+	for (auto& statement: _ast.statements)
+		if (auto* block = get_if<Block>(&statement))
+			flattener(*block);
+		else if (auto* function = get_if<FunctionDefinition>(&statement))
+			flattener(function->body);
+		else
+			yulAssert(false, "BlockFlattener requires the FunctionGrouper.");
+}
diff --git a/libyul/optimiser/BlockFlattener.h b/libyul/optimiser/BlockFlattener.h
index 87a1af7cf1..3825647de3 100644
--- a/libyul/optimiser/BlockFlattener.h
+++ b/libyul/optimiser/BlockFlattener.h
@@ -27,7 +27,7 @@ class BlockFlattener: public ASTModifier
 {
 public:
 	static constexpr char const* name{"BlockFlattener"};
-	static void run(OptimiserStepContext&, Block& _ast) { BlockFlattener{}(_ast); }
+	static void run(OptimiserStepContext&, Block& _ast);
 
 	using ASTModifier::operator();
 	void operator()(Block& _block) override;
diff --git a/libyul/optimiser/CircularReferencesPruner.cpp b/libyul/optimiser/CircularReferencesPruner.cpp
index 1078779c5b..ba1fbf11da 100644
--- a/libyul/optimiser/CircularReferencesPruner.cpp
+++ b/libyul/optimiser/CircularReferencesPruner.cpp
@@ -18,6 +18,7 @@
 #include <libyul/optimiser/CircularReferencesPruner.h>
 
 #include <libyul/optimiser/CallGraphGenerator.h>
+#include <libyul/optimiser/FunctionGrouper.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/AST.h>
 
@@ -29,6 +30,7 @@ using namespace solidity::yul;
 void CircularReferencesPruner::run(OptimiserStepContext& _context, Block& _ast)
 {
 	CircularReferencesPruner{_context.reservedIdentifiers}(_ast);
+	FunctionGrouper::run(_context, _ast);
 }
 
 void CircularReferencesPruner::operator()(Block& _block)
diff --git a/libyul/optimiser/ExpressionJoiner.cpp b/libyul/optimiser/ExpressionJoiner.cpp
index 9d1df86947..dbb684007c 100644
--- a/libyul/optimiser/ExpressionJoiner.cpp
+++ b/libyul/optimiser/ExpressionJoiner.cpp
@@ -22,6 +22,7 @@
 
 #include <libyul/optimiser/ExpressionJoiner.h>
 
+#include <libyul/optimiser/FunctionGrouper.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/Exceptions.h>
@@ -37,9 +38,10 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
-void ExpressionJoiner::run(OptimiserStepContext&, Block& _ast)
+void ExpressionJoiner::run(OptimiserStepContext& _context, Block& _ast)
 {
 	ExpressionJoiner{_ast}(_ast);
+	FunctionGrouper::run(_context, _ast);
 }
 
 
diff --git a/libyul/optimiser/FunctionGrouper.h b/libyul/optimiser/FunctionGrouper.h
index fa54099369..57ea80cac9 100644
--- a/libyul/optimiser/FunctionGrouper.h
+++ b/libyul/optimiser/FunctionGrouper.h
@@ -34,7 +34,7 @@ struct OptimiserStepContext;
  * all function definitions.
  *
  * After this step, a block is of the form
- * { { I...} F... }
+ * { { I... } F... }
  * Where I are (non-function-definition) instructions and F are function definitions.
  */
 class FunctionGrouper
diff --git a/libyul/optimiser/OptimizerUtilities.h b/libyul/optimiser/OptimizerUtilities.h
index 09ea9ed5a3..d80b16316a 100644
--- a/libyul/optimiser/OptimizerUtilities.h
+++ b/libyul/optimiser/OptimizerUtilities.h
@@ -37,6 +37,8 @@ namespace solidity::yul
 {
 
 /// Removes statements that are just empty blocks (non-recursive).
+/// If this is run on the outermost block, the FunctionGrouper should be run afterwards to keep
+/// the canonical form.
 void removeEmptyBlocks(Block& _block);
 
 /// Returns true if a given literal can not be used as an identifier.
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 32ea08dbe1..766cc93b90 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -118,7 +118,7 @@ void OptimiserSuite::run(
 
 	// Some steps depend on properties ensured by FunctionHoister, BlockFlattener, FunctionGrouper and
 	// ForLoopInitRewriter. Run them first to be able to run arbitrary sequences safely.
-	suite.runSequence("hfgo", ast);
+	suite.runSequence("hgfo", ast);
 
 	NameSimplifier::run(suite.m_context, ast);
 	// Now the user-supplied part
diff --git a/libyul/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp
index dae4d4c6ff..cb60f9da89 100644
--- a/libyul/optimiser/UnusedPruner.cpp
+++ b/libyul/optimiser/UnusedPruner.cpp
@@ -21,6 +21,7 @@
 #include <libyul/optimiser/UnusedPruner.h>
 
 #include <libyul/optimiser/CallGraphGenerator.h>
+#include <libyul/optimiser/FunctionGrouper.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
@@ -33,6 +34,12 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
+void UnusedPruner::run(OptimiserStepContext& _context, Block& _ast)
+{
+	UnusedPruner::runUntilStabilisedOnFullAST(_context.dialect, _ast, _context.reservedIdentifiers);
+	FunctionGrouper::run(_context, _ast);
+}
+
 UnusedPruner::UnusedPruner(
 	Dialect const& _dialect,
 	Block& _ast,
diff --git a/libyul/optimiser/UnusedPruner.h b/libyul/optimiser/UnusedPruner.h
index af77d911af..e4587d5d72 100644
--- a/libyul/optimiser/UnusedPruner.h
+++ b/libyul/optimiser/UnusedPruner.h
@@ -50,9 +50,7 @@ class UnusedPruner: public ASTModifier
 {
 public:
 	static constexpr char const* name{"UnusedPruner"};
-	static void run(OptimiserStepContext& _context, Block& _ast) {
-		UnusedPruner::runUntilStabilisedOnFullAST(_context.dialect, _ast, _context.reservedIdentifiers);
-	}
+	static void run(OptimiserStepContext& _context, Block& _ast);
 
 
 	using ASTModifier::operator();

From f2d9a806e0a2a2fb8560cc24d391013dcdf32553 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 9 Nov 2021 13:25:13 +0100
Subject: [PATCH 0108/1748] Document change to BlockFlattener.

---
 docs/internals/optimizer.rst | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 28c342902d..d75eca4198 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -972,15 +972,19 @@ BlockFlattener
 ^^^^^^^^^^^^^^
 
 This stage eliminates nested blocks by inserting the statement in the
-inner block at the appropriate place in the outer block:
+inner block at the appropriate place in the outer block. It depends on the
+FunctionGrouper and does not flatten the outermost block to keep the form
+produced by the FunctionGrouper.
 
 .. code-block:: yul
 
     {
-        let x := 2
         {
-            let y := 3
-            mstore(x, y)
+            let x := 2
+            {
+                let y := 3
+                mstore(x, y)
+            }
         }
     }
 
@@ -989,9 +993,11 @@ is transformed to
 .. code-block:: yul
 
     {
-        let x := 2
-        let y := 3
-        mstore(x, y)
+        {
+            let x := 2
+            let y := 3
+            mstore(x, y)
+        }
     }
 
 As long as the code is disambiguated, this does not cause a problem because

From 10618188dd4af178486402ca240881d633b3dbd8 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 9 Nov 2021 13:25:25 +0100
Subject: [PATCH 0109/1748] Update tests.

---
 .../blockFlattener/basic.yul                  | 28 +++++++-----
 .../blockFlattener/for_stmt.yul               | 12 +++--
 .../blockFlattener/if_stmt.yul                | 24 +++++-----
 .../blockFlattener/many_nested_blocks.yul     | 38 +++++++++-------
 .../blockFlattener/switch_stmt.yul            | 24 +++++-----
 .../called_from_non_function.yul              |  6 ++-
 .../nested_different_names.yul                |  2 +-
 .../nested_same_name.yul                      |  2 +-
 .../circularReferencesPruner/trivial.yul      |  2 +-
 .../expressionJoiner/if_condition.yul         |  6 ++-
 .../expressionJoiner/muli_wrong_order3.yul    |  8 ++--
 .../expressionJoiner/multi.yul                |  4 +-
 .../expressionJoiner/multi_reference.yul      |  6 ++-
 .../expressionJoiner/multi_wrong_order.yul    |  6 ++-
 .../expressionJoiner/multi_wrong_order2.yul   |  6 ++-
 .../no_replacement_across_blocks.yul          |  6 ++-
 .../no_replacement_in_loop_condition1.yul     |  6 ++-
 .../no_replacement_in_loop_condition2.yul     |  8 ++--
 .../expressionJoiner/only_assignment.yul      |  1 +
 .../expressionJoiner/reassignment.yul         |  8 ++--
 .../expressionJoiner/simple.yul               |  4 +-
 .../expressionJoiner/single_wrong_order.yul   |  6 ++-
 .../expressionJoiner/smoke.yul                |  2 +-
 .../expressionJoiner/switch_expression.yul    | 10 +++--
 .../expressionJoiner/triple.yul               |  4 +-
 .../assigned_vars_multi.yul                   |  6 ++-
 .../byte_after_shr_non_mul_of_8.yul           |  2 +-
 .../combine_shift_and_and.yul                 |  8 ++--
 .../combine_shift_and_and_2.yul               | 44 ++++++++++---------
 .../combine_shift_and_and_3.yul               | 28 ++++++------
 .../constant_propagation.yul                  |  2 +-
 .../expressionSimplifier/constants.yul        |  2 +-
 .../expressionSimplifier/create2_and_mask.yul | 12 ++---
 .../expressionSimplifier/create_and_mask.yul  | 14 +++---
 .../exp_simplifications.yul                   | 18 ++++----
 .../expressionSimplifier/idempotency.yul      | 10 +++--
 .../identity_rules_complex.yul                |  2 +-
 .../identity_rules_negative.yul               |  6 ++-
 .../identity_rules_simple.yul                 |  2 +-
 .../including_function_calls.yul              |  2 +-
 .../expressionSimplifier/inside_for.yul       |  8 ++--
 .../expressionSimplifier/invariant.yul        |  2 +-
 .../expressionSimplifier/iszero_sub_to_eq.yul |  8 ++--
 .../large_byte_access.yul                     | 22 +++++-----
 .../expressionSimplifier/mod_and_1.yul        |  6 ++-
 .../expressionSimplifier/mod_and_2.yul        |  6 ++-
 ...lied_function_call_different_arguments.yul |  8 ++--
 ..._applied_function_call_different_names.yul |  2 +-
 ...ied_function_call_equality_not_movable.yul |  2 +-
 ...d_removes_non_constant_and_not_movable.yul | 12 ++---
 .../pop_byte_shr_call.yul                     |  8 ++--
 .../pop_byte_shr_func.yul                     |  6 ++-
 .../pop_byte_shr_func_trivial.yul             |  2 +-
 .../expressionSimplifier/reassign.yul         | 10 +++--
 .../remove_redundant_shift_masking.yul        | 18 ++++----
 .../replace_too_large_shift.yul               | 18 ++++----
 .../expressionSimplifier/return_vars_zero.yul |  2 +-
 .../expressionSimplifier/reversed.yul         |  6 ++-
 .../selfbalance_not_supported.yul             |  4 +-
 .../selfbalance_split.yul                     |  6 ++-
 .../selfbalance_supported.yul                 |  2 +-
 .../side_effects_in_for_condition.yul         |  6 ++-
 .../expressionSimplifier/smoke.yul            |  2 +-
 .../unassigend_vars_multi.yul                 |  6 ++-
 .../expressionSimplifier/unassigned_vars.yul  |  2 +-
 .../no_inline_into_big_function.yul           |  1 +
 .../fullSimplify/constant_propagation.yul     |  6 ++-
 .../fullSimplify/constants.yul                |  2 +-
 .../fullSimplify/identity_rules_complex.yul   |  2 +-
 .../fullSimplify/identity_rules_negative.yul  |  6 ++-
 .../fullSimplify/identity_rules_simple.yul    |  2 +-
 .../fullSimplify/including_function_calls.yul |  2 +-
 .../fullSimplify/inside_for.yul               |  8 ++--
 .../fullSimplify/invariant.yul                | 10 +++--
 .../fullSimplify/mod_and_1.yul                |  6 ++-
 .../fullSimplify/mod_and_2.yul                |  6 ++-
 ...lied_function_call_different_arguments.yul |  8 ++--
 ..._applied_function_call_different_names.yul |  2 +-
 ...ied_function_call_equality_not_movable.yul |  2 +-
 ...d_removes_non_constant_and_not_movable.yul |  8 ++--
 .../fullSimplify/operations.yul               | 38 ++++++++--------
 .../fullSimplify/reversed.yul                 |  6 ++-
 .../fullSimplify/signextend.yul               |  6 ++-
 .../yulOptimizerTests/fullSimplify/smoke.yul  |  2 +-
 .../loadResolver/double_mload.yul             |  6 ++-
 .../double_mload_with_other_reassignment.yul  | 10 +++--
 .../double_mload_with_reassignment.yul        | 10 +++--
 .../yulOptimizerTests/loadResolver/keccak.yul | 10 +++--
 .../loadResolver/keccak_crash.yul             | 10 +++--
 .../loadResolver/keccak_fail1.yul             | 12 ++---
 .../loadResolver/keccak_fail2.yul             | 10 +++--
 .../loadResolver/keccak_short.yul             | 20 +++++----
 .../loadResolver/keccak_string_literal.yul    | 16 ++++---
 .../loadResolver/keccak_symbolic_memory.yul   | 10 +++--
 .../loadResolver/keccak_with_msize.yul        | 12 ++---
 .../yulOptimizerTests/loadResolver/loop.yul   | 16 ++++---
 ...y_with_different_kinds_of_invalidation.yul | 30 +++++++------
 .../loadResolver/memory_with_msize.yul        | 12 ++---
 .../loadResolver/merge_known_write.yul        | 18 ++++----
 .../merge_known_write_with_distance.yul       | 14 +++---
 .../merge_mload_with_known_distance.yul       | 12 ++---
 .../loadResolver/merge_mload_with_rewrite.yul | 14 +++---
 .../merge_mload_without_rewrite.yul           | 14 +++---
 .../loadResolver/merge_unknown_write.yul      | 18 ++++----
 .../loadResolver/merge_with_rewrite.yul       | 14 +++---
 .../loadResolver/mload_in_function.yul        | 12 ++---
 .../loadResolver/mload_self.yul               | 10 +++--
 .../mstore_in_function_loop_body.yul          | 12 ++---
 .../mstore_in_function_loop_init.yul          | 12 ++---
 .../loadResolver/multi_sload_loop.yul         | 24 +++++-----
 .../loadResolver/re_store_memory.yul          | 16 ++++---
 .../loadResolver/re_store_storage.yul         | 16 ++++---
 .../loadResolver/reassign.yul                 | 12 ++---
 .../reassign_value_expression.yul             | 24 +++++-----
 .../loadResolver/second_mstore_with_delta.yul | 18 ++++----
 .../loadResolver/second_store.yul             | 14 +++---
 .../loadResolver/second_store_same_value.yul  | 14 +++---
 .../loadResolver/second_store_with_delta.yul  | 18 ++++----
 .../side_effects_of_user_functions.yul        | 20 +++++----
 .../yulOptimizerTests/loadResolver/simple.yul |  8 ++--
 .../loadResolver/simple_memory.yul            |  8 ++--
 .../loadResolver/staticcall.yul               | 22 +++++-----
 .../loadResolver/verbatim_mload.yul           | 12 ++---
 .../loadResolver/verbatim_sload.yul           | 18 ++++----
 .../splitJoin/control_flow.yul                | 10 +++--
 .../yulOptimizerTests/splitJoin/functions.yul | 14 +++---
 .../yulOptimizerTests/splitJoin/smoke.yul     |  2 +-
 .../yulOptimizerTests/ssaAndBack/for_loop.yul | 14 +++---
 .../ssaAndBack/multi_assign.yul               |  6 ++-
 .../ssaAndBack/multi_assign_if.yul            |  8 ++--
 .../ssaAndBack/multi_assign_multi_var_if.yul  | 18 ++++----
 .../multi_assign_multi_var_switch.yul         | 32 +++++++-------
 .../ssaAndBack/multi_assign_switch.yul        | 12 ++---
 .../yulOptimizerTests/ssaAndBack/simple.yul   |  6 ++-
 .../ssaAndBack/single_assign_if.yul           |  8 ++--
 .../ssaAndBack/single_assign_switch.yul       | 12 ++---
 .../ssaAndBack/ssaReverse.yul                 |  6 ++-
 .../yulOptimizerTests/ssaAndBack/two_vars.yul | 16 ++++---
 .../stackCompressor/inlineInBlock.yul         |  4 +-
 .../stackCompressor/inlineInFunction.yul      |  2 +-
 .../stackCompressor/noInline.yul              |  2 +-
 .../stackCompressor/unusedPrunerWithMSize.yul | 20 +++++----
 .../unusedPruner/functions.yul                |  2 +-
 .../unusedPruner/intermediate_assignment.yul  |  6 ++-
 .../intermediate_multi_assignment.yul         |  8 ++--
 .../yulOptimizerTests/unusedPruner/keccak.yul |  6 ++-
 .../movable_user_defined_function.yul         |  2 +-
 .../yulOptimizerTests/unusedPruner/msize.yul  |  6 ++-
 .../unusedPruner/multi_assign.yul             |  8 ++--
 .../unusedPruner/multi_assignments.yul        |  8 ++--
 .../unusedPruner/multi_declarations.yul       |  2 +-
 .../unusedPruner/multi_declare.yul            |  2 +-
 .../multi_partial_assignments.yul             |  6 ++-
 .../unusedPruner/no_msize.yul                 |  2 +-
 .../yulOptimizerTests/unusedPruner/pop.yul    |  2 +-
 .../yulOptimizerTests/unusedPruner/smoke.yul  |  2 +-
 .../unusedPruner/trivial.yul                  |  2 +-
 .../unusedPruner/verbatim.yul                 |  8 ++--
 test/yulPhaser/Program.cpp                    |  5 ++-
 159 files changed, 893 insertions(+), 638 deletions(-)

diff --git a/test/libyul/yulOptimizerTests/blockFlattener/basic.yul b/test/libyul/yulOptimizerTests/blockFlattener/basic.yul
index e576174367..5b49552fb9 100644
--- a/test/libyul/yulOptimizerTests/blockFlattener/basic.yul
+++ b/test/libyul/yulOptimizerTests/blockFlattener/basic.yul
@@ -1,21 +1,25 @@
 {
-  let _1 := mload(0)
-  let f_a := mload(1)
-  let f_r
   {
-    f_a := mload(f_a)
-    f_r := add(f_a, calldatasize())
+    let _1 := mload(0)
+    let f_a := mload(1)
+    let f_r
+    {
+      f_a := mload(f_a)
+      f_r := add(f_a, calldatasize())
+    }
+    let z := mload(2)
   }
-  let z := mload(2)
 }
 // ----
 // step: blockFlattener
 //
 // {
-//     let _1 := mload(0)
-//     let f_a := mload(1)
-//     let f_r
-//     f_a := mload(f_a)
-//     f_r := add(f_a, calldatasize())
-//     let z := mload(2)
+//     {
+//         let _1 := mload(0)
+//         let f_a := mload(1)
+//         let f_r
+//         f_a := mload(f_a)
+//         f_r := add(f_a, calldatasize())
+//         let z := mload(2)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/blockFlattener/for_stmt.yul b/test/libyul/yulOptimizerTests/blockFlattener/for_stmt.yul
index a5be68a7ce..c587c47a3a 100644
--- a/test/libyul/yulOptimizerTests/blockFlattener/for_stmt.yul
+++ b/test/libyul/yulOptimizerTests/blockFlattener/for_stmt.yul
@@ -1,12 +1,16 @@
 {
-    for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
-        a := add(a, 1)
+    {
+        for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) } {
+            a := add(a, 1)
+        }
     }
 }
 // ----
 // step: blockFlattener
 //
 // {
-//     for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) }
-//     { a := add(a, 1) }
+//     {
+//         for { let a := 1 } iszero(eq(a, 10)) { a := add(a, 1) }
+//         { a := add(a, 1) }
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/blockFlattener/if_stmt.yul b/test/libyul/yulOptimizerTests/blockFlattener/if_stmt.yul
index f31c5f979c..00740fb133 100644
--- a/test/libyul/yulOptimizerTests/blockFlattener/if_stmt.yul
+++ b/test/libyul/yulOptimizerTests/blockFlattener/if_stmt.yul
@@ -1,21 +1,25 @@
 {
-  if add(mload(7), sload(mload(3)))
   {
-    let y := add(mload(3), 3)
-	{
-      y := add(y, 7)
-	}
+    if add(mload(7), sload(mload(3)))
+    {
+      let y := add(mload(3), 3)
+      {
+        y := add(y, 7)
+      }
+    }
+    let t := add(3, 9)
   }
-  let t := add(3, 9)
 }
 // ----
 // step: blockFlattener
 //
 // {
-//     if add(mload(7), sload(mload(3)))
 //     {
-//         let y := add(mload(3), 3)
-//         y := add(y, 7)
+//         if add(mload(7), sload(mload(3)))
+//         {
+//             let y := add(mload(3), 3)
+//             y := add(y, 7)
+//         }
+//         let t := add(3, 9)
 //     }
-//     let t := add(3, 9)
 // }
diff --git a/test/libyul/yulOptimizerTests/blockFlattener/many_nested_blocks.yul b/test/libyul/yulOptimizerTests/blockFlattener/many_nested_blocks.yul
index d7fd4b45a4..d1051a115b 100644
--- a/test/libyul/yulOptimizerTests/blockFlattener/many_nested_blocks.yul
+++ b/test/libyul/yulOptimizerTests/blockFlattener/many_nested_blocks.yul
@@ -1,29 +1,33 @@
 {
-  let a := 3
-  let b := 4
   {
-    a := add(b, 3)
-    let c := 5
+    let a := 3
+    let b := 4
     {
-      b := add(b, 4)
+      a := add(b, 3)
+      let c := 5
       {
-        c := add(a, 5)
-	  }
-      b := add(a, b)
+        b := add(b, 4)
+        {
+          c := add(a, 5)
+        }
+        b := add(a, b)
+      }
+      a := add(a, c)
     }
-    a := add(a, c)
   }
 }
 // ----
 // step: blockFlattener
 //
 // {
-//     let a := 3
-//     let b := 4
-//     a := add(b, 3)
-//     let c := 5
-//     b := add(b, 4)
-//     c := add(a, 5)
-//     b := add(a, b)
-//     a := add(a, c)
+//     {
+//         let a := 3
+//         let b := 4
+//         a := add(b, 3)
+//         let c := 5
+//         b := add(b, 4)
+//         c := add(a, 5)
+//         b := add(a, b)
+//         a := add(a, c)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/blockFlattener/switch_stmt.yul b/test/libyul/yulOptimizerTests/blockFlattener/switch_stmt.yul
index 0b2a8245de..27b9d96dfd 100644
--- a/test/libyul/yulOptimizerTests/blockFlattener/switch_stmt.yul
+++ b/test/libyul/yulOptimizerTests/blockFlattener/switch_stmt.yul
@@ -1,23 +1,27 @@
 {
+  {
     let a := 1
     switch calldataload(0)
     case 0 { { { mstore(0, 1) } } a := 8 }
     default { a := 3 { a := 4 } }
     a := 5
+  }
 }
 // ----
 // step: blockFlattener
 //
 // {
-//     let a := 1
-//     switch calldataload(0)
-//     case 0 {
-//         mstore(0, 1)
-//         a := 8
+//     {
+//         let a := 1
+//         switch calldataload(0)
+//         case 0 {
+//             mstore(0, 1)
+//             a := 8
+//         }
+//         default {
+//             a := 3
+//             a := 4
+//         }
+//         a := 5
 //     }
-//     default {
-//         a := 3
-//         a := 4
-//     }
-//     a := 5
 // }
diff --git a/test/libyul/yulOptimizerTests/circularReferencesPruner/called_from_non_function.yul b/test/libyul/yulOptimizerTests/circularReferencesPruner/called_from_non_function.yul
index 739ba78bff..909d12533c 100644
--- a/test/libyul/yulOptimizerTests/circularReferencesPruner/called_from_non_function.yul
+++ b/test/libyul/yulOptimizerTests/circularReferencesPruner/called_from_non_function.yul
@@ -9,8 +9,10 @@
 // step: circularReferencesPruner
 //
 // {
-//     let a
-//     a := h()
+//     {
+//         let a
+//         a := h()
+//     }
 //     function f() -> x
 //     { x := g() }
 //     function g() -> y
diff --git a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul b/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul
index ac04f96a81..f78b9fb992 100644
--- a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul
+++ b/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_different_names.yul
@@ -11,4 +11,4 @@
 // ----
 // step: circularReferencesPruner
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul b/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul
index 02ac2317de..858a48d85b 100644
--- a/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul
+++ b/test/libyul/yulOptimizerTests/circularReferencesPruner/nested_same_name.yul
@@ -11,4 +11,4 @@
 // ----
 // step: circularReferencesPruner
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/circularReferencesPruner/trivial.yul b/test/libyul/yulOptimizerTests/circularReferencesPruner/trivial.yul
index 4398bc29f4..ebb8a329c8 100644
--- a/test/libyul/yulOptimizerTests/circularReferencesPruner/trivial.yul
+++ b/test/libyul/yulOptimizerTests/circularReferencesPruner/trivial.yul
@@ -5,4 +5,4 @@
 // ----
 // step: circularReferencesPruner
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/if_condition.yul b/test/libyul/yulOptimizerTests/expressionJoiner/if_condition.yul
index 045168cf13..f7e0e2ea16 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/if_condition.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/if_condition.yul
@@ -14,6 +14,8 @@
 // step: expressionJoiner
 //
 // {
-//     if add(mload(7), sload(mload(3))) { let y := add(mload(3), 3) }
-//     let t := add(3, 9)
+//     {
+//         if add(mload(7), sload(mload(3))) { let y := add(mload(3), 3) }
+//         let t := add(3, 9)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul b/test/libyul/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul
index 461285ae24..b2f75828e8 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/muli_wrong_order3.yul
@@ -8,7 +8,9 @@
 // step: expressionJoiner
 //
 // {
-//     let a := mload(3)
-//     let b := mload(6)
-//     sstore(mul(add(b, a), mload(2)), 3)
+//     {
+//         let a := mload(3)
+//         let b := mload(6)
+//         sstore(mul(add(b, a), mload(2)), 3)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/multi.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi.yul
index 5fcd2c5bf2..6a9e1a336e 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/multi.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/multi.yul
@@ -8,5 +8,7 @@
 // step: expressionJoiner
 //
 // {
-//     sstore(mul(add(mload(6), mload(2)), 2), 3)
+//     {
+//         sstore(mul(add(mload(6), mload(2)), 2), 3)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/multi_reference.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi_reference.yul
index ed209e597d..cf90aa836f 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/multi_reference.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/multi_reference.yul
@@ -7,6 +7,8 @@
 // step: expressionJoiner
 //
 // {
-//     let a := mload(2)
-//     let b := add(a, a)
+//     {
+//         let a := mload(2)
+//         let b := add(a, a)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul
index 2837f70330..16bd1adedd 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order.yul
@@ -11,6 +11,8 @@
 // step: expressionJoiner
 //
 // {
-//     let a := mload(2)
-//     sstore(mul(a, add(2, mload(6))), 3)
+//     {
+//         let a := mload(2)
+//         sstore(mul(a, add(2, mload(6))), 3)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul b/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul
index d69f9d8a5d..25cf9676cb 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/multi_wrong_order2.yul
@@ -8,6 +8,8 @@
 // step: expressionJoiner
 //
 // {
-//     let a := mload(2)
-//     sstore(mul(add(a, mload(6)), 2), 3)
+//     {
+//         let a := mload(2)
+//         sstore(mul(add(a, mload(6)), 2), 3)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul
index 0e4f1916a2..f31be09c96 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_across_blocks.yul
@@ -15,6 +15,8 @@
 // step: expressionJoiner
 //
 // {
-//     let x := calldataload(mload(2))
-//     sstore(x, 3)
+//     {
+//         let x := calldataload(mload(2))
+//         sstore(x, 3)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul
index b453446ad2..7e81adc7de 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition1.yul
@@ -5,6 +5,8 @@
 // step: expressionJoiner
 //
 // {
-//     for { let b := mload(1) } b { }
-//     { }
+//     {
+//         for { let b := mload(1) } b { }
+//         { }
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul
index ab41999d50..bc5c5106df 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/no_replacement_in_loop_condition2.yul
@@ -6,7 +6,9 @@
 // step: expressionJoiner
 //
 // {
-//     let a := mload(0)
-//     for { } a { }
-//     { }
+//     {
+//         let a := mload(0)
+//         for { } a { }
+//         { }
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/only_assignment.yul b/test/libyul/yulOptimizerTests/expressionJoiner/only_assignment.yul
index 30bf466348..ac3d8e6221 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/only_assignment.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/only_assignment.yul
@@ -9,6 +9,7 @@
 // step: expressionJoiner
 //
 // {
+//     { }
 //     function f(a) -> x
 //     {
 //         a := mload(2)
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/reassignment.yul b/test/libyul/yulOptimizerTests/expressionJoiner/reassignment.yul
index e327d0b33f..2b5cce251f 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/reassignment.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/reassignment.yul
@@ -8,7 +8,9 @@
 // step: expressionJoiner
 //
 // {
-//     let a := mload(2)
-//     let b := mload(a)
-//     a := 4
+//     {
+//         let a := mload(2)
+//         let b := mload(a)
+//         a := 4
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/simple.yul b/test/libyul/yulOptimizerTests/expressionJoiner/simple.yul
index 5ec8a900ad..ed8a282622 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/simple.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/simple.yul
@@ -7,5 +7,7 @@
 // step: expressionJoiner
 //
 // {
-//     sstore(calldataload(mload(2)), 3)
+//     {
+//         sstore(calldataload(mload(2)), 3)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/single_wrong_order.yul b/test/libyul/yulOptimizerTests/expressionJoiner/single_wrong_order.yul
index 812cb7e7c6..beb3b8ab59 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/single_wrong_order.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/single_wrong_order.yul
@@ -9,6 +9,8 @@
 // step: expressionJoiner
 //
 // {
-//     let b := sload(mload(3))
-//     sstore(add(b, mload(7)), 0)
+//     {
+//         let b := sload(mload(3))
+//         sstore(add(b, mload(7)), 0)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/smoke.yul b/test/libyul/yulOptimizerTests/expressionJoiner/smoke.yul
index 77f73f1126..69c4afdda6 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/smoke.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/smoke.yul
@@ -2,4 +2,4 @@
 // ----
 // step: expressionJoiner
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/switch_expression.yul b/test/libyul/yulOptimizerTests/expressionJoiner/switch_expression.yul
index 08f7bb9fb0..c17e8d3dc1 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/switch_expression.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/switch_expression.yul
@@ -18,8 +18,10 @@
 // step: expressionJoiner
 //
 // {
-//     switch add(mload(7), sload(mload(3)))
-//     case 3 { let y := add(mload(3), 3) }
-//     default { sstore(1, 0) }
-//     let t := add(3, 9)
+//     {
+//         switch add(mload(7), sload(mload(3)))
+//         case 3 { let y := add(mload(3), 3) }
+//         default { sstore(1, 0) }
+//         let t := add(3, 9)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionJoiner/triple.yul b/test/libyul/yulOptimizerTests/expressionJoiner/triple.yul
index d6c652e2c0..e0a5dca4d2 100644
--- a/test/libyul/yulOptimizerTests/expressionJoiner/triple.yul
+++ b/test/libyul/yulOptimizerTests/expressionJoiner/triple.yul
@@ -9,5 +9,7 @@
 // step: expressionJoiner
 //
 // {
-//     sstore(mul(add(mload(7), mload(6)), mload(2)), 3)
+//     {
+//         sstore(mul(add(mload(7), mload(6)), mload(2)), 3)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/assigned_vars_multi.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/assigned_vars_multi.yul
index b73742ced1..1fce6767ed 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/assigned_vars_multi.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/assigned_vars_multi.yul
@@ -8,8 +8,10 @@
 // step: expressionSimplifier
 //
 // {
-//     let c, d := f()
-//     sstore(add(add(d, c), 7), 20)
+//     {
+//         let c, d := f()
+//         sstore(add(add(d, c), 7), 20)
+//     }
 //     function f() -> x, z
 //     { }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/byte_after_shr_non_mul_of_8.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/byte_after_shr_non_mul_of_8.yul
index e7c7bbf881..f9405e1013 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/byte_after_shr_non_mul_of_8.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/byte_after_shr_non_mul_of_8.yul
@@ -6,4 +6,4 @@
 // ----
 // step: expressionSimplifier
 //
-// { sstore(0, 0) }
+// { { sstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and.yul
index 7288ef56f9..9bb106c89e 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and.yul
@@ -13,7 +13,9 @@
 // step: expressionSimplifier
 //
 // {
-//     let x := calldataload(0)
-//     let a := and(0xff, and(shr(248, x), 255))
-//     sstore(a, shr(12, and(shl(8, x), 15790080)))
+//     {
+//         let x := calldataload(0)
+//         let a := and(0xff, and(shr(248, x), 255))
+//         sstore(a, shr(12, and(shl(8, x), 15790080)))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_2.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_2.yul
index f57a5108b8..6e39f2a1dc 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_2.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_2.yul
@@ -24,25 +24,27 @@
 // step: expressionSimplifier
 //
 // {
-//     let x := calldataload(0)
-//     let _2 := 0xf
-//     let _5 := and(shr(248, x), 0)
-//     let _10 := 0xff
-//     let a := and(_5, 255)
-//     let _14 := and(shr(4, x), 3855)
-//     let _15 := 12
-//     let b := shl(_15, _14)
-//     let _19 := and(shr(4, x), 3855)
-//     let c := shl(_15, _19)
-//     let d := shl(_15, and(shr(255, x), 0))
-//     let e := shl(_10, _19)
-//     let f := 0
-//     let g := 0
-//     sstore(10, a)
-//     sstore(11, b)
-//     sstore(_15, c)
-//     sstore(13, d)
-//     sstore(14, e)
-//     sstore(_2, f)
-//     sstore(16, g)
+//     {
+//         let x := calldataload(0)
+//         let _2 := 0xf
+//         let _5 := and(shr(248, x), 0)
+//         let _10 := 0xff
+//         let a := and(_5, 255)
+//         let _14 := and(shr(4, x), 3855)
+//         let _15 := 12
+//         let b := shl(_15, _14)
+//         let _19 := and(shr(4, x), 3855)
+//         let c := shl(_15, _19)
+//         let d := shl(_15, and(shr(255, x), 0))
+//         let e := shl(_10, _19)
+//         let f := 0
+//         let g := 0
+//         sstore(10, a)
+//         sstore(11, b)
+//         sstore(_15, c)
+//         sstore(13, d)
+//         sstore(14, e)
+//         sstore(_2, f)
+//         sstore(16, g)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_3.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_3.yul
index 14ff1b375d..9df15b4e9c 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_3.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_shift_and_and_3.yul
@@ -21,17 +21,19 @@
 // step: expressionSimplifier
 //
 // {
-//     let x := calldataload(0)
-//     let a := and(shl(8, x), 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000)
-//     let b := and(shr(8, x), 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0)
-//     let c := and(shr(8, x), 0x0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
-//     let d := and(shl(8, x), 0x0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00)
-//     let _14 := 150
-//     let e := shl(_14, and(shl(148, x), 0x3ffffffffffffffffffffffffff0000000000000000000000000000000000000))
-//     sstore(15, x)
-//     sstore(16, a)
-//     sstore(17, b)
-//     sstore(18, c)
-//     sstore(19, d)
-//     sstore(20, e)
+//     {
+//         let x := calldataload(0)
+//         let a := and(shl(8, x), 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff000)
+//         let b := and(shr(8, x), 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0)
+//         let c := and(shr(8, x), 0x0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+//         let d := and(shl(8, x), 0x0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00)
+//         let _14 := 150
+//         let e := shl(_14, and(shl(148, x), 0x3ffffffffffffffffffffffffff0000000000000000000000000000000000000))
+//         sstore(15, x)
+//         sstore(16, a)
+//         sstore(17, b)
+//         sstore(18, c)
+//         sstore(19, d)
+//         sstore(20, e)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/constant_propagation.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/constant_propagation.yul
index 56d18fb7b3..557142fa54 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/constant_propagation.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/constant_propagation.yul
@@ -5,4 +5,4 @@
 // ----
 // step: expressionSimplifier
 //
-// { mstore(20, mload(0)) }
+// { { mstore(20, mload(0)) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/constants.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/constants.yul
index ce29499931..bbd8f2d122 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/constants.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/constants.yul
@@ -5,4 +5,4 @@
 // ----
 // step: expressionSimplifier
 //
-// { sstore(7, 13) }
+// { { sstore(7, 13) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/create2_and_mask.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/create2_and_mask.yul
index 8a52659922..a431c57a6c 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/create2_and_mask.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/create2_and_mask.yul
@@ -12,9 +12,11 @@
 // step: expressionSimplifier
 //
 // {
-//     let _1 := 0xffffffffffffffffffffffffffffffffffffffff
-//     let _2 := 0
-//     let _3 := 0x20
-//     let a := and(create2(_2, _2, _3, _2), _1)
-//     sstore(a, and(_1, create2(_2, _2, _3, _2)))
+//     {
+//         let _1 := 0xffffffffffffffffffffffffffffffffffffffff
+//         let _2 := 0
+//         let _3 := 0x20
+//         let a := and(create2(_2, _2, _3, _2), _1)
+//         sstore(a, and(_1, create2(_2, _2, _3, _2)))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/create_and_mask.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/create_and_mask.yul
index 8e77b8726b..3710cbebdf 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/create_and_mask.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/create_and_mask.yul
@@ -11,10 +11,12 @@
 // step: expressionSimplifier
 //
 // {
-//     let _1 := 0x20
-//     let _2 := 0
-//     let c := create(_2, _2, _1)
-//     let _4 := 0xffffffffffffffffffffffffffffffffffffffff
-//     let a := and(c, _4)
-//     sstore(a, and(_4, create(_2, _2, _1)))
+//     {
+//         let _1 := 0x20
+//         let _2 := 0
+//         let c := create(_2, _2, _1)
+//         let _4 := 0xffffffffffffffffffffffffffffffffffffffff
+//         let a := and(c, _4)
+//         sstore(a, and(_4, create(_2, _2, _1)))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/exp_simplifications.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/exp_simplifications.yul
index bfc1cbb2b0..4a5d218053 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/exp_simplifications.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/exp_simplifications.yul
@@ -13,12 +13,14 @@
 // step: expressionSimplifier
 //
 // {
-//     let _1 := 0
-//     let t := calldataload(_1)
-//     sstore(_1, iszero(t))
-//     sstore(1, 1)
-//     let _8 := 2
-//     sstore(_8, shl(t, 1))
-//     sstore(3, exp(8, t))
-//     sstore(4, sub(iszero(and(t, 1)), and(t, 1)))
+//     {
+//         let _1 := 0
+//         let t := calldataload(_1)
+//         sstore(_1, iszero(t))
+//         sstore(1, 1)
+//         let _8 := 2
+//         sstore(_8, shl(t, 1))
+//         sstore(3, exp(8, t))
+//         sstore(4, sub(iszero(and(t, 1)), and(t, 1)))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/idempotency.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/idempotency.yul
index 9698dfdff4..5b11fa7c8e 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/idempotency.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/idempotency.yul
@@ -9,8 +9,10 @@
 // step: expressionSimplifier
 //
 // {
-//     let x := calldataload(0)
-//     let z := calldataload(1)
-//     let t := and(x, z)
-//     sstore(t, or(x, z))
+//     {
+//         let x := calldataload(0)
+//         let z := calldataload(1)
+//         let t := and(x, z)
+//         sstore(t, or(x, z))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul
index 6bb6a751b8..af88cbac6d 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_complex.yul
@@ -5,4 +5,4 @@
 // ----
 // step: expressionSimplifier
 //
-// { sstore(0, 0) }
+// { { sstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul
index 686ae2b635..80f19a1b53 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_negative.yul
@@ -6,6 +6,8 @@
 // step: expressionSimplifier
 //
 // {
-//     let _1 := 0
-//     sstore(_1, sub(calldataload(1), calldataload(_1)))
+//     {
+//         let _1 := 0
+//         sstore(_1, sub(calldataload(1), calldataload(_1)))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul
index 57d84ae153..87677dfea2 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/identity_rules_simple.yul
@@ -6,4 +6,4 @@
 // ----
 // step: expressionSimplifier
 //
-// { sstore(0, 0) }
+// { { sstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/including_function_calls.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/including_function_calls.yul
index 8ebb9e51dd..42cd772e9f 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/including_function_calls.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/including_function_calls.yul
@@ -7,7 +7,7 @@
 // step: expressionSimplifier
 //
 // {
-//     sstore(0, f())
+//     { sstore(0, f()) }
 //     function f() -> a
 //     { }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/inside_for.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/inside_for.yul
index b8b3ee35d8..5a7c8939a6 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/inside_for.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/inside_for.yul
@@ -6,7 +6,9 @@
 // step: expressionSimplifier
 //
 // {
-//     let a := 10
-//     for { } iszero(iszero(a)) { a := add(a, 1) }
-//     { }
+//     {
+//         let a := 10
+//         for { } iszero(iszero(a)) { a := add(a, 1) }
+//         { }
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/invariant.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/invariant.yul
index d7da5e41fe..78565bbe5b 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/invariant.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/invariant.yul
@@ -6,4 +6,4 @@
 // ----
 // step: expressionSimplifier
 //
-// { sstore(0, mload(0)) }
+// { { sstore(0, mload(0)) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/iszero_sub_to_eq.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/iszero_sub_to_eq.yul
index 7efa54b021..3e0f785e95 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/iszero_sub_to_eq.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/iszero_sub_to_eq.yul
@@ -10,7 +10,9 @@
 // step: expressionSimplifier
 //
 // {
-//     let _1 := 0
-//     let a := calldataload(_1)
-//     if eq(a, calldataload(0x20)) { sstore(_1, 1) }
+//     {
+//         let _1 := 0
+//         let a := calldataload(_1)
+//         if eq(a, calldataload(0x20)) { sstore(_1, 1) }
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/large_byte_access.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/large_byte_access.yul
index 22bfaf91fd..19d65dca41 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/large_byte_access.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/large_byte_access.yul
@@ -13,14 +13,16 @@
 // step: expressionSimplifier
 //
 // {
-//     let _1 := 0
-//     let a := calldataload(_1)
-//     let b := 0
-//     let c := byte(20, a)
-//     pop(create(_1, _1, 0x20))
-//     let d := 0
-//     sstore(7, a)
-//     sstore(8, b)
-//     sstore(9, c)
-//     sstore(10, d)
+//     {
+//         let _1 := 0
+//         let a := calldataload(_1)
+//         let b := 0
+//         let c := byte(20, a)
+//         pop(create(_1, _1, 0x20))
+//         let d := 0
+//         sstore(7, a)
+//         sstore(8, b)
+//         sstore(9, c)
+//         sstore(10, d)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_1.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_1.yul
index 696d0b1117..88ed926b18 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_1.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_1.yul
@@ -5,6 +5,8 @@
 // step: expressionSimplifier
 //
 // {
-//     let _4 := 0
-//     mstore(_4, and(calldataload(_4), 255))
+//     {
+//         let _4 := 0
+//         mstore(_4, and(calldataload(_4), 255))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_2.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_2.yul
index 81fe7e117e..a62c5904cf 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_2.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/mod_and_2.yul
@@ -5,6 +5,8 @@
 // step: expressionSimplifier
 //
 // {
-//     let _4 := 0
-//     mstore(_4, and(calldataload(_4), 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
+//     {
+//         let _4 := 0
+//         mstore(_4, and(calldataload(_4), 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul
index eca9021ea6..c426935219 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_arguments.yul
@@ -7,9 +7,11 @@
 // step: expressionSimplifier
 //
 // {
-//     let _2 := f(1)
-//     let _3 := 0
-//     sstore(_3, sub(f(_3), _2))
+//     {
+//         let _2 := f(1)
+//         let _3 := 0
+//         sstore(_3, sub(f(_3), _2))
+//     }
 //     function f(a) -> b
 //     { }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul
index ed439b62fd..5245677053 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_different_names.yul
@@ -8,7 +8,7 @@
 // step: expressionSimplifier
 //
 // {
-//     sstore(0, sub(f1(), f2()))
+//     { sstore(0, sub(f1(), f2())) }
 //     function f1() -> a
 //     { }
 //     function f2() -> b
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul
index bba7cf26e5..b0215685de 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_function_call_equality_not_movable.yul
@@ -8,7 +8,7 @@
 // step: expressionSimplifier
 //
 // {
-//     sstore(sub(f(), f()), 8)
+//     { sstore(sub(f(), f()), 8) }
 //     function f() -> a
 //     { mstore(0, 1) }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul
index 37065cd4dc..a7be174e35 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/not_applied_removes_non_constant_and_not_movable.yul
@@ -9,9 +9,11 @@
 // step: expressionSimplifier
 //
 // {
-//     let _1 := msize()
-//     let _2 := 0
-//     sstore(_2, _1)
-//     pop(keccak256(_2, _2))
-//     sstore(20, 0)
+//     {
+//         let _1 := msize()
+//         let _2 := 0
+//         sstore(_2, _1)
+//         pop(keccak256(_2, _2))
+//         sstore(20, 0)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_call.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_call.yul
index af34e76bde..abd1b1743d 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_call.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_call.yul
@@ -7,7 +7,9 @@
 // step: expressionSimplifier
 //
 // {
-//     let _1 := 0
-//     pop(call(_1, _1, _1, _1, _1, _1, _1))
-//     sstore(_1, 0)
+//     {
+//         let _1 := 0
+//         pop(call(_1, _1, _1, _1, _1, _1, _1))
+//         sstore(_1, 0)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func.yul
index e1ec04ad1e..6465aa7974 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func.yul
@@ -8,8 +8,10 @@
 // step: expressionSimplifier
 //
 // {
-//     pop(f())
-//     mstore(0, 0)
+//     {
+//         pop(f())
+//         mstore(0, 0)
+//     }
 //     function f() -> x
 //     { mstore(0, 1337) }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func_trivial.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func_trivial.yul
index 448e071d8f..b822b402b3 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func_trivial.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/pop_byte_shr_func_trivial.yul
@@ -7,4 +7,4 @@
 // ----
 // step: expressionSimplifier
 //
-// { sstore(0, 0) }
+// { { sstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/reassign.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/reassign.yul
index d87b84f595..d0cf0a6eed 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/reassign.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/reassign.yul
@@ -7,8 +7,10 @@
 // step: expressionSimplifier
 //
 // {
-//     let _1 := 0
-//     let x := mload(_1)
-//     x := _1
-//     mstore(_1, 7)
+//     {
+//         let _1 := 0
+//         let x := mload(_1)
+//         x := _1
+//         mstore(_1, 7)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/remove_redundant_shift_masking.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/remove_redundant_shift_masking.yul
index 060a4e13ff..a4d3012c33 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/remove_redundant_shift_masking.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/remove_redundant_shift_masking.yul
@@ -12,12 +12,14 @@
 // step: expressionSimplifier
 //
 // {
-//     let _2 := calldataload(0)
-//     let _5 := 0xff
-//     let a := shr(248, _2)
-//     let b := shr(248, _2)
-//     let c := and(shr(249, _2), 0xfa)
-//     let d := and(shr(247, _2), _5)
-//     sstore(a, b)
-//     sstore(c, d)
+//     {
+//         let _2 := calldataload(0)
+//         let _5 := 0xff
+//         let a := shr(248, _2)
+//         let b := shr(248, _2)
+//         let c := and(shr(249, _2), 0xfa)
+//         let d := and(shr(247, _2), _5)
+//         sstore(a, b)
+//         sstore(c, d)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/replace_too_large_shift.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/replace_too_large_shift.yul
index 88263e98e7..85c86f0e4b 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/replace_too_large_shift.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/replace_too_large_shift.yul
@@ -12,12 +12,14 @@
 // step: expressionSimplifier
 //
 // {
-//     let a := 0
-//     let b := 0
-//     let _8 := calldataload(2)
-//     let _9 := 255
-//     let c := shl(_9, _8)
-//     let d := shr(_9, calldataload(3))
-//     sstore(a, b)
-//     sstore(c, d)
+//     {
+//         let a := 0
+//         let b := 0
+//         let _8 := calldataload(2)
+//         let _9 := 255
+//         let c := shl(_9, _8)
+//         let d := shr(_9, calldataload(3))
+//         sstore(a, b)
+//         sstore(c, d)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul
index ca31e7613b..73a79410df 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/return_vars_zero.yul
@@ -10,7 +10,7 @@
 // step: expressionSimplifier
 //
 // {
-//     let t, v := f()
+//     { let t, v := f() }
 //     function f() -> c, d
 //     { sstore(0, 7) }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/reversed.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/reversed.yul
index 32c8775721..b83b77c216 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/reversed.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/reversed.yul
@@ -6,6 +6,8 @@
 // step: expressionSimplifier
 //
 // {
-//     let _1 := 0
-//     sstore(_1, mload(_1))
+//     {
+//         let _1 := 0
+//         sstore(_1, mload(_1))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_not_supported.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_not_supported.yul
index 8a9bb7c199..3f30eefd65 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_not_supported.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_not_supported.yul
@@ -6,4 +6,6 @@
 // ----
 // step: expressionSimplifier
 //
-// { sstore(0, balance(address())) }
+// {
+//     { sstore(0, balance(address())) }
+// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_split.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_split.yul
index b14098ffef..72562a2fde 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_split.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_split.yul
@@ -9,6 +9,8 @@
 // step: expressionSimplifier
 //
 // {
-//     let a := address()
-//     sstore(a, selfbalance())
+//     {
+//         let a := address()
+//         sstore(a, selfbalance())
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_supported.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_supported.yul
index bc3c6c4d70..7ed42b360e 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_supported.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/selfbalance_supported.yul
@@ -6,4 +6,4 @@
 // ----
 // step: expressionSimplifier
 //
-// { sstore(0, selfbalance()) }
+// { { sstore(0, selfbalance()) } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul
index 14d65c4e92..bd567a69a6 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul
@@ -9,6 +9,8 @@
 // step: expressionSimplifier
 //
 // {
-//     for { } div(create(0, 1, 0), shl(msize(), 1)) { }
-//     { }
+//     {
+//         for { } div(create(0, 1, 0), shl(msize(), 1)) { }
+//         { }
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/smoke.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/smoke.yul
index 30a2f5e901..0fae4792fd 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/smoke.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/smoke.yul
@@ -2,4 +2,4 @@
 // ----
 // step: expressionSimplifier
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/unassigend_vars_multi.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/unassigend_vars_multi.yul
index b052fe4033..a15cca231d 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/unassigend_vars_multi.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/unassigend_vars_multi.yul
@@ -8,6 +8,8 @@
 // step: expressionSimplifier
 //
 // {
-//     let c, d
-//     sstore(d, 7)
+//     {
+//         let c, d
+//         sstore(d, 7)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/unassigned_vars.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/unassigned_vars.yul
index 9dd4e3365d..b6828cf8c4 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/unassigned_vars.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/unassigned_vars.yul
@@ -8,4 +8,4 @@
 // ----
 // step: expressionSimplifier
 //
-// { sstore(8, 7) }
+// { { sstore(8, 7) } }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul
index c1ce89bcfe..fbc0ca8561 100644
--- a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul
@@ -13,6 +13,7 @@
 // step: fullInliner
 //
 // {
+//     { }
 //     function f(a) -> b
 //     { b := sload(mload(a)) }
 //     function g() -> x_1
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/constant_propagation.yul b/test/libyul/yulOptimizerTests/fullSimplify/constant_propagation.yul
index 968ec47673..a13ad93953 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/constant_propagation.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/constant_propagation.yul
@@ -6,6 +6,8 @@
 // step: fullSimplify
 //
 // {
-//     let _2 := 0
-//     mstore(mload(_2), _2)
+//     {
+//         let _2 := 0
+//         mstore(mload(_2), _2)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/constants.yul b/test/libyul/yulOptimizerTests/fullSimplify/constants.yul
index 0b31d361f9..2d2fb70444 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/constants.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/constants.yul
@@ -5,4 +5,4 @@
 // ----
 // step: fullSimplify
 //
-// { mstore(0, 13) }
+// { { mstore(0, 13) } }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_complex.yul b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_complex.yul
index 452ceaae6f..eb104f6337 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_complex.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_complex.yul
@@ -5,4 +5,4 @@
 // ----
 // step: fullSimplify
 //
-// { mstore(0, 0) }
+// { { mstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_negative.yul b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_negative.yul
index 8c5e4e5dfc..daf34eed5e 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_negative.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_negative.yul
@@ -6,6 +6,8 @@
 // step: fullSimplify
 //
 // {
-//     let _1 := 0
-//     mstore(_1, sub(calldataload(1), calldataload(_1)))
+//     {
+//         let _1 := 0
+//         mstore(_1, sub(calldataload(1), calldataload(_1)))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul
index e8efb735c0..6f90c583ef 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/identity_rules_simple.yul
@@ -5,4 +5,4 @@
 // ----
 // step: fullSimplify
 //
-// { mstore(0, 0) }
+// { { mstore(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/including_function_calls.yul b/test/libyul/yulOptimizerTests/fullSimplify/including_function_calls.yul
index 090b3cde65..08dd01646d 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/including_function_calls.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/including_function_calls.yul
@@ -7,7 +7,7 @@
 // step: fullSimplify
 //
 // {
-//     mstore(f(), 0)
+//     { mstore(f(), 0) }
 //     function f() -> a
 //     { }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/inside_for.yul b/test/libyul/yulOptimizerTests/fullSimplify/inside_for.yul
index 9d4e52dc1b..911c668172 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/inside_for.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/inside_for.yul
@@ -7,7 +7,9 @@
 // step: fullSimplify
 //
 // {
-//     let a := 10
-//     for { } iszero(iszero(a)) { a := add(a, 1) }
-//     { }
+//     {
+//         let a := 10
+//         for { } iszero(iszero(a)) { a := add(a, 1) }
+//         { }
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/invariant.yul b/test/libyul/yulOptimizerTests/fullSimplify/invariant.yul
index 6874918186..0ab5cc6ed8 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/invariant.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/invariant.yul
@@ -11,8 +11,10 @@
 // step: fullSimplify
 //
 // {
-//     let a := calldataload(0)
-//     let _4 := 0
-//     let b := a
-//     mstore(b, eq(calldataload(_4), a))
+//     {
+//         let a := calldataload(0)
+//         let _4 := 0
+//         let b := a
+//         mstore(b, eq(calldataload(_4), a))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/mod_and_1.yul b/test/libyul/yulOptimizerTests/fullSimplify/mod_and_1.yul
index 1e448c9a4f..c10345e4ee 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/mod_and_1.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/mod_and_1.yul
@@ -5,6 +5,8 @@
 // step: fullSimplify
 //
 // {
-//     let _4 := 0
-//     mstore(_4, and(calldataload(_4), 255))
+//     {
+//         let _4 := 0
+//         mstore(_4, and(calldataload(_4), 255))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/mod_and_2.yul b/test/libyul/yulOptimizerTests/fullSimplify/mod_and_2.yul
index 0756c1841d..fc171337f9 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/mod_and_2.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/mod_and_2.yul
@@ -5,6 +5,8 @@
 // step: fullSimplify
 //
 // {
-//     let _4 := 0
-//     mstore(_4, and(calldataload(_4), 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
+//     {
+//         let _4 := 0
+//         mstore(_4, and(calldataload(_4), 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_arguments.yul b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_arguments.yul
index 517bbe442b..e42b6c0986 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_arguments.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_arguments.yul
@@ -6,9 +6,11 @@
 // step: fullSimplify
 //
 // {
-//     let _2 := f(1)
-//     let _3 := 0
-//     mstore(_3, sub(f(_3), _2))
+//     {
+//         let _2 := f(1)
+//         let _3 := 0
+//         mstore(_3, sub(f(_3), _2))
+//     }
 //     function f(a) -> b
 //     { }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_names.yul b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_names.yul
index 7f8fddf2e5..31490cbc06 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_names.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_different_names.yul
@@ -8,7 +8,7 @@
 // step: fullSimplify
 //
 // {
-//     mstore(0, sub(f1(), f2()))
+//     { mstore(0, sub(f1(), f2())) }
 //     function f1() -> a
 //     { }
 //     function f2() -> b
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_equality_not_movable.yul b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_equality_not_movable.yul
index 52030fe88f..8162119e8f 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_equality_not_movable.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_function_call_equality_not_movable.yul
@@ -8,7 +8,7 @@
 // step: fullSimplify
 //
 // {
-//     mstore(0, sub(f(), f()))
+//     { mstore(0, sub(f(), f())) }
 //     function f() -> a
 //     { mstore(1, 2) }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul
index 05fc9447d6..0e366e6d40 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/not_applied_removes_non_constant_and_not_movable.yul
@@ -7,7 +7,9 @@
 // step: fullSimplify
 //
 // {
-//     let _1 := 0
-//     pop(create(_1, _1, _1))
-//     mstore(_1, 0)
+//     {
+//         let _1 := 0
+//         pop(create(_1, _1, _1))
+//         mstore(_1, 0)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/operations.yul b/test/libyul/yulOptimizerTests/fullSimplify/operations.yul
index 93b4242330..a0fb676014 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/operations.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/operations.yul
@@ -23,22 +23,24 @@
 // step: fullSimplify
 //
 // {
-//     mstore(1, 0)
-//     mstore(2, 0)
-//     mstore(3, 0)
-//     mstore(4, 0)
-//     mstore(5, 0)
-//     mstore(6, 0)
-//     mstore(7, 0)
-//     mstore(8, 0)
-//     mstore(9, 0)
-//     mstore(10, 0)
-//     mstore(11, 0)
-//     mstore(12, 0)
-//     mstore(13, 0)
-//     mstore(14, 0)
-//     mstore(15, 0)
-//     mstore(16, 0)
-//     mstore(17, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
-//     mstore(18, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+//     {
+//         mstore(1, 0)
+//         mstore(2, 0)
+//         mstore(3, 0)
+//         mstore(4, 0)
+//         mstore(5, 0)
+//         mstore(6, 0)
+//         mstore(7, 0)
+//         mstore(8, 0)
+//         mstore(9, 0)
+//         mstore(10, 0)
+//         mstore(11, 0)
+//         mstore(12, 0)
+//         mstore(13, 0)
+//         mstore(14, 0)
+//         mstore(15, 0)
+//         mstore(16, 0)
+//         mstore(17, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+//         mstore(18, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/reversed.yul b/test/libyul/yulOptimizerTests/fullSimplify/reversed.yul
index 5fe6324959..b3b98d061a 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/reversed.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/reversed.yul
@@ -6,6 +6,8 @@
 // step: fullSimplify
 //
 // {
-//     let _1 := 0
-//     mstore(_1, mload(_1))
+//     {
+//         let _1 := 0
+//         mstore(_1, mload(_1))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/signextend.yul b/test/libyul/yulOptimizerTests/fullSimplify/signextend.yul
index 9ebdf01289..2dd64525f9 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/signextend.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/signextend.yul
@@ -8,6 +8,8 @@
 // step: fullSimplify
 //
 // {
-//     mstore(0, 7)
-//     mstore(1, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+//     {
+//         mstore(0, 7)
+//         mstore(1, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/smoke.yul b/test/libyul/yulOptimizerTests/fullSimplify/smoke.yul
index 15ff14a845..a5b71eea8d 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/smoke.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/smoke.yul
@@ -2,4 +2,4 @@
 // ----
 // step: fullSimplify
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/double_mload.yul b/test/libyul/yulOptimizerTests/loadResolver/double_mload.yul
index b75f9c07b9..1448354763 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/double_mload.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/double_mload.yul
@@ -8,6 +8,8 @@
 // step: loadResolver
 //
 // {
-//     let a := mload(calldataload(0))
-//     sstore(a, a)
+//     {
+//         let a := mload(calldataload(0))
+//         sstore(a, a)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_other_reassignment.yul b/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_other_reassignment.yul
index 19d2174231..7ffac34c0b 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_other_reassignment.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_other_reassignment.yul
@@ -9,8 +9,10 @@
 // step: loadResolver
 //
 // {
-//     let x := calldataload(0)
-//     let a := mload(x)
-//     x := 7
-//     sstore(a, mload(x))
+//     {
+//         let x := calldataload(0)
+//         let a := mload(x)
+//         x := 7
+//         sstore(a, mload(x))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_reassignment.yul b/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_reassignment.yul
index b5c2f11265..7f8514875d 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_reassignment.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/double_mload_with_reassignment.yul
@@ -9,8 +9,10 @@
 // step: loadResolver
 //
 // {
-//     let x := calldataload(0)
-//     let a := mload(x)
-//     a := 7
-//     sstore(a, mload(x))
+//     {
+//         let x := calldataload(0)
+//         let a := mload(x)
+//         a := 7
+//         sstore(a, mload(x))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak.yul
index 97b468e5fb..25b36f5fea 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak.yul
@@ -9,8 +9,10 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 10
-//     let _2 := 0
-//     mstore(_2, _1)
-//     sstore(_2, 89717814153306320011181716697424560163256864414616650038987186496166826726056)
+//     {
+//         let _1 := 10
+//         let _2 := 0
+//         mstore(_2, _1)
+//         sstore(_2, 89717814153306320011181716697424560163256864414616650038987186496166826726056)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_crash.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_crash.yul
index dd6a164eb4..18c818d15e 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_crash.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_crash.yul
@@ -6,8 +6,10 @@
 // step: loadResolver
 //
 // {
-//     for { }
-//     addmod(keccak256(0x0, create(0x0, 0x0, 0x0)), 0x0, 0x0)
-//     { }
-//     { }
+//     {
+//         for { }
+//         addmod(keccak256(0x0, create(0x0, 0x0, 0x0)), 0x0, 0x0)
+//         { }
+//         { }
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_fail1.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_fail1.yul
index e1157f21d4..e4fe6484ff 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_fail1.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_fail1.yul
@@ -10,9 +10,11 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 30
-//     let _2 := 0
-//     mstore(_2, _1)
-//     if calldataload(_2) { mstore(_2, 20) }
-//     sstore(_2, keccak256(_2, 32))
+//     {
+//         let _1 := 30
+//         let _2 := 0
+//         mstore(_2, _1)
+//         if calldataload(_2) { mstore(_2, 20) }
+//         sstore(_2, keccak256(_2, 32))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_fail2.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_fail2.yul
index 61a2eefb25..5a7d571a47 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_fail2.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_fail2.yul
@@ -9,8 +9,10 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 10
-//     mstore(100, _1)
-//     mstore(132, 5)
-//     sstore(0, keccak256(_1, 33))
+//     {
+//         let _1 := 10
+//         mstore(100, _1)
+//         mstore(132, 5)
+//         sstore(0, keccak256(_1, 33))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_short.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_short.yul
index d1761b7cea..58cb7c264c 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_short.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_short.yul
@@ -19,13 +19,15 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 10
-//     let _2 := 0
-//     mstore(_2, _1)
-//     sstore(_2, 9948786400348073077032572701554570401043517428989726124163377057770909578447)
-//     sstore(1, 110945455955148346822663466543669633859020391897956790847617069135813044810108)
-//     let _13 := 85131057757245807317576516368191972321038229705283732634690444270750521936266
-//     let _14 := 2
-//     sstore(_14, _13)
-//     sstore(_14, 89477152217924674838424037953991966239322087453347756267410168184682657981552)
+//     {
+//         let _1 := 10
+//         let _2 := 0
+//         mstore(_2, _1)
+//         sstore(_2, 9948786400348073077032572701554570401043517428989726124163377057770909578447)
+//         sstore(1, 110945455955148346822663466543669633859020391897956790847617069135813044810108)
+//         let _13 := 85131057757245807317576516368191972321038229705283732634690444270750521936266
+//         let _14 := 2
+//         sstore(_14, _13)
+//         sstore(_14, 89477152217924674838424037953991966239322087453347756267410168184682657981552)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_string_literal.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_string_literal.yul
index 279a23959f..261f38cd1f 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_string_literal.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_string_literal.yul
@@ -12,11 +12,13 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 50
-//     let _2 := "abcdefghijklmn"
-//     mstore(_1, _2)
-//     let _3 := 51246744213555520563123611275127692828770413530219146609532820042079541949502
-//     let _4 := 0
-//     sstore(_4, _3)
-//     sstore(_4, add(_2, 1))
+//     {
+//         let _1 := 50
+//         let _2 := "abcdefghijklmn"
+//         mstore(_1, _2)
+//         let _3 := 51246744213555520563123611275127692828770413530219146609532820042079541949502
+//         let _4 := 0
+//         sstore(_4, _3)
+//         sstore(_4, add(_2, 1))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_symbolic_memory.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_symbolic_memory.yul
index c18af0c8df..46466a062f 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_symbolic_memory.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_symbolic_memory.yul
@@ -15,8 +15,10 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 0
-//     mstore(calldataload(_1), 500)
-//     sstore(_1, 92647596584187651892918913434663110448935397770592030057655219009846081465370)
-//     sstore(1, 110620294328144418057589324861608220015688365608948720310623173341503153578932)
+//     {
+//         let _1 := 0
+//         mstore(calldataload(_1), 500)
+//         sstore(_1, 92647596584187651892918913434663110448935397770592030057655219009846081465370)
+//         sstore(1, 110620294328144418057589324861608220015688365608948720310623173341503153578932)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_with_msize.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_with_msize.yul
index fdc1e88368..5e1c7d4190 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/keccak_with_msize.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_with_msize.yul
@@ -11,9 +11,11 @@
 // step: loadResolver
 //
 // {
-//     let _1 := msize()
-//     let _2 := 0
-//     sstore(_2, _1)
-//     mstore(_2, 10)
-//     sstore(1, keccak256(_2, 32))
+//     {
+//         let _1 := msize()
+//         let _2 := 0
+//         sstore(_2, _1)
+//         mstore(_2, 10)
+//         sstore(1, keccak256(_2, 32))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/loop.yul b/test/libyul/yulOptimizerTests/loadResolver/loop.yul
index 3606891ee1..4587671606 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/loop.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/loop.yul
@@ -8,11 +8,13 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 123213
-//     let _2 := 0
-//     sstore(_2, _1)
-//     let x := _2
-//     let y
-//     for { } lt(x, _1) { x := add(x, 1) }
-//     { y := add(x, y) }
+//     {
+//         let _1 := 123213
+//         let _2 := 0
+//         sstore(_2, _1)
+//         let x := _2
+//         let y
+//         for { } lt(x, _1) { x := add(x, 1) }
+//         { y := add(x, y) }
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/memory_with_different_kinds_of_invalidation.yul b/test/libyul/yulOptimizerTests/loadResolver/memory_with_different_kinds_of_invalidation.yul
index 77fc5aef01..840f19005b 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/memory_with_different_kinds_of_invalidation.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/memory_with_different_kinds_of_invalidation.yul
@@ -18,18 +18,20 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 9
-//     let _2 := 2
-//     mstore(_2, _1)
-//     let _4 := _1
-//     let _5 := 0
-//     sstore(_5, _4)
-//     pop(call(_5, _5, _5, _5, _5, _5, _5))
-//     sstore(_5, mload(_2))
-//     let _17 := 10
-//     mstore(_2, _17)
-//     mstore8(calldataload(_5), 4)
-//     sstore(_5, mload(_2))
-//     mstore(_2, _17)
-//     sstore(_5, _17)
+//     {
+//         let _1 := 9
+//         let _2 := 2
+//         mstore(_2, _1)
+//         let _4 := _1
+//         let _5 := 0
+//         sstore(_5, _4)
+//         pop(call(_5, _5, _5, _5, _5, _5, _5))
+//         sstore(_5, mload(_2))
+//         let _17 := 10
+//         mstore(_2, _17)
+//         mstore8(calldataload(_5), 4)
+//         sstore(_5, mload(_2))
+//         mstore(_2, _17)
+//         sstore(_5, _17)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/memory_with_msize.yul b/test/libyul/yulOptimizerTests/loadResolver/memory_with_msize.yul
index 199fb1f6c4..f54053bb10 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/memory_with_msize.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/memory_with_msize.yul
@@ -9,9 +9,11 @@
 // step: loadResolver
 //
 // {
-//     let _1 := msize()
-//     let _3 := calldataload(0)
-//     mstore(_3, _1)
-//     let t := mload(calldataload(10))
-//     sstore(t, mload(_3))
+//     {
+//         let _1 := msize()
+//         let _3 := calldataload(0)
+//         mstore(_3, _1)
+//         let t := mload(calldataload(10))
+//         sstore(t, mload(_3))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_known_write.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_known_write.yul
index e9ced5f4c3..acb96c07b1 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_known_write.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/merge_known_write.yul
@@ -11,12 +11,14 @@
 // step: loadResolver
 //
 // {
-//     let _2 := calldataload(10)
-//     let _3 := 0
-//     let _4 := calldataload(_3)
-//     mstore(_4, _2)
-//     let _5 := 1
-//     if calldataload(_5) { mstore(_4, _5) }
-//     let t := mload(_3)
-//     sstore(t, mload(_4))
+//     {
+//         let _2 := calldataload(10)
+//         let _3 := 0
+//         let _4 := calldataload(_3)
+//         mstore(_4, _2)
+//         let _5 := 1
+//         if calldataload(_5) { mstore(_4, _5) }
+//         let t := mload(_3)
+//         sstore(t, mload(_4))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_known_write_with_distance.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_known_write_with_distance.yul
index 8ce9fba00c..1659949a3c 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_known_write_with_distance.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/merge_known_write_with_distance.yul
@@ -11,10 +11,12 @@
 // step: loadResolver
 //
 // {
-//     let _2 := calldataload(10)
-//     let _4 := calldataload(0)
-//     mstore(_4, _2)
-//     let _5 := 1
-//     if calldataload(_5) { mstore(add(_4, 0x20), _5) }
-//     sstore(mload(add(_4, 0x20)), _2)
+//     {
+//         let _2 := calldataload(10)
+//         let _4 := calldataload(0)
+//         mstore(_4, _2)
+//         let _5 := 1
+//         if calldataload(_5) { mstore(add(_4, 0x20), _5) }
+//         sstore(mload(add(_4, 0x20)), _2)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_known_distance.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_known_distance.yul
index cde3ec0e6b..18740c0490 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_known_distance.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_known_distance.yul
@@ -11,9 +11,11 @@
 // step: loadResolver
 //
 // {
-//     let _2 := calldataload(0)
-//     let x := mload(_2)
-//     let _3 := 1
-//     if calldataload(_3) { mstore(add(_2, 0x20), _3) }
-//     sstore(mload(add(_2, 0x20)), x)
+//     {
+//         let _2 := calldataload(0)
+//         let x := mload(_2)
+//         let _3 := 1
+//         if calldataload(_3) { mstore(add(_2, 0x20), _3) }
+//         sstore(mload(add(_2, 0x20)), x)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_rewrite.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_rewrite.yul
index 5c09b9b430..00bb85c4c8 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_rewrite.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/merge_mload_with_rewrite.yul
@@ -11,12 +11,14 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 2
-//     let b := mload(_1)
-//     if calldataload(1)
 //     {
-//         mstore(_1, 7)
-//         mstore(_1, b)
+//         let _1 := 2
+//         let b := mload(_1)
+//         if calldataload(1)
+//         {
+//             mstore(_1, 7)
+//             mstore(_1, b)
+//         }
+//         sstore(0, b)
 //     }
-//     sstore(0, b)
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_without_rewrite.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_mload_without_rewrite.yul
index f6d0bdc7d1..7606416982 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_mload_without_rewrite.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/merge_mload_without_rewrite.yul
@@ -10,10 +10,12 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 2
-//     let b := mload(_1)
-//     let _2 := 0
-//     sstore(_2, b)
-//     if calldataload(1) { mstore(_1, 7) }
-//     sstore(_2, mload(_1))
+//     {
+//         let _1 := 2
+//         let b := mload(_1)
+//         let _2 := 0
+//         sstore(_2, b)
+//         if calldataload(1) { mstore(_1, 7) }
+//         sstore(_2, mload(_1))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_unknown_write.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_unknown_write.yul
index 225e0f6272..e8cc3cf4b0 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_unknown_write.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/merge_unknown_write.yul
@@ -11,12 +11,14 @@
 // step: loadResolver
 //
 // {
-//     let _2 := calldataload(10)
-//     let _3 := 0
-//     let _4 := calldataload(_3)
-//     mstore(_4, _2)
-//     let _5 := 1
-//     if calldataload(_5) { mstore(_3, _5) }
-//     let t := mload(_3)
-//     sstore(t, mload(_4))
+//     {
+//         let _2 := calldataload(10)
+//         let _3 := 0
+//         let _4 := calldataload(_3)
+//         mstore(_4, _2)
+//         let _5 := 1
+//         if calldataload(_5) { mstore(_3, _5) }
+//         let t := mload(_3)
+//         sstore(t, mload(_4))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/merge_with_rewrite.yul b/test/libyul/yulOptimizerTests/loadResolver/merge_with_rewrite.yul
index b4b113e812..c6c76f425f 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/merge_with_rewrite.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/merge_with_rewrite.yul
@@ -11,13 +11,15 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 3
-//     let _2 := 2
-//     mstore(_2, _1)
-//     if calldataload(1)
 //     {
-//         mstore(_2, 7)
+//         let _1 := 3
+//         let _2 := 2
 //         mstore(_2, _1)
+//         if calldataload(1)
+//         {
+//             mstore(_2, 7)
+//             mstore(_2, _1)
+//         }
+//         sstore(0, _1)
 //     }
-//     sstore(0, _1)
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/mload_in_function.yul b/test/libyul/yulOptimizerTests/loadResolver/mload_in_function.yul
index a8d9e2af06..b76d071ae8 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/mload_in_function.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/mload_in_function.yul
@@ -10,11 +10,13 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 1337
-//     let _2 := 0
-//     mstore(_2, _1)
-//     foo(42)
-//     sstore(_2, mload(_2))
+//     {
+//         let _1 := 1337
+//         let _2 := 0
+//         mstore(_2, _1)
+//         foo(42)
+//         sstore(_2, mload(_2))
+//     }
 //     function foo(x)
 //     {
 //         for { }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/mload_self.yul b/test/libyul/yulOptimizerTests/loadResolver/mload_self.yul
index e299bcbb9f..6ad9d36ac7 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/mload_self.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/mload_self.yul
@@ -8,8 +8,10 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 0
-//     let x := calldataload(_1)
-//     x := mload(x)
-//     sstore(_1, mload(x))
+//     {
+//         let _1 := 0
+//         let x := calldataload(_1)
+//         x := mload(x)
+//         sstore(_1, mload(x))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_body.yul b/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_body.yul
index 6fcf7a6aa8..901ea12efc 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_body.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_body.yul
@@ -15,11 +15,13 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 1337
-//     let _2 := 0
-//     mstore(_2, _1)
-//     funcWithLoop(42)
-//     sstore(_2, mload(_2))
+//     {
+//         let _1 := 1337
+//         let _2 := 0
+//         mstore(_2, _1)
+//         funcWithLoop(42)
+//         sstore(_2, mload(_2))
+//     }
 //     function userNot(x) -> y
 //     { y := iszero(x) }
 //     function funcWithLoop(x_1)
diff --git a/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_init.yul b/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_init.yul
index 4794237d67..6fb0fdcba9 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_init.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/mstore_in_function_loop_init.yul
@@ -15,11 +15,13 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 1337
-//     let _2 := 0
-//     mstore(_2, _1)
-//     funcWithLoop(42)
-//     sstore(_2, mload(_2))
+//     {
+//         let _1 := 1337
+//         let _2 := 0
+//         mstore(_2, _1)
+//         funcWithLoop(42)
+//         sstore(_2, mload(_2))
+//     }
 //     function userNot(x) -> y
 //     { y := iszero(x) }
 //     function funcWithLoop(x_1)
diff --git a/test/libyul/yulOptimizerTests/loadResolver/multi_sload_loop.yul b/test/libyul/yulOptimizerTests/loadResolver/multi_sload_loop.yul
index 9aecad5290..c367059eb9 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/multi_sload_loop.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/multi_sload_loop.yul
@@ -14,17 +14,19 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 0
-//     let x := calldataload(_1)
-//     let len := sload(x)
-//     let sum
-//     let i := _1
-//     for { } lt(i, len) { i := add(i, 1) }
 //     {
-//         let p := add(add(x, i), 1)
-//         if gt(p, len) { revert(_1, _1) }
-//         sum := add(sum, sload(p))
+//         let _1 := 0
+//         let x := calldataload(_1)
+//         let len := sload(x)
+//         let sum
+//         let i := _1
+//         for { } lt(i, len) { i := add(i, 1) }
+//         {
+//             let p := add(add(x, i), 1)
+//             if gt(p, len) { revert(_1, _1) }
+//             sum := add(sum, sload(p))
+//         }
+//         mstore(_1, sum)
+//         return(_1, 0x20)
 //     }
-//     mstore(_1, sum)
-//     return(_1, 0x20)
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/re_store_memory.yul b/test/libyul/yulOptimizerTests/loadResolver/re_store_memory.yul
index 01e29b705e..031a5f22a5 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/re_store_memory.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/re_store_memory.yul
@@ -11,11 +11,13 @@
 // step: loadResolver
 //
 // {
-//     let a := 0
-//     let b := 1
-//     let c := 2
-//     mstore(a, b)
-//     sstore(a, b)
-//     mstore(a, c)
-//     sstore(10, c)
+//     {
+//         let a := 0
+//         let b := 1
+//         let c := 2
+//         mstore(a, b)
+//         sstore(a, b)
+//         mstore(a, c)
+//         sstore(10, c)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/re_store_storage.yul b/test/libyul/yulOptimizerTests/loadResolver/re_store_storage.yul
index 8c33e4f5dc..fab562208b 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/re_store_storage.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/re_store_storage.yul
@@ -11,11 +11,13 @@
 // step: loadResolver
 //
 // {
-//     let a := 0
-//     let b := 1
-//     let c := 2
-//     sstore(a, b)
-//     mstore(a, b)
-//     sstore(a, c)
-//     mstore(32, c)
+//     {
+//         let a := 0
+//         let b := 1
+//         let c := 2
+//         sstore(a, b)
+//         mstore(a, b)
+//         sstore(a, c)
+//         mstore(32, c)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/reassign.yul b/test/libyul/yulOptimizerTests/loadResolver/reassign.yul
index 4687422e92..694b59e262 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/reassign.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/reassign.yul
@@ -8,9 +8,11 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 0
-//     let a := calldataload(_1)
-//     sstore(a, 6)
-//     a := calldataload(2)
-//     mstore(_1, sload(a))
+//     {
+//         let _1 := 0
+//         let a := calldataload(_1)
+//         sstore(a, 6)
+//         a := calldataload(2)
+//         mstore(_1, sload(a))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/reassign_value_expression.yul b/test/libyul/yulOptimizerTests/loadResolver/reassign_value_expression.yul
index 1b73cecb93..402987acb4 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/reassign_value_expression.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/reassign_value_expression.yul
@@ -18,15 +18,17 @@
 // step: loadResolver
 //
 // {
-//     let x := calldataload(1)
-//     let a := add(x, 10)
-//     let _3 := 7
-//     sstore(a, _3)
-//     x := 9
-//     let _4 := 11
-//     mstore(_3, _4)
-//     a := 33
-//     mstore(sload(a), _4)
-//     a := 39
-//     mstore(sload(a), _4)
+//     {
+//         let x := calldataload(1)
+//         let a := add(x, 10)
+//         let _3 := 7
+//         sstore(a, _3)
+//         x := 9
+//         let _4 := 11
+//         mstore(_3, _4)
+//         a := 33
+//         mstore(sload(a), _4)
+//         a := 39
+//         mstore(sload(a), _4)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/second_mstore_with_delta.yul b/test/libyul/yulOptimizerTests/loadResolver/second_mstore_with_delta.yul
index 1aa05106c3..8f1cf338f6 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/second_mstore_with_delta.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/second_mstore_with_delta.yul
@@ -13,12 +13,14 @@
 // step: loadResolver
 //
 // {
-//     let x := calldataload(1)
-//     let a := add(x, 10)
-//     let b := add(x, 42)
-//     let _4 := 7
-//     mstore(a, _4)
-//     let _5 := 8
-//     mstore(b, _5)
-//     sstore(_4, _5)
+//     {
+//         let x := calldataload(1)
+//         let a := add(x, 10)
+//         let b := add(x, 42)
+//         let _4 := 7
+//         mstore(a, _4)
+//         let _5 := 8
+//         mstore(b, _5)
+//         sstore(_4, _5)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/second_store.yul b/test/libyul/yulOptimizerTests/loadResolver/second_store.yul
index f6f8250ce0..eb960a9f6e 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/second_store.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/second_store.yul
@@ -10,10 +10,12 @@
 // step: loadResolver
 //
 // {
-//     let x := calldataload(1)
-//     sstore(x, 7)
-//     let _3 := 6
-//     let _4 := 0
-//     sstore(calldataload(_4), _3)
-//     mstore(_4, sload(x))
+//     {
+//         let x := calldataload(1)
+//         sstore(x, 7)
+//         let _3 := 6
+//         let _4 := 0
+//         sstore(calldataload(_4), _3)
+//         mstore(_4, sload(x))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/second_store_same_value.yul b/test/libyul/yulOptimizerTests/loadResolver/second_store_same_value.yul
index a5cb459ad7..e13b8aa5f6 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/second_store_same_value.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/second_store_same_value.yul
@@ -10,10 +10,12 @@
 // step: loadResolver
 //
 // {
-//     let x := calldataload(1)
-//     let _2 := 7
-//     sstore(x, _2)
-//     let _4 := 0
-//     sstore(calldataload(_4), _2)
-//     mstore(_4, _2)
+//     {
+//         let x := calldataload(1)
+//         let _2 := 7
+//         sstore(x, _2)
+//         let _4 := 0
+//         sstore(calldataload(_4), _2)
+//         mstore(_4, _2)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/second_store_with_delta.yul b/test/libyul/yulOptimizerTests/loadResolver/second_store_with_delta.yul
index c2e669b7f6..f301737eca 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/second_store_with_delta.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/second_store_with_delta.yul
@@ -13,12 +13,14 @@
 // step: loadResolver
 //
 // {
-//     let x := calldataload(1)
-//     let a := add(x, 10)
-//     let b := add(x, 20)
-//     let _4 := 7
-//     sstore(a, _4)
-//     let _5 := 8
-//     sstore(b, _5)
-//     mstore(_4, _5)
+//     {
+//         let x := calldataload(1)
+//         let a := add(x, 10)
+//         let b := add(x, 20)
+//         let _4 := 7
+//         sstore(a, _4)
+//         let _5 := 8
+//         sstore(b, _5)
+//         mstore(_4, _5)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/side_effects_of_user_functions.yul b/test/libyul/yulOptimizerTests/loadResolver/side_effects_of_user_functions.yul
index 684e6b94f1..b1eefd0890 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/side_effects_of_user_functions.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/side_effects_of_user_functions.yul
@@ -12,15 +12,17 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 9
-//     let _2 := 2
-//     mstore(_2, _1)
-//     reads()
-//     let _4 := _1
-//     let _5 := 0
-//     sstore(_5, _4)
-//     stores()
-//     sstore(_5, mload(_2))
+//     {
+//         let _1 := 9
+//         let _2 := 2
+//         mstore(_2, _1)
+//         reads()
+//         let _4 := _1
+//         let _5 := 0
+//         sstore(_5, _4)
+//         stores()
+//         sstore(_5, mload(_2))
+//     }
 //     function stores()
 //     { mstore(0, 1) }
 //     function reads()
diff --git a/test/libyul/yulOptimizerTests/loadResolver/simple.yul b/test/libyul/yulOptimizerTests/loadResolver/simple.yul
index a645f1692f..a20025bcdf 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/simple.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/simple.yul
@@ -8,7 +8,9 @@
 // step: loadResolver
 //
 // {
-//     let _2 := calldataload(10)
-//     sstore(calldataload(0), _2)
-//     mstore(sload(_2), _2)
+//     {
+//         let _2 := calldataload(10)
+//         sstore(calldataload(0), _2)
+//         mstore(sload(_2), _2)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/simple_memory.yul b/test/libyul/yulOptimizerTests/loadResolver/simple_memory.yul
index 667abe053c..3aa1d740f4 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/simple_memory.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/simple_memory.yul
@@ -8,7 +8,9 @@
 // step: loadResolver
 //
 // {
-//     let _2 := calldataload(10)
-//     mstore(calldataload(0), _2)
-//     sstore(mload(_2), _2)
+//     {
+//         let _2 := calldataload(10)
+//         mstore(calldataload(0), _2)
+//         sstore(mload(_2), _2)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/staticcall.yul b/test/libyul/yulOptimizerTests/loadResolver/staticcall.yul
index b24ab0170c..2a72eee3e2 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/staticcall.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/staticcall.yul
@@ -15,14 +15,16 @@
 // step: loadResolver
 //
 // {
-//     let a := 0
-//     let b := 1
-//     sstore(a, b)
-//     let _1 := 7
-//     let _2 := 900
-//     mstore(_2, _1)
-//     let _3 := 200
-//     pop(staticcall(10000, 10, a, _3, a, _3))
-//     sstore(1, mload(_2))
-//     mstore(a, b)
+//     {
+//         let a := 0
+//         let b := 1
+//         sstore(a, b)
+//         let _1 := 7
+//         let _2 := 900
+//         mstore(_2, _1)
+//         let _3 := 200
+//         pop(staticcall(10000, 10, a, _3, a, _3))
+//         sstore(1, mload(_2))
+//         mstore(a, b)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/verbatim_mload.yul b/test/libyul/yulOptimizerTests/loadResolver/verbatim_mload.yul
index 150c0240b5..8d417a1776 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/verbatim_mload.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/verbatim_mload.yul
@@ -8,9 +8,11 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 20
-//     let _2 := 10
-//     mstore(_2, _1)
-//     sstore(0, mload(_2))
-//     verbatim_0i_0o("test")
+//     {
+//         let _1 := 20
+//         let _2 := 10
+//         mstore(_2, _1)
+//         sstore(0, mload(_2))
+//         verbatim_0i_0o("test")
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/verbatim_sload.yul b/test/libyul/yulOptimizerTests/loadResolver/verbatim_sload.yul
index ba9cb32d80..81479a5092 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/verbatim_sload.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/verbatim_sload.yul
@@ -10,12 +10,14 @@
 // step: loadResolver
 //
 // {
-//     let _1 := 20
-//     let _2 := 10
-//     sstore(_2, _1)
-//     let _4 := _1
-//     let _5 := 30
-//     sstore(_5, _4)
-//     verbatim_0i_0o("test")
-//     sstore(_5, sload(_2))
+//     {
+//         let _1 := 20
+//         let _2 := 10
+//         sstore(_2, _1)
+//         let _4 := _1
+//         let _5 := 30
+//         sstore(_5, _4)
+//         verbatim_0i_0o("test")
+//         sstore(_5, sload(_2))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/splitJoin/control_flow.yul b/test/libyul/yulOptimizerTests/splitJoin/control_flow.yul
index c8b22424cc..875bececd6 100644
--- a/test/libyul/yulOptimizerTests/splitJoin/control_flow.yul
+++ b/test/libyul/yulOptimizerTests/splitJoin/control_flow.yul
@@ -10,12 +10,14 @@
 // step: splitJoin
 //
 // {
-//     if mul(add(calldataload(0), 2), 3)
 //     {
-//         for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) }
+//         if mul(add(calldataload(0), 2), 3)
 //         {
-//             let b := mul(add(a, 2), 4)
-//             sstore(b, mul(b, 2))
+//             for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) }
+//             {
+//                 let b := mul(add(a, 2), 4)
+//                 sstore(b, mul(b, 2))
+//             }
 //         }
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/splitJoin/functions.yul b/test/libyul/yulOptimizerTests/splitJoin/functions.yul
index e2f554dd0e..08e741e8e9 100644
--- a/test/libyul/yulOptimizerTests/splitJoin/functions.yul
+++ b/test/libyul/yulOptimizerTests/splitJoin/functions.yul
@@ -12,14 +12,16 @@
 // step: splitJoin
 //
 // {
-//     let x := f(0)
-//     function f(y) -> r
 //     {
-//         r := mload(mul(6, add(y, 0x20)))
+//         let x := f(0)
+//         for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) }
+//         {
+//             let b := mul(add(a, f(a)), 4)
+//             sstore(b, mul(b, 2))
+//         }
 //     }
-//     for { let a := 2 } lt(a, mload(a)) { a := add(a, mul(a, 2)) }
+//     function f(y) -> r
 //     {
-//         let b := mul(add(a, f(a)), 4)
-//         sstore(b, mul(b, 2))
+//         r := mload(mul(6, add(y, 0x20)))
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/splitJoin/smoke.yul b/test/libyul/yulOptimizerTests/splitJoin/smoke.yul
index 4aac31ddb6..86e53ab148 100644
--- a/test/libyul/yulOptimizerTests/splitJoin/smoke.yul
+++ b/test/libyul/yulOptimizerTests/splitJoin/smoke.yul
@@ -2,4 +2,4 @@
 // ----
 // step: splitJoin
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul b/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul
index 43b9ade6a0..19b3ba44ea 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/for_loop.yul
@@ -19,12 +19,14 @@
 // step: ssaAndBack
 //
 // {
-//     let a := mload(0)
-//     let b := mload(1)
-//     for { } lt(mload(a), mload(b)) { a := mload(b) }
 //     {
-//         let b_4 := mload(a)
-//         a := mload(b_4)
-//         b := mload(a)
+//         let a := mload(0)
+//         let b := mload(1)
+//         for { } lt(mload(a), mload(b)) { a := mload(b) }
+//         {
+//             let b_4 := mload(a)
+//             a := mload(b_4)
+//             b := mload(a)
+//         }
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul
index 2e818561c6..1bfd89cd83 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign.yul
@@ -10,6 +10,8 @@
 // step: ssaAndBack
 //
 // {
-//     let a_5 := mload(4)
-//     mstore(a_5, 0)
+//     {
+//         let a_5 := mload(4)
+//         mstore(a_5, 0)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul
index 4815349d7d..c0f3a4242a 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_if.yul
@@ -12,7 +12,9 @@
 // step: ssaAndBack
 //
 // {
-//     let a := mload(0)
-//     if mload(1) { a := mload(3) }
-//     mstore(a, 0)
+//     {
+//         let a := mload(0)
+//         if mload(1) { a := mload(3) }
+//         mstore(a, 0)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_if.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_if.yul
index a0821ab373..e3a6710282 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_if.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_if.yul
@@ -13,14 +13,16 @@
 // step: ssaAndBack
 //
 // {
-//     let a := mload(0)
-//     let b := mload(1)
-//     if mload(2)
 //     {
-//         let a_3 := mload(b)
-//         let b_4 := mload(a_3)
-//         a := mload(b_4)
-//         b := mload(a)
+//         let a := mload(0)
+//         let b := mload(1)
+//         if mload(2)
+//         {
+//             let a_3 := mload(b)
+//             let b_4 := mload(a_3)
+//             a := mload(b_4)
+//             b := mload(a)
+//         }
+//         mstore(a, b)
 //     }
-//     mstore(a, b)
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_switch.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_switch.yul
index 92a0ba8259..89f3acaa63 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_switch.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_multi_var_switch.yul
@@ -20,20 +20,22 @@
 // step: ssaAndBack
 //
 // {
-//     let a := mload(0)
-//     let b := mload(1)
-//     switch mload(2)
-//     case 0 {
-//         let a_3 := mload(b)
-//         let b_4 := mload(a_3)
-//         a := mload(b_4)
-//         b := mload(a)
+//     {
+//         let a := mload(0)
+//         let b := mload(1)
+//         switch mload(2)
+//         case 0 {
+//             let a_3 := mload(b)
+//             let b_4 := mload(a_3)
+//             a := mload(b_4)
+//             b := mload(a)
+//         }
+//         default {
+//             let b_7 := mload(a)
+//             let a_8 := mload(b_7)
+//             b := mload(a_8)
+//             a := mload(b)
+//         }
+//         mstore(a, b)
 //     }
-//     default {
-//         let b_7 := mload(a)
-//         let a_8 := mload(b_7)
-//         b := mload(a_8)
-//         a := mload(b)
-//     }
-//     mstore(a, b)
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul
index 63c4f8561e..b210c09c0e 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/multi_assign_switch.yul
@@ -17,9 +17,11 @@
 // step: ssaAndBack
 //
 // {
-//     let a := mload(0)
-//     switch mload(1)
-//     case 0 { a := mload(3) }
-//     default { a := mload(6) }
-//     mstore(a, 0)
+//     {
+//         let a := mload(0)
+//         switch mload(1)
+//         case 0 { a := mload(3) }
+//         default { a := mload(6) }
+//         mstore(a, 0)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul b/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul
index e2f130507a..b2979e76d2 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/simple.yul
@@ -7,6 +7,8 @@
 // step: ssaAndBack
 //
 // {
-//     let a_2 := mload(1)
-//     mstore(a_2, 0)
+//     {
+//         let a_2 := mload(1)
+//         mstore(a_2, 0)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_if.yul b/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_if.yul
index e2516b45b9..71823f105a 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_if.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_if.yul
@@ -10,7 +10,9 @@
 // step: ssaAndBack
 //
 // {
-//     let a := mload(0)
-//     if mload(1) { a := mload(1) }
-//     mstore(a, 0)
+//     {
+//         let a := mload(0)
+//         if mload(1) { a := mload(1) }
+//         mstore(a, 0)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_switch.yul b/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_switch.yul
index e6e0553c18..8c53bd28ab 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_switch.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/single_assign_switch.yul
@@ -13,9 +13,11 @@
 // step: ssaAndBack
 //
 // {
-//     let a := mload(0)
-//     switch mload(1)
-//     case 0 { a := mload(1) }
-//     default { a := mload(2) }
-//     mstore(a, 0)
+//     {
+//         let a := mload(0)
+//         switch mload(1)
+//         case 0 { a := mload(1) }
+//         default { a := mload(2) }
+//         mstore(a, 0)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/ssaReverse.yul b/test/libyul/yulOptimizerTests/ssaAndBack/ssaReverse.yul
index 0ef0ffee39..21dfdf2cee 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/ssaReverse.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/ssaReverse.yul
@@ -24,8 +24,10 @@
 // step: ssaAndBack
 //
 // {
-//     let a, b := abi_decode_t_bytes_calldata_ptr(mload(0), mload(1))
-//     mstore(a, b)
+//     {
+//         let a, b := abi_decode_t_bytes_calldata_ptr(mload(0), mload(1))
+//         mstore(a, b)
+//     }
 //     function abi_decode_t_bytes_calldata_ptr(offset_12, end_13) -> arrayPos_14, length_15
 //     {
 //         if iszero(slt(add(offset_12, 0x1f), end_13)) { revert(0, 0) }
diff --git a/test/libyul/yulOptimizerTests/ssaAndBack/two_vars.yul b/test/libyul/yulOptimizerTests/ssaAndBack/two_vars.yul
index 6053bd9ac9..1205993567 100644
--- a/test/libyul/yulOptimizerTests/ssaAndBack/two_vars.yul
+++ b/test/libyul/yulOptimizerTests/ssaAndBack/two_vars.yul
@@ -11,11 +11,13 @@
 // step: ssaAndBack
 //
 // {
-//     let a_1 := mload(0)
-//     let b_2 := mload(a_1)
-//     let a_3 := mload(b_2)
-//     let b_4 := mload(a_3)
-//     let a_5 := mload(b_4)
-//     let b_6 := mload(a_5)
-//     mstore(a_5, b_6)
+//     {
+//         let a_1 := mload(0)
+//         let b_2 := mload(a_1)
+//         let a_3 := mload(b_2)
+//         let b_4 := mload(a_3)
+//         let a_5 := mload(b_4)
+//         let b_6 := mload(a_5)
+//         mstore(a_5, b_6)
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul b/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul
index 382bd201d6..3633b3f36c 100644
--- a/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul
+++ b/test/libyul/yulOptimizerTests/stackCompressor/inlineInBlock.yul
@@ -9,5 +9,7 @@
 // step: stackCompressor
 //
 // {
-//     mstore(calldataload(calldataload(9)), add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(calldataload(calldataload(9)), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1))
+//     {
+//         mstore(calldataload(calldataload(9)), add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(calldataload(calldataload(9)), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1))
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul b/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
index ed85fe7b85..35dfa5343d 100644
--- a/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
+++ b/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
@@ -11,7 +11,7 @@
 // step: stackCompressor
 //
 // {
-//     let x := 8
+//     { let x := 8 }
 //     function f()
 //     {
 //         mstore(calldataload(calldataload(9)), add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(calldataload(calldataload(9)), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1))
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/noInline.yul b/test/libyul/yulOptimizerTests/stackCompressor/noInline.yul
index b5f3dd8725..1a178abf09 100644
--- a/test/libyul/yulOptimizerTests/stackCompressor/noInline.yul
+++ b/test/libyul/yulOptimizerTests/stackCompressor/noInline.yul
@@ -6,7 +6,7 @@
 // step: stackCompressor
 //
 // {
-//     let x := 8
+//     { let x := 8 }
 //     function f()
 //     { let y := 9 }
 // }
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul b/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul
index dc10737ad9..0556a22202 100644
--- a/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul
+++ b/test/libyul/yulOptimizerTests/stackCompressor/unusedPrunerWithMSize.yul
@@ -24,15 +24,17 @@
 // step: stackCompressor
 //
 // {
-//     let _17_72 := msize()
-//     let _22_75 := msize()
-//     let _25_76 := msize()
-//     let _30_80 := msize()
-//     let _32_81 := msize()
-//     pop(keccak256(1, 2))
-//     let _105 := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//     mstore(lt(or(gt(1, or(or(gt(or(or(or(gt(or(gt(_105, _32_81), 1), _30_80), lt(or(1, add(_25_76, _105)), 1)), _22_75), 1), 1), gt(not(_17_72), 1)), 1)), 1), 1), 1)
-//     foo_singlereturn_1()
+//     {
+//         let _17_72 := msize()
+//         let _22_75 := msize()
+//         let _25_76 := msize()
+//         let _30_80 := msize()
+//         let _32_81 := msize()
+//         pop(keccak256(1, 2))
+//         let _105 := 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+//         mstore(lt(or(gt(1, or(or(gt(or(or(or(gt(or(gt(_105, _32_81), 1), _30_80), lt(or(1, add(_25_76, _105)), 1)), _22_75), 1), 1), gt(not(_17_72), 1)), 1)), 1), 1), 1)
+//         foo_singlereturn_1()
+//     }
 //     function foo_singlereturn_1()
 //     { extcodecopy(1, msize(), 1, 1) }
 // }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/functions.yul b/test/libyul/yulOptimizerTests/unusedPruner/functions.yul
index cceace3bbb..cafb399f61 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/functions.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/functions.yul
@@ -5,4 +5,4 @@
 // ----
 // step: unusedPruner
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/intermediate_assignment.yul b/test/libyul/yulOptimizerTests/unusedPruner/intermediate_assignment.yul
index 32e96b9f3a..00bb145adb 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/intermediate_assignment.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/intermediate_assignment.yul
@@ -7,6 +7,8 @@
 // step: unusedPruner
 //
 // {
-//     let a := 1
-//     a := 4
+//     {
+//         let a := 1
+//         a := 4
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul b/test/libyul/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul
index bc05f09f8a..4132a93f85 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/intermediate_multi_assignment.yul
@@ -8,9 +8,11 @@
 // step: unusedPruner
 //
 // {
-//     let a, b
+//     {
+//         let a, b
+//         a := f()
+//         b := 1
+//     }
 //     function f() -> x
 //     { }
-//     a := f()
-//     b := 1
 // }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/keccak.yul b/test/libyul/yulOptimizerTests/unusedPruner/keccak.yul
index 6ad93184a6..357b3a33cf 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/keccak.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/keccak.yul
@@ -7,6 +7,8 @@
 // step: unusedPruner
 //
 // {
-//     pop(keccak256(1, 1))
-//     sstore(0, msize())
+//     {
+//         pop(keccak256(1, 1))
+//         sstore(0, msize())
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/movable_user_defined_function.yul b/test/libyul/yulOptimizerTests/unusedPruner/movable_user_defined_function.yul
index 09d366fb29..43a4297cb5 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/movable_user_defined_function.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/movable_user_defined_function.yul
@@ -10,4 +10,4 @@
 // ----
 // step: unusedPruner
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/msize.yul b/test/libyul/yulOptimizerTests/unusedPruner/msize.yul
index 05ad7b743e..633b447cd9 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/msize.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/msize.yul
@@ -7,6 +7,8 @@
 // step: unusedPruner
 //
 // {
-//     pop(mload(10))
-//     sstore(0, msize())
+//     {
+//         pop(mload(10))
+//         sstore(0, msize())
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/multi_assign.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_assign.yul
index 47e114373b..aac772dcb9 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/multi_assign.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/multi_assign.yul
@@ -8,9 +8,11 @@
 // step: unusedPruner
 //
 // {
-//     let a
-//     let b
+//     {
+//         let a
+//         let b
+//         a, b := f()
+//     }
 //     function f() -> x, y
 //     { }
-//     a, b := f()
 // }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/multi_assignments.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_assignments.yul
index 86f175d695..a987efe800 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/multi_assignments.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/multi_assignments.yul
@@ -7,7 +7,9 @@
 // step: unusedPruner
 //
 // {
-//     let x, y
-//     x := 1
-//     y := 2
+//     {
+//         let x, y
+//         x := 1
+//         y := 2
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/multi_declarations.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_declarations.yul
index f727b0e93c..3f70d6638a 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/multi_declarations.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/multi_declarations.yul
@@ -4,4 +4,4 @@
 // ----
 // step: unusedPruner
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/multi_declare.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_declare.yul
index aa8ae0ad4b..d65b4d5d7e 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/multi_declare.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/multi_declare.yul
@@ -5,4 +5,4 @@
 // ----
 // step: unusedPruner
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul b/test/libyul/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul
index f54087a7d8..d66889a889 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/multi_partial_assignments.yul
@@ -6,6 +6,8 @@
 // step: unusedPruner
 //
 // {
-//     let x, y
-//     x := 1
+//     {
+//         let x, y
+//         x := 1
+//     }
 // }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/no_msize.yul b/test/libyul/yulOptimizerTests/unusedPruner/no_msize.yul
index 7bfc4d7884..0591c0e2a6 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/no_msize.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/no_msize.yul
@@ -6,4 +6,4 @@
 // ----
 // step: unusedPruner
 //
-// { sstore(0, 5) }
+// { { sstore(0, 5) } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/pop.yul b/test/libyul/yulOptimizerTests/unusedPruner/pop.yul
index 66d16db1ed..636552eee3 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/pop.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/pop.yul
@@ -5,4 +5,4 @@
 // ----
 // step: unusedPruner
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/smoke.yul b/test/libyul/yulOptimizerTests/unusedPruner/smoke.yul
index a2ac495a04..3315ce2c42 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/smoke.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/smoke.yul
@@ -2,4 +2,4 @@
 // ----
 // step: unusedPruner
 //
-// { }
+// { { } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/trivial.yul b/test/libyul/yulOptimizerTests/unusedPruner/trivial.yul
index 9de594351b..8a47d21083 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/trivial.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/trivial.yul
@@ -6,4 +6,4 @@
 // ----
 // step: unusedPruner
 //
-// { mstore(0, 1) }
+// { { mstore(0, 1) } }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/verbatim.yul b/test/libyul/yulOptimizerTests/unusedPruner/verbatim.yul
index 65b464f7f5..7fea85c52c 100644
--- a/test/libyul/yulOptimizerTests/unusedPruner/verbatim.yul
+++ b/test/libyul/yulOptimizerTests/unusedPruner/verbatim.yul
@@ -11,7 +11,9 @@
 // step: unusedPruner
 //
 // {
-//     pop(mload(10))
-//     pop(keccak256(10, 32))
-//     verbatim_0i_0o("test")
+//     {
+//         pop(mload(10))
+//         pop(keccak256(10, 32))
+//         verbatim_0i_0o("test")
+//     }
 // }
diff --git a/test/yulPhaser/Program.cpp b/test/yulPhaser/Program.cpp
index 8aa2479a21..2e91926d05 100644
--- a/test/yulPhaser/Program.cpp
+++ b/test/yulPhaser/Program.cpp
@@ -337,7 +337,10 @@ BOOST_AUTO_TEST_CASE(optimise)
 
 	Block const& parentBlockAfter = program.ast();
 	BOOST_TEST(parentBlockAfter.statements.size() == 1);
-	BOOST_TEST(holds_alternative<VariableDeclaration>(parentBlockAfter.statements[0]));
+	BOOST_TEST(holds_alternative<Block>(parentBlockAfter.statements[0]));
+	Block const& innerBlock = get<Block>(parentBlockAfter.statements[0]);
+	BOOST_TEST(innerBlock.statements.size() == 1);
+	BOOST_TEST(holds_alternative<VariableDeclaration>(innerBlock.statements[0]));
 }
 
 BOOST_AUTO_TEST_CASE(output_operator)

From fbc48e30292db668de3874bf0fc9a9e74e9f471b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 28 Oct 2021 12:32:53 +0200
Subject: [PATCH 0110/1748] Extract helpers for managing steps in parallelized
 CircleCI jobs from soltest_all.sh

---
 .circleci/soltest_all.sh | 41 +++++++++++++++++++++++-----------------
 scripts/common.sh        | 22 +++++++++++++++++++++
 2 files changed, 46 insertions(+), 17 deletions(-)

diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 353d81cd68..0c414593f3 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -28,27 +28,31 @@ set -e
 
 REPODIR="$(realpath "$(dirname "$0")"/..)"
 
+# shellcheck source=scripts/common.sh
+source "${REPODIR}/scripts/common.sh"
+
 EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london)
 DEFAULT_EVM=london
 [[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
 OPTIMIZE_VALUES=(0 1)
 STEPS=$(( 1 + ${#EVM_VALUES[@]} * ${#OPTIMIZE_VALUES[@]} ))
 
-if (( CIRCLE_NODE_TOTAL )) && (( CIRCLE_NODE_TOTAL > 1 ))
-then
-    RUN_STEPS=$(seq "$STEPS" | circleci tests split | xargs)
-else
-    RUN_STEPS=$(seq "$STEPS" | xargs)
-fi
-
-echo "Running steps $RUN_STEPS..."
+RUN_STEPS=$(circleci_select_steps "$(seq "$STEPS")")
+printTask "Running steps $RUN_STEPS..."
 
 STEP=1
 
 
 # Run for ABI encoder v1, without SMTChecker tests.
-[[ " $RUN_STEPS " == *" $STEP "* ]] && EVM="${DEFAULT_EVM}" OPTIMIZE=1 ABI_ENCODER_V1=1 BOOST_TEST_ARGS="-t !smtCheckerTests" "${REPODIR}/.circleci/soltest.sh"
-STEP=$((STEP + 1))
+if circleci_step_selected "$RUN_STEPS" "$STEP"
+then
+    EVM="${DEFAULT_EVM}" \
+    OPTIMIZE=1 \
+    ABI_ENCODER_V1=1 \
+    BOOST_TEST_ARGS="-t !smtCheckerTests" \
+    "${REPODIR}/.circleci/soltest.sh"
+fi
+((++STEP))
 
 for OPTIMIZE in "${OPTIMIZE_VALUES[@]}"
 do
@@ -63,13 +67,16 @@ do
         DISABLE_SMTCHECKER=""
         [ "${OPTIMIZE}" != "0" ] && DISABLE_SMTCHECKER="-t !smtCheckerTests"
 
-        [[ " $RUN_STEPS " == *" $STEP "* ]] && EVM="$EVM" OPTIMIZE="$OPTIMIZE" SOLTEST_FLAGS="$SOLTEST_FLAGS $ENFORCE_GAS_ARGS $EWASM_ARGS" BOOST_TEST_ARGS="-t !@nooptions $DISABLE_SMTCHECKER" "${REPODIR}/.circleci/soltest.sh"
-        STEP=$((STEP + 1))
+        if circleci_step_selected "$RUN_STEPS" "$STEP"
+        then
+            EVM="$EVM" \
+            OPTIMIZE="$OPTIMIZE" \
+            SOLTEST_FLAGS="$SOLTEST_FLAGS $ENFORCE_GAS_ARGS $EWASM_ARGS" \
+            BOOST_TEST_ARGS="-t !@nooptions $DISABLE_SMTCHECKER" \
+            "${REPODIR}/.circleci/soltest.sh"
+        fi
+        ((++STEP))
     done
 done
 
-if ((STEP != STEPS + 1))
-then
-    echo "Step counter not properly adjusted!" >&2
-    exit 1
-fi
+((STEP == STEPS + 1)) || assertFail "Step counter not properly adjusted!"
diff --git a/scripts/common.sh b/scripts/common.sh
index 3e40754a61..d529b5bfc2 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -196,3 +196,25 @@ function safe_kill
         kill -9 "$PID"
     fi
 }
+
+function circleci_select_steps
+{
+    local all_steps="$1"
+    (( $# == 1 )) || assertFail
+
+    if (( CIRCLE_NODE_TOTAL )) && (( CIRCLE_NODE_TOTAL > 1 ))
+    then
+        echo "$all_steps" | circleci tests split | xargs
+    else
+        echo "$all_steps" | xargs
+    fi
+}
+
+function circleci_step_selected
+{
+    local selected_steps="$1"
+    local step="$2"
+    [[ $step != *" "* ]] || assertFail "Step names must not contain spaces."
+
+    [[ " $selected_steps " == *" $step "* ]] || return 1
+}

From 834f9d3a6ec00357efbb4e3b68813f281a71acff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 28 Oct 2021 12:46:34 +0200
Subject: [PATCH 0111/1748] Parallelize external test runs on CircleCI

---
 .circleci/config.yml            | 2 ++
 test/externalTests/colony.sh    | 6 +++++-
 test/externalTests/common.sh    | 9 +++++++++
 test/externalTests/ens.sh       | 6 +++++-
 test/externalTests/gnosis-v2.sh | 6 +++++-
 test/externalTests/gnosis.sh    | 6 +++++-
 test/externalTests/zeppelin.sh  | 6 +++++-
 7 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 72434ea15c..02787debc4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -943,6 +943,8 @@ jobs:
         default: 14
     docker:
       - image: circleci/node:<<parameters.nodejs_version>>
+    # NOTE: Each external test does 3 separate compile&test runs
+    parallelism: 3
     environment:
       TERM: xterm
       COMPILE_ONLY: <<parameters.compile_only>>
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index e32385af65..3aaff44138 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -38,6 +38,10 @@ function colony_test
     local min_optimizer_level=3
     local max_optimizer_level=3
 
+    local selected_optimizer_levels
+    selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
+    print_optimizer_levels_or_exit "$selected_optimizer_levels"
+
     setup_solcjs "$DIR" "$SOLJSON"
     download_project "$repo" "$branch" "$DIR"
 
@@ -54,7 +58,7 @@ function colony_test
     replace_version_pragmas
     force_solc_modules "${DIR}/solc"
 
-    for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
+    for level in $selected_optimizer_levels; do
         truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
     done
 }
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index dbda3c3f46..2519a0f878 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -24,6 +24,15 @@ set -e
 
 CURRENT_EVM_VERSION=london
 
+function print_optimizer_levels_or_exit
+{
+    local selected_levels="$1"
+
+    [[ $selected_levels != "" ]] || { printWarning "No steps to run. Exiting."; exit 0; }
+
+    printLog "Selected optimizer levels: ${selected_levels}"
+}
+
 function verify_input
 {
     if [ ! -f "$1" ]; then
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index bbdc573e21..9fed91be1f 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -38,6 +38,10 @@ function ens_test
     local min_optimizer_level=1
     local max_optimizer_level=3
 
+    local selected_optimizer_levels
+    selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
+    print_optimizer_levels_or_exit "$selected_optimizer_levels"
+
     setup_solcjs "$DIR" "$SOLJSON"
     download_project "$repo" "$branch" "$DIR"
 
@@ -52,7 +56,7 @@ function ens_test
     replace_version_pragmas
     force_solc_modules "${DIR}/solc"
 
-    for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
+    for level in $selected_optimizer_levels; do
         truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
     done
 }
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index d92bcc1868..439a3dd91f 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -39,6 +39,10 @@ function gnosis_safe_test
     local min_optimizer_level=2
     local max_optimizer_level=3
 
+    local selected_optimizer_levels
+    selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
+    print_optimizer_levels_or_exit "$selected_optimizer_levels"
+
     setup_solcjs "$DIR" "$SOLJSON"
     download_project "$repo" "$branch" "$DIR"
 
@@ -53,7 +57,7 @@ function gnosis_safe_test
     replace_version_pragmas
     force_solc_modules "${DIR}/solc"
 
-    for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
+    for level in $selected_optimizer_levels; do
         truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
     done
 }
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index b6d9ab0bcb..32b76d9c90 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -38,6 +38,10 @@ function gnosis_safe_test
     local min_optimizer_level=2
     local max_optimizer_level=3
 
+    local selected_optimizer_levels
+    selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
+    print_optimizer_levels_or_exit "$selected_optimizer_levels"
+
     setup_solcjs "$DIR" "$SOLJSON"
     download_project "$repo" "$branch" "$DIR"
 
@@ -51,7 +55,7 @@ function gnosis_safe_test
     replace_version_pragmas
     force_solc_modules "${DIR}/solc"
 
-    for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
+    for level in $selected_optimizer_levels; do
         truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
     done
 }
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 1e23bb7ae5..24e576b931 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -38,6 +38,10 @@ function zeppelin_test
     local min_optimizer_level=1
     local max_optimizer_level=3
 
+    local selected_optimizer_levels
+    selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
+    print_optimizer_levels_or_exit "$selected_optimizer_levels"
+
     setup_solcjs "$DIR" "$SOLJSON"
     download_project "$repo" "$branch" "$DIR"
 
@@ -48,7 +52,7 @@ function zeppelin_test
     replace_version_pragmas
     force_solc_modules "${DIR}/solc"
 
-    for level in $(seq "$min_optimizer_level" "$max_optimizer_level"); do
+    for level in $selected_optimizer_levels; do
         truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
     done
 }

From cffb7fec27c5f884a9a775738f7ab58a9d6d9275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 9 Nov 2021 17:23:33 +0100
Subject: [PATCH 0112/1748] Set version to 0.8.11

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 23c2f0e42e..e3dc030c13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.10")
+set(PROJECT_VERSION "0.8.11")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index ee463b25cd..79d5df058c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.11 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.10 (2021-11-09)
 
 Language Features:

From 276d173e6840c4e9570412acc91685c0ebd738ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 12 Oct 2021 12:51:44 +0200
Subject: [PATCH 0113/1748] Document DEV_SIMPLE_EXCEPTION macro

---
 libsolutil/Exceptions.h | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/libsolutil/Exceptions.h b/libsolutil/Exceptions.h
index d83d8004b4..684c5a051a 100644
--- a/libsolutil/Exceptions.h
+++ b/libsolutil/Exceptions.h
@@ -56,6 +56,10 @@ struct Exception: virtual std::exception, virtual boost::exception
 		::boost::throw_line(__LINE__) \
 	)
 
+/// Defines an exception type that's meant to signal a specific condition and be caught rather than
+/// unwind the stack all the way to the top-level exception handler and interrupt the program.
+/// As such it does not carry a message - the code catching it is expected to handle it without
+/// letting it escape.
 #define DEV_SIMPLE_EXCEPTION(X) struct X: virtual ::solidity::util::Exception { const char* what() const noexcept override { return #X; } }
 
 DEV_SIMPLE_EXCEPTION(InvalidAddress);

From cda0d029bc54c80729ca44d4db01771e37df22ba Mon Sep 17 00:00:00 2001
From: neel iyer <33139997+spiyer99@users.noreply.github.com>
Date: Sun, 15 Aug 2021 10:32:01 +1000
Subject: [PATCH 0114/1748] Define CommandLineError and a few exceptions
 derived from it

---
 solc/CMakeLists.txt |  1 +
 solc/Exceptions.h   | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 solc/Exceptions.h

diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt
index fe68d4eb99..8d9d2b364c 100644
--- a/solc/CMakeLists.txt
+++ b/solc/CMakeLists.txt
@@ -1,6 +1,7 @@
 set(libsolcli_sources
 	CommandLineInterface.cpp CommandLineInterface.h
 	CommandLineParser.cpp CommandLineParser.h
+	Exceptions.h
 )
 
 add_library(solcli ${libsolcli_sources})
diff --git a/solc/Exceptions.h b/solc/Exceptions.h
new file mode 100644
index 0000000000..39a464b9e5
--- /dev/null
+++ b/solc/Exceptions.h
@@ -0,0 +1,34 @@
+/*
+	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
+/**
+ * Exceptions used by the command-line interface.
+ */
+
+#pragma once
+
+#include <liblangutil/Exceptions.h>
+
+namespace solidity::frontend
+{
+
+struct CommandLineError: virtual util::Exception {};
+struct CommandLineExecutionError: virtual CommandLineError {};
+struct CommandLineValidationError: virtual CommandLineError {};
+struct CommandLineOutputError: virtual CommandLineError {};
+
+}

From 3f5471165fc30658fb1a1954dbfc7be662e9639c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 11 Oct 2021 13:48:03 +0200
Subject: [PATCH 0115/1748] CommandLineParser: Report errors by raising
 exceptions

---
 solc/CommandLineInterface.cpp   |  13 +-
 solc/CommandLineParser.cpp      | 392 +++++++++++++-------------------
 solc/CommandLineParser.h        |  38 ++--
 test/solc/CommandLineParser.cpp |  56 ++---
 4 files changed, 211 insertions(+), 288 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 1d069f9251..78e60ad0cb 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -23,6 +23,8 @@
  */
 #include <solc/CommandLineInterface.h>
 
+#include <solc/Exceptions.h>
+
 #include "license.h"
 #include "solidity/BuildInfo.h"
 
@@ -592,9 +594,16 @@ bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
 		return false;
 	}
 
-	bool success = parser.parse(_argc, _argv);
-	if (!success)
+	try
+	{
+		parser.parse(_argc, _argv);
+	}
+	catch (CommandLineValidationError const& _exception)
+	{
+		serr() << _exception.what() << endl;
 		return false;
+	}
+
 	m_hasOutput = m_hasOutput || parser.hasOutput();
 	m_options = parser.options();
 
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 9356c96625..cdd74a2172 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -17,7 +17,11 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <solc/CommandLineParser.h>
+
+#include <solc/Exceptions.h>
+
 #include <libyul/optimiser/Suite.h>
+
 #include <liblangutil/EVMVersion.h>
 
 #include <boost/algorithm/string.hpp>
@@ -131,6 +135,9 @@ static set<string> const g_metadataHashArgs
 };
 
 static map<InputMode, string> const g_inputModeName = {
+	{InputMode::Help, "help"},
+	{InputMode::License, "license"},
+	{InputMode::Version, "version"},
 	{InputMode::Compiler, "compiler"},
 	{InputMode::CompilerWithASTImport, "compiler (AST import)"},
 	{InputMode::Assembler, "assembler"},
@@ -138,15 +145,16 @@ static map<InputMode, string> const g_inputModeName = {
 	{InputMode::Linker, "linker"},
 };
 
-bool CommandLineParser::checkMutuallyExclusive(vector<string> const& _optionNames)
+void CommandLineParser::checkMutuallyExclusive(vector<string> const& _optionNames)
 {
 	if (countEnabledOptions(_optionNames) > 1)
 	{
-		serr() << "The following options are mutually exclusive: " << joinOptionNames(_optionNames) << ". ";
-		serr() << "Select at most one." << endl;
-		return false;
+		solThrow(
+			CommandLineValidationError,
+			"The following options are mutually exclusive: " + joinOptionNames(_optionNames) + ". " +
+			"Select at most one."
+		);
 	}
-	return true;
 }
 
 bool CompilerOutputs::operator==(CompilerOutputs const& _other) const noexcept
@@ -268,17 +276,15 @@ OptimiserSettings CommandLineOptions::optimiserSettings() const
 	return settings;
 }
 
-bool CommandLineParser::parse(int _argc, char const* const* _argv)
+void CommandLineParser::parse(int _argc, char const* const* _argv)
 {
 	m_hasOutput = false;
 
-	if (!parseArgs(_argc, _argv))
-		return false;
-
-	return processArgs();
+	parseArgs(_argc, _argv);
+	processArgs();
 }
 
-bool CommandLineParser::parseInputPathsAndRemappings()
+void CommandLineParser::parseInputPathsAndRemappings()
 {
 	m_options.input.ignoreMissingFiles = (m_args.count(g_strIgnoreMissingFiles) > 0);
 
@@ -289,17 +295,14 @@ bool CommandLineParser::parseInputPathsAndRemappings()
 			{
 				optional<ImportRemapper::Remapping> remapping = ImportRemapper::parseRemapping(positionalArg);
 				if (!remapping.has_value())
-				{
-					serr() << "Invalid remapping: \"" << positionalArg << "\"." << endl;
-					return false;
-				}
+					solThrow(CommandLineValidationError, "Invalid remapping: \"" + positionalArg + "\".");
 
 				if (m_options.input.mode == InputMode::StandardJson)
-				{
-					serr() << "Import remappings are not accepted on the command line in Standard JSON mode." << endl;
-					serr() << "Please put them under 'settings.remappings' in the JSON input." << endl;
-					return false;
-				}
+					solThrow(
+						CommandLineValidationError,
+						"Import remappings are not accepted on the command line in Standard JSON mode.\n"
+						"Please put them under 'settings.remappings' in the JSON input."
+					);
 
 				if (!remapping->target.empty())
 				{
@@ -324,26 +327,24 @@ bool CommandLineParser::parseInputPathsAndRemappings()
 	if (m_options.input.mode == InputMode::StandardJson)
 	{
 		if (m_options.input.paths.size() > 1 || (m_options.input.paths.size() == 1 && m_options.input.addStdin))
-		{
-			serr() << "Too many input files for --" << g_strStandardJSON << "." << endl;
-			serr() << "Please either specify a single file name or provide its content on standard input." << endl;
-			return false;
-		}
+			solThrow(
+				CommandLineValidationError,
+				"Too many input files for --" + g_strStandardJSON + ".\n"
+				"Please either specify a single file name or provide its content on standard input."
+			);
 		else if (m_options.input.paths.size() == 0)
 			// Standard JSON mode input used to be handled separately and zero files meant "read from stdin".
 			// Keep it working that way for backwards-compatibility.
 			m_options.input.addStdin = true;
 	}
 	else if (m_options.input.paths.size() == 0 && !m_options.input.addStdin)
-	{
-		serr() << "No input files given. If you wish to use the standard input please specify \"-\" explicitly." << endl;
-		return false;
-	}
-
-	return true;
+		solThrow(
+			CommandLineValidationError,
+			"No input files given. If you wish to use the standard input please specify \"-\" explicitly."
+		);
 }
 
-bool CommandLineParser::parseLibraryOption(string const& _input)
+void CommandLineParser::parseLibraryOption(string const& _input)
 {
 	namespace fs = boost::filesystem;
 	string data = _input;
@@ -378,71 +379,71 @@ bool CommandLineParser::parseLibraryOption(string const& _input)
 			{
 				separator = lib.rfind(':');
 				if (separator == string::npos)
-				{
-					serr() << "Equal sign separator missing in library address specifier \"" << lib << "\"" << endl;
-					return false;
-				}
+					solThrow(
+						CommandLineValidationError,
+						"Equal sign separator missing in library address specifier \"" + lib + "\""
+					);
 				else
 					isSeparatorEqualSign = false; // separator is colon
 			}
 			else
 				if (lib.rfind('=') != lib.find('='))
-				{
-					serr() << "Only one equal sign \"=\" is allowed in the address string \"" << lib << "\"." << endl;
-					return false;
-				}
+					solThrow(
+						CommandLineValidationError,
+						"Only one equal sign \"=\" is allowed in the address string \"" + lib + "\"."
+					);
 
 			string libName(lib.begin(), lib.begin() + static_cast<ptrdiff_t>(separator));
 			boost::trim(libName);
 			if (m_options.linker.libraries.count(libName))
-			{
-				serr() << "Address specified more than once for library \"" << libName << "\"." << endl;
-				return false;
-			}
+				solThrow(
+					CommandLineValidationError,
+					"Address specified more than once for library \"" + libName + "\"."
+				);
 
 			string addrString(lib.begin() + static_cast<ptrdiff_t>(separator) + 1, lib.end());
 			boost::trim(addrString);
 			if (addrString.empty())
-			{
-				serr() << "Empty address provided for library \"" << libName << "\"." << endl;
-				serr() << "Note that there should not be any whitespace after the " << (isSeparatorEqualSign ? "equal sign" : "colon") << "." << endl;
-				return false;
-			}
+				solThrow(
+					CommandLineValidationError,
+					"Empty address provided for library \"" + libName + "\".\n"
+					"Note that there should not be any whitespace after the " +
+					(isSeparatorEqualSign ? "equal sign" : "colon") + "."
+				);
 
 			if (addrString.substr(0, 2) == "0x")
 				addrString = addrString.substr(2);
 			else
-			{
-				serr() << "The address " << addrString << " is not prefixed with \"0x\"." << endl;
-				serr() << "Note that the address must be prefixed with \"0x\"." << endl;
-				return false;
-			}
+				solThrow(
+					CommandLineValidationError,
+					"The address " + addrString + " is not prefixed with \"0x\".\n"
+					"Note that the address must be prefixed with \"0x\"."
+				);
 
 			if (addrString.length() != 40)
-			{
-				serr() << "Invalid length for address for library \"" << libName << "\": " << addrString.length() << " instead of 40 characters." << endl;
-				return false;
-			}
+				solThrow(
+					CommandLineValidationError,
+					"Invalid length for address for library \"" + libName + "\": " +
+					to_string(addrString.length()) + " instead of 40 characters."
+				);
 			if (!passesAddressChecksum(addrString, false))
-			{
-				serr() << "Invalid checksum on address for library \"" << libName << "\": " << addrString << endl;
-				serr() << "The correct checksum is " << getChecksummedAddress(addrString) << endl;
-				return false;
-			}
+				solThrow(
+					CommandLineValidationError,
+					"Invalid checksum on address for library \"" + libName + "\": " + addrString + "\n"
+					"The correct checksum is " + getChecksummedAddress(addrString)
+				);
 			bytes binAddr = fromHex(addrString);
 			h160 address(binAddr, h160::AlignRight);
 			if (binAddr.size() > 20 || address == h160())
-			{
-				serr() << "Invalid address for library \"" << libName << "\": " << addrString << endl;
-				return false;
-			}
+				solThrow(
+					CommandLineValidationError,
+					"Invalid address for library \"" + libName + "\": " + addrString
+				);
 			m_options.linker.libraries[libName] = address;
 		}
-
-	return true;
 }
 
-bool CommandLineParser::parseOutputSelection()
+void CommandLineParser::parseOutputSelection()
 {
 	static auto outputSupported = [](InputMode _mode, string_view _outputName)
 	{
@@ -498,13 +499,11 @@ bool CommandLineParser::parseOutputSelection()
 			unsupportedOutputs.push_back(optionName);
 
 	if (!unsupportedOutputs.empty())
-	{
-		serr() << "The following outputs are not supported in " << g_inputModeName.at(m_options.input.mode) << " mode: ";
-		serr() << joinOptionNames(unsupportedOutputs) << ".";
-		return false;
-	}
-
-	return true;
+		solThrow(
+			CommandLineValidationError,
+			"The following outputs are not supported in " + g_inputModeName.at(m_options.input.mode) + " mode: " +
+			joinOptionNames(unsupportedOutputs) + "."
+		);
 }
 
 po::options_description CommandLineParser::optionsDescription()
@@ -843,7 +842,7 @@ po::positional_options_description CommandLineParser::positionalOptionsDescripti
 	return filesPositions;
 }
 
-bool CommandLineParser::parseArgs(int _argc, char const* const* _argv)
+void CommandLineParser::parseArgs(int _argc, char const* const* _argv)
 {
 	po::options_description allOptions = optionsDescription();
 	po::positional_options_description filesPositions = positionalOptionsDescription();
@@ -858,18 +857,15 @@ bool CommandLineParser::parseArgs(int _argc, char const* const* _argv)
 	}
 	catch (po::error const& _exception)
 	{
-		serr() << _exception.what() << endl;
-		return false;
+		solThrow(CommandLineValidationError, _exception.what());
 	}
 
 	po::notify(m_args);
-
-	return true;
 }
 
-bool CommandLineParser::processArgs()
+void CommandLineParser::processArgs()
 {
-	if (!checkMutuallyExclusive({
+	checkMutuallyExclusive({
 		g_strHelp,
 		g_strLicense,
 		g_strVersion,
@@ -879,8 +875,7 @@ bool CommandLineParser::processArgs()
 		g_strStrictAssembly,
 		g_strYul,
 		g_strImportAst,
-	}))
-		return false;
+	});
 
 	if (m_args.count(g_strHelp) > 0)
 		m_options.input.mode = InputMode::Help;
@@ -904,7 +899,7 @@ bool CommandLineParser::processArgs()
 		m_options.input.mode == InputMode::License ||
 		m_options.input.mode == InputMode::Version
 	)
-		return true;
+		return;
 
 	map<string, set<InputMode>> validOptionInputModeCombinations = {
 		// TODO: This should eventually contain all options.
@@ -919,13 +914,13 @@ bool CommandLineParser::processArgs()
 	}
 
 	if (!invalidOptionsForCurrentInputMode.empty())
-	{
-		serr() << "The following options are not supported in the current input mode: " << joinOptionNames(invalidOptionsForCurrentInputMode) << endl;
-		return false;
-	}
+		solThrow(
+			CommandLineValidationError,
+			"The following options are not supported in the current input mode: " +
+			joinOptionNames(invalidOptionsForCurrentInputMode)
+		);
 
-	if (!checkMutuallyExclusive({g_strColor, g_strNoColor}))
-		return false;
+	checkMutuallyExclusive({g_strColor, g_strNoColor});
 
 	array<string, 9> const conflictingWithStopAfter{
 		CompilerOutputs::componentName(&CompilerOutputs::binary),
@@ -940,8 +935,7 @@ bool CommandLineParser::processArgs()
 	};
 
 	for (auto& option: conflictingWithStopAfter)
-		if (!checkMutuallyExclusive({g_strStopAfter, option}))
-			return false;
+		checkMutuallyExclusive({g_strStopAfter, option});
 
 	if (
 		m_options.input.mode != InputMode::Compiler &&
@@ -950,23 +944,23 @@ bool CommandLineParser::processArgs()
 	)
 	{
 		if (!m_args[g_strOptimizeRuns].defaulted())
-		{
-			serr() << "Option --" << g_strOptimizeRuns << " is only valid in compiler and assembler modes." << endl;
-			return false;
-		}
+			solThrow(
+				CommandLineValidationError,
+				"Option --" + g_strOptimizeRuns + " is only valid in compiler and assembler modes."
+			);
 
 		for (string const& option: {g_strOptimize, g_strNoOptimizeYul, g_strOptimizeYul, g_strYulOptimizations})
 			if (m_args.count(option) > 0)
-			{
-				serr() << "Option --" << option << " is only valid in compiler and assembler modes." << endl;
-				return false;
-			}
+				solThrow(
+					CommandLineValidationError,
+					"Option --" + option + " is only valid in compiler and assembler modes."
+				);
 
 		if (!m_args[g_strDebugInfo].defaulted())
-		{
-			serr() << "Option --" << g_strDebugInfo << " is only valid in compiler and assembler modes." << endl;
-			return false;
-		}
+			solThrow(
+				CommandLineValidationError,
+				"Option --" + g_strDebugInfo + " is only valid in compiler and assembler modes."
+			);
 	}
 
 	if (m_args.count(g_strColor) > 0)
@@ -981,15 +975,15 @@ bool CommandLineParser::processArgs()
 		string revertStringsString = m_args[g_strRevertStrings].as<string>();
 		std::optional<RevertStrings> revertStrings = revertStringsFromString(revertStringsString);
 		if (!revertStrings)
-		{
-			serr() << "Invalid option for --" << g_strRevertStrings << ": " << revertStringsString << endl;
-			return false;
-		}
+			solThrow(
+				CommandLineValidationError,
+				"Invalid option for --" + g_strRevertStrings + ": " + revertStringsString
+			);
 		if (*revertStrings == RevertStrings::VerboseDebug)
-		{
-			serr() << "Only \"default\", \"strip\" and \"debug\" are implemented for --" << g_strRevertStrings << " for now." << endl;
-			return false;
-		}
+			solThrow(
+				CommandLineValidationError,
+				"Only \"default\", \"strip\" and \"debug\" are implemented for --" + g_strRevertStrings + " for now."
+			);
 		m_options.output.revertStrings = *revertStrings;
 	}
 
@@ -998,20 +992,13 @@ bool CommandLineParser::processArgs()
 		string optionValue = m_args[g_strDebugInfo].as<string>();
 		m_options.output.debugInfoSelection = DebugInfoSelection::fromString(optionValue);
 		if (!m_options.output.debugInfoSelection.has_value())
-		{
-			serr() << "Invalid value for --" << g_strDebugInfo << " option: " << optionValue << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Invalid value for --" + g_strDebugInfo + " option: " + optionValue);
 
 		if (m_options.output.debugInfoSelection->snippet && !m_options.output.debugInfoSelection->location)
-		{
-			serr() << "To use 'snippet' with --" << g_strDebugInfo << " you must select also 'location'." << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "To use 'snippet' with --" + g_strDebugInfo + " you must select also 'location'.");
 	}
 
-	if (!parseCombinedJsonOption())
-		return false;
+	parseCombinedJsonOption();
 
 	if (m_args.count(g_strOutputDir))
 		m_options.output.dir = m_args.at(g_strOutputDir).as<string>();
@@ -1028,8 +1015,7 @@ bool CommandLineParser::processArgs()
 		m_options.formatting.json.indent = m_args[g_strJsonIndent].as<uint32_t>();
 	}
 
-	if (!parseOutputSelection())
-		return false;
+	parseOutputSelection();
 
 	m_options.compiler.estimateGas = (m_args.count(g_strGas) > 0);
 
@@ -1039,18 +1025,13 @@ bool CommandLineParser::processArgs()
 	if (m_args.count(g_strIncludePath) > 0)
 	{
 		if (m_options.input.basePath.empty())
-		{
-			serr() << "--" << g_strIncludePath << " option requires a non-empty base path." << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "--" + g_strIncludePath + " option requires a non-empty base path.");
 
 		for (string const& includePath: m_args[g_strIncludePath].as<vector<string>>())
 		{
 			if (includePath.empty())
-			{
-				serr() << "Empty values are not allowed in --" << g_strIncludePath << "." << endl;
-				return false;
-			}
+				solThrow(CommandLineValidationError, "Empty values are not allowed in --" + g_strIncludePath + ".");
+
 			m_options.input.includePaths.push_back(includePath);
 		}
 	}
@@ -1066,37 +1047,29 @@ bool CommandLineParser::processArgs()
 	if (m_args.count(g_strStopAfter))
 	{
 		if (m_args[g_strStopAfter].as<string>() != "parsing")
-		{
-			serr() << "Valid options for --" << g_strStopAfter << " are: \"parsing\".\n";
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Valid options for --" + g_strStopAfter + " are: \"parsing\".\n");
 		else
 			m_options.output.stopAfter = CompilerStack::State::Parsed;
 	}
 
-	if (!parseInputPathsAndRemappings())
-		return false;
+	parseInputPathsAndRemappings();
 
 	if (m_options.input.mode == InputMode::StandardJson)
-		return true;
+		return;
 
 	if (m_args.count(g_strLibraries))
 		for (string const& library: m_args[g_strLibraries].as<vector<string>>())
-			if (!parseLibraryOption(library))
-				return false;
+			parseLibraryOption(library);
 
 	if (m_options.input.mode == InputMode::Linker)
-		return true;
+		return;
 
 	if (m_args.count(g_strEVMVersion))
 	{
 		string versionOptionStr = m_args[g_strEVMVersion].as<string>();
 		std::optional<langutil::EVMVersion> versionOption = langutil::EVMVersion::fromString(versionOptionStr);
 		if (!versionOption)
-		{
-			serr() << "Invalid option for --" << g_strEVMVersion << ": " << versionOptionStr << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Invalid option for --" + g_strEVMVersion + ": " + versionOptionStr);
 		m_options.output.evmVersion = *versionOption;
 	}
 
@@ -1109,10 +1082,7 @@ bool CommandLineParser::processArgs()
 	{
 		OptimiserSettings optimiserSettings = m_options.optimiserSettings();
 		if (!optimiserSettings.runYulOptimiser)
-		{
-			serr() << "--" << g_strYulOptimizations << " is invalid if Yul optimizer is disabled" << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "--" + g_strYulOptimizations + " is invalid if Yul optimizer is disabled");
 
 		try
 		{
@@ -1120,8 +1090,10 @@ bool CommandLineParser::processArgs()
 		}
 		catch (yul::OptimizerException const& _exception)
 		{
-			serr() << "Invalid optimizer step sequence in --" << g_strYulOptimizations << ": " << _exception.what() << endl;
-			return false;
+			solThrow(
+				CommandLineValidationError,
+				"Invalid optimizer step sequence in --" + g_strYulOptimizations + ": " + _exception.what()
+			);
 		}
 
 		m_options.optimizer.yulSteps = m_args[g_strYulOptimizations].as<string>();
@@ -1142,12 +1114,11 @@ bool CommandLineParser::processArgs()
 			auto optionEnabled = [&](string const& name){ return m_args.count(name) > 0; };
 			auto enabledOptions = nonAssemblyModeOptions | ranges::views::filter(optionEnabled) | ranges::to_vector;
 
-			serr() << "The following options are invalid in assembly mode: ";
-			serr() << joinOptionNames(enabledOptions) << ".";
+			string message = "The following options are invalid in assembly mode: " + joinOptionNames(enabledOptions) + ".";
 			if (m_args.count(g_strOptimizeYul) || m_args.count(g_strNoOptimizeYul))
-				serr() << " Optimization is disabled by default and can be enabled with --" << g_strOptimize << "." << endl;
-			serr() << endl;
-			return false;
+				message += " Optimization is disabled by default and can be enabled with --" + g_strOptimize + ".";
+
+			solThrow(CommandLineValidationError, message);
 		}
 
 		// switch to assembly mode
@@ -1163,10 +1134,7 @@ bool CommandLineParser::processArgs()
 			else if (machine == g_strEwasm)
 				m_options.assembly.targetMachine = Machine::Ewasm;
 			else
-			{
-				serr() << "Invalid option for --" << g_strMachine << ": " << machine << endl;
-				return false;
-			}
+				solThrow(CommandLineValidationError, "Invalid option for --" + g_strMachine + ": " + machine);
 		}
 		if (m_options.assembly.targetMachine == Machine::Ewasm && m_options.assembly.inputLanguage == Input::StrictAssembly)
 			m_options.assembly.inputLanguage = Input::Ewasm;
@@ -1179,45 +1147,35 @@ bool CommandLineParser::processArgs()
 			{
 				m_options.assembly.inputLanguage = Input::Ewasm;
 				if (m_options.assembly.targetMachine != Machine::Ewasm)
-				{
-					serr() << "If you select Ewasm as --" << g_strYulDialect << ", ";
-					serr() << "--" << g_strMachine << " has to be Ewasm as well." << endl;
-					return false;
-				}
+					solThrow(
+						CommandLineValidationError,
+						"If you select Ewasm as --" + g_strYulDialect + ", "
+						"--" + g_strMachine + " has to be Ewasm as well."
+					);
 			}
 			else
-			{
-				serr() << "Invalid option for --" << g_strYulDialect << ": " << dialect << endl;
-				return false;
-			}
+				solThrow(CommandLineValidationError, "Invalid option for --" + g_strYulDialect + ": " + dialect);
 		}
 		if (m_options.optimizer.enabled && (m_options.assembly.inputLanguage != Input::StrictAssembly && m_options.assembly.inputLanguage != Input::Ewasm))
-		{
-			serr() <<
-				"Optimizer can only be used for strict assembly. Use --" <<
-				g_strStrictAssembly <<
-				"." <<
-				endl;
-			return false;
-		}
+			solThrow(
+				CommandLineValidationError,
+				"Optimizer can only be used for strict assembly. Use --"  + g_strStrictAssembly + "."
+			);
 		if (m_options.assembly.targetMachine == Machine::Ewasm && m_options.assembly.inputLanguage != Input::StrictAssembly && m_options.assembly.inputLanguage != Input::Ewasm)
-		{
-			serr() << "The selected input language is not directly supported when targeting the Ewasm machine ";
-			serr() << "and automatic translation is not available." << endl;
-			return false;
-		}
-		serr() <<
-			"Warning: Yul is still experimental. Please use the output with care." <<
-			endl;
-
-		return true;
+			solThrow(
+				CommandLineValidationError,
+				"The selected input language is not directly supported when targeting the Ewasm machine "
+				"and automatic translation is not available."
+			);
+
+		serr() << "Warning: Yul is still experimental. Please use the output with care." << endl;
+		return;
 	}
 	else if (countEnabledOptions({g_strYulDialect, g_strMachine}) >= 1)
-	{
-		serr() << "--" << g_strYulDialect << " and --" << g_strMachine << " ";
-		serr() << "are only valid in assembly mode." << endl;
-		return false;
-	}
+		solThrow(
+			CommandLineValidationError,
+			"--" + g_strYulDialect + " and --" + g_strMachine + " are only valid in assembly mode."
+		);
 
 	if (m_args.count(g_strMetadataHash))
 	{
@@ -1229,10 +1187,7 @@ bool CommandLineParser::processArgs()
 		else if (hashStr == g_strNone)
 			m_options.metadata.hash = CompilerStack::MetadataHash::None;
 		else
-		{
-			serr() << "Invalid option for --" << g_strMetadataHash << ": " << hashStr << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Invalid option for --" + g_strMetadataHash + ": " + hashStr);
 	}
 
 	if (m_args.count(g_strModelCheckerContracts))
@@ -1240,10 +1195,7 @@ bool CommandLineParser::processArgs()
 		string contractsStr = m_args[g_strModelCheckerContracts].as<string>();
 		optional<ModelCheckerContracts> contracts = ModelCheckerContracts::fromString(contractsStr);
 		if (!contracts)
-		{
-			serr() << "Invalid option for --" << g_strModelCheckerContracts << ": " << contractsStr << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerContracts + ": " + contractsStr);
 		m_options.modelChecker.settings.contracts = move(*contracts);
 	}
 
@@ -1255,10 +1207,7 @@ bool CommandLineParser::processArgs()
 		string engineStr = m_args[g_strModelCheckerEngine].as<string>();
 		optional<ModelCheckerEngine> engine = ModelCheckerEngine::fromString(engineStr);
 		if (!engine)
-		{
-			serr() << "Invalid option for --" << g_strModelCheckerEngine << ": " << engineStr << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerEngine + ": " + engineStr);
 		m_options.modelChecker.settings.engine = *engine;
 	}
 
@@ -1267,10 +1216,7 @@ bool CommandLineParser::processArgs()
 		string invsStr = m_args[g_strModelCheckerInvariants].as<string>();
 		optional<ModelCheckerInvariants> invs = ModelCheckerInvariants::fromString(invsStr);
 		if (!invs)
-		{
-			serr() << "Invalid option for --" << g_strModelCheckerInvariants << ": " << invsStr << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerInvariants + ": " + invsStr);
 		m_options.modelChecker.settings.invariants = *invs;
 	}
 
@@ -1282,10 +1228,7 @@ bool CommandLineParser::processArgs()
 		string solversStr = m_args[g_strModelCheckerSolvers].as<string>();
 		optional<smtutil::SMTSolverChoice> solvers = smtutil::SMTSolverChoice::fromString(solversStr);
 		if (!solvers)
-		{
-			serr() << "Invalid option for --" << g_strModelCheckerSolvers << ": " << solversStr << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerSolvers + ": " + solversStr);
 		m_options.modelChecker.settings.solvers = *solvers;
 	}
 
@@ -1294,10 +1237,7 @@ bool CommandLineParser::processArgs()
 		string targetsStr = m_args[g_strModelCheckerTargets].as<string>();
 		optional<ModelCheckerTargets> targets = ModelCheckerTargets::fromString(targetsStr);
 		if (!targets)
-		{
-			serr() << "Invalid option for --" << g_strModelCheckerTargets << ": " << targetsStr << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerTargets + ": " + targetsStr);
 		m_options.modelChecker.settings.targets = *targets;
 	}
 
@@ -1319,27 +1259,21 @@ bool CommandLineParser::processArgs()
 		m_options.input.errorRecovery = (m_args.count(g_strErrorRecovery) > 0);
 
 	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport);
-	return true;
 }
 
-bool CommandLineParser::parseCombinedJsonOption()
+void CommandLineParser::parseCombinedJsonOption()
 {
 	if (!m_args.count(g_strCombinedJson))
-		return true;
+		return;
 
 	set<string> requests;
 	for (string const& item: boost::split(requests, m_args[g_strCombinedJson].as<string>(), boost::is_any_of(",")))
 		if (CombinedJsonRequests::componentMap().count(item) == 0)
-		{
-			serr() << "Invalid option to --" << g_strCombinedJson << ": " << item << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Invalid option to --" + g_strCombinedJson + ": " + item);
 
 	m_options.compiler.combinedJsonRequests = CombinedJsonRequests{};
 	for (auto&& [componentName, component]: CombinedJsonRequests::componentMap())
 		m_options.compiler.combinedJsonRequests.value().*component = (requests.count(componentName) > 0);
-
-	return true;
 }
 
 size_t CommandLineParser::countEnabledOptions(vector<string> const& _optionNames) const
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index a1d13c6907..33a4a24552 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -234,7 +234,7 @@ struct CommandLineOptions
 };
 
 /// Parses the command-line arguments and produces a filled-out CommandLineOptions structure.
-/// Validates provided values and prints error messages in case of errors.
+/// Validates provided values and reports errors by throwing @p CommandLineValidationErrors.
 class CommandLineParser
 {
 public:
@@ -243,12 +243,9 @@ class CommandLineParser
 	{}
 
 	/// Parses the command-line arguments and fills out the internal CommandLineOptions structure.
-	/// Performs validation and prints error messages.
-	/// @return true if there were no validation errors when parsing options and the
-	/// CommandLineOptions structure has been fully initialized. false if there were errors - in
-	/// this case CommandLineOptions may be only partially filled out. May also return false if
-	/// there is not further processing necessary and the program should just exit.
-	bool parse(int _argc, char const* const* _argv);
+	/// @throws CommandLineValidationError if the arguments cannot be properly parsed or are invalid.
+	/// When an exception is thrown, the @p CommandLineOptions may be only partially filled out.
+	void parse(int _argc, char const* const* _argv);
 
 	CommandLineOptions const& options() const { return m_options; }
 
@@ -269,30 +266,29 @@ class CommandLineParser
 	/// Uses boost::program_options to parse the command-line arguments and leaves the result in @a m_args.
 	/// Also handles the arguments that result in information being printed followed by immediate exit.
 	/// @returns false if parsing fails due to syntactical errors or the arguments not matching the description.
-	bool parseArgs(int _argc, char const* const* _argv);
+	void parseArgs(int _argc, char const* const* _argv);
 
 	/// Validates parsed arguments stored in @a m_args and fills out the internal CommandLineOptions
 	/// structure.
-	/// @return false if there are any validation errors, true otherwise.
-	bool processArgs();
+	/// @throws CommandLineValidationError in case of validation errors.
+	void processArgs();
 
 	/// Parses the value supplied to --combined-json.
-	/// @return false if there are any validation errors, true otherwise.
-	bool parseCombinedJsonOption();
+	/// @throws CommandLineValidationError in case of validation errors.
+	void parseCombinedJsonOption();
 
-	/// Parses the names of the input files, remappings for all modes except for Standard JSON.
-	/// Does not check if files actually exist.
-	/// @return false if there are any validation errors, true otherwise.
-	bool parseInputPathsAndRemappings();
+	/// Parses the names of the input files, remappings. Does not check if the files actually exist.
+	/// @throws CommandLineValidationError in case of validation errors.
+	void parseInputPathsAndRemappings();
 
 	/// Tries to read from the file @a _input or interprets @a _input literally if that fails.
-	/// It then tries to parse the contents and appends to m_options.libraries.
-	/// @return false if there are any validation errors, true otherwise.
-	bool parseLibraryOption(std::string const& _input);
+	/// It then tries to parse the contents and appends to @a m_options.libraries.
+	/// @throws CommandLineValidationError in case of validation errors.
+	void parseLibraryOption(std::string const& _input);
 
-	bool parseOutputSelection();
+	void parseOutputSelection();
 
-	bool checkMutuallyExclusive(std::vector<std::string> const& _optionNames);
+	void checkMutuallyExclusive(std::vector<std::string> const& _optionNames);
 	size_t countEnabledOptions(std::vector<std::string> const& _optionNames) const;
 	static std::string joinOptionNames(std::vector<std::string> const& _optionNames, std::string _separator = ", ");
 
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 23ea1efb16..385ab279aa 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -19,6 +19,7 @@
 /// Unit tests for solc/CommandLineParser.h
 
 #include <solc/CommandLineParser.h>
+#include <solc/Exceptions.h>
 
 #include <test/solc/Common.h>
 
@@ -46,17 +47,14 @@ using namespace solidity::yul;
 namespace
 {
 
-optional<CommandLineOptions> parseCommandLine(vector<string> const& _commandLine, ostream& _stderr)
+CommandLineOptions parseCommandLine(vector<string> const& _commandLine)
 {
 	vector<char const*> argv = test::makeArgv(_commandLine);
 
-	CommandLineParser cliParser(_stderr);
-	bool success = cliParser.parse(static_cast<int>(_commandLine.size()), argv.data());
-
-	if (!success)
-		return nullopt;
-	else
-		return cliParser.options();
+	stringstream serr;
+	CommandLineParser cliParser(serr);
+	cliParser.parse(static_cast<int>(_commandLine.size()), argv.data());
+	return cliParser.options();
 }
 
 } // namespace
@@ -75,12 +73,9 @@ BOOST_AUTO_TEST_CASE(no_options)
 	expectedOptions.modelChecker.initialize = true;
 	expectedOptions.modelChecker.settings = {};
 
-	stringstream serr;
-	optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, serr);
+	CommandLineOptions parsedOptions = parseCommandLine(commandLine);
 
-	BOOST_TEST(serr.str() == "");
-	BOOST_REQUIRE(parsedOptions.has_value());
-	BOOST_TEST(parsedOptions.value() == expectedOptions);
+	BOOST_TEST(parsedOptions == expectedOptions);
 }
 
 BOOST_AUTO_TEST_CASE(help_license_version)
@@ -93,15 +88,12 @@ BOOST_AUTO_TEST_CASE(help_license_version)
 
 	for (auto const& [option, expectedMode]: expectedModePerOption)
 	{
-		stringstream serr;
-		optional<CommandLineOptions> parsedOptions = parseCommandLine({"solc", option}, serr);
+		CommandLineOptions parsedOptions = parseCommandLine({"solc", option});
 
 		CommandLineOptions expectedOptions;
 		expectedOptions.input.mode = expectedMode;
 
-		BOOST_TEST(serr.str() == "");
-		BOOST_REQUIRE(parsedOptions.has_value());
-		BOOST_TEST(parsedOptions.value() == expectedOptions);
+		BOOST_TEST(parsedOptions == expectedOptions);
 	}
 }
 
@@ -226,12 +218,9 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			5,
 		};
 
-		stringstream serr;
-		optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, serr);
+		CommandLineOptions parsedOptions = parseCommandLine(commandLine);
 
-		BOOST_TEST(serr.str() == "");
-		BOOST_REQUIRE(parsedOptions.has_value());
-		BOOST_TEST(parsedOptions.value() == expectedOptions);
+		BOOST_TEST(parsedOptions == expectedOptions);
 	}
 }
 
@@ -352,12 +341,9 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 			expectedOptions.optimizer.expectedExecutionsPerDeployment = 1000;
 		}
 
-		stringstream serr;
-		optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, serr);
+		CommandLineOptions parsedOptions = parseCommandLine(commandLine);
 
-		BOOST_TEST(serr.str() == "Warning: Yul is still experimental. Please use the output with care.\n");
-		BOOST_REQUIRE(parsedOptions.has_value());
-		BOOST_TEST(parsedOptions.value() == expectedOptions);
+		BOOST_TEST(parsedOptions == expectedOptions);
 	}
 }
 
@@ -420,12 +406,9 @@ BOOST_AUTO_TEST_CASE(standard_json_mode_options)
 	expectedOptions.compiler.combinedJsonRequests->abi = true;
 	expectedOptions.compiler.combinedJsonRequests->binary = true;
 
-	stringstream serr;
-	optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, serr);
+	CommandLineOptions parsedOptions = parseCommandLine(commandLine);
 
-	BOOST_TEST(serr.str() == "");
-	BOOST_REQUIRE(parsedOptions.has_value());
-	BOOST_TEST(parsedOptions.value() == expectedOptions);
+	BOOST_TEST(parsedOptions == expectedOptions);
 }
 
 BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
@@ -441,10 +424,11 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 		{
 			stringstream serr;
 			vector<string> commandLine = {"solc", optionName, "file", inputMode};
-			optional<CommandLineOptions> parsedOptions = parseCommandLine(commandLine, serr);
 
-			BOOST_TEST(serr.str() == "The following options are not supported in the current input mode: " + optionName + "\n");
-			BOOST_REQUIRE(!parsedOptions.has_value());
+			string expectedMessage = "The following options are not supported in the current input mode: " + optionName;
+			auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedMessage; };
+
+			BOOST_CHECK_EXCEPTION(parseCommandLine(commandLine), CommandLineValidationError, hasCorrectMessage);
 		}
 }
 

From 16f62ed43e58a889ac9b51dc93b776712402fcd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 11 Oct 2021 14:20:56 +0200
Subject: [PATCH 0116/1748] Move the Yul experimental warning from
 CommandLineParser to CommandLineInterface and remove stderr from the parser

---
 solc/CommandLineInterface.cpp   |  5 +++--
 solc/CommandLineParser.cpp      | 12 ------------
 solc/CommandLineParser.h        | 14 --------------
 test/solc/CommandLineParser.cpp |  3 +--
 4 files changed, 4 insertions(+), 30 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 78e60ad0cb..2c7c274f58 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -583,7 +583,7 @@ void CommandLineInterface::createJson(string const& _fileName, string const& _js
 
 bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
 {
-	CommandLineParser parser(serr(/* _markAsUsed */ false));
+	CommandLineParser parser;
 
 	if (isatty(fileno(stdin)) && _argc == 1)
 	{
@@ -604,7 +604,6 @@ bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
 		return false;
 	}
 
-	m_hasOutput = m_hasOutput || parser.hasOutput();
 	m_options = parser.options();
 
 	return true;
@@ -1003,6 +1002,8 @@ bool CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 {
 	solAssert(m_options.input.mode == InputMode::Assembler, "");
 
+	serr() << "Warning: Yul is still experimental. Please use the output with care." << endl;
+
 	bool successful = true;
 	map<string, yul::AssemblyStack> assemblyStacks;
 	for (auto const& src: m_fileReader.sourceCodes())
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index cdd74a2172..87348686c6 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -38,14 +38,6 @@ namespace po = boost::program_options;
 namespace solidity::frontend
 {
 
-ostream& CommandLineParser::serr()
-{
-	m_hasOutput = true;
-	return m_serr;
-}
-
-#define cerr
-
 static string const g_strAllowPaths = "allow-paths";
 static string const g_strBasePath = "base-path";
 static string const g_strIncludePath = "include-path";
@@ -278,8 +270,6 @@ OptimiserSettings CommandLineOptions::optimiserSettings() const
 
 void CommandLineParser::parse(int _argc, char const* const* _argv)
 {
-	m_hasOutput = false;
-
 	parseArgs(_argc, _argv);
 	processArgs();
 }
@@ -1167,8 +1157,6 @@ void CommandLineParser::processArgs()
 				"The selected input language is not directly supported when targeting the Ewasm machine "
 				"and automatic translation is not available."
 			);
-
-		serr() << "Warning: Yul is still experimental. Please use the output with care." << endl;
 		return;
 	}
 	else if (countEnabledOptions({g_strYulDialect, g_strMachine}) >= 1)
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 33a4a24552..c1a95a11f9 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -238,10 +238,6 @@ struct CommandLineOptions
 class CommandLineParser
 {
 public:
-	explicit CommandLineParser(std::ostream& _serr):
-		m_serr(_serr)
-	{}
-
 	/// Parses the command-line arguments and fills out the internal CommandLineOptions structure.
 	/// @throws CommandLineValidationError if the arguments cannot be properly parsed or are invalid.
 	/// When an exception is thrown, the @p CommandLineOptions may be only partially filled out.
@@ -249,9 +245,6 @@ class CommandLineParser
 
 	CommandLineOptions const& options() const { return m_options; }
 
-	/// Returns true if the parser has written anything to any of its output streams.
-	bool hasOutput() const { return m_hasOutput; }
-
 	static void printHelp(std::ostream& _out) { _out << optionsDescription(); }
 
 private:
@@ -292,13 +285,6 @@ class CommandLineParser
 	size_t countEnabledOptions(std::vector<std::string> const& _optionNames) const;
 	static std::string joinOptionNames(std::vector<std::string> const& _optionNames, std::string _separator = ", ");
 
-	/// Returns the stream that should receive error output. Sets m_hasOutput to true if the
-	/// stream has ever been used.
-	std::ostream& serr();
-
-	std::ostream& m_serr;
-	bool m_hasOutput = false;
-
 	CommandLineOptions m_options;
 
 	/// Map of command-line arguments produced by boost::program_options.
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 385ab279aa..c2eab23557 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -51,8 +51,7 @@ CommandLineOptions parseCommandLine(vector<string> const& _commandLine)
 {
 	vector<char const*> argv = test::makeArgv(_commandLine);
 
-	stringstream serr;
-	CommandLineParser cliParser(serr);
+	CommandLineParser cliParser;
 	cliParser.parse(static_cast<int>(_commandLine.size()), argv.data());
 	return cliParser.options();
 }

From e829bcd93370d7caddae9458e75bdea3e4fec9ab Mon Sep 17 00:00:00 2001
From: neel iyer <33139997+spiyer99@users.noreply.github.com>
Date: Sun, 15 Aug 2021 11:14:38 +1000
Subject: [PATCH 0117/1748] CommandLineInterface: Replace code that prints to
 serr() and returns false with CommandLineValidationError exception

---
 solc/CommandLineInterface.cpp | 77 ++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 43 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 2c7c274f58..5aeaa02c26 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -420,16 +420,10 @@ bool CommandLineInterface::readInputFiles()
 	if (m_fileReader.basePath() != "")
 	{
 		if (!boost::filesystem::exists(m_fileReader.basePath()))
-		{
-			serr() << "Base path does not exist: " << m_fileReader.basePath() << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Base path does not exist: \"" + m_fileReader.basePath().string() + '"');
 
 		if (!boost::filesystem::is_directory(m_fileReader.basePath()))
-		{
-			serr() << "Base path is not a directory: " << m_fileReader.basePath() << endl;
-			return false;
-		}
+			solThrow(CommandLineValidationError, "Base path is not a directory: \"" + m_fileReader.basePath().string() + '"');
 	}
 
 	for (boost::filesystem::path const& includePath: m_options.input.includePaths)
@@ -444,16 +438,18 @@ bool CommandLineInterface::readInputFiles()
 	{
 		auto pathToQuotedString = [](boost::filesystem::path const& _path){ return "\"" + _path.string() + "\""; };
 
-		serr() << "Source unit name collision detected. ";
-		serr() << "The specified values of base path and/or include paths would result in multiple ";
-		serr() << "input files being assigned the same source unit name:" << endl;
+		string message =
+			"Source unit name collision detected. "
+			"The specified values of base path and/or include paths would result in multiple "
+			"input files being assigned the same source unit name:\n";
+
 		for (auto const& [sourceUnitName, normalizedInputPaths]: collisions)
 		{
-			serr() << sourceUnitName << " matches: ";
-			serr() << joinHumanReadable(normalizedInputPaths | ranges::views::transform(pathToQuotedString)) << endl;
+			message += sourceUnitName + " matches: ";
+			message += joinHumanReadable(normalizedInputPaths | ranges::views::transform(pathToQuotedString)) + "\n";
 		}
 
-		return false;
+		solThrow(CommandLineValidationError, message);
 	}
 
 	for (boost::filesystem::path const& infile: m_options.input.paths)
@@ -461,10 +457,7 @@ bool CommandLineInterface::readInputFiles()
 		if (!boost::filesystem::exists(infile))
 		{
 			if (!m_options.input.ignoreMissingFiles)
-			{
-				serr() << infile << " is not found." << endl;
-				return false;
-			}
+				solThrow(CommandLineValidationError, '"' + infile.string() + "\" is not found.");
 			else
 				serr() << infile << " is not found. Skipping." << endl;
 
@@ -474,10 +467,7 @@ bool CommandLineInterface::readInputFiles()
 		if (!boost::filesystem::is_regular_file(infile))
 		{
 			if (!m_options.input.ignoreMissingFiles)
-			{
-				serr() << infile << " is not a valid file." << endl;
-				return false;
-			}
+				solThrow(CommandLineValidationError, '"' + infile.string() + "\" is not a valid file.");
 			else
 				serr() << infile << " is not a valid file. Skipping." << endl;
 
@@ -510,10 +500,7 @@ bool CommandLineInterface::readInputFiles()
 	}
 
 	if (m_fileReader.sourceCodes().empty() && !m_standardJsonInput.has_value())
-	{
-		serr() << "All specified input files either do not exist or are not regular files." << endl;
-		return false;
-	}
+		solThrow(CommandLineValidationError, "All specified input files either do not exist or are not regular files.");
 
 	return true;
 }
@@ -647,7 +634,8 @@ bool CommandLineInterface::processInput()
 		outputCompilationResults();
 	}
 
-	return !m_outputFailed;
+	if (m_outputFailed)
+		solThrow(CommandLineOutputError, "Failed to write all output files to disk.");
 }
 
 void CommandLineInterface::printVersion()
@@ -726,8 +714,7 @@ bool CommandLineInterface::compile()
 			}
 			catch (Exception const& _exc)
 			{
-				serr() << string("Failed to import AST: ") << _exc.what() << endl;
-				return false;
+				solThrow(CommandLineExecutionError, "Failed to import AST: "s + _exc.what());
 			}
 		}
 		else
@@ -744,26 +731,28 @@ bool CommandLineInterface::compile()
 			formatter.printErrorInformation(*error);
 		}
 
-		if (!successful)
-			return m_options.input.errorRecovery;
+		if (!successful && !m_options.input.errorRecovery)
+			solThrow(CommandLineExecutionError, "");
 	}
 	catch (CompilerError const& _exception)
 	{
 		m_hasOutput = true;
 		formatter.printExceptionInformation(_exception, "Compiler error");
-		return false;
+		solThrow(CommandLineExecutionError, "");
 	}
 	catch (Error const& _error)
 	{
 		if (_error.type() == Error::Type::DocstringParsingError)
-			serr() << "Documentation parsing error: " << *boost::get_error_info<errinfo_comment>(_error) << endl;
+		{
+			serr() << *boost::get_error_info<errinfo_comment>(_error);
+			solThrow(CommandLineExecutionError, "Documentation parsing failed.");
+		}
 		else
 		{
 			m_hasOutput = true;
 			formatter.printExceptionInformation(_error, _error.typeName());
+			solThrow(CommandLineExecutionError, "");
 		}
-
-		return false;
 	}
 
 	return true;
@@ -933,11 +922,11 @@ bool CommandLineInterface::link()
 				*(it + placeholderSize - 2) != '_' ||
 				*(it + placeholderSize - 1) != '_'
 			)
-			{
-				serr() << "Error in binary object file " << src.first << " at position " << (it - src.second.begin()) << endl;
-				serr() << '"' << string(it, it + min(placeholderSize, static_cast<int>(end - it))) << "\" is not a valid link reference." << endl;
-				return false;
-			}
+				solThrow(
+					CommandLineExecutionError,
+					"Error in binary object file " + src.first + " at position " + to_string(it - src.second.begin()) + "\n" +
+					'"' + string(it, it + min(placeholderSize, static_cast<int>(end - it))) + "\" is not a valid link reference."
+				);
 
 			string foundPlaceholder(it, it + placeholderSize);
 			if (librariesReplacements.count(foundPlaceholder))
@@ -973,9 +962,8 @@ void CommandLineInterface::writeLinkedFiles()
 			outFile << src.second;
 			if (!outFile)
 			{
-				serr() << "Could not write to file " << src.first << ". Aborting." << endl;
 				m_outputFailed = true;
-				return;
+				solThrow(CommandLineOutputError, "Could not write to file " + src.first + ". Aborting.");
 			}
 		}
 	sout() << "Linking completed." << endl;
@@ -1041,7 +1029,10 @@ bool CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 	}
 
 	if (!successful)
-		return false;
+	{
+		solAssert(m_hasOutput);
+		solThrow(CommandLineExecutionError, "");
+	}
 
 	for (auto const& src: m_fileReader.sourceCodes())
 	{

From c8380c25bb4123d174f6c550c8b163fbcde8f36f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 12 Oct 2021 14:16:29 +0200
Subject: [PATCH 0118/1748] CommandLineInterface: Update control flow to
 accommodate the new way of reporting errors

---
 solc/CommandLineInterface.cpp                |  70 +++----
 solc/CommandLineInterface.h                  |  32 +++-
 solc/main.cpp                                |   7 +-
 test/solc/CommandLineInterface.cpp           | 191 +++++++++----------
 test/solc/CommandLineInterfaceAllowPaths.cpp |   6 +-
 test/solc/Common.cpp                         |  28 ++-
 test/solc/Common.h                           |  20 +-
 7 files changed, 196 insertions(+), 158 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 5aeaa02c26..08b45c6ee0 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -404,7 +404,7 @@ void CommandLineInterface::handleGasEstimation(string const& _contract)
 	}
 }
 
-bool CommandLineInterface::readInputFiles()
+void CommandLineInterface::readInputFiles()
 {
 	solAssert(!m_standardJsonInput.has_value(), "");
 
@@ -413,7 +413,7 @@ bool CommandLineInterface::readInputFiles()
 		m_options.input.mode == InputMode::License ||
 		m_options.input.mode == InputMode::Version
 	)
-		return true;
+		return;
 
 	m_fileReader.setBasePath(m_options.input.basePath);
 
@@ -501,8 +501,6 @@ bool CommandLineInterface::readInputFiles()
 
 	if (m_fileReader.sourceCodes().empty() && !m_standardJsonInput.has_value())
 		solThrow(CommandLineValidationError, "All specified input files either do not exist or are not regular files.");
-
-	return true;
 }
 
 map<string, Json::Value> CommandLineInterface::parseAstFromInput()
@@ -568,6 +566,30 @@ void CommandLineInterface::createJson(string const& _fileName, string const& _js
 	createFile(boost::filesystem::basename(_fileName) + string(".json"), _json);
 }
 
+bool CommandLineInterface::run(int _argc, char const* const* _argv)
+{
+	try
+	{
+		if (!parseArguments(_argc, _argv))
+			return false;
+
+		readInputFiles();
+		processInput();
+		return true;
+	}
+	catch (CommandLineError const& _exception)
+	{
+		m_hasOutput = true;
+
+		// There might be no message in the exception itself if the error output is bulky and has
+		// already been printed to stderr (this happens e.g. for compiler errors).
+		if (_exception.what() != ""s)
+			serr() << _exception.what() << endl;
+
+		return false;
+	}
+}
+
 bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
 {
 	CommandLineParser parser;
@@ -581,22 +603,13 @@ bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
 		return false;
 	}
 
-	try
-	{
-		parser.parse(_argc, _argv);
-	}
-	catch (CommandLineValidationError const& _exception)
-	{
-		serr() << _exception.what() << endl;
-		return false;
-	}
-
+	parser.parse(_argc, _argv);
 	m_options = parser.options();
 
 	return true;
 }
 
-bool CommandLineInterface::processInput()
+void CommandLineInterface::processInput()
 {
 	switch (m_options.input.mode)
 	{
@@ -619,18 +632,15 @@ bool CommandLineInterface::processInput()
 		break;
 	}
 	case InputMode::Assembler:
-		if (!assemble(m_options.assembly.inputLanguage, m_options.assembly.targetMachine))
-			return false;
+		assemble(m_options.assembly.inputLanguage, m_options.assembly.targetMachine);
 		break;
 	case InputMode::Linker:
-		if (!link())
-			return false;
+		link();
 		writeLinkedFiles();
 		break;
 	case InputMode::Compiler:
 	case InputMode::CompilerWithASTImport:
-		if (!compile())
-			return false;
+		compile();
 		outputCompilationResults();
 	}
 
@@ -651,7 +661,7 @@ void CommandLineInterface::printLicense()
 	sout() << licenseText << endl;
 }
 
-bool CommandLineInterface::compile()
+void CommandLineInterface::compile()
 {
 	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
 
@@ -714,6 +724,8 @@ bool CommandLineInterface::compile()
 			}
 			catch (Exception const& _exc)
 			{
+				// FIXME: AST import is missing proper validations. This hack catches failing
+				// assertions and presents them as if they were compiler errors.
 				solThrow(CommandLineExecutionError, "Failed to import AST: "s + _exc.what());
 			}
 		}
@@ -754,8 +766,6 @@ bool CommandLineInterface::compile()
 			solThrow(CommandLineExecutionError, "");
 		}
 	}
-
-	return true;
 }
 
 void CommandLineInterface::handleCombinedJSON()
@@ -884,7 +894,7 @@ void CommandLineInterface::handleAst()
 	}
 }
 
-bool CommandLineInterface::link()
+void CommandLineInterface::link()
 {
 	solAssert(m_options.input.mode == InputMode::Linker, "");
 
@@ -945,8 +955,6 @@ bool CommandLineInterface::link()
 			src.second.resize(src.second.size() - 1);
 	}
 	m_fileReader.setSources(move(sourceCodes));
-
-	return true;
 }
 
 void CommandLineInterface::writeLinkedFiles()
@@ -986,7 +994,7 @@ string CommandLineInterface::objectWithLinkRefsHex(evmasm::LinkerObject const& _
 	return out;
 }
 
-bool CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul::AssemblyStack::Machine _targetMachine)
+void CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul::AssemblyStack::Machine _targetMachine)
 {
 	solAssert(m_options.input.mode == InputMode::Assembler, "");
 
@@ -1090,8 +1098,6 @@ bool CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 				serr() << "No text representation found." << endl;
 		}
 	}
-
-	return true;
 }
 
 void CommandLineInterface::outputCompilationResults()
@@ -1128,13 +1134,9 @@ void CommandLineInterface::outputCompilationResults()
 				ret = m_compiler->assemblyString(contract, m_fileReader.sourceCodes());
 
 			if (!m_options.output.dir.empty())
-			{
 				createFile(m_compiler->filesystemFriendlyName(contract) + (m_options.compiler.outputs.asmJson ? "_evm.json" : ".evm"), ret);
-			}
 			else
-			{
 				sout() << "EVM assembly:" << endl << ret << endl;
-			}
 		}
 
 		if (m_options.compiler.estimateGas)
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index ee50574682..fc584001f7 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -51,12 +51,28 @@ class CommandLineInterface
 		m_options(_options)
 	{}
 
-	/// Parse command line arguments and return false if we should not continue
+	/// Parses command-line arguments, executes the requested operation and handles validation and
+	/// execution errors.
+	/// @returns false if it catches a @p CommandLineValidationError or if the application is
+	/// expected to exit with a non-zero exit code despite there being no error.
+	bool run(int _argc, char const* const* _argv);
+
+	/// Parses command line arguments and stores the result in @p m_options.
+	/// @throws CommandLineValidationError if command-line arguments are invalid.
+	/// @returns false if the application is expected to exit with a non-zero exit code despite
+	/// there being no error.
 	bool parseArguments(int _argc, char const* const* _argv);
-	/// Read the content of all input files and initialize the file reader.
-	bool readInputFiles();
-	/// Parse the files, create source code objects, print the output.
-	bool processInput();
+
+	/// Reads the content of all input files and initializes the file reader.
+	/// @throws CommandLineValidationError if it fails to read the input files (invalid paths,
+	/// non-existent files, not enough or too many input files, etc.).
+	void readInputFiles();
+
+	/// Executes the requested operation (compilation, assembling, standard JSON, etc.) and prints
+	/// results to the terminal.
+	/// @throws CommandLineExecutionError if execution fails due to errors in the input files.
+	/// @throws CommandLineOutputError if creating output files or writing to them fails.
+	void processInput();
 
 	CommandLineOptions const& options() const { return m_options; }
 	FileReader const& fileReader() const { return m_fileReader; }
@@ -65,15 +81,15 @@ class CommandLineInterface
 private:
 	void printVersion();
 	void printLicense();
-	bool compile();
-	bool link();
+	void compile();
+	void link();
 	void writeLinkedFiles();
 	/// @returns the ``// <identifier> -> name`` hint for library placeholders.
 	static std::string libraryPlaceholderHint(std::string const& _libraryName);
 	/// @returns the full object with library placeholder hints in hex.
 	static std::string objectWithLinkRefsHex(evmasm::LinkerObject const& _obj);
 
-	bool assemble(yul::AssemblyStack::Language _language, yul::AssemblyStack::Machine _targetMachine);
+	void assemble(yul::AssemblyStack::Language _language, yul::AssemblyStack::Machine _targetMachine);
 
 	void outputCompilationResults();
 
diff --git a/solc/main.cpp b/solc/main.cpp
index 874ee13ca8..ce69d20a79 100644
--- a/solc/main.cpp
+++ b/solc/main.cpp
@@ -62,12 +62,7 @@ int main(int argc, char** argv)
 	{
 		setDefaultOrCLocale();
 		solidity::frontend::CommandLineInterface cli(cin, cout, cerr);
-		bool success =
-			cli.parseArguments(argc, argv) &&
-			cli.readInputFiles() &&
-			cli.processInput();
-
-		return success ? 0 : 1;
+		return cli.run(argc, argv) ? 0 : 1;
 	}
 	catch (smtutil::SMTLogicError const& _exception)
 	{
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 0269ec462f..dbffc47889 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -19,6 +19,7 @@
 /// Unit tests for solc/CommandLineInterface.h
 
 #include <solc/CommandLineInterface.h>
+#include <solc/Exceptions.h>
 
 #include <test/solc/Common.h>
 
@@ -114,7 +115,7 @@ BOOST_AUTO_TEST_SUITE(CommandLineInterfaceTest)
 
 BOOST_AUTO_TEST_CASE(help)
 {
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({"solc", "--help"}, "", /* _processInput */ true);
+	OptionsReaderAndMessages result = runCLI({"solc", "--help"}, "");
 
 	BOOST_TEST(result.success);
 	BOOST_TEST(boost::starts_with(result.stdoutContent, "solc, the Solidity commandline compiler."));
@@ -124,7 +125,7 @@ BOOST_AUTO_TEST_CASE(help)
 
 BOOST_AUTO_TEST_CASE(license)
 {
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({"solc", "--license"}, "", /* _processInput */ true);
+	OptionsReaderAndMessages result = runCLI({"solc", "--license"}, "");
 
 	BOOST_TEST(result.success);
 	BOOST_TEST(boost::starts_with(result.stdoutContent, "Most of the code is licensed under GPLv3"));
@@ -134,7 +135,7 @@ BOOST_AUTO_TEST_CASE(license)
 
 BOOST_AUTO_TEST_CASE(version)
 {
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({"solc", "--version"}, "", /* _processInput */ true);
+	OptionsReaderAndMessages result = runCLI({"solc", "--version"}, "");
 
 	BOOST_TEST(result.success);
 	BOOST_TEST(boost::ends_with(result.stdoutContent, "Version: " + solidity::frontend::VersionString + "\n"));
@@ -158,17 +159,16 @@ BOOST_AUTO_TEST_CASE(multiple_input_modes)
 	string expectedMessage =
 		"The following options are mutually exclusive: "
 		"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast. "
-		"Select at most one.\n";
+		"Select at most one.";
 
 	for (string const& mode1: inputModeOptions)
 		for (string const& mode2: inputModeOptions)
 			if (mode1 != mode2)
-			{
-				vector<string> commandLine = {"solc", mode1, mode2};
-				OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-				BOOST_TEST(!result.success);
-				BOOST_TEST(result.stderrContent == expectedMessage);
-			}
+				BOOST_CHECK_EXCEPTION(
+					parseCommandLineAndReadInputFiles({"solc", mode1, mode2}),
+					CommandLineValidationError,
+					[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+				);
 }
 
 BOOST_AUTO_TEST_CASE(cli_input)
@@ -253,7 +253,7 @@ BOOST_AUTO_TEST_CASE(cli_ignore_missing_no_files_exist)
 		"\"" + (tempDir.path() / "input2.sol").string() + "\" is not found. Skipping.\n"
 		"All specified input files either do not exist or are not regular files.\n";
 
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({
+	OptionsReaderAndMessages result = runCLI({
 		"solc",
 		(tempDir.path() / "input1.sol").string(),
 		(tempDir.path() / "input2.sol").string(),
@@ -267,11 +267,13 @@ BOOST_AUTO_TEST_CASE(cli_not_a_file)
 {
 	TemporaryDirectory tempDir(TEST_CASE_NAME);
 
-	string expectedMessage = "\"" + tempDir.path().string() + "\" is not a valid file.\n";
+	string expectedMessage = "\"" + tempDir.path().string() + "\" is not a valid file.";
 
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({"solc", tempDir.path().string()});
-	BOOST_TEST(!result.success);
-	BOOST_TEST(result.stderrContent == expectedMessage);
+	BOOST_CHECK_EXCEPTION(
+		parseCommandLineAndReadInputFiles({"solc", tempDir.path().string()}),
+		CommandLineValidationError,
+		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+	);
 }
 
 BOOST_AUTO_TEST_CASE(standard_json_base_path)
@@ -336,24 +338,26 @@ BOOST_AUTO_TEST_CASE(standard_json_two_input_files)
 {
 	string expectedMessage =
 		"Too many input files for --standard-json.\n"
-		"Please either specify a single file name or provide its content on standard input.\n";
+		"Please either specify a single file name or provide its content on standard input.";
 
-	vector<string> commandLine = {"solc", "--standard-json", "input1.json", "input2.json"};
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-	BOOST_TEST(!result.success);
-	BOOST_TEST(result.stderrContent == expectedMessage);
+	BOOST_CHECK_EXCEPTION(
+		parseCommandLineAndReadInputFiles({"solc", "--standard-json", "input1.json", "input2.json"}),
+		CommandLineValidationError,
+		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+	);
 }
 
 BOOST_AUTO_TEST_CASE(standard_json_one_input_file_and_stdin)
 {
 	string expectedMessage =
 		"Too many input files for --standard-json.\n"
-		"Please either specify a single file name or provide its content on standard input.\n";
+		"Please either specify a single file name or provide its content on standard input.";
 
-	vector<string> commandLine = {"solc", "--standard-json", "input1.json", "-"};
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-	BOOST_TEST(!result.success);
-	BOOST_TEST(result.stderrContent == expectedMessage);
+	BOOST_CHECK_EXCEPTION(
+		parseCommandLineAndReadInputFiles({"solc", "--standard-json", "input1.json", "-"}),
+		CommandLineValidationError,
+		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+	);
 }
 
 BOOST_AUTO_TEST_CASE(standard_json_ignore_missing)
@@ -362,29 +366,31 @@ BOOST_AUTO_TEST_CASE(standard_json_ignore_missing)
 
 	// This option is pretty much useless Standard JSON mode.
 	string expectedMessage =
-		"\"" + (tempDir.path() / "input.json").string() + "\" is not found. Skipping.\n"
-		"All specified input files either do not exist or are not regular files.\n";
+		"All specified input files either do not exist or are not regular files.";
 
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({
-		"solc",
-		"--standard-json",
-		(tempDir.path() / "input.json").string(),
-		"--ignore-missing",
-	});
-	BOOST_TEST(!result.success);
-	BOOST_TEST(result.stderrContent == expectedMessage);
+	BOOST_CHECK_EXCEPTION(
+		parseCommandLineAndReadInputFiles({
+			"solc",
+			"--standard-json",
+			(tempDir.path() / "input.json").string(),
+			"--ignore-missing",
+		}),
+		CommandLineValidationError,
+		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+	);
 }
 
 BOOST_AUTO_TEST_CASE(standard_json_remapping)
 {
 	string expectedMessage =
 		"Import remappings are not accepted on the command line in Standard JSON mode.\n"
-		"Please put them under 'settings.remappings' in the JSON input.\n";
+		"Please put them under 'settings.remappings' in the JSON input.";
 
-	vector<string> commandLine = {"solc", "--standard-json", "a=b"};
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-	BOOST_TEST(!result.success);
-	BOOST_TEST(result.stderrContent == expectedMessage);
+	BOOST_CHECK_EXCEPTION(
+		parseCommandLineAndReadInputFiles({"solc", "--standard-json", "a=b"}),
+		CommandLineValidationError,
+		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+	);
 }
 
 BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_no_base_path)
@@ -997,11 +1003,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 		canonicalWorkDir / "lib",
 	};
 
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(
-		commandLine,
-		"",
-		true /* _processInput */
-	);
+	OptionsReaderAndMessages result = runCLI(commandLine, "");
 
 	BOOST_TEST(result.stderrContent == "");
 	BOOST_TEST(result.stdoutContent == "");
@@ -1087,11 +1089,7 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 
 	FileReader::FileSystemPathSet expectedAllowedDirectories = {};
 
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(
-		commandLine,
-		standardJsonInput,
-		true /* _processInput */
-	);
+	OptionsReaderAndMessages result = runCLI(commandLine, standardJsonInput);
 
 	Json::Value parsedStdout;
 	string jsonParsingErrors;
@@ -1119,18 +1117,19 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_empty_path)
 	TemporaryWorkingDirectory tempWorkDir(tempDir);
 	createFilesWithParentDirs({tempDir.path() / "base/main.sol"});
 
-	string expectedMessage = "Empty values are not allowed in --include-path.\n";
+	string expectedMessage = "Empty values are not allowed in --include-path.";
 
-	vector<string> commandLine = {
-		"solc",
-		"--base-path=base/",
-		"--include-path", "include/",
-		"--include-path", "",
-		"base/main.sol",
-	};
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-	BOOST_TEST(!result.success);
-	BOOST_TEST(result.stderrContent == expectedMessage);
+	BOOST_CHECK_EXCEPTION(
+		parseCommandLineAndReadInputFiles({
+			"solc",
+			"--base-path=base/",
+			"--include-path", "include/",
+			"--include-path", "",
+			"base/main.sol",
+		}),
+		CommandLineValidationError,
+		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+	);
 }
 
 BOOST_AUTO_TEST_CASE(cli_include_paths_without_base_path)
@@ -1139,12 +1138,13 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_without_base_path)
 	TemporaryWorkingDirectory tempWorkDir(tempDir);
 	createFilesWithParentDirs({tempDir.path() / "contract.sol"});
 
-	string expectedMessage = "--include-path option requires a non-empty base path.\n";
+	string expectedMessage = "--include-path option requires a non-empty base path.";
 
-	vector<string> commandLine = {"solc", "--include-path", "include/", "contract.sol"};
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-	BOOST_TEST(!result.success);
-	BOOST_TEST(result.stderrContent == expectedMessage);
+	BOOST_CHECK_EXCEPTION(
+		parseCommandLineAndReadInputFiles({"solc", "--include-path", "include/", "contract.sol"}),
+		CommandLineValidationError,
+		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+	);
 }
 
 BOOST_AUTO_TEST_CASE(cli_include_paths_should_detect_source_unit_name_collisions)
@@ -1173,35 +1173,37 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_should_detect_source_unit_name_collisions
 
 	{
 		// import "contract1.sol" and import "contract2.sol" would be ambiguous:
-		vector<string> commandLine = {
-			"solc",
-			"--base-path=dir1/",
-			"--include-path=dir2/",
-			"dir1/contract1.sol",
-			"dir2/contract1.sol",
-			"dir1/contract2.sol",
-			"dir2/contract2.sol",
-		};
-		OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-		BOOST_TEST(result.stderrContent == expectedMessage);
-		BOOST_REQUIRE(!result.success);
+		BOOST_CHECK_EXCEPTION(
+			parseCommandLineAndReadInputFiles({
+				"solc",
+				"--base-path=dir1/",
+				"--include-path=dir2/",
+				"dir1/contract1.sol",
+				"dir2/contract1.sol",
+				"dir1/contract2.sol",
+				"dir2/contract2.sol",
+			}),
+			CommandLineValidationError,
+			[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+		);
 	}
 
 	{
 		// import "contract1.sol" and import "contract2.sol" would be ambiguous:
-		vector<string> commandLine = {
-			"solc",
-			"--base-path=dir3/",
-			"--include-path=dir1/",
-			"--include-path=dir2/",
-			"dir1/contract1.sol",
-			"dir2/contract1.sol",
-			"dir1/contract2.sol",
-			"dir2/contract2.sol",
-		};
-		OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
-		BOOST_TEST(result.stderrContent == expectedMessage);
-		BOOST_REQUIRE(!result.success);
+		BOOST_CHECK_EXCEPTION(
+			parseCommandLineAndReadInputFiles({
+				"solc",
+				"--base-path=dir3/",
+				"--include-path=dir1/",
+				"--include-path=dir2/",
+				"dir1/contract1.sol",
+				"dir2/contract1.sol",
+				"dir1/contract2.sol",
+				"dir2/contract2.sol",
+			}),
+			CommandLineValidationError,
+			[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+		);
 	}
 
 	{
@@ -1316,12 +1318,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_ambiguous_import)
 		"3 | import \"contract.sol\";\n"
 		"  | ^^^^^^^^^^^^^^^^^^^^^^\n\n";
 
-	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(
-		commandLine,
-		mainContractSource,
-		true /* _processInput */
-	);
-
+	OptionsReaderAndMessages result = runCLI(commandLine, mainContractSource);
 	BOOST_TEST(result.stderrContent == expectedMessage);
 	BOOST_REQUIRE(!result.success);
 }
diff --git a/test/solc/CommandLineInterfaceAllowPaths.cpp b/test/solc/CommandLineInterfaceAllowPaths.cpp
index a15199618a..77f727014f 100644
--- a/test/solc/CommandLineInterfaceAllowPaths.cpp
+++ b/test/solc/CommandLineInterfaceAllowPaths.cpp
@@ -95,11 +95,7 @@ ImportCheck checkImport(
 		"pragma solidity >=0.0;\n" +
 		_import + ";";
 
-	test::OptionsReaderAndMessages cliResult = test::parseCommandLineAndReadInputFiles(
-		commandLine,
-		standardInputContent,
-		true /* processInput */
-	);
+	test::OptionsReaderAndMessages cliResult = test::runCLI(commandLine, standardInputContent);
 	if (cliResult.success)
 		return ImportCheck::OK();
 
diff --git a/test/solc/Common.cpp b/test/solc/Common.cpp
index 8e40c1af63..ead9b798da 100644
--- a/test/solc/Common.cpp
+++ b/test/solc/Common.cpp
@@ -41,18 +41,34 @@ vector<char const*> test::makeArgv(vector<string> const& _commandLine)
 
 test::OptionsReaderAndMessages test::parseCommandLineAndReadInputFiles(
 	vector<string> const& _commandLine,
-	string const& _standardInputContent,
-	bool _processInput
+	string const& _standardInputContent
 )
 {
 	vector<char const*> argv = makeArgv(_commandLine);
 	stringstream sin(_standardInputContent), sout, serr;
 	CommandLineInterface cli(sin, sout, serr);
 	bool success = cli.parseArguments(static_cast<int>(_commandLine.size()), argv.data());
-	if (success)
-		success = cli.readInputFiles();
-	if (success && _processInput)
-		success = cli.processInput();
+	cli.readInputFiles();
+
+	return {
+		success,
+		cli.options(),
+		cli.fileReader(),
+		cli.standardJsonInput(),
+		sout.str(),
+		stripPreReleaseWarning(serr.str()),
+	};
+}
+
+test::OptionsReaderAndMessages test::runCLI(
+	vector<string> const& _commandLine,
+	string const& _standardInputContent
+)
+{
+	vector<char const*> argv = makeArgv(_commandLine);
+	stringstream sin(_standardInputContent), sout, serr;
+	CommandLineInterface cli(sin, sout, serr);
+	bool success = cli.run(static_cast<int>(_commandLine.size()), argv.data());
 
 	return {
 		success,
diff --git a/test/solc/Common.h b/test/solc/Common.h
index 958d63054d..3575bea74e 100644
--- a/test/solc/Common.h
+++ b/test/solc/Common.h
@@ -44,10 +44,26 @@ struct OptionsReaderAndMessages
 
 std::vector<char const*> makeArgv(std::vector<std::string> const& _commandLine);
 
+/// Runs only command-line parsing, without compilation, assembling or any other input processing.
+/// Lets through any @a CommandLineErrors throw by the CLI.
+/// Note: This uses the @a CommandLineInterface class and does not actually spawn a new process.
+/// @param _commandLine Arguments in the form of strings that would be specified on the command-line.
+///                     You must specify the program name as the first item.
+/// @param _standardInputContent Content that the CLI will be able to read from its standard input.
 OptionsReaderAndMessages parseCommandLineAndReadInputFiles(
 	std::vector<std::string> const& _commandLine,
-	std::string const& _standardInputContent = "",
-	bool _processInput = false
+	std::string const& _standardInputContent = ""
+);
+
+/// Runs all stages of command-line interface processing, including error handling.
+/// Never throws @a CommandLineError - validation errors are included in the returned stderr content.
+/// Note: This uses the @a CommandLineInterface class and does not actually spawn a new process.
+/// @param _commandLine Arguments in the form of strings that would be specified on the command-line.
+///                     You must specify the program name as the first item.
+/// @param _standardInputContent Content that the CLI will be able to read from its standard input.
+OptionsReaderAndMessages runCLI(
+	std::vector<std::string> const& _commandLine,
+	std::string const& _standardInputContent = ""
 );
 
 std::string stripPreReleaseWarning(std::string const& _stderrContent);

From f50aec9334608a54c345801df1f2230284d12149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 13 Oct 2021 12:55:49 +0200
Subject: [PATCH 0119/1748] CommandLineInterface: Report an error immediately
 when writing to disk fails

---
 solc/CommandLineInterface.cpp | 19 +++----------------
 solc/CommandLineInterface.h   |  1 -
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 08b45c6ee0..4610741020 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -546,19 +546,12 @@ void CommandLineInterface::createFile(string const& _fileName, string const& _da
 
 	string pathName = (m_options.output.dir / _fileName).string();
 	if (fs::exists(pathName) && !m_options.output.overwriteFiles)
-	{
-		serr() << "Refusing to overwrite existing file \"" << pathName << "\" (use --overwrite to force)." << endl;
-		m_outputFailed = true;
-		return;
-	}
+		solThrow(CommandLineOutputError, "Refusing to overwrite existing file \"" + pathName + "\" (use --overwrite to force).");
+
 	ofstream outFile(pathName);
 	outFile << _data;
 	if (!outFile)
-	{
-		serr() << "Could not write to file \"" << pathName << "\"." << endl;
-		m_outputFailed = true;
-		return;
-	}
+		solThrow(CommandLineOutputError, "Could not write to file \"" + pathName + "\".");
 }
 
 void CommandLineInterface::createJson(string const& _fileName, string const& _json)
@@ -643,9 +636,6 @@ void CommandLineInterface::processInput()
 		compile();
 		outputCompilationResults();
 	}
-
-	if (m_outputFailed)
-		solThrow(CommandLineOutputError, "Failed to write all output files to disk.");
 }
 
 void CommandLineInterface::printVersion()
@@ -969,10 +959,7 @@ void CommandLineInterface::writeLinkedFiles()
 			ofstream outFile(src.first);
 			outFile << src.second;
 			if (!outFile)
-			{
-				m_outputFailed = true;
 				solThrow(CommandLineOutputError, "Could not write to file " + src.first + ". Aborting.");
-			}
 		}
 	sout() << "Linking completed." << endl;
 }
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index fc584001f7..9d1646e528 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -136,7 +136,6 @@ class CommandLineInterface
 	std::ostream& m_sout;
 	std::ostream& m_serr;
 	bool m_hasOutput = false;
-	bool m_outputFailed = false; ///< If true, creation or write to some of the output files failed.
 	FileReader m_fileReader;
 	std::optional<std::string> m_standardJsonInput;
 	std::unique_ptr<frontend::CompilerStack> m_compiler;

From 0ec3f523bd22a8196135ea38a7bbab0b8cb1f62d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 10 Nov 2021 17:05:23 +0100
Subject: [PATCH 0120/1748] CI: Workaround for $CIRCLE_PULL_REQUEST pointing at
 random PRs in runs outside of PRs

---
 .circleci/config.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 72434ea15c..5575c88727 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -44,7 +44,9 @@ commands:
           name: "Gitter notification"
           when: << parameters.condition >>
           command: |
-            [[ $CI_PULL_REQUEST == "" ]] || { echo "Running on a PR - notification skipped."; exit 0; }
+            # FIXME: Checking $CIRCLE_PULL_REQUEST would be better than hard-coding branch names
+            # but it's broken. CircleCI associates runs on develop/breaking with random old PRs.
+            [[ $CIRCLE_BRANCH == develop || $CIRCLE_BRANCH == breaking ]] || { echo "Running on a PR or a feature branch - notification skipped."; exit 0; }
 
             [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ Nightly job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
             [[ "<< parameters.event >>" == "success" ]] && message=" ✅ Nightly job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."

From 0d82fe9ca7fcc2fa34a08100c694011261126189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 14 Oct 2021 17:30:13 +0200
Subject: [PATCH 0121/1748] cmdlineTests.sh: Test the equivalence of one and
 two-stage compilation via IR

---
 scripts/common.sh    | 12 +++++++
 test/cmdlineTests.sh | 85 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/scripts/common.sh b/scripts/common.sh
index 3e40754a61..fabfb6d72c 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -171,6 +171,18 @@ function msg_on_error
     fi
 }
 
+function diff_values
+{
+    (( $# >= 2 )) || fail "diff_values requires at least 2 arguments."
+
+    local value1="$1"
+    local value2="$2"
+    shift
+    shift
+
+    diff --color=auto --unified=0 <(echo "$value1") <(echo "$value2") "$@"
+}
+
 function safe_kill
 {
     local PID=${1}
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 2076eb993e..4f9d41384b 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -308,6 +308,61 @@ function test_solc_assembly_output
     fi
 }
 
+function test_via_ir_equivalence()
+{
+    (( $# <= 2 )) || fail "This function accepts at most two arguments."
+
+    if [[ $2 != --optimize ]] && [[ $2 != "" ]]
+    then
+        fail "The second argument must be --optimize if present."
+    fi
+
+    local solidity_code="$1"
+    local optimize_flag="$2"
+
+    local optimizer_flags=()
+    [[ $optimize_flag == "" ]] || optimizer_flags+=("$optimize_flag")
+
+    local ir_output
+    ir_output=$(
+        echo "$solidity_code" |
+        msg_on_error --no-stderr "$SOLC" - --ir-optimized --debug-info location "${optimizer_flags[@]}" |
+        sed '/^Optimized IR:$/d'
+    )
+
+    local asm_output_two_stage asm_output_via_ir
+    asm_output_two_stage=$(
+        echo "$ir_output" |
+        msg_on_error --no-stderr "$SOLC" - --strict-assembly --asm "${optimizer_flags[@]}" |
+        sed '/^======= <stdin>/d' |
+        sed '/^Text representation:$/d'
+    )
+    asm_output_via_ir=$(
+        echo "$solidity_code" |
+        msg_on_error --no-stderr "$SOLC" - --experimental-via-ir --asm --debug-info location "${optimizer_flags[@]}" |
+        sed '/^======= <stdin>/d' |
+        sed '/^EVM assembly:$/d'
+    )
+
+    diff_values "$asm_output_two_stage" "$asm_output_via_ir" --ignore-space-change --ignore-blank-lines
+
+    local bin_output_two_stage bin_output_via_ir
+    bin_output_two_stage=$(
+        echo "$ir_output" |
+        msg_on_error --no-stderr "$SOLC" - --strict-assembly --bin "${optimizer_flags[@]}" |
+        sed '/^======= <stdin>/d' |
+        sed '/^Binary representation:$/d'
+    )
+    bin_output_via_ir=$(
+        echo "$solidity_code" |
+        msg_on_error --no-stderr "$SOLC" - --experimental-via-ir --bin "${optimizer_flags[@]}" |
+        sed '/^======= <stdin>/d' |
+        sed '/^Binary:$/d'
+    )
+
+    diff_values "$bin_output_two_stage" "$bin_output_via_ir" --ignore-space-change --ignore-blank-lines
+}
+
 ## RUN
 
 echo "Checking that the bug list is up to date..."
@@ -533,6 +588,36 @@ printTask "Testing assemble, yul, strict-assembly and optimize..."
     test_solc_assembly_output "{ let x := 0 }" "{ { } }" "--strict-assembly --optimize"
 )
 
+printTask "Testing the eqivalence of --experimental-via-ir and a two-stage compilation..."
+(
+    printTask " - Smoke test"
+    test_via_ir_equivalence "contract C {}"
+
+    printTask " - Smoke test (optimized)"
+    test_via_ir_equivalence "contract C {}" --optimize
+
+    externalContracts=(
+        deposit_contract.sol
+        FixedFeeRegistrar.sol
+        _stringutils/stringutils.sol
+    )
+    requiresOptimizer=(
+        deposit_contract.sol
+        FixedFeeRegistrar.sol
+    )
+
+    for contractFile in "${externalContracts[@]}"
+    do
+        if ! [[ "${requiresOptimizer[*]}" =~ $contractFile ]]
+        then
+            printTask " - ${contractFile}"
+            test_via_ir_equivalence "$(cat "${REPO_ROOT}/test/libsolidity/semanticTests/externalContracts/${contractFile}")"
+        fi
+
+        printTask " - ${contractFile} (optimized)"
+        test_via_ir_equivalence "$(cat "${REPO_ROOT}/test/libsolidity/semanticTests/externalContracts/${contractFile}")" --optimize
+    done
+)
 
 printTask "Testing standard input..."
 SOLTMPDIR=$(mktemp -d)

From e2e393495eb7cd9fe9410a914ac772aa246f13ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 15 Oct 2021 15:50:52 +0200
Subject: [PATCH 0122/1748] Install diffutils on macOS to get diff with color
 support

---
 .circleci/osx_install_dependencies.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index ed11f24913..7ef8635a87 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -57,6 +57,7 @@ then
   brew install cmake
   brew install wget
   brew install coreutils
+  brew install diffutils
   ./scripts/install_obsolete_jsoncpp_1_7_4.sh
 
   # z3

From d3b246316622a3beb3ca71396584b4389fa8f630 Mon Sep 17 00:00:00 2001
From: Alessandro Coglio <coglio@kestrel.edu>
Date: Wed, 29 Sep 2021 13:05:08 -0700
Subject: [PATCH 0123/1748] Improve description of literal evaluation.

---
 docs/yul.rst | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index 8f59f28115..ef44a575ba 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -714,13 +714,15 @@ We will use a destructuring notation for the AST nodes.
         L'[$parami] = vi and L'[$reti] = 0 for all i.
         Let G'', L'', mode = E(Gn, L', block)
         G'', Ln, L''[$ret1], ..., L''[$retm]
-    E(G, L, l: StringLiteral) = G, L, utf8EncodeLeftAligned(l),
-        where utf8EncodeLeftAligned performs a UTF-8 encoding of l
-        and aligns it left into 32 bytes
+    E(G, L, l: StringLiteral) = G, L, str(l),
+        where str is the string evaluation function,
+        which for the EVM dialect is defined in the section 'Literals' above
     E(G, L, n: HexNumber) = G, L, hex(n)
-        where hex is the hexadecimal decoding function
+        where hex is the hexadecimal evaluation function,
+        which turns a sequence of hexadecimal digits into their big endian value
     E(G, L, n: DecimalNumber) = G, L, dec(n),
-        where dec is the decimal decoding function
+        where dec is the decimal evaluation function,
+        which turns a sequence of decimal digits into their big endian value
 
 .. _opcodes:
 

From ab5a06e2b93aa57e84c3bea11561cf429abb19e5 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 27 Oct 2021 13:22:02 +0200
Subject: [PATCH 0124/1748] Refactor ASTJSON tests to allow easier addition of
 variations.

---
 test/libsolidity/ASTJSONTest.cpp | 144 +++++++++++++------------------
 test/libsolidity/ASTJSONTest.h   |  40 +++++++--
 2 files changed, 92 insertions(+), 92 deletions(-)

diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index 8579e9ea4b..82c6e7e186 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -16,17 +16,20 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <boost/algorithm/string/replace.hpp>
-#include <test/libsolidity/ASTJSONTest.h>
-#include <test/Common.h>
-#include <libsolutil/AnsiColorized.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 #include <libsolidity/ast/ASTJsonConverter.h>
-#include <libsolidity/interface/CompilerStack.h>
+#include <libsolutil/AnsiColorized.h>
+#include <libsolutil/CommonIO.h>
+
+#include <test/Common.h>
+#include <test/libsolidity/ASTJSONTest.h>
+
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
-#include <boost/throw_exception.hpp>
+#include <boost/algorithm/string/replace.hpp>
 #include <boost/test/unit_test.hpp>
+#include <boost/throw_exception.hpp>
+
 #include <fstream>
 #include <memory>
 #include <stdexcept>
@@ -72,8 +75,13 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
 	if (!boost::algorithm::ends_with(_filename, ".sol"))
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid test contract file name: \"" + _filename + "\"."));
 
-	m_astFilename = _filename.substr(0, _filename.size() - 4) + ".json";
-	m_astParseOnlyFilename = _filename.substr(0, _filename.size() - 4) + "_parseOnly.json";
+	string_view baseName = _filename;
+	baseName.remove_suffix(4);
+
+	m_variants = {
+		TestVariant(baseName, CompilerStack::State::Parsed),
+		TestVariant(baseName, CompilerStack::State::AnalysisPerformed),
+	};
 
 	ifstream file(_filename);
 	if (!file)
@@ -102,26 +110,13 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
 	}
 
 	m_sources.emplace_back(sourceName.empty() ? "a" : sourceName, source);
-
 	file.close();
-	file.open(m_astFilename);
-	if (file)
-	{
-		string line;
-		while (getline(file, line))
-			m_expectation += line + "\n";
-	}
 
-	file.close();
-	file.open(m_astParseOnlyFilename);
-	if (file)
+	for (TestVariant& variant: m_variants)
 	{
-		string line;
-		while (getline(file, line))
-			m_expectationParseOnly += line + "\n";
+		variant.expectation = readFileAsString(variant.astFilename());
+		boost::replace_all(variant.expectation, "\r\n", "\n");
 	}
-
-	file.close();
 }
 
 TestCase::TestResult ASTJSONTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
@@ -135,97 +130,76 @@ TestCase::TestResult ASTJSONTest::run(ostream& _stream, string const& _linePrefi
 		sources[m_sources[i].first] = m_sources[i].second;
 		sourceIndices[m_sources[i].first] = static_cast<unsigned>(i + 1);
 	}
-	c.setSources(sources);
-	c.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 
+	bool resultsMatch = true;
 
-	if (!c.compile(CompilerStack::State::Parsed))
+	for (TestVariant& variant: m_variants)
 	{
-		SourceReferenceFormatter formatter(_stream, c, _formatted, false);
-		formatter.printErrorInformation(c.errors());
-		return TestResult::FatalError;
-	}
+		c.reset();
+		c.setSources(sources);
+		c.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 
-	bool resultsMatch = runTest(
-		m_expectationParseOnly,
-		m_resultParseOnly,
-		sourceIndices,
-		c,
-		"parseOnly",
-		_stream,
-		_linePrefix,
-		_formatted
-	);
+		if (!c.parseAndAnalyze(variant.stopAfter))
+		{
+			// Ignore non-fatal analysis errors, we only want to export.
+			if (c.state() > CompilerStack::State::Parsed)
+				continue;
 
-	c.reset();
-	c.setSources(sources);
-	c.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	if (!c.parse())
-	{
-		// Empty Expectations means we expect failure
-		if (m_expectation.empty())
-			return resultsMatch ? TestResult::Success : TestResult::Failure;
+			SourceReferenceFormatter formatter(_stream, c, _formatted, false);
+			formatter.printErrorInformation(c.errors());
+			return TestResult::FatalError;
+		}
 
-		SourceReferenceFormatter{_stream, c, _formatted, false}
-			.printErrorInformation(c.errors());
-		return TestResult::FatalError;
+		resultsMatch = resultsMatch && runTest(
+			variant,
+			sourceIndices,
+			c,
+			_stream,
+			_linePrefix,
+			_formatted
+		);
 	}
 
-	c.analyze();
-
-	resultsMatch = runTest(
-		m_expectation,
-		m_result,
-		sourceIndices,
-		c,
-		"",
-		_stream,
-		_linePrefix,
-		_formatted
-	) && resultsMatch;
-
 	return resultsMatch ? TestResult::Success : TestResult::Failure;
 }
 
 bool ASTJSONTest::runTest(
-	string& _expectation,
-	string& _result,
+	TestVariant& _variant,
 	map<string, unsigned> const& _sourceIndices,
 	CompilerStack& _compiler,
-	string const& _variation,
 	ostream& _stream,
 	string const& _linePrefix,
 	bool const _formatted
 )
 {
 	if (m_sources.size() > 1)
-		_result += "[\n";
+		_variant.result += "[\n";
 
 	for (size_t i = 0; i < m_sources.size(); i++)
 	{
 		ostringstream result;
 		ASTJsonConverter(_compiler.state(), _sourceIndices).print(result, _compiler.ast(m_sources[i].first));
-		_result += result.str();
+		_variant.result += result.str();
 		if (i != m_sources.size() - 1)
-			_result += ",";
-		_result += "\n";
+			_variant.result += ",";
+		_variant.result += "\n";
 	}
 
 	if (m_sources.size() > 1)
-		_result += "]\n";
+		_variant.result += "]\n";
 
-	replaceTagWithVersion(_expectation);
+	replaceTagWithVersion(_variant.expectation);
 
-	if (_expectation != _result)
+	if (_variant.expectation != _variant.result)
 	{
 		string nextIndentLevel = _linePrefix + "  ";
 		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) <<
 			_linePrefix <<
 			"Expected result" <<
-			(!_variation.empty() ? " (" + _variation + "):" : ":") <<
+			(!_variant.name().empty() ? " (" + _variant.name() + "):" : ":") <<
 			endl;
 		{
-			istringstream stream(_expectation);
+			istringstream stream(_variant.expectation);
 			string line;
 			while (getline(stream, line))
 				_stream << nextIndentLevel << line << endl;
@@ -235,10 +209,10 @@ bool ASTJSONTest::runTest(
 		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) <<
 			_linePrefix <<
 			"Obtained result" <<
-			(!_variation.empty() ? " (" + _variation + "):" : ":") <<
+			(!_variant.name().empty() ? " (" + _variant.name() + "):" : ":") <<
 			endl;
 		{
-			istringstream stream(_result);
+			istringstream stream(_variant.result);
 			string line;
 			while (getline(stream, line))
 				_stream << nextIndentLevel << line << endl;
@@ -266,14 +240,18 @@ void ASTJSONTest::printSource(ostream& _stream, string const& _linePrefix, bool
 
 void ASTJSONTest::printUpdatedExpectations(std::ostream&, std::string const&) const
 {
-	updateExpectation(m_astFilename, m_result, "");
-	updateExpectation(m_astParseOnlyFilename, m_resultParseOnly, "parseOnly ");
+	for (TestVariant const& variant: m_variants)
+		updateExpectation(
+			variant.astFilename(),
+			variant.result,
+			variant.name().empty() ? "" : variant.name() + " "
+		);
 }
 
-void ASTJSONTest::updateExpectation(string const& _filename, string const& _expectation, string const& _variation) const
+void ASTJSONTest::updateExpectation(string const& _filename, string const& _expectation, string const& _variant) const
 {
 	ofstream file(_filename.c_str());
-	if (!file) BOOST_THROW_EXCEPTION(runtime_error("Cannot write " + _variation + "AST expectation to \"" + _filename + "\"."));
+	if (!file) BOOST_THROW_EXCEPTION(runtime_error("Cannot write " + _variant + "AST expectation to \"" + _filename + "\"."));
 	file.exceptions(ios::badbit);
 
 	string replacedResult = _expectation;
diff --git a/test/libsolidity/ASTJSONTest.h b/test/libsolidity/ASTJSONTest.h
index ac57277ac3..3365de589d 100644
--- a/test/libsolidity/ASTJSONTest.h
+++ b/test/libsolidity/ASTJSONTest.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <libsolutil/AnsiColorized.h>
+#include <libsolidity/interface/CompilerStack.h>
 #include <test/TestCase.h>
 
 #include <iosfwd>
@@ -37,6 +38,32 @@ namespace solidity::frontend::test
 class ASTJSONTest: public TestCase
 {
 public:
+	struct TestVariant
+	{
+		TestVariant(std::string_view _baseName, CompilerStack::State _stopAfter):
+			baseName(_baseName),
+			stopAfter(_stopAfter)
+		{}
+
+		std::string name() const
+		{
+			return stopAfter == CompilerStack::State::Parsed ? "parseOnly" : "";
+		}
+
+		std::string astFilename() const
+		{
+			return std::string(baseName) +
+				(name().empty() ? "" : "_") +
+				name() +
+				".json";
+		}
+
+		std::string baseName;
+		CompilerStack::State stopAfter;
+		std::string result;
+		std::string expectation;
+	};
+
 	static std::unique_ptr<TestCase> create(Config const& _config)
 	{
 		return std::make_unique<ASTJSONTest>(_config.filename);
@@ -49,11 +76,9 @@ class ASTJSONTest: public TestCase
 	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
 private:
 	bool runTest(
-		std::string& _expectation,
-		std::string& _result,
+		TestVariant& _testVariant,
 		std::map<std::string, unsigned> const& _sourceIndices,
 		CompilerStack& _compiler,
-		std::string const& _variation,
 		std::ostream& _stream,
 		std::string const& _linePrefix = "",
 		bool const _formatted = false
@@ -61,15 +86,12 @@ class ASTJSONTest: public TestCase
 	void updateExpectation(
 		std::string const& _filename,
 		std::string const& _expectation,
-		std::string const& _variation
+		std::string const& _variant
 	) const;
 
+	std::vector<TestVariant> m_variants;
+
 	std::vector<std::pair<std::string, std::string>> m_sources;
-	std::string m_expectationParseOnly;
-	std::string m_astFilename;
-	std::string m_astParseOnlyFilename;
-	std::string m_result;
-	std::string m_resultParseOnly;
 };
 
 }

From 49b4e77d6ba14aafd701b6f149227b7d138824f3 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 26 Oct 2021 14:03:23 +0200
Subject: [PATCH 0125/1748] Prevent crash when translating yul->ewasm with
 @use-src annotations

---
 Changelog.md                                  |  1 +
 libyul/backends/wasm/EVMToEwasmTranslator.cpp |  6 +++-
 .../yul_to_wasm_source_location_crash/args    |  1 +
 .../yul_to_wasm_source_location_crash/err     |  1 +
 .../input.yul                                 |  4 +++
 .../yul_to_wasm_source_location_crash/output  | 34 +++++++++++++++++++
 6 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test/cmdlineTests/yul_to_wasm_source_location_crash/args
 create mode 100644 test/cmdlineTests/yul_to_wasm_source_location_crash/err
 create mode 100644 test/cmdlineTests/yul_to_wasm_source_location_crash/input.yul
 create mode 100644 test/cmdlineTests/yul_to_wasm_source_location_crash/output

diff --git a/Changelog.md b/Changelog.md
index 79d5df058c..b3af54d047 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Code Generator: Fix a crash when using ``@use-src`` and compiling from Yul to ewasm.
 
 
 ### 0.8.10 (2021-11-09)
diff --git a/libyul/backends/wasm/EVMToEwasmTranslator.cpp b/libyul/backends/wasm/EVMToEwasmTranslator.cpp
index eb7a60a32f..359cc023bb 100644
--- a/libyul/backends/wasm/EVMToEwasmTranslator.cpp
+++ b/libyul/backends/wasm/EVMToEwasmTranslator.cpp
@@ -137,7 +137,11 @@ void EVMToEwasmTranslator::parsePolyfill()
 			string(solidity::yul::wasm::polyfill::Logical) +
 			string(solidity::yul::wasm::polyfill::Memory) +
 		"}", "");
-	m_polyfill = Parser(errorReporter, WasmDialect::instance()).parse(charStream);
+
+	// Passing an empty SourceLocation() here is a workaround to prevent a crash
+	// when compiling from yul->ewasm. We're stripping nativeLocation and
+	// originLocation from the AST (but we only really need to strip nativeLocation)
+	m_polyfill = Parser(errorReporter, WasmDialect::instance(), langutil::SourceLocation()).parse(charStream);
 	if (!errors.empty())
 	{
 		string message;
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/args b/test/cmdlineTests/yul_to_wasm_source_location_crash/args
new file mode 100644
index 0000000000..254a1883c1
--- /dev/null
+++ b/test/cmdlineTests/yul_to_wasm_source_location_crash/args
@@ -0,0 +1 @@
+--strict-assembly --yul-dialect evm --machine ewasm --optimize --ewasm-ir
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/err b/test/cmdlineTests/yul_to_wasm_source_location_crash/err
new file mode 100644
index 0000000000..014a1178fa
--- /dev/null
+++ b/test/cmdlineTests/yul_to_wasm_source_location_crash/err
@@ -0,0 +1 @@
+Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/input.yul b/test/cmdlineTests/yul_to_wasm_source_location_crash/input.yul
new file mode 100644
index 0000000000..89e060931b
--- /dev/null
+++ b/test/cmdlineTests/yul_to_wasm_source_location_crash/input.yul
@@ -0,0 +1,4 @@
+/// @use-src 0:"test.sol"
+object "C" {
+    code { sstore(0,0) }
+}
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/output b/test/cmdlineTests/yul_to_wasm_source_location_crash/output
new file mode 100644
index 0000000000..29ff631aa5
--- /dev/null
+++ b/test/cmdlineTests/yul_to_wasm_source_location_crash/output
@@ -0,0 +1,34 @@
+
+======= yul_to_wasm_source_location_crash/input.yul (Ewasm) =======
+
+==========================
+
+Translated source:
+/// @use-src 0:"test.sol"
+object "C" {
+    code {
+        function main()
+        {
+            let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(0))), 32)
+            let y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(0, 32)))))
+            i64.store(0:i32, y)
+            i64.store(i32.add(0:i32, 8:i32), y)
+            i64.store(i32.add(0:i32, 16:i32), y)
+            i64.store(i32.add(0:i32, 24:i32), y)
+            i64.store(32:i32, y)
+            i64.store(i32.add(32:i32, 8:i32), y)
+            i64.store(i32.add(32:i32, 16:i32), y)
+            i64.store(i32.add(32:i32, 24:i32), y)
+            eth.storageStore(0:i32, 32:i32)
+        }
+        function bswap16(x:i32) -> y:i32
+        {
+            y := i32.or(i32.and(i32.shl(x, 8:i32), 0xff00:i32), i32.and(i32.shr_u(x, 8:i32), 0xff:i32))
+        }
+        function bswap32(x:i32) -> y:i32
+        {
+            let hi:i32 := i32.shl(bswap16(x), 16:i32)
+            y := i32.or(hi, bswap16(i32.shr_u(x, 16:i32)))
+        }
+    }
+}

From cf528271079c3eb3c2d43d1cf72a67998af3dd37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 14:29:22 +0100
Subject: [PATCH 0126/1748] Fix gas mismatch in constructor not being counted
 as a failure

---
 test/libsolidity/SemanticTest.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index c5ee04044d..963967ca48 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -407,7 +407,10 @@ TestCase::TestResult SemanticTest::runTest(
 			if (m_transactionSuccessful == test.call().expectations.failure)
 				success = false;
 			if (success && !checkGasCostExpectation(test, _isYulRun))
+			{
+				success = false;
 				m_gasCostFailure = true;
+			}
 
 			test.setFailure(!m_transactionSuccessful);
 			test.setRawBytes(bytes());

From 077b3a003d65e498e2bc7f5d0f421aba75d451f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 14:36:13 +0100
Subject: [PATCH 0127/1748] Fix `--enforce-gas-cost-min-value` being applied
 only when the cost expectations are not provided in the test file

---
 test/libsolidity/SemanticTest.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 963967ca48..ad6f40fbb6 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -565,14 +565,14 @@ bool SemanticTest::checkGasCostExpectation(TestFunctionCall& io_test, bool _comp
 	// We don't check gas if enforce gas cost is not active
 	// or test is run with abi encoder v1 only
 	// or gas used less than threshold for enforcing feature
+	// or the test has used up all available gas (test will fail anyway)
 	// or setting is "ir" and it's not included in expectations
 	// or if the called function is an isoltest builtin e.g. `smokeTest` or `storageEmpty`
 	if (
 		!m_enforceGasCost ||
-		(
-			(setting == "ir" || m_gasUsed < m_enforceGasCostMinValue || m_gasUsed >= m_gas) &&
-			io_test.call().expectations.gasUsed.count(setting) == 0
-		) ||
+		m_gasUsed < m_enforceGasCostMinValue ||
+		m_gasUsed >= m_gas ||
+		(setting == "ir" && io_test.call().expectations.gasUsed.count(setting) == 0) ||
 		io_test.call().kind == FunctionCall::Kind::Builtin
 	)
 		return true;

From f42180ef06d1bc101829f569fc8d133a1ed42588 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 14:42:10 +0100
Subject: [PATCH 0128/1748] Rename gas constants in ExecutionFramework

---
 test/ExecutionFramework.cpp       | 6 +++---
 test/ExecutionFramework.h         | 5 +++--
 test/libsolidity/SemanticTest.cpp | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index c153cd4717..600bedbf5e 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -182,7 +182,7 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 		message.kind = EVMC_CALL;
 		message.destination = EVMHost::convertToEVMC(m_contractAddress);
 	}
-	message.gas = m_gas.convert_to<int64_t>();
+	message.gas = InitialGas.convert_to<int64_t>();
 
 	evmc::result result = m_evmcHost->call(message);
 
@@ -190,7 +190,7 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 	if (_isCreation)
 		m_contractAddress = EVMHost::convertFromEVMC(result.create_address);
 
-	m_gasUsed = m_gas - result.gas_left;
+	m_gasUsed = InitialGas - result.gas_left;
 	m_transactionSuccessful = (result.status_code == EVMC_SUCCESS);
 
 	if (m_showMessages)
@@ -216,7 +216,7 @@ void ExecutionFramework::sendEther(h160 const& _addr, u256 const& _amount)
 	message.value = EVMHost::convertToEVMC(_amount);
 	message.kind = EVMC_CALL;
 	message.destination = EVMHost::convertToEVMC(_addr);
-	message.gas = m_gas.convert_to<int64_t>();
+	message.gas = InitialGas.convert_to<int64_t>();
 
 	m_evmcHost->call(message);
 }
diff --git a/test/ExecutionFramework.h b/test/ExecutionFramework.h
index 0ee0214d4c..53a09eaf8e 100644
--- a/test/ExecutionFramework.h
+++ b/test/ExecutionFramework.h
@@ -273,6 +273,9 @@ class ExecutionFramework
 	}
 
 protected:
+	u256 const GasPrice = 10 * gwei;
+	u256 const InitialGas = 100000000;
+
 	void selectVM(evmc_capabilities _cap = evmc_capabilities::EVMC_CAPABILITY_EVM1);
 	void reset();
 
@@ -302,8 +305,6 @@ class ExecutionFramework
 	bool m_transactionSuccessful = true;
 	util::h160 m_sender = account(0);
 	util::h160 m_contractAddress;
-	u256 const m_gasPrice = 10 * gwei;
-	u256 const m_gas = 100000000;
 	bytes m_output;
 	u256 m_gasUsed;
 };
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index ad6f40fbb6..4fbb16614c 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -571,7 +571,7 @@ bool SemanticTest::checkGasCostExpectation(TestFunctionCall& io_test, bool _comp
 	if (
 		!m_enforceGasCost ||
 		m_gasUsed < m_enforceGasCostMinValue ||
-		m_gasUsed >= m_gas ||
+		m_gasUsed >= InitialGas ||
 		(setting == "ir" && io_test.call().expectations.gasUsed.count(setting) == 0) ||
 		io_test.call().kind == FunctionCall::Kind::Builtin
 	)

From 032f2d8f9fc71c6ef4dbe37914c21fe42fb99e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 16:19:33 +0100
Subject: [PATCH 0129/1748] Update gas expectations

---
 .../semanticTests/array/constant_var_as_array_length.sol    | 3 +++
 .../semanticTests/array/fixed_arrays_in_constructors.sol    | 3 +++
 .../constructor/bytes_in_constructors_unpacker.sol          | 3 +++
 .../constructor/constructor_arguments_external.sol          | 3 +++
 .../constructor/constructor_static_array_argument.sol       | 3 +++
 .../semanticTests/constructor_ihneritance_init_order_2.sol  | 3 +++
 .../semanticTests/constructor_inheritance_init_order.sol    | 1 +
 test/libsolidity/semanticTests/constructor_with_params.sol  | 2 ++
 .../constructor_with_params_diamond_inheritance.sol         | 3 +++
 .../semanticTests/constructor_with_params_inheritance.sol   | 3 +++
 .../semanticTests/events/event_emit_from_other_contract.sol | 4 +++-
 .../semanticTests/events/event_signature_in_library.sol     | 2 +-
 .../semanticTests/externalContracts/FixedFeeRegistrar.sol   | 2 +-
 .../semanticTests/externalContracts/deposit_contract.sol    | 6 +++---
 .../semanticTests/externalContracts/prbmath_signed.sol      | 4 ++--
 .../semanticTests/externalContracts/prbmath_unsigned.sol    | 2 +-
 .../semanticTests/externalContracts/ramanujan_pi.sol        | 2 +-
 .../libsolidity/semanticTests/externalContracts/strings.sol | 2 +-
 .../functionCall/creation_function_call_with_args.sol       | 3 +++
 .../functionCall/creation_function_call_with_salt.sol       | 3 +++
 .../functionCall/external_call_to_nonexisting.sol           | 3 ++-
 .../external_call_to_nonexisting_debugstrings.sol           | 2 ++
 .../semanticTests/functionCall/gas_and_value_basic.sol      | 3 +++
 .../functionCall/gas_and_value_brace_syntax.sol             | 3 +++
 .../semanticTests/functionCall/send_zero_ether.sol          | 3 +++
 test/libsolidity/semanticTests/immutable/use_scratch.sol    | 3 +++
 .../semanticTests/inheritance/value_for_constructor.sol     | 3 +++
 .../isoltestTesting/balance_other_contract.sol              | 6 +++---
 test/libsolidity/semanticTests/smoke/constructor.sol        | 4 +++-
 test/libsolidity/semanticTests/state/blockhash_basic.sol    | 3 +++
 .../semanticTests/userDefinedValueType/erc20.sol            | 2 +-
 test/libsolidity/semanticTests/various/address_code.sol     | 5 ++++-
 test/libsolidity/semanticTests/various/code_length.sol      | 3 ++-
 .../semanticTests/various/codebalance_assembly.sol          | 1 +
 .../semanticTests/various/contract_binary_dependencies.sol  | 1 +
 .../semanticTests/various/negative_stack_height.sol         | 2 ++
 test/libsolidity/semanticTests/various/senders_balance.sol  | 3 +++
 test/libsolidity/semanticTests/various/value_complex.sol    | 3 +++
 test/libsolidity/semanticTests/various/value_insane.sol     | 3 +++
 39 files changed, 94 insertions(+), 19 deletions(-)

diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
index c696002ad3..945de3cfea 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -11,6 +11,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3 ->
+// gas irOptimized: 143598
+// gas legacy: 183490
+// gas legacyOptimized: 151938
 // a(uint256): 0 -> 1
 // a(uint256): 1 -> 2
 // a(uint256): 2 -> 3
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index c6e46a7fad..ddead0503b 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -11,5 +11,8 @@ contract Creator {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3, 4 ->
+// gas irOptimized: 132278
+// gas legacy: 176789
+// gas legacyOptimized: 129585
 // r() -> 4
 // ch() -> 3
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index e81755ff94..1a93f53b3f 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -10,5 +10,8 @@ contract Test {
 // compileViaYul: also
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
+// gas irOptimized: 291443
+// gas legacy: 309842
+// gas legacyOptimized: 260801
 // m_x() -> 7
 // m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
index bb271ec174..6ee258bd6b 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -19,5 +19,8 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(): "abc", true
+// gas irOptimized: 112563
+// gas legacy: 145838
+// gas legacyOptimized: 104017
 // getFlag() -> true
 // getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index 099202c956..ab90a0bb91 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -12,6 +12,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3, 4 ->
+// gas irOptimized: 180731
+// gas legacy: 221377
+// gas legacyOptimized: 177671
 // a() -> 1
 // b(uint256): 0 -> 2
 // b(uint256): 1 -> 3
diff --git a/test/libsolidity/semanticTests/constructor_ihneritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_ihneritance_init_order_2.sol
index 44a7fb2f3b..db58499ea4 100644
--- a/test/libsolidity/semanticTests/constructor_ihneritance_init_order_2.sol
+++ b/test/libsolidity/semanticTests/constructor_ihneritance_init_order_2.sol
@@ -12,4 +12,7 @@ contract B is A {
 // compileViaYul: also
 // ----
 // constructor() ->
+// gas irOptimized: 122233
+// gas legacy: 135046
+// gas legacyOptimized: 116176
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
index 757a5481f7..41a050fc40 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
@@ -15,4 +15,5 @@ contract B is A {
 // compileViaYul: true
 // ----
 // constructor() ->
+// gas irOptimized: 122233
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index e3ac5b386c..cb61927745 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -11,5 +11,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
+// gas irOptimized: 104227
+// gas legacy: 117158
 // i() -> 2
 // k() -> 0
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index 89cb202c60..fe3c95b544 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -23,6 +23,9 @@ contract D is B, C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
+// gas irOptimized: 159542
+// gas legacy: 170665
+// gas legacyOptimized: 145396
 // i() -> 2
 // j() -> 2
 // k() -> 1
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index d477bbc0d9..3d90783f82 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -14,5 +14,8 @@ contract D is C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
+// gas irOptimized: 124844
+// gas legacy: 139250
+// gas legacyOptimized: 119367
 // i() -> 2
 // k() -> 1
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 128cf00ea3..690f555dc6 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -17,6 +17,8 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas legacy: 249112
+// gas irOptimized: 177344
+// gas legacy: 250376
+// gas legacyOptimized: 174522
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Deposit(address,bytes32,uint256) from 0xf01f7809444bd9a93a854361c6fae3f23d9e23db: #0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b, #0x1234, 0x00
diff --git a/test/libsolidity/semanticTests/events/event_signature_in_library.sol b/test/libsolidity/semanticTests/events/event_signature_in_library.sol
index e43fc4c645..b301ebfd5a 100644
--- a/test/libsolidity/semanticTests/events/event_signature_in_library.sol
+++ b/test/libsolidity/semanticTests/events/event_signature_in_library.sol
@@ -20,4 +20,4 @@ contract C {
 // ----
 // constructor()
 // ~ emit E((uint8,int16),(uint8,int16)): #0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5, 0x00, 0x00
-// gas legacy: 150662
+// gas legacy: 150602
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index 9205de434d..fc0b416fde 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -76,7 +76,7 @@ contract FixedFeeRegistrar is Registrar {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 425623
+// gas irOptimized: 426283
 // gas legacy: 936897
 // gas legacyOptimized: 490983
 // reserve(string), 69 ether: 0x20, 3, "abc" ->
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index f054497e98..ed9a07f7ff 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -178,9 +178,9 @@ contract DepositContract is IDepositContract, ERC165 {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1558013
-// gas legacy: 2580394
-// gas legacyOptimized: 1775403
+// gas irOptimized: 1558001
+// gas legacy: 2436584
+// gas legacyOptimized: 1776483
 // supportsInterface(bytes4): 0x0 -> 0
 // supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index 01d2403a6d..9de7a30d81 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -50,8 +50,8 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1924584
-// gas legacy: 2602700
+// gas irOptimized: 1924392
+// gas legacy: 2480887
 // gas legacyOptimized: 1874490
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
 // gas irOptimized: 22137
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index c31664c859..11001fffad 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -51,7 +51,7 @@ contract test {
 // ----
 // constructor()
 // gas irOptimized: 1778342
-// gas legacy: 2356230
+// gas legacy: 2250130
 // gas legacyOptimized: 1746528
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
 // gas irOptimized: 22004
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index 1fc85adff7..763a8acdaf 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -36,7 +36,7 @@ contract test {
 // ----
 // constructor()
 // gas irOptimized: 465357
-// gas legacy: 733634
+// gas legacy: 672749
 // gas legacyOptimized: 479606
 // prb_pi() -> 3141592656369545286
 // gas irOptimized: 57478
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 238ed21840..7c4028bb9f 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -52,7 +52,7 @@ contract test {
 // ----
 // constructor()
 // gas irOptimized: 702619
-// gas legacy: 1188228
+// gas legacy: 1130761
 // gas legacyOptimized: 750416
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
 // gas irOptimized: 22660
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index 56e458110d..2da7c2dd6d 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -17,4 +17,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
+// gas irOptimized: 200295
+// gas legacy: 245842
+// gas legacyOptimized: 195676
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index 725a54b547..0b0633c6d1 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -18,4 +18,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
+// gas irOptimized: 200458
+// gas legacy: 246202
+// gas legacyOptimized: 195914
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index 9546f10986..942faa048b 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -25,8 +25,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 1 ether ->
+// gas irOptimized: 308423
 // gas legacy: 465314
-// gas legacyOptimized: 510004
+// gas legacyOptimized: 304481
 // f(uint256): 0 -> FAILURE
 // f(uint256): 1 -> FAILURE
 // f(uint256): 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index f426e628eb..26faf248ff 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -27,6 +27,8 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
+// gas irOptimized: 448383
+// gas legacy: 834272
 // gas legacyOptimized: 510004
 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
 // f(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 5ca46b4e19..b1d9299d88 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -41,6 +41,9 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
+// gas irOptimized: 285350
+// gas legacy: 402654
+// gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
 // outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway #
 // checkState() -> false, 15
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 3da540807c..9e2491ac1b 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -40,6 +40,9 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
+// gas irOptimized: 285350
+// gas legacy: 402654
+// gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
 // outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway #
 // checkState() -> false, 15
diff --git a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
index 5f821ff3dd..617a6dec28 100644
--- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
+++ b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
@@ -19,4 +19,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
+// gas irOptimized: 102862
+// gas legacy: 116691
+// gas legacyOptimized: 100361
 // s() -> true
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index 71381fc9b4..4fb3bf2455 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -17,5 +17,8 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 3 ->
+// gas irOptimized: 137184
+// gas legacy: 209361
+// gas legacyOptimized: 139324
 // f() -> 84, 23
 // m(uint256): 3 -> 7
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index 057b3b8e45..b2f0f8a6b1 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -42,6 +42,9 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 22 wei ->
+// gas irOptimized: 288778
+// gas legacy: 402045
+// gas legacyOptimized: 266772
 // getFlag() -> true
 // getName() -> "abc"
 // getBalances() -> 12, 10
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 59ad2cd84b..5af1e5cdc6 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -18,9 +18,9 @@ contract ClientReceipt {
 // compileViaYul: also
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 191881
-// gas legacy: 235167
-// gas legacyOptimized: 180756
+// gas irOptimized: 184076
+// gas legacy: 235195
+// gas legacyOptimized: 176766
 // balance -> 1500
 // gas irOptimized: 191881
 // gas legacy: 235167
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index 3837fe071f..7667c2443f 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -14,7 +14,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 2 wei: 3 ->
-// gas legacy: 148000
+// gas irOptimized: 111723
+// gas legacy: 151416
+// gas legacyOptimized: 108388
 // state() -> 3
 // balance() -> 2
 // balance -> 2
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
index 528c8aea64..d4dbffcb8f 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -14,6 +14,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor()
+// gas irOptimized: 119839
+// gas legacy: 155081
+// gas legacyOptimized: 107997
 // genesisHash() -> 0x3737373737373737373737373737373737373737373737373737373737373737
 // currentHash() -> 0
 // f(uint256): 0 -> 0x3737373737373737373737373737373737373737373737373737373737373737
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index 4db14ff739..efe2ee1148 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -116,7 +116,7 @@ contract ERC20 {
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
 // gas irOptimized: 442239
-// gas legacy: 861547
+// gas legacy: 861559
 // gas legacyOptimized: 420959
 // totalSupply() -> 20
 // gas irOptimized: 23415
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 8e840fd016..6072d5ac3e 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -13,10 +13,13 @@ contract C {
     function h() public view returns (uint) { return address(1).code.length; }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
+// compileViaYul: also
 // ----
 // constructor() ->
+// gas irOptimized: 199687
+// gas legacy: 241124
+// gas legacyOptimized: 155549
 // initCode() -> 0x20, 0
 // f() -> true
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/various/code_length.sol b/test/libsolidity/semanticTests/various/code_length.sol
index 53b3534b25..ad4b6f874c 100644
--- a/test/libsolidity/semanticTests/various/code_length.sol
+++ b/test/libsolidity/semanticTests/various/code_length.sol
@@ -58,8 +58,9 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
+// compileViaYul: also
 // ----
 // constructor()
+// gas legacy: 126455
 // f(): true, true -> true, true
diff --git a/test/libsolidity/semanticTests/various/codebalance_assembly.sol b/test/libsolidity/semanticTests/various/codebalance_assembly.sol
index 2df9c5b4f2..98f4e29693 100644
--- a/test/libsolidity/semanticTests/various/codebalance_assembly.sol
+++ b/test/libsolidity/semanticTests/various/codebalance_assembly.sol
@@ -23,6 +23,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 23 wei ->
+// gas legacy: 100517
 // f() -> 0
 // g() -> 1
 // h() -> 23
diff --git a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
index 5303cdd52c..57942979ae 100644
--- a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
+++ b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
@@ -21,3 +21,4 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
+// gas irOptimized: 104337
diff --git a/test/libsolidity/semanticTests/various/negative_stack_height.sol b/test/libsolidity/semanticTests/various/negative_stack_height.sol
index ba1bebc18d..52fce16f51 100644
--- a/test/libsolidity/semanticTests/various/negative_stack_height.sol
+++ b/test/libsolidity/semanticTests/various/negative_stack_height.sol
@@ -65,3 +65,5 @@ contract C {
 // compileViaYul: false
 // ----
 // constructor() ->
+// gas legacy: 588138
+// gas legacyOptimized: 349636
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 08b83401c0..600e72e3e3 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -19,4 +19,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(), 27 wei ->
+// gas irOptimized: 175261
+// gas legacy: 222977
+// gas legacyOptimized: 169779
 // f() -> 27
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 8d091ec982..bebf7557f0 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -22,4 +22,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
+// gas irOptimized: 185891
+// gas legacy: 265006
+// gas legacyOptimized: 182842
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index c81570626c..9edd8061a1 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -21,4 +21,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
+// gas irOptimized: 187835
+// gas legacy: 266728
+// gas legacyOptimized: 184762
 // sendAmount(uint256): 5 -> 8

From 27dc77be5ddc8cb18009b9611b831bf75e5f4536 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 16:32:38 +0100
Subject: [PATCH 0130/1748] Fix typo in test name: ihneritance -> inheritance

---
 ..._init_order_2.sol => constructor_inheritance_init_order_2.sol} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/libsolidity/semanticTests/{constructor_ihneritance_init_order_2.sol => constructor_inheritance_init_order_2.sol} (100%)

diff --git a/test/libsolidity/semanticTests/constructor_ihneritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
similarity index 100%
rename from test/libsolidity/semanticTests/constructor_ihneritance_init_order_2.sol
rename to test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol

From 90fdea95e7a0cf5a8c29e054afb02018cf7a257d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 19:58:59 +0100
Subject: [PATCH 0131/1748] TestFunctionCall::formatRawParameters(): Ensure
 that uint8_t overload of toHex() is called

- Wrong overload results in isoltest padding each char to 32 bytes
---
 .../format_raw_string_with_control_chars.sol         | 12 ++++++++++++
 test/libsolidity/util/BytesUtils.cpp                 |  2 +-
 test/libsolidity/util/TestFunctionCall.cpp           |  4 +++-
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol

diff --git a/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol b/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol
new file mode 100644
index 0000000000..205a4ae3dd
--- /dev/null
+++ b/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f(string memory s) external pure returns (string memory) {
+        return s;
+    }
+}
+// NOTE: The test is here to illustrate the problem with formatting control chars in strings in
+// test expectations but unfortunately it can only be triggered manually. It does not test anything
+// unless you introduce a difference in expectations to force isoltest to reformat them.
+// ====
+// compileViaYul: also
+// ----
+// f(string): 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" -> 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" # Input/Output: "😃😃😃😃" #
diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp
index 6745bd1dfc..f74b256d0c 100644
--- a/test/libsolidity/util/BytesUtils.cpp
+++ b/test/libsolidity/util/BytesUtils.cpp
@@ -219,7 +219,7 @@ string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff)
 				if (isprint(v))
 					os << v;
 				else
-					os << "\\x" << toHex(v);
+					os << "\\x" << toHex(v, HexCase::Lower);
 		}
 	}
 	os << "\"";
diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index 0f28f3b99b..43805c8f99 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -322,7 +322,9 @@ string TestFunctionCall::formatRawParameters(
 			if (param.format.newline)
 				os << endl << _linePrefix << "// ";
 			for (auto const c: param.rawString)
-				os << (c >= ' ' ? string(1, c) : "\\x" + toHex(static_cast<uint8_t>(c)));
+				// NOTE: Even though we have a toHex() overload specifically for uint8_t, the compiler
+				// chooses the one for bytes if the second argument is omitted.
+				os << (c >= ' ' ? string(1, c) : "\\x" + toHex(static_cast<uint8_t>(c), HexCase::Lower));
 			if (&param != &_params.back())
 				os << ", ";
 		}

From b36a3c6bf58cd4061e14bc03819d21536372b0ea Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Sat, 20 Nov 2021 22:41:19 +0000
Subject: [PATCH 0132/1748] Fix documentation for valid ASCII string literals

---
 docs/types/value-types.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index f849f3f7eb..4cb0dec4fa 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -507,7 +507,7 @@ String literals are written with either double or single-quotes (``"foo"`` or ``
 
 For example, with ``bytes32 samevar = "stringliteral"`` the string literal is interpreted in its raw byte form when assigned to a ``bytes32`` type.
 
-String literals can only contain printable ASCII characters, which means the characters between and including 0x1F .. 0x7E.
+String literals can only contain printable ASCII characters, which means the characters between and including 0x20 .. 0x7E.
 
 Additionally, string literals also support the following escape characters:
 

From ef3c562160b4e86da8ce5644e1d1ceb51e2b5a93 Mon Sep 17 00:00:00 2001
From: Dallon Asnes <30935722+dallonasnes@users.noreply.github.com>
Date: Mon, 22 Nov 2021 15:18:43 -0600
Subject: [PATCH 0133/1748] Fix typo

---
 docs/introduction-to-smart-contracts.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index d19a0decf8..c448d7671d 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -584,5 +584,5 @@ but instead is implemented in the EVM execution environment itself.
 Different EVM-compatible chains might use a different set of
 precompiled contracts. It might also be possible that new
 precompiled contracts are added to the Ethereum main chain in the future,
-but you can reasonabyly expect them to always be in the range between
-``1`` and ``0xffff`` (inclusive).
\ No newline at end of file
+but you can reasonably expect them to always be in the range between
+``1`` and ``0xffff`` (inclusive).

From bd321b9f1f3b4e5527dc4958cc2b1c82c84e1c3f Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 23 Nov 2021 10:37:12 +0100
Subject: [PATCH 0134/1748] Rename RedundantAssignEliminator to
 UnusedAssignEliminator.

---
 libyul/CMakeLists.txt                         |  8 ++---
 libyul/optimiser/SSATransform.h               |  2 +-
 libyul/optimiser/Suite.cpp                    |  6 ++--
 ...minator.cpp => UnusedAssignEliminator.cpp} | 36 +++++++++----------
 ...nEliminator.h => UnusedAssignEliminator.h} | 10 +++---
 ...ndantStoreBase.cpp => UnusedStoreBase.cpp} | 20 +++++------
 ...RedundantStoreBase.h => UnusedStoreBase.h} |  8 ++---
 test/libyul/YulOptimizerTestCommon.cpp        | 10 +++---
 .../for.yul                                   |  0
 .../for_branch.yul                            |  0
 .../for_break.yul                             |  0
 .../for_continue.yul                          |  0
 .../for_continue_2.yul                        |  0
 .../for_continue_3.yul                        |  0
 .../for_decl_inside_break_continue.yul        |  0
 .../for_deep_noremove.yul                     |  0
 .../for_deep_simple.yul                       |  0
 .../for_multi_break.yul                       |  0
 .../for_nested.yul                            |  0
 .../for_rerun.yul                             |  0
 .../for_stmnts_after_break_continue.yul       |  0
 .../function.yul                              |  0
 .../if.yul                                    |  0
 .../if_overwrite_all_branches.yul             |  0
 .../if_used_in_one_branch.yul                 |  0
 .../leave.yul                                 |  0
 .../multi_assign.yul                          |  0
 .../multivar.yul                              |  0
 .../non_movable.yul                           |  0
 .../remove_break.yul                          |  0
 .../remove_continue.yul                       |  0
 .../scopes.yul                                |  0
 .../simple.yul                                |  0
 .../switch_overwrite_in_all.yul               |  0
 .../switch_overwrite_in_one.yul               |  0
 .../switch_overwrite_use_combination.yul      |  0
 .../switch_unused.yul                         |  0
 test/yulPhaser/Chromosome.cpp                 |  4 +--
 38 files changed, 52 insertions(+), 52 deletions(-)
 rename libyul/optimiser/{RedundantAssignEliminator.cpp => UnusedAssignEliminator.cpp} (74%)
 rename libyul/optimiser/{RedundantAssignEliminator.h => UnusedAssignEliminator.h} (94%)
 rename libyul/optimiser/{RedundantStoreBase.cpp => UnusedStoreBase.cpp} (86%)
 rename libyul/optimiser/{RedundantStoreBase.h => UnusedStoreBase.h} (92%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_branch.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_break.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_continue.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_continue_2.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_continue_3.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_decl_inside_break_continue.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_deep_noremove.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_deep_simple.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_multi_break.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_nested.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_rerun.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/for_stmnts_after_break_continue.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/function.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/if.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/if_overwrite_all_branches.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/if_used_in_one_branch.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/leave.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/multi_assign.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/multivar.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/non_movable.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/remove_break.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/remove_continue.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/scopes.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/simple.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/switch_overwrite_in_all.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/switch_overwrite_in_one.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/switch_overwrite_use_combination.yul (100%)
 rename test/libyul/yulOptimizerTests/{redundantAssignEliminator => unusedAssignEliminator}/switch_unused.yul (100%)

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 039e24ea91..16b68535a9 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -173,10 +173,10 @@ add_library(yul
 	optimiser/OptimizerUtilities.h
 	optimiser/ReasoningBasedSimplifier.cpp
 	optimiser/ReasoningBasedSimplifier.h
-	optimiser/RedundantAssignEliminator.cpp
-	optimiser/RedundantAssignEliminator.h
-	optimiser/RedundantStoreBase.cpp
-	optimiser/RedundantStoreBase.h
+	optimiser/UnusedAssignEliminator.cpp
+	optimiser/UnusedAssignEliminator.h
+	optimiser/UnusedStoreBase.cpp
+	optimiser/UnusedStoreBase.h
 	optimiser/Rematerialiser.cpp
 	optimiser/Rematerialiser.h
 	optimiser/SMTSolver.cpp
diff --git a/libyul/optimiser/SSATransform.h b/libyul/optimiser/SSATransform.h
index 66015362a1..64181bf208 100644
--- a/libyul/optimiser/SSATransform.h
+++ b/libyul/optimiser/SSATransform.h
@@ -70,7 +70,7 @@ class NameDispenser;
  * variable references can use the SSA variable. The only exception to this rule are
  * for loop conditions, as we cannot insert a variable declaration there.
  *
- * After this stage, redundantAssignmentRemover is recommended to remove the unnecessary
+ * After this stage, UnusedAssignmentEliminator is recommended to remove the unnecessary
  * intermediate assignments.
  *
  * This stage provides best results if CSE is run right before it, because
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 766cc93b90..4012fa9700 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -55,7 +55,7 @@
 #include <libyul/optimiser/StackLimitEvader.h>
 #include <libyul/optimiser/StructuralSimplifier.h>
 #include <libyul/optimiser/SyntacticalEquality.h>
-#include <libyul/optimiser/RedundantAssignEliminator.h>
+#include <libyul/optimiser/UnusedAssignEliminator.h>
 #include <libyul/optimiser/VarNameCleaner.h>
 #include <libyul/optimiser/LoadResolver.h>
 #include <libyul/optimiser/LoopInvariantCodeMotion.h>
@@ -219,7 +219,7 @@ map<string, unique_ptr<OptimiserStep>> const& OptimiserSuite::allSteps()
 			LiteralRematerialiser,
 			LoadResolver,
 			LoopInvariantCodeMotion,
-			RedundantAssignEliminator,
+			UnusedAssignEliminator,
 			ReasoningBasedSimplifier,
 			Rematerialiser,
 			SSAReverser,
@@ -260,7 +260,7 @@ map<string, char> const& OptimiserSuite::stepNameToAbbreviationMap()
 		{LoadResolver::name,                  'L'},
 		{LoopInvariantCodeMotion::name,       'M'},
 		{ReasoningBasedSimplifier::name,      'R'},
-		{RedundantAssignEliminator::name,     'r'},
+		{UnusedAssignEliminator::name,        'r'},
 		{Rematerialiser::name,                'm'},
 		{SSAReverser::name,                   'V'},
 		{SSATransform::name,                  'a'},
diff --git a/libyul/optimiser/RedundantAssignEliminator.cpp b/libyul/optimiser/UnusedAssignEliminator.cpp
similarity index 74%
rename from libyul/optimiser/RedundantAssignEliminator.cpp
rename to libyul/optimiser/UnusedAssignEliminator.cpp
index b6ac69c8f0..74dd599a11 100644
--- a/libyul/optimiser/RedundantAssignEliminator.cpp
+++ b/libyul/optimiser/UnusedAssignEliminator.cpp
@@ -20,7 +20,7 @@
  * until they go out of scope or are re-assigned.
  */
 
-#include <libyul/optimiser/RedundantAssignEliminator.h>
+#include <libyul/optimiser/UnusedAssignEliminator.h>
 
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/AST.h>
@@ -33,36 +33,36 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
-void RedundantAssignEliminator::run(OptimiserStepContext& _context, Block& _ast)
+void UnusedAssignEliminator::run(OptimiserStepContext& _context, Block& _ast)
 {
-	RedundantAssignEliminator rae{_context.dialect};
+	UnusedAssignEliminator rae{_context.dialect};
 	rae(_ast);
 
 	StatementRemover remover{rae.m_pendingRemovals};
 	remover(_ast);
 }
 
-void RedundantAssignEliminator::operator()(Identifier const& _identifier)
+void UnusedAssignEliminator::operator()(Identifier const& _identifier)
 {
 	changeUndecidedTo(_identifier.name, State::Used);
 }
 
-void RedundantAssignEliminator::operator()(VariableDeclaration const& _variableDeclaration)
+void UnusedAssignEliminator::operator()(VariableDeclaration const& _variableDeclaration)
 {
-	RedundantStoreBase::operator()(_variableDeclaration);
+	UnusedStoreBase::operator()(_variableDeclaration);
 
 	for (auto const& var: _variableDeclaration.variables)
 		m_declaredVariables.emplace(var.name);
 }
 
-void RedundantAssignEliminator::operator()(Assignment const& _assignment)
+void UnusedAssignEliminator::operator()(Assignment const& _assignment)
 {
 	visit(*_assignment.value);
 	for (auto const& var: _assignment.variableNames)
 		changeUndecidedTo(var.name, State::Unused);
 }
 
-void RedundantAssignEliminator::operator()(FunctionDefinition const& _functionDefinition)
+void UnusedAssignEliminator::operator()(FunctionDefinition const& _functionDefinition)
 {
 	ScopedSaveAndRestore outerDeclaredVariables(m_declaredVariables, {});
 	ScopedSaveAndRestore outerReturnVariables(m_returnVariables, {});
@@ -70,28 +70,28 @@ void RedundantAssignEliminator::operator()(FunctionDefinition const& _functionDe
 	for (auto const& retParam: _functionDefinition.returnVariables)
 		m_returnVariables.insert(retParam.name);
 
-	RedundantStoreBase::operator()(_functionDefinition);
+	UnusedStoreBase::operator()(_functionDefinition);
 }
 
-void RedundantAssignEliminator::operator()(Leave const&)
+void UnusedAssignEliminator::operator()(Leave const&)
 {
 	for (YulString name: m_returnVariables)
 		changeUndecidedTo(name, State::Used);
 }
 
-void RedundantAssignEliminator::operator()(Block const& _block)
+void UnusedAssignEliminator::operator()(Block const& _block)
 {
 	ScopedSaveAndRestore outerDeclaredVariables(m_declaredVariables, {});
 
-	RedundantStoreBase::operator()(_block);
+	UnusedStoreBase::operator()(_block);
 
 	for (auto const& var: m_declaredVariables)
 		finalize(var, State::Unused);
 }
 
-void RedundantAssignEliminator::visit(Statement const& _statement)
+void UnusedAssignEliminator::visit(Statement const& _statement)
 {
-	RedundantStoreBase::visit(_statement);
+	UnusedStoreBase::visit(_statement);
 
 	if (auto const* assignment = get_if<Assignment>(&_statement))
 		if (assignment->variableNames.size() == 1)
@@ -99,7 +99,7 @@ void RedundantAssignEliminator::visit(Statement const& _statement)
 			m_stores[assignment->variableNames.front().name][&_statement];
 }
 
-void RedundantAssignEliminator::shortcutNestedLoop(TrackedStores const& _zeroRuns)
+void UnusedAssignEliminator::shortcutNestedLoop(TrackedStores const& _zeroRuns)
 {
 	// Shortcut to avoid horrible runtime:
 	// Change all assignments that were newly introduced in the for loop to "used".
@@ -116,7 +116,7 @@ void RedundantAssignEliminator::shortcutNestedLoop(TrackedStores const& _zeroRun
 		}
 }
 
-void RedundantAssignEliminator::finalizeFunctionDefinition(FunctionDefinition const& _functionDefinition)
+void UnusedAssignEliminator::finalizeFunctionDefinition(FunctionDefinition const& _functionDefinition)
 {
 	for (auto const& param: _functionDefinition.parameters)
 		finalize(param.name, State::Unused);
@@ -124,14 +124,14 @@ void RedundantAssignEliminator::finalizeFunctionDefinition(FunctionDefinition co
 		finalize(retParam.name, State::Used);
 }
 
-void RedundantAssignEliminator::changeUndecidedTo(YulString _variable, RedundantAssignEliminator::State _newState)
+void UnusedAssignEliminator::changeUndecidedTo(YulString _variable, UnusedAssignEliminator::State _newState)
 {
 	for (auto& assignment: m_stores[_variable])
 		if (assignment.second == State::Undecided)
 			assignment.second = _newState;
 }
 
-void RedundantAssignEliminator::finalize(YulString _variable, RedundantAssignEliminator::State _finalState)
+void UnusedAssignEliminator::finalize(YulString _variable, UnusedAssignEliminator::State _finalState)
 {
 	std::map<Statement const*, State> stores = std::move(m_stores[_variable]);
 	m_stores.erase(_variable);
diff --git a/libyul/optimiser/RedundantAssignEliminator.h b/libyul/optimiser/UnusedAssignEliminator.h
similarity index 94%
rename from libyul/optimiser/RedundantAssignEliminator.h
rename to libyul/optimiser/UnusedAssignEliminator.h
index 65bbb53fa2..b5a2998a17 100644
--- a/libyul/optimiser/RedundantAssignEliminator.h
+++ b/libyul/optimiser/UnusedAssignEliminator.h
@@ -25,7 +25,7 @@
 #include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/RedundantStoreBase.h>
+#include <libyul/optimiser/UnusedStoreBase.h>
 
 #include <map>
 #include <vector>
@@ -107,13 +107,13 @@ struct Dialect;
  *
  * Prerequisite: Disambiguator, ForLoopInitRewriter.
  */
-class RedundantAssignEliminator: public RedundantStoreBase
+class UnusedAssignEliminator: public UnusedStoreBase
 {
 public:
-	static constexpr char const* name{"RedundantAssignEliminator"};
+	static constexpr char const* name{"UnusedAssignEliminator"};
 	static void run(OptimiserStepContext&, Block& _ast);
 
-	explicit RedundantAssignEliminator(Dialect const& _dialect): RedundantStoreBase(_dialect) {}
+	explicit UnusedAssignEliminator(Dialect const& _dialect): UnusedStoreBase(_dialect) {}
 
 	void operator()(Identifier const& _identifier) override;
 	void operator()(VariableDeclaration const& _variableDeclaration) override;
@@ -122,7 +122,7 @@ class RedundantAssignEliminator: public RedundantStoreBase
 	void operator()(Leave const&) override;
 	void operator()(Block const& _block) override;
 
-	using RedundantStoreBase::visit;
+	using UnusedStoreBase::visit;
 	void visit(Statement const& _statement) override;
 
 private:
diff --git a/libyul/optimiser/RedundantStoreBase.cpp b/libyul/optimiser/UnusedStoreBase.cpp
similarity index 86%
rename from libyul/optimiser/RedundantStoreBase.cpp
rename to libyul/optimiser/UnusedStoreBase.cpp
index 6fc0570b74..27700bdf74 100644
--- a/libyul/optimiser/RedundantStoreBase.cpp
+++ b/libyul/optimiser/UnusedStoreBase.cpp
@@ -16,10 +16,10 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 /**
- * Base class for both RedundantAssignEliminator and RedundantStoreEliminator.
+ * Base class for both UnusedAssignEliminator and UnusedStoreEliminator.
  */
 
-#include <libyul/optimiser/RedundantStoreBase.h>
+#include <libyul/optimiser/UnusedStoreBase.h>
 
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
@@ -33,7 +33,7 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
-void RedundantStoreBase::operator()(If const& _if)
+void UnusedStoreBase::operator()(If const& _if)
 {
 	visit(*_if.condition);
 
@@ -43,7 +43,7 @@ void RedundantStoreBase::operator()(If const& _if)
 	merge(m_stores, move(skipBranch));
 }
 
-void RedundantStoreBase::operator()(Switch const& _switch)
+void UnusedStoreBase::operator()(Switch const& _switch)
 {
 	visit(*_switch.expression);
 
@@ -69,7 +69,7 @@ void RedundantStoreBase::operator()(Switch const& _switch)
 		merge(m_stores, move(branch));
 }
 
-void RedundantStoreBase::operator()(FunctionDefinition const& _functionDefinition)
+void UnusedStoreBase::operator()(FunctionDefinition const& _functionDefinition)
 {
 	ScopedSaveAndRestore outerAssignments(m_stores, {});
 	ScopedSaveAndRestore forLoopInfo(m_forLoopInfo, {});
@@ -79,7 +79,7 @@ void RedundantStoreBase::operator()(FunctionDefinition const& _functionDefinitio
 	finalizeFunctionDefinition(_functionDefinition);
 }
 
-void RedundantStoreBase::operator()(ForLoop const& _forLoop)
+void UnusedStoreBase::operator()(ForLoop const& _forLoop)
 {
 	ScopedSaveAndRestore outerForLoopInfo(m_forLoopInfo, {});
 	ScopedSaveAndRestore forLoopNestingDepth(m_forLoopNestingDepth, m_forLoopNestingDepth + 1);
@@ -127,19 +127,19 @@ void RedundantStoreBase::operator()(ForLoop const& _forLoop)
 	m_forLoopInfo.pendingBreakStmts.clear();
 }
 
-void RedundantStoreBase::operator()(Break const&)
+void UnusedStoreBase::operator()(Break const&)
 {
 	m_forLoopInfo.pendingBreakStmts.emplace_back(move(m_stores));
 	m_stores.clear();
 }
 
-void RedundantStoreBase::operator()(Continue const&)
+void UnusedStoreBase::operator()(Continue const&)
 {
 	m_forLoopInfo.pendingContinueStmts.emplace_back(move(m_stores));
 	m_stores.clear();
 }
 
-void RedundantStoreBase::merge(TrackedStores& _target, TrackedStores&& _other)
+void UnusedStoreBase::merge(TrackedStores& _target, TrackedStores&& _other)
 {
 	util::joinMap(_target, move(_other), [](
 		map<Statement const*, State>& _assignmentHere,
@@ -150,7 +150,7 @@ void RedundantStoreBase::merge(TrackedStores& _target, TrackedStores&& _other)
 	});
 }
 
-void RedundantStoreBase::merge(TrackedStores& _target, vector<TrackedStores>&& _source)
+void UnusedStoreBase::merge(TrackedStores& _target, vector<TrackedStores>&& _source)
 {
 	for (TrackedStores& ts: _source)
 		merge(_target, move(ts));
diff --git a/libyul/optimiser/RedundantStoreBase.h b/libyul/optimiser/UnusedStoreBase.h
similarity index 92%
rename from libyul/optimiser/RedundantStoreBase.h
rename to libyul/optimiser/UnusedStoreBase.h
index ed588927c1..a65af4e45a 100644
--- a/libyul/optimiser/RedundantStoreBase.h
+++ b/libyul/optimiser/UnusedStoreBase.h
@@ -16,7 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 /**
- * Base class for both RedundantAssignEliminator and RedundantStoreEliminator.
+ * Base class for both UnusedAssignEliminator and UnusedStoreEliminator.
  */
 
 #pragma once
@@ -34,14 +34,14 @@ namespace solidity::yul
 struct Dialect;
 
 /**
- * Base class for both RedundantAssignEliminator and RedundantStoreEliminator.
+ * Base class for both UnusedAssignEliminator and UnusedStoreEliminator.
  *
  * Prerequisite: Disambiguator, ForLoopInitRewriter.
  */
-class RedundantStoreBase: public ASTWalker
+class UnusedStoreBase: public ASTWalker
 {
 public:
-	explicit RedundantStoreBase(Dialect const& _dialect): m_dialect(_dialect) {}
+	explicit UnusedStoreBase(Dialect const& _dialect): m_dialect(_dialect) {}
 
 	using ASTWalker::operator();
 	void operator()(If const& _if) override;
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 962cb18a40..cc315c4b97 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -52,7 +52,7 @@
 #include <libyul/optimiser/SSAReverser.h>
 #include <libyul/optimiser/SSATransform.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/RedundantAssignEliminator.h>
+#include <libyul/optimiser/UnusedAssignEliminator.h>
 #include <libyul/optimiser/StructuralSimplifier.h>
 #include <libyul/optimiser/StackCompressor.h>
 #include <libyul/optimiser/Suite.h>
@@ -231,16 +231,16 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			ForLoopInitRewriter::run(*m_context, *m_ast);
 			SSATransform::run(*m_context, *m_ast);
 		}},
-		{"redundantAssignEliminator", [&]() {
+		{"unusedAssignEliminator", [&]() {
 			disambiguate();
 			ForLoopInitRewriter::run(*m_context, *m_ast);
-			RedundantAssignEliminator::run(*m_context, *m_ast);
+			UnusedAssignEliminator::run(*m_context, *m_ast);
 		}},
 		{"ssaPlusCleanup", [&]() {
 			disambiguate();
 			ForLoopInitRewriter::run(*m_context, *m_ast);
 			SSATransform::run(*m_context, *m_ast);
-			RedundantAssignEliminator::run(*m_context, *m_ast);
+			UnusedAssignEliminator::run(*m_context, *m_ast);
 		}},
 		{"loadResolver", [&]() {
 			disambiguate();
@@ -293,7 +293,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			ForLoopInitRewriter::run(*m_context, *m_ast);
 			// apply SSA
 			SSATransform::run(*m_context, *m_ast);
-			RedundantAssignEliminator::run(*m_context, *m_ast);
+			UnusedAssignEliminator::run(*m_context, *m_ast);
 			// reverse SSA
 			SSAReverser::run(*m_context, *m_ast);
 			FunctionHoister::run(*m_context, *m_ast);
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_branch.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_branch.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_branch.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_branch.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_break.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_break.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_break.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_break.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_continue.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_continue_2.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_2.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_continue_2.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_2.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_continue_3.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_3.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_continue_3.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_3.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_decl_inside_break_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_decl_inside_break_continue.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_decl_inside_break_continue.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_decl_inside_break_continue.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_deep_noremove.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_deep_noremove.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_deep_simple.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_simple.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_deep_simple.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_simple.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_multi_break.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_multi_break.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_multi_break.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_multi_break.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_nested.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_nested.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_nested.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_nested.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_rerun.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_rerun.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_rerun.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_rerun.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/for_stmnts_after_break_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_stmnts_after_break_continue.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/for_stmnts_after_break_continue.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/for_stmnts_after_break_continue.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/function.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/function.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/function.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/function.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/if.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/if.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/if_overwrite_all_branches.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_overwrite_all_branches.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/if_overwrite_all_branches.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/if_overwrite_all_branches.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/if_used_in_one_branch.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_used_in_one_branch.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/if_used_in_one_branch.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/if_used_in_one_branch.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/leave.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/leave.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/leave.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/leave.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/multi_assign.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/multi_assign.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/multi_assign.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/multi_assign.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/multivar.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/multivar.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/multivar.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/multivar.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/non_movable.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/non_movable.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/non_movable.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/non_movable.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/remove_break.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_break.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/remove_break.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_break.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/remove_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_continue.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/remove_continue.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_continue.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/scopes.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/scopes.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/scopes.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/scopes.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/simple.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/simple.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/simple.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/simple.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_overwrite_in_all.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_all.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_overwrite_in_all.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_all.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_overwrite_in_one.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_one.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_overwrite_in_one.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_one.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_overwrite_use_combination.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_use_combination.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_overwrite_use_combination.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_use_combination.yul
diff --git a/test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_unused.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_unused.yul
similarity index 100%
rename from test/libyul/yulOptimizerTests/redundantAssignEliminator/switch_unused.yul
rename to test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_unused.yul
diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp
index 55bfd8f24b..9a396283d2 100644
--- a/test/yulPhaser/Chromosome.cpp
+++ b/test/yulPhaser/Chromosome.cpp
@@ -30,7 +30,7 @@
 #include <libyul/optimiser/ForLoopInitRewriter.h>
 #include <libyul/optimiser/FunctionHoister.h>
 #include <libyul/optimiser/LoopInvariantCodeMotion.h>
-#include <libyul/optimiser/RedundantAssignEliminator.h>
+#include <libyul/optimiser/UnusedAssignEliminator.h>
 #include <libyul/optimiser/Rematerialiser.h>
 #include <libyul/optimiser/Suite.h>
 #include <libyul/optimiser/StructuralSimplifier.h>
@@ -50,7 +50,7 @@ namespace solidity::phaser::test
 vector<string> const ChrOmOsoMeSteps{
 	ConditionalSimplifier::name,
 	FunctionHoister::name,
-	RedundantAssignEliminator::name,
+	UnusedAssignEliminator::name,
 	ForLoopConditionOutOfBody::name,
 	Rematerialiser::name,
 	ForLoopConditionOutOfBody::name,

From 3b98bee29adcac26e68c72fc4b5f59b43da08f68 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 23 Nov 2021 14:05:14 +0100
Subject: [PATCH 0135/1748] Update z3 version.

---
 scripts/deps-ppa/static_z3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index 66fbd3fa73..e8dec0faee 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -25,7 +25,7 @@ set -ev
 keyid=70D110489D66E2F6
 email=builds@ethereum.org
 packagename=z3-static
-version=4.8.12
+version=4.8.13
 
 DISTRIBUTIONS="focal groovy hirsute"
 

From 0e7a065a782b50b95bcca0291e1caefab6ac05bb Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 23 Nov 2021 10:42:18 +0100
Subject: [PATCH 0136/1748] Enhance documentation.

---
 libyul/optimiser/UnusedStoreBase.h                           | 5 +++++
 test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/for_branch.yul  | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/for_break.yul   | 2 +-
 .../unusedAssignEliminator/for_continue.yul                  | 2 +-
 .../unusedAssignEliminator/for_continue_2.yul                | 2 +-
 .../unusedAssignEliminator/for_continue_3.yul                | 2 +-
 .../for_decl_inside_break_continue.yul                       | 2 +-
 .../unusedAssignEliminator/for_deep_noremove.yul             | 2 +-
 .../unusedAssignEliminator/for_deep_simple.yul               | 2 +-
 .../unusedAssignEliminator/for_multi_break.yul               | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/for_nested.yul  | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/for_rerun.yul   | 2 +-
 .../for_stmnts_after_break_continue.yul                      | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/function.yul    | 2 +-
 test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul  | 2 +-
 .../unusedAssignEliminator/if_overwrite_all_branches.yul     | 2 +-
 .../unusedAssignEliminator/if_used_in_one_branch.yul         | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/leave.yul       | 2 +-
 .../unusedAssignEliminator/multi_assign.yul                  | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/multivar.yul    | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/non_movable.yul | 2 +-
 .../unusedAssignEliminator/remove_break.yul                  | 2 +-
 .../unusedAssignEliminator/remove_continue.yul               | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/scopes.yul      | 2 +-
 .../yulOptimizerTests/unusedAssignEliminator/simple.yul      | 2 +-
 .../unusedAssignEliminator/switch_overwrite_in_all.yul       | 2 +-
 .../unusedAssignEliminator/switch_overwrite_in_one.yul       | 2 +-
 .../switch_overwrite_use_combination.yul                     | 2 +-
 .../unusedAssignEliminator/switch_unused.yul                 | 2 +-
 test/yulPhaser/Chromosome.cpp                                | 2 +-
 31 files changed, 35 insertions(+), 30 deletions(-)

diff --git a/libyul/optimiser/UnusedStoreBase.h b/libyul/optimiser/UnusedStoreBase.h
index a65af4e45a..3bd4e42976 100644
--- a/libyul/optimiser/UnusedStoreBase.h
+++ b/libyul/optimiser/UnusedStoreBase.h
@@ -36,6 +36,11 @@ struct Dialect;
 /**
  * Base class for both UnusedAssignEliminator and UnusedStoreEliminator.
  *
+ * The class tracks the state of abstract "stores" (assignments or mstore/sstore
+ * statements) across the control-flow. It is the job of the derived class to create
+ * the stores and track references, but the base class adjusts their "used state" at
+ * control-flow splits and joins.
+ *
  * Prerequisite: Disambiguator, ForLoopInitRewriter.
  */
 class UnusedStoreBase: public ASTWalker
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul
index 3149633680..89de8920cd 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for.yul
@@ -8,7 +8,7 @@
     }
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let a := 2
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_branch.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_branch.yul
index 120b43ce81..8700c8d28b 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_branch.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_branch.yul
@@ -14,7 +14,7 @@
     mstore(x, 0)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_break.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_break.yul
index 1b795ad8c7..db55bf7588 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_break.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_break.yul
@@ -13,7 +13,7 @@
     mstore(x, 0x42)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
index 0ee9c551da..d3cfb0d84b 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue.yul
@@ -16,7 +16,7 @@
     x := 3
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_2.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_2.yul
index ee747ae5d0..2d5bae46e2 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_2.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_2.yul
@@ -13,7 +13,7 @@
     mstore(x, 0x42)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_3.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_3.yul
index b70f35d2bc..d9980d376d 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_3.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_continue_3.yul
@@ -12,7 +12,7 @@
     }
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_decl_inside_break_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_decl_inside_break_continue.yul
index f54b21af8b..94b100e2a9 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_decl_inside_break_continue.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_decl_inside_break_continue.yul
@@ -19,7 +19,7 @@
     mstore(x, 0x42)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x := 1
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
index 5edd71d58b..02a735f9e5 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
@@ -26,7 +26,7 @@
     x := 13
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x := 1
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_simple.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_simple.yul
index 5b086bab8a..039d856d96 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_simple.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_simple.yul
@@ -19,7 +19,7 @@
     }
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     for { } 1 { }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_multi_break.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_multi_break.yul
index ce084b1ce1..3b18dcc8dc 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_multi_break.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_multi_break.yul
@@ -35,7 +35,7 @@
     mstore(x, 0x42)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x := 1
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_nested.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_nested.yul
index a83f536668..101101b923 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_nested.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_nested.yul
@@ -32,7 +32,7 @@
     mstore(x, 0x42)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x := 1
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_rerun.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_rerun.yul
index 5d1e607385..08cf63a52d 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_rerun.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_rerun.yul
@@ -11,7 +11,7 @@
     x := 3
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_stmnts_after_break_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_stmnts_after_break_continue.yul
index 5e88df9689..1a92d3b841 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_stmnts_after_break_continue.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_stmnts_after_break_continue.yul
@@ -23,7 +23,7 @@
     mstore(x, 0x42)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x := 1
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/function.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/function.yul
index 2a20ca8b69..044a5f418f 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/function.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/function.yul
@@ -12,7 +12,7 @@
     r := 2
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let r
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul
index 2fab04a36f..7c65680ae6 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if.yul
@@ -10,7 +10,7 @@
     mstore(0, d)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let c
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_overwrite_all_branches.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_overwrite_all_branches.yul
index 7585f848a2..860050e59d 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_overwrite_all_branches.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_overwrite_all_branches.yul
@@ -11,7 +11,7 @@
     mstore(0, d)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let c
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_used_in_one_branch.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_used_in_one_branch.yul
index 637a32c02a..90643f174c 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_used_in_one_branch.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/if_used_in_one_branch.yul
@@ -11,7 +11,7 @@
     mstore(0, d)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let c
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/leave.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/leave.yul
index 1caee198a1..82bf493470 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/leave.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/leave.yul
@@ -21,7 +21,7 @@
     }
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     function f(a, b) -> x
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/multi_assign.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/multi_assign.yul
index f0845680f4..d4b35e7ee1 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/multi_assign.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/multi_assign.yul
@@ -9,7 +9,7 @@
     y := 4
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     function f() -> a, b
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/multivar.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/multivar.yul
index 2b13ba3c36..d4dda8f902 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/multivar.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/multivar.yul
@@ -6,7 +6,7 @@
     a := b
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let a := 2
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/non_movable.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/non_movable.yul
index 343c672dea..e131b3549e 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/non_movable.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/non_movable.yul
@@ -4,7 +4,7 @@
     a := mload(0)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let a
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_break.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_break.yul
index 035f66d385..76a536c2f3 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_break.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_break.yul
@@ -12,7 +12,7 @@
     }
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let i := 0
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_continue.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_continue.yul
index c4f3b3e43f..27083a73c2 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_continue.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/remove_continue.yul
@@ -13,7 +13,7 @@
 }
 
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let i := 0
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/scopes.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/scopes.yul
index d3c6cb4a6d..bc2d4d80f6 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/scopes.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/scopes.yul
@@ -7,7 +7,7 @@
     }
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let a
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/simple.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/simple.yul
index 12b9ae6b71..326ce29dcd 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/simple.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/simple.yul
@@ -4,6 +4,6 @@
     a := 2
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // { let a }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_all.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_all.yul
index a39cdedd70..a6b77f8973 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_all.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_all.yul
@@ -8,7 +8,7 @@
     mstore(x, 0)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_one.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_one.yul
index 271bb4864c..9b0a23cd88 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_one.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_in_one.yul
@@ -7,7 +7,7 @@
     mstore(x, 0)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_use_combination.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_use_combination.yul
index 8d38dcc161..611123db36 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_use_combination.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_overwrite_use_combination.yul
@@ -8,7 +8,7 @@
     mstore(x, 0)
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_unused.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_unused.yul
index 94de51b889..c15c889919 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_unused.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/switch_unused.yul
@@ -6,7 +6,7 @@
     case 0 { mstore(0, 1) }
 }
 // ----
-// step: redundantAssignEliminator
+// step: unusedAssignEliminator
 //
 // {
 //     let x
diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp
index 9a396283d2..19616cde0b 100644
--- a/test/yulPhaser/Chromosome.cpp
+++ b/test/yulPhaser/Chromosome.cpp
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_strin
 
 	BOOST_TEST(chromosome.length() == allSteps.size());
 	BOOST_TEST(chromosome.optimisationSteps() == allSteps);
-	BOOST_TEST(toString(chromosome) == "flcCUnDvejsxIOoighFTLMRrmVatpud");
+	BOOST_TEST(toString(chromosome) == "flcCUnDvejsxIOoighFTLMRmVatrpud");
 }
 
 BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names)

From 4e6b5205ac0e7921edd311a9a2053ec5675a3b87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 23 Nov 2021 16:40:54 +0100
Subject: [PATCH 0137/1748] CI: Include workflow name instead of hard-coded
 "nightly" in gitter notifications

---
 .circleci/config.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 10d0d0116d..b917dd5670 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -48,8 +48,13 @@ commands:
             # but it's broken. CircleCI associates runs on develop/breaking with random old PRs.
             [[ $CIRCLE_BRANCH == develop || $CIRCLE_BRANCH == breaking ]] || { echo "Running on a PR or a feature branch - notification skipped."; exit 0; }
 
-            [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ Nightly job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
-            [[ "<< parameters.event >>" == "success" ]] && message=" ✅ Nightly job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
+            # Workflow name is not exposed as an env variable. Has to be queried from the API.
+            # The name is not critical so if anything fails, use the raw workflow ID as a fallback.
+            workflow_info=$(curl --silent "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}") || true
+            workflow_name=$(echo "$workflow_info" | jq --raw-output .name || echo "$CIRCLE_WORKFLOW_ID")
+
+            [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ [${workflow_name}] Job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
+            [[ "<< parameters.event >>" == "success" ]] && message=" ✅ [${workflow_name}] Job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
 
             curl "https://api.gitter.im/v1/rooms/${GITTER_NOTIFY_ROOM_ID}/chatMessages" \
               --request POST \

From 00fb719d03cb3495ceee9c63fd4a8df4da986f3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 23 Nov 2021 16:41:22 +0100
Subject: [PATCH 0138/1748] CI: Don't use # in gitter notifications

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b917dd5670..dce0553751 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,8 +53,8 @@ commands:
             workflow_info=$(curl --silent "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}") || true
             workflow_name=$(echo "$workflow_info" | jq --raw-output .name || echo "$CIRCLE_WORKFLOW_ID")
 
-            [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ [${workflow_name}] Job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
-            [[ "<< parameters.event >>" == "success" ]] && message=" ✅ [${workflow_name}] Job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see [build #${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
+            [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ [${workflow_name}] Job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
+            [[ "<< parameters.event >>" == "success" ]] && message=" ✅ [${workflow_name}] Job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
 
             curl "https://api.gitter.im/v1/rooms/${GITTER_NOTIFY_ROOM_ID}/chatMessages" \
               --request POST \

From 406b1fbcec5bbc0d497adea016d02a98a32ad8e7 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 23 Nov 2021 18:07:59 +0100
Subject: [PATCH 0139/1748] bump docker hashes and z3 version

---
 .circleci/config.yml                  | 16 ++++++++--------
 .circleci/osx_install_dependencies.sh |  4 ++--
 CMakeLists.txt                        |  2 +-
 scripts/build_emscripten.sh           |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index dce0553751..fb3abb37af 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,20 +9,20 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-8
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:9c3cdfc1d573d1ca3edacd892590a9a83487a1f746a6ca2093d7e009818c5179"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-9
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:3d8a912e8e78e98cd217955d06d98608ad60adc67728d4c3a569991235fa1abb"
   ubuntu-2004-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-8
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:61232feea23c8c57e82cf5fae890f8b86bbec353cdc04f2fcba383ca589e1d8b"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-9
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:a1ba002cae17279d1396a898b04e4e9c45602ad881295db3e2f484a7e24f6f43"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-13
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:c26a7ffc9fc243a4ec3105b9dc1edcdd964ad0e9665c83172b7ebda74bbf3021"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-14
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:f353823cce2f6cd2f9f1459d86cd76fdfc551a0261d87626615ea6c1d8f90587"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-7
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:9ffcd0944433fe100e9433f2aa9ba5c21e096e758ad8a05a4a76feaed3d1f463"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-8
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:842d6074e0e7e5355c89122c1cafc1fdb59696596750e7d56e5f35c0d883ad59"
   evm-version:
     type: string
     default: london
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 7ef8635a87..a973988a6e 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -61,8 +61,8 @@ then
   ./scripts/install_obsolete_jsoncpp_1_7_4.sh
 
   # z3
-  z3_version="4.8.12"
-  z3_dir="z3-${z3_version}-x64-osx-10.15.7"
+  z3_version="4.8.13"
+  z3_dir="z3-${z3_version}-x64-osx-10.16"
   z3_package="${z3_dir}.zip"
   wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
   validate_checksum "$z3_package" a1f6ef3c99456147c4d3f2652dc6bc90951c4ab3fe7741a255eb794f0ab8938c
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3dc030c13..b4e91f8261 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/licens
 
 include(EthOptions)
 configure_project(TESTS)
-set(LATEST_Z3_VERSION "4.8.12")
+set(LATEST_Z3_VERSION "4.8.13")
 set(MINIMUM_Z3_VERSION "4.8.0")
 find_package(Z3)
 if (${Z3_FOUND})
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 7b8510026c..f6c9151ebf 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -34,7 +34,7 @@ else
     BUILD_DIR="$1"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-7
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-8
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:9ffcd0944433fe100e9433f2aa9ba5c21e096e758ad8a05a4a76feaed3d1f463 \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:842d6074e0e7e5355c89122c1cafc1fdb59696596750e7d56e5f35c0d883ad59 \
     ./scripts/ci/build_emscripten.sh "$BUILD_DIR"

From ff5c842d673b311a6dba7466f0506680dd3bab63 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 23 Nov 2021 18:08:36 +0100
Subject: [PATCH 0140/1748] update smtchecker tests

---
 .../smtCheckerTests/abi/abi_decode_array.sol        | 12 +++---------
 .../abi/abi_encode_with_sig_hash.sol                |  4 +---
 .../length_same_after_assignment_3_fail.sol         |  2 +-
 .../array_members/push_as_lhs_1d.sol                |  2 +-
 .../array_members/push_as_lhs_and_rhs_1d.sol        |  2 +-
 .../push_overflow_2_safe_no_overflow_assumption.sol |  1 -
 .../array_members/push_push_no_args_2_fail.sol      |  4 ++--
 .../blockchain_state/balance_receive_4.sol          |  2 +-
 .../blockchain_state/balance_receive_ext_calls.sol  |  2 +-
 .../balance_receive_ext_calls_2.sol                 |  2 +-
 .../balance_receive_ext_calls_mutex.sol             |  2 +-
 .../blockchain_state/balance_spend.sol              |  2 +-
 .../blockchain_state/balance_spend_2.sol            |  1 -
 .../this_does_not_change_external_call.sol          |  2 +-
 .../branches_in_modifiers_2.sol                     |  2 +-
 .../crypto/crypto_functions_compare_hashes.sol      | 12 +++++++++---
 .../crypto/crypto_functions_not_same.sol            |  4 +++-
 ..._functions_same_input_over_state_same_output.sol | 13 ++++++++++++-
 .../smtCheckerTests/external_calls/call_mutex.sol   |  2 +-
 .../external_calls/call_reentrancy_view.sol         |  2 +-
 .../smtCheckerTests/external_calls/call_safe.sol    |  2 +-
 .../external_calls/call_with_value_1.sol            |  4 +---
 .../external_call_this_with_value_1.sol             |  2 +-
 .../external_hash_known_code_state.sol              |  2 +-
 .../external_hash_known_code_state_reentrancy_3.sol |  2 +-
 ...rnal_hash_known_code_state_reentrancy_unsafe.sol |  4 +---
 .../external_calls/external_reentrancy_1.sol        |  4 +++-
 .../external_calls/external_reentrancy_crypto.sol   |  3 +++
 .../external_calls/external_single_inc.sol          |  2 +-
 .../functions/functions_external_1.sol              |  2 +-
 .../functions/functions_external_2.sol              |  2 +-
 .../smtCheckerTests/functions/getters/struct_3.sol  | 11 +++++++++--
 .../virtual_function_called_by_constructor.sol      |  2 +-
 .../natspec/unsafe_assert_remains_unsafe.sol        |  2 +-
 .../assignment_module_contract_member_variable.sol  |  2 +-
 .../operators/compound_add_array_index.sol          |  2 +-
 .../operators/compound_bitwise_string_literal_3.sol |  3 ++-
 .../operators/conditional_assignment_5.sol          |  4 +---
 .../operators/conditional_assignment_6.sol          |  2 +-
 .../operators/slice_default_start.sol               |  3 ++-
 .../smtCheckerTests/out_of_bounds/array_1.sol       |  3 +--
 .../overflow/unsigned_mul_overflow.sol              |  2 +-
 .../smtCheckerTests/special/abi_decode_simple.sol   |  2 +-
 .../special/tx_vars_chc_internal.sol                |  2 +-
 .../special/tx_vars_reentrancy_1.sol                |  2 +-
 .../special/tx_vars_reentrancy_2.sol                |  2 +-
 .../try_catch/try_public_var_mapping.sol            |  2 +-
 .../smtCheckerTests/types/abi_type_type_1.sol       |  2 +-
 .../smtCheckerTests/types/address_staticcall.sol    |  6 ++++--
 .../smtCheckerTests/types/bool_simple_2.sol         |  2 +-
 .../smtCheckerTests/types/fixed_bytes_access_3.sol  |  3 +--
 .../smtCheckerTests/userTypes/user_abi_1.sol        |  2 +-
 .../smtCheckerTests/userTypes/user_abi_2.sol        |  2 +-
 53 files changed, 92 insertions(+), 75 deletions(-)

diff --git a/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol b/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
index 3c88329a35..e2c0894934 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
@@ -32,9 +32,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (1009-1037): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (1056-1084): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (1103-1131): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (182-210): CHC: Assertion violation happens here.
 // Warning 6328: (335-363): CHC: Assertion violation happens here.
 // Warning 6328: (414-442): CHC: Assertion violation happens here.
@@ -42,9 +39,6 @@ contract C {
 // Warning 6328: (607-635): CHC: Assertion violation happens here.
 // Warning 6328: (654-682): CHC: Assertion violation happens here.
 // Warning 6328: (879-916): CHC: Assertion violation happens here.
-// Warning 6328: (1009-1037): CHC: Assertion violation might happen here.
-// Warning 6328: (1056-1084): CHC: Assertion violation might happen here.
-// Warning 6328: (1103-1131): CHC: Assertion violation might happen here.
-// Warning 4661: (1009-1037): BMC: Assertion violation happens here.
-// Warning 4661: (1056-1084): BMC: Assertion violation happens here.
-// Warning 4661: (1103-1131): BMC: Assertion violation happens here.
+// Warning 6328: (1009-1037): CHC: Assertion violation happens here.
+// Warning 6328: (1056-1084): CHC: Assertion violation happens here.
+// Warning 6328: (1103-1131): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
index dbf4237411..61e755d82d 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
@@ -13,9 +13,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (337-375): CHC: Error trying to invoke SMT solver.
 // Warning 1218: (394-432): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (337-375): CHC: Assertion violation might happen here.
+// Warning 6328: (337-375): CHC: Assertion violation happens here.
 // Warning 6328: (394-432): CHC: Assertion violation might happen here.
-// Warning 4661: (337-375): BMC: Assertion violation happens here.
 // Warning 4661: (394-432): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
index 062b668c38..7a7db383b2 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
@@ -31,4 +31,4 @@ contract C {
 // Warning 6328: (349-375): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
 // Warning 6328: (379-402): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
 // Warning 6328: (406-432): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 3)\n!(arr.length <= 5)\n!(arr.length <= 7)\n!(arr.length <= 8)\n
+// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 7)\n!(arr.length <= 8)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
index 30f194eb7c..5920a4e747 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
@@ -18,4 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (199-229): CHC: Assertion violation happens here.
+// Warning 6328: (199-229): CHC: Assertion violation happens here.\nCounterexample:\nb = [1]\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
index ad3ba78234..66776ed49f 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
@@ -14,4 +14,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (204-230): CHC: Assertion violation happens here.\nCounterexample:\nb = [0, 0]\nlength = 2\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.f()
+// Warning 6328: (204-230): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
index 60b11c91a6..046cf59a13 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
@@ -13,4 +13,3 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(x.length >= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
index dcda253ce4..42313dee93 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
@@ -13,5 +13,5 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (90-116): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[[0]]]\nlast = 0\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
-// Warning 6328: (170-186): CHC: Assertion violation happens here.
-// Warning 6328: (190-246): CHC: Assertion violation happens here.
+// Warning 6328: (170-186): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[[0]]]\nlast = 1\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
+// Warning 6328: (190-246): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[[0]]]\nlast = 1\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
index e8f750d07a..3e3e564317 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
@@ -15,7 +15,7 @@ contract C {
 // Warning 4984: (82-85): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (154-160): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (212-218): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (180-219): CHC: Assertion violation happens here.
+// Warning 6328: (180-219): CHC: Assertion violation happens here.\nCounterexample:\nc = 1\n\nTransaction trace:\nC.constructor()\nState: c = 0\nC.f(){ msg.value: 11 }\nState: c = 1\nC.inv()
 // Info 1180: Contract invariant(s) for :C:\n(((11 * c) + ((- 1) * (:var 1).balances[address(this)])) <= 0)\n
 // Warning 2661: (82-85): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (154-160): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
index e46dfda34b..1ee90e41d0 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
@@ -15,5 +15,5 @@ contract C {
 // ----
 // Warning 1218: (131-165): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (131-165): CHC: Assertion violation might happen here.
-// Info 1180: Reentrancy property(ies) for :C:\n(!(<errorCode> >= 2) && (((:var 0).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) >= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
+// Info 1180: Reentrancy property(ies) for :C:\n(!(<errorCode> >= 2) && (((:var 1).balances[address(this)] + ((- 1) * (:var 0).balances[address(this)])) <= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
 // Warning 4661: (131-165): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
index 28c4734bd4..c53f156d63 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
@@ -12,4 +12,4 @@ contract C {
 // ----
 // Warning 9302: (82-93): Return value of low-level calls not used.
 // Warning 6328: (97-131): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n((((:var 1).balances[address(this)] + ((- 1) * (:var 0).balances[address(this)])) <= 0) && !(<errorCode> >= 2))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
+// Info 1180: Reentrancy property(ies) for :C:\n(!(<errorCode> >= 2) && (((:var 1).balances[address(this)] + ((- 1) * (:var 0).balances[address(this)])) <= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
index 559f67e193..76443dfd05 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
@@ -22,4 +22,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (277-310): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n((!lock || (((:var 3).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) <= 0)) && !(<errorCode> = 1) && (lock' || !lock) && (!lock || (((:var 3).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) >= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance < x)\n
+// Info 1180: Reentrancy property(ies) for :C:\n((lock' || !lock) && !(<errorCode> = 1) && (!lock || (((:var 3).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) >= 0)) && (!lock || (((:var 3).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance < x)\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
index 1e4ec7a32a..bd30b77d1f 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
@@ -19,5 +19,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (280-314): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n((!(c <= 1) || !((:var 1).balances[address(this)] <= 91)) && !((:var 1).balances[address(this)] <= 82) && (!(c <= 0) || !((:var 1).balances[address(this)] <= 100)))\n
+// Info 1180: Contract invariant(s) for :C:\n((!(c <= 1) || !((:var 1).balances[address(this)] <= 90)) && !((:var 1).balances[address(this)] <= 81) && (!(c <= 0) || !((:var 1).balances[address(this)] <= 100)))\n
 // Warning 1236: (175-190): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
index 0b3a432e8c..5df0b99956 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend_2.sol
@@ -16,7 +16,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (193-226): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (193-226): CHC: Assertion violation might happen here.
 // Warning 6328: (245-279): CHC: Assertion violation happens here.
 // Warning 6328: (298-332): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
index 0b5136dcab..f169645010 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
@@ -18,4 +18,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(((address(this) + ((- 1) * t)) <= 0) && ((address(this) + ((- 1) * t)) >= 0))\nReentrancy property(ies) for :C:\n((!(<errorCode> >= 2) || !((t + ((- 1) * address(this))) = 0)) && (!((t + ((- 1) * address(this))) <= 0) || ((t' + ((- 1) * address(this))) <= 0)) && (!((t + ((- 1) * address(this))) >= 0) || ((address(this) + ((- 1) * t')) <= 0)))\n(((<errorCode> <= 0) || !((t + ((- 1) * address(this))) = 0)) && (!((t + ((- 1) * address(this))) <= 0) || ((t' + ((- 1) * address(this))) <= 0)) && (!((t + ((- 1) * address(this))) >= 0) || ((address(this) + ((- 1) * t')) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this) == t)\n<errorCode> = 2 -> Assertion failed at assert(a == t)\n
+// Info 1180: Contract invariant(s) for :C:\n(((address(this) + ((- 1) * t)) <= 0) && ((address(this) + ((- 1) * t)) >= 0))\nReentrancy property(ies) for :C:\n((!((t + ((- 1) * address(this))) = 0) || (<errorCode> <= 0)) && (!((t + ((- 1) * address(this))) <= 0) || ((t' + ((- 1) * address(this))) <= 0)) && (!((t + ((- 1) * address(this))) >= 0) || ((address(this) + ((- 1) * t')) <= 0)))\n((!(<errorCode> >= 2) || !((t + ((- 1) * address(this))) = 0)) && (!((t + ((- 1) * address(this))) <= 0) || ((t' + ((- 1) * address(this))) <= 0)) && (!((t + ((- 1) * address(this))) >= 0) || ((address(this) + ((- 1) * t')) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this) == t)\n<errorCode> = 2 -> Assertion failed at assert(a == t)\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
index 9765fc1f91..4241fa9e29 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
@@ -44,5 +44,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.test()\n    C.reset_if_overflow() -- internal call
-// Warning 6328: (502-519): CHC: Assertion violation happens here.
+// Warning 6328: (502-519): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\noldx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(1)\nState: x = 1\nC.test()\n    C.reset_if_overflow() -- internal call
 // Warning 6328: (615-629): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(10)\nState: x = 10\nC.test()\n    C.reset_if_overflow() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
index a49aeac090..79b30a1239 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
@@ -12,6 +12,12 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (150-164): CHC: Assertion violation happens here.
-// Warning 6328: (168-182): CHC: Assertion violation happens here.
-// Warning 6328: (186-200): CHC: Assertion violation happens here.
+// Warning 1218: (150-164): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (168-182): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (186-200): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (150-164): CHC: Assertion violation might happen here.
+// Warning 6328: (168-182): CHC: Assertion violation might happen here.
+// Warning 6328: (186-200): CHC: Assertion violation might happen here.
+// Warning 4661: (150-164): BMC: Assertion violation happens here.
+// Warning 4661: (168-182): BMC: Assertion violation happens here.
+// Warning 4661: (186-200): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
index a8c6199d0f..59a011f240 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
@@ -12,4 +12,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (196-210): CHC: Assertion violation happens here.
+// Warning 1218: (196-210): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (196-210): CHC: Assertion violation might happen here.
+// Warning 4661: (196-210): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
index 228f9d5809..94eedd5991 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
@@ -37,4 +37,15 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(((erc + ((- 1) * ecrecover(tuple_constructor(h, v, r, s)))) <= 0) && ((erc + ((- 1) * ecrecover(tuple_constructor(h, v, r, s)))) >= 0))\n(((kec + ((- 1) * keccak256(data))) >= 0) && ((kec + ((- 1) * keccak256(data))) <= 0))\n(((rip + ((- 1) * ripemd160(data))) <= 0) && ((rip + ((- 1) * ripemd160(data))) >= 0))\n(((sha + ((- 1) * sha256(data))) <= 0) && ((sha + ((- 1) * sha256(data))) >= 0))\n
+// Warning 1218: (544-563): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (567-586): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (590-609): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (613-632): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (544-563): CHC: Assertion violation might happen here.
+// Warning 6328: (567-586): CHC: Assertion violation might happen here.
+// Warning 6328: (590-609): CHC: Assertion violation might happen here.
+// Warning 6328: (613-632): CHC: Assertion violation might happen here.
+// Warning 4661: (544-563): BMC: Assertion violation happens here.
+// Warning 4661: (567-586): BMC: Assertion violation happens here.
+// Warning 4661: (590-609): BMC: Assertion violation happens here.
+// Warning 4661: (613-632): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
index a310939246..e85eb00aab 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
@@ -23,4 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 9302: (218-234): Return value of low-level calls not used.
-// Info 1180: Reentrancy property(ies) for :C:\n((!lock || ((x' + ((- 1) * x)) = 0)) && (<errorCode> <= 0) && (lock' || !lock))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
+// Info 1180: Reentrancy property(ies) for :C:\n((lock' || !lock) && (<errorCode> <= 0) && (!lock || ((x' + ((- 1) * x)) = 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
index f0f844fff3..87a9e22614 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
@@ -15,4 +15,4 @@ contract C {
 // Warning 2519: (106-112): This declaration shadows an existing declaration.
 // Warning 2072: (106-112): Unused local variable.
 // Warning 2072: (114-131): Unused local variable.
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && ((<errorCode> <= 0) || !(x <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
index 09d3a25922..f4f9d15ad4 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
@@ -10,4 +10,4 @@ contract C {
 // ----
 // Warning 2072: (57-63): Unused local variable.
 // Warning 2072: (65-82): Unused local variable.
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && ((<errorCode> <= 0) || !(x <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (<errorCode> <= 0)) && (!(x <= 0) || (x' <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
index 2569802255..f9293f6930 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
@@ -11,8 +11,6 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 9302: (96-117): Return value of low-level calls not used.
-// Warning 1218: (175-211): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (121-156): CHC: Assertion violation might happen here.
-// Warning 6328: (175-211): CHC: Assertion violation might happen here.
+// Warning 6328: (175-211): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0x0\n\nTransaction trace:\nC.constructor()\nC.g(0x0)\n    i.call{value: 10}("") -- untrusted external call
 // Warning 4661: (121-156): BMC: Assertion violation happens here.
-// Warning 4661: (175-211): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
index 06390b12ca..c52e0773fb 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (157-192): CHC: Assertion violation happens here.
+// Warning 6328: (157-192): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h() -- trusted external call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
index 317400e1d1..2468a1a72d 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
@@ -36,4 +36,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (495-532): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n(((owner + ((- 1) * owner')) >= 0) && !(<errorCode> = 1) && ((owner + ((- 1) * owner')) <= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(owner == address(0) || y != z)\n
+// Info 1180: Reentrancy property(ies) for :C:\n(((owner + ((- 1) * owner')) <= 0) && !(<errorCode> = 1) && ((owner + ((- 1) * owner')) >= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(owner == address(0) || y != z)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
index e5259c6c44..508047c39b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
@@ -41,4 +41,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n((insidef || (z <= 0)) && (y <= 0))\nReentrancy property(ies) for :C:\n((!insidef || !(<errorCode> >= 2)) && (!(y <= 0) || (y' <= 0)) && (insidef' || !insidef))\n((!insidef || !(<errorCode> >= 3)) && (insidef' || !insidef))\n<errorCode> = 0 -> no errors\n<errorCode> = 2 -> Assertion failed at assert(z == y)\n<errorCode> = 3 -> Assertion failed at assert(prevOwner == owner)\n
+// Info 1180: Contract invariant(s) for :C:\n((insidef || (z <= 0)) && (y <= 0))\nReentrancy property(ies) for :C:\n((!insidef || !(<errorCode> >= 2)) && (insidef' || !insidef) && (!(y <= 0) || (y' <= 0)))\n((!insidef || !(<errorCode> >= 3)) && (insidef' || !insidef))\n<errorCode> = 0 -> no errors\n<errorCode> = 2 -> Assertion failed at assert(z == y)\n<errorCode> = 3 -> Assertion failed at assert(prevOwner == owner)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol
index 32aa483a7d..d871d6e134 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol
@@ -35,7 +35,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (366-392): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (348-362): CHC: Assertion violation happens here.
-// Warning 6328: (366-392): CHC: Assertion violation might happen here.
-// Warning 4661: (366-392): BMC: Assertion violation happens here.
+// Warning 6328: (366-392): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
index adde1eb61c..5683a5248b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
@@ -16,4 +16,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (206-220): CHC: Assertion violation happens here.\nCounterexample:\nlocked = false\ntarget = 0x0\n\nTransaction trace:\nC.constructor()\nState: locked = true\nC.call(0x0)\n    D(target).e() -- untrusted external call, synthesized as:\n        C.broken() -- reentrant call
+// Warning 1218: (206-220): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (206-220): CHC: Assertion violation might happen here.
+// Warning 4661: (206-220): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
index 2a79e6c4d2..46e8ac1487 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
@@ -27,6 +27,9 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreInv: yes
 // ----
+// Warning 1218: (264-283): CHC: Error trying to invoke SMT solver.
 // Warning 1218: (302-333): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (264-283): CHC: Assertion violation might happen here.
 // Warning 6328: (302-333): CHC: Assertion violation might happen here.
+// Warning 4661: (264-283): BMC: Assertion violation happens here.
 // Warning 4661: (302-333): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol b/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
index 0b944acb2b..994fbde16f 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
@@ -23,4 +23,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (223-240): CHC: Assertion violation happens here.
+// Warning 6328: (223-240): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, y = 1, d = 0\noldX = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0, d = 0\nC.inc()\nState: x = 0, y = 1, d = 0\nC.f()\n    d.d() -- untrusted external call, synthesized as:\n        C.inc() -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
index ace2d56f29..19dd010a5f 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
@@ -18,4 +18,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!(x <= 0) || !(<errorCode> >= 2)) && (!(x <= 0) || (x' <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == y)\n<errorCode> = 2 -> Assertion failed at assert(x == y)\n
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!(<errorCode> >= 2) || !(x <= 0)) && (!(x <= 0) || (x' <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == y)\n<errorCode> = 2 -> Assertion failed at assert(x == y)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
index 5efcb2da1b..3a3b295e45 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
@@ -25,4 +25,4 @@ contract C
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (234-253): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!((map[1] + ((- 1) * map[0])) <= 0) || ((map'[1] + ((- 1) * map'[0])) <= 0)) && !(<errorCode> = 2) && (!((map[1] + ((- 1) * map[0])) >= 0) || ((map'[0] + ((- 1) * map'[1])) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!((map[1] + ((- 1) * map[0])) >= 0) || ((map'[0] + ((- 1) * map'[1])) <= 0)) && !(<errorCode> = 2) && (!((map[1] + ((- 1) * map[0])) <= 0) || ((map'[1] + ((- 1) * map'[0])) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
index ea433b7863..b5cdcc32dd 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
@@ -21,5 +21,12 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (307-326): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(m.b.length <= 2)\n
+// Warning 1218: (273-277): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (281-287): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (314-318): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (307-326): CHC: Error trying to invoke SMT solver.
+// Warning 6368: (273-277): CHC: Out of bounds access might happen here.
+// Warning 6368: (281-287): CHC: Out of bounds access might happen here.
+// Warning 6368: (314-318): CHC: Out of bounds access might happen here.
+// Warning 6328: (307-326): CHC: Assertion violation might happen here.
+// Warning 4661: (307-326): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
index 0117f9b49d..e30a5e7438 100644
--- a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
@@ -27,4 +27,4 @@ contract C is A {
 // ----
 // Warning 6328: (199-214): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nA.constructor()\nState: x = 2\nA.i()
 // Warning 6328: (387-401): CHC: Assertion violation happens here.\nCounterexample:\nx = 10\n\nTransaction trace:\nC.constructor()\nState: x = 10\nC.i()
-// Info 1180: Contract invariant(s) for :A:\n(!(x <= 1) && !(x >= 3))\nContract invariant(s) for :C:\n(!(x >= 11) && !(x <= 9))\n
+// Info 1180: Contract invariant(s) for :A:\n(!(x <= 1) && !(x >= 3))\nContract invariant(s) for :C:\n(!(x <= 9) && !(x >= 11))\n
diff --git a/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol b/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol
index 1bb6caa423..6202478a69 100644
--- a/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/natspec/unsafe_assert_remains_unsafe.sol
@@ -24,4 +24,4 @@ contract C {
 // SMTEngine: chc
 // ----
 // Warning 6328: (74-87): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call
-// Warning 6328: (117-130): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call\n    C.f2(0) -- internal call
+// Warning 6328: (117-130): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, y = 0\n_x = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.g(0)\n    C.f1(0) -- internal call\n    C.f2(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
index e4b7646861..18869ee3a3 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
@@ -30,4 +30,4 @@ contract A {
 // ----
 // Warning 6328: (AASource:159-178): CHC: Assertion violation happens here.\nCounterexample:\nx = (- 1), y = (- 2)\n\nTransaction trace:\nA.constructor()\nState: x = 0, y = 0\nA.a()\nState: x = (- 2), y = (- 2)\nA.a()
 // Warning 6328: (AASource:370-386): CHC: Assertion violation happens here.\nCounterexample:\nx = 8, y = (- 2)\n\nTransaction trace:\nA.constructor()\nState: x = 0, y = 0\nA.a()
-// Info 1180: Contract invariant(s) for AASource:A:\n(((x = (- 2)) && (y = (- 2))) || ((x = 0) && (y = 0)))\n(((x = 0) && (y = 0)) || ((x = (- 2)) && (y = (- 2))))\n
+// Info 1180: Contract invariant(s) for AASource:A:\n(((x = 0) && (y = 0)) || ((x = (- 2)) && (y = (- 2))))\n
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
index 4068ad2b96..424baf927a 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
@@ -19,4 +19,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (262-284): CHC: Assertion violation happens here.\nCounterexample:\narray = [200, 0]\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0]\nC.f(0, 0)
+// Warning 6328: (262-284): CHC: Assertion violation happens here.\nCounterexample:\narray = [299, 0]\nx = 99\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0]\nC.f(99, 0)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
index 3ac248fb22..b2d56cb128 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
@@ -18,4 +18,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (229-276): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x6062606464666060606260646466606060626064646660606062606464666060\nz = 0x6062606464666060606260646466606060626064646660606062606464666060\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (394-437): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x63666566676e616263666566676e616263666566676e616263666566676e6162\nz = 0x63666566676e616263666566676e616263666566676e616263666566676e6162\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (394-437): CHC: Assertion violation might happen here.
+// Warning 4661: (394-437): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
index dd467f8532..24be3cd8ea 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_5.sol
@@ -25,6 +25,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 2072: (249-255): Unused local variable.
-// Warning 1218: (271-295): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (271-295): CHC: Assertion violation might happen here.
-// Warning 4661: (271-295): BMC: Assertion violation happens here.
+// Warning 6328: (271-295): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
index 3b89e1afb2..1affbb6ca0 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
@@ -25,4 +25,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 2072: (255-261): Unused local variable.
-// Info 1180: Reentrancy property(ies) for :C:\n((!(x' <= 0) || ((x' + ((- 1) * x)) = 0)) && (<errorCode> <= 0) && (!(x' >= 3) || ((x' + ((- 1) * x)) = 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
+// Info 1180: Reentrancy property(ies) for :C:\n((!(x' >= 3) || (a' = a)) && (!(x' <= 0) || !(x >= 2)) && (<errorCode> <= 0) && (!(x <= 2) || !(x' >= 3)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol b/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
index a4dba47bcd..2dcb635193 100644
--- a/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
+++ b/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
@@ -11,5 +11,6 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (150-182): CHC: Assertion violation might happen here.
-// Warning 6328: (186-218): CHC: Assertion violation happens here.
+// Warning 6328: (186-218): CHC: Assertion violation might happen here.
 // Warning 4661: (150-182): BMC: Assertion violation happens here.
+// Warning 4661: (186-218): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
index ee57f069d4..c26e64fccb 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
@@ -21,7 +21,6 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 4984: (112-115): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 3944: (181-184): CHC: Underflow (resulting value less than 0) might happen here.
 // Warning 6368: (259-263): CHC: Out of bounds access happens here.\nCounterexample:\na = [0], l = 1\n = 0\n\nTransaction trace:\nC.constructor()\nState: a = [], l = 0\nC.p()\nState: a = [0], l = 1\nC.r()
+// Info 1180: Contract invariant(s) for :C:\n((a.length + ((- 1) * l)) <= 0)\n
 // Warning 2661: (112-115): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4144: (181-184): BMC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
index 045fcbff86..0a6d85a7ea 100644
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
@@ -6,4 +6,4 @@ contract C  {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 2\ny = 57896044618658097711785492504343953926634992332820282019728792003956564819968\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(2, 57896044618658097711785492504343953926634992332820282019728792003956564819968)
+// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 57896044618658097711785492504343953926634992332820282019728792003956564819968\ny = 2\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(57896044618658097711785492504343953926634992332820282019728792003956564819968, 2)
diff --git a/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol b/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
index 618f762767..a015aba72a 100644
--- a/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
@@ -13,4 +13,4 @@ contract C {
 // Warning 2072: (82-86): Unused local variable.
 // Warning 2072: (140-150): Unused local variable.
 // Warning 2072: (152-156): Unused local variable.
-// Warning 6328: (220-236): CHC: Assertion violation happens here.\nCounterexample:\n\na1 = 2437\nb1 = 0x0a\nc1 = 9\na2 = 2437\nb2 = 0x0a\nc2 = 9\n\nTransaction trace:\nC.constructor()\nC.f(data)
+// Warning 6328: (220-236): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
index ad958fe958..4c3682c60a 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: chc
 // ----
-// Warning 6328: (343-377): CHC: Assertion violation happens here.\nCounterexample:\ngas = 0, origin = 0x0\n\nTransaction trace:\nC.constructor()\nState: gas = 0, origin = 0x0\nC.f(){ tx.gasprice: 0, tx.origin: 0x0 }\n    C.g() -- internal call
+// Warning 6328: (343-377): CHC: Assertion violation happens here.\nCounterexample:\ngas = 0, origin = 0x52f7\n\nTransaction trace:\nC.constructor()\nState: gas = 0, origin = 0x0\nC.f(){ tx.gasprice: 0, tx.origin: 0x52f7 }\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
index 50260aa3d2..71608eabd3 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
@@ -13,4 +13,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 841\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 38 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 0 } -- reentrant call\n            _i.f() -- untrusted external call
+// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 1236\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 38 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 1 } -- reentrant call\n            _i.f() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
index aaddec5b5a..206d95c466 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
@@ -13,4 +13,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (157-191): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 2537\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 38 }\n    _i.f{ value: 100 }() -- untrusted external call
+// Warning 6328: (157-191): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 101\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 69 }\n    _i.f{ value: 100 }() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
index 0854dedd17..2caae5e164 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
@@ -21,5 +21,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (280-300): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (280-300): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n(!(m[0][1] >= 43) && !(m[0][1] <= 41))\n
diff --git a/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol b/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
index d4207bc860..3effe1c05e 100644
--- a/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (107-128): CHC: Assertion violation happens here.\nCounterexample:\n\na = true\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f(d)
+// Warning 6328: (107-128): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_staticcall.sol b/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
index 11b862a10c..9d00904ad7 100644
--- a/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
@@ -10,7 +10,8 @@ contract C
 		assert(success);
 		assert(x == 0);
 		assert(map[0] == 0);
-		assert(localMap[0] == 0);
+		// Disabled because of Spacer's seg fault
+		//assert(localMap[0] == 0);
 	}
 }
 // ====
@@ -18,6 +19,7 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
+// Warning 2072: (127-166): Unused local variable.
 // Warning 2072: (191-207): Unused local variable.
 // Warning 6328: (233-248): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> >= 2)\n!(<errorCode> >= 3)\n!(<errorCode> >= 4)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(success)\n<errorCode> = 2 -> Assertion failed at assert(x == 0)\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n<errorCode> = 4 -> Assertion failed at assert(localMap[0] == 0)\n
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> >= 2)\n!(<errorCode> >= 3)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(success)\n<errorCode> = 2 -> Assertion failed at assert(x == 0)\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
index 44daa89128..ce35a65054 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (66-80): CHC: Assertion violation happens here.\nCounterexample:\n\nx = true\ny = false\n\nTransaction trace:\nC.constructor()\nC.f(true, false)
+// Warning 6328: (66-80): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\ny = true\n\nTransaction trace:\nC.constructor()\nC.f(false, true)
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
index b55293231f..320d7dd10e 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
@@ -32,6 +32,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6368: (374-381): CHC: Out of bounds access might happen here.
 // Warning 6368: (456-462): CHC: Out of bounds access happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 4)\n
+// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 4)\n!(a[2].length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
index 1d31cbe3d2..e4a68df6b4 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (188-212): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 2437\n\nTransaction trace:\nC.constructor()\nC.f(data)
+// Warning 6328: (188-212): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
index a4c4a3a29e..358e5404ea 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-226): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(data)
+// Warning 6328: (192-226): CHC: Assertion violation happens here.

From 0c34d9df88434f48cee3b6b3f97e7097eb1a747f Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 23 Nov 2021 18:54:44 +0100
Subject: [PATCH 0141/1748] Adjust tests for nondeterminism

---
 .../array_members/push_storage_ref_unsafe_aliasing.sol   | 7 ++++---
 .../smtCheckerTests/external_calls/call_safe.sol         | 2 +-
 .../external_calls/external_single_inc.sol               | 3 ++-
 .../smtCheckerTests/functions/functions_external_1.sol   | 3 +--
 test/libsolidity/smtCheckerTests/try_catch/try_4.sol     | 9 +++------
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
index 87b9d92bf3..a8669fb601 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
@@ -13,7 +13,8 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreOS: macos
+// SMTIgnoreCex: yes
 // ----
-// Warning 6368: (188-192): CHC: Out of bounds access happens here.\nCounterexample:\na = []\nb = [32]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
-// Warning 6368: (188-195): CHC: Out of bounds access happens here.\nCounterexample:\n\nb = [32]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
-// Warning 6328: (181-202): CHC: Assertion violation happens here.\nCounterexample:\n\nb = [32]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 6368: (188-192): CHC: Out of bounds access happens here.
+// Warning 6368: (188-195): CHC: Out of bounds access happens here.
+// Warning 6328: (181-202): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
index f4f9d15ad4..e4e3abc24f 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
@@ -7,7 +7,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreInv: yes
 // ----
 // Warning 2072: (57-63): Unused local variable.
 // Warning 2072: (65-82): Unused local variable.
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (<errorCode> <= 0)) && (!(x <= 0) || (x' <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol b/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
index 994fbde16f..7b73311a0b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_single_inc.sol
@@ -22,5 +22,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (223-240): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, y = 1, d = 0\noldX = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0, d = 0\nC.inc()\nState: x = 0, y = 1, d = 0\nC.f()\n    d.d() -- untrusted external call, synthesized as:\n        C.inc() -- reentrant call
+// Warning 6328: (223-240): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
index 19dd010a5f..3a87f34c9d 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
@@ -17,5 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // SMTIgnoreOS: macos
-// ----
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!(<errorCode> >= 2) || !(x <= 0)) && (!(x <= 0) || (x' <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == y)\n<errorCode> = 2 -> Assertion failed at assert(x == y)\n
+// SMTIgnoreInv: yes
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_4.sol b/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
index 0abf62df8e..289f3943d7 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
@@ -14,7 +14,7 @@ contract C {
 	function f() public {
 		x = 0;
 		try d.d() {
-			assert(x == 0); // should fail, x can be anything here
+			//assert(x == 0); // should fail, x can be anything here
 		} catch {
 			assert(x == 0); // should hold, all changes to x has been reverted
 			assert(x == 1); // should fail
@@ -25,8 +25,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (178-192): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (178-192): CHC: Assertion violation might happen here.
-// Warning 6328: (318-332): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 2)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n<errorCode> = 2 -> Assertion failed at assert(x == 0)\n<errorCode> = 3 -> Assertion failed at assert(x == 1)\n
-// Warning 4661: (178-192): BMC: Assertion violation happens here.
+// Warning 6328: (320-334): CHC: Assertion violation happens here.
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n<errorCode> = 2 -> Assertion failed at assert(x == 1)\n

From 6cff73af71542fe6a00975b53b3380c234295fac Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 23 Nov 2021 18:59:26 +0100
Subject: [PATCH 0142/1748] update osx z3 hash

---
 .circleci/osx_install_dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index a973988a6e..36d3367746 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -65,7 +65,7 @@ then
   z3_dir="z3-${z3_version}-x64-osx-10.16"
   z3_package="${z3_dir}.zip"
   wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
-  validate_checksum "$z3_package" a1f6ef3c99456147c4d3f2652dc6bc90951c4ab3fe7741a255eb794f0ab8938c
+  validate_checksum "$z3_package" 191b26be2b617b2dffffce139d77abcd7e584859efbc10a58d01a1d7830697a4
   unzip "$z3_package"
   rm "$z3_package"
   cp "${z3_dir}/bin/libz3.a" /usr/local/lib

From a2588533e504c2a46827fe3ed87362f2bd7c4f32 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 24 Nov 2021 11:38:22 +0100
Subject: [PATCH 0143/1748] macos nondeterminism

---
 .../array_members/length_1d_struct_array_2d_1.sol                | 1 +
 .../libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol | 1 +
 .../smtCheckerTests/blockchain_state/balance_receive_4.sol       | 1 +
 .../blockchain_state/balance_receive_ext_calls.sol               | 1 +
 .../branches_with_return/branches_in_modifiers_2.sol             | 1 +
 .../control_flow/branches_with_return/triple_nested_if.sol       | 1 +
 .../external_calls/external_call_with_value_3.sol                | 1 +
 .../external_hash_known_code_state_reentrancy_unsafe.sol         | 1 +
 .../operators/assignment_module_contract_member_variable.sol     | 1 +
 .../smtCheckerTests/operators/compound_add_array_index.sol       | 1 +
 .../smtCheckerTests/operators/compound_add_mapping.sol           | 1 +
 .../smtCheckerTests/operators/compound_assignment_division_3.sol | 1 +
 .../smtCheckerTests/operators/compound_bitwise_or_int_1.sol      | 1 +
 .../libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol | 1 +
 .../libsolidity/smtCheckerTests/userTypes/multisource_module.sol | 1 +
 15 files changed, 15 insertions(+)

diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
index 71571d9448..ddda215df8 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
@@ -20,5 +20,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Info 1180: Contract invariant(s) for :C:\n!(s1.arr.length <= 0)\n!(s2.arr.length <= 0)\n(((s2.arr[0].length + ((- 1) * s1.arr[0].length)) <= 0) && ((s1.arr[0].length + ((- 1) * s2.arr[0].length)) <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
index 5920a4e747..0d16306b72 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
@@ -17,5 +17,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (199-229): CHC: Assertion violation happens here.\nCounterexample:\nb = [1]\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
index 3e3e564317..4fa420ff16 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
@@ -11,6 +11,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 4984: (82-85): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (154-160): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
index 1ee90e41d0..96223b7e94 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
@@ -12,6 +12,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 1218: (131-165): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (131-165): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
index 4241fa9e29..f08a26bf70 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
@@ -42,6 +42,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.test()\n    C.reset_if_overflow() -- internal call
 // Warning 6328: (502-519): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\noldx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(1)\nState: x = 1\nC.test()\n    C.reset_if_overflow() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
index 09ee2b2b24..472ef8785e 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
@@ -17,5 +17,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Info 1180: Contract invariant(s) for :C:\n((c <= 0) && (a <= 0) && (b <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
index d0e4c84aa6..2a535329ac 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
@@ -12,6 +12,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (150-183): CHC: Assertion violation might happen here.
 // Warning 6328: (202-236): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    i.f{value: 20}() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol
index d871d6e134..b3b43980ab 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe.sol
@@ -34,6 +34,7 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (348-362): CHC: Assertion violation happens here.
 // Warning 6328: (366-392): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
index 18869ee3a3..781476de25 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
@@ -27,6 +27,7 @@ contract A {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (AASource:159-178): CHC: Assertion violation happens here.\nCounterexample:\nx = (- 1), y = (- 2)\n\nTransaction trace:\nA.constructor()\nState: x = 0, y = 0\nA.a()\nState: x = (- 2), y = (- 2)\nA.a()
 // Warning 6328: (AASource:370-386): CHC: Assertion violation happens here.\nCounterexample:\nx = 8, y = (- 2)\n\nTransaction trace:\nA.constructor()\nState: x = 0, y = 0\nA.a()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
index 424baf927a..1c6e205d3f 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
@@ -18,5 +18,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (262-284): CHC: Assertion violation happens here.\nCounterexample:\narray = [299, 0]\nx = 99\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0]\nC.f(99, 0)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol b/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol
index 4169357d1b..ab133cefc9 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol
@@ -11,5 +11,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (165-185): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
index e762eb4be3..aa90aa2529 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
@@ -10,5 +10,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (162-181): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\np = 0\n\nTransaction trace:\nC.constructor()\nC.f(2, 0)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol
index 8f7c69b2cd..fdd8c55cce 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol
@@ -9,6 +9,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6368: (76-81): CHC: Out of bounds access might happen here.
 // Warning 6368: (76-84): CHC: Out of bounds access might happen here.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
index 4c3682c60a..95e3390b45 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
@@ -19,5 +19,6 @@ contract C {
 }
 // ====
 // SMTEngine: chc
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (343-377): CHC: Assertion violation happens here.\nCounterexample:\ngas = 0, origin = 0x52f7\n\nTransaction trace:\nC.constructor()\nState: gas = 0, origin = 0x0\nC.f(){ tx.gasprice: 0, tx.origin: 0x52f7 }\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol b/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
index ee3277d1bc..491b8600d9 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
@@ -15,6 +15,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (s2.sol:259-292): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()\n    C.f(5) -- internal call\n    C.f(5) -- internal call
 // Warning 6328: (s2.sol:346-377): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()\n    C.f(5) -- internal call\n    C.f(5) -- internal call\n    C.g(1) -- internal call\n    C.g(1) -- internal call

From aa1a17072f5446dd553818c050bdbfd54aca635c Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 23 Nov 2021 12:03:43 +0100
Subject: [PATCH 0144/1748] Update z3 version in our docker files

---
 scripts/docker/buildpack-deps/Dockerfile.emscripten           | 4 ++--
 .../docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004           | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 9a3ca36af4..5f86b1e197 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -33,12 +33,12 @@
 # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
 # dependencies automatically.
 FROM emscripten/emsdk:2.0.33 AS base
-LABEL version="7"
+LABEL version="8"
 
 ADD emscripten.jam /usr/src
 RUN set -ex; \
 	cd /usr/src; \
-	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.12 --depth 1 ; \
+	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.13 --depth 1 ; \
 	cd z3; \
 	mkdir build; \
 	cd build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index 48e9839dd9..0b1ed6125d 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="13"
+LABEL version="14"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -61,7 +61,7 @@ RUN set -ex; \
 
 # Z3
 RUN set -ex; \
-    git clone --depth 1 -b z3-4.8.12 https://github.com/Z3Prover/z3.git \
+    git clone --depth 1 -b z3-4.8.13 https://github.com/Z3Prover/z3.git \
     /usr/src/z3; \
     cd /usr/src/z3; \
     mkdir build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 63f09e5138..8ed35d67e9 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="8"
+LABEL version="9"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
index 1f96e41d5c..0ac9d4abf8 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="8"
+LABEL version="9"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

From 6b69791f2bab4e543ec70882a6ea471ec6053462 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Wed, 24 Nov 2021 14:24:56 +0100
Subject: [PATCH 0145/1748] Disabling Clang-14 bitwise instead of logical
 warning in Hera build.

---
 .../docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index 0b1ed6125d..64260c1b9c 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -109,7 +109,7 @@ RUN set -ex; \
 	cd hera; \
 	mkdir build; \
 	cd build; \
-	cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \
+	cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS="-Wno-bitwise-instead-of-logical" -DCMAKE_INSTALL_PREFIX="/usr" ..; \
 	ninja; \
 	ninja install/strip; \
 	rm -rf /usr/src/hera

From 1c8d430b8220733c41485d87e134865702a00a13 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Wed, 24 Nov 2021 17:55:52 +0100
Subject: [PATCH 0146/1748] Remove Hera as a dependency for oss-fuzz Docker
 image.

---
 .../Dockerfile.ubuntu1604.clang.ossfuzz              | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index 64260c1b9c..1d00eabce8 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -102,18 +102,6 @@ RUN set -ex; \
 	ninja install/strip; \
 	rm -rf /usr/src/evmone
 
-# HERA
-RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.5.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
-	cd hera; \
-	mkdir build; \
-	cd build; \
-	cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_CXX_FLAGS="-Wno-bitwise-instead-of-logical" -DCMAKE_INSTALL_PREFIX="/usr" ..; \
-	ninja; \
-	ninja install/strip; \
-	rm -rf /usr/src/hera
-
 # gmp
 RUN set -ex; \
     # Replace system installed libgmp static library

From 26ac84300e3ab2206a931cb955911f4ca5d46254 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 23 Nov 2021 17:09:50 +0100
Subject: [PATCH 0147/1748] CI: Extract workflow name without jq

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fb3abb37af..92c3d030fd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -51,7 +51,7 @@ commands:
             # Workflow name is not exposed as an env variable. Has to be queried from the API.
             # The name is not critical so if anything fails, use the raw workflow ID as a fallback.
             workflow_info=$(curl --silent "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}") || true
-            workflow_name=$(echo "$workflow_info" | jq --raw-output .name || echo "$CIRCLE_WORKFLOW_ID")
+            workflow_name=$(echo "$workflow_info" | grep -E '"\s*name"\s*:\s*".*"' | cut -d \" -f 4 || echo "$CIRCLE_WORKFLOW_ID")
 
             [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ [${workflow_name}] Job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
             [[ "<< parameters.event >>" == "success" ]] && message=" ✅ [${workflow_name}] Job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."

From 674b1ecf3f78e61a17a2cd3fd6c6e8bf5d56b5ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 5 Nov 2021 17:38:25 +0100
Subject: [PATCH 0148/1748] CI: Change the default node version in t_ems_ext
 from 14 to latest

---
 .circleci/config.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fb3abb37af..398e73e49e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -946,8 +946,8 @@ jobs:
         type: integer
         default: 0
       nodejs_version:
-        type: integer
-        default: 14
+        type: string
+        default: latest
     docker:
       - image: circleci/node:<<parameters.nodejs_version>>
     # NOTE: Each external test does 3 separate compile&test runs
@@ -1205,28 +1205,32 @@ workflows:
           name: t_ems_compile_ext_colony
           project: colony
           compile_only: 1
+          nodejs_version: '14'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_compile_ext_gnosis
           project: gnosis
           compile_only: 1
+          nodejs_version: '14'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_compile_ext_gnosis_v2
           project: gnosis-v2
           compile_only: 1
+          nodejs_version: '14'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_compile_ext_zeppelin
           project: zeppelin
           compile_only: 1
+          nodejs_version: '14'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_compile_ext_ens
           project: ens
           compile_only: 1
           # NOTE: One of the dependencies (fsevents) fails to build its native extension on node.js 12+.
-          nodejs_version: 10
+          nodejs_version: '10'
 
       # FIXME: Gnosis tests are pretty flaky right now. They often fail on CircleCI due to random ProviderError
       # and there are also other less frequent problems. See https://github.com/gnosis/safe-contracts/issues/216.
@@ -1235,23 +1239,24 @@ workflows:
       #    name: t_ems_test_ext_gnosis
       #    project: gnosis
       #    # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
-      #    nodejs_version: 12
+      #    nodejs_version: '12'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_test_ext_gnosis_v2
           project: gnosis-v2
           # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
-          nodejs_version: 12
+          nodejs_version: '12'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_test_ext_zeppelin
           project: zeppelin
+          nodejs_version: '14'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_test_ext_ens
           project: ens
           # NOTE: One of the dependencies (fsevents) fails to build its native extension on node.js 12+.
-          nodejs_version: 10
+          nodejs_version: '10'
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags

From 9f59d1746b29591543ea103876a712ed21444845 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Oct 2021 15:49:00 +0200
Subject: [PATCH 0149/1748] Fix OpenZeppelin external tests to actually use
 Hardhat and the binary built in CI

---
 .circleci/config.yml           |  4 +-
 test/externalTests/common.sh   | 95 ++++++++++++++++++++++++++++++++++
 test/externalTests/zeppelin.sh | 12 ++---
 3 files changed, 103 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 398e73e49e..7a24abab4f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1223,7 +1223,6 @@ workflows:
           name: t_ems_compile_ext_zeppelin
           project: zeppelin
           compile_only: 1
-          nodejs_version: '14'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_compile_ext_ens
@@ -1250,7 +1249,8 @@ workflows:
           <<: *workflow_emscripten
           name: t_ems_test_ext_zeppelin
           project: zeppelin
-          nodejs_version: '14'
+          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+          nodejs_version: '16'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_test_ext_ens
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 2519a0f878..7e651d8c0b 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -74,6 +74,7 @@ function setup_solcjs
     npm install
     cp "$soljson" soljson.js
     SOLCVERSION=$(./solcjs --version)
+    SOLCVERSION_SHORT=$(echo "$SOLCVERSION" | sed -En 's/^([0-9.]+).*\+commit\.[0-9a-f]+.*$/\1/p')
     printLog "Using solcjs version $SOLCVERSION"
     cd ..
 }
@@ -161,6 +162,40 @@ function force_truffle_compiler_settings
     echo "module.exports['compilers'] = $(truffle_compiler_settings "$solc_path" "$level" "$evm_version");" >> "$config_file"
 }
 
+function force_hardhat_compiler_binary
+{
+    local config_file="$1"
+    local solc_path="$2"
+
+    printLog "Configuring Hardhat..."
+    echo "-------------------------------------"
+    echo "Config file: ${config_file}"
+    echo "Compiler path: ${solc_path}"
+    hardhat_solc_build_subtask "$SOLCVERSION_SHORT" "$SOLCVERSION" "$solc_path" >> "$config_file"
+}
+
+function force_hardhat_compiler_settings
+{
+    local config_file="$1"
+    local level="$2"
+    local evm_version="${3:-"$CURRENT_EVM_VERSION"}"
+
+    printLog "Configuring Hardhat..."
+    echo "-------------------------------------"
+    echo "Config file: ${config_file}"
+    echo "Optimization level: ${level}"
+    echo "Optimizer settings: $(optimizer_settings_for_level "$level")"
+    echo "EVM version: ${evm_version}"
+    echo "Compiler version: ${SOLCVERSION_SHORT}"
+    echo "Compiler version (full): ${SOLCVERSION}"
+    echo "-------------------------------------"
+
+    {
+        echo -n 'module.exports["solidity"] = '
+        hardhat_compiler_settings "$SOLCVERSION_SHORT" "$level" "$evm_version"
+    } >> "$config_file"
+}
+
 function truffle_verify_compiler_version
 {
     local solc_version="$1"
@@ -170,11 +205,26 @@ function truffle_verify_compiler_version
     grep "$full_solc_version" --with-filename --recursive build/contracts || fail "Wrong compiler version detected."
 }
 
+function hardhat_verify_compiler_version
+{
+    local solc_version="$1"
+    local full_solc_version="$2"
+
+    printLog "Verify that the correct version (${solc_version}/${full_solc_version}) of the compiler was used to compile the contracts..."
+    grep '"solcVersion": "'"${solc_version}"'"' --with-filename artifacts/build-info/*.json || fail "Wrong compiler version detected."
+    grep '"solcLongVersion": "'"${full_solc_version}"'"' --with-filename artifacts/build-info/*.json || fail "Wrong compiler version detected."
+}
+
 function truffle_clean
 {
     rm -rf build/
 }
 
+function hardhat_clean
+{
+    rm -rf artifacts/ cache/
+}
+
 function run_test
 {
     local compile_fn="$1"
@@ -221,6 +271,39 @@ function truffle_compiler_settings
     echo "}"
 }
 
+function hardhat_solc_build_subtask {
+    local solc_version="$1"
+    local full_solc_version="$2"
+    local solc_path="$3"
+
+    echo "const {TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD} = require('hardhat/builtin-tasks/task-names');"
+    echo "const assert = require('assert');"
+    echo
+    echo "subtask(TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD, async (args, hre, runSuper) => {"
+    echo "    assert(args.solcVersion == '${solc_version}', 'Unexpected solc version: ' + args.solcVersion)"
+    echo "    return {"
+    echo "        compilerPath: '$(realpath "$solc_path")',"
+    echo "        isSolcJs: true,"
+    echo "        version: args.solcVersion,"
+    echo "        longVersion: '${full_solc_version}'"
+    echo "    }"
+    echo "})"
+}
+
+function hardhat_compiler_settings {
+    local solc_version="$1"
+    local level="$2"
+    local evm_version="$3"
+
+    echo "{"
+    echo "    version: '${solc_version}',"
+    echo "    settings: {"
+    echo "        optimizer: $(optimizer_settings_for_level "$level"),"
+    echo "        evmVersion: '${evm_version}'"
+    echo "    }"
+    echo "}"
+}
+
 function compile_and_run_test
 {
     local compile_fn="$1"
@@ -252,6 +335,18 @@ function truffle_run_test
     compile_and_run_test compile_fn test_fn truffle_verify_compiler_version
 }
 
+function hardhat_run_test
+{
+    local config_file="$1"
+    local optimizer_level="$2"
+    local compile_fn="$3"
+    local test_fn="$4"
+
+    hardhat_clean
+    force_hardhat_compiler_settings "$config_file" "$optimizer_level"
+    compile_and_run_test compile_fn test_fn hardhat_verify_compiler_version
+}
+
 function external_test
 {
     local name="$1"
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 24e576b931..cd290b860f 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -27,14 +27,14 @@ source test/externalTests/common.sh
 verify_input "$1"
 SOLJSON="$1"
 
-function compile_fn { npx truffle compile; }
-function test_fn { npm run test; }
+function compile_fn { npm run compile; }
+function test_fn { npm test; }
 
 function zeppelin_test
 {
     local repo="https://github.com/OpenZeppelin/openzeppelin-contracts.git"
     local branch=master
-    local config_file="truffle-config.js"
+    local config_file="hardhat.config.js"
     local min_optimizer_level=1
     local max_optimizer_level=3
 
@@ -46,14 +46,14 @@ function zeppelin_test
     download_project "$repo" "$branch" "$DIR"
 
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
+    force_hardhat_compiler_binary "$config_file" "$SOLJSON"
+    force_hardhat_compiler_settings "$config_file" "$min_optimizer_level"
     npm install
 
     replace_version_pragmas
-    force_solc_modules "${DIR}/solc"
 
     for level in $selected_optimizer_levels; do
-        truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
+        hardhat_run_test "$config_file" "$level" compile_fn test_fn
     done
 }
 

From 5e59325d0692665166a072555025152b8d1a63b2 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Sat, 13 Nov 2021 01:31:11 +0530
Subject: [PATCH 0150/1748] relocated downloads section in versions flyout menu
 and added downloads Hint in index.html

---
 docs/_templates/versions.html | 8 ++++----
 docs/index.rst                | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/_templates/versions.html b/docs/_templates/versions.html
index f680b6506d..fcd79cb3fc 100644
--- a/docs/_templates/versions.html
+++ b/docs/_templates/versions.html
@@ -13,13 +13,13 @@
     </span>
     <div class="rst-other-versions">
         <dl>
-            <dt>{{ _('Versions') }}</dt> {% for slug, url in versions %}
-            <dd><a href="{{ url }}">{{ slug }}</a></dd>
+            <dt>{{ _('Downloads') }}</dt> {% for type, url in downloads %}
+            <dd><a href="{{ url }}">{{ type }}</a></dd>
             {% endfor %}
         </dl>
         <dl>
-            <dt>{{ _('Downloads') }}</dt> {% for type, url in downloads %}
-            <dd><a href="{{ url }}">{{ type }}</a></dd>
+            <dt>{{ _('Versions') }}</dt> {% for slug, url in versions %}
+            <dd><a href="{{ url }}">{{ slug }}</a></dd>
             {% endfor %}
         </dl>
         <dl>
diff --git a/docs/index.rst b/docs/index.rst
index 60b3d61fac..1086df9a7b 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -31,6 +31,12 @@ a 0.y.z version number `to indicate this fast pace of change <https://semver.org
 Ideas for improving Solidity or this documentation are always welcome,
 read our :doc:`contributors guide <contributing>` for more details.
 
+.. Hint::
+
+   You can download this documentation as PDF, HTML or Epub by clicking on the versions 
+   flyout menu in the left bottom corner and selecting the preferred download format.
+
+
 Getting Started
 ---------------
 

From ecf6c8e122da75423bf680a7a0ab62a882654c3e Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Sat, 13 Nov 2021 01:41:38 +0530
Subject: [PATCH 0151/1748] trailing whitespace removed in index.rst as per the
 requirements of a syntax test

---
 docs/_templates/versions.html | 8 ++++++--
 docs/index.rst                | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/docs/_templates/versions.html b/docs/_templates/versions.html
index fcd79cb3fc..9168179dfd 100644
--- a/docs/_templates/versions.html
+++ b/docs/_templates/versions.html
@@ -1,7 +1,11 @@
 {# Add rst-badge after rst-versions for small badge style. #}
 <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
     <span class="rst-current-version" data-toggle="rst-current-version">
-    <span class="fa fa-book fa-element"> RTD </span>
+    {% for type, url in downloads %}
+        {% if type == 'PDF' %}
+            <a href="{{ url }}">{{ type }}</a>
+        {% endif %}
+    {% endfor %}
 
     <span class="fa fa-element">
     <input class="container_toggle" type="checkbox" id="switch" name="mode">
@@ -33,4 +37,4 @@
             </dd>
         </dl>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/docs/index.rst b/docs/index.rst
index 1086df9a7b..f69f8692b0 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -33,8 +33,8 @@ read our :doc:`contributors guide <contributing>` for more details.
 
 .. Hint::
 
-   You can download this documentation as PDF, HTML or Epub by clicking on the versions 
-   flyout menu in the left bottom corner and selecting the preferred download format.
+  You can download this documentation as PDF, HTML or Epub by clicking on the versions
+  flyout menu in the bottom-left corner and selecting the preferred download format.
 
 
 Getting Started

From 49d9f334aa3490590eeb4a339cf74565e38052ea Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Sun, 21 Nov 2021 00:14:34 +0530
Subject: [PATCH 0152/1748] Extracted some test cases from SolidityEndToEnd.cpp

---
 test/libsolidity/SolidityEndToEndTest.cpp     | 210 ------------------
 .../enums/invalid_enum_logged.sol             |  24 ++
 .../library_staticcall_delegatecall.sol       |  20 ++
 .../memory_types_initialisation.sol           |  17 ++
 .../strings/constant_string_literal.sol       |  25 +++
 .../semanticTests/strings/return_string.sol   |  20 ++
 .../structs/packed_storage_structs_delete.sol |  27 +++
 .../variables/storing_invalid_boolean.sol     |  35 +++
 8 files changed, 168 insertions(+), 210 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
 create mode 100644 test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
 create mode 100644 test/libsolidity/semanticTests/strings/constant_string_literal.sol
 create mode 100644 test/libsolidity/semanticTests/strings/return_string.sol
 create mode 100644 test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
 create mode 100644 test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index e5a6b8cf7c..4731149618 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -1607,30 +1607,6 @@ BOOST_AUTO_TEST_CASE(library_call_protection)
 	)
 }
 
-BOOST_AUTO_TEST_CASE(library_staticcall_delegatecall)
-{
-	char const* sourceCode = R"(
-		 library Lib {
-			 function x() public view returns (uint) {
-				 return 1;
-			 }
-		 }
-		 contract Test {
-			 uint t;
-			 function f() public returns (uint) {
-				 t = 2;
-				 return this.g();
-			 }
-			 function g() public view returns (uint) {
-				 return Lib.x();
-			 }
-		 }
-	)";
-	compileAndRun(sourceCode, 0, "Lib");
-	compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
-	ABI_CHECK(callContractFunction("f()"), encodeArgs(1));
-}
-
 BOOST_AUTO_TEST_CASE(bytes_from_calldata_to_memory)
 {
 	char const* sourceCode = R"(
@@ -1786,49 +1762,6 @@ BOOST_AUTO_TEST_CASE(copy_from_calldata_removes_bytes_data)
 	);
 }
 
-BOOST_AUTO_TEST_CASE(storing_invalid_boolean)
-{
-	char const* sourceCode = R"(
-		contract C {
-			event Ev(bool);
-			bool public perm;
-			function set() public returns(uint) {
-				bool tmp;
-				assembly {
-					tmp := 5
-				}
-				perm = tmp;
-				return 1;
-			}
-			function ret() public returns(bool) {
-				bool tmp;
-				assembly {
-					tmp := 5
-				}
-				return tmp;
-			}
-			function ev() public returns(uint) {
-				bool tmp;
-				assembly {
-					tmp := 5
-				}
-				emit Ev(tmp);
-				return 1;
-			}
-		}
-	)";
-	compileAndRun(sourceCode);
-	ABI_CHECK(callContractFunction("set()"), encodeArgs(1));
-	ABI_CHECK(callContractFunction("perm()"), encodeArgs(1));
-	ABI_CHECK(callContractFunction("ret()"), encodeArgs(1));
-	ABI_CHECK(callContractFunction("ev()"), encodeArgs(1));
-	BOOST_REQUIRE_EQUAL(numLogs(), 1);
-	BOOST_CHECK_EQUAL(logAddress(0), m_contractAddress);
-	BOOST_CHECK(logData(0) == encodeArgs(1));
-	BOOST_REQUIRE_EQUAL(numLogTopics(0), 1);
-	BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(string("Ev(bool)")));
-}
-
 BOOST_AUTO_TEST_CASE(struct_referencing)
 {
 	static char const* sourceCode = R"(
@@ -2059,70 +1992,6 @@ BOOST_AUTO_TEST_CASE(array_copy_storage_abi)
 //	ABI_CHECK(callContractFunction("f()"), encodeArgs(5));
 //}
 
-BOOST_AUTO_TEST_CASE(packed_storage_structs_delete)
-{
-	char const* sourceCode = R"(
-		contract C {
-			struct str { uint8 a; uint16 b; uint8 c; }
-			uint8 x;
-			uint16 y;
-			str data;
-			function test() public returns (uint) {
-				x = 1;
-				y = 2;
-				data.a = 2;
-				data.b = 0xabcd;
-				data.c = 0xfa;
-				if (x != 1 || y != 2 || data.a != 2 || data.b != 0xabcd || data.c != 0xfa)
-					return 2;
-				delete y;
-				delete data.b;
-				if (x != 1 || y != 0 || data.a != 2 || data.b != 0 || data.c != 0xfa)
-					return 3;
-				delete x;
-				delete data;
-				return 1;
-			}
-		}
-	)";
-	compileAndRun(sourceCode);
-	ABI_CHECK(callContractFunction("test()"), encodeArgs(1));
-	BOOST_CHECK(storageEmpty(m_contractAddress));
-}
-
-BOOST_AUTO_TEST_CASE(invalid_enum_logged)
-{
-	char const* sourceCode = R"(
-		contract C {
-			enum X { A, B }
-			event Log(X);
-
-			function test_log() public returns (uint) {
-				X garbled = X.A;
-				assembly {
-					garbled := 5
-				}
-				emit Log(garbled);
-				return 1;
-			}
-			function test_log_ok() public returns (uint) {
-				X x = X.A;
-				emit Log(x);
-				return 1;
-			}
-		}
-		)";
-	compileAndRun(sourceCode, 0, "C");
-	ABI_CHECK(callContractFunction("test_log_ok()"), encodeArgs(u256(1)));
-	BOOST_REQUIRE_EQUAL(numLogs(), 1);
-	BOOST_CHECK_EQUAL(logAddress(0), m_contractAddress);
-	BOOST_REQUIRE_EQUAL(numLogTopics(0), 1);
-	BOOST_REQUIRE_EQUAL(logTopic(0, 0), util::keccak256(string("Log(uint8)")));
-	BOOST_CHECK_EQUAL(h256(logData(0)), h256(u256(0)));
-
-	ABI_CHECK(callContractFunction("test_log()"), panicData(PanicCode::EnumConversionError));
-}
-
 BOOST_AUTO_TEST_CASE(evm_exceptions_in_constructor_out_of_baund)
 {
 	char const* sourceCode = R"(
@@ -2164,31 +2033,6 @@ BOOST_AUTO_TEST_CASE(failing_send)
 	BOOST_REQUIRE(callContractFunction("callHelper(address)", c_helperAddress) == encodeArgs(true, 20));
 }
 
-BOOST_AUTO_TEST_CASE(return_string)
-{
-	char const* sourceCode = R"(
-		contract Main {
-			string public s;
-			function set(string calldata _s) external {
-				s = _s;
-			}
-			function get1() public returns (string memory r) {
-				return s;
-			}
-			function get2() public returns (string memory r) {
-				r = s;
-			}
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Main");
-	string s("Julia");
-	bytes args = encodeArgs(u256(0x20), u256(s.length()), s);
-	BOOST_REQUIRE(callContractFunction("set(string)", asString(args)) == encodeArgs());
-	ABI_CHECK(callContractFunction("get1()"), args);
-	ABI_CHECK(callContractFunction("get2()"), args);
-	ABI_CHECK(callContractFunction("s()"), args);
-}
-
 BOOST_AUTO_TEST_CASE(return_multiple_strings_of_various_sizes)
 {
 	char const* sourceCode = R"(
@@ -2343,28 +2187,6 @@ BOOST_AUTO_TEST_CASE(return_bytes_internal)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(memory_types_initialisation)
-{
-	char const* sourceCode = R"(
-		contract Test {
-			mapping(uint=>uint) data;
-			function stat() public returns (uint[5] memory)
-			{
-				data[2] = 3; // make sure to use some memory
-			}
-			function dyn() public returns (uint[] memory) { stat(); }
-			function nested() public returns (uint[3][] memory) { stat(); }
-			function nestedStat() public returns (uint[3][7] memory) { stat(); }
-		}
-	)";
-	compileAndRun(sourceCode, 0, "Test");
-
-	ABI_CHECK(callContractFunction("stat()"), encodeArgs(vector<u256>(5)));
-	ABI_CHECK(callContractFunction("dyn()"), encodeArgs(u256(0x20), u256(0)));
-	ABI_CHECK(callContractFunction("nested()"), encodeArgs(u256(0x20), u256(0)));
-	ABI_CHECK(callContractFunction("nestedStat()"), encodeArgs(vector<u256>(3 * 7)));
-}
-
 BOOST_AUTO_TEST_CASE(calldata_struct_short)
 {
 	char const* sourceCode = R"(
@@ -2718,38 +2540,6 @@ BOOST_AUTO_TEST_CASE(nested_mixed_string_as_public_mapping_key)
 		), encodeArgs(u256(i - 3)));
 }
 
-BOOST_AUTO_TEST_CASE(constant_string_literal)
-{
-	char const* sourceCode = R"(
-		contract Test {
-			bytes32 constant public b = "abcdefghijklmnopq";
-			string constant public x = "abefghijklmnopqabcdefghijklmnopqabcdefghijklmnopqabca";
-
-			constructor() {
-				string memory xx = x;
-				bytes32 bb = b;
-			}
-			function getB() public returns (bytes32) { return b; }
-			function getX() public returns (string memory) { return x; }
-			function getX2() public returns (string memory r) { r = x; }
-			function unused() public returns (uint) {
-				"unusedunusedunusedunusedunusedunusedunusedunusedunusedunusedunusedunused";
-				return 2;
-			}
-		}
-	)";
-
-	compileAndRun(sourceCode);
-	string longStr = "abefghijklmnopqabcdefghijklmnopqabcdefghijklmnopqabca";
-	string shortStr = "abcdefghijklmnopq";
-	ABI_CHECK(callContractFunction("b()"), encodeArgs(shortStr));
-	ABI_CHECK(callContractFunction("x()"), encodeDyn(longStr));
-	ABI_CHECK(callContractFunction("getB()"), encodeArgs(shortStr));
-	ABI_CHECK(callContractFunction("getX()"), encodeDyn(longStr));
-	ABI_CHECK(callContractFunction("getX2()"), encodeDyn(longStr));
-	ABI_CHECK(callContractFunction("unused()"), encodeArgs(2));
-}
-
 BOOST_AUTO_TEST_CASE(library_call)
 {
 	char const* sourceCode = R"(
diff --git a/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol b/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
new file mode 100644
index 0000000000..33cec7482a
--- /dev/null
+++ b/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
@@ -0,0 +1,24 @@
+contract C {
+    enum X { A, B }
+    event Log(X);
+
+    function test_log() public returns (uint) {
+        X garbled = X.A;
+        assembly {
+            garbled := 5
+        }
+        emit Log(garbled);
+        return 1;
+    }
+    function test_log_ok() public returns (uint) {
+        X x = X.A;
+        emit Log(x);
+        return 1;
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// test_log_ok() -> 1
+// ~ emit Log(uint8): 0x00
+// test_log() -> FAILURE, hex"4e487b71", 0x21
diff --git a/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol b/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
new file mode 100644
index 0000000000..d566f71801
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
@@ -0,0 +1,20 @@
+library Lib {
+    function x() public view returns (uint) {
+        return 1;
+    }
+}
+contract Test {
+    uint t;
+    function f() public returns (uint) {
+        t = 2;
+        return this.g();
+    }
+    function g() public view returns (uint) {
+        return Lib.x();
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// library: Lib
+// f() -> 1
diff --git a/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol b/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
new file mode 100644
index 0000000000..7ad6b61672
--- /dev/null
+++ b/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
@@ -0,0 +1,17 @@
+contract Test {
+    mapping(uint=>uint) data;
+    function stat() public returns (uint[5] memory)
+    {
+        data[2] = 3; // make sure to use some memory
+    }
+    function dyn() public returns (uint[] memory) { stat(); }
+    function nested() public returns (uint[3][] memory) { stat(); }
+    function nestedStat() public returns (uint[3][7] memory) { stat(); }
+}
+// ====
+// compileViaYul: also
+// ----
+// stat() -> 0, 0, 0, 0, 0
+// dyn() -> 0x20, 0
+// nested() -> 0x20, 0
+// nestedStat() -> 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
diff --git a/test/libsolidity/semanticTests/strings/constant_string_literal.sol b/test/libsolidity/semanticTests/strings/constant_string_literal.sol
new file mode 100644
index 0000000000..9c112c1faa
--- /dev/null
+++ b/test/libsolidity/semanticTests/strings/constant_string_literal.sol
@@ -0,0 +1,25 @@
+contract Test {
+    bytes32 constant public b = "abcdefghijklmnopq";
+    string constant public x = "abefghijklmnopqabcdefghijklmnopqabcdefghijklmnopqabca";
+
+    constructor() {
+        string memory xx = x;
+        bytes32 bb = b;
+    }
+    function getB() public returns (bytes32) { return b; }
+    function getX() public returns (string memory) { return x; }
+    function getX2() public returns (string memory r) { r = x; }
+    function unused() public returns (uint) {
+        "unusedunusedunusedunusedunusedunusedunusedunusedunusedunusedunusedunused";
+        return 2;
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// b() -> 0x6162636465666768696a6b6c6d6e6f7071000000000000000000000000000000
+// x() -> 0x20, 0x35, 0x616265666768696a6b6c6d6e6f70716162636465666768696a6b6c6d6e6f7071, 44048183304486788312148433451363384677562177293131179093971701692629931524096
+// getB() -> 0x6162636465666768696a6b6c6d6e6f7071000000000000000000000000000000
+// getX() -> 0x20, 0x35, 0x616265666768696a6b6c6d6e6f70716162636465666768696a6b6c6d6e6f7071, 44048183304486788312148433451363384677562177293131179093971701692629931524096
+// getX2() -> 0x20, 0x35, 0x616265666768696a6b6c6d6e6f70716162636465666768696a6b6c6d6e6f7071, 44048183304486788312148433451363384677562177293131179093971701692629931524096
+// unused() -> 2
diff --git a/test/libsolidity/semanticTests/strings/return_string.sol b/test/libsolidity/semanticTests/strings/return_string.sol
new file mode 100644
index 0000000000..f221a5e156
--- /dev/null
+++ b/test/libsolidity/semanticTests/strings/return_string.sol
@@ -0,0 +1,20 @@
+contract Main {
+    string public s;
+    function set(string calldata _s) external {
+        s = _s;
+    }
+    function get1() public returns (string memory r) {
+        return s;
+    }
+    function get2() public returns (string memory r) {
+        r = s;
+    }
+}
+// ====
+// compileToEwasm: also
+// compileViaYul: also
+// ----
+// set(string): 0x20, 5, "Julia" ->
+// get1() -> 0x20, 5, "Julia"
+// get2() -> 0x20, 5, "Julia"
+// s() -> 0x20, 5, "Julia"
diff --git a/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol b/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
new file mode 100644
index 0000000000..8d4931554d
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
@@ -0,0 +1,27 @@
+contract C {
+    struct str { uint8 a; uint16 b; uint8 c; }
+    uint8 x;
+    uint16 y;
+    str data;
+    function test() public returns (uint) {
+        x = 1;
+        y = 2;
+        data.a = 2;
+        data.b = 0xabcd;
+        data.c = 0xfa;
+        if (x != 1 || y != 2 || data.a != 2 || data.b != 0xabcd || data.c != 0xfa)
+            return 2;
+        delete y;
+        delete data.b;
+        if (x != 1 || y != 0 || data.a != 2 || data.b != 0 || data.c != 0xfa)
+            return 3;
+        delete x;
+        delete data;
+        return 1;
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// test() -> 1
+// storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol b/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol
new file mode 100644
index 0000000000..930ded40bf
--- /dev/null
+++ b/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol
@@ -0,0 +1,35 @@
+contract C {
+    event Ev(bool);
+    bool public perm;
+    function set() public returns(uint) {
+        bool tmp;
+        assembly {
+            tmp := 5
+        }
+        perm = tmp;
+        return 1;
+    }
+    function ret() public returns(bool) {
+        bool tmp;
+        assembly {
+            tmp := 5
+        }
+        return tmp;
+    }
+    function ev() public returns(uint) {
+        bool tmp;
+        assembly {
+            tmp := 5
+        }
+        emit Ev(tmp);
+        return 1;
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// set() -> 1
+// perm() -> true
+// ret() -> true
+// ev() -> 1
+// ~ emit Ev(bool): true

From bd399e37e3cd2224c9403b6c7ce4ab6f7c990817 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Tue, 30 Nov 2021 00:12:52 +0530
Subject: [PATCH 0153/1748] restoring the RTD section. Downloads section to
 still be above versions section

---
 docs/_templates/versions.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/docs/_templates/versions.html b/docs/_templates/versions.html
index 9168179dfd..a2432e3703 100644
--- a/docs/_templates/versions.html
+++ b/docs/_templates/versions.html
@@ -1,11 +1,7 @@
 {# Add rst-badge after rst-versions for small badge style. #}
 <div class="rst-versions" data-toggle="rst-versions" role="note" aria-label="versions">
     <span class="rst-current-version" data-toggle="rst-current-version">
-    {% for type, url in downloads %}
-        {% if type == 'PDF' %}
-            <a href="{{ url }}">{{ type }}</a>
-        {% endif %}
-    {% endfor %}
+    <span class="fa fa-book fa-element"> RTD </span>
 
     <span class="fa fa-element">
     <input class="container_toggle" type="checkbox" id="switch" name="mode">

From 310f74302d893243a0abc03352654f8e21157be7 Mon Sep 17 00:00:00 2001
From: Dallon Asnes <dallon.asnes@gmail.com>
Date: Mon, 29 Nov 2021 15:31:52 -0600
Subject: [PATCH 0154/1748] Add fixed size type details to encodePacked doc

---
 docs/abi-spec.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 6f50c70d9e..02e5f8b2a4 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -749,7 +749,7 @@ Non-standard Packed Mode
 
 Through ``abi.encodePacked()``, Solidity supports a non-standard packed mode where:
 
-- types shorter than 32 bytes are neither zero padded nor sign extended and
+- types shorter than 32 bytes are concatenated directly, without padding or sign extension
 - dynamic types are encoded in-place and without the length.
 - array elements are padded, but still encoded in-place
 

From 86ce5f1da50e7de9c4d0649273637adda10f46b9 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 29 Nov 2021 21:19:41 +0100
Subject: [PATCH 0155/1748] Use LineColumn type.

---
 liblangutil/CharStream.cpp             |  4 ++--
 liblangutil/CharStream.h               |  3 ++-
 liblangutil/SourceLocation.h           | 19 +++++++++++++++++++
 liblangutil/SourceReferenceExtractor.h |  9 ---------
 4 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/liblangutil/CharStream.cpp b/liblangutil/CharStream.cpp
index 3b30bad776..96a6aebe29 100644
--- a/liblangutil/CharStream.cpp
+++ b/liblangutil/CharStream.cpp
@@ -100,7 +100,7 @@ string CharStream::lineAtPosition(int _position) const
 	return line;
 }
 
-tuple<int, int> CharStream::translatePositionToLineColumn(int _position) const
+LineColumn CharStream::translatePositionToLineColumn(int _position) const
 {
 	using size_type = string::size_type;
 	using diff_type = string::difference_type;
@@ -114,7 +114,7 @@ tuple<int, int> CharStream::translatePositionToLineColumn(int _position) const
 		lineStart = m_source.rfind('\n', searchPosition - 1);
 		lineStart = lineStart == string::npos ? 0 : lineStart + 1;
 	}
-	return tuple<int, int>(lineNumber, searchPosition - lineStart);
+	return LineColumn{lineNumber, static_cast<int>(searchPosition - lineStart)};
 }
 
 string_view CharStream::text(SourceLocation const& _location) const
diff --git a/liblangutil/CharStream.h b/liblangutil/CharStream.h
index 761cece316..2e5d79d932 100644
--- a/liblangutil/CharStream.h
+++ b/liblangutil/CharStream.h
@@ -59,6 +59,7 @@ namespace solidity::langutil
 {
 
 struct SourceLocation;
+struct LineColumn;
 
 /**
  * Bidirectional stream of characters.
@@ -97,7 +98,7 @@ class CharStream
 	/// Functions that help pretty-printing parse errors
 	/// Do only use in error cases, they are quite expensive.
 	std::string lineAtPosition(int _position) const;
-	std::tuple<int, int> translatePositionToLineColumn(int _position) const;
+	LineColumn translatePositionToLineColumn(int _position) const;
 	///@}
 
 	/// Tests whether or not given octet sequence is present at the current position in stream.
diff --git a/liblangutil/SourceLocation.h b/liblangutil/SourceLocation.h
index ea9958933d..ddb4575356 100644
--- a/liblangutil/SourceLocation.h
+++ b/liblangutil/SourceLocation.h
@@ -119,4 +119,23 @@ SourceLocation parseSourceLocation(
 /// Stream output for Location (used e.g. in boost exceptions).
 std::ostream& operator<<(std::ostream& _out, SourceLocation const& _location);
 
+
+/**
+ * Alternative, line-column-based representation for source locations.
+ * Both line and column are zero-based.
+ * If used as a range, the second location is considered exclusive.
+ * Negative values are invalid.
+ */
+struct LineColumn
+{
+	/// Line value, can be between zero and number of `\n` characters in the source file.
+	int line = -1;
+	/// Column value, can be between zero and number of characters in the line (inclusive).
+	int column = -1;
+
+	LineColumn() = default;
+	explicit LineColumn(int _line, int _column): line(_line), column(_column) {}
+};
+
+
 }
diff --git a/liblangutil/SourceReferenceExtractor.h b/liblangutil/SourceReferenceExtractor.h
index 6aeb6065e1..3b418fcfa2 100644
--- a/liblangutil/SourceReferenceExtractor.h
+++ b/liblangutil/SourceReferenceExtractor.h
@@ -30,15 +30,6 @@ namespace solidity::langutil
 
 class CharStreamProvider;
 
-struct LineColumn
-{
-	int line = {-1};
-	int column = {-1};
-
-	LineColumn() = default;
-	LineColumn(std::tuple<int, int> const& _t): line{std::get<0>(_t)}, column{std::get<1>(_t)} {}
-};
-
 struct SourceReference
 {
 	std::string message;      ///< A message that relates to this source reference (such as a warning, info or an error message).

From a0aacb91a6d42a2220081cfaaab17ddaf569f354 Mon Sep 17 00:00:00 2001
From: Dallon Asnes <dallon.asnes@gmail.com>
Date: Mon, 29 Nov 2021 23:43:28 -0600
Subject: [PATCH 0156/1748] Fix cl test script on macOS

---
 test/cmdlineTests.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 4f9d41384b..87442c6067 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -54,7 +54,13 @@ do
             shift
             ;;
         *)
-            matching_tests=$(find . -mindepth 1 -maxdepth 1 -type d -name "$1" | cut --characters 3- | sort)
+            if [[ "$OSTYPE" == "darwin"* ]]
+            then
+                matching_tests=$(find . -mindepth 1 -maxdepth 1 -type d -name "$1" | cut -c 3- | sort)
+            else
+                matching_tests=$(find . -mindepth 1 -maxdepth 1 -type d -name "$1" | cut --characters 3- | sort)
+            fi
+            
 
             if [[ $matching_tests == "" ]]
             then

From 70e925dbfc98a6e8c519f0095d4077fa28fda2c5 Mon Sep 17 00:00:00 2001
From: Dallon Asnes <30935722+dallonasnes@users.noreply.github.com>
Date: Tue, 30 Nov 2021 10:07:50 -0600
Subject: [PATCH 0157/1748] Update test/cmdlineTests.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <cameel2@gmail.com>
---
 test/cmdlineTests.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 87442c6067..f9a26cb46b 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -54,12 +54,7 @@ do
             shift
             ;;
         *)
-            if [[ "$OSTYPE" == "darwin"* ]]
-            then
-                matching_tests=$(find . -mindepth 1 -maxdepth 1 -type d -name "$1" | cut -c 3- | sort)
-            else
-                matching_tests=$(find . -mindepth 1 -maxdepth 1 -type d -name "$1" | cut --characters 3- | sort)
-            fi
+            matching_tests=$(find . -mindepth 1 -maxdepth 1 -type d -name "$1" | cut -c 3- | sort)
             
 
             if [[ $matching_tests == "" ]]

From bd193ae8401066bce6fbc3cede100f693b17922b Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 1 Dec 2021 12:46:02 +0100
Subject: [PATCH 0158/1748] Fix whitespace problem.

---
 test/cmdlineTests.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index f9a26cb46b..d33dd208c1 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -55,7 +55,6 @@ do
             ;;
         *)
             matching_tests=$(find . -mindepth 1 -maxdepth 1 -type d -name "$1" | cut -c 3- | sort)
-            
 
             if [[ $matching_tests == "" ]]
             then

From b6bd85202c0e5e6bae0dcc71b9ebcfea17de5f9a Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 1 Dec 2021 12:30:36 +0100
Subject: [PATCH 0159/1748] Accessors for exceptions.

---
 liblangutil/Exceptions.cpp                 | 10 ++++++++++
 liblangutil/Exceptions.h                   |  5 ++++-
 libsolidity/interface/StandardCompiler.cpp |  2 +-
 libsolutil/Exceptions.h                    |  2 --
 test/libsolidity/AnalysisFramework.cpp     |  2 +-
 test/libsolidity/SyntaxTest.cpp            |  5 +++--
 test/libyul/SyntaxTest.cpp                 |  2 +-
 7 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/liblangutil/Exceptions.cpp b/liblangutil/Exceptions.cpp
index a410a98635..2595c7755c 100644
--- a/liblangutil/Exceptions.cpp
+++ b/liblangutil/Exceptions.cpp
@@ -75,6 +75,16 @@ Error::Error(
 		*this << util::errinfo_comment(_description);
 }
 
+SourceLocation const* Error::sourceLocation() const noexcept
+{
+	return boost::get_error_info<errinfo_sourceLocation>(*this);
+}
+
+SecondarySourceLocation const* Error::secondarySourceLocation() const noexcept
+{
+	return boost::get_error_info<errinfo_secondarySourceLocation>(*this);
+}
+
 optional<Error::Severity> Error::severityFromString(string _input)
 {
 	boost::algorithm::to_lower(_input);
diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
index 0c8f03cb94..10fca80293 100644
--- a/liblangutil/Exceptions.h
+++ b/liblangutil/Exceptions.h
@@ -197,6 +197,9 @@ class Error: virtual public util::Exception
 	Type type() const { return m_type; }
 	std::string const& typeName() const { return m_typeName; }
 
+	SourceLocation const* sourceLocation() const noexcept;
+	SecondarySourceLocation const* secondarySourceLocation() const noexcept;
+
 	/// helper functions
 	static Error const* containsErrorOfType(ErrorList const& _list, Error::Type _type)
 	{
@@ -206,7 +209,7 @@ class Error: virtual public util::Exception
 		return nullptr;
 	}
 
-	static Severity errorSeverity(Type _type)
+	static constexpr Severity errorSeverity(Type _type)
 	{
 		if (_type == Type::Info)
 			return Severity::Info;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index da28cf29f2..39ed7c10fb 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -129,7 +129,7 @@ Json::Value formatErrorWithException(
 		_charStreamProvider
 	);
 
-	if (string const* description = boost::get_error_info<util::errinfo_comment>(_exception))
+	if (string const* description = _exception.comment())
 		message = ((_message.length() > 0) ? (_message + ":") : "") + *description;
 	else
 		message = _message;
diff --git a/libsolutil/Exceptions.h b/libsolutil/Exceptions.h
index d83d8004b4..9d351a28d2 100644
--- a/libsolutil/Exceptions.h
+++ b/libsolutil/Exceptions.h
@@ -39,8 +39,6 @@ struct Exception: virtual std::exception, virtual boost::exception
 
 	/// @returns the errinfo_comment of this exception.
 	std::string const* comment() const noexcept;
-
-private:
 };
 
 /// Throws an exception with a given description and extra information about the location the
diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 84c7a5e0bd..5dce2211f9 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -100,7 +100,7 @@ ErrorList AnalysisFramework::filterErrors(ErrorList const& _errorList, bool _inc
 		for (auto const& messagePrefix: m_messagesToCut)
 			if (currentError->comment()->find(messagePrefix) == 0)
 			{
-				SourceLocation const* location = boost::get_error_info<errinfo_sourceLocation>(*currentError);
+				SourceLocation const* location = currentError->sourceLocation();
 				// sufficient for now, but in future we might clone the error completely, including the secondary location
 				newError = make_shared<Error>(
 					currentError->errorId(),
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 4998b628b3..d3e5124508 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -118,9 +118,10 @@ void SyntaxTest::filterObtainedErrors()
 {
 	for (auto const& currentError: filterErrors(compiler().errors(), true))
 	{
-		int locationStart = -1, locationEnd = -1;
+		int locationStart = -1;
+		int locationEnd = -1;
 		string sourceName;
-		if (auto location = boost::get_error_info<errinfo_sourceLocation>(*currentError))
+		if (SourceLocation const* location = currentError->sourceLocation())
 		{
 			solAssert(location->sourceName, "");
 			sourceName = *location->sourceName;
diff --git a/test/libyul/SyntaxTest.cpp b/test/libyul/SyntaxTest.cpp
index 4668773e93..8ab5bb9530 100644
--- a/test/libyul/SyntaxTest.cpp
+++ b/test/libyul/SyntaxTest.cpp
@@ -54,7 +54,7 @@ void SyntaxTest::parseAndAnalyze()
 		int locationStart = -1;
 		int locationEnd = -1;
 
-		if (auto location = boost::get_error_info<errinfo_sourceLocation>(*error))
+		if (SourceLocation const* location = error->sourceLocation())
 		{
 			locationStart = location->start;
 			locationEnd = location->end;

From 264b7bd85739deb1baff7678a7ea34130b988d88 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 1 Dec 2021 12:20:09 +0100
Subject: [PATCH 0160/1748] LineColumn handling for CharStream.

---
 liblangutil/CharStream.cpp      | 29 +++++++++++
 liblangutil/CharStream.h        |  7 +++
 test/liblangutil/CharStream.cpp | 85 ++++++++++++++++++++++++++++++++-
 3 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/liblangutil/CharStream.cpp b/liblangutil/CharStream.cpp
index 96a6aebe29..6ecd85bfed 100644
--- a/liblangutil/CharStream.cpp
+++ b/liblangutil/CharStream.cpp
@@ -144,3 +144,32 @@ string CharStream::singleLineSnippet(string const& _sourceCode, SourceLocation c
 
 	return cut;
 }
+
+optional<int> CharStream::translateLineColumnToPosition(LineColumn const& _lineColumn) const
+{
+	return translateLineColumnToPosition(m_source, _lineColumn);
+}
+
+optional<int> CharStream::translateLineColumnToPosition(std::string const& _text, LineColumn const& _input)
+{
+	if (_input.line < 0)
+		return nullopt;
+
+	size_t offset = 0;
+	for (int i = 0; i < _input.line; i++)
+	{
+		offset = _text.find('\n', offset);
+		if (offset == _text.npos)
+			return nullopt;
+		offset++; // Skip linefeed.
+	}
+
+	size_t endOfLine = _text.find('\n', offset);
+	if (endOfLine == string::npos)
+		endOfLine = _text.size();
+
+	if (offset + static_cast<size_t>(_input.column) > endOfLine)
+		return nullopt;
+	return offset + static_cast<size_t>(_input.column);
+}
+
diff --git a/liblangutil/CharStream.h b/liblangutil/CharStream.h
index 2e5d79d932..08f86129b2 100644
--- a/liblangutil/CharStream.h
+++ b/liblangutil/CharStream.h
@@ -51,6 +51,7 @@
 #pragma once
 
 #include <cstdint>
+#include <optional>
 #include <string>
 #include <tuple>
 #include <utility>
@@ -101,6 +102,12 @@ class CharStream
 	LineColumn translatePositionToLineColumn(int _position) const;
 	///@}
 
+	/// Translates a line:column to the absolute position.
+	std::optional<int> translateLineColumnToPosition(LineColumn const& _lineColumn) const;
+
+	/// Translates a line:column to the absolute position for the given input text.
+	static std::optional<int> translateLineColumnToPosition(std::string const& _text, LineColumn const& _input);
+
 	/// Tests whether or not given octet sequence is present at the current position in stream.
 	/// @returns true if the sequence could be found, false otherwise.
 	bool prefixMatch(std::string_view _sequence)
diff --git a/test/liblangutil/CharStream.cpp b/test/liblangutil/CharStream.cpp
index 9321b14e0d..766a700986 100644
--- a/test/liblangutil/CharStream.cpp
+++ b/test/liblangutil/CharStream.cpp
@@ -28,6 +28,33 @@
 
 #include <boost/test/unit_test.hpp>
 
+using namespace std;
+using namespace solidity::test;
+
+namespace boost::test_tools::tt_detail
+{
+
+template<>
+struct print_log_value<std::optional<int>>
+{
+	void operator()(std::ostream& _out, std::optional<int> const& _value) const
+	{
+		_out << (_value ? to_string(*_value) : "[nullopt]");
+	}
+};
+
+template<>
+struct print_log_value<nullopt_t>
+{
+	void operator()(std::ostream& _out, nullopt_t const&) const
+	{
+		_out << "[nullopt]";
+	}
+};
+
+} // namespace boost::test_tools::tt_detail
+
+
 namespace solidity::langutil::test
 {
 
@@ -48,6 +75,62 @@ BOOST_AUTO_TEST_CASE(test_fail)
 	);
 }
 
+namespace
+{
+std::optional<int> toPosition(int _line, int _column, string const& _text)
+{
+	return CharStream{_text, "source"}.translateLineColumnToPosition(
+		LineColumn{_line, _column}
+	);
+}
+
+}
+
+BOOST_AUTO_TEST_CASE(translateLineColumnToPosition)
+{
+	BOOST_CHECK_EQUAL(toPosition(-1, 0, "ABC"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(0, -1, "ABC"), nullopt);
+
+	BOOST_CHECK_EQUAL(toPosition(0, 0, ""), 0);
+	BOOST_CHECK_EQUAL(toPosition(1, 0, ""), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(0, 1, ""), nullopt);
+
+	// With last line containing no LF
+	BOOST_CHECK_EQUAL(toPosition(0, 0, "ABC"), 0);
+	BOOST_CHECK_EQUAL(toPosition(0, 1, "ABC"), 1);
+	BOOST_CHECK_EQUAL(toPosition(0, 2, "ABC"), 2);
+	BOOST_CHECK_EQUAL(toPosition(0, 3, "ABC"), 3);
+	BOOST_CHECK_EQUAL(toPosition(0, 4, "ABC"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(1, 0, "ABC"), nullopt);
+
+	BOOST_CHECK_EQUAL(toPosition(0, 3, "ABC\nDEF"), 3);
+	BOOST_CHECK_EQUAL(toPosition(0, 4, "ABC\nDEF"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(1, 0, "ABC\nDEF"), 4);
+	BOOST_CHECK_EQUAL(toPosition(1, 1, "ABC\nDEF"), 5);
+	BOOST_CHECK_EQUAL(toPosition(1, 2, "ABC\nDEF"), 6);
+	BOOST_CHECK_EQUAL(toPosition(1, 3, "ABC\nDEF"), 7);
+	BOOST_CHECK_EQUAL(toPosition(1, 4, "ABC\nDEF"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(2, 0, "ABC\nDEF"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF"), nullopt);
+
+	// With last line containing LF
+	BOOST_CHECK_EQUAL(toPosition(0, 0, "ABC\nDEF\n"), 0);
+	BOOST_CHECK_EQUAL(toPosition(0, 1, "ABC\nDEF\n"), 1);
+	BOOST_CHECK_EQUAL(toPosition(0, 2, "ABC\nDEF\n"), 2);
+
+	BOOST_CHECK_EQUAL(toPosition(1, 0, "ABC\nDEF\n"), 4);
+	BOOST_CHECK_EQUAL(toPosition(1, 1, "ABC\nDEF\n"), 5);
+	BOOST_CHECK_EQUAL(toPosition(1, 2, "ABC\nDEF\n"), 6);
+	BOOST_CHECK_EQUAL(toPosition(1, 3, "ABC\nDEF\n"), 7);
+	BOOST_CHECK_EQUAL(toPosition(1, 4, "ABC\nDEF\n"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(2, 0, "ABC\nDEF\n"), 8);
+	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF\n"), nullopt);
+
+	BOOST_CHECK_EQUAL(toPosition(2, 0, "ABC\nDEF\nGHI\n"), 8);
+	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF\nGHI\n"), 9);
+	BOOST_CHECK_EQUAL(toPosition(2, 2, "ABC\nDEF\nGHI\n"), 10);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
-} // end namespaces
+}

From d56fb3afffd23dfac656a14d2c3c60c7db841f16 Mon Sep 17 00:00:00 2001
From: Tynan Richards <tynan@kri.ch>
Date: Wed, 24 Nov 2021 14:39:14 +0100
Subject: [PATCH 0161/1748] Fix ExpressionSplitter example

Fix error (0x123 and 0x456 were swapped) and split constants into expressions
---
 docs/internals/optimizer.rst | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index d75eca4198..ccb72b9396 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -521,7 +521,7 @@ ExpressionSplitter
 
 The expression splitter turns expressions like ``add(mload(0x123), mul(mload(0x456), 0x20))``
 into a sequence of declarations of unique variables that are assigned sub-expressions
-of that expression so that each function call has only variables or literals
+of that expression so that each function call has only variables
 as arguments.
 
 The above would be transformed into
@@ -529,10 +529,13 @@ The above would be transformed into
 .. code-block:: yul
 
     {
-        let _1 := mload(0x123)
-        let _2 := mul(_1, 0x20)
-        let _3 := mload(0x456)
-        let z := add(_3, _2)
+        let _1 = 0x20
+        let _2 = 0x456
+        let _3 = mload(_2)
+        let _4 = mul(_3, _1)
+        let _5 = 0x123
+        let _6 = mload(_5)
+        let z = add(_6, _4)
     }
 
 Note that this transformation does not change the order of opcodes or function calls.
@@ -543,7 +546,7 @@ this "outlining" of the inner expressions in all cases. We can sidestep this lim
 
 The final program should be in a form such that (with the exception of loop conditions)
 function calls cannot appear nested inside expressions
-and all function call arguments have to be literals or variables.
+and all function call arguments have to be variables.
 
 The benefits of this form are that it is much easier to re-order the sequence of opcodes
 and it is also easier to perform function call inlining. Furthermore, it is simpler

From 829fe6615ba601de8f605941251b2996aad6032a Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 1 Dec 2021 16:23:26 +0100
Subject: [PATCH 0162/1748] Fix Yul example.

---
 docs/internals/optimizer.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index ccb72b9396..19bca791e8 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -529,13 +529,13 @@ The above would be transformed into
 .. code-block:: yul
 
     {
-        let _1 = 0x20
-        let _2 = 0x456
-        let _3 = mload(_2)
-        let _4 = mul(_3, _1)
-        let _5 = 0x123
-        let _6 = mload(_5)
-        let z = add(_6, _4)
+        let _1 := 0x20
+        let _2 := 0x456
+        let _3 := mload(_2)
+        let _4 := mul(_3, _1)
+        let _5 := 0x123
+        let _6 := mload(_5)
+        let z := add(_6, _4)
     }
 
 Note that this transformation does not change the order of opcodes or function calls.

From d9a4020a92db3fdc92163fa1bdb8b46ce13fae86 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 1 Dec 2021 12:31:21 +0100
Subject: [PATCH 0163/1748] Function to read a number of bytes from an input
 stream.

---
 libsolutil/CommonIO.cpp      | 11 +++++++++++
 libsolutil/CommonIO.h        |  4 ++++
 test/libsolutil/CommonIO.cpp |  9 +++++++++
 3 files changed, 24 insertions(+)

diff --git a/libsolutil/CommonIO.cpp b/libsolutil/CommonIO.cpp
index 9da5b2422a..6089f4db66 100644
--- a/libsolutil/CommonIO.cpp
+++ b/libsolutil/CommonIO.cpp
@@ -79,6 +79,17 @@ string solidity::util::readUntilEnd(istream& _stdin)
 	return ss.str();
 }
 
+string solidity::util::readBytes(istream& _input, size_t _length)
+{
+	string output;
+	output.resize(_length);
+	_input.read(output.data(), static_cast<streamsize>(_length));
+	// If read() reads fewer bytes it sets failbit in addition to eofbit.
+	if (_input.fail())
+		output.resize(static_cast<size_t>(_input.gcount()));
+	return output;
+}
+
 #if defined(_WIN32)
 class DisableConsoleBuffering
 {
diff --git a/libsolutil/CommonIO.h b/libsolutil/CommonIO.h
index ab0000f868..e6cd0c1616 100644
--- a/libsolutil/CommonIO.h
+++ b/libsolutil/CommonIO.h
@@ -57,6 +57,10 @@ std::string readFileAsString(boost::filesystem::path const& _file);
 /// Retrieves and returns the whole content of the specified input stream (until EOF).
 std::string readUntilEnd(std::istream& _stdin);
 
+/// Tries to read exactly @a _length bytes from @a _input.
+/// Returns a string containing as much data as has been read.
+std::string readBytes(std::istream& _input, size_t _length);
+
 /// Retrieves and returns a character from standard input (without waiting for EOL).
 int readStandardInputChar();
 
diff --git a/test/libsolutil/CommonIO.cpp b/test/libsolutil/CommonIO.cpp
index ce1a24a414..8b8c3d3263 100644
--- a/test/libsolutil/CommonIO.cpp
+++ b/test/libsolutil/CommonIO.cpp
@@ -90,6 +90,15 @@ BOOST_AUTO_TEST_CASE(readUntilEnd_empty)
 	BOOST_TEST(readUntilEnd(inputStream) == "");
 }
 
+BOOST_AUTO_TEST_CASE(readBytes_past_end)
+{
+	istringstream inputStream("abc");
+	BOOST_CHECK_EQUAL(readBytes(inputStream, 0), "");
+	BOOST_CHECK_EQUAL(readBytes(inputStream, 1), "a");
+	BOOST_CHECK_EQUAL(readBytes(inputStream, 20), "bc");
+	BOOST_CHECK_EQUAL(readBytes(inputStream, 20), "");
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace solidity::util::test

From 105de2561acda08ae4220c63f21093e1a30c032e Mon Sep 17 00:00:00 2001
From: Saska Karsi <44523813+saska@users.noreply.github.com>
Date: Fri, 3 Dec 2021 01:11:04 +0200
Subject: [PATCH 0164/1748] rm trailing comma in style-guide.rst example

---
 docs/style-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 9e0fba5f66..64e76526f5 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -747,7 +747,7 @@ Yes:
     function thisFunctionNameIsReallyLong(
         address x,
         address y,
-        address z,
+        address z
     )
         public
         onlyOwner

From 16535aae3272e676a140ea94e3f2a757a2ee20ec Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 1 Dec 2021 17:38:23 +0100
Subject: [PATCH 0165/1748] Fix ICE when unsafe targets are solved more than
 once and the cex is different

---
 Changelog.md                                  |  1 +
 libsolidity/formal/CHC.cpp                    |  2 -
 .../smtCheckerTests/imports/ExtCall.sol       | 42 +++++++++++++++++++
 3 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/imports/ExtCall.sol

diff --git a/Changelog.md b/Changelog.md
index b3af54d047..e24cb24628 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 Bugfixes:
  * Code Generator: Fix a crash when using ``@use-src`` and compiling from Yul to ewasm.
+ * SMTChecker: Fix internal error when an unsafe target is solved more than once and the counterexample messages are different.
 
 
 ### 0.8.10 (2021-11-09)
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 76a5ded998..0edfc27fff 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -972,8 +972,6 @@ void CHC::resetSourceAnalysis()
 {
 	SMTEncoder::resetSourceAnalysis();
 
-	m_safeTargets.clear();
-	m_unsafeTargets.clear();
 	m_unprovedTargets.clear();
 	m_invariants.clear();
 	m_functionTargetIds.clear();
diff --git a/test/libsolidity/smtCheckerTests/imports/ExtCall.sol b/test/libsolidity/smtCheckerTests/imports/ExtCall.sol
new file mode 100644
index 0000000000..047148a90c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/imports/ExtCall.sol
@@ -0,0 +1,42 @@
+==== Source: ExtCall.sol ====
+interface Unknown {
+    function callme() external;
+}
+
+contract ExtCall {
+    uint x;
+
+    bool lock;
+    modifier mutex {
+        require(!lock);
+        lock = true;
+        _;
+        lock = false;
+    }
+
+    function setX(uint y) mutex public {
+        x = y;
+    }
+
+    function xMut(Unknown u) public {
+        uint x_prev = x;
+        u.callme();
+        assert(x_prev == x);
+    }
+}
+==== Source: ExtCall.t.sol ====
+import "ExtCall.sol";
+
+contract ExtCallTest {
+    ExtCall call;
+
+    function setUp() public {
+        call = new ExtCall();
+    }
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (ExtCall.sol:362-381): CHC: Assertion violation happens here.
+// Warning 4588: (ExtCall.t.sol:110-123): Assertion checker does not yet implement this type of function call.

From a4fbc607c65ed63484e130dea58377b70f573bbe Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Wed, 10 Nov 2021 17:46:36 +0530
Subject: [PATCH 0166/1748] Issue 11610 : Replced typeError with fataTypeError
 in lines 390 and 406. Test file added in
 test/libsolidity/syntaxTests/calldata_struct_argument_with_internal_type_inside.sol

Issue : 11610 : Test cases updated, Changelog.md file updated to include change on 0.8.11
---
 Changelog.md                                              | 2 ++
 libsolidity/analysis/TypeChecker.cpp                      | 4 ++--
 ...s_taking_internal_types_nested_struct_with_mapping.sol | 1 -
 ...unctions_taking_internal_types_struct_with_mapping.sol | 1 -
 test/libsolidity/syntaxTests/array/function_mapping.sol   | 1 -
 .../constructor/constructor_mapping_memory.sol            | 1 -
 ...ata_struct_argument_with_internal_data_type_inside.sol | 8 ++++++++
 ...ruct_array_argument_with_internal_data_type_inside.sol | 8 ++++++++
 ...internal_data_type_inside_as_constructor_parameter.sol | 8 ++++++++
 .../structs/calldata_struct_mapping_function.sol          | 1 -
 .../recursion/recursive_struct_nested_mapping_memory.sol  | 1 -
 ...apping_array_data_location_function_param_external.sol | 1 -
 .../mapping_data_location_function_param_external.sol     | 1 -
 .../mapping_data_location_function_param_public.sol       | 1 -
 .../types/mapping/mapping_function_calldata.sol           | 1 -
 .../types/mapping/mapping_return_public_memory.sol        | 1 -
 .../types/mapping/mapping_struct_data_location_memory.sol | 1 -
 .../mapping_struct_recusrive_data_location_memory.sol     | 1 -
 18 files changed, 28 insertions(+), 15 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol
 create mode 100644 test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol
 create mode 100644 test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol

diff --git a/Changelog.md b/Changelog.md
index e24cb24628..9ecf2ce556 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,8 @@ Compiler Features:
 Bugfixes:
  * Code Generator: Fix a crash when using ``@use-src`` and compiling from Yul to ewasm.
  * SMTChecker: Fix internal error when an unsafe target is solved more than once and the counterexample messages are different.
+ * Fix internal error when a function has a calldata struct argument with an internal type inside.
+
 
 
 ### 0.8.10 (2021-11-09)
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 05fdc489bb..5cc208d698 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -387,7 +387,7 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
 			_var.referenceLocation() == VariableDeclaration::Location::Storage &&
 			!m_currentContract->abstract()
 		)
-			m_errorReporter.typeError(
+			m_errorReporter.fatalTypeError(
 				3644_error,
 				_var.location(),
 				"This parameter has a type that can only be used internally. "
@@ -403,7 +403,7 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
 				solAssert(!message.empty(), "Expected detailed error message!");
 				if (_function.isConstructor())
 					message += " You can make the contract abstract to avoid this problem.";
-				m_errorReporter.typeError(4103_error, _var.location(), message);
+				m_errorReporter.fatalTypeError(4103_error, _var.location(), message);
 			}
 			else if (
 				!useABICoderV2() &&
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol
index 78660bdae4..9c82812e96 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_nested_struct_with_mapping.sol
@@ -7,4 +7,3 @@ contract C {
 }
 // ----
 // TypeError 4103: (132-140): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (132-140): Type struct C.S is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol
index 297f809fd6..144962c2a0 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/external_functions_taking_internal_types_struct_with_mapping.sol
@@ -6,4 +6,3 @@ contract C {
 }
 // ----
 // TypeError 4103: (105-113): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (105-113): Type struct C.S is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/array/function_mapping.sol b/test/libsolidity/syntaxTests/array/function_mapping.sol
index 531ef6c7b6..3f64c081c3 100644
--- a/test/libsolidity/syntaxTests/array/function_mapping.sol
+++ b/test/libsolidity/syntaxTests/array/function_mapping.sol
@@ -5,4 +5,3 @@ contract Test {
 }
 // ----
 // TypeError 4103: (66-98): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (66-98): Type mapping(uint256 => uint256)[] is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol b/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol
index 266a440d63..b9e0ed801d 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_mapping_memory.sol
@@ -3,4 +3,3 @@ contract A {
 }
 // ----
 // TypeError 4103: (29-59): Types containing (nested) mappings can only be parameters or return variables of internal or library functions. You can make the contract abstract to avoid this problem.
-// TypeError 4061: (29-59): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol
new file mode 100644
index 0000000000..729dba7786
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_argument_with_internal_data_type_inside.sol
@@ -0,0 +1,8 @@
+contract C {
+	struct S {
+		function() a;
+	}
+	function f(S calldata) public {}
+}
+// ----
+// TypeError 4103: (56-66): Internal type is not allowed for public or external functions.
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol
new file mode 100644
index 0000000000..f618934e3d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside.sol
@@ -0,0 +1,8 @@
+contract C {
+	struct S {
+		function() a;
+	}
+	function f(S[2] calldata) public {}
+}
+// ----
+// TypeError 4103: (56-69): Internal type is not allowed for public or external functions.
diff --git a/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol
new file mode 100644
index 0000000000..796b0fc586
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionCalls/calldata_struct_array_argument_with_internal_data_type_inside_as_constructor_parameter.sol
@@ -0,0 +1,8 @@
+contract C {
+	struct S {
+		function() a;
+	}
+	constructor (S[2] storage) public {}
+}
+// ----
+// TypeError 3644: (58-70): This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.
diff --git a/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol b/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol
index dcdbad68bc..9ff30c6ec0 100644
--- a/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol
+++ b/test/libsolidity/syntaxTests/structs/calldata_struct_mapping_function.sol
@@ -12,4 +12,3 @@ contract test {
 }
 // ----
 // TypeError 4103: (155-167): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (155-167): Type struct test.S is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol
index 6009ee94d2..c8708e3e0d 100644
--- a/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol
+++ b/test/libsolidity/syntaxTests/structs/recursion/recursive_struct_nested_mapping_memory.sol
@@ -7,4 +7,3 @@ library a {
 }
 // ----
 // TypeError 4103: (149-157): Recursive structs can only be passed as storage pointers to libraries, not as memory objects to contract functions.
-// TypeError 4061: (149-157): Type struct a.b is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol
index 72c2a12a85..f959394d1f 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_array_data_location_function_param_external.sol
@@ -3,4 +3,3 @@ contract c {
 }
 // ----
 // TypeError 4103: (29-61): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (29-61): Type mapping(uint256 => uint256)[] is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol
index 3bc5d7a29c..1281e4b514 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_external.sol
@@ -3,4 +3,3 @@ contract c {
 }
 // ----
 // TypeError 4103: (29-59): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (29-59): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol
index f8a6666750..667c0b1013 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_data_location_function_param_public.sol
@@ -3,4 +3,3 @@ contract c {
 }
 // ----
 // TypeError 4103: (29-57): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (29-57): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol
index 1301a03c3c..8b780ea8d4 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_function_calldata.sol
@@ -9,4 +9,3 @@ contract test {
 }
 // ----
 // TypeError 4103: (121-133): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (121-133): Type struct test.S is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol
index 4d06bad5a4..6594401c6e 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_return_public_memory.sol
@@ -4,4 +4,3 @@ contract C {
 }
 // ----
 // TypeError 4103: (51-79): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (51-79): Type mapping(uint256 => uint256) is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol
index 8208c2e2e8..399f7c6ae4 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_struct_data_location_memory.sol
@@ -5,4 +5,3 @@ contract C {
 }
 // ----
 // TypeError 4103: (104-112): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (104-112): Type struct C.S is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol b/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol
index fa09bdeaee..49cf314873 100644
--- a/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/mapping_struct_recusrive_data_location_memory.sol
@@ -7,4 +7,3 @@ contract C {
 }
 // ----
 // TypeError 4103: (148-156): Types containing (nested) mappings can only be parameters or return variables of internal or library functions.
-// TypeError 4061: (148-156): Type struct C.U is only valid in storage because it contains a (nested) mapping.

From 0cece8e6e745708dfeda209b884301de0d5f9931 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 28 Oct 2021 22:34:48 +0200
Subject: [PATCH 0167/1748] CI: Optimize machine sizes for best speed/cost
 ratio

---
 .circleci/build_win.ps1 |   4 +-
 .circleci/config.yml    | 155 +++++++++++++++++++++++++++++-----------
 2 files changed, 115 insertions(+), 44 deletions(-)

diff --git a/.circleci/build_win.ps1 b/.circleci/build_win.ps1
index 9be967c970..730bb63195 100644
--- a/.circleci/build_win.ps1
+++ b/.circleci/build_win.ps1
@@ -20,7 +20,7 @@ cd build
 $boost_dir=(Resolve-Path $PSScriptRoot\..\deps\boost\lib\cmake\Boost-*)
 ..\deps\cmake\bin\cmake -G "Visual Studio 16 2019" -DBoost_DIR="$boost_dir\" -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreaded -DCMAKE_INSTALL_PREFIX="$PSScriptRoot\..\upload" -DUSE_Z3=OFF ..
 if ( -not $? ) { throw "CMake configure failed." }
-msbuild solidity.sln /p:Configuration=Release /m:5 /v:minimal
+msbuild solidity.sln /p:Configuration=Release /m:10 /v:minimal
 if ( -not $? ) { throw "Build failed." }
-..\deps\cmake\bin\cmake --build . -j 5 --target install --config Release
+..\deps\cmake\bin\cmake --build . -j 10 --target install --config Release
 if ( -not $? ) { throw "Install target failed." }
diff --git a/.circleci/config.yml b/.circleci/config.yml
index cadd37ab23..5a8968deac 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -226,6 +226,14 @@ defaults:
         - image: << pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image >>
       environment:
         TERM: xterm
+        MAKEFLAGS: -j 3
+
+  - base_ubuntu1604_clang_small: &base_ubuntu1604_clang_small
+      <<: *base_ubuntu1604_clang
+      resource_class: small
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 2
 
   - base_ubuntu2004_clang: &base_ubuntu2004_clang
       docker:
@@ -236,20 +244,44 @@ defaults:
         CXX: clang++
         MAKEFLAGS: -j 3
 
-  - base_ubuntu2004_clang_xlarge: &base_ubuntu2004_clang_xlarge
+  - base_ubuntu2004_clang_small: &base_ubuntu2004_clang_small
       <<: *base_ubuntu2004_clang
-      resource_class: xlarge
+      resource_class: small
       environment:
         TERM: xterm
         CC: clang
         CXX: clang++
-        MAKEFLAGS: -j 10
+        MAKEFLAGS: -j 2
+
+  - base_ubuntu2004_clang_large: &base_ubuntu2004_clang_large
+      <<: *base_ubuntu2004_clang
+      resource_class: large
+      environment:
+        TERM: xterm
+        CC: clang
+        CXX: clang++
+        MAKEFLAGS: -j 5
 
   - base_ubuntu2004: &base_ubuntu2004
       docker:
         - image: << pipeline.parameters.ubuntu-2004-docker-image >>
       environment:
         TERM: xterm
+        MAKEFLAGS: -j 3
+
+  - base_ubuntu2004_small: &base_ubuntu2004_small
+      <<: *base_ubuntu2004
+      resource_class: small
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 2
+
+  - base_ubuntu2004_large: &base_ubuntu2004_large
+      <<: *base_ubuntu2004
+      resource_class: large
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 5
 
   - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
       <<: *base_ubuntu2004
@@ -258,29 +290,48 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j 10
 
-  - base_buildpack_focal: &base_buildpack_focal
+  - base_buildpack_focal_small: &base_buildpack_focal_small
       docker:
         - image: buildpack-deps:focal
+      resource_class: small
       environment:
         TERM: xterm
+        MAKEFLAGS: -j 2
 
-  - base_buildpack_latest: &base_buildpack_latest
+  - base_buildpack_latest_small: &base_buildpack_latest_small
       docker:
         - image: buildpack-deps:latest
+      resource_class: small
       environment:
         TERM: xterm
+        MAKEFLAGS: -j 2
 
   - base_archlinux: &base_archlinux
       docker:
         - image: archlinux:base
       environment:
         TERM: xterm
+        MAKEFLAGS: -j 3
+
+  - base_archlinux_large: &base_archlinux_large
+      docker:
+        - image: archlinux:base
+      resource_class: large
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 5
 
   - base_win_powershell: &base_win_powershell
       executor:
         name: win/default
         shell: powershell.exe
 
+  - base_win_powershell_large: &base_win_powershell_large
+      executor:
+        name: win/default
+        shell: powershell.exe
+        size: large
+
   - base_win_cmd: &base_win_cmd
       executor:
         name: win/default
@@ -291,26 +342,31 @@ defaults:
         xcode: "11.0.0"
       environment:
         TERM: xterm
+        MAKEFLAGS: -j 5
 
-  - base_ems_xlarge: &base_ems_xlarge
+  - base_ems_large: &base_ems_large
       docker:
         - image: << pipeline.parameters.emscripten-docker-image >>
-      resource_class: xlarge
+      resource_class: large
       environment:
         TERM: xterm
-        MAKEFLAGS: -j 10
+        MAKEFLAGS: -j 5
 
-  - base_python: &base_python
+  - base_python_small: &base_python_small
       docker:
         - image: circleci/python:3.6
+      resource_class: small
       environment:
         TERM: xterm
+        MAKEFLAGS: -j 2
 
-  - base_node_latest: &base_node_latest
+  - base_node_latest_small: &base_node_latest_small
       docker:
         - image: circleci/node
+      resource_class: small
       environment:
         TERM: xterm
+        MAKEFLAGS: -j 2
 
   # --------------------------------------------------------------------------
   # Workflow Templates
@@ -394,7 +450,7 @@ defaults:
 jobs:
 
   chk_spelling:
-    <<: *base_python
+    <<: *base_python_small
     steps:
       - checkout
       - attach_workspace:
@@ -409,7 +465,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_docs_examples:
-    <<: *base_node_latest
+    <<: *base_node_latest_small
     steps:
       - checkout
       - attach_workspace:
@@ -423,7 +479,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_coding_style:
-    <<: *base_buildpack_focal
+    <<: *base_buildpack_focal_small
     steps:
       - checkout
       - run:
@@ -441,7 +497,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_errorcodes:
-    <<: *base_python
+    <<: *base_python_small
     steps:
       - checkout
       - run:
@@ -450,7 +506,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_pylint:
-    <<: *base_buildpack_focal
+    <<: *base_buildpack_focal_small
     steps:
       - checkout
       - run:
@@ -466,7 +522,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_antlr_grammar:
-    <<: *base_buildpack_focal
+    <<: *base_buildpack_focal_small
     steps:
       - checkout
       - run:
@@ -478,7 +534,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_buglist:
-    <<: *base_node_latest
+    <<: *base_node_latest_small
     steps:
       - checkout
       - run:
@@ -493,7 +549,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_proofs:
-    <<: *base_buildpack_latest
+    <<: *base_buildpack_latest_small
     steps:
       - checkout
       - run:
@@ -506,14 +562,14 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_docs_pragma_min_version:
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2004_small
     steps:
       - checkout
       - run: *run_docs_pragma_min_version
       - gitter_notify_failure_unless_pr
 
   t_ubu_pyscripts:
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2004_small
     steps:
       - checkout
       - run:
@@ -532,6 +588,8 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_ubu: &b_ubu
+    # this runs 2x faster on xlarge but takes 4x more resources (compared to medium).
+    # Enough other jobs depend on it that it's worth it though.
     <<: *base_ubuntu2004_xlarge
     steps:
       - checkout
@@ -544,10 +602,11 @@ jobs:
 
   # x64 ASAN build, for testing for memory related bugs
   b_ubu_asan: &b_ubu_asan
-    <<: *base_ubuntu2004_xlarge
+    # Runs slightly faster on large and xlarge but we only run it nightly so efficiency matters more.
+    <<: *base_ubuntu2004
     environment:
       CMAKE_OPTIONS: -DSANITIZE=address
-      MAKEFLAGS: -j 10
+      MAKEFLAGS: -j 3
       CMAKE_BUILD_TYPE: Release
     steps:
       - checkout
@@ -557,7 +616,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_ubu_clang: &b_ubu_clang
-    <<: *base_ubuntu2004_clang_xlarge
+    <<: *base_ubuntu2004_clang_large
     steps:
       - checkout
       - run: *run_build
@@ -566,6 +625,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_ubu_asan_clang: &b_ubu_asan_clang
+    # This runs a bit faster on large and xlarge but on nightly efficiency matters more.
     <<: *base_ubuntu2004_clang
     environment:
       CC: clang
@@ -580,6 +640,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_ubu_ubsan_clang: &b_ubu_ubsan_clang
+    # This runs a bit faster on large and xlarge but on nightly efficiency matters more.
     <<: *base_ubuntu2004_clang
     environment:
       CC: clang
@@ -600,9 +661,10 @@ jobs:
       MAKEFLAGS: -j 10
 
   b_ubu_static:
-    <<: *base_ubuntu2004_xlarge
+    # Runs 2x faster on large and 3x on xlarge but no other jobs depend on it we can live with medium.
+    <<: *base_ubuntu2004
     environment:
-      MAKEFLAGS: -j 10
+      MAKEFLAGS: -j 3
       CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DUSE_CVC4=OFF -DSOLC_STATIC_STDLIBS=ON
     steps:
       - checkout
@@ -614,11 +676,12 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_ubu_codecov:
-    <<: *base_ubuntu2004_xlarge
+    # Runs ~30% faster on large but we only run it nightly so efficiency matters more.
+    <<: *base_ubuntu2004
     environment:
       COVERAGE: ON
       CMAKE_BUILD_TYPE: Debug
-      MAKEFLAGS: -j 10
+      MAKEFLAGS: -j 3
     steps:
       - checkout
       - run: *run_build
@@ -651,11 +714,11 @@ jobs:
   # Builds in C++20 mode and uses debug build in order to speed up.
   # Do *NOT* store any artifacts or workspace as we don't run tests on this build.
   b_ubu_cxx20:
-    <<: *base_ubuntu2004_xlarge
+    <<: *base_ubuntu2004_large
     environment:
       CMAKE_BUILD_TYPE: Debug
       CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20 -DUSE_CVC4=OFF
-      MAKEFLAGS: -j 10
+      MAKEFLAGS: -j 5
     steps:
       - checkout
       - run: *run_build
@@ -671,7 +734,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   t_ubu_ossfuzz: &t_ubu_ossfuzz
-    <<: *base_ubuntu1604_clang
+    <<: *base_ubuntu1604_clang_small
     steps:
       - checkout
       - attach_workspace:
@@ -688,10 +751,10 @@ jobs:
       - gitter_notify_success_unless_pr
 
   b_archlinux:
-    <<: *base_archlinux
+    <<: *base_archlinux_large
     environment:
       TERM: xterm
-      MAKEFLAGS: -j 3
+      MAKEFLAGS: -j 5
     steps:
       - run:
           name: Install build dependencies
@@ -772,7 +835,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_ems:
-    <<: *base_ems_xlarge
+    <<: *base_ems_large
     steps:
       - checkout
       - run:
@@ -793,7 +856,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_docs:
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2004_small
     steps:
       - checkout
       - run: *setup_prerelease_commit_hash
@@ -850,14 +913,15 @@ jobs:
     <<: *t_ubu_soltest_all
 
   t_ubu_cli: &t_ubu_cli
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2004_small
     <<: *steps_cmdline_tests
 
   t_ubu_release_cli: &t_ubu_release_cli
     <<: *t_ubu_cli
 
   t_ubu_asan_cli:
-    <<: *base_ubuntu2004
+    # Runs slightly faster on medium but we only run it nightly so efficiency matters more.
+    <<: *base_ubuntu2004_small
     environment:
       TERM: xterm
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
@@ -889,10 +953,11 @@ jobs:
     <<: *steps_soltest
 
   t_ubu_ubsan_clang_cli:
-    <<: *base_ubuntu2004_clang
+    <<: *base_ubuntu2004_clang_small
     <<: *steps_cmdline_tests
 
   t_ems_solcjs:
+    # Unlike other t_ems jobs this one actually runs 2x faster on medium (compared to small).
     <<: *base_ubuntu2004
     steps:
       - checkout
@@ -913,7 +978,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   t_ems_ext_hardhat:
-    <<: *base_node_latest
+    <<: *base_node_latest_small
     environment:
       TERM: xterm
       HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
@@ -948,8 +1013,12 @@ jobs:
       nodejs_version:
         type: string
         default: latest
+      resource_class:
+        type: string
+        default: small
     docker:
       - image: circleci/node:<<parameters.nodejs_version>>
+    resource_class: <<parameters.resource_class>>
     # NOTE: Each external test does 3 separate compile&test runs
     parallelism: 3
     environment:
@@ -971,7 +1040,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_win: &b_win
-    <<: *base_win_powershell
+    <<: *base_win_powershell_large
     steps:
       # NOTE: Not disabling git's core.autocrlf here because we want to build using the typical Windows config.
       - checkout
@@ -1028,7 +1097,7 @@ jobs:
     <<: *t_win_soltest
 
   b_bytecode_ubu:
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2004_small
     steps:
       - checkout
       - attach_workspace:
@@ -1094,7 +1163,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_bytecode_ems:
-    <<: *base_node_latest
+    <<: *base_node_latest_small
     environment:
       SOLC_EMSCRIPTEN: "On"
     steps:
@@ -1111,7 +1180,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   t_bytecode_compare:
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2004_small
     environment:
       REPORT_FILES: |
         bytecode-report-emscripten.txt
@@ -1251,6 +1320,7 @@ workflows:
           project: zeppelin
           # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
           nodejs_version: '16'
+          resource_class: medium
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_test_ext_ens
@@ -1321,3 +1391,4 @@ workflows:
           <<: *workflow_emscripten
           name: t_ems_test_ext_colony
           project: colony
+          resource_class: medium

From 075d7b61527fee52cf8be0b9e7b05295be6a8445 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 28 Oct 2021 13:19:04 +0200
Subject: [PATCH 0168/1748] CI: Remove separate compile-only runs for external
 tests that execute quickly

---
 .circleci/config.yml | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5a8968deac..af3da5886d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1269,6 +1269,7 @@ workflows:
       - t_ems_solcjs: *workflow_emscripten
       - t_ems_ext_hardhat: *workflow_emscripten
 
+      # Separate compile-only runs of those external tests where a full run takes much longer.
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_compile_ext_colony
@@ -1281,24 +1282,6 @@ workflows:
           project: gnosis
           compile_only: 1
           nodejs_version: '14'
-      - t_ems_ext:
-          <<: *workflow_emscripten
-          name: t_ems_compile_ext_gnosis_v2
-          project: gnosis-v2
-          compile_only: 1
-          nodejs_version: '14'
-      - t_ems_ext:
-          <<: *workflow_emscripten
-          name: t_ems_compile_ext_zeppelin
-          project: zeppelin
-          compile_only: 1
-      - t_ems_ext:
-          <<: *workflow_emscripten
-          name: t_ems_compile_ext_ens
-          project: ens
-          compile_only: 1
-          # NOTE: One of the dependencies (fsevents) fails to build its native extension on node.js 12+.
-          nodejs_version: '10'
 
       # FIXME: Gnosis tests are pretty flaky right now. They often fail on CircleCI due to random ProviderError
       # and there are also other less frequent problems. See https://github.com/gnosis/safe-contracts/issues/216.

From b96d238c2389b3557f9cb0d3a5c29c550145ff99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 5 Nov 2021 17:26:52 +0100
Subject: [PATCH 0169/1748] CI: Double the number of threads for jobs that did
 slow down after switching to a smaller resource class

---
 .circleci/config.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index af3da5886d..312695ebf7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -617,6 +617,11 @@ jobs:
 
   b_ubu_clang: &b_ubu_clang
     <<: *base_ubuntu2004_clang_large
+    environment:
+      TERM: xterm
+      CC: clang
+      CXX: clang++
+      MAKEFLAGS: -j 10
     steps:
       - checkout
       - run: *run_build
@@ -664,7 +669,7 @@ jobs:
     # Runs 2x faster on large and 3x on xlarge but no other jobs depend on it we can live with medium.
     <<: *base_ubuntu2004
     environment:
-      MAKEFLAGS: -j 3
+      MAKEFLAGS: -j 5
       CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DUSE_CVC4=OFF -DSOLC_STATIC_STDLIBS=ON
     steps:
       - checkout
@@ -718,7 +723,7 @@ jobs:
     environment:
       CMAKE_BUILD_TYPE: Debug
       CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20 -DUSE_CVC4=OFF
-      MAKEFLAGS: -j 5
+      MAKEFLAGS: -j 10
     steps:
       - checkout
       - run: *run_build
@@ -836,6 +841,9 @@ jobs:
 
   b_ems:
     <<: *base_ems_large
+    environment:
+      TERM: xterm
+      MAKEFLAGS: -j 10
     steps:
       - checkout
       - run:
@@ -1303,7 +1311,7 @@ workflows:
           project: zeppelin
           # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
           nodejs_version: '16'
-          resource_class: medium
+          resource_class: large
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_test_ext_ens

From 25a26d2f8bca41e9f488bc8b2eef558da32fb27a Mon Sep 17 00:00:00 2001
From: minami <minaminaoy@gmail.com>
Date: Sun, 5 Dec 2021 16:57:48 +0900
Subject: [PATCH 0170/1748] Fix cheatsheet

---
 docs/cheatsheet.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index d36a963603..17537914ac 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -81,7 +81,7 @@ Global Variables
 - ``abi.encodeWithSelector(bytes4 selector, ...) returns (bytes memory)``: :ref:`ABI <ABI>`-encodes
   the given arguments starting from the second and prepends the given four-byte selector
 - ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``: Equivalent
-  to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature)), ...)```
+  to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature)), ...)``
 - ``bytes.concat(...) returns (bytes memory)``: :ref:`Concatenates variable number of
   arguments to one byte array<bytes-concat>`
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)

From 907405e2e06082389be99eb763e797c142f757a1 Mon Sep 17 00:00:00 2001
From: minami <minaminaoy@gmail.com>
Date: Sun, 5 Dec 2021 16:57:59 +0900
Subject: [PATCH 0171/1748] Fix units-and-global-variables

---
 docs/units-and-global-variables.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index 8a6173280a..ac11e08067 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -135,7 +135,7 @@ ABI Encoding and Decoding Functions
 - ``abi.encode(...) returns (bytes memory)``: ABI-encodes the given arguments
 - ``abi.encodePacked(...) returns (bytes memory)``: Performs :ref:`packed encoding <abi_packed_mode>` of the given arguments. Note that packed encoding can be ambiguous!
 - ``abi.encodeWithSelector(bytes4 selector, ...) returns (bytes memory)``: ABI-encodes the given arguments starting from the second and prepends the given four-byte selector
-- ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``: Equivalent to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature))), ...)```
+- ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``: Equivalent to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature))), ...)``
 
 .. note::
     These encoding functions can be used to craft data for external function calls without actually

From 6bafeca8a25ec87f50ee2c2de8a8eb1cd549a7e9 Mon Sep 17 00:00:00 2001
From: minami <minaminaoy@gmail.com>
Date: Sun, 5 Dec 2021 16:58:03 +0900
Subject: [PATCH 0172/1748] Fix yul

---
 docs/yul.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index ef44a575ba..219905cd5f 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -166,7 +166,7 @@ Inside a code block, the following elements can be used
 - if statements, e.g. ``if lt(a, b) { sstore(0, 1) }``
 - switch statements, e.g. ``switch mload(0) case 0 { revert() } default { mstore(0, 1) }``
 - for loops, e.g. ``for { let i := 0} lt(i, 10) { i := add(i, 1) } { mstore(i, 7) }``
-- function definitions, e.g. ``function f(a, b) -> c { c := add(a, b) }```
+- function definitions, e.g. ``function f(a, b) -> c { c := add(a, b) }``
 
 Multiple syntactical elements can follow each other simply separated by
 whitespace, i.e. there is no terminating ``;`` or newline required.

From f0a9cd7504efa34496ab3e0897a1c0cc3b76ebd2 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 6 Dec 2021 16:15:32 +0100
Subject: [PATCH 0173/1748] Typo in changelog.

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index e24cb24628..f5be36a1bf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -104,7 +104,7 @@ Bugfixes:
  * SMTChecker: Fix false positive in external calls from constructors.
  * SMTChecker: Fix internal error on some multi-source uses of ``abi.*``, cryptographic functions and constants.
  * Standard JSON: Fix non-fatal errors in Yul mode being discarded if followed by a fatal error.
- * Type Checker: Correct wrong error message in inline assembly complaining about ``.slot`` or ``.offset` not valid when actually ``.length`` was used.
+ * Type Checker: Correct wrong error message in inline assembly complaining about ``.slot`` or ``.offset`` not valid when actually ``.length`` was used.
  * Type Checker: Disallow modifier declarations and definitions in interfaces.
  * Yul Optimizer: Fix a crash in LoadResolver, when ``keccak256`` has particular non-identifier arguments.
 

From d41415325803e97479d111bd70465d7867e0a19c Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 6 Dec 2021 15:59:08 +0100
Subject: [PATCH 0174/1748] Some clarifications on literals.

---
 docs/types/value-types.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 4cb0dec4fa..49e35d9eae 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -437,14 +437,16 @@ an error. You can prepend (for integer types) or append (for bytesNN types) zero
 Rational and Integer Literals
 -----------------------------
 
-Integer literals are formed from a sequence of numbers in the range 0-9.
+Integer literals are formed from a sequence of digits in the range 0-9.
 They are interpreted as decimals. For example, ``69`` means sixty nine.
 Octal literals do not exist in Solidity and leading zeros are invalid.
 
-Decimal fraction literals are formed by a ``.`` with at least one number on
+Decimal fractional literals are formed by a ``.`` with at least one number on
 one side.  Examples include ``1.``, ``.1`` and ``1.3``.
 
-Scientific notation is also supported, where the base can have fractions and the exponent cannot.
+Scientific notation in the form of ``2e10`` is also supported, where the
+mantissa can be fractional but the exponent has to be an integer.
+The literal ``MeE`` is equivalent to ``M * 10**E``.
 Examples include ``2e10``, ``-2e10``, ``2e-10``, ``2.5e1``.
 
 Underscores can be used to separate the digits of a numeric literal to aid readability.

From af02678dee8da8e63c90e2b822f04889843c00d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 8 Dec 2021 20:04:35 +0100
Subject: [PATCH 0175/1748] CI: Adjust job parallelism to actually match
 available resources

- Some jobs don't actually run in parallel but have the `parallelism` setting enabled.
- `soltest_all` could be parallelized much more.
---
 .circleci/config.yml     | 4 +---
 .circleci/soltest_all.sh | 1 +
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 312695ebf7..3c47b55c6a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -695,7 +695,6 @@ jobs:
 
   t_ubu_codecov:
     <<: *base_ubuntu2004
-    parallelism: 6
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 1
@@ -878,7 +877,7 @@ jobs:
 
   t_ubu_soltest_all: &t_ubu_soltest_all
     <<: *base_ubuntu2004
-    parallelism: 6
+    parallelism: 15 # 7 EVM versions, each with/without optimization + 1 ABIv1/@nooptions run
     <<: *steps_soltest_all
 
   t_archlinux_soltest: &t_archlinux_soltest
@@ -937,7 +936,6 @@ jobs:
 
   t_ubu_asan_soltest:
     <<: *base_ubuntu2004
-    parallelism: 6
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 0c414593f3..5bd5ed9f1c 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -31,6 +31,7 @@ REPODIR="$(realpath "$(dirname "$0")"/..)"
 # shellcheck source=scripts/common.sh
 source "${REPODIR}/scripts/common.sh"
 
+# NOTE: If you add/remove values, remember to update `parallelism` setting in CircleCI config.
 EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london)
 DEFAULT_EVM=london
 [[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]

From 8ada7db7e9a0e1f0dd0647af3a5943ad294cc153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 10 Dec 2021 15:34:07 +0100
Subject: [PATCH 0176/1748] externalTests: Fix optimizer level 2 to make it
 actually run without Yul optimizer

---
 test/externalTests/colony.sh    | 1 +
 test/externalTests/common.sh    | 2 +-
 test/externalTests/gnosis-v2.sh | 1 +
 test/externalTests/gnosis.sh    | 3 ++-
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 3aaff44138..4f0ca07574 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -35,6 +35,7 @@ function colony_test
     local repo="https://github.com/solidity-external-tests/colonyNetwork.git"
     local branch=develop_080
     local config_file="truffle.js"
+    # On levels 1 and 2 it compiles but tests run out of gas
     local min_optimizer_level=3
     local max_optimizer_level=3
 
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 7e651d8c0b..777df7d465 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -245,7 +245,7 @@ function optimizer_settings_for_level
 
     case "$level" in
         1) echo "{enabled: false}" ;;
-        2) echo "{enabled: true}" ;;
+        2) echo "{enabled: true, details: {yul: false}}" ;;
         3) echo "{enabled: true, details: {yul: true}}" ;;
         *)
             printError "Optimizer level not found. Please define OPTIMIZER_LEVEL=[1, 2, 3]"
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index 439a3dd91f..803e06b3a2 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -36,6 +36,7 @@ function gnosis_safe_test
     local repo="https://github.com/solidity-external-tests/safe-contracts.git"
     local branch=v2_080
     local config_file="truffle-config.js"
+    # level 1: "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit"
     local min_optimizer_level=2
     local max_optimizer_level=3
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 32b76d9c90..a419ea6e75 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -35,7 +35,8 @@ function gnosis_safe_test
     local repo="https://github.com/solidity-external-tests/safe-contracts.git"
     local branch=development_080
     local config_file="truffle-config.js"
-    local min_optimizer_level=2
+    # levels 1 and 2: "Stack too deep" error
+    local min_optimizer_level=3
     local max_optimizer_level=3
 
     local selected_optimizer_levels

From 937597c1cd4b199389a52c1775b44f3667f26f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 9 Dec 2021 14:51:45 +0100
Subject: [PATCH 0177/1748] Use unique name for gnosis-v2 ext test

---
 test/externalTests/gnosis-v2.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index 803e06b3a2..f43e415674 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -63,4 +63,4 @@ function gnosis_safe_test
     done
 }
 
-external_test Gnosis-Safe gnosis_safe_test
+external_test Gnosis-Safe-V2 gnosis_safe_test

From 5fb0246f1c057fcdb4e3e7e0cff8cda7489695d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 3 Dec 2021 15:26:45 +0100
Subject: [PATCH 0178/1748] Use the right config file name in ENS external test

---
 test/externalTests/ens.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 9fed91be1f..c2deca5d2f 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -34,7 +34,7 @@ function ens_test
 {
     local repo="https://github.com/ensdomains/ens.git"
     local branch=master
-    local config_file="truffle-config.js"
+    local config_file="truffle.js"
     local min_optimizer_level=1
     local max_optimizer_level=3
 

From 0edbd90f526d9792c381b10974dc9039e4b6724f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 3 Dec 2021 12:53:50 +0100
Subject: [PATCH 0179/1748] externalTests: Use fail() function to simplify
 error checks

---
 test/externalTests/common.sh | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 7e651d8c0b..4020fc7a1d 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -35,18 +35,12 @@ function print_optimizer_levels_or_exit
 
 function verify_input
 {
-    if [ ! -f "$1" ]; then
-        printError "Usage: $0 <path to soljson.js>"
-        exit 1
-    fi
+    [[ -f "$1" ]] || fail "Usage: $0 <path to soljson.js>"
 }
 
 function verify_version_input
 {
-    if [ -z "$1" ] || [ ! -f "$1" ] || [ -z "$2" ]; then
-        printError "Usage: $0 <path to soljson.js> <version>"
-        exit 1
-    fi
+    [[ $1 != "" && -f "$1" && $2 != "" ]] || fail "Usage: $0 <path to soljson.js> <version>"
 }
 
 function setup
@@ -248,8 +242,7 @@ function optimizer_settings_for_level
         2) echo "{enabled: true}" ;;
         3) echo "{enabled: true, details: {yul: true}}" ;;
         *)
-            printError "Optimizer level not found. Please define OPTIMIZER_LEVEL=[1, 2, 3]"
-            exit 1
+            fail "Optimizer level not found. Please define OPTIMIZER_LEVEL=[1, 2, 3]"
             ;;
     esac
 }
@@ -356,10 +349,7 @@ function external_test
     echo "==========================="
     DIR=$(mktemp -d -t "ext-test-${name}-XXXXXX")
     (
-        if [ -z "$main_fn" ]; then
-            printError "Test main function not defined."
-            exit 1
-        fi
+        [[ "$main_fn" != "" ]] || fail "Test main function not defined."
         $main_fn
     )
     rm -rf "$DIR"

From 081b80ccb2170528e501ab451296407d5f434078 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 3 Dec 2021 12:57:39 +0100
Subject: [PATCH 0180/1748] externalTests: Refactor setup and input
 verification

---
 test/externalTests.sh                 | 19 +++++------
 test/externalTests/colony.sh          |  6 ++--
 test/externalTests/common.sh          | 45 ++++++++++-----------------
 test/externalTests/ens.sh             |  6 ++--
 test/externalTests/gnosis-v2.sh       |  7 ++---
 test/externalTests/gnosis.sh          |  6 ++--
 test/externalTests/solc-js/solc-js.sh |  6 ++--
 test/externalTests/zeppelin.sh        |  8 ++---
 8 files changed, 44 insertions(+), 59 deletions(-)

diff --git a/test/externalTests.sh b/test/externalTests.sh
index 28af6f835a..c9b30d0fe4 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -28,25 +28,20 @@
 
 set -e
 
-if [ ! -f "$1" ]
-then
-  echo "Usage: $0 <path to soljson.js>"
-  exit 1
-fi
-
-SOLJSON="$1"
 REPO_ROOT="$(dirname "$0")"
 
 source scripts/common.sh
 source test/externalTests/common.sh
 
+verify_input "$@"
+
 printTask "Running external tests..."
 
-"$REPO_ROOT/externalTests/zeppelin.sh" "$SOLJSON"
-"$REPO_ROOT/externalTests/gnosis.sh" "$SOLJSON"
-"$REPO_ROOT/externalTests/gnosis-v2.sh" "$SOLJSON"
-"$REPO_ROOT/externalTests/colony.sh" "$SOLJSON"
-"$REPO_ROOT/externalTests/ens.sh" "$SOLJSON"
+"$REPO_ROOT/externalTests/zeppelin.sh" "$@"
+"$REPO_ROOT/externalTests/gnosis.sh" "$@"
+"$REPO_ROOT/externalTests/gnosis-v2.sh" "$@"
+"$REPO_ROOT/externalTests/colony.sh" "$@"
+"$REPO_ROOT/externalTests/ens.sh" "$@"
 
 # Disabled temporarily as it needs to be updated to latest Truffle first.
 #test_truffle Gnosis https://github.com/axic/pm-contracts.git solidity-050
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 3aaff44138..16c8594068 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -24,8 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
-verify_input "$1"
-SOLJSON="$1"
+verify_input "$@"
+BINARY_PATH="$1"
 
 function compile_fn { yarn run provision:token:contracts; }
 function test_fn { yarn run test:contracts; }
@@ -42,7 +42,7 @@ function colony_test
     selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
     print_optimizer_levels_or_exit "$selected_optimizer_levels"
 
-    setup_solcjs "$DIR" "$SOLJSON"
+    setup_solcjs "$DIR" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
 
     neutralize_package_json_hooks
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 4020fc7a1d..5ee22873a9 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -35,52 +35,41 @@ function print_optimizer_levels_or_exit
 
 function verify_input
 {
-    [[ -f "$1" ]] || fail "Usage: $0 <path to soljson.js>"
-}
+    local binary_path="$1"
 
-function verify_version_input
-{
-    [[ $1 != "" && -f "$1" && $2 != "" ]] || fail "Usage: $0 <path to soljson.js> <version>"
+    (( $# == 1 )) || fail "Usage: $0 <path to soljson.js>"
+    [[ -f "$binary_path" ]] || fail "The compiler binary does not exist at '${binary_path}'"
 }
 
-function setup
-{
-    local soljson="$1"
-    local branch="$2"
-
-    setup_solcjs "$DIR" "$soljson" "$branch" "solc"
-    cd solc
-}
 
 function setup_solcjs
 {
-    local dir="$1"
-    local soljson="$2"
-    local branch="${3:-master}"
-    local path="${4:-solc/}"
+    local test_dir="$1"
+    local binary_path="$2"
+    local solcjs_branch="${3:-master}"
+    local install_dir="${4:-solc/}"
 
-    cd "$dir"
+    cd "$test_dir"
     printLog "Setting up solc-js..."
-    git clone --depth 1 -b "$branch" https://github.com/ethereum/solc-js.git "$path"
-
-    cd "$path"
+    git clone --depth 1 -b "$solcjs_branch" https://github.com/ethereum/solc-js.git "$install_dir"
 
+    pushd "$install_dir"
     npm install
-    cp "$soljson" soljson.js
+    cp "$binary_path" soljson.js
     SOLCVERSION=$(./solcjs --version)
     SOLCVERSION_SHORT=$(echo "$SOLCVERSION" | sed -En 's/^([0-9.]+).*\+commit\.[0-9a-f]+.*$/\1/p')
-    printLog "Using solcjs version $SOLCVERSION"
-    cd ..
+    printLog "Using compiler version $SOLCVERSION"
+    popd
 }
 
 function download_project
 {
     local repo="$1"
-    local branch="$2"
-    local dir="$3"
+    local solcjs_branch="$2"
+    local test_dir="$3"
 
-    printLog "Cloning $branch of $repo..."
-    git clone --depth 1 "$repo" -b "$branch" "$dir/ext"
+    printLog "Cloning $solcjs_branch of $repo..."
+    git clone --depth 1 "$repo" -b "$solcjs_branch" "$test_dir/ext"
     cd ext
     echo "Current commit hash: $(git rev-parse HEAD)"
 }
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 9fed91be1f..45ff338fd0 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -24,8 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
-verify_input "$1"
-export SOLJSON="$1"
+verify_input "$@"
+BINARY_PATH="$1"
 
 function compile_fn { npx truffle compile; }
 function test_fn { npm run test; }
@@ -42,7 +42,7 @@ function ens_test
     selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
     print_optimizer_levels_or_exit "$selected_optimizer_levels"
 
-    setup_solcjs "$DIR" "$SOLJSON"
+    setup_solcjs "$DIR" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
 
     # Use latest Truffle. Older versions crash on the output from 0.8.0.
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index 439a3dd91f..878a1f2778 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -24,10 +24,9 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
-verify_input "$1"
-SOLJSON="$1"
+verify_input "$@"
+BINARY_PATH="$1"
 
-function install_fn { npm install --package-lock; }
 function compile_fn { npx truffle compile; }
 function test_fn { npm test; }
 
@@ -43,7 +42,7 @@ function gnosis_safe_test
     selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
     print_optimizer_levels_or_exit "$selected_optimizer_levels"
 
-    setup_solcjs "$DIR" "$SOLJSON"
+    setup_solcjs "$DIR" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 32b76d9c90..c721ae8807 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -24,8 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
-verify_input "$1"
-SOLJSON="$1"
+verify_input "$@"
+BINARY_PATH="$1"
 
 function compile_fn { npx truffle compile; }
 function test_fn { npm test; }
@@ -42,7 +42,7 @@ function gnosis_safe_test
     selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
     print_optimizer_levels_or_exit "$selected_optimizer_levels"
 
-    setup_solcjs "$DIR" "$SOLJSON"
+    setup_solcjs "$DIR" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
diff --git a/test/externalTests/solc-js/solc-js.sh b/test/externalTests/solc-js/solc-js.sh
index a3b24db9ec..4ca6e3d008 100755
--- a/test/externalTests/solc-js/solc-js.sh
+++ b/test/externalTests/solc-js/solc-js.sh
@@ -24,10 +24,11 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
-verify_version_input "$1" "$2"
 SOLJSON="$1"
 VERSION="$2"
 
+[[ $SOLJSON != "" && -f "$SOLJSON" && $VERSION != "" ]] || fail "Usage: $0 <path to soljson.js> <version>"
+
 function compile_fn { echo "Nothing to compile."; }
 function test_fn { npm test; }
 
@@ -37,7 +38,8 @@ function solcjs_test
     SOLCJS_INPUT_DIR="$TEST_DIR"/test/externalTests/solc-js
 
     # set up solc-js on the branch specified
-    setup "$SOLJSON" master
+    setup_solcjs "$DIR" "$SOLJSON" master solc/
+    cd solc/
 
     printLog "Updating index.js file..."
     echo "require('./determinism.js');" >> test/index.js
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index cd290b860f..86530bcc3c 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -24,8 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
-verify_input "$1"
-SOLJSON="$1"
+verify_input "$@"
+BINARY_PATH="$1"
 
 function compile_fn { npm run compile; }
 function test_fn { npm test; }
@@ -42,11 +42,11 @@ function zeppelin_test
     selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
     print_optimizer_levels_or_exit "$selected_optimizer_levels"
 
-    setup_solcjs "$DIR" "$SOLJSON"
+    setup_solcjs "$DIR" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
 
     neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$SOLJSON"
+    force_hardhat_compiler_binary "$config_file" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$min_optimizer_level"
     npm install
 

From 68ff073b3b165132790819720c4f626c53d0c159 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 3 Dec 2021 13:44:03 +0100
Subject: [PATCH 0181/1748] externalTests.sh: Remove outdated commented-out
 command to run gnosis

- A newer command is already enabled above it
---
 test/externalTests.sh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/externalTests.sh b/test/externalTests.sh
index c9b30d0fe4..86f13401e9 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -42,6 +42,3 @@ printTask "Running external tests..."
 "$REPO_ROOT/externalTests/gnosis-v2.sh" "$@"
 "$REPO_ROOT/externalTests/colony.sh" "$@"
 "$REPO_ROOT/externalTests/ens.sh" "$@"
-
-# Disabled temporarily as it needs to be updated to latest Truffle first.
-#test_truffle Gnosis https://github.com/axic/pm-contracts.git solidity-050

From eb8e304b47c8a9da2004e92d6ba2185bdee31825 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 3 Dec 2021 14:51:05 +0100
Subject: [PATCH 0182/1748] externalTests: Add support for using a native
 binary

---
 .circleci/config.yml                  |  2 +-
 test/externalTests/colony.sh          | 12 ++--
 test/externalTests/common.sh          | 89 +++++++++++++++++++--------
 test/externalTests/ens.sh             | 12 ++--
 test/externalTests/gnosis-v2.sh       | 12 ++--
 test/externalTests/gnosis.sh          | 12 ++--
 test/externalTests/solc-js/solc-js.sh |  2 +-
 test/externalTests/zeppelin.sh        |  7 ++-
 8 files changed, 97 insertions(+), 51 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 312695ebf7..1013432223 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1044,7 +1044,7 @@ jobs:
       - run:
           name: External <<parameters.project>> tests
           command: |
-            test/externalTests/<<parameters.project>>.sh /tmp/workspace/soljson.js
+            test/externalTests/<<parameters.project>>.sh solcjs /tmp/workspace/soljson.js
       - gitter_notify_failure_unless_pr
 
   b_win: &b_win
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 16c8594068..dff745d683 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -25,7 +25,8 @@ source scripts/common.sh
 source test/externalTests/common.sh
 
 verify_input "$@"
-BINARY_PATH="$1"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
 
 function compile_fn { yarn run provision:token:contracts; }
 function test_fn { yarn run test:contracts; }
@@ -42,11 +43,12 @@ function colony_test
     selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
     print_optimizer_levels_or_exit "$selected_optimizer_levels"
 
-    setup_solcjs "$DIR" "$BINARY_PATH"
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
+    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$min_optimizer_level"
     yarn
     git submodule update --init
 
@@ -56,10 +58,10 @@ function colony_test
     cd ..
 
     replace_version_pragmas
-    force_solc_modules "${DIR}/solc"
+    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
     for level in $selected_optimizer_levels; do
-        truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$level" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 5ee22873a9..b36861d07c 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -35,31 +35,43 @@ function print_optimizer_levels_or_exit
 
 function verify_input
 {
-    local binary_path="$1"
+    local binary_type="$1"
+    local binary_path="$2"
 
-    (( $# == 1 )) || fail "Usage: $0 <path to soljson.js>"
+    (( $# == 2 )) || fail "Usage: $0 native|solcjs <path to solc or soljson.js>"
+    [[ $binary_type == native || $binary_type == solcjs ]] || fail "Invalid binary type: '${binary_type}'. Must be either 'native' or 'solcjs'."
     [[ -f "$binary_path" ]] || fail "The compiler binary does not exist at '${binary_path}'"
 }
 
-
-function setup_solcjs
+function setup_solc
 {
     local test_dir="$1"
-    local binary_path="$2"
-    local solcjs_branch="${3:-master}"
-    local install_dir="${4:-solc/}"
+    local binary_type="$2"
+    local binary_path="$3"
+    local solcjs_branch="${4:-master}"
+    local install_dir="${5:-solc/}"
+
+    [[ $binary_type == native || $binary_type == solcjs ]] || assertFail
 
     cd "$test_dir"
-    printLog "Setting up solc-js..."
-    git clone --depth 1 -b "$solcjs_branch" https://github.com/ethereum/solc-js.git "$install_dir"
 
-    pushd "$install_dir"
-    npm install
-    cp "$binary_path" soljson.js
-    SOLCVERSION=$(./solcjs --version)
+    if [[ $binary_type == solcjs ]]
+    then
+        printLog "Setting up solc-js..."
+        git clone --depth 1 -b "$solcjs_branch" https://github.com/ethereum/solc-js.git "$install_dir"
+
+        pushd "$install_dir"
+        npm install
+        cp "$binary_path" soljson.js
+        SOLCVERSION=$(./solcjs --version)
+        popd
+    else
+        printLog "Setting up solc..."
+        SOLCVERSION=$("$binary_path" --version | tail -n 1 | sed -n -E 's/^Version: (.*)$/\1/p')
+    fi
+
     SOLCVERSION_SHORT=$(echo "$SOLCVERSION" | sed -En 's/^([0-9.]+).*\+commit\.[0-9a-f]+.*$/\1/p')
     printLog "Using compiler version $SOLCVERSION"
-    popd
 }
 
 function download_project
@@ -127,13 +139,19 @@ function force_solc_modules
 function force_truffle_compiler_settings
 {
     local config_file="$1"
-    local solc_path="$2"
-    local level="$3"
-    local evm_version="${4:-"$CURRENT_EVM_VERSION"}"
+    local binary_type="$2"
+    local solc_path="$3"
+    local level="$4"
+    local evm_version="${5:-"$CURRENT_EVM_VERSION"}"
+
+    [[ $binary_type == native || $binary_type == solcjs ]] || assertFail
+
+    [[ $binary_type == native ]] && local solc_path="native"
 
     printLog "Forcing Truffle compiler settings..."
     echo "-------------------------------------"
     echo "Config file: $config_file"
+    echo "Binary type: $binary_type"
     echo "Compiler path: $solc_path"
     echo "Optimization level: $level"
     echo "Optimizer settings: $(optimizer_settings_for_level "$level")"
@@ -148,13 +166,15 @@ function force_truffle_compiler_settings
 function force_hardhat_compiler_binary
 {
     local config_file="$1"
-    local solc_path="$2"
+    local binary_type="$2"
+    local solc_path="$3"
 
     printLog "Configuring Hardhat..."
     echo "-------------------------------------"
     echo "Config file: ${config_file}"
+    echo "Binary type: ${binary_type}"
     echo "Compiler path: ${solc_path}"
-    hardhat_solc_build_subtask "$SOLCVERSION_SHORT" "$SOLCVERSION" "$solc_path" >> "$config_file"
+    hardhat_solc_build_subtask "$SOLCVERSION_SHORT" "$SOLCVERSION" "$binary_type" "$solc_path" >> "$config_file"
 }
 
 function force_hardhat_compiler_settings
@@ -236,6 +256,16 @@ function optimizer_settings_for_level
     esac
 }
 
+function replace_global_solc
+{
+    local solc_path="$1"
+
+    [[ ! -e solc ]] || fail "A file named 'solc' already exists in '${PWD}'."
+
+    ln -s "$solc_path" solc
+    export PATH="$PWD:$PATH"
+}
+
 function truffle_compiler_settings
 {
     local solc_path="$1"
@@ -256,7 +286,13 @@ function truffle_compiler_settings
 function hardhat_solc_build_subtask {
     local solc_version="$1"
     local full_solc_version="$2"
-    local solc_path="$3"
+    local binary_type="$3"
+    local solc_path="$4"
+
+    [[ $binary_type == native || $binary_type == solcjs ]] || assertFail
+
+    [[ $binary_type == native ]] && local is_solcjs=false
+    [[ $binary_type == solcjs ]] && local is_solcjs=true
 
     echo "const {TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD} = require('hardhat/builtin-tasks/task-names');"
     echo "const assert = require('assert');"
@@ -265,7 +301,7 @@ function hardhat_solc_build_subtask {
     echo "    assert(args.solcVersion == '${solc_version}', 'Unexpected solc version: ' + args.solcVersion)"
     echo "    return {"
     echo "        compilerPath: '$(realpath "$solc_path")',"
-    echo "        isSolcJs: true,"
+    echo "        isSolcJs: ${is_solcjs},"
     echo "        version: args.solcVersion,"
     echo "        longVersion: '${full_solc_version}'"
     echo "    }"
@@ -307,13 +343,14 @@ function compile_and_run_test
 function truffle_run_test
 {
     local config_file="$1"
-    local solc_path="$2"
-    local optimizer_level="$3"
-    local compile_fn="$4"
-    local test_fn="$5"
+    local binary_type="$2"
+    local solc_path="$3"
+    local optimizer_level="$4"
+    local compile_fn="$5"
+    local test_fn="$6"
 
     truffle_clean
-    force_truffle_compiler_settings "$config_file" "$solc_path" "$optimizer_level"
+    force_truffle_compiler_settings "$config_file" "$binary_type" "$solc_path" "$optimizer_level"
     compile_and_run_test compile_fn test_fn truffle_verify_compiler_version
 }
 
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 45ff338fd0..5c7d582704 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -25,7 +25,8 @@ source scripts/common.sh
 source test/externalTests/common.sh
 
 verify_input "$@"
-BINARY_PATH="$1"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
 
 function compile_fn { npx truffle compile; }
 function test_fn { npm run test; }
@@ -42,22 +43,23 @@ function ens_test
     selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
     print_optimizer_levels_or_exit "$selected_optimizer_levels"
 
-    setup_solcjs "$DIR" "$BINARY_PATH"
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
+    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     # Use latest Truffle. Older versions crash on the output from 0.8.0.
     force_truffle_version ^5.1.55
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$min_optimizer_level"
     npm install
 
     replace_version_pragmas
-    force_solc_modules "${DIR}/solc"
+    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
     for level in $selected_optimizer_levels; do
-        truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$level" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index 878a1f2778..b2f6c4a830 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -25,7 +25,8 @@ source scripts/common.sh
 source test/externalTests/common.sh
 
 verify_input "$@"
-BINARY_PATH="$1"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
 
 function compile_fn { npx truffle compile; }
 function test_fn { npm test; }
@@ -42,22 +43,23 @@ function gnosis_safe_test
     selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
     print_optimizer_levels_or_exit "$selected_optimizer_levels"
 
-    setup_solcjs "$DIR" "$BINARY_PATH"
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
+    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
     sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7_080"|g' package.json
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$min_optimizer_level"
     npm install --package-lock
 
     replace_version_pragmas
-    force_solc_modules "${DIR}/solc"
+    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
     for level in $selected_optimizer_levels; do
-        truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$level" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index c721ae8807..69d068474e 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -25,7 +25,8 @@ source scripts/common.sh
 source test/externalTests/common.sh
 
 verify_input "$@"
-BINARY_PATH="$1"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
 
 function compile_fn { npx truffle compile; }
 function test_fn { npm test; }
@@ -42,21 +43,22 @@ function gnosis_safe_test
     selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
     print_optimizer_levels_or_exit "$selected_optimizer_levels"
 
-    setup_solcjs "$DIR" "$BINARY_PATH"
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
+    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "${DIR}/solc" "$min_optimizer_level"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$min_optimizer_level"
     npm install --package-lock
 
     replace_version_pragmas
-    force_solc_modules "${DIR}/solc"
+    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
     for level in $selected_optimizer_levels; do
-        truffle_run_test "$config_file" "${DIR}/solc" "$level" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$level" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/solc-js/solc-js.sh b/test/externalTests/solc-js/solc-js.sh
index 4ca6e3d008..33b43e6430 100755
--- a/test/externalTests/solc-js/solc-js.sh
+++ b/test/externalTests/solc-js/solc-js.sh
@@ -38,7 +38,7 @@ function solcjs_test
     SOLCJS_INPUT_DIR="$TEST_DIR"/test/externalTests/solc-js
 
     # set up solc-js on the branch specified
-    setup_solcjs "$DIR" "$SOLJSON" master solc/
+    setup_solc "$DIR" solcjs "$SOLJSON" master solc/
     cd solc/
 
     printLog "Updating index.js file..."
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 86530bcc3c..0759a3aec6 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -25,7 +25,8 @@ source scripts/common.sh
 source test/externalTests/common.sh
 
 verify_input "$@"
-BINARY_PATH="$1"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
 
 function compile_fn { npm run compile; }
 function test_fn { npm test; }
@@ -42,11 +43,11 @@ function zeppelin_test
     selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
     print_optimizer_levels_or_exit "$selected_optimizer_levels"
 
-    setup_solcjs "$DIR" "$BINARY_PATH"
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
 
     neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_PATH"
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$min_optimizer_level"
     npm install
 

From f5830c451625bad5e667293ec41564ce287b6889 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 7 Dec 2021 16:30:25 +0100
Subject: [PATCH 0183/1748] CI: Extend t_ems job to allow using both emscripten
 and native binaries

---
 .circleci/config.yml | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1013432223..6c60be470e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1015,6 +1015,11 @@ jobs:
     parameters:
       project:
         type: string
+      binary_type:
+        type: enum
+        enum:
+          - solcjs
+          - native
       compile_only:
         type: integer
         default: 0
@@ -1037,14 +1042,26 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - run:
-          name: Install dependencies
+          name: Install lsof
           command: |
             # lsof is used by Colony in its stop-blockchain-client.sh script
-            sudo apt-get -qy install lsof
-      - run:
-          name: External <<parameters.project>> tests
-          command: |
-            test/externalTests/<<parameters.project>>.sh solcjs /tmp/workspace/soljson.js
+            sudo apt-get --quiet --assume-yes --no-install-recommends install lsof
+      - when:
+          condition:
+            equal: [<< parameters.binary_type >>, "solcjs"]
+          steps:
+            - run:
+                name: External <<parameters.project>> tests (solcjs)
+                command: |
+                  test/externalTests/<<parameters.project>>.sh solcjs /tmp/workspace/soljson.js
+      - when:
+          condition:
+            equal: [<< parameters.binary_type >>, "native"]
+          steps:
+            - run:
+                name: External <<parameters.project>> tests (native)
+                command: |
+                  test/externalTests/<<parameters.project>>.sh native /tmp/workspace/solc/solc
       - gitter_notify_failure_unless_pr
 
   b_win: &b_win
@@ -1282,12 +1299,14 @@ workflows:
           <<: *workflow_emscripten
           name: t_ems_compile_ext_colony
           project: colony
+          binary_type: solcjs
           compile_only: 1
           nodejs_version: '14'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_compile_ext_gnosis
           project: gnosis
+          binary_type: solcjs
           compile_only: 1
           nodejs_version: '14'
 
@@ -1297,18 +1316,21 @@ workflows:
       #    <<: *workflow_emscripten
       #    name: t_ems_test_ext_gnosis
       #    project: gnosis
+      #    binary_type: solcjs
       #    # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
       #    nodejs_version: '12'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_test_ext_gnosis_v2
           project: gnosis-v2
+          binary_type: solcjs
           # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
           nodejs_version: '12'
       - t_ems_ext:
           <<: *workflow_emscripten
           name: t_ems_test_ext_zeppelin
           project: zeppelin
+          binary_type: solcjs
           # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
           nodejs_version: '16'
           resource_class: large
@@ -1316,6 +1338,7 @@ workflows:
           <<: *workflow_emscripten
           name: t_ems_test_ext_ens
           project: ens
+          binary_type: solcjs
           # NOTE: One of the dependencies (fsevents) fails to build its native extension on node.js 12+.
           nodejs_version: '10'
 
@@ -1382,4 +1405,5 @@ workflows:
           <<: *workflow_emscripten
           name: t_ems_test_ext_colony
           project: colony
+          binary_type: solcjs
           resource_class: medium

From 3649103e4209351e18d9ca99763349d888224640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 7 Dec 2021 16:34:07 +0100
Subject: [PATCH 0184/1748] Switch most external tests to use native compiler
 built by b_ubu_static

---
 .circleci/config.yml | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6c60be470e..4798c11669 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -396,6 +396,11 @@ defaults:
       requires:
         - b_ubu_release
 
+  - workflow_ubuntu2004_static: &workflow_ubuntu2004_static
+      <<: *workflow_trigger_on_tags
+      requires:
+        - b_ubu_static
+
   - workflow_archlinux: &workflow_archlinux
       <<: *workflow_trigger_on_tags
       requires:
@@ -666,10 +671,11 @@ jobs:
       MAKEFLAGS: -j 10
 
   b_ubu_static:
-    # Runs 2x faster on large and 3x on xlarge but no other jobs depend on it we can live with medium.
-    <<: *base_ubuntu2004
+    # On large runs 2x faster than on medium. 3x on xlarge.
+    <<: *base_ubuntu2004_xlarge
     environment:
-      MAKEFLAGS: -j 5
+      TERM: xterm
+      MAKEFLAGS: -j 10
       CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DUSE_CVC4=OFF -DSOLC_STATIC_STDLIBS=ON
     steps:
       - checkout
@@ -678,6 +684,7 @@ jobs:
           name: strip binary
           command: strip build/solc/solc
       - store_artifacts: *artifacts_solc
+      - persist_to_workspace: *artifacts_executables
       - gitter_notify_failure_unless_pr
 
   b_ubu_codecov:
@@ -1303,10 +1310,10 @@ workflows:
           compile_only: 1
           nodejs_version: '14'
       - t_ems_ext:
-          <<: *workflow_emscripten
-          name: t_ems_compile_ext_gnosis
+          <<: *workflow_ubuntu2004_static
+          name: t_native_compile_ext_gnosis
           project: gnosis
-          binary_type: solcjs
+          binary_type: native
           compile_only: 1
           nodejs_version: '14'
 
@@ -1314,31 +1321,31 @@ workflows:
       # and there are also other less frequent problems. See https://github.com/gnosis/safe-contracts/issues/216.
       #- t_ems_ext:
       #    <<: *workflow_emscripten
-      #    name: t_ems_test_ext_gnosis
+      #    name: t_native_test_ext_gnosis
       #    project: gnosis
-      #    binary_type: solcjs
+      #    binary_type: native
       #    # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
       #    nodejs_version: '12'
       - t_ems_ext:
-          <<: *workflow_emscripten
-          name: t_ems_test_ext_gnosis_v2
+          <<: *workflow_ubuntu2004_static
+          name: t_native_test_ext_gnosis_v2
           project: gnosis-v2
-          binary_type: solcjs
+          binary_type: native
           # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
           nodejs_version: '12'
       - t_ems_ext:
-          <<: *workflow_emscripten
-          name: t_ems_test_ext_zeppelin
+          <<: *workflow_ubuntu2004_static
+          name: t_native_test_ext_zeppelin
           project: zeppelin
-          binary_type: solcjs
+          binary_type: native
           # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
           nodejs_version: '16'
           resource_class: large
       - t_ems_ext:
-          <<: *workflow_emscripten
-          name: t_ems_test_ext_ens
+          <<: *workflow_ubuntu2004_static
+          name: t_native_test_ext_ens
           project: ens
-          binary_type: solcjs
+          binary_type: native
           # NOTE: One of the dependencies (fsevents) fails to build its native extension on node.js 12+.
           nodejs_version: '10'
 

From 01d45a195226f0d6c0dd252582dd154857b621e8 Mon Sep 17 00:00:00 2001
From: Omkar Nikhal <69253915+gitpushOmnik@users.noreply.github.com>
Date: Thu, 9 Dec 2021 23:42:07 +0530
Subject: [PATCH 0185/1748] Remove redundant typo

---
 docs/brand-guide.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/brand-guide.rst b/docs/brand-guide.rst
index fc03f35d93..5601b16a8e 100644
--- a/docs/brand-guide.rst
+++ b/docs/brand-guide.rst
@@ -59,7 +59,7 @@ Under the following terms:
 
 - **Attribution** — You must give appropriate credit, provide a link to
   the license, and indicate if changes were made. You may do so in any
-  reasonable manner, but not in any way that suggests the the Solidity
+  reasonable manner, but not in any way that suggests that the Solidity
   core team endorses you or your use.
 
 When using the Solidity logo, please respect the Solidity logo guidelines.

From 6afb63200c704ec019ec0f7c3e8d5b1db30cbba2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 9 Dec 2021 16:36:09 +0100
Subject: [PATCH 0186/1748] externalTests: Use `yarn install` instead of `yarn`
 in colony ext test to avoid compiling contracts twice

---
 test/externalTests/colony.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index dff745d683..65e4e42561 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -49,7 +49,7 @@ function colony_test
 
     neutralize_package_json_hooks
     force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$min_optimizer_level"
-    yarn
+    yarn install
     git submodule update --init
 
     cd lib

From f0aadcf577bd543ba20e3688ca088b233f28f557 Mon Sep 17 00:00:00 2001
From: dinah <cybergirldinah@gmail.com>
Date: Thu, 9 Dec 2021 20:18:28 -0600
Subject: [PATCH 0187/1748] Remove stale link.

---
 docs/introduction-to-smart-contracts.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index c448d7671d..aab0faf7c5 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -313,7 +313,7 @@ likely it will be.
     since it is not up to the submitter of a transaction, but up to the miners to determine in which block the transaction is included.
 
     If you want to schedule future calls of your contract, you can use
-    the `alarm clock <https://www.ethereum-alarm-clock.com/>`_ or a similar oracle service.
+    a smart contract automation tool or an oracle service.
 
 .. _the-ethereum-virtual-machine:
 

From e6179d5356d532bad82b15c2ffa80b8e65fae2cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 10 Dec 2021 14:59:13 +0100
Subject: [PATCH 0188/1748] CI: Run `t_ems_test_ext_colony` on nodejs 14

- Otherwise it seems to require python, which is not available in CI. We could install it but we'll probably run into other issues on latest node and the switch to latest was not intentional anyway.
---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4798c11669..512b46a78b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1413,4 +1413,5 @@ workflows:
           name: t_ems_test_ext_colony
           project: colony
           binary_type: solcjs
+          nodejs_version: '14'
           resource_class: medium

From 0e6388a90769783fc0cd1d4455fc5c58fec172f0 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 13 Dec 2021 14:52:17 +0100
Subject: [PATCH 0189/1748] Clarify FileReader interface.

---
 libsolidity/interface/FileReader.cpp |  4 ++--
 libsolidity/interface/FileReader.h   | 15 +++++++-------
 solc/CommandLineInterface.cpp        | 30 ++++++++++++++--------------
 test/solc/CommandLineInterface.cpp   | 28 +++++++++++++-------------
 4 files changed, 38 insertions(+), 39 deletions(-)

diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
index cfd1feb338..65cf70e5a4 100644
--- a/libsolidity/interface/FileReader.cpp
+++ b/libsolidity/interface/FileReader.cpp
@@ -84,7 +84,7 @@ void FileReader::allowDirectory(boost::filesystem::path _path)
 	m_allowedDirectories.insert(std::move(_path));
 }
 
-void FileReader::setSource(boost::filesystem::path const& _path, SourceCode _source)
+void FileReader::addOrUpdateFile(boost::filesystem::path const& _path, SourceCode _source)
 {
 	m_sourceCodes[cliPathToSourceUnitName(_path)] = std::move(_source);
 }
@@ -94,7 +94,7 @@ void FileReader::setStdin(SourceCode _source)
 	m_sourceCodes["<stdin>"] = std::move(_source);
 }
 
-void FileReader::setSources(StringMap _sources)
+void FileReader::setSourceUnits(StringMap _sources)
 {
 	m_sourceCodes = std::move(_sources);
 }
diff --git a/libsolidity/interface/FileReader.h b/libsolidity/interface/FileReader.h
index 71f5819df6..71ca5fc5d1 100644
--- a/libsolidity/interface/FileReader.h
+++ b/libsolidity/interface/FileReader.h
@@ -61,18 +61,17 @@ class FileReader
 	void allowDirectory(boost::filesystem::path _path);
 	FileSystemPathSet const& allowedDirectories() const noexcept { return m_allowedDirectories; }
 
-	StringMap const& sourceCodes() const noexcept { return m_sourceCodes; }
-
-	/// Retrieves the source code for a given source unit name.
-	SourceCode const& sourceCode(SourceUnitName const& _sourceUnitName) const { return m_sourceCodes.at(_sourceUnitName); }
+	/// @returns all sources by their internal source unit names.
+	StringMap const& sourceUnits() const noexcept { return m_sourceCodes; }
 
 	/// Resets all sources to the given map of source unit name to source codes.
 	/// Does not enforce @a allowedDirectories().
-	void setSources(StringMap _sources);
+	void setSourceUnits(StringMap _sources);
 
-	/// Adds the source code under a source unit name created by normalizing the file path.
+	/// Adds the source code under a source unit name created by normalizing the file path
+	/// or changes an existing source.
 	/// Does not enforce @a allowedDirectories().
-	void setSource(boost::filesystem::path const& _path, SourceCode _source);
+	void addOrUpdateFile(boost::filesystem::path const& _path, SourceCode _source);
 
 	/// Adds the source code under the source unit name of @a <stdin>.
 	/// Does not enforce @a allowedDirectories().
@@ -83,7 +82,7 @@ class FileReader
 	/// The read will only succeed if the canonical path of the file is within one of the @a allowedDirectories().
 	/// @param _kind must be equal to "source". Other values are not supported.
 	/// @return Content of the loaded file or an error message. If the operation succeeds, a copy of
-	/// the content is retained in @a sourceCodes() under the key of @a _sourceUnitName. If the key
+	/// the content is retained in @a sourceUnits() under the key of @a _sourceUnitName. If the key
 	/// already exists, previous content is discarded.
 	frontend::ReadCallback::Result readFile(std::string const& _kind, std::string const& _sourceUnitName);
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 4610741020..94bfd8a68b 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -483,7 +483,7 @@ void CommandLineInterface::readInputFiles()
 		}
 		else
 		{
-			m_fileReader.setSource(infile, move(fileContent));
+			m_fileReader.addOrUpdateFile(infile, move(fileContent));
 			m_fileReader.allowDirectory(boost::filesystem::canonical(infile).remove_filename());
 		}
 	}
@@ -499,7 +499,7 @@ void CommandLineInterface::readInputFiles()
 			m_fileReader.setStdin(readUntilEnd(m_sin));
 	}
 
-	if (m_fileReader.sourceCodes().empty() && !m_standardJsonInput.has_value())
+	if (m_fileReader.sourceUnits().empty() && !m_standardJsonInput.has_value())
 		solThrow(CommandLineValidationError, "All specified input files either do not exist or are not regular files.");
 }
 
@@ -510,7 +510,7 @@ map<string, Json::Value> CommandLineInterface::parseAstFromInput()
 	map<string, Json::Value> sourceJsons;
 	map<string, string> tmpSources;
 
-	for (SourceCode const& sourceCode: m_fileReader.sourceCodes() | ranges::views::values)
+	for (SourceCode const& sourceCode: m_fileReader.sourceUnits() | ranges::views::values)
 	{
 		Json::Value ast;
 		astAssert(jsonParseStrict(sourceCode, ast), "Input file could not be parsed to JSON");
@@ -528,7 +528,7 @@ map<string, Json::Value> CommandLineInterface::parseAstFromInput()
 		}
 	}
 
-	m_fileReader.setSources(tmpSources);
+	m_fileReader.setSourceUnits(tmpSources);
 
 	return sourceJsons;
 }
@@ -721,7 +721,7 @@ void CommandLineInterface::compile()
 		}
 		else
 		{
-			m_compiler->setSources(m_fileReader.sourceCodes());
+			m_compiler->setSources(m_fileReader.sourceUnits());
 			m_compiler->setParserErrorRecovery(m_options.input.errorRecovery);
 		}
 
@@ -835,7 +835,7 @@ void CommandLineInterface::handleCombinedJSON()
 	if (m_options.compiler.combinedJsonRequests->ast)
 	{
 		output[g_strSources] = Json::Value(Json::objectValue);
-		for (auto const& sourceCode: m_fileReader.sourceCodes())
+		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
 			ASTJsonConverter converter(m_compiler->state(), m_compiler->sourceIndices());
 			output[g_strSources][sourceCode.first] = Json::Value(Json::objectValue);
@@ -858,12 +858,12 @@ void CommandLineInterface::handleAst()
 		return;
 
 	vector<ASTNode const*> asts;
-	for (auto const& sourceCode: m_fileReader.sourceCodes())
+	for (auto const& sourceCode: m_fileReader.sourceUnits())
 		asts.push_back(&m_compiler->ast(sourceCode.first));
 
 	if (!m_options.output.dir.empty())
 	{
-		for (auto const& sourceCode: m_fileReader.sourceCodes())
+		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
 			stringstream data;
 			string postfix = "";
@@ -876,7 +876,7 @@ void CommandLineInterface::handleAst()
 	else
 	{
 		sout() << "JSON AST (compact format):" << endl << endl;
-		for (auto const& sourceCode: m_fileReader.sourceCodes())
+		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
 			sout() << endl << "======= " << sourceCode.first << " =======" << endl;
 			ASTJsonConverter(m_compiler->state(), m_compiler->sourceIndices()).print(sout(), m_compiler->ast(sourceCode.first));
@@ -908,7 +908,7 @@ void CommandLineInterface::link()
 		librariesReplacements[replacement] = library.second;
 	}
 
-	FileReader::StringMap sourceCodes = m_fileReader.sourceCodes();
+	FileReader::StringMap sourceCodes = m_fileReader.sourceUnits();
 	for (auto& src: sourceCodes)
 	{
 		auto end = src.second.end();
@@ -944,14 +944,14 @@ void CommandLineInterface::link()
 		while (!src.second.empty() && *prev(src.second.end()) == '\n')
 			src.second.resize(src.second.size() - 1);
 	}
-	m_fileReader.setSources(move(sourceCodes));
+	m_fileReader.setSourceUnits(move(sourceCodes));
 }
 
 void CommandLineInterface::writeLinkedFiles()
 {
 	solAssert(m_options.input.mode == InputMode::Linker, "");
 
-	for (auto const& src: m_fileReader.sourceCodes())
+	for (auto const& src: m_fileReader.sourceUnits())
 		if (src.first == g_stdinFileName)
 			sout() << src.second << endl;
 		else
@@ -989,7 +989,7 @@ void CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 
 	bool successful = true;
 	map<string, yul::AssemblyStack> assemblyStacks;
-	for (auto const& src: m_fileReader.sourceCodes())
+	for (auto const& src: m_fileReader.sourceUnits())
 	{
 		// --no-optimize-yul option is not accepted in assembly mode.
 		solAssert(!m_options.optimizer.noOptimizeYul, "");
@@ -1029,7 +1029,7 @@ void CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 		solThrow(CommandLineExecutionError, "");
 	}
 
-	for (auto const& src: m_fileReader.sourceCodes())
+	for (auto const& src: m_fileReader.sourceUnits())
 	{
 		string machine =
 			_targetMachine == yul::AssemblyStack::Machine::EVM ? "EVM" :
@@ -1118,7 +1118,7 @@ void CommandLineInterface::outputCompilationResults()
 			if (m_options.compiler.outputs.asmJson)
 				ret = jsonPrettyPrint(removeNullMembers(m_compiler->assemblyJSON(contract)));
 			else
-				ret = m_compiler->assemblyString(contract, m_fileReader.sourceCodes());
+				ret = m_compiler->assemblyString(contract, m_fileReader.sourceUnits());
 
 			if (!m_options.output.dir.empty())
 				createFile(m_compiler->filesystemFriendlyName(contract) + (m_options.compiler.outputs.asmJson ? "_evm.json" : ".evm"), ret);
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index dbffc47889..494dbbd94d 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -213,7 +213,7 @@ BOOST_AUTO_TEST_CASE(cli_input)
 	BOOST_TEST(result.options.input.mode == InputMode::Compiler);
 	BOOST_TEST(result.options.input.addStdin);
 	BOOST_CHECK_EQUAL(result.options.input.remappings, expectedRemappings);
-	BOOST_CHECK_EQUAL(result.reader.sourceCodes(), expectedSources);
+	BOOST_CHECK_EQUAL(result.reader.sourceUnits(), expectedSources);
 	BOOST_CHECK_EQUAL(result.reader.allowedDirectories(), expectedAllowedPaths);
 }
 
@@ -240,7 +240,7 @@ BOOST_AUTO_TEST_CASE(cli_ignore_missing_some_files_exist)
 	BOOST_TEST(result.stderrContent == "\"" + (tempDir2.path() / "input2.sol").string() + "\" is not found. Skipping.\n");
 	BOOST_TEST(result.options.input.mode == InputMode::Compiler);
 	BOOST_TEST(!result.options.input.addStdin);
-	BOOST_CHECK_EQUAL(result.reader.sourceCodes(), expectedSources);
+	BOOST_CHECK_EQUAL(result.reader.sourceUnits(), expectedSources);
 	BOOST_CHECK_EQUAL(result.reader.allowedDirectories(), expectedAllowedPaths);
 }
 
@@ -291,7 +291,7 @@ BOOST_AUTO_TEST_CASE(standard_json_base_path)
 	BOOST_TEST(result.options.input.mode == InputMode::StandardJson);
 	BOOST_TEST(result.options.input.addStdin);
 	BOOST_TEST(result.options.input.paths.empty());
-	BOOST_TEST(result.reader.sourceCodes().empty());
+	BOOST_TEST(result.reader.sourceUnits().empty());
 	BOOST_TEST(result.reader.allowedDirectories().empty());
 	BOOST_TEST(result.reader.basePath() == "/" / tempDir.path().relative_path());
 }
@@ -304,7 +304,7 @@ BOOST_AUTO_TEST_CASE(standard_json_no_input_file)
 	BOOST_TEST(result.options.input.mode == InputMode::StandardJson);
 	BOOST_TEST(result.options.input.addStdin);
 	BOOST_TEST(result.options.input.paths.empty());
-	BOOST_TEST(result.reader.sourceCodes().empty());
+	BOOST_TEST(result.reader.sourceUnits().empty());
 	BOOST_TEST(result.reader.allowedDirectories().empty());
 }
 
@@ -315,7 +315,7 @@ BOOST_AUTO_TEST_CASE(standard_json_dash)
 	BOOST_TEST(result.stderrContent == "");
 	BOOST_TEST(result.options.input.mode == InputMode::StandardJson);
 	BOOST_TEST(result.options.input.addStdin);
-	BOOST_TEST(result.reader.sourceCodes().empty());
+	BOOST_TEST(result.reader.sourceUnits().empty());
 	BOOST_TEST(result.reader.allowedDirectories().empty());
 }
 
@@ -446,7 +446,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_no_base_path)
 	BOOST_TEST(result.stdoutContent == "");
 	BOOST_REQUIRE(result.success);
 	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceCodes() == expectedSources);
+	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
 	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
 	BOOST_TEST(result.reader.basePath() == "");
 }
@@ -508,7 +508,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_same_as_work_dir)
 	BOOST_TEST(result.stdoutContent == "");
 	BOOST_REQUIRE(result.success);
 	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceCodes() == expectedSources);
+	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
 	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
 	BOOST_TEST(result.reader.basePath() == expectedWorkDir);
 }
@@ -581,7 +581,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_different_from_wor
 	BOOST_TEST(result.stdoutContent == "");
 	BOOST_REQUIRE(result.success);
 	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceCodes() == expectedSources);
+	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
 	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
 	BOOST_TEST(result.reader.basePath() == expectedBaseDir);
 }
@@ -650,7 +650,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_relative_base_path)
 	BOOST_TEST(result.stdoutContent == "");
 	BOOST_REQUIRE(result.success);
 	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceCodes() == expectedSources);
+	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
 	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
 	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "base");
 }
@@ -817,7 +817,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_normalization_and_weird_name
 	BOOST_TEST(result.stdoutContent == "");
 	BOOST_REQUIRE(result.success);
 	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceCodes() == expectedSources);
+	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
 	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
 	BOOST_TEST(result.reader.basePath() == expectedOptions.input.basePath);
 }
@@ -874,7 +874,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_symlinks)
 	BOOST_TEST(result.stdoutContent == "");
 	BOOST_REQUIRE(result.success);
 	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceCodes() == expectedSources);
+	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
 	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
 	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "sym/z/");
 }
@@ -906,7 +906,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_and_stdin)
 	BOOST_TEST(result.stdoutContent == "");
 	BOOST_REQUIRE(result.success);
 	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceCodes() == expectedSources);
+	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
 	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
 	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "base");
 }
@@ -1009,7 +1009,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 	BOOST_TEST(result.stdoutContent == "");
 	BOOST_REQUIRE(result.success);
 	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceCodes() == expectedSources);
+	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
 	BOOST_TEST(result.reader.includePaths() == expectedIncludePaths);
 	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
 	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "base/");
@@ -1105,7 +1105,7 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 
 	BOOST_REQUIRE(result.success);
 	BOOST_TEST(result.options == expectedOptions);
-	BOOST_TEST(result.reader.sourceCodes() == expectedSources);
+	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
 	BOOST_TEST(result.reader.includePaths() == expectedIncludePaths);
 	BOOST_TEST(result.reader.allowedDirectories() == expectedAllowedDirectories);
 	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "base/");

From c0b41cfcdd4673e6bff4c0d7b48b3ed4b7a23002 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 13 Dec 2021 17:33:48 +0100
Subject: [PATCH 0190/1748] Add const and file name.

---
 libsolidity/interface/CompilerStack.cpp | 2 +-
 libsolidity/interface/FileReader.cpp    | 4 ++--
 libsolidity/interface/FileReader.h      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 4b7faf4966..5292d5329f 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1447,7 +1447,7 @@ CompilerStack::Source const& CompilerStack::source(string const& _sourceName) co
 {
 	auto it = m_sources.find(_sourceName);
 	if (it == m_sources.end())
-		solThrow(CompilerError, "Given source file not found.");
+		solThrow(CompilerError, "Given source file not found: " + _sourceName);
 
 	return it->second;
 }
diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
index 65cf70e5a4..47f4d2b5aa 100644
--- a/libsolidity/interface/FileReader.cpp
+++ b/libsolidity/interface/FileReader.cpp
@@ -172,7 +172,7 @@ ReadCallback::Result FileReader::readFile(string const& _kind, string const& _so
 	}
 }
 
-string FileReader::cliPathToSourceUnitName(boost::filesystem::path const& _cliPath)
+string FileReader::cliPathToSourceUnitName(boost::filesystem::path const& _cliPath) const
 {
 	vector<boost::filesystem::path> prefixes = {m_basePath.empty() ? normalizeCLIPathForVFS(".") : m_basePath};
 	prefixes += m_includePaths;
@@ -189,7 +189,7 @@ string FileReader::cliPathToSourceUnitName(boost::filesystem::path const& _cliPa
 	return normalizedPath.generic_string();
 }
 
-map<string, FileReader::FileSystemPathSet> FileReader::detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths)
+map<string, FileReader::FileSystemPathSet> FileReader::detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths) const
 {
 	map<string, FileReader::FileSystemPathSet> nameToPaths;
 	for (boost::filesystem::path const& cliPath: _cliPaths)
diff --git a/libsolidity/interface/FileReader.h b/libsolidity/interface/FileReader.h
index 71ca5fc5d1..3892e98263 100644
--- a/libsolidity/interface/FileReader.h
+++ b/libsolidity/interface/FileReader.h
@@ -93,14 +93,14 @@ class FileReader
 
 	/// Creates a source unit name by normalizing a path given on the command line and, if possible,
 	/// making it relative to base path or one of the include directories.
-	std::string cliPathToSourceUnitName(boost::filesystem::path const& _cliPath);
+	std::string cliPathToSourceUnitName(boost::filesystem::path const& _cliPath) const;
 
 	/// Checks if a set contains any paths that lead to different files but would receive identical
 	/// source unit names. Files are considered the same if their paths are exactly the same after
 	/// normalization (without following symlinks).
 	/// @returns a map containing all the conflicting source unit names and the paths that would
 	/// receive them. The returned paths are normalized.
-	std::map<std::string, FileSystemPathSet> detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths);
+	std::map<std::string, FileSystemPathSet> detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths) const;
 
 	/// Normalizes a filesystem path to make it include all components up to the filesystem root,
 	/// remove small, inconsequential differences that do not affect the meaning and make it look

From d17f7206ad7ac3e40fc253fa3ece8c3a5eaba718 Mon Sep 17 00:00:00 2001
From: Alessandro Coglio <coglio@kestrel.edu>
Date: Tue, 7 Dec 2021 23:07:19 -0800
Subject: [PATCH 0191/1748] Improve description of break/continue restrictions.

This is as discussed on Element, with enhancements discussed with @cameel.
---
 docs/yul.rst | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index 219905cd5f..60a2da5b94 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -541,10 +541,24 @@ evaluate to zero values.
 
 In all other situations, expressions have to evaluate to exactly one value.
 
-The ``continue`` and ``break`` statements can only be used inside loop bodies
-and have to be in the same function as the loop (or both have to be at the
-top level). The ``continue`` and ``break`` statements cannot be used
-in other parts of a loop, not even when it is scoped inside a second loop's body.
+A ``continue`` or ``break`` statement can only be used inside the body of a for-loop, as follows.
+Consider the innermost loop that contains the statement.
+The loop and the statement must be in the same function, or both must be at the top level.
+The statement must be in the loop's body block;
+it cannot be in the loop's initialization block or update block.
+It is worth emphasizing that this restriction applies just
+to the innermost loop that contains the ``continue`` or ``break`` statement:
+this innermost loop, and therefore the ``continue`` or ``break`` statement,
+may appear anywhere in an outer loop, possibly in an outer loop's initialization block or update block.
+For example, the following is legal,
+because the ``break`` occurs in the body block of the inner loop,
+despite also occurring in the update block of the outer loop:
+
+.. code-block:: yul
+
+    for {} true { for {} true {} { break } }
+    {
+    }
 
 The condition part of the for-loop has to evaluate to exactly one value.
 

From 316be7206fa5256443e422cde0de59944fe4d9e7 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 13 Dec 2021 22:27:04 +0100
Subject: [PATCH 0192/1748] Fix soundness of storage/memory pointers that were
 not erasing enough knowledge

---
 Changelog.md                                  |  1 +
 libsolidity/formal/SMTEncoder.cpp             | 39 +++++++++----------
 .../smtCheckerTests/file_level/import.sol     |  4 +-
 .../struct_aliasing_parameter_memory_1.sol    | 21 ++++++++++
 .../struct_aliasing_parameter_memory_2.sol    | 26 +++++++++++++
 .../struct_aliasing_parameter_memory_3.sol    | 26 +++++++++++++
 .../struct_aliasing_parameter_storage_1.sol   | 24 ++++++++++++
 .../struct_aliasing_parameter_storage_2.sol   | 23 +++++++++++
 .../struct_aliasing_parameter_storage_3.sol   | 29 ++++++++++++++
 .../struct_aliasing_parameter_storage_4.sol   | 29 ++++++++++++++
 .../types/struct/struct_aliasing_storage.sol  |  3 +-
 11 files changed, 202 insertions(+), 23 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol

diff --git a/Changelog.md b/Changelog.md
index c5b0481420..f9d7552742 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
 Bugfixes:
  * Code Generator: Fix a crash when using ``@use-src`` and compiling from Yul to ewasm.
  * SMTChecker: Fix internal error when an unsafe target is solved more than once and the counterexample messages are different.
+ * SMTChecker: Fix soundness of assigned storage/memory local pointers that were not erasing enough knowledge.
  * Fix internal error when a function has a calldata struct argument with an internal type inside.
 
 
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 11ac5ab7aa..8326b6b2f8 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -32,6 +32,8 @@
 
 #include <liblangutil/CharStreamProvider.h>
 
+#include <libsolutil/Algorithms.h>
+
 #include <range/v3/view.hpp>
 
 #include <limits>
@@ -2371,28 +2373,25 @@ void SMTEncoder::resetReferences(Type const* _type)
 
 bool SMTEncoder::sameTypeOrSubtype(Type const* _a, Type const* _b)
 {
-	Type const* prefix = _a;
-	while (
-		prefix->category() == Type::Category::Mapping ||
-		prefix->category() == Type::Category::Array
-	)
-	{
-		if (*typeWithoutPointer(_b) == *typeWithoutPointer(prefix))
-			return true;
-		if (prefix->category() == Type::Category::Mapping)
-		{
-			auto mapPrefix = dynamic_cast<MappingType const*>(prefix);
-			solAssert(mapPrefix, "");
-			prefix = mapPrefix->valueType();
-		}
-		else
+	bool foundSame = false;
+
+	solidity::util::BreadthFirstSearch<Type const*> bfs{{_a}};
+	bfs.run([&](auto _type, auto&& _addChild) {
+		if (*typeWithoutPointer(_b) == *typeWithoutPointer(_type))
 		{
-			auto arrayPrefix = dynamic_cast<ArrayType const*>(prefix);
-			solAssert(arrayPrefix, "");
-			prefix = arrayPrefix->baseType();
+			foundSame = true;
+			bfs.abort();
 		}
-	}
-	return false;
+		if (auto const* mapType = dynamic_cast<MappingType const*>(_type))
+			_addChild(mapType->valueType());
+		else if (auto const* arrayType = dynamic_cast<ArrayType const*>(_type))
+			_addChild(arrayType->baseType());
+		else if (auto const* structType = dynamic_cast<StructType const*>(_type))
+			for (auto const& member: structType->nativeMembers(nullptr))
+				_addChild(member.type);
+	});
+
+	return foundSame;
 }
 
 bool SMTEncoder::isSupportedType(Type const& _type) const
diff --git a/test/libsolidity/smtCheckerTests/file_level/import.sol b/test/libsolidity/smtCheckerTests/file_level/import.sol
index a67ee4eb6c..85ae712930 100644
--- a/test/libsolidity/smtCheckerTests/file_level/import.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/import.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (B:238-252): CHC: Assertion violation happens here.\nCounterexample:\ndata = {x: 0}\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: data = {x: 0}\nC.g()\n    C.f(7) -- internal call\n        A:set({x: 0}, 7) -- internal call\n        A:set({x: 0}, 8) -- internal call
-// Warning 6328: (B:308-322): CHC: Assertion violation happens here.\nCounterexample:\ndata = {x: 0}\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: data = {x: 0}\nC.g()\n    C.f(7) -- internal call\n        A:set({x: 0}, 7) -- internal call\n        A:set({x: 0}, 8) -- internal call
+// Warning 6328: (B:238-252): CHC: Assertion violation happens here.\nCounterexample:\ndata = {x: 21238}\nx = 8\ny = 21238\n\nTransaction trace:\nC.constructor()\nState: data = {x: 0}\nC.g()\n    C.f(7) -- internal call\n        A:set({x: 0}, 7) -- internal call\n        A:set({x: 8}, 8) -- internal call
+// Warning 6328: (B:308-322): CHC: Assertion violation happens here.\nCounterexample:\ndata = {x: 6}\nx = 0\ny = 6\n\nTransaction trace:\nC.constructor()\nState: data = {x: 0}\nC.g()\n    C.f(7) -- internal call\n        A:set({x: 0}, 7) -- internal call\n        A:set({x: 0}, 8) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol
new file mode 100644
index 0000000000..edb1e1b40b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_1.sol
@@ -0,0 +1,21 @@
+contract C {
+    struct S {
+		uint sum;
+		uint[] a;
+    }
+
+	function f(S memory m, uint v) internal pure {
+		m.sum = v;
+		m.a = new uint[](2);
+	}
+
+	constructor(uint amt) {
+		S memory s;
+		f(s, amt);
+		assert(s.a.length == 2); // should hold but no aliasing support means it fails for now
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (201-224): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\ns = {sum: 0, a: []}\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol
new file mode 100644
index 0000000000..28da837006
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_2.sol
@@ -0,0 +1,26 @@
+contract C {
+    struct S {
+		uint sum;
+		uint[] a;
+    }
+
+	struct T {
+		S s;
+		uint x;
+	}
+
+	function f(S memory m, uint v) internal pure {
+		m.sum = v;
+		m.a = new uint[](2);
+	}
+
+	constructor(uint amt) {
+		T memory t;
+		f(t.s, amt);
+		assert(t.s.a.length == 2); // should hold but no aliasing support means it fails for now
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (236-261): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\nt = {s: {sum: 0, a: []}, x: 0}\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol
new file mode 100644
index 0000000000..36890f03eb
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_memory_3.sol
@@ -0,0 +1,26 @@
+contract C {
+    struct S {
+		uint sum;
+		uint[] a;
+    }
+
+	struct T {
+		S s;
+		uint x;
+	}
+
+	function f(T memory m, uint v) internal pure {
+		m.s.sum = v;
+		m.s.a = new uint[](2);
+	}
+
+	constructor(uint amt) {
+		T memory t;
+		f(t, amt);
+		assert(t.s.a.length == 2); // should hold but no aliasing support means it fails for now
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (238-263): CHC: Assertion violation happens here.\nCounterexample:\n\namt = 0\nt = {s: {sum: 0, a: []}, x: 0}\n\nTransaction trace:\nC.constructor(0)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
new file mode 100644
index 0000000000..3fd0c0d873
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
@@ -0,0 +1,24 @@
+contract C {
+    struct S {
+        mapping(address => uint) innerM;
+		uint sum;
+    }
+
+	function f(S storage m, address i, uint v) internal {
+		m.innerM[i] = v;
+		m.sum += v;
+	}
+
+	S s;
+
+	constructor(uint amt) {
+		f(s, msg.sender, amt);
+	}
+	function g() public view {
+		assert(s.sum == 0); // should hold but no aliasing support means it fails for now
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (270-288): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 21239}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 21239}\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
new file mode 100644
index 0000000000..9d4623ae09
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
@@ -0,0 +1,23 @@
+contract C {
+    struct S {
+        mapping(address => uint) innerM;
+		uint sum;
+    }
+
+	function f(mapping(address => uint) storage innerM, address i, uint v) internal {
+		innerM[i] = v;
+	}
+
+	S s;
+
+	constructor(uint amt) {
+		f(s.innerM, msg.sender, amt);
+	}
+	function g() public view {
+		assert(s.innerM[msg.sender] == 0); // should hold but no aliasing support means it fails for now
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (289-322): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 10}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 10}\nC.g(){ msg.sender: 0x0985 }
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
new file mode 100644
index 0000000000..8779cd0959
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
@@ -0,0 +1,29 @@
+contract C {
+    struct S {
+        mapping(address => uint) innerM;
+		uint sum;
+    }
+
+	struct T {
+		uint x;
+		S s;
+	}
+
+	function f(T storage m, address i, uint v) internal {
+		m.s.innerM[i] = v;
+		m.s.sum += v;
+	}
+
+	T t;
+
+	constructor(uint amt) {
+		f(t, msg.sender, amt);
+	}
+	function g() public view {
+		assert(t.s.sum == 0); // should hold but no aliasing support means it fails for now
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (307-327): CHC: Assertion violation happens here.\nCounterexample:\nt = {x: 10, s: {innerM, sum: 21239}}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: t = {x: 10, s: {innerM, sum: 21239}}\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
new file mode 100644
index 0000000000..957c72c120
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
@@ -0,0 +1,29 @@
+contract C {
+    struct S {
+        mapping(address => uint) innerM;
+		uint sum;
+    }
+
+	struct T {
+		uint x;
+		S s;
+	}
+
+	function f(S storage m, address i, uint v) internal {
+		m.innerM[i] = v;
+		m.sum += v;
+	}
+
+	T t;
+
+	constructor(uint amt) {
+		f(t.s, msg.sender, amt);
+	}
+	function g() public view {
+		assert(t.s.sum == 0); // should hold but no aliasing support means it fails for now
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (305-325): CHC: Assertion violation happens here.\nCounterexample:\nt = {x: 10, s: {innerM, sum: 21239}}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: t = {x: 10, s: {innerM, sum: 21239}}\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol
index 4c13699e2f..e5d9d60abe 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol
@@ -25,5 +25,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (369-405): CHC: Assertion violation happens here.\nCounterexample:\ns1 = {x: 0, a: []}, s2 = {x: 0, a: []}\nb = false\ns3 = {x: 42, a: []}\n\nTransaction trace:\nC.constructor()\nState: s1 = {x: 0, a: []}, s2 = {x: 0, a: []}\nC.f(false)
+// Warning 6328: (369-405): CHC: Assertion violation happens here.

From 91ee0ed4ef07f0f376b0c0cc74050925dc9b5942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 9 Dec 2021 14:10:14 +0100
Subject: [PATCH 0193/1748] scripts/common.sh: Add first_word() helper

---
 scripts/common.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/common.sh b/scripts/common.sh
index 3e67c4f566..ab7d82d875 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -226,7 +226,16 @@ function circleci_step_selected
 {
     local selected_steps="$1"
     local step="$2"
+    (( $# == 2 )) || assertFail
     [[ $step != *" "* ]] || assertFail "Step names must not contain spaces."
 
     [[ " $selected_steps " == *" $step "* ]] || return 1
 }
+
+function first_word
+{
+    local words="$1"
+    (( $# == 1 )) || assertFail
+
+    echo "$words" | cut -d " " -f 1
+}

From adfa51c01c89fd406a8b1ab8c24a606bcec48d87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 29 Nov 2021 14:20:42 +0100
Subject: [PATCH 0194/1748] externalTests: Measure compilation time

---
 test/externalTests/common.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 80a9dec32c..0f5bbc0b11 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -236,7 +236,7 @@ function run_test
     replace_version_pragmas
 
     printLog "Running compile function..."
-    $compile_fn
+    time $compile_fn
 
     printLog "Running test function..."
     $test_fn
@@ -329,7 +329,7 @@ function compile_and_run_test
     local verify_fn="$3"
 
     printLog "Running compile function..."
-    $compile_fn
+    time $compile_fn
     $verify_fn "$SOLCVERSION_SHORT" "$SOLCVERSION"
 
     if [[ "$COMPILE_ONLY" == 1 ]]; then

From d304c8443218753acabd16535ee883ab92e0a88c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 9 Dec 2021 14:37:21 +0100
Subject: [PATCH 0195/1748] externalTests: Replace optimizer levels with named
 presets

---
 scripts/common.sh               |  7 ++++
 test/externalTests/colony.sh    | 20 ++++++-----
 test/externalTests/common.sh    | 63 ++++++++++++++++-----------------
 test/externalTests/ens.sh       | 19 +++++-----
 test/externalTests/gnosis-v2.sh | 20 ++++++-----
 test/externalTests/gnosis.sh    | 20 ++++++-----
 test/externalTests/zeppelin.sh  | 19 +++++-----
 7 files changed, 92 insertions(+), 76 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index ab7d82d875..4a98c00726 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -211,6 +211,7 @@ function safe_kill
 
 function circleci_select_steps
 {
+    # We expect multiple lines in $all_steps, one step per line
     local all_steps="$1"
     (( $# == 1 )) || assertFail
 
@@ -222,6 +223,12 @@ function circleci_select_steps
     fi
 }
 
+function circleci_select_steps_multiarg
+{
+    # We expect multiple arguments, one step per argument.
+    circleci_select_steps "$(printf '%s\n' "$@")"
+}
+
 function circleci_step_selected
 {
     local selected_steps="$1"
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 65a2183bcc..7326f90bc7 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -36,20 +36,22 @@ function colony_test
     local repo="https://github.com/solidity-external-tests/colonyNetwork.git"
     local branch=develop_080
     local config_file="truffle.js"
-    # On levels 1 and 2 it compiles but tests run out of gas
-    local min_optimizer_level=3
-    local max_optimizer_level=3
+    local settings_presets=(
+        #legacy-no-optimize        # Compiles but tests run out of gas
+        #legacy-optimize-evm-only  # Compiles but tests run out of gas
+        legacy-optimize-evm+yul
+    )
 
-    local selected_optimizer_levels
-    selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
-    print_optimizer_levels_or_exit "$selected_optimizer_levels"
+    local selected_optimizer_presets
+    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$min_optimizer_level"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$selected_optimizer_presets")"
     yarn install
     git submodule update --init
 
@@ -61,8 +63,8 @@ function colony_test
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
-    for level in $selected_optimizer_levels; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$level" compile_fn test_fn
+    for preset in $selected_optimizer_presets; do
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 0f5bbc0b11..93484b16b3 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -24,13 +24,13 @@ set -e
 
 CURRENT_EVM_VERSION=london
 
-function print_optimizer_levels_or_exit
+function print_optimizer_presets_or_exit
 {
-    local selected_levels="$1"
+    local selected_presets="$1"
 
-    [[ $selected_levels != "" ]] || { printWarning "No steps to run. Exiting."; exit 0; }
+    [[ $selected_presets != "" ]] || { printWarning "No presets to run. Exiting."; exit 0; }
 
-    printLog "Selected optimizer levels: ${selected_levels}"
+    printLog "Selected settings presets: ${selected_presets}"
 }
 
 function verify_input
@@ -141,7 +141,7 @@ function force_truffle_compiler_settings
     local config_file="$1"
     local binary_type="$2"
     local solc_path="$3"
-    local level="$4"
+    local preset="$4"
     local evm_version="${5:-"$CURRENT_EVM_VERSION"}"
 
     [[ $binary_type == native || $binary_type == solcjs ]] || assertFail
@@ -153,14 +153,16 @@ function force_truffle_compiler_settings
     echo "Config file: $config_file"
     echo "Binary type: $binary_type"
     echo "Compiler path: $solc_path"
-    echo "Optimization level: $level"
-    echo "Optimizer settings: $(optimizer_settings_for_level "$level")"
+    echo "Settings preset: ${preset}"
+    echo "Settings: $(settings_from_preset "$preset" "$evm_version")"
     echo "EVM version: $evm_version"
+    echo "Compiler version: ${SOLCVERSION_SHORT}"
+    echo "Compiler version (full): ${SOLCVERSION}"
     echo "-------------------------------------"
 
     # Forcing the settings should always work by just overwriting the solc object. Forcing them by using a
     # dedicated settings objects should only be the fallback.
-    echo "module.exports['compilers'] = $(truffle_compiler_settings "$solc_path" "$level" "$evm_version");" >> "$config_file"
+    echo "module.exports['compilers'] = $(truffle_compiler_settings "$solc_path" "$preset" "$evm_version");" >> "$config_file"
 }
 
 function force_hardhat_compiler_binary
@@ -180,14 +182,14 @@ function force_hardhat_compiler_binary
 function force_hardhat_compiler_settings
 {
     local config_file="$1"
-    local level="$2"
+    local preset="$2"
     local evm_version="${3:-"$CURRENT_EVM_VERSION"}"
 
     printLog "Configuring Hardhat..."
     echo "-------------------------------------"
     echo "Config file: ${config_file}"
-    echo "Optimization level: ${level}"
-    echo "Optimizer settings: $(optimizer_settings_for_level "$level")"
+    echo "Settings preset: ${preset}"
+    echo "Settings: $(settings_from_preset "$preset" "$evm_version")"
     echo "EVM version: ${evm_version}"
     echo "Compiler version: ${SOLCVERSION_SHORT}"
     echo "Compiler version (full): ${SOLCVERSION}"
@@ -195,7 +197,7 @@ function force_hardhat_compiler_settings
 
     {
         echo -n 'module.exports["solidity"] = '
-        hardhat_compiler_settings "$SOLCVERSION_SHORT" "$level" "$evm_version"
+        hardhat_compiler_settings "$SOLCVERSION_SHORT" "$preset" "$evm_version"
     } >> "$config_file"
 }
 
@@ -242,16 +244,17 @@ function run_test
     $test_fn
 }
 
-function optimizer_settings_for_level
+function settings_from_preset
 {
-    local level="$1"
+    local preset="$1"
+    local evm_version="$2"
 
-    case "$level" in
-        1) echo "{enabled: false}" ;;
-        2) echo "{enabled: true, details: {yul: false}}" ;;
-        3) echo "{enabled: true, details: {yul: true}}" ;;
+    case "$preset" in
+        legacy-no-optimize)       echo "{evmVersion: '${evm_version}', optimizer: {enabled: false}}" ;;
+        legacy-optimize-evm-only) echo "{evmVersion: '${evm_version}', optimizer: {enabled: true, details: {yul: false}}}" ;;
+        legacy-optimize-evm+yul)  echo "{evmVersion: '${evm_version}', optimizer: {enabled: true, details: {yul: true}}}" ;;
         *)
-            fail "Optimizer level not found. Please define OPTIMIZER_LEVEL=[1, 2, 3]"
+            fail "Unknown settings preset: '${preset}'."
             ;;
     esac
 }
@@ -269,16 +272,13 @@ function replace_global_solc
 function truffle_compiler_settings
 {
     local solc_path="$1"
-    local level="$2"
+    local preset="$2"
     local evm_version="$3"
 
     echo "{"
     echo "    solc: {"
     echo "        version: \"${solc_path}\","
-    echo "        settings: {"
-    echo "            optimizer: $(optimizer_settings_for_level "$level"),"
-    echo "            evmVersion: \"${evm_version}\""
-    echo "        }"
+    echo "        settings: $(settings_from_preset "$preset" "$evm_version")"
     echo "    }"
     echo "}"
 }
@@ -310,15 +310,12 @@ function hardhat_solc_build_subtask {
 
 function hardhat_compiler_settings {
     local solc_version="$1"
-    local level="$2"
+    local preset="$2"
     local evm_version="$3"
 
     echo "{"
     echo "    version: '${solc_version}',"
-    echo "    settings: {"
-    echo "        optimizer: $(optimizer_settings_for_level "$level"),"
-    echo "        evmVersion: '${evm_version}'"
-    echo "    }"
+    echo "    settings: $(settings_from_preset "$preset" "$evm_version")"
     echo "}"
 }
 
@@ -345,24 +342,24 @@ function truffle_run_test
     local config_file="$1"
     local binary_type="$2"
     local solc_path="$3"
-    local optimizer_level="$4"
+    local preset="$4"
     local compile_fn="$5"
     local test_fn="$6"
 
     truffle_clean
-    force_truffle_compiler_settings "$config_file" "$binary_type" "$solc_path" "$optimizer_level"
+    force_truffle_compiler_settings "$config_file" "$binary_type" "$solc_path" "$preset"
     compile_and_run_test compile_fn test_fn truffle_verify_compiler_version
 }
 
 function hardhat_run_test
 {
     local config_file="$1"
-    local optimizer_level="$2"
+    local preset="$2"
     local compile_fn="$3"
     local test_fn="$4"
 
     hardhat_clean
-    force_hardhat_compiler_settings "$config_file" "$optimizer_level"
+    force_hardhat_compiler_settings "$config_file" "$preset"
     compile_and_run_test compile_fn test_fn hardhat_verify_compiler_version
 }
 
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 7b354acde6..de05454312 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -36,12 +36,15 @@ function ens_test
     local repo="https://github.com/ensdomains/ens.git"
     local branch=master
     local config_file="truffle.js"
-    local min_optimizer_level=1
-    local max_optimizer_level=3
+    local settings_presets=(
+        legacy-no-optimize
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+    )
 
-    local selected_optimizer_levels
-    selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
-    print_optimizer_levels_or_exit "$selected_optimizer_levels"
+    local selected_optimizer_presets
+    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
@@ -52,14 +55,14 @@ function ens_test
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$min_optimizer_level"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$selected_optimizer_presets")"
     npm install
 
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
-    for level in $selected_optimizer_levels; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$level" compile_fn test_fn
+    for preset in $selected_optimizer_presets; do
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index b71749a065..443d5583cb 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -36,13 +36,15 @@ function gnosis_safe_test
     local repo="https://github.com/solidity-external-tests/safe-contracts.git"
     local branch=v2_080
     local config_file="truffle-config.js"
-    # level 1: "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit"
-    local min_optimizer_level=2
-    local max_optimizer_level=3
+    local settings_presets=(
+        #legacy-no-optimize       # "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit"
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+    )
 
-    local selected_optimizer_levels
-    selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
-    print_optimizer_levels_or_exit "$selected_optimizer_levels"
+    local selected_optimizer_presets
+    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
@@ -53,14 +55,14 @@ function gnosis_safe_test
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$min_optimizer_level"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$selected_optimizer_presets")"
     npm install --package-lock
 
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
-    for level in $selected_optimizer_levels; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$level" compile_fn test_fn
+    for preset in $selected_optimizer_presets; do
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 97208660bc..9f0d356b6c 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -36,13 +36,15 @@ function gnosis_safe_test
     local repo="https://github.com/solidity-external-tests/safe-contracts.git"
     local branch=development_080
     local config_file="truffle-config.js"
-    # levels 1 and 2: "Stack too deep" error
-    local min_optimizer_level=3
-    local max_optimizer_level=3
+    local settings_presets=(
+        #legacy-no-optimize        # "Stack too deep" error
+        #legacy-optimize-evm-only  # "Stack too deep" error
+        legacy-optimize-evm+yul
+    )
 
-    local selected_optimizer_levels
-    selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
-    print_optimizer_levels_or_exit "$selected_optimizer_levels"
+    local selected_optimizer_presets
+    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
@@ -52,14 +54,14 @@ function gnosis_safe_test
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$min_optimizer_level"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$selected_optimizer_presets")"
     npm install --package-lock
 
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
-    for level in $selected_optimizer_levels; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$level" compile_fn test_fn
+    for preset in $selected_optimizer_presets; do
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 0759a3aec6..280c9ffeba 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -36,25 +36,28 @@ function zeppelin_test
     local repo="https://github.com/OpenZeppelin/openzeppelin-contracts.git"
     local branch=master
     local config_file="hardhat.config.js"
-    local min_optimizer_level=1
-    local max_optimizer_level=3
+    local settings_presets=(
+        legacy-no-optimize
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+    )
 
-    local selected_optimizer_levels
-    selected_optimizer_levels=$(circleci_select_steps "$(seq "$min_optimizer_level" "$max_optimizer_level")")
-    print_optimizer_levels_or_exit "$selected_optimizer_levels"
+    local selected_optimizer_presets
+    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
 
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$min_optimizer_level"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$selected_optimizer_presets")"
     npm install
 
     replace_version_pragmas
 
-    for level in $selected_optimizer_levels; do
-        hardhat_run_test "$config_file" "$level" compile_fn test_fn
+    for preset in $selected_optimizer_presets; do
+        hardhat_run_test "$config_file" "$preset" compile_fn test_fn
     done
 }
 

From 3ec05d02b5abeac390bc074b523f2c77c3aafa81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 9 Dec 2021 15:35:16 +0100
Subject: [PATCH 0196/1748] externalTests: Add extra viaIR runs

---
 .circleci/config.yml            |  5 +++--
 test/externalTests/colony.sh    |  3 +++
 test/externalTests/common.sh    | 10 +++++++---
 test/externalTests/ens.sh       |  3 +++
 test/externalTests/gnosis-v2.sh |  3 +++
 test/externalTests/gnosis.sh    |  3 +++
 test/externalTests/zeppelin.sh  |  3 +++
 7 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cda6e58909..20d06662d8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1037,8 +1037,9 @@ jobs:
     docker:
       - image: circleci/node:<<parameters.nodejs_version>>
     resource_class: <<parameters.resource_class>>
-    # NOTE: Each external test does 3 separate compile&test runs
-    parallelism: 3
+    # NOTE: Each external test runs up to 6 independent settings presets. If parallelism is higher than
+    # actual preset count, some runs will exit immediately. If it's lower, some runs will get more than one preset.
+    parallelism: 6
     environment:
       TERM: xterm
       COMPILE_ONLY: <<parameters.compile_only>>
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 7326f90bc7..d5b57f024a 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -37,6 +37,9 @@ function colony_test
     local branch=develop_080
     local config_file="truffle.js"
     local settings_presets=(
+        #ir-no-optimize            # Compiles but tests run out of gas
+        #ir-optimize-evm-only      # Compiles but tests run out of gas
+        ir-optimize-evm+yul
         #legacy-no-optimize        # Compiles but tests run out of gas
         #legacy-optimize-evm-only  # Compiles but tests run out of gas
         legacy-optimize-evm+yul
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 93484b16b3..012a21b2f7 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -250,9 +250,13 @@ function settings_from_preset
     local evm_version="$2"
 
     case "$preset" in
-        legacy-no-optimize)       echo "{evmVersion: '${evm_version}', optimizer: {enabled: false}}" ;;
-        legacy-optimize-evm-only) echo "{evmVersion: '${evm_version}', optimizer: {enabled: true, details: {yul: false}}}" ;;
-        legacy-optimize-evm+yul)  echo "{evmVersion: '${evm_version}', optimizer: {enabled: true, details: {yul: true}}}" ;;
+        # NOTE: Remember to update `parallelism` of `t_ems_ext` job in CI config if you add/remove presets
+        legacy-no-optimize)       echo "{evmVersion: '${evm_version}', viaIR: false, optimizer: {enabled: false}}" ;;
+        ir-no-optimize)           echo "{evmVersion: '${evm_version}', viaIR: true,  optimizer: {enabled: false}}" ;;
+        legacy-optimize-evm-only) echo "{evmVersion: '${evm_version}', viaIR: false, optimizer: {enabled: true, details: {yul: false}}}" ;;
+        ir-optimize-evm-only)     echo "{evmVersion: '${evm_version}', viaIR: true,  optimizer: {enabled: true, details: {yul: false}}}" ;;
+        legacy-optimize-evm+yul)  echo "{evmVersion: '${evm_version}', viaIR: false, optimizer: {enabled: true, details: {yul: true}}}" ;;
+        ir-optimize-evm+yul)      echo "{evmVersion: '${evm_version}', viaIR: true,  optimizer: {enabled: true, details: {yul: true}}}" ;;
         *)
             fail "Unknown settings preset: '${preset}'."
             ;;
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index de05454312..c0bc4b558c 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -37,6 +37,9 @@ function ens_test
     local branch=master
     local config_file="truffle.js"
     local settings_presets=(
+        #ir-no-optimize           # "YulException: Variable var_ttl_236 is 1 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # "YulException: Variable var_ttl_236 is 1 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index 443d5583cb..bae0f0f1e6 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -37,6 +37,9 @@ function gnosis_safe_test
     local branch=v2_080
     local config_file="truffle-config.js"
     local settings_presets=(
+        #ir-no-optimize           # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul
         #legacy-no-optimize       # "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit"
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 9f0d356b6c..562ab156f6 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -37,6 +37,9 @@ function gnosis_safe_test
     local branch=development_080
     local config_file="truffle-config.js"
     local settings_presets=(
+        #ir-no-optimize            # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only      # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul
         #legacy-no-optimize        # "Stack too deep" error
         #legacy-optimize-evm-only  # "Stack too deep" error
         legacy-optimize-evm+yul
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 280c9ffeba..89f3d6b423 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -37,6 +37,9 @@ function zeppelin_test
     local branch=master
     local config_file="hardhat.config.js"
     local settings_presets=(
+        #ir-no-optimize           # "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
+        #ir-optimize-evm+yul      # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul

From c15ef45d2969c6a53216c27126294b940e761583 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 6 Dec 2021 15:52:50 +0100
Subject: [PATCH 0197/1748] Explanation about operators.

---
 docs/types/operators.rst | 36 +++++++++++++++++++++++++++++++++---
 1 file changed, 33 insertions(+), 3 deletions(-)

diff --git a/docs/types/operators.rst b/docs/types/operators.rst
index 29962588fe..450963e11d 100644
--- a/docs/types/operators.rst
+++ b/docs/types/operators.rst
@@ -1,7 +1,35 @@
-.. index:: assignment, ! delete, lvalue
+.. index:: ! operator
 
-Operators Involving LValues
-===========================
+Operators
+=========
+
+Arithmetic and bit operators can be applied even if the two operands do not have the same type.
+For example, you can compute ``y = x + z``, where ``x`` is a ``uint8`` and ``z`` has
+the type ``int32``. In these cases, the following mechanism will be used to determine
+the type in which the operation is computed (this is important in case of overflow)
+and the type of the operator's result:
+
+1. If the type of the right operand can be implicitly converted to the type of the left
+   operand, use the type of the left operand,
+2. if the type of the left operand can be implicitly converted to the type of the right
+   operand, use the type of the right operand,
+3. otherwise, the operation is not allowed.
+
+In case one of the operands is a :ref:`literal number <rational_literals>` it is first converted to its
+"mobile type", which is the smallest type that can hold the value
+(unsigned types of the same bit-width are considered "smaller" than the signed types).
+If both are literal numbers, the operation is computed with arbitrary precision.
+
+The operator's result type is the same as the type the operation is performed in,
+except for comparison operators where the result is always ``bool``.
+
+The operators ``**`` (exponentiation), ``<<``  and ``>>`` use the type of the
+left operand for the operation and the result.
+
+.. index:: assignment, lvalue, ! compound operators
+
+Compound and Increment/Decrement Operators
+------------------------------------------
 
 If ``a`` is an LValue (i.e. a variable or something that can be assigned to), the
 following operators are available as shorthands:
@@ -12,6 +40,8 @@ to ``a += 1`` / ``a -= 1`` but the expression itself still has the previous valu
 of ``a``. In contrast, ``--a`` and ``++a`` have the same effect on ``a`` but
 return the value after the change.
 
+.. index:: !delete
+
 .. _delete:
 
 delete

From 9b55d4788e5e008905af060b26f44cac7e45d98e Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Mon, 6 Dec 2021 18:01:27 +0530
Subject: [PATCH 0198/1748] Added sameType check for fromType and toType in
 YulUtilFunctions.cpp and relevant tests in semanticTests

---
 Changelog.md                                  |  2 +-
 libsolidity/codegen/YulUtilFunctions.cpp      | 11 ++++-
 ...on_external_storage_to_storage_dynamic.sol | 43 ++++++++++++++++++
 ...o_storage_dynamic_different_mutability.sol | 45 +++++++++++++++++++
 ... copy_function_internal_storage_array.sol} |  2 +-
 .../copy_storage_arrays_of_function_type.sol  |  9 ++++
 6 files changed, 108 insertions(+), 4 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
 rename test/libsolidity/semanticTests/array/copying/{copy_function_storage_array.sol => copy_function_internal_storage_array.sol} (94%)
 create mode 100644 test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol

diff --git a/Changelog.md b/Changelog.md
index f9d7552742..c4b67e935b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,7 +11,7 @@ Bugfixes:
  * SMTChecker: Fix internal error when an unsafe target is solved more than once and the counterexample messages are different.
  * SMTChecker: Fix soundness of assigned storage/memory local pointers that were not erasing enough knowledge.
  * Fix internal error when a function has a calldata struct argument with an internal type inside.
-
+ * IR Generator: Fix IR syntax error when copying storage arrays of functions.
 
 
 ### 0.8.10 (2021-11-09)
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 1ad9aafa7f..106ad260f9 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -2057,7 +2057,7 @@ string YulUtilFunctions::copyValueArrayStorageToStorageFunction(ArrayType const&
 			solAssert(!_fromType.isValueType(), "");
 		templ("functionName", functionName);
 		templ("resizeArray", resizeArrayFunction(_toType));
-		templ("arrayLength",arrayLengthFunction(_fromType));
+		templ("arrayLength", arrayLengthFunction(_fromType));
 		templ("panic", panicFunction(PanicCode::ResourceError));
 		templ("srcDataLocation", arrayDataAreaFunction(_fromType));
 		templ("dstDataLocation", arrayDataAreaFunction(_toType));
@@ -2065,7 +2065,14 @@ string YulUtilFunctions::copyValueArrayStorageToStorageFunction(ArrayType const&
 		unsigned itemsPerSlot = 32 / _toType.storageStride();
 		templ("itemsPerSlot", to_string(itemsPerSlot));
 		templ("multipleItemsPerSlotDst", itemsPerSlot > 1);
-		bool sameType = _fromType.baseType() == _toType.baseType();
+		bool sameType = *_fromType.baseType() == *_toType.baseType();
+		if (auto functionType = dynamic_cast<FunctionType const*>(_fromType.baseType()))
+		{
+			solAssert(functionType->equalExcludingStateMutability(
+				dynamic_cast<FunctionType const&>(*_toType.baseType())
+			));
+			sameType = true;
+		}
 		templ("sameType", sameType);
 		if (sameType)
 		{
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
new file mode 100644
index 0000000000..543342dfde
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
@@ -0,0 +1,43 @@
+contract C {
+    function testFunction1() public {}
+    function testFunction2() public {}
+    function testFunction3() public {}
+
+
+    function() external [3] externalArray0;
+    function() external [3] externalArray1 = [
+        this.testFunction1,
+        this.testFunction2,
+        this.testFunction3
+    ];
+
+    function copyExternalStorageArrayOfFunctionType() external returns (bool) {
+        assert(keccak256(abi.encode(externalArray0)) != keccak256(abi.encode(externalArray1)));
+        externalArray0 = externalArray1;
+        return keccak256(abi.encode(externalArray0)) == keccak256(abi.encode(externalArray1));
+    }
+
+    function() internal [3] internalArray0;
+    function() internal [3] internalArray1 = [
+        testFunction1,
+        testFunction2,
+        testFunction3
+    ];
+
+    function copyInternalArrayOfFunctionType() external returns (bool) {
+        internalArray0 = internalArray1;
+        assert(internalArray0.length == 3);
+
+        return
+        internalArray0.length == internalArray1.length &&
+        internalArray0[0] == internalArray1[0] &&
+        internalArray0[1] == internalArray1[1] &&
+        internalArray0[2] == internalArray1[2];
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// copyExternalStorageArrayOfFunctionType() -> true
+// gas legacy: 103412
+// copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
new file mode 100644
index 0000000000..0e356bce65
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -0,0 +1,45 @@
+contract C {
+    function testFunction1() public {}
+    function testFunction2() public view {}
+    function testFunction3() public pure {}
+
+    function() external [3] externalArray0;
+    function() external [3] externalArray1 = [
+        this.testFunction1,
+        this.testFunction2,
+        this.testFunction3
+    ];
+
+    function copyExternalStorageArraysOfFunctionType() external returns (bool)
+    {
+        assert(keccak256(abi.encodePacked(externalArray0)) != keccak256(abi.encodePacked(externalArray1)));
+        externalArray0 = externalArray1;
+        return keccak256(abi.encodePacked(externalArray0)) == keccak256(abi.encodePacked(externalArray1));
+    }
+
+    function() internal [3] internalArray0;
+    function() internal [3] internalArray1 = [
+        testFunction1,
+        testFunction2,
+        testFunction3
+    ];
+
+    function copyInternalArrayOfFunctionType() external returns (bool)
+    {
+        internalArray0 = internalArray1;
+        assert(internalArray0.length == 3);
+
+        return
+        internalArray0.length == internalArray1.length &&
+        internalArray0[0] == internalArray1[0] &&
+        internalArray0[1] == internalArray1[1] &&
+        internalArray0[2] == internalArray1[2];
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// copyExternalStorageArraysOfFunctionType() -> true
+// gas legacy: 103398
+// copyInternalArrayOfFunctionType() -> true
+// gas legacy: 104178
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
similarity index 94%
rename from test/libsolidity/semanticTests/array/copying/copy_function_storage_array.sol
rename to test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index 8448d2e69b..6f019c77c2 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -18,6 +18,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 7
-// gas irOptimized: 126552
+// gas irOptimized: 124080
 // gas legacy: 205196
 // gas legacyOptimized: 204987
diff --git a/test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol b/test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol
new file mode 100644
index 0000000000..44011bea45
--- /dev/null
+++ b/test/libsolidity/syntaxTests/array/copy_storage_arrays_of_function_type.sol
@@ -0,0 +1,9 @@
+contract C {
+    function() external [] s0;
+    function() external view [] s1;
+    function copyStorageArrayOfFunctionType() public {
+        s1 = s0;
+    }
+}
+// ----
+// TypeError 7407: (148-150): Type function () external[] storage ref is not implicitly convertible to expected type function () view external[] storage ref.

From fdeb9717084e7427100b7ec5778c8a1ab222f5f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 15 Dec 2021 20:45:39 +0100
Subject: [PATCH 0199/1748] Add an appropriate label to each type of issue

---
 .github/ISSUE_TEMPLATE/bug_report.md          | 1 +
 .github/ISSUE_TEMPLATE/documentation_issue.md | 1 +
 .github/ISSUE_TEMPLATE/feature_request.md     | 1 +
 3 files changed, 3 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 571b97474c..0edc9f79f0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,7 @@
 ---
 name: Bug Report
 about: Bug reports about the Solidity Compiler.
+labels: ["bug :bug:"]
 ---
 
 <!--## Prerequisites
diff --git a/.github/ISSUE_TEMPLATE/documentation_issue.md b/.github/ISSUE_TEMPLATE/documentation_issue.md
index c0706b5f36..fc3dd77dbb 100644
--- a/.github/ISSUE_TEMPLATE/documentation_issue.md
+++ b/.github/ISSUE_TEMPLATE/documentation_issue.md
@@ -1,6 +1,7 @@
 ---
 name: Documentation Issue
 about: Solidity documentation.
+labels: ["documentation :book:"]
 ---
 
 ## Page
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 6702b62cb8..0b86a08f4f 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,7 @@
 ---
 name: Feature Request
 about: Solidity language or infrastructure feature requests.
+labels: ["feature"]
 ---
 
 <!--## Prerequisites

From 9e0f03b3dc34745a84403dabcc24027f6b9e146e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 15 Dec 2021 20:48:52 +0100
Subject: [PATCH 0200/1748] Remove hard wrapping in the issue templates

---
 .github/ISSUE_TEMPLATE/bug_report.md          |  5 ++--
 .github/ISSUE_TEMPLATE/documentation_issue.md | 12 +++------
 .github/ISSUE_TEMPLATE/feature_request.md     | 25 ++++++-------------
 3 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 0edc9f79f0..261f78fdc1 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -9,13 +9,12 @@ labels: ["bug :bug:"]
 - First, many thanks for taking part in the community. We really appreciate that.
 - We realize there is a lot of information requested here. We ask only that you do your best to provide as much information as possible so we can better help you.
 - Support questions are better asked in one of the following locations:
-	- [Solidity chat](https://gitter.im/ethereum/solidity)
-	- [Stack Overflow](https://ethereum.stackexchange.com/)
+    - [Solidity chat](https://gitter.im/ethereum/solidity)
+    - [Stack Overflow](https://ethereum.stackexchange.com/)
 - Ensure the issue isn't already reported.
 - The issue should be reproducible with the latest solidity version; however, this isn't a hard requirement and being reproducible with an older version is sufficient.
 
 *Delete the above section and the instructions in the sections below before submitting*
-
 -->
 
 ## Description
diff --git a/.github/ISSUE_TEMPLATE/documentation_issue.md b/.github/ISSUE_TEMPLATE/documentation_issue.md
index fc3dd77dbb..c5873f726c 100644
--- a/.github/ISSUE_TEMPLATE/documentation_issue.md
+++ b/.github/ISSUE_TEMPLATE/documentation_issue.md
@@ -6,18 +6,12 @@ labels: ["documentation :book:"]
 
 ## Page
 
-<!--
-Please link directly to the page which you think has a problem
--->
+<!--Please link directly to the page which you think has a problem.-->
 
 ## Abstract
 
-<!--
-Please describe in detail what is wrong.
--->
+<!--Please describe in detail what is wrong.-->
 
 ## Pull request
 
-<!--
-Please link to your pull request which resolves this issue
--->
+<!--Please link to your pull request which resolves this issue.-->
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 0b86a08f4f..7191414d43 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -9,40 +9,29 @@ labels: ["feature"]
 - First, many thanks for taking part in the community. We really appreciate that.
 - We realize there is a lot of data requested here. We ask only that you do your best to provide as much information as possible so we can better help you.
 - Support questions are better asked in one of the following locations:
-	- [Solidity chat](https://gitter.im/ethereum/solidity)
-	- [Stack Overflow](https://ethereum.stackexchange.com/)
+    - [Solidity chat](https://gitter.im/ethereum/solidity)
+    - [Stack Overflow](https://ethereum.stackexchange.com/)
 - Ensure the issue isn't already reported (check `feature` and `language design` labels).
 
 *Delete the above section and the instructions in the sections below before submitting*
-
 -->
 
 ## Abstract
 
-<!--
-Please describe by example what problem you see in the current Solidity language
-and reason about it.
--->
+<!--Please describe by example what problem you see in the current Solidity language and reason about it.-->
 
 ## Motivation
 
-<!--
-In this section you describe how you propose to address the problem you described earlier,
-including by giving one or more exemplary source code snippets for demonstration.
--->
+<!--In this section you describe how you propose to address the problem you described earlier, including by giving one or more exemplary source code snippets for demonstration.-->
 
 ## Specification
 
-<!--
-The technical specification should describe the syntax and semantics of any new feature. The
-specification should be detailed enough to allow any developer to implement the functionality.
--->
+<!--The technical specification should describe the syntax and semantics of any new feature. The specification should be detailed enough to allow any developer to implement the functionality.-->
 
 ## Backwards Compatibility
 
 <!--
-All language changes that introduce backwards incompatibilities must include a section describing
-these incompatibilities and their severity.
+All language changes that introduce backwards incompatibilities must include a section describing these incompatibilities and their severity.
 
 Please describe how you propose to deal with these incompatibilities.
--->
\ No newline at end of file
+-->

From 6035e8c02a96653fa659b667a3dd2ba7705b4967 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 15 Dec 2021 21:07:08 +0100
Subject: [PATCH 0201/1748] Configure issue type selection screen to always
 select the "Solidity" project

---
 .github/ISSUE_TEMPLATE/config.yml | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..931bc8940e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Bug Report
+    url: https://github.com/ethereum/solidity/issues/new?template=bug_report.md&projects=ethereum/solidity/43
+  - name: Documentation Issue
+    url: https://github.com/ethereum/solidity/issues/new?template=documentation_issue.md&projects=ethereum/solidity/43
+  - name: Feature Request
+    url: https://github.com/ethereum/solidity/issues/new?template=feature_request.md&projects=ethereum/solidity/43

From b2a05a1bcfafa4fbe1344eba19e6e63ceecb6d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 15 Dec 2021 21:07:28 +0100
Subject: [PATCH 0202/1748] Remove unused "general" issue template

---
 .github/ISSUE_TEMPLATE/general.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/general.md

diff --git a/.github/ISSUE_TEMPLATE/general.md b/.github/ISSUE_TEMPLATE/general.md
deleted file mode 100644
index e69de29bb2..0000000000

From 9a0821f2c30f9c51bb5d7e6ac4cc85cf42bd6c9b Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 16 Dec 2021 00:11:59 +0100
Subject: [PATCH 0203/1748] Fix warning about reference.

---
 libyul/backends/evm/StackLayoutGenerator.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index 43a1d032ce..50dcee5dec 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -247,7 +247,7 @@ Stack createIdealLayout(Stack const& _operationOutput, Stack const& _post, Calla
 	// before the operation, i.e. if PreviousSlot{2} is at a position at which _post contains VariableSlot{"tmp"},
 	// then we want the variable tmp in the slot at offset 2 in the layout before the operation.
 	vector<optional<StackSlot>> idealLayout(_post.size(), nullopt);
-	for (auto const& [slot, idealPosition]: ranges::zip_view(_post, layout))
+	for (auto&& [slot, idealPosition]: ranges::zip_view(_post, layout))
 		if (PreviousSlot* previousSlot = std::get_if<PreviousSlot>(&idealPosition))
 			idealLayout.at(previousSlot->slot) = slot;
 

From 19a74506e39af9448590ce4fefee65fdd7f9c8eb Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Wed, 17 Nov 2021 00:17:37 +0530
Subject: [PATCH 0204/1748] trial test cases extracted from
 SoliidityEndToEndTest.cpp into .sol files.

removed libevmone.so files from the directory

trial test cases extracted from SoliidityEndToEndTest.cpp into .sol files. Corresponding code in the .cpp file has been commented instead of begin removed pending preliminary reviews

removed libevmone files

Added testcase packed_storage_structs_delete

added test case invalid_enum_logged

added test case enum_referencing

added test case memory_types_initialisation

added test case return string

added test case constant_string_literal.sol

removed extractable keyword from solidityEndtoEnd.cpp, moved copying_bytes_multiassigned.sol to array/copying folder, added recv() function to copying_bytes_multiassigned.sol but this test case is failing now

change typo error in the name of test case library_staticcall_delegatecal.sol to library_staticcall_delegatecall.sol

Added compileToEwasm:false to call_forward_bytes.sol test case and moved it to semanticTests/fallback

added compileToEwasm:false line to library_call_in_homestead

added compileToEwasm: false line to copying_bytes_multiassign, copy_from_calldata_removes_bytes, enum_referencing, library_call_in_homestead, struct_referencing

Added test case internal_types_in_library

Added test case mapping_arguments_in_library

Added test case mapping_returns_in_library

Added test case mapping_returns_in_library_named

Added test case using_library_mappings_public

Added test case library_function_external

Added test case library_stray_values

added test case using_library_mappings_return

added test case using_library_structs

Added test case using_for_function_on_struct and corrections to using_library_structs, using_library_mpapings_return, library_stray_values

Added test case using_for_overload

added test case using_for_by_name

added test case bound_function_in_function

added test case bound_function_in_var

added test case bound_function_to_string

added test case payable_function_calls_library

added function call corrections to copying_bytes_multiassign and call_forward_bytes

Made changes to the test cases as per comments on PR #12289

mentioned in Changelog.md : Extraced some test cases from SolEndToEnd.cpp
---
 test/libsolidity/SolidityEndToEndTest.cpp     | 519 ------------------
 .../copying/copying_bytes_multiassign.sol     |  33 ++
 .../copy_from_calldata_removes_bytes_data.sol |  19 +
 .../semanticTests/enums/enum_referencing.sol  |  41 ++
 .../fallback/call_forward_bytes.sol           |  27 +
 .../bound_function_in_function.sol            |  16 +
 .../functionCall/bound_function_in_var.sol    |  16 +
 .../functionCall/bound_function_to_string.sol |  20 +
 .../libraries/internal_types_in_library.sol   |  30 +
 .../libraries/library_call_in_homestead.sol   |  15 +
 .../libraries/library_stray_values.sol        |  14 +
 .../mapping_arguments_in_library.sol          |  41 ++
 .../libraries/mapping_returns_in_library.sol  |  75 +++
 .../mapping_returns_in_library_named.sol      |  31 ++
 .../payable_function_calls_library.sol        |  14 +
 .../libraries/using_for_by_name.sol           |  16 +
 .../libraries/using_for_overload.sol          |  20 +
 .../using_library_mappings_public.sol         |  27 +
 .../using_library_mappings_return.sol         |  25 +
 .../libraries/using_library_structs.sol       |  27 +
 .../structs/struct_referencing.sol            |  61 ++
 .../structs/using_for_function_on_struct.sol  |  16 +
 22 files changed, 584 insertions(+), 519 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
 create mode 100644 test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
 create mode 100644 test/libsolidity/semanticTests/enums/enum_referencing.sol
 create mode 100644 test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
 create mode 100644 test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol
 create mode 100644 test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol
 create mode 100644 test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/library_stray_values.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/using_for_by_name.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/using_for_overload.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/using_library_structs.sol
 create mode 100644 test/libsolidity/semanticTests/structs/struct_referencing.sol
 create mode 100644 test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 4731149618..314d4283e0 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -1551,26 +1551,6 @@ BOOST_AUTO_TEST_CASE(generic_staticcall)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(library_call_in_homestead)
-{
-	char const* sourceCode = R"(
-		library Lib { function m() public returns (address) { return msg.sender; } }
-		contract Test {
-			address public sender;
-			function f() public {
-				sender = Lib.m();
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs());
-		ABI_CHECK(callContractFunction("sender()"), encodeArgs(m_sender));
-	)
-}
-
 BOOST_AUTO_TEST_CASE(library_call_protection)
 {
 	// This tests code that reverts a call if it is a direct call to a library
@@ -1626,38 +1606,6 @@ BOOST_AUTO_TEST_CASE(bytes_from_calldata_to_memory)
 	);
 }
 
-BOOST_AUTO_TEST_CASE(call_forward_bytes)
-{
-	char const* sourceCode = R"(
-		contract receiver {
-			uint public received;
-			function recv(uint x) public { received += x + 1; }
-			fallback() external { received = 0x80; }
-		}
-		contract sender {
-			constructor() { rec = new receiver(); }
-			fallback() external { savedData = msg.data; }
-			function forward() public returns (bool) { address(rec).call(savedData); return true; }
-			function clear() public returns (bool) { delete savedData; return true; }
-			function val() public returns (uint) { return rec.received(); }
-			receiver rec;
-			bytes savedData;
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN();
-		compileAndRun(sourceCode, 0, "sender");
-		ABI_CHECK(callContractFunction("recv(uint256)", 7), bytes());
-		ABI_CHECK(callContractFunction("val()"), encodeArgs(0));
-		ABI_CHECK(callContractFunction("forward()"), encodeArgs(true));
-		ABI_CHECK(callContractFunction("val()"), encodeArgs(8));
-		ABI_CHECK(callContractFunction("clear()"), encodeArgs(true));
-		ABI_CHECK(callContractFunction("val()"), encodeArgs(8));
-		ABI_CHECK(callContractFunction("forward()"), encodeArgs(true));
-		ABI_CHECK(callContractFunction("val()"), encodeArgs(0x80));
-	);
-}
-
 BOOST_AUTO_TEST_CASE(call_forward_bytes_length)
 {
 	char const* sourceCode = R"(
@@ -2576,254 +2524,6 @@ BOOST_AUTO_TEST_CASE(library_function_external)
 	)
 }
 
-BOOST_AUTO_TEST_CASE(library_stray_values)
-{
-	char const* sourceCode = R"(
-		library Lib { function m(uint x, uint y) public returns (uint) { return x * y; } }
-		contract Test {
-			function f(uint x) public returns (uint) {
-				Lib;
-				Lib.m;
-				return x + 9;
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f(uint256)", u256(33)), encodeArgs(u256(42)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(internal_types_in_library)
-{
-	char const* sourceCode = R"(
-		library Lib {
-			function find(uint16[] storage _haystack, uint16 _needle) public view returns (uint)
-			{
-				for (uint i = 0; i < _haystack.length; ++i)
-					if (_haystack[i] == _needle)
-						return i;
-				return type(uint).max;
-			}
-		}
-		contract Test {
-			mapping(string => uint16[]) data;
-			function f() public returns (uint a, uint b)
-			{
-				while (data["abc"].length < 20)
-					data["abc"].push();
-				data["abc"][4] = 9;
-				data["abc"][17] = 3;
-				a = Lib.find(data["abc"], 9);
-				b = Lib.find(data["abc"], 3);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(4), u256(17)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(mapping_arguments_in_library)
-{
-	char const* sourceCode = R"(
-		library Lib {
-			function set(mapping(uint => uint) storage m, uint key, uint value) internal
-			{
-				m[key] = value;
-			}
-			function get(mapping(uint => uint) storage m, uint key) internal view returns (uint)
-			{
-				return m[key];
-			}
-		}
-		contract Test {
-			mapping(uint => uint) m;
-			function set(uint256 key, uint256 value) public returns (uint)
-			{
-				uint oldValue = Lib.get(m, key);
-				Lib.set(m, key, value);
-				return oldValue;
-			}
-			function get(uint256 key) public view returns (uint) {
-				return Lib.get(m, key);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("set(uint256,uint256)", u256(1), u256(42)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("set(uint256,uint256)", u256(2), u256(84)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("set(uint256,uint256)", u256(21), u256(7)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get(uint256)", u256(0)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get(uint256)", u256(1)), encodeArgs(u256(42)));
-		ABI_CHECK(callContractFunction("get(uint256)", u256(2)), encodeArgs(u256(84)));
-		ABI_CHECK(callContractFunction("get(uint256)", u256(21)), encodeArgs(u256(7)));
-		ABI_CHECK(callContractFunction("set(uint256,uint256)", u256(1), u256(21)), encodeArgs(u256(42)));
-		ABI_CHECK(callContractFunction("set(uint256,uint256)", u256(2), u256(42)), encodeArgs(u256(84)));
-		ABI_CHECK(callContractFunction("set(uint256,uint256)", u256(21), u256(14)), encodeArgs(u256(7)));
-		ABI_CHECK(callContractFunction("get(uint256)", u256(0)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get(uint256)", u256(1)), encodeArgs(u256(21)));
-		ABI_CHECK(callContractFunction("get(uint256)", u256(2)), encodeArgs(u256(42)));
-		ABI_CHECK(callContractFunction("get(uint256)", u256(21)), encodeArgs(u256(14)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(mapping_returns_in_library)
-{
-	char const* sourceCode = R"(
-		library Lib {
-			function choose_mapping(mapping(uint => uint) storage a, mapping(uint => uint) storage b, bool c) internal pure returns(mapping(uint=>uint) storage)
-			{
-				return c ? a : b;
-			}
-		}
-		contract Test {
-			mapping(uint => uint) a;
-			mapping(uint => uint) b;
-			function set(bool choice, uint256 key, uint256 value) public returns (uint)
-			{
-				mapping(uint => uint) storage m = Lib.choose_mapping(a, b, choice);
-				uint oldValue = m[key];
-				m[key] = value;
-				return oldValue;
-			}
-			function get(bool choice, uint256 key) public view returns (uint) {
-				return Lib.choose_mapping(a, b, choice)[key];
-			}
-			function get_a(uint256 key) public view returns (uint) {
-				return a[key];
-			}
-			function get_b(uint256 key) public view returns (uint) {
-				return b[key];
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", true, u256(1), u256(42)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", true, u256(2), u256(84)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", true, u256(21), u256(7)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", false, u256(1), u256(10)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", false, u256(2), u256(11)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", false, u256(21), u256(12)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", true, u256(0)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", true, u256(1)), encodeArgs(u256(42)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", true, u256(2)), encodeArgs(u256(84)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", true, u256(21)), encodeArgs(u256(7)));
-		ABI_CHECK(callContractFunction("get_a(uint256)", u256(0)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get_a(uint256)", u256(1)), encodeArgs(u256(42)));
-		ABI_CHECK(callContractFunction("get_a(uint256)", u256(2)), encodeArgs(u256(84)));
-		ABI_CHECK(callContractFunction("get_a(uint256)", u256(21)), encodeArgs(u256(7)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", false, u256(0)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", false, u256(1)), encodeArgs(u256(10)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", false, u256(2)), encodeArgs(u256(11)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", false, u256(21)), encodeArgs(u256(12)));
-		ABI_CHECK(callContractFunction("get_b(uint256)", u256(0)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get_b(uint256)", u256(1)), encodeArgs(u256(10)));
-		ABI_CHECK(callContractFunction("get_b(uint256)", u256(2)), encodeArgs(u256(11)));
-		ABI_CHECK(callContractFunction("get_b(uint256)", u256(21)), encodeArgs(u256(12)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", true, u256(1), u256(21)), encodeArgs(u256(42)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", true, u256(2), u256(42)), encodeArgs(u256(84)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", true, u256(21), u256(14)), encodeArgs(u256(7)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", false, u256(1), u256(30)), encodeArgs(u256(10)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", false, u256(2), u256(31)), encodeArgs(u256(11)));
-		ABI_CHECK(callContractFunction("set(bool,uint256,uint256)", false, u256(21), u256(32)), encodeArgs(u256(12)));
-		ABI_CHECK(callContractFunction("get_a(uint256)", u256(0)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get_a(uint256)", u256(1)), encodeArgs(u256(21)));
-		ABI_CHECK(callContractFunction("get_a(uint256)", u256(2)), encodeArgs(u256(42)));
-		ABI_CHECK(callContractFunction("get_a(uint256)", u256(21)), encodeArgs(u256(14)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", true, u256(0)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", true, u256(1)), encodeArgs(u256(21)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", true, u256(2)), encodeArgs(u256(42)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", true, u256(21)), encodeArgs(u256(14)));
-		ABI_CHECK(callContractFunction("get_b(uint256)", u256(0)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get_b(uint256)", u256(1)), encodeArgs(u256(30)));
-		ABI_CHECK(callContractFunction("get_b(uint256)", u256(2)), encodeArgs(u256(31)));
-		ABI_CHECK(callContractFunction("get_b(uint256)", u256(21)), encodeArgs(u256(32)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", false, u256(0)), encodeArgs(u256(0)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", false, u256(1)), encodeArgs(u256(30)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", false, u256(2)), encodeArgs(u256(31)));
-		ABI_CHECK(callContractFunction("get(bool,uint256)", false, u256(21)), encodeArgs(u256(32)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(mapping_returns_in_library_named)
-{
-	char const* sourceCode = R"(
-		library Lib {
-			function f(mapping(uint => uint) storage a, mapping(uint => uint) storage b) internal returns(mapping(uint=>uint) storage r)
-			{
-				r = a;
-				r[1] = 42;
-				r = b;
-				r[1] = 21;
-			}
-		}
-		contract Test {
-			mapping(uint => uint) a;
-			mapping(uint => uint) b;
-			function f() public returns (uint, uint, uint, uint, uint, uint)
-			{
-				Lib.f(a, b)[2] = 84;
-				return (a[0], a[1], a[2], b[0], b[1], b[2]);
-			}
-			function g() public returns (uint, uint, uint, uint, uint, uint)
-			{
-				mapping(uint => uint) storage m = Lib.f(a, b);
-				m[2] = 17;
-				return (a[0], a[1], a[2], b[0], b[1], b[2]);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(0), u256(42), u256(0), u256(0), u256(21), u256(84)));
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(u256(0), u256(42), u256(0), u256(0), u256(21), u256(17)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(using_library_mappings_public)
-{
-	char const* sourceCode = R"(
-			library Lib {
-				function set(mapping(uint => uint) storage m, uint key, uint value) public
-				{
-					m[key] = value;
-				}
-			}
-			contract Test {
-				mapping(uint => uint) m1;
-				mapping(uint => uint) m2;
-				function f() public returns (uint, uint, uint, uint, uint, uint)
-				{
-					Lib.set(m1, 0, 1);
-					Lib.set(m1, 2, 42);
-					Lib.set(m2, 0, 23);
-					Lib.set(m2, 2, 99);
-					return (m1[0], m1[1], m1[2], m2[0], m2[1], m2[2]);
-				}
-			}
-		)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(1), u256(0), u256(42), u256(23), u256(0), u256(99)));
-	)
-}
-
 BOOST_AUTO_TEST_CASE(using_library_mappings_external)
 {
 	char const* libSourceCode = R"(
@@ -2860,65 +2560,6 @@ BOOST_AUTO_TEST_CASE(using_library_mappings_external)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(using_library_mappings_return)
-{
-	char const* sourceCode = R"(
-			library Lib {
-				function choose(mapping(uint => mapping(uint => uint)) storage m, uint key) external returns (mapping(uint => uint) storage) {
-					return m[key];
-				}
-			}
-			contract Test {
-				mapping(uint => mapping(uint => uint)) m;
-				function f() public returns (uint, uint, uint, uint, uint, uint)
-				{
-					Lib.choose(m, 0)[0] = 1;
-					Lib.choose(m, 0)[2] = 42;
-					Lib.choose(m, 1)[0] = 23;
-					Lib.choose(m, 1)[2] = 99;
-					return (m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2]);
-				}
-			}
-		)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(1), u256(0), u256(42), u256(23), u256(0), u256(99)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(using_library_structs)
-{
-	char const* sourceCode = R"(
-		library Lib {
-			struct Data { uint a; uint[] b; }
-			function set(Data storage _s) public
-			{
-				_s.a = 7;
-				while (_s.b.length < 20)
-					_s.b.push();
-				_s.b[19] = 8;
-			}
-		}
-		contract Test {
-			mapping(string => Lib.Data) data;
-			function f() public returns (uint a, uint b)
-			{
-				Lib.set(data["abc"]);
-				a = data["abc"].a;
-				b = data["abc"].b[19];
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(7), u256(8)));
-	)
-}
-
 BOOST_AUTO_TEST_CASE(short_strings)
 {
 	// This test verifies that the byte array encoding that combines length and data works
@@ -3114,146 +2755,6 @@ BOOST_AUTO_TEST_CASE(create_memory_array_allocation_size)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(using_for_function_on_struct)
-{
-	char const* sourceCode = R"(
-		library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
-		contract C {
-			using D for D.s;
-			D.s public x;
-			function f(uint a) public returns (uint) {
-				x.a = 3;
-				return x.mul(a);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "D");
-		compileAndRun(sourceCode, 0, "C", bytes(), map<string, h160>{{":D", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f(uint256)", u256(7)), encodeArgs(u256(3 * 7)));
-		ABI_CHECK(callContractFunction("x()"), encodeArgs(u256(3 * 7)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(using_for_overload)
-{
-	char const* sourceCode = R"(
-		library D {
-			struct s { uint a; }
-			function mul(s storage self, uint x) public returns (uint) { return self.a *= x; }
-			function mul(s storage self, bytes32 x) public returns (bytes32) { }
-		}
-		contract C {
-			using D for D.s;
-			D.s public x;
-			function f(uint a) public returns (uint) {
-				x.a = 6;
-				return x.mul(a);
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "D");
-		compileAndRun(sourceCode, 0, "C", bytes(), map<string, h160>{{":D", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f(uint256)", u256(7)), encodeArgs(u256(6 * 7)));
-		ABI_CHECK(callContractFunction("x()"), encodeArgs(u256(6 * 7)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(using_for_by_name)
-{
-	char const* sourceCode = R"(
-		library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
-		contract C {
-			using D for D.s;
-			D.s public x;
-			function f(uint a) public returns (uint) {
-				x.a = 6;
-				return x.mul({x: a});
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "D");
-		compileAndRun(sourceCode, 0, "C", bytes(), map<string, h160>{{":D", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f(uint256)", u256(7)), encodeArgs(u256(6 * 7)));
-		ABI_CHECK(callContractFunction("x()"), encodeArgs(u256(6 * 7)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(bound_function_in_function)
-{
-	char const* sourceCode = R"(
-		library L {
-			function g(function() internal returns (uint) _t) internal returns (uint) { return _t(); }
-		}
-		contract C {
-			using L for *;
-			function f() public returns (uint) {
-				return t.g();
-			}
-			function t() public pure returns (uint)  { return 7; }
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "L");
-		compileAndRun(sourceCode, 0, "C", bytes(), map<string, h160>{{":L", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(7)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(bound_function_in_var)
-{
-	char const* sourceCode = R"(
-		library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
-		contract C {
-			using D for D.s;
-			D.s public x;
-			function f(uint a) public returns (uint) {
-				x.a = 6;
-				return (x.mul)({x: a});
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "D");
-		compileAndRun(sourceCode, 0, "C", bytes(), map<string, h160>{{":D", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f(uint256)", u256(7)), encodeArgs(u256(6 * 7)));
-		ABI_CHECK(callContractFunction("x()"), encodeArgs(u256(6 * 7)));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(bound_function_to_string)
-{
-	char const* sourceCode = R"(
-		library D { function length(string memory self) public returns (uint) { return bytes(self).length; } }
-		contract C {
-			using D for string;
-			string x;
-			function f() public returns (uint) {
-				x = "abc";
-				return x.length();
-			}
-			function g() public returns (uint) {
-				string memory s = "abc";
-				return s.length();
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "D");
-		compileAndRun(sourceCode, 0, "C", bytes(), map<string, h160>{{":D", m_contractAddress}});
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(3)));
-		ABI_CHECK(callContractFunction("g()"), encodeArgs(u256(3)));
-	)
-}
-
 BOOST_AUTO_TEST_CASE(inline_long_string_return)
 {
 		char const* sourceCode = R"(
@@ -3406,26 +2907,6 @@ BOOST_AUTO_TEST_CASE(payable_function)
 	BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 27 + 27);
 }
 
-BOOST_AUTO_TEST_CASE(payable_function_calls_library)
-{
-	char const* sourceCode = R"(
-		library L {
-			function f() public returns (uint) { return 7; }
-		}
-		contract C {
-			function f() public payable returns (uint) {
-				return L.f();
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode, 0, "L");
-		compileAndRun(sourceCode, 0, "C", bytes(), map<string, h160>{{":L", m_contractAddress}});
-		ABI_CHECK(callContractFunctionWithValue("f()", 27), encodeArgs(u256(7)));
-	)
-}
-
 BOOST_AUTO_TEST_CASE(non_payable_throw)
 {
 	char const* sourceCode = R"(
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
new file mode 100644
index 0000000000..3583a752d1
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -0,0 +1,33 @@
+contract receiver {
+    uint public received;
+    function recv(uint x) public { received += x + 1; }
+    fallback() external { received = 0x80; }
+}
+contract sender {
+    constructor() { rec = new receiver(); }
+    fallback() external { savedData1 = savedData2 = msg.data; }
+    function forward(bool selector) public returns (bool) {
+        if (selector) { address(rec).call(savedData1); delete savedData1; }
+        else { address(rec).call(savedData2); delete savedData2; }
+        return true;
+    }
+    function val() public returns (uint) { return rec.received(); }
+    receiver rec;
+    bytes savedData1;
+    bytes savedData2;
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// (): 7 ->
+// gas irOptimized: 110941
+// gas legacy: 111082
+// gas legacyOptimized: 111027
+// val() -> 0
+// forward(bool): true -> true
+// val() -> 0x80
+// forward(bool): false -> true
+// val() -> 0x80
+// forward(bool): true -> true
+// val() -> 0x80
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
new file mode 100644
index 0000000000..87067b77bc
--- /dev/null
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -0,0 +1,19 @@
+contract c {
+    function set() public returns (bool) { data = msg.data; return true; }
+    function checkIfDataIsEmpty() public returns (bool) { return data.length == 0; }
+    function sendMessage() public returns (bool, bytes memory) { bytes memory emptyData; return address(this).call(emptyData);}
+    fallback() external { data = msg.data; }
+    bytes data;
+}
+// ====
+// EVMVersion: >=byzantium
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// (): 1, 2, 3, 4, 5 ->
+// gas irOptimized: 155178
+// gas legacy: 155254
+// gas legacyOptimized: 155217
+// checkIfDataIsEmpty() -> false
+// sendMessage() -> true, 0x40, 0
+// checkIfDataIsEmpty() -> true
diff --git a/test/libsolidity/semanticTests/enums/enum_referencing.sol b/test/libsolidity/semanticTests/enums/enum_referencing.sol
new file mode 100644
index 0000000000..537c05182b
--- /dev/null
+++ b/test/libsolidity/semanticTests/enums/enum_referencing.sol
@@ -0,0 +1,41 @@
+interface I {
+    enum Direction { A, B, Left, Right }
+}
+library L {
+    enum Direction { Left, Right }
+    function f() public pure returns (Direction) {
+        return Direction.Right;
+    }
+    function g() public pure returns (I.Direction) {
+        return I.Direction.Right;
+    }
+}
+contract C is I {
+    function f() public pure returns (Direction) {
+        return Direction.Right;
+    }
+    function g() public pure returns (I.Direction) {
+        return I.Direction.Right;
+    }
+    function h() public pure returns (L.Direction) {
+        return L.Direction.Right;
+    }
+    function x() public pure returns (L.Direction) {
+        return L.f();
+    }
+    function y() public pure returns (I.Direction) {
+        return L.g();
+    }
+}
+// ====
+// compileViaYul: also
+// compileToEwasm: false
+// ----
+// library: L
+// f() -> 3
+// g() -> 3
+// f() -> 3
+// g() -> 3
+// h() -> 1
+// x() -> 1
+// y() -> 3
diff --git a/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol b/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
new file mode 100644
index 0000000000..39122e7574
--- /dev/null
+++ b/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
@@ -0,0 +1,27 @@
+contract receiver {
+    uint256 public received;
+    function recv(uint256 x) public { received += x + 1; }
+    fallback() external { received = 0x80; }
+}
+contract sender {
+    constructor() { rec = new receiver();}
+    fallback() external { savedData = msg.data; }
+    function forward() public returns (bool) { address(rec).call(savedData); return true; }
+    function clear() public returns (bool) { delete savedData; return true; }
+    function val() public returns (uint) { return rec.received(); }
+    receiver rec;
+    bytes savedData;
+}
+// ====
+// allowNonExistingFunctions: true
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// recv(uint256): 7 ->
+// val() -> 0
+// forward() -> true
+// val() -> 8
+// clear() -> true
+// val() -> 8
+// forward() -> true
+// val() -> 0x80
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol b/test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol
new file mode 100644
index 0000000000..983de5e3ce
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol
@@ -0,0 +1,16 @@
+library L {
+    function g(function() internal returns (uint) _t) internal returns (uint) { return _t(); }
+}
+contract C {
+    using L for *;
+    function f() public returns (uint) {
+        return t.g();
+    }
+    function t() public pure returns (uint)  { return 7; }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: L
+// f() -> 7
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol b/test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol
new file mode 100644
index 0000000000..ad80241270
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol
@@ -0,0 +1,16 @@
+library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
+contract C {
+    using D for D.s;
+    D.s public x;
+    function f(uint a) public returns (uint) {
+        x.a = 6;
+        return (x.mul)({x: a});
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: D
+// f(uint256): 7 -> 0x2a
+// x() -> 0x2a
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol b/test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol
new file mode 100644
index 0000000000..376768b86d
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol
@@ -0,0 +1,20 @@
+library D { function length(string memory self) public returns (uint) { return bytes(self).length; } }
+contract C {
+    using D for string;
+    string x;
+    function f() public returns (uint) {
+        x = "abc";
+        return x.length();
+    }
+    function g() public returns (uint) {
+        string memory s = "abc";
+        return s.length();
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: D
+// f() -> 3
+// g() -> 3
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
new file mode 100644
index 0000000000..6b13ee09c3
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -0,0 +1,30 @@
+library Lib {
+    function find(uint16[] storage _haystack, uint16 _needle) public view returns (uint)
+    {
+        for (uint i = 0; i < _haystack.length; ++i)
+            if (_haystack[i] == _needle)
+                return i;
+        return type(uint).max;
+    }
+}
+contract Test {
+    mapping(string => uint16[]) data;
+    function f() public returns (uint a, uint b)
+    {
+        while (data["abc"].length < 20)
+            data["abc"].push();
+        data["abc"][4] = 9;
+        data["abc"][17] = 3;
+        a = Lib.find(data["abc"], 9);
+        b = Lib.find(data["abc"], 3);
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: Lib
+// f() -> 4, 0x11
+// gas irOptimized: 115822
+// gas legacy: 135952
+// gas legacyOptimized: 119643
diff --git a/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol b/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
new file mode 100644
index 0000000000..6841221f41
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
@@ -0,0 +1,15 @@
+library Lib { function m() public returns (address) { return msg.sender; } }
+contract Test {
+    address public sender;
+    function f() public {
+        sender = Lib.m();
+    }
+}
+// ====
+// compileViaYul: also
+// compileToEwasm: false
+// EVMVersion: >=homestead
+// ----
+// library: Lib
+// f() ->
+// sender() -> 0x1212121212121212121212121212120000000012
diff --git a/test/libsolidity/semanticTests/libraries/library_stray_values.sol b/test/libsolidity/semanticTests/libraries/library_stray_values.sol
new file mode 100644
index 0000000000..1692b018a7
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/library_stray_values.sol
@@ -0,0 +1,14 @@
+library Lib { function m(uint x, uint y) public returns (uint) { return x * y; } }
+contract Test {
+    function f(uint x) public returns (uint) {
+        Lib;
+        Lib.m;
+        return x + 9;
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: Lib
+// f(uint256): 33 -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol b/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
new file mode 100644
index 0000000000..06cfd6e1a1
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
@@ -0,0 +1,41 @@
+library Lib {
+    function set(mapping(uint => uint) storage m, uint key, uint value) internal
+    {
+        m[key] = value;
+    }
+    function get(mapping(uint => uint) storage m, uint key) internal view returns (uint)
+    {
+        return m[key];
+    }
+}
+contract Test {
+    mapping(uint => uint) m;
+    function set(uint256 key, uint256 value) public returns (uint)
+    {
+        uint oldValue = Lib.get(m, key);
+        Lib.set(m, key, value);
+        return oldValue;
+    }
+    function get(uint256 key) public view returns (uint) {
+        return Lib.get(m, key);
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: Lib
+// set(uint256,uint256): 1, 42 -> 0
+// set(uint256,uint256): 2, 84 -> 0
+// set(uint256,uint256): 21, 7 -> 0
+// get(uint256): 0 -> 0
+// get(uint256): 1 -> 0x2a
+// get(uint256): 2 -> 0x54
+// get(uint256): 21 -> 7
+// set(uint256,uint256): 1, 21 -> 0x2a
+// set(uint256,uint256): 2, 42 -> 0x54
+// set(uint256,uint256): 21, 14 -> 7
+// get(uint256): 0 -> 0
+// get(uint256): 1 -> 0x15
+// get(uint256): 2 -> 0x2a
+// get(uint256): 21 -> 14
diff --git a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
new file mode 100644
index 0000000000..dd2b2953fa
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
@@ -0,0 +1,75 @@
+library Lib {
+    function choose_mapping(mapping(uint => uint) storage a, mapping(uint => uint) storage b, bool c) internal pure returns(mapping(uint=>uint) storage)
+    {
+        return c ? a : b;
+    }
+}
+contract Test {
+    mapping(uint => uint) a;
+    mapping(uint => uint) b;
+    function set(bool choice, uint256 key, uint256 value) public returns (uint)
+    {
+        mapping(uint => uint) storage m = Lib.choose_mapping(a, b, choice);
+        uint oldValue = m[key];
+        m[key] = value;
+        return oldValue;
+    }
+    function get(bool choice, uint256 key) public view returns (uint) {
+        return Lib.choose_mapping(a, b, choice)[key];
+    }
+    function get_a(uint256 key) public view returns (uint) {
+        return a[key];
+    }
+    function get_b(uint256 key) public view returns (uint) {
+        return b[key];
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: Lib
+// set(bool,uint256,uint256): true, 1, 42 -> 0
+// set(bool,uint256,uint256): true, 2, 84 -> 0
+// set(bool,uint256,uint256): true, 21, 7 -> 0
+// set(bool,uint256,uint256): false, 1, 10 -> 0
+// set(bool,uint256,uint256): false, 2, 11 -> 0
+// set(bool,uint256,uint256): false, 21, 12 -> 0
+// get(bool,uint256): true, 0 -> 0
+// get(bool,uint256): true, 1 -> 0x2a
+// get(bool,uint256): true, 2 -> 0x54
+// get(bool,uint256): true, 21 -> 7
+// get_a(uint256): 0 -> 0
+// get_a(uint256): 1 -> 0x2a
+// get_a(uint256): 2 -> 0x54
+// get_a(uint256): 21 -> 7
+// get(bool,uint256): false, 0 -> 0
+// get(bool,uint256): false, 1 -> 10
+// get(bool,uint256): false, 2 -> 11
+// get(bool,uint256): false, 21 -> 12
+// get_b(uint256): 0 -> 0
+// get_b(uint256): 1 -> 10
+// get_b(uint256): 2 -> 11
+// get_b(uint256): 21 -> 12
+// set(bool,uint256,uint256): true, 1, 21 -> 0x2a
+// set(bool,uint256,uint256): true, 2, 42 -> 0x54
+// set(bool,uint256,uint256): true, 21, 14 -> 7
+// set(bool,uint256,uint256): false, 1, 30 -> 10
+// set(bool,uint256,uint256): false, 2, 31 -> 11
+// set(bool,uint256,uint256): false, 21, 32 -> 12
+// get_a(uint256): 0 -> 0
+// get_a(uint256): 1 -> 0x15
+// get_a(uint256): 2 -> 0x2a
+// get_a(uint256): 21 -> 14
+// get(bool,uint256): true, 0 -> 0
+// get(bool,uint256): true, 1 -> 0x15
+// get(bool,uint256): true, 2 -> 0x2a
+// get(bool,uint256): true, 21 -> 14
+// get_b(uint256): 0 -> 0
+// get_b(uint256): 1 -> 0x1e
+// get_b(uint256): 2 -> 0x1f
+// get_b(uint256): 21 -> 0x20
+// get(bool,uint256): false, 0 -> 0
+// get(bool,uint256): false, 1 -> 0x1e
+// get(bool,uint256): false, 2 -> 0x1f
+// get(bool,uint256): false, 21 -> 0x20
diff --git a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
new file mode 100644
index 0000000000..23f851279a
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
@@ -0,0 +1,31 @@
+library Lib {
+    function f(mapping(uint => uint) storage a, mapping(uint => uint) storage b) internal returns(mapping(uint=>uint) storage r)
+    {
+        r = a;
+        r[1] = 42;
+        r = b;
+        r[1] = 21;
+    }
+}
+contract Test {
+    mapping(uint => uint) a;
+    mapping(uint => uint) b;
+    function f() public returns (uint, uint, uint, uint, uint, uint)
+    {
+        Lib.f(a, b)[2] = 84;
+        return (a[0], a[1], a[2], b[0], b[1], b[2]);
+    }
+    function g() public returns (uint, uint, uint, uint, uint, uint)
+    {
+        mapping(uint => uint) storage m = Lib.f(a, b);
+        m[2] = 17;
+        return (a[0], a[1], a[2], b[0], b[1], b[2]);
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: Lib
+// f() -> 0, 0x2a, 0, 0, 0x15, 0x54
+// g() -> 0, 0x2a, 0, 0, 0x15, 0x11
diff --git a/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol b/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
new file mode 100644
index 0000000000..6b0488f06f
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
@@ -0,0 +1,14 @@
+library L {
+    function f() public returns (uint) { return 7; }
+}
+contract C {
+    function f() public payable returns (uint) {
+        return L.f();
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: L
+// f(): 27 -> 7
diff --git a/test/libsolidity/semanticTests/libraries/using_for_by_name.sol b/test/libsolidity/semanticTests/libraries/using_for_by_name.sol
new file mode 100644
index 0000000000..8a84c8aaac
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/using_for_by_name.sol
@@ -0,0 +1,16 @@
+library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
+contract C {
+    using D for D.s;
+    D.s public x;
+    function f(uint a) public returns (uint) {
+        x.a = 6;
+        return x.mul({x: a});
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: D
+// f(uint256): 7 -> 0x2a
+// x() -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/using_for_overload.sol b/test/libsolidity/semanticTests/libraries/using_for_overload.sol
new file mode 100644
index 0000000000..54cfe0ce10
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/using_for_overload.sol
@@ -0,0 +1,20 @@
+library D {
+    struct s { uint a; }
+    function mul(s storage self, uint x) public returns (uint) { return self.a *= x; }
+    function mul(s storage self, bytes32 x) public returns (bytes32) { }
+}
+contract C {
+    using D for D.s;
+    D.s public x;
+    function f(uint a) public returns (uint) {
+        x.a = 6;
+        return x.mul(a);
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: D
+// f(uint256): 7 -> 0x2a
+// x() -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
new file mode 100644
index 0000000000..d85f906949
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -0,0 +1,27 @@
+library Lib {
+    function set(mapping(uint => uint) storage m, uint key, uint value) public
+    {
+        m[key] = value;
+    }
+}
+contract Test {
+    mapping(uint => uint) m1;
+    mapping(uint => uint) m2;
+    function f() public returns (uint, uint, uint, uint, uint, uint)
+    {
+        Lib.set(m1, 0, 1);
+        Lib.set(m1, 2, 42);
+        Lib.set(m2, 0, 23);
+        Lib.set(m2, 2, 99);
+        return (m1[0], m1[1], m1[2], m2[0], m2[1], m2[2]);
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: Lib
+// f() -> 1, 0, 0x2a, 0x17, 0, 0x63
+// gas irOptimized: 119757
+// gas legacy: 124793
+// gas legacyOptimized: 119694
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
new file mode 100644
index 0000000000..9192fdfe31
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
@@ -0,0 +1,25 @@
+library Lib {
+    function choose(mapping(uint => mapping(uint => uint)) storage m, uint key) external returns (mapping(uint => uint) storage) {
+        return m[key];
+    }
+}
+contract Test {
+    mapping(uint => mapping(uint => uint)) m;
+    function f() public returns (uint, uint, uint, uint, uint, uint)
+    {
+        Lib.choose(m, 0)[0] = 1;
+        Lib.choose(m, 0)[2] = 42;
+        Lib.choose(m, 1)[0] = 23;
+        Lib.choose(m, 1)[2] = 99;
+        return (m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2]);
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: Lib
+// f() -> 1, 0, 0x2a, 0x17, 0, 0x63
+// gas irOptimized: 120471
+// gas legacy: 125245
+// gas legacyOptimized: 120153
diff --git a/test/libsolidity/semanticTests/libraries/using_library_structs.sol b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
new file mode 100644
index 0000000000..4348c377c7
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
@@ -0,0 +1,27 @@
+library Lib {
+    struct Data { uint a; uint[] b; }
+    function set(Data storage _s) public
+    {
+        _s.a = 7;
+        while (_s.b.length < 20)
+            _s.b.push();
+        _s.b[19] = 8;
+    }
+}
+contract Test {
+    mapping(string => Lib.Data) data;
+    function f() public returns (uint a, uint b)
+    {
+        Lib.set(data["abc"]);
+        a = data["abc"].a;
+        b = data["abc"].b[19];
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: Lib
+// f() -> 7, 8
+// gas irOptimized: 101869
+// gas legacy: 101504
diff --git a/test/libsolidity/semanticTests/structs/struct_referencing.sol b/test/libsolidity/semanticTests/structs/struct_referencing.sol
new file mode 100644
index 0000000000..af2357a23e
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/struct_referencing.sol
@@ -0,0 +1,61 @@
+pragma abicoder v2;
+interface I {
+    struct S { uint a; }
+}
+
+library L {
+    struct S { uint b; uint a; }
+    function f() public pure returns (S memory) {
+        S memory s;
+        s.a = 3;
+        return s;
+    }
+    function g() public pure returns (I.S memory) {
+        I.S memory s;
+        s.a = 4;
+        return s;
+    }
+    // argument-dependant lookup tests
+    function a(I.S memory) public pure returns (uint) { return 1; }
+    function a(S memory) public pure returns (uint) { return 2; }
+}
+
+contract C is I {
+    function f() public pure returns (S memory) {
+        S memory s;
+        s.a = 1;
+        return s;
+    }
+    function g() public pure returns (I.S memory) {
+        I.S memory s;
+        s.a = 2;
+        return s;
+    }
+    function h() public pure returns (L.S memory) {
+        L.S memory s;
+        s.a = 5;
+        return s;
+    }
+    function x() public pure returns (L.S memory) {
+        return L.f();
+    }
+    function y() public pure returns (I.S memory) {
+        return L.g();
+    }
+    function a1() public pure returns (uint) { S memory s; return L.a(s); }
+    function a2() public pure returns (uint) { L.S memory s; return L.a(s); }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: L
+// f() -> 1
+// g() -> 2
+// f() -> 1
+// g() -> 2
+// h() -> 0, 5
+// x() -> 0, 3
+// y() -> 4
+// a1() -> 1
+// a2() -> 2
diff --git a/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol b/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol
new file mode 100644
index 0000000000..347aeb5951
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol
@@ -0,0 +1,16 @@
+library D { struct s { uint a; } function mul(s storage self, uint x) public returns (uint) { return self.a *= x; } }
+contract C {
+    using D for D.s;
+    D.s public x;
+    function f(uint a) public returns (uint) {
+        x.a = 3;
+        return x.mul(a);
+    }
+}
+// ====
+// compileToEwasm: false
+// compileViaYul: also
+// ----
+// library: D
+// f(uint256): 7 -> 0x15
+// x() -> 0x15

From 7cc7a0f1839c95607c8e2eb4a80bb5a8d82229fd Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Mon, 6 Dec 2021 18:01:27 +0530
Subject: [PATCH 0205/1748] Added sameType check for fromType and toType in
 YulUtilFunctions.cpp and relevant tests in semanticTests

---
 ...on_external_storage_to_storage_dynamic.sol | 46 +++++++++++-------
 ...o_storage_dynamic_different_mutability.sol | 48 ++++++++++++-------
 2 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
index 543342dfde..8bd9ee42c2 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
@@ -4,12 +4,27 @@ contract C {
     function testFunction3() public {}
 
 
-    function() external [3] externalArray0;
-    function() external [3] externalArray1 = [
-        this.testFunction1,
-        this.testFunction2,
-        this.testFunction3
-    ];
+    function() external [] externalArray0;
+    function() external [] externalArray1;
+
+    function() internal [] internalArray0;
+    function() internal [] internalArray1;
+
+    constructor() {
+        externalArray0 = new function() external[] (3);
+        externalArray1 = [
+            this.testFunction1,
+            this.testFunction2,
+            this.testFunction3
+        ];
+
+        internalArray0 = new function() internal[] (3);
+        internalArray1 = [
+            testFunction1,
+            testFunction2,
+            testFunction3
+        ];
+    }
 
     function copyExternalStorageArrayOfFunctionType() external returns (bool) {
         assert(keccak256(abi.encode(externalArray0)) != keccak256(abi.encode(externalArray1)));
@@ -17,27 +32,22 @@ contract C {
         return keccak256(abi.encode(externalArray0)) == keccak256(abi.encode(externalArray1));
     }
 
-    function() internal [3] internalArray0;
-    function() internal [3] internalArray1 = [
-        testFunction1,
-        testFunction2,
-        testFunction3
-    ];
-
     function copyInternalArrayOfFunctionType() external returns (bool) {
         internalArray0 = internalArray1;
         assert(internalArray0.length == 3);
 
         return
-        internalArray0.length == internalArray1.length &&
-        internalArray0[0] == internalArray1[0] &&
-        internalArray0[1] == internalArray1[1] &&
-        internalArray0[2] == internalArray1[2];
+            internalArray0.length == internalArray1.length &&
+            internalArray0[0] == internalArray1[0] &&
+            internalArray0[1] == internalArray1[1] &&
+            internalArray0[2] == internalArray1[2];
     }
 }
 // ====
 // compileViaYul: also
 // ----
 // copyExternalStorageArrayOfFunctionType() -> true
-// gas legacy: 103412
+// gas irOptimized: 104701
+// gas legacy: 108725
+// gas legacyOptimized: 102441
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
index 0e356bce65..63236ed774 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -3,12 +3,29 @@ contract C {
     function testFunction2() public view {}
     function testFunction3() public pure {}
 
-    function() external [3] externalArray0;
-    function() external [3] externalArray1 = [
-        this.testFunction1,
-        this.testFunction2,
-        this.testFunction3
-    ];
+
+    function() external [] externalArray0;
+    function() external [] externalArray1;
+
+    function() internal [] internalArray0;
+    function() internal [] internalArray1;
+
+    constructor() {
+        externalArray0 = new function() external[] (3);
+        externalArray1 = [
+            this.testFunction1,
+            this.testFunction2,
+            this.testFunction3
+        ];
+
+        internalArray0 = new function() internal[] (3);
+        internalArray1 = [
+            testFunction1,
+            testFunction2,
+            testFunction3
+        ];
+    }
+
 
     function copyExternalStorageArraysOfFunctionType() external returns (bool)
     {
@@ -17,29 +34,24 @@ contract C {
         return keccak256(abi.encodePacked(externalArray0)) == keccak256(abi.encodePacked(externalArray1));
     }
 
-    function() internal [3] internalArray0;
-    function() internal [3] internalArray1 = [
-        testFunction1,
-        testFunction2,
-        testFunction3
-    ];
-
     function copyInternalArrayOfFunctionType() external returns (bool)
     {
         internalArray0 = internalArray1;
         assert(internalArray0.length == 3);
 
         return
-        internalArray0.length == internalArray1.length &&
-        internalArray0[0] == internalArray1[0] &&
-        internalArray0[1] == internalArray1[1] &&
-        internalArray0[2] == internalArray1[2];
+            internalArray0.length == internalArray1.length &&
+            internalArray0[0] == internalArray1[0] &&
+            internalArray0[1] == internalArray1[1] &&
+            internalArray0[2] == internalArray1[2];
     }
 }
 // ====
 // compileViaYul: also
 // ----
 // copyExternalStorageArraysOfFunctionType() -> true
-// gas legacy: 103398
+// gas irOptimized: 104372
+// gas legacy: 108462
+// gas legacyOptimized: 102174
 // copyInternalArrayOfFunctionType() -> true
 // gas legacy: 104178

From 7a96953e78cc2083db182db1628ad68da785d03c Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 11 Nov 2021 16:21:23 +0100
Subject: [PATCH 0206/1748] Implement typechecked abi.encodeCall()

---
 Changelog.md                                  |   1 +
 docs/cheatsheet.rst                           |   2 +
 docs/units-and-global-variables.rst           |   1 +
 libsolidity/analysis/TypeChecker.cpp          | 113 ++++++++++++++++++
 libsolidity/analysis/TypeChecker.h            |   3 +
 libsolidity/analysis/ViewPureChecker.cpp      |   1 +
 libsolidity/ast/Types.cpp                     |  11 ++
 libsolidity/ast/Types.h                       |   1 +
 libsolidity/codegen/ExpressionCompiler.cpp    |  56 ++++++---
 .../codegen/ir/IRGeneratorForStatements.cpp   |  48 ++++++--
 libsolidity/formal/SMTEncoder.cpp             |   2 +
 libsolidity/formal/SymbolicState.cpp          |   9 ++
 .../abiencodedecode/abi_encode_call.sol       |  51 ++++++++
 .../abi_encode_call_is_consistent.sol         |  63 ++++++++++
 .../abi_encode_call_memory.sol                |  28 +++++
 .../abi_encode_call_special_args.sol          |  48 ++++++++
 .../abi_encode_with_signaturev2.sol           |   1 -
 .../abi/abi_encode_call_simple.sol            |  26 ++++
 .../specialFunctions/encodeCall.sol           |  82 +++++++++++++
 .../encodeCall_nested_tuple.sol               |   9 ++
 .../encodeCall_tuple_incomplete.sol           |   8 ++
 21 files changed, 538 insertions(+), 26 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
 create mode 100644 test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
 create mode 100644 test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
 create mode 100644 test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
 create mode 100644 test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol

diff --git a/Changelog.md b/Changelog.md
index c4b67e935b..577bc40643 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.11 (unreleased)
 
 Language Features:
+ * General: New builtin function ``abi.encodeCall(functionPointer, (arg1, arg2, ...))`` that type-checks the arguments and returns the ABI-encoded function call data.
 
 
 Compiler Features:
diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index 17537914ac..1aa8f24ef3 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -80,6 +80,8 @@ Global Variables
   the given arguments. Note that this encoding can be ambiguous!
 - ``abi.encodeWithSelector(bytes4 selector, ...) returns (bytes memory)``: :ref:`ABI <ABI>`-encodes
   the given arguments starting from the second and prepends the given four-byte selector
+- ``abi.encodeCall(function functionPointer, (...)) returns (bytes memory)``: ABI-encodes a call to ``functionPointer`` with the arguments found in the
+  tuple. Performs a full type-check, ensuring the types match the function signature. Result equals ``abi.encodeWithSelector(functionPointer.selector, (...))``
 - ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``: Equivalent
   to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature)), ...)``
 - ``bytes.concat(...) returns (bytes memory)``: :ref:`Concatenates variable number of
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index ac11e08067..70125636c2 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -136,6 +136,7 @@ ABI Encoding and Decoding Functions
 - ``abi.encodePacked(...) returns (bytes memory)``: Performs :ref:`packed encoding <abi_packed_mode>` of the given arguments. Note that packed encoding can be ambiguous!
 - ``abi.encodeWithSelector(bytes4 selector, ...) returns (bytes memory)``: ABI-encodes the given arguments starting from the second and prepends the given four-byte selector
 - ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``: Equivalent to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature))), ...)``
+- ``abi.encodeCall(function functionPointer, (...)) returns (bytes memory)``: ABI-encodes a call to ``functionPointer`` with the arguments found in the tuple. Performs a full type-check, ensuring the types match the function signature. Result equals ``abi.encodeWithSelector(functionPointer.selector, (...))``
 
 .. note::
     These encoding functions can be used to craft data for external function calls without actually
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 5cc208d698..aacd233a2a 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1996,6 +1996,7 @@ void TypeChecker::typeCheckABIEncodeFunctions(
 		_functionType->kind() == FunctionType::Kind::ABIEncode ||
 		_functionType->kind() == FunctionType::Kind::ABIEncodePacked ||
 		_functionType->kind() == FunctionType::Kind::ABIEncodeWithSelector ||
+		_functionType->kind() == FunctionType::Kind::ABIEncodeCall ||
 		_functionType->kind() == FunctionType::Kind::ABIEncodeWithSignature,
 		"ABI function has unexpected FunctionType::Kind."
 	);
@@ -2020,6 +2021,13 @@ void TypeChecker::typeCheckABIEncodeFunctions(
 	// Perform standard function call type checking
 	typeCheckFunctionGeneralChecks(_functionCall, _functionType);
 
+	// No further generic checks needed as we do a precise check for ABIEncodeCall
+	if (_functionType->kind() == FunctionType::Kind::ABIEncodeCall)
+	{
+		typeCheckABIEncodeCallFunction(_functionCall);
+		return;
+	}
+
 	// Check additional arguments for variadic functions
 	vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
 	for (size_t i = 0; i < arguments.size(); ++i)
@@ -2078,6 +2086,110 @@ void TypeChecker::typeCheckABIEncodeFunctions(
 	}
 }
 
+void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCall)
+{
+	vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
+
+	// Expecting first argument to be the function pointer and second to be a tuple.
+	if (arguments.size() != 2)
+	{
+		m_errorReporter.typeError(
+			6219_error,
+			_functionCall.location(),
+			"Expected two arguments: a function pointer followed by a tuple."
+		);
+		return;
+	}
+
+	auto const functionPointerType = dynamic_cast<FunctionTypePointer>(type(*arguments.front()));
+
+	if (!functionPointerType)
+	{
+		m_errorReporter.typeError(
+			5511_error,
+			arguments.front()->location(),
+			"Expected first argument to be a function pointer, not \"" +
+			type(*arguments.front())->canonicalName() +
+			"\"."
+		);
+		return;
+	}
+
+	if (functionPointerType->kind() != FunctionType::Kind::External)
+	{
+		string msg = "Function must be \"public\" or \"external\".";
+		SecondarySourceLocation ssl{};
+
+		if (functionPointerType->hasDeclaration())
+		{
+			ssl.append("Function is declared here:", functionPointerType->declaration().location());
+			if (functionPointerType->declaration().scope() == m_currentContract)
+				msg += " Did you forget to prefix \"this.\"?";
+		}
+
+		m_errorReporter.typeError(3509_error, arguments[0]->location(), ssl, msg);
+		return;
+	}
+
+	solAssert(!functionPointerType->takesArbitraryParameters(), "Function must have fixed parameters.");
+
+	// Tuples with only one component become that component
+	vector<ASTPointer<Expression const>> callArguments;
+
+	auto const* tupleType = dynamic_cast<TupleType const*>(type(*arguments[1]));
+	if (tupleType)
+	{
+		auto const& argumentTuple = dynamic_cast<TupleExpression const&>(*arguments[1].get());
+		callArguments = decltype(callArguments){argumentTuple.components().begin(), argumentTuple.components().end()};
+	}
+	else
+		callArguments.push_back(arguments[1]);
+
+	if (functionPointerType->parameterTypes().size() != callArguments.size())
+	{
+		if (tupleType)
+			m_errorReporter.typeError(
+				7788_error,
+				_functionCall.location(),
+				"Expected " +
+				to_string(functionPointerType->parameterTypes().size()) +
+				" instead of " +
+				to_string(callArguments.size()) +
+				" components for the tuple parameter."
+			);
+		else
+			m_errorReporter.typeError(
+				7515_error,
+				_functionCall.location(),
+				"Expected a tuple with " +
+				to_string(functionPointerType->parameterTypes().size()) +
+				" components instead of a single non-tuple parameter."
+			);
+	}
+
+	// Use min() to check as much as we can before failing fatally
+	size_t const numParameters = min(callArguments.size(), functionPointerType->parameterTypes().size());
+
+	for (size_t i = 0; i < numParameters; i++)
+	{
+		Type const& argType = *type(*callArguments[i]);
+		BoolResult result = argType.isImplicitlyConvertibleTo(*functionPointerType->parameterTypes()[i]);
+		if (!result)
+			m_errorReporter.typeError(
+				5407_error,
+				callArguments[i]->location(),
+				"Cannot implicitly convert component at position " +
+				to_string(i) +
+				" from \"" +
+				argType.canonicalName() +
+				"\" to \"" +
+				functionPointerType->parameterTypes()[i]->canonicalName() +
+				"\"" +
+				(result.message().empty() ?  "." : ": " + result.message())
+			);
+	}
+}
+
 void TypeChecker::typeCheckBytesConcatFunction(
 	FunctionCall const& _functionCall,
 	FunctionType const* _functionType
@@ -2507,6 +2619,7 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
 		case FunctionType::Kind::ABIEncodePacked:
 		case FunctionType::Kind::ABIEncodeWithSelector:
 		case FunctionType::Kind::ABIEncodeWithSignature:
+		case FunctionType::Kind::ABIEncodeCall:
 		{
 			typeCheckABIEncodeFunctions(_functionCall, functionType);
 			returnTypes = functionType->returnParameterTypes();
diff --git a/libsolidity/analysis/TypeChecker.h b/libsolidity/analysis/TypeChecker.h
index ba445ffbb0..7586f9d151 100644
--- a/libsolidity/analysis/TypeChecker.h
+++ b/libsolidity/analysis/TypeChecker.h
@@ -110,6 +110,9 @@ class TypeChecker: private ASTConstVisitor
 		FunctionTypePointer _functionType
 	);
 
+	/// Performs checks specific to the ABI encode functions of type ABIEncodeCall
+	void typeCheckABIEncodeCallFunction(FunctionCall const& _functionCall);
+
 	/// Performs general checks and checks specific to bytes concat function call
 	void typeCheckBytesConcatFunction(
 		FunctionCall const& _functionCall,
diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp
index 81f755cec0..252210a129 100644
--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ b/libsolidity/analysis/ViewPureChecker.cpp
@@ -367,6 +367,7 @@ void ViewPureChecker::endVisit(MemberAccess const& _memberAccess)
 			{MagicType::Kind::ABI, "encode"},
 			{MagicType::Kind::ABI, "encodePacked"},
 			{MagicType::Kind::ABI, "encodeWithSelector"},
+			{MagicType::Kind::ABI, "encodeCall"},
 			{MagicType::Kind::ABI, "encodeWithSignature"},
 			{MagicType::Kind::Message, "data"},
 			{MagicType::Kind::Message, "sig"},
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index fe0ac8ef86..aa1d5820f0 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -2935,6 +2935,7 @@ string FunctionType::richIdentifier() const
 	case Kind::ABIEncode: id += "abiencode"; break;
 	case Kind::ABIEncodePacked: id += "abiencodepacked"; break;
 	case Kind::ABIEncodeWithSelector: id += "abiencodewithselector"; break;
+	case Kind::ABIEncodeCall: id += "abiencodecall"; break;
 	case Kind::ABIEncodeWithSignature: id += "abiencodewithsignature"; break;
 	case Kind::ABIDecode: id += "abidecode"; break;
 	case Kind::MetaType: id += "metatype"; break;
@@ -3499,6 +3500,7 @@ bool FunctionType::isPure() const
 		m_kind == Kind::ABIEncode ||
 		m_kind == Kind::ABIEncodePacked ||
 		m_kind == Kind::ABIEncodeWithSelector ||
+		m_kind == Kind::ABIEncodeCall ||
 		m_kind == Kind::ABIEncodeWithSignature ||
 		m_kind == Kind::ABIDecode ||
 		m_kind == Kind::MetaType ||
@@ -4001,6 +4003,15 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 				true,
 				StateMutability::Pure
 			)},
+			{"encodeCall", TypeProvider::function(
+				TypePointers{},
+				TypePointers{TypeProvider::array(DataLocation::Memory)},
+				strings{},
+				strings{1, ""},
+				FunctionType::Kind::ABIEncodeCall,
+				true,
+				StateMutability::Pure
+			)},
 			{"encodeWithSignature", TypeProvider::function(
 				TypePointers{TypeProvider::array(DataLocation::Memory, true)},
 				TypePointers{TypeProvider::array(DataLocation::Memory)},
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index b08694820b..8b3826ca06 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1237,6 +1237,7 @@ class FunctionType: public Type
 		ABIEncode,
 		ABIEncodePacked,
 		ABIEncodeWithSelector,
+		ABIEncodeCall,
 		ABIEncodeWithSignature,
 		ABIDecode,
 		GasLeft, ///< gasleft()
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 07d37c4c58..5a633d2e66 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1236,28 +1236,47 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 		case FunctionType::Kind::ABIEncode:
 		case FunctionType::Kind::ABIEncodePacked:
 		case FunctionType::Kind::ABIEncodeWithSelector:
+		case FunctionType::Kind::ABIEncodeCall:
 		case FunctionType::Kind::ABIEncodeWithSignature:
 		{
 			bool const isPacked = function.kind() == FunctionType::Kind::ABIEncodePacked;
 			bool const hasSelectorOrSignature =
 				function.kind() == FunctionType::Kind::ABIEncodeWithSelector ||
+				function.kind() == FunctionType::Kind::ABIEncodeCall ||
 				function.kind() == FunctionType::Kind::ABIEncodeWithSignature;
 
 			TypePointers argumentTypes;
-			TypePointers targetTypes;
-			for (unsigned i = 0; i < arguments.size(); ++i)
+
+			ASTNode::listAccept(arguments, *this);
+
+			if (function.kind() == FunctionType::Kind::ABIEncodeCall)
 			{
-				arguments[i]->accept(*this);
-				// Do not keep the selector as part of the ABI encoded args
-				if (!hasSelectorOrSignature || i > 0)
-					argumentTypes.push_back(arguments[i]->annotation().type);
+				solAssert(arguments.size() == 2);
+
+				auto const functionPtr = dynamic_cast<FunctionTypePointer>(arguments[0]->annotation().type);
+				solAssert(functionPtr);
+				solAssert(functionPtr->sizeOnStack() == 2);
+
+				// Account for tuples with one component which become that component
+				if (auto const tupleType = dynamic_cast<TupleType const*>(arguments[1]->annotation().type))
+					argumentTypes = tupleType->components();
+				else
+					argumentTypes.emplace_back(arguments[1]->annotation().type);
 			}
+			else
+				for (unsigned i = 0; i < arguments.size(); ++i)
+				{
+					// Do not keep the selector as part of the ABI encoded args
+					if (!hasSelectorOrSignature || i > 0)
+						argumentTypes.push_back(arguments[i]->annotation().type);
+				}
+
 			utils().fetchFreeMemoryPointer();
-			// stack now: [<selector>] <arg1> .. <argN> <free_mem>
+			// stack now: [<selector/functionPointer/signature>] <arg1> .. <argN> <free_mem>
 
 			// adjust by 32(+4) bytes to accommodate the length(+selector)
 			m_context << u256(32 + (hasSelectorOrSignature ? 4 : 0)) << Instruction::ADD;
-			// stack now: [<selector>] <arg1> .. <argN> <data_encoding_area_start>
+			// stack now: [<selector/functionPointer/signature>] <arg1> .. <argN> <data_encoding_area_start>
 
 			if (isPacked)
 			{
@@ -1270,7 +1289,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				utils().abiEncode(argumentTypes, TypePointers());
 			}
 			utils().fetchFreeMemoryPointer();
-			// stack: [<selector>] <data_encoding_area_end> <bytes_memory_ptr>
+			// stack: [<selector/functionPointer/signature>] <data_encoding_area_end> <bytes_memory_ptr>
 
 			// size is end minus start minus length slot
 			m_context.appendInlineAssembly(R"({
@@ -1278,16 +1297,17 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 			})", {"mem_end", "mem_ptr"});
 			m_context << Instruction::SWAP1;
 			utils().storeFreeMemoryPointer();
-			// stack: [<selector>] <memory ptr>
+			// stack: [<selector/functionPointer/signature>] <memory ptr>
 
 			if (hasSelectorOrSignature)
 			{
-				// stack: <selector> <memory pointer>
+				// stack: <selector/functionPointer/signature> <memory pointer>
 				solAssert(arguments.size() >= 1, "");
 				Type const* selectorType = arguments[0]->annotation().type;
 				utils().moveIntoStack(selectorType->sizeOnStack());
 				Type const* dataOnStack = selectorType;
-				// stack: <memory pointer> <selector>
+
+				// stack: <memory pointer> <selector/functionPointer/signature>
 				if (function.kind() == FunctionType::Kind::ABIEncodeWithSignature)
 				{
 					// hash the signature
@@ -1299,7 +1319,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 					else
 					{
 						utils().fetchFreeMemoryPointer();
-						// stack: <memory pointer> <selector> <free mem ptr>
+						// stack: <memory pointer> <signature> <free mem ptr>
 						utils().packedEncode(TypePointers{selectorType}, TypePointers());
 						utils().toSizeAfterFreeMemoryPointer();
 						m_context << Instruction::KECCAK256;
@@ -1308,10 +1328,16 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 						dataOnStack = TypeProvider::fixedBytes(32);
 					}
 				}
-				else
+				else if (function.kind() == FunctionType::Kind::ABIEncodeCall)
 				{
-					solAssert(function.kind() == FunctionType::Kind::ABIEncodeWithSelector, "");
+					// stack: <memory pointer> <functionPointer>
+					// Extract selector from the stack
+					m_context << Instruction::SWAP1 << Instruction::POP;
+					// Conversion will be done below
+					dataOnStack = TypeProvider::uint(32);
 				}
+				else
+					solAssert(function.kind() == FunctionType::Kind::ABIEncodeWithSelector, "");
 
 				utils().convertType(*dataOnStack, FixedBytesType(4), true);
 
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 85b21bbdcd..179b3e739b 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1104,29 +1104,57 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::ABIEncode:
 	case FunctionType::Kind::ABIEncodePacked:
 	case FunctionType::Kind::ABIEncodeWithSelector:
+	case FunctionType::Kind::ABIEncodeCall:
 	case FunctionType::Kind::ABIEncodeWithSignature:
 	{
 		bool const isPacked = functionType->kind() == FunctionType::Kind::ABIEncodePacked;
 		solAssert(functionType->padArguments() != isPacked, "");
 		bool const hasSelectorOrSignature =
 			functionType->kind() == FunctionType::Kind::ABIEncodeWithSelector ||
+			functionType->kind() == FunctionType::Kind::ABIEncodeCall ||
 			functionType->kind() == FunctionType::Kind::ABIEncodeWithSignature;
 
 		TypePointers argumentTypes;
 		TypePointers targetTypes;
 		vector<string> argumentVars;
-		for (size_t i = 0; i < arguments.size(); ++i)
+		string selector;
+		vector<ASTPointer<Expression const>> argumentsOfEncodeFunction;
+
+		if (functionType->kind() == FunctionType::Kind::ABIEncodeCall)
 		{
-			// ignore selector
-			if (hasSelectorOrSignature && i == 0)
-				continue;
-			argumentTypes.emplace_back(&type(*arguments[i]));
-			targetTypes.emplace_back(type(*arguments[i]).fullEncodingType(false, true, isPacked));
-			argumentVars += IRVariable(*arguments[i]).stackSlots();
+			solAssert(arguments.size() == 2, "");
+			// Account for tuples with one component which become that component
+			if (type(*arguments[1]).category() == Type::Category::Tuple)
+			{
+				auto const& tupleExpression = dynamic_cast<TupleExpression const&>(*arguments[1]);
+				for (auto component: tupleExpression.components())
+					argumentsOfEncodeFunction.push_back(component);
+			}
+			else
+				argumentsOfEncodeFunction.push_back(arguments[1]);
 		}
+		else
+			for (size_t i = 0; i < arguments.size(); ++i)
+			{
+				// ignore selector
+				if (hasSelectorOrSignature && i == 0)
+					continue;
+				argumentsOfEncodeFunction.push_back(arguments[i]);
+			}
 
-		string selector;
-		if (functionType->kind() == FunctionType::Kind::ABIEncodeWithSignature)
+		for (auto const& argument: argumentsOfEncodeFunction)
+		{
+			argumentTypes.emplace_back(&type(*argument));
+			targetTypes.emplace_back(type(*argument).fullEncodingType(false, true, isPacked));
+			argumentVars += IRVariable(*argument).stackSlots();
+		}
+
+		if (functionType->kind() == FunctionType::Kind::ABIEncodeCall)
+			selector = convert(
+				IRVariable(*arguments[0]).part("functionSelector"),
+				*TypeProvider::fixedBytes(4)
+			).name();
+		else if (functionType->kind() == FunctionType::Kind::ABIEncodeWithSignature)
 		{
 			// hash the signature
 			Type const& selectorType = type(*arguments.front());
@@ -1833,7 +1861,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 
 			define(_memberAccess) << requestedValue << "\n";
 		}
-		else if (set<string>{"encode", "encodePacked", "encodeWithSelector", "encodeWithSignature", "decode"}.count(member))
+		else if (set<string>{"encode", "encodePacked", "encodeWithSelector", "encodeCall", "encodeWithSignature", "decode"}.count(member))
 		{
 			// no-op
 		}
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 8326b6b2f8..68545f4f6b 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -637,6 +637,7 @@ void SMTEncoder::endVisit(FunctionCall const& _funCall)
 	case FunctionType::Kind::ABIEncode:
 	case FunctionType::Kind::ABIEncodePacked:
 	case FunctionType::Kind::ABIEncodeWithSelector:
+	case FunctionType::Kind::ABIEncodeCall:
 	case FunctionType::Kind::ABIEncodeWithSignature:
 		visitABIFunction(_funCall);
 		break;
@@ -3041,6 +3042,7 @@ set<FunctionCall const*> SMTEncoder::collectABICalls(ASTNode const* _node)
 				case FunctionType::Kind::ABIEncode:
 				case FunctionType::Kind::ABIEncodePacked:
 				case FunctionType::Kind::ABIEncodeWithSelector:
+				case FunctionType::Kind::ABIEncodeCall:
 				case FunctionType::Kind::ABIEncodeWithSignature:
 				case FunctionType::Kind::ABIDecode:
 					abiCalls.insert(&_funCall);
diff --git a/libsolidity/formal/SymbolicState.cpp b/libsolidity/formal/SymbolicState.cpp
index e136f347db..6612723d06 100644
--- a/libsolidity/formal/SymbolicState.cpp
+++ b/libsolidity/formal/SymbolicState.cpp
@@ -236,6 +236,15 @@ void SymbolicState::buildABIFunctions(set<FunctionCall const*> const& _abiFuncti
 			else
 				solAssert(false, "Unexpected argument of abi.decode");
 		}
+		else if (t->kind() == FunctionType::Kind::ABIEncodeCall)
+		{
+			// abi.encodeCall : (functionPointer, tuple_of_args_or_one_non_tuple_arg(arguments)) -> bytes
+			solAssert(args.size() == 2, "Unexpected number of arguments for abi.encodeCall");
+
+			outTypes.emplace_back(TypeProvider::bytesMemory());
+			inTypes.emplace_back(args.at(0)->annotation().type);
+			inTypes.emplace_back(args.at(1)->annotation().type);
+		}
 		else
 		{
 			outTypes = returnTypes;
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
new file mode 100644
index 0000000000..dc6ead60b2
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
@@ -0,0 +1,51 @@
+pragma abicoder v2;
+contract C {
+	type UnsignedNumber is uint256;
+	enum Enum { First, Second, Third }
+
+	struct Struct {
+		UnsignedNumber[] dynamicArray;
+		uint256 justAnInt;
+		string name;
+		bytes someBytes;
+		Enum theEnum;
+	}
+
+	function callMeMaybe(Struct calldata _data, int256 _intVal, string memory _nameVal) external pure {
+		assert(_data.dynamicArray.length == 3);
+		assert(UnsignedNumber.unwrap(_data.dynamicArray[0]) == 0);
+		assert(UnsignedNumber.unwrap(_data.dynamicArray[1]) == 1);
+		assert(UnsignedNumber.unwrap(_data.dynamicArray[2]) == 2);
+		assert(_data.justAnInt == 6);
+		assert(keccak256(bytes(_data.name)) == keccak256("StructName"));
+		assert(keccak256(_data.someBytes) == keccak256(bytes("1234")));
+		assert(_data.theEnum == Enum.Second);
+		assert(_intVal == 5);
+		assert(keccak256(bytes(_nameVal)) == keccak256("TestName"));
+	}
+
+	function callExternal() public returns (bool) {
+		Struct memory structToSend;
+		structToSend.dynamicArray = new UnsignedNumber[](3);
+		structToSend.dynamicArray[0] = UnsignedNumber.wrap(0);
+		structToSend.dynamicArray[1] = UnsignedNumber.wrap(1);
+		structToSend.dynamicArray[2] = UnsignedNumber.wrap(2);
+		structToSend.justAnInt = 6;
+		structToSend.name = "StructName";
+		structToSend.someBytes = bytes("1234");
+		structToSend.theEnum = Enum.Second;
+
+		(bool success,) = address(this).call(abi.encodeCall(this.callMeMaybe, (
+			structToSend,
+			5,
+			"TestName"
+		)));
+
+		return success;
+	}
+}
+
+// ====
+// compileViaYul: also
+// ----
+// callExternal() -> true
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
new file mode 100644
index 0000000000..3c053e38a4
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
@@ -0,0 +1,63 @@
+pragma abicoder v2;
+
+contract C {
+	bool sideEffectRan = false;
+
+	function(uint256, string memory) external fPointer;
+	function fExternal(uint256 p, string memory t) external {}
+	string xstor;
+	function getExternalFunctionPointer() public returns (function(uint256, string memory) external) {
+		sideEffectRan = true;
+		return this.fExternal;
+	}
+
+	function fSignatureFromLiteral() public pure returns (bytes memory) {
+		return abi.encodeWithSignature("fExternal(uint256,string)", 1, "123");
+	}
+	function fSignatureFromLiteralCall() public view returns (bytes memory) {
+		return abi.encodeCall(this.fExternal, (1, "123"));
+	}
+	function fSignatureFromMemory() public pure returns (bytes memory) {
+		string memory x = "fExternal(uint256,string)";
+		return abi.encodeWithSignature(x, 1, "123");
+	}
+	function fSignatureFromMemoryCall() public view returns (bytes memory) {
+		return abi.encodeCall(this.fExternal, (1,"123"));
+	}
+	function fSignatureFromMemorys() public returns (bytes memory) {
+		xstor = "fExternal(uint256,string)";
+		return abi.encodeWithSignature(xstor, 1, "123");
+	}
+	function fPointerCall() public returns(bytes memory) {
+		fPointer = this.fExternal;
+		return abi.encodeCall(fPointer, (1, "123"));
+	}
+	function fLocalPointerCall() public returns(bytes memory) {
+		function(uint256, string memory) external localFunctionPointer = this.fExternal;
+		return abi.encodeCall(localFunctionPointer, (1, "123"));
+	}
+	function fReturnedFunctionPointer() public returns (bytes memory) {
+		return abi.encodeCall(getExternalFunctionPointer(), (1, "123"));
+	}
+
+	function assertConsistentSelectors() public {
+		assert(keccak256(fSignatureFromLiteral()) == keccak256(fSignatureFromLiteralCall()));
+		assert(keccak256(fSignatureFromMemory()) == keccak256(fSignatureFromMemoryCall()));
+		assert(keccak256(fSignatureFromMemoryCall()) == keccak256(fSignatureFromMemorys()));
+		assert(keccak256(fPointerCall()) == keccak256(fSignatureFromLiteral()));
+		assert(keccak256(fLocalPointerCall()) == keccak256(fSignatureFromLiteral()));
+		assert(keccak256(fReturnedFunctionPointer()) == keccak256(fSignatureFromLiteral()));
+	}
+}
+// ====
+// compileViaYul: also
+// ----
+// assertConsistentSelectors() ->
+// fSignatureFromLiteral() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
+// fSignatureFromLiteralCall() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
+// fSignatureFromMemory() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
+// fSignatureFromMemoryCall() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
+// fSignatureFromMemorys() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
+// fPointerCall() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
+// fLocalPointerCall() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
+// fReturnedFunctionPointer() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
new file mode 100644
index 0000000000..781a6684f4
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
@@ -0,0 +1,28 @@
+pragma abicoder v2;
+
+contract D {
+	function something() external pure {}
+}
+
+contract C {
+	function something() external pure {}
+	function test() external returns (bytes4) {
+		function() external[2] memory x;
+		x[0] = this.something;
+		x[1] = (new D()).something;
+		function() external f = x[1];
+		bytes memory a = abi.encodeCall(x[0], ());
+		bytes memory b = abi.encodeCall(x[1], ());
+		bytes memory c = abi.encodeCall(f, ());
+		assert(a.length == 4 && b.length == 4 && c.length == 4);
+		assert(bytes4(a) == bytes4(b));
+		assert(bytes4(a) == bytes4(c));
+		assert(bytes4(a) == f.selector);
+		return bytes4(a);
+	}
+}
+
+// ====
+// compileViaYul: also
+// ----
+// test() -> 0xa7a0d53700000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
new file mode 100644
index 0000000000..24e6d065f9
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
@@ -0,0 +1,48 @@
+pragma abicoder v2;
+
+contract C {
+	bool sideEffectRan = false;
+
+	function fNoArgs() external {}
+	function fArray(uint[] memory x) external {}
+	function fUint(uint x, uint y) external returns (uint a, uint b) {}
+
+	function fSignatureFromLiteralNoArgs() public pure returns (bytes memory) {
+		return abi.encodeWithSignature("fNoArgs()");
+	}
+	function fPointerNoArgs() public view returns (bytes memory) {
+		return abi.encodeCall(this.fNoArgs, ());
+	}
+
+	function fSignatureFromLiteralArray() public pure returns (bytes memory) {
+		uint[] memory x;
+		return abi.encodeWithSignature("fArray(uint256[])", x);
+	}
+	function fPointerArray() public view returns (bytes memory) {
+		uint[] memory x;
+		return abi.encodeCall(this.fArray, x);
+	}
+
+	function fSignatureFromLiteralUint() public pure returns (bytes memory) {
+		return abi.encodeWithSignature("fUint(uint256,uint256)", 12, 13);
+	}
+	function fPointerUint() public view returns (bytes memory) {
+		return abi.encodeCall(this.fUint, (12,13));
+	}
+
+	function assertConsistentSelectors() public view {
+		assert(keccak256(fSignatureFromLiteralNoArgs()) == keccak256(fPointerNoArgs()));
+		assert(keccak256(fSignatureFromLiteralArray()) == keccak256(fPointerArray()));
+		assert(keccak256(fSignatureFromLiteralUint()) == keccak256(fPointerUint()));
+	}
+}
+// ====
+// compileViaYul: also
+// ----
+// assertConsistentSelectors() ->
+// fSignatureFromLiteralNoArgs() -> 0x20, 0x04, 12200448252684243758085936796735499259670113115893304444050964496075123064832
+// fPointerNoArgs() -> 0x20, 4, 12200448252684243758085936796735499259670113115893304444050964496075123064832
+// fSignatureFromLiteralArray() -> 0x20, 0x44, 4612216551196396486909126966576324289294165774260092952932219511233230929920, 862718293348820473429344482784628181556388621521298319395315527974912, 0
+// fPointerArray() -> 0x20, 0x44, 4612216551196396486909126966576324289294165774260092952932219511233230929920, 862718293348820473429344482784628181556388621521298319395315527974912, 0
+// fPointerUint() -> 0x20, 0x44, 30372892641494467502622535050667754357470287521126424526399600764424271429632, 323519360005807677536004181044235568083645733070486869773243322990592, 350479306672958317330671196131255198757282877493027442254346933239808
+// fSignatureFromLiteralUint() -> 0x20, 0x44, 30372892641494467502622535050667754357470287521126424526399600764424271429632, 323519360005807677536004181044235568083645733070486869773243322990592, 350479306672958317330671196131255198757282877493027442254346933239808
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
index f6333a9476..1968a76a83 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
@@ -26,7 +26,6 @@ contract C {
     }
     struct S { uint a; string b; uint16 c; }
     function f4() public pure returns (bytes memory) {
-        bytes4 x = 0x12345678;
         S memory s;
         s.a = 0x1234567;
         s.b = "Lorem ipsum dolor sit ethereum........";
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol
new file mode 100644
index 0000000000..72fd4290c3
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol
@@ -0,0 +1,26 @@
+contract C {
+	function callMeMaybe(uint a, uint b, uint[] memory c) external {}
+
+	function abiEncodeSimple(uint x, uint y, uint z, uint[] memory a, uint[] memory b) public view {
+		require(x == y);
+		bytes memory b1 = abi.encodeCall(this.callMeMaybe, (x, z, a));
+		bytes memory b2 = abi.encodeCall(this.callMeMaybe, (y, z, a));
+		assert(b1.length == b2.length);
+
+		bytes memory b3 = abi.encodeCall(this.callMeMaybe, (y, z, b));
+		assert(b1.length == b3.length); // should fail
+	}
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
+// ----
+// Warning 6031: (233-249): Internal error: Expression undefined for SMT solver.
+// Warning 6031: (298-314): Internal error: Expression undefined for SMT solver.
+// Warning 6031: (398-414): Internal error: Expression undefined for SMT solver.
+// Warning 1218: (330-360): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (430-460): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (330-360): CHC: Assertion violation might happen here.
+// Warning 6328: (430-460): CHC: Assertion violation might happen here.
+// Warning 4661: (330-360): BMC: Assertion violation happens here.
+// Warning 4661: (430-460): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol
new file mode 100644
index 0000000000..41b8f16ccb
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol
@@ -0,0 +1,82 @@
+interface I {
+	function fExternal(uint256 p, string memory t) external;
+}
+
+library L {
+	function fExternal(uint256 p, string memory t) external {}
+}
+
+contract C {
+	using L for uint256;
+
+	function f(int a) public {}
+	function f2(int a, string memory b) public {}
+	function f3(int a, int b) public {}
+	function f4() public {}
+	function fInternal(uint256 p, string memory t) internal {}
+
+	function failFunctionArgsWrongType() public returns(bytes memory) {
+		return abi.encodeCall(this.f, ("test"));
+	}
+	function failFunctionArgsTooMany() public returns(bytes memory) {
+		return abi.encodeCall(this.f, (1, 2));
+	}
+	function failFunctionArgsTooFew0() public returns(bytes memory) {
+		return abi.encodeCall(this.f, ());
+	}
+	function failFunctionArgsTooFew1() public returns(bytes memory) {
+		return abi.encodeCall(this.f);
+	}
+	function failFunctionPtrMissing() public returns(bytes memory) {
+		return abi.encodeCall(1, this.f);
+	}
+	function failFunctionPtrWrongType() public returns(bytes memory) {
+		return abi.encodeCall(abi.encodeCall, (1, 2, 3, "test"));
+	}
+	function failFunctionInternal() public returns(bytes memory) {
+		return abi.encodeCall(fInternal, (1, "123"));
+	}
+	function failFunctionInternalFromVariable() public returns(bytes memory) {
+		function(uint256, string memory) internal localFunctionPointer = fInternal;
+		return abi.encodeCall(localFunctionPointer, (1, "123"));
+	}
+	function failFunctionArgsArrayLiteral() public returns(bytes memory) {
+		return abi.encodeCall(this.f3, [1, 2]);
+	}
+	function failLibraryPointerCall() public returns (bytes memory) {
+		return abi.encodeCall(L.fExternal, (1, "123"));
+	}
+	function failBoundLibraryPointerCall() public returns (bytes memory) {
+		uint256 x = 1;
+		return abi.encodeCall(x.fExternal, (1, "123"));
+	}
+	function failInterfacePointerCall() public returns (bytes memory) {
+		return abi.encodeCall(I.fExternal, (1, "123"));
+	}
+	function successFunctionArgsIntLiteralTuple() public returns(bytes memory) {
+		return abi.encodeCall(this.f, (1));
+	}
+	function successFunctionArgsIntLiteral() public returns(bytes memory) {
+		return abi.encodeCall(this.f, 1);
+	}
+	function successFunctionArgsLiteralTuple() public returns(bytes memory) {
+		return abi.encodeCall(this.f2, (1, "test"));
+	}
+	function successFunctionArgsEmptyTuple() public returns(bytes memory) {
+		return abi.encodeCall(this.f4, ());
+	}
+}
+// ----
+// TypeError 5407: (486-494): Cannot implicitly convert component at position 0 from "literal_string "test"" to "int256".
+// TypeError 7788: (576-606): Expected 1 instead of 2 components for the tuple parameter.
+// TypeError 7788: (687-713): Expected 1 instead of 0 components for the tuple parameter.
+// TypeError 6219: (794-816): Expected two arguments: a function pointer followed by a tuple.
+// TypeError 5511: (911-912): Expected first argument to be a function pointer, not "int_const 1".
+// TypeError 3509: (1018-1032): Function must be "public" or "external".
+// TypeError 3509: (1145-1154): Function must be "public" or "external". Did you forget to prefix "this."?
+// TypeError 3509: (1350-1370): Function must be "public" or "external".
+// TypeError 7515: (1469-1500): Expected a tuple with 2 components instead of a single non-tuple parameter.
+// TypeError 5407: (1493-1499): Cannot implicitly convert component at position 0 from "uint8[2]" to "int256".
+// TypeError 3509: (1596-1607): Function must be "public" or "external".
+// TypeError 3509: (1738-1749): Function must be "public" or "external".
+// TypeError 3509: (1860-1871): Function must be "public" or "external".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol
new file mode 100644
index 0000000000..c27f61d687
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_nested_tuple.sol
@@ -0,0 +1,9 @@
+contract C {
+	function f(int a, int b) public {}
+	function failFunctionArgsIntLiteralNestedTuple() public returns(bytes memory) {
+		return abi.encodeCall(this.f, ((1,2)));
+	}
+}
+// ----
+// TypeError 7788: (139-170): Expected 2 instead of 1 components for the tuple parameter.
+// TypeError 5407: (163-168): Cannot implicitly convert component at position 0 from "tuple(int_const 1,int_const 2)" to "int256".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol
new file mode 100644
index 0000000000..7f69995d5e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_tuple_incomplete.sol
@@ -0,0 +1,8 @@
+contract C {
+	function f(int a) public {}
+	function failFunctionArgsIntLiteralTuple() public returns(bytes memory) {
+		return abi.encodeCall(this.f, (1,));
+	}
+}
+// ----
+// TypeError 8381: (149-153): Tuple component cannot be empty.

From fc88226376b97a53f39a1c70956fe138f13a0a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 16 Dec 2021 17:47:43 +0100
Subject: [PATCH 0207/1748] Move `about` field from issue templates to
 `config.yml`

---
 .github/ISSUE_TEMPLATE/bug_report.md          | 1 -
 .github/ISSUE_TEMPLATE/config.yml             | 3 +++
 .github/ISSUE_TEMPLATE/documentation_issue.md | 1 -
 .github/ISSUE_TEMPLATE/feature_request.md     | 1 -
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 261f78fdc1..7be77f4226 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,5 @@
 ---
 name: Bug Report
-about: Bug reports about the Solidity Compiler.
 labels: ["bug :bug:"]
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 931bc8940e..139c117874 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,7 +2,10 @@ blank_issues_enabled: false
 contact_links:
   - name: Bug Report
     url: https://github.com/ethereum/solidity/issues/new?template=bug_report.md&projects=ethereum/solidity/43
+    about: Bug reports about the Solidity Compiler.
   - name: Documentation Issue
     url: https://github.com/ethereum/solidity/issues/new?template=documentation_issue.md&projects=ethereum/solidity/43
+    about: Solidity documentation.
   - name: Feature Request
     url: https://github.com/ethereum/solidity/issues/new?template=feature_request.md&projects=ethereum/solidity/43
+    about: Solidity language or infrastructure feature requests.
diff --git a/.github/ISSUE_TEMPLATE/documentation_issue.md b/.github/ISSUE_TEMPLATE/documentation_issue.md
index c5873f726c..9e58b88684 100644
--- a/.github/ISSUE_TEMPLATE/documentation_issue.md
+++ b/.github/ISSUE_TEMPLATE/documentation_issue.md
@@ -1,6 +1,5 @@
 ---
 name: Documentation Issue
-about: Solidity documentation.
 labels: ["documentation :book:"]
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 7191414d43..0b5bfbd4af 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,5 @@
 ---
 name: Feature Request
-about: Solidity language or infrastructure feature requests.
 labels: ["feature"]
 ---
 

From 927b24df1f37cdffc794a74081cfb37d01d47c17 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 13 Dec 2021 14:53:40 +0100
Subject: [PATCH 0208/1748] Initial implementation of Language Server

---
 .circleci/config.yml                          |  20 +-
 Changelog.md                                  |   1 +
 libsolidity/CMakeLists.txt                    |   6 +
 libsolidity/lsp/FileRepository.cpp            |  64 ++
 libsolidity/lsp/FileRepository.h              |  53 ++
 libsolidity/lsp/LanguageServer.cpp            | 402 ++++++++
 libsolidity/lsp/LanguageServer.h              | 110 +++
 libsolidity/lsp/Transport.cpp                 | 141 +++
 libsolidity/lsp/Transport.h                   | 101 ++
 scripts/tests.sh                              |   3 +
 solc/CommandLineInterface.cpp                 |  19 +-
 solc/CommandLineInterface.h                   |   1 +
 solc/CommandLineParser.cpp                    |  14 +
 solc/CommandLineParser.h                      |   1 +
 test/libsolidity/lsp/didChange_template.sol   |   6 +
 test/libsolidity/lsp/didOpen_with_import.sol  |  12 +
 test/libsolidity/lsp/lib.sol                  |  15 +
 .../libsolidity/lsp/publish_diagnostics_1.sol |  18 +
 .../libsolidity/lsp/publish_diagnostics_2.sol |  21 +
 .../libsolidity/lsp/publish_diagnostics_3.sol |  10 +
 test/lsp.py                                   | 874 ++++++++++++++++++
 test/solc/CommandLineInterface.cpp            |   2 +-
 22 files changed, 1891 insertions(+), 3 deletions(-)
 create mode 100644 libsolidity/lsp/FileRepository.cpp
 create mode 100644 libsolidity/lsp/FileRepository.h
 create mode 100644 libsolidity/lsp/LanguageServer.cpp
 create mode 100644 libsolidity/lsp/LanguageServer.h
 create mode 100644 libsolidity/lsp/Transport.cpp
 create mode 100644 libsolidity/lsp/Transport.h
 create mode 100644 test/libsolidity/lsp/didChange_template.sol
 create mode 100644 test/libsolidity/lsp/didOpen_with_import.sol
 create mode 100644 test/libsolidity/lsp/lib.sol
 create mode 100644 test/libsolidity/lsp/publish_diagnostics_1.sol
 create mode 100644 test/libsolidity/lsp/publish_diagnostics_2.sol
 create mode 100644 test/libsolidity/lsp/publish_diagnostics_3.sol
 create mode 100755 test/lsp.py

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cda6e58909..8123fefe84 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -198,6 +198,19 @@ defaults:
         - store_artifacts: *artifacts_test_results
         - gitter_notify_failure_unless_pr
 
+  - steps_test_lsp: &steps_test_lsp
+      steps:
+        - checkout
+        - attach_workspace:
+            at: build
+        - run:
+            name: Install dependencies
+            command: pip install --user deepdiff colorama
+        - run:
+            name: Executing solc LSP test suite
+            command: ./test/lsp.py ./build/solc/solc
+        - gitter_notify_failure_unless_pr
+
   - steps_soltest_all: &steps_soltest_all
       steps:
         - checkout
@@ -519,7 +532,7 @@ jobs:
           command: apt -q update && apt install -y python3-pip
       - run:
           name: Install pylint
-          command: python3 -m pip install pylint z3-solver pygments-lexer-solidity parsec tabulate
+          command: python3 -m pip install pylint z3-solver pygments-lexer-solidity parsec tabulate deepdiff colorama
           # also z3-solver, parsec and tabulate to make sure pylint knows about this module, pygments-lexer-solidity for docs
       - run:
           name: Linting Python Scripts
@@ -887,6 +900,10 @@ jobs:
     parallelism: 15 # 7 EVM versions, each with/without optimization + 1 ABIv1/@nooptions run
     <<: *steps_soltest_all
 
+  t_ubu_lsp: &t_ubu_lsp
+    <<: *base_ubuntu2004_small
+    <<: *steps_test_lsp
+
   t_archlinux_soltest: &t_archlinux_soltest
     <<: *base_archlinux
     environment:
@@ -1288,6 +1305,7 @@ workflows:
       - t_ubu_soltest_enforce_yul: *workflow_ubuntu2004
       - b_ubu_clang: *workflow_trigger_on_tags
       - t_ubu_clang_soltest: *workflow_ubuntu2004_clang
+      - t_ubu_lsp: *workflow_ubuntu2004
 
       # Ubuntu fake release build and tests
       - b_ubu_release: *workflow_trigger_on_tags
diff --git a/Changelog.md b/Changelog.md
index c4b67e935b..9e3526fab8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * Commandline Interface: Add ``--lsp`` option to get ``solc`` to act as a Language Server (LSP) communicating over stdio.
 
 
 Bugfixes:
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 7e3791eab0..ff82cd9fb5 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -155,6 +155,12 @@ set(sources
 	interface/StorageLayout.h
 	interface/Version.cpp
 	interface/Version.h
+	lsp/LanguageServer.cpp
+	lsp/LanguageServer.h
+	lsp/FileRepository.cpp
+	lsp/FileRepository.h
+	lsp/Transport.cpp
+	lsp/Transport.h
 	parsing/DocStringParser.cpp
 	parsing/DocStringParser.h
 	parsing/Parser.cpp
diff --git a/libsolidity/lsp/FileRepository.cpp b/libsolidity/lsp/FileRepository.cpp
new file mode 100644
index 0000000000..9c7f72e0c4
--- /dev/null
+++ b/libsolidity/lsp/FileRepository.cpp
@@ -0,0 +1,64 @@
+/*
+	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 <libsolidity/lsp/FileRepository.h>
+
+using namespace std;
+using namespace solidity;
+using namespace solidity::lsp;
+
+namespace
+{
+
+string stripFilePrefix(string const& _path)
+{
+	if (_path.find("file://") == 0)
+		return _path.substr(7);
+	else
+		return _path;
+}
+
+}
+
+string FileRepository::sourceUnitNameToClientPath(string const& _sourceUnitName) const
+{
+	if (m_sourceUnitNamesToClientPaths.count(_sourceUnitName))
+		return m_sourceUnitNamesToClientPaths.at(_sourceUnitName);
+	else if (_sourceUnitName.find("file://") == 0)
+		return _sourceUnitName;
+	else
+		return "file://" + (m_fileReader.basePath() / _sourceUnitName).generic_string();
+}
+
+string FileRepository::clientPathToSourceUnitName(string const& _path) const
+{
+	return m_fileReader.cliPathToSourceUnitName(stripFilePrefix(_path));
+}
+
+map<string, string> const& FileRepository::sourceUnits() const
+{
+	return m_fileReader.sourceUnits();
+}
+
+void FileRepository::setSourceByClientPath(string const& _uri, string _text)
+{
+	// This is needed for uris outside the base path. It can lead to collisions,
+	// but we need to mostly rewrite this in a future version anyway.
+	m_sourceUnitNamesToClientPaths.emplace(clientPathToSourceUnitName(_uri), _uri);
+	m_fileReader.addOrUpdateFile(stripFilePrefix(_uri), move(_text));
+}
diff --git a/libsolidity/lsp/FileRepository.h b/libsolidity/lsp/FileRepository.h
new file mode 100644
index 0000000000..b6aa5ee085
--- /dev/null
+++ b/libsolidity/lsp/FileRepository.h
@@ -0,0 +1,53 @@
+/*
+	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
+#pragma once
+
+#include <libsolidity/interface/FileReader.h>
+
+#include <string>
+#include <map>
+
+namespace solidity::lsp
+{
+
+class FileRepository
+{
+public:
+	explicit FileRepository(boost::filesystem::path const& _basePath):
+		m_fileReader(_basePath) {}
+
+	boost::filesystem::path const& basePath() const { return m_fileReader.basePath(); }
+
+	/// Translates a compiler-internal source unit name to an LSP client path.
+	std::string sourceUnitNameToClientPath(std::string const& _sourceUnitName) const;
+	/// Translates an LSP client path into a compiler-internal source unit name.
+	std::string clientPathToSourceUnitName(std::string const& _uri) const;
+
+	/// @returns all sources by their compiler-internal source unit name.
+	std::map<std::string, std::string> const& sourceUnits() const;
+	/// Changes the source identified by the LSP client path _uri to _text.
+	void setSourceByClientPath(std::string const& _uri, std::string _text);
+
+	frontend::ReadCallback::Callback reader() { return m_fileReader.reader(); }
+
+private:
+	std::map<std::string, std::string> m_sourceUnitNamesToClientPaths;
+	frontend::FileReader m_fileReader;
+};
+
+}
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
new file mode 100644
index 0000000000..586220df11
--- /dev/null
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -0,0 +1,402 @@
+/*
+	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 <libsolidity/ast/AST.h>
+#include <libsolidity/ast/ASTUtils.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/interface/ReadFile.h>
+#include <libsolidity/interface/StandardCompiler.h>
+#include <libsolidity/lsp/LanguageServer.h>
+
+#include <liblangutil/SourceReferenceExtractor.h>
+#include <liblangutil/CharStream.h>
+
+#include <libsolutil/Visitor.h>
+#include <libsolutil/JSON.h>
+
+#include <boost/exception/diagnostic_information.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+
+#include <fmt/format.h>
+
+#include <ostream>
+#include <string>
+
+using namespace std;
+using namespace std::placeholders;
+
+using namespace solidity::lsp;
+using namespace solidity::langutil;
+using namespace solidity::frontend;
+
+namespace
+{
+
+Json::Value toJson(LineColumn _pos)
+{
+	Json::Value json = Json::objectValue;
+	json["line"] = max(_pos.line, 0);
+	json["character"] = max(_pos.column, 0);
+
+	return json;
+}
+
+Json::Value toJsonRange(LineColumn const& _start, LineColumn const& _end)
+{
+	Json::Value json;
+	json["start"] = toJson(_start);
+	json["end"] = toJson(_end);
+	return json;
+}
+
+optional<LineColumn> parseLineColumn(Json::Value const& _lineColumn)
+{
+	if (_lineColumn.isObject() && _lineColumn["line"].isInt() && _lineColumn["character"].isInt())
+		return LineColumn{_lineColumn["line"].asInt(), _lineColumn["character"].asInt()};
+	else
+		return nullopt;
+}
+
+constexpr int toDiagnosticSeverity(Error::Type _errorType)
+{
+	// 1=Error, 2=Warning, 3=Info, 4=Hint
+	switch (Error::errorSeverity(_errorType))
+	{
+	case Error::Severity::Error: return 1;
+	case Error::Severity::Warning: return 2;
+	case Error::Severity::Info: return 3;
+	}
+	solAssert(false);
+	return -1;
+}
+
+}
+
+LanguageServer::LanguageServer(Transport& _transport):
+	m_client{_transport},
+	m_handlers{
+		{"$/cancelRequest", [](auto, auto) {/*nothing for now as we are synchronous */}},
+		{"cancelRequest", [](auto, auto) {/*nothing for now as we are synchronous */}},
+		{"exit", [this](auto, auto) { m_state = (m_state == State::ShutdownRequested ? State::ExitRequested : State::ExitWithoutShutdown); }},
+		{"initialize", bind(&LanguageServer::handleInitialize, this, _1, _2)},
+		{"initialized", [](auto, auto) {}},
+		{"shutdown", [this](auto, auto) { m_state = State::ShutdownRequested; }},
+		{"textDocument/didOpen", bind(&LanguageServer::handleTextDocumentDidOpen, this, _1, _2)},
+		{"textDocument/didChange", bind(&LanguageServer::handleTextDocumentDidChange, this, _1, _2)},
+		{"textDocument/didClose", bind(&LanguageServer::handleTextDocumentDidClose, this, _1, _2)},
+		{"workspace/didChangeConfiguration", bind(&LanguageServer::handleWorkspaceDidChangeConfiguration, this, _1, _2)},
+	},
+	m_fileRepository("/" /* basePath */),
+	m_compilerStack{m_fileRepository.reader()}
+{
+}
+
+optional<SourceLocation> LanguageServer::parsePosition(
+	string const& _sourceUnitName,
+	Json::Value const& _position
+) const
+{
+	if (!m_fileRepository.sourceUnits().count(_sourceUnitName))
+		return nullopt;
+
+	if (optional<LineColumn> lineColumn = parseLineColumn(_position))
+		if (optional<int> const offset = CharStream::translateLineColumnToPosition(
+			m_fileRepository.sourceUnits().at(_sourceUnitName),
+			*lineColumn
+		))
+			return SourceLocation{*offset, *offset, make_shared<string>(_sourceUnitName)};
+	return nullopt;
+}
+
+optional<SourceLocation> LanguageServer::parseRange(string const& _sourceUnitName, Json::Value const& _range) const
+{
+	if (!_range.isObject())
+		return nullopt;
+	optional<SourceLocation> start = parsePosition(_sourceUnitName, _range["start"]);
+	optional<SourceLocation> end = parsePosition(_sourceUnitName, _range["end"]);
+	if (!start || !end)
+		return nullopt;
+	solAssert(*start->sourceName == *end->sourceName);
+	start->end = end->end;
+	return start;
+}
+
+Json::Value LanguageServer::toRange(SourceLocation const& _location) const
+{
+	if (!_location.hasText())
+		return toJsonRange({}, {});
+
+	solAssert(_location.sourceName, "");
+	CharStream const& stream = m_compilerStack.charStream(*_location.sourceName);
+	LineColumn start = stream.translatePositionToLineColumn(_location.start);
+	LineColumn end = stream.translatePositionToLineColumn(_location.end);
+	return toJsonRange(start, end);
+}
+
+Json::Value LanguageServer::toJson(SourceLocation const& _location) const
+{
+	solAssert(_location.sourceName);
+	Json::Value item = Json::objectValue;
+	item["uri"] = m_fileRepository.sourceUnitNameToClientPath(*_location.sourceName);
+	item["range"] = toRange(_location);
+	return item;
+}
+
+void LanguageServer::changeConfiguration(Json::Value const& _settings)
+{
+	m_settingsObject = _settings;
+}
+
+void LanguageServer::compile()
+{
+	// For files that are not open, we have to take changes on disk into account,
+	// so we just remove all non-open files.
+
+	FileRepository oldRepository(m_fileRepository.basePath());
+	swap(oldRepository, m_fileRepository);
+
+	for (string const& fileName: m_openFiles)
+		m_fileRepository.setSourceByClientPath(
+			fileName,
+			oldRepository.sourceUnits().at(oldRepository.clientPathToSourceUnitName(fileName))
+		);
+
+	// TODO: optimize! do not recompile if nothing has changed (file(s) not flagged dirty).
+
+	m_compilerStack.reset(false);
+	m_compilerStack.setSources(m_fileRepository.sourceUnits());
+	m_compilerStack.compile(CompilerStack::State::AnalysisPerformed);
+}
+
+void LanguageServer::compileAndUpdateDiagnostics()
+{
+	compile();
+
+	// These are the source units we will sent diagnostics to the client for sure,
+	// even if it is just to clear previous diagnostics.
+	map<string, Json::Value> diagnosticsBySourceUnit;
+	for (string const& sourceUnitName: m_fileRepository.sourceUnits() | ranges::views::keys)
+		diagnosticsBySourceUnit[sourceUnitName] = Json::arrayValue;
+	for (string const& sourceUnitName: m_nonemptyDiagnostics)
+		diagnosticsBySourceUnit[sourceUnitName] = Json::arrayValue;
+
+	for (shared_ptr<Error const> const& error: m_compilerStack.errors())
+	{
+		SourceLocation const* location = error->sourceLocation();
+		if (!location || !location->sourceName)
+			// LSP only has diagnostics applied to individual files.
+			continue;
+
+		Json::Value jsonDiag;
+		jsonDiag["source"] = "solc";
+		jsonDiag["severity"] = toDiagnosticSeverity(error->type());
+		jsonDiag["code"] = Json::UInt64{error->errorId().error};
+		string message = error->typeName() + ":";
+		if (string const* comment = error->comment())
+			message += " " + *comment;
+		jsonDiag["message"] = move(message);
+		jsonDiag["range"] = toRange(*location);
+
+		if (auto const* secondary = error->secondarySourceLocation())
+			for (auto&& [secondaryMessage, secondaryLocation]: secondary->infos)
+			{
+				Json::Value jsonRelated;
+				jsonRelated["message"] = secondaryMessage;
+				jsonRelated["location"] = toJson(secondaryLocation);
+				jsonDiag["relatedInformation"].append(jsonRelated);
+			}
+
+		diagnosticsBySourceUnit[*location->sourceName].append(jsonDiag);
+	}
+
+	m_nonemptyDiagnostics.clear();
+	for (auto&& [sourceUnitName, diagnostics]: diagnosticsBySourceUnit)
+	{
+		Json::Value params;
+		params["uri"] = m_fileRepository.sourceUnitNameToClientPath(sourceUnitName);
+		if (!diagnostics.empty())
+			m_nonemptyDiagnostics.insert(sourceUnitName);
+		params["diagnostics"] = move(diagnostics);
+		m_client.notify("textDocument/publishDiagnostics", move(params));
+	}
+}
+
+bool LanguageServer::run()
+{
+	while (m_state != State::ExitRequested && m_state != State::ExitWithoutShutdown && !m_client.closed())
+	{
+		MessageID id;
+		try
+		{
+			optional<Json::Value> const jsonMessage = m_client.receive();
+			if (!jsonMessage)
+				continue;
+
+			if ((*jsonMessage)["method"].isString())
+			{
+				string const methodName = (*jsonMessage)["method"].asString();
+				id = (*jsonMessage)["id"];
+
+				if (auto handler = valueOrDefault(m_handlers, methodName))
+					handler(id, (*jsonMessage)["params"]);
+				else
+					m_client.error(id, ErrorCode::MethodNotFound, "Unknown method " + methodName);
+			}
+			else
+				m_client.error({}, ErrorCode::ParseError, "\"method\" has to be a string.");
+		}
+		catch (...)
+		{
+			m_client.error(id, ErrorCode::InternalError, "Unhandled exception: "s + boost::current_exception_diagnostic_information());
+		}
+	}
+	return m_state == State::ExitRequested;
+}
+
+bool LanguageServer::checkServerInitialized(MessageID _id)
+{
+	if (m_state != State::Initialized)
+	{
+		m_client.error(_id, ErrorCode::ServerNotInitialized, "Server is not properly initialized.");
+		return false;
+	}
+	else
+		return true;
+}
+
+void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
+{
+	if (m_state != State::Started)
+	{
+		m_client.error(_id, ErrorCode::RequestFailed, "Initialize called at the wrong time.");
+		return;
+	}
+	m_state = State::Initialized;
+
+	// The default of FileReader is to use `.`, but the path from where the LSP was started
+	// should not matter.
+	string rootPath("/");
+	if (Json::Value uri = _args["rootUri"])
+	{
+		rootPath = uri.asString();
+		if (!boost::starts_with(rootPath, "file://"))
+		{
+			m_client.error(_id, ErrorCode::InvalidParams, "rootUri only supports file URI scheme.");
+			return;
+		}
+		rootPath = rootPath.substr(7);
+	}
+	else if (Json::Value rootPath = _args["rootPath"])
+		rootPath = rootPath.asString();
+
+	m_fileRepository = FileRepository(boost::filesystem::path(rootPath));
+	if (_args["initializationOptions"].isObject())
+		changeConfiguration(_args["initializationOptions"]);
+
+	Json::Value replyArgs;
+	replyArgs["serverInfo"]["name"] = "solc";
+	replyArgs["serverInfo"]["version"] = string(VersionNumber);
+	replyArgs["capabilities"]["textDocumentSync"]["openClose"] = true;
+	replyArgs["capabilities"]["textDocumentSync"]["change"] = 2; // 0=none, 1=full, 2=incremental
+
+	m_client.reply(_id, move(replyArgs));
+}
+
+
+void LanguageServer::handleWorkspaceDidChangeConfiguration(MessageID _id, Json::Value const& _args)
+{
+	if (!checkServerInitialized(_id))
+		return;
+
+	if (_args["settings"].isObject())
+		changeConfiguration(_args["settings"]);
+}
+
+void LanguageServer::handleTextDocumentDidOpen(MessageID _id, Json::Value const& _args)
+{
+	if (!checkServerInitialized(_id))
+		return;
+
+	if (!_args["textDocument"])
+		m_client.error(_id, ErrorCode::RequestFailed, "Text document parameter missing.");
+
+	string text = _args["textDocument"]["text"].asString();
+	string uri = _args["textDocument"]["uri"].asString();
+	m_openFiles.insert(uri);
+	m_fileRepository.setSourceByClientPath(uri, move(text));
+	compileAndUpdateDiagnostics();
+}
+
+void LanguageServer::handleTextDocumentDidChange(MessageID _id, Json::Value const& _args)
+{
+	if (!checkServerInitialized(_id))
+		return;
+
+	string const uri = _args["textDocument"]["uri"].asString();
+
+	for (Json::Value jsonContentChange: _args["contentChanges"])
+	{
+		if (!jsonContentChange.isObject())
+		{
+			m_client.error(_id, ErrorCode::RequestFailed, "Invalid content reference.");
+			return;
+		}
+
+		string const sourceUnitName = m_fileRepository.clientPathToSourceUnitName(uri);
+		if (!m_fileRepository.sourceUnits().count(sourceUnitName))
+		{
+			m_client.error(_id, ErrorCode::RequestFailed, "Unknown file: " + uri);
+			return;
+		}
+
+		string text = jsonContentChange["text"].asString();
+		if (jsonContentChange["range"].isObject()) // otherwise full content update
+		{
+			optional<SourceLocation> change = parseRange(sourceUnitName, jsonContentChange["range"]);
+			if (!change || !change->hasText())
+			{
+				m_client.error(
+					_id,
+					ErrorCode::RequestFailed,
+					"Invalid source range: " + jsonCompactPrint(jsonContentChange["range"])
+				);
+				return;
+			}
+			string buffer = m_fileRepository.sourceUnits().at(sourceUnitName);
+			buffer.replace(static_cast<size_t>(change->start), static_cast<size_t>(change->end - change->start), move(text));
+			text = move(buffer);
+		}
+		m_fileRepository.setSourceByClientPath(uri, move(text));
+	}
+
+	compileAndUpdateDiagnostics();
+}
+
+void LanguageServer::handleTextDocumentDidClose(MessageID _id, Json::Value const& _args)
+{
+	if (!checkServerInitialized(_id))
+		return;
+
+	if (!_args["textDocument"])
+		m_client.error(_id, ErrorCode::RequestFailed, "Text document parameter missing.");
+
+	string uri = _args["textDocument"]["uri"].asString();
+	m_openFiles.erase(uri);
+
+	compileAndUpdateDiagnostics();
+}
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
new file mode 100644
index 0000000000..802dd81989
--- /dev/null
+++ b/libsolidity/lsp/LanguageServer.h
@@ -0,0 +1,110 @@
+/*
+	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
+#pragma once
+
+#include <libsolidity/lsp/Transport.h>
+#include <libsolidity/lsp/FileRepository.h>
+#include <libsolidity/interface/CompilerStack.h>
+#include <libsolidity/interface/FileReader.h>
+
+#include <json/value.h>
+
+#include <functional>
+#include <map>
+#include <optional>
+#include <string>
+#include <vector>
+
+namespace solidity::lsp
+{
+
+enum class ErrorCode;
+
+/**
+ * Solidity Language Server, managing one LSP client.
+ * This implements a subset of LSP version 3.16 that can be found at:
+ * https://microsoft.github.io/language-server-protocol/specifications/specification-3-16/
+ */
+class LanguageServer
+{
+public:
+	/// @param _transport Customizable transport layer.
+	explicit LanguageServer(Transport& _transport);
+
+	/// Re-compiles the project and updates the diagnostics pushed to the client.
+	void compileAndUpdateDiagnostics();
+
+	/// Loops over incoming messages via the transport layer until shutdown condition is met.
+	///
+	/// The standard shutdown condition is when the maximum number of consecutive failures
+	/// has been exceeded.
+	///
+	/// @return boolean indicating normal or abnormal termination.
+	bool run();
+
+private:
+	/// Checks if the server is initialized (to be used by messages that need it to be initialized).
+	/// Reports an error and returns false if not.
+	bool checkServerInitialized(MessageID _id);
+	void handleInitialize(MessageID _id, Json::Value const& _args);
+	void handleWorkspaceDidChangeConfiguration(MessageID _id, Json::Value const& _args);
+	void handleTextDocumentDidOpen(MessageID _id, Json::Value const& _args);
+	void handleTextDocumentDidChange(MessageID _id, Json::Value const& _args);
+	void handleTextDocumentDidClose(MessageID _id, Json::Value const& _args);
+
+	/// Invoked when the server user-supplied configuration changes (initiated by the client).
+	void changeConfiguration(Json::Value const&);
+
+	/// Compile everything until after analysis phase.
+	void compile();
+
+	std::optional<langutil::SourceLocation> parsePosition(
+		std::string const& _sourceUnitName,
+		Json::Value const& _position
+	) const;
+	/// @returns the source location given a source unit name and an LSP Range object,
+	/// or nullopt on failure.
+	std::optional<langutil::SourceLocation> parseRange(
+		std::string const& _sourceUnitName,
+		Json::Value const& _range
+	) const;
+	Json::Value toRange(langutil::SourceLocation const& _location) const;
+	Json::Value toJson(langutil::SourceLocation const& _location) const;
+
+	// LSP related member fields
+	using MessageHandler = std::function<void(MessageID, Json::Value const&)>;
+
+	enum class State { Started, Initialized, ShutdownRequested, ExitRequested, ExitWithoutShutdown };
+	State m_state = State::Started;
+
+	Transport& m_client;
+	std::map<std::string, MessageHandler> m_handlers;
+
+	/// Set of files known to be open by the client.
+	std::set<std::string> m_openFiles;
+	/// Set of source unit names for which we sent diagnostics to the client in the last iteration.
+	std::set<std::string> m_nonemptyDiagnostics;
+	FileRepository m_fileRepository;
+
+	frontend::CompilerStack m_compilerStack;
+
+	/// User-supplied custom configuration settings (such as EVM version).
+	Json::Value m_settingsObject;
+};
+
+}
diff --git a/libsolidity/lsp/Transport.cpp b/libsolidity/lsp/Transport.cpp
new file mode 100644
index 0000000000..fcd3c82492
--- /dev/null
+++ b/libsolidity/lsp/Transport.cpp
@@ -0,0 +1,141 @@
+/*
+	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 <libsolidity/lsp/Transport.h>
+
+#include <libsolutil/JSON.h>
+#include <libsolutil/Visitor.h>
+#include <libsolutil/CommonIO.h>
+#include <liblangutil/Exceptions.h>
+
+#include <boost/algorithm/string.hpp>
+
+#include <iostream>
+#include <sstream>
+
+using namespace std;
+using namespace solidity::lsp;
+
+IOStreamTransport::IOStreamTransport(istream& _in, ostream& _out):
+	m_input{_in},
+	m_output{_out}
+{
+}
+
+IOStreamTransport::IOStreamTransport():
+	IOStreamTransport(cin, cout)
+{
+}
+
+bool IOStreamTransport::closed() const noexcept
+{
+	return m_input.eof();
+}
+
+optional<Json::Value> IOStreamTransport::receive()
+{
+	auto const headers = parseHeaders();
+	if (!headers)
+	{
+		error({}, ErrorCode::ParseError, "Could not parse RPC headers.");
+		return nullopt;
+	}
+
+	if (!headers->count("content-length"))
+	{
+		error({}, ErrorCode::ParseError, "No content-length header found.");
+		return nullopt;
+	}
+
+	string const data = util::readBytes(m_input, stoul(headers->at("content-length")));
+
+	Json::Value jsonMessage;
+	string jsonParsingErrors;
+	solidity::util::jsonParseStrict(data, jsonMessage, &jsonParsingErrors);
+	if (!jsonParsingErrors.empty() || !jsonMessage || !jsonMessage.isObject())
+	{
+		error({}, ErrorCode::ParseError, "Could not parse RPC JSON payload. " + jsonParsingErrors);
+		return nullopt;
+	}
+
+	return {move(jsonMessage)};
+}
+
+void IOStreamTransport::notify(string _method, Json::Value _message)
+{
+	Json::Value json;
+	json["method"] = move(_method);
+	json["params"] = move(_message);
+	send(move(json));
+}
+
+void IOStreamTransport::reply(MessageID _id, Json::Value _message)
+{
+	Json::Value json;
+	json["result"] = move(_message);
+	send(move(json), _id);
+}
+
+void IOStreamTransport::error(MessageID _id, ErrorCode _code, string _message)
+{
+	Json::Value json;
+	json["error"]["code"] = static_cast<int>(_code);
+	json["error"]["message"] = move(_message);
+	send(move(json), _id);
+}
+
+void IOStreamTransport::send(Json::Value _json, MessageID _id)
+{
+	solAssert(_json.isObject());
+	_json["jsonrpc"] = "2.0";
+	if (_id != Json::nullValue)
+		_json["id"] = _id;
+
+	string const jsonString = solidity::util::jsonCompactPrint(_json);
+
+	m_output << "Content-Length: " << jsonString.size() << "\r\n";
+	m_output << "\r\n";
+	m_output << jsonString;
+
+	m_output.flush();
+}
+
+optional<map<string, string>> IOStreamTransport::parseHeaders()
+{
+	map<string, string> headers;
+
+	while (true)
+	{
+		string line;
+		getline(m_input, line);
+		if (boost::trim_copy(line).empty())
+			break;
+
+		auto const delimiterPos = line.find(':');
+		if (delimiterPos == string::npos)
+			return nullopt;
+
+		string name = boost::to_lower_copy(line.substr(0, delimiterPos));
+		string value = line.substr(delimiterPos + 1);
+		if (!headers.emplace(
+			boost::trim_copy(name),
+			boost::trim_copy(value)
+		).second)
+			return nullopt;
+	}
+	return {move(headers)};
+}
diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h
new file mode 100644
index 0000000000..c6ed8fa8a2
--- /dev/null
+++ b/libsolidity/lsp/Transport.h
@@ -0,0 +1,101 @@
+/*
+	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
+#pragma once
+
+#include <json/value.h>
+
+#include <functional>
+#include <iosfwd>
+#include <map>
+#include <optional>
+#include <string>
+#include <string_view>
+#include <variant>
+
+namespace solidity::lsp
+{
+
+using MessageID = Json::Value;
+
+enum class ErrorCode
+{
+	// Defined by JSON RPC
+	ParseError = -32700,
+	MethodNotFound = -32601,
+	InvalidParams = -32602,
+	InternalError = -32603,
+
+	// Defined by the protocol.
+	ServerNotInitialized = -32002,
+	RequestFailed = -32803
+};
+
+/**
+ * Transport layer API
+ *
+ * The transport layer API is abstracted to make LSP more testable as well as
+ * this way it could be possible to support other transports (HTTP for example) easily.
+ */
+class Transport
+{
+public:
+	virtual ~Transport() = default;
+
+	virtual bool closed() const noexcept = 0;
+	virtual std::optional<Json::Value> receive() = 0;
+	virtual void notify(std::string _method, Json::Value _params) = 0;
+	virtual void reply(MessageID _id, Json::Value _result) = 0;
+	virtual void error(MessageID _id, ErrorCode _code, std::string _message) = 0;
+};
+
+/**
+ * LSP Transport using JSON-RPC over iostreams.
+ */
+class IOStreamTransport: public Transport
+{
+public:
+	/// Constructs a standard stream transport layer.
+	///
+	/// @param _in for example std::cin (stdin)
+	/// @param _out for example std::cout (stdout)
+	IOStreamTransport(std::istream& _in, std::ostream& _out);
+
+	// Constructs a JSON transport using standard I/O streams.
+	IOStreamTransport();
+
+	bool closed() const noexcept override;
+	std::optional<Json::Value> receive() override;
+	void notify(std::string _method, Json::Value _params) override;
+	void reply(MessageID _id, Json::Value _result) override;
+	void error(MessageID _id, ErrorCode _code, std::string _message) override;
+
+protected:
+	/// Sends an arbitrary raw message to the client.
+	///
+	/// Used by the notify/reply/error function family.
+	virtual void send(Json::Value _message, MessageID _id = Json::nullValue);
+
+	/// Parses header section from the client including message-delimiting empty line.
+	std::optional<std::map<std::string, std::string>> parseHeaders();
+
+private:
+	std::istream& m_input;
+	std::ostream& m_output;
+};
+
+}
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 029be16291..5515a68691 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -83,6 +83,9 @@ done
 printTask "Testing Python scripts..."
 "$REPO_ROOT/test/pyscriptTests.py"
 
+printTask "Testing LSP..."
+"$REPO_ROOT/scripts/test_solidity_lsp.py" "${SOLIDITY_BUILD_DIR}/solc/solc"
+
 printTask "Running commandline tests..."
 # Only run in parallel if this is run on CI infrastructure
 if [[ -n "$CI" ]]
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 94bfd8a68b..235059a02b 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -38,6 +38,8 @@
 #include <libsolidity/interface/DebugSettings.h>
 #include <libsolidity/interface/ImportRemapper.h>
 #include <libsolidity/interface/StorageLayout.h>
+#include <libsolidity/lsp/LanguageServer.h>
+#include <libsolidity/lsp/Transport.h>
 
 #include <libyul/AssemblyStack.h>
 
@@ -56,6 +58,7 @@
 #include <libsolutil/JSON.h>
 
 #include <algorithm>
+#include <fstream>
 #include <memory>
 
 #include <range/v3/view/map.hpp>
@@ -499,7 +502,11 @@ void CommandLineInterface::readInputFiles()
 			m_fileReader.setStdin(readUntilEnd(m_sin));
 	}
 
-	if (m_fileReader.sourceUnits().empty() && !m_standardJsonInput.has_value())
+	if (
+		m_options.input.mode != InputMode::LanguageServer &&
+		m_fileReader.sourceUnits().empty() &&
+		!m_standardJsonInput.has_value()
+	)
 		solThrow(CommandLineValidationError, "All specified input files either do not exist or are not regular files.");
 }
 
@@ -624,6 +631,9 @@ void CommandLineInterface::processInput()
 		m_standardJsonInput.reset();
 		break;
 	}
+	case InputMode::LanguageServer:
+		serveLSP();
+		break;
 	case InputMode::Assembler:
 		assemble(m_options.assembly.inputLanguage, m_options.assembly.targetMachine);
 		break;
@@ -884,6 +894,13 @@ void CommandLineInterface::handleAst()
 	}
 }
 
+void CommandLineInterface::serveLSP()
+{
+	lsp::IOStreamTransport transport;
+	if (!lsp::LanguageServer{transport}.run())
+		solThrow(CommandLineExecutionError, "LSP terminated abnormally.");
+}
+
 void CommandLineInterface::link()
 {
 	solAssert(m_options.input.mode == InputMode::Linker, "");
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 9d1646e528..951731825c 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -82,6 +82,7 @@ class CommandLineInterface
 	void printVersion();
 	void printLicense();
 	void compile();
+	void serveLSP();
 	void link();
 	void writeLinkedFiles();
 	/// @returns the ``// <identifier> -> name`` hint for library placeholders.
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 87348686c6..65c7d78621 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -59,6 +59,7 @@ static string const g_strIPFS = "ipfs";
 static string const g_strLicense = "license";
 static string const g_strLibraries = "libraries";
 static string const g_strLink = "link";
+static string const g_strLSP = "lsp";
 static string const g_strMachine = "machine";
 static string const g_strMetadataHash = "metadata-hash";
 static string const g_strMetadataLiteral = "metadata-literal";
@@ -135,6 +136,7 @@ static map<InputMode, string> const g_inputModeName = {
 	{InputMode::Assembler, "assembler"},
 	{InputMode::StandardJson, "standard JSON"},
 	{InputMode::Linker, "linker"},
+	{InputMode::LanguageServer, "language server (LSP)"},
 };
 
 void CommandLineParser::checkMutuallyExclusive(vector<string> const& _optionNames)
@@ -455,6 +457,7 @@ void CommandLineParser::parseOutputSelection()
 		case InputMode::Help:
 		case InputMode::License:
 		case InputMode::Version:
+		case InputMode::LanguageServer:
 			solAssert(false);
 		case InputMode::Compiler:
 		case InputMode::CompilerWithASTImport:
@@ -633,6 +636,11 @@ General Information)").c_str(),
 			"Supported Inputs is the output of the --" + g_strStandardJSON + " or the one produced by "
 			"--" + g_strCombinedJson + " " + CombinedJsonRequests::componentName(&CombinedJsonRequests::ast)).c_str()
 		)
+		(
+			g_strLSP.c_str(),
+			"Switch to language server mode (\"LSP\"). Allows the compiler to be used as an analysis backend "
+			"for your favourite IDE."
+		)
 	;
 	desc.add(alternativeInputModes);
 
@@ -865,6 +873,7 @@ void CommandLineParser::processArgs()
 		g_strStrictAssembly,
 		g_strYul,
 		g_strImportAst,
+		g_strLSP
 	});
 
 	if (m_args.count(g_strHelp) > 0)
@@ -875,6 +884,8 @@ void CommandLineParser::processArgs()
 		m_options.input.mode = InputMode::Version;
 	else if (m_args.count(g_strStandardJSON) > 0)
 		m_options.input.mode = InputMode::StandardJson;
+	else if (m_args.count(g_strLSP))
+		m_options.input.mode = InputMode::LanguageServer;
 	else if (m_args.count(g_strAssemble) > 0 || m_args.count(g_strStrictAssembly) > 0 || m_args.count(g_strYul) > 0)
 		m_options.input.mode = InputMode::Assembler;
 	else if (m_args.count(g_strLink) > 0)
@@ -910,6 +921,9 @@ void CommandLineParser::processArgs()
 			joinOptionNames(invalidOptionsForCurrentInputMode)
 		);
 
+	if (m_options.input.mode == InputMode::LanguageServer)
+		return;
+
 	checkMutuallyExclusive({g_strColor, g_strNoColor});
 
 	array<string, 9> const conflictingWithStopAfter{
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index c1a95a11f9..791e7f1c10 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -56,6 +56,7 @@ enum class InputMode
 	StandardJson,
 	Linker,
 	Assembler,
+	LanguageServer
 };
 
 struct CompilerOutputs
diff --git a/test/libsolidity/lsp/didChange_template.sol b/test/libsolidity/lsp/didChange_template.sol
new file mode 100644
index 0000000000..d08ba140e5
--- /dev/null
+++ b/test/libsolidity/lsp/didChange_template.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract C
+{
+}
diff --git a/test/libsolidity/lsp/didOpen_with_import.sol b/test/libsolidity/lsp/didOpen_with_import.sol
new file mode 100644
index 0000000000..f505ca6e5e
--- /dev/null
+++ b/test/libsolidity/lsp/didOpen_with_import.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+import './lib.sol';
+
+contract C
+{
+    function f(uint a, uint b) public pure returns (uint)
+    {
+        return Lib.add(2 * a, b);
+    }
+}
diff --git a/test/libsolidity/lsp/lib.sol b/test/libsolidity/lsp/lib.sol
new file mode 100644
index 0000000000..f4fb51e77b
--- /dev/null
+++ b/test/libsolidity/lsp/lib.sol
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+library Lib
+{
+    function add(uint a, uint b) public pure returns (uint result)
+    {
+        result = a + b;
+    }
+
+    function warningWithUnused() public pure
+    {
+        uint unused;
+    }
+}
diff --git a/test/libsolidity/lsp/publish_diagnostics_1.sol b/test/libsolidity/lsp/publish_diagnostics_1.sol
new file mode 100644
index 0000000000..e667185122
--- /dev/null
+++ b/test/libsolidity/lsp/publish_diagnostics_1.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract MyContract
+{
+    constructor()
+    {
+        uint unused; // [Warning 2072] Unused local variable.
+    }
+}
+
+contract D
+{
+    function main() public payable returns (uint)
+    {
+        MyContract c = new MyContract();
+    }
+}
diff --git a/test/libsolidity/lsp/publish_diagnostics_2.sol b/test/libsolidity/lsp/publish_diagnostics_2.sol
new file mode 100644
index 0000000000..9686189552
--- /dev/null
+++ b/test/libsolidity/lsp/publish_diagnostics_2.sol
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract C
+{
+    function makeSomeError() public pure returns (uint res)
+    {
+        uint x = "hi";
+        return;
+        res = 2;
+    }
+}
+
+contract D
+{
+    function main() public payable returns (uint)
+    {
+        C c = new C();
+        return c.makeSomeError(2, 3);
+    }
+}
diff --git a/test/libsolidity/lsp/publish_diagnostics_3.sol b/test/libsolidity/lsp/publish_diagnostics_3.sol
new file mode 100644
index 0000000000..bb8998a6ad
--- /dev/null
+++ b/test/libsolidity/lsp/publish_diagnostics_3.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+abstract contract A {
+    function a() public virtual;
+}
+
+contract B is A
+{
+}
diff --git a/test/lsp.py b/test/lsp.py
new file mode 100755
index 0000000000..d558c20d95
--- /dev/null
+++ b/test/lsp.py
@@ -0,0 +1,874 @@
+#!/usr/bin/env python3
+
+import argparse
+import fnmatch
+import json
+import os
+import subprocess
+import traceback
+
+from typing import Any, List, Optional, Tuple, Union
+
+import colorama # Enables the use of SGR & CUP terminal VT sequences on Windows.
+from deepdiff import DeepDiff
+
+# {{{ JsonRpcProcess
+class BadHeader(Exception):
+    def __init__(self, msg: str):
+        super().__init__("Bad header: " + msg)
+
+class JsonRpcProcess:
+    exe_path: str
+    exe_args: List[str]
+    process: subprocess.Popen
+    trace_io: bool
+
+    def __init__(self, exe_path: str, exe_args: List[str], trace_io: bool = True):
+        self.exe_path = exe_path
+        self.exe_args = exe_args
+        self.trace_io = trace_io
+
+    def __enter__(self):
+        self.process = subprocess.Popen(
+            [self.exe_path, *self.exe_args],
+            stdin=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE
+        )
+        return self
+
+    def __exit__(self, exception_type, exception_value, traceback) -> None:
+        self.process.kill()
+        self.process.wait(timeout=2.0)
+
+    def trace(self, topic: str, message: str) -> None:
+        if self.trace_io:
+            print(f"{SGR_TRACE}{topic}:{SGR_RESET} {message}")
+
+    def receive_message(self) -> Union[None, dict]:
+        # Note, we should make use of timeout to avoid infinite blocking if nothing is received.
+        CONTENT_LENGTH_HEADER = "Content-Length: "
+        CONTENT_TYPE_HEADER = "Content-Type: "
+        if self.process.stdout == None:
+            return None
+        message_size = None
+        while True:
+            # read header
+            line = self.process.stdout.readline()
+            if line == '':
+                # server quit
+                return None
+            line = line.decode("utf-8")
+            if not line.endswith("\r\n"):
+                raise BadHeader("missing newline")
+            # remove the "\r\n"
+            line = line[:-2]
+            if line == '':
+                break # done with the headers
+            if line.startswith(CONTENT_LENGTH_HEADER):
+                line = line[len(CONTENT_LENGTH_HEADER):]
+                if not line.isdigit():
+                    raise BadHeader("size is not int")
+                message_size = int(line)
+            elif line.startswith(CONTENT_TYPE_HEADER):
+                # nothing todo with type for now.
+                pass
+            else:
+                raise BadHeader("unknown header")
+        if message_size is None:
+            raise BadHeader("missing size")
+        rpc_message = self.process.stdout.read(message_size).decode("utf-8")
+        json_object = json.loads(rpc_message)
+        self.trace('receive_message', json.dumps(json_object, indent=4, sort_keys=True))
+        return json_object
+
+    def send_message(self, method_name: str, params: Optional[dict]) -> None:
+        if self.process.stdin == None:
+            return
+        message = {
+            'jsonrpc': '2.0',
+            'method': method_name,
+            'params': params
+        }
+        json_string = json.dumps(obj=message)
+        rpc_message = f"Content-Length: {len(json_string)}\r\n\r\n{json_string}"
+        self.trace(f'send_message ({method_name})', json.dumps(message, indent=4, sort_keys=True))
+        self.process.stdin.write(rpc_message.encode("utf-8"))
+        self.process.stdin.flush()
+
+    def call_method(self, method_name: str, params: Optional[dict]) -> Any:
+        self.send_message(method_name, params)
+        return self.receive_message()
+
+    def send_notification(self, name: str, params: Optional[dict] = None) -> None:
+        self.send_message(name, params)
+
+# }}}
+
+SGR_RESET = '\033[m'
+SGR_TRACE = '\033[1;36m'
+SGR_NOTICE = '\033[1;35m'
+SGR_TEST_BEGIN = '\033[1;33m'
+SGR_ASSERT_BEGIN = '\033[1;34m'
+SGR_STATUS_OKAY = '\033[1;32m'
+SGR_STATUS_FAIL = '\033[1;31m'
+
+class ExpectationFailed(Exception):
+    def __init__(self, actual, expected):
+        self.actual = actual
+        self.expected = expected
+        diff = DeepDiff(actual, expected)
+        super().__init__(
+            f"Expectation failed.\n\tExpected {expected}\n\tbut got {actual}.\n\t{diff}"
+        )
+
+def create_cli_parser() -> argparse.ArgumentParser:
+    parser = argparse.ArgumentParser(description="Solidity LSP Test suite")
+    parser.set_defaults(trace_io=False)
+    parser.add_argument(
+        "-T, --trace-io",
+        dest="trace_io",
+        action="store_true",
+        help="Be more verbose by also printing assertions."
+    )
+    parser.set_defaults(print_assertions=False)
+    parser.add_argument(
+        "-v, --print-assertions",
+        dest="print_assertions",
+        action="store_true",
+        help="Be more verbose by also printing assertions."
+    )
+    parser.add_argument(
+        "-t, --test-pattern",
+        dest="test_pattern",
+        type=str,
+        default="*",
+        help="Filters all available tests by matching against this test pattern (using globbing)",
+        nargs="?"
+    )
+    parser.add_argument(
+        "solc_path",
+        type=str,
+        default="solc",
+        help="Path to solc binary to test against",
+        nargs="?"
+    )
+    parser.add_argument(
+        "project_root_dir",
+        type=str,
+        default=f"{os.path.dirname(os.path.realpath(__file__))}/..",
+        help="Path to Solidity project's root directory (must be fully qualified).",
+        nargs="?"
+    )
+    return parser
+
+class Counter:
+    total: int = 0
+    passed: int = 0
+    failed: int = 0
+
+class SolidityLSPTestSuite: # {{{
+    test_counter = Counter()
+    assertion_counter = Counter()
+    print_assertions: bool = False
+    trace_io: bool = False
+    test_pattern: str
+
+    def __init__(self):
+        colorama.init()
+        args = create_cli_parser().parse_args()
+        self.solc_path = args.solc_path
+        self.project_root_dir = os.path.realpath(args.project_root_dir) + "/test/libsolidity/lsp"
+        self.project_root_uri = "file://" + self.project_root_dir
+        self.print_assertions = args.print_assertions
+        self.trace_io = args.trace_io
+        self.test_pattern = args.test_pattern
+
+        print(f"{SGR_NOTICE}test pattern: {self.test_pattern}{SGR_RESET}")
+
+    def main(self) -> int:
+        """
+        Runs all test cases.
+        Returns 0 on success and the number of failing assertions (capped to 127) otherwise.
+        """
+        all_tests = sorted([
+            str(name)[5:]
+            for name in dir(SolidityLSPTestSuite)
+            if callable(getattr(SolidityLSPTestSuite, name)) and name.startswith("test_")
+        ])
+        filtered_tests = fnmatch.filter(all_tests, self.test_pattern)
+        for method_name in filtered_tests:
+            test_fn = getattr(self, 'test_' + method_name)
+            title: str = test_fn.__name__[5:]
+            print(f"{SGR_TEST_BEGIN}Testing {title} ...{SGR_RESET}")
+            try:
+                with JsonRpcProcess(self.solc_path, ["--lsp"], trace_io=self.trace_io) as solc:
+                    test_fn(solc)
+                    self.test_counter.passed += 1
+            except ExpectationFailed as e:
+                self.test_counter.failed += 1
+                print(e)
+                print(traceback.format_exc())
+            except Exception as e: # pragma pylint: disable=broad-except
+                self.test_counter.failed += 1
+                print(f"Unhandled exception {e.__class__.__name__} caught: {e}")
+                print(traceback.format_exc())
+
+        print(
+            f"\n{SGR_NOTICE}Summary:{SGR_RESET}\n\n"
+            f"  Test cases: {self.test_counter.passed} passed, {self.test_counter.failed} failed\n"
+            f"  Assertions: {self.assertion_counter.passed} passed, {self.assertion_counter.failed} failed\n"
+        )
+
+        return min(max(self.test_counter.failed, self.assertion_counter.failed), 127)
+
+    def setup_lsp(self, lsp: JsonRpcProcess, expose_project_root=True):
+        """
+        Prepares the solc LSP server by calling `initialize`,
+        and `initialized` methods.
+        """
+        params = {
+            'processId': None,
+            'rootUri': self.project_root_uri,
+            'trace': 'off',
+            'initializationOptions': {},
+            'capabilities': {
+                'textDocument': {
+                    'publishDiagnostics': {'relatedInformation': True}
+                },
+                'workspace': {
+                    'applyEdit': True,
+                    'configuration': True,
+                    'didChangeConfiguration': {'dynamicRegistration': True},
+                    'workspaceEdit': {'documentChanges': True},
+                    'workspaceFolders': True
+                }
+            }
+        }
+        if expose_project_root == False:
+            params['rootUri'] = None
+        lsp.call_method('initialize', params)
+        lsp.send_notification('initialized')
+
+    # {{{ helpers
+    def get_test_file_path(self, test_case_name):
+        return f"{self.project_root_dir}/{test_case_name}.sol"
+
+    def get_test_file_uri(self, test_case_name):
+        return "file://" + self.get_test_file_path(test_case_name)
+
+    def get_test_file_contents(self, test_case_name):
+        """
+        Reads the file contents from disc for a given test case.
+        The `test_case_name` will be the basename of the file
+        in the test path (test/libsolidity/lsp).
+        """
+        with open(self.get_test_file_path(test_case_name), mode="r", encoding="utf-8", newline='') as f:
+            return f.read()
+
+    def require_params_for_method(self, method_name: str, message: dict) -> Any:
+        """
+        Ensures the given RPC message does contain the
+        field 'method' with the given method name,
+        and then returns its passed params.
+        An exception is raised on expectation failures.
+        """
+        assert message is not None
+        if 'error' in message.keys():
+            code = message['error']["code"]
+            text = message['error']['message']
+            raise RuntimeError(f"Error {code} received. {text}")
+        if 'method' not in message.keys():
+            raise RuntimeError("No method received but something else.")
+        self.expect_equal(message['method'], method_name, "Ensure expected method name")
+        return message['params']
+
+    def wait_for_diagnostics(self, solc: JsonRpcProcess, count: int) -> List[dict]:
+        """
+        Return `count` number of published diagnostic reports sorted by file URI.
+        """
+        reports = []
+        for _ in range(0, count):
+            message = solc.receive_message()
+            assert message is not None # This can happen if the server aborts early.
+            reports.append(
+                self.require_params_for_method(
+                    'textDocument/publishDiagnostics',
+                    message,
+                )
+            )
+        return sorted(reports, key=lambda x: x['uri'])
+
+    def open_file_and_wait_for_diagnostics(
+        self,
+        solc_process: JsonRpcProcess,
+        test_case_name: str,
+        max_diagnostic_reports: int = 1
+    ) -> List[Any]:
+        """
+        Opens file for given test case and waits for diagnostics to be published.
+        """
+        assert max_diagnostic_reports > 0
+        solc_process.send_message(
+            'textDocument/didOpen',
+            {
+                'textDocument':
+                {
+                    'uri': self.get_test_file_uri(test_case_name),
+                    'languageId': 'Solidity',
+                    'version': 1,
+                    'text': self.get_test_file_contents(test_case_name)
+                }
+            }
+        )
+        return self.wait_for_diagnostics(solc_process, max_diagnostic_reports)
+
+    def expect_equal(self, actual, expected, description="Equality") -> None:
+        self.assertion_counter.total += 1
+        prefix = f"[{self.assertion_counter.total}] {SGR_ASSERT_BEGIN}{description}: "
+        diff = DeepDiff(actual, expected)
+        if len(diff) == 0:
+            self.assertion_counter.passed += 1
+            if self.print_assertions:
+                print(prefix + SGR_STATUS_OKAY + 'OK' + SGR_RESET)
+            return
+
+        # Failed assertions are always printed.
+        self.assertion_counter.failed += 1
+        print(prefix + SGR_STATUS_FAIL + 'FAILED' + SGR_RESET)
+        raise ExpectationFailed(actual, expected)
+
+    def expect_empty_diagnostics(self, published_diagnostics: List[dict]) -> None:
+        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
+        self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0, "should not contain diagnostics")
+
+    def expect_diagnostic(
+        self,
+        diagnostic,
+        code: int,
+        lineNo: int,
+        startEndColumns: Tuple[int, int]
+    ):
+        assert len(startEndColumns) == 2
+        [startColumn, endColumn] = startEndColumns
+        self.expect_equal(diagnostic['code'], code, f'diagnostic: {code}')
+        self.expect_equal(
+            diagnostic['range'],
+            {
+                'start': {'character': startColumn, 'line': lineNo},
+                'end': {'character': endColumn, 'line': lineNo}
+            },
+            "diagnostic: check range"
+        )
+    # }}}
+
+    # {{{ actual tests
+    def test_publish_diagnostics_warnings(self, solc: JsonRpcProcess) -> None:
+        self.setup_lsp(solc)
+        TEST_NAME = 'publish_diagnostics_1'
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
+
+        self.expect_equal(len(published_diagnostics), 1, "One published_diagnostics message")
+        report = published_diagnostics[0]
+
+        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
+        diagnostics = report['diagnostics']
+
+        self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
+        self.expect_diagnostic(diagnostics[0], code=6321, lineNo=13, startEndColumns=(44, 48))
+        self.expect_diagnostic(diagnostics[1], code=2072, lineNo= 7, startEndColumns=( 8, 19))
+        self.expect_diagnostic(diagnostics[2], code=2072, lineNo=15, startEndColumns=( 8, 20))
+
+    def test_publish_diagnostics_errors(self, solc: JsonRpcProcess) -> None:
+        self.setup_lsp(solc)
+        TEST_NAME = 'publish_diagnostics_2'
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
+
+        self.expect_equal(len(published_diagnostics), 1, "One published_diagnostics message")
+        report = published_diagnostics[0]
+
+        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
+        diagnostics = report['diagnostics']
+
+        self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
+        self.expect_diagnostic(diagnostics[0], code=9574, lineNo= 7, startEndColumns=( 8, 21))
+        self.expect_diagnostic(diagnostics[1], code=6777, lineNo= 8, startEndColumns=( 8, 15))
+        self.expect_diagnostic(diagnostics[2], code=6160, lineNo=18, startEndColumns=(15, 36))
+
+    def test_publish_diagnostics_errors_multiline(self, solc: JsonRpcProcess) -> None:
+        self.setup_lsp(solc)
+        TEST_NAME = 'publish_diagnostics_3'
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
+
+        self.expect_equal(len(published_diagnostics), 1, "One published_diagnostics message")
+        report = published_diagnostics[0]
+
+        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
+        diagnostics = report['diagnostics']
+
+        self.expect_equal(len(diagnostics), 1, "3 diagnostic messages")
+        self.expect_equal(diagnostics[0]['code'], 3656, "diagnostic: check code")
+        self.expect_equal(
+            diagnostics[0]['range'],
+            {
+                'end': {'character': 1, 'line': 9},
+                'start': {'character': 0, 'line': 7}
+            },
+            "diagnostic: check range"
+        )
+
+    def test_textDocument_didOpen_with_relative_import(self, solc: JsonRpcProcess) -> None:
+        self.setup_lsp(solc)
+        TEST_NAME = 'didOpen_with_import'
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME, 2)
+
+        self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
+
+        # primary file:
+        report = published_diagnostics[0]
+        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
+        self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
+
+        # imported file (./lib.sol):
+        report = published_diagnostics[1]
+        self.expect_equal(report['uri'], self.get_test_file_uri('lib'), "Correct file URI")
+        self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
+        self.expect_diagnostic(report['diagnostics'][0], code=2072, lineNo=12, startEndColumns=(8, 19))
+
+    def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
+        # Reusing another test but now change some file that generates an error in the other.
+        self.test_textDocument_didOpen_with_relative_import(solc)
+        self.open_file_and_wait_for_diagnostics(solc, 'lib', 2)
+        solc.send_message(
+            'textDocument/didChange',
+            {
+                'textDocument':
+                {
+                    'uri': self.get_test_file_uri('lib')
+                },
+                'contentChanges':
+                [
+                    {
+                        'range': {
+                            'start': { 'line':  5, 'character': 0 },
+                            'end':   { 'line': 10, 'character': 0 }
+                        },
+                        'text': "" # deleting function `add`
+                    }
+                ]
+            }
+        )
+        published_diagnostics = self.wait_for_diagnostics(solc, 2)
+        self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
+
+        # Main file now contains a new diagnostic
+        report = published_diagnostics[0]
+        self.expect_equal(report['uri'], self.get_test_file_uri('didOpen_with_import'))
+        diagnostics = report['diagnostics']
+        self.expect_equal(len(diagnostics), 1, "now, no diagnostics")
+        self.expect_diagnostic(diagnostics[0], code=9582, lineNo=9, startEndColumns=(15, 22))
+
+        # The modified file retains the same diagnostics.
+        report = published_diagnostics[1]
+        self.expect_equal(report['uri'], self.get_test_file_uri('lib'))
+        self.expect_equal(len(report['diagnostics']), 0)
+        # The warning went away because the compiler aborts further processing after the error.
+
+    def test_textDocument_didOpen_with_relative_import_without_project_url(self, solc: JsonRpcProcess) -> None:
+        self.setup_lsp(solc, expose_project_root=False)
+        TEST_NAME = 'didOpen_with_import'
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME, 2)
+        self.verify_didOpen_with_import_diagnostics(published_diagnostics)
+
+    def verify_didOpen_with_import_diagnostics(
+        self,
+        published_diagnostics: List[Any],
+        main_file_name='didOpen_with_import'
+    ):
+        self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
+
+        # primary file:
+        report = published_diagnostics[0]
+        self.expect_equal(report['uri'], self.get_test_file_uri(main_file_name), "Correct file URI")
+        self.expect_equal(len(report['diagnostics']), 0, "one diagnostic")
+
+        # imported file (./lib.sol):
+        report = published_diagnostics[1]
+        self.expect_equal(report['uri'], self.get_test_file_uri('lib'), "Correct file URI")
+        self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
+        self.expect_diagnostic(report['diagnostics'][0], code=2072, lineNo=12, startEndColumns=(8, 19))
+
+    def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess) -> None:
+        self.setup_lsp(solc)
+        TEST_NAME = 'publish_diagnostics_1'
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
+        self.expect_equal(len(published_diagnostics), 1, "One published_diagnostics message")
+        report = published_diagnostics[0]
+        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
+        diagnostics = report['diagnostics']
+        self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
+        self.expect_diagnostic(diagnostics[0], code=6321, lineNo=13, startEndColumns=(44, 48))
+        self.expect_diagnostic(diagnostics[1], code=2072, lineNo= 7, startEndColumns=( 8, 19))
+        self.expect_diagnostic(diagnostics[2], code=2072, lineNo=15, startEndColumns=( 8, 20))
+
+        solc.send_message(
+            'textDocument/didChange',
+            {
+                'textDocument': {
+                    'uri': self.get_test_file_uri(TEST_NAME)
+                },
+                'contentChanges': [
+                    {
+                        'range': {
+                            'start': { 'line': 7, 'character': 1 },
+                            'end': {   'line': 8, 'character': 1 }
+                        },
+                        'text': ""
+                    }
+                ]
+            }
+        )
+        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(published_diagnostics), 1)
+        report = published_diagnostics[0]
+        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
+        diagnostics = report['diagnostics']
+        self.expect_equal(len(diagnostics), 2)
+        self.expect_diagnostic(diagnostics[0], code=6321, lineNo=12, startEndColumns=(44, 48))
+        self.expect_diagnostic(diagnostics[1], code=2072, lineNo=14, startEndColumns=( 8, 20))
+
+    def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess) -> None:
+        # Reuse this test to prepare and ensure it is as expected
+        self.test_textDocument_didOpen_with_relative_import(solc)
+        self.open_file_and_wait_for_diagnostics(solc, 'lib', 2)
+        # lib.sol: Fix the unused variable message by removing it.
+        solc.send_message(
+            'textDocument/didChange',
+            {
+                'textDocument':
+                {
+                    'uri': self.get_test_file_uri('lib')
+                },
+                'contentChanges': # delete the in-body statement: `uint unused;`
+                [
+                    {
+                        'range':
+                        {
+                            'start': { 'line': 12, 'character': 1 },
+                            'end':   { 'line': 13, 'character': 1 }
+                        },
+                        'text': ""
+                    }
+                ]
+            }
+        )
+        published_diagnostics = self.wait_for_diagnostics(solc, 2)
+        self.expect_equal(len(published_diagnostics), 2, "published diagnostics count")
+        report1 = published_diagnostics[0]
+        self.expect_equal(report1['uri'], self.get_test_file_uri('didOpen_with_import'), "Correct file URI")
+        self.expect_equal(len(report1['diagnostics']), 0, "no diagnostics in didOpen_with_import.sol")
+        report2 = published_diagnostics[1]
+        self.expect_equal(report2['uri'], self.get_test_file_uri('lib'), "Correct file URI")
+        self.expect_equal(len(report2['diagnostics']), 0, "no diagnostics in lib.sol")
+
+        # Now close the file and expect the warning to re-appear
+        solc.send_message(
+            'textDocument/didClose',
+            { 'textDocument': { 'uri': self.get_test_file_uri('lib') }}
+        )
+
+        published_diagnostics = self.wait_for_diagnostics(solc, 2)
+        self.verify_didOpen_with_import_diagnostics(published_diagnostics)
+
+    def test_textDocument_opening_two_new_files_edit_and_close(self, solc: JsonRpcProcess) -> None:
+        """
+        Open two new files A and B, let A import B, expect no error,
+        then close B and now expect the error of file B not being found.
+        """
+
+        self.setup_lsp(solc)
+        FILE_A_URI = 'file:///a.sol'
+        solc.send_message('textDocument/didOpen', {
+            'textDocument': {
+                'uri': FILE_A_URI,
+                'languageId': 'Solidity',
+                'version': 1,
+                'text': ''.join([
+                    '// SPDX-License-Identifier: UNLICENSED\n',
+                    'pragma solidity >=0.8.0;\n',
+                ])
+            }
+        })
+        reports = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(reports), 1, "one publish diagnostics notification")
+        self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
+
+        FILE_B_URI = 'file:///b.sol'
+        solc.send_message('textDocument/didOpen', {
+            'textDocument': {
+                'uri': FILE_B_URI,
+                'languageId': 'Solidity',
+                'version': 1,
+                'text': ''.join([
+                    '// SPDX-License-Identifier: UNLICENSED\n',
+                    'pragma solidity >=0.8.0;\n',
+                ])
+            }
+        })
+        reports = self.wait_for_diagnostics(solc, 2)
+        self.expect_equal(len(reports), 2, "one publish diagnostics notification")
+        self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
+        self.expect_equal(len(reports[1]['diagnostics']), 0, "should not contain diagnostics")
+
+        solc.send_message('textDocument/didChange', {
+            'textDocument': {
+                'uri': FILE_A_URI
+            },
+            'contentChanges': [
+                {
+                    'range': {
+                        'start': { 'line': 2, 'character': 0 },
+                        'end': { 'line': 2, 'character': 0 }
+                    },
+                    'text': 'import "./b.sol";\n'
+                }
+            ]
+        })
+        reports = self.wait_for_diagnostics(solc, 2)
+        self.expect_equal(len(reports), 2, "one publish diagnostics notification")
+        self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
+        self.expect_equal(len(reports[1]['diagnostics']), 0, "should not contain diagnostics")
+
+        solc.send_message(
+            'textDocument/didClose',
+            { 'textDocument': { 'uri': FILE_B_URI }}
+        )
+        # We only get one diagnostics message since the diagnostics for b.sol was empty.
+        reports = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(reports), 1, "one publish diagnostics notification")
+        self.expect_diagnostic(reports[0]['diagnostics'][0], 6275, 2, (0, 17)) # a.sol: File B not found
+        self.expect_equal(reports[0]['uri'], FILE_A_URI, "Correct uri")
+
+    def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc: JsonRpcProcess) -> None:
+        """
+        We open a virtual file that imports a real file with a warning.
+        Once we close the virtual file, the warning is removed from the diagnostics,
+        since the real file is not considered part of the project anymore.
+        """
+
+        self.setup_lsp(solc)
+        FILE_A_URI = f'file://{self.project_root_dir}/a.sol'
+        solc.send_message('textDocument/didOpen', {
+            'textDocument': {
+                'uri': FILE_A_URI,
+                'languageId': 'Solidity',
+                'version': 1,
+                'text':
+                    '// SPDX-License-Identifier: UNLICENSED\n'
+                    'pragma solidity >=0.8.0;\n'
+                    'import "./lib.sol";\n'
+            }
+        })
+        reports = self.wait_for_diagnostics(solc, 2)
+        self.expect_equal(len(reports), 2, '')
+        self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
+        self.expect_diagnostic(reports[1]['diagnostics'][0], 2072, 12, (8, 19)) # unused variable in lib.sol
+
+        # Now close the file and expect the warning for lib.sol to be removed
+        solc.send_message(
+            'textDocument/didClose',
+            { 'textDocument': { 'uri': FILE_A_URI }}
+        )
+        reports = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(reports), 1, '')
+        self.expect_equal(reports[0]['uri'], f'file://{self.project_root_dir}/lib.sol', "")
+        self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
+
+
+    def test_textDocument_didChange_at_eol(self, solc: JsonRpcProcess) -> None:
+        """
+        Append at one line and insert a new one below.
+        """
+        self.setup_lsp(solc)
+        FILE_NAME = 'didChange_template'
+        FILE_URI = self.get_test_file_uri(FILE_NAME)
+        solc.send_message('textDocument/didOpen', {
+            'textDocument': {
+                'uri': FILE_URI,
+                'languageId': 'Solidity',
+                'version': 1,
+                'text': self.get_test_file_contents(FILE_NAME)
+            }
+        })
+        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
+        self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0, "no diagnostics")
+        solc.send_message('textDocument/didChange', {
+            'textDocument': {
+                'uri': FILE_URI
+            },
+            'contentChanges': [
+                {
+                    'range': {
+                        'start': { 'line': 6, 'character': 0 },
+                        'end': { 'line': 6, 'character': 0 }
+                    },
+                    'text': " f"
+                }
+            ]
+        })
+        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
+        report2 = published_diagnostics[0]
+        self.expect_equal(report2['uri'], FILE_URI, "Correct file URI")
+        self.expect_equal(len(report2['diagnostics']), 1, "one diagnostic")
+        self.expect_diagnostic(report2['diagnostics'][0], 7858, 6, (1, 2))
+
+        solc.send_message('textDocument/didChange', {
+            'textDocument': { 'uri': FILE_URI },
+            'contentChanges': [
+                {
+                    'range': {
+                        'start': { 'line': 6, 'character': 2 },
+                        'end': { 'line': 6, 'character': 2 }
+                    },
+                    'text': 'unction f() public {}'
+                }
+            ]
+        })
+        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
+        report3 = published_diagnostics[0]
+        self.expect_equal(report3['uri'], FILE_URI, "Correct file URI")
+        self.expect_equal(len(report3['diagnostics']), 1, "one diagnostic")
+        self.expect_diagnostic(report3['diagnostics'][0], 4126, 6, (1, 23))
+
+    def test_textDocument_didChange_empty_file(self, solc: JsonRpcProcess) -> None:
+        """
+        Starts with an empty file and changes it to look like
+        the didOpen_with_import test case. Then we can use
+        the same verification calls to ensure it worked as expected.
+        """
+        # This FILE_NAME must be alphabetically before lib.sol to not over-complify
+        # the test logic in verify_didOpen_with_import_diagnostics.
+        FILE_NAME = 'a_new_file'
+        FILE_URI = self.get_test_file_uri(FILE_NAME)
+        self.setup_lsp(solc)
+        solc.send_message('textDocument/didOpen', {
+            'textDocument': {
+                'uri': FILE_URI,
+                'languageId': 'Solidity',
+                'version': 1,
+                'text': ''
+            }
+        })
+        reports = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(reports), 1)
+        report = reports[0]
+        published_diagnostics = report['diagnostics']
+        self.expect_equal(len(published_diagnostics), 2)
+        self.expect_diagnostic(published_diagnostics[0], code=1878, lineNo=0, startEndColumns=(0, 0))
+        self.expect_diagnostic(published_diagnostics[1], code=3420, lineNo=0, startEndColumns=(0, 0))
+        solc.send_message('textDocument/didChange', {
+            'textDocument': {
+                'uri': self.get_test_file_uri('a_new_file')
+            },
+            'contentChanges': [
+                {
+                    'range': {
+                        'start': { 'line': 0, 'character': 0 },
+                        'end': { 'line': 0, 'character': 0 }
+                    },
+                    'text': self.get_test_file_contents('didOpen_with_import')
+                }
+            ]
+        })
+        published_diagnostics = self.wait_for_diagnostics(solc, 2)
+        self.verify_didOpen_with_import_diagnostics(published_diagnostics, 'a_new_file')
+
+    def test_textDocument_didChange_multi_line(self, solc: JsonRpcProcess) -> None:
+        """
+        Starts with an empty file and changes it to multiple times, changing
+        content across lines.
+        """
+        self.setup_lsp(solc)
+        FILE_NAME = 'didChange_template'
+        FILE_URI = self.get_test_file_uri(FILE_NAME)
+        solc.send_message('textDocument/didOpen', {
+            'textDocument': {
+                'uri': FILE_URI,
+                'languageId': 'Solidity',
+                'version': 1,
+                'text': self.get_test_file_contents(FILE_NAME)
+            }
+        })
+        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
+        self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0, "no diagnostics")
+        solc.send_message('textDocument/didChange', {
+            'textDocument': { 'uri': FILE_URI },
+            'contentChanges': [
+                {
+                    'range': {
+                        'start': { 'line': 3, 'character': 3 },
+                        'end': { 'line': 4, 'character': 1 }
+                    },
+                    'text': "tract D {\n\n  uint x\n = -1; \n "
+                }
+            ]
+        })
+        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
+        report2 = published_diagnostics[0]
+        self.expect_equal(report2['uri'], FILE_URI, "Correct file URI")
+        self.expect_equal(len(report2['diagnostics']), 1, "one diagnostic")
+        self.expect_diagnostic(report2['diagnostics'][0], 7407, 6, (3, 5))
+
+        # Now we are changing the part "x\n = -" of "uint x\n = -1;"
+        solc.send_message('textDocument/didChange', {
+            'textDocument': { 'uri': FILE_URI },
+            'contentChanges': [
+                {
+                    'range': {
+                        'start': { 'line': 5, 'character': 7 },
+                        'end': { 'line': 6, 'character': 4 }
+                    },
+                    'text': "y\n = [\nuint(1),\n3,4]+"
+                }
+            ]
+        })
+        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
+        report3 = published_diagnostics[0]
+        self.expect_equal(report3['uri'], FILE_URI, "Correct file URI")
+        self.expect_equal(len(report3['diagnostics']), 2, "two diagnostics")
+        diagnostic = report3['diagnostics'][0]
+        self.expect_equal(diagnostic['code'], 2271, 'diagnostic: 2271')
+        # check multi-line error code
+        self.expect_equal(
+            diagnostic['range'],
+            {
+                'end': {'character': 6, 'line': 8},
+                'start': {'character': 3, 'line': 6}
+            },
+            "diagnostic: check range"
+        )
+        diagnostic = report3['diagnostics'][1]
+        self.expect_equal(diagnostic['code'], 7407, 'diagnostic: 7407')
+        # check multi-line error code
+        self.expect_equal(
+            diagnostic['range'],
+            {
+                'end': {'character': 6, 'line': 8},
+                'start': {'character': 3, 'line': 6}
+            },
+            "diagnostic: check range"
+        )
+
+    # }}}
+    # }}}
+
+if __name__ == "__main__":
+    suite = SolidityLSPTestSuite()
+    exit_code = suite.main()
+    exit(exit_code)
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 494dbbd94d..73c999f3f7 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -158,7 +158,7 @@ BOOST_AUTO_TEST_CASE(multiple_input_modes)
 	};
 	string expectedMessage =
 		"The following options are mutually exclusive: "
-		"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast. "
+		"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast, --lsp. "
 		"Select at most one.";
 
 	for (string const& mode1: inputModeOptions)

From 84738eb9e6c630949cff0a21c1faedd8cbed9274 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 16 Dec 2021 18:05:25 +0100
Subject: [PATCH 0209/1748] Add security policy to github's template chooser

---
 .github/ISSUE_TEMPLATE/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 139c117874..a5a945a675 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -9,3 +9,6 @@ contact_links:
   - name: Feature Request
     url: https://github.com/ethereum/solidity/issues/new?template=feature_request.md&projects=ethereum/solidity/43
     about: Solidity language or infrastructure feature requests.
+  - name: Report a security vulnerability
+    url: https://github.com/ethereum/solidity/security/policy
+    about: Please review our security policy for more details.

From b3d9c596cd8371728935cfaedb060ff439075315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 16 Dec 2021 18:12:04 +0100
Subject: [PATCH 0210/1748] Move issue template labels to config.yml

---
 .github/ISSUE_TEMPLATE/bug_report.md          | 1 -
 .github/ISSUE_TEMPLATE/config.yml             | 6 +++---
 .github/ISSUE_TEMPLATE/documentation_issue.md | 1 -
 .github/ISSUE_TEMPLATE/feature_request.md     | 1 -
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 7be77f4226..36e25b1f09 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,6 +1,5 @@
 ---
 name: Bug Report
-labels: ["bug :bug:"]
 ---
 
 <!--## Prerequisites
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index a5a945a675..b4e9b3d505 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,13 +1,13 @@
 blank_issues_enabled: false
 contact_links:
   - name: Bug Report
-    url: https://github.com/ethereum/solidity/issues/new?template=bug_report.md&projects=ethereum/solidity/43
+    url: https://github.com/ethereum/solidity/issues/new?template=bug_report.md&projects=ethereum/solidity/43&labels=bug+%3Abug%3A
     about: Bug reports about the Solidity Compiler.
   - name: Documentation Issue
-    url: https://github.com/ethereum/solidity/issues/new?template=documentation_issue.md&projects=ethereum/solidity/43
+    url: https://github.com/ethereum/solidity/issues/new?template=documentation_issue.md&projects=ethereum/solidity/43&labels=documentation+%3Abook%3A
     about: Solidity documentation.
   - name: Feature Request
-    url: https://github.com/ethereum/solidity/issues/new?template=feature_request.md&projects=ethereum/solidity/43
+    url: https://github.com/ethereum/solidity/issues/new?template=feature_request.md&projects=ethereum/solidity/43&labels=feature
     about: Solidity language or infrastructure feature requests.
   - name: Report a security vulnerability
     url: https://github.com/ethereum/solidity/security/policy
diff --git a/.github/ISSUE_TEMPLATE/documentation_issue.md b/.github/ISSUE_TEMPLATE/documentation_issue.md
index 9e58b88684..7509ec395f 100644
--- a/.github/ISSUE_TEMPLATE/documentation_issue.md
+++ b/.github/ISSUE_TEMPLATE/documentation_issue.md
@@ -1,6 +1,5 @@
 ---
 name: Documentation Issue
-labels: ["documentation :book:"]
 ---
 
 ## Page
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 0b5bfbd4af..900e6977ce 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,6 +1,5 @@
 ---
 name: Feature Request
-labels: ["feature"]
 ---
 
 <!--## Prerequisites

From 4819d010a8e574ee9ff054220bbdbd217aeeaae0 Mon Sep 17 00:00:00 2001
From: Sean Billig <sean.billig@gmail.com>
Date: Tue, 14 Dec 2021 19:35:30 -0800
Subject: [PATCH 0211/1748] Update circleci mac xcode version to 13.2

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cda6e58909..b5e623ef4a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -339,7 +339,7 @@ defaults:
 
   - base_osx: &base_osx
       macos:
-        xcode: "11.0.0"
+        xcode: "13.2.0"
       environment:
         TERM: xterm
         MAKEFLAGS: -j 5

From 1b0cef46241306f0424e5afc049fce9d8eba964b Mon Sep 17 00:00:00 2001
From: GitHubPang <61439577+GitHubPang@users.noreply.github.com>
Date: Mon, 20 Dec 2021 10:56:39 +0800
Subject: [PATCH 0212/1748] Fix a few typos

---
 docs/control-structures.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 84b65918d3..7881a22eca 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -648,7 +648,7 @@ in the following situations:
 #. If your contract receives Ether via a public getter function.
 
 For the following cases, the error data from the external call
-(if provided) is forwarded. This mean that it can either cause
+(if provided) is forwarded. This means that it can either cause
 an `Error` or a `Panic` (or whatever else was given):
 
 #. If a ``.transfer()`` fails.
@@ -718,7 +718,7 @@ The ``revert`` statement takes a custom error as direct argument without parenth
 
     revert CustomError(arg1, arg2);
 
-For backards-compatibility reasons, there is also the ``revert()`` function, which uses parentheses
+For backwards-compatibility reasons, there is also the ``revert()`` function, which uses parentheses
 and accepts a string:
 
     revert();
@@ -863,7 +863,7 @@ type of error:
 
 
 It is planned to support other types of error data in the future.
-The strings ``Error`` and ``Panic`` are currently parsed as is and are not treated as an identifiers.
+The strings ``Error`` and ``Panic`` are currently parsed as is and are not treated as identifiers.
 
 In order to catch all error cases, you have to have at least the clause
 ``catch { ...}`` or the clause ``catch (bytes memory lowLevelData) { ... }``.

From b8e64a48838944563bc2f686e7e5d674dfd42e82 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 20 Dec 2021 13:11:00 +0100
Subject: [PATCH 0213/1748] Fixes CI build error for ArchLinux.

---
 test/ExecutionFramework.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/ExecutionFramework.h b/test/ExecutionFramework.h
index 53a09eaf8e..ae2ab68943 100644
--- a/test/ExecutionFramework.h
+++ b/test/ExecutionFramework.h
@@ -37,6 +37,7 @@
 
 #include <functional>
 
+#include <boost/rational.hpp>
 #include <boost/test/unit_test.hpp>
 
 namespace solidity::frontend::test

From 25a3bf2df04a5c70a6b095454d7ebec69e8445d2 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 20 Dec 2021 12:43:48 +0100
Subject: [PATCH 0214/1748] Set release date.

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 091af2d7c0..1bc4149072 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.11 (unreleased)
+### 0.8.11 (2021-12-20)
 
 Language Features:
  * General: New builtin function ``abi.encodeCall(functionPointer, (arg1, arg2, ...))`` that type-checks the arguments and returns the ABI-encoded function call data.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 6385af1707..608ba3dfda 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1548,6 +1548,10 @@
         "bugs": [],
         "released": "2021-11-09"
     },
+    "0.8.11": {
+        "bugs": [],
+        "released": "2021-12-20"
+    },
     "0.8.2": {
         "bugs": [
             "SignedImmutables",

From ff181ad12935812809f6d0dbc68856b2ea7287f2 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 20 Dec 2021 16:17:07 +0100
Subject: [PATCH 0215/1748] Set version to 0.8.12.

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b4e91f8261..f3a03d94e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.11")
+set(PROJECT_VERSION "0.8.12")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 1bc4149072..62123c770e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,13 @@
+### 0.8.12 (unreleased)
+
+Compiler Features:
+
+
+
+Bugfixes:
+
+
+
 ### 0.8.11 (2021-12-20)
 
 Language Features:

From c374d27eecbd14e26d1bcb74c8902797d0008691 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 20 Dec 2021 17:29:44 +0100
Subject: [PATCH 0216/1748] Remove constexpr.

---
 libsolidity/lsp/LanguageServer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 586220df11..254706cc60 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -72,7 +72,7 @@ optional<LineColumn> parseLineColumn(Json::Value const& _lineColumn)
 		return nullopt;
 }
 
-constexpr int toDiagnosticSeverity(Error::Type _errorType)
+int toDiagnosticSeverity(Error::Type _errorType)
 {
 	// 1=Error, 2=Warning, 3=Info, 4=Hint
 	switch (Error::errorSeverity(_errorType))

From ddd9a8414105dfea4f5bf9d7f028cf047be565f6 Mon Sep 17 00:00:00 2001
From: mejsiej <93134155+mejsiej@users.noreply.github.com>
Date: Thu, 2 Dec 2021 12:36:04 +0100
Subject: [PATCH 0217/1748] Improve failure message when generating getter.

---
 libsolidity/analysis/TypeChecker.cpp                     | 9 ++++++++-
 .../070_struct_accessor_one_array_only.sol               | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index aacd233a2a..d6c589f75c 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -592,7 +592,14 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
 				);
 		}
 		if (!getter.interfaceFunctionType())
-			m_errorReporter.typeError(6744_error, _variable.location(), "Internal or recursive type is not allowed for public state variables.");
+		{
+			solAssert(getter.returnParameterNames().size() == getter.returnParameterTypes().size());
+			solAssert(getter.parameterNames().size() == getter.parameterTypes().size());
+			if (getter.returnParameterTypes().empty() && getter.parameterTypes().empty())
+				m_errorReporter.typeError(5359_error, _variable.location(), "The struct has all its members omitted, therefore the getter cannot return any values.");
+			else
+				m_errorReporter.typeError(6744_error, _variable.location(), "Internal or recursive type is not allowed for public state variables.");
+		}
 	}
 
 	bool isStructMemberDeclaration = dynamic_cast<StructDefinition const*>(_variable.scope()) != nullptr;
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol
index 71129da5f1..79e7f17fc2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/070_struct_accessor_one_array_only.sol
@@ -3,4 +3,4 @@ contract test {
     Data public data;
 }
 // ----
-// TypeError 6744: (58-74): Internal or recursive type is not allowed for public state variables.
+// TypeError 5359: (58-74): The struct has all its members omitted, therefore the getter cannot return any values.

From 1124e28628e804af6e13f619b496a1134eb14bc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 10 Dec 2021 19:27:18 +0100
Subject: [PATCH 0218/1748] externalTests: With COMPILE_ONLY=1 still do
 compilation on all levels if only JS tests fail

---
 test/externalTests/colony.sh    | 14 +++++++++-----
 test/externalTests/common.sh    | 20 +++++++++++++-------
 test/externalTests/ens.sh       |  5 ++++-
 test/externalTests/gnosis-v2.sh |  8 ++++++--
 test/externalTests/gnosis.sh    |  5 ++++-
 test/externalTests/zeppelin.sh  |  8 ++++++--
 6 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index d5b57f024a..9bebc27222 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -36,12 +36,16 @@ function colony_test
     local repo="https://github.com/solidity-external-tests/colonyNetwork.git"
     local branch=develop_080
     local config_file="truffle.js"
+
+    local compile_only_presets=(
+        ir-no-optimize            # Compiles but tests run out of gas
+        ir-optimize-evm-only      # Compiles but tests run out of gas
+        legacy-no-optimize        # Compiles but tests run out of gas
+        legacy-optimize-evm-only  # Compiles but tests run out of gas
+    )
     local settings_presets=(
-        #ir-no-optimize            # Compiles but tests run out of gas
-        #ir-optimize-evm-only      # Compiles but tests run out of gas
+        "${compile_only_presets[@]}"
         ir-optimize-evm+yul
-        #legacy-no-optimize        # Compiles but tests run out of gas
-        #legacy-optimize-evm-only  # Compiles but tests run out of gas
         legacy-optimize-evm+yul
     )
 
@@ -67,7 +71,7 @@ function colony_test
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
     for preset in $selected_optimizer_presets; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 012a21b2f7..400304f3be 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -328,12 +328,16 @@ function compile_and_run_test
     local compile_fn="$1"
     local test_fn="$2"
     local verify_fn="$3"
+    local preset="$4"
+    local compile_only_presets="$5"
+
+    [[ $preset != *" "* ]] || assertFail "Preset names must not contain spaces."
 
     printLog "Running compile function..."
     time $compile_fn
     $verify_fn "$SOLCVERSION_SHORT" "$SOLCVERSION"
 
-    if [[ "$COMPILE_ONLY" == 1 ]]; then
+    if [[ "$COMPILE_ONLY" == 1 || " $compile_only_presets " == *" $preset "* ]]; then
         printLog "Skipping test function..."
     else
         printLog "Running test function..."
@@ -347,24 +351,26 @@ function truffle_run_test
     local binary_type="$2"
     local solc_path="$3"
     local preset="$4"
-    local compile_fn="$5"
-    local test_fn="$6"
+    local compile_only_presets="$5"
+    local compile_fn="$6"
+    local test_fn="$7"
 
     truffle_clean
     force_truffle_compiler_settings "$config_file" "$binary_type" "$solc_path" "$preset"
-    compile_and_run_test compile_fn test_fn truffle_verify_compiler_version
+    compile_and_run_test compile_fn test_fn truffle_verify_compiler_version "$preset" "$compile_only_presets"
 }
 
 function hardhat_run_test
 {
     local config_file="$1"
     local preset="$2"
-    local compile_fn="$3"
-    local test_fn="$4"
+    local compile_only_presets="$3"
+    local compile_fn="$4"
+    local test_fn="$5"
 
     hardhat_clean
     force_hardhat_compiler_settings "$config_file" "$preset"
-    compile_and_run_test compile_fn test_fn hardhat_verify_compiler_version
+    compile_and_run_test compile_fn test_fn hardhat_verify_compiler_version "$preset" "$compile_only_presets"
 }
 
 function external_test
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index c0bc4b558c..f425f97cf3 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -36,7 +36,10 @@ function ens_test
     local repo="https://github.com/ensdomains/ens.git"
     local branch=master
     local config_file="truffle.js"
+
+    local compile_only_presets=()
     local settings_presets=(
+        "${compile_only_presets[@]}"
         #ir-no-optimize           # "YulException: Variable var_ttl_236 is 1 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # "YulException: Variable var_ttl_236 is 1 slot(s) too deep inside the stack."
         ir-optimize-evm+yul
@@ -65,7 +68,7 @@ function ens_test
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
     for preset in $selected_optimizer_presets; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index bae0f0f1e6..f963c74a0f 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -36,11 +36,15 @@ function gnosis_safe_test
     local repo="https://github.com/solidity-external-tests/safe-contracts.git"
     local branch=v2_080
     local config_file="truffle-config.js"
+
+    local compile_only_presets=(
+        legacy-no-optimize        # "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit"
+    )
     local settings_presets=(
+        "${compile_only_presets[@]}"
         #ir-no-optimize           # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
         ir-optimize-evm+yul
-        #legacy-no-optimize       # "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit"
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
     )
@@ -65,7 +69,7 @@ function gnosis_safe_test
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
     for preset in $selected_optimizer_presets; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 562ab156f6..7d8bc24426 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -36,7 +36,10 @@ function gnosis_safe_test
     local repo="https://github.com/solidity-external-tests/safe-contracts.git"
     local branch=development_080
     local config_file="truffle-config.js"
+
+    local compile_only_presets=()
     local settings_presets=(
+        "${compile_only_presets[@]}"
         #ir-no-optimize            # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
         #ir-optimize-evm-only      # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
         ir-optimize-evm+yul
@@ -64,7 +67,7 @@ function gnosis_safe_test
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
     for preset in $selected_optimizer_presets; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 89f3d6b423..9865c7e40b 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -36,10 +36,14 @@ function zeppelin_test
     local repo="https://github.com/OpenZeppelin/openzeppelin-contracts.git"
     local branch=master
     local config_file="hardhat.config.js"
+
+    local compile_only_presets=(
+        ir-optimize-evm+yul       # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
+    )
     local settings_presets=(
+        "${compile_only_presets[@]}"
         #ir-no-optimize           # "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
-        #ir-optimize-evm+yul      # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
@@ -60,7 +64,7 @@ function zeppelin_test
     replace_version_pragmas
 
     for preset in $selected_optimizer_presets; do
-        hardhat_run_test "$config_file" "$preset" compile_fn test_fn
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
 

From 1cb976683514a6d1eda987d98b4c6dd3cd23b20a Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 20 Dec 2021 19:39:05 +0100
Subject: [PATCH 0219/1748] Document nodejs required version change.

---
 Changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 62123c770e..e4022b2b17 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,9 @@ Compiler Features:
 Bugfixes:
 
 
+Solc-Js:
+ * The wrapper now requires at least nodejs v10.
+
 
 ### 0.8.11 (2021-12-20)
 

From 449f56c15bbc4e5b1b8413d5e025d0f845794688 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 21 Dec 2021 15:23:03 +0100
Subject: [PATCH 0220/1748] pylint: Enable and fix consider-using-sys-exit
 warnings

---
 scripts/error_codes.py | 18 +++++++++---------
 scripts/pylint_all.py  |  6 +++---
 scripts/pylintrc       |  1 -
 test/lsp.py            |  3 ++-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index fe9c73b04b..65158a0a6c 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -277,7 +277,7 @@ def main(argv):
 
     if [check, fix, examine_coverage, next_id].count(True) != 1:
         print("usage: python error_codes.py --check | --fix [--no-confirm] | --examine-coverage | --next")
-        exit(1)
+        sys.exit(1)
 
     cwd = os.getcwd()
 
@@ -303,9 +303,9 @@ def main(argv):
     if examine_coverage:
         if not ok:
             print("Incorrect IDs have to be fixed before applying --examine-coverage")
-            exit(1)
+            sys.exit(1)
         res = 0 if examine_id_coverage(cwd, source_id_to_file_names) else 1
-        exit(res)
+        sys.exit(res)
 
     ok &= examine_id_coverage(cwd, source_id_to_file_names, new_ids_only=True)
 
@@ -314,18 +314,18 @@ def main(argv):
     if next_id:
         if not ok:
             print("Incorrect IDs have to be fixed before applying --next")
-            exit(1)
+            sys.exit(1)
         available_ids = {str(id) for id in range(1000, 10000)} - source_id_to_file_names.keys()
         next_id = get_next_id(available_ids)
         print(f"Next ID: {next_id}")
-        exit(0)
+        sys.exit(0)
 
     if ok:
         print("No incorrect IDs found")
-        exit(0)
+        sys.exit(0)
 
     if check:
-        exit(1)
+        sys.exit(1)
 
     assert fix, "Unexpected state, should not come here without --fix"
 
@@ -338,14 +338,14 @@ def main(argv):
         while len(answer) == 0 or answer not in "YNyn":
             answer = input("[Y/N]? ")
         if answer not in "yY":
-            exit(1)
+            sys.exit(1)
 
     # number of appearances for every id
     source_id_to_count = { id: len(file_names) for id, file_names in source_id_to_file_names.items() }
 
     fix_ids_in_source_files(source_file_names, source_id_to_count)
     print("Fixing completed")
-    exit(2)
+    sys.exit(2)
 
 
 if __name__ == "__main__":
diff --git a/scripts/pylint_all.py b/scripts/pylint_all.py
index 8dbe6a7fca..a60b000ede 100755
--- a/scripts/pylint_all.py
+++ b/scripts/pylint_all.py
@@ -6,9 +6,9 @@
 
 from argparse import ArgumentParser
 from os import path, walk
-from sys import exit
 from textwrap import dedent
 import subprocess
+import sys
 
 PROJECT_ROOT = path.dirname(path.dirname(path.realpath(__file__)))
 PYLINT_RCFILE = f"{PROJECT_ROOT}/scripts/pylintrc"
@@ -89,7 +89,7 @@ def main():
     success = pylint_all_filenames(options.dev_mode, rootdirs)
 
     if not success:
-        exit(1)
+        sys.exit(1)
     else:
         print("No problems found.")
 
@@ -98,4 +98,4 @@ def main():
     try:
         main()
     except KeyboardInterrupt:
-        exit("Interrupted by user. Exiting.")
+        sys.exit("Interrupted by user. Exiting.")
diff --git a/scripts/pylintrc b/scripts/pylintrc
index 50dbebee00..15ad5700ff 100644
--- a/scripts/pylintrc
+++ b/scripts/pylintrc
@@ -20,7 +20,6 @@ disable=
     bad-continuation,
     bad-indentation,
     bad-whitespace,
-    consider-using-sys-exit,
     duplicate-code,
     invalid-name,
     missing-docstring,
diff --git a/test/lsp.py b/test/lsp.py
index d558c20d95..fdaab9d88c 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -5,6 +5,7 @@
 import json
 import os
 import subprocess
+import sys
 import traceback
 
 from typing import Any, List, Optional, Tuple, Union
@@ -871,4 +872,4 @@ def test_textDocument_didChange_multi_line(self, solc: JsonRpcProcess) -> None:
 if __name__ == "__main__":
     suite = SolidityLSPTestSuite()
     exit_code = suite.main()
-    exit(exit_code)
+    sys.exit(exit_code)

From 784ae91b41be23f4059ec538e1a5281c237e1d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 21 Dec 2021 15:23:52 +0100
Subject: [PATCH 0221/1748] pylint: Enable and fix no-self-use warnings

---
 scripts/endToEndExtraction/verify-testcases.py | 3 ++-
 scripts/pylintrc                               | 1 -
 scripts/regressions.py                         | 3 ++-
 test/formal/rule.py                            | 3 ++-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/endToEndExtraction/verify-testcases.py b/scripts/endToEndExtraction/verify-testcases.py
index 8e1c60a792..150a1806ba 100755
--- a/scripts/endToEndExtraction/verify-testcases.py
+++ b/scripts/endToEndExtraction/verify-testcases.py
@@ -154,7 +154,8 @@ def diff(self, analyser):
 
         print(len(intersection), "test-cases - ", len(mismatches), " mismatche(s)")
 
-    def check_traces(self, test_name, left, right, mismatches):
+    @classmethod
+    def check_traces(cls, test_name, left, right, mismatches):
         for trace_id, trace in enumerate(left.traces):
             left_trace = trace
             right_trace = right.traces[trace_id]
diff --git a/scripts/pylintrc b/scripts/pylintrc
index 15ad5700ff..a2b5839f59 100644
--- a/scripts/pylintrc
+++ b/scripts/pylintrc
@@ -24,7 +24,6 @@ disable=
     invalid-name,
     missing-docstring,
     no-else-return,
-    no-self-use,
     pointless-string-statement,
     redefined-builtin,
     redefined-outer-name,
diff --git a/scripts/regressions.py b/scripts/regressions.py
index 046044197d..e30c0aeb9f 100755
--- a/scripts/regressions.py
+++ b/scripts/regressions.py
@@ -41,7 +41,8 @@ def __init__(self, description, args):
                                          "build/test/tools/ossfuzz")
         self._logpath = os.path.join(self._repo_root, "test_results")
 
-    def parseCmdLine(self, description, args):
+    @classmethod
+    def parseCmdLine(cls, description, args):
         argParser = ArgumentParser(description)
         argParser.add_argument('-o', '--out-dir', required=True, type=str,
                                help="""Directory where test results will be written""")
diff --git a/test/formal/rule.py b/test/formal/rule.py
index ac0f0c8a63..8fbf006883 100644
--- a/test/formal/rule.py
+++ b/test/formal/rule.py
@@ -39,6 +39,7 @@ def check(self, _nonopt, _opt):
 			self.error('Rule is incorrect.\nModel: ' + str(m))
 		self.solver.pop()
 
-	def error(self, msg):
+	@classmethod
+	def error(cls, msg):
 		print(msg)
 		sys.exit(1)

From 5b10ff1216696220a99e35841a7b11db6508c187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 21 Dec 2021 15:25:14 +0100
Subject: [PATCH 0222/1748] pylint: Enable and fix singleton-comparison
 warnings

---
 docs/conf.py            | 2 +-
 scripts/error_codes.py  | 2 +-
 scripts/pylintrc        | 1 -
 scripts/splitSources.py | 2 +-
 test/lsp.py             | 6 +++---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 5fa2e6ab5d..4ae4812c5e 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -73,7 +73,7 @@ def setup(sphinx):
 with open('../CMakeLists.txt', 'r', encoding='utf8') as f:
     version = re.search('PROJECT_VERSION "([^"]+)"', f.read()).group(1)
 # The full version, including alpha/beta/rc tags.
-if os.path.isfile('../prerelease.txt') != True or os.path.getsize('../prerelease.txt') == 0:
+if not os.path.isfile('../prerelease.txt') or os.path.getsize('../prerelease.txt') == 0:
     release = version
 else:
     # This is a prerelease version
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 65158a0a6c..402068d144 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -18,7 +18,7 @@ def read_file(file_name):
         with open(file_name, "r", encoding="latin-1" if is_latin else ENCODING) as f:
             content = f.read()
     finally:
-        if content == None:
+        if content is None:
             print(f"Error reading: {file_name}")
     return content
 
diff --git a/scripts/pylintrc b/scripts/pylintrc
index a2b5839f59..6835806b6d 100644
--- a/scripts/pylintrc
+++ b/scripts/pylintrc
@@ -27,7 +27,6 @@ disable=
     pointless-string-statement,
     redefined-builtin,
     redefined-outer-name,
-    singleton-comparison,
     too-few-public-methods,
     too-many-public-methods,
     ungrouped-imports
diff --git a/scripts/splitSources.py b/scripts/splitSources.py
index 181741f9c8..d31202fb79 100755
--- a/scripts/splitSources.py
+++ b/scripts/splitSources.py
@@ -40,7 +40,7 @@ def writeSourceToFile(lines):
     filePath, srcName = extractSourceName(lines[0])
     # print("sourceName is ", srcName)
     # print("filePath is", filePath)
-    if filePath != False:
+    if filePath:
         os.system("mkdir -p " + filePath)
     with open(srcName, mode='a+', encoding='utf8', newline='') as f:
         createdSources.append(srcName)
diff --git a/test/lsp.py b/test/lsp.py
index fdaab9d88c..f03d9bc09b 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -50,7 +50,7 @@ def receive_message(self) -> Union[None, dict]:
         # Note, we should make use of timeout to avoid infinite blocking if nothing is received.
         CONTENT_LENGTH_HEADER = "Content-Length: "
         CONTENT_TYPE_HEADER = "Content-Type: "
-        if self.process.stdout == None:
+        if self.process.stdout is None:
             return None
         message_size = None
         while True:
@@ -84,7 +84,7 @@ def receive_message(self) -> Union[None, dict]:
         return json_object
 
     def send_message(self, method_name: str, params: Optional[dict]) -> None:
-        if self.process.stdin == None:
+        if self.process.stdin is None:
             return
         message = {
             'jsonrpc': '2.0',
@@ -246,7 +246,7 @@ def setup_lsp(self, lsp: JsonRpcProcess, expose_project_root=True):
                 }
             }
         }
-        if expose_project_root == False:
+        if not expose_project_root:
             params['rootUri'] = None
         lsp.call_method('initialize', params)
         lsp.send_notification('initialized')

From dece5f4de2fb66df75ad0803a0295d3055b03907 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 21 Dec 2021 15:26:54 +0100
Subject: [PATCH 0223/1748] pylint: Enable and fix redefined-builtin warnings

---
 docs/conf.py                                  |  2 +-
 .../endToEndExtraction/remove-testcases.py    |  4 +-
 .../endToEndExtraction/verify-testcases.py    | 36 ++++++------
 scripts/error_codes.py                        | 56 +++++++++----------
 scripts/isolate_tests.py                      |  4 +-
 scripts/pylintrc                              |  3 +-
 .../docker-scripts/isolate_tests.py           |  4 +-
 7 files changed, 54 insertions(+), 55 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 4ae4812c5e..10aa406f28 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -63,7 +63,7 @@ def setup(sphinx):
 
 # General information about the project.
 project = 'Solidity'
-copyright = '2016-2021, Ethereum'
+project_copyright = '2016-2021, Ethereum'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/scripts/endToEndExtraction/remove-testcases.py b/scripts/endToEndExtraction/remove-testcases.py
index 28822e044c..ca9a635994 100755
--- a/scripts/endToEndExtraction/remove-testcases.py
+++ b/scripts/endToEndExtraction/remove-testcases.py
@@ -33,12 +33,12 @@ def parse_call(call):
     return function.strip(), arguments.strip(), results.strip()
 
 
-def colorize(left, right, id):
+def colorize(left, right, index):
     red = "\x1b[31m"
     yellow = "\x1b[33m"
     reset = "\x1b[0m"
     colors = [red, yellow]
-    color = colors[id % len(colors)]
+    color = colors[index % len(colors)]
     function, _arguments, _results = parse_call(right)
     left = left.replace("compileAndRun", color + "compileAndRun" + reset)
     right = right.replace("constructor", color + "constructor" + reset)
diff --git a/scripts/endToEndExtraction/verify-testcases.py b/scripts/endToEndExtraction/verify-testcases.py
index 150a1806ba..87d608607d 100755
--- a/scripts/endToEndExtraction/verify-testcases.py
+++ b/scripts/endToEndExtraction/verify-testcases.py
@@ -32,11 +32,11 @@ def __init__(self, kind, parameter):
     def get_input(self):
         return self._input
 
-    def set_input(self, input):
+    def set_input(self, bytecode):
         if self.kind == "create":
             # remove cbor encoded metadata from bytecode
-            length = int(input[-4:], 16) * 2
-            self._input = input[:len(input) - length - 4]
+            length = int(bytecode[-4:], 16) * 2
+            self._input = bytecode[:len(bytecode) - length - 4]
 
     def get_output(self):
         return self._output
@@ -110,21 +110,21 @@ def analyse(self):
 
     @staticmethod
     def parse_parameters(line, trace):
-        input = re.search(r'\s*in:\s*([a-fA-F0-9]*)', line, re.M | re.I)
-        if input:
-            trace.input = input.group(1)
-        output = re.search(r'\s*out:\s*([a-fA-F0-9]*)', line, re.M | re.I)
-        if output:
-            trace.output = output.group(1)
-        result = re.search(r'\s*result:\s*([a-fA-F0-9]*)', line, re.M | re.I)
-        if result:
-            trace.result = result.group(1)
-        gas_used = re.search(r'\s*gas\sused:\s*([a-fA-F0-9]*)', line, re.M | re.I)
-        if gas_used:
-            trace.gas = gas_used.group(1)
-        value = re.search(r'\s*value:\s*([a-fA-F0-9]*)', line, re.M | re.I)
-        if value:
-            trace.value = value.group(1)
+        input_match = re.search(r'\s*in:\s*([a-fA-F0-9]*)', line, re.M | re.I)
+        if input_match:
+            trace.input = input_match.group(1)
+        output_match = re.search(r'\s*out:\s*([a-fA-F0-9]*)', line, re.M | re.I)
+        if output_match:
+            trace.output = output_match.group(1)
+        result_match = re.search(r'\s*result:\s*([a-fA-F0-9]*)', line, re.M | re.I)
+        if result_match:
+            trace.result = result_match.group(1)
+        gas_used_match = re.search(r'\s*gas\sused:\s*([a-fA-F0-9]*)', line, re.M | re.I)
+        if gas_used_match:
+            trace.gas = gas_used_match.group(1)
+        value_match = re.search(r'\s*value:\s*([a-fA-F0-9]*)', line, re.M | re.I)
+        if value_match:
+            trace.value = value_match.group(1)
 
     def diff(self, analyser):
         if not self.ready:
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 402068d144..a50e34d0b3 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -44,11 +44,11 @@ def find_ids_in_source_file(file_name, id_to_file_names):
         if in_comment(source, m.start()):
             continue
         underscore_pos = m.group(0).index("_")
-        id = m.group(0)[0:underscore_pos]
-        if id in id_to_file_names:
-            id_to_file_names[id].append(file_name)
+        error_id = m.group(0)[0:underscore_pos]
+        if error_id in id_to_file_names:
+            id_to_file_names[error_id].append(file_name)
         else:
-            id_to_file_names[id] = [file_name]
+            id_to_file_names[error_id] = [file_name]
 
 
 def find_ids_in_source_files(file_names):
@@ -76,16 +76,16 @@ def fix_ids_in_source_file(file_name, id_to_count, available_ids):
         destination.extend(source[k:m.start()])
 
         underscore_pos = m.group(0).index("_")
-        id = m.group(0)[0:underscore_pos]
+        error_id = m.group(0)[0:underscore_pos]
 
         # incorrect id or id has a duplicate somewhere
-        if not in_comment(source, m.start()) and (len(id) != 4 or id[0] == "0" or id_to_count[id] > 1):
-            assert id in id_to_count
+        if not in_comment(source, m.start()) and (len(error_id) != 4 or error_id[0] == "0" or id_to_count[error_id] > 1):
+            assert error_id in id_to_count
             new_id = get_next_id(available_ids)
             assert new_id not in id_to_count
-            id_to_count[id] -= 1
+            id_to_count[error_id] -= 1
         else:
-            new_id = id
+            new_id = error_id
 
         destination.extend(new_id + "_error")
         k = m.end()
@@ -104,7 +104,7 @@ def fix_ids_in_source_files(file_names, id_to_count):
     id_to_count contains number of appearances of every id in sources
     """
 
-    available_ids = {str(id) for id in range(1000, 10000)} - id_to_count.keys()
+    available_ids = {str(error_id) for error_id in range(1000, 10000)} - id_to_count.keys()
     for file_name in file_names:
         fix_ids_in_source_file(file_name, id_to_count, available_ids)
 
@@ -113,8 +113,8 @@ def find_files(top_dir, sub_dirs, extensions):
     """Builds a list of files with given extensions in specified subdirectories"""
 
     source_file_names = []
-    for dir in sub_dirs:
-        for root, _, file_names in os.walk(os.path.join(top_dir, dir), onerror=lambda e: exit(f"Walk error: {e}")):
+    for directory in sub_dirs:
+        for root, _, file_names in os.walk(os.path.join(top_dir, directory), onerror=lambda e: sys.exit(f"Walk error: {e}")):
             for file_name in file_names:
                 _, ext = path.splitext(file_name)
                 if ext in extensions:
@@ -145,27 +145,27 @@ def find_ids_in_cmdline_test_err(file_name):
 
 
 def print_ids(ids):
-    for k, id in enumerate(sorted(ids)):
+    for k, error_id in enumerate(sorted(ids)):
         if k % 10 > 0:
             print(" ", end="")
         elif k > 0:
             print()
-        print(id, end="")
+        print(error_id, end="")
 
 
 def print_ids_per_file(ids, id_to_file_names, top_dir):
     file_name_to_ids = {}
-    for id in ids:
-        for file_name in id_to_file_names[id]:
+    for error_id in ids:
+        for file_name in id_to_file_names[error_id]:
             relpath = path.relpath(file_name, top_dir)
             if relpath not in file_name_to_ids:
                 file_name_to_ids[relpath] = []
-            file_name_to_ids[relpath].append(id)
+            file_name_to_ids[relpath].append(error_id)
 
     for file_name in sorted(file_name_to_ids):
         print(file_name)
-        for id in sorted(file_name_to_ids[file_name]):
-            print(f" {id}", end="")
+        for error_id in sorted(file_name_to_ids[file_name]):
+            print(f" {error_id}", end="")
         print()
 
 
@@ -289,15 +289,15 @@ def main(argv):
     source_id_to_file_names = find_ids_in_source_files(source_file_names)
 
     ok = True
-    for id in sorted(source_id_to_file_names):
-        if len(id) != 4:
-            print(f"ID {id} length != 4")
+    for error_id in sorted(source_id_to_file_names):
+        if len(error_id) != 4:
+            print(f"ID {error_id} length != 4")
             ok = False
-        if id[0] == "0":
-            print(f"ID {id} starts with zero")
+        if error_id[0] == "0":
+            print(f"ID {error_id} starts with zero")
             ok = False
-        if len(source_id_to_file_names[id]) > 1:
-            print(f"ID {id} appears {len(source_id_to_file_names[id])} times")
+        if len(source_id_to_file_names[error_id]) > 1:
+            print(f"ID {error_id} appears {len(source_id_to_file_names[error_id])} times")
             ok = False
 
     if examine_coverage:
@@ -315,7 +315,7 @@ def main(argv):
         if not ok:
             print("Incorrect IDs have to be fixed before applying --next")
             sys.exit(1)
-        available_ids = {str(id) for id in range(1000, 10000)} - source_id_to_file_names.keys()
+        available_ids = {str(error_id) for error_id in range(1000, 10000)} - source_id_to_file_names.keys()
         next_id = get_next_id(available_ids)
         print(f"Next ID: {next_id}")
         sys.exit(0)
@@ -341,7 +341,7 @@ def main(argv):
             sys.exit(1)
 
     # number of appearances for every id
-    source_id_to_count = { id: len(file_names) for id, file_names in source_id_to_file_names.items() }
+    source_id_to_count = { error_id: len(file_names) for error_id, file_names in source_id_to_file_names.items() }
 
     fix_ids_in_source_files(source_file_names, source_id_to_count)
     print("Fixing completed")
diff --git a/scripts/isolate_tests.py b/scripts/isolate_tests.py
index 4abe6a0bd4..e641d58d19 100755
--- a/scripts/isolate_tests.py
+++ b/scripts/isolate_tests.py
@@ -106,8 +106,8 @@ def write_cases(f, solidityTests, yulTests):
         # When code examples are extracted they are indented by 8 spaces, which violates the style guide,
         # so before checking remove 4 spaces from each line.
         remainder = dedent(test)
-        hash = hashlib.sha256(test.encode("utf-8")).hexdigest()
-        sol_filename = f'test_{hash}_{cleaned_filename}.{language}'
+        source_code_hash = hashlib.sha256(test.encode("utf-8")).hexdigest()
+        sol_filename = f'test_{source_code_hash}_{cleaned_filename}.{language}'
         with open(sol_filename, mode='w', encoding='utf8', newline='') as fi:
             fi.write(remainder)
 
diff --git a/scripts/pylintrc b/scripts/pylintrc
index 6835806b6d..e14763c0d2 100644
--- a/scripts/pylintrc
+++ b/scripts/pylintrc
@@ -14,7 +14,7 @@
 # ATTENTION: This list should be extended with care, consider using NOLINT comments inside your
 # python files instead, as the goal is actually to reduce the list of globally disabled checks.
 #
-# TODO: What could be eliminated in future PRs: bad-continuation, invalid-name, redefined-builtin,
+# TODO: What could be eliminated in future PRs: bad-continuation, invalid-name,
 # undefined-variable, unused-*, useless-object-inheritance.
 disable=
     bad-continuation,
@@ -25,7 +25,6 @@ disable=
     missing-docstring,
     no-else-return,
     pointless-string-statement,
-    redefined-builtin,
     redefined-outer-name,
     too-few-public-methods,
     too-many-public-methods,
diff --git a/scripts/wasm-rebuild/docker-scripts/isolate_tests.py b/scripts/wasm-rebuild/docker-scripts/isolate_tests.py
index c447c1e679..41487325ed 100755
--- a/scripts/wasm-rebuild/docker-scripts/isolate_tests.py
+++ b/scripts/wasm-rebuild/docker-scripts/isolate_tests.py
@@ -47,8 +47,8 @@ def write_cases(f, tests):
     cleaned_filename = f.replace(".","_").replace("-","_").replace(" ","_").lower()
     for test in tests:
         remainder = re.sub(r'^ {4}', '', test, 0, re.MULTILINE)
-        hash = hashlib.sha256(test).hexdigest()
-        with open(f'test_{hash}_{cleaned_filename}.sol', 'w', encoding='utf8') as _f:
+        source_code_hash = hashlib.sha256(test).hexdigest()
+        with open(f'test_{source_code_hash}_{cleaned_filename}.sol', 'w', encoding='utf8') as _f:
             _f.write(remainder)
 
 

From 589f4b2a833f1c79ae7844336eb0976a3039b70a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 21 Dec 2021 15:27:41 +0100
Subject: [PATCH 0224/1748] pylint: Enable bad-continuation and
 ungrouped-imports warnings and update the list of warnings to eliminate in
 the future

---
 scripts/pylintrc | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/pylintrc b/scripts/pylintrc
index e14763c0d2..ffbd96fe89 100644
--- a/scripts/pylintrc
+++ b/scripts/pylintrc
@@ -14,10 +14,8 @@
 # ATTENTION: This list should be extended with care, consider using NOLINT comments inside your
 # python files instead, as the goal is actually to reduce the list of globally disabled checks.
 #
-# TODO: What could be eliminated in future PRs: bad-continuation, invalid-name,
-# undefined-variable, unused-*, useless-object-inheritance.
+# TODO: What could be eliminated in future PRs: invalid-name, pointless-string-statement, redefined-outer-name.
 disable=
-    bad-continuation,
     bad-indentation,
     bad-whitespace,
     duplicate-code,
@@ -27,8 +25,7 @@ disable=
     pointless-string-statement,
     redefined-outer-name,
     too-few-public-methods,
-    too-many-public-methods,
-    ungrouped-imports
+    too-many-public-methods
 
 [BASIC]
 

From 8cfecb45cceb4167fbd4e7911a15471498cb91b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 21 Dec 2021 16:17:22 +0100
Subject: [PATCH 0225/1748] Fix ESLint warnings/errors in external test JS

---
 test/externalTests/solc-js/determinism.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/externalTests/solc-js/determinism.js b/test/externalTests/solc-js/determinism.js
index d895a2c7f1..7f8dc4dcd2 100644
--- a/test/externalTests/solc-js/determinism.js
+++ b/test/externalTests/solc-js/determinism.js
@@ -4,17 +4,17 @@ const solc = require('../index.js');
 
 tape('Deterministic Compilation', function (t) {
   t.test('DAO', function (st) {
-    var input = {};
-    var prevBytecode = null;
-    var testdir = 'test/DAO/';
-    var files = ['DAO.sol', 'Token.sol', 'TokenCreation.sol', 'ManagedAccount.sol'];
-    var i;
+    const input = {};
+    let prevBytecode = null;
+    const testdir = 'test/DAO/';
+    const files = ['DAO.sol', 'Token.sol', 'TokenCreation.sol', 'ManagedAccount.sol'];
+    let i;
     for (i in files) {
-      var file = files[i];
+      const file = files[i];
       input[file] = { content: fs.readFileSync(testdir + file, 'utf8') };
     }
     for (i = 0; i < 10; i++) {
-      var output = JSON.parse(solc.compile(JSON.stringify({
+      const output = JSON.parse(solc.compile(JSON.stringify({
         language: 'Solidity',
         settings: {
           optimizer: {
@@ -22,7 +22,7 @@ tape('Deterministic Compilation', function (t) {
           },
           outputSelection: {
             '*': {
-              '*': [ 'evm.bytecode' ]
+              '*': ['evm.bytecode']
             }
           }
         },
@@ -31,9 +31,9 @@ tape('Deterministic Compilation', function (t) {
       st.ok(output);
       st.ok(output.contracts);
       st.ok(output.contracts['DAO.sol']);
-      st.ok(output.contracts['DAO.sol']['DAO']);
-      st.ok(output.contracts['DAO.sol']['DAO'].evm.bytecode.object);
-      var bytecode = output.contracts['DAO.sol']['DAO'].evm.bytecode.object;
+      st.ok(output.contracts['DAO.sol'].DAO);
+      st.ok(output.contracts['DAO.sol'].DAO.evm.bytecode.object);
+      const bytecode = output.contracts['DAO.sol'].DAO.evm.bytecode.object;
       st.ok(bytecode.length > 0);
       if (prevBytecode !== null) {
         st.equal(prevBytecode, bytecode);

From de364c566c52b351eb7519b6c947ffda61f76c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 21 Dec 2021 15:19:32 +0100
Subject: [PATCH 0226/1748] pylint: Disable the opinionated too-many-xyz
 warnings

---
 scripts/bytecodecompare/prepare_report.py      | 6 +++---
 scripts/endToEndExtraction/verify-testcases.py | 2 --
 scripts/error_codes.py                         | 2 --
 scripts/pylintrc                               | 8 +++++++-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
index 9d35b9988e..dd317735fe 100755
--- a/scripts/bytecodecompare/prepare_report.py
+++ b/scripts/bytecodecompare/prepare_report.py
@@ -187,7 +187,7 @@ def parse_cli_output(source_file_name: Path, cli_output: str) -> FileReport:
     return file_report
 
 
-def prepare_compiler_input(  # pylint: disable=too-many-arguments
+def prepare_compiler_input(
     compiler_path: Path,
     source_file_name: Path,
     optimize: bool,
@@ -256,7 +256,7 @@ def detect_metadata_cli_option_support(compiler_path: Path):
     return process.returncode == 0
 
 
-def run_compiler(  # pylint: disable=too-many-arguments
+def run_compiler(
     compiler_path: Path,
     source_file_name: Path,
     optimize: bool,
@@ -320,7 +320,7 @@ def run_compiler(  # pylint: disable=too-many-arguments
         return parse_cli_output(Path(source_file_name), process.stdout)
 
 
-def generate_report(  # pylint: disable=too-many-arguments,too-many-locals
+def generate_report(
     source_file_names: List[str],
     compiler_path: Path,
     interface: CompilerInterface,
diff --git a/scripts/endToEndExtraction/verify-testcases.py b/scripts/endToEndExtraction/verify-testcases.py
index 87d608607d..b011870424 100755
--- a/scripts/endToEndExtraction/verify-testcases.py
+++ b/scripts/endToEndExtraction/verify-testcases.py
@@ -9,8 +9,6 @@
 #
 # verify-testcases.py will compare both traces. If these traces are identical, the extracted tests were
 # identical with the tests specified in SolidityEndToEndTest.cpp.
-#
-# pylint: disable=too-many-instance-attributes
 
 import re
 import os
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index a50e34d0b3..f3d35cae41 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -254,8 +254,6 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
 
 
 def main(argv):
-    # pylint: disable=too-many-branches, too-many-locals, too-many-statements
-
     check = False
     fix = False
     no_confirm = False
diff --git a/scripts/pylintrc b/scripts/pylintrc
index ffbd96fe89..02d529567d 100644
--- a/scripts/pylintrc
+++ b/scripts/pylintrc
@@ -25,7 +25,13 @@ disable=
     pointless-string-statement,
     redefined-outer-name,
     too-few-public-methods,
-    too-many-public-methods
+    too-many-arguments,
+    too-many-branches,
+    too-many-instance-attributes,
+    too-many-locals,
+    too-many-public-methods,
+    too-many-statements,
+    ungrouped-imports
 
 [BASIC]
 

From 7e91dba663a738b2053f231ffd355484bbbb1fc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 27 Oct 2021 13:02:42 +0200
Subject: [PATCH 0227/1748] Switch ens external test to ens-contracts repo

---
 .circleci/config.yml         |  4 ++--
 test/externalTests/common.sh | 21 +++++++++++++++++++--
 test/externalTests/ens.sh    | 35 +++++++++++++++++------------------
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 611675a26f..164802b37b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1363,8 +1363,8 @@ workflows:
           name: t_native_test_ext_ens
           project: ens
           binary_type: native
-          # NOTE: One of the dependencies (fsevents) fails to build its native extension on node.js 12+.
-          nodejs_version: '10'
+          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+          nodejs_version: '16'
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 400304f3be..d394a0b5fd 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -117,6 +117,19 @@ function neutralize_package_json_hooks
     sed -i 's|"prepare": *".*"|"prepare": ""|g' package.json
 }
 
+function neutralize_packaged_contracts
+{
+    # Frameworks will build contracts from any package that contains a configuration file.
+    # This is both unnecessary (any files imported from these packages will get compiled again as a
+    # part of the main project anyway) and trips up our version check because it won't use our
+    # custom compiler binary.
+    printLog "Removing framework config and artifacts from npm packages..."
+    find node_modules/ -type f '(' -name 'hardhat.config.*' -o -name 'truffle-config.*' ')' -delete
+
+    # Some npm packages also come packaged with pre-built artifacts.
+    find node_modules/ -path '*artifacts/build-info/*.json' -delete
+}
+
 function force_solc_modules
 {
     local custom_solcjs_path="${1:-solc/}"
@@ -216,8 +229,12 @@ function hardhat_verify_compiler_version
     local full_solc_version="$2"
 
     printLog "Verify that the correct version (${solc_version}/${full_solc_version}) of the compiler was used to compile the contracts..."
-    grep '"solcVersion": "'"${solc_version}"'"' --with-filename artifacts/build-info/*.json || fail "Wrong compiler version detected."
-    grep '"solcLongVersion": "'"${full_solc_version}"'"' --with-filename artifacts/build-info/*.json || fail "Wrong compiler version detected."
+    local build_info_files
+    build_info_files=$(find . -path '*artifacts/build-info/*.json')
+    for build_info_file in $build_info_files; do
+        grep '"solcVersion": "'"${solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
+        grep '"solcLongVersion": "'"${full_solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
+    done
 }
 
 function truffle_clean
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index f425f97cf3..2b663cf843 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -28,22 +28,23 @@ verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
 
-function compile_fn { npx truffle compile; }
-function test_fn { npm run test; }
+function compile_fn { yarn build; }
+function test_fn { yarn test; }
 
 function ens_test
 {
-    local repo="https://github.com/ensdomains/ens.git"
-    local branch=master
-    local config_file="truffle.js"
+    local repo="https://github.com/ensdomains/ens-contracts.git"
+    local branch="v0.0.8"  # The project is in flux right now and master might be too unstable for us
+    local config_file="hardhat.config.js"
 
-    local compile_only_presets=()
+    local compile_only_presets=(
+        legacy-no-optimize        # Compiles but tests fail to deploy GovernorCompatibilityBravo (code too large).
+    )
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # "YulException: Variable var_ttl_236 is 1 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # "YulException: Variable var_ttl_236 is 1 slot(s) too deep inside the stack."
-        ir-optimize-evm+yul
-        legacy-no-optimize
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var__945 is 1 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var__945 is 1 slot(s) too deep inside the stack."
+        #ir-optimize-evm+yul      # Compilation fails with "YulException: Variable _5 is 1 too deep in the stack [ _5 usr$i usr$h _7 usr$scratch usr$k usr$f _4 usr$len usr$j_2 RET _2 _1 var_data_mpos usr$totallen usr$x _12 ]"
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
     )
@@ -56,20 +57,18 @@ function ens_test
     download_project "$repo" "$branch" "$DIR"
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
-    # Use latest Truffle. Older versions crash on the output from 0.8.0.
-    force_truffle_version ^5.1.55
-
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$selected_optimizer_presets")"
-    npm install
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$selected_optimizer_presets")"
+    yarn install
 
     replace_version_pragmas
-    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
+    neutralize_packaged_contracts
 
     for preset in $selected_optimizer_presets; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
 
-external_test Ens ens_test
+external_test ENS ens_test

From 4fa8eee6830aeed60f551d34c197f89d227b2604 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 20 Dec 2021 13:38:03 +0100
Subject: [PATCH 0228/1748] Use function names instead of members.

---
 libsolidity/ast/Types.cpp | 86 +++++++++++++++++++--------------------
 libsolidity/ast/Types.h   |  2 +-
 2 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index aa1d5820f0..ed16d2b35f 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -2942,11 +2942,11 @@ string FunctionType::richIdentifier() const
 	}
 	id += "_" + stateMutabilityToString(m_stateMutability);
 	id += identifierList(m_parameterTypes) + "returns" + identifierList(m_returnParameterTypes);
-	if (m_gasSet)
+	if (gasSet())
 		id += "gas";
-	if (m_valueSet)
+	if (valueSet())
 		id += "value";
-	if (m_saltSet)
+	if (saltSet())
 		id += "salt";
 	if (bound())
 		id += "bound_to" + identifierList(selfType());
@@ -3094,11 +3094,11 @@ bool FunctionType::nameable() const
 {
 	return
 		(m_kind == Kind::Internal || m_kind == Kind::External) &&
-		!m_bound &&
-		!m_arbitraryParameters &&
-		!m_gasSet &&
-		!m_valueSet &&
-		!m_saltSet;
+		!bound() &&
+		!takesArbitraryParameters() &&
+		!gasSet() &&
+		!valueSet() &&
+		!saltSet();
 }
 
 vector<tuple<string, Type const*>> FunctionType::makeStackItems() const
@@ -3140,11 +3140,11 @@ vector<tuple<string, Type const*>> FunctionType::makeStackItems() const
 		break;
 	}
 
-	if (m_gasSet)
+	if (gasSet())
 		slots.emplace_back("gas", TypeProvider::uint256());
-	if (m_valueSet)
+	if (valueSet())
 		slots.emplace_back("value", TypeProvider::uint256());
-	if (m_saltSet)
+	if (saltSet())
 		slots.emplace_back("salt", TypeProvider::fixedBytes(32));
 	if (bound())
 		slots.emplace_back("self", m_parameterTypes.front());
@@ -3182,7 +3182,7 @@ FunctionTypePointer FunctionType::interfaceFunctionType() const
 		m_parameterNames,
 		m_returnParameterNames,
 		m_kind,
-		m_arbitraryParameters,
+		takesArbitraryParameters(),
 		m_stateMutability,
 		m_declaration
 	);
@@ -3240,9 +3240,9 @@ MemberList::MemberMap FunctionType::nativeMembers(ASTNode const* _scope) const
 						false,
 						StateMutability::Pure,
 						nullptr,
-						m_gasSet,
-						m_valueSet,
-						m_saltSet
+						gasSet(),
+						valueSet(),
+						saltSet()
 					)
 				);
 		}
@@ -3258,9 +3258,9 @@ MemberList::MemberMap FunctionType::nativeMembers(ASTNode const* _scope) const
 					false,
 					StateMutability::Pure,
 					nullptr,
-					m_gasSet,
-					m_valueSet,
-					m_saltSet
+					gasSet(),
+					valueSet(),
+					saltSet()
 				)
 			);
 		return members;
@@ -3288,7 +3288,7 @@ MemberList::MemberMap FunctionType::nativeMembers(ASTNode const* _scope) const
 
 Type const* FunctionType::encodingType() const
 {
-	if (m_gasSet || m_valueSet)
+	if (gasSet() || valueSet())
 		return nullptr;
 	// Only external functions can be encoded, internal functions cannot leave code boundaries.
 	if (m_kind == Kind::External)
@@ -3307,7 +3307,7 @@ TypeResult FunctionType::interfaceType(bool /*_inLibrary*/) const
 
 Type const* FunctionType::mobileType() const
 {
-	if (m_valueSet || m_gasSet || m_saltSet || m_bound)
+	if (valueSet() || gasSet() || saltSet() || bound())
 		return nullptr;
 
 	// return function without parameter names
@@ -3317,13 +3317,13 @@ Type const* FunctionType::mobileType() const
 		strings(m_parameterTypes.size()),
 		strings(m_returnParameterNames.size()),
 		m_kind,
-		m_arbitraryParameters,
+		takesArbitraryParameters(),
 		m_stateMutability,
 		m_declaration,
-		m_gasSet,
-		m_valueSet,
-		m_bound,
-		m_saltSet
+		gasSet(),
+		valueSet(),
+		bound(),
+		saltSet()
 	);
 }
 
@@ -3409,7 +3409,7 @@ bool FunctionType::equalExcludingStateMutability(FunctionType const& _other) con
 		return false;
 
 	//@todo this is ugly, but cannot be prevented right now
-	if (m_gasSet != _other.m_gasSet || m_valueSet != _other.m_valueSet || m_saltSet != _other.m_saltSet)
+	if (gasSet() != _other.gasSet() || valueSet() != _other.valueSet() || saltSet() != _other.saltSet())
 		return false;
 
 	if (bound() != _other.bound())
@@ -3526,34 +3526,34 @@ Type const* FunctionType::copyAndSetCallOptions(bool _setGas, bool _setValue, bo
 		m_parameterNames,
 		m_returnParameterNames,
 		m_kind,
-		m_arbitraryParameters,
+		takesArbitraryParameters(),
 		m_stateMutability,
 		m_declaration,
-		m_gasSet || _setGas,
-		m_valueSet || _setValue,
-		m_saltSet || _setSalt,
-		m_bound
+		gasSet() || _setGas,
+		valueSet() || _setValue,
+		saltSet() || _setSalt,
+		bound()
 	);
 }
 
 FunctionTypePointer FunctionType::asBoundFunction() const
 {
 	solAssert(!m_parameterTypes.empty(), "");
-	solAssert(!m_gasSet, "");
-	solAssert(!m_valueSet, "");
-	solAssert(!m_saltSet, "");
+	solAssert(!gasSet(), "");
+	solAssert(!valueSet(), "");
+	solAssert(!saltSet(), "");
 	return TypeProvider::function(
 		m_parameterTypes,
 		m_returnParameterTypes,
 		m_parameterNames,
 		m_returnParameterNames,
 		m_kind,
-		m_arbitraryParameters,
+		takesArbitraryParameters(),
 		m_stateMutability,
 		m_declaration,
-		m_gasSet,
-		m_valueSet,
-		m_saltSet,
+		gasSet(),
+		valueSet(),
+		saltSet(),
 		true
 	);
 }
@@ -3592,13 +3592,13 @@ FunctionTypePointer FunctionType::asExternallyCallableFunction(bool _inLibrary)
 		m_parameterNames,
 		m_returnParameterNames,
 		kind,
-		m_arbitraryParameters,
+		takesArbitraryParameters(),
 		m_stateMutability,
 		m_declaration,
-		m_gasSet,
-		m_valueSet,
-		m_saltSet,
-		m_bound
+		gasSet(),
+		valueSet(),
+		saltSet(),
+		bound()
 	);
 }
 
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 8b3826ca06..94ee41052b 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1314,7 +1314,7 @@ class FunctionType: public Type
 			"Return parameter names list must match return parameter types list!"
 		);
 		solAssert(
-			!m_bound || !m_parameterTypes.empty(),
+			!bound() || !m_parameterTypes.empty(),
 			"Attempted construction of bound function without self type"
 		);
 	}

From f94279a4374a05ec3c253449ed3b11e2d8ee0c54 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 20 Dec 2021 12:40:43 +0100
Subject: [PATCH 0229/1748] Use options struct for function type factory
 function.

---
 libsolidity/analysis/GlobalContext.cpp | 32 ++++-----
 libsolidity/analysis/TypeChecker.cpp   |  1 -
 libsolidity/ast/TypeProvider.cpp       | 29 ++++----
 libsolidity/ast/TypeProvider.h         | 10 +--
 libsolidity/ast/Types.cpp              | 94 +++++++++++---------------
 libsolidity/ast/Types.h                | 32 +++++++++
 6 files changed, 107 insertions(+), 91 deletions(-)

diff --git a/libsolidity/analysis/GlobalContext.cpp b/libsolidity/analysis/GlobalContext.cpp
index 17d5b8c3e6..58ebea7b1a 100644
--- a/libsolidity/analysis/GlobalContext.cpp
+++ b/libsolidity/analysis/GlobalContext.cpp
@@ -73,24 +73,24 @@ inline vector<shared_ptr<MagicVariableDeclaration const>> constructMagicVariable
 
 	return {
 		magicVarDecl("abi", TypeProvider::magic(MagicType::Kind::ABI)),
-		magicVarDecl("addmod", TypeProvider::function(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Kind::AddMod, false, StateMutability::Pure)),
-		magicVarDecl("assert", TypeProvider::function(strings{"bool"}, strings{}, FunctionType::Kind::Assert, false, StateMutability::Pure)),
+		magicVarDecl("addmod", TypeProvider::function(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Kind::AddMod, StateMutability::Pure)),
+		magicVarDecl("assert", TypeProvider::function(strings{"bool"}, strings{}, FunctionType::Kind::Assert, StateMutability::Pure)),
 		magicVarDecl("block", TypeProvider::magic(MagicType::Kind::Block)),
-		magicVarDecl("blockhash", TypeProvider::function(strings{"uint256"}, strings{"bytes32"}, FunctionType::Kind::BlockHash, false, StateMutability::View)),
-		magicVarDecl("ecrecover", TypeProvider::function(strings{"bytes32", "uint8", "bytes32", "bytes32"}, strings{"address"}, FunctionType::Kind::ECRecover, false, StateMutability::Pure)),
-		magicVarDecl("gasleft", TypeProvider::function(strings(), strings{"uint256"}, FunctionType::Kind::GasLeft, false, StateMutability::View)),
-		magicVarDecl("keccak256", TypeProvider::function(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::KECCAK256, false, StateMutability::Pure)),
+		magicVarDecl("blockhash", TypeProvider::function(strings{"uint256"}, strings{"bytes32"}, FunctionType::Kind::BlockHash, StateMutability::View)),
+		magicVarDecl("ecrecover", TypeProvider::function(strings{"bytes32", "uint8", "bytes32", "bytes32"}, strings{"address"}, FunctionType::Kind::ECRecover, StateMutability::Pure)),
+		magicVarDecl("gasleft", TypeProvider::function(strings(), strings{"uint256"}, FunctionType::Kind::GasLeft, StateMutability::View)),
+		magicVarDecl("keccak256", TypeProvider::function(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::KECCAK256, StateMutability::Pure)),
 		magicVarDecl("msg", TypeProvider::magic(MagicType::Kind::Message)),
-		magicVarDecl("mulmod", TypeProvider::function(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Kind::MulMod, false, StateMutability::Pure)),
+		magicVarDecl("mulmod", TypeProvider::function(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Kind::MulMod, StateMutability::Pure)),
 		magicVarDecl("now", TypeProvider::uint256()),
-		magicVarDecl("require", TypeProvider::function(strings{"bool"}, strings{}, FunctionType::Kind::Require, false, StateMutability::Pure)),
-		magicVarDecl("require", TypeProvider::function(strings{"bool", "string memory"}, strings{}, FunctionType::Kind::Require, false, StateMutability::Pure)),
-		magicVarDecl("revert", TypeProvider::function(strings(), strings(), FunctionType::Kind::Revert, false, StateMutability::Pure)),
-		magicVarDecl("revert", TypeProvider::function(strings{"string memory"}, strings(), FunctionType::Kind::Revert, false, StateMutability::Pure)),
-		magicVarDecl("ripemd160", TypeProvider::function(strings{"bytes memory"}, strings{"bytes20"}, FunctionType::Kind::RIPEMD160, false, StateMutability::Pure)),
+		magicVarDecl("require", TypeProvider::function(strings{"bool"}, strings{}, FunctionType::Kind::Require, StateMutability::Pure)),
+		magicVarDecl("require", TypeProvider::function(strings{"bool", "string memory"}, strings{}, FunctionType::Kind::Require, StateMutability::Pure)),
+		magicVarDecl("revert", TypeProvider::function(strings(), strings(), FunctionType::Kind::Revert, StateMutability::Pure)),
+		magicVarDecl("revert", TypeProvider::function(strings{"string memory"}, strings(), FunctionType::Kind::Revert, StateMutability::Pure)),
+		magicVarDecl("ripemd160", TypeProvider::function(strings{"bytes memory"}, strings{"bytes20"}, FunctionType::Kind::RIPEMD160, StateMutability::Pure)),
 		magicVarDecl("selfdestruct", TypeProvider::function(strings{"address payable"}, strings{}, FunctionType::Kind::Selfdestruct)),
-		magicVarDecl("sha256", TypeProvider::function(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::SHA256, false, StateMutability::Pure)),
-		magicVarDecl("sha3", TypeProvider::function(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::KECCAK256, false, StateMutability::Pure)),
+		magicVarDecl("sha256", TypeProvider::function(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::SHA256, StateMutability::Pure)),
+		magicVarDecl("sha3", TypeProvider::function(strings{"bytes memory"}, strings{"bytes32"}, FunctionType::Kind::KECCAK256, StateMutability::Pure)),
 		magicVarDecl("suicide", TypeProvider::function(strings{"address payable"}, strings{}, FunctionType::Kind::Selfdestruct)),
 		magicVarDecl("tx", TypeProvider::magic(MagicType::Kind::Transaction)),
 		// Accepts a MagicType that can be any contract type or an Integer type and returns a
@@ -99,8 +99,8 @@ inline vector<shared_ptr<MagicVariableDeclaration const>> constructMagicVariable
 			strings{},
 			strings{},
 			FunctionType::Kind::MetaType,
-			true,
-			StateMutability::Pure
+			StateMutability::Pure,
+			FunctionType::Options::withArbitraryParameters()
 		)),
 	};
 }
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index d6c589f75c..be8275a934 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -2866,7 +2866,6 @@ void TypeChecker::endVisit(NewExpression const& _newExpression)
 			strings(1, ""),
 			strings(1, ""),
 			FunctionType::Kind::ObjectCreation,
-			false,
 			StateMutability::Pure
 		);
 		_newExpression.annotation().isPure = true;
diff --git a/libsolidity/ast/TypeProvider.cpp b/libsolidity/ast/TypeProvider.cpp
index 6183493b46..f5af82f944 100644
--- a/libsolidity/ast/TypeProvider.cpp
+++ b/libsolidity/ast/TypeProvider.cpp
@@ -445,13 +445,18 @@ FunctionType const* TypeProvider::function(
 	strings const& _parameterTypes,
 	strings const& _returnParameterTypes,
 	FunctionType::Kind _kind,
-	bool _arbitraryParameters,
-	StateMutability _stateMutability
+	StateMutability _stateMutability,
+	FunctionType::Options _options
 )
 {
+	// Can only use this constructor for "arbitraryParameters".
+	solAssert(!_options.valueSet && !_options.gasSet && !_options.saltSet && !_options.bound);
 	return createAndGet<FunctionType>(
-		_parameterTypes, _returnParameterTypes,
-		_kind, _arbitraryParameters, _stateMutability
+		_parameterTypes,
+		_returnParameterTypes,
+		_kind,
+		_options.arbitraryParameters,
+		_stateMutability
 	);
 }
 
@@ -461,13 +466,9 @@ FunctionType const* TypeProvider::function(
 	strings _parameterNames,
 	strings _returnParameterNames,
 	FunctionType::Kind _kind,
-	bool _arbitraryParameters,
 	StateMutability _stateMutability,
 	Declaration const* _declaration,
-	bool _gasSet,
-	bool _valueSet,
-	bool _bound,
-	bool _saltSet
+	FunctionType::Options _options
 )
 {
 	return createAndGet<FunctionType>(
@@ -476,13 +477,13 @@ FunctionType const* TypeProvider::function(
 		_parameterNames,
 		_returnParameterNames,
 		_kind,
-		_arbitraryParameters,
+		_options.arbitraryParameters,
 		_stateMutability,
 		_declaration,
-		_gasSet,
-		_valueSet,
-		_bound,
-		_saltSet
+		_options.gasSet,
+		_options.valueSet,
+		_options.saltSet,
+		_options.bound
 	);
 }
 
diff --git a/libsolidity/ast/TypeProvider.h b/libsolidity/ast/TypeProvider.h
index 78b8378cab..b089ff1efe 100644
--- a/libsolidity/ast/TypeProvider.h
+++ b/libsolidity/ast/TypeProvider.h
@@ -149,8 +149,8 @@ class TypeProvider
 		strings const& _parameterTypes,
 		strings const& _returnParameterTypes,
 		FunctionType::Kind _kind = FunctionType::Kind::Internal,
-		bool _arbitraryParameters = false,
-		StateMutability _stateMutability = StateMutability::NonPayable
+		StateMutability _stateMutability = StateMutability::NonPayable,
+		FunctionType::Options _options = {}
 	);
 
 	/// @returns a highly customized FunctionType, use with care.
@@ -160,13 +160,9 @@ class TypeProvider
 		strings _parameterNames = strings{},
 		strings _returnParameterNames = strings{},
 		FunctionType::Kind _kind = FunctionType::Kind::Internal,
-		bool _arbitraryParameters = false,
 		StateMutability _stateMutability = StateMutability::NonPayable,
 		Declaration const* _declaration = nullptr,
-		bool _gasSet = false,
-		bool _valueSet = false,
-		bool _bound = false,
-		bool _saltSet = false
+		FunctionType::Options _options = {}
 	);
 
 	/// Auto-detect the proper type for a literal. @returns an empty pointer if the literal does
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index ed16d2b35f..da2811a214 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -470,15 +470,15 @@ MemberList::MemberMap AddressType::nativeMembers(ASTNode const*) const
 		{"balance", TypeProvider::uint256()},
 		{"code", TypeProvider::array(DataLocation::Memory)},
 		{"codehash",  TypeProvider::fixedBytes(32)},
-		{"call", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareCall, false, StateMutability::Payable)},
-		{"callcode", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareCallCode, false, StateMutability::Payable)},
-		{"delegatecall", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareDelegateCall, false, StateMutability::NonPayable)},
-		{"staticcall", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareStaticCall, false, StateMutability::View)}
+		{"call", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareCall, StateMutability::Payable)},
+		{"callcode", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareCallCode, StateMutability::Payable)},
+		{"delegatecall", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareDelegateCall, StateMutability::NonPayable)},
+		{"staticcall", TypeProvider::function(strings{"bytes memory"}, strings{"bool", "bytes memory"}, FunctionType::Kind::BareStaticCall, StateMutability::View)}
 	};
 	if (m_stateMutability == StateMutability::Payable)
 	{
-		members.emplace_back(MemberList::Member{"send", TypeProvider::function(strings{"uint"}, strings{"bool"}, FunctionType::Kind::Send, false, StateMutability::NonPayable)});
-		members.emplace_back(MemberList::Member{"transfer", TypeProvider::function(strings{"uint"}, strings(), FunctionType::Kind::Transfer, false, StateMutability::NonPayable)});
+		members.emplace_back(MemberList::Member{"send", TypeProvider::function(strings{"uint"}, strings{"bool"}, FunctionType::Kind::Send, StateMutability::NonPayable)});
+		members.emplace_back(MemberList::Member{"transfer", TypeProvider::function(strings{"uint"}, strings(), FunctionType::Kind::Transfer, StateMutability::NonPayable)});
 	}
 	return members;
 }
@@ -2848,7 +2848,6 @@ FunctionTypePointer FunctionType::newExpressionType(ContractDefinition const& _c
 		parameterNames,
 		strings{""},
 		Kind::Creation,
-		false,
 		stateMutability
 	);
 }
@@ -3176,13 +3175,13 @@ FunctionTypePointer FunctionType::interfaceFunctionType() const
 	if (variable && retParamTypes.get().empty())
 		return FunctionTypePointer();
 
+	solAssert(!takesArbitraryParameters());
 	return TypeProvider::function(
 		paramTypes,
 		retParamTypes,
 		m_parameterNames,
 		m_returnParameterNames,
 		m_kind,
-		takesArbitraryParameters(),
 		m_stateMutability,
 		m_declaration
 	);
@@ -3237,12 +3236,9 @@ MemberList::MemberMap FunctionType::nativeMembers(ASTNode const* _scope) const
 						strings(1, ""),
 						strings(1, ""),
 						Kind::SetValue,
-						false,
 						StateMutability::Pure,
 						nullptr,
-						gasSet(),
-						valueSet(),
-						saltSet()
+						Options::fromFunctionType(*this)
 					)
 				);
 		}
@@ -3255,12 +3251,9 @@ MemberList::MemberMap FunctionType::nativeMembers(ASTNode const* _scope) const
 					strings(1, ""),
 					strings(1, ""),
 					Kind::SetGas,
-					false,
 					StateMutability::Pure,
 					nullptr,
-					gasSet(),
-					valueSet(),
-					saltSet()
+					Options::fromFunctionType(*this)
 				)
 			);
 		return members;
@@ -3317,13 +3310,9 @@ Type const* FunctionType::mobileType() const
 		strings(m_parameterTypes.size()),
 		strings(m_returnParameterNames.size()),
 		m_kind,
-		takesArbitraryParameters(),
 		m_stateMutability,
 		m_declaration,
-		gasSet(),
-		valueSet(),
-		bound(),
-		saltSet()
+		Options::fromFunctionType(*this)
 	);
 }
 
@@ -3520,19 +3509,19 @@ TypePointers FunctionType::parseElementaryTypeVector(strings const& _types)
 Type const* FunctionType::copyAndSetCallOptions(bool _setGas, bool _setValue, bool _setSalt) const
 {
 	solAssert(m_kind != Kind::Declaration, "");
+	Options options = Options::fromFunctionType(*this);
+	if (_setGas) options.gasSet = true;
+	if (_setValue) options.valueSet = true;
+	if (_setSalt) options.saltSet = true;
 	return TypeProvider::function(
 		m_parameterTypes,
 		m_returnParameterTypes,
 		m_parameterNames,
 		m_returnParameterNames,
 		m_kind,
-		takesArbitraryParameters(),
 		m_stateMutability,
 		m_declaration,
-		gasSet() || _setGas,
-		valueSet() || _setValue,
-		saltSet() || _setSalt,
-		bound()
+		options
 	);
 }
 
@@ -3542,19 +3531,17 @@ FunctionTypePointer FunctionType::asBoundFunction() const
 	solAssert(!gasSet(), "");
 	solAssert(!valueSet(), "");
 	solAssert(!saltSet(), "");
+	Options options = Options::fromFunctionType(*this);
+	options.bound = true;
 	return TypeProvider::function(
 		m_parameterTypes,
 		m_returnParameterTypes,
 		m_parameterNames,
 		m_returnParameterNames,
 		m_kind,
-		takesArbitraryParameters(),
 		m_stateMutability,
 		m_declaration,
-		gasSet(),
-		valueSet(),
-		saltSet(),
-		true
+		options
 	);
 }
 
@@ -3592,13 +3579,9 @@ FunctionTypePointer FunctionType::asExternallyCallableFunction(bool _inLibrary)
 		m_parameterNames,
 		m_returnParameterNames,
 		kind,
-		takesArbitraryParameters(),
 		m_stateMutability,
 		m_declaration,
-		gasSet(),
-		valueSet(),
-		saltSet(),
-		bound()
+		Options::fromFunctionType(*this)
 	);
 }
 
@@ -3803,7 +3786,6 @@ MemberList::MemberMap TypeType::nativeMembers(ASTNode const* _currentScope) cons
 				strings{string{}},
 				strings{string{}},
 				FunctionType::Kind::Wrap,
-				false, /*_arbitraryParameters */
 				StateMutability::Pure
 			)
 		);
@@ -3815,7 +3797,6 @@ MemberList::MemberMap TypeType::nativeMembers(ASTNode const* _currentScope) cons
 				strings{string{}},
 				strings{string{}},
 				FunctionType::Kind::Unwrap,
-				false, /* _arbitraryParameters */
 				StateMutability::Pure
 			)
 		);
@@ -3830,8 +3811,9 @@ MemberList::MemberMap TypeType::nativeMembers(ASTNode const* _currentScope) cons
 			strings{},
 			strings{string()},
 			FunctionType::Kind::BytesConcat,
-			/* _arbitraryParameters */ true,
-			StateMutability::Pure
+			StateMutability::Pure,
+			nullptr,
+			FunctionType::Options::withArbitraryParameters()
 		));
 
 	return members;
@@ -3954,7 +3936,7 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 		return MemberList::MemberMap({
 			{"coinbase", TypeProvider::payableAddress()},
 			{"timestamp", TypeProvider::uint256()},
-			{"blockhash", TypeProvider::function(strings{"uint"}, strings{"bytes32"}, FunctionType::Kind::BlockHash, false, StateMutability::View)},
+			{"blockhash", TypeProvider::function(strings{"uint"}, strings{"bytes32"}, FunctionType::Kind::BlockHash, StateMutability::View)},
 			{"difficulty", TypeProvider::uint256()},
 			{"number", TypeProvider::uint256()},
 			{"gaslimit", TypeProvider::uint256()},
@@ -3982,8 +3964,9 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 				strings{},
 				strings{1, ""},
 				FunctionType::Kind::ABIEncode,
-				true,
-				StateMutability::Pure
+				StateMutability::Pure,
+				nullptr,
+				FunctionType::Options::withArbitraryParameters()
 			)},
 			{"encodePacked", TypeProvider::function(
 				TypePointers{},
@@ -3991,8 +3974,9 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 				strings{},
 				strings{1, ""},
 				FunctionType::Kind::ABIEncodePacked,
-				true,
-				StateMutability::Pure
+				StateMutability::Pure,
+				nullptr,
+				FunctionType::Options::withArbitraryParameters()
 			)},
 			{"encodeWithSelector", TypeProvider::function(
 				TypePointers{TypeProvider::fixedBytes(4)},
@@ -4000,8 +3984,9 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 				strings{1, ""},
 				strings{1, ""},
 				FunctionType::Kind::ABIEncodeWithSelector,
-				true,
-				StateMutability::Pure
+				StateMutability::Pure,
+				nullptr,
+				FunctionType::Options::withArbitraryParameters()
 			)},
 			{"encodeCall", TypeProvider::function(
 				TypePointers{},
@@ -4009,8 +3994,9 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 				strings{},
 				strings{1, ""},
 				FunctionType::Kind::ABIEncodeCall,
-				true,
-				StateMutability::Pure
+				StateMutability::Pure,
+				nullptr,
+				FunctionType::Options::withArbitraryParameters()
 			)},
 			{"encodeWithSignature", TypeProvider::function(
 				TypePointers{TypeProvider::array(DataLocation::Memory, true)},
@@ -4018,8 +4004,9 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 				strings{1, ""},
 				strings{1, ""},
 				FunctionType::Kind::ABIEncodeWithSignature,
-				true,
-				StateMutability::Pure
+				StateMutability::Pure,
+				nullptr,
+				FunctionType::Options::withArbitraryParameters()
 			)},
 			{"decode", TypeProvider::function(
 				TypePointers(),
@@ -4027,8 +4014,9 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 				strings{},
 				strings{},
 				FunctionType::Kind::ABIDecode,
-				true,
-				StateMutability::Pure
+				StateMutability::Pure,
+				nullptr,
+				FunctionType::Options::withArbitraryParameters()
 			)}
 		});
 	case Kind::MetaType:
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 94ee41052b..dc6bda477c 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1247,6 +1247,38 @@ class FunctionType: public Type
 		/// Cannot be called.
 		Declaration,
 	};
+	struct Options
+	{
+		/// true iff the function takes an arbitrary number of arguments of arbitrary types
+		bool arbitraryParameters = false;
+		/// true iff the gas value to be used is on the stack
+		bool gasSet = false;
+		/// true iff the value to be sent is on the stack
+		bool valueSet = false;
+		/// iff the salt value (for create2) to be used is on the stack
+		bool saltSet = false;
+		/// true iff the function is called as arg1.fun(arg2, ..., argn).
+		/// This is achieved through the "using for" directive.
+		bool bound = false;
+
+		static Options withArbitraryParameters()
+		{
+			Options result;
+			result.arbitraryParameters = true;
+			return result;
+		}
+		static Options fromFunctionType(FunctionType const& _type)
+		{
+			Options result;
+			result.arbitraryParameters = _type.takesArbitraryParameters();
+			result.gasSet = _type.gasSet();
+			result.valueSet = _type.valueSet();
+			result.saltSet = _type.saltSet();
+			result.bound = _type.bound();
+			return result;
+		}
+	};
+
 
 	/// Creates the type of a function.
 	/// @arg _kind must be Kind::Internal, Kind::External or Kind::Declaration.

From 7620bfaad8adb9b21a8826c7bcc02a424fbbea39 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 20 Dec 2021 13:23:40 +0100
Subject: [PATCH 0230/1748] Add option member for function type.

---
 libsolidity/ast/TypeProvider.cpp           | 10 ++----
 libsolidity/ast/Types.h                    | 42 ++++++++--------------
 libsolidity/codegen/ExpressionCompiler.cpp |  9 +++--
 3 files changed, 24 insertions(+), 37 deletions(-)

diff --git a/libsolidity/ast/TypeProvider.cpp b/libsolidity/ast/TypeProvider.cpp
index f5af82f944..97d230d2e4 100644
--- a/libsolidity/ast/TypeProvider.cpp
+++ b/libsolidity/ast/TypeProvider.cpp
@@ -455,8 +455,8 @@ FunctionType const* TypeProvider::function(
 		_parameterTypes,
 		_returnParameterTypes,
 		_kind,
-		_options.arbitraryParameters,
-		_stateMutability
+		_stateMutability,
+		std::move(_options)
 	);
 }
 
@@ -477,13 +477,9 @@ FunctionType const* TypeProvider::function(
 		_parameterNames,
 		_returnParameterNames,
 		_kind,
-		_options.arbitraryParameters,
 		_stateMutability,
 		_declaration,
-		_options.gasSet,
-		_options.valueSet,
-		_options.saltSet,
-		_options.bound
+		std::move(_options)
 	);
 }
 
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index dc6bda477c..2f7e6005be 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1295,18 +1295,21 @@ class FunctionType: public Type
 		strings const& _parameterTypes,
 		strings const& _returnParameterTypes,
 		Kind _kind,
-		bool _arbitraryParameters = false,
-		StateMutability _stateMutability = StateMutability::NonPayable
+		StateMutability _stateMutability = StateMutability::NonPayable,
+		Options _options = Options{false, false, false, false, false}
 	): FunctionType(
 		parseElementaryTypeVector(_parameterTypes),
 		parseElementaryTypeVector(_returnParameterTypes),
 		strings(_parameterTypes.size(), ""),
 		strings(_returnParameterTypes.size(), ""),
 		_kind,
-		_arbitraryParameters,
-		_stateMutability
+		_stateMutability,
+		nullptr,
+		std::move(_options)
 	)
 	{
+		// In this constructor, only the "arbitrary Parameters" option should be used.
+		solAssert(!bound() && !gasSet() && !valueSet() && !saltSet());
 	}
 
 	/// Detailed constructor, use with care.
@@ -1316,13 +1319,9 @@ class FunctionType: public Type
 		strings _parameterNames = strings(),
 		strings _returnParameterNames = strings(),
 		Kind _kind = Kind::Internal,
-		bool _arbitraryParameters = false,
 		StateMutability _stateMutability = StateMutability::NonPayable,
 		Declaration const* _declaration = nullptr,
-		bool _gasSet = false,
-		bool _valueSet = false,
-		bool _saltSet = false,
-		bool _bound = false
+		Options _options = Options{false, false, false, false, false}
 	):
 		m_parameterTypes(std::move(_parameterTypes)),
 		m_returnParameterTypes(std::move(_returnParameterTypes)),
@@ -1330,12 +1329,8 @@ class FunctionType: public Type
 		m_returnParameterNames(std::move(_returnParameterNames)),
 		m_kind(_kind),
 		m_stateMutability(_stateMutability),
-		m_arbitraryParameters(_arbitraryParameters),
-		m_gasSet(_gasSet),
-		m_valueSet(_valueSet),
-		m_bound(_bound),
 		m_declaration(_declaration),
-		m_saltSet(_saltSet)
+		m_options(std::move(_options))
 	{
 		solAssert(
 			m_parameterNames.size() == m_parameterTypes.size(),
@@ -1440,7 +1435,7 @@ class FunctionType: public Type
 	/// The only functions that do not pad are hash functions, the low-level call functions
 	/// and abi.encodePacked.
 	bool padArguments() const;
-	bool takesArbitraryParameters() const { return m_arbitraryParameters; }
+	bool takesArbitraryParameters() const { return m_options.arbitraryParameters; }
 	/// true iff the function takes a single bytes parameter and it is passed on without padding.
 	bool takesSinglePackedBytesParameter() const
 	{
@@ -1459,10 +1454,10 @@ class FunctionType: public Type
 		}
 	}
 
-	bool gasSet() const { return m_gasSet; }
-	bool valueSet() const { return m_valueSet; }
-	bool saltSet() const { return m_saltSet; }
-	bool bound() const { return m_bound; }
+	bool gasSet() const { return m_options.gasSet; }
+	bool valueSet() const { return m_options.valueSet; }
+	bool saltSet() const { return m_options.saltSet; }
+	bool bound() const { return m_options.bound; }
 
 	/// @returns a copy of this type, where gas or value are set manually. This will never set one
 	/// of the parameters to false.
@@ -1490,15 +1485,8 @@ class FunctionType: public Type
 	std::vector<std::string> m_returnParameterNames;
 	Kind const m_kind;
 	StateMutability m_stateMutability = StateMutability::NonPayable;
-	/// true if the function takes an arbitrary number of arguments of arbitrary types
-	bool const m_arbitraryParameters = false;
-	bool const m_gasSet = false; ///< true iff the gas value to be used is on the stack
-	bool const m_valueSet = false; ///< true iff the value to be sent is on the stack
-	/// true iff the function is called as arg1.fun(arg2, ..., argn).
-	/// This is achieved through the "using for" directive.
-	bool const m_bound = false;
 	Declaration const* m_declaration = nullptr;
-	bool m_saltSet = false; ///< true iff the salt value to be used is on the stack
+	Options const m_options;
 };
 
 /**
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 5a633d2e66..a54a2dd4f1 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -780,6 +780,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 			break;
 		case FunctionType::Kind::Send:
 		case FunctionType::Kind::Transfer:
+		{
 			_functionCall.expression().accept(*this);
 			// Provide the gas stipend manually at first because we may send zero ether.
 			// Will be zeroed if we send more than zero ether.
@@ -788,6 +789,9 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 			// gas <- gas * !value
 			m_context << Instruction::SWAP1 << Instruction::DUP2;
 			m_context << Instruction::ISZERO << Instruction::MUL << Instruction::SWAP1;
+			FunctionType::Options callOptions;
+			callOptions.valueSet = true;
+			callOptions.gasSet = true;
 			appendExternalFunctionCall(
 				FunctionType(
 					TypePointers{},
@@ -795,11 +799,9 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 					strings(),
 					strings(),
 					FunctionType::Kind::BareCall,
-					false,
 					StateMutability::NonPayable,
 					nullptr,
-					true,
-					true
+					callOptions
 				),
 				{},
 				false
@@ -812,6 +814,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				m_context.appendConditionalRevert(true);
 			}
 			break;
+		}
 		case FunctionType::Kind::Selfdestruct:
 			acceptAndConvert(*arguments.front(), *function.parameterTypes().front(), true);
 			m_context << Instruction::SELFDESTRUCT;

From fb8c138b8bb85d603f0ce4aef3170b63129d8887 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Fri, 24 Dec 2021 00:44:15 +0100
Subject: [PATCH 0231/1748] Do not analyze unecessary contracts

---
 libsolidity/formal/CHC.cpp                               | 9 +++++++++
 libsolidity/formal/SMTEncoder.cpp                        | 6 ++++++
 libsolidity/formal/SMTEncoder.h                          | 2 ++
 .../blockchain_state/balance_receive_ext_calls.sol       | 2 +-
 .../this_does_not_change_external_call.sol               | 3 +--
 .../constructor_state_variable_init_chain_alternate.sol  | 3 ++-
 .../external_calls/external_call_with_value_2.sol        | 2 +-
 .../smtCheckerTests/functions/functions_external_2.sol   | 2 +-
 .../operators/conditional_assignment_6.sol               | 2 +-
 .../smtCheckerTests/special/tx_vars_reentrancy_1.sol     | 2 +-
 .../smtCheckerTests/special/tx_vars_reentrancy_2.sol     | 2 +-
 11 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 0edfc27fff..9e31d7fc9c 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -78,6 +78,9 @@ CHC::CHC(
 
 void CHC::analyze(SourceUnit const& _source)
 {
+	if (!shouldAnalyze(_source))
+		return;
+
 	if (!m_settings.solvers.z3 && !m_settings.solvers.smtlib2)
 	{
 		if (!m_noSolverWarning)
@@ -137,6 +140,9 @@ vector<string> CHC::unhandledQueries() const
 
 bool CHC::visit(ContractDefinition const& _contract)
 {
+	if (!shouldAnalyze(_contract))
+		return false;
+
 	resetContractAnalysis();
 	initContract(_contract);
 	clearIndices(&_contract);
@@ -152,6 +158,9 @@ bool CHC::visit(ContractDefinition const& _contract)
 
 void CHC::endVisit(ContractDefinition const& _contract)
 {
+	if (!shouldAnalyze(_contract))
+		return;
+
 	for (auto base: _contract.annotation().linearizedBaseContracts)
 	{
 		if (auto constructor = base->constructor())
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 68545f4f6b..b42e9b3557 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -1035,6 +1035,12 @@ void SMTEncoder::visitPublicGetter(FunctionCall const& _funCall)
 	}
 }
 
+bool SMTEncoder::shouldAnalyze(SourceUnit const& _source) const
+{
+	return m_settings.contracts.isDefault() ||
+		m_settings.contracts.has(*_source.annotation().path);
+}
+
 bool SMTEncoder::shouldAnalyze(ContractDefinition const& _contract) const
 {
 	if (!_contract.canBeDeployed())
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 7ca19358d7..fe84189beb 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -223,6 +223,8 @@ class SMTEncoder: public ASTConstVisitor
 	/// @returns true if @param _contract is set for analysis in the settings
 	/// and it is not abstract.
 	bool shouldAnalyze(ContractDefinition const& _contract) const;
+	/// @returns true if @param _source is set for analysis in the settings.
+	bool shouldAnalyze(SourceUnit const& _source) const;
 
 	bool isPublicGetter(Expression const& _expr);
 
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
index 96223b7e94..313da678ef 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
@@ -16,5 +16,5 @@ contract C {
 // ----
 // Warning 1218: (131-165): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (131-165): CHC: Assertion violation might happen here.
-// Info 1180: Reentrancy property(ies) for :C:\n(!(<errorCode> >= 2) && (((:var 1).balances[address(this)] + ((- 1) * (:var 0).balances[address(this)])) <= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
+// Info 1180: Reentrancy property(ies) for :C:\n(!(<errorCode> >= 2) && (((:var 0).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) >= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
 // Warning 4661: (131-165): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
index f169645010..49d2eb33b4 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
@@ -17,5 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreOS: macos
-// ----
-// Info 1180: Contract invariant(s) for :C:\n(((address(this) + ((- 1) * t)) <= 0) && ((address(this) + ((- 1) * t)) >= 0))\nReentrancy property(ies) for :C:\n((!((t + ((- 1) * address(this))) = 0) || (<errorCode> <= 0)) && (!((t + ((- 1) * address(this))) <= 0) || ((t' + ((- 1) * address(this))) <= 0)) && (!((t + ((- 1) * address(this))) >= 0) || ((address(this) + ((- 1) * t')) <= 0)))\n((!(<errorCode> >= 2) || !((t + ((- 1) * address(this))) = 0)) && (!((t + ((- 1) * address(this))) <= 0) || ((t' + ((- 1) * address(this))) <= 0)) && (!((t + ((- 1) * address(this))) >= 0) || ((address(this) + ((- 1) * t')) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this) == t)\n<errorCode> = 2 -> Assertion failed at assert(a == t)\n
+// SMTIgnoreInv: yes
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
index f0b5d48e1f..805a75bbb0 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
@@ -24,5 +24,6 @@ contract D is C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (286-300): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\na = 1\n\nTransaction trace:\nD.constructor(1)
+// Warning 6328: (286-300): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
index 4b51d9d9e2..f6c8338583 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
@@ -14,5 +14,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (150-186): CHC: Assertion violation might happen here.
-// Warning 6328: (205-240): CHC: Assertion violation happens here.
+// Warning 6328: (205-240): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    i.f{value: 0}() -- untrusted external call
 // Warning 4661: (150-186): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
index 3a3b295e45..c2f55fa981 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
@@ -25,4 +25,4 @@ contract C
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (234-253): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!((map[1] + ((- 1) * map[0])) >= 0) || ((map'[0] + ((- 1) * map'[1])) <= 0)) && !(<errorCode> = 2) && (!((map[1] + ((- 1) * map[0])) <= 0) || ((map'[1] + ((- 1) * map'[0])) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!((map[1] + ((- 1) * map[0])) >= 0) || ((map'[0] + ((- 1) * map'[1])) <= 0)) && (((map'[1] + ((- 1) * map'[0])) <= 0) || !((map[1] + ((- 1) * map[0])) <= 0)) && !(<errorCode> = 2))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
index 1affbb6ca0..923147d495 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
@@ -25,4 +25,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 2072: (255-261): Unused local variable.
-// Info 1180: Reentrancy property(ies) for :C:\n((!(x' >= 3) || (a' = a)) && (!(x' <= 0) || !(x >= 2)) && (<errorCode> <= 0) && (!(x <= 2) || !(x' >= 3)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
+// Info 1180: Reentrancy property(ies) for :C:\n((!(x <= 2) || !(x' >= 3)) && (<errorCode> <= 0) && (!(x' <= 0) || !(x >= 2)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
index 71608eabd3..175b684109 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
@@ -13,4 +13,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 1236\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 38 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 1 } -- reentrant call\n            _i.f() -- untrusted external call
+// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 2997\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 2803 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 32278 } -- reentrant call\n            _i.f() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
index 206d95c466..81de958b34 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
@@ -13,4 +13,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (157-191): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 101\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 69 }\n    _i.f{ value: 100 }() -- untrusted external call
+// Warning 6328: (157-191): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 101\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 83 }\n    _i.f{ value: 100 }() -- untrusted external call

From 942a3301dc2b0117567cc5c6e8253f226e98fbbb Mon Sep 17 00:00:00 2001
From: semaraugusto <semaraugusto@dcc.ufmg.br>
Date: Wed, 29 Dec 2021 00:17:15 -0300
Subject: [PATCH 0232/1748] fix issue with delegating votes to people who
 cannot vote. That made it so that if wallet A delegated to wallet B and B had
 no rights to vote, than B would lose out on its own vote

---
 docs/examples/voting.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/examples/voting.rst b/docs/examples/voting.rst
index 84191118db..24e1e5446d 100644
--- a/docs/examples/voting.rst
+++ b/docs/examples/voting.rst
@@ -130,9 +130,12 @@ of votes.
 
             // Since `sender` is a reference, this
             // modifies `voters[msg.sender].voted`
+            Voter storage delegate_ = voters[to];
+
+            // Voters cannot delegate to wallets that cannot vote.
+            require(delegate_.weight >= 1)
             sender.voted = true;
             sender.delegate = to;
-            Voter storage delegate_ = voters[to];
             if (delegate_.voted) {
                 // If the delegate already voted,
                 // directly add to the number of votes

From 6fbfa33486ba4bd1c6c3a9953566788df7546c78 Mon Sep 17 00:00:00 2001
From: Semar Augusto <semaraugusto@dcc.ufmg.br>
Date: Wed, 29 Dec 2021 07:04:13 -0300
Subject: [PATCH 0233/1748] Update docs/examples/voting.rst

Co-authored-by: Bhargava Shastry <bshastry@ethereum.org>
---
 docs/examples/voting.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/voting.rst b/docs/examples/voting.rst
index 24e1e5446d..0e8901c3dd 100644
--- a/docs/examples/voting.rst
+++ b/docs/examples/voting.rst
@@ -133,7 +133,7 @@ of votes.
             Voter storage delegate_ = voters[to];
 
             // Voters cannot delegate to wallets that cannot vote.
-            require(delegate_.weight >= 1)
+            require(delegate_.weight >= 1);
             sender.voted = true;
             sender.delegate = to;
             if (delegate_.voted) {

From 4c838d9cf5394535b5bb0f179ca0c80b01967338 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 20 Dec 2021 19:30:53 +0100
Subject: [PATCH 0234/1748] abi.encodeCall for declarations.

---
 Changelog.md                                  |  4 +
 libsolidity/analysis/TypeChecker.cpp          | 25 +++++-
 libsolidity/codegen/ExpressionCompiler.cpp    | 18 +++-
 .../codegen/ir/IRGeneratorForStatements.cpp   | 19 ++++-
 .../abi_encode_call_declaration.sol           | 54 ++++++++++++
 .../specialFunctions/encodeCall.sol           | 84 ++++++-------------
 .../specialFunctions/encodeCall_fail_args.sol | 27 ++++++
 .../encodeCall_fail_funType.sol               | 78 +++++++++++++++++
 8 files changed, 239 insertions(+), 70 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol

diff --git a/Changelog.md b/Changelog.md
index e4022b2b17..b88e1a9714 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
 ### 0.8.12 (unreleased)
 
+Language Features:
+ * General: Support ``ContractName.functionName`` for ``abi.encodeCall``, in addition to external function pointers.
+
+
 Compiler Features:
 
 
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index d6c589f75c..d4cffc00e7 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -2122,16 +2122,35 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 		return;
 	}
 
-	if (functionPointerType->kind() != FunctionType::Kind::External)
+	if (
+		functionPointerType->kind() != FunctionType::Kind::External &&
+		functionPointerType->kind() != FunctionType::Kind::Declaration
+	)
 	{
-		string msg = "Function must be \"public\" or \"external\".";
+		string msg = "Expected regular external function type, or external view on public function.";
+		if (functionPointerType->kind() == FunctionType::Kind::Internal)
+			msg += " Provided internal function.";
+		else if (functionPointerType->kind() == FunctionType::Kind::DelegateCall)
+			msg += " Cannot use library functions for abi.encodeCall.";
+		else if (functionPointerType->kind() == FunctionType::Kind::Creation)
+			msg += " Provided creation function.";
+		else
+			msg += " Cannot use special function.";
 		SecondarySourceLocation ssl{};
 
 		if (functionPointerType->hasDeclaration())
 		{
 			ssl.append("Function is declared here:", functionPointerType->declaration().location());
-			if (functionPointerType->declaration().scope() == m_currentContract)
+			if (
+				functionPointerType->declaration().visibility() == Visibility::Public &&
+				functionPointerType->declaration().scope() == m_currentContract
+			)
 				msg += " Did you forget to prefix \"this.\"?";
+			else if (contains(
+				m_currentContract->annotation().linearizedBaseContracts,
+				functionPointerType->declaration().scope()
+			) && functionPointerType->declaration().scope() != m_currentContract)
+				msg += " Functions from base contracts have to be external.";
 		}
 
 		m_errorReporter.typeError(3509_error, arguments[0]->location(), ssl, msg);
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 5a633d2e66..78b6f02b63 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1255,7 +1255,6 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 
 				auto const functionPtr = dynamic_cast<FunctionTypePointer>(arguments[0]->annotation().type);
 				solAssert(functionPtr);
-				solAssert(functionPtr->sizeOnStack() == 2);
 
 				// Account for tuples with one component which become that component
 				if (auto const tupleType = dynamic_cast<TupleType const*>(arguments[1]->annotation().type))
@@ -1330,9 +1329,20 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				}
 				else if (function.kind() == FunctionType::Kind::ABIEncodeCall)
 				{
-					// stack: <memory pointer> <functionPointer>
-					// Extract selector from the stack
-					m_context << Instruction::SWAP1 << Instruction::POP;
+					auto const& funType = dynamic_cast<FunctionType const&>(*selectorType);
+					if (funType.kind() == FunctionType::Kind::Declaration)
+					{
+						solAssert(funType.hasDeclaration());
+						solAssert(selectorType->sizeOnStack() == 0);
+						m_context << funType.externalIdentifier();
+					}
+					else
+					{
+						solAssert(selectorType->sizeOnStack() == 2);
+						// stack: <memory pointer> <functionPointer>
+						// Extract selector from the stack
+						m_context << Instruction::SWAP1 << Instruction::POP;
+					}
 					// Conversion will be done below
 					dataOnStack = TypeProvider::uint(32);
 				}
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 179b3e739b..d356850375 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1150,10 +1150,21 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		}
 
 		if (functionType->kind() == FunctionType::Kind::ABIEncodeCall)
-			selector = convert(
-				IRVariable(*arguments[0]).part("functionSelector"),
-				*TypeProvider::fixedBytes(4)
-			).name();
+		{
+			auto const& selectorType = dynamic_cast<FunctionType const&>(type(*arguments.front()));
+			if (selectorType.kind() == FunctionType::Kind::Declaration)
+			{
+				solAssert(selectorType.hasDeclaration());
+				selector = formatNumber(selectorType.externalIdentifier() << (256 - 32));
+			}
+			else
+			{
+				selector = convert(
+					IRVariable(*arguments[0]).part("functionSelector"),
+					*TypeProvider::fixedBytes(4)
+				).name();
+			}
+		}
 		else if (functionType->kind() == FunctionType::Kind::ABIEncodeWithSignature)
 		{
 			// hash the signature
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
new file mode 100644
index 0000000000..a70c6b903c
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
@@ -0,0 +1,54 @@
+pragma abicoder v2;
+
+contract X {
+    // no "returns" on purpose
+    function a(uint) public pure {}
+    function b(uint) external pure {}
+}
+
+contract Base {
+    function a(uint x) external pure returns (uint) { return x + 1; }
+}
+
+contract C is Base {
+	function test() public view returns (uint r) {
+        bool success;
+        bytes memory result;
+        (success, result) = address(this).staticcall(abi.encodeCall(X.a, 1));
+        require(success && result.length == 32);
+        r += abi.decode(result, (uint));
+        require(r == 2);
+
+        (success, result) = address(this).staticcall(abi.encodeCall(X.b, 10));
+        require(success && result.length == 32);
+        r += abi.decode(result, (uint));
+        require(r == 13);
+
+        (success, result) = address(this).staticcall(abi.encodeCall(Base.a, 100));
+        require(success && result.length == 32);
+        r += abi.decode(result, (uint));
+        require(r == 114);
+
+        (success, result) = address(this).staticcall(abi.encodeCall(this.a, 1000));
+        require(success && result.length == 32);
+        r += abi.decode(result, (uint));
+        require(r == 1115);
+
+        (success, result) = address(this).staticcall(abi.encodeCall(C.b, 10000));
+        require(success && result.length == 32);
+        r += abi.decode(result, (uint));
+        require(r == 11116);
+
+        return r;
+	}
+    function b(uint x) external view returns (uint) {
+        return this.a(x);
+    }
+
+}
+
+// ====
+// compileViaYul: also
+// EVMVersion: >=byzantium
+// ----
+// test() -> 11116
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol
index 41b8f16ccb..6cf39cfaeb 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall.sol
@@ -2,81 +2,47 @@ interface I {
 	function fExternal(uint256 p, string memory t) external;
 }
 
+contract Other {
+	function fExternal(uint) external pure {}
+	function fPublic(uint) public pure {}
+	function fInternal(uint) internal pure {}
+}
+
 library L {
 	function fExternal(uint256 p, string memory t) external {}
+	function fInternal(uint256 p, string memory t) internal {}
 }
 
-contract C {
-	using L for uint256;
+contract Base {
+	function baseFunctionExternal(uint) external pure {}
+}
 
+contract C is Base {
 	function f(int a) public {}
 	function f2(int a, string memory b) public {}
-	function f3(int a, int b) public {}
 	function f4() public {}
-	function fInternal(uint256 p, string memory t) internal {}
 
-	function failFunctionArgsWrongType() public returns(bytes memory) {
-		return abi.encodeCall(this.f, ("test"));
-	}
-	function failFunctionArgsTooMany() public returns(bytes memory) {
-		return abi.encodeCall(this.f, (1, 2));
-	}
-	function failFunctionArgsTooFew0() public returns(bytes memory) {
-		return abi.encodeCall(this.f, ());
-	}
-	function failFunctionArgsTooFew1() public returns(bytes memory) {
-		return abi.encodeCall(this.f);
-	}
-	function failFunctionPtrMissing() public returns(bytes memory) {
-		return abi.encodeCall(1, this.f);
-	}
-	function failFunctionPtrWrongType() public returns(bytes memory) {
-		return abi.encodeCall(abi.encodeCall, (1, 2, 3, "test"));
-	}
-	function failFunctionInternal() public returns(bytes memory) {
-		return abi.encodeCall(fInternal, (1, "123"));
-	}
-	function failFunctionInternalFromVariable() public returns(bytes memory) {
-		function(uint256, string memory) internal localFunctionPointer = fInternal;
-		return abi.encodeCall(localFunctionPointer, (1, "123"));
-	}
-	function failFunctionArgsArrayLiteral() public returns(bytes memory) {
-		return abi.encodeCall(this.f3, [1, 2]);
-	}
-	function failLibraryPointerCall() public returns (bytes memory) {
-		return abi.encodeCall(L.fExternal, (1, "123"));
-	}
-	function failBoundLibraryPointerCall() public returns (bytes memory) {
-		uint256 x = 1;
-		return abi.encodeCall(x.fExternal, (1, "123"));
-	}
-	function failInterfacePointerCall() public returns (bytes memory) {
-		return abi.encodeCall(I.fExternal, (1, "123"));
-	}
-	function successFunctionArgsIntLiteralTuple() public returns(bytes memory) {
+	function successFunctionArgsIntLiteralTuple() public view returns(bytes memory) {
 		return abi.encodeCall(this.f, (1));
 	}
-	function successFunctionArgsIntLiteral() public returns(bytes memory) {
+	function successFunctionArgsIntLiteral() public view returns(bytes memory) {
 		return abi.encodeCall(this.f, 1);
 	}
-	function successFunctionArgsLiteralTuple() public returns(bytes memory) {
+	function successFunctionArgsLiteralTuple() public view returns(bytes memory) {
 		return abi.encodeCall(this.f2, (1, "test"));
 	}
-	function successFunctionArgsEmptyTuple() public returns(bytes memory) {
+	function successFunctionArgsEmptyTuple() public view returns(bytes memory) {
 		return abi.encodeCall(this.f4, ());
 	}
+	function viaDeclaration() public pure returns (bytes memory) {
+		return bytes.concat(
+			abi.encodeCall(Other.fExternal, (1)),
+			abi.encodeCall(Other.fPublic, (1)),
+			abi.encodeCall(I.fExternal, (1, "123"))
+		);
+	}
+	function viaBaseDeclaration() public pure returns (bytes memory) {
+		return abi.encodeCall(Base.baseFunctionExternal, (1));
+	}
 }
 // ----
-// TypeError 5407: (486-494): Cannot implicitly convert component at position 0 from "literal_string "test"" to "int256".
-// TypeError 7788: (576-606): Expected 1 instead of 2 components for the tuple parameter.
-// TypeError 7788: (687-713): Expected 1 instead of 0 components for the tuple parameter.
-// TypeError 6219: (794-816): Expected two arguments: a function pointer followed by a tuple.
-// TypeError 5511: (911-912): Expected first argument to be a function pointer, not "int_const 1".
-// TypeError 3509: (1018-1032): Function must be "public" or "external".
-// TypeError 3509: (1145-1154): Function must be "public" or "external". Did you forget to prefix "this."?
-// TypeError 3509: (1350-1370): Function must be "public" or "external".
-// TypeError 7515: (1469-1500): Expected a tuple with 2 components instead of a single non-tuple parameter.
-// TypeError 5407: (1493-1499): Cannot implicitly convert component at position 0 from "uint8[2]" to "int256".
-// TypeError 3509: (1596-1607): Function must be "public" or "external".
-// TypeError 3509: (1738-1749): Function must be "public" or "external".
-// TypeError 3509: (1860-1871): Function must be "public" or "external".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
new file mode 100644
index 0000000000..a1c20f9bde
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
@@ -0,0 +1,27 @@
+contract C {
+	function f(int a) public {}
+	function f3(int a, int b) public {}
+
+	function failFunctionArgsWrongType() public returns(bytes memory) {
+		return abi.encodeCall(this.f, ("test"));
+	}
+	function failFunctionArgsTooMany() public returns(bytes memory) {
+		return abi.encodeCall(this.f, (1, 2));
+	}
+	function failFunctionArgsTooFew0() public returns(bytes memory) {
+		return abi.encodeCall(this.f, ());
+	}
+	function failFunctionArgsTooFew1() public returns(bytes memory) {
+		return abi.encodeCall(this.f);
+	}
+	function failFunctionArgsArrayLiteral() public returns(bytes memory) {
+		return abi.encodeCall(this.f3, [1, 2]);
+	}
+}
+// ----
+// TypeError 5407: (181-189): Cannot implicitly convert component at position 0 from "literal_string "test"" to "int256".
+// TypeError 7788: (271-301): Expected 1 instead of 2 components for the tuple parameter.
+// TypeError 7788: (382-408): Expected 1 instead of 0 components for the tuple parameter.
+// TypeError 6219: (489-511): Expected two arguments: a function pointer followed by a tuple.
+// TypeError 7515: (597-628): Expected a tuple with 2 components instead of a single non-tuple parameter.
+// TypeError 5407: (621-627): Cannot implicitly convert component at position 0 from "uint8[2]" to "int256".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol
new file mode 100644
index 0000000000..e2de483872
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol
@@ -0,0 +1,78 @@
+interface I {
+	function fExternal(uint256 p, string memory t) external;
+}
+
+contract Other {
+	function fExternal(uint) external pure {}
+	function fPublic(uint) public pure {}
+	function fInternal(uint) internal pure {}
+}
+
+library L {
+	function fExternal(uint256 p, string memory t) external {}
+	function fInternal(uint256 p, string memory t) internal {}
+}
+
+contract Base {
+	function baseFunctionInternal(uint) internal pure {}
+	function baseFunctionPublic(uint) public pure {}
+}
+
+function fileLevel(uint) pure {}
+
+contract C is Base {
+	using L for uint256;
+
+	function fPublic(int a) public {}
+	function fInternal(uint256 p, string memory t) internal {}
+
+	function failFunctionPtrMissing() public returns(bytes memory) {
+		return abi.encodeCall(1, this.fPublic);
+	}
+	function failFunctionPtrWrongType() public returns(bytes memory) {
+		return abi.encodeCall(abi.encodeCall, (1, 2, 3, "test"));
+	}
+	function failFunctionInternal() public returns(bytes memory) {
+		return abi.encodeCall(fInternal, (1, "123"));
+	}
+	function failFunctionInternalFromVariable() public returns(bytes memory) {
+		function(uint256, string memory) internal localFunctionPointer = fInternal;
+		return abi.encodeCall(localFunctionPointer, (1, "123"));
+	}
+	function failLibraryPointerCall() public {
+		abi.encodeCall(L.fInternal, (1, "123"));
+		abi.encodeCall(L.fExternal, (1, "123"));
+	}
+	function failBoundLibraryPointerCall() public returns (bytes memory) {
+		uint256 x = 1;
+		return abi.encodeCall(x.fExternal, (1, "123"));
+	}
+	function viaBaseDeclaration() public pure returns (bytes memory) {
+		return abi.encodeCall(C.fPublic, (2));
+	}
+	function viaBaseDeclaration2() public pure returns (bytes memory) {
+		return bytes.concat(
+			abi.encodeCall(Base.baseFunctionPublic, (1)),
+			abi.encodeCall(Base.baseFunctionInternal, (1))
+		);
+	}
+	function fileLevelFunction() public pure returns (bytes memory) {
+		return abi.encodeCall(fileLevel, (2));
+	}
+	function createFunction() public pure returns (bytes memory) {
+		return abi.encodeCall(new Other, (2));
+	}
+}
+// ----
+// TypeError 5511: (742-743): Expected first argument to be a function pointer, not "int_const 1".
+// TypeError 3509: (855-869): Expected regular external function type, or external view on public function. Cannot use special function.
+// TypeError 3509: (982-991): Expected regular external function type, or external view on public function. Provided internal function.
+// TypeError 3509: (1187-1207): Expected regular external function type, or external view on public function. Provided internal function.
+// TypeError 3509: (1286-1297): Expected regular external function type, or external view on public function. Provided internal function.
+// TypeError 3509: (1329-1340): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
+// TypeError 3509: (1471-1482): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
+// TypeError 3509: (1592-1601): Expected regular external function type, or external view on public function. Provided internal function. Did you forget to prefix "this."?
+// TypeError 3509: (1722-1745): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
+// TypeError 3509: (1771-1796): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
+// TypeError 3509: (1902-1911): Expected regular external function type, or external view on public function. Provided internal function.
+// TypeError 3509: (2010-2019): Expected regular external function type, or external view on public function. Provided creation function.

From b95db2db5eff4bb40779c048411b0752ab0ad298 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 28 Dec 2021 18:29:20 +0100
Subject: [PATCH 0235/1748] Remove unnecessary checks in modifier resolve
 function

---
 libsolidity/ast/AST.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index c36aee5b39..f2b7369b71 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -511,23 +511,20 @@ ModifierDefinition const& ModifierDefinition::resolveVirtual(
 	ContractDefinition const* _searchStart
 ) const
 {
+	// Super is not possible with modifiers
 	solAssert(_searchStart == nullptr, "Used super in connection with modifiers.");
 
-	// If we are not doing super-lookup and the modifier is not virtual, we can stop here.
-	if (_searchStart == nullptr && !virtualSemantics())
+	// The modifier is not virtual, we can stop here.
+	if (!virtualSemantics())
 		return *this;
 
 	solAssert(!dynamic_cast<ContractDefinition const&>(*scope()).isLibrary(), "");
 
 	for (ContractDefinition const* c: _mostDerivedContract.annotation().linearizedBaseContracts)
-	{
-		if (_searchStart != nullptr && c != _searchStart)
-			continue;
-		_searchStart = nullptr;
 		for (ModifierDefinition const* modifier: c->functionModifiers())
 			if (modifier->name() == name())
 				return *modifier;
-	}
+
 	solAssert(false, "Virtual modifier " + name() + " not found.");
 	return *this; // not reached
 }

From 4456eeb6bbad5b2ae826a577318458eebb62d962 Mon Sep 17 00:00:00 2001
From: Franziska Heintel <41991517+franzihei@users.noreply.github.com>
Date: Wed, 29 Dec 2021 16:06:05 +0100
Subject: [PATCH 0236/1748] [DOCS] update contributing section meeting link

---
 docs/contributing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 4844eaae3c..2895744ef4 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -33,7 +33,7 @@ the team and contributors are working on, you can join our public team calls:
 - Mondays at 3pm CET/CEST.
 - Wednesdays at 2pm CET/CEST.
 
-Both calls take place on `Jitsi <https://meet.komputing.org/solidity>`_.
+Both calls take place on `Jitsi <https://meet.ethereum.org/solidity>`_.
 
 How to Report Issues
 ====================

From bd819c87fa12ee8a3a5aa164bd2f44fed731416b Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Fri, 24 Dec 2021 23:23:51 +0530
Subject: [PATCH 0237/1748] added warning if isoltest gas-cost-expectations are
 not enforced

---
 test/boostTest.cpp      | 3 +++
 test/tools/isoltest.cpp | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index 6fcd684f46..c9d70dc1ce 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -191,6 +191,9 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 	if (solidity::test::CommonOptions::get().disableSemanticTests)
 		cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
 
+	if (!solidity::test::CommonOptions::get().enforceGasTest)
+		cout << endl << "WARNING :: Gas Cost Expectations are not being enforced" << endl << endl;
+
 	// Include the interactive tests in the automatic tests as well
 	for (auto const& ts: g_interactiveTestsuites)
 	{
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index 5ae1a3f998..149eaaffa6 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -437,6 +437,9 @@ int main(int argc, char const *argv[])
 		if (options.disableSemanticTests)
 			cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
 
+		if (!options.enforceGasTest)
+			cout << "WARNING :: Gas Cost Expectations are not being enforced" << endl << endl;
+
 		TestStats global_stats{0, 0};
 		cout << "Running tests..." << endl << endl;
 

From 2a7f26e2c09d630d484774145cd9c62702b1c9d8 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 20 Dec 2021 19:03:48 +0100
Subject: [PATCH 0238/1748] Test batcher.

---
 .circleci/config.yml     |   8 ++-
 .circleci/soltest.sh     |  41 ++++++++++++---
 .circleci/soltest_all.sh |  46 ++++++-----------
 test/Common.cpp          |  13 +++++
 test/Common.h            |  26 ++++++++++
 test/boostTest.cpp       | 109 +++++++++++++++++++++++++++++----------
 test/tools/isoltest.cpp  |  32 +++++++++---
 7 files changed, 205 insertions(+), 70 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 164802b37b..6edfc2d3a6 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -897,7 +897,7 @@ jobs:
 
   t_ubu_soltest_all: &t_ubu_soltest_all
     <<: *base_ubuntu2004
-    parallelism: 15 # 7 EVM versions, each with/without optimization + 1 ABIv1/@nooptions run
+    parallelism: 50
     <<: *steps_soltest_all
 
   t_ubu_lsp: &t_ubu_lsp
@@ -906,6 +906,7 @@ jobs:
 
   t_archlinux_soltest: &t_archlinux_soltest
     <<: *base_archlinux
+    parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
@@ -924,6 +925,7 @@ jobs:
 
   t_ubu_soltest_enforce_yul: &t_ubu_soltest_enforce_yul
     <<: *base_ubuntu2004
+    parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
       SOLTEST_FLAGS: --enforce-via-yul
@@ -933,6 +935,7 @@ jobs:
 
   t_ubu_clang_soltest: &t_ubu_clang_soltest
     <<: *base_ubuntu2004_clang
+    parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
@@ -960,6 +963,7 @@ jobs:
 
   t_ubu_asan_soltest:
     <<: *base_ubuntu2004
+    parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
@@ -969,6 +973,7 @@ jobs:
 
   t_ubu_asan_clang_soltest:
     <<: *base_ubuntu2004_clang
+    parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
@@ -978,6 +983,7 @@ jobs:
 
   t_ubu_ubsan_clang_soltest:
     <<: *base_ubuntu2004_clang
+    parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
     <<: *steps_soltest
diff --git a/.circleci/soltest.sh b/.circleci/soltest.sh
index 1814b87280..30bd1274ca 100755
--- a/.circleci/soltest.sh
+++ b/.circleci/soltest.sh
@@ -50,19 +50,48 @@ mkdir -p test_results
 ulimit -s 16384
 
 get_logfile_basename() {
+    local run="$1"
     local filename="${EVM}"
     test "${OPTIMIZE}" = "1" && filename="${filename}_opt"
     test "${ABI_ENCODER_V1}" = "1" && filename="${filename}_abiv1"
+    filename="${filename}_${run}"
 
     echo -ne "${filename}"
 }
 
-BOOST_TEST_ARGS=("--color_output=no" "--show_progress=yes" "--logger=JUNIT,error,test_results/$(get_logfile_basename).xml" "${BOOST_TEST_ARGS[@]}")
-SOLTEST_ARGS=("--evm-version=$EVM" "${SOLTEST_FLAGS[@]}")
+[ -z "$CIRCLE_NODE_TOTAL" ] || [ "$CIRCLE_NODE_TOTAL" = 0 ] && CIRCLE_NODE_TOTAL=1
+[ -z "$CIRCLE_NODE_INDEX" ] && CIRCLE_NODE_INDEX=0
+[ -z "$INDEX_SHIFT" ] && INDEX_SHIFT=0
 
-test "${OPTIMIZE}" = "1" && SOLTEST_ARGS+=(--optimize)
-test "${ABI_ENCODER_V1}" = "1" && SOLTEST_ARGS+=(--abiencoderv1)
+# Multiply by a prime number to get better spread, just in case
+# long-running test cases are next to each other.
+CIRCLE_NODE_INDEX=$(((CIRCLE_NODE_INDEX + 23 * INDEX_SHIFT) % CIRCLE_NODE_TOTAL))
 
-echo "Running ${REPODIR}/build/test/soltest ${BOOST_TEST_ARGS[*]} -- ${SOLTEST_ARGS[*]}"
+CPUs=3
+PIDs=()
+for run in $(seq 0 $((CPUs - 1)))
+do
+    BOOST_TEST_ARGS_RUN=(
+        "--color_output=no"
+        "--show_progress=yes"
+        "--logger=JUNIT,error,test_results/$(get_logfile_basename "$run").xml"
+        "${BOOST_TEST_ARGS[@]}"
+    )
+    SOLTEST_ARGS=("--evm-version=$EVM" "${SOLTEST_FLAGS[@]}")
 
-"${REPODIR}/build/test/soltest" "${BOOST_TEST_ARGS[@]}" -- "${SOLTEST_ARGS[@]}"
+    test "${OPTIMIZE}" = "1" && SOLTEST_ARGS+=(--optimize)
+    test "${ABI_ENCODER_V1}" = "1" && SOLTEST_ARGS+=(--abiencoderv1)
+
+    BATCH_ARGS=("--batches" "$((CPUs * CIRCLE_NODE_TOTAL))" "--selected-batch" "$((CPUs * CIRCLE_NODE_INDEX + run))")
+
+    echo "Running ${REPODIR}/build/test/soltest ${BOOST_TEST_ARGS_RUN[*]} -- ${SOLTEST_ARGS[*]}"
+
+    "${REPODIR}/build/test/soltest" -l test_suite "${BOOST_TEST_ARGS_RUN[@]}" -- "${SOLTEST_ARGS[@]}" "${BATCH_ARGS[@]}" &
+    PIDs+=($!)
+done
+
+# wait for individual processes to get their exit status
+for pid in ${PIDs[*]}
+do
+    wait "$pid"
+done
diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 5bd5ed9f1c..3e29d1d2eb 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -31,30 +31,21 @@ REPODIR="$(realpath "$(dirname "$0")"/..)"
 # shellcheck source=scripts/common.sh
 source "${REPODIR}/scripts/common.sh"
 
-# NOTE: If you add/remove values, remember to update `parallelism` setting in CircleCI config.
 EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london)
 DEFAULT_EVM=london
 [[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
 OPTIMIZE_VALUES=(0 1)
-STEPS=$(( 1 + ${#EVM_VALUES[@]} * ${#OPTIMIZE_VALUES[@]} ))
-
-RUN_STEPS=$(circleci_select_steps "$(seq "$STEPS")")
-printTask "Running steps $RUN_STEPS..."
-
-STEP=1
-
 
 # Run for ABI encoder v1, without SMTChecker tests.
-if circleci_step_selected "$RUN_STEPS" "$STEP"
-then
-    EVM="${DEFAULT_EVM}" \
-    OPTIMIZE=1 \
-    ABI_ENCODER_V1=1 \
-    BOOST_TEST_ARGS="-t !smtCheckerTests" \
-    "${REPODIR}/.circleci/soltest.sh"
-fi
-((++STEP))
+EVM="${DEFAULT_EVM}" \
+OPTIMIZE=1 \
+ABI_ENCODER_V1=1 \
+BOOST_TEST_ARGS="-t !smtCheckerTests" \
+"${REPODIR}/.circleci/soltest.sh"
 
+# We shift the batch index so that long-running tests
+# do not always run in the same executor for all EVM versions
+INDEX_SHIFT=0
 for OPTIMIZE in "${OPTIMIZE_VALUES[@]}"
 do
     for EVM in "${EVM_VALUES[@]}"
@@ -68,16 +59,13 @@ do
         DISABLE_SMTCHECKER=""
         [ "${OPTIMIZE}" != "0" ] && DISABLE_SMTCHECKER="-t !smtCheckerTests"
 
-        if circleci_step_selected "$RUN_STEPS" "$STEP"
-        then
-            EVM="$EVM" \
-            OPTIMIZE="$OPTIMIZE" \
-            SOLTEST_FLAGS="$SOLTEST_FLAGS $ENFORCE_GAS_ARGS $EWASM_ARGS" \
-            BOOST_TEST_ARGS="-t !@nooptions $DISABLE_SMTCHECKER" \
-            "${REPODIR}/.circleci/soltest.sh"
-        fi
-        ((++STEP))
-    done
-done
+        EVM="$EVM" \
+        OPTIMIZE="$OPTIMIZE" \
+        SOLTEST_FLAGS="$SOLTEST_FLAGS $ENFORCE_GAS_ARGS $EWASM_ARGS" \
+        BOOST_TEST_ARGS="-t !@nooptions $DISABLE_SMTCHECKER" \
+        INDEX_SHIFT="$INDEX_SHIFT" \
+        "${REPODIR}/.circleci/soltest.sh"
 
-((STEP == STEPS + 1)) || assertFail "Step counter not properly adjusted!"
+        INDEX_SHIFT=$((INDEX_SHIFT + 1))
+    done
+done
\ No newline at end of file
diff --git a/test/Common.cpp b/test/Common.cpp
index 2a663aa1b7..a702cddd69 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -102,6 +102,8 @@ void CommonOptions::addOptions()
 		("testpath", po::value<fs::path>(&this->testPath)->default_value(solidity::test::testPath()), "path to test files")
 		("vm", po::value<std::vector<fs::path>>(&vmPaths), "path to evmc library, can be supplied multiple times.")
 		("ewasm", po::bool_switch(&ewasm)->default_value(ewasm), "tries to automatically find an ewasm vm and enable ewasm test-execution.")
+		("batches", po::value<size_t>(&this->batches)->default_value(1), "set number of batches to split the tests into")
+		("selected-batch", po::value<size_t>(&this->selectedBatch)->default_value(0), "zero-based number of batch to execute")
 		("no-semantic-tests", po::bool_switch(&disableSemanticTests)->default_value(disableSemanticTests), "disable semantic tests")
 		("no-smt", po::bool_switch(&disableSMT)->default_value(disableSMT), "disable SMT checker")
 		("optimize", po::bool_switch(&optimize)->default_value(optimize), "enables optimization")
@@ -126,6 +128,17 @@ void CommonOptions::validate() const
 		ConfigException,
 		"Invalid test path specified."
 	);
+	assertThrow(
+		batches > 0,
+		ConfigException,
+		"Batches needs to be at least 1."
+	);
+	assertThrow(
+		selectedBatch < batches,
+		ConfigException,
+		"Selected batch has to be less than number of batches."
+	);
+
 	if (enforceGasTest)
 	{
 		assertThrow(
diff --git a/test/Common.h b/test/Common.h
index f7c8fa733e..f3ea9e6f48 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -20,6 +20,7 @@
 
 #include <libsolutil/Exceptions.h>
 #include <liblangutil/EVMVersion.h>
+#include <liblangutil/Exceptions.h>
 
 #include <test/evmc/evmc.h>
 
@@ -67,6 +68,8 @@ struct CommonOptions
 	bool useABIEncoderV1 = false;
 	bool showMessages = false;
 	bool showMetadata = false;
+	size_t batches = 1;
+	size_t selectedBatch = 0;
 
 	langutil::EVMVersion evmVersion() const;
 
@@ -96,4 +99,27 @@ bool isValidSemanticTestPath(boost::filesystem::path const& _testPath);
 
 bool loadVMs(CommonOptions const& _options);
 
+/**
+ * Component to help with splitting up all tests into batches.
+ */
+class Batcher
+{
+public:
+	Batcher(size_t _offset, size_t _batches):
+		m_offset(_offset),
+		m_batches(_batches)
+	{
+		solAssert(m_batches > 0 && m_offset < m_batches);
+	}
+	Batcher(Batcher const&) = delete;
+	Batcher& operator=(Batcher const&) = delete;
+
+	bool checkAndAdvance() { return (m_counter++) % m_batches == m_offset; }
+
+private:
+	size_t const m_offset;
+	size_t const m_batches;
+	size_t m_counter = 0;
+};
+
 }
diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index c9d70dc1ce..bfb546736c 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -30,6 +30,7 @@
 #pragma warning(disable:4535) // calling _set_se_translator requires /EHa
 #endif
 #include <boost/test/unit_test.hpp>
+#include <boost/test/tree/traverse.hpp>
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif
@@ -60,6 +61,41 @@ void removeTestSuite(std::string const& _name)
 	master.remove(id);
 }
 
+/**
+ * Class that traverses the boost test tree and removes unit tests that are
+ * not in the current batch.
+ */
+class BoostBatcher: public test_tree_visitor
+{
+public:
+	BoostBatcher(solidity::test::Batcher& _batcher):
+		m_batcher(_batcher)
+	{}
+
+	void visit(test_case const& _testCase) override
+	{
+		if (!m_batcher.checkAndAdvance())
+			// disabling them would be nicer, but it does not work like this:
+			// const_cast<test_case&>(_testCase).p_run_status.value = test_unit::RS_DISABLED;
+			m_path.back()->remove(_testCase.p_id);
+	}
+	bool test_suite_start(test_suite const& _testSuite) override
+	{
+		m_path.push_back(&const_cast<test_suite&>(_testSuite));
+		return test_tree_visitor::test_suite_start(_testSuite);
+	}
+	void test_suite_finish(test_suite const& _testSuite) override
+	{
+		m_path.pop_back();
+		test_tree_visitor::test_suite_finish(_testSuite);
+	}
+
+private:
+	solidity::test::Batcher& m_batcher;
+	std::vector<test_suite*> m_path;
+};
+
+
 void runTestCase(TestCase::Config const& _config, TestCase::TestCaseCreator const& _testCaseCreator)
 {
 	try
@@ -100,7 +136,8 @@ int registerTests(
 	bool _enforceViaYul,
 	bool _enforceCompileToEwasm,
 	vector<string> const& _labels,
-	TestCase::TestCaseCreator _testCaseCreator
+	TestCase::TestCaseCreator _testCaseCreator,
+	solidity::test::Batcher& _batcher
 )
 {
 	int numTestsAdded = 0;
@@ -131,33 +168,38 @@ int registerTests(
 					_enforceViaYul,
 					_enforceCompileToEwasm,
 					_labels,
-					_testCaseCreator
+					_testCaseCreator,
+					_batcher
 				);
 		_suite.add(sub_suite);
 	}
 	else
 	{
-		// This must be a vector of unique_ptrs because Boost.Test keeps the equivalent of a string_view to the filename
-		// that is passed in. If the strings were stored directly in the vector, pointers/references to them would be
-		// invalidated on reallocation.
-		static vector<unique_ptr<string const>> filenames;
-
-		filenames.emplace_back(make_unique<string>(_path.string()));
-		auto test_case = make_test_case(
-			[config, _testCaseCreator]
-			{
-				BOOST_REQUIRE_NO_THROW({
-					runTestCase(config, _testCaseCreator);
-				});
-			},
-			_path.stem().string(),
-			*filenames.back(),
-			0
-		);
-		for (auto const& _label: _labels)
-			test_case->add_label(_label);
-		_suite.add(test_case);
-		numTestsAdded = 1;
+		// TODO would be better to set the test to disabled.
+		if (_batcher.checkAndAdvance())
+		{
+			// This must be a vector of unique_ptrs because Boost.Test keeps the equivalent of a string_view to the filename
+			// that is passed in. If the strings were stored directly in the vector, pointers/references to them would be
+			// invalidated on reallocation.
+			static vector<unique_ptr<string const>> filenames;
+
+			filenames.emplace_back(make_unique<string>(_path.string()));
+			auto test_case = make_test_case(
+				[config, _testCaseCreator]
+				{
+					BOOST_REQUIRE_NO_THROW({
+						runTestCase(config, _testCaseCreator);
+					});
+				},
+				_path.stem().string(),
+				*filenames.back(),
+				0
+			);
+			for (auto const& _label: _labels)
+				test_case->add_label(_label);
+			_suite.add(test_case);
+			numTestsAdded = 1;
+		}
 	}
 	return numTestsAdded;
 }
@@ -172,6 +214,7 @@ void initializeOptions()
 
 	solidity::test::CommonOptions::setSingleton(std::move(options));
 }
+
 }
 
 // TODO: Prototype -- why isn't this declared in the boost headers?
@@ -180,6 +223,8 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] );
 
 test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 {
+	using namespace solidity::test;
+
 	master_test_suite_t& master = framework::master_test_suite();
 	master.p_name.value = "SolidityTests";
 
@@ -194,6 +239,14 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 	if (!solidity::test::CommonOptions::get().enforceGasTest)
 		cout << endl << "WARNING :: Gas Cost Expectations are not being enforced" << endl << endl;
 
+	Batcher batcher(CommonOptions::get().selectedBatch, CommonOptions::get().batches);
+	if (CommonOptions::get().batches > 1)
+		cout << "Batch " << CommonOptions::get().selectedBatch << " out of " << CommonOptions::get().batches << endl;
+
+	// Batch the boost tests
+	BoostBatcher boostBatcher(batcher);
+	traverse_test_tree(master, boostBatcher, true);
+
 	// Include the interactive tests in the automatic tests as well
 	for (auto const& ts: g_interactiveTestsuites)
 	{
@@ -205,15 +258,19 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 		if (ts.needsVM && solidity::test::CommonOptions::get().disableSemanticTests)
 			continue;
 
-		solAssert(registerTests(
+		//TODO
+		//solAssert(
+		registerTests(
 			master,
 			options.testPath / ts.path,
 			ts.subpath,
 			options.enforceViaYul,
 			options.enforceCompileToEwasm,
 			ts.labels,
-			ts.testCaseCreator
-		) > 0, std::string("no ") + ts.title + " tests found");
+			ts.testCaseCreator,
+			batcher
+		);
+		// > 0, std::string("no ") + ts.title + " tests found");
 	}
 
 	if (solidity::test::CommonOptions::get().disableSemanticTests)
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index 149eaaffa6..ae2ce6e248 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -119,7 +119,8 @@ class TestTool
 		TestCreator _testCaseCreator,
 		TestOptions const& _options,
 		fs::path const& _basepath,
-		fs::path const& _path
+		fs::path const& _path,
+		solidity::test::Batcher& _batcher
 	);
 private:
 	enum class Request
@@ -269,7 +270,8 @@ TestStats TestTool::processPath(
 	TestCreator _testCaseCreator,
 	TestOptions const& _options,
 	fs::path const& _basepath,
-	fs::path const& _path
+	fs::path const& _path,
+	solidity::test::Batcher& _batcher
 )
 {
 	std::queue<fs::path> paths;
@@ -298,6 +300,11 @@ TestStats TestTool::processPath(
 			++testCount;
 			paths.pop();
 		}
+		else if (!_batcher.checkAndAdvance())
+		{
+			paths.pop();
+			++skippedCount;
+		}
 		else
 		{
 			++testCount;
@@ -373,7 +380,8 @@ std::optional<TestStats> runTestSuite(
 	TestOptions const& _options,
 	fs::path const& _basePath,
 	fs::path const& _subdirectory,
-	string const& _name
+	string const& _name,
+	solidity::test::Batcher& _batcher
 )
 {
 	fs::path testPath{_basePath / _subdirectory};
@@ -389,7 +397,8 @@ std::optional<TestStats> runTestSuite(
 		_testCaseCreator,
 		_options,
 		_basePath,
-		_subdirectory
+		_subdirectory,
+		_batcher
 	);
 
 	if (stats.skippedCount != stats.testCount)
@@ -415,21 +424,23 @@ std::optional<TestStats> runTestSuite(
 
 int main(int argc, char const *argv[])
 {
+	using namespace solidity::test;
+
 	try
 	{
 		setupTerminal();
 
 		{
-			auto options = std::make_unique<solidity::test::IsolTestOptions>();
+			auto options = std::make_unique<IsolTestOptions>();
 
 			if (!options->parse(argc, argv))
 				return -1;
 
 			options->validate();
-			solidity::test::CommonOptions::setSingleton(std::move(options));
+			CommonOptions::setSingleton(std::move(options));
 		}
 
-		auto& options = dynamic_cast<solidity::test::IsolTestOptions const&>(solidity::test::CommonOptions::get());
+		auto& options = dynamic_cast<IsolTestOptions const&>(CommonOptions::get());
 
 		if (!solidity::test::loadVMs(options))
 			return 1;
@@ -443,6 +454,10 @@ int main(int argc, char const *argv[])
 		TestStats global_stats{0, 0};
 		cout << "Running tests..." << endl << endl;
 
+		Batcher batcher(CommonOptions::get().selectedBatch, CommonOptions::get().batches);
+		if (CommonOptions::get().batches > 1)
+			cout << "Batch " << CommonOptions::get().selectedBatch << " out of " << CommonOptions::get().batches << endl;
+
 		// Actually run the tests.
 		// Interactive tests are added in InteractiveTests.h
 		for (auto const& ts: g_interactiveTestsuites)
@@ -458,7 +473,8 @@ int main(int argc, char const *argv[])
 				options,
 				options.testPath / ts.path,
 				ts.subpath,
-				ts.title
+				ts.title,
+				batcher
 			);
 			if (stats)
 				global_stats += *stats;

From 0010027e17b133266e86963ee003aa42c8883c84 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 30 Dec 2021 12:31:20 +0100
Subject: [PATCH 0239/1748] Fix mapping example.

---
 docs/types/mapping-types.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/types/mapping-types.rst b/docs/types/mapping-types.rst
index c026d73f2e..18f3bf8275 100644
--- a/docs/types/mapping-types.rst
+++ b/docs/types/mapping-types.rst
@@ -84,23 +84,24 @@ The example below uses ``_allowances`` to record the amount someone else is allo
         }
 
         function transferFrom(address sender, address recipient, uint256 amount) public returns (bool) {
+            require(_allowances[sender][msg.sender] >= amount, "ERC20: Allowance not high enough.");
+            _allowances[sender][msg.sender] -= amount;
             _transfer(sender, recipient, amount);
-            approve(sender, msg.sender, amount);
             return true;
         }
 
-        function approve(address owner, address spender, uint256 amount) public returns (bool) {
-            require(owner != address(0), "ERC20: approve from the zero address");
+        function approve(address spender, uint256 amount) public returns (bool) {
             require(spender != address(0), "ERC20: approve to the zero address");
 
-            _allowances[owner][spender] = amount;
-            emit Approval(owner, spender, amount);
+            _allowances[msg.sender][spender] = amount;
+            emit Approval(msg.sender, spender, amount);
             return true;
         }
 
         function _transfer(address sender, address recipient, uint256 amount) internal {
             require(sender != address(0), "ERC20: transfer from the zero address");
             require(recipient != address(0), "ERC20: transfer to the zero address");
+            require(_balances[sender] >= amount, "ERC20: Not enough funds.");
 
             _balances[sender] -= amount;
             _balances[recipient] += amount;

From f30130888e0daf706c23b2a0026c56cfbc9092ee Mon Sep 17 00:00:00 2001
From: Pranay Reddy <pranayreddy1024@gmail.com>
Date: Mon, 3 Jan 2022 11:20:52 +0530
Subject: [PATCH 0240/1748] Added specificity to data location.

Added the specificity that bytes1[] and bytes differ because of padding only in memory data location. Added extra sentence that they are similar when used in storage data location.
---
 docs/types/reference-types.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index cc6fe2d8a8..126440321c 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -153,7 +153,8 @@ third-party string libraries. You can also compare two strings by their keccak25
 concatenate two strings using ``bytes.concat(bytes(s1), bytes(s2))``.
 
 You should use ``bytes`` over ``bytes1[]`` because it is cheaper,
-since ``bytes1[]`` adds 31 padding bytes between the elements. As a general rule,
+since using ``bytes1[]`` in ``memory`` adds 31 padding bytes between the elements. Note that in ``storage``, the
+padding is absent due to tight packing, see :ref:`bytes and string <bytes-and-string>`. As a general rule,
 use ``bytes`` for arbitrary-length raw byte data and ``string`` for arbitrary-length
 string (UTF-8) data. If you can limit the length to a certain number of bytes,
 always use one of the value types ``bytes1`` to ``bytes32`` because they are much cheaper.

From 5597d43635df0c1df09be6c13d326f7ef6cf9d3a Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 3 Jan 2022 14:03:40 +0100
Subject: [PATCH 0241/1748] Add impish to static Z3 PPA script.

---
 scripts/deps-ppa/static_z3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index e8dec0faee..733f9bf3d8 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -27,7 +27,7 @@ email=builds@ethereum.org
 packagename=z3-static
 version=4.8.13
 
-DISTRIBUTIONS="focal groovy hirsute"
+DISTRIBUTIONS="focal groovy hirsute impish"
 
 for distribution in $DISTRIBUTIONS
 do

From e5f912ec89b2a695d783ea6ac80502480254d7d4 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 3 Jan 2022 15:33:51 +0100
Subject: [PATCH 0242/1748] Add static z3 build and version check to release
 checklist.

---
 ReleaseChecklist.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index eaa859fe72..7bfea128ad 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -54,7 +54,8 @@
  - [ ] Run ``./scripts/docker_deploy_manual.sh v$VERSION``).
 
 ### PPA
- - [ ] Change ``scripts/release_ppa.sh`` to match your key's email and key id.
+ - [ ] Make sure the ``ethereum/cpp-build-deps`` PPA repository contains libz3-static-dev builds for all current versions of ubuntu. If not run ``scripts/deps-ppa/static-z3.sh`` (after changing email address and key id and adding the missing ubuntu version) and wait for the builds to succeed before continuing.
+ - [ ] Change ``scripts/release_ppa.sh`` to match your key's email and key id; double-check that ``DISTRIBUTIONS`` contains the most recent versions.
  - [ ] Run ``scripts/release_ppa.sh v$VERSION`` to create the PPA release (you need the relevant openssl key).
  - [ ] Wait for the ``~ethereum/ubuntu/ethereum-static`` PPA build to be finished and published for *all platforms*. SERIOUSLY: DO NOT PROCEED EARLIER!!! *After* the static builds are *published*, copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA for the destination series ``Trusty``, ``Xenial`` and ``Bionic`` while selecting ``Copy existing binaries``.
 

From 57474917a097f32a94a2e8f06574ade6fc3bd36d Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 3 Jan 2022 15:37:29 +0100
Subject: [PATCH 0243/1748] Clarify which functions are added.

---
 docs/contracts/libraries.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/contracts/libraries.rst b/docs/contracts/libraries.rst
index 4f0f03fec7..76bedba49b 100644
--- a/docs/contracts/libraries.rst
+++ b/docs/contracts/libraries.rst
@@ -34,7 +34,8 @@ contracts (using qualified access like ``L.f()``).
 Of course, calls to internal functions
 use the internal calling convention, which means that all internal types
 can be passed and types :ref:`stored in memory <data-location>` will be passed by reference and not copied.
-To realize this in the EVM, code of internal library functions
+To realize this in the EVM, the code of internal library functions
+that are called from a contract
 and all functions called from therein will at compile time be included in the calling
 contract, and a regular ``JUMP`` call will be used instead of a ``DELEGATECALL``.
 

From 772e1008136fe571c62679c32e2ede5e80965c13 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 11 Nov 2021 15:54:38 +0100
Subject: [PATCH 0244/1748] Equal store eliminator.

---
 Changelog.md                                  |  1 +
 libsolidity/interface/OptimiserSettings.h     |  2 +-
 libyul/CMakeLists.txt                         |  2 +
 libyul/optimiser/EqualStoreEliminator.cpp     | 77 +++++++++++++++++++
 libyul/optimiser/EqualStoreEliminator.h       | 60 +++++++++++++++
 libyul/optimiser/OptimizerUtilities.cpp       | 15 ++++
 libyul/optimiser/OptimizerUtilities.h         | 11 +++
 libyul/optimiser/Suite.cpp                    |  3 +
 libyul/optimiser/UnusedAssignEliminator.cpp   |  1 +
 libyul/optimiser/UnusedStoreBase.cpp          | 16 +---
 libyul/optimiser/UnusedStoreBase.h            | 10 ---
 test/libyul/YulOptimizerTestCommon.cpp        |  6 ++
 .../mstore_with_keccak.yul                    | 31 ++++++++
 test/yulPhaser/Chromosome.cpp                 |  2 +-
 14 files changed, 210 insertions(+), 27 deletions(-)
 create mode 100644 libyul/optimiser/EqualStoreEliminator.cpp
 create mode 100644 libyul/optimiser/EqualStoreEliminator.h
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_with_keccak.yul

diff --git a/Changelog.md b/Changelog.md
index b88e1a9714..6e3602c1fc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ Language Features:
 
 
 Compiler Features:
+ * Yul Optimizer: Remove ``mstore`` and ``sstore`` operations if the slot already contains the same value.
 
 
 
diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h
index 5317acee4b..e1c35e9ea2 100644
--- a/libsolidity/interface/OptimiserSettings.h
+++ b/libsolidity/interface/OptimiserSettings.h
@@ -44,7 +44,7 @@ struct OptimiserSettings
 	static char constexpr DefaultYulOptimiserSteps[] =
 		"dhfoDgvulfnTUtnIf"            // None of these can make stack problems worse
 		"["
-			"xa[r]scLM"                // Turn into SSA and simplify
+			"xa[r]EscLM"               // Turn into SSA and simplify
 			"cCTUtTOntnfDIul"          // Perform structural simplification
 			"Lcul"                     // Simplify again
 			"Vcul [j]"                 // Reverse SSA
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 16b68535a9..fde673e3d8 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -120,6 +120,8 @@ add_library(yul
 	optimiser/DeadCodeEliminator.h
 	optimiser/Disambiguator.cpp
 	optimiser/Disambiguator.h
+	optimiser/EqualStoreEliminator.cpp
+	optimiser/EqualStoreEliminator.h
 	optimiser/EquivalentFunctionDetector.cpp
 	optimiser/EquivalentFunctionDetector.h
 	optimiser/EquivalentFunctionCombiner.cpp
diff --git a/libyul/optimiser/EqualStoreEliminator.cpp b/libyul/optimiser/EqualStoreEliminator.cpp
new file mode 100644
index 0000000000..c89567868f
--- /dev/null
+++ b/libyul/optimiser/EqualStoreEliminator.cpp
@@ -0,0 +1,77 @@
+/*
+	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
+/**
+ * Optimisation stage that removes mstore and sstore operations if they store the same
+ * value that is already known to be in that slot.
+ */
+
+#include <libyul/optimiser/EqualStoreEliminator.h>
+
+#include <libyul/optimiser/CallGraphGenerator.h>
+#include <libyul/optimiser/OptimizerUtilities.h>
+#include <libyul/optimiser/Semantics.h>
+#include <libyul/optimiser/CallGraphGenerator.h>
+#include <libyul/SideEffects.h>
+#include <libyul/AST.h>
+#include <libyul/Utilities.h>
+
+#include <libevmasm/GasMeter.h>
+#include <libsolutil/Keccak256.h>
+
+#include <limits>
+
+using namespace std;
+using namespace solidity;
+using namespace solidity::util;
+using namespace solidity::evmasm;
+using namespace solidity::yul;
+
+void EqualStoreEliminator::run(OptimiserStepContext const& _context, Block& _ast)
+{
+	EqualStoreEliminator eliminator{
+		_context.dialect,
+		SideEffectsPropagator::sideEffects(_context.dialect, CallGraphGenerator::callGraph(_ast))
+	};
+	eliminator(_ast);
+
+	StatementRemover remover{eliminator.m_pendingRemovals};
+	remover(_ast);
+}
+
+void EqualStoreEliminator::visit(Statement& _statement)
+{
+	// No need to consider potential changes through complex arguments since
+	// isSimpleStore only returns something if the arguments are identifiers.
+	if (ExpressionStatement const* expression = get_if<ExpressionStatement>(&_statement))
+	{
+		if (auto vars = isSimpleStore(StoreLoadLocation::Storage, *expression))
+		{
+			if (auto const* currentValue = valueOrNullptr(m_storage, vars->first))
+				if (*currentValue == vars->second)
+					m_pendingRemovals.insert(&_statement);
+		}
+		else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, *expression))
+		{
+			if (auto const* currentValue = valueOrNullptr(m_memory, vars->first))
+				if (*currentValue == vars->second)
+					m_pendingRemovals.insert(&_statement);
+		}
+	}
+
+	DataFlowAnalyzer::visit(_statement);
+}
diff --git a/libyul/optimiser/EqualStoreEliminator.h b/libyul/optimiser/EqualStoreEliminator.h
new file mode 100644
index 0000000000..796fcc5383
--- /dev/null
+++ b/libyul/optimiser/EqualStoreEliminator.h
@@ -0,0 +1,60 @@
+/*
+	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
+/**
+ * Optimisation stage that removes mstore and sstore operations if they store the same
+ * value that is already known to be in that slot.
+ */
+
+#pragma once
+
+#include <libyul/optimiser/DataFlowAnalyzer.h>
+#include <libyul/optimiser/OptimiserStep.h>
+
+namespace solidity::yul
+{
+
+/**
+ * Optimisation stage that removes mstore and sstore operations if they store the same
+ * value that is already known to be in that slot.
+ *
+ * Works best if the code is in SSA form - without literal arguments.
+ *
+ * Prerequisite: Disambiguator, ForLoopInitRewriter.
+ */
+class EqualStoreEliminator: public DataFlowAnalyzer
+{
+public:
+	static constexpr char const* name{"EqualStoreEliminator"};
+	static void run(OptimiserStepContext const&, Block& _ast);
+
+private:
+	EqualStoreEliminator(
+		Dialect const& _dialect,
+		std::map<YulString, SideEffects> _functionSideEffects
+	):
+		DataFlowAnalyzer(_dialect, std::move(_functionSideEffects))
+	{}
+
+protected:
+	using ASTModifier::visit;
+	void visit(Statement& _statement) override;
+
+	std::set<Statement const*> m_pendingRemovals;
+};
+
+}
diff --git a/libyul/optimiser/OptimizerUtilities.cpp b/libyul/optimiser/OptimizerUtilities.cpp
index 23596a745f..ba06b2180b 100644
--- a/libyul/optimiser/OptimizerUtilities.cpp
+++ b/libyul/optimiser/OptimizerUtilities.cpp
@@ -57,3 +57,18 @@ optional<evmasm::Instruction> yul::toEVMInstruction(Dialect const& _dialect, Yul
 			return builtin->instruction;
 	return nullopt;
 }
+
+void StatementRemover::operator()(Block& _block)
+{
+	util::iterateReplacing(
+		_block.statements,
+		[&](Statement& _statement) -> std::optional<vector<Statement>>
+		{
+			if (m_toRemove.count(&_statement))
+				return {vector<Statement>{}};
+			else
+				return nullopt;
+		}
+	);
+	ASTModifier::operator()(_block);
+}
diff --git a/libyul/optimiser/OptimizerUtilities.h b/libyul/optimiser/OptimizerUtilities.h
index d80b16316a..b491e57e1f 100644
--- a/libyul/optimiser/OptimizerUtilities.h
+++ b/libyul/optimiser/OptimizerUtilities.h
@@ -25,6 +25,7 @@
 #include <libyul/ASTForward.h>
 #include <libyul/Dialect.h>
 #include <libyul/YulString.h>
+#include <libyul/optimiser/ASTWalker.h>
 
 #include <optional>
 
@@ -48,4 +49,14 @@ bool isRestrictedIdentifier(Dialect const& _dialect, YulString const& _identifie
 /// Helper function that returns the instruction, if the `_name` is a BuiltinFunction
 std::optional<evmasm::Instruction> toEVMInstruction(Dialect const& _dialect, YulString const& _name);
 
+class StatementRemover: public ASTModifier
+{
+public:
+	explicit StatementRemover(std::set<Statement const*> const& _toRemove): m_toRemove(_toRemove) {}
+
+	void operator()(Block& _block) override;
+private:
+	std::set<Statement const*> const& m_toRemove;
+};
+
 }
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 4012fa9700..0f21940613 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -32,6 +32,7 @@
 #include <libyul/optimiser/DeadCodeEliminator.h>
 #include <libyul/optimiser/FunctionGrouper.h>
 #include <libyul/optimiser/FunctionHoister.h>
+#include <libyul/optimiser/EqualStoreEliminator.h>
 #include <libyul/optimiser/EquivalentFunctionCombiner.h>
 #include <libyul/optimiser/ExpressionSplitter.h>
 #include <libyul/optimiser/ExpressionJoiner.h>
@@ -204,6 +205,7 @@ map<string, unique_ptr<OptimiserStep>> const& OptimiserSuite::allSteps()
 			ConditionalUnsimplifier,
 			ControlFlowSimplifier,
 			DeadCodeEliminator,
+			EqualStoreEliminator,
 			EquivalentFunctionCombiner,
 			ExpressionInliner,
 			ExpressionJoiner,
@@ -244,6 +246,7 @@ map<string, char> const& OptimiserSuite::stepNameToAbbreviationMap()
 		{ConditionalUnsimplifier::name,       'U'},
 		{ControlFlowSimplifier::name,         'n'},
 		{DeadCodeEliminator::name,            'D'},
+		{EqualStoreEliminator::name,          'E'},
 		{EquivalentFunctionCombiner::name,    'v'},
 		{ExpressionInliner::name,             'e'},
 		{ExpressionJoiner::name,              'j'},
diff --git a/libyul/optimiser/UnusedAssignEliminator.cpp b/libyul/optimiser/UnusedAssignEliminator.cpp
index 74dd599a11..273aa6b791 100644
--- a/libyul/optimiser/UnusedAssignEliminator.cpp
+++ b/libyul/optimiser/UnusedAssignEliminator.cpp
@@ -23,6 +23,7 @@
 #include <libyul/optimiser/UnusedAssignEliminator.h>
 
 #include <libyul/optimiser/Semantics.h>
+#include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
diff --git a/libyul/optimiser/UnusedStoreBase.cpp b/libyul/optimiser/UnusedStoreBase.cpp
index 27700bdf74..73f957ecc4 100644
--- a/libyul/optimiser/UnusedStoreBase.cpp
+++ b/libyul/optimiser/UnusedStoreBase.cpp
@@ -23,6 +23,7 @@
 
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
+#include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
@@ -156,18 +157,3 @@ void UnusedStoreBase::merge(TrackedStores& _target, vector<TrackedStores>&& _sou
 		merge(_target, move(ts));
 	_source.clear();
 }
-
-void StatementRemover::operator()(Block& _block)
-{
-	util::iterateReplacing(
-		_block.statements,
-		[&](Statement& _statement) -> std::optional<vector<Statement>>
-		{
-			if (m_toRemove.count(&_statement))
-				return {vector<Statement>{}};
-			else
-				return nullopt;
-		}
-	);
-	ASTModifier::operator()(_block);
-}
diff --git a/libyul/optimiser/UnusedStoreBase.h b/libyul/optimiser/UnusedStoreBase.h
index 3bd4e42976..15dccb04a2 100644
--- a/libyul/optimiser/UnusedStoreBase.h
+++ b/libyul/optimiser/UnusedStoreBase.h
@@ -105,14 +105,4 @@ class UnusedStoreBase: public ASTWalker
 	size_t m_forLoopNestingDepth = 0;
 };
 
-class StatementRemover: public ASTModifier
-{
-public:
-	explicit StatementRemover(std::set<Statement const*> const& _toRemove): m_toRemove(_toRemove) {}
-
-	void operator()(Block& _block) override;
-private:
-	std::set<Statement const*> const& m_toRemove;
-};
-
 }
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index cc315c4b97..bb8458d78b 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -28,6 +28,7 @@
 #include <libyul/optimiser/ConditionalUnsimplifier.h>
 #include <libyul/optimiser/ConditionalSimplifier.h>
 #include <libyul/optimiser/CommonSubexpressionEliminator.h>
+#include <libyul/optimiser/EqualStoreEliminator.h>
 #include <libyul/optimiser/EquivalentFunctionCombiner.h>
 #include <libyul/optimiser/ExpressionSplitter.h>
 #include <libyul/optimiser/FunctionGrouper.h>
@@ -236,6 +237,11 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			ForLoopInitRewriter::run(*m_context, *m_ast);
 			UnusedAssignEliminator::run(*m_context, *m_ast);
 		}},
+		{"equalStoreEliminator", [&]() {
+			disambiguate();
+			ForLoopInitRewriter::run(*m_context, *m_ast);
+			EqualStoreEliminator::run(*m_context, *m_ast);
+		}},
 		{"ssaPlusCleanup", [&]() {
 			disambiguate();
 			ForLoopInitRewriter::run(*m_context, *m_ast);
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_with_keccak.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_with_keccak.yul
new file mode 100644
index 0000000000..395fea6d02
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_with_keccak.yul
@@ -0,0 +1,31 @@
+{
+    let var_k := calldataload(0)
+    let _1 := 0x00
+    let _2 := 0x20
+    mstore(_1, var_k)
+    mstore(_2, _1)
+    sstore(keccak256(_1, 0x40), 0x01)
+    mstore(_1, var_k)
+    mstore(_2, _1)
+    sstore(add(keccak256(_1, 0x40), 0x01), 0x03)
+    mstore(_1, var_k)
+    mstore(_2, _1)
+    sstore(add(keccak256(_1, 0x40), 2), 0x04)
+    mstore(_1, var_k)
+    mstore(_2, _1)
+    sstore(add(keccak256(_1, 0x40), 0x03), 2)
+}
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let var_k := calldataload(0)
+//     let _1 := 0x00
+//     let _2 := 0x20
+//     mstore(_1, var_k)
+//     mstore(_2, _1)
+//     sstore(keccak256(_1, 0x40), 0x01)
+//     sstore(add(keccak256(_1, 0x40), 0x01), 0x03)
+//     sstore(add(keccak256(_1, 0x40), 2), 0x04)
+//     sstore(add(keccak256(_1, 0x40), 0x03), 2)
+// }
diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp
index 19616cde0b..d3e31b5e81 100644
--- a/test/yulPhaser/Chromosome.cpp
+++ b/test/yulPhaser/Chromosome.cpp
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_strin
 
 	BOOST_TEST(chromosome.length() == allSteps.size());
 	BOOST_TEST(chromosome.optimisationSteps() == allSteps);
-	BOOST_TEST(toString(chromosome) == "flcCUnDvejsxIOoighFTLMRmVatrpud");
+	BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMRrmVatpud");
 }
 
 BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names)

From e7fc2a176acd0d13e8e7a1df0ae12f2a2bcec0d5 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 11 Nov 2021 16:39:13 +0100
Subject: [PATCH 0245/1748] Test updates.

---
 .../functionCall/mapping_array_internal_argument.sol          | 2 +-
 test/libsolidity/semanticTests/structs/struct_copy.sol        | 4 ++--
 .../yulOptimizerTests/fullSuite/stack_compressor_msize.yul    | 1 -
 .../fullSuite/unusedFunctionParameterPruner_loop.yul          | 2 --
 .../fullSuite/unusedFunctionParameterPruner_simple.yul        | 2 --
 5 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index f01a590eb3..d3e2ba0756 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -20,7 +20,7 @@ contract test {
 // compileViaYul: also
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
-// gas irOptimized: 111965
+// gas irOptimized: 111896
 // gas legacy: 113806
 // gas legacyOptimized: 111781
 // get(uint8): 1 -> 21, 22, 42, 43
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index 0bbb6489e9..f170dca3fb 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -38,12 +38,12 @@ contract c {
 // compileViaYul: also
 // ----
 // set(uint256): 7 -> true
-// gas irOptimized: 110011
+// gas irOptimized: 110119
 // gas legacy: 110616
 // gas legacyOptimized: 110006
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // copy(uint256,uint256): 7, 8 -> true
-// gas irOptimized: 118707
+// gas irOptimized: 118698
 // gas legacy: 119166
 // gas legacyOptimized: 118622
 // retrieve(uint256): 7 -> 1, 3, 4, 2
diff --git a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
index d670f002fc..13683e8e6a 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
@@ -55,7 +55,6 @@
 //         sstore(0, 0)
 //         sstore(2, _1)
 //         extcodecopy(_1, msize(), _1, _1)
-//         sstore(0, 0)
 //         sstore(3, _1)
 //     }
 //     function gcd(_a, _b) -> out
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
index b531842dbd..ee648f80f9 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
@@ -20,9 +20,7 @@
 //         f()
 //         sstore(0, 1)
 //         f()
-//         sstore(0, 1)
 //         f()
-//         sstore(0, 1)
 //     }
 //     function f()
 //     {
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul
index 531b1a6ce9..68620cc96b 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul
@@ -18,9 +18,7 @@
 //         f()
 //         sstore(0, 1)
 //         f()
-//         sstore(0, 1)
 //         f()
-//         sstore(0, 1)
 //     }
 //     function f()
 //     {

From b354c81a638e0abd2e5b4e29ee05c10d405807bd Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 24 Nov 2021 10:14:59 +0100
Subject: [PATCH 0246/1748] Documentation

---
 docs/internals/optimizer.rst | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 19bca791e8..a7eff7346b 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -290,6 +290,7 @@ on the individual steps and their sequence below.
 - :ref:`conditional-unsimplifier`.
 - :ref:`control-flow-simplifier`.
 - :ref:`dead-code-eliminator`.
+- :ref:`equal-store-eliminator`.
 - :ref:`equivalent-function-combiner`.
 - :ref:`expression-joiner`.
 - :ref:`expression-simplifier`.
@@ -938,6 +939,22 @@ we require ForLoopInitRewriter to run before this step.
 
 Prerequisite: ForLoopInitRewriter, Function Hoister, Function Grouper
 
+.. _equal-store-eliminator:
+
+EqualStoreEliminator
+^^^^^^^^^^^^^^^^^^^^
+
+This steps removes ``mstore(k, v)`` and ``sstore(k, v)`` calls if
+there was a previous call to ``mstore(k, v)`` / ``sstore(k, v)``,
+no other store in between and the values of ``k`` and ``v`` did not change.
+
+This simple step is effective if run after the SSA transform and the
+Common Subexpression Eliminator, because SSA will make sure that the variables
+will not change and the Common Subexpression Eliminator re-uses exactly the same
+variable if the value is known to be the same.
+
+Prerequisites: Disambiguator, ForLoopInitRewriter
+
 .. _unused-pruner:
 
 UnusedPruner

From 259a98b82c84d40714dc8f250092a572947f014f Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Mon, 3 Jan 2022 18:22:42 +0100
Subject: [PATCH 0247/1748] Impose stricter upper bound on memory accesses in
 order to prevent overflow/wrap around.

---
 test/tools/yulInterpreter/EVMInstructionInterpreter.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 1e030d0984..067e00a9e5 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -476,7 +476,9 @@ bool EVMInstructionInterpreter::accessMemory(u256 const& _offset, u256 const& _s
 	{
 		u256 newSize = (_offset + _size + 0x1f) & ~u256(0x1f);
 		m_state.msize = max(m_state.msize, newSize);
-		return _size <= 0xffff;
+		// We only record accesses to contiguous memory chunks that are at most 0xffff bytes
+		// in size and at an offset of at most numeric_limits<size_t>::max() - 0xffff
+		return _size <= 0xffff && _offset <= u256(numeric_limits<size_t>::max() - 0xffff);
 	}
 	else
 		m_state.msize = u256(-1);

From 6fe1ee6a8ae344c0767ecfd08c3ff391140ae463 Mon Sep 17 00:00:00 2001
From: Braden Watling <bradenwatling@gmail.com>
Date: Mon, 3 Jan 2022 17:22:23 -0500
Subject: [PATCH 0248/1748] Fix typo in control-structures.rst

I'm learning Solidity by reading these docs and found this statement confusing. I'm fairly certain that the correct description here is that the *callee* changes get reverted, but the caller is able to react to the failures.

I tested this with the following snippet in Remix, which resulted in a successful transaction when deployed:

```
// SPDX-License-Identifier: UNLICENSED
pragma solidity ^0.8.7;

contract A {
    uint public value;

    function a(uint newValue, bool shouldRevert) external {
        value = newValue;
        if (shouldRevert) {
            revert();
        }
    }
}

contract B {
    function b() external {
        A a = new A();
        try a.a(50, false) {
            assert(a.value() == 50);
        } catch {
            assert(false);
        }
        a = new A();
        try a.a(50, true) {
            assert(false);
        } catch {
            assert(a.value() == 0);
        }
    }
}
```
---
 docs/control-structures.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 7881a22eca..879901e44e 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -699,7 +699,7 @@ safest action is to revert all changes and make the whole transaction
 (or at least call) without effect.
 
 In both cases, the caller can react on such failures using ``try``/``catch``, but
-the changes in the caller will always be reverted.
+the changes in the callee will always be reverted.
 
 .. note::
 

From 85d1a57e65a1490db812a4531fc0b85d42ad8669 Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Mon, 3 Jan 2022 15:19:25 +0530
Subject: [PATCH 0249/1748] Added more tests. Updated chromosome. Remove unused
 headers.

---
 libyul/optimiser/EqualStoreEliminator.cpp     |  7 ---
 libyul/optimiser/UnusedStoreBase.cpp          |  1 -
 .../externalContracts/deposit_contract.sol    |  2 +-
 .../equalStoreEliminator/branching.yul        | 25 +++++++++
 .../equalStoreEliminator/forloop.yul          | 20 +++++++
 .../equalStoreEliminator/functionbody.yul     | 56 +++++++++++++++++++
 .../indirect_inferrence.yul                   | 24 ++++++++
 .../equalStoreEliminator/value_change.yul     | 18 ++++++
 .../equalStoreEliminator/verbatim.yul         | 27 +++++++++
 test/yulPhaser/Chromosome.cpp                 |  2 +-
 10 files changed, 172 insertions(+), 10 deletions(-)
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/branching.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/forloop.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/functionbody.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/indirect_inferrence.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/value_change.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/verbatim.yul

diff --git a/libyul/optimiser/EqualStoreEliminator.cpp b/libyul/optimiser/EqualStoreEliminator.cpp
index c89567868f..dcba98ce4f 100644
--- a/libyul/optimiser/EqualStoreEliminator.cpp
+++ b/libyul/optimiser/EqualStoreEliminator.cpp
@@ -25,16 +25,9 @@
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/optimiser/Semantics.h>
-#include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/SideEffects.h>
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
-#include <libevmasm/GasMeter.h>
-#include <libsolutil/Keccak256.h>
-
-#include <limits>
-
 using namespace std;
 using namespace solidity;
 using namespace solidity::util;
diff --git a/libyul/optimiser/UnusedStoreBase.cpp b/libyul/optimiser/UnusedStoreBase.cpp
index 73f957ecc4..8e34d172f4 100644
--- a/libyul/optimiser/UnusedStoreBase.cpp
+++ b/libyul/optimiser/UnusedStoreBase.cpp
@@ -23,7 +23,6 @@
 
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/AST.h>
 
 #include <libsolutil/CommonData.h>
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index ed9a07f7ff..7f57998051 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -178,7 +178,7 @@ contract DepositContract is IDepositContract, ERC165 {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1558001
+// gas irOptimized: 1557137
 // gas legacy: 2436584
 // gas legacyOptimized: 1776483
 // supportsInterface(bytes4): 0x0 -> 0
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/branching.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/branching.yul
new file mode 100644
index 0000000000..63f0d38e43
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/branching.yul
@@ -0,0 +1,25 @@
+{
+    let a := calldataload(0)
+    let b := 20
+    sstore(a, b)
+    if calldataload(32) {
+        sstore(a, b)
+        pop(staticcall(0, 0, 0, 0, 0, 0))
+        sstore(a, b)
+    }
+    sstore(a, b)
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let a := calldataload(0)
+//     let b := 20
+//     sstore(a, b)
+//     if calldataload(32)
+//     {
+//         pop(staticcall(0, 0, 0, 0, 0, 0))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/forloop.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/forloop.yul
new file mode 100644
index 0000000000..ccd7dd40bf
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/forloop.yul
@@ -0,0 +1,20 @@
+{
+    let x := calldataload(0)
+    let y := calldataload(1)
+
+    sstore(x, y)
+    for {let a := 1} lt(a, 10) {a := add(a, 1) } {
+        sstore(x, y)
+    }
+}
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let x := calldataload(0)
+//     let y := calldataload(1)
+//     sstore(x, y)
+//     let a := 1
+//     for { } lt(a, 10) { a := add(a, 1) }
+//     { sstore(x, y) }
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/functionbody.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/functionbody.yul
new file mode 100644
index 0000000000..68839721cd
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/functionbody.yul
@@ -0,0 +1,56 @@
+{
+    f(calldataload(0), calldataload(32))
+    h(calldataload(64), calldataload(96))
+
+    function f(a, b) {
+        // gets removed
+        sstore(a, b)
+        g()
+        sstore(a, b)
+    }
+
+    function g() {
+        pop(staticcall(0, 0, 0, 0, 0, 0))
+    }
+
+    function h(a_, b_) {
+        // cannot be removed
+        sstore(a_, b_)
+        i()
+        sstore(a_, b_)
+    }
+
+    function i() {
+        pop(delegatecall(0, 0, 0, 0, 0, 0))
+    }
+
+
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     f(calldataload(0), calldataload(32))
+//     h(calldataload(64), calldataload(96))
+//     function f(a, b)
+//     {
+//         sstore(a, b)
+//         g()
+//     }
+//     function g()
+//     {
+//         pop(staticcall(0, 0, 0, 0, 0, 0))
+//     }
+//     function h(a_, b_)
+//     {
+//         sstore(a_, b_)
+//         i()
+//         sstore(a_, b_)
+//     }
+//     function i()
+//     {
+//         pop(delegatecall(0, 0, 0, 0, 0, 0))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/indirect_inferrence.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/indirect_inferrence.yul
new file mode 100644
index 0000000000..2b68e63100
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/indirect_inferrence.yul
@@ -0,0 +1,24 @@
+{
+    let x := calldataload(0)
+    let y := sload(x)
+    // both of these can be removed
+    sstore(x, y)
+    sstore(x, y)
+
+    let a := x
+    let b := mload(a)
+    // both of these can be removed
+    mstore(a, b)
+    mstore(a, b)
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let x := calldataload(0)
+//     let y := sload(x)
+//     let a := x
+//     let b := mload(a)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/value_change.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/value_change.yul
new file mode 100644
index 0000000000..bd1e08bcd7
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/value_change.yul
@@ -0,0 +1,18 @@
+{
+    let x := calldataload(0)
+    let y := calldataload(32)
+    sstore(x, y)
+    y := calldataload(64)
+    // cannot be removed
+    sstore(x, y)
+}
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let x := calldataload(0)
+//     let y := calldataload(32)
+//     sstore(x, y)
+//     y := calldataload(64)
+//     sstore(x, y)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/verbatim.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/verbatim.yul
new file mode 100644
index 0000000000..fcaddd1213
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/verbatim.yul
@@ -0,0 +1,27 @@
+{
+    let a := calldataload(0)
+    let b := 20
+    sstore(a, b)
+    if calldataload(32) {
+        sstore(a, b)
+        pop(staticcall(0, 0, 0, 0, 0, 0))
+        verbatim_0i_0o("xyz")
+    }
+    sstore(a, b)
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let a := calldataload(0)
+//     let b := 20
+//     sstore(a, b)
+//     if calldataload(32)
+//     {
+//         pop(staticcall(0, 0, 0, 0, 0, 0))
+//         verbatim_0i_0o("xyz")
+//     }
+//     sstore(a, b)
+// }
diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp
index d3e31b5e81..1b1e8bed5b 100644
--- a/test/yulPhaser/Chromosome.cpp
+++ b/test/yulPhaser/Chromosome.cpp
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_strin
 
 	BOOST_TEST(chromosome.length() == allSteps.size());
 	BOOST_TEST(chromosome.optimisationSteps() == allSteps);
-	BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMRrmVatpud");
+	BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMRmVatrpud");
 }
 
 BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names)

From bb16c1943c6b2a09855c5734f8f5c30cb6c7c9d9 Mon Sep 17 00:00:00 2001
From: Braden Watling <bradenwatling@gmail.com>
Date: Mon, 3 Jan 2022 17:46:12 -0500
Subject: [PATCH 0250/1748] Fix gas retaining statement.

According to https://docs.soliditylang.org/en/v0.8.11/introduction-to-smart-contracts.html?highlight=63%2F64#message-calls, the caller forwards 63/64th of its gas, but here we seem to contradict that by saying the caller retains 63/64th of its gas.
---
 docs/control-structures.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 879901e44e..0ce7d21e33 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -895,6 +895,6 @@ in scope in the block that follows.
     The error might have happened deeper down in the call chain and the
     called contract just forwarded it. Also, it could be due to an
     out-of-gas situation and not a deliberate error condition:
-    The caller always retains 63/64th of the gas in a call and thus
+    The caller always retains at least 1/64th of the gas in a call and thus
     even if the called contract goes out of gas, the caller still
     has some gas left.

From b8ad2b2718f6aa7ca2e418a1a0e2cc36c029db03 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Mon, 20 Sep 2021 22:05:03 +0200
Subject: [PATCH 0251/1748] Yul interpreter: Add flag to disable memory tracing
 and dump for fuzzing. Model revert in yul interpreter. Add logTrace for a few
 more instructions and clear trace on revert.

---
 test/libyul/EwasmTranslationTest.cpp          |  9 +++-
 test/libyul/YulInterpreterTest.cpp            |  9 +++-
 test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp | 10 +++-
 test/tools/ossfuzz/yulFuzzerCommon.cpp        |  5 +-
 test/tools/ossfuzz/yulFuzzerCommon.h          |  7 +++
 test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp  | 17 ++++--
 .../EVMInstructionInterpreter.cpp             | 54 ++++++++++++++-----
 .../EVMInstructionInterpreter.h               | 28 ++++++++--
 test/tools/yulInterpreter/Interpreter.cpp     | 36 ++++++++-----
 test/tools/yulInterpreter/Interpreter.h       | 29 ++++++++--
 test/tools/yulrun.cpp                         |  4 +-
 11 files changed, 158 insertions(+), 50 deletions(-)

diff --git a/test/libyul/EwasmTranslationTest.cpp b/test/libyul/EwasmTranslationTest.cpp
index 9bd80f4b18..17b7f18685 100644
--- a/test/libyul/EwasmTranslationTest.cpp
+++ b/test/libyul/EwasmTranslationTest.cpp
@@ -108,13 +108,18 @@ string EwasmTranslationTest::interpret()
 	state.maxExprNesting = 64;
 	try
 	{
-		Interpreter::run(state, WasmDialect{}, *m_object->code);
+		Interpreter::run(
+			state,
+			WasmDialect{},
+			*m_object->code,
+			/*disableMemoryTracing=*/false
+		);
 	}
 	catch (InterpreterTerminatedGeneric const&)
 	{
 	}
 
 	stringstream result;
-	state.dumpTraceAndState(result);
+	state.dumpTraceAndState(result, false);
 	return result.str();
 }
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index ba47b4c080..3e7de4d170 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -94,13 +94,18 @@ string YulInterpreterTest::interpret()
 	state.maxExprNesting = 64;
 	try
 	{
-		Interpreter::run(state, EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}), *m_ast);
+		Interpreter::run(
+			state,
+			EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}),
+			*m_ast,
+			/*disableMemoryTracing=*/false
+		);
 	}
 	catch (InterpreterTerminatedGeneric const&)
 	{
 	}
 
 	stringstream result;
-	state.dumpTraceAndState(result);
+	state.dumpTraceAndState(result, false);
 	return result.str();
 }
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
index a3a789bc9a..c6d52a62eb 100644
--- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
@@ -81,10 +81,15 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 
 	ostringstream os1;
 	ostringstream os2;
+	// Disable memory tracing to avoid false positive reports
+	// such as unused write to memory e.g.,
+	// { mstore(0, 1) }
+	// that would be removed by the redundant store eliminator.
 	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
 		os1,
 		stack.parserResult()->code,
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion())
+		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
+		/*disableMemoryTracing=*/true
 	);
 	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
 		return 0;
@@ -93,7 +98,8 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	termReason = yulFuzzerUtil::interpret(
 		os2,
 		stack.parserResult()->code,
-		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion())
+		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
+		/*disableMemoryTracing=*/true
 	);
 
 	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
diff --git a/test/tools/ossfuzz/yulFuzzerCommon.cpp b/test/tools/ossfuzz/yulFuzzerCommon.cpp
index 890aad3b82..cfbbbaa484 100644
--- a/test/tools/ossfuzz/yulFuzzerCommon.cpp
+++ b/test/tools/ossfuzz/yulFuzzerCommon.cpp
@@ -26,6 +26,7 @@ yulFuzzerUtil::TerminationReason yulFuzzerUtil::interpret(
 	ostream& _os,
 	shared_ptr<yul::Block> _ast,
 	Dialect const& _dialect,
+	bool _disableMemoryTracing,
 	bool _outputStorageOnly,
 	size_t _maxSteps,
 	size_t _maxTraceSize,
@@ -52,7 +53,7 @@ yulFuzzerUtil::TerminationReason yulFuzzerUtil::interpret(
 	TerminationReason reason = TerminationReason::None;
 	try
 	{
-		Interpreter::run(state, _dialect, *_ast);
+		Interpreter::run(state, _dialect, *_ast, _disableMemoryTracing);
 	}
 	catch (StepLimitReached const&)
 	{
@@ -74,7 +75,7 @@ yulFuzzerUtil::TerminationReason yulFuzzerUtil::interpret(
 	if (_outputStorageOnly)
 		state.dumpStorage(_os);
 	else
-		state.dumpTraceAndState(_os);
+		state.dumpTraceAndState(_os, _disableMemoryTracing);
 	return reason;
 }
 
diff --git a/test/tools/ossfuzz/yulFuzzerCommon.h b/test/tools/ossfuzz/yulFuzzerCommon.h
index 71411a7087..4c8f665f61 100644
--- a/test/tools/ossfuzz/yulFuzzerCommon.h
+++ b/test/tools/ossfuzz/yulFuzzerCommon.h
@@ -32,10 +32,17 @@ struct yulFuzzerUtil
 		None
 	};
 
+	/// Interprets the Yul AST pointed to by @param _ast. Flag @param _outputStorageOnly
+	/// (unset by default) outputs an execution trace of both memory and storage;
+	/// if set, only storage contents are output as part of the execution trace. The
+	/// latter avoids false positives that will be produced by the fuzzer when certain
+	/// optimizer steps are activated e.g., Redundant store eliminator, Equal store
+	/// eliminator.
 	static TerminationReason interpret(
 		std::ostream& _os,
 		std::shared_ptr<yul::Block> _ast,
 		Dialect const& _dialect,
+		bool _disableMemoryTracing = false,
 		bool _outputStorageOnly = false,
 		size_t _maxSteps = maxSteps,
 		size_t _maxTraceSize = maxTraceSize,
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index 22f67e1cf9..4cafccb284 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -88,10 +88,15 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 
 	ostringstream os1;
 	ostringstream os2;
+	// Disable memory tracing to avoid false positive reports
+	// such as unused write to memory e.g.,
+	// { mstore(0, 1) }
+	// that would be removed by the redundant store eliminator.
 	yulFuzzerUtil::TerminationReason termReason = yulFuzzerUtil::interpret(
 		os1,
 		stack.parserResult()->code,
-		EVMDialect::strictAssemblyForEVMObjects(version)
+		EVMDialect::strictAssemblyForEVMObjects(version),
+		/*disableMemoryTracing=*/true
 	);
 
 	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
@@ -107,12 +112,18 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	termReason = yulFuzzerUtil::interpret(
 		os2,
 		astBlock,
-		EVMDialect::strictAssemblyForEVMObjects(version)
+		EVMDialect::strictAssemblyForEVMObjects(version),
+		true
 	);
 	if (yulFuzzerUtil::resourceLimitsExceeded(termReason))
 		return;
 
 	bool isTraceEq = (os1.str() == os2.str());
-	yulAssert(isTraceEq, "Interpreted traces for optimized and unoptimized code differ.");
+	if (!isTraceEq)
+	{
+		cout << os1.str() << endl;
+		cout << os2.str() << endl;
+		yulAssert(false, "Interpreted traces for optimized and unoptimized code differ.");
+	}
 	return;
 }
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 067e00a9e5..810cf9d181 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -27,6 +27,7 @@
 #include <libyul/AST.h>
 
 #include <libevmasm/Instruction.h>
+#include <libevmasm/SemanticInformation.h>
 
 #include <libsolutil/Keccak256.h>
 #include <libsolutil/Numeric.h>
@@ -35,6 +36,7 @@
 
 using namespace std;
 using namespace solidity;
+using namespace solidity::evmasm;
 using namespace solidity::yul;
 using namespace solidity::yul::test;
 
@@ -99,6 +101,7 @@ u256 EVMInstructionInterpreter::eval(
 	switch (_instruction)
 	{
 	case Instruction::STOP:
+		logTrace(_instruction);
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
 	// --------------- arithmetic ---------------
 	case Instruction::ADD:
@@ -204,6 +207,7 @@ u256 EVMInstructionInterpreter::eval(
 	case Instruction::CALLDATASIZE:
 		return m_state.calldata.size();
 	case Instruction::CALLDATACOPY:
+		logTrace(_instruction, arg);
 		if (accessMemory(arg[0], arg[2]))
 			copyZeroExtended(
 				m_state.memory, m_state.calldata,
@@ -213,6 +217,7 @@ u256 EVMInstructionInterpreter::eval(
 	case Instruction::CODESIZE:
 		return m_state.code.size();
 	case Instruction::CODECOPY:
+		logTrace(_instruction, arg);
 		if (accessMemory(arg[0], arg[2]))
 			copyZeroExtended(
 				m_state.memory, m_state.code,
@@ -339,12 +344,18 @@ u256 EVMInstructionInterpreter::eval(
 	case Instruction::REVERT:
 		accessMemory(arg[0], arg[1]);
 		logTrace(_instruction, arg);
+		m_state.storage.clear();
+		m_state.trace.clear();
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
 	case Instruction::INVALID:
 		logTrace(_instruction);
+		m_state.storage.clear();
+		m_state.trace.clear();
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
 	case Instruction::SELFDESTRUCT:
 		logTrace(_instruction, arg);
+		m_state.storage.clear();
+		m_state.trace.clear();
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
 	case Instruction::POP:
 		break;
@@ -507,23 +518,40 @@ void EVMInstructionInterpreter::writeMemoryWord(u256 const& _offset, u256 const&
 }
 
 
-void EVMInstructionInterpreter::logTrace(evmasm::Instruction _instruction, std::vector<u256> const& _arguments, bytes const& _data)
+void EVMInstructionInterpreter::logTrace(
+	evmasm::Instruction _instruction,
+	std::vector<u256> const& _arguments,
+	bytes const& _data
+)
 {
-	logTrace(evmasm::instructionInfo(_instruction).name, _arguments, _data);
+	logTrace(
+		evmasm::instructionInfo(_instruction).name,
+		SemanticInformation::memory(_instruction) == SemanticInformation::Effect::Write,
+		_arguments,
+		_data
+	);
 }
 
-void EVMInstructionInterpreter::logTrace(std::string const& _pseudoInstruction, std::vector<u256> const& _arguments, bytes const& _data)
+void EVMInstructionInterpreter::logTrace(
+	std::string const& _pseudoInstruction,
+	bool _writesToMemory,
+	std::vector<u256> const& _arguments,
+	bytes const& _data
+)
 {
-	string message = _pseudoInstruction + "(";
-	for (size_t i = 0; i < _arguments.size(); ++i)
-		message += (i > 0 ? ", " : "") + formatNumber(_arguments[i]);
-	message += ")";
-	if (!_data.empty())
-		message += " [" + util::toHex(_data) + "]";
-	m_state.trace.emplace_back(std::move(message));
-	if (m_state.maxTraceSize > 0 && m_state.trace.size() >= m_state.maxTraceSize)
+	if (!(_writesToMemory && memWriteTracingDisabled()))
 	{
-		m_state.trace.emplace_back("Trace size limit reached.");
-		BOOST_THROW_EXCEPTION(TraceLimitReached());
+		string message = _pseudoInstruction + "(";
+		for (size_t i = 0; i < _arguments.size(); ++i)
+			message += (i > 0 ? ", " : "") + formatNumber(_arguments[i]);
+		message += ")";
+		if (!_data.empty())
+			message += " [" + util::toHex(_data) + "]";
+		m_state.trace.emplace_back(std::move(message));
+		if (m_state.maxTraceSize > 0 && m_state.trace.size() >= m_state.maxTraceSize)
+		{
+			m_state.trace.emplace_back("Trace size limit reached.");
+			BOOST_THROW_EXCEPTION(TraceLimitReached());
+		}
 	}
 }
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
index 2da5b45e52..c05af8c1ae 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -66,8 +66,9 @@ struct InterpreterState;
 class EVMInstructionInterpreter
 {
 public:
-	explicit EVMInstructionInterpreter(InterpreterState& _state):
-		m_state(_state)
+	explicit EVMInstructionInterpreter(InterpreterState& _state, bool _disableMemWriteTrace):
+		m_state(_state),
+		m_disableMemoryWriteInstructions(_disableMemWriteTrace)
 	{}
 	/// Evaluate instruction
 	u256 eval(evmasm::Instruction _instruction, std::vector<u256> const& _arguments);
@@ -93,12 +94,29 @@ class EVMInstructionInterpreter
 	/// Does not adjust msize, use @a accessMemory for that
 	void writeMemoryWord(u256 const& _offset, u256 const& _value);
 
-	void logTrace(evmasm::Instruction _instruction, std::vector<u256> const& _arguments = {}, bytes const& _data = {});
+	void logTrace(
+		evmasm::Instruction _instruction,
+		std::vector<u256> const& _arguments = {},
+		bytes const& _data = {}
+	);
 	/// Appends a log to the trace representing an instruction or similar operation by string,
-	/// with arguments and auxiliary data (if nonempty).
-	void logTrace(std::string const& _pseudoInstruction, std::vector<u256> const& _arguments = {}, bytes const& _data = {});
+	/// with arguments and auxiliary data (if nonempty). Flag @param _writesToMemory indicates
+	/// whether the instruction writes to (true) or does not write to (false) memory.
+	void logTrace(
+		std::string const& _pseudoInstruction,
+		bool _writesToMemory,
+		std::vector<u256> const& _arguments = {},
+		bytes const& _data = {}
+	);
+	/// @returns disable trace flag.
+	bool memWriteTracingDisabled()
+	{
+		return m_disableMemoryWriteInstructions;
+	}
 
 	InterpreterState& m_state;
+	/// Flag to disable trace of instructions that write to memory.
+	bool m_disableMemoryWriteInstructions;
 };
 
 } // solidity::yul::test
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index 08c6aafd67..bf0ad820b8 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -55,26 +55,34 @@ void InterpreterState::dumpStorage(ostream& _out) const
 			_out << "  " << slot.first.hex() << ": " << slot.second.hex() << endl;
 }
 
-void InterpreterState::dumpTraceAndState(ostream& _out) const
+void InterpreterState::dumpTraceAndState(ostream& _out, bool _disableMemoryTrace) const
 {
 	_out << "Trace:" << endl;
 	for (auto const& line: trace)
 		_out << "  " << line << endl;
-	_out << "Memory dump:\n";
-	map<u256, u256> words;
-	for (auto const& [offset, value]: memory)
-		words[(offset / 0x20) * 0x20] |= u256(uint32_t(value)) << (256 - 8 - 8 * static_cast<size_t>(offset % 0x20));
-	for (auto const& [offset, value]: words)
-		if (value != 0)
-			_out << "  " << std::uppercase << std::hex << std::setw(4) << offset << ": " << h256(value).hex() << endl;
+	if (!_disableMemoryTrace)
+	{
+		_out << "Memory dump:\n";
+		map<u256, u256> words;
+		for (auto const& [offset, value]: memory)
+			words[(offset / 0x20) * 0x20] |= u256(uint32_t(value)) << (256 - 8 - 8 * static_cast<size_t>(offset % 0x20));
+		for (auto const& [offset, value]: words)
+			if (value != 0)
+				_out << "  " << std::uppercase << std::hex << std::setw(4) << offset << ": " << h256(value).hex() << endl;
+	}
 	_out << "Storage dump:" << endl;
 	dumpStorage(_out);
 }
 
-void Interpreter::run(InterpreterState& _state, Dialect const& _dialect, Block const& _ast)
+void Interpreter::run(
+	InterpreterState& _state,
+	Dialect const& _dialect,
+	Block const& _ast,
+	bool _disableMemoryTrace
+)
 {
 	Scope scope;
-	Interpreter{_state, _dialect, scope}(_ast);
+	Interpreter{_state, _dialect, scope, _disableMemoryTrace}(_ast);
 }
 
 void Interpreter::operator()(ExpressionStatement const& _expressionStatement)
@@ -209,14 +217,14 @@ void Interpreter::operator()(Block const& _block)
 
 u256 Interpreter::evaluate(Expression const& _expression)
 {
-	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables);
+	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables, m_disableMemoryTrace);
 	ev.visit(_expression);
 	return ev.value();
 }
 
 vector<u256> Interpreter::evaluateMulti(Expression const& _expression)
 {
-	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables);
+	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables, m_disableMemoryTrace);
 	ev.visit(_expression);
 	return ev.values();
 }
@@ -279,7 +287,7 @@ void ExpressionEvaluator::operator()(FunctionCall const& _funCall)
 	{
 		if (BuiltinFunctionForEVM const* fun = dialect->builtin(_funCall.functionName.name))
 		{
-			EVMInstructionInterpreter interpreter(m_state);
+			EVMInstructionInterpreter interpreter(m_state, m_disableMemoryTrace);
 			setValue(interpreter.evalBuiltin(*fun, _funCall.arguments, values()));
 			return;
 		}
@@ -308,7 +316,7 @@ void ExpressionEvaluator::operator()(FunctionCall const& _funCall)
 		variables[fun->returnVariables.at(i).name] = 0;
 
 	m_state.controlFlowState = ControlFlowState::Default;
-	Interpreter interpreter(m_state, m_dialect, *scope, std::move(variables));
+	Interpreter interpreter(m_state, m_dialect, *scope, m_disableMemoryTrace, std::move(variables));
 	interpreter(fun->body);
 	m_state.controlFlowState = ControlFlowState::Default;
 
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index 621305422c..cdc454401e 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -102,7 +102,10 @@ struct InterpreterState
 	ControlFlowState controlFlowState = ControlFlowState::Default;
 
 	/// Prints execution trace and non-zero storage to @param _out.
-	void dumpTraceAndState(std::ostream& _out) const;
+	/// Flag @param _disableMemoryTrace, if set, does not produce a memory dump. This
+	/// avoids false positives reports by the fuzzer when certain optimizer steps are
+	/// activated e.g., Redundant store eliminator, Equal store eliminator.
+	void dumpTraceAndState(std::ostream& _out, bool _disableMemoryTrace) const;
 	/// Prints non-zero storage to @param _out.
 	void dumpStorage(std::ostream& _out) const;
 };
@@ -124,18 +127,29 @@ struct Scope
 class Interpreter: public ASTWalker
 {
 public:
-	static void run(InterpreterState& _state, Dialect const& _dialect, Block const& _ast);
+	/// Executes the Yul interpreter. Flag @param _disableMemoryTracing if set ensures that
+	/// instructions that write to memory do not affect @param _state. This
+	/// avoids false positives reports by the fuzzer when certain optimizer steps are
+	/// activated e.g., Redundant store eliminator, Equal store eliminator.
+	static void run(
+		InterpreterState& _state,
+		Dialect const& _dialect,
+		Block const& _ast,
+		bool _disableMemoryTracing
+	);
 
 	Interpreter(
 		InterpreterState& _state,
 		Dialect const& _dialect,
 		Scope& _scope,
+		bool _disableMemoryTracing,
 		std::map<YulString, u256> _variables = {}
 	):
 		m_dialect(_dialect),
 		m_state(_state),
 		m_variables(std::move(_variables)),
-		m_scope(&_scope)
+		m_scope(&_scope),
+		m_disableMemoryTrace(_disableMemoryTracing)
 	{
 	}
 
@@ -173,6 +187,7 @@ class Interpreter: public ASTWalker
 	/// Values of variables.
 	std::map<YulString, u256> m_variables;
 	Scope* m_scope;
+	bool m_disableMemoryTrace;
 };
 
 /**
@@ -185,12 +200,14 @@ class ExpressionEvaluator: public ASTWalker
 		InterpreterState& _state,
 		Dialect const& _dialect,
 		Scope& _scope,
-		std::map<YulString, u256> const& _variables
+		std::map<YulString, u256> const& _variables,
+		bool _disableMemoryTrace
 	):
 		m_state(_state),
 		m_dialect(_dialect),
 		m_variables(_variables),
-		m_scope(_scope)
+		m_scope(_scope),
+		m_disableMemoryTrace(_disableMemoryTrace)
 	{}
 
 	void operator()(Literal const&) override;
@@ -226,6 +243,8 @@ class ExpressionEvaluator: public ASTWalker
 	std::vector<u256> m_values;
 	/// Current expression nesting level
 	unsigned m_nestingLevel = 0;
+	/// Flag to disable memory tracing
+	bool m_disableMemoryTrace;
 };
 
 }
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index cb90a3f431..5702997683 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -87,13 +87,13 @@ void interpret(string const& _source)
 	try
 	{
 		Dialect const& dialect(EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}));
-		Interpreter::run(state, dialect, *ast);
+		Interpreter::run(state, dialect, *ast, /*disableMemoryTracing=*/false);
 	}
 	catch (InterpreterTerminatedGeneric const&)
 	{
 	}
 
-	state.dumpTraceAndState(cout);
+	state.dumpTraceAndState(cout, /*disableMemoryTracing=*/false);
 }
 
 }

From 671064b60981f49171b26080ca3926651d965ac4 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 4 Jan 2022 18:27:31 +0100
Subject: [PATCH 0252/1748] Use fixed seed for flaky phaser test for now.

---
 test/yulPhaser/Mutations.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/yulPhaser/Mutations.cpp b/test/yulPhaser/Mutations.cpp
index c42ff4e35c..8e1d0238b3 100644
--- a/test/yulPhaser/Mutations.cpp
+++ b/test/yulPhaser/Mutations.cpp
@@ -644,6 +644,8 @@ BOOST_AUTO_TEST_CASE(uniformCrossover_should_swap_tail_with_uniform_probability)
 	Chromosome chromosome1("aaaaa");
 	Chromosome chromosome2("cccccccccc");
 
+	SimulationRNG::reset(1);
+
 	vector<size_t> bernoulliTrials;
 	for (size_t i = 0; i < operationCount; ++i)
 	{

From c798ac472e28e5dbd27143706d78a70d1ea7e972 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Tue, 4 Jan 2022 18:59:40 -0500
Subject: [PATCH 0253/1748] Typo: SemVer

---
 Changelog.md                 | 2 +-
 docs/installing-solidity.rst | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b88e1a9714..da977bc280 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2156,7 +2156,7 @@ Features:
  * Internal: Inline assembly usable by the code generator.
  * Commandline interface: Using ``-`` as filename allows reading from stdin.
  * Interface JSON: Fallback function is now part of the ABI.
- * Interface: Version string now *semver* compatible.
+ * Interface: Version string now *SemVer* compatible.
  * Code generator: Do not provide "new account gas" if we know the called account exists.
 
 Bugfixes:
diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index dbfa7a4c58..d3f9015a2b 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -537,8 +537,8 @@ The Solidity version string contains four parts:
 
 If there are local modifications, the commit will be postfixed with ``.mod``.
 
-These parts are combined as required by Semver, where the Solidity pre-release tag equals to the Semver pre-release
-and the Solidity commit and platform combined make up the Semver build metadata.
+These parts are combined as required by SemVer, where the Solidity pre-release tag equals to the SemVer pre-release
+and the Solidity commit and platform combined make up the SemVer build metadata.
 
 A release example: ``0.4.8+commit.60cc1668.Emscripten.clang``.
 
@@ -549,7 +549,7 @@ Important Information About Versioning
 
 After a release is made, the patch version level is bumped, because we assume that only
 patch level changes follow. When changes are merged, the version should be bumped according
-to semver and the severity of the change. Finally, a release is always made with the version
+to SemVer and the severity of the change. Finally, a release is always made with the version
 of the current nightly build, but without the ``prerelease`` specifier.
 
 Example:

From 4105b0a587bb7deeda1f189888e37014f053553c Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 3 Jan 2022 16:19:04 +0100
Subject: [PATCH 0254/1748] LSP: Introduce HandlerError(id, code, message)
 exception for easier handling.

---
 libsolidity/lsp/LanguageServer.cpp | 101 +++++++++++++++--------------
 libsolidity/lsp/LanguageServer.h   |  10 +--
 libsolidity/lsp/Transport.h        |  19 ++++++
 3 files changed, 76 insertions(+), 54 deletions(-)

diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 254706cc60..f9f0233496 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -38,6 +38,7 @@
 #include <string>
 
 using namespace std;
+using namespace std::string_literals;
 using namespace std::placeholders;
 
 using namespace solidity::lsp;
@@ -96,10 +97,10 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"initialize", bind(&LanguageServer::handleInitialize, this, _1, _2)},
 		{"initialized", [](auto, auto) {}},
 		{"shutdown", [this](auto, auto) { m_state = State::ShutdownRequested; }},
-		{"textDocument/didOpen", bind(&LanguageServer::handleTextDocumentDidOpen, this, _1, _2)},
-		{"textDocument/didChange", bind(&LanguageServer::handleTextDocumentDidChange, this, _1, _2)},
-		{"textDocument/didClose", bind(&LanguageServer::handleTextDocumentDidClose, this, _1, _2)},
-		{"workspace/didChangeConfiguration", bind(&LanguageServer::handleWorkspaceDidChangeConfiguration, this, _1, _2)},
+		{"textDocument/didOpen", bind(&LanguageServer::handleTextDocumentDidOpen, this, _2)},
+		{"textDocument/didChange", bind(&LanguageServer::handleTextDocumentDidChange, this, _2)},
+		{"textDocument/didClose", bind(&LanguageServer::handleTextDocumentDidClose, this, _2)},
+		{"workspace/didChangeConfiguration", bind(&LanguageServer::handleWorkspaceDidChangeConfiguration, this, _2)},
 	},
 	m_fileRepository("/" /* basePath */),
 	m_compilerStack{m_fileRepository.reader()}
@@ -260,6 +261,10 @@ bool LanguageServer::run()
 			else
 				m_client.error({}, ErrorCode::ParseError, "\"method\" has to be a string.");
 		}
+		catch (RequestError const& error)
+		{
+			m_client.error(id, error.code(), error.comment() ? *error.comment() : ""s);
+		}
 		catch (...)
 		{
 			m_client.error(id, ErrorCode::InternalError, "Unhandled exception: "s + boost::current_exception_diagnostic_information());
@@ -268,24 +273,23 @@ bool LanguageServer::run()
 	return m_state == State::ExitRequested;
 }
 
-bool LanguageServer::checkServerInitialized(MessageID _id)
+void LanguageServer::requireServerInitialized()
 {
 	if (m_state != State::Initialized)
-	{
-		m_client.error(_id, ErrorCode::ServerNotInitialized, "Server is not properly initialized.");
-		return false;
-	}
-	else
-		return true;
+		BOOST_THROW_EXCEPTION(
+			RequestError(ErrorCode::ServerNotInitialized) <<
+			errinfo_comment("Server is not properly initialized.")
+		);
 }
 
 void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 {
 	if (m_state != State::Started)
-	{
-		m_client.error(_id, ErrorCode::RequestFailed, "Initialize called at the wrong time.");
-		return;
-	}
+		BOOST_THROW_EXCEPTION(
+			RequestError(ErrorCode::RequestFailed) <<
+			errinfo_comment("Initialize called at the wrong time.")
+		);
+
 	m_state = State::Initialized;
 
 	// The default of FileReader is to use `.`, but the path from where the LSP was started
@@ -295,10 +299,11 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	{
 		rootPath = uri.asString();
 		if (!boost::starts_with(rootPath, "file://"))
-		{
-			m_client.error(_id, ErrorCode::InvalidParams, "rootUri only supports file URI scheme.");
-			return;
-		}
+			BOOST_THROW_EXCEPTION(
+				RequestError(ErrorCode::InvalidParams) <<
+				errinfo_comment("rootUri only supports file URI scheme.")
+			);
+
 		rootPath = rootPath.substr(7);
 	}
 	else if (Json::Value rootPath = _args["rootPath"])
@@ -317,23 +322,23 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	m_client.reply(_id, move(replyArgs));
 }
 
-
-void LanguageServer::handleWorkspaceDidChangeConfiguration(MessageID _id, Json::Value const& _args)
+void LanguageServer::handleWorkspaceDidChangeConfiguration(Json::Value const& _args)
 {
-	if (!checkServerInitialized(_id))
-		return;
+	requireServerInitialized();
 
 	if (_args["settings"].isObject())
 		changeConfiguration(_args["settings"]);
 }
 
-void LanguageServer::handleTextDocumentDidOpen(MessageID _id, Json::Value const& _args)
+void LanguageServer::handleTextDocumentDidOpen(Json::Value const& _args)
 {
-	if (!checkServerInitialized(_id))
-		return;
+	requireServerInitialized();
 
 	if (!_args["textDocument"])
-		m_client.error(_id, ErrorCode::RequestFailed, "Text document parameter missing.");
+		BOOST_THROW_EXCEPTION(
+			RequestError(ErrorCode::RequestFailed) <<
+			errinfo_comment("Text document parameter missing.")
+		);
 
 	string text = _args["textDocument"]["text"].asString();
 	string uri = _args["textDocument"]["uri"].asString();
@@ -342,41 +347,37 @@ void LanguageServer::handleTextDocumentDidOpen(MessageID _id, Json::Value const&
 	compileAndUpdateDiagnostics();
 }
 
-void LanguageServer::handleTextDocumentDidChange(MessageID _id, Json::Value const& _args)
+void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 {
-	if (!checkServerInitialized(_id))
-		return;
+	requireServerInitialized();
 
 	string const uri = _args["textDocument"]["uri"].asString();
 
 	for (Json::Value jsonContentChange: _args["contentChanges"])
 	{
 		if (!jsonContentChange.isObject())
-		{
-			m_client.error(_id, ErrorCode::RequestFailed, "Invalid content reference.");
-			return;
-		}
+			BOOST_THROW_EXCEPTION(
+				RequestError(ErrorCode::RequestFailed) <<
+				errinfo_comment("Invalid content reference.")
+			);
 
 		string const sourceUnitName = m_fileRepository.clientPathToSourceUnitName(uri);
 		if (!m_fileRepository.sourceUnits().count(sourceUnitName))
-		{
-			m_client.error(_id, ErrorCode::RequestFailed, "Unknown file: " + uri);
-			return;
-		}
+			BOOST_THROW_EXCEPTION(
+				RequestError(ErrorCode::RequestFailed) <<
+				errinfo_comment("Unknown file: " + uri)
+			);
 
 		string text = jsonContentChange["text"].asString();
 		if (jsonContentChange["range"].isObject()) // otherwise full content update
 		{
 			optional<SourceLocation> change = parseRange(sourceUnitName, jsonContentChange["range"]);
 			if (!change || !change->hasText())
-			{
-				m_client.error(
-					_id,
-					ErrorCode::RequestFailed,
-					"Invalid source range: " + jsonCompactPrint(jsonContentChange["range"])
+				BOOST_THROW_EXCEPTION(
+					RequestError(ErrorCode::RequestFailed) <<
+					errinfo_comment("Invalid source range: " + jsonCompactPrint(jsonContentChange["range"]))
 				);
-				return;
-			}
+
 			string buffer = m_fileRepository.sourceUnits().at(sourceUnitName);
 			buffer.replace(static_cast<size_t>(change->start), static_cast<size_t>(change->end - change->start), move(text));
 			text = move(buffer);
@@ -387,13 +388,15 @@ void LanguageServer::handleTextDocumentDidChange(MessageID _id, Json::Value cons
 	compileAndUpdateDiagnostics();
 }
 
-void LanguageServer::handleTextDocumentDidClose(MessageID _id, Json::Value const& _args)
+void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
 {
-	if (!checkServerInitialized(_id))
-		return;
+	requireServerInitialized();
 
 	if (!_args["textDocument"])
-		m_client.error(_id, ErrorCode::RequestFailed, "Text document parameter missing.");
+		BOOST_THROW_EXCEPTION(
+			RequestError(ErrorCode::RequestFailed) <<
+			errinfo_comment("Text document parameter missing.")
+		);
 
 	string uri = _args["textDocument"]["uri"].asString();
 	m_openFiles.erase(uri);
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
index 802dd81989..a3ab371988 100644
--- a/libsolidity/lsp/LanguageServer.h
+++ b/libsolidity/lsp/LanguageServer.h
@@ -60,12 +60,12 @@ class LanguageServer
 private:
 	/// Checks if the server is initialized (to be used by messages that need it to be initialized).
 	/// Reports an error and returns false if not.
-	bool checkServerInitialized(MessageID _id);
+	void requireServerInitialized();
 	void handleInitialize(MessageID _id, Json::Value const& _args);
-	void handleWorkspaceDidChangeConfiguration(MessageID _id, Json::Value const& _args);
-	void handleTextDocumentDidOpen(MessageID _id, Json::Value const& _args);
-	void handleTextDocumentDidChange(MessageID _id, Json::Value const& _args);
-	void handleTextDocumentDidClose(MessageID _id, Json::Value const& _args);
+	void handleWorkspaceDidChangeConfiguration(Json::Value const& _args);
+	void handleTextDocumentDidOpen(Json::Value const& _args);
+	void handleTextDocumentDidChange(Json::Value const& _args);
+	void handleTextDocumentDidClose(Json::Value const& _args);
 
 	/// Invoked when the server user-supplied configuration changes (initiated by the client).
 	void changeConfiguration(Json::Value const&);
diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h
index c6ed8fa8a2..384f1e3eb3 100644
--- a/libsolidity/lsp/Transport.h
+++ b/libsolidity/lsp/Transport.h
@@ -17,6 +17,8 @@
 // SPDX-License-Identifier: GPL-3.0
 #pragma once
 
+#include <libsolutil/Exceptions.h>
+
 #include <json/value.h>
 
 #include <functional>
@@ -45,6 +47,23 @@ enum class ErrorCode
 	RequestFailed = -32803
 };
 
+/**
+ * Error exception used to bail out on errors in the LSP function-call handlers.
+ */
+class RequestError: public util::Exception
+{
+public:
+	explicit RequestError(ErrorCode _code):
+		m_code{_code}
+	{
+	}
+
+	ErrorCode code() const noexcept { return m_code; }
+
+private:
+	ErrorCode m_code;
+};
+
 /**
  * Transport layer API
  *

From 1bd0f9570fed42e3dd1ce67c0ced0c3a1062d264 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 5 Jan 2022 11:30:04 +0100
Subject: [PATCH 0255/1748] LSP: Introduces lspAssert(condition, ErrorCode,
 message)

---
 libsolidity/lsp/LanguageServer.cpp | 80 +++++++++++++++---------------
 libsolidity/lsp/Transport.h        |  9 ++++
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index f9f0233496..fb704d8192 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -275,20 +275,20 @@ bool LanguageServer::run()
 
 void LanguageServer::requireServerInitialized()
 {
-	if (m_state != State::Initialized)
-		BOOST_THROW_EXCEPTION(
-			RequestError(ErrorCode::ServerNotInitialized) <<
-			errinfo_comment("Server is not properly initialized.")
-		);
+	lspAssert(
+		m_state == State::Initialized,
+		ErrorCode::ServerNotInitialized,
+		"Server is not properly initialized."
+	);
 }
 
 void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 {
-	if (m_state != State::Started)
-		BOOST_THROW_EXCEPTION(
-			RequestError(ErrorCode::RequestFailed) <<
-			errinfo_comment("Initialize called at the wrong time.")
-		);
+	lspAssert(
+		m_state == State::Started,
+		ErrorCode::RequestFailed,
+		"Initialize called at the wrong time."
+	);
 
 	m_state = State::Initialized;
 
@@ -298,11 +298,11 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	if (Json::Value uri = _args["rootUri"])
 	{
 		rootPath = uri.asString();
-		if (!boost::starts_with(rootPath, "file://"))
-			BOOST_THROW_EXCEPTION(
-				RequestError(ErrorCode::InvalidParams) <<
-				errinfo_comment("rootUri only supports file URI scheme.")
-			);
+		lspAssert(
+			boost::starts_with(rootPath, "file://"),
+			ErrorCode::InvalidParams,
+			"rootUri only supports file URI scheme."
+		);
 
 		rootPath = rootPath.substr(7);
 	}
@@ -334,11 +334,11 @@ void LanguageServer::handleTextDocumentDidOpen(Json::Value const& _args)
 {
 	requireServerInitialized();
 
-	if (!_args["textDocument"])
-		BOOST_THROW_EXCEPTION(
-			RequestError(ErrorCode::RequestFailed) <<
-			errinfo_comment("Text document parameter missing.")
-		);
+	lspAssert(
+		_args["textDocument"],
+		ErrorCode::RequestFailed,
+		"Text document parameter missing."
+	);
 
 	string text = _args["textDocument"]["text"].asString();
 	string uri = _args["textDocument"]["uri"].asString();
@@ -355,28 +355,28 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 
 	for (Json::Value jsonContentChange: _args["contentChanges"])
 	{
-		if (!jsonContentChange.isObject())
-			BOOST_THROW_EXCEPTION(
-				RequestError(ErrorCode::RequestFailed) <<
-				errinfo_comment("Invalid content reference.")
-			);
+		lspAssert(
+			jsonContentChange.isObject(),
+			ErrorCode::RequestFailed,
+			"Invalid content reference."
+		);
 
 		string const sourceUnitName = m_fileRepository.clientPathToSourceUnitName(uri);
-		if (!m_fileRepository.sourceUnits().count(sourceUnitName))
-			BOOST_THROW_EXCEPTION(
-				RequestError(ErrorCode::RequestFailed) <<
-				errinfo_comment("Unknown file: " + uri)
-			);
+		lspAssert(
+			m_fileRepository.sourceUnits().count(sourceUnitName),
+			ErrorCode::RequestFailed,
+			"Unknown file: " + uri
+		);
 
 		string text = jsonContentChange["text"].asString();
 		if (jsonContentChange["range"].isObject()) // otherwise full content update
 		{
 			optional<SourceLocation> change = parseRange(sourceUnitName, jsonContentChange["range"]);
-			if (!change || !change->hasText())
-				BOOST_THROW_EXCEPTION(
-					RequestError(ErrorCode::RequestFailed) <<
-					errinfo_comment("Invalid source range: " + jsonCompactPrint(jsonContentChange["range"]))
-				);
+			lspAssert(
+				change && change->hasText(),
+				ErrorCode::RequestFailed,
+				"Invalid source range: " + jsonCompactPrint(jsonContentChange["range"])
+			);
 
 			string buffer = m_fileRepository.sourceUnits().at(sourceUnitName);
 			buffer.replace(static_cast<size_t>(change->start), static_cast<size_t>(change->end - change->start), move(text));
@@ -392,11 +392,11 @@ void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
 {
 	requireServerInitialized();
 
-	if (!_args["textDocument"])
-		BOOST_THROW_EXCEPTION(
-			RequestError(ErrorCode::RequestFailed) <<
-			errinfo_comment("Text document parameter missing.")
-		);
+	lspAssert(
+		_args["textDocument"],
+		ErrorCode::RequestFailed,
+		"Text document parameter missing."
+	);
 
 	string uri = _args["textDocument"]["uri"].asString();
 	m_openFiles.erase(uri);
diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h
index 384f1e3eb3..2d0b49517a 100644
--- a/libsolidity/lsp/Transport.h
+++ b/libsolidity/lsp/Transport.h
@@ -64,6 +64,15 @@ class RequestError: public util::Exception
 	ErrorCode m_code;
 };
 
+#define lspAssert(condition, errorCode, errorMessage) \
+	if (!(condition)) \
+	{ \
+		BOOST_THROW_EXCEPTION( \
+			RequestError(errorCode) << \
+			errinfo_comment(errorMessage) \
+		); \
+	}
+
 /**
  * Transport layer API
  *

From b1ef5de49687ec1c65c39320124e208f7d7c037c Mon Sep 17 00:00:00 2001
From: Esquith Allen <18001622+esquith@users.noreply.github.com>
Date: Wed, 5 Jan 2022 21:58:41 -0500
Subject: [PATCH 0256/1748] fix typo

---
 docs/examples/micropayment.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/micropayment.rst b/docs/examples/micropayment.rst
index 3383e61958..c95d7c5e41 100644
--- a/docs/examples/micropayment.rst
+++ b/docs/examples/micropayment.rst
@@ -37,7 +37,7 @@ Alice does not need to interact with the Ethereum network
 to sign the transaction, the process is completely offline.
 In this tutorial, we will sign messages in the browser
 using `web3.js <https://github.com/ethereum/web3.js>`_ and
-`MetaMask <https://metamask.io>`_, using the method described in `EIP-762 <https://github.com/ethereum/EIPs/pull/712>`_,
+`MetaMask <https://metamask.io>`_, using the method described in `EIP-712 <https://github.com/ethereum/EIPs/pull/712>`_,
 as it provides a number of other security benefits.
 
 .. code-block:: javascript

From e969aed7803270f412e43107b83f5d5c97c4bb4a Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 30 Dec 2021 18:16:29 +0100
Subject: [PATCH 0257/1748] Properly resolve virtual modifiers

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/ControlFlowBuilder.cpp   | 33 +++++---
 libsolidity/analysis/ControlFlowBuilder.h     |  8 +-
 libsolidity/analysis/ControlFlowGraph.cpp     |  2 +-
 libsolidity/analysis/ControlFlowGraph.h       |  4 +-
 .../analysis/ControlFlowRevertPruner.cpp      | 76 +++++++++----------
 .../modifier_declaration_fine.sol             |  6 +-
 .../modifier_different_functions.sol          | 12 +++
 .../modifiers/modifier_override.sol           | 17 +++++
 .../storageReturn/modifier_err.sol            |  8 +-
 .../storageReturn/modifier_fine.sol           |  6 +-
 11 files changed, 110 insertions(+), 63 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol
 create mode 100644 test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol

diff --git a/Changelog.md b/Changelog.md
index b88e1a9714..7f985b3004 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
 
 
 Solc-Js:
diff --git a/libsolidity/analysis/ControlFlowBuilder.cpp b/libsolidity/analysis/ControlFlowBuilder.cpp
index ff8e2a29af..3de1ecca54 100644
--- a/libsolidity/analysis/ControlFlowBuilder.cpp
+++ b/libsolidity/analysis/ControlFlowBuilder.cpp
@@ -25,19 +25,21 @@ using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace std;
 
-ControlFlowBuilder::ControlFlowBuilder(CFG::NodeContainer& _nodeContainer, FunctionFlow const& _functionFlow):
+ControlFlowBuilder::ControlFlowBuilder(CFG::NodeContainer& _nodeContainer, FunctionFlow const& _functionFlow, ContractDefinition const* _contract):
 	m_nodeContainer(_nodeContainer),
 	m_currentNode(_functionFlow.entry),
 	m_returnNode(_functionFlow.exit),
 	m_revertNode(_functionFlow.revert),
-	m_transactionReturnNode(_functionFlow.transactionReturn)
+	m_transactionReturnNode(_functionFlow.transactionReturn),
+	m_contract(_contract)
 {
 }
 
 
 unique_ptr<FunctionFlow> ControlFlowBuilder::createFunctionFlow(
 	CFG::NodeContainer& _nodeContainer,
-	FunctionDefinition const& _function
+	FunctionDefinition const& _function,
+	ContractDefinition const* _contract
 )
 {
 	auto functionFlow = make_unique<FunctionFlow>();
@@ -45,7 +47,7 @@ unique_ptr<FunctionFlow> ControlFlowBuilder::createFunctionFlow(
 	functionFlow->exit = _nodeContainer.newNode();
 	functionFlow->revert = _nodeContainer.newNode();
 	functionFlow->transactionReturn = _nodeContainer.newNode();
-	ControlFlowBuilder builder(_nodeContainer, *functionFlow);
+	ControlFlowBuilder builder(_nodeContainer, *functionFlow, _contract);
 	builder.appendControlFlow(_function);
 
 	return functionFlow;
@@ -297,7 +299,8 @@ bool ControlFlowBuilder::visit(FunctionCall const& _functionCall)
 				_functionCall.expression().accept(*this);
 				ASTNode::listAccept(_functionCall.arguments(), *this);
 
-				m_currentNode->functionCalls.emplace_back(&_functionCall);
+				solAssert(!m_currentNode->functionCall);
+				m_currentNode->functionCall = &_functionCall;
 
 				auto nextNode = newLabel();
 
@@ -321,8 +324,20 @@ bool ControlFlowBuilder::visit(ModifierInvocation const& _modifierInvocation)
 	auto modifierDefinition = dynamic_cast<ModifierDefinition const*>(
 		_modifierInvocation.name().annotation().referencedDeclaration
 	);
-	if (!modifierDefinition) return false;
-	if (!modifierDefinition->isImplemented()) return false;
+
+	if (!modifierDefinition)
+		return false;
+
+	VirtualLookup const& requiredLookup = *_modifierInvocation.name().annotation().requiredLookup;
+
+	if (requiredLookup == VirtualLookup::Virtual)
+		modifierDefinition = &modifierDefinition->resolveVirtual(*m_contract);
+	else
+		solAssert(requiredLookup == VirtualLookup::Static);
+
+	if (!modifierDefinition->isImplemented())
+		return false;
+
 	solAssert(!!m_returnNode, "");
 
 	m_placeholderEntry = newLabel();
@@ -355,8 +370,8 @@ bool ControlFlowBuilder::visit(FunctionDefinition const& _functionDefinition)
 
 	}
 
-	for (auto const& modifier: _functionDefinition.modifiers())
-		appendControlFlow(*modifier);
+	for (auto const& modifierInvocation: _functionDefinition.modifiers())
+		appendControlFlow(*modifierInvocation);
 
 	appendControlFlow(_functionDefinition.body());
 
diff --git a/libsolidity/analysis/ControlFlowBuilder.h b/libsolidity/analysis/ControlFlowBuilder.h
index 9cab99dd4c..a150262f16 100644
--- a/libsolidity/analysis/ControlFlowBuilder.h
+++ b/libsolidity/analysis/ControlFlowBuilder.h
@@ -37,13 +37,15 @@ class ControlFlowBuilder: private ASTConstVisitor, private yul::ASTWalker
 public:
 	static std::unique_ptr<FunctionFlow> createFunctionFlow(
 		CFG::NodeContainer& _nodeContainer,
-		FunctionDefinition const& _function
+		FunctionDefinition const& _function,
+		ContractDefinition const* _contract = nullptr
 	);
 
 private:
 	explicit ControlFlowBuilder(
 		CFG::NodeContainer& _nodeContainer,
-		FunctionFlow const& _functionFlow
+		FunctionFlow const& _functionFlow,
+		ContractDefinition const* _contract = nullptr
 	);
 
 	// Visits for constructing the control flow.
@@ -158,6 +160,8 @@ class ControlFlowBuilder: private ASTConstVisitor, private yul::ASTWalker
 	CFGNode* m_revertNode = nullptr;
 	CFGNode* m_transactionReturnNode = nullptr;
 
+	ContractDefinition const* m_contract = nullptr;
+
 	/// The current jump destination of break Statements.
 	CFGNode* m_breakJump = nullptr;
 	/// The current jump destination of continue Statements.
diff --git a/libsolidity/analysis/ControlFlowGraph.cpp b/libsolidity/analysis/ControlFlowGraph.cpp
index f4afe0149b..ca36b421c3 100644
--- a/libsolidity/analysis/ControlFlowGraph.cpp
+++ b/libsolidity/analysis/ControlFlowGraph.cpp
@@ -44,7 +44,7 @@ bool CFG::visit(ContractDefinition const& _contract)
 		for (FunctionDefinition const* function: contract->definedFunctions())
 			if (function->isImplemented())
 				m_functionControlFlow[{&_contract, function}] =
-					ControlFlowBuilder::createFunctionFlow(m_nodeContainer, *function);
+					ControlFlowBuilder::createFunctionFlow(m_nodeContainer, *function, &_contract);
 
 	return true;
 }
diff --git a/libsolidity/analysis/ControlFlowGraph.h b/libsolidity/analysis/ControlFlowGraph.h
index 732548664e..7383783fd6 100644
--- a/libsolidity/analysis/ControlFlowGraph.h
+++ b/libsolidity/analysis/ControlFlowGraph.h
@@ -98,8 +98,8 @@ struct CFGNode
 	std::vector<CFGNode*> entries;
 	/// Exit nodes. All CFG nodes to which control flow may continue after this node.
 	std::vector<CFGNode*> exits;
-	/// Function calls done by this node
-	std::vector<FunctionCall const*> functionCalls;
+	/// Function call done by this node
+	FunctionCall const* functionCall = nullptr;
 
 	/// Variable occurrences in the node.
 	std::vector<VariableOccurrence> variableOccurrences;
diff --git a/libsolidity/analysis/ControlFlowRevertPruner.cpp b/libsolidity/analysis/ControlFlowRevertPruner.cpp
index 6a8018355d..9a44be57af 100644
--- a/libsolidity/analysis/ControlFlowRevertPruner.cpp
+++ b/libsolidity/analysis/ControlFlowRevertPruner.cpp
@@ -81,27 +81,27 @@ void ControlFlowRevertPruner::findRevertStates()
 				if (_node == functionFlow.exit)
 					foundExit = true;
 
-				for (auto const* functionCall: _node->functionCalls)
+				if (auto const* functionCall = _node->functionCall)
 				{
 					auto const* resolvedFunction = ASTNode::resolveFunctionCall(*functionCall, item.contract);
 
-					if (resolvedFunction == nullptr || !resolvedFunction->isImplemented())
-						continue;
-
-					CFG::FunctionContractTuple calledFunctionTuple{
-						findScopeContract(*resolvedFunction, item.contract),
-						resolvedFunction
-					};
-					switch (m_functions.at(calledFunctionTuple))
+					if (resolvedFunction && resolvedFunction->isImplemented())
 					{
-						case RevertState::Unknown:
-							wakeUp[calledFunctionTuple].insert(item);
-							foundUnknown = true;
-							return;
-						case RevertState::AllPathsRevert:
-							return;
-						case RevertState::HasNonRevertingPath:
-							break;
+						CFG::FunctionContractTuple calledFunctionTuple{
+							findScopeContract(*resolvedFunction, item.contract),
+							resolvedFunction
+						};
+						switch (m_functions.at(calledFunctionTuple))
+						{
+							case RevertState::Unknown:
+								wakeUp[calledFunctionTuple].insert(item);
+								foundUnknown = true;
+								return;
+							case RevertState::AllPathsRevert:
+								return;
+							case RevertState::HasNonRevertingPath:
+								break;
+						}
 					}
 				}
 
@@ -135,31 +135,29 @@ void ControlFlowRevertPruner::modifyFunctionFlows()
 		FunctionFlow const& functionFlow = m_cfg.functionFlow(*item.first.function, item.first.contract);
 		solidity::util::BreadthFirstSearch<CFGNode*>{{functionFlow.entry}}.run(
 			[&](CFGNode* _node, auto&& _addChild) {
-				for (auto const* functionCall: _node->functionCalls)
+				if (auto const* functionCall = _node->functionCall)
 				{
 					auto const* resolvedFunction = ASTNode::resolveFunctionCall(*functionCall, item.first.contract);
 
-					if (resolvedFunction == nullptr || !resolvedFunction->isImplemented())
-						continue;
-
-					switch (m_functions.at({findScopeContract(*resolvedFunction, item.first.contract), resolvedFunction}))
-					{
-						case RevertState::Unknown:
-							[[fallthrough]];
-						case RevertState::AllPathsRevert:
-							// If the revert states of the functions do not
-							// change anymore, we treat all "unknown" states as
-							// "reverting", since they can only be caused by
-							// recursion.
-							for (CFGNode * node: _node->exits)
-								ranges::remove(node->entries, _node);
-
-							_node->exits = {functionFlow.revert};
-							functionFlow.revert->entries.push_back(_node);
-							return;
-						default:
-							break;
-					}
+					if (resolvedFunction && resolvedFunction->isImplemented())
+						switch (m_functions.at({findScopeContract(*resolvedFunction, item.first.contract), resolvedFunction}))
+						{
+							case RevertState::Unknown:
+								[[fallthrough]];
+							case RevertState::AllPathsRevert:
+								// If the revert states of the functions do not
+								// change anymore, we treat all "unknown" states as
+								// "reverting", since they can only be caused by
+								// recursion.
+								for (CFGNode * node: _node->exits)
+									ranges::remove(node->entries, _node);
+
+								_node->exits = {functionFlow.revert};
+								functionFlow.revert->entries.push_back(_node);
+								return;
+							default:
+								break;
+						}
 				}
 
 				for (CFGNode* exit: _node->exits)
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/modifier_declaration_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/modifier_declaration_fine.sol
index 6df4939cf4..260ae6b949 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/modifier_declaration_fine.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/modifier_declaration_fine.sol
@@ -1,5 +1,5 @@
 contract C {
-    modifier revertIfNoReturn() {
+    modifier alwaysRevert() {
         _;
         revert();
     }
@@ -9,10 +9,10 @@ contract C {
     }
     struct S { uint a; }
     S s;
-    function f(bool flag) revertIfNoReturn() internal view {
+    function f(bool flag) alwaysRevert() internal view {
         if (flag) s;
     }
-    function g(bool flag) revertIfNoReturn() ifFlag(flag) internal view {
+    function g(bool flag) alwaysRevert() ifFlag(flag) internal view {
         s;
     }
 
diff --git a/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol b/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol
new file mode 100644
index 0000000000..63d9153692
--- /dev/null
+++ b/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_different_functions.sol
@@ -0,0 +1,12 @@
+contract A {
+	function f() mod internal returns (uint[] storage) {
+		revert();
+	}
+	function g() mod internal returns (uint[] storage) {
+	}
+	modifier mod() virtual {
+		_;
+	}
+}
+// ----
+// TypeError 3464: (118-132): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol b/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol
new file mode 100644
index 0000000000..3c5eb80ee4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/controlFlow/modifiers/modifier_override.sol
@@ -0,0 +1,17 @@
+contract A {
+	function f() mod internal returns (uint[] storage) {
+	}
+	modifier mod() virtual {
+		revert();
+		_;
+	}
+}
+contract B is A {
+	modifier mod() override { _; }
+	function g() public {
+		f()[0] = 42;
+	}
+}
+// ----
+// Warning 5740: (65-69): Unreachable code.
+// TypeError 3464: (49-63): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol
index bf896b86a2..5dee487d1f 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_err.sol
@@ -1,5 +1,5 @@
 contract C {
-    modifier revertIfNoReturn() {
+    modifier callAndRevert() {
         _;
         revert();
     }
@@ -13,10 +13,10 @@ contract C {
         return s;
     }
 
-    function g(bool flag) ifFlag(flag) revertIfNoReturn() internal view returns(S storage) {
+    function g(bool flag) ifFlag(flag) callAndRevert() internal view returns(S storage) {
         return s;
     }
 }
 // ----
-// TypeError 3464: (249-258): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
-// TypeError 3464: (367-376): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (246-255): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
+// TypeError 3464: (361-370): This variable is of storage pointer type and can be returned without prior assignment, which would lead to undefined behaviour.
diff --git a/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_fine.sol b/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_fine.sol
index ee37f6d642..7b7b3ba0c2 100644
--- a/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_fine.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/storageReturn/modifier_fine.sol
@@ -1,5 +1,5 @@
 contract C {
-    modifier revertIfNoReturn() {
+    modifier callAndRevert() {
         _;
         revert();
     }
@@ -9,10 +9,10 @@ contract C {
     }
     struct S { uint a; }
     S s;
-    function f(bool flag) revertIfNoReturn() internal view returns(S storage) {
+    function f(bool flag) callAndRevert() internal view returns(S storage) {
         if (flag) return s;
     }
-    function g(bool flag) revertIfNoReturn() ifFlag(flag) internal view returns(S storage) {
+    function g(bool flag) callAndRevert() ifFlag(flag) internal view returns(S storage) {
         return s;
     }
 

From 2c7aed1d7e584044748eebee573f75576e52f638 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Thu, 6 Jan 2022 14:16:02 +0100
Subject: [PATCH 0258/1748] Add FunctionHoister as a pre-requisite for equal
 store eliminator.

---
 test/libyul/YulOptimizerTestCommon.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index bb8458d78b..e7711f5866 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -239,6 +239,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 		}},
 		{"equalStoreEliminator", [&]() {
 			disambiguate();
+			FunctionHoister::run(*m_context, *m_ast);
 			ForLoopInitRewriter::run(*m_context, *m_ast);
 			EqualStoreEliminator::run(*m_context, *m_ast);
 		}},

From 4c20821e6d3f343fe19245fc01bb0c4fb9b3dbc5 Mon Sep 17 00:00:00 2001
From: Mohamed Safouen Bouabid <BOUABid.m.safouen@gmail.com>
Date: Fri, 7 Jan 2022 16:01:13 +0100
Subject: [PATCH 0259/1748] Explaining payable(msg.sender)

At this point of the documentation a new Solidity learner will not understand this line without further explanation:
if (!payable(msg.sender).send(amount)) {
It should explain how msg.sender is of type "address" and not "address payable" so it cannot send or receive Ether. Therefore it must be explicitly converted to payable.
---
 docs/examples/blind-auction.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/examples/blind-auction.rst b/docs/examples/blind-auction.rst
index ad898a9b15..b0a86f248d 100644
--- a/docs/examples/blind-auction.rst
+++ b/docs/examples/blind-auction.rst
@@ -121,6 +121,9 @@ to receive their money - contracts cannot activate themselves.
                 // before `send` returns.
                 pendingReturns[msg.sender] = 0;
 
+                // msg.sender is not of type `address payable` and must be
+                // explicitly converted using `payable(msg.sender)` in order
+                // use the member function `send()`.
                 if (!payable(msg.sender).send(amount)) {
                     // No need to call throw here, just reset the amount owing
                     pendingReturns[msg.sender] = amount;

From 790e7f42a1750b6a8f98079e1671a3cb579e8bf9 Mon Sep 17 00:00:00 2001
From: Brien <58648726+brien-tech@users.noreply.github.com>
Date: Mon, 10 Jan 2022 02:29:51 -0500
Subject: [PATCH 0260/1748] Fixing typo in "smart contracts"

---
 docs/layout-of-source-files.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/layout-of-source-files.rst b/docs/layout-of-source-files.rst
index cd031bb01b..b3a27bf1ed 100644
--- a/docs/layout-of-source-files.rst
+++ b/docs/layout-of-source-files.rst
@@ -13,7 +13,7 @@ and :ref:`constant variable<constants>` definitions.
 SPDX License Identifier
 =======================
 
-Trust in smart contract can be better established if their source code
+Trust in smart contracts can be better established if their source code
 is available. Since making source code available always touches on legal problems
 with regards to copyright, the Solidity compiler encourages the use
 of machine-readable `SPDX license identifiers <https://spdx.org>`_.

From 19b1a13c6d2bc80ccc4174691c84f18bb4891f3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Oct 2021 11:12:45 +0200
Subject: [PATCH 0261/1748] externalTests: Add support for hardhat.config.ts

---
 test/externalTests/common.sh | 43 +++++++++++++++++++++++++++---------
 1 file changed, 32 insertions(+), 11 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index d394a0b5fd..a0bf17bdad 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -189,14 +189,17 @@ function force_hardhat_compiler_binary
     echo "Config file: ${config_file}"
     echo "Binary type: ${binary_type}"
     echo "Compiler path: ${solc_path}"
-    hardhat_solc_build_subtask "$SOLCVERSION_SHORT" "$SOLCVERSION" "$binary_type" "$solc_path" >> "$config_file"
+
+    local language="${config_file##*.}"
+    hardhat_solc_build_subtask "$SOLCVERSION_SHORT" "$SOLCVERSION" "$binary_type" "$solc_path" "$language" >> "$config_file"
 }
 
 function force_hardhat_compiler_settings
 {
     local config_file="$1"
     local preset="$2"
-    local evm_version="${3:-"$CURRENT_EVM_VERSION"}"
+    local config_var_name="$3"
+    local evm_version="${4:-"$CURRENT_EVM_VERSION"}"
 
     printLog "Configuring Hardhat..."
     echo "-------------------------------------"
@@ -208,10 +211,16 @@ function force_hardhat_compiler_settings
     echo "Compiler version (full): ${SOLCVERSION}"
     echo "-------------------------------------"
 
-    {
-        echo -n 'module.exports["solidity"] = '
-        hardhat_compiler_settings "$SOLCVERSION_SHORT" "$preset" "$evm_version"
-    } >> "$config_file"
+    local settings
+    settings=$(hardhat_compiler_settings "$SOLCVERSION_SHORT" "$preset" "$evm_version")
+    if [[ $config_file == *\.js ]]; then
+        [[ $config_var_name == "" ]] || assertFail
+        echo "module.exports['solidity'] = ${settings}" >> "$config_file"
+    else
+        [[ $config_file == *\.ts ]] || assertFail
+        [[ $config_var_name != "" ]] || assertFail
+        echo "${config_var_name}.solidity = {compilers: [${settings}]}"  >> "$config_file"
+    fi
 }
 
 function truffle_verify_compiler_version
@@ -309,16 +318,27 @@ function hardhat_solc_build_subtask {
     local full_solc_version="$2"
     local binary_type="$3"
     local solc_path="$4"
+    local language="$5"
 
     [[ $binary_type == native || $binary_type == solcjs ]] || assertFail
 
     [[ $binary_type == native ]] && local is_solcjs=false
     [[ $binary_type == solcjs ]] && local is_solcjs=true
 
-    echo "const {TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD} = require('hardhat/builtin-tasks/task-names');"
-    echo "const assert = require('assert');"
-    echo
-    echo "subtask(TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD, async (args, hre, runSuper) => {"
+    if [[ $language == js ]]; then
+        echo "const {TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD} = require('hardhat/builtin-tasks/task-names');"
+        echo "const assert = require('assert');"
+        echo
+        echo "subtask(TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD, async (args, hre, runSuper) => {"
+    else
+        [[ $language == ts ]] || assertFail
+        echo "import {TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD} from 'hardhat/builtin-tasks/task-names';"
+        echo "import assert = require('assert');"
+        echo "import {subtask} from 'hardhat/config';"
+        echo
+        echo "subtask(TASK_COMPILE_SOLIDITY_GET_SOLC_BUILD, async (args: any, _hre: any, _runSuper: any) => {"
+    fi
+
     echo "    assert(args.solcVersion == '${solc_version}', 'Unexpected solc version: ' + args.solcVersion)"
     echo "    return {"
     echo "        compilerPath: '$(realpath "$solc_path")',"
@@ -384,9 +404,10 @@ function hardhat_run_test
     local compile_only_presets="$3"
     local compile_fn="$4"
     local test_fn="$5"
+    local config_var_name="$6"
 
     hardhat_clean
-    force_hardhat_compiler_settings "$config_file" "$preset"
+    force_hardhat_compiler_settings "$config_file" "$preset" "$config_var_name"
     compile_and_run_test compile_fn test_fn hardhat_verify_compiler_version "$preset" "$compile_only_presets"
 }
 

From 6980fa32e2c67d18dcf4115f36e225db96a08138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 6 Dec 2021 16:34:36 +0100
Subject: [PATCH 0262/1748] External test for sushiswap/trident

---
 .circleci/config.yml          |  7 +++
 test/externalTests.sh         |  1 +
 test/externalTests/trident.sh | 90 +++++++++++++++++++++++++++++++++++
 3 files changed, 98 insertions(+)
 create mode 100755 test/externalTests/trident.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6edfc2d3a6..02f91de839 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1371,6 +1371,13 @@ workflows:
           binary_type: native
           # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
           nodejs_version: '16'
+      - t_ems_ext:
+          <<: *workflow_ubuntu2004_static
+          name: t_native_test_ext_trident
+          project: trident
+          binary_type: native
+          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+          nodejs_version: '16'
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 86f13401e9..846cdf5153 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -42,3 +42,4 @@ printTask "Running external tests..."
 "$REPO_ROOT/externalTests/gnosis-v2.sh" "$@"
 "$REPO_ROOT/externalTests/colony.sh" "$@"
 "$REPO_ROOT/externalTests/ens.sh" "$@"
+"$REPO_ROOT/externalTests/trident.sh" "$@"
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
new file mode 100755
index 0000000000..379af8cc1d
--- /dev/null
+++ b/test/externalTests/trident.sh
@@ -0,0 +1,90 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2021 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+
+function compile_fn { yarn build; }
+
+function test_fn {
+    # shellcheck disable=SC2046
+    TS_NODE_TRANSPILE_ONLY=1 npx hardhat test --no-compile $(
+        # TODO: We need to skip Migration.test.ts because it fails and makes other tests fail too.
+        # Replace this with `yarn test` once https://github.com/sushiswap/trident/issues/283 is fixed.
+        find test/ -name "*.test.ts" ! -path "test/Migration.test.ts"
+    )
+}
+
+function trident_test
+{
+    # TODO: Switch to https://github.com/sushiswap/trident / master once
+    # https://github.com/sushiswap/trident/pull/282 gets merged.
+    local repo="https://github.com/solidity-external-tests/trident.git"
+    local branch=master_080
+    local config_file="hardhat.config.ts"
+    local config_var=config
+
+    local compile_only_presets=()
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize            # Compilation fails with: "YulException: Variable var_amount_165 is 9 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only      # Compilation fails with: "YulException: Variable var_amount_165 is 9 slot(s) too deep inside the stack."
+        #ir-optimize-evm+yul       # Compilation fails with: "YulException: Cannot swap Variable var_nearestTick with Variable _4: too deep in the stack by 4 slots"
+        legacy-no-optimize
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+    )
+
+    local selected_optimizer_presets
+    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_optimizer_presets_or_exit "$selected_optimizer_presets"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$branch" "$DIR"
+
+    # TODO: Currently tests work only with the exact versions from yarn.lock.
+    # Re-enable this when https://github.com/sushiswap/trident/issues/284 is fixed.
+    #neutralize_package_lock
+
+    neutralize_package_json_hooks
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$selected_optimizer_presets")" "$config_var"
+    yarn install
+
+    replace_version_pragmas
+    force_solc_modules "${DIR}/solc"
+
+    # @sushiswap/core package contains contracts that get built with 0.6.12 and fail our compiler
+    # version check. It's not used by tests so we can remove it.
+    rm -r node_modules/@sushiswap/core/
+
+    for preset in $selected_optimizer_presets; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+    done
+}
+
+external_test Trident trident_test

From 2d038cddffc130c44f18d6e3af1e235ac596c329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 9 Dec 2021 13:22:17 +0100
Subject: [PATCH 0263/1748] trident ext test: Patch upstream instread of
 relying on our fork

---
 test/externalTests/trident.sh | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index 379af8cc1d..3129302938 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -41,10 +41,8 @@ function test_fn {
 
 function trident_test
 {
-    # TODO: Switch to https://github.com/sushiswap/trident / master once
-    # https://github.com/sushiswap/trident/pull/282 gets merged.
-    local repo="https://github.com/solidity-external-tests/trident.git"
-    local branch=master_080
+    local repo="https://github.com/sushiswap/trident"
+    local branch=master
     local config_file="hardhat.config.ts"
     local config_var=config
 
@@ -78,6 +76,14 @@ function trident_test
     replace_version_pragmas
     force_solc_modules "${DIR}/solc"
 
+    # BentoBoxV1Flat.sol requires a few small tweaks to compile on 0.8.x.
+    # TODO: Remove once https://github.com/sushiswap/trident/pull/282 gets merged.
+    sed -i 's|uint128(-1)|type(uint128).max|g' contracts/flat/BentoBoxV1Flat.sol
+    sed -i 's|uint64(-1)|type(uint64).max|g' contracts/flat/BentoBoxV1Flat.sol
+    sed -i 's|uint32(-1)|type(uint32).max|g' contracts/flat/BentoBoxV1Flat.sol
+    sed -i 's|IERC20(0)|IERC20(address(0))|g' contracts/flat/BentoBoxV1Flat.sol
+    sed -i 's|IStrategy(0)|IStrategy(address(0))|g' contracts/flat/BentoBoxV1Flat.sol
+
     # @sushiswap/core package contains contracts that get built with 0.6.12 and fail our compiler
     # version check. It's not used by tests so we can remove it.
     rm -r node_modules/@sushiswap/core/

From 1928b7843bc6f76904231f8f2c7858e4d574167f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 17 Dec 2021 16:01:19 +0100
Subject: [PATCH 0264/1748] externalTests: Preset selection via command-line
 arguments

---
 test/externalTests/colony.sh    | 10 +++++-----
 test/externalTests/common.sh    | 27 +++++++++++++++++++++++++--
 test/externalTests/ens.sh       | 10 +++++-----
 test/externalTests/gnosis-v2.sh | 10 +++++-----
 test/externalTests/gnosis.sh    | 10 +++++-----
 test/externalTests/zeppelin.sh  | 10 +++++-----
 6 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 9bebc27222..d3664bb1ea 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -27,6 +27,7 @@ source test/externalTests/common.sh
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
 
 function compile_fn { yarn run provision:token:contracts; }
 function test_fn { yarn run test:contracts; }
@@ -49,16 +50,15 @@ function colony_test
         legacy-optimize-evm+yul
     )
 
-    local selected_optimizer_presets
-    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_optimizer_presets_or_exit "$selected_optimizer_presets"
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$selected_optimizer_presets")"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$SELECTED_PRESETS")"
     yarn install
     git submodule update --init
 
@@ -70,7 +70,7 @@ function colony_test
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
-    for preset in $selected_optimizer_presets; do
+    for preset in $SELECTED_PRESETS; do
         truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index d394a0b5fd..ae194062b6 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -24,7 +24,16 @@ set -e
 
 CURRENT_EVM_VERSION=london
 
-function print_optimizer_presets_or_exit
+AVAILABLE_PRESETS=(
+    legacy-no-optimize
+    ir-no-optimize
+    legacy-optimize-evm-only
+    ir-optimize-evm-only
+    legacy-optimize-evm+yul
+    ir-optimize-evm+yul
+)
+
+function print_presets_or_exit
 {
     local selected_presets="$1"
 
@@ -37,10 +46,22 @@ function verify_input
 {
     local binary_type="$1"
     local binary_path="$2"
+    local selected_presets="$3"
 
-    (( $# == 2 )) || fail "Usage: $0 native|solcjs <path to solc or soljson.js>"
+    (( $# >= 2 && $# <= 3 )) || fail "Usage: $0 native|solcjs <path to solc or soljson.js> [preset]"
     [[ $binary_type == native || $binary_type == solcjs ]] || fail "Invalid binary type: '${binary_type}'. Must be either 'native' or 'solcjs'."
     [[ -f "$binary_path" ]] || fail "The compiler binary does not exist at '${binary_path}'"
+
+    if [[ $selected_presets != "" ]]
+    then
+        for preset in $selected_presets
+        do
+            if [[ " ${AVAILABLE_PRESETS[*]} " != *" $preset "* ]]
+            then
+                fail "Preset '${preset}' does not exist. Available presets: ${AVAILABLE_PRESETS[*]}."
+            fi
+        done
+    fi
 }
 
 function setup_solc
@@ -266,6 +287,8 @@ function settings_from_preset
     local preset="$1"
     local evm_version="$2"
 
+    [[ " ${AVAILABLE_PRESETS[*]} " == *" $preset "* ]] || assertFail
+
     case "$preset" in
         # NOTE: Remember to update `parallelism` of `t_ems_ext` job in CI config if you add/remove presets
         legacy-no-optimize)       echo "{evmVersion: '${evm_version}', viaIR: false, optimizer: {enabled: false}}" ;;
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 2b663cf843..858ce42fc7 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -27,6 +27,7 @@ source test/externalTests/common.sh
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
 
 function compile_fn { yarn build; }
 function test_fn { yarn test; }
@@ -49,9 +50,8 @@ function ens_test
         legacy-optimize-evm+yul
     )
 
-    local selected_optimizer_presets
-    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_optimizer_presets_or_exit "$selected_optimizer_presets"
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
@@ -60,13 +60,13 @@ function ens_test
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$selected_optimizer_presets")"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
     yarn install
 
     replace_version_pragmas
     neutralize_packaged_contracts
 
-    for preset in $selected_optimizer_presets; do
+    for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index f963c74a0f..b051d8b4e6 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -27,6 +27,7 @@ source test/externalTests/common.sh
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
 
 function compile_fn { npx truffle compile; }
 function test_fn { npm test; }
@@ -49,9 +50,8 @@ function gnosis_safe_test
         legacy-optimize-evm+yul
     )
 
-    local selected_optimizer_presets
-    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_optimizer_presets_or_exit "$selected_optimizer_presets"
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
@@ -62,13 +62,13 @@ function gnosis_safe_test
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$selected_optimizer_presets")"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$SELECTED_PRESETS")"
     npm install --package-lock
 
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
-    for preset in $selected_optimizer_presets; do
+    for preset in $SELECTED_PRESETS; do
         truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 7d8bc24426..cb07458c92 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -27,6 +27,7 @@ source test/externalTests/common.sh
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
 
 function compile_fn { npx truffle compile; }
 function test_fn { npm test; }
@@ -48,9 +49,8 @@ function gnosis_safe_test
         legacy-optimize-evm+yul
     )
 
-    local selected_optimizer_presets
-    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_optimizer_presets_or_exit "$selected_optimizer_presets"
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
@@ -60,13 +60,13 @@ function gnosis_safe_test
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$selected_optimizer_presets")"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$SELECTED_PRESETS")"
     npm install --package-lock
 
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
 
-    for preset in $selected_optimizer_presets; do
+    for preset in $SELECTED_PRESETS; do
         truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 9865c7e40b..3844a2cbab 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -27,6 +27,7 @@ source test/externalTests/common.sh
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
 
 function compile_fn { npm run compile; }
 function test_fn { npm test; }
@@ -49,21 +50,20 @@ function zeppelin_test
         legacy-optimize-evm+yul
     )
 
-    local selected_optimizer_presets
-    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_optimizer_presets_or_exit "$selected_optimizer_presets"
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$branch" "$DIR"
 
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$selected_optimizer_presets")"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
     npm install
 
     replace_version_pragmas
 
-    for preset in $selected_optimizer_presets; do
+    for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }

From 483148ddff4f3d4836f45cf5c493643bce5e8081 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 10 Jan 2022 16:26:14 +0100
Subject: [PATCH 0265/1748] Include the parallel run number in gitter
 notifcations from CI

---
 .circleci/config.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 02f91de839..1b1fbbdb0c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -53,8 +53,11 @@ commands:
             workflow_info=$(curl --silent "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}") || true
             workflow_name=$(echo "$workflow_info" | grep -E '"\s*name"\s*:\s*".*"' | cut -d \" -f 4 || echo "$CIRCLE_WORKFLOW_ID")
 
-            [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ [${workflow_name}] Job **${CIRCLE_JOB}** failed on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
-            [[ "<< parameters.event >>" == "success" ]] && message=" ✅ [${workflow_name}] Job **${CIRCLE_JOB}** succeeded on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
+            [[ $CIRCLE_NODE_TOTAL == 1 ]] && job="**${CIRCLE_JOB}**"
+            [[ $CIRCLE_NODE_TOTAL != 1 ]] && job="**${CIRCLE_JOB}** (run $((CIRCLE_NODE_INDEX + 1))/${CIRCLE_NODE_TOTAL})"
+
+            [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ [${workflow_name}] Job ${job} failed on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
+            [[ "<< parameters.event >>" == "success" ]] && message=" ✅ [${workflow_name}] Job ${job} succeeded on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
 
             curl "https://api.gitter.im/v1/rooms/${GITTER_NOTIFY_ROOM_ID}/chatMessages" \
               --request POST \

From b60b596741614263f80d71a5bfe069360cc97764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 10 Jan 2022 17:25:20 +0100
Subject: [PATCH 0266/1748] externalTests: Add support for cloning repos at a
 specific commit

---
 test/externalTests/colony.sh    |  5 +++--
 test/externalTests/common.sh    | 24 ++++++++++++++++++------
 test/externalTests/ens.sh       |  5 +++--
 test/externalTests/gnosis-v2.sh |  5 +++--
 test/externalTests/gnosis.sh    |  5 +++--
 test/externalTests/trident.sh   |  5 +++--
 test/externalTests/zeppelin.sh  |  5 +++--
 7 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 9bebc27222..a63648e85b 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -34,7 +34,8 @@ function test_fn { yarn run test:contracts; }
 function colony_test
 {
     local repo="https://github.com/solidity-external-tests/colonyNetwork.git"
-    local branch=develop_080
+    local ref_type=branch
+    local ref="develop_080"
     local config_file="truffle.js"
 
     local compile_only_presets=(
@@ -54,7 +55,7 @@ function colony_test
     print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$branch" "$DIR"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     neutralize_package_json_hooks
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index a0bf17bdad..728f85fbbb 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -77,12 +77,24 @@ function setup_solc
 function download_project
 {
     local repo="$1"
-    local solcjs_branch="$2"
-    local test_dir="$3"
-
-    printLog "Cloning $solcjs_branch of $repo..."
-    git clone --depth 1 "$repo" -b "$solcjs_branch" "$test_dir/ext"
-    cd ext
+    local ref_type="$2"
+    local solcjs_ref="$3"
+    local test_dir="$4"
+
+    [[ $ref_type == commit || $ref_type == branch || $ref_type == tag ]] || assertFail
+
+    printLog "Cloning ${ref_type} ${solcjs_ref} of ${repo}..."
+    if [[ $ref_type == commit ]]; then
+        mkdir ext
+        cd ext
+        git init
+        git remote add origin "$repo"
+        git fetch --depth 1 origin "$solcjs_ref"
+        git reset --hard FETCH_HEAD
+    else
+        git clone --depth 1 "$repo" -b "$solcjs_ref" "$test_dir/ext"
+        cd ext
+    fi
     echo "Current commit hash: $(git rev-parse HEAD)"
 }
 
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 2b663cf843..b19fbabe27 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -34,7 +34,8 @@ function test_fn { yarn test; }
 function ens_test
 {
     local repo="https://github.com/ensdomains/ens-contracts.git"
-    local branch="v0.0.8"  # The project is in flux right now and master might be too unstable for us
+    local ref_type=tag
+    local ref="v0.0.8"     # The project is in flux right now and master might be too unstable for us
     local config_file="hardhat.config.js"
 
     local compile_only_presets=(
@@ -54,7 +55,7 @@ function ens_test
     print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$branch" "$DIR"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     neutralize_package_lock
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index f963c74a0f..e219400953 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -34,7 +34,8 @@ function test_fn { npm test; }
 function gnosis_safe_test
 {
     local repo="https://github.com/solidity-external-tests/safe-contracts.git"
-    local branch=v2_080
+    local ref_type=branch
+    local ref="v2_080"
     local config_file="truffle-config.js"
 
     local compile_only_presets=(
@@ -54,7 +55,7 @@ function gnosis_safe_test
     print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$branch" "$DIR"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 7d8bc24426..ade36a9cec 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -34,7 +34,8 @@ function test_fn { npm test; }
 function gnosis_safe_test
 {
     local repo="https://github.com/solidity-external-tests/safe-contracts.git"
-    local branch=development_080
+    local ref_type=branch
+    local ref="development_080"
     local config_file="truffle-config.js"
 
     local compile_only_presets=()
@@ -53,7 +54,7 @@ function gnosis_safe_test
     print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$branch" "$DIR"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index 3129302938..3c15c5ea13 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -42,7 +42,8 @@ function test_fn {
 function trident_test
 {
     local repo="https://github.com/sushiswap/trident"
-    local branch=master
+    local ref_type=branch
+    local ref="master"
     local config_file="hardhat.config.ts"
     local config_var=config
 
@@ -62,7 +63,7 @@ function trident_test
     print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$branch" "$DIR"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
 
     # TODO: Currently tests work only with the exact versions from yarn.lock.
     # Re-enable this when https://github.com/sushiswap/trident/issues/284 is fixed.
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 9865c7e40b..7873ec9539 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -34,7 +34,8 @@ function test_fn { npm test; }
 function zeppelin_test
 {
     local repo="https://github.com/OpenZeppelin/openzeppelin-contracts.git"
-    local branch=master
+    local ref_type=branch
+    local ref="master"
     local config_file="hardhat.config.js"
 
     local compile_only_presets=(
@@ -54,7 +55,7 @@ function zeppelin_test
     print_optimizer_presets_or_exit "$selected_optimizer_presets"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$branch" "$DIR"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
 
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"

From b8b8fcb463e7e42f60e693462c8285975c33bef4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 10 Jan 2022 17:26:44 +0100
Subject: [PATCH 0267/1748] Switch the trident external test to and earlier,
 working revision

---
 test/externalTests/trident.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index 3c15c5ea13..6921d7a8a9 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -42,8 +42,8 @@ function test_fn {
 function trident_test
 {
     local repo="https://github.com/sushiswap/trident"
-    local ref_type=branch
-    local ref="master"
+    local ref_type=commit
+    local ref="0cab5ae884cc9a41223d52791be775c3a053cb26" # master as of 2021-12-16
     local config_file="hardhat.config.ts"
     local config_var=config
 

From f5ff358addc224c598a275e134ac1d129c4edd65 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 10 Jan 2022 19:30:26 +0100
Subject: [PATCH 0268/1748] Adds missing accepts to ImportDirective's
 SymbolAlias::symbol

---
 libsolidity/analysis/NameAndTypeResolver.cpp |  3 ++-
 libsolidity/ast/AST_accept.h                 | 10 ++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index 74834a0cb7..968aa744cc 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -571,7 +571,8 @@ bool DeclarationRegistrationHelper::visit(ImportDirective& _import)
 	if (!m_scopes[importee])
 		m_scopes[importee] = make_shared<DeclarationContainer>(nullptr, m_scopes[nullptr].get());
 	m_scopes[&_import] = m_scopes[importee];
-	return ASTVisitor::visit(_import);
+	ASTVisitor::visit(_import);
+	return false; // Do not recurse into child nodes (Identifier for symbolAliases)
 }
 
 bool DeclarationRegistrationHelper::visit(ContractDefinition& _contract)
diff --git a/libsolidity/ast/AST_accept.h b/libsolidity/ast/AST_accept.h
index 14ebfe6214..fa42c2dc68 100644
--- a/libsolidity/ast/AST_accept.h
+++ b/libsolidity/ast/AST_accept.h
@@ -58,13 +58,19 @@ void PragmaDirective::accept(ASTConstVisitor& _visitor) const
 
 void ImportDirective::accept(ASTVisitor& _visitor)
 {
-	_visitor.visit(*this);
+	if (_visitor.visit(*this))
+		for (SymbolAlias const& symbolAlias: symbolAliases())
+			if (symbolAlias.symbol)
+				symbolAlias.symbol->accept(_visitor);
 	_visitor.endVisit(*this);
 }
 
 void ImportDirective::accept(ASTConstVisitor& _visitor) const
 {
-	_visitor.visit(*this);
+	if (_visitor.visit(*this))
+		for (SymbolAlias const& symbolAlias: symbolAliases())
+			if (symbolAlias.symbol)
+				symbolAlias.symbol->accept(_visitor);
 	_visitor.endVisit(*this);
 }
 

From 823f0da3ee2d3e24975cdb00d67929ac0307a15d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 10 Jan 2022 21:28:32 +0100
Subject: [PATCH 0269/1748] trident: Update to match changes done to other
 external tests in the preset selection PR

---
 test/externalTests/trident.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index 6921d7a8a9..d82b0a7079 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -58,9 +58,8 @@ function trident_test
         legacy-optimize-evm+yul
     )
 
-    local selected_optimizer_presets
-    selected_optimizer_presets=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_optimizer_presets_or_exit "$selected_optimizer_presets"
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$ref_type" "$ref" "$DIR"
@@ -71,7 +70,7 @@ function trident_test
 
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$selected_optimizer_presets")" "$config_var"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
     yarn install
 
     replace_version_pragmas
@@ -89,7 +88,7 @@ function trident_test
     # version check. It's not used by tests so we can remove it.
     rm -r node_modules/@sushiswap/core/
 
-    for preset in $selected_optimizer_presets; do
+    for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
     done
 }

From 7142bfa548f650d3b018092fb826168dfafd177b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 10 Jan 2022 21:11:50 +0100
Subject: [PATCH 0270/1748] trident: Sort test suites to make the order the
 same in CI and locally

---
 test/externalTests/trident.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index d82b0a7079..c244efd093 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -35,7 +35,7 @@ function test_fn {
     TS_NODE_TRANSPILE_ONLY=1 npx hardhat test --no-compile $(
         # TODO: We need to skip Migration.test.ts because it fails and makes other tests fail too.
         # Replace this with `yarn test` once https://github.com/sushiswap/trident/issues/283 is fixed.
-        find test/ -name "*.test.ts" ! -path "test/Migration.test.ts"
+        find test/ -name "*.test.ts" ! -path "test/Migration.test.ts" | LC_ALL=C sort
     )
 }
 

From cc49eeda3fbbf2886b8ff2f58ed44aed390450e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 10 Jan 2022 21:12:37 +0100
Subject: [PATCH 0271/1748] trident: Note explaining the hard-coded commit

---
 test/externalTests/trident.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index c244efd093..26c3d38104 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -43,6 +43,7 @@ function trident_test
 {
     local repo="https://github.com/sushiswap/trident"
     local ref_type=commit
+    # FIXME: Switch back to master branch when https://github.com/sushiswap/trident/issues/303 gets fixed.
     local ref="0cab5ae884cc9a41223d52791be775c3a053cb26" # master as of 2021-12-16
     local config_file="hardhat.config.ts"
     local config_var=config

From 9f171c0f06975a6852c8afac8361bb5a976c8d51 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 12 Jan 2022 14:46:30 +0100
Subject: [PATCH 0272/1748] update smtchecker tests for new z3

---
 .circleci/config.yml                             | 16 ++++++++--------
 .circleci/osx_install_dependencies.sh            |  2 +-
 CMakeLists.txt                                   |  2 +-
 scripts/build_emscripten.sh                      |  4 ++--
 .../blockchain_state/balance_receive_2.sol       |  2 +-
 .../balance_receive_ext_calls_2.sol              |  2 +-
 .../branches_in_modifiers_2.sol                  |  2 +-
 .../external_calls/call_with_value_1.sol         |  2 +-
 .../external_call_from_constructor_3.sol         |  2 +-
 .../external_call_with_value_2.sol               |  2 +-
 .../external_hash_known_code_state.sol           |  2 +-
 ...hash_known_code_state_reentrancy_indirect.sol |  4 +++-
 .../external_calls/external_reentrancy_2.sol     |  4 +++-
 .../functions/functions_external_2.sol           |  2 +-
 .../virtual_function_called_by_constructor.sol   |  2 +-
 .../assignment_contract_member_variable.sol      |  2 +-
 .../operators/compound_add_array_index.sol       |  2 +-
 .../operators/conditional_assignment_6.sol       |  2 +-
 .../special/tx_vars_reentrancy_1.sol             |  2 +-
 .../special/tx_vars_reentrancy_2.sol             |  4 +++-
 .../try_catch/try_public_var_mapping.sol         |  2 +-
 .../types/address_transfer_insufficient.sol      |  2 +-
 .../types/mapping_equal_keys_2.sol               |  2 +-
 .../types/static_array_length_1.sol              |  2 +-
 .../struct_aliasing_parameter_storage_2.sol      |  2 +-
 .../struct_aliasing_parameter_storage_3.sol      |  2 +-
 .../smtCheckerTests/userTypes/fixedpoint.sol     |  2 +-
 27 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b1fbbdb0c..56a4af30a4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,20 +9,20 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-9
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:3d8a912e8e78e98cd217955d06d98608ad60adc67728d4c3a569991235fa1abb"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-10
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e61939751ff9777307857361f712b581bfc8a8aaae75fab7b50febc764710587"
   ubuntu-2004-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-9
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:a1ba002cae17279d1396a898b04e4e9c45602ad881295db3e2f484a7e24f6f43"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-10
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0de8c68f084120b2a165406e3a0c2aab58b32f5b7182c2322245245f1d243b8d"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-14
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:f353823cce2f6cd2f9f1459d86cd76fdfc551a0261d87626615ea6c1d8f90587"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-15
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:87f1a57586eec194a6217ab624efc69d3d9af2f7ac8ca36497ad57488c2f08ae"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-8
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:842d6074e0e7e5355c89122c1cafc1fdb59696596750e7d56e5f35c0d883ad59"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-9
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d51534dfdd05ece86f69ed7beafd68c15b88606da00a4b7fe2873ccfbd0dce24"
   evm-version:
     type: string
     default: london
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 36d3367746..9e8d14963b 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -61,7 +61,7 @@ then
   ./scripts/install_obsolete_jsoncpp_1_7_4.sh
 
   # z3
-  z3_version="4.8.13"
+  z3_version="4.8.14"
   z3_dir="z3-${z3_version}-x64-osx-10.16"
   z3_package="${z3_dir}.zip"
   wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3a03d94e8..99d7659809 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/licens
 
 include(EthOptions)
 configure_project(TESTS)
-set(LATEST_Z3_VERSION "4.8.13")
+set(LATEST_Z3_VERSION "4.8.14")
 set(MINIMUM_Z3_VERSION "4.8.0")
 find_package(Z3)
 if (${Z3_FOUND})
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index f6c9151ebf..16e9078f32 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -34,7 +34,7 @@ else
     BUILD_DIR="$1"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-8
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-9
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:842d6074e0e7e5355c89122c1cafc1fdb59696596750e7d56e5f35c0d883ad59 \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:d51534dfdd05ece86f69ed7beafd68c15b88606da00a4b7fe2873ccfbd0dce24\
     ./scripts/ci/build_emscripten.sh "$BUILD_DIR"
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
index c4714e2e3b..bbf91ade44 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
@@ -16,5 +16,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 4984: (266-272): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639926, once = true\n\nTransaction trace:\nC.constructor(){ msg.value: 28100 }\nState: x = 115792089237316195423570985008687907853269984665640564039457584007913129639926, once = false\nC.f(){ msg.value: 8 }
-// Warning 6328: (235-273): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, once = true\n\nTransaction trace:\nC.constructor(){ msg.value: 0 }\nState: x = 0, once = false\nC.f(){ msg.value: 8 }
+// Warning 6328: (235-273): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, once = true\n\nTransaction trace:\nC.constructor(){ msg.value: 0 }\nState: x = 0, once = false\nC.f(){ msg.value: 2 }
 // Info 1180: Contract invariant(s) for :C:\nonce\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
index c53f156d63..28c4734bd4 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
@@ -12,4 +12,4 @@ contract C {
 // ----
 // Warning 9302: (82-93): Return value of low-level calls not used.
 // Warning 6328: (97-131): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n(!(<errorCode> >= 2) && (((:var 1).balances[address(this)] + ((- 1) * (:var 0).balances[address(this)])) <= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
+// Info 1180: Reentrancy property(ies) for :C:\n((((:var 1).balances[address(this)] + ((- 1) * (:var 0).balances[address(this)])) <= 0) && !(<errorCode> >= 2))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
index f08a26bf70..98b551c17e 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
@@ -45,5 +45,5 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.test()\n    C.reset_if_overflow() -- internal call
-// Warning 6328: (502-519): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\noldx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(1)\nState: x = 1\nC.test()\n    C.reset_if_overflow() -- internal call
+// Warning 6328: (502-519): CHC: Assertion violation happens here.
 // Warning 6328: (615-629): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(10)\nState: x = 10\nC.test()\n    C.reset_if_overflow() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
index f9293f6930..813185adf4 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
@@ -12,5 +12,5 @@ contract C {
 // ----
 // Warning 9302: (96-117): Return value of low-level calls not used.
 // Warning 6328: (121-156): CHC: Assertion violation might happen here.
-// Warning 6328: (175-211): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0x0\n\nTransaction trace:\nC.constructor()\nC.g(0x0)\n    i.call{value: 10}("") -- untrusted external call
+// Warning 6328: (175-211): CHC: Assertion violation happens here.
 // Warning 4661: (121-156): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
index 9d27d6d3b4..eb5cd97ddd 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
@@ -20,4 +20,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (69-85): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
-// Warning 6328: (203-217): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 0\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 0\nC.f()
+// Warning 6328: (203-217): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 3\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 3\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
index f6c8338583..4b51d9d9e2 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
@@ -14,5 +14,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (150-186): CHC: Assertion violation might happen here.
-// Warning 6328: (205-240): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    i.f{value: 0}() -- untrusted external call
+// Warning 6328: (205-240): CHC: Assertion violation happens here.
 // Warning 4661: (150-186): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
index 2468a1a72d..317400e1d1 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
@@ -36,4 +36,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (495-532): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n(((owner + ((- 1) * owner')) <= 0) && !(<errorCode> = 1) && ((owner + ((- 1) * owner')) >= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(owner == address(0) || y != z)\n
+// Info 1180: Reentrancy property(ies) for :C:\n(((owner + ((- 1) * owner')) >= 0) && !(<errorCode> = 1) && ((owner + ((- 1) * owner')) <= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(owner == address(0) || y != z)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
index 4ab3f21e68..1fcda01b0a 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
@@ -43,5 +43,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
+// Warning 1218: (437-463): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (419-433): CHC: Assertion violation happens here.
-// Warning 6328: (437-463): CHC: Assertion violation happens here.
+// Warning 6328: (437-463): CHC: Assertion violation might happen here.
+// Warning 4661: (437-463): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
index 19ff2bbad8..1e8ce8816a 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
@@ -13,4 +13,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (117-131): CHC: Assertion violation happens here.\nCounterexample:\nlocked = false\ntarget = 0x0\n\nTransaction trace:\nC.constructor()\nState: locked = true\nC.call(0x0)\n    D(target).e() -- untrusted external call, synthesized as:\n        C.call(0x0) -- reentrant call
+// Warning 1218: (117-131): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (117-131): CHC: Assertion violation might happen here.
+// Warning 4661: (117-131): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
index c2f55fa981..5efcb2da1b 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
@@ -25,4 +25,4 @@ contract C
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (234-253): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!((map[1] + ((- 1) * map[0])) >= 0) || ((map'[0] + ((- 1) * map'[1])) <= 0)) && (((map'[1] + ((- 1) * map'[0])) <= 0) || !((map[1] + ((- 1) * map[0])) <= 0)) && !(<errorCode> = 2))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!((map[1] + ((- 1) * map[0])) <= 0) || ((map'[1] + ((- 1) * map'[0])) <= 0)) && !(<errorCode> = 2) && (!((map[1] + ((- 1) * map[0])) >= 0) || ((map'[0] + ((- 1) * map'[1])) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
index e30a5e7438..0117f9b49d 100644
--- a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
@@ -27,4 +27,4 @@ contract C is A {
 // ----
 // Warning 6328: (199-214): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nA.constructor()\nState: x = 2\nA.i()
 // Warning 6328: (387-401): CHC: Assertion violation happens here.\nCounterexample:\nx = 10\n\nTransaction trace:\nC.constructor()\nState: x = 10\nC.i()
-// Info 1180: Contract invariant(s) for :A:\n(!(x <= 1) && !(x >= 3))\nContract invariant(s) for :C:\n(!(x <= 9) && !(x >= 11))\n
+// Info 1180: Contract invariant(s) for :A:\n(!(x <= 1) && !(x >= 3))\nContract invariant(s) for :C:\n(!(x >= 11) && !(x <= 9))\n
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
index 284f9bcbd5..7a1deafe0d 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
@@ -29,4 +29,4 @@ contract A {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (392-408): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :A:\n(((x = (- 2)) && (y = (- 2))) || ((x = 0) && (y = 0)))\n(((x = 0) && (y = 0)) || ((x = (- 2)) && (y = (- 2))))\n
+// Info 1180: Contract invariant(s) for :A:\n(((x = (- 2)) && (y = (- 2))) || ((x = 0) && (y = 0)))\n
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
index 1c6e205d3f..4186f39fec 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
@@ -20,4 +20,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (262-284): CHC: Assertion violation happens here.\nCounterexample:\narray = [299, 0]\nx = 99\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0]\nC.f(99, 0)
+// Warning 6328: (262-284): CHC: Assertion violation happens here.\nCounterexample:\narray = [200, 0]\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0]\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
index 923147d495..b26fcbd93c 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
@@ -25,4 +25,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 2072: (255-261): Unused local variable.
-// Info 1180: Reentrancy property(ies) for :C:\n((!(x <= 2) || !(x' >= 3)) && (<errorCode> <= 0) && (!(x' <= 0) || !(x >= 2)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
+// Info 1180: Reentrancy property(ies) for :C:\n((!(x' >= 3) || (a' = a)) && (<errorCode> <= 0) && (!(x' <= 0) || !(x >= 2)) && (!(x <= 2) || !(x' >= 3)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
index 175b684109..7729cebb9a 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
@@ -13,4 +13,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 2997\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 2803 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 32278 } -- reentrant call\n            _i.f() -- untrusted external call
+// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 2997\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 2803 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 2446 } -- reentrant call\n            _i.f() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
index 81de958b34..e704cfd71e 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
@@ -13,4 +13,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (157-191): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 101\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 83 }\n    _i.f{ value: 100 }() -- untrusted external call
+// Warning 1218: (157-191): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (157-191): CHC: Assertion violation might happen here.
+// Warning 4661: (157-191): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
index 2caae5e164..0854dedd17 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
@@ -21,5 +21,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (280-300): CHC: Assertion violation happens here.
+// Warning 6328: (280-300): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n(!(m[0][1] >= 43) && !(m[0][1] <= 41))\n
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
index 4b55c3241b..2fcdda1751 100644
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
@@ -11,6 +11,6 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (180-204): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x2297\nb = 0x2297\n\nTransaction trace:\nC.constructor()\nC.f(0x2297, 0x2297)
+// Warning 6328: (180-204): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x52f6\nb = 0x52f6\n\nTransaction trace:\nC.constructor()\nC.f(0x52f6, 0x52f6)
 // Warning 1236: (101-116): BMC: Insufficient funds happens here.
 // Warning 1236: (120-136): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
index 0290d31e18..37e2e4c130 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
@@ -9,4 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (86-100): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 1\n\nTransaction trace:\nC.constructor()\nC.f(0, 1)
+// Warning 6328: (86-100): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(1, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
index e8b6f1a32f..72bed0f4e2 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
@@ -9,4 +9,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (102-122): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x09, 0x09]\n\nTransaction trace:\nC.constructor()\nC.f([0x09, 0x09])
-// Warning 6328: (141-161): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x09, 0x09]\n\nTransaction trace:\nC.constructor()\nC.f([0x09, 0x09])
+// Warning 6328: (141-161): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0a, 0x0a]\n\nTransaction trace:\nC.constructor()\nC.f([0x0a, 0x0a])
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
index 9d4623ae09..6982623821 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (289-322): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 10}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 10}\nC.g(){ msg.sender: 0x0985 }
+// Warning 6328: (289-322): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 11}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 11}\nC.g(){ msg.sender: 0x0985 }
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
index 8779cd0959..fcf30555e9 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
@@ -26,4 +26,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (307-327): CHC: Assertion violation happens here.\nCounterexample:\nt = {x: 10, s: {innerM, sum: 21239}}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: t = {x: 10, s: {innerM, sum: 21239}}\nC.g()
+// Warning 6328: (307-327): CHC: Assertion violation happens here.\nCounterexample:\nt = {x: 11, s: {innerM, sum: 21239}}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: t = {x: 11, s: {innerM, sum: 21239}}\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol b/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
index a8aa0bd9a7..0a479c4acd 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
@@ -69,6 +69,6 @@ contract TestFixedMath {
 // SMTEngine: all
 // ----
 // Warning 6328: (1886-1970): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTestFixedMath.constructor()\nTestFixedMath.f()\n    TestFixedMath.add(0, 0) -- internal call\n        FixedMath.add(0, 0) -- internal call\n    TestFixedMath.add(25, 45) -- internal call\n        FixedMath.add(25, 45) -- internal call\n    TestFixedMath.add(25, 45) -- internal call\n        FixedMath.add(25, 45) -- internal call
-// Warning 6328: (2165-2266): CHC: Assertion violation happens here.
+// Warning 6328: (2165-2266): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTestFixedMath.constructor()\nTestFixedMath.g()\n    TestFixedMath.mul(340282366920938463463374607431768211456, 20) -- internal call\n        FixedMath.mul(340282366920938463463374607431768211456, 20) -- internal call\n    TestFixedMath.mul(340282366920938463463374607431768211456, 20) -- internal call\n        FixedMath.mul(340282366920938463463374607431768211456, 20) -- internal call
 // Warning 6328: (2675-2791): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTestFixedMath.constructor()\nTestFixedMath.h()\n    TestFixedMath.floor(11579208923731619542357098500868790785326998665640564039457584007913129639930) -- internal call\n        FixedMath.floor(11579208923731619542357098500868790785326998665640564039457584007913129639930) -- internal call\n    TestFixedMath.floor(115792089237316195423570985008687907853269984665640564039457584007913129639935) -- internal call\n        FixedMath.floor(115792089237316195423570985008687907853269984665640564039457584007913129639935) -- internal call\n    TestFixedMath.floor(11579208923731619542357098500868790785326998665640564039457584007913129639930) -- internal call\n        FixedMath.floor(11579208923731619542357098500868790785326998665640564039457584007913129639930) -- internal call
 // Warning 6328: (3161-3212): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTestFixedMath.constructor()\nTestFixedMath.i()\n    TestFixedMath.toUFixed256x18(0) -- internal call\n        FixedMath.toUFixed256x18(0) -- internal call\n    TestFixedMath.toUFixed256x18(5) -- internal call\n        FixedMath.toUFixed256x18(5) -- internal call\n    TestFixedMath.toUFixed256x18(115792089237316195423570985008687907853269984665640564039457) -- internal call\n        FixedMath.toUFixed256x18(115792089237316195423570985008687907853269984665640564039457) -- internal call\n    TestFixedMath.toUFixed256x18(5) -- internal call\n        FixedMath.toUFixed256x18(5) -- internal call

From b49f486cf6d6dfb19dfaee0dea1cad58930534f7 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 12 Jan 2022 17:38:47 +0100
Subject: [PATCH 0273/1748] Update osx z3 archive hash.

---
 .circleci/osx_install_dependencies.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 9e8d14963b..cd0637eac9 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -65,7 +65,7 @@ then
   z3_dir="z3-${z3_version}-x64-osx-10.16"
   z3_package="${z3_dir}.zip"
   wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
-  validate_checksum "$z3_package" 191b26be2b617b2dffffce139d77abcd7e584859efbc10a58d01a1d7830697a4
+  validate_checksum "$z3_package" 1341671670e0c4e72da80815128a68975ee90816d50ceaf6bd820f06babe2cfd
   unzip "$z3_package"
   rm "$z3_package"
   cp "${z3_dir}/bin/libz3.a" /usr/local/lib

From 1655626e0a0704aee0351b1a9bf700941b8be244 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 12 Jan 2022 17:58:05 +0100
Subject: [PATCH 0274/1748] Remove counterexample from test.

---
 .../libsolidity/smtCheckerTests/userTypes/fixedpoint.sol | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol b/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
index 0a479c4acd..4bff3a4984 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
@@ -67,8 +67,9 @@ contract TestFixedMath {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (1886-1970): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTestFixedMath.constructor()\nTestFixedMath.f()\n    TestFixedMath.add(0, 0) -- internal call\n        FixedMath.add(0, 0) -- internal call\n    TestFixedMath.add(25, 45) -- internal call\n        FixedMath.add(25, 45) -- internal call\n    TestFixedMath.add(25, 45) -- internal call\n        FixedMath.add(25, 45) -- internal call
-// Warning 6328: (2165-2266): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTestFixedMath.constructor()\nTestFixedMath.g()\n    TestFixedMath.mul(340282366920938463463374607431768211456, 20) -- internal call\n        FixedMath.mul(340282366920938463463374607431768211456, 20) -- internal call\n    TestFixedMath.mul(340282366920938463463374607431768211456, 20) -- internal call\n        FixedMath.mul(340282366920938463463374607431768211456, 20) -- internal call
-// Warning 6328: (2675-2791): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTestFixedMath.constructor()\nTestFixedMath.h()\n    TestFixedMath.floor(11579208923731619542357098500868790785326998665640564039457584007913129639930) -- internal call\n        FixedMath.floor(11579208923731619542357098500868790785326998665640564039457584007913129639930) -- internal call\n    TestFixedMath.floor(115792089237316195423570985008687907853269984665640564039457584007913129639935) -- internal call\n        FixedMath.floor(115792089237316195423570985008687907853269984665640564039457584007913129639935) -- internal call\n    TestFixedMath.floor(11579208923731619542357098500868790785326998665640564039457584007913129639930) -- internal call\n        FixedMath.floor(11579208923731619542357098500868790785326998665640564039457584007913129639930) -- internal call
-// Warning 6328: (3161-3212): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nTestFixedMath.constructor()\nTestFixedMath.i()\n    TestFixedMath.toUFixed256x18(0) -- internal call\n        FixedMath.toUFixed256x18(0) -- internal call\n    TestFixedMath.toUFixed256x18(5) -- internal call\n        FixedMath.toUFixed256x18(5) -- internal call\n    TestFixedMath.toUFixed256x18(115792089237316195423570985008687907853269984665640564039457) -- internal call\n        FixedMath.toUFixed256x18(115792089237316195423570985008687907853269984665640564039457) -- internal call\n    TestFixedMath.toUFixed256x18(5) -- internal call\n        FixedMath.toUFixed256x18(5) -- internal call
+// Warning 6328: (1886-1970): CHC: Assertion violation happens here.
+// Warning 6328: (2165-2266): CHC: Assertion violation happens here.
+// Warning 6328: (2675-2791): CHC: Assertion violation happens here.
+// Warning 6328: (3161-3212): CHC: Assertion violation happens here.

From 098a3cb537db94869157905f5f0af7f4e2558460 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 12 Jan 2022 18:42:40 +0100
Subject: [PATCH 0275/1748] adjust tests for nondeterminism

---
 .../smtCheckerTests/blockchain_state/balance_receive_2.sol   | 5 +++--
 .../blockchain_state/balance_receive_ext_calls_2.sol         | 2 +-
 .../smtCheckerTests/external_calls/call_mutex_unsafe.sol     | 3 ++-
 .../external_calls/external_call_with_value_2.sol            | 1 +
 .../external_hash_known_code_state_reentrancy_3.sol          | 3 +--
 .../external_hash_known_code_state_reentrancy_indirect.sol   | 1 +
 test/libsolidity/smtCheckerTests/file_level/import.sol       | 5 +++--
 .../operators/assignment_contract_member_variable.sol        | 2 +-
 .../smtCheckerTests/types/address_transfer_insufficient.sol  | 3 ++-
 .../smtCheckerTests/types/mapping_equal_keys_2.sol           | 3 ++-
 .../smtCheckerTests/types/static_array_length_1.sol          | 5 +++--
 .../types/struct/struct_aliasing_parameter_storage_4.sol     | 3 ++-
 12 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
index bbf91ade44..b611bc95f1 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
@@ -14,7 +14,8 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 4984: (266-272): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639926, once = true\n\nTransaction trace:\nC.constructor(){ msg.value: 28100 }\nState: x = 115792089237316195423570985008687907853269984665640564039457584007913129639926, once = false\nC.f(){ msg.value: 8 }
-// Warning 6328: (235-273): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, once = true\n\nTransaction trace:\nC.constructor(){ msg.value: 0 }\nState: x = 0, once = false\nC.f(){ msg.value: 2 }
+// Warning 4984: (266-272): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (235-273): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\nonce\n
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
index 28c4734bd4..a1eb278bc7 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
@@ -9,7 +9,7 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTIgnoreInv: yes
 // ----
 // Warning 9302: (82-93): Return value of low-level calls not used.
 // Warning 6328: (97-131): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n((((:var 1).balances[address(this)] + ((- 1) * (:var 0).balances[address(this)])) <= 0) && !(<errorCode> >= 2))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
index ad17e3d059..64494971a2 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
@@ -21,6 +21,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
 // Warning 9302: (212-228): Return value of low-level calls not used.
-// Warning 6328: (232-246): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, lock = false\n_a = 0x0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, lock = false\nC.f(0x0)\n    _a.call("aaaaa") -- untrusted external call, synthesized as:\n        C.set(1) -- reentrant call
+// Warning 6328: (232-246): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
index 4b51d9d9e2..2b94abc0e0 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_2.sol
@@ -12,6 +12,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
 // Warning 6328: (150-186): CHC: Assertion violation might happen here.
 // Warning 6328: (205-240): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
index 508047c39b..8372285ee7 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
@@ -40,5 +40,4 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// ----
-// Info 1180: Contract invariant(s) for :C:\n((insidef || (z <= 0)) && (y <= 0))\nReentrancy property(ies) for :C:\n((!insidef || !(<errorCode> >= 2)) && (insidef' || !insidef) && (!(y <= 0) || (y' <= 0)))\n((!insidef || !(<errorCode> >= 3)) && (insidef' || !insidef))\n<errorCode> = 0 -> no errors\n<errorCode> = 2 -> Assertion failed at assert(z == y)\n<errorCode> = 3 -> Assertion failed at assert(prevOwner == owner)\n
+// SMTIgnoreInv: yes
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
index 1fcda01b0a..ea9764e17b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
@@ -42,6 +42,7 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 1218: (437-463): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (419-433): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/file_level/import.sol b/test/libsolidity/smtCheckerTests/file_level/import.sol
index 85ae712930..7bc2a54451 100644
--- a/test/libsolidity/smtCheckerTests/file_level/import.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/import.sol
@@ -21,6 +21,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (B:238-252): CHC: Assertion violation happens here.\nCounterexample:\ndata = {x: 21238}\nx = 8\ny = 21238\n\nTransaction trace:\nC.constructor()\nState: data = {x: 0}\nC.g()\n    C.f(7) -- internal call\n        A:set({x: 0}, 7) -- internal call\n        A:set({x: 8}, 8) -- internal call
-// Warning 6328: (B:308-322): CHC: Assertion violation happens here.\nCounterexample:\ndata = {x: 6}\nx = 0\ny = 6\n\nTransaction trace:\nC.constructor()\nState: data = {x: 0}\nC.g()\n    C.f(7) -- internal call\n        A:set({x: 0}, 7) -- internal call\n        A:set({x: 0}, 8) -- internal call
+// Warning 6328: (B:238-252): CHC: Assertion violation happens here.
+// Warning 6328: (B:308-322): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
index 7a1deafe0d..efa29edc11 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
@@ -27,6 +27,6 @@ contract A {
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTIgnoreInv: yes
 // ----
 // Warning 6328: (392-408): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :A:\n(((x = (- 2)) && (y = (- 2))) || ((x = 0) && (y = 0)))\n
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
index 2fcdda1751..59568cb5be 100644
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_transfer_insufficient.sol
@@ -10,7 +10,8 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (180-204): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x52f6\nb = 0x52f6\n\nTransaction trace:\nC.constructor()\nC.f(0x52f6, 0x52f6)
+// Warning 6328: (180-204): CHC: Assertion violation happens here.
 // Warning 1236: (101-116): BMC: Insufficient funds happens here.
 // Warning 1236: (120-136): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
index 37e2e4c130..3b8a8846e5 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
@@ -8,5 +8,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (86-100): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(1, 0)
+// Warning 6328: (86-100): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
index 72bed0f4e2..61d18c4178 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
@@ -7,6 +7,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (102-122): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x09, 0x09]\n\nTransaction trace:\nC.constructor()\nC.f([0x09, 0x09])
-// Warning 6328: (141-161): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0a, 0x0a]\n\nTransaction trace:\nC.constructor()\nC.f([0x0a, 0x0a])
+// Warning 6328: (102-122): CHC: Assertion violation happens here.
+// Warning 6328: (141-161): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
index 957c72c120..618b1172d9 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
@@ -25,5 +25,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (305-325): CHC: Assertion violation happens here.\nCounterexample:\nt = {x: 10, s: {innerM, sum: 21239}}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: t = {x: 10, s: {innerM, sum: 21239}}\nC.g()
+// Warning 6328: (305-325): CHC: Assertion violation happens here.

From 38545e81c1d04a6619260570cf0d644f26bf2683 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 12 Jan 2022 13:09:49 +0100
Subject: [PATCH 0276/1748] Update docker images to Z3 4.8.14.

---
 scripts/deps-ppa/static_z3.sh                                 | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.emscripten           | 4 ++--
 .../docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004           | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang     | 2 +-
 scripts/release_ppa.sh                                        | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index 733f9bf3d8..353a8a8d98 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -25,9 +25,9 @@ set -ev
 keyid=70D110489D66E2F6
 email=builds@ethereum.org
 packagename=z3-static
-version=4.8.13
+version=4.8.14
 
-DISTRIBUTIONS="focal groovy hirsute impish"
+DISTRIBUTIONS="focal hirsute impish jammy"
 
 for distribution in $DISTRIBUTIONS
 do
diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 5f86b1e197..0d1d1a28e8 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -33,12 +33,12 @@
 # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
 # dependencies automatically.
 FROM emscripten/emsdk:2.0.33 AS base
-LABEL version="8"
+LABEL version="9"
 
 ADD emscripten.jam /usr/src
 RUN set -ex; \
 	cd /usr/src; \
-	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.13 --depth 1 ; \
+	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.14 --depth 1 ; \
 	cd z3; \
 	mkdir build; \
 	cd build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index 1d00eabce8..fb79ea946a 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="14"
+LABEL version="15"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -61,7 +61,7 @@ RUN set -ex; \
 
 # Z3
 RUN set -ex; \
-    git clone --depth 1 -b z3-4.8.13 https://github.com/Z3Prover/z3.git \
+    git clone --depth 1 -b z3-4.8.14 https://github.com/Z3Prover/z3.git \
     /usr/src/z3; \
     cd /usr/src/z3; \
     mkdir build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 8ed35d67e9..3ecf9143a5 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="9"
+LABEL version="10"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
index 0ac9d4abf8..d262fa5fa5 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="9"
+LABEL version="10"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 60e931083a..725649f804 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -57,7 +57,7 @@ packagename=solc
 
 static_build_distribution=hirsute
 
-DISTRIBUTIONS="focal hirsute impish"
+DISTRIBUTIONS="focal hirsute impish jammy"
 
 if is_release
 then

From 78f0be56c3ed7a6c60e39871cdca877644a67afc Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Thu, 13 Jan 2022 01:19:03 -0500
Subject: [PATCH 0277/1748] Document address members code and codehash

---
 docs/types/value-types.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 49e35d9eae..215a18ceec 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -329,6 +329,10 @@ on ``call``.
     regardless of whether state is read from or written to, as this can have many pitfalls.
     Also, access to gas might change in the future.
 
+* ``code`` and ``codehash``
+
+You can query the deployed code for any smart contract. Use ``code`` to get the EVM bytecode as a string, which might be empty. Use ``codehash`` get the Keccak-256 hash of that code.
+
 .. note::
     All contracts can be converted to ``address`` type, so it is possible to query the balance of the
     current contract using ``address(this).balance``.

From 2c4c8264e4428ff45cfd5f8f9b5458f1044ba8aa Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 12 Jan 2022 18:58:17 +0100
Subject: [PATCH 0278/1748] Fix wrong error with immutables when base contract
 c'tor uses return

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/ImmutableValidator.cpp   | 25 ++++++++++++-------
 libsolidity/analysis/ImmutableValidator.h     |  5 ++--
 .../base_ctor_return_no_immutables.sol        | 10 ++++++++
 4 files changed, 30 insertions(+), 11 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/immutable/base_ctor_return_no_immutables.sol

diff --git a/Changelog.md b/Changelog.md
index b83e083d03..bd492e4bfd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,7 @@ Compiler Features:
 
 Bugfixes:
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
+ * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the parent contract contains immutable variables.
 
 
 Solc-Js:
diff --git a/libsolidity/analysis/ImmutableValidator.cpp b/libsolidity/analysis/ImmutableValidator.cpp
index e28236fb68..485aa3fa24 100644
--- a/libsolidity/analysis/ImmutableValidator.cpp
+++ b/libsolidity/analysis/ImmutableValidator.cpp
@@ -29,7 +29,7 @@ void ImmutableValidator::analyze()
 {
 	m_inCreationContext = true;
 
-	auto linearizedContracts = m_currentContract.annotation().linearizedBaseContracts | ranges::views::reverse;
+	auto linearizedContracts = m_mostDerivedContract.annotation().linearizedBaseContracts | ranges::views::reverse;
 
 	for (ContractDefinition const* contract: linearizedContracts)
 		for (VariableDeclaration const* stateVar: contract->stateVariables())
@@ -62,7 +62,7 @@ void ImmutableValidator::analyze()
 			visitCallableIfNew(*modDef);
 	}
 
-	checkAllVariablesInitialized(m_currentContract.location());
+	checkAllVariablesInitialized(m_mostDerivedContract.location());
 }
 
 bool ImmutableValidator::visit(Assignment const& _assignment)
@@ -137,7 +137,7 @@ void ImmutableValidator::endVisit(IdentifierPath const& _identifierPath)
 	if (auto const callableDef = dynamic_cast<CallableDeclaration const*>(_identifierPath.annotation().referencedDeclaration))
 		visitCallableIfNew(
 			*_identifierPath.annotation().requiredLookup == VirtualLookup::Virtual ?
-			callableDef->resolveVirtual(m_currentContract) :
+			callableDef->resolveVirtual(m_mostDerivedContract) :
 			*callableDef
 		);
 
@@ -147,7 +147,7 @@ void ImmutableValidator::endVisit(IdentifierPath const& _identifierPath)
 void ImmutableValidator::endVisit(Identifier const& _identifier)
 {
 	if (auto const callableDef = dynamic_cast<CallableDeclaration const*>(_identifier.annotation().referencedDeclaration))
-		visitCallableIfNew(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual ? callableDef->resolveVirtual(m_currentContract) : *callableDef);
+		visitCallableIfNew(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual ? callableDef->resolveVirtual(m_mostDerivedContract) : *callableDef);
 	if (auto const varDecl = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration))
 		analyseVariableReference(*varDecl, _identifier);
 }
@@ -160,15 +160,18 @@ void ImmutableValidator::endVisit(Return const& _return)
 
 bool ImmutableValidator::analyseCallable(CallableDeclaration const& _callableDeclaration)
 {
-	FunctionDefinition const* prevConstructor = m_currentConstructor;
-	m_currentConstructor = nullptr;
+	ScopedSaveAndRestore constructorGuard{m_currentConstructor, {}};
+	ScopedSaveAndRestore constructorContractGuard{m_currentConstructorContract, {}};
 
 	if (FunctionDefinition const* funcDef = dynamic_cast<decltype(funcDef)>(&_callableDeclaration))
 	{
 		ASTNode::listAccept(funcDef->modifiers(), *this);
 
 		if (funcDef->isConstructor())
+		{
+			m_currentConstructorContract = funcDef->annotation().contract;
 			m_currentConstructor = funcDef;
+		}
 
 		if (funcDef->isImplemented())
 			funcDef->body().accept(*this);
@@ -177,8 +180,6 @@ bool ImmutableValidator::analyseCallable(CallableDeclaration const& _callableDec
 		if (modDef->isImplemented())
 			modDef->body().accept(*this);
 
-	m_currentConstructor = prevConstructor;
-
 	return false;
 }
 
@@ -253,7 +254,8 @@ void ImmutableValidator::analyseVariableReference(VariableDeclaration const& _va
 
 void ImmutableValidator::checkAllVariablesInitialized(solidity::langutil::SourceLocation const& _location)
 {
-	for (ContractDefinition const* contract: m_currentContract.annotation().linearizedBaseContracts)
+	for (ContractDefinition const* contract: m_mostDerivedContract.annotation().linearizedBaseContracts | ranges::views::reverse)
+	{
 		for (VariableDeclaration const* varDecl: contract->stateVariables())
 			if (varDecl->immutable())
 				if (!util::contains(m_initializedStateVariables, varDecl))
@@ -263,6 +265,11 @@ void ImmutableValidator::checkAllVariablesInitialized(solidity::langutil::Source
 						solidity::langutil::SecondarySourceLocation().append("Not initialized: ", varDecl->location()),
 						"Construction control flow ends without initializing all immutable state variables."
 					);
+
+		// Don't check further than the current c'tors contract
+		if (contract == m_currentConstructorContract)
+			break;
+	}
 }
 
 void ImmutableValidator::visitCallableIfNew(Declaration const& _declaration)
diff --git a/libsolidity/analysis/ImmutableValidator.h b/libsolidity/analysis/ImmutableValidator.h
index e6d837efe5..452e91d7c8 100644
--- a/libsolidity/analysis/ImmutableValidator.h
+++ b/libsolidity/analysis/ImmutableValidator.h
@@ -42,7 +42,7 @@ class ImmutableValidator: private ASTConstVisitor
 
 public:
 	ImmutableValidator(langutil::ErrorReporter& _errorReporter, ContractDefinition const& _contractDefinition):
-		m_currentContract(_contractDefinition),
+		m_mostDerivedContract(_contractDefinition),
 		m_errorReporter(_errorReporter)
 	{ }
 
@@ -66,7 +66,7 @@ class ImmutableValidator: private ASTConstVisitor
 
 	void visitCallableIfNew(Declaration const& _declaration);
 
-	ContractDefinition const& m_currentContract;
+	ContractDefinition const& m_mostDerivedContract;
 
 	CallableDeclarationSet m_visitedCallables;
 
@@ -74,6 +74,7 @@ class ImmutableValidator: private ASTConstVisitor
 	langutil::ErrorReporter& m_errorReporter;
 
 	FunctionDefinition const* m_currentConstructor = nullptr;
+	ContractDefinition const* m_currentConstructorContract = nullptr;
 	bool m_inLoop = false;
 	bool m_inBranch = false;
 	bool m_inCreationContext = true;
diff --git a/test/libsolidity/syntaxTests/immutable/base_ctor_return_no_immutables.sol b/test/libsolidity/syntaxTests/immutable/base_ctor_return_no_immutables.sol
new file mode 100644
index 0000000000..e6e668bc0a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/base_ctor_return_no_immutables.sol
@@ -0,0 +1,10 @@
+contract Parent {
+    constructor() {
+        return;
+    }
+}
+
+contract Child is Parent {
+    uint public immutable baked = 123;
+}
+

From f6ca4132b357fc43acb50d2122ab5f6ae7141457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 13 Jan 2022 18:05:45 +0100
Subject: [PATCH 0279/1748] ens: Remove global solc replacement (only necessary
 with Truffle)

---
 test/externalTests/ens.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 2a539f8fc9..d3fcb0b13d 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -56,7 +56,6 @@ function ens_test
 
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$ref_type" "$ref" "$DIR"
-    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     neutralize_package_lock
     neutralize_package_json_hooks

From f7a075bd48340eab881f900caf709d4c5e45e837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 13 Jan 2022 17:46:40 +0100
Subject: [PATCH 0280/1748] externalTests: Add
 force_hardhat_unlimited_contract_size

---
 test/externalTests/common.sh | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 91068d07d5..37bd8d74d5 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -227,6 +227,26 @@ function force_hardhat_compiler_binary
     hardhat_solc_build_subtask "$SOLCVERSION_SHORT" "$SOLCVERSION" "$binary_type" "$solc_path" "$language" >> "$config_file"
 }
 
+function force_hardhat_unlimited_contract_size
+{
+    local config_file="$1"
+    local config_var_name="$2"
+
+    printLog "Configuring Hardhat..."
+    echo "-------------------------------------"
+    echo "Allow unlimited contract size: true"
+    echo "-------------------------------------"
+
+    if [[ $config_file == *\.js ]]; then
+        [[ $config_var_name == "" ]] || assertFail
+        echo "module.exports.networks.hardhat.allowUnlimitedContractSize = true" >> "$config_file"
+    else
+        [[ $config_file == *\.ts ]] || assertFail
+        [[ $config_var_name != "" ]] || assertFail
+        echo "${config_var_name}.networks!.hardhat!.allowUnlimitedContractSize = true" >> "$config_file"
+    fi
+}
+
 function force_hardhat_compiler_settings
 {
     local config_file="$1"

From 054f1cb304cba5c20f4a4a2ef708bdead82a68b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 13 Jan 2022 17:47:00 +0100
Subject: [PATCH 0281/1748] External test for Euler

---
 .circleci/config.yml        |  7 ++++
 test/externalTests.sh       |  1 +
 test/externalTests/euler.sh | 74 +++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100755 test/externalTests/euler.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 56a4af30a4..cafe68b786 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1381,6 +1381,13 @@ workflows:
           binary_type: native
           # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
           nodejs_version: '16'
+      - t_ems_ext:
+          <<: *workflow_ubuntu2004_static
+          name: t_native_test_ext_euler
+          project: euler
+          binary_type: native
+          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+          nodejs_version: '16'
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 846cdf5153..67a5e24ade 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -43,3 +43,4 @@ printTask "Running external tests..."
 "$REPO_ROOT/externalTests/colony.sh" "$@"
 "$REPO_ROOT/externalTests/ens.sh" "$@"
 "$REPO_ROOT/externalTests/trident.sh" "$@"
+"$REPO_ROOT/externalTests/euler.sh" "$@"
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
new file mode 100755
index 0000000000..485d7ae56a
--- /dev/null
+++ b/test/externalTests/euler.sh
@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
+
+function compile_fn { npm run compile; }
+function test_fn { npx --no hardhat --no-compile test; }
+
+function euler_test
+{
+    local repo="https://github.com/euler-xyz/euler-contracts"
+    local ref_type=branch
+    local ref="master"
+    local config_file="hardhat.config.js"
+
+    local compile_only_presets=()
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var_utilisation_307 is 6 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_utilisation_307 is 6 slot(s) too deep inside the stack."
+        #ir-optimize-evm+yul      # Compilation fails with "YulException: Variable var_status_mpos is 3 too deep in the stack"
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+        legacy-no-optimize
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+
+    neutralize_package_lock
+    neutralize_package_json_hooks
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
+    force_hardhat_unlimited_contract_size "$config_file"
+    npm install
+
+    replace_version_pragmas
+    neutralize_packaged_contracts
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+    done
+}
+
+external_test Euler euler_test

From 4de1367ba771a9aebb5a165cea72f2048600b919 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 13 Jan 2022 18:44:17 +0100
Subject: [PATCH 0282/1748] External test for Yield Liquidator V2

---
 .circleci/config.yml                   |  7 +++
 test/externalTests.sh                  |  1 +
 test/externalTests/yield-liquidator.sh | 74 ++++++++++++++++++++++++++
 3 files changed, 82 insertions(+)
 create mode 100755 test/externalTests/yield-liquidator.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cafe68b786..b23a0db3de 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1388,6 +1388,13 @@ workflows:
           binary_type: native
           # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
           nodejs_version: '16'
+      - t_ems_ext:
+          <<: *workflow_ubuntu2004_static
+          name: t_native_test_ext_yield_liquidator
+          project: yield-liquidator
+          binary_type: native
+          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+          nodejs_version: '16'
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 67a5e24ade..3b2c0e5bbd 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -44,3 +44,4 @@ printTask "Running external tests..."
 "$REPO_ROOT/externalTests/ens.sh" "$@"
 "$REPO_ROOT/externalTests/trident.sh" "$@"
 "$REPO_ROOT/externalTests/euler.sh" "$@"
+"$REPO_ROOT/externalTests/yield-liquidator.sh" "$@"
diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
new file mode 100755
index 0000000000..6712941e74
--- /dev/null
+++ b/test/externalTests/yield-liquidator.sh
@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
+
+function compile_fn { npm run build; }
+function test_fn { npm run test; }
+
+function yield_liquidator_test
+{
+    local repo="https://github.com/yieldprotocol/yield-liquidator-v2"
+    local ref_type=branch
+    local ref="master"
+    local config_file="hardhat.config.ts"
+    local config_var="module.exports"
+
+    local compile_only_presets=()
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var_roles_168_mpos is 2 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var__33 is 6 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+        legacy-no-optimize
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+
+    neutralize_package_lock
+    neutralize_package_json_hooks
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
+    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
+    npm install
+
+    replace_version_pragmas
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+    done
+}
+
+external_test Yield-Liquidator-V2 yield_liquidator_test

From 91f51b76c622df691be7251179ac1d97b5f9f74b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 14 Jan 2022 22:30:55 +0100
Subject: [PATCH 0283/1748] CI: Use 'large' resource class for macOS and use -j
 without spaces

---
 .circleci/config.yml | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cafe68b786..e046caeb56 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -358,7 +358,15 @@ defaults:
         xcode: "13.2.0"
       environment:
         TERM: xterm
-        MAKEFLAGS: -j 5
+        MAKEFLAGS: -j5
+
+  - base_osx_large: &base_osx_large
+      macos:
+        xcode: "13.2.0"
+      resource_class: large
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j10
 
   - base_ems_large: &base_ems_large
       docker:
@@ -794,11 +802,11 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_osx:
-    <<: *base_osx
+    <<: *base_osx_large
     environment:
       TERM: xterm
       CMAKE_BUILD_TYPE: Release
-      MAKEFLAGS: -j 5
+      MAKEFLAGS: -j10
     steps:
       - checkout
       - restore_cache:

From 1af0ce0f260b515f4def20ada0f6606b211cb852 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 13 Jan 2022 23:07:35 +0100
Subject: [PATCH 0284/1748] External test for Bleeps

---
 .circleci/config.yml         |  8 ++++
 test/externalTests.sh        |  1 +
 test/externalTests/bleeps.sh | 84 ++++++++++++++++++++++++++++++++++++
 3 files changed, 93 insertions(+)
 create mode 100755 test/externalTests/bleeps.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ca2a8fed13..ad19100a3f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1403,6 +1403,14 @@ workflows:
           binary_type: native
           # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
           nodejs_version: '16'
+      - t_ems_ext:
+          <<: *workflow_ubuntu2004_static
+          name: t_native_test_ext_bleeps
+          project: bleeps
+          binary_type: native
+          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+          nodejs_version: '16'
+          resource_class: medium
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 3b2c0e5bbd..4968f52135 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -45,3 +45,4 @@ printTask "Running external tests..."
 "$REPO_ROOT/externalTests/trident.sh" "$@"
 "$REPO_ROOT/externalTests/euler.sh" "$@"
 "$REPO_ROOT/externalTests/yield-liquidator.sh" "$@"
+"$REPO_ROOT/externalTests/bleeps.sh" "$@"
diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
new file mode 100755
index 0000000000..df0e5e39e0
--- /dev/null
+++ b/test/externalTests/bleeps.sh
@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+
+function compile_fn { npm run compile; }
+function test_fn { npm run test; }
+
+function bleeps_test
+{
+    local repo="https://github.com/wighawag/bleeps"
+    local ref_type=tag
+    local ref=bleeps_migrations # TODO: There's a 0.4.19 contract in 'main' that would need patching for the latest compiler.
+    local config_file="hardhat.config.ts"
+    local config_var=config
+
+    local compile_only_presets=()
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize            # Compilation fails with: "YulException: Variable param_0 is 2 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only      # Compilation fails with: "YulException: Variable param_0 is 2 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul
+        #legacy-no-optimize        # Compilation fails with: "CompilerError: Stack too deep, try removing local variables."
+        #legacy-optimize-evm-only  # Compilation fails with: "CompilerError: Stack too deep, try removing local variables."
+        legacy-optimize-evm+yul
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+
+    pushd "common-lib/"
+    neutralize_package_json_hooks
+    npm install
+    npm run build
+    popd
+
+    pushd "contracts/"
+    sed -i 's|"bleeps-common": "workspace:\*",|"bleeps-common": "file:../common-lib/",|g' package.json
+
+    neutralize_package_lock
+    neutralize_package_json_hooks
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
+    npm install npm-run-all
+    npm install
+
+    replace_version_pragmas
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+    done
+
+    popd
+}
+
+external_test Bleeps bleeps_test

From 0004ad876451e28de1b3aa031ab56d08d2cdb3b1 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 12 Jan 2022 14:12:03 +0100
Subject: [PATCH 0285/1748] Fix ICE when a constant variable declaration
 forward references a struct

---
 Changelog.md                                   |  1 +
 .../analysis/DeclarationTypeChecker.cpp        | 18 ++++++++----------
 libsolidity/analysis/TypeChecker.cpp           |  9 ---------
 libsolidity/ast/Types.h                        |  6 +-----
 .../constantEvaluator/type_reference.sol       |  1 +
 .../type_reference_in_contract.sol             |  1 +
 .../syntaxTests/constants/mapping_constant.sol |  2 +-
 .../syntaxTests/constants/struct_constant.sol  |  2 +-
 .../const_struct_with_mapping.sol              |  2 +-
 .../105_constant_input_parameter.sol           |  1 +
 .../171_assignment_to_const_array_vars.sol     |  2 +-
 .../173_constant_struct.sol                    |  2 +-
 .../constant_forward_reference_struct.sol      |  4 ++++
 .../nameAndTypeResolution/constant_mapping.sol |  2 +-
 .../constant_nested_mapping.sol                |  2 +-
 .../parsing/location_specifiers_for_params.sol |  1 +
 16 files changed, 25 insertions(+), 31 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol

diff --git a/Changelog.md b/Changelog.md
index bd492e4bfd..92018a7714 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ Compiler Features:
 Bugfixes:
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
  * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the parent contract contains immutable variables.
+ * TypeChecker: Fix ICE when a constant variable declaration forward references a struct.
 
 
 Solc-Js:
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index 076155366b..7a4aa99427 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -437,16 +437,14 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 		type = TypeProvider::withLocation(ref, typeLoc, isPointer);
 	}
 
-	if (
-		_variable.isConstant() &&
-		!dynamic_cast<UserDefinedValueType const*>(type) &&
-		type->containsNestedMapping()
-	)
-		m_errorReporter.fatalDeclarationError(
-			3530_error,
-			_variable.location(),
-			"The type contains a (nested) mapping and therefore cannot be a constant."
-		);
+	if (_variable.isConstant() && !type->isValueType())
+	{
+		bool allowed = false;
+		if (auto arrayType = dynamic_cast<ArrayType const*>(type))
+			allowed = arrayType->isByteArray();
+		if (!allowed)
+			m_errorReporter.fatalTypeError(9259_error, _variable.location(), "Only constants of value type and byte array type are implemented.");
+	}
 
 	_variable.annotation().type = type;
 }
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 94f4b80da3..f3ba2884b7 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -530,15 +530,6 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
 	}
 	if (_variable.isConstant())
 	{
-		if (!varType->isValueType())
-		{
-			bool allowed = false;
-			if (auto arrayType = dynamic_cast<ArrayType const*>(varType))
-				allowed = arrayType->isByteArray();
-			if (!allowed)
-				m_errorReporter.fatalTypeError(9259_error, _variable.location(), "Constants of non-value type not yet implemented.");
-		}
-
 		if (!_variable.value())
 			m_errorReporter.typeError(4266_error, _variable.location(), "Uninitialized \"constant\" variable.");
 		else if (!*_variable.value()->annotation().isPure)
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 2f7e6005be..f15da58ab3 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1110,11 +1110,7 @@ class UserDefinedValueType: public Type
 	u256 storageSize() const override { return underlyingType().storageSize(); }
 	unsigned storageBytes() const override { return underlyingType().storageBytes(); }
 
-	bool isValueType() const override
-	{
-		solAssert(underlyingType().isValueType(), "");
-		return true;
-	}
+	bool isValueType() const override { return true; }
 	bool nameable() const override
 	{
 		solAssert(underlyingType().nameable(), "");
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol b/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
index 585c005f62..f10d015336 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
@@ -1,3 +1,4 @@
 int[L] constant L = 6;
 // ----
 // TypeError 5462: (4-5): Invalid array length, expected integer literal or constant expression.
+// TypeError 9259: (0-21): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol b/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
index 9073f6ac16..c95eab19d2 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
@@ -3,3 +3,4 @@ contract C {
 }
 // ----
 // TypeError 5462: (21-22): Invalid array length, expected integer literal or constant expression.
+// TypeError 9259: (17-38): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/constants/mapping_constant.sol b/test/libsolidity/syntaxTests/constants/mapping_constant.sol
index 4d80fb43e3..3ca53d35c1 100644
--- a/test/libsolidity/syntaxTests/constants/mapping_constant.sol
+++ b/test/libsolidity/syntaxTests/constants/mapping_constant.sol
@@ -1,3 +1,3 @@
 mapping(uint => uint) constant b = b;
 // ----
-// DeclarationError 3530: (0-36): The type contains a (nested) mapping and therefore cannot be a constant.
+// TypeError 9259: (0-36): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/constants/struct_constant.sol b/test/libsolidity/syntaxTests/constants/struct_constant.sol
index 8d750beb6a..fd9d90ff58 100644
--- a/test/libsolidity/syntaxTests/constants/struct_constant.sol
+++ b/test/libsolidity/syntaxTests/constants/struct_constant.sol
@@ -1,4 +1,4 @@
 struct S { uint x; }
 S constant s;
 // ----
-// TypeError 9259: (21-33): Constants of non-value type not yet implemented.
+// TypeError 9259: (21-33): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol b/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
index f8e0896c3f..79d0f93c6f 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
@@ -5,4 +5,4 @@ contract C {
     S public constant e = 0x1212121212121212121212121212121212121212;
 }
 // ----
-// DeclarationError 3530: (71-135): The type contains a (nested) mapping and therefore cannot be a constant.
+// TypeError 9259: (71-135): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
index aaf6f620a6..9289e5dd89 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
@@ -3,3 +3,4 @@ contract test {
 }
 // ----
 // DeclarationError 1788: (31-55): The "constant" keyword can only be used for state variables or variables at file level.
+// TypeError 9259: (31-55): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
index 81b9eab8a7..db3539b7c8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
@@ -2,4 +2,4 @@ contract C {
     uint[3] constant x = [uint(1), 2, 3];
 }
 // ----
-// TypeError 9259: (17-53): Constants of non-value type not yet implemented.
+// TypeError 9259: (17-53): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
index d32dd2768f..24dab2fb2b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
@@ -3,4 +3,4 @@ contract C {
     S constant x = S(5, new uint[](4));
 }
 // ----
-// TypeError 9259: (52-86): Constants of non-value type not yet implemented.
+// TypeError 9259: (52-86): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol
new file mode 100644
index 0000000000..0c6281c959
--- /dev/null
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol
@@ -0,0 +1,4 @@
+S constant x;
+struct S { int y; }
+// ----
+// TypeError 9259: (0-12): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
index 7539a99cbe..b2670db794 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
@@ -2,4 +2,4 @@ contract C {
     mapping(uint => uint) constant x;
 }
 // ----
-// DeclarationError 3530: (17-49): The type contains a (nested) mapping and therefore cannot be a constant.
+// TypeError 9259: (17-49): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
index 81e6e6b152..dd5ae352c2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
@@ -5,4 +5,4 @@ contract C {
     S public constant c;
 }
 // ----
-// DeclarationError 3530: (71-90): The type contains a (nested) mapping and therefore cannot be a constant.
+// TypeError 9259: (71-90): Only constants of value type and byte arrays are implemented.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
index 7d3dd56405..866c7f427e 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
@@ -3,3 +3,4 @@ contract Foo {
 }
 // ----
 // DeclarationError 1788: (30-55): The "constant" keyword can only be used for state variables or variables at file level.
+// TypeError 9259: (30-55): Only constants of value type and byte arrays are implemented.

From 57d84c8bfb6cad75f13ddfe4a5aee4ed97300f51 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 12 Jan 2022 16:30:04 +0100
Subject: [PATCH 0286/1748] Fix genetic algorithms CI failure

---
 .../syntaxTests/constantEvaluator/type_reference.sol           | 2 +-
 .../constantEvaluator/type_reference_in_contract.sol           | 2 +-
 test/libsolidity/syntaxTests/constants/mapping_constant.sol    | 2 +-
 test/libsolidity/syntaxTests/constants/struct_constant.sol     | 2 +-
 .../iceRegressionTests/const_struct_with_mapping.sol           | 2 +-
 .../nameAndTypeResolution/105_constant_input_parameter.sol     | 2 +-
 .../171_assignment_to_const_array_vars.sol                     | 2 +-
 .../syntaxTests/nameAndTypeResolution/173_constant_struct.sol  | 2 +-
 .../constant_forward_reference_struct.sol                      | 2 +-
 .../syntaxTests/nameAndTypeResolution/constant_mapping.sol     | 2 +-
 .../nameAndTypeResolution/constant_nested_mapping.sol          | 2 +-
 .../syntaxTests/parsing/location_specifiers_for_params.sol     | 2 +-
 test/yulPhaser/GeneticAlgorithms.cpp                           | 3 +++
 13 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol b/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
index f10d015336..086d891512 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/type_reference.sol
@@ -1,4 +1,4 @@
 int[L] constant L = 6;
 // ----
 // TypeError 5462: (4-5): Invalid array length, expected integer literal or constant expression.
-// TypeError 9259: (0-21): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (0-21): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol b/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
index c95eab19d2..dfb81378b4 100644
--- a/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
+++ b/test/libsolidity/syntaxTests/constantEvaluator/type_reference_in_contract.sol
@@ -3,4 +3,4 @@ contract C {
 }
 // ----
 // TypeError 5462: (21-22): Invalid array length, expected integer literal or constant expression.
-// TypeError 9259: (17-38): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (17-38): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/constants/mapping_constant.sol b/test/libsolidity/syntaxTests/constants/mapping_constant.sol
index 3ca53d35c1..e6b5b124a9 100644
--- a/test/libsolidity/syntaxTests/constants/mapping_constant.sol
+++ b/test/libsolidity/syntaxTests/constants/mapping_constant.sol
@@ -1,3 +1,3 @@
 mapping(uint => uint) constant b = b;
 // ----
-// TypeError 9259: (0-36): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (0-36): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/constants/struct_constant.sol b/test/libsolidity/syntaxTests/constants/struct_constant.sol
index fd9d90ff58..9195dac0c8 100644
--- a/test/libsolidity/syntaxTests/constants/struct_constant.sol
+++ b/test/libsolidity/syntaxTests/constants/struct_constant.sol
@@ -1,4 +1,4 @@
 struct S { uint x; }
 S constant s;
 // ----
-// TypeError 9259: (21-33): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (21-33): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol b/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
index 79d0f93c6f..2983b0e71e 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/const_struct_with_mapping.sol
@@ -5,4 +5,4 @@ contract C {
     S public constant e = 0x1212121212121212121212121212121212121212;
 }
 // ----
-// TypeError 9259: (71-135): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (71-135): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
index 9289e5dd89..e2ef8518d2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/105_constant_input_parameter.sol
@@ -3,4 +3,4 @@ contract test {
 }
 // ----
 // DeclarationError 1788: (31-55): The "constant" keyword can only be used for state variables or variables at file level.
-// TypeError 9259: (31-55): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (31-55): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
index db3539b7c8..590cec5a30 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/171_assignment_to_const_array_vars.sol
@@ -2,4 +2,4 @@ contract C {
     uint[3] constant x = [uint(1), 2, 3];
 }
 // ----
-// TypeError 9259: (17-53): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (17-53): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
index 24dab2fb2b..6b5e7a13c2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/173_constant_struct.sol
@@ -3,4 +3,4 @@ contract C {
     S constant x = S(5, new uint[](4));
 }
 // ----
-// TypeError 9259: (52-86): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (52-86): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol
index 0c6281c959..d845e735ce 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_forward_reference_struct.sol
@@ -1,4 +1,4 @@
 S constant x;
 struct S { int y; }
 // ----
-// TypeError 9259: (0-12): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (0-12): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
index b2670db794..803cdad535 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_mapping.sol
@@ -2,4 +2,4 @@ contract C {
     mapping(uint => uint) constant x;
 }
 // ----
-// TypeError 9259: (17-49): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (17-49): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
index dd5ae352c2..2fed9d6311 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/constant_nested_mapping.sol
@@ -5,4 +5,4 @@ contract C {
     S public constant c;
 }
 // ----
-// TypeError 9259: (71-90): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (71-90): Only constants of value type and byte array type are implemented.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
index 866c7f427e..c5761a944e 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params.sol
@@ -3,4 +3,4 @@ contract Foo {
 }
 // ----
 // DeclarationError 1788: (30-55): The "constant" keyword can only be used for state variables or variables at file level.
-// TypeError 9259: (30-55): Only constants of value type and byte arrays are implemented.
+// TypeError 9259: (30-55): Only constants of value type and byte array type are implemented.
diff --git a/test/yulPhaser/GeneticAlgorithms.cpp b/test/yulPhaser/GeneticAlgorithms.cpp
index 16d5cc654b..29c9cfa2ec 100644
--- a/test/yulPhaser/GeneticAlgorithms.cpp
+++ b/test/yulPhaser/GeneticAlgorithms.cpp
@@ -217,6 +217,9 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_select_individuals_with_probability_
 {
 	constexpr double relativeTolerance = 0.1;
 	constexpr size_t populationSize = 1000;
+
+	SimulationRNG::reset(1);
+
 	assert(populationSize % 4 == 0 && "Choose a number divisible by 4 for this test");
 
 	auto population =

From 776c984cb03130a8ecbb5c45df2fabfa505e3162 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 13 Jan 2022 14:55:20 +0100
Subject: [PATCH 0287/1748] Adjust documentation for linux packages not
 maintained by us.

---
 docs/installing-solidity.rst | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index d3f9015a2b..438c1afa95 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -118,8 +118,17 @@ The nightly version can be installed using these commands:
     sudo apt-get update
     sudo apt-get install solc
 
-We are also releasing a `snap package <https://snapcraft.io/>`_, which is
-installable in all the `supported Linux distros <https://snapcraft.io/docs/core/install>`_. To
+Furthermore, some Linux distributions provide their own packages. These packages are not directly
+maintained by us, but usually kept up-to-date by the respective package maintainers.
+
+For example, Arch Linux has packages for the latest development version:
+
+.. code-block:: bash
+
+    pacman -S solidity
+
+There is also a `snap package <https://snapcraft.io/solc>`_, however, it is **currently unmaintained**.
+It is installable in all the `supported Linux distros <https://snapcraft.io/docs/core/install>`_. To
 install the latest stable version of solc:
 
 .. code-block:: bash
@@ -139,18 +148,6 @@ with the most recent changes, please use the following:
     but it comes with limitations, like accessing only the files in your ``/home`` and ``/media`` directories.
     For more information, go to `Demystifying Snap Confinement <https://snapcraft.io/blog/demystifying-snap-confinement>`_.
 
-Arch Linux also has packages, albeit limited to the latest development version:
-
-.. code-block:: bash
-
-    pacman -S solidity
-
-Gentoo Linux has an `Ethereum overlay <https://overlays.gentoo.org/#ethereum>`_ that contains a Solidity package.
-After the overlay is setup, ``solc`` can be installed in x86_64 architectures by:
-
-.. code-block:: bash
-
-    emerge dev-lang/solidity
 
 macOS Packages
 ==============

From 7c0a121e456b966826afe575929bad225aa0cb15 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Mon, 17 Jan 2022 17:09:14 +0100
Subject: [PATCH 0288/1748] Natspec: Fix ICE when overriding a struct getter
 with a Natspec-documented return value and the name in the struct is
 different.

---
 Changelog.md                               |  1 +
 libsolidity/analysis/DocStringAnalyser.cpp | 35 +++++++-------
 libsolidity/analysis/DocStringAnalyser.h   |  3 +-
 test/libsolidity/SolidityNatspecJSON.cpp   | 54 +++++++++++++++++++++-
 4 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 92018a7714..4723b10399 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ Compiler Features:
 Bugfixes:
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
  * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the parent contract contains immutable variables.
+ * Natspec: Fix ICE when overriding a struct getter with a Natspec-documented return value and the name in the struct is different.
  * TypeChecker: Fix ICE when a constant variable declaration forward references a struct.
 
 
diff --git a/libsolidity/analysis/DocStringAnalyser.cpp b/libsolidity/analysis/DocStringAnalyser.cpp
index 018c10f581..5cff34f2a0 100644
--- a/libsolidity/analysis/DocStringAnalyser.cpp
+++ b/libsolidity/analysis/DocStringAnalyser.cpp
@@ -25,6 +25,7 @@
 #include <libsolidity/analysis/DocStringAnalyser.h>
 
 #include <libsolidity/ast/AST.h>
+#include <libsolidity/ast/TypeProvider.h>
 #include <liblangutil/ErrorReporter.h>
 
 #include <boost/algorithm/string.hpp>
@@ -37,7 +38,7 @@ using namespace solidity::frontend;
 namespace
 {
 
-void copyMissingTags(set<CallableDeclaration const*> const& _baseFunctions, StructurallyDocumentedAnnotation& _target, CallableDeclaration const* _declaration = nullptr)
+void copyMissingTags(set<CallableDeclaration const*> const& _baseFunctions, StructurallyDocumentedAnnotation& _target, FunctionType const* _functionType = nullptr)
 {
 	// Only copy if there is exactly one direct base function.
 	if (_baseFunctions.size() != 1)
@@ -45,12 +46,6 @@ void copyMissingTags(set<CallableDeclaration const*> const& _baseFunctions, Stru
 
 	CallableDeclaration const& baseFunction = **_baseFunctions.begin();
 
-	auto hasReturnParameter = [](CallableDeclaration const& declaration, size_t _n)
-	{
-		return declaration.returnParameterList() &&
-			declaration.returnParameters().size() > _n;
-	};
-
 	auto& sourceDoc = dynamic_cast<StructurallyDocumentedAnnotation const&>(baseFunction.annotation());
 
 	for (auto it = sourceDoc.docTags.begin(); it != sourceDoc.docTags.end();)
@@ -70,21 +65,22 @@ void copyMissingTags(set<CallableDeclaration const*> const& _baseFunctions, Stru
 			DocTag content = it->second;
 
 			// Update the parameter name for @return tags
-			if (_declaration && tag == "return")
+			if (_functionType && tag == "return")
 			{
 				size_t docParaNameEndPos = content.content.find_first_of(" \t");
 				string const docParameterName = content.content.substr(0, docParaNameEndPos);
 
 				if (
-					hasReturnParameter(*_declaration, n) &&
-					docParameterName != _declaration->returnParameters().at(n)->name()
+					_functionType->returnParameterNames().size() > n &&
+					docParameterName != _functionType->returnParameterNames().at(n)
 				)
 				{
 					bool baseHasNoName =
-						hasReturnParameter(baseFunction, n) &&
+						baseFunction.returnParameterList() &&
+						baseFunction.returnParameters().size() > n &&
 						baseFunction.returnParameters().at(n)->name().empty();
 
-					string paramName = _declaration->returnParameters().at(n)->name();
+					string paramName = _functionType->returnParameterNames().at(n);
 					content.content =
 						(paramName.empty() ? "" : std::move(paramName) + " ") + (
 							string::npos == docParaNameEndPos || baseHasNoName ?
@@ -127,7 +123,7 @@ bool DocStringAnalyser::analyseDocStrings(SourceUnit const& _sourceUnit)
 bool DocStringAnalyser::visit(FunctionDefinition const& _function)
 {
 	if (!_function.isConstructor())
-		handleCallable(_function, _function, _function.annotation());
+		handleCallable(_function, _function, _function.annotation(), TypeProvider::function(_function));
 	return true;
 }
 
@@ -136,10 +132,12 @@ bool DocStringAnalyser::visit(VariableDeclaration const& _variable)
 	if (!_variable.isStateVariable() && !_variable.isFileLevelVariable())
 		return false;
 
+	auto const* getterType = TypeProvider::function(_variable);
+
 	if (CallableDeclaration const* baseFunction = resolveInheritDoc(_variable.annotation().baseFunctions, _variable, _variable.annotation()))
-		copyMissingTags({baseFunction}, _variable.annotation());
+		copyMissingTags({baseFunction}, _variable.annotation(), getterType);
 	else if (_variable.annotation().docTags.empty())
-		copyMissingTags(_variable.annotation().baseFunctions, _variable.annotation());
+		copyMissingTags(_variable.annotation().baseFunctions, _variable.annotation(), getterType);
 
 	return false;
 }
@@ -168,17 +166,18 @@ bool DocStringAnalyser::visit(ErrorDefinition const& _error)
 void DocStringAnalyser::handleCallable(
 	CallableDeclaration const& _callable,
 	StructurallyDocumented const& _node,
-	StructurallyDocumentedAnnotation& _annotation
+	StructurallyDocumentedAnnotation& _annotation,
+	FunctionType const* _functionType
 )
 {
 	if (CallableDeclaration const* baseFunction = resolveInheritDoc(_callable.annotation().baseFunctions, _node, _annotation))
-		copyMissingTags({baseFunction}, _annotation, &_callable);
+		copyMissingTags({baseFunction}, _annotation, _functionType);
 	else if (
 		_annotation.docTags.empty() &&
 		_callable.annotation().baseFunctions.size() == 1 &&
 		parameterNamesEqual(_callable, **_callable.annotation().baseFunctions.begin())
 	)
-		copyMissingTags(_callable.annotation().baseFunctions, _annotation, &_callable);
+		copyMissingTags(_callable.annotation().baseFunctions, _annotation, _functionType);
 }
 
 CallableDeclaration const* DocStringAnalyser::resolveInheritDoc(
diff --git a/libsolidity/analysis/DocStringAnalyser.h b/libsolidity/analysis/DocStringAnalyser.h
index 1fa076359f..d9cd6f09dc 100644
--- a/libsolidity/analysis/DocStringAnalyser.h
+++ b/libsolidity/analysis/DocStringAnalyser.h
@@ -54,7 +54,8 @@ class DocStringAnalyser: private ASTConstVisitor
 	void handleCallable(
 		CallableDeclaration const& _callable,
 		StructurallyDocumented const& _node,
-		StructurallyDocumentedAnnotation& _annotation
+		StructurallyDocumentedAnnotation& _annotation,
+		FunctionType const* _functionType = nullptr
 	);
 
 	langutil::ErrorReporter& m_errorReporter;
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index 6ee55d586a..af04d07954 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -2482,7 +2482,7 @@ BOOST_AUTO_TEST_CASE(custom_inheritance)
 	checkNatspec(sourceCode, "B", natspecB, false);
 }
 
-BOOST_AUTO_TEST_CASE(dev_different_amount_return_parameters)
+BOOST_AUTO_TEST_CASE(dev_struct_getter_override)
 {
 	char const *sourceCode = R"(
 		interface IThing {
@@ -2534,6 +2534,58 @@ BOOST_AUTO_TEST_CASE(dev_different_amount_return_parameters)
 	checkNatspec(sourceCode, "Thing", natspec2, false);
 }
 
+BOOST_AUTO_TEST_CASE(dev_struct_getter_override_different_return_parameter_names)
+{
+	char const *sourceCode = R"(
+		interface IThing {
+			/// @return x a number
+			/// @return y another number
+			function value() external view returns (uint128 x, uint128 y);
+		}
+
+		contract Thing is IThing {
+			struct Value {
+				uint128 a;
+				uint128 b;
+			}
+
+			Value public override value;
+		}
+	)";
+
+	char const *natspec = R"ABCDEF({
+		"methods":
+		{
+			"value()":
+			{
+			  "returns":
+			  {
+				"x": "a number",
+				"y": "another number"
+			  }
+			}
+		}
+	})ABCDEF";
+
+	char const *natspec2 = R"ABCDEF({
+		"methods": {},
+		"stateVariables":
+		{
+			"value":
+			{
+				"returns":
+				{
+					"a": "a number",
+					"b": "another number"
+				}
+			}
+		}
+	})ABCDEF";
+
+	checkNatspec(sourceCode, "IThing", natspec, false);
+	checkNatspec(sourceCode, "Thing", natspec2, false);
+}
+
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 2d0f6278bbe9a740e715ee9acbc83eec0bca68e9 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 17 Jan 2022 18:39:18 +0100
Subject: [PATCH 0289/1748] Allow builtins as yul identifier paths in antlr
 grammar.

---
 Changelog.md                                             | 1 +
 docs/grammar/SolidityParser.g4                           | 2 +-
 .../inlineAssembly/assignment_to_function_pointer.sol    | 9 +++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol

diff --git a/Changelog.md b/Changelog.md
index bd492e4bfd..39e844387b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Antlr Grammar: Allow builtin names in ``yulPath`` to support ``.address`` in function pointers.
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
  * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the parent contract contains immutable variables.
 
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index f7630c59ee..110773fede 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -564,7 +564,7 @@ yulFunctionDefinition:
  * While only identifiers without dots can be declared within inline assembly,
  * paths containing dots can refer to declarations outside the inline assembly block.
  */
-yulPath: YulIdentifier (YulPeriod YulIdentifier)*;
+yulPath: YulIdentifier (YulPeriod (YulIdentifier | YulEVMBuiltin))*;
 /**
  * A call to a function with return values can only occur as right-hand side of an assignment or
  * a variable declaration.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol
new file mode 100644
index 0000000000..d29a748905
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol
@@ -0,0 +1,9 @@
+contract C {
+  function f() public pure {
+    function() external g;
+    assembly {
+      g.address := 0x42
+      g.selector := 0x23
+    }
+  }
+}

From 31cf7f7adbd40732f3522a2f4eedd5ce0874f215 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 22 Dec 2021 13:55:29 +0100
Subject: [PATCH 0290/1748] CI: Create templates for parameterized jobs to make
 it easier to reuse them in multiple workflows

---
 .circleci/config.yml | 176 +++++++++++++++++++++++--------------------
 1 file changed, 96 insertions(+), 80 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ad19100a3f..ed9c2ca057 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -475,6 +475,91 @@ defaults:
       requires:
         - b_win_release
 
+  # --------------------------------------------------------------------------
+  # Parameterized Job Templates
+
+  # Separate compile-only runs of those external tests where a full run takes much longer.
+  - job_ems_compile_ext_colony: &job_ems_compile_ext_colony
+      <<: *workflow_emscripten
+      name: t_ems_compile_ext_colony
+      project: colony
+      binary_type: solcjs
+      compile_only: 1
+      nodejs_version: '14'
+  - job_native_compile_ext_gnosis: &job_native_compile_ext_gnosis
+      <<: *workflow_ubuntu2004_static
+      name: t_native_compile_ext_gnosis
+      project: gnosis
+      binary_type: native
+      compile_only: 1
+      nodejs_version: '14'
+
+  - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
+      <<: *workflow_emscripten
+      name: t_native_test_ext_gnosis
+      project: gnosis
+      binary_type: native
+      # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
+      nodejs_version: '12'
+  - job_native_test_ext_gnosis_v2: &job_native_test_ext_gnosis_v2
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_gnosis_v2
+      project: gnosis-v2
+      binary_type: native
+      # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
+      nodejs_version: '12'
+  - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_zeppelin
+      project: zeppelin
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
+      resource_class: large
+  - job_native_test_ext_ens: &job_native_test_ext_ens
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_ens
+      project: ens
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
+  - job_native_test_ext_trident: &job_native_test_ext_trident
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_trident
+      project: trident
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
+  - job_native_test_ext_euler: &job_native_test_ext_euler
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_euler
+      project: euler
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
+  - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_yield_liquidator
+      project: yield-liquidator
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
+  - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_bleeps
+      project: bleeps
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
+      resource_class: medium
+  - job_ems_test_ext_colony: &job_ems_test_ext_colony
+      <<: *workflow_emscripten
+      name: t_ems_test_ext_colony
+      project: colony
+      binary_type: solcjs
+      nodejs_version: '14'
+      resource_class: medium
+
 # -----------------------------------------------------------------------------------------------
 jobs:
 
@@ -1335,82 +1420,19 @@ workflows:
       - t_ems_solcjs: *workflow_emscripten
       - t_ems_ext_hardhat: *workflow_emscripten
 
-      # Separate compile-only runs of those external tests where a full run takes much longer.
-      - t_ems_ext:
-          <<: *workflow_emscripten
-          name: t_ems_compile_ext_colony
-          project: colony
-          binary_type: solcjs
-          compile_only: 1
-          nodejs_version: '14'
-      - t_ems_ext:
-          <<: *workflow_ubuntu2004_static
-          name: t_native_compile_ext_gnosis
-          project: gnosis
-          binary_type: native
-          compile_only: 1
-          nodejs_version: '14'
+      - t_ems_ext: *job_ems_compile_ext_colony
+      - t_ems_ext: *job_native_compile_ext_gnosis
 
       # FIXME: Gnosis tests are pretty flaky right now. They often fail on CircleCI due to random ProviderError
       # and there are also other less frequent problems. See https://github.com/gnosis/safe-contracts/issues/216.
-      #- t_ems_ext:
-      #    <<: *workflow_emscripten
-      #    name: t_native_test_ext_gnosis
-      #    project: gnosis
-      #    binary_type: native
-      #    # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
-      #    nodejs_version: '12'
-      - t_ems_ext:
-          <<: *workflow_ubuntu2004_static
-          name: t_native_test_ext_gnosis_v2
-          project: gnosis-v2
-          binary_type: native
-          # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
-          nodejs_version: '12'
-      - t_ems_ext:
-          <<: *workflow_ubuntu2004_static
-          name: t_native_test_ext_zeppelin
-          project: zeppelin
-          binary_type: native
-          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
-          nodejs_version: '16'
-          resource_class: large
-      - t_ems_ext:
-          <<: *workflow_ubuntu2004_static
-          name: t_native_test_ext_ens
-          project: ens
-          binary_type: native
-          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
-          nodejs_version: '16'
-      - t_ems_ext:
-          <<: *workflow_ubuntu2004_static
-          name: t_native_test_ext_trident
-          project: trident
-          binary_type: native
-          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
-          nodejs_version: '16'
-      - t_ems_ext:
-          <<: *workflow_ubuntu2004_static
-          name: t_native_test_ext_euler
-          project: euler
-          binary_type: native
-          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
-          nodejs_version: '16'
-      - t_ems_ext:
-          <<: *workflow_ubuntu2004_static
-          name: t_native_test_ext_yield_liquidator
-          project: yield-liquidator
-          binary_type: native
-          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
-          nodejs_version: '16'
-      - t_ems_ext:
-          <<: *workflow_ubuntu2004_static
-          name: t_native_test_ext_bleeps
-          project: bleeps
-          binary_type: native
-          # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
-          nodejs_version: '16'
-          resource_class: medium
+      #-t_ems_ext: *job_native_test_ext_gnosis
+      - t_ems_ext: *job_native_test_ext_gnosis_v2
+      - t_ems_ext: *job_native_test_ext_zeppelin
+      - t_ems_ext: *job_native_test_ext_ens
+      - t_ems_ext: *job_native_test_ext_trident
+      - t_ems_ext: *job_native_test_ext_euler
+      - t_ems_ext: *job_native_test_ext_yield_liquidator
+      - t_ems_ext: *job_native_test_ext_bleeps
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
@@ -1471,10 +1493,4 @@ workflows:
 
       # Emscripten build and tests that take more than 15 minutes to execute
       - b_ems: *workflow_trigger_on_tags
-      - t_ems_ext:
-          <<: *workflow_emscripten
-          name: t_ems_test_ext_colony
-          project: colony
-          binary_type: solcjs
-          nodejs_version: '14'
-          resource_class: medium
+      - t_ems_ext: *job_ems_test_ext_colony

From b1e7964ad533c400e9e5c623e8e9f81c85c03648 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 22 Dec 2021 17:43:37 +0100
Subject: [PATCH 0291/1748] CI: Add missing workflow_trigger_on_tags filter to
 bytecode jobs

---
 .circleci/config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ed9c2ca057..b53bdb72b3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1442,18 +1442,23 @@ workflows:
 
       # Bytecode comparison:
       - b_bytecode_ubu:
+          <<: *workflow_trigger_on_tags
           requires:
             - b_ubu
       - b_bytecode_win:
+          <<: *workflow_trigger_on_tags
           requires:
             - b_win
       - b_bytecode_osx:
+          <<: *workflow_trigger_on_tags
           requires:
             - b_osx
       - b_bytecode_ems:
+          <<: *workflow_trigger_on_tags
           requires:
             - b_ems
       - t_bytecode_compare:
+          <<: *workflow_trigger_on_tags
           requires:
             - b_bytecode_ubu
             - b_bytecode_win

From c91f995ec9aa389fb3c0b0b98bbb836deb8cc353 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 17 Jan 2022 20:12:11 +0100
Subject: [PATCH 0292/1748] Update
 test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 .../assignment_to_function_pointer.sol               | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol
index d29a748905..38e88eeeb6 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assignment_to_function_pointer.sol
@@ -1,9 +1,9 @@
 contract C {
-  function f() public pure {
-    function() external g;
-    assembly {
-      g.address := 0x42
-      g.selector := 0x23
+    function f() public pure {
+        function() external g;
+        assembly {
+            g.address := 0x42
+            g.selector := 0x23
+        }
     }
-  }
 }

From 7fbf134ce3f40cd6f3248abffdaf3d14e4018a69 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 18 Jan 2022 13:36:54 +0100
Subject: [PATCH 0293/1748] Add test for fixed natspec ICE

---
 test/libsolidity/SolidityNatspecJSON.cpp | 49 ++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index af04d07954..2b729205aa 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -2534,6 +2534,55 @@ BOOST_AUTO_TEST_CASE(dev_struct_getter_override)
 	checkNatspec(sourceCode, "Thing", natspec2, false);
 }
 
+BOOST_AUTO_TEST_CASE(dev_struct_getter_override_no_return_name)
+{
+	char const *sourceCode = R"(
+		interface IThing {
+			///@return
+			function value(uint) external returns (uint128,uint128);
+		}
+
+		contract Thing is IThing {
+			struct Value {
+				uint128 x;
+				uint128 A;
+			}
+			mapping(uint=>Value) public override value;
+		}
+	)";
+
+	char const *natspec = R"ABCDEF({
+		"methods":
+		{
+			"value(uint256)":
+			{
+				"returns":
+				{
+					"_0": ""
+				}
+			}
+		}
+	})ABCDEF";
+
+	char const *natspec2 = R"ABCDEF({
+		"methods": {},
+		"stateVariables":
+		{
+			"value":
+			{
+				"return": "x ",
+				"returns":
+				{
+					"x": ""
+				}
+			}
+		}
+	})ABCDEF";
+
+	checkNatspec(sourceCode, "IThing", natspec, false);
+	checkNatspec(sourceCode, "Thing", natspec2, false);
+}
+
 BOOST_AUTO_TEST_CASE(dev_struct_getter_override_different_return_parameter_names)
 {
 	char const *sourceCode = R"(

From 89d6bff72afe8cf1a3eb6e1590e6419e1fea9f42 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 18 Jan 2022 15:21:48 +0100
Subject: [PATCH 0294/1748] Fix .push() not considering external functions

---
 Changelog.md                                  |  1 +
 libsolidity/codegen/YulUtilFunctions.cpp      |  2 +-
 .../viaYul/copy_struct_invalid_ir_bug.sol     | 28 +++++++++++++++++++
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol

diff --git a/Changelog.md b/Changelog.md
index bb20bd813e..597a6a70a9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@ Bugfixes:
  * Antlr Grammar: Allow builtin names in ``yulPath`` to support ``.address`` in function pointers.
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
  * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the parent contract contains immutable variables.
+ * IR Generator: Fix IR syntax error when copying storage arrays of structs containing functions.
  * Natspec: Fix ICE when overriding a struct getter with a Natspec-documented return value and the name in the struct is different.
  * TypeChecker: Fix ICE when a constant variable declaration forward references a struct.
 
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 106ad260f9..2327250b28 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -3608,7 +3608,7 @@ string YulUtilFunctions::copyStructToStorageFunction(StructType const& _from, St
 				auto const& [srcSlotOffset, srcOffset] = _from.storageOffsetsOfMember(structMembers[i].name);
 				t("memberOffset", formatNumber(srcSlotOffset));
 				if (memberType.isValueType())
-					t("read", readFromStorageValueType(memberType, srcOffset, false));
+					t("read", readFromStorageValueType(memberType, srcOffset, true));
 				else
 					solAssert(srcOffset == 0, "");
 
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
new file mode 100644
index 0000000000..70e3a34d45
--- /dev/null
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -0,0 +1,28 @@
+contract C {
+	struct Struct {
+		function () external el;
+	}
+	Struct[] array;
+	int externalCalled = 0;
+
+	function ext() external {
+		externalCalled++;
+	}
+
+	function f() public {
+		array.push(Struct(this.ext));
+		array.push(array[0]);
+
+		array[0].el();
+		array[1].el();
+
+		assert(externalCalled == 2);
+	}
+}
+// ====
+// compileViaYul: also
+// ----
+// f() ->
+// gas irOptimized: 113142
+// gas legacy: 112937
+// gas legacyOptimized: 112608

From a0d6c118604dd20896601b3c85344c8882da1d4a Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Thu, 16 Dec 2021 17:05:39 +0530
Subject: [PATCH 0295/1748] Equality operator allowed for external function
 types

---
 Changelog.md                                  |  1 +
 libsolidity/ast/Types.cpp                     | 12 ++-
 libsolidity/codegen/ExpressionCompiler.cpp    | 26 +++++-
 libsolidity/codegen/YulUtilFunctions.cpp      | 29 +++++++
 libsolidity/codegen/YulUtilFunctions.h        |  3 +
 .../codegen/ir/IRGeneratorForStatements.cpp   | 26 ++++--
 ...or_external_function_cleans_dirty_bits.sol | 17 ++++
 ...rison_operators_for_external_functions.sol | 81 +++++++++++++++++++
 ...xternal_functions_with_extra_gas_slots.sol | 12 +++
 ...nternal_and_external_function_pointers.sol | 23 ++++++
 ...al_functions_with_different_parameters.sol | 26 ++++++
 11 files changed, 244 insertions(+), 12 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol
 create mode 100644 test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol

diff --git a/Changelog.md b/Changelog.md
index bb20bd813e..d8e9d8f40d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 Language Features:
  * General: Support ``ContractName.functionName`` for ``abi.encodeCall``, in addition to external function pointers.
+ * General: Add equality-comparison operators for external function types.
 
 
 Compiler Features:
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index da2811a214..fb31a93030 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -3018,8 +3018,18 @@ TypeResult FunctionType::binaryOperatorResult(Token _operator, Type const* _othe
 	if (_other->category() != category() || !(_operator == Token::Equal || _operator == Token::NotEqual))
 		return nullptr;
 	FunctionType const& other = dynamic_cast<FunctionType const&>(*_other);
-	if (kind() == Kind::Internal && other.kind() == Kind::Internal && sizeOnStack() == 1 && other.sizeOnStack() == 1)
+	if (kind() == Kind::Internal && sizeOnStack() == 1 && other.kind() == Kind::Internal && other.sizeOnStack() == 1)
 		return commonType(this, _other);
+	else if (
+		kind() == Kind::External &&
+		sizeOnStack() == 2 &&
+		!bound() &&
+		other.kind() == Kind::External &&
+		other.sizeOnStack() == 2 &&
+		!other.bound()
+	)
+		return commonType(this, _other);
+
 	return nullptr;
 }
 
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 34a9a1ee8d..b14a032c40 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -2278,12 +2278,29 @@ void ExpressionCompiler::appendAndOrOperatorCode(BinaryOperation const& _binaryO
 
 void ExpressionCompiler::appendCompareOperatorCode(Token _operator, Type const& _type)
 {
-	solAssert(_type.sizeOnStack() == 1, "Comparison of multi-slot types.");
 	if (_operator == Token::Equal || _operator == Token::NotEqual)
 	{
-		if (FunctionType const* funType = dynamic_cast<decltype(funType)>(&_type))
+		FunctionType const* functionType = dynamic_cast<decltype(functionType)>(&_type);
+		if (functionType && functionType->kind() == FunctionType::Kind::External)
 		{
-			if (funType->kind() == FunctionType::Kind::Internal)
+			solUnimplementedAssert(functionType->sizeOnStack() == 2, "");
+			m_context << Instruction::SWAP3;
+
+			m_context << ((u256(1) << 160) - 1) << Instruction::AND;
+			m_context << Instruction::SWAP1;
+			m_context << ((u256(1) << 160) - 1) << Instruction::AND;
+			m_context << Instruction::EQ;
+			m_context << Instruction::SWAP2;
+			m_context << ((u256(1) << 32) - 1) << Instruction::AND;
+			m_context << Instruction::SWAP1;
+			m_context << ((u256(1) << 32) - 1) << Instruction::AND;
+			m_context << Instruction::EQ;
+			m_context << Instruction::AND;
+		}
+		else
+		{
+			solAssert(_type.sizeOnStack() == 1, "Comparison of multi-slot types.");
+			if (functionType && functionType->kind() == FunctionType::Kind::Internal)
 			{
 				// We have to remove the upper bits (construction time value) because they might
 				// be "unknown" in one of the operands and not in the other.
@@ -2291,13 +2308,14 @@ void ExpressionCompiler::appendCompareOperatorCode(Token _operator, Type const&
 				m_context << Instruction::SWAP1;
 				m_context << ((u256(1) << 32) - 1) << Instruction::AND;
 			}
+			m_context << Instruction::EQ;
 		}
-		m_context << Instruction::EQ;
 		if (_operator == Token::NotEqual)
 			m_context << Instruction::ISZERO;
 	}
 	else
 	{
+		solAssert(_type.sizeOnStack() == 1, "Comparison of multi-slot types.");
 		bool isSigned = false;
 		if (auto type = dynamic_cast<IntegerType const*>(&_type))
 			isSigned = type->isSigned();
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 106ad260f9..cbe8b8204b 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -29,6 +29,7 @@
 #include <libsolutil/FunctionSelector.h>
 #include <libsolutil/Whiskers.h>
 #include <libsolutil/StringUtils.h>
+#include <libsolidity/ast/TypeProvider.h>
 
 using namespace std;
 using namespace solidity;
@@ -4548,3 +4549,31 @@ string YulUtilFunctions::externalCodeFunction()
 		.render();
 	});
 }
+
+std::string YulUtilFunctions::externalFunctionPointersEqualFunction()
+{
+	std::string const functionName = "externalFunctionPointersEqualFunction";
+	return m_functionCollector.createFunction(functionName, [&]() {
+		return util::Whiskers(R"(
+			function <functionName>(
+				leftAddress,
+				leftSelector,
+				rightAddress,
+				rightSelector
+			) -> result {
+				result := and(
+					eq(
+						<addressCleanUpFunction>(leftAddress), <addressCleanUpFunction>(rightAddress)
+					),
+					eq(
+						<selectorCleanUpFunction>(leftSelector), <selectorCleanUpFunction>(rightSelector)
+					)
+				)
+			}
+		)")
+		("functionName", functionName)
+		("addressCleanUpFunction", cleanupFunction(*TypeProvider::address()))
+		("selectorCleanUpFunction", cleanupFunction(*TypeProvider::uint(32)))
+		.render();
+	});
+}
diff --git a/libsolidity/codegen/YulUtilFunctions.h b/libsolidity/codegen/YulUtilFunctions.h
index a03ee75c2c..52d672b1fd 100644
--- a/libsolidity/codegen/YulUtilFunctions.h
+++ b/libsolidity/codegen/YulUtilFunctions.h
@@ -522,6 +522,9 @@ class YulUtilFunctions
 	/// Signature: (address) -> mpos
 	std::string externalCodeFunction();
 
+	/// @return the name of a function that that checks if two external functions pointers are equal or not
+	std::string externalFunctionPointersEqualFunction();
+
 private:
 /// @returns the name of a function that copies a struct from calldata or memory to storage
 	/// signature: (slot, value) ->
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index d356850375..24d695d393 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -799,13 +799,8 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 
 	if (TokenTraits::isCompareOp(op))
 	{
-		if (auto type = dynamic_cast<FunctionType const*>(commonType))
-		{
-			solAssert(op == Token::Equal || op == Token::NotEqual, "Invalid function pointer comparison!");
-			solAssert(type->kind() != FunctionType::Kind::External, "External function comparison not allowed!");
-		}
-
 		solAssert(commonType->isValueType(), "");
+
 		bool isSigned = false;
 		if (auto type = dynamic_cast<IntegerType const*>(commonType))
 			isSigned = type->isSigned();
@@ -813,8 +808,25 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 		string args = expressionAsType(_binOp.leftExpression(), *commonType, true);
 		args += ", " + expressionAsType(_binOp.rightExpression(), *commonType, true);
 
+		auto functionType = dynamic_cast<FunctionType const*>(commonType);
+		solAssert(functionType ? (op == Token::Equal || op == Token::NotEqual) : true, "Invalid function pointer comparison!");
+
 		string expr;
-		if (op == Token::Equal)
+
+		if (functionType && functionType->kind() ==  FunctionType::Kind::External)
+		{
+			solUnimplementedAssert(functionType->sizeOnStack() == 2, "");
+			expr = m_utils.externalFunctionPointersEqualFunction() +
+				"(" +
+				IRVariable{_binOp.leftExpression()}.part("address").name() + "," +
+				IRVariable{_binOp.leftExpression()}.part("functionSelector").name() + "," +
+				IRVariable{_binOp.rightExpression()}.part("address").name() + "," +
+				IRVariable{_binOp.rightExpression()}.part("functionSelector").name() +
+				")";
+			if (op == Token::NotEqual)
+				expr = "iszero(" + expr + ")";
+		}
+		else if (op == Token::Equal)
 			expr = "eq(" + move(args) + ")";
 		else if (op == Token::NotEqual)
 			expr = "iszero(eq(" + move(args) + "))";
diff --git a/test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol b/test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol
new file mode 100644
index 0000000000..3347d9b779
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol
@@ -0,0 +1,17 @@
+contract C {
+  function g() external {}
+  function comparison_operators_for_external_function_pointers_with_dirty_bits() external returns (bool) {
+        function() external g_ptr_dirty = this.g;
+        assembly {
+                g_ptr_dirty.address := or(g_ptr_dirty.address, shl(160, sub(0,1)))
+                g_ptr_dirty.selector := or(g_ptr_dirty.selector, shl(32, sub(0,1)))
+        }
+        function() external g_ptr = this.g;
+        return g_ptr == g_ptr_dirty;
+  }
+}
+// ====
+// compileViaYul: also
+// EVMVersion: >=constantinople
+// ----
+// comparison_operators_for_external_function_pointers_with_dirty_bits() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol b/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
new file mode 100644
index 0000000000..da75ea0716
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
@@ -0,0 +1,81 @@
+contract C {
+    function f() external {}
+    function g() external {}
+    function h() pure external {}
+    function i() view external {}
+
+    function comparison_operators_for_external_functions() public returns (bool) {
+        assert(
+            this.f != this.g &&
+            this.f != this.h &&
+            this.f != this.i &&
+
+            this.g != this.h &&
+            this.g != this.i &&
+
+            this.h != this.i &&
+
+            this.f == this.f &&
+            this.g == this.g &&
+            this.h == this.h &&
+            this.i == this.i
+        );
+        return true;
+    }
+
+    function comparison_operators_for_local_external_function_pointers() public returns (bool) {
+        function () external f_local = this.f;
+        function () external g_local = this.g;
+        function () external pure h_local = this.h;
+        function () external view i_local = this.i;
+
+        assert(
+            f_local == this.f &&
+            g_local == this.g &&
+            h_local == this.h &&
+            i_local == this.i &&
+
+            f_local != this.g &&
+            f_local != this.h &&
+            f_local != this.i &&
+
+            g_local != this.f &&
+            g_local != this.h &&
+            g_local != this.i &&
+
+            h_local != this.f &&
+            h_local != this.g &&
+            h_local != this.i &&
+
+            i_local != this.f &&
+            i_local != this.g &&
+            i_local != this.h
+        );
+
+        assert(
+            f_local == f_local &&
+            f_local != g_local &&
+            f_local != h_local &&
+            f_local != i_local
+        );
+
+        assert(
+            g_local == g_local &&
+            g_local != h_local &&
+            g_local != i_local
+        );
+
+        assert(
+            h_local == h_local &&
+            i_local == i_local &&
+            h_local != i_local
+        );
+
+        return true;
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// comparison_operators_for_external_functions() -> true
+// comparison_operators_for_local_external_function_pointers() -> true
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
new file mode 100644
index 0000000000..7b0713cafa
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
@@ -0,0 +1,12 @@
+contract C {
+    function external_test_function() external {}
+    function comparison_operator_for_external_function_with_extra_slots() external returns (bool) {
+        return (
+            (this.external_test_function{gas: 4} == this.external_test_function) &&
+            (this.external_test_function{gas: 4} == this.external_test_function{gas: 4})
+        );
+    }
+}
+// ----
+// TypeError 2271: (193-259): Operator == not compatible with types function () external and function () external
+// TypeError 2271: (277-351): Operator == not compatible with types function () external and function () external
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
new file mode 100644
index 0000000000..19f44658f5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
@@ -0,0 +1,23 @@
+contract C {
+    function external_test_function() external {}
+    function internal_test_function() internal {}
+
+    function comparison_operator_between_internal_and_external_function_pointers() external returns (bool) {
+        function () external external_function_pointer_local = this.external_test_function;
+        function () internal internal_function_pointer_local = internal_test_function;
+
+        assert(
+            this.external_test_function == external_function_pointer_local &&
+            internal_function_pointer_local == internal_test_function
+        );
+        assert(
+            internal_function_pointer_local != external_function_pointer_local &&
+            internal_test_function != this.external_test_function
+        );
+
+        return true;
+    }
+}
+// ----
+// TypeError 2271: (606-672): Operator != not compatible with types function () and function () external
+// TypeError 2271: (688-741): Operator != not compatible with types function () and function () external
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol
new file mode 100644
index 0000000000..39381f454b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol
@@ -0,0 +1,26 @@
+contract C {
+    function external_test_function1(uint num) external {}
+    function external_test_function2(bool val) external {}
+
+    function comparison_operator_between_internal_and_external_function_pointers() external returns (bool) {
+        function () external external_function_pointer_local1 = this.external_test_function1;
+        function () external external_function_pointer_local2 = this.external_test_function2;
+
+        assert(
+            this.external_test_function1 == external_function_pointer_local1 &&
+            this.external_test_function2 == external_function_pointer_local2
+        );
+        assert(
+            external_function_pointer_local2 != external_function_pointer_local1 &&
+            this.external_test_function2 != this.external_test_function1
+        );
+
+        return true;
+    }
+}
+// ----
+// TypeError 9574: (249-333): Type function (uint256) external is not implicitly convertible to expected type function () external.
+// TypeError 9574: (343-427): Type function (bool) external is not implicitly convertible to expected type function () external.
+// TypeError 2271: (458-522): Operator == not compatible with types function (uint256) external and function () external
+// TypeError 2271: (538-602): Operator == not compatible with types function (bool) external and function () external
+// TypeError 2271: (726-786): Operator != not compatible with types function (bool) external and function (uint256) external

From 6d05912d70086c6e86012bb7dc67677c95a027cc Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 19 Jan 2022 14:30:47 +0100
Subject: [PATCH 0296/1748] Require strict parsing for natspec JSON tests

---
 test/libsolidity/SolidityNatspecJSON.cpp | 110 ++++++++++++++---------
 1 file changed, 66 insertions(+), 44 deletions(-)

diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index af04d07954..ebd109be90 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -56,7 +56,8 @@ class DocumentationChecker
 		else
 			generatedDocumentation = m_compilerStack.natspecDev(_contractName);
 		Json::Value expectedDocumentation;
-		util::jsonParseStrict(_expectedDocumentationString, expectedDocumentation);
+		std::string parseError;
+		BOOST_REQUIRE_MESSAGE(util::jsonParseStrict(_expectedDocumentationString, expectedDocumentation, &parseError), parseError);
 
 		expectedDocumentation["version"] = Json::Value(Natspec::c_natspecVersion);
 		expectedDocumentation["kind"] = Json::Value(_userDocumentation ? "user" : "dev");
@@ -185,18 +186,27 @@ BOOST_AUTO_TEST_CASE(dev_and_user_basic_test)
 		}
 	)";
 
-	char const* devNatspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
+	char const* devNatspec = R"R(
+	{
+		"methods" :
+		{
+			"mul(uint256)":
+			{
+				"details": "Multiplies a number by 7"
+			}
+		}
+	})R";
 
-	char const* userNatspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256)\":{ \"notice\": \"Multiplies `a` by 7\"}"
-	"}}";
+	char const* userNatspec = R"R(
+	{
+		"methods" :
+		{
+			"mul(uint256)":
+			{
+				"notice": "Multiplies `a` by 7"
+			}
+		}
+	})R";
 
 	checkNatspec(sourceCode, "test", devNatspec, false);
 	checkNatspec(sourceCode, "test", userNatspec, true);
@@ -636,7 +646,7 @@ BOOST_AUTO_TEST_CASE(dev_return_no_params)
 	{
 		"methods": {
 			"mul(uint256,uint256)": {
-				"returns": { "d": "The result of the multiplication"
+				"returns": { "d": "The result of the multiplication" }
 			}
 		}
 	})ABCDEF";
@@ -866,19 +876,23 @@ BOOST_AUTO_TEST_CASE(dev_multiline_return)
 		}
 	)";
 
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        },\n"
-	"        \"returns\": {\n"
-	"            \"d\": \"The result of the multiplication and cookies with nutella\",\n"
-	"        }\n"
-	"    }\n"
-	"}}";
+	char const* natspec = R"R({
+		"methods":
+		{
+			"mul(uint256,uint256)": {
+				"details": "Multiplies a number by 7 and adds second parameter",
+				"params":
+				{
+					"a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+					"second": "Documentation for the second parameter"
+				},
+				"returns":
+				{
+					"d": "The result of the multiplication and cookies with nutella"
+				}
+			}
+		}
+	})R";
 
 	checkNatspec(sourceCode, "test", natspec, false);
 }
@@ -901,19 +915,25 @@ BOOST_AUTO_TEST_CASE(dev_multiline_comment)
 		}
 	)";
 
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        },\n"
-	"        \"returns\": {\n"
-	"            \"d\": \"The result of the multiplication and cookies with nutella\",\n"
-	"        }\n"
-	"    }\n"
-	"}}";
+	char const* natspec = R"R(
+	{
+		"methods":
+		{
+			"mul(uint256,uint256)":
+			{
+				"details": "Multiplies a number by 7 and adds second parameter",
+				"params":
+				{
+					"a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+					"second": "Documentation for the second parameter"
+				},
+				"returns":
+				{
+					"d": "The result of the multiplication and cookies with nutella"
+				}
+			}
+		}
+	})R";
 
 	checkNatspec(sourceCode, "test", natspec, false);
 }
@@ -2295,7 +2315,7 @@ BOOST_AUTO_TEST_CASE(dev_return_name_no_description)
 			{
 				"returns":
 				{
-					"a": "a",
+					"a": "a"
 				}
 			}
 		}
@@ -2308,7 +2328,7 @@ BOOST_AUTO_TEST_CASE(dev_return_name_no_description)
 			{
 				"returns":
 				{
-					"b": "a",
+					"b": "a"
 				}
 			}
 		}
@@ -2465,7 +2485,8 @@ BOOST_AUTO_TEST_CASE(custom_inheritance)
 		}
 	)";
 
-	char const* natspecA = R"ABCDEF({
+	char const* natspecA = R"ABCDEF(
+	{
 		"methods":
 		{
 			"g(uint256)":
@@ -2473,8 +2494,9 @@ BOOST_AUTO_TEST_CASE(custom_inheritance)
 				"custom:since": "2014"
 			}
 		}
-	)ABCDEF";
-	char const* natspecB = R"ABCDEF({
+	})ABCDEF";
+	char const* natspecB = R"ABCDEF(
+	{
 		"methods": {}
 	})ABCDEF";
 

From be7c7dd4a9102336d595312c0d43a1bbd2790ce8 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 19 Jan 2022 15:35:05 +0100
Subject: [PATCH 0297/1748] Make formatting more consistent in natspec tests

---
 test/libsolidity/SolidityNatspecJSON.cpp | 234 +++++++++++++----------
 1 file changed, 130 insertions(+), 104 deletions(-)

diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index ebd109be90..29796922e8 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -119,7 +119,8 @@ BOOST_AUTO_TEST_CASE(user_newline_break)
 
 	char const* natspec = R"ABCDEF(
 	{
-		"methods": {
+		"methods":
+		{
 			"f()":
 			{
 			"notice": "world"
@@ -147,8 +148,10 @@ BOOST_AUTO_TEST_CASE(user_multiline_empty_lines)
 
 	char const* natspec = R"ABCDEF(
 	{
-		"methods": {
-			"f()": {
+		"methods":
+		{
+			"f()":
+			{
 				"notice": "hello world"
 			}
 		}
@@ -188,7 +191,7 @@ BOOST_AUTO_TEST_CASE(dev_and_user_basic_test)
 
 	char const* devNatspec = R"R(
 	{
-		"methods" :
+		"methods":
 		{
 			"mul(uint256)":
 			{
@@ -199,7 +202,7 @@ BOOST_AUTO_TEST_CASE(dev_and_user_basic_test)
 
 	char const* userNatspec = R"R(
 	{
-		"methods" :
+		"methods":
 		{
 			"mul(uint256)":
 			{
@@ -307,16 +310,16 @@ BOOST_AUTO_TEST_CASE(public_state_variable)
 
 	char const* devDoc = R"R(
 	{
-		"methods" : {},
-		"stateVariables" :
+		"methods": {},
+		"stateVariables":
 		{
-			"state" :
+			"state":
 			{
-				"details" : "example of dev",
-				"return" : "returns state",
-				"returns" :
+				"details": "example of dev",
+				"return": "returns state",
+				"returns":
 				{
-					"_0" : "returns state"
+					"_0": "returns state"
 				}
 			}
 		}
@@ -326,9 +329,9 @@ BOOST_AUTO_TEST_CASE(public_state_variable)
 
 	char const* userDoc = R"R(
 	{
-		"methods" :
+		"methods":
 		{
-			"state()" :
+			"state()":
 			{
 				"notice": "example of notice"
 			}
@@ -356,15 +359,15 @@ BOOST_AUTO_TEST_CASE(public_state_variable_struct)
 
 	char const* devDoc = R"R(
 	{
-		"methods" : {},
-		"stateVariables" :
+		"methods": {},
+		"stateVariables":
 		{
-			"coinStack" :
+			"coinStack":
 			{
-				"returns" :
+				"returns":
 				{
-					"observeGraphicURL" : "Front pic",
-					"reverseGraphicURL" : "Back pic"
+					"observeGraphicURL": "Front pic",
+					"reverseGraphicURL": "Back pic"
 				}
 			}
 		}
@@ -374,9 +377,9 @@ BOOST_AUTO_TEST_CASE(public_state_variable_struct)
 
 	char const* userDoc = R"R(
 	{
-		"methods" :
+		"methods":
 		{
-			"coinStack(uint256)" :
+			"coinStack(uint256)":
 			{
 				"notice": "Get the n-th coin I own"
 			}
@@ -416,12 +419,12 @@ BOOST_AUTO_TEST_CASE(private_state_variable)
 
 	char const* devDoc = R"(
 	{
-		"methods" : {},
-		"stateVariables" :
+		"methods": {},
+		"stateVariables":
 		{
-			"state" :
+			"state":
 			{
-				"details" : "example of dev"
+				"details": "example of dev"
 			}
 		}
 	}
@@ -644,8 +647,10 @@ BOOST_AUTO_TEST_CASE(dev_return_no_params)
 
 	char const* natspec = R"ABCDEF(
 	{
-		"methods": {
-			"mul(uint256,uint256)": {
+		"methods":
+		{
+			"mul(uint256,uint256)":
+			{
 				"returns": { "d": "The result of the multiplication" }
 			}
 		}
@@ -879,7 +884,8 @@ BOOST_AUTO_TEST_CASE(dev_multiline_return)
 	char const* natspec = R"R({
 		"methods":
 		{
-			"mul(uint256,uint256)": {
+			"mul(uint256,uint256)":
+			{
 				"details": "Multiplies a number by 7 and adds second parameter",
 				"params":
 				{
@@ -1024,13 +1030,14 @@ BOOST_AUTO_TEST_CASE(natspec_notice_without_tag)
 
 	char const* natspec = R"ABCDEF(
 	{
-	   "methods" : {
-		  "mul(uint256)" : {
-			 "notice" : "I do something awesome"
-		  }
-	   }
-	}
-	)ABCDEF";
+		"methods":
+		{
+			"mul(uint256)":
+			{
+				"notice": "I do something awesome"
+			}
+		}
+	})ABCDEF";
 
 	checkNatspec(sourceCode, "test", natspec, true);
 }
@@ -1047,11 +1054,13 @@ BOOST_AUTO_TEST_CASE(natspec_multiline_notice_without_tag)
 
 	char const* natspec = R"ABCDEF(
 	{
-	   "methods" : {
-		  "mul(uint256)" : {
-			 "notice" : "I do something awesome which requires two lines to explain"
-		  }
-	   }
+		"methods":
+		{
+			"mul(uint256)":
+			{
+			"notice": "I do something awesome which requires two lines to explain"
+		}
+	}
 	}
 	)ABCDEF";
 
@@ -1067,7 +1076,7 @@ BOOST_AUTO_TEST_CASE(empty_comment)
 	)";
 	char const* natspec = R"ABCDEF(
 	{
-	   "methods" : {}
+		"methods": {}
 	}
 	)ABCDEF";
 
@@ -1155,8 +1164,10 @@ BOOST_AUTO_TEST_CASE(user_constructor)
 	)";
 
 	char const* natspec = R"ABCDEF({
-	"methods": {
-		"constructor" : {
+	"methods":
+	{
+		"constructor":
+		{
 			"notice": "this is a really nice constructor"
 		}
 	}
@@ -1177,12 +1188,15 @@ BOOST_AUTO_TEST_CASE(user_constructor_and_function)
 	)";
 
 	char const* natspec = R"ABCDEF({
-	"methods" : {
-		"mul(uint256,uint256)" : {
-			"notice" : "another multiplier"
+	"methods":
+	{
+		"mul(uint256,uint256)":
+		{
+			"notice": "another multiplier"
 		},
-		"constructor" : {
-			"notice" : "this is a really nice constructor"
+		"constructor":
+		{
+			"notice": "this is a really nice constructor"
 		}
 	}
 	})ABCDEF";
@@ -1201,11 +1215,14 @@ BOOST_AUTO_TEST_CASE(dev_constructor)
 	)";
 
 	char const *natspec = R"ABCDEF({
-	"methods" : {
-		"constructor" : {
-			"params" : {
-				"a" : "the parameter a is really nice and very useful",
-				"second" : "the second parameter is not very useful, it just provides additional confusion"
+	"methods":
+	{
+		"constructor":
+		{
+			"params":
+			{
+				"a": "the parameter a is really nice and very useful",
+				"second": "the second parameter is not very useful, it just provides additional confusion"
 			}
 		}
 	}
@@ -1248,21 +1265,27 @@ BOOST_AUTO_TEST_CASE(dev_constructor_and_function)
 	)";
 
 	char const *natspec = R"ABCDEF({
-	"methods" : {
-		"mul(uint256,uint256)" : {
-			"details" : "Multiplies a number by 7 and adds second parameter",
-			"params" : {
-				"a" : "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-				"second" : "Documentation for the second parameter"
+	"methods":
+	{
+		"mul(uint256,uint256)":
+		{
+			"details": "Multiplies a number by 7 and adds second parameter",
+			"params":
+			{
+				"a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+				"second": "Documentation for the second parameter"
 			},
-			"returns" : {
+			"returns":
+			{
 				"d": "The result of the multiplication and cookies with nutella"
 			}
 		},
-		"constructor" : {
-			"params" : {
-				"a" : "the parameter a is really nice and very useful",
-				"second" : "the second parameter is not very useful, it just provides additional confusion"
+		"constructor":
+		{
+			"params":
+			{
+				"a": "the parameter a is really nice and very useful",
+				"second": "the second parameter is not very useful, it just provides additional confusion"
 			}
 		}
 	}
@@ -1312,7 +1335,8 @@ BOOST_AUTO_TEST_CASE(slash3_slash3)
 	)";
 
 	char const* natspec = R"ABCDEF({
-		"methods": {
+		"methods":
+		{
 			"f()": { "notice": "lorem ipsum" }
 		}
 	})ABCDEF";
@@ -1331,7 +1355,8 @@ BOOST_AUTO_TEST_CASE(slash3_slash4)
 	)";
 
 	char const* natspec = R"ABCDEF({
-		"methods": {
+		"methods":
+		{
 			"f()": { "notice": "lorem" }
 		}
 	})ABCDEF";
@@ -1360,12 +1385,12 @@ BOOST_AUTO_TEST_CASE(dev_default_inherit_variable)
 	})ABCDEF";
 
 	char const *natspec1 = R"ABCDEF({
-		"methods" : {},
-		"stateVariables" :
+		"methods": {},
+		"stateVariables":
 		{
-			"x" :
+			"x":
 			{
-				"details" : "test"
+				"details": "test"
 			}
 		}
 	})ABCDEF";
@@ -1426,12 +1451,12 @@ BOOST_AUTO_TEST_CASE(dev_explicit_inherit_variable)
 	})ABCDEF";
 
 	char const *natspec1 = R"ABCDEF({
-		"methods" : {},
-		"stateVariables" :
+		"methods": {},
+		"stateVariables":
 		{
-			"x" :
+			"x":
 			{
-				"details" : "test"
+				"details": "test"
 			}
 		}
 	})ABCDEF";
@@ -1487,7 +1512,7 @@ BOOST_AUTO_TEST_CASE(dev_default_inherit)
 			function transfer(address to, uint amount) virtual override external returns (bool)
 			{
 			return false;
-		  }
+			}
 		}
 
 		contract Token is Middle {
@@ -1533,8 +1558,8 @@ BOOST_AUTO_TEST_CASE(user_default_inherit)
 		contract Middle is ERC20 {
 			function transfer(address to, uint amount) virtual override external returns (bool)
 			{
-			return false;
-		  }
+				return false;
+			}
 		}
 
 		contract Token is Middle {
@@ -2353,11 +2378,11 @@ BOOST_AUTO_TEST_CASE(error)
 	char const* devdoc = R"X({
 		"errors":{
 			"E(uint256,uint256)": [{
-				"details" : "an error.",
-				"params" :
+				"details": "an error.",
+				"params":
 				{
-					"a" : "first parameter",
-					"b" : "second parameter"
+					"a": "first parameter",
+					"b": "second parameter"
 				}
 			}]
 		},
@@ -2369,7 +2394,7 @@ BOOST_AUTO_TEST_CASE(error)
 	char const* userdoc = R"X({
 		"errors":{
 			"E(uint256,uint256)": [{
-				"notice" : "Something failed."
+				"notice": "Something failed."
 			}]
 		},
 		"methods": {}
@@ -2404,22 +2429,23 @@ BOOST_AUTO_TEST_CASE(error_multiple)
 
 	char const* devdoc = R"X({
 		"methods": {},
-		"errors": {
+		"errors":
+		{
 			"E(uint256,uint256)": [
 				{
-					"details" : "an error.",
-					"params" :
+					"details": "an error.",
+					"params":
 					{
-						"x" : "first parameter",
-						"y" : "second parameter"
+						"x": "first parameter",
+						"y": "second parameter"
 					}
 				},
 				{
-					"details" : "X an error.",
-					"params" :
+					"details": "X an error.",
+					"params":
 					{
-						"a" : "X first parameter",
-						"b" : "X second parameter"
+						"a": "X first parameter",
+						"b": "X second parameter"
 					}
 				}
 			]
@@ -2431,8 +2457,8 @@ BOOST_AUTO_TEST_CASE(error_multiple)
 	char const* userdoc = R"X({
 		"errors":{
 			"E(uint256,uint256)": [
-				{ "notice" : "Something failed." },
-				{ "notice" : "X Something failed." }
+				{ "notice": "Something failed." },
+				{ "notice": "X Something failed." }
 			]
 		},
 		"methods": {}
@@ -2528,11 +2554,11 @@ BOOST_AUTO_TEST_CASE(dev_struct_getter_override)
 		{
 			"value()":
 			{
-			  "returns":
-			  {
-				"x": "a number",
-				"y": "another number"
-			  }
+				"returns":
+				{
+					"x": "a number",
+					"y": "another number"
+				}
 			}
 		}
 	})ABCDEF";
@@ -2580,11 +2606,11 @@ BOOST_AUTO_TEST_CASE(dev_struct_getter_override_different_return_parameter_names
 		{
 			"value()":
 			{
-			  "returns":
-			  {
-				"x": "a number",
-				"y": "another number"
-			  }
+				"returns":
+				{
+					"x": "a number",
+					"y": "another number"
+				}
 			}
 		}
 	})ABCDEF";

From 93f7d5f8f0be28d84158a6ccde7fd7d2050598d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 19 Jan 2022 17:02:20 +0100
Subject: [PATCH 0298/1748] External tests for Pool Together v4

---
 .circleci/config.yml                |  8 +++
 test/externalTests.sh               |  1 +
 test/externalTests/pool-together.sh | 78 +++++++++++++++++++++++++++++
 3 files changed, 87 insertions(+)
 create mode 100755 test/externalTests/pool-together.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b53bdb72b3..0813fe5768 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -552,6 +552,13 @@ defaults:
       # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
       resource_class: medium
+  - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_pool_together
+      project: pool-together
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *workflow_emscripten
       name: t_ems_test_ext_colony
@@ -1433,6 +1440,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_euler
       - t_ems_ext: *job_native_test_ext_yield_liquidator
       - t_ems_ext: *job_native_test_ext_bleeps
+      - t_ems_ext: *job_native_test_ext_pool_together
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 4968f52135..560ca27446 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -46,3 +46,4 @@ printTask "Running external tests..."
 "$REPO_ROOT/externalTests/euler.sh" "$@"
 "$REPO_ROOT/externalTests/yield-liquidator.sh" "$@"
 "$REPO_ROOT/externalTests/bleeps.sh" "$@"
+"$REPO_ROOT/externalTests/pool-together.sh" "$@"
diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
new file mode 100755
index 0000000000..1cabd6a501
--- /dev/null
+++ b/test/externalTests/pool-together.sh
@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
+
+function compile_fn { yarn compile; }
+function test_fn { yarn test; }
+
+function pool_together_test
+{
+    local repo="https://github.com/pooltogether/v4-core"
+    local ref_type=branch
+    local ref=master
+    local config_file="hardhat.config.ts"
+    local config_var="config"
+
+    local compile_only_presets=()
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize            # Compilation fails with "YulException: Variable var_amount_205 is 9 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_amount_205 is 9 slot(s) too deep inside the stack."
+        #ir-optimize-evm+yul       # FIXME: ICE due to https://github.com/ethereum/solidity/issues/12558
+        legacy-no-optimize
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+
+    neutralize_package_lock
+    neutralize_package_json_hooks
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
+    yarn install
+
+    # These come with already compiled artifacts. We want them recompiled with latest compiler.
+    rm -r node_modules/@pooltogether/yield-source-interface/artifacts/
+    rm -r node_modules/@pooltogether/uniform-random-number/artifacts/
+    rm -r node_modules/@pooltogether/owner-manager-contracts/artifacts/
+
+    replace_version_pragmas
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+    done
+}
+
+external_test Pool-Together-V4 pool_together_test

From 8f804333fe6f8f639a67f0a4b33ff5ab2c5d2749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 19 Jan 2022 17:05:00 +0100
Subject: [PATCH 0299/1748] force_hardhat_unlimited_contract_size: Initialize
 'hardhat' network if is not explicitly configured

---
 test/externalTests/common.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 37bd8d74d5..4c0fed8d34 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -239,12 +239,14 @@ function force_hardhat_unlimited_contract_size
 
     if [[ $config_file == *\.js ]]; then
         [[ $config_var_name == "" ]] || assertFail
-        echo "module.exports.networks.hardhat.allowUnlimitedContractSize = true" >> "$config_file"
+        echo "module.exports.networks.hardhat = module.exports.networks.hardhat || {allowUnlimitedContractSize: undefined}"
+        echo "module.exports.networks.hardhat.allowUnlimitedContractSize = true"
     else
         [[ $config_file == *\.ts ]] || assertFail
         [[ $config_var_name != "" ]] || assertFail
-        echo "${config_var_name}.networks!.hardhat!.allowUnlimitedContractSize = true" >> "$config_file"
-    fi
+        echo "${config_var_name}.networks!.hardhat ??= {allowUnlimitedContractSize: undefined};"
+        echo "${config_var_name}.networks!.hardhat!.allowUnlimitedContractSize = true"
+    fi >> "$config_file"
 }
 
 function force_hardhat_compiler_settings

From 7b4522f5071285aad5758d5749de3557e3d6653f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 19 Jan 2022 17:05:43 +0100
Subject: [PATCH 0300/1748] External test for Tracer Perpetual Pools

---
 .circleci/config.yml                  |  8 +++
 test/externalTests.sh                 |  1 +
 test/externalTests/perpetual-pools.sh | 74 +++++++++++++++++++++++++++
 3 files changed, 83 insertions(+)
 create mode 100755 test/externalTests/perpetual-pools.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0813fe5768..58c3824358 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -559,6 +559,13 @@ defaults:
       binary_type: native
       # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
+  - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_perpetual_pools
+      project: perpetual-pools
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *workflow_emscripten
       name: t_ems_test_ext_colony
@@ -1441,6 +1448,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_yield_liquidator
       - t_ems_ext: *job_native_test_ext_bleeps
       - t_ems_ext: *job_native_test_ext_pool_together
+      - t_ems_ext: *job_native_test_ext_perpetual_pools
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 560ca27446..96728585a3 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -47,3 +47,4 @@ printTask "Running external tests..."
 "$REPO_ROOT/externalTests/yield-liquidator.sh" "$@"
 "$REPO_ROOT/externalTests/bleeps.sh" "$@"
 "$REPO_ROOT/externalTests/pool-together.sh" "$@"
+"$REPO_ROOT/externalTests/perpetual-pools.sh" "$@"
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
new file mode 100755
index 0000000000..6c4af4937b
--- /dev/null
+++ b/test/externalTests/perpetual-pools.sh
@@ -0,0 +1,74 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
+
+function compile_fn { yarn build; }
+function test_fn { yarn test; }
+
+function perpetual_pools_test
+{
+    local repo="https://github.com/tracer-protocol/perpetual-pools-contracts"
+    local ref_type=branch
+    local ref=pools-v2
+    local config_file="hardhat.config.ts"
+    local config_var="config"
+
+    local compile_only_presets=()
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize            # Compilation fails with "YulException: Variable var_amount_527 is 9 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_amount_527 is 9 slot(s) too deep inside the stack."
+        #ir-optimize-evm+yul       # Compilation fails with "YulException: Variable expr_mpos is 1 too deep in the stack"
+        legacy-no-optimize
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+
+    neutralize_package_lock
+    neutralize_package_json_hooks
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
+    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
+    yarn install
+
+    replace_version_pragmas
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+    done
+}
+
+external_test Tracer-Perpetual-Pools perpetual_pools_test

From 27d0480e9615bd2347eef6c6aaf17d3b3874b216 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Wed, 19 Jan 2022 21:00:40 +0530
Subject: [PATCH 0301/1748] Adding Stack Height Checker and modifying the
 number of POP instructions to appropriately provide the pointer address

---
 Changelog.md                                  |  1 +
 libsolidity/codegen/ExpressionCompiler.cpp    |  6 +++--
 ...eck_on_adding_gas_variable_to_function.sol | 25 +++++++++++++++++++
 ...ns_with_variable_number_of_stack_slots.sol |  8 ++++++
 4 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol

diff --git a/Changelog.md b/Changelog.md
index d751eb4bf0..0f7c3f29e6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -17,6 +17,7 @@ Bugfixes:
  * IR Generator: Fix IR syntax error when copying storage arrays of structs containing functions.
  * Natspec: Fix ICE when overriding a struct getter with a Natspec-documented return value and the name in the struct is different.
  * TypeChecker: Fix ICE when a constant variable declaration forward references a struct.
+ * Code Generator: Fix ICE when accessing the members of external functions occupying more than two stack slots.
 
 
 Solc-Js:
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index b14a032c40..a76d1f3d9b 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1760,6 +1760,9 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 	case Type::Category::Function:
 		if (member == "selector")
 		{
+			auto const& functionType = dynamic_cast<FunctionType const&>(*_memberAccess.expression().annotation().type);
+			if (functionType.kind() == FunctionType::Kind::External)
+				CompilerUtils(m_context).popStackSlots(functionType.sizeOnStack() - 2);
 			m_context << Instruction::SWAP1 << Instruction::POP;
 			/// need to store it as bytes4
 			utils().leftShiftNumberOnStack(224);
@@ -1768,8 +1771,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 		{
 			auto const& functionType = dynamic_cast<FunctionType const&>(*_memberAccess.expression().annotation().type);
 			solAssert(functionType.kind() == FunctionType::Kind::External, "");
-			// stack: <address> <function_id>
-			m_context << Instruction::POP;
+			CompilerUtils(m_context).popStackSlots(functionType.sizeOnStack() - 1);
 		}
 		else
 			solAssert(
diff --git a/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol b/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
new file mode 100644
index 0000000000..5726860b9b
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
@@ -0,0 +1,25 @@
+contract C {
+    function g() external {}
+    function h() external payable {}
+    function test_function() external returns (bool){
+        assert (
+            this.g.address == this.g.address &&
+            this.g{gas: 42}.address == this.g.address &&
+            this.g{gas: 42}.selector == this.g.selector
+        );
+        assert (
+            this.h.address == this.h.address &&
+            this.h{gas: 42}.address == this.h.address &&
+            this.h{gas: 42}.selector == this.h.selector
+        );
+        assert (
+            this.h{gas: 42, value: 5}.address == this.h.address &&
+            this.h{gas: 42, value: 5}.selector == this.h.selector
+        );
+        return true;
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// test_function() -> true
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol
new file mode 100644
index 0000000000..8593bdbf4f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_variable_number_of_stack_slots.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f (address) external returns (bool) {
+        this.f{gas: 42}.address;
+    }
+}
+// ----
+// Warning 6321: (56-60): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Warning 2018: (17-102): Function state mutability can be restricted to view

From a550048cf058ac7a20e2c4ac07c962de74474e30 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 20 Jan 2022 14:53:18 +0100
Subject: [PATCH 0302/1748] Fix too strict assert for calldata string -> bytes
 conversions

---
 Changelog.md                                          |  3 ++-
 libsolidity/codegen/CompilerUtils.cpp                 |  5 ++++-
 libsolidity/codegen/YulUtilFunctions.cpp              |  5 ++++-
 .../explicit_string_bytes_calldata_cast.sol           | 11 +++++++++++
 4 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol

diff --git a/Changelog.md b/Changelog.md
index 0f7c3f29e6..93b9408390 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,12 +12,13 @@ Compiler Features:
 
 Bugfixes:
  * Antlr Grammar: Allow builtin names in ``yulPath`` to support ``.address`` in function pointers.
+ * Code Generator: Fix ICE when accessing the members of external functions occupying more than two stack slots.
+ * Code Generator: Fix ICE when doing an explicit conversion from ``string calldata`` to ``bytes``.
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
  * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the parent contract contains immutable variables.
  * IR Generator: Fix IR syntax error when copying storage arrays of structs containing functions.
  * Natspec: Fix ICE when overriding a struct getter with a Natspec-documented return value and the name in the struct is different.
  * TypeChecker: Fix ICE when a constant variable declaration forward references a struct.
- * Code Generator: Fix ICE when accessing the members of external functions occupying more than two stack slots.
 
 
 Solc-Js:
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index 5e49868a3d..a9a9118df5 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -1140,7 +1140,10 @@ void CompilerUtils::convertType(
 
 		solAssert(_targetType.category() == Type::Category::Array, "");
 		auto const& targetArrayType = dynamic_cast<ArrayType const&>(_targetType);
-		solAssert(typeOnStack.arrayType().isImplicitlyConvertibleTo(targetArrayType), "");
+		solAssert(
+			typeOnStack.arrayType().isImplicitlyConvertibleTo(targetArrayType) ||
+			(typeOnStack.arrayType().isByteArray() && targetArrayType.isByteArray())
+		);
 		solAssert(
 			typeOnStack.arrayType().dataStoredIn(DataLocation::CallData) &&
 			typeOnStack.arrayType().isDynamicallySized() &&
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index f8d4630caa..cb4bd3553c 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -3222,7 +3222,10 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 		solAssert(_to.category() == Type::Category::Array, "");
 		auto const& targetType = dynamic_cast<ArrayType const&>(_to);
 
-		solAssert(fromType.arrayType().isImplicitlyConvertibleTo(targetType), "");
+		solAssert(
+			fromType.arrayType().isImplicitlyConvertibleTo(targetType) ||
+			(fromType.arrayType().isByteArray() && targetType.isByteArray())
+		);
 		solAssert(
 			fromType.arrayType().dataStoredIn(DataLocation::CallData) &&
 			fromType.arrayType().isDynamicallySized() &&
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol
new file mode 100644
index 0000000000..4a5b01d39a
--- /dev/null
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol
@@ -0,0 +1,11 @@
+// Triggered ICE before
+contract C {
+	function f(string calldata data) external pure returns(string memory) {
+		bytes calldata test = bytes(data[:3]);
+		return string(test);
+	}
+}
+// ====
+// compileViaYul: also
+// ----
+// f(string): 0x20, 3, "123" -> 0x20, 3, "123"

From 6f4709d3838a560e29fd5b2c7fb81bd17bfe1b73 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 20 Jan 2022 15:03:37 +0100
Subject: [PATCH 0303/1748] Remove empty assert messages

---
 libsolidity/codegen/CompilerUtils.cpp         |  95 ++++---
 libsolidity/codegen/YulUtilFunctions.cpp      |   5 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   | 232 +++++++++---------
 3 files changed, 165 insertions(+), 167 deletions(-)

diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index a9a9118df5..1876b6ac06 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -54,7 +54,7 @@ static_assert(CompilerUtils::generalPurposeMemoryStart >= CompilerUtils::zeroPoi
 void CompilerUtils::initialiseFreeMemoryPointer()
 {
 	size_t reservedMemory = m_context.reservedMemory();
-	solAssert(bigint(generalPurposeMemoryStart) + bigint(reservedMemory) < bigint(1) << 63, "");
+	solAssert(bigint(generalPurposeMemoryStart) + bigint(reservedMemory) < bigint(1) << 63);
 	m_context << (u256(generalPurposeMemoryStart) + reservedMemory);
 	storeFreeMemoryPointer();
 }
@@ -92,7 +92,7 @@ void CompilerUtils::toSizeAfterFreeMemoryPointer()
 
 void CompilerUtils::revertWithStringData(Type const& _argumentType)
 {
-	solAssert(_argumentType.isImplicitlyConvertibleTo(*TypeProvider::fromElementaryTypeName("string memory")), "");
+	solAssert(_argumentType.isImplicitlyConvertibleTo(*TypeProvider::fromElementaryTypeName("string memory")));
 	fetchFreeMemoryPointer();
 	m_context << util::selectorFromSignature("Error(string)");
 	m_context << Instruction::DUP2 << Instruction::MSTORE;
@@ -173,9 +173,9 @@ void CompilerUtils::loadFromMemoryDynamic(
 
 	if (auto arrayType = dynamic_cast<ArrayType const*>(&_type))
 	{
-		solAssert(!arrayType->isDynamicallySized(), "");
-		solAssert(!_fromCalldata, "");
-		solAssert(_padToWordBoundaries, "");
+		solAssert(!arrayType->isDynamicallySized());
+		solAssert(!_fromCalldata);
+		solAssert(_padToWordBoundaries);
 		if (_keepUpdatedMemoryOffset)
 			m_context << arrayType->memoryDataSize() << Instruction::ADD;
 	}
@@ -251,7 +251,7 @@ void CompilerUtils::abiDecode(TypePointers const& _typeParameters, bool _fromMem
 		// Use the new Yul-based decoding function
 		auto stackHeightBefore = m_context.stackHeight();
 		abiDecodeV2(_typeParameters, _fromMemory);
-		solAssert(m_context.stackHeight() - stackHeightBefore == sizeOnStack(_typeParameters) - 2, "");
+		solAssert(m_context.stackHeight() - stackHeightBefore == sizeOnStack(_typeParameters) - 2);
 		return;
 	}
 
@@ -290,7 +290,7 @@ void CompilerUtils::abiDecode(TypePointers const& _typeParameters, bool _fromMem
 				);
 				// @todo If base type is an array or struct, it is still calldata-style encoded, so
 				// we would have to convert it like below.
-				solAssert(arrayType.location() == DataLocation::Memory, "");
+				solAssert(arrayType.location() == DataLocation::Memory);
 				if (arrayType.isDynamicallySized())
 				{
 					// compute data pointer
@@ -430,7 +430,7 @@ void CompilerUtils::encodeToMemory(
 	// stack: <v1> <v2> ... <vn> <mem>
 	bool const encoderV2 = m_context.useABICoderV2();
 	TypePointers targetTypes = _targetTypes.empty() ? _givenTypes : _targetTypes;
-	solAssert(targetTypes.size() == _givenTypes.size(), "");
+	solAssert(targetTypes.size() == _givenTypes.size());
 	for (Type const*& t: targetTypes)
 	{
 		Type const* tEncoding = t->fullEncodingType(_encodeAsLibraryTypes, encoderV2, !_padToWordBoundaries);
@@ -449,7 +449,7 @@ void CompilerUtils::encodeToMemory(
 		);
 		auto stackHeightBefore = m_context.stackHeight();
 		abiEncodeV2(_givenTypes, targetTypes, _encodeAsLibraryTypes, _padToWordBoundaries);
-		solAssert(stackHeightBefore - m_context.stackHeight() == sizeOnStack(_givenTypes), "");
+		solAssert(stackHeightBefore - m_context.stackHeight() == sizeOnStack(_givenTypes));
 		return;
 	}
 
@@ -489,8 +489,8 @@ void CompilerUtils::encodeToMemory(
 			{
 				// special case: convert storage reference type to value type - this is only
 				// possible for library calls where we just forward the storage reference
-				solAssert(_encodeAsLibraryTypes, "");
-				solAssert(_givenTypes[i]->sizeOnStack() == 1, "");
+				solAssert(_encodeAsLibraryTypes);
+				solAssert(_givenTypes[i]->sizeOnStack() == 1);
 			}
 			else if (
 				_givenTypes[i]->dataStoredIn(DataLocation::Storage) ||
@@ -638,7 +638,7 @@ void CompilerUtils::zeroInitialiseMemoryArray(ArrayType const& _type)
 {
 	if (_type.baseType()->hasSimpleZeroValueInMemory())
 	{
-		solAssert(_type.baseType()->isValueType(), "");
+		solAssert(_type.baseType()->isValueType());
 		Whiskers templ(R"({
 			let size := mul(length, <element_size>)
 			// cheap way of zero-initializing a memory range
@@ -774,9 +774,9 @@ void CompilerUtils::convertType(
 
 	if (stackTypeCategory == Type::Category::UserDefinedValueType)
 	{
-		solAssert(_cleanupNeeded, "");
+		solAssert(_cleanupNeeded);
 		auto& userDefined = dynamic_cast<UserDefinedValueType const&>(_typeOnStack);
-		solAssert(_typeOnStack == _targetType || _targetType == userDefined.underlyingType(), "");
+		solAssert(_typeOnStack == _targetType || _targetType == userDefined.underlyingType());
 		return convertType(
 			userDefined.underlyingType(),
 			_targetType,
@@ -787,9 +787,9 @@ void CompilerUtils::convertType(
 	}
 	if (targetTypeCategory == Type::Category::UserDefinedValueType)
 	{
-		solAssert(_cleanupNeeded, "");
+		solAssert(_cleanupNeeded);
 		auto& userDefined = dynamic_cast<UserDefinedValueType const&>(_targetType);
-		solAssert(_typeOnStack.isImplicitlyConvertibleTo(userDefined.underlyingType()), "");
+		solAssert(_typeOnStack.isImplicitlyConvertibleTo(userDefined.underlyingType()));
 		return convertType(
 			_typeOnStack,
 			userDefined.underlyingType(),
@@ -829,7 +829,7 @@ void CompilerUtils::convertType(
 		}
 		else if (targetTypeCategory == Type::Category::Address)
 		{
-			solAssert(typeOnStack.numBytes() * 8 == 160, "");
+			solAssert(typeOnStack.numBytes() * 8 == 160);
 			rightShiftNumberOnStack(256 - 160);
 		}
 		else
@@ -849,7 +849,7 @@ void CompilerUtils::convertType(
 		break;
 	}
 	case Type::Category::Enum:
-		solAssert(_targetType == _typeOnStack || targetTypeCategory == Type::Category::Integer, "");
+		solAssert(_targetType == _typeOnStack || targetTypeCategory == Type::Category::Integer);
 		if (enumOverflowCheckPending)
 		{
 			EnumType const& enumType = dynamic_cast<decltype(enumType)>(_typeOnStack);
@@ -885,13 +885,13 @@ void CompilerUtils::convertType(
 					cleanHigherOrderBits(*typeOnStack);
 			}
 			else if (stackTypeCategory == Type::Category::Address)
-				solAssert(targetBytesType.numBytes() * 8 == 160, "");
+				solAssert(targetBytesType.numBytes() * 8 == 160);
 			leftShiftNumberOnStack(256 - targetBytesType.numBytes() * 8);
 		}
 		else if (targetTypeCategory == Type::Category::Enum)
 		{
 			solAssert(stackTypeCategory != Type::Category::Address, "Invalid conversion to EnumType requested.");
-			solAssert(_typeOnStack.mobileType(), "");
+			solAssert(_typeOnStack.mobileType());
 			// just clean
 			convertType(_typeOnStack, *_typeOnStack.mobileType(), true);
 			EnumType const& enumType = dynamic_cast<decltype(enumType)>(_targetType);
@@ -964,13 +964,13 @@ void CompilerUtils::convertType(
 		if (targetTypeCategory == Type::Category::FixedBytes)
 		{
 			unsigned const numBytes = dynamic_cast<FixedBytesType const&>(_targetType).numBytes();
-			solAssert(data.size() <= 32, "");
+			solAssert(data.size() <= 32);
 			m_context << (u256(h256(data, h256::AlignLeft)) & (~(u256(-1) >> (8 * numBytes))));
 		}
 		else if (targetTypeCategory == Type::Category::Array)
 		{
 			auto const& arrayType = dynamic_cast<ArrayType const&>(_targetType);
-			solAssert(arrayType.isByteArray(), "");
+			solAssert(arrayType.isByteArray());
 			size_t storageSize = 32 + ((data.size() + 31) / 32) * 32;
 			allocateMemory(storageSize);
 			// stack: mempos
@@ -995,10 +995,10 @@ void CompilerUtils::convertType(
 				typeOnStack.isByteArray() && !typeOnStack.isString(),
 				"Array types other than bytes not convertible to bytesNN."
 			);
-			solAssert(typeOnStack.isDynamicallySized(), "");
+			solAssert(typeOnStack.isDynamicallySized());
 
 			bool fromCalldata = typeOnStack.dataStoredIn(DataLocation::CallData);
-			solAssert(typeOnStack.sizeOnStack() == (fromCalldata ? 2 : 1), "");
+			solAssert(typeOnStack.sizeOnStack() == (fromCalldata ? 2 : 1));
 			if (fromCalldata)
 				m_context << Instruction::SWAP1;
 
@@ -1012,7 +1012,7 @@ void CompilerUtils::convertType(
 			);
 			break;
 		}
-		solAssert(targetTypeCategory == stackTypeCategory, "");
+		solAssert(targetTypeCategory == stackTypeCategory);
 		auto const& targetType = dynamic_cast<ArrayType const&>(_targetType);
 		switch (targetType.location())
 		{
@@ -1034,9 +1034,9 @@ void CompilerUtils::convertType(
 					typeOnStack.baseType()->isDynamicallyEncoded()
 				)
 				{
-					solAssert(m_context.useABICoderV2(), "");
+					solAssert(m_context.useABICoderV2());
 					// stack: offset length(optional in case of dynamically sized array)
-					solAssert(typeOnStack.sizeOnStack() == (typeOnStack.isDynamicallySized() ? 2 : 1), "");
+					solAssert(typeOnStack.sizeOnStack() == (typeOnStack.isDynamicallySized() ? 2 : 1));
 					if (typeOnStack.isDynamicallySized())
 						m_context << Instruction::SWAP1;
 
@@ -1122,9 +1122,9 @@ void CompilerUtils::convertType(
 				typeOnStack.arrayType().isByteArray() && !typeOnStack.arrayType().isString(),
 				"Array types other than bytes not convertible to bytesNN."
 			);
-			solAssert(typeOnStack.isDynamicallySized(), "");
-			solAssert(typeOnStack.dataStoredIn(DataLocation::CallData), "");
-			solAssert(typeOnStack.sizeOnStack() == 2, "");
+			solAssert(typeOnStack.isDynamicallySized());
+			solAssert(typeOnStack.dataStoredIn(DataLocation::CallData));
+			solAssert(typeOnStack.sizeOnStack() == 2);
 
 			m_context << Instruction::SWAP1;
 			m_context.callYulFunction(
@@ -1138,7 +1138,7 @@ void CompilerUtils::convertType(
 			break;
 		}
 
-		solAssert(_targetType.category() == Type::Category::Array, "");
+		solAssert(_targetType.category() == Type::Category::Array);
 		auto const& targetArrayType = dynamic_cast<ArrayType const&>(_targetType);
 		solAssert(
 			typeOnStack.arrayType().isImplicitlyConvertibleTo(targetArrayType) ||
@@ -1147,8 +1147,7 @@ void CompilerUtils::convertType(
 		solAssert(
 			typeOnStack.arrayType().dataStoredIn(DataLocation::CallData) &&
 			typeOnStack.arrayType().isDynamicallySized() &&
-			!typeOnStack.arrayType().baseType()->isDynamicallyEncoded(),
-			""
+			!typeOnStack.arrayType().baseType()->isDynamicallyEncoded()
 		);
 		if (!_targetType.dataStoredIn(DataLocation::CallData))
 			return convertType(typeOnStack.arrayType(), _targetType);
@@ -1156,7 +1155,7 @@ void CompilerUtils::convertType(
 	}
 	case Type::Category::Struct:
 	{
-		solAssert(targetTypeCategory == stackTypeCategory, "");
+		solAssert(targetTypeCategory == stackTypeCategory);
 		auto& targetType = dynamic_cast<StructType const&>(_targetType);
 		auto& typeOnStack = dynamic_cast<StructType const&>(_typeOnStack);
 		switch (targetType.location())
@@ -1185,7 +1184,7 @@ void CompilerUtils::convertType(
 					// stack: <memory ptr> <source ref> <memory ptr>
 					for (auto const& member: typeOnStack->members(nullptr))
 					{
-						solAssert(!member.type->containsNestedMapping(), "");
+						solAssert(!member.type->containsNestedMapping());
 						pair<u256, unsigned> const& offsets = typeOnStack->storageOffsetsOfMember(member.name);
 						_context << offsets.first << Instruction::DUP3 << Instruction::ADD;
 						_context << u256(offsets.second);
@@ -1212,7 +1211,7 @@ void CompilerUtils::convertType(
 			{
 				if (typeOnStack.isDynamicallyEncoded())
 				{
-					solAssert(m_context.useABICoderV2(), "");
+					solAssert(m_context.useABICoderV2());
 					m_context.callYulFunction(
 						m_context.utilFunctions().conversionFunction(typeOnStack, targetType),
 						1,
@@ -1234,7 +1233,7 @@ void CompilerUtils::convertType(
 			}
 			break;
 		case DataLocation::CallData:
-			solAssert(_typeOnStack == _targetType, "");
+			solAssert(_typeOnStack == _targetType);
 			// nothing to do
 			break;
 		}
@@ -1244,7 +1243,7 @@ void CompilerUtils::convertType(
 	{
 		TupleType const& sourceTuple = dynamic_cast<TupleType const&>(_typeOnStack);
 		TupleType const& targetTuple = dynamic_cast<TupleType const&>(_targetType);
-		solAssert(targetTuple.components().size() == sourceTuple.components().size(), "");
+		solAssert(targetTuple.components().size() == sourceTuple.components().size());
 		unsigned depth = sourceTuple.sizeOnStack();
 		for (size_t i = 0; i < sourceTuple.components().size(); ++i)
 		{
@@ -1252,7 +1251,7 @@ void CompilerUtils::convertType(
 			Type const* targetType = targetTuple.components()[i];
 			if (!sourceType)
 			{
-				solAssert(!targetType, "");
+				solAssert(!targetType);
 				continue;
 			}
 			unsigned sourceSize = sourceType->sizeOnStack();
@@ -1294,7 +1293,7 @@ void CompilerUtils::convertType(
 		break;
 	default:
 		// we used to allow conversions from function to address
-		solAssert(!(stackTypeCategory == Type::Category::Function && targetTypeCategory == Type::Category::Address), "");
+		solAssert(!(stackTypeCategory == Type::Category::Function && targetTypeCategory == Type::Category::Address));
 		if (stackTypeCategory == Type::Category::Function && targetTypeCategory == Type::Category::Function)
 		{
 			FunctionType const& typeOnStack = dynamic_cast<FunctionType const&>(_typeOnStack);
@@ -1351,14 +1350,14 @@ void CompilerUtils::pushZeroValue(Type const& _type)
 	}
 	if (referenceType->location() == DataLocation::CallData)
 	{
-		solAssert(referenceType->sizeOnStack() == 1 || referenceType->sizeOnStack() == 2, "");
+		solAssert(referenceType->sizeOnStack() == 1 || referenceType->sizeOnStack() == 2);
 		m_context << Instruction::CALLDATASIZE;
 		if (referenceType->sizeOnStack() == 2)
 			m_context << 0;
 		return;
 	}
 
-	solAssert(referenceType->location() == DataLocation::Memory, "");
+	solAssert(referenceType->location() == DataLocation::Memory);
 	if (auto arrayType = dynamic_cast<ArrayType const*>(&_type))
 		if (arrayType->isDynamicallySized())
 		{
@@ -1386,7 +1385,7 @@ void CompilerUtils::pushZeroValue(Type const& _type)
 				}
 			else if (auto arrayType = dynamic_cast<ArrayType const*>(type))
 			{
-				solAssert(!arrayType->isDynamicallySized(), "");
+				solAssert(!arrayType->isDynamicallySized());
 				if (arrayType->length() > 0)
 				{
 					_context << arrayType->length() << Instruction::SWAP1;
@@ -1486,7 +1485,7 @@ void CompilerUtils::popStackSlots(size_t _amount)
 
 void CompilerUtils::popAndJump(unsigned _toHeight, evmasm::AssemblyItem const& _jumpTo)
 {
-	solAssert(m_context.stackHeight() >= _toHeight, "");
+	solAssert(m_context.stackHeight() >= _toHeight);
 	unsigned amount = m_context.stackHeight() - _toHeight;
 	popStackSlots(amount);
 	m_context.appendJumpTo(_jumpTo);
@@ -1554,7 +1553,7 @@ void CompilerUtils::storeStringData(bytesConstRef _data)
 
 unsigned CompilerUtils::loadFromMemoryHelper(Type const& _type, bool _fromCalldata, bool _padToWords)
 {
-	solAssert(_type.isValueType(), "");
+	solAssert(_type.isValueType());
 	Type const* type = &_type;
 	if (auto const* userDefined = dynamic_cast<UserDefinedValueType const*>(type))
 		type = &userDefined->underlyingType();
@@ -1606,7 +1605,7 @@ void CompilerUtils::cleanHigherOrderBits(IntegerType const& _typeOnStack)
 
 void CompilerUtils::leftShiftNumberOnStack(unsigned _bits)
 {
-	solAssert(_bits < 256, "");
+	solAssert(_bits < 256);
 	if (m_context.evmVersion().hasBitwiseShifting())
 		m_context << _bits << Instruction::SHL;
 	else
@@ -1615,7 +1614,7 @@ void CompilerUtils::leftShiftNumberOnStack(unsigned _bits)
 
 void CompilerUtils::rightShiftNumberOnStack(unsigned _bits)
 {
-	solAssert(_bits < 256, "");
+	solAssert(_bits < 256);
 	// NOTE: If we add signed right shift, SAR rounds differently than SDIV
 	if (m_context.evmVersion().hasBitwiseShifting())
 		m_context << _bits << Instruction::SHR;
@@ -1630,7 +1629,7 @@ unsigned CompilerUtils::prepareMemoryStore(Type const& _type, bool _padToWords,
 		"Memory store of types with stack size != 1 not allowed (Type: " + _type.toString(true) + ")."
 	);
 
-	solAssert(!_type.isDynamicallyEncoded(), "");
+	solAssert(!_type.isDynamicallyEncoded());
 
 	unsigned numBytes = _type.calldataEncodedSize(_padToWords);
 
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index cb4bd3553c..217ec14b0d 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -3219,7 +3219,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 			solAssert(fromType.arrayType().isByteArray(), "Array types other than bytes not convertible to bytesNN.");
 			return bytesToFixedBytesConversionFunction(fromType.arrayType(), dynamic_cast<FixedBytesType const &>(_to));
 		}
-		solAssert(_to.category() == Type::Category::Array, "");
+		solAssert(_to.category() == Type::Category::Array);
 		auto const& targetType = dynamic_cast<ArrayType const&>(_to);
 
 		solAssert(
@@ -3229,8 +3229,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 		solAssert(
 			fromType.arrayType().dataStoredIn(DataLocation::CallData) &&
 			fromType.arrayType().isDynamicallySized() &&
-			!fromType.arrayType().baseType()->isDynamicallyEncoded(),
-			""
+			!fromType.arrayType().baseType()->isDynamicallyEncoded()
 		);
 
 		if (!targetType.dataStoredIn(DataLocation::CallData))
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 24d695d393..420c48baa4 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -95,7 +95,7 @@ struct CopyTranslate: public yul::ASTCopier
 			return ASTCopier::translate(_identifier);
 
 		yul::Expression translated = translateReference(_identifier);
-		solAssert(holds_alternative<yul::Identifier>(translated), "");
+		solAssert(holds_alternative<yul::Identifier>(translated));
 		return get<yul::Identifier>(std::move(translated));
 	}
 
@@ -115,14 +115,14 @@ struct CopyTranslate: public yul::ASTCopier
 		if (suffix.empty() && varDecl->isLocalVariable())
 		{
 			auto const& var = m_context.localVariable(*varDecl);
-			solAssert(var.type().sizeOnStack() == 1, "");
+			solAssert(var.type().sizeOnStack() == 1);
 
 			value = var.commaSeparatedList();
 		}
 		else if (varDecl->isConstant())
 		{
 			VariableDeclaration const* variable = rootConstVariableDeclaration(*varDecl);
-			solAssert(variable, "");
+			solAssert(variable);
 
 			if (variable->value()->annotation().type->category() == Type::Category::RationalNumber)
 			{
@@ -130,7 +130,7 @@ struct CopyTranslate: public yul::ASTCopier
 				if (auto const* bytesType = dynamic_cast<FixedBytesType const*>(variable->type()))
 					intValue <<= 256 - 8 * bytesType->numBytes();
 				else
-					solAssert(variable->type()->category() == Type::Category::Integer, "");
+					solAssert(variable->type()->category() == Type::Category::Integer);
 				value = intValue.str();
 			}
 			else if (auto const* literal = dynamic_cast<Literal const*>(variable->value().get()))
@@ -141,20 +141,20 @@ struct CopyTranslate: public yul::ASTCopier
 				{
 				case Type::Category::Bool:
 				case Type::Category::Address:
-					solAssert(type->category() == variable->annotation().type->category(), "");
+					solAssert(type->category() == variable->annotation().type->category());
 					value = toCompactHexWithPrefix(type->literalValue(literal));
 					break;
 				case Type::Category::StringLiteral:
 				{
 					auto const& stringLiteral = dynamic_cast<StringLiteralType const&>(*type);
-					solAssert(variable->type()->category() == Type::Category::FixedBytes, "");
+					solAssert(variable->type()->category() == Type::Category::FixedBytes);
 					unsigned const numBytes = dynamic_cast<FixedBytesType const&>(*variable->type()).numBytes();
-					solAssert(stringLiteral.value().size() <= numBytes, "");
+					solAssert(stringLiteral.value().size() <= numBytes);
 					value = formatNumber(u256(h256(stringLiteral.value(), h256::AlignLeft)));
 					break;
 				}
 				default:
-					solAssert(false, "");
+					solAssert(false);
 				}
 			}
 			else
@@ -167,25 +167,25 @@ struct CopyTranslate: public yul::ASTCopier
 			else if (suffix == "offset")
 				value = to_string(m_context.storageLocationOfStateVariable(*varDecl).second);
 			else
-				solAssert(false, "");
+				solAssert(false);
 		}
 		else if (varDecl->type()->dataStoredIn(DataLocation::Storage))
 		{
-			solAssert(suffix == "slot" || suffix == "offset", "");
-			solAssert(varDecl->isLocalVariable(), "");
+			solAssert(suffix == "slot" || suffix == "offset");
+			solAssert(varDecl->isLocalVariable());
 			if (suffix == "slot")
 				value = IRVariable{*varDecl}.part("slot").name();
 			else if (varDecl->type()->isValueType())
 				value = IRVariable{*varDecl}.part("offset").name();
 			else
 			{
-				solAssert(!IRVariable{*varDecl}.hasPart("offset"), "");
+				solAssert(!IRVariable{*varDecl}.hasPart("offset"));
 				value = "0";
 			}
 		}
 		else if (varDecl->type()->dataStoredIn(DataLocation::CallData))
 		{
-			solAssert(suffix == "offset" || suffix == "length", "");
+			solAssert(suffix == "offset" || suffix == "length");
 			value = IRVariable{*varDecl}.part(suffix).name();
 		}
 		else if (
@@ -193,15 +193,15 @@ struct CopyTranslate: public yul::ASTCopier
 			functionType && functionType->kind() == FunctionType::Kind::External
 		)
 		{
-			solAssert(suffix == "selector" || suffix == "address", "");
-			solAssert(varDecl->type()->sizeOnStack() == 2, "");
+			solAssert(suffix == "selector" || suffix == "address");
+			solAssert(varDecl->type()->sizeOnStack() == 2);
 			if (suffix == "selector")
 				value = IRVariable{*varDecl}.part("functionSelector").name();
 			else
 				value = IRVariable{*varDecl}.part("address").name();
 		}
 		else
-			solAssert(false, "");
+			solAssert(false);
 
 		if (isdigit(value.front()))
 			return yul::Literal{_identifier.debugData, yul::LiteralKind::Number, yul::YulString{value}, {}};
@@ -268,7 +268,7 @@ void IRGeneratorForStatements::initializeStateVar(VariableDeclaration const& _va
 		setLocation(_varDecl);
 
 		solAssert(_varDecl.immutable() || m_context.isStateVariable(_varDecl), "Must be immutable or a state variable.");
-		solAssert(!_varDecl.isConstant(), "");
+		solAssert(!_varDecl.isConstant());
 		if (!_varDecl.value())
 			return;
 
@@ -355,7 +355,7 @@ string IRGeneratorForStatements::constantValueFunction(VariableDeclaration const
 			templ("sourceLocationComment", dispenseLocationComment(_constant, m_context));
 			templ("functionName", functionName);
 			IRGeneratorForStatements generator(m_context, m_utils);
-			solAssert(_constant.value(), "");
+			solAssert(_constant.value());
 			Type const& constantType = *_constant.type();
 			templ("value", generator.evaluateExpression(*_constant.value(), constantType).commaSeparatedList());
 			templ("code", generator.code());
@@ -386,7 +386,7 @@ void IRGeneratorForStatements::endVisit(VariableDeclarationStatement const& _var
 			for (size_t i = 0; i < _varDeclStatement.declarations().size(); ++i)
 				if (auto const& decl = _varDeclStatement.declarations()[i])
 				{
-					solAssert(tupleType->components()[i], "");
+					solAssert(tupleType->components()[i]);
 					define(m_context.addLocalVariable(*decl), IRVariable(*expression).tupleComponent(i));
 				}
 		}
@@ -443,7 +443,7 @@ bool IRGeneratorForStatements::visit(Assignment const& _assignment)
 		TokenTraits::AssignmentToBinaryOp(assignmentOperator);
 
 	if (TokenTraits::isShiftOp(binaryOperator))
-		solAssert(type(_assignment.rightHandSide()).mobileType(), "");
+		solAssert(type(_assignment.rightHandSide()).mobileType());
 	IRVariable value =
 		type(_assignment.leftHandSide()).isValueType() ?
 		convert(
@@ -460,11 +460,11 @@ bool IRGeneratorForStatements::visit(Assignment const& _assignment)
 	if (assignmentOperator != Token::Assign)
 	{
 		solAssert(type(_assignment.leftHandSide()).isValueType(), "Compound operators only available for value types.");
-		solAssert(binaryOperator != Token::Exp, "");
-		solAssert(type(_assignment) == type(_assignment.leftHandSide()), "");
+		solAssert(binaryOperator != Token::Exp);
+		solAssert(type(_assignment) == type(_assignment.leftHandSide()));
 
 		IRVariable leftIntermediate = readFromLValue(*m_currentLValue);
-		solAssert(type(_assignment) == leftIntermediate.type(), "");
+		solAssert(type(_assignment) == leftIntermediate.type());
 
 		define(_assignment) << (
 			TokenTraits::isShiftOp(binaryOperator) ?
@@ -523,14 +523,14 @@ bool IRGeneratorForStatements::visit(TupleExpression const& _tuple)
 	{
 		bool willBeWrittenTo = _tuple.annotation().willBeWrittenTo;
 		if (willBeWrittenTo)
-			solAssert(!m_currentLValue, "");
+			solAssert(!m_currentLValue);
 		if (_tuple.components().size() == 1)
 		{
-			solAssert(_tuple.components().front(), "");
+			solAssert(_tuple.components().front());
 			_tuple.components().front()->accept(*this);
 			setLocation(_tuple);
 			if (willBeWrittenTo)
-				solAssert(!!m_currentLValue, "");
+				solAssert(!!m_currentLValue);
 			else
 				define(_tuple, *_tuple.components().front());
 		}
@@ -544,7 +544,7 @@ bool IRGeneratorForStatements::visit(TupleExpression const& _tuple)
 					setLocation(_tuple);
 					if (willBeWrittenTo)
 					{
-						solAssert(!!m_currentLValue, "");
+						solAssert(!!m_currentLValue);
 						lvalues.emplace_back(std::move(m_currentLValue));
 						m_currentLValue.reset();
 					}
@@ -568,7 +568,7 @@ bool IRGeneratorForStatements::visit(Block const& _block)
 {
 	if (_block.unchecked())
 	{
-		solAssert(m_context.arithmetic() == Arithmetic::Checked, "");
+		solAssert(m_context.arithmetic() == Arithmetic::Checked);
 		m_context.setArithmetic(Arithmetic::Wrapping);
 	}
 	return true;
@@ -578,7 +578,7 @@ void IRGeneratorForStatements::endVisit(Block const& _block)
 {
 	if (_block.unchecked())
 	{
-		solAssert(m_context.arithmetic() == Arithmetic::Wrapping, "");
+		solAssert(m_context.arithmetic() == Arithmetic::Wrapping);
 		m_context.setArithmetic(Arithmetic::Checked);
 	}
 }
@@ -607,7 +607,7 @@ bool IRGeneratorForStatements::visit(IfStatement const& _ifStatement)
 
 void IRGeneratorForStatements::endVisit(PlaceholderStatement const& _placeholder)
 {
-	solAssert(m_placeholderCallback, "");
+	solAssert(m_placeholderCallback);
 	setLocation(_placeholder);
 	appendCode() << m_placeholderCallback();
 }
@@ -776,7 +776,7 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 {
 	setLocation(_binOp);
 
-	solAssert(!!_binOp.annotation().commonType, "");
+	solAssert(!!_binOp.annotation().commonType);
 	Type const* commonType = _binOp.annotation().commonType;
 	langutil::Token op = _binOp.getOperator();
 
@@ -799,7 +799,7 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 
 	if (TokenTraits::isCompareOp(op))
 	{
-		solAssert(commonType->isValueType(), "");
+		solAssert(commonType->isValueType());
 
 		bool isSigned = false;
 		if (auto type = dynamic_cast<IntegerType const*>(commonType))
@@ -855,7 +855,7 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 		else if (auto rationalNumberType = dynamic_cast<RationalNumberType const*>(_binOp.leftExpression().annotation().type))
 		{
 			solAssert(rationalNumberType->integerType(), "Invalid literal as the base for exponentiation.");
-			solAssert(dynamic_cast<IntegerType const*>(commonType), "");
+			solAssert(dynamic_cast<IntegerType const*>(commonType));
 
 			define(_binOp) << m_utils.overflowCheckedIntLiteralExpFunction(
 				*rationalNumberType,
@@ -951,7 +951,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	{
 		FunctionDefinition const* functionDef = ASTNode::resolveFunctionCall(_functionCall, &m_context.mostDerivedContract());
 
-		solAssert(!functionType->takesArbitraryParameters(), "");
+		solAssert(!functionType->takesArbitraryParameters());
 
 		vector<string> args;
 		if (functionType->bound())
@@ -962,7 +962,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 
 		if (functionDef)
 		{
-			solAssert(functionDef->isImplemented(), "");
+			solAssert(functionDef->isImplemented());
 
 			define(_functionCall) <<
 				m_context.enqueueFunctionForCodeGeneration(*functionDef) <<
@@ -1065,7 +1065,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::Error:
 	{
 		ErrorDefinition const* error = dynamic_cast<ErrorDefinition const*>(ASTNode::referencedDeclaration(_functionCall.expression()));
-		solAssert(error, "");
+		solAssert(error);
 		revertWithError(
 			error->functionType(true)->externalSignature(),
 			error->functionType(true)->parameterTypes(),
@@ -1076,7 +1076,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::Wrap:
 	case FunctionType::Kind::Unwrap:
 	{
-		solAssert(arguments.size() == 1, "");
+		solAssert(arguments.size() == 1);
 		FunctionType::Kind kind = functionType->kind();
 		if (kind == FunctionType::Kind::Wrap)
 			solAssert(
@@ -1086,7 +1086,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 				""
 			);
 		else
-			solAssert(type(*arguments.at(0)).category() == Type::Category::UserDefinedValueType, "");
+			solAssert(type(*arguments.at(0)).category() == Type::Category::UserDefinedValueType);
 
 		define(_functionCall, *arguments.at(0));
 		break;
@@ -1120,7 +1120,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::ABIEncodeWithSignature:
 	{
 		bool const isPacked = functionType->kind() == FunctionType::Kind::ABIEncodePacked;
-		solAssert(functionType->padArguments() != isPacked, "");
+		solAssert(functionType->padArguments() != isPacked);
 		bool const hasSelectorOrSignature =
 			functionType->kind() == FunctionType::Kind::ABIEncodeWithSelector ||
 			functionType->kind() == FunctionType::Kind::ABIEncodeCall ||
@@ -1134,7 +1134,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 
 		if (functionType->kind() == FunctionType::Kind::ABIEncodeCall)
 		{
-			solAssert(arguments.size() == 2, "");
+			solAssert(arguments.size() == 2);
 			// Account for tuples with one component which become that component
 			if (type(*arguments[1]).category() == Type::Category::Tuple)
 			{
@@ -1257,7 +1257,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 			referenceType && referenceType->dataStoredIn(DataLocation::CallData)
 			)
 		{
-			solAssert(referenceType->isImplicitlyConvertibleTo(*TypeProvider::bytesCalldata()), "");
+			solAssert(referenceType->isImplicitlyConvertibleTo(*TypeProvider::bytesCalldata()));
 			IRVariable var = convert(*arguments[0], *TypeProvider::bytesCalldata());
 			templ("abiDecode", m_context.abiFunctions().tupleDecoder(targetTypes, false));
 			templ("offset", var.part("offset").name());
@@ -1279,8 +1279,8 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	}
 	case FunctionType::Kind::Revert:
 	{
-		solAssert(arguments.size() == parameterTypes.size(), "");
-		solAssert(arguments.size() <= 1, "");
+		solAssert(arguments.size() == parameterTypes.size());
+		solAssert(arguments.size() <= 1);
 		solAssert(
 			arguments.empty() ||
 			arguments.front()->annotation().type->isImplicitlyConvertibleTo(*TypeProvider::stringMemory()),
@@ -1299,7 +1299,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::ObjectCreation:
 	{
 		ArrayType const& arrayType = dynamic_cast<ArrayType const&>(*_functionCall.annotation().type);
-		solAssert(arguments.size() == 1, "");
+		solAssert(arguments.size() == 1);
 
 		IRVariable value = convert(*arguments[0], *TypeProvider::uint256());
 		define(_functionCall) <<
@@ -1311,7 +1311,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	}
 	case FunctionType::Kind::KECCAK256:
 	{
-		solAssert(arguments.size() == 1, "");
+		solAssert(arguments.size() == 1);
 
 		ArrayType const* arrayType = TypeProvider::bytesMemory();
 
@@ -1339,10 +1339,10 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	}
 	case FunctionType::Kind::ArrayPop:
 	{
-		solAssert(functionType->bound(), "");
-		solAssert(functionType->parameterTypes().empty(), "");
+		solAssert(functionType->bound());
+		solAssert(functionType->parameterTypes().empty());
 		ArrayType const* arrayType = dynamic_cast<ArrayType const*>(functionType->selfType());
-		solAssert(arrayType, "");
+		solAssert(arrayType);
 		define(_functionCall) <<
 			m_utils.storageArrayPopFunction(*arrayType) <<
 			"(" <<
@@ -1353,7 +1353,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::ArrayPush:
 	{
 		ArrayType const* arrayType = dynamic_cast<ArrayType const*>(functionType->selfType());
-		solAssert(arrayType, "");
+		solAssert(arrayType);
 
 		if (arguments.empty())
 		{
@@ -1414,8 +1414,8 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 			{FunctionType::Kind::AddMod, "addmod"},
 			{FunctionType::Kind::MulMod, "mulmod"},
 		};
-		solAssert(functions.find(functionType->kind()) != functions.end(), "");
-		solAssert(arguments.size() == 3 && parameterTypes.size() == 3, "");
+		solAssert(functions.find(functionType->kind()) != functions.end());
+		solAssert(arguments.size() == 3 && parameterTypes.size() == 3);
 
 		IRVariable modulus(m_context.newYulVariable(), *(parameterTypes[2]));
 		define(modulus, *arguments[2]);
@@ -1440,7 +1440,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 			{FunctionType::Kind::Selfdestruct, "selfdestruct"},
 			{FunctionType::Kind::BlockHash, "blockhash"},
 		};
-		solAssert(functions.find(functionType->kind()) != functions.end(), "");
+		solAssert(functions.find(functionType->kind()) != functions.end());
 
 		string args;
 		for (size_t i = 0; i < arguments.size(); ++i)
@@ -1497,7 +1497,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		t("saltSet", functionType->saltSet());
 		if (functionType->saltSet())
 			t("salt", IRVariable(_functionCall.expression()).part("salt").name());
-		solAssert(IRVariable(_functionCall).stackSlots().size() == 1, "");
+		solAssert(IRVariable(_functionCall).stackSlots().size() == 1);
 		t("address", IRVariable(_functionCall).commaSeparatedList());
 		t("isTryCall", _functionCall.annotation().tryCall);
 		if (_functionCall.annotation().tryCall)
@@ -1511,7 +1511,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::Send:
 	case FunctionType::Kind::Transfer:
 	{
-		solAssert(arguments.size() == 1 && parameterTypes.size() == 1, "");
+		solAssert(arguments.size() == 1 && parameterTypes.size() == 1);
 		string address{IRVariable(_functionCall.expression()).part("address").name()};
 		string value{expressionAsType(*arguments[0], *(parameterTypes[0]))};
 		Whiskers templ(R"(
@@ -1540,10 +1540,10 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::RIPEMD160:
 	case FunctionType::Kind::SHA256:
 	{
-		solAssert(!_functionCall.annotation().tryCall, "");
-		solAssert(!functionType->valueSet(), "");
-		solAssert(!functionType->gasSet(), "");
-		solAssert(!functionType->bound(), "");
+		solAssert(!_functionCall.annotation().tryCall);
+		solAssert(!functionType->valueSet());
+		solAssert(!functionType->gasSet());
+		solAssert(!functionType->bound());
 
 		static map<FunctionType::Kind, std::tuple<unsigned, size_t>> precompiles = {
 			{FunctionType::Kind::ECRecover, std::make_tuple(1, 0)},
@@ -1618,7 +1618,7 @@ void IRGeneratorForStatements::endVisit(FunctionCallOptions const& _options)
 	for (size_t i = 0; i < _options.names().size(); ++i)
 	{
 		string const& name = *_options.names()[i];
-		solAssert(name == "salt" || name == "gas" || name == "value", "");
+		solAssert(name == "salt" || name == "gas" || name == "value");
 
 		define(IRVariable(_options).part(name), *_options.options()[i]);
 	}
@@ -1636,7 +1636,7 @@ bool IRGeneratorForStatements::visit(MemberAccess const& _memberAccess)
 		innerExpression->expression().annotation().type->category() == Type::Category::Address
 	)
 	{
-		solAssert(innerExpression->annotation().type->category() == Type::Category::Array, "");
+		solAssert(innerExpression->annotation().type->category() == Type::Category::Array);
 		// Skip visiting <address>.code
 		innerExpression->expression().accept(*this);
 
@@ -1657,7 +1657,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 	if (memberFunctionType && memberFunctionType->bound())
 	{
 		define(IRVariable(_memberAccess).part("self"), _memberAccess.expression());
-		solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static, "");
+		solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static);
 		if (memberFunctionType->kind() == FunctionType::Kind::Internal)
 			assignInternalFunctionIDIfNotCalledDirectly(
 				_memberAccess,
@@ -1673,9 +1673,9 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		else
 		{
 			auto const& functionDefinition = dynamic_cast<FunctionDefinition const&>(memberFunctionType->declaration());
-			solAssert(memberFunctionType->kind() == FunctionType::Kind::DelegateCall, "");
+			solAssert(memberFunctionType->kind() == FunctionType::Kind::DelegateCall);
 			auto contract = dynamic_cast<ContractDefinition const*>(functionDefinition.scope());
-			solAssert(contract && contract->isLibrary(), "");
+			solAssert(contract && contract->isLibrary());
 			define(IRVariable(_memberAccess).part("address")) << linkerSymbol(*contract) << "\n";
 			define(IRVariable(_memberAccess).part("functionSelector")) << memberFunctionType->externalIdentifier() << "\n";
 		}
@@ -1688,7 +1688,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 	{
 		ContractType const& type = dynamic_cast<ContractType const&>(*_memberAccess.expression().annotation().type);
 		if (type.isSuper())
-			solAssert(false, "");
+			solAssert(false);
 
 		// ordinary contract type
 		else if (Declaration const* declaration = _memberAccess.annotation().referencedDeclaration)
@@ -1736,7 +1736,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 				")\n";
 		else if (set<string>{"send", "transfer"}.count(member))
 		{
-			solAssert(dynamic_cast<AddressType const&>(*_memberAccess.expression().annotation().type).stateMutability() == StateMutability::Payable, "");
+			solAssert(dynamic_cast<AddressType const&>(*_memberAccess.expression().annotation().type).stateMutability() == StateMutability::Payable);
 			define(IRVariable{_memberAccess}.part("address"), _memberAccess.expression());
 		}
 		else if (set<string>{"call", "callcode", "delegatecall", "staticcall"}.count(member))
@@ -1764,7 +1764,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 				functionType.kind() == FunctionType::Kind::Internal
 			)
 			{
-				solAssert(functionType.hasDeclaration(), "");
+				solAssert(functionType.hasDeclaration());
 				solAssert(
 					functionType.kind() == FunctionType::Kind::Error ||
 					functionType.declaration().isPartOfExternalInterface(),
@@ -1832,7 +1832,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		{
 			Type const* arg = dynamic_cast<MagicType const&>(*_memberAccess.expression().annotation().type).typeArgument();
 			auto const& contractType = dynamic_cast<ContractType const&>(*arg);
-			solAssert(!contractType.isSuper(), "");
+			solAssert(!contractType.isSuper());
 			ContractDefinition const& contract = contractType.contractDefinition();
 			m_context.subObjectsCreated().insert(&contract);
 			appendCode() << Whiskers(R"(
@@ -1856,7 +1856,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		{
 			Type const* arg = dynamic_cast<MagicType const&>(*_memberAccess.expression().annotation().type).typeArgument();
 			auto const& contractType = dynamic_cast<ContractType const&>(*arg);
-			solAssert(!contractType.isSuper(), "");
+			solAssert(!contractType.isSuper());
 			ContractDefinition const& contract = contractType.contractDefinition();
 			define(_memberAccess) << formatNumber(u256{contract.interfaceId()} << (256 - 32)) << "\n";
 		}
@@ -1983,7 +1983,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		}
 		else if (member == "pop" || member == "push")
 		{
-			solAssert(type.location() == DataLocation::Storage, "");
+			solAssert(type.location() == DataLocation::Storage);
 			define(IRVariable{_memberAccess}.part("slot"), IRVariable{_memberAccess.expression()}.part("slot"));
 		}
 		else
@@ -2019,8 +2019,8 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 						*_memberAccess.annotation().referencedDeclaration
 					).resolveVirtual(m_context.mostDerivedContract(), super);
 
-				solAssert(resolvedFunctionDef.functionType(true), "");
-				solAssert(resolvedFunctionDef.functionType(true)->kind() == FunctionType::Kind::Internal, "");
+				solAssert(resolvedFunctionDef.functionType(true));
+				solAssert(resolvedFunctionDef.functionType(true)->kind() == FunctionType::Kind::Internal);
 				assignInternalFunctionIDIfNotCalledDirectly(_memberAccess, resolvedFunctionDef);
 			}
 			else if (auto const* variable = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
@@ -2078,19 +2078,19 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 				// The old code generator had a generic "else" case here
 				// without any specific code being generated,
 				// but it would still be better to have an exhaustive list.
-				solAssert(false, "");
+				solAssert(false);
 		}
 		else if (EnumType const* enumType = dynamic_cast<EnumType const*>(&actualType))
 			define(_memberAccess) << to_string(enumType->memberValue(_memberAccess.memberName())) << "\n";
 		else if (dynamic_cast<UserDefinedValueType const*>(&actualType))
-			solAssert(member == "wrap" || member == "unwrap", "");
+			solAssert(member == "wrap" || member == "unwrap");
 		else if (auto const* arrayType = dynamic_cast<ArrayType const*>(&actualType))
-			solAssert(arrayType->isByteArray() && member == "concat", "");
+			solAssert(arrayType->isByteArray() && member == "concat");
 		else
 			// The old code generator had a generic "else" case here
 			// without any specific code being generated,
 			// but it would still be better to have an exhaustive list.
-			solAssert(false, "");
+			solAssert(false);
 		break;
 	}
 	case Type::Category::Module:
@@ -2106,17 +2106,17 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		);
 		if (auto variable = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
 		{
-			solAssert(variable->isConstant(), "");
+			solAssert(variable->isConstant());
 			handleVariableReference(*variable, static_cast<Expression const&>(_memberAccess));
 		}
 		else if (auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration))
 		{
 			auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type);
-			solAssert(function && function->isFree(), "");
-			solAssert(function->functionType(true), "");
-			solAssert(function->functionType(true)->kind() == FunctionType::Kind::Internal, "");
-			solAssert(funType->kind() == FunctionType::Kind::Internal, "");
-			solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static, "");
+			solAssert(function && function->isFree());
+			solAssert(function->functionType(true));
+			solAssert(function->functionType(true)->kind() == FunctionType::Kind::Internal);
+			solAssert(funType->kind() == FunctionType::Kind::Internal);
+			solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static);
 
 			assignInternalFunctionIDIfNotCalledDirectly(_memberAccess, *function);
 		}
@@ -2140,7 +2140,7 @@ bool IRGeneratorForStatements::visit(InlineAssembly const& _inlineAsm)
 
 	yul::Statement modified = bodyCopier(_inlineAsm.operations());
 
-	solAssert(holds_alternative<yul::Block>(modified), "");
+	solAssert(holds_alternative<yul::Block>(modified));
 
 	// Do not provide dialect so that we get the full type information.
 	appendCode() << yul::AsmPrinter()(std::get<yul::Block>(modified)) << "\n";
@@ -2183,7 +2183,7 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 			dynamic_cast<ArraySliceType const&>(baseType).arrayType();
 
 		if (baseType.category() == Type::Category::ArraySlice)
-			solAssert(arrayType.dataStoredIn(DataLocation::CallData) && arrayType.isDynamicallySized(), "");
+			solAssert(arrayType.dataStoredIn(DataLocation::CallData) && arrayType.isDynamicallySized());
 
 		solAssert(_indexAccess.indexExpression(), "Index expression expected.");
 
@@ -2276,8 +2276,8 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 	}
 	else if (baseType.category() == Type::Category::TypeType)
 	{
-		solAssert(baseType.sizeOnStack() == 0, "");
-		solAssert(_indexAccess.annotation().type->sizeOnStack() == 0, "");
+		solAssert(baseType.sizeOnStack() == 0);
+		solAssert(_indexAccess.annotation().type->sizeOnStack() == 0);
 		// no-op - this seems to be a lone array type (`structType[];`)
 	}
 	else
@@ -2302,7 +2302,7 @@ void IRGeneratorForStatements::endVisit(IndexRangeAccess const& _indexRangeAcces
 	{
 		case DataLocation::CallData:
 		{
-			solAssert(baseType.isDynamicallySized(), "");
+			solAssert(baseType.isDynamicallySized());
 			IRVariable sliceStart{m_context.newYulVariable(), *TypeProvider::uint256()};
 			if (_indexRangeAccess.startExpression())
 				define(sliceStart, IRVariable{*_indexRangeAccess.startExpression()});
@@ -2340,18 +2340,18 @@ void IRGeneratorForStatements::endVisit(Identifier const& _identifier)
 		switch (magicVar->type()->category())
 		{
 		case Type::Category::Contract:
-			solAssert(_identifier.name() == "this", "");
+			solAssert(_identifier.name() == "this");
 			define(_identifier) << "address()\n";
 			break;
 		case Type::Category::Integer:
-			solAssert(_identifier.name() == "now", "");
+			solAssert(_identifier.name() == "now");
 			define(_identifier) << "timestamp()\n";
 			break;
 		case Type::Category::TypeType:
 		{
 			auto typeType = dynamic_cast<TypeType const*>(magicVar->type());
 			if (auto contractType = dynamic_cast<ContractType const*>(typeType->actualType()))
-				solAssert(!contractType->isSuper() || _identifier.name() == "super", "");
+				solAssert(!contractType->isSuper() || _identifier.name() == "super");
 			break;
 		}
 		default:
@@ -2361,11 +2361,11 @@ void IRGeneratorForStatements::endVisit(Identifier const& _identifier)
 	}
 	else if (FunctionDefinition const* functionDef = dynamic_cast<FunctionDefinition const*>(declaration))
 	{
-		solAssert(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual, "");
+		solAssert(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual);
 		FunctionDefinition const& resolvedFunctionDef = functionDef->resolveVirtual(m_context.mostDerivedContract());
 
-		solAssert(resolvedFunctionDef.functionType(true), "");
-		solAssert(resolvedFunctionDef.functionType(true)->kind() == FunctionType::Kind::Internal, "");
+		solAssert(resolvedFunctionDef.functionType(true));
+		solAssert(resolvedFunctionDef.functionType(true)->kind() == FunctionType::Kind::Internal);
 		assignInternalFunctionIDIfNotCalledDirectly(_identifier, resolvedFunctionDef);
 	}
 	else if (VariableDeclaration const* varDecl = dynamic_cast<VariableDeclaration const*>(declaration))
@@ -2460,9 +2460,9 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 )
 {
 	FunctionType const& funType = dynamic_cast<FunctionType const&>(type(_functionCall.expression()));
-	solAssert(!funType.takesArbitraryParameters(), "");
-	solAssert(_arguments.size() == funType.parameterTypes().size(), "");
-	solAssert(!funType.isBareCall(), "");
+	solAssert(!funType.takesArbitraryParameters());
+	solAssert(_arguments.size() == funType.parameterTypes().size());
+	solAssert(!funType.isBareCall());
 	FunctionType::Kind const funKind = funType.kind();
 
 	solAssert(
@@ -2566,7 +2566,7 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 
 	string const retVars = IRVariable(_functionCall).commaSeparatedList();
 	templ("retVars", retVars);
-	solAssert(retVars.empty() == returnInfo.returnTypes.empty(), "");
+	solAssert(retVars.empty() == returnInfo.returnTypes.empty());
 
 	templ("abiDecode", m_context.abiFunctions().tupleDecoder(returnInfo.returnTypes, true));
 	templ("dynamicReturnSize", returnInfo.dynamicReturnSize);
@@ -2575,7 +2575,7 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 
 	bool encodeForLibraryCall = funKind == FunctionType::Kind::DelegateCall;
 
-	solAssert(funType.padArguments(), "");
+	solAssert(funType.padArguments());
 	templ("encodeArgs", m_context.abiFunctions().tupleEncoder(argumentTypes, parameterTypes, encodeForLibraryCall));
 	templ("argumentString", joinHumanReadablePrefixed(argumentStrings));
 
@@ -2628,7 +2628,7 @@ void IRGeneratorForStatements::appendBareCall(
 	);
 	FunctionType::Kind const funKind = funType.kind();
 
-	solAssert(funKind != FunctionType::Kind::BareStaticCall || m_context.evmVersion().hasStaticCall(), "");
+	solAssert(funKind != FunctionType::Kind::BareStaticCall || m_context.evmVersion().hasStaticCall());
 	solAssert(funKind != FunctionType::Kind::BareCallCode, "Callcode has been removed.");
 	solAssert(
 		funKind == FunctionType::Kind::BareCall ||
@@ -2636,7 +2636,7 @@ void IRGeneratorForStatements::appendBareCall(
 		funKind == FunctionType::Kind::BareStaticCall, ""
 	);
 
-	solAssert(!_functionCall.annotation().tryCall, "");
+	solAssert(!_functionCall.annotation().tryCall);
 	Whiskers templ(R"(
 		<?needsEncoding>
 			let <pos> := <allocateUnbounded>()
@@ -2848,7 +2848,7 @@ string IRGeneratorForStatements::binaryOperation(
 			"Not yet implemented - FixedPointType."
 		);
 		IntegerType const* type = dynamic_cast<IntegerType const*>(&_type);
-		solAssert(type, "");
+		solAssert(type);
 		bool checked = m_context.arithmetic() == Arithmetic::Checked;
 		switch (_operator)
 		{
@@ -2888,9 +2888,9 @@ std::string IRGeneratorForStatements::shiftOperation(
 		"Not yet implemented - FixedPointType."
 	);
 	IntegerType const* amountType = dynamic_cast<IntegerType const*>(&_amountToShift.type());
-	solAssert(amountType, "");
+	solAssert(amountType);
 
-	solAssert(_operator == Token::SHL || _operator == Token::SAR, "");
+	solAssert(_operator == Token::SHL || _operator == Token::SAR);
 
 	return
 		Whiskers(R"(
@@ -2909,7 +2909,7 @@ std::string IRGeneratorForStatements::shiftOperation(
 void IRGeneratorForStatements::appendAndOrOperatorCode(BinaryOperation const& _binOp)
 {
 	langutil::Token const op = _binOp.getOperator();
-	solAssert(op == Token::Or || op == Token::And, "");
+	solAssert(op == Token::Or || op == Token::And);
 
 	_binOp.leftExpression().accept(*this);
 	setLocation(_binOp);
@@ -2956,7 +2956,7 @@ void IRGeneratorForStatements::writeToLValue(IRLValue const& _lvalue, IRVariable
 
 					if (_memory.byteArrayElement)
 					{
-						solAssert(_lvalue.type == *TypeProvider::byte(), "");
+						solAssert(_lvalue.type == *TypeProvider::byte());
 						appendCode() << "mstore8(" + _memory.address + ", byte(0, " + prepared.commaSeparatedList() + "))\n";
 					}
 					else
@@ -2980,9 +2980,9 @@ void IRGeneratorForStatements::writeToLValue(IRLValue const& _lvalue, IRVariable
 				}
 				else
 				{
-					solAssert(_lvalue.type.sizeOnStack() == 1, "");
+					solAssert(_lvalue.type.sizeOnStack() == 1);
 					auto const* valueReferenceType = dynamic_cast<ReferenceType const*>(&_value.type());
-					solAssert(valueReferenceType && valueReferenceType->dataStoredIn(DataLocation::Memory), "");
+					solAssert(valueReferenceType && valueReferenceType->dataStoredIn(DataLocation::Memory));
 					appendCode() << "mstore(" + _memory.address + ", " + _value.part("mpos").name() + ")\n";
 				}
 			},
@@ -2991,7 +2991,7 @@ void IRGeneratorForStatements::writeToLValue(IRLValue const& _lvalue, IRVariable
 			{
 				solUnimplementedAssert(_lvalue.type.isValueType());
 				solUnimplementedAssert(_lvalue.type.sizeOnStack() == 1);
-				solAssert(_lvalue.type == *_immutable.variable->type(), "");
+				solAssert(_lvalue.type == *_immutable.variable->type());
 				size_t memOffset = m_context.immutableMemoryOffset(*_immutable.variable);
 
 				IRVariable prepared(m_context.newYulVariable(), _lvalue.type);
@@ -3051,7 +3051,7 @@ IRVariable IRGeneratorForStatements::readFromLValue(IRLValue const& _lvalue)
 		[&](IRLValue::Immutable const& _immutable) {
 			solUnimplementedAssert(_lvalue.type.isValueType());
 			solUnimplementedAssert(_lvalue.type.sizeOnStack() == 1);
-			solAssert(_lvalue.type == *_immutable.variable->type(), "");
+			solAssert(_lvalue.type == *_immutable.variable->type());
 			if (m_context.executionContext() == IRGenerationContext::ExecutionContext::Creation)
 			{
 				string readFunction = m_utils.readFromMemory(*_immutable.variable->type());
@@ -3073,13 +3073,13 @@ IRVariable IRGeneratorForStatements::readFromLValue(IRLValue const& _lvalue)
 
 void IRGeneratorForStatements::setLValue(Expression const& _expression, IRLValue _lvalue)
 {
-	solAssert(!m_currentLValue, "");
+	solAssert(!m_currentLValue);
 
 	if (_expression.annotation().willBeWrittenTo)
 	{
 		m_currentLValue.emplace(std::move(_lvalue));
 		if (_lvalue.type.dataStoredIn(DataLocation::CallData))
-			solAssert(holds_alternative<IRLValue::Stack>(_lvalue.kind), "");
+			solAssert(holds_alternative<IRLValue::Stack>(_lvalue.kind));
 	}
 	else
 		// Only define the expression, if it will not be written to.
@@ -3153,7 +3153,7 @@ bool IRGeneratorForStatements::visit(TryStatement const& _tryStatement)
 		size_t i = 0;
 		for (ASTPointer<VariableDeclaration> const& varDecl: successClause.parameters()->parameters())
 		{
-			solAssert(varDecl, "");
+			solAssert(varDecl);
 			define(m_context.addLocalVariable(*varDecl),
 				successClause.parameters()->parameters().size() == 1 ?
 				IRVariable(externalCall) :
@@ -3194,7 +3194,7 @@ void IRGeneratorForStatements::handleCatch(TryStatement const& _tryStatement)
 		appendCode() << runFallback << " := 0\n";
 		if (errorClause->parameters())
 		{
-			solAssert(errorClause->parameters()->parameters().size() == 1, "");
+			solAssert(errorClause->parameters()->parameters().size() == 1);
 			IRVariable const& var = m_context.addLocalVariable(*errorClause->parameters()->parameters().front());
 			define(var) << dataVariable << "\n";
 		}
@@ -3215,7 +3215,7 @@ void IRGeneratorForStatements::handleCatch(TryStatement const& _tryStatement)
 		appendCode() << runFallback << " := 0\n";
 		if (panicClause->parameters())
 		{
-			solAssert(panicClause->parameters()->parameters().size() == 1, "");
+			solAssert(panicClause->parameters()->parameters().size() == 1);
 			IRVariable const& var = m_context.addLocalVariable(*panicClause->parameters()->parameters().front());
 			define(var) << code << "\n";
 		}
@@ -3241,7 +3241,7 @@ void IRGeneratorForStatements::handleCatchFallback(TryCatchClause const& _fallba
 	setLocation(_fallback);
 	if (_fallback.parameters())
 	{
-		solAssert(m_context.evmVersion().supportsReturndata(), "");
+		solAssert(m_context.evmVersion().supportsReturndata());
 		solAssert(
 			_fallback.parameters()->parameters().size() == 1 &&
 			_fallback.parameters()->parameters().front() &&
@@ -3277,7 +3277,7 @@ void IRGeneratorForStatements::revertWithError(
 	for (ASTPointer<Expression const> const& arg: _errorArguments)
 	{
 		errorArgumentVars += IRVariable(*arg).stackSlots();
-		solAssert(arg->annotation().type, "");
+		solAssert(arg->annotation().type);
 		errorArgumentTypes.push_back(arg->annotation().type);
 	}
 	templ("argumentVars", joinHumanReadablePrefixed(errorArgumentVars));
@@ -3295,6 +3295,6 @@ bool IRGeneratorForStatements::visit(TryCatchClause const& _clause)
 
 string IRGeneratorForStatements::linkerSymbol(ContractDefinition const& _library) const
 {
-	solAssert(_library.isLibrary(), "");
+	solAssert(_library.isLibrary());
 	return "linkersymbol(" + util::escapeAndQuoteString(_library.fullyQualifiedName()) + ")";
 }

From 9a13917049faa653ab743a26f777821a0b7ae61c Mon Sep 17 00:00:00 2001
From: Bruno Barbieri <brunobar79@gmail.com>
Date: Thu, 20 Jan 2022 20:20:30 -0500
Subject: [PATCH 0304/1748] Add modifiers to the order of layout

---
 docs/style-guide.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 64e76526f5..177f4a7987 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -1053,7 +1053,8 @@ Inside each contract, library or interface, use the following order:
 1. Type declarations
 2. State variables
 3. Events
-4. Functions
+4. Modifiers
+5. Functions
 
 .. note::
 

From a7cbb41bf946026510f5e4bf5d566bae4d0de94f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 13 Jan 2022 23:08:01 +0100
Subject: [PATCH 0305/1748] externalTests: Add name_hardhat_default_export

---
 test/externalTests/common.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 4c0fed8d34..fe73dc67ac 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -211,6 +211,17 @@ function force_truffle_compiler_settings
     echo "module.exports['compilers'] = $(truffle_compiler_settings "$solc_path" "$preset" "$evm_version");" >> "$config_file"
 }
 
+function name_hardhat_default_export
+{
+    local config_file="$1"
+    local config_var_name="$2"
+
+    local import="import {HardhatUserConfig} from 'hardhat/types';"
+    local config="const config: HardhatUserConfig = {"
+    sed -i "s|^\s*export\s*default\s*{|${import}\n${config}|g" "$config_file"
+    echo "export default config;" >> "$config_file"
+}
+
 function force_hardhat_compiler_binary
 {
     local config_file="$1"

From de28f317160f45d3d86c574dfcd43f161996c6fb Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 21 Jan 2022 15:24:18 +0100
Subject: [PATCH 0306/1748] Improved stack shuffling in corner cases.

---
 Changelog.md                       |  2 +-
 libyul/backends/evm/StackHelpers.h | 37 +++++++++++++++++++-
 test/CMakeLists.txt                |  1 +
 test/libyul/StackShufflingTest.cpp | 54 ++++++++++++++++++++++++++++++
 4 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 test/libyul/StackShufflingTest.cpp

diff --git a/Changelog.md b/Changelog.md
index 93b9408390..3bdf50ffa8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,7 +19,7 @@ Bugfixes:
  * IR Generator: Fix IR syntax error when copying storage arrays of structs containing functions.
  * Natspec: Fix ICE when overriding a struct getter with a Natspec-documented return value and the name in the struct is different.
  * TypeChecker: Fix ICE when a constant variable declaration forward references a struct.
-
+ * Yul EVM Code Transform: Improved stack shuffling in corner cases.
 
 Solc-Js:
  * The wrapper now requires at least nodejs v10.
diff --git a/libyul/backends/evm/StackHelpers.h b/libyul/backends/evm/StackHelpers.h
index 38d0ddf4b2..a0a9428604 100644
--- a/libyul/backends/evm/StackHelpers.h
+++ b/libyul/backends/evm/StackHelpers.h
@@ -262,6 +262,11 @@ class Shuffler
 							if (ops.sourceMultiplicity(ops.sourceSize() - 1 - swapDepth) < 0)
 							{
 								ops.swap(swapDepth);
+								if (ops.targetIsArbitrary(sourceTop))
+									// Usually we keep a slot that is to-be-removed, if the current top is arbitrary.
+									// However, since we are in a stack-too-deep situation, pop it immediately
+									// to compress the stack (we can always push back junk in the end).
+									ops.pop();
 								return true;
 							}
 						// Otherwise we rely on stack compression or stack-to-memory.
@@ -321,14 +326,44 @@ class Shuffler
 			yulAssert(ops.sourceMultiplicity(i) == 0 && (ops.targetIsArbitrary(i) || ops.targetMultiplicity(i) == 0), "");
 		yulAssert(ops.isCompatible(sourceTop, sourceTop), "");
 
+		auto swappableOffsets = ranges::views::iota(size > 17 ? size - 17 : 0u, size);
+
 		// If we find a lower slot that is out of position, but also compatible with the top, swap that up.
+		for (size_t offset: swappableOffsets)
+			if (!ops.isCompatible(offset, offset) && ops.isCompatible(sourceTop, offset))
+			{
+				ops.swap(size - offset - 1);
+				return true;
+			}
+		// Swap up any reachable slot that is still out of position.
+		for (size_t offset: swappableOffsets)
+			if (!ops.isCompatible(offset, offset) && !ops.sourceIsSame(offset, sourceTop))
+			{
+				ops.swap(size - offset - 1);
+				return true;
+			}
+		// We are in a stack-too-deep situation and try to reduce the stack size.
+		// If the current top is merely kept since the target slot is arbitrary, pop it.
+		if (ops.targetIsArbitrary(sourceTop) && ops.sourceMultiplicity(sourceTop) <= 0)
+		{
+			ops.pop();
+			return true;
+		}
+		// If any reachable slot is merely kept, since the target slot is arbitrary, swap it up and pop it.
+		for (size_t offset: swappableOffsets)
+			if (ops.targetIsArbitrary(offset) && ops.sourceMultiplicity(offset) <= 0)
+			{
+				ops.swap(size - offset - 1);
+				ops.pop();
+				return true;
+			}
+		// We cannot avoid a stack-too-deep error. Repeat the above without restricting to reachable slots.
 		for (size_t offset: ranges::views::iota(0u, size))
 			if (!ops.isCompatible(offset, offset) && ops.isCompatible(sourceTop, offset))
 			{
 				ops.swap(size - offset - 1);
 				return true;
 			}
-		// Swap up any slot that is still out of position.
 		for (size_t offset: ranges::views::iota(0u, size))
 			if (!ops.isCompatible(offset, offset) && !ops.sourceIsSame(offset, sourceTop))
 			{
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 3a0b5f7b68..1ca9c33281 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -147,6 +147,7 @@ set(libyul_sources
     libyul/Parser.cpp
     libyul/StackLayoutGeneratorTest.cpp
     libyul/StackLayoutGeneratorTest.h
+    libyul/StackShufflingTest.cpp
     libyul/SyntaxTest.h
     libyul/SyntaxTest.cpp
     libyul/YulInterpreterTest.cpp
diff --git a/test/libyul/StackShufflingTest.cpp b/test/libyul/StackShufflingTest.cpp
new file mode 100644
index 0000000000..2a2c217490
--- /dev/null
+++ b/test/libyul/StackShufflingTest.cpp
@@ -0,0 +1,54 @@
+/*
+    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/>.
+*/
+/**
+ * Unit tests for stack shuffling.
+ */
+#include <libyul/backends/evm/StackHelpers.h>
+#include <boost/test/unit_test.hpp>
+
+using namespace std;
+using namespace solidity::langutil;
+
+namespace solidity::yul::test
+{
+
+BOOST_AUTO_TEST_SUITE(YulStackShuffling)
+
+BOOST_AUTO_TEST_CASE(swap_cycle)
+{
+	std::vector<Scope::Variable> scopeVariables;
+	Scope::Function function;
+	std::vector<VariableSlot> v;
+	for (size_t i = 0; i < 17; ++i)
+		scopeVariables.emplace_back(Scope::Variable{""_yulstring, YulString{"v" + to_string(i)}});
+	for (size_t i = 0; i < 17; ++i)
+		v.emplace_back(VariableSlot{scopeVariables[i]});
+
+	Stack sourceStack{
+		v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[9], v[10], v[11], v[12], v[13], v[14], v[15], v[16],
+		FunctionReturnLabelSlot{function}, FunctionReturnLabelSlot{function}, v[5]};
+	Stack targetStack{
+		v[1], v[0], v[2], v[3], v[4], v[5], v[6], v[7], v[9], v[10], v[11], v[12], v[13], v[14], v[15], v[16],
+		FunctionReturnLabelSlot{function}, JunkSlot{}, JunkSlot{}
+	};
+	// Used to hit a swapping cycle.
+	createStackLayout(sourceStack, targetStack, [](auto){}, [](auto){}, [](){});
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+}

From d3cce85a8de50f6e07a0f60cd70c783c720d9b56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 21 Jan 2022 16:10:08 +0100
Subject: [PATCH 0307/1748] externalTests: Make
 force_hardhat_unlimited_contract_size work with Typescript < 4.0

- The `??=` operator was added in Typescript 4. `??` Was already available on 3.7 so we can use it instead to get projects like Uniswap work.
---
 test/externalTests/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index fe73dc67ac..130e325a2a 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -255,7 +255,7 @@ function force_hardhat_unlimited_contract_size
     else
         [[ $config_file == *\.ts ]] || assertFail
         [[ $config_var_name != "" ]] || assertFail
-        echo "${config_var_name}.networks!.hardhat ??= {allowUnlimitedContractSize: undefined};"
+        echo "${config_var_name}.networks!.hardhat = ${config_var_name}.networks!.hardhat ?? {allowUnlimitedContractSize: undefined};"
         echo "${config_var_name}.networks!.hardhat!.allowUnlimitedContractSize = true"
     fi >> "$config_file"
 }

From aeb96373776f9de3700d4b189ba8a3cb862825a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 14 Jan 2022 01:32:28 +0100
Subject: [PATCH 0308/1748] External test for Uniswap V3

---
 .circleci/config.yml          |  8 ++++
 test/externalTests.sh         |  1 +
 test/externalTests/uniswap.sh | 83 +++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100755 test/externalTests/uniswap.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 58c3824358..cf9d3053e3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -566,6 +566,13 @@ defaults:
       binary_type: native
       # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
+  - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_uniswap
+      project: uniswap
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *workflow_emscripten
       name: t_ems_test_ext_colony
@@ -1449,6 +1456,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_bleeps
       - t_ems_ext: *job_native_test_ext_pool_together
       - t_ems_ext: *job_native_test_ext_perpetual_pools
+      - t_ems_ext: *job_native_test_ext_uniswap
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 96728585a3..4649d06308 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -48,3 +48,4 @@ printTask "Running external tests..."
 "$REPO_ROOT/externalTests/bleeps.sh" "$@"
 "$REPO_ROOT/externalTests/pool-together.sh" "$@"
 "$REPO_ROOT/externalTests/perpetual-pools.sh" "$@"
+"$REPO_ROOT/externalTests/uniswap.sh" "$@"
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
new file mode 100755
index 0000000000..b3baad1a32
--- /dev/null
+++ b/test/externalTests/uniswap.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+
+function compile_fn { yarn compile; }
+function test_fn { UPDATE_SNAPSHOT=1 npx hardhat test; }
+
+function uniswap_test
+{
+    local repo="https://github.com/solidity-external-tests/uniswap-v3-core.git"
+    local ref_type=branch
+    local ref=main_080
+    local config_file="hardhat.config.ts"
+    local config_var=config
+
+    local compile_only_presets=()
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize           # Compilation fails with: "YulException: Variable ret_0 is 1 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # Compilation fails with: "YulException: Variable ret_0 is 1 slot(s) too deep inside the stack."
+        #ir-optimize-evm+yul      # Compilation fails with: "YulException: Variable var_slot0Start_mpos is 1 too deep in the stack"
+        legacy-no-optimize
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+
+    neutralize_package_json_hooks
+    name_hardhat_default_export "$config_file" "$config_var"
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
+    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
+
+    # Force latest versions of everything except Hardhat and some of its dependencies.
+    # - Hardhat 2.2.0 pulled in by yarn.lock is too old because it can't decode Panics caused by overflow/underflow.
+    # - Hardhat 2.5.0+ won't work because of error messages hard-coded in test expectations. E.g.
+    #   "revert SPL" is expected but the message is "reverted with reason string 'SPL'" in 2.5.0.
+    # - Newer versions of ethereumjs/tx have an issue with 'gteHardfork()' method.
+    neutralize_package_lock
+    yarn add hardhat@2.4.3
+    yarn add @ethereumjs/tx@3.1.3
+
+    yarn install
+
+    replace_version_pragmas
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+    done
+}
+
+external_test Uniswap-V3 uniswap_test

From 36efd084df6b80735250a7a2bd23dc98aeb103e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 17 Jan 2022 11:26:57 +0100
Subject: [PATCH 0309/1748] External test for PRBMath

---
 .circleci/config.yml           |  8 ++++
 test/externalTests.sh          |  1 +
 test/externalTests/prb-math.sh | 81 ++++++++++++++++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100755 test/externalTests/prb-math.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cf9d3053e3..b6e261713a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -573,6 +573,13 @@ defaults:
       binary_type: native
       # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
+  - job_native_test_prb_math: &job_native_test_prb_math
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_prb_math
+      project: prb-math
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *workflow_emscripten
       name: t_ems_test_ext_colony
@@ -1457,6 +1464,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_pool_together
       - t_ems_ext: *job_native_test_ext_perpetual_pools
       - t_ems_ext: *job_native_test_ext_uniswap
+      - t_ems_ext: *job_native_test_prb_math
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 4649d06308..cdbfe517e8 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -49,3 +49,4 @@ printTask "Running external tests..."
 "$REPO_ROOT/externalTests/pool-together.sh" "$@"
 "$REPO_ROOT/externalTests/perpetual-pools.sh" "$@"
 "$REPO_ROOT/externalTests/uniswap.sh" "$@"
+"$REPO_ROOT/externalTests/prb-math.sh" "$@"
diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
new file mode 100755
index 0000000000..339a5e75d4
--- /dev/null
+++ b/test/externalTests/prb-math.sh
@@ -0,0 +1,81 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
+
+function compile_fn { yarn compile; }
+function test_fn { yarn test:contracts; }
+
+function prb_math_test
+{
+    local repo="https://github.com/paulrberg/prb-math"
+    local ref_type=branch
+    local ref=main
+    local config_file="hardhat.config.ts"
+    local config_var="config"
+
+    local compile_only_presets=(
+        ir-optimize-evm+yul       # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
+    )
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var_y_1960 is 8 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_y_1960 is 8 slot(s) too deep inside the stack."
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+        legacy-no-optimize
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+
+    cp .env.example .env
+
+    # The project has yarn 3.1.0 binary stored in the repo and yarnrc forces the yarn 1.x binary
+    # installed system-wide to use it. Unfortunately Yarn 3 fails in weird ways when we remove
+    # yarn.lock. Remove the config to restore Yarn 1.x.
+    rm .yarnrc.yml
+
+    neutralize_package_lock
+    neutralize_package_json_hooks
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
+    yarn install --no-lock-file
+
+    replace_version_pragmas
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+    done
+}
+
+external_test PRBMath prb_math_test

From 8bfc9ad829a394bf02f729fbd77b31bf051866b7 Mon Sep 17 00:00:00 2001
From: Markus Waas <mail@markuswaas.de>
Date: Sun, 23 Jan 2022 08:56:15 +1300
Subject: [PATCH 0310/1748] Add msg.sig to cheatsheet

---
 docs/cheatsheet.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index 1aa8f24ef3..eab1e3d52a 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -96,6 +96,7 @@ Global Variables
 - ``gasleft() returns (uint256)``: remaining gas
 - ``msg.data`` (``bytes``): complete calldata
 - ``msg.sender`` (``address``): sender of the message (current call)
+- ``msg.sig`` (``bytes4``): first four bytes of the calldata (i.e. function identifier)
 - ``msg.value`` (``uint``): number of wei sent with the message
 - ``tx.gasprice`` (``uint``): gas price of the transaction
 - ``tx.origin`` (``address``): sender of the transaction (full call chain)

From cf024d9fa330ab07d43d7d9e54e83bed3c42849e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 10 Jan 2022 15:43:44 +0100
Subject: [PATCH 0311/1748] External test for ElementFi

---
 .circleci/config.yml            |   9 +++
 test/externalTests.sh           |   1 +
 test/externalTests/elementfi.sh | 101 ++++++++++++++++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100755 test/externalTests/elementfi.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b6e261713a..143a692fdb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -580,6 +580,14 @@ defaults:
       binary_type: native
       # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
+  - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_elementfi
+      project: elementfi
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
+      resource_class: medium
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *workflow_emscripten
       name: t_ems_test_ext_colony
@@ -1465,6 +1473,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_perpetual_pools
       - t_ems_ext: *job_native_test_ext_uniswap
       - t_ems_ext: *job_native_test_prb_math
+      - t_ems_ext: *job_native_test_ext_elementfi
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index cdbfe517e8..a5e52c8524 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -50,3 +50,4 @@ printTask "Running external tests..."
 "$REPO_ROOT/externalTests/perpetual-pools.sh" "$@"
 "$REPO_ROOT/externalTests/uniswap.sh" "$@"
 "$REPO_ROOT/externalTests/prb-math.sh" "$@"
+"$REPO_ROOT/externalTests/elementfi.sh" "$@"
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
new file mode 100755
index 0000000000..7227ce37e2
--- /dev/null
+++ b/test/externalTests/elementfi.sh
@@ -0,0 +1,101 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+
+function compile_fn { npm run build; }
+function test_fn { npm run test; }
+
+function elementfi_test
+{
+    local repo="https://github.com/element-fi/elf-contracts"
+    local ref_type=branch
+    local ref=main
+    local config_file="hardhat.config.ts"
+    local config_var=config
+
+    local compile_only_presets=(
+        ir-optimize-evm+yul       # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
+    )
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack."
+        legacy-no-optimize
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+
+    chmod +x scripts/load-balancer-contracts.sh
+    scripts/load-balancer-contracts.sh
+
+    # Balancer contracts require 0.7.x. Patch them for 0.8.x.
+    pushd contracts/balancer-core-v2
+    sed -i 's|uint256(address(this))|uint256(uint160(address(this)))|g' test/MockPoolFactory.sol
+    sed -i 's|uint256(address(this))|uint256(uint160(address(this)))|g' vault/ProtocolFeesCollector.sol
+    sed -i 's|uint256(address(this))|uint256(uint160(address(this)))|g' vault/VaultAuthorization.sol
+    sed -i 's|msg\.sender\.sendValue(excess)|payable(msg.sender).sendValue(excess)|g' vault/AssetTransfersHandler.sol
+    sed -i 's|msg\.sender\.transfer(wad)|payable(msg.sender).transfer(wad)|g' test/WETH.sol
+    sed -i 's|int256(-amountsOut\[i\])|-int256(amountsOut[i])|g' test/MockVault.sol
+    sed -i 's|int256(-amount)|-int256(amount)|g' vault/AssetManagers.sol
+    sed -i 's|uint256(-1)|type(uint256).max|g' pools/BalancerPoolToken.sol
+    sed -i 's|uint256(-1)|type(uint256).max|g' test/WETH.sol
+    sed -i 's|IERC20(0)|IERC20(address(0))|g' pools/BasePool.sol
+    sed -i 's|IERC20(0)|IERC20(address(0))|g' vault/balances/TwoTokenPoolsBalance.sol
+    sed -i 's|IERC20(0)|IERC20(address(0))|g' vault/FlashLoans.sol
+    sed -i 's|IERC20(0)|IERC20(address(0))|g' vault/PoolTokens.sol
+    sed -i 's|uint256(msg\.sender)|uint256(uint160(msg.sender))|g' pools/BasePool.sol
+    sed -i 's|uint256(msg\.sender)|uint256(uint160(msg.sender))|g' pools/weighted/WeightedPool2Tokens.sol
+    sed -i 's|address(uint256(_data))|address(uint160(uint256(_data)))|g' lib/openzeppelin/Create2.sol
+    sed -i 's|address(uint256(poolId) >> (12 \* 8))|address(uint160(uint256(poolId) >> (12 * 8)))|g' vault/PoolRegistry.sol
+    sed -i 's|bytes32(uint256(pool))|bytes32(uint256(uint160(pool)))|g' vault/PoolRegistry.sol
+    popd
+
+    # Several tests fail unless we use the exact versions hard-coded in package-lock.json
+    #neutralize_package_lock
+
+    neutralize_package_json_hooks
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
+    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
+    npm install
+
+    replace_version_pragmas
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+    done
+}
+
+external_test ElementFi elementfi_test

From 2e1383eae165568cecf076223dc4c16bb5266409 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 25 Jan 2022 13:31:47 +0100
Subject: [PATCH 0312/1748] Change the way we run solcjs now that it has been
 renamed in solc-js

---
 scripts/solc-bin/bytecode_reports_for_modified_binaries.sh | 2 +-
 test/externalTests/common.sh                               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
index 69d6a34d01..5638d62a74 100755
--- a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
+++ b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
@@ -151,7 +151,7 @@ for binary_name in $platform_binaries; do
             cp "${script_dir}/bytecodecompare/prepare_report.js" prepare_report.js
 
             validate_reported_version \
-                "$(solc-js/solcjs --version)" \
+                "$(solc-js/solc.js --version)" \
                 "$solidity_version_and_commit"
 
             # shellcheck disable=SC2035
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 130e325a2a..396612b96a 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -84,7 +84,7 @@ function setup_solc
         pushd "$install_dir"
         npm install
         cp "$binary_path" soljson.js
-        SOLCVERSION=$(./solcjs --version)
+        SOLCVERSION=$(./solc.js --version)
         popd
     else
         printLog "Setting up solc..."

From 1cd4ffc355fe2eb9e4790c94ff5dfd5ea068974a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 25 Jan 2022 15:29:08 +0100
Subject: [PATCH 0313/1748] bytecode compare: Stop depending on solc-js
 internal structure and install it via npm from a local dir instead

---
 scripts/bytecodecompare/prepare_report.js | 2 +-
 scripts/bytecodecompare/storebytecode.sh  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bytecodecompare/prepare_report.js b/scripts/bytecodecompare/prepare_report.js
index 608337c866..36acfbb358 100755
--- a/scripts/bytecodecompare/prepare_report.js
+++ b/scripts/bytecodecompare/prepare_report.js
@@ -2,7 +2,7 @@
 const process = require('process')
 const fs = require('fs')
 
-const compiler = require('./solc-js/wrapper.js')(require('./solc-js/soljson.js'))
+const compiler = require('solc')
 
 
 function loadSource(sourceFileName, stripSMTPragmas)
diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 9298dd4d3d..137ed753c4 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -44,9 +44,9 @@ TMPDIR=$(mktemp -d)
     then
         # npm install solc
         git clone --depth 1 https://github.com/ethereum/solc-js.git solc-js
-        ( cd solc-js; npm install )
         cp "$REPO_ROOT/emscripten_build/libsolc/soljson.js" solc-js/
         cp "$REPO_ROOT/scripts/bytecodecompare/prepare_report.js" .
+        ( npm install solc-js/ )
         echo "Running the compiler..."
         # shellcheck disable=SC2035
         ./prepare_report.js *.sol > report.txt

From 8011d23b5cbf05e3488e1df7d9b54e97f2cb87bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 25 Jan 2022 16:41:50 +0100
Subject: [PATCH 0314/1748] Release checklist: switch to a command that
 automatically downloads the binary before running verifyVersion

---
 ReleaseChecklist.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 7bfea128ad..b95ea32a94 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -66,7 +66,7 @@
 ### Release solc-js
  - [ ] Wait until solc-bin was properly deployed. You can test this via remix - a test run through remix is advisable anyway.
  - [ ] Increment the version number, create a pull request for that, merge it after tests succeeded.
- - [ ] Run ``node verifyVersion.js && npm publish`` in the updated ``solc-js`` repository.
+ - [ ] Run ``npm run updateBinary && npm publish`` in the updated ``solc-js`` repository.
  - [ ] Create a tag using ``git tag --annotate v$VERSION`` and push it with ``git push --tags``.
 
 ### Post-release

From cdaa6dd5913427d1cba3d4739edc9f75240ac43c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 25 Jan 2022 16:42:37 +0100
Subject: [PATCH 0315/1748] Adjust workflow with solc-js checkout now that it's
 on TypeScrpt

---
 scripts/solc-bin/bytecode_reports_for_modified_binaries.sh | 4 +++-
 scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh        | 1 +
 test/externalTests/common.sh                               | 3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
index 5638d62a74..be151bca86 100755
--- a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
+++ b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
@@ -109,6 +109,7 @@ cd "$tmp_dir"
 git clone https://github.com/ethereum/solc-js.git "$solcjs_dir"
 cd "$solcjs_dir"
 npm install
+npm run build
 
 cd "${solc_bin_dir}/${platform}/"
 echo "Commit range: ${base_ref}..${top_ref}"
@@ -147,11 +148,12 @@ for binary_name in $platform_binaries; do
 
         if [[ $platform == emscripten-wasm32 ]] || [[ $platform == emscripten-asmjs ]]; then
             ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/soljson.js"
+            ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/dist/soljson.js"
             ln -s "${solcjs_dir}" solc-js
             cp "${script_dir}/bytecodecompare/prepare_report.js" prepare_report.js
 
             validate_reported_version \
-                "$(solc-js/solc.js --version)" \
+                "$(solc-js/dist/solc.js --version)" \
                 "$solidity_version_and_commit"
 
             # shellcheck disable=SC2035
diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index eaca0c7307..6293d182b4 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -228,6 +228,7 @@ mkdir -p "${OUTPUTDIR}"/bin
 echo "Prepare solc-js."
 cd /root/solc-js
 npm install >/dev/null 2>&1
+npm run build >/dev/null 2>&1
 
 echo "Install semver helper."
 npm install -g semver >/dev/null 2>&1
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 396612b96a..10df975256 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -84,7 +84,8 @@ function setup_solc
         pushd "$install_dir"
         npm install
         cp "$binary_path" soljson.js
-        SOLCVERSION=$(./solc.js --version)
+        npm run build
+        SOLCVERSION=$(dist/solc.js --version)
         popd
     else
         printLog "Setting up solc..."

From 4e395137b97f91426a41031a4ef4188b6a1ac63b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 25 Jan 2022 16:00:26 +0100
Subject: [PATCH 0316/1748] Changelog entry for the TypeScript migration

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 93b9408390..571c1011d3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -23,6 +23,7 @@ Bugfixes:
 
 Solc-Js:
  * The wrapper now requires at least nodejs v10.
+ * The code has been ported to TypeScript.
 
 
 ### 0.8.11 (2021-12-20)

From f46e333f9a0b4be44c192adddffe04bd64f8b383 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 25 Jan 2022 17:12:35 +0100
Subject: [PATCH 0317/1748] fixup! bytecode compare: Stop depending on solc-js
 internal structure and install it via npm from a local dir instead

---
 scripts/bytecodecompare/storebytecode.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 137ed753c4..1c300662bc 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -42,11 +42,18 @@ TMPDIR=$(mktemp -d)
 
     if [[ "$SOLC_EMSCRIPTEN" = "On" ]]
     then
+        echo "Installing solc-js..."
         # npm install solc
         git clone --depth 1 https://github.com/ethereum/solc-js.git solc-js
         cp "$REPO_ROOT/emscripten_build/libsolc/soljson.js" solc-js/
+        pushd solc-js/
+        npm install
+        npm run build
+        popd
+
         cp "$REPO_ROOT/scripts/bytecodecompare/prepare_report.js" .
-        ( npm install solc-js/ )
+        npm install solc-js/
+
         echo "Running the compiler..."
         # shellcheck disable=SC2035
         ./prepare_report.js *.sol > report.txt

From cfda0e41ce8099646c847ab519b67866c7b0ab38 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Wed, 26 Jan 2022 15:58:12 +0100
Subject: [PATCH 0318/1748] Filter log statements and remove gas comparison.

---
 test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp | 17 -----------------
 test/tools/ossfuzz/protoToYul.cpp              |  4 +++-
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
index 89acd2c090..7c045b47a7 100644
--- a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
+++ b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
@@ -71,11 +71,6 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		of.write(yul_source.data(), static_cast<streamsize>(yul_source.size()));
 	}
 
-	// Do not proceed with tests that are too large. 1200 is an arbitrary
-	// threshold.
-	if (yul_source.size() > 1200)
-		return;
-
 	YulStringRepository::reset();
 
 	solidity::frontend::OptimiserSettings settings = solidity::frontend::OptimiserSettings::full();
@@ -162,18 +157,6 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	ostringstream optimizedState;
 	optimizedState << EVMHostPrinter{hostContext, deployResultOpt.create_address}.state();
 
-	int64_t constexpr tolerance = 1000;
-	if (callResult.gas_left > callResultOpt.gas_left)
-		if (callResult.gas_left - callResultOpt.gas_left > tolerance)
-		{
-			cout << "Gas differential " << callResult.gas_left - callResultOpt.gas_left << endl;
-			cout << "Unoptimised bytecode" << endl;
-			cout << util::toHex(unoptimisedByteCode) << endl;
-			cout << "Optimised bytecode" << endl;
-			cout << util::toHex(optimisedByteCode) << endl;
-			solAssert(false, "Optimised code consumed more than +1000 gas.");
-		}
-
 	solAssert(
 		unoptimizedState.str() == optimizedState.str(),
 		"State of unoptimised and optimised stack reused code do not match."
diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 599e6153e8..f6759dddb4 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -1348,7 +1348,9 @@ void ProtoConverter::visit(Statement const& _x)
 			m_output << "continue\n";
 		break;
 	case Statement::kLogFunc:
-		visit(_x.log_func());
+		// Log is a stateful statement since it writes to storage.
+		if (!m_filterStatefulInstructions)
+			visit(_x.log_func());
 		break;
 	case Statement::kCopyFunc:
 		visit(_x.copy_func());

From 4bcd69e7bd112a120c4c3be05aec07fc39f6a14b Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Thu, 27 Jan 2022 14:49:44 +0100
Subject: [PATCH 0319/1748] Code transform fuzzer: Only test against latest EVM
 version.

---
 test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
index 7c045b47a7..5d29637c03 100644
--- a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
+++ b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
@@ -60,8 +60,9 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		filterUnboundedLoops
 	);
 	string yul_source = converter.programToString(_input);
-	// Fuzzer also fuzzes the EVM version field.
-	langutil::EVMVersion version = converter.version();
+	// Do not fuzz the EVM Version field.
+	// See https://github.com/ethereum/solidity/issues/12590
+	langutil::EVMVersion version;
 	EVMHost hostContext(version, evmone);
 	hostContext.reset();
 

From 8c6f80aa0302da32d7e313c117ffaf4cf6a8e6c2 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Tue, 25 Jan 2022 18:46:27 -0500
Subject: [PATCH 0320/1748] Document our version policy w/r/t SemVer

---
 docs/installing-solidity.rst | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 438c1afa95..f2ed852370 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -9,11 +9,22 @@ Installing the Solidity Compiler
 Versioning
 ==========
 
-Solidity versions follow `semantic versioning <https://semver.org>`_ and in addition to
-releases, **nightly development builds** are also made available.  The nightly builds
-are not guaranteed to be working and despite best efforts they might contain undocumented
-and/or broken changes. We recommend using the latest release. Package installers below
-will use the latest release.
+Solidity versions follow `Semantic Versioning <https://semver.org>`_. In
+addition, patch level releases with major release 0 (i.e. 0.x.y) will not
+contain breaking changes. That means code that compiles with version 0.x.y
+can be expected to compile with 0.x.z where z > y.
+
+In addition to releases, we provide **nightly development builds** with the
+intention of making it easy for developers to try out upcoming features and
+provide early feedback. Note, however, that while the nightly builds are usually
+very stable, they contain bleeding-edge code from the development branch and are
+not guaranteed to be always working. Despite our best efforts, they might
+contain undocumented and/or broken changes that will not become a part of an
+actual release. They are not meant for production use.
+
+When deploying contracts, you should use the latest released version of Solidity. This
+is because breaking changes, as well as new features and bug fixes are introduced regularly.
+We currently use a 0.x version number [to indicate this fast pace of change](https://semver.org/#spec-item-4).
 
 Remix
 =====
@@ -551,10 +562,10 @@ of the current nightly build, but without the ``prerelease`` specifier.
 
 Example:
 
-0. The 0.4.0 release is made.
-1. The nightly build has a version of 0.4.1 from now on.
-2. Non-breaking changes are introduced --> no change in version.
-3. A breaking change is introduced --> version is bumped to 0.5.0.
-4. The 0.5.0 release is made.
+1. The 0.4.0 release is made.
+2. The nightly build has a version of 0.4.1 from now on.
+3. Non-breaking changes are introduced --> no change in version.
+4. A breaking change is introduced --> version is bumped to 0.5.0.
+5. The 0.5.0 release is made.
 
 This behaviour works well with the  :ref:`version pragma <version_pragma>`.

From 95f9289f2ced419639478821618f962041ac9599 Mon Sep 17 00:00:00 2001
From: Younghoon-Lee <8109h@naver.com>
Date: Fri, 28 Jan 2022 01:11:35 +0900
Subject: [PATCH 0321/1748] Add blank line to make it consistency

---
 docs/style-guide.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 177f4a7987..1bbe6cc740 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -281,6 +281,7 @@ Yes:
         // ...
     }
 
+
     contract B is Owned {
         // ...
     }
@@ -846,15 +847,20 @@ Yes:
         constructor(uint) {
         }
     }
+
+
     contract C {
         constructor(uint, uint) {
         }
     }
+
+
     contract D {
         constructor(uint) {
         }
     }
 
+
     contract A is B, C, D {
         uint x;
 

From dec511aad8f7ea748455a2bdc5e3218398f04995 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Tue, 25 Jan 2022 20:31:01 +0530
Subject: [PATCH 0322/1748]  Corresponding code in the .cpp file has been
 commented instead of begin removed pending preliminary reviews Code
 generators needed fixing of the cleanup process during typecasting of bytes
 and integers

---
 Changelog.md                                  |  2 ++
 libsolidity/codegen/YulUtilFunctions.cpp      |  4 ++--
 .../codegen/ir/IRGeneratorForStatements.cpp   | 15 +++++++-----
 .../codegen/ir/IRGeneratorForStatements.h     | 12 ++++++----
 ...nup_bytes_types_shortening_OldCodeGen.sol} |  5 ++--
 ...anup_bytes_types_shortening_newCodeGen.sol | 14 +++++++++++
 ...xed_log_topic_during_explicit_downcast.sol | 23 +++++++++++++++++++
 ...ing_explicit_downcast_during_emissions.sol | 19 +++++++++++++++
 .../userDefinedValueType/erc20.sol            |  2 +-
 .../semanticTests/various/erc20.sol           |  2 +-
 10 files changed, 81 insertions(+), 17 deletions(-)
 rename test/libsolidity/semanticTests/cleanup/{cleanup_bytes_types_shortening.sol => cleanup_bytes_types_shortening_OldCodeGen.sol} (77%)
 create mode 100644 test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol
 create mode 100644 test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast.sol
 create mode 100644 test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol

diff --git a/Changelog.md b/Changelog.md
index 571c1011d3..510feae9f2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,6 +16,8 @@ Bugfixes:
  * Code Generator: Fix ICE when doing an explicit conversion from ``string calldata`` to ``bytes``.
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
  * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the parent contract contains immutable variables.
+ * IR Generator: Add missing cleanup during the conversion of fixed bytes types to smaller fixed bytes types.
+ * IR Generator: Add missing cleanup for indexed event arguments of value type.
  * IR Generator: Fix IR syntax error when copying storage arrays of structs containing functions.
  * Natspec: Fix ICE when overriding a struct getter with a Natspec-documented return value and the name in the struct is different.
  * TypeChecker: Fix ICE when a constant variable declaration forward references a struct.
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 217ec14b0d..84f63a9e15 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -3400,11 +3400,11 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 						.render();
 			else
 			{
-				// clear for conversion to longer bytes
 				solAssert(toCategory == Type::Category::FixedBytes, "Invalid type conversion requested.");
+				FixedBytesType const& to = dynamic_cast<FixedBytesType const&>(_to);
 				body =
 					Whiskers("converted := <clean>(value)")
-					("clean", cleanupFunction(from))
+					("clean", cleanupFunction((to.numBytes() <= from.numBytes()) ? to : from))
 					.render();
 			}
 			break;
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 420c48baa4..cf48df4700 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1035,7 +1035,10 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 						")\n";
 				}
 				else
-					indexedArgs.emplace_back(convert(arg, *paramTypes[i]));
+				{
+					solAssert(parameterTypes[i]->sizeOnStack() == 1, "");
+					indexedArgs.emplace_back(convert(arg, *paramTypes[i], true));
+				}
 			}
 			else
 			{
@@ -2724,14 +2727,14 @@ void IRGeneratorForStatements::assignInternalFunctionIDIfNotCalledDirectly(
 	m_context.addToInternalDispatch(_referencedFunction);
 }
 
-IRVariable IRGeneratorForStatements::convert(IRVariable const& _from, Type const& _to)
+IRVariable IRGeneratorForStatements::convert(IRVariable const& _from, Type const& _to, bool _forceCleanup)
 {
-	if (_from.type() == _to)
+	if (_from.type() == _to && !_forceCleanup)
 		return _from;
 	else
 	{
 		IRVariable converted(m_context.newYulVariable(), _to);
-		define(converted, _from);
+		define(converted, _from, _forceCleanup);
 		return converted;
 	}
 }
@@ -2763,10 +2766,10 @@ void IRGeneratorForStatements::declare(IRVariable const& _var)
 		appendCode() << "let " << _var.commaSeparatedList() << "\n";
 }
 
-void IRGeneratorForStatements::declareAssign(IRVariable const& _lhs, IRVariable const& _rhs, bool _declare)
+void IRGeneratorForStatements::declareAssign(IRVariable const& _lhs, IRVariable const& _rhs, bool _declare, bool _forceCleanup)
 {
 	string output;
-	if (_lhs.type() == _rhs.type())
+	if (_lhs.type() == _rhs.type() && !_forceCleanup)
 		for (auto const& [stackItemName, stackItemType]: _lhs.type().stackItems())
 			if (stackItemType)
 				declareAssign(_lhs.part(stackItemName), _rhs.part(stackItemName), _declare);
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.h b/libsolidity/codegen/ir/IRGeneratorForStatements.h
index 74b7def549..10e8f0b5ef 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.h
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.h
@@ -86,7 +86,11 @@ class IRGeneratorForStatements: public IRGeneratorForStatementsBase
 	IRVariable evaluateExpression(Expression const& _expression, Type const& _to);
 
 	/// Defines @a _var using the value of @a _value while performing type conversions, if required.
-	void define(IRVariable const& _var, IRVariable const& _value) { declareAssign(_var, _value, true); }
+	/// If @a _forceCleanup is set to true, it also cleans the value of the variable after the conversion.
+	void define(IRVariable const& _var, IRVariable const& _value, bool _forceCleanup = false)
+	{
+		declareAssign(_var, _value, true, _forceCleanup);
+	}
 
 	/// @returns the name of a function that computes the value of the given constant
 	/// and also generates the function.
@@ -162,8 +166,8 @@ class IRGeneratorForStatements: public IRGeneratorForStatementsBase
 	);
 
 	/// Generates the required conversion code and @returns an IRVariable referring to the value of @a _variable
-	/// converted to type @a _to.
-	IRVariable convert(IRVariable const& _variable, Type const& _to);
+	/// If @a _forceCleanup is set to true, it also cleans the value of the variable after the conversion.
+	IRVariable convert(IRVariable const& _variable, Type const& _to, bool _forceCleanup = false);
 
 	/// @returns a Yul expression representing the current value of @a _expression,
 	/// converted to type @a _to if it does not yet have that type.
@@ -179,7 +183,7 @@ class IRGeneratorForStatements: public IRGeneratorForStatementsBase
 	/// Declares variable @a _var.
 	void declare(IRVariable const& _var);
 
-	void declareAssign(IRVariable const& _var, IRVariable const& _value, bool _define);
+	void declareAssign(IRVariable const& _var, IRVariable const& _value, bool _define, bool _forceCleanup = false);
 
 	/// @returns an IRVariable with the zero
 	/// value of @a _type.
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_OldCodeGen.sol
similarity index 77%
rename from test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening.sol
rename to test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_OldCodeGen.sol
index edae83729c..9ca68e6d0d 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_OldCodeGen.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
-// compileViaYul: also
+// compileViaYul: false
 // ----
-// f() -> "\xff\xff\xff\xff"
+// f() -> 0xffffffff00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol
new file mode 100644
index 0000000000..a99b82a085
--- /dev/null
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f() public pure returns (bytes32 r) {
+        bytes4 x = 0xffffffff;
+        bytes2 y = bytes2(x);
+        assembly {
+            r := y
+        }
+    }
+}
+// ====
+// compileToEwasm: also
+// compileViaYul: true
+// ----
+// f() -> 0xffff000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast.sol b/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast.sol
new file mode 100644
index 0000000000..f0aa239bae
--- /dev/null
+++ b/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast.sol
@@ -0,0 +1,23 @@
+contract C {
+    function f() public pure returns (uint32 y) {
+        uint8 x = uint8(uint256(0x31313131313131313131313131313131));
+        assembly { y := x }
+    }
+
+    function g() public pure returns (bytes32 y) {
+        bytes1 x = bytes1(bytes16(0x31313131313131313131313131313131));
+        assembly { y := x }
+    }
+
+    function h() external returns (bytes32 y) {
+        bytes1 x;
+        assembly { x := sub(0,1) }
+        y = x;
+    }
+}
+// ====
+// compileViaYul: true
+// ----
+// f() -> 0x31
+// g() -> 0x3100000000000000000000000000000000000000000000000000000000000000
+// h() -> 0xff00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol b/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol
new file mode 100644
index 0000000000..df6bc2192f
--- /dev/null
+++ b/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol
@@ -0,0 +1,19 @@
+contract C {
+    event ev0(bytes1 indexed);
+    constructor() {
+        emit ev0(bytes1(bytes16(0x31313131313131313131313131313131)));
+    }
+    function j() external {
+        bytes1 x;
+        assembly { x := 0x3131313131313131313131313131313131313131313131313131313131313131 }
+        emit ev0(x);
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// constructor() ->
+// ~ emit ev0(bytes1): #"1"
+// gas legacy: 168735
+// j() ->
+// ~ emit ev0(bytes1): #"1"
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index efe2ee1148..220d9d9a24 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -115,7 +115,7 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 442239
+// gas irOptimized: 447831
 // gas legacy: 861559
 // gas legacyOptimized: 420959
 // totalSupply() -> 20
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index 204e620d62..64a3286a94 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -98,7 +98,7 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 437697
+// gas irOptimized: 443295
 // gas legacy: 833310
 // gas legacyOptimized: 416135
 // totalSupply() -> 20

From 0f7b69432e9c7d576c57812889dba3261053a534 Mon Sep 17 00:00:00 2001
From: Nikita Stupin <18281368+nikitastupin@users.noreply.github.com>
Date: Tue, 21 Sep 2021 12:04:43 +0300
Subject: [PATCH 0323/1748] Separate visibility for state variables and
 functions

---
 docs/contracts/visibility-and-getters.rst | 63 ++++++++++++++---------
 1 file changed, 38 insertions(+), 25 deletions(-)

diff --git a/docs/contracts/visibility-and-getters.rst b/docs/contracts/visibility-and-getters.rst
index f04945cfdb..8932c5079b 100644
--- a/docs/contracts/visibility-and-getters.rst
+++ b/docs/contracts/visibility-and-getters.rst
@@ -1,20 +1,41 @@
 .. index:: ! visibility, external, public, private, internal
 
+.. |visibility-caveat| replace:: Making something ``private`` or ``internal`` only prevents other contracts from reading or modifying the information, but it will still be visible to the whole world outside of the blockchain.
+
 .. _visibility-and-getters:
 
 **********************
 Visibility and Getters
 **********************
 
-Solidity knows two kinds of function calls: internal
-ones that do not create an actual EVM call (also called
-a "message call") and external
-ones that do. Because of that, there are four types of visibility for
-functions and state variables.
+State Variable Visibility
+=========================
+
+``public``
+    Public state variables differ from internal ones only in that the compiler automatically generates
+    :ref:`getter functions<getter-functions>` for them, which allows other contracts to read their values.
+    When used within the same contract, the external access (e.g. ``this.x``) invokes the getter
+    while internal access (e.g. ``x``) gets the variable value directly from storage.
+    Setter functions are not generated so other contracts cannot directly modify their values.
+
+``internal``
+    Internal state variables can only be accessed from within the contract they are defined in
+    and in derived contracts.
+    They cannot be accessed externally.
+    This is the default visibility level for state variables.
+
+``private``
+    Private state variables are like internal ones but they are not visible in derived contracts.
+
+.. warning::
+    |visibility-caveat|
 
-Functions have to be specified as being ``external``,
-``public``, ``internal`` or ``private``.
-For state variables, ``external`` is not possible.
+Function Visibility
+===================
+
+Solidity knows two kinds of function calls: external ones that do create an actual EVM message call and internal ones that do not.
+Furthermore, internal functions can be made inaccessible to derived contracts.
+This gives rise to four types of visibility for functions.
 
 ``external``
     External functions are part of the contract interface,
@@ -24,27 +45,19 @@ For state variables, ``external`` is not possible.
 
 ``public``
     Public functions are part of the contract interface
-    and can be either called internally or via
-    messages. For public state variables, an automatic getter
-    function (see below) is generated.
+    and can be either called internally or via message calls.
 
 ``internal``
-    Those functions and state variables can only be
-    accessed internally (i.e. from within the current contract
-    or contracts deriving from it), without using ``this``.
-    This is the default visibility level for state variables.
+    Internal functions can only be accessed from within the current contract
+    or contracts deriving from it.
+    They cannot be accessed externally.
+    Since they are not exposed to the outside through the contract's ABI, they can take parameters of internal types like mappings or storage references.
 
 ``private``
-    Private functions and state variables are only
-    visible for the contract they are defined in and not in
-    derived contracts.
-
-.. note::
-    Everything that is inside a contract is visible to
-    all observers external to the blockchain. Making something ``private``
-    only prevents other contracts from reading or modifying
-    the information, but it will still be visible to the
-    whole world outside of the blockchain.
+    Private functions are like internal ones but they are not visible in derived contracts.
+
+.. warning::
+    |visibility-caveat|
 
 The visibility specifier is given after the type for
 state variables and between parameter list and

From 0fe5811459bb25078e471ceeec475eaf49374d21 Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Mon, 24 Jan 2022 11:56:27 +0100
Subject: [PATCH 0324/1748] Fixed a ICE on calldata to struct member copy

---
 Changelog.md                                  |  1 +
 .../codegen/ir/IRGeneratorForStatements.cpp   |  7 +-
 .../structs/copy_from_calldata.sol            | 38 ++++++++
 .../structs/copy_from_storage.sol             | 24 +++++
 .../copy_struct_array_from_storage.sol        | 96 +++++++++++++++++++
 .../structs/function_type_copy.sol            | 44 +++++++++
 .../msg_data_to_struct_member_copy.sol        | 45 +++++++++
 .../array/copy_from_function_type.sol         |  9 ++
 8 files changed, 262 insertions(+), 2 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/structs/copy_from_calldata.sol
 create mode 100644 test/libsolidity/semanticTests/structs/copy_from_storage.sol
 create mode 100644 test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
 create mode 100644 test/libsolidity/semanticTests/structs/function_type_copy.sol
 create mode 100644 test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
 create mode 100644 test/libsolidity/syntaxTests/array/copy_from_function_type.sol

diff --git a/Changelog.md b/Changelog.md
index 510feae9f2..a49aedea4c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -18,6 +18,7 @@ Bugfixes:
  * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the parent contract contains immutable variables.
  * IR Generator: Add missing cleanup during the conversion of fixed bytes types to smaller fixed bytes types.
  * IR Generator: Add missing cleanup for indexed event arguments of value type.
+ * IR Generator: Fix internal error when copying reference types in calldata and storage to struct or array members in memory.
  * IR Generator: Fix IR syntax error when copying storage arrays of structs containing functions.
  * Natspec: Fix ICE when overriding a struct getter with a Natspec-documented return value and the name in the struct is different.
  * TypeChecker: Fix ICE when a constant variable declaration forward references a struct.
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index cf48df4700..d68bc39c60 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2985,8 +2985,11 @@ void IRGeneratorForStatements::writeToLValue(IRLValue const& _lvalue, IRVariable
 				{
 					solAssert(_lvalue.type.sizeOnStack() == 1);
 					auto const* valueReferenceType = dynamic_cast<ReferenceType const*>(&_value.type());
-					solAssert(valueReferenceType && valueReferenceType->dataStoredIn(DataLocation::Memory));
-					appendCode() << "mstore(" + _memory.address + ", " + _value.part("mpos").name() + ")\n";
+					solAssert(valueReferenceType);
+					if (valueReferenceType->dataStoredIn(DataLocation::Memory))
+						appendCode() << "mstore(" + _memory.address + ", " + _value.part("mpos").name() + ")\n";
+					else
+						appendCode() << "mstore(" + _memory.address + ", " + m_utils.conversionFunction(_value.type(), _lvalue.type) + "(" + _value.commaSeparatedList() + "))\n";
 				}
 			},
 			[&](IRLValue::Stack const& _stack) { assign(_stack.variable, _value); },
diff --git a/test/libsolidity/semanticTests/structs/copy_from_calldata.sol b/test/libsolidity/semanticTests/structs/copy_from_calldata.sol
new file mode 100644
index 0000000000..bfe6fc949c
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_from_calldata.sol
@@ -0,0 +1,38 @@
+// Example from https://github.com/ethereum/solidity/issues/12558
+pragma abicoder v2;
+contract C {
+    function f(uint[] calldata a) external returns (uint[][] memory) {
+        uint[][] memory m = new uint[][](2);
+        m[0] = a;
+
+        return m;
+    }
+}
+contract Test {
+    C immutable c = new C();
+
+    function test() external returns (bool) {
+        uint[] memory arr = new uint[](4);
+
+        arr[0] = 13;
+        arr[1] = 14;
+        arr[2] = 15;
+        arr[3] = 16;
+
+        uint[][] memory ret = c.f(arr);
+        assert(ret.length == 2);
+        assert(ret[0].length == 4);
+        assert(ret[0][0] == 13);
+        assert(ret[0][1] == 14);
+        assert(ret[0][2] == 15);
+        assert(ret[0][3] == 16);
+        assert(ret[1].length == 0);
+
+        return true;
+    }
+}
+// ====
+// EVMVersion: >homestead
+// compileViaYul: also
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/structs/copy_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_from_storage.sol
new file mode 100644
index 0000000000..d4a970bdce
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_from_storage.sol
@@ -0,0 +1,24 @@
+pragma abicoder v2;
+// Example from https://github.com/ethereum/solidity/issues/12558
+struct S {
+    uint x;
+}
+
+contract C {
+    S sStorage;
+    constructor() {
+        sStorage.x = 13;
+    }
+
+    function f() external returns (S[] memory) {
+        S[] memory sMemory = new S[](1);
+
+        sMemory[0] = sStorage;
+
+        return sMemory;
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// f() -> 0x20, 1, 13
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
new file mode 100644
index 0000000000..7bbe495ce2
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
@@ -0,0 +1,96 @@
+pragma abicoder v2;
+
+struct S { uint value; }
+
+contract Test {
+    S[][] a;
+    S[] b;
+
+    constructor() {
+        a.push();
+        a[0].push(S(1));
+        a[0].push(S(2));
+        a[0].push(S(3));
+
+        b.push(S(4));
+        b.push(S(5));
+        b.push(S(6));
+        b.push(S(7));
+    }
+
+    function test1() external returns (bool) {
+        a.push();
+        a[1] = b;
+
+        assert(a.length == 2);
+        assert(a[0].length == 3);
+        assert(a[1].length == 4);
+        assert(a[1][0].value == 4);
+        assert(a[1][1].value == 5);
+        assert(a[1][2].value == 6);
+        assert(a[1][3].value == 7);
+
+        return true;
+    }
+
+    function test2() external returns (bool) {
+        S[][] memory temp = new S[][](2);
+
+        temp = a;
+
+        assert(temp.length == 2);
+        assert(temp[0].length == 3);
+        assert(temp[1].length == 4);
+        assert(temp[1][0].value == 4);
+        assert(temp[1][1].value == 5);
+        assert(temp[1][2].value == 6);
+        assert(temp[1][3].value == 7);
+
+        return true;
+    }
+
+    function test3() external returns (bool) {
+        S[][] memory temp = new S[][](2);
+
+        temp[0] = a[0];
+        temp[1] = a[1];
+
+        assert(temp.length == 2);
+        assert(temp[0].length == 3);
+        assert(temp[1].length == 4);
+        assert(temp[1][0].value == 4);
+        assert(temp[1][1].value == 5);
+        assert(temp[1][2].value == 6);
+        assert(temp[1][3].value == 7);
+
+        return true;
+    }
+
+    function test4() external returns (bool) {
+        S[][] memory temp = new S[][](2);
+
+        temp[0] = a[0];
+        temp[1] = b;
+
+        assert(temp.length == 2);
+        assert(temp[0].length == 3);
+        assert(temp[1].length == 4);
+        assert(temp[1][0].value == 4);
+        assert(temp[1][1].value == 5);
+        assert(temp[1][2].value == 6);
+        assert(temp[1][3].value == 7);
+
+        return true;
+    }
+}
+// ====
+// EVMVersion: >homestead
+// compileViaYul: also
+// ----
+// test1() -> true
+// gas irOptimized: 150618
+// gas legacy: 150266
+// gas legacyOptimized: 149875
+// test2() -> true
+// test3() -> true
+// test4() -> true
diff --git a/test/libsolidity/semanticTests/structs/function_type_copy.sol b/test/libsolidity/semanticTests/structs/function_type_copy.sol
new file mode 100644
index 0000000000..79fe5ef4c8
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/function_type_copy.sol
@@ -0,0 +1,44 @@
+pragma abicoder v2;
+struct S {
+    function () external[] functions;
+}
+
+contract C {
+    function f(function () external[] calldata functions) external returns (S memory) {
+        S memory s;
+        s.functions = functions;
+        return s;
+    }
+}
+
+contract Test {
+    C immutable c = new C();
+
+    function test() external returns (bool) {
+        function() external[] memory functions = new function() external[](3);
+
+        functions[0] = this.random1;
+        functions[1] = this.random2;
+        functions[2] = this.random3;
+
+        S memory ret = c.f(functions);
+
+        assert(ret.functions.length == 3);
+        assert(ret.functions[0] == this.random1);
+        assert(ret.functions[1] == this.random2);
+        assert(ret.functions[2] == this.random3);
+
+        return true;
+    }
+    function random1() external {
+    }
+    function random2() external {
+    }
+    function random3() external {
+    }
+}
+// ====
+// EVMVersion: >homestead
+// compileViaYul: also
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol b/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
new file mode 100644
index 0000000000..f28bbf477f
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
@@ -0,0 +1,45 @@
+pragma abicoder v2;
+
+struct St0 {
+    bytes el0;
+}
+contract C {
+    function f() external returns (St0 memory) {
+        St0 memory x;
+        x.el0 = msg.data;
+        return x;
+    }
+
+    function g() external returns (St0 memory) {
+        bytes memory temp = msg.data;
+        St0 memory x;
+        x.el0 = temp;
+        return x;
+    }
+
+    function hashes() external returns (bytes4, bytes4) {
+        return (this.f.selector, this.g.selector);
+    }
+
+    function large(uint256, uint256, uint256, uint256) external returns (St0 memory) {
+        St0 memory x;
+        x.el0 = msg.data;
+        return x;
+    }
+
+    function another_large(uint256, uint256, uint256, uint256) external returns (St0 memory) {
+        bytes memory temp = msg.data;
+        St0 memory x;
+        x.el0 = temp;
+        return x;
+    }
+
+}
+// ====
+// compileViaYul: also
+// ----
+// f() -> 0x20, 0x20, 4, 0x26121ff000000000000000000000000000000000000000000000000000000000
+// g() -> 0x20, 0x20, 4, 0xe2179b8e00000000000000000000000000000000000000000000000000000000
+// hashes() -> 0x26121ff000000000000000000000000000000000000000000000000000000000, 0xe2179b8e00000000000000000000000000000000000000000000000000000000
+// large(uint256,uint256,uint256,uint256): 1, 2, 3, 4 -> 0x20, 0x20, 0x84, 0xe02492f800000000000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000000000, 0x200000000000000000000000000000000000000000000000000000000, 0x300000000000000000000000000000000000000000000000000000000, 0x400000000000000000000000000000000000000000000000000000000
+// another_large(uint256,uint256,uint256,uint256): 1, 2, 3, 4 -> 0x20, 0x20, 0x84, 0x2a46f85a00000000000000000000000000000000000000000000000000000000, 0x100000000000000000000000000000000000000000000000000000000, 0x200000000000000000000000000000000000000000000000000000000, 0x300000000000000000000000000000000000000000000000000000000, 0x400000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/syntaxTests/array/copy_from_function_type.sol b/test/libsolidity/syntaxTests/array/copy_from_function_type.sol
new file mode 100644
index 0000000000..b795094683
--- /dev/null
+++ b/test/libsolidity/syntaxTests/array/copy_from_function_type.sol
@@ -0,0 +1,9 @@
+// Example from https://github.com/ethereum/solidity/issues/12558
+pragma abicoder v2;
+contract C {
+  function() external[1][] s0;
+  constructor(function() external[1][] memory i0)
+  {
+    i0[0] = s0[1];
+  }
+}

From f1ce1528bb988fe3d51f3cc98e16dd1b5eaa9d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 28 Jan 2022 21:46:01 +0100
Subject: [PATCH 0325/1748] Update the release checklist to use the
 build+publish commands for solc-js

---
 ReleaseChecklist.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index b95ea32a94..39a3d9a324 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -66,7 +66,8 @@
 ### Release solc-js
  - [ ] Wait until solc-bin was properly deployed. You can test this via remix - a test run through remix is advisable anyway.
  - [ ] Increment the version number, create a pull request for that, merge it after tests succeeded.
- - [ ] Run ``npm run updateBinary && npm publish`` in the updated ``solc-js`` repository.
+ - [ ] Run ``npm run build:tarball`` in the updated ``solc-js`` repository to create ``solc-<version>.tgz``. Inspect the tarball to ensure that it contains an up to date compiler binary.
+ - [ ] Run ``npm run publish:tarball`` to publish the newly created tarball.
  - [ ] Create a tag using ``git tag --annotate v$VERSION`` and push it with ``git push --tags``.
 
 ### Post-release

From 8728971354c15b1a8147726fa8c3efe8c801f0ee Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 31 Jan 2022 19:07:01 +0100
Subject: [PATCH 0326/1748] Correct type of address.code

---
 docs/types/value-types.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 215a18ceec..30a8577963 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -331,7 +331,9 @@ on ``call``.
 
 * ``code`` and ``codehash``
 
-You can query the deployed code for any smart contract. Use ``code`` to get the EVM bytecode as a string, which might be empty. Use ``codehash`` get the Keccak-256 hash of that code.
+You can query the deployed code for any smart contract. Use ``.code`` to get the EVM bytecode as a
+``bytes memory``, which might be empty. Use ``.codehash`` get the Keccak-256 hash of that code
+(as a ``bytes32``). Note that ``addr.codehash`` is cheaper than using ``keccak256(addr.code)``.
 
 .. note::
     All contracts can be converted to ``address`` type, so it is possible to query the balance of the

From 4259e1bb7021d28931bf3d3f5973e32431f2c837 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 31 Jan 2022 19:18:32 +0100
Subject: [PATCH 0327/1748] Fix changelog

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index a49aedea4c..e75e2c710e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -15,7 +15,7 @@ Bugfixes:
  * Code Generator: Fix ICE when accessing the members of external functions occupying more than two stack slots.
  * Code Generator: Fix ICE when doing an explicit conversion from ``string calldata`` to ``bytes``.
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
- * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the parent contract contains immutable variables.
+ * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the derived contract contains immutable variables.
  * IR Generator: Add missing cleanup during the conversion of fixed bytes types to smaller fixed bytes types.
  * IR Generator: Add missing cleanup for indexed event arguments of value type.
  * IR Generator: Fix internal error when copying reference types in calldata and storage to struct or array members in memory.

From 73470aed6afb172f189a550b79e310c9cac8c680 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 3 Nov 2021 16:10:14 +0100
Subject: [PATCH 0328/1748] Fix util::valueOrDefault.

---
 libsolutil/CommonData.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/libsolutil/CommonData.h b/libsolutil/CommonData.h
index 0d5a75282e..b117c27728 100644
--- a/libsolutil/CommonData.h
+++ b/libsolutil/CommonData.h
@@ -267,17 +267,22 @@ template<
 	typename MapType,
 	typename KeyType,
 	typename ValueType = std::decay_t<decltype(std::declval<MapType>().find(std::declval<KeyType>())->second)> const&,
-	typename AllowCopyType = void*
+	typename AllowCopyType = std::conditional_t<std::is_pod_v<ValueType> || std::is_pointer_v<ValueType>, detail::allow_copy, void*>
 >
-decltype(auto) valueOrDefault(MapType&& _map, KeyType const& _key, ValueType&& _defaultValue = {}, AllowCopyType = nullptr)
+decltype(auto) valueOrDefault(
+	MapType&& _map,
+	KeyType const& _key,
+	ValueType&& _defaultValue = {},
+	AllowCopyType = {}
+)
 {
 	auto it = _map.find(_key);
 	static_assert(
 		std::is_same_v<AllowCopyType, detail::allow_copy> ||
-		std::is_reference_v<decltype((it == _map.end()) ? _defaultValue : it->second)>,
+		std::is_reference_v<decltype((it == _map.end()) ? std::forward<ValueType>(_defaultValue) : it->second)>,
 		"valueOrDefault does not allow copies by default. Pass allow_copy as additional argument, if you want to allow copies."
 	);
-	return (it == _map.end()) ? _defaultValue : it->second;
+	return (it == _map.end()) ? std::forward<ValueType>(_defaultValue) : it->second;
 }
 
 namespace detail

From 8bcc4ee7d1a65f4732549f31cd7d5e8194c6c260 Mon Sep 17 00:00:00 2001
From: franzihei <franziheintel@gmail.com>
Date: Mon, 31 Jan 2022 15:32:49 +0100
Subject: [PATCH 0329/1748] Adding a few resources

---
 docs/resources.rst | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/resources.rst b/docs/resources.rst
index 5b8d0013ab..a3b8d17e08 100644
--- a/docs/resources.rst
+++ b/docs/resources.rst
@@ -14,7 +14,7 @@ General Resources
 * `Solidity Compiler Developers Chat <https://matrix.to/#/#ethereum_solidity-dev:gitter.im>`_
 * `Awesome Solidity <https://github.com/bkrem/awesome-solidity>`_
 * `Solidity by Example <https://solidity-by-example.org/>`_
-
+* `Solidity Documentation Community Translations <https://github.com/solidity-docs>`_
 
 Integrated (Ethereum) Development Environments
 ==============================================
@@ -28,15 +28,15 @@ Integrated (Ethereum) Development Environments
     * `Embark <https://framework.embarklabs.io/>`_
         Developer platform for building and deploying decentralized applications.
 
+    * `Foundry <https://github.com/gakonst/foundry>`_
+        Fast, portable and modular toolkit for Ethereum application development written in Rust.
+
     * `Hardhat <https://hardhat.org/>`_
         Ethereum development environment with local Ethereum network, debugging features and plugin ecosystem.
 
     * `Remix <https://remix.ethereum.org/>`_
         Browser-based IDE with integrated compiler and Solidity runtime environment without server-side components.
 
-    * `Scaffold-ETH <https://github.com/austintgriffith/scaffold-eth>`_
-        Ethereum development stack focused on fast product iterations.
-
     * `Truffle <https://www.trufflesuite.com/truffle>`_
         Ethereum development framework.
 
@@ -112,6 +112,9 @@ Solidity Tools
 * `PIET <https://piet.slock.it/>`_
     A tool to develop, audit and use Solidity smart contracts through a simple graphical interface.
 
+* `Scaffold-ETH <https://github.com/scaffold-eth/scaffold-eth>`_
+    Forkable Ethereum development stack focused on fast product iterations.
+
 * `sol2uml <https://www.npmjs.com/package/sol2uml>`_
     Unified Modeling Language (UML) class diagram generator for Solidity contracts.
 
@@ -130,6 +133,9 @@ Solidity Tools
 * `Solhint <https://github.com/protofire/solhint>`_
     Solidity linter that provides security, style guide and best practice rules for smart contract validation.
 
+* `Sourcify <https://sourcify.dev/>`_
+    Decentralized automated contract verification service and public repository of contract metadata.
+
 * `Sūrya <https://github.com/ConsenSys/surya/>`_
     Utility tool for smart contract systems, offering a number of visual outputs and information about the contracts' structure. Also supports querying the function call graph.
 

From e2711b7fabcbf3af0c15e415778d821c1581d913 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Tue, 25 Jan 2022 20:31:01 +0530
Subject: [PATCH 0330/1748]  Corresponding code in the .cpp file has been
 commented instead of begin removed pending preliminary reviews Code
 generators needed fixing of the cleanup process during typecasting of bytes
 and integers

---
 .../codegen/ir/IRGeneratorForStatements.cpp   | 37 ++++++++++++-------
 .../codegen/ir/IRGeneratorForStatements.h     | 30 +++++++++++----
 2 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index d68bc39c60..86d00dbc9c 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -805,8 +805,8 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 		if (auto type = dynamic_cast<IntegerType const*>(commonType))
 			isSigned = type->isSigned();
 
-		string args = expressionAsType(_binOp.leftExpression(), *commonType, true);
-		args += ", " + expressionAsType(_binOp.rightExpression(), *commonType, true);
+		string args = expressionAsCleanedType(_binOp.leftExpression(), *commonType);
+		args += ", " + expressionAsCleanedType(_binOp.rightExpression(), *commonType);
 
 		auto functionType = dynamic_cast<FunctionType const*>(commonType);
 		solAssert(functionType ? (op == Token::Equal || op == Token::NotEqual) : true, "Invalid function pointer comparison!");
@@ -1037,7 +1037,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 				else
 				{
 					solAssert(parameterTypes[i]->sizeOnStack() == 1, "");
-					indexedArgs.emplace_back(convert(arg, *paramTypes[i], true));
+					indexedArgs.emplace_back(convertAndCleanup(arg, *parameterTypes[i]));
 				}
 			}
 			else
@@ -2727,32 +2727,43 @@ void IRGeneratorForStatements::assignInternalFunctionIDIfNotCalledDirectly(
 	m_context.addToInternalDispatch(_referencedFunction);
 }
 
-IRVariable IRGeneratorForStatements::convert(IRVariable const& _from, Type const& _to, bool _forceCleanup)
+IRVariable IRGeneratorForStatements::convert(IRVariable const& _from, Type const& _to)
 {
-	if (_from.type() == _to && !_forceCleanup)
+	if (_from.type() == _to)
 		return _from;
 	else
 	{
 		IRVariable converted(m_context.newYulVariable(), _to);
-		define(converted, _from, _forceCleanup);
+		define(converted, _from);
 		return converted;
 	}
 }
 
-std::string IRGeneratorForStatements::expressionAsType(Expression const& _expression, Type const& _to, bool _forceCleanup)
+IRVariable IRGeneratorForStatements::convertAndCleanup(IRVariable const& _from, Type const& _to)
+{
+	IRVariable converted(m_context.newYulVariable(), _to);
+	defineAndCleanup(converted, _from);
+	return converted;
+}
+
+std::string IRGeneratorForStatements::expressionAsType(Expression const& _expression, Type const& _to)
 {
 	IRVariable from(_expression);
 	if (from.type() == _to)
-	{
-		if (_forceCleanup)
-			return m_utils.cleanupFunction(_to) + "(" + from.commaSeparatedList() + ")";
-		else
-			return from.commaSeparatedList();
-	}
+		return from.commaSeparatedList();
 	else
 		return m_utils.conversionFunction(from.type(), _to) + "(" + from.commaSeparatedList() + ")";
 }
 
+std::string IRGeneratorForStatements::expressionAsCleanedType(Expression const& _expression, Type const& _to)
+{
+	IRVariable from(_expression);
+	if (from.type() == _to)
+		return m_utils.cleanupFunction(_to) + "(" + expressionAsType(_expression, _to) + ")";
+	else
+		return expressionAsType(_expression, _to) ;
+}
+
 std::ostream& IRGeneratorForStatements::define(IRVariable const& _var)
 {
 	if (_var.type().sizeOnStack() > 0)
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.h b/libsolidity/codegen/ir/IRGeneratorForStatements.h
index 10e8f0b5ef..11f8b3c846 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.h
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.h
@@ -86,10 +86,19 @@ class IRGeneratorForStatements: public IRGeneratorForStatementsBase
 	IRVariable evaluateExpression(Expression const& _expression, Type const& _to);
 
 	/// Defines @a _var using the value of @a _value while performing type conversions, if required.
-	/// If @a _forceCleanup is set to true, it also cleans the value of the variable after the conversion.
-	void define(IRVariable const& _var, IRVariable const& _value, bool _forceCleanup = false)
+	void define(IRVariable const& _var, IRVariable const& _value)
 	{
-		declareAssign(_var, _value, true, _forceCleanup);
+		bool _declare = true;
+		declareAssign(_var, _value, _declare);
+	}
+
+	/// Defines @a _var using the value of @a _value while performing type conversions, if required.
+	/// It also cleans the value of the variable.
+	void defineAndCleanup(IRVariable const& _var, IRVariable const& _value)
+	{
+		bool _forceCleanup = true;
+		bool _declare = true;
+		declareAssign(_var, _value, _declare, _forceCleanup);
 	}
 
 	/// @returns the name of a function that computes the value of the given constant
@@ -166,13 +175,20 @@ class IRGeneratorForStatements: public IRGeneratorForStatementsBase
 	);
 
 	/// Generates the required conversion code and @returns an IRVariable referring to the value of @a _variable
-	/// If @a _forceCleanup is set to true, it also cleans the value of the variable after the conversion.
-	IRVariable convert(IRVariable const& _variable, Type const& _to, bool _forceCleanup = false);
+	IRVariable convert(IRVariable const& _variable, Type const& _to);
+
+	/// Generates the required conversion code and @returns an IRVariable referring to the value of @a _variable
+	/// It also cleans the value of the variable.
+	IRVariable convertAndCleanup(IRVariable const& _from, Type const& _to);
+
+	/// @returns a Yul expression representing the current value of @a _expression,
+	/// converted to type @a _to if it does not yet have that type.
+	std::string expressionAsType(Expression const& _expression, Type const& _to);
 
 	/// @returns a Yul expression representing the current value of @a _expression,
 	/// converted to type @a _to if it does not yet have that type.
-	/// If @a _forceCleanup is set to true, it also cleans the value, in case it already has type @a _to.
-	std::string expressionAsType(Expression const& _expression, Type const& _to, bool _forceCleanup = false);
+	/// It also cleans the value, in case it already has type @a _to.
+	std::string expressionAsCleanedType(Expression const& _expression, Type const& _to);
 
 	/// @returns an output stream that can be used to define @a _var using a function call or
 	/// single stack slot expression.

From 1528d4b9e4e8de6771ce15da90341e96d08dba86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 1 Feb 2022 14:34:03 +0100
Subject: [PATCH 0331/1748] perpetual-pools: Switch the test to our fork
 (original repo is gone)

---
 test/externalTests/perpetual-pools.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index 6c4af4937b..e1ee9af8f5 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -34,7 +34,7 @@ function test_fn { yarn test; }
 
 function perpetual_pools_test
 {
-    local repo="https://github.com/tracer-protocol/perpetual-pools-contracts"
+    local repo="https://github.com/solidity-external-tests/perpetual-pools-contracts"
     local ref_type=branch
     local ref=pools-v2
     local config_file="hardhat.config.ts"

From 6788f77541729e3ab2bc9e41dda66c2c06540b29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 1 Feb 2022 15:25:13 +0100
Subject: [PATCH 0332/1748] Add missing SELECTED_PRESETS argument to some of
 the recently added external tests

---
 test/externalTests/bleeps.sh    | 1 +
 test/externalTests/elementfi.sh | 1 +
 test/externalTests/trident.sh   | 1 +
 test/externalTests/uniswap.sh   | 1 +
 4 files changed, 4 insertions(+)

diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index df0e5e39e0..a4d1efa625 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -27,6 +27,7 @@ source test/externalTests/common.sh
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
 
 function compile_fn { npm run compile; }
 function test_fn { npm run test; }
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index 7227ce37e2..f52a13ca67 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -27,6 +27,7 @@ source test/externalTests/common.sh
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
 
 function compile_fn { npm run build; }
 function test_fn { npm run test; }
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index 26c3d38104..8e6f35ae33 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -27,6 +27,7 @@ source test/externalTests/common.sh
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
 
 function compile_fn { yarn build; }
 
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index b3baad1a32..96a5d2b63b 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -27,6 +27,7 @@ source test/externalTests/common.sh
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
 
 function compile_fn { yarn compile; }
 function test_fn { UPDATE_SNAPSHOT=1 npx hardhat test; }

From 57800529d1f54daa5d5c961532362dd50a62405d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 1 Feb 2022 16:40:08 +0100
Subject: [PATCH 0333/1748] bleeps: Switch to the main branch

---
 test/externalTests/bleeps.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index a4d1efa625..70f69d4603 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -35,8 +35,8 @@ function test_fn { npm run test; }
 function bleeps_test
 {
     local repo="https://github.com/wighawag/bleeps"
-    local ref_type=tag
-    local ref=bleeps_migrations # TODO: There's a 0.4.19 contract in 'main' that would need patching for the latest compiler.
+    local ref_type=branch
+    local ref=main
     local config_file="hardhat.config.ts"
     local config_var=config
 

From e1a90b829e395d5356812d461322e465506c501e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 1 Feb 2022 16:40:28 +0100
Subject: [PATCH 0334/1748] bleeps: Patch WETH9.sol for 0.8.x

---
 test/externalTests/bleeps.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index 70f69d4603..d005cf8efb 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -66,6 +66,12 @@ function bleeps_test
     pushd "contracts/"
     sed -i 's|"bleeps-common": "workspace:\*",|"bleeps-common": "file:../common-lib/",|g' package.json
 
+    sed -i 's/function() public/fallback() external/g' src/externals/WETH9.sol
+    sed -i 's/this\.balance/address(this).balance/g' src/externals/WETH9.sol
+    sed -i 's/uint(-1)/type(uint).max/g' src/externals/WETH9.sol
+    sed -i 's/msg\.sender\.transfer(/payable(msg.sender).transfer(/g' src/externals/WETH9.sol
+    sed -i 's/^\s*\(Deposit\|Withdrawal\|Approval\|Transfer\)(/emit \1(/g' src/externals/WETH9.sol
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"

From 1e0a695d241dcf430c485dfdfb1d9e2b454fdb7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 1 Feb 2022 17:01:10 +0100
Subject: [PATCH 0335/1748] Disable bleeps external test until it gets fixed
 upstream

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 143a692fdb..44b44bb012 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1468,7 +1468,8 @@ workflows:
       - t_ems_ext: *job_native_test_ext_trident
       - t_ems_ext: *job_native_test_ext_euler
       - t_ems_ext: *job_native_test_ext_yield_liquidator
-      - t_ems_ext: *job_native_test_ext_bleeps
+      # Disabled until we have a fix for https://github.com/wighawag/bleeps/issues/2
+      #-t_ems_ext: *job_native_test_ext_bleeps
       - t_ems_ext: *job_native_test_ext_pool_together
       - t_ems_ext: *job_native_test_ext_perpetual_pools
       - t_ems_ext: *job_native_test_ext_uniswap

From 9043621747de80cfb6b4a5e890f062d6e962d27d Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Fri, 28 Jan 2022 23:27:05 +0530
Subject: [PATCH 0336/1748] Changed occurences of isByteArray() to
 isByteArrayOrString(). The idea is to, in a future commit, replace such
 occurences of isByteArrayOrString() which are required to return True only
 for Bytes type with a new isByteArray() function.

---
 .../analysis/DeclarationTypeChecker.cpp       |  2 +-
 libsolidity/analysis/TypeChecker.cpp          |  4 +-
 libsolidity/ast/Types.cpp                     | 26 ++++----
 libsolidity/ast/Types.h                       |  8 +--
 libsolidity/codegen/ABIFunctions.cpp          | 24 +++----
 libsolidity/codegen/ArrayUtils.cpp            | 58 ++++++++--------
 libsolidity/codegen/CompilerUtils.cpp         | 12 ++--
 libsolidity/codegen/ExpressionCompiler.cpp    | 14 ++--
 libsolidity/codegen/YulUtilFunctions.cpp      | 66 +++++++++----------
 libsolidity/codegen/ir/IRGenerator.cpp        |  4 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   |  6 +-
 libsolidity/formal/SMTEncoder.cpp             | 10 +--
 libsolidity/formal/SymbolicTypes.cpp          |  2 +-
 libsolidity/interface/ABI.cpp                 |  2 +-
 libsolidity/interface/StorageLayout.cpp       |  2 +-
 15 files changed, 120 insertions(+), 120 deletions(-)

diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index 7a4aa99427..ba989972cb 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -441,7 +441,7 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 	{
 		bool allowed = false;
 		if (auto arrayType = dynamic_cast<ArrayType const*>(type))
-			allowed = arrayType->isByteArray();
+			allowed = arrayType->isByteArrayOrString();
 		if (!allowed)
 			m_errorReporter.fatalTypeError(9259_error, _variable.location(), "Only constants of value type and byte array type are implemented.");
 	}
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index f3ba2884b7..1a07d6ded0 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1783,7 +1783,7 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
 						(
 							(
 								resultArrayType->isPointer() ||
-								(argArrayType->isByteArray() && resultArrayType->isByteArray())
+								(argArrayType->isByteArrayOrString() && resultArrayType->isByteArrayOrString())
 							) &&
 							resultArrayType->location() == DataLocation::Storage
 						),
@@ -1791,7 +1791,7 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
 					);
 				else
 					solAssert(
-						argArrayType->isByteArray() && !argArrayType->isString() && resultType->category() == Type::Category::FixedBytes,
+						argArrayType->isByteArrayOrString() && !argArrayType->isString() && resultType->category() == Type::Category::FixedBytes,
 						""
 					);
 			}
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index fb31a93030..f50210ff55 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -1206,7 +1206,7 @@ BoolResult StringLiteralType::isImplicitlyConvertibleTo(Type const& _convertTo)
 			);
 		return
 			arrayType->location() != DataLocation::CallData &&
-			arrayType->isByteArray() &&
+			arrayType->isByteArrayOrString() &&
 			!(arrayType->dataStoredIn(DataLocation::Storage) && arrayType->isPointer());
 	}
 	else
@@ -1530,7 +1530,7 @@ BoolResult ArrayType::isImplicitlyConvertibleTo(Type const& _convertTo) const
 	if (_convertTo.category() != category())
 		return false;
 	auto& convertTo = dynamic_cast<ArrayType const&>(_convertTo);
-	if (convertTo.isByteArray() != isByteArray() || convertTo.isString() != isString())
+	if (convertTo.isByteArrayOrString() != isByteArrayOrString() || convertTo.isString() != isString())
 		return false;
 	// memory/calldata to storage can be converted, but only to a direct storage reference
 	if (convertTo.location() == DataLocation::Storage && location() != DataLocation::Storage && convertTo.isPointer())
@@ -1571,11 +1571,11 @@ BoolResult ArrayType::isExplicitlyConvertibleTo(Type const& _convertTo) const
 		return true;
 	// allow conversion bytes <-> string and bytes -> bytesNN
 	if (_convertTo.category() != category())
-		return isByteArray() && !isString() && _convertTo.category() == Type::Category::FixedBytes;
+		return isByteArrayOrString() && !isString() && _convertTo.category() == Type::Category::FixedBytes;
 	auto& convertTo = dynamic_cast<ArrayType const&>(_convertTo);
 	if (convertTo.location() != location())
 		return false;
-	if (!isByteArray() || !convertTo.isByteArray())
+	if (!isByteArrayOrString() || !convertTo.isByteArrayOrString())
 		return false;
 	return true;
 }
@@ -1585,7 +1585,7 @@ string ArrayType::richIdentifier() const
 	string id;
 	if (isString())
 		id = "t_string";
-	else if (isByteArray())
+	else if (isByteArrayOrString())
 		id = "t_bytes";
 	else
 	{
@@ -1608,7 +1608,7 @@ bool ArrayType::operator==(Type const& _other) const
 	ArrayType const& other = dynamic_cast<ArrayType const&>(_other);
 	if (
 		!ReferenceType::operator==(other) ||
-		other.isByteArray() != isByteArray() ||
+		other.isByteArrayOrString() != isByteArrayOrString() ||
 		other.isString() != isString() ||
 		other.isDynamicallySized() != isDynamicallySized()
 	)
@@ -1751,7 +1751,7 @@ string ArrayType::toString(bool _short) const
 	string ret;
 	if (isString())
 		ret = "string";
-	else if (isByteArray())
+	else if (isByteArrayOrString())
 		ret = "bytes";
 	else
 	{
@@ -1770,7 +1770,7 @@ string ArrayType::canonicalName() const
 	string ret;
 	if (isString())
 		ret = "string";
-	else if (isByteArray())
+	else if (isByteArrayOrString())
 		ret = "bytes";
 	else
 	{
@@ -1784,7 +1784,7 @@ string ArrayType::canonicalName() const
 
 string ArrayType::signatureInExternalFunction(bool _structsByName) const
 {
-	if (isByteArray())
+	if (isByteArrayOrString())
 		return canonicalName();
 	else
 	{
@@ -1899,7 +1899,7 @@ u256 ArrayType::memoryDataSize() const
 {
 	solAssert(!isDynamicallySized(), "");
 	solAssert(m_location == DataLocation::Memory, "");
-	solAssert(!isByteArray(), "");
+	solAssert(!isByteArrayOrString(), "");
 	bigint size = bigint(m_length) * m_baseType->memoryHeadSize();
 	solAssert(size <= numeric_limits<u256>::max(), "Array size does not fit u256.");
 	return u256(size);
@@ -2701,7 +2701,7 @@ FunctionType::FunctionType(VariableDeclaration const& _varDecl):
 		}
 		else if (auto arrayType = dynamic_cast<ArrayType const*>(returnType))
 		{
-			if (arrayType->isByteArray())
+			if (arrayType->isByteArrayOrString())
 				// Return byte arrays as whole.
 				break;
 			returnType = arrayType->baseType();
@@ -2720,7 +2720,7 @@ FunctionType::FunctionType(VariableDeclaration const& _varDecl):
 			if (member.type->category() != Category::Mapping)
 			{
 				if (auto arrayType = dynamic_cast<ArrayType const*>(member.type))
-					if (!arrayType->isByteArray())
+					if (!arrayType->isByteArrayOrString())
 						continue;
 				m_returnParameterTypes.push_back(TypeProvider::withLocationIfReference(
 					DataLocation::Memory,
@@ -3813,7 +3813,7 @@ MemberList::MemberMap TypeType::nativeMembers(ASTNode const* _currentScope) cons
 	}
 	else if (
 		auto const* arrayType = dynamic_cast<ArrayType const*>(m_actualType);
-		arrayType && arrayType->isByteArray()
+		arrayType && arrayType->isByteArrayOrString()
 	)
 		members.emplace_back("concat", TypeProvider::function(
 			TypePointers{},
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index f15da58ab3..e34c114057 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -838,7 +838,7 @@ class ArrayType: public ReferenceType
 	BoolResult validForLocation(DataLocation _loc) const override;
 
 	/// @returns true if this is a byte array or a string
-	bool isByteArray() const { return m_arrayKind != ArrayKind::Ordinary; }
+	bool isByteArrayOrString() const { return m_arrayKind != ArrayKind::Ordinary; }
 	/// @returns true if this is a string
 	bool isString() const { return m_arrayKind == ArrayKind::String; }
 	Type const* baseType() const { solAssert(!!m_baseType, ""); return m_baseType; }
@@ -849,11 +849,11 @@ class ArrayType: public ReferenceType
 	std::unique_ptr<ReferenceType> copyForLocation(DataLocation _location, bool _isPointer) const override;
 
 	/// The offset to advance in calldata to move from one array element to the next.
-	unsigned calldataStride() const { return isByteArray() ? 1 : m_baseType->calldataHeadSize(); }
+	unsigned calldataStride() const { return isByteArrayOrString() ? 1 : m_baseType->calldataHeadSize(); }
 	/// The offset to advance in memory to move from one array element to the next.
-	unsigned memoryStride() const { return isByteArray() ? 1 : m_baseType->memoryHeadSize(); }
+	unsigned memoryStride() const { return isByteArrayOrString() ? 1 : m_baseType->memoryHeadSize(); }
 	/// The offset to advance in storage to move from one array element to the next.
-	unsigned storageStride() const { return isByteArray() ? 1 : m_baseType->storageBytes(); }
+	unsigned storageStride() const { return isByteArrayOrString() ? 1 : m_baseType->storageBytes(); }
 
 	void clearCache() const override;
 
diff --git a/libsolidity/codegen/ABIFunctions.cpp b/libsolidity/codegen/ABIFunctions.cpp
index 97cf3425db..65f9e1723a 100644
--- a/libsolidity/codegen/ABIFunctions.cpp
+++ b/libsolidity/codegen/ABIFunctions.cpp
@@ -312,7 +312,7 @@ string ABIFunctions::abiEncodingFunction(
 		{
 			case DataLocation::CallData:
 				if (
-					fromArray->isByteArray() ||
+					fromArray->isByteArrayOrString() ||
 					*fromArray->baseType() == *TypeProvider::uint256() ||
 					*fromArray->baseType() == FixedBytesType(32)
 				)
@@ -320,7 +320,7 @@ string ABIFunctions::abiEncodingFunction(
 				else
 					return abiEncodingFunctionSimpleArray(*fromArray, *toArray, _options);
 			case DataLocation::Memory:
-				if (fromArray->isByteArray())
+				if (fromArray->isByteArrayOrString())
 					return abiEncodingFunctionMemoryByteArray(*fromArray, *toArray, _options);
 				else
 					return abiEncodingFunctionSimpleArray(*fromArray, *toArray, _options);
@@ -448,7 +448,7 @@ string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
 
 	solAssert(fromArrayType.location() == DataLocation::CallData, "");
 	solAssert(
-		fromArrayType.isByteArray() ||
+		fromArrayType.isByteArrayOrString() ||
 		*fromArrayType.baseType() == *TypeProvider::uint256() ||
 		*fromArrayType.baseType() == FixedBytesType(32),
 		""
@@ -468,7 +468,7 @@ string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
 		_to.identifier() +
 		_options.toFunctionNameSuffix();
 	return createFunction(functionName, [&]() {
-		bool needsPadding = _options.padded && fromArrayType.isByteArray();
+		bool needsPadding = _options.padded && fromArrayType.isByteArrayOrString();
 		if (fromArrayType.isDynamicallySized())
 		{
 			Whiskers templ(R"(
@@ -482,7 +482,7 @@ string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
 			)");
 			templ("storeLength", arrayStoreLengthForEncodingFunction(toArrayType, _options));
 			templ("functionName", functionName);
-			if (fromArrayType.isByteArray() || fromArrayType.calldataStride() == 1)
+			if (fromArrayType.isByteArrayOrString() || fromArrayType.calldataStride() == 1)
 				templ("scaleLengthByStride", "");
 			else
 				templ("scaleLengthByStride",
@@ -536,7 +536,7 @@ string ABIFunctions::abiEncodingFunctionSimpleArray(
 
 	solAssert(_from.isDynamicallySized() == _to.isDynamicallySized(), "");
 	solAssert(_from.length() == _to.length(), "");
-	solAssert(!_from.isByteArray(), "");
+	solAssert(!_from.isByteArrayOrString(), "");
 	if (_from.dataStoredIn(DataLocation::Storage))
 		solAssert(_from.baseType()->storageBytes() > 16, "");
 
@@ -647,10 +647,10 @@ string ABIFunctions::abiEncodingFunctionMemoryByteArray(
 	solAssert(_from.isDynamicallySized() == _to.isDynamicallySized(), "");
 	solAssert(_from.length() == _to.length(), "");
 	solAssert(_from.dataStoredIn(DataLocation::Memory), "");
-	solAssert(_from.isByteArray(), "");
+	solAssert(_from.isByteArrayOrString(), "");
 
 	return createFunction(functionName, [&]() {
-		solAssert(_to.isByteArray(), "");
+		solAssert(_to.isByteArrayOrString(), "");
 		Whiskers templ(R"(
 			function <functionName>(value, pos) -> end {
 				let length := <lengthFun>(value)
@@ -686,9 +686,9 @@ string ABIFunctions::abiEncodingFunctionCompactStorageArray(
 	solAssert(_from.dataStoredIn(DataLocation::Storage), "");
 
 	return createFunction(functionName, [&]() {
-		if (_from.isByteArray())
+		if (_from.isByteArrayOrString())
 		{
-			solAssert(_to.isByteArray(), "");
+			solAssert(_to.isByteArrayOrString(), "");
 			Whiskers templ(R"(
 				// <readableTypeNameFrom> -> <readableTypeNameTo>
 				function <functionName>(value, pos) -> ret {
@@ -1168,7 +1168,7 @@ string ABIFunctions::abiDecodingFunctionArray(ArrayType const& _type, bool _from
 string ABIFunctions::abiDecodingFunctionArrayAvailableLength(ArrayType const& _type, bool _fromMemory)
 {
 	solAssert(_type.dataStoredIn(DataLocation::Memory), "");
-	if (_type.isByteArray())
+	if (_type.isByteArrayOrString())
 		return abiDecodingFunctionByteArrayAvailableLength(_type, _fromMemory);
 	solAssert(_type.calldataStride() > 0, "");
 
@@ -1275,7 +1275,7 @@ string ABIFunctions::abiDecodingFunctionCalldataArray(ArrayType const& _type)
 string ABIFunctions::abiDecodingFunctionByteArrayAvailableLength(ArrayType const& _type, bool _fromMemory)
 {
 	solAssert(_type.dataStoredIn(DataLocation::Memory), "");
-	solAssert(_type.isByteArray(), "");
+	solAssert(_type.isByteArrayOrString(), "");
 
 	string functionName =
 		"abi_decode_available_length_" +
diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
index 27afe14985..d2691c8779 100644
--- a/libsolidity/codegen/ArrayUtils.cpp
+++ b/libsolidity/codegen/ArrayUtils.cpp
@@ -50,8 +50,8 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 	solAssert(_targetType.location() == DataLocation::Storage, "");
 
 	Type const* uint256 = TypeProvider::uint256();
-	Type const* targetBaseType = _targetType.isByteArray() ? uint256 : _targetType.baseType();
-	Type const* sourceBaseType = _sourceType.isByteArray() ? uint256 : _sourceType.baseType();
+	Type const* targetBaseType = _targetType.isByteArrayOrString() ? uint256 : _targetType.baseType();
+	Type const* sourceBaseType = _sourceType.isByteArrayOrString() ? uint256 : _sourceType.baseType();
 
 	// TODO unroll loop for small sizes
 
@@ -97,7 +97,7 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 			// stack: target_ref source_ref source_length target_ref target_length
 			if (_targetType.isDynamicallySized())
 				// store new target length
-				if (!_targetType.isByteArray())
+				if (!_targetType.isByteArrayOrString())
 					// Otherwise, length will be stored below.
 					_context << Instruction::DUP3 << Instruction::DUP3 << Instruction::SSTORE;
 			if (sourceBaseType->category() == Type::Category::Mapping)
@@ -126,7 +126,7 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 			evmasm::AssemblyItem copyLoopEndWithoutByteOffset = _context.newTag();
 
 			// special case for short byte arrays: Store them together with their length.
-			if (_targetType.isByteArray())
+			if (_targetType.isByteArrayOrString())
 			{
 				// stack: target_ref target_data_end source_length target_data_pos source_ref
 				_context << Instruction::DUP3;
@@ -141,7 +141,7 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 				_context << Instruction::DUP3 << u256(31) << Instruction::LT;
 				evmasm::AssemblyItem longByteArray = _context.appendConditionalJump();
 				// store the short byte array
-				solAssert(_sourceType.isByteArray(), "");
+				solAssert(_sourceType.isByteArrayOrString(), "");
 				if (_sourceType.location() == DataLocation::Storage)
 				{
 					// just copy the slot, it contains length and data
@@ -323,7 +323,7 @@ void ArrayUtils::copyArrayToMemory(ArrayType const& _sourceType, bool _padToWord
 	{
 		if (!_sourceType.isDynamicallySized())
 			m_context << _sourceType.length();
-		if (!_sourceType.isByteArray())
+		if (!_sourceType.isByteArrayOrString())
 			convertLengthToSize(_sourceType);
 
 		string routine = "calldatacopy(target, source, len)\n";
@@ -375,14 +375,14 @@ void ArrayUtils::copyArrayToMemory(ArrayType const& _sourceType, bool _padToWord
 			m_context << Instruction::SWAP1 << u256(32) << Instruction::ADD;
 			m_context << Instruction::SWAP1;
 		}
-		if (!_sourceType.isByteArray())
+		if (!_sourceType.isByteArrayOrString())
 			convertLengthToSize(_sourceType);
 		// stack: <target> <source> <size>
 		m_context << Instruction::DUP1 << Instruction::DUP4 << Instruction::DUP4;
 		// We can resort to copying full 32 bytes only if
 		// - the length is known to be a multiple of 32 or
 		// - we will pad to full 32 bytes later anyway.
-		if (!_sourceType.isByteArray() || _padToWordBoundaries)
+		if (!_sourceType.isByteArrayOrString() || _padToWordBoundaries)
 			utils.memoryCopy32();
 		else
 			utils.memoryCopy();
@@ -390,7 +390,7 @@ void ArrayUtils::copyArrayToMemory(ArrayType const& _sourceType, bool _padToWord
 		m_context << Instruction::SWAP1 << Instruction::POP;
 		// stack: <target> <size>
 
-		bool paddingNeeded = _padToWordBoundaries && _sourceType.isByteArray();
+		bool paddingNeeded = _padToWordBoundaries && _sourceType.isByteArrayOrString();
 
 		if (paddingNeeded)
 		{
@@ -446,7 +446,7 @@ void ArrayUtils::copyArrayToMemory(ArrayType const& _sourceType, bool _padToWord
 		m_context << Instruction::DUP1 << Instruction::ISZERO;
 		evmasm::AssemblyItem loopEnd = m_context.appendConditionalJump();
 		// Special case for tightly-stored byte arrays
-		if (_sourceType.isByteArray())
+		if (_sourceType.isByteArrayOrString())
 		{
 			// stack here: memory_offset storage_offset length
 			m_context << Instruction::DUP1 << u256(31) << Instruction::LT;
@@ -482,14 +482,14 @@ void ArrayUtils::copyArrayToMemory(ArrayType const& _sourceType, bool _padToWord
 		}
 
 		// stack here: memory_end_offset storage_data_offset memory_offset
-		bool haveByteOffset = !_sourceType.isByteArray() && storageBytes <= 16;
+		bool haveByteOffset = !_sourceType.isByteArrayOrString() && storageBytes <= 16;
 		if (haveByteOffset)
 			m_context << u256(0) << Instruction::SWAP1;
 		// stack here: memory_end_offset storage_data_offset [storage_byte_offset] memory_offset
 		evmasm::AssemblyItem loopStart = m_context.newTag();
 		m_context << loopStart;
 		// load and store
-		if (_sourceType.isByteArray())
+		if (_sourceType.isByteArrayOrString())
 		{
 			// Packed both in storage and memory.
 			m_context << Instruction::DUP2 << Instruction::SLOAD;
@@ -528,12 +528,12 @@ void ArrayUtils::copyArrayToMemory(ArrayType const& _sourceType, bool _padToWord
 		// stack here: memory_end_offset storage_data_offset [storage_byte_offset] memory_offset
 		if (haveByteOffset)
 			m_context << Instruction::SWAP1 << Instruction::POP;
-		if (!_sourceType.isByteArray())
+		if (!_sourceType.isByteArrayOrString())
 		{
 			solAssert(_sourceType.calldataStride() % 32 == 0, "");
 			solAssert(_sourceType.memoryStride() % 32 == 0, "");
 		}
-		if (_padToWordBoundaries && _sourceType.isByteArray())
+		if (_padToWordBoundaries && _sourceType.isByteArrayOrString())
 		{
 			// memory_end_offset - start is the actual length (we want to compute the ceil of).
 			// memory_offset - start is its next multiple of 32, but it might be off by 32.
@@ -624,7 +624,7 @@ void ArrayUtils::clearDynamicArray(ArrayType const& _type) const
 	m_context << u256(0) << Instruction::DUP3 << Instruction::SSTORE;
 	// Special case: short byte arrays are stored togeher with their length
 	evmasm::AssemblyItem endTag = m_context.newTag();
-	if (_type.isByteArray())
+	if (_type.isByteArrayOrString())
 	{
 		// stack: ref old_length
 		m_context << Instruction::DUP1 << u256(31) << Instruction::LT;
@@ -664,7 +664,7 @@ void ArrayUtils::resizeDynamicArray(ArrayType const& _typeIn) const
 			ArrayType const& _type = dynamic_cast<ArrayType const&>(*type);
 			solAssert(_type.location() == DataLocation::Storage, "");
 			solAssert(_type.isDynamicallySized(), "");
-			if (!_type.isByteArray() && _type.baseType()->storageBytes() < 32)
+			if (!_type.isByteArrayOrString() && _type.baseType()->storageBytes() < 32)
 				solAssert(_type.baseType()->isValueType(), "Invalid storage size for non-value type.");
 
 			unsigned stackHeightStart = _context.stackHeight();
@@ -677,7 +677,7 @@ void ArrayUtils::resizeDynamicArray(ArrayType const& _typeIn) const
 			solAssert(_context.stackHeight() - stackHeightStart == 3 - 2, "2");
 
 			// Special case for short byte arrays, they are stored together with their length
-			if (_type.isByteArray())
+			if (_type.isByteArrayOrString())
 			{
 				evmasm::AssemblyItem regularPath = _context.newTag();
 				// We start by a large case-distinction about the old and new length of the byte array.
@@ -766,7 +766,7 @@ void ArrayUtils::resizeDynamicArray(ArrayType const& _typeIn) const
 			// stack: ref new_length old_length
 			// store new length
 			_context << Instruction::DUP2;
-			if (_type.isByteArray())
+			if (_type.isByteArrayOrString())
 				// For a "long" byte array, store length as 2*length+1
 				_context << Instruction::DUP1 << Instruction::ADD << u256(1) << Instruction::ADD;
 			_context << Instruction::DUP4 << Instruction::SSTORE;
@@ -806,10 +806,10 @@ void ArrayUtils::incrementDynamicArraySize(ArrayType const& _type) const
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solAssert(_type.isDynamicallySized(), "");
-	if (!_type.isByteArray() && _type.baseType()->storageBytes() < 32)
+	if (!_type.isByteArrayOrString() && _type.baseType()->storageBytes() < 32)
 		solAssert(_type.baseType()->isValueType(), "Invalid storage size for non-value type.");
 
-	if (_type.isByteArray())
+	if (_type.isByteArrayOrString())
 	{
 		// We almost always just add 2 (length of byte arrays is shifted left by one)
 		// except for the case where we transition from a short byte array
@@ -850,10 +850,10 @@ void ArrayUtils::popStorageArrayElement(ArrayType const& _type) const
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solAssert(_type.isDynamicallySized(), "");
-	if (!_type.isByteArray() && _type.baseType()->storageBytes() < 32)
+	if (!_type.isByteArrayOrString() && _type.baseType()->storageBytes() < 32)
 		solAssert(_type.baseType()->isValueType(), "Invalid storage size for non-value type.");
 
-	if (_type.isByteArray())
+	if (_type.isByteArrayOrString())
 	{
 		m_context << Instruction::DUP1 << Instruction::SLOAD << Instruction::DUP1;
 		m_context.callYulFunction(m_context.utilFunctions().extractByteArrayLengthFunction(), 1, 1);
@@ -999,7 +999,7 @@ void ArrayUtils::convertLengthToSize(ArrayType const& _arrayType, bool _pad) con
 	}
 	else
 	{
-		if (!_arrayType.isByteArray())
+		if (!_arrayType.isByteArrayOrString())
 		{
 			if (_arrayType.location() == DataLocation::Memory)
 				m_context << _arrayType.memoryStride();
@@ -1031,7 +1031,7 @@ void ArrayUtils::retrieveLength(ArrayType const& _arrayType, unsigned _stackDept
 			break;
 		case DataLocation::Storage:
 			m_context << Instruction::SLOAD;
-			if (_arrayType.isByteArray())
+			if (_arrayType.isByteArrayOrString())
 				m_context.callYulFunction(m_context.utilFunctions().extractByteArrayLengthFunction(), 1, 1);
 			break;
 		}
@@ -1062,7 +1062,7 @@ void ArrayUtils::accessIndex(ArrayType const& _arrayType, bool _doBoundsCheck, b
 	{
 	case DataLocation::Memory:
 		// stack: <base_ref> <index>
-		if (!_arrayType.isByteArray())
+		if (!_arrayType.isByteArrayOrString())
 			m_context << u256(_arrayType.memoryHeadSize()) << Instruction::MUL;
 		if (_arrayType.isDynamicallySized())
 			m_context << u256(32) << Instruction::ADD;
@@ -1071,7 +1071,7 @@ void ArrayUtils::accessIndex(ArrayType const& _arrayType, bool _doBoundsCheck, b
 		m_context << Instruction::ADD;
 		break;
 	case DataLocation::CallData:
-		if (!_arrayType.isByteArray())
+		if (!_arrayType.isByteArrayOrString())
 		{
 			m_context << _arrayType.calldataStride();
 			m_context << Instruction::MUL;
@@ -1090,7 +1090,7 @@ void ArrayUtils::accessIndex(ArrayType const& _arrayType, bool _doBoundsCheck, b
 		// stack: [<base_ref>] <index> <base_ref>
 
 		evmasm::AssemblyItem endTag = m_context.newTag();
-		if (_arrayType.isByteArray())
+		if (_arrayType.isByteArrayOrString())
 		{
 			// Special case of short byte arrays.
 			m_context << Instruction::SWAP1;
@@ -1153,7 +1153,7 @@ void ArrayUtils::accessCallDataArrayElement(ArrayType const& _arrayType, bool _d
 		{
 			solAssert(_arrayType.baseType()->storageBytes() <= 32, "");
 			if (
-				!_arrayType.isByteArray() &&
+				!_arrayType.isByteArrayOrString() &&
 				_arrayType.baseType()->storageBytes() < 32 &&
 				m_context.useABICoderV2()
 			)
@@ -1165,7 +1165,7 @@ void ArrayUtils::accessCallDataArrayElement(ArrayType const& _arrayType, bool _d
 				CompilerUtils(m_context).loadFromMemoryDynamic(
 					*_arrayType.baseType(),
 					true,
-					!_arrayType.isByteArray(),
+					!_arrayType.isByteArrayOrString(),
 					false
 				);
 		}
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index 1876b6ac06..ba678878f2 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -970,7 +970,7 @@ void CompilerUtils::convertType(
 		else if (targetTypeCategory == Type::Category::Array)
 		{
 			auto const& arrayType = dynamic_cast<ArrayType const&>(_targetType);
-			solAssert(arrayType.isByteArray());
+			solAssert(arrayType.isByteArrayOrString());
 			size_t storageSize = 32 + ((data.size() + 31) / 32) * 32;
 			allocateMemory(storageSize);
 			// stack: mempos
@@ -992,7 +992,7 @@ void CompilerUtils::convertType(
 		if (_targetType.category() == Type::Category::FixedBytes)
 		{
 			solAssert(
-				typeOnStack.isByteArray() && !typeOnStack.isString(),
+				typeOnStack.isByteArrayOrString() && !typeOnStack.isString(),
 				"Array types other than bytes not convertible to bytesNN."
 			);
 			solAssert(typeOnStack.isDynamicallySized());
@@ -1019,7 +1019,7 @@ void CompilerUtils::convertType(
 		case DataLocation::Storage:
 			// Other cases are done explicitly in LValue::storeValue, and only possible by assignment.
 			solAssert(
-				(targetType.isPointer() || (typeOnStack.isByteArray() && targetType.isByteArray())) &&
+				(targetType.isPointer() || (typeOnStack.isByteArrayOrString() && targetType.isByteArrayOrString())) &&
 				typeOnStack.location() == DataLocation::Storage,
 				"Invalid conversion to storage type."
 			);
@@ -1105,7 +1105,7 @@ void CompilerUtils::convertType(
 		}
 		case DataLocation::CallData:
 			solAssert(
-				((targetType.isByteArray() && typeOnStack.isByteArray()) || _typeOnStack == _targetType) &&
+				((targetType.isByteArrayOrString() && typeOnStack.isByteArrayOrString()) || _typeOnStack == _targetType) &&
 				typeOnStack.location() == DataLocation::CallData,
 				"Invalid conversion to calldata type."
 			);
@@ -1119,7 +1119,7 @@ void CompilerUtils::convertType(
 		if (_targetType.category() == Type::Category::FixedBytes)
 		{
 			solAssert(
-				typeOnStack.arrayType().isByteArray() && !typeOnStack.arrayType().isString(),
+				typeOnStack.arrayType().isByteArrayOrString() && !typeOnStack.arrayType().isString(),
 				"Array types other than bytes not convertible to bytesNN."
 			);
 			solAssert(typeOnStack.isDynamicallySized());
@@ -1142,7 +1142,7 @@ void CompilerUtils::convertType(
 		auto const& targetArrayType = dynamic_cast<ArrayType const&>(_targetType);
 		solAssert(
 			typeOnStack.arrayType().isImplicitlyConvertibleTo(targetArrayType) ||
-			(typeOnStack.arrayType().isByteArray() && targetArrayType.isByteArray())
+			(typeOnStack.arrayType().isByteArrayOrString() && targetArrayType.isByteArrayOrString())
 		);
 		solAssert(
 			typeOnStack.arrayType().dataStoredIn(DataLocation::CallData) &&
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index a76d1f3d9b..da3022251f 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -153,7 +153,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 			if (paramTypes[i]->isDynamicallySized())
 			{
 				solAssert(
-					dynamic_cast<ArrayType const&>(*paramTypes[i]).isByteArray(),
+					dynamic_cast<ArrayType const&>(*paramTypes[i]).isByteArrayOrString(),
 					"Expected string or byte array for mapping key type"
 				);
 
@@ -239,7 +239,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 			if (returnTypes[i]->category() == Type::Category::Mapping)
 				continue;
 			if (auto arrayType = dynamic_cast<ArrayType const*>(returnTypes[i]))
-				if (!arrayType->isByteArray())
+				if (!arrayType->isByteArrayOrString())
 					continue;
 			pair<u256, unsigned> const& offsets = structType->storageOffsetsOfMember(names[i]);
 			m_context << Instruction::DUP1 << u256(offsets.first) << Instruction::ADD << u256(offsets.second);
@@ -1047,7 +1047,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				// stack: ArrayReference (newLength-1)
 				ArrayUtils(m_context).accessIndex(*arrayType, false);
 
-				if (arrayType->isByteArray())
+				if (arrayType->isByteArrayOrString())
 					setLValue<StorageByteArrayElement>(_functionCall);
 				else
 					setLValueToStorageItem(_functionCall);
@@ -1084,7 +1084,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				utils().moveToStackTop(1 + type->sizeOnStack());
 				utils().moveToStackTop(1 + type->sizeOnStack());
 				// stack: argValue storageSlot slotOffset
-				if (!arrayType->isByteArray())
+				if (!arrayType->isByteArrayOrString())
 					StorageItem(m_context, *paramType).storeValue(*type, _functionCall.location(), true);
 				else
 					StorageByteArrayElement(m_context).storeValue(*type, _functionCall.location(), true);
@@ -1165,7 +1165,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 			// update free memory pointer
 			m_context << Instruction::DUP1;
 			// Stack: memptr requested_length requested_length
-			if (arrayType.isByteArray())
+			if (arrayType.isByteArrayOrString())
 				// Round up to multiple of 32
 				m_context << u256(31) << Instruction::ADD << u256(31) << Instruction::NOT << Instruction::AND;
 			else
@@ -2086,7 +2086,7 @@ bool ExpressionCompiler::visit(IndexAccess const& _indexAccess)
 			{
 				case DataLocation::Storage:
 					ArrayUtils(m_context).accessIndex(arrayType);
-					if (arrayType.isByteArray())
+					if (arrayType.isByteArrayOrString())
 					{
 						solAssert(!arrayType.isString(), "Index access to string is not allowed.");
 						setLValue<StorageByteArrayElement>(_indexAccess);
@@ -2096,7 +2096,7 @@ bool ExpressionCompiler::visit(IndexAccess const& _indexAccess)
 					break;
 				case DataLocation::Memory:
 					ArrayUtils(m_context).accessIndex(arrayType);
-					setLValue<MemoryItem>(_indexAccess, *_indexAccess.annotation().type, !arrayType.isByteArray());
+					setLValue<MemoryItem>(_indexAccess, *_indexAccess.annotation().type, !arrayType.isByteArrayOrString());
 					break;
 				case DataLocation::CallData:
 					ArrayUtils(m_context).accessCallDataArrayElement(arrayType);
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 84f63a9e15..3c79b64b46 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -1183,8 +1183,8 @@ string YulUtilFunctions::arrayLengthFunction(ArrayType const& _type)
 		w("calldata", _type.location() == DataLocation::CallData);
 		if (_type.location() == DataLocation::Storage)
 		{
-			w("byteArray", _type.isByteArray());
-			if (_type.isByteArray())
+			w("byteArray", _type.isByteArrayOrString());
+			if (_type.isByteArrayOrString())
 				w("extractByteArrayLength", extractByteArrayLengthFunction());
 		}
 
@@ -1220,7 +1220,7 @@ std::string YulUtilFunctions::resizeArrayFunction(ArrayType const& _type)
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solUnimplementedAssert(_type.baseType()->storageBytes() <= 32);
 
-	if (_type.isByteArray())
+	if (_type.isByteArrayOrString())
 		return resizeDynamicByteArrayFunction(_type);
 
 	string functionName = "resize_array_" + _type.identifier();
@@ -1259,7 +1259,7 @@ string YulUtilFunctions::cleanUpStorageArrayEndFunction(ArrayType const& _type)
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solAssert(_type.baseType()->category() != Type::Category::Mapping, "");
-	solAssert(!_type.isByteArray(), "");
+	solAssert(!_type.isByteArrayOrString(), "");
 	solUnimplementedAssert(_type.baseType()->storageBytes() <= 32);
 
 	string functionName = "cleanup_storage_array_end_" + _type.identifier();
@@ -1319,7 +1319,7 @@ string YulUtilFunctions::resizeDynamicByteArrayFunction(ArrayType const& _type)
 
 string YulUtilFunctions::cleanUpDynamicByteArrayEndSlotsFunction(ArrayType const& _type)
 {
-	solAssert(_type.isByteArray(), "");
+	solAssert(_type.isByteArrayOrString(), "");
 	solAssert(_type.isDynamicallySized(), "");
 
 	string functionName = "clean_up_bytearray_end_slots_" + _type.identifier();
@@ -1479,7 +1479,7 @@ string YulUtilFunctions::storageArrayPopFunction(ArrayType const& _type)
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solAssert(_type.isDynamicallySized(), "");
 	solUnimplementedAssert(_type.baseType()->storageBytes() <= 32, "Base type is not yet implemented.");
-	if (_type.isByteArray())
+	if (_type.isByteArrayOrString())
 		return storageByteArrayPopFunction(_type);
 
 	string functionName = "array_pop_" + _type.identifier();
@@ -1509,7 +1509,7 @@ string YulUtilFunctions::storageByteArrayPopFunction(ArrayType const& _type)
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solAssert(_type.isDynamicallySized(), "");
-	solAssert(_type.isByteArray(), "");
+	solAssert(_type.isByteArrayOrString(), "");
 
 	string functionName = "byte_array_pop_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
@@ -1566,7 +1566,7 @@ string YulUtilFunctions::storageArrayPushFunction(ArrayType const& _type, Type c
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(array <values>) {
-				<?isByteArray>
+				<?isByteArrayOrString>
 					let data := sload(array)
 					let oldLen := <extractByteArrayLength>(data)
 					if iszero(lt(oldLen, <maxArrayLength>)) { <panic>() }
@@ -1598,20 +1598,20 @@ string YulUtilFunctions::storageArrayPushFunction(ArrayType const& _type, Type c
 						let slot, offset := <indexAccess>(array, oldLen)
 						<storeValue>(slot, offset <values>)
 					}
-				<!isByteArray>
+				<!isByteArrayOrString>
 					let oldLen := sload(array)
 					if iszero(lt(oldLen, <maxArrayLength>)) { <panic>() }
 					sstore(array, add(oldLen, 1))
 					let slot, offset := <indexAccess>(array, oldLen)
 					<storeValue>(slot, offset <values>)
-				</isByteArray>
+				</isByteArrayOrString>
 			})")
 			("functionName", functionName)
 			("values", _fromType->sizeOnStack() == 0 ? "" : ", " + suffixedVariableNameList("value", 0, _fromType->sizeOnStack()))
 			("panic", panicFunction(PanicCode::ResourceError))
-			("extractByteArrayLength", _type.isByteArray() ? extractByteArrayLengthFunction() : "")
+			("extractByteArrayLength", _type.isByteArrayOrString() ? extractByteArrayLengthFunction() : "")
 			("dataAreaFunction", arrayDataAreaFunction(_type))
-			("isByteArray", _type.isByteArray())
+			("isByteArrayOrString", _type.isByteArrayOrString())
 			("indexAccess", storageArrayIndexAccessFunction(_type))
 			("storeValue", updateStorageValueFunction(*_fromType, *_type.baseType()))
 			("maxArrayLength", (u256(1) << 64).str())
@@ -1642,9 +1642,9 @@ string YulUtilFunctions::storageArrayPushZeroFunction(ArrayType const& _type)
 				slot, offset := <indexAccess>(array, oldLen)
 			})")
 			("functionName", functionName)
-			("isBytes", _type.isByteArray())
-			("increaseBytesSize", _type.isByteArray() ? increaseByteArraySizeFunction(_type) : "")
-			("extractLength", _type.isByteArray() ? extractByteArrayLengthFunction() : "")
+			("isBytes", _type.isByteArrayOrString())
+			("increaseBytesSize", _type.isByteArrayOrString() ? increaseByteArraySizeFunction(_type) : "")
+			("extractLength", _type.isByteArrayOrString() ? extractByteArrayLengthFunction() : "")
 			("panic", panicFunction(PanicCode::ResourceError))
 			("fetchLength", arrayLengthFunction(_type))
 			("indexAccess", storageArrayIndexAccessFunction(_type))
@@ -1795,7 +1795,7 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 	if (!_toType.isDynamicallySized())
 		solAssert(!_fromType.isDynamicallySized() && _fromType.length() <= _toType.length(), "");
 
-	if (_fromType.isByteArray())
+	if (_fromType.isByteArrayOrString())
 		return copyByteArrayToStorageFunction(_fromType, _toType);
 	if (_fromType.dataStoredIn(DataLocation::Storage) && _toType.baseType()->isValueType())
 		return copyValueArrayStorageToStorageFunction(_fromType, _toType);
@@ -1902,8 +1902,8 @@ string YulUtilFunctions::copyByteArrayToStorageFunction(ArrayType const& _fromTy
 		*_fromType.copyForLocation(_toType.location(), _toType.isPointer()) == dynamic_cast<ReferenceType const&>(_toType),
 		""
 	);
-	solAssert(_fromType.isByteArray(), "");
-	solAssert(_toType.isByteArray(), "");
+	solAssert(_fromType.isByteArrayOrString(), "");
+	solAssert(_toType.isByteArrayOrString(), "");
 
 	string functionName = "copy_byte_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
 	return m_functionCollector.createFunction(functionName, [&](){
@@ -1980,8 +1980,8 @@ string YulUtilFunctions::copyValueArrayStorageToStorageFunction(ArrayType const&
 	solAssert(_toType.baseType()->isValueType(), "");
 	solAssert(_fromType.baseType()->isImplicitlyConvertibleTo(*_toType.baseType()), "");
 
-	solAssert(!_fromType.isByteArray(), "");
-	solAssert(!_toType.isByteArray(), "");
+	solAssert(!_fromType.isByteArrayOrString(), "");
+	solAssert(!_toType.isByteArrayOrString(), "");
 	solAssert(_fromType.dataStoredIn(DataLocation::Storage), "");
 	solAssert(_toType.dataStoredIn(DataLocation::Storage), "");
 
@@ -2155,7 +2155,7 @@ string YulUtilFunctions::arrayConvertLengthToSize(ArrayType const& _type)
 					})")
 					("functionName", functionName)
 					("stride", to_string(_type.location() == DataLocation::Memory ? _type.memoryStride() : _type.calldataStride()))
-					("byteArray", _type.isByteArray())
+					("byteArray", _type.isByteArrayOrString())
 					("mul", overflowCheckedIntMulFunction(*TypeProvider::uint256()))
 					.render();
 			default:
@@ -2187,7 +2187,7 @@ string YulUtilFunctions::arrayAllocationSizeFunction(ArrayType const& _type)
 		)");
 		w("functionName", functionName);
 		w("panic", panicFunction(PanicCode::ResourceError));
-		w("byteArray", _type.isByteArray());
+		w("byteArray", _type.isByteArrayOrString());
 		w("roundUp", roundUpFunction());
 		w("dynamic", _type.isDynamicallySized());
 		return w.render();
@@ -2262,7 +2262,7 @@ string YulUtilFunctions::storageArrayIndexAccessFunction(ArrayType const& _type)
 		("dataAreaFunc", arrayDataAreaFunction(_type))
 		("indexAccessNoChecks", longByteArrayStorageIndexAccessNoCheckFunction())
 		("multipleItemsPerSlot", _type.baseType()->storageBytes() <= 16)
-		("isBytesArray", _type.isByteArray())
+		("isBytesArray", _type.isByteArrayOrString())
 		("storageSize", _type.baseType()->storageSize().str())
 		("storageBytes", toString(_type.baseType()->storageBytes()))
 		("itemsPerSlot", to_string(32 / _type.baseType()->storageBytes()))
@@ -2376,7 +2376,7 @@ string YulUtilFunctions::accessCalldataTailFunction(Type const& _type)
 
 string YulUtilFunctions::nextArrayElementFunction(ArrayType const& _type)
 {
-	solAssert(!_type.isByteArray(), "");
+	solAssert(!_type.isByteArrayOrString(), "");
 	if (_type.dataStoredIn(DataLocation::Storage))
 		solAssert(_type.baseType()->storageBytes() > 16, "");
 	string functionName = "array_nextElement_" + _type.identifier();
@@ -2447,7 +2447,7 @@ string YulUtilFunctions::copyArrayFromStorageToMemoryFunction(ArrayType const& _
 			solAssert(_to.memoryStride() == 32, "");
 			solAssert(_to.baseType()->dataStoredIn(DataLocation::Memory), "");
 			solAssert(_from.baseType()->dataStoredIn(DataLocation::Storage), "");
-			solAssert(!_from.isByteArray(), "");
+			solAssert(!_from.isByteArrayOrString(), "");
 			solAssert(*_to.withLocation(DataLocation::Storage, _from.isPointer()) == _from, "");
 			return Whiskers(R"(
 				function <functionName>(slot) -> memPtr {
@@ -2755,7 +2755,7 @@ string YulUtilFunctions::updateStorageValueFunction(
 			solAssert(_fromType.category() == Type::Category::StringLiteral, "");
 			solAssert(toReferenceType->category() == Type::Category::Array, "");
 			auto const& toArrayType = dynamic_cast<ArrayType const&>(*toReferenceType);
-			solAssert(toArrayType.isByteArray(), "");
+			solAssert(toArrayType.isByteArrayOrString(), "");
 
 			return Whiskers(R"(
 				function <functionName>(slot<?dynamicOffset>, offset</dynamicOffset>) {
@@ -3216,7 +3216,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 		auto const& fromType = dynamic_cast<ArraySliceType const&>(_from);
 		if (_to.category() == Type::Category::FixedBytes)
 		{
-			solAssert(fromType.arrayType().isByteArray(), "Array types other than bytes not convertible to bytesNN.");
+			solAssert(fromType.arrayType().isByteArrayOrString(), "Array types other than bytes not convertible to bytesNN.");
 			return bytesToFixedBytesConversionFunction(fromType.arrayType(), dynamic_cast<FixedBytesType const &>(_to));
 		}
 		solAssert(_to.category() == Type::Category::Array);
@@ -3224,7 +3224,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 
 		solAssert(
 			fromType.arrayType().isImplicitlyConvertibleTo(targetType) ||
-			(fromType.arrayType().isByteArray() && targetType.isByteArray())
+			(fromType.arrayType().isByteArrayOrString() && targetType.isByteArrayOrString())
 		);
 		solAssert(
 			fromType.arrayType().dataStoredIn(DataLocation::CallData) &&
@@ -3256,7 +3256,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 		auto const& fromArrayType =  dynamic_cast<ArrayType const&>(_from);
 		if (_to.category() == Type::Category::FixedBytes)
 		{
-			solAssert(fromArrayType.isByteArray(), "Array types other than bytes not convertible to bytesNN.");
+			solAssert(fromArrayType.isByteArrayOrString(), "Array types other than bytes not convertible to bytesNN.");
 			return bytesToFixedBytesConversionFunction(fromArrayType, dynamic_cast<FixedBytesType const &>(_to));
 		}
 		solAssert(_to.category() == Type::Category::Array, "");
@@ -3460,7 +3460,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 
 string YulUtilFunctions::bytesToFixedBytesConversionFunction(ArrayType const& _from, FixedBytesType const& _to)
 {
-	solAssert(_from.isByteArray() && !_from.isString(), "");
+	solAssert(_from.isByteArrayOrString() && !_from.isString(), "");
 	solAssert(_from.isDynamicallySized(), "");
 	string functionName = "convert_bytes_to_fixedbytes_from_" + _from.identifier() + "_to_" + _to.identifier();
 	return m_functionCollector.createFunction(functionName, [&](auto& _args, auto& _returnParams) {
@@ -3633,14 +3633,14 @@ string YulUtilFunctions::arrayConversionFunction(ArrayType const& _from, ArrayTy
 {
 	if (_to.dataStoredIn(DataLocation::CallData))
 		solAssert(
-			_from.dataStoredIn(DataLocation::CallData) && _from.isByteArray() && _to.isByteArray(),
+			_from.dataStoredIn(DataLocation::CallData) && _from.isByteArrayOrString() && _to.isByteArrayOrString(),
 			""
 		);
 
 	// Other cases are done explicitly in LValue::storeValue, and only possible by assignment.
 	if (_to.location() == DataLocation::Storage)
 		solAssert(
-			(_to.isPointer() || (_from.isByteArray() && _to.isByteArray())) &&
+			(_to.isPointer() || (_from.isByteArrayOrString() && _to.isByteArrayOrString())) &&
 			_from.location() == DataLocation::Storage,
 			"Invalid conversion to storage type."
 		);
@@ -4238,7 +4238,7 @@ string YulUtilFunctions::conversionFunctionSpecial(Type const& _from, Type const
 		}
 		else if (_to.category() == Type::Category::Array)
 		{
-			solAssert(dynamic_cast<ArrayType const&>(_to).isByteArray(), "");
+			solAssert(dynamic_cast<ArrayType const&>(_to).isByteArrayOrString(), "");
 			Whiskers templ(R"(
 				function <functionName>() -> converted {
 					converted := <copyLiteralToMemory>()
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index c2bb0c3cf3..e361ada473 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -677,7 +677,7 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 					continue;
 				if (
 					auto const* arrayType = dynamic_cast<ArrayType const*>(returnTypes[i]);
-					arrayType && !arrayType->isByteArray()
+					arrayType && !arrayType->isByteArrayOrString()
 				)
 					continue;
 
@@ -698,7 +698,7 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 			solAssert(returnTypes.size() == 1, "");
 			auto const* arrayType = dynamic_cast<ArrayType const*>(returnTypes.front());
 			if (arrayType)
-				solAssert(arrayType->isByteArray(), "");
+				solAssert(arrayType->isByteArrayOrString(), "");
 			vector<string> retVars = IRVariable("ret", *returnTypes.front()).stackSlots();
 			returnVariables += retVars;
 			code += Whiskers(R"(
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 86d00dbc9c..065b351f61 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2088,7 +2088,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		else if (dynamic_cast<UserDefinedValueType const*>(&actualType))
 			solAssert(member == "wrap" || member == "unwrap");
 		else if (auto const* arrayType = dynamic_cast<ArrayType const*>(&actualType))
-			solAssert(arrayType->isByteArray() && member == "concat");
+			solAssert(arrayType->isByteArrayOrString() && member == "concat");
 		else
 			// The old code generator had a generic "else" case here
 			// without any specific code being generated,
@@ -2226,7 +2226,7 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 
 				setLValue(_indexAccess, IRLValue{
 					*arrayType.baseType(),
-					IRLValue::Memory{memAddress, arrayType.isByteArray()}
+					IRLValue::Memory{memAddress, arrayType.isByteArrayOrString()}
 				});
 				break;
 			}
@@ -2240,7 +2240,7 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 					", " +
 					expressionAsType(*_indexAccess.indexExpression(), *TypeProvider::uint256()) +
 					")";
-				if (arrayType.isByteArray())
+				if (arrayType.isByteArrayOrString())
 					define(_indexAccess) <<
 						m_utils.cleanupFunction(*arrayType.baseType()) <<
 						"(calldataload(" <<
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index b42e9b3557..76342ba08e 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -953,7 +953,7 @@ bool isReturnedFromStructGetter(Type const* _type)
 	if (category == Type::Category::Mapping)
 		return false;
 	if (category == Type::Category::Array)
-		return dynamic_cast<ArrayType const&>(*_type).isByteArray();
+		return dynamic_cast<ArrayType const&>(*_type).isByteArrayOrString();
 	// default
 	return true;
 }
@@ -990,7 +990,7 @@ void SMTEncoder::visitPublicGetter(FunctionCall const& _funCall)
 	{
 		if (
 			type->isValueType() ||
-			(type->category() == Type::Category::Array && dynamic_cast<ArrayType const&>(*type).isByteArray())
+			(type->category() == Type::Category::Array && dynamic_cast<ArrayType const&>(*type).isByteArrayOrString())
 		)
 		{
 			solAssert(symbArguments.empty(), "");
@@ -1071,7 +1071,7 @@ void SMTEncoder::visitTypeConversion(FunctionCall const& _funCall)
 	if (auto sliceType = dynamic_cast<ArraySliceType const*>(argType))
 		arrayType = &sliceType->arrayType();
 
-	if (arrayType && arrayType->isByteArray() && smt::isFixedBytes(*funCallType))
+	if (arrayType && arrayType->isByteArrayOrString() && smt::isFixedBytes(*funCallType))
 	{
 		auto array = dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(*argument));
 		bytesToFixedBytesAssertions(*array, _funCall);
@@ -2695,14 +2695,14 @@ Expression const* SMTEncoder::cleanExpression(Expression const& _expr)
 			auto typeType = dynamic_cast<TypeType const*>(functionCall->expression().annotation().type);
 			solAssert(typeType, "");
 			if (auto const* arrayType = dynamic_cast<ArrayType const*>(typeType->actualType()))
-				if (arrayType->isByteArray())
+				if (arrayType->isByteArrayOrString())
 				{
 					// this is a cast to `bytes`
 					solAssert(functionCall->arguments().size() == 1, "");
 					Expression const& arg = *functionCall->arguments()[0];
 					if (
 						auto const* argArrayType = dynamic_cast<ArrayType const*>(arg.annotation().type);
-						argArrayType && argArrayType->isByteArray()
+						argArrayType && argArrayType->isByteArrayOrString()
 					)
 						return cleanExpression(arg);
 				}
diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
index 36d9a0f353..024e33be6e 100644
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ b/libsolidity/formal/SymbolicTypes.cpp
@@ -96,7 +96,7 @@ SortPointer smtSort(frontend::Type const& _type)
 		auto sliceArrayType = dynamic_cast<ArraySliceType const*>(&_type);
 		ArrayType const* arrayType = sliceArrayType ? &sliceArrayType->arrayType() : dynamic_cast<ArrayType const*>(&_type);
 		if (
-			(arrayType && (arrayType->isString() || arrayType->isByteArray())) ||
+			(arrayType && (arrayType->isString() || arrayType->isByteArrayOrString())) ||
 			_type.category() == frontend::Type::Category::StringLiteral
 		)
 			tupleName = "bytes";
diff --git a/libsolidity/interface/ABI.cpp b/libsolidity/interface/ABI.cpp
index cf395ffa02..9c7a645b6f 100644
--- a/libsolidity/interface/ABI.cpp
+++ b/libsolidity/interface/ABI.cpp
@@ -176,7 +176,7 @@ Json::Value ABI::formatType(
 		ret["type"] = _encodingType.canonicalName() + suffix;
 	else if (ArrayType const* arrayType = dynamic_cast<ArrayType const*>(&_encodingType))
 	{
-		if (arrayType->isByteArray())
+		if (arrayType->isByteArrayOrString())
 			ret["type"] = _encodingType.canonicalName() + suffix;
 		else
 		{
diff --git a/libsolidity/interface/StorageLayout.cpp b/libsolidity/interface/StorageLayout.cpp
index a484503c11..74d7ccf4bb 100644
--- a/libsolidity/interface/StorageLayout.cpp
+++ b/libsolidity/interface/StorageLayout.cpp
@@ -94,7 +94,7 @@ void StorageLayout::generate(Type const* _type)
 	}
 	else if (auto arrayType = dynamic_cast<ArrayType const*>(_type))
 	{
-		if (arrayType->isByteArray())
+		if (arrayType->isByteArrayOrString())
 			typeInfo["encoding"] = "bytes";
 		else
 		{

From cc6344c03c2b9c00a76bc2af1d9f1da7aa9c467b Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Wed, 2 Feb 2022 16:14:24 +0530
Subject: [PATCH 0337/1748] Changed instaces of isByteArrayOrString() to
 isByteArray() where it's only supposed to return a True for Bytes Type

---
 libsolidity/analysis/TypeChecker.cpp     | 2 +-
 libsolidity/ast/Types.cpp                | 6 +++---
 libsolidity/ast/Types.h                  | 2 ++
 libsolidity/codegen/CompilerUtils.cpp    | 4 ++--
 libsolidity/codegen/YulUtilFunctions.cpp | 6 +++---
 libsolidity/formal/SymbolicTypes.cpp     | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 1a07d6ded0..5b03717d9d 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1791,7 +1791,7 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
 					);
 				else
 					solAssert(
-						argArrayType->isByteArrayOrString() && !argArrayType->isString() && resultType->category() == Type::Category::FixedBytes,
+						argArrayType->isByteArray() && resultType->category() == Type::Category::FixedBytes,
 						""
 					);
 			}
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index f50210ff55..74cd76ee73 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -1530,7 +1530,7 @@ BoolResult ArrayType::isImplicitlyConvertibleTo(Type const& _convertTo) const
 	if (_convertTo.category() != category())
 		return false;
 	auto& convertTo = dynamic_cast<ArrayType const&>(_convertTo);
-	if (convertTo.isByteArrayOrString() != isByteArrayOrString() || convertTo.isString() != isString())
+	if (convertTo.isByteArray() != isByteArray() || convertTo.isString() != isString())
 		return false;
 	// memory/calldata to storage can be converted, but only to a direct storage reference
 	if (convertTo.location() == DataLocation::Storage && location() != DataLocation::Storage && convertTo.isPointer())
@@ -1571,7 +1571,7 @@ BoolResult ArrayType::isExplicitlyConvertibleTo(Type const& _convertTo) const
 		return true;
 	// allow conversion bytes <-> string and bytes -> bytesNN
 	if (_convertTo.category() != category())
-		return isByteArrayOrString() && !isString() && _convertTo.category() == Type::Category::FixedBytes;
+		return isByteArray() && _convertTo.category() == Type::Category::FixedBytes;
 	auto& convertTo = dynamic_cast<ArrayType const&>(_convertTo);
 	if (convertTo.location() != location())
 		return false;
@@ -1608,7 +1608,7 @@ bool ArrayType::operator==(Type const& _other) const
 	ArrayType const& other = dynamic_cast<ArrayType const&>(_other);
 	if (
 		!ReferenceType::operator==(other) ||
-		other.isByteArrayOrString() != isByteArrayOrString() ||
+		other.isByteArray() != isByteArray() ||
 		other.isString() != isString() ||
 		other.isDynamicallySized() != isDynamicallySized()
 	)
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index e34c114057..3f134df17d 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -837,6 +837,8 @@ class ArrayType: public ReferenceType
 
 	BoolResult validForLocation(DataLocation _loc) const override;
 
+	/// @returns true if this is a byte array.
+	bool isByteArray() const { return m_arrayKind == ArrayKind::Bytes; }
 	/// @returns true if this is a byte array or a string
 	bool isByteArrayOrString() const { return m_arrayKind != ArrayKind::Ordinary; }
 	/// @returns true if this is a string
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index ba678878f2..0ad37241b4 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -992,7 +992,7 @@ void CompilerUtils::convertType(
 		if (_targetType.category() == Type::Category::FixedBytes)
 		{
 			solAssert(
-				typeOnStack.isByteArrayOrString() && !typeOnStack.isString(),
+				typeOnStack.isByteArray(),
 				"Array types other than bytes not convertible to bytesNN."
 			);
 			solAssert(typeOnStack.isDynamicallySized());
@@ -1119,7 +1119,7 @@ void CompilerUtils::convertType(
 		if (_targetType.category() == Type::Category::FixedBytes)
 		{
 			solAssert(
-				typeOnStack.arrayType().isByteArrayOrString() && !typeOnStack.arrayType().isString(),
+				typeOnStack.arrayType().isByteArray(),
 				"Array types other than bytes not convertible to bytesNN."
 			);
 			solAssert(typeOnStack.isDynamicallySized());
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 3c79b64b46..9b50d68cd9 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -3216,7 +3216,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 		auto const& fromType = dynamic_cast<ArraySliceType const&>(_from);
 		if (_to.category() == Type::Category::FixedBytes)
 		{
-			solAssert(fromType.arrayType().isByteArrayOrString(), "Array types other than bytes not convertible to bytesNN.");
+			solAssert(fromType.arrayType().isByteArray(), "Array types other than bytes not convertible to bytesNN.");
 			return bytesToFixedBytesConversionFunction(fromType.arrayType(), dynamic_cast<FixedBytesType const &>(_to));
 		}
 		solAssert(_to.category() == Type::Category::Array);
@@ -3256,7 +3256,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 		auto const& fromArrayType =  dynamic_cast<ArrayType const&>(_from);
 		if (_to.category() == Type::Category::FixedBytes)
 		{
-			solAssert(fromArrayType.isByteArrayOrString(), "Array types other than bytes not convertible to bytesNN.");
+			solAssert(fromArrayType.isByteArray(), "Array types other than bytes not convertible to bytesNN.");
 			return bytesToFixedBytesConversionFunction(fromArrayType, dynamic_cast<FixedBytesType const &>(_to));
 		}
 		solAssert(_to.category() == Type::Category::Array, "");
@@ -3460,7 +3460,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 
 string YulUtilFunctions::bytesToFixedBytesConversionFunction(ArrayType const& _from, FixedBytesType const& _to)
 {
-	solAssert(_from.isByteArrayOrString() && !_from.isString(), "");
+	solAssert(_from.isByteArray(), "");
 	solAssert(_from.isDynamicallySized(), "");
 	string functionName = "convert_bytes_to_fixedbytes_from_" + _from.identifier() + "_to_" + _to.identifier();
 	return m_functionCollector.createFunction(functionName, [&](auto& _args, auto& _returnParams) {
diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
index 024e33be6e..b9041c6bd4 100644
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ b/libsolidity/formal/SymbolicTypes.cpp
@@ -96,7 +96,7 @@ SortPointer smtSort(frontend::Type const& _type)
 		auto sliceArrayType = dynamic_cast<ArraySliceType const*>(&_type);
 		ArrayType const* arrayType = sliceArrayType ? &sliceArrayType->arrayType() : dynamic_cast<ArrayType const*>(&_type);
 		if (
-			(arrayType && (arrayType->isString() || arrayType->isByteArrayOrString())) ||
+			(arrayType && arrayType->isByteArrayOrString()) ||
 			_type.category() == frontend::Type::Category::StringLiteral
 		)
 			tupleName = "bytes";

From dcaa094f1f3850203f3908b9853efefeb3c54d58 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Wed, 2 Feb 2022 18:11:14 -0500
Subject: [PATCH 0338/1748] Add NatSpec note for libraries

---
 docs/natspec-format.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/natspec-format.rst b/docs/natspec-format.rst
index 297bbc8c62..a66c104629 100644
--- a/docs/natspec-format.rst
+++ b/docs/natspec-format.rst
@@ -36,7 +36,7 @@ tools.
 Documentation Example
 =====================
 
-Documentation is inserted above each ``contract``, ``interface``,
+Documentation is inserted above each ``contract``, ``interface``, ``library``,
 ``function``, and ``event`` using the Doxygen notation format.
 A ``public`` state variable is equivalent to a ``function``
 for the purposes of NatSpec.

From f5b345504beab1f1cd10c21f382f97b7c6aa5321 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 3 Feb 2022 14:52:58 +0100
Subject: [PATCH 0339/1748] When installing solc-js use the dist/ subdir, which
 contains the built JS files

---
 scripts/bytecodecompare/storebytecode.sh                   | 2 +-
 scripts/solc-bin/bytecode_reports_for_modified_binaries.sh | 4 ++--
 test/externalTests/colony.sh                               | 6 +++---
 test/externalTests/gnosis-v2.sh                            | 6 +++---
 test/externalTests/gnosis.sh                               | 6 +++---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 1c300662bc..3574fe6bfb 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -52,7 +52,7 @@ TMPDIR=$(mktemp -d)
         popd
 
         cp "$REPO_ROOT/scripts/bytecodecompare/prepare_report.js" .
-        npm install solc-js/
+        npm install ./solc-js/dist
 
         echo "Running the compiler..."
         # shellcheck disable=SC2035
diff --git a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
index be151bca86..68ab995afc 100755
--- a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
+++ b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
@@ -149,11 +149,11 @@ for binary_name in $platform_binaries; do
         if [[ $platform == emscripten-wasm32 ]] || [[ $platform == emscripten-asmjs ]]; then
             ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/soljson.js"
             ln -sf "${solc_bin_dir}/${platform}/${binary_name}" "${solcjs_dir}/dist/soljson.js"
-            ln -s "${solcjs_dir}" solc-js
+            npm install "${solcjs_dir}/dist"
             cp "${script_dir}/bytecodecompare/prepare_report.js" prepare_report.js
 
             validate_reported_version \
-                "$(solc-js/dist/solc.js --version)" \
+                "$(node_modules/solc/solc.js --version)" \
                 "$solidity_version_and_commit"
 
             # shellcheck disable=SC2035
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 8386b0b491..d659899535 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -59,7 +59,7 @@ function colony_test
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$SELECTED_PRESETS")"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")"
     yarn install
     git submodule update --init
 
@@ -69,10 +69,10 @@ function colony_test
     cd ..
 
     replace_version_pragmas
-    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
+    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
 
     for preset in $SELECTED_PRESETS; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index 16f3d6f622..8ad070d113 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -63,14 +63,14 @@ function gnosis_safe_test
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$SELECTED_PRESETS")"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")"
     npm install --package-lock
 
     replace_version_pragmas
-    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
+    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
 
     for preset in $SELECTED_PRESETS; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 62dea10df6..edada2fef3 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -61,14 +61,14 @@ function gnosis_safe_test
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$(first_word "$SELECTED_PRESETS")"
+    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")"
     npm install --package-lock
 
     replace_version_pragmas
-    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc"
+    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
 
     for preset in $SELECTED_PRESETS; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
     done
 }
 

From e85bceb4178f82e05762dc3e7e7bcf3020ded091 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Fri, 4 Feb 2022 02:08:36 +0530
Subject: [PATCH 0340/1748] Types.h:872 had a comment /// String is interpreted
 as a subtype of Bytes. - this was now incorrect after #12593 . That has been
 removed now.

---
 libsolidity/ast/Types.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 3f134df17d..c4aaf38ca1 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -864,7 +864,6 @@ class ArrayType: public ReferenceType
 	std::vector<Type const*> decomposition() const override { return {m_baseType}; }
 
 private:
-	/// String is interpreted as a subtype of Bytes.
 	enum class ArrayKind { Ordinary, Bytes, String };
 
 	bigint unlimitedStaticCalldataSize(bool _padded) const;

From b925250705d5ba44cbf6a2b49bb78eacaa402d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 28 Jan 2022 19:14:29 +0100
Subject: [PATCH 0341/1748] Make solc-js.sh run its tests directly

- Its structure has diverged a lot from other external tests and there's not point in keeping it abstracted like this.
---
 test/externalTests/common.sh          | 14 --------------
 test/externalTests/solc-js/solc-js.sh |  8 ++++----
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 10df975256..3737069cb3 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -323,20 +323,6 @@ function hardhat_clean
     rm -rf artifacts/ cache/
 }
 
-function run_test
-{
-    local compile_fn="$1"
-    local test_fn="$2"
-
-    replace_version_pragmas
-
-    printLog "Running compile function..."
-    time $compile_fn
-
-    printLog "Running test function..."
-    $test_fn
-}
-
 function settings_from_preset
 {
     local preset="$1"
diff --git a/test/externalTests/solc-js/solc-js.sh b/test/externalTests/solc-js/solc-js.sh
index 33b43e6430..3da03519b3 100755
--- a/test/externalTests/solc-js/solc-js.sh
+++ b/test/externalTests/solc-js/solc-js.sh
@@ -29,9 +29,6 @@ VERSION="$2"
 
 [[ $SOLJSON != "" && -f "$SOLJSON" && $VERSION != "" ]] || fail "Usage: $0 <path to soljson.js> <version>"
 
-function compile_fn { echo "Nothing to compile."; }
-function test_fn { npm test; }
-
 function solcjs_test
 {
     TEST_DIR=$(pwd)
@@ -60,7 +57,10 @@ function solcjs_test
     echo "Updating package.json to version $VERSION"
     npm version --allow-same-version --no-git-tag-version "$VERSION"
 
-    run_test compile_fn test_fn
+    replace_version_pragmas
+
+    printLog "Running test function..."
+    npm test
 }
 
 external_test solc-js solcjs_test

From 9e641e60e7eeff966f3cd33824cf42bdb5111493 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 28 Jan 2022 20:51:04 +0100
Subject: [PATCH 0342/1748] externalTests/solc-js: Allow using a local checkout
 of solc-js

---
 test/externalTests/common.sh          | 10 +++++++++-
 test/externalTests/solc-js/solc-js.sh |  5 +++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 3737069cb3..ec782f0562 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -71,15 +71,23 @@ function setup_solc
     local binary_path="$3"
     local solcjs_branch="${4:-master}"
     local install_dir="${5:-solc/}"
+    local solcjs_dir="$6"
 
     [[ $binary_type == native || $binary_type == solcjs ]] || assertFail
+    [[ $binary_type == solcjs || $solcjs_dir == "" ]] || assertFail
 
     cd "$test_dir"
 
     if [[ $binary_type == solcjs ]]
     then
         printLog "Setting up solc-js..."
-        git clone --depth 1 -b "$solcjs_branch" https://github.com/ethereum/solc-js.git "$install_dir"
+        if [[ $solcjs_dir == "" ]]; then
+            printLog "Cloning branch ${solcjs_branch}..."
+            git clone --depth 1 -b "$solcjs_branch" https://github.com/ethereum/solc-js.git "$install_dir"
+        else
+            printLog "Using local solc-js from ${solcjs_dir}..."
+            cp -ra "$solcjs_dir" solc
+        fi
 
         pushd "$install_dir"
         npm install
diff --git a/test/externalTests/solc-js/solc-js.sh b/test/externalTests/solc-js/solc-js.sh
index 3da03519b3..bf7ca87628 100755
--- a/test/externalTests/solc-js/solc-js.sh
+++ b/test/externalTests/solc-js/solc-js.sh
@@ -26,8 +26,9 @@ source test/externalTests/common.sh
 
 SOLJSON="$1"
 VERSION="$2"
+SOLCJS_CHECKOUT="$3" # optional
 
-[[ $SOLJSON != "" && -f "$SOLJSON" && $VERSION != "" ]] || fail "Usage: $0 <path to soljson.js> <version>"
+[[ $SOLJSON != "" && -f "$SOLJSON" && $VERSION != "" ]] || fail "Usage: $0 <path to soljson.js> <version> [<path to solc-js>]"
 
 function solcjs_test
 {
@@ -35,7 +36,7 @@ function solcjs_test
     SOLCJS_INPUT_DIR="$TEST_DIR"/test/externalTests/solc-js
 
     # set up solc-js on the branch specified
-    setup_solc "$DIR" solcjs "$SOLJSON" master solc/
+    setup_solc "$DIR" solcjs "$SOLJSON" master solc/ "$SOLCJS_CHECKOUT"
     cd solc/
 
     printLog "Updating index.js file..."

From b52032a452004e53115a8c214341593ef29018db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Feb 2022 15:18:37 +0100
Subject: [PATCH 0343/1748] Re-enable Bleeps and just disable the failing
 governor test

---
 .circleci/config.yml         | 3 +--
 test/externalTests/bleeps.sh | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44b44bb012..143a692fdb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1468,8 +1468,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_trident
       - t_ems_ext: *job_native_test_ext_euler
       - t_ems_ext: *job_native_test_ext_yield_liquidator
-      # Disabled until we have a fix for https://github.com/wighawag/bleeps/issues/2
-      #-t_ems_ext: *job_native_test_ext_bleeps
+      - t_ems_ext: *job_native_test_ext_bleeps
       - t_ems_ext: *job_native_test_ext_pool_together
       - t_ems_ext: *job_native_test_ext_perpetual_pools
       - t_ems_ext: *job_native_test_ext_uniswap
diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index d005cf8efb..561200e219 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -72,6 +72,10 @@ function bleeps_test
     sed -i 's/msg\.sender\.transfer(/payable(msg.sender).transfer(/g' src/externals/WETH9.sol
     sed -i 's/^\s*\(Deposit\|Withdrawal\|Approval\|Transfer\)(/emit \1(/g' src/externals/WETH9.sol
 
+    # This test does not currently pass due to an upstream problem.
+    # TODO: Remove this line when https://github.com/wighawag/bleeps/issues/2 is fixed
+    rm test/BleepsDAO.governor.test.ts
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"

From 4ebd839d3a303814865b83ff2c605f1a50d80b73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Feb 2022 15:51:34 +0100
Subject: [PATCH 0344/1748] Run full tests, not just test:contracts in PRBMath
 external test

- `test:contracts` does not seem to be running any tests at all.
---
 test/externalTests/prb-math.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
index 339a5e75d4..53fad2c255 100755
--- a/test/externalTests/prb-math.sh
+++ b/test/externalTests/prb-math.sh
@@ -30,7 +30,7 @@ BINARY_PATH="$2"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn compile; }
-function test_fn { yarn test:contracts; }
+function test_fn { yarn test; }
 
 function prb_math_test
 {

From 653c1e68429937abec17c9242a191227db0202b9 Mon Sep 17 00:00:00 2001
From: Ayush Shukla <shuklaayush247@gmail.com>
Date: Thu, 3 Feb 2022 20:26:46 +0530
Subject: [PATCH 0345/1748] Fix slot calculation for bytes/string mapping

---
 docs/internals/layout_in_storage.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/internals/layout_in_storage.rst b/docs/internals/layout_in_storage.rst
index b1b89a6a3c..9afe97ddbf 100644
--- a/docs/internals/layout_in_storage.rst
+++ b/docs/internals/layout_in_storage.rst
@@ -90,7 +90,7 @@ The value corresponding to a mapping key ``k`` is located at ``keccak256(h(k) .
 where ``.`` is concatenation and ``h`` is a function that is applied to the key depending on its type:
 
 - for value types, ``h`` pads the value to 32 bytes in the same way as when storing the value in memory.
-- for strings and byte arrays, ``h`` computes the ``keccak256`` hash of the unpadded data.
+- for strings and byte arrays, ``h(k)`` is just the unpadded data.
 
 If the mapping value is a
 non-value type, the computed slot marks the start of the data. If the value is of struct type,

From 4d65bfa95e28f3dc3b8ad6cd6aaf8578c15851c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sat, 5 Feb 2022 00:05:39 +0100
Subject: [PATCH 0346/1748] CI: Remove notes about Hardhat failing on nodejs
 17; that version is officially not supported

---
 .circleci/config.yml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 143a692fdb..3f2c661a0c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -521,35 +521,30 @@ defaults:
       name: t_native_test_ext_ens
       project: ens
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
   - job_native_test_ext_trident: &job_native_test_ext_trident
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_trident
       project: trident
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
   - job_native_test_ext_euler: &job_native_test_ext_euler
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_euler
       project: euler
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_yield_liquidator
       project: yield-liquidator
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
   - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_bleeps
       project: bleeps
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
       resource_class: medium
   - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
@@ -557,35 +552,30 @@ defaults:
       name: t_native_test_ext_pool_together
       project: pool-together
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
   - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_perpetual_pools
       project: perpetual-pools
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
   - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_uniswap
       project: uniswap
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
   - job_native_test_prb_math: &job_native_test_prb_math
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_elementfi
       project: elementfi
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
       nodejs_version: '16'
       resource_class: medium
   - job_ems_test_ext_colony: &job_ems_test_ext_colony

From 247eab90567e36fb9d8e390ef530551316fc7a6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sat, 5 Feb 2022 00:03:53 +0100
Subject: [PATCH 0347/1748] CI: Rename node_latest_small to node_small

---
 .circleci/config.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3f2c661a0c..db9baaa642 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -384,7 +384,7 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j 2
 
-  - base_node_latest_small: &base_node_latest_small
+  - base_node_small: &base_node_small
       docker:
         - image: circleci/node
       resource_class: small
@@ -605,7 +605,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_docs_examples:
-    <<: *base_node_latest_small
+    <<: *base_node_small
     steps:
       - checkout
       - attach_workspace:
@@ -674,7 +674,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_buglist:
-    <<: *base_node_latest_small
+    <<: *base_node_small
     steps:
       - checkout
       - run:
@@ -1136,7 +1136,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   t_ems_ext_hardhat:
-    <<: *base_node_latest_small
+    <<: *base_node_small
     environment:
       TERM: xterm
       HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
@@ -1339,7 +1339,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_bytecode_ems:
-    <<: *base_node_latest_small
+    <<: *base_node_small
     environment:
       SOLC_EMSCRIPTEN: "On"
     steps:

From 2f0ccb21bef0ddee12b37b52289ca7081b6a5d31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sat, 5 Feb 2022 00:04:20 +0100
Subject: [PATCH 0348/1748] CI: Switch t_ems_ext_hardhat to nodejs 16

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index db9baaa642..58a4c27428 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1137,6 +1137,8 @@ jobs:
 
   t_ems_ext_hardhat:
     <<: *base_node_small
+    docker:
+      - image: circleci/node:16
     environment:
       TERM: xterm
       HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js

From 7634fc4ea9537d60fdf686f43a4e54e7ab0f43fe Mon Sep 17 00:00:00 2001
From: a3d4 <a3d4@pm.me>
Date: Fri, 4 Feb 2022 17:54:21 +0100
Subject: [PATCH 0349/1748] Clarify symlink handling on Windows

---
 docs/contributing.rst    | 7 +++++++
 test/FilesystemUtils.cpp | 1 +
 2 files changed, 8 insertions(+)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 2895744ef4..ba5a0a0f8f 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -94,6 +94,13 @@ dependencies (`evmone <https://github.com/ethereum/evmone/releases>`_,
 On macOS some of the testing scripts expect GNU coreutils to be installed.
 This can be easiest accomplished using Homebrew: ``brew install coreutils``.
 
+On Windows systems make sure that you have a privilege to create symlinks,
+otherwise several tests may fail.
+Administrators should have that privilege, but you may also
+`grant it to other users <https://docs.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/create-symbolic-links#policy-management>`_
+or
+`enable Developer Mode <https://docs.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development>`_.
+
 Running the Tests
 -----------------
 
diff --git a/test/FilesystemUtils.cpp b/test/FilesystemUtils.cpp
index 0235b11476..0d1de3af95 100644
--- a/test/FilesystemUtils.cpp
+++ b/test/FilesystemUtils.cpp
@@ -81,5 +81,6 @@ bool solidity::test::createSymlinkIfSupportedByFilesystem(
 		BOOST_THROW_EXCEPTION(runtime_error(
 			"Failed to create a symbolic link: \"" + _linkName.string() + "\""
 			" -> " + _targetPath.string() + "\"."
+			" " + symlinkCreationError.message() + "."
 		));
 }

From 0a17495cf94016318ee76f299419595d6bfdd718 Mon Sep 17 00:00:00 2001
From: a3d4 <a3d4@pm.me>
Date: Sat, 5 Feb 2022 11:51:11 +0100
Subject: [PATCH 0350/1748] Treat root path in normalizeCLIPathForVFS as case
 insensitive on Windows

---
 libsolidity/interface/FileReader.cpp      |  3 ++-
 test/libsolidity/interface/FileReader.cpp | 28 +++++++++++++++++++----
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
index 47f4d2b5aa..adb4b01cae 100644
--- a/libsolidity/interface/FileReader.cpp
+++ b/libsolidity/interface/FileReader.cpp
@@ -269,7 +269,8 @@ boost::filesystem::path FileReader::normalizeCLIPathForVFS(
 	if (!isUNCPath(normalizedPath))
 	{
 		boost::filesystem::path workingDirRootPath = canonicalWorkDir.root_path();
-		if (normalizedRootPath == workingDirRootPath)
+		// Ignore drive letter case on Windows (C:\ <=> c:\).
+		if (boost::filesystem::equivalent(normalizedRootPath, workingDirRootPath))
 			normalizedRootPath = "/";
 	}
 
diff --git a/test/libsolidity/interface/FileReader.cpp b/test/libsolidity/interface/FileReader.cpp
index 866a4435ac..39355e536f 100644
--- a/test/libsolidity/interface/FileReader.cpp
+++ b/test/libsolidity/interface/FileReader.cpp
@@ -25,6 +25,7 @@
 #include <test/TemporaryDirectory.h>
 #include <test/libsolidity/util/SoltestErrors.h>
 
+#include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 
@@ -192,8 +193,8 @@ BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_root_name_only)
 
 #if defined(_WIN32)
 		boost::filesystem::path driveLetter = boost::filesystem::current_path().root_name();
-		solAssert(!driveLetter.empty(), "");
-		solAssert(driveLetter.is_relative(), "");
+		soltestAssert(!driveLetter.empty(), "");
+		soltestAssert(driveLetter.is_relative(), "");
 
 		BOOST_CHECK_EQUAL(FileReader::normalizeCLIPathForVFS(driveLetter, resolveSymlinks), expectedWorkDir);
 #endif
@@ -212,13 +213,32 @@ BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_stripping_root_name)
 
 	for (SymlinkResolution resolveSymlinks: {SymlinkResolution::Enabled, SymlinkResolution::Disabled})
 	{
+		boost::filesystem::path workDir = boost::filesystem::current_path();
+
 		boost::filesystem::path normalizedPath = FileReader::normalizeCLIPathForVFS(
-			boost::filesystem::current_path(),
+			workDir,
 			resolveSymlinks
 		);
-		BOOST_CHECK_EQUAL(normalizedPath, "/" / boost::filesystem::current_path().relative_path());
+		BOOST_CHECK_EQUAL(normalizedPath, "/" / workDir.relative_path());
 		BOOST_TEST(normalizedPath.root_name().empty());
 		BOOST_CHECK_EQUAL(normalizedPath.root_directory(), "/");
+
+#if defined(_WIN32)
+		string root = workDir.root_path().string();
+		soltestAssert(root.length() == 3 && root[1] == ':' && root[2] == '\\', "");
+
+		for (auto convert: {boost::to_lower_copy<string>, boost::to_upper_copy<string>})
+		{
+			boost::filesystem::path workDirWin = convert(root, locale()) / workDir.relative_path();
+			normalizedPath = FileReader::normalizeCLIPathForVFS(
+				workDirWin,
+				resolveSymlinks
+			);
+			BOOST_CHECK_EQUAL(normalizedPath, "/" / workDir.relative_path());
+			BOOST_TEST(normalizedPath.root_name().empty());
+			BOOST_CHECK_EQUAL(normalizedPath.root_directory(), "/");
+		}
+#endif
 	}
 }
 

From a0dd2cd1ff59d06425c78180a2a8a6e2c8ff506e Mon Sep 17 00:00:00 2001
From: a3d4 <a3d4@pm.me>
Date: Sat, 5 Feb 2022 15:12:49 +0100
Subject: [PATCH 0351/1748] Remove a reference to unused
 SolidityFixedFeeRegistrar

---
 test/boostTest.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index bfb546736c..1cc512c325 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -57,7 +57,7 @@ void removeTestSuite(std::string const& _name)
 {
 	master_test_suite_t& master = framework::master_test_suite();
 	auto id = master.get(_name);
-	assert(id != INV_TEST_UNIT_ID);
+	soltestAssert(id != INV_TEST_UNIT_ID, "Removing non-existent test suite!");
 	master.remove(id);
 }
 
@@ -279,7 +279,6 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 			"ABIDecoderTest",
 			"ABIEncoderTest",
 			"SolidityAuctionRegistrar",
-			"SolidityFixedFeeRegistrar",
 			"SolidityWallet",
 			"GasMeterTests",
 			"GasCostTests",

From 6bd38aa4ef2ca036775896b77909b361ed3d8855 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Sat, 5 Feb 2022 23:59:09 -0500
Subject: [PATCH 0352/1748] Fix signature of pop member

---
 docs/types/reference-types.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index 126440321c..88e23a47eb 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -337,9 +337,9 @@ Array Members
      Dynamic storage arrays and ``bytes`` (not ``string``) have a member function
      called ``push(x)`` that you can use to append a given element at the end of the array.
      The function returns nothing.
-**pop**:
+**pop()**:
      Dynamic storage arrays and ``bytes`` (not ``string``) have a member
-     function called ``pop`` that you can use to remove an element from the
+     function called ``pop()`` that you can use to remove an element from the
      end of the array. This also implicitly calls :ref:`delete<delete>` on the removed element.
 
 .. note::

From c3145979fc18c104479379916b17364e94fccb16 Mon Sep 17 00:00:00 2001
From: Hakeem Almidan <Hakeemmidan@gmail.com>
Date: Sun, 6 Feb 2022 20:16:04 +0300
Subject: [PATCH 0353/1748] Update cheatsheet.rst

Add more description to the bullet point of 'block.timestamp' (under 'Global Variables')
---
 docs/cheatsheet.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index eab1e3d52a..cd9ba5c149 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -92,7 +92,7 @@ Global Variables
 - ``block.difficulty`` (``uint``): current block difficulty
 - ``block.gaslimit`` (``uint``): current block gaslimit
 - ``block.number`` (``uint``): current block number
-- ``block.timestamp`` (``uint``): current block timestamp
+- ``block.timestamp`` (``uint``): current block timestamp in seconds since Unix epoch
 - ``gasleft() returns (uint256)``: remaining gas
 - ``msg.data`` (``bytes``): complete calldata
 - ``msg.sender`` (``address``): sender of the message (current call)

From 4715fafb829a156e25a027027d8632689ee3d04b Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 7 Feb 2022 11:31:59 +0100
Subject: [PATCH 0354/1748] Re-enable preset for poolTogether.

---
 test/externalTests/pool-together.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index 1cabd6a501..a7f5933c0e 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -45,7 +45,7 @@ function pool_together_test
         "${compile_only_presets[@]}"
         #ir-no-optimize            # Compilation fails with "YulException: Variable var_amount_205 is 9 slot(s) too deep inside the stack."
         #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_amount_205 is 9 slot(s) too deep inside the stack."
-        #ir-optimize-evm+yul       # FIXME: ICE due to https://github.com/ethereum/solidity/issues/12558
+        ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul

From b9fe628b70b0f118f02822ace678a69c39f5843c Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 27 Jan 2022 14:07:50 +0100
Subject: [PATCH 0355/1748] Emit immutable references for pure yul code

---
 Changelog.md                                  |  1 +
 libsolidity/interface/StandardCompiler.cpp    | 22 ++++----
 .../standard_yul_immutable_references/args    |  1 +
 .../input.json                                | 22 ++++++++
 .../output.json                               | 52 +++++++++++++++++++
 .../standard_yul_object_name/output.json      |  2 +-
 6 files changed, 88 insertions(+), 12 deletions(-)
 create mode 100644 test/cmdlineTests/standard_yul_immutable_references/args
 create mode 100644 test/cmdlineTests/standard_yul_immutable_references/input.json
 create mode 100644 test/cmdlineTests/standard_yul_immutable_references/output.json

diff --git a/Changelog.md b/Changelog.md
index e75e2c710e..c938c44b0f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Language Features:
 
 Compiler Features:
  * Yul Optimizer: Remove ``mstore`` and ``sstore`` operations if the slot already contains the same value.
+ * Yul: Emit immutable references for pure yul code when requested.
 
 
 
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 39ed7c10fb..5ccf2d447b 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1461,36 +1461,36 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	stack.optimize();
 
 	MachineAssemblyObject object;
-	MachineAssemblyObject runtimeObject;
-	tie(object, runtimeObject) = stack.assembleWithDeployed();
+	MachineAssemblyObject deployedObject;
+	tie(object, deployedObject) = stack.assembleWithDeployed();
 
 	if (object.bytecode)
 		object.bytecode->link(_inputsAndSettings.libraries);
-	if (runtimeObject.bytecode)
-		runtimeObject.bytecode->link(_inputsAndSettings.libraries);
+	if (deployedObject.bytecode)
+		deployedObject.bytecode->link(_inputsAndSettings.libraries);
 
-	for (string const& objectKind: vector<string>{"bytecode", "deployedBytecode"})
+	for (auto&& [kind, isDeployed]: {make_pair("bytecode"s, false), make_pair("deployedBytecode"s, true)})
 		if (isArtifactRequested(
 			_inputsAndSettings.outputSelection,
 			sourceName,
 			contractName,
-			evmObjectComponents(objectKind),
+			evmObjectComponents(kind),
 			wildcardMatchesExperimental
 		))
 		{
-			MachineAssemblyObject const& o = objectKind == "bytecode" ? object : runtimeObject;
+			MachineAssemblyObject const& o = isDeployed ? deployedObject : object;
 			if (o.bytecode)
-				output["contracts"][sourceName][contractName]["evm"][objectKind] =
+				output["contracts"][sourceName][contractName]["evm"][kind] =
 					collectEVMObject(
 						*o.bytecode,
 						o.sourceMappings.get(),
 						Json::arrayValue,
-						false,
-						[&](string const& _element) { return isArtifactRequested(
+						isDeployed,
+						[&, kind = kind](string const& _element) { return isArtifactRequested(
 							_inputsAndSettings.outputSelection,
 							sourceName,
 							contractName,
-							"evm." + objectKind + "." + _element,
+							"evm." + kind + "." + _element,
 							wildcardMatchesExperimental
 						); }
 					);
diff --git a/test/cmdlineTests/standard_yul_immutable_references/args b/test/cmdlineTests/standard_yul_immutable_references/args
new file mode 100644
index 0000000000..d13a8ac44a
--- /dev/null
+++ b/test/cmdlineTests/standard_yul_immutable_references/args
@@ -0,0 +1 @@
+--pretty-json
diff --git a/test/cmdlineTests/standard_yul_immutable_references/input.json b/test/cmdlineTests/standard_yul_immutable_references/input.json
new file mode 100644
index 0000000000..aedbae8683
--- /dev/null
+++ b/test/cmdlineTests/standard_yul_immutable_references/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Yul",
+	"sources":
+	{
+		"A":
+		{
+			"content": "object \"YulTest\" {  code {    let size := datasize(\"runtime\")    datacopy(0, dataoffset(\"runtime\"), size)    setimmutable(0, \"test\", 1)    return(0, size)  }  object \"runtime\" {    code {      mstore(0, loadimmutable(\"test\"))      return(0, 0x20)    }  }}"
+		}
+	},
+	"settings":
+	{
+		"outputSelection": {
+			"A": {
+				"*": [
+					"evm.deployedBytecode.immutableReferences",
+					"evm.bytecode",
+					"evm.deployedBytecode"
+				]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_yul_immutable_references/output.json b/test/cmdlineTests/standard_yul_immutable_references/output.json
new file mode 100644
index 0000000000..42361097de
--- /dev/null
+++ b/test/cmdlineTests/standard_yul_immutable_references/output.json
@@ -0,0 +1,52 @@
+{
+  "contracts":
+  {
+    "A":
+    {
+      "YulTest":
+      {
+        "evm":
+        {
+          "bytecode":
+          {
+            "functionDebugData": {},
+            "generatedSources": [],
+            "linkReferences": {},
+            "object": "60298060156000396001600060010152806000f3fe7f000000000000000000000000000000000000000000000000000000000000000060005260206000f3",
+            "opcodes": "PUSH1 0x29 DUP1 PUSH1 0x15 PUSH1 0x0 CODECOPY PUSH1 0x1 PUSH1 0x0 PUSH1 0x1 ADD MSTORE DUP1 PUSH1 0x0 RETURN INVALID PUSH32 0x0 PUSH1 0x0 MSTORE PUSH1 0x20 PUSH1 0x0 RETURN ",
+            "sourceMap": "42:19:0:-:0;100:4;77:21;74:1;65:40;133:1;122;109:26;;;149:4;146:1;139:15"
+          },
+          "deployedBytecode":
+          {
+            "functionDebugData": {},
+            "generatedSources": [],
+            "immutableReferences":
+            {
+              "test":
+              [
+                {
+                  "length": 32,
+                  "start": 1
+                }
+              ]
+            },
+            "linkReferences": {},
+            "object": "7f000000000000000000000000000000000000000000000000000000000000000060005260206000f3",
+            "opcodes": "PUSH32 0x0 PUSH1 0x0 MSTORE PUSH1 0x20 PUSH1 0x0 RETURN ",
+            "sourceMap": "203:21:0:-:0;200:1;193:32;241:4;238:1;231:15"
+          }
+        }
+      }
+    }
+  },
+  "errors":
+  [
+    {
+      "component": "general",
+      "formattedMessage": "Yul is still experimental. Please use the output with care.",
+      "message": "Yul is still experimental. Please use the output with care.",
+      "severity": "warning",
+      "type": "Warning"
+    }
+  ]
+}
diff --git a/test/cmdlineTests/standard_yul_object_name/output.json b/test/cmdlineTests/standard_yul_object_name/output.json
index f2e85ed7cb..45280c8a1b 100644
--- a/test/cmdlineTests/standard_yul_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_object_name/output.json
@@ -23,7 +23,7 @@ sub_0: assembly {
         /* \"A\":137:149   */
       revert
 }
-","bytecode":{"functionDebugData":{},"generatedSources":[],"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"},"deployedBytecode":{"functionDebugData":{},"generatedSources":[],"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"}},"ir":"object \"NamedObject\" {
+","bytecode":{"functionDebugData":{},"generatedSources":[],"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"},"deployedBytecode":{"functionDebugData":{},"generatedSources":[],"immutableReferences":{},"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"}},"ir":"object \"NamedObject\" {
     code {
         let x := dataoffset(\"DataName\")
         sstore(add(x, 0), 0)

From 2e2094ad820994161cf621c90a0e82f3d1c1d6f2 Mon Sep 17 00:00:00 2001
From: Naveen Sahu <42338831+theNvN@users.noreply.github.com>
Date: Wed, 2 Feb 2022 02:02:31 +0530
Subject: [PATCH 0356/1748] plain `address` can be sent Ether too

The docs state that a plain `address` cannot be sent Ether. But even though `send` and `transfer` members are not available for plain `address`, the `call` is. And `call` can be invoked upon a plain `address` type to send Ether to the address.

For instance, the `someone` (`address` type) can be sent Ether by invoking `sendSomeone()` method in the following `Dummy` contract:

```
contract Dummy {
    address someone = 0xAb8...cb2;

    function balanceOf(address addr) public view returns (uint) {
        return addr.balance;
    }

    function sendToSomeone() public payable returns (bool) {
        (bool sent, ) = someone.call{value: msg.value}("");
        return sent;
    }
}
```
---
 docs/types/value-types.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 30a8577963..0d6a30cd62 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -188,7 +188,8 @@ The address type comes in two flavours, which are largely identical:
 - ``address payable``: Same as ``address``, but with the additional members ``transfer`` and ``send``.
 
 The idea behind this distinction is that ``address payable`` is an address you can send Ether to,
-while a plain ``address`` cannot be sent Ether.
+while you are not supposed to send Ether to a plain ``address``, for example because it might be a smart contract
+that was not built to accept Ether.
 
 Type conversions:
 

From 6225dad3328ef1d8a440e2710545795f07bf9844 Mon Sep 17 00:00:00 2001
From: joshuatarkwski <tarkowski.joshua@gmail.com>
Date: Wed, 10 Nov 2021 15:16:11 +0100
Subject: [PATCH 0357/1748] Output searched locations on import failure.

---
 libsolidity/interface/FileReader.cpp          | 23 ++++++++++++++-----
 .../output.json                               |  4 ++--
 test/solc/CommandLineInterfaceAllowPaths.cpp  |  6 ++---
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
index 47f4d2b5aa..8733e91a0d 100644
--- a/libsolidity/interface/FileReader.cpp
+++ b/libsolidity/interface/FileReader.cpp
@@ -116,7 +116,6 @@ ReadCallback::Result FileReader::readFile(string const& _kind, string const& _so
 		for (auto const& prefix: prefixes)
 		{
 			boost::filesystem::path canonicalPath = normalizeCLIPathForVFS(prefix / strippedSourceUnitName, SymlinkResolution::Enabled);
-
 			if (boost::filesystem::exists(canonicalPath))
 				candidates.push_back(std::move(canonicalPath));
 		}
@@ -124,7 +123,12 @@ ReadCallback::Result FileReader::readFile(string const& _kind, string const& _so
 		auto pathToQuotedString = [](boost::filesystem::path const& _path){ return "\"" + _path.string() + "\""; };
 
 		if (candidates.empty())
-			return ReadCallback::Result{false, "File not found."};
+			return ReadCallback::Result{
+				false,
+				"File not found. Searched the following locations: " +
+				joinHumanReadable(prefixes | ranges::views::transform(pathToQuotedString), ", ") +
+				"."
+			};
 
 		if (candidates.size() >= 2)
 			return ReadCallback::Result{
@@ -135,11 +139,13 @@ ReadCallback::Result FileReader::readFile(string const& _kind, string const& _so
 				"."
 			};
 
-		FileSystemPathSet extraAllowedPaths = {m_basePath.empty() ? "." : m_basePath};
-		extraAllowedPaths += m_includePaths;
+		FileSystemPathSet allowedPaths =
+			m_allowedDirectories +
+			decltype(allowedPaths){m_basePath.empty() ? "." : m_basePath} +
+			m_includePaths;
 
 		bool isAllowed = false;
-		for (boost::filesystem::path const& allowedDir: m_allowedDirectories + extraAllowedPaths)
+		for (boost::filesystem::path const& allowedDir: allowedPaths)
 			if (isPathPrefix(normalizeCLIPathForVFS(allowedDir, SymlinkResolution::Enabled), candidates[0]))
 			{
 				isAllowed = true;
@@ -147,7 +153,12 @@ ReadCallback::Result FileReader::readFile(string const& _kind, string const& _so
 			}
 
 		if (!isAllowed)
-			return ReadCallback::Result{false, "File outside of allowed directories."};
+			return ReadCallback::Result{
+				false,
+				"File outside of allowed directories. The following are allowed: " +
+				joinHumanReadable(allowedPaths | ranges::views::transform(pathToQuotedString), ", ") +
+				"."
+			};
 
 		if (!boost::filesystem::is_regular_file(candidates[0]))
 			return ReadCallback::Result{false, "Not a valid file."};
diff --git a/test/cmdlineTests/standard_yul_single_file_via_urls/output.json b/test/cmdlineTests/standard_yul_single_file_via_urls/output.json
index 3f62fa0fe4..a97057c889 100644
--- a/test/cmdlineTests/standard_yul_single_file_via_urls/output.json
+++ b/test/cmdlineTests/standard_yul_single_file_via_urls/output.json
@@ -3,8 +3,8 @@
     [
         {
             "component": "general",
-            "formattedMessage": "Cannot import url (\"in.yul\"): File not found.",
-            "message": "Cannot import url (\"in.yul\"): File not found.",
+            "formattedMessage": "Cannot import url (\"in.yul\"): File not found. Searched the following locations: \"\".",
+            "message": "Cannot import url (\"in.yul\"): File not found. Searched the following locations: \"\".",
             "severity": "error",
             "type": "IOError"
         },
diff --git a/test/solc/CommandLineInterfaceAllowPaths.cpp b/test/solc/CommandLineInterfaceAllowPaths.cpp
index 77f727014f..472f2184b4 100644
--- a/test/solc/CommandLineInterfaceAllowPaths.cpp
+++ b/test/solc/CommandLineInterfaceAllowPaths.cpp
@@ -100,7 +100,7 @@ ImportCheck checkImport(
 		return ImportCheck::OK();
 
 	static regex const sourceNotFoundErrorRegex{
-		R"(^Error \(6275\): Source ".+" not found: (.*)\.\n)"
+		R"(^Error \(6275\): Source "[^"]+" not found: (.*)\.\n)"
 		R"(\s*--> .*<stdin>:\d+:\d+:\n)"
 		R"(\s*\|\n)"
 		R"(\d+\s*\| import '.+';\n)"
@@ -110,12 +110,12 @@ ImportCheck checkImport(
 	smatch submatches;
 	if (!regex_match(cliResult.stderrContent, submatches, sourceNotFoundErrorRegex))
 		return ImportCheck::Unknown("Unexpected stderr content: '" + cliResult.stderrContent + "'");
-	if (submatches[1] != "File not found" && submatches[1] != "File outside of allowed directories")
+	if (submatches[1] != "File not found" && !boost::starts_with(string(submatches[1]), "File outside of allowed directories"))
 		return ImportCheck::Unknown("Unexpected error message: '" + cliResult.stderrContent + "'");
 
 	if (submatches[1] == "File not found")
 		return ImportCheck::FileNotFound();
-	else if (submatches[1] == "File outside of allowed directories")
+	else if (boost::starts_with(string(submatches[1]), "File outside of allowed directories"))
 		return ImportCheck::PathDisallowed();
 	else
 		return ImportCheck::Unknown("Unexpected error message '" + submatches[1].str() + "'");

From 9e62f21b2586afb6544f6a03d9c4c2f088dd94f7 Mon Sep 17 00:00:00 2001
From: joshieDo <ranriver@protonmail.com>
Date: Mon, 17 Jan 2022 21:28:58 +0000
Subject: [PATCH 0358/1748] Add event and error identifiers to cli hashes cmd

---
 Changelog.md                            |  1 +
 libsolidity/interface/CompilerStack.cpp | 32 +++++++++++++++++++++++++
 libsolidity/interface/CompilerStack.h   |  6 +++++
 solc/CommandLineInterface.cpp           | 20 ++++++++++++++--
 test/cmdlineTests/hashes/args           |  1 +
 test/cmdlineTests/hashes/input.sol      | 28 ++++++++++++++++++++++
 test/cmdlineTests/hashes/output         | 23 ++++++++++++++++++
 7 files changed, 109 insertions(+), 2 deletions(-)
 create mode 100644 test/cmdlineTests/hashes/args
 create mode 100644 test/cmdlineTests/hashes/input.sol
 create mode 100644 test/cmdlineTests/hashes/output

diff --git a/Changelog.md b/Changelog.md
index c938c44b0f..98515970f0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 
 
 Compiler Features:
+ * Commandline Interface: Event and error signatures are also returned when using ``--hashes``.
  * Yul Optimizer: Remove ``mstore`` and ``sstore`` operations if the slot already contains the same value.
  * Yul: Emit immutable references for pure yul code when requested.
 
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 5292d5329f..a1c26ab374 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -75,6 +75,7 @@
 #include <libsolutil/IpfsHash.h>
 #include <libsolutil/JSON.h>
 #include <libsolutil/Algorithms.h>
+#include <libsolutil/FunctionSelector.h>
 
 #include <json/json.h>
 
@@ -1024,6 +1025,37 @@ Json::Value CompilerStack::methodIdentifiers(string const& _contractName) const
 	return methodIdentifiers;
 }
 
+Json::Value CompilerStack::errorIdentifiers(string const& _contractName) const
+{
+	if (m_stackState < AnalysisPerformed)
+		solThrow(CompilerError, "Analysis was not successful.");
+
+	Json::Value errorIdentifiers(Json::objectValue);
+	for (ErrorDefinition const* error: contractDefinition(_contractName).interfaceErrors())
+	{
+		string signature = error->functionType(true)->externalSignature();
+		errorIdentifiers[signature] = toHex(toCompactBigEndian(selectorFromSignature32(signature), 4));
+	}
+
+	return errorIdentifiers;
+}
+
+Json::Value CompilerStack::eventIdentifiers(string const& _contractName) const
+{
+	if (m_stackState < AnalysisPerformed)
+		solThrow(CompilerError, "Analysis was not successful.");
+
+	Json::Value eventIdentifiers(Json::objectValue);
+	for (EventDefinition const* event: contractDefinition(_contractName).interfaceEvents())
+		if (!event->isAnonymous())
+		{
+			string signature = event->functionType(true)->externalSignature();
+			eventIdentifiers[signature] = toHex(u256(h256::Arith(keccak256(signature))));
+		}
+
+	return eventIdentifiers;
+}
+
 bytes CompilerStack::cborMetadata(string const& _contractName, bool _forIR) const
 {
 	if (m_stackState < AnalysisPerformed)
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 3609662e02..2e1e687f71 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -330,6 +330,12 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// @returns a JSON representing a map of method identifiers (hashes) to function names.
 	Json::Value methodIdentifiers(std::string const& _contractName) const;
 
+	/// @returns a JSON representing a map of error identifiers (hashes) to error names.
+	Json::Value errorIdentifiers(std::string const& _contractName) const;
+
+	/// @returns a JSON representing a map of event identifiers (hashes) to event names.
+	Json::Value eventIdentifiers(std::string const& _contractName) const;
+
 	/// @returns the Contract Metadata matching the pipeline selected using the viaIR setting.
 	std::string const& metadata(std::string const& _contractName) const { return metadata(contract(_contractName)); }
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 235059a02b..d96460fa1e 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -271,14 +271,30 @@ void CommandLineInterface::handleSignatureHashes(string const& _contract)
 		return;
 
 	Json::Value methodIdentifiers = m_compiler->methodIdentifiers(_contract);
-	string out;
+	string out = "Function signatures:\n";
 	for (auto const& name: methodIdentifiers.getMemberNames())
 		out += methodIdentifiers[name].asString() + ": " + name + "\n";
 
+	Json::Value errorIdentifiers = m_compiler->errorIdentifiers(_contract);
+	if (!errorIdentifiers.empty())
+	{
+		out += "\nError signatures:\n";
+		for (auto const& name: errorIdentifiers.getMemberNames())
+			out += errorIdentifiers[name].asString() + ": " + name + "\n";
+	}
+
+	Json::Value eventIdentifiers = m_compiler->eventIdentifiers(_contract);
+	if (!eventIdentifiers.empty())
+	{
+		out += "\nEvent signatures:\n";
+		for (auto const& name: eventIdentifiers.getMemberNames())
+			out += eventIdentifiers[name].asString() + ": " + name + "\n";
+	}
+
 	if (!m_options.output.dir.empty())
 		createFile(m_compiler->filesystemFriendlyName(_contract) + ".signatures", out);
 	else
-		sout() << "Function signatures:" << endl << out;
+		sout() << out;
 }
 
 void CommandLineInterface::handleMetadata(string const& _contract)
diff --git a/test/cmdlineTests/hashes/args b/test/cmdlineTests/hashes/args
new file mode 100644
index 0000000000..40469d358c
--- /dev/null
+++ b/test/cmdlineTests/hashes/args
@@ -0,0 +1 @@
+--hashes
\ No newline at end of file
diff --git a/test/cmdlineTests/hashes/input.sol b/test/cmdlineTests/hashes/input.sol
new file mode 100644
index 0000000000..1f5c758f71
--- /dev/null
+++ b/test/cmdlineTests/hashes/input.sol
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+error fileLevelError(uint z);
+
+library L {
+	event libraryEvent(uint r);
+	error libraryError(uint r);
+	error libraryErrorUnused(uint u);
+	event libraryEventUnused(uint u);
+}
+
+contract C {
+	struct S { uint x; }
+
+	event ev(uint y);
+	event anon_ev(uint y) anonymous;
+
+	error err(uint z, uint w);
+
+	function f(S memory s) public {
+		emit L.libraryEvent(3);
+		if (s.x > 1)
+			revert fileLevelError(3);
+		else
+			revert L.libraryError(4);
+	}
+}
diff --git a/test/cmdlineTests/hashes/output b/test/cmdlineTests/hashes/output
new file mode 100644
index 0000000000..5223d732a3
--- /dev/null
+++ b/test/cmdlineTests/hashes/output
@@ -0,0 +1,23 @@
+
+======= hashes/input.sol:C =======
+Function signatures:
+3fc03eeb: f((uint256))
+
+Error signatures:
+619a0bb7: err(uint256,uint256)
+82b5f64f: fileLevelError(uint256)
+8c41f45c: libraryError(uint256)
+
+Event signatures:
+2d4dd5fe18ada5a020a9f5591539a8dc3010a5c074ba6a70e1c956659f02786a: ev(uint256)
+
+======= hashes/input.sol:L =======
+Function signatures:
+
+Error signatures:
+8c41f45c: libraryError(uint256)
+c61c03f5: libraryErrorUnused(uint256)
+
+Event signatures:
+81f3fb02f88d32d3bb08c80c9a622ca3b3223292f131c6ad049811f9a8a606dc: libraryEvent(uint256)
+0a994ad3600197f16ffe1ea1101caea3174efe5ebd9ba9a75d6d5524c5de28cd: libraryEventUnused(uint256)

From 3e7c68d9b09b59a959f32975f21ba3ec19152afa Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Mon, 31 Jan 2022 17:52:08 +0100
Subject: [PATCH 0359/1748] Merge identifier query methods into one

---
 libsolidity/interface/CompilerStack.cpp       | 33 +++++--------------
 libsolidity/interface/CompilerStack.h         | 10 ++----
 libsolidity/interface/StandardCompiler.cpp    |  2 +-
 solc/CommandLineInterface.cpp                 | 22 ++++++-------
 .../input.json                                | 17 ++++++++++
 .../output.json                               |  1 +
 test/libsolidity/SemanticTest.cpp             |  2 +-
 .../tools/ossfuzz/SolidityEvmoneInterface.cpp |  2 +-
 test/tools/ossfuzz/SolidityEvmoneInterface.h  |  2 +-
 9 files changed, 43 insertions(+), 48 deletions(-)
 create mode 100644 test/cmdlineTests/standard_method_identifiers_requested_empty/input.json
 create mode 100644 test/cmdlineTests/standard_method_identifiers_requested_empty/output.json

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index a1c26ab374..acf1932956 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1014,46 +1014,31 @@ Json::Value const& CompilerStack::natspecDev(Contract const& _contract) const
 	return _contract.devDocumentation.init([&]{ return Natspec::devDocumentation(*_contract.contract); });
 }
 
-Json::Value CompilerStack::methodIdentifiers(string const& _contractName) const
+Json::Value CompilerStack::contractIdentifiers(string const& _contractName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Analysis was not successful.");
 
-	Json::Value methodIdentifiers(Json::objectValue);
-	for (auto const& it: contractDefinition(_contractName).interfaceFunctions())
-		methodIdentifiers[it.second->externalSignature()] = it.first.hex();
-	return methodIdentifiers;
-}
+	Json::Value contractIdentifiers(Json::objectValue);
+	// Always have a methods object
+	contractIdentifiers["methods"] = Json::objectValue;
 
-Json::Value CompilerStack::errorIdentifiers(string const& _contractName) const
-{
-	if (m_stackState < AnalysisPerformed)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	Json::Value errorIdentifiers(Json::objectValue);
+	for (auto const& it: contractDefinition(_contractName).interfaceFunctions())
+		contractIdentifiers["methods"][it.second->externalSignature()] = it.first.hex();
 	for (ErrorDefinition const* error: contractDefinition(_contractName).interfaceErrors())
 	{
 		string signature = error->functionType(true)->externalSignature();
-		errorIdentifiers[signature] = toHex(toCompactBigEndian(selectorFromSignature32(signature), 4));
+		contractIdentifiers["errors"][signature] = toHex(toCompactBigEndian(selectorFromSignature32(signature), 4));
 	}
 
-	return errorIdentifiers;
-}
-
-Json::Value CompilerStack::eventIdentifiers(string const& _contractName) const
-{
-	if (m_stackState < AnalysisPerformed)
-		solThrow(CompilerError, "Analysis was not successful.");
-
-	Json::Value eventIdentifiers(Json::objectValue);
 	for (EventDefinition const* event: contractDefinition(_contractName).interfaceEvents())
 		if (!event->isAnonymous())
 		{
 			string signature = event->functionType(true)->externalSignature();
-			eventIdentifiers[signature] = toHex(u256(h256::Arith(keccak256(signature))));
+			contractIdentifiers["events"][signature] = toHex(u256(h256::Arith(keccak256(signature))));
 		}
 
-	return eventIdentifiers;
+	return contractIdentifiers;
 }
 
 bytes CompilerStack::cborMetadata(string const& _contractName, bool _forIR) const
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 2e1e687f71..b1f85dd4df 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -327,14 +327,8 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// Prerequisite: Successful call to parse or compile.
 	Json::Value const& natspecDev(std::string const& _contractName) const;
 
-	/// @returns a JSON representing a map of method identifiers (hashes) to function names.
-	Json::Value methodIdentifiers(std::string const& _contractName) const;
-
-	/// @returns a JSON representing a map of error identifiers (hashes) to error names.
-	Json::Value errorIdentifiers(std::string const& _contractName) const;
-
-	/// @returns a JSON representing a map of event identifiers (hashes) to event names.
-	Json::Value eventIdentifiers(std::string const& _contractName) const;
+	/// @returns a JSON object with the three members ``methods``, ``events``, ``errors``. Each is a map, mapping identifiers (hashes) to function names.
+	Json::Value contractIdentifiers(std::string const& _contractName) const;
 
 	/// @returns the Contract Metadata matching the pipeline selected using the viaIR setting.
 	std::string const& metadata(std::string const& _contractName) const { return metadata(contract(_contractName)); }
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 5ccf2d447b..0e5b8aba46 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1298,7 +1298,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.legacyAssembly", wildcardMatchesExperimental))
 			evmData["legacyAssembly"] = compilerStack.assemblyJSON(contractName);
 		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.methodIdentifiers", wildcardMatchesExperimental))
-			evmData["methodIdentifiers"] = compilerStack.methodIdentifiers(contractName);
+			evmData["methodIdentifiers"] = compilerStack.contractIdentifiers(contractName)["methods"];
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.gasEstimates", wildcardMatchesExperimental))
 			evmData["gasEstimates"] = compilerStack.gasEstimates(contractName);
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index d96460fa1e..ba557918c1 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -270,25 +270,23 @@ void CommandLineInterface::handleSignatureHashes(string const& _contract)
 	if (!m_options.compiler.outputs.signatureHashes)
 		return;
 
-	Json::Value methodIdentifiers = m_compiler->methodIdentifiers(_contract);
+	Json::Value contractIdentifiers = m_compiler->contractIdentifiers(_contract);
 	string out = "Function signatures:\n";
-	for (auto const& name: methodIdentifiers.getMemberNames())
-		out += methodIdentifiers[name].asString() + ": " + name + "\n";
+	for (auto const& name: contractIdentifiers["methods"].getMemberNames())
+		out += contractIdentifiers["methods"][name].asString() + ": " + name + "\n";
 
-	Json::Value errorIdentifiers = m_compiler->errorIdentifiers(_contract);
-	if (!errorIdentifiers.empty())
+	if (contractIdentifiers.isMember("errors"))
 	{
 		out += "\nError signatures:\n";
-		for (auto const& name: errorIdentifiers.getMemberNames())
-			out += errorIdentifiers[name].asString() + ": " + name + "\n";
+		for (auto const& name: contractIdentifiers["errors"].getMemberNames())
+			out += contractIdentifiers["errors"][name].asString() + ": " + name + "\n";
 	}
 
-	Json::Value eventIdentifiers = m_compiler->eventIdentifiers(_contract);
-	if (!eventIdentifiers.empty())
+	if (contractIdentifiers.isMember("events"))
 	{
 		out += "\nEvent signatures:\n";
-		for (auto const& name: eventIdentifiers.getMemberNames())
-			out += eventIdentifiers[name].asString() + ": " + name + "\n";
+		for (auto const& name: contractIdentifiers["events"].getMemberNames())
+			out += contractIdentifiers["events"][name].asString() + ": " + name + "\n";
 	}
 
 	if (!m_options.output.dir.empty())
@@ -838,7 +836,7 @@ void CommandLineInterface::handleCombinedJSON()
 				m_compiler->runtimeObject(contractName).functionDebugData
 			);
 		if (m_options.compiler.combinedJsonRequests->signatureHashes)
-			contractData[g_strSignatureHashes] = m_compiler->methodIdentifiers(contractName);
+			contractData[g_strSignatureHashes] = m_compiler->contractIdentifiers(contractName)["methods"];
 		if (m_options.compiler.combinedJsonRequests->natspecDev)
 			contractData[g_strNatspecDev] = m_compiler->natspecDev(contractName);
 		if (m_options.compiler.combinedJsonRequests->natspecUser)
diff --git a/test/cmdlineTests/standard_method_identifiers_requested_empty/input.json b/test/cmdlineTests/standard_method_identifiers_requested_empty/input.json
new file mode 100644
index 0000000000..28b9699b51
--- /dev/null
+++ b/test/cmdlineTests/standard_method_identifiers_requested_empty/input.json
@@ -0,0 +1,17 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C { }"
+		}
+	},
+	"settings":
+	{
+		"outputSelection":
+		{
+			"*": { "*": ["evm.methodIdentifiers"] }
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json b/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json
new file mode 100644
index 0000000000..7953dc1572
--- /dev/null
+++ b/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json
@@ -0,0 +1 @@
+{"contracts":{"A":{"C":{"evm":{"methodIdentifiers":{}}}}},"sources":{"A":{"id":0}}}
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 4fbb16614c..342cf24fc2 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -435,7 +435,7 @@ TestCase::TestResult SemanticTest::runTest(
 			{
 				soltestAssert(
 					m_allowNonExistingFunctions ||
-					m_compiler.methodIdentifiers(m_compiler.lastContractName(m_sources.mainSourceFile)).isMember(test.call().signature),
+					m_compiler.contractIdentifiers(m_compiler.lastContractName(m_sources.mainSourceFile))["methods"].isMember(test.call().signature),
 					"The function " + test.call().signature + " is not known to the compiler"
 				);
 
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
index 4d536183c3..49b17930a3 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
@@ -58,7 +58,7 @@ optional<CompilerOutput> SolidityCompilationFramework::compileContract()
 		else
 			contractName = m_compilerInput.contractName;
 		evmasm::LinkerObject obj = m_compiler.object(contractName);
-		Json::Value methodIdentifiers = m_compiler.methodIdentifiers(contractName);
+		Json::Value methodIdentifiers = m_compiler.contractIdentifiers(contractName)["methods"];
 		return CompilerOutput{obj.bytecode, methodIdentifiers};
 	}
 }
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.h b/test/tools/ossfuzz/SolidityEvmoneInterface.h
index 980eb9a842..51f6d5bdcc 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.h
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.h
@@ -91,7 +91,7 @@ class SolidityCompilationFramework
 	/// @returns method identifiers in contract called @param _contractName.
 	Json::Value methodIdentifiers(std::string const& _contractName)
 	{
-		return m_compiler.methodIdentifiers(_contractName);
+		return m_compiler.contractIdentifiers(_contractName)["methods"];
 	}
 	/// @returns Compilation output comprising EVM bytecode and list of
 	/// method identifiers in contract if compilation is successful,

From 0f05b1485e0fa8f54119ba0f48c3e7b7bcac3044 Mon Sep 17 00:00:00 2001
From: yatharthagoenka <goenkayathartha2002@gmail.com>
Date: Sat, 4 Sep 2021 15:37:18 +0530
Subject: [PATCH 0360/1748] CI: shared build and dependency installation steps

---
 .circleci/config.yml | 62 +++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 35 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 58a4c27428..be4940c636 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -214,6 +214,14 @@ defaults:
             command: ./test/lsp.py ./build/solc/solc
         - gitter_notify_failure_unless_pr
 
+  - steps_build: &steps_build
+      steps:
+        - checkout
+        - run: *run_build
+        - store_artifacts: *artifacts_solc
+        - persist_to_workspace: *artifacts_executables
+        - gitter_notify_failure_unless_pr
+
   - steps_soltest_all: &steps_soltest_all
       steps:
         - checkout
@@ -234,6 +242,14 @@ defaults:
         - store_artifacts: *artifacts_test_results
         - gitter_notify_failure_unless_pr
 
+  - steps_install_dependencies_osx: &steps_install_dependencies_osx
+      steps:
+        - restore_cache:
+            keys:
+              - dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
+        - attach_workspace:
+            at: .
+
   # --------------------------------------------------------------------------
   # Base Image Templates
 
@@ -748,12 +764,7 @@ jobs:
       CMAKE_OPTIONS: -DSANITIZE=address
       MAKEFLAGS: -j 3
       CMAKE_BUILD_TYPE: Release
-    steps:
-      - checkout
-      - run: *run_build
-      - store_artifacts: *artifacts_solc
-      - persist_to_workspace: *artifacts_executables
-      - gitter_notify_failure_unless_pr
+    <<: *steps_build
 
   b_ubu_clang: &b_ubu_clang
     <<: *base_ubuntu2004_clang_large
@@ -762,12 +773,7 @@ jobs:
       CC: clang
       CXX: clang++
       MAKEFLAGS: -j 10
-    steps:
-      - checkout
-      - run: *run_build
-      - store_artifacts: *artifacts_solc
-      - persist_to_workspace: *artifacts_executables
-      - gitter_notify_failure_unless_pr
+    <<: *steps_build
 
   b_ubu_asan_clang: &b_ubu_asan_clang
     # This runs a bit faster on large and xlarge but on nightly efficiency matters more.
@@ -777,12 +783,7 @@ jobs:
       CXX: clang++
       CMAKE_OPTIONS: -DSANITIZE=address
       MAKEFLAGS: -j 3
-    steps:
-      - checkout
-      - run: *run_build
-      - store_artifacts: *artifacts_solc
-      - persist_to_workspace: *artifacts_executables
-      - gitter_notify_failure_unless_pr
+    <<: *steps_build
 
   b_ubu_ubsan_clang: &b_ubu_ubsan_clang
     # This runs a bit faster on large and xlarge but on nightly efficiency matters more.
@@ -792,12 +793,7 @@ jobs:
       CXX: clang++
       CMAKE_OPTIONS: -DSANITIZE=undefined
       MAKEFLAGS: -j 3
-    steps:
-      - checkout
-      - run: *run_build
-      - store_artifacts: *artifacts_solc
-      - persist_to_workspace: *artifacts_executables
-      - gitter_notify_failure_unless_pr
+    <<: *steps_build
 
   b_ubu_release: &b_ubu_release
     <<: *b_ubu
@@ -949,7 +945,7 @@ jobs:
             - build/test/tools/solfuzzer
       - gitter_notify_failure_unless_pr
 
-  t_osx_soltest:
+  t_osx_soltest: &t_osx_soltest
     <<: *base_osx
     environment:
       EVM: << pipeline.parameters.evm-version >>
@@ -957,11 +953,9 @@ jobs:
       TERM: xterm
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
-      - attach_workspace:
-          at: .
+      - when:
+          condition: true
+          <<: *steps_install_dependencies_osx
       - run: *run_soltest
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
@@ -971,11 +965,9 @@ jobs:
     <<: *base_osx
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
-      - attach_workspace:
-          at: .
+      - when:
+          condition: true
+          <<: *steps_install_dependencies_osx
       - run: *run_cmdline_tests
       - store_artifacts: *artifacts_test_results
       - gitter_notify_failure_unless_pr

From bce5f9e0da5d96b4f0ed715d3138775016e6337f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 8 Feb 2022 14:55:49 +0100
Subject: [PATCH 0361/1748] CI: Store all artifacts in steps_build so that we
 can use it for b_ubu

---
 .circleci/config.yml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index be4940c636..6069ba4fbb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -219,6 +219,8 @@ defaults:
         - checkout
         - run: *run_build
         - store_artifacts: *artifacts_solc
+        - store_artifacts: *artifact_solidity_upgrade
+        - store_artifacts: *artifact_yul_phaser
         - persist_to_workspace: *artifacts_executables
         - gitter_notify_failure_unless_pr
 
@@ -747,14 +749,7 @@ jobs:
     # this runs 2x faster on xlarge but takes 4x more resources (compared to medium).
     # Enough other jobs depend on it that it's worth it though.
     <<: *base_ubuntu2004_xlarge
-    steps:
-      - checkout
-      - run: *run_build
-      - store_artifacts: *artifacts_solc
-      - store_artifacts: *artifact_solidity_upgrade
-      - store_artifacts: *artifact_yul_phaser
-      - persist_to_workspace: *artifacts_executables
-      - gitter_notify_failure_unless_pr
+    <<: *steps_build
 
   # x64 ASAN build, for testing for memory related bugs
   b_ubu_asan: &b_ubu_asan

From bdf84c991fe6902cce3bac52a4a970ae5a1bca3f Mon Sep 17 00:00:00 2001
From: yatharthagoenka <goenkayathartha2002@gmail.com>
Date: Sat, 4 Sep 2021 15:37:18 +0530
Subject: [PATCH 0362/1748]  Ci: parameterize the clang sanitizer jobs

---
 .circleci/config.yml | 31 +++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6069ba4fbb..39c219bcec 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -604,6 +604,15 @@ defaults:
       nodejs_version: '14'
       resource_class: medium
 
+  - job_b_ubu_asan_clang: &job_b_ubu_asan_clang
+      <<: *workflow_trigger_on_tags
+      name: b_ubu_asan_clang
+      cmake_options: -DSANITIZE=address
+  - job_b_ubu_ubsan_clang: &job_b_ubu_ubsan_clang
+      <<: *workflow_trigger_on_tags
+      name: b_ubu_ubsan_clang
+      cmake_options: -DSANITIZE=address
+
 # -----------------------------------------------------------------------------------------------
 jobs:
 
@@ -770,24 +779,18 @@ jobs:
       MAKEFLAGS: -j 10
     <<: *steps_build
 
-  b_ubu_asan_clang: &b_ubu_asan_clang
-    # This runs a bit faster on large and xlarge but on nightly efficiency matters more.
-    <<: *base_ubuntu2004_clang
-    environment:
-      CC: clang
-      CXX: clang++
-      CMAKE_OPTIONS: -DSANITIZE=address
-      MAKEFLAGS: -j 3
-    <<: *steps_build
-
-  b_ubu_ubsan_clang: &b_ubu_ubsan_clang
+  b_ubu_san_clang:
     # This runs a bit faster on large and xlarge but on nightly efficiency matters more.
+    parameters:
+      cmake_options:
+        type: string
     <<: *base_ubuntu2004_clang
     environment:
+      TERM: xterm
       CC: clang
       CXX: clang++
-      CMAKE_OPTIONS: -DSANITIZE=undefined
       MAKEFLAGS: -j 3
+      CMAKE_OPTIONS: << parameters.cmake_options >>
     <<: *steps_build
 
   b_ubu_release: &b_ubu_release
@@ -1506,13 +1509,13 @@ workflows:
 
       # ASan build and tests
       - b_ubu_asan: *workflow_trigger_on_tags
-      - b_ubu_asan_clang: *workflow_trigger_on_tags
+      - b_ubu_san_clang: *job_b_ubu_asan_clang
       - t_ubu_asan_soltest: *workflow_ubuntu2004_asan
       - t_ubu_asan_clang_soltest: *workflow_ubuntu2004_asan_clang
       - t_ubu_asan_cli: *workflow_ubuntu2004_asan
 
       # UBSan build and tests
-      - b_ubu_ubsan_clang: *workflow_trigger_on_tags
+      - b_ubu_san_clang: *job_b_ubu_ubsan_clang
       - t_ubu_ubsan_clang_soltest: *workflow_ubuntu2004_ubsan_clang
       - t_ubu_ubsan_clang_cli: *workflow_ubuntu2004_ubsan_clang
 

From 46075d04d953981119f6376851051334076cf946 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 1 Feb 2022 15:42:08 +0100
Subject: [PATCH 0363/1748] Include used events in ``--hashes`` output

---
 libsolidity/ast/AST.cpp                       | 20 ++++++++++++------
 libsolidity/ast/AST.h                         |  3 ++-
 libsolidity/interface/ABI.cpp                 |  2 +-
 libsolidity/interface/CompilerStack.cpp       | 21 ++++++++++++-------
 libsolidity/interface/CompilerStack.h         |  2 +-
 libsolidity/interface/Natspec.cpp             |  2 +-
 libsolidity/interface/StandardCompiler.cpp    |  2 +-
 solc/CommandLineInterface.cpp                 | 20 +++++++++---------
 test/cmdlineTests/hashes/output               |  1 +
 test/libsolidity/SemanticTest.cpp             |  2 +-
 .../tools/ossfuzz/SolidityEvmoneInterface.cpp |  2 +-
 test/tools/ossfuzz/SolidityEvmoneInterface.h  |  2 +-
 12 files changed, 47 insertions(+), 32 deletions(-)

diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index f2b7369b71..2a7609de85 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -192,7 +192,7 @@ FunctionDefinition const* ContractDefinition::receiveFunction() const
 	return nullptr;
 }
 
-vector<EventDefinition const*> const& ContractDefinition::interfaceEvents() const
+vector<EventDefinition const*> const& ContractDefinition::definedInterfaceEvents() const
 {
 	return m_interfaceEvents.init([&]{
 		set<string> eventsSeen;
@@ -213,11 +213,20 @@ vector<EventDefinition const*> const& ContractDefinition::interfaceEvents() cons
 					interfaceEvents.push_back(e);
 				}
 			}
-
 		return interfaceEvents;
 	});
 }
 
+vector<EventDefinition const*> const ContractDefinition::usedInterfaceEvents() const
+{
+	solAssert(annotation().creationCallGraph.set(), "");
+
+	return convertContainer<std::vector<EventDefinition const*>>(
+		(*annotation().creationCallGraph)->emittedEvents +
+		(*annotation().deployedCallGraph)->emittedEvents
+	);
+}
+
 vector<ErrorDefinition const*> ContractDefinition::interfaceErrors(bool _requireCallGraph) const
 {
 	set<ErrorDefinition const*, CompareByID> result;
@@ -227,10 +236,9 @@ vector<ErrorDefinition const*> ContractDefinition::interfaceErrors(bool _require
 	if (_requireCallGraph)
 		solAssert(annotation().creationCallGraph.set(), "");
 	if (annotation().creationCallGraph.set())
-	{
-		result += (*annotation().creationCallGraph)->usedErrors;
-		result += (*annotation().deployedCallGraph)->usedErrors;
-	}
+		result +=
+			(*annotation().creationCallGraph)->usedErrors +
+			(*annotation().deployedCallGraph)->usedErrors;
 	return convertContainer<vector<ErrorDefinition const*>>(move(result));
 }
 
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index b7d5db8058..c35c69c9d2 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -519,7 +519,8 @@ class ContractDefinition: public Declaration, public StructurallyDocumented, pub
 		return ranges::subrange<decltype(b)>(b, e) | ranges::views::values;
 	}
 	std::vector<EventDefinition const*> events() const { return filteredNodes<EventDefinition>(m_subNodes); }
-	std::vector<EventDefinition const*> const& interfaceEvents() const;
+	std::vector<EventDefinition const*> const& definedInterfaceEvents() const;
+	std::vector<EventDefinition const*> const usedInterfaceEvents() const;
 	/// @returns all errors defined in this contract or any base contract
 	/// and all errors referenced during execution.
 	/// @param _requireCallGraph if false, do not fail if the call graph has not been computed yet.
diff --git a/libsolidity/interface/ABI.cpp b/libsolidity/interface/ABI.cpp
index 9c7a645b6f..eab1801c6a 100644
--- a/libsolidity/interface/ABI.cpp
+++ b/libsolidity/interface/ABI.cpp
@@ -101,7 +101,7 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
 			method["stateMutability"] = stateMutabilityToString(externalFunctionType->stateMutability());
 			abi.emplace(std::move(method));
 		}
-	for (auto const& it: _contractDef.interfaceEvents())
+	for (auto const& it: _contractDef.definedInterfaceEvents())
 	{
 		Json::Value event{Json::objectValue};
 		event["type"] = "event";
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index acf1932956..7a8bc4ddbf 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -81,6 +81,8 @@
 
 #include <boost/algorithm/string/replace.hpp>
 
+#include <range/v3/view/concat.hpp>
+
 #include <utility>
 #include <map>
 #include <limits>
@@ -1014,31 +1016,34 @@ Json::Value const& CompilerStack::natspecDev(Contract const& _contract) const
 	return _contract.devDocumentation.init([&]{ return Natspec::devDocumentation(*_contract.contract); });
 }
 
-Json::Value CompilerStack::contractIdentifiers(string const& _contractName) const
+Json::Value CompilerStack::interfaceSymbols(string const& _contractName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Analysis was not successful.");
 
-	Json::Value contractIdentifiers(Json::objectValue);
+	Json::Value interfaceSymbols(Json::objectValue);
 	// Always have a methods object
-	contractIdentifiers["methods"] = Json::objectValue;
+	interfaceSymbols["methods"] = Json::objectValue;
 
 	for (auto const& it: contractDefinition(_contractName).interfaceFunctions())
-		contractIdentifiers["methods"][it.second->externalSignature()] = it.first.hex();
+		interfaceSymbols["methods"][it.second->externalSignature()] = it.first.hex();
 	for (ErrorDefinition const* error: contractDefinition(_contractName).interfaceErrors())
 	{
 		string signature = error->functionType(true)->externalSignature();
-		contractIdentifiers["errors"][signature] = toHex(toCompactBigEndian(selectorFromSignature32(signature), 4));
+		interfaceSymbols["errors"][signature] = toHex(toCompactBigEndian(selectorFromSignature32(signature), 4));
 	}
 
-	for (EventDefinition const* event: contractDefinition(_contractName).interfaceEvents())
+	for (EventDefinition const* event: ranges::concat_view(
+		contractDefinition(_contractName).definedInterfaceEvents(),
+		contractDefinition(_contractName).usedInterfaceEvents()
+	))
 		if (!event->isAnonymous())
 		{
 			string signature = event->functionType(true)->externalSignature();
-			contractIdentifiers["events"][signature] = toHex(u256(h256::Arith(keccak256(signature))));
+			interfaceSymbols["events"][signature] = toHex(u256(h256::Arith(keccak256(signature))));
 		}
 
-	return contractIdentifiers;
+	return interfaceSymbols;
 }
 
 bytes CompilerStack::cborMetadata(string const& _contractName, bool _forIR) const
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index b1f85dd4df..c1f15a4804 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -328,7 +328,7 @@ class CompilerStack: public langutil::CharStreamProvider
 	Json::Value const& natspecDev(std::string const& _contractName) const;
 
 	/// @returns a JSON object with the three members ``methods``, ``events``, ``errors``. Each is a map, mapping identifiers (hashes) to function names.
-	Json::Value contractIdentifiers(std::string const& _contractName) const;
+	Json::Value interfaceSymbols(std::string const& _contractName) const;
 
 	/// @returns the Contract Metadata matching the pipeline selected using the viaIR setting.
 	std::string const& metadata(std::string const& _contractName) const { return metadata(contract(_contractName)); }
diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp
index 533cbaa3dd..4496904937 100644
--- a/libsolidity/interface/Natspec.cpp
+++ b/libsolidity/interface/Natspec.cpp
@@ -78,7 +78,7 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
 				doc["methods"][it.second->externalSignature()]["notice"] = value;
 		}
 
-	for (auto const& event: _contractDef.interfaceEvents())
+	for (auto const& event: _contractDef.definedInterfaceEvents())
 	{
 		string value = extractDoc(event->annotation().docTags, "notice");
 		if (!value.empty())
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 0e5b8aba46..75876d9353 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1298,7 +1298,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.legacyAssembly", wildcardMatchesExperimental))
 			evmData["legacyAssembly"] = compilerStack.assemblyJSON(contractName);
 		if (isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.methodIdentifiers", wildcardMatchesExperimental))
-			evmData["methodIdentifiers"] = compilerStack.contractIdentifiers(contractName)["methods"];
+			evmData["methodIdentifiers"] = compilerStack.interfaceSymbols(contractName)["methods"];
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.gasEstimates", wildcardMatchesExperimental))
 			evmData["gasEstimates"] = compilerStack.gasEstimates(contractName);
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index ba557918c1..bafd3a7356 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -270,23 +270,23 @@ void CommandLineInterface::handleSignatureHashes(string const& _contract)
 	if (!m_options.compiler.outputs.signatureHashes)
 		return;
 
-	Json::Value contractIdentifiers = m_compiler->contractIdentifiers(_contract);
+	Json::Value interfaceSymbols = m_compiler->interfaceSymbols(_contract);
 	string out = "Function signatures:\n";
-	for (auto const& name: contractIdentifiers["methods"].getMemberNames())
-		out += contractIdentifiers["methods"][name].asString() + ": " + name + "\n";
+	for (auto const& name: interfaceSymbols["methods"].getMemberNames())
+		out += interfaceSymbols["methods"][name].asString() + ": " + name + "\n";
 
-	if (contractIdentifiers.isMember("errors"))
+	if (interfaceSymbols.isMember("errors"))
 	{
 		out += "\nError signatures:\n";
-		for (auto const& name: contractIdentifiers["errors"].getMemberNames())
-			out += contractIdentifiers["errors"][name].asString() + ": " + name + "\n";
+		for (auto const& name: interfaceSymbols["errors"].getMemberNames())
+			out += interfaceSymbols["errors"][name].asString() + ": " + name + "\n";
 	}
 
-	if (contractIdentifiers.isMember("events"))
+	if (interfaceSymbols.isMember("events"))
 	{
 		out += "\nEvent signatures:\n";
-		for (auto const& name: contractIdentifiers["events"].getMemberNames())
-			out += contractIdentifiers["events"][name].asString() + ": " + name + "\n";
+		for (auto const& name: interfaceSymbols["events"].getMemberNames())
+			out += interfaceSymbols["events"][name].asString() + ": " + name + "\n";
 	}
 
 	if (!m_options.output.dir.empty())
@@ -836,7 +836,7 @@ void CommandLineInterface::handleCombinedJSON()
 				m_compiler->runtimeObject(contractName).functionDebugData
 			);
 		if (m_options.compiler.combinedJsonRequests->signatureHashes)
-			contractData[g_strSignatureHashes] = m_compiler->contractIdentifiers(contractName)["methods"];
+			contractData[g_strSignatureHashes] = m_compiler->interfaceSymbols(contractName)["methods"];
 		if (m_options.compiler.combinedJsonRequests->natspecDev)
 			contractData[g_strNatspecDev] = m_compiler->natspecDev(contractName);
 		if (m_options.compiler.combinedJsonRequests->natspecUser)
diff --git a/test/cmdlineTests/hashes/output b/test/cmdlineTests/hashes/output
index 5223d732a3..b010456d39 100644
--- a/test/cmdlineTests/hashes/output
+++ b/test/cmdlineTests/hashes/output
@@ -10,6 +10,7 @@ Error signatures:
 
 Event signatures:
 2d4dd5fe18ada5a020a9f5591539a8dc3010a5c074ba6a70e1c956659f02786a: ev(uint256)
+81f3fb02f88d32d3bb08c80c9a622ca3b3223292f131c6ad049811f9a8a606dc: libraryEvent(uint256)
 
 ======= hashes/input.sol:L =======
 Function signatures:
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 342cf24fc2..1f07f177d4 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -435,7 +435,7 @@ TestCase::TestResult SemanticTest::runTest(
 			{
 				soltestAssert(
 					m_allowNonExistingFunctions ||
-					m_compiler.contractIdentifiers(m_compiler.lastContractName(m_sources.mainSourceFile))["methods"].isMember(test.call().signature),
+					m_compiler.interfaceSymbols(m_compiler.lastContractName(m_sources.mainSourceFile))["methods"].isMember(test.call().signature),
 					"The function " + test.call().signature + " is not known to the compiler"
 				);
 
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
index 49b17930a3..ff9fcf2d8d 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
@@ -58,7 +58,7 @@ optional<CompilerOutput> SolidityCompilationFramework::compileContract()
 		else
 			contractName = m_compilerInput.contractName;
 		evmasm::LinkerObject obj = m_compiler.object(contractName);
-		Json::Value methodIdentifiers = m_compiler.contractIdentifiers(contractName)["methods"];
+		Json::Value methodIdentifiers = m_compiler.interfaceSymbols(contractName)["methods"];
 		return CompilerOutput{obj.bytecode, methodIdentifiers};
 	}
 }
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.h b/test/tools/ossfuzz/SolidityEvmoneInterface.h
index 51f6d5bdcc..da0fed58f2 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.h
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.h
@@ -91,7 +91,7 @@ class SolidityCompilationFramework
 	/// @returns method identifiers in contract called @param _contractName.
 	Json::Value methodIdentifiers(std::string const& _contractName)
 	{
-		return m_compiler.contractIdentifiers(_contractName)["methods"];
+		return m_compiler.interfaceSymbols(_contractName)["methods"];
 	}
 	/// @returns Compilation output comprising EVM bytecode and list of
 	/// method identifiers in contract if compilation is successful,

From d511fe93ab480f22a55e8cb6329abb20ad5c8712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 24 Jan 2022 14:01:58 +0100
Subject: [PATCH 0364/1748] CI: Fix job name for PRBMath external test

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 39c219bcec..af58d830f1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -583,7 +583,7 @@ defaults:
       project: uniswap
       binary_type: native
       nodejs_version: '16'
-  - job_native_test_prb_math: &job_native_test_prb_math
+  - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_prb_math
       project: prb-math
@@ -1454,7 +1454,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_pool_together
       - t_ems_ext: *job_native_test_ext_perpetual_pools
       - t_ems_ext: *job_native_test_ext_uniswap
-      - t_ems_ext: *job_native_test_prb_math
+      - t_ems_ext: *job_native_test_ext_prb_math
       - t_ems_ext: *job_native_test_ext_elementfi
 
       # Windows build and tests

From 3e1aee17455b1d58fa485587df52db4ee7a2fc8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sat, 18 Dec 2021 00:08:59 +0100
Subject: [PATCH 0365/1748] externalTests: Clean the build/ dir for Hardhat too

---
 test/externalTests/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 10df975256..cd0afb8a49 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -320,7 +320,7 @@ function truffle_clean
 
 function hardhat_clean
 {
-    rm -rf artifacts/ cache/
+    rm -rf build/ artifacts/ cache/
 }
 
 function run_test

From 7fc225384132fff74cda971eaf7927fb07c921b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 22 Dec 2021 17:06:52 +0100
Subject: [PATCH 0366/1748] externalTests: Make comments about failing presets
 less terse

---
 test/externalTests/gnosis-v2.sh | 6 +++---
 test/externalTests/gnosis.sh    | 8 ++++----
 test/externalTests/zeppelin.sh  | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index 8ad070d113..a48dddf9c1 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -40,12 +40,12 @@ function gnosis_safe_test
     local config_file="truffle-config.js"
 
     local compile_only_presets=(
-        legacy-no-optimize        # "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit"
+        legacy-no-optimize        # Compiles but migrations run out of gas: "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit"
     )
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
         ir-optimize-evm+yul
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index edada2fef3..1b430a9ae5 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -42,11 +42,11 @@ function gnosis_safe_test
     local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize            # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only      # "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
+        #ir-no-optimize            # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
         ir-optimize-evm+yul
-        #legacy-no-optimize        # "Stack too deep" error
-        #legacy-optimize-evm-only  # "Stack too deep" error
+        #legacy-no-optimize        # Compilation fails with "Stack too deep" error
+        #legacy-optimize-evm-only  # Compilation fails with "Stack too deep" error
         legacy-optimize-evm+yul
     )
 
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 5c54ceb8b2..d365dfe2a8 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -44,8 +44,8 @@ function zeppelin_test
     )
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul

From a7852cba75e58b86955a0b8a5015b8282ca406b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 17 Dec 2021 22:42:45 +0100
Subject: [PATCH 0367/1748] Python script for parsing eth-gas-reporter output

---
 scripts/externalTests/parse_eth_gas_report.py | 269 +++++++++++++
 .../fixtures/eth_gas_report_gnosis.rst        | 381 ++++++++++++++++++
 ...test_externalTests_parse_eth_gas_report.py | 219 ++++++++++
 3 files changed, 869 insertions(+)
 create mode 100755 scripts/externalTests/parse_eth_gas_report.py
 create mode 100644 test/scripts/fixtures/eth_gas_report_gnosis.rst
 create mode 100644 test/scripts/test_externalTests_parse_eth_gas_report.py

diff --git a/scripts/externalTests/parse_eth_gas_report.py b/scripts/externalTests/parse_eth_gas_report.py
new file mode 100755
index 0000000000..c5cc58e587
--- /dev/null
+++ b/scripts/externalTests/parse_eth_gas_report.py
@@ -0,0 +1,269 @@
+#!/usr/bin/env python3
+# coding=utf-8
+
+from dataclasses import asdict, dataclass, field
+from typing import Dict, Optional, Tuple
+import json
+import re
+import sys
+
+REPORT_HEADER_REGEX = re.compile(r'''
+    ^[|\s]+ Solc[ ]version:\s*(?P<solc_version>[\w\d.]+)
+    [|\s]+ Optimizer[ ]enabled:\s*(?P<optimize>[\w]+)
+    [|\s]+ Runs:\s*(?P<runs>[\d]+)
+    [|\s]+ Block[ ]limit:\s*(?P<block_limit>[\d]+)\s*gas
+    [|\s]+$
+''', re.VERBOSE)
+METHOD_HEADER_REGEX = re.compile(r'^[|\s]+Methods[|\s]+$')
+METHOD_COLUMN_HEADERS_REGEX = re.compile(r'''
+    ^[|\s]+ Contract
+    [|\s]+ Method
+    [|\s]+ Min
+    [|\s]+ Max
+    [|\s]+ Avg
+    [|\s]+ \#[ ]calls
+    [|\s]+ \w+[ ]\(avg\)
+    [|\s]+$
+''', re.VERBOSE)
+METHOD_ROW_REGEX = re.compile(r'''
+    ^[|\s]+ (?P<contract>[^|]+)
+    [|\s]+ (?P<method>[^|]+)
+    [|\s]+ (?P<min>[^|]+)
+    [|\s]+ (?P<max>[^|]+)
+    [|\s]+ (?P<avg>[^|]+)
+    [|\s]+ (?P<call_count>[^|]+)
+    [|\s]+ (?P<eur_avg>[^|]+)
+    [|\s]+$
+''', re.VERBOSE)
+FRAME_REGEX = re.compile(r'^[-|\s]+$')
+DEPLOYMENT_HEADER_REGEX = re.compile(r'^[|\s]+Deployments[|\s]+% of limit[|\s]+$')
+DEPLOYMENT_ROW_REGEX = re.compile(r'''
+    ^[|\s]+ (?P<contract>[^|]+)
+    [|\s]+ (?P<min>[^|]+)
+    [|\s]+ (?P<max>[^|]+)
+    [|\s]+ (?P<avg>[^|]+)
+    [|\s]+ (?P<percent_of_limit>[^|]+)\s*%
+    [|\s]+ (?P<eur_avg>[^|]+)
+    [|\s]+$
+''', re.VERBOSE)
+
+
+class ReportError(Exception):
+    pass
+
+class ReportValidationError(ReportError):
+    pass
+
+class ReportParsingError(Exception):
+    def __init__(self, message: str, line: str, line_number: int):
+        # pylint: disable=useless-super-delegation  # It's not useless, it adds type annotations.
+        super().__init__(message, line, line_number)
+
+    def __str__(self):
+        return f"Parsing error on line {self.args[2] + 1}: {self.args[0]}\n{self.args[1]}"
+
+
+@dataclass(frozen=True)
+class MethodGasReport:
+    min_gas: int
+    max_gas: int
+    avg_gas: int
+    call_count: int
+    total_gas: int = field(init=False)
+
+    def __post_init__(self):
+        object.__setattr__(self, 'total_gas', self.avg_gas * self.call_count)
+
+
+@dataclass(frozen=True)
+class ContractGasReport:
+    min_deployment_gas: Optional[int]
+    max_deployment_gas: Optional[int]
+    avg_deployment_gas: Optional[int]
+    methods: Optional[Dict[str, MethodGasReport]]
+    total_method_gas: int = field(init=False, default=0)
+
+    def __post_init__(self):
+        if self.methods is not None:
+            object.__setattr__(self, 'total_method_gas', sum(method.total_gas for method in self.methods.values()))
+
+
+@dataclass(frozen=True)
+class GasReport:
+    solc_version: str
+    optimize: bool
+    runs: int
+    block_limit: int
+    contracts: Dict[str, ContractGasReport]
+    total_method_gas: int = field(init=False)
+    total_deployment_gas: int = field(init=False)
+
+    def __post_init__(self):
+        object.__setattr__(self, 'total_method_gas', sum(
+            total_method_gas
+            for total_method_gas in (contract.total_method_gas for contract in self.contracts.values())
+            if total_method_gas is not None
+        ))
+        object.__setattr__(self, 'total_deployment_gas', sum(
+            contract.avg_deployment_gas
+            for contract in self.contracts.values()
+            if contract.avg_deployment_gas is not None
+        ))
+
+    def to_json(self):
+        return json.dumps(asdict(self), indent=4, sort_keys=True)
+
+
+def parse_bool(input_string: str) -> bool:
+    if input_string == 'true':
+        return True
+    elif input_string == 'false':
+        return True
+    else:
+        raise ValueError(f"Invalid boolean value: '{input_string}'")
+
+
+def parse_optional_int(input_string: str, default: Optional[int] = None) -> Optional[int]:
+    if input_string.strip() == '-':
+        return default
+
+    return int(input_string)
+
+
+def parse_report_header(line: str) -> Optional[dict]:
+    match = REPORT_HEADER_REGEX.match(line)
+    if match is None:
+        return None
+
+    return {
+        'solc_version': match.group('solc_version'),
+        'optimize': parse_bool(match.group('optimize')),
+        'runs': int(match.group('runs')),
+        'block_limit': int(match.group('block_limit')),
+    }
+
+
+def parse_method_row(line: str, line_number: int) -> Optional[Tuple[str, str, MethodGasReport]]:
+    match = METHOD_ROW_REGEX.match(line)
+    if match is None:
+        raise ReportParsingError("Expected a table row with method details.", line, line_number)
+
+    avg_gas = parse_optional_int(match['avg'])
+    call_count = int(match['call_count'])
+
+    if avg_gas is None and call_count == 0:
+        # No calls, no gas values. Uninteresting. Skip the row.
+        return None
+
+    return (
+        match['contract'].strip(),
+        match['method'].strip(),
+        MethodGasReport(
+            min_gas=parse_optional_int(match['min'], avg_gas),
+            max_gas=parse_optional_int(match['max'], avg_gas),
+            avg_gas=avg_gas,
+            call_count=call_count,
+        )
+    )
+
+
+def parse_deployment_row(line: str, line_number: int) -> Tuple[str, int, int, int]:
+    match = DEPLOYMENT_ROW_REGEX.match(line)
+    if match is None:
+        raise ReportParsingError("Expected a table row with deployment details.", line, line_number)
+
+    return (
+        match['contract'].strip(),
+        parse_optional_int(match['min'].strip()),
+        parse_optional_int(match['max'].strip()),
+        int(match['avg'].strip()),
+    )
+
+
+def preprocess_unicode_frames(input_string: str) -> str:
+    # The report has a mix of normal pipe chars and its unicode variant.
+    # Let's just replace all frame chars with normal pipes for easier parsing.
+    return input_string.replace('\u2502', '|').replace('·', '|')
+
+
+def parse_report(rst_report: str) -> GasReport:
+    report_params = None
+    methods_by_contract = {}
+    deployment_costs = {}
+    expected_row_type = None
+
+    for line_number, line in enumerate(preprocess_unicode_frames(rst_report).splitlines()):
+        try:
+            if (
+                line.strip() == "" or
+                FRAME_REGEX.match(line) is not None or
+                METHOD_COLUMN_HEADERS_REGEX.match(line) is not None
+            ):
+                continue
+            if METHOD_HEADER_REGEX.match(line) is not None:
+                expected_row_type = 'method'
+                continue
+            if DEPLOYMENT_HEADER_REGEX.match(line) is not None:
+                expected_row_type = 'deployment'
+                continue
+
+            new_report_params = parse_report_header(line)
+            if new_report_params is not None:
+                if report_params is not None:
+                    raise ReportParsingError("Duplicate report header.", line, line_number)
+
+                report_params = new_report_params
+                continue
+
+            if expected_row_type == 'method':
+                parsed_row = parse_method_row(line, line_number)
+                if parsed_row is None:
+                    continue
+
+                (contract, method, method_report) = parsed_row
+
+                if contract not in methods_by_contract:
+                    methods_by_contract[contract] = {}
+
+                if method in methods_by_contract[contract]:
+                    # Report must be generated with full signatures for method names to be unambiguous.
+                    raise ReportParsingError(f"Duplicate method row for '{contract}.{method}'.", line, line_number)
+
+                methods_by_contract[contract][method] = method_report
+            elif expected_row_type == 'deployment':
+                (contract, min_gas, max_gas, avg_gas) = parse_deployment_row(line, line_number)
+
+                if contract in deployment_costs:
+                    raise ReportParsingError(f"Duplicate contract deployment row for '{contract}'.", line, line_number)
+
+                deployment_costs[contract] = (min_gas, max_gas, avg_gas)
+            else:
+                assert expected_row_type is None
+                raise ReportParsingError("Found data row without a section header.", line, line_number)
+
+        except ValueError as error:
+            raise ReportParsingError(error.args[0], line, line_number) from error
+
+    if report_params is None:
+        raise ReportValidationError("Report header not found.")
+
+    report_params['contracts'] = {
+        contract: ContractGasReport(
+            min_deployment_gas=deployment_costs.get(contract, (None, None, None))[0],
+            max_deployment_gas=deployment_costs.get(contract, (None, None, None))[1],
+            avg_deployment_gas=deployment_costs.get(contract, (None, None, None))[2],
+            methods=methods_by_contract.get(contract),
+        )
+        for contract in methods_by_contract.keys() | deployment_costs.keys()
+    }
+
+    return GasReport(**report_params)
+
+
+if __name__ == "__main__":
+    try:
+        report = parse_report(sys.stdin.read())
+        print(report.to_json())
+    except ReportError as exception:
+        print(f"{exception}", file=sys.stderr)
+        sys.exit(1)
diff --git a/test/scripts/fixtures/eth_gas_report_gnosis.rst b/test/scripts/fixtures/eth_gas_report_gnosis.rst
new file mode 100644
index 0000000000..c2e77f9bed
--- /dev/null
+++ b/test/scripts/fixtures/eth_gas_report_gnosis.rst
@@ -0,0 +1,381 @@
+·----------------------------------------------------------------------------------------------------------------------------------------|---------------------------|-------------|------------------------------·
+|                                                          Solc version: 0.8.10                                                          ·  Optimizer enabled: true  ·  Runs: 200  ·  Block limit: 100000000 gas  │
+·········································································································································|···························|·············|·······························
+|  Methods                                                                                                                                                                                                        │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  Contract                      ·  Method                                                                                               ·  Min        ·  Max        ·  Avg        ·  # calls      ·  eur (avg)   │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  getMessageHash(bytes)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  getMessageHashForSafe(address,bytes)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  getModules()                                                                                         ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  isValidSignature(bytes,bytes)                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  isValidSignature(bytes32,bytes)                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  NAME()                                                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  onERC1155Received(address,address,uint256,uint256,bytes)                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  onERC721Received(address,address,uint256,bytes)                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  simulate(address,bytes)                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  supportsInterface(bytes4)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  tokensReceived(address,address,address,uint256,bytes,bytes)                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CompatibilityFallbackHandler  ·  VERSION()                                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CreateCall                    ·  performCreate(uint256,bytes)                                                                         ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  CreateCall                    ·  performCreate2(uint256,bytes,bytes32)                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DebugTransactionGuard         ·  checkAfterExecution(bytes32,bool)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DebugTransactionGuard         ·  checkTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes,address)  ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DebugTransactionGuard         ·  supportsInterface(bytes4)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DebugTransactionGuard         ·  txNonces(bytes32)                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DefaultCallbackHandler        ·  NAME()                                                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DefaultCallbackHandler        ·  onERC1155BatchReceived(address,address,uint256[],uint256[],bytes)                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DefaultCallbackHandler        ·  onERC1155Received(address,address,uint256,uint256,bytes)                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DefaultCallbackHandler        ·  onERC721Received(address,address,uint256,bytes)                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DefaultCallbackHandler        ·  supportsInterface(bytes4)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DefaultCallbackHandler        ·  tokensReceived(address,address,address,uint256,bytes,bytes)                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DefaultCallbackHandler        ·  VERSION()                                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DelegateCallTransactionGuard  ·  allowedTarget()                                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DelegateCallTransactionGuard  ·  checkAfterExecution(bytes32,bool)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DelegateCallTransactionGuard  ·  checkTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes,address)  ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  DelegateCallTransactionGuard  ·  supportsInterface(bytes4)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC1155Token                  ·  balanceOf(address,uint256)                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC1155Token                  ·  mint(address,uint256,uint256,bytes)                                                                  ·      47934  ·      59804  ·      57826  ·            6  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC1155Token                  ·  safeTransferFrom(address,address,uint256,uint256,bytes)                                              ·          -  ·          -  ·      53900  ·            2  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  allowance(address,address)                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  approve(address,uint256)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  balanceOf(address)                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  decimals()                                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  decreaseAllowance(address,uint256)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  increaseAllowance(address,uint256)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  name()                                                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  symbol()                                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  totalSupply()                                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  transfer(address,uint256)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20                         ·  transferFrom(address,address,uint256)                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  allowance(address,address)                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  approve(address,uint256)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  balanceOf(address)                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  decimals()                                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  decreaseAllowance(address,uint256)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  increaseAllowance(address,uint256)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  name()                                                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  symbol()                                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  totalSupply()                                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  transfer(address,uint256)                                                                            ·          -  ·          -  ·      51567  ·            8  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ERC20Token                    ·  transferFrom(address,address,uint256)                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  FallbackManager               ·  setFallbackHandler(address)                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  addOwnerWithThreshold(address,uint256)                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  approvedHashes(address,bytes32)                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  approveHash(bytes32)                                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  changeThreshold(uint256)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  checkNSignatures(bytes32,bytes,bytes,uint256)                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  checkSignatures(bytes32,bytes,bytes)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  disableModule(address,address)                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  domainSeparator()                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  enableModule(address)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  encodeTransactionData(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,uint256)   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  execTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes)           ·      59563  ·     151736  ·      94816  ·           85  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  execTransactionFromModule(address,uint256,bytes,uint8)                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  execTransactionFromModuleReturnData(address,uint256,bytes,uint8)                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  getChainId()                                                                                         ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  getModulesPaginated(address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  getOwners()                                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  getStorageAt(uint256,uint256)                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  getThreshold()                                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  getTransactionHash(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,uint256)      ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  isModuleEnabled(address)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  isOwner(address)                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  nonce()                                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  removeOwner(address,address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  requiredTxGas(address,uint256,bytes,uint8)                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  setFallbackHandler(address)                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  setGuard(address)                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  setup(address[],uint256,address,bytes,address,address,uint256,address)                               ·     167642  ·     263690  ·     201944  ·           49  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  signedMessages(bytes32)                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  simulateAndRevert(address,bytes)                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  swapOwner(address,address,address)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafe                    ·  VERSION()                                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  addOwnerWithThreshold(address,uint256)                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  approvedHashes(address,bytes32)                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  approveHash(bytes32)                                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  changeThreshold(uint256)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  checkNSignatures(bytes32,bytes,bytes,uint256)                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  checkSignatures(bytes32,bytes,bytes)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  disableModule(address,address)                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  domainSeparator()                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  enableModule(address)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  encodeTransactionData(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,uint256)   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  execTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes)           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  execTransactionFromModule(address,uint256,bytes,uint8)                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  execTransactionFromModuleReturnData(address,uint256,bytes,uint8)                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  getChainId()                                                                                         ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  getModulesPaginated(address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  getOwners()                                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  getStorageAt(uint256,uint256)                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  getThreshold()                                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  getTransactionHash(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,uint256)      ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  isModuleEnabled(address)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  isOwner(address)                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  nonce()                                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  removeOwner(address,address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  requiredTxGas(address,uint256,bytes,uint8)                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  setFallbackHandler(address)                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  setGuard(address)                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  setup(address[],uint256,address,bytes,address,address,uint256,address)                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  signedMessages(bytes32)                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  simulateAndRevert(address,bytes)                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  swapOwner(address,address,address)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeL2                  ·  VERSION()                                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeProxyFactory        ·  calculateCreateProxyWithNonceAddress(address,bytes,uint256)                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeProxyFactory        ·  createProxy(address,bytes)                                                                           ·     105568  ·     105580  ·     105568  ·           52  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeProxyFactory        ·  createProxyWithCallback(address,bytes,uint256,address)                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeProxyFactory        ·  createProxyWithNonce(address,bytes,uint256)                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeProxyFactory        ·  proxyCreationCode()                                                                                  ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GnosisSafeProxyFactory        ·  proxyRuntimeCode()                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  GuardManager                  ·  setGuard(address)                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  Migration                     ·  migrate()                                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  Migration                     ·  migrationSingleton()                                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  Migration                     ·  safe120Singleton()                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  DEFAULT_FALLBACK_VALUE()                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenAnyReturn(bytes)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenAnyReturnAddress(address)                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenAnyReturnBool(bool)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenAnyReturnUint(uint256)                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenAnyRevert()                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenAnyRevertWithMessage(string)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenAnyRunOutOfGas()                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenCalldataReturn(bytes,bytes)                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenCalldataReturnAddress(bytes,address)                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenCalldataReturnBool(bytes,bool)                                                                  ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenCalldataReturnUint(bytes,uint256)                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenCalldataRevert(bytes)                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenCalldataRevertWithMessage(bytes,string)                                                         ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenCalldataRunOutOfGas(bytes)                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenMethodReturn(bytes,bytes)                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenMethodReturnAddress(bytes,address)                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenMethodReturnBool(bytes,bool)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenMethodReturnUint(bytes,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenMethodRevert(bytes)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenMethodRevertWithMessage(bytes,string)                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  givenMethodRunOutOfGas(bytes)                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  invocationCount()                                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  invocationCountForCalldata(bytes)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  invocationCountForMethod(bytes)                                                                      ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  MOCKS_LIST_END_HASH()                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  MOCKS_LIST_END()                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  MOCKS_LIST_START()                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  reset()                                                                                              ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  SENTINEL_ANY_MOCKS()                                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MockContract                  ·  updateInvocationCount(bytes4,bytes)                                                                  ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ModuleManager                 ·  disableModule(address,address)                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ModuleManager                 ·  enableModule(address)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ModuleManager                 ·  execTransactionFromModule(address,uint256,bytes,uint8)                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ModuleManager                 ·  execTransactionFromModuleReturnData(address,uint256,bytes,uint8)                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ModuleManager                 ·  getModulesPaginated(address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ModuleManager                 ·  isModuleEnabled(address)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MultiSend                     ·  multiSend(bytes)                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  MultiSendCallOnly             ·  multiSend(bytes)                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  OwnerManager                  ·  addOwnerWithThreshold(address,uint256)                                                               ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  OwnerManager                  ·  changeThreshold(uint256)                                                                             ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  OwnerManager                  ·  getOwners()                                                                                          ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  OwnerManager                  ·  getThreshold()                                                                                       ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  OwnerManager                  ·  isOwner(address)                                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  OwnerManager                  ·  removeOwner(address,address,uint256)                                                                 ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  OwnerManager                  ·  swapOwner(address,address,address)                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ReentrancyTransactionGuard    ·  checkAfterExecution(bytes32,bool)                                                                    ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ReentrancyTransactionGuard    ·  checkTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes,address)  ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  ReentrancyTransactionGuard    ·  supportsInterface(bytes4)                                                                            ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  SignMessageLib                ·  getMessageHash(bytes)                                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  SignMessageLib                ·  signMessage(bytes)                                                                                   ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  SimulateTxAccessor            ·  simulate(address,uint256,bytes,uint8)                                                                ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  StorageAccessible             ·  getStorageAt(uint256,uint256)                                                                        ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  StorageAccessible             ·  simulateAndRevert(address,bytes)                                                                     ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  TestHandler                   ·  dudududu()                                                                                           ·          -  ·          -  ·          -  ·            0  ·           -  │
+·································|·······································································································|·············|·············|·············|···············|···············
+|  Deployments                                                                                                                           ·                                         ·  % of limit   ·              │
+·········································································································································|·············|·············|·············|···············|···············
+|  DelegateCallTransactionGuard                                                                                                          ·     283510  ·     283522  ·     283516  ·        0.3 %  ·           -  │
+·········································································································································|·············|·············|·············|···············|···············
+|  ERC1155Token                                                                                                                          ·          -  ·          -  ·     525869  ·        0.5 %  ·           -  │
+·········································································································································|·············|·············|·············|···············|···············
+|  ERC20Token                                                                                                                            ·          -  ·          -  ·     733462  ·        0.7 %  ·           -  │
+·----------------------------------------------------------------------------------------------------------------------------------------|-------------|-------------|-------------|---------------|--------------·
diff --git a/test/scripts/test_externalTests_parse_eth_gas_report.py b/test/scripts/test_externalTests_parse_eth_gas_report.py
new file mode 100644
index 0000000000..cefa0487a2
--- /dev/null
+++ b/test/scripts/test_externalTests_parse_eth_gas_report.py
@@ -0,0 +1,219 @@
+#!/usr/bin/env python3
+
+from dataclasses import asdict
+import unittest
+
+from textwrap import dedent
+
+from unittest_helpers import FIXTURE_DIR, load_fixture
+
+# NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
+# pragma pylint: disable=import-error
+from externalTests.parse_eth_gas_report import parse_report, ReportParsingError, ReportValidationError
+# pragma pylint: enable=import-error
+
+ETH_GAS_REPORT_GNOSIS_RST_PATH = FIXTURE_DIR / 'eth_gas_report_gnosis.rst'
+ETH_GAS_REPORT_GNOSIS_RST_CONTENT = load_fixture(ETH_GAS_REPORT_GNOSIS_RST_PATH)
+
+
+class TestEthGasReport(unittest.TestCase):
+    def setUp(self):
+        self.maxDiff = 10000
+
+    def test_parse_report(self):
+        parsed_report = parse_report(ETH_GAS_REPORT_GNOSIS_RST_CONTENT)
+
+        expected_report = {
+            'solc_version': '0.8.10',
+            'optimize': True,
+            'runs': 200,
+            'block_limit': 100000000,
+            'total_method_gas': 57826 * 6 + 53900 * 2 + 51567 * 8 + 94816 * 85 + 201944 * 49 + 105568 * 52,
+            'total_deployment_gas': 283516 + 525869 + 733462,
+            'contracts': {
+                'DelegateCallTransactionGuard': {
+                    'total_method_gas': 0,
+                    'min_deployment_gas': 283510,
+                    'max_deployment_gas': 283522,
+                    'avg_deployment_gas': 283516,
+                    'methods': None,
+                },
+                'ERC1155Token': {
+                    'total_method_gas': 57826 * 6 + 53900 * 2,
+                    'min_deployment_gas': None,
+                    'max_deployment_gas': None,
+                    'avg_deployment_gas': 525869,
+                    'methods': {
+                        'mint(address,uint256,uint256,bytes)': {
+                            'total_gas': 57826 * 6,
+                            'min_gas': 47934,
+                            'max_gas': 59804,
+                            'avg_gas': 57826,
+                            'call_count': 6
+                        },
+                        'safeTransferFrom(address,address,uint256,uint256,bytes)': {
+                            'total_gas': 53900 * 2,
+                            'min_gas': 53900,
+                            'max_gas': 53900,
+                            'avg_gas': 53900,
+                            'call_count': 2,
+                        },
+                    },
+                },
+                'ERC20Token': {
+                    'total_method_gas': 51567 * 8,
+                    'min_deployment_gas': None,
+                    'max_deployment_gas': None,
+                    'avg_deployment_gas': 733462,
+                    'methods': {
+                        'transfer(address,uint256)': {
+                            'total_gas': 51567 * 8,
+                            'min_gas': 51567,
+                            'max_gas': 51567,
+                            'avg_gas': 51567,
+                            'call_count': 8,
+                        },
+                    },
+                },
+                'GnosisSafe': {
+                    'total_method_gas': 94816 * 85 + 201944 * 49,
+                    'min_deployment_gas': None,
+                    'max_deployment_gas': None,
+                    'avg_deployment_gas': None,
+                    'methods': {
+                        'execTransaction(address,uint256,bytes,uint8,uint256,uint256,uint256,address,address,bytes)': {
+                            'total_gas': 94816 * 85,
+                            'min_gas': 59563,
+                            'max_gas': 151736,
+                            'avg_gas': 94816,
+                            'call_count': 85,
+                        },
+                        'setup(address[],uint256,address,bytes,address,address,uint256,address)': {
+                            'total_gas': 201944 * 49,
+                            'min_gas': 167642,
+                            'max_gas': 263690,
+                            'avg_gas': 201944,
+                            'call_count': 49,
+                        },
+                    },
+                },
+                'GnosisSafeProxyFactory': {
+                    'total_method_gas': 105568 * 52,
+                    'min_deployment_gas': None,
+                    'max_deployment_gas': None,
+                    'avg_deployment_gas': None,
+                    'methods': {
+                        'createProxy(address,bytes)': {
+                            'total_gas': 105568 * 52,
+                            'min_gas': 105568,
+                            'max_gas': 105580,
+                            'avg_gas': 105568,
+                            'call_count': 52,
+                        },
+                    },
+                },
+            }
+        }
+        self.assertEqual(asdict(parsed_report), expected_report)
+
+    def test_parse_report_should_fail_if_report_is_empty(self):
+        text_report = ""
+        with self.assertRaises(ReportValidationError) as manager:
+            parse_report(text_report)
+        self.assertEqual(str(manager.exception), "Report header not found.")
+
+    def test_parse_report_should_fail_if_report_has_no_header(self):
+        text_report = dedent("""
+            | Methods                                            |
+            | ERC1155Token · mint() · 1 · 3 · 2 ·          6 · - |
+            | Deployments           ·           · % of limit ·   │
+            | ERC1155Token          · - · - · 5 ·        1 % · - |
+        """).strip('\n')
+        with self.assertRaises(ReportValidationError) as manager:
+            parse_report(text_report)
+        self.assertEqual(str(manager.exception), "Report header not found.")
+
+    def test_parse_report_should_fail_if_data_rows_have_no_headers(self):
+        text_report = dedent("""
+            | ERC1155Token · mint() · 1 · 3 · 2 · 6 · - |
+        """).strip('\n')
+        expected_message = dedent("""
+            Parsing error on line 1: Found data row without a section header.
+            | ERC1155Token | mint() | 1 | 3 | 2 | 6 | - |
+        """).strip('\n')
+
+        with self.assertRaises(ReportParsingError) as manager:
+            parse_report(text_report)
+        self.assertEqual(str(manager.exception), expected_message)
+
+    def test_parse_report_should_fail_if_report_has_more_than_one_header(self):
+        text_report = dedent("""
+            | Solc version: 0.8.10 · Optimizer enabled: true  · Runs: 200 · Block limit: 100000000 gas |
+            | Solc version: 0.8.9  · Optimizer enabled: false · Runs: 111 · Block limit: 999999999 gas |
+        """).strip('\n')
+        expected_message = dedent("""
+            Parsing error on line 2: Duplicate report header.
+            | Solc version: 0.8.9  | Optimizer enabled: false | Runs: 111 | Block limit: 999999999 gas |
+        """).strip('\n')
+
+        with self.assertRaises(ReportParsingError) as manager:
+            parse_report(text_report)
+        self.assertEqual(str(manager.exception), expected_message)
+
+    def test_parse_report_should_fail_if_row_matching_same_method_call_appears_twice(self):
+        text_report = dedent("""
+            | Methods                                               |
+            | ERC1155Token · mint() · 47934 · 59804 · 57826 · 6 · - |
+            | ERC1155Token · mint() · 11111 · 22222 · 33333 · 4 · - |
+        """).strip('\n')
+        expected_message = dedent("""
+            Parsing error on line 3: Duplicate method row for 'ERC1155Token.mint()'.
+            | ERC1155Token | mint() | 11111 | 22222 | 33333 | 4 | - |
+        """).strip('\n')
+
+        with self.assertRaises(ReportParsingError) as manager:
+            parse_report(text_report)
+        self.assertEqual(str(manager.exception), expected_message)
+
+    def test_parse_report_should_fail_if_row_matching_same_contract_deployment_appears_twice(self):
+        text_report = dedent("""
+            | Deployments          ·        · % of limit ·   │
+            | ERC1155Token · - · - · 525869 ·      0.5 % · - |
+            | ERC1155Token · - · - · 111111 ·      0.6 % · - |
+        """).strip('\n')
+        expected_message = dedent("""
+            Parsing error on line 3: Duplicate contract deployment row for 'ERC1155Token'.
+            | ERC1155Token | - | - | 111111 |      0.6 % | - |
+        """).strip('\n')
+
+        with self.assertRaises(ReportParsingError) as manager:
+            parse_report(text_report)
+        self.assertEqual(str(manager.exception), expected_message)
+
+    def test_parse_report_should_fail_if_method_row_appears_under_deployments_header(self):
+        text_report = dedent("""
+            | Deployments           ·                       · % of limit ·   │
+            | ERC1155Token · mint() · 47934 · 59804 · 57826 ·          6 · - |
+        """).strip('\n')
+        expected_message = dedent("""
+            Parsing error on line 2: Expected a table row with deployment details.
+            | ERC1155Token | mint() | 47934 | 59804 | 57826 |          6 | - |
+        """).strip('\n')
+
+        with self.assertRaises(ReportParsingError) as manager:
+            parse_report(text_report)
+        self.assertEqual(str(manager.exception), expected_message)
+
+    def test_parse_report_should_fail_if_deployment_row_appears_under_methods_header(self):
+        text_report = dedent("""
+            | Methods                               |
+            | ERC1155Token · - · - · 525869 · 5 · - |
+        """).strip('\n')
+        expected_message = dedent("""
+            Parsing error on line 2: Expected a table row with method details.
+            | ERC1155Token | - | - | 525869 | 5 | - |
+        """).strip('\n')
+
+        with self.assertRaises(ReportParsingError) as manager:
+            parse_report(text_report)
+        self.assertEqual(str(manager.exception), expected_message)

From c6094bb0c28a6735b0868ad9373c0240404db881 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sat, 18 Dec 2021 00:36:30 +0100
Subject: [PATCH 0368/1748] externalTests: Benchmark reports

---
 .circleci/config.yml                   |   9 ++
 test/externalTests.sh                  |  32 ++---
 test/externalTests/bleeps.sh           |   6 +-
 test/externalTests/colony.sh           |   3 +
 test/externalTests/common.sh           | 166 +++++++++++++++++++++++--
 test/externalTests/elementfi.sh        |   3 +
 test/externalTests/ens.sh              |   3 +
 test/externalTests/euler.sh            |   3 +
 test/externalTests/gnosis-v2.sh        |   4 +
 test/externalTests/gnosis.sh           |   4 +
 test/externalTests/perpetual-pools.sh  |   3 +
 test/externalTests/pool-together.sh    |   3 +
 test/externalTests/prb-math.sh         |   7 +-
 test/externalTests/trident.sh          |   3 +
 test/externalTests/uniswap.sh          |   4 +
 test/externalTests/yield-liquidator.sh |   3 +
 test/externalTests/zeppelin.sh         |   3 +
 17 files changed, 232 insertions(+), 27 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index af58d830f1..44837d8319 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1205,6 +1205,15 @@ jobs:
                 name: External <<parameters.project>> tests (native)
                 command: |
                   test/externalTests/<<parameters.project>>.sh native /tmp/workspace/solc/solc
+      - store_artifacts:
+          path: reports/externalTests/
+      # persist_to_workspace fails if the directory does not exist and the test script will create
+      # it only if it actually has benchmark results.
+      - run: mkdir -p reports/externalTests/
+      - persist_to_workspace:
+          root: .
+          paths:
+            - reports/externalTests/
       - gitter_notify_failure_unless_pr
 
   b_win: &b_win
diff --git a/test/externalTests.sh b/test/externalTests.sh
index a5e52c8524..b3b46460bf 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -28,26 +28,26 @@
 
 set -e
 
-REPO_ROOT="$(dirname "$0")"
-
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/..")
+
 verify_input "$@"
 
 printTask "Running external tests..."
 
-"$REPO_ROOT/externalTests/zeppelin.sh" "$@"
-"$REPO_ROOT/externalTests/gnosis.sh" "$@"
-"$REPO_ROOT/externalTests/gnosis-v2.sh" "$@"
-"$REPO_ROOT/externalTests/colony.sh" "$@"
-"$REPO_ROOT/externalTests/ens.sh" "$@"
-"$REPO_ROOT/externalTests/trident.sh" "$@"
-"$REPO_ROOT/externalTests/euler.sh" "$@"
-"$REPO_ROOT/externalTests/yield-liquidator.sh" "$@"
-"$REPO_ROOT/externalTests/bleeps.sh" "$@"
-"$REPO_ROOT/externalTests/pool-together.sh" "$@"
-"$REPO_ROOT/externalTests/perpetual-pools.sh" "$@"
-"$REPO_ROOT/externalTests/uniswap.sh" "$@"
-"$REPO_ROOT/externalTests/prb-math.sh" "$@"
-"$REPO_ROOT/externalTests/elementfi.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/zeppelin.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/gnosis.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/gnosis-v2.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/colony.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/ens.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/trident.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/euler.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/yield-liquidator.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/bleeps.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/pool-together.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/perpetual-pools.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/uniswap.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/prb-math.sh" "$@"
+"{$REPO_ROOT}/test/externalTests/elementfi.sh" "$@"
diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index 561200e219..bd3b0255b1 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -24,13 +24,16 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
 SELECTED_PRESETS="$3"
 
 function compile_fn { npm run compile; }
-function test_fn { npm run test; }
+# NOTE: `npm run test` runs `mocha` which seems to disable the gas reporter.
+function test_fn { HARDHAT_DEPLOY_FIXTURE=true npx --no hardhat --no-compile test; }
 
 function bleeps_test
 {
@@ -87,6 +90,7 @@ function bleeps_test
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat bleeps "$repo" "$preset"
     done
 
     popd
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index d659899535..e23ce11350 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -73,6 +75,7 @@ function colony_test
 
     for preset in $SELECTED_PRESETS; do
         truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+        store_benchmark_report truffle colony "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index cd0afb8a49..8f7b09eb52 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -20,7 +20,7 @@
 #------------------------------------------------------------------------------
 set -e
 
-# Requires "${REPO_ROOT}/scripts/common.sh" to be included before.
+# Requires $REPO_ROOT to be defined and "${REPO_ROOT}/scripts/common.sh" to be included before.
 
 CURRENT_EVM_VERSION=london
 
@@ -207,9 +207,19 @@ function force_truffle_compiler_settings
     echo "Compiler version (full): ${SOLCVERSION}"
     echo "-------------------------------------"
 
-    # Forcing the settings should always work by just overwriting the solc object. Forcing them by using a
-    # dedicated settings objects should only be the fallback.
-    echo "module.exports['compilers'] = $(truffle_compiler_settings "$solc_path" "$preset" "$evm_version");" >> "$config_file"
+    local compiler_settings gas_reporter_settings
+    compiler_settings=$(truffle_compiler_settings "$solc_path" "$preset" "$evm_version")
+    gas_reporter_settings=$(eth_gas_reporter_settings "$preset")
+
+    {
+        echo "require('eth-gas-reporter');"
+        echo "module.exports['mocha'] = {"
+        echo "    reporter: 'eth-gas-reporter',"
+        echo "    reporterOptions: ${gas_reporter_settings}"
+        echo "};"
+
+        echo "module.exports['compilers'] = ${compiler_settings};"
+    } >> "$config_file"
 }
 
 function name_hardhat_default_export
@@ -278,16 +288,21 @@ function force_hardhat_compiler_settings
     echo "Compiler version (full): ${SOLCVERSION}"
     echo "-------------------------------------"
 
-    local settings
-    settings=$(hardhat_compiler_settings "$SOLCVERSION_SHORT" "$preset" "$evm_version")
+    local compiler_settings gas_reporter_settings
+    compiler_settings=$(hardhat_compiler_settings "$SOLCVERSION_SHORT" "$preset" "$evm_version")
+    gas_reporter_settings=$(eth_gas_reporter_settings "$preset")
     if [[ $config_file == *\.js ]]; then
         [[ $config_var_name == "" ]] || assertFail
-        echo "module.exports['solidity'] = ${settings}" >> "$config_file"
+        echo "require('hardhat-gas-reporter');"
+        echo "module.exports.gasReporter = ${gas_reporter_settings};"
+        echo "module.exports.solidity = ${compiler_settings};"
     else
         [[ $config_file == *\.ts ]] || assertFail
         [[ $config_var_name != "" ]] || assertFail
-        echo "${config_var_name}.solidity = {compilers: [${settings}]}"  >> "$config_file"
-    fi
+        echo 'import "hardhat-gas-reporter";'
+        echo "${config_var_name}.gasReporter = ${gas_reporter_settings};"
+        echo "${config_var_name}.solidity = {compilers: [${compiler_settings}]};"
+    fi >> "$config_file"
 }
 
 function truffle_verify_compiler_version
@@ -368,6 +383,21 @@ function replace_global_solc
     export PATH="$PWD:$PATH"
 }
 
+function eth_gas_reporter_settings
+{
+    local preset="$1"
+
+    echo "{"
+    echo "    enabled: true,"
+    echo "    gasPrice: 1,"                           # Gas price does not matter to us at all. Set to whatever to avoid API call.
+    echo "    noColors: true,"
+    echo "    showTimeSpent: false,"                  # We're not interested in test timing
+    echo "    onlyCalledMethods: true,"               # Exclude entries with no gas for shorter report
+    echo "    showMethodSig: true,"                   # Should make diffs more stable if there are overloaded functions
+    echo "    outputFile: \"$(gas_report_path "$preset")\""
+    echo "}"
+}
+
 function truffle_compiler_settings
 {
     local solc_path="$1"
@@ -495,3 +525,121 @@ function external_test
     rm -rf "$DIR"
     echo "Done."
 }
+
+function gas_report_path
+{
+    local preset="$1"
+
+    echo "${DIR}/gas-report-${preset}.rst"
+}
+
+function gas_report_to_json
+{
+    cat - | "${REPO_ROOT}/scripts/externalTests/parse_eth_gas_report.py" | jq '{gas: .}'
+}
+
+function detect_hardhat_artifact_dir
+{
+    if [[ -e build/ && -e artifacts/ ]]; then
+        fail "Cannot determine Hardhat artifact location. Both build/ and artifacts/ exist"
+    elif [[ -e build/ ]]; then
+        echo -n build/artifacts
+    elif [[ -e artifacts/ ]]; then
+        echo -n artifacts
+    else
+        fail "Hardhat build artifacts not found."
+    fi
+}
+
+function bytecode_size_json_from_truffle_artifacts
+{
+    # NOTE: The output of this function is a series of concatenated JSON dicts rather than a list.
+
+    for artifact in build/contracts/*.json; do
+        if [[ $(jq '. | has("unlinked_binary")' "$artifact") == false ]]; then
+            # Each artifact represents compilation output for a single contract. Some top-level keys contain
+            # bits of Standard JSON output while others are generated by Truffle. Process it into a dict
+            # of the form `{"<file>": {"<contract>": <size>}}`.
+            # NOTE: The `bytecode` field starts with 0x, which is why we subtract 1 from size.
+            jq '{
+                (.ast.absolutePath): {
+                    (.contractName): (.bytecode | length / 2 - 1)
+                }
+            }' "$artifact"
+        fi
+    done
+}
+
+function bytecode_size_json_from_hardhat_artifacts
+{
+    # NOTE: The output of this function is a series of concatenated JSON dicts rather than a list.
+
+    for artifact in "$(detect_hardhat_artifact_dir)"/build-info/*.json; do
+        # Each artifact contains Standard JSON output under the `output` key.
+        # Process it into a dict of the form `{"<file>": {"<contract>": <size>}}`,
+        # Note that one Hardhat artifact often represents multiple input files.
+        jq '.output.contracts | to_entries[] | {
+            "\(.key)": .value | to_entries[] | {
+                "\(.key)": (.value.evm.bytecode.object | length / 2)
+            }
+        }' "$artifact"
+    done
+}
+
+function combine_artifact_json
+{
+    # Combine all dicts into a list with `jq --slurp` and then use `reduce` to merge them into one
+    # big dict with keys of the form `"<file>:<contract>"`. Then run jq again to filter out items
+    # with zero size and put the rest under under a top-level `bytecode_size` key. Also add another
+    # key with total bytecode size.
+    # NOTE: The extra inner `bytecode_size` key is there only to make diffs more readable.
+    cat - |
+        jq --slurp 'reduce (.[] | to_entries[]) as {$key, $value} ({}; . + {
+            ($key + ":" + ($value | to_entries[].key)): {
+                bytecode_size: $value | to_entries[].value
+            }
+        })' |
+        jq --indent 4 --sort-keys '{
+            bytecode_size: [. | to_entries[] | select(.value.bytecode_size > 0)] | from_entries,
+            total_bytecode_size: (reduce (. | to_entries[]) as {$key, $value} (0; . + $value.bytecode_size))
+        }'
+}
+
+function project_info_json
+{
+    local project_url="$1"
+
+    echo "{"
+    echo "    \"project\": {"
+    # NOTE: Given that we clone with `--depth 1`, we'll only get useful output out of `git describe`
+    # if we directly check out a tag. Still better than nothing.
+    echo "        \"version\": \"$(git describe --always)\","
+    echo "        \"commit\": \"$(git rev-parse HEAD)\","
+    echo "        \"url\": \"${project_url}\""
+    echo "    }"
+    echo "}"
+}
+
+function store_benchmark_report
+{
+    local framework="$1"
+    local project_name="$2"
+    local project_url="$3"
+    local preset="$4"
+
+    [[ $framework == truffle || $framework == hardhat ]] || assertFail
+    [[ " ${AVAILABLE_PRESETS[*]} " == *" $preset "* ]] || assertFail
+
+    local report_dir="${REPO_ROOT}/reports/externalTests"
+    local output_file="${report_dir}/benchmark-${project_name}-${preset}.json"
+    mkdir -p "$report_dir"
+
+    {
+        if [[ -e $(gas_report_path "$preset") ]]; then
+            gas_report_to_json < "$(gas_report_path "$preset")"
+        fi
+
+        "bytecode_size_json_from_${framework}_artifacts" | combine_artifact_json
+        project_info_json "$project_url"
+    } | jq --slurp "{\"${project_name}\": {\"${preset}\": add}}" --indent 4 --sort-keys > "$output_file"
+}
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index f52a13ca67..3641eac2b4 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -96,6 +98,7 @@ function elementfi_test
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat elementfi "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index d3fcb0b13d..734c5d8ae8 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -68,6 +70,7 @@ function ens_test
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+        store_benchmark_report hardhat ens "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 485d7ae56a..b3b505051c 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -68,6 +70,7 @@ function euler_test
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+        store_benchmark_report hardhat euler "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
index a48dddf9c1..6b0915b6a0 100755
--- a/test/externalTests/gnosis-v2.sh
+++ b/test/externalTests/gnosis-v2.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -65,12 +67,14 @@ function gnosis_safe_test
     neutralize_package_json_hooks
     force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")"
     npm install --package-lock
+    npm install eth-gas-reporter
 
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
 
     for preset in $SELECTED_PRESETS; do
         truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+        store_benchmark_report truffle gnosis2 "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 1b430a9ae5..82d1892f2d 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -63,12 +65,14 @@ function gnosis_safe_test
     neutralize_package_json_hooks
     force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")"
     npm install --package-lock
+    npm install eth-gas-reporter
 
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
 
     for preset in $SELECTED_PRESETS; do
         truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+        store_benchmark_report truffle gnosis "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index e1ee9af8f5..8f90ed0b4d 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -68,6 +70,7 @@ function perpetual_pools_test
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat perpetual-pools "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index a7f5933c0e..b24cd6f4b2 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -72,6 +74,7 @@ function pool_together_test
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat pool-together "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
index 53fad2c255..01bdb76f18 100755
--- a/test/externalTests/prb-math.sh
+++ b/test/externalTests/prb-math.sh
@@ -24,13 +24,16 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn compile; }
-function test_fn { yarn test; }
+# NOTE: `yarn test` runs `mocha` which seems to disable the gas reporter.
+function test_fn { npx --no hardhat --no-compile test; }
 
 function prb_math_test
 {
@@ -70,11 +73,13 @@ function prb_math_test
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
     yarn install --no-lock-file
+    yarn add hardhat-gas-reporter
 
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat prb-math "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index 8e6f35ae33..5e230560d5 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -92,6 +94,7 @@ function trident_test
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat trident "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index 96a5d2b63b..2f94c6abde 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -73,11 +75,13 @@ function uniswap_test
     yarn add @ethereumjs/tx@3.1.3
 
     yarn install
+    yarn add hardhat-gas-reporter
 
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat uniswap "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
index 6712941e74..1b5b9f1462 100755
--- a/test/externalTests/yield-liquidator.sh
+++ b/test/externalTests/yield-liquidator.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -68,6 +70,7 @@ function yield_liquidator_test
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat yield_liquidator "$repo" "$preset"
     done
 }
 
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index d365dfe2a8..4094c69364 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -24,6 +24,8 @@ set -e
 source scripts/common.sh
 source test/externalTests/common.sh
 
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
 verify_input "$@"
 BINARY_TYPE="$1"
 BINARY_PATH="$2"
@@ -66,6 +68,7 @@ function zeppelin_test
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
+        store_benchmark_report hardhat zeppelin "$repo" "$preset"
     done
 }
 

From 60d9aa0d4f34da1f0ccd022e69ca4c45f378ce20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 22 Dec 2021 17:45:20 +0100
Subject: [PATCH 0369/1748] Benchmark report collector job + summary

---
 .circleci/config.yml                          | 35 +++++++++++
 scripts/externalTests/merge_benchmarks.sh     | 60 +++++++++++++++++++
 scripts/externalTests/summarize_benchmarks.sh | 53 ++++++++++++++++
 3 files changed, 148 insertions(+)
 create mode 100755 scripts/externalTests/merge_benchmarks.sh
 create mode 100755 scripts/externalTests/summarize_benchmarks.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 44837d8319..a1fca20ceb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1216,6 +1216,23 @@ jobs:
             - reports/externalTests/
       - gitter_notify_failure_unless_pr
 
+  c_ext_benchmarks:
+    <<: *base_node_small
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - run:
+          name: Combine benchmark reports
+          command: cat reports/externalTests/benchmark-*.json | scripts/externalTests/merge_benchmarks.sh > reports/externalTests/all-benchmarks.json
+      - run:
+          name: Summarize reports
+          command: cat reports/externalTests/all-benchmarks.json | scripts/externalTests/summarize_benchmarks.sh > reports/externalTests/summarized-benchmarks.json
+      - store_artifacts:
+          path: reports/externalTests/all-benchmarks.json
+      - store_artifacts:
+          path: reports/externalTests/summarized-benchmarks.json
+
   b_win: &b_win
     <<: *base_win_powershell_large
     steps:
@@ -1466,6 +1483,24 @@ workflows:
       - t_ems_ext: *job_native_test_ext_prb_math
       - t_ems_ext: *job_native_test_ext_elementfi
 
+      - c_ext_benchmarks:
+          <<: *workflow_trigger_on_tags
+          requires:
+            - t_ems_compile_ext_colony
+            - t_native_compile_ext_gnosis
+            - t_native_test_ext_gnosis_v2
+            - t_native_test_ext_zeppelin
+            - t_native_test_ext_ens
+            - t_native_test_ext_trident
+            - t_native_test_ext_euler
+            - t_native_test_ext_yield_liquidator
+            - t_native_test_ext_bleeps
+            - t_native_test_ext_pool_together
+            - t_native_test_ext_perpetual_pools
+            - t_native_test_ext_uniswap
+            - t_native_test_ext_prb_math
+            - t_native_test_ext_elementfi
+
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
       - b_win_release: *workflow_trigger_on_tags
diff --git a/scripts/externalTests/merge_benchmarks.sh b/scripts/externalTests/merge_benchmarks.sh
new file mode 100755
index 0000000000..3e2d7318c7
--- /dev/null
+++ b/scripts/externalTests/merge_benchmarks.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# Reads multiple individual benchmark reports produced by scripts from
+# test/externalTests/ from standard input and creates a combined report.
+#
+# Usage:
+#    <script name>.sh < <CONCATENATED_REPORTS>
+#
+# CONCATENATED_REPORTS: JSON report files concatenated into a single stream (e.g. using cat).
+#
+# Example:
+#    cat reports/externalTests/benchmark-*.json | <script name>.sh
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2021 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -euo pipefail
+
+# We expect a series of dicts of the form {"<project>": {"<preset>": {...}}}.
+# Unfortunately jq's built-in `add` filter can't handle nested dicts and
+# would just overwrite values sharing a project name instead of merging them.
+
+# This is done by first grouping the dicts into an array of the form
+# [
+#     [{"key": "<project1>", "value": {"<preset1>": {...}}}, {"key": "<project1>", "value": {"<preset2>": {...}}, ...],
+#     [{"key": "<project2>", "value": {"<preset1>": {...}}}, {"key": "<project2>", "value": {"<preset2>": {...}}, ...],
+#     ...
+# ]
+# and then using reduce() on each group sharing the same project name to convert it into a
+# dict having preset names as keys.
+jq --slurp  --indent 4 --sort-keys '
+    map(to_entries[]) |
+    group_by(.key) |
+    map({
+        (.[0].key): (
+            reduce (.[].value | to_entries[]) as {$key, $value} (
+                {}; . + {
+                    ($key): $value
+                }
+            )
+        )
+    }) |
+    add
+'
diff --git a/scripts/externalTests/summarize_benchmarks.sh b/scripts/externalTests/summarize_benchmarks.sh
new file mode 100755
index 0000000000..1b84800b22
--- /dev/null
+++ b/scripts/externalTests/summarize_benchmarks.sh
@@ -0,0 +1,53 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# Reads a combined benchmark report from standard input and outputs an abbreviated
+# report containing only totals. Can handle individual reports coming directly
+# from scripts in test/externalTests/ as well as combined report from merge_benchmarks.sh.
+#
+# Usage:
+#    <script name>.sh < <CONCATENATED_REPORTS>
+#
+# CONCATENATED_REPORTS: JSON report files concatenated into a single stream (e.g. using cat).
+#
+# Example:
+#    cat reports/externalTests/benchmark-*.json | <script name>.sh
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2021 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -euo pipefail
+
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
+# Iterates over presets in a dict of the form {"<project>": {"<preset>": {...}}} and for each
+# one preserves only the few keys with totals that we want to see in the summary.
+exec "${REPO_ROOT}/scripts/externalTests/merge_benchmarks.sh" | jq --indent 4 --sort-keys '
+    with_entries({
+        key: .key,
+        value: .value | with_entries({
+            key: .key,
+            value: {
+                bytecode_size: .value.total_bytecode_size,
+                method_gas: .value.gas.total_method_gas,
+                deployment_gas: .value.gas.total_deployment_gas,
+                version: .value.project.version
+            }
+        })
+    })
+'

From c6c7f3525de45c57abf0e458a3b009a6427da195 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Wed, 9 Feb 2022 21:30:11 -0500
Subject: [PATCH 0370/1748] Note about storage compatability mode

---
 docs/internals/layout_in_storage.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/internals/layout_in_storage.rst b/docs/internals/layout_in_storage.rst
index 9afe97ddbf..4682d640c1 100644
--- a/docs/internals/layout_in_storage.rst
+++ b/docs/internals/layout_in_storage.rst
@@ -56,7 +56,8 @@ as individual values.
      of Solidity due to the fact that storage pointers can be passed to libraries. This means that
      any change to the rules outlined in this section is considered a breaking change
      of the language and due to its critical nature should be considered very carefully before
-     being executed.
+     being executed. In the event of such a breaking change, we would want to release a
+     compatibility mode in which the compiler would generate bytecode supporting the old layout.
 
 
 Mappings and Dynamic Arrays

From 290b9326e387a231932dc93af1273bd8a5b9dbc1 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 10 Feb 2022 13:38:17 +0100
Subject: [PATCH 0371/1748] Move stray semantics test to proper directory.

---
 .../constructor_inheritance_init_order_3_legacy.sol} |  6 +++---
 .../constructor_inheritance_init_order_3_viaIR.sol   | 12 ++++++++++++
 2 files changed, 15 insertions(+), 3 deletions(-)
 rename test/libsolidity/{constructor_inheritance_init_order_3.sol => semanticTests/constructor_inheritance_init_order_3_legacy.sol} (54%)
 create mode 100644 test/libsolidity/semanticTests/constructor_inheritance_init_order_3_viaIR.sol

diff --git a/test/libsolidity/constructor_inheritance_init_order_3.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_legacy.sol
similarity index 54%
rename from test/libsolidity/constructor_inheritance_init_order_3.sol
rename to test/libsolidity/semanticTests/constructor_inheritance_init_order_3_legacy.sol
index c9719a108b..d9bed3f543 100644
--- a/test/libsolidity/constructor_inheritance_init_order_3.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_legacy.sol
@@ -1,12 +1,12 @@
 contract A {
-    uint public x;
+    uint public x = 2;
     constructor(uint) {}
-    function f() public { x = 4; }
+    function f() public returns(uint) { x = 4; }
 }
 contract B is A {
     constructor() A(f()) {}
 }
 // ====
-// compileViaYul: also
+// compileViaYul: false
 // ----
 // x() -> 4
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_viaIR.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_viaIR.sol
new file mode 100644
index 0000000000..0d582f8d7d
--- /dev/null
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_3_viaIR.sol
@@ -0,0 +1,12 @@
+contract A {
+    uint public x = 2;
+    constructor(uint) {}
+    function f() public returns(uint) { x = 4; }
+}
+contract B is A {
+    constructor() A(f()) {}
+}
+// ====
+// compileViaYul: true
+// ----
+// x() -> 2

From 276851ff91357aa4dbd6d808ba0ffab6e7160adf Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Fri, 4 Feb 2022 19:26:03 +0530
Subject: [PATCH 0372/1748] Added support for FunctionType::Kind::StringConcat
 and functions string.concat

---
 Changelog.md                                  |  1 +
 docs/cheatsheet.rst                           |  2 +
 docs/types/reference-types.rst                | 33 +++++++----
 docs/units-and-global-variables.rst           |  8 +++
 libsolidity/analysis/TypeChecker.cpp          | 40 ++++++++++++-
 libsolidity/analysis/TypeChecker.h            |  6 ++
 libsolidity/ast/Types.cpp                     |  8 +--
 libsolidity/ast/Types.h                       |  1 +
 libsolidity/codegen/ExpressionCompiler.cpp    | 13 ++++-
 libsolidity/codegen/YulUtilFunctions.cpp      | 33 +++++++----
 libsolidity/codegen/YulUtilFunctions.h        | 10 +++-
 .../codegen/ir/IRGeneratorForStatements.cpp   |  4 +-
 .../strings/concat/string_concat_2_args.sol   | 14 +++++
 .../concat/string_concat_different_types.sol  | 37 ++++++++++++
 .../string_concat_empty_argument_list.sol     | 10 ++++
 .../concat/string_concat_empty_strings.sol    | 27 +++++++++
 .../strings/concat/string_concat_nested.sol   |  9 +++
 .../concat/string_concat_empty_invalid.sol    |  7 +++
 ...tring_concat_with_different_parameters.sol | 13 +++++
 ...ng_concat_wrong_type_bytes_and_strings.sol | 15 +++++
 ..._concat_wrong_type_empty_array_literal.sol |  7 +++
 .../concat/string_concat_wrong_type_misc.sol  | 40 +++++++++++++
 ...ong_type_misc_literals_and_expressions.sol | 58 +++++++++++++++++++
 .../string_concat_wrong_type_zero_literal.sol | 33 +++++++++++
 24 files changed, 391 insertions(+), 38 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
 create mode 100644 test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
 create mode 100644 test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
 create mode 100644 test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
 create mode 100644 test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
 create mode 100644 test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol
 create mode 100644 test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol
 create mode 100644 test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol
 create mode 100644 test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol
 create mode 100644 test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol
 create mode 100644 test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol
 create mode 100644 test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol

diff --git a/Changelog.md b/Changelog.md
index 98515970f0..fe116d5e0c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -17,6 +17,7 @@ Bugfixes:
  * Code Generator: Fix ICE when accessing the members of external functions occupying more than two stack slots.
  * Code Generator: Fix ICE when doing an explicit conversion from ``string calldata`` to ``bytes``.
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
+ * General: ``string.concat`` now properly takes strings as arguments and returns ``string memory``. It was accidentally introduced as a copy of ``bytes.concat`` before.
  * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the derived contract contains immutable variables.
  * IR Generator: Add missing cleanup during the conversion of fixed bytes types to smaller fixed bytes types.
  * IR Generator: Add missing cleanup for indexed event arguments of value type.
diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index cd9ba5c149..a7581aae57 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -86,6 +86,8 @@ Global Variables
   to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature)), ...)``
 - ``bytes.concat(...) returns (bytes memory)``: :ref:`Concatenates variable number of
   arguments to one byte array<bytes-concat>`
+- ``string.concat(...) returns (string memory)``: :ref:`Concatenates variable number of
+  arguments to one string array<string-concat>`
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)
 - ``block.chainid`` (``uint``): current chain id
 - ``block.coinbase`` (``address payable``): current block miner's address
diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index 88e23a47eb..014c49935a 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -150,7 +150,7 @@ length or index access.
 Solidity does not have string manipulation functions, but there are
 third-party string libraries. You can also compare two strings by their keccak256-hash using
 ``keccak256(abi.encodePacked(s1)) == keccak256(abi.encodePacked(s2))`` and
-concatenate two strings using ``bytes.concat(bytes(s1), bytes(s2))``.
+concatenate two strings using ``string.concat(s1, s2)``.
 
 You should use ``bytes`` over ``bytes1[]`` because it is cheaper,
 since using ``bytes1[]`` in ``memory`` adds 31 padding bytes between the elements. Note that in ``storage``, the
@@ -165,31 +165,40 @@ always use one of the value types ``bytes1`` to ``bytes32`` because they are muc
     that you are accessing the low-level bytes of the UTF-8 representation,
     and not the individual characters.
 
-.. index:: ! bytes-concat
+.. index:: ! bytes-concat, ! string-concat
 
 .. _bytes-concat:
+.. _string-concat:
 
-``bytes.concat`` function
-^^^^^^^^^^^^^^^^^^^^^^^^^
+The functions ``bytes.concat`` and ``string.concat``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-You can concatenate a variable number of ``bytes`` or ``bytes1 ... bytes32`` using ``bytes.concat``.
+You can concatenate an arbitrary number of ``string`` values using ``string.concat``.
+The function returns a single ``string memory`` array that contains the contents of the arguments without padding.
+If you want to use parameters of other types that are not implicitly convertible to ``string``, you need to convert them to ``string`` first.
+
+Analogously, the ``bytes.concat`` function can concatenate an arbitrary number of ``bytes`` or ``bytes1 ... bytes32`` values.
 The function returns a single ``bytes memory`` array that contains the contents of the arguments without padding.
-If you want to use string parameters or other types, you need to convert them to ``bytes`` or ``bytes1``/.../``bytes32`` first.
+If you want to use string parameters or other types that are not implicitly convertible to ``bytes``, you need to convert them to ``bytes`` or ``bytes1``/.../``bytes32`` first.
+
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity ^0.8.4;
+    pragma solidity ^0.8.12;
 
     contract C {
-        bytes s = "Storage";
-        function f(bytes calldata c, string memory m, bytes16 b) public view {
-            bytes memory a = bytes.concat(s, c, c[:2], "Literal", bytes(m), b);
-            assert((s.length + c.length + 2 + 7 + bytes(m).length + 16) == a.length);
+        string s = "Storage";
+        function f(bytes calldata bc, string memory sm, bytes16 b) public view {
+            string memory concat_string = string.concat(s, string(bc), "Literal", sm);
+            assert((bytes(s).length + bc.length + 7 + bytes(sm).length) == bytes(concat_string).length);
+
+            bytes memory concat_bytes = bytes.concat(bytes(s), bc, bc[:2], "Literal", bytes(sm), b);
+            assert((bytes(s).length + bc.length + 2 + 7 + bytes(sm).length + b.length) == concat_bytes.length);
         }
     }
 
-If you call ``bytes.concat`` without arguments it will return an empty ``bytes`` array.
+If you call ``string.concat`` or ``bytes.concat`` without arguments they return an empty array.
 
 .. index:: ! array;allocating, new
 
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index 70125636c2..7d172eb075 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -154,6 +154,14 @@ Members of bytes
 
 - ``bytes.concat(...) returns (bytes memory)``: :ref:`Concatenates variable number of bytes and bytes1, ..., bytes32 arguments to one byte array<bytes-concat>`
 
+.. index:: string members
+
+Members of string
+-----------------
+
+- ``string.concat(...) returns (string memory)``: :ref:`Concatenates variable number of string arguments to one string array<string-concat>`
+
+
 .. index:: assert, revert, require
 
 Error Handling
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 5b03717d9d..74701bde0f 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -2207,14 +2207,42 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 	}
 }
 
+
+void TypeChecker::typeCheckStringConcatFunction(
+	FunctionCall const& _functionCall,
+	FunctionType const* _functionType
+)
+{
+	solAssert(_functionType);
+	solAssert(_functionType->kind() == FunctionType::Kind::StringConcat);
+	solAssert(_functionCall.names().empty());
+
+	typeCheckFunctionGeneralChecks(_functionCall, _functionType);
+
+	for (shared_ptr<Expression const> const& argument: _functionCall.arguments())
+	{
+		Type const* argumentType = type(*argument);
+		bool notConvertibleToString = !argumentType->isImplicitlyConvertibleTo(*TypeProvider::stringMemory());
+
+		if (notConvertibleToString)
+			m_errorReporter.typeError(
+				9977_error,
+				argument->location(),
+				"Invalid type for argument in the string.concat function call. "
+				"string type is required, but " +
+				argumentType->identifier() + " provided."
+			);
+	}
+}
+
 void TypeChecker::typeCheckBytesConcatFunction(
 	FunctionCall const& _functionCall,
 	FunctionType const* _functionType
 )
 {
-	solAssert(_functionType, "");
-	solAssert(_functionType->kind() == FunctionType::Kind::BytesConcat, "");
-	solAssert(_functionCall.names().empty(), "");
+	solAssert(_functionType);
+	solAssert(_functionType->kind() == FunctionType::Kind::BytesConcat);
+	solAssert(_functionCall.names().empty());
 
 	typeCheckFunctionGeneralChecks(_functionCall, _functionType);
 
@@ -2651,6 +2679,12 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
 			returnTypes = functionType->returnParameterTypes();
 			break;
 		}
+		case FunctionType::Kind::StringConcat:
+		{
+			typeCheckStringConcatFunction(_functionCall, functionType);
+			returnTypes = functionType->returnParameterTypes();
+			break;
+		}
 		case FunctionType::Kind::Wrap:
 		case FunctionType::Kind::Unwrap:
 		{
diff --git a/libsolidity/analysis/TypeChecker.h b/libsolidity/analysis/TypeChecker.h
index 7586f9d151..969ee43940 100644
--- a/libsolidity/analysis/TypeChecker.h
+++ b/libsolidity/analysis/TypeChecker.h
@@ -113,6 +113,12 @@ class TypeChecker: private ASTConstVisitor
 	/// Performs checks specific to the ABI encode functions of type ABIEncodeCall
 	void typeCheckABIEncodeCallFunction(FunctionCall const& _functionCall);
 
+	/// Performs general checks and checks specific to string concat function call
+	void typeCheckStringConcatFunction(
+		FunctionCall const& _functionCall,
+		FunctionType const* _functionType
+	);
+
 	/// Performs general checks and checks specific to bytes concat function call
 	void typeCheckBytesConcatFunction(
 		FunctionCall const& _functionCall,
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 74cd76ee73..8a6905307b 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -2928,6 +2928,7 @@ string FunctionType::richIdentifier() const
 	case Kind::ArrayPush: id += "arraypush"; break;
 	case Kind::ArrayPop: id += "arraypop"; break;
 	case Kind::BytesConcat: id += "bytesconcat"; break;
+	case Kind::StringConcat: id += "stringconcat"; break;
 	case Kind::ObjectCreation: id += "objectcreation"; break;
 	case Kind::Assert: id += "assert"; break;
 	case Kind::Require: id += "require"; break;
@@ -3817,15 +3818,14 @@ MemberList::MemberMap TypeType::nativeMembers(ASTNode const* _currentScope) cons
 	)
 		members.emplace_back("concat", TypeProvider::function(
 			TypePointers{},
-			TypePointers{TypeProvider::bytesMemory()},
+			TypePointers{arrayType->isString() ? TypeProvider::stringMemory() : TypeProvider::bytesMemory()},
 			strings{},
-			strings{string()},
-			FunctionType::Kind::BytesConcat,
+			strings{string{}},
+			arrayType->isString() ? FunctionType::Kind::StringConcat : FunctionType::Kind::BytesConcat,
 			StateMutability::Pure,
 			nullptr,
 			FunctionType::Options::withArbitraryParameters()
 		));
-
 	return members;
 }
 
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index c4aaf38ca1..9b030f65a5 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1228,6 +1228,7 @@ class FunctionType: public Type
 		ArrayPush, ///< .push() to a dynamically sized array in storage
 		ArrayPop, ///< .pop() from a dynamically sized array in storage
 		BytesConcat, ///< .concat() on bytes (type type)
+		StringConcat, ///< .concat() on string (type type)
 		ObjectCreation, ///< array creation using new
 		Assert, ///< assert()
 		Require, ///< require()
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index da3022251f..e4ad4cf7e0 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1101,6 +1101,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 			ArrayUtils(m_context).popStorageArrayElement(*arrayType);
 			break;
 		}
+		case FunctionType::Kind::StringConcat:
 		case FunctionType::Kind::BytesConcat:
 		{
 			_functionCall.expression().accept(*this);
@@ -1121,8 +1122,16 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				else
 				{
 					solAssert(!dynamic_cast<RationalNumberType const*>(argument->annotation().type), "");
-					solAssert(argument->annotation().type->isImplicitlyConvertibleTo(*TypeProvider::bytesMemory()), "");
-					targetTypes.emplace_back(TypeProvider::bytesMemory());
+					if (function.kind() == FunctionType::Kind::StringConcat)
+					{
+						solAssert(argument->annotation().type->isImplicitlyConvertibleTo(*TypeProvider::stringMemory()), "");
+						targetTypes.emplace_back(TypeProvider::stringMemory());
+					}
+					else if (function.kind() == FunctionType::Kind::BytesConcat)
+					{
+						solAssert(argument->annotation().type->isImplicitlyConvertibleTo(*TypeProvider::bytesMemory()), "");
+						targetTypes.emplace_back(TypeProvider::bytesMemory());
+					}
 				}
 			}
 			utils().fetchFreeMemoryPointer();
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 9b50d68cd9..23f41efd2d 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -2475,18 +2475,26 @@ string YulUtilFunctions::copyArrayFromStorageToMemoryFunction(ArrayType const& _
 	});
 }
 
-string YulUtilFunctions::bytesConcatFunction(vector<Type const*> const& _argumentTypes)
+string YulUtilFunctions::bytesOrStringConcatFunction(
+	vector<Type const*> const& _argumentTypes,
+	FunctionType::Kind _functionTypeKind
+)
 {
-	string functionName = "bytes_concat";
+	solAssert(_functionTypeKind == FunctionType::Kind::BytesConcat || _functionTypeKind == FunctionType::Kind::StringConcat);
+	std::string functionName = (_functionTypeKind == FunctionType::Kind::StringConcat) ? "string_concat" : "bytes_concat";
 	size_t totalParams = 0;
 	vector<Type const*> targetTypes;
+
 	for (Type const* argumentType: _argumentTypes)
 	{
-		solAssert(
-			argumentType->isImplicitlyConvertibleTo(*TypeProvider::bytesMemory()) ||
-			argumentType->isImplicitlyConvertibleTo(*TypeProvider::fixedBytes(32)),
-			""
-		);
+		if (_functionTypeKind == FunctionType::Kind::StringConcat)
+			solAssert(argumentType->isImplicitlyConvertibleTo(*TypeProvider::stringMemory()));
+		else if (_functionTypeKind == FunctionType::Kind::BytesConcat)
+			solAssert(
+				argumentType->isImplicitlyConvertibleTo(*TypeProvider::bytesMemory()) ||
+				argumentType->isImplicitlyConvertibleTo(*TypeProvider::fixedBytes(32))
+			);
+
 		if (argumentType->category() == Type::Category::FixedBytes)
 			targetTypes.emplace_back(argumentType);
 		else if (
@@ -2496,15 +2504,16 @@ string YulUtilFunctions::bytesConcatFunction(vector<Type const*> const& _argumen
 			targetTypes.emplace_back(TypeProvider::fixedBytes(static_cast<unsigned>(literalType->value().size())));
 		else
 		{
-			solAssert(!dynamic_cast<RationalNumberType const*>(argumentType), "");
-			solAssert(argumentType->isImplicitlyConvertibleTo(*TypeProvider::bytesMemory()), "");
-			targetTypes.emplace_back(TypeProvider::bytesMemory());
+			solAssert(!dynamic_cast<RationalNumberType const*>(argumentType));
+			targetTypes.emplace_back(
+				_functionTypeKind == FunctionType::Kind::StringConcat ?
+				TypeProvider::stringMemory() :
+				TypeProvider::bytesMemory()
+			);
 		}
-
 		totalParams += argumentType->sizeOnStack();
 		functionName += "_" + argumentType->identifier();
 	}
-
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers templ(R"(
 			function <functionName>(<parameters>) -> outPtr {
diff --git a/libsolidity/codegen/YulUtilFunctions.h b/libsolidity/codegen/YulUtilFunctions.h
index 52d672b1fd..4d6e7efdac 100644
--- a/libsolidity/codegen/YulUtilFunctions.h
+++ b/libsolidity/codegen/YulUtilFunctions.h
@@ -312,9 +312,13 @@ class YulUtilFunctions
 	/// of the storage array into it.
 	std::string copyArrayFromStorageToMemoryFunction(ArrayType const& _from, ArrayType const& _to);
 
-	/// @returns the name of a function that does concatenation of variadic number of bytes
-	/// or fixed bytes
-	std::string bytesConcatFunction(std::vector<Type const*> const& _argumentTypes);
+	/// @returns the name of a function that does concatenation of variadic number of
+	/// bytes if @a functionTypeKind is FunctionType::Kind::BytesConcat,
+	/// or of strings, if @a functionTypeKind is FunctionType::Kind::StringConcat.
+	std::string bytesOrStringConcatFunction(
+		std::vector<Type const*> const& _argumentTypes,
+		FunctionType::Kind _functionTypeKind
+	);
 
 	/// @returns the name of a function that performs index access for mappings.
 	/// @param _mappingType the type of the mapping
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 065b351f61..9fb73f0214 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1389,6 +1389,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		}
 		break;
 	}
+	case FunctionType::Kind::StringConcat:
 	case FunctionType::Kind::BytesConcat:
 	{
 		TypePointers argumentTypes;
@@ -1399,11 +1400,10 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 			argumentVars += IRVariable(*argument).stackSlots();
 		}
 		define(IRVariable(_functionCall)) <<
-			m_utils.bytesConcatFunction(argumentTypes) <<
+			m_utils.bytesOrStringConcatFunction(argumentTypes, functionType->kind()) <<
 			"(" <<
 			joinHumanReadable(argumentVars) <<
 			")\n";
-
 		break;
 	}
 	case FunctionType::Kind::MetaType:
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
new file mode 100644
index 0000000000..7b7bc828cc
--- /dev/null
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f(string memory a, string memory b) public returns (string memory) {
+        return string.concat(a, b);
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// f(string,string): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
+// f(string,string): 0x40, 0xa0, 64, "abcdabcdabcdabcdabcdabcdabcdabcd", "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 0x45, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
+// f(string,string): 0x40, 0x80, 3, "abc", 3, "def" -> 0x20, 6, "abcdef"
+// f(string,string): 0x40, 0xa0, 34, "abcdabcdabcdabcdabcdabcdabcdabcd", "ab", 30, "cdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x40, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636461626364616263646162636461626364616263646162636461626364
+// f(string,string): 0x40, 0xa0, 34, "abcdabcdabcdabcdabcdabcdabcdabcd", "ab", 34, "cdabcdabcdabcdabcdabcdabcdabcdab", "cd" -> 0x20, 0x44, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636461626364616263646162636461626364616263646162636461626364, 44048183293808120317390542201052832727062033572611867748297851798484192067584
+// f(string,string): 0x40, 0x80, 3, "abc", 30, "dabcdabcdabcdabcdabcdabcdabcda" -> 0x20, 0x21, 0x6162636461626364616263646162636461626364616263646162636461626364, 43874346312576839672212443538448152585028080127215369968075725190498334277632
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
new file mode 100644
index 0000000000..ab59c1bf6e
--- /dev/null
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
@@ -0,0 +1,37 @@
+contract C{
+    string s = "bcdef";
+
+    function f(string memory a) public returns (string memory) {
+        return string.concat(a, "bcdef");
+    }
+    function g(string calldata a) public returns (string memory) {
+        return string.concat(a, "abcdefghabcdefghabcdefghabcdefghab");
+    }
+    function h(string calldata a) public returns (string memory) {
+        return string.concat(a, s);
+    }
+    function j(string calldata a) public returns (string memory) {
+        string storage ref = s;
+        return string.concat(a, ref, s);
+    }
+    function k(string calldata a, bytes memory b) public returns (string memory) {
+        return string.concat(a, string(b));
+    }
+    function slice(string calldata a) public returns (string memory) {
+        require(bytes(a).length > 2, "");
+        return string.concat(a[:2], a[2:]);
+    }
+    function strParam(bytes calldata a) public returns (string memory) {
+        return string.concat(string(a), "bcdef");
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// f(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
+// g(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x42, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636465666768616263646566676861626364656667686162636465666768, 44047497324925121336511606693520958599579173549109180625971642598225011015680
+// h(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
+// j(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x2a, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928944786876717917111204727192787026596791669343131645116682757734400
+// k(string,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
+// slice(string): 0x20, 4, "abcd" -> 0x20, 4, "abcd"
+// strParam(bytes): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
new file mode 100644
index 0000000000..70be494bae
--- /dev/null
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public returns (string memory) {
+        return string.concat();
+    }
+}
+// ====
+// compileToEwasm: also
+// compileViaYul: also
+// ----
+// f() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
new file mode 100644
index 0000000000..ca520884e3
--- /dev/null
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
@@ -0,0 +1,27 @@
+contract C {
+    function f() public returns (string memory) {
+        string memory b = "";
+        return string.concat(
+            string.concat(b),
+            string.concat(b, b),
+            string.concat("", b),
+            string.concat(b, "")
+        );
+    }
+
+    function g() public returns (string memory) {
+        return string.concat("", "abc", hex"", "abc", unicode"");
+    }
+
+    function h() public returns (string memory) {
+        string memory b = "";
+        return string.concat(b, "abc", b, "abc", b);
+    }
+}
+// ====
+// compileToEwasm: also
+// compileViaYul: also
+// ----
+// f() -> 0x20, 0
+// g() -> 0x20, 6, "abcabc"
+// h() -> 0x20, 6, "abcabc"
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
new file mode 100644
index 0000000000..82931cd86c
--- /dev/null
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f(string memory a, string memory b, string memory c) public returns (string memory) {
+        return string.concat(string.concat(a, b), c);
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// f(string,string,string): 0x60, 0x60, 0x60, 2, "ab" -> 0x20, 6, "ababab"
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol
new file mode 100644
index 0000000000..f38a3267ee
--- /dev/null
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_empty_invalid.sol
@@ -0,0 +1,7 @@
+contract C {
+    function g() public pure returns (string memory) {
+        return string.concat;
+    }
+}
+// ----
+// TypeError 6359: (83-96): Return argument type function () pure returns (string memory) is not implicitly convertible to expected type (type of first return variable) string memory.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol
new file mode 100644
index 0000000000..dcf3057da7
--- /dev/null
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_with_different_parameters.sol
@@ -0,0 +1,13 @@
+contract C {
+    function j() external {
+        string memory a = "hello";
+        string memory b = " world";
+
+        string memory d = string.concat(bytes(a), bytes(b));
+        string memory e = string.concat(a, 0);
+    }
+}
+// ----
+// TypeError 9977: (153-161): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr provided.
+// TypeError 9977: (163-171): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr provided.
+// TypeError 9977: (217-218): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol
new file mode 100644
index 0000000000..49b8a465a9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_bytes_and_strings.sol
@@ -0,0 +1,15 @@
+contract C {
+    string s;
+    function f(string calldata c, string calldata c1) public {
+        string memory a;
+        bytes16 b;
+        uint8[] memory num;
+        bytes1[] memory m;
+        string memory d = string.concat(a, b, c, num, s, "abc", m, c1, bytes(c1));
+    }
+}
+// ----
+// TypeError 9977: (232-233): Invalid type for argument in the string.concat function call. string type is required, but t_bytes16 provided.
+// TypeError 9977: (238-241): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$dyn_memory_ptr provided.
+// TypeError 9977: (253-254): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_bytes1_$dyn_memory_ptr provided.
+// TypeError 9977: (260-269): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_calldata_ptr provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol
new file mode 100644
index 0000000000..8c204ffca9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_empty_array_literal.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() public {
+        string.concat([], [], []);
+    }
+}
+// ----
+// TypeError 6378: (61-63): Unable to deduce common type for array elements.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol
new file mode 100644
index 0000000000..3c4639363c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc.sol
@@ -0,0 +1,40 @@
+contract C {
+    struct S {
+        uint x;
+    }
+
+    enum E {A, B, C}
+
+    mapping(uint => E) m;
+
+    function f() public {
+        bool b;
+        uint u;
+        uint8 u8;
+        address a;
+        address payable ap;
+        function () external fext;
+        function () internal fint;
+        uint[] memory uDynamic;
+        uint[2] memory uStatic;
+        C c;
+        S memory s;
+        E e;
+
+        string.concat(b, u, u8, a, ap, fext, fint, uDynamic, uStatic, c, s, e, m);
+    }
+}
+// ----
+// TypeError 9977: (426-427): Invalid type for argument in the string.concat function call. string type is required, but t_bool provided.
+// TypeError 9977: (429-430): Invalid type for argument in the string.concat function call. string type is required, but t_uint256 provided.
+// TypeError 9977: (432-434): Invalid type for argument in the string.concat function call. string type is required, but t_uint8 provided.
+// TypeError 9977: (436-437): Invalid type for argument in the string.concat function call. string type is required, but t_address provided.
+// TypeError 9977: (439-441): Invalid type for argument in the string.concat function call. string type is required, but t_address_payable provided.
+// TypeError 9977: (443-447): Invalid type for argument in the string.concat function call. string type is required, but t_function_external_nonpayable$__$returns$__$ provided.
+// TypeError 9977: (449-453): Invalid type for argument in the string.concat function call. string type is required, but t_function_internal_nonpayable$__$returns$__$ provided.
+// TypeError 9977: (455-463): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint256_$dyn_memory_ptr provided.
+// TypeError 9977: (465-472): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint256_$2_memory_ptr provided.
+// TypeError 9977: (474-475): Invalid type for argument in the string.concat function call. string type is required, but t_contract$_C_$86 provided.
+// TypeError 9977: (477-478): Invalid type for argument in the string.concat function call. string type is required, but t_struct$_S_$4_memory_ptr provided.
+// TypeError 9977: (480-481): Invalid type for argument in the string.concat function call. string type is required, but t_enum$_E_$8 provided.
+// TypeError 9977: (483-484): Invalid type for argument in the string.concat function call. string type is required, but t_mapping$_t_uint256_$_t_enum$_E_$8_$ provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol
new file mode 100644
index 0000000000..f8e62b49e4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_misc_literals_and_expressions.sol
@@ -0,0 +1,58 @@
+contract C {
+    struct S {
+        uint x;
+    }
+
+    enum E {A, B, C}
+
+    function f() public {
+        string.concat(
+            false,
+            1,
+            1e10,
+            1e-10,
+            0.1,
+            0x1234567,
+            0x11112222333344445555666677778888999900,     // One byte less than an address
+            0x1111222233334444555566667777888899990000,   // Address
+            0x111122223333444455556666777788889999000011, // One byte more than an address
+            0x00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff,  // exactly 32 bytes
+            -0x0000000000000000000000000000000000000000000000000000000000000001, // exactly 32 bytes
+            bytes(bytes32(0x00112233445566778899aabbccddeeff00112233445566778899aabbccddeeff))[:],
+            f,
+            (),
+            (0, 0),
+            [0],
+            [0][:],
+            [0][0],
+            new C(),
+            S(0),
+            E.A
+        );
+    }
+}
+// ----
+// TypeError 9640: (698-780): Explicit type conversion not allowed from "bytes32" to "bytes memory".
+// TypeError 1227: (698-783): Index range access is only supported for dynamic calldata arrays.
+// TypeError 1227: (865-871): Index range access is only supported for dynamic calldata arrays.
+// TypeError 9977: (134-139): Invalid type for argument in the string.concat function call. string type is required, but t_bool provided.
+// TypeError 9977: (153-154): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_1 provided.
+// TypeError 9977: (168-172): Invalid type for argument in the string.concat function call. string type is required, but t_rational_10000000000_by_1 provided.
+// TypeError 9977: (186-191): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_10000000000 provided.
+// TypeError 9977: (205-208): Invalid type for argument in the string.concat function call. string type is required, but t_rational_1_by_10 provided.
+// TypeError 9977: (222-231): Invalid type for argument in the string.concat function call. string type is required, but t_rational_19088743_by_1 provided.
+// TypeError 9977: (245-285): Invalid type for argument in the string.concat function call. string type is required, but t_rational_380605192295934637532253317235440047844071680_by_1 provided.
+// TypeError 9977: (336-378): Invalid type for argument in the string.concat function call. string type is required, but t_address provided.
+// TypeError 9977: (405-449): Invalid type for argument in the string.concat function call. string type is required, but t_rational_24943341882306372405313753398341798975509081620497_by_1 provided.
+// TypeError 9977: (496-562): Invalid type for argument in the string.concat function call. string type is required, but t_rational_30272441630670900764332283662402067049651745785153368133042924362431065855_by_1 provided.
+// TypeError 9977: (597-664): Invalid type for argument in the string.concat function call. string type is required, but t_rational_minus_1_by_1 provided.
+// TypeError 9977: (698-783): Invalid type for argument in the string.concat function call. string type is required, but t_bytes_memory_ptr_slice provided.
+// TypeError 9977: (797-798): Invalid type for argument in the string.concat function call. string type is required, but t_function_internal_nonpayable$__$returns$__$ provided.
+// TypeError 9977: (812-814): Invalid type for argument in the string.concat function call. string type is required, but t_tuple$__$ provided.
+// TypeError 9977: (828-834): Invalid type for argument in the string.concat function call. string type is required, but t_tuple$_t_rational_0_by_1_$_t_rational_0_by_1_$ provided.
+// TypeError 9977: (848-851): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$1_memory_ptr provided.
+// TypeError 9977: (865-871): Invalid type for argument in the string.concat function call. string type is required, but t_array$_t_uint8_$1_memory_ptr_slice provided.
+// TypeError 9977: (885-891): Invalid type for argument in the string.concat function call. string type is required, but t_uint8 provided.
+// TypeError 9977: (905-912): Invalid type for argument in the string.concat function call. string type is required, but t_contract$_C_$61 provided.
+// TypeError 9977: (926-930): Invalid type for argument in the string.concat function call. string type is required, but t_struct$_S_$4_memory_ptr provided.
+// TypeError 9977: (944-947): Invalid type for argument in the string.concat function call. string type is required, but t_enum$_E_$8 provided.
diff --git a/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol
new file mode 100644
index 0000000000..c1b2b4513d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/string/concat/string_concat_wrong_type_zero_literal.sol
@@ -0,0 +1,33 @@
+contract C {
+    function f() public pure {
+        string.concat(
+            0,
+            -0,
+            0.0,
+            -0.0,
+            0e10,
+            -0e10,
+            0e-10,
+            -0e-10,
+            (0),
+            0x00,
+            -0x00,
+            0x0000000000000000000000000000000000000000000000000000000000000000, // exactly 32 bytes
+            -0x0000000000000000000000000000000000000000000000000000000000000000 // exactly 32 bytes
+        );
+    }
+}
+// ----
+// TypeError 9977: (79-80): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (94-96): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (110-113): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (127-131): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (145-149): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (163-168): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (182-187): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (201-207): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (221-224): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (238-242): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (256-261): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (275-341): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.
+// TypeError 9977: (375-442): Invalid type for argument in the string.concat function call. string type is required, but t_rational_0_by_1 provided.

From e3ebcd63cf8d29a1e14c249388d21576a3481318 Mon Sep 17 00:00:00 2001
From: Amsavarthan Lv <80940598+amsavarthan@users.noreply.github.com>
Date: Sun, 13 Feb 2022 15:17:37 +0530
Subject: [PATCH 0373/1748] Highlighted "revert" command

When reading through the documentation, I found that highlighting was missed for the revert command and added that.
---
 docs/introduction-to-smart-contracts.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index aab0faf7c5..fa2fa34c11 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -222,7 +222,7 @@ than the maximum value of ``uint`` (``2**256 - 1``). This is also true for the s
 
 :ref:`Errors <errors>` allow you to provide more information to the caller about
 why a condition or operation failed. Errors are used together with the
-:ref:`revert statement <revert-statement>`. The revert statement unconditionally
+:ref:`revert statement <revert-statement>`. The ``revert`` statement unconditionally
 aborts and reverts all changes similar to the ``require`` function, but it also
 allows you to provide the name of an error and additional data which will be supplied to the caller
 (and eventually to the front-end application or block explorer) so that

From 1188795449295402472b5888e1adf7914942d1db Mon Sep 17 00:00:00 2001
From: Laurent <ldfp@msn.com>
Date: Sun, 13 Feb 2022 17:32:09 +0100
Subject: [PATCH 0374/1748] Solve issue 12658 ; Solving wrong syntax.

Solve this issue : https://github.com/ethereum/solidity/issues/12658
---
 docs/installing-solidity.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index f2ed852370..9d6e666d25 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -24,7 +24,7 @@ actual release. They are not meant for production use.
 
 When deploying contracts, you should use the latest released version of Solidity. This
 is because breaking changes, as well as new features and bug fixes are introduced regularly.
-We currently use a 0.x version number [to indicate this fast pace of change](https://semver.org/#spec-item-4).
+We currently use a 0.x version number `to indicate this fast pace of change <https://semver.org/#spec-item-4>`_.
 
 Remix
 =====

From 5c67d7d8e3cec33aade7e7c1d065e5526d9c6246 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 14 Feb 2022 11:48:56 +0100
Subject: [PATCH 0375/1748] Disable running smt tests in ubsan runs.

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 39c219bcec..8cddc8793c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1098,6 +1098,7 @@ jobs:
     parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
+      SOLTEST_FLAGS: --no-smt
     <<: *steps_soltest
 
   t_ubu_ubsan_clang_cli:

From c47da51eab8e5c4ebff0f6dd2ca748179aa21ab4 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 2 Feb 2022 17:18:38 +0100
Subject: [PATCH 0376/1748] Consider all grandparents in override analysis.

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/OverrideChecker.cpp      |  7 +++---
 .../correct_choice_for_base_function.sol      | 17 ++++++++++++++
 ...ce_for_base_function_abstract_contract.sol | 17 ++++++++++++++
 .../interface_and_base_override_err.sol       | 18 +++++++++++++++
 .../interface_and_base_override_fine.sol      | 16 ++++++++++++++
 .../override/override_multi_layered_error.sol | 22 +++++++++++++++++++
 .../override/override_multi_layered_fine.sol  | 18 +++++++++++++++
 .../override_multi_layered_fine_abstract.sol  | 18 +++++++++++++++
 9 files changed, 131 insertions(+), 3 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function_abstract_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_fine.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine_abstract.sol

diff --git a/Changelog.md b/Changelog.md
index f688af733f..364fe35d8b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,7 @@ Bugfixes:
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
  * General: ``string.concat`` now properly takes strings as arguments and returns ``string memory``. It was accidentally introduced as a copy of ``bytes.concat`` before.
  * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the derived contract contains immutable variables.
+ * Inheritance: Consider functions in all ancestors during override analysis.
  * IR Generator: Add missing cleanup during the conversion of fixed bytes types to smaller fixed bytes types.
  * IR Generator: Add missing cleanup for indexed event arguments of value type.
  * IR Generator: Fix internal error when copying reference types in calldata and storage to struct or array members in memory.
diff --git a/libsolidity/analysis/OverrideChecker.cpp b/libsolidity/analysis/OverrideChecker.cpp
index 6f44f92ace..2f83748fb4 100644
--- a/libsolidity/analysis/OverrideChecker.cpp
+++ b/libsolidity/analysis/OverrideChecker.cpp
@@ -897,10 +897,11 @@ OverrideChecker::OverrideProxyBySignatureMultiSet const& OverrideChecker::inheri
 				if (var->isPublic())
 					functionsInBase.emplace(OverrideProxy{var});
 
-			for (OverrideProxy const& func: inheritedFunctions(*base))
-				functionsInBase.insert(func);
-
 			result += functionsInBase;
+
+			for (OverrideProxy const& func: inheritedFunctions(*base))
+				if (!functionsInBase.count(func))
+					result.insert(func);
 		}
 
 		m_inheritedFunctions[&_contract] = result;
diff --git a/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function.sol b/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function.sol
new file mode 100644
index 0000000000..a7da5e4d1c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function.sol
@@ -0,0 +1,17 @@
+interface IBase {
+    function foo() external view;
+}
+
+contract Base is IBase {
+    function foo() public virtual view {}
+}
+
+interface IExt is IBase {}
+
+contract Ext is IExt, Base {}
+
+contract T { function foo() public virtual view {} }
+
+contract Impl is Ext, T {
+    function foo() public view override(IBase, Base, T) {}
+}
diff --git a/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function_abstract_contract.sol b/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function_abstract_contract.sol
new file mode 100644
index 0000000000..8814026201
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/override/correct_choice_for_base_function_abstract_contract.sol
@@ -0,0 +1,17 @@
+abstract contract IBase {
+    function foo() external view virtual;
+}
+
+contract Base is IBase {
+    function foo() public virtual override view {}
+}
+
+abstract contract IExt is IBase {}
+
+contract Ext is IExt, Base {}
+
+contract T { function foo() public virtual view {} }
+
+contract Impl is Ext, T {
+    function foo() public view override(IBase, Base, T) {}
+}
diff --git a/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol b/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol
new file mode 100644
index 0000000000..e3f4917704
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_err.sol
@@ -0,0 +1,18 @@
+interface IBase {
+    function foo() external view;
+}
+
+contract Base is IBase {
+    function foo() public virtual view {}
+}
+
+interface IExt is IBase {}
+
+contract Ext is IExt, Base {}
+
+contract Impl is Ext {
+    function foo() public view {}
+}
+// ----
+// TypeError 9456: (211-240): Overriding function is missing "override" specifier.
+// TypeError 4327: (211-240): Function needs to specify overridden contracts "Base" and "IBase".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_fine.sol b/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_fine.sol
new file mode 100644
index 0000000000..e20bcd8881
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/override/interface_and_base_override_fine.sol
@@ -0,0 +1,16 @@
+interface IBase {
+    function foo() external view;
+}
+
+contract Base is IBase {
+    function foo() public virtual view {}
+}
+
+interface IExt is IBase {}
+
+contract Ext is IExt, Base {}
+
+contract Impl is Ext {
+    function foo() public view override (IBase, Base) {}
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol
new file mode 100644
index 0000000000..309d905d15
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_error.sol
@@ -0,0 +1,22 @@
+interface IBase {
+    function foo() external view;
+}
+
+contract Base1 is IBase { function foo() public virtual view {} }
+contract Base2 is IBase { function foo() public virtual view {} }
+
+interface IExt1a is IBase {}
+interface IExt1b is IBase {}
+interface IExt2a is IBase {}
+interface IExt2b is IBase {}
+
+contract Ext1 is IExt1a, IExt1b, Base1 {}
+contract Ext2 is IExt2a, IExt2b, Base2 {}
+
+contract Impl is Ext1, Ext2 {
+    function foo() public view {}
+}
+// ----
+// TypeError 9456: (424-453): Overriding function is missing "override" specifier.
+// TypeError 9456: (424-453): Overriding function is missing "override" specifier.
+// TypeError 4327: (424-453): Function needs to specify overridden contracts "Base1", "Base2" and "IBase".
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine.sol
new file mode 100644
index 0000000000..3c12d3ba60
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine.sol
@@ -0,0 +1,18 @@
+interface IBase {
+    function foo() external view;
+}
+
+contract Base1 is IBase { function foo() public virtual view {} }
+contract Base2 is IBase { function foo() public virtual view {} }
+
+interface IExt1a is IBase {}
+interface IExt1b is IBase {}
+interface IExt2a is IBase {}
+interface IExt2b is IBase {}
+
+contract Ext1 is IExt1a, IExt1b, Base1 {}
+contract Ext2 is IExt2a, IExt2b, Base2 {}
+
+contract Impl is Ext1, Ext2 {
+    function foo() public view override (IBase, Base1, Base2) {}
+}
diff --git a/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine_abstract.sol b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine_abstract.sol
new file mode 100644
index 0000000000..1671c9d0dd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/override/override_multi_layered_fine_abstract.sol
@@ -0,0 +1,18 @@
+interface IBase {
+    function foo() external view;
+}
+
+contract Base1 is IBase { function foo() public virtual view {} }
+contract Base2 is IBase { function foo() public virtual view {} }
+
+interface IExt1a is IBase {}
+abstract contract IExt1b is IBase {}
+abstract contract IExt2a is IBase {}
+interface IExt2b is IBase {}
+
+contract Ext1 is IExt1a, IExt1b, Base1 {}
+contract Ext2 is IExt2a, IExt2b, Base2 {}
+
+contract Impl is Ext1, Ext2 {
+    function foo() public view override (IBase, Base1, Base2) {}
+}

From a2a5ca6fef965aeb872ac1b23ab3897c742cc169 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 8 Feb 2022 13:00:35 +0100
Subject: [PATCH 0377/1748] Add emscripten's mini-lz4.js.

---
 scripts/ci/mini-lz4.js | 345 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 345 insertions(+)
 create mode 100644 scripts/ci/mini-lz4.js

diff --git a/scripts/ci/mini-lz4.js b/scripts/ci/mini-lz4.js
new file mode 100644
index 0000000000..06514fec54
--- /dev/null
+++ b/scripts/ci/mini-lz4.js
@@ -0,0 +1,345 @@
+/*
+MiniLZ4: Minimal LZ4 block decoding and encoding.
+
+based off of node-lz4, https://github.com/pierrec/node-lz4
+
+====
+Copyright (c) 2012 Pierre Curto
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+====
+
+changes have the same license
+*/
+
+var MiniLZ4 = (function() {
+
+var exports = {};
+
+/**
+ * Decode a block. Assumptions: input contains all sequences of a 
+ * chunk, output is large enough to receive the decoded data.
+ * If the output buffer is too small, an error will be thrown.
+ * If the returned value is negative, an error occured at the returned offset.
+ *
+ * @param {ArrayBufferView} input input data
+ * @param {ArrayBufferView} output output data
+ * @param {number=} sIdx
+ * @param {number=} eIdx
+ * @return {number} number of decoded bytes
+ * @private
+ */
+exports.uncompress = function (input, output, sIdx, eIdx) {
+	sIdx = sIdx || 0
+	eIdx = eIdx || (input.length - sIdx)
+	// Process each sequence in the incoming data
+	for (var i = sIdx, n = eIdx, j = 0; i < n;) {
+		var token = input[i++]
+
+		// Literals
+		var literals_length = (token >> 4)
+		if (literals_length > 0) {
+			// length of literals
+			var l = literals_length + 240
+			while (l === 255) {
+				l = input[i++]
+				literals_length += l
+			}
+
+			// Copy the literals
+			var end = i + literals_length
+			while (i < end) output[j++] = input[i++]
+
+			// End of buffer?
+			if (i === n) return j
+		}
+
+		// Match copy
+		// 2 bytes offset (little endian)
+		var offset = input[i++] | (input[i++] << 8)
+
+		// XXX 0 is an invalid offset value
+		if (offset === 0) return j
+		if (offset > j) return -(i-2)
+
+		// length of match copy
+		var match_length = (token & 0xf)
+		var l = match_length + 240
+		while (l === 255) {
+			l = input[i++]
+			match_length += l
+		}
+
+		// Copy the match
+		var pos = j - offset // position of the match copy in the current output
+		var end = j + match_length + 4 // minmatch = 4
+		while (j < end) output[j++] = output[pos++]
+	}
+
+	return j
+}
+
+var
+	maxInputSize	= 0x7E000000
+,	minMatch		= 4
+// uint32() optimization
+,	hashLog			= 16
+,	hashShift		= (minMatch * 8) - hashLog
+,	hashSize		= 1 << hashLog
+
+,	copyLength		= 8
+,	lastLiterals	= 5
+,	mfLimit			= copyLength + minMatch
+,	skipStrength	= 6
+
+,	mlBits  		= 4
+,	mlMask  		= (1 << mlBits) - 1
+,	runBits 		= 8 - mlBits
+,	runMask 		= (1 << runBits) - 1
+
+,	hasher 			= /* XXX uint32( */ 2654435761 /* ) */
+
+assert(hashShift === 16);
+var hashTable = new Int16Array(1<<16);
+var empty = new Int16Array(hashTable.length);
+
+// CompressBound returns the maximum length of a lz4 block, given it's uncompressed length
+exports.compressBound = function (isize) {
+	return isize > maxInputSize
+		? 0
+		: (isize + (isize/255) + 16) | 0
+}
+
+/** @param {number=} sIdx
+	@param {number=} eIdx */
+exports.compress = function (src, dst, sIdx, eIdx) {
+	hashTable.set(empty);
+	return compressBlock(src, dst, 0, sIdx || 0, eIdx || dst.length)
+}
+
+function compressBlock (src, dst, pos, sIdx, eIdx) {
+	// XXX var Hash = uint32() // Reusable unsigned 32 bits integer
+	var dpos = sIdx
+	var dlen = eIdx - sIdx
+	var anchor = 0
+
+	if (src.length >= maxInputSize) throw new Error("input too large")
+
+	// Minimum of input bytes for compression (LZ4 specs)
+	if (src.length > mfLimit) {
+		var n = exports.compressBound(src.length)
+		if ( dlen < n ) throw Error("output too small: " + dlen + " < " + n)
+
+		var 
+			step  = 1
+		,	findMatchAttempts = (1 << skipStrength) + 3
+		// Keep last few bytes incompressible (LZ4 specs):
+		// last 5 bytes must be literals
+		,	srcLength = src.length - mfLimit
+
+		while (pos + minMatch < srcLength) {
+			// Find a match
+			// min match of 4 bytes aka sequence
+			var sequenceLowBits = src[pos+1]<<8 | src[pos]
+			var sequenceHighBits = src[pos+3]<<8 | src[pos+2]
+			// compute hash for the current sequence
+			var hash = Math.imul(sequenceLowBits | (sequenceHighBits << 16), hasher) >>> hashShift;
+			/* XXX Hash.fromBits(sequenceLowBits, sequenceHighBits)
+							.multiply(hasher)
+							.shiftr(hashShift)
+							.toNumber() */
+			// get the position of the sequence matching the hash
+			// NB. since 2 different sequences may have the same hash
+			// it is double-checked below
+			// do -1 to distinguish between initialized and uninitialized values
+			var ref = hashTable[hash] - 1
+			// save position of current sequence in hash table
+			hashTable[hash] = pos + 1
+
+			// first reference or within 64k limit or current sequence !== hashed one: no match
+			if ( ref < 0 ||
+				((pos - ref) >>> 16) > 0 ||
+				(
+					((src[ref+3]<<8 | src[ref+2]) != sequenceHighBits) ||
+					((src[ref+1]<<8 | src[ref]) != sequenceLowBits )
+				)
+			) {
+				// increase step if nothing found within limit
+				step = findMatchAttempts++ >> skipStrength
+				pos += step
+				continue
+			}
+
+			findMatchAttempts = (1 << skipStrength) + 3
+
+			// got a match
+			var literals_length = pos - anchor
+			var offset = pos - ref
+
+			// minMatch already verified
+			pos += minMatch
+			ref += minMatch
+
+			// move to the end of the match (>=minMatch)
+			var match_length = pos
+			while (pos < srcLength && src[pos] == src[ref]) {
+				pos++
+				ref++
+			}
+
+			// match length
+			match_length = pos - match_length
+
+			// token
+			var token = match_length < mlMask ? match_length : mlMask
+
+			// encode literals length
+			if (literals_length >= runMask) {
+				// add match length to the token
+				dst[dpos++] = (runMask << mlBits) + token
+				for (var len = literals_length - runMask; len > 254; len -= 255) {
+					dst[dpos++] = 255
+				}
+				dst[dpos++] = len
+			} else {
+				// add match length to the token
+				dst[dpos++] = (literals_length << mlBits) + token
+			}
+
+			// write literals
+			for (var i = 0; i < literals_length; i++) {
+				dst[dpos++] = src[anchor+i]
+			}
+
+			// encode offset
+			dst[dpos++] = offset
+			dst[dpos++] = (offset >> 8)
+
+			// encode match length
+			if (match_length >= mlMask) {
+				match_length -= mlMask
+				while (match_length >= 255) {
+					match_length -= 255
+					dst[dpos++] = 255
+				}
+
+				dst[dpos++] = match_length
+			}
+
+			anchor = pos
+		}
+	}
+
+	// cannot compress input
+	if (anchor == 0) return 0
+
+	// Write last literals
+	// encode literals length
+	literals_length = src.length - anchor
+	if (literals_length >= runMask) {
+		// add match length to the token
+		dst[dpos++] = (runMask << mlBits)
+		for (var ln = literals_length - runMask; ln > 254; ln -= 255) {
+			dst[dpos++] = 255
+		}
+		dst[dpos++] = ln
+	} else {
+		// add match length to the token
+		dst[dpos++] = (literals_length << mlBits)
+	}
+
+	// write literals
+	pos = anchor
+	while (pos < src.length) {
+		dst[dpos++] = src[pos++]
+	}
+
+	return dpos
+}
+
+exports.CHUNK_SIZE = 2048; // musl libc does readaheads of 1024 bytes, so a multiple of that is a good idea
+
+exports.compressPackage = function(data, verify) {
+  if (verify) {
+    var temp = new Uint8Array(exports.CHUNK_SIZE);
+  }
+  // compress the data in chunks
+  assert(data instanceof ArrayBuffer);
+  data = new Uint8Array(data);
+  console.log('compressing package of size ' + data.length);
+  var compressedChunks = [];
+  var successes = [];
+  var offset = 0;
+  var total = 0;
+  while (offset < data.length) {
+    var chunk = data.subarray(offset, offset + exports.CHUNK_SIZE);
+    //console.log('compress a chunk ' + [offset, total, data.length]);
+    offset += exports.CHUNK_SIZE;
+    var bound = exports.compressBound(chunk.length);
+    var compressed = new Uint8Array(bound);
+    var compressedSize = exports.compress(chunk, compressed);
+    if (compressedSize > 0) {
+      assert(compressedSize <= bound);
+      compressed = compressed.subarray(0, compressedSize);
+      compressedChunks.push(compressed);
+      total += compressedSize;
+      successes.push(1);
+      if (verify) {
+        var back = exports.uncompress(compressed, temp);
+        assert(back === chunk.length, [back, chunk.length]);
+        for (var i = 0; i < chunk.length; i++) {
+          assert(chunk[i] === temp[i]);
+        }
+      }
+    } else {
+      assert(compressedSize === 0);
+      // failure to compress :(
+      compressedChunks.push(chunk);
+      total += chunk.length; // last chunk may not be the full exports.CHUNK_SIZE size
+      successes.push(0);
+    }
+  }
+  data = null; // XXX null out pack['data'] too?
+  var compressedData = {
+    'data': new Uint8Array(total + exports.CHUNK_SIZE*2), // store all the compressed data, plus room for two cached decompressed chunk, in one fast array
+    'cachedOffset': total,
+    'cachedIndexes': [-1, -1], // cache last two blocks, so that reading 1,2,3 + preloading another block won't trigger decompress thrashing
+    'cachedChunks': [null, null],
+    'offsets': [], // chunk# => start in compressed data
+    'sizes': [],
+    'successes': successes, // 1 if chunk is compressed
+  };
+  offset = 0;
+  for (var i = 0; i < compressedChunks.length; i++) {
+    compressedData['data'].set(compressedChunks[i], offset);
+    compressedData['offsets'][i] = offset;
+    compressedData['sizes'][i] = compressedChunks[i].length
+    offset += compressedChunks[i].length;
+  }
+  console.log('compressed package into ' + [compressedData['data'].length]);
+  assert(offset === total);
+  return compressedData;
+};
+
+assert(exports.CHUNK_SIZE < (1 << 15)); // we use 16-bit ints as the type of the hash table, chunk size must be smaller
+
+return exports;
+
+})();
+

From a68183db3cbae850831aeb7a1ead96792345c27c Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 8 Feb 2022 13:17:21 +0100
Subject: [PATCH 0378/1748] Add base64DecToArr.js.

---
 scripts/ci/base64DecToArr.js | 47 ++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)
 create mode 100644 scripts/ci/base64DecToArr.js

diff --git a/scripts/ci/base64DecToArr.js b/scripts/ci/base64DecToArr.js
new file mode 100644
index 0000000000..afa24d9cfa
--- /dev/null
+++ b/scripts/ci/base64DecToArr.js
@@ -0,0 +1,47 @@
+/*\
+|*|
+|*|  Base64 / binary data / UTF-8 strings utilities
+|*|
+|*|  https://developer.mozilla.org/en-US/docs/Web/JavaScript/Base64_encoding_and_decoding
+|*|
+\*/
+
+/* Array of bytes to Base64 string decoding */
+
+function b64ToUint6 (nChr) {
+
+  return nChr > 64 && nChr < 91 ?
+      nChr - 65
+    : nChr > 96 && nChr < 123 ?
+      nChr - 71
+    : nChr > 47 && nChr < 58 ?
+      nChr + 4
+    : nChr === 43 ?
+      62
+    : nChr === 47 ?
+      63
+    :
+      0;
+
+}
+
+function base64DecToArr (sBase64, nBlocksSize) {
+
+  var
+    sB64Enc = sBase64.replace(/[^A-Za-z0-9\+\/]/g, ""), nInLen = sB64Enc.length,
+    nOutLen = nBlocksSize ? Math.ceil((nInLen * 3 + 1 >> 2) / nBlocksSize) * nBlocksSize : nInLen * 3 + 1 >> 2, taBytes = new Uint8Array(nOutLen);
+
+  for (var nMod3, nMod4, nUint24 = 0, nOutIdx = 0, nInIdx = 0; nInIdx < nInLen; nInIdx++) {
+    nMod4 = nInIdx & 3;
+    nUint24 |= b64ToUint6(sB64Enc.charCodeAt(nInIdx)) << 6 * (3 - nMod4);
+    if (nMod4 === 3 || nInLen - nInIdx === 1) {
+      for (nMod3 = 0; nMod3 < 3 && nOutIdx < nOutLen; nMod3++, nOutIdx++) {
+        taBytes[nOutIdx] = nUint24 >>> (16 >>> nMod3 & 24) & 255;
+      }
+      nUint24 = 0;
+
+    }
+  }
+
+  return taBytes;
+}

From 6895972d04e5cdff2cc09bba0e04d8f884452697 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 8 Feb 2022 13:16:20 +0100
Subject: [PATCH 0379/1748] Adjust mini-lz4.js and base64DecToArr.js.

---
 scripts/ci/base64DecToArr.js |   9 +-
 scripts/ci/mini-lz4.js       | 278 +++--------------------------------
 2 files changed, 28 insertions(+), 259 deletions(-)

diff --git a/scripts/ci/base64DecToArr.js b/scripts/ci/base64DecToArr.js
index afa24d9cfa..e1f4729bc9 100644
--- a/scripts/ci/base64DecToArr.js
+++ b/scripts/ci/base64DecToArr.js
@@ -1,3 +1,4 @@
+function base64DecToArr (sBase64) {
 /*\
 |*|
 |*|  Base64 / binary data / UTF-8 strings utilities
@@ -25,15 +26,13 @@ function b64ToUint6 (nChr) {
 
 }
 
-function base64DecToArr (sBase64, nBlocksSize) {
-
   var
-    sB64Enc = sBase64.replace(/[^A-Za-z0-9\+\/]/g, ""), nInLen = sB64Enc.length,
-    nOutLen = nBlocksSize ? Math.ceil((nInLen * 3 + 1 >> 2) / nBlocksSize) * nBlocksSize : nInLen * 3 + 1 >> 2, taBytes = new Uint8Array(nOutLen);
+    nInLen = sBase64.length,
+    nOutLen = nInLen * 3 + 1 >> 2, taBytes = new Uint8Array(nOutLen);
 
   for (var nMod3, nMod4, nUint24 = 0, nOutIdx = 0, nInIdx = 0; nInIdx < nInLen; nInIdx++) {
     nMod4 = nInIdx & 3;
-    nUint24 |= b64ToUint6(sB64Enc.charCodeAt(nInIdx)) << 6 * (3 - nMod4);
+    nUint24 |= b64ToUint6(sBase64.charCodeAt(nInIdx)) << 6 * (3 - nMod4);
     if (nMod4 === 3 || nInLen - nInIdx === 1) {
       for (nMod3 = 0; nMod3 < 3 && nOutIdx < nOutLen; nMod3++, nOutIdx++) {
         taBytes[nOutIdx] = nUint24 >>> (16 >>> nMod3 & 24) & 255;
diff --git a/scripts/ci/mini-lz4.js b/scripts/ci/mini-lz4.js
index 06514fec54..68a7eb9782 100644
--- a/scripts/ci/mini-lz4.js
+++ b/scripts/ci/mini-lz4.js
@@ -1,4 +1,7 @@
+function uncompress(source, uncompressedSize) {
 /*
+based off https://github.com/emscripten-core/emscripten/blob/main/third_party/mini-lz4.js
+====
 MiniLZ4: Minimal LZ4 block decoding and encoding.
 
 based off of node-lz4, https://github.com/pierrec/node-lz4
@@ -27,16 +30,11 @@ THE SOFTWARE.
 
 changes have the same license
 */
-
-var MiniLZ4 = (function() {
-
-var exports = {};
-
 /**
- * Decode a block. Assumptions: input contains all sequences of a 
+ * Decode a block. Assumptions: input contains all sequences of a
  * chunk, output is large enough to receive the decoded data.
  * If the output buffer is too small, an error will be thrown.
- * If the returned value is negative, an error occured at the returned offset.
+ * If the returned value is negative, an error occurred at the returned offset.
  *
  * @param {ArrayBufferView} input input data
  * @param {ArrayBufferView} output output data
@@ -45,7 +43,7 @@ var exports = {};
  * @return {number} number of decoded bytes
  * @private
  */
-exports.uncompress = function (input, output, sIdx, eIdx) {
+function uncompressBlock (input, output, sIdx, eIdx) {
 	sIdx = sIdx || 0
 	eIdx = eIdx || (input.length - sIdx)
 	// Process each sequence in the incoming data
@@ -85,7 +83,6 @@ exports.uncompress = function (input, output, sIdx, eIdx) {
 			l = input[i++]
 			match_length += l
 		}
-
 		// Copy the match
 		var pos = j - offset // position of the match copy in the current output
 		var end = j + match_length + 4 // minmatch = 4
@@ -94,252 +91,25 @@ exports.uncompress = function (input, output, sIdx, eIdx) {
 
 	return j
 }
-
-var
-	maxInputSize	= 0x7E000000
-,	minMatch		= 4
-// uint32() optimization
-,	hashLog			= 16
-,	hashShift		= (minMatch * 8) - hashLog
-,	hashSize		= 1 << hashLog
-
-,	copyLength		= 8
-,	lastLiterals	= 5
-,	mfLimit			= copyLength + minMatch
-,	skipStrength	= 6
-
-,	mlBits  		= 4
-,	mlMask  		= (1 << mlBits) - 1
-,	runBits 		= 8 - mlBits
-,	runMask 		= (1 << runBits) - 1
-
-,	hasher 			= /* XXX uint32( */ 2654435761 /* ) */
-
-assert(hashShift === 16);
-var hashTable = new Int16Array(1<<16);
-var empty = new Int16Array(hashTable.length);
-
-// CompressBound returns the maximum length of a lz4 block, given it's uncompressed length
-exports.compressBound = function (isize) {
-	return isize > maxInputSize
-		? 0
-		: (isize + (isize/255) + 16) | 0
-}
-
-/** @param {number=} sIdx
-	@param {number=} eIdx */
-exports.compress = function (src, dst, sIdx, eIdx) {
-	hashTable.set(empty);
-	return compressBlock(src, dst, 0, sIdx || 0, eIdx || dst.length)
-}
-
-function compressBlock (src, dst, pos, sIdx, eIdx) {
-	// XXX var Hash = uint32() // Reusable unsigned 32 bits integer
-	var dpos = sIdx
-	var dlen = eIdx - sIdx
-	var anchor = 0
-
-	if (src.length >= maxInputSize) throw new Error("input too large")
-
-	// Minimum of input bytes for compression (LZ4 specs)
-	if (src.length > mfLimit) {
-		var n = exports.compressBound(src.length)
-		if ( dlen < n ) throw Error("output too small: " + dlen + " < " + n)
-
-		var 
-			step  = 1
-		,	findMatchAttempts = (1 << skipStrength) + 3
-		// Keep last few bytes incompressible (LZ4 specs):
-		// last 5 bytes must be literals
-		,	srcLength = src.length - mfLimit
-
-		while (pos + minMatch < srcLength) {
-			// Find a match
-			// min match of 4 bytes aka sequence
-			var sequenceLowBits = src[pos+1]<<8 | src[pos]
-			var sequenceHighBits = src[pos+3]<<8 | src[pos+2]
-			// compute hash for the current sequence
-			var hash = Math.imul(sequenceLowBits | (sequenceHighBits << 16), hasher) >>> hashShift;
-			/* XXX Hash.fromBits(sequenceLowBits, sequenceHighBits)
-							.multiply(hasher)
-							.shiftr(hashShift)
-							.toNumber() */
-			// get the position of the sequence matching the hash
-			// NB. since 2 different sequences may have the same hash
-			// it is double-checked below
-			// do -1 to distinguish between initialized and uninitialized values
-			var ref = hashTable[hash] - 1
-			// save position of current sequence in hash table
-			hashTable[hash] = pos + 1
-
-			// first reference or within 64k limit or current sequence !== hashed one: no match
-			if ( ref < 0 ||
-				((pos - ref) >>> 16) > 0 ||
-				(
-					((src[ref+3]<<8 | src[ref+2]) != sequenceHighBits) ||
-					((src[ref+1]<<8 | src[ref]) != sequenceLowBits )
-				)
-			) {
-				// increase step if nothing found within limit
-				step = findMatchAttempts++ >> skipStrength
-				pos += step
-				continue
-			}
-
-			findMatchAttempts = (1 << skipStrength) + 3
-
-			// got a match
-			var literals_length = pos - anchor
-			var offset = pos - ref
-
-			// minMatch already verified
-			pos += minMatch
-			ref += minMatch
-
-			// move to the end of the match (>=minMatch)
-			var match_length = pos
-			while (pos < srcLength && src[pos] == src[ref]) {
-				pos++
-				ref++
-			}
-
-			// match length
-			match_length = pos - match_length
-
-			// token
-			var token = match_length < mlMask ? match_length : mlMask
-
-			// encode literals length
-			if (literals_length >= runMask) {
-				// add match length to the token
-				dst[dpos++] = (runMask << mlBits) + token
-				for (var len = literals_length - runMask; len > 254; len -= 255) {
-					dst[dpos++] = 255
-				}
-				dst[dpos++] = len
-			} else {
-				// add match length to the token
-				dst[dpos++] = (literals_length << mlBits) + token
-			}
-
-			// write literals
-			for (var i = 0; i < literals_length; i++) {
-				dst[dpos++] = src[anchor+i]
-			}
-
-			// encode offset
-			dst[dpos++] = offset
-			dst[dpos++] = (offset >> 8)
-
-			// encode match length
-			if (match_length >= mlMask) {
-				match_length -= mlMask
-				while (match_length >= 255) {
-					match_length -= 255
-					dst[dpos++] = 255
-				}
-
-				dst[dpos++] = match_length
-			}
-
-			anchor = pos
+var result = new ArrayBuffer(uncompressedSize);
+var sourceIndex = 0;
+var destIndex = 0;
+var blockSize;
+while((blockSize = (source[sourceIndex] | (source[sourceIndex + 1] << 8) | (source[sourceIndex + 2] << 16) | (source[sourceIndex + 3] << 24))) > 0)
+{
+	sourceIndex += 4;
+	if (blockSize & 0x80000000)
+	{
+		blockSize &= 0x7FFFFFFFF;
+		for (var i = 0; i < blockSize; i++) {
+			result[destIndex++] = source[sourceIndex++];
 		}
 	}
-
-	// cannot compress input
-	if (anchor == 0) return 0
-
-	// Write last literals
-	// encode literals length
-	literals_length = src.length - anchor
-	if (literals_length >= runMask) {
-		// add match length to the token
-		dst[dpos++] = (runMask << mlBits)
-		for (var ln = literals_length - runMask; ln > 254; ln -= 255) {
-			dst[dpos++] = 255
-		}
-		dst[dpos++] = ln
-	} else {
-		// add match length to the token
-		dst[dpos++] = (literals_length << mlBits)
-	}
-
-	// write literals
-	pos = anchor
-	while (pos < src.length) {
-		dst[dpos++] = src[pos++]
+	else
+	{
+		destIndex += uncompressBlock(source, new Uint8Array(result, destIndex, uncompressedSize - destIndex), sourceIndex, sourceIndex + blockSize);
+		sourceIndex += blockSize;
 	}
-
-	return dpos
 }
-
-exports.CHUNK_SIZE = 2048; // musl libc does readaheads of 1024 bytes, so a multiple of that is a good idea
-
-exports.compressPackage = function(data, verify) {
-  if (verify) {
-    var temp = new Uint8Array(exports.CHUNK_SIZE);
-  }
-  // compress the data in chunks
-  assert(data instanceof ArrayBuffer);
-  data = new Uint8Array(data);
-  console.log('compressing package of size ' + data.length);
-  var compressedChunks = [];
-  var successes = [];
-  var offset = 0;
-  var total = 0;
-  while (offset < data.length) {
-    var chunk = data.subarray(offset, offset + exports.CHUNK_SIZE);
-    //console.log('compress a chunk ' + [offset, total, data.length]);
-    offset += exports.CHUNK_SIZE;
-    var bound = exports.compressBound(chunk.length);
-    var compressed = new Uint8Array(bound);
-    var compressedSize = exports.compress(chunk, compressed);
-    if (compressedSize > 0) {
-      assert(compressedSize <= bound);
-      compressed = compressed.subarray(0, compressedSize);
-      compressedChunks.push(compressed);
-      total += compressedSize;
-      successes.push(1);
-      if (verify) {
-        var back = exports.uncompress(compressed, temp);
-        assert(back === chunk.length, [back, chunk.length]);
-        for (var i = 0; i < chunk.length; i++) {
-          assert(chunk[i] === temp[i]);
-        }
-      }
-    } else {
-      assert(compressedSize === 0);
-      // failure to compress :(
-      compressedChunks.push(chunk);
-      total += chunk.length; // last chunk may not be the full exports.CHUNK_SIZE size
-      successes.push(0);
-    }
-  }
-  data = null; // XXX null out pack['data'] too?
-  var compressedData = {
-    'data': new Uint8Array(total + exports.CHUNK_SIZE*2), // store all the compressed data, plus room for two cached decompressed chunk, in one fast array
-    'cachedOffset': total,
-    'cachedIndexes': [-1, -1], // cache last two blocks, so that reading 1,2,3 + preloading another block won't trigger decompress thrashing
-    'cachedChunks': [null, null],
-    'offsets': [], // chunk# => start in compressed data
-    'sizes': [],
-    'successes': successes, // 1 if chunk is compressed
-  };
-  offset = 0;
-  for (var i = 0; i < compressedChunks.length; i++) {
-    compressedData['data'].set(compressedChunks[i], offset);
-    compressedData['offsets'][i] = offset;
-    compressedData['sizes'][i] = compressedChunks[i].length
-    offset += compressedChunks[i].length;
-  }
-  console.log('compressed package into ' + [compressedData['data'].length]);
-  assert(offset === total);
-  return compressedData;
-};
-
-assert(exports.CHUNK_SIZE < (1 << 15)); // we use 16-bit ints as the type of the hash table, chunk size must be smaller
-
-return exports;
-
-})();
-
+return new Uint8Array(result, 0, uncompressedSize);
+}

From 3a201ec0f8f128fa2070e561905b04fd57ff34b6 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 9 Nov 2021 18:07:15 +0100
Subject: [PATCH 0380/1748] Build packed soljson.js.

---
 .circleci/config.yml            |  4 ++--
 cmake/EthCompilerSettings.cmake |  2 --
 cmake/templates/license.h.in    | 30 ++++++++++++++++++++++++++
 scripts/ci/build_emscripten.sh  |  6 ++++--
 scripts/ci/mini-lz4.js          |  1 +
 scripts/ci/pack_soljson.sh      | 37 +++++++++++++++++++++++++++++++++
 6 files changed, 74 insertions(+), 6 deletions(-)
 create mode 100755 scripts/ci/pack_soljson.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8cddc8793c..cbe3918734 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -982,10 +982,10 @@ jobs:
           command: |
             scripts/ci/build_emscripten.sh
       - store_artifacts:
-          path: emscripten_build/libsolc/soljson.js
+          path: upload/soljson.js
           destination: soljson.js
       - run: mkdir -p workspace
-      - run: cp emscripten_build/libsolc/soljson.js workspace/soljson.js
+      - run: cp upload/soljson.js workspace/soljson.js
       - run: scripts/get_version.sh > workspace/version.txt
       - persist_to_workspace:
           root: workspace
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 25c32f8896..7dceb677b8 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -142,8 +142,6 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s WASM=1")
 			# Set webassembly build to synchronous loading.
 			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s WASM_ASYNC_COMPILATION=0")
-			# Output a single js file with the wasm binary embedded as base64 string.
-			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s SINGLE_FILE=1")
 			# Allow new functions to be added to the wasm module via addFunction.
 			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s ALLOW_TABLE_GROWTH=1")
 			# Disable warnings about not being pure asm.js due to memory growth.
diff --git a/cmake/templates/license.h.in b/cmake/templates/license.h.in
index 6cdd2bb8a8..2d7f2691a8 100644
--- a/cmake/templates/license.h.in
+++ b/cmake/templates/license.h.in
@@ -137,6 +137,36 @@ evmc:
    See the License for the specific language governing permissions and
    limitations under the License.
 
+mini-lz4:
+  The file scripts/ci/mini-lz4.js is derived from the emscripten adaptation of
+  node-lz4 and licensed under the following terms:
+
+  Copyright (c) 2012 Pierre Curto
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
+
+base64:
+  The file scripts/ci/base64DecToArr.js is derived from a code example
+  in the MDN Web Docs, which permits use under CC0 terms:
+
+  Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/
+
 
 All other code is licensed under GPL version 3:
 
diff --git a/scripts/ci/build_emscripten.sh b/scripts/ci/build_emscripten.sh
index 7eac2486f8..55d2288c3d 100755
--- a/scripts/ci/build_emscripten.sh
+++ b/scripts/ci/build_emscripten.sh
@@ -40,6 +40,8 @@ else
 	BUILD_DIR="$1"
 fi
 
+apt-get update && apt-get install lz4
+
 WORKSPACE=/root/project
 
 cd $WORKSPACE
@@ -71,8 +73,8 @@ make soljson
 
 cd ..
 mkdir -p upload
-cp "$BUILD_DIR/libsolc/soljson.js" upload/
-cp "$BUILD_DIR/libsolc/soljson.js" ./
+scripts/ci/pack_soljson.sh "$BUILD_DIR/libsolc/soljson.js" "$BUILD_DIR/libsolc/soljson.wasm" upload/soljson.js
+cp upload/soljson.js ./
 
 OUTPUT_SIZE=$(ls -la soljson.js)
 
diff --git a/scripts/ci/mini-lz4.js b/scripts/ci/mini-lz4.js
index 68a7eb9782..767647003e 100644
--- a/scripts/ci/mini-lz4.js
+++ b/scripts/ci/mini-lz4.js
@@ -1,6 +1,7 @@
 function uncompress(source, uncompressedSize) {
 /*
 based off https://github.com/emscripten-core/emscripten/blob/main/third_party/mini-lz4.js
+The license only applies to the body of this function (``uncompress``).
 ====
 MiniLZ4: Minimal LZ4 block decoding and encoding.
 
diff --git a/scripts/ci/pack_soljson.sh b/scripts/ci/pack_soljson.sh
new file mode 100755
index 0000000000..75ef9e09b4
--- /dev/null
+++ b/scripts/ci/pack_soljson.sh
@@ -0,0 +1,37 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+script_dir="$(realpath "$(dirname "$0")")"
+soljson_js="$1"
+soljson_wasm="$2"
+soljson_wasm_size=$(wc -c "${soljson_wasm}" | cut -d ' ' -f 1)
+output="$3"
+
+(( $# == 3 )) || { >&2 echo "Usage: $0 soljson.js soljson.wasm packed_soljson.js"; exit 1; }
+
+# If this changes in an emscripten update, it's probably nothing to worry about,
+# but we should double-check when it happens and adjust the tail command below.
+[[ $(head -c 5 "${soljson_js}") == "null;" ]] || { >&2 echo 'Expected soljson.js to start with "null;"'; exit 1; }
+
+echo "Packing $soljson_js and $soljson_wasm to $output."
+(
+    echo -n 'var Module = Module || {}; Module["wasmBinary"] = '
+    echo -n '(function(source, uncompressedSize) {'
+    # Note that base64DecToArr assumes no trailing equals signs.
+    cpp "${script_dir}/base64DecToArr.js" | grep -v "^#.*"
+    # Note that mini-lz4.js assumes no file header and no frame crc checksums.
+    cpp "${script_dir}/mini-lz4.js" | grep -v "^#.*"
+    echo 'return uncompress(base64DecToArr(source), uncompressedSize);})('
+    echo -n '"'
+    # We fix lz4 format settings, remove the 8 bytes file header and remove the trailing equals signs of the base64 encoding.
+    lz4c --no-frame-crc --best --favor-decSpeed "${soljson_wasm}" - | tail -c +8 | base64 -w 0 | sed 's/[^A-Za-z0-9\+\/]//g'
+    echo '",'
+    echo -n "${soljson_wasm_size});"
+    # Remove "null;" from the js wrapper.
+    tail -c +6 "${soljson_js}"
+) > "$output"
+
+echo "Testing $output."
+echo "process.stdout.write(require('$(realpath "${output}")').wasmBinary)" | node | cmp "${soljson_wasm}" && echo "Binaries match."
+# Allow the wasm binary to be garbage collected after compilation.
+echo 'Module["wasmBinary"] = undefined;' >> "${output}"

From bf2556af83ec1fd0711ad4771c5a45978a74d4a4 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 14 Feb 2022 17:47:56 +0100
Subject: [PATCH 0381/1748] Minor changes to changelog.

---
 Changelog.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 364fe35d8b..eb801785f1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,8 +1,8 @@
 ### 0.8.12 (unreleased)
 
 Language Features:
- * General: Support ``ContractName.functionName`` for ``abi.encodeCall``, in addition to external function pointers.
  * General: Add equality-comparison operators for external function types.
+ * General: Support ``ContractName.functionName`` for ``abi.encodeCall``, in addition to external function pointers.
 
 
 Compiler Features:
@@ -14,8 +14,8 @@ Compiler Features:
 
 Bugfixes:
  * Antlr Grammar: Allow builtin names in ``yulPath`` to support ``.address`` in function pointers.
- * Code Generator: Fix ICE when accessing the members of external functions occupying more than two stack slots.
- * Code Generator: Fix ICE when doing an explicit conversion from ``string calldata`` to ``bytes``.
+ * Code Generator: Fix internal error when accessing the members of external functions occupying more than two stack slots.
+ * Code Generator: Fix internal error when doing an explicit conversion from ``string calldata`` to ``bytes``.
  * Control Flow Graph: Perform proper virtual lookup for modifiers for uninitialized variable and unreachable code analysis.
  * General: ``string.concat`` now properly takes strings as arguments and returns ``string memory``. It was accidentally introduced as a copy of ``bytes.concat`` before.
  * Immutables: Fix wrong error when the constructor of a base contract uses ``return`` and the derived contract contains immutable variables.
@@ -24,8 +24,8 @@ Bugfixes:
  * IR Generator: Add missing cleanup for indexed event arguments of value type.
  * IR Generator: Fix internal error when copying reference types in calldata and storage to struct or array members in memory.
  * IR Generator: Fix IR syntax error when copying storage arrays of structs containing functions.
- * Natspec: Fix ICE when overriding a struct getter with a Natspec-documented return value and the name in the struct is different.
- * TypeChecker: Fix ICE when a constant variable declaration forward references a struct.
+ * Natspec: Fix internal error when overriding a struct getter with a Natspec-documented return value and the name in the struct is different.
+ * Type Checker: Fix internal error when a constant variable declaration forward references a struct.
  * Yul EVM Code Transform: Improved stack shuffling in corner cases.
 
 Solc-Js:

From 04bcd01b0d7a8e9b59f609a6d183bbee6709bf9d Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 14 Feb 2022 17:49:07 +0100
Subject: [PATCH 0382/1748] Add Changelog entry about packed soljson.js.

---
 Changelog.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 364fe35d8b..8a6d5aa313 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -28,11 +28,16 @@ Bugfixes:
  * TypeChecker: Fix ICE when a constant variable declaration forward references a struct.
  * Yul EVM Code Transform: Improved stack shuffling in corner cases.
 
+
 Solc-Js:
  * The wrapper now requires at least nodejs v10.
  * The code has been ported to TypeScript.
 
 
+Build System:
+ * Emscripten builds store the embedded WebAssembly binary in LZ4 compressed format and transparently decompress on loading.
+
+
 ### 0.8.11 (2021-12-20)
 
 Language Features:

From 408b8e2f7681678cab03269bc39d81d5b45ef50b Mon Sep 17 00:00:00 2001
From: Aleksey Bykhun <theisease@gmail.com>
Date: Sat, 11 Dec 2021 16:44:27 +0800
Subject: [PATCH 0383/1748] docs: note on invalid SPDX `UNLICENSED`

https://github.com/ethereum/solidity/issues/12251
---
 docs/layout-of-source-files.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/layout-of-source-files.rst b/docs/layout-of-source-files.rst
index b3a27bf1ed..921211248b 100644
--- a/docs/layout-of-source-files.rst
+++ b/docs/layout-of-source-files.rst
@@ -27,6 +27,9 @@ it does include the supplied string in the :ref:`bytecode metadata <metadata>`.
 
 If you do not want to specify a license or if the source code is
 not open-source, please use the special value ``UNLICENSED``.
+Note that ``UNLICENSED`` (no usage allowed, not present in SPDX license list)
+is different from ``UNLICENSE`` (grants all rights to everyone).
+Solidity follows `the npm recommendation <https://docs.npmjs.com/cli/v7/configuring-npm/package-json#license>`_.
 
 Supplying this comment of course does not free you from other
 obligations related to licensing like having to mention

From 10a431a18b0c8092998b10f18ce394294d97de57 Mon Sep 17 00:00:00 2001
From: a3d4 <a3d4@pm.me>
Date: Tue, 8 Feb 2022 03:52:30 +0100
Subject: [PATCH 0384/1748] Enable asserts in MSVC RelWithDebInfo configuration

---
 cmake/EthCompilerSettings.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 7dceb677b8..8be5f0cbb9 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -151,8 +151,10 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 
 # The major alternative compiler to GCC/Clang is Microsoft's Visual C++ compiler, only available on Windows.
 elseif (DEFINED MSVC)
+	# Remove NDEBUG from RELWITHDEBINFO (to enable asserts)
+	string(REPLACE "/DNDEBUG" " " CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 
-    add_compile_options(/MP)						# enable parallel compilation
+	add_compile_options(/MP)						# enable parallel compilation
 	add_compile_options(/EHsc)						# specify Exception Handling Model in msvc
 	add_compile_options(/WX)						# enable warnings-as-errors
 	add_compile_options(/wd4068)					# disable unknown pragma warning (4068)

From c22f0ef9bbada54866aada341976469ee5432190 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 14 Feb 2022 20:26:32 +0100
Subject: [PATCH 0385/1748] Add comment

---
 cmake/EthCompilerSettings.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 8be5f0cbb9..ffa825446e 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -152,6 +152,7 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 # The major alternative compiler to GCC/Clang is Microsoft's Visual C++ compiler, only available on Windows.
 elseif (DEFINED MSVC)
 	# Remove NDEBUG from RELWITHDEBINFO (to enable asserts)
+	# CMAKE_CXX_FLAGS_RELWITHDEBINFO for GCC/Clang does not include NDEBUG
 	string(REPLACE "/DNDEBUG" " " CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 
 	add_compile_options(/MP)						# enable parallel compilation

From ccbc865beb938fc9bf6ffe7b23970e668df998b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 15 Feb 2022 12:43:30 +0100
Subject: [PATCH 0386/1748] elementfi: Bypass expiration check that won't pass
 due to test settings

---
 test/externalTests/elementfi.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index 3641eac2b4..37d5b74104 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -85,6 +85,10 @@ function elementfi_test
     sed -i 's|bytes32(uint256(pool))|bytes32(uint256(uint160(pool)))|g' vault/PoolRegistry.sol
     popd
 
+    # The test suite uses forked mainnet and an expiration period that's too short.
+    # TODO: Remove when https://github.com/element-fi/elf-contracts/issues/243 is fixed.
+    sed -i 's|^\s*require(_expiration - block\.timestamp < _unitSeconds);\s*$||g' contracts/ConvergentCurvePool.sol
+
     # Several tests fail unless we use the exact versions hard-coded in package-lock.json
     #neutralize_package_lock
 

From 9d9487077073c6a959a4933b88d8bd1187e90175 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Tue, 15 Feb 2022 19:17:05 -0500
Subject: [PATCH 0387/1748] Fix typos

---
 docs/style-guide.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 1bbe6cc740..a3d3f69a5e 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -8,7 +8,7 @@ Style Guide
 Introduction
 ************
 
-This guide is intended to provide coding conventions for writing solidity code.
+This guide is intended to provide coding conventions for writing Solidity code.
 This guide should be thought of as an evolving document that will change over
 time as useful conventions are found and old conventions are rendered obsolete.
 
@@ -20,7 +20,7 @@ taken from python's
 `pep8 style guide <https://www.python.org/dev/peps/pep-0008/>`_.
 
 The goal of this guide is *not* to be the right way or the best way to write
-solidity code.  The goal of this guide is *consistency*.  A quote from python's
+Solidity code.  The goal of this guide is *consistency*.  A quote from python's
 `pep8 <https://www.python.org/dev/peps/pep-0008/#a-foolish-consistency-is-the-hobgoblin-of-little-minds>`_
 captures this concept well.
 
@@ -28,7 +28,7 @@ captures this concept well.
 
     A style guide is about consistency. Consistency with this style guide is important. Consistency within a project is more important. Consistency within one module or function is most important.
 
-    But most importantly: **know when to be inconsistent** -- sometimes the style guide just doesn't apply. When in doubt, use your best judgement. Look at other examples and decide what looks best. And don't hesitate to ask!
+    But most importantly: **know when to be inconsistent** -- sometimes the style guide just doesn't apply. When in doubt, use your best judgment. Look at other examples and decide what looks best. And don't hesitate to ask!
 
 
 ***********
@@ -51,7 +51,7 @@ Mixing tabs and spaces should be avoided.
 Blank Lines
 ===========
 
-Surround top level declarations in solidity source with two blank lines.
+Surround top level declarations in Solidity source with two blank lines.
 
 Yes:
 
@@ -680,7 +680,7 @@ No:
     }
 
 For long function declarations, it is recommended to drop each argument onto
-it's own line at the same indentation level as the function body.  The closing
+its own line at the same indentation level as the function body.  The closing
 parenthesis and opening bracket should be placed on their own line as well at
 the same indentation level as the function declaration.
 
@@ -933,7 +933,7 @@ Permissible:
     function shortFunction() public { doSomething(); }
 
 These guidelines for function declarations are intended to improve readability.
-Authors should use their best judgement as this guide does not try to cover all
+Authors should use their best judgment as this guide does not try to cover all
 possible permutations for function declarations.
 
 Mappings
@@ -1023,7 +1023,7 @@ No:
 
 * Operators with a higher priority than others can exclude surrounding
   whitespace in order to denote precedence.  This is meant to allow for
-  improved readability for complex statement. You should always use the same
+  improved readability for complex statements. You should always use the same
   amount of whitespace on either side of an operator:
 
 Yes:

From e2d87c1bcc952d63f606ea646e3145eca43b21d2 Mon Sep 17 00:00:00 2001
From: Richie <devtooligan@gmail.com>
Date: Tue, 15 Feb 2022 19:35:11 -0800
Subject: [PATCH 0388/1748] tweak: expand definition of suggested collision
 naming convention

---
 docs/style-guide.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 1bbe6cc740..9138162ccf 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -1258,8 +1258,7 @@ Avoiding Naming Collisions
 
 * ``single_trailing_underscore_``
 
-This convention is suggested when the desired name collides with that of a
-built-in or otherwise reserved name.
+This convention is suggested when the desired name collides with that of an existing state variable, function, built-in or otherwise reserved name.
 
 .. _style_guide_natspec:
 

From 49bc8206f19c48bfef3a9082b92cdf8793776f06 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 16 Feb 2022 09:48:59 +0100
Subject: [PATCH 0389/1748] Set release date.

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 476dcd8ce9..643f0807a6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.12 (unreleased)
+### 0.8.12 (2022-02-16)
 
 Language Features:
  * General: Add equality-comparison operators for external function types.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 608ba3dfda..0aae3f1ac4 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1552,6 +1552,10 @@
         "bugs": [],
         "released": "2021-12-20"
     },
+    "0.8.12": {
+        "bugs": [],
+        "released": "2022-02-16"
+    },
     "0.8.2": {
         "bugs": [
             "SignedImmutables",

From 59f28d385a28facedc7d225a6427c88cd4f3b474 Mon Sep 17 00:00:00 2001
From: Sleepy <92123154+morphean-sec@users.noreply.github.com>
Date: Sat, 29 Jan 2022 11:39:40 +0300
Subject: [PATCH 0390/1748] Added solidity visual auditor for VSCode

---
 docs/resources.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/resources.rst b/docs/resources.rst
index a3b8d17e08..c70b35fbf8 100644
--- a/docs/resources.rst
+++ b/docs/resources.rst
@@ -82,6 +82,9 @@ Editor Integrations
     * `Visual Studio Code extension <https://juan.blanco.ws/solidity-contracts-in-visual-studio-code/>`_
         Solidity plugin for Microsoft Visual Studio Code that includes syntax highlighting and the Solidity compiler.
 
+    * `Solidity Visual Auditor extension <https://marketplace.visualstudio.com/items?itemName=tintinweb.solidity-visual-auditor>`_
+        Adds security centric syntax and semantic highlighting to Visual Studio Code.
+
 Solidity Tools
 ==============
 

From 8aa3b7fea0fe70b7486c547aa6b70fe0c70e8d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 16 Feb 2022 13:16:44 +0100
Subject: [PATCH 0391/1748] Neutralize packaged Uniswap contracts in
 yield-liquidator external test

---
 test/externalTests/yield-liquidator.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
index 1b5b9f1462..bf2ea93e22 100755
--- a/test/externalTests/yield-liquidator.sh
+++ b/test/externalTests/yield-liquidator.sh
@@ -67,6 +67,7 @@ function yield_liquidator_test
     npm install
 
     replace_version_pragmas
+    neutralize_packaged_contracts
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"

From 65ba798caf88ddd6fb4979695e4c180ad80cfb16 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 16 Feb 2022 16:12:18 +0100
Subject: [PATCH 0392/1748] Set version to 0.8.13

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99d7659809..fc7320c72d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.12")
+set(PROJECT_VERSION "0.8.13")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 643f0807a6..300bc0122d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,15 @@
+### 0.8.13 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
+
 ### 0.8.12 (2022-02-16)
 
 Language Features:

From 635ca409f85e44f05070a12cd11d755075bef2eb Mon Sep 17 00:00:00 2001
From: Richie <devtooligan@gmail.com>
Date: Wed, 16 Feb 2022 12:06:33 -0800
Subject: [PATCH 0393/1748] fix: shorten line length per code review

---
 docs/style-guide.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 9138162ccf..6efebafce1 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -1258,7 +1258,8 @@ Avoiding Naming Collisions
 
 * ``single_trailing_underscore_``
 
-This convention is suggested when the desired name collides with that of an existing state variable, function, built-in or otherwise reserved name.
+This convention is suggested when the desired name collides with that of
+an existing state variable, function, built-in or otherwise reserved name.
 
 .. _style_guide_natspec:
 

From 4ee7684afc9a01967a5f42eacfd0d365a58c5592 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 17 Feb 2022 09:39:54 +0100
Subject: [PATCH 0394/1748] Update PPA build script.

---
 scripts/release_ppa.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 725649f804..fe1efda27a 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -55,9 +55,9 @@ keyid=379F4801D622CDCF
 email=builds@ethereum.org
 packagename=solc
 
-static_build_distribution=hirsute
+static_build_distribution=impish
 
-DISTRIBUTIONS="focal hirsute impish jammy"
+DISTRIBUTIONS="focal impish jammy"
 
 if is_release
 then

From bf313444844407ad9614e5bc9f285c498834981a Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 17 Feb 2022 09:59:52 +0100
Subject: [PATCH 0395/1748] Add codeowners file.

---
 .github/CODEOWNERS | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 0000000000..1f6c29d6cd
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1 @@
+docs/style-guide.rst @fulldecent

From e9cc45b25886ab2fd023095b0607de777877d286 Mon Sep 17 00:00:00 2001
From: Wes Bouaziz <5843554+wesbz@users.noreply.github.com>
Date: Thu, 17 Feb 2022 10:57:28 +0100
Subject: [PATCH 0396/1748] Fixing a typo in doc's EVM dialect in Yul's doc.

It's the tiniest typo but it's visible on the website.
---
 docs/yul.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index 60a2da5b94..e4775ee4d0 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -768,7 +768,7 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | Instruction             |     |   | Explanation                                                     |
 +=========================+=====+===+=================================================================+
-| stop()                  + `-` | F | stop execution, identical to return(0, 0)                       |
+| stop()                  | `-` | F | stop execution, identical to return(0, 0)                       |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | add(x, y)               |     | F | x + y                                                           |
 +-------------------------+-----+---+-----------------------------------------------------------------+

From 175580fe90135b4449db057b8079756a6319e912 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 17 Feb 2022 16:52:36 +0100
Subject: [PATCH 0397/1748] Make error message less confusing

---
 libsolidity/analysis/ViewPureChecker.cpp               |  5 ++---
 .../syntaxTests/freeFunctions/free_mutability.sol      |  2 +-
 .../libsolidity/syntaxTests/multiSource/one_source.sol |  2 +-
 .../viewPureChecker/access_to_base_member_function.sol |  2 +-
 .../viewPureChecker/access_to_base_member_struct.sol   |  4 ++--
 .../viewPureChecker/access_to_base_members.sol         |  2 +-
 .../array/access_to_array_push_view.sol                |  2 +-
 .../viewPureChecker/builtin_functions_view_fail.sol    | 10 +++++-----
 .../viewPureChecker/call_internal_functions_fail.sol   |  2 +-
 .../syntaxTests/viewPureChecker/creation_view_fail.sol |  2 +-
 .../viewPureChecker/function_types_fail.sol            |  4 ++--
 .../viewPureChecker/gas_with_call_nonpayable.sol       |  4 ++--
 .../viewPureChecker/local_storage_variables_fail.sol   |  2 +-
 .../syntaxTests/viewPureChecker/modifiers_fail.sol     |  2 +-
 .../viewPureChecker/value_with_call_nonpayable.sol     |  4 ++--
 .../syntaxTests/viewPureChecker/write_storage_fail.sol |  2 +-
 16 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp
index 252210a129..3179a8eb70 100644
--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ b/libsolidity/analysis/ViewPureChecker.cpp
@@ -256,10 +256,9 @@ void ViewPureChecker::reportMutability(
 		m_errorReporter.typeError(
 			8961_error,
 			_location,
-			"Function declared as " +
+			"Function cannot be declared as " +
 			stateMutabilityToString(m_currentFunction->stateMutability()) +
-			", but this expression (potentially) modifies the state and thus "
-			"requires non-payable (the default) or payable."
+			" because this expression (potentially) modifies the state."
 		);
 		m_errors = true;
 	}
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol b/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol
index dafa91ccbc..9279ff1ebc 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_mutability.sol
@@ -5,4 +5,4 @@ function f() {
 function g(uint[] storage x) pure { x[0] = 1; }
 // ----
 // Warning 2018: (0-39): Function state mutability can be restricted to pure
-// TypeError 8961: (76-80): Function declared as pure, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (76-80): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/multiSource/one_source.sol b/test/libsolidity/syntaxTests/multiSource/one_source.sol
index 11ee497208..9c1d92eb51 100644
--- a/test/libsolidity/syntaxTests/multiSource/one_source.sol
+++ b/test/libsolidity/syntaxTests/multiSource/one_source.sol
@@ -4,4 +4,4 @@ contract A {
 	function f() public pure { x = 42; }
 }
 // ----
-// TypeError 8961: (SourceName:53-54): Function declared as pure, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (SourceName:53-54): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol
index 1b5a7ae503..0f434c7437 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_function.sol
@@ -8,4 +8,4 @@ contract B is A {
     }
 }
 // ----
-// TypeError 8961: (100-105): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (100-105): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol
index 612fbb745b..13d0ed9136 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_member_struct.sol
@@ -15,7 +15,7 @@ contract B is A {
     }
 }
 // ----
-// TypeError 8961: (107-110): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError 8961: (166-171): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (107-110): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (166-171): Function cannot be declared as view because this expression (potentially) modifies the state.
 // TypeError 2527: (244-247): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 2527: (244-249): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol
index e9dccaecdb..1203d2c670 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/access_to_base_members.sol
@@ -12,4 +12,4 @@ contract B is A {
 }
 // ----
 // TypeError 2527: (107-110): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (157-160): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (157-160): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol
index 3b7c19f5ee..27ba16eaf2 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/array/access_to_array_push_view.sol
@@ -5,4 +5,4 @@ contract A {
     }
 }
 // ----
-// TypeError 8961: (88-96): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (88-96): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
index 000f5b009b..76a05d8beb 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
@@ -20,8 +20,8 @@ contract C {
     }
 }
 // ----
-// TypeError 8961: (52-77): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError 8961: (132-153): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError 8961: (201-228): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError 8961: (293-323): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError 8961: (414-436): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (52-77): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (132-153): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (201-228): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (293-323): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (414-436): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol
index a47de539e7..38762a34a6 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/call_internal_functions_fail.sol
@@ -7,4 +7,4 @@ contract C {
 }
 // ----
 // TypeError 2527: (56-59): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (130-133): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (130-133): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol
index 643ba8b266..c934c90933 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/creation_view_fail.sol
@@ -3,4 +3,4 @@ contract C {
     function f() public view { new D(); }
 }
 // ----
-// TypeError 8961: (58-65): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (58-65): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol
index 47027331fc..f0ad5efcce 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/function_types_fail.sol
@@ -13,6 +13,6 @@ contract C {
     }
 }
 // ----
-// TypeError 8961: (92-103): Function declared as pure, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (92-103): Function cannot be declared as pure because this expression (potentially) modifies the state.
 // TypeError 2527: (193-202): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (289-300): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (289-300): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol b/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
index be8a5aeb89..65030cb307 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/gas_with_call_nonpayable.sol
@@ -8,5 +8,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 8961: (90-109): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError 8961: (180-197): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (90-109): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (180-197): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol
index 774dd44e5f..3b9054c41a 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/local_storage_variables_fail.sol
@@ -12,4 +12,4 @@ contract C {
 }
 // ----
 // TypeError 2527: (100-101): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (184-187): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (184-187): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol
index 3c592844a1..ad24e18277 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/modifiers_fail.sol
@@ -9,4 +9,4 @@ contract C is D {
 }
 // ----
 // TypeError 2527: (154-162): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (195-209): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (195-209): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol b/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
index af95cbe49e..cfb41d3204 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/value_with_call_nonpayable.sol
@@ -8,5 +8,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 8961: (90-111): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
-// TypeError 8961: (182-201): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (90-111): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (182-201): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol
index d6828aac68..c3875f411b 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/write_storage_fail.sol
@@ -3,4 +3,4 @@ contract C {
     function f() view public { x = 2; }
 }
 // ----
-// TypeError 8961: (56-57): Function declared as view, but this expression (potentially) modifies the state and thus requires non-payable (the default) or payable.
+// TypeError 8961: (56-57): Function cannot be declared as view because this expression (potentially) modifies the state.

From 0d28b8395a01fb41d3e3e6f692f504cc29e1bacb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 10 Feb 2022 16:17:51 +0100
Subject: [PATCH 0398/1748] storebytecode.sh: Update outdated script docstring.

---
 scripts/bytecodecompare/storebytecode.sh | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 3574fe6bfb..2192960e4b 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
 
 #------------------------------------------------------------------------------
-# Script used for cross-platform comparison as part of the travis automation.
-# Splits all test source code into multiple files, generates bytecode and
-# uploads the bytecode into github.com/ethereum/solidity-test-bytecode where
-# another travis job is triggered to do the actual comparison.
+# Script used for cross-platform comparison of the bytecode generated by the compiler.
+# Splits all test source code into multiple files, generates bytecode and metadata
+# for each file and combines it into a single report.txt file.
+#
+# The script is meant to be executed in CI on all supported platforms. All generated
+# reports must be identical for a given compiler version.
 #
 # ------------------------------------------------------------------------------
 # This file is part of solidity.

From 8d0f10c2fb173118be5c4f669d5df2a8dbf5087b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 10 Feb 2022 20:44:11 +0100
Subject: [PATCH 0399/1748] wasm-rebuild: Incorrect comment about script
 location

---
 scripts/wasm-rebuild/docker-scripts/rebuild_current.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh
index 41e554139e..fbe5a9d600 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_current.sh
@@ -45,7 +45,7 @@ set +e
 if [ -e scripts/ci/build_emscripten.sh ]; then
   scripts/ci/build_emscripten.sh
 else
-  # The script used to be in scripts/ci/ in earlier versions.
+  # The script used to be in scripts/travis-emscripten/ in earlier versions.
   scripts/travis-emscripten/build_emscripten.sh
 fi
 

From 076bc516c8683d3804522d4ce6184add4142c846 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 17 Feb 2022 21:41:17 +0100
Subject: [PATCH 0400/1748] wasm-rebuild: Upgrade packages to get newer SSL
 certificates required to be able to download boost over HTTPS

---
 scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index 6293d182b4..87c97095b2 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -213,7 +213,9 @@ ln -sf /emsdk_portable/emscripten/bin/* /usr/local/bin
 rm -rf /src
 ln -sf /root/project /src
 
+echo "Install dependencies and upgrade system packages."
 apt-get -qq update >/dev/null 2>&1
+apt-get -qq upgrade >/dev/null 2>&1
 apt-get -qq install cmake >/dev/null 2>&1
 
 echo "Create output directories."

From c38cc8b73625df2b957a65fb3e768f0ff198319d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 17 Feb 2022 21:40:18 +0100
Subject: [PATCH 0401/1748] wasm-rebuild: Revert solc-js changes - not needed
 because the script uses an old branch of solc-js

---
 scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index 87c97095b2..36831512f9 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -230,7 +230,6 @@ mkdir -p "${OUTPUTDIR}"/bin
 echo "Prepare solc-js."
 cd /root/solc-js
 npm install >/dev/null 2>&1
-npm run build >/dev/null 2>&1
 
 echo "Install semver helper."
 npm install -g semver >/dev/null 2>&1

From dda05655b0c8866be99da0783b6cf7f9eadf2d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 17 Feb 2022 23:01:58 +0100
Subject: [PATCH 0402/1748] wasm-rebuild: Patch storebytecode.sh from 0.6.1 not
 to use latest solc-js

---
 scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index 36831512f9..eeeed82079 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -196,6 +196,7 @@ cp scripts/bytecodecompare/storebytecode.sh /tmp
 # shellcheck disable=SC2016
 sed -i -e 's/rm -rf "\$TMPDIR"/cp "\$TMPDIR"\/report.txt \/tmp\/report.txt ; rm -rf "\$TMPDIR"/' /tmp/storebytecode.sh
 sed -i -e 's/REPO_ROOT=.*/REPO_ROOT=\/src/' /tmp/storebytecode.sh
+sed -i -e 's/git clone/git clone --branch '"${SOLC_JS_BRANCH}"'/' /tmp/storebytecode.sh
 export SOLC_EMSCRIPTEN="On"
 
 echo "Check out solc-js repository..."

From 42ac3b29b446e6c5e997185fe7137efe3cbbcee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 18 Feb 2022 14:46:25 +0100
Subject: [PATCH 0403/1748] wasm-rebuild: Update solc-bin URL

---
 scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index eeeed82079..b54c4ce02e 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -27,7 +27,7 @@ done
 SOLIDITY_REPO_URL="https://github.com/ethereum/solidity"
 SOLC_JS_REPO_URL="https://github.com/ethereum/solc-js"
 SOLC_JS_BRANCH=wasmRebuildTests
-RELEASE_URL="https://raw.githubusercontent.com/ethereum/solc-bin/gh-pages/bin"
+RELEASE_URL="https://binaries.soliditylang.org/bin"
 RELEASE_COMMIT_LIST_URL="$RELEASE_URL/list.txt"
 
 SCRIPTDIR=$(dirname "$0")

From 1f5407521a7980ffa77ce8ced89097987bdbf905 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 18 Feb 2022 14:45:38 +0100
Subject: [PATCH 0404/1748] wasm-rebuild: Print tags that will be processed

---
 scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
index b54c4ce02e..9ef9caaa8c 100755
--- a/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
+++ b/scripts/wasm-rebuild/docker-scripts/rebuild_tags.sh
@@ -240,6 +240,7 @@ wget -q "${RELEASE_COMMIT_LIST_URL}" -O /tmp/release_commit_list.txt
 
 cd /src
 TAGS=$(git tag --list "${TAG_FILTER}" | tac)
+echo "Matching tags: ${TAGS}"
 for TAG in ${TAGS}; do
   process_tag "${TAG}"
 done

From 28340038483a887afbaea9de370eef1b7644a5a5 Mon Sep 17 00:00:00 2001
From: Abdul Karim Moro <Abdul.moro4u@gmail.com>
Date: Sat, 19 Feb 2022 08:31:26 +0900
Subject: [PATCH 0405/1748] fixed grammar on doc.

If readers can gain additional pieces of  information on smart contracts, then  "more details" should be correct.
---
 docs/introduction-to-smart-contracts.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index fa2fa34c11..94188a0974 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -10,7 +10,7 @@ A Simple Smart Contract
 
 Let us begin with a basic example that sets the value of a variable and exposes
 it for other contracts to access. It is fine if you do not understand
-everything right now, we will go into more detail later.
+everything right now, we will go into more details later.
 
 Storage Example
 ===============

From 106921c278d9b78cb894fddae350728f744aaed4 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 27 Oct 2021 18:09:00 +0200
Subject: [PATCH 0406/1748] Extract external function part into its own
 function.

---
 libsolidity/codegen/ir/Common.cpp      |  8 ++++
 libsolidity/codegen/ir/Common.h        |  1 +
 libsolidity/codegen/ir/IRGenerator.cpp | 64 ++++++++++++++++----------
 libsolidity/codegen/ir/IRGenerator.h   |  3 ++
 4 files changed, 52 insertions(+), 24 deletions(-)

diff --git a/libsolidity/codegen/ir/Common.cpp b/libsolidity/codegen/ir/Common.cpp
index e75e5ef27b..8f73f57335 100644
--- a/libsolidity/codegen/ir/Common.cpp
+++ b/libsolidity/codegen/ir/Common.cpp
@@ -41,6 +41,14 @@ YulArity YulArity::fromType(FunctionType const& _functionType)
 	};
 }
 
+string IRNames::externalFunctionABIWrapper(Declaration const& _functionOrVarDecl)
+{
+	if (auto const* function = dynamic_cast<FunctionDefinition const*>(&_functionOrVarDecl))
+		solAssert(!function->isConstructor());
+
+	return "external_fun_" + _functionOrVarDecl.name() + "_" + to_string(_functionOrVarDecl.id());
+}
+
 string IRNames::function(FunctionDefinition const& _function)
 {
 	if (_function.isConstructor())
diff --git a/libsolidity/codegen/ir/Common.h b/libsolidity/codegen/ir/Common.h
index 3a860f8f1e..2484ad8091 100644
--- a/libsolidity/codegen/ir/Common.h
+++ b/libsolidity/codegen/ir/Common.h
@@ -49,6 +49,7 @@ struct YulArity
 
 struct IRNames
 {
+	static std::string externalFunctionABIWrapper(Declaration const& _functionOrVardecl);
 	static std::string function(FunctionDefinition const& _function);
 	static std::string function(VariableDeclaration const& _varDecl);
 	static std::string modifierInvocation(ModifierInvocation const& _modifierInvocation);
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index e361ada473..6b52010d99 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -735,6 +735,44 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 	});
 }
 
+string IRGenerator::generateExternalFunction(ContractDefinition const& _contract, FunctionType const& _functionType)
+{
+	string functionName = IRNames::externalFunctionABIWrapper(_functionType.declaration());
+	return m_context.functionCollector().createFunction(functionName, [&](vector<string>&, vector<string>&) -> string {
+		Whiskers t(R"X(
+			<callValueCheck>
+			<?+params>let <params> := </+params> <abiDecode>(4, calldatasize())
+			<?+retParams>let <retParams> := </+retParams> <function>(<params>)
+			let memPos := <allocateUnbounded>()
+			let memEnd := <abiEncode>(memPos <?+retParams>,</+retParams> <retParams>)
+			return(memPos, sub(memEnd, memPos))
+		)X");
+		t("callValueCheck", (_functionType.isPayable() || _contract.isLibrary()) ? "" : callValueCheck());
+
+		unsigned paramVars = make_shared<TupleType>(_functionType.parameterTypes())->sizeOnStack();
+		unsigned retVars = make_shared<TupleType>(_functionType.returnParameterTypes())->sizeOnStack();
+
+		ABIFunctions abiFunctions(m_evmVersion, m_context.revertStrings(), m_context.functionCollector());
+		t("abiDecode", abiFunctions.tupleDecoder(_functionType.parameterTypes()));
+		t("params",  suffixedVariableNameList("param_", 0, paramVars));
+		t("retParams",  suffixedVariableNameList("ret_", 0, retVars));
+
+		if (FunctionDefinition const* funDef = dynamic_cast<FunctionDefinition const*>(&_functionType.declaration()))
+		{
+			solAssert(!funDef->isConstructor());
+			t("function", m_context.enqueueFunctionForCodeGeneration(*funDef));
+		}
+		else if (VariableDeclaration const* varDecl = dynamic_cast<VariableDeclaration const*>(&_functionType.declaration()))
+			t("function", generateGetter(*varDecl));
+		else
+			solAssert(false, "Unexpected declaration for function!");
+
+		t("allocateUnbounded", m_utils.allocateUnboundedFunction());
+		t("abiEncode", abiFunctions.tupleEncoder(_functionType.returnParameterTypes(), _functionType.returnParameterTypes(), _contract.isLibrary()));
+		return t.render();
+	});
+}
+
 string IRGenerator::generateInitialAssignment(VariableDeclaration const& _varDecl)
 {
 	IRGeneratorForStatements generator(m_context, m_utils);
@@ -976,12 +1014,7 @@ string IRGenerator::dispatchRoutine(ContractDefinition const& _contract)
 			{
 				// <functionName>
 				<delegatecallCheck>
-				<callValueCheck>
-				<?+params>let <params> := </+params> <abiDecode>(4, calldatasize())
-				<?+retParams>let <retParams> := </+retParams> <function>(<params>)
-				let memPos := <allocateUnbounded>()
-				let memEnd := <abiEncode>(memPos <?+retParams>,</+retParams> <retParams>)
-				return(memPos, sub(memEnd, memPos))
+				<externalFunction>()
 			}
 			</cases>
 			default {}
@@ -1011,25 +1044,8 @@ string IRGenerator::dispatchRoutine(ContractDefinition const& _contract)
 					"() }";
 		}
 		templ["delegatecallCheck"] = delegatecallCheck;
-		templ["callValueCheck"] = (type->isPayable() || _contract.isLibrary()) ? "" : callValueCheck();
-
-		unsigned paramVars = make_shared<TupleType>(type->parameterTypes())->sizeOnStack();
-		unsigned retVars = make_shared<TupleType>(type->returnParameterTypes())->sizeOnStack();
-
-		ABIFunctions abiFunctions(m_evmVersion, m_context.revertStrings(), m_context.functionCollector());
-		templ["abiDecode"] = abiFunctions.tupleDecoder(type->parameterTypes());
-		templ["params"] = suffixedVariableNameList("param_", 0, paramVars);
-		templ["retParams"] = suffixedVariableNameList("ret_", 0, retVars);
-
-		if (FunctionDefinition const* funDef = dynamic_cast<FunctionDefinition const*>(&type->declaration()))
-			templ["function"] = m_context.enqueueFunctionForCodeGeneration(*funDef);
-		else if (VariableDeclaration const* varDecl = dynamic_cast<VariableDeclaration const*>(&type->declaration()))
-			templ["function"] = generateGetter(*varDecl);
-		else
-			solAssert(false, "Unexpected declaration for function!");
 
-		templ["allocateUnbounded"] = m_utils.allocateUnboundedFunction();
-		templ["abiEncode"] = abiFunctions.tupleEncoder(type->returnParameterTypes(), type->returnParameterTypes(), _contract.isLibrary());
+		templ["externalFunction"] = generateExternalFunction(_contract, *type);
 	}
 	t("cases", functions);
 	FunctionDefinition const* etherReceiver = _contract.receiveFunction();
diff --git a/libsolidity/codegen/ir/IRGenerator.h b/libsolidity/codegen/ir/IRGenerator.h
index 126f90046a..f89dc127aa 100644
--- a/libsolidity/codegen/ir/IRGenerator.h
+++ b/libsolidity/codegen/ir/IRGenerator.h
@@ -102,6 +102,9 @@ class IRGenerator
 	/// Generates a getter for the given declaration and returns its name
 	std::string generateGetter(VariableDeclaration const& _varDecl);
 
+	/// Generates the external part (ABI decoding and encoding) of a function or getter.
+	std::string generateExternalFunction(ContractDefinition const& _contract, FunctionType const& _functionType);
+
 	/// Generates code that assigns the initial value of the respective type.
 	std::string generateInitialAssignment(VariableDeclaration const& _varDecl);
 

From e9592c3f8e72bc130489a4ca291c3d36059a601e Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 15 Feb 2022 12:20:28 +0100
Subject: [PATCH 0407/1748] Update tests.

---
 .../output                                    |  18 +-
 .../output                                    |  18 +-
 .../output                                    |  18 +-
 .../debug_info_in_yul_snippet_escaping/output |  22 +-
 test/cmdlineTests/exp_base_literal/output     |  18 +-
 .../output                                    |  62 +-
 test/cmdlineTests/name_simplifier/output      |   4 +-
 test/cmdlineTests/revert_strings/output       |  18 +-
 .../output.json                               | 774 ++++++++----------
 .../output.json                               |  18 +-
 .../output.json                               |  18 +-
 .../output.json                               |  18 +-
 .../output.json                               | 424 +++++-----
 .../output.json                               |  24 +-
 .../standard_ir_requested/output.json         |  18 +-
 .../standard_viair_requested/output.json      |  18 +-
 test/cmdlineTests/viair_abicoder_v1/output    |  18 +-
 .../output                                    |  25 +-
 .../yul_string_format_ascii/output.json       |  18 +-
 .../output.json                               |  18 +-
 .../output.json                               |  18 +-
 .../yul_string_format_ascii_long/output.json  |  18 +-
 .../yul_string_format_hex/output.json         |  18 +-
 .../abi_encode_calldata_slice.sol             |   4 +-
 .../struct/struct_storage_ptr.sol             |   2 +-
 .../abi_encode_calldata_slice.sol             |   4 +-
 .../abiEncoderV2/abi_encode_v2.sol            |   2 +-
 ...2_in_function_inherited_in_v1_contract.sol |   2 +-
 .../abiEncoderV2/calldata_array.sol           |   2 +-
 .../abiEncoderV2/storage_array_encoding.sol   |   4 +-
 .../arrays_complex_from_and_to_storage.sol    |   2 +-
 .../array/bytes_length_member.sol             |   2 +-
 .../copying/array_copy_calldata_storage.sol   |   2 +-
 .../copying/array_copy_including_array.sol    |   4 +-
 .../array_copy_storage_storage_dyn_dyn.sol    |   2 +-
 .../array_nested_calldata_to_storage.sol      |   8 +-
 .../array_nested_memory_to_storage.sol        |   4 +-
 ...on_external_storage_to_storage_dynamic.sol |   2 +-
 ...o_storage_dynamic_different_mutability.sol |   2 +-
 .../array/copying/bytes_inside_mappings.sol   |   4 +-
 .../copy_byte_array_in_struct_to_storage.sol  |   4 +-
 .../copy_function_internal_storage_array.sol  |   2 +-
 .../array/copying/copy_removes_bytes_data.sol |   2 +-
 .../copying/copying_bytes_multiassign.sol     |   2 +-
 .../array/dynamic_array_cleanup.sol           |   2 +-
 .../array/dynamic_arrays_in_storage.sol       |   2 +-
 .../array/dynamic_multi_array_cleanup.sol     |   2 +-
 .../array/fixed_array_cleanup.sol             |   2 +-
 .../array/fixed_arrays_in_constructors.sol    |   2 +-
 .../array/function_array_cross_calls.sol      |   2 +-
 .../push/array_push_struct_from_calldata.sol  |   2 +-
 .../array/push/push_no_args_2d.sol            |   4 +-
 .../array/push/push_no_args_bytes.sol         |   2 +-
 .../semanticTests/array/reusing_memory.sol    |   2 +-
 .../copy_from_calldata_removes_bytes_data.sol |   2 +-
 .../constructor/arrays_in_constructors.sol    |   2 +-
 .../bytes_in_constructors_packer.sol          |   2 +-
 .../constructor_arguments_external.sol        |   2 +-
 .../constructor_static_array_argument.sol     |   2 +-
 .../constructor_inheritance_init_order.sol    |   2 +-
 .../constructor_inheritance_init_order_2.sol  |   2 +-
 ...ructor_with_params_diamond_inheritance.sol |   2 +-
 .../externalContracts/FixedFeeRegistrar.sol   |   2 +-
 .../externalContracts/deposit_contract.sol    |  10 +-
 .../externalContracts/prbmath_signed.sol      |   2 +-
 .../externalContracts/prbmath_unsigned.sol    |   2 +-
 .../externalContracts/ramanujan_pi.sol        |   2 +-
 .../externalContracts/strings.sol             |   4 +-
 ...ernal_call_to_nonexisting_debugstrings.sol |   2 +-
 .../functionCall/failed_create.sol            |   4 +-
 .../functionCall/gas_and_value_basic.sol      |   2 +-
 .../gas_and_value_brace_syntax.sol            |   2 +-
 .../mapping_array_internal_argument.sol       |   2 +-
 .../immutable/multi_creation.sol              |   2 +-
 .../semanticTests/immutable/use_scratch.sol   |   2 +-
 ...ted_function_calldata_memory_interface.sol |   2 +-
 .../inheritance/value_for_constructor.sol     |   2 +-
 .../salted_create_with_value.sol              |   2 +-
 .../semanticTests/smoke/constructor.sol       |   2 +-
 .../semanticTests/state/blockhash_basic.sol   |   2 +-
 ...ta_struct_with_nested_array_to_storage.sol |   2 +-
 .../conversion/recursive_storage_memory.sol   |   2 +-
 .../copy_struct_array_from_storage.sol        |   2 +-
 .../structs/memory_structs_nested_load.sol    |   2 +-
 ...truct_containing_bytes_copy_and_delete.sol |   2 +-
 .../semanticTests/structs/struct_copy.sol     |   4 +-
 .../struct_delete_storage_nested_small.sol    |   2 +-
 .../struct_delete_storage_with_array.sol      |   2 +-
 .../semanticTests/structs/structs.sol         |   2 +-
 .../userDefinedValueType/calldata.sol         |   2 +-
 .../userDefinedValueType/erc20.sol            |   2 +-
 .../semanticTests/various/address_code.sol    |   2 +-
 .../various/destructuring_assignment.sol      |   2 +-
 .../semanticTests/various/erc20.sol           |   2 +-
 .../skip_dynamic_types_for_structs.sol        |   2 +-
 .../various/staticcall_for_view_and_pure.sol  |   2 +-
 .../various/swap_in_storage_overwrite.sol     |   2 +-
 .../viaYul/array_memory_index_access.sol      |   2 +-
 .../viaYul/copy_struct_invalid_ir_bug.sol     |   2 +-
 99 files changed, 952 insertions(+), 859 deletions(-)

diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
index 1b90e94a31..7775ff69ca 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
@@ -108,12 +108,7 @@ object "C_6" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    fun_f_5()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_5()
                 }
 
                 default {}
@@ -150,6 +145,17 @@ object "C_6" {
 
             }
 
+            function external_fun_f_5() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                fun_f_5()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
index 86968e71b4..35f680d923 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
@@ -108,12 +108,7 @@ object "C_6" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    fun_f_5()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_5()
                 }
 
                 default {}
@@ -150,6 +145,17 @@ object "C_6" {
 
             }
 
+            function external_fun_f_5() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                fun_f_5()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
index 6a87b0b461..93fad04216 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
@@ -101,12 +101,7 @@ object "C_6" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    fun_f_5()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_5()
                 }
 
                 default {}
@@ -143,6 +138,17 @@ object "C_6" {
 
             }
 
+            function external_fun_f_5() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                fun_f_5()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
index ae3ee1735e..82a74384e7 100644
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
@@ -158,12 +158,7 @@ object "D_27" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f_26()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_26()
                 }
 
                 default {}
@@ -238,6 +233,17 @@ object "D_27" {
 
             }
 
+            function external_fun_f_26() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f_26()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
@@ -484,7 +490,7 @@ object "D_27" {
                             revert(pos, returndatasize())
                         }
                         mstore(add(allocate_memory_array_string(), 32), "/*")
-                        let memPtr := allocate_memory_array_string_480()
+                        let memPtr := allocate_memory_array_string_546()
                         mstore(add(memPtr, 32), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
                         mstore(add(memPtr, 64), shl(200, 0x2e2e2e22202a2f))
                         let memPos := mload(64)
@@ -525,7 +531,7 @@ object "D_27" {
                 memPtr := memPtr_1
                 mstore(memPtr_1, 2)
             }
-            function allocate_memory_array_string_480() -> memPtr
+            function allocate_memory_array_string_546() -> memPtr
             {
                 let memPtr_1 := mload(64)
                 let newFreePtr := add(memPtr_1, 96)
diff --git a/test/cmdlineTests/exp_base_literal/output b/test/cmdlineTests/exp_base_literal/output
index 77893da189..7b6e6e628d 100644
--- a/test/cmdlineTests/exp_base_literal/output
+++ b/test/cmdlineTests/exp_base_literal/output
@@ -53,12 +53,7 @@ object "C_81" {
                 {
                     // f(uint256,uint256,uint256,uint256)
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    let param_0, param_1, param_2, param_3 :=  abi_decode_tuple_t_uint256t_uint256t_uint256t_uint256(4, calldatasize())
-                    let ret_0, ret_1, ret_2, ret_3 :=  fun_f_80(param_0, param_1, param_2, param_3)
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_uint256_t_int256_t_uint256_t_uint256__to_t_uint256_t_int256_t_uint256_t_uint256__fromStack(memPos , ret_0, ret_1, ret_2, ret_3)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_80()
                 }
 
                 default {}
@@ -160,6 +155,17 @@ object "C_81" {
 
             }
 
+            function external_fun_f_80() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                let param_0, param_1, param_2, param_3 :=  abi_decode_tuple_t_uint256t_uint256t_uint256t_uint256(4, calldatasize())
+                let ret_0, ret_1, ret_2, ret_3 :=  fun_f_80(param_0, param_1, param_2, param_3)
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_uint256_t_int256_t_uint256_t_uint256__to_t_uint256_t_int256_t_uint256_t_uint256__fromStack(memPos , ret_0, ret_1, ret_2, ret_3)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/output b/test/cmdlineTests/inline_assembly_function_name_clash/output
index 00192f8f44..ef16b19902 100644
--- a/test/cmdlineTests/inline_assembly_function_name_clash/output
+++ b/test/cmdlineTests/inline_assembly_function_name_clash/output
@@ -7,157 +7,169 @@
             {
                 "abi_decode_tuple_":
                 {
-                    "entryPoint": 216,
+                    "entryPoint": 122,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
                 "abi_encode_t_uint256_to_t_uint256_fromStack":
                 {
-                    "entryPoint": 250,
+                    "entryPoint": 156,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
                 "abi_encode_tuple_t_uint256__to_t_uint256__fromStack":
                 {
-                    "entryPoint": 265,
+                    "entryPoint": 171,
                     "parameterSlots": 2,
                     "returnSlots": 1
                 },
                 "allocate_unbounded":
                 {
-                    "entryPoint": 196,
+                    "entryPoint": 102,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
                 "cleanup_t_uint256":
                 {
-                    "entryPoint": 240,
+                    "entryPoint": 146,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "convert_t_uint256_to_t_uint256":
                 {
-                    "entryPoint": 391,
+                    "entryPoint": 413,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
+                "external_fun_f_25":
+                {
+                    "entryPoint": 198,
+                    "parameterSlots": 0,
+                    "returnSlots": 0
+                },
+                "external_fun_g_36":
+                {
+                    "entryPoint": 256,
+                    "parameterSlots": 0,
+                    "returnSlots": 0
+                },
                 "fun_f_25":
                 {
-                    "entryPoint": 658,
+                    "entryPoint": 680,
                     "id": 25,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
                 "fun_f_25_inner":
                 {
-                    "entryPoint": 624,
+                    "entryPoint": 646,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "fun_g_36":
                 {
-                    "entryPoint": 874,
+                    "entryPoint": 896,
                     "id": 36,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
                 "fun_g_36_inner":
                 {
-                    "entryPoint": 840,
+                    "entryPoint": 862,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "identity":
                 {
-                    "entryPoint": 381,
+                    "entryPoint": 403,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "modifier_m_17":
                 {
-                    "entryPoint": 470,
+                    "entryPoint": 492,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "modifier_m_19":
                 {
-                    "entryPoint": 547,
+                    "entryPoint": 569,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "modifier_m_28":
                 {
-                    "entryPoint": 686,
+                    "entryPoint": 708,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "modifier_m_30":
                 {
-                    "entryPoint": 763,
+                    "entryPoint": 785,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "prepare_store_t_uint256":
                 {
-                    "entryPoint": 425,
+                    "entryPoint": 447,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74":
                 {
-                    "entryPoint": 292,
+                    "entryPoint": 314,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
                 "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb":
                 {
-                    "entryPoint": 206,
+                    "entryPoint": 112,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
                 "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
                 {
-                    "entryPoint": 211,
+                    "entryPoint": 117,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
                 "shift_left_0":
                 {
-                    "entryPoint": 302,
+                    "entryPoint": 324,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "shift_right_224_unsigned":
                 {
-                    "entryPoint": 183,
+                    "entryPoint": 89,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "update_byte_slice_32_shift_0":
                 {
-                    "entryPoint": 315,
+                    "entryPoint": 337,
                     "parameterSlots": 2,
                     "returnSlots": 1
                 },
                 "update_storage_value_offset_0t_uint256_to_t_uint256":
                 {
-                    "entryPoint": 435,
+                    "entryPoint": 457,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
                 "usr$f":
                 {
-                    "entryPoint": 493,
+                    "entryPoint": 515,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
                 "zero_value_for_split_t_uint256":
                 {
-                    "entryPoint": 297,
+                    "entryPoint": 319,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 }
diff --git a/test/cmdlineTests/name_simplifier/output b/test/cmdlineTests/name_simplifier/output
index 57a4cb594b..3dabe9c8d2 100644
--- a/test/cmdlineTests/name_simplifier/output
+++ b/test/cmdlineTests/name_simplifier/output
@@ -50,7 +50,7 @@ object "C_59" {
                         for { } lt(src, srcEnd) { src := add(src, _2) }
                         {
                             if slt(sub(calldatasize(), src), _2) { revert(_1, _1) }
-                            let value := allocate_memory_1172()
+                            let value := allocate_memory_1307()
                             mstore(value, calldataload(src))
                             mstore(dst, value)
                             dst := add(dst, _2)
@@ -68,7 +68,7 @@ object "C_59" {
                 mstore(4, 0x41)
                 revert(0, 0x24)
             }
-            function allocate_memory_1172() -> memPtr
+            function allocate_memory_1307() -> memPtr
             {
                 memPtr := mload(64)
                 let newFreePtr := add(memPtr, 32)
diff --git a/test/cmdlineTests/revert_strings/output b/test/cmdlineTests/revert_strings/output
index d13f9f4e5e..31b3db33b6 100644
--- a/test/cmdlineTests/revert_strings/output
+++ b/test/cmdlineTests/revert_strings/output
@@ -68,12 +68,7 @@ object "C_15" {
                 {
                     // f(uint256[][],uint8)
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    let param_0, param_1 :=  abi_decode_tuple_t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptrt_enum$_E_$3(4, calldatasize())
-                    fun_f_14(param_0, param_1)
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_14()
                 }
 
                 default {}
@@ -338,6 +333,17 @@ object "C_15" {
 
             }
 
+            function external_fun_f_14() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                let param_0, param_1 :=  abi_decode_tuple_t_array$_t_array$_t_uint256_$dyn_memory_ptr_$dyn_memory_ptrt_enum$_E_$3(4, calldatasize())
+                fun_f_14(param_0, param_1)
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
 
                 let start := allocate_unbounded()
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index 1c3999afcf..bb3083af91 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -78,194 +78,108 @@ stop
 sub_0: assembly {
         /* \"C\":79:428  contract C... */
       mstore(0x40, 0x80)
-      jumpi(tag_8, iszero(lt(calldatasize, 0x04)))
+      jumpi(tag_7, iszero(lt(calldatasize, 0x04)))
+    tag_8:
       0x00
       dup1
       revert
-    tag_8:
+    tag_7:
       0x00
       dup1
       calldataload
       0xe0
       shr
-      dup1
+      swap1
+      dup2
       0x26121ff0
       eq
-      tag_10
+      tag_9
       jumpi
+      pop
       dup1
       0x793816ec
       eq
-      tag_12
+      tag_11
       jumpi
       0x9942ec6f
       eq
-      tag_14
+      tag_13
       jumpi
-      pop
       0x00
       dup1
       revert
-    tag_14:
-      jumpi(tag_16, callvalue)
+    tag_13:
+      tag_8
+      tag_3
+      jump\t// in
+    tag_11:
       pop
-      tag_18
-      calldatasize
-      tag_1
+      tag_8
+      tag_2
       jump\t// in
-    tag_18:
+    tag_9:
+      swap1
+      pop
+      jumpi(tag_19, callvalue)
+      dup1
+      add(calldatasize, not(0x03))
+      slt
       tag_19
-        /* \"C\":375:378  int */
-      tag_20
-      tag_6
-      jump\t// in
-    tag_20:
+      jumpi
+      pop
+      0x20
+        /* \"C\":290:298  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+      sub(shl(0xff, 0x01), 0x2a)
+        /* \"C\":117:119  41 */
+      dup2
+      sgt
+      0x01
+      and
+      tag_21
+      jumpi
         /* \"C\":79:428  contract C... */
+    tag_22:
       mload(0x40)
+        /* \"C\":117:119  41 */
       swap1
+      0x29
+      add
+        /* \"C\":79:428  contract C... */
       dup2
       mstore
-      swap1
-      dup2
-      swap1
-      0x20
-      dup3
-      add
-      swap1
-      jump
-    tag_19:
-      sub
-      swap1
       return
-    tag_16:
+        /* \"C\":117:119  41 */
+    tag_21:
+      tag_23
+      tag_4
+      jump\t// in
+    tag_23:
+      jump(tag_22)
+        /* \"C\":79:428  contract C... */
+    tag_19:
       dup1
       revert
-    tag_12:
+    tag_2:
       pop
-      jumpi(tag_16, callvalue)
-      tag_19
-      swap1
-      tag_24
-      calldatasize
-      tag_1
-      jump\t// in
-    tag_24:
-      sload
+      jumpi(tag_8, callvalue)
+      jumpi(tag_8, slt(add(not(0x03), calldatasize), 0x00))
+      0x20
+      sload(0x00)
       mload(0x40)
       swap1
       dup2
       mstore
-      swap1
-      dup2
-      swap1
-      0x20
-      dup3
-      add
-      swap1
-      jump
-    tag_10:
-      pop
-      jumpi(tag_16, callvalue)
-      pop
-      tag_27
-      calldatasize
-      tag_1
-      jump\t// in
-    tag_27:
-      tag_19
-        /* \"C\":279:298  constVar + immutVar */
-      tag_20
-        /* \"C\":290:298  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":279:298  constVar + immutVar */
-      tag_4
-      jump\t// in
-        /* \"C\":79:428  contract C... */
-    tag_1:
-      0x00
-      swap1
-      not(0x03)
-      add
-      slt
-      tag_30
-      jumpi
-      jump\t// out
-    tag_30:
-      pop
-      0x00
-      dup1
-      revert
-        /* \"C\":117:119  41 */
+      return
     tag_3:
       pop
-      mstore(0x00, shl(0xe0, 0x4e487b71))
-      mstore(0x04, 0x11)
-      revert(0x00, 0x24)
-    tag_4:
-      sub(shl(0xff, 0x01), 0x2a)
-      dup2
-      sgt
-      0x01
-      and
-      tag_32
-      jumpi
-    tag_33:
-      0x29
-      add
-      swap1
-      jump\t// out
-    tag_32:
-      tag_34
-      tag_3
-      jump\t// in
-    tag_34:
-      jump(tag_33)
-    tag_5:
+      jumpi(tag_8, callvalue)
       0x00
-      dup2
-      slt
       dup1
-      iszero
-      sub(shl(0xff, 0x01), 0x01)
-      dup4
-      swap1
-      sub
-      dup5
-      sgt
-      and
-      tag_35
-      jumpi
-    tag_36:
-      shl(0xff, 0x01)
-      dup3
-      swap1
-      sub
-      dup4
+      add(calldatasize, not(0x03))
       slt
-      and
-      tag_37
+      tag_19
       jumpi
-      add
-      swap1
-      jump\t// out
-    tag_37:
-      tag_39
-      tag_3
-      jump\t// in
-    tag_39:
-      add
-      swap1
-      jump\t// out
-    tag_35:
-      tag_40
-      tag_3
-      jump\t// in
-    tag_40:
-      jump(tag_36)
-        /* \"C\":304:341  modifier m()... */
-    tag_6:
-        /* \"C\":79:428  contract C... */
-      0x00
       dup1
       sload
         /* \"C\":117:119  41 */
@@ -275,11 +189,9 @@ sub_0: assembly {
         /* \"C\":79:428  contract C... */
       dup2
       eq
-      tag_41
+      tag_32
       jumpi
-        /* \"C\":304:341  modifier m()... */
-    tag_42:
-        /* \"C\":79:428  contract C... */
+    tag_33:
       add
       swap1
       dup2
@@ -293,7 +205,7 @@ sub_0: assembly {
       0x20
         /* \"C\":403:407  this */
       dup2
-        /* \"C\":403:411  this.f() */
+        /* \"C\":79:428  contract C... */
       0x04
         /* \"C\":403:407  this */
       dup2
@@ -304,38 +216,55 @@ sub_0: assembly {
       swap2
       dup3
       iszero
-      tag_43
+      tag_34
       jumpi
       dup1
       swap3
-      tag_45
+      tag_36
       jumpi
-        /* \"C\":304:341  modifier m()... */
-    tag_46:
+        /* \"C\":79:428  contract C... */
+    tag_37:
         /* \"C\":392:411  stateVar + this.f() */
       pop
       pop
-      tag_47
-      swap1
+      tag_38
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_48
+      tag_39
         /* \"C\":392:411  stateVar + this.f() */
-      swap3
+      swap2
+        /* \"C\":79:428  contract C... */
+      tag_40
+        /* \"C\":392:411  stateVar + this.f() */
+      swap4
       tag_5
       jump\t// in
-    tag_47:
+    tag_38:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       swap1
       tag_5
       jump\t// in
-    tag_48:
-        /* \"C\":304:341  modifier m()... */
+    tag_39:
+        /* \"C\":79:428  contract C... */
+      mload(0x40)
       swap1
-      jump\t// out
+      dup2
+      mstore
+      swap1
+      dup2
+      swap1
+      0x20
+      dup3
+      add
+      swap1
+      jump
+    tag_40:
+      sub
+      swap1
+      return
         /* \"C\":403:411  this.f() */
-    tag_45:
+    tag_36:
         /* \"C\":79:428  contract C... */
       swap1
       swap2
@@ -357,20 +286,21 @@ sub_0: assembly {
       dup4
       lt
       or
-      tag_49
+      tag_41
       jumpi
       pop
-      swap2
-        /* \"C\":403:411  this.f() */
-      tag_51
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_47
-        /* \"C\":79:428  contract C... */
+      tag_40
       swap3
+        /* \"C\":403:411  this.f() */
+      tag_43
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_48
+      tag_39
+        /* \"C\":79:428  contract C... */
+      swap4
+        /* \"C\":392:411  stateVar + this.f() */
+      tag_38
         /* \"C\":79:428  contract C... */
-      swap5
+      swap4
       0x40
       mstore
         /* \"C\":403:411  this.f() */
@@ -378,39 +308,30 @@ sub_0: assembly {
       dup2
       add
       swap1
-      tag_7
+      tag_6
       jump\t// in
-    tag_51:
-      swap2
-      dup2
-      swap4
+    tag_43:
+      swap3
       pop
-      jump(tag_46)
+      swap3
+      jump(tag_37)
         /* \"C\":79:428  contract C... */
-    tag_49:
+    tag_41:
       shl(0xe0, 0x4e487b71)
       dup2
       mstore
-      0x41
-        /* \"C\":403:411  this.f() */
-      0x04
-        /* \"C\":79:428  contract C... */
-      mstore
+      mstore(0x04, 0x41)
       0x24
-      swap5
-      pop
-        /* \"C\":117:119  41 */
-      swap3
+      swap4
       pop
+      swap2
       pop
       pop
-        /* \"C\":79:428  contract C... */
       revert
         /* \"C\":403:411  this.f() */
-    tag_43:
+    tag_34:
         /* \"C\":79:428  contract C... */
-      swap4
-      pop
+      swap3
       pop
       pop
       pop
@@ -423,31 +344,84 @@ sub_0: assembly {
       returndatasize
       swap1
       revert
-    tag_41:
-      tag_52
-      tag_3
+    tag_32:
+      tag_44
+      tag_4
       jump\t// in
-    tag_52:
-      jump(tag_42)
-    tag_7:
-      swap1
-      dup2
-      0x20
-      swap2
-      sub
-      slt
-      tag_53
-      jumpi
-      mload
-      swap1
-      jump\t// out
-    tag_53:
-      pop
+    tag_44:
+      jump(tag_33)
+        /* \"C\":117:119  41 */
+    tag_4:
       pop
+        /* \"C\":79:428  contract C... */
+      shl(0xe0, 0x4e487b71)
+        /* \"C\":117:119  41 */
+      0x00
+      mstore
+      mstore(0x04, 0x11)
+      revert(0x00, 0x24)
+    tag_5:
       0x00
+      dup2
+      slt
       dup1
-      revert
-
+      iszero
+      sub(shl(0xff, 0x01), 0x01)
+      dup4
+      swap1
+      sub
+      dup5
+      sgt
+      and
+      tag_45
+      jumpi
+    tag_46:
+      shl(0xff, 0x01)
+      dup3
+      swap1
+      sub
+      dup4
+      slt
+      and
+      tag_47
+      jumpi
+      add
+      swap1
+      jump\t// out
+    tag_47:
+      tag_49
+      tag_4
+      jump\t// in
+    tag_49:
+      add
+      swap1
+      jump\t// out
+    tag_45:
+      tag_50
+      tag_4
+      jump\t// in
+    tag_50:
+      jump(tag_46)
+        /* \"C\":79:428  contract C... */
+    tag_6:
+      swap1
+      dup2
+      0x20
+      swap2
+      sub
+      slt
+      tag_51
+      jumpi
+      mload
+      swap1
+      jump\t// out
+    tag_51:
+      pop
+      pop
+      0x00
+      dup1
+      revert
+
     auxdata: <AUXDATA REMOVED>
 }
 "}}},"D":{"D":{"evm":{"assembly":"    /* \"D\":91:166  contract D is C(3)... */
@@ -571,194 +545,108 @@ stop
 sub_0: assembly {
         /* \"D\":91:166  contract D is C(3)... */
       mstore(0x40, 0x80)
-      jumpi(tag_8, iszero(lt(calldatasize, 0x04)))
+      jumpi(tag_7, iszero(lt(calldatasize, 0x04)))
+    tag_8:
       0x00
       dup1
       revert
-    tag_8:
+    tag_7:
       0x00
       dup1
       calldataload
       0xe0
       shr
-      dup1
+      swap1
+      dup2
       0x26121ff0
       eq
-      tag_10
+      tag_9
       jumpi
+      pop
       dup1
       0x793816ec
       eq
-      tag_12
+      tag_11
       jumpi
       0x9942ec6f
       eq
-      tag_14
+      tag_13
       jumpi
-      pop
       0x00
       dup1
       revert
-    tag_14:
-      jumpi(tag_16, callvalue)
+    tag_13:
+      tag_8
+      tag_3
+      jump\t// in
+    tag_11:
       pop
-      tag_18
-      calldatasize
-      tag_1
+      tag_8
+      tag_2
       jump\t// in
-    tag_18:
+    tag_9:
+      swap1
+      pop
+      jumpi(tag_19, callvalue)
+      dup1
+      add(calldatasize, not(0x03))
+      slt
       tag_19
-        /* \"C\":375:378  int */
-      tag_20
-      tag_6
-      jump\t// in
-    tag_20:
+      jumpi
+      pop
+      0x20
+        /* \"C\":290:298  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+      sub(shl(0xff, 0x01), 0x2a)
+        /* \"C\":117:119  41 */
+      dup2
+      sgt
+      0x01
+      and
+      tag_21
+      jumpi
         /* \"D\":91:166  contract D is C(3)... */
+    tag_22:
       mload(0x40)
+        /* \"C\":117:119  41 */
       swap1
+      0x29
+      add
+        /* \"D\":91:166  contract D is C(3)... */
       dup2
       mstore
-      swap1
-      dup2
-      swap1
-      0x20
-      dup3
-      add
-      swap1
-      jump
-    tag_19:
-      sub
-      swap1
       return
-    tag_16:
+        /* \"C\":117:119  41 */
+    tag_21:
+      tag_23
+      tag_4
+      jump\t// in
+    tag_23:
+      jump(tag_22)
+        /* \"D\":91:166  contract D is C(3)... */
+    tag_19:
       dup1
       revert
-    tag_12:
+    tag_2:
       pop
-      jumpi(tag_16, callvalue)
-      tag_19
-      swap1
-      tag_24
-      calldatasize
-      tag_1
-      jump\t// in
-    tag_24:
-      sload
+      jumpi(tag_8, callvalue)
+      jumpi(tag_8, slt(add(not(0x03), calldatasize), 0x00))
+      0x20
+      sload(0x00)
       mload(0x40)
       swap1
       dup2
       mstore
-      swap1
-      dup2
-      swap1
-      0x20
-      dup3
-      add
-      swap1
-      jump
-    tag_10:
-      pop
-      jumpi(tag_16, callvalue)
-      pop
-      tag_27
-      calldatasize
-      tag_1
-      jump\t// in
-    tag_27:
-      tag_19
-        /* \"C\":279:298  constVar + immutVar */
-      tag_20
-        /* \"C\":290:298  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-        /* \"C\":279:298  constVar + immutVar */
-      tag_4
-      jump\t// in
-        /* \"D\":91:166  contract D is C(3)... */
-    tag_1:
-      0x00
-      swap1
-      not(0x03)
-      add
-      slt
-      tag_30
-      jumpi
-      jump\t// out
-    tag_30:
-      pop
-      0x00
-      dup1
-      revert
-        /* \"C\":117:119  41 */
+      return
     tag_3:
       pop
-      mstore(0x00, shl(0xe0, 0x4e487b71))
-      mstore(0x04, 0x11)
-      revert(0x00, 0x24)
-    tag_4:
-      sub(shl(0xff, 0x01), 0x2a)
-      dup2
-      sgt
-      0x01
-      and
-      tag_32
-      jumpi
-    tag_33:
-      0x29
-      add
-      swap1
-      jump\t// out
-    tag_32:
-      tag_34
-      tag_3
-      jump\t// in
-    tag_34:
-      jump(tag_33)
-    tag_5:
+      jumpi(tag_8, callvalue)
       0x00
-      dup2
-      slt
       dup1
-      iszero
-      sub(shl(0xff, 0x01), 0x01)
-      dup4
-      swap1
-      sub
-      dup5
-      sgt
-      and
-      tag_35
-      jumpi
-    tag_36:
-      shl(0xff, 0x01)
-      dup3
-      swap1
-      sub
-      dup4
+      add(calldatasize, not(0x03))
       slt
-      and
-      tag_37
+      tag_19
       jumpi
-      add
-      swap1
-      jump\t// out
-    tag_37:
-      tag_39
-      tag_3
-      jump\t// in
-    tag_39:
-      add
-      swap1
-      jump\t// out
-    tag_35:
-      tag_40
-      tag_3
-      jump\t// in
-    tag_40:
-      jump(tag_36)
-        /* \"C\":304:341  modifier m()... */
-    tag_6:
-        /* \"D\":91:166  contract D is C(3)... */
-      0x00
       dup1
       sload
         /* \"C\":117:119  41 */
@@ -768,11 +656,9 @@ sub_0: assembly {
         /* \"D\":91:166  contract D is C(3)... */
       dup2
       eq
-      tag_41
+      tag_32
       jumpi
-        /* \"C\":304:341  modifier m()... */
-    tag_42:
-        /* \"D\":91:166  contract D is C(3)... */
+    tag_33:
       add
       swap1
       dup2
@@ -786,7 +672,7 @@ sub_0: assembly {
       0x20
         /* \"C\":403:407  this */
       dup2
-        /* \"C\":403:411  this.f() */
+        /* \"D\":91:166  contract D is C(3)... */
       0x04
         /* \"C\":403:407  this */
       dup2
@@ -797,38 +683,55 @@ sub_0: assembly {
       swap2
       dup3
       iszero
-      tag_43
+      tag_34
       jumpi
       dup1
       swap3
-      tag_45
+      tag_36
       jumpi
-        /* \"C\":304:341  modifier m()... */
-    tag_46:
+        /* \"D\":91:166  contract D is C(3)... */
+    tag_37:
         /* \"C\":392:411  stateVar + this.f() */
       pop
       pop
-      tag_47
-      swap1
+      tag_38
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_48
+      tag_39
         /* \"C\":392:411  stateVar + this.f() */
-      swap3
+      swap2
+        /* \"D\":91:166  contract D is C(3)... */
+      tag_40
+        /* \"C\":392:411  stateVar + this.f() */
+      swap4
       tag_5
       jump\t// in
-    tag_47:
+    tag_38:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       swap1
       tag_5
       jump\t// in
-    tag_48:
-        /* \"C\":304:341  modifier m()... */
+    tag_39:
+        /* \"D\":91:166  contract D is C(3)... */
+      mload(0x40)
       swap1
-      jump\t// out
+      dup2
+      mstore
+      swap1
+      dup2
+      swap1
+      0x20
+      dup3
+      add
+      swap1
+      jump
+    tag_40:
+      sub
+      swap1
+      return
         /* \"C\":403:411  this.f() */
-    tag_45:
+    tag_36:
         /* \"D\":91:166  contract D is C(3)... */
       swap1
       swap2
@@ -850,20 +753,21 @@ sub_0: assembly {
       dup4
       lt
       or
-      tag_49
+      tag_41
       jumpi
       pop
-      swap2
-        /* \"C\":403:411  this.f() */
-      tag_51
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_47
-        /* \"D\":91:166  contract D is C(3)... */
+      tag_40
       swap3
+        /* \"C\":403:411  this.f() */
+      tag_43
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_48
+      tag_39
         /* \"D\":91:166  contract D is C(3)... */
-      swap5
+      swap4
+        /* \"C\":392:411  stateVar + this.f() */
+      tag_38
+        /* \"D\":91:166  contract D is C(3)... */
+      swap4
       0x40
       mstore
         /* \"C\":403:411  this.f() */
@@ -871,39 +775,30 @@ sub_0: assembly {
       dup2
       add
       swap1
-      tag_7
+      tag_6
       jump\t// in
-    tag_51:
-      swap2
-      dup2
-      swap4
+    tag_43:
+      swap3
       pop
-      jump(tag_46)
+      swap3
+      jump(tag_37)
         /* \"D\":91:166  contract D is C(3)... */
-    tag_49:
+    tag_41:
       shl(0xe0, 0x4e487b71)
       dup2
       mstore
-      0x41
-        /* \"C\":403:411  this.f() */
-      0x04
-        /* \"D\":91:166  contract D is C(3)... */
-      mstore
+      mstore(0x04, 0x41)
       0x24
-      swap5
-      pop
-        /* \"C\":117:119  41 */
-      swap3
+      swap4
       pop
+      swap2
       pop
       pop
-        /* \"D\":91:166  contract D is C(3)... */
       revert
         /* \"C\":403:411  this.f() */
-    tag_43:
+    tag_34:
         /* \"D\":91:166  contract D is C(3)... */
-      swap4
-      pop
+      swap3
       pop
       pop
       pop
@@ -916,25 +811,78 @@ sub_0: assembly {
       returndatasize
       swap1
       revert
-    tag_41:
-      tag_52
-      tag_3
+    tag_32:
+      tag_44
+      tag_4
       jump\t// in
-    tag_52:
-      jump(tag_42)
-    tag_7:
+    tag_44:
+      jump(tag_33)
+        /* \"C\":117:119  41 */
+    tag_4:
+      pop
+        /* \"D\":91:166  contract D is C(3)... */
+      shl(0xe0, 0x4e487b71)
+        /* \"C\":117:119  41 */
+      0x00
+      mstore
+      mstore(0x04, 0x11)
+      revert(0x00, 0x24)
+    tag_5:
+      0x00
+      dup2
+      slt
+      dup1
+      iszero
+      sub(shl(0xff, 0x01), 0x01)
+      dup4
+      swap1
+      sub
+      dup5
+      sgt
+      and
+      tag_45
+      jumpi
+    tag_46:
+      shl(0xff, 0x01)
+      dup3
+      swap1
+      sub
+      dup4
+      slt
+      and
+      tag_47
+      jumpi
+      add
+      swap1
+      jump\t// out
+    tag_47:
+      tag_49
+      tag_4
+      jump\t// in
+    tag_49:
+      add
+      swap1
+      jump\t// out
+    tag_45:
+      tag_50
+      tag_4
+      jump\t// in
+    tag_50:
+      jump(tag_46)
+        /* \"D\":91:166  contract D is C(3)... */
+    tag_6:
       swap1
       dup2
       0x20
       swap2
       sub
       slt
-      tag_53
+      tag_51
       jumpi
       mload
       swap1
       jump\t// out
-    tag_53:
+    tag_51:
       pop
       pop
       0x00
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
index 1fa8928e1f..16236251d3 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
@@ -114,12 +114,7 @@ object \"C_6\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    fun_f_5()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_5()
                 }
 
                 default {}
@@ -156,6 +151,17 @@ object \"C_6\" {
 
             }
 
+            function external_fun_f_5() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                fun_f_5()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
index e427b7fe10..d017c8e9c2 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
@@ -114,12 +114,7 @@ object \"C_6\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    fun_f_5()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_5()
                 }
 
                 default {}
@@ -156,6 +151,17 @@ object \"C_6\" {
 
             }
 
+            function external_fun_f_5() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                fun_f_5()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
index e81f461d2f..afe07fad93 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
@@ -107,12 +107,7 @@ object \"C_6\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    fun_f_5()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_5()
                 }
 
                 default {}
@@ -149,6 +144,17 @@ object \"C_6\" {
 
             }
 
+            function external_fun_f_5() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                fun_f_5()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index 2acd68ff75..6b3c5661e9 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -172,48 +172,28 @@ object \"C_54\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f_30()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_30()
                 }
 
                 case 0x793816ec
                 {
                     // stateVar()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  getter_fun_stateVar_10()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_stateVar_10()
                 }
 
                 case 0x9942ec6f
                 {
                     // f2()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f2_53()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f2_53()
                 }
 
                 case 0xa00b982b
                 {
                     // constVar()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  getter_fun_constVar_5()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_constVar_5()
                 }
 
                 default {}
@@ -260,6 +240,17 @@ object \"C_54\" {
 
             }
 
+            function external_fun_f_30() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f_30()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function shift_right_unsigned_dynamic(bits, value) -> newValue {
                 newValue :=
 
@@ -292,6 +283,28 @@ object \"C_54\" {
             }
             /// @src 0:79:435  \"contract C...\"
 
+            function external_fun_stateVar_10() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  getter_fun_stateVar_10()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
+            function external_fun_f2_53() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f2_53()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function cleanup_t_rational_41_by_1(value) -> cleaned {
                 cleaned := value
             }
@@ -320,6 +333,17 @@ object \"C_54\" {
             }
             /// @src 0:79:435  \"contract C...\"
 
+            function external_fun_constVar_5() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  getter_fun_constVar_5()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
@@ -638,114 +662,104 @@ object \"C_54\" {
                     switch shr(224, calldataload(_1))
                     case 0x26121ff0 {
                         if callvalue() { revert(_1, _1) }
-                        abi_decode(calldatasize())
-                        let ret := /** @src 0:286:305  \"constVar + immutVar\" */ checked_add_int256_556(/** @src 0:297:305  \"immutVar\" */ loadimmutable(\"8\"))
+                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        /// @src 0:297:305  \"immutVar\"
+                        let _2 := loadimmutable(\"8\")
                         /// @src 0:79:435  \"contract C...\"
+                        if and(1, sgt(_2, sub(shl(255, 1), 42))) { panic_error_0x11() }
                         let memPos := mload(64)
-                        return(memPos, sub(abi_encode_int256(memPos, ret), memPos))
-                    }
-                    case 0x793816ec {
-                        if callvalue() { revert(_1, _1) }
-                        abi_decode(calldatasize())
-                        let ret_1 := sload(_1)
-                        let memPos_1 := mload(64)
-                        return(memPos_1, sub(abi_encode_int256(memPos_1, ret_1), memPos_1))
-                    }
-                    case 0x9942ec6f {
-                        if callvalue() { revert(_1, _1) }
-                        abi_decode(calldatasize())
-                        let ret_2 := /** @src 0:382:385  \"int\" */ modifier_m()
-                        /// @src 0:79:435  \"contract C...\"
-                        let memPos_2 := mload(64)
-                        return(memPos_2, sub(abi_encode_int256(memPos_2, ret_2), memPos_2))
-                    }
-                    case 0xa00b982b {
-                        if callvalue() { revert(_1, _1) }
-                        abi_decode(calldatasize())
-                        let memPos_3 := mload(64)
-                        return(memPos_3, sub(abi_encode_int256_555(memPos_3), memPos_3))
+                        mstore(memPos, add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 0:79:435  \"contract C...\" */ _2))
+                        return(memPos, 32)
                     }
+                    case 0x793816ec { external_fun_stateVar() }
+                    case 0x9942ec6f { external_fun_f2() }
+                    case 0xa00b982b { external_fun_constVar() }
                 }
                 revert(0, 0)
             }
-            function abi_decode(dataEnd)
-            {
-                if slt(add(dataEnd, not(3)), 0) { revert(0, 0) }
-            }
-            function abi_encode_int256_555(headStart) -> tail
-            {
-                tail := add(headStart, 32)
-                mstore(headStart, /** @src 0:124:126  \"41\" */ 0x29)
-            }
-            /// @src 0:79:435  \"contract C...\"
             function abi_encode_int256(headStart, value0) -> tail
             {
                 tail := add(headStart, 32)
                 mstore(headStart, value0)
             }
-            function panic_error_0x11()
-            {
-                mstore(0, shl(224, 0x4e487b71))
-                mstore(4, 0x11)
-                revert(0, 0x24)
-            }
-            function checked_add_int256_556(y) -> sum
-            {
-                if and(1, sgt(y, sub(shl(255, 1), 42))) { panic_error_0x11() }
-                sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 0:79:435  \"contract C...\" */ y)
-            }
-            function checked_add_int256(x, y) -> sum
+            function external_fun_stateVar()
             {
-                let _1 := slt(x, 0)
-                if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x))) { panic_error_0x11() }
-                if and(_1, slt(y, sub(shl(255, 1), x))) { panic_error_0x11() }
-                sum := add(x, y)
-            }
-            /// @ast-id 37 @src 0:311:348  \"modifier m()...\"
-            function modifier_m() -> _1
+                if callvalue() { revert(0, 0) }
+                if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                let _1 := sload(0)
+                let memPos := mload(64)
+                mstore(memPos, _1)
+                return(memPos, 32)
+            }
+            function external_fun_f2()
             {
-                /// @src 0:79:435  \"contract C...\"
-                let _2 := 0
-                let _3 := sload(_2)
-                if eq(_3, sub(shl(255, 1), 1)) { panic_error_0x11() }
-                let ret := add(_3, 1)
-                sstore(_2, ret)
+                if callvalue() { revert(0, 0) }
+                let _1 := 0
+                if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                let _2 := sload(_1)
+                if eq(_2, sub(shl(255, 1), 1)) { panic_error_0x11() }
+                let ret := add(_2, 1)
+                sstore(_1, ret)
                 /// @src 0:410:418  \"this.f()\"
-                let _4 := /** @src 0:79:435  \"contract C...\" */ mload(64)
+                let _3 := /** @src 0:79:435  \"contract C...\" */ mload(64)
                 /// @src 0:410:418  \"this.f()\"
-                mstore(_4, /** @src 0:79:435  \"contract C...\" */ shl(228, 0x026121ff))
+                mstore(_3, /** @src 0:79:435  \"contract C...\" */ shl(228, 0x026121ff))
                 /// @src 0:410:418  \"this.f()\"
-                let _5 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _4, 4, _4, 32)
-                if iszero(_5)
+                let _4 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _3, /** @src 0:79:435  \"contract C...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _3, 32)
+                if iszero(_4)
                 {
                     /// @src 0:79:435  \"contract C...\"
                     let pos := mload(64)
-                    returndatacopy(pos, _2, returndatasize())
+                    returndatacopy(pos, _1, returndatasize())
                     revert(pos, returndatasize())
                 }
                 /// @src 0:410:418  \"this.f()\"
-                let expr := /** @src 0:79:435  \"contract C...\" */ _2
+                let expr := /** @src 0:79:435  \"contract C...\" */ _1
                 /// @src 0:410:418  \"this.f()\"
-                if _5
+                if _4
                 {
                     /// @src 0:79:435  \"contract C...\"
-                    let newFreePtr := add(_4, and(add(/** @src 0:410:418  \"this.f()\" */ returndatasize(), /** @src 0:79:435  \"contract C...\" */ 31), not(31)))
-                    if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _4))
+                    let newFreePtr := add(_3, and(add(/** @src 0:410:418  \"this.f()\" */ returndatasize(), /** @src 0:79:435  \"contract C...\" */ 31), not(31)))
+                    if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _3))
                     {
-                        mstore(_2, shl(224, 0x4e487b71))
-                        mstore(/** @src 0:410:418  \"this.f()\" */ 4, /** @src 0:79:435  \"contract C...\" */ 0x41)
-                        revert(_2, 0x24)
+                        mstore(_1, shl(224, 0x4e487b71))
+                        mstore(4, 0x41)
+                        revert(_1, 0x24)
                     }
                     mstore(64, newFreePtr)
                     /// @src 0:410:418  \"this.f()\"
-                    expr := abi_decode_int256_fromMemory(_4, add(_4, returndatasize()))
+                    expr := abi_decode_int256_fromMemory(_3, add(_3, returndatasize()))
                 }
                 /// @src 0:399:418  \"stateVar + this.f()\"
                 let expr_1 := checked_add_int256(ret, expr)
-                /// @src 0:343:344  \"_\"
-                _1 := /** @src 0:399:429  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:421:429  \"immutVar\" */ loadimmutable(\"8\"))
+                /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
+                let var := /** @src 0:399:429  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:421:429  \"immutVar\" */ loadimmutable(\"8\"))
+                /// @src 0:79:435  \"contract C...\"
+                let memPos := mload(64)
+                return(memPos, sub(abi_encode_int256(memPos, var), memPos))
+            }
+            function external_fun_constVar()
+            {
+                if callvalue() { revert(0, 0) }
+                if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                let memPos := mload(64)
+                mstore(memPos, /** @src 0:124:126  \"41\" */ 0x29)
+                /// @src 0:79:435  \"contract C...\"
+                return(memPos, 32)
+            }
+            function panic_error_0x11()
+            {
+                mstore(0, shl(224, 0x4e487b71))
+                mstore(4, 0x11)
+                revert(0, 0x24)
+            }
+            function checked_add_int256(x, y) -> sum
+            {
+                let _1 := slt(x, 0)
+                if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x))) { panic_error_0x11() }
+                if and(_1, slt(y, sub(shl(255, 1), x))) { panic_error_0x11() }
+                sum := add(x, y)
             }
-            /// @src 0:79:435  \"contract C...\"
             function abi_decode_int256_fromMemory(headStart, dataEnd) -> value0
             {
                 if slt(sub(dataEnd, headStart), 32) { revert(0, 0) }
@@ -997,48 +1011,28 @@ object \"D_72\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f_30()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_30()
                 }
 
                 case 0x793816ec
                 {
                     // stateVar()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  getter_fun_stateVar_10()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_stateVar_10()
                 }
 
                 case 0x9942ec6f
                 {
                     // f2()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f2_53()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f2_53()
                 }
 
                 case 0xa00b982b
                 {
                     // constVar()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  getter_fun_constVar_5()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_constVar_5()
                 }
 
                 default {}
@@ -1085,6 +1079,17 @@ object \"D_72\" {
 
             }
 
+            function external_fun_f_30() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f_30()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function shift_right_unsigned_dynamic(bits, value) -> newValue {
                 newValue :=
 
@@ -1117,6 +1122,28 @@ object \"D_72\" {
             }
             /// @src 1:91:166  \"contract D is C(3)...\"
 
+            function external_fun_stateVar_10() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  getter_fun_stateVar_10()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
+            function external_fun_f2_53() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f2_53()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function cleanup_t_rational_41_by_1(value) -> cleaned {
                 cleaned := value
             }
@@ -1145,6 +1172,17 @@ object \"D_72\" {
             }
             /// @src 1:91:166  \"contract D is C(3)...\"
 
+            function external_fun_constVar_5() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  getter_fun_constVar_5()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_int256__to_t_int256__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
@@ -1471,114 +1509,104 @@ object \"D_72\" {
                     switch shr(224, calldataload(_1))
                     case 0x26121ff0 {
                         if callvalue() { revert(_1, _1) }
-                        abi_decode(calldatasize())
-                        let ret := /** @src 0:286:305  \"constVar + immutVar\" */ checked_add_int256_556(/** @src 0:297:305  \"immutVar\" */ loadimmutable(\"8\"))
+                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        /// @src 0:297:305  \"immutVar\"
+                        let _2 := loadimmutable(\"8\")
                         /// @src 1:91:166  \"contract D is C(3)...\"
+                        if and(1, sgt(_2, sub(shl(255, 1), 42))) { panic_error_0x11() }
                         let memPos := mload(64)
-                        return(memPos, sub(abi_encode_int256(memPos, ret), memPos))
-                    }
-                    case 0x793816ec {
-                        if callvalue() { revert(_1, _1) }
-                        abi_decode(calldatasize())
-                        let ret_1 := sload(_1)
-                        let memPos_1 := mload(64)
-                        return(memPos_1, sub(abi_encode_int256(memPos_1, ret_1), memPos_1))
-                    }
-                    case 0x9942ec6f {
-                        if callvalue() { revert(_1, _1) }
-                        abi_decode(calldatasize())
-                        let ret_2 := /** @src 0:382:385  \"int\" */ modifier_m()
-                        /// @src 1:91:166  \"contract D is C(3)...\"
-                        let memPos_2 := mload(64)
-                        return(memPos_2, sub(abi_encode_int256(memPos_2, ret_2), memPos_2))
-                    }
-                    case 0xa00b982b {
-                        if callvalue() { revert(_1, _1) }
-                        abi_decode(calldatasize())
-                        let memPos_3 := mload(64)
-                        return(memPos_3, sub(abi_encode_int256_555(memPos_3), memPos_3))
+                        mstore(memPos, add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 1:91:166  \"contract D is C(3)...\" */ _2))
+                        return(memPos, 32)
                     }
+                    case 0x793816ec { external_fun_stateVar() }
+                    case 0x9942ec6f { external_fun_f2() }
+                    case 0xa00b982b { external_fun_constVar() }
                 }
                 revert(0, 0)
             }
-            function abi_decode(dataEnd)
-            {
-                if slt(add(dataEnd, not(3)), 0) { revert(0, 0) }
-            }
-            function abi_encode_int256_555(headStart) -> tail
-            {
-                tail := add(headStart, 32)
-                mstore(headStart, /** @src 0:124:126  \"41\" */ 0x29)
-            }
-            /// @src 1:91:166  \"contract D is C(3)...\"
             function abi_encode_int256(headStart, value0) -> tail
             {
                 tail := add(headStart, 32)
                 mstore(headStart, value0)
             }
-            function panic_error_0x11()
-            {
-                mstore(0, shl(224, 0x4e487b71))
-                mstore(4, 0x11)
-                revert(0, 0x24)
-            }
-            function checked_add_int256_556(y) -> sum
-            {
-                if and(1, sgt(y, sub(shl(255, 1), 42))) { panic_error_0x11() }
-                sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 1:91:166  \"contract D is C(3)...\" */ y)
-            }
-            function checked_add_int256(x, y) -> sum
+            function external_fun_stateVar()
             {
-                let _1 := slt(x, 0)
-                if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x))) { panic_error_0x11() }
-                if and(_1, slt(y, sub(shl(255, 1), x))) { panic_error_0x11() }
-                sum := add(x, y)
-            }
-            /// @ast-id 37 @src 0:311:348  \"modifier m()...\"
-            function modifier_m() -> _1
+                if callvalue() { revert(0, 0) }
+                if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                let _1 := sload(0)
+                let memPos := mload(64)
+                mstore(memPos, _1)
+                return(memPos, 32)
+            }
+            function external_fun_f2()
             {
-                /// @src 1:91:166  \"contract D is C(3)...\"
-                let _2 := 0
-                let _3 := sload(_2)
-                if eq(_3, sub(shl(255, 1), 1)) { panic_error_0x11() }
-                let ret := add(_3, 1)
-                sstore(_2, ret)
+                if callvalue() { revert(0, 0) }
+                let _1 := 0
+                if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                let _2 := sload(_1)
+                if eq(_2, sub(shl(255, 1), 1)) { panic_error_0x11() }
+                let ret := add(_2, 1)
+                sstore(_1, ret)
                 /// @src 0:410:418  \"this.f()\"
-                let _4 := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(64)
+                let _3 := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(64)
                 /// @src 0:410:418  \"this.f()\"
-                mstore(_4, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
+                mstore(_3, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
                 /// @src 0:410:418  \"this.f()\"
-                let _5 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _4, 4, _4, 32)
-                if iszero(_5)
+                let _4 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _3, /** @src 1:91:166  \"contract D is C(3)...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _3, 32)
+                if iszero(_4)
                 {
                     /// @src 1:91:166  \"contract D is C(3)...\"
                     let pos := mload(64)
-                    returndatacopy(pos, _2, returndatasize())
+                    returndatacopy(pos, _1, returndatasize())
                     revert(pos, returndatasize())
                 }
                 /// @src 0:410:418  \"this.f()\"
-                let expr := /** @src 1:91:166  \"contract D is C(3)...\" */ _2
+                let expr := /** @src 1:91:166  \"contract D is C(3)...\" */ _1
                 /// @src 0:410:418  \"this.f()\"
-                if _5
+                if _4
                 {
                     /// @src 1:91:166  \"contract D is C(3)...\"
-                    let newFreePtr := add(_4, and(add(/** @src 0:410:418  \"this.f()\" */ returndatasize(), /** @src 1:91:166  \"contract D is C(3)...\" */ 31), not(31)))
-                    if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _4))
+                    let newFreePtr := add(_3, and(add(/** @src 0:410:418  \"this.f()\" */ returndatasize(), /** @src 1:91:166  \"contract D is C(3)...\" */ 31), not(31)))
+                    if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _3))
                     {
-                        mstore(_2, shl(224, 0x4e487b71))
-                        mstore(/** @src 0:410:418  \"this.f()\" */ 4, /** @src 1:91:166  \"contract D is C(3)...\" */ 0x41)
-                        revert(_2, 0x24)
+                        mstore(_1, shl(224, 0x4e487b71))
+                        mstore(4, 0x41)
+                        revert(_1, 0x24)
                     }
                     mstore(64, newFreePtr)
                     /// @src 0:410:418  \"this.f()\"
-                    expr := abi_decode_int256_fromMemory(_4, add(_4, returndatasize()))
+                    expr := abi_decode_int256_fromMemory(_3, add(_3, returndatasize()))
                 }
                 /// @src 0:399:418  \"stateVar + this.f()\"
                 let expr_1 := checked_add_int256(ret, expr)
-                /// @src 0:343:344  \"_\"
-                _1 := /** @src 0:399:429  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:421:429  \"immutVar\" */ loadimmutable(\"8\"))
+                /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
+                let var := /** @src 0:399:429  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:421:429  \"immutVar\" */ loadimmutable(\"8\"))
+                /// @src 1:91:166  \"contract D is C(3)...\"
+                let memPos := mload(64)
+                return(memPos, sub(abi_encode_int256(memPos, var), memPos))
+            }
+            function external_fun_constVar()
+            {
+                if callvalue() { revert(0, 0) }
+                if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                let memPos := mload(64)
+                mstore(memPos, /** @src 0:124:126  \"41\" */ 0x29)
+                /// @src 1:91:166  \"contract D is C(3)...\"
+                return(memPos, 32)
+            }
+            function panic_error_0x11()
+            {
+                mstore(0, shl(224, 0x4e487b71))
+                mstore(4, 0x11)
+                revert(0, 0x24)
+            }
+            function checked_add_int256(x, y) -> sum
+            {
+                let _1 := slt(x, 0)
+                if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x))) { panic_error_0x11() }
+                if and(_1, slt(y, sub(shl(255, 1), x))) { panic_error_0x11() }
+                sum := add(x, y)
             }
-            /// @src 1:91:166  \"contract D is C(3)...\"
             function abi_decode_int256_fromMemory(headStart, dataEnd) -> value0
             {
                 if slt(sub(dataEnd, headStart), 32) { revert(0, 0) }
diff --git a/test/cmdlineTests/standard_irOptimized_requested/output.json b/test/cmdlineTests/standard_irOptimized_requested/output.json
index c56849339d..85b8616020 100644
--- a/test/cmdlineTests/standard_irOptimized_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_requested/output.json
@@ -34,17 +34,7 @@ object \"C_7\" {
             {
                 let selector := shift_right_224_unsigned(calldataload(0))
                 switch selector
-                case 0x26121ff0 {
-                    if callvalue()
-                    {
-                        revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-                    }
-                    abi_decode_tuple_(4, calldatasize())
-                    fun_f_6()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple__to__fromStack(memPos)
-                    return(memPos, sub(memEnd, memPos))
-                }
+                case 0x26121ff0 { external_fun_f_6() }
                 default { }
             }
             revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
@@ -65,6 +55,18 @@ object \"C_7\" {
             }
             function abi_encode_tuple__to__fromStack(headStart) -> tail
             { tail := add(headStart, 0) }
+            function external_fun_f_6()
+            {
+                if callvalue()
+                {
+                    revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+                }
+                abi_decode_tuple_(4, calldatasize())
+                fun_f_6()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos)
+                return(memPos, sub(memEnd, memPos))
+            }
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
             { revert(0, 0) }
             /// @ast-id 6 @src 0:92:119  \"function f() public pure {}\"
diff --git a/test/cmdlineTests/standard_ir_requested/output.json b/test/cmdlineTests/standard_ir_requested/output.json
index 59f07f768c..1e7f8dec3b 100644
--- a/test/cmdlineTests/standard_ir_requested/output.json
+++ b/test/cmdlineTests/standard_ir_requested/output.json
@@ -52,12 +52,7 @@ object \"C_7\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    fun_f_6()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_6()
                 }
 
                 default {}
@@ -94,6 +89,17 @@ object \"C_7\" {
 
             }
 
+            function external_fun_f_6() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                fun_f_6()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/standard_viair_requested/output.json b/test/cmdlineTests/standard_viair_requested/output.json
index b72923f484..881a4bad49 100644
--- a/test/cmdlineTests/standard_viair_requested/output.json
+++ b/test/cmdlineTests/standard_viair_requested/output.json
@@ -121,12 +121,7 @@ object \"D_16\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    fun_f_15()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple__to__fromStack(memPos  )
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_15()
                 }
 
                 default {}
@@ -163,6 +158,17 @@ object \"D_16\" {
 
             }
 
+            function external_fun_f_15() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                fun_f_15()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos  )
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/viair_abicoder_v1/output b/test/cmdlineTests/viair_abicoder_v1/output
index cedda56dcc..c71c535daa 100644
--- a/test/cmdlineTests/viair_abicoder_v1/output
+++ b/test/cmdlineTests/viair_abicoder_v1/output
@@ -53,12 +53,7 @@ object "test_11" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f_10()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_bool__to_t_bool__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_10()
                 }
 
                 default {}
@@ -105,6 +100,17 @@ object "test_11" {
 
             }
 
+            function external_fun_f_10() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f_10()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_bool__to_t_bool__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
index cc67ca5bcb..5b7c3fdb01 100644
--- a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
+++ b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
@@ -125,18 +125,7 @@ object "C_6" {
                 if iszero(lt(calldatasize(), 4))
                 {
                     let selector := shift_right_unsigned(calldataload(0))
-                    if eq(0x26121ff0, selector)
-                    {
-                        if callvalue()
-                        {
-                            revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-                        }
-                        abi_decode(4, calldatasize())
-                        fun_f()
-                        let memPos := allocate_unbounded()
-                        let memEnd := abi_encode_tuple(memPos)
-                        return(memPos, sub(memEnd, memPos))
-                    }
+                    if eq(0x26121ff0, selector) { external_fun_f() }
                 }
                 revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
             }
@@ -421,6 +410,18 @@ object "C_6" {
                 let tail_86 := tail_1
                 tail := tail_1
             }
+            function external_fun_f()
+            {
+                if callvalue()
+                {
+                    revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+                }
+                abi_decode(4, calldatasize())
+                fun_f()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple(memPos)
+                return(memPos, sub(memEnd, memPos))
+            }
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
             { revert(0, 0) }
             /// @ast-id 5 @src 0:74:101  "function f() public pure {}"
diff --git a/test/cmdlineTests/yul_string_format_ascii/output.json b/test/cmdlineTests/yul_string_format_ascii/output.json
index 2354929e40..46dd577ebd 100644
--- a/test/cmdlineTests/yul_string_format_ascii/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii/output.json
@@ -52,12 +52,7 @@ object \"C_11\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f_10()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_10()
                 }
 
                 default {}
@@ -132,6 +127,17 @@ object \"C_11\" {
 
             }
 
+            function external_fun_f_10() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f_10()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json b/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
index 84e9ff2713..0ffffa3a43 100644
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
@@ -52,12 +52,7 @@ object \"C_11\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f_10()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_bytes32__to_t_bytes32__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_10()
                 }
 
                 default {}
@@ -104,6 +99,17 @@ object \"C_11\" {
 
             }
 
+            function external_fun_f_10() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f_10()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_bytes32__to_t_bytes32__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json b/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
index 716a1cc6e6..1fb1070155 100644
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
@@ -52,12 +52,7 @@ object \"C_11\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f_10()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_bytes4__to_t_bytes4__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_10()
                 }
 
                 default {}
@@ -104,6 +99,17 @@ object \"C_11\" {
 
             }
 
+            function external_fun_f_10() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f_10()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_bytes4__to_t_bytes4__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/yul_string_format_ascii_long/output.json b/test/cmdlineTests/yul_string_format_ascii_long/output.json
index 1f52e103be..bf757e6855 100644
--- a/test/cmdlineTests/yul_string_format_ascii_long/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_long/output.json
@@ -52,12 +52,7 @@ object \"C_11\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f_10()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_10()
                 }
 
                 default {}
@@ -132,6 +127,17 @@ object \"C_11\" {
 
             }
 
+            function external_fun_f_10() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f_10()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_string_memory_ptr__to_t_string_memory_ptr__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/yul_string_format_hex/output.json b/test/cmdlineTests/yul_string_format_hex/output.json
index 04166a7601..0ff492ce4e 100644
--- a/test/cmdlineTests/yul_string_format_hex/output.json
+++ b/test/cmdlineTests/yul_string_format_hex/output.json
@@ -52,12 +52,7 @@ object \"C_11\" {
                 {
                     // f()
 
-                    if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
-                    abi_decode_tuple_(4, calldatasize())
-                    let ret_0 :=  fun_f_10()
-                    let memPos := allocate_unbounded()
-                    let memEnd := abi_encode_tuple_t_bytes4__to_t_bytes4__fromStack(memPos , ret_0)
-                    return(memPos, sub(memEnd, memPos))
+                    external_fun_f_10()
                 }
 
                 default {}
@@ -104,6 +99,17 @@ object \"C_11\" {
 
             }
 
+            function external_fun_f_10() {
+
+                if callvalue() { revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb() }
+                abi_decode_tuple_(4, calldatasize())
+                let ret_0 :=  fun_f_10()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple_t_bytes4__to_t_bytes4__fromStack(memPos , ret_0)
+                return(memPos, sub(memEnd, memPos))
+
+            }
+
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74() {
                 revert(0, 0)
             }
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index e54c39d322..64ca830411 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // compileViaYul: also
 // ----
 // test_bytes() ->
-// gas irOptimized: 373483
+// gas irOptimized: 371847
 // gas legacy: 418955
 // gas legacyOptimized: 326783
 // test_uint256() ->
-// gas irOptimized: 524664
+// gas irOptimized: 522929
 // gas legacy: 586784
 // gas legacyOptimized: 451529
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index 19d9b1b9a4..3c1ffa6cf2 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -26,6 +26,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 167446
+// gas irOptimized: 167672
 // gas legacy: 169347
 // gas legacyOptimized: 167269
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 53aeb89499..1c4e8d7a2e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -61,10 +61,10 @@ contract C {
 // compileViaYul: also
 // ----
 // test_bytes() ->
-// gas irOptimized: 373483
+// gas irOptimized: 371847
 // gas legacy: 418955
 // gas legacyOptimized: 326783
 // test_uint256() ->
-// gas irOptimized: 524664
+// gas irOptimized: 522929
 // gas legacy: 586784
 // gas legacyOptimized: 451529
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index 3e96976981..82ece5f3f3 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -53,6 +53,6 @@ contract C {
 // f2() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f4() -> 0x20, 0x160, 0x1, 0x80, 0xc0, 0x2, 0x3, "abc", 0x7, 0x40, 0x2, 0x2, 0x3
-// gas irOptimized: 113361
+// gas irOptimized: 113299
 // gas legacy: 114900
 // gas legacyOptimized: 112606
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index 953fa79455..2aa7a251ba 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -32,6 +32,6 @@ contract C is B {
 // compileViaYul: also
 // ----
 // test() -> 77
-// gas irOptimized: 119931
+// gas irOptimized: 119895
 // gas legacy: 155093
 // gas legacyOptimized: 111550
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 11fccbb610..8d1f1a727b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -21,6 +21,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 171964
+// gas irOptimized: 171838
 // gas legacy: 141644
 // gas legacyOptimized: 121532
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index 1f836bfafa..1f1e977201 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -19,10 +19,10 @@ contract C {
 // compileViaYul: also
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 180925
+// gas irOptimized: 180931
 // gas legacy: 184929
 // gas legacyOptimized: 181504
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112535
+// gas irOptimized: 112539
 // gas legacy: 115468
 // gas legacyOptimized: 112988
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index e8d5670598..7a2a06a2e6 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -14,7 +14,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 189910
+// gas irOptimized: 189871
 // gas legacy: 211149
 // gas legacyOptimized: 206054
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index bb4e21e16f..aaf990ef68 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -15,7 +15,7 @@ contract c {
 // ----
 // getLength() -> 0
 // set(): 1, 2 -> true
-// gas irOptimized: 110433
+// gas irOptimized: 110439
 // gas legacy: 110726
 // gas legacyOptimized: 110567
 // getLength() -> 68
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
index 2a401cd87d..6c876286b5 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -22,7 +22,7 @@ contract c {
 // compileViaYul: also
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
-// gas irOptimized: 650669
+// gas irOptimized: 650647
 // gas legacy: 694515
 // gas legacyOptimized: 694013
 // retrieve() -> 9, 28, 9, 28, 4, 3, 32
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index 4f70232509..1c030debaf 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -37,12 +37,12 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x02000202
-// gas irOptimized: 4652092
+// gas irOptimized: 4652058
 // gas legacy: 4578341
 // gas legacyOptimized: 4548354
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4483169
+// gas irOptimized: 4483175
 // gas legacy: 4410769
 // gas legacyOptimized: 4382531
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
index 202b3ad264..b4b3929746 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
@@ -17,7 +17,7 @@ contract c {
 // ----
 // setData1(uint256,uint256,uint256): 10, 5, 4 ->
 // copyStorageStorage() ->
-// gas irOptimized: 111426
+// gas irOptimized: 111406
 // gas legacy: 109278
 // gas legacyOptimized: 109268
 // getData2(uint256): 5 -> 10, 4
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
index 3cc9c9bd9f..f3f3e82366 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
@@ -38,10 +38,10 @@ contract c {
 // compileViaYul: true
 // ----
 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 181308
+// gas irOptimized: 181298
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 157901
+// gas irOptimized: 157936
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 135108
+// gas irOptimized: 135098
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
-// gas irOptimized: 111428
+// gas irOptimized: 111362
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index 826d48b2ba..e8b460b4f7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -40,12 +40,12 @@ contract Test {
 // compileViaYul: also
 // ----
 // test() -> 24
-// gas irOptimized: 227167
+// gas irOptimized: 227133
 // gas legacy: 227133
 // gas legacyOptimized: 226547
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 133621
+// gas irOptimized: 133597
 // gas legacy: 134295
 // gas legacyOptimized: 133383
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
index 8bd9ee42c2..d872534cdc 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
@@ -47,7 +47,7 @@ contract C {
 // compileViaYul: also
 // ----
 // copyExternalStorageArrayOfFunctionType() -> true
-// gas irOptimized: 104701
+// gas irOptimized: 104669
 // gas legacy: 108725
 // gas legacyOptimized: 102441
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
index 63236ed774..71399a281e 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -50,7 +50,7 @@ contract C {
 // compileViaYul: also
 // ----
 // copyExternalStorageArraysOfFunctionType() -> true
-// gas irOptimized: 104372
+// gas irOptimized: 104342
 // gas legacy: 108462
 // gas legacyOptimized: 102174
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
index 809ef247d5..ae2698551a 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -7,11 +7,11 @@ contract c {
 // compileViaYul: also
 // ----
 // set(uint256): 1, 2 -> true
-// gas irOptimized: 110699
+// gas irOptimized: 110604
 // gas legacy: 111091
 // gas legacyOptimized: 110736
 // set(uint256): 2, 2, 3, 4, 5 -> true
-// gas irOptimized: 177659
+// gas irOptimized: 177564
 // gas legacy: 178021
 // gas legacyOptimized: 177666
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index ed0fe8f5f4..72a837d1b0 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -37,11 +37,11 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179952
+// gas irOptimized: 179899
 // gas legacy: 180694
 // gas legacyOptimized: 180088
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 107332
+// gas irOptimized: 107274
 // gas legacy: 107895
 // gas legacyOptimized: 107254
 // h() -> 0x40, 0x60, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index 6f019c77c2..7550a92256 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -18,6 +18,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 7
-// gas irOptimized: 124080
+// gas irOptimized: 124041
 // gas legacy: 205196
 // gas legacyOptimized: 204987
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
index b8ec0d97f2..8d8bd4d506 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -9,7 +9,7 @@ contract c {
 // compileViaYul: also
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
-// gas irOptimized: 177417
+// gas irOptimized: 177390
 // gas legacy: 177656
 // gas legacyOptimized: 177496
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index 3583a752d1..7b2af96071 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -21,7 +21,7 @@ contract sender {
 // compileViaYul: also
 // ----
 // (): 7 ->
-// gas irOptimized: 110941
+// gas irOptimized: 110954
 // gas legacy: 111082
 // gas legacyOptimized: 111027
 // val() -> 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index 9f4be21192..019a3fca0d 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -16,7 +16,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 519848
+// gas irOptimized: 519886
 // gas legacy: 521773
 // gas legacyOptimized: 517048
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index 2587442d59..4ed8c050b4 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -44,7 +44,7 @@ contract c {
 // ----
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
-// gas irOptimized: 104355
+// gas irOptimized: 111304
 // gas legacy: 108571
 // gas legacyOptimized: 100417
 // getLengths() -> 48, 49
diff --git a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
index 6aecbde32d..cf310f86dd 100644
--- a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
@@ -18,7 +18,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() -> 8
-// gas irOptimized: 122528
+// gas irOptimized: 122534
 // gas legacy: 121756
 // gas legacyOptimized: 120687
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index dd131f287f..b09cb58120 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -13,7 +13,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 465585
+// gas irOptimized: 465544
 // gas legacy: 471460
 // gas legacyOptimized: 467520
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index ddead0503b..07a054514a 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -11,7 +11,7 @@ contract Creator {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 132278
+// gas irOptimized: 129908
 // gas legacy: 176789
 // gas legacyOptimized: 129585
 // r() -> 4
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 9c78c12070..e9aef6d0d8 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -45,6 +45,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 290947
+// gas irOptimized: 290567
 // gas legacy: 452172
 // gas legacyOptimized: 285017
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index f6da6a3985..7546a664bd 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -18,6 +18,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
-// gas irOptimized: 138785
+// gas irOptimized: 138732
 // gas legacy: 145150
 // gas legacyOptimized: 139171
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index 8df809acd9..761bf3ee3b 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -29,14 +29,14 @@ contract C {
 // ----
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
-// gas irOptimized: 112555
+// gas irOptimized: 112528
 // gas legacy: 108234
 // gas legacyOptimized: 102245
 // l() -> 1
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
-// gas irOptimized: 116427
+// gas irOptimized: 116400
 // gas legacy: 107780
 // gas legacyOptimized: 96331
 // l() -> 2
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index defbf41499..830f25b02f 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -23,7 +23,7 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 184507
+// gas irOptimized: 185936
 // gas legacy: 184991
 // gas legacyOptimized: 180608
 // l() -> 70
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index ee1a57b1ee..87280f6a49 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -26,6 +26,6 @@ contract Main {
 // compileViaYul: also
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 113581
+// gas irOptimized: 113552
 // gas legacy: 126596
 // gas legacyOptimized: 113823
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
index 87067b77bc..7773c6832c 100644
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -11,7 +11,7 @@ contract c {
 // compileViaYul: also
 // ----
 // (): 1, 2, 3, 4, 5 ->
-// gas irOptimized: 155178
+// gas irOptimized: 155181
 // gas legacy: 155254
 // gas legacyOptimized: 155217
 // checkIfDataIsEmpty() -> false
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 7885b24a34..759c58d30e 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 456668
+// gas irOptimized: 443921
 // gas legacy: 590683
 // gas legacyOptimized: 448326
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 434b926fc6..7210ac2698 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 308497
+// gas irOptimized: 300765
 // gas legacy: 428917
 // gas legacyOptimized: 298128
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
index 6ee258bd6b..2206fd351b 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -19,7 +19,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(): "abc", true
-// gas irOptimized: 112563
+// gas irOptimized: 107175
 // gas legacy: 145838
 // gas legacyOptimized: 104017
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index ab90a0bb91..f6fab1092d 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -12,7 +12,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 180731
+// gas irOptimized: 174905
 // gas legacy: 221377
 // gas legacyOptimized: 177671
 // a() -> 1
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
index 41a050fc40..2518deb925 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
@@ -15,5 +15,5 @@ contract B is A {
 // compileViaYul: true
 // ----
 // constructor() ->
-// gas irOptimized: 122233
+// gas irOptimized: 122017
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
index db58499ea4..68506528b6 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
@@ -12,7 +12,7 @@ contract B is A {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 122233
+// gas irOptimized: 122017
 // gas legacy: 135046
 // gas legacyOptimized: 116176
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index fe3c95b544..8f891116e4 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -23,7 +23,7 @@ contract D is B, C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 159542
+// gas irOptimized: 160166
 // gas legacy: 170665
 // gas legacyOptimized: 145396
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index fc0b416fde..e6d6c478bc 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -76,7 +76,7 @@ contract FixedFeeRegistrar is Registrar {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 426283
+// gas irOptimized: 413485
 // gas legacy: 936897
 // gas legacyOptimized: 490983
 // reserve(string), 69 ether: 0x20, 3, "abc" ->
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 7f57998051..d98e737920 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -178,7 +178,7 @@ contract DepositContract is IDepositContract, ERC165 {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1557137
+// gas irOptimized: 1543359
 // gas legacy: 2436584
 // gas legacyOptimized: 1776483
 // supportsInterface(bytes4): 0x0 -> 0
@@ -186,27 +186,27 @@ contract DepositContract is IDepositContract, ERC165 {
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 122169
+// gas irOptimized: 122135
 // gas legacy: 150465
 // gas legacyOptimized: 122798
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 122169
+// gas irOptimized: 122135
 // gas legacy: 150465
 // gas legacyOptimized: 122798
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 122148
+// gas irOptimized: 122114
 // gas legacy: 150475
 // gas legacyOptimized: 122811
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 122148
+// gas irOptimized: 122114
 // gas legacy: 150475
 // gas legacyOptimized: 122811
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index 9de7a30d81..56abe4a9dc 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -50,7 +50,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1924392
+// gas irOptimized: 1938339
 // gas legacy: 2480887
 // gas legacyOptimized: 1874490
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 11001fffad..720f57489a 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -50,7 +50,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1778342
+// gas irOptimized: 1790188
 // gas legacy: 2250130
 // gas legacyOptimized: 1746528
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index 763a8acdaf..45976217b5 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -35,7 +35,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 465357
+// gas irOptimized: 465789
 // gas legacy: 672749
 // gas legacyOptimized: 479606
 // prb_pi() -> 3141592656369545286
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 7c4028bb9f..a16f884e8b 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -51,7 +51,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 702619
+// gas irOptimized: 707330
 // gas legacy: 1130761
 // gas legacyOptimized: 750416
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
@@ -71,6 +71,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 2040067
+// gas irOptimized: 2040045
 // gas legacy: 4381235
 // gas legacyOptimized: 2317529
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index 26faf248ff..ce8d29b8b8 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -27,7 +27,7 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 448383
+// gas irOptimized: 445767
 // gas legacy: 834272
 // gas legacyOptimized: 510004
 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 54cd9f06a5..4862f3b4c2 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -18,7 +18,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 218775
+// gas irOptimized: 213663
 // gas legacy: 294569
 // gas legacyOptimized: 174699
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
@@ -26,7 +26,7 @@ contract C {
 // f(uint256): 20 -> FAILURE
 // x() -> 1
 // stack(uint256): 1023 -> FAILURE
-// gas irOptimized: 296769
+// gas irOptimized: 304303
 // gas legacy: 483942
 // gas legacyOptimized: 298807
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index b1d9299d88..a4c3fb3dd1 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -41,7 +41,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 285350
+// gas irOptimized: 274154
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 9e2491ac1b..5b39dda482 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -40,7 +40,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 285350
+// gas irOptimized: 274154
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index d3e2ba0756..f1e2f11166 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -20,7 +20,7 @@ contract test {
 // compileViaYul: also
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
-// gas irOptimized: 111896
+// gas irOptimized: 111929
 // gas legacy: 113806
 // gas legacyOptimized: 111781
 // get(uint8): 1 -> 21, 22, 42, 43
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index 2f74c17f55..840a8761b2 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -29,7 +29,7 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 127387
+// gas irOptimized: 127302
 // gas legacy: 151334
 // gas legacyOptimized: 125166
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index 4fb3bf2455..e065f3f013 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 3 ->
-// gas irOptimized: 137184
+// gas irOptimized: 131042
 // gas legacy: 209361
 // gas legacyOptimized: 139324
 // f() -> 84, 23
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index 46992694e3..8f3584a9db 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -25,6 +25,6 @@ contract B {
 // compileViaYul: also
 // ----
 // g() -> 42
-// gas irOptimized: 111781
+// gas irOptimized: 111770
 // gas legacy: 185053
 // gas legacyOptimized: 114598
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index b2f0f8a6b1..94cd46a2db 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -42,7 +42,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 288778
+// gas irOptimized: 276469
 // gas legacy: 402045
 // gas legacyOptimized: 266772
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index e8fe016874..af9c7e76b2 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -22,6 +22,6 @@ contract A {
 // compileViaYul: also
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 272947
+// gas irOptimized: 272338
 // gas legacy: 422501
 // gas legacyOptimized: 287472
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index 7667c2443f..a6e812e9a0 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -14,7 +14,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 2 wei: 3 ->
-// gas irOptimized: 111723
+// gas irOptimized: 111699
 // gas legacy: 151416
 // gas legacyOptimized: 108388
 // state() -> 3
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
index d4dbffcb8f..9abeb90aa0 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -14,7 +14,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 119839
+// gas irOptimized: 115297
 // gas legacy: 155081
 // gas legacyOptimized: 107997
 // genesisHash() -> 0x3737373737373737373737373737373737373737373737373737373737373737
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
index 7b84033d87..6e65cd2394 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
-// gas irOptimized: 203397
+// gas irOptimized: 203312
 // gas legacy: 209194
 // gas legacyOptimized: 203583
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
index 0d0aba8c8f..c23a15ec0a 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
@@ -25,6 +25,6 @@ contract CopyTest {
 // compileViaYul: also
 // ----
 // run() -> 2, 23, 42
-// gas irOptimized: 193980
+// gas irOptimized: 194005
 // gas legacy: 186016
 // gas legacyOptimized: 184668
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
index 7bbe495ce2..258ff350b3 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
@@ -88,7 +88,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // test1() -> true
-// gas irOptimized: 150618
+// gas irOptimized: 150545
 // gas legacy: 150266
 // gas legacyOptimized: 149875
 // test2() -> true
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
index 12ec4ca181..5dd4d48a63 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
@@ -69,7 +69,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // load() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
-// gas irOptimized: 111179
+// gas irOptimized: 111432
 // gas legacy: 112999
 // gas legacyOptimized: 110881
 // store() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index a677b5be8d..6b5d1f0224 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -25,7 +25,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133752
+// gas irOptimized: 133728
 // gas legacy: 134436
 // gas legacyOptimized: 133879
 // test(uint256): 32 -> "3"
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index f170dca3fb..03a063bb8f 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -38,12 +38,12 @@ contract c {
 // compileViaYul: also
 // ----
 // set(uint256): 7 -> true
-// gas irOptimized: 110119
+// gas irOptimized: 110051
 // gas legacy: 110616
 // gas legacyOptimized: 110006
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // copy(uint256,uint256): 7, 8 -> true
-// gas irOptimized: 118698
+// gas irOptimized: 118597
 // gas legacy: 119166
 // gas legacyOptimized: 118622
 // retrieve(uint256): 7 -> 1, 3, 4, 2
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
index bc18d31922..ded05d8d60 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
@@ -33,4 +33,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 0, 0, 0
-// gas irOptimized: 117289
+// gas irOptimized: 117403
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index e759520b47..44acf38e4d 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -44,7 +44,7 @@ contract C {
 // compileViaYul: also
 // ----
 // f() ->
-// gas irOptimized: 121618
+// gas irOptimized: 121624
 // gas legacy: 122132
 // gas legacyOptimized: 121500
 // g() ->
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index b56a2ec229..3356eac164 100644
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ b/test/libsolidity/semanticTests/structs/structs.sol
@@ -32,7 +32,7 @@ contract test {
 // ----
 // check() -> false
 // set() ->
-// gas irOptimized: 134335
+// gas irOptimized: 134432
 // gas legacy: 135277
 // gas legacyOptimized: 134064
 // check() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 1927b25192..bd7e2fe9cd 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -51,7 +51,7 @@ contract C {
 // compileViaYul: also
 // ----
 // test_f() -> true
-// gas irOptimized: 122509
+// gas irOptimized: 122413
 // gas legacy: 126168
 // gas legacyOptimized: 123199
 // test_g() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index 220d9d9a24..c2c5f3cdc1 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -115,7 +115,7 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 447831
+// gas irOptimized: 423885
 // gas legacy: 861559
 // gas legacyOptimized: 420959
 // totalSupply() -> 20
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 6072d5ac3e..38e0fb13f1 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 199687
+// gas irOptimized: 199723
 // gas legacy: 241124
 // gas legacyOptimized: 155549
 // initCode() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index ee6f7690db..cc93152ead 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -36,6 +36,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 240685
+// gas irOptimized: 240691
 // gas legacy: 240358
 // gas legacyOptimized: 239682
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index 64a3286a94..9ba4e3cb73 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -98,7 +98,7 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 443295
+// gas irOptimized: 419330
 // gas legacy: 833310
 // gas legacyOptimized: 416135
 // totalSupply() -> 20
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index cad181c8f4..ba4e7426ae 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -22,6 +22,6 @@ contract C {
 // compileViaYul: also
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178835
+// gas irOptimized: 178822
 // gas legacy: 180762
 // gas legacyOptimized: 179481
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index 1950f7a4d7..06faab8824 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -42,6 +42,6 @@ contract D {
 // gas legacy: 98438801
 // gas legacyOptimized: 98438594
 // fpure() -> FAILURE
-// gas irOptimized: 98438626
+// gas irOptimized: 98438625
 // gas legacy: 98438801
 // gas legacyOptimized: 98438595
diff --git a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
index c8398b2bf3..9b7a4306f3 100644
--- a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
@@ -30,7 +30,7 @@ contract c {
 // x() -> 0, 0
 // y() -> 0, 0
 // set() ->
-// gas irOptimized: 109733
+// gas irOptimized: 109713
 // gas legacy: 109732
 // gas legacyOptimized: 109682
 // x() -> 1, 2
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
index b603fb7864..6ef403dcc6 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
@@ -28,7 +28,7 @@ contract C {
 // index(uint256): 10 -> true
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
-// gas irOptimized: 138441
+// gas irOptimized: 138410
 // gas legacy: 248854
 // gas legacyOptimized: 152638
 // accessIndex(uint256,int256): 10, 1 -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index 70e3a34d45..497dd36c8b 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -23,6 +23,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() ->
-// gas irOptimized: 113142
+// gas irOptimized: 113096
 // gas legacy: 112937
 // gas legacyOptimized: 112608

From 195f72e844e7cac0907053f6f5a8cd5857bafc23 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Thu, 10 Feb 2022 19:44:08 +0530
Subject: [PATCH 0408/1748] Added errorSelector field for custom errors

---
 Changelog.md                                  |  3 +-
 libsolidity/ast/ASTJsonConverter.cpp          | 21 ++++-
 test/libsolidity/ASTJSON/documentation.json   |  1 +
 .../libsolidity/ASTJSON/event_definition.json |  1 +
 ...vent_with_variables_of_internal_types.json |  0
 ...event_with_variables_of_internal_types.sol |  5 ++
 ...variables_of_internal_types_parseOnly.json | 78 +++++++++++++++++++
 test/libsolidity/ASTJSON/used_errors.json     | 20 ++---
 test/libsolidity/ASTJSON/used_errors.sol      |  2 +-
 .../ASTJSON/used_errors_parseOnly.json        | 18 ++---
 10 files changed, 124 insertions(+), 25 deletions(-)
 create mode 100644 test/libsolidity/ASTJSON/event_with_variables_of_internal_types.json
 create mode 100644 test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol
 create mode 100644 test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json

diff --git a/Changelog.md b/Changelog.md
index 300bc0122d..fd7dda5847 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,12 +4,11 @@ Language Features:
 
 
 Compiler Features:
-
+* JSON-AST: Added selector field for errors and events.
 
 Bugfixes:
 
 
-
 ### 0.8.12 (2022-02-16)
 
 Language Features:
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index 326cca43ed..97417f81c0 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -32,6 +32,7 @@
 #include <libsolutil/JSON.h>
 #include <libsolutil/UTF8.h>
 #include <libsolutil/CommonData.h>
+#include <libsolutil/Keccak256.h>
 
 #include <boost/algorithm/string/join.hpp>
 
@@ -493,24 +494,36 @@ bool ASTJsonConverter::visit(ModifierInvocation const& _node)
 bool ASTJsonConverter::visit(EventDefinition const& _node)
 {
 	m_inEvent = true;
-	setJsonNode(_node, "EventDefinition", {
+	std::vector<pair<string, Json::Value>> _attributes = {
 		make_pair("name", _node.name()),
 		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
 		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
 		make_pair("parameters", toJson(_node.parameterList())),
 		make_pair("anonymous", _node.isAnonymous())
-	});
+	};
+	if (m_stackState >= CompilerStack::State::AnalysisPerformed)
+			_attributes.emplace_back(
+				make_pair(
+					"eventSelector",
+					toHex(u256(h256::Arith(util::keccak256(_node.functionType(true)->externalSignature()))))
+				));
+
+	setJsonNode(_node, "EventDefinition", std::move(_attributes));
 	return false;
 }
 
 bool ASTJsonConverter::visit(ErrorDefinition const& _node)
 {
-	setJsonNode(_node, "ErrorDefinition", {
+	std::vector<pair<string, Json::Value>> _attributes = {
 		make_pair("name", _node.name()),
 		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
 		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
 		make_pair("parameters", toJson(_node.parameterList()))
-	});
+	};
+	if (m_stackState >= CompilerStack::State::AnalysisPerformed)
+		_attributes.emplace_back(make_pair("errorSelector", _node.functionType(true)->externalIdentifierHex()));
+
+	setJsonNode(_node, "ErrorDefinition", std::move(_attributes));
 	return false;
 }
 
diff --git a/test/libsolidity/ASTJSON/documentation.json b/test/libsolidity/ASTJSON/documentation.json
index de512181f4..f31382d3ad 100644
--- a/test/libsolidity/ASTJSON/documentation.json
+++ b/test/libsolidity/ASTJSON/documentation.json
@@ -162,6 +162,7 @@
             "src": "69:26:3",
             "text": "Some comment on Evt."
           },
+          "eventSelector": "a69007916fc1145953e5a7032d7c3eab4b8e2f33ec59b0f71e732904eeede3a4",
           "id": 12,
           "name": "Evt",
           "nameLocation": "102:3:3",
diff --git a/test/libsolidity/ASTJSON/event_definition.json b/test/libsolidity/ASTJSON/event_definition.json
index 627fd13ba8..0bb614c221 100644
--- a/test/libsolidity/ASTJSON/event_definition.json
+++ b/test/libsolidity/ASTJSON/event_definition.json
@@ -30,6 +30,7 @@
       [
         {
           "anonymous": false,
+          "eventSelector": "92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028",
           "id": 2,
           "name": "E",
           "nameLocation": "19:1:1",
diff --git a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.json b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.json
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol
new file mode 100644
index 0000000000..a229105700
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol
@@ -0,0 +1,5 @@
+contract C {
+    event E(function() internal);
+}
+
+// ----
diff --git a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json
new file mode 100644
index 0000000000..0c90ee840f
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json
@@ -0,0 +1,78 @@
+{
+  "absolutePath": "a",
+  "id": 8,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "id": 7,
+      "name": "C",
+      "nameLocation": "9:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "id": 6,
+          "name": "E",
+          "nameLocation": "23:1:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 5,
+            "nodeType": "ParameterList",
+            "parameters":
+            [
+              {
+                "constant": false,
+                "id": 4,
+                "indexed": false,
+                "mutability": "mutable",
+                "name": "",
+                "nameLocation": "-1:-1:-1",
+                "nodeType": "VariableDeclaration",
+                "src": "25:20:1",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {},
+                "typeName":
+                {
+                  "id": 3,
+                  "nodeType": "FunctionTypeName",
+                  "parameterTypes":
+                  {
+                    "id": 1,
+                    "nodeType": "ParameterList",
+                    "parameters": [],
+                    "src": "33:2:1"
+                  },
+                  "returnParameterTypes":
+                  {
+                    "id": 2,
+                    "nodeType": "ParameterList",
+                    "parameters": [],
+                    "src": "44:0:1"
+                  },
+                  "src": "25:20:1",
+                  "stateMutability": "nonpayable",
+                  "typeDescriptions": {},
+                  "visibility": "internal"
+                },
+                "visibility": "internal"
+              }
+            ],
+            "src": "24:21:1"
+          },
+          "src": "17:29:1"
+        }
+      ],
+      "src": "0:48:1",
+      "usedErrors": []
+    }
+  ],
+  "src": "0:49:1"
+}
diff --git a/test/libsolidity/ASTJSON/used_errors.json b/test/libsolidity/ASTJSON/used_errors.json
index a8ca24a284..a0e8e28ba4 100644
--- a/test/libsolidity/ASTJSON/used_errors.json
+++ b/test/libsolidity/ASTJSON/used_errors.json
@@ -20,6 +20,7 @@
   "nodes":
   [
     {
+      "errorSelector": "c1599bd9",
       "id": 2,
       "name": "X",
       "nameLocation": "6:1:1",
@@ -127,6 +128,7 @@
       "nodes":
       [
         {
+          "errorSelector": "2bc80f3a",
           "id": 11,
           "name": "T",
           "nameLocation": "63:1:1",
@@ -145,7 +147,7 @@
           {
             "id": 17,
             "nodeType": "Block",
-            "src": "97:8:1",
+            "src": "92:8:1",
             "statements":
             [
               {
@@ -160,7 +162,7 @@
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 9,
-                    "src": "99:1:1",
+                    "src": "94:1:1",
                     "typeDescriptions":
                     {
                       "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
@@ -175,7 +177,7 @@
                   "lValueRequested": false,
                   "names": [],
                   "nodeType": "FunctionCall",
-                  "src": "99:3:1",
+                  "src": "94:3:1",
                   "tryCall": false,
                   "typeDescriptions":
                   {
@@ -185,7 +187,7 @@
                 },
                 "id": 16,
                 "nodeType": "ExpressionStatement",
-                "src": "99:3:1"
+                "src": "94:3:1"
               }
             ]
           },
@@ -209,17 +211,17 @@
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
-            "src": "97:0:1"
+            "src": "92:0:1"
           },
           "scope": 19,
-          "src": "72:33:1",
-          "stateMutability": "pure",
+          "src": "72:28:1",
+          "stateMutability": "nonpayable",
           "virtual": false,
           "visibility": "public"
         }
       ],
       "scope": 20,
-      "src": "40:67:1",
+      "src": "40:62:1",
       "usedErrors":
       [
         2,
@@ -227,5 +229,5 @@
       ]
     }
   ],
-  "src": "0:108:1"
+  "src": "0:103:1"
 }
diff --git a/test/libsolidity/ASTJSON/used_errors.sol b/test/libsolidity/ASTJSON/used_errors.sol
index e891a20ee4..ead3e2dcf4 100644
--- a/test/libsolidity/ASTJSON/used_errors.sol
+++ b/test/libsolidity/ASTJSON/used_errors.sol
@@ -2,7 +2,7 @@ error X();
 function f() { revert X(); }
 contract C {
     error T();
-    function h() public pure { f(); }
+    function h() public { f(); }
 }
 
 // ----
diff --git a/test/libsolidity/ASTJSON/used_errors_parseOnly.json b/test/libsolidity/ASTJSON/used_errors_parseOnly.json
index 162f441c45..58b476005f 100644
--- a/test/libsolidity/ASTJSON/used_errors_parseOnly.json
+++ b/test/libsolidity/ASTJSON/used_errors_parseOnly.json
@@ -108,7 +108,7 @@
           {
             "id": 17,
             "nodeType": "Block",
-            "src": "97:8:1",
+            "src": "92:8:1",
             "statements":
             [
               {
@@ -121,19 +121,19 @@
                     "name": "f",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "src": "99:1:1",
+                    "src": "94:1:1",
                     "typeDescriptions": {}
                   },
                   "id": 15,
                   "names": [],
                   "nodeType": "FunctionCall",
-                  "src": "99:3:1",
+                  "src": "94:3:1",
                   "tryCall": false,
                   "typeDescriptions": {}
                 },
                 "id": 16,
                 "nodeType": "ExpressionStatement",
-                "src": "99:3:1"
+                "src": "94:3:1"
               }
             ]
           },
@@ -156,17 +156,17 @@
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
-            "src": "97:0:1"
+            "src": "92:0:1"
           },
-          "src": "72:33:1",
-          "stateMutability": "pure",
+          "src": "72:28:1",
+          "stateMutability": "nonpayable",
           "virtual": false,
           "visibility": "public"
         }
       ],
-      "src": "40:67:1",
+      "src": "40:62:1",
       "usedErrors": []
     }
   ],
-  "src": "0:108:1"
+  "src": "0:103:1"
 }

From 49f06dacdf82589712d8080c9df4f46d8bf8b2e1 Mon Sep 17 00:00:00 2001
From: Richie <devtooligan@gmail.com>
Date: Tue, 15 Feb 2022 19:24:44 -0800
Subject: [PATCH 0409/1748] fix: remove lower_case_with_underscores and
 Capitalized_Words_With_Underscores from code examples

---
 docs/050-breaking-changes.rst  | 12 ++++----
 docs/assembly.rst              | 12 ++++----
 docs/contracts/functions.rst   |  8 +++---
 docs/style-guide.rst           | 16 +++++------
 docs/types/mapping-types.rst   | 18 ++++++------
 docs/types/reference-types.rst | 52 +++++++++++++++++-----------------
 6 files changed, 58 insertions(+), 60 deletions(-)

diff --git a/docs/050-breaking-changes.rst b/docs/050-breaking-changes.rst
index 90af865267..3f41ac860a 100644
--- a/docs/050-breaking-changes.rst
+++ b/docs/050-breaking-changes.rst
@@ -89,8 +89,8 @@ For most of the topics the compiler will provide suggestions.
 
 * Explicit data location for all variables of struct, array or mapping types is
   now mandatory. This is also applied to function parameters and return
-  variables.  For example, change ``uint[] x = m_x`` to ``uint[] storage x =
-  m_x``, and ``function f(uint[][] x)`` to ``function f(uint[][] memory x)``
+  variables.  For example, change ``uint[] x = z`` to ``uint[] storage x =
+  z``, and ``function f(uint[][] x)`` to ``function f(uint[][] memory x)``
   where ``memory`` is the data location and might be replaced by ``storage`` or
   ``calldata`` accordingly.  Note that ``external`` functions require
   parameters with a data location of ``calldata``.
@@ -483,7 +483,7 @@ New version:
             return data;
         }
 
-        using address_make_payable for address;
+        using AddressMakePayable for address;
         // Data location for 'arr' must be specified
         function g(uint[] memory /* arr */, bytes8 x, OtherContract otherContract, address unknownContract) public payable {
             // 'otherContract.transfer' is not provided.
@@ -500,7 +500,7 @@ New version:
             // 'address payable' should be used whenever possible.
             // To increase clarity, we suggest the use of a library for
             // the conversion (provided after the contract in this example).
-            address payable addr = unknownContract.make_payable();
+            address payable addr = unknownContract.makePayable();
             require(addr.send(1 ether));
 
             // Since uint32 (4 bytes) is smaller than bytes8 (8 bytes),
@@ -516,8 +516,8 @@ New version:
 
     // We can define a library for explicitly converting ``address``
     // to ``address payable`` as a workaround.
-    library address_make_payable {
-        function make_payable(address x) internal pure returns (address payable) {
+    library AddressMakePayable {
+        function makePayable(address x) internal pure returns (address payable) {
             return address(uint160(x));
         }
     }
diff --git a/docs/assembly.rst b/docs/assembly.rst
index c26a53e49a..5427e0f511 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -45,19 +45,19 @@ Solidity language without a compiler change.
     pragma solidity >=0.4.16 <0.9.0;
 
     library GetCode {
-        function at(address _addr) public view returns (bytes memory o_code) {
+        function at(address _addr) public view returns (bytes memory code) {
             assembly {
                 // retrieve the size of the code, this needs assembly
                 let size := extcodesize(_addr)
                 // allocate output byte array - this could also be done without assembly
-                // by using o_code = new bytes(size)
-                o_code := mload(0x40)
+                // by using code = new bytes(size)
+                code := mload(0x40)
                 // new "memory end" including padding
-                mstore(0x40, add(o_code, and(add(add(size, 0x20), 0x1f), not(0x1f))))
+                mstore(0x40, add(code, and(add(add(size, 0x20), 0x1f), not(0x1f))))
                 // store length in memory
-                mstore(o_code, size)
+                mstore(code, size)
                 // actually retrieve the code, this needs assembly
-                extcodecopy(_addr, add(o_code, 0x20), 0, size)
+                extcodecopy(_addr, add(code, 0x20), 0, size)
             }
         }
     }
diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index ff49e4f281..cada0e5d94 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -102,10 +102,10 @@ two integers passed as function parameters, then you use something like:
         function arithmetic(uint _a, uint _b)
             public
             pure
-            returns (uint o_sum, uint o_product)
+            returns (uint sum, uint product)
         {
-            o_sum = _a + _b;
-            o_product = _a * _b;
+            sum = _a + _b;
+            product = _a * _b;
         }
     }
 
@@ -129,7 +129,7 @@ statement:
         function arithmetic(uint _a, uint _b)
             public
             pure
-            returns (uint o_sum, uint o_product)
+            returns (uint sum, uint product)
         {
             return (_a + _b, _a * _b);
         }
diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index a3d3f69a5e..3b76273cc0 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -204,7 +204,7 @@ Yes:
 
 .. code-block:: solidity
 
-    thisIsALongNestedMapping[being][set][to_some_value] = someFunction(
+    thisIsALongNestedMapping[being][set][toSomeValue] = someFunction(
         argument1,
         argument2,
         argument3,
@@ -215,7 +215,7 @@ No:
 
 .. code-block:: solidity
 
-    thisIsALongNestedMapping[being][set][to_some_value] = someFunction(argument1,
+    thisIsALongNestedMapping[being][set][toSomeValue] = someFunction(argument1,
                                                                        argument2,
                                                                        argument3,
                                                                        argument4);
@@ -439,15 +439,15 @@ Yes:
 
     x = 1;
     y = 2;
-    long_variable = 3;
+    longVariable = 3;
 
 No:
 
 .. code-block:: solidity
 
-    x             = 1;
-    y             = 2;
-    long_variable = 3;
+    x            = 1;
+    y            = 2;
+    longVariable = 3;
 
 Don't include a whitespace in the receive and fallback functions:
 
@@ -1092,12 +1092,10 @@ naming styles.
 * ``b`` (single lowercase letter)
 * ``B`` (single uppercase letter)
 * ``lowercase``
-* ``lower_case_with_underscores``
 * ``UPPERCASE``
 * ``UPPER_CASE_WITH_UNDERSCORES``
 * ``CapitalizedWords`` (or CapWords)
 * ``mixedCase`` (differs from CapitalizedWords by initial lowercase character!)
-* ``Capitalized_Words_With_Underscores``
 
 .. note:: When using initialisms in CapWords, capitalize all the letters of the initialisms. Thus HTTPServerError is better than HttpServerError. When using initialisms in mixedCase, capitalize all the letters of the initialisms, except keep the first one lower case if it is the beginning of the name. Thus xmlHTTPRequest is better than XMLHTTPRequest.
 
@@ -1256,7 +1254,7 @@ Enums, in the style of simple type declarations, should be named using the CapWo
 Avoiding Naming Collisions
 ==========================
 
-* ``single_trailing_underscore_``
+* ``singleTrailingUnderscore_``
 
 This convention is suggested when the desired name collides with that of a
 built-in or otherwise reserved name.
diff --git a/docs/types/mapping-types.rst b/docs/types/mapping-types.rst
index 18f3bf8275..2b6d284bff 100644
--- a/docs/types/mapping-types.rst
+++ b/docs/types/mapping-types.rst
@@ -166,22 +166,22 @@ the ``sum`` function iterates over to sum all the values.
             return self.data[key].keyIndex > 0;
         }
 
-        function iterate_start(itmap storage self) internal view returns (uint keyIndex) {
-            return iterate_next(self, type(uint).max);
+        function iterateStart(itmap storage self) internal view returns (uint keyIndex) {
+            return iterateNext(self, type(uint).max);
         }
 
-        function iterate_valid(itmap storage self, uint keyIndex) internal view returns (bool) {
+        function iterateValid(itmap storage self, uint keyIndex) internal view returns (bool) {
             return keyIndex < self.keys.length;
         }
 
-        function iterate_next(itmap storage self, uint keyIndex) internal view returns (uint r_keyIndex) {
+        function iterateNext(itmap storage self, uint keyIndex) internal view returns (uint r_keyIndex) {
             keyIndex++;
             while (keyIndex < self.keys.length && self.keys[keyIndex].deleted)
                 keyIndex++;
             return keyIndex;
         }
 
-        function iterate_get(itmap storage self, uint keyIndex) internal view returns (uint key, uint value) {
+        function iterateGet(itmap storage self, uint keyIndex) internal view returns (uint key, uint value) {
             key = self.keys[keyIndex].key;
             value = self.data[key].value;
         }
@@ -206,11 +206,11 @@ the ``sum`` function iterates over to sum all the values.
         // Computes the sum of all stored data.
         function sum() public view returns (uint s) {
             for (
-                uint i = data.iterate_start();
-                data.iterate_valid(i);
-                i = data.iterate_next(i)
+                uint i = data.iterateStart();
+                data.iterateValid(i);
+                i = data.iterateNext(i)
             ) {
-                (, uint value) = data.iterate_get(i);
+                (, uint value) = data.iterateGet(i);
                 s += value;
             }
         }
diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index 014c49935a..f595612c02 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -190,11 +190,11 @@ If you want to use string parameters or other types that are not implicitly conv
     contract C {
         string s = "Storage";
         function f(bytes calldata bc, string memory sm, bytes16 b) public view {
-            string memory concat_string = string.concat(s, string(bc), "Literal", sm);
-            assert((bytes(s).length + bc.length + 7 + bytes(sm).length) == bytes(concat_string).length);
+            string memory concatString = string.concat(s, string(bc), "Literal", sm);
+            assert((bytes(s).length + bc.length + 7 + bytes(sm).length) == bytes(concatString).length);
 
-            bytes memory concat_bytes = bytes.concat(bytes(s), bc, bc[:2], "Literal", bytes(sm), b);
-            assert((bytes(s).length + bc.length + 2 + 7 + bytes(sm).length + b.length) == concat_bytes.length);
+            bytes memory concatBytes = bytes.concat(bytes(s), bc, bc[:2], "Literal", bytes(sm), b);
+            assert((bytes(s).length + bc.length + 2 + 7 + bytes(sm).length + b.length) == concatBytes.length);
         }
     }
 
@@ -376,20 +376,20 @@ Array Members
     pragma solidity >=0.6.0 <0.9.0;
 
     contract ArrayContract {
-        uint[2**20] m_aLotOfIntegers;
+        uint[2**20] aLotOfIntegers;
         // Note that the following is not a pair of dynamic arrays but a
         // dynamic array of pairs (i.e. of fixed size arrays of length two).
         // Because of that, T[] is always a dynamic array of T, even if T
         // itself is an array.
         // Data location for all state variables is storage.
-        bool[2][] m_pairsOfFlags;
+        bool[2][] pairsOfFlags;
 
         // newPairs is stored in memory - the only possibility
         // for public contract function arguments
         function setAllFlagPairs(bool[2][] memory newPairs) public {
             // assignment to a storage array performs a copy of ``newPairs`` and
-            // replaces the complete array ``m_pairsOfFlags``.
-            m_pairsOfFlags = newPairs;
+            // replaces the complete array ``pairsOfFlags``.
+            pairsOfFlags = newPairs;
         }
 
         struct StructType {
@@ -411,45 +411,45 @@ Array Members
 
         function setFlagPair(uint index, bool flagA, bool flagB) public {
             // access to a non-existing index will throw an exception
-            m_pairsOfFlags[index][0] = flagA;
-            m_pairsOfFlags[index][1] = flagB;
+            pairsOfFlags[index][0] = flagA;
+            pairsOfFlags[index][1] = flagB;
         }
 
         function changeFlagArraySize(uint newSize) public {
             // using push and pop is the only way to change the
             // length of an array
-            if (newSize < m_pairsOfFlags.length) {
-                while (m_pairsOfFlags.length > newSize)
-                    m_pairsOfFlags.pop();
-            } else if (newSize > m_pairsOfFlags.length) {
-                while (m_pairsOfFlags.length < newSize)
-                    m_pairsOfFlags.push();
+            if (newSize < pairsOfFlags.length) {
+                while (pairsOfFlags.length > newSize)
+                    pairsOfFlags.pop();
+            } else if (newSize > pairsOfFlags.length) {
+                while (pairsOfFlags.length < newSize)
+                    pairsOfFlags.push();
             }
         }
 
         function clear() public {
             // these clear the arrays completely
-            delete m_pairsOfFlags;
-            delete m_aLotOfIntegers;
+            delete pairsOfFlags;
+            delete aLotOfIntegers;
             // identical effect here
-            m_pairsOfFlags = new bool[2][](0);
+            pairsOfFlags = new bool[2][](0);
         }
 
-        bytes m_byteData;
+        bytes byteData;
 
         function byteArrays(bytes memory data) public {
             // byte arrays ("bytes") are different as they are stored without padding,
             // but can be treated identical to "uint8[]"
-            m_byteData = data;
+            byteData = data;
             for (uint i = 0; i < 7; i++)
-                m_byteData.push();
-            m_byteData[3] = 0x08;
-            delete m_byteData[2];
+                byteData.push();
+            byteData[3] = 0x08;
+            delete byteData[2];
         }
 
         function addFlag(bool[2] memory flag) public returns (uint) {
-            m_pairsOfFlags.push(flag);
-            return m_pairsOfFlags.length;
+            pairsOfFlags.push(flag);
+            return pairsOfFlags.length;
         }
 
         function createMemoryArray(uint size) public pure returns (bytes memory) {

From c5070d8633bb03eb0e59027cbc8891421c4c7b92 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 22 Feb 2022 10:22:11 +0100
Subject: [PATCH 0410/1748] Update .github/CODEOWNERS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 1f6c29d6cd..d50c44566a 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-docs/style-guide.rst @fulldecent
+/docs/style-guide.rst @fulldecent

From f7b29d55da95e97fd969e1ccd0f531a2c44748ce Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 21 Feb 2022 15:35:38 -0500
Subject: [PATCH 0411/1748] cmake/EthCompilerSettings.cmake: generator
 expression fix for ninja.

---
 cmake/EthCompilerSettings.cmake | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index ffa825446e..0ddeb452a9 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -54,9 +54,10 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 	add_compile_options(-Wsign-conversion)
 	add_compile_options(-Wconversion)
 
-	eth_add_cxx_compiler_flag_if_supported(
-		$<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>
-	)
+	check_cxx_compiler_flag(-Wextra-semi WEXTRA_SEMI)
+	if(WEXTRA_SEMI)
+		add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>)
+	endif()
 	eth_add_cxx_compiler_flag_if_supported(-Wfinal-dtor-non-final-class)
 	eth_add_cxx_compiler_flag_if_supported(-Wnewline-eof)
 	eth_add_cxx_compiler_flag_if_supported(-Wsuggest-destructor-override)

From 50ae21d1bfaf016a6e8f467dcde6bca65a753af7 Mon Sep 17 00:00:00 2001
From: a3d4 <a3d4@pm.me>
Date: Sun, 20 Feb 2022 02:36:11 +0100
Subject: [PATCH 0412/1748] Fix running tests from any drive

---
 libsolidity/interface/FileReader.cpp      | 31 +++++++++++++++++------
 libsolidity/interface/FileReader.h        | 11 ++++++++
 test/libsolidity/interface/FileReader.cpp |  5 ++--
 test/solc/CommandLineInterface.cpp        |  8 +++---
 4 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
index e581c4a568..8300feb572 100644
--- a/libsolidity/interface/FileReader.cpp
+++ b/libsolidity/interface/FileReader.cpp
@@ -276,14 +276,8 @@ boost::filesystem::path FileReader::normalizeCLIPathForVFS(
 	// If the path is on the same drive as the working dir, for portability we prefer not to
 	// include the root name. Do this only for non-UNC paths - my experiments show that on Windows
 	// when the working dir is an UNC path, / does not not actually refer to the root of the UNC path.
-	boost::filesystem::path normalizedRootPath = normalizedPath.root_path();
-	if (!isUNCPath(normalizedPath))
-	{
-		boost::filesystem::path workingDirRootPath = canonicalWorkDir.root_path();
-		// Ignore drive letter case on Windows (C:\ <=> c:\).
-		if (boost::filesystem::equivalent(normalizedRootPath, workingDirRootPath))
-			normalizedRootPath = "/";
-	}
+
+	boost::filesystem::path normalizedRootPath = normalizeCLIRootPathForVFS(normalizedPath, canonicalWorkDir);
 
 	// lexically_normal() will not squash paths like "/../../" into "/". We have to do it manually.
 	boost::filesystem::path dotDotPrefix = absoluteDotDotPrefix(normalizedPath);
@@ -308,6 +302,27 @@ boost::filesystem::path FileReader::normalizeCLIPathForVFS(
 	return normalizedPathNoDotDot;
 }
 
+boost::filesystem::path FileReader::normalizeCLIRootPathForVFS(
+	boost::filesystem::path const& _path,
+	boost::filesystem::path const& _workDir
+)
+{
+	solAssert(_workDir.is_absolute(), "");
+
+	boost::filesystem::path absolutePath = boost::filesystem::absolute(_path, _workDir);
+	boost::filesystem::path rootPath = absolutePath.root_path();
+	boost::filesystem::path baseRootPath = _workDir.root_path();
+
+	if (isUNCPath(absolutePath))
+		return rootPath;
+
+	// Ignore drive letter case on Windows (C:\ <=> c:\).
+	if (boost::filesystem::equivalent(rootPath, baseRootPath))
+		return "/";
+
+	return rootPath;
+}
+
 bool FileReader::isPathPrefix(boost::filesystem::path const& _prefix, boost::filesystem::path const& _path)
 {
 	solAssert(!_prefix.empty() && !_path.empty(), "");
diff --git a/libsolidity/interface/FileReader.h b/libsolidity/interface/FileReader.h
index 3892e98263..f05ce894d9 100644
--- a/libsolidity/interface/FileReader.h
+++ b/libsolidity/interface/FileReader.h
@@ -115,6 +115,17 @@ class FileReader
 		SymlinkResolution _symlinkResolution = SymlinkResolution::Disabled
 	);
 
+	/// Normalizes a root path by excluding, in some cases, its root name.
+	/// The function is used for better portability, and intended to omit root name
+	/// if the path can be used without it.
+	/// @param _path Path to normalize the root path.
+	/// @param _workDir Current working directory path, must be absolute.
+	/// @returns a normalized root path.
+	static boost::filesystem::path normalizeCLIRootPathForVFS(
+		boost::filesystem::path const& _path,
+		boost::filesystem::path const& _workDir = boost::filesystem::current_path()
+	);
+
 	/// @returns true if all the path components of @a _prefix are present at the beginning of @a _path.
 	/// Both paths must be absolute (or have slash as root) and normalized (no . or .. segments, no
 	/// multiple consecutive slashes).
diff --git a/test/libsolidity/interface/FileReader.cpp b/test/libsolidity/interface/FileReader.cpp
index 39355e536f..ea85685fd1 100644
--- a/test/libsolidity/interface/FileReader.cpp
+++ b/test/libsolidity/interface/FileReader.cpp
@@ -313,8 +313,9 @@ BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_should_not_resolve_symlinks_unless_r
 	if (!createSymlinkIfSupportedByFilesystem(tempDir.path() / "abc", tempDir.path() / "sym", true))
 		return;
 
-	boost::filesystem::path expectedPrefixWithSymlinks = "/" / tempDir.path().relative_path();
-	boost::filesystem::path expectedPrefixWithoutSymlinks = "/" / boost::filesystem::weakly_canonical(tempDir).relative_path();
+	boost::filesystem::path expectedRootPath = FileReader::normalizeCLIRootPathForVFS(tempDir);
+	boost::filesystem::path expectedPrefixWithSymlinks = expectedRootPath / tempDir.path().relative_path();
+	boost::filesystem::path expectedPrefixWithoutSymlinks = expectedRootPath / boost::filesystem::weakly_canonical(tempDir).relative_path();
 
 	BOOST_CHECK_EQUAL(
 		FileReader::normalizeCLIPathForVFS(tempDir.path() / "sym/contract.sol", SymlinkResolution::Disabled),
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 73c999f3f7..169437f3c4 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -178,8 +178,9 @@ BOOST_AUTO_TEST_CASE(cli_input)
 	createFilesWithParentDirs({tempDir1.path() / "input1.sol"});
 	createFilesWithParentDirs({tempDir2.path() / "input2.sol"});
 
-	boost::filesystem::path expectedDir1 = "/" / tempDir1.path().relative_path();
-	boost::filesystem::path expectedDir2 = "/" / tempDir2.path().relative_path();
+	boost::filesystem::path expectedRootPath = FileReader::normalizeCLIRootPathForVFS(tempDir1);
+	boost::filesystem::path expectedDir1 = expectedRootPath / tempDir1.path().relative_path();
+	boost::filesystem::path expectedDir2 = expectedRootPath / tempDir2.path().relative_path();
 	soltestAssert(expectedDir1.is_absolute() || expectedDir1.root_path() == "/", "");
 	soltestAssert(expectedDir2.is_absolute() || expectedDir2.root_path() == "/", "");
 
@@ -223,7 +224,8 @@ BOOST_AUTO_TEST_CASE(cli_ignore_missing_some_files_exist)
 	TemporaryDirectory tempDir2(TEST_CASE_NAME);
 	createFilesWithParentDirs({tempDir1.path() / "input1.sol"});
 
-	boost::filesystem::path expectedDir1 = "/" / tempDir1.path().relative_path();
+	boost::filesystem::path expectedRootPath = FileReader::normalizeCLIRootPathForVFS(tempDir1);
+	boost::filesystem::path expectedDir1 = expectedRootPath / tempDir1.path().relative_path();
 	soltestAssert(expectedDir1.is_absolute() || expectedDir1.root_path() == "/", "");
 
 	// NOTE: Allowed paths should not be added for skipped files.

From b741ca3ab5148c5be9ea47a38c083b1b94688c92 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 21 Feb 2022 20:55:41 -0500
Subject: [PATCH 0413/1748] scripts/common.sh: 'diff --color' not supported by
 macOS.

---
 scripts/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index 4a98c00726..7cb96ed02b 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -180,7 +180,7 @@ function diff_values
     shift
     shift
 
-    diff --color=auto --unified=0 <(echo "$value1") <(echo "$value2") "$@"
+    diff --unified=0 <(echo "$value1") <(echo "$value2") "$@"
 }
 
 function safe_kill

From 1f9fab84a648068080ee79e1263351b4f9632324 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 24 Feb 2022 17:54:17 +0100
Subject: [PATCH 0414/1748] Remove release.sh/.bat scripts we no longer use

---
 .../fix_homebrew_paths_in_standalone_zip.py   | 66 -------------------
 scripts/release.bat                           | 38 -----------
 scripts/release.sh                            | 56 ----------------
 3 files changed, 160 deletions(-)
 delete mode 100755 scripts/fix_homebrew_paths_in_standalone_zip.py
 delete mode 100644 scripts/release.bat
 delete mode 100755 scripts/release.sh

diff --git a/scripts/fix_homebrew_paths_in_standalone_zip.py b/scripts/fix_homebrew_paths_in_standalone_zip.py
deleted file mode 100755
index 43f26795c3..0000000000
--- a/scripts/fix_homebrew_paths_in_standalone_zip.py
+++ /dev/null
@@ -1,66 +0,0 @@
-# ------------------------------------------------------------------------------
-# This Python script is used within the OS X release process, to ensure
-# that the standalone OS X ZIP files which we make are actually
-# standalone, and not implicitly dependent on Homebrew installs for
-# external libraries which we use.
-#
-# This implicit dependencies seem to show up only where we have
-# external dependencies which are dependent on each other, and the
-# path from one to another is an absolute path to "/usr/local/opt",
-# the Homebrew install location.   External dependencies which only
-# depend on system libraries are fine.   Our main applications seem
-# to be fine.
-#
-# An example of a dependency which requires this fix-up at the time
-# of writing is the following dependency edge:
-#
-# libjsonrpccpp-client.0.dylib
-#     -> /usr/local/opt/jsoncpp/lib/libjsoncpp.0.dylib
-#
-# See https://blogs.oracle.com/dipol/entry/dynamic_libraries_rpath_and_mac
-# for a little overview of "install_name_tool" and "otool".
-#
-# ------------------------------------------------------------------------------
-# 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/>
-#
-# (c) 2016 solidity contributors.
-# -----------------------------------------------------------------------------
-
-import os
-import subprocess
-import sys
-
-def readDependencies(fname):
-    with subprocess.Popen(['otool', '-L', fname], stdout=subprocess.PIPE) as o:
-        for line in o.stdout:
-            if line[0] == '\t':
-                library = line.split(' ', 1)[0][1:]
-                if (library.startswith("/usr/local/lib") or
-                    library.startswith("/usr/local/opt") or
-                    library.startswith("/Users/")
-                ):
-                    if os.path.basename(library) != os.path.basename(fname):
-                        command = "install_name_tool -change " + \
-                            library + " @executable_path/./" + \
-                            os.path.basename(library) + " " + fname
-                        print(command)
-                        os.system("chmod +w " + fname)
-                        os.system(command)
-
-root = sys.argv[1]
-for (dirpath, dirnames, filenames) in os.walk(root):
-    for filename in filenames:
-        readDependencies(os.path.join(root, filename))
diff --git a/scripts/release.bat b/scripts/release.bat
deleted file mode 100644
index a1a909ae00..0000000000
--- a/scripts/release.bat
+++ /dev/null
@@ -1,38 +0,0 @@
-@ECHO OFF
-
-REM ---------------------------------------------------------------------------
-REM Batch file for implementing release flow for solidity for Windows.
-REM
-REM The documentation for solidity is hosted at:
-REM
-REM     https://docs.soliditylang.org
-REM
-REM ---------------------------------------------------------------------------
-REM This file is part of solidity.
-REM
-REM solidity is free software: you can redistribute it and/or modify
-REM it under the terms of the GNU General Public License as published by
-REM the Free Software Foundation, either version 3 of the License, or
-REM (at your option) any later version.
-REM
-REM solidity is distributed in the hope that it will be useful,
-REM but WITHOUT ANY WARRANTY; without even the implied warranty of
-REM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-REM GNU General Public License for more details.
-REM
-REM You should have received a copy of the GNU General Public License
-REM along with solidity.  If not, see <http://www.gnu.org/licenses/>
-REM
-REM Copyright (c) 2016 solidity contributors.
-REM ---------------------------------------------------------------------------
-
-set CONFIGURATION=%1
-set VERSION=%2
-
-set "DLLS=MSVC_DLLS_NOT_FOUND"
-FOR /d %%d IN ("C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Redist\MSVC\*"
-    "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Redist\MSVC\*") DO set "DLLS=%%d\x86\Microsoft.VC141.CRT\msvc*.dll"
-
-7z a solidity-windows.zip ^
-    .\build\solc\%CONFIGURATION%\solc.exe .\build\test\%CONFIGURATION%\soltest.exe ^
-    "%DLLS%"
diff --git a/scripts/release.sh b/scripts/release.sh
deleted file mode 100755
index 88aaa5fef1..0000000000
--- a/scripts/release.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Bash script implementing release flow for solidity for Linux and macOS.
-#
-# TODO - At the time of writing, we only have ZIPs working.  Need to hook up
-# support for Homebrew and PPAs.
-#
-# The documentation for solidity is hosted at:
-#
-#     https://docs.soliditylang.org
-#
-# ------------------------------------------------------------------------------
-# 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/>
-#
-# (c) 2016 solidity contributors.
-#------------------------------------------------------------------------------
-
-ZIP_SUFFIX="$1"
-ZIP_TEMP_DIR="$(pwd)/build/zip/"
-
-# There is an implicit assumption here that we HAVE to run from root directory.
-REPO_ROOT=$(pwd)
-
-mkdir -p "$ZIP_TEMP_DIR"
-
-# Copy all the solidity executables into a temporary directory prior to ZIP creation
-
-cp "$REPO_ROOT/build/solc/solc" "$ZIP_TEMP_DIR"
-
-# For macOS, we run a fix-up script which alters all of the symbolic links within
-# the executables and dynamic libraries such that the ZIP becomes self-contained, by
-# revectoring all the dylib references to be relative to the directory containing the
-# application, so that the ZIPs are self-contained, with the only external references
-# being for kernel-level dylibs.
-
-if [[ "$OSTYPE" == "darwin"* ]]; then
-    python3 "$REPO_ROOT/scripts/fix_homebrew_paths_in_standalone_zip.py" "$ZIP_TEMP_DIR"
-fi
-
-# And ZIP it all up, with a filename suffix passed in on the command-line.
-mkdir -p "$REPO_ROOT/upload"
-zip -j "$REPO_ROOT/upload/solidity-$ZIP_SUFFIX.zip" "$ZIP_TEMP_DIR/"*

From 1762482a565e394d5efc6f8a4fd401359dbfcfe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 24 Feb 2022 17:57:10 +0100
Subject: [PATCH 0415/1748] Add instructions for creating the source tarball
 back to the release checklist

---
 ReleaseChecklist.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 39a3d9a324..6d5008cb37 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -26,7 +26,11 @@
  - [ ] Click the `PUBLISH RELEASE` button on the release page, creating the tag.
  - [ ] Wait for the CI runs on the tag itself.
 
-### Download Binaries
+### Upload Release Artifacts
+ - [ ] Switch to the tag that archives have to be created for.
+ - [ ] Create the ``prerelease.txt`` file: (``echo -n > prerelease.txt``).
+ - [ ] Run ``scripts/create_source_tarball.sh`` while being on the tag to create the source tarball. This will create the tarball in a directory called ``upload``.
+ - [ ] Take the tarball from the upload directory (its name should be ``solidity_x.x.x.tar.gz``, otherwise ``prerelease.txt`` was missing in the step before) and upload the source tarball to the release page.
  - [ ] Take the ``solc.exe`` binary from the ``b_win_release`` run of the released commit in circle-ci and add it to the release page as ``solc-windows.exe``.
  - [ ] Take the ``solc`` binary from the ``b_osx`` run of the released commit in circle-ci and add it to the release page as ``solc-macos``.
  - [ ] Take the ``solc`` binary from the ``b_ubu_static`` run of the released commit in circle-ci and add it to the release page as ``solc-static-linux``.

From fb7cdda89162bfc9c3f173e03016783896e0627e Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 28 Feb 2022 17:57:19 +0100
Subject: [PATCH 0416/1748] Fix iterable mapping example.

---
 docs/types/mapping-types.rst | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/docs/types/mapping-types.rst b/docs/types/mapping-types.rst
index 2b6d284bff..399523cf22 100644
--- a/docs/types/mapping-types.rst
+++ b/docs/types/mapping-types.rst
@@ -126,7 +126,7 @@ the ``sum`` function iterates over to sum all the values.
     :force:
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.6.8 <0.9.0;
+    pragma solidity ^0.8.8;
 
     struct IndexValue { uint keyIndex; uint value; }
     struct KeyFlag { uint key; bool deleted; }
@@ -137,6 +137,8 @@ the ``sum`` function iterates over to sum all the values.
         uint size;
     }
 
+    type Iterator is uint;
+
     library IterableMapping {
         function insert(itmap storage self, uint key, uint value) internal returns (bool replaced) {
             uint keyIndex = self.data[key].keyIndex;
@@ -166,25 +168,29 @@ the ``sum`` function iterates over to sum all the values.
             return self.data[key].keyIndex > 0;
         }
 
-        function iterateStart(itmap storage self) internal view returns (uint keyIndex) {
-            return iterateNext(self, type(uint).max);
+        function iterateStart(itmap storage self) internal view returns (Iterator) {
+            return iteratorSkipDeleted(self, 0);
         }
 
-        function iterateValid(itmap storage self, uint keyIndex) internal view returns (bool) {
-            return keyIndex < self.keys.length;
+        function iterateValid(itmap storage self, Iterator iterator) internal view returns (bool) {
+            return Iterator.unwrap(iterator) < self.keys.length;
         }
 
-        function iterateNext(itmap storage self, uint keyIndex) internal view returns (uint r_keyIndex) {
-            keyIndex++;
-            while (keyIndex < self.keys.length && self.keys[keyIndex].deleted)
-                keyIndex++;
-            return keyIndex;
+        function iterateNext(itmap storage self, Iterator iterator) internal view returns (Iterator) {
+            return iteratorSkipDeleted(self, Iterator.unwrap(iterator) + 1);
         }
 
-        function iterateGet(itmap storage self, uint keyIndex) internal view returns (uint key, uint value) {
+        function iterateGet(itmap storage self, Iterator iterator) internal view returns (uint key, uint value) {
+            uint keyIndex = Iterator.unwrap(iterator);
             key = self.keys[keyIndex].key;
             value = self.data[key].value;
         }
+
+        function iteratorSkipDeleted(itmap storage self, uint keyIndex) private view returns (Iterator) {
+            while (keyIndex < self.keys.length && self.keys[keyIndex].deleted)
+                keyIndex++;
+            return Iterator.wrap(keyIndex);
+        }
     }
 
     // How to use it
@@ -206,7 +212,7 @@ the ``sum`` function iterates over to sum all the values.
         // Computes the sum of all stored data.
         function sum() public view returns (uint s) {
             for (
-                uint i = data.iterateStart();
+                Iterator i = data.iterateStart();
                 data.iterateValid(i);
                 i = data.iterateNext(i)
             ) {

From bef69b595b17ac3cd9c7b060aad400d6b6f99da2 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 28 Feb 2022 18:56:20 +0100
Subject: [PATCH 0417/1748] Ignore cex in SMT test

---
 .../smtCheckerTests/userTypes/multisource_module.sol         | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol b/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
index 491b8600d9..846f3ab755 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
@@ -16,6 +16,7 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreOS: macos
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (s2.sol:259-292): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()\n    C.f(5) -- internal call\n    C.f(5) -- internal call
-// Warning 6328: (s2.sol:346-377): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()\n    C.f(5) -- internal call\n    C.f(5) -- internal call\n    C.g(1) -- internal call\n    C.g(1) -- internal call
+// Warning 6328: (s2.sol:259-292): CHC: Assertion violation happens here.
+// Warning 6328: (s2.sol:346-377): CHC: Assertion violation happens here.

From 5134dafb8e5184aeed73be30066f8e22591e0254 Mon Sep 17 00:00:00 2001
From: Callis Ezenwaka <callisezenwaka@gmail.com>
Date: Thu, 17 Feb 2022 00:28:34 +0100
Subject: [PATCH 0418/1748] Update typo in using-for.rst

Update typo in using-for.rst
---
 docs/assembly.rst            | 2 +-
 docs/contracts/using-for.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index 5427e0f511..e6dc6519c6 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -139,7 +139,7 @@ the variable will not point beyond ``calldatasize()`` is performed.
 For external function pointers the address and the function selector can be
 accessed using ``x.address`` and ``x.selector``.
 The selector consists of four right-aligned bytes.
-Both values are can be assigned to. For example:
+Both values can be assigned to. For example:
 
 .. code-block:: solidity
     :force:
diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index 582409904f..af6750f87d 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -120,7 +120,7 @@ It is also possible to extend elementary types in that way:
     }
 
 Note that all external library calls are actual EVM function calls. This means that
-if you pass memory or value types, a copy will be performed, even of the
+if you pass memory or value types, a copy will be performed, even in case of the
 ``self`` variable. The only situation where no copy will be performed
 is when storage reference variables are used or when internal library
 functions are called.

From d0d4bca35b206cdaf2bcb34b51dda26081d57e06 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 15 Feb 2022 16:19:55 +0100
Subject: [PATCH 0419/1748] Extend side effects to operations.

---
 libevmasm/SemanticInformation.cpp | 131 ++++++++++++++++++++++++++++--
 libevmasm/SemanticInformation.h   |  26 ++++++
 2 files changed, 151 insertions(+), 6 deletions(-)

diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index 41dc07fcf4..8a1266bcf0 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -29,6 +29,125 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 
+vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(Instruction _instruction)
+{
+	switch (_instruction)
+	{
+	case Instruction::SSTORE:
+	case Instruction::SLOAD:
+	{
+		assertThrow(memory(_instruction) == Effect::None, OptimizerException, "");
+		assertThrow(storage(_instruction) != Effect::None, OptimizerException, "");
+		Operation op;
+		op.effect = storage(_instruction);
+		op.location = Location::Storage;
+		op.startParameter = 0;
+		// We know that exactly one slot is affected.
+		op.lengthConstant = 1;
+		return {op};
+	}
+	case Instruction::MSTORE:
+	case Instruction::MSTORE8:
+	case Instruction::MLOAD:
+	{
+		assertThrow(memory(_instruction) != Effect::None, OptimizerException, "");
+		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
+		Operation op;
+		op.effect = memory(_instruction);
+		op.location = Location::Memory;
+		op.startParameter = 0;
+		if (_instruction == Instruction::MSTORE || _instruction == Instruction::MLOAD)
+			op.lengthConstant = 32;
+		else if (_instruction == Instruction::MSTORE8)
+			op.lengthConstant = 1;
+
+		return {op};
+	}
+	case Instruction::REVERT:
+	case Instruction::RETURN:
+	case Instruction::KECCAK256:
+	case Instruction::LOG0:
+	case Instruction::LOG1:
+	case Instruction::LOG2:
+	case Instruction::LOG3:
+	case Instruction::LOG4:
+	{
+		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
+		assertThrow(memory(_instruction) == Effect::Read, OptimizerException, "");
+		Operation op;
+		op.effect = memory(_instruction);
+		op.location = Location::Memory;
+		op.startParameter = 0;
+		op.lengthParameter = 1;
+		return {op};
+	}
+	case Instruction::EXTCODECOPY:
+	{
+		assertThrow(memory(_instruction) == Effect::Write, OptimizerException, "");
+		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
+		Operation op;
+		op.effect = memory(_instruction);
+		op.location = Location::Memory;
+		op.startParameter = 1;
+		op.lengthParameter = 3;
+		return {op};
+	}
+	case Instruction::CODECOPY:
+	case Instruction::CALLDATACOPY:
+	case Instruction::RETURNDATACOPY:
+	{
+		assertThrow(memory(_instruction) == Effect::Write, OptimizerException, "");
+		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
+		Operation op;
+		op.effect = memory(_instruction);
+		op.location = Location::Memory;
+		op.startParameter = 0;
+		op.lengthParameter = 2;
+		return {op};
+	}
+	case Instruction::STATICCALL:
+	case Instruction::CALL:
+	case Instruction::CALLCODE:
+	case Instruction::DELEGATECALL:
+	{
+		size_t paramCount = static_cast<size_t>(instructionInfo(_instruction).args);
+		vector<Operation> operations{
+			Operation{Location::Memory, Effect::Read, paramCount - 4, paramCount - 3, {}},
+			Operation{Location::Storage, Effect::Read, {}, {}, {}}
+		};
+		if (_instruction != Instruction::STATICCALL)
+			operations.emplace_back(Operation{Location::Storage, Effect::Write, {}, {}, {}});
+		operations.emplace_back(Operation{
+			Location::Memory,
+			Effect::Write,
+			paramCount - 2,
+			paramCount - 1,
+			{}
+		});
+		return operations;
+	}
+	case Instruction::CREATE:
+	case Instruction::CREATE2:
+		return vector<Operation>{
+			Operation{
+				Location::Memory,
+				Effect::Read,
+				1,
+				2,
+				{}
+			},
+			Operation{Location::Storage, Effect::Read, {}, {}, {}},
+			Operation{Location::Storage, Effect::Write, {}, {}, {}}
+		};
+	case Instruction::MSIZE:
+		// This is just to satisfy the assert below.
+		return vector<Operation>{};
+	default:
+		assertThrow(storage(_instruction) == None && memory(_instruction) == None, AssemblyException, "");
+	}
+	return {};
+}
+
 bool SemanticInformation::breaksCSEAnalysisBlock(AssemblyItem const& _item, bool _msizeImportant)
 {
 	switch (_item.type())
@@ -49,7 +168,7 @@ bool SemanticInformation::breaksCSEAnalysisBlock(AssemblyItem const& _item, bool
 	case PushLibraryAddress:
 	case PushImmutable:
 		return false;
-	case Operation:
+	case evmasm::Operation:
 	{
 		if (isSwapInstruction(_item) || isDupInstruction(_item))
 			return false;
@@ -79,7 +198,7 @@ bool SemanticInformation::breaksCSEAnalysisBlock(AssemblyItem const& _item, bool
 
 bool SemanticInformation::isCommutativeOperation(AssemblyItem const& _item)
 {
-	if (_item.type() != Operation)
+	if (_item.type() != evmasm::Operation)
 		return false;
 	switch (_item.instruction())
 	{
@@ -97,14 +216,14 @@ bool SemanticInformation::isCommutativeOperation(AssemblyItem const& _item)
 
 bool SemanticInformation::isDupInstruction(AssemblyItem const& _item)
 {
-	if (_item.type() != Operation)
+	if (_item.type() != evmasm::Operation)
 		return false;
 	return evmasm::isDupInstruction(_item.instruction());
 }
 
 bool SemanticInformation::isSwapInstruction(AssemblyItem const& _item)
 {
-	if (_item.type() != Operation)
+	if (_item.type() != evmasm::Operation)
 		return false;
 	return evmasm::isSwapInstruction(_item.instruction());
 }
@@ -116,7 +235,7 @@ bool SemanticInformation::isJumpInstruction(AssemblyItem const& _item)
 
 bool SemanticInformation::altersControlFlow(AssemblyItem const& _item)
 {
-	if (_item.type() != Operation)
+	if (_item.type() != evmasm::Operation)
 		return false;
 	switch (_item.instruction())
 	{
@@ -166,7 +285,7 @@ bool SemanticInformation::isDeterministic(AssemblyItem const& _item)
 {
 	assertThrow(_item.type() != VerbatimBytecode, AssemblyException, "");
 
-	if (_item.type() != Operation)
+	if (_item.type() != evmasm::Operation)
 		return true;
 
 	switch (_item.instruction())
diff --git a/libevmasm/SemanticInformation.h b/libevmasm/SemanticInformation.h
index 8ba2743c47..68693f9598 100644
--- a/libevmasm/SemanticInformation.h
+++ b/libevmasm/SemanticInformation.h
@@ -45,6 +45,32 @@ struct SemanticInformation
 		Write
 	};
 
+	enum class Location { Storage, Memory };
+
+	/**
+	 * Represents a read or write operation from or to one of the data locations.
+	 */
+	struct Operation
+	{
+		Location location;
+		Effect effect;
+		/// Start of affected area as an index into the parameters.
+		/// Unknown if not provided.
+		std::optional<size_t> startParameter;
+		/// Length of the affected area as an index into the parameters (if this is an opcode).
+		/// Unknown if neither this nor lengthConstant is provided.
+		std::optional<size_t> lengthParameter;
+		/// Length as a constant.
+		/// Unknown if neither this nor lengthArgument is provided.
+		std::optional<size_t> lengthConstant;
+	};
+
+	/// @returns the sequence of read write operations performed by the instruction.
+	/// Order matters.
+	/// For external calls, there is just one unknown read and one unknown write operation,
+	/// event though there might be multiple.
+	static std::vector<Operation> readWriteOperations(Instruction _instruction);
+
 	/// @returns true if the given items starts a new block for common subexpression analysis.
 	/// @param _msizeImportant if false, consider an operation non-breaking if its only side-effect is that it modifies msize.
 	static bool breaksCSEAnalysisBlock(AssemblyItem const& _item, bool _msizeImportant);

From 63f0a22c5d1f2621793db40bf33ddeeb514f598c Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 2 Mar 2022 13:49:40 +0100
Subject: [PATCH 0420/1748] Also save and restore the nesting depth.

---
 libyul/optimiser/UnusedStoreBase.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libyul/optimiser/UnusedStoreBase.cpp b/libyul/optimiser/UnusedStoreBase.cpp
index 8e34d172f4..de13a23ccb 100644
--- a/libyul/optimiser/UnusedStoreBase.cpp
+++ b/libyul/optimiser/UnusedStoreBase.cpp
@@ -73,6 +73,7 @@ void UnusedStoreBase::operator()(FunctionDefinition const& _functionDefinition)
 {
 	ScopedSaveAndRestore outerAssignments(m_stores, {});
 	ScopedSaveAndRestore forLoopInfo(m_forLoopInfo, {});
+	ScopedSaveAndRestore forLoopNestingDepth(m_forLoopNestingDepth, 0);
 
 	(*this)(_functionDefinition.body);
 

From 149a730f4a7f668124eae39b91da91b630b0ca72 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 1 Mar 2022 13:47:39 -0500
Subject: [PATCH 0421/1748] Update buildpacks to include jq.

---
 .../docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004           | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang     | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index fb79ea946a..bbc554e0f9 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="15"
+LABEL version="16"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -32,7 +32,7 @@ RUN apt-get update; \
 		software-properties-common \
 		ninja-build git wget \
 		libbz2-dev zlib1g-dev git curl uuid-dev \
-		pkg-config openjdk-8-jdk liblzma-dev unzip mlton m4; \
+		pkg-config openjdk-8-jdk liblzma-dev unzip mlton m4 jq; \
     apt-get install -qy python3-pip;
 
 # Install cmake 3.21.2 (minimum requirement is cmake 3.10)
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 3ecf9143a5..6a047aa275 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="10"
+LABEL version="11"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -37,7 +37,7 @@ RUN set -ex; \
 		cmake ninja-build \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
-		libcvc4-dev libz3-static-dev z3-static \
+		libcvc4-dev libz3-static-dev z3-static jq \
 		; \
 	apt-get install -qy python3-pip python3-sphinx; \
 	pip3 install codecov; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
index d262fa5fa5..853969ecdd 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="10"
+LABEL version="11"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -38,7 +38,7 @@ RUN set -ex; \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
 		clang \
-		libz3-static-dev \
+		libz3-static-dev jq \
 		; \
 	rm -rf /var/lib/apt/lists/*
 

From b0dcd7b9158ce2c0233640a47ab256dae39a1468 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 2 Mar 2022 13:47:04 +0100
Subject: [PATCH 0422/1748] Split out disassemble to remove numeric from
 instruction includes.

---
 libevmasm/AssemblyItem.h                   |  1 +
 libevmasm/CMakeLists.txt                   |  2 +
 libevmasm/ConstantOptimiser.h              |  1 +
 libevmasm/Disassemble.cpp                  | 76 ++++++++++++++++++++++
 libevmasm/Disassemble.h                    | 38 +++++++++++
 libevmasm/Instruction.cpp                  | 53 +--------------
 libevmasm/Instruction.h                    | 18 ++---
 libevmasm/SemanticInformation.h            |  3 +
 libsolidity/interface/StandardCompiler.cpp |  2 +-
 libyul/backends/evm/EVMMetrics.h           |  1 +
 libyul/optimiser/SimplificationRules.h     |  1 +
 solc/CommandLineInterface.cpp              |  1 +
 test/Common.h                              |  3 +-
 test/libevmasm/Assembler.cpp               |  1 +
 test/libsolidity/SolidityOptimizer.cpp     |  1 +
 test/libyul/ObjectCompilerTest.cpp         |  1 +
 16 files changed, 136 insertions(+), 67 deletions(-)
 create mode 100644 libevmasm/Disassemble.cpp
 create mode 100644 libevmasm/Disassemble.h

diff --git a/libevmasm/AssemblyItem.h b/libevmasm/AssemblyItem.h
index 1cbfe768d6..796a792e8a 100644
--- a/libevmasm/AssemblyItem.h
+++ b/libevmasm/AssemblyItem.h
@@ -26,6 +26,7 @@
 #include <libevmasm/Exceptions.h>
 #include <liblangutil/SourceLocation.h>
 #include <libsolutil/Common.h>
+#include <libsolutil/Numeric.h>
 #include <libsolutil/Assertions.h>
 #include <optional>
 #include <iostream>
diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
index 4e392aadda..6563b2c0fa 100644
--- a/libevmasm/CMakeLists.txt
+++ b/libevmasm/CMakeLists.txt
@@ -11,6 +11,8 @@ set(sources
 	ConstantOptimiser.h
 	ControlFlowGraph.cpp
 	ControlFlowGraph.h
+	Disassemble.cpp
+	Disassemble.h
 	Exceptions.h
 	ExpressionClasses.cpp
 	ExpressionClasses.h
diff --git a/libevmasm/ConstantOptimiser.h b/libevmasm/ConstantOptimiser.h
index d094bff73e..ece28d2496 100644
--- a/libevmasm/ConstantOptimiser.h
+++ b/libevmasm/ConstantOptimiser.h
@@ -26,6 +26,7 @@
 
 #include <liblangutil/EVMVersion.h>
 
+#include <libsolutil/Numeric.h>
 #include <libsolutil/Assertions.h>
 
 #include <vector>
diff --git a/libevmasm/Disassemble.cpp b/libevmasm/Disassemble.cpp
new file mode 100644
index 0000000000..aa5b2820c4
--- /dev/null
+++ b/libevmasm/Disassemble.cpp
@@ -0,0 +1,76 @@
+/*
+	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 <libevmasm/Disassemble.h>
+
+#include <libsolutil/Common.h>
+#include <libsolutil/CommonIO.h>
+#include <functional>
+
+using namespace std;
+using namespace solidity;
+using namespace solidity::util;
+using namespace solidity::evmasm;
+
+
+void solidity::evmasm::eachInstruction(
+	bytes const& _mem,
+	function<void(Instruction,u256 const&)> const& _onInstruction
+)
+{
+	for (auto it = _mem.begin(); it < _mem.end(); ++it)
+	{
+		Instruction const instr{*it};
+		int additional = 0;
+		if (isValidInstruction(instr))
+			additional = instructionInfo(instr).additional;
+
+		u256 data{};
+
+		// fill the data with the additional data bytes from the instruction stream
+		while (additional > 0 && std::next(it) < _mem.end())
+		{
+			data <<= 8;
+			data |= *++it;
+			--additional;
+		}
+
+		// pad the remaining number of additional octets with zeros
+		data <<= 8 * additional;
+
+		_onInstruction(instr, data);
+	}
+}
+
+string solidity::evmasm::disassemble(bytes const& _mem, string const& _delimiter)
+{
+	stringstream ret;
+	eachInstruction(_mem, [&](Instruction _instr, u256 const& _data) {
+		if (!isValidInstruction(_instr))
+			ret << "0x" << std::uppercase << std::hex << static_cast<int>(_instr) << _delimiter;
+		else
+		{
+			InstructionInfo info = instructionInfo(_instr);
+			ret << info.name;
+			if (info.additional)
+				ret << " 0x" << std::uppercase << std::hex << _data;
+			ret << _delimiter;
+		}
+	});
+	return ret.str();
+}
diff --git a/libevmasm/Disassemble.h b/libevmasm/Disassemble.h
new file mode 100644
index 0000000000..cf194e24b7
--- /dev/null
+++ b/libevmasm/Disassemble.h
@@ -0,0 +1,38 @@
+/*
+	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
+
+#pragma once
+
+#include <libsolutil/Common.h>
+#include <libsolutil/Numeric.h>
+
+#include <libevmasm/Instruction.h>
+
+#include <functional>
+#include <string>
+
+namespace solidity::evmasm
+{
+
+/// Iterate through EVM code and call a function on each instruction.
+void eachInstruction(bytes const& _mem, std::function<void(Instruction, u256 const&)> const& _onInstruction);
+
+/// Convert from EVM code to simple EVM assembly language.
+std::string disassemble(bytes const& _mem, std::string const& _delimiter = " ");
+
+}
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index 7ce36c2543..e2ce48b7f1 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -22,10 +22,6 @@
 
 #include <libevmasm/Instruction.h>
 
-#include <libsolutil/Common.h>
-#include <libsolutil/CommonIO.h>
-#include <functional>
-
 using namespace std;
 using namespace solidity;
 using namespace solidity::util;
@@ -325,53 +321,6 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::SELFDESTRUCT,	{ "SELFDESTRUCT",		0, 1, 0, true, Tier::Special } }
 };
 
-void solidity::evmasm::eachInstruction(
-	bytes const& _mem,
-	function<void(Instruction,u256 const&)> const& _onInstruction
-)
-{
-	for (auto it = _mem.begin(); it < _mem.end(); ++it)
-	{
-		auto instr = Instruction(*it);
-		int additional = 0;
-		if (isValidInstruction(instr))
-			additional = instructionInfo(instr).additional;
-
-		u256 data;
-
-		// fill the data with the additional data bytes from the instruction stream
-		while (additional > 0 && std::next(it) < _mem.end())
-		{
-			data <<= 8;
-			data |= *++it;
-			--additional;
-		}
-
-		// pad the remaining number of additional octets with zeros
-		data <<= 8 * additional;
-
-		_onInstruction(instr, data);
-	}
-}
-
-string solidity::evmasm::disassemble(bytes const& _mem, string const& _delimiter)
-{
-	stringstream ret;
-	eachInstruction(_mem, [&](Instruction _instr, u256 const& _data) {
-		if (!isValidInstruction(_instr))
-			ret << "0x" << std::uppercase << std::hex << static_cast<int>(_instr) << _delimiter;
-		else
-		{
-			InstructionInfo info = instructionInfo(_instr);
-			ret << info.name;
-			if (info.additional)
-				ret << " 0x" << std::uppercase << std::hex << _data;
-			ret << _delimiter;
-		}
-	});
-	return ret.str();
-}
-
 InstructionInfo solidity::evmasm::instructionInfo(Instruction _inst)
 {
 	try
@@ -380,7 +329,7 @@ InstructionInfo solidity::evmasm::instructionInfo(Instruction _inst)
 	}
 	catch (...)
 	{
-		return InstructionInfo({"<INVALID_INSTRUCTION: " + toString((unsigned)_inst) + ">", 0, 0, 0, false, Tier::Invalid});
+		return InstructionInfo({"<INVALID_INSTRUCTION: " + to_string(static_cast<unsigned>(_inst)) + ">", 0, 0, 0, false, Tier::Invalid});
 	}
 }
 
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index ad6bc97969..52bda8bf1d 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -25,8 +25,6 @@
 #include <libevmasm/Exceptions.h>
 #include <libsolutil/Common.h>
 #include <libsolutil/Assertions.h>
-#include <libsolutil/Numeric.h>
-#include <functional>
 
 namespace solidity::evmasm
 {
@@ -217,25 +215,25 @@ inline bool isLogInstruction(Instruction _inst)
 /// @returns the number of PUSH Instruction _inst
 inline unsigned getPushNumber(Instruction _inst)
 {
-	return (uint8_t)_inst - unsigned(Instruction::PUSH1) + 1;
+	return static_cast<uint8_t>(_inst) - unsigned(Instruction::PUSH1) + 1;
 }
 
 /// @returns the number of DUP Instruction _inst
 inline unsigned getDupNumber(Instruction _inst)
 {
-	return (uint8_t)_inst - unsigned(Instruction::DUP1) + 1;
+	return static_cast<uint8_t>(_inst) - unsigned(Instruction::DUP1) + 1;
 }
 
 /// @returns the number of SWAP Instruction _inst
 inline unsigned getSwapNumber(Instruction _inst)
 {
-	return (uint8_t)_inst - unsigned(Instruction::SWAP1) + 1;
+	return static_cast<uint8_t>(_inst) - unsigned(Instruction::SWAP1) + 1;
 }
 
 /// @returns the number of LOG Instruction _inst
 inline unsigned getLogNumber(Instruction _inst)
 {
-	return (uint8_t)_inst - unsigned(Instruction::LOG0);
+	return static_cast<uint8_t>(_inst) - unsigned(Instruction::LOG0);
 }
 
 /// @returns the PUSH<_number> instruction
@@ -266,7 +264,7 @@ inline Instruction logInstruction(unsigned _number)
 	return Instruction(unsigned(Instruction::LOG0) + _number);
 }
 
-enum class Tier : unsigned
+enum class Tier
 {
 	Zero = 0,	// 0, Zero
 	Base,		// 2, Quick
@@ -301,10 +299,4 @@ bool isValidInstruction(Instruction _inst);
 /// Convert from string mnemonic to Instruction type.
 extern const std::map<std::string, Instruction> c_instructions;
 
-/// Iterate through EVM code and call a function on each instruction.
-void eachInstruction(bytes const& _mem, std::function<void(Instruction, u256 const&)> const& _onInstruction);
-
-/// Convert from EVM code to simple EVM assembly language.
-std::string disassemble(bytes const& _mem, std::string const& _delimiter = " ");
-
 }
diff --git a/libevmasm/SemanticInformation.h b/libevmasm/SemanticInformation.h
index 68693f9598..36aabd55f9 100644
--- a/libevmasm/SemanticInformation.h
+++ b/libevmasm/SemanticInformation.h
@@ -26,6 +26,9 @@
 
 #include <libevmasm/Instruction.h>
 
+#include <optional>
+#include <vector>
+
 namespace solidity::evmasm
 {
 
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 75876d9353..93ac20b03c 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -29,7 +29,7 @@
 #include <libyul/Exceptions.h>
 #include <libyul/optimiser/Suite.h>
 
-#include <libevmasm/Instruction.h>
+#include <libevmasm/Disassemble.h>
 
 #include <libsmtutil/Exceptions.h>
 
diff --git a/libyul/backends/evm/EVMMetrics.h b/libyul/backends/evm/EVMMetrics.h
index 19702b8f32..b67cb77cdd 100644
--- a/libyul/backends/evm/EVMMetrics.h
+++ b/libyul/backends/evm/EVMMetrics.h
@@ -23,6 +23,7 @@
 
 #include <libyul/optimiser/ASTWalker.h>
 #include <liblangutil/EVMVersion.h>
+#include <libsolutil/Numeric.h>
 #include <libevmasm/Instruction.h>
 
 namespace solidity::yul
diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
index d4da4a2b09..77018bb380 100644
--- a/libyul/optimiser/SimplificationRules.h
+++ b/libyul/optimiser/SimplificationRules.h
@@ -27,6 +27,7 @@
 #include <libyul/YulString.h>
 
 #include <libsolutil/CommonData.h>
+#include <libsolutil/Numeric.h>
 
 #include <liblangutil/EVMVersion.h>
 #include <liblangutil/SourceLocation.h>
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index bafd3a7356..24e4ee7dd8 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -44,6 +44,7 @@
 #include <libyul/AssemblyStack.h>
 
 #include <libevmasm/Instruction.h>
+#include <libevmasm/Disassemble.h>
 #include <libevmasm/GasMeter.h>
 
 #include <liblangutil/Exceptions.h>
diff --git a/test/Common.h b/test/Common.h
index f3ea9e6f48..e7e211d9e6 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -21,6 +21,7 @@
 #include <libsolutil/Exceptions.h>
 #include <liblangutil/EVMVersion.h>
 #include <liblangutil/Exceptions.h>
+#include <libsolutil/Numeric.h>
 
 #include <test/evmc/evmc.h>
 
@@ -47,7 +48,7 @@ static constexpr auto heraFilename = "libhera.so";
 static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.5.0/hera-0.5.0-linux-x86_64.tar.gz";
 #endif
 
-struct ConfigException : public util::Exception {};
+struct ConfigException: public util::Exception {};
 
 struct CommonOptions
 {
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index c7f28f654c..78e598bcab 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -23,6 +23,7 @@
 
 #include <libevmasm/Assembly.h>
 #include <libsolutil/JSON.h>
+#include <libevmasm/Disassemble.h>
 #include <libyul/Exceptions.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index 9c9d9a7e6b..eb4102b150 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -25,6 +25,7 @@
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
 #include <libevmasm/Instruction.h>
+#include <libevmasm/Disassemble.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/libyul/ObjectCompilerTest.cpp b/test/libyul/ObjectCompilerTest.cpp
index 256bced21b..f22870952d 100644
--- a/test/libyul/ObjectCompilerTest.cpp
+++ b/test/libyul/ObjectCompilerTest.cpp
@@ -25,6 +25,7 @@
 #include <libyul/AssemblyStack.h>
 
 #include <libevmasm/Instruction.h>
+#include <libevmasm/Disassemble.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/SourceReferenceFormatter.h>

From e6848caac1246650ac5108f9abd08ac877b0f592 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 3 Feb 2022 11:49:16 +0100
Subject: [PATCH 0423/1748] Allow annotating inline assembly as memory-safe.

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/DocStringTagParser.cpp   | 66 +++++++++++++++++++
 libsolidity/analysis/DocStringTagParser.h     |  1 +
 libsolidity/ast/ASTAnnotations.h              |  2 +
 libsolidity/codegen/ir/IRGenerationContext.h  |  8 +--
 libsolidity/codegen/ir/IRGenerator.cpp        |  8 +--
 .../codegen/ir/IRGeneratorForStatements.cpp   |  3 +-
 .../inlineAssembly/invalid_natspec.sol        | 14 ++++
 .../inlineAssembly/natspec_memory_safe.sol    |  6 ++
 9 files changed, 100 insertions(+), 9 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/natspec_memory_safe.sol

diff --git a/Changelog.md b/Changelog.md
index fd7dda5847..181c386aa0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.13 (unreleased)
 
 Language Features:
+ * General: Allow annotating inline assembly as memory-safe to allow optimizations and stack limit evasion that rely on respecting Solidity's memory model.
 
 
 Compiler Features:
diff --git a/libsolidity/analysis/DocStringTagParser.cpp b/libsolidity/analysis/DocStringTagParser.cpp
index 137cdb4099..5dc68d97f0 100644
--- a/libsolidity/analysis/DocStringTagParser.cpp
+++ b/libsolidity/analysis/DocStringTagParser.cpp
@@ -30,6 +30,7 @@
 #include <liblangutil/Common.h>
 
 #include <range/v3/algorithm/any_of.hpp>
+#include <range/v3/view/filter.hpp>
 
 #include <boost/algorithm/string.hpp>
 
@@ -162,6 +163,71 @@ bool DocStringTagParser::visit(ErrorDefinition const& _error)
 	return true;
 }
 
+bool DocStringTagParser::visit(InlineAssembly const& _assembly)
+{
+	if (!_assembly.documentation())
+		return true;
+	StructuredDocumentation documentation{-1, _assembly.location(), _assembly.documentation()};
+	ErrorList errors;
+	ErrorReporter errorReporter{errors};
+	auto docTags = DocStringParser{documentation, errorReporter}.parse();
+
+	if (!errors.empty())
+	{
+		SecondarySourceLocation ssl;
+		for (auto const& error: errors)
+			if (error->comment())
+				ssl.append(
+					*error->comment(),
+					_assembly.location()
+				);
+		m_errorReporter.warning(
+			7828_error,
+			_assembly.location(),
+			"Inline assembly has invalid NatSpec documentation.",
+			ssl
+		);
+	}
+
+	for (auto const& [tagName, tagValue]: docTags)
+	{
+		if (tagName == "solidity")
+		{
+			vector<string> values;
+			boost::split(values, tagValue.content, isWhiteSpace);
+
+			set<string> valuesSeen;
+			set<string> duplicates;
+			for (auto const& value: values | ranges::views::filter(not_fn(&string::empty)))
+				if (valuesSeen.insert(value).second)
+				{
+					if (value == "memory-safe-assembly")
+						_assembly.annotation().memorySafe = true;
+					else
+						m_errorReporter.warning(
+							8787_error,
+							_assembly.location(),
+							"Unexpected value for @solidity tag in inline assembly: " + value
+						);
+				}
+				else if (duplicates.insert(value).second)
+					m_errorReporter.warning(
+						4377_error,
+						_assembly.location(),
+						"Value for @solidity tag in inline assembly specified multiple times: " + value
+					);
+		}
+		else
+			m_errorReporter.warning(
+				6269_error,
+				_assembly.location(),
+				"Unexpected NatSpec tag \"" + tagName + "\" with value \"" + tagValue.content + "\" in inline assembly."
+			);
+	}
+
+	return true;
+}
+
 void DocStringTagParser::checkParameters(
 	CallableDeclaration const& _callable,
 	StructurallyDocumented const& _node,
diff --git a/libsolidity/analysis/DocStringTagParser.h b/libsolidity/analysis/DocStringTagParser.h
index 84fde6c6c0..248befcb82 100644
--- a/libsolidity/analysis/DocStringTagParser.h
+++ b/libsolidity/analysis/DocStringTagParser.h
@@ -48,6 +48,7 @@ class DocStringTagParser: private ASTConstVisitor
 	bool visit(ModifierDefinition const& _modifier) override;
 	bool visit(EventDefinition const& _event) override;
 	bool visit(ErrorDefinition const& _error) override;
+	bool visit(InlineAssembly const& _assembly) override;
 
 	void checkParameters(
 		CallableDeclaration const& _callable,
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index 53931e4263..4489dce8d2 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -220,6 +220,8 @@ struct InlineAssemblyAnnotation: StatementAnnotation
 	std::map<yul::Identifier const*, ExternalIdentifierInfo> externalReferences;
 	/// Information generated during analysis phase.
 	std::shared_ptr<yul::AsmAnalysisInfo> analysisInfo;
+	/// True, if the assembly block was annotated to be memory-safe.
+	bool memorySafe = false;
 };
 
 struct BlockAnnotation: StatementAnnotation, ScopableAnnotation
diff --git a/libsolidity/codegen/ir/IRGenerationContext.h b/libsolidity/codegen/ir/IRGenerationContext.h
index cf01dc4f48..ea960bb70b 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.h
+++ b/libsolidity/codegen/ir/IRGenerationContext.h
@@ -160,8 +160,8 @@ class IRGenerationContext
 
 	std::set<ContractDefinition const*, ASTNode::CompareByID>& subObjectsCreated() { return m_subObjects; }
 
-	bool inlineAssemblySeen() const { return m_inlineAssemblySeen; }
-	void setInlineAssemblySeen() { m_inlineAssemblySeen = true; }
+	bool memoryUnsafeInlineAssemblySeen() const { return m_memoryUnsafeInlineAssemblySeen; }
+	void setMemoryUnsafeInlineAssemblySeen() { m_memoryUnsafeInlineAssemblySeen = true; }
 
 	/// @returns the runtime ID to be used for the function in the dispatch routine
 	/// and for internal function pointers.
@@ -202,8 +202,8 @@ class IRGenerationContext
 	/// Whether to use checked or wrapping arithmetic.
 	Arithmetic m_arithmetic = Arithmetic::Checked;
 
-	/// Flag indicating whether any inline assembly block was seen.
-	bool m_inlineAssemblySeen = false;
+	/// Flag indicating whether any memory-unsafe inline assembly block was seen.
+	bool m_memoryUnsafeInlineAssemblySeen = false;
 
 	/// Function definitions queued for code generation. They're the Solidity functions whose calls
 	/// were discovered by the IR generator during AST traversal.
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 6b52010d99..cb187b424c 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -213,8 +213,8 @@ string IRGenerator::generate(
 	t("subObjects", subObjectSources(m_context.subObjectsCreated()));
 
 	// This has to be called only after all other code generation for the creation object is complete.
-	bool creationInvolvesAssembly = m_context.inlineAssemblySeen();
-	t("memoryInitCreation", memoryInit(!creationInvolvesAssembly));
+	bool creationInvolvesMemoryUnsafeAssembly = m_context.memoryUnsafeInlineAssemblySeen();
+	t("memoryInitCreation", memoryInit(!creationInvolvesMemoryUnsafeAssembly));
 	t("useSrcMapCreation", formatUseSrcMap(m_context));
 
 	resetContext(_contract, ExecutionContext::Deployed);
@@ -239,8 +239,8 @@ string IRGenerator::generate(
 	t("useSrcMapDeployed", formatUseSrcMap(m_context));
 
 	// This has to be called only after all other code generation for the deployed object is complete.
-	bool deployedInvolvesAssembly = m_context.inlineAssemblySeen();
-	t("memoryInitDeployed", memoryInit(!deployedInvolvesAssembly));
+	bool deployedInvolvesMemoryUnsafeAssembly = m_context.memoryUnsafeInlineAssemblySeen();
+	t("memoryInitDeployed", memoryInit(!deployedInvolvesMemoryUnsafeAssembly));
 
 	solAssert(_contract.annotation().creationCallGraph->get() != nullptr, "");
 	solAssert(_contract.annotation().deployedCallGraph->get() != nullptr, "");
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 9fb73f0214..cf0977c6e0 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2138,7 +2138,8 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 bool IRGeneratorForStatements::visit(InlineAssembly const& _inlineAsm)
 {
 	setLocation(_inlineAsm);
-	m_context.setInlineAssemblySeen();
+	if (!_inlineAsm.annotation().memorySafe)
+		m_context.setMemoryUnsafeInlineAssemblySeen();
 	CopyTranslate bodyCopier{_inlineAsm.dialect(), m_context, _inlineAsm.annotation().externalReferences};
 
 	yul::Statement modified = bodyCopier(_inlineAsm.operations());
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
new file mode 100644
index 0000000000..3a6ccefb37
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
@@ -0,0 +1,14 @@
+contract C {
+	function f() public pure {
+		/// @test test
+		assembly {}
+		/// @solidity test
+		assembly {}
+		/// @param
+		assembly {}
+	}
+}
+// ----
+// Warning 6269: (60-71): Unexpected natspec tag in inline assembly: test
+// Warning 8787: (95-106): Unexpected value for @solidity tag in inline assembly: test
+// Warning 7828: (122-133): Inline assembly has invalid natspec documentation.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/natspec_memory_safe.sol b/test/libsolidity/syntaxTests/inlineAssembly/natspec_memory_safe.sol
new file mode 100644
index 0000000000..b93b203186
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/natspec_memory_safe.sol
@@ -0,0 +1,6 @@
+contract C {
+	function f() public pure {
+		// @solidity memory-safe-assembly
+		assembly {}
+	}
+}
\ No newline at end of file

From 9bcfcc61a771c3edd7e42d5ea545369415d5f22d Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 10 Feb 2022 17:57:27 +0100
Subject: [PATCH 0424/1748] Inline assembly without memory effects is
 implicitly memory safe.

---
 libsolidity/analysis/DocStringTagParser.cpp         |  2 +-
 libsolidity/analysis/TypeChecker.cpp                | 10 ++++++++--
 libsolidity/ast/ASTAnnotations.h                    |  4 +++-
 libsolidity/codegen/ir/IRGeneratorForStatements.cpp |  2 +-
 libyul/AsmAnalysis.cpp                              |  1 +
 libyul/AsmAnalysis.h                                |  4 ++++
 6 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/libsolidity/analysis/DocStringTagParser.cpp b/libsolidity/analysis/DocStringTagParser.cpp
index 5dc68d97f0..7be9cf8dfc 100644
--- a/libsolidity/analysis/DocStringTagParser.cpp
+++ b/libsolidity/analysis/DocStringTagParser.cpp
@@ -202,7 +202,7 @@ bool DocStringTagParser::visit(InlineAssembly const& _assembly)
 				if (valuesSeen.insert(value).second)
 				{
 					if (value == "memory-safe-assembly")
-						_assembly.annotation().memorySafe = true;
+						_assembly.annotation().markedMemorySafe = true;
 					else
 						m_errorReporter.warning(
 							8787_error,
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 74701bde0f..955c66f840 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -763,6 +763,7 @@ void TypeChecker::endVisit(FunctionTypeName const& _funType)
 
 bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 {
+	bool lvalueAccessToMemoryVariable = false;
 	// External references have already been resolved in a prior stage and stored in the annotation.
 	// We run the resolve step again regardless.
 	yul::ExternalIdentifierAccess::Resolver identifierAccess = [&](
@@ -787,6 +788,8 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 		if (auto var = dynamic_cast<VariableDeclaration const*>(declaration))
 		{
 			solAssert(var->type(), "Expected variable type!");
+			if (_context == yul::IdentifierContext::LValue && var->type()->dataStoredIn(DataLocation::Memory))
+				lvalueAccessToMemoryVariable = true;
 			if (var->immutable())
 			{
 				m_errorReporter.typeError(3773_error, nativeLocationOf(_identifier), "Assembly access to immutable variables is not supported.");
@@ -974,8 +977,11 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 		identifierAccess
 	);
 	if (!analyzer.analyze(_inlineAssembly.operations()))
-		return false;
-	return true;
+		solAssert(m_errorReporter.hasErrors());
+	_inlineAssembly.annotation().hasMemoryEffects =
+		lvalueAccessToMemoryVariable ||
+		(analyzer.sideEffects().memory != yul::SideEffects::None);
+	return false;
 }
 
 bool TypeChecker::visit(IfStatement const& _ifStatement)
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index 4489dce8d2..0d6901ef27 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -221,7 +221,9 @@ struct InlineAssemblyAnnotation: StatementAnnotation
 	/// Information generated during analysis phase.
 	std::shared_ptr<yul::AsmAnalysisInfo> analysisInfo;
 	/// True, if the assembly block was annotated to be memory-safe.
-	bool memorySafe = false;
+	bool markedMemorySafe = false;
+	/// True, if the assembly block involves any memory opcode or assigns to variables in memory.
+	SetOnce<bool> hasMemoryEffects;
 };
 
 struct BlockAnnotation: StatementAnnotation, ScopableAnnotation
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index cf0977c6e0..263f90261e 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2138,7 +2138,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 bool IRGeneratorForStatements::visit(InlineAssembly const& _inlineAsm)
 {
 	setLocation(_inlineAsm);
-	if (!_inlineAsm.annotation().memorySafe)
+	if (*_inlineAsm.annotation().hasMemoryEffects && !_inlineAsm.annotation().markedMemorySafe)
 		m_context.setMemoryUnsafeInlineAssemblySeen();
 	CopyTranslate bodyCopier{_inlineAsm.dialect(), m_context, _inlineAsm.annotation().externalReferences};
 
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index d19aa1a4e4..c38c0ba8e2 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -316,6 +316,7 @@ vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 			literalArguments = &f->literalArguments;
 
 		validateInstructions(_funCall);
+		m_sideEffects += f->sideEffects;
 	}
 	else if (m_currentScope->lookup(_funCall.functionName.name, GenericVisitor{
 		[&](Scope::Variable const&)
diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
index dc2770500b..c71b4cbe31 100644
--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@@ -94,6 +94,8 @@ class AsmAnalyzer
 	void operator()(Leave const&) { }
 	void operator()(Block const& _block);
 
+	/// @returns the worst side effects encountered during analysis (including within defined functions).
+	SideEffects const& sideEffects() const { return m_sideEffects; }
 private:
 	/// Visits the expression, expects that it evaluates to exactly one value and
 	/// returns the type. Reports errors on errors and returns the default type.
@@ -128,6 +130,8 @@ class AsmAnalyzer
 	/// Names of data objects to be referenced by builtin functions with literal arguments.
 	std::set<YulString> m_dataNames;
 	ForLoop const* m_currentForLoop = nullptr;
+	/// Worst side effects encountered during analysis (including within defined functions).
+	SideEffects m_sideEffects;
 };
 
 }

From dfb7bf2853cfbe2f0a44f4665cbc5ed6201dbe5c Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 3 Feb 2022 12:37:40 +0100
Subject: [PATCH 0425/1748] Report memoryguard in stack too deep error.

---
 libyul/backends/evm/EVMObjectCompiler.cpp | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index bede32d174..c3c95d8bc5 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -25,6 +25,8 @@
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/backends/evm/OptimizedEVMCodeTransform.h>
 
+#include <libyul/optimiser/FunctionCallFinder.h>
+
 #include <libyul/Object.h>
 #include <libyul/Exceptions.h>
 
@@ -74,7 +76,22 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 			OptimizedEVMCodeTransform::UseNamedLabels::ForFirstFunctionOfEachName
 		);
 		if (!stackErrors.empty())
-			BOOST_THROW_EXCEPTION(stackErrors.front());
+		{
+			vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
+				*_object.code,
+				"memoryguard"_yulstring
+			);
+			auto stackError = stackErrors.front();
+			string msg = stackError.comment() ? *stackError.comment() : "";
+			if (memoryGuardCalls.empty())
+				msg += "\nNo memoryguard was present. "
+					"Consider using memory-safe assembly only and annotating it via "
+					"\"/// @solidity memory-safe-assembly\".";
+			else
+				msg += "\nmemoryguard was present.";
+			stackError << util::errinfo_comment(msg);
+			BOOST_THROW_EXCEPTION(stackError);
+		}
 	}
 	else
 	{

From 62a997ac97130ee63d0a60145f7035e3947d4de6 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 3 Feb 2022 16:08:32 +0100
Subject: [PATCH 0426/1748] Documentation.

---
 docs/assembly.rst            | 96 ++++++++++++++++++++++++++++++++++++
 docs/ir-breaking-changes.rst |  2 +
 2 files changed, 98 insertions(+)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index e6dc6519c6..b0ce0e5248 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -228,6 +228,11 @@ of their block is reached.
 Conventions in Solidity
 -----------------------
 
+.. _assembly-typed-variables:
+
+Values of Typed Variables
+=========================
+
 In contrast to EVM assembly, Solidity has types which are narrower than 256 bits,
 e.g. ``uint24``. For efficiency, most arithmetic operations ignore the fact that
 types can be shorter than 256
@@ -237,6 +242,11 @@ This means that if you access such a variable
 from within inline assembly, you might have to manually clean the higher-order bits
 first.
 
+.. _assembly-memory-management:
+
+Memory Management
+=================
+
 Solidity manages memory in the following way. There is a "free memory pointer"
 at position ``0x40`` in memory. If you want to allocate memory, use the memory
 starting from where this pointer points at and update it.
@@ -268,3 +278,89 @@ first slot of the array and followed by the array elements.
     Statically-sized memory arrays do not have a length field, but it might be added later
     to allow better convertibility between statically- and dynamically-sized arrays, so
     do not rely on this.
+
+Memory Safety
+=============
+
+Without the use of inline assembly, the compiler can rely on memory to remain in a well-defined
+state at all times. This is especially relevant for :ref:`the new code generation pipeline via Yul IR <ir-breaking-changes>`:
+this code generation path can move local variables from stack to memory to avoid stack-too-deep errors and
+perform additional memory optimizations, if it can rely on certain assumptions about memory use.
+
+While we recommend to always respect Solidity's memory model, inline assembly allows you to use memory
+in an incompatible way. Therefore, moving stack variables to memory and additional memory optimizations are,
+by default, disabled in the presence of any inline assembly block that contains a memory operation or assigns
+to solidity variables in memory.
+
+However, you can specifically annotate an assembly block to indicate that it in fact respects Solidity's memory
+model as follows:
+
+.. code-block:: solidity
+
+    /// @solidity memory-safe-assembly
+    assembly {
+        ...
+    }
+
+In particular, a memory-safe assembly block may only access the following memory ranges:
+
+- Memory allocated by yourself using a mechanism like the ``allocate`` function described above.
+- Memory allocated by Solidity, e.g. memory within the bounds of a memory array you reference.
+- The scratch space between memory offset 0 and 64 mentioned above.
+- Temporary memory that is located *after* the value of the free memory pointer at the beginning of the assembly block,
+  i.e. memory that is "allocated" at the free memory pointer without updating the free memory pointer.
+
+Furthermore, if the assembly block assigns to Solidity variables in memory, you need to assure that accesses to
+the Solidity variables only access these memory ranges.
+
+Since this is mainly about the optimizer, these restrictions still need to be followed, even if the assembly block
+reverts or terminates. As an example, the following assembly snippet is not memory safe:
+
+.. code-block:: solidity
+
+    assembly {
+      returndatacopy(0, 0, returndatasize())
+      revert(0, returndatasize())
+    }
+
+But the following is:
+
+.. code-block:: solidity
+
+    /// @solidity memory-safe-assembly
+    assembly {
+      let p := mload(0x40)
+      returndatacopy(p, 0, returndatasize())
+      revert(p, returndatasize())
+    }
+
+Note that you do not need to update the free memory pointer if there is no following allocation,
+but you can only use memory starting from the current offset given by the free memory pointer.
+
+If the memory operations use a length of zero, it is also fine to just use any offset (not only if it falls into the scratch space):
+
+.. code-block:: solidity
+
+    /// @solidity memory-safe-assembly
+    assembly {
+      revert(0, 0)
+    }
+
+Note that not only memory operations in inline assembly itself can be memory-unsafe, but also assignments to
+solidity variables of reference type in memory. For example the following is not memory-safe:
+
+.. code-block:: solidity
+
+    bytes memory x;
+    assembly {
+      x := 0x40
+    }
+    x[0x20] = 0x42;
+
+Inline assembly that neither involves any operations that access memory nor assigns to any solidity variables
+in memory is automatically considered memory-safe and does not need to be annotated.
+
+.. warning::
+    It is your responsibility to make sure that the assembly actually satisfies the memory model. If you annotate
+    an assembly block as memory-safe, but violate one of the memory assumptions, this **will** lead to incorrect and
+    undefined behaviour that cannot easily be discovered by testing.
diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index c1f6deb57f..3fce53b3b8 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -1,6 +1,8 @@
 
 .. index: ir breaking changes
 
+.. _ir-breaking-changes:
+
 *********************************
 Solidity IR-based Codegen Changes
 *********************************

From ad13062978beedd9960e81875ee7c9c878d78b40 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 3 Feb 2022 12:00:06 +0100
Subject: [PATCH 0427/1748] Patch external tests with a safe inline assembly
 annotation.

---
 test/externalTests/ens.sh     | 4 +++-
 test/externalTests/trident.sh | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 734c5d8ae8..e4edbf46c9 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -48,7 +48,7 @@ function ens_test
         "${compile_only_presets[@]}"
         #ir-no-optimize           # Compilation fails with "YulException: Variable var__945 is 1 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var__945 is 1 slot(s) too deep inside the stack."
-        #ir-optimize-evm+yul      # Compilation fails with "YulException: Variable _5 is 1 too deep in the stack [ _5 usr$i usr$h _7 usr$scratch usr$k usr$f _4 usr$len usr$j_2 RET _2 _1 var_data_mpos usr$totallen usr$x _12 ]"
+        ir-optimize-evm+yul      # Needs memory-safe inline assembly patch
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
     )
@@ -68,6 +68,8 @@ function ens_test
     replace_version_pragmas
     neutralize_packaged_contracts
 
+    find . -name "*.sol" -exec sed -i -e 's/^\(\s*\)\(assembly\)/\1\/\/\/ @solidity memory-safe-assembly\n\1\2/' '{}' \;
+
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
         store_benchmark_report hardhat ens "$repo" "$preset"
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index 5e230560d5..6c1f56fbb1 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -56,7 +56,7 @@ function trident_test
         "${compile_only_presets[@]}"
         #ir-no-optimize            # Compilation fails with: "YulException: Variable var_amount_165 is 9 slot(s) too deep inside the stack."
         #ir-optimize-evm-only      # Compilation fails with: "YulException: Variable var_amount_165 is 9 slot(s) too deep inside the stack."
-        #ir-optimize-evm+yul       # Compilation fails with: "YulException: Cannot swap Variable var_nearestTick with Variable _4: too deep in the stack by 4 slots"
+        ir-optimize-evm+yul       # Needs memory-safe inline assembly patch
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
@@ -87,6 +87,7 @@ function trident_test
     sed -i 's|uint32(-1)|type(uint32).max|g' contracts/flat/BentoBoxV1Flat.sol
     sed -i 's|IERC20(0)|IERC20(address(0))|g' contracts/flat/BentoBoxV1Flat.sol
     sed -i 's|IStrategy(0)|IStrategy(address(0))|g' contracts/flat/BentoBoxV1Flat.sol
+    find contracts -name "*.sol" -exec sed -i -e 's/^\(\s*\)\(assembly\)/\1\/\/\/ @solidity memory-safe-assembly\n\1\2/' '{}' \;
 
     # @sushiswap/core package contains contracts that get built with 0.6.12 and fail our compiler
     # version check. It's not used by tests so we can remove it.

From 6b6e163be5adec74d39f3f8e39739b658988381c Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 10 Feb 2022 17:57:43 +0100
Subject: [PATCH 0428/1748] Tests.

---
 test/CMakeLists.txt                           |  2 +
 test/InteractiveTests.h                       |  2 +
 .../constant_optimizer_yul/output             | 11 +--
 .../input.sol                                 |  2 +-
 .../output                                    |  7 +-
 .../input.sol                                 |  2 +-
 .../output                                    |  6 +-
 test/libsolidity/MemoryGuardTest.cpp          | 78 +++++++++++++++++++
 test/libsolidity/MemoryGuardTest.h            | 53 +++++++++++++
 .../constructor_safe_deploy_unsafe.sol        | 17 ++++
 .../constructor_unsafe_deploy_safe.sol        | 17 ++++
 .../memoryGuardTests/free_function.sol        | 29 +++++++
 .../memoryGuardTests/multi_annotation.sol     | 17 ++++
 .../memoryGuardTests/multiple_contracts.sol   | 25 ++++++
 .../safe_and_unmarked_empty.sol               | 10 +++
 .../safe_and_unmarked_unsafe.sol              | 10 +++
 test/libsolidity/memoryGuardTests/stub.sol    |  4 +
 .../unmarked_but_no_memory_access.sol         |  8 ++
 .../unmarked_with_memory_access.sol           |  8 ++
 .../unmarked_with_memory_assignment.sol       | 11 +++
 .../externalContracts/prbmath_unsigned.sol    |  2 +-
 .../inlineAssembly/invalid_natspec.sol        |  4 +-
 .../inlineAssembly/natspec_multi.sol          | 23 ++++++
 .../natspec_multi_swallowed.sol               | 19 +++++
 test/tools/CMakeLists.txt                     |  1 +
 25 files changed, 354 insertions(+), 14 deletions(-)
 create mode 100644 test/libsolidity/MemoryGuardTest.cpp
 create mode 100644 test/libsolidity/MemoryGuardTest.h
 create mode 100644 test/libsolidity/memoryGuardTests/constructor_safe_deploy_unsafe.sol
 create mode 100644 test/libsolidity/memoryGuardTests/constructor_unsafe_deploy_safe.sol
 create mode 100644 test/libsolidity/memoryGuardTests/free_function.sol
 create mode 100644 test/libsolidity/memoryGuardTests/multi_annotation.sol
 create mode 100644 test/libsolidity/memoryGuardTests/multiple_contracts.sol
 create mode 100644 test/libsolidity/memoryGuardTests/safe_and_unmarked_empty.sol
 create mode 100644 test/libsolidity/memoryGuardTests/safe_and_unmarked_unsafe.sol
 create mode 100644 test/libsolidity/memoryGuardTests/stub.sol
 create mode 100644 test/libsolidity/memoryGuardTests/unmarked_but_no_memory_access.sol
 create mode 100644 test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol
 create mode 100644 test/libsolidity/memoryGuardTests/unmarked_with_memory_assignment.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1ca9c33281..255218c159 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -83,6 +83,8 @@ set(libsolidity_sources
     libsolidity/InlineAssembly.cpp
     libsolidity/LibSolc.cpp
     libsolidity/Metadata.cpp
+    libsolidity/MemoryGuardTest.cpp
+    libsolidity/MemoryGuardTest.h
     libsolidity/SemanticTest.cpp
     libsolidity/SemanticTest.h
     libsolidity/SemVerMatcher.cpp
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
index d8f3ef07e3..d359a815ad 100644
--- a/test/InteractiveTests.h
+++ b/test/InteractiveTests.h
@@ -22,6 +22,7 @@
 #include <test/libsolidity/ABIJsonTest.h>
 #include <test/libsolidity/ASTJSONTest.h>
 #include <test/libsolidity/GasTest.h>
+#include <test/libsolidity/MemoryGuardTest.h>
 #include <test/libsolidity/SyntaxTest.h>
 #include <test/libsolidity/SemanticTest.h>
 #include <test/libsolidity/SMTCheckerTest.h>
@@ -74,6 +75,7 @@ Testsuite const g_interactiveTestsuites[] = {
 	{"JSON ABI",               "libsolidity", "ABIJson",               false, false, &ABIJsonTest::create},
 	{"SMT Checker",            "libsolidity", "smtCheckerTests",       true,  false, &SMTCheckerTest::create},
 	{"Gas Estimates",          "libsolidity", "gasTests",              false, false, &GasTest::create},
+	{"Memory Guard Tests",     "libsolidity", "memoryGuardTests",     false, false, &MemoryGuardTest::create},
 	{"Ewasm Translation",      "libyul",      "ewasmTranslationTests", false, false, &yul::test::EwasmTranslationTest::create}
 };
 
diff --git a/test/cmdlineTests/constant_optimizer_yul/output b/test/cmdlineTests/constant_optimizer_yul/output
index 328ac25443..2a769811a6 100644
--- a/test/cmdlineTests/constant_optimizer_yul/output
+++ b/test/cmdlineTests/constant_optimizer_yul/output
@@ -11,14 +11,15 @@ object "C_12" {
     code {
         {
             /// @src 0:61:418  "contract C {..."
-            mstore(64, 128)
+            let _1 := memoryguard(0x80)
+            mstore(64, _1)
             if callvalue() { revert(0, 0) }
             /// @src 0:103:238  "assembly {..."
             sstore(0, shl(180, 1))
             /// @src 0:61:418  "contract C {..."
-            let _1 := datasize("C_12_deployed")
-            codecopy(128, dataoffset("C_12_deployed"), _1)
-            return(128, _1)
+            let _2 := datasize("C_12_deployed")
+            codecopy(_1, dataoffset("C_12_deployed"), _2)
+            return(_1, _2)
         }
     }
     /// @use-src 0:"constant_optimizer_yul/input.sol"
@@ -26,7 +27,7 @@ object "C_12" {
         code {
             {
                 /// @src 0:61:418  "contract C {..."
-                mstore(64, 128)
+                mstore(64, memoryguard(0x80))
                 if callvalue() { revert(0, 0) }
                 /// @src 0:279:410  "assembly {..."
                 sstore(0, 0x1000000000000000000000000000000000000000000000)
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/input.sol b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/input.sol
index aca9b3befe..67e1632e98 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/input.sol
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/input.sol
@@ -3,6 +3,6 @@ pragma solidity >=0.0.0;
 pragma abicoder v2;
 
 contract D {
-    constructor() { assembly {}}
+    constructor() { assembly { mstore(0,0) } }
     function f() public pure {}
 }
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
index 34b72f8b8e..d9b769a124 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
@@ -10,9 +10,12 @@ Optimized IR:
 object "D_12" {
     code {
         {
-            /// @src 0:82:161  "contract D {..."
+            /// @src 0:82:175  "contract D {..."
             mstore(64, 128)
             if callvalue() { revert(0, 0) }
+            /// @src 0:115:139  "assembly { mstore(0,0) }"
+            mstore(0, 0)
+            /// @src 0:82:175  "contract D {..."
             let _1 := datasize("D_12_deployed")
             codecopy(128, dataoffset("D_12_deployed"), _1)
             return(128, _1)
@@ -22,7 +25,7 @@ object "D_12" {
     object "D_12_deployed" {
         code {
             {
-                /// @src 0:82:161  "contract D {..."
+                /// @src 0:82:175  "contract D {..."
                 let _1 := memoryguard(0x80)
                 mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/input.sol b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/input.sol
index e217f9cbb9..26c0bfa982 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/input.sol
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/input.sol
@@ -4,6 +4,6 @@ pragma abicoder v2;
 
 contract D {
     function f() public pure {
-        assembly {}
+        assembly { mstore(0,0) }
     }
 }
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
index cc95451e6d..9a07c7861f 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
@@ -10,7 +10,7 @@ Optimized IR:
 object "D_8" {
     code {
         {
-            /// @src 0:82:153  "contract D {..."
+            /// @src 0:82:166  "contract D {..."
             let _1 := memoryguard(0x80)
             mstore(64, _1)
             if callvalue() { revert(0, 0) }
@@ -23,7 +23,7 @@ object "D_8" {
     object "D_8_deployed" {
         code {
             {
-                /// @src 0:82:153  "contract D {..."
+                /// @src 0:82:166  "contract D {..."
                 mstore(64, 128)
                 if iszero(lt(calldatasize(), 4))
                 {
@@ -32,6 +32,8 @@ object "D_8" {
                     {
                         if callvalue() { revert(_1, _1) }
                         if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        /// @src 0:134:158  "assembly { mstore(0,0) }"
+                        mstore(/** @src 0:82:166  "contract D {..." */ _1, _1)
                         return(128, _1)
                     }
                 }
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
new file mode 100644
index 0000000000..b757e673fe
--- /dev/null
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -0,0 +1,78 @@
+/*
+	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/libsolidity/MemoryGuardTest.h>
+
+#include <test/libyul/Common.h>
+#include <libsolidity/codegen/ir/Common.h>
+#include <libsolutil/Algorithms.h>
+#include <libyul/Object.h>
+#include <libyul/backends/evm/EVMDialect.h>
+#include <libyul/optimiser/FunctionCallFinder.h>
+#include <fstream>
+#include <memory>
+#include <stdexcept>
+
+using namespace std;
+using namespace solidity;
+using namespace solidity::util;
+using namespace solidity::util::formatting;
+using namespace solidity::langutil;
+using namespace solidity::frontend;
+using namespace solidity::frontend::test;
+using namespace yul;
+
+TestCase::TestResult MemoryGuardTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+{
+	compiler().reset();
+	compiler().setSources(StringMap{{"", m_source}});
+	compiler().setViaIR(true);
+	compiler().setOptimiserSettings(OptimiserSettings::none());
+	if (!compiler().compile())
+		return TestResult::FatalError;
+
+	m_obtainedResult.clear();
+	for (string contractName: compiler().contractNames())
+	{
+		ErrorList errors;
+		auto [object, analysisInfo] = yul::test::parse(
+			compiler().yulIR(contractName),
+			EVMDialect::strictAssemblyForEVMObjects({}),
+			errors
+		);
+
+		if (!object || !analysisInfo || Error::containsErrors(errors))
+		{
+			AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing IR." << endl;
+			return TestResult::FatalError;
+		}
+
+		auto handleObject = [&](std::string const& _kind, Object const& _object) {
+			m_obtainedResult += contractName + "(" + _kind + ") " + (FunctionCallFinder::run(
+				*_object.code,
+				"memoryguard"_yulstring
+			).empty() ? "false" : "true") + "\n";
+		};
+		handleObject("creation", *object);
+		size_t deployedIndex = object->subIndexByName.at(
+			YulString(IRNames::deployedObject(compiler().contractDefinition(contractName)))
+		);
+		handleObject("runtime", dynamic_cast<Object const&>(*object->subObjects[deployedIndex]));
+	}
+	return checkResult(_stream, _linePrefix, _formatted);
+}
diff --git a/test/libsolidity/MemoryGuardTest.h b/test/libsolidity/MemoryGuardTest.h
new file mode 100644
index 0000000000..e2ca8a6e53
--- /dev/null
+++ b/test/libsolidity/MemoryGuardTest.h
@@ -0,0 +1,53 @@
+/*
+	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
+
+#pragma once
+
+#include <test/libsolidity/AnalysisFramework.h>
+#include <test/TestCase.h>
+#include <test/CommonSyntaxTest.h>
+#include <liblangutil/Exceptions.h>
+#include <libsolutil/AnsiColorized.h>
+
+#include <iosfwd>
+#include <string>
+#include <vector>
+#include <utility>
+
+namespace solidity::frontend::test
+{
+
+using solidity::test::SyntaxTestError;
+
+class MemoryGuardTest: public AnalysisFramework, public TestCase
+{
+public:
+	static std::unique_ptr<TestCase> create(Config const& _config)
+	{
+		return std::make_unique<MemoryGuardTest>(_config.filename);
+	}
+	MemoryGuardTest(std::string const& _filename): TestCase(_filename)
+	{
+		m_source = m_reader.source();
+		m_expectation = m_reader.simpleExpectations();
+	}
+
+	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
+};
+
+}
diff --git a/test/libsolidity/memoryGuardTests/constructor_safe_deploy_unsafe.sol b/test/libsolidity/memoryGuardTests/constructor_safe_deploy_unsafe.sol
new file mode 100644
index 0000000000..2ab905ad83
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/constructor_safe_deploy_unsafe.sol
@@ -0,0 +1,17 @@
+contract C {
+    constructor() {
+        uint256 x;
+        assembly { x := 0 }
+        f();
+    }
+    function f() internal pure {
+        /// @solidity memory-safe-assembly
+        assembly { mstore(0, 0) }
+    }
+    function g() public pure {
+        assembly { mstore(0, 0) }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/constructor_unsafe_deploy_safe.sol b/test/libsolidity/memoryGuardTests/constructor_unsafe_deploy_safe.sol
new file mode 100644
index 0000000000..12b7e772f0
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/constructor_unsafe_deploy_safe.sol
@@ -0,0 +1,17 @@
+contract C {
+    constructor() {
+        uint256 x;
+        assembly { x := 0 }
+        f();
+    }
+    function f() internal pure {
+        assembly { mstore(0, 0) }
+    }
+    function g() public pure {
+        /// @solidity memory-safe-assembly
+        assembly { mstore(0, 0) }
+    }
+}
+// ----
+// :C(creation) false
+// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/free_function.sol b/test/libsolidity/memoryGuardTests/free_function.sol
new file mode 100644
index 0000000000..a417189ed3
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/free_function.sol
@@ -0,0 +1,29 @@
+function safe() pure returns (uint256 x) {
+    assembly { x := 42 }
+    /// @solidity memory-safe-assembly
+    assembly { mstore(0, 0) }
+}
+function unsafe() pure returns (uint256 x) {
+    assembly { pop(mload(0)) }
+}
+contract C {
+    constructor() {
+        unsafe();
+    }
+    function f() public pure {
+        safe();
+    }
+}
+contract D {
+    constructor() {
+        safe();
+    }
+    function f() public pure {
+        unsafe();
+    }
+}
+// ----
+// :C(creation) false
+// :C(runtime) true
+// :D(creation) true
+// :D(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/multi_annotation.sol b/test/libsolidity/memoryGuardTests/multi_annotation.sol
new file mode 100644
index 0000000000..478546b833
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/multi_annotation.sol
@@ -0,0 +1,17 @@
+contract C {
+    constructor() {
+        /// @solidity memory-safe-assembly    a memory-safe-assembly
+        assembly { mstore(0, 0) }
+    }
+    function f() internal pure {
+        /// @solidity a memory-safe-assembly
+        assembly { mstore(0, 0) }
+        /// @solidity a
+        ///           memory-safe-assembly
+        ///           b
+        assembly { mstore(0, 0) }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/multiple_contracts.sol b/test/libsolidity/memoryGuardTests/multiple_contracts.sol
new file mode 100644
index 0000000000..84d2cb4537
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/multiple_contracts.sol
@@ -0,0 +1,25 @@
+contract C {
+    constructor(uint256 x) {
+        assembly { x := 4 }
+        /// @solidity memory-safe-assembly
+        assembly { mstore(0, 0) }
+    }
+    function f() public pure {
+        assembly { mstore(0,0) }
+    }
+}
+contract D {
+    constructor() {
+        assembly { mstore(0,0) }
+    }
+    function f(uint256 x) public pure {
+        assembly { x := 4 }
+        /// @solidity memory-safe-assembly
+        assembly { mstore(0, 0) }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) false
+// :D(creation) false
+// :D(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/safe_and_unmarked_empty.sol b/test/libsolidity/memoryGuardTests/safe_and_unmarked_empty.sol
new file mode 100644
index 0000000000..614201deb4
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/safe_and_unmarked_empty.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() external pure {
+        /// @solidity memory-safe-assembly
+        assembly {}
+        assembly {}
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/safe_and_unmarked_unsafe.sol b/test/libsolidity/memoryGuardTests/safe_and_unmarked_unsafe.sol
new file mode 100644
index 0000000000..32d19993c0
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/safe_and_unmarked_unsafe.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() external pure {
+        /// @solidity memory-safe-assembly
+        assembly {}
+        assembly { mstore(0,0) }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/stub.sol b/test/libsolidity/memoryGuardTests/stub.sol
new file mode 100644
index 0000000000..65f6447c18
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/stub.sol
@@ -0,0 +1,4 @@
+contract C {}
+// ----
+// :C(creation) true
+// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/unmarked_but_no_memory_access.sol b/test/libsolidity/memoryGuardTests/unmarked_but_no_memory_access.sol
new file mode 100644
index 0000000000..8af88d75d0
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/unmarked_but_no_memory_access.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f(uint256 x, uint256 y) public pure returns (uint256 z){
+        assembly { z := add(x, y) }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol b/test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol
new file mode 100644
index 0000000000..88f826fdb9
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f() public pure {
+        assembly { mstore(0,0) }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/unmarked_with_memory_assignment.sol b/test/libsolidity/memoryGuardTests/unmarked_with_memory_assignment.sol
new file mode 100644
index 0000000000..c7519a65e0
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/unmarked_with_memory_assignment.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public pure {
+        bytes memory x;
+        assembly {
+            x := 0
+        }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) false
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 720f57489a..0488179f1d 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -50,7 +50,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1790188
+// gas irOptimized: 1792108
 // gas legacy: 2250130
 // gas legacyOptimized: 1746528
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol b/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
index 3a6ccefb37..d23eceeed7 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/invalid_natspec.sol
@@ -9,6 +9,6 @@ contract C {
 	}
 }
 // ----
-// Warning 6269: (60-71): Unexpected natspec tag in inline assembly: test
+// Warning 6269: (60-71): Unexpected NatSpec tag "test" with value "test" in inline assembly.
 // Warning 8787: (95-106): Unexpected value for @solidity tag in inline assembly: test
-// Warning 7828: (122-133): Inline assembly has invalid natspec documentation.
+// Warning 7828: (122-133): Inline assembly has invalid NatSpec documentation.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol b/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol
new file mode 100644
index 0000000000..945d62b069
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi.sol
@@ -0,0 +1,23 @@
+function f() pure {
+    /// @unrelated bogus-value
+
+    /// @before bogus-value
+    ///
+    /// @solidity a   memory-safe-assembly b    c
+    ///           d
+    /// @after bogus-value
+    assembly {}
+    /// @solidity memory-safe-assembly a a a
+    ///           memory-safe-assembly
+    assembly {}
+}
+// ----
+// Warning 6269: (189-200): Unexpected NatSpec tag "after" with value "bogus-value" in inline assembly.
+// Warning 6269: (189-200): Unexpected NatSpec tag "before" with value "bogus-value" in inline assembly.
+// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: a
+// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: b
+// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: c
+// Warning 8787: (189-200): Unexpected value for @solidity tag in inline assembly: d
+// Warning 8787: (289-300): Unexpected value for @solidity tag in inline assembly: a
+// Warning 4377: (289-300): Value for @solidity tag in inline assembly specified multiple times: a
+// Warning 4377: (289-300): Value for @solidity tag in inline assembly specified multiple times: memory-safe-assembly
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol
new file mode 100644
index 0000000000..74be1232dd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/natspec_multi_swallowed.sol
@@ -0,0 +1,19 @@
+function f() pure {
+    /// @unrelated bogus-value
+
+    /// @before
+    ///
+    /// @solidity a   memory-safe-assembly b    c
+    ///           d
+    /// @after bogus-value
+    assembly {}
+    /// @solidity memory-safe-assembly a a a
+    ///           memory-safe-assembly
+    assembly {}
+}
+// ----
+// Warning 6269: (177-188): Unexpected NatSpec tag "after" with value "bogus-value" in inline assembly.
+// Warning 6269: (177-188): Unexpected NatSpec tag "before" with value "@solidity a   memory-safe-assembly b    c           d" in inline assembly.
+// Warning 8787: (277-288): Unexpected value for @solidity tag in inline assembly: a
+// Warning 4377: (277-288): Value for @solidity tag in inline assembly specified multiple times: a
+// Warning 4377: (277-288): Value for @solidity tag in inline assembly specified multiple times: memory-safe-assembly
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index 18e3d43773..5971341ec9 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -23,6 +23,7 @@ add_executable(isoltest
 	../libsolidity/util/TestFileParser.cpp
 	../libsolidity/util/TestFunctionCall.cpp
 	../libsolidity/GasTest.cpp
+	../libsolidity/MemoryGuardTest.cpp
 	../libsolidity/SyntaxTest.cpp
 	../libsolidity/SemanticTest.cpp
 	../libsolidity/AnalysisFramework.cpp

From 30008465bf095291b4ea222a9e5c77a97eb28ced Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 2 Mar 2022 16:47:55 +0100
Subject: [PATCH 0429/1748] perpetual-pools: Use Hardhat 2.8.4 to work around
 @openzeppelin/hardhat-upgrades's problem with parallel compilation on Hardhat
 2.9.0

---
 test/externalTests/perpetual-pools.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index 8f90ed0b4d..7e42896984 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -66,6 +66,11 @@ function perpetual_pools_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     yarn install
 
+    # The project depends on @openzeppelin/hardhat-upgrades, which is currently not prepared
+    # for the parallel compilation introduced in Hardhat 2.9.0.
+    # TODO: Remove when https://github.com/OpenZeppelin/openzeppelin-upgrades/issues/528 is fixed.
+    yarn add hardhat@2.8.4
+
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do

From 290b1c3a90c1e2cceb6b33ab9ed8e9c4f11ac46c Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 14 Feb 2022 13:21:15 +0100
Subject: [PATCH 0430/1748] Allow memory-safe inline assembly dialect flag.

---
 libsolidity/analysis/DocStringTagParser.cpp | 10 ++++++++++
 libsolidity/analysis/SyntaxChecker.cpp      | 21 +++++++++++++++++++++
 libsolidity/ast/AST.h                       |  9 ++++++++-
 libsolidity/ast/ASTJsonConverter.cpp        | 16 ++++++++++++++--
 libsolidity/ast/ASTJsonImporter.cpp         | 13 +++++++++++++
 libsolidity/parsing/Parser.cpp              | 17 ++++++++++++++++-
 6 files changed, 82 insertions(+), 4 deletions(-)

diff --git a/libsolidity/analysis/DocStringTagParser.cpp b/libsolidity/analysis/DocStringTagParser.cpp
index 7be9cf8dfc..1dc2711ef1 100644
--- a/libsolidity/analysis/DocStringTagParser.cpp
+++ b/libsolidity/analysis/DocStringTagParser.cpp
@@ -202,7 +202,17 @@ bool DocStringTagParser::visit(InlineAssembly const& _assembly)
 				if (valuesSeen.insert(value).second)
 				{
 					if (value == "memory-safe-assembly")
+					{
+						if (_assembly.annotation().markedMemorySafe)
+							m_errorReporter.warning(
+								8544_error,
+								_assembly.location(),
+								"Inline assembly marked as memory safe using both a NatSpec tag and an assembly flag. "
+								"If you are not concerned with backwards compatibility, only use the assembly flag, "
+								"otherwise only use the NatSpec tag."
+							);
 						_assembly.annotation().markedMemorySafe = true;
+					}
 					else
 						m_errorReporter.warning(
 							8787_error,
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index e47080cb48..589787a893 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -334,6 +334,27 @@ bool SyntaxChecker::visit(UnaryOperation const& _operation)
 
 bool SyntaxChecker::visit(InlineAssembly const& _inlineAssembly)
 {
+	if (_inlineAssembly.flags())
+		for (auto flag: *_inlineAssembly.flags())
+		{
+			if (*flag == "memory-safe")
+			{
+				if (_inlineAssembly.annotation().markedMemorySafe)
+					m_errorReporter.syntaxError(
+						7026_error,
+						_inlineAssembly.location(),
+						"Inline assembly marked memory-safe multiple times."
+					);
+				_inlineAssembly.annotation().markedMemorySafe = true;
+			}
+			else
+				m_errorReporter.warning(
+					4430_error,
+					_inlineAssembly.location(),
+					"Unknown inline assembly flag: \"" + *flag + "\""
+				);
+		}
+
 	if (!m_useYulOptimizer)
 		return false;
 
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index c35c69c9d2..4893c212f0 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -1463,19 +1463,26 @@ class InlineAssembly: public Statement
 		SourceLocation const& _location,
 		ASTPointer<ASTString> const& _docString,
 		yul::Dialect const& _dialect,
+		ASTPointer<std::vector<ASTPointer<ASTString>>> _flags,
 		std::shared_ptr<yul::Block> _operations
 	):
-		Statement(_id, _location, _docString), m_dialect(_dialect), m_operations(std::move(_operations)) {}
+		Statement(_id, _location, _docString),
+		m_dialect(_dialect),
+		m_flags(move(_flags)),
+		m_operations(std::move(_operations))
+	{}
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
 
 	yul::Dialect const& dialect() const { return m_dialect; }
 	yul::Block const& operations() const { return *m_operations; }
+	ASTPointer<std::vector<ASTPointer<ASTString>>> const& flags() const { return m_flags; }
 
 	InlineAssemblyAnnotation& annotation() const override;
 
 private:
 	yul::Dialect const& m_dialect;
+	ASTPointer<std::vector<ASTPointer<ASTString>>> m_flags;
 	std::shared_ptr<yul::Block> m_operations;
 };
 
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index 97417f81c0..6b48797d15 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -600,11 +600,23 @@ bool ASTJsonConverter::visit(InlineAssembly const& _node)
 	for (Json::Value& it: externalReferences | ranges::views::values)
 		externalReferencesJson.append(std::move(it));
 
-	setJsonNode(_node, "InlineAssembly", {
+	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("AST", Json::Value(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations()))),
 		make_pair("externalReferences", std::move(externalReferencesJson)),
 		make_pair("evmVersion", dynamic_cast<solidity::yul::EVMDialect const&>(_node.dialect()).evmVersion().name())
-	});
+	};
+
+	if (_node.flags())
+	{
+		Json::Value flags(Json::arrayValue);
+		for (auto const& flag: *_node.flags())
+			if (flag)
+				flags.append(*flag);
+			else
+				flags.append(Json::nullValue);
+		attributes.emplace_back(make_pair("flags", move(flags)));
+	}
+	setJsonNode(_node, "InlineAssembly", move(attributes));
 
 	return false;
 }
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 2e69df93fb..d71864f348 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -626,11 +626,24 @@ ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json::Value con
 	astAssert(m_evmVersion == evmVersion, "Imported tree evm version differs from configured evm version!");
 
 	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(evmVersion.value());
+	ASTPointer<vector<ASTPointer<ASTString>>> flags;
+	if (_node.isMember("flags"))
+	{
+		flags = make_shared<vector<ASTPointer<ASTString>>>();
+		Json::Value const& flagsNode = _node["flags"];
+		astAssert(flagsNode.isArray(), "Assembly flags must be an array.");
+		for (Json::ArrayIndex i = 0; i < flagsNode.size(); ++i)
+		{
+			astAssert(flagsNode[i].isString(), "Assembly flag must be a string.");
+			flags->emplace_back(make_shared<ASTString>(flagsNode[i].asString()));
+		}
+	}
 	shared_ptr<yul::Block> operations = make_shared<yul::Block>(yul::AsmJsonImporter(m_sourceNames).createBlock(member(_node, "AST")));
 	return createASTNode<InlineAssembly>(
 		_node,
 		nullOrASTString(_node, "documentation"),
 		dialect,
+		move(flags),
 		operations
 	);
 }
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index fea062d016..b1d7e7ccad 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1321,13 +1321,28 @@ ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> con
 		advance();
 	}
 
+	ASTPointer<vector<ASTPointer<ASTString>>> flags;
+	if (m_scanner->currentToken() == Token::LParen)
+	{
+		flags = make_shared<vector<ASTPointer<ASTString>>>();
+		do
+		{
+			advance();
+			expectToken(Token::StringLiteral, false);
+			flags->emplace_back(make_shared<ASTString>(m_scanner->currentLiteral()));
+			advance();
+		}
+		while (m_scanner->currentToken() == Token::Comma);
+		expectToken(Token::RParen);
+	}
+
 	yul::Parser asmParser(m_errorReporter, dialect);
 	shared_ptr<yul::Block> block = asmParser.parseInline(m_scanner);
 	if (block == nullptr)
 		BOOST_THROW_EXCEPTION(FatalError());
 
 	location.end = nativeLocationOf(*block).end;
-	return make_shared<InlineAssembly>(nextID(), location, _docString, dialect, block);
+	return make_shared<InlineAssembly>(nextID(), location, _docString, dialect, move(flags), block);
 }
 
 ASTPointer<IfStatement> Parser::parseIfStatement(ASTPointer<ASTString> const& _docString)

From 93dd8ad5530eddada38d35c612d70a29b4fa5e8e Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 14 Feb 2022 13:21:00 +0100
Subject: [PATCH 0431/1748] Tests.

---
 .../constructor_safe_deploy_unsafe.sol        |  0
 .../constructor_unsafe_deploy_safe.sol        |  0
 .../{ => comment}/free_function.sol           |  0
 .../{ => comment}/multi_annotation.sol        |  0
 .../{ => comment}/multiple_contracts.sol      |  0
 .../{ => comment}/safe_and_unmarked_empty.sol |  0
 .../safe_and_unmarked_unsafe.sol              |  0
 .../constructor_safe_deploy_unsafe.sol        | 17 +++++++++++
 .../constructor_unsafe_deploy_safe.sol        | 16 +++++++++++
 .../dialectString/free_function.sol           | 28 +++++++++++++++++++
 .../dialectString/multiple_contracts.sol      | 23 +++++++++++++++
 .../dialectString/safe_and_unmarked_empty.sol |  9 ++++++
 .../safe_and_unmarked_unsafe.sol              |  9 ++++++
 .../memoryGuardTests/dialectString/stub.sol   |  4 +++
 .../assembly_dialect_duplicate_option.sol     |  5 ++++
 .../assembly_dialect_invalid_options.sol      |  8 ++++++
 .../assembly_dialect_leading_space.sol        |  5 ++++
 .../assembly_duplicate_option.sol             |  5 ++++
 .../assembly_empty_option_list.sol            |  5 ++++
 .../assembly_empty_option_list_dialect.sol    |  5 ++++
 .../assembly_flags_delimiter.sol              |  5 ++++
 .../assembly_invalid_options.sol              |  8 ++++++
 ...memory_safe_dialect_string_and_comment.sol |  7 +++++
 .../memory_safe_in_dialect_string.sol         |  3 ++
 24 files changed, 162 insertions(+)
 rename test/libsolidity/memoryGuardTests/{ => comment}/constructor_safe_deploy_unsafe.sol (100%)
 rename test/libsolidity/memoryGuardTests/{ => comment}/constructor_unsafe_deploy_safe.sol (100%)
 rename test/libsolidity/memoryGuardTests/{ => comment}/free_function.sol (100%)
 rename test/libsolidity/memoryGuardTests/{ => comment}/multi_annotation.sol (100%)
 rename test/libsolidity/memoryGuardTests/{ => comment}/multiple_contracts.sol (100%)
 rename test/libsolidity/memoryGuardTests/{ => comment}/safe_and_unmarked_empty.sol (100%)
 rename test/libsolidity/memoryGuardTests/{ => comment}/safe_and_unmarked_unsafe.sol (100%)
 create mode 100644 test/libsolidity/memoryGuardTests/dialectString/constructor_safe_deploy_unsafe.sol
 create mode 100644 test/libsolidity/memoryGuardTests/dialectString/constructor_unsafe_deploy_safe.sol
 create mode 100644 test/libsolidity/memoryGuardTests/dialectString/free_function.sol
 create mode 100644 test/libsolidity/memoryGuardTests/dialectString/multiple_contracts.sol
 create mode 100644 test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_empty.sol
 create mode 100644 test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_unsafe.sol
 create mode 100644 test/libsolidity/memoryGuardTests/dialectString/stub.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_duplicate_option.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_invalid_options.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assembly_duplicate_option.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/memory_safe_dialect_string_and_comment.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/memory_safe_in_dialect_string.sol

diff --git a/test/libsolidity/memoryGuardTests/constructor_safe_deploy_unsafe.sol b/test/libsolidity/memoryGuardTests/comment/constructor_safe_deploy_unsafe.sol
similarity index 100%
rename from test/libsolidity/memoryGuardTests/constructor_safe_deploy_unsafe.sol
rename to test/libsolidity/memoryGuardTests/comment/constructor_safe_deploy_unsafe.sol
diff --git a/test/libsolidity/memoryGuardTests/constructor_unsafe_deploy_safe.sol b/test/libsolidity/memoryGuardTests/comment/constructor_unsafe_deploy_safe.sol
similarity index 100%
rename from test/libsolidity/memoryGuardTests/constructor_unsafe_deploy_safe.sol
rename to test/libsolidity/memoryGuardTests/comment/constructor_unsafe_deploy_safe.sol
diff --git a/test/libsolidity/memoryGuardTests/free_function.sol b/test/libsolidity/memoryGuardTests/comment/free_function.sol
similarity index 100%
rename from test/libsolidity/memoryGuardTests/free_function.sol
rename to test/libsolidity/memoryGuardTests/comment/free_function.sol
diff --git a/test/libsolidity/memoryGuardTests/multi_annotation.sol b/test/libsolidity/memoryGuardTests/comment/multi_annotation.sol
similarity index 100%
rename from test/libsolidity/memoryGuardTests/multi_annotation.sol
rename to test/libsolidity/memoryGuardTests/comment/multi_annotation.sol
diff --git a/test/libsolidity/memoryGuardTests/multiple_contracts.sol b/test/libsolidity/memoryGuardTests/comment/multiple_contracts.sol
similarity index 100%
rename from test/libsolidity/memoryGuardTests/multiple_contracts.sol
rename to test/libsolidity/memoryGuardTests/comment/multiple_contracts.sol
diff --git a/test/libsolidity/memoryGuardTests/safe_and_unmarked_empty.sol b/test/libsolidity/memoryGuardTests/comment/safe_and_unmarked_empty.sol
similarity index 100%
rename from test/libsolidity/memoryGuardTests/safe_and_unmarked_empty.sol
rename to test/libsolidity/memoryGuardTests/comment/safe_and_unmarked_empty.sol
diff --git a/test/libsolidity/memoryGuardTests/safe_and_unmarked_unsafe.sol b/test/libsolidity/memoryGuardTests/comment/safe_and_unmarked_unsafe.sol
similarity index 100%
rename from test/libsolidity/memoryGuardTests/safe_and_unmarked_unsafe.sol
rename to test/libsolidity/memoryGuardTests/comment/safe_and_unmarked_unsafe.sol
diff --git a/test/libsolidity/memoryGuardTests/dialectString/constructor_safe_deploy_unsafe.sol b/test/libsolidity/memoryGuardTests/dialectString/constructor_safe_deploy_unsafe.sol
new file mode 100644
index 0000000000..8c5aa229dc
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/dialectString/constructor_safe_deploy_unsafe.sol
@@ -0,0 +1,17 @@
+contract C {
+    constructor() {
+        uint256 x;
+        assembly { x := 0 }
+        f();
+    }
+    function f() internal pure {
+        assembly "evmasm" ("memory-safe") { mstore(0, 0) }
+        assembly ("memory-safe") { mstore(0, 0) }
+    }
+    function g() public pure {
+        assembly { mstore(0, 0) }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/dialectString/constructor_unsafe_deploy_safe.sol b/test/libsolidity/memoryGuardTests/dialectString/constructor_unsafe_deploy_safe.sol
new file mode 100644
index 0000000000..595e259145
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/dialectString/constructor_unsafe_deploy_safe.sol
@@ -0,0 +1,16 @@
+contract C {
+    constructor() {
+        uint256 x;
+        assembly { x := 0 }
+        f();
+    }
+    function f() internal pure {
+        assembly { mstore(0, 0) }
+    }
+    function g() public pure {
+        assembly "evmasm" ("memory-safe") { mstore(0, 0) }
+    }
+}
+// ----
+// :C(creation) false
+// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/dialectString/free_function.sol b/test/libsolidity/memoryGuardTests/dialectString/free_function.sol
new file mode 100644
index 0000000000..9e3d2a4b51
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/dialectString/free_function.sol
@@ -0,0 +1,28 @@
+function safe() pure returns (uint256 x) {
+    assembly { x := 42 }
+    assembly "evmasm" ("memory-safe") { mstore(0, 0) }
+}
+function unsafe() pure returns (uint256 x) {
+    assembly { pop(mload(0)) }
+}
+contract C {
+    constructor() {
+        unsafe();
+    }
+    function f() public pure {
+        safe();
+    }
+}
+contract D {
+    constructor() {
+        safe();
+    }
+    function f() public pure {
+        unsafe();
+    }
+}
+// ----
+// :C(creation) false
+// :C(runtime) true
+// :D(creation) true
+// :D(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/dialectString/multiple_contracts.sol b/test/libsolidity/memoryGuardTests/dialectString/multiple_contracts.sol
new file mode 100644
index 0000000000..2ee227bc69
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/dialectString/multiple_contracts.sol
@@ -0,0 +1,23 @@
+contract C {
+    constructor(uint256 x) {
+        assembly { x := 4 }
+        assembly "evmasm" ("memory-safe") { mstore(0, 0) }
+    }
+    function f() public pure {
+        assembly { mstore(0,0) }
+    }
+}
+contract D {
+    constructor() {
+        assembly { mstore(0,0) }
+    }
+    function f(uint256 x) public pure {
+        assembly { x := 4 }
+        assembly ("memory-safe") { mstore(0, 0) }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) false
+// :D(creation) false
+// :D(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_empty.sol b/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_empty.sol
new file mode 100644
index 0000000000..ab653be97a
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_empty.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() external pure {
+        assembly "evmasm" ("memory-safe") {}
+        assembly {}
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_unsafe.sol b/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_unsafe.sol
new file mode 100644
index 0000000000..8b865d5b84
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/dialectString/safe_and_unmarked_unsafe.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() external pure {
+        assembly "evmasm" ("memory-safe") {}
+        assembly { mstore(0,0) }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/dialectString/stub.sol b/test/libsolidity/memoryGuardTests/dialectString/stub.sol
new file mode 100644
index 0000000000..65f6447c18
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/dialectString/stub.sol
@@ -0,0 +1,4 @@
+contract C {}
+// ----
+// :C(creation) true
+// :C(runtime) true
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_duplicate_option.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_duplicate_option.sol
new file mode 100644
index 0000000000..7e0672f65d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_duplicate_option.sol
@@ -0,0 +1,5 @@
+function f() pure {
+    assembly "evmasm" ("memory-safe", "memory-safe") {}
+}
+// ----
+// SyntaxError 7026: (24-75): Inline assembly marked memory-safe multiple times.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_invalid_options.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_invalid_options.sol
new file mode 100644
index 0000000000..44206c9ece
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_invalid_options.sol
@@ -0,0 +1,8 @@
+function f() pure {
+    assembly "evmasm" ("a", "b", "c", "c") {}
+}
+// ----
+// Warning 4430: (24-65): Unknown inline assembly flag: "a"
+// Warning 4430: (24-65): Unknown inline assembly flag: "b"
+// Warning 4430: (24-65): Unknown inline assembly flag: "c"
+// Warning 4430: (24-65): Unknown inline assembly flag: "c"
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol
new file mode 100644
index 0000000000..1cf1e7fb94
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_dialect_leading_space.sol
@@ -0,0 +1,5 @@
+function f() pure {
+    assembly " evmasm" {}
+}
+// ----
+// ParserError 4531: (33-42): Only "evmasm" supported.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_duplicate_option.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_duplicate_option.sol
new file mode 100644
index 0000000000..69c5035598
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_duplicate_option.sol
@@ -0,0 +1,5 @@
+function f() pure {
+    assembly ("memory-safe", "memory-safe") {}
+}
+// ----
+// SyntaxError 7026: (24-66): Inline assembly marked memory-safe multiple times.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol
new file mode 100644
index 0000000000..cae17320b9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list.sol
@@ -0,0 +1,5 @@
+function f() pure {
+    assembly () {}
+}
+// ----
+// ParserError 2314: (34-35): Expected 'StringLiteral' but got ')'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol
new file mode 100644
index 0000000000..222e59b930
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_empty_option_list_dialect.sol
@@ -0,0 +1,5 @@
+function f() pure {
+    assembly "evmasm" () {}
+}
+// ----
+// ParserError 2314: (43-44): Expected 'StringLiteral' but got ')'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol
new file mode 100644
index 0000000000..cd82f8aaa4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_flags_delimiter.sol
@@ -0,0 +1,5 @@
+function f() pure {
+	assembly ("a" "b") {}
+}
+// ----
+// ParserError 2314: (35-38): Expected ')' but got 'StringLiteral'
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol b/test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol
new file mode 100644
index 0000000000..3364d793e8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/assembly_invalid_options.sol
@@ -0,0 +1,8 @@
+function f() pure {
+    assembly ("a", "b", "c", "c") {}
+}
+// ----
+// Warning 4430: (24-56): Unknown inline assembly flag: "a"
+// Warning 4430: (24-56): Unknown inline assembly flag: "b"
+// Warning 4430: (24-56): Unknown inline assembly flag: "c"
+// Warning 4430: (24-56): Unknown inline assembly flag: "c"
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_dialect_string_and_comment.sol b/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_dialect_string_and_comment.sol
new file mode 100644
index 0000000000..9d0fd3e1c7
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_dialect_string_and_comment.sol
@@ -0,0 +1,7 @@
+function f() pure {
+    /// @solidity memory-safe-assembly
+    assembly "evmasm" ("memory-safe") {
+    }
+}
+// ----
+// Warning 8544: (63-104): Inline assembly marked as memory safe using both a NatSpec tag and an assembly flag. If you are not concerned with backwards compatibility, only use the assembly flag, otherwise only use the NatSpec tag.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_in_dialect_string.sol b/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_in_dialect_string.sol
new file mode 100644
index 0000000000..c034f803da
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/memory_safe_in_dialect_string.sol
@@ -0,0 +1,3 @@
+function f() pure {
+    assembly "evmasm" ("memory-safe") {}
+}
\ No newline at end of file

From 0381de54c2aaf1575ef93d77974f1d58c25789aa Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 14 Feb 2022 13:23:50 +0100
Subject: [PATCH 0432/1748] Update docs.

---
 docs/assembly.rst | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index b0ce0e5248..746da43c13 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -297,8 +297,7 @@ model as follows:
 
 .. code-block:: solidity
 
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
         ...
     }
 
@@ -327,8 +326,7 @@ But the following is:
 
 .. code-block:: solidity
 
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
       let p := mload(0x40)
       returndatacopy(p, 0, returndatasize())
       revert(p, returndatasize())
@@ -341,8 +339,7 @@ If the memory operations use a length of zero, it is also fine to just use any o
 
 .. code-block:: solidity
 
-    /// @solidity memory-safe-assembly
-    assembly {
+    assembly ("memory-safe") {
       revert(0, 0)
     }
 
@@ -364,3 +361,16 @@ in memory is automatically considered memory-safe and does not need to be annota
     It is your responsibility to make sure that the assembly actually satisfies the memory model. If you annotate
     an assembly block as memory-safe, but violate one of the memory assumptions, this **will** lead to incorrect and
     undefined behaviour that cannot easily be discovered by testing.
+
+In case you are developing a library that is meant to be compatible across multiple versions
+of solidity, you can use a special comment to annotate an assembly block as memory-safe:
+
+.. code-block:: solidity
+
+    /// @solidity memory-safe-assembly
+    assembly {
+        ...
+    }
+
+Note that we will disallow the annotation via comment in a future breaking release, so if you are not concerned with
+backwards-compatibility with older compiler versions, prefer using the dialect string.

From 46d8611e90f9ffd9764db5f3b9c16a5139c0eb61 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 14 Feb 2022 13:57:56 +0100
Subject: [PATCH 0433/1748] Adjust grammar.

---
 docs/grammar/SolidityLexer.g4  | 6 ++++++
 docs/grammar/SolidityParser.g4 | 8 +++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index 5a73be85fd..653255ae36 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -251,6 +251,12 @@ mode AssemblyBlockMode;
 AssemblyDialect: '"evmasm"';
 AssemblyLBrace: '{' -> popMode, pushMode(YulMode);
 
+AssemblyFlagString: '"' DoubleQuotedStringCharacter+ '"';
+
+AssemblyBlockLParen: '(';
+AssemblyBlockRParen: ')';
+AssemblyBlockComma: ',';
+
 AssemblyBlockWS: [ \t\r\n\u000C]+ -> skip ;
 AssemblyBlockCOMMENT: '/*' .*? '*/' -> channel(HIDDEN) ;
 AssemblyBlockLINE_COMMENT: '//' ~[\r\n]* -> channel(HIDDEN) ;
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index 110773fede..e41bb2ba9d 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -476,7 +476,13 @@ revertStatement: Revert expression callArgumentList Semicolon;
  * The contents of an inline assembly block use a separate scanner/lexer, i.e. the set of keywords and
  * allowed identifiers is different inside an inline assembly block.
  */
-assemblyStatement: Assembly AssemblyDialect? AssemblyLBrace yulStatement* YulRBrace;
+assemblyStatement: Assembly AssemblyDialect? assemblyFlags? AssemblyLBrace yulStatement* YulRBrace;
+
+/**
+ * Assembly flags.
+ * Comma-separated list of double-quoted strings as flags.
+ */
+assemblyFlags: AssemblyBlockLParen AssemblyFlagString (AssemblyBlockComma AssemblyFlagString)* AssemblyBlockRParen;
 
 //@doc:inline
 variableDeclarationList: variableDeclarations+=variableDeclaration (Comma variableDeclarations+=variableDeclaration)*;

From ab0ab4491da2c9d92e6bc8dd9ee2832a6ec2f9b0 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 1 Mar 2022 17:40:27 -0500
Subject: [PATCH 0434/1748] Update CI to use new buildpacks.

---
 .circleci/config.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b50f75833..65e7113a38 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,16 +9,16 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-10
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e61939751ff9777307857361f712b581bfc8a8aaae75fab7b50febc764710587"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-11
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:9928dc357829e475e8729c62a1c2d495dbb41cb9fe4c4b115a5568be8e1ed69e"
   ubuntu-2004-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-10
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0de8c68f084120b2a165406e3a0c2aab58b32f5b7182c2322245245f1d243b8d"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-11
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:72fb9574c90e8ef908dce4c9dd9788ff4de708b504d970cd9146eed8911c313e"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-15
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:87f1a57586eec194a6217ab624efc69d3d9af2f7ac8ca36497ad57488c2f08ae"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-16
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:fe54d8e5409827d43edb0dc8ad0d9e4232a675050ceb271c873b73e5ee267938"
   emscripten-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:emscripten-9

From beabc51c206da9ec9fb28edcb9d554b97099b432 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Wed, 16 Feb 2022 17:33:39 +0530
Subject: [PATCH 0435/1748] returnSize assigned according to truth value of
 returnInfo.dynamicReturnSize

---
 libsolidity/codegen/ReturnInfo.cpp            |   2 +
 .../codegen/ir/IRGeneratorForStatements.cpp   |  38 +++---
 .../output.json                               | 128 +++++++++++-------
 .../output.json                               |  40 ++++--
 .../abi_encode_calldata_slice.sol             |   4 +-
 .../struct/struct_storage_ptr.sol             |   2 +-
 .../abi_encode_calldata_slice.sol             |   4 +-
 ...2_in_function_inherited_in_v1_contract.sol |   2 +-
 .../abiEncoderV2/calldata_array.sol           |   2 +-
 .../array/fixed_arrays_as_return_type.sol     |   2 +-
 .../array/function_array_cross_calls.sol      |   2 +-
 .../semanticTests/array/reusing_memory.sol    |   2 +-
 .../constructor/arrays_in_constructors.sol    |   2 +-
 .../bytes_in_constructors_packer.sol          |   2 +-
 .../events/event_emit_from_other_contract.sol |   2 +-
 .../creation_function_call_with_args.sol      |   2 +-
 .../creation_function_call_with_salt.sol      |   2 +-
 .../external_call_to_nonexisting.sol          |   2 +-
 ...ernal_call_to_nonexisting_debugstrings.sol |   2 +-
 .../functionCall/failed_create.sol            |   4 +-
 .../functionCall/gas_and_value_basic.sol      |   2 +-
 .../gas_and_value_brace_syntax.sol            |   2 +-
 .../return_size_bigger_than_expected.sol      |  31 +++++
 .../return_size_shorter_than_expected.sol     |  32 +++++
 ...n_expected_evm_version_after_homestead.sol |  34 +++++
 .../immutable/multi_creation.sol              |   2 +-
 ...ted_function_calldata_memory_interface.sol |   2 +-
 .../inheritance/value_for_constructor.sol     |   2 +-
 .../balance_other_contract.sol                |   2 +-
 .../libraries/internal_types_in_library.sol   |   2 +-
 .../using_library_mappings_public.sol         |   2 +-
 .../using_library_mappings_return.sol         |   2 +-
 .../libraries/using_library_structs.sol       |   2 +-
 .../salted_create_with_value.sol              |   2 +-
 .../userDefinedValueType/calldata.sol         |   2 +-
 .../semanticTests/various/senders_balance.sol |   2 +-
 .../skip_dynamic_types_for_structs.sol        |   2 +-
 .../semanticTests/various/value_complex.sol   |   2 +-
 .../semanticTests/various/value_insane.sol    |   2 +-
 .../viaYul/copy_struct_invalid_ir_bug.sol     |   2 +-
 40 files changed, 261 insertions(+), 116 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/functionCall/return_size_bigger_than_expected.sol
 create mode 100644 test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected.sol
 create mode 100644 test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected_evm_version_after_homestead.sol

diff --git a/libsolidity/codegen/ReturnInfo.cpp b/libsolidity/codegen/ReturnInfo.cpp
index fd2ff451f1..28518d9b2a 100644
--- a/libsolidity/codegen/ReturnInfo.cpp
+++ b/libsolidity/codegen/ReturnInfo.cpp
@@ -54,4 +54,6 @@ ReturnInfo::ReturnInfo(EVMVersion const& _evmVersion, FunctionType const& _funct
 				estimatedReturnSize += retType->decodingType()->calldataEncodedSize();
 		}
 	}
+	if (dynamicReturnSize)
+		solAssert(estimatedReturnSize == 0);
 }
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 9fb73f0214..ed49c94b0a 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2505,6 +2505,8 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 			appendCode() << "mstore(add(" << m_utils.allocateUnboundedFunction() << "() , " << to_string(returnInfo.estimatedReturnSize) << "), 0)\n";
 	}
 
+	// NOTE: When the expected size of returndata is static, we pass that in to the call opcode and it gets copied automatically.
+    // When it's dynamic, we get zero from estimatedReturnSize() instead and then we need an explicit returndatacopy().
 	Whiskers templ(R"(
 		<?checkExtcodesize>
 			if iszero(extcodesize(<address>)) { <revertNoCode>() }
@@ -2514,22 +2516,29 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 		mstore(<pos>, <shl28>(<funSel>))
 		let <end> := <encodeArgs>(add(<pos>, 4) <argumentString>)
 
-		let <success> := <call>(<gas>, <address>, <?hasValue> <value>, </hasValue> <pos>, sub(<end>, <pos>), <pos>, <reservedReturnSize>)
+		let <success> := <call>(<gas>, <address>, <?hasValue> <value>, </hasValue> <pos>, sub(<end>, <pos>), <pos>, <staticReturndataSize>)
 		<?noTryCall>
 			if iszero(<success>) { <forwardingRevert>() }
 		</noTryCall>
 		<?+retVars> let <retVars> </+retVars>
 		if <success> {
-			<?dynamicReturnSize>
-				// copy dynamic return data out
-				returndatacopy(<pos>, 0, returndatasize())
-			</dynamicReturnSize>
+			<?isReturndataSizeDynamic>
+				let <returnDataSizeVar> := returndatasize()
+				returndatacopy(<pos>, 0, <returnDataSizeVar>)
+			<!isReturndataSizeDynamic>
+				let <returnDataSizeVar> := <staticReturndataSize>
+				<?supportsReturnData>
+					if gt(<returnDataSizeVar>, returndatasize()) {
+						<returnDataSizeVar> := returndatasize()
+					}
+				</supportsReturnData>
+			</isReturndataSizeDynamic>
 
 			// update freeMemoryPointer according to dynamic return size
-			<finalizeAllocation>(<pos>, <returnSize>)
+			<finalizeAllocation>(<pos>, <returnDataSizeVar>)
 
 			// decode return parameters from external try-call into retVars
-			<?+retVars> <retVars> := </+retVars> <abiDecode>(<pos>, add(<pos>, <returnSize>))
+			<?+retVars> <retVars> := </+retVars> <abiDecode>(<pos>, add(<pos>, <returnDataSizeVar>))
 		}
 	)");
 	templ("revertNoCode", m_utils.revertReasonIfDebugFunction("Target contract does not contain code"));
@@ -2558,21 +2567,18 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 	templ("funSel", IRVariable(_functionCall.expression()).part("functionSelector").name());
 	templ("address", IRVariable(_functionCall.expression()).part("address").name());
 
-	// Always use the actual return length, and not our calculated expected length, if returndatacopy is supported.
-	// This ensures it can catch badly formatted input from external calls.
-	if (m_context.evmVersion().supportsReturndata())
-		templ("returnSize", "returndatasize()");
-	else
-		templ("returnSize", to_string(returnInfo.estimatedReturnSize));
-
-	templ("reservedReturnSize", returnInfo.dynamicReturnSize ? "0" : to_string(returnInfo.estimatedReturnSize));
+	if (returnInfo.dynamicReturnSize)
+		solAssert(m_context.evmVersion().supportsReturndata());
+	templ("returnDataSizeVar", m_context.newYulVariable());
+	templ("staticReturndataSize", to_string(returnInfo.estimatedReturnSize));
+	templ("supportsReturnData", m_context.evmVersion().supportsReturndata());
 
 	string const retVars = IRVariable(_functionCall).commaSeparatedList();
 	templ("retVars", retVars);
 	solAssert(retVars.empty() == returnInfo.returnTypes.empty());
 
 	templ("abiDecode", m_context.abiFunctions().tupleDecoder(returnInfo.returnTypes, true));
-	templ("dynamicReturnSize", returnInfo.dynamicReturnSize);
+	templ("isReturndataSizeDynamic", returnInfo.dynamicReturnSize);
 
 	templ("noTryCall", !_functionCall.annotation().tryCall);
 
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index bb3083af91..238934a3f0 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -265,34 +265,39 @@ sub_0: assembly {
       return
         /* \"C\":403:411  this.f() */
     tag_36:
-        /* \"C\":79:428  contract C... */
       swap1
       swap2
       pop
-        /* \"C\":403:411  this.f() */
+      0x20
+      swap1
       returndatasize
+      dup3
+      gt
+      tag_41
+      jumpi
+    tag_42:
         /* \"C\":79:428  contract C... */
       0x1f
+      dup3
       add
       not(0x1f)
       and
-      dup3
+      dup4
       add
       swap1
       0xffffffffffffffff
       dup3
       gt
-      dup4
+      dup5
       dup4
       lt
       or
-      tag_41
+      tag_43
       jumpi
       pop
-      tag_40
       swap3
         /* \"C\":403:411  this.f() */
-      tag_43
+      tag_45
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       tag_39
         /* \"C\":79:428  contract C... */
@@ -301,34 +306,41 @@ sub_0: assembly {
       tag_38
         /* \"C\":79:428  contract C... */
       swap4
+      tag_40
+      swap7
       0x40
       mstore
         /* \"C\":403:411  this.f() */
-      returndatasize
       dup2
       add
       swap1
       tag_6
       jump\t// in
-    tag_43:
+    tag_45:
       swap3
       pop
       swap3
       jump(tag_37)
         /* \"C\":79:428  contract C... */
-    tag_41:
+    tag_43:
       shl(0xe0, 0x4e487b71)
       dup2
       mstore
       mstore(0x04, 0x41)
       0x24
-      swap4
+      swap5
+      pop
+      swap3
       pop
-      swap2
       pop
       pop
       revert
         /* \"C\":403:411  this.f() */
+    tag_41:
+      returndatasize
+      swap2
+      pop
+      jump(tag_42)
     tag_34:
         /* \"C\":79:428  contract C... */
       swap3
@@ -345,10 +357,10 @@ sub_0: assembly {
       swap1
       revert
     tag_32:
-      tag_44
+      tag_46
       tag_4
       jump\t// in
-    tag_44:
+    tag_46:
       jump(tag_33)
         /* \"C\":117:119  41 */
     tag_4:
@@ -373,9 +385,9 @@ sub_0: assembly {
       dup5
       sgt
       and
-      tag_45
+      tag_47
       jumpi
-    tag_46:
+    tag_48:
       shl(0xff, 0x01)
       dup3
       swap1
@@ -383,25 +395,25 @@ sub_0: assembly {
       dup4
       slt
       and
-      tag_47
+      tag_49
       jumpi
       add
       swap1
       jump\t// out
-    tag_47:
-      tag_49
+    tag_49:
+      tag_51
       tag_4
       jump\t// in
-    tag_49:
+    tag_51:
       add
       swap1
       jump\t// out
-    tag_45:
-      tag_50
+    tag_47:
+      tag_52
       tag_4
       jump\t// in
-    tag_50:
-      jump(tag_46)
+    tag_52:
+      jump(tag_48)
         /* \"C\":79:428  contract C... */
     tag_6:
       swap1
@@ -410,12 +422,12 @@ sub_0: assembly {
       swap2
       sub
       slt
-      tag_51
+      tag_53
       jumpi
       mload
       swap1
       jump\t// out
-    tag_51:
+    tag_53:
       pop
       pop
       0x00
@@ -732,34 +744,39 @@ sub_0: assembly {
       return
         /* \"C\":403:411  this.f() */
     tag_36:
-        /* \"D\":91:166  contract D is C(3)... */
       swap1
       swap2
       pop
-        /* \"C\":403:411  this.f() */
+      0x20
+      swap1
       returndatasize
+      dup3
+      gt
+      tag_41
+      jumpi
+    tag_42:
         /* \"D\":91:166  contract D is C(3)... */
       0x1f
+      dup3
       add
       not(0x1f)
       and
-      dup3
+      dup4
       add
       swap1
       0xffffffffffffffff
       dup3
       gt
-      dup4
+      dup5
       dup4
       lt
       or
-      tag_41
+      tag_43
       jumpi
       pop
-      tag_40
       swap3
         /* \"C\":403:411  this.f() */
-      tag_43
+      tag_45
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       tag_39
         /* \"D\":91:166  contract D is C(3)... */
@@ -768,34 +785,41 @@ sub_0: assembly {
       tag_38
         /* \"D\":91:166  contract D is C(3)... */
       swap4
+      tag_40
+      swap7
       0x40
       mstore
         /* \"C\":403:411  this.f() */
-      returndatasize
       dup2
       add
       swap1
       tag_6
       jump\t// in
-    tag_43:
+    tag_45:
       swap3
       pop
       swap3
       jump(tag_37)
         /* \"D\":91:166  contract D is C(3)... */
-    tag_41:
+    tag_43:
       shl(0xe0, 0x4e487b71)
       dup2
       mstore
       mstore(0x04, 0x41)
       0x24
-      swap4
+      swap5
+      pop
+      swap3
       pop
-      swap2
       pop
       pop
       revert
         /* \"C\":403:411  this.f() */
+    tag_41:
+      returndatasize
+      swap2
+      pop
+      jump(tag_42)
     tag_34:
         /* \"D\":91:166  contract D is C(3)... */
       swap3
@@ -812,10 +836,10 @@ sub_0: assembly {
       swap1
       revert
     tag_32:
-      tag_44
+      tag_46
       tag_4
       jump\t// in
-    tag_44:
+    tag_46:
       jump(tag_33)
         /* \"C\":117:119  41 */
     tag_4:
@@ -840,9 +864,9 @@ sub_0: assembly {
       dup5
       sgt
       and
-      tag_45
+      tag_47
       jumpi
-    tag_46:
+    tag_48:
       shl(0xff, 0x01)
       dup3
       swap1
@@ -850,25 +874,25 @@ sub_0: assembly {
       dup4
       slt
       and
-      tag_47
+      tag_49
       jumpi
       add
       swap1
       jump\t// out
-    tag_47:
-      tag_49
+    tag_49:
+      tag_51
       tag_4
       jump\t// in
-    tag_49:
+    tag_51:
       add
       swap1
       jump\t// out
-    tag_45:
-      tag_50
+    tag_47:
+      tag_52
       tag_4
       jump\t// in
-    tag_50:
-      jump(tag_46)
+    tag_52:
+      jump(tag_48)
         /* \"D\":91:166  contract D is C(3)... */
     tag_6:
       swap1
@@ -877,12 +901,12 @@ sub_0: assembly {
       swap2
       sub
       slt
-      tag_51
+      tag_53
       jumpi
       mload
       swap1
       jump\t// out
-    tag_51:
+    tag_53:
       pop
       pop
       0x00
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index 6b3c5661e9..f593301bcc 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -563,18 +563,24 @@ object \"C_54\" {
                 let expr_47
                 if _12 {
 
+                    let _13 := 32
+
+                    if gt(_13, returndatasize()) {
+                        _13 := returndatasize()
+                    }
+
                     // update freeMemoryPointer according to dynamic return size
-                    finalize_allocation(_10, returndatasize())
+                    finalize_allocation(_10, _13)
 
                     // decode return parameters from external try-call into retVars
-                    expr_47 :=  abi_decode_tuple_t_int256_fromMemory(_10, add(_10, returndatasize()))
+                    expr_47 :=  abi_decode_tuple_t_int256_fromMemory(_10, add(_10, _13))
                 }
                 /// @src 0:399:418  \"stateVar + this.f()\"
                 let expr_48 := checked_add_t_int256(expr_44, expr_47)
 
                 /// @src 0:421:429  \"immutVar\"
-                let _13 := loadimmutable(\"8\")
-                let expr_49 := _13
+                let _14 := loadimmutable(\"8\")
+                let expr_49 := _14
                 /// @src 0:399:429  \"stateVar + this.f() + immutVar\"
                 let expr_50 := checked_add_t_int256(expr_48, expr_49)
 
@@ -718,8 +724,10 @@ object \"C_54\" {
                 /// @src 0:410:418  \"this.f()\"
                 if _4
                 {
+                    let _5 := 32
+                    if gt(_5, returndatasize()) { _5 := returndatasize() }
                     /// @src 0:79:435  \"contract C...\"
-                    let newFreePtr := add(_3, and(add(/** @src 0:410:418  \"this.f()\" */ returndatasize(), /** @src 0:79:435  \"contract C...\" */ 31), not(31)))
+                    let newFreePtr := add(_3, and(add(_5, 31), not(31)))
                     if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _3))
                     {
                         mstore(_1, shl(224, 0x4e487b71))
@@ -728,7 +736,7 @@ object \"C_54\" {
                     }
                     mstore(64, newFreePtr)
                     /// @src 0:410:418  \"this.f()\"
-                    expr := abi_decode_int256_fromMemory(_3, add(_3, returndatasize()))
+                    expr := abi_decode_int256_fromMemory(_3, add(_3, _5))
                 }
                 /// @src 0:399:418  \"stateVar + this.f()\"
                 let expr_1 := checked_add_int256(ret, expr)
@@ -1402,18 +1410,24 @@ object \"D_72\" {
                 let expr_47
                 if _12 {
 
+                    let _13 := 32
+
+                    if gt(_13, returndatasize()) {
+                        _13 := returndatasize()
+                    }
+
                     // update freeMemoryPointer according to dynamic return size
-                    finalize_allocation(_10, returndatasize())
+                    finalize_allocation(_10, _13)
 
                     // decode return parameters from external try-call into retVars
-                    expr_47 :=  abi_decode_tuple_t_int256_fromMemory(_10, add(_10, returndatasize()))
+                    expr_47 :=  abi_decode_tuple_t_int256_fromMemory(_10, add(_10, _13))
                 }
                 /// @src 0:399:418  \"stateVar + this.f()\"
                 let expr_48 := checked_add_t_int256(expr_44, expr_47)
 
                 /// @src 0:421:429  \"immutVar\"
-                let _13 := loadimmutable(\"8\")
-                let expr_49 := _13
+                let _14 := loadimmutable(\"8\")
+                let expr_49 := _14
                 /// @src 0:399:429  \"stateVar + this.f() + immutVar\"
                 let expr_50 := checked_add_t_int256(expr_48, expr_49)
 
@@ -1565,8 +1579,10 @@ object \"D_72\" {
                 /// @src 0:410:418  \"this.f()\"
                 if _4
                 {
+                    let _5 := 32
+                    if gt(_5, returndatasize()) { _5 := returndatasize() }
                     /// @src 1:91:166  \"contract D is C(3)...\"
-                    let newFreePtr := add(_3, and(add(/** @src 0:410:418  \"this.f()\" */ returndatasize(), /** @src 1:91:166  \"contract D is C(3)...\" */ 31), not(31)))
+                    let newFreePtr := add(_3, and(add(_5, 31), not(31)))
                     if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _3))
                     {
                         mstore(_1, shl(224, 0x4e487b71))
@@ -1575,7 +1591,7 @@ object \"D_72\" {
                     }
                     mstore(64, newFreePtr)
                     /// @src 0:410:418  \"this.f()\"
-                    expr := abi_decode_int256_fromMemory(_3, add(_3, returndatasize()))
+                    expr := abi_decode_int256_fromMemory(_3, add(_3, _5))
                 }
                 /// @src 0:399:418  \"stateVar + this.f()\"
                 let expr_1 := checked_add_int256(ret, expr)
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 64ca830411..c386cf3e84 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // compileViaYul: also
 // ----
 // test_bytes() ->
-// gas irOptimized: 371847
+// gas irOptimized: 371919
 // gas legacy: 418955
 // gas legacyOptimized: 326783
 // test_uint256() ->
-// gas irOptimized: 522929
+// gas irOptimized: 523001
 // gas legacy: 586784
 // gas legacyOptimized: 451529
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index 3c1ffa6cf2..cc1a182c9f 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -26,6 +26,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 167672
+// gas irOptimized: 167696
 // gas legacy: 169347
 // gas legacyOptimized: 167269
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 1c4e8d7a2e..9deed97f1d 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -61,10 +61,10 @@ contract C {
 // compileViaYul: also
 // ----
 // test_bytes() ->
-// gas irOptimized: 371847
+// gas irOptimized: 371919
 // gas legacy: 418955
 // gas legacyOptimized: 326783
 // test_uint256() ->
-// gas irOptimized: 522929
+// gas irOptimized: 523001
 // gas legacy: 586784
 // gas legacyOptimized: 451529
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index 2aa7a251ba..eec062f56b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -32,6 +32,6 @@ contract C is B {
 // compileViaYul: also
 // ----
 // test() -> 77
-// gas irOptimized: 119895
+// gas irOptimized: 119919
 // gas legacy: 155093
 // gas legacyOptimized: 111550
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 8d1f1a727b..cf5958d456 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -21,6 +21,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 171838
+// gas irOptimized: 171842
 // gas legacy: 141644
 // gas legacyOptimized: 121532
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 3b0a73d006..fcf41823e7 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -21,6 +21,6 @@ contract B {
 // compileViaYul: also
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 130097
+// gas irOptimized: 130152
 // gas legacy: 234943
 // gas legacyOptimized: 132863
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index e9aef6d0d8..73f9799d43 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -45,6 +45,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 290567
+// gas irOptimized: 298983
 // gas legacy: 452172
 // gas legacyOptimized: 285017
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index 87280f6a49..ee91ce7f7b 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -26,6 +26,6 @@ contract Main {
 // compileViaYul: also
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 113552
+// gas irOptimized: 113598
 // gas legacy: 126596
 // gas legacyOptimized: 113823
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 759c58d30e..cc303899a1 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 443921
+// gas irOptimized: 443960
 // gas legacy: 590683
 // gas legacyOptimized: 448326
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 7210ac2698..ffe0fb8c25 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 300765
+// gas irOptimized: 300804
 // gas legacy: 428917
 // gas legacyOptimized: 298128
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 690f555dc6..5ec47a4a9c 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 177344
+// gas irOptimized: 173672
 // gas legacy: 250376
 // gas legacyOptimized: 174522
 // deposit(bytes32), 18 wei: 0x1234 ->
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index 2da7c2dd6d..685d8a7de5 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -17,7 +17,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 200295
+// gas irOptimized: 203967
 // gas legacy: 245842
 // gas legacyOptimized: 195676
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index 0b0633c6d1..a768a2836d 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -18,7 +18,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 200458
+// gas irOptimized: 204130
 // gas legacy: 246202
 // gas legacyOptimized: 195914
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index 942faa048b..030aeaa10b 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -25,7 +25,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 308423
+// gas irOptimized: 315341
 // gas legacy: 465314
 // gas legacyOptimized: 304481
 // f(uint256): 0 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index ce8d29b8b8..cfbf1bcc13 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -27,7 +27,7 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 445767
+// gas irOptimized: 452673
 // gas legacy: 834272
 // gas legacyOptimized: 510004
 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 4862f3b4c2..2ebf8740d2 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -18,7 +18,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 213663
+// gas irOptimized: 219285
 // gas legacy: 294569
 // gas legacyOptimized: 174699
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
@@ -26,7 +26,7 @@ contract C {
 // f(uint256): 20 -> FAILURE
 // x() -> 1
 // stack(uint256): 1023 -> FAILURE
-// gas irOptimized: 304303
+// gas irOptimized: 314884
 // gas legacy: 483942
 // gas legacyOptimized: 298807
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index a4c3fb3dd1..4321753d68 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -41,7 +41,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 274154
+// gas irOptimized: 283040
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 5b39dda482..2f89517b7a 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -40,7 +40,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 274154
+// gas irOptimized: 283040
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/return_size_bigger_than_expected.sol b/test/libsolidity/semanticTests/functionCall/return_size_bigger_than_expected.sol
new file mode 100644
index 0000000000..c7a1d12bf9
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionCall/return_size_bigger_than_expected.sol
@@ -0,0 +1,31 @@
+interface ShortReturn {
+    function f() external pure returns (bytes32);
+}
+contract LongReturn {
+    function f() external pure returns (uint[20] memory) {}
+}
+
+contract Test {
+    function test() public returns (uint) {
+        LongReturn longReturn = new LongReturn();
+        uint freeMemoryBefore;
+        assembly {
+            freeMemoryBefore := mload(0x40)
+        }
+
+        ShortReturn(address(longReturn)).f();
+
+        uint freeMemoryAfter;
+
+        assembly {
+            freeMemoryAfter := mload(0x40)
+        }
+
+        return freeMemoryAfter - freeMemoryBefore;
+    }
+}
+// ====
+// compileViaYul: true
+// ----
+// test() -> 0x20
+// gas legacy: 131966
diff --git a/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected.sol b/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected.sol
new file mode 100644
index 0000000000..5f39b877eb
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected.sol
@@ -0,0 +1,32 @@
+interface LongReturn {
+    function f() external pure returns (uint[20] memory);
+}
+contract ShortReturn {
+    function f() external pure returns (bytes32) {}
+}
+
+contract Test {
+    function test() public returns (uint) {
+        ShortReturn shortReturn = new ShortReturn();
+        uint freeMemoryBefore;
+        assembly {
+            freeMemoryBefore := mload(0x40)
+        }
+
+        LongReturn(address(shortReturn)).f();
+
+        uint freeMemoryAfter;
+
+        assembly {
+            freeMemoryAfter := mload(0x40)
+        }
+
+        return freeMemoryAfter - freeMemoryBefore;
+    }
+}
+// ====
+// EVMVersion: <=homestead
+// compileViaYul: true
+// ----
+// test() -> 0x0500
+// gas legacy: 131966
diff --git a/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected_evm_version_after_homestead.sol b/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected_evm_version_after_homestead.sol
new file mode 100644
index 0000000000..2258322755
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionCall/return_size_shorter_than_expected_evm_version_after_homestead.sol
@@ -0,0 +1,34 @@
+interface LongReturn {
+    function f() external pure returns (uint[20] memory);
+}
+contract ShortReturn {
+    function f() external pure returns (bytes32) {}
+}
+
+contract Test {
+    function test() public returns (uint) {
+        ShortReturn shortReturn = new ShortReturn();
+        uint freeMemoryBefore;
+        assembly {
+            freeMemoryBefore := mload(0x40)
+        }
+
+        // This reverts. The external call succeeds but ABI decoding fails due to the returned
+        // `bytes32` being much shorter than the expected `uint[20]`.
+        LongReturn(address(shortReturn)).f();
+
+        uint freeMemoryAfter;
+
+        assembly {
+            freeMemoryAfter := mload(0x40)
+        }
+
+        return freeMemoryAfter - freeMemoryBefore;
+    }
+}
+// ====
+// EVMVersion: >homestead
+// compileViaYul: true
+// ----
+// test() -> FAILURE
+// gas legacy: 131966
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index 840a8761b2..e834663d0d 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -29,7 +29,7 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 127302
+// gas irOptimized: 127347
 // gas legacy: 151334
 // gas legacyOptimized: 125166
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index 8f3584a9db..a156509929 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -25,6 +25,6 @@ contract B {
 // compileViaYul: also
 // ----
 // g() -> 42
-// gas irOptimized: 111770
+// gas irOptimized: 111794
 // gas legacy: 185053
 // gas legacyOptimized: 114598
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index 94cd46a2db..e6f94bdcff 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -42,7 +42,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 276469
+// gas irOptimized: 284287
 // gas legacy: 402045
 // gas legacyOptimized: 266772
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 5af1e5cdc6..8d37ed809f 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -18,7 +18,7 @@ contract ClientReceipt {
 // compileViaYul: also
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 184076
+// gas irOptimized: 188162
 // gas legacy: 235195
 // gas legacyOptimized: 176766
 // balance -> 1500
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index 6b13ee09c3..ac61fad71c 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -25,6 +25,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 4, 0x11
-// gas irOptimized: 115822
+// gas irOptimized: 115874
 // gas legacy: 135952
 // gas legacyOptimized: 119643
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index d85f906949..e8d22c279c 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -22,6 +22,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 119757
+// gas irOptimized: 119561
 // gas legacy: 124793
 // gas legacyOptimized: 119694
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
index 9192fdfe31..86e7fa3d75 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
@@ -20,6 +20,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 120471
+// gas irOptimized: 120572
 // gas legacy: 125245
 // gas legacyOptimized: 120153
diff --git a/test/libsolidity/semanticTests/libraries/using_library_structs.sol b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
index 4348c377c7..116887fd59 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_structs.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
@@ -23,5 +23,5 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 7, 8
-// gas irOptimized: 101869
+// gas irOptimized: 101820
 // gas legacy: 101504
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index af9c7e76b2..4ce8b5149c 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -22,6 +22,6 @@ contract A {
 // compileViaYul: also
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 272338
+// gas irOptimized: 272413
 // gas legacy: 422501
 // gas legacyOptimized: 287472
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index bd7e2fe9cd..56ad74c540 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -51,7 +51,7 @@ contract C {
 // compileViaYul: also
 // ----
 // test_f() -> true
-// gas irOptimized: 122413
+// gas irOptimized: 122364
 // gas legacy: 126168
 // gas legacyOptimized: 123199
 // test_g() -> true
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 600e72e3e3..1c456f1d48 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -19,7 +19,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(), 27 wei ->
-// gas irOptimized: 175261
+// gas irOptimized: 178933
 // gas legacy: 222977
 // gas legacyOptimized: 169779
 // f() -> 27
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index ba4e7426ae..30a2d9f65a 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -22,6 +22,6 @@ contract C {
 // compileViaYul: also
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178822
+// gas irOptimized: 178812
 // gas legacy: 180762
 // gas legacyOptimized: 179481
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index bebf7557f0..5d8bda5dd7 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -22,7 +22,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 185891
+// gas irOptimized: 192113
 // gas legacy: 265006
 // gas legacyOptimized: 182842
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 9edd8061a1..0b2b1735b2 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -21,7 +21,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 187835
+// gas irOptimized: 194261
 // gas legacy: 266728
 // gas legacyOptimized: 184762
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index 497dd36c8b..05b7e668b4 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -23,6 +23,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() ->
-// gas irOptimized: 113096
+// gas irOptimized: 112998
 // gas legacy: 112937
 // gas legacyOptimized: 112608

From cb4ffbfbb7509191483834972ee5c504f7908f08 Mon Sep 17 00:00:00 2001
From: david-k <david.k@posteo.de>
Date: Fri, 4 Mar 2022 11:02:54 +0100
Subject: [PATCH 0436/1748] Fix leftover use of divModWithSlacks in doc

The option `divModWithSlacks` was previously changed to `divModNoSlacks`.
However, this was not reflected in the documentation.
---
 docs/using-the-compiler.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index c6c40cacc0..067c96c96f 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -410,12 +410,13 @@ Input Description
             "source1.sol": ["contract1"],
             "source2.sol": ["contract2", "contract3"]
           },
-          // Choose whether division and modulo operations should be replaced by
-          // multiplication with slack variables. Default is `true`.
-          // Using `false` here is recommended if you are using the CHC engine
+          // Choose how division and modulo operations should be encoded.
+          // When using `false` they are replaced by multiplication with slack
+          // variables. This is the default.
+          // Using `true` here is recommended if you are using the CHC engine
           // and not using Spacer as the Horn solver (using Eldarica, for example).
           // See the Formal Verification section for a more detailed explanation of this option.
-          "divModWithSlacks": true,
+          "divModNoSlacks": false,
           // Choose which model checker engine to use: all (default), bmc, chc, none.
           "engine": "chc",
           // Choose which types of invariants should be reported to the user: contract, reentrancy.

From 66a779d2677cd322d26f7c7f304bd65092464a47 Mon Sep 17 00:00:00 2001
From: Mate Soos <mate.soos@ethereum.org>
Date: Fri, 4 Mar 2022 12:20:57 +0100
Subject: [PATCH 0437/1748] Fixing style issue in ExecutionFramework.cpp

It should be `auto const&` not `const auto&`
---
 test/ExecutionFramework.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index 600bedbf5e..bb46f108d1 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -266,7 +266,7 @@ h160 ExecutionFramework::logAddress(size_t _logIdx) const
 
 bytes ExecutionFramework::logData(size_t _logIdx) const
 {
-	const auto& data = m_evmcHost->recorded_logs.at(_logIdx).data;
+	auto const& data = m_evmcHost->recorded_logs.at(_logIdx).data;
 	// TODO: Return a copy of log data, because this is expected from REQUIRE_LOG_DATA(),
 	//       but reference type like string_view would be preferable.
 	return {data.begin(), data.end()};

From 17fa85a2fbe27d97d080b17d89b064ba3dc078fe Mon Sep 17 00:00:00 2001
From: Paarth Madan <paarth.mdn@gmail.com>
Date: Fri, 11 Feb 2022 22:10:36 -0500
Subject: [PATCH 0438/1748] Add Base64 test cases with and without inline
 assembly

Adds two implementations of Base64 encoding as specified in RFC4648.
Implementation (1) uses inline assembly, while Implementation (2) is
written purely in Solidity.

Assertions are added to replicate the test vectors specified in the RFC
for Base64 to ensure both implementations to specification.
---
 .../_base64/base64_inline_asm.sol             | 96 +++++++++++++++++++
 .../_base64/base64_no_inline_asm.sol          | 39 ++++++++
 .../externalContracts/base64.sol              | 61 ++++++++++++
 3 files changed, 196 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/externalContracts/_base64/base64_inline_asm.sol
 create mode 100644 test/libsolidity/semanticTests/externalContracts/_base64/base64_no_inline_asm.sol
 create mode 100644 test/libsolidity/semanticTests/externalContracts/base64.sol

diff --git a/test/libsolidity/semanticTests/externalContracts/_base64/base64_inline_asm.sol b/test/libsolidity/semanticTests/externalContracts/_base64/base64_inline_asm.sol
new file mode 100644
index 0000000000..7df0c902d1
--- /dev/null
+++ b/test/libsolidity/semanticTests/externalContracts/_base64/base64_inline_asm.sol
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+/**
+ * @dev Provides a set of functions to operate with Base64 strings.
+ */
+library InlineAsmBase64 {
+    /**
+     * @dev Base64 Encoding/Decoding Table
+     */
+    string internal constant _TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+    /**
+     * @dev Converts a `bytes` to its Bytes64 `string` representation.
+     */
+    function encode(bytes memory data) internal pure returns (string memory) {
+        /**
+         * Inspired by OpenZepplin Base64 implementation
+         * https://github.com/OpenZeppelin/openzeppelin-contracts/pull/2884/commits/157c32b65a15cb0b58257543643cafa1cebf883a
+         */
+        if (data.length == 0) return "";
+
+        // Loads the table into memory
+        string memory table = _TABLE;
+
+        // Encoding takes 3 bytes chunks of binary data from `bytes` data parameter
+        // and split into 4 numbers of 6 bits.
+        // The final Base64 length should be `bytes` data length multiplied by 4/3 rounded up
+        // - `data.length + 2`  -> Round up
+        // - `/ 3`              -> Number of 3-bytes chunks
+        // - `4 *`              -> 4 characters for each chunk
+        uint256 encodedLen = 4 * ((data.length + 2) / 3);
+
+        // Add some extra buffer at the end required for the writing
+        string memory result = new string(encodedLen);
+
+        assembly {
+            // Store the actual result length in memory
+            mstore(result, encodedLen)
+
+            // Prepare the lookup table
+            let tablePtr := add(table, 1)
+
+            // Prepare input pointer
+            let dataPtr := data
+            let endPtr := add(dataPtr, mload(data))
+
+            // Prepare result pointer, jump over length
+            let resultPtr := add(result, 32)
+
+            // Run over the input, 3 bytes at a time
+            for {
+
+            } lt(dataPtr, endPtr) {
+
+            } {
+                // Advance 3 bytes
+                dataPtr := add(dataPtr, 3)
+                let input := mload(dataPtr)
+
+                // To write each character, shift the 3 bytes (24 bits) chunk 4
+                // times in blocks of 6 bits for each character (18, 12, 6, 0)
+                // and apply logical AND with 0x3F to extract the 6-bit group.
+                // Add the 6-bit group with the table ptr to index into the
+                // table and acquire the character to write.  Finally, write
+                // the character to the result pointer.
+
+                mstore8(resultPtr, mload(add(tablePtr, and(shr(18, input), 0x3F))))
+                resultPtr := add(resultPtr, 1) // Advance
+
+                mstore8(resultPtr, mload(add(tablePtr, and(shr(12, input), 0x3F))))
+                resultPtr := add(resultPtr, 1) // Advance
+
+                mstore8(resultPtr, mload(add(tablePtr, and(shr(6, input), 0x3F))))
+                resultPtr := add(resultPtr, 1) // Advance
+
+                mstore8(resultPtr, mload(add(tablePtr, and(input, 0x3F))))
+                resultPtr := add(resultPtr, 1) // Advance
+            }
+
+            // When data `bytes` is not exactly 3 bytes long
+            // it is padded with `=` characters at the end
+            switch mod(mload(data), 3)
+            case 1 {
+                mstore8(sub(resultPtr, 1), 0x3d)
+                mstore8(sub(resultPtr, 2), 0x3d)
+            }
+            case 2 {
+                mstore8(sub(resultPtr, 1), 0x3d)
+            }
+        }
+
+        return result;
+    }
+}
diff --git a/test/libsolidity/semanticTests/externalContracts/_base64/base64_no_inline_asm.sol b/test/libsolidity/semanticTests/externalContracts/_base64/base64_no_inline_asm.sol
new file mode 100644
index 0000000000..f54d2f9252
--- /dev/null
+++ b/test/libsolidity/semanticTests/externalContracts/_base64/base64_no_inline_asm.sol
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: MIT
+
+pragma solidity ^0.8.0;
+
+/**
+ * @dev Provides a set of functions to operate with Base64 strings.
+ */
+library NoAsmBase64 {
+    bytes private constant TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+        function encode(bytes memory data) internal pure returns (string memory) {
+        if (data.length == 0) return "";
+
+        bytes memory table     = TABLE;
+        bytes memory result    = new bytes(4 * ((data.length + 2) / 3));
+        uint256      resultPtr = 0;
+
+        for (uint256 dataPtr = 0; dataPtr < data.length; dataPtr += 3) {
+            uint24 chunk = (                            (uint24(uint8(data[dataPtr + 0])) << 16))
+                         + (dataPtr + 1 < data.length ? (uint24(uint8(data[dataPtr + 1])) <<  8) : 0)
+                         + (dataPtr + 2 < data.length ? (uint24(uint8(data[dataPtr + 2]))      ) : 0);
+
+            result[resultPtr++] = table[uint8(chunk >> 18) & 0x3f];
+            result[resultPtr++] = table[uint8(chunk >> 12) & 0x3f];
+            result[resultPtr++] = table[uint8(chunk >>  6) & 0x3f];
+            result[resultPtr++] = table[uint8(chunk      ) & 0x3f];
+        }
+
+        if (data.length % 3 == 1) {
+            result[--resultPtr] = 0x3d;
+            result[--resultPtr] = 0x3d;
+        }
+        else if (data.length % 3 == 2) {
+            result[--resultPtr] = 0x3d;
+        }
+
+        return (string(result));
+    }
+}
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
new file mode 100644
index 0000000000..fd17c5d78b
--- /dev/null
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -0,0 +1,61 @@
+==== ExternalSource: _base64/base64_inline_asm.sol ====
+==== ExternalSource: _base64/base64_no_inline_asm.sol ====
+==== Source: base64.sol ====
+
+import "_base64/base64_inline_asm.sol";
+import "_base64/base64_no_inline_asm.sol";
+
+contract test {
+    function encode_inline_asm(bytes memory data) external pure returns (string memory) {
+      return InlineAsmBase64.encode(data);
+    }
+
+    function encode_no_asm(bytes memory data) external pure returns (string memory) {
+      return NoAsmBase64.encode(data);
+    }
+
+    function encode_inline_asm_large() external {
+      for (uint i = 0; i < 1000; i++) {
+        InlineAsmBase64.encode("foo");
+      }
+    }
+
+    function encode_no_asm_large() external {
+      for (uint i = 0; i < 1000; i++) {
+        NoAsmBase64.encode("foo");
+      }
+    }
+}
+// Test cases derived from Base64 specification: RFC4648
+// https://datatracker.ietf.org/doc/html/rfc4648#section-10
+//
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: also
+// ----
+// constructor()
+// gas irOptimized: 450044
+// gas legacy: 766936
+// gas legacyOptimized: 543094
+// encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
+// encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
+// encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
+// encode_inline_asm(bytes): 0x20, 3, "foo" -> 0x20, 4, "Zm9v"
+// encode_inline_asm(bytes): 0x20, 4, "foob" -> 0x20, 8, "Zm9vYg=="
+// encode_inline_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
+// encode_inline_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
+// encode_no_asm(bytes): 0x20, 0 -> 0x20, 0
+// encode_no_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
+// encode_no_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
+// encode_no_asm(bytes): 0x20, 3, "foo" -> 0x20, 4, "Zm9v"
+// encode_no_asm(bytes): 0x20, 4, "foob" -> 0x20, 8, "Zm9vYg=="
+// encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
+// encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
+// encode_inline_asm_large()
+// gas irOptimized: 1385047
+// gas legacy: 1658033
+// gas legacyOptimized: 1210033
+// encode_no_asm_large()
+// gas irOptimized: 3335101
+// gas legacy: 4801077
+// gas legacyOptimized: 2929077

From a890c82f9dee11a41fcb4a987d6da8b764284b5e Mon Sep 17 00:00:00 2001
From: Tyler <tylerfeuerstein@gmail.com>
Date: Sun, 6 Mar 2022 23:14:53 -0500
Subject: [PATCH 0439/1748] Remove use of `using namespace` in header file

---
 libsolidity/ast/ASTAnnotations.h | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index 53931e4263..2b07eebbd3 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -47,7 +47,6 @@ namespace solidity::frontend
 
 class Type;
 class ArrayType;
-using namespace util;
 
 struct CallGraph;
 
@@ -91,13 +90,13 @@ struct StructurallyDocumentedAnnotation
 struct SourceUnitAnnotation: ASTAnnotation
 {
 	/// The "absolute" (in the compiler sense) path of this source unit.
-	SetOnce<std::string> path;
+	util::SetOnce<std::string> path;
 	/// The exported symbols (all global symbols).
-	SetOnce<std::map<ASTString, std::vector<Declaration const*>>> exportedSymbols;
+	util::SetOnce<std::map<ASTString, std::vector<Declaration const*>>> exportedSymbols;
 	/// Experimental features.
 	std::set<ExperimentalFeature> experimentalFeatures;
 	/// Using the new ABI coder. Set to `false` if using ABI coder v1.
-	SetOnce<bool> useABICoderV2;
+	util::SetOnce<bool> useABICoderV2;
 };
 
 struct ScopableAnnotation
@@ -127,7 +126,7 @@ struct DeclarationAnnotation: ASTAnnotation, ScopableAnnotation
 struct ImportAnnotation: DeclarationAnnotation
 {
 	/// The absolute path of the source unit to import.
-	SetOnce<std::string> absolutePath;
+	util::SetOnce<std::string> absolutePath;
 	/// The actual source unit.
 	SourceUnit const* sourceUnit = nullptr;
 };
@@ -135,7 +134,7 @@ struct ImportAnnotation: DeclarationAnnotation
 struct TypeDeclarationAnnotation: DeclarationAnnotation
 {
 	/// The name of this type, prefixed by proper namespaces if globally accessible.
-	SetOnce<std::string> canonicalName;
+	util::SetOnce<std::string> canonicalName;
 };
 
 struct StructDeclarationAnnotation: TypeDeclarationAnnotation
@@ -162,9 +161,9 @@ struct ContractDefinitionAnnotation: TypeDeclarationAnnotation, StructurallyDocu
 	/// These can either be inheritance specifiers or modifier invocations.
 	std::map<FunctionDefinition const*, ASTNode const*> baseConstructorArguments;
 	/// A graph with edges representing calls between functions that may happen during contract construction.
-	SetOnce<std::shared_ptr<CallGraph const>> creationCallGraph;
+	util::SetOnce<std::shared_ptr<CallGraph const>> creationCallGraph;
 	/// A graph with edges representing calls between functions that may happen in a deployed contract.
-	SetOnce<std::shared_ptr<CallGraph const>> deployedCallGraph;
+	util::SetOnce<std::shared_ptr<CallGraph const>> deployedCallGraph;
 
 	/// List of contracts whose bytecode is referenced by this contract, e.g. through "new".
 	/// The Value represents the ast node that referenced the contract.
@@ -252,7 +251,7 @@ struct IdentifierPathAnnotation: ASTAnnotation
 	/// Referenced declaration, set during reference resolution stage.
 	Declaration const* referencedDeclaration = nullptr;
 	/// What kind of lookup needs to be done (static, virtual, super) find the declaration.
-	SetOnce<VirtualLookup> requiredLookup;
+	util::SetOnce<VirtualLookup> requiredLookup;
 };
 
 struct ExpressionAnnotation: ASTAnnotation
@@ -260,11 +259,11 @@ struct ExpressionAnnotation: ASTAnnotation
 	/// Inferred type of the expression.
 	Type const* type = nullptr;
 	/// Whether the expression is a constant variable
-	SetOnce<bool> isConstant;
+	util::SetOnce<bool> isConstant;
 	/// Whether the expression is pure, i.e. compile-time constant.
-	SetOnce<bool> isPure;
+	util::SetOnce<bool> isPure;
 	/// Whether it is an LValue (i.e. something that can be assigned to).
-	SetOnce<bool> isLValue;
+	util::SetOnce<bool> isLValue;
 	/// Whether the expression is used in a context where the LValue is actually required.
 	bool willBeWrittenTo = false;
 	/// Whether the expression is an lvalue that is only assigned.
@@ -291,7 +290,7 @@ struct IdentifierAnnotation: ExpressionAnnotation
 	/// Referenced declaration, set at latest during overload resolution stage.
 	Declaration const* referencedDeclaration = nullptr;
 	/// What kind of lookup needs to be done (static, virtual, super) find the declaration.
-	SetOnce<VirtualLookup> requiredLookup;
+	util::SetOnce<VirtualLookup> requiredLookup;
 	/// List of possible declarations it could refer to (can contain duplicates).
 	std::vector<Declaration const*> candidateDeclarations;
 	/// List of possible declarations it could refer to.
@@ -303,7 +302,7 @@ struct MemberAccessAnnotation: ExpressionAnnotation
 	/// Referenced declaration, set at latest during overload resolution stage.
 	Declaration const* referencedDeclaration = nullptr;
 	/// What kind of lookup needs to be done (static, virtual, super) find the declaration.
-	SetOnce<VirtualLookup> requiredLookup;
+	util::SetOnce<VirtualLookup> requiredLookup;
 };
 
 struct BinaryOperationAnnotation: ExpressionAnnotation

From 06820e1b1eee5b20bf53d9e8d5c9dbbd241b8b4c Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 7 Mar 2022 12:14:08 +0100
Subject: [PATCH 0440/1748] Remove unused entry point to evmasm Assembly.

---
 libevmasm/Assembly.cpp | 20 --------------------
 libevmasm/Assembly.h   |  7 -------
 2 files changed, 27 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 12c7be2303..55d23e283f 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -397,26 +397,6 @@ AssemblyItem Assembly::newImmutableAssignment(string const& _identifier)
 	return AssemblyItem{AssignImmutable, h};
 }
 
-Assembly& Assembly::optimise(bool _enable, EVMVersion _evmVersion, bool _isCreation, size_t _runs)
-{
-	OptimiserSettings settings;
-	settings.isCreation = _isCreation;
-	settings.runInliner = true;
-	settings.runJumpdestRemover = true;
-	settings.runPeephole = true;
-	if (_enable)
-	{
-		settings.runDeduplicate = true;
-		settings.runCSE = true;
-		settings.runConstantOptimiser = true;
-	}
-	settings.evmVersion = _evmVersion;
-	settings.expectedExecutionsPerDeployment = _runs;
-	optimise(settings);
-	return *this;
-}
-
-
 Assembly& Assembly::optimise(OptimiserSettings const& _settings)
 {
 	optimiseInternal(_settings, {});
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index f768ffe314..97807e2238 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -134,13 +134,6 @@ class Assembly
 	/// is optimised according to the settings in @a _settings.
 	Assembly& optimise(OptimiserSettings const& _settings);
 
-	/// Modify (if @a _enable is set) and return the current assembly such that creation and
-	/// execution gas usage is optimised. @a _isCreation should be true for the top-level assembly.
-	/// @a _runs specifes an estimate on how often each opcode in this assembly will be executed,
-	/// i.e. use a small value to optimise for size and a large value to optimise for runtime.
-	/// If @a _enable is not set, will perform some simple peephole optimizations.
-	Assembly& optimise(bool _enable, langutil::EVMVersion _evmVersion, bool _isCreation, size_t _runs);
-
 	/// Create a text representation of the assembly.
 	std::string assemblyString(
 		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),

From 4d9a0787981ee38c5567afb55aad0b568a7f3c0d Mon Sep 17 00:00:00 2001
From: franzihei <franziheintel@gmail.com>
Date: Tue, 1 Mar 2022 15:31:10 +0100
Subject: [PATCH 0441/1748] updates index with language links

---
 docs/index.rst | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index f69f8692b0..7576b36321 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -5,10 +5,8 @@ Solidity is an object-oriented, high-level language for implementing smart
 contracts. Smart contracts are programs which govern the behaviour of accounts
 within the Ethereum state.
 
-Solidity is a `curly-bracket language <https://en.wikipedia.org/wiki/List_of_programming_languages_by_type#Curly-bracket_languages>`_.
-It is influenced by C++, Python and JavaScript, and is designed to target the Ethereum Virtual Machine (EVM).
-You can find more details about which languages Solidity has been inspired by in
-the :doc:`language influences <language-influences>` section.
+Solidity is a `curly-bracket language <https://en.wikipedia.org/wiki/List_of_programming_languages_by_type#Curly-bracket_languages>`_ designed to target the Ethereum Virtual Machine (EVM).
+It is influenced by C++, Python and JavaScript. You can find more details about which languages Solidity has been inspired by in the :doc:`language influences <language-influences>` section.
 
 Solidity is statically typed, supports inheritance, libraries and complex
 user-defined types among other features.
@@ -90,24 +88,25 @@ our `Gitter channel <https://gitter.im/ethereum/solidity/>`_.
 Translations
 ------------
 
-Community volunteers help translate this documentation into several languages.
-They have varying degrees of completeness and up-to-dateness. The English
+Community contributors help translate this documentation into several languages.
+Note that they have varying degrees of completeness and up-to-dateness. The English
 version stands as a reference.
 
+You can switch between languages by clicking on the flyout menu in the bottom-left corner
+and selecting the preferred language.
+
+* `French <https://docs.soliditylang.org/fr/latest/>`_
+* `Indonesian <https://github.com/solidity-docs/id-indonesian>`_
+* `Persian <https://github.com/solidity-docs/fa-persian>`_
+* `Japanese <https://github.com/solidity-docs/ja-japanese>`_
+* `Korean <https://github.com/solidity-docs/ko-korean>`_
+* `Chinese <https://github.com/solidity-docs/zh-cn-chinese/>`_
+
 .. note::
 
    We recently set up a new GitHub organization and translation workflow to help streamline the
    community efforts. Please refer to the `translation guide <https://github.com/solidity-docs/translation-guide>`_
-   for information on how to contribute to the community translations moving forward.
-
-* `French <https://solidity-fr.readthedocs.io>`_ (in progress)
-* `Italian <https://github.com/damianoazzolini/solidity>`_ (in progress)
-* `Japanese <https://solidity-jp.readthedocs.io>`_
-* `Korean <https://solidity-kr.readthedocs.io>`_ (in progress)
-* `Russian <https://github.com/ethereum/wiki/wiki/%5BRussian%5D-%D0%A0%D1%83%D0%BA%D0%BE%D0%B2%D0%BE%D0%B4%D1%81%D1%82%D0%B2%D0%BE-%D0%BF%D0%BE-Solidity>`_ (rather outdated)
-* `Simplified Chinese <https://learnblockchain.cn/docs/solidity/>`_ (in progress)
-* `Spanish <https://solidity-es.readthedocs.io>`_
-* `Turkish <https://github.com/denizozzgur/Solidity_TR/blob/master/README.md>`_ (partial)
+   for information on how to start a new language or contribute to the community translations.
 
 Contents
 ========

From 52dfccca98d870566c764204495582a1656b3a10 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Fri, 4 Mar 2022 10:15:57 +0100
Subject: [PATCH 0442/1748] Replace all locale-dependent operations with
 locale-agnostic counterparts

---
 libevmasm/AssemblyItem.cpp                    |  4 +-
 liblangutil/Token.cpp                         | 11 +++--
 libsolidity/ast/Types.cpp                     |  5 ++-
 .../codegen/ir/IRGeneratorForStatements.cpp   |  2 +-
 libsolidity/formal/CHC.cpp                    |  5 ++-
 libsolutil/CommonData.cpp                     | 11 ++---
 libsolutil/StringUtils.h                      | 45 +++++++++++++++++++
 libyul/backends/evm/EVMDialect.cpp            | 20 ++++-----
 libyul/optimiser/SimplificationRules.cpp      | 12 ++---
 test/CommonSyntaxTest.cpp                     | 13 +++---
 test/TestCase.cpp                             |  2 +-
 test/TestCase.h                               |  2 +-
 test/libsolidity/util/BytesUtils.cpp          |  3 +-
 test/libsolidity/util/TestFileParser.cpp      | 15 ++++---
 test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp |  3 +-
 test/tools/yulopti.cpp                        |  3 +-
 16 files changed, 105 insertions(+), 51 deletions(-)

diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
index eeeadb3ef3..9840587653 100644
--- a/libevmasm/AssemblyItem.cpp
+++ b/libevmasm/AssemblyItem.cpp
@@ -200,9 +200,7 @@ string AssemblyItem::toAssemblyText(Assembly const& _assembly) const
 	case Operation:
 	{
 		assertThrow(isValidInstruction(instruction()), AssemblyException, "Invalid instruction.");
-		string name = instructionInfo(instruction()).name;
-		transform(name.begin(), name.end(), name.begin(), [](unsigned char _c) { return tolower(_c); });
-		text = name;
+		text = util::toLower(instructionInfo(instruction()).name);
 		break;
 	}
 	case Push:
diff --git a/liblangutil/Token.cpp b/liblangutil/Token.cpp
index 8bdaff1fd3..d7620ef13d 100644
--- a/liblangutil/Token.cpp
+++ b/liblangutil/Token.cpp
@@ -40,10 +40,13 @@
 // You should have received a copy of the GNU General Public License
 // along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 
-#include <liblangutil/Token.h>
 #include <liblangutil/Exceptions.h>
+#include <liblangutil/Token.h>
+#include <libsolutil/StringUtils.h>
+
 #include <map>
 
+
 using namespace std;
 
 namespace solidity::langutil
@@ -180,11 +183,11 @@ tuple<Token, unsigned int, unsigned int> fromIdentifierOrKeyword(string const& _
 		return ret;
 	};
 
-	auto positionM = find_if(_literal.begin(), _literal.end(), ::isdigit);
+	auto positionM = find_if(_literal.begin(), _literal.end(), util::isDigit);
 	if (positionM != _literal.end())
 	{
 		string baseType(_literal.begin(), positionM);
-		auto positionX = find_if_not(positionM, _literal.end(), ::isdigit);
+		auto positionX = find_if_not(positionM, _literal.end(), util::isDigit);
 		int m = parseSize(positionM, positionX);
 		Token keyword = keywordByName(baseType);
 		if (keyword == Token::Bytes)
@@ -208,7 +211,7 @@ tuple<Token, unsigned int, unsigned int> fromIdentifierOrKeyword(string const& _
 				positionM < positionX &&
 				positionX < _literal.end() &&
 				*positionX == 'x' &&
-				all_of(positionX + 1, _literal.end(), ::isdigit)
+				all_of(positionX + 1, _literal.end(), util::isDigit)
 			) {
 				int n = parseSize(positionX + 1, _literal.end());
 				if (
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 8a6905307b..c84d79785f 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -33,6 +33,7 @@
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/FunctionSelector.h>
 #include <libsolutil/Keccak256.h>
+#include <libsolutil/StringUtils.h>
 #include <libsolutil/UTF8.h>
 
 #include <boost/algorithm/string.hpp>
@@ -781,8 +782,8 @@ tuple<bool, rational> RationalNumberType::parseRational(string const& _value)
 		if (radixPoint != _value.end())
 		{
 			if (
-				!all_of(radixPoint + 1, _value.end(), ::isdigit) ||
-				!all_of(_value.begin(), radixPoint, ::isdigit)
+				!all_of(radixPoint + 1, _value.end(), util::isDigit) ||
+				!all_of(_value.begin(), radixPoint, util::isDigit)
 			)
 				return make_tuple(false, rational(0));
 
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index ed49c94b0a..01c012e65f 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -203,7 +203,7 @@ struct CopyTranslate: public yul::ASTCopier
 		else
 			solAssert(false);
 
-		if (isdigit(value.front()))
+		if (isDigit(value.front()))
 			return yul::Literal{_identifier.debugData, yul::LiteralKind::Number, yul::YulString{value}, {}};
 		else
 			return yul::Identifier{_identifier.debugData, yul::YulString{value}};
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 9e31d7fc9c..cbadc2c1dd 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -33,6 +33,7 @@
 #include <libsmtutil/CHCSmtLib2Interface.h>
 #include <liblangutil/CharStreamProvider.h>
 #include <libsolutil/Algorithms.h>
+#include <libsolutil/StringUtils.h>
 
 #ifdef HAVE_Z3_DLOPEN
 #include <z3_version.h>
@@ -1998,9 +1999,9 @@ map<unsigned, vector<unsigned>> CHC::summaryCalls(CHCSolverInterface::CexGraph c
 			// Predicates that do not have a CALLID have a predicate id at the end of <suffix>,
 			// so the assertion below should still hold.
 			auto beg = _s.data();
-			while (beg != _s.data() + _s.size() && !isdigit(*beg)) ++beg;
+			while (beg != _s.data() + _s.size() && !isDigit(*beg)) ++beg;
 			auto end = beg;
-			while (end != _s.data() + _s.size() && isdigit(*end)) ++end;
+			while (end != _s.data() + _s.size() && isDigit(*end)) ++end;
 
 			solAssert(beg != end, "Expected to find numerical call or predicate id.");
 
diff --git a/libsolutil/CommonData.cpp b/libsolutil/CommonData.cpp
index a49f904918..437a090c2c 100644
--- a/libsolutil/CommonData.cpp
+++ b/libsolutil/CommonData.cpp
@@ -20,11 +20,12 @@
  * @date 2014
  */
 
+#include <libsolutil/Assertions.h>
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Exceptions.h>
-#include <libsolutil/Assertions.h>
-#include <libsolutil/Keccak256.h>
 #include <libsolutil/FixedHash.h>
+#include <libsolutil/Keccak256.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>
 
@@ -154,9 +155,9 @@ string solidity::util::getChecksummedAddress(string const& _addr)
 		char addressCharacter = s[i];
 		uint8_t nibble = hash[i / 2u] >> (4u * (1u - (i % 2u))) & 0xf;
 		if (nibble >= 8)
-			ret += static_cast<char>(toupper(addressCharacter));
+			ret += toUpper(addressCharacter);
 		else
-			ret += static_cast<char>(tolower(addressCharacter));
+			ret += toLower(addressCharacter);
 	}
 	return ret;
 }
@@ -211,7 +212,7 @@ string solidity::util::escapeAndQuoteString(string const& _input)
 			out += "\\r";
 		else if (c == '\t')
 			out += "\\t";
-		else if (!isprint(c, locale::classic()))
+		else if (!isPrint(c))
 		{
 			ostringstream o;
 			o << "\\x" << std::hex << setfill('0') << setw(2) << (unsigned)(unsigned char)(c);
diff --git a/libsolutil/StringUtils.h b/libsolutil/StringUtils.h
index 09aa30be91..7a48c296f8 100644
--- a/libsolutil/StringUtils.h
+++ b/libsolutil/StringUtils.h
@@ -27,7 +27,9 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Numeric.h>
 
+#include <algorithm>
 #include <limits>
+#include <locale>
 #include <string>
 #include <vector>
 
@@ -197,4 +199,47 @@ inline std::optional<unsigned> toUnsignedInt(std::string const& _value)
 	}
 }
 
+/// Converts parameter _c to its lowercase equivalent if c is an uppercase letter and has a lowercase equivalent. It uses the classic "C" locale semantics.
+/// @param _c value to be converted
+/// @return the converted value
+inline char toLower(char _c)
+{
+	return tolower(_c, std::locale::classic());
+}
+
+/// Converts parameter _c to its uppercase equivalent if c is an lowercase letter and has a uppercase equivalent. It uses the classic "C" locale semantics.
+/// @param _c value to be converted
+/// @return the converted value
+inline char toUpper(char _c)
+{
+	return toupper(_c, std::locale::classic());
+}
+
+/// Converts parameter _s to its lowercase equivalent. It uses the classic "C" locale semantics.
+/// @param _s value to be converted
+/// @return the converted value
+inline std::string toLower(std::string _s)
+{
+	std::transform(_s.begin(), _s.end(), _s.begin(), [](char _c) {
+		return toLower(_c);
+	});
+	return _s;
+}
+
+/// Checks whether _c is a decimal digit character. It uses the classic "C" locale semantics.
+/// @param _c character to be checked
+/// @return true if _c is a decimal digit character, false otherwise
+inline bool isDigit(char _c)
+{
+	return isdigit(_c, std::locale::classic());
+}
+
+// Checks if character is printable using classic "C" locale
+/// @param _c character to be checked
+/// @return true if _c is a printable character, false otherwise.
+inline bool isPrint(char _c)
+{
+	return isprint(_c, std::locale::classic());
+}
+
 }
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 0fefb24d0c..35fa5f88eb 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -21,17 +21,17 @@
 
 #include <libyul/backends/evm/EVMDialect.h>
 
-#include <libyul/AsmAnalysisInfo.h>
+#include <libevmasm/Instruction.h>
+#include <libevmasm/SemanticInformation.h>
+#include <liblangutil/Exceptions.h>
+#include <libsolutil/StringUtils.h>
 #include <libyul/AST.h>
-#include <libyul/Object.h>
-#include <libyul/Exceptions.h>
+#include <libyul/AsmAnalysisInfo.h>
 #include <libyul/AsmParser.h>
+#include <libyul/Exceptions.h>
+#include <libyul/Object.h>
 #include <libyul/Utilities.h>
 #include <libyul/backends/evm/AbstractAssembly.h>
-#include <libevmasm/SemanticInformation.h>
-#include <libevmasm/Instruction.h>
-
-#include <liblangutil/Exceptions.h>
 
 #include <range/v3/view/reverse.hpp>
 #include <range/v3/view/tail.hpp>
@@ -121,8 +121,7 @@ set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 	set<YulString> reserved;
 	for (auto const& instr: evmasm::c_instructions)
 	{
-		string name = instr.first;
-		transform(name.begin(), name.end(), name.begin(), [](unsigned char _c) { return tolower(_c); });
+		string name = toLower(instr.first);
 		if (!baseFeeException(instr.second))
 			reserved.emplace(name);
 	}
@@ -142,8 +141,7 @@ map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVe
 	map<YulString, BuiltinFunctionForEVM> builtins;
 	for (auto const& instr: evmasm::c_instructions)
 	{
-		string name = instr.first;
-		transform(name.begin(), name.end(), name.begin(), [](unsigned char _c) { return tolower(_c); });
+		string name = toLower(instr.first);
 		auto const opcode = instr.second;
 
 		if (
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index 55c30d2f28..3e906fcdff 100644
--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -21,15 +21,16 @@
 
 #include <libyul/optimiser/SimplificationRules.h>
 
+#include <libyul/AST.h>
+#include <libyul/Utilities.h>
+#include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/ASTCopier.h>
+#include <libyul/optimiser/DataFlowAnalyzer.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/SyntacticalEquality.h>
-#include <libyul/optimiser/DataFlowAnalyzer.h>
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
 
 #include <libevmasm/RuleList.h>
+#include <libsolutil/StringUtils.h>
 
 using namespace std;
 using namespace solidity;
@@ -249,8 +250,7 @@ Expression Pattern::toExpression(shared_ptr<DebugData const> const& _debugData)
 		for (auto const& arg: m_arguments)
 			arguments.emplace_back(arg.toExpression(_debugData));
 
-		string name = instructionInfo(m_instruction).name;
-		transform(begin(name), end(name), begin(name), [](auto _c) { return tolower(_c); });
+		string name = util::toLower(instructionInfo(m_instruction).name);
 
 		return FunctionCall{_debugData,
 			Identifier{_debugData, YulString{name}},
diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index 11f6542818..d28ec16754 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -29,7 +29,6 @@
 
 using namespace std;
 using namespace solidity;
-using namespace solidity::util;
 using namespace solidity::util::formatting;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -43,10 +42,11 @@ namespace
 
 int parseUnsignedInteger(string::iterator& _it, string::iterator _end)
 {
-	if (_it == _end || !isdigit(*_it))
+	auto isDigit = [](char _c) -> bool {return isdigit(_c, std::locale::classic());};
+	if (_it == _end || !isDigit(*_it))
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid test expectation. Source location expected."));
 	int result = 0;
-	while (_it != _end && isdigit(*_it))
+	while (_it != _end && isDigit(*_it))
 	{
 		result *= 10;
 		result += *_it - '0';
@@ -195,6 +195,7 @@ string CommonSyntaxTest::errorMessage(Exception const& _e)
 
 vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 {
+	auto isDigit = [](char _c) -> bool {return isdigit(_c, std::locale::classic());};
 	vector<SyntaxTestError> expectations;
 	string line;
 	while (getline(_stream, line))
@@ -207,14 +208,14 @@ vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 		if (it == line.end()) continue;
 
 		auto typeBegin = it;
-		while (it != line.end() && isalpha(*it))
+		while (it != line.end() && isalpha(*it, locale::classic()))
 			++it;
 		string errorType(typeBegin, it);
 
 		skipWhitespace(it, line.end());
 
 		optional<ErrorId> errorId;
-		if (it != line.end() && isdigit(*it))
+		if (it != line.end() && isDigit(*it))
 			errorId = ErrorId{static_cast<unsigned long long>(parseUnsignedInteger(it, line.end()))};
 
 		expect(it, line.end(), ':');
@@ -227,7 +228,7 @@ vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 		if (it != line.end() && *it == '(')
 		{
 			++it;
-			if (it != line.end() && !isdigit(*it))
+			if (it != line.end() && !isDigit(*it))
 			{
 				auto sourceNameStart = it;
 				while (it != line.end() && *it != ':')
diff --git a/test/TestCase.cpp b/test/TestCase.cpp
index 93b209aba0..32de682961 100644
--- a/test/TestCase.cpp
+++ b/test/TestCase.cpp
@@ -118,7 +118,7 @@ EVMVersionRestrictedTestCase::EVMVersionRestrictedTestCase(string const& _filena
 	string comparator;
 	size_t versionBegin = 0;
 	for (auto character: versionString)
-		if (!isalpha(character))
+		if (!isalpha(character, locale::classic()))
 		{
 			comparator += character;
 			versionBegin++;
diff --git a/test/TestCase.h b/test/TestCase.h
index 5d4394b11f..d63c88b48a 100644
--- a/test/TestCase.h
+++ b/test/TestCase.h
@@ -90,7 +90,7 @@ class TestCase
 	template<typename IteratorType>
 	static void skipWhitespace(IteratorType& _it, IteratorType _end)
 	{
-		while (_it != _end && isspace(*_it))
+		while (_it != _end && std::isspace<char>(*_it, std::locale::classic()))
 			++_it;
 	}
 
diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp
index f74b256d0c..49482a6c6e 100644
--- a/test/libsolidity/util/BytesUtils.cpp
+++ b/test/libsolidity/util/BytesUtils.cpp
@@ -22,6 +22,7 @@
 
 #include <libsolutil/CommonData.h>
 #include <libsolutil/CommonIO.h>
+#include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>
 
@@ -216,7 +217,7 @@ string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff)
 				os << "\\n";
 				break;
 			default:
-				if (isprint(v))
+				if (isPrint(static_cast<char>(v)))
 					os << v;
 				else
 					os << "\\x" << toHex(v, HexCase::Lower);
diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp
index 6652f704a9..dbaf52604d 100644
--- a/test/libsolidity/util/TestFileParser.cpp
+++ b/test/libsolidity/util/TestFileParser.cpp
@@ -762,13 +762,16 @@ string TestFileParser::Scanner::scanString()
 // TODO: use fromHex() from CommonData
 char TestFileParser::Scanner::scanHexPart()
 {
+	auto toLower = [](char _c) -> char { return tolower(_c, locale::classic()); };
+	auto isDigit = [](char _c) -> bool { return isdigit(_c, locale::classic()); };
+
 	advance(); // skip 'x'
 
 	int value{};
-	if (isdigit(current()))
+	if (isDigit(current()))
 		value = current() - '0';
-	else if (tolower(current()) >= 'a' && tolower(current()) <= 'f')
-		value = tolower(current()) - 'a' + 10;
+	else if (toLower(current()) >= 'a' && toLower(current()) <= 'f')
+		value = toLower(current()) - 'a' + 10;
 	else
 		BOOST_THROW_EXCEPTION(TestParserError("\\x used with no following hex digits."));
 
@@ -777,10 +780,10 @@ char TestFileParser::Scanner::scanHexPart()
 		return static_cast<char>(value);
 
 	value <<= 4;
-	if (isdigit(current()))
+	if (isDigit(current()))
 		value |= current() - '0';
-	else if (tolower(current()) >= 'a' && tolower(current()) <= 'f')
-		value |= tolower(current()) - 'a' + 10;
+	else if (toLower(current()) >= 'a' && toLower(current()) <= 'f')
+		value |= toLower(current()) - 'a' + 10;
 
 	advance();
 
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
index c6d52a62eb..dce6c61623 100644
--- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
@@ -28,6 +28,7 @@
 
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/CommonData.h>
+#include <libsolutil/StringUtils.h>
 
 #include <test/tools/ossfuzz/yulFuzzerCommon.h>
 
@@ -53,7 +54,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	string input(reinterpret_cast<char const*>(_data), _size);
 
 	if (std::any_of(input.begin(), input.end(), [](char c) {
-		return ((static_cast<unsigned char>(c) > 127) || !(std::isprint(c) || (c == '\n') || (c == '\t')));
+		return ((static_cast<unsigned char>(c) > 127) || !(isPrint(c) || (c == '\n') || (c == '\t')));
 	}))
 		return 0;
 
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index 5c4f00f0a9..ad98ab9bee 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -21,6 +21,7 @@
 
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/Exceptions.h>
+#include <libsolutil/StringUtils.h>
 #include <liblangutil/ErrorReporter.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
@@ -155,7 +156,7 @@ class YulOpti
 				return (
 					!boost::algorithm::iequals(get<1>(_a), get<1>(_b)) ?
 					boost::algorithm::lexicographical_compare(get<1>(_a), get<1>(_b), boost::algorithm::is_iless()) :
-					tolower(get<0>(_a)) < tolower(get<0>(_b))
+					toLower(get<0>(_a)) < toLower(get<0>(_b))
 				);
 			});
 

From 519e1c9402f83e26bf93186a3facc440dd1b770c Mon Sep 17 00:00:00 2001
From: Tyler <tylerfeuerstein@gmail.com>
Date: Sun, 6 Mar 2022 23:25:35 -0500
Subject: [PATCH 0443/1748] Specify namespaces

Fix references into solidity::util
---
 libsolidity/analysis/ControlFlowAnalyzer.cpp  |  2 +-
 .../analysis/ControlFlowRevertPruner.cpp      |  2 +-
 libsolidity/analysis/FunctionCallGraph.cpp    |  2 +-
 libsolidity/analysis/PostTypeChecker.cpp      |  4 +-
 .../analysis/PostTypeContractLevelChecker.cpp |  2 +-
 libsolidity/analysis/TypeChecker.cpp          |  4 +-
 libsolidity/ast/AST.cpp                       |  4 +-
 libsolidity/ast/ASTJsonConverter.cpp          |  2 +-
 libsolidity/codegen/CompilerContext.cpp       |  2 +-
 libsolidity/codegen/ContractCompiler.cpp      | 12 ++---
 libsolidity/codegen/ExpressionCompiler.cpp    |  8 ++--
 libsolidity/codegen/LValue.cpp                |  6 +--
 libsolidity/codegen/ir/IRGenerator.cpp        |  4 +-
 libsolidity/formal/CHC.cpp                    |  2 +-
 libsolidity/formal/Invariants.cpp             |  2 +-
 libsolidity/formal/Predicate.cpp              |  8 ++--
 libsolidity/formal/SMTEncoder.cpp             |  2 +-
 libsolidity/formal/SymbolicState.cpp          |  2 +-
 libsolidity/formal/SymbolicTypes.cpp          |  2 +-
 libsolidity/interface/CompilerStack.cpp       | 14 +++---
 libsolidity/lsp/LanguageServer.cpp            |  4 +-
 libsolidity/lsp/Transport.h                   |  2 +-
 libsolutil/IpfsHash.cpp                       |  2 +-
 libyul/Object.cpp                             |  4 +-
 libyul/optimiser/DataFlowAnalyzer.cpp         |  2 +-
 libyul/optimiser/EqualStoreEliminator.cpp     |  4 +-
 solc/CommandLineInterface.cpp                 |  4 +-
 solc/CommandLineParser.cpp                    | 44 +++++++++----------
 test/libsolidity/SemanticTest.cpp             |  8 ++--
 test/libsolidity/SolidityEndToEndTest.cpp     |  4 +-
 .../SolidityExpressionCompiler.cpp            |  2 +-
 test/libsolidity/SolidityOptimizer.cpp        |  4 +-
 .../analysis/FunctionCallGraph.cpp            |  1 +
 test/libsolidity/util/BytesUtils.cpp          |  2 +-
 test/libsolidity/util/TestFunctionCall.cpp    |  2 +-
 test/solc/CommandLineInterface.cpp            |  1 +
 36 files changed, 89 insertions(+), 87 deletions(-)

diff --git a/libsolidity/analysis/ControlFlowAnalyzer.cpp b/libsolidity/analysis/ControlFlowAnalyzer.cpp
index 0c64ac3b5b..e80964aceb 100644
--- a/libsolidity/analysis/ControlFlowAnalyzer.cpp
+++ b/libsolidity/analysis/ControlFlowAnalyzer.cpp
@@ -129,7 +129,7 @@ void ControlFlowAnalyzer::checkUninitializedAccess(CFGNode const* _entry, CFGNod
 		// Propagate changes to all exits and queue them for traversal, if needed.
 		for (auto const& exit: currentNode->exits)
 			if (
-				auto exists = valueOrNullptr(nodeInfos, exit);
+				auto exists = util::valueOrNullptr(nodeInfos, exit);
 				nodeInfos[exit].propagateFrom(nodeInfo) || !exists
 			)
 				nodesToTraverse.insert(exit);
diff --git a/libsolidity/analysis/ControlFlowRevertPruner.cpp b/libsolidity/analysis/ControlFlowRevertPruner.cpp
index 9a44be57af..ae9c18a13a 100644
--- a/libsolidity/analysis/ControlFlowRevertPruner.cpp
+++ b/libsolidity/analysis/ControlFlowRevertPruner.cpp
@@ -57,7 +57,7 @@ void ControlFlowRevertPruner::run()
 
 void ControlFlowRevertPruner::findRevertStates()
 {
-	std::set<CFG::FunctionContractTuple> pendingFunctions = keys(m_functions);
+	std::set<CFG::FunctionContractTuple> pendingFunctions = util::keys(m_functions);
 	// We interrupt the search whenever we encounter a call to a function with (yet) unknown
 	// revert behaviour. The ``wakeUp`` data structure contains information about which
 	// searches to restart once we know about the behaviour.
diff --git a/libsolidity/analysis/FunctionCallGraph.cpp b/libsolidity/analysis/FunctionCallGraph.cpp
index 2652371284..45da1b4f0d 100644
--- a/libsolidity/analysis/FunctionCallGraph.cpp
+++ b/libsolidity/analysis/FunctionCallGraph.cpp
@@ -97,7 +97,7 @@ CallGraph FunctionCallGraphBuilder::buildDeployedGraph(
 	// assigned to state variables and as such may be reachable after deployment as well.
 	builder.m_currentNode = CallGraph::SpecialNode::InternalDispatch;
 	set<CallGraph::Node, CallGraph::CompareByID> defaultNode;
-	for (CallGraph::Node const& dispatchTarget: valueOrDefault(_creationGraph.edges, CallGraph::SpecialNode::InternalDispatch, defaultNode))
+	for (CallGraph::Node const& dispatchTarget: util::valueOrDefault(_creationGraph.edges, CallGraph::SpecialNode::InternalDispatch, defaultNode))
 	{
 		solAssert(!holds_alternative<CallGraph::SpecialNode>(dispatchTarget), "");
 		solAssert(get<CallableDeclaration const*>(dispatchTarget) != nullptr, "");
diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp
index d08ee78b71..b5b973aa4c 100644
--- a/libsolidity/analysis/PostTypeChecker.cpp
+++ b/libsolidity/analysis/PostTypeChecker.cpp
@@ -411,12 +411,12 @@ struct ReservedErrorSelector: public PostTypeChecker::Checker
 			);
 		else
 		{
-			uint32_t selector = selectorFromSignature32(_error.functionType(true)->externalSignature());
+			uint32_t selector = util::selectorFromSignature32(_error.functionType(true)->externalSignature());
 			if (selector == 0 || ~selector == 0)
 				m_errorReporter.syntaxError(
 					2855_error,
 					_error.location(),
-					"The selector 0x" + toHex(toCompactBigEndian(selector, 4)) + " is reserved. Please rename the error to avoid the collision."
+					"The selector 0x" + util::toHex(toCompactBigEndian(selector, 4)) + " is reserved. Please rename the error to avoid the collision."
 				);
 		}
 	}
diff --git a/libsolidity/analysis/PostTypeContractLevelChecker.cpp b/libsolidity/analysis/PostTypeContractLevelChecker.cpp
index 32927188fc..38a192c226 100644
--- a/libsolidity/analysis/PostTypeContractLevelChecker.cpp
+++ b/libsolidity/analysis/PostTypeContractLevelChecker.cpp
@@ -52,7 +52,7 @@ bool PostTypeContractLevelChecker::check(ContractDefinition const& _contract)
 	for (ErrorDefinition const* error: _contract.interfaceErrors())
 	{
 		string signature = error->functionType(true)->externalSignature();
-		uint32_t hash = selectorFromSignature32(signature);
+		uint32_t hash = util::selectorFromSignature32(signature);
 		// Fail if there is a different signature for the same hash.
 		if (!errorHashes[hash].empty() && !errorHashes[hash].count(signature))
 		{
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 74701bde0f..00b68b8967 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -659,7 +659,7 @@ void TypeChecker::visitManually(
 		if (auto const* modifierContract = dynamic_cast<ContractDefinition const*>(modifierDecl->scope()))
 			if (m_currentContract)
 			{
-				if (!contains(m_currentContract->annotation().linearizedBaseContracts, modifierContract))
+				if (!util::contains(m_currentContract->annotation().linearizedBaseContracts, modifierContract))
 					m_errorReporter.typeError(
 						9428_error,
 						_modifier.location(),
@@ -2137,7 +2137,7 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 				functionPointerType->declaration().scope() == m_currentContract
 			)
 				msg += " Did you forget to prefix \"this.\"?";
-			else if (contains(
+			else if (util::contains(
 				m_currentContract->annotation().linearizedBaseContracts,
 				functionPointerType->declaration().scope()
 			) && functionPointerType->declaration().scope() != m_currentContract)
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index 2a7609de85..be6f2fe9be 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -221,7 +221,7 @@ vector<EventDefinition const*> const ContractDefinition::usedInterfaceEvents() c
 {
 	solAssert(annotation().creationCallGraph.set(), "");
 
-	return convertContainer<std::vector<EventDefinition const*>>(
+	return util::convertContainer<std::vector<EventDefinition const*>>(
 		(*annotation().creationCallGraph)->emittedEvents +
 		(*annotation().deployedCallGraph)->emittedEvents
 	);
@@ -239,7 +239,7 @@ vector<ErrorDefinition const*> ContractDefinition::interfaceErrors(bool _require
 		result +=
 			(*annotation().creationCallGraph)->usedErrors +
 			(*annotation().deployedCallGraph)->usedErrors;
-	return convertContainer<vector<ErrorDefinition const*>>(move(result));
+	return util::convertContainer<vector<ErrorDefinition const*>>(move(result));
 }
 
 vector<pair<util::FixedHash<4>, FunctionTypePointer>> const& ContractDefinition::interfaceFunctionList(bool _includeInheritedFunctions) const
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index 97417f81c0..06807e9dfa 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -505,7 +505,7 @@ bool ASTJsonConverter::visit(EventDefinition const& _node)
 			_attributes.emplace_back(
 				make_pair(
 					"eventSelector",
-					toHex(u256(h256::Arith(util::keccak256(_node.functionType(true)->externalSignature()))))
+					toHex(u256(util::h256::Arith(util::keccak256(_node.functionType(true)->externalSignature()))))
 				));
 
 	setJsonNode(_node, "EventDefinition", std::move(_attributes));
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 700f53d1f7..9bc035806b 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -403,7 +403,7 @@ void CompilerContext::appendInlineAssembly(
 	{
 		if (_insideFunction)
 			return false;
-		return contains(_localVariables, _identifier.name.str());
+		return util::contains(_localVariables, _identifier.name.str());
 	};
 	identifierAccess.generateCode = [&](
 		yul::Identifier const& _identifier,
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 5abc646367..d2c71e2aff 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -235,7 +235,7 @@ size_t ContractCompiler::deployLibrary(ContractDefinition const& _contract)
 	m_context.pushSubroutineOffset(m_context.runtimeSub());
 	// This code replaces the address added by appendDeployTimeAddress().
 	m_context.appendInlineAssembly(
-		Whiskers(R"(
+		util::Whiskers(R"(
 		{
 			// If code starts at 11, an mstore(0) writes to the full PUSH20 plus data
 			// without the need for a shift.
@@ -672,7 +672,7 @@ bool ContractCompiler::visit(FunctionDefinition const& _function)
 		BOOST_THROW_EXCEPTION(
 			StackTooDeepError() <<
 			errinfo_sourceLocation(_function.location()) <<
-			errinfo_comment("Stack too deep, try removing local variables.")
+			util::errinfo_comment("Stack too deep, try removing local variables.")
 		);
 	while (!stackLayout.empty() && stackLayout.back() != static_cast<int>(stackLayout.size() - 1))
 		if (stackLayout.back() < 0)
@@ -842,7 +842,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 						BOOST_THROW_EXCEPTION(
 							StackTooDeepError() <<
 							errinfo_sourceLocation(_inlineAssembly.location()) <<
-							errinfo_comment("Stack too deep, try removing local variables.")
+							util::errinfo_comment("Stack too deep, try removing local variables.")
 						);
 					_assembly.appendInstruction(dupInstruction(stackDiff));
 				}
@@ -916,7 +916,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 				BOOST_THROW_EXCEPTION(
 					StackTooDeepError() <<
 					errinfo_sourceLocation(_inlineAssembly.location()) <<
-					errinfo_comment("Stack too deep(" + to_string(stackDiff) + "), try removing local variables.")
+					util::errinfo_comment("Stack too deep(" + to_string(stackDiff) + "), try removing local variables.")
 				);
 			_assembly.appendInstruction(swapInstruction(stackDiff));
 			_assembly.appendInstruction(Instruction::POP);
@@ -1045,7 +1045,7 @@ void ContractCompiler::handleCatch(vector<ASTPointer<TryCatchClause>> const& _ca
 		solAssert(m_context.evmVersion().supportsReturndata(), "");
 
 		// stack: <selector>
-		m_context << Instruction::DUP1 << selectorFromSignature32("Error(string)") << Instruction::EQ;
+		m_context << Instruction::DUP1 << util::selectorFromSignature32("Error(string)") << Instruction::EQ;
 		m_context << Instruction::ISZERO;
 		m_context.appendConditionalJumpTo(panicTag);
 		m_context << Instruction::POP; // remove selector
@@ -1077,7 +1077,7 @@ void ContractCompiler::handleCatch(vector<ASTPointer<TryCatchClause>> const& _ca
 		solAssert(m_context.evmVersion().supportsReturndata(), "");
 
 		// stack: <selector>
-		m_context << selectorFromSignature32("Panic(uint256)") << Instruction::EQ;
+		m_context << util::selectorFromSignature32("Panic(uint256)") << Instruction::EQ;
 		m_context << Instruction::ISZERO;
 		m_context.appendConditionalJumpTo(fallbackTag);
 
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index e4ad4cf7e0..1eefe41b99 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -268,7 +268,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 		BOOST_THROW_EXCEPTION(
 			StackTooDeepError() <<
 			errinfo_sourceLocation(_varDecl.location()) <<
-			errinfo_comment("Stack too deep.")
+			util::errinfo_comment("Stack too deep.")
 		);
 	m_context << dupInstruction(retSizeOnStack + 1);
 	m_context.appendJump(evmasm::AssemblyItem::JumpType::OutOfFunction);
@@ -350,7 +350,7 @@ bool ExpressionCompiler::visit(Assignment const& _assignment)
 				BOOST_THROW_EXCEPTION(
 					StackTooDeepError() <<
 					errinfo_sourceLocation(_assignment.location()) <<
-					errinfo_comment("Stack too deep, try removing local variables.")
+					util::errinfo_comment("Stack too deep, try removing local variables.")
 				);
 			// value [lvalue_ref] updated_value
 			for (unsigned i = 0; i < itemSize; ++i)
@@ -1452,7 +1452,7 @@ bool ExpressionCompiler::visit(FunctionCallOptions const& _functionCallOptions)
 			solAssert(false, "Unexpected option name!");
 		acceptAndConvert(*_functionCallOptions.options()[i], *requiredType);
 
-		solAssert(!contains(presentOptions, newOption), "");
+		solAssert(!util::contains(presentOptions, newOption), "");
 		ptrdiff_t insertPos = presentOptions.end() - lower_bound(presentOptions.begin(), presentOptions.end(), newOption);
 
 		utils().moveIntoStack(static_cast<unsigned>(insertPos), 1);
@@ -2862,7 +2862,7 @@ void ExpressionCompiler::setLValueFromDeclaration(Declaration const& _declaratio
 	else
 		BOOST_THROW_EXCEPTION(InternalCompilerError()
 			<< errinfo_sourceLocation(_expression.location())
-			<< errinfo_comment("Identifier type not supported or identifier not found."));
+			<< util::errinfo_comment("Identifier type not supported or identifier not found."));
 }
 
 void ExpressionCompiler::setLValueToStorageItem(Expression const& _expression)
diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp
index bd92529537..379e9818b6 100644
--- a/libsolidity/codegen/LValue.cpp
+++ b/libsolidity/codegen/LValue.cpp
@@ -50,7 +50,7 @@ void StackVariable::retrieveValue(SourceLocation const& _location, bool) const
 		BOOST_THROW_EXCEPTION(
 			StackTooDeepError() <<
 			errinfo_sourceLocation(_location) <<
-			errinfo_comment("Stack too deep, try removing local variables.")
+			util::errinfo_comment("Stack too deep, try removing local variables.")
 		);
 	solAssert(stackPos + 1 >= m_size, "Size and stack pos mismatch.");
 	for (unsigned i = 0; i < m_size; ++i)
@@ -64,7 +64,7 @@ void StackVariable::storeValue(Type const&, SourceLocation const& _location, boo
 		BOOST_THROW_EXCEPTION(
 			StackTooDeepError() <<
 			errinfo_sourceLocation(_location) <<
-			errinfo_comment("Stack too deep, try removing local variables.")
+			util::errinfo_comment("Stack too deep, try removing local variables.")
 		);
 	else if (stackDiff > 0)
 		for (unsigned i = 0; i < m_size; ++i)
@@ -436,7 +436,7 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 			BOOST_THROW_EXCEPTION(
 				InternalCompilerError()
 					<< errinfo_sourceLocation(_location)
-					<< errinfo_comment("Invalid non-value type for assignment."));
+					<< util::errinfo_comment("Invalid non-value type for assignment."));
 	}
 }
 
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 6b52010d99..84ccef94e4 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -234,7 +234,7 @@ string IRGenerator::generate(
 	t("deployedFunctions", m_context.functionCollector().requestedFunctions());
 	t("deployedSubObjects", subObjectSources(m_context.subObjectsCreated()));
 	t("metadataName", yul::Object::metadataName());
-	t("cborMetadata", toHex(_cborMetadata));
+	t("cborMetadata", util::toHex(_cborMetadata));
 
 	t("useSrcMapDeployed", formatUseSrcMap(m_context));
 
@@ -788,7 +788,7 @@ pair<string, map<ContractDefinition const*, vector<string>>> IRGenerator::evalua
 	{
 		bool operator()(ContractDefinition const* _c1, ContractDefinition const* _c2) const
 		{
-			solAssert(contains(linearizedBaseContracts, _c1) && contains(linearizedBaseContracts, _c2), "");
+			solAssert(util::contains(linearizedBaseContracts, _c1) && util::contains(linearizedBaseContracts, _c2), "");
 			auto it1 = find(linearizedBaseContracts.begin(), linearizedBaseContracts.end(), _c1);
 			auto it2 = find(linearizedBaseContracts.begin(), linearizedBaseContracts.end(), _c2);
 			return it1 < it2;
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 9e31d7fc9c..8f7bc5dbcb 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1497,7 +1497,7 @@ smtutil::Expression CHC::predicate(FunctionCall const& _funCall)
 
 	auto const* contract = function->annotation().contract;
 	auto const& hierarchy = m_currentContract->annotation().linearizedBaseContracts;
-	solAssert(kind != FunctionType::Kind::Internal || function->isFree() || (contract && contract->isLibrary()) || contains(hierarchy, contract), "");
+	solAssert(kind != FunctionType::Kind::Internal || function->isFree() || (contract && contract->isLibrary()) || util::contains(hierarchy, contract), "");
 
 	bool usesStaticCall = function->stateMutability() == StateMutability::Pure || function->stateMutability() == StateMutability::View;
 
diff --git a/libsolidity/formal/Invariants.cpp b/libsolidity/formal/Invariants.cpp
index 9dad0722cd..10d342ed47 100644
--- a/libsolidity/formal/Invariants.cpp
+++ b/libsolidity/formal/Invariants.cpp
@@ -48,7 +48,7 @@ map<Predicate const*, set<string>> collectInvariants(
 
 	map<string, pair<smtutil::Expression, smtutil::Expression>> equalities;
 	// Collect equalities where one of the sides is a predicate we're interested in.
-	BreadthFirstSearch<smtutil::Expression const*>{{&_proof}}.run([&](auto&& _expr, auto&& _addChild) {
+	util::BreadthFirstSearch<smtutil::Expression const*>{{&_proof}}.run([&](auto&& _expr, auto&& _addChild) {
 		if (_expr->name == "=")
 			for (auto const& t: targets)
 			{
diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
index 6e0eb4f3b9..91513a00c0 100644
--- a/libsolidity/formal/Predicate.cpp
+++ b/libsolidity/formal/Predicate.cpp
@@ -350,7 +350,7 @@ vector<optional<string>> Predicate::summaryStateValues(vector<smtutil::Expressio
 
 	vector<smtutil::Expression> stateArgs(stateFirst, stateLast);
 	solAssert(stateArgs.size() == stateVars->size(), "");
-	auto stateTypes = applyMap(*stateVars, [&](auto const& _var) { return _var->type(); });
+	auto stateTypes = util::applyMap(*stateVars, [&](auto const& _var) { return _var->type(); });
 	return formatExpressions(stateArgs, stateTypes);
 }
 
@@ -412,7 +412,7 @@ pair<vector<optional<string>>, vector<VariableDeclaration const*>> Predicate::lo
 	auto first = _args.end() - static_cast<int>(localVars.size());
 	vector<smtutil::Expression> outValues(first, _args.end());
 
-	auto mask = applyMap(
+	auto mask = util::applyMap(
 		localVars,
 		[this](auto _var) {
 			auto varScope = dynamic_cast<ScopeOpener const*>(_var->scope());
@@ -422,7 +422,7 @@ pair<vector<optional<string>>, vector<VariableDeclaration const*>> Predicate::lo
 	auto localVarsInScope = util::filter(localVars, mask);
 	auto outValuesInScope = util::filter(outValues, mask);
 
-	auto outTypes = applyMap(localVarsInScope, [](auto _var) { return _var->type(); });
+	auto outTypes = util::applyMap(localVarsInScope, [](auto _var) { return _var->type(); });
 	return {formatExpressions(outValuesInScope, outTypes), localVarsInScope};
 }
 
@@ -496,7 +496,7 @@ optional<string> Predicate::expressionToString(smtutil::Expression const& _expr,
 				if (_expr.name == "0")
 					return "0x0";
 				// For some reason the code below returns "0x" for "0".
-				return toHex(toCompactBigEndian(bigint(_expr.name)), HexPrefix::Add, HexCase::Lower);
+				return util::toHex(toCompactBigEndian(bigint(_expr.name)), util::HexPrefix::Add, util::HexCase::Lower);
 			}
 			catch (out_of_range const&)
 			{
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 76342ba08e..e699e28b8d 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -313,7 +313,7 @@ bool SMTEncoder::visit(InlineAssembly const& _inlineAsm)
 		{
 			auto const& vars = _assignment.variableNames;
 			for (auto const& identifier: vars)
-				if (auto externalInfo = valueOrNullptr(externalReferences, &identifier))
+				if (auto externalInfo = util::valueOrNullptr(externalReferences, &identifier))
 					if (auto varDecl = dynamic_cast<VariableDeclaration const*>(externalInfo->declaration))
 						assignedVars.insert(varDecl);
 		}
diff --git a/libsolidity/formal/SymbolicState.cpp b/libsolidity/formal/SymbolicState.cpp
index 6612723d06..b1fd7978fa 100644
--- a/libsolidity/formal/SymbolicState.cpp
+++ b/libsolidity/formal/SymbolicState.cpp
@@ -211,7 +211,7 @@ void SymbolicState::buildABIFunctions(set<FunctionCall const*> const& _abiFuncti
 
 
 		auto argTypes = [](auto const& _args) {
-			return applyMap(_args, [](auto arg) { return arg->annotation().type; });
+			return util::applyMap(_args, [](auto arg) { return arg->annotation().type; });
 		};
 
 		/// Since each abi.* function may have a different number of input/output parameters,
diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
index b9041c6bd4..e40ff92451 100644
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ b/libsolidity/formal/SymbolicTypes.cpp
@@ -580,7 +580,7 @@ optional<smtutil::Expression> symbolicTypeConversion(frontend::Type const* _from
 					return smtutil::Expression(size_t(0));
 				auto bytesVec = util::asBytes(strType->value());
 				bytesVec.resize(fixedBytesType->numBytes(), 0);
-				return smtutil::Expression(u256(toHex(bytesVec, util::HexPrefix::Add)));
+				return smtutil::Expression(u256(util::toHex(bytesVec, util::HexPrefix::Add)));
 			}
 
 	return std::nullopt;
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 7a8bc4ddbf..3eb25987db 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -278,7 +278,7 @@ void CompilerStack::setMetadataHash(MetadataHash _metadataHash)
 void CompilerStack::selectDebugInfo(DebugInfoSelection _debugInfoSelection)
 {
 	if (m_stackState >= CompilationSuccessful)
-		BOOST_THROW_EXCEPTION(CompilerError() << errinfo_comment("Must select debug info components before compilation."));
+		BOOST_THROW_EXCEPTION(CompilerError() << util::errinfo_comment("Must select debug info components before compilation."));
 	m_debugInfoSelection = _debugInfoSelection;
 }
 
@@ -573,7 +573,7 @@ bool CompilerStack::analyze()
 		if (noErrors)
 		{
 			ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile);
-			auto allSources = applyMap(m_sourceOrder, [](Source const* _source) { return _source->ast; });
+			auto allSources = util::applyMap(m_sourceOrder, [](Source const* _source) { return _source->ast; });
 			modelChecker.enableAllEnginesIfPragmaPresent(allSources);
 			modelChecker.checkRequestedSourcesAndContracts(allSources);
 			for (Source const* source: m_sourceOrder)
@@ -1030,7 +1030,7 @@ Json::Value CompilerStack::interfaceSymbols(string const& _contractName) const
 	for (ErrorDefinition const* error: contractDefinition(_contractName).interfaceErrors())
 	{
 		string signature = error->functionType(true)->externalSignature();
-		interfaceSymbols["errors"][signature] = toHex(toCompactBigEndian(selectorFromSignature32(signature), 4));
+		interfaceSymbols["errors"][signature] = util::toHex(toCompactBigEndian(util::selectorFromSignature32(signature), 4));
 	}
 
 	for (EventDefinition const* event: ranges::concat_view(
@@ -1040,7 +1040,7 @@ Json::Value CompilerStack::interfaceSymbols(string const& _contractName) const
 		if (!event->isAnonymous())
 		{
 			string signature = event->functionType(true)->externalSignature();
-			interfaceSymbols["events"][signature] = toHex(u256(h256::Arith(keccak256(signature))));
+			interfaceSymbols["events"][signature] = toHex(u256(h256::Arith(util::keccak256(signature))));
 		}
 
 	return interfaceSymbols;
@@ -1494,7 +1494,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 			continue;
 
 		solAssert(s.second.charStream, "Character stream not available");
-		meta["sources"][s.first]["keccak256"] = "0x" + toHex(s.second.keccak256().asBytes());
+		meta["sources"][s.first]["keccak256"] = "0x" + util::toHex(s.second.keccak256().asBytes());
 		if (optional<string> licenseString = s.second.ast->licenseString())
 			meta["sources"][s.first]["license"] = *licenseString;
 		if (m_metadataLiteralSources)
@@ -1502,7 +1502,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 		else
 		{
 			meta["sources"][s.first]["urls"] = Json::arrayValue;
-			meta["sources"][s.first]["urls"].append("bzz-raw://" + toHex(s.second.swarmHash().asBytes()));
+			meta["sources"][s.first]["urls"].append("bzz-raw://" + util::toHex(s.second.swarmHash().asBytes()));
 			meta["sources"][s.first]["urls"].append(s.second.ipfsUrl());
 		}
 	}
@@ -1565,7 +1565,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 
 	meta["settings"]["libraries"] = Json::objectValue;
 	for (auto const& library: m_libraries)
-		meta["settings"]["libraries"][library.first] = "0x" + toHex(library.second.asBytes());
+		meta["settings"]["libraries"][library.first] = "0x" + util::toHex(library.second.asBytes());
 
 	meta["output"]["abi"] = contractABI(_contract);
 	meta["output"]["userdoc"] = natspecUser(_contract);
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index fb704d8192..bda55b26df 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -253,7 +253,7 @@ bool LanguageServer::run()
 				string const methodName = (*jsonMessage)["method"].asString();
 				id = (*jsonMessage)["id"];
 
-				if (auto handler = valueOrDefault(m_handlers, methodName))
+				if (auto handler = util::valueOrDefault(m_handlers, methodName))
 					handler(id, (*jsonMessage)["params"]);
 				else
 					m_client.error(id, ErrorCode::MethodNotFound, "Unknown method " + methodName);
@@ -375,7 +375,7 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 			lspAssert(
 				change && change->hasText(),
 				ErrorCode::RequestFailed,
-				"Invalid source range: " + jsonCompactPrint(jsonContentChange["range"])
+				"Invalid source range: " + util::jsonCompactPrint(jsonContentChange["range"])
 			);
 
 			string buffer = m_fileRepository.sourceUnits().at(sourceUnitName);
diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h
index 2d0b49517a..82fe439099 100644
--- a/libsolidity/lsp/Transport.h
+++ b/libsolidity/lsp/Transport.h
@@ -69,7 +69,7 @@ class RequestError: public util::Exception
 	{ \
 		BOOST_THROW_EXCEPTION( \
 			RequestError(errorCode) << \
-			errinfo_comment(errorMessage) \
+			util::errinfo_comment(errorMessage) \
 		); \
 	}
 
diff --git a/libsolutil/IpfsHash.cpp b/libsolutil/IpfsHash.cpp
index a34ee035bd..dbf411dc78 100644
--- a/libsolutil/IpfsHash.cpp
+++ b/libsolutil/IpfsHash.cpp
@@ -59,7 +59,7 @@ bytes encodeLinkData(bytes const& _data)
 string base58Encode(bytes const& _data)
 {
 	static string const alphabet{"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"};
-	bigint data(toHex(_data, HexPrefix::Add));
+	bigint data(util::toHex(_data, HexPrefix::Add));
 	string output;
 	while (data)
 	{
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index ed456ab53d..cf68ff765f 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -91,13 +91,13 @@ string Object::toString(
 set<YulString> Object::qualifiedDataNames() const
 {
 	set<YulString> qualifiedNames =
-		name.empty() || contains(name.str(), '.') ?
+		name.empty() || util::contains(name.str(), '.') ?
 		set<YulString>{} :
 		set<YulString>{name};
 	for (shared_ptr<ObjectNode> const& subObjectNode: subObjects)
 	{
 		yulAssert(qualifiedNames.count(subObjectNode->name) == 0, "");
-		if (contains(subObjectNode->name.str(), '.'))
+		if (util::contains(subObjectNode->name.str(), '.'))
 			continue;
 		qualifiedNames.insert(subObjectNode->name);
 		if (auto const* subObject = dynamic_cast<Object const*>(subObjectNode.get()))
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index af25cde592..c1ad2116af 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -367,7 +367,7 @@ void DataFlowAnalyzer::joinKnowledgeHelper(
 	// of m_memory and thus any overlapping write would have cleared the keys
 	// that are not known to be different inside m_memory already.
 	cxx20::erase_if(_this, mapTuple([&_older](auto&& key, auto&& currentValue){
-		YulString const* oldValue = valueOrNullptr(_older, key);
+		YulString const* oldValue = util::valueOrNullptr(_older, key);
 		return !oldValue || *oldValue != currentValue;
 	}));
 }
diff --git a/libyul/optimiser/EqualStoreEliminator.cpp b/libyul/optimiser/EqualStoreEliminator.cpp
index dcba98ce4f..56f9902f89 100644
--- a/libyul/optimiser/EqualStoreEliminator.cpp
+++ b/libyul/optimiser/EqualStoreEliminator.cpp
@@ -54,13 +54,13 @@ void EqualStoreEliminator::visit(Statement& _statement)
 	{
 		if (auto vars = isSimpleStore(StoreLoadLocation::Storage, *expression))
 		{
-			if (auto const* currentValue = valueOrNullptr(m_storage, vars->first))
+			if (auto const* currentValue = util::valueOrNullptr(m_storage, vars->first))
 				if (*currentValue == vars->second)
 					m_pendingRemovals.insert(&_statement);
 		}
 		else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, *expression))
 		{
-			if (auto const* currentValue = valueOrNullptr(m_memory, vars->first))
+			if (auto const* currentValue = util::valueOrNullptr(m_memory, vars->first))
 				if (*currentValue == vars->second)
 					m_pendingRemovals.insert(&_statement);
 		}
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 24e4ee7dd8..03679bd7c5 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -464,7 +464,7 @@ void CommandLineInterface::readInputFiles()
 		for (auto const& [sourceUnitName, normalizedInputPaths]: collisions)
 		{
 			message += sourceUnitName + " matches: ";
-			message += joinHumanReadable(normalizedInputPaths | ranges::views::transform(pathToQuotedString)) + "\n";
+			message += util::joinHumanReadable(normalizedInputPaths | ranges::views::transform(pathToQuotedString)) + "\n";
 		}
 
 		solThrow(CommandLineValidationError, message);
@@ -963,7 +963,7 @@ void CommandLineInterface::link()
 			string foundPlaceholder(it, it + placeholderSize);
 			if (librariesReplacements.count(foundPlaceholder))
 			{
-				string hexStr(toHex(librariesReplacements.at(foundPlaceholder).asBytes()));
+				string hexStr(util::toHex(librariesReplacements.at(foundPlaceholder).asBytes()));
 				copy(hexStr.begin(), hexStr.end(), it);
 			}
 			else
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 65c7d78621..8f6d549f20 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -166,7 +166,7 @@ ostream& operator<<(ostream& _out, CompilerOutputs const& _selection)
 		if (_selection.*component)
 			serializedSelection.push_back(CompilerOutputs::componentName(component));
 
-	return _out << joinHumanReadable(serializedSelection, ",");
+	return _out << util::joinHumanReadable(serializedSelection, ",");
 }
 
 string const& CompilerOutputs::componentName(bool CompilerOutputs::* _component)
@@ -197,7 +197,7 @@ ostream& operator<<(ostream& _out, CombinedJsonRequests const& _requests)
 		if (_requests.*component)
 			serializedRequests.push_back(CombinedJsonRequests::componentName(component));
 
-	return _out << joinHumanReadable(serializedRequests, ",");
+	return _out << util::joinHumanReadable(serializedRequests, ",");
 }
 
 string const& CombinedJsonRequests::componentName(bool CombinedJsonRequests::* _component)
@@ -343,17 +343,17 @@ void CommandLineParser::parseLibraryOption(string const& _input)
 	try
 	{
 		if (fs::is_regular_file(_input))
-			data = readFileAsString(_input);
+			data = util::readFileAsString(_input);
 	}
 	catch (fs::filesystem_error const&)
 	{
 		// Thrown e.g. if path is too long.
 	}
-	catch (FileNotFound const&)
+	catch (util::FileNotFound const&)
 	{
 		// Should not happen if `fs::is_regular_file` is correct.
 	}
-	catch (NotAFile const&)
+	catch (util::NotAFile const&)
 	{
 		// Should not happen if `fs::is_regular_file` is correct.
 	}
@@ -418,15 +418,15 @@ void CommandLineParser::parseLibraryOption(string const& _input)
 					"Invalid length for address for library \"" + libName + "\": " +
 					to_string(addrString.length()) + " instead of 40 characters."
 				);
-			if (!passesAddressChecksum(addrString, false))
+			if (!util::passesAddressChecksum(addrString, false))
 				solThrow(
 					CommandLineValidationError,
 					"Invalid checksum on address for library \"" + libName + "\": " + addrString + "\n"
-					"The correct checksum is " + getChecksummedAddress(addrString)
+					"The correct checksum is " + util::getChecksummedAddress(addrString)
 				);
-			bytes binAddr = fromHex(addrString);
-			h160 address(binAddr, h160::AlignRight);
-			if (binAddr.size() > 20 || address == h160())
+			bytes binAddr = util::fromHex(addrString);
+			util::h160 address(binAddr, util::h160::AlignRight);
+			if (binAddr.size() > 20 || address == util::h160())
 				solThrow(
 					CommandLineValidationError,
 					"Invalid address for library \"" + libName + "\": " + addrString
@@ -461,9 +461,9 @@ void CommandLineParser::parseOutputSelection()
 			solAssert(false);
 		case InputMode::Compiler:
 		case InputMode::CompilerWithASTImport:
-			return contains(compilerModeOutputs, _outputName);
+			return util::contains(compilerModeOutputs, _outputName);
 		case InputMode::Assembler:
-			return contains(assemblerModeOutputs, _outputName);
+			return util::contains(assemblerModeOutputs, _outputName);
 		case InputMode::StandardJson:
 		case InputMode::Linker:
 			return false;
@@ -582,15 +582,15 @@ General Information)").c_str(),
 		)
 		(
 			g_strRevertStrings.c_str(),
-			po::value<string>()->value_name(joinHumanReadable(g_revertStringsArgs, ",")),
+			po::value<string>()->value_name(util::joinHumanReadable(g_revertStringsArgs, ",")),
 			"Strip revert (and require) reason strings or add additional debugging information."
 		)
 		(
 			g_strDebugInfo.c_str(),
-			po::value<string>()->default_value(toString(DebugInfoSelection::Default())),
+			po::value<string>()->default_value(util::toString(DebugInfoSelection::Default())),
 			("Debug info components to be included in the produced EVM assembly and Yul code. "
 			"Value can be all, none or a comma-separated list containing one or more of the "
-			"following components: " + joinHumanReadable(DebugInfoSelection::componentMap() | ranges::views::keys) + ".").c_str()
+			"following components: " + util::joinHumanReadable(DebugInfoSelection::componentMap() | ranges::views::keys) + ".").c_str()
 		)
 		(
 			g_strStopAfter.c_str(),
@@ -648,12 +648,12 @@ General Information)").c_str(),
 	assemblyModeOptions.add_options()
 		(
 			g_strMachine.c_str(),
-			po::value<string>()->value_name(joinHumanReadable(g_machineArgs, ",")),
+			po::value<string>()->value_name(util::joinHumanReadable(g_machineArgs, ",")),
 			"Target machine in assembly or Yul mode."
 		)
 		(
 			g_strYulDialect.c_str(),
-			po::value<string>()->value_name(joinHumanReadable(g_yulDialectArgs, ",")),
+			po::value<string>()->value_name(util::joinHumanReadable(g_yulDialectArgs, ",")),
 			"Input dialect to use in assembly or yul mode."
 		)
 	;
@@ -726,7 +726,7 @@ General Information)").c_str(),
 		)
 		(
 			g_strCombinedJson.c_str(),
-			po::value<string>()->value_name(joinHumanReadable(CombinedJsonRequests::componentMap() | ranges::views::keys, ",")),
+			po::value<string>()->value_name(util::joinHumanReadable(CombinedJsonRequests::componentMap() | ranges::views::keys, ",")),
 			"Output a single json document containing the specified information."
 		)
 	;
@@ -736,7 +736,7 @@ General Information)").c_str(),
 	metadataOptions.add_options()
 		(
 			g_strMetadataHash.c_str(),
-			po::value<string>()->value_name(joinHumanReadable(g_metadataHashArgs, ",")),
+			po::value<string>()->value_name(util::joinHumanReadable(g_metadataHashArgs, ",")),
 			"Choose hash method for the bytecode metadata or disable it."
 		)
 		(
@@ -1011,11 +1011,11 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strPrettyJson) > 0)
 	{
-		m_options.formatting.json.format = JsonFormat::Pretty;
+		m_options.formatting.json.format = util::JsonFormat::Pretty;
 	}
 	if (!m_args[g_strJsonIndent].defaulted())
 	{
-		m_options.formatting.json.format = JsonFormat::Pretty;
+		m_options.formatting.json.format = util::JsonFormat::Pretty;
 		m_options.formatting.json.indent = m_args[g_strJsonIndent].as<uint32_t>();
 	}
 
@@ -1289,7 +1289,7 @@ size_t CommandLineParser::countEnabledOptions(vector<string> const& _optionNames
 
 string CommandLineParser::joinOptionNames(vector<string> const& _optionNames, string _separator)
 {
-	return joinHumanReadable(
+	return util::joinHumanReadable(
 		_optionNames | ranges::views::transform([](string const& _option){ return "--" + _option; }),
 		_separator
 	);
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 1f07f177d4..3c26f5a97e 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -70,10 +70,10 @@ SemanticTest::SemanticTest(
 	static set<string> const legacyRunTriggers{"also", "false", "default"};
 
 	string compileViaYul = m_reader.stringSetting("compileViaYul", "default");
-	if (!contains(compileViaYulAllowedValues, compileViaYul))
+	if (!util::contains(compileViaYulAllowedValues, compileViaYul))
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid compileViaYul value: " + compileViaYul + "."));
-	m_testCaseWantsYulRun = contains(yulRunTriggers, compileViaYul);
-	m_testCaseWantsLegacyRun = contains(legacyRunTriggers, compileViaYul);
+	m_testCaseWantsYulRun = util::contains(yulRunTriggers, compileViaYul);
+	m_testCaseWantsLegacyRun = util::contains(legacyRunTriggers, compileViaYul);
 
 	// Do not enforce via yul and ewasm, if via yul was explicitly denied.
 	if (compileViaYul == "false")
@@ -189,7 +189,7 @@ vector<SideEffectHook> SemanticTest::makeSideEffectHooks() const
 			{
 				vector<string> result;
 				for (auto const& argument: _call.arguments.parameters)
-					result.emplace_back(toHex(argument.rawBytes));
+					result.emplace_back(util::toHex(argument.rawBytes));
 				return result;
 			}
 			return {};
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 314d4283e0..42c455f4c3 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -4074,12 +4074,12 @@ BOOST_AUTO_TEST_CASE(strip_reason_strings)
 			m_optimiserSettings == OptimiserSettings::none()
 		)
 			// check that the reason string IS part of the binary.
-			BOOST_CHECK(toHex(m_output).find("736f6d6520726561736f6e") != std::string::npos);
+			BOOST_CHECK(util::toHex(m_output).find("736f6d6520726561736f6e") != std::string::npos);
 
 		m_revertStrings = RevertStrings::Strip;
 		compileAndRun(sourceCode, 0, "C");
 		// check that the reason string is NOT part of the binary.
-		BOOST_CHECK(toHex(m_output).find("736f6d6520726561736f6e") == std::string::npos);
+		BOOST_CHECK(util::toHex(m_output).find("736f6d6520726561736f6e") == std::string::npos);
 
 		ABI_CHECK(callContractFunction("f(bool)", true), encodeArgs(7));
 		ABI_CHECK(callContractFunction("f(bool)", false), encodeArgs());
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
index 5f7b8d4724..4fef140e8f 100644
--- a/test/libsolidity/SolidityExpressionCompiler.cpp
+++ b/test/libsolidity/SolidityExpressionCompiler.cpp
@@ -350,7 +350,7 @@ BOOST_AUTO_TEST_CASE(arithmetic)
 			uint8_t(Instruction::JUMPDEST),
 			uint8_t(Instruction::PUSH32)
 		} +
-		fromHex("4E487B7100000000000000000000000000000000000000000000000000000000") +
+		util::fromHex("4E487B7100000000000000000000000000000000000000000000000000000000") +
 		bytes{
 			uint8_t(Instruction::PUSH1), 0x0,
 			uint8_t(Instruction::MSTORE),
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index eb4102b150..a1580fb539 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -98,8 +98,8 @@ class OptimizerTestFramework: public SolidityExecutionFramework
 		BOOST_CHECK_MESSAGE(!optimizedOutput.empty(), "No optimized output for " + _sig);
 		BOOST_CHECK_MESSAGE(!nonOptimizedOutput.empty(), "No un-optimized output for " + _sig);
 		BOOST_CHECK_MESSAGE(nonOptimizedOutput == optimizedOutput, "Computed values do not match."
-							"\nNon-Optimized: " + toHex(nonOptimizedOutput) +
-							"\nOptimized:     " + toHex(optimizedOutput));
+							"\nNon-Optimized: " + util::toHex(nonOptimizedOutput) +
+							"\nOptimized:     " + util::toHex(optimizedOutput));
 	}
 
 	/// @returns the number of instructions in the given bytecode, not taking the metadata hash
diff --git a/test/libsolidity/analysis/FunctionCallGraph.cpp b/test/libsolidity/analysis/FunctionCallGraph.cpp
index 30477aa2e4..7b67aeb44e 100644
--- a/test/libsolidity/analysis/FunctionCallGraph.cpp
+++ b/test/libsolidity/analysis/FunctionCallGraph.cpp
@@ -47,6 +47,7 @@
 #include <vector>
 
 using namespace std;
+using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 
diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp
index f74b256d0c..3c711f0225 100644
--- a/test/libsolidity/util/BytesUtils.cpp
+++ b/test/libsolidity/util/BytesUtils.cpp
@@ -219,7 +219,7 @@ string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff)
 				if (isprint(v))
 					os << v;
 				else
-					os << "\\x" << toHex(v, HexCase::Lower);
+					os << "\\x" << util::toHex(v, HexCase::Lower);
 		}
 	}
 	os << "\"";
diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index 43805c8f99..c51dbec971 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -324,7 +324,7 @@ string TestFunctionCall::formatRawParameters(
 			for (auto const c: param.rawString)
 				// NOTE: Even though we have a toHex() overload specifically for uint8_t, the compiler
 				// chooses the one for bytes if the second argument is omitted.
-				os << (c >= ' ' ? string(1, c) : "\\x" + toHex(static_cast<uint8_t>(c), HexCase::Lower));
+				os << (c >= ' ' ? string(1, c) : "\\x" + util::toHex(static_cast<uint8_t>(c), HexCase::Lower));
 			if (&param != &_params.back())
 				os << ", ";
 		}
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 169437f3c4..d5cb39a83e 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -43,6 +43,7 @@
 using namespace std;
 using namespace solidity::frontend;
 using namespace solidity::test;
+using namespace solidity::util;
 
 using PathSet = set<boost::filesystem::path>;
 

From 7bd6cba79c040648d0e4c4180c60760fecea5c64 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 9 Mar 2022 10:41:57 +0100
Subject: [PATCH 0444/1748] Provide generic access to type definition for
 user-defined types.

---
 libsolidity/ast/Types.cpp | 15 +++++++++++++++
 libsolidity/ast/Types.h   | 11 +++++++++++
 2 files changed, 26 insertions(+)

diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index c84d79785f..77e9af866e 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -2341,6 +2341,11 @@ TypeResult StructType::interfaceType(bool _inLibrary) const
 	return *m_interfaceType_library;
 }
 
+Declaration const* StructType::typeDefinition() const
+{
+	return &structDefinition();
+}
+
 BoolResult StructType::validForLocation(DataLocation _loc) const
 {
 	for (auto const& member: m_struct.members())
@@ -2473,6 +2478,11 @@ Type const* EnumType::encodingType() const
 	return TypeProvider::uint(8);
 }
 
+Declaration const* EnumType::typeDefinition() const
+{
+	return &enumDefinition();
+}
+
 TypeResult EnumType::unaryOperatorResult(Token _operator) const
 {
 	return _operator == Token::Delete ? TypeProvider::emptyTuple() : nullptr;
@@ -2541,6 +2551,11 @@ Type const& UserDefinedValueType::underlyingType() const
 	return *type;
 }
 
+Declaration const* UserDefinedValueType::typeDefinition() const
+{
+	return &m_definition;
+}
+
 string UserDefinedValueType::richIdentifier() const
 {
 	return "t_userDefinedValueType" + parenthesizeIdentifier(m_definition.name()) + to_string(m_definition.id());
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 9b030f65a5..9b30807691 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -369,6 +369,10 @@ class Type
 	/// are returned without modification.
 	virtual TypeResult interfaceType(bool /*_inLibrary*/) const { return nullptr; }
 
+	/// @returns the declaration of a user defined type (enum, struct, user defined value type).
+	/// Returns nullptr otherwise.
+	virtual Declaration const* typeDefinition() const { return nullptr; }
+
 	/// Clears all internally cached values (if any).
 	virtual void clearCache() const;
 
@@ -1004,6 +1008,8 @@ class StructType: public ReferenceType
 	Type const* encodingType() const override;
 	TypeResult interfaceType(bool _inLibrary) const override;
 
+	Declaration const* typeDefinition() const override;
+
 	BoolResult validForLocation(DataLocation _loc) const override;
 
 	bool recursive() const;
@@ -1069,6 +1075,8 @@ class EnumType: public Type
 		return _inLibrary ? this : encodingType();
 	}
 
+	Declaration const* typeDefinition() const override;
+
 	EnumDefinition const& enumDefinition() const { return m_enum; }
 	/// @returns the value that the string has in the Enum
 	unsigned int memberValue(ASTString const& _member) const;
@@ -1101,6 +1109,9 @@ class UserDefinedValueType: public Type
 	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
 	Type const* encodingType() const override { return &underlyingType(); }
 	TypeResult interfaceType(bool /* _inLibrary */) const override {return &underlyingType(); }
+
+	Declaration const* typeDefinition() const override;
+
 	std::string richIdentifier() const override;
 	bool operator==(Type const& _other) const override;
 

From b3daef766525459a7f624b0a66d667a76044194c Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 7 Mar 2022 13:31:55 +0100
Subject: [PATCH 0445/1748] [CMake] Refactor libsolc linker flag for
 EXPORTED_FUNCTIONS and make it more readable.

---
 cmake/EthUtils.cmake   |  8 ++++++++
 libsolc/CMakeLists.txt | 11 ++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/cmake/EthUtils.cmake b/cmake/EthUtils.cmake
index fca41107eb..44b92f4a0a 100644
--- a/cmake/EthUtils.cmake
+++ b/cmake/EthUtils.cmake
@@ -48,3 +48,11 @@ function(detect_stray_source_files FILELIST DIRECTORY)
 		message(SEND_ERROR "The following source files are present but are not compiled: ${sources}")
 	endif()
 endfunction(detect_stray_source_files)
+
+# CreateExportedFunctionsForEMSDK(OUTPUT_VARIABLE Symbol1 Symbol2 ... SymbolN)
+function(CreateExportedFunctionsForEMSDK OUTPUT_VARIABLE)
+	list(TRANSFORM ARGN PREPEND "\"_")
+	list(TRANSFORM ARGN APPEND "\"")
+	list(JOIN ARGN "," ARGN)
+	set(${OUTPUT_VARIABLE} "[${ARGN}]" PARENT_SCOPE)
+endfunction()
diff --git a/libsolc/CMakeLists.txt b/libsolc/CMakeLists.txt
index 776b97ca50..fce54dd24b 100644
--- a/libsolc/CMakeLists.txt
+++ b/libsolc/CMakeLists.txt
@@ -1,8 +1,17 @@
 if (EMSCRIPTEN)
+	CreateExportedFunctionsForEMSDK(
+		ExportedFunctions
+		solidity_license
+		solidity_version
+		solidity_compile
+		solidity_alloc
+		solidity_free
+		solidity_reset
+	)
 	# Specify which functions to export in soljson.js.
 	# Note that additional Emscripten-generated methods needed by solc-js are
 	# defined to be exported in cmake/EthCompilerSettings.cmake.
-	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXPORTED_FUNCTIONS='[\"_solidity_license\",\"_solidity_version\",\"_solidity_compile\",\"_solidity_alloc\",\"_solidity_free\",\"_solidity_reset\"]'")
+	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s EXPORTED_FUNCTIONS='${ExportedFunctions}'")
 	add_executable(soljson libsolc.cpp libsolc.h)
 	target_link_libraries(soljson PRIVATE solidity)
 else()

From 859869c4ddf27c29d56a99a250ce5e45ef19e2d1 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 9 Mar 2022 16:03:57 +0100
Subject: [PATCH 0446/1748] Simplify peephole optimizer template.

---
 libevmasm/PeepholeOptimiser.cpp | 71 +++++++++++----------------------
 1 file changed, 24 insertions(+), 47 deletions(-)

diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
index 8e4a09fcc1..b04c2158ce 100644
--- a/libevmasm/PeepholeOptimiser.cpp
+++ b/libevmasm/PeepholeOptimiser.cpp
@@ -41,51 +41,28 @@ struct OptimiserState
 	std::back_insert_iterator<AssemblyItems> out;
 };
 
-template <class Method, size_t Arguments>
-struct ApplyRule
+template<typename FunctionType>
+struct FunctionParameterCount;
+template<typename R, typename... Args>
+struct FunctionParameterCount<R(Args...)>
 {
+	static constexpr auto value = sizeof...(Args);
 };
+
 template <class Method>
-struct ApplyRule<Method, 4>
-{
-	static bool applyRule(AssemblyItems::const_iterator _in, std::back_insert_iterator<AssemblyItems> _out)
-	{
-		return Method::applySimple(_in[0], _in[1], _in[2], _in[3], _out);
-	}
-};
-template <class Method>
-struct ApplyRule<Method, 3>
-{
-	static bool applyRule(AssemblyItems::const_iterator _in, std::back_insert_iterator<AssemblyItems> _out)
-	{
-		return Method::applySimple(_in[0], _in[1], _in[2], _out);
-	}
-};
-template <class Method>
-struct ApplyRule<Method, 2>
-{
-	static bool applyRule(AssemblyItems::const_iterator _in, std::back_insert_iterator<AssemblyItems> _out)
-	{
-		return Method::applySimple(_in[0], _in[1], _out);
-	}
-};
-template <class Method>
-struct ApplyRule<Method, 1>
+struct SimplePeepholeOptimizerMethod
 {
-	static bool applyRule(AssemblyItems::const_iterator _in, std::back_insert_iterator<AssemblyItems> _out)
+	template <size_t... Indices>
+	static bool applyRule(AssemblyItems::const_iterator _in, back_insert_iterator<AssemblyItems> _out, index_sequence<Indices...>)
 	{
-		return Method::applySimple(_in[0], _out);
+		return Method::applySimple(_in[Indices]..., _out);
 	}
-};
-
-template <class Method, size_t WindowSize>
-struct SimplePeepholeOptimizerMethod
-{
 	static bool apply(OptimiserState& _state)
 	{
+		static constexpr size_t WindowSize = FunctionParameterCount<decltype(Method::applySimple)>::value - 1;
 		if (
 			_state.i + WindowSize <= _state.items.size() &&
-			ApplyRule<Method, WindowSize>::applyRule(_state.items.begin() + static_cast<ptrdiff_t>(_state.i), _state.out)
+			applyRule(_state.items.begin() + static_cast<ptrdiff_t>(_state.i), _state.out, make_index_sequence<WindowSize>{})
 		)
 		{
 			_state.i += WindowSize;
@@ -96,7 +73,7 @@ struct SimplePeepholeOptimizerMethod
 	}
 };
 
-struct Identity: SimplePeepholeOptimizerMethod<Identity, 1>
+struct Identity: SimplePeepholeOptimizerMethod<Identity>
 {
 	static bool applySimple(AssemblyItem const& _item, std::back_insert_iterator<AssemblyItems> _out)
 	{
@@ -105,7 +82,7 @@ struct Identity: SimplePeepholeOptimizerMethod<Identity, 1>
 	}
 };
 
-struct PushPop: SimplePeepholeOptimizerMethod<PushPop, 2>
+struct PushPop: SimplePeepholeOptimizerMethod<PushPop>
 {
 	static bool applySimple(AssemblyItem const& _push, AssemblyItem const& _pop, std::back_insert_iterator<AssemblyItems>)
 	{
@@ -118,7 +95,7 @@ struct PushPop: SimplePeepholeOptimizerMethod<PushPop, 2>
 	}
 };
 
-struct OpPop: SimplePeepholeOptimizerMethod<OpPop, 2>
+struct OpPop: SimplePeepholeOptimizerMethod<OpPop>
 {
 	static bool applySimple(
 		AssemblyItem const& _op,
@@ -140,7 +117,7 @@ struct OpPop: SimplePeepholeOptimizerMethod<OpPop, 2>
 	}
 };
 
-struct DoubleSwap: SimplePeepholeOptimizerMethod<DoubleSwap, 2>
+struct DoubleSwap: SimplePeepholeOptimizerMethod<DoubleSwap>
 {
 	static size_t applySimple(AssemblyItem const& _s1, AssemblyItem const& _s2, std::back_insert_iterator<AssemblyItems>)
 	{
@@ -148,7 +125,7 @@ struct DoubleSwap: SimplePeepholeOptimizerMethod<DoubleSwap, 2>
 	}
 };
 
-struct DoublePush: SimplePeepholeOptimizerMethod<DoublePush, 2>
+struct DoublePush: SimplePeepholeOptimizerMethod<DoublePush>
 {
 	static bool applySimple(AssemblyItem const& _push1, AssemblyItem const& _push2, std::back_insert_iterator<AssemblyItems> _out)
 	{
@@ -163,7 +140,7 @@ struct DoublePush: SimplePeepholeOptimizerMethod<DoublePush, 2>
 	}
 };
 
-struct CommutativeSwap: SimplePeepholeOptimizerMethod<CommutativeSwap, 2>
+struct CommutativeSwap: SimplePeepholeOptimizerMethod<CommutativeSwap>
 {
 	static bool applySimple(AssemblyItem const& _swap, AssemblyItem const& _op, std::back_insert_iterator<AssemblyItems> _out)
 	{
@@ -181,7 +158,7 @@ struct CommutativeSwap: SimplePeepholeOptimizerMethod<CommutativeSwap, 2>
 	}
 };
 
-struct SwapComparison: SimplePeepholeOptimizerMethod<SwapComparison, 2>
+struct SwapComparison: SimplePeepholeOptimizerMethod<SwapComparison>
 {
 	static bool applySimple(AssemblyItem const& _swap, AssemblyItem const& _op, std::back_insert_iterator<AssemblyItems> _out)
 	{
@@ -207,7 +184,7 @@ struct SwapComparison: SimplePeepholeOptimizerMethod<SwapComparison, 2>
 };
 
 /// Remove swapN after dupN
-struct DupSwap: SimplePeepholeOptimizerMethod<DupSwap, 2>
+struct DupSwap: SimplePeepholeOptimizerMethod<DupSwap>
 {
 	static size_t applySimple(
 		AssemblyItem const& _dupN,
@@ -230,7 +207,7 @@ struct DupSwap: SimplePeepholeOptimizerMethod<DupSwap, 2>
 };
 
 
-struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod<IsZeroIsZeroJumpI, 4>
+struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod<IsZeroIsZeroJumpI>
 {
 	static size_t applySimple(
 		AssemblyItem const& _iszero1,
@@ -256,7 +233,7 @@ struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod<IsZeroIsZeroJumpI, 4>
 	}
 };
 
-struct JumpToNext: SimplePeepholeOptimizerMethod<JumpToNext, 3>
+struct JumpToNext: SimplePeepholeOptimizerMethod<JumpToNext>
 {
 	static size_t applySimple(
 		AssemblyItem const& _pushTag,
@@ -282,7 +259,7 @@ struct JumpToNext: SimplePeepholeOptimizerMethod<JumpToNext, 3>
 	}
 };
 
-struct TagConjunctions: SimplePeepholeOptimizerMethod<TagConjunctions, 3>
+struct TagConjunctions: SimplePeepholeOptimizerMethod<TagConjunctions>
 {
 	static bool applySimple(
 		AssemblyItem const& _pushTag,
@@ -317,7 +294,7 @@ struct TagConjunctions: SimplePeepholeOptimizerMethod<TagConjunctions, 3>
 	}
 };
 
-struct TruthyAnd: SimplePeepholeOptimizerMethod<TruthyAnd, 3>
+struct TruthyAnd: SimplePeepholeOptimizerMethod<TruthyAnd>
 {
 	static bool applySimple(
 		AssemblyItem const& _push,

From ce0a3e93f2e2a29a179d6c8d7f98b01310d7f909 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 7 Mar 2022 12:49:23 +0100
Subject: [PATCH 0447/1748] Store whether an evmasm Assembly is creation code.

---
 Changelog.md                                  |  1 +
 libevmasm/Assembly.cpp                        |  8 ++++---
 libevmasm/Assembly.h                          |  6 ++++-
 libsolidity/codegen/CompilerContext.h         |  2 +-
 libyul/AssemblyStack.cpp                      |  8 +++++--
 libyul/backends/evm/AbstractAssembly.h        |  2 +-
 libyul/backends/evm/EVMObjectCompiler.cpp     |  5 +++-
 libyul/backends/evm/EthAssemblyAdapter.cpp    |  4 ++--
 libyul/backends/evm/EthAssemblyAdapter.h      |  2 +-
 libyul/backends/evm/NoOutputAssembly.cpp      |  2 +-
 libyul/backends/evm/NoOutputAssembly.h        |  2 +-
 test/cmdlineTests/yul_optimize_runs/output    |  5 ++--
 test/libevmasm/Assembler.cpp                  | 18 +++++++-------
 test/libevmasm/Optimiser.cpp                  |  4 ++--
 .../semanticTests/array/reusing_memory.sol    |  2 +-
 .../constructor/arrays_in_constructors.sol    |  2 +-
 .../bytes_in_constructors_packer.sol          |  2 +-
 .../creation_function_call_with_args.sol      |  2 +-
 .../creation_function_call_with_salt.sol      |  2 +-
 .../inheritance/value_for_constructor.sol     |  2 +-
 .../salted_create_with_value.sol              |  2 +-
 test/libyul/EVMCodeTransformTest.cpp          |  2 +-
 test/tools/fuzzer_common.cpp                  | 24 ++++++++++---------
 23 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 181c386aa0..63588731fa 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 * JSON-AST: Added selector field for errors and events.
 
 Bugfixes:
+ * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``.
 
 
 ### 0.8.12 (2022-02-16)
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 55d23e283f..492d434c83 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -411,13 +411,15 @@ map<u256, u256> const& Assembly::optimiseInternal(
 	if (m_tagReplacements)
 		return *m_tagReplacements;
 
+	assertThrow(_settings.isCreation == m_creation, OptimizerException, "Mismatching creation settings.");
+
 	// Run optimisation for sub-assemblies.
 	for (size_t subId = 0; subId < m_subs.size(); ++subId)
 	{
 		OptimiserSettings settings = _settings;
-		// Disable creation mode for sub-assemblies.
-		settings.isCreation = false;
-		map<u256, u256> const& subTagReplacements = m_subs[subId]->optimiseInternal(
+		Assembly& sub = *m_subs[subId];
+		settings.isCreation = sub.isCreation();
+		map<u256, u256> const& subTagReplacements = sub.optimiseInternal(
 			settings,
 			JumpdestRemover::referencedTags(m_items, subId)
 		);
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index 97807e2238..270d854803 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -48,7 +48,7 @@ using AssemblyPointer = std::shared_ptr<Assembly>;
 class Assembly
 {
 public:
-	explicit Assembly(std::string _name = std::string()):m_name(std::move(_name)) { }
+	Assembly(bool _creation, std::string _name): m_creation(_creation), m_name(std::move(_name)) { }
 
 	AssemblyItem newTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(Tag, m_usedTags++); }
 	AssemblyItem newPushTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(PushTag, m_usedTags++); }
@@ -157,6 +157,8 @@ class Assembly
 	std::vector<size_t> decodeSubPath(size_t _subObjectId) const;
 	size_t encodeSubPath(std::vector<size_t> const& _subPath);
 
+	bool isCreation() const { return m_creation; }
+
 protected:
 	/// Does the same operations as @a optimise, but should only be applied to a sub and
 	/// returns the replaced tags. Also takes an argument containing the tags of this assembly
@@ -214,6 +216,8 @@ class Assembly
 	mutable std::vector<size_t> m_tagPositionsInBytecode;
 
 	int m_deposit = 0;
+	/// True, if the assembly contains contract creation code.
+	bool const m_creation = false;
 	/// Internal name of the assembly object, only used with the Yul backend
 	/// currently
 	std::string m_name;
diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h
index cd71d5a4d3..a796ac60b2 100644
--- a/libsolidity/codegen/CompilerContext.h
+++ b/libsolidity/codegen/CompilerContext.h
@@ -65,7 +65,7 @@ class CompilerContext
 		RevertStrings _revertStrings,
 		CompilerContext* _runtimeContext = nullptr
 	):
-		m_asm(std::make_shared<evmasm::Assembly>()),
+		m_asm(std::make_shared<evmasm::Assembly>(_runtimeContext != nullptr, std::string{})),
 		m_evmVersion(_evmVersion),
 		m_revertStrings(_revertStrings),
 		m_reservedMemory{0},
diff --git a/libyul/AssemblyStack.cpp b/libyul/AssemblyStack.cpp
index 30ad58d773..5d0ddd81a6 100644
--- a/libyul/AssemblyStack.cpp
+++ b/libyul/AssemblyStack.cpp
@@ -38,6 +38,7 @@
 
 #include <libevmasm/Assembly.h>
 #include <liblangutil/Scanner.h>
+#include <boost/algorithm/string.hpp>
 #include <optional>
 
 using namespace std;
@@ -194,7 +195,10 @@ void AssemblyStack::optimize(Object& _object, bool _isCreation)
 	yulAssert(_object.analysisInfo, "");
 	for (auto& subNode: _object.subObjects)
 		if (auto subObject = dynamic_cast<Object*>(subNode.get()))
-			optimize(*subObject, false);
+		{
+			bool isCreation = !boost::ends_with(subObject->name.str(), "_deployed");
+			optimize(*subObject, isCreation);
+		}
 
 	Dialect const& dialect = languageToDialect(m_language, m_evmVersion);
 	unique_ptr<GasMeter> meter;
@@ -281,7 +285,7 @@ AssemblyStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
 	yulAssert(m_parserResult->code, "");
 	yulAssert(m_parserResult->analysisInfo, "");
 
-	evmasm::Assembly assembly;
+	evmasm::Assembly assembly(true, {});
 	EthAssemblyAdapter adapter(assembly);
 	compileEVM(adapter, m_optimiserSettings.optimizeStackAllocation);
 
diff --git a/libyul/backends/evm/AbstractAssembly.h b/libyul/backends/evm/AbstractAssembly.h
index 66d5333e22..2d7be90019 100644
--- a/libyul/backends/evm/AbstractAssembly.h
+++ b/libyul/backends/evm/AbstractAssembly.h
@@ -98,7 +98,7 @@ class AbstractAssembly
 	/// Append the assembled size as a constant.
 	virtual void appendAssemblySize() = 0;
 	/// Creates a new sub-assembly, which can be referenced using dataSize and dataOffset.
-	virtual std::pair<std::shared_ptr<AbstractAssembly>, SubID> createSubAssembly(std::string _name = "") = 0;
+	virtual std::pair<std::shared_ptr<AbstractAssembly>, SubID> createSubAssembly(bool _creation, std::string _name = "") = 0;
 	/// Appends the offset of the given sub-assembly or data.
 	virtual void appendDataOffset(std::vector<SubID> const& _subPath) = 0;
 	/// Appends the size of the given sub-assembly or data.
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index c3c95d8bc5..b60e383e65 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -30,6 +30,8 @@
 #include <libyul/Object.h>
 #include <libyul/Exceptions.h>
 
+#include <boost/algorithm/string.hpp>
+
 using namespace solidity::yul;
 using namespace std;
 
@@ -48,7 +50,8 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 	for (auto const& subNode: _object.subObjects)
 		if (auto* subObject = dynamic_cast<Object*>(subNode.get()))
 		{
-			auto subAssemblyAndID = m_assembly.createSubAssembly(subObject->name.str());
+			bool isCreation = !boost::ends_with(subObject->name.str(), "_deployed");
+			auto subAssemblyAndID = m_assembly.createSubAssembly(isCreation, subObject->name.str());
 			context.subIDs[subObject->name] = subAssemblyAndID.second;
 			subObject->subId = subAssemblyAndID.second;
 			compile(*subObject, *subAssemblyAndID.first, m_dialect, _optimize);
diff --git a/libyul/backends/evm/EthAssemblyAdapter.cpp b/libyul/backends/evm/EthAssemblyAdapter.cpp
index 1c41534b25..5d7b4cbf45 100644
--- a/libyul/backends/evm/EthAssemblyAdapter.cpp
+++ b/libyul/backends/evm/EthAssemblyAdapter.cpp
@@ -122,9 +122,9 @@ void EthAssemblyAdapter::appendAssemblySize()
 	m_assembly.appendProgramSize();
 }
 
-pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> EthAssemblyAdapter::createSubAssembly(string _name)
+pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> EthAssemblyAdapter::createSubAssembly(bool _creation, string _name)
 {
-	shared_ptr<evmasm::Assembly> assembly{make_shared<evmasm::Assembly>(std::move(_name))};
+	shared_ptr<evmasm::Assembly> assembly{make_shared<evmasm::Assembly>(_creation, std::move(_name))};
 	auto sub = m_assembly.newSub(assembly);
 	return {make_shared<EthAssemblyAdapter>(*assembly), static_cast<size_t>(sub.data())};
 }
diff --git a/libyul/backends/evm/EthAssemblyAdapter.h b/libyul/backends/evm/EthAssemblyAdapter.h
index c11b375f68..87047ccbf4 100644
--- a/libyul/backends/evm/EthAssemblyAdapter.h
+++ b/libyul/backends/evm/EthAssemblyAdapter.h
@@ -55,7 +55,7 @@ class EthAssemblyAdapter: public AbstractAssembly
 	void appendJumpTo(LabelID _labelId, int _stackDiffAfter, JumpType _jumpType) override;
 	void appendJumpToIf(LabelID _labelId, JumpType _jumpType) override;
 	void appendAssemblySize() override;
-	std::pair<std::shared_ptr<AbstractAssembly>, SubID> createSubAssembly(std::string _name = {}) override;
+	std::pair<std::shared_ptr<AbstractAssembly>, SubID> createSubAssembly(bool _creation, std::string _name = {}) override;
 	void appendDataOffset(std::vector<SubID> const& _subPath) override;
 	void appendDataSize(std::vector<SubID> const& _subPath) override;
 	SubID appendData(bytes const& _data) override;
diff --git a/libyul/backends/evm/NoOutputAssembly.cpp b/libyul/backends/evm/NoOutputAssembly.cpp
index 62c0ad1198..e262042014 100644
--- a/libyul/backends/evm/NoOutputAssembly.cpp
+++ b/libyul/backends/evm/NoOutputAssembly.cpp
@@ -98,7 +98,7 @@ void NoOutputAssembly::appendAssemblySize()
 	appendInstruction(evmasm::Instruction::PUSH1);
 }
 
-pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> NoOutputAssembly::createSubAssembly(std::string)
+pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> NoOutputAssembly::createSubAssembly(bool, std::string)
 {
 	yulAssert(false, "Sub assemblies not implemented.");
 	return {};
diff --git a/libyul/backends/evm/NoOutputAssembly.h b/libyul/backends/evm/NoOutputAssembly.h
index b41d7f4a6b..1103392ef9 100644
--- a/libyul/backends/evm/NoOutputAssembly.h
+++ b/libyul/backends/evm/NoOutputAssembly.h
@@ -65,7 +65,7 @@ class NoOutputAssembly: public AbstractAssembly
 	void appendJumpToIf(LabelID _labelId, JumpType _jumpType) override;
 
 	void appendAssemblySize() override;
-	std::pair<std::shared_ptr<AbstractAssembly>, SubID> createSubAssembly(std::string _name = "") override;
+	std::pair<std::shared_ptr<AbstractAssembly>, SubID> createSubAssembly(bool _creation, std::string _name = "") override;
 	void appendDataOffset(std::vector<SubID> const& _subPath) override;
 	void appendDataSize(std::vector<SubID> const& _subPath) override;
 	SubID appendData(bytes const& _data) override;
diff --git a/test/cmdlineTests/yul_optimize_runs/output b/test/cmdlineTests/yul_optimize_runs/output
index b95184440d..357c796ee4 100644
--- a/test/cmdlineTests/yul_optimize_runs/output
+++ b/test/cmdlineTests/yul_optimize_runs/output
@@ -21,7 +21,7 @@ object "RunsTest1" {
 
 
 Binary representation:
-602580600c6000396000f3fe7fabc123450000000000000000000000000000000000000000000000000000000060005500
+600c80600c6000396000f3fe63abc1234560e01b60005500
 
 Text representation:
     /* "yul_optimize_runs/input.yul":106:125   */
@@ -40,8 +40,7 @@ Text representation:
 stop
 
 sub_0: assembly {
-        /* "yul_optimize_runs/input.yul":237:257   */
-      0xabc1234500000000000000000000000000000000000000000000000000000000
+      shl(0xe0, 0xabc12345)
         /* "yul_optimize_runs/input.yul":277:278   */
       0x00
         /* "yul_optimize_runs/input.yul":270:288   */
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index 78e598bcab..3a31678164 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -58,11 +58,11 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 		{ "root.asm", 0 },
 		{ "sub.asm", 1 }
 	};
-	Assembly _assembly;
+	Assembly _assembly{false, {}};
 	auto root_asm = make_shared<string>("root.asm");
 	_assembly.setSourceLocation({1, 3, root_asm});
 
-	Assembly _subAsm;
+	Assembly _subAsm{false, {}};
 	auto sub_asm = make_shared<string>("sub.asm");
 	_subAsm.setSourceLocation({6, 8, sub_asm});
 	// PushImmutable
@@ -197,7 +197,7 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 				{ *subName, 1 }
 			};
 
-			auto subAsm = make_shared<Assembly>();
+			auto subAsm = make_shared<Assembly>(false, string{});
 			for (char i = 0; i < numImmutables; ++i)
 			{
 				for (int r = 0; r < numActualRefs; ++r)
@@ -207,7 +207,7 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 				}
 			}
 
-			Assembly assembly;
+			Assembly assembly{true, {}};
 			for (char i = 1; i <= numImmutables; ++i)
 			{
 				assembly.setSourceLocation({10*i, 10*i + 3+i, assemblyName});
@@ -256,11 +256,11 @@ BOOST_AUTO_TEST_CASE(immutable)
 		{ "root.asm", 0 },
 		{ "sub.asm", 1 }
 	};
-	Assembly _assembly;
+	Assembly _assembly{true, {}};
 	auto root_asm = make_shared<string>("root.asm");
 	_assembly.setSourceLocation({1, 3, root_asm});
 
-	Assembly _subAsm;
+	Assembly _subAsm{false, {}};
 	auto sub_asm = make_shared<string>("sub.asm");
 	_subAsm.setSourceLocation({6, 8, sub_asm});
 	_subAsm.appendImmutable("someImmutable");
@@ -349,10 +349,10 @@ BOOST_AUTO_TEST_CASE(immutable)
 
 BOOST_AUTO_TEST_CASE(subobject_encode_decode)
 {
-	Assembly assembly;
+	Assembly assembly{true, {}};
 
-	shared_ptr<Assembly> subAsmPtr = make_shared<Assembly>();
-	shared_ptr<Assembly> subSubAsmPtr = make_shared<Assembly>();
+	shared_ptr<Assembly> subAsmPtr = make_shared<Assembly>(false, string{});
+	shared_ptr<Assembly> subSubAsmPtr = make_shared<Assembly>(false, string{});
 
 	assembly.appendSubroutine(subAsmPtr);
 	subAsmPtr->appendSubroutine(subSubAsmPtr);
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index c8bb93c41d..278a7c77fd 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -1250,8 +1250,8 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
 	// tag unifications (due to block deduplication) is also
 	// visible at the super-assembly.
 
-	Assembly main;
-	AssemblyPointer sub = make_shared<Assembly>();
+	Assembly main{false, {}};
+	AssemblyPointer sub = make_shared<Assembly>(true, string{});
 
 	sub->append(u256(1));
 	auto t1 = sub->newTag();
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index ee91ce7f7b..ba0ca8abd8 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -26,6 +26,6 @@ contract Main {
 // compileViaYul: also
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 113598
+// gas irOptimized: 113610
 // gas legacy: 126596
 // gas legacyOptimized: 113823
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index cc303899a1..21de2ac97e 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 443960
+// gas irOptimized: 444029
 // gas legacy: 590683
 // gas legacyOptimized: 448326
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index ffe0fb8c25..d5e633924e 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 300804
+// gas irOptimized: 300885
 // gas legacy: 428917
 // gas legacyOptimized: 298128
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index 685d8a7de5..c4a65bb55a 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -17,7 +17,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 203967
+// gas irOptimized: 203963
 // gas legacy: 245842
 // gas legacyOptimized: 195676
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index a768a2836d..7ed6384182 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -18,7 +18,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 204130
+// gas irOptimized: 204126
 // gas legacy: 246202
 // gas legacyOptimized: 195914
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index e6f94bdcff..462de46a78 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -42,7 +42,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 284287
+// gas irOptimized: 284283
 // gas legacy: 402045
 // gas legacyOptimized: 266772
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 4ce8b5149c..eb9d93ee26 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -22,6 +22,6 @@ contract A {
 // compileViaYul: also
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 272413
+// gas irOptimized: 272449
 // gas legacy: 422501
 // gas legacyOptimized: 287472
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
index 8986acc1b0..679493f35f 100644
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ b/test/libyul/EVMCodeTransformTest.cpp
@@ -65,7 +65,7 @@ TestCase::TestResult EVMCodeTransformTest::run(ostream& _stream, string const& _
 		return TestResult::FatalError;
 	}
 
-	evmasm::Assembly assembly;
+	evmasm::Assembly assembly{false, {}};
 	EthAssemblyAdapter adapter(assembly);
 	EVMObjectCompiler::compile(
 		*stack.parserResult(),
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 82066bf527..094a845548 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -185,25 +185,27 @@ void FuzzerUtil::testConstantOptimizer(string const& _input, bool _quiet)
 	if (!_quiet)
 		cout << "Got " << numbers.size() << " inputs:" << endl;
 
-	Assembly assembly;
-	for (u256 const& n: numbers)
-	{
-		if (!_quiet)
-			cout << n << endl;
-		assembly.append(n);
-	}
 	for (bool isCreation: {false, true})
+	{
+		Assembly assembly{isCreation, {}};
+		for (u256 const& n: numbers)
+		{
+			if (!_quiet)
+				cout << n << endl;
+			assembly.append(n);
+		}
 		for (unsigned runs: {1u, 2u, 3u, 20u, 40u, 100u, 200u, 400u, 1000u})
 		{
 			// Make a copy here so that each time we start with the original state.
 			Assembly tmp = assembly;
 			ConstantOptimisationMethod::optimiseConstants(
-					isCreation,
-					runs,
-					langutil::EVMVersion{},
-					tmp
+				isCreation,
+				runs,
+				langutil::EVMVersion{},
+				tmp
 			);
 		}
+	}
 }
 
 void FuzzerUtil::testStandardCompiler(string const& _input, bool _quiet)

From 0a9d752b8b9bd033a0a302ffe68b0c7e516cafe7 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 7 Mar 2022 13:06:58 +0100
Subject: [PATCH 0448/1748] Add test case and adjust tests.

---
 .../viair_subobject_optimization/args         |   1 +
 .../viair_subobject_optimization/input.sol    |  20 +
 .../viair_subobject_optimization/output       | 379 ++++++++++++++++++
 test/cmdlineTests/yul_optimize_runs/input.yul |   6 +-
 test/cmdlineTests/yul_optimize_runs/output    |  25 +-
 .../semanticTests/array/reusing_memory.sol    |   2 +-
 .../constructor/arrays_in_constructors.sol    |   2 +-
 .../bytes_in_constructors_packer.sol          |   2 +-
 .../creation_function_call_with_args.sol      |   2 +-
 .../creation_function_call_with_salt.sol      |   2 +-
 .../inheritance/value_for_constructor.sol     |   2 +-
 .../salted_create_with_value.sol              |   2 +-
 12 files changed, 423 insertions(+), 22 deletions(-)
 create mode 100644 test/cmdlineTests/viair_subobject_optimization/args
 create mode 100644 test/cmdlineTests/viair_subobject_optimization/input.sol
 create mode 100644 test/cmdlineTests/viair_subobject_optimization/output

diff --git a/test/cmdlineTests/viair_subobject_optimization/args b/test/cmdlineTests/viair_subobject_optimization/args
new file mode 100644
index 0000000000..51e6fa5196
--- /dev/null
+++ b/test/cmdlineTests/viair_subobject_optimization/args
@@ -0,0 +1 @@
+--experimental-via-ir --optimize --asm
\ No newline at end of file
diff --git a/test/cmdlineTests/viair_subobject_optimization/input.sol b/test/cmdlineTests/viair_subobject_optimization/input.sol
new file mode 100644
index 0000000000..74549134a6
--- /dev/null
+++ b/test/cmdlineTests/viair_subobject_optimization/input.sol
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >0.0.0;
+
+contract C {
+  constructor(uint x) {
+    // In earlier versions of the compiler, the resulting assembly pushed the constant
+    // 0xFFFFFFFFFFFFFFFF42 directly in the subassembly of D, while it was optimized to
+    // ``sub(shl(0x48, 0x01), 0xbe)`` when C was compiled in isolation.
+    // Now the assembly is expected to contain two instances of ``sub(shl(0x48, 0x01), 0xbe)``,
+    // one in the creation code of ``C`` directly, one in a subassembly of ``D``.
+    // The constant 0xFFFFFFFFFFFFFFFF42 should not occur in the assembly output at all.
+    if (x == 0xFFFFFFFFFFFFFFFF42)
+      revert();
+  }
+}
+contract D {
+  function f() public pure returns (bytes memory) {
+    return type(C).creationCode;
+  }
+}
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
new file mode 100644
index 0000000000..8b5666b378
--- /dev/null
+++ b/test/cmdlineTests/viair_subobject_optimization/output
@@ -0,0 +1,379 @@
+
+======= viair_subobject_optimization/input.sol:C =======
+EVM assembly:
+    /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
+  0x80
+  dup1
+  0x40
+  mstore
+  jumpi(tag_6, callvalue)
+  0x1f
+  bytecodeSize
+  codesize
+  dup2
+  swap1
+  sub
+  swap2
+  dup3
+  add
+  not(0x1f)
+  and
+  dup4
+  add
+  swap2
+  sub(shl(0x40, 0x01), 0x01)
+  dup4
+  gt
+  dup5
+  dup5
+  lt
+  or
+  tag_4
+  jumpi
+  dup1
+  dup5
+  swap3
+  0x20
+  swap5
+  0x40
+  mstore
+  dup4
+  codecopy
+  dup2
+  add
+  sub
+  slt
+  tag_6
+  jumpi
+  tag_8
+  swap1
+  mload
+  tag_1
+  jump	// in
+tag_8:
+  mload(0x40)
+  dataSize(sub_0)
+  swap1
+  dup2
+  dataOffset(sub_0)
+  dup3
+  codecopy
+  return
+tag_6:
+  pop
+  0x00
+  dup1
+  revert
+tag_4:
+  pop
+  pop
+  pop
+  pop
+  mstore(0x00, shl(0xe0, 0x4e487b71))
+  mstore(0x04, 0x41)
+  revert(0x00, 0x24)
+    /* "viair_subobject_optimization/input.sol":76:666  constructor(uint x) {... */
+tag_1:
+  sub(shl(0x48, 0x01), 0xbe)
+    /* "viair_subobject_optimization/input.sol":620:645  x == 0xFFFFFFFFFFFFFFFF42 */
+  eq
+    /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
+  tag_6
+  jumpi
+    /* "viair_subobject_optimization/input.sol":76:666  constructor(uint x) {... */
+  jump	// out
+stop
+
+sub_0: assembly {
+        /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
+      mstore(0x40, 0x80)
+      0x00
+      dup1
+      revert
+
+    auxdata: <AUXDATA REMOVED>
+}
+
+
+======= viair_subobject_optimization/input.sol:D =======
+EVM assembly:
+    /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
+  0x80
+  dup1
+  0x40
+  mstore
+  jumpi(tag_1, callvalue)
+  dataSize(sub_0)
+  swap1
+  dup2
+  dataOffset(sub_0)
+  dup3
+  codecopy
+  return
+tag_1:
+  pop
+  0x00
+  dup1
+  revert
+stop
+
+sub_0: assembly {
+        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
+      0x80
+      dup1
+      0x40
+      mstore
+      jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
+    tag_3:
+      pop
+      0x00
+      dup1
+      revert
+    tag_2:
+      0x00
+      swap1
+      dup2
+      calldataload
+      0xe0
+      shr
+      0x26121ff0
+      eq
+      tag_4
+      jumpi
+      pop
+      jump(tag_3)
+    tag_4:
+      jumpi(tag_8, callvalue)
+      dup2
+      add(calldatasize, not(0x03))
+      slt
+      tag_8
+      jumpi
+        /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
+      dataSize(sub_0)
+        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
+      0x3f
+      dup2
+      add
+      not(0x1f)
+      and
+      dup3
+      add
+      0xffffffffffffffff
+      dup2
+      gt
+      dup4
+      dup3
+      lt
+      or
+      tag_10
+      jumpi
+      tag_12
+      swap4
+      pop
+      0x40
+      mstore
+        /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
+      dup1
+      dup3
+      mstore
+      dataOffset(sub_0)
+      0x20
+      dup4
+      add
+      codecopy
+        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
+      mload(0x40)
+      swap2
+      dup3
+      swap2
+      dup3
+      tag_1
+      jump	// in
+    tag_12:
+      sub
+      swap1
+      return
+    tag_10:
+      pop
+      pop
+      shl(0xe0, 0x4e487b71)
+      dup3
+      mstore
+      pop
+      mstore(0x04, 0x41)
+      0x24
+      swap1
+      revert
+    tag_8:
+      pop
+      dup1
+      revert
+    tag_1:
+      swap2
+      swap1
+      swap2
+      0x20
+      dup1
+      dup3
+      mstore
+      dup4
+      mload
+      swap1
+      dup2
+      dup2
+      dup5
+      add
+      mstore
+      0x00
+      swap5
+    tag_13:
+      dup3
+      dup7
+      lt
+      tag_14
+      jumpi
+      pop
+      pop
+      dup1
+      0x40
+      swap4
+      swap5
+      gt
+      tag_16
+      jumpi
+    tag_17:
+      0x1f
+      add
+      not(0x1f)
+      and
+      add
+      add
+      swap1
+      jump	// out
+    tag_16:
+      0x00
+      dup4
+      dup3
+      dup5
+      add
+      add
+      mstore
+      jump(tag_17)
+    tag_14:
+      dup6
+      dup2
+      add
+      dup3
+      add
+      mload
+      dup5
+      dup8
+      add
+      0x40
+      add
+      mstore
+      swap5
+      dup2
+      add
+      swap5
+      jump(tag_13)
+    stop
+
+    sub_0: assembly {
+            /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
+          0x80
+          dup1
+          0x40
+          mstore
+          jumpi(tag_6, callvalue)
+          0x1f
+          bytecodeSize
+          codesize
+          dup2
+          swap1
+          sub
+          swap2
+          dup3
+          add
+          not(0x1f)
+          and
+          dup4
+          add
+          swap2
+          sub(shl(0x40, 0x01), 0x01)
+          dup4
+          gt
+          dup5
+          dup5
+          lt
+          or
+          tag_4
+          jumpi
+          dup1
+          dup5
+          swap3
+          0x20
+          swap5
+          0x40
+          mstore
+          dup4
+          codecopy
+          dup2
+          add
+          sub
+          slt
+          tag_6
+          jumpi
+          tag_8
+          swap1
+          mload
+          tag_1
+          jump	// in
+        tag_8:
+          mload(0x40)
+          dataSize(sub_0)
+          swap1
+          dup2
+          dataOffset(sub_0)
+          dup3
+          codecopy
+          return
+        tag_6:
+          pop
+          0x00
+          dup1
+          revert
+        tag_4:
+          pop
+          pop
+          pop
+          pop
+          mstore(0x00, shl(0xe0, 0x4e487b71))
+          mstore(0x04, 0x41)
+          revert(0x00, 0x24)
+            /* "viair_subobject_optimization/input.sol":76:666  constructor(uint x) {... */
+        tag_1:
+          sub(shl(0x48, 0x01), 0xbe)
+            /* "viair_subobject_optimization/input.sol":620:645  x == 0xFFFFFFFFFFFFFFFF42 */
+          eq
+            /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
+          tag_6
+          jumpi
+            /* "viair_subobject_optimization/input.sol":76:666  constructor(uint x) {... */
+          jump	// out
+        stop
+
+        sub_0: assembly {
+                /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
+              mstore(0x40, 0x80)
+              0x00
+              dup1
+              revert
+
+            auxdata: <AUXDATA REMOVED>
+        }
+    }
+
+    auxdata: <AUXDATA REMOVED>
+}
diff --git a/test/cmdlineTests/yul_optimize_runs/input.yul b/test/cmdlineTests/yul_optimize_runs/input.yul
index 07c602a4a5..6088853e60 100644
--- a/test/cmdlineTests/yul_optimize_runs/input.yul
+++ b/test/cmdlineTests/yul_optimize_runs/input.yul
@@ -1,10 +1,10 @@
 object "RunsTest1" {
     code {
         // Deploy the contract
-        datacopy(0, dataoffset("Runtime"), datasize("Runtime"))
-        return(0, datasize("Runtime"))
+        datacopy(0, dataoffset("Runtime_deployed"), datasize("Runtime_deployed"))
+        return(0, datasize("Runtime_deployed"))
     }
-    object "Runtime" {
+    object "Runtime_deployed" {
         code {
             let funcSel := shl(224, 0xabc12345)
             sstore(0, funcSel)
diff --git a/test/cmdlineTests/yul_optimize_runs/output b/test/cmdlineTests/yul_optimize_runs/output
index 357c796ee4..6f4ba83907 100644
--- a/test/cmdlineTests/yul_optimize_runs/output
+++ b/test/cmdlineTests/yul_optimize_runs/output
@@ -5,12 +5,12 @@ Pretty printed source:
 object "RunsTest1" {
     code {
         {
-            let _1 := datasize("Runtime")
-            datacopy(0, dataoffset("Runtime"), _1)
+            let _1 := datasize("Runtime_deployed")
+            datacopy(0, dataoffset("Runtime_deployed"), _1)
             return(0, _1)
         }
     }
-    object "Runtime" {
+    object "Runtime_deployed" {
         code {
             {
                 sstore(0, 0xabc1234500000000000000000000000000000000000000000000000000000000)
@@ -21,30 +21,31 @@ object "RunsTest1" {
 
 
 Binary representation:
-600c80600c6000396000f3fe63abc1234560e01b60005500
+602580600c6000396000f3fe7fabc123450000000000000000000000000000000000000000000000000000000060005500
 
 Text representation:
-    /* "yul_optimize_runs/input.yul":106:125   */
+    /* "yul_optimize_runs/input.yul":115:143   */
   dataSize(sub_0)
-    /* "yul_optimize_runs/input.yul":83:104   */
+    /* "yul_optimize_runs/input.yul":83:113   */
   dup1
   dataOffset(sub_0)
     /* "yul_optimize_runs/input.yul":80:81   */
   0x00
-    /* "yul_optimize_runs/input.yul":71:126   */
+    /* "yul_optimize_runs/input.yul":71:144   */
   codecopy
     /* "yul_optimize_runs/input.yul":80:81   */
   0x00
-    /* "yul_optimize_runs/input.yul":135:165   */
+    /* "yul_optimize_runs/input.yul":153:192   */
   return
 stop
 
 sub_0: assembly {
-      shl(0xe0, 0xabc12345)
-        /* "yul_optimize_runs/input.yul":277:278   */
+        /* "yul_optimize_runs/input.yul":273:293   */
+      0xabc1234500000000000000000000000000000000000000000000000000000000
+        /* "yul_optimize_runs/input.yul":313:314   */
       0x00
-        /* "yul_optimize_runs/input.yul":270:288   */
+        /* "yul_optimize_runs/input.yul":306:324   */
       sstore
-        /* "yul_optimize_runs/input.yul":208:298   */
+        /* "yul_optimize_runs/input.yul":244:334   */
       stop
 }
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index ba0ca8abd8..7a05b5328b 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -26,6 +26,6 @@ contract Main {
 // compileViaYul: also
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 113610
+// gas irOptimized: 113613
 // gas legacy: 126596
 // gas legacyOptimized: 113823
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 21de2ac97e..031deb64cc 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 444029
+// gas irOptimized: 443989
 // gas legacy: 590683
 // gas legacyOptimized: 448326
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index d5e633924e..8264a93edf 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 300885
+// gas irOptimized: 300837
 // gas legacy: 428917
 // gas legacyOptimized: 298128
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index c4a65bb55a..0b94078147 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -17,7 +17,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 203963
+// gas irOptimized: 203982
 // gas legacy: 245842
 // gas legacyOptimized: 195676
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index 7ed6384182..a4796ac825 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -18,7 +18,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 204126
+// gas irOptimized: 204145
 // gas legacy: 246202
 // gas legacyOptimized: 195914
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index 462de46a78..aea318e659 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -42,7 +42,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 284283
+// gas irOptimized: 284321
 // gas legacy: 402045
 // gas legacyOptimized: 266772
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index eb9d93ee26..780cc32b83 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -22,6 +22,6 @@ contract A {
 // compileViaYul: also
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 272449
+// gas irOptimized: 272467
 // gas legacy: 422501
 // gas legacyOptimized: 287472

From b57e8564267d0aefdb8e9a71f89ccbf4dbbabd0c Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 7 Mar 2022 16:24:20 +0100
Subject: [PATCH 0449/1748] Adjust documentation.

---
 docs/yul.rst | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index e4775ee4d0..8a584db1d4 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -1124,6 +1124,11 @@ regular strings in native encoding. For code,
 
 Above, ``Block`` refers to ``Block`` in the Yul code grammar explained in the previous chapter.
 
+.. note::
+
+    An object with a name that ends in ``_deployed`` is treated as deployed code by the Yul optimizer.
+    The only consequence of this is a different gas cost heuristic in the optimizer.
+
 .. note::
 
     Data objects or sub-objects whose names contain a ``.`` can be defined
@@ -1172,17 +1177,17 @@ An example Yul Object is shown below:
 
             // now return the runtime object (the currently
             // executing code is the constructor code)
-            size := datasize("runtime")
+            size := datasize("Contract1_deployed")
             offset := allocate(size)
             // This will turn into a memory->memory copy for Ewasm and
             // a codecopy for EVM
-            datacopy(offset, dataoffset("runtime"), size)
+            datacopy(offset, dataoffset("Contract1_deployed"), size)
             return(offset, size)
         }
 
         data "Table2" hex"4123"
 
-        object "runtime" {
+        object "Contract1_deployed" {
             code {
                 function allocate(size) -> ptr {
                     ptr := mload(0x40)
@@ -1204,7 +1209,7 @@ An example Yul Object is shown below:
                 // code here ...
             }
 
-            object "runtime" {
+            object "Contract2_deployed" {
                 code {
                     // code here ...
                 }

From e0c837b33b7c72d64572d42655f7d56769bcdefd Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 7 Mar 2022 17:39:52 +0100
Subject: [PATCH 0450/1748] Remove isCreation flag from OptimiserSettings.

---
 libevmasm/Assembly.cpp                  | 9 +++------
 libevmasm/Assembly.h                    | 1 -
 libsolidity/codegen/CompilerContext.cpp | 3 +--
 libyul/AssemblyStack.cpp                | 3 +--
 test/libevmasm/Optimiser.cpp            | 3 +--
 5 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 492d434c83..6d7b97cc4a 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -411,14 +411,11 @@ map<u256, u256> const& Assembly::optimiseInternal(
 	if (m_tagReplacements)
 		return *m_tagReplacements;
 
-	assertThrow(_settings.isCreation == m_creation, OptimizerException, "Mismatching creation settings.");
-
 	// Run optimisation for sub-assemblies.
 	for (size_t subId = 0; subId < m_subs.size(); ++subId)
 	{
 		OptimiserSettings settings = _settings;
 		Assembly& sub = *m_subs[subId];
-		settings.isCreation = sub.isCreation();
 		map<u256, u256> const& subTagReplacements = sub.optimiseInternal(
 			settings,
 			JumpdestRemover::referencedTags(m_items, subId)
@@ -438,7 +435,7 @@ map<u256, u256> const& Assembly::optimiseInternal(
 				m_items,
 				_tagsReferencedFromOutside,
 				_settings.expectedExecutionsPerDeployment,
-				_settings.isCreation,
+				isCreation(),
 				_settings.evmVersion
 			}.optimise();
 
@@ -539,8 +536,8 @@ map<u256, u256> const& Assembly::optimiseInternal(
 
 	if (_settings.runConstantOptimiser)
 		ConstantOptimisationMethod::optimiseConstants(
-			_settings.isCreation,
-			_settings.isCreation ? 1 : _settings.expectedExecutionsPerDeployment,
+			isCreation(),
+			isCreation() ? 1 : _settings.expectedExecutionsPerDeployment,
 			_settings.evmVersion,
 			*this
 		);
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index 270d854803..11bc166629 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -117,7 +117,6 @@ class Assembly
 
 	struct OptimiserSettings
 	{
-		bool isCreation = false;
 		bool runInliner = false;
 		bool runJumpdestRemover = false;
 		bool runPeephole = false;
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 700f53d1f7..a01dafc911 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -572,8 +572,7 @@ void CompilerContext::updateSourceLocation()
 evmasm::Assembly::OptimiserSettings CompilerContext::translateOptimiserSettings(OptimiserSettings const& _settings)
 {
 	// Constructing it this way so that we notice changes in the fields.
-	evmasm::Assembly::OptimiserSettings asmSettings{false, false,  false, false, false, false, false, m_evmVersion, 0};
-	asmSettings.isCreation = true;
+	evmasm::Assembly::OptimiserSettings asmSettings{false,  false, false, false, false, false, m_evmVersion, 0};
 	asmSettings.runInliner = _settings.runInliner;
 	asmSettings.runJumpdestRemover = _settings.runJumpdestRemover;
 	asmSettings.runPeephole = _settings.runPeephole;
diff --git a/libyul/AssemblyStack.cpp b/libyul/AssemblyStack.cpp
index 5d0ddd81a6..3fefb9cafc 100644
--- a/libyul/AssemblyStack.cpp
+++ b/libyul/AssemblyStack.cpp
@@ -72,8 +72,7 @@ evmasm::Assembly::OptimiserSettings translateOptimiserSettings(
 )
 {
 	// Constructing it this way so that we notice changes in the fields.
-	evmasm::Assembly::OptimiserSettings asmSettings{false, false,  false, false, false, false, false, _evmVersion, 0};
-	asmSettings.isCreation = true;
+	evmasm::Assembly::OptimiserSettings asmSettings{false,  false, false, false, false, false, _evmVersion, 0};
 	asmSettings.runInliner = _settings.runInliner;
 	asmSettings.runJumpdestRemover = _settings.runJumpdestRemover;
 	asmSettings.runPeephole = _settings.runPeephole;
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index 278a7c77fd..44fbde9274 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -1278,7 +1278,6 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
 	main.append(u256(8));
 
 	Assembly::OptimiserSettings settings;
-	settings.isCreation = false;
 	settings.runInliner = false;
 	settings.runJumpdestRemover = true;
 	settings.runPeephole = true;
@@ -1287,7 +1286,7 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
 	settings.runConstantOptimiser = true;
 	settings.evmVersion = solidity::test::CommonOptions::get().evmVersion();
 	settings.expectedExecutionsPerDeployment = OptimiserSettings{}.expectedExecutionsPerDeployment;
-;
+
 	main.optimise(settings);
 
 	AssemblyItems expectationMain{

From e7a3814977c0ba0715e910068e5a0430e3b90770 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 9 Mar 2022 16:52:30 +0100
Subject: [PATCH 0451/1748] Unit test.

---
 test/libsolidity/SolidityEndToEndTest.cpp     | 28 +++++++++++++++++++
 .../SolidityExecutionFramework.cpp            |  1 +
 test/libsolidity/SolidityExecutionFramework.h |  5 ++--
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 314d4283e0..5a76a16c65 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -84,6 +84,34 @@ struct SolidityEndToEndTestExecutionFramework: public SolidityExecutionFramework
 
 BOOST_FIXTURE_TEST_SUITE(SolidityEndToEndTest, SolidityEndToEndTestExecutionFramework)
 
+BOOST_AUTO_TEST_CASE(creation_code_optimizer)
+{
+	string codeC = R"(
+		contract C {
+			constructor(uint x) {
+			if (x == 0xFFFFFFFFFFFFFFFF42)
+				revert();
+			}
+		}
+	)";
+	string codeD = R"(
+		contract D {
+			function f() public pure returns (bytes memory) {
+				return type(C).creationCode;
+			}
+		}
+	)";
+
+	m_metadataHash = CompilerStack::MetadataHash::None;
+	ALSO_VIA_YUL({
+		bytes bytecodeC = compileContract(codeC);
+		reset();
+		compileAndRun(codeC + codeD);
+		ABI_CHECK(callContractFunction("f()"), encodeArgs(0x20, bytecodeC.size()) + encode(bytecodeC, false));
+		m_doEwasmTestrun = false;
+	})
+}
+
 unsigned constexpr roundTo32(unsigned _num)
 {
 	return (_num + 31) / 32 * 32;
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index f3921613f4..7ff226a694 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -62,6 +62,7 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 	m_compiler.enableEvmBytecodeGeneration(!m_compileViaYul);
 	m_compiler.enableIRGeneration(m_compileViaYul);
 	m_compiler.setRevertStringBehaviour(m_revertStrings);
+	m_compiler.setMetadataHash(m_metadataHash);
 	if (!m_compiler.compile())
 	{
 		// The testing framework expects an exception for
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
index e0e02cf95a..202addffaf 100644
--- a/test/libsolidity/SolidityExecutionFramework.h
+++ b/test/libsolidity/SolidityExecutionFramework.h
@@ -75,11 +75,12 @@ class SolidityExecutionFramework: public solidity::test::ExecutionFramework
 	/// the latter only if it is forced.
 	static std::string addPreamble(std::string const& _sourceCode);
 protected:
-
-	solidity::frontend::CompilerStack m_compiler;
+	using CompilerStack = solidity::frontend::CompilerStack;
+	CompilerStack m_compiler;
 	bool m_compileViaYul = false;
 	bool m_compileToEwasm = false;
 	bool m_showMetadata = false;
+	CompilerStack::MetadataHash m_metadataHash = CompilerStack::MetadataHash::IPFS;
 	RevertStrings m_revertStrings = RevertStrings::Default;
 };
 

From 1b93db7863209dab8850a96bdb262cdbca688d85 Mon Sep 17 00:00:00 2001
From: kanedaaaa <samflynn19121@gmail.com>
Date: Wed, 9 Mar 2022 18:35:14 +0100
Subject: [PATCH 0452/1748] doc: improve explanation of interfaces

---
 docs/contracts/interfaces.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contracts/interfaces.rst b/docs/contracts/interfaces.rst
index a4581a15f9..cc71cf64e6 100644
--- a/docs/contracts/interfaces.rst
+++ b/docs/contracts/interfaces.rst
@@ -10,7 +10,7 @@ Interfaces are similar to abstract contracts, but they cannot have any functions
 There are further restrictions:
 
 - They cannot inherit from other contracts, but they can inherit from other interfaces.
-- All declared functions must be external.
+- All declared functions must be external in the interface, even if they are public in the contract.
 - They cannot declare a constructor.
 - They cannot declare state variables.
 - They cannot declare modifiers.

From 68bdb7f2e03a79739c8bef7dceb1a65dc6a8d0b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 28 Feb 2022 14:23:25 +0100
Subject: [PATCH 0453/1748] Disable flaky ElementFi tests

---
 test/externalTests/elementfi.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index 37d5b74104..d8d3fd6cb9 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -89,6 +89,12 @@ function elementfi_test
     # TODO: Remove when https://github.com/element-fi/elf-contracts/issues/243 is fixed.
     sed -i 's|^\s*require(_expiration - block\.timestamp < _unitSeconds);\s*$||g' contracts/ConvergentCurvePool.sol
 
+    # This test file is very flaky. There's one particular cases that fails randomly (see
+    # https://github.com/element-fi/elf-contracts/issues/240) but some others also depends on an external
+    # service which makes tests time out when that service is down.
+    # "ProviderError: Too Many Requests error received from eth-mainnet.alchemyapi.io"
+    rm test/mockERC20YearnVaultTest.ts
+
     # Several tests fail unless we use the exact versions hard-coded in package-lock.json
     #neutralize_package_lock
 

From 304c3984adc8e1b615dd7bd2626331e680b876ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Oct 2021 11:12:45 +0200
Subject: [PATCH 0454/1748] Update gnosis external test to use upstream
 directly and use Hardhat

---
 .circleci/config.yml            | 20 ++------
 test/externalTests.sh           |  1 -
 test/externalTests/gnosis-v2.sh | 81 ---------------------------------
 test/externalTests/gnosis.sh    | 38 ++++++++++------
 4 files changed, 29 insertions(+), 111 deletions(-)
 delete mode 100755 test/externalTests/gnosis-v2.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 65e7113a38..f7f2de8cbe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -513,19 +513,12 @@ defaults:
       nodejs_version: '14'
 
   - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
-      <<: *workflow_emscripten
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_gnosis
       project: gnosis
       binary_type: native
-      # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
-      nodejs_version: '12'
-  - job_native_test_ext_gnosis_v2: &job_native_test_ext_gnosis_v2
-      <<: *workflow_ubuntu2004_static
-      name: t_native_test_ext_gnosis_v2
-      project: gnosis-v2
-      binary_type: native
-      # NOTE: Tests do not start on node.js 14 ("ganache-cli exited early with code 1").
-      nodejs_version: '12'
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
   - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_zeppelin
@@ -1468,10 +1461,7 @@ workflows:
       - t_ems_ext: *job_ems_compile_ext_colony
       - t_ems_ext: *job_native_compile_ext_gnosis
 
-      # FIXME: Gnosis tests are pretty flaky right now. They often fail on CircleCI due to random ProviderError
-      # and there are also other less frequent problems. See https://github.com/gnosis/safe-contracts/issues/216.
-      #-t_ems_ext: *job_native_test_ext_gnosis
-      - t_ems_ext: *job_native_test_ext_gnosis_v2
+      - t_ems_ext: *job_native_test_ext_gnosis
       - t_ems_ext: *job_native_test_ext_zeppelin
       - t_ems_ext: *job_native_test_ext_ens
       - t_ems_ext: *job_native_test_ext_trident
@@ -1489,7 +1479,7 @@ workflows:
           requires:
             - t_ems_compile_ext_colony
             - t_native_compile_ext_gnosis
-            - t_native_test_ext_gnosis_v2
+            - t_native_test_ext_gnosis
             - t_native_test_ext_zeppelin
             - t_native_test_ext_ens
             - t_native_test_ext_trident
diff --git a/test/externalTests.sh b/test/externalTests.sh
index b3b46460bf..2c4c6f76cd 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -39,7 +39,6 @@ printTask "Running external tests..."
 
 "{$REPO_ROOT}/test/externalTests/zeppelin.sh" "$@"
 "{$REPO_ROOT}/test/externalTests/gnosis.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/gnosis-v2.sh" "$@"
 "{$REPO_ROOT}/test/externalTests/colony.sh" "$@"
 "{$REPO_ROOT}/test/externalTests/ens.sh" "$@"
 "{$REPO_ROOT}/test/externalTests/trident.sh" "$@"
diff --git a/test/externalTests/gnosis-v2.sh b/test/externalTests/gnosis-v2.sh
deleted file mode 100755
index 6b0915b6a0..0000000000
--- a/test/externalTests/gnosis-v2.sh
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# 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/>
-#
-# (c) 2020 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source test/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$2"
-SELECTED_PRESETS="$3"
-
-function compile_fn { npx truffle compile; }
-function test_fn { npm test; }
-
-function gnosis_safe_test
-{
-    local repo="https://github.com/solidity-external-tests/safe-contracts.git"
-    local ref_type=branch
-    local ref="v2_080"
-    local config_file="truffle-config.js"
-
-    local compile_only_presets=(
-        legacy-no-optimize        # Compiles but migrations run out of gas: "Error: while migrating GnosisSafe: Returned error: base fee exceeds gas limit"
-    )
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
-        ir-optimize-evm+yul
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
-
-    sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
-    sed -i -E 's|"@gnosis.pm/util-contracts": "[^"]+"|"@gnosis.pm/util-contracts": "github:solidity-external-tests/util-contracts#solc-7_080"|g' package.json
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")"
-    npm install --package-lock
-    npm install eth-gas-reporter
-
-    replace_version_pragmas
-    [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
-
-    for preset in $SELECTED_PRESETS; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
-        store_benchmark_report truffle gnosis2 "$repo" "$preset"
-    done
-}
-
-external_test Gnosis-Safe-V2 gnosis_safe_test
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 82d1892f2d..ec09257fb1 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -31,24 +31,26 @@ BINARY_TYPE="$1"
 BINARY_PATH="$2"
 SELECTED_PRESETS="$3"
 
-function compile_fn { npx truffle compile; }
+function compile_fn { npm run build; }
 function test_fn { npm test; }
 
 function gnosis_safe_test
 {
-    local repo="https://github.com/solidity-external-tests/safe-contracts.git"
+    local repo="https://github.com/gnosis/safe-contracts.git"
     local ref_type=branch
-    local ref="development_080"
-    local config_file="truffle-config.js"
+    local ref=main
+    local config_file="hardhat.config.ts"
+    local config_var=userConfig
 
-    local compile_only_presets=()
+    local compile_only_presets=(
+        ir-optimize-evm+yul        # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
+    )
     local settings_presets=(
         "${compile_only_presets[@]}"
         #ir-no-optimize            # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
         #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
-        ir-optimize-evm+yul
-        #legacy-no-optimize        # Compilation fails with "Stack too deep" error
-        #legacy-optimize-evm-only  # Compilation fails with "Stack too deep" error
+        legacy-no-optimize
+        legacy-optimize-evm-only
         legacy-optimize-evm+yul
     )
 
@@ -59,20 +61,28 @@ function gnosis_safe_test
     download_project "$repo" "$ref_type" "$ref" "$DIR"
     [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
 
-    sed -i 's|github:gnosis/mock-contract#sol_0_5_0|github:solidity-external-tests/mock-contract#master_080|g' package.json
+    # NOTE: The patterns below intentionally have hard-coded versions.
+    # When the upstream updates them, there's a chance we can just remove the regex.
+    sed -i 's|"@gnosis\.pm/mock-contract": "\^4\.0\.0"|"@gnosis.pm/mock-contract": "github:solidity-external-tests/mock-contract#master_080"|g' package.json
+    sed -i 's|"@openzeppelin/contracts": "\^3\.4\.0"|"@openzeppelin/contracts": "^4.0.0"|g' package.json
+
+    # Disable two tests failing due to Hardhat's heuristics not yet updated to handle solc 0.8.10.
+    # TODO: Remove this when Hardhat implements them (https://github.com/nomiclabs/hardhat/issues/2051).
+    sed -i "s|\(it\)\(('should revert if called directly', async () => {\)|\1.skip\2|g" test/handlers/CompatibilityFallbackHandler.spec.ts
 
     neutralize_package_lock
     neutralize_package_json_hooks
-    force_truffle_compiler_settings "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$(first_word "$SELECTED_PRESETS")"
-    npm install --package-lock
-    npm install eth-gas-reporter
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
+    npm install
+    npm install hardhat-gas-reporter
 
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
 
     for preset in $SELECTED_PRESETS; do
-        truffle_run_test "$config_file" "$BINARY_TYPE" "${DIR}/solc/dist" "$preset" "${compile_only_presets[*]}" compile_fn test_fn
-        store_benchmark_report truffle gnosis "$repo" "$preset"
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat gnosis "$repo" "$preset"
     done
 }
 

From 438c08248838bf14dd6b7a5b01cfeccee6b1ecae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 18 Jan 2022 15:35:35 +0100
Subject: [PATCH 0455/1748] CI: Remove the compile-only run for Gnosis

---
 .circleci/config.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f7f2de8cbe..65adf9ee3f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -504,13 +504,6 @@ defaults:
       binary_type: solcjs
       compile_only: 1
       nodejs_version: '14'
-  - job_native_compile_ext_gnosis: &job_native_compile_ext_gnosis
-      <<: *workflow_ubuntu2004_static
-      name: t_native_compile_ext_gnosis
-      project: gnosis
-      binary_type: native
-      compile_only: 1
-      nodejs_version: '14'
 
   - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
       <<: *workflow_ubuntu2004_static
@@ -1459,7 +1452,6 @@ workflows:
       - t_ems_ext_hardhat: *workflow_emscripten
 
       - t_ems_ext: *job_ems_compile_ext_colony
-      - t_ems_ext: *job_native_compile_ext_gnosis
 
       - t_ems_ext: *job_native_test_ext_gnosis
       - t_ems_ext: *job_native_test_ext_zeppelin
@@ -1478,7 +1470,6 @@ workflows:
           <<: *workflow_trigger_on_tags
           requires:
             - t_ems_compile_ext_colony
-            - t_native_compile_ext_gnosis
             - t_native_test_ext_gnosis
             - t_native_test_ext_zeppelin
             - t_native_test_ext_ens

From 9ef600e5726f67f802f3aa4bec2bba937d01b4ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 9 Mar 2022 20:35:46 +0100
Subject: [PATCH 0456/1748] euler: Override Hardhat test timeout

---
 test/externalTests/common.sh | 24 +++++++++++++++++++++++-
 test/externalTests/euler.sh  |  2 ++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index e4e1e3adfd..9c68c88288 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -233,7 +233,6 @@ function force_truffle_compiler_settings
 function name_hardhat_default_export
 {
     local config_file="$1"
-    local config_var_name="$2"
 
     local import="import {HardhatUserConfig} from 'hardhat/types';"
     local config="const config: HardhatUserConfig = {"
@@ -241,6 +240,29 @@ function name_hardhat_default_export
     echo "export default config;" >> "$config_file"
 }
 
+function force_hardhat_timeout
+{
+    local config_file="$1"
+    local config_var_name="$2"
+    local new_timeout="$3"
+
+    printLog "Configuring Hardhat..."
+    echo "-------------------------------------"
+    echo "Timeout: ${new_timeout}"
+    echo "-------------------------------------"
+
+    if [[ $config_file == *\.js ]]; then
+        [[ $config_var_name == "" ]] || assertFail
+        echo "module.exports.mocha = module.exports.mocha || {timeout: ${new_timeout}}"
+        echo "module.exports.mocha.timeout =  ${new_timeout}"
+    else
+        [[ $config_file == *\.ts ]] || assertFail
+        [[ $config_var_name != "" ]] || assertFail
+        echo "${config_var_name}.mocha = ${config_var_name}.mocha ?? {timeout: ${new_timeout}};"
+        echo "${config_var_name}.mocha!.timeout = ${new_timeout}"
+    fi >> "$config_file"
+}
+
 function force_hardhat_compiler_binary
 {
     local config_file="$1"
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index b3b505051c..6a73f00e58 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -63,6 +63,8 @@ function euler_test
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
     force_hardhat_unlimited_contract_size "$config_file"
+    # Workaround for the timeout that's too short for unoptimized code (https://github.com/ethereum/solidity/pull/12765)
+    force_hardhat_timeout "$config_file" "" 100000
     npm install
 
     replace_version_pragmas

From 6ab31420afab093b5d81a2caa1b7de18d2619132 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Mar 2022 09:51:20 +0100
Subject: [PATCH 0457/1748] Remove unneeded header files.

---
 libyul/optimiser/StructuralSimplifier.cpp | 48 +++++++++++------------
 libyul/optimiser/StructuralSimplifier.h   |  4 --
 test/libyul/KnowledgeBaseTest.cpp         |  1 -
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/libyul/optimiser/StructuralSimplifier.cpp b/libyul/optimiser/StructuralSimplifier.cpp
index 5b1ae2550a..ca8f942392 100644
--- a/libyul/optimiser/StructuralSimplifier.cpp
+++ b/libyul/optimiser/StructuralSimplifier.cpp
@@ -55,6 +55,30 @@ OptionalStatements replaceConstArgSwitch(Switch& _switchStmt, u256 const& _const
 		return optional<vector<Statement>>{vector<Statement>{}};
 }
 
+optional<u256> hasLiteralValue(Expression const& _expression)
+{
+	if (holds_alternative<Literal>(_expression))
+		return valueOfLiteral(std::get<Literal>(_expression));
+	else
+		return std::optional<u256>();
+}
+
+bool expressionAlwaysTrue(Expression const& _expression)
+{
+	if (std::optional<u256> value = hasLiteralValue(_expression))
+		return *value != 0;
+	else
+		return false;
+}
+
+bool expressionAlwaysFalse(Expression const& _expression)
+{
+	if (std::optional<u256> value = hasLiteralValue(_expression))
+		return *value == 0;
+	else
+		return false;
+}
+
 }
 
 void StructuralSimplifier::run(OptimiserStepContext&, Block& _ast)
@@ -103,27 +127,3 @@ void StructuralSimplifier::simplify(std::vector<yul::Statement>& _statements)
 		}
 	);
 }
-
-bool StructuralSimplifier::expressionAlwaysTrue(Expression const& _expression)
-{
-	if (std::optional<u256> value = hasLiteralValue(_expression))
-		return *value != 0;
-	else
-		return false;
-}
-
-bool StructuralSimplifier::expressionAlwaysFalse(Expression const& _expression)
-{
-	if (std::optional<u256> value = hasLiteralValue(_expression))
-		return *value == 0;
-	else
-		return false;
-}
-
-std::optional<u256> StructuralSimplifier::hasLiteralValue(Expression const& _expression) const
-{
-	if (holds_alternative<Literal>(_expression))
-		return valueOfLiteral(std::get<Literal>(_expression));
-	else
-		return std::optional<u256>();
-}
diff --git a/libyul/optimiser/StructuralSimplifier.h b/libyul/optimiser/StructuralSimplifier.h
index 3fd59efde4..734b2e53af 100644
--- a/libyul/optimiser/StructuralSimplifier.h
+++ b/libyul/optimiser/StructuralSimplifier.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/DataFlowAnalyzer.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libsolutil/Common.h>
 
@@ -50,9 +49,6 @@ class StructuralSimplifier: public ASTModifier
 	StructuralSimplifier() = default;
 
 	void simplify(std::vector<Statement>& _statements);
-	bool expressionAlwaysTrue(Expression const& _expression);
-	bool expressionAlwaysFalse(Expression const& _expression);
-	std::optional<u256> hasLiteralValue(Expression const& _expression) const;
 };
 
 }
diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp
index 03cc4cd8d5..ac48f962ff 100644
--- a/test/libyul/KnowledgeBaseTest.cpp
+++ b/test/libyul/KnowledgeBaseTest.cpp
@@ -25,7 +25,6 @@
 #include <libyul/Object.h>
 #include <libyul/optimiser/KnowledgeBase.h>
 #include <libyul/optimiser/SSAValueTracker.h>
-#include <libyul/optimiser/DataFlowAnalyzer.h>
 #include <libyul/optimiser/NameDispenser.h>
 #include <libyul/optimiser/CommonSubexpressionEliminator.h>
 #include <libyul/backends/evm/EVMDialect.h>

From e9f3f9361ddf1526be166e1f8ef2a5a535beec07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 1 Mar 2022 17:48:46 +0100
Subject: [PATCH 0458/1748] Re-enable running tests in external tests via IR in
 cases where they don't pass due to Hardhat heuristics

---
 test/externalTests/elementfi.sh | 12 +++++++++---
 test/externalTests/gnosis.sh    | 10 +++++++---
 test/externalTests/prb-math.sh  | 25 ++++++++++++++++++++++---
 test/externalTests/zeppelin.sh  | 18 +++++++++++++++---
 4 files changed, 53 insertions(+), 12 deletions(-)

diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index d8d3fd6cb9..74ed93a5c2 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -42,13 +42,12 @@ function elementfi_test
     local config_file="hardhat.config.ts"
     local config_var=config
 
-    local compile_only_presets=(
-        ir-optimize-evm+yul       # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
-    )
+    local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
         #ir-no-optimize           # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
@@ -89,6 +88,13 @@ function elementfi_test
     # TODO: Remove when https://github.com/element-fi/elf-contracts/issues/243 is fixed.
     sed -i 's|^\s*require(_expiration - block\.timestamp < _unitSeconds);\s*$||g' contracts/ConvergentCurvePool.sol
 
+    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
+    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    sed -i 's|it(\("fails to withdraw more shares than in balance"\)|it.skip(\1|g' test/compoundAssetProxyTest.ts
+    sed -i 's|it(\("should prevent withdrawal of Principal Tokens and Interest Tokens before the tranche expires "\)|it.skip(\1|g' test/trancheTest.ts
+    sed -i 's|it(\("should prevent withdrawal of more Principal Tokens and Interest Tokens than the user has"\)|it.skip(\1|g' test/trancheTest.ts
+
     # This test file is very flaky. There's one particular cases that fails randomly (see
     # https://github.com/element-fi/elf-contracts/issues/240) but some others also depends on an external
     # service which makes tests time out when that service is down.
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index ec09257fb1..ccfc6cf5c1 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -42,13 +42,12 @@ function gnosis_safe_test
     local config_file="hardhat.config.ts"
     local config_var=userConfig
 
-    local compile_only_presets=(
-        ir-optimize-evm+yul        # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
-    )
+    local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
         #ir-no-optimize            # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
         #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
@@ -70,6 +69,11 @@ function gnosis_safe_test
     # TODO: Remove this when Hardhat implements them (https://github.com/nomiclabs/hardhat/issues/2051).
     sed -i "s|\(it\)\(('should revert if called directly', async () => {\)|\1.skip\2|g" test/handlers/CompatibilityFallbackHandler.spec.ts
 
+    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
+    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    sed -i "s|\(it\)\(('should not allow to call setup on singleton'\)|\1.skip\2|g" test/core/GnosisSafe.Setup.spec.ts
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
index 01bdb76f18..1d0a0dd86a 100755
--- a/test/externalTests/prb-math.sh
+++ b/test/externalTests/prb-math.sh
@@ -43,13 +43,12 @@ function prb_math_test
     local config_file="hardhat.config.ts"
     local config_var="config"
 
-    local compile_only_presets=(
-        ir-optimize-evm+yul       # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
-    )
+    local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
         #ir-no-optimize           # Compilation fails with "YulException: Variable var_y_1960 is 8 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_y_1960 is 8 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
         legacy-no-optimize
@@ -68,6 +67,26 @@ function prb_math_test
     # yarn.lock. Remove the config to restore Yarn 1.x.
     rm .yarnrc.yml
 
+    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
+    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    pushd test/contracts/prbMathUd60x18/pure/
+    sed -i 's|context(\("when the sum overflows"\)|context.skip(\1|g' add.test.ts
+    sed -i 's|context(\("when the sum does not overflow"\)|context.skip(\1|g' add.test.ts
+    sed -i 's|context(\("when both operands are zero"\)|context.skip(\1|g' avg.test.ts
+    sed -i 's|context(\("when one operand is zero and the other is not zero"\)|context.skip(\1|g' avg.test.ts
+    sed -i 's|context(\("when the denominator is zero"\)|context.skip(\1|g' div.test.ts
+    sed -i 's|context(\("when x is zero"\)|context.skip(\1|g' inv.test.ts
+    popd
+    pushd test/contracts/prbMathSd59x18/pure/
+    sed -i 's|context(\("when the sum overflows"\)|context.skip(\1|g' add.test.ts
+    sed -i 's|context(\("when the sum underflows"\)|context.skip(\1|g' add.test.ts
+    sed -i 's|context(\("when the denominator is zero"\)|context.skip(\1|g' div.test.ts
+    sed -i 's|context(\("when x is zero"\)|context.skip(\1|g' inv.test.ts
+    sed -i 's|context(\("when the difference underflows"\)|context.skip(\1|g' sub.test.ts
+    sed -i 's|context(\("when the difference overflows"\)|context.skip(\1|g' sub.test.ts
+    popd
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 4094c69364..ab79a87759 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -41,13 +41,12 @@ function zeppelin_test
     local ref="master"
     local config_file="hardhat.config.js"
 
-    local compile_only_presets=(
-        ir-optimize-evm+yul       # Compiles but tests fail. See https://github.com/nomiclabs/hardhat/issues/2115
-    )
+    local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
         #ir-no-optimize           # Compilation fails with "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
@@ -59,6 +58,19 @@ function zeppelin_test
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$ref_type" "$ref" "$DIR"
 
+    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
+    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    pushd test/utils/
+    sed -i "s|it(\('reverts \)|it.skip(\1|g" math/SafeMath.test.js
+    sed -i "s|it(\('reverts \)|it.skip(\1|g" math/SignedSafeMath.test.js
+    sed -i "s|it(\('reverts \)|it.skip(\1|g" structs/EnumerableSet.behavior.js
+    popd
+
+    # In some cases Hardhat does not detect revert reasons properly via IR.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    sed -i "s|it(\('reverts if the current value is 0'\)|it.skip(\1|g" test/utils/Counters.test.js
+
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"

From b3fe042884368e8ce4be04cb9c7693568bed570d Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 7 Mar 2022 19:13:35 +0100
Subject: [PATCH 0459/1748] Optimize eq iszero jumpi to xor jumpi and remove
 double jump.

---
 Changelog.md                                  |  1 +
 libevmasm/PeepholeOptimiser.cpp               | 61 ++++++++++++++++++-
 test/cmdlineTests/optimizer_user_yul/output   |  5 +-
 .../abiEncoderV1/abi_decode_v2_storage.sol    |  4 +-
 .../abi_encode_calldata_slice.sol             |  8 +--
 .../abi_encode_calldata_slice.sol             |  8 +--
 .../abiEncoderV2/calldata_array.sol           |  4 +-
 .../abi_decode_simple_storage.sol             |  4 +-
 .../arrays_complex_from_and_to_storage.sol    |  2 +-
 .../array/byte_array_storage_layout.sol       |  4 +-
 .../array/byte_array_transitional_2.sol       |  6 +-
 .../array/bytes_length_member.sol             |  4 +-
 .../copying/array_copy_calldata_storage.sol   |  2 +-
 .../copying/array_copy_different_packing.sol  |  6 +-
 .../copying/array_copy_including_array.sol    | 10 +--
 .../array_copy_storage_storage_struct.sol     |  2 +-
 .../copying/array_copy_target_leftover.sol    |  4 +-
 .../copying/array_copy_target_simple.sol      |  4 +-
 .../copying/array_copy_target_simple_2.sol    |  4 +-
 ...on_external_storage_to_storage_dynamic.sol |  4 +-
 ...o_storage_dynamic_different_mutability.sol |  4 +-
 .../array_of_struct_calldata_to_storage.sol   |  2 +-
 .../array/copying/bytes_inside_mappings.sol   |  8 +--
 .../copying/bytes_storage_to_storage.sol      | 20 +++---
 .../copy_byte_array_in_struct_to_storage.sol  |  8 +--
 .../copying/copy_byte_array_to_storage.sol    |  4 +-
 .../copy_function_internal_storage_array.sol  |  2 +-
 .../array/copying/copy_removes_bytes_data.sol |  4 +-
 .../copying/copying_bytes_multiassign.sol     |  4 +-
 .../memory_dyn_2d_bytes_to_storage.sol        |  4 +-
 .../array/copying/storage_memory_nested.sol   |  4 +-
 .../copying/storage_memory_nested_bytes.sol   |  4 +-
 .../storage_memory_nested_from_pointer.sol    |  4 +-
 .../copying/storage_memory_packed_dyn.sol     |  4 +-
 .../array/delete/bytes_delete_element.sol     |  4 +-
 .../array/dynamic_array_cleanup.sol           |  4 +-
 .../array/fixed_array_cleanup.sol             |  4 +-
 .../array/fixed_arrays_as_return_type.sol     |  6 +-
 .../array/fixed_arrays_in_constructors.sol    |  2 +-
 .../array/function_array_cross_calls.sol      |  6 +-
 .../array/pop/array_pop_array_transition.sol  |  6 +-
 .../array/pop/array_pop_uint16_transition.sol |  4 +-
 .../array/pop/array_pop_uint24_transition.sol |  4 +-
 .../array/pop/byte_array_pop_copy_long.sol    |  4 +-
 .../pop/byte_array_pop_long_storage_empty.sol |  4 +-
 ...ray_pop_long_storage_empty_garbage_ref.sol |  4 +-
 .../array/pop/byte_array_pop_masking_long.sol |  4 +-
 .../push/array_push_nested_from_calldata.sol  |  2 +-
 .../push/array_push_struct_from_calldata.sol  |  2 +-
 .../array/push/byte_array_push_transition.sol |  6 +-
 .../array/push/nested_bytes_push.sol          |  4 +-
 .../array/push/push_no_args_2d.sol            |  6 +-
 .../array/push/push_no_args_bytes.sol         |  4 +-
 .../copy_from_calldata_removes_bytes_data.sol |  6 +-
 .../constructor/arrays_in_constructors.sol    |  2 +-
 .../bytes_in_constructors_packer.sol          |  6 +-
 .../bytes_in_constructors_unpacker.sol        |  4 +-
 .../constructor_arguments_external.sol        |  2 +-
 .../constructor_static_array_argument.sol     |  2 +-
 .../constructor/no_callvalue_check.sol        |  2 +-
 .../constructor_inheritance_init_order.sol    |  2 +-
 .../constructor_inheritance_init_order_2.sol  |  2 +-
 .../semanticTests/constructor_with_params.sol |  2 +-
 .../constructor_with_params_inheritance.sol   |  2 +-
 .../events/event_emit_from_other_contract.sol |  2 +-
 .../events/event_indexed_string.sol           |  4 +-
 .../externalContracts/FixedFeeRegistrar.sol   |  6 +-
 .../externalContracts/base64.sol              | 12 ++--
 .../externalContracts/deposit_contract.sol    | 22 +++----
 .../externalContracts/prbmath_signed.sol      |  6 +-
 .../externalContracts/prbmath_unsigned.sol    |  6 +-
 .../externalContracts/ramanujan_pi.sol        |  6 +-
 .../semanticTests/externalContracts/snark.sol |  2 +-
 .../externalContracts/strings.sol             | 12 ++--
 .../external_call_to_nonexisting.sol          |  6 +-
 ...ernal_call_to_nonexisting_debugstrings.sol |  6 +-
 .../functionCall/failed_create.sol            |  6 +-
 .../functionCall/gas_and_value_basic.sol      |  2 +-
 .../gas_and_value_brace_syntax.sol            |  2 +-
 .../mapping_array_internal_argument.sol       |  2 +-
 .../inheritance/value_for_constructor.sol     |  2 +-
 .../balance_other_contract.sol                |  2 +-
 .../libraries/internal_types_in_library.sol   |  6 +-
 .../semanticTests/state/blockhash_basic.sol   |  2 +-
 ...ta_struct_with_nested_array_to_storage.sol |  2 +-
 .../copy_struct_array_from_storage.sol        |  2 +-
 ...truct_containing_bytes_copy_and_delete.sol |  4 +-
 .../semanticTests/structs/struct_copy.sol     |  2 +-
 .../userDefinedValueType/calldata.sol         |  8 +--
 .../userDefinedValueType/erc20.sol            |  4 +-
 .../semanticTests/various/address_code.sol    |  4 +-
 .../various/destructuring_assignment.sol      |  6 +-
 .../semanticTests/various/erc20.sol           |  4 +-
 .../skip_dynamic_types_for_structs.sol        |  4 +-
 .../semanticTests/various/value_complex.sol   |  2 +-
 .../semanticTests/various/value_insane.sol    |  2 +-
 .../viaYul/array_memory_index_access.sol      |  6 +-
 .../viaYul/array_storage_index_access.sol     | 28 ++++-----
 .../array_storage_index_zeroed_test.sol       | 24 ++++----
 .../viaYul/array_storage_push_empty.sol       |  8 +--
 .../viaYul/copy_struct_invalid_ir_bug.sol     |  6 +-
 101 files changed, 312 insertions(+), 253 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 63588731fa..1b512d3e95 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 
 Compiler Features:
 * JSON-AST: Added selector field for errors and events.
+ * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump.
 
 Bugfixes:
  * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``.
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
index b04c2158ce..31fb11f6f0 100644
--- a/libevmasm/PeepholeOptimiser.cpp
+++ b/libevmasm/PeepholeOptimiser.cpp
@@ -233,6 +233,65 @@ struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod<IsZeroIsZeroJumpI>
 	}
 };
 
+struct EqIsZeroJumpI: SimplePeepholeOptimizerMethod<EqIsZeroJumpI>
+{
+	static size_t applySimple(
+		AssemblyItem const& _eq,
+		AssemblyItem const& _iszero,
+		AssemblyItem const& _pushTag,
+		AssemblyItem const& _jumpi,
+		std::back_insert_iterator<AssemblyItems> _out
+	)
+	{
+		if (
+			_eq == Instruction::EQ &&
+			_iszero == Instruction::ISZERO &&
+			_pushTag.type() == PushTag &&
+			_jumpi == Instruction::JUMPI
+		)
+		{
+			*_out = AssemblyItem(Instruction::SUB, _eq.location());
+			*_out = _pushTag;
+			*_out = _jumpi;
+			return true;
+		}
+		else
+			return false;
+	}
+};
+
+// push_tag_1 jumpi push_tag_2 jump tag_1: -> iszero push_tag_2 jumpi tag_1:
+struct DoubleJump: SimplePeepholeOptimizerMethod<DoubleJump>
+{
+	static size_t applySimple(
+		AssemblyItem const& _pushTag1,
+		AssemblyItem const& _jumpi,
+		AssemblyItem const& _pushTag2,
+		AssemblyItem const& _jump,
+		AssemblyItem const& _tag1,
+		std::back_insert_iterator<AssemblyItems> _out
+	)
+	{
+		if (
+			_pushTag1.type() == PushTag &&
+			_jumpi == Instruction::JUMPI &&
+			_pushTag2.type() == PushTag &&
+			_jump == Instruction::JUMP &&
+			_tag1.type() == Tag &&
+			_pushTag1.data() == _tag1.data()
+		)
+		{
+			*_out = AssemblyItem(Instruction::ISZERO, _jumpi.location());
+			*_out = _pushTag2;
+			*_out = _jumpi;
+			*_out = _tag1;
+			return true;
+		}
+		else
+			return false;
+	}
+};
+
 struct JumpToNext: SimplePeepholeOptimizerMethod<JumpToNext>
 {
 	static size_t applySimple(
@@ -372,7 +431,7 @@ bool PeepholeOptimiser::optimise()
 		applyMethods(
 			state,
 			PushPop(), OpPop(), DoublePush(), DoubleSwap(), CommutativeSwap(), SwapComparison(),
-			DupSwap(), IsZeroIsZeroJumpI(), JumpToNext(), UnreachableCode(),
+			DupSwap(), IsZeroIsZeroJumpI(), EqIsZeroJumpI(), DoubleJump(), JumpToNext(), UnreachableCode(),
 			TagConjunctions(), TruthyAnd(), Identity()
 		);
 	if (m_optimisedItems.size() < m_items.size() || (
diff --git a/test/cmdlineTests/optimizer_user_yul/output b/test/cmdlineTests/optimizer_user_yul/output
index f6e7705c79..689e82ddb4 100644
--- a/test/cmdlineTests/optimizer_user_yul/output
+++ b/test/cmdlineTests/optimizer_user_yul/output
@@ -58,10 +58,9 @@ tag_6:
     /* "optimizer_user_yul/input.sol":384:392  sload(5) */
   dup1
     /* "optimizer_user_yul/input.sol":376:509  for { } sload(5) { } {... */
-  tag_8
+  iszero
+  tag_6
   jumpi
-  jump(tag_6)
-tag_8:
     /* "optimizer_user_yul/input.sol":380:383  { } */
   pop
     /* "optimizer_user_yul/input.sol":340:513  {... */
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index 06f9bcbbfc..302e878d14 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
@@ -25,5 +25,5 @@ contract C {
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
 // gas irOptimized: 203312
-// gas legacy: 206084
-// gas legacyOptimized: 203068
+// gas legacy: 206075
+// gas legacyOptimized: 203059
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index c386cf3e84..5c7cc1cd5e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -61,9 +61,9 @@ contract C {
 // ----
 // test_bytes() ->
 // gas irOptimized: 371919
-// gas legacy: 418955
-// gas legacyOptimized: 326783
+// gas legacy: 416585
+// gas legacyOptimized: 322043
 // test_uint256() ->
 // gas irOptimized: 523001
-// gas legacy: 586784
-// gas legacyOptimized: 451529
+// gas legacy: 583100
+// gas legacyOptimized: 444161
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 9deed97f1d..6c63366899 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -62,9 +62,9 @@ contract C {
 // ----
 // test_bytes() ->
 // gas irOptimized: 371919
-// gas legacy: 418955
-// gas legacyOptimized: 326783
+// gas legacy: 416585
+// gas legacyOptimized: 322043
 // test_uint256() ->
 // gas irOptimized: 523001
-// gas legacy: 586784
-// gas legacyOptimized: 451529
+// gas legacy: 583100
+// gas legacyOptimized: 444161
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index cf5958d456..8f42fe5f74 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -22,5 +22,5 @@ contract C {
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
 // gas irOptimized: 171842
-// gas legacy: 141644
-// gas legacyOptimized: 121532
+// gas legacy: 140672
+// gas legacyOptimized: 119588
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index b6c6ad5f03..027ae4e169 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -12,5 +12,5 @@ contract C {
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
 // gas irOptimized: 135918
-// gas legacy: 137190
-// gas legacyOptimized: 136082
+// gas legacy: 137181
+// gas legacyOptimized: 136073
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index 7a2a06a2e6..7a6602f9df 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -14,7 +14,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 189871
+// gas irOptimized: 189817
 // gas legacy: 211149
 // gas legacyOptimized: 206054
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
index 2c238a54b0..b176c7e866 100644
--- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
@@ -48,8 +48,8 @@ contract c {
 // storageEmpty -> 0
 // test_long() -> 67
 // gas irOptimized: 89148
-// gas legacy: 103590
-// gas legacyOptimized: 101044
+// gas legacy: 103039
+// gas legacyOptimized: 100493
 // storageEmpty -> 0
 // test_pop() -> 1780731860627700044960722568376592200742329637303199754547598369979433020
 // gas legacy: 61930
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index 31879057a7..76dce6a184 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -19,6 +19,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0
-// gas irOptimized: 158143
-// gas legacy: 189715
-// gas legacyOptimized: 184472
+// gas irOptimized: 157951
+// gas legacy: 188576
+// gas legacyOptimized: 183333
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index aaf990ef68..284c1b7099 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -16,6 +16,6 @@ contract c {
 // getLength() -> 0
 // set(): 1, 2 -> true
 // gas irOptimized: 110439
-// gas legacy: 110726
-// gas legacyOptimized: 110567
+// gas legacy: 110723
+// gas legacyOptimized: 110564
 // getLength() -> 68
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
index 6c876286b5..f80da35008 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -22,7 +22,7 @@ contract c {
 // compileViaYul: also
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
-// gas irOptimized: 650647
+// gas irOptimized: 650608
 // gas legacy: 694515
 // gas legacyOptimized: 694013
 // retrieve() -> 9, 28, 9, 28, 4, 3, 32
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 81607a2643..6d84d1ecd1 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -21,6 +21,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 212571
-// gas legacy: 221883
-// gas legacyOptimized: 220734
+// gas irOptimized: 212568
+// gas legacy: 221856
+// gas legacyOptimized: 220680
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index 1c030debaf..65dfc65ab7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -37,12 +37,12 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x02000202
-// gas irOptimized: 4652058
-// gas legacy: 4578341
-// gas legacyOptimized: 4548354
+// gas irOptimized: 4652050
+// gas legacy: 4578320
+// gas legacyOptimized: 4548312
 // storageEmpty -> 1
 // clear() -> 0, 0
 // gas irOptimized: 4483175
-// gas legacy: 4410769
-// gas legacyOptimized: 4382531
+// gas legacy: 4410748
+// gas legacyOptimized: 4382489
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
index db26b4d472..676736dc11 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
@@ -19,7 +19,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 4, 5
-// gas irOptimized: 238826
+// gas irOptimized: 238799
 // gas legacy: 238736
 // gas legacyOptimized: 237159
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index 1daa061a52..5325e9cdfa 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -21,5 +21,5 @@ contract c {
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
 // gas irOptimized: 129167
-// gas legacy: 186406
-// gas legacyOptimized: 166126
+// gas legacy: 186184
+// gas legacyOptimized: 165682
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index c87f70244c..74cd2dc793 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -23,5 +23,5 @@ contract c {
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
 // gas irOptimized: 294772
-// gas legacy: 303653
-// gas legacyOptimized: 301999
+// gas legacy: 303626
+// gas legacyOptimized: 301945
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index c39f802757..5bf1209946 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -23,5 +23,5 @@ contract c {
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
 // gas irOptimized: 273963
-// gas legacy: 276381
-// gas legacyOptimized: 275453
+// gas legacy: 276360
+// gas legacyOptimized: 275411
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
index d872534cdc..e13c15cabf 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
@@ -48,6 +48,6 @@ contract C {
 // ----
 // copyExternalStorageArrayOfFunctionType() -> true
 // gas irOptimized: 104669
-// gas legacy: 108725
-// gas legacyOptimized: 102441
+// gas legacy: 108722
+// gas legacyOptimized: 102438
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
index 71399a281e..7f746c41a8 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -51,7 +51,7 @@ contract C {
 // ----
 // copyExternalStorageArraysOfFunctionType() -> true
 // gas irOptimized: 104342
-// gas legacy: 108462
-// gas legacyOptimized: 102174
+// gas legacy: 108459
+// gas legacyOptimized: 102171
 // copyInternalArrayOfFunctionType() -> true
 // gas legacy: 104178
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
index b3d950ffa8..e8d28e28b7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
@@ -17,4 +17,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
-// gas irOptimized: 121048
+// gas irOptimized: 121021
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
index ae2698551a..26ad58f4cc 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -8,12 +8,12 @@ contract c {
 // ----
 // set(uint256): 1, 2 -> true
 // gas irOptimized: 110604
-// gas legacy: 111091
-// gas legacyOptimized: 110736
+// gas legacy: 111088
+// gas legacyOptimized: 110733
 // set(uint256): 2, 2, 3, 4, 5 -> true
 // gas irOptimized: 177564
-// gas legacy: 178021
-// gas legacyOptimized: 177666
+// gas legacy: 178018
+// gas legacyOptimized: 177663
 // storageEmpty -> 0
 // copy(uint256,uint256): 1, 2 -> true
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 87974f053a..9c2e3b28e2 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -20,24 +20,24 @@ contract c {
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
 // gas irOptimized: 121741
-// gas legacy: 124364
-// gas legacyOptimized: 119898
+// gas legacy: 123884
+// gas legacyOptimized: 119139
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
 // gas irOptimized: 130733
-// gas legacy: 135431
-// gas legacyOptimized: 130829
+// gas legacy: 134936
+// gas legacyOptimized: 130046
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
 // gas irOptimized: 137732
-// gas legacy: 142238
-// gas legacyOptimized: 137518
+// gas legacy: 141728
+// gas legacyOptimized: 136711
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
 // gas irOptimized: 152352
-// gas legacy: 160728
-// gas legacyOptimized: 152168
+// gas legacy: 159768
+// gas legacyOptimized: 150641
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
 // gas irOptimized: 406089
-// gas legacy: 423017
-// gas legacyOptimized: 406021
+// gas legacy: 421067
+// gas legacyOptimized: 402910
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index 72a837d1b0..d17978bf86 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -38,11 +38,11 @@ contract C {
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
 // gas irOptimized: 179899
-// gas legacy: 180694
-// gas legacyOptimized: 180088
+// gas legacy: 180676
+// gas legacyOptimized: 180070
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
 // gas irOptimized: 107274
-// gas legacy: 107895
-// gas legacyOptimized: 107254
+// gas legacy: 107877
+// gas legacyOptimized: 107236
 // h() -> 0x40, 0x60, 0x00, 0x00
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index b73f3dc448..87c2382066 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -49,5 +49,5 @@ contract C {
 // ----
 // f() -> 0xff
 // gas irOptimized: 121145
-// gas legacy: 128035
-// gas legacyOptimized: 123476
+// gas legacy: 128005
+// gas legacyOptimized: 123446
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index 7550a92256..64cb8edd1c 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -18,6 +18,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 7
-// gas irOptimized: 124041
+// gas irOptimized: 124037
 // gas legacy: 205196
 // gas legacyOptimized: 204987
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
index 8d8bd4d506..9c435f3e17 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -10,8 +10,8 @@ contract c {
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
 // gas irOptimized: 177390
-// gas legacy: 177656
-// gas legacyOptimized: 177496
+// gas legacy: 177653
+// gas legacyOptimized: 177493
 // storageEmpty -> 0
 // reset() -> true
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index 7b2af96071..ecf9c838a2 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -22,8 +22,8 @@ contract sender {
 // ----
 // (): 7 ->
 // gas irOptimized: 110954
-// gas legacy: 111082
-// gas legacyOptimized: 111027
+// gas legacy: 111073
+// gas legacyOptimized: 111018
 // val() -> 0
 // forward(bool): true -> true
 // val() -> 0x80
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index 3d4623b79d..24de47c279 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -21,5 +21,5 @@ contract C {
 // ----
 // f() -> 3
 // gas irOptimized: 129916
-// gas legacy: 130307
-// gas legacyOptimized: 129363
+// gas legacy: 130181
+// gas legacyOptimized: 129198
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
index ec58360cd8..cbeaefd82c 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -20,5 +20,5 @@ contract C {
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
 // gas irOptimized: 207785
-// gas legacy: 212325
-// gas legacyOptimized: 211486
+// gas legacy: 212313
+// gas legacyOptimized: 211462
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index f94b442f36..35fd24fd80 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -14,5 +14,5 @@ contract C {
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
 // gas irOptimized: 202840
-// gas legacy: 204459
-// gas legacyOptimized: 203437
+// gas legacy: 204441
+// gas legacyOptimized: 203419
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
index ece6f7969f..e595c48164 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
@@ -21,5 +21,5 @@ contract C {
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
 // gas irOptimized: 207785
-// gas legacy: 212330
-// gas legacyOptimized: 211491
+// gas legacy: 212318
+// gas legacyOptimized: 211467
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index abcd72ee10..f212c573ad 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -16,5 +16,5 @@ contract C {
 // ----
 // f() -> 2, 3, 4
 // gas irOptimized: 114120
-// gas legacy: 126449
-// gas legacyOptimized: 120902
+// gas legacy: 126350
+// gas legacyOptimized: 120704
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index 149e8768d7..00c8c41f6a 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -19,5 +19,5 @@ contract c {
 // ----
 // test1() -> true
 // gas irOptimized: 225894
-// gas legacy: 255577
-// gas legacyOptimized: 248611
+// gas legacy: 254650
+// gas legacyOptimized: 247384
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index 019a3fca0d..a9eff11f41 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -17,8 +17,8 @@ contract c {
 // storageEmpty -> 1
 // fill() ->
 // gas irOptimized: 519886
-// gas legacy: 521773
-// gas legacyOptimized: 517048
+// gas legacy: 521710
+// gas legacyOptimized: 516922
 // storageEmpty -> 0
 // halfClear() ->
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index b09cb58120..c2a2a7b466 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -14,8 +14,8 @@ contract c {
 // storageEmpty -> 1
 // fill() ->
 // gas irOptimized: 465544
-// gas legacy: 471460
-// gas legacyOptimized: 467520
+// gas legacy: 471400
+// gas legacyOptimized: 467400
 // storageEmpty -> 0
 // clear() ->
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index fcf41823e7..3b93c930ad 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -21,6 +21,6 @@ contract B {
 // compileViaYul: also
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 130152
-// gas legacy: 234943
-// gas legacyOptimized: 132863
+// gas irOptimized: 129910
+// gas legacy: 234719
+// gas legacyOptimized: 132639
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index 07a054514a..0521c45de5 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -11,7 +11,7 @@ contract Creator {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 129908
+// gas irOptimized: 128995
 // gas legacy: 176789
 // gas legacyOptimized: 129585
 // r() -> 4
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 73f9799d43..050595439d 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -45,6 +45,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 298983
-// gas legacy: 452172
-// gas legacyOptimized: 285017
+// gas irOptimized: 298735
+// gas legacy: 452136
+// gas legacyOptimized: 284945
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index f2a98f9938..3b6fa4b5b2 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -25,7 +25,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 1, 2, 3
-// gas irOptimized: 2271482
-// gas legacy: 2273722
-// gas legacyOptimized: 2262396
+// gas irOptimized: 2271050
+// gas legacy: 2273434
+// gas legacyOptimized: 2261820
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index 4be29a15d3..6ec59a75e5 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -21,6 +21,6 @@ contract c {
 // ----
 // test() -> 38, 28, 18
 // gas irOptimized: 188649
-// gas legacy: 189780
-// gas legacyOptimized: 178870
+// gas legacy: 189492
+// gas legacyOptimized: 178294
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index 08a4031745..de4b2fa1cf 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -21,6 +21,6 @@ contract c {
 // ----
 // test() -> 20, 10
 // gas irOptimized: 159175
-// gas legacy: 159459
-// gas legacyOptimized: 153281
+// gas legacy: 159279
+// gas legacyOptimized: 152921
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index 387d21872c..c9f81f37a1 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -13,5 +13,5 @@ contract c {
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
 // gas irOptimized: 109503
-// gas legacy: 127309
-// gas legacyOptimized: 124136
+// gas legacy: 126728
+// gas legacyOptimized: 123444
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index c911b1b7c3..2b63293cb8 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -19,6 +19,6 @@ contract c {
 // ----
 // test() -> true
 // gas irOptimized: 196545
-// gas legacy: 229864
-// gas legacyOptimized: 210964
+// gas legacy: 228685
+// gas legacyOptimized: 209662
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index 38c0c84d63..d2358b1e2f 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -18,6 +18,6 @@ contract c {
 // ----
 // test() ->
 // gas irOptimized: 142640
-// gas legacy: 165363
-// gas legacyOptimized: 159446
+// gas legacy: 164430
+// gas legacyOptimized: 158513
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index 6d314fb27e..f6f9c10e89 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -13,5 +13,5 @@ contract c {
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
 // gas irOptimized: 108493
-// gas legacy: 126187
-// gas legacyOptimized: 123261
+// gas legacy: 125610
+// gas legacyOptimized: 122582
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
index a4be5ad901..55a7d1bfe9 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -14,6 +14,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
-// gas irOptimized: 113267
+// gas irOptimized: 113258
 // gas legacy: 113686
 // gas legacyOptimized: 113499
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index 7546a664bd..299aa79c78 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -18,6 +18,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
-// gas irOptimized: 138732
+// gas irOptimized: 138705
 // gas legacy: 145150
 // gas legacyOptimized: 139171
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 78c817d446..4b8113c1b1 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -17,6 +17,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0
-// gas irOptimized: 176848
-// gas legacy: 218028
-// gas legacyOptimized: 205124
+// gas irOptimized: 176497
+// gas legacy: 216790
+// gas legacyOptimized: 203886
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index 262ba724a5..7c4bdcb9a2 100644
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
@@ -16,5 +16,5 @@ contract C {
 // ----
 // f() ->
 // gas irOptimized: 179590
-// gas legacy: 180620
-// gas legacyOptimized: 180403
+// gas legacy: 180602
+// gas legacyOptimized: 180385
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index 761bf3ee3b..610639388d 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -30,14 +30,14 @@ contract C {
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
 // gas irOptimized: 112528
-// gas legacy: 108234
-// gas legacyOptimized: 102245
+// gas legacy: 108105
+// gas legacyOptimized: 101987
 // l() -> 1
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
 // gas irOptimized: 116400
-// gas legacy: 107780
+// gas legacy: 107525
 // gas legacyOptimized: 96331
 // l() -> 2
 // ll(uint256): 1 -> 85
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 830f25b02f..6c7ae703b2 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -24,8 +24,8 @@ contract C {
 // l() -> 0
 // g(uint256): 70 ->
 // gas irOptimized: 185936
-// gas legacy: 184991
-// gas legacyOptimized: 180608
+// gas legacy: 183811
+// gas legacyOptimized: 179218
 // l() -> 70
 // a(uint256): 69 -> left(69)
 // f() ->
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
index 7773c6832c..4c993d2d2b 100644
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -11,9 +11,9 @@ contract c {
 // compileViaYul: also
 // ----
 // (): 1, 2, 3, 4, 5 ->
-// gas irOptimized: 155181
-// gas legacy: 155254
-// gas legacyOptimized: 155217
+// gas irOptimized: 155170
+// gas legacy: 155251
+// gas legacyOptimized: 155214
 // checkIfDataIsEmpty() -> false
 // sendMessage() -> true, 0x40, 0
 // checkIfDataIsEmpty() -> true
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 031deb64cc..9f9e962831 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 443989
+// gas irOptimized: 443720
 // gas legacy: 590683
 // gas legacyOptimized: 448326
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 8264a93edf..a053762987 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 300837
-// gas legacy: 428917
-// gas legacyOptimized: 298128
+// gas irOptimized: 300834
+// gas legacy: 428711
+// gas legacyOptimized: 297922
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 1a93f53b3f..70a636c290 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -11,7 +11,7 @@ contract Test {
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
 // gas irOptimized: 291443
-// gas legacy: 309842
-// gas legacyOptimized: 260801
+// gas legacy: 309607
+// gas legacyOptimized: 260566
 // m_x() -> 7
 // m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
index 2206fd351b..bb9567dd04 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -19,7 +19,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(): "abc", true
-// gas irOptimized: 107175
+// gas irOptimized: 106267
 // gas legacy: 145838
 // gas legacyOptimized: 104017
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index f6fab1092d..4d3c98dbe1 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -12,7 +12,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 174905
+// gas irOptimized: 174041
 // gas legacy: 221377
 // gas legacyOptimized: 177671
 // a() -> 1
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index 3fdbb07854..1352c6e1c8 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -19,6 +19,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 123037
+// gas irOptimized: 123036
 // gas legacy: 123226
 // gas legacyOptimized: 123092
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
index 2518deb925..f17ffe54fc 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
@@ -15,5 +15,5 @@ contract B is A {
 // compileViaYul: true
 // ----
 // constructor() ->
-// gas irOptimized: 122017
+// gas irOptimized: 121153
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
index 68506528b6..5fafdd0451 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
@@ -12,7 +12,7 @@ contract B is A {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 122017
+// gas irOptimized: 121153
 // gas legacy: 135046
 // gas legacyOptimized: 116176
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index cb61927745..0b8982d408 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -11,7 +11,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 104227
+// gas irOptimized: 103363
 // gas legacy: 117158
 // i() -> 2
 // k() -> 0
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index 3d90783f82..9f33757b14 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -14,7 +14,7 @@ contract D is C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 124844
+// gas irOptimized: 123980
 // gas legacy: 139250
 // gas legacyOptimized: 119367
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 5ec47a4a9c..19c05a1567 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 173672
+// gas irOptimized: 172802
 // gas legacy: 250376
 // gas legacyOptimized: 174522
 // deposit(bytes32), 18 wei: 0x1234 ->
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index d35db93c46..5d3ad58404 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -20,5 +20,5 @@ contract C {
 // deposit() ->
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
 // gas irOptimized: 343396
-// gas legacy: 390742
-// gas legacyOptimized: 376774
+// gas legacy: 388679
+// gas legacyOptimized: 374441
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index e6d6c478bc..9965c786e4 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -76,9 +76,9 @@ contract FixedFeeRegistrar is Registrar {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 413485
-// gas legacy: 936897
-// gas legacyOptimized: 490983
+// gas irOptimized: 413269
+// gas legacy: 935817
+// gas legacyOptimized: 489951
 // reserve(string), 69 ether: 0x20, 3, "abc" ->
 // ~ emit Changed(string): #0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
 // gas irOptimized: 45967
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index fd17c5d78b..02c8587632 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -35,8 +35,8 @@ contract test {
 // ----
 // constructor()
 // gas irOptimized: 450044
-// gas legacy: 766936
-// gas legacyOptimized: 543094
+// gas legacy: 765640
+// gas legacyOptimized: 541810
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
 // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
 // encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
@@ -53,9 +53,9 @@ contract test {
 // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
 // encode_inline_asm_large()
 // gas irOptimized: 1385047
-// gas legacy: 1658033
-// gas legacyOptimized: 1210033
+// gas legacy: 1652033
+// gas legacyOptimized: 1201033
 // encode_no_asm_large()
 // gas irOptimized: 3335101
-// gas legacy: 4801077
-// gas legacyOptimized: 2929077
+// gas legacy: 4777077
+// gas legacyOptimized: 2890077
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index d98e737920..42a9207fdd 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -178,35 +178,35 @@ contract DepositContract is IDepositContract, ERC165 {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1543359
-// gas legacy: 2436584
-// gas legacyOptimized: 1776483
+// gas irOptimized: 1542927
+// gas legacy: 2435803
+// gas legacyOptimized: 1775425
 // supportsInterface(bytes4): 0x0 -> 0
 // supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
 // gas irOptimized: 122135
-// gas legacy: 150465
-// gas legacyOptimized: 122798
+// gas legacy: 150273
+// gas legacyOptimized: 122510
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
 // gas irOptimized: 122135
-// gas legacy: 150465
-// gas legacyOptimized: 122798
+// gas legacy: 150273
+// gas legacyOptimized: 122510
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
 // gas irOptimized: 122114
-// gas legacy: 150475
-// gas legacyOptimized: 122811
+// gas legacy: 150283
+// gas legacyOptimized: 122523
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
 // gas irOptimized: 122114
-// gas legacy: 150475
-// gas legacyOptimized: 122811
+// gas legacy: 150283
+// gas legacyOptimized: 122523
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index 56abe4a9dc..bcb4238a77 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -50,9 +50,9 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1938339
-// gas legacy: 2480887
-// gas legacyOptimized: 1874490
+// gas irOptimized: 1937251
+// gas legacy: 2478955
+// gas legacyOptimized: 1877737
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
 // gas irOptimized: 22137
 // gas legacy: 22767
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 0488179f1d..46e0598856 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -50,9 +50,9 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1792108
-// gas legacy: 2250130
-// gas legacyOptimized: 1746528
+// gas irOptimized: 1791688
+// gas legacy: 2248594
+// gas legacyOptimized: 1749096
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
 // gas irOptimized: 22004
 // gas legacy: 22497
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index 45976217b5..eb1b5d8410 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -35,9 +35,9 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 465789
-// gas legacy: 672749
-// gas legacyOptimized: 479606
+// gas irOptimized: 464709
+// gas legacy: 671453
+// gas legacyOptimized: 480242
 // prb_pi() -> 3141592656369545286
 // gas irOptimized: 57478
 // gas legacy: 98903
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 8f6b939fdf..05b4ddb25a 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -298,5 +298,5 @@ contract Test {
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
 // gas irOptimized: 95261
-// gas legacy: 114094
+// gas legacy: 113731
 // gas legacyOptimized: 83670
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index a16f884e8b..9f70844105 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -51,9 +51,9 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 707330
-// gas legacy: 1130761
-// gas legacyOptimized: 750416
+// gas irOptimized: 704522
+// gas legacy: 1127730
+// gas legacyOptimized: 753807
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
 // gas irOptimized: 22660
 // gas legacy: 23190
@@ -71,6 +71,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 2040045
-// gas legacy: 4381235
-// gas legacyOptimized: 2317529
+// gas irOptimized: 2040024
+// gas legacy: 4356286
+// gas legacyOptimized: 2268278
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index 030aeaa10b..b74680c96a 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -25,9 +25,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 315341
-// gas legacy: 465314
-// gas legacyOptimized: 304481
+// gas irOptimized: 314681
+// gas legacy: 464030
+// gas legacyOptimized: 304049
 // f(uint256): 0 -> FAILURE
 // f(uint256): 1 -> FAILURE
 // f(uint256): 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index cfbf1bcc13..124f69034f 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -27,9 +27,9 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 452673
-// gas legacy: 834272
-// gas legacyOptimized: 510004
+// gas irOptimized: 449901
+// gas legacy: 832976
+// gas legacyOptimized: 509560
 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
 // f(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
 // f(uint256): 2 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 2ebf8740d2..639f399454 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -18,9 +18,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 219285
-// gas legacy: 294569
-// gas legacyOptimized: 174699
+// gas irOptimized: 219069
+// gas legacy: 294335
+// gas legacyOptimized: 174279
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
 // x() -> 1
 // f(uint256): 20 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 4321753d68..ac51947c32 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -41,7 +41,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 283040
+// gas irOptimized: 282824
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 2f89517b7a..0eb9648bec 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -40,7 +40,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 283040
+// gas irOptimized: 282824
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index f1e2f11166..92b75ba4ea 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -20,7 +20,7 @@ contract test {
 // compileViaYul: also
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
-// gas irOptimized: 111929
+// gas irOptimized: 111914
 // gas legacy: 113806
 // gas legacyOptimized: 111781
 // get(uint8): 1 -> 21, 22, 42, 43
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index aea318e659..52ed2bc769 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -42,7 +42,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 284321
+// gas irOptimized: 282981
 // gas legacy: 402045
 // gas legacyOptimized: 266772
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 8d37ed809f..94128fbc4f 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -18,7 +18,7 @@ contract ClientReceipt {
 // compileViaYul: also
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 188162
+// gas irOptimized: 187946
 // gas legacy: 235195
 // gas legacyOptimized: 176766
 // balance -> 1500
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index ac61fad71c..9cf5f65ff2 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -25,6 +25,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 4, 0x11
-// gas irOptimized: 115874
-// gas legacy: 135952
-// gas legacyOptimized: 119643
+// gas irOptimized: 115868
+// gas legacy: 135820
+// gas legacyOptimized: 119448
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
index 9abeb90aa0..513bf0b8e2 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -14,7 +14,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 115297
+// gas irOptimized: 115278
 // gas legacy: 155081
 // gas legacyOptimized: 107997
 // genesisHash() -> 0x3737373737373737373737373737373737373737373737373737373737373737
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
index 6e65cd2394..c5c484df7e 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
-// gas irOptimized: 203312
+// gas irOptimized: 203303
 // gas legacy: 209194
 // gas legacyOptimized: 203583
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
index 258ff350b3..876a7f6c8e 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
@@ -88,7 +88,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // test1() -> true
-// gas irOptimized: 150545
+// gas irOptimized: 150533
 // gas legacy: 150266
 // gas legacyOptimized: 149875
 // test2() -> true
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index 6b5d1f0224..f77156d643 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -26,8 +26,8 @@ contract c {
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
 // gas irOptimized: 133728
-// gas legacy: 134436
-// gas legacyOptimized: 133879
+// gas legacy: 134433
+// gas legacyOptimized: 133876
 // test(uint256): 32 -> "3"
 // storageEmpty -> 0
 // copy() -> true
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index 03a063bb8f..62a8baaedb 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -43,7 +43,7 @@ contract c {
 // gas legacyOptimized: 110006
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // copy(uint256,uint256): 7, 8 -> true
-// gas irOptimized: 118597
+// gas irOptimized: 118591
 // gas legacy: 119166
 // gas legacyOptimized: 118622
 // retrieve(uint256): 7 -> 1, 3, 4, 2
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 56ad74c540..3f4309c868 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -51,12 +51,12 @@ contract C {
 // compileViaYul: also
 // ----
 // test_f() -> true
-// gas irOptimized: 122364
-// gas legacy: 126168
-// gas legacyOptimized: 123199
+// gas irOptimized: 122334
+// gas legacy: 126150
+// gas legacyOptimized: 123163
 // test_g() -> true
 // gas irOptimized: 95980
-// gas legacy: 101311
+// gas legacy: 101281
 // gas legacyOptimized: 96566
 // addresses(uint256): 0 -> 0x18
 // addresses(uint256): 1 -> 0x19
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index c2c5f3cdc1..aea108e2ba 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -115,8 +115,8 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 423885
-// gas legacy: 861559
+// gas irOptimized: 423453
+// gas legacy: 860880
 // gas legacyOptimized: 420959
 // totalSupply() -> 20
 // gas irOptimized: 23415
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 38e0fb13f1..594adea400 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -18,8 +18,8 @@ contract C {
 // ----
 // constructor() ->
 // gas irOptimized: 199723
-// gas legacy: 241124
-// gas legacyOptimized: 155549
+// gas legacy: 240889
+// gas legacyOptimized: 155314
 // initCode() -> 0x20, 0
 // f() -> true
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index cc93152ead..4b253a63e4 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -36,6 +36,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 240691
-// gas legacy: 240358
-// gas legacyOptimized: 239682
+// gas irOptimized: 240667
+// gas legacy: 240349
+// gas legacyOptimized: 239673
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index 9ba4e3cb73..9f9084825e 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -98,8 +98,8 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 419330
-// gas legacy: 833310
+// gas irOptimized: 418910
+// gas legacy: 832643
 // gas legacyOptimized: 416135
 // totalSupply() -> 20
 // gas irOptimized: 23415
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 30a2d9f65a..9e334c5e54 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -23,5 +23,5 @@ contract C {
 // ----
 // g() -> 2, 6
 // gas irOptimized: 178812
-// gas legacy: 180762
-// gas legacyOptimized: 179481
+// gas legacy: 180753
+// gas legacyOptimized: 179472
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 5d8bda5dd7..78eb2eec7d 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -22,7 +22,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 192113
+// gas irOptimized: 191249
 // gas legacy: 265006
 // gas legacyOptimized: 182842
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 0b2b1735b2..4b57d19e62 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -21,7 +21,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 194261
+// gas irOptimized: 193397
 // gas legacy: 266728
 // gas legacyOptimized: 184762
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
index 6ef403dcc6..772c77af2c 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
@@ -28,9 +28,9 @@ contract C {
 // index(uint256): 10 -> true
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
-// gas irOptimized: 138410
-// gas legacy: 248854
-// gas legacyOptimized: 152638
+// gas irOptimized: 137645
+// gas legacy: 247324
+// gas legacyOptimized: 149578
 // accessIndex(uint256,int256): 10, 1 -> 2
 // accessIndex(uint256,int256): 10, 0 -> 1
 // accessIndex(uint256,int256): 10, 11 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index 24d0e9f145..63096bed6c 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -19,32 +19,32 @@ contract C {
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
 // gas irOptimized: 3032986
-// gas legacy: 3071205
-// gas legacyOptimized: 3011873
+// gas legacy: 3070431
+// gas legacyOptimized: 3010325
 // test_indices(uint256): 5 ->
 // gas irOptimized: 367642
-// gas legacy: 369241
-// gas legacyOptimized: 366149
+// gas legacy: 369211
+// gas legacyOptimized: 366089
 // test_indices(uint256): 10 ->
 // test_indices(uint256): 15 ->
 // gas irOptimized: 72860
 // test_indices(uint256): 0xFF ->
 // gas irOptimized: 3438610
-// gas legacy: 3514167
-// gas legacyOptimized: 3398107
+// gas legacy: 3512637
+// gas legacyOptimized: 3395047
 // test_indices(uint256): 1000 ->
 // gas irOptimized: 18318372
-// gas legacy: 18617999
-// gas legacyOptimized: 18178944
+// gas legacy: 18611999
+// gas legacyOptimized: 18166944
 // test_indices(uint256): 129 ->
 // gas irOptimized: 2733570
-// gas legacy: 2772735
-// gas legacyOptimized: 2716547
+// gas legacy: 2771961
+// gas legacyOptimized: 2714999
 // test_indices(uint256): 128 ->
 // gas irOptimized: 426682
-// gas legacy: 467272
-// gas legacyOptimized: 418424
+// gas legacy: 466504
+// gas legacyOptimized: 416888
 // test_indices(uint256): 1 ->
 // gas irOptimized: 363074
-// gas legacy: 363407
-// gas legacyOptimized: 361811
+// gas legacy: 363401
+// gas legacyOptimized: 361799
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index b2e0cb5467..4361001f49 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -54,18 +54,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131197
-// gas legacy: 132367
-// gas legacyOptimized: 129586
+// gas irOptimized: 131193
+// gas legacy: 132331
+// gas legacyOptimized: 129514
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 174805
-// gas legacy: 177329
-// gas legacyOptimized: 172224
+// gas irOptimized: 174811
+// gas legacy: 177248
+// gas legacyOptimized: 172062
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 198055
-// gas legacy: 201954
-// gas legacyOptimized: 194604
+// gas irOptimized: 198071
+// gas legacy: 201828
+// gas legacyOptimized: 194352
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 6098185
-// gas legacy: 6163149
-// gas legacyOptimized: 6029474
+// gas irOptimized: 6098681
+// gas legacy: 6160863
+// gas legacyOptimized: 6024902
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
index 5c7c4cba84..7291e1e347 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
@@ -14,12 +14,12 @@ contract C {
 // ----
 // pushEmpty(uint256): 128
 // gas irOptimized: 412570
-// gas legacy: 417287
-// gas legacyOptimized: 399048
+// gas legacy: 416903
+// gas legacyOptimized: 398280
 // pushEmpty(uint256): 256
 // gas irOptimized: 702558
-// gas legacy: 715083
-// gas legacyOptimized: 688908
+// gas legacy: 714315
+// gas legacyOptimized: 687372
 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
 // gas irOptimized: 100000000
 // gas legacy: 100000000
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index 05b7e668b4..b2df7d748d 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -23,6 +23,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() ->
-// gas irOptimized: 112998
-// gas legacy: 112937
-// gas legacyOptimized: 112608
+// gas irOptimized: 112995
+// gas legacy: 112931
+// gas legacyOptimized: 112602

From b5caa774826492e8c902d64af2a900ea1f8315a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 10 Mar 2022 14:52:51 +0100
Subject: [PATCH 0460/1748] euler: Use project's own TEST_TIMEOUT var for
 changing the timeout instead of mocha settings

---
 test/externalTests/euler.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 6a73f00e58..39283bcd54 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -32,7 +32,10 @@ BINARY_PATH="$2"
 SELECTED_PRESETS="$3"
 
 function compile_fn { npm run compile; }
-function test_fn { npx --no hardhat --no-compile test; }
+function test_fn {
+    # The default timeout of 20000 ms is too short for unoptimized code (https://github.com/ethereum/solidity/pull/12765).
+    TEST_TIMEOUT=100000 npx --no hardhat --no-compile test
+}
 
 function euler_test
 {
@@ -63,8 +66,6 @@ function euler_test
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
     force_hardhat_unlimited_contract_size "$config_file"
-    # Workaround for the timeout that's too short for unoptimized code (https://github.com/ethereum/solidity/pull/12765)
-    force_hardhat_timeout "$config_file" "" 100000
     npm install
 
     replace_version_pragmas

From 4f02be110c6181839adfc1145bf07a79a095c711 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 5 May 2021 18:02:35 +0200
Subject: [PATCH 0461/1748] Unused store eliminator.

---
 Changelog.md                                  |   1 +
 libevmasm/SemanticInformation.cpp             |   4 +-
 libsolidity/interface/OptimiserSettings.h     |   2 +-
 libyul/CMakeLists.txt                         |   2 +
 libyul/optimiser/Suite.cpp                    |   3 +
 libyul/optimiser/UnusedStoreEliminator.cpp    | 379 ++++++++++++++++++
 libyul/optimiser/UnusedStoreEliminator.h      | 119 ++++++
 .../constant_optimizer_yul/output             |   1 -
 .../output                                    |  12 +-
 .../output                                    |  12 +-
 .../output                                    |  12 +-
 .../debug_info_in_yul_snippet_escaping/output |   2 -
 .../output                                    |   2 -
 .../ir_compiler_subobjects/output             |   2 -
 .../output                                    |  16 +-
 .../output                                    |   3 -
 .../keccak_optimization_deploy_code/output    |   3 -
 .../keccak_optimization_low_runs/output       |   1 -
 .../output.json                               |  27 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |  12 +-
 .../output.json                               |  10 +-
 .../viair_subobject_optimization/output       |  11 -
 test/cmdlineTests/viair_subobjects/output     |   2 -
 test/formal/redundant_store_unrelated.py      |  63 +++
 .../array_copy_storage_storage_dyn_dyn.sol    |   2 +-
 .../copying/copy_byte_array_to_storage.sol    |   2 +-
 .../delete/delete_storage_array_packed.sol    |   2 +-
 ...ray_pop_long_storage_empty_garbage_ref.sol |   2 +-
 .../semanticTests/array/reusing_memory.sol    |   2 +-
 .../constructor_arguments_external.sol        |   2 +-
 .../constructor/no_callvalue_check.sol        |   2 +-
 .../semanticTests/constructor_with_params.sol |   2 +-
 ...ructor_with_params_diamond_inheritance.sol |   2 +-
 .../constructor_with_params_inheritance.sol   |   2 +-
 .../creation_function_call_with_args.sol      |   2 +-
 .../creation_function_call_with_salt.sol      |   2 +-
 .../functionCall/failed_create.sol            |   2 +-
 .../functionCall/send_zero_ether.sol          |   2 +-
 .../inheritance/value_for_constructor.sol     |   2 +-
 .../using_library_mappings_public.sol         |   2 +-
 .../salted_create/salted_create.sol           |   2 +-
 .../salted_create_with_value.sol              |   2 +-
 .../semanticTests/smoke/constructor.sol       |   2 +-
 .../structs/struct_copy_via_local.sol         |   2 +-
 ...truct_delete_storage_with_arrays_small.sol |   2 +-
 .../struct_memory_to_storage_function_ptr.sol |   2 +-
 .../semanticTests/structs/structs.sol         |   2 +-
 .../calldata_to_storage.sol                   |   2 +-
 .../memory_to_storage.sol                     |   2 +-
 .../various/contract_binary_dependencies.sol  |   2 +-
 test/libyul/YulOptimizerTestCommon.cpp        |  10 +
 .../fullSuite/extcodelength.yul               |  40 ++
 .../yulOptimizerTests/fullSuite/medium.yul    |   8 +-
 ...remove_redundant_assignments_in_switch.yul |   1 -
 .../fullSuite/stack_compressor_msize.yul      |   2 +-
 .../static_array_slot_computation.yul         |   1 -
 .../yulOptimizerTests/fullSuite/storage.yul   |   1 -
 .../unusedFunctionParameterPruner.yul         |   1 -
 .../unusedFunctionParameterPruner_loop.yul    |   2 +-
 ...nusedFunctionParameterPruner_recursion.yul |   1 -
 .../unusedFunctionParameterPruner_return.yul  |   2 -
 .../unusedFunctionParameterPruner_simple.yul  |   2 +-
 .../call_does_not_need_to_write.yul           |  24 ++
 .../covering_calldatacopy.yul                 |  59 +++
 .../covering_calldatacopy_fixed.yul           |  53 +++
 .../unusedStoreEliminator/create.yul          |  17 +
 .../create_inside_function.yul                |  22 +
 .../unusedStoreEliminator/function_end.yul    |  20 +
 .../function_side_effects.yul                 |  55 +++
 .../function_side_effects_2.yul               |  28 ++
 .../if_overwrite_all_branches.yul             |  20 +
 .../unusedStoreEliminator/leave.yul           |  23 ++
 .../unusedStoreEliminator/memoryguard.yul     |  24 ++
 .../unusedStoreEliminator/mload.yul           |  20 +
 .../no_storage_inside_function.yul            |  27 ++
 .../unusedStoreEliminator/overflow.yul        |  18 +
 .../unusedStoreEliminator/overlapping.yul     |  21 +
 .../overlapping_small.yul                     |  27 ++
 .../remove_before_revert.yul                  |  21 +
 .../unaligned_access.yul                      |  17 +
 .../unusedStoreEliminator/unknown_length2.yul |  33 ++
 .../unrelated_relative.yul                    |  23 ++
 .../write_before_recursion.yul                |  27 ++
 test/yulPhaser/Chromosome.cpp                 |   2 +-
 86 files changed, 1272 insertions(+), 157 deletions(-)
 create mode 100644 libyul/optimiser/UnusedStoreEliminator.cpp
 create mode 100644 libyul/optimiser/UnusedStoreEliminator.h
 create mode 100644 test/formal/redundant_store_unrelated.py
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul

diff --git a/Changelog.md b/Changelog.md
index 1b512d3e95..8b9fa530c1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Language Features:
 Compiler Features:
 * JSON-AST: Added selector field for errors and events.
  * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump.
+ * Yul Optimizer: Remove ``sstore`` and ``mstore`` operations that are never read from.
 
 Bugfixes:
  * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``.
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index 8a1266bcf0..acbcaa5c0f 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -121,7 +121,9 @@ vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(
 			Location::Memory,
 			Effect::Write,
 			paramCount - 2,
-			paramCount - 1,
+			// Length is in paramCount - 1, but it is only a max length,
+			// there is no guarantee that the full area is written to.
+			{},
 			{}
 		});
 		return operations;
diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h
index e1c35e9ea2..e233048c18 100644
--- a/libsolidity/interface/OptimiserSettings.h
+++ b/libsolidity/interface/OptimiserSettings.h
@@ -55,7 +55,7 @@ struct OptimiserSettings
 			"xa[rul]"                  // Prune a bit more in SSA
 			"xa[r]cL"                  // Turn into SSA again and simplify
 			"gvif"                     // Run full inliner
-			"CTUca[r]LsTFOtfDnca[r]Iulc" // SSA plus simplify
+			"CTUca[r]LSsTFOtfDnca[r]Iulc" // SSA plus simplify
 		"]"
 		"jmul[jul] VcTOcul jmul";      // Make source short and pretty
 
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index fde673e3d8..806f094fe7 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -179,6 +179,8 @@ add_library(yul
 	optimiser/UnusedAssignEliminator.h
 	optimiser/UnusedStoreBase.cpp
 	optimiser/UnusedStoreBase.h
+	optimiser/UnusedStoreEliminator.cpp
+	optimiser/UnusedStoreEliminator.h
 	optimiser/Rematerialiser.cpp
 	optimiser/Rematerialiser.h
 	optimiser/SMTSolver.cpp
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 0f21940613..181c9bdcba 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -57,6 +57,7 @@
 #include <libyul/optimiser/StructuralSimplifier.h>
 #include <libyul/optimiser/SyntacticalEquality.h>
 #include <libyul/optimiser/UnusedAssignEliminator.h>
+#include <libyul/optimiser/UnusedStoreEliminator.h>
 #include <libyul/optimiser/VarNameCleaner.h>
 #include <libyul/optimiser/LoadResolver.h>
 #include <libyul/optimiser/LoopInvariantCodeMotion.h>
@@ -222,6 +223,7 @@ map<string, unique_ptr<OptimiserStep>> const& OptimiserSuite::allSteps()
 			LoadResolver,
 			LoopInvariantCodeMotion,
 			UnusedAssignEliminator,
+			UnusedStoreEliminator,
 			ReasoningBasedSimplifier,
 			Rematerialiser,
 			SSAReverser,
@@ -264,6 +266,7 @@ map<string, char> const& OptimiserSuite::stepNameToAbbreviationMap()
 		{LoopInvariantCodeMotion::name,       'M'},
 		{ReasoningBasedSimplifier::name,      'R'},
 		{UnusedAssignEliminator::name,        'r'},
+		{UnusedStoreEliminator::name,         'S'},
 		{Rematerialiser::name,                'm'},
 		{SSAReverser::name,                   'V'},
 		{SSATransform::name,                  'a'},
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
new file mode 100644
index 0000000000..e3ff2d77a7
--- /dev/null
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -0,0 +1,379 @@
+/*
+	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
+/**
+ * Optimiser component that removes stores to memory and storage slots that are not used
+ * or overwritten later on.
+ */
+
+#include <libyul/optimiser/UnusedStoreEliminator.h>
+
+#include <libyul/optimiser/Semantics.h>
+#include <libyul/optimiser/OptimizerUtilities.h>
+#include <libyul/optimiser/Semantics.h>
+#include <libyul/optimiser/SSAValueTracker.h>
+#include <libyul/optimiser/DataFlowAnalyzer.h>
+#include <libyul/optimiser/KnowledgeBase.h>
+#include <libyul/ControlFlowSideEffectsCollector.h>
+#include <libyul/AST.h>
+
+#include <libsolutil/CommonData.h>
+
+#include <libevmasm/Instruction.h>
+#include <libevmasm/SemanticInformation.h>
+
+#include <range/v3/algorithm/all_of.hpp>
+
+using namespace std;
+using namespace solidity;
+using namespace solidity::yul;
+
+/// Variable names for special constants that can never appear in actual Yul code.
+static string const zero{"@ 0"};
+static string const one{"@ 1"};
+static string const thirtyTwo{"@ 32"};
+
+
+void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
+{
+	map<YulString, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
+		_context.dialect,
+		CallGraphGenerator::callGraph(_ast)
+	);
+
+	SSAValueTracker ssaValues;
+	ssaValues(_ast);
+	map<YulString, AssignedValue> values;
+	for (auto const& [name, expression]: ssaValues.values())
+		values[name] = AssignedValue{expression, {}};
+	Expression const zeroLiteral{Literal{{}, LiteralKind::Number, YulString{"0"}, {}}};
+	Expression const oneLiteral{Literal{{}, LiteralKind::Number, YulString{"1"}, {}}};
+	Expression const thirtyTwoLiteral{Literal{{}, LiteralKind::Number, YulString{"32"}, {}}};
+	values[YulString{zero}] = AssignedValue{&zeroLiteral, {}};
+	values[YulString{one}] = AssignedValue{&oneLiteral, {}};
+	values[YulString{thirtyTwo}] = AssignedValue{&thirtyTwoLiteral, {}};
+
+	bool const ignoreMemory = MSizeFinder::containsMSize(_context.dialect, _ast);
+	UnusedStoreEliminator rse{
+		_context.dialect,
+		functionSideEffects,
+		ControlFlowSideEffectsCollector{_context.dialect, _ast}.functionSideEffectsNamed(),
+		values,
+		ignoreMemory
+	};
+	rse(_ast);
+	rse.changeUndecidedTo(State::Unused, Location::Memory);
+	rse.changeUndecidedTo(State::Used, Location::Storage);
+	rse.scheduleUnusedForDeletion();
+
+	StatementRemover remover(rse.m_pendingRemovals);
+	remover(_ast);
+}
+
+void UnusedStoreEliminator::operator()(FunctionCall const& _functionCall)
+{
+	UnusedStoreBase::operator()(_functionCall);
+
+	for (Operation const& op: operationsFromFunctionCall(_functionCall))
+		applyOperation(op);
+
+	ControlFlowSideEffects sideEffects;
+	if (auto builtin = m_dialect.builtin(_functionCall.functionName.name))
+		sideEffects = builtin->controlFlowSideEffects;
+	else
+		sideEffects = m_controlFlowSideEffects.at(_functionCall.functionName.name);
+
+	if (!sideEffects.canContinue)
+	{
+		changeUndecidedTo(State::Unused, Location::Memory);
+		changeUndecidedTo(sideEffects.canTerminate ? State::Used : State::Unused, Location::Storage);
+	}
+}
+
+void UnusedStoreEliminator::operator()(FunctionDefinition const& _functionDefinition)
+{
+	ScopedSaveAndRestore storeOperations(m_storeOperations, {});
+	UnusedStoreBase::operator()(_functionDefinition);
+}
+
+
+void UnusedStoreEliminator::operator()(Leave const&)
+{
+	changeUndecidedTo(State::Used);
+}
+
+void UnusedStoreEliminator::visit(Statement const& _statement)
+{
+	using evmasm::Instruction;
+
+	UnusedStoreBase::visit(_statement);
+
+	auto const* exprStatement = get_if<ExpressionStatement>(&_statement);
+	if (!exprStatement)
+		return;
+
+	FunctionCall const* funCall = get_if<FunctionCall>(&exprStatement->expression);
+	yulAssert(funCall);
+	optional<Instruction> instruction = toEVMInstruction(m_dialect, funCall->functionName.name);
+	if (!instruction)
+		return;
+
+	if (!ranges::all_of(funCall->arguments, [](Expression const& _expr) -> bool {
+		return get_if<Identifier>(&_expr) || get_if<Literal>(&_expr);
+	}))
+		return;
+
+	// We determine if this is a store instruction without additional side-effects
+	// both by querying a combination of semantic information and by listing the instructions.
+	// This way the assert below should be triggered on any change.
+	using evmasm::SemanticInformation;
+	bool isStorageWrite = (*instruction == Instruction::SSTORE);
+	bool isMemoryWrite =
+		*instruction == Instruction::EXTCODECOPY ||
+		*instruction == Instruction::CODECOPY ||
+		*instruction == Instruction::CALLDATACOPY ||
+		*instruction == Instruction::RETURNDATACOPY ||
+		*instruction == Instruction::MSTORE ||
+		*instruction == Instruction::MSTORE8;
+	bool isCandidateForRemoval =
+		SemanticInformation::otherState(*instruction) != SemanticInformation::Write && (
+			SemanticInformation::storage(*instruction) == SemanticInformation::Write ||
+			(!m_ignoreMemory && SemanticInformation::memory(*instruction) == SemanticInformation::Write)
+		);
+	yulAssert(isCandidateForRemoval == (isStorageWrite || (!m_ignoreMemory && isMemoryWrite)));
+	if (isCandidateForRemoval)
+	{
+		m_stores[YulString{}].insert({&_statement, State::Undecided});
+		vector<Operation> operations = operationsFromFunctionCall(*funCall);
+		yulAssert(operations.size() == 1, "");
+		m_storeOperations[&_statement] = move(operations.front());
+	}
+}
+
+void UnusedStoreEliminator::finalizeFunctionDefinition(FunctionDefinition const&)
+{
+	changeUndecidedTo(State::Used);
+	scheduleUnusedForDeletion();
+}
+
+vector<UnusedStoreEliminator::Operation> UnusedStoreEliminator::operationsFromFunctionCall(
+	FunctionCall const& _functionCall
+) const
+{
+	using evmasm::Instruction;
+
+	YulString functionName = _functionCall.functionName.name;
+	SideEffects sideEffects;
+	if (BuiltinFunction const* f = m_dialect.builtin(functionName))
+		sideEffects = f->sideEffects;
+	else
+		sideEffects = m_functionSideEffects.at(functionName);
+
+	optional<Instruction> instruction = toEVMInstruction(m_dialect, functionName);
+	if (!instruction)
+	{
+		vector<Operation> result;
+		// Unknown read is worse than unknown write.
+		if (sideEffects.memory != SideEffects::Effect::None)
+			result.emplace_back(Operation{Location::Memory, Effect::Read, {}, {}});
+		if (sideEffects.storage != SideEffects::Effect::None)
+			result.emplace_back(Operation{Location::Storage, Effect::Read, {}, {}});
+		return result;
+	}
+
+	using evmasm::SemanticInformation;
+
+	return util::applyMap(
+		SemanticInformation::readWriteOperations(*instruction),
+		[&](SemanticInformation::Operation const& _op) -> Operation
+		{
+			yulAssert(!(_op.lengthParameter && _op.lengthConstant));
+			yulAssert(_op.effect != Effect::None);
+			Operation ourOp{_op.location, _op.effect, {}, {}};
+			if (_op.startParameter)
+				ourOp.start = identifierNameIfSSA(_functionCall.arguments.at(*_op.startParameter));
+			if (_op.lengthParameter)
+				ourOp.length = identifierNameIfSSA(_functionCall.arguments.at(*_op.lengthParameter));
+			if (_op.lengthConstant)
+				switch (*_op.lengthConstant)
+				{
+				case 1: ourOp.length = YulString(one); break;
+				case 32: ourOp.length = YulString(thirtyTwo); break;
+				default: yulAssert(false);
+				}
+			return ourOp;
+		}
+	);
+}
+
+void UnusedStoreEliminator::applyOperation(UnusedStoreEliminator::Operation const& _operation)
+{
+	for (auto& [statement, state]: m_stores[YulString{}])
+		if (state == State::Undecided)
+		{
+			Operation const& storeOperation = m_storeOperations.at(statement);
+			if (_operation.effect == Effect::Read && !knownUnrelated(storeOperation, _operation))
+				state = State::Used;
+			else if (_operation.effect == Effect::Write && knownCovered(storeOperation, _operation))
+				state = State::Unused;
+		}
+}
+
+bool UnusedStoreEliminator::knownUnrelated(
+	UnusedStoreEliminator::Operation const& _op1,
+	UnusedStoreEliminator::Operation const& _op2
+) const
+{
+	KnowledgeBase knowledge(m_dialect, m_ssaValues);
+
+	if (_op1.location != _op2.location)
+		return true;
+	if (_op1.location == Location::Storage)
+	{
+		if (_op1.start && _op2.start)
+		{
+			yulAssert(
+				_op1.length &&
+				_op2.length &&
+				knowledge.valueIfKnownConstant(*_op1.length) == 1 &&
+				knowledge.valueIfKnownConstant(*_op2.length) == 1
+			);
+			return knowledge.knownToBeDifferent(*_op1.start, *_op2.start);
+		}
+	}
+	else
+	{
+		yulAssert(_op1.location == Location::Memory, "");
+		if (
+			(_op1.length && knowledge.knownToBeZero(*_op1.length)) ||
+			(_op2.length && knowledge.knownToBeZero(*_op2.length))
+		)
+			return true;
+
+		if (_op1.start && _op1.length && _op2.start)
+		{
+			optional<u256> length1 = knowledge.valueIfKnownConstant(*_op1.length);
+			optional<u256> start1 = knowledge.valueIfKnownConstant(*_op1.start);
+			optional<u256> start2 = knowledge.valueIfKnownConstant(*_op2.start);
+			if (
+				(length1 && start1 && start2) &&
+				*start1 + *length1 >= *start1 && // no overflow
+				*start1 + *length1 <= *start2
+			)
+				return true;
+		}
+		if (_op2.start && _op2.length && _op1.start)
+		{
+			optional<u256> length2 = knowledge.valueIfKnownConstant(*_op2.length);
+			optional<u256> start2 = knowledge.valueIfKnownConstant(*_op2.start);
+			optional<u256> start1 = knowledge.valueIfKnownConstant(*_op1.start);
+			if (
+				(length2 && start2 && start1) &&
+				*start2 + *length2 >= *start2 && // no overflow
+				*start2 + *length2 <= *start1
+			)
+				return true;
+		}
+
+		if (_op1.start && _op1.length && _op2.start && _op2.length)
+		{
+			optional<u256> length1 = knowledge.valueIfKnownConstant(*_op1.length);
+			optional<u256> length2 = knowledge.valueIfKnownConstant(*_op2.length);
+			if (
+				(length1 && *length1 <= 32) &&
+				(length2 && *length2 <= 32) &&
+				knowledge.knownToBeDifferentByAtLeast32(*_op1.start, *_op2.start)
+			)
+				return true;
+		}
+	}
+
+	return false;
+}
+
+bool UnusedStoreEliminator::knownCovered(
+	UnusedStoreEliminator::Operation const& _covered,
+	UnusedStoreEliminator::Operation const& _covering
+) const
+{
+	if (_covered.location != _covering.location)
+		return false;
+	if (
+		(_covered.start && _covered.start == _covering.start) &&
+		(_covered.length && _covered.length == _covering.length)
+	)
+		return true;
+	if (_covered.location == Location::Memory)
+	{
+		KnowledgeBase knowledge(m_dialect, m_ssaValues);
+
+		if (_covered.length && knowledge.knownToBeZero(*_covered.length))
+			return true;
+
+		// Condition (i = cover_i_ng, e = cover_e_d):
+		// i.start <= e.start && e.start + e.length <= i.start + i.length
+		if (!_covered.start || !_covering.start || !_covered.length || !_covering.length)
+			return false;
+		optional<u256> coveredLength = knowledge.valueIfKnownConstant(*_covered.length);
+		optional<u256> coveringLength = knowledge.valueIfKnownConstant(*_covering.length);
+		if (knowledge.knownToBeEqual(*_covered.start, *_covering.start))
+			if (coveredLength && coveringLength && *coveredLength <= *coveringLength)
+				return true;
+		optional<u256> coveredStart = knowledge.valueIfKnownConstant(*_covered.start);
+		optional<u256> coveringStart = knowledge.valueIfKnownConstant(*_covering.start);
+		if (coveredStart && coveringStart && coveredLength && coveringLength)
+			if (
+				*coveringStart <= *coveredStart &&
+				*coveringStart + *coveringLength >= *coveringStart && // no overflow
+				*coveredStart + *coveredLength >= *coveredStart && // no overflow
+				*coveredStart + *coveredLength <= *coveringStart + *coveringLength
+			)
+				return true;
+
+		// TODO for this we probably need a non-overflow assumption as above.
+		// Condition (i = cover_i_ng, e = cover_e_d):
+		// i.start <= e.start && e.start + e.length <= i.start + i.length
+	}
+	return false;
+}
+
+void UnusedStoreEliminator::changeUndecidedTo(
+	State _newState,
+	optional<UnusedStoreEliminator::Location> _onlyLocation)
+{
+	for (auto& [statement, state]: m_stores[YulString{}])
+		if (
+			state == State::Undecided &&
+			(_onlyLocation == nullopt || *_onlyLocation == m_storeOperations.at(statement).location)
+		)
+			state = _newState;
+}
+
+optional<YulString> UnusedStoreEliminator::identifierNameIfSSA(Expression const& _expression) const
+{
+	if (Identifier const* identifier = get_if<Identifier>(&_expression))
+		if (m_ssaValues.count(identifier->name))
+			return {identifier->name};
+	return nullopt;
+}
+
+void UnusedStoreEliminator::scheduleUnusedForDeletion()
+{
+	for (auto const& [statement, state]: m_stores[YulString{}])
+		if (state == State::Unused)
+			m_pendingRemovals.insert(statement);
+}
diff --git a/libyul/optimiser/UnusedStoreEliminator.h b/libyul/optimiser/UnusedStoreEliminator.h
new file mode 100644
index 0000000000..dc3065e45b
--- /dev/null
+++ b/libyul/optimiser/UnusedStoreEliminator.h
@@ -0,0 +1,119 @@
+/*
+	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
+/**
+ * Optimiser component that removes stores to memory and storage slots that are not used
+ * or overwritten later on.
+ */
+
+#pragma once
+
+#include <libyul/ASTForward.h>
+#include <libyul/optimiser/ASTWalker.h>
+#include <libyul/optimiser/OptimiserStep.h>
+#include <libyul/optimiser/Semantics.h>
+#include <libyul/optimiser/UnusedStoreBase.h>
+
+#include <libevmasm/SemanticInformation.h>
+
+#include <map>
+#include <vector>
+
+namespace solidity::yul
+{
+struct Dialect;
+struct AssignedValue;
+
+/**
+ * Optimizer component that removes sstore statements if they
+ * are overwritten in all code paths or never read from.
+ *
+ * The m_store member of UnusedStoreBase is only used with the empty yul string
+ * as key in the first dimension.
+ *
+ * Best run in SSA form.
+ *
+ * Prerequisite: Disambiguator, ForLoopInitRewriter.
+ */
+class UnusedStoreEliminator: public UnusedStoreBase
+{
+public:
+	static constexpr char const* name{"UnusedStoreEliminator"};
+	static void run(OptimiserStepContext& _context, Block& _ast);
+
+	explicit UnusedStoreEliminator(
+		Dialect const& _dialect,
+		std::map<YulString, SideEffects> const& _functionSideEffects,
+		std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects,
+		std::map<YulString, AssignedValue> const& _ssaValues,
+		bool _ignoreMemory
+	):
+		UnusedStoreBase(_dialect),
+		m_ignoreMemory(_ignoreMemory),
+		m_functionSideEffects(_functionSideEffects),
+		m_controlFlowSideEffects(_controlFlowSideEffects),
+		m_ssaValues(_ssaValues)
+	{}
+
+	using UnusedStoreBase::operator();
+	void operator()(FunctionCall const& _functionCall) override;
+	void operator()(FunctionDefinition const&) override;
+	void operator()(Leave const&) override;
+
+	using UnusedStoreBase::visit;
+	void visit(Statement const& _statement) override;
+
+	using Location = evmasm::SemanticInformation::Location;
+	using Effect = evmasm::SemanticInformation::Effect;
+	struct Operation
+	{
+		Location location;
+		Effect effect;
+		/// Start of affected area. Unknown if not provided.
+		std::optional<YulString> start;
+		/// Length of affected area, unknown if not provided.
+		/// Unused for storage.
+		std::optional<YulString> length;
+	};
+
+private:
+	void shortcutNestedLoop(TrackedStores const&) override
+	{
+		// We might only need to do this for newly introduced stores in the loop.
+		changeUndecidedTo(State::Used);
+	}
+	void finalizeFunctionDefinition(FunctionDefinition const&) override;
+
+	std::vector<Operation> operationsFromFunctionCall(FunctionCall const& _functionCall) const;
+	void applyOperation(Operation const& _operation);
+	bool knownUnrelated(Operation const& _op1, Operation const& _op2) const;
+	bool knownCovered(Operation const& _covered, Operation const& _covering) const;
+
+	void changeUndecidedTo(State _newState, std::optional<Location> _onlyLocation = std::nullopt);
+	void scheduleUnusedForDeletion();
+
+	std::optional<YulString> identifierNameIfSSA(Expression const& _expression) const;
+
+	bool const m_ignoreMemory;
+	std::map<YulString, SideEffects> const& m_functionSideEffects;
+	std::map<YulString, ControlFlowSideEffects> m_controlFlowSideEffects;
+	std::map<YulString, AssignedValue> const& m_ssaValues;
+
+	std::map<Statement const*, Operation> m_storeOperations;
+};
+
+}
diff --git a/test/cmdlineTests/constant_optimizer_yul/output b/test/cmdlineTests/constant_optimizer_yul/output
index 2a769811a6..ae0b7a0f6c 100644
--- a/test/cmdlineTests/constant_optimizer_yul/output
+++ b/test/cmdlineTests/constant_optimizer_yul/output
@@ -27,7 +27,6 @@ object "C_12" {
         code {
             {
                 /// @src 0:61:418  "contract C {..."
-                mstore(64, memoryguard(0x80))
                 if callvalue() { revert(0, 0) }
                 /// @src 0:279:410  "assembly {..."
                 sstore(0, 0x1000000000000000000000000000000000000000000000)
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
index 7775ff69ca..3b0e1d3ba8 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
@@ -201,16 +201,14 @@ object "C_6" {
         code {
             {
                 /// @src 0:60:101  "contract C {..."
-                let _1 := memoryguard(0x80)
-                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _2 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_2)))
+                    let _1 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_1)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
-                        return(_1, _2)
+                        if callvalue() { revert(_1, _1) }
+                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        return(memoryguard(0x80), _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
index 35f680d923..94d7481691 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
@@ -200,16 +200,14 @@ object "C_6" {
         code {
             {
                 /// @src 0:60:101
-                let _1 := memoryguard(0x80)
-                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _2 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_2)))
+                    let _1 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_1)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
-                        return(_1, _2)
+                        if callvalue() { revert(_1, _1) }
+                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        return(memoryguard(0x80), _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
index 93fad04216..706b8f773f 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
@@ -189,16 +189,14 @@ object "C_6" {
     object "C_6_deployed" {
         code {
             {
-                let _1 := memoryguard(0x80)
-                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _2 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_2)))
+                    let _1 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_1)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
-                        return(_1, _2)
+                        if callvalue() { revert(_1, _1) }
+                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        return(memoryguard(0x80), _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
index 82a74384e7..1408b60210 100644
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
@@ -95,7 +95,6 @@ object "C_2" {
         code {
             {
                 /// @src 0:265:278  "contract C {}"
-                mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
         }
@@ -559,7 +558,6 @@ object "D_27" {
                 code {
                     {
                         /// @src 0:265:278  "contract C {}"
-                        mstore(64, memoryguard(0x80))
                         revert(0, 0)
                     }
                 }
diff --git a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
index 330e208f45..5246a50ee6 100644
--- a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
+++ b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
@@ -24,7 +24,6 @@ object "C_7" {
         code {
             {
                 /// @src 0:82:117  "contract C {..."
-                mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
         }
@@ -58,7 +57,6 @@ object "D_10" {
         code {
             {
                 /// @src 0:118:137  "contract D is C {..."
-                mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
         }
diff --git a/test/cmdlineTests/ir_compiler_subobjects/output b/test/cmdlineTests/ir_compiler_subobjects/output
index fbedf38db8..80d90aac50 100644
--- a/test/cmdlineTests/ir_compiler_subobjects/output
+++ b/test/cmdlineTests/ir_compiler_subobjects/output
@@ -24,7 +24,6 @@ object "C_3" {
         code {
             {
                 /// @src 0:82:95  "contract C {}"
-                mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
         }
@@ -110,7 +109,6 @@ object "D_16" {
                 code {
                     {
                         /// @src 0:82:95  "contract C {}"
-                        mstore(64, memoryguard(0x80))
                         revert(0, 0)
                     }
                 }
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
index d9b769a124..90c7ddf650 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
@@ -11,11 +11,7 @@ object "D_12" {
     code {
         {
             /// @src 0:82:175  "contract D {..."
-            mstore(64, 128)
             if callvalue() { revert(0, 0) }
-            /// @src 0:115:139  "assembly { mstore(0,0) }"
-            mstore(0, 0)
-            /// @src 0:82:175  "contract D {..."
             let _1 := datasize("D_12_deployed")
             codecopy(128, dataoffset("D_12_deployed"), _1)
             return(128, _1)
@@ -26,16 +22,14 @@ object "D_12" {
         code {
             {
                 /// @src 0:82:175  "contract D {..."
-                let _1 := memoryguard(0x80)
-                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _2 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_2)))
+                    let _1 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_1)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
-                        return(_1, _2)
+                        if callvalue() { revert(_1, _1) }
+                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        return(memoryguard(0x80), _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
index 9a07c7861f..7738519c4b 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
@@ -24,7 +24,6 @@ object "D_8" {
         code {
             {
                 /// @src 0:82:166  "contract D {..."
-                mstore(64, 128)
                 if iszero(lt(calldatasize(), 4))
                 {
                     let _1 := 0
@@ -32,8 +31,6 @@ object "D_8" {
                     {
                         if callvalue() { revert(_1, _1) }
                         if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        /// @src 0:134:158  "assembly { mstore(0,0) }"
-                        mstore(/** @src 0:82:166  "contract D {..." */ _1, _1)
                         return(128, _1)
                     }
                 }
diff --git a/test/cmdlineTests/keccak_optimization_deploy_code/output b/test/cmdlineTests/keccak_optimization_deploy_code/output
index 4abb046f63..b70a029fcb 100644
--- a/test/cmdlineTests/keccak_optimization_deploy_code/output
+++ b/test/cmdlineTests/keccak_optimization_deploy_code/output
@@ -11,7 +11,6 @@ object "C_12" {
     code {
         {
             /// @src 0:62:463  "contract C {..."
-            mstore(64, 128)
             if callvalue() { revert(0, 0) }
             /// @src 0:103:275  "assembly {..."
             mstore(0, 100)
@@ -27,10 +26,8 @@ object "C_12" {
         code {
             {
                 /// @src 0:62:463  "contract C {..."
-                mstore(64, 128)
                 if callvalue() { revert(0, 0) }
                 /// @src 0:317:454  "assembly {..."
-                mstore(0, 100)
                 sstore(0, 17385872270140913825666367956517731270094621555228275961425792378517567244498)
                 /// @src 0:62:463  "contract C {..."
                 stop()
diff --git a/test/cmdlineTests/keccak_optimization_low_runs/output b/test/cmdlineTests/keccak_optimization_low_runs/output
index f5df14027a..691e37145e 100644
--- a/test/cmdlineTests/keccak_optimization_low_runs/output
+++ b/test/cmdlineTests/keccak_optimization_low_runs/output
@@ -24,7 +24,6 @@ object "C_7" {
         code {
             {
                 /// @src 0:62:285  "contract C {..."
-                mstore(64, 128)
                 if callvalue() { revert(0, 0) }
                 /// @src 0:109:277  "assembly {..."
                 mstore(0, 100)
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index 238934a3f0..f7d61a7b1a 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -1,8 +1,5 @@
 {"contracts":{"C":{"C":{"evm":{"assembly":"    /* \"C\":79:428  contract C... */
   0xa0
-  dup1
-  0x40
-  mstore
   jumpi(tag_6, callvalue)
   0x1f
   bytecodeSize
@@ -438,9 +435,6 @@ sub_0: assembly {
 }
 "}}},"D":{"D":{"evm":{"assembly":"    /* \"D\":91:166  contract D is C(3)... */
   0xa0
-  dup1
-  0x40
-  mstore
   jumpi(tag_6, callvalue)
   0x1f
   bytecodeSize
@@ -514,13 +508,8 @@ tag_4:
 tag_1:
     /* \"C\":147:149  42 */
   mstore(0x80, 0x2a)
-    /* \"D\":107:108  3 */
-  0x03
-    /* \"C\":203:219  stateVar = _init */
-  0x00
-    /* \"D\":91:166  contract D is C(3)... */
-  sstore
   sub(shl(0xff, 0x01), 0x04)
+    /* \"D\":91:166  contract D is C(3)... */
   dup2
   sgt
   0x01
@@ -531,9 +520,7 @@ tag_1:
   0x03
     /* \"D\":91:166  contract D is C(3)... */
   add
-    /* \"C\":203:219  stateVar = _init */
   0x00
-    /* \"D\":91:166  contract D is C(3)... */
   sstore
     /* \"D\":113:164  constructor(int _init2)... */
   jump\t// out
@@ -541,17 +528,9 @@ tag_1:
 tag_9:
   pop
   pop
-  shl(0xe0, 0x4e487b71)
-    /* \"C\":203:219  stateVar = _init */
-  0x00
-    /* \"D\":91:166  contract D is C(3)... */
-  mstore
+  mstore(0x00, shl(0xe0, 0x4e487b71))
   mstore(0x04, 0x11)
-  0x24
-    /* \"C\":203:219  stateVar = _init */
-  0x00
-    /* \"D\":91:166  contract D is C(3)... */
-  revert
+  revert(0x00, 0x24)
 stop
 
 sub_0: assembly {
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
index 16236251d3..44c143b714 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
@@ -206,16 +206,14 @@ object \"C_6\" {
         code {
             {
                 /// @src 0:60:101  \"contract C {...\"
-                let _1 := memoryguard(0x80)
-                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _2 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_2)))
+                    let _1 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_1)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
-                        return(_1, _2)
+                        if callvalue() { revert(_1, _1) }
+                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        return(memoryguard(0x80), _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
index d017c8e9c2..8dad4c42ec 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
@@ -205,16 +205,14 @@ object \"C_6\" {
         code {
             {
                 /// @src 0:60:101
-                let _1 := memoryguard(0x80)
-                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _2 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_2)))
+                    let _1 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_1)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
-                        return(_1, _2)
+                        if callvalue() { revert(_1, _1) }
+                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        return(memoryguard(0x80), _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
index afe07fad93..1675f7ec5a 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
@@ -194,16 +194,14 @@ object \"C_6\" {
     object \"C_6_deployed\" {
         code {
             {
-                let _1 := memoryguard(0x80)
-                mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _2 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_2)))
+                    let _1 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_1)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
-                        return(_1, _2)
+                        if callvalue() { revert(_1, _1) }
+                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        return(memoryguard(0x80), _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index f593301bcc..f21722a633 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -622,7 +622,6 @@ object \"C_54\" {
         {
             /// @src 0:79:435  \"contract C...\"
             let _1 := memoryguard(0xa0)
-            mstore(64, _1)
             if callvalue() { revert(0, 0) }
             let programSize := datasize(\"C_54\")
             let argSize := sub(codesize(), programSize)
@@ -1469,7 +1468,6 @@ object \"D_72\" {
         {
             /// @src 1:91:166  \"contract D is C(3)...\"
             let _1 := memoryguard(0xa0)
-            mstore(64, _1)
             if callvalue() { revert(0, 0) }
             let programSize := datasize(\"D_72\")
             let argSize := sub(codesize(), programSize)
@@ -1500,15 +1498,13 @@ object \"D_72\" {
             /// @src 0:154:156  \"42\"
             mstore(128, 0x2a)
             /// @src 1:91:166  \"contract D is C(3)...\"
-            sstore(/** @src 0:210:226  \"stateVar = _init\" */ 0x00, /** @src 1:107:108  \"3\" */ 0x03)
-            /// @src 1:91:166  \"contract D is C(3)...\"
             if and(1, sgt(var_init2, sub(shl(255, 1), 4)))
             {
-                mstore(/** @src 0:210:226  \"stateVar = _init\" */ 0x00, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(224, 0x4e487b71))
+                mstore(0, shl(224, 0x4e487b71))
                 mstore(4, 0x11)
-                revert(/** @src 0:210:226  \"stateVar = _init\" */ 0x00, /** @src 1:91:166  \"contract D is C(3)...\" */ 0x24)
+                revert(0, 0x24)
             }
-            sstore(/** @src 0:210:226  \"stateVar = _init\" */ 0x00, /** @src 1:91:166  \"contract D is C(3)...\" */ add(/** @src 1:107:108  \"3\" */ 0x03, /** @src 1:91:166  \"contract D is C(3)...\" */ var_init2))
+            sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ add(/** @src 1:107:108  \"3\" */ 0x03, /** @src 1:91:166  \"contract D is C(3)...\" */ var_init2))
         }
     }
     /// @use-src 0:\"C\", 1:\"D\"
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
index 8b5666b378..7dec204b1a 100644
--- a/test/cmdlineTests/viair_subobject_optimization/output
+++ b/test/cmdlineTests/viair_subobject_optimization/output
@@ -3,9 +3,6 @@
 EVM assembly:
     /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
   0x80
-  dup1
-  0x40
-  mstore
   jumpi(tag_6, callvalue)
   0x1f
   bytecodeSize
@@ -86,7 +83,6 @@ stop
 
 sub_0: assembly {
         /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
-      mstore(0x40, 0x80)
       0x00
       dup1
       revert
@@ -120,9 +116,6 @@ stop
 sub_0: assembly {
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
       0x80
-      dup1
-      0x40
-      mstore
       jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
     tag_3:
       pop
@@ -283,9 +276,6 @@ sub_0: assembly {
     sub_0: assembly {
             /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
           0x80
-          dup1
-          0x40
-          mstore
           jumpi(tag_6, callvalue)
           0x1f
           bytecodeSize
@@ -366,7 +356,6 @@ sub_0: assembly {
 
         sub_0: assembly {
                 /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
-              mstore(0x40, 0x80)
               0x00
               dup1
               revert
diff --git a/test/cmdlineTests/viair_subobjects/output b/test/cmdlineTests/viair_subobjects/output
index 4b388665cf..aea2013ec4 100644
--- a/test/cmdlineTests/viair_subobjects/output
+++ b/test/cmdlineTests/viair_subobjects/output
@@ -30,7 +30,6 @@ object "C_3" {
         code {
             {
                 /// @src 0:82:95  "contract C {}"
-                mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
         }
@@ -122,7 +121,6 @@ object "D_16" {
                 code {
                     {
                         /// @src 0:82:95  "contract C {}"
-                        mstore(64, memoryguard(0x80))
                         revert(0, 0)
                     }
                 }
diff --git a/test/formal/redundant_store_unrelated.py b/test/formal/redundant_store_unrelated.py
new file mode 100644
index 0000000000..2961d0099c
--- /dev/null
+++ b/test/formal/redundant_store_unrelated.py
@@ -0,0 +1,63 @@
+import sys
+from z3 import Solver, Int, unsat
+
+"""
+Tests that the conditions inside RedundantStoreEliminator::knownUnrelated
+only return "unrelated" incorrectly if one of the operation reverts
+due to large memory access.
+"""
+
+n_bits = 256
+
+solver = Solver()
+solver.set("timeout", 60000)
+
+def restrict(x):
+    solver.add(x >= 0)
+    solver.add(x < 2**n_bits)
+
+def restrictedInt(x):
+    var = Int(x)
+    restrict(var)
+    return var
+
+start1 = restrictedInt('start1')
+length1 = restrictedInt('length1')
+start2 = restrictedInt('start2')
+length2 = restrictedInt('length2')
+
+k = Int('k')
+diff = Int('diff')
+solver.add(diff == start2 - start1 + k * 2**n_bits)
+restrict(diff)
+# diff is the result of sub(start2, start1) in EVM
+
+# These are the conditions in the code.
+solver.add(diff >= length1)
+solver.add(diff <= 2**(n_bits-1))
+
+# We check that the two conditions are conflicting:
+# - overlap
+# - start1 is small
+
+# Overlap:
+# x is a potential point where the memory operations
+# overlap.
+# Note that we do not use wrapping arithmetic
+# here, because it is not done in the EVM either.
+# For example calldatacopy(2**256 - 2, 0, 10)
+# (copy 10 bytes from calldata position zero to memory
+# position 2**256 - 2) would not write to memory position
+# zero either.
+x = Int('x')
+solver.add(start1 <= x)
+solver.add(x < start1 + length1)
+solver.add(start2 <= x)
+solver.add(x < start2 + length2)
+
+# start1 is "small":
+solver.add(start1 < 2**(n_bits-1))
+
+if solver.check() != unsat:
+  print("Expected unsat but got something else")
+  sys.exit(1)
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
index b4b3929746..6eb0de4211 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
@@ -17,7 +17,7 @@ contract c {
 // ----
 // setData1(uint256,uint256,uint256): 10, 5, 4 ->
 // copyStorageStorage() ->
-// gas irOptimized: 111406
+// gas irOptimized: 111397
 // gas legacy: 109278
 // gas legacyOptimized: 109268
 // getData2(uint256): 5 -> 10, 4
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index 87c2382066..b7b8e4be24 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -48,6 +48,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0xff
-// gas irOptimized: 121145
+// gas irOptimized: 121125
 // gas legacy: 128005
 // gas legacyOptimized: 123446
diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
index 82c8d6b6cc..8d0f6358e3 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
@@ -16,4 +16,4 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0, 0, 0
-// gas irOptimized: 91098
+// gas irOptimized: 90992
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index d2358b1e2f..1550df0d41 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -19,5 +19,5 @@ contract c {
 // test() ->
 // gas irOptimized: 142640
 // gas legacy: 164430
-// gas legacyOptimized: 158513
+// gas legacyOptimized: 157898
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index 7a05b5328b..d783be0b28 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -26,6 +26,6 @@ contract Main {
 // compileViaYul: also
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 113613
+// gas irOptimized: 113604
 // gas legacy: 126596
 // gas legacyOptimized: 113823
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
index bb9567dd04..1fa4688699 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -19,7 +19,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(): "abc", true
-// gas irOptimized: 106267
+// gas irOptimized: 106221
 // gas legacy: 145838
 // gas legacyOptimized: 104017
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index 1352c6e1c8..e509019458 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -19,6 +19,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 123036
+// gas irOptimized: 120036
 // gas legacy: 123226
 // gas legacyOptimized: 123092
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index 0b8982d408..21738240a2 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -11,7 +11,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 103363
+// gas irOptimized: 103290
 // gas legacy: 117158
 // i() -> 2
 // k() -> 0
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index 8f891116e4..635a60c016 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -23,7 +23,7 @@ contract D is B, C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 160166
+// gas irOptimized: 160093
 // gas legacy: 170665
 // gas legacyOptimized: 145396
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index 9f33757b14..2d8b667ef5 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -14,7 +14,7 @@ contract D is C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 123980
+// gas irOptimized: 123907
 // gas legacy: 139250
 // gas legacyOptimized: 119367
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index 0b94078147..a67b1b5ad8 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -17,7 +17,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 203982
+// gas irOptimized: 203909
 // gas legacy: 245842
 // gas legacyOptimized: 195676
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index a4796ac825..b03734532e 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -18,7 +18,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 204145
+// gas irOptimized: 204072
 // gas legacy: 246202
 // gas legacyOptimized: 195914
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 639f399454..933bf342d1 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -18,7 +18,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 219069
+// gas irOptimized: 216903
 // gas legacy: 294335
 // gas legacyOptimized: 174279
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
diff --git a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
index 617a6dec28..1524c46d04 100644
--- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
+++ b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
@@ -19,7 +19,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 102862
+// gas irOptimized: 101782
 // gas legacy: 116691
 // gas legacyOptimized: 100361
 // s() -> true
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index 52ed2bc769..354e5d82b4 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -42,7 +42,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 282981
+// gas irOptimized: 282916
 // gas legacy: 402045
 // gas legacyOptimized: 266772
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index e8d22c279c..60741d4c45 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -22,6 +22,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 119561
+// gas irOptimized: 119501
 // gas legacy: 124793
 // gas legacyOptimized: 119694
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create.sol b/test/libsolidity/semanticTests/salted_create/salted_create.sol
index 5374d23521..51b987c2ca 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create.sol
@@ -22,6 +22,6 @@ contract A {
 // ----
 // different_salt() -> true
 // same_salt() -> true
-// gas irOptimized: 98438914
+// gas irOptimized: 98438898
 // gas legacy: 98439116
 // gas legacyOptimized: 98438970
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 780cc32b83..aab46a9a4b 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -22,6 +22,6 @@ contract A {
 // compileViaYul: also
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 272467
+// gas irOptimized: 272431
 // gas legacy: 422501
 // gas legacyOptimized: 287472
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index a6e812e9a0..44d7d502fb 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -14,7 +14,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 2 wei: 3 ->
-// gas irOptimized: 111699
+// gas irOptimized: 111607
 // gas legacy: 151416
 // gas legacyOptimized: 108388
 // state() -> 3
diff --git a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
index 21757ea407..4305687b7c 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
@@ -21,6 +21,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> true
-// gas irOptimized: 110186
+// gas irOptimized: 110177
 // gas legacy: 110627
 // gas legacyOptimized: 109706
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
index 6f88df3949..abc10d8aa8 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
@@ -27,4 +27,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 0
-// gas irOptimized: 111896
+// gas irOptimized: 112129
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
index fe791a68dd..936039f5e0 100644
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
+++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
@@ -32,6 +32,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 42, 23, 34, 42, 42
-// gas irOptimized: 110966
+// gas irOptimized: 110845
 // gas legacy: 112021
 // gas legacyOptimized: 110548
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index 3356eac164..412b71d39f 100644
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ b/test/libsolidity/semanticTests/structs/structs.sol
@@ -32,7 +32,7 @@ contract test {
 // ----
 // check() -> false
 // set() ->
-// gas irOptimized: 134432
+// gas irOptimized: 134411
 // gas legacy: 135277
 // gas legacyOptimized: 134064
 // check() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
index 433d1969c6..0305fd473b 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
@@ -25,7 +25,7 @@ contract C {
 // ----
 // s() -> 0, 0, 0x00, 0
 // f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 ->
-// gas irOptimized: 44786
+// gas irOptimized: 44405
 // gas legacy: 47200
 // gas legacyOptimized: 44923
 // s() -> 1, 0xff, 0x6162000000000000000000000000000000000000000000000000000000000000, 15
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
index 04e9936823..b250bea87c 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
@@ -25,7 +25,7 @@ contract C {
 // ----
 // s() -> 0, 0, 0x00, 0
 // f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 ->
-// gas irOptimized: 44536
+// gas irOptimized: 44473
 // gas legacy: 46213
 // gas legacyOptimized: 44671
 // s() -> 1, 0xff, 0x6162000000000000000000000000000000000000000000000000000000000000, 15
diff --git a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
index 57942979ae..8061385627 100644
--- a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
+++ b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
@@ -21,4 +21,4 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 104337
+// gas irOptimized: 102813
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index e7711f5866..60826665a0 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -54,6 +54,7 @@
 #include <libyul/optimiser/SSATransform.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/UnusedAssignEliminator.h>
+#include <libyul/optimiser/UnusedStoreEliminator.h>
 #include <libyul/optimiser/StructuralSimplifier.h>
 #include <libyul/optimiser/StackCompressor.h>
 #include <libyul/optimiser/Suite.h>
@@ -237,6 +238,15 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			ForLoopInitRewriter::run(*m_context, *m_ast);
 			UnusedAssignEliminator::run(*m_context, *m_ast);
 		}},
+		{"unusedStoreEliminator", [&]() {
+			disambiguate();
+			ForLoopInitRewriter::run(*m_context, *m_ast);
+			ExpressionSplitter::run(*m_context, *m_ast);
+			SSATransform::run(*m_context, *m_ast);
+			UnusedStoreEliminator::run(*m_context, *m_ast);
+			SSAReverser::run(*m_context, *m_ast);
+			ExpressionJoiner::run(*m_context, *m_ast);
+		}},
 		{"equalStoreEliminator", [&]() {
 			disambiguate();
 			FunctionHoister::run(*m_context, *m_ast);
diff --git a/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul b/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul
new file mode 100644
index 0000000000..436f5d5faf
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/extcodelength.yul
@@ -0,0 +1,40 @@
+{
+    let _1 := 0
+    let value := calldataload(4)
+    if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(_1, _1) }
+    let length := extcodesize(value)
+    let _2 := 0xffffffffffffffff
+    if gt(length, _2) { revert(0, 0) }
+    let _3 := not(31)
+    let memPtr := mload(64)
+    let newFreePtr := add(memPtr, and(add(and(add(length, 31), _3), 63), _3))
+    if or(gt(newFreePtr, _2), lt(newFreePtr, memPtr)) { revert(0, 0) }
+    mstore(64, newFreePtr)
+    mstore(memPtr, length)
+
+    // We aim to optimize this out.
+    extcodecopy(value, add(memPtr, 32), _1, length)
+    sstore(_1, mload(memPtr))
+}
+// ====
+// EVMVersion: >byzantium
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         let value := calldataload(4)
+//         if iszero(eq(value, and(value, sub(shl(160, 1), 1)))) { revert(0, 0) }
+//         let length := extcodesize(value)
+//         let _1 := 0xffffffffffffffff
+//         if gt(length, _1) { revert(0, 0) }
+//         let memPtr := mload(64)
+//         let _2 := not(31)
+//         let newFreePtr := add(memPtr, and(add(and(add(length, 31), _2), 63), _2))
+//         if or(gt(newFreePtr, _1), lt(newFreePtr, memPtr)) { revert(0, 0) }
+//         mstore(64, newFreePtr)
+//         mstore(memPtr, length)
+//         extcodecopy(value, add(memPtr, 32), 0, length)
+//         sstore(0, mload(memPtr))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/medium.yul b/test/libyul/yulOptimizerTests/fullSuite/medium.yul
index 41b77c1157..9a6381d799 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/medium.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/medium.yul
@@ -23,13 +23,7 @@
 //
 // {
 //     {
-//         let p := mload(0x40)
-//         mstore(0x40, add(p, 0x20))
-//         mstore(0x40, add(p, 96))
-//         let p_1 := add(p, 128)
-//         mstore(p_1, 2)
-//         mstore(0x40, 0x20)
-//         sstore(0, p_1)
+//         sstore(0, add(mload(0x40), 128))
 //         sstore(1, 0x20)
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul b/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul
index a0ac5c36d2..3176613253 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/remove_redundant_assignments_in_switch.yul
@@ -15,6 +15,5 @@
 //         case 0 { }
 //         case 1 { }
 //         default { invalid() }
-//         mstore(1, 1)
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
index 13683e8e6a..75e2ff4c20 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/stack_compressor_msize.yul
@@ -52,9 +52,9 @@
 //         pop(keccak256(gcd(_3, _2), or(gt(not(gcd(_3, _2)), _1), _1)))
 //         mstore(lt(or(gt(_1, or(or(gt(or(or(or(gt(or(gt(_6, _9), _1), _8), _7), _5), _1), _1), _4), _1)), _1), _1), _1)
 //         sstore(not(gcd(_3, _2)), _1)
-//         sstore(0, 0)
 //         sstore(2, _1)
 //         extcodecopy(_1, msize(), _1, _1)
+//         sstore(0, 0)
 //         sstore(3, _1)
 //     }
 //     function gcd(_a, _b) -> out
diff --git a/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul b/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
index c5f4aa466c..72c09d3dc3 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
@@ -39,7 +39,6 @@
 //                 mstore(4, 0x32)
 //                 revert(_1, 0x24)
 //             }
-//             mstore(_1, _1)
 //             sstore(0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56d, 0x05)
 //         }
 //     }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/storage.yul b/test/libyul/yulOptimizerTests/fullSuite/storage.yul
index 7b3360847e..a60b3d3486 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/storage.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/storage.yul
@@ -8,7 +8,6 @@
 //
 // {
 //     {
-//         sstore(4, 5)
 //         sstore(4, 3)
 //         sstore(8, 3)
 //     }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul
index b7f0b4afbf..6f82ab27a6 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner.yul
@@ -20,7 +20,6 @@
 // {
 //     {
 //         let out1, out2 := foo(sload(32))
-//         sstore(0, out1)
 //         sstore(0, out2)
 //         let out1_1, out2_1 := foo(sload(8))
 //     }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
index ee648f80f9..7955ee12ea 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
@@ -18,9 +18,9 @@
 // {
 //     {
 //         f()
-//         sstore(0, 1)
 //         f()
 //         f()
+//         sstore(0, 1)
 //     }
 //     function f()
 //     {
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul
index c3b75e84ee..92d251cabe 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_recursion.yul
@@ -18,7 +18,6 @@
 //     {
 //         let x, y, z := f()
 //         sstore(0, x)
-//         sstore(1, y)
 //         sstore(1, z)
 //     }
 //     function f() -> x, y, z
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul
index 14f0137cb1..b066d998ba 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_return.yul
@@ -22,8 +22,6 @@
 // {
 //     {
 //         let out1, out2 := foo(sload(32))
-//         sstore(0, out1)
-//         sstore(0, out2)
 //         sstore(0, 0)
 //         let out1_1, out2_1 := foo(sload(8))
 //     }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul
index 68620cc96b..785840baa3 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_simple.yul
@@ -16,9 +16,9 @@
 // {
 //     {
 //         f()
-//         sstore(0, 1)
 //         f()
 //         f()
+//         sstore(0, 1)
 //     }
 //     function f()
 //     {
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul
new file mode 100644
index 0000000000..eeff779f85
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/call_does_not_need_to_write.yul
@@ -0,0 +1,24 @@
+{
+  mstore(0, 1)
+  let x := call(
+      0,
+      0,
+      0,
+      0,
+      0,
+      0,
+      0x32 // length is only a max length, so there is no guarantee that the mstore above is overwritten.
+    )
+  sstore(0, mload(0))
+}
+
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         mstore(0, 1)
+//         let x := call(0, 0, 0, 0, 0, 0, 0x32)
+//         sstore(0, mload(0))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul
new file mode 100644
index 0000000000..7fd227089b
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy.yul
@@ -0,0 +1,59 @@
+{
+    let start := calldataload(0x10)
+    if calldataload(0) {
+        // not covered
+        mstore(add(start, 2), 7)
+        calldatacopy(start, 0, 0x20)
+    }
+    if calldataload(1) {
+        // covered
+        mstore(add(start, 2), 9)
+        calldatacopy(add(start, 1), 0, 0x21)
+    }
+    if calldataload(2) {
+        // covered
+        mstore8(add(start, 2), 7)
+        calldatacopy(start, 0, 3)
+    }
+    if calldataload(3) {
+        // not covered
+        mstore8(add(start, 3), 7)
+        calldatacopy(start, 0, 3)
+    }
+    sstore(0, keccak256(start, 0x40))
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let start := calldataload(0x10)
+//         if calldataload(0)
+//         {
+//             let _4 := 7
+//             mstore(add(start, 2), _4)
+//             calldatacopy(start, 0, 0x20)
+//         }
+//         if calldataload(1)
+//         {
+//             let _11 := 9
+//             mstore(add(start, 2), _11)
+//             let _14 := 0x21
+//             let _15 := 0
+//             calldatacopy(add(start, 1), _15, _14)
+//         }
+//         if calldataload(2)
+//         {
+//             let _20 := 7
+//             mstore8(add(start, 2), _20)
+//             calldatacopy(start, 0, 3)
+//         }
+//         if calldataload(3)
+//         {
+//             let _27 := 7
+//             mstore8(add(start, 3), _27)
+//             calldatacopy(start, 0, 3)
+//         }
+//         sstore(0, keccak256(start, 0x40))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul
new file mode 100644
index 0000000000..47e0b95fa3
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/covering_calldatacopy_fixed.yul
@@ -0,0 +1,53 @@
+{
+    if calldataload(0) {
+        // not covered
+        mstore(2, 7)
+        calldatacopy(0, 0, 0x20)
+    }
+    if calldataload(1) {
+        // covered
+        mstore(2, 9)
+        calldatacopy(1, 0, 0x21)
+    }
+    if calldataload(2) {
+        // covered
+        mstore8(2, 7)
+        calldatacopy(0, 0, 3)
+    }
+    if calldataload(3) {
+        // not covered
+        mstore8(3, 7)
+        calldatacopy(0, 0, 3)
+    }
+    sstore(0, keccak256(0, 0x40))
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         if calldataload(0)
+//         {
+//             mstore(2, 7)
+//             calldatacopy(0, 0, 0x20)
+//         }
+//         if calldataload(1)
+//         {
+//             let _10 := 9
+//             let _11 := 2
+//             calldatacopy(1, 0, 0x21)
+//         }
+//         if calldataload(2)
+//         {
+//             let _17 := 7
+//             let _18 := 2
+//             calldatacopy(0, 0, 3)
+//         }
+//         if calldataload(3)
+//         {
+//             mstore8(3, 7)
+//             calldatacopy(0, 0, 3)
+//         }
+//         sstore(0, keccak256(0, 0x40))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul
new file mode 100644
index 0000000000..c3183d9ec8
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/create.yul
@@ -0,0 +1,17 @@
+{
+    let x := 5
+    sstore(x, 10)
+    pop(create(0, 0, 0))
+    sstore(x, 20)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 5
+//         sstore(x, 10)
+//         pop(create(0, 0, 0))
+//         sstore(x, 20)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul
new file mode 100644
index 0000000000..782c68663b
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/create_inside_function.yul
@@ -0,0 +1,22 @@
+{
+    let x := 5
+    function f() {
+        pop(create(0, 0, 0))
+    }
+    sstore(x, 10)
+    f()
+    sstore(x, 20)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 5
+//         sstore(x, 10)
+//         f()
+//         sstore(x, 20)
+//     }
+//     function f()
+//     { pop(create(0, 0, 0)) }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul
new file mode 100644
index 0000000000..cb69be3635
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_end.yul
@@ -0,0 +1,20 @@
+{
+    function f() {
+        let x := calldataload(2)
+        mstore(x, 2)
+        // This cannot be removed because we do not know what happens after the function.
+        mstore(x, 3)
+    }
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     { }
+//     function f()
+//     {
+//         let x := calldataload(2)
+//         let _2 := 2
+//         mstore(x, 3)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul
new file mode 100644
index 0000000000..25f9355b3b
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects.yul
@@ -0,0 +1,55 @@
+{
+    function justStop() { return(0, 0) }
+    function justRevert() { revert(0, 0) }
+
+    let x := 0
+    let y := 1
+    let a := 0x80
+    let b := 7
+    let c := 9
+    switch calldataload(0)
+    case 0
+    {
+        sstore(x, y)
+        mstore(a, b)
+        justStop()
+        sstore(x, y)
+        mstore(a, b)
+    }
+    case 1
+    {
+        sstore(x, y)
+        mstore(a, b)
+        justRevert()
+        sstore(x, y)
+        mstore(a, b)
+    }
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 0
+//         let y := 1
+//         let a := 0x80
+//         let b := 7
+//         let c := 9
+//         switch calldataload(0)
+//         case 0 {
+//             sstore(x, y)
+//             mstore(a, b)
+//             justStop()
+//             sstore(x, y)
+//         }
+//         case 1 {
+//             mstore(a, b)
+//             justRevert()
+//             sstore(x, y)
+//         }
+//     }
+//     function justStop()
+//     { return(0, 0) }
+//     function justRevert()
+//     { revert(0, 0) }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul
new file mode 100644
index 0000000000..843f7f6e9f
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_2.yul
@@ -0,0 +1,28 @@
+{
+   let x := 0
+   let y := 1
+   sstore(x, y)
+   f()
+   sstore(x, y)
+   function f() {
+      // prevent inlining
+      f()
+      return(0, 0)
+   }
+  }
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 0
+//         let y := 1
+//         f()
+//         sstore(x, y)
+//     }
+//     function f()
+//     {
+//         f()
+//         return(0, 0)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul
new file mode 100644
index 0000000000..7054dc2554
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/if_overwrite_all_branches.yul
@@ -0,0 +1,20 @@
+{
+    let c := calldataload(0)
+    // This store will be overwritten in all branches and thus can be removed.
+    sstore(c, 1)
+    if c {
+        sstore(c, 2)
+    }
+    sstore(c, 3)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let c := calldataload(0)
+//         let _2 := 1
+//         if c { let _3 := 2 }
+//         sstore(c, 3)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul
new file mode 100644
index 0000000000..92a7515541
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/leave.yul
@@ -0,0 +1,23 @@
+{
+    function f() {
+        mstore(0, 5)
+        if calldataload(0) { leave }
+        mstore(0x20, 5)
+        revert(0, 0)
+    }
+    f()
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     { f() }
+//     function f()
+//     {
+//         mstore(0, 5)
+//         if calldataload(0) { leave }
+//         let _5 := 5
+//         let _6 := 0x20
+//         revert(0, 0)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul
new file mode 100644
index 0000000000..466cd02e53
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/memoryguard.yul
@@ -0,0 +1,24 @@
+{
+    mstore(0x40, memoryguard(100))
+    let free_mem_ptr := mload(0x40)
+    // redundant
+    mstore(free_mem_ptr, 100)
+    // redundant
+    mstore8(add(free_mem_ptr, 31), 200)
+    mstore(free_mem_ptr, 300)
+    return(free_mem_ptr, add(free_mem_ptr, 100))
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         mstore(0x40, memoryguard(100))
+//         let free_mem_ptr := mload(0x40)
+//         let _4 := 100
+//         let _5 := 200
+//         mstore8(add(free_mem_ptr, 31), _5)
+//         mstore(free_mem_ptr, 300)
+//         return(free_mem_ptr, add(free_mem_ptr, 100))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul
new file mode 100644
index 0000000000..717332472c
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload.yul
@@ -0,0 +1,20 @@
+{
+    let zero := 0
+    mstore(zero, 5)
+    let x := mload(zero)
+    mstore(zero, 8)
+    let y := mload(zero)
+    sstore(zero, y)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let zero := 0
+//         mstore(zero, 5)
+//         let x := mload(zero)
+//         mstore(zero, 8)
+//         sstore(zero, mload(zero))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul
new file mode 100644
index 0000000000..524b328e9e
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/no_storage_inside_function.yul
@@ -0,0 +1,27 @@
+{
+  function f() -> r {
+     r := mload(0x20)
+  }
+  let x := 5
+  sstore(x, 10) // should be removed
+  mstore(0, 42) // could be removed, but will probably stay?
+  pop(f())
+  sstore(x, 10)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 5
+//         let _2 := 10
+//         mstore(0, 42)
+//         pop(f())
+//         sstore(x, 10)
+//     }
+//     function f() -> r
+//     {
+//         r := mload(0x20)
+//         let r_7 := r
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul
new file mode 100644
index 0000000000..dda59873cb
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overflow.yul
@@ -0,0 +1,18 @@
+{
+    let x := 0
+
+    calldatacopy(0, 0, 115792089237316195423570985008687907853269984665640564039457584007913129639935)
+    mstore(x, 20)
+    return(0, 32)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 0
+//         calldatacopy(0, 0, 115792089237316195423570985008687907853269984665640564039457584007913129639935)
+//         mstore(x, 20)
+//         return(0, 32)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul
new file mode 100644
index 0000000000..78179dc3ea
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping.yul
@@ -0,0 +1,21 @@
+{
+    let _1 := 0
+    if callvalue() { revert(_1, _1) }
+    mstore(_1, shl(224, 0x4e487b71))
+    mstore(4, 0x32)
+    revert(_1, 0x24)
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let _1 := 0
+//         if callvalue() { revert(_1, _1) }
+//         mstore(_1, shl(224, 0x4e487b71))
+//         mstore(4, 0x32)
+//         revert(_1, 0x24)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul
new file mode 100644
index 0000000000..2950a04ce2
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/overlapping_small.yul
@@ -0,0 +1,27 @@
+{
+    let _1 := 0
+    let _2 := callvalue()
+    let _3 := 0x4e487b71
+    let _4 := 224
+    let _5 := 7
+    mstore(_1, _5)
+    let _6 := 0x32
+    let _7 := 4
+    mstore(_7, _6)
+    let _8 := 0x24
+    revert(_1, _8)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let _1 := 0
+//         let _2 := callvalue()
+//         let _3 := 0x4e487b71
+//         let _4 := 224
+//         mstore(_1, 7)
+//         mstore(4, 0x32)
+//         revert(_1, 0x24)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul
new file mode 100644
index 0000000000..e7777964c2
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/remove_before_revert.yul
@@ -0,0 +1,21 @@
+{
+    let c := calldataload(0)
+    mstore(c, 4)
+    if c {
+        sstore(c, 2)
+    }
+    let d := 0
+    revert(d, d)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let c := calldataload(0)
+//         let _2 := 4
+//         if c { let _3 := 2 }
+//         let d := 0
+//         revert(d, d)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul
new file mode 100644
index 0000000000..3bfd558fe0
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unaligned_access.yul
@@ -0,0 +1,17 @@
+{
+    let zero := 0
+    mstore(zero, 0x1234)
+    mstore(4, 0x456)
+    revert(zero, 5)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let zero := 0
+//         mstore(zero, 0x1234)
+//         mstore(4, 0x456)
+//         revert(zero, 5)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul
new file mode 100644
index 0000000000..db5f060a63
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unknown_length2.yul
@@ -0,0 +1,33 @@
+{
+    let a
+    switch calldataload(0)
+    case 0 { a := calldataload(9) }
+    case 1 { a := calldataload(10) }
+
+    calldatacopy(0x20, 0, a)
+    let x := mload(0)
+    sstore(0, x)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let a_9
+//         let a := a_9
+//         switch calldataload(0)
+//         case 0 {
+//             a := calldataload(9)
+//             let a_10 := a
+//         }
+//         case 1 {
+//             let a_12 := a
+//             a := calldataload(10)
+//             let a_11 := a
+//         }
+//         let a_13 := a
+//         let _5 := 0
+//         let _6 := 0x20
+//         sstore(0, mload(0))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul
new file mode 100644
index 0000000000..b0b42060f4
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/unrelated_relative.yul
@@ -0,0 +1,23 @@
+{
+    let c := calldataload(0)
+    mstore(c, 4)
+    mstore(add(c, 0x20), 8)
+    sstore(0, mload(c))
+    mstore(c, 9)
+    mstore(add(c, 0x20), 20)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let c := calldataload(0)
+//         mstore(c, 4)
+//         let _3 := 8
+//         let _5 := add(c, 0x20)
+//         sstore(0, mload(c))
+//         let _8 := 9
+//         let _9 := 20
+//         let _11 := add(c, 0x20)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul
new file mode 100644
index 0000000000..855ae8325b
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/write_before_recursion.yul
@@ -0,0 +1,27 @@
+{
+    sstore(0, 1)
+    mstore(0, 2)
+    f()
+    function f() {
+        g()
+    }
+    function g() {
+        f()
+    }
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let _1 := 1
+//         let _2 := 0
+//         let _3 := 2
+//         let _4 := 0
+//         f()
+//     }
+//     function f()
+//     { g() }
+//     function g()
+//     { f() }
+// }
diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp
index 1b1e8bed5b..90e278f42e 100644
--- a/test/yulPhaser/Chromosome.cpp
+++ b/test/yulPhaser/Chromosome.cpp
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_strin
 
 	BOOST_TEST(chromosome.length() == allSteps.size());
 	BOOST_TEST(chromosome.optimisationSteps() == allSteps);
-	BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMRmVatrpud");
+	BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMRmVatrpuSd");
 }
 
 BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names)

From 1653b6c5b72f157537c81e3bef375c026d988c8e Mon Sep 17 00:00:00 2001
From: Tyler <tylerfeuerstein@gmail.com>
Date: Thu, 10 Mar 2022 17:36:46 -0500
Subject: [PATCH 0462/1748] more qualifying

---
 libsolidity/ast/ASTAnnotations.h         |  2 +-
 test/CommonSyntaxTest.cpp                | 10 ++++------
 test/libsolidity/util/TestFileParser.cpp |  5 ++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index d7a49b8506..3497a2ea82 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -222,7 +222,7 @@ struct InlineAssemblyAnnotation: StatementAnnotation
 	/// True, if the assembly block was annotated to be memory-safe.
 	bool markedMemorySafe = false;
 	/// True, if the assembly block involves any memory opcode or assigns to variables in memory.
-	SetOnce<bool> hasMemoryEffects;
+	util::SetOnce<bool> hasMemoryEffects;
 };
 
 struct BlockAnnotation: StatementAnnotation, ScopableAnnotation
diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index d28ec16754..385ada76d7 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -42,11 +42,10 @@ namespace
 
 int parseUnsignedInteger(string::iterator& _it, string::iterator _end)
 {
-	auto isDigit = [](char _c) -> bool {return isdigit(_c, std::locale::classic());};
-	if (_it == _end || !isDigit(*_it))
+	if (_it == _end || !util::isDigit(*_it))
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid test expectation. Source location expected."));
 	int result = 0;
-	while (_it != _end && isDigit(*_it))
+	while (_it != _end && util::isDigit(*_it))
 	{
 		result *= 10;
 		result += *_it - '0';
@@ -195,7 +194,6 @@ string CommonSyntaxTest::errorMessage(Exception const& _e)
 
 vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 {
-	auto isDigit = [](char _c) -> bool {return isdigit(_c, std::locale::classic());};
 	vector<SyntaxTestError> expectations;
 	string line;
 	while (getline(_stream, line))
@@ -215,7 +213,7 @@ vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 		skipWhitespace(it, line.end());
 
 		optional<ErrorId> errorId;
-		if (it != line.end() && isDigit(*it))
+		if (it != line.end() && util::isDigit(*it))
 			errorId = ErrorId{static_cast<unsigned long long>(parseUnsignedInteger(it, line.end()))};
 
 		expect(it, line.end(), ':');
@@ -228,7 +226,7 @@ vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 		if (it != line.end() && *it == '(')
 		{
 			++it;
-			if (it != line.end() && !isDigit(*it))
+			if (it != line.end() && !util::isDigit(*it))
 			{
 				auto sourceNameStart = it;
 				while (it != line.end() && *it != ':')
diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp
index dbaf52604d..0071062946 100644
--- a/test/libsolidity/util/TestFileParser.cpp
+++ b/test/libsolidity/util/TestFileParser.cpp
@@ -763,12 +763,11 @@ string TestFileParser::Scanner::scanString()
 char TestFileParser::Scanner::scanHexPart()
 {
 	auto toLower = [](char _c) -> char { return tolower(_c, locale::classic()); };
-	auto isDigit = [](char _c) -> bool { return isdigit(_c, locale::classic()); };
 
 	advance(); // skip 'x'
 
 	int value{};
-	if (isDigit(current()))
+	if (util::isDigit(current()))
 		value = current() - '0';
 	else if (toLower(current()) >= 'a' && toLower(current()) <= 'f')
 		value = toLower(current()) - 'a' + 10;
@@ -780,7 +779,7 @@ char TestFileParser::Scanner::scanHexPart()
 		return static_cast<char>(value);
 
 	value <<= 4;
-	if (isDigit(current()))
+	if (util::isDigit(current()))
 		value |= current() - '0';
 	else if (toLower(current()) >= 'a' && toLower(current()) <= 'f')
 		value |= toLower(current()) - 'a' + 10;

From 33575674538625cc06fd099a3eb0996d0c81f043 Mon Sep 17 00:00:00 2001
From: Tyler <tylerfeuerstein@gmail.com>
Date: Thu, 10 Mar 2022 18:16:12 -0500
Subject: [PATCH 0463/1748] Fix CommonSyntaxTest.cpp and others

---
 test/CommonSyntaxTest.cpp                | 24 ++++++++++++------------
 test/libsolidity/util/TestFileParser.cpp |  8 ++++++--
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index 385ada76d7..5b66aea302 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -83,9 +83,9 @@ TestCase::TestResult CommonSyntaxTest::conclude(ostream& _stream, string const&
 void CommonSyntaxTest::printExpectationAndError(ostream& _stream, string const& _linePrefix, bool _formatted)
 {
 	string nextIndentLevel = _linePrefix + "  ";
-	AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl;
+	util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl;
 	printErrorList(_stream, m_expectations, nextIndentLevel, _formatted);
-	AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl;
+	util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl;
 	printErrorList(_stream, m_errorList, nextIndentLevel, _formatted);
 }
 
@@ -104,8 +104,8 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 				continue;
 
 			if (outputSourceNames)
-				_stream << _linePrefix << formatting::CYAN << "==== Source: " << name << " ====" << formatting::RESET << endl;
-			vector<char const*> sourceFormatting(source.length(), formatting::RESET);
+				_stream << _linePrefix << util::formatting::CYAN << "==== Source: " << name << " ====" << util::formatting::RESET << endl;
+			vector<char const*> sourceFormatting(source.length(), util::formatting::RESET);
 			for (auto const& error: m_errorList)
 				if (error.sourceName == name && error.locationStart >= 0 && error.locationEnd >= 0)
 				{
@@ -115,11 +115,11 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 					for (int i = error.locationStart; i < error.locationEnd; i++)
 						if (isWarning)
 						{
-							if (sourceFormatting[static_cast<size_t>(i)] == formatting::RESET)
-								sourceFormatting[static_cast<size_t>(i)] = formatting::ORANGE_BACKGROUND_256;
+							if (sourceFormatting[static_cast<size_t>(i)] == util::formatting::RESET)
+								sourceFormatting[static_cast<size_t>(i)] = util::formatting::ORANGE_BACKGROUND_256;
 						}
 						else
-							sourceFormatting[static_cast<size_t>(i)] = formatting::RED_BACKGROUND;
+							sourceFormatting[static_cast<size_t>(i)] = util::formatting::RED_BACKGROUND;
 				}
 
 			_stream << _linePrefix << sourceFormatting.front() << source.front();
@@ -131,12 +131,12 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 					_stream << source[i];
 				else
 				{
-					_stream << formatting::RESET << endl;
+					_stream << util::formatting::RESET << endl;
 					if (i + 1 < source.length())
 						_stream << _linePrefix << sourceFormatting[i];
 				}
 			}
-			_stream << formatting::RESET;
+			_stream << util::formatting::RESET;
 		}
 		else
 		{
@@ -157,12 +157,12 @@ void CommonSyntaxTest::printErrorList(
 )
 {
 	if (_errorList.empty())
-		AnsiColorized(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << endl;
+		util::AnsiColorized(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << endl;
 	else
 		for (auto const& error: _errorList)
 		{
 			{
-				AnsiColorized scope(_stream, _formatted, {BOLD, (error.type == "Warning") ? YELLOW : RED});
+				util::AnsiColorized scope(_stream, _formatted, {BOLD, (error.type == "Warning") ? YELLOW : RED});
 				_stream << _linePrefix << error.type;
 				if (error.errorId.has_value())
 					_stream << ' ' << error.errorId->error;
@@ -184,7 +184,7 @@ void CommonSyntaxTest::printErrorList(
 		}
 }
 
-string CommonSyntaxTest::errorMessage(Exception const& _e)
+string CommonSyntaxTest::errorMessage(util::Exception const& _e)
 {
 	if (_e.comment() && !_e.comment()->empty())
 		return boost::replace_all_copy(*_e.comment(), "\n", "\\n");
diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp
index 0071062946..11cfdbb867 100644
--- a/test/libsolidity/util/TestFileParser.cpp
+++ b/test/libsolidity/util/TestFileParser.cpp
@@ -16,6 +16,9 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
+
+#include <libsolutil/StringUtils.h>
+
 #include <test/libsolidity/util/TestFileParser.h>
 
 #include <test/libsolidity/util/BytesUtils.h>
@@ -34,6 +37,7 @@
 #include <stdexcept>
 
 using namespace solidity;
+using namespace solidity::util;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 using namespace std;
@@ -767,7 +771,7 @@ char TestFileParser::Scanner::scanHexPart()
 	advance(); // skip 'x'
 
 	int value{};
-	if (util::isDigit(current()))
+	if (isDigit(current()))
 		value = current() - '0';
 	else if (toLower(current()) >= 'a' && toLower(current()) <= 'f')
 		value = toLower(current()) - 'a' + 10;
@@ -779,7 +783,7 @@ char TestFileParser::Scanner::scanHexPart()
 		return static_cast<char>(value);
 
 	value <<= 4;
-	if (util::isDigit(current()))
+	if (isDigit(current()))
 		value |= current() - '0';
 	else if (toLower(current()) >= 'a' && toLower(current()) <= 'f')
 		value |= toLower(current()) - 'a' + 10;

From 624d2d396881749c69c50c75f11469693c4655fe Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Fri, 11 Mar 2022 14:13:42 +0530
Subject: [PATCH 0464/1748] Error messages from abi encodecall are giving more
 details about the types of the involved variables

---
 libsolidity/analysis/TypeChecker.cpp                |  4 ++--
 ...bi_encode_convert_address_to_address_payable.sol | 11 +++++++++++
 ...nction_pointer_to_different_function_pointer.sol | 13 +++++++++++++
 ...ncode_convert_function_to_different_function.sol | 13 +++++++++++++
 ...bi_encode_convert_string_to_different_string.sol | 12 ++++++++++++
 .../specialFunctions/encodeCall_fail_args.sol       |  2 +-
 6 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 955c66f840..0ea9c6c08c 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -2204,9 +2204,9 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 				"Cannot implicitly convert component at position " +
 				to_string(i) +
 				" from \"" +
-				argType.canonicalName() +
+				argType.toString() +
 				"\" to \"" +
-				functionPointerType->parameterTypes()[i]->canonicalName() +
+				functionPointerType->parameterTypes()[i]->toString() +
 				"\"" +
 				(result.message().empty() ?  "." : ": " + result.message())
 			);
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol
new file mode 100644
index 0000000000..a4c823a858
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol
@@ -0,0 +1,11 @@
+interface I {
+    function f(address payable) external;
+}
+
+contract C {
+    function main() external view {
+        abi.encodeCall(I.f, (address(0)));
+    }
+}
+// ----
+// TypeError 5407: (136-148): Cannot implicitly convert component at position 0 from "address" to "address payable".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol
new file mode 100644
index 0000000000..7c570e29e0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol
@@ -0,0 +1,13 @@
+interface I {
+    function f(function (string calldata) external) external;
+}
+
+contract C {
+    function g(string calldata) external {}
+
+    function main() external view {
+        abi.encodeCall(I.f, (this.g));
+    }
+}
+// ----
+// TypeError 5407: (201-209): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol
new file mode 100644
index 0000000000..7a35bfa553
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol
@@ -0,0 +1,13 @@
+interface I {
+    function f(function (string calldata) external view returns (uint)) external;
+}
+
+contract C {
+    function g(string memory) external {}
+
+    function main() external view {
+        abi.encodeCall(I.f, (this.g));
+    }
+}
+// ----
+// TypeError 5407: (219-227): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) view external returns (uint256)".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol
new file mode 100644
index 0000000000..72efe4a077
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol
@@ -0,0 +1,12 @@
+interface I {
+    function f(string calldata) external;
+}
+
+contract C {
+    string s;
+    function main() external view {
+        abi.encodeCall(I.f, (s));
+    }
+}
+// ----
+// TypeError 5407: (150-153): Cannot implicitly convert component at position 0 from "string storage ref" to "string calldata".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
index a1c20f9bde..48372263f6 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args.sol
@@ -24,4 +24,4 @@ contract C {
 // TypeError 7788: (382-408): Expected 1 instead of 0 components for the tuple parameter.
 // TypeError 6219: (489-511): Expected two arguments: a function pointer followed by a tuple.
 // TypeError 7515: (597-628): Expected a tuple with 2 components instead of a single non-tuple parameter.
-// TypeError 5407: (621-627): Cannot implicitly convert component at position 0 from "uint8[2]" to "int256".
+// TypeError 5407: (621-627): Cannot implicitly convert component at position 0 from "uint8[2] memory" to "int256".

From 9dc26af82902c4002a92ba23831b82ba15d823d0 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman@codepoets.it>
Date: Fri, 25 Feb 2022 11:12:18 +0100
Subject: [PATCH 0465/1748] Use "C" instead user environment locale in solc

---
 Changelog.md  |  2 +-
 solc/main.cpp | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 8b9fa530c1..99aa6ebb86 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,7 +11,7 @@ Compiler Features:
 
 Bugfixes:
  * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``.
-
+ * Fix internal error for locales with unusual capitalization rules. Locale set in the environment is now completely ignored.
 
 ### 0.8.12 (2022-02-16)
 
diff --git a/solc/main.cpp b/solc/main.cpp
index ce69d20a79..50a6a8fc52 100644
--- a/solc/main.cpp
+++ b/solc/main.cpp
@@ -27,40 +27,16 @@
 
 #include <boost/exception/all.hpp>
 
-#include <clocale>
 #include <iostream>
 
 using namespace std;
 using namespace solidity;
 
-/*
-The equivalent of setlocale(LC_ALL, "C") is called before any user code is run.
-If the user has an invalid environment setting then it is possible for the call
-to set locale to fail, so there are only two possible actions, the first is to
-throw a runtime exception and cause the program to quit (default behaviour),
-or the second is to modify the environment to something sensible (least
-surprising behaviour).
-
-The follow code produces the least surprising behaviour. It will use the user
-specified default locale if it is valid, and if not then it will modify the
-environment the process is running in to use a sensible default. This also means
-that users do not need to install language packs for their OS.
-*/
-static void setDefaultOrCLocale()
-{
-#if __unix__
-	if (!std::setlocale(LC_ALL, ""))
-	{
-		setenv("LC_ALL", "C", 1);
-	}
-#endif
-}
 
 int main(int argc, char** argv)
 {
 	try
 	{
-		setDefaultOrCLocale();
 		solidity::frontend::CommandLineInterface cli(cin, cout, cerr);
 		return cli.run(argc, argv) ? 0 : 1;
 	}

From 2d834eaf67ad05d4c5d21272cbea3bb51e1b44a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 25 Feb 2022 19:21:58 +0100
Subject: [PATCH 0466/1748] A script and CI job for testing the compiler with
 different locales

---
 .circleci/config.yml | 15 ++++++++
 Changelog.md         |  1 +
 test/localeTest.sh   | 83 ++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 99 insertions(+)
 create mode 100755 test/localeTest.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 65adf9ee3f..bcfc99cd7f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1051,6 +1051,20 @@ jobs:
   t_ubu_release_cli: &t_ubu_release_cli
     <<: *t_ubu_cli
 
+  t_ubu_locale:
+    <<: *base_ubuntu2004_small
+    steps:
+      - checkout
+      - attach_workspace:
+          at: build
+      - run:
+          name: Install all locales
+          command: |
+            apt update --assume-yes
+            apt install locales-all --assume-yes --no-install-recommends
+      - run: test/localeTest.sh build/solc/solc
+      - gitter_notify_failure_unless_pr
+
   t_ubu_asan_cli:
     # Runs slightly faster on medium but we only run it nightly so efficiency matters more.
     <<: *base_ubuntu2004_small
@@ -1435,6 +1449,7 @@ workflows:
       # Ubuntu build and tests
       - b_ubu: *workflow_trigger_on_tags
       - t_ubu_cli: *workflow_ubuntu2004
+      - t_ubu_locale: *workflow_ubuntu2004
       - t_ubu_soltest_all: *workflow_ubuntu2004
       - t_ubu_soltest_enforce_yul: *workflow_ubuntu2004
       - b_ubu_clang: *workflow_trigger_on_tags
diff --git a/Changelog.md b/Changelog.md
index 99aa6ebb86..39d22c88e0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@ Bugfixes:
  * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``.
  * Fix internal error for locales with unusual capitalization rules. Locale set in the environment is now completely ignored.
 
+
 ### 0.8.12 (2022-02-16)
 
 Language Features:
diff --git a/test/localeTest.sh b/test/localeTest.sh
new file mode 100755
index 0000000000..58e2aad4d9
--- /dev/null
+++ b/test/localeTest.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+#------------------------------------------------------------------------------
+# Script that tests that the compiler works correctly regardless of the locale
+# setting. As a prerequisite, the following locales must be enabled system-wide:
+# C, tr_TR.utf8, ja_JP.eucjp.
+#
+# Usage:
+#    <script name>.sh <path to solc binary>
+#
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -eo pipefail
+
+REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+solc_binary="$1"
+(( $# == 1 )) || fail "Expected exactly 1 argument."
+
+# This test won't work without some specific locales installed
+locale -a | grep -e "^tr_TR\.utf8$" || fail "Locale 'tr_TR.utf8' not available."
+locale -a | grep -e "^ja_JP\.eucjp$" || fail "Locale 'ja_JP.eucjp' not available."
+locale -a | grep -e "^C$" || fail "Locale 'C' not available."
+locale -a | grep -e "^__invalid_locale__$" && fail "'__invalid_locale__' is not supposed to be a valid locale name."
+
+i="i"
+
+test_code=$(cat <<'EOF'
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity *;
+    library L {}
+EOF
+)
+
+# Whatever locale is set by default.
+printTask "Testing the default locale..."
+default_locale_output=$(echo "$test_code" | "$solc_binary" - --bin)
+
+# Plain C locale
+printTask "Testing the C locale..."
+export LC_ALL=C
+[[ ${i^^} == "I" ]] || assertFail
+c_locale_output=$(echo "$test_code" | "$solc_binary" - --bin)
+diff_values "$default_locale_output" "$c_locale_output"
+
+# Turkish locale, which has capitalization rules (`i` -> `İ` and `I` to `ı`) that can make identifiers invalid.
+printTask "Testing the Turkish locale..."
+export LC_ALL=tr_TR.utf8
+[[ ${i^^} != "I" ]] || assertFail
+tr_locale_output=$(echo "$test_code" | "$solc_binary" - --bin)
+diff_values "$default_locale_output" "$tr_locale_output"
+
+# A different locale, that should not do anything special to ASCII chars.
+printTask "Testing the Japanese locale..."
+export LC_ALL=ja_JP.eucjp
+[[ ${i^^} == "I" ]] || assertFail
+ja_locale_output=$(echo "$test_code" | "$solc_binary" - --bin)
+diff_values "$default_locale_output" "$ja_locale_output"
+
+# The compiler should not crash if the locale is not valid.
+printTask "Testing an invalid locale..."
+export LC_ALL=__invalid_locale__ || true
+invalid_locale_output=$(echo "$test_code" | "$solc_binary" - --bin)
+diff_values "$default_locale_output" "$invalid_locale_output"

From b7a9daa2f8cfff09ea2ed22c72774cf874d2ca22 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Tue, 22 Feb 2022 23:13:41 +0530
Subject: [PATCH 0467/1748] Generate warning when rational numbers are
 converted to their mobile type without explicit requests

---
 docs/types/operators.rst                      | 17 ++++++++++
 docs/types/value-types.rst                    | 11 ++++++-
 ...y_operator_with_literal_types_overflow.sol | 19 +++++++++++
 ...tor_return_type_with_literal_arguments.sol | 33 +++++++++++++++++++
 4 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
 create mode 100644 test/libsolidity/syntaxTests/literals/ternary_operator_return_type_with_literal_arguments.sol

diff --git a/docs/types/operators.rst b/docs/types/operators.rst
index 450963e11d..be5f0d4568 100644
--- a/docs/types/operators.rst
+++ b/docs/types/operators.rst
@@ -26,6 +26,23 @@ except for comparison operators where the result is always ``bool``.
 The operators ``**`` (exponentiation), ``<<``  and ``>>`` use the type of the
 left operand for the operation and the result.
 
+Ternary Operator
+----------------
+The ternary operator is used in expressions of the form ``<expression> ? <trueExpression> : <falseExpression>``.
+It evaluates one of the latter two given expressions depending upon the result of the evaluation of the main ``<expression>``.
+If ``<expression>`` evaluates to ``true``, then ``<trueExpression>`` will be evaluated, otherwise ``<falseExpression>`` is evaluated.
+
+The result of the ternary operator does not have a rational number type, even if all of its operands are rational number literals.
+The result type is determined from the types of the two operands in the same way as above, converting to their mobile type first if required.
+
+As a consequence, ``255 + (true ? 1 : 0)`` will revert due to arithmetic overflow.
+The reason is that ``(true ? 1 : 0)`` is of ``uint8`` type, which forces the addition to be performed in ``uint8`` as well,
+and 256 exceeds the range allowed for this type.
+
+Another consequence is that an expression like ``1.5 + 1.5`` is valid but ``1.5 + (true ? 1.5 : 2.5)`` is not.
+This is because the former is a rational expression evaluated in unlimited precision and only its final value matters.
+The latter involves a conversion of a fractional rational number to an integer, which is currently disallowed.
+
 .. index:: assignment, lvalue, ! compound operators
 
 Compound and Increment/Decrement Operators
diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 0d6a30cd62..8f10094078 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -463,7 +463,7 @@ There is no additional semantic meaning added to a number literal containing und
 the underscores are ignored.
 
 Number literal expressions retain arbitrary precision until they are converted to a non-literal type (i.e. by
-using them together with a non-literal expression or by explicit conversion).
+using them together with anything else than a number literal expression (like boolean literals) or by explicit conversion).
 This means that computations do not overflow and divisions do not truncate
 in number literal expressions.
 
@@ -471,6 +471,15 @@ For example, ``(2**800 + 1) - 2**800`` results in the constant ``1`` (of type ``
 although intermediate results would not even fit the machine word size. Furthermore, ``.5 * 8`` results
 in the integer ``4`` (although non-integers were used in between).
 
+.. warning::
+    While most operators produce a literal expression when applied to literals, there are certain operators that do not follow this pattern:
+
+    - Ternary operator (``... ? ... : ...``),
+    - Array subscript (``<array>[<index>]``).
+
+    You might expect expressions like ``255 + (true ? 1 : 0)`` or ``255 + [1, 2, 3][0]`` to be equivalent to using the literal 256
+    directly, but in fact they are computed within the type ``uint8`` and can overflow.
+
 Any operator that can be applied to integers can also be applied to number literal expressions as
 long as the operands are integers. If any of the two is fractional, bit operations are disallowed
 and exponentiation is disallowed if the exponent is fractional (because that might result in
diff --git a/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol b/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
new file mode 100644
index 0000000000..22d61c6c51
--- /dev/null
+++ b/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
@@ -0,0 +1,19 @@
+contract TestTernary
+{
+    function h() pure public returns (uint16 b)
+    {
+        b = (true ? 63 : 255) + (false ? 63 : 255);
+    }
+
+    function g() pure public returns (uint16 a)
+    {
+        bool t = true;
+        bool f = false;
+        a = (t ? 63 : 255) + (f ? 63 : 255);
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// g() -> FAILURE, hex"4e487b71", 0x11
+// h() -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/syntaxTests/literals/ternary_operator_return_type_with_literal_arguments.sol b/test/libsolidity/syntaxTests/literals/ternary_operator_return_type_with_literal_arguments.sol
new file mode 100644
index 0000000000..6a928c3add
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literals/ternary_operator_return_type_with_literal_arguments.sol
@@ -0,0 +1,33 @@
+contract TestTernary
+{
+    function g() pure public
+    {
+        bool t = true;
+        bool f = false;
+        uint8 v255 = 255;
+        uint8 v63 = 63;
+        uint8 a;
+
+        // Currently none of these should produce errors or warnings.
+        // The result of the operator is always a limited-precision integer, even if all arguments are literals.
+
+        a = (t ? 63 : 255) + (f ? 63 : 255);
+        a = (t ? 0x3f : 0xff) + (f ? 0x3f : 0xff);
+        a = (t ? uint8(63) : 255) + (f ? 63 : uint8(255));
+        a = (t ? v63 : 255) + (f ? 63 : v255);
+
+        a = (true ? 63 : 255) + (false ? 63 : 255);
+        a = (true ? 0x3f : 0xff) + (false ? 0x3f : 0xff);
+        a = (true ? uint8(63) : 255) + (false ? 63 : uint8(255));
+        a = (true ? v63 : 255) + (false ? 63 : v255);
+
+        a = (t ? 63 : 255) - (f ? 63 : 255);
+        a = (t ? 63 : 255) * (f ? 63 : 255);
+        a = (t ? 63 : 255) / (f ? 63 : 255);
+
+        a = (t ? (true ? 63 : 255) : (false ? 63 : 255)) + (f ? (t ? 63 : 255) : (f ? 63 : 255));
+        a = uint8(t ? 63 : 255) + uint8(f ? 63 : 255);
+
+    }
+}
+// ----

From 1035eacb531adcfc82f339cffd8d066047b0333d Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 5 Jan 2022 12:15:10 +0100
Subject: [PATCH 0468/1748] LSP: Introduce HandlerBase for future LSP-feature
 implementations.

---
 libsolidity/CMakeLists.txt         |  6 ++
 libsolidity/lsp/HandlerBase.cpp    | 63 ++++++++++++++++++++
 libsolidity/lsp/HandlerBase.h      | 46 +++++++++++++++
 libsolidity/lsp/LanguageServer.cpp | 93 +++++++++---------------------
 libsolidity/lsp/LanguageServer.h   | 17 +++---
 libsolidity/lsp/Utils.cpp          | 70 ++++++++++++++++++++++
 libsolidity/lsp/Utils.h            | 29 ++++++++++
 7 files changed, 249 insertions(+), 75 deletions(-)
 create mode 100644 libsolidity/lsp/HandlerBase.cpp
 create mode 100644 libsolidity/lsp/HandlerBase.h
 create mode 100644 libsolidity/lsp/Utils.cpp
 create mode 100644 libsolidity/lsp/Utils.h

diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index ff82cd9fb5..04a4300a3e 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -159,8 +159,14 @@ set(sources
 	lsp/LanguageServer.h
 	lsp/FileRepository.cpp
 	lsp/FileRepository.h
+	lsp/HandlerBase.cpp
+	lsp/HandlerBase.h
+	lsp/LanguageServer.cpp
+	lsp/LanguageServer.h
 	lsp/Transport.cpp
 	lsp/Transport.h
+	lsp/Utils.cpp
+	lsp/Utils.h
 	parsing/DocStringParser.cpp
 	parsing/DocStringParser.h
 	parsing/Parser.cpp
diff --git a/libsolidity/lsp/HandlerBase.cpp b/libsolidity/lsp/HandlerBase.cpp
new file mode 100644
index 0000000000..3ef2274614
--- /dev/null
+++ b/libsolidity/lsp/HandlerBase.cpp
@@ -0,0 +1,63 @@
+#include <libsolidity/lsp/HandlerBase.h>
+#include <libsolidity/lsp/LanguageServer.h>
+#include <libsolidity/lsp/Utils.h>
+#include <libsolidity/ast/AST.h>
+
+#include <liblangutil/Exceptions.h>
+
+using namespace std;
+
+namespace solidity::lsp
+{
+
+using namespace langutil;
+
+Json::Value HandlerBase::toRange(SourceLocation const& _location) const
+{
+	if (!_location.hasText())
+		return toJsonRange({}, {});
+
+	solAssert(_location.sourceName, "");
+	langutil::CharStream const& stream = charStreamProvider().charStream(*_location.sourceName);
+	LineColumn start = stream.translatePositionToLineColumn(_location.start);
+	LineColumn end = stream.translatePositionToLineColumn(_location.end);
+	return toJsonRange(start, end);
+}
+
+Json::Value HandlerBase::toJson(SourceLocation const& _location) const
+{
+	solAssert(_location.sourceName);
+	Json::Value item = Json::objectValue;
+	item["uri"] = fileRepository().sourceUnitNameToClientPath(*_location.sourceName);
+	item["range"] = toRange(_location);
+	return item;
+}
+
+optional<SourceLocation> HandlerBase::parsePosition(string const& _sourceUnitName, Json::Value const& _position) const
+{
+	if (!fileRepository().sourceUnits().count(_sourceUnitName))
+		return nullopt;
+
+	if (optional<LineColumn> lineColumn = parseLineColumn(_position))
+		if (optional<int> const offset = CharStream::translateLineColumnToPosition(
+			fileRepository().sourceUnits().at(_sourceUnitName),
+			*lineColumn
+		))
+			return SourceLocation{*offset, *offset, make_shared<string>(_sourceUnitName)};
+	return nullopt;
+}
+
+optional<SourceLocation> HandlerBase::parseRange(string const& _sourceUnitName, Json::Value const& _range) const
+{
+	if (!_range.isObject())
+		return nullopt;
+	optional<SourceLocation> start = parsePosition(_sourceUnitName, _range["start"]);
+	optional<SourceLocation> end = parsePosition(_sourceUnitName, _range["end"]);
+	if (!start || !end)
+		return nullopt;
+	solAssert(*start->sourceName == *end->sourceName);
+	start->end = end->end;
+	return start;
+}
+
+}
diff --git a/libsolidity/lsp/HandlerBase.h b/libsolidity/lsp/HandlerBase.h
new file mode 100644
index 0000000000..067d485b52
--- /dev/null
+++ b/libsolidity/lsp/HandlerBase.h
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <libsolidity/lsp/FileRepository.h>
+#include <libsolidity/lsp/LanguageServer.h>
+
+#include <liblangutil/SourceLocation.h>
+#include <liblangutil/CharStreamProvider.h>
+
+#include <optional>
+
+namespace solidity::lsp
+{
+
+class Transport;
+
+/**
+ * Helper base class for implementing handlers.
+ */
+class HandlerBase
+{
+public:
+	explicit HandlerBase(LanguageServer& _server): m_server{_server} {}
+
+	Json::Value toRange(langutil::SourceLocation const& _location) const;
+	Json::Value toJson(langutil::SourceLocation const& _location) const;
+
+	std::optional<langutil::SourceLocation> parsePosition(
+		std::string const& _sourceUnitName,
+		Json::Value const& _position
+	) const;
+
+	/// @returns the source location given a source unit name and an LSP Range object,
+	/// or nullopt on failure.
+	std::optional<langutil::SourceLocation> parseRange(
+		std::string const& _sourceUnitName,
+		Json::Value const& _range
+	) const;
+
+	langutil::CharStreamProvider const& charStreamProvider() const noexcept { return m_server.charStreamProvider(); };
+	FileRepository const& fileRepository() const noexcept { return m_server.fileRepository(); };
+	Transport& client() const noexcept { return m_server.client(); };
+
+	LanguageServer& m_server;
+};
+
+}
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index bda55b26df..1808fc9931 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -21,6 +21,9 @@
 #include <libsolidity/interface/ReadFile.h>
 #include <libsolidity/interface/StandardCompiler.h>
 #include <libsolidity/lsp/LanguageServer.h>
+#include <libsolidity/lsp/HandlerBase.h>
+#include <libsolidity/lsp/Utils.h>
+
 
 #include <liblangutil/SourceReferenceExtractor.h>
 #include <liblangutil/CharStream.h>
@@ -48,31 +51,6 @@ using namespace solidity::frontend;
 namespace
 {
 
-Json::Value toJson(LineColumn _pos)
-{
-	Json::Value json = Json::objectValue;
-	json["line"] = max(_pos.line, 0);
-	json["character"] = max(_pos.column, 0);
-
-	return json;
-}
-
-Json::Value toJsonRange(LineColumn const& _start, LineColumn const& _end)
-{
-	Json::Value json;
-	json["start"] = toJson(_start);
-	json["end"] = toJson(_end);
-	return json;
-}
-
-optional<LineColumn> parseLineColumn(Json::Value const& _lineColumn)
-{
-	if (_lineColumn.isObject() && _lineColumn["line"].isInt() && _lineColumn["character"].isInt())
-		return LineColumn{_lineColumn["line"].asInt(), _lineColumn["character"].asInt()};
-	else
-		return nullopt;
-}
-
 int toDiagnosticSeverity(Error::Type _errorType)
 {
 	// 1=Error, 2=Warning, 3=Info, 4=Hint
@@ -107,55 +85,19 @@ LanguageServer::LanguageServer(Transport& _transport):
 {
 }
 
-optional<SourceLocation> LanguageServer::parsePosition(
-	string const& _sourceUnitName,
-	Json::Value const& _position
-) const
+optional<SourceLocation> LanguageServer::parseRange(string const& _sourceUnitName, Json::Value const& _range)
 {
-	if (!m_fileRepository.sourceUnits().count(_sourceUnitName))
-		return nullopt;
-
-	if (optional<LineColumn> lineColumn = parseLineColumn(_position))
-		if (optional<int> const offset = CharStream::translateLineColumnToPosition(
-			m_fileRepository.sourceUnits().at(_sourceUnitName),
-			*lineColumn
-		))
-			return SourceLocation{*offset, *offset, make_shared<string>(_sourceUnitName)};
-	return nullopt;
+	return HandlerBase{*this}.parseRange(_sourceUnitName, _range);
 }
 
-optional<SourceLocation> LanguageServer::parseRange(string const& _sourceUnitName, Json::Value const& _range) const
+Json::Value LanguageServer::toRange(SourceLocation const& _location)
 {
-	if (!_range.isObject())
-		return nullopt;
-	optional<SourceLocation> start = parsePosition(_sourceUnitName, _range["start"]);
-	optional<SourceLocation> end = parsePosition(_sourceUnitName, _range["end"]);
-	if (!start || !end)
-		return nullopt;
-	solAssert(*start->sourceName == *end->sourceName);
-	start->end = end->end;
-	return start;
+	return HandlerBase(*this).toRange(_location);
 }
 
-Json::Value LanguageServer::toRange(SourceLocation const& _location) const
+Json::Value LanguageServer::toJson(SourceLocation const& _location)
 {
-	if (!_location.hasText())
-		return toJsonRange({}, {});
-
-	solAssert(_location.sourceName, "");
-	CharStream const& stream = m_compilerStack.charStream(*_location.sourceName);
-	LineColumn start = stream.translatePositionToLineColumn(_location.start);
-	LineColumn end = stream.translatePositionToLineColumn(_location.end);
-	return toJsonRange(start, end);
-}
-
-Json::Value LanguageServer::toJson(SourceLocation const& _location) const
-{
-	solAssert(_location.sourceName);
-	Json::Value item = Json::objectValue;
-	item["uri"] = m_fileRepository.sourceUnitNameToClientPath(*_location.sourceName);
-	item["range"] = toRange(_location);
-	return item;
+	return HandlerBase(*this).toJson(_location);
 }
 
 void LanguageServer::changeConfiguration(Json::Value const& _settings)
@@ -403,3 +345,20 @@ void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
 
 	compileAndUpdateDiagnostics();
 }
+
+ASTNode const* LanguageServer::requestASTNode(std::string const& _sourceUnitName, LineColumn const& _filePos)
+{
+	if (m_compilerStack.state() < CompilerStack::AnalysisPerformed)
+		return nullptr;
+
+	if (!m_fileRepository.sourceUnits().count(_sourceUnitName))
+		return nullptr;
+
+	optional<int> sourcePos = m_compilerStack.charStream(_sourceUnitName)
+		.translateLineColumnToPosition(_filePos);
+	if (!sourcePos.has_value())
+		return nullptr;
+
+	return locateInnermostASTNode(*sourcePos, m_compilerStack.ast(_sourceUnitName));
+}
+
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
index a3ab371988..8bc5e21a29 100644
--- a/libsolidity/lsp/LanguageServer.h
+++ b/libsolidity/lsp/LanguageServer.h
@@ -57,6 +57,11 @@ class LanguageServer
 	/// @return boolean indicating normal or abnormal termination.
 	bool run();
 
+	FileRepository& fileRepository() noexcept { return m_fileRepository; }
+	Transport& client() noexcept { return m_client; }
+	frontend::ASTNode const* requestASTNode(std::string const& _sourceUnitName, langutil::LineColumn const& _filePos);
+	langutil::CharStreamProvider const& charStreamProvider() const noexcept { return m_compilerStack; }
+
 private:
 	/// Checks if the server is initialized (to be used by messages that need it to be initialized).
 	/// Reports an error and returns false if not.
@@ -72,22 +77,18 @@ class LanguageServer
 
 	/// Compile everything until after analysis phase.
 	void compile();
+	using MessageHandler = std::function<void(MessageID, Json::Value const&)>;
 
-	std::optional<langutil::SourceLocation> parsePosition(
-		std::string const& _sourceUnitName,
-		Json::Value const& _position
-	) const;
 	/// @returns the source location given a source unit name and an LSP Range object,
 	/// or nullopt on failure.
 	std::optional<langutil::SourceLocation> parseRange(
 		std::string const& _sourceUnitName,
 		Json::Value const& _range
-	) const;
-	Json::Value toRange(langutil::SourceLocation const& _location) const;
-	Json::Value toJson(langutil::SourceLocation const& _location) const;
+	);
+	Json::Value toRange(langutil::SourceLocation const& _location);
+	Json::Value toJson(langutil::SourceLocation const& _location);
 
 	// LSP related member fields
-	using MessageHandler = std::function<void(MessageID, Json::Value const&)>;
 
 	enum class State { Started, Initialized, ShutdownRequested, ExitRequested, ExitWithoutShutdown };
 	State m_state = State::Started;
diff --git a/libsolidity/lsp/Utils.cpp b/libsolidity/lsp/Utils.cpp
new file mode 100644
index 0000000000..a25e06d5f6
--- /dev/null
+++ b/libsolidity/lsp/Utils.cpp
@@ -0,0 +1,70 @@
+#include <liblangutil/CharStreamProvider.h>
+#include <liblangutil/Exceptions.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/lsp/FileRepository.h>
+#include <libsolidity/lsp/Utils.h>
+
+namespace solidity::lsp
+{
+
+using namespace frontend;
+using namespace langutil;
+using namespace std;
+
+optional<LineColumn> parseLineColumn(Json::Value const& _lineColumn)
+{
+	if (_lineColumn.isObject() && _lineColumn["line"].isInt() && _lineColumn["character"].isInt())
+		return LineColumn{_lineColumn["line"].asInt(), _lineColumn["character"].asInt()};
+	else
+		return nullopt;
+}
+
+Json::Value toJson(LineColumn _pos)
+{
+	Json::Value json = Json::objectValue;
+	json["line"] = max(_pos.line, 0);
+	json["character"] = max(_pos.column, 0);
+
+	return json;
+}
+
+Json::Value toJsonRange(LineColumn const& _start, LineColumn const& _end)
+{
+	Json::Value json;
+	json["start"] = toJson(_start);
+	json["end"] = toJson(_end);
+	return json;
+}
+
+vector<Declaration const*> allAnnotatedDeclarations(Expression const* _expression)
+{
+	vector<Declaration const*> output;
+
+	if (auto const* identifier = dynamic_cast<Identifier const*>(_expression))
+	{
+		output.push_back(identifier->annotation().referencedDeclaration);
+		output += identifier->annotation().candidateDeclarations;
+	}
+	else if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(_expression))
+	{
+		output.push_back(memberAccess->annotation().referencedDeclaration);
+	}
+
+	return output;
+}
+
+optional<SourceLocation> declarationPosition(Declaration const* _declaration)
+{
+	if (!_declaration)
+		return nullopt;
+
+	if (_declaration->nameLocation().isValid())
+		return _declaration->nameLocation();
+
+	if (_declaration->location().isValid())
+		return _declaration->location();
+
+	return nullopt;
+}
+
+}
diff --git a/libsolidity/lsp/Utils.h b/libsolidity/lsp/Utils.h
new file mode 100644
index 0000000000..8b598823f2
--- /dev/null
+++ b/libsolidity/lsp/Utils.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <liblangutil/SourceLocation.h>
+
+#include <libsolidity/ast/ASTForward.h>
+
+#include <libsolutil/JSON.h>
+
+#include <optional>
+#include <vector>
+
+namespace solidity::langutil
+{
+class CharStreamProvider;
+}
+
+namespace solidity::lsp
+{
+
+class FileRepository;
+
+std::optional<langutil::LineColumn> parseLineColumn(Json::Value const& _lineColumn);
+Json::Value toJson(langutil::LineColumn _pos);
+Json::Value toJsonRange(langutil::LineColumn const& _start, langutil::LineColumn const& _end);
+
+std::vector<frontend::Declaration const*> allAnnotatedDeclarations(frontend::Expression const* _expression);
+std::optional<langutil::SourceLocation> declarationPosition(frontend::Declaration const* _declaration);
+
+}

From 9410e125dab367e7eb002fbf68fd38680f1d436e Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 14 Mar 2022 11:54:09 +0100
Subject: [PATCH 0469/1748] Change memory-safe assembly annotation suggestion
 during stack too deep errors.

---
 libyul/backends/evm/EVMObjectCompiler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index b60e383e65..4dbf5cc1a3 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -89,7 +89,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 			if (memoryGuardCalls.empty())
 				msg += "\nNo memoryguard was present. "
 					"Consider using memory-safe assembly only and annotating it via "
-					"\"/// @solidity memory-safe-assembly\".";
+					"'assembly (\"memory-safe\") { ... }'.";
 			else
 				msg += "\nmemoryguard was present.";
 			stackError << util::errinfo_comment(msg);

From 2b2f8acc12ded28b79f8c91d96de9e870934c8b1 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 20 Dec 2021 14:10:17 +0100
Subject: [PATCH 0470/1748] LSP: Implements goto-definition.

---
 Changelog.md                                  |   1 +
 libsolidity/CMakeLists.txt                    |   4 +-
 libsolidity/ast/ASTUtils.cpp                  |  23 ++
 libsolidity/ast/ASTUtils.h                    |   7 +-
 libsolidity/lsp/GotoDefinition.cpp            |  66 ++++
 libsolidity/lsp/GotoDefinition.h              |  31 ++
 libsolidity/lsp/HandlerBase.cpp               |  73 +++--
 libsolidity/lsp/HandlerBase.h                 |  38 ++-
 libsolidity/lsp/LanguageServer.cpp            |  26 +-
 libsolidity/lsp/LanguageServer.h              |   9 +-
 libsolidity/lsp/Utils.cpp                     |  78 ++++-
 libsolidity/lsp/Utils.h                       |  56 +++-
 test/libsolidity/lsp/goto_definition.sol      |  68 +++++
 .../lsp/goto_definition_imports.sol           |  19 ++
 test/libsolidity/lsp/lib.sol                  |  26 ++
 test/lsp.py                                   | 287 +++++++++++++++++-
 16 files changed, 720 insertions(+), 92 deletions(-)
 create mode 100644 libsolidity/lsp/GotoDefinition.cpp
 create mode 100644 libsolidity/lsp/GotoDefinition.h
 create mode 100644 test/libsolidity/lsp/goto_definition.sol
 create mode 100644 test/libsolidity/lsp/goto_definition_imports.sol

diff --git a/Changelog.md b/Changelog.md
index 39d22c88e0..3e38e79920 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 * JSON-AST: Added selector field for errors and events.
  * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump.
  * Yul Optimizer: Remove ``sstore`` and ``mstore`` operations that are never read from.
+ * LSP: Implements goto-definition.
 
 Bugfixes:
  * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``.
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 04a4300a3e..3d2845463c 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -155,10 +155,10 @@ set(sources
 	interface/StorageLayout.h
 	interface/Version.cpp
 	interface/Version.h
-	lsp/LanguageServer.cpp
-	lsp/LanguageServer.h
 	lsp/FileRepository.cpp
 	lsp/FileRepository.h
+	lsp/GotoDefinition.cpp
+	lsp/GotoDefinition.h
 	lsp/HandlerBase.cpp
 	lsp/HandlerBase.h
 	lsp/LanguageServer.cpp
diff --git a/libsolidity/ast/ASTUtils.cpp b/libsolidity/ast/ASTUtils.cpp
index 3ed47d6f2e..2b7ea74277 100644
--- a/libsolidity/ast/ASTUtils.cpp
+++ b/libsolidity/ast/ASTUtils.cpp
@@ -18,12 +18,35 @@
 
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/ASTUtils.h>
+#include <libsolidity/ast/ASTVisitor.h>
 
 #include <libsolutil/Algorithms.h>
 
 namespace solidity::frontend
 {
 
+ASTNode const* locateInnermostASTNode(int _offsetInFile, SourceUnit const& _sourceUnit)
+{
+	ASTNode const* innermostMatch = nullptr;
+	auto locator = SimpleASTVisitor(
+		[&](ASTNode const& _node) -> bool
+		{
+			// In the AST parent location always covers the whole child location.
+			// The parent is visited first so to get the innermost node we simply
+			// take the last one that still contains the offset.
+
+			if (!_node.location().containsOffset(_offsetInFile))
+				return false;
+
+			innermostMatch = &_node;
+			return true;
+		},
+		[](ASTNode const&) {}
+	);
+	_sourceUnit.accept(locator);
+	return innermostMatch;
+}
+
 bool isConstantVariableRecursive(VariableDeclaration const& _varDecl)
 {
 	solAssert(_varDecl.isConstant(), "Constant variable expected");
diff --git a/libsolidity/ast/ASTUtils.h b/libsolidity/ast/ASTUtils.h
index 5b1a7d4e52..2bfbb8fe9c 100644
--- a/libsolidity/ast/ASTUtils.h
+++ b/libsolidity/ast/ASTUtils.h
@@ -21,9 +21,11 @@
 namespace solidity::frontend
 {
 
-class VariableDeclaration;
+class ASTNode;
 class Declaration;
 class Expression;
+class SourceUnit;
+class VariableDeclaration;
 
 /// Find the topmost referenced constant variable declaration when the given variable
 /// declaration value is an identifier. Works only for constant variable declarations.
@@ -33,4 +35,7 @@ VariableDeclaration const* rootConstVariableDeclaration(VariableDeclaration cons
 /// Returns true if the constant variable declaration is recursive.
 bool isConstantVariableRecursive(VariableDeclaration const& _varDecl);
 
+/// Returns the innermost AST node that covers the given location or nullptr if not found.
+ASTNode const* locateInnermostASTNode(int _offsetInFile, SourceUnit const& _sourceUnit);
+
 }
diff --git a/libsolidity/lsp/GotoDefinition.cpp b/libsolidity/lsp/GotoDefinition.cpp
new file mode 100644
index 0000000000..26fb686dbb
--- /dev/null
+++ b/libsolidity/lsp/GotoDefinition.cpp
@@ -0,0 +1,66 @@
+/*
+	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 <libsolidity/lsp/GotoDefinition.h>
+#include <libsolidity/lsp/Transport.h> // for RequestError
+#include <libsolidity/lsp/Utils.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/ast/ASTUtils.h>
+
+#include <fmt/format.h>
+
+#include <memory>
+#include <string>
+#include <vector>
+
+using namespace solidity::frontend;
+using namespace solidity::langutil;
+using namespace solidity::lsp;
+using namespace std;
+
+void GotoDefinition::operator()(MessageID _id, Json::Value const& _args)
+{
+	auto const [sourceUnitName, lineColumn] = extractSourceUnitNameAndLineColumn(_args);
+
+	ASTNode const* sourceNode = m_server.astNodeAtSourceLocation(sourceUnitName, lineColumn);
+
+	vector<SourceLocation> locations;
+	if (auto const* expression = dynamic_cast<Expression const*>(sourceNode))
+	{
+		// Handles all expressions that can have one or more declaration annotation.
+		if (auto const* declaration = referencedDeclaration(expression))
+			if (auto location = declarationLocation(declaration))
+				locations.emplace_back(move(location.value()));
+	}
+	else if (auto const* identifierPath = dynamic_cast<IdentifierPath const*>(sourceNode))
+	{
+		if (auto const* declaration = identifierPath->annotation().referencedDeclaration)
+			if (auto location = declarationLocation(declaration))
+				locations.emplace_back(move(location.value()));
+	}
+	else if (auto const* importDirective = dynamic_cast<ImportDirective const*>(sourceNode))
+	{
+		auto const& path = *importDirective->annotation().absolutePath;
+		if (fileRepository().sourceUnits().count(path))
+			locations.emplace_back(SourceLocation{0, 0, make_shared<string const>(path)});
+	}
+
+	Json::Value reply = Json::arrayValue;
+	for (SourceLocation const& location: locations)
+		reply.append(toJson(location));
+	client().reply(_id, reply);
+}
diff --git a/libsolidity/lsp/GotoDefinition.h b/libsolidity/lsp/GotoDefinition.h
new file mode 100644
index 0000000000..453da3f156
--- /dev/null
+++ b/libsolidity/lsp/GotoDefinition.h
@@ -0,0 +1,31 @@
+/*
+	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 <libsolidity/lsp/HandlerBase.h>
+
+namespace solidity::lsp
+{
+
+class GotoDefinition: public HandlerBase
+{
+public:
+	explicit GotoDefinition(LanguageServer& _server): HandlerBase(_server) {}
+
+	void operator()(MessageID, Json::Value const&);
+};
+
+}
diff --git a/libsolidity/lsp/HandlerBase.cpp b/libsolidity/lsp/HandlerBase.cpp
index 3ef2274614..0da19aad35 100644
--- a/libsolidity/lsp/HandlerBase.cpp
+++ b/libsolidity/lsp/HandlerBase.cpp
@@ -1,3 +1,22 @@
+/*
+	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 <libsolutil/Exceptions.h>
+
 #include <libsolidity/lsp/HandlerBase.h>
 #include <libsolidity/lsp/LanguageServer.h>
 #include <libsolidity/lsp/Utils.h>
@@ -5,12 +24,12 @@
 
 #include <liblangutil/Exceptions.h>
 
-using namespace std;
+#include <fmt/format.h>
 
-namespace solidity::lsp
-{
-
-using namespace langutil;
+using namespace solidity::langutil;
+using namespace solidity::lsp;
+using namespace solidity::util;
+using namespace std;
 
 Json::Value HandlerBase::toRange(SourceLocation const& _location) const
 {
@@ -33,31 +52,27 @@ Json::Value HandlerBase::toJson(SourceLocation const& _location) const
 	return item;
 }
 
-optional<SourceLocation> HandlerBase::parsePosition(string const& _sourceUnitName, Json::Value const& _position) const
+pair<string, LineColumn> HandlerBase::extractSourceUnitNameAndLineColumn(Json::Value const& _args) const
 {
-	if (!fileRepository().sourceUnits().count(_sourceUnitName))
-		return nullopt;
-
-	if (optional<LineColumn> lineColumn = parseLineColumn(_position))
-		if (optional<int> const offset = CharStream::translateLineColumnToPosition(
-			fileRepository().sourceUnits().at(_sourceUnitName),
-			*lineColumn
-		))
-			return SourceLocation{*offset, *offset, make_shared<string>(_sourceUnitName)};
-	return nullopt;
-}
+	string const uri = _args["textDocument"]["uri"].asString();
+	string const sourceUnitName = fileRepository().clientPathToSourceUnitName(uri);
+	if (!fileRepository().sourceUnits().count(sourceUnitName))
+		BOOST_THROW_EXCEPTION(
+			RequestError(ErrorCode::RequestFailed) <<
+			errinfo_comment("Unknown file: " + uri)
+		);
 
-optional<SourceLocation> HandlerBase::parseRange(string const& _sourceUnitName, Json::Value const& _range) const
-{
-	if (!_range.isObject())
-		return nullopt;
-	optional<SourceLocation> start = parsePosition(_sourceUnitName, _range["start"]);
-	optional<SourceLocation> end = parsePosition(_sourceUnitName, _range["end"]);
-	if (!start || !end)
-		return nullopt;
-	solAssert(*start->sourceName == *end->sourceName);
-	start->end = end->end;
-	return start;
-}
+	auto const lineColumn = parseLineColumn(_args["position"]);
+	if (!lineColumn)
+		BOOST_THROW_EXCEPTION(
+			RequestError(ErrorCode::RequestFailed) <<
+			errinfo_comment(fmt::format(
+				"Unknown position {line}:{column} in file: {file}",
+				fmt::arg("line", lineColumn.value().line),
+				fmt::arg("column", lineColumn.value().column),
+				fmt::arg("file", sourceUnitName)
+			))
+		);
 
+	return {sourceUnitName, *lineColumn};
 }
diff --git a/libsolidity/lsp/HandlerBase.h b/libsolidity/lsp/HandlerBase.h
index 067d485b52..3ca1679be6 100644
--- a/libsolidity/lsp/HandlerBase.h
+++ b/libsolidity/lsp/HandlerBase.h
@@ -1,3 +1,20 @@
+/*
+	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
 #pragma once
 
 #include <libsolidity/lsp/FileRepository.h>
@@ -24,22 +41,15 @@ class HandlerBase
 	Json::Value toRange(langutil::SourceLocation const& _location) const;
 	Json::Value toJson(langutil::SourceLocation const& _location) const;
 
-	std::optional<langutil::SourceLocation> parsePosition(
-		std::string const& _sourceUnitName,
-		Json::Value const& _position
-	) const;
+	/// @returns source unit name and the line column position as extracted
+	/// from the JSON-RPC parameters.
+	std::pair<std::string, langutil::LineColumn> extractSourceUnitNameAndLineColumn(Json::Value const& _params) const;
 
-	/// @returns the source location given a source unit name and an LSP Range object,
-	/// or nullopt on failure.
-	std::optional<langutil::SourceLocation> parseRange(
-		std::string const& _sourceUnitName,
-		Json::Value const& _range
-	) const;
-
-	langutil::CharStreamProvider const& charStreamProvider() const noexcept { return m_server.charStreamProvider(); };
-	FileRepository const& fileRepository() const noexcept { return m_server.fileRepository(); };
-	Transport& client() const noexcept { return m_server.client(); };
+	langutil::CharStreamProvider const& charStreamProvider() const noexcept { return m_server.charStreamProvider(); }
+	FileRepository const& fileRepository() const noexcept { return m_server.fileRepository(); }
+	Transport& client() const noexcept { return m_server.client(); }
 
+protected:
 	LanguageServer& m_server;
 };
 
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 1808fc9931..671476ab05 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -24,6 +24,8 @@
 #include <libsolidity/lsp/HandlerBase.h>
 #include <libsolidity/lsp/Utils.h>
 
+// LSP feature implementations
+#include <libsolidity/lsp/GotoDefinition.h>
 
 #include <liblangutil/SourceReferenceExtractor.h>
 #include <liblangutil/CharStream.h>
@@ -75,9 +77,11 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"initialize", bind(&LanguageServer::handleInitialize, this, _1, _2)},
 		{"initialized", [](auto, auto) {}},
 		{"shutdown", [this](auto, auto) { m_state = State::ShutdownRequested; }},
+		{"textDocument/definition", GotoDefinition(*this) },
 		{"textDocument/didOpen", bind(&LanguageServer::handleTextDocumentDidOpen, this, _2)},
 		{"textDocument/didChange", bind(&LanguageServer::handleTextDocumentDidChange, this, _2)},
 		{"textDocument/didClose", bind(&LanguageServer::handleTextDocumentDidClose, this, _2)},
+		{"textDocument/implementation", GotoDefinition(*this) },
 		{"workspace/didChangeConfiguration", bind(&LanguageServer::handleWorkspaceDidChangeConfiguration, this, _2)},
 	},
 	m_fileRepository("/" /* basePath */),
@@ -85,11 +89,6 @@ LanguageServer::LanguageServer(Transport& _transport):
 {
 }
 
-optional<SourceLocation> LanguageServer::parseRange(string const& _sourceUnitName, Json::Value const& _range)
-{
-	return HandlerBase{*this}.parseRange(_sourceUnitName, _range);
-}
-
 Json::Value LanguageServer::toRange(SourceLocation const& _location)
 {
 	return HandlerBase(*this).toRange(_location);
@@ -258,8 +257,10 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	Json::Value replyArgs;
 	replyArgs["serverInfo"]["name"] = "solc";
 	replyArgs["serverInfo"]["version"] = string(VersionNumber);
-	replyArgs["capabilities"]["textDocumentSync"]["openClose"] = true;
+	replyArgs["capabilities"]["definitionProvider"] = true;
+	replyArgs["capabilities"]["implementationProvider"] = true;
 	replyArgs["capabilities"]["textDocumentSync"]["change"] = 2; // 0=none, 1=full, 2=incremental
+	replyArgs["capabilities"]["textDocumentSync"]["openClose"] = true;
 
 	m_client.reply(_id, move(replyArgs));
 }
@@ -313,7 +314,7 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 		string text = jsonContentChange["text"].asString();
 		if (jsonContentChange["range"].isObject()) // otherwise full content update
 		{
-			optional<SourceLocation> change = parseRange(sourceUnitName, jsonContentChange["range"]);
+			optional<SourceLocation> change = parseRange(m_fileRepository, sourceUnitName, jsonContentChange["range"]);
 			lspAssert(
 				change && change->hasText(),
 				ErrorCode::RequestFailed,
@@ -346,7 +347,7 @@ void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
 	compileAndUpdateDiagnostics();
 }
 
-ASTNode const* LanguageServer::requestASTNode(std::string const& _sourceUnitName, LineColumn const& _filePos)
+ASTNode const* LanguageServer::astNodeAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
 {
 	if (m_compilerStack.state() < CompilerStack::AnalysisPerformed)
 		return nullptr;
@@ -354,11 +355,10 @@ ASTNode const* LanguageServer::requestASTNode(std::string const& _sourceUnitName
 	if (!m_fileRepository.sourceUnits().count(_sourceUnitName))
 		return nullptr;
 
-	optional<int> sourcePos = m_compilerStack.charStream(_sourceUnitName)
-		.translateLineColumnToPosition(_filePos);
-	if (!sourcePos.has_value())
+	if (optional<int> sourcePos =
+		m_compilerStack.charStream(_sourceUnitName).translateLineColumnToPosition(_filePos))
+		return locateInnermostASTNode(*sourcePos, m_compilerStack.ast(_sourceUnitName));
+	else
 		return nullptr;
-
-	return locateInnermostASTNode(*sourcePos, m_compilerStack.ast(_sourceUnitName));
 }
 
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
index 8bc5e21a29..d2ad093677 100644
--- a/libsolidity/lsp/LanguageServer.h
+++ b/libsolidity/lsp/LanguageServer.h
@@ -59,7 +59,7 @@ class LanguageServer
 
 	FileRepository& fileRepository() noexcept { return m_fileRepository; }
 	Transport& client() noexcept { return m_client; }
-	frontend::ASTNode const* requestASTNode(std::string const& _sourceUnitName, langutil::LineColumn const& _filePos);
+	frontend::ASTNode const* astNodeAtSourceLocation(std::string const& _sourceUnitName, langutil::LineColumn const& _filePos);
 	langutil::CharStreamProvider const& charStreamProvider() const noexcept { return m_compilerStack; }
 
 private:
@@ -71,6 +71,7 @@ class LanguageServer
 	void handleTextDocumentDidOpen(Json::Value const& _args);
 	void handleTextDocumentDidChange(Json::Value const& _args);
 	void handleTextDocumentDidClose(Json::Value const& _args);
+	void handleGotoDefinition(MessageID _id, Json::Value const& _args);
 
 	/// Invoked when the server user-supplied configuration changes (initiated by the client).
 	void changeConfiguration(Json::Value const&);
@@ -79,12 +80,6 @@ class LanguageServer
 	void compile();
 	using MessageHandler = std::function<void(MessageID, Json::Value const&)>;
 
-	/// @returns the source location given a source unit name and an LSP Range object,
-	/// or nullopt on failure.
-	std::optional<langutil::SourceLocation> parseRange(
-		std::string const& _sourceUnitName,
-		Json::Value const& _range
-	);
 	Json::Value toRange(langutil::SourceLocation const& _location);
 	Json::Value toJson(langutil::SourceLocation const& _location);
 
diff --git a/libsolidity/lsp/Utils.cpp b/libsolidity/lsp/Utils.cpp
index a25e06d5f6..624d1f1502 100644
--- a/libsolidity/lsp/Utils.cpp
+++ b/libsolidity/lsp/Utils.cpp
@@ -1,9 +1,30 @@
+/*
+	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 <liblangutil/CharStreamProvider.h>
 #include <liblangutil/Exceptions.h>
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/lsp/FileRepository.h>
 #include <libsolidity/lsp/Utils.h>
 
+#include <fmt/format.h>
+#include <fstream>
+
 namespace solidity::lsp
 {
 
@@ -19,7 +40,7 @@ optional<LineColumn> parseLineColumn(Json::Value const& _lineColumn)
 		return nullopt;
 }
 
-Json::Value toJson(LineColumn _pos)
+Json::Value toJson(LineColumn const& _pos)
 {
 	Json::Value json = Json::objectValue;
 	json["line"] = max(_pos.line, 0);
@@ -36,24 +57,20 @@ Json::Value toJsonRange(LineColumn const& _start, LineColumn const& _end)
 	return json;
 }
 
-vector<Declaration const*> allAnnotatedDeclarations(Expression const* _expression)
+Declaration const* referencedDeclaration(Expression const* _expression)
 {
-	vector<Declaration const*> output;
-
 	if (auto const* identifier = dynamic_cast<Identifier const*>(_expression))
-	{
-		output.push_back(identifier->annotation().referencedDeclaration);
-		output += identifier->annotation().candidateDeclarations;
-	}
-	else if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(_expression))
-	{
-		output.push_back(memberAccess->annotation().referencedDeclaration);
-	}
-
-	return output;
+		if (Declaration const* referencedDeclaration = identifier->annotation().referencedDeclaration)
+			return referencedDeclaration;
+
+	if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(_expression))
+		if (memberAccess->annotation().referencedDeclaration)
+			return memberAccess->annotation().referencedDeclaration;
+
+	return nullptr;
 }
 
-optional<SourceLocation> declarationPosition(Declaration const* _declaration)
+optional<SourceLocation> declarationLocation(Declaration const* _declaration)
 {
 	if (!_declaration)
 		return nullopt;
@@ -67,4 +84,35 @@ optional<SourceLocation> declarationPosition(Declaration const* _declaration)
 	return nullopt;
 }
 
+optional<SourceLocation> parsePosition(
+	FileRepository const& _fileRepository,
+	string const& _sourceUnitName,
+	Json::Value const& _position
+)
+{
+	if (!_fileRepository.sourceUnits().count(_sourceUnitName))
+		return nullopt;
+
+	if (optional<LineColumn> lineColumn = parseLineColumn(_position))
+		if (optional<int> const offset = CharStream::translateLineColumnToPosition(
+			_fileRepository.sourceUnits().at(_sourceUnitName),
+			*lineColumn
+		))
+			return SourceLocation{*offset, *offset, make_shared<string>(_sourceUnitName)};
+	return nullopt;
+}
+
+optional<SourceLocation> parseRange(FileRepository const& _fileRepository, string const& _sourceUnitName, Json::Value const& _range)
+{
+	if (!_range.isObject())
+		return nullopt;
+	optional<SourceLocation> start = parsePosition(_fileRepository, _sourceUnitName, _range["start"]);
+	optional<SourceLocation> end = parsePosition(_fileRepository, _sourceUnitName, _range["end"]);
+	if (!start || !end)
+		return nullopt;
+	solAssert(*start->sourceName == *end->sourceName);
+	start->end = end->end;
+	return start;
+}
+
 }
diff --git a/libsolidity/lsp/Utils.h b/libsolidity/lsp/Utils.h
index 8b598823f2..3594efba24 100644
--- a/libsolidity/lsp/Utils.h
+++ b/libsolidity/lsp/Utils.h
@@ -1,3 +1,21 @@
+/*
+	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
+
 #pragma once
 
 #include <liblangutil/SourceLocation.h>
@@ -9,6 +27,13 @@
 #include <optional>
 #include <vector>
 
+#if !defined(NDEBUG)
+#include <fstream>
+#define lspDebug(message) (std::ofstream("/tmp/solc.log", std::ios::app) << (message) << std::endl)
+#else
+#define lspDebug(message) do {} while (0)
+#endif
+
 namespace solidity::langutil
 {
 class CharStreamProvider;
@@ -20,10 +45,35 @@ namespace solidity::lsp
 class FileRepository;
 
 std::optional<langutil::LineColumn> parseLineColumn(Json::Value const& _lineColumn);
-Json::Value toJson(langutil::LineColumn _pos);
+Json::Value toJson(langutil::LineColumn const& _pos);
 Json::Value toJsonRange(langutil::LineColumn const& _start, langutil::LineColumn const& _end);
 
-std::vector<frontend::Declaration const*> allAnnotatedDeclarations(frontend::Expression const* _expression);
-std::optional<langutil::SourceLocation> declarationPosition(frontend::Declaration const* _declaration);
+/// @returns the source location given a source unit name and an LSP Range object,
+/// or nullopt on failure.
+std::optional<langutil::SourceLocation> parsePosition(
+	FileRepository const& _fileRepository,
+	std::string const& _sourceUnitName,
+	Json::Value const& _position
+);
+
+/// @returns the source location given a source unit name and an LSP Range object,
+/// or nullopt on failure.
+std::optional<langutil::SourceLocation> parseRange(
+	FileRepository const& _fileRepository,
+	std::string const& _sourceUnitName,
+	Json::Value const& _range
+);
+
+/// Extracts the resolved declaration of the given expression AST node.
+///
+/// This may for example be the type declaration of an identifier,
+/// or the type declaration of a structured member identifier.
+///
+/// @returns the resolved type declaration if found, or nullptr otherwise.
+frontend::Declaration const* referencedDeclaration(frontend::Expression const* _expression);
+
+/// @returns the location of the declaration's name, if present, or the location of the complete
+/// declaration otherwise. If the input declaration is nullptr, std::nullopt is returned instead.
+std::optional<langutil::SourceLocation> declarationLocation(frontend::Declaration const* _declaration);
 
 }
diff --git a/test/libsolidity/lsp/goto_definition.sol b/test/libsolidity/lsp/goto_definition.sol
new file mode 100644
index 0000000000..675c1297ce
--- /dev/null
+++ b/test/libsolidity/lsp/goto_definition.sol
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+import "./lib.sol";
+
+interface I
+{
+    function f(uint x) external returns (uint);
+}
+
+contract IA is I
+{
+    function f(uint x) public pure override returns (uint) { return x + 1; }
+}
+
+contract IB is I
+{
+    function f(uint x) public pure override returns (uint) { return x + 2; }
+}
+
+library IntLib
+{
+    function add(int self, int b) public pure returns (int) { return self + b; }
+}
+
+contract C
+{
+    I obj;
+    function virtual_inheritance() public payable
+    {
+        obj = new IA();
+        obj.f(1); // goto-definition should jump to definition of interface.
+    }
+
+    using IntLib for *;
+    function using_for(int i) pure public
+    {
+        i.add(5);
+        14.add(4);
+    }
+
+    function useLib(uint n) public payable returns (uint)
+    {
+        return Lib.add(n, 1);
+    }
+
+    function enums(Color c) public pure returns (Color d)
+    {
+        Color e = Color.Red;
+        if (c == e)
+            d = Color.Green;
+        else
+            d = c;
+    }
+
+    type Price is uint128;
+    function udlTest() public pure returns (uint128)
+    {
+        Price p = Price.wrap(128);
+        return Price.unwrap(p);
+    }
+
+    function structCtorTest(uint8 v) public pure returns (uint8 result)
+    {
+        RGBColor memory c = RGBColor(v, 2 * v, 3 * v);
+        result = c.red;
+    }
+}
diff --git a/test/libsolidity/lsp/goto_definition_imports.sol b/test/libsolidity/lsp/goto_definition_imports.sol
new file mode 100644
index 0000000000..b3df921fe1
--- /dev/null
+++ b/test/libsolidity/lsp/goto_definition_imports.sol
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+import {Weather as Wetter} from "./lib.sol";
+import "./lib.sol" as That;
+
+contract C
+{
+    function test_symbol_alias() public pure returns (Wetter result)
+    {
+        result = Wetter.Sunny;
+    }
+
+    function test_library_alias() public pure returns (That.Color result)
+    {
+        That.Color color = That.Color.Red;
+        result = color;
+    }
+}
diff --git a/test/libsolidity/lsp/lib.sol b/test/libsolidity/lsp/lib.sol
index f4fb51e77b..22efe6ca2a 100644
--- a/test/libsolidity/lsp/lib.sol
+++ b/test/libsolidity/lsp/lib.sol
@@ -1,6 +1,25 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.0;
 
+/// Some Error type E.
+error E(uint, uint);
+
+enum Weather {
+    Sunny,
+    Cloudy,
+    Rainy
+}
+
+/// Some custom Color enum type holding 3 colors.
+enum Color {
+    /// Red color.
+    Red,
+    /// Green color.
+    Green,
+    /// Blue color.
+    Blue
+}
+
 library Lib
 {
     function add(uint a, uint b) public pure returns (uint result)
@@ -13,3 +32,10 @@ library Lib
         uint unused;
     }
 }
+
+struct RGBColor
+{
+    uint8 red;
+    uint8 green;
+    uint8 blue;
+}
diff --git a/test/lsp.py b/test/lsp.py
index f03d9bc09b..a20c28c3cd 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-
+# pragma pylint: disable=too-many-lines
 import argparse
 import fnmatch
 import json
@@ -361,6 +361,52 @@ def expect_diagnostic(
             },
             "diagnostic: check range"
         )
+
+    def expect_location(
+        self,
+        obj: dict,
+        uri: str,
+        lineNo: int,
+        startEndColumns: Tuple[int, int]
+    ):
+        """
+        obj is an JSON object containing two keys:
+            - 'uri': a string of the document URI
+            - 'range': the location range, two child objects 'start' and 'end',
+                        each having a 'line' and 'character' integer value.
+        """
+        [startColumn, endColumn] = startEndColumns
+        self.expect_equal(obj['uri'], uri)
+        self.expect_equal(obj['range']['start']['line'], lineNo)
+        self.expect_equal(obj['range']['start']['character'], startColumn)
+        self.expect_equal(obj['range']['end']['line'], lineNo)
+        self.expect_equal(obj['range']['end']['character'], endColumn)
+
+    def expect_goto_definition_location(
+        self,
+        solc: JsonRpcProcess,
+        document_uri: str,
+        document_position: Tuple[int, int],
+        expected_uri: str,
+        expected_lineNo: int,
+        expected_startEndColumns: Tuple[int, int],
+        description: str
+    ):
+        response = solc.call_method(
+            'textDocument/definition',
+            {
+                'textDocument': {
+                    'uri': document_uri,
+                },
+                'position': {
+                    'line': document_position[0],
+                    'character': document_position[1]
+                }
+            }
+        )
+        message = "Goto definition (" + description + ")"
+        self.expect_equal(len(response['result']), 1, message)
+        self.expect_location(response['result'][0], expected_uri, expected_lineNo, expected_startEndColumns)
     # }}}
 
     # {{{ actual tests
@@ -434,7 +480,7 @@ def test_textDocument_didOpen_with_relative_import(self, solc: JsonRpcProcess) -
         report = published_diagnostics[1]
         self.expect_equal(report['uri'], self.get_test_file_uri('lib'), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
-        self.expect_diagnostic(report['diagnostics'][0], code=2072, lineNo=12, startEndColumns=(8, 19))
+        self.expect_diagnostic(report['diagnostics'][0], code=2072, lineNo=31, startEndColumns=(8, 19))
 
     def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
         # Reusing another test but now change some file that generates an error in the other.
@@ -451,8 +497,8 @@ def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
                 [
                     {
                         'range': {
-                            'start': { 'line':  5, 'character': 0 },
-                            'end':   { 'line': 10, 'character': 0 }
+                            'start': { 'line': 24, 'character': 0 },
+                            'end':   { 'line': 29, 'character': 0 }
                         },
                         'text': "" # deleting function `add`
                     }
@@ -497,7 +543,7 @@ def verify_didOpen_with_import_diagnostics(
         report = published_diagnostics[1]
         self.expect_equal(report['uri'], self.get_test_file_uri('lib'), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
-        self.expect_diagnostic(report['diagnostics'][0], code=2072, lineNo=12, startEndColumns=(8, 19))
+        self.expect_diagnostic(report['diagnostics'][0], code=2072, lineNo=31, startEndColumns=(8, 19))
 
     def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
@@ -555,8 +601,8 @@ def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess
                     {
                         'range':
                         {
-                            'start': { 'line': 12, 'character': 1 },
-                            'end':   { 'line': 13, 'character': 1 }
+                            'start': { 'line': 31, 'character': 1 },
+                            'end':   { 'line': 32, 'character': 1 }
                         },
                         'text': ""
                     }
@@ -673,7 +719,7 @@ def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc
         reports = self.wait_for_diagnostics(solc, 2)
         self.expect_equal(len(reports), 2, '')
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
-        self.expect_diagnostic(reports[1]['diagnostics'][0], 2072, 12, (8, 19)) # unused variable in lib.sol
+        self.expect_diagnostic(reports[1]['diagnostics'][0], 2072, 31, (8, 19)) # unused variable in lib.sol
 
         # Now close the file and expect the warning for lib.sol to be removed
         solc.send_message(
@@ -744,6 +790,231 @@ def test_textDocument_didChange_at_eol(self, solc: JsonRpcProcess) -> None:
         self.expect_equal(len(report3['diagnostics']), 1, "one diagnostic")
         self.expect_diagnostic(report3['diagnostics'][0], 4126, 6, (1, 23))
 
+    def test_textDocument_definition(self, solc: JsonRpcProcess) -> None:
+        self.setup_lsp(solc)
+        FILE_NAME = 'goto_definition'
+        FILE_URI = self.get_test_file_uri(FILE_NAME)
+        LIB_URI = self.get_test_file_uri('lib')
+        solc.send_message('textDocument/didOpen', {
+            'textDocument': {
+                'uri': FILE_URI,
+                'languageId': 'Solidity',
+                'version': 1,
+                'text': self.get_test_file_contents(FILE_NAME)
+            }
+        })
+        published_diagnostics = self.wait_for_diagnostics(solc, 2)
+        self.expect_equal(len(published_diagnostics), 2, "publish diagnostics for 2 files")
+        self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0)
+        self.expect_equal(len(published_diagnostics[1]['diagnostics']), 1)
+        self.expect_diagnostic(published_diagnostics[1]['diagnostics'][0], 2072, 31, (8, 19)) # unused variable in lib.sol
+
+        # import directive
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(3, 9), # symbol `"./lib.sol"` in `import "./lib.sol"`
+            expected_uri=LIB_URI,
+            expected_lineNo=0,
+            expected_startEndColumns=(0, 0),
+            description="import directive"
+        )
+
+        # type symbol to jump to type defs (error, contract, enum, ...)
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(30, 19), # symbol `IA` in `new IA()`
+            expected_uri=FILE_URI,
+            expected_lineNo=10,
+            expected_startEndColumns=(9, 11),
+            description="type symbol to jump to definition"
+        )
+
+        # virtual function lookup?
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(31, 12), # symbol `f`, jumps to interface definition
+            expected_uri=FILE_URI,
+            expected_lineNo=7,
+            expected_startEndColumns=(13, 14),
+            description="virtual function lookup"
+        )
+
+        # using for
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(37, 10), # symbol `add` in `i.add(5)`
+            expected_uri=FILE_URI,
+            expected_lineNo=22,
+            expected_startEndColumns=(13, 16),
+            description="using for"
+        )
+
+        # library
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(43, 15), # symbol `Lib` in `Lib.add(n, 1)`
+            expected_uri=LIB_URI,
+            expected_lineNo=22,
+            expected_startEndColumns=(8, 11),
+            description="Library symbol from different file"
+        )
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(43, 19), # symbol `add` in `Lib.add(n, 1)`
+            expected_uri=LIB_URI,
+            expected_lineNo=24,
+            expected_startEndColumns=(13, 16),
+            description="Library member symbol from different file"
+        )
+
+        # enum type symbol and enum values
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(46, 19), # symbol `Color` in function signature's parameter
+            expected_uri=LIB_URI,
+            expected_lineNo=13,
+            expected_startEndColumns=(5, 10),
+            description="Enum type"
+        )
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(48, 24), # symbol `Red` in `Color.Red`
+            expected_uri=LIB_URI,
+            expected_lineNo=15,
+            expected_startEndColumns=(4, 7),
+            description="Enum value"
+        )
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(48, 24), # symbol `Red` in `Color.Red`
+            expected_uri=LIB_URI,
+            expected_lineNo=15,
+            expected_startEndColumns=(4, 7),
+            description="Enum value"
+        )
+
+        # local variable declarations
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(49, 17), # symbol `e` in `(c == e)`
+            expected_uri=FILE_URI,
+            expected_lineNo=48,
+            expected_startEndColumns=(14, 15),
+            description="local variable declaration"
+        )
+
+        # User defined type
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(58, 8), # symbol `Price` in `Price p ...`
+            expected_uri=FILE_URI,
+            expected_lineNo=55,
+            expected_startEndColumns=(9, 14),
+            description="User defined type on left hand side"
+        )
+
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(58, 18), # symbol `Price` in `Price.wrap()` expected_uri=FILE_URI,
+            expected_uri=FILE_URI,
+            expected_lineNo=55,
+            expected_startEndColumns=(9, 14),
+            description="User defined type on right hand side."
+        )
+
+        # struct constructor also properly jumps to the struct's declaration.
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(64, 33), # symbol `RGBColor` right hand side expression.
+            expected_uri=LIB_URI,
+            expected_lineNo=35,
+            expected_startEndColumns=(7, 15),
+            description="Struct constructor."
+        )
+
+    def test_textDocument_definition_imports(self, solc: JsonRpcProcess) -> None:
+        self.setup_lsp(solc)
+        FILE_NAME = 'goto_definition_imports'
+        FILE_URI = self.get_test_file_uri(FILE_NAME)
+        LIB_URI = self.get_test_file_uri('lib')
+        solc.send_message('textDocument/didOpen', {
+            'textDocument': {
+                'uri': FILE_URI,
+                'languageId': 'Solidity',
+                'version': 1,
+                'text': self.get_test_file_contents(FILE_NAME)
+            }
+        })
+        published_diagnostics = self.wait_for_diagnostics(solc, 2)
+        self.expect_equal(len(published_diagnostics), 2, "publish diagnostics for 2 files")
+        self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0)
+        self.expect_equal(len(published_diagnostics[1]['diagnostics']), 1)
+        self.expect_diagnostic(published_diagnostics[1]['diagnostics'][0], 2072, 31, (8, 19)) # unused variable in lib.sol
+
+        # import directive: test symbol alias
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(3, 9), #  in `Weather` of `import {Weather as Wetter} from "./lib.sol"`
+            expected_uri=LIB_URI,
+            expected_lineNo=6,
+            expected_startEndColumns=(5, 12),
+            description="goto definition of symbol in symbol alias import directive"
+        )
+
+        # import directive: test symbol alias
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(8, 55), # `Wetter` in return type declaration
+            expected_uri=LIB_URI,
+            expected_lineNo=6,
+            expected_startEndColumns=(5, 12),
+            description="goto definition of symbol in symbol alias import directive"
+        )
+
+        # That.Color tests with `That` being the aliased library to be imported.
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(13, 55), # `That` in return type declaration
+            expected_uri=LIB_URI,
+            expected_lineNo=13,
+            expected_startEndColumns=(5, 10),
+            description="goto definition of symbol in symbol alias import directive"
+        )
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(15, 8),
+            expected_uri=LIB_URI,
+            expected_lineNo=13,
+            expected_startEndColumns=(5, 10),
+            description="`That` in LHS variable assignment"
+        )
+        self.expect_goto_definition_location(
+            solc=solc,
+            document_uri=FILE_URI,
+            document_position=(15, 27),
+            expected_uri=FILE_URI,
+            expected_lineNo=4,
+            expected_startEndColumns=(22, 26),
+            description="`That` in expression"
+        )
+
     def test_textDocument_didChange_empty_file(self, solc: JsonRpcProcess) -> None:
         """
         Starts with an empty file and changes it to look like

From 672951ccc74bd0f103f32fb04132d55f51100a39 Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Mon, 11 Oct 2021 10:16:52 +0200
Subject: [PATCH 0471/1748] Extend using-for.

---
 Changelog.md                                  |   1 +
 docs/contracts/using-for.rst                  | 107 ++++++++-----
 docs/grammar/SolidityParser.g4                |   7 +-
 .../analysis/DeclarationTypeChecker.cpp       |  38 ++++-
 libsolidity/analysis/SyntaxChecker.cpp        |  24 +++
 libsolidity/analysis/SyntaxChecker.h          |   3 +
 libsolidity/analysis/TypeChecker.cpp          |  66 +++++++-
 libsolidity/ast/AST.h                         |  29 +++-
 libsolidity/ast/ASTJsonConverter.cpp          |  22 ++-
 libsolidity/ast/ASTJsonImporter.cpp           |  10 +-
 libsolidity/ast/AST_accept.h                  |   4 +-
 libsolidity/ast/Types.cpp                     |  71 +++++---
 libsolidity/parsing/Parser.cpp                |  22 ++-
 .../ASTJSON/using_for_directive.json          | 151 ++++++++++++++----
 .../ASTJSON/using_for_directive.sol           |   5 +-
 .../using_for_directive_parseOnly.json        | 114 ++++++++++---
 .../using/calldata_memory_copy.sol            |  19 +++
 .../using/free_function_braces.sol            |  26 +++
 .../using/free_function_multi.sol             |  27 ++++
 .../using/free_functions_individual.sol       |  30 ++++
 .../using/imported_functions.sol              |  19 +++
 .../using/library_through_module.sol          |  34 ++++
 .../semanticTests/using/module_renamed.sol    |  26 +++
 .../syntaxTests/bound/bound_to_struct.sol     |   2 +-
 .../syntaxTests/bound/interface_using_for.sol |   2 +-
 .../252_using_for_not_library.sol             |   2 +-
 .../514_using_for_with_non_library.sol        |   2 +-
 .../syntaxTests/using/double_asterisk.sol     |  19 +++
 .../file_level_inactive_after_import.sol      |  22 +++
 .../free_functions_implicit_conversion.sol    |   6 +
 ...free_functions_implicit_conversion_err.sol |   8 +
 .../using/free_functions_non_unique_err.sol   |  12 ++
 .../syntaxTests/using/free_overloads.sol      |  10 ++
 .../using/free_overloads_array.sol            |   9 ++
 .../syntaxTests/using/free_reference_type.sol |  11 ++
 .../syntaxTests/using/library_import_as.sol   |  16 ++
 ...library_non_free_external_function_err.sol |  14 ++
 .../using/library_non_free_function.sol       |  13 ++
 .../syntaxTests/using/module_1.sol            |  12 ++
 .../syntaxTests/using/module_2.sol            |  14 ++
 .../syntaxTests/using/module_3.sol            |  14 ++
 .../using/module_identifier_not_found.sol     |  13 ++
 .../syntaxTests/using/using_contract_err.sol  |  13 ++
 .../using/using_empty_list_err.sol            |   5 +
 .../using/using_empty_list_file_level.sol     |   3 +
 .../using/using_for_ast_file_level.sol        |   7 +
 .../using/using_free_functions.sol            |  16 ++
 .../using/using_free_no_parameters_err.sol    |   7 +
 .../using/using_functions_with_ast.sol        |   7 +
 .../syntaxTests/using/using_lhs_asterisk.sol  |   3 +
 .../using/using_lhs_asterisk_contract.sol     |   5 +
 .../using/using_library_ast_file_level.sol    |   4 +
 .../using/using_library_file_level.sol        |   3 +
 .../using/using_non_free_function_err.sol     |   9 ++
 .../syntaxTests/using/using_non_function.sol  |   6 +
 55 files changed, 993 insertions(+), 151 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/using/calldata_memory_copy.sol
 create mode 100644 test/libsolidity/semanticTests/using/free_function_braces.sol
 create mode 100644 test/libsolidity/semanticTests/using/free_function_multi.sol
 create mode 100644 test/libsolidity/semanticTests/using/free_functions_individual.sol
 create mode 100644 test/libsolidity/semanticTests/using/imported_functions.sol
 create mode 100644 test/libsolidity/semanticTests/using/library_through_module.sol
 create mode 100644 test/libsolidity/semanticTests/using/module_renamed.sol
 create mode 100644 test/libsolidity/syntaxTests/using/double_asterisk.sol
 create mode 100644 test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol
 create mode 100644 test/libsolidity/syntaxTests/using/free_functions_implicit_conversion.sol
 create mode 100644 test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
 create mode 100644 test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
 create mode 100644 test/libsolidity/syntaxTests/using/free_overloads.sol
 create mode 100644 test/libsolidity/syntaxTests/using/free_overloads_array.sol
 create mode 100644 test/libsolidity/syntaxTests/using/free_reference_type.sol
 create mode 100644 test/libsolidity/syntaxTests/using/library_import_as.sol
 create mode 100644 test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
 create mode 100644 test/libsolidity/syntaxTests/using/library_non_free_function.sol
 create mode 100644 test/libsolidity/syntaxTests/using/module_1.sol
 create mode 100644 test/libsolidity/syntaxTests/using/module_2.sol
 create mode 100644 test/libsolidity/syntaxTests/using/module_3.sol
 create mode 100644 test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_contract_err.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_empty_list_err.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_free_functions.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_functions_with_ast.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_library_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_non_function.sol

diff --git a/Changelog.md b/Changelog.md
index 39d22c88e0..7171cfa427 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 Language Features:
  * General: Allow annotating inline assembly as memory-safe to allow optimizations and stack limit evasion that rely on respecting Solidity's memory model.
+ * General: ``using M for Type;`` is allowed at file level and ``M`` can now also be a brace-enclosed list of free functions or library functions.
 
 
 Compiler Features:
diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index af6750f87d..c95a419e63 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -6,71 +6,89 @@
 Using For
 *********
 
-The directive ``using A for B;`` can be used to attach library
-functions (from the library ``A``) to any type (``B``)
-in the context of a contract.
+The directive ``using A for B;`` can be used to attach
+functions (``A``) as member functions to any type (``B``).
 These functions will receive the object they are called on
 as their first parameter (like the ``self`` variable in Python).
 
-The effect of ``using A for *;`` is that the functions from
-the library ``A`` are attached to *any* type.
+It is valid either at file level or inside a contract,
+at contract level.
 
-In both situations, *all* functions in the library are attached,
+The first part, ``A``, can be one of:
+
+- a list of file-level or library functions (``using {f, g, h, L.t} for uint;``) -
+  only those functions will be attached to the type.
+- the name of a library (``using L for uint;``) -
+  all functions (both public and internal ones) of the library are attached to the type
+
+At file level, the second part, ``B``, has to be an explicit type (without data location specifier).
+Inside contracts, you can also use ``using L for *;``,
+which has the effect that all functions of the library ``L``
+are attached to *all* types.
+
+If you specify a library, *all* functions in the library are attached,
 even those where the type of the first parameter does not
 match the type of the object. The type is checked at the
 point the function is called and function overload
 resolution is performed.
 
+If you use a list of functions (``using {f, g, h, L.t} for uint;``),
+then the type (``uint``) has to be implicitly convertible to the
+first parameter of each of these functions. This check is
+performed even if none of these functions are called.
+
 The ``using A for B;`` directive is active only within the current
-contract, including within all of its functions, and has no effect
-outside of the contract in which it is used. The directive
-may only be used inside a contract, not inside any of its functions.
+scope (either the contract or the current module/source unit),
+including within all of its functions, and has no effect
+outside of the contract or module in which it is used.
 
 Let us rewrite the set example from the
-:ref:`libraries` in this way:
+:ref:`libraries` section in this way, using file-level functions
+instead of library functions.
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.6.0 <0.9.0;
-
+    pragma solidity ^0.8.13;
 
-    // This is the same code as before, just without comments
     struct Data { mapping(uint => bool) flags; }
+    // Now we attach functions to the type.
+    // The attached functions can be used throughout the rest of the module.
+    // If you import the module, you have to
+    // repeat the using directive there, for example as
+    //   import "flags.sol" as Flags;
+    //   using {Flags.insert, Flags.remove, Flags.contains}
+    //     for Flags.Data;
+    using {insert, remove, contains} for Data;
+
+    function insert(Data storage self, uint value)
+        returns (bool)
+    {
+        if (self.flags[value])
+            return false; // already there
+        self.flags[value] = true;
+        return true;
+    }
 
-    library Set {
-        function insert(Data storage self, uint value)
-            public
-            returns (bool)
-        {
-            if (self.flags[value])
-                return false; // already there
-            self.flags[value] = true;
-            return true;
-        }
-
-        function remove(Data storage self, uint value)
-            public
-            returns (bool)
-        {
-            if (!self.flags[value])
-                return false; // not there
-            self.flags[value] = false;
-            return true;
-        }
+    function remove(Data storage self, uint value)
+        returns (bool)
+    {
+        if (!self.flags[value])
+            return false; // not there
+        self.flags[value] = false;
+        return true;
+    }
 
-        function contains(Data storage self, uint value)
-            public
-            view
-            returns (bool)
-        {
-            return self.flags[value];
-        }
+    function contains(Data storage self, uint value)
+        public
+        view
+        returns (bool)
+    {
+        return self.flags[value];
     }
 
 
     contract C {
-        using Set for Data; // this is the crucial change
         Data knownValues;
 
         function register(uint value) public {
@@ -82,12 +100,13 @@ Let us rewrite the set example from the
         }
     }
 
-It is also possible to extend elementary types in that way:
+It is also possible to extend built-in types in that way.
+In this example, we will use a library.
 
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.6.8 <0.9.0;
+    pragma solidity ^0.8.13;
 
     library Search {
         function indexOf(uint[] storage self, uint value)
@@ -100,9 +119,9 @@ It is also possible to extend elementary types in that way:
             return type(uint).max;
         }
     }
+    using Search for uint[];
 
     contract C {
-        using Search for uint[];
         uint[] data;
 
         function append(uint value) public {
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index e41bb2ba9d..415dd5985c 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -12,6 +12,7 @@ options { tokenVocab=SolidityLexer; }
 sourceUnit: (
 	pragmaDirective
 	| importDirective
+	| usingDirective
 	| contractDefinition
 	| interfaceDefinition
 	| libraryDefinition
@@ -311,10 +312,10 @@ errorDefinition:
 	Semicolon;
 
 /**
- * Using directive to bind library functions to types.
- * Can occur within contracts and libraries.
+ * Using directive to bind library functions and free functions to types.
+ * Can occur within contracts and libraries and at the file level.
  */
-usingDirective: Using identifierPath For (Mul | typeName) Semicolon;
+usingDirective: Using (identifierPath | (LBrace identifierPath (Comma identifierPath)* RBrace)) For (Mul | typeName) Semicolon;
 /**
  * A type name can be an elementary type, a function type, a mapping type, a user-defined type
  * (e.g. a contract or struct) or an array type.
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index ba989972cb..4fb2104352 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -25,6 +25,7 @@
 #include <liblangutil/ErrorReporter.h>
 
 #include <libsolutil/Algorithms.h>
+#include <libsolutil/Visitor.h>
 
 #include <range/v3/view/transform.hpp>
 
@@ -451,12 +452,39 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 
 bool DeclarationTypeChecker::visit(UsingForDirective const& _usingFor)
 {
-	ContractDefinition const* library = dynamic_cast<ContractDefinition const*>(
-		_usingFor.libraryName().annotation().referencedDeclaration
-	);
+	if (_usingFor.usesBraces())
+	{
+		for (ASTPointer<IdentifierPath> const& function: _usingFor.functionsOrLibrary())
+			if (auto functionDefinition = dynamic_cast<FunctionDefinition const*>(function->annotation().referencedDeclaration))
+			{
+				if (!functionDefinition->isFree() && !(
+					dynamic_cast<ContractDefinition const*>(functionDefinition->scope()) &&
+					dynamic_cast<ContractDefinition const*>(functionDefinition->scope())->isLibrary()
+				))
+					m_errorReporter.typeError(
+						4167_error,
+						function->location(),
+						"Only file-level functions and library functions can be bound to a type in a \"using\" statement"
+					);
+			}
+			else
+				m_errorReporter.fatalTypeError(8187_error, function->location(), "Expected function name." );
+	}
+	else
+	{
+		ContractDefinition const* library = dynamic_cast<ContractDefinition const*>(
+			_usingFor.functionsOrLibrary().front()->annotation().referencedDeclaration
+		);
+		if (!library || !library->isLibrary())
+			m_errorReporter.fatalTypeError(
+				4357_error,
+				_usingFor.functionsOrLibrary().front()->location(),
+				"Library name expected. If you want to attach a function, use '{...}'."
+			);
+	}
 
-	if (!library || !library->isLibrary())
-		m_errorReporter.fatalTypeError(4357_error, _usingFor.libraryName().location(), "Library name expected.");
+	// We do not visit _usingFor.functions() because it will lead to an error since
+	// library names cannot be mentioned stand-alone.
 
 	if (_usingFor.typeName())
 		_usingFor.typeName()->accept(*this);
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index 589787a893..b6a30e6646 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -403,6 +403,30 @@ void SyntaxChecker::endVisit(ContractDefinition const&)
 	m_currentContractKind = std::nullopt;
 }
 
+bool SyntaxChecker::visit(UsingForDirective const& _usingFor)
+{
+	if (!m_currentContractKind && !_usingFor.typeName())
+		m_errorReporter.syntaxError(
+			8118_error,
+			_usingFor.location(),
+			"The type has to be specified explicitly at file level (cannot use '*')."
+		);
+	else if (_usingFor.usesBraces() && !_usingFor.typeName())
+		m_errorReporter.syntaxError(
+			3349_error,
+			_usingFor.location(),
+			"The type has to be specified explicitly when attaching specific functions."
+		);
+	if (m_currentContractKind == ContractKind::Interface)
+		m_errorReporter.syntaxError(
+			9088_error,
+			_usingFor.location(),
+			"The \"using for\" directive is not allowed inside interfaces."
+		);
+
+	return true;
+}
+
 bool SyntaxChecker::visit(FunctionDefinition const& _function)
 {
 	solAssert(_function.isFree() == (m_currentContractKind == std::nullopt), "");
diff --git a/libsolidity/analysis/SyntaxChecker.h b/libsolidity/analysis/SyntaxChecker.h
index ca36ed992c..f221df09fc 100644
--- a/libsolidity/analysis/SyntaxChecker.h
+++ b/libsolidity/analysis/SyntaxChecker.h
@@ -88,6 +88,9 @@ class SyntaxChecker: private ASTConstVisitor
 
 	bool visit(ContractDefinition const& _contract) override;
 	void endVisit(ContractDefinition const& _contract) override;
+
+	bool visit(UsingForDirective const& _usingFor) override;
+
 	bool visit(FunctionDefinition const& _function) override;
 	bool visit(FunctionTypeName const& _node) override;
 
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 56edfc6733..3790331170 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -35,6 +35,7 @@
 #include <libsolutil/Algorithms.h>
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/Views.h>
+#include <libsolutil/Visitor.h>
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -3626,12 +3627,67 @@ void TypeChecker::endVisit(Literal const& _literal)
 
 void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 {
-	if (m_currentContract->isInterface())
-		m_errorReporter.typeError(
-			9088_error,
-			_usingFor.location(),
-			"The \"using for\" directive is not allowed inside interfaces."
+	if (!_usingFor.usesBraces())
+	{
+		solAssert(_usingFor.functionsOrLibrary().size() == 1);
+		ContractDefinition const* library = dynamic_cast<ContractDefinition const*>(
+				_usingFor.functionsOrLibrary().front()->annotation().referencedDeclaration
+		);
+		solAssert(library && library->isLibrary());
+		// No type checking for libraries
+		return;
+	}
+
+	if (!_usingFor.typeName())
+	{
+		solAssert(m_errorReporter.hasErrors());
+		return;
+	}
+
+	solAssert(_usingFor.typeName()->annotation().type);
+	Type const* normalizedType = TypeProvider::withLocationIfReference(
+		DataLocation::Storage,
+		_usingFor.typeName()->annotation().type
+	);
+	solAssert(normalizedType);
+
+	for (ASTPointer<IdentifierPath> const& path: _usingFor.functionsOrLibrary())
+	{
+		solAssert(path->annotation().referencedDeclaration);
+		FunctionDefinition const& functionDefinition =
+			dynamic_cast<FunctionDefinition const&>(*path->annotation().referencedDeclaration);
+
+		solAssert(functionDefinition.type());
+
+		if (functionDefinition.parameters().empty())
+			m_errorReporter.fatalTypeError(
+				4731_error,
+				path->location(),
+				"The function \"" + joinHumanReadable(path->path(), ".") + "\" " +
+				"does not have any parameters, and therefore cannot be bound to the type \"" +
+				(normalizedType ? normalizedType->toString(true) : "*") + "\"."
+			);
+
+		FunctionType const* functionType = dynamic_cast<FunctionType const&>(*functionDefinition.type()).asBoundFunction();
+		solAssert(functionType && functionType->selfType(), "");
+		BoolResult result = normalizedType->isImplicitlyConvertibleTo(
+			*TypeProvider::withLocationIfReference(DataLocation::Storage, functionType->selfType())
 		);
+		if (!result)
+			m_errorReporter.typeError(
+				3100_error,
+				path->location(),
+				"The function \"" + joinHumanReadable(path->path(), ".") + "\" "+
+				"cannot be bound to the type \"" + _usingFor.typeName()->annotation().type->toString() +
+				"\" because the type cannot be implicitly converted to the first argument" +
+				" of the function (\"" + functionType->selfType()->toString() + "\")" +
+				(
+					result.message().empty() ?
+					"." :
+					": " +  result.message()
+				)
+			);
+	}
 }
 
 void TypeChecker::checkErrorAndEventParameters(CallableDeclaration const& _callable)
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 4893c212f0..613d91ad99 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -33,6 +33,7 @@
 #include <libevmasm/Instruction.h>
 #include <libsolutil/FixedHash.h>
 #include <libsolutil/LazyInit.h>
+#include <libsolutil/Visitor.h>
 
 #include <json/json.h>
 
@@ -630,9 +631,16 @@ class InheritanceSpecifier: public ASTNode
 };
 
 /**
- * `using LibraryName for uint` will attach all functions from the library LibraryName
- * to `uint` if the first parameter matches the type. `using LibraryName for *` attaches
- * the function to any matching type.
+ * Using for directive:
+ *
+ * 1. `using LibraryName for T` attaches all functions from the library `LibraryName` to the type `T`
+ * 2. `using LibraryName for *` attaches to all types.
+ * 3. `using {f1, f2, ..., fn} for T` attaches the functions `f1`, `f2`, ...,
+ *     `fn`, respectively to `T`.
+ *
+ * For version 3, T has to be implicitly convertible to the first parameter type of
+ * all functions, and this is checked at the point of the using statement. For versions 1 and
+ * 2, this check is only done when a function is called.
  */
 class UsingForDirective: public ASTNode
 {
@@ -640,23 +648,28 @@ class UsingForDirective: public ASTNode
 	UsingForDirective(
 		int64_t _id,
 		SourceLocation const& _location,
-		ASTPointer<IdentifierPath> _libraryName,
+		std::vector<ASTPointer<IdentifierPath>> _functions,
+		bool _usesBraces,
 		ASTPointer<TypeName> _typeName
 	):
-		ASTNode(_id, _location), m_libraryName(std::move(_libraryName)), m_typeName(std::move(_typeName))
+		ASTNode(_id, _location), m_functions(_functions), m_usesBraces(_usesBraces), m_typeName(std::move(_typeName))
 	{
-		solAssert(m_libraryName != nullptr, "Name cannot be null.");
 	}
 
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
 
-	IdentifierPath const& libraryName() const { return *m_libraryName; }
 	/// @returns the type name the library is attached to, null for `*`.
 	TypeName const* typeName() const { return m_typeName.get(); }
 
+	/// @returns a list of functions or the single library.
+	std::vector<ASTPointer<IdentifierPath>> const& functionsOrLibrary() const { return m_functions; }
+	bool usesBraces() const { return m_usesBraces; }
+
 private:
-	ASTPointer<IdentifierPath> m_libraryName;
+	/// Either the single library or a list of functions.
+	std::vector<ASTPointer<IdentifierPath>> m_functions;
+	bool m_usesBraces;
 	ASTPointer<TypeName> m_typeName;
 };
 
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index 2616d7e230..bd9ce129a3 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -32,6 +32,7 @@
 #include <libsolutil/JSON.h>
 #include <libsolutil/UTF8.h>
 #include <libsolutil/CommonData.h>
+#include <libsolutil/Visitor.h>
 #include <libsolutil/Keccak256.h>
 
 #include <boost/algorithm/string/join.hpp>
@@ -311,10 +312,25 @@ bool ASTJsonConverter::visit(InheritanceSpecifier const& _node)
 
 bool ASTJsonConverter::visit(UsingForDirective const& _node)
 {
-	setJsonNode(_node, "UsingForDirective", {
-		make_pair("libraryName", toJson(_node.libraryName())),
+	vector<pair<string, Json::Value>> attributes = {
 		make_pair("typeName", _node.typeName() ? toJson(*_node.typeName()) : Json::nullValue)
-	});
+	};
+	if (_node.usesBraces())
+	{
+		Json::Value functionList;
+		for (auto const& function: _node.functionsOrLibrary())
+		{
+			Json::Value functionNode;
+			functionNode["function"] = toJson(*function);
+			functionList.append(move(functionNode));
+		}
+		attributes.emplace_back("functionList", move(functionList));
+	}
+	else
+		attributes.emplace_back("libraryName", toJson(*_node.functionsOrLibrary().front()));
+
+	setJsonNode(_node, "UsingForDirective", move(attributes));
+
 	return false;
 }
 
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index d71864f348..ce0575fab8 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -348,9 +348,17 @@ ASTPointer<InheritanceSpecifier> ASTJsonImporter::createInheritanceSpecifier(Jso
 
 ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json::Value const& _node)
 {
+	vector<ASTPointer<IdentifierPath>> functions;
+	if (_node.isMember("libraryName"))
+		functions.emplace_back(createIdentifierPath(_node["libraryName"]));
+	else if (_node.isMember("functionList"))
+		for (Json::Value const& function: _node["functionList"])
+			functions.emplace_back(createIdentifierPath(function["function"]));
+
 	return createASTNode<UsingForDirective>(
 		_node,
-		createIdentifierPath(member(_node, "libraryName")),
+		move(functions),
+		!_node.isMember("libraryName"),
 		_node["typeName"].isNull() ? nullptr  : convertJsonToASTNode<TypeName>(_node["typeName"])
 	);
 }
diff --git a/libsolidity/ast/AST_accept.h b/libsolidity/ast/AST_accept.h
index fa42c2dc68..6dab08f009 100644
--- a/libsolidity/ast/AST_accept.h
+++ b/libsolidity/ast/AST_accept.h
@@ -194,7 +194,7 @@ void UsingForDirective::accept(ASTVisitor& _visitor)
 {
 	if (_visitor.visit(*this))
 	{
-		m_libraryName->accept(_visitor);
+		listAccept(functionsOrLibrary(), _visitor);
 		if (m_typeName)
 			m_typeName->accept(_visitor);
 	}
@@ -205,7 +205,7 @@ void UsingForDirective::accept(ASTConstVisitor& _visitor) const
 {
 	if (_visitor.visit(*this))
 	{
-		m_libraryName->accept(_visitor);
+		listAccept(functionsOrLibrary(), _visitor);
 		if (m_typeName)
 			m_typeName->accept(_visitor);
 	}
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 77e9af866e..29475fc4ab 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -35,6 +35,7 @@
 #include <libsolutil/Keccak256.h>
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/UTF8.h>
+#include <libsolutil/Visitor.h>
 
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/classification.hpp>
@@ -331,30 +332,48 @@ Type const* Type::fullEncodingType(bool _inLibraryCall, bool _encoderV2, bool) c
 MemberList::MemberMap Type::boundFunctions(Type const& _type, ASTNode const& _scope)
 {
 	vector<UsingForDirective const*> usingForDirectives;
-	if (auto const* sourceUnit = dynamic_cast<SourceUnit const*>(&_scope))
-		usingForDirectives += ASTNode::filteredNodes<UsingForDirective>(sourceUnit->nodes());
-	else if (auto const* contract = dynamic_cast<ContractDefinition const*>(&_scope))
-		usingForDirectives +=
-			contract->usingForDirectives() +
-			ASTNode::filteredNodes<UsingForDirective>(contract->sourceUnit().nodes());
+	SourceUnit const* sourceUnit = dynamic_cast<SourceUnit const*>(&_scope);
+	if (auto const* contract = dynamic_cast<ContractDefinition const*>(&_scope))
+	{
+		sourceUnit = &contract->sourceUnit();
+		usingForDirectives += contract->usingForDirectives();
+	}
 	else
-		solAssert(false, "");
+		solAssert(sourceUnit, "");
+	usingForDirectives += ASTNode::filteredNodes<UsingForDirective>(sourceUnit->nodes());
 
 	// Normalise data location of type.
 	DataLocation typeLocation = DataLocation::Storage;
 	if (auto refType = dynamic_cast<ReferenceType const*>(&_type))
 		typeLocation = refType->location();
 
-	set<Declaration const*> seenFunctions;
 	MemberList::MemberMap members;
 
+	set<pair<string, Declaration const*>> seenFunctions;
+	auto addFunction = [&](FunctionDefinition const& _function, optional<string> _name = {})
+	{
+		if (!_name)
+			_name = _function.name();
+		Type const* functionType =
+			_function.libraryFunction() ? _function.typeViaContractName() : _function.type();
+		solAssert(functionType, "");
+		FunctionType const* asBoundFunction =
+			dynamic_cast<FunctionType const&>(*functionType).asBoundFunction();
+		solAssert(asBoundFunction, "");
+
+		if (_type.isImplicitlyConvertibleTo(*asBoundFunction->selfType()))
+			if (seenFunctions.insert(make_pair(*_name, &_function)).second)
+				members.emplace_back(&_function, asBoundFunction, *_name);
+	};
+
 	for (UsingForDirective const* ufd: usingForDirectives)
 	{
 		// Convert both types to pointers for comparison to see if the `using for`
 		// directive applies.
 		// Further down, we check more detailed for each function if `_type` is
 		// convertible to the function parameter type.
-		if (ufd->typeName() &&
+		if (
+			ufd->typeName() &&
 			*TypeProvider::withLocationIfReference(typeLocation, &_type, true) !=
 			*TypeProvider::withLocationIfReference(
 				typeLocation,
@@ -363,20 +382,28 @@ MemberList::MemberMap Type::boundFunctions(Type const& _type, ASTNode const& _sc
 			)
 		)
 			continue;
-		auto const& library = dynamic_cast<ContractDefinition const&>(
-			*ufd->libraryName().annotation().referencedDeclaration
-		);
-		for (FunctionDefinition const* function: library.definedFunctions())
+
+		for (auto const& pathPointer: ufd->functionsOrLibrary())
 		{
-			if (!function->isOrdinary() || !function->isVisibleAsLibraryMember() || seenFunctions.count(function))
-				continue;
-			seenFunctions.insert(function);
-			if (function->parameters().empty())
-				continue;
-			FunctionTypePointer fun =
-				dynamic_cast<FunctionType const&>(*function->typeViaContractName()).asBoundFunction();
-			if (_type.isImplicitlyConvertibleTo(*fun->selfType()))
-				members.emplace_back(function, fun);
+			solAssert(pathPointer);
+			Declaration const* declaration = pathPointer->annotation().referencedDeclaration;
+			solAssert(declaration);
+
+			if (ContractDefinition const* library = dynamic_cast<ContractDefinition const*>(declaration))
+			{
+				solAssert(library->isLibrary());
+				for (FunctionDefinition const* function: library->definedFunctions())
+				{
+					if (!function->isOrdinary() || !function->isVisibleAsLibraryMember() || function->parameters().empty())
+						continue;
+					addFunction(*function);
+				}
+			}
+			else
+				addFunction(
+					dynamic_cast<FunctionDefinition const&>(*declaration),
+					pathPointer->path().back()
+				);
 		}
 	}
 
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index b1d7e7ccad..0ded8ea043 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -117,6 +117,9 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 			case Token::Type:
 				nodes.push_back(parseUserDefinedValueTypeDefinition());
 				break;
+			case Token::Using:
+				nodes.push_back(parseUsingDirective());
+				break;
 			case Token::Function:
 				nodes.push_back(parseFunctionDefinition(true));
 				break;
@@ -962,7 +965,22 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 	ASTNodeFactory nodeFactory(*this);
 
 	expectToken(Token::Using);
-	ASTPointer<IdentifierPath> library(parseIdentifierPath());
+
+	vector<ASTPointer<IdentifierPath>> functions;
+	bool const usesBraces = m_scanner->currentToken() == Token::LBrace;
+	if (usesBraces)
+	{
+		do
+		{
+			advance();
+			functions.emplace_back(parseIdentifierPath());
+		}
+		while (m_scanner->currentToken() == Token::Comma);
+		expectToken(Token::RBrace);
+	}
+	else
+		functions.emplace_back(parseIdentifierPath());
+
 	ASTPointer<TypeName> typeName;
 	expectToken(Token::For);
 	if (m_scanner->currentToken() == Token::Mul)
@@ -971,7 +989,7 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 		typeName = parseTypeName();
 	nodeFactory.markEndPosition();
 	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<UsingForDirective>(library, typeName);
+	return nodeFactory.createNode<UsingForDirective>(move(functions), usesBraces, typeName);
 }
 
 ASTPointer<ModifierInvocation> Parser::parseModifierInvocation()
diff --git a/test/libsolidity/ASTJSON/using_for_directive.json b/test/libsolidity/ASTJSON/using_for_directive.json
index b935b262b1..37877ff171 100644
--- a/test/libsolidity/ASTJSON/using_for_directive.json
+++ b/test/libsolidity/ASTJSON/using_for_directive.json
@@ -4,17 +4,51 @@
   {
     "C":
     [
-      5
+      13
     ],
     "L":
     [
-      1
+      4
+    ],
+    "f":
+    [
+      10
     ]
   },
-  "id": 6,
+  "id": 14,
   "nodeType": "SourceUnit",
   "nodes":
   [
+    {
+      "functionList":
+      [
+        {
+          "function":
+          {
+            "id": 1,
+            "name": "f",
+            "nodeType": "IdentifierPath",
+            "referencedDeclaration": 10,
+            "src": "7:1:1"
+          }
+        }
+      ],
+      "id": 3,
+      "nodeType": "UsingForDirective",
+      "src": "0:19:1",
+      "typeName":
+      {
+        "id": 2,
+        "name": "uint",
+        "nodeType": "ElementaryTypeName",
+        "src": "14:4:1",
+        "typeDescriptions":
+        {
+          "typeIdentifier": "t_uint256",
+          "typeString": "uint256"
+        }
+      }
+    },
     {
       "abstract": false,
       "baseContracts": [],
@@ -22,19 +56,86 @@
       "contractDependencies": [],
       "contractKind": "library",
       "fullyImplemented": true,
-      "id": 1,
+      "id": 4,
       "linearizedBaseContracts":
       [
-        1
+        4
       ],
       "name": "L",
-      "nameLocation": "8:1:1",
+      "nameLocation": "28:1:1",
       "nodeType": "ContractDefinition",
       "nodes": [],
-      "scope": 6,
-      "src": "0:12:1",
+      "scope": 14,
+      "src": "20:12:1",
       "usedErrors": []
     },
+    {
+      "body":
+      {
+        "id": 9,
+        "nodeType": "Block",
+        "src": "50:2:1",
+        "statements": []
+      },
+      "id": 10,
+      "implemented": true,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "f",
+      "nameLocation": "42:1:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 7,
+        "nodeType": "ParameterList",
+        "parameters":
+        [
+          {
+            "constant": false,
+            "id": 6,
+            "mutability": "mutable",
+            "name": "",
+            "nameLocation": "-1:-1:-1",
+            "nodeType": "VariableDeclaration",
+            "scope": 10,
+            "src": "44:4:1",
+            "stateVariable": false,
+            "storageLocation": "default",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_uint256",
+              "typeString": "uint256"
+            },
+            "typeName":
+            {
+              "id": 5,
+              "name": "uint",
+              "nodeType": "ElementaryTypeName",
+              "src": "44:4:1",
+              "typeDescriptions":
+              {
+                "typeIdentifier": "t_uint256",
+                "typeString": "uint256"
+              }
+            },
+            "visibility": "internal"
+          }
+        ],
+        "src": "43:6:1"
+      },
+      "returnParameters":
+      {
+        "id": 8,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "50:0:1"
+      },
+      "scope": 14,
+      "src": "33:19:1",
+      "stateMutability": "nonpayable",
+      "virtual": false,
+      "visibility": "internal"
+    },
     {
       "abstract": false,
       "baseContracts": [],
@@ -42,46 +143,34 @@
       "contractDependencies": [],
       "contractKind": "contract",
       "fullyImplemented": true,
-      "id": 5,
+      "id": 13,
       "linearizedBaseContracts":
       [
-        5
+        13
       ],
       "name": "C",
-      "nameLocation": "22:1:1",
+      "nameLocation": "62:1:1",
       "nodeType": "ContractDefinition",
       "nodes":
       [
         {
-          "id": 4,
+          "id": 12,
           "libraryName":
           {
-            "id": 2,
+            "id": 11,
             "name": "L",
             "nodeType": "IdentifierPath",
-            "referencedDeclaration": 1,
-            "src": "32:1:1"
+            "referencedDeclaration": 4,
+            "src": "72:1:1"
           },
           "nodeType": "UsingForDirective",
-          "src": "26:17:1",
-          "typeName":
-          {
-            "id": 3,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "38:4:1",
-            "typeDescriptions":
-            {
-              "typeIdentifier": "t_uint256",
-              "typeString": "uint256"
-            }
-          }
+          "src": "66:14:1"
         }
       ],
-      "scope": 6,
-      "src": "13:32:1",
+      "scope": 14,
+      "src": "53:29:1",
       "usedErrors": []
     }
   ],
-  "src": "0:46:1"
+  "src": "0:83:1"
 }
diff --git a/test/libsolidity/ASTJSON/using_for_directive.sol b/test/libsolidity/ASTJSON/using_for_directive.sol
index be6e5288f4..30e40252a4 100644
--- a/test/libsolidity/ASTJSON/using_for_directive.sol
+++ b/test/libsolidity/ASTJSON/using_for_directive.sol
@@ -1,3 +1,6 @@
-library L {} contract C { using L for uint; }
+using {f} for uint;
+library L {}
+function f(uint) {}
+contract C { using L for *; }
 
 // ----
diff --git a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
index b4b016ac15..dcc5ce8d15 100644
--- a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
+++ b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
@@ -1,57 +1,131 @@
 {
   "absolutePath": "a",
-  "id": 6,
+  "id": 14,
   "nodeType": "SourceUnit",
   "nodes":
   [
+    {
+      "functionList":
+      [
+        {
+          "function":
+          {
+            "id": 1,
+            "name": "f",
+            "nodeType": "IdentifierPath",
+            "src": "7:1:1"
+          }
+        }
+      ],
+      "id": 3,
+      "nodeType": "UsingForDirective",
+      "src": "0:19:1",
+      "typeName":
+      {
+        "id": 2,
+        "name": "uint",
+        "nodeType": "ElementaryTypeName",
+        "src": "14:4:1",
+        "typeDescriptions": {}
+      }
+    },
     {
       "abstract": false,
       "baseContracts": [],
       "contractDependencies": [],
       "contractKind": "library",
-      "id": 1,
+      "id": 4,
       "name": "L",
-      "nameLocation": "8:1:1",
+      "nameLocation": "28:1:1",
       "nodeType": "ContractDefinition",
       "nodes": [],
-      "src": "0:12:1",
+      "src": "20:12:1",
       "usedErrors": []
     },
+    {
+      "body":
+      {
+        "id": 9,
+        "nodeType": "Block",
+        "src": "50:2:1",
+        "statements": []
+      },
+      "id": 10,
+      "implemented": true,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "f",
+      "nameLocation": "42:1:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 7,
+        "nodeType": "ParameterList",
+        "parameters":
+        [
+          {
+            "constant": false,
+            "id": 6,
+            "mutability": "mutable",
+            "name": "",
+            "nameLocation": "-1:-1:-1",
+            "nodeType": "VariableDeclaration",
+            "src": "44:4:1",
+            "stateVariable": false,
+            "storageLocation": "default",
+            "typeDescriptions": {},
+            "typeName":
+            {
+              "id": 5,
+              "name": "uint",
+              "nodeType": "ElementaryTypeName",
+              "src": "44:4:1",
+              "typeDescriptions": {}
+            },
+            "visibility": "internal"
+          }
+        ],
+        "src": "43:6:1"
+      },
+      "returnParameters":
+      {
+        "id": 8,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "50:0:1"
+      },
+      "src": "33:19:1",
+      "stateMutability": "nonpayable",
+      "virtual": false,
+      "visibility": "internal"
+    },
     {
       "abstract": false,
       "baseContracts": [],
       "contractDependencies": [],
       "contractKind": "contract",
-      "id": 5,
+      "id": 13,
       "name": "C",
-      "nameLocation": "22:1:1",
+      "nameLocation": "62:1:1",
       "nodeType": "ContractDefinition",
       "nodes":
       [
         {
-          "id": 4,
+          "id": 12,
           "libraryName":
           {
-            "id": 2,
+            "id": 11,
             "name": "L",
             "nodeType": "IdentifierPath",
-            "src": "32:1:1"
+            "src": "72:1:1"
           },
           "nodeType": "UsingForDirective",
-          "src": "26:17:1",
-          "typeName":
-          {
-            "id": 3,
-            "name": "uint",
-            "nodeType": "ElementaryTypeName",
-            "src": "38:4:1",
-            "typeDescriptions": {}
-          }
+          "src": "66:14:1"
         }
       ],
-      "src": "13:32:1",
+      "src": "53:29:1",
       "usedErrors": []
     }
   ],
-  "src": "0:46:1"
+  "src": "0:83:1"
 }
diff --git a/test/libsolidity/semanticTests/using/calldata_memory_copy.sol b/test/libsolidity/semanticTests/using/calldata_memory_copy.sol
new file mode 100644
index 0000000000..493cfc29b0
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/calldata_memory_copy.sol
@@ -0,0 +1,19 @@
+
+contract C {
+    function f(uint[] calldata arr) external returns (uint) {
+        return arr.sum();
+    }
+}
+
+function sum(uint[] memory arr) returns (uint result) {
+    for(uint i = 0; i < arr.length; i++) {
+        result += arr[i];
+    }
+}
+
+using {sum} for uint[];
+
+// ====
+// compileViaYul: also
+// ----
+// f(uint256[]): 0x20, 3, 1, 2, 8 -> 11
diff --git a/test/libsolidity/semanticTests/using/free_function_braces.sol b/test/libsolidity/semanticTests/using/free_function_braces.sol
new file mode 100644
index 0000000000..e522ff61b2
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/free_function_braces.sol
@@ -0,0 +1,26 @@
+function id(uint x) pure returns (uint) {
+    return x;
+}
+
+function zero(uint) pure returns (uint) {
+    return 0;
+}
+
+contract C {
+    function f(uint z) pure external returns(uint) {
+        return z.id();
+    }
+
+    function g(uint z) pure external returns (uint) {
+        return z.zero();
+    }
+
+    using {id, zero} for uint;
+}
+// ====
+// compileViaYul: also
+// ----
+// f(uint256): 10 -> 10
+// g(uint256): 10 -> 0
+// f(uint256): 256 -> 0x0100
+// g(uint256): 256 -> 0
diff --git a/test/libsolidity/semanticTests/using/free_function_multi.sol b/test/libsolidity/semanticTests/using/free_function_multi.sol
new file mode 100644
index 0000000000..bf71e4d44b
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/free_function_multi.sol
@@ -0,0 +1,27 @@
+contract C {
+    function f(uint z) pure external returns(uint) {
+        return z.id();
+    }
+
+    using {id, zero, zero, id} for uint;
+
+    function g(uint z) pure external returns (uint) {
+        return z.zero();
+    }
+}
+
+function id(uint x) pure returns (uint) {
+    return x;
+}
+
+function zero(uint) pure returns (uint) {
+    return 0;
+}
+
+// ====
+// compileViaYul: also
+// ----
+// f(uint256): 10 -> 10
+// g(uint256): 10 -> 0
+// f(uint256): 256 -> 0x0100
+// g(uint256): 256 -> 0
diff --git a/test/libsolidity/semanticTests/using/free_functions_individual.sol b/test/libsolidity/semanticTests/using/free_functions_individual.sol
new file mode 100644
index 0000000000..334b427e13
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/free_functions_individual.sol
@@ -0,0 +1,30 @@
+using {zero} for uint;
+
+contract C {
+    using {id} for uint;
+
+    function f(uint z) pure external returns(uint) {
+        return z.id();
+    }
+
+    function g(uint z) pure external returns (uint) {
+        return z.zero();
+    }
+}
+
+function id(uint x) pure returns (uint) {
+    return x;
+}
+
+function zero(uint) pure returns (uint) {
+    return 0;
+}
+
+
+// ====
+// compileViaYul: also
+// ----
+// f(uint256): 10 -> 10
+// g(uint256): 10 -> 0
+// f(uint256): 256 -> 0x0100
+// g(uint256): 256 -> 0
diff --git a/test/libsolidity/semanticTests/using/imported_functions.sol b/test/libsolidity/semanticTests/using/imported_functions.sol
new file mode 100644
index 0000000000..d99e558fdc
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/imported_functions.sol
@@ -0,0 +1,19 @@
+==== Source: A ====
+function inc(uint x) pure returns (uint) {
+    return x + 1;
+}
+
+==== Source: B ====
+contract C {
+	function f(uint x) public returns (uint) {
+        return x.f() + x.inc();
+    }
+}
+using {A.inc, f} for uint;
+import {inc as f} from "A";
+import "A" as A;
+// ====
+// compileViaYul: also
+// ----
+// f(uint256): 5 -> 12
+// f(uint256): 10 -> 0x16
diff --git a/test/libsolidity/semanticTests/using/library_through_module.sol b/test/libsolidity/semanticTests/using/library_through_module.sol
new file mode 100644
index 0000000000..6102f5a707
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/library_through_module.sol
@@ -0,0 +1,34 @@
+==== Source: A ====
+library L {
+    function id(uint x) internal pure returns (uint) {
+        return x;
+    }
+    function one_ext(uint) pure external returns(uint) {
+        return 1;
+    }
+    function empty() pure internal {
+    }
+
+}
+
+==== Source: B ====
+contract C {
+    using M.L for uint;
+    function f(uint x) public pure returns (uint) {
+        return x.id();
+    }
+    function g(uint x) public pure returns (uint) {
+        return x.one_ext();
+    }
+}
+
+import "A" as M;
+
+// ====
+// compileViaYul: also
+// ----
+// library: "A":L
+// f(uint256): 5 -> 5
+// f(uint256): 10 -> 10
+// g(uint256): 5 -> 1
+// g(uint256): 10 -> 1
diff --git a/test/libsolidity/semanticTests/using/module_renamed.sol b/test/libsolidity/semanticTests/using/module_renamed.sol
new file mode 100644
index 0000000000..d648e88d1a
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/module_renamed.sol
@@ -0,0 +1,26 @@
+==== Source: A ====
+function f(uint x) pure returns (uint) {
+    return x + 2;
+}
+function g(uint x) pure returns (uint) {
+    return x + 8;
+}
+
+==== Source: B ====
+import {f as g, g as f} from "A";
+
+==== Source: C ====
+contract C {
+	function test(uint x, uint y) public pure returns (uint, uint) {
+        return (x.f(), y.g());
+    }
+}
+
+using {M.g, M.f} for uint;
+
+import "B" as M;
+
+// ====
+// compileViaYul: also
+// ----
+// test(uint256,uint256): 1, 1 -> 9, 3
diff --git a/test/libsolidity/syntaxTests/bound/bound_to_struct.sol b/test/libsolidity/syntaxTests/bound/bound_to_struct.sol
index 0e1cbddb87..59c8e2aa7d 100644
--- a/test/libsolidity/syntaxTests/bound/bound_to_struct.sol
+++ b/test/libsolidity/syntaxTests/bound/bound_to_struct.sol
@@ -7,4 +7,4 @@ contract C {
     using S for S;
 }
 // ----
-// TypeError 4357: (113-114): Library name expected.
+// TypeError 4357: (113-114): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/bound/interface_using_for.sol b/test/libsolidity/syntaxTests/bound/interface_using_for.sol
index 727ff2c46e..4159710170 100644
--- a/test/libsolidity/syntaxTests/bound/interface_using_for.sol
+++ b/test/libsolidity/syntaxTests/bound/interface_using_for.sol
@@ -7,4 +7,4 @@ interface I {
     function g() external;
 }
 // ----
-// TypeError 9088: (60-76): The "using for" directive is not allowed inside interfaces.
+// SyntaxError 9088: (60-76): The "using for" directive is not allowed inside interfaces.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol
index 83839f3687..42de5ba411 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/252_using_for_not_library.sol
@@ -3,4 +3,4 @@ contract C {
     using D for uint;
 }
 // ----
-// TypeError 4357: (38-39): Library name expected.
+// TypeError 4357: (38-39): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol
index ba141ce970..940a3b071a 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/514_using_for_with_non_library.sol
@@ -7,4 +7,4 @@ library L {
     }
 }
 // ----
-// TypeError 4357: (120-121): Library name expected.
+// TypeError 4357: (120-121): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/double_asterisk.sol b/test/libsolidity/syntaxTests/using/double_asterisk.sol
new file mode 100644
index 0000000000..44cee54797
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/double_asterisk.sol
@@ -0,0 +1,19 @@
+function id(uint x) pure returns (uint) {
+    return x;
+}
+
+function zero(address) pure returns (address) {
+    return address(0);
+}
+
+contract C {
+    using * for *;
+    function f(uint x) pure external returns (uint) {
+        return x.id();
+    }
+    function g(address a) pure external returns (address) {
+        return a.zero();
+    }
+}
+// ----
+// ParserError 2314: (156-157): Expected identifier but got '*'
diff --git a/test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol b/test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol
new file mode 100644
index 0000000000..219954238a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/file_level_inactive_after_import.sol
@@ -0,0 +1,22 @@
+==== Source: A ====
+function id(uint x) pure returns (uint) {
+    return x;
+}
+// we check that the effect of this directive is
+// limited to this file.
+using {id} for uint;
+
+function t() pure {
+    uint y = 2;
+    y = y.id();
+}
+
+==== Source: B ====
+import "A";
+
+function f() pure {
+    uint y = 2;
+    y = y.id();
+}
+// ----
+// TypeError 9582: (B:57-61): Member "id" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion.sol b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion.sol
new file mode 100644
index 0000000000..9df5e9c2c1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion.sol
@@ -0,0 +1,6 @@
+function id(uint16 x) pure returns(uint16) {
+    return x;
+}
+contract C {
+    using {id} for uint8;
+}
diff --git a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
new file mode 100644
index 0000000000..36f3f3032e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
@@ -0,0 +1,8 @@
+function id(uint16 x) pure returns(uint16) {
+    return x;
+}
+contract C {
+    using {id} for uint256;
+}
+// ----
+// TypeError 3100: (85-87): The function "id" cannot be bound to the type "uint256" because the type cannot be implicitly converted to the first argument of the function ("uint16").
diff --git a/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol b/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
new file mode 100644
index 0000000000..7536dff07f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
@@ -0,0 +1,12 @@
+function id(int8 x) pure returns(int8) {
+    return x;
+}
+function id(uint256 x) pure returns(uint256) {
+    return x;
+}
+
+contract C {
+    using {id} for uint256;
+}
+// ----
+// DeclarationError 7920: (145-147): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_overloads.sol b/test/libsolidity/syntaxTests/using/free_overloads.sol
new file mode 100644
index 0000000000..28a8e69ed1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/free_overloads.sol
@@ -0,0 +1,10 @@
+function f(uint8 x) pure returns (uint) {
+    return x;
+}
+function f(int8 storage x) pure returns (int) {
+    return x[0];
+}
+using {f} for uint8;
+using {f} for int;
+// ----
+// DeclarationError 7920: (132-133): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_overloads_array.sol b/test/libsolidity/syntaxTests/using/free_overloads_array.sol
new file mode 100644
index 0000000000..91b8073971
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/free_overloads_array.sol
@@ -0,0 +1,9 @@
+function f(uint x, uint[] y) pure returns (uint) {
+    return x;
+}
+function f(uint x, uint y) pure returns (int) {
+    return x;
+}
+using {f} for uint;
+// ----
+// DeclarationError 7920: (138-139): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_reference_type.sol b/test/libsolidity/syntaxTests/using/free_reference_type.sol
new file mode 100644
index 0000000000..833b78266e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/free_reference_type.sol
@@ -0,0 +1,11 @@
+function f(uint[] memory x) pure returns (uint) {
+    return x[0];
+}
+function g(uint[] storage x) view returns (uint) {
+    return x[0];
+}
+function h(uint[] calldata x) pure returns (uint) {
+    return x[0];
+}
+using {f, g, h} for uint[];
+// ----
diff --git a/test/libsolidity/syntaxTests/using/library_import_as.sol b/test/libsolidity/syntaxTests/using/library_import_as.sol
new file mode 100644
index 0000000000..7c3fc2891d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/library_import_as.sol
@@ -0,0 +1,16 @@
+==== Source: A ====
+library L {
+    function id(uint x) pure internal returns (uint) {
+        return x;
+    }
+}
+
+==== Source: B ====
+import {L as M} from "A";
+
+contract C {
+    using M for uint;
+	function f(uint x) public pure returns (uint) {
+        return x.id();
+    }
+}
diff --git a/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol b/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
new file mode 100644
index 0000000000..76d53cf90c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
@@ -0,0 +1,14 @@
+library L {
+    function id_ext(uint x) external returns(uint) {
+        return x;
+    }
+}
+
+contract C {
+    using L.id_ext for uint;
+    function f(uint x) external {
+        x.id_ext();
+    }
+}
+// ----
+// DeclarationError 7920: (115-123): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/using/library_non_free_function.sol b/test/libsolidity/syntaxTests/using/library_non_free_function.sol
new file mode 100644
index 0000000000..2fdb471aba
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/library_non_free_function.sol
@@ -0,0 +1,13 @@
+library L {
+    function id(uint x) internal pure returns(uint) {
+        return x;
+    }
+}
+
+contract C {
+    using {L.id} for uint;
+    function f(uint x) external pure {
+        x.id();
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/using/module_1.sol b/test/libsolidity/syntaxTests/using/module_1.sol
new file mode 100644
index 0000000000..a2d3b9f992
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/module_1.sol
@@ -0,0 +1,12 @@
+==== Source: A ====
+function id(uint x) pure returns (uint) {
+    return x;
+}
+
+==== Source: B ====
+import "A" as M;
+contract C {
+    using M for uint;
+}
+// ----
+// TypeError 4357: (B:40-41): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/module_2.sol b/test/libsolidity/syntaxTests/using/module_2.sol
new file mode 100644
index 0000000000..9242082225
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/module_2.sol
@@ -0,0 +1,14 @@
+==== Source: A ====
+function id(uint x) pure returns (uint) {
+    return x;
+}
+
+==== Source: B ====
+import {id as Id} from "A";
+
+contract C {
+    using { Id } for uint;
+	function f(uint x) public pure returns (uint) {
+        return x.Id();
+    }
+}
diff --git a/test/libsolidity/syntaxTests/using/module_3.sol b/test/libsolidity/syntaxTests/using/module_3.sol
new file mode 100644
index 0000000000..f017363e67
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/module_3.sol
@@ -0,0 +1,14 @@
+==== Source: A ====
+function id(uint x) pure returns (uint) {
+    return x;
+}
+
+==== Source: B ====
+import "A" as M;
+
+contract C {
+    using {M.id} for uint;
+    function f(uint x) public pure returns (uint) {
+        return x.id();
+    }
+}
diff --git a/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol b/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
new file mode 100644
index 0000000000..ef1688b229
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
@@ -0,0 +1,13 @@
+==== Source: A ====
+function id(uint x) pure returns (uint) {
+    return x;
+}
+
+==== Source: B ====
+import "A" as M;
+
+contract C {
+    using { id } for uint;
+}
+// ----
+// DeclarationError 7920: (B:43-45): Identifier not found or not unique.
diff --git a/test/libsolidity/syntaxTests/using/using_contract_err.sol b/test/libsolidity/syntaxTests/using/using_contract_err.sol
new file mode 100644
index 0000000000..e216e4cfc4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_contract_err.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f(uint) external {
+    }
+}
+interface I {
+    function f(uint) external;
+}
+
+contract Test {
+    using C for uint;
+}
+// ----
+// TypeError 4357: (127-128): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/using_empty_list_err.sol b/test/libsolidity/syntaxTests/using/using_empty_list_err.sol
new file mode 100644
index 0000000000..b8b9cb9a76
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_empty_list_err.sol
@@ -0,0 +1,5 @@
+contract C {
+    using {} for uint;
+}
+// ----
+// ParserError 2314: (24-25): Expected identifier but got '}'
diff --git a/test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol b/test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol
new file mode 100644
index 0000000000..b1dc8b7068
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_empty_list_file_level.sol
@@ -0,0 +1,3 @@
+using {} for uint;
+// ----
+// ParserError 2314: (7-8): Expected identifier but got '}'
diff --git a/test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol b/test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol
new file mode 100644
index 0000000000..2b5d6a0dd6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_for_ast_file_level.sol
@@ -0,0 +1,7 @@
+function id(uint x) pure returns (uint) {
+    return x;
+}
+
+using {id} for *;
+// ----
+// SyntaxError 8118: (59-76): The type has to be specified explicitly at file level (cannot use '*').
diff --git a/test/libsolidity/syntaxTests/using/using_free_functions.sol b/test/libsolidity/syntaxTests/using/using_free_functions.sol
new file mode 100644
index 0000000000..5180cfd201
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_free_functions.sol
@@ -0,0 +1,16 @@
+function id(uint x) pure returns (uint) {
+    return x;
+}
+
+function zero(uint) pure returns (uint) {
+    return 0;
+}
+using {id} for uint;
+contract C {
+    using {zero} for uint;
+
+    function g(uint z) pure external {
+        z.zero();
+        z.id();
+    }
+}
diff --git a/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol b/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
new file mode 100644
index 0000000000..e03ba5d10d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
@@ -0,0 +1,7 @@
+function one() pure returns(uint) {
+    return 1;
+}
+
+using {one} for uint;
+// ----
+// TypeError 4731: (60-63): The function "one" does not have any parameters, and therefore cannot be bound to the type "uint256".
diff --git a/test/libsolidity/syntaxTests/using/using_functions_with_ast.sol b/test/libsolidity/syntaxTests/using/using_functions_with_ast.sol
new file mode 100644
index 0000000000..62f8e4736f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_functions_with_ast.sol
@@ -0,0 +1,7 @@
+function f(uint) {}
+
+contract C {
+    using {f} for *;
+}
+// ----
+// SyntaxError 3349: (38-54): The type has to be specified explicitly when attaching specific functions.
diff --git a/test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol b/test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol
new file mode 100644
index 0000000000..07b607004c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_lhs_asterisk.sol
@@ -0,0 +1,3 @@
+using * for uint;
+// ----
+// ParserError 2314: (6-7): Expected identifier but got '*'
diff --git a/test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol b/test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol
new file mode 100644
index 0000000000..67eee5862e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_lhs_asterisk_contract.sol
@@ -0,0 +1,5 @@
+contract C {
+    using * for uint;
+}
+// ----
+// ParserError 2314: (23-24): Expected identifier but got '*'
diff --git a/test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol b/test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol
new file mode 100644
index 0000000000..dfc0b916e9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_library_ast_file_level.sol
@@ -0,0 +1,4 @@
+library L { }
+using L for *;
+// ----
+// SyntaxError 8118: (14-28): The type has to be specified explicitly at file level (cannot use '*').
diff --git a/test/libsolidity/syntaxTests/using/using_library_file_level.sol b/test/libsolidity/syntaxTests/using/using_library_file_level.sol
new file mode 100644
index 0000000000..c4de282c48
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_library_file_level.sol
@@ -0,0 +1,3 @@
+library L { }
+using L for uint;
+// ----
diff --git a/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol b/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
new file mode 100644
index 0000000000..df3b3f65fa
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
@@ -0,0 +1,9 @@
+contract C {
+    using {f, g} for uint;
+
+    function f(uint) internal { }
+    function g(uint) public { }
+}
+// ----
+// TypeError 4167: (24-25): Only file-level functions and library functions can be bound to a type in a "using" statement
+// TypeError 4167: (27-28): Only file-level functions and library functions can be bound to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/using/using_non_function.sol b/test/libsolidity/syntaxTests/using/using_non_function.sol
new file mode 100644
index 0000000000..32d97345b6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_non_function.sol
@@ -0,0 +1,6 @@
+contract C {
+    function() internal pure x;
+    using {x} for uint;
+}
+// ----
+// TypeError 8187: (56-57): Expected function name.

From a059ca1dab98db6873bcaffc05e1a40a68ae4c7d Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 14 Mar 2022 13:06:33 +0100
Subject: [PATCH 0472/1748] Clean up changelog.

---
 Changelog.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 3e38e79920..4740462b49 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,14 +5,15 @@ Language Features:
 
 
 Compiler Features:
-* JSON-AST: Added selector field for errors and events.
+ * JSON-AST: Added selector field for errors and events.
+ * LSP: Implements goto-definition.
  * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump.
  * Yul Optimizer: Remove ``sstore`` and ``mstore`` operations that are never read from.
- * LSP: Implements goto-definition.
+
 
 Bugfixes:
+ * General: Fix internal error for locales with unusual capitalization rules. Locale set in the environment is now completely ignored.
  * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``.
- * Fix internal error for locales with unusual capitalization rules. Locale set in the environment is now completely ignored.
 
 
 ### 0.8.12 (2022-02-16)

From d60940962442653ef7a97301820f1b9cc455bef0 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman@codepoets.it>
Date: Thu, 17 Feb 2022 12:33:29 +0100
Subject: [PATCH 0473/1748] Add not_existing_import.json to ASTJSON tests

---
 .../ASTJSON/not_existing_import.json          | 108 ++++++++++++++++++
 1 file changed, 108 insertions(+)

diff --git a/test/libsolidity/ASTJSON/not_existing_import.json b/test/libsolidity/ASTJSON/not_existing_import.json
index e69de29bb2..a36c59fffb 100644
--- a/test/libsolidity/ASTJSON/not_existing_import.json
+++ b/test/libsolidity/ASTJSON/not_existing_import.json
@@ -0,0 +1,108 @@
+{
+  "absolutePath": "a",
+  "id": 12,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "absolutePath": "notexisting.sol",
+      "file": "notexisting.sol",
+      "id": 1,
+      "nameLocation": "28:11:1",
+      "nodeType": "ImportDirective",
+      "src": "0:40:1",
+      "symbolAliases": [],
+      "unitAlias": "NotExisting"
+    },
+    {
+      "abstract": false,
+      "baseContracts":
+      [
+        {
+          "baseName":
+          {
+            "id": 2,
+            "name": "NotExisting.X",
+            "nodeType": "IdentifierPath",
+            "src": "55:13:1"
+          },
+          "id": 3,
+          "nodeType": "InheritanceSpecifier",
+          "src": "55:13:1"
+        }
+      ],
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "id": 11,
+      "name": "C",
+      "nameLocation": "50:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "constant": false,
+          "id": 6,
+          "mutability": "mutable",
+          "name": "myStruct",
+          "nameLocation": "102:8:1",
+          "nodeType": "VariableDeclaration",
+          "src": "72:38:1",
+          "stateVariable": false,
+          "storageLocation": "default",
+          "typeDescriptions": {},
+          "typeName":
+          {
+            "id": 5,
+            "nodeType": "UserDefinedTypeName",
+            "pathNode":
+            {
+              "id": 4,
+              "name": "NotExisting.SomeStruct",
+              "nodeType": "IdentifierPath",
+              "src": "72:22:1"
+            },
+            "src": "72:22:1",
+            "typeDescriptions": {}
+          },
+          "visibility": "public"
+        },
+        {
+          "body":
+          {
+            "id": 9,
+            "nodeType": "Block",
+            "src": "127:2:1",
+            "statements": []
+          },
+          "id": 10,
+          "implemented": true,
+          "kind": "constructor",
+          "modifiers": [],
+          "name": "",
+          "nameLocation": "-1:-1:-1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 7,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "124:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 8,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "127:0:1"
+          },
+          "src": "113:16:1",
+          "stateMutability": "nonpayable",
+          "virtual": false
+        }
+      ],
+      "src": "41:90:1",
+      "usedErrors": []
+    }
+  ],
+  "src": "0:132:1"
+}

From 5f7ff667b9b4856785c3eb64943054745fe5e28a Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman@codepoets.it>
Date: Thu, 17 Feb 2022 13:38:29 +0100
Subject: [PATCH 0474/1748] Fix syntax errors in ASTJSON tests

---
 test/libsolidity/ASTJSON/address_payable.json |  13 +-
 test/libsolidity/ASTJSON/address_payable.sol  |   2 +-
 .../ASTJSON/address_payable_parseOnly.json    |   5 +-
 .../ASTJSON/assembly/nested_functions.json    |  83 ++++++----
 .../ASTJSON/assembly/nested_functions.sol     |   2 +-
 .../assembly/nested_functions_parseOnly.json  |  58 +++----
 test/libsolidity/ASTJSON/assembly/switch.json |  26 +---
 test/libsolidity/ASTJSON/assembly/switch.sol  |   6 +-
 .../ASTJSON/assembly/switch_parseOnly.json    |   6 +-
 test/libsolidity/ASTJSON/function_type.json   |  22 +--
 test/libsolidity/ASTJSON/function_type.sol    |   2 +-
 .../ASTJSON/function_type_parseOnly.json      |  22 +--
 test/libsolidity/ASTJSON/non_utf8.json        | 144 +++++++++++++++---
 test/libsolidity/ASTJSON/non_utf8.sol         |   2 +-
 .../ASTJSON/non_utf8_parseOnly.json           |  82 ++++++++--
 test/libsolidity/ASTJSON/source_location.json |  26 ++--
 test/libsolidity/ASTJSON/source_location.sol  |   2 +-
 .../ASTJSON/source_location_parseOnly.json    |  26 ++--
 test/libsolidity/ASTJSON/used_errors.json     |  46 +++---
 test/libsolidity/ASTJSON/used_errors.sol      |   2 +-
 .../ASTJSON/used_errors_parseOnly.json        |  42 ++---
 21 files changed, 389 insertions(+), 230 deletions(-)

diff --git a/test/libsolidity/ASTJSON/address_payable.json b/test/libsolidity/ASTJSON/address_payable.json
index 22090ee290..9aec1e510c 100644
--- a/test/libsolidity/ASTJSON/address_payable.json
+++ b/test/libsolidity/ASTJSON/address_payable.json
@@ -423,18 +423,19 @@
                       "isPure": true,
                       "lValueRequested": false,
                       "nodeType": "ElementaryTypeNameExpression",
-                      "src": "239:7:1",
+                      "src": "239:8:1",
                       "typeDescriptions":
                       {
-                        "typeIdentifier": "t_type$_t_address_$",
-                        "typeString": "type(address)"
+                        "typeIdentifier": "t_type$_t_address_payable_$",
+                        "typeString": "type(address payable)"
                       },
                       "typeName":
                       {
                         "id": 31,
                         "name": "address",
                         "nodeType": "ElementaryTypeName",
-                        "src": "239:7:1",
+                        "src": "239:8:1",
+                        "stateMutability": "payable",
                         "typeDescriptions": {}
                       }
                     },
@@ -450,8 +451,8 @@
                     "tryCall": false,
                     "typeDescriptions":
                     {
-                      "typeIdentifier": "t_address",
-                      "typeString": "address"
+                      "typeIdentifier": "t_address_payable",
+                      "typeString": "address payable"
                     }
                   },
                   "src": "232:17:1",
diff --git a/test/libsolidity/ASTJSON/address_payable.sol b/test/libsolidity/ASTJSON/address_payable.sol
index f7cc66cb56..28c9c8a20d 100644
--- a/test/libsolidity/ASTJSON/address_payable.sol
+++ b/test/libsolidity/ASTJSON/address_payable.sol
@@ -4,7 +4,7 @@ contract C {
         address payable a = m[arg];
         r = arg;
         address c = address(this);
-        m[c] = address(0);
+        m[c] = payable(0);
     }
 }
 
diff --git a/test/libsolidity/ASTJSON/address_payable_parseOnly.json b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
index 85e06e90cd..39e91de1cc 100644
--- a/test/libsolidity/ASTJSON/address_payable_parseOnly.json
+++ b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
@@ -268,14 +268,15 @@
                     {
                       "id": 32,
                       "nodeType": "ElementaryTypeNameExpression",
-                      "src": "239:7:1",
+                      "src": "239:8:1",
                       "typeDescriptions": {},
                       "typeName":
                       {
                         "id": 31,
                         "name": "address",
                         "nodeType": "ElementaryTypeName",
-                        "src": "239:7:1",
+                        "src": "239:8:1",
+                        "stateMutability": "payable",
                         "typeDescriptions": {}
                       }
                     },
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions.json b/test/libsolidity/ASTJSON/assembly/nested_functions.json
index aea5e54d09..2ba3bd03a9 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions.json
@@ -17,6 +17,7 @@
       "canonicalName": "C",
       "contractDependencies": [],
       "contractKind": "contract",
+      "fullyImplemented": true,
       "id": 8,
       "linearizedBaseContracts":
       [
@@ -32,21 +33,21 @@
           {
             "id": 6,
             "nodeType": "Block",
-            "src": "57:97:1",
+            "src": "57:95:1",
             "statements":
             [
               {
                 "AST":
                 {
                   "nodeType": "YulBlock",
-                  "src": "72:78:1",
+                  "src": "72:76:1",
                   "statements":
                   [
                     {
                       "body":
                       {
                         "nodeType": "YulBlock",
-                        "src": "94:50:1",
+                        "src": "94:35:1",
                         "statements":
                         [
                           {
@@ -59,43 +60,53 @@
                             "name": "f2",
                             "nodeType": "YulFunctionDefinition",
                             "src": "104:17:1"
-                          },
-                          {
-                            "nodeType": "YulAssignment",
-                            "src": "130:6:1",
-                            "value":
-                            {
-                              "kind": "number",
-                              "nodeType": "YulLiteral",
-                              "src": "135:1:1",
-                              "type": "",
-                              "value": "2"
-                            },
-                            "variableNames":
-                            [
-                              {
-                                "name": "x",
-                                "nodeType": "YulIdentifier",
-                                "src": "130:1:1"
-                              }
-                            ]
                           }
                         ]
                       },
                       "name": "f1",
                       "nodeType": "YulFunctionDefinition",
-                      "src": "80:64:1"
+                      "src": "80:49:1"
+                    },
+                    {
+                      "nodeType": "YulAssignment",
+                      "src": "136:6:1",
+                      "value":
+                      {
+                        "kind": "number",
+                        "nodeType": "YulLiteral",
+                        "src": "141:1:1",
+                        "type": "",
+                        "value": "2"
+                      },
+                      "variableNames":
+                      [
+                        {
+                          "name": "x",
+                          "nodeType": "YulIdentifier",
+                          "src": "136:1:1"
+                        }
+                      ]
                     }
                   ]
                 },
-                "evmVersion": %EVMVERSION%,
-                "externalReferences": [],
+                "evmVersion": "london",
+                "externalReferences":
+                [
+                  {
+                    "declaration": 3,
+                    "isOffset": false,
+                    "isSlot": false,
+                    "src": "136:1:1",
+                    "valueSize": 1
+                  }
+                ],
                 "id": 5,
                 "nodeType": "InlineAssembly",
-                "src": "63:87:1"
+                "src": "63:85:1"
               }
             ]
           },
+          "functionSelector": "26121ff0",
           "id": 7,
           "implemented": true,
           "kind": "function",
@@ -127,14 +138,22 @@
                 "src": "49:6:1",
                 "stateVariable": false,
                 "storageLocation": "default",
-                "typeDescriptions": {},
+                "typeDescriptions":
+                {
+                  "typeIdentifier": "t_uint256",
+                  "typeString": "uint256"
+                },
                 "typeName":
                 {
                   "id": 2,
                   "name": "uint",
                   "nodeType": "ElementaryTypeName",
                   "src": "49:4:1",
-                  "typeDescriptions": {}
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_uint256",
+                    "typeString": "uint256"
+                  }
                 },
                 "visibility": "internal"
               }
@@ -142,16 +161,16 @@
             "src": "48:8:1"
           },
           "scope": 8,
-          "src": "15:139:1",
+          "src": "15:137:1",
           "stateMutability": "pure",
           "virtual": false,
           "visibility": "public"
         }
       ],
       "scope": 9,
-      "src": "0:156:1",
+      "src": "0:154:1",
       "usedErrors": []
     }
   ],
-  "src": "0:157:1"
+  "src": "0:155:1"
 }
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions.sol b/test/libsolidity/ASTJSON/assembly/nested_functions.sol
index 412dd05a48..396efa0bf8 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.sol
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions.sol
@@ -3,8 +3,8 @@ contract C {
     assembly {
       function f1() {
         function f2() { }
-        x := 2
       }
+      x := 2
     }
   }
 }
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
index af50716650..94b69a7615 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
@@ -20,21 +20,21 @@
           {
             "id": 6,
             "nodeType": "Block",
-            "src": "57:97:1",
+            "src": "57:95:1",
             "statements":
             [
               {
                 "AST":
                 {
                   "nodeType": "YulBlock",
-                  "src": "72:78:1",
+                  "src": "72:76:1",
                   "statements":
                   [
                     {
                       "body":
                       {
                         "nodeType": "YulBlock",
-                        "src": "94:50:1",
+                        "src": "94:35:1",
                         "statements":
                         [
                           {
@@ -47,40 +47,40 @@
                             "name": "f2",
                             "nodeType": "YulFunctionDefinition",
                             "src": "104:17:1"
-                          },
-                          {
-                            "nodeType": "YulAssignment",
-                            "src": "130:6:1",
-                            "value":
-                            {
-                              "kind": "number",
-                              "nodeType": "YulLiteral",
-                              "src": "135:1:1",
-                              "type": "",
-                              "value": "2"
-                            },
-                            "variableNames":
-                            [
-                              {
-                                "name": "x",
-                                "nodeType": "YulIdentifier",
-                                "src": "130:1:1"
-                              }
-                            ]
                           }
                         ]
                       },
                       "name": "f1",
                       "nodeType": "YulFunctionDefinition",
-                      "src": "80:64:1"
+                      "src": "80:49:1"
+                    },
+                    {
+                      "nodeType": "YulAssignment",
+                      "src": "136:6:1",
+                      "value":
+                      {
+                        "kind": "number",
+                        "nodeType": "YulLiteral",
+                        "src": "141:1:1",
+                        "type": "",
+                        "value": "2"
+                      },
+                      "variableNames":
+                      [
+                        {
+                          "name": "x",
+                          "nodeType": "YulIdentifier",
+                          "src": "136:1:1"
+                        }
+                      ]
                     }
                   ]
                 },
-                "evmVersion": %EVMVERSION%,
+                "evmVersion": "london",
                 "externalReferences": [],
                 "id": 5,
                 "nodeType": "InlineAssembly",
-                "src": "63:87:1"
+                "src": "63:85:1"
               }
             ]
           },
@@ -128,15 +128,15 @@
             ],
             "src": "48:8:1"
           },
-          "src": "15:139:1",
+          "src": "15:137:1",
           "stateMutability": "pure",
           "virtual": false,
           "visibility": "public"
         }
       ],
-      "src": "0:156:1",
+      "src": "0:154:1",
       "usedErrors": []
     }
   ],
-  "src": "0:157:1"
+  "src": "0:155:1"
 }
diff --git a/test/libsolidity/ASTJSON/assembly/switch.json b/test/libsolidity/ASTJSON/assembly/switch.json
index 85dcb313f2..f78699ef64 100644
--- a/test/libsolidity/ASTJSON/assembly/switch.json
+++ b/test/libsolidity/ASTJSON/assembly/switch.json
@@ -17,6 +17,7 @@
       "canonicalName": "C",
       "contractDependencies": [],
       "contractKind": "contract",
+      "fullyImplemented": true,
       "id": 6,
       "linearizedBaseContracts":
       [
@@ -56,7 +57,7 @@
                       "variables":
                       [
                         {
-                          "name": "f",
+                          "name": "v",
                           "nodeType": "YulTypedName",
                           "src": "79:1:1",
                           "type": ""
@@ -87,7 +88,7 @@
                                 "variableNames":
                                 [
                                   {
-                                    "name": "f",
+                                    "name": "v",
                                     "nodeType": "YulIdentifier",
                                     "src": "141:1:1"
                                   }
@@ -127,7 +128,7 @@
                                 "variableNames":
                                 [
                                   {
-                                    "name": "f",
+                                    "name": "v",
                                     "nodeType": "YulIdentifier",
                                     "src": "172:1:1"
                                   }
@@ -158,29 +159,14 @@
                   ]
                 },
                 "evmVersion": %EVMVERSION%,
-                "externalReferences":
-                [
-                  {
-                    "declaration": 5,
-                    "isOffset": false,
-                    "isSlot": false,
-                    "src": "141:1:1",
-                    "valueSize": 18446744073709551615
-                  },
-                  {
-                    "declaration": 5,
-                    "isOffset": false,
-                    "isSlot": false,
-                    "src": "172:1:1",
-                    "valueSize": 18446744073709551615
-                  }
-                ],
+                "externalReferences": [],
                 "id": 3,
                 "nodeType": "InlineAssembly",
                 "src": "52:138:1"
               }
             ]
           },
+          "functionSelector": "26121ff0",
           "id": 5,
           "implemented": true,
           "kind": "function",
diff --git a/test/libsolidity/ASTJSON/assembly/switch.sol b/test/libsolidity/ASTJSON/assembly/switch.sol
index 640c5b51c7..c04d311b09 100644
--- a/test/libsolidity/ASTJSON/assembly/switch.sol
+++ b/test/libsolidity/ASTJSON/assembly/switch.sol
@@ -1,10 +1,10 @@
 contract C {
     function f() pure public {
         assembly {
-            let f := 0
+            let v := 0
             switch calldatasize()
-            case 0 { f := 1 }
-            default { f := 2 }
+            case 0 { v := 1 }
+            default { v := 2 }
         }
     }
 }
diff --git a/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json b/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
index 93e671c100..54d38b6383 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
@@ -44,7 +44,7 @@
                       "variables":
                       [
                         {
-                          "name": "f",
+                          "name": "v",
                           "nodeType": "YulTypedName",
                           "src": "79:1:1",
                           "type": ""
@@ -75,7 +75,7 @@
                                 "variableNames":
                                 [
                                   {
-                                    "name": "f",
+                                    "name": "v",
                                     "nodeType": "YulIdentifier",
                                     "src": "141:1:1"
                                   }
@@ -115,7 +115,7 @@
                                 "variableNames":
                                 [
                                   {
-                                    "name": "f",
+                                    "name": "v",
                                     "nodeType": "YulIdentifier",
                                     "src": "172:1:1"
                                   }
diff --git a/test/libsolidity/ASTJSON/function_type.json b/test/libsolidity/ASTJSON/function_type.json
index cef79e70be..924f9cdb9a 100644
--- a/test/libsolidity/ASTJSON/function_type.json
+++ b/test/libsolidity/ASTJSON/function_type.json
@@ -33,7 +33,7 @@
           {
             "id": 15,
             "nodeType": "Block",
-            "src": "120:2:1",
+            "src": "127:2:1",
             "statements": []
           },
           "functionSelector": "d6cd4974",
@@ -144,7 +144,7 @@
                 "nameLocation": "-1:-1:-1",
                 "nodeType": "VariableDeclaration",
                 "scope": 16,
-                "src": "79:40:1",
+                "src": "86:40:1",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions":
@@ -161,7 +161,7 @@
                     "id": 8,
                     "nodeType": "ParameterList",
                     "parameters": [],
-                    "src": "87:2:1"
+                    "src": "94:2:1"
                   },
                   "returnParameterTypes":
                   {
@@ -177,7 +177,7 @@
                         "nameLocation": "-1:-1:-1",
                         "nodeType": "VariableDeclaration",
                         "scope": 12,
-                        "src": "113:4:1",
+                        "src": "120:4:1",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions":
@@ -190,7 +190,7 @@
                           "id": 9,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "113:4:1",
+                          "src": "120:4:1",
                           "typeDescriptions":
                           {
                             "typeIdentifier": "t_uint256",
@@ -200,9 +200,9 @@
                         "visibility": "internal"
                       }
                     ],
-                    "src": "112:6:1"
+                    "src": "119:6:1"
                   },
-                  "src": "79:40:1",
+                  "src": "86:40:1",
                   "stateMutability": "view",
                   "typeDescriptions":
                   {
@@ -214,19 +214,19 @@
                 "visibility": "internal"
               }
             ],
-            "src": "78:41:1"
+            "src": "85:41:1"
           },
           "scope": 17,
-          "src": "13:109:1",
+          "src": "13:116:1",
           "stateMutability": "nonpayable",
           "virtual": false,
           "visibility": "public"
         }
       ],
       "scope": 18,
-      "src": "0:124:1",
+      "src": "0:131:1",
       "usedErrors": []
     }
   ],
-  "src": "0:125:1"
+  "src": "0:132:1"
 }
diff --git a/test/libsolidity/ASTJSON/function_type.sol b/test/libsolidity/ASTJSON/function_type.sol
index bed2742b2a..176cea3740 100644
--- a/test/libsolidity/ASTJSON/function_type.sol
+++ b/test/libsolidity/ASTJSON/function_type.sol
@@ -1,3 +1,3 @@
-contract C { function f(function() external payable returns (uint) x) returns (function() external view returns (uint)) {} }
+contract C { function f(function() external payable returns (uint) x) public returns (function() external view returns (uint)) {} }
 
 // ----
diff --git a/test/libsolidity/ASTJSON/function_type_parseOnly.json b/test/libsolidity/ASTJSON/function_type_parseOnly.json
index e47f24ad18..fd1d7637b0 100644
--- a/test/libsolidity/ASTJSON/function_type_parseOnly.json
+++ b/test/libsolidity/ASTJSON/function_type_parseOnly.json
@@ -20,7 +20,7 @@
           {
             "id": 15,
             "nodeType": "Block",
-            "src": "120:2:1",
+            "src": "127:2:1",
             "statements": []
           },
           "id": 16,
@@ -111,7 +111,7 @@
                 "name": "",
                 "nameLocation": "-1:-1:-1",
                 "nodeType": "VariableDeclaration",
-                "src": "79:40:1",
+                "src": "86:40:1",
                 "stateVariable": false,
                 "storageLocation": "default",
                 "typeDescriptions": {},
@@ -124,7 +124,7 @@
                     "id": 8,
                     "nodeType": "ParameterList",
                     "parameters": [],
-                    "src": "87:2:1"
+                    "src": "94:2:1"
                   },
                   "returnParameterTypes":
                   {
@@ -139,7 +139,7 @@
                         "name": "",
                         "nameLocation": "-1:-1:-1",
                         "nodeType": "VariableDeclaration",
-                        "src": "113:4:1",
+                        "src": "120:4:1",
                         "stateVariable": false,
                         "storageLocation": "default",
                         "typeDescriptions": {},
@@ -148,15 +148,15 @@
                           "id": 9,
                           "name": "uint",
                           "nodeType": "ElementaryTypeName",
-                          "src": "113:4:1",
+                          "src": "120:4:1",
                           "typeDescriptions": {}
                         },
                         "visibility": "internal"
                       }
                     ],
-                    "src": "112:6:1"
+                    "src": "119:6:1"
                   },
-                  "src": "79:40:1",
+                  "src": "86:40:1",
                   "stateMutability": "view",
                   "typeDescriptions": {},
                   "visibility": "external"
@@ -164,17 +164,17 @@
                 "visibility": "internal"
               }
             ],
-            "src": "78:41:1"
+            "src": "85:41:1"
           },
-          "src": "13:109:1",
+          "src": "13:116:1",
           "stateMutability": "nonpayable",
           "virtual": false,
           "visibility": "public"
         }
       ],
-      "src": "0:124:1",
+      "src": "0:131:1",
       "usedErrors": []
     }
   ],
-  "src": "0:125:1"
+  "src": "0:132:1"
 }
diff --git a/test/libsolidity/ASTJSON/non_utf8.json b/test/libsolidity/ASTJSON/non_utf8.json
index 2f7145fda5..0e2a56f84b 100644
--- a/test/libsolidity/ASTJSON/non_utf8.json
+++ b/test/libsolidity/ASTJSON/non_utf8.json
@@ -4,10 +4,10 @@
   {
     "C":
     [
-      9
+      15
     ]
   },
-  "id": 10,
+  "id": 16,
   "nodeType": "SourceUnit",
   "nodes":
   [
@@ -18,10 +18,10 @@
       "contractDependencies": [],
       "contractKind": "contract",
       "fullyImplemented": true,
-      "id": 9,
+      "id": 15,
       "linearizedBaseContracts":
       [
-        9
+        15
       ],
       "name": "C",
       "nameLocation": "9:1:1",
@@ -31,9 +31,9 @@
         {
           "body":
           {
-            "id": 7,
+            "id": 13,
             "nodeType": "Block",
-            "src": "33:30:1",
+            "src": "33:45:1",
             "statements":
             [
               {
@@ -50,7 +50,7 @@
                     "name": "x",
                     "nameLocation": "49:1:1",
                     "nodeType": "VariableDeclaration",
-                    "scope": 7,
+                    "scope": 13,
                     "src": "35:15:1",
                     "stateVariable": false,
                     "storageLocation": "memory",
@@ -74,31 +74,131 @@
                     "visibility": "internal"
                   }
                 ],
-                "id": 6,
+                "id": 12,
                 "initialValue":
                 {
-                  "hexValue": "ff",
-                  "id": 5,
+                  "arguments":
+                  [
+                    {
+                      "arguments":
+                      [
+                        {
+                          "hexValue": "ff",
+                          "id": 9,
+                          "isConstant": false,
+                          "isLValue": false,
+                          "isPure": true,
+                          "kind": "hexString",
+                          "lValueRequested": false,
+                          "nodeType": "Literal",
+                          "src": "66:7:1",
+                          "typeDescriptions":
+                          {
+                            "typeIdentifier": "t_stringliteral_8b1a944cf13a9a1c08facb2c9e98623ef3254d2ddb48113885c3e8e97fec8db9",
+                            "typeString": "literal_string hex\"ff\""
+                          }
+                        }
+                      ],
+                      "expression":
+                      {
+                        "argumentTypes":
+                        [
+                          {
+                            "typeIdentifier": "t_stringliteral_8b1a944cf13a9a1c08facb2c9e98623ef3254d2ddb48113885c3e8e97fec8db9",
+                            "typeString": "literal_string hex\"ff\""
+                          }
+                        ],
+                        "id": 8,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": true,
+                        "lValueRequested": false,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "60:5:1",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_type$_t_bytes_storage_ptr_$",
+                          "typeString": "type(bytes storage pointer)"
+                        },
+                        "typeName":
+                        {
+                          "id": 7,
+                          "name": "bytes",
+                          "nodeType": "ElementaryTypeName",
+                          "src": "60:5:1",
+                          "typeDescriptions": {}
+                        }
+                      },
+                      "id": 10,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "typeConversion",
+                      "lValueRequested": false,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "60:14:1",
+                      "tryCall": false,
+                      "typeDescriptions":
+                      {
+                        "typeIdentifier": "t_bytes_memory_ptr",
+                        "typeString": "bytes memory"
+                      }
+                    }
+                  ],
+                  "expression":
+                  {
+                    "argumentTypes":
+                    [
+                      {
+                        "typeIdentifier": "t_bytes_memory_ptr",
+                        "typeString": "bytes memory"
+                      }
+                    ],
+                    "id": 6,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": true,
+                    "lValueRequested": false,
+                    "nodeType": "ElementaryTypeNameExpression",
+                    "src": "53:6:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_type$_t_string_storage_ptr_$",
+                      "typeString": "type(string storage pointer)"
+                    },
+                    "typeName":
+                    {
+                      "id": 5,
+                      "name": "string",
+                      "nodeType": "ElementaryTypeName",
+                      "src": "53:6:1",
+                      "typeDescriptions": {}
+                    }
+                  },
+                  "id": 11,
                   "isConstant": false,
                   "isLValue": false,
                   "isPure": true,
-                  "kind": "hexString",
+                  "kind": "typeConversion",
                   "lValueRequested": false,
-                  "nodeType": "Literal",
-                  "src": "53:7:1",
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "53:22:1",
+                  "tryCall": false,
                   "typeDescriptions":
                   {
-                    "typeIdentifier": "t_stringliteral_8b1a944cf13a9a1c08facb2c9e98623ef3254d2ddb48113885c3e8e97fec8db9",
-                    "typeString": "literal_string hex\"ff\""
+                    "typeIdentifier": "t_string_memory_ptr",
+                    "typeString": "string memory"
                   }
                 },
                 "nodeType": "VariableDeclarationStatement",
-                "src": "35:25:1"
+                "src": "35:40:1"
               }
             ]
           },
           "functionSelector": "26121ff0",
-          "id": 8,
+          "id": 14,
           "implemented": true,
           "kind": "function",
           "modifiers": [],
@@ -119,17 +219,17 @@
             "parameters": [],
             "src": "33:0:1"
           },
-          "scope": 9,
-          "src": "13:50:1",
+          "scope": 15,
+          "src": "13:65:1",
           "stateMutability": "nonpayable",
           "virtual": false,
           "visibility": "public"
         }
       ],
-      "scope": 10,
-      "src": "0:65:1",
+      "scope": 16,
+      "src": "0:80:1",
       "usedErrors": []
     }
   ],
-  "src": "0:66:1"
+  "src": "0:81:1"
 }
diff --git a/test/libsolidity/ASTJSON/non_utf8.sol b/test/libsolidity/ASTJSON/non_utf8.sol
index 3651a05fd6..0f14102cce 100644
--- a/test/libsolidity/ASTJSON/non_utf8.sol
+++ b/test/libsolidity/ASTJSON/non_utf8.sol
@@ -1,3 +1,3 @@
-contract C { function f() public { string memory x = hex"ff"; } }
+contract C { function f() public { string memory x = string(bytes(hex"ff")); } }
 
 // ----
diff --git a/test/libsolidity/ASTJSON/non_utf8_parseOnly.json b/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
index e33388a071..df358ae362 100644
--- a/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
+++ b/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
@@ -1,6 +1,6 @@
 {
   "absolutePath": "a",
-  "id": 10,
+  "id": 16,
   "nodeType": "SourceUnit",
   "nodes":
   [
@@ -9,7 +9,7 @@
       "baseContracts": [],
       "contractDependencies": [],
       "contractKind": "contract",
-      "id": 9,
+      "id": 15,
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
@@ -18,9 +18,9 @@
         {
           "body":
           {
-            "id": 7,
+            "id": 13,
             "nodeType": "Block",
-            "src": "33:30:1",
+            "src": "33:45:1",
             "statements":
             [
               {
@@ -52,22 +52,74 @@
                     "visibility": "internal"
                   }
                 ],
-                "id": 6,
+                "id": 12,
                 "initialValue":
                 {
-                  "hexValue": "ff",
-                  "id": 5,
-                  "kind": "hexString",
-                  "nodeType": "Literal",
-                  "src": "53:7:1",
+                  "arguments":
+                  [
+                    {
+                      "arguments":
+                      [
+                        {
+                          "hexValue": "ff",
+                          "id": 9,
+                          "kind": "hexString",
+                          "nodeType": "Literal",
+                          "src": "66:7:1",
+                          "typeDescriptions": {}
+                        }
+                      ],
+                      "expression":
+                      {
+                        "id": 8,
+                        "nodeType": "ElementaryTypeNameExpression",
+                        "src": "60:5:1",
+                        "typeDescriptions": {},
+                        "typeName":
+                        {
+                          "id": 7,
+                          "name": "bytes",
+                          "nodeType": "ElementaryTypeName",
+                          "src": "60:5:1",
+                          "typeDescriptions": {}
+                        }
+                      },
+                      "id": 10,
+                      "names": [],
+                      "nodeType": "FunctionCall",
+                      "src": "60:14:1",
+                      "tryCall": false,
+                      "typeDescriptions": {}
+                    }
+                  ],
+                  "expression":
+                  {
+                    "id": 6,
+                    "nodeType": "ElementaryTypeNameExpression",
+                    "src": "53:6:1",
+                    "typeDescriptions": {},
+                    "typeName":
+                    {
+                      "id": 5,
+                      "name": "string",
+                      "nodeType": "ElementaryTypeName",
+                      "src": "53:6:1",
+                      "typeDescriptions": {}
+                    }
+                  },
+                  "id": 11,
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "53:22:1",
+                  "tryCall": false,
                   "typeDescriptions": {}
                 },
                 "nodeType": "VariableDeclarationStatement",
-                "src": "35:25:1"
+                "src": "35:40:1"
               }
             ]
           },
-          "id": 8,
+          "id": 14,
           "implemented": true,
           "kind": "function",
           "modifiers": [],
@@ -88,15 +140,15 @@
             "parameters": [],
             "src": "33:0:1"
           },
-          "src": "13:50:1",
+          "src": "13:65:1",
           "stateMutability": "nonpayable",
           "virtual": false,
           "visibility": "public"
         }
       ],
-      "src": "0:65:1",
+      "src": "0:80:1",
       "usedErrors": []
     }
   ],
-  "src": "0:66:1"
+  "src": "0:81:1"
 }
diff --git a/test/libsolidity/ASTJSON/source_location.json b/test/libsolidity/ASTJSON/source_location.json
index 0591a30cc8..df51e49c6f 100644
--- a/test/libsolidity/ASTJSON/source_location.json
+++ b/test/libsolidity/ASTJSON/source_location.json
@@ -33,7 +33,7 @@
           {
             "id": 10,
             "nodeType": "Block",
-            "src": "26:20:1",
+            "src": "33:20:1",
             "statements":
             [
               {
@@ -48,10 +48,10 @@
                     "id": 4,
                     "mutability": "mutable",
                     "name": "x",
-                    "nameLocation": "33:1:1",
+                    "nameLocation": "40:1:1",
                     "nodeType": "VariableDeclaration",
                     "scope": 10,
-                    "src": "28:6:1",
+                    "src": "35:6:1",
                     "stateVariable": false,
                     "storageLocation": "default",
                     "typeDescriptions":
@@ -64,7 +64,7 @@
                       "id": 3,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
-                      "src": "28:4:1",
+                      "src": "35:4:1",
                       "typeDescriptions":
                       {
                         "typeIdentifier": "t_uint256",
@@ -85,7 +85,7 @@
                   "kind": "number",
                   "lValueRequested": false,
                   "nodeType": "Literal",
-                  "src": "37:1:1",
+                  "src": "44:1:1",
                   "typeDescriptions":
                   {
                     "typeIdentifier": "t_rational_2_by_1",
@@ -94,7 +94,7 @@
                   "value": "2"
                 },
                 "nodeType": "VariableDeclarationStatement",
-                "src": "28:10:1"
+                "src": "35:10:1"
               },
               {
                 "expression":
@@ -107,7 +107,7 @@
                   "nodeType": "UnaryOperation",
                   "operator": "++",
                   "prefix": false,
-                  "src": "40:3:1",
+                  "src": "47:3:1",
                   "subExpression":
                   {
                     "id": 7,
@@ -115,7 +115,7 @@
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 4,
-                    "src": "40:1:1",
+                    "src": "47:1:1",
                     "typeDescriptions":
                     {
                       "typeIdentifier": "t_uint256",
@@ -130,7 +130,7 @@
                 },
                 "id": 9,
                 "nodeType": "ExpressionStatement",
-                "src": "40:3:1"
+                "src": "47:3:1"
               }
             ]
           },
@@ -154,19 +154,19 @@
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
-            "src": "26:0:1"
+            "src": "33:0:1"
           },
           "scope": 12,
-          "src": "13:33:1",
+          "src": "13:40:1",
           "stateMutability": "nonpayable",
           "virtual": false,
           "visibility": "public"
         }
       ],
       "scope": 13,
-      "src": "0:48:1",
+      "src": "0:55:1",
       "usedErrors": []
     }
   ],
-  "src": "0:49:1"
+  "src": "0:56:1"
 }
diff --git a/test/libsolidity/ASTJSON/source_location.sol b/test/libsolidity/ASTJSON/source_location.sol
index 0960bcde6b..756998e43a 100644
--- a/test/libsolidity/ASTJSON/source_location.sol
+++ b/test/libsolidity/ASTJSON/source_location.sol
@@ -1,3 +1,3 @@
-contract C { function f() { uint x = 2; x++; } }
+contract C { function f() public { uint x = 2; x++; } }
 
 // ----
diff --git a/test/libsolidity/ASTJSON/source_location_parseOnly.json b/test/libsolidity/ASTJSON/source_location_parseOnly.json
index decc215fe2..88835788b8 100644
--- a/test/libsolidity/ASTJSON/source_location_parseOnly.json
+++ b/test/libsolidity/ASTJSON/source_location_parseOnly.json
@@ -20,7 +20,7 @@
           {
             "id": 10,
             "nodeType": "Block",
-            "src": "26:20:1",
+            "src": "33:20:1",
             "statements":
             [
               {
@@ -35,9 +35,9 @@
                     "id": 4,
                     "mutability": "mutable",
                     "name": "x",
-                    "nameLocation": "33:1:1",
+                    "nameLocation": "40:1:1",
                     "nodeType": "VariableDeclaration",
-                    "src": "28:6:1",
+                    "src": "35:6:1",
                     "stateVariable": false,
                     "storageLocation": "default",
                     "typeDescriptions": {},
@@ -46,7 +46,7 @@
                       "id": 3,
                       "name": "uint",
                       "nodeType": "ElementaryTypeName",
-                      "src": "28:4:1",
+                      "src": "35:4:1",
                       "typeDescriptions": {}
                     },
                     "visibility": "internal"
@@ -59,12 +59,12 @@
                   "id": 5,
                   "kind": "number",
                   "nodeType": "Literal",
-                  "src": "37:1:1",
+                  "src": "44:1:1",
                   "typeDescriptions": {},
                   "value": "2"
                 },
                 "nodeType": "VariableDeclarationStatement",
-                "src": "28:10:1"
+                "src": "35:10:1"
               },
               {
                 "expression":
@@ -73,21 +73,21 @@
                   "nodeType": "UnaryOperation",
                   "operator": "++",
                   "prefix": false,
-                  "src": "40:3:1",
+                  "src": "47:3:1",
                   "subExpression":
                   {
                     "id": 7,
                     "name": "x",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "src": "40:1:1",
+                    "src": "47:1:1",
                     "typeDescriptions": {}
                   },
                   "typeDescriptions": {}
                 },
                 "id": 9,
                 "nodeType": "ExpressionStatement",
-                "src": "40:3:1"
+                "src": "47:3:1"
               }
             ]
           },
@@ -110,17 +110,17 @@
             "id": 2,
             "nodeType": "ParameterList",
             "parameters": [],
-            "src": "26:0:1"
+            "src": "33:0:1"
           },
-          "src": "13:33:1",
+          "src": "13:40:1",
           "stateMutability": "nonpayable",
           "virtual": false,
           "visibility": "public"
         }
       ],
-      "src": "0:48:1",
+      "src": "0:55:1",
       "usedErrors": []
     }
   ],
-  "src": "0:49:1"
+  "src": "0:56:1"
 }
diff --git a/test/libsolidity/ASTJSON/used_errors.json b/test/libsolidity/ASTJSON/used_errors.json
index a0e8e28ba4..f00336d209 100644
--- a/test/libsolidity/ASTJSON/used_errors.json
+++ b/test/libsolidity/ASTJSON/used_errors.json
@@ -39,7 +39,7 @@
       {
         "id": 8,
         "nodeType": "Block",
-        "src": "24:15:1",
+        "src": "29:15:1",
         "statements":
         [
           {
@@ -54,7 +54,7 @@
                 "nodeType": "Identifier",
                 "overloadedDeclarations": [],
                 "referencedDeclaration": 2,
-                "src": "33:1:1",
+                "src": "38:1:1",
                 "typeDescriptions":
                 {
                   "typeIdentifier": "t_function_error_pure$__$returns$__$",
@@ -69,7 +69,7 @@
               "lValueRequested": false,
               "names": [],
               "nodeType": "FunctionCall",
-              "src": "33:3:1",
+              "src": "38:3:1",
               "tryCall": false,
               "typeDescriptions":
               {
@@ -79,7 +79,7 @@
             },
             "id": 7,
             "nodeType": "RevertStatement",
-            "src": "26:10:1"
+            "src": "31:10:1"
           }
         ]
       },
@@ -102,11 +102,11 @@
         "id": 4,
         "nodeType": "ParameterList",
         "parameters": [],
-        "src": "24:0:1"
+        "src": "29:0:1"
       },
       "scope": 20,
-      "src": "11:28:1",
-      "stateMutability": "nonpayable",
+      "src": "11:33:1",
+      "stateMutability": "pure",
       "virtual": false,
       "visibility": "internal"
     },
@@ -123,7 +123,7 @@
         19
       ],
       "name": "C",
-      "nameLocation": "49:1:1",
+      "nameLocation": "54:1:1",
       "nodeType": "ContractDefinition",
       "nodes":
       [
@@ -131,23 +131,23 @@
           "errorSelector": "2bc80f3a",
           "id": 11,
           "name": "T",
-          "nameLocation": "63:1:1",
+          "nameLocation": "68:1:1",
           "nodeType": "ErrorDefinition",
           "parameters":
           {
             "id": 10,
             "nodeType": "ParameterList",
             "parameters": [],
-            "src": "64:2:1"
+            "src": "69:2:1"
           },
-          "src": "57:10:1"
+          "src": "62:10:1"
         },
         {
           "body":
           {
             "id": 17,
             "nodeType": "Block",
-            "src": "92:8:1",
+            "src": "97:8:1",
             "statements":
             [
               {
@@ -162,11 +162,11 @@
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
                     "referencedDeclaration": 9,
-                    "src": "94:1:1",
+                    "src": "99:1:1",
                     "typeDescriptions":
                     {
-                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
-                      "typeString": "function ()"
+                      "typeIdentifier": "t_function_internal_pure$__$returns$__$",
+                      "typeString": "function () pure"
                     }
                   },
                   "id": 15,
@@ -177,7 +177,7 @@
                   "lValueRequested": false,
                   "names": [],
                   "nodeType": "FunctionCall",
-                  "src": "94:3:1",
+                  "src": "99:3:1",
                   "tryCall": false,
                   "typeDescriptions":
                   {
@@ -187,7 +187,7 @@
                 },
                 "id": 16,
                 "nodeType": "ExpressionStatement",
-                "src": "94:3:1"
+                "src": "99:3:1"
               }
             ]
           },
@@ -197,31 +197,31 @@
           "kind": "function",
           "modifiers": [],
           "name": "h",
-          "nameLocation": "81:1:1",
+          "nameLocation": "86:1:1",
           "nodeType": "FunctionDefinition",
           "parameters":
           {
             "id": 12,
             "nodeType": "ParameterList",
             "parameters": [],
-            "src": "82:2:1"
+            "src": "87:2:1"
           },
           "returnParameters":
           {
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
-            "src": "92:0:1"
+            "src": "97:0:1"
           },
           "scope": 19,
-          "src": "72:28:1",
+          "src": "77:28:1",
           "stateMutability": "nonpayable",
           "virtual": false,
           "visibility": "public"
         }
       ],
       "scope": 20,
-      "src": "40:62:1",
+      "src": "45:62:1",
       "usedErrors":
       [
         2,
@@ -229,5 +229,5 @@
       ]
     }
   ],
-  "src": "0:103:1"
+  "src": "0:108:1"
 }
diff --git a/test/libsolidity/ASTJSON/used_errors.sol b/test/libsolidity/ASTJSON/used_errors.sol
index ead3e2dcf4..24c03982fe 100644
--- a/test/libsolidity/ASTJSON/used_errors.sol
+++ b/test/libsolidity/ASTJSON/used_errors.sol
@@ -1,5 +1,5 @@
 error X();
-function f() { revert X(); }
+function f() pure { revert X(); }
 contract C {
     error T();
     function h() public { f(); }
diff --git a/test/libsolidity/ASTJSON/used_errors_parseOnly.json b/test/libsolidity/ASTJSON/used_errors_parseOnly.json
index 58b476005f..b7500b445e 100644
--- a/test/libsolidity/ASTJSON/used_errors_parseOnly.json
+++ b/test/libsolidity/ASTJSON/used_errors_parseOnly.json
@@ -23,7 +23,7 @@
       {
         "id": 8,
         "nodeType": "Block",
-        "src": "24:15:1",
+        "src": "29:15:1",
         "statements":
         [
           {
@@ -36,19 +36,19 @@
                 "name": "X",
                 "nodeType": "Identifier",
                 "overloadedDeclarations": [],
-                "src": "33:1:1",
+                "src": "38:1:1",
                 "typeDescriptions": {}
               },
               "id": 6,
               "names": [],
               "nodeType": "FunctionCall",
-              "src": "33:3:1",
+              "src": "38:3:1",
               "tryCall": false,
               "typeDescriptions": {}
             },
             "id": 7,
             "nodeType": "RevertStatement",
-            "src": "26:10:1"
+            "src": "31:10:1"
           }
         ]
       },
@@ -71,10 +71,10 @@
         "id": 4,
         "nodeType": "ParameterList",
         "parameters": [],
-        "src": "24:0:1"
+        "src": "29:0:1"
       },
-      "src": "11:28:1",
-      "stateMutability": "nonpayable",
+      "src": "11:33:1",
+      "stateMutability": "pure",
       "virtual": false,
       "visibility": "internal"
     },
@@ -85,30 +85,30 @@
       "contractKind": "contract",
       "id": 19,
       "name": "C",
-      "nameLocation": "49:1:1",
+      "nameLocation": "54:1:1",
       "nodeType": "ContractDefinition",
       "nodes":
       [
         {
           "id": 11,
           "name": "T",
-          "nameLocation": "63:1:1",
+          "nameLocation": "68:1:1",
           "nodeType": "ErrorDefinition",
           "parameters":
           {
             "id": 10,
             "nodeType": "ParameterList",
             "parameters": [],
-            "src": "64:2:1"
+            "src": "69:2:1"
           },
-          "src": "57:10:1"
+          "src": "62:10:1"
         },
         {
           "body":
           {
             "id": 17,
             "nodeType": "Block",
-            "src": "92:8:1",
+            "src": "97:8:1",
             "statements":
             [
               {
@@ -121,19 +121,19 @@
                     "name": "f",
                     "nodeType": "Identifier",
                     "overloadedDeclarations": [],
-                    "src": "94:1:1",
+                    "src": "99:1:1",
                     "typeDescriptions": {}
                   },
                   "id": 15,
                   "names": [],
                   "nodeType": "FunctionCall",
-                  "src": "94:3:1",
+                  "src": "99:3:1",
                   "tryCall": false,
                   "typeDescriptions": {}
                 },
                 "id": 16,
                 "nodeType": "ExpressionStatement",
-                "src": "94:3:1"
+                "src": "99:3:1"
               }
             ]
           },
@@ -142,31 +142,31 @@
           "kind": "function",
           "modifiers": [],
           "name": "h",
-          "nameLocation": "81:1:1",
+          "nameLocation": "86:1:1",
           "nodeType": "FunctionDefinition",
           "parameters":
           {
             "id": 12,
             "nodeType": "ParameterList",
             "parameters": [],
-            "src": "82:2:1"
+            "src": "87:2:1"
           },
           "returnParameters":
           {
             "id": 13,
             "nodeType": "ParameterList",
             "parameters": [],
-            "src": "92:0:1"
+            "src": "97:0:1"
           },
-          "src": "72:28:1",
+          "src": "77:28:1",
           "stateMutability": "nonpayable",
           "virtual": false,
           "visibility": "public"
         }
       ],
-      "src": "40:62:1",
+      "src": "45:62:1",
       "usedErrors": []
     }
   ],
-  "src": "0:103:1"
+  "src": "0:108:1"
 }

From 38639417e19250d106b0543aaa73b8c0389ba9da Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman@codepoets.it>
Date: Fri, 18 Feb 2022 09:13:33 +0100
Subject: [PATCH 0475/1748] Non-fatal erros do not stop ASTJSON test execution

---
 test/libsolidity/ASTJSONTest.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index 82c6e7e186..975c66be22 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -141,13 +141,13 @@ TestCase::TestResult ASTJSONTest::run(ostream& _stream, string const& _linePrefi
 
 		if (!c.parseAndAnalyze(variant.stopAfter))
 		{
-			// Ignore non-fatal analysis errors, we only want to export.
-			if (c.state() > CompilerStack::State::Parsed)
-				continue;
-
-			SourceReferenceFormatter formatter(_stream, c, _formatted, false);
-			formatter.printErrorInformation(c.errors());
-			return TestResult::FatalError;
+			// We just want to export so raise fatal analysis errors only
+			if (c.state() < CompilerStack::State::ParsedAndImported)
+			{
+				SourceReferenceFormatter formatter(_stream, c, _formatted, false);
+				formatter.printErrorInformation(c.errors());
+				return TestResult::FatalError;
+			}
 		}
 
 		resultsMatch = resultsMatch && runTest(

From f431c6f0584dfd84f18d245b909acacd95c73689 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman@codepoets.it>
Date: Tue, 22 Feb 2022 12:29:29 +0100
Subject: [PATCH 0476/1748] Support compilation fail scenarios in ASTJSON tests

---
 .../ASTJSON/not_existing_import.sol           |  1 +
 test/libsolidity/ASTJSONTest.cpp              | 24 +++++++++++++++++--
 test/libsolidity/ASTJSONTest.h                |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/ASTJSON/not_existing_import.sol b/test/libsolidity/ASTJSON/not_existing_import.sol
index 6353c7527b..7251a02b84 100644
--- a/test/libsolidity/ASTJSON/not_existing_import.sol
+++ b/test/libsolidity/ASTJSON/not_existing_import.sol
@@ -6,3 +6,4 @@ contract C is NotExisting.X
 }
 
 // ----
+// failAfter: Parsed
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index 975c66be22..0dbf484480 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -27,6 +27,7 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
+#include <boost/algorithm/string/trim.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/throw_exception.hpp>
 
@@ -49,6 +50,15 @@ namespace
 
 string const sourceDelimiter("==== Source: ");
 
+const map<string, CompilerStack::State> compilerStateMap = {
+	{"Empty", CompilerStack::State::Empty},
+	{"SourcesSet", CompilerStack::State::SourcesSet},
+	{"Parsed", CompilerStack::State::Parsed},
+	{"ParsedAndImported", CompilerStack::State::ParsedAndImported},
+	{"AnalysisPerformed", CompilerStack::State::AnalysisPerformed},
+	{"CompilationSuccessful", CompilerStack::State::CompilationSuccessful}
+};
+
 void replaceVersionWithTag(string& _input)
 {
 	boost::algorithm::replace_all(
@@ -92,6 +102,7 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
 	string source;
 	string line;
 	string const delimiter("// ----");
+	string const failMarker("// failAfter:");
 	while (getline(file, line))
 	{
 		if (boost::algorithm::starts_with(line, sourceDelimiter))
@@ -105,6 +116,16 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
 			);
 			source = string();
 		}
+		else if (boost::algorithm::starts_with(line, failMarker))
+		{
+			string state = line.substr(failMarker.size());
+			boost::algorithm::trim(state);
+			if (compilerStateMap.find(state) == compilerStateMap.end())
+				BOOST_THROW_EXCEPTION(runtime_error("Unsupported compiler state (" + state + ") in test contract file"));
+			if (m_expectedFailAfter.has_value())
+				BOOST_THROW_EXCEPTION(runtime_error("Duplicated \"failAfter\" directive"));
+			m_expectedFailAfter = compilerStateMap.at(state);
+		}
 		else if (!line.empty() && !boost::algorithm::starts_with(line, delimiter))
 			source += line + "\n";
 	}
@@ -141,8 +162,7 @@ TestCase::TestResult ASTJSONTest::run(ostream& _stream, string const& _linePrefi
 
 		if (!c.parseAndAnalyze(variant.stopAfter))
 		{
-			// We just want to export so raise fatal analysis errors only
-			if (c.state() < CompilerStack::State::ParsedAndImported)
+			if (!m_expectedFailAfter.has_value() || m_expectedFailAfter.value() + 1 != c.state())
 			{
 				SourceReferenceFormatter formatter(_stream, c, _formatted, false);
 				formatter.printErrorInformation(c.errors());
diff --git a/test/libsolidity/ASTJSONTest.h b/test/libsolidity/ASTJSONTest.h
index 3365de589d..97cea184bb 100644
--- a/test/libsolidity/ASTJSONTest.h
+++ b/test/libsolidity/ASTJSONTest.h
@@ -90,6 +90,7 @@ class ASTJSONTest: public TestCase
 	) const;
 
 	std::vector<TestVariant> m_variants;
+	std::optional<CompilerStack::State> m_expectedFailAfter;
 
 	std::vector<std::pair<std::string, std::string>> m_sources;
 };

From 371a531381497f949af8a485f3fcfd588a2aafe9 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman@codepoets.it>
Date: Wed, 23 Feb 2022 07:42:05 +0100
Subject: [PATCH 0477/1748] Add "fail after parsing" scenario to ASTJSON tests

---
 .../ASTJSON/fail_after_parsing.json           | 310 ++++++++++++++++++
 .../ASTJSON/fail_after_parsing.sol            |  16 +
 .../ASTJSON/fail_after_parsing_parseOnly.json | 283 ++++++++++++++++
 3 files changed, 609 insertions(+)
 create mode 100644 test/libsolidity/ASTJSON/fail_after_parsing.json
 create mode 100644 test/libsolidity/ASTJSON/fail_after_parsing.sol
 create mode 100644 test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json

diff --git a/test/libsolidity/ASTJSON/fail_after_parsing.json b/test/libsolidity/ASTJSON/fail_after_parsing.json
new file mode 100644
index 0000000000..11cb47f355
--- /dev/null
+++ b/test/libsolidity/ASTJSON/fail_after_parsing.json
@@ -0,0 +1,310 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "I":
+    [
+      29
+    ],
+    "g":
+    [
+      3
+    ]
+  },
+  "id": 30,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "id": 3,
+      "implemented": false,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "g",
+      "nameLocation": "9:1:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 1,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "10:2:1"
+      },
+      "returnParameters":
+      {
+        "id": 2,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "19:0:1"
+      },
+      "scope": 30,
+      "src": "0:20:1",
+      "stateMutability": "nonpayable",
+      "virtual": false,
+      "visibility": "public"
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "I",
+      "contractDependencies": [],
+      "contractKind": "interface",
+      "id": 29,
+      "linearizedBaseContracts":
+      [
+        29
+      ],
+      "name": "I",
+      "nameLocation": "31:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "canonicalName": "I.S",
+          "id": 7,
+          "members":
+          [
+            {
+              "constant": false,
+              "id": 6,
+              "mutability": "mutable",
+              "name": "s",
+              "nameLocation": "52:1:1",
+              "nodeType": "VariableDeclaration",
+              "scope": 7,
+              "src": "50:3:1",
+              "stateVariable": false,
+              "storageLocation": "default",
+              "typeDescriptions": {},
+              "typeName":
+              {
+                "id": 5,
+                "nodeType": "UserDefinedTypeName",
+                "pathNode":
+                {
+                  "id": 4,
+                  "name": "S",
+                  "nodeType": "IdentifierPath",
+                  "referencedDeclaration": 7,
+                  "src": "50:1:1"
+                },
+                "referencedDeclaration": 7,
+                "src": "50:1:1",
+                "typeDescriptions": {}
+              },
+              "visibility": "internal"
+            }
+          ],
+          "name": "S",
+          "nameLocation": "46:1:1",
+          "nodeType": "StructDefinition",
+          "scope": 29,
+          "src": "39:17:1",
+          "visibility": "public"
+        },
+        {
+          "body":
+          {
+            "id": 27,
+            "nodeType": "Block",
+            "src": "85:74:1",
+            "statements":
+            [
+              {
+                "assignments":
+                [
+                  15
+                ],
+                "declarations":
+                [
+                  {
+                    "constant": false,
+                    "id": 15,
+                    "mutability": "mutable",
+                    "name": "E",
+                    "nameLocation": "101:1:1",
+                    "nodeType": "VariableDeclaration",
+                    "scope": 27,
+                    "src": "95:7:1",
+                    "stateVariable": false,
+                    "storageLocation": "default",
+                    "typeDescriptions": {},
+                    "typeName":
+                    {
+                      "id": 14,
+                      "nodeType": "UserDefinedTypeName",
+                      "pathNode":
+                      {
+                        "id": 13,
+                        "name": "error",
+                        "nodeType": "IdentifierPath",
+                        "src": "95:5:1"
+                      },
+                      "src": "95:5:1",
+                      "typeDescriptions": {}
+                    },
+                    "visibility": "internal"
+                  }
+                ],
+                "id": 16,
+                "nodeType": "VariableDeclarationStatement",
+                "src": "95:7:1"
+              },
+              {
+                "eventCall":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "id": 17,
+                    "name": "E",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "src": "110:1:1",
+                    "typeDescriptions": {}
+                  },
+                  "id": 18,
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "110:3:1",
+                  "tryCall": false,
+                  "typeDescriptions": {}
+                },
+                "id": 19,
+                "nodeType": "EmitStatement",
+                "src": "105:8:1"
+              },
+              {
+                "expression":
+                {
+                  "id": 21,
+                  "nodeType": "UnaryOperation",
+                  "operator": "++",
+                  "prefix": true,
+                  "src": "123:3:1",
+                  "subExpression":
+                  {
+                    "id": 20,
+                    "name": "c",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "src": "125:1:1",
+                    "typeDescriptions": {}
+                  },
+                  "typeDescriptions": {}
+                },
+                "id": 22,
+                "nodeType": "ExpressionStatement",
+                "src": "123:3:1"
+              },
+              {
+                "assignments":
+                [
+                  24
+                ],
+                "declarations":
+                [
+                  {
+                    "constant": false,
+                    "id": 24,
+                    "mutability": "mutable",
+                    "name": "c",
+                    "nameLocation": "143:1:1",
+                    "nodeType": "VariableDeclaration",
+                    "scope": 27,
+                    "src": "129:15:1",
+                    "stateVariable": false,
+                    "storageLocation": "calldata",
+                    "typeDescriptions": {},
+                    "typeName":
+                    {
+                      "id": 23,
+                      "name": "uint",
+                      "nodeType": "ElementaryTypeName",
+                      "src": "129:4:1",
+                      "typeDescriptions": {}
+                    },
+                    "visibility": "internal"
+                  }
+                ],
+                "id": 26,
+                "initialValue":
+                {
+                  "hexValue": "3132332e34",
+                  "id": 25,
+                  "kind": "number",
+                  "nodeType": "Literal",
+                  "src": "147:5:1",
+                  "typeDescriptions": {},
+                  "value": "123.4"
+                },
+                "nodeType": "VariableDeclarationStatement",
+                "src": "129:23:1"
+              }
+            ]
+          },
+          "id": 28,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "70:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 11,
+            "nodeType": "ParameterList",
+            "parameters":
+            [
+              {
+                "constant": false,
+                "id": 10,
+                "mutability": "mutable",
+                "name": "e",
+                "nameLocation": "82:1:1",
+                "nodeType": "VariableDeclaration",
+                "scope": 28,
+                "src": "72:11:1",
+                "stateVariable": false,
+                "storageLocation": "storage",
+                "typeDescriptions": {},
+                "typeName":
+                {
+                  "id": 9,
+                  "nodeType": "UserDefinedTypeName",
+                  "pathNode":
+                  {
+                    "id": 8,
+                    "name": "E",
+                    "nodeType": "IdentifierPath",
+                    "src": "72:1:1"
+                  },
+                  "src": "72:1:1",
+                  "typeDescriptions": {}
+                },
+                "visibility": "internal"
+              }
+            ],
+            "src": "71:13:1"
+          },
+          "returnParameters":
+          {
+            "id": 12,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "85:0:1"
+          },
+          "scope": 29,
+          "src": "61:98:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 30,
+      "src": "21:140:1",
+      "usedErrors": []
+    }
+  ],
+  "src": "0:162:1"
+}
diff --git a/test/libsolidity/ASTJSON/fail_after_parsing.sol b/test/libsolidity/ASTJSON/fail_after_parsing.sol
new file mode 100644
index 0000000000..b3b53a7c16
--- /dev/null
+++ b/test/libsolidity/ASTJSON/fail_after_parsing.sol
@@ -0,0 +1,16 @@
+function g() public;
+
+interface I {
+    struct S { S s; }
+
+    function f(E storage e) {
+        error E;
+        emit E();
+
+        ++c;
+        uint calldata c = 123.4;
+    }
+}
+
+// ----
+// failAfter: Parsed
diff --git a/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json b/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
new file mode 100644
index 0000000000..a5c7669ef5
--- /dev/null
+++ b/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
@@ -0,0 +1,283 @@
+{
+  "absolutePath": "a",
+  "id": 30,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "id": 3,
+      "implemented": false,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "g",
+      "nameLocation": "9:1:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 1,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "10:2:1"
+      },
+      "returnParameters":
+      {
+        "id": 2,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "19:0:1"
+      },
+      "src": "0:20:1",
+      "stateMutability": "nonpayable",
+      "virtual": false,
+      "visibility": "public"
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "contractDependencies": [],
+      "contractKind": "interface",
+      "id": 29,
+      "name": "I",
+      "nameLocation": "31:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "id": 7,
+          "members":
+          [
+            {
+              "constant": false,
+              "id": 6,
+              "mutability": "mutable",
+              "name": "s",
+              "nameLocation": "52:1:1",
+              "nodeType": "VariableDeclaration",
+              "src": "50:3:1",
+              "stateVariable": false,
+              "storageLocation": "default",
+              "typeDescriptions": {},
+              "typeName":
+              {
+                "id": 5,
+                "nodeType": "UserDefinedTypeName",
+                "pathNode":
+                {
+                  "id": 4,
+                  "name": "S",
+                  "nodeType": "IdentifierPath",
+                  "src": "50:1:1"
+                },
+                "src": "50:1:1",
+                "typeDescriptions": {}
+              },
+              "visibility": "internal"
+            }
+          ],
+          "name": "S",
+          "nameLocation": "46:1:1",
+          "nodeType": "StructDefinition",
+          "src": "39:17:1",
+          "visibility": "public"
+        },
+        {
+          "body":
+          {
+            "id": 27,
+            "nodeType": "Block",
+            "src": "85:88:1",
+            "statements":
+            [
+              {
+                "assignments":
+                [
+                  15
+                ],
+                "declarations":
+                [
+                  {
+                    "constant": false,
+                    "id": 15,
+                    "mutability": "mutable",
+                    "name": "E",
+                    "nameLocation": "101:1:1",
+                    "nodeType": "VariableDeclaration",
+                    "src": "95:7:1",
+                    "stateVariable": false,
+                    "storageLocation": "default",
+                    "typeDescriptions": {},
+                    "typeName":
+                    {
+                      "id": 14,
+                      "nodeType": "UserDefinedTypeName",
+                      "pathNode":
+                      {
+                        "id": 13,
+                        "name": "error",
+                        "nodeType": "IdentifierPath",
+                        "src": "95:5:1"
+                      },
+                      "src": "95:5:1",
+                      "typeDescriptions": {}
+                    },
+                    "visibility": "internal"
+                  }
+                ],
+                "id": 16,
+                "nodeType": "VariableDeclarationStatement",
+                "src": "95:7:1"
+              },
+              {
+                "eventCall":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "id": 17,
+                    "name": "E",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "src": "117:1:1",
+                    "typeDescriptions": {}
+                  },
+                  "id": 18,
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "117:3:1",
+                  "tryCall": false,
+                  "typeDescriptions": {}
+                },
+                "id": 19,
+                "nodeType": "EmitStatement",
+                "src": "112:8:1"
+              },
+              {
+                "expression":
+                {
+                  "id": 21,
+                  "nodeType": "UnaryOperation",
+                  "operator": "++",
+                  "prefix": true,
+                  "src": "130:3:1",
+                  "subExpression":
+                  {
+                    "id": 20,
+                    "name": "c",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "src": "132:1:1",
+                    "typeDescriptions": {}
+                  },
+                  "typeDescriptions": {}
+                },
+                "id": 22,
+                "nodeType": "ExpressionStatement",
+                "src": "130:3:1"
+              },
+              {
+                "assignments":
+                [
+                  24
+                ],
+                "declarations":
+                [
+                  {
+                    "constant": false,
+                    "id": 24,
+                    "mutability": "mutable",
+                    "name": "c",
+                    "nameLocation": "157:1:1",
+                    "nodeType": "VariableDeclaration",
+                    "src": "143:15:1",
+                    "stateVariable": false,
+                    "storageLocation": "calldata",
+                    "typeDescriptions": {},
+                    "typeName":
+                    {
+                      "id": 23,
+                      "name": "uint",
+                      "nodeType": "ElementaryTypeName",
+                      "src": "143:4:1",
+                      "typeDescriptions": {}
+                    },
+                    "visibility": "internal"
+                  }
+                ],
+                "id": 26,
+                "initialValue":
+                {
+                  "hexValue": "3132332e34",
+                  "id": 25,
+                  "kind": "number",
+                  "nodeType": "Literal",
+                  "src": "161:5:1",
+                  "typeDescriptions": {},
+                  "value": "123.4"
+                },
+                "nodeType": "VariableDeclarationStatement",
+                "src": "143:23:1"
+              }
+            ]
+          },
+          "id": 28,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "70:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 11,
+            "nodeType": "ParameterList",
+            "parameters":
+            [
+              {
+                "constant": false,
+                "id": 10,
+                "mutability": "mutable",
+                "name": "e",
+                "nameLocation": "82:1:1",
+                "nodeType": "VariableDeclaration",
+                "src": "72:11:1",
+                "stateVariable": false,
+                "storageLocation": "storage",
+                "typeDescriptions": {},
+                "typeName":
+                {
+                  "id": 9,
+                  "nodeType": "UserDefinedTypeName",
+                  "pathNode":
+                  {
+                    "id": 8,
+                    "name": "E",
+                    "nodeType": "IdentifierPath",
+                    "src": "72:1:1"
+                  },
+                  "src": "72:1:1",
+                  "typeDescriptions": {}
+                },
+                "visibility": "internal"
+              }
+            ],
+            "src": "71:13:1"
+          },
+          "returnParameters":
+          {
+            "id": 12,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "85:0:1"
+          },
+          "src": "61:112:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "src": "21:154:1",
+      "usedErrors": []
+    }
+  ],
+  "src": "0:176:1"
+}

From 4c1224e3bf4d9690fb67b9f16c6221493edeb286 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman@codepoets.it>
Date: Wed, 23 Feb 2022 14:57:57 +0100
Subject: [PATCH 0478/1748] Generate ASTJSONTest variants only if a file with
 expected result exists

---
 .../ASTJSON/assembly/nested_functions.json    |  2 +-
 .../assembly/nested_functions_parseOnly.json  |  2 +-
 ...vent_with_variables_of_internal_types.json |  0
 test/libsolidity/ASTJSONTest.cpp              | 61 +++++++++++++------
 4 files changed, 43 insertions(+), 22 deletions(-)
 delete mode 100644 test/libsolidity/ASTJSON/event_with_variables_of_internal_types.json

diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions.json b/test/libsolidity/ASTJSON/assembly/nested_functions.json
index 2ba3bd03a9..41a18a1d0e 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions.json
@@ -89,7 +89,7 @@
                     }
                   ]
                 },
-                "evmVersion": "london",
+                "evmVersion": %EVMVERSION%,
                 "externalReferences":
                 [
                   {
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
index 94b69a7615..f5f5546080 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
@@ -76,7 +76,7 @@
                     }
                   ]
                 },
-                "evmVersion": "london",
+                "evmVersion": %EVMVERSION%,
                 "externalReferences": [],
                 "id": 5,
                 "nodeType": "InlineAssembly",
diff --git a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.json b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.json
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index 0dbf484480..f6c40371d8 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -50,14 +50,29 @@ namespace
 
 string const sourceDelimiter("==== Source: ");
 
-const map<string, CompilerStack::State> compilerStateMap = {
-	{"Empty", CompilerStack::State::Empty},
-	{"SourcesSet", CompilerStack::State::SourcesSet},
-	{"Parsed", CompilerStack::State::Parsed},
-	{"ParsedAndImported", CompilerStack::State::ParsedAndImported},
-	{"AnalysisPerformed", CompilerStack::State::AnalysisPerformed},
-	{"CompilationSuccessful", CompilerStack::State::CompilationSuccessful}
-};
+string compilerStateToString(CompilerStack::State _state)
+{
+	switch (_state)
+	{
+		case CompilerStack::State::Empty: return "Empty";
+		case CompilerStack::State::SourcesSet: return "SourcesSet";
+		case CompilerStack::State::Parsed: return "Parsed";
+		case CompilerStack::State::ParsedAndImported: return "ParsedAndImported";
+		case CompilerStack::State::AnalysisPerformed: return "AnalysisPerformed";
+		case CompilerStack::State::CompilationSuccessful: return "CompilationSuccessful";
+	}
+	soltestAssert(false, "Unexpected value of state parameter");
+}
+
+CompilerStack::State stringToCompilerState(const string& _state)
+{
+	for (unsigned int i = CompilerStack::State::Empty; i <= CompilerStack::State::CompilationSuccessful; ++i)
+	{
+		if (_state == compilerStateToString(CompilerStack::State(i)))
+			return CompilerStack::State(i);
+	}
+	BOOST_THROW_EXCEPTION(runtime_error("Unsupported compiler state (" + _state + ") in test contract file"));
+}
 
 void replaceVersionWithTag(string& _input)
 {
@@ -88,11 +103,25 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
 	string_view baseName = _filename;
 	baseName.remove_suffix(4);
 
-	m_variants = {
-		TestVariant(baseName, CompilerStack::State::Parsed),
-		TestVariant(baseName, CompilerStack::State::AnalysisPerformed),
+	const std::vector<CompilerStack::State> variantCompileStates = {
+		CompilerStack::State::Parsed,
+		CompilerStack::State::AnalysisPerformed
 	};
 
+	for (const auto state: variantCompileStates)
+	{
+		auto variant = TestVariant(baseName, state);
+		if (boost::filesystem::exists(variant.astFilename()))
+		{
+			variant.expectation = readFileAsString(variant.astFilename());
+			boost::replace_all(variant.expectation, "\r\n", "\n");
+			m_variants.push_back(variant);
+		}
+	}
+
+	if (m_variants.empty())
+		BOOST_THROW_EXCEPTION(runtime_error("Missing file with expected result for: \"" + _filename + "\"."));
+
 	ifstream file(_filename);
 	if (!file)
 		BOOST_THROW_EXCEPTION(runtime_error("Cannot open test contract: \"" + _filename + "\"."));
@@ -120,11 +149,9 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
 		{
 			string state = line.substr(failMarker.size());
 			boost::algorithm::trim(state);
-			if (compilerStateMap.find(state) == compilerStateMap.end())
-				BOOST_THROW_EXCEPTION(runtime_error("Unsupported compiler state (" + state + ") in test contract file"));
 			if (m_expectedFailAfter.has_value())
 				BOOST_THROW_EXCEPTION(runtime_error("Duplicated \"failAfter\" directive"));
-			m_expectedFailAfter = compilerStateMap.at(state);
+			m_expectedFailAfter = stringToCompilerState(state);
 		}
 		else if (!line.empty() && !boost::algorithm::starts_with(line, delimiter))
 			source += line + "\n";
@@ -132,12 +159,6 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
 
 	m_sources.emplace_back(sourceName.empty() ? "a" : sourceName, source);
 	file.close();
-
-	for (TestVariant& variant: m_variants)
-	{
-		variant.expectation = readFileAsString(variant.astFilename());
-		boost::replace_all(variant.expectation, "\r\n", "\n");
-	}
 }
 
 TestCase::TestResult ASTJSONTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)

From 8a254b7a7f1d985a72b506b0a9447407bf012822 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Mon, 7 Mar 2022 14:21:27 +0100
Subject: [PATCH 0479/1748] Use sol file to validate test variants

---
 .../ASTJSON/fail_after_parsing.json           | 310 ------------------
 .../ASTJSON/not_existing_import.json          | 108 ------
 test/libsolidity/ASTJSONTest.cpp              |  47 ++-
 test/libsolidity/ASTJSONTest.h                |   4 +
 4 files changed, 42 insertions(+), 427 deletions(-)
 delete mode 100644 test/libsolidity/ASTJSON/fail_after_parsing.json
 delete mode 100644 test/libsolidity/ASTJSON/not_existing_import.json

diff --git a/test/libsolidity/ASTJSON/fail_after_parsing.json b/test/libsolidity/ASTJSON/fail_after_parsing.json
deleted file mode 100644
index 11cb47f355..0000000000
--- a/test/libsolidity/ASTJSON/fail_after_parsing.json
+++ /dev/null
@@ -1,310 +0,0 @@
-{
-  "absolutePath": "a",
-  "exportedSymbols":
-  {
-    "I":
-    [
-      29
-    ],
-    "g":
-    [
-      3
-    ]
-  },
-  "id": 30,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 3,
-      "implemented": false,
-      "kind": "freeFunction",
-      "modifiers": [],
-      "name": "g",
-      "nameLocation": "9:1:1",
-      "nodeType": "FunctionDefinition",
-      "parameters":
-      {
-        "id": 1,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "10:2:1"
-      },
-      "returnParameters":
-      {
-        "id": 2,
-        "nodeType": "ParameterList",
-        "parameters": [],
-        "src": "19:0:1"
-      },
-      "scope": 30,
-      "src": "0:20:1",
-      "stateMutability": "nonpayable",
-      "virtual": false,
-      "visibility": "public"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "I",
-      "contractDependencies": [],
-      "contractKind": "interface",
-      "id": 29,
-      "linearizedBaseContracts":
-      [
-        29
-      ],
-      "name": "I",
-      "nameLocation": "31:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "canonicalName": "I.S",
-          "id": 7,
-          "members":
-          [
-            {
-              "constant": false,
-              "id": 6,
-              "mutability": "mutable",
-              "name": "s",
-              "nameLocation": "52:1:1",
-              "nodeType": "VariableDeclaration",
-              "scope": 7,
-              "src": "50:3:1",
-              "stateVariable": false,
-              "storageLocation": "default",
-              "typeDescriptions": {},
-              "typeName":
-              {
-                "id": 5,
-                "nodeType": "UserDefinedTypeName",
-                "pathNode":
-                {
-                  "id": 4,
-                  "name": "S",
-                  "nodeType": "IdentifierPath",
-                  "referencedDeclaration": 7,
-                  "src": "50:1:1"
-                },
-                "referencedDeclaration": 7,
-                "src": "50:1:1",
-                "typeDescriptions": {}
-              },
-              "visibility": "internal"
-            }
-          ],
-          "name": "S",
-          "nameLocation": "46:1:1",
-          "nodeType": "StructDefinition",
-          "scope": 29,
-          "src": "39:17:1",
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 27,
-            "nodeType": "Block",
-            "src": "85:74:1",
-            "statements":
-            [
-              {
-                "assignments":
-                [
-                  15
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 15,
-                    "mutability": "mutable",
-                    "name": "E",
-                    "nameLocation": "101:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 27,
-                    "src": "95:7:1",
-                    "stateVariable": false,
-                    "storageLocation": "default",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 14,
-                      "nodeType": "UserDefinedTypeName",
-                      "pathNode":
-                      {
-                        "id": 13,
-                        "name": "error",
-                        "nodeType": "IdentifierPath",
-                        "src": "95:5:1"
-                      },
-                      "src": "95:5:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 16,
-                "nodeType": "VariableDeclarationStatement",
-                "src": "95:7:1"
-              },
-              {
-                "eventCall":
-                {
-                  "arguments": [],
-                  "expression":
-                  {
-                    "id": 17,
-                    "name": "E",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "110:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "id": 18,
-                  "names": [],
-                  "nodeType": "FunctionCall",
-                  "src": "110:3:1",
-                  "tryCall": false,
-                  "typeDescriptions": {}
-                },
-                "id": 19,
-                "nodeType": "EmitStatement",
-                "src": "105:8:1"
-              },
-              {
-                "expression":
-                {
-                  "id": 21,
-                  "nodeType": "UnaryOperation",
-                  "operator": "++",
-                  "prefix": true,
-                  "src": "123:3:1",
-                  "subExpression":
-                  {
-                    "id": 20,
-                    "name": "c",
-                    "nodeType": "Identifier",
-                    "overloadedDeclarations": [],
-                    "src": "125:1:1",
-                    "typeDescriptions": {}
-                  },
-                  "typeDescriptions": {}
-                },
-                "id": 22,
-                "nodeType": "ExpressionStatement",
-                "src": "123:3:1"
-              },
-              {
-                "assignments":
-                [
-                  24
-                ],
-                "declarations":
-                [
-                  {
-                    "constant": false,
-                    "id": 24,
-                    "mutability": "mutable",
-                    "name": "c",
-                    "nameLocation": "143:1:1",
-                    "nodeType": "VariableDeclaration",
-                    "scope": 27,
-                    "src": "129:15:1",
-                    "stateVariable": false,
-                    "storageLocation": "calldata",
-                    "typeDescriptions": {},
-                    "typeName":
-                    {
-                      "id": 23,
-                      "name": "uint",
-                      "nodeType": "ElementaryTypeName",
-                      "src": "129:4:1",
-                      "typeDescriptions": {}
-                    },
-                    "visibility": "internal"
-                  }
-                ],
-                "id": 26,
-                "initialValue":
-                {
-                  "hexValue": "3132332e34",
-                  "id": 25,
-                  "kind": "number",
-                  "nodeType": "Literal",
-                  "src": "147:5:1",
-                  "typeDescriptions": {},
-                  "value": "123.4"
-                },
-                "nodeType": "VariableDeclarationStatement",
-                "src": "129:23:1"
-              }
-            ]
-          },
-          "id": 28,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "f",
-          "nameLocation": "70:1:1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 11,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 10,
-                "mutability": "mutable",
-                "name": "e",
-                "nameLocation": "82:1:1",
-                "nodeType": "VariableDeclaration",
-                "scope": 28,
-                "src": "72:11:1",
-                "stateVariable": false,
-                "storageLocation": "storage",
-                "typeDescriptions": {},
-                "typeName":
-                {
-                  "id": 9,
-                  "nodeType": "UserDefinedTypeName",
-                  "pathNode":
-                  {
-                    "id": 8,
-                    "name": "E",
-                    "nodeType": "IdentifierPath",
-                    "src": "72:1:1"
-                  },
-                  "src": "72:1:1",
-                  "typeDescriptions": {}
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "71:13:1"
-          },
-          "returnParameters":
-          {
-            "id": 12,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "85:0:1"
-          },
-          "scope": 29,
-          "src": "61:98:1",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 30,
-      "src": "21:140:1",
-      "usedErrors": []
-    }
-  ],
-  "src": "0:162:1"
-}
diff --git a/test/libsolidity/ASTJSON/not_existing_import.json b/test/libsolidity/ASTJSON/not_existing_import.json
deleted file mode 100644
index a36c59fffb..0000000000
--- a/test/libsolidity/ASTJSON/not_existing_import.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-  "absolutePath": "a",
-  "id": 12,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "absolutePath": "notexisting.sol",
-      "file": "notexisting.sol",
-      "id": 1,
-      "nameLocation": "28:11:1",
-      "nodeType": "ImportDirective",
-      "src": "0:40:1",
-      "symbolAliases": [],
-      "unitAlias": "NotExisting"
-    },
-    {
-      "abstract": false,
-      "baseContracts":
-      [
-        {
-          "baseName":
-          {
-            "id": 2,
-            "name": "NotExisting.X",
-            "nodeType": "IdentifierPath",
-            "src": "55:13:1"
-          },
-          "id": 3,
-          "nodeType": "InheritanceSpecifier",
-          "src": "55:13:1"
-        }
-      ],
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "id": 11,
-      "name": "C",
-      "nameLocation": "50:1:1",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "constant": false,
-          "id": 6,
-          "mutability": "mutable",
-          "name": "myStruct",
-          "nameLocation": "102:8:1",
-          "nodeType": "VariableDeclaration",
-          "src": "72:38:1",
-          "stateVariable": false,
-          "storageLocation": "default",
-          "typeDescriptions": {},
-          "typeName":
-          {
-            "id": 5,
-            "nodeType": "UserDefinedTypeName",
-            "pathNode":
-            {
-              "id": 4,
-              "name": "NotExisting.SomeStruct",
-              "nodeType": "IdentifierPath",
-              "src": "72:22:1"
-            },
-            "src": "72:22:1",
-            "typeDescriptions": {}
-          },
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 9,
-            "nodeType": "Block",
-            "src": "127:2:1",
-            "statements": []
-          },
-          "id": 10,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 7,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "124:2:1"
-          },
-          "returnParameters":
-          {
-            "id": 8,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "127:0:1"
-          },
-          "src": "113:16:1",
-          "stateMutability": "nonpayable",
-          "virtual": false
-        }
-      ],
-      "src": "41:90:1",
-      "usedErrors": []
-    }
-  ],
-  "src": "0:132:1"
-}
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index f6c40371d8..14e2c2a8a4 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -94,12 +94,8 @@ void replaceTagWithVersion(string& _input)
 
 }
 
-
-ASTJSONTest::ASTJSONTest(string const& _filename)
+void ASTJSONTest::generateTestVariants(string const& _filename)
 {
-	if (!boost::algorithm::ends_with(_filename, ".sol"))
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid test contract file name: \"" + _filename + "\"."));
-
 	string_view baseName = _filename;
 	baseName.remove_suffix(4);
 
@@ -118,10 +114,10 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
 			m_variants.push_back(variant);
 		}
 	}
+}
 
-	if (m_variants.empty())
-		BOOST_THROW_EXCEPTION(runtime_error("Missing file with expected result for: \"" + _filename + "\"."));
-
+void ASTJSONTest::fillSources(string const& _filename)
+{
 	ifstream file(_filename);
 	if (!file)
 		BOOST_THROW_EXCEPTION(runtime_error("Cannot open test contract: \"" + _filename + "\"."));
@@ -152,15 +148,48 @@ ASTJSONTest::ASTJSONTest(string const& _filename)
 			if (m_expectedFailAfter.has_value())
 				BOOST_THROW_EXCEPTION(runtime_error("Duplicated \"failAfter\" directive"));
 			m_expectedFailAfter = stringToCompilerState(state);
+
 		}
 		else if (!line.empty() && !boost::algorithm::starts_with(line, delimiter))
 			source += line + "\n";
 	}
-
 	m_sources.emplace_back(sourceName.empty() ? "a" : sourceName, source);
 	file.close();
 }
 
+void ASTJSONTest::validateTestConfiguration() const
+{
+	if (m_variants.empty())
+		BOOST_THROW_EXCEPTION(runtime_error("No file with expected result found."));
+
+	if (m_expectedFailAfter.has_value())
+	{
+		auto unexpectedTestVariant = std::find_if(
+			m_variants.begin(), m_variants.end(),
+			[failAfter = m_expectedFailAfter](TestVariant v) { return v.stopAfter > failAfter; }
+		);
+
+		if (unexpectedTestVariant != m_variants.end())
+			BOOST_THROW_EXCEPTION(
+				runtime_error(
+					string("Unexpected JSON file: ") + unexpectedTestVariant->astFilename() +
+					" in \"failAfter: " +
+					compilerStateToString(m_expectedFailAfter.value()) + "\" scenario."
+				)
+			);
+	}
+}
+
+ASTJSONTest::ASTJSONTest(string const& _filename)
+{
+	if (!boost::algorithm::ends_with(_filename, ".sol"))
+		BOOST_THROW_EXCEPTION(runtime_error("Invalid test contract file name: \"" + _filename + "\"."));
+
+	generateTestVariants(_filename);
+	fillSources(_filename);
+	validateTestConfiguration();
+}
+
 TestCase::TestResult ASTJSONTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
 {
 	CompilerStack c;
diff --git a/test/libsolidity/ASTJSONTest.h b/test/libsolidity/ASTJSONTest.h
index 97cea184bb..648f3bbc32 100644
--- a/test/libsolidity/ASTJSONTest.h
+++ b/test/libsolidity/ASTJSONTest.h
@@ -89,6 +89,10 @@ class ASTJSONTest: public TestCase
 		std::string const& _variant
 	) const;
 
+	void generateTestVariants(std::string const& _filename);
+	void fillSources(std::string const& _filename);
+	void validateTestConfiguration() const;
+
 	std::vector<TestVariant> m_variants;
 	std::optional<CompilerStack::State> m_expectedFailAfter;
 

From e58c0b561d700d3c0331202f23713b9d40c0c3e5 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 9 Mar 2022 16:02:31 +0100
Subject: [PATCH 0480/1748] Mark viaIR code generation as non-experimental.

---
 Changelog.md                                  |  2 ++
 docs/internals/layout_in_storage.rst          |  3 +-
 docs/internals/optimizer.rst                  |  2 +-
 docs/ir-breaking-changes.rst                  |  6 +---
 docs/using-the-compiler.rst                   |  2 +-
 libsolidity/codegen/ir/IRGenerator.cpp        | 12 ++-----
 libsolidity/interface/CompilerStack.cpp       |  2 +-
 libsolidity/interface/CompilerStack.h         |  9 +++--
 solc/CommandLineInterface.cpp                 |  2 +-
 solc/CommandLineParser.cpp                    | 16 ++++++---
 solc/CommandLineParser.h                      |  2 +-
 test/cmdlineTests.sh                          |  6 ++--
 .../constant_optimizer_yul/output             |  7 ----
 .../output                                    | 14 --------
 .../output                                    | 14 --------
 .../output                                    | 14 --------
 .../debug_info_in_yul_snippet_escaping/output | 34 ------------------
 test/cmdlineTests/exp_base_literal/output     |  7 ----
 .../function_debug_info_via_yul/args          |  2 +-
 .../inline_assembly_function_name_clash/args  |  2 +-
 .../output                                    | 14 --------
 .../ir_compiler_subobjects/output             | 14 --------
 .../output                                    |  7 ----
 .../output                                    |  7 ----
 .../keccak_optimization_deploy_code/output    |  7 ----
 .../keccak_optimization_low_runs/output       |  7 ----
 test/cmdlineTests/name_simplifier/output      |  7 ----
 .../cmdlineTests/optimizer_array_sload/output |  7 ----
 test/cmdlineTests/revert_strings/output       |  7 ----
 .../output.json                               | 18 ++--------
 .../output.json                               | 18 ++--------
 .../output.json                               | 18 ++--------
 .../output.json                               | 36 +++----------------
 .../output.json                               |  9 +----
 .../standard_ir_requested/output.json         |  9 +----
 .../standard_viair_requested/output.json      | 24 ++-----------
 test/cmdlineTests/viair_abicoder_v1/output    |  7 ----
 test/cmdlineTests/viair_subobjects/args       |  2 +-
 test/cmdlineTests/viair_subobjects/output     | 14 --------
 test/cmdlineTests/yul_optimizer_steps/output  |  7 ----
 .../output                                    |  7 ----
 .../yul_string_format_ascii/output.json       |  9 +----
 .../output.json                               |  9 +----
 .../output.json                               |  9 +----
 .../yul_string_format_ascii_long/output.json  |  9 +----
 .../yul_string_format_hex/output.json         |  9 +----
 test/libsolidity/Metadata.cpp                 |  8 +----
 test/solc/CommandLineParser.cpp               | 13 +++++--
 48 files changed, 63 insertions(+), 407 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c7bf10c8a3..50dc4540e4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,8 @@ Language Features:
 
 
 Compiler Features:
+ * Commandline Interface: Allow the use of ``--via-ir`` in place of ``--experimental-via-ir``.
+ * Compilation via Yul IR is no longer marked as experimental.
  * JSON-AST: Added selector field for errors and events.
  * LSP: Implements goto-definition.
  * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump.
diff --git a/docs/internals/layout_in_storage.rst b/docs/internals/layout_in_storage.rst
index 4682d640c1..599cd03d3e 100644
--- a/docs/internals/layout_in_storage.rst
+++ b/docs/internals/layout_in_storage.rst
@@ -140,8 +140,7 @@ by checking if the lowest bit is set: short (not set) and long (set).
 
 .. note::
   Handling invalidly encoded slots is currently not supported but may be added in the future.
-  If you are compiling via the experimental IR-based compiler pipeline, reading an invalidly encoded
-  slot results in a ``Panic(0x22)`` error.
+  If you are compiling via IR, reading an invalidly encoded slot results in a ``Panic(0x22)`` error.
 
 JSON Output
 ===========
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index a7eff7346b..1d6c214e5f 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -23,7 +23,7 @@ call completely.
 Currently, the parameter ``--optimize`` activates the opcode-based optimizer for the
 generated bytecode and the Yul optimizer for the Yul code generated internally, for example for ABI coder v2.
 One can use ``solc --ir-optimized --optimize`` to produce an
-optimized experimental Yul IR for a Solidity source. Similarly, one can use ``solc --strict-assembly --optimize``
+optimized Yul IR for a Solidity source. Similarly, one can use ``solc --strict-assembly --optimize``
 for a stand-alone Yul mode.
 
 You can find more details on both optimizer modules and their optimization steps below.
diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index 3fce53b3b8..f235accafc 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -15,11 +15,7 @@ The IR-based code generator was introduced with an aim to not only allow
 code generation to be more transparent and auditable but also
 to enable more powerful optimization passes that span across functions.
 
-Currently, the IR-based code generator is still marked experimental,
-but it supports all language features and has received a lot of testing,
-so we consider it almost ready for production use.
-
-You can enable it on the command line using ``--experimental-via-ir``
+You can enable it on the command line using ``--via-ir``
 or with the option ``{"viaIR": true}`` in standard-json and we
 encourage everyone to try it out!
 
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 067c96c96f..3c2ec38f9b 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -298,7 +298,7 @@ Input Description
         // tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg, istanbul or berlin
         "evmVersion": "byzantium",
         // Optional: Change compilation pipeline to go through the Yul intermediate representation.
-        // This is a highly EXPERIMENTAL feature, not to be used for production. This is false by default.
+        // This is false by default.
         "viaIR": true,
         // Optional: Debugging settings
         "debug": {
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 672520c6d4..cb62cc292a 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -93,7 +93,7 @@ pair<string, string> IRGenerator::run(
 	map<ContractDefinition const*, string_view const> const& _otherYulSources
 )
 {
-	string const ir = yul::reindent(generate(_contract, _cborMetadata, _otherYulSources));
+	string ir = yul::reindent(generate(_contract, _cborMetadata, _otherYulSources));
 
 	yul::AssemblyStack asmStack(
 		m_evmVersion,
@@ -113,15 +113,7 @@ pair<string, string> IRGenerator::run(
 	}
 	asmStack.optimize();
 
-	string warning =
-		"/*=====================================================*\n"
-		" *                       WARNING                       *\n"
-		" *  Solidity to Yul compilation is still EXPERIMENTAL  *\n"
-		" *       It can result in LOSS OF FUNDS or worse       *\n"
-		" *                !USE AT YOUR OWN RISK!               *\n"
-		" *=====================================================*/\n\n";
-
-	return {warning + ir, warning + asmStack.print(m_context.soliditySourceProvider())};
+	return {move(ir), asmStack.print(m_context.soliditySourceProvider())};
 }
 
 string IRGenerator::generate(
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 3eb25987db..de5bea1374 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1677,7 +1677,7 @@ bytes CompilerStack::createCBORMetadata(Contract const& _contract, bool _forIR)
 	else
 		solAssert(m_metadataHash == MetadataHash::None, "Invalid metadata hash");
 
-	if (experimentalMode || _forIR)
+	if (experimentalMode)
 		encoder.pushBool("experimental", true);
 	if (m_metadataFormat == MetadataFormat::WithReleaseVersionTag)
 		encoder.pushBytes("solc", VersionCompactBytes);
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index c1f15a4804..e5bc9b3458 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -189,7 +189,7 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// Enable EVM Bytecode generation. This is enabled by default.
 	void enableEvmBytecodeGeneration(bool _enable = true) { m_generateEvmBytecode = _enable; }
 
-	/// Enable experimental generation of Yul IR code.
+	/// Enable generation of Yul IR code.
 	void enableIRGeneration(bool _enable = true) { m_generateIR = _enable; }
 
 	/// Enable experimental generation of Ewasm code. If enabled, IR is also generated.
@@ -373,8 +373,8 @@ class CompilerStack: public langutil::CharStreamProvider
 		std::shared_ptr<evmasm::Assembly> evmRuntimeAssembly;
 		evmasm::LinkerObject object; ///< Deployment object (includes the runtime sub-object).
 		evmasm::LinkerObject runtimeObject; ///< Runtime object.
-		std::string yulIR; ///< Experimental Yul IR code.
-		std::string yulIROptimized; ///< Optimized experimental Yul IR code.
+		std::string yulIR; ///< Yul IR code.
+		std::string yulIROptimized; ///< Optimized Yul IR code.
 		std::string ewasm; ///< Experimental Ewasm text representation
 		evmasm::LinkerObject ewasmObject; ///< Experimental Ewasm code
 		util::LazyInit<std::string const> metadata; ///< The metadata json that will be hashed into the chain.
@@ -447,8 +447,7 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// Can only be called after state is SourcesSet.
 	Source const& source(std::string const& _sourceName) const;
 
-	/// @param _forIR If true, include a flag that indicates that the bytecode comes from the
-	///               experimental IR codegen.
+	/// @param _forIR If true, include a flag that indicates that the bytecode comes from IR codegen.
 	/// @returns the metadata JSON as a compact string for the given contract.
 	std::string createMetadata(Contract const& _contract, bool _forIR) const;
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 03679bd7c5..207160045d 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -693,7 +693,7 @@ void CommandLineInterface::compile()
 			m_compiler->setModelCheckerSettings(m_options.modelChecker.settings);
 		m_compiler->setRemappings(m_options.input.remappings);
 		m_compiler->setLibraries(m_options.linker.libraries);
-		m_compiler->setViaIR(m_options.output.experimentalViaIR);
+		m_compiler->setViaIR(m_options.output.viaIR);
 		m_compiler->setEVMVersion(m_options.output.evmVersion);
 		m_compiler->setRevertStringBehaviour(m_options.output.revertStrings);
 		if (m_options.output.debugInfoSelection.has_value())
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 8f6d549f20..4cc346737f 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -47,6 +47,7 @@ static string const g_strErrorRecovery = "error-recovery";
 static string const g_strEVM = "evm";
 static string const g_strEVMVersion = "evm-version";
 static string const g_strEwasm = "ewasm";
+static string const g_strViaIR = "via-ir";
 static string const g_strExperimentalViaIR = "experimental-via-ir";
 static string const g_strGas = "gas";
 static string const g_strHelp = "help";
@@ -225,7 +226,7 @@ bool CommandLineOptions::operator==(CommandLineOptions const& _other) const noex
 		output.dir == _other.output.dir &&
 		output.overwriteFiles == _other.output.overwriteFiles &&
 		output.evmVersion == _other.output.evmVersion &&
-		output.experimentalViaIR == _other.output.experimentalViaIR &&
+		output.viaIR == _other.output.viaIR &&
 		output.revertStrings == _other.output.revertStrings &&
 		output.debugInfoSelection == _other.output.debugInfoSelection &&
 		output.stopAfter == _other.output.stopAfter &&
@@ -578,7 +579,11 @@ General Information)").c_str(),
 		)
 		(
 			g_strExperimentalViaIR.c_str(),
-			"Turn on experimental compilation mode via the IR (EXPERIMENTAL)."
+			"Deprecated synonym of --via-ir."
+		)
+		(
+			g_strViaIR.c_str(),
+			"Turn on compilation mode via the IR."
 		)
 		(
 			g_strRevertStrings.c_str(),
@@ -706,8 +711,8 @@ General Information)").c_str(),
 		(CompilerOutputs::componentName(&CompilerOutputs::binary).c_str(), "Binary of the contracts in hex.")
 		(CompilerOutputs::componentName(&CompilerOutputs::binaryRuntime).c_str(), "Binary of the runtime part of the contracts in hex.")
 		(CompilerOutputs::componentName(&CompilerOutputs::abi).c_str(), "ABI specification of the contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::ir).c_str(), "Intermediate Representation (IR) of all contracts (EXPERIMENTAL).")
-		(CompilerOutputs::componentName(&CompilerOutputs::irOptimized).c_str(), "Optimized intermediate Representation (IR) of all contracts (EXPERIMENTAL).")
+		(CompilerOutputs::componentName(&CompilerOutputs::ir).c_str(), "Intermediate Representation (IR) of all contracts.")
+		(CompilerOutputs::componentName(&CompilerOutputs::irOptimized).c_str(), "Optimized intermediate Representation (IR) of all contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::ewasm).c_str(), "Ewasm text representation of all contracts (EXPERIMENTAL).")
 		(CompilerOutputs::componentName(&CompilerOutputs::ewasmIR).c_str(), "Intermediate representation (IR) converted to a form that can be translated directly into Ewasm text representation (EXPERIMENTAL).")
 		(CompilerOutputs::componentName(&CompilerOutputs::signatureHashes).c_str(), "Function signature hashes of the contracts.")
@@ -906,6 +911,7 @@ void CommandLineParser::processArgs()
 		// TODO: This should eventually contain all options.
 		{g_strErrorRecovery, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strExperimentalViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}}
 	};
 	vector<string> invalidOptionsForCurrentInputMode;
 	for (auto const& [optionName, inputModes]: validOptionInputModeCombinations)
@@ -1256,7 +1262,7 @@ void CommandLineParser::processArgs()
 		m_args.count(g_strModelCheckerSolvers) ||
 		m_args.count(g_strModelCheckerTargets) ||
 		m_args.count(g_strModelCheckerTimeout);
-	m_options.output.experimentalViaIR = (m_args.count(g_strExperimentalViaIR) > 0);
+	m_options.output.viaIR = (m_args.count(g_strExperimentalViaIR) > 0 || m_args.count(g_strViaIR) > 0);
 	if (m_options.input.mode == InputMode::Compiler)
 		m_options.input.errorRecovery = (m_args.count(g_strErrorRecovery) > 0);
 
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 791e7f1c10..9723d5e06e 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -182,7 +182,7 @@ struct CommandLineOptions
 		boost::filesystem::path dir;
 		bool overwriteFiles = false;
 		langutil::EVMVersion evmVersion;
-		bool experimentalViaIR = false;
+		bool viaIR = false;
 		RevertStrings revertStrings = RevertStrings::Default;
 		std::optional<langutil::DebugInfoSelection> debugInfoSelection;
 		CompilerStack::State stopAfter = CompilerStack::State::CompilationSuccessful;
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index d33dd208c1..6798a83f88 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -339,7 +339,7 @@ function test_via_ir_equivalence()
     )
     asm_output_via_ir=$(
         echo "$solidity_code" |
-        msg_on_error --no-stderr "$SOLC" - --experimental-via-ir --asm --debug-info location "${optimizer_flags[@]}" |
+        msg_on_error --no-stderr "$SOLC" - --via-ir --asm --debug-info location "${optimizer_flags[@]}" |
         sed '/^======= <stdin>/d' |
         sed '/^EVM assembly:$/d'
     )
@@ -355,7 +355,7 @@ function test_via_ir_equivalence()
     )
     bin_output_via_ir=$(
         echo "$solidity_code" |
-        msg_on_error --no-stderr "$SOLC" - --experimental-via-ir --bin "${optimizer_flags[@]}" |
+        msg_on_error --no-stderr "$SOLC" - --via-ir --bin "${optimizer_flags[@]}" |
         sed '/^======= <stdin>/d' |
         sed '/^Binary:$/d'
     )
@@ -588,7 +588,7 @@ printTask "Testing assemble, yul, strict-assembly and optimize..."
     test_solc_assembly_output "{ let x := 0 }" "{ { } }" "--strict-assembly --optimize"
 )
 
-printTask "Testing the eqivalence of --experimental-via-ir and a two-stage compilation..."
+printTask "Testing the eqivalence of --via-ir and a two-stage compilation..."
 (
     printTask " - Smoke test"
     test_via_ir_equivalence "contract C {}"
diff --git a/test/cmdlineTests/constant_optimizer_yul/output b/test/cmdlineTests/constant_optimizer_yul/output
index ae0b7a0f6c..9c7faa7322 100644
--- a/test/cmdlineTests/constant_optimizer_yul/output
+++ b/test/cmdlineTests/constant_optimizer_yul/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"constant_optimizer_yul/input.sol"
 object "C_12" {
     code {
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
index 3b0e1d3ba8..af83c9f36a 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
@@ -54,13 +54,6 @@ sub_0: assembly {
 }
 
 IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 
 /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_all/input.sol"
 object "C_6" {
@@ -176,13 +169,6 @@ object "C_6" {
 
 
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_all/input.sol"
 object "C_6" {
     code {
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
index 94d7481691..dc4ea45fd7 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
@@ -54,13 +54,6 @@ sub_0: assembly {
 }
 
 IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 
 /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_location_only/input.sol"
 object "C_6" {
@@ -175,13 +168,6 @@ object "C_6" {
 
 
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_location_only/input.sol"
 object "C_6" {
     code {
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
index 706b8f773f..b2ad57c308 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
@@ -51,13 +51,6 @@ sub_0: assembly {
 }
 
 IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 
 /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_none/input.sol"
 object "C_6" {
@@ -166,13 +159,6 @@ object "C_6" {
 
 
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"debug_info_in_yul_and_evm_asm_print_none/input.sol"
 object "C_6" {
     code {
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
index 1408b60210..04a354e2ed 100644
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
@@ -1,11 +1,4 @@
 IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 
 /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
 object "C_2" {
@@ -70,13 +63,6 @@ object "C_2" {
 
 
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
 object "C_2" {
     code {
@@ -103,13 +89,6 @@ object "C_2" {
 }
 
 IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 
 /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
 object "D_27" {
@@ -367,12 +346,6 @@ object "D_27" {
             /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
 
         }
-        /*=====================================================*
-        *                       WARNING                       *
-        *  Solidity to Yul compilation is still EXPERIMENTAL  *
-        *       It can result in LOSS OF FUNDS or worse       *
-        *                !USE AT YOUR OWN RISK!               *
-        *=====================================================*/
 
         /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
         object "C_2" {
@@ -442,13 +415,6 @@ object "D_27" {
 
 
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
 object "D_27" {
     code {
diff --git a/test/cmdlineTests/exp_base_literal/output b/test/cmdlineTests/exp_base_literal/output
index 7b6e6e628d..24e5d29be7 100644
--- a/test/cmdlineTests/exp_base_literal/output
+++ b/test/cmdlineTests/exp_base_literal/output
@@ -1,11 +1,4 @@
 IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 
 /// @use-src 0:"exp_base_literal/input.sol"
 object "C_81" {
diff --git a/test/cmdlineTests/function_debug_info_via_yul/args b/test/cmdlineTests/function_debug_info_via_yul/args
index ab626e663c..7b0bf90f14 100644
--- a/test/cmdlineTests/function_debug_info_via_yul/args
+++ b/test/cmdlineTests/function_debug_info_via_yul/args
@@ -1 +1 @@
---experimental-via-ir --optimize --combined-json function-debug,function-debug-runtime --pretty-json
+--via-ir --optimize --combined-json function-debug,function-debug-runtime --pretty-json
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/args b/test/cmdlineTests/inline_assembly_function_name_clash/args
index 4299d023e8..a4e76abf25 100644
--- a/test/cmdlineTests/inline_assembly_function_name_clash/args
+++ b/test/cmdlineTests/inline_assembly_function_name_clash/args
@@ -1 +1 @@
---experimental-via-ir --combined-json function-debug-runtime --pretty-json --json-indent 4
\ No newline at end of file
+--via-ir --combined-json function-debug-runtime --pretty-json --json-indent 4
\ No newline at end of file
diff --git a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
index 5246a50ee6..84fd9d0bc3 100644
--- a/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
+++ b/test/cmdlineTests/ir_compiler_inheritance_nosubobjects/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"ir_compiler_inheritance_nosubobjects/input.sol"
 object "C_7" {
     code {
@@ -32,13 +25,6 @@ object "C_7" {
 }
 
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"ir_compiler_inheritance_nosubobjects/input.sol"
 object "D_10" {
     code {
diff --git a/test/cmdlineTests/ir_compiler_subobjects/output b/test/cmdlineTests/ir_compiler_subobjects/output
index 80d90aac50..5cacb6c16b 100644
--- a/test/cmdlineTests/ir_compiler_subobjects/output
+++ b/test/cmdlineTests/ir_compiler_subobjects/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"ir_compiler_subobjects/input.sol"
 object "C_3" {
     code {
@@ -32,13 +25,6 @@ object "C_3" {
 }
 
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"ir_compiler_subobjects/input.sol"
 object "D_16" {
     code {
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
index 90c7ddf650..41f353269f 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"ir_with_assembly_no_memoryguard_creation/input.sol"
 object "D_12" {
     code {
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
index 7738519c4b..c406d4f7ed 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"ir_with_assembly_no_memoryguard_runtime/input.sol"
 object "D_8" {
     code {
diff --git a/test/cmdlineTests/keccak_optimization_deploy_code/output b/test/cmdlineTests/keccak_optimization_deploy_code/output
index b70a029fcb..8b89ea5b63 100644
--- a/test/cmdlineTests/keccak_optimization_deploy_code/output
+++ b/test/cmdlineTests/keccak_optimization_deploy_code/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"keccak_optimization_deploy_code/input.sol"
 object "C_12" {
     code {
diff --git a/test/cmdlineTests/keccak_optimization_low_runs/output b/test/cmdlineTests/keccak_optimization_low_runs/output
index 691e37145e..c308d737b2 100644
--- a/test/cmdlineTests/keccak_optimization_low_runs/output
+++ b/test/cmdlineTests/keccak_optimization_low_runs/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"keccak_optimization_low_runs/input.sol"
 object "C_7" {
     code {
diff --git a/test/cmdlineTests/name_simplifier/output b/test/cmdlineTests/name_simplifier/output
index 3dabe9c8d2..219d767692 100644
--- a/test/cmdlineTests/name_simplifier/output
+++ b/test/cmdlineTests/name_simplifier/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"name_simplifier/input.sol"
 object "C_59" {
     code {
diff --git a/test/cmdlineTests/optimizer_array_sload/output b/test/cmdlineTests/optimizer_array_sload/output
index 8404525f8c..bb0d0bf402 100644
--- a/test/cmdlineTests/optimizer_array_sload/output
+++ b/test/cmdlineTests/optimizer_array_sload/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"optimizer_array_sload/input.sol"
 object "Arraysum_34" {
     code {
diff --git a/test/cmdlineTests/revert_strings/output b/test/cmdlineTests/revert_strings/output
index 31b3db33b6..0f16ff9d0f 100644
--- a/test/cmdlineTests/revert_strings/output
+++ b/test/cmdlineTests/revert_strings/output
@@ -1,11 +1,4 @@
 IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 
 /// @use-src 0:"revert_strings/input.sol"
 object "C_15" {
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
index 44c143b714..30895c160a 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
@@ -60,14 +60,7 @@ sub_0: assembly {
 }
 "
                 },
-                "ir": "/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+                "ir": "
 /// @use-src 0:\"C\"
 object \"C_6\" {
     code {
@@ -181,14 +174,7 @@ object \"C_6\" {
 }
 
 ",
-                "irOptimized": "/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-/// @use-src 0:\"C\"
+                "irOptimized": "/// @use-src 0:\"C\"
 object \"C_6\" {
     code {
         {
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
index 8dad4c42ec..6ee9874d38 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
@@ -60,14 +60,7 @@ sub_0: assembly {
 }
 "
                 },
-                "ir": "/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+                "ir": "
 /// @use-src 0:\"C\"
 object \"C_6\" {
     code {
@@ -180,14 +173,7 @@ object \"C_6\" {
 }
 
 ",
-                "irOptimized": "/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-/// @use-src 0:\"C\"
+                "irOptimized": "/// @use-src 0:\"C\"
 object \"C_6\" {
     code {
         {
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
index 1675f7ec5a..a32ee05806 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
@@ -57,14 +57,7 @@ sub_0: assembly {
 }
 "
                 },
-                "ir": "/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+                "ir": "
 /// @use-src 0:\"C\"
 object \"C_6\" {
     code {
@@ -171,14 +164,7 @@ object \"C_6\" {
 }
 
 ",
-                "irOptimized": "/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-/// @use-src 0:\"C\"
+                "irOptimized": "/// @use-src 0:\"C\"
 object \"C_6\" {
     code {
         {
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index f21722a633..a57dbdc35c 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -1,11 +1,4 @@
-{"contracts":{"C":{"C":{"ir":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+{"contracts":{"C":{"C":{"ir":"
 /// @use-src 0:\"C\"
 object \"C_54\" {
     code {
@@ -609,14 +602,7 @@ object \"C_54\" {
 
 }
 
-","irOptimized":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-/// @use-src 0:\"C\"
+","irOptimized":"/// @use-src 0:\"C\"
 object \"C_54\" {
     code {
         {
@@ -776,14 +762,7 @@ object \"C_54\" {
         data \".metadata\" hex\"<BYTECODE REMOVED>\"
     }
 }
-"}},"D":{"D":{"ir":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+"}},"D":{"D":{"ir":"
 /// @use-src 0:\"C\", 1:\"D\"
 object \"D_72\" {
     code {
@@ -1455,14 +1434,7 @@ object \"D_72\" {
 
 }
 
-","irOptimized":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-/// @use-src 0:\"C\", 1:\"D\"
+","irOptimized":"/// @use-src 0:\"C\", 1:\"D\"
 object \"D_72\" {
     code {
         {
diff --git a/test/cmdlineTests/standard_irOptimized_requested/output.json b/test/cmdlineTests/standard_irOptimized_requested/output.json
index 85b8616020..f919764114 100644
--- a/test/cmdlineTests/standard_irOptimized_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_requested/output.json
@@ -1,11 +1,4 @@
-{"contracts":{"A":{"C":{"irOptimized":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-/// @use-src 0:\"A\"
+{"contracts":{"A":{"C":{"irOptimized":"/// @use-src 0:\"A\"
 object \"C_7\" {
     code {
         /// @src 0:79:121  \"contract C { function f() public pure {} }\"
diff --git a/test/cmdlineTests/standard_ir_requested/output.json b/test/cmdlineTests/standard_ir_requested/output.json
index 1e7f8dec3b..78e2aebce6 100644
--- a/test/cmdlineTests/standard_ir_requested/output.json
+++ b/test/cmdlineTests/standard_ir_requested/output.json
@@ -1,11 +1,4 @@
-{"contracts":{"A":{"C":{"ir":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+{"contracts":{"A":{"C":{"ir":"
 /// @use-src 0:\"A\"
 object \"C_7\" {
     code {
diff --git a/test/cmdlineTests/standard_viair_requested/output.json b/test/cmdlineTests/standard_viair_requested/output.json
index 881a4bad49..f08a5d3027 100644
--- a/test/cmdlineTests/standard_viair_requested/output.json
+++ b/test/cmdlineTests/standard_viair_requested/output.json
@@ -1,11 +1,4 @@
-{"contracts":{"A":{"C":{"evm":{"bytecode":{"generatedSources":[],"object":"<BYTECODE REMOVED>"},"deployedBytecode":{"object":"<BYTECODE REMOVED>"}},"ir":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+{"contracts":{"A":{"C":{"evm":{"bytecode":{"generatedSources":[],"object":"<BYTECODE REMOVED>"},"deployedBytecode":{"object":"<BYTECODE REMOVED>"}},"ir":"
 /// @use-src 0:\"A\"
 object \"C_3\" {
     code {
@@ -67,14 +60,7 @@ object \"C_3\" {
 
 }
 
-"},"D":{"evm":{"bytecode":{"generatedSources":[],"object":"<BYTECODE REMOVED>"},"deployedBytecode":{"object":"<BYTECODE REMOVED>"}},"ir":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+"},"D":{"evm":{"bytecode":{"generatedSources":[],"object":"<BYTECODE REMOVED>"},"deployedBytecode":{"object":"<BYTECODE REMOVED>"}},"ir":"
 /// @use-src 0:\"A\"
 object \"D_16\" {
     code {
@@ -207,12 +193,6 @@ object \"D_16\" {
             /// @src 0:93:146  \"contract D { function f() public { C c = new C(); } }\"
 
         }
-        /*=====================================================*
-        *                       WARNING                       *
-        *  Solidity to Yul compilation is still EXPERIMENTAL  *
-        *       It can result in LOSS OF FUNDS or worse       *
-        *                !USE AT YOUR OWN RISK!               *
-        *=====================================================*/
 
         /// @use-src 0:\"A\"
         object \"C_3\" {
diff --git a/test/cmdlineTests/viair_abicoder_v1/output b/test/cmdlineTests/viair_abicoder_v1/output
index c71c535daa..1c4d6c90e2 100644
--- a/test/cmdlineTests/viair_abicoder_v1/output
+++ b/test/cmdlineTests/viair_abicoder_v1/output
@@ -1,11 +1,4 @@
 IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 
 /// @use-src 0:"viair_abicoder_v1/input.sol"
 object "test_11" {
diff --git a/test/cmdlineTests/viair_subobjects/args b/test/cmdlineTests/viair_subobjects/args
index 1a5580b80b..5331d83ac4 100644
--- a/test/cmdlineTests/viair_subobjects/args
+++ b/test/cmdlineTests/viair_subobjects/args
@@ -1 +1 @@
---ir-optimized --experimental-via-ir --optimize --bin --bin-runtime
\ No newline at end of file
+--ir-optimized --via-ir --optimize --bin --bin-runtime
\ No newline at end of file
diff --git a/test/cmdlineTests/viair_subobjects/output b/test/cmdlineTests/viair_subobjects/output
index aea2013ec4..51fdae9244 100644
--- a/test/cmdlineTests/viair_subobjects/output
+++ b/test/cmdlineTests/viair_subobjects/output
@@ -5,13 +5,6 @@ Binary:
 Binary of the runtime part:
 <BYTECODE REMOVED>
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"viair_subobjects/input.sol"
 object "C_3" {
     code {
@@ -44,13 +37,6 @@ Binary:
 Binary of the runtime part:
 <BYTECODE REMOVED>
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"viair_subobjects/input.sol"
 object "D_16" {
     code {
diff --git a/test/cmdlineTests/yul_optimizer_steps/output b/test/cmdlineTests/yul_optimizer_steps/output
index a88ce164ac..bb68a48fa8 100644
--- a/test/cmdlineTests/yul_optimizer_steps/output
+++ b/test/cmdlineTests/yul_optimizer_steps/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"yul_optimizer_steps/input.sol"
 object "C_7" {
     code {
diff --git a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
index 5b7c3fdb01..1e19c3a5c8 100644
--- a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
+++ b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
@@ -1,11 +1,4 @@
 Optimized IR:
-/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
 /// @use-src 0:"yul_optimizer_steps_nested_brackets/input.sol"
 object "C_6" {
     code {
diff --git a/test/cmdlineTests/yul_string_format_ascii/output.json b/test/cmdlineTests/yul_string_format_ascii/output.json
index 46dd577ebd..3ff8779ffa 100644
--- a/test/cmdlineTests/yul_string_format_ascii/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii/output.json
@@ -1,11 +1,4 @@
-{"contracts":{"A":{"C":{"ir":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+{"contracts":{"A":{"C":{"ir":"
 /// @use-src 0:\"A\"
 object \"C_11\" {
     code {
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json b/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
index 0ffffa3a43..a5aaa8633d 100644
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
@@ -1,11 +1,4 @@
-{"contracts":{"A":{"C":{"ir":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+{"contracts":{"A":{"C":{"ir":"
 /// @use-src 0:\"A\"
 object \"C_11\" {
     code {
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json b/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
index 1fb1070155..4cb4408cab 100644
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
@@ -1,11 +1,4 @@
-{"contracts":{"A":{"C":{"ir":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+{"contracts":{"A":{"C":{"ir":"
 /// @use-src 0:\"A\"
 object \"C_11\" {
     code {
diff --git a/test/cmdlineTests/yul_string_format_ascii_long/output.json b/test/cmdlineTests/yul_string_format_ascii_long/output.json
index bf757e6855..e019e5c2fc 100644
--- a/test/cmdlineTests/yul_string_format_ascii_long/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_long/output.json
@@ -1,11 +1,4 @@
-{"contracts":{"A":{"C":{"ir":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+{"contracts":{"A":{"C":{"ir":"
 /// @use-src 0:\"A\"
 object \"C_11\" {
     code {
diff --git a/test/cmdlineTests/yul_string_format_hex/output.json b/test/cmdlineTests/yul_string_format_hex/output.json
index 0ff492ce4e..a4e1b1463c 100644
--- a/test/cmdlineTests/yul_string_format_hex/output.json
+++ b/test/cmdlineTests/yul_string_format_hex/output.json
@@ -1,11 +1,4 @@
-{"contracts":{"A":{"C":{"ir":"/*=====================================================*
- *                       WARNING                       *
- *  Solidity to Yul compilation is still EXPERIMENTAL  *
- *       It can result in LOSS OF FUNDS or worse       *
- *                !USE AT YOUR OWN RISK!               *
- *=====================================================*/
-
-
+{"contracts":{"A":{"C":{"ir":"
 /// @use-src 0:\"A\"
 object \"C_11\" {
     code {
diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
index d373986370..9cbf73f842 100644
--- a/test/libsolidity/Metadata.cpp
+++ b/test/libsolidity/Metadata.cpp
@@ -373,13 +373,7 @@ BOOST_AUTO_TEST_CASE(metadata_viair)
 			CompilerStack::MetadataFormat::WithReleaseVersionTag
 		);
 
-		if (_viaIR)
-		{
-			BOOST_CHECK(parsedCBORMetadata.count("experimental") == 1);
-			BOOST_CHECK(parsedCBORMetadata.at("experimental") == "true");
-		}
-		else
-			BOOST_CHECK(parsedCBORMetadata.count("experimental") == 0);
+		BOOST_CHECK(parsedCBORMetadata.count("experimental") == 0);
 	};
 
 	check(sourceCode, true);
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index c2eab23557..b4be5a83a1 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -120,6 +120,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			"--output-dir=/tmp/out",
 			"--overwrite",
 			"--evm-version=spuriousDragon",
+			"--via-ir",
 			"--experimental-via-ir",
 			"--revert-strings=strip",
 			"--debug-info=location",
@@ -175,7 +176,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 		expectedOptions.output.dir = "/tmp/out";
 		expectedOptions.output.overwriteFiles = true;
 		expectedOptions.output.evmVersion = EVMVersion::spuriousDragon();
-		expectedOptions.output.experimentalViaIR = true;
+		expectedOptions.output.viaIR = true;
 		expectedOptions.output.revertStrings = RevertStrings::Strip;
 		expectedOptions.output.debugInfoSelection = DebugInfoSelection::fromString("location");
 		expectedOptions.formatting.json = JsonFormat{JsonFormat::Pretty, 7};
@@ -223,6 +224,13 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(via_ir_options)
+{
+	BOOST_TEST(!parseCommandLine({"solc", "contract.sol"}).output.viaIR);
+	for (string viaIrOption: {"--via-ir", "--experimental-via-ir"})
+		BOOST_TEST(parseCommandLine({"solc", viaIrOption, "contract.sol"}).output.viaIR);
+}
+
 BOOST_AUTO_TEST_CASE(assembly_mode_options)
 {
 	static vector<tuple<vector<string>, AssemblyStack::Machine, AssemblyStack::Language>> const allowedCombinations = {
@@ -415,7 +423,8 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 	map<string, vector<string>> invalidOptionInputModeCombinations = {
 		// TODO: This should eventually contain all options.
 		{"--error-recovery", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--experimental-via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}}
+		{"--experimental-via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}}
 	};
 
 	for (auto const& [optionName, inputModes]: invalidOptionInputModeCombinations)

From 0172f61340e9ec1020e7dee8aaaca668067ed9d0 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 14 Mar 2022 14:47:16 +0100
Subject: [PATCH 0481/1748] No longer mark Yul as experimental.

---
 libsolidity/interface/StandardCompiler.cpp           |  4 ----
 scripts/common_cmdline.sh                            |  1 -
 solc/CommandLineInterface.cpp                        |  2 --
 test/cmdlineTests/evm_to_wasm/err                    |  1 -
 test/cmdlineTests/evm_to_wasm_break/err              |  1 -
 .../evm_to_wasm_output_selection_asm_only/err        |  1 -
 .../evm_to_wasm_output_selection_ewasm_ir_only/err   |  1 -
 .../evm_to_wasm_output_selection_ewasm_only/err      |  1 -
 test/cmdlineTests/linking_standard_yul/output.json   |  2 +-
 .../output.json                                      |  2 +-
 .../output.json                                      |  2 +-
 test/cmdlineTests/linking_strict_assembly/err        |  1 -
 .../err                                              |  1 -
 .../err                                              |  1 -
 .../err                                              |  1 -
 .../err                                              |  1 -
 .../err                                              |  1 -
 .../err                                              |  1 -
 .../err                                              |  1 -
 test/cmdlineTests/object_compiler/err                |  1 -
 test/cmdlineTests/standard_yul/output.json           |  2 +-
 .../standard_yul_debug_info_print_all/output.json    | 12 +-----------
 .../output.json                                      | 12 +-----------
 .../standard_yul_debug_info_print_none/output.json   | 12 +-----------
 .../standard_yul_embedded_object_name/output.json    |  2 +-
 .../standard_yul_immutable_references/output.json    | 12 +-----------
 .../standard_yul_invalid_object_name/output.json     |  2 +-
 test/cmdlineTests/standard_yul_object/output.json    |  2 +-
 .../standard_yul_object_name/output.json             |  2 +-
 .../standard_yul_optimiserSteps/output.json          |  2 +-
 test/cmdlineTests/standard_yul_optimized/output.json |  2 +-
 test/cmdlineTests/standard_yul_stack_opt/output.json |  2 +-
 .../standard_yul_stack_opt_disabled/output.json      |  2 +-
 .../cmdlineTests/strict_asm_debug_info_print_all/err |  1 -
 .../strict_asm_debug_info_print_location_only/err    |  1 -
 .../strict_asm_debug_info_print_none/err             |  1 -
 test/cmdlineTests/strict_asm_jump/err                |  1 -
 test/cmdlineTests/strict_asm_only_cr/err             |  1 -
 test/cmdlineTests/strict_asm_optimizer_steps/err     |  1 -
 .../strict_asm_output_selection_asm_only/err         |  1 -
 .../strict_asm_output_selection_bin_only/err         |  1 -
 .../strict_asm_output_selection_ewasm_ir_only/err    |  1 -
 .../strict_asm_output_selection_ewasm_only/err       |  1 -
 .../err                                              |  1 -
 .../err                                              |  1 -
 .../wasm_to_wasm_memory_instructions_alignment/err   |  1 -
 test/cmdlineTests/yul_function_name_clashes/err      |  1 -
 .../yul_function_name_clashes_different_params/err   |  1 -
 test/cmdlineTests/yul_optimize_runs/err              |  1 -
 .../yul_to_wasm_source_location_crash/err            |  1 -
 test/cmdlineTests/yul_verbatim/err                   |  1 -
 test/cmdlineTests/yul_verbatim_msize/err             |  1 -
 52 files changed, 16 insertions(+), 96 deletions(-)
 delete mode 100644 test/cmdlineTests/evm_to_wasm/err
 delete mode 100644 test/cmdlineTests/evm_to_wasm_break/err
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/err
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err
 delete mode 100644 test/cmdlineTests/linking_strict_assembly/err
 delete mode 100644 test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/err
 delete mode 100644 test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/err
 delete mode 100644 test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/err
 delete mode 100644 test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/err
 delete mode 100644 test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/err
 delete mode 100644 test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/err
 delete mode 100644 test/cmdlineTests/linking_strict_assembly_unresolved_references/err
 delete mode 100644 test/cmdlineTests/object_compiler/err
 delete mode 100644 test/cmdlineTests/strict_asm_debug_info_print_all/err
 delete mode 100644 test/cmdlineTests/strict_asm_debug_info_print_location_only/err
 delete mode 100644 test/cmdlineTests/strict_asm_debug_info_print_none/err
 delete mode 100644 test/cmdlineTests/strict_asm_optimizer_steps/err
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_asm_only/err
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_bin_only/err
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/err
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_only/err
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err
 delete mode 100644 test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/err
 delete mode 100644 test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/err
 delete mode 100644 test/cmdlineTests/yul_function_name_clashes/err
 delete mode 100644 test/cmdlineTests/yul_function_name_clashes_different_params/err
 delete mode 100644 test/cmdlineTests/yul_optimize_runs/err
 delete mode 100644 test/cmdlineTests/yul_to_wasm_source_location_crash/err
 delete mode 100644 test/cmdlineTests/yul_verbatim/err
 delete mode 100644 test/cmdlineTests/yul_verbatim_msize/err

diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 93ac20b03c..31400ccadc 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1448,10 +1448,6 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 		return output;
 	}
 
-	// TODO: move this warning to AssemblyStack
-	output["errors"] = Json::arrayValue;
-	output["errors"].append(formatError(Error::Severity::Warning, "Warning", "general", "Yul is still experimental. Please use the output with care."));
-
 	string contractName = stack.parserResult()->name.str();
 
 	bool const wildcardMatchesExperimental = true;
diff --git a/scripts/common_cmdline.sh b/scripts/common_cmdline.sh
index 3efeadc03d..d364f64448 100644
--- a/scripts/common_cmdline.sh
+++ b/scripts/common_cmdline.sh
@@ -69,7 +69,6 @@ function compileFull
     local exit_code=$?
     local errors; errors=$(grep -v -E \
         -e 'Warning: This is a pre-release compiler version|Warning: Experimental features are turned on|pragma experimental ABIEncoderV2|^ +--> |^ +\||^[0-9]+ +\| ' \
-        -e 'Warning: Yul is still experimental. Please use the output with care.' \
         -e '^No text representation found.$' < "$stderr_path"
     )
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 207160045d..55b7033927 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -1017,8 +1017,6 @@ void CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 {
 	solAssert(m_options.input.mode == InputMode::Assembler, "");
 
-	serr() << "Warning: Yul is still experimental. Please use the output with care." << endl;
-
 	bool successful = true;
 	map<string, yul::AssemblyStack> assemblyStacks;
 	for (auto const& src: m_fileReader.sourceUnits())
diff --git a/test/cmdlineTests/evm_to_wasm/err b/test/cmdlineTests/evm_to_wasm/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/evm_to_wasm/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/evm_to_wasm_break/err b/test/cmdlineTests/evm_to_wasm_break/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/evm_to_wasm_break/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/err b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/linking_standard_yul/output.json b/test/cmdlineTests/linking_standard_yul/output.json
index 7816df4ecf..89fa9901cf 100644
--- a/test/cmdlineTests/linking_standard_yul/output.json
+++ b/test/cmdlineTests/linking_standard_yul/output.json
@@ -1 +1 @@
-{"contracts":{"A":{"a":{"evm":{"bytecode":{"linkReferences":{},"object":"<BYTECODE REMOVED>"}}}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+{"contracts":{"A":{"a":{"evm":{"bytecode":{"linkReferences":{},"object":"<BYTECODE REMOVED>"}}}}},}
diff --git a/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json b/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json
index 7816df4ecf..89fa9901cf 100644
--- a/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json
+++ b/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json
@@ -1 +1 @@
-{"contracts":{"A":{"a":{"evm":{"bytecode":{"linkReferences":{},"object":"<BYTECODE REMOVED>"}}}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+{"contracts":{"A":{"a":{"evm":{"bytecode":{"linkReferences":{},"object":"<BYTECODE REMOVED>"}}}}},}
diff --git a/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json b/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json
index 4dab683515..ec597c396e 100644
--- a/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json
+++ b/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json
@@ -1 +1 @@
-{"contracts":{"A":{"a":{"evm":{"bytecode":{"linkReferences":{"contract/test.sol":{"L2":[{"length":20,"start":22}]}},"object":"<BYTECODE REMOVED>__$fb58009a6b1ecea3b9d99bedd645df4ec3$__<BYTECODE REMOVED>"}}}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+{"contracts":{"A":{"a":{"evm":{"bytecode":{"linkReferences":{"contract/test.sol":{"L2":[{"length":20,"start":22}]}},"object":"<BYTECODE REMOVED>__$fb58009a6b1ecea3b9d99bedd645df4ec3$__<BYTECODE REMOVED>"}}}}},}
diff --git a/test/cmdlineTests/linking_strict_assembly/err b/test/cmdlineTests/linking_strict_assembly/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/linking_strict_assembly/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/err b/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/err b/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/err b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/err b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/err b/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/err b/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/linking_strict_assembly_unresolved_references/err b/test/cmdlineTests/linking_strict_assembly_unresolved_references/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/linking_strict_assembly_unresolved_references/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/object_compiler/err b/test/cmdlineTests/object_compiler/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/object_compiler/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/standard_yul/output.json b/test/cmdlineTests/standard_yul/output.json
index 671b8ffa7c..63da252cd2 100644
--- a/test/cmdlineTests/standard_yul/output.json
+++ b/test/cmdlineTests/standard_yul/output.json
@@ -26,4 +26,4 @@
         sstore(add(x, 0), 0)
     }
 }
-"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+"}}},}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json b/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
index b57bc91889..70122b9a7c 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
@@ -23,14 +23,4 @@ tag_3:
             }
         }
     },
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Yul is still experimental. Please use the output with care.",
-            "message": "Yul is still experimental. Please use the output with care.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ]
-}
+    }
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json b/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
index 0ce9fd2de3..e7b1a69436 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
@@ -23,14 +23,4 @@ tag_3:
             }
         }
     },
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Yul is still experimental. Please use the output with care.",
-            "message": "Yul is still experimental. Please use the output with care.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ]
-}
+    }
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json b/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
index 8203ee0a26..b8b5ff9130 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
@@ -21,14 +21,4 @@ tag_3:
             }
         }
     },
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Yul is still experimental. Please use the output with care.",
-            "message": "Yul is still experimental. Please use the output with care.",
-            "severity": "warning",
-            "type": "Warning"
-        }
-    ]
-}
+    }
diff --git a/test/cmdlineTests/standard_yul_embedded_object_name/output.json b/test/cmdlineTests/standard_yul_embedded_object_name/output.json
index 32a2a647a0..0967ef424b 100644
--- a/test/cmdlineTests/standard_yul_embedded_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_embedded_object_name/output.json
@@ -1 +1 @@
-{"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+{}
diff --git a/test/cmdlineTests/standard_yul_immutable_references/output.json b/test/cmdlineTests/standard_yul_immutable_references/output.json
index 42361097de..fe9bd66a65 100644
--- a/test/cmdlineTests/standard_yul_immutable_references/output.json
+++ b/test/cmdlineTests/standard_yul_immutable_references/output.json
@@ -39,14 +39,4 @@
       }
     }
   },
-  "errors":
-  [
-    {
-      "component": "general",
-      "formattedMessage": "Yul is still experimental. Please use the output with care.",
-      "message": "Yul is still experimental. Please use the output with care.",
-      "severity": "warning",
-      "type": "Warning"
-    }
-  ]
-}
+  }
diff --git a/test/cmdlineTests/standard_yul_invalid_object_name/output.json b/test/cmdlineTests/standard_yul_invalid_object_name/output.json
index 32a2a647a0..0967ef424b 100644
--- a/test/cmdlineTests/standard_yul_invalid_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_invalid_object_name/output.json
@@ -1 +1 @@
-{"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+{}
diff --git a/test/cmdlineTests/standard_yul_object/output.json b/test/cmdlineTests/standard_yul_object/output.json
index 49aaa6a747..96903c4522 100644
--- a/test/cmdlineTests/standard_yul_object/output.json
+++ b/test/cmdlineTests/standard_yul_object/output.json
@@ -28,4 +28,4 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
     }
     data \"DataName\" hex\"616263\"
 }
-"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+"}}},}
diff --git a/test/cmdlineTests/standard_yul_object_name/output.json b/test/cmdlineTests/standard_yul_object_name/output.json
index 45280c8a1b..b4a9e36856 100644
--- a/test/cmdlineTests/standard_yul_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_object_name/output.json
@@ -43,4 +43,4 @@ sub_0: assembly {
         code { revert(0, 0) }
     }
 }
-"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+"}}},}
diff --git a/test/cmdlineTests/standard_yul_optimiserSteps/output.json b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
index 4071589cbe..c4b5f6e0e0 100644
--- a/test/cmdlineTests/standard_yul_optimiserSteps/output.json
+++ b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
@@ -21,4 +21,4 @@
         }
     }
 }
-"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+"}}},}
diff --git a/test/cmdlineTests/standard_yul_optimized/output.json b/test/cmdlineTests/standard_yul_optimized/output.json
index 371a0816b6..40fd18d2b1 100644
--- a/test/cmdlineTests/standard_yul_optimized/output.json
+++ b/test/cmdlineTests/standard_yul_optimized/output.json
@@ -16,4 +16,4 @@
 ","irOptimized":"object \"object\" {
     code { { sstore(mload(0), 0) } }
 }
-"}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+"}}},}
diff --git a/test/cmdlineTests/standard_yul_stack_opt/output.json b/test/cmdlineTests/standard_yul_stack_opt/output.json
index f041adaa86..1bc924d959 100644
--- a/test/cmdlineTests/standard_yul_stack_opt/output.json
+++ b/test/cmdlineTests/standard_yul_stack_opt/output.json
@@ -12,4 +12,4 @@
   sstore
     /* \"A\":0:72   */
   stop
-"}}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+"}}}},}
diff --git a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
index a4670cf261..8fa9f92ce0 100644
--- a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
+++ b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
@@ -15,4 +15,4 @@
     /* \"A\":0:72   */
   pop
   pop
-"}}}},"errors":[{"component":"general","formattedMessage":"Yul is still experimental. Please use the output with care.","message":"Yul is still experimental. Please use the output with care.","severity":"warning","type":"Warning"}]}
+"}}}},}
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_all/err b/test/cmdlineTests/strict_asm_debug_info_print_all/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_all/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_location_only/err b/test/cmdlineTests/strict_asm_debug_info_print_location_only/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_location_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_none/err b/test/cmdlineTests/strict_asm_debug_info_print_none/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/strict_asm_debug_info_print_none/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_jump/err b/test/cmdlineTests/strict_asm_jump/err
index 866361af4d..c0001f3825 100644
--- a/test/cmdlineTests/strict_asm_jump/err
+++ b/test/cmdlineTests/strict_asm_jump/err
@@ -1,4 +1,3 @@
-Warning: Yul is still experimental. Please use the output with care.
 Error: Function "jump" not found.
  --> strict_asm_jump/input.yul:1:3:
   |
diff --git a/test/cmdlineTests/strict_asm_only_cr/err b/test/cmdlineTests/strict_asm_only_cr/err
index 62ebc300d7..0879e4f212 100644
--- a/test/cmdlineTests/strict_asm_only_cr/err
+++ b/test/cmdlineTests/strict_asm_only_cr/err
@@ -1,4 +1,3 @@
-Warning: Yul is still experimental. Please use the output with care.
 Error: Expected keyword "object".
  --> strict_asm_only_cr/input.yul:1:2:
   |
diff --git a/test/cmdlineTests/strict_asm_optimizer_steps/err b/test/cmdlineTests/strict_asm_optimizer_steps/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/strict_asm_optimizer_steps/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_asm_only/err b/test/cmdlineTests/strict_asm_output_selection_asm_only/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_asm_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/err b/test/cmdlineTests/strict_asm_output_selection_bin_only/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_bin_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/err b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/err b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err b/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ir_optimized_only/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/err b/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/err b/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/yul_function_name_clashes/err b/test/cmdlineTests/yul_function_name_clashes/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/yul_function_name_clashes/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/err b/test/cmdlineTests/yul_function_name_clashes_different_params/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/yul_function_name_clashes_different_params/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/yul_optimize_runs/err b/test/cmdlineTests/yul_optimize_runs/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/yul_optimize_runs/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/err b/test/cmdlineTests/yul_to_wasm_source_location_crash/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/yul_to_wasm_source_location_crash/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/yul_verbatim/err b/test/cmdlineTests/yul_verbatim/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/yul_verbatim/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.
diff --git a/test/cmdlineTests/yul_verbatim_msize/err b/test/cmdlineTests/yul_verbatim_msize/err
deleted file mode 100644
index 014a1178fa..0000000000
--- a/test/cmdlineTests/yul_verbatim_msize/err
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Yul is still experimental. Please use the output with care.

From 0f1a63c3fa5db2c55e0a94b72653a1f1172e1ca9 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 11 Mar 2022 17:01:30 +0100
Subject: [PATCH 0482/1748] Fix import directive visits in type checker and
 view pure checker.

---
 Changelog.md                                      |  1 +
 libsolidity/analysis/TypeChecker.cpp              |  5 +++++
 libsolidity/analysis/TypeChecker.h                |  2 ++
 libsolidity/analysis/ViewPureChecker.cpp          |  5 +++++
 libsolidity/analysis/ViewPureChecker.h            |  2 ++
 libsolidity/formal/SMTEncoder.cpp                 |  6 ++++++
 libsolidity/formal/SMTEncoder.h                   |  1 +
 .../multiSource/import_overloaded_function.sol    | 15 +++++++++++++++
 8 files changed, 37 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol

diff --git a/Changelog.md b/Changelog.md
index c7bf10c8a3..a23843c45a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,6 +14,7 @@ Compiler Features:
 
 Bugfixes:
  * General: Fix internal error for locales with unusual capitalization rules. Locale set in the environment is now completely ignored.
+ * Type Checker: Fix incorrect type checker errors when importing overloaded functions.
  * Yul IR Code Generation: Optimize embedded creation code with correct settings. This fixes potential mismatches between the constructor code of a contract compiled in isolation and the bytecode in ``type(C).creationCode``, resp. the bytecode used for ``new C(...)``.
 
 
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 3790331170..4bf30d4eb3 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -268,6 +268,11 @@ TypePointers TypeChecker::typeCheckMetaTypeFunctionAndRetrieveReturnType(Functio
 	return {TypeProvider::meta(dynamic_cast<TypeType const&>(*firstArgType).actualType())};
 }
 
+bool TypeChecker::visit(ImportDirective const&)
+{
+	return false;
+}
+
 void TypeChecker::endVisit(InheritanceSpecifier const& _inheritance)
 {
 	auto base = dynamic_cast<ContractDefinition const*>(&dereference(_inheritance.name()));
diff --git a/libsolidity/analysis/TypeChecker.h b/libsolidity/analysis/TypeChecker.h
index 969ee43940..2ef6b818be 100644
--- a/libsolidity/analysis/TypeChecker.h
+++ b/libsolidity/analysis/TypeChecker.h
@@ -125,6 +125,8 @@ class TypeChecker: private ASTConstVisitor
 		FunctionType const* _functionType
 	);
 
+	bool visit(ImportDirective const&) override;
+
 	void endVisit(InheritanceSpecifier const& _inheritance) override;
 	void endVisit(ModifierDefinition const& _modifier) override;
 	bool visit(FunctionDefinition const& _function) override;
diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp
index 3179a8eb70..7483af8922 100644
--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ b/libsolidity/analysis/ViewPureChecker.cpp
@@ -134,6 +134,11 @@ bool ViewPureChecker::check()
 	return !m_errors;
 }
 
+bool ViewPureChecker::visit(ImportDirective const&)
+{
+	return false;
+}
+
 bool ViewPureChecker::visit(FunctionDefinition const& _funDef)
 {
 	solAssert(!m_currentFunction, "");
diff --git a/libsolidity/analysis/ViewPureChecker.h b/libsolidity/analysis/ViewPureChecker.h
index dfbb2f7478..b0abe8fd83 100644
--- a/libsolidity/analysis/ViewPureChecker.h
+++ b/libsolidity/analysis/ViewPureChecker.h
@@ -50,6 +50,8 @@ class ViewPureChecker: private ASTConstVisitor
 		langutil::SourceLocation location;
 	};
 
+	bool visit(ImportDirective const&) override;
+
 	bool visit(FunctionDefinition const& _funDef) override;
 	void endVisit(FunctionDefinition const& _funDef) override;
 	bool visit(ModifierDefinition const& _modifierDef) override;
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index e699e28b8d..7cc978d28c 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -115,6 +115,12 @@ void SMTEncoder::endVisit(ContractDefinition const& _contract)
 		m_context.popSolver();
 }
 
+bool SMTEncoder::visit(ImportDirective const&)
+{
+	// do not visit because the identifier therein will confuse us.
+	return false;
+}
+
 void SMTEncoder::endVisit(VariableDeclaration const& _varDecl)
 {
 	// State variables are handled by the constructor.
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index fe84189beb..84a80461d6 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -136,6 +136,7 @@ class SMTEncoder: public ASTConstVisitor
 	// because the order of expression evaluation is undefined
 	// TODO: or just force a certain order, but people might have a different idea about that.
 
+	bool visit(ImportDirective const& _node) override;
 	bool visit(ContractDefinition const& _node) override;
 	void endVisit(ContractDefinition const& _node) override;
 	void endVisit(VariableDeclaration const& _node) override;
diff --git a/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol b/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol
new file mode 100644
index 0000000000..503f656802
--- /dev/null
+++ b/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol
@@ -0,0 +1,15 @@
+==== Source: A ====
+function sub(uint256 x, uint256 y) pure returns (uint) { return 1; }
+function sub(uint256 x) pure returns (uint) { return 2; }
+==== Source: B ====
+import {sub} from "A";
+contract C
+{
+    function f() public pure returns (uint, uint) {
+        return (sub(1, 2), sub(2));
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// f() -> 1, 2

From e0d9dec87431b47737fd10212d4946915ad9c24b Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Mon, 14 Mar 2022 14:23:59 +0100
Subject: [PATCH 0483/1748] Permit control flow mutations in global scope of a
 Yul program.

---
 .../ossfuzz/protomutators/YulProtoMutator.cpp | 19 +++++++++++++++++++
 .../ossfuzz/protomutators/YulProtoMutator.h   |  2 ++
 2 files changed, 21 insertions(+)

diff --git a/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp b/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
index f1f3fbc938..09001217d7 100644
--- a/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
+++ b/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
@@ -73,6 +73,7 @@ static addControlFlow<SwitchStmt> c4;
 static addControlFlow<FunctionDef> c5;
 static addControlFlow<CaseStmt> c6;
 static addControlFlow<Code> c7;
+static addControlFlow<Program> c8;
 
 Literal* YPM::intLiteral(unsigned _value)
 {
@@ -261,6 +262,24 @@ Block* YPM::basicBlock(T* _msg)
 		return _msg->mutable_case_block();
 	else if constexpr (std::is_same_v<T, Code>)
 		return _msg->mutable_block();
+	else if constexpr (std::is_same_v<T, Program>)
+		return globalBlock(_msg);
 	else
 		static_assert(AlwaysFalse<T>::value, "Yul proto mutator: non-exhaustive visitor.");
 }
+
+Block* YPM::globalBlock(Program* _program)
+{
+	switch (_program->program_oneof_case())
+	{
+	case Program::kBlock:
+		return _program->mutable_block();
+	case Program::kObj:
+		return _program->mutable_obj()->mutable_code()->mutable_block();
+	case Program::PROGRAM_ONEOF_NOT_SET:
+	{
+		_program->set_allocated_block(new Block());
+		return _program->mutable_block();
+	}
+	}
+}
diff --git a/test/tools/ossfuzz/protomutators/YulProtoMutator.h b/test/tools/ossfuzz/protomutators/YulProtoMutator.h
index e947a61c39..c6fd010ba8 100644
--- a/test/tools/ossfuzz/protomutators/YulProtoMutator.h
+++ b/test/tools/ossfuzz/protomutators/YulProtoMutator.h
@@ -103,5 +103,7 @@ struct YulProtoMutator
 	/// Obtain a basic block in a for stmt uniformly
 	/// at random
 	static Block* randomBlock(ForStmt* _msg);
+	/// Obtain a basic block in global scope.
+	static Block* globalBlock(Program* _program);
 };
 }

From beb51068bbb1193872dffb0dd5b02b019c410939 Mon Sep 17 00:00:00 2001
From: Richie <devtooligan@gmail.com>
Date: Tue, 15 Feb 2022 18:59:49 -0800
Subject: [PATCH 0484/1748] fix: corrects _ prefixes

---
 docs/assembly.rst                           | 36 ++++-----
 docs/common-patterns.rst                    | 30 +++----
 docs/contracts/constant-state-variables.rst | 10 +--
 docs/contracts/creating-contracts.rst       |  4 +-
 docs/contracts/events.rst                   | 16 ++--
 docs/contracts/function-modifiers.rst       |  4 +-
 docs/contracts/functions.rst                | 58 +++++++-------
 docs/contracts/inheritance.rst              | 10 +--
 docs/contracts/libraries.rst                | 16 ++--
 docs/contracts/using-for.rst                |  8 +-
 docs/introduction-to-smart-contracts.rst    |  4 +-
 docs/ir-breaking-changes.rst                | 34 ++++----
 docs/security-considerations.rst            | 20 ++---
 docs/smtchecker.rst                         | 88 ++++++++++-----------
 docs/types/mapping-types.rst                | 16 ++--
 docs/types/reference-types.rst              | 16 ++--
 16 files changed, 185 insertions(+), 185 deletions(-)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index 746da43c13..0876229b14 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -45,10 +45,10 @@ Solidity language without a compiler change.
     pragma solidity >=0.4.16 <0.9.0;
 
     library GetCode {
-        function at(address _addr) public view returns (bytes memory code) {
+        function at(address addr) public view returns (bytes memory code) {
             assembly {
                 // retrieve the size of the code, this needs assembly
-                let size := extcodesize(_addr)
+                let size := extcodesize(addr)
                 // allocate output byte array - this could also be done without assembly
                 // by using code = new bytes(size)
                 code := mload(0x40)
@@ -57,7 +57,7 @@ Solidity language without a compiler change.
                 // store length in memory
                 mstore(code, size)
                 // actually retrieve the code, this needs assembly
-                extcodecopy(_addr, add(code, 0x20), 0, size)
+                extcodecopy(addr, add(code, 0x20), 0, size)
             }
         }
     }
@@ -74,43 +74,43 @@ efficient code, for example:
     library VectorSum {
         // This function is less efficient because the optimizer currently fails to
         // remove the bounds checks in array access.
-        function sumSolidity(uint[] memory _data) public pure returns (uint sum) {
-            for (uint i = 0; i < _data.length; ++i)
-                sum += _data[i];
+        function sumSolidity(uint[] memory data) public pure returns (uint sum) {
+            for (uint i = 0; i < data.length; ++i)
+                sum += data[i];
         }
 
         // We know that we only access the array in bounds, so we can avoid the check.
         // 0x20 needs to be added to an array because the first slot contains the
         // array length.
-        function sumAsm(uint[] memory _data) public pure returns (uint sum) {
-            for (uint i = 0; i < _data.length; ++i) {
+        function sumAsm(uint[] memory data) public pure returns (uint sum) {
+            for (uint i = 0; i < data.length; ++i) {
                 assembly {
-                    sum := add(sum, mload(add(add(_data, 0x20), mul(i, 0x20))))
+                    sum := add(sum, mload(add(add(data, 0x20), mul(i, 0x20))))
                 }
             }
         }
 
         // Same as above, but accomplish the entire code within inline assembly.
-        function sumPureAsm(uint[] memory _data) public pure returns (uint sum) {
+        function sumPureAsm(uint[] memory data) public pure returns (uint sum) {
             assembly {
                 // Load the length (first 32 bytes)
-                let len := mload(_data)
+                let len := mload(data)
 
                 // Skip over the length field.
                 //
                 // Keep temporary variable so it can be incremented in place.
                 //
-                // NOTE: incrementing _data would result in an unusable
-                //       _data variable after this assembly block
-                let data := add(_data, 0x20)
+                // NOTE: incrementing data would result in an unusable
+                //       data variable after this assembly block
+                let dataElementLocation := add(data, 0x20)
 
                 // Iterate until the bound is not met.
                 for
-                    { let end := add(data, mul(len, 0x20)) }
-                    lt(data, end)
-                    { data := add(data, 0x20) }
+                    { let end := add(dataElementLocation, mul(len, 0x20)) }
+                    lt(dataElementLocation, end)
+                    { data := add(dataElementLocation, 0x20) }
                 {
-                    sum := add(sum, mload(data))
+                    sum := add(sum, mload(dataElementLocation))
                 }
             }
         }
diff --git a/docs/common-patterns.rst b/docs/common-patterns.rst
index 86c81dbfb9..1793ebd2f2 100644
--- a/docs/common-patterns.rst
+++ b/docs/common-patterns.rst
@@ -163,9 +163,9 @@ restrictions highly readable.
         // prepend a check that only passes
         // if the function is called from
         // a certain address.
-        modifier onlyBy(address _account)
+        modifier onlyBy(address account)
         {
-            if (msg.sender != _account)
+            if (msg.sender != account)
                 revert Unauthorized();
             // Do not forget the "_;"! It will
             // be replaced by the actual function
@@ -173,17 +173,17 @@ restrictions highly readable.
             _;
         }
 
-        /// Make `_newOwner` the new owner of this
+        /// Make `newOwner` the new owner of this
         /// contract.
-        function changeOwner(address _newOwner)
+        function changeOwner(address newOwner)
             public
             onlyBy(owner)
         {
-            owner = _newOwner;
+            owner = newOwner;
         }
 
-        modifier onlyAfter(uint _time) {
-            if (block.timestamp < _time)
+        modifier onlyAfter(uint time) {
+            if (block.timestamp < time)
                 revert TooEarly();
             _;
         }
@@ -205,21 +205,21 @@ restrictions highly readable.
         // refunded, but only after the function body.
         // This was dangerous before Solidity version 0.4.0,
         // where it was possible to skip the part after `_;`.
-        modifier costs(uint _amount) {
-            if (msg.value < _amount)
+        modifier costs(uint amount) {
+            if (msg.value < amount)
                 revert NotEnoughEther();
 
             _;
-            if (msg.value > _amount)
-                payable(msg.sender).transfer(msg.value - _amount);
+            if (msg.value > amount)
+                payable(msg.sender).transfer(msg.value - amount);
         }
 
-        function forceOwnerChange(address _newOwner)
+        function forceOwnerChange(address newOwner)
             public
             payable
             costs(200 ether)
         {
-            owner = _newOwner;
+            owner = newOwner;
             // just some example condition
             if (uint160(owner) & 0 == 1)
                 // This did not refund for Solidity
@@ -315,8 +315,8 @@ function finishes.
 
         uint public creationTime = block.timestamp;
 
-        modifier atStage(Stages _stage) {
-            if (stage != _stage)
+        modifier atStage(Stages stage_) {
+            if (stage != stage_)
                 revert FunctionInvalidAtThisStage();
             _;
         }
diff --git a/docs/contracts/constant-state-variables.rst b/docs/contracts/constant-state-variables.rst
index b67068d635..e917cad7f6 100644
--- a/docs/contracts/constant-state-variables.rst
+++ b/docs/contracts/constant-state-variables.rst
@@ -41,14 +41,14 @@ Not all types for constants and immutables are implemented at this time. The onl
         uint immutable maxBalance;
         address immutable owner = msg.sender;
 
-        constructor(uint _decimals, address _reference) {
-            decimals = _decimals;
+        constructor(uint decimals_, address ref) {
+            decimals = decimals_;
             // Assignments to immutables can even access the environment.
-            maxBalance = _reference.balance;
+            maxBalance = ref.balance;
         }
 
-        function isBalanceTooHigh(address _other) public view returns (bool) {
-            return _other.balance > maxBalance;
+        function isBalanceTooHigh(address other) public view returns (bool) {
+            return other.balance > maxBalance;
         }
     }
 
diff --git a/docs/contracts/creating-contracts.rst b/docs/contracts/creating-contracts.rst
index f1fd3b0b50..f574a5a6aa 100644
--- a/docs/contracts/creating-contracts.rst
+++ b/docs/contracts/creating-contracts.rst
@@ -48,7 +48,7 @@ This means that cyclic creation dependencies are impossible.
 
         // This is the constructor which registers the
         // creator and the assigned name.
-        constructor(bytes32 _name) {
+        constructor(bytes32 name_) {
             // State variables are accessed via their name
             // and not via e.g. `this.owner`. Functions can
             // be accessed directly or through `this.f`,
@@ -65,7 +65,7 @@ This means that cyclic creation dependencies are impossible.
             // no real way to verify that.
             // This does not create a new contract.
             creator = TokenCreator(msg.sender);
-            name = _name;
+            name = name_;
         }
 
         function changeName(bytes32 newName) public {
diff --git a/docs/contracts/events.rst b/docs/contracts/events.rst
index 6e99a332bc..27df4dde16 100644
--- a/docs/contracts/events.rst
+++ b/docs/contracts/events.rst
@@ -80,18 +80,18 @@ four indexed arguments rather than three.
 
     contract ClientReceipt {
         event Deposit(
-            address indexed _from,
-            bytes32 indexed _id,
-            uint _value
+            address indexed from,
+            bytes32 indexed id,
+            uint value
         );
 
-        function deposit(bytes32 _id) public payable {
+        function deposit(bytes32 id) public payable {
             // Events are emitted using `emit`, followed by
             // the name of the event and the arguments
             // (if any) in parentheses. Any such invocation
             // (even deeply nested) can be detected from
             // the JavaScript API by filtering for `Deposit`.
-            emit Deposit(msg.sender, _id, msg.value);
+            emit Deposit(msg.sender, id, msg.value);
         }
     }
 
@@ -126,9 +126,9 @@ The output of the above looks like the following (trimmed):
 
     {
        "returnValues": {
-           "_from": "0x1111…FFFFCCCC",
-           "_id": "0x50…sd5adb20",
-           "_value": "0x420042"
+           "from": "0x1111…FFFFCCCC",
+           "id": "0x50…sd5adb20",
+           "value": "0x420042"
        },
        "raw": {
            "data": "0x7f…91385",
diff --git a/docs/contracts/function-modifiers.rst b/docs/contracts/function-modifiers.rst
index 0d4c8e8c26..2445895e41 100644
--- a/docs/contracts/function-modifiers.rst
+++ b/docs/contracts/function-modifiers.rst
@@ -72,8 +72,8 @@ if they are marked ``virtual``. For details, please see
             registeredAddresses[msg.sender] = true;
         }
 
-        function changePrice(uint _price) public onlyOwner {
-            price = _price;
+        function changePrice(uint price_) public onlyOwner {
+            price = price_;
         }
     }
 
diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index cada0e5d94..8957d0f547 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -17,17 +17,17 @@ that call them, similar to internal library functions.
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.1 <0.9.0;
 
-    function sum(uint[] memory _arr) pure returns (uint s) {
-        for (uint i = 0; i < _arr.length; i++)
-            s += _arr[i];
+    function sum(uint[] memory arr) pure returns (uint s) {
+        for (uint i = 0; i < arr.length; i++)
+            s += arr[i];
     }
 
     contract ArrayExample {
         bool found;
-        function f(uint[] memory _arr) public {
+        function f(uint[] memory arr) public {
             // This calls the free function internally.
             // The compiler will add its code to the contract.
-            uint s = sum(_arr);
+            uint s = sum(arr);
             require(s >= 10);
             found = true;
         }
@@ -65,8 +65,8 @@ with two integers, you would use something like the following:
 
     contract Simple {
         uint sum;
-        function taker(uint _a, uint _b) public {
-            sum = _a + _b;
+        function taker(uint a, uint b) public {
+            sum = a + b;
         }
     }
 
@@ -99,13 +99,13 @@ two integers passed as function parameters, then you use something like:
     pragma solidity >=0.4.16 <0.9.0;
 
     contract Simple {
-        function arithmetic(uint _a, uint _b)
+        function arithmetic(uint a, uint b)
             public
             pure
             returns (uint sum, uint product)
         {
-            sum = _a + _b;
-            product = _a * _b;
+            sum = a + b;
+            product = a * b;
         }
     }
 
@@ -126,12 +126,12 @@ statement:
     pragma solidity >=0.4.16 <0.9.0;
 
     contract Simple {
-        function arithmetic(uint _a, uint _b)
+        function arithmetic(uint a, uint b)
             public
             pure
             returns (uint sum, uint product)
         {
-            return (_a + _b, _a * _b);
+            return (a + b, a * b);
         }
     }
 
@@ -362,7 +362,7 @@ Fallback Function
 -----------------
 
 A contract can have at most one ``fallback`` function, declared using either ``fallback () external [payable]``
-or ``fallback (bytes calldata _input) external [payable] returns (bytes memory _output)``
+or ``fallback (bytes calldata input) external [payable] returns (bytes memory output)``
 (both without the ``function`` keyword).
 This function must have ``external`` visibility. A fallback function can be virtual, can override
 and can have modifiers.
@@ -373,8 +373,8 @@ all and there is no :ref:`receive Ether function <receive-ether-function>`.
 The fallback function always receives data, but in order to also receive Ether
 it must be marked ``payable``.
 
-If the version with parameters is used, ``_input`` will contain the full data sent to the contract
-(equal to ``msg.data``) and can return data in ``_output``. The returned data will not be
+If the version with parameters is used, ``input`` will contain the full data sent to the contract
+(equal to ``msg.data``) and can return data in ``output``. The returned data will not be
 ABI-encoded. Instead it will be returned without modifications (not even padding).
 
 In the worst case, if a payable fallback function is also used in
@@ -397,7 +397,7 @@ operations as long as there is enough gas passed on to it.
     for the function selector and then
     you can use ``abi.decode`` together with the array slice syntax to
     decode ABI-encoded data:
-    ``(c, d) = abi.decode(_input[4:], (uint256, uint256));``
+    ``(c, d) = abi.decode(input[4:], (uint256, uint256));``
     Note that this should only be used as a last resort and
     proper functions should be used instead.
 
@@ -486,13 +486,13 @@ The following example shows overloading of the function
     pragma solidity >=0.4.16 <0.9.0;
 
     contract A {
-        function f(uint _in) public pure returns (uint out) {
-            out = _in;
+        function f(uint value) public pure returns (uint out) {
+            out = value;
         }
 
-        function f(uint _in, bool _really) public pure returns (uint out) {
-            if (_really)
-                out = _in;
+        function f(uint value, bool really) public pure returns (uint out) {
+            if (really)
+                out = value;
         }
     }
 
@@ -506,12 +506,12 @@ externally visible functions differ by their Solidity types but not by their ext
 
     // This will not compile
     contract A {
-        function f(B _in) public pure returns (B out) {
-            out = _in;
+        function f(B value) public pure returns (B out) {
+            out = value;
         }
 
-        function f(address _in) public pure returns (address out) {
-            out = _in;
+        function f(address value) public pure returns (address out) {
+            out = value;
         }
     }
 
@@ -539,12 +539,12 @@ candidate, resolution fails.
     pragma solidity >=0.4.16 <0.9.0;
 
     contract A {
-        function f(uint8 _in) public pure returns (uint8 out) {
-            out = _in;
+        function f(uint8 val) public pure returns (uint8 out) {
+            out = val;
         }
 
-        function f(uint256 _in) public pure returns (uint256 out) {
-            out = _in;
+        function f(uint256 val) public pure returns (uint256 out) {
+            out = val;
         }
     }
 
diff --git a/docs/contracts/inheritance.rst b/docs/contracts/inheritance.rst
index b77feda0a1..54817837c4 100644
--- a/docs/contracts/inheritance.rst
+++ b/docs/contracts/inheritance.rst
@@ -421,8 +421,8 @@ equivalent to ``constructor() {}``. For example:
     abstract contract A {
         uint public a;
 
-        constructor(uint _a) {
-            a = _a;
+        constructor(uint a_) {
+            a = a_;
         }
     }
 
@@ -459,7 +459,7 @@ derived contracts need to specify all of them. This can be done in two ways:
 
     contract Base {
         uint x;
-        constructor(uint _x) { x = _x; }
+        constructor(uint x_) { x = x_; }
     }
 
     // Either directly specify in the inheritance list...
@@ -469,12 +469,12 @@ derived contracts need to specify all of them. This can be done in two ways:
 
     // or through a "modifier" of the derived constructor.
     contract Derived2 is Base {
-        constructor(uint _y) Base(_y * _y) {}
+        constructor(uint y) Base(y * y) {}
     }
 
 One way is directly in the inheritance list (``is Base(7)``).  The other is in
 the way a modifier is invoked as part of
-the derived constructor (``Base(_y * _y)``). The first way to
+the derived constructor (``Base(y * y)``). The first way to
 do it is more convenient if the constructor argument is a
 constant and defines the behaviour of the contract or
 describes it. The second way has to be used if the
diff --git a/docs/contracts/libraries.rst b/docs/contracts/libraries.rst
index 76bedba49b..c40284b499 100644
--- a/docs/contracts/libraries.rst
+++ b/docs/contracts/libraries.rst
@@ -146,16 +146,16 @@ custom types without the overhead of external function calls:
             r.limbs[0] = x;
         }
 
-        function add(bigint memory _a, bigint memory _b) internal pure returns (bigint memory r) {
-            r.limbs = new uint[](max(_a.limbs.length, _b.limbs.length));
+        function add(bigint memory a, bigint memory b) internal pure returns (bigint memory r) {
+            r.limbs = new uint[](max(a.limbs.length, b.limbs.length));
             uint carry = 0;
             for (uint i = 0; i < r.limbs.length; ++i) {
-                uint a = limb(_a, i);
-                uint b = limb(_b, i);
+                uint limbA = limb(a, i);
+                uint limbB = limb(b, i);
                 unchecked {
-                    r.limbs[i] = a + b + carry;
+                    r.limbs[i] = limbA + limbB + carry;
 
-                    if (a + b < a || (a + b == type(uint).max && carry > 0))
+                    if (limbA + limbB < limbA || (limbA + limbB == type(uint).max && carry > 0))
                         carry = 1;
                     else
                         carry = 0;
@@ -172,8 +172,8 @@ custom types without the overhead of external function calls:
             }
         }
 
-        function limb(bigint memory _a, uint _limb) internal pure returns (uint) {
-            return _limb < _a.limbs.length ? _a.limbs[_limb] : 0;
+        function limb(bigint memory a, uint index) internal pure returns (uint) {
+            return index < a.limbs.length ? a.limbs[index] : 0;
         }
 
         function max(uint a, uint b) private pure returns (uint) {
diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index c95a419e63..7711935474 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -128,13 +128,13 @@ In this example, we will use a library.
             data.push(value);
         }
 
-        function replace(uint _old, uint _new) public {
+        function replace(uint from, uint to) public {
             // This performs the library function call
-            uint index = data.indexOf(_old);
+            uint index = data.indexOf(from);
             if (index == type(uint).max)
-                data.push(_new);
+                data.push(to);
             else
-                data[index] = _new;
+                data[index] = to;
         }
     }
 
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 94188a0974..7adbfaedba 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -168,8 +168,8 @@ following:
 
 .. code-block:: solidity
 
-    function balances(address _account) external view returns (uint) {
-        return balances[_account];
+    function balances(address account) external view returns (uint) {
+        return balances[account];
     }
 
 You can use this function to query the balance of a single account.
diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index f235accafc..fb307e64c5 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -74,8 +74,8 @@ hiding new and different behavior in existing code.
       // SPDX-License-Identifier: GPL-3.0
       pragma solidity >=0.7.0;
       contract C {
-          function f(uint _a) public pure mod() returns (uint _r) {
-              _r = _a++;
+          function f(uint a) public pure mod() returns (uint r) {
+              r = a++;
           }
           modifier mod() { _; _; }
       }
@@ -166,7 +166,7 @@ This causes differences in some contracts, for example:
 
       contract C {
           bytes x;
-          function f() public returns (uint _r) {
+          function f() public returns (uint r) {
               bytes memory m = "tmp";
               assembly {
                   mstore(m, 8)
@@ -174,7 +174,7 @@ This causes differences in some contracts, for example:
               }
               x = m;
               assembly {
-                  _r := sload(x.slot)
+                  r := sload(x.slot)
               }
           }
       }
@@ -197,8 +197,8 @@ This causes differences in some contracts, for example:
       // SPDX-License-Identifier: GPL-3.0
       pragma solidity >=0.8.1;
       contract C {
-          function preincr_u8(uint8 _a) public pure returns (uint8) {
-              return ++_a + _a;
+          function preincr_u8(uint8 a) public pure returns (uint8) {
+              return ++a + a;
           }
       }
 
@@ -218,11 +218,11 @@ This causes differences in some contracts, for example:
       // SPDX-License-Identifier: GPL-3.0
       pragma solidity >=0.8.1;
       contract C {
-          function add(uint8 _a, uint8 _b) public pure returns (uint8) {
-              return _a + _b;
+          function add(uint8 a, uint8 b) public pure returns (uint8) {
+              return a + b;
           }
-          function g(uint8 _a, uint8 _b) public pure returns (uint8) {
-              return add(++_a + ++_b, _a + _b);
+          function g(uint8 a, uint8 b) public pure returns (uint8) {
+              return add(++a + ++b, a + b);
           }
       }
 
@@ -321,13 +321,13 @@ For example:
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.1;
     contract C {
-        function f(uint8 _a) public pure returns (uint _r1, uint _r2)
+        function f(uint8 a) public pure returns (uint r1, uint r2)
         {
-            _a = ~_a;
+            a = ~a;
             assembly {
-                _r1 := _a
+                r1 := a
             }
-            _r2 = _a;
+            r2 = a;
         }
     }
 
@@ -336,6 +336,6 @@ The function ``f(1)`` returns the following values:
 - Old code generator: (``fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe``, ``00000000000000000000000000000000000000000000000000000000000000fe``)
 - New code generator: (``00000000000000000000000000000000000000000000000000000000000000fe``, ``00000000000000000000000000000000000000000000000000000000000000fe``)
 
-Note that, unlike the new code generator, the old code generator does not perform a cleanup after the bit-not assignment (``_a = ~_a``).
-This results in different values being assigned (within the inline assembly block) to return value ``_r1`` between the old and new code generators.
-However, both code generators perform a cleanup before the new value of ``_a`` is assigned to ``_r2``.
+Note that, unlike the new code generator, the old code generator does not perform a cleanup after the bit-not assignment (``a = ~a``).
+This results in different values being assigned (within the inline assembly block) to return value ``r1`` between the old and new code generators.
+However, both code generators perform a cleanup before the new value of ``a`` is assigned to ``r2``.
diff --git a/docs/security-considerations.rst b/docs/security-considerations.rst
index 09770c5707..ceadfd0bc0 100644
--- a/docs/security-considerations.rst
+++ b/docs/security-considerations.rst
@@ -210,9 +210,9 @@ using a second proxy:
     contract ProxyWithMoreFunctionality {
         PermissionlessProxy proxy;
 
-        function callOther(address _addr, bytes memory _payload) public
+        function callOther(address addr, bytes memory payload) public
                 returns (bool, bytes memory) {
-            return proxy.callOther(_addr, _payload);
+            return proxy.callOther(addr, payload);
         }
         // Other functions and other functionality
     }
@@ -220,9 +220,9 @@ using a second proxy:
     // This is the full contract, it has no other functionality and
     // requires no privileges to work.
     contract PermissionlessProxy {
-        function callOther(address _addr, bytes memory _payload) public
+        function callOther(address addr, bytes memory payload) public
                 returns (bool, bytes memory) {
-            return _addr.call(_payload);
+            return addr.call(payload);
         }
     }
 
@@ -331,17 +331,17 @@ field of a ``struct`` that is the base type of a dynamic storage array.  The
     contract Map {
         mapping (uint => uint)[] array;
 
-        function allocate(uint _newMaps) public {
-            for (uint i = 0; i < _newMaps; i++)
+        function allocate(uint newMaps) public {
+            for (uint i = 0; i < newMaps; i++)
                 array.push();
         }
 
-        function writeMap(uint _map, uint _key, uint _value) public {
-            array[_map][_key] = _value;
+        function writeMap(uint map, uint key, uint value) public {
+            array[map][key] = value;
         }
 
-        function readMap(uint _map, uint _key) public view returns (uint) {
-            return array[_map][_key];
+        function readMap(uint map, uint key) public view returns (uint) {
+            return array[map][key];
         }
 
         function eraseMaps() public {
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index 791659897e..5093408a7e 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -82,12 +82,12 @@ Overflow
         uint immutable x;
         uint immutable y;
 
-        function add(uint _x, uint _y) internal pure returns (uint) {
-            return _x + _y;
+        function add(uint x_, uint y_) internal pure returns (uint) {
+            return x_ + y_;
         }
 
-        constructor(uint _x, uint _y) {
-            (x, y) = (_x, _y);
+        constructor(uint x_, uint y_) {
+            (x, y) = (x_, y_);
         }
 
         function stateAdd() public view returns (uint) {
@@ -116,7 +116,7 @@ Here, it reports the following:
         Overflow.add(1, 115792089237316195423570985008687907853269984665640564039457584007913129639935) -- internal call
      --> o.sol:9:20:
       |
-    9 |             return _x + _y;
+    9 |             return x_ + y_;
       |                    ^^^^^^^
 
 If we add ``require`` statements that filter out overflow cases,
@@ -131,12 +131,12 @@ the SMTChecker proves that no overflow is reachable (by not reporting warnings):
         uint immutable x;
         uint immutable y;
 
-        function add(uint _x, uint _y) internal pure returns (uint) {
-            return _x + _y;
+        function add(uint x_, uint y_) internal pure returns (uint) {
+            return x_ + y_;
         }
 
-        constructor(uint _x, uint _y) {
-            (x, y) = (_x, _y);
+        constructor(uint x_, uint y_) {
+            (x, y) = (x_, y_);
         }
 
         function stateAdd() public view returns (uint) {
@@ -155,7 +155,7 @@ An assertion represents an invariant in your code: a property that must be true
 
 The code below defines a function ``f`` that guarantees no overflow.
 Function ``inv`` defines the specification that ``f`` is monotonically increasing:
-for every possible pair ``(_a, _b)``, if ``_b > _a`` then ``f(_b) > f(_a)``.
+for every possible pair ``(a, b)``, if ``b > a`` then ``f(b) > f(a)``.
 Since ``f`` is indeed monotonically increasing, the SMTChecker proves that our
 property is correct. You are encouraged to play with the property and the function
 definition to see what results come out!
@@ -166,14 +166,14 @@ definition to see what results come out!
     pragma solidity >=0.8.0;
 
     contract Monotonic {
-        function f(uint _x) internal pure returns (uint) {
-            require(_x < type(uint128).max);
-            return _x * 42;
+        function f(uint x) internal pure returns (uint) {
+            require(x < type(uint128).max);
+            return x * 42;
         }
 
-        function inv(uint _a, uint _b) public pure {
-            require(_b > _a);
-            assert(f(_b) > f(_a));
+        function inv(uint a, uint b) public pure {
+            require(b > a);
+            assert(f(b) > f(a));
         }
     }
 
@@ -188,14 +188,14 @@ equal every element in the array.
     pragma solidity >=0.8.0;
 
     contract Max {
-        function max(uint[] memory _a) public pure returns (uint) {
+        function max(uint[] memory a) public pure returns (uint) {
             uint m = 0;
-            for (uint i = 0; i < _a.length; ++i)
-                if (_a[i] > m)
-                    m = _a[i];
+            for (uint i = 0; i < a.length; ++i)
+                if (a[i] > m)
+                    m = a[i];
 
-            for (uint i = 0; i < _a.length; ++i)
-                assert(m >= _a[i]);
+            for (uint i = 0; i < a.length; ++i)
+                assert(m >= a[i]);
 
             return m;
         }
@@ -222,15 +222,15 @@ For example, changing the code to
     pragma solidity >=0.8.0;
 
     contract Max {
-        function max(uint[] memory _a) public pure returns (uint) {
-            require(_a.length >= 5);
+        function max(uint[] memory a) public pure returns (uint) {
+            require(a.length >= 5);
             uint m = 0;
-            for (uint i = 0; i < _a.length; ++i)
-                if (_a[i] > m)
-                    m = _a[i];
+            for (uint i = 0; i < a.length; ++i)
+                if (a[i] > m)
+                    m = a[i];
 
-            for (uint i = 0; i < _a.length; ++i)
-                assert(m > _a[i]);
+            for (uint i = 0; i < a.length; ++i)
+                assert(m > a[i]);
 
             return m;
         }
@@ -243,7 +243,7 @@ gives us:
     Warning: CHC: Assertion violation happens here.
     Counterexample:
 
-    _a = [0, 0, 0, 0, 0]
+    a = [0, 0, 0, 0, 0]
      = 0
 
     Transaction trace:
@@ -251,7 +251,7 @@ gives us:
     Test.max([0, 0, 0, 0, 0])
       --> max.sol:14:4:
        |
-    14 |            assert(m > _a[i]);
+    14 |            assert(m > a[i]);
 
 
 State Properties
@@ -383,9 +383,9 @@ anything, including reenter the caller contract.
 
         Unknown immutable unknown;
 
-        constructor(Unknown _u) {
-            require(address(_u) != address(0));
-            unknown = _u;
+        constructor(Unknown u) {
+            require(address(u) != address(0));
+            unknown = u;
         }
 
         modifier mutex {
@@ -395,8 +395,8 @@ anything, including reenter the caller contract.
             lock = false;
         }
 
-        function set(uint _x) mutex public {
-            x = _x;
+        function set(uint x_) mutex public {
+            x = x_;
         }
 
         function run() mutex public {
@@ -754,15 +754,15 @@ not mean loss of proving power.
     {
         function f(
             bytes32 hash,
-            uint8 _v1, uint8 _v2,
-            bytes32 _r1, bytes32 _r2,
-            bytes32 _s1, bytes32 _s2
+            uint8 v1, uint8 v2,
+            bytes32 r1, bytes32 r2,
+            bytes32 s1, bytes32 s2
         ) public pure returns (address) {
-            address a1 = ecrecover(hash, _v1, _r1, _s1);
-            require(_v1 == _v2);
-            require(_r1 == _r2);
-            require(_s1 == _s2);
-            address a2 = ecrecover(hash, _v2, _r2, _s2);
+            address a1 = ecrecover(hash, v1, r1, s1);
+            require(v1 == v2);
+            require(r1 == r2);
+            require(s1 == s2);
+            address a2 = ecrecover(hash, v2, r2, s2);
             assert(a1 == a2);
             return a1;
         }
diff --git a/docs/types/mapping-types.rst b/docs/types/mapping-types.rst
index 399523cf22..1c94b20ab5 100644
--- a/docs/types/mapping-types.rst
+++ b/docs/types/mapping-types.rst
@@ -4,12 +4,12 @@
 Mapping Types
 =============
 
-Mapping types use the syntax ``mapping(_KeyType => _ValueType)`` and variables
-of mapping type are declared using the syntax ``mapping(_KeyType => _ValueType) _VariableName``.
-The ``_KeyType`` can be any
+Mapping types use the syntax ``mapping(KeyType => ValueType)`` and variables
+of mapping type are declared using the syntax ``mapping(KeyType => ValueType) VariableName``.
+The ``KeyType`` can be any
 built-in value type, ``bytes``, ``string``, or any contract or enum type. Other user-defined
 or complex types, such as mappings, structs or array types are not allowed.
-``_ValueType`` can be any type, including mappings, arrays and structs.
+``ValueType`` can be any type, including mappings, arrays and structs.
 
 You can think of mappings as `hash tables <https://en.wikipedia.org/wiki/Hash_table>`_, which are virtually initialised
 such that every possible key exists and is mapped to a value whose
@@ -29,10 +29,10 @@ of contract functions that are publicly visible.
 These restrictions are also true for arrays and structs that contain mappings.
 
 You can mark state variables of mapping type as ``public`` and Solidity creates a
-:ref:`getter <visibility-and-getters>` for you. The ``_KeyType`` becomes a parameter for the getter.
-If ``_ValueType`` is a value type or a struct, the getter returns ``_ValueType``.
-If ``_ValueType`` is an array or a mapping, the getter has one parameter for
-each ``_KeyType``, recursively.
+:ref:`getter <visibility-and-getters>` for you. The ``KeyType`` becomes a parameter for the getter.
+If ``ValueType`` is a value type or a struct, the getter returns ``ValueType``.
+If ``ValueType`` is an array or a mapping, the getter has one parameter for
+each ``KeyType``, recursively.
 
 In the example below, the ``MappingExample`` contract defines a public ``balances``
 mapping, with the key type an ``address``, and a value type a ``uint``, mapping
diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index f595612c02..74b6daa7ff 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -511,21 +511,21 @@ Array slices are useful to ABI-decode secondary data passed in function paramete
         /// @dev Address of the client contract managed by proxy i.e., this contract
         address client;
 
-        constructor(address _client) {
-            client = _client;
+        constructor(address client_) {
+            client = client_;
         }
 
         /// Forward call to "setOwner(address)" that is implemented by client
         /// after doing basic validation on the address argument.
-        function forward(bytes calldata _payload) external {
-            bytes4 sig = bytes4(_payload[:4]);
-            // Due to truncating behaviour, bytes4(_payload) performs identically.
-            // bytes4 sig = bytes4(_payload);
+        function forward(bytes calldata payload) external {
+            bytes4 sig = bytes4(payload[:4]);
+            // Due to truncating behaviour, bytes4(payload) performs identically.
+            // bytes4 sig = bytes4(payload);
             if (sig == bytes4(keccak256("setOwner(address)"))) {
-                address owner = abi.decode(_payload[4:], (address));
+                address owner = abi.decode(payload[4:], (address));
                 require(owner != address(0), "Address of owner cannot be zero.");
             }
-            (bool status,) = client.delegatecall(_payload);
+            (bool status,) = client.delegatecall(payload);
             require(status, "Forwarded call failed.");
         }
     }

From 9188519f114d6f6f1aa450817a6797567ab3be85 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 16 Nov 2021 17:01:09 +0100
Subject: [PATCH 0485/1748] Using for with global binding.

---
 Changelog.md                                  |  1 +
 docs/contracts/using-for.rst                  |  7 +++
 docs/grammar/SolidityLexer.g4                 |  1 +
 docs/grammar/SolidityParser.g4                |  4 +-
 libsolidity/analysis/SyntaxChecker.cpp        | 12 +++++
 libsolidity/analysis/TypeChecker.cpp          | 22 +++++++++
 libsolidity/ast/AST.h                         | 15 ++++++-
 libsolidity/ast/ASTJsonConverter.cpp          |  1 +
 libsolidity/ast/ASTJsonImporter.cpp           |  3 +-
 libsolidity/ast/Types.cpp                     |  7 +++
 libsolidity/parsing/Parser.cpp                |  8 +++-
 .../ASTJSON/using_for_directive.json          |  2 +
 .../using_for_directive_parseOnly.json        |  2 +
 .../semanticTests/using/recursive_import.sol  | 25 +++++++++++
 .../using/using_global_for_global.sol         | 20 +++++++++
 .../using/using_global_invisible.sol          | 45 +++++++++++++++++++
 .../using/using_global_library.sol            | 27 +++++++++++
 .../syntaxTests/using/global_and_local.sol    | 21 +++++++++
 .../syntaxTests/using/global_for_asterisk.sol |  5 +++
 .../using/global_for_non_user_defined.sol     |  4 ++
 .../global_for_type_defined_elsewhere.sol     |  7 +++
 .../using/global_for_type_from_other_file.sol | 14 ++++++
 .../using/global_inside_contract.sol          |  7 +++
 .../syntaxTests/using/global_local_clash.sol  | 21 +++++++++
 .../syntaxTests/using/global_nonglobal.sol    | 17 +++++++
 .../syntaxTests/using/global_working.sol      | 15 +++++++
 26 files changed, 307 insertions(+), 6 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/using/recursive_import.sol
 create mode 100644 test/libsolidity/semanticTests/using/using_global_for_global.sol
 create mode 100644 test/libsolidity/semanticTests/using/using_global_invisible.sol
 create mode 100644 test/libsolidity/semanticTests/using/using_global_library.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_and_local.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_for_asterisk.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_inside_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_local_clash.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_nonglobal.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_working.sol

diff --git a/Changelog.md b/Changelog.md
index 213ecd2692..6227ada01f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,7 @@
 Language Features:
  * General: Allow annotating inline assembly as memory-safe to allow optimizations and stack limit evasion that rely on respecting Solidity's memory model.
  * General: ``using M for Type;`` is allowed at file level and ``M`` can now also be a brace-enclosed list of free functions or library functions.
+ * General: ``using ... for T global;`` is allowed at file level where the user-defined type ``T`` has been defined, resulting in the effect of the statement being available everywhere ``T`` is available.
 
 
 Compiler Features:
diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index c95a419e63..a0f68104ce 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -42,6 +42,13 @@ scope (either the contract or the current module/source unit),
 including within all of its functions, and has no effect
 outside of the contract or module in which it is used.
 
+When the directive is used at file level and applied to a
+user-defined type which was defined at file level in the same file,
+the word ``global`` can be added at the end. This will have the
+effect that the functions are attached to the type everywhere
+the type is available (including other files), not only in the
+scope of the using statement.
+
 Let us rewrite the set example from the
 :ref:`libraries` section in this way, using file-level functions
 instead of library functions.
diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index 653255ae36..9250835dd2 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -47,6 +47,7 @@ FixedBytes:
 	'bytes25' | 'bytes26' | 'bytes27' | 'bytes28' | 'bytes29' | 'bytes30' | 'bytes31' | 'bytes32';
 For: 'for';
 Function: 'function';
+Global: 'global'; // not a real keyword
 Hex: 'hex';
 If: 'if';
 Immutable: 'immutable';
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index 415dd5985c..92718b9752 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -315,7 +315,7 @@ errorDefinition:
  * Using directive to bind library functions and free functions to types.
  * Can occur within contracts and libraries and at the file level.
  */
-usingDirective: Using (identifierPath | (LBrace identifierPath (Comma identifierPath)* RBrace)) For (Mul | typeName) Semicolon;
+usingDirective: Using (identifierPath | (LBrace identifierPath (Comma identifierPath)* RBrace)) For (Mul | typeName) Global? Semicolon;
 /**
  * A type name can be an elementary type, a function type, a mapping type, a user-defined type
  * (e.g. a contract or struct) or an array type.
@@ -389,7 +389,7 @@ inlineArrayExpression: LBrack (expression ( Comma expression)* ) RBrack;
 /**
  * Besides regular non-keyword Identifiers, some keywords like 'from' and 'error' can also be used as identifiers.
  */
-identifier: Identifier | From | Error | Revert;
+identifier: Identifier | From | Error | Revert | Global;
 
 literal: stringLiteral | numberLiteral | booleanLiteral | hexStringLiteral | unicodeStringLiteral;
 booleanLiteral: True | False;
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index b6a30e6646..bdf138e202 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -417,6 +417,18 @@ bool SyntaxChecker::visit(UsingForDirective const& _usingFor)
 			_usingFor.location(),
 			"The type has to be specified explicitly when attaching specific functions."
 		);
+	if (_usingFor.global() && !_usingFor.typeName())
+		m_errorReporter.syntaxError(
+			2854_error,
+			_usingFor.location(),
+			"Can only globally bind functions to specific types."
+		);
+	if (_usingFor.global() && m_currentContractKind)
+		m_errorReporter.syntaxError(
+			3367_error,
+			_usingFor.location(),
+			"\"global\" can only be used at file level."
+		);
 	if (m_currentContractKind == ContractKind::Interface)
 		m_errorReporter.syntaxError(
 			9088_error,
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 4bf30d4eb3..43334563be 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3656,6 +3656,28 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 	);
 	solAssert(normalizedType);
 
+	if (_usingFor.global())
+	{
+		if (m_currentContract)
+			solAssert(m_errorReporter.hasErrors());
+		if (Declaration const* typeDefinition = _usingFor.typeName()->annotation().type->typeDefinition())
+		{
+			if (typeDefinition->scope() != m_currentSourceUnit)
+				m_errorReporter.typeError(
+					4117_error,
+					_usingFor.location(),
+					"Can only use \"global\" with types defined in the same source unit at file level."
+				);
+		}
+		else
+			m_errorReporter.typeError(
+				8841_error,
+				_usingFor.location(),
+				"Can only use \"global\" with user-defined types."
+			);
+	}
+
+
 	for (ASTPointer<IdentifierPath> const& path: _usingFor.functionsOrLibrary())
 	{
 		solAssert(path->annotation().referencedDeclaration);
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 613d91ad99..4eba73c5d8 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -641,6 +641,10 @@ class InheritanceSpecifier: public ASTNode
  * For version 3, T has to be implicitly convertible to the first parameter type of
  * all functions, and this is checked at the point of the using statement. For versions 1 and
  * 2, this check is only done when a function is called.
+ *
+ * Finally, `using {f1, f2, ..., fn} for T global` is also valid at file level, as long as T is
+ * a user-defined type defined in the same file at file level. In this case, the methods are
+ * attached to all objects of that type regardless of scope.
  */
 class UsingForDirective: public ASTNode
 {
@@ -650,9 +654,14 @@ class UsingForDirective: public ASTNode
 		SourceLocation const& _location,
 		std::vector<ASTPointer<IdentifierPath>> _functions,
 		bool _usesBraces,
-		ASTPointer<TypeName> _typeName
+		ASTPointer<TypeName> _typeName,
+		bool _global
 	):
-		ASTNode(_id, _location), m_functions(_functions), m_usesBraces(_usesBraces), m_typeName(std::move(_typeName))
+		ASTNode(_id, _location),
+		m_functions(_functions),
+		m_usesBraces(_usesBraces),
+		m_typeName(std::move(_typeName)),
+		m_global{_global}
 	{
 	}
 
@@ -665,12 +674,14 @@ class UsingForDirective: public ASTNode
 	/// @returns a list of functions or the single library.
 	std::vector<ASTPointer<IdentifierPath>> const& functionsOrLibrary() const { return m_functions; }
 	bool usesBraces() const { return m_usesBraces; }
+	bool global() const { return m_global; }
 
 private:
 	/// Either the single library or a list of functions.
 	std::vector<ASTPointer<IdentifierPath>> m_functions;
 	bool m_usesBraces;
 	ASTPointer<TypeName> m_typeName;
+	bool m_global = false;
 };
 
 class StructDefinition: public Declaration, public ScopeOpener
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index bd9ce129a3..4338cc64f5 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -328,6 +328,7 @@ bool ASTJsonConverter::visit(UsingForDirective const& _node)
 	}
 	else
 		attributes.emplace_back("libraryName", toJson(*_node.functionsOrLibrary().front()));
+	attributes.emplace_back("global", _node.global());
 
 	setJsonNode(_node, "UsingForDirective", move(attributes));
 
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index ce0575fab8..2f36cdead4 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -359,7 +359,8 @@ ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json::Val
 		_node,
 		move(functions),
 		!_node.isMember("libraryName"),
-		_node["typeName"].isNull() ? nullptr  : convertJsonToASTNode<TypeName>(_node["typeName"])
+		_node["typeName"].isNull() ? nullptr  : convertJsonToASTNode<TypeName>(_node["typeName"]),
+		memberAsBool(_node, "global")
 	);
 }
 
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 29475fc4ab..cedac68f32 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -342,6 +342,13 @@ MemberList::MemberMap Type::boundFunctions(Type const& _type, ASTNode const& _sc
 		solAssert(sourceUnit, "");
 	usingForDirectives += ASTNode::filteredNodes<UsingForDirective>(sourceUnit->nodes());
 
+	if (Declaration const* typeDefinition = _type.typeDefinition())
+		if (auto const* sourceUnit = dynamic_cast<SourceUnit const*>(typeDefinition->scope()))
+			for (auto usingFor: ASTNode::filteredNodes<UsingForDirective>(sourceUnit->nodes()))
+				// We do not yet compare the type name because of normalization.
+				if (usingFor->global() && usingFor->typeName())
+					usingForDirectives.emplace_back(usingFor);
+
 	// Normalise data location of type.
 	DataLocation typeLocation = DataLocation::Storage;
 	if (auto refType = dynamic_cast<ReferenceType const*>(&_type))
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 0ded8ea043..a1b49a81f3 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -987,9 +987,15 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 		advance();
 	else
 		typeName = parseTypeName();
+	bool global = false;
+	if (m_scanner->currentToken() == Token::Identifier && currentLiteral() == "global")
+	{
+		global = true;
+		advance();
+	}
 	nodeFactory.markEndPosition();
 	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<UsingForDirective>(move(functions), usesBraces, typeName);
+	return nodeFactory.createNode<UsingForDirective>(move(functions), usesBraces, typeName, global);
 }
 
 ASTPointer<ModifierInvocation> Parser::parseModifierInvocation()
diff --git a/test/libsolidity/ASTJSON/using_for_directive.json b/test/libsolidity/ASTJSON/using_for_directive.json
index 37877ff171..c9052b0d7d 100644
--- a/test/libsolidity/ASTJSON/using_for_directive.json
+++ b/test/libsolidity/ASTJSON/using_for_directive.json
@@ -33,6 +33,7 @@
           }
         }
       ],
+      "global": false,
       "id": 3,
       "nodeType": "UsingForDirective",
       "src": "0:19:1",
@@ -154,6 +155,7 @@
       "nodes":
       [
         {
+          "global": false,
           "id": 12,
           "libraryName":
           {
diff --git a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
index dcc5ce8d15..d704b4e815 100644
--- a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
+++ b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
@@ -17,6 +17,7 @@
           }
         }
       ],
+      "global": false,
       "id": 3,
       "nodeType": "UsingForDirective",
       "src": "0:19:1",
@@ -111,6 +112,7 @@
       "nodes":
       [
         {
+          "global": false,
           "id": 12,
           "libraryName":
           {
diff --git a/test/libsolidity/semanticTests/using/recursive_import.sol b/test/libsolidity/semanticTests/using/recursive_import.sol
new file mode 100644
index 0000000000..09d27db60f
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/recursive_import.sol
@@ -0,0 +1,25 @@
+==== Source: A ====
+import {T as U} from "A";
+import "A" as X;
+
+type T is uint;
+function f(T x) pure returns (T) { return T.wrap(T.unwrap(x) + 1); }
+function g(T x) pure returns (uint) { return T.unwrap(x) + 10; }
+
+using { f } for X.X.U global;
+using { g } for T global;
+
+function cr() pure returns (T) {}
+
+==== Source: B ====
+import { cr } from "A";
+
+contract C {
+    function f() public returns (uint) {
+        return cr().f().g();
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// f() -> 11
diff --git a/test/libsolidity/semanticTests/using/using_global_for_global.sol b/test/libsolidity/semanticTests/using/using_global_for_global.sol
new file mode 100644
index 0000000000..7d7809d2ae
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/using_global_for_global.sol
@@ -0,0 +1,20 @@
+==== Source: A ====
+type global is uint;
+using { f } for global global;
+function f(global x) pure returns (global) { return global.wrap(global.unwrap(x) + 1); }
+==== Source: B ====
+import { global } from "A";
+
+function g(global x) pure returns (global) { return global.wrap(global.unwrap(x) + 10); }
+
+contract C {
+    using { g } for global;
+    function f(global r) public pure returns (global) {
+        return r.f().g();
+    }
+}
+
+// ====
+// compileViaYul: also
+// ----
+// f(uint256): 100 -> 111
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/using/using_global_invisible.sol b/test/libsolidity/semanticTests/using/using_global_invisible.sol
new file mode 100644
index 0000000000..e4bf286eeb
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/using_global_invisible.sol
@@ -0,0 +1,45 @@
+==== Source: A ====
+type T is uint;
+using L for T global;
+library L {
+    function inc(T x) internal pure returns (T) {
+        return T.wrap(T.unwrap(x) + 1);
+    }
+    function dec(T x) external pure returns (T) {
+        return T.wrap(T.unwrap(x) - 1);
+    }
+}
+using {unwrap} for T global;
+function unwrap(T x) pure returns (uint) {
+    return T.unwrap(x);
+}
+
+==== Source: B ====
+contract C {
+    function f() public pure returns (T r1) {
+        r1 = r1.inc().inc();
+    }
+}
+
+import {T} from "A";
+
+==== Source: C ====
+import {C} from "B";
+
+contract D {
+    function test() public returns (uint) {
+        C c = new C();
+        // This tests that bound functions are available
+        // even if the type is not available by name.
+        // This is a regular function call, a
+        // public and an internal library call
+        // and a free function call.
+        return c.f().inc().inc().dec().unwrap();
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// library: "A":L
+// test() -> 3
+// gas legacy: 130369
diff --git a/test/libsolidity/semanticTests/using/using_global_library.sol b/test/libsolidity/semanticTests/using/using_global_library.sol
new file mode 100644
index 0000000000..747ed6bd04
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/using_global_library.sol
@@ -0,0 +1,27 @@
+==== Source: A ====
+type T is uint;
+using L for T global;
+library L {
+    function inc(T x) internal pure returns (T) {
+        return T.wrap(T.unwrap(x) + 1);
+    }
+    function dec(T x) external pure returns (T) {
+        return T.wrap(T.unwrap(x) - 1);
+    }
+}
+
+==== Source: B ====
+contract C {
+    function f() public pure returns (T r1, T r2) {
+        r1 = r1.inc().inc();
+        r2 = r1.dec();
+    }
+}
+
+import {T} from "A";
+
+// ====
+// compileViaYul: also
+// ----
+// library: "A":L
+// f() -> 2, 1
diff --git a/test/libsolidity/syntaxTests/using/global_and_local.sol b/test/libsolidity/syntaxTests/using/global_and_local.sol
new file mode 100644
index 0000000000..7af04c0a60
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_and_local.sol
@@ -0,0 +1,21 @@
+==== Source: A ====
+using {f} for S global;
+struct S { uint x; }
+function gen() pure returns (S memory) {}
+function f(S memory _x) pure returns (uint) { return _x.x; }
+==== Source: B ====
+contract C {
+    using {fun} for S;
+    // Adds the same function again with the same name,
+    // so it's fine.
+    using {A.f} for S;
+
+    function test() pure public
+    {
+        uint p = g().f();
+        p = g().fun();
+    }
+}
+import {gen as g, f as fun, S} from "A";
+import "A" as A;
+// ----
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/using/global_for_asterisk.sol b/test/libsolidity/syntaxTests/using/global_for_asterisk.sol
new file mode 100644
index 0000000000..b5f6d88272
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_for_asterisk.sol
@@ -0,0 +1,5 @@
+using {f} for * global;
+function f(uint) pure{}
+// ----
+// SyntaxError 8118: (0-23): The type has to be specified explicitly at file level (cannot use '*').
+// SyntaxError 2854: (0-23): Can only globally bind functions to specific types.
diff --git a/test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol b/test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol
new file mode 100644
index 0000000000..051874abc9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_for_non_user_defined.sol
@@ -0,0 +1,4 @@
+using {f} for uint global;
+function f(uint) pure{}
+// ----
+// TypeError 8841: (0-26): Can only use "global" with user-defined types.
diff --git a/test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol b/test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol
new file mode 100644
index 0000000000..232ffafade
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_for_type_defined_elsewhere.sol
@@ -0,0 +1,7 @@
+using {f} for L.S global;
+function f(L.S memory) pure{}
+library L {
+    struct S { uint x; }
+}
+// ----
+// TypeError 4117: (0-25): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol b/test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol
new file mode 100644
index 0000000000..458a644e9a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_for_type_from_other_file.sol
@@ -0,0 +1,14 @@
+==== Source: A ====
+struct S { uint x; }
+==== Source: B ====
+
+using {f} for S global;
+using {f} for A.S global;
+
+function f(S memory) pure{}
+
+import {S} from "A";
+import "A" as A;
+// ----
+// TypeError 4117: (B:1-24): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 4117: (B:25-50): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_inside_contract.sol b/test/libsolidity/syntaxTests/using/global_inside_contract.sol
new file mode 100644
index 0000000000..edaeea9223
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_inside_contract.sol
@@ -0,0 +1,7 @@
+contract C {
+    using {f} for uint global;
+}
+function f(uint) pure{}
+// ----
+// SyntaxError 3367: (17-43): "global" can only be used at file level.
+// TypeError 8841: (17-43): Can only use "global" with user-defined types.
diff --git a/test/libsolidity/syntaxTests/using/global_local_clash.sol b/test/libsolidity/syntaxTests/using/global_local_clash.sol
new file mode 100644
index 0000000000..1d149417f2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_local_clash.sol
@@ -0,0 +1,21 @@
+==== Source: A ====
+using {f} for S global;
+struct S { uint x; }
+function gen() pure returns (S memory) {}
+function f(S memory _x) pure returns (uint) { return _x.x; }
+function f1(S memory _x) pure returns (uint) { return _x.x + 1; }
+==== Source: B ====
+contract C {
+    // Here, f points to f1, so we end up with two different functions
+    // bound as S.f
+    using {f} for S;
+
+    function test() pure public
+    {
+        uint p = g().f();
+    }
+}
+import {gen as g, f1 as f, S} from "A";
+import "A" as A;
+// ----
+// TypeError 6675: (B:181-186): Member "f" not unique after argument-dependent lookup in struct S memory.
diff --git a/test/libsolidity/syntaxTests/using/global_nonglobal.sol b/test/libsolidity/syntaxTests/using/global_nonglobal.sol
new file mode 100644
index 0000000000..972a34a8d1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_nonglobal.sol
@@ -0,0 +1,17 @@
+==== Source: A ====
+using {f} for S global;
+using {g} for S;
+struct S { uint x; }
+function gen() pure returns (S memory) {}
+function f(S memory _x) pure { _x.g(); }
+function g(S memory _x) pure { }
+==== Source: B ====
+import "A";
+function test() pure
+{
+    gen().f();
+    gen().g();
+}
+
+// ----
+// TypeError 9582: (B:54-61): Member "g" not found or not visible after argument-dependent lookup in struct S memory.
diff --git a/test/libsolidity/syntaxTests/using/global_working.sol b/test/libsolidity/syntaxTests/using/global_working.sol
new file mode 100644
index 0000000000..9447202451
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_working.sol
@@ -0,0 +1,15 @@
+==== Source: A ====
+using {f} for S global;
+// this should not conflict
+using {f} for S;
+struct S { uint x; }
+function gen() pure returns (S memory) {}
+function f(S memory _x) pure returns (uint) { return _x.x; }
+==== Source: B ====
+function test() pure
+{
+    uint p = g().f();
+    p++;
+}
+import {gen as g} from "A";
+// ----
\ No newline at end of file

From eab4ca906c2bcf9b44687f0eb5d2987bf75ec4dd Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Mar 2022 18:25:00 +0100
Subject: [PATCH 0486/1748] Refactor data flow analyzer state access.

---
 .../CommonSubexpressionEliminator.cpp         |  8 +++---
 libyul/optimiser/DataFlowAnalyzer.cpp         | 24 +++++++++++++++---
 libyul/optimiser/DataFlowAnalyzer.h           |  9 +++++++
 libyul/optimiser/EqualStoreEliminator.cpp     |  4 +--
 libyul/optimiser/ExpressionSimplifier.cpp     |  6 ++++-
 libyul/optimiser/KnowledgeBase.cpp            |  4 +--
 libyul/optimiser/KnowledgeBase.h              | 12 +++++----
 libyul/optimiser/LoadResolver.cpp             | 10 ++++----
 libyul/optimiser/Rematerialiser.cpp           | 25 +++++++++----------
 libyul/optimiser/SimplificationRules.cpp      |  8 +++---
 libyul/optimiser/SimplificationRules.h        |  4 +--
 libyul/optimiser/StackCompressor.cpp          |  9 ++++---
 libyul/optimiser/UnusedStoreEliminator.cpp    |  4 +--
 test/libyul/KnowledgeBaseTest.cpp             |  2 +-
 14 files changed, 81 insertions(+), 48 deletions(-)

diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
index 16cdfd8935..d25beb6bdd 100644
--- a/libyul/optimiser/CommonSubexpressionEliminator.cpp
+++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@@ -95,10 +95,10 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
 	if (Identifier const* identifier = get_if<Identifier>(&_e))
 	{
 		YulString identifierName = identifier->name;
-		if (m_value.count(identifierName))
+		if (AssignedValue const* assignedValue = variableValue(identifierName))
 		{
-			assertThrow(m_value.at(identifierName).value, OptimizerException, "");
-			if (Identifier const* value = get_if<Identifier>(m_value.at(identifierName).value))
+			assertThrow(assignedValue->value, OptimizerException, "");
+			if (Identifier const* value = get_if<Identifier>(assignedValue->value))
 				if (inScope(value->name))
 					_e = Identifier{debugDataOf(_e), value->name};
 		}
@@ -106,7 +106,7 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
 	else
 	{
 		// TODO this search is rather inefficient.
-		for (auto const& [variable, value]: m_value)
+		for (auto const& [variable, value]: allValues())
 		{
 			assertThrow(value.value, OptimizerException, "");
 			// Prevent using the default value of return variables
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index c1ad2116af..34622e738b 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -24,6 +24,7 @@
 
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Semantics.h>
+#include <libyul/optimiser/KnowledgeBase.h>
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Exceptions.h>
@@ -47,7 +48,7 @@ DataFlowAnalyzer::DataFlowAnalyzer(
 ):
 	m_dialect(_dialect),
 	m_functionSideEffects(std::move(_functionSideEffects)),
-	m_knowledgeBase(_dialect, m_value)
+	m_knowledgeBase(_dialect, [this](YulString _var) { return variableValue(_var); })
 {
 	if (auto const* builtin = _dialect.memoryStoreFunction(YulString{}))
 		m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
@@ -218,6 +219,22 @@ void DataFlowAnalyzer::operator()(Block& _block)
 	assertThrow(numScopes == m_variableScopes.size(), OptimizerException, "");
 }
 
+optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
+{
+	if (YulString const* value = util::valueOrNullptr(m_storage, _key))
+		return *value;
+	else
+		return nullopt;
+}
+
+optional<YulString> DataFlowAnalyzer::memoryValue(YulString _key) const
+{
+	if (YulString const* value = util::valueOrNullptr(m_memory, _key))
+		return *value;
+	else
+		return nullopt;
+}
+
 void DataFlowAnalyzer::handleAssignment(set<YulString> const& _variables, Expression* _value, bool _isDeclaration)
 {
 	if (!_isDeclaration)
@@ -386,8 +403,8 @@ bool DataFlowAnalyzer::inScope(YulString _variableName) const
 
 optional<u256> DataFlowAnalyzer::valueOfIdentifier(YulString const& _name)
 {
-	if (m_value.count(_name))
-		if (Literal const* literal = get_if<Literal>(m_value.at(_name).value))
+	if (AssignedValue const* value = variableValue(_name))
+		if (Literal const* literal = get_if<Literal>(value->value))
 			return valueOfLiteral(*literal);
 	return nullopt;
 }
@@ -416,3 +433,4 @@ std::optional<YulString> DataFlowAnalyzer::isSimpleLoad(
 				return key->name;
 	return {};
 }
+
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index deaa71f890..56e48fed5d 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -29,6 +29,7 @@
 #include <libyul/AST.h> // Needed for m_zero below.
 #include <libyul/SideEffects.h>
 
+#include <libsolutil/Numeric.h>
 #include <libsolutil/Common.h>
 
 #include <map>
@@ -38,6 +39,7 @@ namespace solidity::yul
 {
 struct Dialect;
 struct SideEffects;
+class KnowledgeBase;
 
 /// Value assigned to a variable.
 struct AssignedValue
@@ -98,6 +100,13 @@ class DataFlowAnalyzer: public ASTModifier
 	void operator()(ForLoop&) override;
 	void operator()(Block& _block) override;
 
+	/// @returns the current value of the given variable, if known - always movable.
+	AssignedValue const* variableValue(YulString _variable) const { return util::valueOrNullptr(m_value, _variable); }
+	std::set<YulString> const* references(YulString _variable) const { return util::valueOrNullptr(m_references, _variable); }
+	std::map<YulString, AssignedValue> const& allValues() const { return m_value; }
+	std::optional<YulString> storageValue(YulString _key) const;
+	std::optional<YulString> memoryValue(YulString _key) const;
+
 protected:
 	/// Registers the assignment.
 	void handleAssignment(std::set<YulString> const& _names, Expression* _value, bool _isDeclaration);
diff --git a/libyul/optimiser/EqualStoreEliminator.cpp b/libyul/optimiser/EqualStoreEliminator.cpp
index 56f9902f89..542d8d50b3 100644
--- a/libyul/optimiser/EqualStoreEliminator.cpp
+++ b/libyul/optimiser/EqualStoreEliminator.cpp
@@ -54,13 +54,13 @@ void EqualStoreEliminator::visit(Statement& _statement)
 	{
 		if (auto vars = isSimpleStore(StoreLoadLocation::Storage, *expression))
 		{
-			if (auto const* currentValue = util::valueOrNullptr(m_storage, vars->first))
+			if (optional<YulString> currentValue = storageValue(vars->first))
 				if (*currentValue == vars->second)
 					m_pendingRemovals.insert(&_statement);
 		}
 		else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, *expression))
 		{
-			if (auto const* currentValue = util::valueOrNullptr(m_memory, vars->first))
+			if (optional<YulString> currentValue = memoryValue(vars->first))
 				if (*currentValue == vars->second)
 					m_pendingRemovals.insert(&_statement);
 		}
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index 736ebe4b93..8c3a038f10 100644
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -38,6 +38,10 @@ void ExpressionSimplifier::visit(Expression& _expression)
 {
 	ASTModifier::visit(_expression);
 
-	while (auto const* match = SimplificationRules::findFirstMatch(_expression, m_dialect, m_value))
+	while (auto const* match = SimplificationRules::findFirstMatch(
+		_expression,
+		m_dialect,
+		[this](YulString _var) { return variableValue(_var); }
+	))
 		_expression = match->action().toExpression(debugDataOf(_expression));
 }
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index 5b5c07ddad..460f6707ff 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -80,8 +80,8 @@ bool KnowledgeBase::knownToBeZero(YulString _a)
 
 optional<u256> KnowledgeBase::valueIfKnownConstant(YulString _a)
 {
-	if (m_variableValues.count(_a))
-		if (Literal const* literal = get_if<Literal>(m_variableValues.at(_a).value))
+	if (AssignedValue const* value = m_variableValues(_a))
+		if (Literal const* literal = get_if<Literal>(value->value))
 			return valueOfLiteral(*literal);
 	return {};
 }
diff --git a/libyul/optimiser/KnowledgeBase.h b/libyul/optimiser/KnowledgeBase.h
index 75e060eb1b..999d0e312b 100644
--- a/libyul/optimiser/KnowledgeBase.h
+++ b/libyul/optimiser/KnowledgeBase.h
@@ -28,6 +28,7 @@
 #include <libsolutil/Numeric.h>
 
 #include <map>
+#include <functional>
 
 namespace solidity::yul
 {
@@ -37,15 +38,16 @@ struct AssignedValue;
 
 /**
  * Class that can answer questions about values of variables and their relations.
- *
- * The reference to the map of values provided at construction is assumed to be updating.
  */
 class KnowledgeBase
 {
 public:
-	KnowledgeBase(Dialect const& _dialect, std::map<YulString, AssignedValue> const& _variableValues):
+	KnowledgeBase(
+		Dialect const& _dialect,
+		std::function<AssignedValue const*(YulString)> _variableValues
+	):
 		m_dialect(_dialect),
-		m_variableValues(_variableValues)
+		m_variableValues(std::move(_variableValues))
 	{}
 
 	bool knownToBeDifferent(YulString _a, YulString _b);
@@ -60,7 +62,7 @@ class KnowledgeBase
 	Expression simplifyRecursively(Expression _expression);
 
 	Dialect const& m_dialect;
-	std::map<YulString, AssignedValue> const& m_variableValues;
+	std::function<AssignedValue const*(YulString)> m_variableValues;
 	size_t m_counter = 0;
 };
 
diff --git a/libyul/optimiser/LoadResolver.cpp b/libyul/optimiser/LoadResolver.cpp
index 550ca6fb36..abcfbaabb8 100644
--- a/libyul/optimiser/LoadResolver.cpp
+++ b/libyul/optimiser/LoadResolver.cpp
@@ -82,12 +82,12 @@ void LoadResolver::tryResolve(
 	YulString key = std::get<Identifier>(_arguments.at(0)).name;
 	if (_location == StoreLoadLocation::Storage)
 	{
-		if (auto value = util::valueOrNullptr(m_storage, key))
+		if (auto value = storageValue(key))
 			if (inScope(*value))
 				_e = Identifier{debugDataOf(_e), *value};
 	}
 	else if (!m_containsMSize && _location == StoreLoadLocation::Memory)
-		if (auto value = util::valueOrNullptr(m_memory, key))
+		if (auto value = memoryValue(key))
 			if (inScope(*value))
 				_e = Identifier{debugDataOf(_e), *value};
 }
@@ -129,10 +129,10 @@ void LoadResolver::tryEvaluateKeccak(
 	if (costOfLiteral > costOfKeccak)
 		return;
 
-	auto memoryValue = util::valueOrNullptr(m_memory, memoryKey->name);
-	if (memoryValue && inScope(*memoryValue))
+	optional<YulString> value = memoryValue(memoryKey->name);
+	if (value && inScope(*value))
 	{
-		optional<u256> memoryContent = valueOfIdentifier(*memoryValue);
+		optional<u256> memoryContent = valueOfIdentifier(*value);
 		optional<u256> byteLength = valueOfIdentifier(length->name);
 		if (memoryContent && byteLength && *byteLength <= 32)
 		{
diff --git a/libyul/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp
index f1597a7f20..6e00fcd8a2 100644
--- a/libyul/optimiser/Rematerialiser.cpp
+++ b/libyul/optimiser/Rematerialiser.cpp
@@ -79,16 +79,15 @@ void Rematerialiser::visit(Expression& _e)
 	{
 		Identifier& identifier = std::get<Identifier>(_e);
 		YulString name = identifier.name;
-		if (m_value.count(name))
+		if (AssignedValue const* value = variableValue(name))
 		{
-			assertThrow(m_value.at(name).value, OptimizerException, "");
-			AssignedValue const& value = m_value.at(name);
+			assertThrow(value->value, OptimizerException, "");
 			size_t refs = m_referenceCounts[name];
-			size_t cost = CodeCost::codeCost(m_dialect, *value.value);
+			size_t cost = CodeCost::codeCost(m_dialect, *value->value);
 			if (
 				(
 					!m_onlySelectedVariables && (
-						(refs <= 1 && value.loopDepth == m_loopDepth) ||
+						(refs <= 1 && value->loopDepth == m_loopDepth) ||
 						cost == 0 ||
 						(refs <= 5 && cost <= 1 && m_loopDepth == 0)
 					)
@@ -96,13 +95,14 @@ void Rematerialiser::visit(Expression& _e)
 			)
 			{
 				assertThrow(m_referenceCounts[name] > 0, OptimizerException, "");
-				if (ranges::all_of(m_references[name], [&](auto const& ref) { return inScope(ref); }))
+				auto variableReferences = references(name);
+				if (!variableReferences || ranges::all_of(*variableReferences, [&](auto const& ref) { return inScope(ref); }))
 				{
 					// update reference counts
 					m_referenceCounts[name]--;
-					for (auto const& ref: ReferencesCounter::countReferences(*value.value))
+					for (auto const& ref: ReferencesCounter::countReferences(*value->value))
 						m_referenceCounts[ref.first] += ref.second;
-					_e = (ASTCopier{}).translate(*value.value);
+					_e = (ASTCopier{}).translate(*value->value);
 				}
 			}
 		}
@@ -116,12 +116,11 @@ void LiteralRematerialiser::visit(Expression& _e)
 	{
 		Identifier& identifier = std::get<Identifier>(_e);
 		YulString name = identifier.name;
-		if (m_value.count(name))
+		if (AssignedValue const* value = variableValue(name))
 		{
-			Expression const* value = m_value.at(name).value;
-			assertThrow(value, OptimizerException, "");
-			if (holds_alternative<Literal>(*value))
-				_e = *value;
+			assertThrow(value->value, OptimizerException, "");
+			if (holds_alternative<Literal>(*value->value))
+				_e = *value->value;
 		}
 	}
 	DataFlowAnalyzer::visit(_e);
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index 3e906fcdff..9d0144750d 100644
--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -41,7 +41,7 @@ using namespace solidity::yul;
 SimplificationRules::Rule const* SimplificationRules::findFirstMatch(
 	Expression const& _expr,
 	Dialect const& _dialect,
-	map<YulString, AssignedValue> const& _ssaValues
+	function<AssignedValue const*(YulString)> const& _ssaValues
 )
 {
 	auto instruction = instructionAndArguments(_dialect, _expr);
@@ -138,7 +138,7 @@ void Pattern::setMatchGroup(unsigned _group, map<unsigned, Expression const*>& _
 bool Pattern::matches(
 	Expression const& _expr,
 	Dialect const& _dialect,
-	map<YulString, AssignedValue> const& _ssaValues
+	function<AssignedValue const*(YulString)> const& _ssaValues
 ) const
 {
 	Expression const* expr = &_expr;
@@ -148,8 +148,8 @@ bool Pattern::matches(
 	if (m_kind != PatternKind::Any && holds_alternative<Identifier>(_expr))
 	{
 		YulString varName = std::get<Identifier>(_expr).name;
-		if (_ssaValues.count(varName))
-			if (Expression const* new_expr = _ssaValues.at(varName).value)
+		if (AssignedValue const* value = _ssaValues(varName))
+			if (Expression const* new_expr = value->value)
 				expr = new_expr;
 	}
 	assertThrow(expr, OptimizerException, "");
diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
index 77018bb380..7444c47fb8 100644
--- a/libyul/optimiser/SimplificationRules.h
+++ b/libyul/optimiser/SimplificationRules.h
@@ -62,7 +62,7 @@ class SimplificationRules
 	static Rule const* findFirstMatch(
 		Expression const& _expr,
 		Dialect const& _dialect,
-		std::map<YulString, AssignedValue> const& _ssaValues
+		std::function<AssignedValue const*(YulString)> const& _ssaValues
 	);
 
 	/// Checks whether the rulelist is non-empty. This is usually enforced
@@ -119,7 +119,7 @@ class Pattern
 	bool matches(
 		Expression const& _expr,
 		Dialect const& _dialect,
-		std::map<YulString, AssignedValue> const& _ssaValues
+		std::function<AssignedValue const*(YulString)> const& _ssaValues
 	) const;
 
 	std::vector<Pattern> arguments() const { return m_arguments; }
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index 2deef5234a..8b06d66258 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -67,7 +67,8 @@ class RematCandidateSelector: public DataFlowAnalyzer
 			if (size_t const* cost = util::valueOrNullptr(m_expressionCodeCost, candidate))
 			{
 				size_t numRef = m_numReferences[candidate];
-				cand[*cost * numRef].emplace_back(candidate, m_references[candidate]);
+				set<YulString> const* ref = references(candidate);
+				cand[*cost * numRef].emplace_back(candidate, ref ? move(*ref) : set<YulString>{});
 			}
 		}
 		return cand;
@@ -80,11 +81,11 @@ class RematCandidateSelector: public DataFlowAnalyzer
 		if (_varDecl.variables.size() == 1)
 		{
 			YulString varName = _varDecl.variables.front().name;
-			if (m_value.count(varName))
+			if (AssignedValue const* value = variableValue(varName))
 			{
 				yulAssert(!m_expressionCodeCost.count(varName), "");
 				m_candidates.emplace_back(varName);
-				m_expressionCodeCost[varName] = CodeCost::codeCost(m_dialect, *m_value[varName].value);
+				m_expressionCodeCost[varName] = CodeCost::codeCost(m_dialect, *value->value);
 			}
 		}
 	}
@@ -105,7 +106,7 @@ class RematCandidateSelector: public DataFlowAnalyzer
 			YulString name = std::get<Identifier>(_e).name;
 			if (m_expressionCodeCost.count(name))
 			{
-				if (!m_value.count(name))
+				if (!variableValue(name))
 					rematImpossible(name);
 				else
 					++m_numReferences[name];
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index e3ff2d77a7..343bd720a1 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -238,7 +238,7 @@ bool UnusedStoreEliminator::knownUnrelated(
 	UnusedStoreEliminator::Operation const& _op2
 ) const
 {
-	KnowledgeBase knowledge(m_dialect, m_ssaValues);
+	KnowledgeBase knowledge(m_dialect, [this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
 
 	if (_op1.location != _op2.location)
 		return true;
@@ -319,7 +319,7 @@ bool UnusedStoreEliminator::knownCovered(
 		return true;
 	if (_covered.location == Location::Memory)
 	{
-		KnowledgeBase knowledge(m_dialect, m_ssaValues);
+		KnowledgeBase knowledge(m_dialect, [this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
 
 		if (_covered.length && knowledge.knownToBeZero(*_covered.length))
 			return true;
diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp
index ac48f962ff..ec2f0313d1 100644
--- a/test/libyul/KnowledgeBaseTest.cpp
+++ b/test/libyul/KnowledgeBaseTest.cpp
@@ -58,7 +58,7 @@ class KnowledgeBaseTest
 		for (auto const& [name, expression]: m_ssaValues.values())
 			m_values[name].value = expression;
 
-		return KnowledgeBase(m_dialect, m_values);
+		return KnowledgeBase(m_dialect, [this](YulString _var) { return util::valueOrNullptr(m_values, _var); });
 	}
 
 	EVMDialect m_dialect{EVMVersion{}, true};

From afdf22f5c77c89304110b303b9a39906c19b869e Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Mar 2022 19:35:58 +0100
Subject: [PATCH 0487/1748] Create a state struct.

---
 libyul/optimiser/DataFlowAnalyzer.cpp | 72 +++++++++++++--------------
 libyul/optimiser/DataFlowAnalyzer.h   | 24 +++++----
 2 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 34622e738b..65cdf31c32 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -65,20 +65,20 @@ void DataFlowAnalyzer::operator()(ExpressionStatement& _statement)
 	if (auto vars = isSimpleStore(StoreLoadLocation::Storage, _statement))
 	{
 		ASTModifier::operator()(_statement);
-		cxx20::erase_if(m_storage, mapTuple([&](auto&& key, auto&& value) {
+		cxx20::erase_if(m_state.storage, mapTuple([&](auto&& key, auto&& value) {
 			return
 				!m_knowledgeBase.knownToBeDifferent(vars->first, key) &&
 				!m_knowledgeBase.knownToBeEqual(vars->second, value);
 		}));
-		m_storage[vars->first] = vars->second;
+		m_state.storage[vars->first] = vars->second;
 	}
 	else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, _statement))
 	{
 		ASTModifier::operator()(_statement);
-		cxx20::erase_if(m_memory, mapTuple([&](auto&& key, auto&& /* value */) {
+		cxx20::erase_if(m_state.memory, mapTuple([&](auto&& key, auto&& /* value */) {
 			return !m_knowledgeBase.knownToBeDifferentByAtLeast32(vars->first, key);
 		}));
-		m_memory[vars->first] = vars->second;
+		m_state.memory[vars->first] = vars->second;
 	}
 	else
 	{
@@ -117,8 +117,8 @@ void DataFlowAnalyzer::operator()(VariableDeclaration& _varDecl)
 void DataFlowAnalyzer::operator()(If& _if)
 {
 	clearKnowledgeIfInvalidated(*_if.condition);
-	unordered_map<YulString, YulString> storage = m_storage;
-	unordered_map<YulString, YulString> memory = m_memory;
+	unordered_map<YulString, YulString> storage = m_state.storage;
+	unordered_map<YulString, YulString> memory = m_state.memory;
 
 	ASTModifier::operator()(_if);
 
@@ -134,8 +134,8 @@ void DataFlowAnalyzer::operator()(Switch& _switch)
 	set<YulString> assignedVariables;
 	for (auto& _case: _switch.cases)
 	{
-		unordered_map<YulString, YulString> storage = m_storage;
-		unordered_map<YulString, YulString> memory = m_memory;
+		unordered_map<YulString, YulString> storage = m_state.storage;
+		unordered_map<YulString, YulString> memory = m_state.memory;
 		(*this)(_case.body);
 		joinKnowledge(storage, memory);
 
@@ -154,11 +154,8 @@ void DataFlowAnalyzer::operator()(FunctionDefinition& _fun)
 {
 	// Save all information. We might rather reinstantiate this class,
 	// but this could be difficult if it is subclassed.
-	ScopedSaveAndRestore valueResetter(m_value, {});
+	ScopedSaveAndRestore stateResetter(m_state, {});
 	ScopedSaveAndRestore loopDepthResetter(m_loopDepth, 0u);
-	ScopedSaveAndRestore referencesResetter(m_references, {});
-	ScopedSaveAndRestore storageResetter(m_storage, {});
-	ScopedSaveAndRestore memoryResetter(m_memory, {});
 	pushScope(true);
 
 	for (auto const& parameter: _fun.parameters)
@@ -221,7 +218,7 @@ void DataFlowAnalyzer::operator()(Block& _block)
 
 optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
 {
-	if (YulString const* value = util::valueOrNullptr(m_storage, _key))
+	if (YulString const* value = util::valueOrNullptr(m_state.storage, _key))
 		return *value;
 	else
 		return nullopt;
@@ -229,7 +226,7 @@ optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
 
 optional<YulString> DataFlowAnalyzer::memoryValue(YulString _key) const
 {
-	if (YulString const* value = util::valueOrNullptr(m_memory, _key))
+	if (YulString const* value = util::valueOrNullptr(m_state.memory, _key))
 		return *value;
 	else
 		return nullopt;
@@ -259,17 +256,17 @@ void DataFlowAnalyzer::handleAssignment(set<YulString> const& _variables, Expres
 	auto const& referencedVariables = movableChecker.referencedVariables();
 	for (auto const& name: _variables)
 	{
-		m_references[name] = referencedVariables;
+		m_state.references[name] = referencedVariables;
 		if (!_isDeclaration)
 		{
 			// assignment to slot denoted by "name"
-			m_storage.erase(name);
+			m_state.storage.erase(name);
 			// assignment to slot contents denoted by "name"
-			cxx20::erase_if(m_storage, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
+			cxx20::erase_if(m_state.storage, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
 			// assignment to slot denoted by "name"
-			m_memory.erase(name);
+			m_state.memory.erase(name);
 			// assignment to slot contents denoted by "name"
-			cxx20::erase_if(m_memory, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
+			cxx20::erase_if(m_state.memory, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
 		}
 	}
 
@@ -282,9 +279,9 @@ void DataFlowAnalyzer::handleAssignment(set<YulString> const& _variables, Expres
 			// On the other hand, if we knew the value in the slot
 			// already, then the sload() / mload() would have been replaced by a variable anyway.
 			if (auto key = isSimpleLoad(StoreLoadLocation::Memory, *_value))
-				m_memory[*key] = variable;
+				m_state.memory[*key] = variable;
 			else if (auto key = isSimpleLoad(StoreLoadLocation::Storage, *_value))
-				m_storage[*key] = variable;
+				m_state.storage[*key] = variable;
 		}
 	}
 }
@@ -298,8 +295,8 @@ void DataFlowAnalyzer::popScope()
 {
 	for (auto const& name: m_variableScopes.back().variables)
 	{
-		m_value.erase(name);
-		m_references.erase(name);
+		m_state.value.erase(name);
+		m_state.references.erase(name);
 	}
 	m_variableScopes.pop_back();
 }
@@ -325,44 +322,44 @@ void DataFlowAnalyzer::clearValues(set<YulString> _variables)
 	auto eraseCondition = mapTuple([&_variables](auto&& key, auto&& value) {
 		return _variables.count(key) || _variables.count(value);
 	});
-	cxx20::erase_if(m_storage, eraseCondition);
-	cxx20::erase_if(m_memory, eraseCondition);
+	cxx20::erase_if(m_state.storage, eraseCondition);
+	cxx20::erase_if(m_state.memory, eraseCondition);
 
 	// Also clear variables that reference variables to be cleared.
 	for (auto const& variableToClear: _variables)
-		for (auto const& [ref, names]: m_references)
+		for (auto const& [ref, names]: m_state.references)
 			if (names.count(variableToClear))
 				_variables.emplace(ref);
 
 	// Clear the value and update the reference relation.
 	for (auto const& name: _variables)
 	{
-		m_value.erase(name);
-		m_references.erase(name);
+		m_state.value.erase(name);
+		m_state.references.erase(name);
 	}
 }
 
 void DataFlowAnalyzer::assignValue(YulString _variable, Expression const* _value)
 {
-	m_value[_variable] = {_value, m_loopDepth};
+	m_state.value[_variable] = {_value, m_loopDepth};
 }
 
 void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Block const& _block)
 {
 	SideEffectsCollector sideEffects(m_dialect, _block, &m_functionSideEffects);
 	if (sideEffects.invalidatesStorage())
-		m_storage.clear();
+		m_state.storage.clear();
 	if (sideEffects.invalidatesMemory())
-		m_memory.clear();
+		m_state.memory.clear();
 }
 
 void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Expression const& _expr)
 {
 	SideEffectsCollector sideEffects(m_dialect, _expr, &m_functionSideEffects);
 	if (sideEffects.invalidatesStorage())
-		m_storage.clear();
+		m_state.storage.clear();
 	if (sideEffects.invalidatesMemory())
-		m_memory.clear();
+		m_state.memory.clear();
 }
 
 void DataFlowAnalyzer::joinKnowledge(
@@ -370,8 +367,8 @@ void DataFlowAnalyzer::joinKnowledge(
 	unordered_map<YulString, YulString> const& _olderMemory
 )
 {
-	joinKnowledgeHelper(m_storage, _olderStorage);
-	joinKnowledgeHelper(m_memory, _olderMemory);
+	joinKnowledgeHelper(m_state.storage, _olderStorage);
+	joinKnowledgeHelper(m_state.memory, _olderMemory);
 }
 
 void DataFlowAnalyzer::joinKnowledgeHelper(
@@ -381,8 +378,8 @@ void DataFlowAnalyzer::joinKnowledgeHelper(
 {
 	// We clear if the key does not exist in the older map or if the value is different.
 	// This also works for memory because _older is an "older version"
-	// of m_memory and thus any overlapping write would have cleared the keys
-	// that are not known to be different inside m_memory already.
+	// of m_state.memory and thus any overlapping write would have cleared the keys
+	// that are not known to be different inside m_state.memory already.
 	cxx20::erase_if(_this, mapTuple([&_older](auto&& key, auto&& currentValue){
 		YulString const* oldValue = util::valueOrNullptr(_older, key);
 		return !oldValue || *oldValue != currentValue;
@@ -433,4 +430,3 @@ std::optional<YulString> DataFlowAnalyzer::isSimpleLoad(
 				return key->name;
 	return {};
 }
-
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index 56e48fed5d..a8463360b1 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -101,9 +101,9 @@ class DataFlowAnalyzer: public ASTModifier
 	void operator()(Block& _block) override;
 
 	/// @returns the current value of the given variable, if known - always movable.
-	AssignedValue const* variableValue(YulString _variable) const { return util::valueOrNullptr(m_value, _variable); }
-	std::set<YulString> const* references(YulString _variable) const { return util::valueOrNullptr(m_references, _variable); }
-	std::map<YulString, AssignedValue> const& allValues() const { return m_value; }
+	AssignedValue const* variableValue(YulString _variable) const { return util::valueOrNullptr(m_state.value, _variable); }
+	std::set<YulString> const* references(YulString _variable) const { return util::valueOrNullptr(m_state.references, _variable); }
+	std::map<YulString, AssignedValue> const& allValues() const { return m_state.value; }
 	std::optional<YulString> storageValue(YulString _key) const;
 	std::optional<YulString> memoryValue(YulString _key) const;
 
@@ -173,14 +173,20 @@ class DataFlowAnalyzer: public ASTModifier
 	/// if this is not provided or the function is not found.
 	std::map<YulString, SideEffects> m_functionSideEffects;
 
-	/// Current values of variables, always movable.
-	std::map<YulString, AssignedValue> m_value;
-	/// m_references[a].contains(b) <=> the current expression assigned to a references b
-	std::unordered_map<YulString, std::set<YulString>> m_references;
+private:
+	struct State
+	{
+		/// Current values of variables, always movable.
+		std::map<YulString, AssignedValue> value;
+		/// m_references[a].contains(b) <=> the current expression assigned to a references b
+		std::unordered_map<YulString, std::set<YulString>> references;
 
-	std::unordered_map<YulString, YulString> m_storage;
-	std::unordered_map<YulString, YulString> m_memory;
+		std::unordered_map<YulString, YulString> storage;
+		std::unordered_map<YulString, YulString> memory;
+	};
+	State m_state;
 
+protected:
 	KnowledgeBase m_knowledgeBase;
 
 	YulString m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Last) + 1];

From db270510244b755700d376f824c8e2c32a3fe1d9 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 10 Mar 2022 19:05:32 +0100
Subject: [PATCH 0488/1748] Test for old behaviour.

---
 .../abi_encode_call_uint_bytes.sol            | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol

diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol
new file mode 100644
index 0000000000..52bb2abf9b
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol
@@ -0,0 +1,22 @@
+contract C {
+	function removeSignature(bytes memory x) internal pure returns (bytes memory r) {
+		r = new bytes(x.length - 4);
+		for (uint i = 0; i < x.length - 4; ++i)
+			r[i] = x[i + 4];
+	}
+	function g(bytes2, bytes2) public {}
+	function h(uint16, uint16) public {}
+	function f() public returns (bytes memory) {
+		uint16 x = 0x1234;
+		return removeSignature(abi.encodeCall(this.g, (0x1234, bytes2(x))));
+	}
+	function f2() public returns (bytes memory) {
+		bytes2 x = 0x1234;
+		return removeSignature(abi.encodeCall(this.h, (0x1234, uint16(x))));
+	}
+}
+// ====
+// compileViaYul: also
+// ----
+// f() -> 0x20, 0x40, 0x1234, 0x1234000000000000000000000000000000000000000000000000000000000000
+// f2() -> 0x20, 0x40, 0x1234, 0x1234

From 8cb01a99539619c84d83897228722420ad6d0971 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 10 Mar 2022 19:05:51 +0100
Subject: [PATCH 0489/1748] Fix and updated test.

---
 Changelog.md                                      |  4 ++++
 docs/bugs.json                                    | 12 +++++++++++-
 docs/bugs_by_version.json                         |  8 ++++++--
 libsolidity/codegen/ExpressionCompiler.cpp        | 14 +++++++++-----
 .../codegen/ir/IRGeneratorForStatements.cpp       | 14 +++++++++++++-
 .../abi_encode_call_uint_bytes.sol                | 15 +++++++--------
 6 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 6227ada01f..76c4cbb49a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
 ### 0.8.13 (unreleased)
 
+Important Bugfixes:
+ * Code Generator: Correctly encode literals used in ``abi.encodeCall`` in place of fixed bytes arguments.
+
+
 Language Features:
  * General: Allow annotating inline assembly as memory-safe to allow optimizations and stack limit evasion that rely on respecting Solidity's memory model.
  * General: ``using M for Type;`` is allowed at file level and ``M`` can now also be a brace-enclosed list of free functions or library functions.
diff --git a/docs/bugs.json b/docs/bugs.json
index 0b72c05c7d..9e24175b4b 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -1,4 +1,15 @@
 [
+    {
+        "uid": "SOL-2022-1",
+        "name": "AbiEncodeCallLiteralAsFixedBytesBug",
+        "summary": "Literals used for a fixed length bytes parameter in ``abi.encodeCall`` were encoded incorrectly.",
+        "description": "For the encoding, the compiler only considered the types of the expressions in the second argument of ``abi.encodeCall`` itself, but not the parameter types of the function given as first argument. In almost all cases the abi encoding of the type of the expression matches the abi encoding of the parameter type of the given function. This is because the type checker ensures the expression is implicitly convertible to the respective parameter type. However this is not true for number literals used for fixed bytes types shorter than 32 bytes, nor for string literals used for any fixed bytes type. Number literals were encoded as numbers instead of being shifted to become left-aligned. String literals were encoded as dynamically sized memory strings instead of being converted to a left-aligned bytes value.",
+        "link": "https://blog.soliditylang.org/2022/03/16/encodecall-bug/",
+        "introduced": "0.8.11",
+        "fixed": "0.8.13",
+        "severity": "very low"
+
+    },
     {
         "uid": "SOL-2021-4",
         "name": "UserDefinedValueTypesBug",
@@ -8,7 +19,6 @@
         "introduced": "0.8.8",
         "fixed": "0.8.9",
         "severity": "very low"
-
     },
     {
         "uid": "SOL-2021-3",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 0aae3f1ac4..318a96e144 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1549,11 +1549,15 @@
         "released": "2021-11-09"
     },
     "0.8.11": {
-        "bugs": [],
+        "bugs": [
+            "AbiEncodeCallLiteralAsFixedBytesBug"
+        ],
         "released": "2021-12-20"
     },
     "0.8.12": {
-        "bugs": [],
+        "bugs": [
+            "AbiEncodeCallLiteralAsFixedBytesBug"
+        ],
         "released": "2022-02-16"
     },
     "0.8.2": {
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 1eefe41b99..21cb45e775 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1258,6 +1258,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				function.kind() == FunctionType::Kind::ABIEncodeWithSignature;
 
 			TypePointers argumentTypes;
+			TypePointers targetTypes;
 
 			ASTNode::listAccept(arguments, *this);
 
@@ -1265,14 +1266,17 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 			{
 				solAssert(arguments.size() == 2);
 
-				auto const functionPtr = dynamic_cast<FunctionTypePointer>(arguments[0]->annotation().type);
-				solAssert(functionPtr);
-
 				// Account for tuples with one component which become that component
 				if (auto const tupleType = dynamic_cast<TupleType const*>(arguments[1]->annotation().type))
 					argumentTypes = tupleType->components();
 				else
 					argumentTypes.emplace_back(arguments[1]->annotation().type);
+
+				auto functionPtr = dynamic_cast<FunctionTypePointer>(arguments[0]->annotation().type);
+				solAssert(functionPtr);
+				functionPtr = functionPtr->asExternallyCallableFunction(false);
+				solAssert(functionPtr);
+				targetTypes = functionPtr->parameterTypes();
 			}
 			else
 				for (unsigned i = 0; i < arguments.size(); ++i)
@@ -1292,12 +1296,12 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 			if (isPacked)
 			{
 				solAssert(!function.padArguments(), "");
-				utils().packedEncode(argumentTypes, TypePointers());
+				utils().packedEncode(argumentTypes, targetTypes);
 			}
 			else
 			{
 				solAssert(function.padArguments(), "");
-				utils().abiEncode(argumentTypes, TypePointers());
+				utils().abiEncode(argumentTypes, targetTypes);
 			}
 			utils().fetchFreeMemoryPointer();
 			// stack: [<selector/functionPointer/signature>] <data_encoding_area_end> <bytes_memory_ptr>
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 9092739e99..9e48c811c6 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1160,10 +1160,22 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		for (auto const& argument: argumentsOfEncodeFunction)
 		{
 			argumentTypes.emplace_back(&type(*argument));
-			targetTypes.emplace_back(type(*argument).fullEncodingType(false, true, isPacked));
 			argumentVars += IRVariable(*argument).stackSlots();
 		}
 
+		if (functionType->kind() == FunctionType::Kind::ABIEncodeCall)
+		{
+			auto encodedFunctionType = dynamic_cast<FunctionType const*>(arguments.front()->annotation().type);
+			solAssert(encodedFunctionType);
+			encodedFunctionType = encodedFunctionType->asExternallyCallableFunction(false);
+			solAssert(encodedFunctionType);
+			targetTypes = encodedFunctionType->parameterTypes();
+		}
+		else
+			for (auto const& argument: argumentsOfEncodeFunction)
+				targetTypes.emplace_back(type(*argument).fullEncodingType(false, true, isPacked));
+
+
 		if (functionType->kind() == FunctionType::Kind::ABIEncodeCall)
 		{
 			auto const& selectorType = dynamic_cast<FunctionType const&>(type(*arguments.front()));
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol
index 52bb2abf9b..d19a457f97 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol
@@ -1,22 +1,21 @@
 contract C {
-	function removeSignature(bytes memory x) internal pure returns (bytes memory r) {
-		r = new bytes(x.length - 4);
-		for (uint i = 0; i < x.length - 4; ++i)
-			r[i] = x[i + 4];
+	function removeSignature(bytes calldata x) external pure returns (bytes memory) {
+		return x[4:];
 	}
-	function g(bytes2, bytes2) public {}
+	function g(bytes2, bytes2, bytes2) public {}
 	function h(uint16, uint16) public {}
 	function f() public returns (bytes memory) {
 		uint16 x = 0x1234;
-		return removeSignature(abi.encodeCall(this.g, (0x1234, bytes2(x))));
+		return this.removeSignature(abi.encodeCall(this.g, (0x1234, "ab", bytes2(x))));
 	}
 	function f2() public returns (bytes memory) {
 		bytes2 x = 0x1234;
-		return removeSignature(abi.encodeCall(this.h, (0x1234, uint16(x))));
+		return this.removeSignature(abi.encodeCall(this.h, (0x1234, uint16(x))));
 	}
 }
 // ====
 // compileViaYul: also
+// EVMVersion: >homestead
 // ----
-// f() -> 0x20, 0x40, 0x1234, 0x1234000000000000000000000000000000000000000000000000000000000000
+// f() -> 0x20, 0x60, 0x1234000000000000000000000000000000000000000000000000000000000000, 0x6162000000000000000000000000000000000000000000000000000000000000, 0x1234000000000000000000000000000000000000000000000000000000000000
 // f2() -> 0x20, 0x40, 0x1234, 0x1234

From 0bc29f2cb5348fd1afa753705ce31485f2e53994 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 15 Mar 2022 12:07:28 +0100
Subject: [PATCH 0490/1748] Using for at file level.

---
 docs/layout-of-source-files.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/layout-of-source-files.rst b/docs/layout-of-source-files.rst
index 921211248b..729951142a 100644
--- a/docs/layout-of-source-files.rst
+++ b/docs/layout-of-source-files.rst
@@ -3,8 +3,8 @@ Layout of a Solidity Source File
 ********************************
 
 Source files can contain an arbitrary number of
-:ref:`contract definitions<contract_structure>`, import_ directives,
-:ref:`pragma directives<pragma>` and
+:ref:`contract definitions<contract_structure>`, import_ ,
+:ref:`pragma<pragma>` and :ref:`using for<using-for>` directives and
 :ref:`struct<structs>`, :ref:`enum<enums>`, :ref:`function<functions>`, :ref:`error<errors>`
 and :ref:`constant variable<constants>` definitions.
 

From 28593839d9913a740e9c8514d2ba607241d54398 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 15 Mar 2022 14:24:42 +0100
Subject: [PATCH 0491/1748] Add helper to see if a switch has a default case.

---
 libsolidity/analysis/ControlFlowBuilder.cpp | 3 +--
 libyul/AST.h                                | 9 +++++++++
 libyul/optimiser/ControlFlowSimplifier.cpp  | 8 +-------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/libsolidity/analysis/ControlFlowBuilder.cpp b/libsolidity/analysis/ControlFlowBuilder.cpp
index 3de1ecca54..7c568b18e1 100644
--- a/libsolidity/analysis/ControlFlowBuilder.cpp
+++ b/libsolidity/analysis/ControlFlowBuilder.cpp
@@ -457,8 +457,7 @@ void ControlFlowBuilder::operator()(yul::Switch const& _switch)
 	}
 	mergeFlow(nodes);
 
-	bool hasDefault = util::contains_if(_switch.cases, [](yul::Case const& _case) { return !_case.value; });
-	if (!hasDefault)
+	if (!hasDefaultCase(_switch))
 		connect(beforeSwitch, m_currentNode);
 }
 
diff --git a/libyul/AST.h b/libyul/AST.h
index 1c7b8e02a1..71419d807f 100644
--- a/libyul/AST.h
+++ b/libyul/AST.h
@@ -144,4 +144,13 @@ template <class... Args> inline std::shared_ptr<DebugData const> debugDataOf(std
 	return std::visit([](auto const& _arg) { return debugDataOf(_arg); }, _node);
 }
 
+inline bool hasDefaultCase(Switch const& _switch)
+{
+	return std::any_of(
+		_switch.cases.begin(),
+		_switch.cases.end(),
+		[](Case const& _case) { return !_case.value; }
+	);
+}
+
 }
diff --git a/libyul/optimiser/ControlFlowSimplifier.cpp b/libyul/optimiser/ControlFlowSimplifier.cpp
index 443a2a9be1..cfd59d09ae 100644
--- a/libyul/optimiser/ControlFlowSimplifier.cpp
+++ b/libyul/optimiser/ControlFlowSimplifier.cpp
@@ -60,13 +60,7 @@ void removeEmptyDefaultFromSwitch(Switch& _switchStmt)
 
 void removeEmptyCasesFromSwitch(Switch& _switchStmt)
 {
-	bool hasDefault = std::any_of(
-		_switchStmt.cases.begin(),
-		_switchStmt.cases.end(),
-		[](Case const& _case) { return !_case.value; }
-	);
-
-	if (hasDefault)
+	if (hasDefaultCase(_switchStmt))
 		return;
 
 	ranges::actions::remove_if(

From b6cd3e154c814530540806e19aa08763f6806eac Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 12 Jan 2022 13:15:58 +0100
Subject: [PATCH 0492/1748] Test case for current behaviour.

---
 .../pops_in_reverting_branch.yul              | 44 +++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 test/libyul/evmCodeTransform/pops_in_reverting_branch.yul

diff --git a/test/libyul/evmCodeTransform/pops_in_reverting_branch.yul b/test/libyul/evmCodeTransform/pops_in_reverting_branch.yul
new file mode 100644
index 0000000000..48142ac469
--- /dev/null
+++ b/test/libyul/evmCodeTransform/pops_in_reverting_branch.yul
@@ -0,0 +1,44 @@
+object "main" {
+	code {
+	    let a := calldataload(0)
+	    let b := calldataload(32)
+	    if calldataload(64) {
+	        revert(0,0)
+	    }
+	    sstore(b, a)
+	}
+}
+// ====
+// stackOptimization: true
+// ----
+//     /* "":51:52   */
+//   0x00
+//     /* "":38:53   */
+//   calldataload
+//     /* "":81:83   */
+//   0x20
+//     /* "":68:84   */
+//   calldataload
+//     /* "":106:108   */
+//   0x40
+//     /* "":93:109   */
+//   calldataload
+//     /* "":90:139   */
+//   tag_1
+//   jumpi
+//     /* "":22:160   */
+// tag_2:
+//     /* "":145:157   */
+//   sstore
+//     /* "":22:160   */
+//   stop
+//     /* "":110:139   */
+// tag_1:
+//     /* "":121:132   */
+//   pop
+//   pop
+//     /* "":130:131   */
+//   0x00
+//     /* "":121:132   */
+//   dup1
+//   revert

From 5cd98006d4f13461cb5523c298d8580c741335e4 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 14 Jan 2022 13:37:40 +0100
Subject: [PATCH 0493/1748] Fill in junk in stack layouts on terminating
 control flow paths.

---
 Changelog.md                                  |   1 +
 libevmasm/PeepholeOptimiser.cpp               |  31 ++++-
 libyul/backends/evm/ControlFlowGraph.h        |   9 ++
 .../backends/evm/ControlFlowGraphBuilder.cpp  |  90 +++++++++++++-
 libyul/backends/evm/StackLayoutGenerator.cpp  | 110 ++++++++++++++++++
 libyul/backends/evm/StackLayoutGenerator.h    |   3 +
 test/cmdlineTests/dup_opt_peephole/output     |   2 -
 .../function_debug_info_via_yul/output        |   2 +-
 .../output.json                               |  90 +++-----------
 .../viair_subobject_optimization/output       |  24 +---
 .../abiEncoderV1/abi_decode_v2_storage.sol    |   2 +-
 .../abi_encode_calldata_slice.sol             |   4 +-
 .../struct/struct_storage_ptr.sol             |   2 +-
 .../abi_encode_calldata_slice.sol             |   4 +-
 .../abiEncoderV2/abi_encode_v2.sol            |   2 +-
 ...2_in_function_inherited_in_v1_contract.sol |   2 +-
 .../abiEncoderV2/calldata_array.sol           |   2 +-
 .../abiEncoderV2/storage_array_encoding.sol   |   4 +-
 .../arrays_complex_from_and_to_storage.sol    |   2 +-
 .../array/byte_array_transitional_2.sol       |   2 +-
 .../array/bytes_length_member.sol             |   2 +-
 .../array/constant_var_as_array_length.sol    |   2 +-
 .../copying/array_copy_different_packing.sol  |   2 +-
 .../copying/array_copy_including_array.sol    |   4 +-
 .../array/copying/array_copy_nested_array.sol |   2 +-
 ...ay_copy_storage_storage_different_base.sol |   2 +-
 .../array_copy_storage_storage_dyn_dyn.sol    |   2 +-
 ...ray_copy_storage_storage_static_static.sol |   2 +-
 .../copying/array_copy_target_simple.sol      |   2 +-
 .../copying/array_copy_target_simple_2.sol    |   2 +-
 .../array_nested_calldata_to_storage.sol      |   4 +-
 .../array_nested_memory_to_storage.sol        |   2 +-
 ...on_external_storage_to_storage_dynamic.sol |   2 +-
 ...o_storage_dynamic_different_mutability.sol |   2 +-
 .../array_of_struct_calldata_to_storage.sol   |   2 +-
 .../array_of_struct_memory_to_storage.sol     |   2 +-
 .../copying/bytes_storage_to_storage.sol      |  10 +-
 .../calldata_array_dynamic_to_storage.sol     |   2 +-
 .../copy_byte_array_in_struct_to_storage.sol  |   2 +-
 .../copying/copy_byte_array_to_storage.sol    |   2 +-
 .../copy_function_internal_storage_array.sol  |   2 +-
 .../array/copying/copy_removes_bytes_data.sol |   2 +-
 .../copying/copying_bytes_multiassign.sol     |   4 +-
 .../memory_dyn_2d_bytes_to_storage.sol        |   2 +-
 .../array/copying/storage_memory_nested.sol   |   2 +-
 .../storage_memory_nested_from_pointer.sol    |   2 +-
 .../copying/storage_memory_nested_struct.sol  |   2 +-
 .../copying/storage_memory_packed_dyn.sol     |   2 +-
 .../array/create_memory_array.sol             |   2 +-
 .../array/delete/bytes_delete_element.sol     |   2 +-
 .../array/dynamic_array_cleanup.sol           |   2 +-
 .../array/dynamic_arrays_in_storage.sol       |   2 +-
 .../array/dynamic_multi_array_cleanup.sol     |   2 +-
 .../array/fixed_array_cleanup.sol             |   2 +-
 .../array/fixed_arrays_as_return_type.sol     |   2 +-
 .../array/fixed_arrays_in_constructors.sol    |   2 +-
 .../array/function_array_cross_calls.sol      |   2 +-
 .../array/pop/array_pop_array_transition.sol  |   2 +-
 .../array/pop/array_pop_uint24_transition.sol |   2 +-
 .../array/pop/byte_array_pop_copy_long.sol    |   2 +-
 .../pop/byte_array_pop_long_storage_empty.sol |   2 +-
 ...ray_pop_long_storage_empty_garbage_ref.sol |   2 +-
 .../array/pop/byte_array_pop_masking_long.sol |   2 +-
 .../push/array_push_nested_from_calldata.sol  |   2 +-
 .../push/array_push_struct_from_calldata.sol  |   2 +-
 .../array/push/byte_array_push_transition.sol |   2 +-
 .../array/push/push_no_args_2d.sol            |   4 +-
 .../array/push/push_no_args_bytes.sol         |   2 +-
 .../semanticTests/array/reusing_memory.sol    |   2 +-
 .../copy_from_calldata_removes_bytes_data.sol |   4 +-
 .../constructor/arrays_in_constructors.sol    |   2 +-
 .../bytes_in_constructors_packer.sol          |   2 +-
 .../bytes_in_constructors_unpacker.sol        |   2 +-
 .../constructor_arguments_external.sol        |   2 +-
 .../constructor_static_array_argument.sol     |   2 +-
 .../constructor/no_callvalue_check.sol        |   2 +-
 .../constructor_inheritance_init_order.sol    |   2 +-
 .../constructor_inheritance_init_order_2.sol  |   2 +-
 .../semanticTests/constructor_with_params.sol |   2 +-
 ...ructor_with_params_diamond_inheritance.sol |   2 +-
 .../constructor_with_params_inheritance.sol   |   2 +-
 .../events/event_dynamic_array_storage.sol    |   2 +-
 .../events/event_dynamic_array_storage_v2.sol |   2 +-
 .../events/event_emit_from_other_contract.sol |   2 +-
 .../externalContracts/FixedFeeRegistrar.sol   |   2 +-
 .../externalContracts/base64.sol              |   6 +-
 .../externalContracts/deposit_contract.sol    |  10 +-
 .../externalContracts/prbmath_signed.sol      |   2 +-
 .../externalContracts/prbmath_unsigned.sol    |   2 +-
 .../externalContracts/ramanujan_pi.sol        |   2 +-
 .../externalContracts/strings.sol             |   4 +-
 .../creation_function_call_with_args.sol      |   2 +-
 .../creation_function_call_with_salt.sol      |   2 +-
 .../external_call_to_nonexisting.sol          |   2 +-
 ...ernal_call_to_nonexisting_debugstrings.sol |   2 +-
 .../functionCall/failed_create.sol            |   2 +-
 .../functionCall/gas_and_value_basic.sol      |   2 +-
 .../gas_and_value_brace_syntax.sol            |   2 +-
 .../mapping_array_internal_argument.sol       |   2 +-
 .../functionCall/send_zero_ether.sol          |   2 +-
 .../immutable/multi_creation.sol              |   2 +-
 .../semanticTests/immutable/use_scratch.sol   |   2 +-
 ...ted_function_calldata_memory_interface.sol |   2 +-
 .../inheritance/value_for_constructor.sol     |   2 +-
 .../balance_other_contract.sol                |   2 +-
 .../using_library_mappings_public.sol         |   2 +-
 .../libraries/using_library_structs.sol       |   2 +-
 .../semanticTests/smoke/constructor.sol       |   2 +-
 .../semanticTests/state/blockhash_basic.sol   |   2 +-
 ...ta_struct_with_nested_array_to_storage.sol |   2 +-
 .../conversion/recursive_storage_memory.sol   |   2 +-
 .../structs/memory_structs_nested_load.sol    |   2 +-
 .../semanticTests/structs/struct_copy.sol     |   2 +-
 .../struct_delete_storage_with_array.sol      |   2 +-
 .../struct_memory_to_storage_function_ptr.sol |   2 +-
 .../userDefinedValueType/calldata.sol         |   2 +-
 .../userDefinedValueType/erc20.sol            |   2 +-
 .../semanticTests/various/address_code.sol    |   2 +-
 .../various/contract_binary_dependencies.sol  |   2 +-
 .../various/destructuring_assignment.sol      |   2 +-
 .../semanticTests/various/erc20.sol           |   2 +-
 .../semanticTests/various/senders_balance.sol |   2 +-
 .../skip_dynamic_types_for_structs.sol        |   2 +-
 .../various/staticcall_for_view_and_pure.sol  |   4 +-
 .../semanticTests/various/value_complex.sol   |   2 +-
 .../semanticTests/various/value_insane.sol    |   2 +-
 .../viaYul/array_memory_index_access.sol      |   2 +-
 .../viaYul/array_storage_index_access.sol     |  14 +--
 .../array_storage_index_boundary_test.sol     |   4 +-
 .../array_storage_index_zeroed_test.sol       |   8 +-
 .../viaYul/array_storage_length_access.sol    |   2 +-
 .../viaYul/array_storage_push_empty.sol       |   4 +-
 ...rray_storage_push_empty_length_address.sol |   4 +-
 .../viaYul/array_storage_push_pop.sol         |   4 +-
 .../viaYul/copy_struct_invalid_ir_bug.sol     |   2 +-
 .../pops_in_reverting_branch.yul              |   3 -
 .../libyul/evmCodeTransform/stackReuse/if.yul |   2 -
 test/libyul/yulStackLayout/complex.yul        |  20 ++--
 test/libyul/yulStackLayout/for.yul            |   6 +-
 139 files changed, 433 insertions(+), 276 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 76c4cbb49a..e239abd3e9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,6 +16,7 @@ Compiler Features:
  * JSON-AST: Added selector field for errors and events.
  * LSP: Implements goto-definition.
  * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump.
+ * Yul EVM Code Transform: Avoid unnecessary ``pop``s on terminating control flow.
  * Yul Optimizer: Remove ``sstore`` and ``mstore`` operations that are never read from.
 
 
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
index 31fb11f6f0..4e4a2c9d7a 100644
--- a/libevmasm/PeepholeOptimiser.cpp
+++ b/libevmasm/PeepholeOptimiser.cpp
@@ -117,6 +117,35 @@ struct OpPop: SimplePeepholeOptimizerMethod<OpPop>
 	}
 };
 
+struct OpStop: SimplePeepholeOptimizerMethod<OpStop>
+{
+	static bool applySimple(
+		AssemblyItem const& _op,
+		AssemblyItem const& _stop,
+		std::back_insert_iterator<AssemblyItems> _out
+	)
+	{
+		if (_stop == Instruction::STOP)
+		{
+			if (_op.type() == Operation)
+			{
+				Instruction instr = _op.instruction();
+				if (!instructionInfo(instr).sideEffects)
+				{
+					*_out = {Instruction::STOP, _op.location()};
+					return true;
+				}
+			}
+			else if (_op.type() == Push)
+			{
+				*_out = {Instruction::STOP, _op.location()};
+				return true;
+			}
+		}
+		return false;
+	}
+};
+
 struct DoubleSwap: SimplePeepholeOptimizerMethod<DoubleSwap>
 {
 	static size_t applySimple(AssemblyItem const& _s1, AssemblyItem const& _s2, std::back_insert_iterator<AssemblyItems>)
@@ -430,7 +459,7 @@ bool PeepholeOptimiser::optimise()
 	while (state.i < m_items.size())
 		applyMethods(
 			state,
-			PushPop(), OpPop(), DoublePush(), DoubleSwap(), CommutativeSwap(), SwapComparison(),
+			PushPop(), OpPop(), OpStop(), DoublePush(), DoubleSwap(), CommutativeSwap(), SwapComparison(),
 			DupSwap(), IsZeroIsZeroJumpI(), EqIsZeroJumpI(), DoubleJump(), JumpToNext(), UnreachableCode(),
 			TagConjunctions(), TruthyAnd(), Identity()
 		);
diff --git a/libyul/backends/evm/ControlFlowGraph.h b/libyul/backends/evm/ControlFlowGraph.h
index 6196697fc4..8ca2076a04 100644
--- a/libyul/backends/evm/ControlFlowGraph.h
+++ b/libyul/backends/evm/ControlFlowGraph.h
@@ -195,6 +195,14 @@ struct CFG
 		std::shared_ptr<DebugData const> debugData;
 		std::vector<BasicBlock*> entries;
 		std::vector<Operation> operations;
+		/// True, if the block is the beginning of a disconnected subgraph. That is, if no block that is reachable
+		/// from this block is an ancestor of this block. In other words, this is true, if this block is the target
+		/// of a cut-edge/bridge in the CFG or if the block itself terminates.
+		bool isStartOfSubGraph = false;
+		/// True, if there is a path from this block to a function return.
+		bool needsCleanStack = false;
+		/// If the block starts a sub-graph and does not lead to a function return, we are free to add junk to it.
+		bool allowsJunk() const { return isStartOfSubGraph && !needsCleanStack; }
 		std::variant<MainExit, Jump, ConditionalJump, FunctionReturn, Terminated> exit = MainExit{};
 	};
 
@@ -205,6 +213,7 @@ struct CFG
 		BasicBlock* entry = nullptr;
 		std::vector<VariableSlot> parameters;
 		std::vector<VariableSlot> returnVariables;
+		std::vector<BasicBlock*> exits;
 	};
 
 	/// The main entry point, i.e. the start of the outermost Yul block.
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index df271bb8d8..855d96fbd3 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -48,7 +48,7 @@ using namespace std;
 
 namespace
 {
-// Removes edges to blocks that are not reachable.
+/// Removes edges to blocks that are not reachable.
 void cleanUnreachable(CFG& _cfg)
 {
 	// Determine which blocks are reachable from the entry.
@@ -77,7 +77,8 @@ void cleanUnreachable(CFG& _cfg)
 			return !reachabilityCheck.visited.count(entry);
 		});
 }
-// Sets the ``recursive`` member to ``true`` for all recursive function calls.
+
+/// Sets the ``recursive`` member to ``true`` for all recursive function calls.
 void markRecursiveCalls(CFG& _cfg)
 {
 	map<CFG::BasicBlock*, vector<CFG::FunctionCall*>> callsPerBlock;
@@ -124,6 +125,84 @@ void markRecursiveCalls(CFG& _cfg)
 			});
 		}
 }
+
+/// Marks each cut-vertex in the CFG, i.e. each block that begins a disconnected sub-graph of the CFG.
+/// Entering such a block means that control flow will never return to a previously visited block.
+void markStartsOfSubGraphs(CFG& _cfg)
+{
+	vector<CFG::BasicBlock*> entries;
+	entries.emplace_back(_cfg.entry);
+	for (auto&& functionInfo: _cfg.functionInfo | ranges::views::values)
+		entries.emplace_back(functionInfo.entry);
+	for (auto& entry: entries)
+	{
+		/**
+		 * Detect bridges following Algorithm 1 in https://arxiv.org/pdf/2108.07346.pdf
+		 * and mark the bridge targets as starts of sub-graphs.
+		 */
+		set<CFG::BasicBlock*> visited;
+		map<CFG::BasicBlock*, size_t> disc;
+		map<CFG::BasicBlock*, size_t> low;
+		map<CFG::BasicBlock*, CFG::BasicBlock*> parent;
+		size_t time = 0;
+		auto dfs = [&](CFG::BasicBlock* _u, auto _recurse) -> void {
+			visited.insert(_u);
+			disc[_u] = low[_u] = time;
+			time++;
+
+			vector<CFG::BasicBlock*> children = _u->entries;
+			visit(util::GenericVisitor{
+				[&](CFG::BasicBlock::Jump const& _jump) {
+					children.emplace_back(_jump.target);
+				},
+				[&](CFG::BasicBlock::ConditionalJump const& _jump) {
+					children.emplace_back(_jump.zero);
+					children.emplace_back(_jump.nonZero);
+				},
+				[&](CFG::BasicBlock::FunctionReturn const&) {},
+				[&](CFG::BasicBlock::Terminated const&) { _u->isStartOfSubGraph = true; },
+				[&](CFG::BasicBlock::MainExit const&) { _u->isStartOfSubGraph = true; }
+			}, _u->exit);
+			yulAssert(!util::contains(children, _u));
+
+			for (CFG::BasicBlock* v: children)
+				if (!visited.count(v))
+				{
+					parent[v] = _u;
+					_recurse(v, _recurse);
+					low[_u] = min(low[_u], low[v]);
+					if (low[v] > disc[_u])
+					{
+						// _u <-> v is a cut edge in the undirected graph
+						bool edgeVtoU = util::contains(_u->entries, v);
+						bool edgeUtoV = util::contains(v->entries, _u);
+						if (edgeVtoU && !edgeUtoV)
+							// Cut edge v -> _u
+							_u->isStartOfSubGraph = true;
+						else if (edgeUtoV && !edgeVtoU)
+							// Cut edge _u -> v
+							v->isStartOfSubGraph = true;
+					}
+				}
+				else if (v != parent[_u])
+					low[_u] = min(low[_u], disc[v]);
+		};
+		dfs(entry, dfs);
+	}
+}
+
+/// Marks each block that needs to maintain a clean stack. That is each block that has an outgoing
+/// path to a function return.
+void markNeedsCleanStack(CFG& _cfg)
+{
+	for (auto& functionInfo: _cfg.functionInfo | ranges::views::values)
+		for (CFG::BasicBlock* exit: functionInfo.exits)
+			util::BreadthFirstSearch<CFG::BasicBlock*>{{exit}}.run([&](CFG::BasicBlock* _block, auto _addChild) {
+				_block->needsCleanStack = true;
+				for (CFG::BasicBlock* entry: _block->entries)
+					_addChild(entry);
+			});
+}
 }
 
 std::unique_ptr<CFG> ControlFlowGraphBuilder::build(
@@ -141,6 +220,8 @@ std::unique_ptr<CFG> ControlFlowGraphBuilder::build(
 
 	cleanUnreachable(*result);
 	markRecursiveCalls(*result);
+	markStartsOfSubGraphs(*result);
+	markNeedsCleanStack(*result);
 
 	// TODO: It might be worthwhile to run some further simplifications on the graph itself here.
 	// E.g. if there is a jump to a node that has the jumping node as its only entry, the nodes can be fused, etc.
@@ -379,6 +460,7 @@ void ControlFlowGraphBuilder::operator()(Leave const& leave_)
 {
 	yulAssert(m_currentFunction.has_value(), "");
 	m_currentBlock->exit = CFG::BasicBlock::FunctionReturn{debugDataOf(leave_), *m_currentFunction};
+	(*m_currentFunction)->exits.emplace_back(m_currentBlock);
 	m_currentBlock = &m_graph.makeBlock(debugDataOf(*m_currentBlock));
 }
 
@@ -395,6 +477,7 @@ void ControlFlowGraphBuilder::operator()(FunctionDefinition const& _function)
 	builder.m_currentFunction = &functionInfo;
 	builder.m_currentBlock = functionInfo.entry;
 	builder(_function.body);
+	functionInfo.exits.emplace_back(builder.m_currentBlock);
 	builder.m_currentBlock->exit = CFG::BasicBlock::FunctionReturn{debugDataOf(_function), &functionInfo};
 }
 
@@ -423,7 +506,8 @@ void ControlFlowGraphBuilder::registerFunction(FunctionDefinition const& _functi
 				std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_retVar.name)),
 				_retVar.debugData
 			};
-		}) | ranges::to<vector>
+		}) | ranges::to<vector>,
+		{}
 	})).second;
 	yulAssert(inserted);
 }
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index 50dcee5dec..4f9a1e2a19 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -23,6 +23,8 @@
 
 #include <libyul/backends/evm/StackHelpers.h>
 
+#include <libevmasm/GasMeter.h>
+
 #include <libsolutil/Algorithms.h>
 #include <libsolutil/cxx20.h>
 #include <libsolutil/Visitor.h>
@@ -400,6 +402,7 @@ void StackLayoutGenerator::processEntryPoint(CFG::BasicBlock const& _entry)
 	}
 
 	stitchConditionalJumps(_entry);
+	fillInJunk(_entry);
 }
 
 optional<Stack> StackLayoutGenerator::getExitLayoutOrStageDependencies(
@@ -703,3 +706,110 @@ Stack StackLayoutGenerator::compressStack(Stack _stack)
 	while (firstDupOffset);
 	return _stack;
 }
+
+void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block)
+{
+	/// Recursively adds junk to the subgraph starting on @a _entry.
+	/// Since it is only called on cut-vertices, the full subgraph retains proper stack balance.
+	auto addJunkRecursive = [&](CFG::BasicBlock const* _entry, size_t _numJunk) {
+		util::BreadthFirstSearch<CFG::BasicBlock const*> breadthFirstSearch{{_entry}};
+		breadthFirstSearch.run([&](CFG::BasicBlock const* _block, auto _addChild) {
+			auto& blockInfo = m_layout.blockInfos.at(_block);
+			blockInfo.entryLayout = Stack{_numJunk, JunkSlot{}} + move(blockInfo.entryLayout);
+			for (auto const& operation: _block->operations)
+			{
+				auto& operationEntryLayout = m_layout.operationEntryLayout.at(&operation);
+				operationEntryLayout = Stack{_numJunk, JunkSlot{}} + move(operationEntryLayout);
+			}
+			blockInfo.exitLayout = Stack{_numJunk, JunkSlot{}} + move(blockInfo.exitLayout);
+
+			std::visit(util::GenericVisitor{
+				[&](CFG::BasicBlock::MainExit const&) {},
+				[&](CFG::BasicBlock::Jump const& _jump)
+				{
+					_addChild(_jump.target);
+				},
+				[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
+				{
+					_addChild(_conditionalJump.zero);
+					_addChild(_conditionalJump.nonZero);
+				},
+				[&](CFG::BasicBlock::FunctionReturn const&) { yulAssert(false); },
+				[&](CFG::BasicBlock::Terminated const&) {},
+			}, _block->exit);
+		});
+	};
+	/// @returns the number of operations required to transform @a _source to @a _target.
+	auto evaluateTransform = [](Stack _source, Stack const& _target) -> size_t {
+		size_t opGas = 0;
+		auto swap = [&](unsigned _swapDepth)
+		{
+			if (_swapDepth > 16)
+				opGas += 1000;
+			else
+				opGas += evmasm::GasMeter::runGas(evmasm::swapInstruction(_swapDepth));
+		};
+		auto dupOrPush = [&](StackSlot const& _slot)
+		{
+			if (canBeFreelyGenerated(_slot))
+				opGas += evmasm::GasMeter::runGas(evmasm::pushInstruction(32));
+			else
+			{
+				auto depth = util::findOffset(_source | ranges::views::reverse, _slot);
+				yulAssert(depth);
+				if (*depth < 16)
+					opGas += evmasm::GasMeter::runGas(evmasm::dupInstruction(static_cast<unsigned>(*depth + 1)));
+				else
+					opGas += 1000;
+			}
+		};
+		auto pop = [&]() { opGas += evmasm::GasMeter::runGas(evmasm::Instruction::POP); };
+		createStackLayout(_source, _target, swap, dupOrPush, pop);
+		return opGas;
+	};
+	/// Traverses the CFG and at each block that allows junk, i.e. that is a cut-vertex that never leads to a function
+	/// return, checks if adding junk reduces the shuffling cost upon entering and if so recursively adds junk
+	/// to the spanned subgraph.
+	util::BreadthFirstSearch<CFG::BasicBlock const*>{{&_block}}.run([&](CFG::BasicBlock const* _block, auto _addChild) {
+		std::visit(util::GenericVisitor{
+			[&](CFG::BasicBlock::MainExit const&) {},
+			[&](CFG::BasicBlock::Jump const& _jump)
+			{
+				_addChild(_jump.target);
+			},
+			[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
+			{
+				for (CFG::BasicBlock* exit: {_conditionalJump.zero, _conditionalJump.nonZero})
+					if (exit->allowsJunk())
+					{
+						auto& blockInfo = m_layout.blockInfos.at(exit);
+						Stack entryLayout = blockInfo.entryLayout;
+						Stack nextLayout = exit->operations.empty() ? blockInfo.exitLayout : m_layout.operationEntryLayout.at(&exit->operations.front());
+
+						size_t bestCost = evaluateTransform(entryLayout, nextLayout);
+						size_t bestNumJunk = 0;
+						size_t maxJunk = entryLayout.size();
+						for (size_t numJunk = 1; numJunk <= maxJunk; ++numJunk)
+						{
+							size_t cost = evaluateTransform(entryLayout, Stack{numJunk, JunkSlot{}} + nextLayout);
+							if (cost < bestCost)
+							{
+								bestCost = cost;
+								bestNumJunk = numJunk;
+							}
+						}
+
+						if (bestNumJunk > 0)
+						{
+							addJunkRecursive(exit, bestNumJunk);
+							blockInfo.entryLayout = entryLayout;
+						}
+					}
+				_addChild(_conditionalJump.zero);
+				_addChild(_conditionalJump.nonZero);
+			},
+			[&](CFG::BasicBlock::FunctionReturn const&) {},
+			[&](CFG::BasicBlock::Terminated const&) {},
+		}, _block->exit);
+	});
+}
diff --git a/libyul/backends/evm/StackLayoutGenerator.h b/libyul/backends/evm/StackLayoutGenerator.h
index 803e493544..34cac6d39d 100644
--- a/libyul/backends/evm/StackLayoutGenerator.h
+++ b/libyul/backends/evm/StackLayoutGenerator.h
@@ -111,6 +111,9 @@ class StackLayoutGenerator
 	/// stack @a _stack.
 	static Stack compressStack(Stack _stack);
 
+	//// Fills in junk when entering branches that do not need a clean stack in case the result is cheaper.
+	void fillInJunk(CFG::BasicBlock const& _block);
+
 	StackLayout& m_layout;
 };
 
diff --git a/test/cmdlineTests/dup_opt_peephole/output b/test/cmdlineTests/dup_opt_peephole/output
index 593d330f83..2f75f2bdda 100644
--- a/test/cmdlineTests/dup_opt_peephole/output
+++ b/test/cmdlineTests/dup_opt_peephole/output
@@ -46,8 +46,6 @@ sub_0: assembly {
         /* "dup_opt_peephole/input.sol":150:162  sstore(0, x) */
       sstore
         /* "dup_opt_peephole/input.sol":107:166  {... */
-      pop
-        /* "dup_opt_peephole/input.sol":60:171  contract C {... */
       stop
 
     auxdata: <AUXDATA REMOVED>
diff --git a/test/cmdlineTests/function_debug_info_via_yul/output b/test/cmdlineTests/function_debug_info_via_yul/output
index 495c82d5be..4e9c732b49 100644
--- a/test/cmdlineTests/function_debug_info_via_yul/output
+++ b/test/cmdlineTests/function_debug_info_via_yul/output
@@ -13,7 +13,7 @@
         },
         "calldata_array_index_access_uint256_dyn_calldata":
         {
-          "entryPoint": 152,
+          "entryPoint": 145,
           "parameterSlots": 2,
           "returnSlots": 1
         }
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index f7d61a7b1a..3490a73426 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -58,15 +58,10 @@
   assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
   return
 tag_6:
-  pop
   0x00
   dup1
   revert
 tag_4:
-  pop
-  pop
-  pop
-  pop
   mstore(0x00, shl(0xe0, 0x4e487b71))
   mstore(0x04, 0x41)
   revert(0x00, 0x24)
@@ -115,15 +110,12 @@ sub_0: assembly {
       tag_2
       jump\t// in
     tag_9:
-      swap1
-      pop
       jumpi(tag_19, callvalue)
       dup1
       add(calldatasize, not(0x03))
       slt
       tag_19
       jumpi
-      pop
       0x20
         /* \"C\":290:298  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
@@ -221,21 +213,16 @@ sub_0: assembly {
       jumpi
         /* \"C\":79:428  contract C... */
     tag_37:
-        /* \"C\":392:411  stateVar + this.f() */
-      pop
-      pop
       tag_38
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       tag_39
         /* \"C\":392:411  stateVar + this.f() */
-      swap2
-        /* \"C\":79:428  contract C... */
       tag_40
-        /* \"C\":392:411  stateVar + this.f() */
-      swap4
+      dup6
+      dup8
       tag_5
       jump\t// in
-    tag_38:
+    tag_40:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
@@ -256,7 +243,7 @@ sub_0: assembly {
       add
       swap1
       jump
-    tag_40:
+    tag_38:
       sub
       swap1
       return
@@ -300,10 +287,10 @@ sub_0: assembly {
         /* \"C\":79:428  contract C... */
       swap4
         /* \"C\":392:411  stateVar + this.f() */
-      tag_38
+      tag_40
         /* \"C\":79:428  contract C... */
       swap4
-      tag_40
+      tag_38
       swap7
       0x40
       mstore
@@ -325,12 +312,7 @@ sub_0: assembly {
       mstore
       mstore(0x04, 0x41)
       0x24
-      swap5
-      pop
-      swap3
-      pop
-      pop
-      pop
+      swap1
       revert
         /* \"C\":403:411  this.f() */
     tag_41:
@@ -340,10 +322,6 @@ sub_0: assembly {
       jump(tag_42)
     tag_34:
         /* \"C\":79:428  contract C... */
-      swap3
-      pop
-      pop
-      pop
       mload(0x40)
       swap1
       returndatasize
@@ -419,17 +397,11 @@ sub_0: assembly {
       swap2
       sub
       slt
-      tag_53
+      tag_8
       jumpi
       mload
       swap1
       jump\t// out
-    tag_53:
-      pop
-      pop
-      0x00
-      dup1
-      revert
 
     auxdata: <AUXDATA REMOVED>
 }
@@ -492,15 +464,10 @@ tag_8:
   assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
   return
 tag_6:
-  pop
   0x00
   dup1
   revert
 tag_4:
-  pop
-  pop
-  pop
-  pop
   mstore(0x00, shl(0xe0, 0x4e487b71))
   mstore(0x04, 0x41)
   revert(0x00, 0x24)
@@ -526,8 +493,6 @@ tag_1:
   jump\t// out
     /* \"D\":91:166  contract D is C(3)... */
 tag_9:
-  pop
-  pop
   mstore(0x00, shl(0xe0, 0x4e487b71))
   mstore(0x04, 0x11)
   revert(0x00, 0x24)
@@ -576,15 +541,12 @@ sub_0: assembly {
       tag_2
       jump\t// in
     tag_9:
-      swap1
-      pop
       jumpi(tag_19, callvalue)
       dup1
       add(calldatasize, not(0x03))
       slt
       tag_19
       jumpi
-      pop
       0x20
         /* \"C\":290:298  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
@@ -682,21 +644,16 @@ sub_0: assembly {
       jumpi
         /* \"D\":91:166  contract D is C(3)... */
     tag_37:
-        /* \"C\":392:411  stateVar + this.f() */
-      pop
-      pop
       tag_38
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       tag_39
         /* \"C\":392:411  stateVar + this.f() */
-      swap2
-        /* \"D\":91:166  contract D is C(3)... */
       tag_40
-        /* \"C\":392:411  stateVar + this.f() */
-      swap4
+      dup6
+      dup8
       tag_5
       jump\t// in
-    tag_38:
+    tag_40:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
@@ -717,7 +674,7 @@ sub_0: assembly {
       add
       swap1
       jump
-    tag_40:
+    tag_38:
       sub
       swap1
       return
@@ -761,10 +718,10 @@ sub_0: assembly {
         /* \"D\":91:166  contract D is C(3)... */
       swap4
         /* \"C\":392:411  stateVar + this.f() */
-      tag_38
+      tag_40
         /* \"D\":91:166  contract D is C(3)... */
       swap4
-      tag_40
+      tag_38
       swap7
       0x40
       mstore
@@ -786,12 +743,7 @@ sub_0: assembly {
       mstore
       mstore(0x04, 0x41)
       0x24
-      swap5
-      pop
-      swap3
-      pop
-      pop
-      pop
+      swap1
       revert
         /* \"C\":403:411  this.f() */
     tag_41:
@@ -801,10 +753,6 @@ sub_0: assembly {
       jump(tag_42)
     tag_34:
         /* \"D\":91:166  contract D is C(3)... */
-      swap3
-      pop
-      pop
-      pop
       mload(0x40)
       swap1
       returndatasize
@@ -880,17 +828,11 @@ sub_0: assembly {
       swap2
       sub
       slt
-      tag_53
+      tag_8
       jumpi
       mload
       swap1
       jump\t// out
-    tag_53:
-      pop
-      pop
-      0x00
-      dup1
-      revert
 
     auxdata: <AUXDATA REMOVED>
 }
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
index 7dec204b1a..1686e3ef7b 100644
--- a/test/cmdlineTests/viair_subobject_optimization/output
+++ b/test/cmdlineTests/viair_subobject_optimization/output
@@ -57,15 +57,10 @@ tag_8:
   codecopy
   return
 tag_6:
-  pop
   0x00
   dup1
   revert
 tag_4:
-  pop
-  pop
-  pop
-  pop
   mstore(0x00, shl(0xe0, 0x4e487b71))
   mstore(0x04, 0x41)
   revert(0x00, 0x24)
@@ -107,7 +102,6 @@ EVM assembly:
   codecopy
   return
 tag_1:
-  pop
   0x00
   dup1
   revert
@@ -117,8 +111,6 @@ sub_0: assembly {
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
       0x80
       jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
-    tag_3:
-      pop
       0x00
       dup1
       revert
@@ -134,7 +126,9 @@ sub_0: assembly {
       tag_4
       jumpi
       pop
-      jump(tag_3)
+      0x00
+      dup1
+      revert
     tag_4:
       jumpi(tag_8, callvalue)
       dup2
@@ -188,15 +182,12 @@ sub_0: assembly {
       swap1
       return
     tag_10:
-      pop
-      pop
       shl(0xe0, 0x4e487b71)
-      dup3
+      dup5
       mstore
-      pop
       mstore(0x04, 0x41)
       0x24
-      swap1
+      dup5
       revert
     tag_8:
       pop
@@ -330,15 +321,10 @@ sub_0: assembly {
           codecopy
           return
         tag_6:
-          pop
           0x00
           dup1
           revert
         tag_4:
-          pop
-          pop
-          pop
-          pop
           mstore(0x00, shl(0xe0, 0x4e487b71))
           mstore(0x04, 0x41)
           revert(0x00, 0x24)
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index 302e878d14..07f4ab2756 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
@@ -24,6 +24,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
-// gas irOptimized: 203312
+// gas irOptimized: 203310
 // gas legacy: 206075
 // gas legacyOptimized: 203059
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 5c7cc1cd5e..8503e5790a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // compileViaYul: also
 // ----
 // test_bytes() ->
-// gas irOptimized: 371919
+// gas irOptimized: 371912
 // gas legacy: 416585
 // gas legacyOptimized: 322043
 // test_uint256() ->
-// gas irOptimized: 523001
+// gas irOptimized: 523016
 // gas legacy: 583100
 // gas legacyOptimized: 444161
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index cc1a182c9f..cfdecd7a04 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -26,6 +26,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 167696
+// gas irOptimized: 167691
 // gas legacy: 169347
 // gas legacyOptimized: 167269
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 6c63366899..2710f202d0 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -61,10 +61,10 @@ contract C {
 // compileViaYul: also
 // ----
 // test_bytes() ->
-// gas irOptimized: 371919
+// gas irOptimized: 371912
 // gas legacy: 416585
 // gas legacyOptimized: 322043
 // test_uint256() ->
-// gas irOptimized: 523001
+// gas irOptimized: 523016
 // gas legacy: 583100
 // gas legacyOptimized: 444161
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index 82ece5f3f3..e1e2d0ab64 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -53,6 +53,6 @@ contract C {
 // f2() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f4() -> 0x20, 0x160, 0x1, 0x80, 0xc0, 0x2, 0x3, "abc", 0x7, 0x40, 0x2, 0x2, 0x3
-// gas irOptimized: 113299
+// gas irOptimized: 113277
 // gas legacy: 114900
 // gas legacyOptimized: 112606
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index eec062f56b..1a72e0888c 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -32,6 +32,6 @@ contract C is B {
 // compileViaYul: also
 // ----
 // test() -> 77
-// gas irOptimized: 119919
+// gas irOptimized: 119911
 // gas legacy: 155093
 // gas legacyOptimized: 111550
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 8f42fe5f74..63ee9bd029 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -21,6 +21,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 171842
+// gas irOptimized: 171829
 // gas legacy: 140672
 // gas legacyOptimized: 119588
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index 1f1e977201..5499c2594e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -19,10 +19,10 @@ contract C {
 // compileViaYul: also
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 180931
+// gas irOptimized: 180924
 // gas legacy: 184929
 // gas legacyOptimized: 181504
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112539
+// gas irOptimized: 112520
 // gas legacy: 115468
 // gas legacyOptimized: 112988
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index 7a6602f9df..8d1851c817 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -14,7 +14,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 189817
+// gas irOptimized: 189800
 // gas legacy: 211149
 // gas legacyOptimized: 206054
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index 76dce6a184..f0b0d1bc0c 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -19,6 +19,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0
-// gas irOptimized: 157951
+// gas irOptimized: 157949
 // gas legacy: 188576
 // gas legacyOptimized: 183333
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index 284c1b7099..b4e018e659 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -15,7 +15,7 @@ contract c {
 // ----
 // getLength() -> 0
 // set(): 1, 2 -> true
-// gas irOptimized: 110439
+// gas irOptimized: 110435
 // gas legacy: 110723
 // gas legacyOptimized: 110564
 // getLength() -> 68
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
index 945de3cfea..2aa3d43f84 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -11,7 +11,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3 ->
-// gas irOptimized: 143598
+// gas irOptimized: 142856
 // gas legacy: 183490
 // gas legacyOptimized: 151938
 // a(uint256): 0 -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 6d84d1ecd1..04b3b8e84f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -21,6 +21,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 212568
+// gas irOptimized: 212564
 // gas legacy: 221856
 // gas legacyOptimized: 220680
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index 65dfc65ab7..92495b1578 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -37,12 +37,12 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x02000202
-// gas irOptimized: 4652050
+// gas irOptimized: 4652048
 // gas legacy: 4578320
 // gas legacyOptimized: 4548312
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4483175
+// gas irOptimized: 4483170
 // gas legacy: 4410748
 // gas legacyOptimized: 4382489
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index 0e05c4ea8e..88fed0d9be 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -15,6 +15,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
-// gas irOptimized: 690205
+// gas irOptimized: 690203
 // gas legacy: 686268
 // gas legacyOptimized: 685688
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
index cad3c9d492..bd45f49a98 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
@@ -19,6 +19,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 5, 4
-// gas irOptimized: 225956
+// gas irOptimized: 225954
 // gas legacy: 233801
 // gas legacyOptimized: 232816
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
index 6eb0de4211..f90d4b8520 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
@@ -17,7 +17,7 @@ contract c {
 // ----
 // setData1(uint256,uint256,uint256): 10, 5, 4 ->
 // copyStorageStorage() ->
-// gas irOptimized: 111397
+// gas irOptimized: 111387
 // gas legacy: 109278
 // gas legacyOptimized: 109268
 // getData2(uint256): 5 -> 10, 4
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
index c865b82280..ad12cad129 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
@@ -18,6 +18,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 8, 0
-// gas irOptimized: 236090
+// gas irOptimized: 236079
 // gas legacy: 234695
 // gas legacyOptimized: 234103
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index 74cd2dc793..68817ba4c1 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -22,6 +22,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
-// gas irOptimized: 294772
+// gas irOptimized: 294770
 // gas legacy: 303626
 // gas legacyOptimized: 301945
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index 5bf1209946..346b1c469b 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -22,6 +22,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
-// gas irOptimized: 273963
+// gas irOptimized: 273961
 // gas legacy: 276360
 // gas legacyOptimized: 275411
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
index f3f3e82366..834f4d28c6 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
@@ -40,8 +40,8 @@ contract c {
 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
 // gas irOptimized: 181298
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 157936
+// gas irOptimized: 157929
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
 // gas irOptimized: 135098
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
-// gas irOptimized: 111362
+// gas irOptimized: 111346
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index e8b460b4f7..e199d37bc0 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -46,6 +46,6 @@ contract Test {
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 133597
+// gas irOptimized: 133590
 // gas legacy: 134295
 // gas legacyOptimized: 133383
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
index e13c15cabf..e358feaf7b 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
@@ -47,7 +47,7 @@ contract C {
 // compileViaYul: also
 // ----
 // copyExternalStorageArrayOfFunctionType() -> true
-// gas irOptimized: 104669
+// gas irOptimized: 104659
 // gas legacy: 108722
 // gas legacyOptimized: 102438
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
index 7f746c41a8..551ed4616c 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -50,7 +50,7 @@ contract C {
 // compileViaYul: also
 // ----
 // copyExternalStorageArraysOfFunctionType() -> true
-// gas irOptimized: 104342
+// gas irOptimized: 104332
 // gas legacy: 108459
 // gas legacyOptimized: 102171
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
index e8d28e28b7..c4aa6ac4b7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
@@ -17,4 +17,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
-// gas irOptimized: 121021
+// gas irOptimized: 121019
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
index 2fe2715876..0c554a32fe 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
@@ -19,4 +19,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 10, 11, 12
-// gas irOptimized: 119149
+// gas irOptimized: 119148
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 9c2e3b28e2..29a017e089 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -19,25 +19,25 @@ contract c {
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 121741
+// gas irOptimized: 121735
 // gas legacy: 123884
 // gas legacyOptimized: 119139
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 130733
+// gas irOptimized: 130727
 // gas legacy: 134936
 // gas legacyOptimized: 130046
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 137732
+// gas irOptimized: 137726
 // gas legacy: 141728
 // gas legacyOptimized: 136711
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 152352
+// gas irOptimized: 152346
 // gas legacy: 159768
 // gas legacyOptimized: 150641
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 406089
+// gas irOptimized: 406083
 // gas legacy: 421067
 // gas legacyOptimized: 402910
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
index 7c0b3bdbbd..d150440053 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
@@ -11,6 +11,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
-// gas irOptimized: 111161
+// gas irOptimized: 111159
 // gas legacy: 111565
 // gas legacyOptimized: 111347
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index d17978bf86..05f8bd2bf9 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -37,7 +37,7 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179899
+// gas irOptimized: 179895
 // gas legacy: 180676
 // gas legacyOptimized: 180070
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index b7b8e4be24..41a5e99093 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -48,6 +48,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0xff
-// gas irOptimized: 121125
+// gas irOptimized: 121123
 // gas legacy: 128005
 // gas legacyOptimized: 123446
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index 64cb8edd1c..4c223d30c2 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -18,6 +18,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 7
-// gas irOptimized: 124037
+// gas irOptimized: 124034
 // gas legacy: 205196
 // gas legacyOptimized: 204987
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
index 9c435f3e17..cf8023a2f4 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -9,7 +9,7 @@ contract c {
 // compileViaYul: also
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
-// gas irOptimized: 177390
+// gas irOptimized: 177386
 // gas legacy: 177653
 // gas legacyOptimized: 177493
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index ecf9c838a2..09457bb74b 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -22,8 +22,8 @@ contract sender {
 // ----
 // (): 7 ->
 // gas irOptimized: 110954
-// gas legacy: 111073
-// gas legacyOptimized: 111018
+// gas legacy: 111071
+// gas legacyOptimized: 111016
 // val() -> 0
 // forward(bool): true -> true
 // val() -> 0x80
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index 24de47c279..8908caa55f 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -20,6 +20,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 3
-// gas irOptimized: 129916
+// gas irOptimized: 129910
 // gas legacy: 130181
 // gas legacyOptimized: 129198
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
index cbeaefd82c..c9c72543c3 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -19,6 +19,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 207785
+// gas irOptimized: 207781
 // gas legacy: 212313
 // gas legacyOptimized: 211462
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
index e595c48164..8f98822e70 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
@@ -20,6 +20,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 207785
+// gas irOptimized: 207781
 // gas legacy: 212318
 // gas legacyOptimized: 211467
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
index 556fb5a61b..d9a50e73d2 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
@@ -26,6 +26,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 11, 0x0c, 1, 0x15, 22, 4
-// gas irOptimized: 291850
+// gas irOptimized: 291848
 // gas legacy: 293516
 // gas legacyOptimized: 290263
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index f212c573ad..f954701d5a 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -15,6 +15,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 2, 3, 4
-// gas irOptimized: 114120
+// gas irOptimized: 114114
 // gas legacy: 126350
 // gas legacyOptimized: 120704
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
index 8072526abc..e107bd68a4 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array.sol
@@ -20,6 +20,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> "A", 8, 4, "B"
-// gas irOptimized: 130594
+// gas irOptimized: 130592
 // gas legacy: 121398
 // gas legacyOptimized: 115494
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index 00c8c41f6a..f6208ea6f9 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -18,6 +18,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test1() -> true
-// gas irOptimized: 225894
+// gas irOptimized: 225890
 // gas legacy: 254650
 // gas legacyOptimized: 247384
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index a9eff11f41..01ba8dcfe3 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -16,7 +16,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 519886
+// gas irOptimized: 519884
 // gas legacy: 521710
 // gas legacyOptimized: 516922
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index 4ed8c050b4..be8f6eff31 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -44,7 +44,7 @@ contract c {
 // ----
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
-// gas irOptimized: 111304
+// gas irOptimized: 111295
 // gas legacy: 108571
 // gas legacyOptimized: 100417
 // getLengths() -> 48, 49
diff --git a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
index cf310f86dd..5bbd9e2070 100644
--- a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
@@ -18,7 +18,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() -> 8
-// gas irOptimized: 122534
+// gas irOptimized: 122531
 // gas legacy: 121756
 // gas legacyOptimized: 120687
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index c2a2a7b466..fba3119e1a 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -13,7 +13,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 465544
+// gas irOptimized: 465542
 // gas legacy: 471400
 // gas legacyOptimized: 467400
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 3b93c930ad..a19475f7b2 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -21,6 +21,6 @@ contract B {
 // compileViaYul: also
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 129910
+// gas irOptimized: 128110
 // gas legacy: 234719
 // gas legacyOptimized: 132639
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index 0521c45de5..3f66dca6fe 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -11,7 +11,7 @@ contract Creator {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 128995
+// gas irOptimized: 129013
 // gas legacy: 176789
 // gas legacyOptimized: 129585
 // r() -> 4
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 050595439d..66e385812f 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -45,6 +45,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 298735
+// gas irOptimized: 292702
 // gas legacy: 452136
 // gas legacyOptimized: 284945
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index 3b6fa4b5b2..3b066cfaab 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -25,7 +25,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 1, 2, 3
-// gas irOptimized: 2271050
+// gas irOptimized: 2271044
 // gas legacy: 2273434
 // gas legacyOptimized: 2261820
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index de4b2fa1cf..06f3c6cc93 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -20,7 +20,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 20, 10
-// gas irOptimized: 159175
+// gas irOptimized: 159169
 // gas legacy: 159279
 // gas legacyOptimized: 152921
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index c9f81f37a1..227eb6afd7 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -12,6 +12,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
-// gas irOptimized: 109503
+// gas irOptimized: 109499
 // gas legacy: 126728
 // gas legacyOptimized: 123444
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index 2b63293cb8..146a4dfc34 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -18,7 +18,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> true
-// gas irOptimized: 196545
+// gas irOptimized: 196541
 // gas legacy: 228685
 // gas legacyOptimized: 209662
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index 1550df0d41..d5d004f5fd 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -17,7 +17,7 @@ contract c {
 // compileViaYul: also
 // ----
 // test() ->
-// gas irOptimized: 142640
+// gas irOptimized: 142639
 // gas legacy: 164430
 // gas legacyOptimized: 157898
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index f6f9c10e89..fb05db3507 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -12,6 +12,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 108493
+// gas irOptimized: 108487
 // gas legacy: 125610
 // gas legacyOptimized: 122582
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
index 55a7d1bfe9..05299ae556 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -14,6 +14,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
-// gas irOptimized: 113258
+// gas irOptimized: 113256
 // gas legacy: 113686
 // gas legacyOptimized: 113499
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index 299aa79c78..a7b8d6d9d1 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -18,6 +18,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
-// gas irOptimized: 138705
+// gas irOptimized: 138691
 // gas legacy: 145150
 // gas legacyOptimized: 139171
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 4b8113c1b1..c4f7cb44a5 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -17,6 +17,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0
-// gas irOptimized: 176497
+// gas irOptimized: 176495
 // gas legacy: 216790
 // gas legacyOptimized: 203886
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index 610639388d..5b470e829b 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -29,14 +29,14 @@ contract C {
 // ----
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
-// gas irOptimized: 112528
+// gas irOptimized: 112517
 // gas legacy: 108105
 // gas legacyOptimized: 101987
 // l() -> 1
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
-// gas irOptimized: 116400
+// gas irOptimized: 116389
 // gas legacy: 107525
 // gas legacyOptimized: 96331
 // l() -> 2
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 6c7ae703b2..713c44ec14 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -23,7 +23,7 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 185936
+// gas irOptimized: 185922
 // gas legacy: 183811
 // gas legacyOptimized: 179218
 // l() -> 70
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index d783be0b28..d2d09645de 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -26,6 +26,6 @@ contract Main {
 // compileViaYul: also
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 113604
+// gas irOptimized: 113398
 // gas legacy: 126596
 // gas legacyOptimized: 113823
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
index 4c993d2d2b..b8dbff46a8 100644
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -12,8 +12,8 @@ contract c {
 // ----
 // (): 1, 2, 3, 4, 5 ->
 // gas irOptimized: 155170
-// gas legacy: 155251
-// gas legacyOptimized: 155214
+// gas legacy: 155249
+// gas legacyOptimized: 155212
 // checkIfDataIsEmpty() -> false
 // sendMessage() -> true, 0x40, 0
 // checkIfDataIsEmpty() -> true
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 9f9e962831..82050efa21 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 443720
+// gas irOptimized: 437093
 // gas legacy: 590683
 // gas legacyOptimized: 448326
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index a053762987..2e0835c253 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 300834
+// gas irOptimized: 295403
 // gas legacy: 428711
 // gas legacyOptimized: 297922
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 70a636c290..31212c5e82 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -10,7 +10,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 291443
+// gas irOptimized: 286205
 // gas legacy: 309607
 // gas legacyOptimized: 260566
 // m_x() -> 7
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
index 1fa4688699..701f4accb1 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -19,7 +19,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(): "abc", true
-// gas irOptimized: 106221
+// gas irOptimized: 106683
 // gas legacy: 145838
 // gas legacyOptimized: 104017
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index 4d3c98dbe1..0c38107cc8 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -12,7 +12,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 174041
+// gas irOptimized: 174020
 // gas legacy: 221377
 // gas legacyOptimized: 177671
 // a() -> 1
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index e509019458..9908b2386c 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -19,6 +19,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 120036
+// gas irOptimized: 120037
 // gas legacy: 123226
 // gas legacyOptimized: 123092
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
index f17ffe54fc..4f9984503b 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
@@ -15,5 +15,5 @@ contract B is A {
 // compileViaYul: true
 // ----
 // constructor() ->
-// gas irOptimized: 121153
+// gas irOptimized: 121557
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
index 5fafdd0451..a583bd39fb 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
@@ -12,7 +12,7 @@ contract B is A {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 121153
+// gas irOptimized: 121557
 // gas legacy: 135046
 // gas legacyOptimized: 116176
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index 21738240a2..ca4cf5a054 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -11,7 +11,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 103290
+// gas irOptimized: 103630
 // gas legacy: 117158
 // i() -> 2
 // k() -> 0
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index 635a60c016..b8f4d42bb4 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -23,7 +23,7 @@ contract D is B, C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 160093
+// gas irOptimized: 158225
 // gas legacy: 170665
 // gas legacyOptimized: 145396
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index 2d8b667ef5..ede647d608 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -14,7 +14,7 @@ contract D is C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 123907
+// gas irOptimized: 124199
 // gas legacy: 139250
 // gas legacyOptimized: 119367
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index b5db5ca2b1..dedffe232f 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
@@ -15,6 +15,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 114746
+// gas irOptimized: 114741
 // gas legacy: 116393
 // gas legacyOptimized: 114415
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
index f833ba37a7..947e5ad9e5 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
@@ -16,6 +16,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 114746
+// gas irOptimized: 114741
 // gas legacy: 116393
 // gas legacyOptimized: 114415
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 19c05a1567..36e5ee73c9 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 172802
+// gas irOptimized: 173316
 // gas legacy: 250376
 // gas legacyOptimized: 174522
 // deposit(bytes32), 18 wei: 0x1234 ->
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index 9965c786e4..58087a3b55 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -76,7 +76,7 @@ contract FixedFeeRegistrar is Registrar {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 413269
+// gas irOptimized: 402812
 // gas legacy: 935817
 // gas legacyOptimized: 489951
 // reserve(string), 69 ether: 0x20, 3, "abc" ->
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index 02c8587632..7101af5941 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -34,7 +34,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 450044
+// gas irOptimized: 443542
 // gas legacy: 765640
 // gas legacyOptimized: 541810
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
@@ -52,10 +52,10 @@ contract test {
 // encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
 // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
 // encode_inline_asm_large()
-// gas irOptimized: 1385047
+// gas irOptimized: 1385042
 // gas legacy: 1652033
 // gas legacyOptimized: 1201033
 // encode_no_asm_large()
-// gas irOptimized: 3335101
+// gas irOptimized: 3335099
 // gas legacy: 4777077
 // gas legacyOptimized: 2890077
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 42a9207fdd..bcbf816ae5 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -178,7 +178,7 @@ contract DepositContract is IDepositContract, ERC165 {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1542927
+// gas irOptimized: 1532125
 // gas legacy: 2435803
 // gas legacyOptimized: 1775425
 // supportsInterface(bytes4): 0x0 -> 0
@@ -186,27 +186,27 @@ contract DepositContract is IDepositContract, ERC165 {
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 122135
+// gas irOptimized: 122134
 // gas legacy: 150273
 // gas legacyOptimized: 122510
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 122135
+// gas irOptimized: 122134
 // gas legacy: 150273
 // gas legacyOptimized: 122510
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 122114
+// gas irOptimized: 122113
 // gas legacy: 150283
 // gas legacyOptimized: 122523
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 122114
+// gas irOptimized: 122113
 // gas legacy: 150283
 // gas legacyOptimized: 122523
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index bcb4238a77..e45d3360e3 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -50,7 +50,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1937251
+// gas irOptimized: 1926032
 // gas legacy: 2478955
 // gas legacyOptimized: 1877737
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 46e0598856..c3fb5183b1 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -50,7 +50,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1791688
+// gas irOptimized: 1783505
 // gas legacy: 2248594
 // gas legacyOptimized: 1749096
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index eb1b5d8410..2152a38a01 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -35,7 +35,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 464709
+// gas irOptimized: 456094
 // gas legacy: 671453
 // gas legacyOptimized: 480242
 // prb_pi() -> 3141592656369545286
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 9f70844105..ce582e7c94 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -51,7 +51,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 704522
+// gas irOptimized: 691317
 // gas legacy: 1127730
 // gas legacyOptimized: 753807
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
@@ -71,6 +71,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 2040024
+// gas irOptimized: 2040019
 // gas legacy: 4356286
 // gas legacyOptimized: 2268278
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index a67b1b5ad8..99167ee8e8 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -17,7 +17,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 203909
+// gas irOptimized: 200649
 // gas legacy: 245842
 // gas legacyOptimized: 195676
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index b03734532e..7a44bf1b99 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -18,7 +18,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 204072
+// gas irOptimized: 200812
 // gas legacy: 246202
 // gas legacyOptimized: 195914
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index b74680c96a..7a29cc2544 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -25,7 +25,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 314681
+// gas irOptimized: 304151
 // gas legacy: 464030
 // gas legacyOptimized: 304049
 // f(uint256): 0 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index 124f69034f..2e9be2ff5f 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -27,7 +27,7 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 449901
+// gas irOptimized: 446871
 // gas legacy: 832976
 // gas legacyOptimized: 509560
 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 933bf342d1..0a8b5a9228 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -18,7 +18,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 216903
+// gas irOptimized: 214971
 // gas legacy: 294335
 // gas legacyOptimized: 174279
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index ac51947c32..ca2cf152e8 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -41,7 +41,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 282824
+// gas irOptimized: 275142
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 0eb9648bec..a08d75557e 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -40,7 +40,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 282824
+// gas irOptimized: 275142
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index 92b75ba4ea..f422b43d92 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -20,7 +20,7 @@ contract test {
 // compileViaYul: also
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
-// gas irOptimized: 111914
+// gas irOptimized: 111909
 // gas legacy: 113806
 // gas legacyOptimized: 111781
 // get(uint8): 1 -> 21, 22, 42, 43
diff --git a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
index 1524c46d04..188052e758 100644
--- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
+++ b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
@@ -19,7 +19,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 101782
+// gas irOptimized: 100480
 // gas legacy: 116691
 // gas legacyOptimized: 100361
 // s() -> true
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index e834663d0d..c50acf2be0 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -29,7 +29,7 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 127347
+// gas irOptimized: 126536
 // gas legacy: 151334
 // gas legacyOptimized: 125166
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index e065f3f013..4f3e8a3bd1 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 3 ->
-// gas irOptimized: 131042
+// gas irOptimized: 129602
 // gas legacy: 209361
 // gas legacyOptimized: 139324
 // f() -> 84, 23
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index a156509929..165ae909df 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -25,6 +25,6 @@ contract B {
 // compileViaYul: also
 // ----
 // g() -> 42
-// gas irOptimized: 111794
+// gas irOptimized: 102144
 // gas legacy: 185053
 // gas legacyOptimized: 114598
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index 354e5d82b4..95dd7c3d90 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -42,7 +42,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 282916
+// gas irOptimized: 280056
 // gas legacy: 402045
 // gas legacyOptimized: 266772
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 94128fbc4f..3b1a485c19 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -18,7 +18,7 @@ contract ClientReceipt {
 // compileViaYul: also
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 187946
+// gas irOptimized: 183976
 // gas legacy: 235195
 // gas legacyOptimized: 176766
 // balance -> 1500
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index 60741d4c45..6304e12d8c 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -22,6 +22,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 119501
+// gas irOptimized: 119499
 // gas legacy: 124793
 // gas legacyOptimized: 119694
diff --git a/test/libsolidity/semanticTests/libraries/using_library_structs.sol b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
index 116887fd59..1f1ac6eb0c 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_structs.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
@@ -23,5 +23,5 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 7, 8
-// gas irOptimized: 101820
+// gas irOptimized: 101818
 // gas legacy: 101504
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index 44d7d502fb..4e5a07e958 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -14,7 +14,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 2 wei: 3 ->
-// gas irOptimized: 111607
+// gas irOptimized: 109775
 // gas legacy: 151416
 // gas legacyOptimized: 108388
 // state() -> 3
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
index 513bf0b8e2..558e1ca909 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -14,7 +14,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 115278
+// gas irOptimized: 113738
 // gas legacy: 155081
 // gas legacyOptimized: 107997
 // genesisHash() -> 0x3737373737373737373737373737373737373737373737373737373737373737
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
index c5c484df7e..c5f2e73434 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
-// gas irOptimized: 203303
+// gas irOptimized: 203299
 // gas legacy: 209194
 // gas legacyOptimized: 203583
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
index c23a15ec0a..509fd29ed8 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
@@ -25,6 +25,6 @@ contract CopyTest {
 // compileViaYul: also
 // ----
 // run() -> 2, 23, 42
-// gas irOptimized: 194005
+// gas irOptimized: 194003
 // gas legacy: 186016
 // gas legacyOptimized: 184668
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
index 5dd4d48a63..89f5755779 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
@@ -69,7 +69,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // load() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
-// gas irOptimized: 111432
+// gas irOptimized: 111425
 // gas legacy: 112999
 // gas legacyOptimized: 110881
 // store() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index 62a8baaedb..f7083c7a0b 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -43,7 +43,7 @@ contract c {
 // gas legacyOptimized: 110006
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // copy(uint256,uint256): 7, 8 -> true
-// gas irOptimized: 118591
+// gas irOptimized: 118581
 // gas legacy: 119166
 // gas legacyOptimized: 118622
 // retrieve(uint256): 7 -> 1, 3, 4, 2
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index 44acf38e4d..bdb60b877b 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -44,7 +44,7 @@ contract C {
 // compileViaYul: also
 // ----
 // f() ->
-// gas irOptimized: 121624
+// gas irOptimized: 121619
 // gas legacy: 122132
 // gas legacyOptimized: 121500
 // g() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
index 936039f5e0..6c317598b9 100644
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
+++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
@@ -32,6 +32,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 42, 23, 34, 42, 42
-// gas irOptimized: 110845
+// gas irOptimized: 110843
 // gas legacy: 112021
 // gas legacyOptimized: 110548
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 3f4309c868..433470160d 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -51,7 +51,7 @@ contract C {
 // compileViaYul: also
 // ----
 // test_f() -> true
-// gas irOptimized: 122334
+// gas irOptimized: 122329
 // gas legacy: 126150
 // gas legacyOptimized: 123163
 // test_g() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index aea108e2ba..d65af8e8cc 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -115,7 +115,7 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 423453
+// gas irOptimized: 418388
 // gas legacy: 860880
 // gas legacyOptimized: 420959
 // totalSupply() -> 20
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 594adea400..6f1fbe7a9c 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 199723
+// gas irOptimized: 194717
 // gas legacy: 240889
 // gas legacyOptimized: 155314
 // initCode() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
index 8061385627..3d5a480e4f 100644
--- a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
+++ b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
@@ -21,4 +21,4 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 102813
+// gas irOptimized: 101495
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 4b253a63e4..23b6c9e58d 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -36,6 +36,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 240667
+// gas irOptimized: 240662
 // gas legacy: 240349
 // gas legacyOptimized: 239673
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index 9f9084825e..109a27578f 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -98,7 +98,7 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 418910
+// gas irOptimized: 413852
 // gas legacy: 832643
 // gas legacyOptimized: 416135
 // totalSupply() -> 20
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 1c456f1d48..344daf8d82 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -19,7 +19,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(), 27 wei ->
-// gas irOptimized: 178933
+// gas irOptimized: 175589
 // gas legacy: 222977
 // gas legacyOptimized: 169779
 // f() -> 27
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 9e334c5e54..971d83407b 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -22,6 +22,6 @@ contract C {
 // compileViaYul: also
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178812
+// gas irOptimized: 178805
 // gas legacy: 180753
 // gas legacyOptimized: 179472
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index 06faab8824..d2c520545d 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -38,10 +38,10 @@ contract D {
 // f() -> 0x1 # This should work, next should throw #
 // gas legacy: 103716
 // fview() -> FAILURE
-// gas irOptimized: 98438625
+// gas irOptimized: 98438622
 // gas legacy: 98438801
 // gas legacyOptimized: 98438594
 // fpure() -> FAILURE
-// gas irOptimized: 98438625
+// gas irOptimized: 98438622
 // gas legacy: 98438801
 // gas legacyOptimized: 98438595
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 78eb2eec7d..879e9d23c8 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -22,7 +22,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 191249
+// gas irOptimized: 190491
 // gas legacy: 265006
 // gas legacyOptimized: 182842
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 4b57d19e62..0499c1b068 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -21,7 +21,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 193397
+// gas irOptimized: 192213
 // gas legacy: 266728
 // gas legacyOptimized: 184762
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
index 772c77af2c..5bd5fe137d 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
@@ -28,7 +28,7 @@ contract C {
 // index(uint256): 10 -> true
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
-// gas irOptimized: 137645
+// gas irOptimized: 137634
 // gas legacy: 247324
 // gas legacyOptimized: 149578
 // accessIndex(uint256,int256): 10, 1 -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index 63096bed6c..31cf4ad690 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -18,33 +18,33 @@ contract C {
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
-// gas irOptimized: 3032986
+// gas irOptimized: 3032985
 // gas legacy: 3070431
 // gas legacyOptimized: 3010325
 // test_indices(uint256): 5 ->
-// gas irOptimized: 367642
+// gas irOptimized: 367641
 // gas legacy: 369211
 // gas legacyOptimized: 366089
 // test_indices(uint256): 10 ->
 // test_indices(uint256): 15 ->
 // gas irOptimized: 72860
 // test_indices(uint256): 0xFF ->
-// gas irOptimized: 3438610
+// gas irOptimized: 3438609
 // gas legacy: 3512637
 // gas legacyOptimized: 3395047
 // test_indices(uint256): 1000 ->
-// gas irOptimized: 18318372
+// gas irOptimized: 18318371
 // gas legacy: 18611999
 // gas legacyOptimized: 18166944
 // test_indices(uint256): 129 ->
-// gas irOptimized: 2733570
+// gas irOptimized: 2733569
 // gas legacy: 2771961
 // gas legacyOptimized: 2714999
 // test_indices(uint256): 128 ->
-// gas irOptimized: 426682
+// gas irOptimized: 426681
 // gas legacy: 466504
 // gas legacyOptimized: 416888
 // test_indices(uint256): 1 ->
-// gas irOptimized: 363074
+// gas irOptimized: 363073
 // gas legacy: 363401
 // gas legacyOptimized: 361799
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
index 975130c517..ea64676a83 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
@@ -18,11 +18,11 @@ contract C {
 // test_boundary_check(uint256,uint256): 1, 1 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
-// gas irOptimized: 137849
+// gas irOptimized: 137834
 // gas legacy: 131830
 // gas legacyOptimized: 112054
 // test_boundary_check(uint256,uint256): 256, 255 -> 0
-// gas irOptimized: 140028
+// gas irOptimized: 140017
 // gas legacy: 134149
 // gas legacyOptimized: 114233
 // test_boundary_check(uint256,uint256): 256, 0xFFFF -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index 4361001f49..26c0d8394e 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -54,18 +54,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131193
+// gas irOptimized: 131192
 // gas legacy: 132331
 // gas legacyOptimized: 129514
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 174811
+// gas irOptimized: 174810
 // gas legacy: 177248
 // gas legacyOptimized: 172062
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 198071
+// gas irOptimized: 198070
 // gas legacy: 201828
 // gas legacyOptimized: 194352
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 6098681
+// gas irOptimized: 6098680
 // gas legacy: 6160863
 // gas legacyOptimized: 6024902
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
index c5af584495..1c3f8410cd 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
@@ -18,7 +18,7 @@ contract C {
 // gas legacy: 126722
 // gas legacyOptimized: 107818
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1217857
+// gas irOptimized: 1217851
 // gas legacy: 1702119
 // gas legacyOptimized: 1398420
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
index 7291e1e347..6e126a1507 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
@@ -13,11 +13,11 @@ contract C {
 // compileViaYul: also
 // ----
 // pushEmpty(uint256): 128
-// gas irOptimized: 412570
+// gas irOptimized: 412561
 // gas legacy: 416903
 // gas legacyOptimized: 398280
 // pushEmpty(uint256): 256
-// gas irOptimized: 702558
+// gas irOptimized: 702549
 // gas legacy: 714315
 // gas legacyOptimized: 687372
 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
index 5e5d1c962c..cb23435d17 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
@@ -22,11 +22,11 @@ contract C {
 // gas legacy: 77730
 // gas legacyOptimized: 77162
 // set_get_length(uint256): 0xFF -> 0xFF
-// gas irOptimized: 141805
+// gas irOptimized: 141799
 // gas legacy: 678237
 // gas legacyOptimized: 115104
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1801672
+// gas irOptimized: 1801666
 // gas legacy: 9873774
 // gas legacyOptimized: 1398546
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
index e802e3687b..25a2f5f9af 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
@@ -19,11 +19,11 @@ contract C {
 // gas legacy: 85822
 // gas legacyOptimized: 83608
 // set_get_length(uint256): 0xFF -> 0
-// gas irOptimized: 821881
+// gas irOptimized: 821875
 // gas legacy: 810327
 // gas legacyOptimized: 786258
 // set_get_length(uint256): 0xFFF -> 0
-// gas irOptimized: 12841093
+// gas irOptimized: 12841087
 // gas legacy: 12649059
 // gas legacyOptimized: 12267870
 // set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index b2df7d748d..f1a6f592b2 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -23,6 +23,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() ->
-// gas irOptimized: 112995
+// gas irOptimized: 112992
 // gas legacy: 112931
 // gas legacyOptimized: 112602
diff --git a/test/libyul/evmCodeTransform/pops_in_reverting_branch.yul b/test/libyul/evmCodeTransform/pops_in_reverting_branch.yul
index 48142ac469..78bf0a1682 100644
--- a/test/libyul/evmCodeTransform/pops_in_reverting_branch.yul
+++ b/test/libyul/evmCodeTransform/pops_in_reverting_branch.yul
@@ -34,9 +34,6 @@ object "main" {
 //   stop
 //     /* "":110:139   */
 // tag_1:
-//     /* "":121:132   */
-//   pop
-//   pop
 //     /* "":130:131   */
 //   0x00
 //     /* "":121:132   */
diff --git a/test/libyul/evmCodeTransform/stackReuse/if.yul b/test/libyul/evmCodeTransform/stackReuse/if.yul
index cf0b2a044b..cee19ab93f 100644
--- a/test/libyul/evmCodeTransform/stackReuse/if.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/if.yul
@@ -13,8 +13,6 @@
 //   jumpi
 //     /* "":55:107   */
 // tag_2:
-//     /* "":95:105   */
-//   pop
 //     /* "":104:105   */
 //   0x03
 //     /* "":55:107   */
diff --git a/test/libyul/yulStackLayout/complex.yul b/test/libyul/yulStackLayout/complex.yul
index e521e6faa2..604dca1f46 100644
--- a/test/libyul/yulStackLayout/complex.yul
+++ b/test/libyul/yulStackLayout/complex.yul
@@ -204,16 +204,16 @@
 //
 // Block12 [label="\
 // [ JUNK JUNK JUNK JUNK x JUNK ]\l\
-// [ 0x06 x ]\l\
+// [ JUNK JUNK JUNK JUNK JUNK JUNK 0x06 x ]\l\
 // sstore\l\
-// [ ]\l\
-// [ 0x2a ]\l\
+// [ JUNK JUNK JUNK JUNK JUNK JUNK ]\l\
+// [ JUNK JUNK JUNK JUNK JUNK JUNK 0x2a ]\l\
 // Assignment(c)\l\
-// [ c ]\l\
-// [ 0x00 0x00 ]\l\
+// [ JUNK JUNK JUNK JUNK JUNK JUNK c ]\l\
+// [ JUNK JUNK JUNK JUNK JUNK JUNK 0x00 0x00 ]\l\
 // revert\l\
-// [ ]\l\
-// [ ]\l\
+// [ JUNK JUNK JUNK JUNK JUNK JUNK ]\l\
+// [ JUNK JUNK JUNK JUNK JUNK JUNK ]\l\
 // "];
 // Block12Exit [label="Terminated"];
 // Block12 -> Block12Exit;
@@ -254,10 +254,10 @@
 //
 // Block16 [label="\
 // [ JUNK JUNK JUNK JUNK JUNK ]\l\
-// [ 0x00 0x00 ]\l\
+// [ JUNK JUNK JUNK JUNK JUNK 0x00 0x00 ]\l\
 // return\l\
-// [ ]\l\
-// [ ]\l\
+// [ JUNK JUNK JUNK JUNK JUNK ]\l\
+// [ JUNK JUNK JUNK JUNK JUNK ]\l\
 // "];
 // Block16Exit [label="Terminated"];
 // Block16 -> Block16Exit;
diff --git a/test/libyul/yulStackLayout/for.yul b/test/libyul/yulStackLayout/for.yul
index fc0fbcdb7e..88aafad6b2 100644
--- a/test/libyul/yulStackLayout/for.yul
+++ b/test/libyul/yulStackLayout/for.yul
@@ -49,10 +49,10 @@
 //
 // Block2 [label="\
 // [ JUNK ]\l\
-// [ 0x0506 0x06 ]\l\
+// [ JUNK 0x0506 0x06 ]\l\
 // sstore\l\
-// [ ]\l\
-// [ ]\l\
+// [ JUNK ]\l\
+// [ JUNK ]\l\
 // "];
 // Block2Exit [label="MainExit"];
 // Block2 -> Block2Exit;

From 75abe92eb2033bba82d1f0fe9948253c65106f18 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 15 Mar 2022 18:10:52 +0100
Subject: [PATCH 0494/1748] Refactor stack compressor.

---
 libyul/optimiser/NameCollector.cpp            |  20 +-
 libyul/optimiser/NameCollector.h              |   2 +-
 libyul/optimiser/Rematerialiser.cpp           |  23 ---
 libyul/optimiser/Rematerialiser.h             |  12 --
 libyul/optimiser/StackCompressor.cpp          | 171 +++++++++---------
 .../stackCompressor/inlineInFunction.yul      |   1 -
 6 files changed, 99 insertions(+), 130 deletions(-)

diff --git a/libyul/optimiser/NameCollector.cpp b/libyul/optimiser/NameCollector.cpp
index eca509f43c..c2a82d4946 100644
--- a/libyul/optimiser/NameCollector.cpp
+++ b/libyul/optimiser/NameCollector.cpp
@@ -30,18 +30,22 @@ using namespace solidity::util;
 
 void NameCollector::operator()(VariableDeclaration const& _varDecl)
 {
-	for (auto const& var: _varDecl.variables)
-		m_names.emplace(var.name);
+	if (m_collectWhat != OnlyFunctions)
+		for (auto const& var: _varDecl.variables)
+			m_names.emplace(var.name);
 }
 
-void NameCollector::operator ()(FunctionDefinition const& _funDef)
+void NameCollector::operator()(FunctionDefinition const& _funDef)
 {
-	if (m_collectWhat == VariablesAndFunctions)
+	if (m_collectWhat != OnlyVariables)
 		m_names.emplace(_funDef.name);
-	for (auto const& arg: _funDef.parameters)
-		m_names.emplace(arg.name);
-	for (auto const& ret: _funDef.returnVariables)
-		m_names.emplace(ret.name);
+	if (m_collectWhat != OnlyFunctions)
+	{
+		for (auto const& arg: _funDef.parameters)
+			m_names.emplace(arg.name);
+		for (auto const& ret: _funDef.returnVariables)
+			m_names.emplace(ret.name);
+	}
 	ASTWalker::operator ()(_funDef);
 }
 
diff --git a/libyul/optimiser/NameCollector.h b/libyul/optimiser/NameCollector.h
index 8c9dc14ff8..34dd5f9b30 100644
--- a/libyul/optimiser/NameCollector.h
+++ b/libyul/optimiser/NameCollector.h
@@ -35,7 +35,7 @@ namespace solidity::yul
 class NameCollector: public ASTWalker
 {
 public:
-	enum CollectWhat { VariablesAndFunctions, OnlyVariables };
+	enum CollectWhat { VariablesAndFunctions, OnlyVariables, OnlyFunctions };
 
 	explicit NameCollector(
 		Block const& _block,
diff --git a/libyul/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp
index 6e00fcd8a2..7dff1df80f 100644
--- a/libyul/optimiser/Rematerialiser.cpp
+++ b/libyul/optimiser/Rematerialiser.cpp
@@ -37,16 +37,6 @@ void Rematerialiser::run(Dialect const& _dialect, Block& _ast, set<YulString> _v
 	Rematerialiser{_dialect, _ast, std::move(_varsToAlwaysRematerialize), _onlySelectedVariables}(_ast);
 }
 
-void Rematerialiser::run(
-	Dialect const& _dialect,
-	FunctionDefinition& _function,
-	set<YulString> _varsToAlwaysRematerialize,
-	bool _onlySelectedVariables
-)
-{
-	Rematerialiser{_dialect, _function, std::move(_varsToAlwaysRematerialize), _onlySelectedVariables}(_function);
-}
-
 Rematerialiser::Rematerialiser(
 	Dialect const& _dialect,
 	Block& _ast,
@@ -60,19 +50,6 @@ Rematerialiser::Rematerialiser(
 {
 }
 
-Rematerialiser::Rematerialiser(
-	Dialect const& _dialect,
-	FunctionDefinition& _function,
-	set<YulString> _varsToAlwaysRematerialize,
-	bool _onlySelectedVariables
-):
-	DataFlowAnalyzer(_dialect),
-	m_referenceCounts(ReferencesCounter::countReferences(_function)),
-	m_varsToAlwaysRematerialize(std::move(_varsToAlwaysRematerialize)),
-	m_onlySelectedVariables(_onlySelectedVariables)
-{
-}
-
 void Rematerialiser::visit(Expression& _e)
 {
 	if (holds_alternative<Identifier>(_e))
diff --git a/libyul/optimiser/Rematerialiser.h b/libyul/optimiser/Rematerialiser.h
index d1ebb15951..592f79d1be 100644
--- a/libyul/optimiser/Rematerialiser.h
+++ b/libyul/optimiser/Rematerialiser.h
@@ -53,12 +53,6 @@ class Rematerialiser: public DataFlowAnalyzer
 		std::set<YulString> _varsToAlwaysRematerialize = {},
 		bool _onlySelectedVariables = false
 	);
-	static void run(
-		Dialect const& _dialect,
-		FunctionDefinition& _function,
-		std::set<YulString> _varsToAlwaysRematerialize = {},
-		bool _onlySelectedVariables = false
-	);
 
 protected:
 	Rematerialiser(
@@ -67,12 +61,6 @@ class Rematerialiser: public DataFlowAnalyzer
 		std::set<YulString> _varsToAlwaysRematerialize = {},
 		bool _onlySelectedVariables = false
 	);
-	Rematerialiser(
-		Dialect const& _dialect,
-		FunctionDefinition& _function,
-		std::set<YulString> _varsToAlwaysRematerialize = {},
-		bool _onlySelectedVariables = false
-	);
 
 	using DataFlowAnalyzer::operator();
 
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index 8b06d66258..eb06292588 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -50,31 +50,41 @@ namespace
 /**
  * Class that discovers all variables that can be fully eliminated by rematerialization,
  * and the corresponding approximate costs.
+ *
+ * Prerequisite: Disambiguator, Function Grouper
  */
 class RematCandidateSelector: public DataFlowAnalyzer
 {
 public:
 	explicit RematCandidateSelector(Dialect const& _dialect): DataFlowAnalyzer(_dialect) {}
 
-	/// @returns a map from rematerialisation costs to a vector of variables to rematerialise
+	/// @returns a map from function name to rematerialisation costs to a vector of variables to rematerialise
 	/// and variables that occur in their expression.
 	/// While the map is sorted by cost, the contained vectors are sorted by the order of occurrence.
-	map<size_t, vector<tuple<YulString, set<YulString>>>> candidates()
+	map<YulString, map<size_t, vector<tuple<YulString, set<YulString>>>>> candidates()
 	{
-		map<size_t, vector<tuple<YulString, set<YulString>>>> cand;
-		for (auto const& candidate: m_candidates)
+		map<YulString, map<size_t, vector<tuple<YulString, set<YulString>>>>> cand;
+		for (auto const& [functionName, candidate]: m_candidates)
 		{
 			if (size_t const* cost = util::valueOrNullptr(m_expressionCodeCost, candidate))
 			{
 				size_t numRef = m_numReferences[candidate];
 				set<YulString> const* ref = references(candidate);
-				cand[*cost * numRef].emplace_back(candidate, ref ? move(*ref) : set<YulString>{});
+				cand[functionName][*cost * numRef].emplace_back(candidate, ref ? move(*ref) : set<YulString>{});
 			}
 		}
 		return cand;
 	}
 
 	using DataFlowAnalyzer::operator();
+	void operator()(FunctionDefinition& _function) override
+	{
+		yulAssert(m_currentFunctionName.empty());
+		m_currentFunctionName = _function.name;
+		DataFlowAnalyzer::operator()(_function);
+		m_currentFunctionName = {};
+	}
+
 	void operator()(VariableDeclaration& _varDecl) override
 	{
 		DataFlowAnalyzer::operator()(_varDecl);
@@ -84,7 +94,7 @@ class RematCandidateSelector: public DataFlowAnalyzer
 			if (AssignedValue const* value = variableValue(varName))
 			{
 				yulAssert(!m_expressionCodeCost.count(varName), "");
-				m_candidates.emplace_back(varName);
+				m_candidates.emplace_back(m_currentFunctionName, varName);
 				m_expressionCodeCost[varName] = CodeCost::codeCost(m_dialect, *value->value);
 			}
 		}
@@ -122,8 +132,10 @@ class RematCandidateSelector: public DataFlowAnalyzer
 		m_expressionCodeCost.erase(_variable);
 	}
 
-	/// All candidate variables in order of occurrence.
-	vector<YulString> m_candidates;
+	YulString m_currentFunctionName = {};
+
+	/// All candidate variables by function name, in order of occurrence.
+	vector<pair<YulString, YulString>> m_candidates;
 	/// Candidate variables and the code cost of their value.
 	map<YulString, size_t> m_expressionCodeCost;
 	/// Number of references to each candidate variable.
@@ -156,62 +168,80 @@ set<YulString> chooseVarsToEliminate(
 	return varsToEliminate;
 }
 
-template <typename ASTNode>
 void eliminateVariables(
 	Dialect const& _dialect,
-	ASTNode& _node,
-	size_t _numVariables,
+	Block& _ast,
+	map<YulString, int> const& _numVariables,
 	bool _allowMSizeOptimization
 )
 {
 	RematCandidateSelector selector{_dialect};
-	selector(_node);
-	Rematerialiser::run(_dialect, _node, chooseVarsToEliminate(selector.candidates(), _numVariables));
-	UnusedPruner::runUntilStabilised(_dialect, _node, _allowMSizeOptimization);
+	selector(_ast);
+	map<YulString, map<size_t, vector<tuple<YulString, set<YulString>>>>> candidates = selector.candidates();
+
+	set<YulString> varsToEliminate;
+	for (auto const& [functionName, numVariables]: _numVariables)
+	{
+		yulAssert(numVariables > 0);
+		varsToEliminate += chooseVarsToEliminate(candidates[functionName], static_cast<size_t>(numVariables));
+	}
+
+	Rematerialiser::run(_dialect, _ast, move(varsToEliminate));
+	// Do not remove functions.
+	set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
+	UnusedPruner::runUntilStabilised(_dialect, _ast, _allowMSizeOptimization, nullptr, allFunctions);
 }
 
-void eliminateVariables(
+void eliminateVariablesOptimizedCodegen(
 	Dialect const& _dialect,
-	Block& _block,
-	vector<StackLayoutGenerator::StackTooDeep> const& _unreachables,
+	Block& _ast,
+	map<YulString, vector<StackLayoutGenerator::StackTooDeep>> const& _unreachables,
 	bool _allowMSizeOptimization
 )
 {
+	if (std::all_of(_unreachables.begin(), _unreachables.end(), [](auto const& _item) { return _item.second.empty(); }))
+		return;
+
 	RematCandidateSelector selector{_dialect};
-	selector(_block);
-	std::map<YulString, size_t> candidates;
-	for (auto [cost, candidatesWithCost]: selector.candidates())
-		for (auto candidate: candidatesWithCost)
-			candidates[get<0>(candidate)] = cost;
+	selector(_ast);
+
+	map<YulString, size_t> candidates;
+	for (auto const& [functionName, candidatesInFunction]: selector.candidates())
+		for (auto [cost, candidatesWithCost]: candidatesInFunction)
+			for (auto candidate: candidatesWithCost)
+				candidates[get<0>(candidate)] = cost;
 
 	set<YulString> varsToEliminate;
 
 	// TODO: this currently ignores the fact that variables may reference other variables we want to eliminate.
-	for (auto const& unreachable: _unreachables)
-	{
-		map<size_t, vector<YulString>> suitableCandidates;
-		size_t neededSlots = unreachable.deficit;
-		for (auto varName: unreachable.variableChoices)
-		{
-			if (varsToEliminate.count(varName))
-				--neededSlots;
-			else if (size_t* cost = util::valueOrNullptr(candidates, varName))
-				if (!util::contains(suitableCandidates[*cost], varName))
-					suitableCandidates[*cost].emplace_back(varName);
-		}
-		for (auto candidatesByCost: suitableCandidates)
+	for (auto const& [functionName, unreachables]: _unreachables)
+		for (auto const& unreachable: unreachables)
 		{
-			for (auto candidate: candidatesByCost.second)
-				if (neededSlots--)
-					varsToEliminate.emplace(candidate);
-				else
+			map<size_t, vector<YulString>> suitableCandidates;
+			size_t neededSlots = unreachable.deficit;
+			for (auto varName: unreachable.variableChoices)
+			{
+				if (varsToEliminate.count(varName))
+					--neededSlots;
+				else if (size_t* cost = util::valueOrNullptr(candidates, varName))
+					if (!util::contains(suitableCandidates[*cost], varName))
+						suitableCandidates[*cost].emplace_back(varName);
+			}
+			for (auto candidatesByCost: suitableCandidates)
+			{
+				for (auto candidate: candidatesByCost.second)
+					if (neededSlots--)
+						varsToEliminate.emplace(candidate);
+					else
+						break;
+				if (!neededSlots)
 					break;
-			if (!neededSlots)
-				break;
+			}
 		}
-	}
-	Rematerialiser::run(_dialect, _block, std::move(varsToEliminate), true);
-	UnusedPruner::runUntilStabilised(_dialect, _block, _allowMSizeOptimization);
+	Rematerialiser::run(_dialect, _ast, std::move(varsToEliminate), true);
+	// Do not remove functions.
+	set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
+	UnusedPruner::runUntilStabilised(_dialect, _ast, _allowMSizeOptimization, nullptr, allFunctions);
 }
 
 }
@@ -239,21 +269,12 @@ bool StackCompressor::run(
 	{
 		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object);
 		unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, _dialect, *_object.code);
-		Block& mainBlock = std::get<Block>(_object.code->statements.at(0));
-		if (
-			auto stackTooDeepErrors = StackLayoutGenerator::reportStackTooDeep(*cfg, YulString{});
-			!stackTooDeepErrors.empty()
-		)
-			eliminateVariables(_dialect, mainBlock, stackTooDeepErrors, allowMSizeOptimzation);
-		for (size_t i = 1; i < _object.code->statements.size(); ++i)
-		{
-			auto& fun = std::get<FunctionDefinition>(_object.code->statements[i]);
-			if (
-				auto stackTooDeepErrors = StackLayoutGenerator::reportStackTooDeep(*cfg, fun.name);
-				!stackTooDeepErrors.empty()
-			)
-				eliminateVariables(_dialect, fun.body, stackTooDeepErrors, allowMSizeOptimzation);
-		}
+		eliminateVariablesOptimizedCodegen(
+			_dialect,
+			*_object.code,
+			StackLayoutGenerator::reportStackTooDeep(*cfg),
+			allowMSizeOptimzation
+		);
 	}
 	else
 		for (size_t iterations = 0; iterations < _maxIterations; iterations++)
@@ -261,32 +282,12 @@ bool StackCompressor::run(
 			map<YulString, int> stackSurplus = CompilabilityChecker(_dialect, _object, _optimizeStackAllocation).stackDeficit;
 			if (stackSurplus.empty())
 				return true;
-
-			if (stackSurplus.count(YulString{}))
-			{
-				yulAssert(stackSurplus.at({}) > 0, "Invalid surplus value.");
-				eliminateVariables(
-					_dialect,
-					std::get<Block>(_object.code->statements.at(0)),
-					static_cast<size_t>(stackSurplus.at({})),
-					allowMSizeOptimzation
-				);
-			}
-
-			for (size_t i = 1; i < _object.code->statements.size(); ++i)
-			{
-				auto& fun = std::get<FunctionDefinition>(_object.code->statements[i]);
-				if (!stackSurplus.count(fun.name))
-					continue;
-
-				yulAssert(stackSurplus.at(fun.name) > 0, "Invalid surplus value.");
-				eliminateVariables(
-					_dialect,
-					fun,
-					static_cast<size_t>(stackSurplus.at(fun.name)),
-					allowMSizeOptimzation
-				);
-			}
+			eliminateVariables(
+				_dialect,
+				*_object.code,
+				stackSurplus,
+				allowMSizeOptimzation
+			);
 		}
 	return false;
 }
diff --git a/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul b/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
index 35dfa5343d..a51c39f4f3 100644
--- a/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
+++ b/test/libyul/yulOptimizerTests/stackCompressor/inlineInFunction.yul
@@ -11,7 +11,6 @@
 // step: stackCompressor
 //
 // {
-//     { let x := 8 }
 //     function f()
 //     {
 //         mstore(calldataload(calldataload(9)), add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(add(calldataload(calldataload(9)), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1), 1))

From acd488532d505b852002da4c8b689433f161992d Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 16 Mar 2022 10:28:40 +0100
Subject: [PATCH 0495/1748] Set release date.

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index e239abd3e9..28aace8a4f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.13 (unreleased)
+### 0.8.13 (2022-03-16)
 
 Important Bugfixes:
  * Code Generator: Correctly encode literals used in ``abi.encodeCall`` in place of fixed bytes arguments.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 318a96e144..7b9a7fc3d5 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1560,6 +1560,10 @@
         ],
         "released": "2022-02-16"
     },
+    "0.8.13": {
+        "bugs": [],
+        "released": "2022-03-16"
+    },
     "0.8.2": {
         "bugs": [
             "SignedImmutables",

From 1be21e267031c18b667d58ad0306a21c55e75253 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 16 Mar 2022 12:23:23 +0100
Subject: [PATCH 0496/1748] Move state variable initialization to top.

---
 docs/ir-breaking-changes.rst | 83 ++++++++++++++++++------------------
 1 file changed, 42 insertions(+), 41 deletions(-)

diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index fb307e64c5..2b5905a96b 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -30,6 +30,48 @@ Semantic Only Changes
 This section lists the changes that are semantic-only, thus potentially
 hiding new and different behavior in existing code.
 
+- The order of state variable initialization has changed in case of inheritance.
+
+  The order used to be:
+
+  - All state variables are zero-initialized at the beginning.
+  - Evaluate base constructor arguments from most derived to most base contract.
+  - Initialize all state variables in the whole inheritance hierarchy from most base to most derived.
+  - Run the constructor, if present, for all contracts in the linearized hierarchy from most base to most derived.
+
+  New order:
+
+  - All state variables are zero-initialized at the beginning.
+  - Evaluate base constructor arguments from most derived to most base contract.
+  - For every contract in order from most base to most derived in the linearized hierarchy:
+
+      1. Initialize state variables.
+      2. Run the constructor (if present).
+
+  This causes differences in contracts where the initial value of a state
+  variable relies on the result of the constructor in another contract:
+
+  .. code-block:: solidity
+
+      // SPDX-License-Identifier: GPL-3.0
+      pragma solidity >=0.7.1;
+
+      contract A {
+          uint x;
+          constructor() {
+              x = 42;
+          }
+          function f() public view returns(uint256) {
+              return x;
+          }
+      }
+      contract B is A {
+          uint public y = f();
+      }
+
+  Previously, ``y`` would be set to 0. This is due to the fact that we would first initialize state variables: First, ``x`` is set to 0, and when initializing ``y``, ``f()`` would return 0 causing ``y`` to be 0 as well.
+  With the new rules, ``y`` will be set to 42. We first initialize ``x`` to 0, then call A's constructor which sets ``x`` to 42. Finally, when initializing ``y``, ``f()`` returns 42 causing ``y`` to be 42.
+
 - When storage structs are deleted, every storage slot that contains
   a member of the struct is set to zero entirely. Formerly, padding space
   was left untouched.
@@ -112,47 +154,6 @@ hiding new and different behavior in existing code.
   - New code generator: ``0`` as all parameters, including return parameters, will be re-initialized before
     each ``_;`` evaluation.
 
-- The order of contract initialization has changed in case of inheritance.
-
-  The order used to be:
-
-  - All state variables are zero-initialized at the beginning.
-  - Evaluate base constructor arguments from most derived to most base contract.
-  - Initialize all state variables in the whole inheritance hierarchy from most base to most derived.
-  - Run the constructor, if present, for all contracts in the linearized hierarchy from most base to most derived.
-
-  New order:
-
-  - All state variables are zero-initialized at the beginning.
-  - Evaluate base constructor arguments from most derived to most base contract.
-  - For every contract in order from most base to most derived in the linearized hierarchy execute:
-
-      1. If present at declaration, initial values are assigned to state variables.
-      2. Constructor, if present.
-
-This causes differences in some contracts, for example:
-
-  .. code-block:: solidity
-
-      // SPDX-License-Identifier: GPL-3.0
-      pragma solidity >=0.7.1;
-
-      contract A {
-          uint x;
-          constructor() {
-              x = 42;
-          }
-          function f() public view returns(uint256) {
-              return x;
-          }
-      }
-      contract B is A {
-          uint public y = f();
-      }
-
-  Previously, ``y`` would be set to 0. This is due to the fact that we would first initialize state variables: First, ``x`` is set to 0, and when initializing ``y``, ``f()`` would return 0 causing ``y`` to be 0 as well.
-  With the new rules, ``y`` will be set to 42. We first initialize ``x`` to 0, then call A's constructor which sets ``x`` to 42. Finally, when initializing ``y``, ``f()`` returns 42 causing ``y`` to be 42.
-
 - Copying ``bytes`` arrays from memory to storage is implemented in a different way.
   The old code generator always copies full words, while the new one cuts the byte
   array after its end. The old behaviour can lead to dirty data being copied after

From 8b0845fe977bf60fa99b32636ff06d97e2f5f9b0 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 16 Mar 2022 12:57:38 +0100
Subject: [PATCH 0497/1748] CommonSubexpressionEliminator performance
 optimization

---
 libevmasm/CommonSubexpressionEliminator.cpp | 6 +++---
 libevmasm/CommonSubexpressionEliminator.h   | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
index 8a4e9f6e37..397d20f169 100644
--- a/libevmasm/CommonSubexpressionEliminator.cpp
+++ b/libevmasm/CommonSubexpressionEliminator.cpp
@@ -219,7 +219,7 @@ void CSECodeGenerator::addDependencies(Id _c)
 {
 	if (m_classPositions.count(_c))
 		return; // it is already on the stack
-	if (m_neededBy.count(_c))
+	if (m_neededBy.find(_c) != m_neededBy.end())
 		return; // we already computed the dependencies for _c
 	ExpressionClasses::Expression expr = m_expressionClasses.representative(_c);
 	assertThrow(expr.item, OptimizerException, "");
@@ -300,8 +300,8 @@ void CSECodeGenerator::addDependencies(Id _c)
 
 void CSECodeGenerator::generateClassElement(Id _c, bool _allowSequenced)
 {
-	for (auto it: m_classPositions)
-		for (auto p: it.second)
+	for (auto const& it: m_classPositions)
+		for (int p: it.second)
 			if (p > m_stackHeight)
 			{
 				assertThrow(false, OptimizerException, "");
diff --git a/libevmasm/CommonSubexpressionEliminator.h b/libevmasm/CommonSubexpressionEliminator.h
index 88e5597193..51a5d74b22 100644
--- a/libevmasm/CommonSubexpressionEliminator.h
+++ b/libevmasm/CommonSubexpressionEliminator.h
@@ -24,11 +24,12 @@
 
 #pragma once
 
-#include <vector>
 #include <map>
+#include <ostream>
 #include <set>
 #include <tuple>
-#include <ostream>
+#include <unordered_map>
+#include <vector>
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/Exceptions.h>
 #include <libevmasm/ExpressionClasses.h>
@@ -154,11 +155,11 @@ class CSECodeGenerator
 	/// Current height of the stack relative to the start.
 	int m_stackHeight = 0;
 	/// If (b, a) is in m_requests then b is needed to compute a.
-	std::multimap<Id, Id> m_neededBy;
+	std::unordered_multimap<Id, Id> m_neededBy;
 	/// Current content of the stack.
 	std::map<int, Id> m_stack;
 	/// Current positions of equivalence classes, equal to the empty set if already deleted.
-	std::map<Id, std::set<int>> m_classPositions;
+	std::unordered_map<Id, std::set<int>> m_classPositions;
 
 	/// The actual equivalence class items and how to compute them.
 	ExpressionClasses& m_expressionClasses;

From e786bf9b5ae162758fc92cc97cefc77c8f748433 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 16 Mar 2022 14:38:15 +0100
Subject: [PATCH 0498/1748] Set version to 0.8.14.

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc7320c72d..759f69a538 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.13")
+set(PROJECT_VERSION "0.8.14")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 28aace8a4f..b178baf570 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,15 @@
+### 0.8.14 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
+
 ### 0.8.13 (2022-03-16)
 
 Important Bugfixes:

From 54ab09fee883c6d054db85c80eb4d9459afe004a Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 15 Mar 2022 17:25:22 +0100
Subject: [PATCH 0499/1748] Additional peephole optimizer rules for removing
 side-effect free instructions before simple terminations.

---
 Changelog.md                    |  1 +
 libevmasm/PeepholeOptimiser.cpp | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index b178baf570..32d76774a8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * Peephole Optimizer: Remove operations without side effects before simple terminations.
 
 
 Bugfixes:
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
index 4e4a2c9d7a..334903c92b 100644
--- a/libevmasm/PeepholeOptimiser.cpp
+++ b/libevmasm/PeepholeOptimiser.cpp
@@ -146,6 +146,35 @@ struct OpStop: SimplePeepholeOptimizerMethod<OpStop>
 	}
 };
 
+struct OpReturnRevert: SimplePeepholeOptimizerMethod<OpReturnRevert>
+{
+	static bool applySimple(
+		AssemblyItem const& _op,
+		AssemblyItem const& _push,
+		AssemblyItem const& _pushOrDup,
+		AssemblyItem const& _returnRevert,
+		std::back_insert_iterator<AssemblyItems> _out
+	)
+	{
+		if (
+			(_returnRevert == Instruction::RETURN || _returnRevert == Instruction::REVERT) &&
+			_push.type() == Push &&
+			(_pushOrDup.type() == Push || _pushOrDup == dupInstruction(1))
+		)
+			if (
+				(_op.type() == Operation && !instructionInfo(_op.instruction()).sideEffects) ||
+				_op.type() == Push
+			)
+			{
+					*_out = _push;
+					*_out = _pushOrDup;
+					*_out = _returnRevert;
+					return true;
+			}
+		return false;
+	}
+};
+
 struct DoubleSwap: SimplePeepholeOptimizerMethod<DoubleSwap>
 {
 	static size_t applySimple(AssemblyItem const& _s1, AssemblyItem const& _s2, std::back_insert_iterator<AssemblyItems>)
@@ -459,7 +488,7 @@ bool PeepholeOptimiser::optimise()
 	while (state.i < m_items.size())
 		applyMethods(
 			state,
-			PushPop(), OpPop(), OpStop(), DoublePush(), DoubleSwap(), CommutativeSwap(), SwapComparison(),
+			PushPop(), OpPop(), OpStop(), OpReturnRevert(), DoublePush(), DoubleSwap(), CommutativeSwap(), SwapComparison(),
 			DupSwap(), IsZeroIsZeroJumpI(), EqIsZeroJumpI(), DoubleJump(), JumpToNext(), UnreachableCode(),
 			TagConjunctions(), TruthyAnd(), Identity()
 		);

From 4b9c01752d506a02b2f4080f260c14a8d0a98158 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 15 Mar 2022 17:25:35 +0100
Subject: [PATCH 0500/1748] Test updates.

---
 test/cmdlineTests/function_debug_info_via_yul/output          | 2 +-
 test/cmdlineTests/viair_subobject_optimization/output         | 1 -
 .../abi_encode_v2_in_function_inherited_in_v1_contract.sol    | 2 +-
 .../semanticTests/array/constant_var_as_array_length.sol      | 2 +-
 .../semanticTests/array/fixed_arrays_as_return_type.sol       | 2 +-
 .../semanticTests/array/function_array_cross_calls.sol        | 2 +-
 test/libsolidity/semanticTests/array/reusing_memory.sol       | 2 +-
 .../constructor/bytes_in_constructors_packer.sol              | 2 +-
 .../constructor/bytes_in_constructors_unpacker.sol            | 2 +-
 .../constructor_with_params_diamond_inheritance.sol           | 2 +-
 .../semanticTests/events/event_emit_from_other_contract.sol   | 2 +-
 .../semanticTests/externalContracts/deposit_contract.sol      | 2 +-
 .../semanticTests/externalContracts/prbmath_unsigned.sol      | 2 +-
 .../semanticTests/externalContracts/ramanujan_pi.sol          | 2 +-
 .../functionCall/creation_function_call_with_args.sol         | 2 +-
 .../functionCall/creation_function_call_with_salt.sol         | 2 +-
 .../functionCall/external_call_to_nonexisting.sol             | 2 +-
 test/libsolidity/semanticTests/functionCall/failed_create.sol | 2 +-
 .../semanticTests/functionCall/gas_and_value_basic.sol        | 2 +-
 .../semanticTests/functionCall/gas_and_value_brace_syntax.sol | 2 +-
 .../semanticTests/functionCall/send_zero_ether.sol            | 2 +-
 test/libsolidity/semanticTests/immutable/multi_creation.sol   | 2 +-
 test/libsolidity/semanticTests/immutable/use_scratch.sol      | 2 +-
 .../inherited_function_calldata_memory_interface.sol          | 2 +-
 .../semanticTests/inheritance/value_for_constructor.sol       | 2 +-
 .../semanticTests/isoltestTesting/balance_other_contract.sol  | 2 +-
 .../semanticTests/salted_create/salted_create_with_value.sol  | 2 +-
 test/libsolidity/semanticTests/smoke/constructor.sol          | 2 +-
 test/libsolidity/semanticTests/state/blockhash_basic.sol      | 2 +-
 test/libsolidity/semanticTests/various/address_code.sol       | 2 +-
 .../semanticTests/various/contract_binary_dependencies.sol    | 2 +-
 test/libsolidity/semanticTests/various/senders_balance.sol    | 2 +-
 .../semanticTests/various/staticcall_for_view_and_pure.sol    | 4 ++--
 test/libsolidity/semanticTests/various/value_complex.sol      | 2 +-
 test/libsolidity/semanticTests/various/value_insane.sol       | 2 +-
 35 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/test/cmdlineTests/function_debug_info_via_yul/output b/test/cmdlineTests/function_debug_info_via_yul/output
index 4e9c732b49..97125e4b95 100644
--- a/test/cmdlineTests/function_debug_info_via_yul/output
+++ b/test/cmdlineTests/function_debug_info_via_yul/output
@@ -13,7 +13,7 @@
         },
         "calldata_array_index_access_uint256_dyn_calldata":
         {
-          "entryPoint": 145,
+          "entryPoint": 144,
           "parameterSlots": 2,
           "returnSlots": 1
         }
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
index 1686e3ef7b..5d4e894801 100644
--- a/test/cmdlineTests/viair_subobject_optimization/output
+++ b/test/cmdlineTests/viair_subobject_optimization/output
@@ -125,7 +125,6 @@ sub_0: assembly {
       eq
       tag_4
       jumpi
-      pop
       0x00
       dup1
       revert
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index 1a72e0888c..b7d917dbf9 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -32,6 +32,6 @@ contract C is B {
 // compileViaYul: also
 // ----
 // test() -> 77
-// gas irOptimized: 119911
+// gas irOptimized: 119711
 // gas legacy: 155093
 // gas legacyOptimized: 111550
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
index 2aa3d43f84..42d14ba242 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -11,7 +11,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 1, 2, 3 ->
-// gas irOptimized: 142856
+// gas irOptimized: 142640
 // gas legacy: 183490
 // gas legacyOptimized: 151938
 // a(uint256): 0 -> 1
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index a19475f7b2..3ce5f1a8da 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -21,6 +21,6 @@ contract B {
 // compileViaYul: also
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 128110
+// gas irOptimized: 127910
 // gas legacy: 234719
 // gas legacyOptimized: 132639
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 66e385812f..087ecf0a83 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -45,6 +45,6 @@ contract C {
 // compileViaYul: also
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 292702
+// gas irOptimized: 292502
 // gas legacy: 452136
 // gas legacyOptimized: 284945
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index d2d09645de..455d6f9484 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -26,6 +26,6 @@ contract Main {
 // compileViaYul: also
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 113398
+// gas irOptimized: 113198
 // gas legacy: 126596
 // gas legacyOptimized: 113823
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 2e0835c253..bdd5c6eb50 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -26,6 +26,6 @@ contract Creator {
 // compileViaYul: also
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 295403
+// gas irOptimized: 293203
 // gas legacy: 428711
 // gas legacyOptimized: 297922
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 31212c5e82..d0b3f64cbc 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -10,7 +10,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 286205
+// gas irOptimized: 283829
 // gas legacy: 309607
 // gas legacyOptimized: 260566
 // m_x() -> 7
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index b8f4d42bb4..3e9ae1ab2a 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -23,7 +23,7 @@ contract D is B, C {
 // compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 158225
+// gas irOptimized: 156071
 // gas legacy: 170665
 // gas legacyOptimized: 145396
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 36e5ee73c9..0f685b783a 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 173316
+// gas irOptimized: 173094
 // gas legacy: 250376
 // gas legacyOptimized: 174522
 // deposit(bytes32), 18 wei: 0x1234 ->
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index bcbf816ae5..9e3211ecb4 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -178,7 +178,7 @@ contract DepositContract is IDepositContract, ERC165 {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1532125
+// gas irOptimized: 1529797
 // gas legacy: 2435803
 // gas legacyOptimized: 1775425
 // supportsInterface(bytes4): 0x0 -> 0
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index c3fb5183b1..c37fe52b56 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -50,7 +50,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 1783505
+// gas irOptimized: 1780841
 // gas legacy: 2248594
 // gas legacyOptimized: 1749096
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index 2152a38a01..b1c4c0169a 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -35,7 +35,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 456094
+// gas irOptimized: 455866
 // gas legacy: 671453
 // gas legacyOptimized: 480242
 // prb_pi() -> 3141592656369545286
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index 99167ee8e8..0f1b635239 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -17,7 +17,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 200649
+// gas irOptimized: 200217
 // gas legacy: 245842
 // gas legacyOptimized: 195676
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index 7a44bf1b99..462e9ad76c 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -18,7 +18,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 200812
+// gas irOptimized: 200380
 // gas legacy: 246202
 // gas legacyOptimized: 195914
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index 7a29cc2544..79c3adccb1 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -25,7 +25,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 304151
+// gas irOptimized: 303935
 // gas legacy: 464030
 // gas legacyOptimized: 304049
 // f(uint256): 0 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 0a8b5a9228..19fd10bf65 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -18,7 +18,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 214971
+// gas irOptimized: 212583
 // gas legacy: 294335
 // gas legacyOptimized: 174279
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index ca2cf152e8..40de1b5092 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -41,7 +41,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 275142
+// gas irOptimized: 270609
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index a08d75557e..6b3f99deec 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -40,7 +40,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 275142
+// gas irOptimized: 270609
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
index 188052e758..a3d93043de 100644
--- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
+++ b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
@@ -19,7 +19,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 100480
+// gas irOptimized: 100264
 // gas legacy: 116691
 // gas legacyOptimized: 100361
 // s() -> true
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index c50acf2be0..a66c86027c 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -29,7 +29,7 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 126536
+// gas irOptimized: 126136
 // gas legacy: 151334
 // gas legacyOptimized: 125166
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index 4f3e8a3bd1..9dec409357 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(): 3 ->
-// gas irOptimized: 129602
+// gas irOptimized: 127454
 // gas legacy: 209361
 // gas legacyOptimized: 139324
 // f() -> 84, 23
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index 165ae909df..2ce71c31fe 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -25,6 +25,6 @@ contract B {
 // compileViaYul: also
 // ----
 // g() -> 42
-// gas irOptimized: 102144
+// gas irOptimized: 101944
 // gas legacy: 185053
 // gas legacyOptimized: 114598
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index 95dd7c3d90..b38e9a6ad4 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -42,7 +42,7 @@ contract Main {
 // compileViaYul: also
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 280056
+// gas irOptimized: 277680
 // gas legacy: 402045
 // gas legacyOptimized: 266772
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 3b1a485c19..b02e48804f 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -18,7 +18,7 @@ contract ClientReceipt {
 // compileViaYul: also
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 183976
+// gas irOptimized: 183544
 // gas legacy: 235195
 // gas legacyOptimized: 176766
 // balance -> 1500
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index aab46a9a4b..6613e471bd 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -22,6 +22,6 @@ contract A {
 // compileViaYul: also
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 272431
+// gas irOptimized: 271831
 // gas legacy: 422501
 // gas legacyOptimized: 287472
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index 4e5a07e958..3003c5d8d9 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -14,7 +14,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor(), 2 wei: 3 ->
-// gas irOptimized: 109775
+// gas irOptimized: 107627
 // gas legacy: 151416
 // gas legacyOptimized: 108388
 // state() -> 3
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
index 558e1ca909..829a8695d3 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -14,7 +14,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor()
-// gas irOptimized: 113738
+// gas irOptimized: 111584
 // gas legacy: 155081
 // gas legacyOptimized: 107997
 // genesisHash() -> 0x3737373737373737373737373737373737373737373737373737373737373737
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 6f1fbe7a9c..2adf317160 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 194717
+// gas irOptimized: 192317
 // gas legacy: 240889
 // gas legacyOptimized: 155314
 // initCode() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
index 3d5a480e4f..9ff4fe5e22 100644
--- a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
+++ b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
@@ -21,4 +21,4 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 101495
+// gas irOptimized: 101063
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 344daf8d82..0e0e59996b 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -19,7 +19,7 @@ contract D {
 // compileViaYul: also
 // ----
 // constructor(), 27 wei ->
-// gas irOptimized: 175589
+// gas irOptimized: 175157
 // gas legacy: 222977
 // gas legacyOptimized: 169779
 // f() -> 27
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index d2c520545d..90dd3a6f72 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -38,10 +38,10 @@ contract D {
 // f() -> 0x1 # This should work, next should throw #
 // gas legacy: 103716
 // fview() -> FAILURE
-// gas irOptimized: 98438622
+// gas irOptimized: 98438619
 // gas legacy: 98438801
 // gas legacyOptimized: 98438594
 // fpure() -> FAILURE
-// gas irOptimized: 98438622
+// gas irOptimized: 98438619
 // gas legacy: 98438801
 // gas legacyOptimized: 98438595
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 879e9d23c8..c868652a0f 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -22,7 +22,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 190491
+// gas irOptimized: 190275
 // gas legacy: 265006
 // gas legacyOptimized: 182842
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 0499c1b068..c304732bb9 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -21,7 +21,7 @@ contract test {
 // compileViaYul: also
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 192213
+// gas irOptimized: 191991
 // gas legacy: 266728
 // gas legacyOptimized: 184762
 // sendAmount(uint256): 5 -> 8

From a054285f31fbf332de2230e727a844b86090dc21 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 16 Mar 2022 16:43:21 +0100
Subject: [PATCH 0501/1748] Simplify rematerialization candidates.

---
 libyul/optimiser/StackCompressor.cpp | 24 +++++++-----------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index eb06292588..b3402e4d7b 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -61,16 +61,15 @@ class RematCandidateSelector: public DataFlowAnalyzer
 	/// @returns a map from function name to rematerialisation costs to a vector of variables to rematerialise
 	/// and variables that occur in their expression.
 	/// While the map is sorted by cost, the contained vectors are sorted by the order of occurrence.
-	map<YulString, map<size_t, vector<tuple<YulString, set<YulString>>>>> candidates()
+	map<YulString, map<size_t, vector<YulString>>> candidates()
 	{
-		map<YulString, map<size_t, vector<tuple<YulString, set<YulString>>>>> cand;
+		map<YulString, map<size_t, vector<YulString>>> cand;
 		for (auto const& [functionName, candidate]: m_candidates)
 		{
 			if (size_t const* cost = util::valueOrNullptr(m_expressionCodeCost, candidate))
 			{
 				size_t numRef = m_numReferences[candidate];
-				set<YulString> const* ref = references(candidate);
-				cand[functionName][*cost * numRef].emplace_back(candidate, ref ? move(*ref) : set<YulString>{});
+				cand[functionName][*cost * numRef].emplace_back(candidate);
 			}
 		}
 		return cand;
@@ -144,25 +143,16 @@ class RematCandidateSelector: public DataFlowAnalyzer
 
 /// Selects at most @a _numVariables among @a _candidates.
 set<YulString> chooseVarsToEliminate(
-	map<size_t, vector<tuple<YulString, set<YulString>>>> const& _candidates,
+	map<size_t, vector<YulString>> const& _candidates,
 	size_t _numVariables
 )
 {
 	set<YulString> varsToEliminate;
 	for (auto&& [cost, candidates]: _candidates)
-		for (auto&& [candidate, references]: candidates)
+		for (auto&& candidate: candidates)
 		{
 			if (varsToEliminate.size() >= _numVariables)
 				return varsToEliminate;
-			// If a variable we would like to eliminate references another one
-			// we already selected for elimination, then stop selecting
-			// candidates. If we would add that variable, then the cost calculation
-			// for the previous variable would be off. Furthermore, we
-			// do not skip the variable because it would be better to properly re-compute
-			// the costs of all other variables instead.
-			for (YulString const& referencedVar: references)
-				if (varsToEliminate.count(referencedVar))
-					return varsToEliminate;
 			varsToEliminate.insert(candidate);
 		}
 	return varsToEliminate;
@@ -177,7 +167,7 @@ void eliminateVariables(
 {
 	RematCandidateSelector selector{_dialect};
 	selector(_ast);
-	map<YulString, map<size_t, vector<tuple<YulString, set<YulString>>>>> candidates = selector.candidates();
+	map<YulString, map<size_t, vector<YulString>>> candidates = selector.candidates();
 
 	set<YulString> varsToEliminate;
 	for (auto const& [functionName, numVariables]: _numVariables)
@@ -209,7 +199,7 @@ void eliminateVariablesOptimizedCodegen(
 	for (auto const& [functionName, candidatesInFunction]: selector.candidates())
 		for (auto [cost, candidatesWithCost]: candidatesInFunction)
 			for (auto candidate: candidatesWithCost)
-				candidates[get<0>(candidate)] = cost;
+				candidates[candidate] = cost;
 
 	set<YulString> varsToEliminate;
 

From 040c444a2a406b687fe23e3dd7928177f87255a4 Mon Sep 17 00:00:00 2001
From: Hector Roussille <hector.roussille@gmail.com>
Date: Wed, 16 Mar 2022 18:38:55 +0100
Subject: [PATCH 0502/1748] Fixed ambiguity in the create2 address computation
 doc

specify that arguments are encoded using abi.encode in the example code
---
 docs/control-structures.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 0ce7d21e33..de3b58485c 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -283,7 +283,7 @@ which only need to be created if there is a dispute.
                 salt,
                 keccak256(abi.encodePacked(
                     type(D).creationCode,
-                    arg
+                    abi.encode(arg)
                 ))
             )))));
 

From 0bf674b4423bce87f0d54c5264e318342e6b3552 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 1 Mar 2022 18:56:17 +0100
Subject: [PATCH 0503/1748] LSP test: Minor refactoring and better exception
 reporting

---
 test/libsolidity/lsp/didOpen_with_import.sol  |   1 +
 test/libsolidity/lsp/lib.sol                  |   3 +
 .../libsolidity/lsp/publish_diagnostics_1.sol |   3 +
 .../libsolidity/lsp/publish_diagnostics_2.sol |   3 +
 .../libsolidity/lsp/publish_diagnostics_3.sol |   2 +
 test/lsp.py                                   | 183 +++++++++++++-----
 6 files changed, 143 insertions(+), 52 deletions(-)

diff --git a/test/libsolidity/lsp/didOpen_with_import.sol b/test/libsolidity/lsp/didOpen_with_import.sol
index f505ca6e5e..a335df759c 100644
--- a/test/libsolidity/lsp/didOpen_with_import.sol
+++ b/test/libsolidity/lsp/didOpen_with_import.sol
@@ -8,5 +8,6 @@ contract C
     function f(uint a, uint b) public pure returns (uint)
     {
         return Lib.add(2 * a, b);
+        //     ^^^^^^^ @diagnostics
     }
 }
diff --git a/test/libsolidity/lsp/lib.sol b/test/libsolidity/lsp/lib.sol
index 22efe6ca2a..031cf19adc 100644
--- a/test/libsolidity/lsp/lib.sol
+++ b/test/libsolidity/lsp/lib.sol
@@ -23,13 +23,16 @@ enum Color {
 library Lib
 {
     function add(uint a, uint b) public pure returns (uint result)
+// ^( @addFunction
     {
         result = a + b;
     }
 
+// ^) @addFunction
     function warningWithUnused() public pure
     {
         uint unused;
+    //  ^^^^^^^^^^^ @diagnostics
     }
 }
 
diff --git a/test/libsolidity/lsp/publish_diagnostics_1.sol b/test/libsolidity/lsp/publish_diagnostics_1.sol
index e667185122..be15a40908 100644
--- a/test/libsolidity/lsp/publish_diagnostics_1.sol
+++ b/test/libsolidity/lsp/publish_diagnostics_1.sol
@@ -6,13 +6,16 @@ contract MyContract
     constructor()
     {
         uint unused; // [Warning 2072] Unused local variable.
+   //   ^^^^^^^^^^^ @unusedVariable
     }
 }
 
 contract D
 {
     function main() public payable returns (uint)
+                                       //   ^^^^ @unusedReturnVariable
     {
         MyContract c = new MyContract();
+   //   ^^^^^^^^^^^^ @unusedContractVariable
     }
 }
diff --git a/test/libsolidity/lsp/publish_diagnostics_2.sol b/test/libsolidity/lsp/publish_diagnostics_2.sol
index 9686189552..65b4df5854 100644
--- a/test/libsolidity/lsp/publish_diagnostics_2.sol
+++ b/test/libsolidity/lsp/publish_diagnostics_2.sol
@@ -6,7 +6,9 @@ contract C
     function makeSomeError() public pure returns (uint res)
     {
         uint x = "hi";
+    //  ^^^^^^^^^^^^^ @conversionError
         return;
+     // ^^^^^^^ @argumentsRequired
         res = 2;
     }
 }
@@ -17,5 +19,6 @@ contract D
     {
         C c = new C();
         return c.makeSomeError(2, 3);
+          //   ^^^^^^^^^^^^^^^^^^^^^ @wrongArgumentsCount
     }
 }
diff --git a/test/libsolidity/lsp/publish_diagnostics_3.sol b/test/libsolidity/lsp/publish_diagnostics_3.sol
index bb8998a6ad..45b418a903 100644
--- a/test/libsolidity/lsp/publish_diagnostics_3.sol
+++ b/test/libsolidity/lsp/publish_diagnostics_3.sol
@@ -6,5 +6,7 @@ abstract contract A {
 }
 
 contract B is A
+// ^( @notAbstract
 {
 }
+// ^) @notAbstract
diff --git a/test/lsp.py b/test/lsp.py
index a20c28c3cd..e094292ba9 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -7,8 +7,10 @@
 import subprocess
 import sys
 import traceback
+import re
 
 from typing import Any, List, Optional, Tuple, Union
+from enum import Enum, auto
 
 import colorama # Enables the use of SGR & CUP terminal VT sequences on Windows.
 from deepdiff import DeepDiff
@@ -18,6 +20,7 @@ class BadHeader(Exception):
     def __init__(self, msg: str):
         super().__init__("Bad header: " + msg)
 
+
 class JsonRpcProcess:
     exe_path: str
     exe_args: List[str]
@@ -116,13 +119,14 @@ def send_notification(self, name: str, params: Optional[dict] = None) -> None:
 
 class ExpectationFailed(Exception):
     def __init__(self, actual, expected):
-        self.actual = actual
-        self.expected = expected
-        diff = DeepDiff(actual, expected)
+        self.actual = json.dumps(actual, sort_keys=True)
+        self.expected = json.dumps(expected, sort_keys=True)
+        diff = json.dumps(DeepDiff(actual, expected), indent=4)
         super().__init__(
-            f"Expectation failed.\n\tExpected {expected}\n\tbut got {actual}.\n\t{diff}"
+            f"\n\tExpected {self.expected}\n\tbut got {self.actual}.\n\t{diff}"
         )
 
+
 def create_cli_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(description="Solidity LSP Test suite")
     parser.set_defaults(trace_io=False)
@@ -168,12 +172,25 @@ class Counter:
     passed: int = 0
     failed: int = 0
 
+
+class Marker(Enum):
+    SimpleRange = auto()
+    MultilineRange = auto()
+
+
+# Returns the given marker with the end extended by 'amount'
+def extendEnd(marker, amount=1):
+    marker["end"]["character"] += amount
+    return marker
+
+
 class SolidityLSPTestSuite: # {{{
     test_counter = Counter()
     assertion_counter = Counter()
     print_assertions: bool = False
     trace_io: bool = False
     test_pattern: str
+    marker_regexes: {}
 
     def __init__(self):
         colorama.init()
@@ -184,6 +201,10 @@ def __init__(self):
         self.print_assertions = args.print_assertions
         self.trace_io = args.trace_io
         self.test_pattern = args.test_pattern
+        self.marker_regexes = {
+            Marker.SimpleRange: re.compile(R"(?P<range>[\^]+) (?P<tag>@\w+)"),
+            Marker.MultilineRange: re.compile(R"\^(?P<delimiter>[()]) (?P<tag>@\w+)$")
+        }
 
         print(f"{SGR_NOTICE}test pattern: {self.test_pattern}{SGR_RESET}")
 
@@ -206,9 +227,8 @@ def main(self) -> int:
                 with JsonRpcProcess(self.solc_path, ["--lsp"], trace_io=self.trace_io) as solc:
                     test_fn(solc)
                     self.test_counter.passed += 1
-            except ExpectationFailed as e:
+            except ExpectationFailed:
                 self.test_counter.failed += 1
-                print(e)
                 print(traceback.format_exc())
             except Exception as e: # pragma pylint: disable=broad-except
                 self.test_counter.failed += 1
@@ -347,20 +367,26 @@ def expect_diagnostic(
         self,
         diagnostic,
         code: int,
-        lineNo: int,
-        startEndColumns: Tuple[int, int]
+        lineNo: int = None,
+        startEndColumns: Tuple[int, int] = None,
+        marker: {} = None
     ):
-        assert len(startEndColumns) == 2
-        [startColumn, endColumn] = startEndColumns
         self.expect_equal(diagnostic['code'], code, f'diagnostic: {code}')
-        self.expect_equal(
-            diagnostic['range'],
-            {
-                'start': {'character': startColumn, 'line': lineNo},
-                'end': {'character': endColumn, 'line': lineNo}
-            },
-            "diagnostic: check range"
-        )
+
+        if marker:
+            self.expect_equal(diagnostic['range'], marker, "diagnostic: check range")
+        else:
+            assert len(startEndColumns) == 2
+            [startColumn, endColumn] = startEndColumns
+            self.expect_equal(
+                diagnostic['range'],
+                {
+                    'start': {'character': startColumn, 'line': lineNo},
+                    'end': {'character': endColumn, 'line': lineNo}
+                },
+                "diagnostic: check range"
+            )
+
 
     def expect_location(
         self,
@@ -421,10 +447,12 @@ def test_publish_diagnostics_warnings(self, solc: JsonRpcProcess) -> None:
         self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
         diagnostics = report['diagnostics']
 
+        markers = self.get_file_tags(TEST_NAME)
+
         self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
-        self.expect_diagnostic(diagnostics[0], code=6321, lineNo=13, startEndColumns=(44, 48))
-        self.expect_diagnostic(diagnostics[1], code=2072, lineNo= 7, startEndColumns=( 8, 19))
-        self.expect_diagnostic(diagnostics[2], code=2072, lineNo=15, startEndColumns=( 8, 20))
+        self.expect_diagnostic(diagnostics[0], code=6321, marker=markers["@unusedReturnVariable"])
+        self.expect_diagnostic(diagnostics[1], code=2072, marker=markers["@unusedVariable"])
+        self.expect_diagnostic(diagnostics[2], code=2072, marker=markers["@unusedContractVariable"])
 
     def test_publish_diagnostics_errors(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
@@ -437,10 +465,12 @@ def test_publish_diagnostics_errors(self, solc: JsonRpcProcess) -> None:
         self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
         diagnostics = report['diagnostics']
 
+        markers = self.get_file_tags(TEST_NAME)
+
         self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
-        self.expect_diagnostic(diagnostics[0], code=9574, lineNo= 7, startEndColumns=( 8, 21))
-        self.expect_diagnostic(diagnostics[1], code=6777, lineNo= 8, startEndColumns=( 8, 15))
-        self.expect_diagnostic(diagnostics[2], code=6160, lineNo=18, startEndColumns=(15, 36))
+        self.expect_diagnostic(diagnostics[0], code=9574, marker=markers["@conversionError"])
+        self.expect_diagnostic(diagnostics[1], code=6777, marker=markers["@argumentsRequired"])
+        self.expect_diagnostic(diagnostics[2], code=6160, marker=markers["@wrongArgumentsCount"])
 
     def test_publish_diagnostics_errors_multiline(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
@@ -453,13 +483,13 @@ def test_publish_diagnostics_errors_multiline(self, solc: JsonRpcProcess) -> Non
         self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
         diagnostics = report['diagnostics']
 
-        self.expect_equal(len(diagnostics), 1, "3 diagnostic messages")
+        self.expect_equal(len(diagnostics), 1, "1 diagnostic messages")
         self.expect_equal(diagnostics[0]['code'], 3656, "diagnostic: check code")
         self.expect_equal(
             diagnostics[0]['range'],
             {
-                'end': {'character': 1, 'line': 9},
-                'start': {'character': 0, 'line': 7}
+                'start': {'character': 0, 'line': 7},
+                'end': {'character': 1, 'line': 10}
             },
             "diagnostic: check range"
         )
@@ -480,11 +510,58 @@ def test_textDocument_didOpen_with_relative_import(self, solc: JsonRpcProcess) -
         report = published_diagnostics[1]
         self.expect_equal(report['uri'], self.get_test_file_uri('lib'), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
-        self.expect_diagnostic(report['diagnostics'][0], code=2072, lineNo=31, startEndColumns=(8, 19))
+        marker = self.get_file_tags("lib")["@diagnostics"]
+        self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
+
+
+    def get_file_tags(self, test_name: str, verbose=False):
+        """
+        Finds all tags (e.g. @tagname) in the given test and returns them as a
+        dictionary having the following structure: {
+            "@tagname": {
+             "start": { "character": 3, "line": 2 },
+             "end":   { "character": 30, "line": 2 }
+            }
+        }
+        """
+        content = self.get_test_file_contents(test_name)
+
+        markers = {}
+
+        for lineNum, line in enumerate(content.splitlines(), start=-1):
+            commentStart = line.find("//")
+            if commentStart == -1:
+                continue
+
+            for kind, regex in self.marker_regexes.items():
+                for match in regex.finditer(line[commentStart:]):
+                    if kind == Marker.SimpleRange:
+                        markers[match.group("tag")] = {
+                            "start": {
+                                "line": lineNum,
+                                "character": match.start("range") + commentStart
+                            },
+                            "end": {
+                                "line": lineNum,
+                                "character": match.end("range") + commentStart
+                        }}
+                    elif kind == Marker.MultilineRange:
+                        if match.group("delimiter") == "(":
+                            markers[match.group("tag")] = \
+                                { "start": { "line": lineNum, "character": 0 } }
+                        elif match.group("delimiter") == ")":
+                            markers[match.group("tag")]["end"] = \
+                                { "line": lineNum, "character": 0 }
+
+        if verbose:
+            print(markers)
+        return markers
+
 
     def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
         # Reusing another test but now change some file that generates an error in the other.
         self.test_textDocument_didOpen_with_relative_import(solc)
+        marker = self.get_file_tags("lib")["@addFunction"]
         self.open_file_and_wait_for_diagnostics(solc, 'lib', 2)
         solc.send_message(
             'textDocument/didChange',
@@ -496,10 +573,7 @@ def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
                 'contentChanges':
                 [
                     {
-                        'range': {
-                            'start': { 'line': 24, 'character': 0 },
-                            'end':   { 'line': 29, 'character': 0 }
-                        },
+                        'range': marker,
                         'text': "" # deleting function `add`
                     }
                 ]
@@ -512,8 +586,9 @@ def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
         report = published_diagnostics[0]
         self.expect_equal(report['uri'], self.get_test_file_uri('didOpen_with_import'))
         diagnostics = report['diagnostics']
+        marker = self.get_file_tags("didOpen_with_import")["@diagnostics"]
         self.expect_equal(len(diagnostics), 1, "now, no diagnostics")
-        self.expect_diagnostic(diagnostics[0], code=9582, lineNo=9, startEndColumns=(15, 22))
+        self.expect_diagnostic(diagnostics[0], code=9582, marker=marker)
 
         # The modified file retains the same diagnostics.
         report = published_diagnostics[1]
@@ -543,7 +618,10 @@ def verify_didOpen_with_import_diagnostics(
         report = published_diagnostics[1]
         self.expect_equal(report['uri'], self.get_test_file_uri('lib'), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
-        self.expect_diagnostic(report['diagnostics'][0], code=2072, lineNo=31, startEndColumns=(8, 19))
+
+        marker = self.get_file_tags('lib')["@diagnostics"]
+        self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
+
 
     def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
@@ -554,9 +632,10 @@ def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess)
         self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
         diagnostics = report['diagnostics']
         self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
-        self.expect_diagnostic(diagnostics[0], code=6321, lineNo=13, startEndColumns=(44, 48))
-        self.expect_diagnostic(diagnostics[1], code=2072, lineNo= 7, startEndColumns=( 8, 19))
-        self.expect_diagnostic(diagnostics[2], code=2072, lineNo=15, startEndColumns=( 8, 20))
+        markers = self.get_file_tags(TEST_NAME)
+        self.expect_diagnostic(diagnostics[0], code=6321, marker=markers["@unusedReturnVariable"])
+        self.expect_diagnostic(diagnostics[1], code=2072, marker=markers["@unusedVariable"])
+        self.expect_diagnostic(diagnostics[2], code=2072, marker=markers["@unusedContractVariable"])
 
         solc.send_message(
             'textDocument/didChange',
@@ -566,10 +645,7 @@ def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess)
                 },
                 'contentChanges': [
                     {
-                        'range': {
-                            'start': { 'line': 7, 'character': 1 },
-                            'end': {   'line': 8, 'character': 1 }
-                        },
+                        'range': extendEnd(markers["@unusedVariable"]),
                         'text': ""
                     }
                 ]
@@ -581,13 +657,16 @@ def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess)
         self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
         diagnostics = report['diagnostics']
         self.expect_equal(len(diagnostics), 2)
-        self.expect_diagnostic(diagnostics[0], code=6321, lineNo=12, startEndColumns=(44, 48))
-        self.expect_diagnostic(diagnostics[1], code=2072, lineNo=14, startEndColumns=( 8, 20))
+        self.expect_diagnostic(diagnostics[0], code=6321, marker=markers["@unusedReturnVariable"])
+        self.expect_diagnostic(diagnostics[1], code=2072, marker=markers["@unusedContractVariable"])
 
     def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess) -> None:
         # Reuse this test to prepare and ensure it is as expected
         self.test_textDocument_didOpen_with_relative_import(solc)
         self.open_file_and_wait_for_diagnostics(solc, 'lib', 2)
+
+        marker = self.get_file_tags('lib')["@diagnostics"]
+
         # lib.sol: Fix the unused variable message by removing it.
         solc.send_message(
             'textDocument/didChange',
@@ -599,11 +678,7 @@ def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess
                 'contentChanges': # delete the in-body statement: `uint unused;`
                 [
                     {
-                        'range':
-                        {
-                            'start': { 'line': 31, 'character': 1 },
-                            'end':   { 'line': 32, 'character': 1 }
-                        },
+                        'range': extendEnd(marker),
                         'text': ""
                     }
                 ]
@@ -719,7 +794,11 @@ def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc
         reports = self.wait_for_diagnostics(solc, 2)
         self.expect_equal(len(reports), 2, '')
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
-        self.expect_diagnostic(reports[1]['diagnostics'][0], 2072, 31, (8, 19)) # unused variable in lib.sol
+
+        marker = self.get_file_tags("lib")["@diagnostics"]
+
+        # unused variable in lib.sol
+        self.expect_diagnostic(reports[1]['diagnostics'][0], code=2072, marker=marker)
 
         # Now close the file and expect the warning for lib.sol to be removed
         solc.send_message(
@@ -807,7 +886,7 @@ def test_textDocument_definition(self, solc: JsonRpcProcess) -> None:
         self.expect_equal(len(published_diagnostics), 2, "publish diagnostics for 2 files")
         self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0)
         self.expect_equal(len(published_diagnostics[1]['diagnostics']), 1)
-        self.expect_diagnostic(published_diagnostics[1]['diagnostics'][0], 2072, 31, (8, 19)) # unused variable in lib.sol
+        self.expect_diagnostic(published_diagnostics[1]['diagnostics'][0], 2072, 33, (8, 19)) # unused variable in lib.sol
 
         # import directive
         self.expect_goto_definition_location(
@@ -940,7 +1019,7 @@ def test_textDocument_definition(self, solc: JsonRpcProcess) -> None:
             document_uri=FILE_URI,
             document_position=(64, 33), # symbol `RGBColor` right hand side expression.
             expected_uri=LIB_URI,
-            expected_lineNo=35,
+            expected_lineNo=38,
             expected_startEndColumns=(7, 15),
             description="Struct constructor."
         )
@@ -962,7 +1041,7 @@ def test_textDocument_definition_imports(self, solc: JsonRpcProcess) -> None:
         self.expect_equal(len(published_diagnostics), 2, "publish diagnostics for 2 files")
         self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0)
         self.expect_equal(len(published_diagnostics[1]['diagnostics']), 1)
-        self.expect_diagnostic(published_diagnostics[1]['diagnostics'][0], 2072, 31, (8, 19)) # unused variable in lib.sol
+        self.expect_diagnostic(published_diagnostics[1]['diagnostics'][0], 2072, 33, (8, 19)) # unused variable in lib.sol
 
         # import directive: test symbol alias
         self.expect_goto_definition_location(

From 07c9384b44a62cec3ddbaf6885c6035eac9182ab Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Tue, 22 Mar 2022 23:06:23 -0700
Subject: [PATCH 0504/1748] Update value-types.rst

---
 docs/types/value-types.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 8f10094078..cc3f17dd3b 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -463,7 +463,7 @@ There is no additional semantic meaning added to a number literal containing und
 the underscores are ignored.
 
 Number literal expressions retain arbitrary precision until they are converted to a non-literal type (i.e. by
-using them together with anything else than a number literal expression (like boolean literals) or by explicit conversion).
+using them together with anything other than a number literal expression (like boolean literals) or by explicit conversion).
 This means that computations do not overflow and divisions do not truncate
 in number literal expressions.
 

From 13a4c79a9b02fca61940b90406edd6de0e99d3ae Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 23 Mar 2022 17:32:33 +0100
Subject: [PATCH 0505/1748] lsp.py: Adds --fail-fast (-f) to terminate early on
 first failure.

---
 test/lsp.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/test/lsp.py b/test/lsp.py
index e094292ba9..8b7398cf29 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -129,6 +129,13 @@ def __init__(self, actual, expected):
 
 def create_cli_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(description="Solidity LSP Test suite")
+    parser.set_defaults(fail_fast=False)
+    parser.add_argument(
+        "-f, --fail-fast",
+        dest="fail_fast",
+        action="store_true",
+        help="Terminates the running tests on first failure."
+    )
     parser.set_defaults(trace_io=False)
     parser.add_argument(
         "-T, --trace-io",
@@ -189,6 +196,7 @@ class SolidityLSPTestSuite: # {{{
     assertion_counter = Counter()
     print_assertions: bool = False
     trace_io: bool = False
+    fail_fast: bool = False
     test_pattern: str
     marker_regexes: {}
 
@@ -201,6 +209,7 @@ def __init__(self):
         self.print_assertions = args.print_assertions
         self.trace_io = args.trace_io
         self.test_pattern = args.test_pattern
+        self.fail_fast = args.fail_fast
         self.marker_regexes = {
             Marker.SimpleRange: re.compile(R"(?P<range>[\^]+) (?P<tag>@\w+)"),
             Marker.MultilineRange: re.compile(R"\^(?P<delimiter>[()]) (?P<tag>@\w+)$")
@@ -230,10 +239,14 @@ def main(self) -> int:
             except ExpectationFailed:
                 self.test_counter.failed += 1
                 print(traceback.format_exc())
+                if self.fail_fast:
+                    break
             except Exception as e: # pragma pylint: disable=broad-except
                 self.test_counter.failed += 1
                 print(f"Unhandled exception {e.__class__.__name__} caught: {e}")
                 print(traceback.format_exc())
+                if self.fail_fast:
+                    break
 
         print(
             f"\n{SGR_NOTICE}Summary:{SGR_RESET}\n\n"

From 1a0988e503cd551a8c31e62a30b7194fb3631d00 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 15 Mar 2022 15:25:51 -0500
Subject: [PATCH 0506/1748] libevmasm: refactor asm-json export & add support
 for source list.

---
 Changelog.md                      |   2 +
 libevmasm/Assembly.cpp            | 150 +++++++++---------------------
 libevmasm/Assembly.h              |  15 +--
 libevmasm/AssemblyItem.cpp        |  51 ++++++++++
 libevmasm/AssemblyItem.h          |   7 ++
 test/cmdlineTests/asm_json/output |  71 +++++++-------
 test/libevmasm/Assembler.cpp      |  72 +++++++++++---
 7 files changed, 204 insertions(+), 164 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 32d76774a8..33291c6bc8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,9 +5,11 @@ Language Features:
 
 Compiler Features:
  * Peephole Optimizer: Remove operations without side effects before simple terminations.
+ * Assembly-Json: Export: Include source list in `sourceList` field.
 
 
 Bugfixes:
+* Assembly-Json: Fix assembly json export to store jump types of operations in `jumpType` field instead of `value`.
 
 
 
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 6d7b97cc4a..43e06ef9ba 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -222,123 +222,59 @@ string Assembly::assemblyString(
 	return tmp.str();
 }
 
-Json::Value Assembly::createJsonValue(string _name, int _source, int _begin, int _end, string _value, string _jumpType)
-{
-	Json::Value value{Json::objectValue};
-	value["name"] = _name;
-	value["source"] = _source;
-	value["begin"] = _begin;
-	value["end"] = _end;
-	if (!_value.empty())
-		value["value"] = _value;
-	if (!_jumpType.empty())
-		value["jumpType"] = _jumpType;
-	return value;
-}
-
-string Assembly::toStringInHex(u256 _value)
-{
-	std::stringstream hexStr;
-	hexStr << std::uppercase << hex << _value;
-	return hexStr.str();
-}
-
-Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices) const
+Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices, bool _includeSourceList) const
 {
 	Json::Value root;
 	root[".code"] = Json::arrayValue;
-
-	Json::Value& collection = root[".code"];
-	for (AssemblyItem const& i: m_items)
+	Json::Value& code = root[".code"];
+	for (AssemblyItem const& item: m_items)
 	{
 		int sourceIndex = -1;
-		if (i.location().sourceName)
+		if (item.location().sourceName)
 		{
-			auto iter = _sourceIndices.find(*i.location().sourceName);
+			auto iter = _sourceIndices.find(*item.location().sourceName);
 			if (iter != _sourceIndices.end())
 				sourceIndex = static_cast<int>(iter->second);
 		}
 
-		switch (i.type())
+		auto [name, data] = item.nameAndData();
+		Json::Value jsonItem;
+		jsonItem["name"] = name;
+		jsonItem["begin"] = item.location().start;
+		jsonItem["end"] = item.location().end;
+		if (item.m_modifierDepth != 0)
+			jsonItem["modifierDepth"] = static_cast<int>(item.m_modifierDepth);
+		std::string jumpType = item.getJumpTypeAsString();
+		if (!jumpType.empty())
+			jsonItem["jumpType"] = jumpType;
+		if (name == "PUSHLIB")
+			data = m_libraries.at(h256(data));
+		else if (name == "PUSHIMMUTABLE" || name == "ASSIGNIMMUTABLE")
+			data = m_immutables.at(h256(data));
+		if (!data.empty())
+			jsonItem["value"] = data;
+		jsonItem["source"] = sourceIndex;
+		code.append(move(jsonItem));
+
+		if (item.type() == AssemblyItemType::Tag)
 		{
-		case Operation:
-			collection.append(
-				createJsonValue(
-					instructionInfo(i.instruction()).name,
-					sourceIndex,
-					i.location().start,
-					i.location().end,
-					i.getJumpTypeAsString())
-				);
-			break;
-		case Push:
-			collection.append(
-				createJsonValue("PUSH", sourceIndex, i.location().start, i.location().end, toStringInHex(i.data()), i.getJumpTypeAsString()));
-			break;
-		case PushTag:
-			if (i.data() == 0)
-				collection.append(
-					createJsonValue("PUSH [ErrorTag]", sourceIndex, i.location().start, i.location().end, ""));
-			else
-				collection.append(
-					createJsonValue("PUSH [tag]", sourceIndex, i.location().start, i.location().end, toString(i.data())));
-			break;
-		case PushSub:
-			collection.append(
-				createJsonValue("PUSH [$]", sourceIndex, i.location().start, i.location().end, toString(h256(i.data()))));
-			break;
-		case PushSubSize:
-			collection.append(
-				createJsonValue("PUSH #[$]", sourceIndex, i.location().start, i.location().end, toString(h256(i.data()))));
-			break;
-		case PushProgramSize:
-			collection.append(
-				createJsonValue("PUSHSIZE", sourceIndex, i.location().start, i.location().end));
-			break;
-		case PushLibraryAddress:
-			collection.append(
-				createJsonValue("PUSHLIB", sourceIndex, i.location().start, i.location().end, m_libraries.at(h256(i.data())))
-			);
-			break;
-		case PushDeployTimeAddress:
-			collection.append(
-				createJsonValue("PUSHDEPLOYADDRESS", sourceIndex, i.location().start, i.location().end)
-			);
-			break;
-		case PushImmutable:
-			collection.append(createJsonValue(
-				"PUSHIMMUTABLE",
-				sourceIndex,
-				i.location().start,
-				i.location().end,
-				m_immutables.at(h256(i.data()))
-			));
-			break;
-		case AssignImmutable:
-			collection.append(createJsonValue(
-				"ASSIGNIMMUTABLE",
-				sourceIndex,
-				i.location().start,
-				i.location().end,
-				m_immutables.at(h256(i.data()))
-			));
-			break;
-		case Tag:
-			collection.append(
-				createJsonValue("tag", sourceIndex, i.location().start, i.location().end, toString(i.data())));
-			collection.append(
-				createJsonValue("JUMPDEST", sourceIndex, i.location().start, i.location().end));
-			break;
-		case PushData:
-			collection.append(createJsonValue("PUSH data", sourceIndex, i.location().start, i.location().end, toStringInHex(i.data())));
-			break;
-		case VerbatimBytecode:
-			collection.append(createJsonValue("VERBATIM", sourceIndex, i.location().start, i.location().end, util::toHex(i.verbatimData())));
-			break;
-		default:
-			assertThrow(false, InvalidOpcode, "");
+			Json::Value jumpdest;
+			jumpdest["name"] = "JUMPDEST";
+			jumpdest["begin"] = item.location().start;
+			jumpdest["end"] = item.location().end;
+			jumpdest["source"] = sourceIndex;
+			if (item.m_modifierDepth != 0)
+				jumpdest["modifierDepth"] = static_cast<int>(item.m_modifierDepth);
+			code.append(move(jumpdest));
 		}
 	}
+	if (_includeSourceList)
+	{
+		root["sourceList"] = Json::arrayValue;
+		Json::Value& jsonSourceList = root["sourceList"];
+		for (auto const& [name, index]: _sourceIndices)
+			jsonSourceList[index] = name;
+	}
 
 	if (!m_data.empty() || !m_subs.empty())
 	{
@@ -346,17 +282,17 @@ Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices)
 		Json::Value& data = root[".data"];
 		for (auto const& i: m_data)
 			if (u256(i.first) >= m_subs.size())
-				data[toStringInHex((u256)i.first)] = util::toHex(i.second);
+				data[util::toHex(toBigEndian((u256)i.first), util::HexPrefix::DontAdd, util::HexCase::Upper)] = util::toHex(i.second);
 
 		for (size_t i = 0; i < m_subs.size(); ++i)
 		{
 			std::stringstream hexStr;
 			hexStr << hex << i;
-			data[hexStr.str()] = m_subs[i]->assemblyJSON(_sourceIndices);
+			data[hexStr.str()] = m_subs[i]->assemblyJSON(_sourceIndices, /*_includeSourceList = */false);
 		}
 	}
 
-	if (m_auxiliaryData.size() > 0)
+	if (!m_auxiliaryData.empty())
 		root[".auxdata"] = util::toHex(m_auxiliaryData);
 
 	return root;
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index 11bc166629..592119f17f 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -39,6 +39,7 @@
 #include <sstream>
 #include <memory>
 #include <map>
+#include <utility>
 
 namespace solidity::evmasm
 {
@@ -147,7 +148,8 @@ class Assembly
 
 	/// Create a JSON representation of the assembly.
 	Json::Value assemblyJSON(
-		std::map<std::string, unsigned> const& _sourceIndices = std::map<std::string, unsigned>()
+		std::map<std::string, unsigned> const& _sourceIndices = std::map<std::string, unsigned>(),
+		bool _includeSourceList = true
 	) const;
 
 	/// Mark this assembly as invalid. Calling ``assemble`` on it will throw.
@@ -167,16 +169,6 @@ class Assembly
 	unsigned codeSize(unsigned subTagSize) const;
 
 private:
-	static Json::Value createJsonValue(
-		std::string _name,
-		int _source,
-		int _begin,
-		int _end,
-		std::string _value = std::string(),
-		std::string _jumpType = std::string()
-	);
-	static std::string toStringInHex(u256 _value);
-
 	bool m_invalid = false;
 
 	Assembly const* subAssemblyById(size_t _subId) const;
@@ -222,6 +214,7 @@ class Assembly
 	std::string m_name;
 
 	langutil::SourceLocation m_currentSourceLocation;
+
 public:
 	size_t m_currentModifierDepth = 0;
 };
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
index 9840587653..a36e0ddb1d 100644
--- a/libevmasm/AssemblyItem.cpp
+++ b/libevmasm/AssemblyItem.cpp
@@ -21,6 +21,7 @@
 #include <libevmasm/Assembly.h>
 
 #include <libsolutil/CommonData.h>
+#include <libsolutil/CommonIO.h>
 #include <libsolutil/Numeric.h>
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/FixedHash.h>
@@ -36,6 +37,18 @@ using namespace solidity::langutil;
 
 static_assert(sizeof(size_t) <= 8, "size_t must be at most 64-bits wide");
 
+namespace
+{
+
+string toStringInHex(u256 _value)
+{
+	std::stringstream hexStr;
+	hexStr << std::uppercase << hex << _value;
+	return hexStr.str();
+}
+
+}
+
 AssemblyItem AssemblyItem::toSubAssemblyTag(size_t _subId) const
 {
 	assertThrow(data() < (u256(1) << 64), util::Exception, "Tag already has subassembly set.");
@@ -56,6 +69,44 @@ pair<size_t, size_t> AssemblyItem::splitForeignPushTag() const
 	return make_pair(subId, tag);
 }
 
+pair<string, string> AssemblyItem::nameAndData() const
+{
+	switch (type())
+	{
+	case Operation:
+		return {instructionInfo(instruction()).name, m_data != nullptr ? toStringInHex(*m_data) : ""};
+	case Push:
+		return {"PUSH", toStringInHex(data())};
+	case PushTag:
+		if (data() == 0)
+			return {"PUSH [ErrorTag]", ""};
+		else
+			return {"PUSH [tag]", util::toString(data())};
+	case PushSub:
+		return {"PUSH [$]", toString(util::h256(data()))};
+	case PushSubSize:
+		return {"PUSH #[$]", toString(util::h256(data()))};
+	case PushProgramSize:
+		return {"PUSHSIZE", ""};
+	case PushLibraryAddress:
+		return {"PUSHLIB", toString(util::h256(data()))};
+	case PushDeployTimeAddress:
+		return {"PUSHDEPLOYADDRESS", ""};
+	case PushImmutable:
+		return {"PUSHIMMUTABLE", toString(util::h256(data()))};
+	case AssignImmutable:
+		return {"ASSIGNIMMUTABLE", toString(util::h256(data()))};
+	case Tag:
+		return {"tag", util::toString(data())};
+	case PushData:
+		return {"PUSH data", toStringInHex(data())};
+	case VerbatimBytecode:
+		return {"VERBATIM", util::toHex(verbatimData())};
+	default:
+		assertThrow(false, InvalidOpcode, "");
+	}
+}
+
 void AssemblyItem::setPushTagSubIdAndTag(size_t _subId, size_t _tag)
 {
 	assertThrow(m_type == PushTag || m_type == Tag, util::Exception, "");
diff --git a/libevmasm/AssemblyItem.h b/libevmasm/AssemblyItem.h
index 796a792e8a..4aef82d8b2 100644
--- a/libevmasm/AssemblyItem.h
+++ b/libevmasm/AssemblyItem.h
@@ -106,6 +106,13 @@ class AssemblyItem
 	u256 const& data() const { assertThrow(m_type != Operation, util::Exception, ""); return *m_data; }
 	void setData(u256 const& _data) { assertThrow(m_type != Operation, util::Exception, ""); m_data = std::make_shared<u256>(_data); }
 
+	/// This function is used in `Assembly::assemblyJSON`.
+	/// It returns the name & data of the current assembly item.
+	/// @returns a pair, where the first element is the json-assembly
+	/// item name, where second element is the string representation
+	/// of it's data.
+	std::pair<std::string, std::string> nameAndData() const;
+
 	bytes const& verbatimData() const { assertThrow(m_type == VerbatimBytecode, util::Exception, ""); return std::get<2>(*m_verbatimBytecode); }
 
 	/// @returns the instruction of this item (only valid if type() == Operation)
diff --git a/test/cmdlineTests/asm_json/output b/test/cmdlineTests/asm_json/output
index 26ab87147a..000ad1b753 100644
--- a/test/cmdlineTests/asm_json/output
+++ b/test/cmdlineTests/asm_json/output
@@ -450,9 +450,9 @@ EVM assembly:
         {
           "begin": 77,
           "end": 158,
+          "jumpType": "[in]",
           "name": "JUMP",
-          "source": 0,
-          "value": "[in]"
+          "source": 0
         },
         {
           "begin": 77,
@@ -477,9 +477,9 @@ EVM assembly:
         {
           "begin": 77,
           "end": 158,
+          "jumpType": "[in]",
           "name": "JUMP",
-          "source": 0,
-          "value": "[in]"
+          "source": 0
         },
         {
           "begin": 77,
@@ -555,9 +555,9 @@ EVM assembly:
         {
           "begin": 118,
           "end": 125,
+          "jumpType": "[in]",
           "name": "JUMP",
-          "source": 0,
-          "value": "[in]"
+          "source": 0
         },
         {
           "begin": 118,
@@ -657,9 +657,9 @@ EVM assembly:
         {
           "begin": 77,
           "end": 158,
+          "jumpType": "[out]",
           "name": "JUMP",
-          "source": 0,
-          "value": "[out]"
+          "source": 0
         },
         {
           "begin": 88,
@@ -752,9 +752,9 @@ EVM assembly:
         {
           "begin": 334,
           "end": 411,
+          "jumpType": "[out]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[out]"
+          "source": 1
         },
         {
           "begin": 417,
@@ -792,9 +792,9 @@ EVM assembly:
         {
           "begin": 490,
           "end": 514,
+          "jumpType": "[in]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[in]"
+          "source": 1
         },
         {
           "begin": 490,
@@ -875,9 +875,9 @@ EVM assembly:
         {
           "begin": 417,
           "end": 539,
+          "jumpType": "[out]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[out]"
+          "source": 1
         },
         {
           "begin": 545,
@@ -946,9 +946,9 @@ EVM assembly:
         {
           "begin": 645,
           "end": 678,
+          "jumpType": "[in]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[in]"
+          "source": 1
         },
         {
           "begin": 645,
@@ -990,9 +990,9 @@ EVM assembly:
         {
           "begin": 545,
           "end": 684,
+          "jumpType": "[out]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[out]"
+          "source": 1
         },
         {
           "begin": 690,
@@ -1081,9 +1081,9 @@ EVM assembly:
         {
           "begin": 804,
           "end": 883,
+          "jumpType": "[in]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[in]"
+          "source": 1
         },
         {
           "begin": 804,
@@ -1159,9 +1159,9 @@ EVM assembly:
         {
           "begin": 949,
           "end": 1002,
+          "jumpType": "[in]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[in]"
+          "source": 1
         },
         {
           "begin": 949,
@@ -1221,9 +1221,9 @@ EVM assembly:
         {
           "begin": 690,
           "end": 1019,
+          "jumpType": "[out]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[out]"
+          "source": 1
         },
         {
           "begin": 1025,
@@ -1341,9 +1341,9 @@ EVM assembly:
         {
           "begin": 1270,
           "end": 1290,
+          "jumpType": "[in]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[in]"
+          "source": 1
         },
         {
           "begin": 1270,
@@ -1393,9 +1393,9 @@ EVM assembly:
         {
           "begin": 1304,
           "end": 1324,
+          "jumpType": "[in]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[in]"
+          "source": 1
         },
         {
           "begin": 1304,
@@ -1489,9 +1489,9 @@ EVM assembly:
         {
           "begin": 1464,
           "end": 1482,
+          "jumpType": "[in]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[in]"
+          "source": 1
         },
         {
           "begin": 1464,
@@ -1576,11 +1576,16 @@ EVM assembly:
         {
           "begin": 1211,
           "end": 1516,
+          "jumpType": "[out]",
           "name": "JUMP",
-          "source": 1,
-          "value": "[out]"
+          "source": 1
         }
       ]
     }
-  }
+  },
+  "sourceList":
+  [
+    "asm_json/input.sol",
+    "#utility.yul"
+  ]
 }
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index 3a31678164..680531799d 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -56,7 +56,8 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 {
 	map<string, unsigned> indices = {
 		{ "root.asm", 0 },
-		{ "sub.asm", 1 }
+		{ "sub.asm", 1 },
+		{ "verbatim.asm", 2 }
 	};
 	Assembly _assembly{false, {}};
 	auto root_asm = make_shared<string>("root.asm");
@@ -65,11 +66,22 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 	Assembly _subAsm{false, {}};
 	auto sub_asm = make_shared<string>("sub.asm");
 	_subAsm.setSourceLocation({6, 8, sub_asm});
+
+	Assembly _verbatimAsm(true, "");
+	auto verbatim_asm = make_shared<string>("verbatim.asm");
+	_verbatimAsm.setSourceLocation({8, 18, verbatim_asm});
+
 	// PushImmutable
 	_subAsm.appendImmutable("someImmutable");
+	_subAsm.append(AssemblyItem(PushTag, 0));
 	_subAsm.append(Instruction::INVALID);
 	shared_ptr<Assembly> _subAsmPtr = make_shared<Assembly>(_subAsm);
 
+	_verbatimAsm.appendVerbatim({0xff,0xff}, 0, 0);
+	_verbatimAsm.appendVerbatim({0x74, 0x65, 0x73, 0x74}, 0, 1);
+	_verbatimAsm.append(Instruction::MSTORE);
+	shared_ptr<Assembly> _verbatimAsmPtr = make_shared<Assembly>(_verbatimAsm);
+
 	// Tag
 	auto tag = _assembly.newTag();
 	_assembly.append(tag);
@@ -77,7 +89,10 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 	_assembly.append(u256(1));
 	_assembly.append(u256(2));
 	// Push
-	_assembly.append(Instruction::KECCAK256);
+	auto keccak256 = AssemblyItem(Instruction::KECCAK256);
+	_assembly.m_currentModifierDepth = 1;
+	_assembly.append(keccak256);
+	_assembly.m_currentModifierDepth = 0;
 	// PushProgramSize
 	_assembly.appendProgramSize();
 	// PushLibraryAddress
@@ -90,6 +105,10 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 	auto sub = _assembly.appendSubroutine(_subAsmPtr);
 	// PushSub
 	_assembly.pushSubroutineOffset(static_cast<size_t>(sub.data()));
+	// PushSubSize
+	auto verbatim_sub = _assembly.appendSubroutine(_verbatimAsmPtr);
+	// PushSub
+	_assembly.pushSubroutineOffset(static_cast<size_t>(verbatim_sub.data()));
 	// PushDeployTimeAddress
 	_assembly.append(PushDeployTimeAddress);
 	// AssignImmutable.
@@ -102,16 +121,21 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 	_assembly.appendToAuxiliaryData(bytes{0x42, 0x66});
 	_assembly.appendToAuxiliaryData(bytes{0xee, 0xaa});
 
+	_assembly.m_currentModifierDepth = 2;
+	_assembly.appendJump(tag);
+	_assembly.m_currentModifierDepth = 0;
+
 	checkCompilation(_assembly);
 
 	BOOST_CHECK_EQUAL(
 		_assembly.assemble().toHex(),
-		"5b6001600220606f73__$bf005014d9d0f534b8fcb268bd84c491a2$__"
-		"6000566067602260457300000000000000000000000000000000000000005050"
+		"5b6001600220607f73__$bf005014d9d0f534b8fcb268bd84c491a2$__"
+		"60005660776024604c600760707300000000000000000000000000000000000000005050"
 		"600260010152"
-		"00fe"
+		"006000"
+		"56fe"
 		"7f0000000000000000000000000000000000000000000000000000000000000000"
-		"fe010203044266eeaa"
+		"6000feffff7465737452010203044266eeaa"
 	);
 	BOOST_CHECK_EQUAL(
 		_assembly.assemblyString(),
@@ -124,30 +148,40 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 		"  data_a6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b\n"
 		"  dataSize(sub_0)\n"
 		"  dataOffset(sub_0)\n"
+		"  dataSize(sub_1)\n"
+		"  dataOffset(sub_1)\n"
 		"  deployTimeAddress()\n"
 		"  assignImmutable(\"0xc3978657661c4d8e32e3d5f42597c009f0d3859e9f9d0d94325268f9799e2bfb\")\n"
 		"  0x02\n"
 		"  assignImmutable(\"0x26f2c0195e9d408feff3abd77d83f2971f3c9a18d1e8a9437c7835ae4211fc9f\")\n"
 		"  stop\n"
+		"  jump(tag_1)\n"
 		"stop\n"
 		"data_a6885b3731702da62e8e4a8f584ac46a7f6822f4e2ba50fba902f67b1588d23b 01020304\n"
 		"\n"
 		"sub_0: assembly {\n"
 		"        /* \"sub.asm\":6:8   */\n"
 		"      immutable(\"0x26f2c0195e9d408feff3abd77d83f2971f3c9a18d1e8a9437c7835ae4211fc9f\")\n"
+		"      tag_0\n"
 		"      invalid\n"
 		"}\n"
 		"\n"
+		"sub_1: assembly {\n"
+		"        /* \"verbatim.asm\":8:18   */\n"
+		"      verbatimbytecode_ffff\n"
+		"      verbatimbytecode_74657374\n"
+		"      mstore\n"
+		"}\n"
+		"\n"
 		"auxdata: 0x4266eeaa\n"
 	);
-	BOOST_CHECK_EQUAL(
-		util::jsonCompactPrint(_assembly.assemblyJSON(indices)),
+	string json{
 		"{\".auxdata\":\"4266eeaa\",\".code\":["
 		"{\"begin\":1,\"end\":3,\"name\":\"tag\",\"source\":0,\"value\":\"1\"},"
 		"{\"begin\":1,\"end\":3,\"name\":\"JUMPDEST\",\"source\":0},"
 		"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"1\"},"
 		"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"2\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"KECCAK256\",\"source\":0},"
+		"{\"begin\":1,\"end\":3,\"modifierDepth\":1,\"name\":\"KECCAK256\",\"source\":0},"
 		"{\"begin\":1,\"end\":3,\"name\":\"PUSHSIZE\",\"source\":0},"
 		"{\"begin\":1,\"end\":3,\"name\":\"PUSHLIB\",\"source\":0,\"value\":\"someLibrary\"},"
 		"{\"begin\":1,\"end\":3,\"name\":\"PUSH [tag]\",\"source\":0,\"value\":\"1\"},"
@@ -155,16 +189,28 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 		"{\"begin\":1,\"end\":3,\"name\":\"PUSH data\",\"source\":0,\"value\":\"A6885B3731702DA62E8E4A8F584AC46A7F6822F4E2BA50FBA902F67B1588D23B\"},"
 		"{\"begin\":1,\"end\":3,\"name\":\"PUSH #[$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
 		"{\"begin\":1,\"end\":3,\"name\":\"PUSH [$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000000\"},"
+		"{\"begin\":1,\"end\":3,\"name\":\"PUSH #[$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000001\"},"
+		"{\"begin\":1,\"end\":3,\"name\":\"PUSH [$]\",\"source\":0,\"value\":\"0000000000000000000000000000000000000000000000000000000000000001\"},"
 		"{\"begin\":1,\"end\":3,\"name\":\"PUSHDEPLOYADDRESS\",\"source\":0},"
 		"{\"begin\":1,\"end\":3,\"name\":\"ASSIGNIMMUTABLE\",\"source\":0,\"value\":\"someOtherImmutable\"},"
 		"{\"begin\":1,\"end\":3,\"name\":\"PUSH\",\"source\":0,\"value\":\"2\"},"
 		"{\"begin\":1,\"end\":3,\"name\":\"ASSIGNIMMUTABLE\",\"source\":0,\"value\":\"someImmutable\"},"
-		"{\"begin\":1,\"end\":3,\"name\":\"STOP\",\"source\":0}"
+		"{\"begin\":1,\"end\":3,\"name\":\"STOP\",\"source\":0},"
+		"{\"begin\":1,\"end\":3,\"modifierDepth\":2,\"name\":\"PUSH [tag]\",\"source\":0,\"value\":\"1\"},{\"begin\":1,\"end\":3,\"modifierDepth\":2,\"name\":\"JUMP\",\"source\":0}"
 		"],\".data\":{\"0\":{\".code\":["
 		"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"},"
+		"{\"begin\":6,\"end\":8,\"name\":\"PUSH [ErrorTag]\",\"source\":1},"
 		"{\"begin\":6,\"end\":8,\"name\":\"INVALID\",\"source\":1}"
-		"]},\"A6885B3731702DA62E8E4A8F584AC46A7F6822F4E2BA50FBA902F67B1588D23B\":\"01020304\"}}"
-	);
+		"]},"
+		"\"1\":{\".code\":["
+		"{\"begin\":8,\"end\":18,\"name\":\"VERBATIM\",\"source\":2,\"value\":\"ffff\"},"
+		"{\"begin\":8,\"end\":18,\"name\":\"VERBATIM\",\"source\":2,\"value\":\"74657374\"},"
+		"{\"begin\":8,\"end\":18,\"name\":\"MSTORE\",\"source\":2}"
+		"]},\"A6885B3731702DA62E8E4A8F584AC46A7F6822F4E2BA50FBA902F67B1588D23B\":\"01020304\"},\"sourceList\":[\"root.asm\",\"sub.asm\",\"verbatim.asm\"]}"
+	};
+	Json::Value jsonValue;
+	BOOST_CHECK(util::jsonParseStrict(json, jsonValue));
+	BOOST_CHECK_EQUAL(util::jsonCompactPrint(_assembly.assemblyJSON(indices)), util::jsonCompactPrint(jsonValue));
 }
 
 BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
@@ -343,7 +389,7 @@ BOOST_AUTO_TEST_CASE(immutable)
 		"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"},"
 		"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someOtherImmutable\"},"
 		"{\"begin\":6,\"end\":8,\"name\":\"PUSHIMMUTABLE\",\"source\":1,\"value\":\"someImmutable\"}"
-		"]}}}"
+		"]}},\"sourceList\":[\"root.asm\",\"sub.asm\"]}"
 	);
 }
 

From 54fa215885b568b0e6c14951c6ce412ed67c0ff2 Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Wed, 23 Mar 2022 17:15:17 -0700
Subject: [PATCH 0507/1748] Update mapping-types.rst

typo
---
 docs/types/mapping-types.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/types/mapping-types.rst b/docs/types/mapping-types.rst
index 1c94b20ab5..c59d6e8454 100644
--- a/docs/types/mapping-types.rst
+++ b/docs/types/mapping-types.rst
@@ -119,7 +119,7 @@ Iterable Mappings
 You cannot iterate over mappings, i.e. you cannot enumerate their keys.
 It is possible, though, to implement a data structure on
 top of them and iterate over that. For example, the code below implements an
-``IterableMapping`` library that the ``User`` contract then adds data too, and
+``IterableMapping`` library that the ``User`` contract then adds data to, and
 the ``sum`` function iterates over to sum all the values.
 
 .. code-block:: solidity

From 4c6066bfad29941b8011542951ee7ef99f73abdc Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Mon, 7 Mar 2022 18:38:34 +0530
Subject: [PATCH 0508/1748] typeCheckAbiEncodeCallFunction should type check
 the arguments on functionPointerType->asExternallyCallableFunction instead of
 teh plain function type

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/TypeChecker.cpp          | 51 ++++++++++---------
 .../abiEncoder/abi_encode_conversions.sol     | 35 +++++++++++++
 .../abi_encode_conversions_address.sol        | 11 ++++
 ...i_encode_conversions_function_pointers.sol | 16 ++++++
 ...ode_convert_address_to_address_payable.sol | 11 ----
 ..._pointer_to_different_function_pointer.sol | 13 -----
 ...convert_function_to_different_function.sol | 13 -----
 ...ode_convert_string_to_different_string.sol | 12 -----
 9 files changed, 90 insertions(+), 73 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol
 delete mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol
 delete mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol
 delete mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol
 delete mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol

diff --git a/Changelog.md b/Changelog.md
index 33291c6bc8..8f666eac19 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ Compiler Features:
 
 Bugfixes:
 * Assembly-Json: Fix assembly json export to store jump types of operations in `jumpType` field instead of `value`.
+* TypeChecker: Convert parameters of function type to how they would be called for ``abi.encodeCall``.
 
 
 
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 43334563be..da24782b4c 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -2111,57 +2111,60 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 		return;
 	}
 
-	auto const functionPointerType = dynamic_cast<FunctionTypePointer>(type(*arguments.front()));
-
-	if (!functionPointerType)
+	FunctionType const* externalFunctionType = nullptr;
+	if (auto const functionPointerType = dynamic_cast<FunctionTypePointer>(type(*arguments.front())))
+	{
+		// this cannot be a library function, that is checked below
+		externalFunctionType = functionPointerType->asExternallyCallableFunction(false);
+		solAssert(externalFunctionType->kind() == functionPointerType->kind());
+	}
+	else
 	{
 		m_errorReporter.typeError(
 			5511_error,
 			arguments.front()->location(),
 			"Expected first argument to be a function pointer, not \"" +
-			type(*arguments.front())->canonicalName() +
+			type(*arguments.front())->toString() +
 			"\"."
 		);
 		return;
 	}
 
 	if (
-		functionPointerType->kind() != FunctionType::Kind::External &&
-		functionPointerType->kind() != FunctionType::Kind::Declaration
+		externalFunctionType->kind() != FunctionType::Kind::External &&
+		externalFunctionType->kind() != FunctionType::Kind::Declaration
 	)
 	{
 		string msg = "Expected regular external function type, or external view on public function.";
-		if (functionPointerType->kind() == FunctionType::Kind::Internal)
+		if (externalFunctionType->kind() == FunctionType::Kind::Internal)
 			msg += " Provided internal function.";
-		else if (functionPointerType->kind() == FunctionType::Kind::DelegateCall)
+		else if (externalFunctionType->kind() == FunctionType::Kind::DelegateCall)
 			msg += " Cannot use library functions for abi.encodeCall.";
-		else if (functionPointerType->kind() == FunctionType::Kind::Creation)
+		else if (externalFunctionType->kind() == FunctionType::Kind::Creation)
 			msg += " Provided creation function.";
 		else
 			msg += " Cannot use special function.";
 		SecondarySourceLocation ssl{};
 
-		if (functionPointerType->hasDeclaration())
+		if (externalFunctionType->hasDeclaration())
 		{
-			ssl.append("Function is declared here:", functionPointerType->declaration().location());
+			ssl.append("Function is declared here:", externalFunctionType->declaration().location());
 			if (
-				functionPointerType->declaration().visibility() == Visibility::Public &&
-				functionPointerType->declaration().scope() == m_currentContract
+				externalFunctionType->declaration().visibility() == Visibility::Public &&
+				externalFunctionType->declaration().scope() == m_currentContract
 			)
 				msg += " Did you forget to prefix \"this.\"?";
 			else if (util::contains(
 				m_currentContract->annotation().linearizedBaseContracts,
-				functionPointerType->declaration().scope()
-			) && functionPointerType->declaration().scope() != m_currentContract)
+				externalFunctionType->declaration().scope()
+			) && externalFunctionType->declaration().scope() != m_currentContract)
 				msg += " Functions from base contracts have to be external.";
 		}
 
 		m_errorReporter.typeError(3509_error, arguments[0]->location(), ssl, msg);
 		return;
 	}
-
-	solAssert(!functionPointerType->takesArbitraryParameters(), "Function must have fixed parameters.");
-
+	solAssert(!externalFunctionType->takesArbitraryParameters(), "Function must have fixed parameters.");
 	// Tuples with only one component become that component
 	vector<ASTPointer<Expression const>> callArguments;
 
@@ -2174,14 +2177,14 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 	else
 		callArguments.push_back(arguments[1]);
 
-	if (functionPointerType->parameterTypes().size() != callArguments.size())
+	if (externalFunctionType->parameterTypes().size() != callArguments.size())
 	{
 		if (tupleType)
 			m_errorReporter.typeError(
 				7788_error,
 				_functionCall.location(),
 				"Expected " +
-				to_string(functionPointerType->parameterTypes().size()) +
+				to_string(externalFunctionType->parameterTypes().size()) +
 				" instead of " +
 				to_string(callArguments.size()) +
 				" components for the tuple parameter."
@@ -2191,18 +2194,18 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 				7515_error,
 				_functionCall.location(),
 				"Expected a tuple with " +
-				to_string(functionPointerType->parameterTypes().size()) +
+				to_string(externalFunctionType->parameterTypes().size()) +
 				" components instead of a single non-tuple parameter."
 			);
 	}
 
 	// Use min() to check as much as we can before failing fatally
-	size_t const numParameters = min(callArguments.size(), functionPointerType->parameterTypes().size());
+	size_t const numParameters = min(callArguments.size(), externalFunctionType->parameterTypes().size());
 
 	for (size_t i = 0; i < numParameters; i++)
 	{
 		Type const& argType = *type(*callArguments[i]);
-		BoolResult result = argType.isImplicitlyConvertibleTo(*functionPointerType->parameterTypes()[i]);
+		BoolResult result = argType.isImplicitlyConvertibleTo(*externalFunctionType->parameterTypes()[i]);
 		if (!result)
 			m_errorReporter.typeError(
 				5407_error,
@@ -2212,7 +2215,7 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 				" from \"" +
 				argType.toString() +
 				"\" to \"" +
-				functionPointerType->parameterTypes()[i]->toString() +
+				externalFunctionType->parameterTypes()[i]->toString() +
 				"\"" +
 				(result.message().empty() ?  "." : ": " + result.message())
 			);
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions.sol
new file mode 100644
index 0000000000..7104785802
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions.sol
@@ -0,0 +1,35 @@
+interface testInterface {
+    function C(function (string memory) external) external;
+    function D(string calldata) external;
+    function E(string memory) external;
+    function F(address) external;
+}
+
+contract testContract {
+    function g(string calldata) external {}
+    function h(string memory) external {}
+    function i(string calldata str) external {
+        this.h(str);
+        this.g(str);
+    }
+    function j(string memory str) external {
+        this.h(str);
+        this.g(str);
+    }
+    function k(string memory str) external pure {
+        abi.encodeCall(testInterface.D, (str));
+    }
+    string s;
+
+    function main() external view {
+        abi.encodeCall(testInterface.C, (this.g));
+        abi.encodeCall(testInterface.C, (this.h));
+        abi.encodeCall(testInterface.D, (s));
+        abi.encodeCall(testInterface.E, (s));
+        abi.encodeCall(testInterface.F, (payable(address(0))));
+        abi.encodeCall(this.i, (s));
+        abi.encodeCall(this.j, (s));
+    }
+}
+// ----
+// Warning 6133: (860-914): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol
new file mode 100644
index 0000000000..b5d53142c7
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_address.sol
@@ -0,0 +1,11 @@
+interface testInterface {
+    function A(address payable) external;
+}
+
+contract testContract {
+    function main() external view {
+        abi.encodeCall(testInterface.A, (address(0)));
+    }
+}
+// ----
+// TypeError 5407: (171-183): Cannot implicitly convert component at position 0 from "address" to "address payable".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol
new file mode 100644
index 0000000000..242eb61c79
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_conversions_function_pointers.sol
@@ -0,0 +1,16 @@
+interface testInterface {
+    function B(function (string calldata) external) external;
+}
+
+contract testContract {
+    function g(string calldata) external {}
+    function h(string memory) external {}
+
+    function main() external view {
+        abi.encodeCall(testInterface.B, (this.g));
+        abi.encodeCall(testInterface.B, (this.h));
+    }
+}
+// ----
+// TypeError 5407: (278-286): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
+// TypeError 5407: (329-337): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol
deleted file mode 100644
index a4c823a858..0000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_address_to_address_payable.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-interface I {
-    function f(address payable) external;
-}
-
-contract C {
-    function main() external view {
-        abi.encodeCall(I.f, (address(0)));
-    }
-}
-// ----
-// TypeError 5407: (136-148): Cannot implicitly convert component at position 0 from "address" to "address payable".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol
deleted file mode 100644
index 7c570e29e0..0000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_pointer_to_different_function_pointer.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface I {
-    function f(function (string calldata) external) external;
-}
-
-contract C {
-    function g(string calldata) external {}
-
-    function main() external view {
-        abi.encodeCall(I.f, (this.g));
-    }
-}
-// ----
-// TypeError 5407: (201-209): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol
deleted file mode 100644
index 7a35bfa553..0000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_function_to_different_function.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-interface I {
-    function f(function (string calldata) external view returns (uint)) external;
-}
-
-contract C {
-    function g(string memory) external {}
-
-    function main() external view {
-        abi.encodeCall(I.f, (this.g));
-    }
-}
-// ----
-// TypeError 5407: (219-227): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) view external returns (uint256)".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol
deleted file mode 100644
index 72efe4a077..0000000000
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encode_convert_string_to_different_string.sol
+++ /dev/null
@@ -1,12 +0,0 @@
-interface I {
-    function f(string calldata) external;
-}
-
-contract C {
-    string s;
-    function main() external view {
-        abi.encodeCall(I.f, (s));
-    }
-}
-// ----
-// TypeError 5407: (150-153): Cannot implicitly convert component at position 0 from "string storage ref" to "string calldata".

From 34c06c27a5658b6b65d80d64d9cc684f8e1eddf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 28 Mar 2022 17:56:30 +0200
Subject: [PATCH 0509/1748] Downgrade ethers.js to 5.6.1 in ens, gnosis, euler,
 perpetual-pools and uniswap external tests

---
 test/externalTests/ens.sh             | 4 ++++
 test/externalTests/euler.sh           | 4 ++++
 test/externalTests/gnosis.sh          | 4 ++++
 test/externalTests/perpetual-pools.sh | 4 ++++
 test/externalTests/uniswap.sh         | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index e4edbf46c9..bf018d0ce6 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -65,6 +65,10 @@ function ens_test
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
     yarn install
 
+    # With ethers.js 5.6.2 many tests for revert messages fail.
+    # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
+    yarn add ethers@5.6.1
+
     replace_version_pragmas
     neutralize_packaged_contracts
 
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 39283bcd54..0d63ecd434 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -68,6 +68,10 @@ function euler_test
     force_hardhat_unlimited_contract_size "$config_file"
     npm install
 
+    # With ethers.js 5.6.2 many tests for revert messages fail.
+    # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
+    npm install ethers@5.6.1
+
     replace_version_pragmas
     neutralize_packaged_contracts
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index ccfc6cf5c1..b8553e4eb3 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -81,6 +81,10 @@ function gnosis_safe_test
     npm install
     npm install hardhat-gas-reporter
 
+    # With ethers.js 5.6.2 many tests for revert messages fail.
+    # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
+    npm install ethers@5.6.1
+
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
 
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index 7e42896984..51d729d5df 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -71,6 +71,10 @@ function perpetual_pools_test
     # TODO: Remove when https://github.com/OpenZeppelin/openzeppelin-upgrades/issues/528 is fixed.
     yarn add hardhat@2.8.4
 
+    # With ethers.js 5.6.2 many tests for revert messages fail.
+    # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
+    yarn add ethers@5.6.1
+
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index 2f94c6abde..efea480b6c 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -77,6 +77,10 @@ function uniswap_test
     yarn install
     yarn add hardhat-gas-reporter
 
+    # With ethers.js 5.6.2 many tests for revert messages fail.
+    # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
+    yarn add ethers@5.6.1
+
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do

From b445e7e74c47d7627b55d59091d8fe27209a3a65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 28 Mar 2022 19:51:46 +0200
Subject: [PATCH 0510/1748] Revert "perpetual-pools: Use Hardhat 2.8.4 to work
 around @openzeppelin/hardhat-upgrades's problem with parallel compilation on
 Hardhat 2.9.0"

This reverts commit 30008465bf095291b4ea222a9e5c77a97eb28ced.
---
 test/externalTests/perpetual-pools.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index 51d729d5df..1b54fc577f 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -66,11 +66,6 @@ function perpetual_pools_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     yarn install
 
-    # The project depends on @openzeppelin/hardhat-upgrades, which is currently not prepared
-    # for the parallel compilation introduced in Hardhat 2.9.0.
-    # TODO: Remove when https://github.com/OpenZeppelin/openzeppelin-upgrades/issues/528 is fixed.
-    yarn add hardhat@2.8.4
-
     # With ethers.js 5.6.2 many tests for revert messages fail.
     # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
     yarn add ethers@5.6.1

From 5ef0048d85eff80c542a7946c441980890ac153a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 1 Apr 2022 22:27:33 +0200
Subject: [PATCH 0511/1748] zeppelin: Disable the newly added Polygon-Child
 test, failing via IR due to Hardhat heuristics

---
 test/externalTests/zeppelin.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index ab79a87759..ccbf7595ac 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -70,6 +70,8 @@ function zeppelin_test
     # In some cases Hardhat does not detect revert reasons properly via IR.
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
     sed -i "s|it(\('reverts if the current value is 0'\)|it.skip(\1|g" test/utils/Counters.test.js
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
+    sed -i "s|describe\(('Polygon-Child'\)|describe.skip\1|g" test/crosschain/CrossChainEnabled.test.js
 
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"

From 73443c0ada55a7b3f941e034d207df22de2ceb3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 1 Apr 2022 22:53:59 +0200
Subject: [PATCH 0512/1748] elementfi: Switch all presets to compile-only

---
 test/externalTests/elementfi.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index 74ed93a5c2..898627da8d 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -42,9 +42,9 @@ function elementfi_test
     local config_file="hardhat.config.ts"
     local config_var=config
 
-    local compile_only_presets=()
-    local settings_presets=(
-        "${compile_only_presets[@]}"
+    local compile_only_presets=(
+        # ElementFi's test suite is hard-coded for mainnet forked via alchemy.io.
+        # Locally we can only compile.
         #ir-no-optimize           # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack."
         ir-optimize-evm+yul
@@ -52,6 +52,9 @@ function elementfi_test
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
     )
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+    )
 
     [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
     print_presets_or_exit "$SELECTED_PRESETS"

From 1e7688e8a14b0d8617e6274982dc6b37a3a32457 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Thu, 24 Mar 2022 12:08:20 +0100
Subject: [PATCH 0513/1748] Tests for the equivalence of one and two-stage
 compilation via IR supports multi-file contracts

---
 test/cmdlineTests.sh | 88 +++++++++++++++++++++++++-------------------
 1 file changed, 51 insertions(+), 37 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 6798a83f88..8b6f646305 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -317,47 +317,56 @@ function test_via_ir_equivalence()
         fail "The second argument must be --optimize if present."
     fi
 
-    local solidity_code="$1"
+    local solidity_file="$1"
     local optimize_flag="$2"
 
+    filename=$(basename "$1" .sol)
+
     local optimizer_flags=()
     [[ $optimize_flag == "" ]] || optimizer_flags+=("$optimize_flag")
+    [[ $optimize_flag == "" ]] || filename+="_optimize"
 
-    local ir_output
-    ir_output=$(
-        echo "$solidity_code" |
-        msg_on_error --no-stderr "$SOLC" - --ir-optimized --debug-info location "${optimizer_flags[@]}" |
-        sed '/^Optimized IR:$/d'
-    )
+    msg_on_error --no-stderr "$SOLC" --ir-optimized --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
+    sed '/^Optimized IR:$/d' |
+    awk -v RS= "{print > (\"${filename}_\"NR \".yul\")}"
 
-    local asm_output_two_stage asm_output_via_ir
-    asm_output_two_stage=$(
-        echo "$ir_output" |
-        msg_on_error --no-stderr "$SOLC" - --strict-assembly --asm "${optimizer_flags[@]}" |
+    for yul_file in $(find . -name "$filename*.yul" | sort -V); do
+        msg_on_error --no-stderr "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" "$yul_file" |
         sed '/^======= <stdin>/d' |
-        sed '/^Text representation:$/d'
-    )
+        sed '/^Text representation:$/d' >> "${yul_file/.yul/.asm}"
+    done
+
+    local asm_output_two_stage asm_output_via_ir
+    for asm_file in $(find . -name "$filename*.asm" | sort -V); do
+        asm_output_two_stage+=$(sed '/^asm_output_two_stage:$/d' "$asm_file" | sed '/^=======/d')
+    done
+
     asm_output_via_ir=$(
-        echo "$solidity_code" |
-        msg_on_error --no-stderr "$SOLC" - --via-ir --asm --debug-info location "${optimizer_flags[@]}" |
+        msg_on_error --no-stderr "$SOLC" --via-ir --asm --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
         sed '/^======= <stdin>/d' |
-        sed '/^EVM assembly:$/d'
+        sed '/^EVM assembly:$/d' |
+        sed '/^asm_output_via_ir/d' |
+        sed '/^=======/d'
     )
 
     diff_values "$asm_output_two_stage" "$asm_output_via_ir" --ignore-space-change --ignore-blank-lines
 
     local bin_output_two_stage bin_output_via_ir
-    bin_output_two_stage=$(
-        echo "$ir_output" |
-        msg_on_error --no-stderr "$SOLC" - --strict-assembly --bin "${optimizer_flags[@]}" |
-        sed '/^======= <stdin>/d' |
-        sed '/^Binary representation:$/d'
-    )
+
+    for yul_file in $(find . -name "$filename*.yul" | sort -V); do
+        bin_output_two_stage+=$(
+	    msg_on_error --no-stderr "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" |
+            sed '/^======= <stdin>/d' |
+            sed '/^Binary representation:$/d' |
+            sed '/^=======/d'
+        )
+    done
+
     bin_output_via_ir=$(
-        echo "$solidity_code" |
-        msg_on_error --no-stderr "$SOLC" - --via-ir --bin "${optimizer_flags[@]}" |
+        msg_on_error --no-stderr "$SOLC" --via-ir --bin "${optimizer_flags[@]}" "$solidity_file" |
         sed '/^======= <stdin>/d' |
-        sed '/^Binary:$/d'
+        sed '/^Binary:$/d' |
+        sed '/^=======/d'
     )
 
     diff_values "$bin_output_two_stage" "$bin_output_via_ir" --ignore-space-change --ignore-blank-lines
@@ -589,21 +598,25 @@ printTask "Testing assemble, yul, strict-assembly and optimize..."
 )
 
 printTask "Testing the eqivalence of --via-ir and a two-stage compilation..."
+SOLTMPDIR=$(mktemp -d)
 (
-    printTask " - Smoke test"
-    test_via_ir_equivalence "contract C {}"
-
-    printTask " - Smoke test (optimized)"
-    test_via_ir_equivalence "contract C {}" --optimize
+    cd "$SOLTMPDIR"
 
     externalContracts=(
-        deposit_contract.sol
-        FixedFeeRegistrar.sol
-        _stringutils/stringutils.sol
+        externalTests/solc-js/DAO/TokenCreation.sol
+        libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
+        libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
+        libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol
+        libsolidity/semanticTests/externalContracts/deposit_contract.sol
+        libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+        libsolidity/semanticTests/externalContracts/snark.sol
     )
+
     requiresOptimizer=(
-        deposit_contract.sol
-        FixedFeeRegistrar.sol
+        externalTests/solc-js/DAO/TokenCreation.sol
+        libsolidity/semanticTests/externalContracts/deposit_contract.sol
+        libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+        libsolidity/semanticTests/externalContracts/snark.sol
     )
 
     for contractFile in "${externalContracts[@]}"
@@ -611,13 +624,14 @@ printTask "Testing the eqivalence of --via-ir and a two-stage compilation..."
         if ! [[ "${requiresOptimizer[*]}" =~ $contractFile ]]
         then
             printTask " - ${contractFile}"
-            test_via_ir_equivalence "$(cat "${REPO_ROOT}/test/libsolidity/semanticTests/externalContracts/${contractFile}")"
+            test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}"
         fi
 
         printTask " - ${contractFile} (optimized)"
-        test_via_ir_equivalence "$(cat "${REPO_ROOT}/test/libsolidity/semanticTests/externalContracts/${contractFile}")" --optimize
+        test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}" --optimize
     done
 )
+rm -r "$SOLTMPDIR"
 
 printTask "Testing standard input..."
 SOLTMPDIR=$(mktemp -d)

From 755e043a6d4126c66be163685a02e73be84efc8f Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 21 Mar 2022 17:33:11 +0100
Subject: [PATCH 0514/1748] Use error message for unary operators.

---
 libsolidity/analysis/TypeChecker.cpp      | 11 +++++++----
 test/libsolidity/syntaxTests/negation.sol |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index da24782b4c..d83253b29f 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1663,19 +1663,22 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 	else
 		_operation.subExpression().accept(*this);
 	Type const* subExprType = type(_operation.subExpression());
-	Type const* t = type(_operation.subExpression())->unaryOperatorResult(op);
-	if (!t)
+	TypeResult result = type(_operation.subExpression())->unaryOperatorResult(op);
+	if (!result)
 	{
 		string description = "Unary operator " + string(TokenTraits::toString(op)) + " cannot be applied to type " + subExprType->toString();
+		if (!result.message().empty())
+			description += ". " + result.message();
 		if (modifying)
 			// Cannot just report the error, ignore the unary operator, and continue,
 			// because the sub-expression was already processed with requireLValue()
 			m_errorReporter.fatalTypeError(9767_error, _operation.location(), description);
 		else
 			m_errorReporter.typeError(4907_error, _operation.location(), description);
-		t = subExprType;
+		_operation.annotation().type = subExprType;
 	}
-	_operation.annotation().type = t;
+	else
+		_operation.annotation().type = result.get();
 	_operation.annotation().isConstant = false;
 	_operation.annotation().isPure = !modifying && *_operation.subExpression().annotation().isPure;
 	_operation.annotation().isLValue = false;
diff --git a/test/libsolidity/syntaxTests/negation.sol b/test/libsolidity/syntaxTests/negation.sol
index f79920954e..4a9d87b8a0 100644
--- a/test/libsolidity/syntaxTests/negation.sol
+++ b/test/libsolidity/syntaxTests/negation.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4907: (97-99): Unary operator - cannot be applied to type uint256
+// TypeError 4907: (97-99): Unary operator - cannot be applied to type uint256. Unary negation is only allowed for signed integers.

From c7222044a2b0fb0d704c4c8b7795a3f365a4f098 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 29 Mar 2022 16:16:45 +0200
Subject: [PATCH 0515/1748] externalTests.sh: Fix broken ${} syntax in the
 script

---
 test/externalTests.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/test/externalTests.sh b/test/externalTests.sh
index 2c4c6f76cd..89e7515d44 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -37,16 +37,16 @@ verify_input "$@"
 
 printTask "Running external tests..."
 
-"{$REPO_ROOT}/test/externalTests/zeppelin.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/gnosis.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/colony.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/ens.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/trident.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/euler.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/yield-liquidator.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/bleeps.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/pool-together.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/perpetual-pools.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/uniswap.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/prb-math.sh" "$@"
-"{$REPO_ROOT}/test/externalTests/elementfi.sh" "$@"
+"${REPO_ROOT}/test/externalTests/zeppelin.sh" "$@"
+"${REPO_ROOT}/test/externalTests/gnosis.sh" "$@"
+"${REPO_ROOT}/test/externalTests/colony.sh" "$@"
+"${REPO_ROOT}/test/externalTests/ens.sh" "$@"
+"${REPO_ROOT}/test/externalTests/trident.sh" "$@"
+"${REPO_ROOT}/test/externalTests/euler.sh" "$@"
+"${REPO_ROOT}/test/externalTests/yield-liquidator.sh" "$@"
+"${REPO_ROOT}/test/externalTests/bleeps.sh" "$@"
+"${REPO_ROOT}/test/externalTests/pool-together.sh" "$@"
+"${REPO_ROOT}/test/externalTests/perpetual-pools.sh" "$@"
+"${REPO_ROOT}/test/externalTests/uniswap.sh" "$@"
+"${REPO_ROOT}/test/externalTests/prb-math.sh" "$@"
+"${REPO_ROOT}/test/externalTests/elementfi.sh" "$@"

From 6f4844648fede1e0c4020a37d5d4f32f92169412 Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Mon, 28 Mar 2022 13:27:57 -0700
Subject: [PATCH 0516/1748] abstract-contracts.rst: Clarify when a contract may
 or must be marked abstract

---
 docs/contracts/abstract-contracts.rst | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/contracts/abstract-contracts.rst b/docs/contracts/abstract-contracts.rst
index 34792f58c9..fb1beb2dab 100644
--- a/docs/contracts/abstract-contracts.rst
+++ b/docs/contracts/abstract-contracts.rst
@@ -6,12 +6,15 @@
 Abstract Contracts
 ******************
 
-Contracts need to be marked as abstract when at least one of their functions is not implemented.
-Contracts may be marked as abstract even though all functions are implemented.
-
-This can be done by using the ``abstract`` keyword as shown in the following example. Note that this contract needs to be
-defined as abstract, because the function ``utterance()`` was defined, but no implementation was
-provided (no implementation body ``{ }`` was given).
+Contracts must be marked as abstract when at least one of their functions is not implemented or when
+they do not provide arguments for all of their base contract constructors.
+Even if this is not the case, a contract may still be marked abstract, such as when you do not intend
+for the contract to be created directly. Abstract contracts are similar to :ref:`interfaces` but an
+interface is more limited in what it can declare.
+
+An abstract contract is declared using the ``abstract`` keyword as shown in the following example.
+Note that this contract needs to be defined as abstract, because the function ``utterance()`` is declared,
+but no implementation was provided (no implementation body ``{ }`` was given).
 
 .. code-block:: solidity
 

From 2fabb3db8f6bbe90e5c3554087069c2f601bff34 Mon Sep 17 00:00:00 2001
From: dtedesco1 <dtedesco1@gmail.com>
Date: Mon, 4 Apr 2022 13:39:32 +0800
Subject: [PATCH 0517/1748] attempt rebase, fix free function, fix check errors

---
 .../MultiSigWallet/MultiSigWallet.sol         | 81 ++++++++++---------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/test/compilationTests/MultiSigWallet/MultiSigWallet.sol b/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
index b4594344c2..6f1b8a975e 100644
--- a/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
+++ b/test/compilationTests/MultiSigWallet/MultiSigWallet.sol
@@ -88,18 +88,6 @@ contract MultiSigWallet {
         _;
     }
 
-    /// @dev Receive function allows to deposit ether.
-    receive()
-        external
-        payable
-    {
-        if (msg.value > 0)
-            emit Deposit(msg.sender, msg.value);
-    }
-
-    /*
-     * Public functions
-     */
     /// @dev Contract constructor sets initial owners and required number of confirmations.
     /// @param _owners List of initial owners.
     /// @param _required Number of required confirmations.
@@ -115,6 +103,19 @@ contract MultiSigWallet {
         required = _required;
     }
 
+    /// @dev Receive function allows to deposit ether.
+    receive()
+        external
+        payable
+    {
+        if (msg.value > 0)
+            emit Deposit(msg.sender, msg.value);
+    }
+
+    /*
+     * Public functions
+     */
+
     /// @dev Allows to add a new owner. Transaction has to be sent by wallet.
     /// @param owner Address of new owner.
     function addOwner(address owner)
@@ -225,9 +226,9 @@ contract MultiSigWallet {
         notExecuted(transactionId)
     {
         if (isConfirmed(transactionId)) {
-            Transaction storage tx = transactions[transactionId];
-            (tx.executed,) = tx.destination.call{value: tx.value}(tx.data);
-            if (tx.executed)
+            Transaction storage transaction = transactions[transactionId];
+            (transaction.executed,) = transaction.destination.call{value: transaction.value}(transaction.data);
+            if (transaction.executed)
                 emit Execution(transactionId);
             else
                 emit ExecutionFailure(transactionId);
@@ -249,30 +250,7 @@ contract MultiSigWallet {
             if (count == required)
                 return true;
         }
-    }
-
-    /*
-     * Internal functions
-     */
-    /// @dev Adds a new transaction to the transaction mapping, if transaction does not exist yet.
-    /// @param destination Transaction target address.
-    /// @param value Transaction ether value.
-    /// @param data Transaction data payload.
-    /// @return transactionId Returns transaction ID.
-    function addTransaction(address destination, uint value, bytes memory data)
-        internal
-        notNull(destination)
-        returns (uint transactionId)
-    {
-        transactionId = transactionCount;
-        transactions[transactionId] = Transaction({
-            destination: destination,
-            value: value,
-            data: data,
-            executed: false
-        });
-        transactionCount += 1;
-        emit Submission(transactionId);
+        return false;
     }
 
     /*
@@ -362,4 +340,27 @@ contract MultiSigWallet {
         for (i=from; i<to; i++)
             _transactionIds[i - from] = transactionIdsTemp[i];
     }
-}
+    /*
+     * Internal functions
+     */
+    /// @dev Adds a new transaction to the transaction mapping, if transaction does not exist yet.
+    /// @param destination Transaction target address.
+    /// @param value Transaction ether value.
+    /// @param data Transaction data payload.
+    /// @return transactionId Returns transaction ID.
+    function addTransaction(address destination, uint value, bytes memory data)
+        internal
+        notNull(destination)
+        returns (uint transactionId)
+    {
+        transactionId = transactionCount;
+        transactions[transactionId] = Transaction({
+            destination: destination,
+            value: value,
+            data: data,
+            executed: false
+        });
+        transactionCount += 1;
+        emit Submission(transactionId);
+    }
+}
\ No newline at end of file

From 96376264e82ea8f90b4fb18d9cb7c624f0f5281e Mon Sep 17 00:00:00 2001
From: Aisultan Kali <aisultan.kali@gmail.com>
Date: Fri, 22 Oct 2021 02:05:49 +0000
Subject: [PATCH 0518/1748] Set handlers use unified jsonPrint with prettifier
 if needed

---
 Changelog.md                                  |   1 +
 libsolidity/ast/ASTJsonConverter.cpp          |   4 +-
 libsolidity/ast/ASTJsonConverter.h            |   3 +-
 solc/CommandLineInterface.cpp                 |  15 +--
 test/cmdlineTests/asm_json/args               |   2 +-
 .../asm_json_no_pretty_print/args             |   1 +
 .../asm_json_no_pretty_print/input.sol        |   9 ++
 .../asm_json_no_pretty_print/output           |   4 +
 .../ast_compact_json_no_pretty_json/args      |   1 +
 .../ast_compact_json_no_pretty_json/input.sol |   4 +
 .../ast_compact_json_no_pretty_json/output    |   5 +
 .../ast_compact_json_with_base_path/args      |   2 +-
 .../args                                      |   0
 .../input.sol                                 |   0
 .../output                                    |   2 +-
 .../combined_json_no_pretty_print/args        |   1 +
 .../combined_json_no_pretty_print/input.sol   |   3 +
 .../combined_json_no_pretty_print/output      |   1 +
 .../combined_json_with_base_path/args         |   2 +-
 .../combined_json_with_base_path/output       | 112 +++++++++++++++++-
 .../combined_json_with_devdoc/args            |   1 +
 .../combined_json_with_devdoc/input.sol       |   8 ++
 .../combined_json_with_devdoc/output          |  25 ++++
 .../combined_json_with_userdoc/args           |   1 +
 .../combined_json_with_userdoc/input.sol      |   8 ++
 .../combined_json_with_userdoc/output         |  25 ++++
 .../recovery_ast_constructor/args             |   2 +-
 .../standard_json_no_pretty_print/args        |   0
 .../standard_json_no_pretty_print/input.json  |  10 ++
 .../standard_json_no_pretty_print/output.json |   1 +
 .../storage_layout_user_defined/args          |   2 +-
 .../storage_layout_user_defined/output        |  85 ++++++++++++-
 .../args                                      |   1 +
 .../input.sol                                 |   4 +
 .../output                                    |   4 +
 test/libsolidity/ASTJSONTest.cpp              |   3 +-
 36 files changed, 333 insertions(+), 19 deletions(-)
 create mode 100644 test/cmdlineTests/asm_json_no_pretty_print/args
 create mode 100644 test/cmdlineTests/asm_json_no_pretty_print/input.sol
 create mode 100644 test/cmdlineTests/asm_json_no_pretty_print/output
 create mode 100644 test/cmdlineTests/ast_compact_json_no_pretty_json/args
 create mode 100644 test/cmdlineTests/ast_compact_json_no_pretty_json/input.sol
 create mode 100644 test/cmdlineTests/ast_compact_json_no_pretty_json/output
 rename test/cmdlineTests/{pretty_json_combined => combined_json_abi}/args (100%)
 rename test/cmdlineTests/{pretty_json_combined => combined_json_abi}/input.sol (100%)
 rename test/cmdlineTests/{pretty_json_combined => combined_json_abi}/output (70%)
 create mode 100644 test/cmdlineTests/combined_json_no_pretty_print/args
 create mode 100644 test/cmdlineTests/combined_json_no_pretty_print/input.sol
 create mode 100644 test/cmdlineTests/combined_json_no_pretty_print/output
 create mode 100644 test/cmdlineTests/combined_json_with_devdoc/args
 create mode 100644 test/cmdlineTests/combined_json_with_devdoc/input.sol
 create mode 100644 test/cmdlineTests/combined_json_with_devdoc/output
 create mode 100644 test/cmdlineTests/combined_json_with_userdoc/args
 create mode 100644 test/cmdlineTests/combined_json_with_userdoc/input.sol
 create mode 100644 test/cmdlineTests/combined_json_with_userdoc/output
 create mode 100644 test/cmdlineTests/standard_json_no_pretty_print/args
 create mode 100644 test/cmdlineTests/standard_json_no_pretty_print/input.json
 create mode 100644 test/cmdlineTests/standard_json_no_pretty_print/output.json
 create mode 100644 test/cmdlineTests/storage_layout_user_defined_no_pretty_print/args
 create mode 100644 test/cmdlineTests/storage_layout_user_defined_no_pretty_print/input.sol
 create mode 100644 test/cmdlineTests/storage_layout_user_defined_no_pretty_print/output

diff --git a/Changelog.md b/Changelog.md
index 8f666eac19..203081823d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 Compiler Features:
  * Peephole Optimizer: Remove operations without side effects before simple terminations.
  * Assembly-Json: Export: Include source list in `sourceList` field.
+ * Commandline Interface: option ``--pretty-json`` works also with the following options: ``--abi``, ``--asm-json``, ``--ast-compact-json``, ``--devdoc``, ``--storage-layout``, ``--userdoc``.
 
 
 Bugfixes:
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonConverter.cpp
index 4338cc64f5..f75f5bc15c 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonConverter.cpp
@@ -190,9 +190,9 @@ Json::Value ASTJsonConverter::inlineAssemblyIdentifierToJson(pair<yul::Identifie
 	return tuple;
 }
 
-void ASTJsonConverter::print(ostream& _stream, ASTNode const& _node)
+void ASTJsonConverter::print(ostream& _stream, ASTNode const& _node, util::JsonFormat const& _format)
 {
-	_stream << util::jsonPrettyPrint(toJson(_node));
+	_stream << util::jsonPrint(toJson(_node), _format);
 }
 
 Json::Value ASTJsonConverter::toJson(ASTNode const& _node)
diff --git a/libsolidity/ast/ASTJsonConverter.h b/libsolidity/ast/ASTJsonConverter.h
index 56fdb13043..88725299f6 100644
--- a/libsolidity/ast/ASTJsonConverter.h
+++ b/libsolidity/ast/ASTJsonConverter.h
@@ -29,6 +29,7 @@
 #include <liblangutil/Exceptions.h>
 
 #include <json/json.h>
+#include <libsolutil/JSON.h>
 
 #include <algorithm>
 #include <optional>
@@ -58,7 +59,7 @@ class ASTJsonConverter: public ASTConstVisitor
 		std::map<std::string, unsigned> _sourceIndices = std::map<std::string, unsigned>()
 	);
 	/// Output the json representation of the AST to _stream.
-	void print(std::ostream& _stream, ASTNode const& _node);
+	void print(std::ostream& _stream, ASTNode const& _node, util::JsonFormat const& _format);
 	Json::Value toJson(ASTNode const& _node);
 	template <class T>
 	Json::Value toJson(std::vector<ASTPointer<T>> const& _nodes)
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 55b7033927..8cf3a8ebc1 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -317,7 +317,7 @@ void CommandLineInterface::handleABI(string const& _contract)
 	if (!m_options.compiler.outputs.abi)
 		return;
 
-	string data = jsonCompactPrint(removeNullMembers(m_compiler->contractABI(_contract)));
+	string data = jsonPrint(removeNullMembers(m_compiler->contractABI(_contract)), m_options.formatting.json);
 	if (!m_options.output.dir.empty())
 		createFile(m_compiler->filesystemFriendlyName(_contract) + ".abi", data);
 	else
@@ -331,7 +331,7 @@ void CommandLineInterface::handleStorageLayout(string const& _contract)
 	if (!m_options.compiler.outputs.storageLayout)
 		return;
 
-	string data = jsonCompactPrint(removeNullMembers(m_compiler->storageLayout(_contract)));
+	string data = jsonPrint(removeNullMembers(m_compiler->storageLayout(_contract)), m_options.formatting.json);
 	if (!m_options.output.dir.empty())
 		createFile(m_compiler->filesystemFriendlyName(_contract) + "_storage.json", data);
 	else
@@ -361,12 +361,13 @@ void CommandLineInterface::handleNatspec(bool _natspecDev, string const& _contra
 
 	if (enabled)
 	{
-		std::string output = jsonPrettyPrint(
+		std::string output = jsonPrint(
 			removeNullMembers(
 				_natspecDev ?
 				m_compiler->natspecDev(_contract) :
 				m_compiler->natspecUser(_contract)
-			)
+			),
+			m_options.formatting.json
 		);
 
 		if (!m_options.output.dir.empty())
@@ -892,7 +893,7 @@ void CommandLineInterface::handleAst()
 		{
 			stringstream data;
 			string postfix = "";
-			ASTJsonConverter(m_compiler->state(), m_compiler->sourceIndices()).print(data, m_compiler->ast(sourceCode.first));
+			ASTJsonConverter(m_compiler->state(), m_compiler->sourceIndices()).print(data, m_compiler->ast(sourceCode.first), m_options.formatting.json);
 			postfix += "_json";
 			boost::filesystem::path path(sourceCode.first);
 			createFile(path.filename().string() + postfix + ".ast", data.str());
@@ -904,7 +905,7 @@ void CommandLineInterface::handleAst()
 		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
 			sout() << endl << "======= " << sourceCode.first << " =======" << endl;
-			ASTJsonConverter(m_compiler->state(), m_compiler->sourceIndices()).print(sout(), m_compiler->ast(sourceCode.first));
+			ASTJsonConverter(m_compiler->state(), m_compiler->sourceIndices()).print(sout(), m_compiler->ast(sourceCode.first), m_options.formatting.json);
 		}
 	}
 }
@@ -1146,7 +1147,7 @@ void CommandLineInterface::outputCompilationResults()
 		{
 			string ret;
 			if (m_options.compiler.outputs.asmJson)
-				ret = jsonPrettyPrint(removeNullMembers(m_compiler->assemblyJSON(contract)));
+				ret = util::jsonPrint(removeNullMembers(m_compiler->assemblyJSON(contract)), m_options.formatting.json);
 			else
 				ret = m_compiler->assemblyString(contract, m_fileReader.sourceUnits());
 
diff --git a/test/cmdlineTests/asm_json/args b/test/cmdlineTests/asm_json/args
index 8f47136920..dd9e77b16f 100644
--- a/test/cmdlineTests/asm_json/args
+++ b/test/cmdlineTests/asm_json/args
@@ -1 +1 @@
---asm-json
+--asm-json --pretty-json
diff --git a/test/cmdlineTests/asm_json_no_pretty_print/args b/test/cmdlineTests/asm_json_no_pretty_print/args
new file mode 100644
index 0000000000..8f47136920
--- /dev/null
+++ b/test/cmdlineTests/asm_json_no_pretty_print/args
@@ -0,0 +1 @@
+--asm-json
diff --git a/test/cmdlineTests/asm_json_no_pretty_print/input.sol b/test/cmdlineTests/asm_json_no_pretty_print/input.sol
new file mode 100644
index 0000000000..da3a08d7f1
--- /dev/null
+++ b/test/cmdlineTests/asm_json_no_pretty_print/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f(uint x) public pure {
+        x += 42;
+        require(x > 100);
+    }
+}
diff --git a/test/cmdlineTests/asm_json_no_pretty_print/output b/test/cmdlineTests/asm_json_no_pretty_print/output
new file mode 100644
index 0000000000..232d0bdea1
--- /dev/null
+++ b/test/cmdlineTests/asm_json_no_pretty_print/output
@@ -0,0 +1,4 @@
+
+======= asm_json_no_pretty_print/input.sol:C =======
+EVM assembly:
+{".code":[{"begin":60,"end":160,"name":"PUSH","source":0,"value":"80"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"40"},{"begin":60,"end":160,"name":"MSTORE","source":0},{"begin":60,"end":160,"name":"CALLVALUE","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"ISZERO","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"POP","source":0},{"begin":60,"end":160,"name":"PUSH #[$]","source":0,"value":"0000000000000000000000000000000000000000000000000000000000000000"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"PUSH [$]","source":0,"value":"0000000000000000000000000000000000000000000000000000000000000000"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"CODECOPY","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"RETURN","source":0}],".data":{"0":{".auxdata":"<BYTECODE REMOVED>",".code":[{"begin":60,"end":160,"name":"PUSH","source":0,"value":"80"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"40"},{"begin":60,"end":160,"name":"MSTORE","source":0},{"begin":60,"end":160,"name":"CALLVALUE","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"ISZERO","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"POP","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"4"},{"begin":60,"end":160,"name":"CALLDATASIZE","source":0},{"begin":60,"end":160,"name":"LT","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"2"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"CALLDATALOAD","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"E0"},{"begin":60,"end":160,"name":"SHR","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"B3DE648B"},{"begin":60,"end":160,"name":"EQ","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"3"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"2"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"3"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"4"},{"begin":77,"end":158,"name":"PUSH","source":0,"value":"4"},{"begin":77,"end":158,"name":"DUP1","source":0},{"begin":77,"end":158,"name":"CALLDATASIZE","source":0},{"begin":77,"end":158,"name":"SUB","source":0},{"begin":77,"end":158,"name":"DUP2","source":0},{"begin":77,"end":158,"name":"ADD","source":0},{"begin":77,"end":158,"name":"SWAP1","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"5"},{"begin":77,"end":158,"name":"SWAP2","source":0},{"begin":77,"end":158,"name":"SWAP1","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"6"},{"begin":77,"end":158,"jumpType":"[in]","name":"JUMP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"5"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"7"},{"begin":77,"end":158,"jumpType":"[in]","name":"JUMP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"4"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"STOP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"7"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":123,"end":125,"name":"PUSH","source":0,"value":"2A"},{"begin":118,"end":125,"name":"DUP2","source":0},{"begin":118,"end":125,"name":"PUSH [tag]","source":0,"value":"9"},{"begin":118,"end":125,"name":"SWAP2","source":0},{"begin":118,"end":125,"name":"SWAP1","source":0},{"begin":118,"end":125,"name":"PUSH [tag]","source":0,"value":"10"},{"begin":118,"end":125,"jumpType":"[in]","name":"JUMP","source":0},{"begin":118,"end":125,"name":"tag","source":0,"value":"9"},{"begin":118,"end":125,"name":"JUMPDEST","source":0},{"begin":118,"end":125,"name":"SWAP1","source":0},{"begin":118,"end":125,"name":"POP","source":0},{"begin":147,"end":150,"name":"PUSH","source":0,"value":"64"},{"begin":143,"end":144,"name":"DUP2","source":0},{"begin":143,"end":150,"name":"GT","source":0},{"begin":135,"end":151,"name":"PUSH [tag]","source":0,"value":"11"},{"begin":135,"end":151,"name":"JUMPI","source":0},{"begin":135,"end":151,"name":"PUSH","source":0,"value":"0"},{"begin":135,"end":151,"name":"DUP1","source":0},{"begin":135,"end":151,"name":"REVERT","source":0},{"begin":135,"end":151,"name":"tag","source":0,"value":"11"},{"begin":135,"end":151,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"POP","source":0},{"begin":77,"end":158,"jumpType":"[out]","name":"JUMP","source":0},{"begin":88,"end":205,"name":"tag","source":1,"value":"13"},{"begin":88,"end":205,"name":"JUMPDEST","source":1},{"begin":197,"end":198,"name":"PUSH","source":1,"value":"0"},{"begin":194,"end":195,"name":"DUP1","source":1},{"begin":187,"end":199,"name":"REVERT","source":1},{"begin":334,"end":411,"name":"tag","source":1,"value":"15"},{"begin":334,"end":411,"name":"JUMPDEST","source":1},{"begin":371,"end":378,"name":"PUSH","source":1,"value":"0"},{"begin":400,"end":405,"name":"DUP2","source":1},{"begin":389,"end":405,"name":"SWAP1","source":1},{"begin":389,"end":405,"name":"POP","source":1},{"begin":334,"end":411,"name":"SWAP2","source":1},{"begin":334,"end":411,"name":"SWAP1","source":1},{"begin":334,"end":411,"name":"POP","source":1},{"begin":334,"end":411,"jumpType":"[out]","name":"JUMP","source":1},{"begin":417,"end":539,"name":"tag","source":1,"value":"16"},{"begin":417,"end":539,"name":"JUMPDEST","source":1},{"begin":490,"end":514,"name":"PUSH [tag]","source":1,"value":"25"},{"begin":508,"end":513,"name":"DUP2","source":1},{"begin":490,"end":514,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":490,"end":514,"jumpType":"[in]","name":"JUMP","source":1},{"begin":490,"end":514,"name":"tag","source":1,"value":"25"},{"begin":490,"end":514,"name":"JUMPDEST","source":1},{"begin":483,"end":488,"name":"DUP2","source":1},{"begin":480,"end":515,"name":"EQ","source":1},{"begin":470,"end":533,"name":"PUSH [tag]","source":1,"value":"26"},{"begin":470,"end":533,"name":"JUMPI","source":1},{"begin":529,"end":530,"name":"PUSH","source":1,"value":"0"},{"begin":526,"end":527,"name":"DUP1","source":1},{"begin":519,"end":531,"name":"REVERT","source":1},{"begin":470,"end":533,"name":"tag","source":1,"value":"26"},{"begin":470,"end":533,"name":"JUMPDEST","source":1},{"begin":417,"end":539,"name":"POP","source":1},{"begin":417,"end":539,"jumpType":"[out]","name":"JUMP","source":1},{"begin":545,"end":684,"name":"tag","source":1,"value":"17"},{"begin":545,"end":684,"name":"JUMPDEST","source":1},{"begin":591,"end":596,"name":"PUSH","source":1,"value":"0"},{"begin":629,"end":635,"name":"DUP2","source":1},{"begin":616,"end":636,"name":"CALLDATALOAD","source":1},{"begin":607,"end":636,"name":"SWAP1","source":1},{"begin":607,"end":636,"name":"POP","source":1},{"begin":645,"end":678,"name":"PUSH [tag]","source":1,"value":"28"},{"begin":672,"end":677,"name":"DUP2","source":1},{"begin":645,"end":678,"name":"PUSH [tag]","source":1,"value":"16"},{"begin":645,"end":678,"jumpType":"[in]","name":"JUMP","source":1},{"begin":645,"end":678,"name":"tag","source":1,"value":"28"},{"begin":645,"end":678,"name":"JUMPDEST","source":1},{"begin":545,"end":684,"name":"SWAP3","source":1},{"begin":545,"end":684,"name":"SWAP2","source":1},{"begin":545,"end":684,"name":"POP","source":1},{"begin":545,"end":684,"name":"POP","source":1},{"begin":545,"end":684,"jumpType":"[out]","name":"JUMP","source":1},{"begin":690,"end":1019,"name":"tag","source":1,"value":"6"},{"begin":690,"end":1019,"name":"JUMPDEST","source":1},{"begin":749,"end":755,"name":"PUSH","source":1,"value":"0"},{"begin":798,"end":800,"name":"PUSH","source":1,"value":"20"},{"begin":786,"end":795,"name":"DUP3","source":1},{"begin":777,"end":784,"name":"DUP5","source":1},{"begin":773,"end":796,"name":"SUB","source":1},{"begin":769,"end":801,"name":"SLT","source":1},{"begin":766,"end":885,"name":"ISZERO","source":1},{"begin":766,"end":885,"name":"PUSH [tag]","source":1,"value":"30"},{"begin":766,"end":885,"name":"JUMPI","source":1},{"begin":804,"end":883,"name":"PUSH [tag]","source":1,"value":"31"},{"begin":804,"end":883,"name":"PUSH [tag]","source":1,"value":"13"},{"begin":804,"end":883,"jumpType":"[in]","name":"JUMP","source":1},{"begin":804,"end":883,"name":"tag","source":1,"value":"31"},{"begin":804,"end":883,"name":"JUMPDEST","source":1},{"begin":766,"end":885,"name":"tag","source":1,"value":"30"},{"begin":766,"end":885,"name":"JUMPDEST","source":1},{"begin":924,"end":925,"name":"PUSH","source":1,"value":"0"},{"begin":949,"end":1002,"name":"PUSH [tag]","source":1,"value":"32"},{"begin":994,"end":1001,"name":"DUP5","source":1},{"begin":985,"end":991,"name":"DUP3","source":1},{"begin":974,"end":983,"name":"DUP6","source":1},{"begin":970,"end":992,"name":"ADD","source":1},{"begin":949,"end":1002,"name":"PUSH [tag]","source":1,"value":"17"},{"begin":949,"end":1002,"jumpType":"[in]","name":"JUMP","source":1},{"begin":949,"end":1002,"name":"tag","source":1,"value":"32"},{"begin":949,"end":1002,"name":"JUMPDEST","source":1},{"begin":939,"end":1002,"name":"SWAP2","source":1},{"begin":939,"end":1002,"name":"POP","source":1},{"begin":895,"end":1012,"name":"POP","source":1},{"begin":690,"end":1019,"name":"SWAP3","source":1},{"begin":690,"end":1019,"name":"SWAP2","source":1},{"begin":690,"end":1019,"name":"POP","source":1},{"begin":690,"end":1019,"name":"POP","source":1},{"begin":690,"end":1019,"jumpType":"[out]","name":"JUMP","source":1},{"begin":1025,"end":1205,"name":"tag","source":1,"value":"18"},{"begin":1025,"end":1205,"name":"JUMPDEST","source":1},{"begin":1073,"end":1150,"name":"PUSH","source":1,"value":"4E487B7100000000000000000000000000000000000000000000000000000000"},{"begin":1070,"end":1071,"name":"PUSH","source":1,"value":"0"},{"begin":1063,"end":1151,"name":"MSTORE","source":1},{"begin":1170,"end":1174,"name":"PUSH","source":1,"value":"11"},{"begin":1167,"end":1168,"name":"PUSH","source":1,"value":"4"},{"begin":1160,"end":1175,"name":"MSTORE","source":1},{"begin":1194,"end":1198,"name":"PUSH","source":1,"value":"24"},{"begin":1191,"end":1192,"name":"PUSH","source":1,"value":"0"},{"begin":1184,"end":1199,"name":"REVERT","source":1},{"begin":1211,"end":1516,"name":"tag","source":1,"value":"10"},{"begin":1211,"end":1516,"name":"JUMPDEST","source":1},{"begin":1251,"end":1254,"name":"PUSH","source":1,"value":"0"},{"begin":1270,"end":1290,"name":"PUSH [tag]","source":1,"value":"35"},{"begin":1288,"end":1289,"name":"DUP3","source":1},{"begin":1270,"end":1290,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":1270,"end":1290,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1270,"end":1290,"name":"tag","source":1,"value":"35"},{"begin":1270,"end":1290,"name":"JUMPDEST","source":1},{"begin":1265,"end":1290,"name":"SWAP2","source":1},{"begin":1265,"end":1290,"name":"POP","source":1},{"begin":1304,"end":1324,"name":"PUSH [tag]","source":1,"value":"36"},{"begin":1322,"end":1323,"name":"DUP4","source":1},{"begin":1304,"end":1324,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":1304,"end":1324,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1304,"end":1324,"name":"tag","source":1,"value":"36"},{"begin":1304,"end":1324,"name":"JUMPDEST","source":1},{"begin":1299,"end":1324,"name":"SWAP3","source":1},{"begin":1299,"end":1324,"name":"POP","source":1},{"begin":1458,"end":1459,"name":"DUP3","source":1},{"begin":1390,"end":1456,"name":"PUSH","source":1,"value":"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"},{"begin":1386,"end":1460,"name":"SUB","source":1},{"begin":1383,"end":1384,"name":"DUP3","source":1},{"begin":1380,"end":1461,"name":"GT","source":1},{"begin":1377,"end":1484,"name":"ISZERO","source":1},{"begin":1377,"end":1484,"name":"PUSH [tag]","source":1,"value":"37"},{"begin":1377,"end":1484,"name":"JUMPI","source":1},{"begin":1464,"end":1482,"name":"PUSH [tag]","source":1,"value":"38"},{"begin":1464,"end":1482,"name":"PUSH [tag]","source":1,"value":"18"},{"begin":1464,"end":1482,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1464,"end":1482,"name":"tag","source":1,"value":"38"},{"begin":1464,"end":1482,"name":"JUMPDEST","source":1},{"begin":1377,"end":1484,"name":"tag","source":1,"value":"37"},{"begin":1377,"end":1484,"name":"JUMPDEST","source":1},{"begin":1508,"end":1509,"name":"DUP3","source":1},{"begin":1505,"end":1506,"name":"DUP3","source":1},{"begin":1501,"end":1510,"name":"ADD","source":1},{"begin":1494,"end":1510,"name":"SWAP1","source":1},{"begin":1494,"end":1510,"name":"POP","source":1},{"begin":1211,"end":1516,"name":"SWAP3","source":1},{"begin":1211,"end":1516,"name":"SWAP2","source":1},{"begin":1211,"end":1516,"name":"POP","source":1},{"begin":1211,"end":1516,"name":"POP","source":1},{"begin":1211,"end":1516,"jumpType":"[out]","name":"JUMP","source":1}]}},"sourceList":["asm_json_no_pretty_print/input.sol","#utility.yul"]}
diff --git a/test/cmdlineTests/ast_compact_json_no_pretty_json/args b/test/cmdlineTests/ast_compact_json_no_pretty_json/args
new file mode 100644
index 0000000000..f60d99b442
--- /dev/null
+++ b/test/cmdlineTests/ast_compact_json_no_pretty_json/args
@@ -0,0 +1 @@
+--ast-compact-json --allow-paths .
diff --git a/test/cmdlineTests/ast_compact_json_no_pretty_json/input.sol b/test/cmdlineTests/ast_compact_json_no_pretty_json/input.sol
new file mode 100644
index 0000000000..f123f6c8be
--- /dev/null
+++ b/test/cmdlineTests/ast_compact_json_no_pretty_json/input.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {}
diff --git a/test/cmdlineTests/ast_compact_json_no_pretty_json/output b/test/cmdlineTests/ast_compact_json_no_pretty_json/output
new file mode 100644
index 0000000000..abdc17125d
--- /dev/null
+++ b/test/cmdlineTests/ast_compact_json_no_pretty_json/output
@@ -0,0 +1,5 @@
+JSON AST (compact format):
+
+
+======= ast_compact_json_no_pretty_json/input.sol =======
+{"absolutePath":"ast_compact_json_no_pretty_json/input.sol","exportedSymbols":{"C":[2]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":2,"linearizedBaseContracts":[2],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":3,"src":"60:13:0","usedErrors":[]}],"src":"36:38:0"}
diff --git a/test/cmdlineTests/ast_compact_json_with_base_path/args b/test/cmdlineTests/ast_compact_json_with_base_path/args
index 103ae311ab..a30ef24c0e 100644
--- a/test/cmdlineTests/ast_compact_json_with_base_path/args
+++ b/test/cmdlineTests/ast_compact_json_with_base_path/args
@@ -1 +1 @@
---ast-compact-json --base-path . --allow-paths .
+--ast-compact-json --pretty-json --base-path . --allow-paths .
diff --git a/test/cmdlineTests/pretty_json_combined/args b/test/cmdlineTests/combined_json_abi/args
similarity index 100%
rename from test/cmdlineTests/pretty_json_combined/args
rename to test/cmdlineTests/combined_json_abi/args
diff --git a/test/cmdlineTests/pretty_json_combined/input.sol b/test/cmdlineTests/combined_json_abi/input.sol
similarity index 100%
rename from test/cmdlineTests/pretty_json_combined/input.sol
rename to test/cmdlineTests/combined_json_abi/input.sol
diff --git a/test/cmdlineTests/pretty_json_combined/output b/test/cmdlineTests/combined_json_abi/output
similarity index 70%
rename from test/cmdlineTests/pretty_json_combined/output
rename to test/cmdlineTests/combined_json_abi/output
index 6bed3b94dc..c775c6d72c 100644
--- a/test/cmdlineTests/pretty_json_combined/output
+++ b/test/cmdlineTests/combined_json_abi/output
@@ -1,7 +1,7 @@
 {
    "contracts":
    {
-      "pretty_json_combined/input.sol:C":
+      "combined_json_abi/input.sol:C":
       {
          "abi": []
       }
diff --git a/test/cmdlineTests/combined_json_no_pretty_print/args b/test/cmdlineTests/combined_json_no_pretty_print/args
new file mode 100644
index 0000000000..92b1564655
--- /dev/null
+++ b/test/cmdlineTests/combined_json_no_pretty_print/args
@@ -0,0 +1 @@
+--combined-json abi
diff --git a/test/cmdlineTests/combined_json_no_pretty_print/input.sol b/test/cmdlineTests/combined_json_no_pretty_print/input.sol
new file mode 100644
index 0000000000..625af56828
--- /dev/null
+++ b/test/cmdlineTests/combined_json_no_pretty_print/input.sol
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {}
diff --git a/test/cmdlineTests/combined_json_no_pretty_print/output b/test/cmdlineTests/combined_json_no_pretty_print/output
new file mode 100644
index 0000000000..081dc4fa4e
--- /dev/null
+++ b/test/cmdlineTests/combined_json_no_pretty_print/output
@@ -0,0 +1 @@
+{"contracts":{"combined_json_no_pretty_print/input.sol:C":{"abi":[]}},"version": "<VERSION REMOVED>"}
diff --git a/test/cmdlineTests/combined_json_with_base_path/args b/test/cmdlineTests/combined_json_with_base_path/args
index 0dec582bad..4e1f48462b 100644
--- a/test/cmdlineTests/combined_json_with_base_path/args
+++ b/test/cmdlineTests/combined_json_with_base_path/args
@@ -1 +1 @@
---combined-json ast --base-path . --allow-paths .
+--combined-json ast --pretty-json --base-path . --allow-paths .
diff --git a/test/cmdlineTests/combined_json_with_base_path/output b/test/cmdlineTests/combined_json_with_base_path/output
index fe00b71a0c..9acdea5531 100644
--- a/test/cmdlineTests/combined_json_with_base_path/output
+++ b/test/cmdlineTests/combined_json_with_base_path/output
@@ -1 +1,111 @@
-{"contracts":{"combined_json_with_base_path/c.sol:C":{}},"sourceList":["combined_json_with_base_path/c.sol","combined_json_with_base_path/input.sol"],"sources":{"combined_json_with_base_path/c.sol":{"AST":{"absolutePath":"combined_json_with_base_path/c.sol","exportedSymbols":{"C":[5]},"id":6,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":4,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":5,"linearizedBaseContracts":[5],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":6,"src":"60:13:0","usedErrors":[]}],"src":"36:38:0"}},"combined_json_with_base_path/input.sol":{"AST":{"absolutePath":"combined_json_with_base_path/input.sol","exportedSymbols":{"C":[5]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:1"},{"absolutePath":"combined_json_with_base_path/c.sol","file":"./c.sol","id":2,"nameLocation":"-1:-1:-1","nodeType":"ImportDirective","scope":3,"sourceUnit":6,"src":"60:17:1","symbolAliases":[],"unitAlias":""}],"src":"36:42:1"}}},"version": "<VERSION REMOVED>"}
+{
+  "contracts":
+  {
+    "combined_json_with_base_path/c.sol:C": {}
+  },
+  "sourceList":
+  [
+    "combined_json_with_base_path/c.sol",
+    "combined_json_with_base_path/input.sol"
+  ],
+  "sources":
+  {
+    "combined_json_with_base_path/c.sol":
+    {
+      "AST":
+      {
+        "absolutePath": "combined_json_with_base_path/c.sol",
+        "exportedSymbols":
+        {
+          "C":
+          [
+            5
+          ]
+        },
+        "id": 6,
+        "license": "GPL-3.0",
+        "nodeType": "SourceUnit",
+        "nodes":
+        [
+          {
+            "id": 4,
+            "literals":
+            [
+              "solidity",
+              ">=",
+              "0.0"
+            ],
+            "nodeType": "PragmaDirective",
+            "src": "36:22:0"
+          },
+          {
+            "abstract": false,
+            "baseContracts": [],
+            "canonicalName": "C",
+            "contractDependencies": [],
+            "contractKind": "contract",
+            "fullyImplemented": true,
+            "id": 5,
+            "linearizedBaseContracts":
+            [
+              5
+            ],
+            "name": "C",
+            "nameLocation": "69:1:0",
+            "nodeType": "ContractDefinition",
+            "nodes": [],
+            "scope": 6,
+            "src": "60:13:0",
+            "usedErrors": []
+          }
+        ],
+        "src": "36:38:0"
+      }
+    },
+    "combined_json_with_base_path/input.sol":
+    {
+      "AST":
+      {
+        "absolutePath": "combined_json_with_base_path/input.sol",
+        "exportedSymbols":
+        {
+          "C":
+          [
+            5
+          ]
+        },
+        "id": 3,
+        "license": "GPL-3.0",
+        "nodeType": "SourceUnit",
+        "nodes":
+        [
+          {
+            "id": 1,
+            "literals":
+            [
+              "solidity",
+              ">=",
+              "0.0"
+            ],
+            "nodeType": "PragmaDirective",
+            "src": "36:22:1"
+          },
+          {
+            "absolutePath": "combined_json_with_base_path/c.sol",
+            "file": "./c.sol",
+            "id": 2,
+            "nameLocation": "-1:-1:-1",
+            "nodeType": "ImportDirective",
+            "scope": 3,
+            "sourceUnit": 6,
+            "src": "60:17:1",
+            "symbolAliases": [],
+            "unitAlias": ""
+          }
+        ],
+        "src": "36:42:1"
+      }
+    }
+  },
+  "version": "<VERSION REMOVED>"
+}
diff --git a/test/cmdlineTests/combined_json_with_devdoc/args b/test/cmdlineTests/combined_json_with_devdoc/args
new file mode 100644
index 0000000000..dc55cdec72
--- /dev/null
+++ b/test/cmdlineTests/combined_json_with_devdoc/args
@@ -0,0 +1 @@
+--combined-json devdoc --pretty-json --allow-paths .
diff --git a/test/cmdlineTests/combined_json_with_devdoc/input.sol b/test/cmdlineTests/combined_json_with_devdoc/input.sol
new file mode 100644
index 0000000000..6787b59b17
--- /dev/null
+++ b/test/cmdlineTests/combined_json_with_devdoc/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+/// @dev This is devdoc.
+contract C {}
+
+/// And this is a notice.
+contract D {}
diff --git a/test/cmdlineTests/combined_json_with_devdoc/output b/test/cmdlineTests/combined_json_with_devdoc/output
new file mode 100644
index 0000000000..d3df44a90d
--- /dev/null
+++ b/test/cmdlineTests/combined_json_with_devdoc/output
@@ -0,0 +1,25 @@
+{
+  "contracts":
+  {
+    "combined_json_with_devdoc/input.sol:C":
+    {
+      "devdoc":
+      {
+        "details": "This is devdoc.",
+        "kind": "dev",
+        "methods": {},
+        "version": 1
+      }
+    },
+    "combined_json_with_devdoc/input.sol:D":
+    {
+      "devdoc":
+      {
+        "kind": "dev",
+        "methods": {},
+        "version": 1
+      }
+    }
+  },
+  "version": "<VERSION REMOVED>"
+}
diff --git a/test/cmdlineTests/combined_json_with_userdoc/args b/test/cmdlineTests/combined_json_with_userdoc/args
new file mode 100644
index 0000000000..b7c2697aa4
--- /dev/null
+++ b/test/cmdlineTests/combined_json_with_userdoc/args
@@ -0,0 +1 @@
+--combined-json userdoc --pretty-json --allow-paths .
diff --git a/test/cmdlineTests/combined_json_with_userdoc/input.sol b/test/cmdlineTests/combined_json_with_userdoc/input.sol
new file mode 100644
index 0000000000..c6d37c8d40
--- /dev/null
+++ b/test/cmdlineTests/combined_json_with_userdoc/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+/// @notice Description for users.
+contract C {}
+
+/// @dev Description for developers.
+contract D {}
diff --git a/test/cmdlineTests/combined_json_with_userdoc/output b/test/cmdlineTests/combined_json_with_userdoc/output
new file mode 100644
index 0000000000..650981d67c
--- /dev/null
+++ b/test/cmdlineTests/combined_json_with_userdoc/output
@@ -0,0 +1,25 @@
+{
+  "contracts":
+  {
+    "combined_json_with_userdoc/input.sol:C":
+    {
+      "userdoc":
+      {
+        "kind": "user",
+        "methods": {},
+        "notice": "Description for users.",
+        "version": 1
+      }
+    },
+    "combined_json_with_userdoc/input.sol:D":
+    {
+      "userdoc":
+      {
+        "kind": "user",
+        "methods": {},
+        "version": 1
+      }
+    }
+  },
+  "version": "<VERSION REMOVED>"
+}
diff --git a/test/cmdlineTests/recovery_ast_constructor/args b/test/cmdlineTests/recovery_ast_constructor/args
index c7bde99421..8b7c575db0 100644
--- a/test/cmdlineTests/recovery_ast_constructor/args
+++ b/test/cmdlineTests/recovery_ast_constructor/args
@@ -1 +1 @@
---error-recovery --ast-compact-json  --hashes
+--error-recovery --ast-compact-json --pretty-json  --hashes
diff --git a/test/cmdlineTests/standard_json_no_pretty_print/args b/test/cmdlineTests/standard_json_no_pretty_print/args
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/cmdlineTests/standard_json_no_pretty_print/input.json b/test/cmdlineTests/standard_json_no_pretty_print/input.json
new file mode 100644
index 0000000000..e9dc4cf381
--- /dev/null
+++ b/test/cmdlineTests/standard_json_no_pretty_print/input.json
@@ -0,0 +1,10 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract C {}"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_json_no_pretty_print/output.json b/test/cmdlineTests/standard_json_no_pretty_print/output.json
new file mode 100644
index 0000000000..59b90c8cc9
--- /dev/null
+++ b/test/cmdlineTests/standard_json_no_pretty_print/output.json
@@ -0,0 +1 @@
+{"sources":{"A":{"id":0}}}
diff --git a/test/cmdlineTests/storage_layout_user_defined/args b/test/cmdlineTests/storage_layout_user_defined/args
index f69ac4e39c..0538465fe7 100644
--- a/test/cmdlineTests/storage_layout_user_defined/args
+++ b/test/cmdlineTests/storage_layout_user_defined/args
@@ -1 +1 @@
---storage-layout
+--storage-layout --pretty-json
diff --git a/test/cmdlineTests/storage_layout_user_defined/output b/test/cmdlineTests/storage_layout_user_defined/output
index 0f6890daeb..f79b8413e6 100644
--- a/test/cmdlineTests/storage_layout_user_defined/output
+++ b/test/cmdlineTests/storage_layout_user_defined/output
@@ -1,4 +1,87 @@
 
 ======= storage_layout_user_defined/input.sol:C =======
 Contract Storage Layout:
-{"storage":[{"astId":7,"contract":"storage_layout_user_defined/input.sol:C","label":"a","offset":0,"slot":"0","type":"t_userDefinedValueType(MyInt128)2"},{"astId":10,"contract":"storage_layout_user_defined/input.sol:C","label":"b","offset":16,"slot":"0","type":"t_userDefinedValueType(MyInt128)2"},{"astId":13,"contract":"storage_layout_user_defined/input.sol:C","label":"c","offset":0,"slot":"1","type":"t_userDefinedValueType(MyInt128)2"},{"astId":16,"contract":"storage_layout_user_defined/input.sol:C","label":"d","offset":16,"slot":"1","type":"t_userDefinedValueType(MyInt8)4"},{"astId":19,"contract":"storage_layout_user_defined/input.sol:C","label":"e","offset":17,"slot":"1","type":"t_userDefinedValueType(MyInt8)4"},{"astId":22,"contract":"storage_layout_user_defined/input.sol:C","label":"f","offset":18,"slot":"1","type":"t_userDefinedValueType(MyInt8)4"},{"astId":25,"contract":"storage_layout_user_defined/input.sol:C","label":"g","offset":19,"slot":"1","type":"t_userDefinedValueType(MyInt8)4"},{"astId":28,"contract":"storage_layout_user_defined/input.sol:C","label":"h","offset":20,"slot":"1","type":"t_userDefinedValueType(MyInt8)4"}],"types":{"t_userDefinedValueType(MyInt128)2":{"encoding":"inplace","label":"MyInt128","numberOfBytes":"16"},"t_userDefinedValueType(MyInt8)4":{"encoding":"inplace","label":"MyInt8","numberOfBytes":"1"}}}
+{
+  "storage":
+  [
+    {
+      "astId": 7,
+      "contract": "storage_layout_user_defined/input.sol:C",
+      "label": "a",
+      "offset": 0,
+      "slot": "0",
+      "type": "t_userDefinedValueType(MyInt128)2"
+    },
+    {
+      "astId": 10,
+      "contract": "storage_layout_user_defined/input.sol:C",
+      "label": "b",
+      "offset": 16,
+      "slot": "0",
+      "type": "t_userDefinedValueType(MyInt128)2"
+    },
+    {
+      "astId": 13,
+      "contract": "storage_layout_user_defined/input.sol:C",
+      "label": "c",
+      "offset": 0,
+      "slot": "1",
+      "type": "t_userDefinedValueType(MyInt128)2"
+    },
+    {
+      "astId": 16,
+      "contract": "storage_layout_user_defined/input.sol:C",
+      "label": "d",
+      "offset": 16,
+      "slot": "1",
+      "type": "t_userDefinedValueType(MyInt8)4"
+    },
+    {
+      "astId": 19,
+      "contract": "storage_layout_user_defined/input.sol:C",
+      "label": "e",
+      "offset": 17,
+      "slot": "1",
+      "type": "t_userDefinedValueType(MyInt8)4"
+    },
+    {
+      "astId": 22,
+      "contract": "storage_layout_user_defined/input.sol:C",
+      "label": "f",
+      "offset": 18,
+      "slot": "1",
+      "type": "t_userDefinedValueType(MyInt8)4"
+    },
+    {
+      "astId": 25,
+      "contract": "storage_layout_user_defined/input.sol:C",
+      "label": "g",
+      "offset": 19,
+      "slot": "1",
+      "type": "t_userDefinedValueType(MyInt8)4"
+    },
+    {
+      "astId": 28,
+      "contract": "storage_layout_user_defined/input.sol:C",
+      "label": "h",
+      "offset": 20,
+      "slot": "1",
+      "type": "t_userDefinedValueType(MyInt8)4"
+    }
+  ],
+  "types":
+  {
+    "t_userDefinedValueType(MyInt128)2":
+    {
+      "encoding": "inplace",
+      "label": "MyInt128",
+      "numberOfBytes": "16"
+    },
+    "t_userDefinedValueType(MyInt8)4":
+    {
+      "encoding": "inplace",
+      "label": "MyInt8",
+      "numberOfBytes": "1"
+    }
+  }
+}
diff --git a/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/args b/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/args
new file mode 100644
index 0000000000..f69ac4e39c
--- /dev/null
+++ b/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/args
@@ -0,0 +1 @@
+--storage-layout
diff --git a/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/input.sol b/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/input.sol
new file mode 100644
index 0000000000..c80f7c7366
--- /dev/null
+++ b/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/input.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL v3
+pragma solidity >=0.0;
+
+contract C {}
diff --git a/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/output b/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/output
new file mode 100644
index 0000000000..1be4da0b6e
--- /dev/null
+++ b/test/cmdlineTests/storage_layout_user_defined_no_pretty_print/output
@@ -0,0 +1,4 @@
+
+======= storage_layout_user_defined_no_pretty_print/input.sol:C =======
+Contract Storage Layout:
+{"storage":[]}
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index 14e2c2a8a4..a509adde6c 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -20,6 +20,7 @@
 #include <libsolidity/ast/ASTJsonConverter.h>
 #include <libsolutil/AnsiColorized.h>
 #include <libsolutil/CommonIO.h>
+#include <libsolutil/JSON.h>
 
 #include <test/Common.h>
 #include <test/libsolidity/ASTJSONTest.h>
@@ -248,7 +249,7 @@ bool ASTJSONTest::runTest(
 	for (size_t i = 0; i < m_sources.size(); i++)
 	{
 		ostringstream result;
-		ASTJsonConverter(_compiler.state(), _sourceIndices).print(result, _compiler.ast(m_sources[i].first));
+		ASTJsonConverter(_compiler.state(), _sourceIndices).print(result, _compiler.ast(m_sources[i].first), JsonFormat{ JsonFormat::Pretty });
 		_variant.result += result.str();
 		if (i != m_sources.size() - 1)
 			_variant.result += ",";

From 2d07ea3d420f096a4423710a62f5a6464b6c936a Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Tue, 5 Apr 2022 13:38:59 +0200
Subject: [PATCH 0519/1748] Implements $/setTrace and uses trace logging.

For helping the caller to know in advance how many files are expected
with a response for publishDiagnostics.
---
 libsolidity/lsp/LanguageServer.cpp | 23 +++++++++++++++++++++++
 libsolidity/lsp/LanguageServer.h   |  1 +
 libsolidity/lsp/Transport.cpp      | 12 ++++++++++++
 libsolidity/lsp/Transport.h        | 16 ++++++++++++++++
 4 files changed, 52 insertions(+)

diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 671476ab05..8a42ca1049 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -76,6 +76,7 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"exit", [this](auto, auto) { m_state = (m_state == State::ShutdownRequested ? State::ExitRequested : State::ExitWithoutShutdown); }},
 		{"initialize", bind(&LanguageServer::handleInitialize, this, _1, _2)},
 		{"initialized", [](auto, auto) {}},
+		{"$/setTrace", bind(&LanguageServer::setTrace, this, _2)},
 		{"shutdown", [this](auto, auto) { m_state = State::ShutdownRequested; }},
 		{"textDocument/definition", GotoDefinition(*this) },
 		{"textDocument/didOpen", bind(&LanguageServer::handleTextDocumentDidOpen, this, _2)},
@@ -166,6 +167,13 @@ void LanguageServer::compileAndUpdateDiagnostics()
 		diagnosticsBySourceUnit[*location->sourceName].append(jsonDiag);
 	}
 
+	if (m_client.traceValue() != TraceValue::Off)
+	{
+		Json::Value extra;
+		extra["openFileCount"] = Json::UInt64(diagnosticsBySourceUnit.size());
+		m_client.trace("Number of currently open files: " + to_string(diagnosticsBySourceUnit.size()), extra);
+	}
+
 	m_nonemptyDiagnostics.clear();
 	for (auto&& [sourceUnitName, diagnostics]: diagnosticsBySourceUnit)
 	{
@@ -273,6 +281,21 @@ void LanguageServer::handleWorkspaceDidChangeConfiguration(Json::Value const& _a
 		changeConfiguration(_args["settings"]);
 }
 
+void LanguageServer::setTrace(Json::Value const& _args)
+{
+	if (!_args["value"].isString())
+		// Simply ignore invalid parameter.
+		return;
+
+	string const stringValue = _args["value"].asString();
+	if (stringValue == "off")
+		m_client.setTrace(TraceValue::Off);
+	else if (stringValue == "messages")
+		m_client.setTrace(TraceValue::Messages);
+	else if (stringValue == "verbose")
+		m_client.setTrace(TraceValue::Verbose);
+}
+
 void LanguageServer::handleTextDocumentDidOpen(Json::Value const& _args)
 {
 	requireServerInitialized();
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
index d2ad093677..e827f62598 100644
--- a/libsolidity/lsp/LanguageServer.h
+++ b/libsolidity/lsp/LanguageServer.h
@@ -68,6 +68,7 @@ class LanguageServer
 	void requireServerInitialized();
 	void handleInitialize(MessageID _id, Json::Value const& _args);
 	void handleWorkspaceDidChangeConfiguration(Json::Value const& _args);
+	void setTrace(Json::Value const& _args);
 	void handleTextDocumentDidOpen(Json::Value const& _args);
 	void handleTextDocumentDidChange(Json::Value const& _args);
 	void handleTextDocumentDidClose(Json::Value const& _args);
diff --git a/libsolidity/lsp/Transport.cpp b/libsolidity/lsp/Transport.cpp
index fcd3c82492..b82b34ec44 100644
--- a/libsolidity/lsp/Transport.cpp
+++ b/libsolidity/lsp/Transport.cpp
@@ -98,6 +98,18 @@ void IOStreamTransport::error(MessageID _id, ErrorCode _code, string _message)
 	send(move(json), _id);
 }
 
+void Transport::trace(std::string _message, Json::Value _extra)
+{
+	if (m_logTrace != TraceValue::Off)
+	{
+		Json::Value params;
+		if (_extra.isObject())
+			params = move(_extra);
+		params["message"] = move(_message);
+		notify("$/logTrace", move(params));
+	}
+}
+
 void IOStreamTransport::send(Json::Value _json, MessageID _id)
 {
 	solAssert(_json.isObject());
diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h
index 82fe439099..d84edf49d3 100644
--- a/libsolidity/lsp/Transport.h
+++ b/libsolidity/lsp/Transport.h
@@ -34,6 +34,13 @@ namespace solidity::lsp
 
 using MessageID = Json::Value;
 
+enum class TraceValue
+{
+	Off,
+	Messages,
+	Verbose
+};
+
 enum class ErrorCode
 {
 	// Defined by JSON RPC
@@ -89,6 +96,15 @@ class Transport
 	virtual void notify(std::string _method, Json::Value _params) = 0;
 	virtual void reply(MessageID _id, Json::Value _result) = 0;
 	virtual void error(MessageID _id, ErrorCode _code, std::string _message) = 0;
+
+	void trace(std::string _message, Json::Value _extra = Json::nullValue);
+
+	TraceValue traceValue() const noexcept { return m_logTrace; }
+	void setTrace(TraceValue _value) noexcept { m_logTrace = _value; }
+
+
+private:
+	TraceValue m_logTrace = TraceValue::Off;
 };
 
 /**

From ee5e878ad794dd38e778d37099373f3eda762d73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 9 Feb 2022 18:05:38 +0100
Subject: [PATCH 0520/1748] benchmark_diff: A Python script for diffing
 summarized benchmarks from external tests

---
 scripts/externalTests/benchmark_diff.py       | 212 ++++++++++++
 .../summarized-benchmarks-branch.json         | 100 ++++++
 .../summarized-benchmarks-develop.json        |  99 ++++++
 .../test_externalTests_benchmark_diff.py      | 309 ++++++++++++++++++
 4 files changed, 720 insertions(+)
 create mode 100755 scripts/externalTests/benchmark_diff.py
 create mode 100644 test/scripts/fixtures/summarized-benchmarks-branch.json
 create mode 100644 test/scripts/fixtures/summarized-benchmarks-develop.json
 create mode 100644 test/scripts/test_externalTests_benchmark_diff.py

diff --git a/scripts/externalTests/benchmark_diff.py b/scripts/externalTests/benchmark_diff.py
new file mode 100755
index 0000000000..0669e62eba
--- /dev/null
+++ b/scripts/externalTests/benchmark_diff.py
@@ -0,0 +1,212 @@
+#!/usr/bin/env python3
+
+from argparse import ArgumentParser
+from dataclasses import dataclass
+from enum import Enum
+from pathlib import Path
+from typing import Any, Optional, Union
+import json
+import sys
+
+
+class DifferenceStyle(Enum):
+    ABSOLUTE = 'absolute'
+    RELATIVE = 'relative'
+    HUMANIZED = 'humanized'
+
+
+DEFAULT_RELATIVE_PRECISION = 4
+DEFAULT_DIFFERENCE_STYLE = DifferenceStyle.ABSOLUTE
+
+
+class ValidationError(Exception):
+    pass
+
+
+class CommandLineError(ValidationError):
+    pass
+
+
+class BenchmarkDiffer:
+    difference_style: DifferenceStyle
+    relative_precision: Optional[int]
+
+    def __init__(
+        self,
+        difference_style: DifferenceStyle,
+        relative_precision: Optional[int],
+    ):
+        self.difference_style = difference_style
+        self.relative_precision = relative_precision
+
+    def run(self, before: Any, after: Any) -> Optional[Union[dict, str, int, float]]:
+        if not isinstance(before, dict) or not isinstance(after, dict):
+            return self._diff_scalars(before, after)
+
+        if before.get('version') != after.get('version'):
+            return self._humanize_diff('!V')
+
+        diff = {}
+        for key in (set(before) | set(after)) - {'version'}:
+            value_diff = self.run(before.get(key), after.get(key))
+            if value_diff not in [None, {}]:
+                diff[key] = value_diff
+
+        return diff
+
+    def _diff_scalars(self, before: Any, after: Any) -> Optional[Union[str, int, float, dict]]:
+        assert not isinstance(before, dict) or not isinstance(after, dict)
+
+        if before is None and after is None:
+            return {}
+        if before is None:
+            return self._humanize_diff('!B')
+        if after is None:
+            return self._humanize_diff('!A')
+        if not isinstance(before, (int, float)) or not isinstance(after, (int, float)):
+            return self._humanize_diff('!T')
+
+        number_diff = self._diff_numbers(before, after)
+        if self.difference_style != DifferenceStyle.HUMANIZED:
+            return number_diff
+
+        return self._humanize_diff(number_diff)
+
+    def _diff_numbers(self, value_before: Union[int, float], value_after: Union[int, float]) -> Union[str, int, float]:
+        diff: Union[str, int, float]
+
+        if self.difference_style == DifferenceStyle.ABSOLUTE:
+            diff = value_after - value_before
+            if isinstance(diff, float) and diff.is_integer():
+                diff = int(diff)
+
+            return diff
+
+        if value_before == 0:
+            if value_after > 0:
+                return '+INF'
+            elif value_after < 0:
+                return '-INF'
+            else:
+                return 0
+
+        diff = (value_after - value_before) / abs(value_before)
+        if self.relative_precision is not None:
+            rounded_diff = round(diff, self.relative_precision)
+            if rounded_diff == 0 and diff < 0:
+                diff = '-0'
+            elif rounded_diff == 0 and diff > 0:
+                diff = '+0'
+            else:
+                diff = rounded_diff
+
+        if isinstance(diff, float) and diff.is_integer():
+            diff = int(diff)
+
+        return diff
+
+    def _humanize_diff(self, diff: Union[str, int, float]) -> str:
+        if isinstance(diff, str) and diff.startswith('!'):
+            return diff
+
+        value: Union[str, int, float]
+        if isinstance(diff, (int, float)):
+            value = diff * 100
+            if isinstance(value, float) and self.relative_precision is not None:
+                # The multiplication can result in new significant digits appearing. We need to reround.
+                # NOTE: round() works fine with negative precision.
+                value = round(value, self.relative_precision - 2)
+                if isinstance(value, float) and value.is_integer():
+                    value = int(value)
+            prefix = ''
+            if diff < 0:
+                prefix = ''
+            elif diff > 0:
+                prefix = '+'
+        else:
+            value = diff
+            prefix = ''
+
+        return f"{prefix}{value}%"
+
+
+@dataclass(frozen=True)
+class CommandLineOptions:
+    report_before: Path
+    report_after: Path
+    difference_style: DifferenceStyle
+    relative_precision: int
+
+
+def process_commandline() -> CommandLineOptions:
+    script_description = (
+        "Compares summarized benchmark reports and outputs JSON with the same structure but listing only differences."
+    )
+
+    parser = ArgumentParser(description=script_description)
+    parser.add_argument(dest='report_before', help="Path to a JSON file containing original benchmark results.")
+    parser.add_argument(dest='report_after', help="Path to a JSON file containing new benchmark results.")
+    parser.add_argument(
+        '--style',
+        dest='difference_style',
+        choices=[s.value for s in DifferenceStyle],
+        help=(
+            "How to present numeric differences: "
+            f"'{DifferenceStyle.ABSOLUTE.value}' subtracts new from original; "
+            f"'{DifferenceStyle.RELATIVE.value}' also divides by the original; "
+            f"'{DifferenceStyle.HUMANIZED.value}' is like relative but value is a percentage and "
+            "positive/negative changes are emphasized. "
+            f"(default: '{DEFAULT_DIFFERENCE_STYLE}')."
+        )
+    )
+    # NOTE: Negative values are valid for precision. round() handles them in a sensible way.
+    parser.add_argument(
+        '--precision',
+        dest='relative_precision',
+        type=int,
+        default=DEFAULT_RELATIVE_PRECISION,
+        help=(
+            "Number of significant digits for relative differences. "
+            f"Note that with --style={DifferenceStyle.HUMANIZED.value} the rounding is applied "
+            "**before** converting the value to a percentage so you need to add 2. "
+            f"Has no effect when used together with --style={DifferenceStyle.ABSOLUTE.value}. "
+            f"(default: {DEFAULT_RELATIVE_PRECISION})"
+        )
+    )
+
+    options = parser.parse_args()
+
+    if options.difference_style is not None:
+        difference_style = DifferenceStyle(options.difference_style)
+    else:
+        difference_style = DEFAULT_DIFFERENCE_STYLE
+
+    processed_options = CommandLineOptions(
+        report_before=Path(options.report_before),
+        report_after=Path(options.report_after),
+        difference_style=difference_style,
+        relative_precision=options.relative_precision,
+    )
+
+    return processed_options
+
+
+def main():
+    try:
+        options = process_commandline()
+
+        differ = BenchmarkDiffer(options.difference_style, options.relative_precision)
+        diff = differ.run(
+            json.loads(options.report_before.read_text('utf-8')),
+            json.loads(options.report_after.read_text('utf-8')),
+        )
+
+        print(json.dumps(diff, indent=4, sort_keys=True))
+
+        return 0
+    except CommandLineError as exception:
+        print(f"ERROR: {exception}", file=sys.stderr)
+        return 1
+
+if __name__ == "__main__":
+    sys.exit(main())
diff --git a/test/scripts/fixtures/summarized-benchmarks-branch.json b/test/scripts/fixtures/summarized-benchmarks-branch.json
new file mode 100644
index 0000000000..0ba46b87d6
--- /dev/null
+++ b/test/scripts/fixtures/summarized-benchmarks-branch.json
@@ -0,0 +1,100 @@
+{
+    "bleeps": {
+        "ir-optimize-evm+yul": {
+            "bytecode_size": 132868,
+            "deployment_gas": 0,
+            "method_gas": 39289198,
+            "version": "bb90cd0"
+        },
+        "legacy-optimize-evm+yul": {
+            "bytecode_size": 137869,
+            "deployment_gas": 0,
+            "method_gas": 38863224,
+            "version": "bb90cd0"
+        }
+    },
+    "colony": {
+        "legacy-no-optimize": {
+            "bytecode_size": 664190,
+            "deployment_gas": null,
+            "method_gas": null,
+            "version": "573399b"
+        },
+        "legacy-optimize-evm+yul": {
+            "bytecode_size": 363606,
+            "deployment_gas": null,
+            "method_gas": null,
+            "version": "573399b"
+        }
+    },
+    "elementfi": {
+        "legacy-no-optimize": {
+            "bytecode_size": null,
+            "deployment_gas": 69200158,
+            "method_gas": null,
+            "version": "87f8b5e"
+        },
+        "legacy-optimize-evm+yul": {
+            "deployment_gas": 40951128,
+            "version": "87f8b5e"
+        },
+        "ir-optimize-evm-only": {},
+        "ir-no-optimize": {
+            "deployment_gas": null,
+            "method_gas": 2777867251,
+            "version": "87f8b5e"
+        }
+    },
+    "euler": {
+        "ir-no-optimize": {
+            "bytecode_size": 328540,
+            "deployment_gas": 61591870,
+            "method_gas": 3537419168,
+            "version": "2ef99fc"
+        },
+        "legacy-no-optimize": {
+            "bytecode_size": 328540,
+            "deployment_gas": 62590688,
+            "method_gas": 3537419168,
+            "version": "2ef99fc"
+        },
+        "legacy-optimize-evm+yul": {
+            "bytecode_size": 182190,
+            "deployment_gas": 35236828,
+            "method_gas": 2777867251,
+            "version": "2ef99fc"
+        },
+        "legacy-optimize-evm-only": {
+            "bytecode_size": 205211,
+            "deployment_gas": 39459629,
+            "method_gas": 2978467272,
+            "version": "2ef99fc"
+        },
+        "ir-optimize-evm-only": {
+            "bytecode_size": 205211,
+            "deployment_gas": 39459629,
+            "method_gas": 2978467272,
+            "version": "2ef99fc"
+        },
+        "ir-optimize-evm+yul": {
+            "bytecode_size": 205211,
+            "deployment_gas": 39459629,
+            "method_gas": 2777867251
+        }
+    },
+    "gnosis": {
+        "ir-optimize-evm+yul": {
+            "bytecode_size": 56069,
+            "deployment_gas": null,
+            "method_gas": null,
+            "version": "ea09294"
+        }
+    },
+    "zeppelin": {
+        "legacy-optimize-evm+yul": {
+            "bytecode_size": 510428,
+            "deployment_gas": 94501114,
+            "version": "af7ec04"
+        }
+    }
+}
diff --git a/test/scripts/fixtures/summarized-benchmarks-develop.json b/test/scripts/fixtures/summarized-benchmarks-develop.json
new file mode 100644
index 0000000000..1961870f3f
--- /dev/null
+++ b/test/scripts/fixtures/summarized-benchmarks-develop.json
@@ -0,0 +1,99 @@
+{
+    "bleeps": {
+        "ir-optimize-evm+yul": {
+            "bytecode_size": 132165,
+            "deployment_gas": 0,
+            "method_gas": 39289935,
+            "version": "bb90cd0"
+        },
+        "legacy-optimize-evm+yul": {
+            "bytecode_size": 137869,
+            "deployment_gas": 0,
+            "method_gas": 38863224,
+            "version": "bb90cd0"
+        }
+    },
+    "colony": {
+        "ir-optimize-evm+yul": {
+            "bytecode_size": 363606,
+            "deployment_gas": null,
+            "method_gas": null,
+            "version": "573399b"
+        },
+        "legacy-optimize-evm+yul": {
+            "bytecode_size": 363606,
+            "deployment_gas": null,
+            "method_gas": null,
+            "version": "573399b"
+        }
+    },
+    "elementfi": {
+        "legacy-no-optimize": {
+            "bytecode_size": 890560,
+            "deployment_gas": null,
+            "method_gas": null,
+            "version": "87f8b5e"
+        },
+        "legacy-optimize-evm+yul": {
+            "bytecode_size": 536668,
+            "version": "87f8b5e"
+        },
+        "legacy-optimize-evm-only": {},
+        "ir-no-optimize": {
+            "bytecode_size": null,
+            "method_gas": 2777867251,
+            "version": "87f8b5e"
+        }
+    },
+    "euler": {
+        "ir-no-optimize": {
+            "bytecode_size": 323909,
+            "deployment_gas": 61591870,
+            "method_gas": 3452105184,
+            "version": "2ef99fc"
+        },
+        "legacy-no-optimize": {
+            "bytecode_size": 323909,
+            "deployment_gas": 61591870,
+            "method_gas": 3452105184,
+            "version": "c23e8bd"
+        },
+        "legacy-optimize-evm+yul": {
+            "bytecode_size": 182190,
+            "deployment_gas": 35236828,
+            "method_gas": 2777867251,
+            "version": "c23e8bd"
+        },
+        "legacy-optimize-evm-only": {
+            "bytecode_size": 202106,
+            "deployment_gas": 38790600,
+            "method_gas": 2907368790,
+            "version": "v1.2.3"
+        },
+        "ir-optimize-evm-only": {
+            "bytecode_size": 182190,
+            "deployment_gas": 35236828,
+            "method_gas": 2777867251
+        },
+        "ir-optimize-evm+yul": {
+            "bytecode_size": 182190,
+            "deployment_gas": 35236828,
+            "method_gas": 2777867251
+        }
+    },
+    "ens": {
+        "legacy-optimize-evm+yul": {
+            "bytecode_size": 156937,
+            "deployment_gas": 30073789,
+            "method_gas": 105365362,
+            "version": "v0.0.8"
+        }
+    },
+    "zeppelin": {
+        "legacy-optimize-evm+yul": {
+            "bytecode_size": 510428,
+            "deployment_gas": 94501114,
+            "version": "af7ec04"
+        }
+    }
+}
diff --git a/test/scripts/test_externalTests_benchmark_diff.py b/test/scripts/test_externalTests_benchmark_diff.py
new file mode 100644
index 0000000000..b4ccf07450
--- /dev/null
+++ b/test/scripts/test_externalTests_benchmark_diff.py
@@ -0,0 +1,309 @@
+#!/usr/bin/env python3
+
+import json
+import unittest
+
+from unittest_helpers import FIXTURE_DIR, load_fixture
+
+# NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
+# pragma pylint: disable=import-error
+from externalTests.benchmark_diff import BenchmarkDiffer, DifferenceStyle
+# pragma pylint: enable=import-error
+
+SUMMARIZED_BENCHMARKS_DEVELOP_JSON_PATH = FIXTURE_DIR / 'summarized-benchmarks-develop.json'
+SUMMARIZED_BENCHMARKS_BRANCH_JSON_PATH = FIXTURE_DIR / 'summarized-benchmarks-branch.json'
+
+
+class TestBenchmarkDiff(unittest.TestCase):
+    def setUp(self):
+        self.maxDiff = 10000
+
+    def test_benchmark_diff(self):
+        report_before = json.loads(load_fixture(SUMMARIZED_BENCHMARKS_DEVELOP_JSON_PATH))
+        report_after = json.loads(load_fixture(SUMMARIZED_BENCHMARKS_BRANCH_JSON_PATH))
+        expected_diff = {
+            "bleeps": {
+                "ir-optimize-evm+yul": {
+                    # Numerical difference -> negative/positive/zero.
+                    # Zeros are not skipped to differentiate them from missing values.
+                    "bytecode_size": 132868 - 132165,
+                    "deployment_gas": 0,
+                    "method_gas": 39289198 - 39289935,
+                },
+                "legacy-optimize-evm+yul": {
+                    # No differences within preset -> zeros still present.
+                    "bytecode_size": 0,
+                    "deployment_gas": 0,
+                    "method_gas": 0,
+                },
+            },
+            "colony": {
+                # Preset missing on one side -> replace dict with string
+                "ir-optimize-evm+yul": "!A",
+                "legacy-no-optimize": "!B",
+                "legacy-optimize-evm+yul": {
+                    "bytecode_size": 0,
+                    # Attribute missing on both sides -> skip
+                    #"deployment_gas":
+                    #"method_gas":
+                },
+            },
+            "elementfi": {
+                "legacy-no-optimize": {
+                    # Attributes null on one side -> replace value with string
+                    "bytecode_size": "!A",
+                    "deployment_gas": "!B",
+                    # Attribute null on both sides -> skip
+                    #"method_gas":
+                },
+                "legacy-optimize-evm+yul": {
+                    # Attributes missing on one side -> replace value with string
+                    "bytecode_size": "!A",
+                    "deployment_gas": "!B",
+                    # Attribute missing on both sides -> skip
+                    #"method_gas":
+                },
+                "ir-no-optimize": {
+                    # Attributes missing on one side, null on the other -> skip
+                    #"bytecode_size":
+                    #"deployment_gas":
+                    "method_gas": 0,
+                },
+                # Empty preset missing on one side -> replace dict with string
+                "legacy-optimize-evm-only": "!A",
+                "ir-optimize-evm-only": "!B",
+            },
+            "euler": {
+                # Matching versions -> show attributes, skip version
+                "ir-no-optimize": {
+                    "bytecode_size": 328540 - 323909,
+                    "deployment_gas": 0,
+                    "method_gas": 3537419168 - 3452105184,
+                },
+                # Different versions, different values -> replace whole preset with string
+                "legacy-no-optimize": "!V",
+                # Different versions, same values -> replace whole preset with string
+                "legacy-optimize-evm+yul": "!V",
+                # Different versions (not a commit hash), different values -> replace whole preset with string
+                "legacy-optimize-evm-only": "!V",
+                # Version missing on one side -> replace whole preset with string
+                "ir-optimize-evm-only": "!V",
+                # Version missing on both sides -> assume same version
+                "ir-optimize-evm+yul": {
+                    "bytecode_size": 205211 - 182190,
+                    "deployment_gas": 39459629 - 35236828,
+                    "method_gas": 0,
+                },
+            },
+            "zeppelin": {
+                "legacy-optimize-evm+yul": {
+                    # Whole project identical -> attributes still present, with zeros
+                    "bytecode_size": 0,
+                    "deployment_gas": 0,
+                    # Field missing on both sides -> skip
+                    #"method_gas":
+                }
+            },
+            # Empty project missing on one side -> replace its dict with a string
+            "gnosis": "!B",
+            "ens": "!A",
+        }
+        differ = BenchmarkDiffer(DifferenceStyle.ABSOLUTE, None)
+        self.assertEqual(differ.run(report_before, report_after), expected_diff)
+
+
+class TestBenchmarkDiffer(unittest.TestCase):
+    def setUp(self):
+        self.maxDiff = 10000
+
+    @staticmethod
+    def _nest(value, levels):
+        nested_value = value
+        for level in levels:
+            nested_value = {level: nested_value}
+
+        return nested_value
+
+    def _assert_single_value_diff_matches(self, differ, cases, nest_result=True, nestings=None):
+        if nestings is None:
+            nestings = [[], ['p'], ['p', 's'], ['p', 's', 'a']]
+
+        for levels in nestings:
+            for (before, after, expected_diff) in cases:
+                self.assertEqual(
+                    differ.run(self._nest(before, levels), self._nest(after, levels)),
+                    self._nest(expected_diff, levels) if nest_result else expected_diff,
+                    f'Wrong diff for {self._nest(before, levels)} vs {self._nest(after, levels)}'
+                )
+
+    def test_empty(self):
+        for style in DifferenceStyle:
+            differ = BenchmarkDiffer(style, None)
+            self._assert_single_value_diff_matches(differ, [({}, {}, {})], nest_result=False)
+
+    def test_null(self):
+        for style in DifferenceStyle:
+            differ = BenchmarkDiffer(style, None)
+            self._assert_single_value_diff_matches(differ, [(None, None, {})], nest_result=False)
+
+    def test_number_diff_absolute_json(self):
+        self._assert_single_value_diff_matches(
+            BenchmarkDiffer(DifferenceStyle.ABSOLUTE, 4),
+            [
+                (2,   2,    0),
+                (2,   5,    3),
+                (5,   2,   -3),
+                (2.0, 2.0,  0),
+                (2,   2.0,  0),
+                (2.0, 2,    0),
+                (2,   2.5,  2.5 - 2),
+                (2.5, 2,    2 - 2.5),
+
+                (0,   0,    0),
+                (0,   2,    2),
+                (0,   -2,  -2),
+
+                (-3, -1,    2),
+                (-1, -3,   -2),
+                (2,   0,   -2),
+                (-2,  0,    2),
+
+                (1.00006, 1,  1 - 1.00006),
+                (1, 1.00006,  1.00006 - 1),
+                (1.00004, 1, 1 - 1.00004),
+                (1, 1.00004, 1.00004 - 1),
+            ],
+        )
+
+    def test_number_diff_json(self):
+        self._assert_single_value_diff_matches(
+            BenchmarkDiffer(DifferenceStyle.RELATIVE, 4),
+            [
+                (2,   2,   0),
+                (2,   5,   (5 - 2) / 2),
+                (5,   2,   (2 - 5) / 5),
+                (2.0, 2.0, 0),
+                (2,   2.0, 0),
+                (2.0, 2,   0),
+                (2,   2.5, (2.5 - 2) / 2),
+                (2.5, 2,   (2 - 2.5) / 2.5),
+
+                (0,   0,   0),
+                (0,   2,   '+INF'),
+                (0,   -2,  '-INF'),
+
+                (-3, -1,   0.6667),
+                (-1, -3,  -2),
+                (2,   0,  -1),
+                (-2,  0,   1),
+
+                (1.00006, 1,   -0.0001),
+                (1, 1.00006,    0.0001),
+                (1.000004, 1, '-0'),
+                (1, 1.000004, '+0'),
+            ],
+        )
+
+    def test_number_diff_humanized_json(self):
+        self._assert_single_value_diff_matches(
+            BenchmarkDiffer(DifferenceStyle.HUMANIZED, 4),
+            [
+                (2,   2,      '0%'),
+                (2,   5,   '+150%'),
+                (5,   2,    '-60%'),
+                (2.0, 2.0,    '0%'),
+                (2,   2.0,    '0%'),
+                (2.0, 2,      '0%'),
+                (2,   2.5,  '+25%'),
+                (2.5, 2,    '-20%'),
+
+                (0,   0,      '0%'),
+                (0,   2,   '+INF%'),
+                (0,   -2,  '-INF%'),
+
+                (-3, -1, '+66.67%'),
+                (-1, -3,   '-200%'),
+                (2,   0,   '-100%'),
+                (-2,  0,   '+100%'),
+
+                (1.00006, 1,  '-0.01%'),
+                (1, 1.00006,  '+0.01%'),
+                (1.000004, 1,    '-0%'),
+                (1, 1.000004,    '+0%'),
+            ],
+        )
+
+    def test_type_mismatch(self):
+        for style in DifferenceStyle:
+            self._assert_single_value_diff_matches(
+                BenchmarkDiffer(style, 4),
+                [
+                    (1, {}, '!T'),
+                    ({}, 1, '!T'),
+                    (1.5, {}, '!T'),
+                    ({}, 1.5, '!T'),
+                    ('1', {}, '!T'),
+                    ({}, '1', '!T'),
+                    (1, '1', '!T'),
+                    ('1', 1, '!T'),
+                    (1.5, '1', '!T'),
+                    ('1', 1.5, '!T'),
+                    ('1', '1', '!T'),
+                ],
+            )
+
+    def test_version_mismatch(self):
+        for style in DifferenceStyle:
+            self._assert_single_value_diff_matches(
+                BenchmarkDiffer(style, 4),
+                [
+                    ({'a': 123, 'version': 1}, {'a': 123, 'version': 2}, '!V'),
+                    ({'a': 123, 'version': 2}, {'a': 123, 'version': 1}, '!V'),
+                    ({'a': 123, 'version': 'a'}, {'a': 123, 'version': 'b'}, '!V'),
+                    ({'a': 123, 'version': 'a'}, {'a': 123, 'version': 1}, '!V'),
+
+                    ({'a': 'a', 'version': 1}, {'a': 'a', 'version': 2}, '!V'),
+                    ({'a': {}, 'version': 1}, {'a': {}, 'version': 2}, '!V'),
+                    ({'s': {'a': 1}, 'version': 1}, {'s': {'a': 1}, 'version': 2}, '!V'),
+
+                    ({'a': 123, 'version': 1}, {'a': 456, 'version': 2}, '!V'),
+                    ({'a': 'a', 'version': 1}, {'a': 'b', 'version': 2}, '!V'),
+                    ({'s': {'a': 1}, 'version': 1}, {'s': {'a': 2}, 'version': 2}, '!V'),
+                ],
+            )
+
+    def test_missing(self):
+        for style in DifferenceStyle:
+            self._assert_single_value_diff_matches(
+                BenchmarkDiffer(style, None),
+                [
+                    (1, None, '!A'),
+                    (None, 1, '!B'),
+                    ('1', None, '!A'),
+                    (None, '1', '!B'),
+                    ({}, None, '!A'),
+                    (None, {}, '!B'),
+
+                    ({'x': 1}, {}, {'x': '!A'}),
+                    ({}, {'x': 1}, {'x': '!B'}),
+                    ({'x': 1}, {'x': None}, {'x': '!A'}),
+                    ({'x': None}, {'x': 1}, {'x': '!B'}),
+                    ({'x': 1}, {'y': 1}, {'x': '!A', 'y': '!B'}),
+
+                    ({'x': {}}, {}, {'x': '!A'}),
+                    ({}, {'x': {}}, {'x': '!B'}),
+                    ({'p': {'x': {}}}, {}, {'p': '!A'}),
+                    ({}, {'p': {'x': {}}}, {'p': '!B'}),
+                ],
+            )
+
+    def test_missing_vs_null(self):
+        for style in DifferenceStyle:
+            self._assert_single_value_diff_matches(
+                BenchmarkDiffer(style, None),
+                [
+                    ({'a': None}, {}, {}),
+                    ({}, {'a': None}, {}),
+                ],
+                nest_result=False,
+            )

From 8c9856c52c464c598b55e75c7873a27778d9957d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 18 Mar 2022 14:51:11 +0100
Subject: [PATCH 0521/1748] benchmark_diff: Add table mode with support for
 json, console and markdown output

---
 scripts/externalTests/benchmark_diff.py       | 259 +++++++++++-
 ...benchmark-diff-develop-branch-humanized.md |  75 ++++
 .../test_externalTests_benchmark_diff.py      | 371 ++++++++++++++----
 3 files changed, 610 insertions(+), 95 deletions(-)
 create mode 100644 test/scripts/fixtures/summarized-benchmark-diff-develop-branch-humanized.md

diff --git a/scripts/externalTests/benchmark_diff.py b/scripts/externalTests/benchmark_diff.py
index 0669e62eba..234f85ac0e 100755
--- a/scripts/externalTests/benchmark_diff.py
+++ b/scripts/externalTests/benchmark_diff.py
@@ -4,19 +4,44 @@
 from dataclasses import dataclass
 from enum import Enum
 from pathlib import Path
-from typing import Any, Optional, Union
+from textwrap import dedent
+from typing import Any, Mapping, Optional, Set, Sequence, Union
 import json
 import sys
 
 
+class DiffMode(Enum):
+    IN_PLACE = 'inplace'
+    TABLE = 'table'
+
+
 class DifferenceStyle(Enum):
     ABSOLUTE = 'absolute'
     RELATIVE = 'relative'
     HUMANIZED = 'humanized'
 
 
+class OutputFormat(Enum):
+    JSON = 'json'
+    CONSOLE = 'console'
+    MARKDOWN = 'markdown'
+
+
 DEFAULT_RELATIVE_PRECISION = 4
-DEFAULT_DIFFERENCE_STYLE = DifferenceStyle.ABSOLUTE
+
+DEFAULT_DIFFERENCE_STYLE = {
+    DiffMode.IN_PLACE: DifferenceStyle.ABSOLUTE,
+    DiffMode.TABLE: DifferenceStyle.HUMANIZED,
+}
+assert all(t in DiffMode for t in DEFAULT_DIFFERENCE_STYLE)
+assert all(d in DifferenceStyle for d in DEFAULT_DIFFERENCE_STYLE.values())
+
+DEFAULT_OUTPUT_FORMAT = {
+    DiffMode.IN_PLACE: OutputFormat.JSON,
+    DiffMode.TABLE: OutputFormat.CONSOLE,
+}
+assert all(m in DiffMode for m in DEFAULT_OUTPUT_FORMAT)
+assert all(o in OutputFormat for o in DEFAULT_OUTPUT_FORMAT.values())
 
 
 class ValidationError(Exception):
@@ -30,14 +55,17 @@ class CommandLineError(ValidationError):
 class BenchmarkDiffer:
     difference_style: DifferenceStyle
     relative_precision: Optional[int]
+    output_format: OutputFormat
 
     def __init__(
         self,
         difference_style: DifferenceStyle,
         relative_precision: Optional[int],
+        output_format: OutputFormat,
     ):
         self.difference_style = difference_style
         self.relative_precision = relative_precision
+        self.output_format = output_format
 
     def run(self, before: Any, after: Any) -> Optional[Union[dict, str, int, float]]:
         if not isinstance(before, dict) or not isinstance(after, dict):
@@ -106,8 +134,13 @@ def _diff_numbers(self, value_before: Union[int, float], value_after: Union[int,
         return diff
 
     def _humanize_diff(self, diff: Union[str, int, float]) -> str:
+        def wrap(value: str, symbol: str):
+            return f"{symbol}{value}{symbol}"
+
+        markdown = (self.output_format == OutputFormat.MARKDOWN)
+
         if isinstance(diff, str) and diff.startswith('!'):
-            return diff
+            return wrap(diff, '`' if markdown else '')
 
         value: Union[str, int, float]
         if isinstance(diff, (int, float)):
@@ -118,32 +151,209 @@ def _humanize_diff(self, diff: Union[str, int, float]) -> str:
                 value = round(value, self.relative_precision - 2)
                 if isinstance(value, float) and value.is_integer():
                     value = int(value)
+            suffix = ''
             prefix = ''
             if diff < 0:
                 prefix = ''
+                if markdown:
+                    suffix += ' ✅'
             elif diff > 0:
                 prefix = '+'
+                if markdown:
+                    suffix += ' ❌'
+            important = (diff != 0)
         else:
             value = diff
+            important = False
             prefix = ''
+            suffix = ''
+
+        return wrap(
+            wrap(
+                f"{prefix}{value}%{suffix}",
+                '`' if markdown else ''
+            ),
+            '**' if important and markdown else ''
+        )
+
+
+@dataclass(frozen=True)
+class DiffTable:
+    columns: Mapping[str, Sequence[Union[int, float, str]]]
+
+
+class DiffTableSet:
+    table_headers: Sequence[str]
+    row_headers: Sequence[str]
+    column_headers: Sequence[str]
+
+    # Cells is a nested dict rather than a 3D array so that conversion to JSON is straightforward
+    cells: Mapping[str, Mapping[str, Mapping[str, Union[int, float, str]]]] # preset -> project -> attribute
+
+    def __init__(self, diff: dict):
+        self.table_headers = sorted(self._find_all_preset_names(diff))
+        self.column_headers = sorted(self._find_all_attribute_names(diff))
+        self.row_headers = sorted(project for project in diff)
+
+        # All dimensions must have unique values
+        assert len(self.table_headers) == len(set(self.table_headers))
+        assert len(self.column_headers) == len(set(self.column_headers))
+        assert len(self.row_headers) == len(set(self.row_headers))
+
+        self.cells = {
+            preset: {
+                project: {
+                    attribute: self._cell_content(diff, project, preset, attribute)
+                    for attribute in self.column_headers
+                }
+                for project in self.row_headers
+            }
+            for preset in self.table_headers
+        }
+
+    def calculate_row_column_width(self) -> int:
+        return max(len(h) for h in self.row_headers)
+
+    def calculate_column_widths(self, table_header: str) -> Sequence[int]:
+        assert table_header in self.table_headers
+
+        return [
+            max(
+                len(column_header),
+                max(
+                    len(str(self.cells[table_header][row_header][column_header]))
+                    for row_header in self.row_headers
+                )
+            )
+            for column_header in self.column_headers
+        ]
+
+    @classmethod
+    def _find_all_preset_names(cls, diff: dict) -> Set[str]:
+        return {
+            preset
+            for project, project_diff in diff.items()
+            if isinstance(project_diff, dict)
+            for preset in project_diff
+        }
+
+    @classmethod
+    def _find_all_attribute_names(cls, diff: dict) -> Set[str]:
+        return {
+            attribute
+            for project, project_diff in diff.items()
+            if isinstance(project_diff, dict)
+            for preset, preset_diff in project_diff.items()
+            if isinstance(preset_diff, dict)
+            for attribute in preset_diff
+        }
+
+    @classmethod
+    def _cell_content(cls, diff: dict, project: str, preset: str, attribute: str) -> str:
+        assert project in diff
+
+        if isinstance(diff[project], str):
+            return diff[project]
+        if preset not in diff[project]:
+            return ''
+        if isinstance(diff[project][preset], str):
+            return diff[project][preset]
+        if attribute not in diff[project][preset]:
+            return ''
+
+        return diff[project][preset][attribute]
+
+
+class DiffTableFormatter:
+    LEGEND = dedent("""
+        `!V` = version mismatch
+        `!B` = no value in the "before" version
+        `!A` = no value in the "after" version
+        `!T` = one or both values were not numeric and could not be compared
+        `-0` = very small negative value rounded to zero
+        `+0` = very small positive value rounded to zero
+    """)
+
+    @classmethod
+    def run(cls, diff_table_set: DiffTableSet, output_format: OutputFormat):
+        if output_format == OutputFormat.JSON:
+            return json.dumps(diff_table_set.cells, indent=4, sort_keys=True)
+        else:
+            assert output_format in {OutputFormat.CONSOLE, OutputFormat.MARKDOWN}
+
+            output = ''
+            for table_header in diff_table_set.table_headers:
+                column_widths = ([
+                    diff_table_set.calculate_row_column_width(),
+                    *diff_table_set.calculate_column_widths(table_header)
+                ])
+
+                if output_format == OutputFormat.MARKDOWN:
+                    output += f'\n### `{table_header}`\n'
+                else:
+                    output += f'\n{table_header.upper()}\n'
+
+                if output_format == OutputFormat.CONSOLE:
+                    output += cls._format_separator_row(column_widths, output_format) + '\n'
+                output += cls._format_data_row(['project', *diff_table_set.column_headers], column_widths) + '\n'
+                output += cls._format_separator_row(column_widths, output_format) + '\n'
+
+                for row_header in diff_table_set.row_headers:
+                    row = [
+                        diff_table_set.cells[table_header][row_header][column_header]
+                        for column_header in diff_table_set.column_headers
+                    ]
+                    output += cls._format_data_row([row_header, *row], column_widths) + '\n'
+
+                if output_format == OutputFormat.CONSOLE:
+                    output += cls._format_separator_row(column_widths, output_format) + '\n'
+
+            if output_format == OutputFormat.MARKDOWN:
+                output += f'\n{cls.LEGEND}\n'
+            return output
+
+    @classmethod
+    def _format_separator_row(cls, widths: Sequence[int], output_format: OutputFormat):
+        assert output_format in {OutputFormat.CONSOLE, OutputFormat.MARKDOWN}
+
+        if output_format == OutputFormat.MARKDOWN:
+            return '|:' + ':|-'.join('-' * width for width in widths) + ':|'
+        else:
+            return '|-' + '-|-'.join('-' * width for width in widths) + '-|'
 
-        return f"{prefix}{value}%"
+    @classmethod
+    def _format_data_row(cls, cells: Sequence[Union[int, float, str]], widths: Sequence[int]):
+        assert len(cells) == len(widths)
+
+        return '| ' + ' | '.join(str(cell).rjust(width) for cell, width in zip(cells, widths)) + ' |'
 
 
 @dataclass(frozen=True)
 class CommandLineOptions:
+    diff_mode: DiffMode
     report_before: Path
     report_after: Path
     difference_style: DifferenceStyle
     relative_precision: int
+    output_format: OutputFormat
 
 
 def process_commandline() -> CommandLineOptions:
     script_description = (
-        "Compares summarized benchmark reports and outputs JSON with the same structure but listing only differences."
+        "Compares summarized benchmark reports and outputs JSON with the same structure but listing only differences. "
+        "Can also print the output as markdown table and format the values to make differences stand out more."
     )
 
     parser = ArgumentParser(description=script_description)
+    parser.add_argument(
+        dest='diff_mode',
+        choices=[m.value for m in DiffMode],
+        help=(
+            "Diff mode: "
+            f"'{DiffMode.IN_PLACE.value}' preserves input JSON structure and replace values with differences; "
+            f"'{DiffMode.TABLE.value}' creates a table assuming 3-level project/preset/attribute structure."
+        )
+    )
     parser.add_argument(dest='report_before', help="Path to a JSON file containing original benchmark results.")
     parser.add_argument(dest='report_after', help="Path to a JSON file containing new benchmark results.")
     parser.add_argument(
@@ -156,7 +366,8 @@ def process_commandline() -> CommandLineOptions:
             f"'{DifferenceStyle.RELATIVE.value}' also divides by the original; "
             f"'{DifferenceStyle.HUMANIZED.value}' is like relative but value is a percentage and "
             "positive/negative changes are emphasized. "
-            f"(default: '{DEFAULT_DIFFERENCE_STYLE}')."
+            f"(default: '{DEFAULT_DIFFERENCE_STYLE[DiffMode.IN_PLACE]}' in '{DiffMode.IN_PLACE.value}' mode, "
+            f"'{DEFAULT_DIFFERENCE_STYLE[DiffMode.TABLE]}' in '{DiffMode.TABLE.value}' mode)"
         )
     )
     # NOTE: Negative values are valid for precision. round() handles them in a sensible way.
@@ -173,21 +384,47 @@ def process_commandline() -> CommandLineOptions:
             f"(default: {DEFAULT_RELATIVE_PRECISION})"
         )
     )
+    parser.add_argument(
+        '--output-format',
+        dest='output_format',
+        choices=[o.value for o in OutputFormat],
+        help=(
+            "The format to use for the diff: "
+            f"'{OutputFormat.JSON.value}' is raw JSON; "
+            f"'{OutputFormat.CONSOLE.value}' is a table with human-readable values that will look good in the console output. "
+            f"'{OutputFormat.MARKDOWN.value}' is similar '{OutputFormat.CONSOLE.value}' but adjusted to "
+            "render as proper markdown and with extra elements (legend, emoji to make non-zero values stand out more, etc)."
+            f"(default: '{DEFAULT_OUTPUT_FORMAT[DiffMode.IN_PLACE]}' in '{DiffMode.IN_PLACE.value}' mode, "
+            f"'{DEFAULT_OUTPUT_FORMAT[DiffMode.TABLE]}' in '{DiffMode.TABLE.value}' mode)"
+        )
+    )
 
     options = parser.parse_args()
 
     if options.difference_style is not None:
         difference_style = DifferenceStyle(options.difference_style)
     else:
-        difference_style = DEFAULT_DIFFERENCE_STYLE
+        difference_style = DEFAULT_DIFFERENCE_STYLE[DiffMode(options.diff_mode)]
+
+    if options.output_format is not None:
+        output_format = OutputFormat(options.output_format)
+    else:
+        output_format = DEFAULT_OUTPUT_FORMAT[DiffMode(options.diff_mode)]
 
     processed_options = CommandLineOptions(
+        diff_mode=DiffMode(options.diff_mode),
         report_before=Path(options.report_before),
         report_after=Path(options.report_after),
         difference_style=difference_style,
         relative_precision=options.relative_precision,
+        output_format=output_format,
     )
 
+    if processed_options.diff_mode == DiffMode.IN_PLACE and processed_options.output_format != OutputFormat.JSON:
+        raise CommandLineError(
+            f"Only the '{OutputFormat.JSON.value}' output format is supported in the '{DiffMode.IN_PLACE.value}' mode."
+        )
+
     return processed_options
 
 
@@ -195,13 +432,17 @@ def main():
     try:
         options = process_commandline()
 
-        differ = BenchmarkDiffer(options.difference_style, options.relative_precision)
+        differ = BenchmarkDiffer(options.difference_style, options.relative_precision, options.output_format)
         diff = differ.run(
             json.loads(options.report_before.read_text('utf-8')),
             json.loads(options.report_after.read_text('utf-8')),
         )
 
-        print(json.dumps(diff, indent=4, sort_keys=True))
+        if options.diff_mode == DiffMode.IN_PLACE:
+            print(json.dumps(diff, indent=4, sort_keys=True))
+        else:
+            assert options.diff_mode == DiffMode.TABLE
+            print(DiffTableFormatter.run(DiffTableSet(diff), options.output_format))
 
         return 0
     except CommandLineError as exception:
diff --git a/test/scripts/fixtures/summarized-benchmark-diff-develop-branch-humanized.md b/test/scripts/fixtures/summarized-benchmark-diff-develop-branch-humanized.md
new file mode 100644
index 0000000000..ce351a5b70
--- /dev/null
+++ b/test/scripts/fixtures/summarized-benchmark-diff-develop-branch-humanized.md
@@ -0,0 +1,75 @@
+
+### `ir-no-optimize`
+|   project |  bytecode_size | deployment_gas |     method_gas |
+|:---------:|---------------:|---------------:|---------------:|
+|    bleeps |                |                |                |
+|    colony |                |                |                |
+| elementfi |                |                |           `0%` |
+|       ens |           `!A` |           `!A` |           `!A` |
+|     euler | **`+1.43% ❌`** |           `0%` | **`+2.47% ❌`** |
+|    gnosis |           `!B` |           `!B` |           `!B` |
+|  zeppelin |                |                |                |
+
+### `ir-optimize-evm+yul`
+|   project |   bytecode_size |  deployment_gas | method_gas |
+|:---------:|----------------:|----------------:|-----------:|
+|    bleeps |  **`+0.53% ❌`** |            `0%` |      `-0%` |
+|    colony |            `!A` |            `!A` |       `!A` |
+| elementfi |                 |                 |            |
+|       ens |            `!A` |            `!A` |       `!A` |
+|     euler | **`+12.64% ❌`** | **`+11.98% ❌`** |       `0%` |
+|    gnosis |            `!B` |            `!B` |       `!B` |
+|  zeppelin |                 |                 |            |
+
+### `ir-optimize-evm-only`
+|   project | bytecode_size | deployment_gas | method_gas |
+|:---------:|--------------:|---------------:|-----------:|
+|    bleeps |               |                |            |
+|    colony |               |                |            |
+| elementfi |          `!B` |           `!B` |       `!B` |
+|       ens |          `!A` |           `!A` |       `!A` |
+|     euler |          `!V` |           `!V` |       `!V` |
+|    gnosis |          `!B` |           `!B` |       `!B` |
+|  zeppelin |               |                |            |
+
+### `legacy-no-optimize`
+|   project | bytecode_size | deployment_gas | method_gas |
+|:---------:|--------------:|---------------:|-----------:|
+|    bleeps |               |                |            |
+|    colony |          `!B` |           `!B` |       `!B` |
+| elementfi |          `!A` |           `!B` |            |
+|       ens |          `!A` |           `!A` |       `!A` |
+|     euler |          `!V` |           `!V` |       `!V` |
+|    gnosis |          `!B` |           `!B` |       `!B` |
+|  zeppelin |               |                |            |
+
+### `legacy-optimize-evm+yul`
+|   project | bytecode_size | deployment_gas | method_gas |
+|:---------:|--------------:|---------------:|-----------:|
+|    bleeps |          `0%` |           `0%` |       `0%` |
+|    colony |          `0%` |                |            |
+| elementfi |          `!A` |           `!B` |            |
+|       ens |          `!A` |           `!A` |       `!A` |
+|     euler |          `!V` |           `!V` |       `!V` |
+|    gnosis |          `!B` |           `!B` |       `!B` |
+|  zeppelin |          `0%` |           `0%` |            |
+
+### `legacy-optimize-evm-only`
+|   project | bytecode_size | deployment_gas | method_gas |
+|:---------:|--------------:|---------------:|-----------:|
+|    bleeps |               |                |            |
+|    colony |               |                |            |
+| elementfi |          `!A` |           `!A` |       `!A` |
+|       ens |          `!A` |           `!A` |       `!A` |
+|     euler |          `!V` |           `!V` |       `!V` |
+|    gnosis |          `!B` |           `!B` |       `!B` |
+|  zeppelin |               |                |            |
+
+
+`!V` = version mismatch
+`!B` = no value in the "before" version
+`!A` = no value in the "after" version
+`!T` = one or both values were not numeric and could not be compared
+`-0` = very small negative value rounded to zero
+`+0` = very small positive value rounded to zero
+
diff --git a/test/scripts/test_externalTests_benchmark_diff.py b/test/scripts/test_externalTests_benchmark_diff.py
index b4ccf07450..b40db8e633 100644
--- a/test/scripts/test_externalTests_benchmark_diff.py
+++ b/test/scripts/test_externalTests_benchmark_diff.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 
+from textwrap import dedent
 import json
 import unittest
 
@@ -7,12 +8,15 @@
 
 # NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
 # pragma pylint: disable=import-error
-from externalTests.benchmark_diff import BenchmarkDiffer, DifferenceStyle
+from externalTests.benchmark_diff import BenchmarkDiffer, DifferenceStyle, DiffTableSet, DiffTableFormatter, OutputFormat
 # pragma pylint: enable=import-error
 
 SUMMARIZED_BENCHMARKS_DEVELOP_JSON_PATH = FIXTURE_DIR / 'summarized-benchmarks-develop.json'
 SUMMARIZED_BENCHMARKS_BRANCH_JSON_PATH = FIXTURE_DIR / 'summarized-benchmarks-branch.json'
 
+SUMMARIZED_DIFF_HUMANIZED_MD_PATH = FIXTURE_DIR / 'summarized-benchmark-diff-develop-branch-humanized.md'
+SUMMARIZED_DIFF_HUMANIZED_MD = load_fixture(SUMMARIZED_DIFF_HUMANIZED_MD_PATH)
+
 
 class TestBenchmarkDiff(unittest.TestCase):
     def setUp(self):
@@ -108,7 +112,7 @@ def test_benchmark_diff(self):
             "gnosis": "!B",
             "ens": "!A",
         }
-        differ = BenchmarkDiffer(DifferenceStyle.ABSOLUTE, None)
+        differ = BenchmarkDiffer(DifferenceStyle.ABSOLUTE, None, OutputFormat.JSON)
         self.assertEqual(differ.run(report_before, report_after), expected_diff)
 
 
@@ -138,105 +142,137 @@ def _assert_single_value_diff_matches(self, differ, cases, nest_result=True, nes
 
     def test_empty(self):
         for style in DifferenceStyle:
-            differ = BenchmarkDiffer(style, None)
+            differ = BenchmarkDiffer(style, None, OutputFormat.JSON)
             self._assert_single_value_diff_matches(differ, [({}, {}, {})], nest_result=False)
 
     def test_null(self):
         for style in DifferenceStyle:
-            differ = BenchmarkDiffer(style, None)
+            differ = BenchmarkDiffer(style, None, OutputFormat.JSON)
             self._assert_single_value_diff_matches(differ, [(None, None, {})], nest_result=False)
 
     def test_number_diff_absolute_json(self):
-        self._assert_single_value_diff_matches(
-            BenchmarkDiffer(DifferenceStyle.ABSOLUTE, 4),
-            [
-                (2,   2,    0),
-                (2,   5,    3),
-                (5,   2,   -3),
-                (2.0, 2.0,  0),
-                (2,   2.0,  0),
-                (2.0, 2,    0),
-                (2,   2.5,  2.5 - 2),
-                (2.5, 2,    2 - 2.5),
-
-                (0,   0,    0),
-                (0,   2,    2),
-                (0,   -2,  -2),
-
-                (-3, -1,    2),
-                (-1, -3,   -2),
-                (2,   0,   -2),
-                (-2,  0,    2),
-
-                (1.00006, 1,  1 - 1.00006),
-                (1, 1.00006,  1.00006 - 1),
-                (1.00004, 1, 1 - 1.00004),
-                (1, 1.00004, 1.00004 - 1),
-            ],
-        )
+        for output_format in OutputFormat:
+            self._assert_single_value_diff_matches(
+                BenchmarkDiffer(DifferenceStyle.ABSOLUTE, 4, output_format),
+                [
+                    (2,   2,    0),
+                    (2,   5,    3),
+                    (5,   2,   -3),
+                    (2.0, 2.0,  0),
+                    (2,   2.0,  0),
+                    (2.0, 2,    0),
+                    (2,   2.5,  2.5 - 2),
+                    (2.5, 2,    2 - 2.5),
+
+                    (0,   0,    0),
+                    (0,   2,    2),
+                    (0,   -2,  -2),
+
+                    (-3, -1,    2),
+                    (-1, -3,   -2),
+                    (2,   0,   -2),
+                    (-2,  0,    2),
+
+                    (1.00006, 1,  1 - 1.00006),
+                    (1, 1.00006,  1.00006 - 1),
+                    (1.00004, 1, 1 - 1.00004),
+                    (1, 1.00004, 1.00004 - 1),
+                ],
+            )
 
     def test_number_diff_json(self):
-        self._assert_single_value_diff_matches(
-            BenchmarkDiffer(DifferenceStyle.RELATIVE, 4),
-            [
-                (2,   2,   0),
-                (2,   5,   (5 - 2) / 2),
-                (5,   2,   (2 - 5) / 5),
-                (2.0, 2.0, 0),
-                (2,   2.0, 0),
-                (2.0, 2,   0),
-                (2,   2.5, (2.5 - 2) / 2),
-                (2.5, 2,   (2 - 2.5) / 2.5),
-
-                (0,   0,   0),
-                (0,   2,   '+INF'),
-                (0,   -2,  '-INF'),
-
-                (-3, -1,   0.6667),
-                (-1, -3,  -2),
-                (2,   0,  -1),
-                (-2,  0,   1),
-
-                (1.00006, 1,   -0.0001),
-                (1, 1.00006,    0.0001),
-                (1.000004, 1, '-0'),
-                (1, 1.000004, '+0'),
-            ],
-        )
+        for output_format in OutputFormat:
+            self._assert_single_value_diff_matches(
+                BenchmarkDiffer(DifferenceStyle.RELATIVE, 4, output_format),
+                [
+                    (2,   2,   0),
+                    (2,   5,   (5 - 2) / 2),
+                    (5,   2,   (2 - 5) / 5),
+                    (2.0, 2.0, 0),
+                    (2,   2.0, 0),
+                    (2.0, 2,   0),
+                    (2,   2.5, (2.5 - 2) / 2),
+                    (2.5, 2,   (2 - 2.5) / 2.5),
+
+                    (0,   0,   0),
+                    (0,   2,   '+INF'),
+                    (0,   -2,  '-INF'),
+
+                    (-3, -1,   0.6667),
+                    (-1, -3,  -2),
+                    (2,   0,  -1),
+                    (-2,  0,   1),
+
+                    (1.00006, 1,   -0.0001),
+                    (1, 1.00006,    0.0001),
+                    (1.000004, 1, '-0'),
+                    (1, 1.000004, '+0'),
+                ],
+            )
+
+    def test_number_diff_humanized_json_and_console(self):
+        for output_format in [OutputFormat.JSON, OutputFormat.CONSOLE]:
+            self._assert_single_value_diff_matches(
+                BenchmarkDiffer(DifferenceStyle.HUMANIZED, 4, output_format),
+                [
+                    (2,   2,      '0%'),
+                    (2,   5,   '+150%'),
+                    (5,   2,    '-60%'),
+                    (2.0, 2.0,    '0%'),
+                    (2,   2.0,    '0%'),
+                    (2.0, 2,      '0%'),
+                    (2,   2.5,  '+25%'),
+                    (2.5, 2,    '-20%'),
+
+                    (0,   0,      '0%'),
+                    (0,   2,   '+INF%'),
+                    (0,   -2,  '-INF%'),
+
+                    (-3, -1, '+66.67%'),
+                    (-1, -3,   '-200%'),
+                    (2,   0,   '-100%'),
+                    (-2,  0,   '+100%'),
+
+                    (1.00006, 1,  '-0.01%'),
+                    (1, 1.00006,  '+0.01%'),
+                    (1.000004, 1,    '-0%'),
+                    (1, 1.000004,    '+0%'),
+                ],
+            )
 
-    def test_number_diff_humanized_json(self):
+    def test_number_diff_humanized_markdown(self):
         self._assert_single_value_diff_matches(
-            BenchmarkDiffer(DifferenceStyle.HUMANIZED, 4),
+            BenchmarkDiffer(DifferenceStyle.HUMANIZED, 4, OutputFormat.MARKDOWN),
             [
-                (2,   2,      '0%'),
-                (2,   5,   '+150%'),
-                (5,   2,    '-60%'),
-                (2.0, 2.0,    '0%'),
-                (2,   2.0,    '0%'),
-                (2.0, 2,      '0%'),
-                (2,   2.5,  '+25%'),
-                (2.5, 2,    '-20%'),
-
-                (0,   0,      '0%'),
-                (0,   2,   '+INF%'),
-                (0,   -2,  '-INF%'),
-
-                (-3, -1, '+66.67%'),
-                (-1, -3,   '-200%'),
-                (2,   0,   '-100%'),
-                (-2,  0,   '+100%'),
-
-                (1.00006, 1,  '-0.01%'),
-                (1, 1.00006,  '+0.01%'),
-                (1.000004, 1,    '-0%'),
-                (1, 1.000004,    '+0%'),
+                (2,   2,             '`0%`'),
+                (2,   5,   '**`+150% ❌`**'),
+                (5,   2,    '**`-60% ✅`**'),
+                (2.0, 2.0,           '`0%`'),
+                (2,   2.0,           '`0%`'),
+                (2.0, 2,             '`0%`'),
+                (2,   2.5,  '**`+25% ❌`**'),
+                (2.5, 2,    '**`-20% ✅`**'),
+
+                (0,   0,             '`0%`'),
+                (0,   2,          '`+INF%`'),
+                (0,   -2,         '`-INF%`'),
+
+                (-3, -1, '**`+66.67% ❌`**'),
+                (-1, -3,   '**`-200% ✅`**'),
+                (2,   0,   '**`-100% ✅`**'),
+                (-2,  0,   '**`+100% ❌`**'),
+
+                (1.00006, 1,  '**`-0.01% ✅`**'),
+                (1, 1.00006,  '**`+0.01% ❌`**'),
+                (1.000004, 1,           '`-0%`'),
+                (1, 1.000004,           '`+0%`'),
             ],
         )
 
     def test_type_mismatch(self):
         for style in DifferenceStyle:
             self._assert_single_value_diff_matches(
-                BenchmarkDiffer(style, 4),
+                BenchmarkDiffer(style, 4, OutputFormat.JSON),
                 [
                     (1, {}, '!T'),
                     ({}, 1, '!T'),
@@ -255,7 +291,7 @@ def test_type_mismatch(self):
     def test_version_mismatch(self):
         for style in DifferenceStyle:
             self._assert_single_value_diff_matches(
-                BenchmarkDiffer(style, 4),
+                BenchmarkDiffer(style, 4, OutputFormat.JSON),
                 [
                     ({'a': 123, 'version': 1}, {'a': 123, 'version': 2}, '!V'),
                     ({'a': 123, 'version': 2}, {'a': 123, 'version': 1}, '!V'),
@@ -275,7 +311,7 @@ def test_version_mismatch(self):
     def test_missing(self):
         for style in DifferenceStyle:
             self._assert_single_value_diff_matches(
-                BenchmarkDiffer(style, None),
+                BenchmarkDiffer(style, None, OutputFormat.JSON),
                 [
                     (1, None, '!A'),
                     (None, 1, '!B'),
@@ -300,10 +336,173 @@ def test_missing(self):
     def test_missing_vs_null(self):
         for style in DifferenceStyle:
             self._assert_single_value_diff_matches(
-                BenchmarkDiffer(style, None),
+                BenchmarkDiffer(style, None, OutputFormat.JSON),
                 [
                     ({'a': None}, {}, {}),
                     ({}, {'a': None}, {}),
                 ],
                 nest_result=False,
             )
+
+
+class TestDiffTableFormatter(unittest.TestCase):
+    def setUp(self):
+        self.maxDiff = 10000
+
+        self.report_before = {
+            'project A': {
+                'preset X': {'A1':  99, 'A2': 50, 'version': 1},
+                'preset Y': {'A1':   0, 'A2': 50, 'version': 1},
+            },
+            'project B': {
+                'preset X': {           'A2': 50},
+                'preset Y': {'A1':   0},
+            },
+            'project C': {
+                'preset X': {'A1':   0, 'A2': 50, 'version': 1},
+            },
+            'project D': {
+                'preset X': {'A1': 999},
+            },
+        }
+        self.report_after = {
+            'project A': {
+                'preset X': {'A1': 100, 'A2':  50, 'version': 1},
+                'preset Y': {'A1': 500, 'A2': 500, 'version': 2},
+            },
+            'project B': {
+                'preset X': {'A1':   0},
+                'preset Y': {           'A2': 50},
+            },
+            'project C': {
+                'preset Y': {'A1':   0, 'A2': 50, 'version': 1},
+            },
+            'project E': {
+                'preset Y': {           'A2': 999},
+            },
+        }
+
+    def test_diff_table_formatter(self):
+        report_before = json.loads(load_fixture(SUMMARIZED_BENCHMARKS_DEVELOP_JSON_PATH))
+        report_after = json.loads(load_fixture(SUMMARIZED_BENCHMARKS_BRANCH_JSON_PATH))
+        differ = BenchmarkDiffer(DifferenceStyle.HUMANIZED, 4, OutputFormat.MARKDOWN)
+        diff = differ.run(report_before, report_after)
+
+        self.assertEqual(DiffTableFormatter.run(DiffTableSet(diff), OutputFormat.MARKDOWN), SUMMARIZED_DIFF_HUMANIZED_MD)
+
+    def test_diff_table_formatter_json_absolute(self):
+        differ = BenchmarkDiffer(DifferenceStyle.ABSOLUTE, 4, OutputFormat.JSON)
+        diff = differ.run(self.report_before, self.report_after)
+
+        expected_formatted_table = dedent("""\
+            {
+                "preset X": {
+                    "project A": {
+                        "A1": 1,
+                        "A2": 0
+                    },
+                    "project B": {
+                        "A1": "!B",
+                        "A2": "!A"
+                    },
+                    "project C": {
+                        "A1": "!A",
+                        "A2": "!A"
+                    },
+                    "project D": {
+                        "A1": "!A",
+                        "A2": "!A"
+                    },
+                    "project E": {
+                        "A1": "!B",
+                        "A2": "!B"
+                    }
+                },
+                "preset Y": {
+                    "project A": {
+                        "A1": "!V",
+                        "A2": "!V"
+                    },
+                    "project B": {
+                        "A1": "!A",
+                        "A2": "!B"
+                    },
+                    "project C": {
+                        "A1": "!B",
+                        "A2": "!B"
+                    },
+                    "project D": {
+                        "A1": "!A",
+                        "A2": "!A"
+                    },
+                    "project E": {
+                        "A1": "!B",
+                        "A2": "!B"
+                    }
+                }
+            }"""
+        )
+        self.assertEqual(DiffTableFormatter.run(DiffTableSet(diff), OutputFormat.JSON), expected_formatted_table)
+
+    def test_diff_table_formatter_console_relative(self):
+        differ = BenchmarkDiffer(DifferenceStyle.RELATIVE, 4, OutputFormat.CONSOLE)
+        diff = differ.run(self.report_before, self.report_after)
+
+        expected_formatted_table = dedent("""
+            PRESET X
+            |-----------|--------|----|
+            |   project |     A1 | A2 |
+            |-----------|--------|----|
+            | project A | 0.0101 |  0 |
+            | project B |     !B | !A |
+            | project C |     !A | !A |
+            | project D |     !A | !A |
+            | project E |     !B | !B |
+            |-----------|--------|----|
+
+            PRESET Y
+            |-----------|----|----|
+            |   project | A1 | A2 |
+            |-----------|----|----|
+            | project A | !V | !V |
+            | project B | !A | !B |
+            | project C | !B | !B |
+            | project D | !A | !A |
+            | project E | !B | !B |
+            |-----------|----|----|
+        """)
+        self.assertEqual(DiffTableFormatter.run(DiffTableSet(diff), OutputFormat.CONSOLE), expected_formatted_table)
+
+    def test_diff_table_formatter_markdown_humanized(self):
+        differ = BenchmarkDiffer(DifferenceStyle.HUMANIZED, 4, OutputFormat.MARKDOWN)
+        diff = differ.run(self.report_before, self.report_after)
+
+        expected_formatted_table = dedent("""
+            ### `preset X`
+            |   project |             A1 |   A2 |
+            |:---------:|---------------:|-----:|
+            | project A | **`+1.01% ❌`** | `0%` |
+            | project B |           `!B` | `!A` |
+            | project C |           `!A` | `!A` |
+            | project D |           `!A` | `!A` |
+            | project E |           `!B` | `!B` |
+
+            ### `preset Y`
+            |   project |   A1 |   A2 |
+            |:---------:|-----:|-----:|
+            | project A | `!V` | `!V` |
+            | project B | `!A` | `!B` |
+            | project C | `!B` | `!B` |
+            | project D | `!A` | `!A` |
+            | project E | `!B` | `!B` |
+
+
+            `!V` = version mismatch
+            `!B` = no value in the "before" version
+            `!A` = no value in the "after" version
+            `!T` = one or both values were not numeric and could not be compared
+            `-0` = very small negative value rounded to zero
+            `+0` = very small positive value rounded to zero
+
+        """)
+        self.assertEqual(DiffTableFormatter.run(DiffTableSet(diff), OutputFormat.MARKDOWN), expected_formatted_table)

From 3a17274691210191a6a407e7314a3070af87233c Mon Sep 17 00:00:00 2001
From: Ryan <ryan.guo99@gmail.com>
Date: Thu, 31 Mar 2022 20:36:45 -0500
Subject: [PATCH 0522/1748] Improve error message for static array with size
 too large

---
 libsolidity/analysis/DeclarationTypeChecker.cpp  |  8 +++++++-
 .../array/length/bytes32_too_large.sol           |  2 +-
 .../array/length/bytes32_too_large_multidim.sol  |  2 +-
 .../array/length/literal_conversion.sol          | 16 ++++++++++++++++
 .../syntaxTests/array/length/too_large.sol       |  5 ++++-
 .../array/length/uint_too_large_multidim.sol     |  2 +-
 6 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/array/length/literal_conversion.sol

diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index 4fb2104352..54a7354e29 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -297,7 +297,7 @@ void DeclarationTypeChecker::endVisit(ArrayTypeName const& _typeName)
 		else if (optional<ConstantEvaluator::TypedRational> value = ConstantEvaluator::evaluate(m_errorReporter, *length))
 			lengthValue = value->value;
 
-		if (!lengthValue || lengthValue > TypeProvider::uint256()->max())
+		if (!lengthValue)
 			m_errorReporter.typeError(
 				5462_error,
 				length->location(),
@@ -309,6 +309,12 @@ void DeclarationTypeChecker::endVisit(ArrayTypeName const& _typeName)
 			m_errorReporter.typeError(3208_error, length->location(), "Array with fractional length specified.");
 		else if (*lengthValue < 0)
 			m_errorReporter.typeError(3658_error, length->location(), "Array with negative length specified.");
+		else if (lengthValue > TypeProvider::uint256()->max())
+			m_errorReporter.typeError(
+				1847_error,
+				length->location(),
+				"Array length too large, maximum is 2**256 - 1."
+			);
 
 		_typeName.annotation().type = TypeProvider::array(
 			DataLocation::Storage,
diff --git a/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol b/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol
index 37f1948999..8ab6419849 100644
--- a/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol
+++ b/test/libsolidity/syntaxTests/array/length/bytes32_too_large.sol
@@ -2,4 +2,4 @@ contract C {
     bytes32[8**90] ids;
 }
 // ----
-// TypeError 5462: (25-30): Invalid array length, expected integer literal or constant expression.
+// TypeError 1847: (25-30): Array length too large, maximum is 2**256 - 1.
diff --git a/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol b/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol
index 1a4e7f64ca..8a7eeb4d56 100644
--- a/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol
+++ b/test/libsolidity/syntaxTests/array/length/bytes32_too_large_multidim.sol
@@ -2,4 +2,4 @@ contract C {
     bytes32[8**90][500] ids;
 }
 // ----
-// TypeError 5462: (25-30): Invalid array length, expected integer literal or constant expression.
+// TypeError 1847: (25-30): Array length too large, maximum is 2**256 - 1.
diff --git a/test/libsolidity/syntaxTests/array/length/literal_conversion.sol b/test/libsolidity/syntaxTests/array/length/literal_conversion.sol
new file mode 100644
index 0000000000..cf769f3379
--- /dev/null
+++ b/test/libsolidity/syntaxTests/array/length/literal_conversion.sol
@@ -0,0 +1,16 @@
+contract C {
+    uint[uint(1)] valid_size_invalid_expr1;
+    uint[uint(2**256-1)] valid_size_invalid_expr2;
+    uint[uint(2**256)] invalid_size_invalid_expr3;
+
+    uint[int(1)] valid_size_invalid_expr4;
+    uint[int(2**256-1)] valid_size_invalid_expr5;
+    uint[int(2**256)] invalid_size_invalid_expr6;
+}
+// ----
+// TypeError 5462: (22-29): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (66-80): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (117-129): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (169-175): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (212-225): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (262-273): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/array/length/too_large.sol b/test/libsolidity/syntaxTests/array/length/too_large.sol
index 687e80303c..7d59fd86cb 100644
--- a/test/libsolidity/syntaxTests/array/length/too_large.sol
+++ b/test/libsolidity/syntaxTests/array/length/too_large.sol
@@ -1,5 +1,8 @@
 contract C {
     uint[8**90] ids;
+    uint[2**256-1] okay;
+    uint[2**256] tooLarge;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 1847: (22-27): Array length too large, maximum is 2**256 - 1.
+// TypeError 1847: (68-74): Array length too large, maximum is 2**256 - 1.
diff --git a/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol b/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol
index 6ea3eda505..f3e249f839 100644
--- a/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol
+++ b/test/libsolidity/syntaxTests/array/length/uint_too_large_multidim.sol
@@ -2,4 +2,4 @@ contract C {
     uint[8**90][500] ids;
 }
 // ----
-// TypeError 5462: (22-27): Invalid array length, expected integer literal or constant expression.
+// TypeError 1847: (22-27): Array length too large, maximum is 2**256 - 1.

From fd0df0b05d72b58a52e7159ee46f208c75c6ef8a Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Tue, 5 Apr 2022 12:19:59 -0700
Subject: [PATCH 0523/1748] Update inheritance.rst

---
 docs/contracts/inheritance.rst | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/docs/contracts/inheritance.rst b/docs/contracts/inheritance.rst
index 54817837c4..25838f3c58 100644
--- a/docs/contracts/inheritance.rst
+++ b/docs/contracts/inheritance.rst
@@ -443,7 +443,7 @@ cannot be assigned valid values from outside but only through the constructors o
     ``internal`` or ``public``.
 
 
-.. index:: ! base;constructor
+.. index:: ! base;constructor, inheritance list, contract;abstract, abstract contract
 
 Arguments for Base Constructors
 ===============================
@@ -467,11 +467,20 @@ derived contracts need to specify all of them. This can be done in two ways:
         constructor() {}
     }
 
-    // or through a "modifier" of the derived constructor.
+    // or through a "modifier" of the derived constructor...
     contract Derived2 is Base {
         constructor(uint y) Base(y * y) {}
     }
 
+    // or declare abstract...
+    abstract contract Derived3 is Base {
+    }
+
+    // and have the next concrete derived contract initialize it.
+    contract DerivedFromDerived is Derived3 {
+        constructor() Base(10 + 10) {}
+    }
+
 One way is directly in the inheritance list (``is Base(7)``).  The other is in
 the way a modifier is invoked as part of
 the derived constructor (``Base(y * y)``). The first way to
@@ -484,7 +493,12 @@ inheritance list or in modifier-style in the derived constructor.
 Specifying arguments in both places is an error.
 
 If a derived contract does not specify the arguments to all of its base
-contracts' constructors, it will be abstract.
+contracts' constructors, it must be declared abstract. In that case, when
+another contract derives from it, that other contract's inheritance list
+or constructor must provide the necessary parameters
+for all base classes that haven't had their parameters specified (otherwise,
+that other contract must be declared abstract as well). For example, in the above
+code snippet, see ``Derived3`` and ``DerivedFromDerived``.
 
 .. index:: ! inheritance;multiple, ! linearization, ! C3 linearization
 

From 44093f2ed63782e02ee3611e701c92b2bdf9bd0c Mon Sep 17 00:00:00 2001
From: a3d4 <a3d4@pm.me>
Date: Wed, 6 Apr 2022 01:34:58 +0200
Subject: [PATCH 0524/1748] Fix MSVC Debug crash

---
 libyul/optimiser/StructuralSimplifier.cpp | 43 +++++++++++++----------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/libyul/optimiser/StructuralSimplifier.cpp b/libyul/optimiser/StructuralSimplifier.cpp
index ca8f942392..0b80c42cdb 100644
--- a/libyul/optimiser/StructuralSimplifier.cpp
+++ b/libyul/optimiser/StructuralSimplifier.cpp
@@ -93,26 +93,31 @@ void StructuralSimplifier::operator()(Block& _block)
 
 void StructuralSimplifier::simplify(std::vector<yul::Statement>& _statements)
 {
-	util::GenericVisitor visitor{
-		util::VisitorFallback<OptionalStatements>{},
-		[&](If& _ifStmt) -> OptionalStatements {
-			if (expressionAlwaysTrue(*_ifStmt.condition))
-				return {std::move(_ifStmt.body.statements)};
-			else if (expressionAlwaysFalse(*_ifStmt.condition))
-				return {vector<Statement>{}};
-			return {};
-		},
-		[&](Switch& _switchStmt) -> OptionalStatements {
-			if (std::optional<u256> const constExprVal = hasLiteralValue(*_switchStmt.expression))
-				return replaceConstArgSwitch(_switchStmt, constExprVal.value());
-			return {};
-		},
-		[&](ForLoop& _forLoop) -> OptionalStatements {
-			if (expressionAlwaysFalse(*_forLoop.condition))
-				return {std::move(_forLoop.pre.statements)};
-			return {};
-		}
+	// Explicit local variables ifLambda, switchLambda, forLoopLambda are created to avoid MSVC C++17 Debug test crash
+	// (Run-Time Check Failure #2 - Stack around the variable '....' was corrupted).
+	// As soon as the issue is fixed, this workaround can be removed.
+	auto ifLambda = [&](If& _ifStmt) -> OptionalStatements
+	{
+		if (expressionAlwaysTrue(*_ifStmt.condition))
+			return {std::move(_ifStmt.body.statements)};
+		else if (expressionAlwaysFalse(*_ifStmt.condition))
+			return {vector<Statement>{}};
+		return {};
+	};
+	auto switchLambda = [&](Switch& _switchStmt) -> OptionalStatements
+	{
+		if (std::optional<u256> const constExprVal = hasLiteralValue(*_switchStmt.expression))
+			return replaceConstArgSwitch(_switchStmt, constExprVal.value());
+		return {};
 	};
+	auto forLoopLambda = [&](ForLoop& _forLoop) -> OptionalStatements
+	{
+		if (expressionAlwaysFalse(*_forLoop.condition))
+			return {std::move(_forLoop.pre.statements)};
+		return {};
+	};
+
+	util::GenericVisitor visitor{util::VisitorFallback<OptionalStatements>{}, ifLambda, switchLambda, forLoopLambda};
 
 	util::iterateReplacing(
 		_statements,

From 4d8a34370e9f433de9f773718fafe88021b5cf3f Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Tue, 5 Apr 2022 09:06:04 +0200
Subject: [PATCH 0525/1748] Create split_on_empty_lines_into_numbered_files
 function in scripts/common.sh

---
 scripts/common.sh    |  9 +++++++++
 test/cmdlineTests.sh | 39 ++++++++++++++++++---------------------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index 7cb96ed02b..1ea0e1fc1f 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -246,3 +246,12 @@ function first_word
 
     echo "$words" | cut -d " " -f 1
 }
+
+# Function reads from stdin. Therefore it has to be used with pipes.
+function split_on_empty_lines_into_numbered_files
+{
+    path_prefix="${1}"
+    path_suffix="${2}"
+
+    awk -v RS= "{print > (\"${path_prefix}_\"NR \"${path_suffix}\")}"
+}
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 8b6f646305..91b233b89e 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -310,6 +310,9 @@ function test_solc_assembly_output
 
 function test_via_ir_equivalence()
 {
+    SOLTMPDIR=$(mktemp -d)
+    pushd "$SOLTMPDIR"
+
     (( $# <= 2 )) || fail "This function accepts at most two arguments."
 
     if [[ $2 != --optimize ]] && [[ $2 != "" ]]
@@ -320,56 +323,54 @@ function test_via_ir_equivalence()
     local solidity_file="$1"
     local optimize_flag="$2"
 
-    filename=$(basename "$1" .sol)
+    output_file_prefix=$(basename "$1" .sol)
 
     local optimizer_flags=()
     [[ $optimize_flag == "" ]] || optimizer_flags+=("$optimize_flag")
-    [[ $optimize_flag == "" ]] || filename+="_optimize"
+    [[ $optimize_flag == "" ]] || output_file_prefix+="_optimize"
 
     msg_on_error --no-stderr "$SOLC" --ir-optimized --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
-    sed '/^Optimized IR:$/d' |
-    awk -v RS= "{print > (\"${filename}_\"NR \".yul\")}"
+        sed '/^Optimized IR:$/d' |
+        split_on_empty_lines_into_numbered_files $output_file_prefix ".yul"
 
-    for yul_file in $(find . -name "$filename*.yul" | sort -V); do
+    for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
         msg_on_error --no-stderr "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" "$yul_file" |
-        sed '/^======= <stdin>/d' |
-        sed '/^Text representation:$/d' >> "${yul_file/.yul/.asm}"
+            sed '/^Text representation:$/d' > "${yul_file/.yul/.asm}"
     done
 
     local asm_output_two_stage asm_output_via_ir
-    for asm_file in $(find . -name "$filename*.asm" | sort -V); do
+    for asm_file in $(find . -name "${output_file_prefix}*.asm" | sort -V); do
         asm_output_two_stage+=$(sed '/^asm_output_two_stage:$/d' "$asm_file" | sed '/^=======/d')
     done
 
     asm_output_via_ir=$(
         msg_on_error --no-stderr "$SOLC" --via-ir --asm --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
-        sed '/^======= <stdin>/d' |
-        sed '/^EVM assembly:$/d' |
-        sed '/^asm_output_via_ir/d' |
-        sed '/^=======/d'
+            sed '/^EVM assembly:$/d' |
+            sed '/^=======/d'
     )
 
     diff_values "$asm_output_two_stage" "$asm_output_via_ir" --ignore-space-change --ignore-blank-lines
 
     local bin_output_two_stage bin_output_via_ir
 
-    for yul_file in $(find . -name "$filename*.yul" | sort -V); do
+    for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
         bin_output_two_stage+=$(
 	    msg_on_error --no-stderr "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" |
-            sed '/^======= <stdin>/d' |
-            sed '/^Binary representation:$/d' |
-            sed '/^=======/d'
+                sed '/^Binary representation:$/d' |
+                sed '/^=======/d'
         )
     done
 
     bin_output_via_ir=$(
         msg_on_error --no-stderr "$SOLC" --via-ir --bin "${optimizer_flags[@]}" "$solidity_file" |
-        sed '/^======= <stdin>/d' |
         sed '/^Binary:$/d' |
         sed '/^=======/d'
     )
 
     diff_values "$bin_output_two_stage" "$bin_output_via_ir" --ignore-space-change --ignore-blank-lines
+
+    popd
+    rm -r "$SOLTMPDIR"
 }
 
 ## RUN
@@ -598,10 +599,7 @@ printTask "Testing assemble, yul, strict-assembly and optimize..."
 )
 
 printTask "Testing the eqivalence of --via-ir and a two-stage compilation..."
-SOLTMPDIR=$(mktemp -d)
 (
-    cd "$SOLTMPDIR"
-
     externalContracts=(
         externalTests/solc-js/DAO/TokenCreation.sol
         libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
@@ -631,7 +629,6 @@ SOLTMPDIR=$(mktemp -d)
         test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}" --optimize
     done
 )
-rm -r "$SOLTMPDIR"
 
 printTask "Testing standard input..."
 SOLTMPDIR=$(mktemp -d)

From 0bb885dab2c64dc1dec40b0f1f898b141a7e65d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 17:04:37 +0100
Subject: [PATCH 0526/1748] Bring soltestAssert() up to date with solAssert()

- Allow omitting description.
- Provide a default description.
- Use a custom exception type derived from util::Exception rather than std::exception.
---
 test/libsolidity/util/SoltestErrors.h | 29 ++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/test/libsolidity/util/SoltestErrors.h b/test/libsolidity/util/SoltestErrors.h
index e223f714b7..849a8b34e1 100644
--- a/test/libsolidity/util/SoltestErrors.h
+++ b/test/libsolidity/util/SoltestErrors.h
@@ -15,20 +15,35 @@
 #pragma once
 
 #include <libsolutil/AnsiColorized.h>
+#include <libsolutil/Assertions.h>
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Exceptions.h>
 
+#include <boost/preprocessor/cat.hpp>
+#include <boost/preprocessor/facilities/empty.hpp>
+#include <boost/preprocessor/facilities/overload.hpp>
+
 namespace solidity::frontend::test
 {
 
-#define soltestAssert(CONDITION, DESCRIPTION) \
-	do \
-	{ \
-		if (!(CONDITION)) \
-			BOOST_THROW_EXCEPTION(std::runtime_error(DESCRIPTION)); \
-	} \
-	while (false)
+struct InternalSoltestError: virtual util::Exception {};
+
+#if !BOOST_PP_VARIADICS_MSVC
+#define soltestAssert(...) BOOST_PP_OVERLOAD(soltestAssert_,__VA_ARGS__)(__VA_ARGS__)
+#else
+#define soltestAssert(...) BOOST_PP_CAT(BOOST_PP_OVERLOAD(soltestAssert_,__VA_ARGS__)(__VA_ARGS__),BOOST_PP_EMPTY())
+#endif
+
+#define soltestAssert_1(CONDITION) \
+	soltestAssert_2((CONDITION), "")
 
+#define soltestAssert_2(CONDITION, DESCRIPTION) \
+	assertThrowWithDefaultDescription( \
+		(CONDITION), \
+		::solidity::frontend::test::InternalSoltestError, \
+		(DESCRIPTION), \
+		"Soltest assertion failed" \
+	)
 
 class TestParserError: virtual public util::Exception
 {

From 3c5930dd8e0ed6622b34799ef98f59ef75813460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 6 Apr 2022 22:22:23 +0200
Subject: [PATCH 0527/1748] Put arguments in parantheses in assert macro
 definitions

---
 liblangutil/Exceptions.h | 16 ++++++++--------
 libsmtutil/Exceptions.h  |  6 +++---
 libsolutil/Assertions.h  |  4 ++--
 libsolutil/Exceptions.h  |  2 +-
 libyul/Exceptions.h      |  6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
index 10fca80293..fb6f23cf11 100644
--- a/liblangutil/Exceptions.h
+++ b/liblangutil/Exceptions.h
@@ -58,13 +58,13 @@ struct InvalidAstError: virtual util::Exception {};
 #endif
 
 #define solAssert_1(CONDITION) \
-	solAssert_2(CONDITION, "")
+	solAssert_2((CONDITION), "")
 
 #define solAssert_2(CONDITION, DESCRIPTION) \
 	assertThrowWithDefaultDescription( \
-		CONDITION, \
+		(CONDITION), \
 		::solidity::langutil::InternalCompilerError, \
-		DESCRIPTION, \
+		(DESCRIPTION), \
 		"Solidity assertion failed" \
 	)
 
@@ -77,13 +77,13 @@ struct InvalidAstError: virtual util::Exception {};
 #endif
 
 #define solUnimplementedAssert_1(CONDITION) \
-	solUnimplementedAssert_2(CONDITION, "")
+	solUnimplementedAssert_2((CONDITION), "")
 
 #define solUnimplementedAssert_2(CONDITION, DESCRIPTION) \
 	assertThrowWithDefaultDescription( \
-		CONDITION, \
+		(CONDITION), \
 		::solidity::langutil::UnimplementedFeatureError, \
-		DESCRIPTION, \
+		(DESCRIPTION), \
 		"Unimplemented feature" \
 	)
 
@@ -105,9 +105,9 @@ struct InvalidAstError: virtual util::Exception {};
 
 #define astAssert_2(CONDITION, DESCRIPTION) \
 	assertThrowWithDefaultDescription( \
-		CONDITION, \
+		(CONDITION), \
 		::solidity::langutil::InvalidAstError, \
-		DESCRIPTION, \
+		(DESCRIPTION), \
 		"AST assertion failed" \
 	)
 
diff --git a/libsmtutil/Exceptions.h b/libsmtutil/Exceptions.h
index fd144ca729..2a32c4fcda 100644
--- a/libsmtutil/Exceptions.h
+++ b/libsmtutil/Exceptions.h
@@ -38,13 +38,13 @@ struct SMTLogicError: virtual util::Exception {};
 #endif
 
 #define smtAssert_1(CONDITION) \
-	smtAssert_2(CONDITION, "")
+	smtAssert_2((CONDITION), "")
 
 #define smtAssert_2(CONDITION, DESCRIPTION) \
 	assertThrowWithDefaultDescription( \
-		CONDITION, \
+		(CONDITION), \
 		::solidity::smtutil::SMTLogicError, \
-		DESCRIPTION, \
+		(DESCRIPTION), \
 		"SMT assertion failed" \
 	)
 
diff --git a/libsolutil/Assertions.h b/libsolutil/Assertions.h
index 81823e0400..4924522d6e 100644
--- a/libsolutil/Assertions.h
+++ b/libsolutil/Assertions.h
@@ -63,7 +63,7 @@ inline std::string stringOrDefault(std::string _string, std::string _defaultStri
 		if (!(_condition)) \
 			solThrow( \
 				_exceptionType, \
-				::solidity::util::assertions::stringOrDefault(_description, _defaultDescription) \
+				::solidity::util::assertions::stringOrDefault((_description), (_defaultDescription)) \
 			); \
 	} \
 	while (false)
@@ -72,6 +72,6 @@ inline std::string stringOrDefault(std::string _string, std::string _defaultStri
 /// Use it as assertThrow(1 == 1, ExceptionType, "Mathematics is wrong.");
 /// The second parameter must be an exception class (rather than an instance).
 #define assertThrow(_condition, _exceptionType, _description) \
-	assertThrowWithDefaultDescription(_condition, _exceptionType, _description, "Assertion failed")
+	assertThrowWithDefaultDescription((_condition), _exceptionType, (_description), "Assertion failed")
 
 }
diff --git a/libsolutil/Exceptions.h b/libsolutil/Exceptions.h
index 66b2442ef1..8ac7a5fae2 100644
--- a/libsolutil/Exceptions.h
+++ b/libsolutil/Exceptions.h
@@ -48,7 +48,7 @@ struct Exception: virtual std::exception, virtual boost::exception
 #define solThrow(_exceptionType, _description) \
 	::boost::throw_exception( \
 		_exceptionType() << \
-		::solidity::util::errinfo_comment(_description) << \
+		::solidity::util::errinfo_comment((_description)) << \
 		::boost::throw_function(ETH_FUNC) << \
 		::boost::throw_file(__FILE__) << \
 		::boost::throw_line(__LINE__) \
diff --git a/libyul/Exceptions.h b/libyul/Exceptions.h
index 1ad7785e9b..45c681a5d6 100644
--- a/libyul/Exceptions.h
+++ b/libyul/Exceptions.h
@@ -63,13 +63,13 @@ struct StackTooDeepError: virtual YulException
 #endif
 
 #define yulAssert_1(CONDITION) \
-	yulAssert_2(CONDITION, "")
+	yulAssert_2((CONDITION), "")
 
 #define yulAssert_2(CONDITION, DESCRIPTION) \
 	assertThrowWithDefaultDescription( \
-		CONDITION, \
+		(CONDITION), \
 		::solidity::yul::YulAssertion, \
-		DESCRIPTION, \
+		(DESCRIPTION), \
 		"Yul assertion failed" \
 	)
 

From ed8403f45657964bf14f9bf8e8fa063e55bd045b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 17:47:21 +0100
Subject: [PATCH 0528/1748] isoltest: Handle parsing errors differently from
 unexpected exceptions

---
 test/tools/isoltest.cpp | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index ae2ce6e248..746cee7e66 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -499,9 +499,20 @@ int main(int argc, char const *argv[])
 
 		return global_stats ? 0 : 1;
 	}
-	catch (std::exception const& _exception)
+	catch (boost::program_options::error const& exception)
 	{
-		cerr << _exception.what() << endl;
+		cerr << exception.what() << endl;
+		return 1;
+	}
+	catch (std::runtime_error const& exception)
+	{
+		cerr << exception.what() << endl;
+		return 1;
+	}
+	catch (...)
+	{
+		cerr << "Unhandled exception caught." << endl;
+		cerr << boost::current_exception_diagnostic_information() << endl;
 		return 1;
 	}
 }

From 7bace8d25d55a71a243ca117699f9c665a47ca2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 17:49:27 +0100
Subject: [PATCH 0529/1748] soltest: Don't assume that parse() can never return
 false

---
 test/boostTest.cpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index 1cc512c325..0d3b0eb34f 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -204,15 +204,18 @@ int registerTests(
 	return numTestsAdded;
 }
 
-void initializeOptions()
+bool initializeOptions()
 {
 	auto const& suite = boost::unit_test::framework::master_test_suite();
 
 	auto options = std::make_unique<solidity::test::CommonOptions>();
-	solAssert(options->parse(suite.argc, suite.argv), "Failed to parse options!");
+	bool shouldContinue = options->parse(suite.argc, suite.argv);
+	if (!shouldContinue)
+		return false;
 	options->validate();
 
 	solidity::test::CommonOptions::setSingleton(std::move(options));
+	return true;
 }
 
 }
@@ -228,7 +231,9 @@ test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
 	master_test_suite_t& master = framework::master_test_suite();
 	master.p_name.value = "SolidityTests";
 
-	initializeOptions();
+	bool shouldContinue = initializeOptions();
+	if (!shouldContinue)
+		exit(0);
 
 	if (!solidity::test::loadVMs(solidity::test::CommonOptions::get()))
 		exit(1);

From cf6704ae0636fce85fda9d4dd52e1e2f86e97fac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 18:19:37 +0100
Subject: [PATCH 0530/1748] isoltest: Do not return an error code from `--help`

---
 test/Common.h                  | 3 +++
 test/tools/IsolTestOptions.cpp | 6 +++---
 test/tools/isoltest.cpp        | 5 +++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/Common.h b/test/Common.h
index e7e211d9e6..28862348f4 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -75,6 +75,9 @@ struct CommonOptions
 	langutil::EVMVersion evmVersion() const;
 
 	virtual void addOptions();
+	// @returns true if the program should continue, false if it should exit immediately without
+	// reporting an error.
+	// Throws ConfigException or std::runtime_error if parsing fails.
 	virtual bool parse(int argc, char const* const* argv);
 	// Throws a ConfigException on error
 	virtual void validate() const;
diff --git a/test/tools/IsolTestOptions.cpp b/test/tools/IsolTestOptions.cpp
index cdd1b85ab1..ca7761d744 100644
--- a/test/tools/IsolTestOptions.cpp
+++ b/test/tools/IsolTestOptions.cpp
@@ -75,9 +75,9 @@ void IsolTestOptions::addOptions()
 
 bool IsolTestOptions::parse(int _argc, char const* const* _argv)
 {
-	bool const res = CommonOptions::parse(_argc, _argv);
+	bool const shouldContinue = CommonOptions::parse(_argc, _argv);
 
-	if (showHelp || !res)
+	if (showHelp || !shouldContinue)
 	{
 		std::cout << options << std::endl;
 		return false;
@@ -85,7 +85,7 @@ bool IsolTestOptions::parse(int _argc, char const* const* _argv)
 
 	enforceGasTest = enforceGasTest || (evmVersion() == langutil::EVMVersion{} && !useABIEncoderV1);
 
-	return res;
+	return shouldContinue;
 }
 
 void IsolTestOptions::validate() const
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index 746cee7e66..a2ef564cbd 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -433,8 +433,9 @@ int main(int argc, char const *argv[])
 		{
 			auto options = std::make_unique<IsolTestOptions>();
 
-			if (!options->parse(argc, argv))
-				return -1;
+			bool shouldContinue = options->parse(argc, argv);
+			if (!shouldContinue)
+				return 0;
 
 			options->validate();
 			CommonOptions::setSingleton(std::move(options));

From 7c835598819877f3b1258f0fa29379fa2bc4b530 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 Nov 2021 17:51:18 +0100
Subject: [PATCH 0531/1748] soltest: Handle CLI validation errors gracefully

---
 test/Common.cpp    |  47 ++++++++++--------
 test/boostTest.cpp | 119 +++++++++++++++++++++++++--------------------
 2 files changed, 93 insertions(+), 73 deletions(-)

diff --git a/test/Common.cpp b/test/Common.cpp
index a702cddd69..8cdf0fed1c 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -159,26 +159,33 @@ bool CommonOptions::parse(int argc, char const* const* argv)
 	po::variables_map arguments;
 	addOptions();
 
-	po::command_line_parser cmdLineParser(argc, argv);
-	cmdLineParser.options(options);
-	auto parsedOptions = cmdLineParser.run();
-	po::store(parsedOptions, arguments);
-	po::notify(arguments);
-
-	for (auto const& parsedOption: parsedOptions.options)
-		if (parsedOption.position_key >= 0)
-		{
-			if (
-				parsedOption.original_tokens.empty() ||
-				(parsedOption.original_tokens.size() == 1 && parsedOption.original_tokens.front().empty())
-			)
-				continue; // ignore empty options
-			std::stringstream errorMessage;
-			errorMessage << "Unrecognized option: ";
-			for (auto const& token: parsedOption.original_tokens)
-				errorMessage << token;
-			BOOST_THROW_EXCEPTION(std::runtime_error(errorMessage.str()));
-		}
+	try
+	{
+		po::command_line_parser cmdLineParser(argc, argv);
+		cmdLineParser.options(options);
+		auto parsedOptions = cmdLineParser.run();
+		po::store(parsedOptions, arguments);
+		po::notify(arguments);
+
+		for (auto const& parsedOption: parsedOptions.options)
+			if (parsedOption.position_key >= 0)
+			{
+				if (
+					parsedOption.original_tokens.empty() ||
+					(parsedOption.original_tokens.size() == 1 && parsedOption.original_tokens.front().empty())
+				)
+					continue; // ignore empty options
+				std::stringstream errorMessage;
+				errorMessage << "Unrecognized option: ";
+				for (auto const& token: parsedOption.original_tokens)
+					errorMessage << token;
+				BOOST_THROW_EXCEPTION(std::runtime_error(errorMessage.str()));
+			}
+	}
+	catch (po::error const& exception)
+	{
+		solThrow(ConfigException, exception.what());
+	}
 
 	if (vmPaths.empty())
 	{
diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index 0d3b0eb34f..014673ebaa 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -222,75 +222,88 @@ bool initializeOptions()
 
 // TODO: Prototype -- why isn't this declared in the boost headers?
 // TODO: replace this with a (global) fixture.
-test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] );
+test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[]);
 
-test_suite* init_unit_test_suite( int /*argc*/, char* /*argv*/[] )
+test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])
 {
 	using namespace solidity::test;
 
 	master_test_suite_t& master = framework::master_test_suite();
 	master.p_name.value = "SolidityTests";
 
-	bool shouldContinue = initializeOptions();
-	if (!shouldContinue)
-		exit(0);
+	try
+	{
+		bool shouldContinue = initializeOptions();
+		if (!shouldContinue)
+			exit(0);
 
-	if (!solidity::test::loadVMs(solidity::test::CommonOptions::get()))
-		exit(1);
+		if (!solidity::test::loadVMs(solidity::test::CommonOptions::get()))
+			exit(1);
 
-	if (solidity::test::CommonOptions::get().disableSemanticTests)
-		cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
+		if (solidity::test::CommonOptions::get().disableSemanticTests)
+			cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
 
-	if (!solidity::test::CommonOptions::get().enforceGasTest)
-		cout << endl << "WARNING :: Gas Cost Expectations are not being enforced" << endl << endl;
+		if (!solidity::test::CommonOptions::get().enforceGasTest)
+			cout << endl << "WARNING :: Gas Cost Expectations are not being enforced" << endl << endl;
 
-	Batcher batcher(CommonOptions::get().selectedBatch, CommonOptions::get().batches);
-	if (CommonOptions::get().batches > 1)
-		cout << "Batch " << CommonOptions::get().selectedBatch << " out of " << CommonOptions::get().batches << endl;
+		Batcher batcher(CommonOptions::get().selectedBatch, CommonOptions::get().batches);
+		if (CommonOptions::get().batches > 1)
+			cout << "Batch " << CommonOptions::get().selectedBatch << " out of " << CommonOptions::get().batches << endl;
 
-	// Batch the boost tests
-	BoostBatcher boostBatcher(batcher);
-	traverse_test_tree(master, boostBatcher, true);
+		// Batch the boost tests
+		BoostBatcher boostBatcher(batcher);
+		traverse_test_tree(master, boostBatcher, true);
+
+		// Include the interactive tests in the automatic tests as well
+		for (auto const& ts: g_interactiveTestsuites)
+		{
+			auto const& options = solidity::test::CommonOptions::get();
+
+			if (ts.smt && options.disableSMT)
+				continue;
+
+			if (ts.needsVM && solidity::test::CommonOptions::get().disableSemanticTests)
+				continue;
+
+			//TODO
+			//solAssert(
+			registerTests(
+				master,
+				options.testPath / ts.path,
+				ts.subpath,
+				options.enforceViaYul,
+				options.enforceCompileToEwasm,
+				ts.labels,
+				ts.testCaseCreator,
+				batcher
+			);
+			// > 0, std::string("no ") + ts.title + " tests found");
+		 }
 
-	// Include the interactive tests in the automatic tests as well
-	for (auto const& ts: g_interactiveTestsuites)
+		if (solidity::test::CommonOptions::get().disableSemanticTests)
+		{
+			for (auto suite: {
+				"ABIDecoderTest",
+				"ABIEncoderTest",
+				"SolidityAuctionRegistrar",
+				"SolidityWallet",
+				"GasMeterTests",
+				"GasCostTests",
+				"SolidityEndToEndTest",
+				"SolidityOptimizer"
+			})
+				removeTestSuite(suite);
+		}
+	}
+	catch (solidity::test::ConfigException const& exception)
 	{
-		auto const& options = solidity::test::CommonOptions::get();
-
-		if (ts.smt && options.disableSMT)
-			continue;
-
-		if (ts.needsVM && solidity::test::CommonOptions::get().disableSemanticTests)
-			continue;
-
-		//TODO
-		//solAssert(
-		registerTests(
-			master,
-			options.testPath / ts.path,
-			ts.subpath,
-			options.enforceViaYul,
-			options.enforceCompileToEwasm,
-			ts.labels,
-			ts.testCaseCreator,
-			batcher
-		);
-		// > 0, std::string("no ") + ts.title + " tests found");
+		cerr << exception.what() << endl;
+		exit(1);
 	}
-
-	if (solidity::test::CommonOptions::get().disableSemanticTests)
+	catch (std::runtime_error const& exception)
 	{
-		for (auto suite: {
-			"ABIDecoderTest",
-			"ABIEncoderTest",
-			"SolidityAuctionRegistrar",
-			"SolidityWallet",
-			"GasMeterTests",
-			"GasCostTests",
-			"SolidityEndToEndTest",
-			"SolidityOptimizer"
-		})
-			removeTestSuite(suite);
+		cerr << exception.what() << endl;
+		exit(1);
 	}
 
 	return nullptr;

From b3048ccf077e3818c2ce9f2e05ad411c3525423d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 30 Nov 2021 14:26:59 +0100
Subject: [PATCH 0532/1748] Use EXIT_FAILURE and EXIT_SUCCESS constants in
 exit() and when returning from main()

---
 test/boostTest.cpp      |  8 ++++----
 test/tools/isoltest.cpp | 14 +++++++-------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index 014673ebaa..b7a4c80f0a 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -235,10 +235,10 @@ test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])
 	{
 		bool shouldContinue = initializeOptions();
 		if (!shouldContinue)
-			exit(0);
+			exit(EXIT_SUCCESS);
 
 		if (!solidity::test::loadVMs(solidity::test::CommonOptions::get()))
-			exit(1);
+			exit(EXIT_FAILURE);
 
 		if (solidity::test::CommonOptions::get().disableSemanticTests)
 			cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
@@ -298,12 +298,12 @@ test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])
 	catch (solidity::test::ConfigException const& exception)
 	{
 		cerr << exception.what() << endl;
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 	catch (std::runtime_error const& exception)
 	{
 		cerr << exception.what() << endl;
-		exit(1);
+		exit(EXIT_FAILURE);
 	}
 
 	return nullptr;
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index a2ef564cbd..ce45819b87 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -435,7 +435,7 @@ int main(int argc, char const *argv[])
 
 			bool shouldContinue = options->parse(argc, argv);
 			if (!shouldContinue)
-				return 0;
+				return EXIT_SUCCESS;
 
 			options->validate();
 			CommonOptions::setSingleton(std::move(options));
@@ -444,7 +444,7 @@ int main(int argc, char const *argv[])
 		auto& options = dynamic_cast<IsolTestOptions const&>(CommonOptions::get());
 
 		if (!solidity::test::loadVMs(options))
-			return 1;
+			return EXIT_FAILURE;
 
 		if (options.disableSemanticTests)
 			cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
@@ -480,7 +480,7 @@ int main(int argc, char const *argv[])
 			if (stats)
 				global_stats += *stats;
 			else
-				return 1;
+				return EXIT_FAILURE;
 		}
 
 		cout << endl << "Summary: ";
@@ -498,22 +498,22 @@ int main(int argc, char const *argv[])
 		if (options.disableSemanticTests)
 			cout << "\nNOTE: Skipped semantics tests.\n" << endl;
 
-		return global_stats ? 0 : 1;
+		return global_stats ? EXIT_SUCCESS : EXIT_FAILURE;
 	}
 	catch (boost::program_options::error const& exception)
 	{
 		cerr << exception.what() << endl;
-		return 1;
+		return EXIT_FAILURE;
 	}
 	catch (std::runtime_error const& exception)
 	{
 		cerr << exception.what() << endl;
-		return 1;
+		return EXIT_FAILURE;
 	}
 	catch (...)
 	{
 		cerr << "Unhandled exception caught." << endl;
 		cerr << boost::current_exception_diagnostic_information() << endl;
-		return 1;
+		return EXIT_FAILURE;
 	}
 }

From 39f3175a378a43319595eadea7882b09f7e81282 Mon Sep 17 00:00:00 2001
From: andreb0x <98777324+andreb0x@users.noreply.github.com>
Date: Mon, 7 Mar 2022 08:31:33 -0500
Subject: [PATCH 0533/1748] updates to gas section

small modifications for clarity

updates to delegatecall

Update introduction-to-smart-contracts.rst

modifying "write" to "transactions"

updates to gas section

small modifications for clarity

Update introduction-to-smart-contracts.rst

modifying "write" to "transactions"

updates to gas section

small modifications for clarity

updates to delegatecall
---
 docs/introduction-to-smart-contracts.rst | 29 +++++++++++++++++-------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 7adbfaedba..d673a0788d 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -396,14 +396,15 @@ returns that code when executed.
 Gas
 ===
 
-Upon creation, each transaction is charged with a certain amount of **gas**,
-whose purpose is to limit the amount of work that is needed to execute
-the transaction and to pay for this execution at the same time. While the EVM executes the
+Upon creation, each transaction is charged with a certain amount of **gas**. 
+Imposing a cost on operations that write to the blockchain serves to secure the network:
+it deincentivizes bad actors from spamming, and pays validators (i.e. miners and stakers)
+for the work that is required to validate new blocks. While the EVM executes the
 transaction, the gas is gradually depleted according to specific rules.
 
-The **gas price** is a value set by the creator of the transaction, who
+The **gas price** is a value set by the creator of the transaction (see `msg.sender), who
 has to pay ``gas_price * gas`` up front from the sending account.
-If some gas is left after the execution, it is refunded to the creator in the same way.
+If some gas is left after execution, it is refunded to the transaction originator.
 
 If the gas is used up at any point (i.e. it would be negative),
 an out-of-gas exception is triggered, which reverts all modifications
@@ -415,8 +416,7 @@ Storage, Memory and the Stack
 =============================
 
 The Ethereum Virtual Machine has three areas where it can store data-
-storage, memory and the stack, which are explained in the following
-paragraphs.
+storage, memory and the stack.
 
 Each account has a data area called **storage**, which is persistent between function calls
 and transactions.
@@ -505,12 +505,25 @@ Delegatecall / Callcode and Libraries
 There exists a special variant of a message call, named **delegatecall**
 which is identical to a message call apart from the fact that
 the code at the target address is executed in the context of the calling
-contract and ``msg.sender`` and ``msg.value`` do not change their values.
+<<<<<<< HEAD
+contract. In practice this means ``msg.sender`` and ``msg.value`` retain
+the values that were passed to the delegator, while executing code that
+lives in the delegated contract.
+=======
+contract. In practice this means ``msg.sender`` and ``msg.value`` retain 
+the values that were passed to the delegator, while executing code that 
+lives in the delegated contract. 
+>>>>>>> updates to delegatecall
 
 This means that a contract can dynamically load code from a different
 address at runtime. Storage, current address and balance still
 refer to the calling contract, only the code is taken from the called address.
 
+For example, say Alice calls a method in contract A to modify 
+state variable `A.var` according to method ``A.foo()``. 
+If contract A then delegates call to contract B, the logic of `B.foo()` 
+will be executed, but modifications will be made to state variable `A.var`. 
+
 This makes it possible to implement the "library" feature in Solidity:
 Reusable library code that can be applied to a contract's storage, e.g. in
 order to implement a complex data structure.

From 60416120aff67768d3860dbdde0e1257b5f7324f Mon Sep 17 00:00:00 2001
From: andreb0x <98777324+andreb0x@users.noreply.github.com>
Date: Mon, 7 Mar 2022 10:57:56 -0500
Subject: [PATCH 0534/1748] Update introduction-to-smart-contracts.rst

modifying "write" to "transactions"
---
 docs/introduction-to-smart-contracts.rst | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index d673a0788d..7baae4c316 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -396,13 +396,13 @@ returns that code when executed.
 Gas
 ===
 
-Upon creation, each transaction is charged with a certain amount of **gas**. 
-Imposing a cost on operations that write to the blockchain serves to secure the network:
+Upon creation, each transaction is charged with a certain amount of **gas**.
+Imposing a cost on transactions serves to secure the network:
 it deincentivizes bad actors from spamming, and pays validators (i.e. miners and stakers)
 for the work that is required to validate new blocks. While the EVM executes the
 transaction, the gas is gradually depleted according to specific rules.
 
-The **gas price** is a value set by the creator of the transaction (see `msg.sender), who
+The **gas price** is a value set by the originator of the transaction, i.e. `tx.origin`, who
 has to pay ``gas_price * gas`` up front from the sending account.
 If some gas is left after execution, it is refunded to the transaction originator.
 
@@ -505,25 +505,14 @@ Delegatecall / Callcode and Libraries
 There exists a special variant of a message call, named **delegatecall**
 which is identical to a message call apart from the fact that
 the code at the target address is executed in the context of the calling
-<<<<<<< HEAD
 contract. In practice this means ``msg.sender`` and ``msg.value`` retain
 the values that were passed to the delegator, while executing code that
 lives in the delegated contract.
-=======
-contract. In practice this means ``msg.sender`` and ``msg.value`` retain 
-the values that were passed to the delegator, while executing code that 
-lives in the delegated contract. 
->>>>>>> updates to delegatecall
 
 This means that a contract can dynamically load code from a different
 address at runtime. Storage, current address and balance still
 refer to the calling contract, only the code is taken from the called address.
 
-For example, say Alice calls a method in contract A to modify 
-state variable `A.var` according to method ``A.foo()``. 
-If contract A then delegates call to contract B, the logic of `B.foo()` 
-will be executed, but modifications will be made to state variable `A.var`. 
-
 This makes it possible to implement the "library" feature in Solidity:
 Reusable library code that can be applied to a contract's storage, e.g. in
 order to implement a complex data structure.

From 9e2b26e046adf56f48f73afcd982984d9f697cd1 Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Tue, 29 Mar 2022 13:48:49 -0700
Subject: [PATCH 0535/1748] Clarify the reason for the memory-unsafe assembly
 example being unsafe

---
 docs/assembly.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index 0876229b14..70c4a458d0 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -313,7 +313,8 @@ Furthermore, if the assembly block assigns to Solidity variables in memory, you
 the Solidity variables only access these memory ranges.
 
 Since this is mainly about the optimizer, these restrictions still need to be followed, even if the assembly block
-reverts or terminates. As an example, the following assembly snippet is not memory safe:
+reverts or terminates. As an example, the following assembly snippet is not memory safe, because the value of
+``returndatasize()`` may exceed the 64 byte scratch space:
 
 .. code-block:: solidity
 
@@ -322,7 +323,8 @@ reverts or terminates. As an example, the following assembly snippet is not memo
       revert(0, returndatasize())
     }
 
-But the following is:
+On the other hand, the following code *is* memory safe, because memory beyond the location pointed to by the
+free memory pointer can safely be used as temporary scratch space:
 
 .. code-block:: solidity
 

From 22d8c0aecd8ecf0973bae33fe949235f92cf2bda Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 7 Apr 2022 20:29:07 +0200
Subject: [PATCH 0536/1748] Some updates to gas and delegatecall.

---
 docs/introduction-to-smart-contracts.rst | 33 ++++++++++++++----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 7baae4c316..9b2e5fceb5 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -396,26 +396,33 @@ returns that code when executed.
 Gas
 ===
 
-Upon creation, each transaction is charged with a certain amount of **gas**.
-Imposing a cost on transactions serves to secure the network:
-it deincentivizes bad actors from spamming, and pays validators (i.e. miners and stakers)
-for the work that is required to validate new blocks. While the EVM executes the
+Upon creation, each transaction is charged with a certain amount of **gas**
+that has to be paid for by the originator of the transaction (``tx.origin``).
+While the EVM executes the
 transaction, the gas is gradually depleted according to specific rules.
+If the gas is used up at any point (i.e. it would be negative),
+an out-of-gas exception is triggered, which ends execution and reverts all modifications
+made to the state in the current call frame.
+
+This mechanism incentivizes economical use of EVM execution time
+and also compensates EVM executors (i.e. miners / stakers) for their work.
+Since each block has a maximum amount of gas, it also limits the amount
+of work needed to validate a block.
 
-The **gas price** is a value set by the originator of the transaction, i.e. `tx.origin`, who
-has to pay ``gas_price * gas`` up front from the sending account.
+The **gas price** is a value set by the originator of the transaction, who
+has to pay ``gas_price * gas`` up front to the EVM executor.
 If some gas is left after execution, it is refunded to the transaction originator.
+In case of an exception that reverts changes, already used up gas is not refunded.
 
-If the gas is used up at any point (i.e. it would be negative),
-an out-of-gas exception is triggered, which reverts all modifications
-made to the state in the current call frame.
+Since EVM executors can choose to include a transaction or not,
+transaction senders cannot abuse the system by setting a low gas price.
 
 .. index:: ! storage, ! memory, ! stack
 
 Storage, Memory and the Stack
 =============================
 
-The Ethereum Virtual Machine has three areas where it can store data-
+The Ethereum Virtual Machine has three areas where it can store data:
 storage, memory and the stack.
 
 Each account has a data area called **storage**, which is persistent between function calls
@@ -504,10 +511,8 @@ Delegatecall / Callcode and Libraries
 
 There exists a special variant of a message call, named **delegatecall**
 which is identical to a message call apart from the fact that
-the code at the target address is executed in the context of the calling
-contract. In practice this means ``msg.sender`` and ``msg.value`` retain
-the values that were passed to the delegator, while executing code that
-lives in the delegated contract.
+the code at the target address is executed in the context (i.e. at the address) of the calling
+contract and ``msg.sender`` and ``msg.value`` do not change their values.
 
 This means that a contract can dynamically load code from a different
 address at runtime. Storage, current address and balance still

From fb7c969ce89912b80657b5bce3cd17edd81468bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 25 Mar 2022 20:03:26 +0100
Subject: [PATCH 0537/1748] Tests for assembly instructions allowed with
 mutable/view/pure functions

---
 .../inline_assembly_instructions_allowed.sol  | 92 +++++++++++++++++++
 ...ine_assembly_instructions_allowed_pure.sol | 90 ++++++++++++++++++
 ...ine_assembly_instructions_allowed_view.sol | 91 ++++++++++++++++++
 ...nline_assembly_instructions_disallowed.sol | 28 ++++++
 ..._assembly_instructions_disallowed_pure.sol | 80 ++++++++++++++++
 ..._assembly_instructions_disallowed_view.sol | 38 ++++++++
 6 files changed, 419 insertions(+)
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol

diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
new file mode 100644
index 0000000000..8b634c2195
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
@@ -0,0 +1,92 @@
+contract C {
+    function f() public {
+        assembly {
+            stop()
+            pop(add(0, 1))
+            pop(sub(0, 1))
+            pop(mul(0, 1))
+            pop(div(0, 1))
+            pop(sdiv(0, 1))
+            pop(mod(0, 1))
+            pop(smod(0, 1))
+            pop(exp(0, 1))
+            pop(not(0))
+            pop(lt(0, 1))
+            pop(gt(0, 1))
+            pop(slt(0, 1))
+            pop(sgt(0, 1))
+            pop(eq(0, 1))
+            pop(iszero(0))
+            pop(and(0, 1))
+            pop(or(0, 1))
+            pop(xor(0, 1))
+            pop(byte(0, 1))
+            pop(shl(0, 1))
+            pop(shr(0, 1))
+            pop(sar(0, 1))
+            pop(addmod(0, 1, 2))
+            pop(mulmod(0, 1, 2))
+            pop(signextend(0, 1))
+            pop(keccak256(0, 1))
+            pop(0)
+            pop(mload(0))
+            mstore(0, 1)
+            mstore8(0, 1)
+            pop(sload(0))
+            sstore(0, 1)
+            pop(gas())
+            pop(address())
+            pop(balance(0))
+            pop(selfbalance())
+            pop(caller())
+            pop(callvalue())
+            pop(calldataload(0))
+            pop(calldatasize())
+            calldatacopy(0, 1, 2)
+            pop(codesize())
+            codecopy(0, 1, 2)
+            pop(extcodesize(0))
+            extcodecopy(0, 1, 2, 3)
+            pop(returndatasize())
+            returndatacopy(0, 1, 2)
+            pop(extcodehash(0))
+            pop(create(0, 1, 2))
+            pop(create2(0, 1, 2, 3))
+            pop(call(0, 1, 2, 3, 4, 5, 6))
+            pop(callcode(0, 1, 2, 3, 4, 5, 6))
+            pop(delegatecall(0, 1, 2, 3, 4, 5))
+            pop(staticcall(0, 1, 2, 3, 4, 5))
+            return(0, 1)
+            revert(0, 1)
+            selfdestruct(0)
+            invalid()
+            log0(0, 1)
+            log1(0, 1, 2)
+            log2(0, 1, 2, 3)
+            log3(0, 1, 2, 3, 4)
+            log4(0, 1, 2, 3, 4, 5)
+            pop(chainid())
+            pop(basefee())
+            pop(origin())
+            pop(gasprice())
+            pop(blockhash(0))
+            pop(coinbase())
+            pop(timestamp())
+            pop(number())
+            pop(difficulty())
+            pop(gaslimit())
+
+            // NOTE: msize() is allowed only with optimizer disabled
+            //pop(msize())
+            //pop(pc())
+        }
+    }
+}
+// ====
+// EVMVersion: >=london
+// ----
+// Warning 5740: (89-1716): Unreachable code.
+// Warning 5740: (1729-1741): Unreachable code.
+// Warning 5740: (1754-1769): Unreachable code.
+// Warning 5740: (1782-1791): Unreachable code.
+// Warning 5740: (1804-2215): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
new file mode 100644
index 0000000000..85d7b63008
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
@@ -0,0 +1,90 @@
+contract C {
+    function f() public pure {
+        assembly {
+            stop()
+            pop(add(0, 1))
+            pop(sub(0, 1))
+            pop(mul(0, 1))
+            pop(div(0, 1))
+            pop(sdiv(0, 1))
+            pop(mod(0, 1))
+            pop(smod(0, 1))
+            pop(exp(0, 1))
+            pop(not(0))
+            pop(lt(0, 1))
+            pop(gt(0, 1))
+            pop(slt(0, 1))
+            pop(sgt(0, 1))
+            pop(eq(0, 1))
+            pop(iszero(0))
+            pop(and(0, 1))
+            pop(or(0, 1))
+            pop(xor(0, 1))
+            pop(byte(0, 1))
+            pop(shl(0, 1))
+            pop(shr(0, 1))
+            pop(sar(0, 1))
+            pop(addmod(0, 1, 2))
+            pop(mulmod(0, 1, 2))
+            pop(signextend(0, 1))
+            pop(keccak256(0, 1))
+            pop(0)
+            pop(mload(0))
+            mstore(0, 1)
+            mstore8(0, 1)
+            //pop(sload(0))
+            //sstore(0, 1)
+            //pop(gas())
+            //pop(address())
+            //pop(balance(0))
+            //pop(selfbalance())
+            //pop(caller())
+            //pop(callvalue())
+            pop(calldataload(0))
+            pop(calldatasize())
+            calldatacopy(0, 1, 2)
+            pop(codesize())
+            codecopy(0, 1, 2)
+            //pop(extcodesize(0))
+            //extcodecopy(0, 1, 2, 3)
+            pop(returndatasize())
+            returndatacopy(0, 1, 2)
+            //pop(extcodehash(0))
+            //pop(create(0, 1, 2))
+            //pop(create2(0, 1, 2, 3))
+            //pop(call(0, 1, 2, 3, 4, 5, 6))
+            //pop(callcode(0, 1, 2, 3, 4, 5, 6))
+            //pop(delegatecall(0, 1, 2, 3, 4, 5))
+            //pop(staticcall(0, 1, 2, 3, 4, 5))
+            return(0, 1)
+            revert(0, 1)
+            //selfdestruct(0)
+            invalid()
+            //log0(0, 1)
+            //log1(0, 1, 2)
+            //log2(0, 1, 2, 3)
+            //log3(0, 1, 2, 3, 4)
+            //log4(0, 1, 2, 3, 4, 5)
+            //pop(chainid())
+            //pop(basefee())
+            //pop(origin())
+            //pop(gasprice())
+            //pop(blockhash(0))
+            //pop(coinbase())
+            //pop(timestamp())
+            //pop(number())
+            //pop(difficulty())
+            //pop(gaslimit())
+
+            // NOTE: msize() is allowed only with optimizer disabled
+            //pop(msize())
+            //pop(pc())
+        }
+    }
+}
+// ====
+// EVMVersion: >=london
+// ----
+// Warning 5740: (94-1755): Unreachable code.
+// Warning 5740: (1768-1780): Unreachable code.
+// Warning 5740: (1823-1832): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol
new file mode 100644
index 0000000000..af30bc21ae
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol
@@ -0,0 +1,91 @@
+contract C {
+    function f() public view {
+        assembly {
+            stop()
+            pop(add(0, 1))
+            pop(sub(0, 1))
+            pop(mul(0, 1))
+            pop(div(0, 1))
+            pop(sdiv(0, 1))
+            pop(mod(0, 1))
+            pop(smod(0, 1))
+            pop(exp(0, 1))
+            pop(not(0))
+            pop(lt(0, 1))
+            pop(gt(0, 1))
+            pop(slt(0, 1))
+            pop(sgt(0, 1))
+            pop(eq(0, 1))
+            pop(iszero(0))
+            pop(and(0, 1))
+            pop(or(0, 1))
+            pop(xor(0, 1))
+            pop(byte(0, 1))
+            pop(shl(0, 1))
+            pop(shr(0, 1))
+            pop(sar(0, 1))
+            pop(addmod(0, 1, 2))
+            pop(mulmod(0, 1, 2))
+            pop(signextend(0, 1))
+            pop(keccak256(0, 1))
+            pop(0)
+            pop(mload(0))
+            mstore(0, 1)
+            mstore8(0, 1)
+            pop(sload(0))
+            //sstore(0, 1)
+            pop(gas())
+            pop(address())
+            pop(balance(0))
+            pop(selfbalance())
+            pop(caller())
+            pop(callvalue())
+            pop(calldataload(0))
+            pop(calldatasize())
+            calldatacopy(0, 1, 2)
+            pop(codesize())
+            codecopy(0, 1, 2)
+            pop(extcodesize(0))
+            extcodecopy(0, 1, 2, 3)
+            pop(returndatasize())
+            returndatacopy(0, 1, 2)
+            pop(extcodehash(0))
+            //pop(create(0, 1, 2))
+            //pop(create2(0, 1, 2, 3))
+            //pop(call(0, 1, 2, 3, 4, 5, 6))
+            //pop(callcode(0, 1, 2, 3, 4, 5, 6))
+            //pop(delegatecall(0, 1, 2, 3, 4, 5))
+            pop(staticcall(0, 1, 2, 3, 4, 5))
+            return(0, 1)
+            revert(0, 1)
+            //selfdestruct(0)
+            invalid()
+            //log0(0, 1)
+            //log1(0, 1, 2)
+            //log2(0, 1, 2, 3)
+            //log3(0, 1, 2, 3, 4)
+            //log4(0, 1, 2, 3, 4, 5)
+            pop(chainid())
+            pop(basefee())
+            pop(origin())
+            pop(gasprice())
+            pop(blockhash(0))
+            pop(coinbase())
+            pop(timestamp())
+            pop(number())
+            pop(difficulty())
+            pop(gaslimit())
+
+            // NOTE: msize() is allowed only with optimizer disabled
+            //pop(msize())
+            //pop(pc())
+        }
+    }
+}
+// ====
+// EVMVersion: >=london
+// ----
+// Warning 5740: (94-1733): Unreachable code.
+// Warning 5740: (1746-1758): Unreachable code.
+// Warning 5740: (1801-1810): Unreachable code.
+// Warning 5740: (1978-2244): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed.sol
new file mode 100644
index 0000000000..992a51ad2a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed.sol
@@ -0,0 +1,28 @@
+contract C {
+    function f() public {
+        assembly {
+            datasize(0)
+            dataoffset(0)
+            datacopy(0, 1, 2)
+            setimmutable(0, "x", 1)
+            loadimmutable("x")
+            linkersymbol("x")
+            memoryguard(0)
+            verbatim_1i_1o(hex"600202", 0)
+
+            pop(msize())
+            pop(pc())
+        }
+    }
+}
+// ----
+// SyntaxError 6553: (47-362): The msize instruction cannot be used when the Yul optimizer is activated because it can change its semantics. Either disable the Yul optimizer or do not use the instruction.
+// DeclarationError 4619: (70-78): Function "datasize" not found.
+// DeclarationError 4619: (94-104): Function "dataoffset" not found.
+// DeclarationError 4619: (120-128): Function "datacopy" not found.
+// DeclarationError 4619: (150-162): Function "setimmutable" not found.
+// DeclarationError 4619: (186-199): Function "loadimmutable" not found.
+// DeclarationError 4619: (217-229): Function "linkersymbol" not found.
+// DeclarationError 4619: (247-258): Function "memoryguard" not found.
+// DeclarationError 4619: (274-288): Function "verbatim_1i_1o" not found.
+// SyntaxError 2450: (347-349): PC instruction is a low-level EVM feature. Because of that PC is disallowed in strict assembly.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
new file mode 100644
index 0000000000..f9a652fdbd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
@@ -0,0 +1,80 @@
+contract C {
+    function f() public pure {
+        assembly {
+            pop(sload(0))
+            sstore(0, 1)
+            pop(gas())
+            pop(address())
+            pop(balance(0))
+            pop(selfbalance())
+            pop(caller())
+            pop(callvalue())
+            pop(extcodesize(0))
+            extcodecopy(0, 1, 2, 3)
+            pop(extcodehash(0))
+            pop(create(0, 1, 2))
+            pop(create2(0, 1, 2, 3))
+            pop(call(0, 1, 2, 3, 4, 5, 6))
+            pop(callcode(0, 1, 2, 3, 4, 5, 6))
+            pop(delegatecall(0, 1, 2, 3, 4, 5))
+            pop(staticcall(0, 1, 2, 3, 4, 5))
+            selfdestruct(0)
+            log0(0, 1)
+            log1(0, 1, 2)
+            log2(0, 1, 2, 3)
+            log3(0, 1, 2, 3, 4)
+            log4(0, 1, 2, 3, 4, 5)
+            pop(chainid())
+            pop(basefee())
+            pop(origin())
+            pop(gasprice())
+            pop(blockhash(0))
+            pop(coinbase())
+            pop(timestamp())
+            pop(number())
+            pop(difficulty())
+            pop(gaslimit())
+
+            // These two are disallowed too but the error suppresses other errors.
+            //pop(msize())
+            //pop(pc())
+        }
+    }
+}
+// ====
+// EVMVersion: >=london
+// ----
+// Warning 5740: (672-1083): Unreachable code.
+// TypeError 2527: (79-87): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (101-113): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 2527: (130-135): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (153-162): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (180-190): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (208-221): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (239-247): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (265-276): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (294-308): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (322-345): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (362-376): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (394-409): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (427-446): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (464-489): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (507-536): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (554-584): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 2527: (602-630): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (644-659): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (672-682): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (695-708): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (721-737): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (750-769): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (782-804): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 2527: (821-830): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (848-857): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (875-883): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (901-911): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (929-941): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (959-969): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (987-998): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1016-1024): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1042-1054): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1072-1082): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol
new file mode 100644
index 0000000000..5daf917420
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol
@@ -0,0 +1,38 @@
+contract C {
+    function f() public view {
+        assembly {
+            sstore(0, 1)
+            pop(create(0, 1, 2))
+            pop(create2(0, 1, 2, 3))
+            pop(call(0, 1, 2, 3, 4, 5, 6))
+            pop(callcode(0, 1, 2, 3, 4, 5, 6))
+            pop(delegatecall(0, 1, 2, 3, 4, 5))
+            selfdestruct(0)
+            log0(0, 1)
+            log1(0, 1, 2)
+            log2(0, 1, 2, 3)
+            log3(0, 1, 2, 3, 4)
+            log4(0, 1, 2, 3, 4, 5)
+
+            // These two are disallowed too but the error suppresses other errors.
+            //pop(msize())
+            //pop(pc())
+        }
+    }
+}
+// ====
+// EVMVersion: >=london
+// ----
+// Warning 5740: (336-468): Unreachable code.
+// TypeError 8961: (75-87): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (104-119): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (137-156): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (174-199): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (217-246): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (264-294): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (308-323): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (336-346): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (359-372): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (385-401): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (414-433): Function cannot be declared as view because this expression (potentially) modifies the state.
+// TypeError 8961: (446-468): Function cannot be declared as view because this expression (potentially) modifies the state.

From f567eb1fb2a24dbd956fe65512d4b9015ba7f5ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 25 Mar 2022 20:21:06 +0100
Subject: [PATCH 0538/1748] Disallow RETURNDATASIZE and RETURNDATACOPY in
 inline assembly blocks in pure functions

---
 Changelog.md                                  |  1 +
 libevmasm/SemanticInformation.cpp             |  2 +
 .../inlineAssembly/evm_byzantium.sol          |  2 +-
 .../evm_byzantium_on_homestead.sol            |  2 +-
 ...ze_as_variable_call_post_byzantium.sol.sol |  2 +-
 ...urndatasize_as_variable_post_byzantium.sol |  2 +-
 ...turndatasize_as_variable_pre_byzantium.sol |  2 +-
 ...ine_assembly_instructions_allowed_pure.sol | 10 ++--
 ..._assembly_instructions_disallowed_pure.sol | 52 ++++++++++---------
 9 files changed, 41 insertions(+), 34 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 203081823d..4327a5709f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ Compiler Features:
 Bugfixes:
 * Assembly-Json: Fix assembly json export to store jump types of operations in `jumpType` field instead of `value`.
 * TypeChecker: Convert parameters of function type to how they would be called for ``abi.encodeCall``.
+* View Pure Checker: Mark ``returndatasize`` and ``returndatacopy`` as view to disallow them in inline assembly blocks in pure functions.
 
 
 
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index acbcaa5c0f..a2a2b1af21 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -479,6 +479,8 @@ bool SemanticInformation::invalidInPureFunctions(Instruction _instruction)
 	case Instruction::EXTCODESIZE:
 	case Instruction::EXTCODECOPY:
 	case Instruction::EXTCODEHASH:
+	case Instruction::RETURNDATASIZE:
+	case Instruction::RETURNDATACOPY:
 	case Instruction::BLOCKHASH:
 	case Instruction::COINBASE:
 	case Instruction::TIMESTAMP:
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol
index b08172ebe4..28d3365776 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol
@@ -1,5 +1,5 @@
 contract C {
-    function f() pure external {
+    function f() view external {
         assembly {
             let s := returndatasize()
             returndatacopy(0, 0, s)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol
index 74316c5263..5698f990fd 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol
@@ -1,5 +1,5 @@
 contract C {
-    function f() pure external {
+    function f() view external {
         assembly {
             let s := returndatasize()
             returndatacopy(0, 0, s)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol
index f959537b60..403022846d 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol
@@ -1,5 +1,5 @@
 contract C {
-    function f() public pure {
+    function f() public view {
         uint returndatasize;
         returndatasize;
         assembly {
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
index 44a12aa06e..903da7223e 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
@@ -1,5 +1,5 @@
 contract C {
-    function f() public pure {
+    function f() public view {
         uint returndatasize;
         returndatasize;
         assembly {
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol
index 07bae8ac89..250a0755fb 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol
@@ -1,4 +1,4 @@
-contract C { function f() public pure { uint returndatasize; returndatasize; assembly { pop(returndatasize()) }}}
+contract C { function f() public view { uint returndatasize; returndatasize; assembly { pop(returndatasize()) }}}
 // ====
 // EVMVersion: =homestead
 // ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
index 85d7b63008..9c09bcc372 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
@@ -47,8 +47,8 @@ contract C {
             codecopy(0, 1, 2)
             //pop(extcodesize(0))
             //extcodecopy(0, 1, 2, 3)
-            pop(returndatasize())
-            returndatacopy(0, 1, 2)
+            //pop(returndatasize())
+            //returndatacopy(0, 1, 2)
             //pop(extcodehash(0))
             //pop(create(0, 1, 2))
             //pop(create2(0, 1, 2, 3))
@@ -85,6 +85,6 @@ contract C {
 // ====
 // EVMVersion: >=london
 // ----
-// Warning 5740: (94-1755): Unreachable code.
-// Warning 5740: (1768-1780): Unreachable code.
-// Warning 5740: (1823-1832): Unreachable code.
+// Warning 5740: (94-1759): Unreachable code.
+// Warning 5740: (1772-1784): Unreachable code.
+// Warning 5740: (1827-1836): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
index f9a652fdbd..8da17390db 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
@@ -11,6 +11,8 @@ contract C {
             pop(callvalue())
             pop(extcodesize(0))
             extcodecopy(0, 1, 2, 3)
+            pop(returndatasize())
+            returndatacopy(0, 1, 2)
             pop(extcodehash(0))
             pop(create(0, 1, 2))
             pop(create2(0, 1, 2, 3))
@@ -44,7 +46,7 @@ contract C {
 // ====
 // EVMVersion: >=london
 // ----
-// Warning 5740: (672-1083): Unreachable code.
+// Warning 5740: (742-1153): Unreachable code.
 // TypeError 2527: (79-87): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 8961: (101-113): Function cannot be declared as pure because this expression (potentially) modifies the state.
 // TypeError 2527: (130-135): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
@@ -55,26 +57,28 @@ contract C {
 // TypeError 2527: (265-276): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 2527: (294-308): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 2527: (322-345): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (362-376): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (394-409): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (427-446): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (464-489): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (507-536): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (554-584): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 2527: (602-630): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (644-659): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (672-682): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (695-708): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (721-737): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (750-769): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (782-804): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 2527: (821-830): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (848-857): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (875-883): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (901-911): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (929-941): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (959-969): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (987-998): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1016-1024): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1042-1054): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1072-1082): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (362-378): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (392-415): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (432-446): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (464-479): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (497-516): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (534-559): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (577-606): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (624-654): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 2527: (672-700): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (714-729): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (742-752): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (765-778): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (791-807): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (820-839): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (852-874): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 2527: (891-900): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (918-927): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (945-953): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (971-981): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (999-1011): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1029-1039): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1057-1068): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1086-1094): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1112-1124): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1142-1152): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".

From c5bf750bf31a12bd4e04cff916235e2f49dc1949 Mon Sep 17 00:00:00 2001
From: Bytecurl <102375389+bytecurl@users.noreply.github.com>
Date: Thu, 7 Apr 2022 19:59:05 +0200
Subject: [PATCH 0539/1748] Add .DS_Store and Thumbs.db to .gitignore

Add OS specific local files that should not be included in a git repository - .DS_Store (macOS) and Thumbs.db (Windows)
---
 .gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.gitignore b/.gitignore
index 9322b0c815..0ec3f7ace8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,7 @@ CMakeLists.txt.user
 
 # place to put local temporary files
 tmp
+
+# OS specific local files
+.DS_Store
+Thumbs.db

From e1a59397c65d3b3eff19299fd703a7887a4b4e27 Mon Sep 17 00:00:00 2001
From: Joshua Quinones <jiq4449@ad.rit.edu>
Date: Mon, 28 Mar 2022 00:27:11 -0400
Subject: [PATCH 0540/1748] Renamed AssemblyStack to YulStack

All files, references, variables, comments, etc. were renamed to YulStack.
---
 libsolidity/codegen/ir/IRGenerator.cpp        |  6 +--
 libsolidity/interface/CompilerStack.cpp       | 14 +++----
 libsolidity/interface/StandardCompiler.cpp    |  6 +--
 libyul/CMakeLists.txt                         |  4 +-
 libyul/{AssemblyStack.cpp => YulStack.cpp}    | 38 +++++++++----------
 libyul/{AssemblyStack.h => YulStack.h}        |  8 ++--
 solc/CommandLineInterface.cpp                 | 24 ++++++------
 solc/CommandLineInterface.h                   |  4 +-
 solc/CommandLineParser.cpp                    |  4 +-
 solc/CommandLineParser.h                      |  6 +--
 test/libsolidity/InlineAssembly.cpp           | 34 ++++++++---------
 .../SolidityExecutionFramework.cpp            |  6 +--
 test/libsolidity/SolidityExecutionFramework.h |  2 +-
 test/libyul/Common.cpp                        |  6 +--
 test/libyul/EVMCodeTransformTest.cpp          |  6 +--
 test/libyul/EwasmTranslationTest.cpp          |  6 +--
 test/libyul/EwasmTranslationTest.h            |  6 +--
 test/libyul/ObjectCompilerTest.cpp            | 10 ++---
 test/libyul/ObjectParser.cpp                  | 10 ++---
 test/libyul/YulInterpreterTest.cpp            |  6 +--
 test/solc/CommandLineParser.cpp               | 38 +++++++++----------
 test/tools/ossfuzz/SolidityEvmoneInterface.h  |  2 +-
 test/tools/ossfuzz/YulEvmoneInterface.cpp     |  2 +-
 test/tools/ossfuzz/YulEvmoneInterface.h       |  6 +--
 .../ossfuzz/strictasm_assembly_ossfuzz.cpp    |  8 ++--
 test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp |  6 +--
 test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp  |  6 +--
 test/tools/ossfuzz/yulProtoFuzzer.cpp         |  8 ++--
 test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp  |  8 ++--
 test/tools/yulrun.cpp                         |  6 +--
 30 files changed, 148 insertions(+), 148 deletions(-)
 rename libyul/{AssemblyStack.cpp => YulStack.cpp} (89%)
 rename libyul/{AssemblyStack.h => YulStack.h} (97%)

diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index cb62cc292a..7c76f8344b 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -30,7 +30,7 @@
 #include <libsolidity/codegen/ABIFunctions.h>
 #include <libsolidity/codegen/CompilerUtils.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/Utilities.h>
 
 #include <libsolutil/Algorithms.h>
@@ -95,9 +95,9 @@ pair<string, string> IRGenerator::run(
 {
 	string ir = yul::reindent(generate(_contract, _cborMetadata, _otherYulSources));
 
-	yul::AssemblyStack asmStack(
+	yul::YulStack asmStack(
 		m_evmVersion,
-		yul::AssemblyStack::Language::StrictAssembly,
+		yul::YulStack::Language::StrictAssembly,
 		m_optimiserSettings,
 		m_context.debugInfoSelection()
 	);
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index de5bea1374..6560b0be5e 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -62,7 +62,7 @@
 #include <libyul/YulString.h>
 #include <libyul/AsmPrinter.h>
 #include <libyul/AsmJsonConverter.h>
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/AST.h>
 #include <libyul/AsmParser.h>
 
@@ -1382,9 +1382,9 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 		return;
 
 	// Re-parse the Yul IR in EVM dialect
-	yul::AssemblyStack stack(
+	yul::YulStack stack(
 		m_evmVersion,
-		yul::AssemblyStack::Language::StrictAssembly,
+		yul::YulStack::Language::StrictAssembly,
 		m_optimiserSettings,
 		m_debugInfoSelection
 	);
@@ -1414,22 +1414,22 @@ void CompilerStack::generateEwasm(ContractDefinition const& _contract)
 		return;
 
 	// Re-parse the Yul IR in EVM dialect
-	yul::AssemblyStack stack(
+	yul::YulStack stack(
 		m_evmVersion,
-		yul::AssemblyStack::Language::StrictAssembly,
+		yul::YulStack::Language::StrictAssembly,
 		m_optimiserSettings,
 		m_debugInfoSelection
 	);
 	stack.parseAndAnalyze("", compiledContract.yulIROptimized);
 
 	stack.optimize();
-	stack.translate(yul::AssemblyStack::Language::Ewasm);
+	stack.translate(yul::YulStack::Language::Ewasm);
 	stack.optimize();
 
 	//cout << yul::AsmPrinter{}(*stack.parserResult()->code) << endl;
 
 	// Turn into Ewasm text representation.
-	auto result = stack.assemble(yul::AssemblyStack::Machine::Ewasm);
+	auto result = stack.assemble(yul::YulStack::Machine::Ewasm);
 	compiledContract.ewasm = std::move(result.assembly);
 	compiledContract.ewasmObject = std::move(*result.bytecode);
 }
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 31400ccadc..9ca8de3eae 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -25,7 +25,7 @@
 #include <libsolidity/interface/ImportRemapper.h>
 
 #include <libsolidity/ast/ASTJsonConverter.h>
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/Exceptions.h>
 #include <libyul/optimiser/Suite.h>
 
@@ -1407,9 +1407,9 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 		return output;
 	}
 
-	AssemblyStack stack(
+	YulStack stack(
 		_inputsAndSettings.evmVersion,
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		_inputsAndSettings.optimiserSettings,
 		_inputsAndSettings.debugInfoSelection.has_value() ?
 			_inputsAndSettings.debugInfoSelection.value() :
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 806f094fe7..cc7033a0b8 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -30,8 +30,8 @@ add_library(yul
 	AsmParser.h
 	AsmPrinter.cpp
 	AsmPrinter.h
-	AssemblyStack.h
-	AssemblyStack.cpp
+	YulStack.h
+	YulStack.cpp
 	CompilabilityChecker.cpp
 	CompilabilityChecker.h
 	ControlFlowSideEffects.h
diff --git a/libyul/AssemblyStack.cpp b/libyul/YulStack.cpp
similarity index 89%
rename from libyul/AssemblyStack.cpp
rename to libyul/YulStack.cpp
index 3fefb9cafc..3bca7288cb 100644
--- a/libyul/AssemblyStack.cpp
+++ b/libyul/YulStack.cpp
@@ -21,7 +21,7 @@
  */
 
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>
@@ -48,16 +48,16 @@ using namespace solidity::langutil;
 
 namespace
 {
-Dialect const& languageToDialect(AssemblyStack::Language _language, EVMVersion _version)
+Dialect const& languageToDialect(YulStack::Language _language, EVMVersion _version)
 {
 	switch (_language)
 	{
-	case AssemblyStack::Language::Assembly:
-	case AssemblyStack::Language::StrictAssembly:
+	case YulStack::Language::Assembly:
+	case YulStack::Language::StrictAssembly:
 		return EVMDialect::strictAssemblyForEVMObjects(_version);
-	case AssemblyStack::Language::Yul:
+	case YulStack::Language::Yul:
 		return EVMDialectTyped::instance(_version);
-	case AssemblyStack::Language::Ewasm:
+	case YulStack::Language::Ewasm:
 		return WasmDialect::instance();
 	}
 	yulAssert(false, "");
@@ -88,14 +88,14 @@ evmasm::Assembly::OptimiserSettings translateOptimiserSettings(
 }
 
 
-CharStream const& AssemblyStack::charStream(string const& _sourceName) const
+CharStream const& YulStack::charStream(string const& _sourceName) const
 {
 	yulAssert(m_charStream, "");
 	yulAssert(m_charStream->name() == _sourceName, "");
 	return *m_charStream;
 }
 
-bool AssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string const& _source)
+bool YulStack::parseAndAnalyze(std::string const& _sourceName, std::string const& _source)
 {
 	m_errors.clear();
 	m_analysisSuccessful = false;
@@ -110,7 +110,7 @@ bool AssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string
 	return analyzeParsed();
 }
 
-void AssemblyStack::optimize()
+void YulStack::optimize()
 {
 	if (!m_optimiserSettings.runYulOptimiser)
 		return;
@@ -123,7 +123,7 @@ void AssemblyStack::optimize()
 	yulAssert(analyzeParsed(), "Invalid source code after optimization.");
 }
 
-void AssemblyStack::translate(AssemblyStack::Language _targetLanguage)
+void YulStack::translate(YulStack::Language _targetLanguage)
 {
 	if (m_language == _targetLanguage)
 		return;
@@ -141,14 +141,14 @@ void AssemblyStack::translate(AssemblyStack::Language _targetLanguage)
 	m_language = _targetLanguage;
 }
 
-bool AssemblyStack::analyzeParsed()
+bool YulStack::analyzeParsed()
 {
 	yulAssert(m_parserResult, "");
 	m_analysisSuccessful = analyzeParsed(*m_parserResult);
 	return m_analysisSuccessful;
 }
 
-bool AssemblyStack::analyzeParsed(Object& _object)
+bool YulStack::analyzeParsed(Object& _object)
 {
 	yulAssert(_object.code, "");
 	_object.analysisInfo = make_shared<AsmAnalysisInfo>();
@@ -168,7 +168,7 @@ bool AssemblyStack::analyzeParsed(Object& _object)
 	return success;
 }
 
-void AssemblyStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) const
+void YulStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) const
 {
 	EVMDialect const* dialect = nullptr;
 	switch (m_language)
@@ -188,7 +188,7 @@ void AssemblyStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) cons
 	EVMObjectCompiler::compile(*m_parserResult, _assembly, *dialect, _optimize);
 }
 
-void AssemblyStack::optimize(Object& _object, bool _isCreation)
+void YulStack::optimize(Object& _object, bool _isCreation)
 {
 	yulAssert(_object.code, "");
 	yulAssert(_object.analysisInfo, "");
@@ -214,7 +214,7 @@ void AssemblyStack::optimize(Object& _object, bool _isCreation)
 	);
 }
 
-MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
+MachineAssemblyObject YulStack::assemble(Machine _machine) const
 {
 	yulAssert(m_analysisSuccessful, "");
 	yulAssert(m_parserResult, "");
@@ -243,7 +243,7 @@ MachineAssemblyObject AssemblyStack::assemble(Machine _machine) const
 }
 
 std::pair<MachineAssemblyObject, MachineAssemblyObject>
-AssemblyStack::assembleWithDeployed(optional<string_view> _deployName) const
+YulStack::assembleWithDeployed(optional<string_view> _deployName) const
 {
 	auto [creationAssembly, deployedAssembly] = assembleEVMWithDeployed(_deployName);
 	yulAssert(creationAssembly, "");
@@ -277,7 +277,7 @@ AssemblyStack::assembleWithDeployed(optional<string_view> _deployName) const
 }
 
 std::pair<std::shared_ptr<evmasm::Assembly>, std::shared_ptr<evmasm::Assembly>>
-AssemblyStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
+YulStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
 {
 	yulAssert(m_analysisSuccessful, "");
 	yulAssert(m_parserResult, "");
@@ -317,7 +317,7 @@ AssemblyStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
 	return {make_shared<evmasm::Assembly>(assembly), {}};
 }
 
-string AssemblyStack::print(
+string YulStack::print(
 	CharStreamProvider const* _soliditySourceProvider
 ) const
 {
@@ -326,7 +326,7 @@ string AssemblyStack::print(
 	return m_parserResult->toString(&languageToDialect(m_language, m_evmVersion), m_debugInfoSelection, _soliditySourceProvider) + "\n";
 }
 
-shared_ptr<Object> AssemblyStack::parserResult() const
+shared_ptr<Object> YulStack::parserResult() const
 {
 	yulAssert(m_analysisSuccessful, "Analysis was not successful.");
 	yulAssert(m_parserResult, "");
diff --git a/libyul/AssemblyStack.h b/libyul/YulStack.h
similarity index 97%
rename from libyul/AssemblyStack.h
rename to libyul/YulStack.h
index 950265ca48..77d0025f14 100644
--- a/libyul/AssemblyStack.h
+++ b/libyul/YulStack.h
@@ -63,14 +63,14 @@ struct MachineAssemblyObject
  * Full assembly stack that can support EVM-assembly and Yul as input and EVM, EVM1.5 and
  * Ewasm as output.
  */
-class AssemblyStack: public langutil::CharStreamProvider
+class YulStack: public langutil::CharStreamProvider
 {
 public:
 	enum class Language { Yul, Assembly, StrictAssembly, Ewasm };
 	enum class Machine { EVM, Ewasm };
 
-	AssemblyStack():
-		AssemblyStack(
+	YulStack():
+		YulStack(
 			langutil::EVMVersion{},
 			Language::Assembly,
 			solidity::frontend::OptimiserSettings::none(),
@@ -78,7 +78,7 @@ class AssemblyStack: public langutil::CharStreamProvider
 		)
 	{}
 
-	AssemblyStack(
+	YulStack(
 		langutil::EVMVersion _evmVersion,
 		Language _language,
 		solidity::frontend::OptimiserSettings _optimiserSettings,
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 8cf3a8ebc1..40a428c955 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -41,7 +41,7 @@
 #include <libsolidity/lsp/LanguageServer.h>
 #include <libsolidity/lsp/Transport.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <libevmasm/Instruction.h>
 #include <libevmasm/Disassemble.h>
@@ -1014,18 +1014,18 @@ string CommandLineInterface::objectWithLinkRefsHex(evmasm::LinkerObject const& _
 	return out;
 }
 
-void CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul::AssemblyStack::Machine _targetMachine)
+void CommandLineInterface::assemble(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine)
 {
 	solAssert(m_options.input.mode == InputMode::Assembler, "");
 
 	bool successful = true;
-	map<string, yul::AssemblyStack> assemblyStacks;
+	map<string, yul::YulStack> yulStacks;
 	for (auto const& src: m_fileReader.sourceUnits())
 	{
 		// --no-optimize-yul option is not accepted in assembly mode.
 		solAssert(!m_options.optimizer.noOptimizeYul, "");
 
-		auto& stack = assemblyStacks[src.first] = yul::AssemblyStack(
+		auto& stack = yulStacks[src.first] = yul::YulStack(
 			m_options.output.evmVersion,
 			_language,
 			m_options.optimiserSettings(),
@@ -1040,7 +1040,7 @@ void CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 			stack.optimize();
 	}
 
-	for (auto const& sourceAndStack: assemblyStacks)
+	for (auto const& sourceAndStack: yulStacks)
 	{
 		auto const& stack = sourceAndStack.second;
 		SourceReferenceFormatter formatter(serr(false), stack, coloredOutput(m_options), m_options.formatting.withErrorIds);
@@ -1063,11 +1063,11 @@ void CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 	for (auto const& src: m_fileReader.sourceUnits())
 	{
 		string machine =
-			_targetMachine == yul::AssemblyStack::Machine::EVM ? "EVM" :
+			_targetMachine == yul::YulStack::Machine::EVM ? "EVM" :
 			"Ewasm";
 		sout() << endl << "======= " << src.first << " (" << machine << ") =======" << endl;
 
-		yul::AssemblyStack& stack = assemblyStacks[src.first];
+		yul::YulStack& stack = yulStacks[src.first];
 
 		if (m_options.compiler.outputs.irOptimized)
 		{
@@ -1077,9 +1077,9 @@ void CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 			sout() << stack.print() << endl;
 		}
 
-		if (_language != yul::AssemblyStack::Language::Ewasm && _targetMachine == yul::AssemblyStack::Machine::Ewasm)
+		if (_language != yul::YulStack::Language::Ewasm && _targetMachine == yul::YulStack::Machine::Ewasm)
 		{
-			stack.translate(yul::AssemblyStack::Language::Ewasm);
+			stack.translate(yul::YulStack::Language::Ewasm);
 			stack.optimize();
 
 			if (m_options.compiler.outputs.ewasmIR)
@@ -1103,10 +1103,10 @@ void CommandLineInterface::assemble(yul::AssemblyStack::Language _language, yul:
 				serr() << "No binary representation found." << endl;
 		}
 
-		solAssert(_targetMachine == yul::AssemblyStack::Machine::Ewasm || _targetMachine == yul::AssemblyStack::Machine::EVM, "");
+		solAssert(_targetMachine == yul::YulStack::Machine::Ewasm || _targetMachine == yul::YulStack::Machine::EVM, "");
 		if (
-			(_targetMachine == yul::AssemblyStack::Machine::EVM && m_options.compiler.outputs.asm_) ||
-			(_targetMachine == yul::AssemblyStack::Machine::Ewasm && m_options.compiler.outputs.ewasm)
+			(_targetMachine == yul::YulStack::Machine::EVM && m_options.compiler.outputs.asm_) ||
+			(_targetMachine == yul::YulStack::Machine::Ewasm && m_options.compiler.outputs.ewasm)
 		)
 		{
 			sout() << endl << "Text representation:" << endl;
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 951731825c..b7ab158f9e 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -27,7 +27,7 @@
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/DebugSettings.h>
 #include <libsolidity/interface/FileReader.h>
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <iostream>
 #include <memory>
@@ -90,7 +90,7 @@ class CommandLineInterface
 	/// @returns the full object with library placeholder hints in hex.
 	static std::string objectWithLinkRefsHex(evmasm::LinkerObject const& _obj);
 
-	void assemble(yul::AssemblyStack::Language _language, yul::AssemblyStack::Machine _targetMachine);
+	void assemble(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine);
 
 	void outputCompilationResults();
 
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 4cc346737f..1a3fbed0ee 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -1132,8 +1132,8 @@ void CommandLineParser::processArgs()
 		}
 
 		// switch to assembly mode
-		using Input = yul::AssemblyStack::Language;
-		using Machine = yul::AssemblyStack::Machine;
+		using Input = yul::YulStack::Language;
+		using Machine = yul::YulStack::Machine;
 		m_options.assembly.inputLanguage = m_args.count(g_strYul) ? Input::Yul : (m_args.count(g_strStrictAssembly) ? Input::StrictAssembly : Input::Assembly);
 
 		if (m_args.count(g_strMachine))
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 9723d5e06e..108a16cd23 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -25,7 +25,7 @@
 #include <libsolidity/interface/FileReader.h>
 #include <libsolidity/interface/ImportRemapper.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/EVMVersion.h>
@@ -190,8 +190,8 @@ struct CommandLineOptions
 
 	struct
 	{
-		yul::AssemblyStack::Machine targetMachine = yul::AssemblyStack::Machine::EVM;
-		yul::AssemblyStack::Language inputLanguage = yul::AssemblyStack::Language::StrictAssembly;
+		yul::YulStack::Machine targetMachine = yul::YulStack::Machine::EVM;
+		yul::YulStack::Language inputLanguage = yul::YulStack::Language::StrictAssembly;
 	} assembly;
 
 	struct
diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp
index f0e5e455fd..314a0d7604 100644
--- a/test/libsolidity/InlineAssembly.cpp
+++ b/test/libsolidity/InlineAssembly.cpp
@@ -26,7 +26,7 @@
 
 #include <libsolidity/ast/AST.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/Exceptions.h>
@@ -56,11 +56,11 @@ std::optional<Error> parseAndReturnFirstError(
 	string const& _source,
 	bool _assemble = false,
 	bool _allowWarnings = true,
-	AssemblyStack::Language _language = AssemblyStack::Language::Assembly,
-	AssemblyStack::Machine _machine = AssemblyStack::Machine::EVM
+	YulStack::Language _language = YulStack::Language::Assembly,
+	YulStack::Machine _machine = YulStack::Machine::EVM
 )
 {
-	AssemblyStack stack(
+	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
 		_language,
 		solidity::frontend::OptimiserSettings::none(),
@@ -103,24 +103,24 @@ bool successParse(
 	string const& _source,
 	bool _assemble = false,
 	bool _allowWarnings = true,
-	AssemblyStack::Language _language = AssemblyStack::Language::Assembly,
-	AssemblyStack::Machine _machine = AssemblyStack::Machine::EVM
+	YulStack::Language _language = YulStack::Language::Assembly,
+	YulStack::Machine _machine = YulStack::Machine::EVM
 )
 {
 	return !parseAndReturnFirstError(_source, _assemble, _allowWarnings, _language, _machine);
 }
 
-bool successAssemble(string const& _source, bool _allowWarnings = true, AssemblyStack::Language _language = AssemblyStack::Language::Assembly)
+bool successAssemble(string const& _source, bool _allowWarnings = true, YulStack::Language _language = YulStack::Language::Assembly)
 {
 	return
-		successParse(_source, true, _allowWarnings, _language, AssemblyStack::Machine::EVM);
+		successParse(_source, true, _allowWarnings, _language, YulStack::Machine::EVM);
 }
 
 Error expectError(
 	std::string const& _source,
 	bool _assemble,
 	bool _allowWarnings = false,
-	AssemblyStack::Language _language = AssemblyStack::Language::Assembly
+	YulStack::Language _language = YulStack::Language::Assembly
 )
 {
 
@@ -131,9 +131,9 @@ Error expectError(
 
 void parsePrintCompare(string const& _source, bool _canWarn = false)
 {
-	AssemblyStack stack(
+	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
-		AssemblyStack::Language::Assembly,
+		YulStack::Language::Assembly,
 		OptimiserSettings::none(),
 		DebugInfoSelection::None()
 	);
@@ -157,7 +157,7 @@ do \
 } while(0)
 
 #define CHECK_ERROR(text, assemble, typ, substring, warnings) \
-CHECK_ERROR_LANG(text, assemble, typ, substring, warnings, AssemblyStack::Language::Assembly)
+CHECK_ERROR_LANG(text, assemble, typ, substring, warnings, YulStack::Language::Assembly)
 
 #define CHECK_PARSE_ERROR(text, type, substring) \
 CHECK_ERROR(text, false, type, substring, false)
@@ -169,13 +169,13 @@ CHECK_ERROR(text, false, type, substring, false)
 CHECK_ERROR(text, true, type, substring, false)
 
 #define CHECK_STRICT_ERROR(text, type, substring) \
-CHECK_ERROR_LANG(text, false, type, substring, false, AssemblyStack::Language::StrictAssembly)
+CHECK_ERROR_LANG(text, false, type, substring, false, YulStack::Language::StrictAssembly)
 
 #define CHECK_STRICT_WARNING(text, type, substring) \
-CHECK_ERROR(text, false, type, substring, false, AssemblyStack::Language::StrictAssembly)
+CHECK_ERROR(text, false, type, substring, false, YulStack::Language::StrictAssembly)
 
 #define SUCCESS_STRICT(text) \
-do { successParse((text), false, false, AssemblyStack::Language::StrictAssembly); } while (false)
+do { successParse((text), false, false, YulStack::Language::StrictAssembly); } while (false)
 
 
 BOOST_AUTO_TEST_SUITE(SolidityInlineAssembly)
@@ -221,9 +221,9 @@ BOOST_AUTO_TEST_CASE(print_string_literal_unicode)
 {
 	string source = "{ let x := \"\\u1bac\" }";
 	string parsed = "object \"object\" {\n    code { let x := \"\\xe1\\xae\\xac\" }\n}\n";
-	AssemblyStack stack(
+	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
-		AssemblyStack::Language::Assembly,
+		YulStack::Language::Assembly,
 		OptimiserSettings::none(),
 		DebugInfoSelection::None()
 	);
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index 7ff226a694..70d0b2a6e4 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -97,9 +97,9 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 				else if (forceEnableOptimizer)
 					optimiserSettings = OptimiserSettings::full();
 
-				yul::AssemblyStack asmStack(
+				yul::YulStack asmStack(
 					m_evmVersion,
-					yul::AssemblyStack::Language::StrictAssembly,
+					yul::YulStack::Language::StrictAssembly,
 					optimiserSettings,
 					DebugInfoSelection::All()
 				);
@@ -109,7 +109,7 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 				try
 				{
 					asmStack.optimize();
-					obj = move(*asmStack.assemble(yul::AssemblyStack::Machine::EVM).bytecode);
+					obj = move(*asmStack.assemble(yul::YulStack::Machine::EVM).bytecode);
 					obj.link(_libraryAddresses);
 					break;
 				}
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
index 202addffaf..dfa4951529 100644
--- a/test/libsolidity/SolidityExecutionFramework.h
+++ b/test/libsolidity/SolidityExecutionFramework.h
@@ -30,7 +30,7 @@
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/DebugSettings.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 namespace solidity::frontend::test
 {
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index fc9be20012..f40f422a8a 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -26,7 +26,7 @@
 #include <libyul/optimiser/Disambiguator.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmPrinter.h>
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/backends/wasm/WasmDialect.h>
@@ -55,9 +55,9 @@ Dialect const& defaultDialect(bool _yul)
 
 pair<shared_ptr<Block>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(string const& _source, bool _yul)
 {
-	AssemblyStack stack(
+	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
-		_yul ? AssemblyStack::Language::Yul : AssemblyStack::Language::StrictAssembly,
+		_yul ? YulStack::Language::Yul : YulStack::Language::StrictAssembly,
 		solidity::test::CommonOptions::get().optimize ?
 			solidity::frontend::OptimiserSettings::standard() :
 			solidity::frontend::OptimiserSettings::minimal(),
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
index 679493f35f..c1f6ae5df5 100644
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ b/test/libyul/EVMCodeTransformTest.cpp
@@ -19,7 +19,7 @@
 #include <test/libyul/EVMCodeTransformTest.h>
 #include <test/libyul/Common.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/backends/evm/EthAssemblyAdapter.h>
 #include <libyul/backends/evm/EVMObjectCompiler.h>
 
@@ -51,9 +51,9 @@ TestCase::TestResult EVMCodeTransformTest::run(ostream& _stream, string const& _
 	solidity::frontend::OptimiserSettings settings = solidity::frontend::OptimiserSettings::none();
 	settings.runYulOptimiser = false;
 	settings.optimizeStackAllocation = m_stackOpt;
-	AssemblyStack stack(
+	YulStack stack(
 		EVMVersion{},
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		settings,
 		DebugInfoSelection::All()
 	);
diff --git a/test/libyul/EwasmTranslationTest.cpp b/test/libyul/EwasmTranslationTest.cpp
index 17b7f18685..34a7144040 100644
--- a/test/libyul/EwasmTranslationTest.cpp
+++ b/test/libyul/EwasmTranslationTest.cpp
@@ -25,7 +25,7 @@
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/backends/wasm/WasmDialect.h>
 #include <libyul/backends/wasm/EVMToEwasmTranslator.h>
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/AST.h>
 #include <libyul/Object.h>
@@ -80,9 +80,9 @@ TestCase::TestResult EwasmTranslationTest::run(ostream& _stream, string const& _
 
 bool EwasmTranslationTest::parse(ostream& _stream, string const& _linePrefix, bool const _formatted)
 {
-	m_stack = AssemblyStack(
+	m_stack = YulStack(
 		solidity::test::CommonOptions::get().evmVersion(),
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::All()
 	);
diff --git a/test/libyul/EwasmTranslationTest.h b/test/libyul/EwasmTranslationTest.h
index eba82beee1..d54b8732a0 100644
--- a/test/libyul/EwasmTranslationTest.h
+++ b/test/libyul/EwasmTranslationTest.h
@@ -20,12 +20,12 @@
 
 #include <test/TestCase.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 namespace solidity::yul
 {
 struct Object;
-class AssemblyStack;
+class YulStack;
 }
 
 namespace solidity::yul::test
@@ -48,7 +48,7 @@ class EwasmTranslationTest: public solidity::frontend::test::EVMVersionRestricte
 	std::string interpret();
 
 	std::shared_ptr<Object> m_object;
-	AssemblyStack m_stack;
+	YulStack m_stack;
 };
 
 }
diff --git a/test/libyul/ObjectCompilerTest.cpp b/test/libyul/ObjectCompilerTest.cpp
index f22870952d..dcb7158c2f 100644
--- a/test/libyul/ObjectCompilerTest.cpp
+++ b/test/libyul/ObjectCompilerTest.cpp
@@ -22,7 +22,7 @@
 
 #include <libsolutil/AnsiColorized.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <libevmasm/Instruction.h>
 #include <libevmasm/Disassemble.h>
@@ -63,9 +63,9 @@ ObjectCompilerTest::ObjectCompilerTest(string const& _filename):
 
 TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
 {
-	AssemblyStack stack(
+	YulStack stack(
 		EVMVersion(),
-		m_wasm ? AssemblyStack::Language::Ewasm : AssemblyStack::Language::StrictAssembly,
+		m_wasm ? YulStack::Language::Ewasm : YulStack::Language::StrictAssembly,
 		OptimiserSettings::preset(m_optimisationPreset),
 		DebugInfoSelection::All()
 	);
@@ -80,7 +80,7 @@ TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _li
 
 	if (m_wasm)
 	{
-		MachineAssemblyObject obj = stack.assemble(AssemblyStack::Machine::Ewasm);
+		MachineAssemblyObject obj = stack.assemble(YulStack::Machine::Ewasm);
 		solAssert(obj.bytecode, "");
 
 		m_obtainedResult = "Text:\n" + obj.assembly + "\n";
@@ -88,7 +88,7 @@ TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _li
 	}
 	else
 	{
-		MachineAssemblyObject obj = stack.assemble(AssemblyStack::Machine::EVM);
+		MachineAssemblyObject obj = stack.assemble(YulStack::Machine::EVM);
 		solAssert(obj.bytecode, "");
 		solAssert(obj.sourceMappings, "");
 
diff --git a/test/libyul/ObjectParser.cpp b/test/libyul/ObjectParser.cpp
index 1d6f0bed33..bee0025afa 100644
--- a/test/libyul/ObjectParser.cpp
+++ b/test/libyul/ObjectParser.cpp
@@ -26,7 +26,7 @@
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/Scanner.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
 #include <libsolidity/interface/OptimiserSettings.h>
@@ -58,9 +58,9 @@ pair<bool, ErrorList> parse(string const& _source)
 {
 	try
 	{
-		AssemblyStack asmStack(
+		YulStack asmStack(
 			solidity::test::CommonOptions::get().evmVersion(),
-			AssemblyStack::Language::StrictAssembly,
+			YulStack::Language::StrictAssembly,
 			solidity::frontend::OptimiserSettings::none(),
 			DebugInfoSelection::All()
 		);
@@ -180,9 +180,9 @@ BOOST_AUTO_TEST_CASE(to_string)
 }
 )";
 	expectation = boost::replace_all_copy(expectation, "\t", "    ");
-	AssemblyStack asmStack(
+	YulStack asmStack(
 		solidity::test::CommonOptions::get().evmVersion(),
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::All()
 	);
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index 3e7de4d170..3c890972ee 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -23,7 +23,7 @@
 #include <test/Common.h>
 
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/AsmAnalysisInfo.h>
 
 #include <liblangutil/DebugInfoSelection.h>
@@ -65,9 +65,9 @@ TestCase::TestResult YulInterpreterTest::run(ostream& _stream, string const& _li
 
 bool YulInterpreterTest::parse(ostream& _stream, string const& _linePrefix, bool const _formatted)
 {
-	AssemblyStack stack(
+	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::All()
 	);
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index b4be5a83a1..22b3bd8355 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -233,23 +233,23 @@ BOOST_AUTO_TEST_CASE(via_ir_options)
 
 BOOST_AUTO_TEST_CASE(assembly_mode_options)
 {
-	static vector<tuple<vector<string>, AssemblyStack::Machine, AssemblyStack::Language>> const allowedCombinations = {
-		{{"--machine=ewasm", "--yul-dialect=ewasm", "--assemble"}, AssemblyStack::Machine::Ewasm, AssemblyStack::Language::Ewasm},
-		{{"--machine=ewasm", "--yul-dialect=ewasm", "--yul"}, AssemblyStack::Machine::Ewasm, AssemblyStack::Language::Ewasm},
-		{{"--machine=ewasm", "--yul-dialect=ewasm", "--strict-assembly"}, AssemblyStack::Machine::Ewasm, AssemblyStack::Language::Ewasm},
-		{{"--machine=ewasm", "--yul-dialect=evm", "--assemble"}, AssemblyStack::Machine::Ewasm, AssemblyStack::Language::StrictAssembly},
-		{{"--machine=ewasm", "--yul-dialect=evm", "--yul"}, AssemblyStack::Machine::Ewasm, AssemblyStack::Language::StrictAssembly},
-		{{"--machine=ewasm", "--yul-dialect=evm", "--strict-assembly"}, AssemblyStack::Machine::Ewasm, AssemblyStack::Language::StrictAssembly},
-		{{"--machine=ewasm", "--strict-assembly"}, AssemblyStack::Machine::Ewasm, AssemblyStack::Language::Ewasm},
-		{{"--machine=evm", "--yul-dialect=evm", "--assemble"}, AssemblyStack::Machine::EVM, AssemblyStack::Language::StrictAssembly},
-		{{"--machine=evm", "--yul-dialect=evm", "--yul"}, AssemblyStack::Machine::EVM, AssemblyStack::Language::StrictAssembly},
-		{{"--machine=evm", "--yul-dialect=evm", "--strict-assembly"}, AssemblyStack::Machine::EVM, AssemblyStack::Language::StrictAssembly},
-		{{"--machine=evm", "--assemble"}, AssemblyStack::Machine::EVM, AssemblyStack::Language::Assembly},
-		{{"--machine=evm", "--yul"}, AssemblyStack::Machine::EVM, AssemblyStack::Language::Yul},
-		{{"--machine=evm", "--strict-assembly"}, AssemblyStack::Machine::EVM, AssemblyStack::Language::StrictAssembly},
-		{{"--assemble"}, AssemblyStack::Machine::EVM, AssemblyStack::Language::Assembly},
-		{{"--yul"}, AssemblyStack::Machine::EVM, AssemblyStack::Language::Yul},
-		{{"--strict-assembly"}, AssemblyStack::Machine::EVM, AssemblyStack::Language::StrictAssembly},
+	static vector<tuple<vector<string>, YulStack::Machine, YulStack::Language>> const allowedCombinations = {
+		{{"--machine=ewasm", "--yul-dialect=ewasm", "--assemble"}, YulStack::Machine::Ewasm, YulStack::Language::Ewasm},
+		{{"--machine=ewasm", "--yul-dialect=ewasm", "--yul"}, YulStack::Machine::Ewasm, YulStack::Language::Ewasm},
+		{{"--machine=ewasm", "--yul-dialect=ewasm", "--strict-assembly"}, YulStack::Machine::Ewasm, YulStack::Language::Ewasm},
+		{{"--machine=ewasm", "--yul-dialect=evm", "--assemble"}, YulStack::Machine::Ewasm, YulStack::Language::StrictAssembly},
+		{{"--machine=ewasm", "--yul-dialect=evm", "--yul"}, YulStack::Machine::Ewasm, YulStack::Language::StrictAssembly},
+		{{"--machine=ewasm", "--yul-dialect=evm", "--strict-assembly"}, YulStack::Machine::Ewasm, YulStack::Language::StrictAssembly},
+		{{"--machine=ewasm", "--strict-assembly"}, YulStack::Machine::Ewasm, YulStack::Language::Ewasm},
+		{{"--machine=evm", "--yul-dialect=evm", "--assemble"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
+		{{"--machine=evm", "--yul-dialect=evm", "--yul"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
+		{{"--machine=evm", "--yul-dialect=evm", "--strict-assembly"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
+		{{"--machine=evm", "--assemble"}, YulStack::Machine::EVM, YulStack::Language::Assembly},
+		{{"--machine=evm", "--yul"}, YulStack::Machine::EVM, YulStack::Language::Yul},
+		{{"--machine=evm", "--strict-assembly"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
+		{{"--assemble"}, YulStack::Machine::EVM, YulStack::Language::Assembly},
+		{{"--yul"}, YulStack::Machine::EVM, YulStack::Language::Yul},
+		{{"--strict-assembly"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
 	};
 
 	for (auto const& [assemblyOptions, expectedMachine, expectedLanguage]: allowedCombinations)
@@ -302,7 +302,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 			"--ewasm-ir",
 		};
 		commandLine += assemblyOptions;
-		if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
+		if (expectedLanguage == YulStack::Language::StrictAssembly || expectedLanguage == YulStack::Language::Ewasm)
 			commandLine += vector<string>{
 				"--optimize",
 				"--optimize-runs=1000",
@@ -341,7 +341,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		expectedOptions.compiler.outputs.irOptimized = true;
 		expectedOptions.compiler.outputs.ewasm = true;
 		expectedOptions.compiler.outputs.ewasmIR = true;
-		if (expectedLanguage == AssemblyStack::Language::StrictAssembly || expectedLanguage == AssemblyStack::Language::Ewasm)
+		if (expectedLanguage == YulStack::Language::StrictAssembly || expectedLanguage == YulStack::Language::Ewasm)
 		{
 			expectedOptions.optimizer.enabled = true;
 			expectedOptions.optimizer.yulSteps = "agf";
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.h b/test/tools/ossfuzz/SolidityEvmoneInterface.h
index da0fed58f2..734caf560a 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.h
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.h
@@ -22,7 +22,7 @@
 
 #include <libsolidity/interface/CompilerStack.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <libsolutil/Keccak256.h>
 
diff --git a/test/tools/ossfuzz/YulEvmoneInterface.cpp b/test/tools/ossfuzz/YulEvmoneInterface.cpp
index e21a881c65..2d7ddccc18 100644
--- a/test/tools/ossfuzz/YulEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/YulEvmoneInterface.cpp
@@ -35,7 +35,7 @@ bytes YulAssembler::assemble()
 
 	if (m_optimiseYul)
 		m_stack.optimize();
-	return m_stack.assemble(AssemblyStack::Machine::EVM).bytecode->bytecode;
+	return m_stack.assemble(YulStack::Machine::EVM).bytecode->bytecode;
 }
 
 evmc::result YulEvmoneUtility::deployCode(bytes const& _input, EVMHost& _host)
diff --git a/test/tools/ossfuzz/YulEvmoneInterface.h b/test/tools/ossfuzz/YulEvmoneInterface.h
index 0b3384940b..709e5475f0 100644
--- a/test/tools/ossfuzz/YulEvmoneInterface.h
+++ b/test/tools/ossfuzz/YulEvmoneInterface.h
@@ -19,7 +19,7 @@
 
 #include <test/EVMHost.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <libsolidity/interface/OptimiserSettings.h>
 
@@ -37,7 +37,7 @@ class YulAssembler
 	):
 		m_stack(
 			_version,
-			solidity::yul::AssemblyStack::Language::StrictAssembly,
+			solidity::yul::YulStack::Language::StrictAssembly,
 			_optSettings,
 			langutil::DebugInfoSelection::All()
 		),
@@ -46,7 +46,7 @@ class YulAssembler
 	{}
 	solidity::bytes assemble();
 private:
-	solidity::yul::AssemblyStack m_stack;
+	solidity::yul::YulStack m_stack;
 	std::string m_yulProgram;
 	bool m_optimiseYul;
 };
diff --git a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
index 7142ec23c0..a353ca10b4 100644
--- a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
@@ -16,7 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/backends/evm/EVMCodeTransform.h>
 
 #include <liblangutil/DebugInfoSelection.h>
@@ -37,9 +37,9 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	YulStringRepository::reset();
 
 	string input(reinterpret_cast<char const*>(_data), _size);
-	AssemblyStack stack(
+	YulStack stack(
 		langutil::EVMVersion(),
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		langutil::DebugInfoSelection::All()
 	);
@@ -49,7 +49,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 
 	try
 	{
-		MachineAssemblyObject obj = stack.assemble(AssemblyStack::Machine::EVM);
+		MachineAssemblyObject obj = stack.assemble(YulStack::Machine::EVM);
 		solAssert(obj.bytecode, "");
 	}
 	catch (StackTooDeepError const&)
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
index dce6c61623..dd66102c17 100644
--- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
@@ -20,7 +20,7 @@
 #include <libyul/AsmAnalysis.h>
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/Exceptions.h>
@@ -60,9 +60,9 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 
 	YulStringRepository::reset();
 
-	AssemblyStack stack(
+	YulStack stack(
 		langutil::EVMVersion(),
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
 	);
diff --git a/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
index 05a0179bfc..94a837d5ab 100644
--- a/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
@@ -16,7 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/EVMVersion.h>
@@ -38,9 +38,9 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	YulStringRepository::reset();
 
 	string input(reinterpret_cast<char const*>(_data), _size);
-	AssemblyStack stack(
+	YulStack stack(
 		langutil::EVMVersion(),
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
 	);
diff --git a/test/tools/ossfuzz/yulProtoFuzzer.cpp b/test/tools/ossfuzz/yulProtoFuzzer.cpp
index ca15b37695..74183aa3f1 100644
--- a/test/tools/ossfuzz/yulProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/yulProtoFuzzer.cpp
@@ -25,7 +25,7 @@
 
 #include <test/libyul/YulOptimizerTestCommon.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/Exceptions.h>
 
 #include <libyul/backends/evm/EVMDialect.h>
@@ -61,10 +61,10 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 
 	YulStringRepository::reset();
 
-	// AssemblyStack entry point
-	AssemblyStack stack(
+	// YulStack entry point
+	YulStack stack(
 		version,
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
 	);
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index 4cafccb284..c3ad9c9f3f 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -26,7 +26,7 @@
 
 #include <src/libfuzzer/libfuzzer_macro.h>
 
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/Exceptions.h>
 
@@ -60,10 +60,10 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 
 	YulStringRepository::reset();
 
-	// AssemblyStack entry point
-	AssemblyStack stack(
+	// YulStack entry point
+	YulStack stack(
 		version,
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
 	);
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index 5702997683..fd43d222d2 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -25,7 +25,7 @@
 #include <libyul/AsmAnalysis.h>
 #include <libyul/Dialect.h>
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AssemblyStack.h>
+#include <libyul/YulStack.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/Exceptions.h>
@@ -56,9 +56,9 @@ namespace
 
 pair<shared_ptr<Block>, shared_ptr<AsmAnalysisInfo>> parse(string const& _source)
 {
-	AssemblyStack stack(
+	YulStack stack(
 		langutil::EVMVersion(),
-		AssemblyStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::Default()
 	);

From a608bc12f78c5eca014719cfb18c018fa0286a24 Mon Sep 17 00:00:00 2001
From: Tharun K <53267275+tharun634@users.noreply.github.com>
Date: Thu, 7 Apr 2022 18:02:06 +0530
Subject: [PATCH 0541/1748] Moved `docs.sh` script to `docs/`

---
 .circleci/config.yml      | 2 +-
 docs/contributing.rst     | 2 +-
 {scripts => docs}/docs.sh | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {scripts => docs}/docs.sh (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bcfc99cd7f..1b6fc6b9d1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -987,7 +987,7 @@ jobs:
       - run: *setup_prerelease_commit_hash
       - run:
           name: Build documentation
-          command: ./scripts/docs.sh
+          command: ./docs/docs.sh
       - store_artifacts:
           path: docs/_build/html/
           destination: docs-html
diff --git a/docs/contributing.rst b/docs/contributing.rst
index ba5a0a0f8f..0c2ee9124b 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -475,7 +475,7 @@ For example ``pragma solidity >=0.4.0 <0.9.0;``.
 Running Documentation Tests
 ---------------------------
 
-Make sure your contributions pass our documentation tests by running ``./scripts/docs.sh`` that installs dependencies
+Make sure your contributions pass our documentation tests by running ``./docs/docs.sh`` that installs dependencies
 needed for documentation and checks for any problems such as broken links or syntax issues.
 
 Solidity Language Design
diff --git a/scripts/docs.sh b/docs/docs.sh
similarity index 100%
rename from scripts/docs.sh
rename to docs/docs.sh

From efd0024853f1867c6703621aeddc28614b896d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 8 Apr 2022 20:40:17 +0200
Subject: [PATCH 0542/1748] docs.sh: Make the script independent of the working
 directory

---
 docs/docs.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/docs.sh b/docs/docs.sh
index 30bb96f614..ec3f3899a3 100755
--- a/docs/docs.sh
+++ b/docs/docs.sh
@@ -27,7 +27,9 @@
 #------------------------------------------------------------------------------
 
 set -e
-cd docs
+
+script_dir="$(dirname "$0")"
+
+cd "${script_dir}"
 pip3 install -r requirements.txt --upgrade --upgrade-strategy eager
 sphinx-build -nW -b html -d _build/doctrees . _build/html
-cd ..

From 23e77e9a8483b8a865fe419b5d5af7c7687384e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 8 Apr 2022 20:40:52 +0200
Subject: [PATCH 0543/1748] docs.sh: Fail on all errors, includding undefined
 variables and failures in piped commands

---
 docs/docs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docs.sh b/docs/docs.sh
index ec3f3899a3..f2c5667612 100755
--- a/docs/docs.sh
+++ b/docs/docs.sh
@@ -26,7 +26,7 @@
 # (c) 2016 solidity contributors.
 #------------------------------------------------------------------------------
 
-set -e
+set -euo pipefail
 
 script_dir="$(dirname "$0")"
 

From 9867fbcfb0a19dc5ad328c2778848888bf12da56 Mon Sep 17 00:00:00 2001
From: "sourabh.xyz" <swasti@sourabh.xyz>
Date: Sat, 9 Apr 2022 13:17:07 +0530
Subject: [PATCH 0544/1748] Update inheritance.rst
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed typo 'owned' → 'Owned'.
---
 docs/contracts/inheritance.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contracts/inheritance.rst b/docs/contracts/inheritance.rst
index 25838f3c58..a33a36d27b 100644
--- a/docs/contracts/inheritance.rst
+++ b/docs/contracts/inheritance.rst
@@ -76,9 +76,9 @@ Details are given in the following example.
     }
 
 
-    // Multiple inheritance is possible. Note that `owned` is
+    // Multiple inheritance is possible. Note that `Owned` is
     // also a base class of `Destructible`, yet there is only a single
-    // instance of `owned` (as for virtual inheritance in C++).
+    // instance of `Owned` (as for virtual inheritance in C++).
     contract Named is Owned, Destructible {
         constructor(bytes32 name) {
             Config config = Config(0xD5f9D8D94886E70b06E474c3fB14Fd43E2f23970);

From b74a27e946ece79b5613990f3074a49fc9e29c10 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Fri, 18 Mar 2022 07:07:03 +0100
Subject: [PATCH 0545/1748] ExpressionClasses performance optimization

---
 libevmasm/ExpressionClasses.cpp | 31 ++++++++++++++++++++++++++-----
 libevmasm/ExpressionClasses.h   | 18 ++++++++++++------
 2 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/libevmasm/ExpressionClasses.cpp b/libevmasm/ExpressionClasses.cpp
index c17ff9c297..8cd97b6a89 100644
--- a/libevmasm/ExpressionClasses.cpp
+++ b/libevmasm/ExpressionClasses.cpp
@@ -23,38 +23,59 @@
  */
 
 #include <libevmasm/ExpressionClasses.h>
+
 #include <libevmasm/Assembly.h>
 #include <libevmasm/CommonSubexpressionEliminator.h>
 #include <libevmasm/SimplificationRules.h>
 
+#include <boost/container_hash/hash.hpp>
+
 #include <functional>
-#include <tuple>
 #include <limits>
+#include <tuple>
 
 using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
 
-bool ExpressionClasses::Expression::operator<(ExpressionClasses::Expression const& _other) const
+bool ExpressionClasses::Expression::operator==(ExpressionClasses::Expression const& _other) const
 {
 	assertThrow(!!item && !!_other.item, OptimizerException, "");
 	auto type = item->type();
 	auto otherType = _other.item->type();
 	if (type != otherType)
-		return type < otherType;
+		return false;
 	else if (type == Operation)
 	{
 		auto instr = item->instruction();
 		auto otherInstr = _other.item->instruction();
-		return std::tie(instr, arguments, sequenceNumber) <
+		return std::tie(instr, arguments, sequenceNumber) ==
 			std::tie(otherInstr, _other.arguments, _other.sequenceNumber);
 	}
 	else
-		return std::tie(item->data(), arguments, sequenceNumber) <
+		return std::tie(item->data(), arguments, sequenceNumber) ==
 			std::tie(_other.item->data(), _other.arguments, _other.sequenceNumber);
 }
 
+std::size_t ExpressionClasses::Expression::ExpressionHash::operator()(Expression const& _expression) const
+{
+	assertThrow(!!_expression.item, OptimizerException, "");
+	std::size_t seed = 0;
+	auto type = _expression.item->type();
+	boost::hash_combine(seed, type);
+
+	if (type == Operation)
+		boost::hash_combine(seed, _expression.item->instruction());
+	else
+		boost::hash_combine(seed, _expression.item->data());
+
+	boost::hash_range(seed, _expression.arguments.begin(), _expression.arguments.end());
+	boost::hash_combine(seed, _expression.sequenceNumber);
+
+	return seed;
+}
+
 ExpressionClasses::Id ExpressionClasses::find(
 	AssemblyItem const& _item,
 	Ids const& _arguments,
diff --git a/libevmasm/ExpressionClasses.h b/libevmasm/ExpressionClasses.h
index 7df907517e..8d4159fc7b 100644
--- a/libevmasm/ExpressionClasses.h
+++ b/libevmasm/ExpressionClasses.h
@@ -24,13 +24,13 @@
 
 #pragma once
 
-#include <libsolutil/Common.h>
 #include <libevmasm/AssemblyItem.h>
 
-#include <vector>
-#include <map>
+#include <libsolutil/Common.h>
+
 #include <memory>
-#include <set>
+#include <unordered_set>
+#include <vector>
 
 namespace solidity::langutil
 {
@@ -61,9 +61,15 @@ class ExpressionClasses
 		/// Storage modification sequence, only used for storage and memory operations.
 		unsigned sequenceNumber = 0;
 		/// Behaves as if this was a tuple of (item->type(), item->data(), arguments, sequenceNumber).
-		bool operator<(Expression const& _other) const;
+		bool operator==(Expression const& _other) const;
+
+		struct ExpressionHash
+		{
+			std::size_t operator()(Expression const& _expression) const;
+		};
 	};
 
+
 	/// Retrieves the id of the expression equivalence class resulting from the given item applied to the
 	/// given classes, might also create a new one.
 	/// @param _copyItem if true, copies the assembly item to an internal storage instead of just
@@ -122,7 +128,7 @@ class ExpressionClasses
 	/// Expression equivalence class representatives - we only store one item of an equivalence.
 	std::vector<Expression> m_representatives;
 	/// All expression ever encountered.
-	std::set<Expression> m_expressions;
+	std::unordered_set<Expression, Expression::ExpressionHash> m_expressions;
 	std::vector<std::shared_ptr<AssemblyItem>> m_spareAssemblyItems;
 };
 

From 63f53a19ddf5f10ce8f0d48cd087a6ec68f5c75b Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Mon, 21 Mar 2022 09:10:12 +0100
Subject: [PATCH 0546/1748] Limit max chunk size in
 CommonSubexpressionEliminator::feedItems

---
 libevmasm/CommonSubexpressionEliminator.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libevmasm/CommonSubexpressionEliminator.h b/libevmasm/CommonSubexpressionEliminator.h
index 51a5d74b22..0b7d0e9f5f 100644
--- a/libevmasm/CommonSubexpressionEliminator.h
+++ b/libevmasm/CommonSubexpressionEliminator.h
@@ -179,7 +179,12 @@ AssemblyItemIterator CommonSubexpressionEliminator::feedItems(
 )
 {
 	assertThrow(!m_breakingItem, OptimizerException, "Invalid use of CommonSubexpressionEliminator.");
-	for (; _iterator != _end && !SemanticInformation::breaksCSEAnalysisBlock(*_iterator, _msizeImportant); ++_iterator)
+	unsigned const maxChunkSize = 1000;
+	for (
+		unsigned chunkSize = 0;
+		_iterator != _end && !SemanticInformation::breaksCSEAnalysisBlock(*_iterator, _msizeImportant) && chunkSize < maxChunkSize;
+		++_iterator, ++chunkSize
+	)
 		feedItem(*_iterator);
 	if (_iterator != _end)
 		m_breakingItem = &(*_iterator++);

From 91638ed7b221b8374646893bf10423168bd0f89d Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Fri, 25 Mar 2022 13:13:49 +0100
Subject: [PATCH 0547/1748] fixup! Limit max chunk size in
 CommonSubexpressionEliminator::feedItems

---
 libevmasm/CommonSubexpressionEliminator.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libevmasm/CommonSubexpressionEliminator.h b/libevmasm/CommonSubexpressionEliminator.h
index 0b7d0e9f5f..68d40d5ac0 100644
--- a/libevmasm/CommonSubexpressionEliminator.h
+++ b/libevmasm/CommonSubexpressionEliminator.h
@@ -180,13 +180,14 @@ AssemblyItemIterator CommonSubexpressionEliminator::feedItems(
 {
 	assertThrow(!m_breakingItem, OptimizerException, "Invalid use of CommonSubexpressionEliminator.");
 	unsigned const maxChunkSize = 1000;
+	unsigned chunkSize = 0;
 	for (
-		unsigned chunkSize = 0;
+		;
 		_iterator != _end && !SemanticInformation::breaksCSEAnalysisBlock(*_iterator, _msizeImportant) && chunkSize < maxChunkSize;
 		++_iterator, ++chunkSize
 	)
 		feedItem(*_iterator);
-	if (_iterator != _end)
+	if (_iterator != _end && chunkSize < maxChunkSize)
 		m_breakingItem = &(*_iterator++);
 	return _iterator;
 }

From e980a29186527c9325f9d2e2515847fc4602c871 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Mon, 11 Apr 2022 08:01:58 +0200
Subject: [PATCH 0548/1748] Set CommonSubexpressionEliminator max chunk size to
 2000

---
 libevmasm/CommonSubexpressionEliminator.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libevmasm/CommonSubexpressionEliminator.h b/libevmasm/CommonSubexpressionEliminator.h
index 68d40d5ac0..b0810a9a1d 100644
--- a/libevmasm/CommonSubexpressionEliminator.h
+++ b/libevmasm/CommonSubexpressionEliminator.h
@@ -179,7 +179,7 @@ AssemblyItemIterator CommonSubexpressionEliminator::feedItems(
 )
 {
 	assertThrow(!m_breakingItem, OptimizerException, "Invalid use of CommonSubexpressionEliminator.");
-	unsigned const maxChunkSize = 1000;
+	unsigned const maxChunkSize = 2000;
 	unsigned chunkSize = 0;
 	for (
 		;

From f9fa76c9d3177c629c0f94094867f81cbd8f50cc Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 20 Dec 2021 13:59:30 +0100
Subject: [PATCH 0549/1748] smt encode call

---
 Changelog.md                                  |  1 +
 libsolidity/formal/SMTEncoder.cpp             | 11 ++++++++
 .../abi/abi_encode_call_simple.sol            | 26 -------------------
 .../abi/abi_encode_call_simple_1.sol          | 22 ++++++++++++++++
 .../abi/abi_encode_call_simple_2.sol          | 21 +++++++++++++++
 .../abi/abi_encode_call_simple_3.sol          | 21 +++++++++++++++
 .../abi/abi_encode_call_simple_4.sol          | 25 ++++++++++++++++++
 .../abi/abi_encode_call_simple_5.sol          | 25 ++++++++++++++++++
 8 files changed, 126 insertions(+), 26 deletions(-)
 delete mode 100644 test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol
 create mode 100644 test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol

diff --git a/Changelog.md b/Changelog.md
index 203081823d..26ba5965d8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
  * Peephole Optimizer: Remove operations without side effects before simple terminations.
  * Assembly-Json: Export: Include source list in `sourceList` field.
  * Commandline Interface: option ``--pretty-json`` works also with the following options: ``--abi``, ``--asm-json``, ``--ast-compact-json``, ``--devdoc``, ``--storage-layout``, ``--userdoc``.
+ * SMTChecker: Support ``abi.encodeCall`` taking into account the called selector.
 
 
 Bugfixes:
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 7cc978d28c..8c5dd647e2 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -586,6 +586,16 @@ bool SMTEncoder::visit(FunctionCall const& _funCall)
 			arg->accept(*this);
 		return false;
 	}
+	else if (funType.kind() == FunctionType::Kind::ABIEncodeCall)
+	{
+		auto fun = _funCall.arguments().front();
+		createExpr(*fun);
+		auto const* functionType = dynamic_cast<FunctionType const*>(fun->annotation().type);
+		if (functionType->hasDeclaration())
+			defineExpr(*fun, functionType->externalIdentifier());
+		return true;
+	}
+
 	// We do not really need to visit the expression in a wrap/unwrap no-op call,
 	// so we just ignore the function call expression to avoid "unsupported" warnings.
 	else if (
@@ -1323,6 +1333,7 @@ bool SMTEncoder::visit(MemberAccess const& _memberAccess)
 
 	auto const& exprType = memberExpr->annotation().type;
 	solAssert(exprType, "");
+
 	if (exprType->category() == Type::Category::Magic)
 	{
 		if (auto const* identifier = dynamic_cast<Identifier const*>(memberExpr))
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol
deleted file mode 100644
index 72fd4290c3..0000000000
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple.sol
+++ /dev/null
@@ -1,26 +0,0 @@
-contract C {
-	function callMeMaybe(uint a, uint b, uint[] memory c) external {}
-
-	function abiEncodeSimple(uint x, uint y, uint z, uint[] memory a, uint[] memory b) public view {
-		require(x == y);
-		bytes memory b1 = abi.encodeCall(this.callMeMaybe, (x, z, a));
-		bytes memory b2 = abi.encodeCall(this.callMeMaybe, (y, z, a));
-		assert(b1.length == b2.length);
-
-		bytes memory b3 = abi.encodeCall(this.callMeMaybe, (y, z, b));
-		assert(b1.length == b3.length); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6031: (233-249): Internal error: Expression undefined for SMT solver.
-// Warning 6031: (298-314): Internal error: Expression undefined for SMT solver.
-// Warning 6031: (398-414): Internal error: Expression undefined for SMT solver.
-// Warning 1218: (330-360): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (430-460): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (330-360): CHC: Assertion violation might happen here.
-// Warning 6328: (430-460): CHC: Assertion violation might happen here.
-// Warning 4661: (330-360): BMC: Assertion violation happens here.
-// Warning 4661: (430-460): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol
new file mode 100644
index 0000000000..be0bc4769f
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol
@@ -0,0 +1,22 @@
+contract C {
+	function callMeMaybe(uint a, uint b) external {}
+
+	function abiEncodeSimple(uint x, uint y, uint z) public view {
+		require(x == y);
+		function (uint, uint) external f = this.callMeMaybe;
+		bytes memory b1 = abi.encodeCall(f, (x, z));
+		bytes memory b2 = abi.encodeCall(f, (y, z));
+		assert(b1.length == b2.length); // should hold
+		assert(b1[0] == b2[0]); // should hold
+
+		bytes memory b3 = abi.encodeCall(this.callMeMaybe, (3, z));
+		assert(b1.length == b3.length); // should hold, but we don't encode the length computation precisely
+	}
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
+// ----
+// Warning 6368: (354-359): CHC: Out of bounds access happens here.
+// Warning 6368: (363-368): CHC: Out of bounds access happens here.
+// Warning 6328: (451-481): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol
new file mode 100644
index 0000000000..c6044a8cdc
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol
@@ -0,0 +1,21 @@
+contract C {
+	function callMeMaybe(uint a, uint b) external {}
+
+	function abiEncodeSimple(uint x, uint y, uint z) public view {
+		require(x == y);
+		bytes memory b1 = abi.encodeCall(this.callMeMaybe, (x, z));
+		bytes memory b2 = abi.encodeCall(this.callMeMaybe, (y, z));
+		assert(b1.length == b2.length); // should hold
+		assert(b1[0] == b2[0]); // should hold
+
+		bytes memory b3 = abi.encodeCall(this.callMeMaybe, (3, z));
+		assert(b1.length == b3.length); // should hold but we don't compute the length precisely
+	}
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
+// ----
+// Warning 6368: (329-334): CHC: Out of bounds access happens here.
+// Warning 6368: (338-343): CHC: Out of bounds access happens here.
+// Warning 6328: (426-456): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol
new file mode 100644
index 0000000000..a3b20f7f75
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol
@@ -0,0 +1,21 @@
+contract C {
+	function callMeMaybe(uint a, uint b) external {}
+
+	function abiEncodeSimple(uint x, uint y, uint z) public pure {
+		require(x == y);
+		bytes memory b1 = abi.encodeCall(C.callMeMaybe, (x, z));
+		bytes memory b2 = abi.encodeCall(C.callMeMaybe, (y, z));
+		assert(b1.length == b2.length); // should hold
+		assert(b1[0] == b2[0]); // should hold
+
+		bytes memory b3 = abi.encodeCall(C.callMeMaybe, (3, z));
+		assert(b1.length == b3.length); // should hold but we don't compute the length precisely
+	}
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
+// ----
+// Warning 6368: (323-328): CHC: Out of bounds access happens here.
+// Warning 6368: (332-337): CHC: Out of bounds access happens here.
+// Warning 6328: (417-447): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol
new file mode 100644
index 0000000000..6f0128f8ab
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol
@@ -0,0 +1,25 @@
+abstract contract D {
+	function no(uint a, uint b) external virtual;
+}
+
+contract C {
+	function callMeMaybe(uint a, uint b) external {}
+
+	function abiEncodeSimple(uint x, uint y, uint z) public pure {
+		require(x == y);
+		bytes memory b1 = abi.encodeCall(D.no, (x, z));
+		bytes memory b2 = abi.encodeCall(D.no, (y, z));
+		assert(b1.length == b2.length); // should hold
+		assert(b1[0] == b2[0]); // should hold
+
+		bytes memory b3 = abi.encodeCall(D.no, (3, z));
+		assert(b1.length == b3.length); // should hold but we don't compute the length precisely
+	}
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
+// ----
+// Warning 6368: (377-382): CHC: Out of bounds access happens here.
+// Warning 6368: (386-391): CHC: Out of bounds access happens here.
+// Warning 6328: (462-492): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol
new file mode 100644
index 0000000000..98e42ad9f6
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol
@@ -0,0 +1,25 @@
+abstract contract D {
+	function no(uint a, uint b) external virtual;
+}
+
+contract C {
+	function callMeMaybe(uint a, uint b) external {}
+
+	function abiEncodeSimple(D d, uint x, uint y, uint z) public pure {
+		require(x == y);
+		bytes memory b1 = abi.encodeCall(d.no, (x, z));
+		bytes memory b2 = abi.encodeCall(d.no, (y, z));
+		assert(b1.length == b2.length); // should hold
+		assert(b1[0] == b2[0]); // should hold
+
+		bytes memory b3 = abi.encodeCall(d.no, (3, z));
+		assert(b1.length == b3.length); // should hold but we don't compute the length precisely
+	}
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
+// ----
+// Warning 6368: (382-387): CHC: Out of bounds access happens here.
+// Warning 6368: (391-396): CHC: Out of bounds access happens here.
+// Warning 6328: (467-497): CHC: Assertion violation happens here.

From 6931c939e086a3ddc6056ca3adc7566267359870 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 11 Apr 2022 15:54:56 +0200
Subject: [PATCH 0550/1748] CI: Make osx test jobs handle dependency
 installation even if b_osx does not install them

---
 .circleci/config.yml | 40 +++++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b6fc6b9d1..7875197f76 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -249,8 +249,20 @@ defaults:
         - restore_cache:
             keys:
               - dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
-        - attach_workspace:
-            at: .
+        # DO NOT EDIT between here and save_cache, but rather edit ./circleci/osx_install_dependencies.sh
+        # WARNING! If you do edit anything here instead, remember to invalidate the cache manually.
+        - run:
+            name: Install build dependencies
+            command: ./.circleci/osx_install_dependencies.sh
+        - save_cache:
+            key: dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
+            paths:
+              - /usr/local/bin
+              - /usr/local/sbin
+              - /usr/local/lib
+              - /usr/local/include
+              - /usr/local/Cellar
+              - /usr/local/Homebrew
 
   # --------------------------------------------------------------------------
   # Base Image Templates
@@ -900,23 +912,9 @@ jobs:
       MAKEFLAGS: -j10
     steps:
       - checkout
-      - restore_cache:
-          keys:
-            - dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
-      # DO NOT EDIT between here and save_cache, but rather edit ./circleci/osx_install_dependencies.sh
-      # WARNING! If you do edit anything here instead, remember to invalidate the cache manually.
-      - run:
-          name: Install build dependencies
-          command: ./.circleci/osx_install_dependencies.sh
-      - save_cache:
-          key: dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
-          paths:
-            - /usr/local/bin
-            - /usr/local/sbin
-            - /usr/local/lib
-            - /usr/local/include
-            - /usr/local/Cellar
-            - /usr/local/Homebrew
+      - when:
+          condition: true
+          <<: *steps_install_dependencies_osx
       - run: *run_build
       - store_artifacts: *artifacts_solc
       - store_artifacts: *artifact_solidity_upgrade
@@ -940,6 +938,8 @@ jobs:
       - when:
           condition: true
           <<: *steps_install_dependencies_osx
+      - attach_workspace:
+          at: .
       - run: *run_soltest
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
@@ -952,6 +952,8 @@ jobs:
       - when:
           condition: true
           <<: *steps_install_dependencies_osx
+      - attach_workspace:
+          at: .
       - run: *run_cmdline_tests
       - store_artifacts: *artifacts_test_results
       - gitter_notify_failure_unless_pr

From 4ac46ebf40cf0e019224af6ba45ded71038959a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 11 Apr 2022 14:06:42 +0200
Subject: [PATCH 0551/1748] Disable dependency caching on macOS in CI

---
 .circleci/config.yml | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7875197f76..a75e372ae3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -246,23 +246,11 @@ defaults:
 
   - steps_install_dependencies_osx: &steps_install_dependencies_osx
       steps:
-        - restore_cache:
-            keys:
-              - dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
-        # DO NOT EDIT between here and save_cache, but rather edit ./circleci/osx_install_dependencies.sh
-        # WARNING! If you do edit anything here instead, remember to invalidate the cache manually.
+        # FIXME: We used to cache dependencies on macOS but now it takes longer than just installing
+        # them each time. See https://github.com/ethereum/solidity/issues/12925.
         - run:
             name: Install build dependencies
             command: ./.circleci/osx_install_dependencies.sh
-        - save_cache:
-            key: dependencies-osx-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
-            paths:
-              - /usr/local/bin
-              - /usr/local/sbin
-              - /usr/local/lib
-              - /usr/local/include
-              - /usr/local/Cellar
-              - /usr/local/Homebrew
 
   # --------------------------------------------------------------------------
   # Base Image Templates

From afd9feead48a28d756e649c21cff1a7ebef897e9 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 15 Mar 2022 18:52:59 +0100
Subject: [PATCH 0552/1748] LSP.py: Implement simple send/respond framework

---
 scripts/tests.sh                              |    2 +-
 test/libsolidity/lsp/goto_definition.sol      |  139 +++
 .../lsp/goto_definition_imports.sol           |   52 +
 test/libsolidity/lsp/lib.sol                  |    8 +
 .../libsolidity/lsp/publish_diagnostics_1.sol |    2 +
 .../libsolidity/lsp/publish_diagnostics_2.sol |    2 +
 test/lsp.py                                   | 1053 ++++++++++++-----
 7 files changed, 942 insertions(+), 316 deletions(-)

diff --git a/scripts/tests.sh b/scripts/tests.sh
index 5515a68691..80559f5e21 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -84,7 +84,7 @@ printTask "Testing Python scripts..."
 "$REPO_ROOT/test/pyscriptTests.py"
 
 printTask "Testing LSP..."
-"$REPO_ROOT/scripts/test_solidity_lsp.py" "${SOLIDITY_BUILD_DIR}/solc/solc"
+"$REPO_ROOT/test/lsp.py" "${SOLIDITY_BUILD_DIR}/solc/solc"
 
 printTask "Running commandline tests..."
 # Only run in parallel if this is run on CI infrastructure
diff --git a/test/libsolidity/lsp/goto_definition.sol b/test/libsolidity/lsp/goto_definition.sol
index 675c1297ce..7415d3866a 100644
--- a/test/libsolidity/lsp/goto_definition.sol
+++ b/test/libsolidity/lsp/goto_definition.sol
@@ -2,13 +2,16 @@
 pragma solidity >=0.8.0;
 
 import "./lib.sol";
+//      ^ @importDirective
 
 interface I
 {
     function f(uint x) external returns (uint);
+    //       ^ @functionF
 }
 
 contract IA is I
+    //   ^^ @IASymbol
 {
     function f(uint x) public pure override returns (uint) { return x + 1; }
 }
@@ -21,6 +24,7 @@ contract IB is I
 library IntLib
 {
     function add(int self, int b) public pure returns (int) { return self + b; }
+    //       ^^^ @IntLibAdd
 }
 
 contract C
@@ -29,40 +33,175 @@ contract C
     function virtual_inheritance() public payable
     {
         obj = new IA();
+        //        ^ @usingIASymbol
         obj.f(1); // goto-definition should jump to definition of interface.
+    //      ^ @virtualFunctionLookup
     }
 
     using IntLib for *;
     function using_for(int i) pure public
     {
         i.add(5);
+ //       ^ @usingIntAdd
         14.add(4);
     }
 
     function useLib(uint n) public payable returns (uint)
     {
         return Lib.add(n, 1);
+        //     ^ @LibSymbol
+        //         ^ @LibAddSymbol
     }
 
     function enums(Color c) public pure returns (Color d)
+    //             ^ @ColorSymbolInParameter
     {
         Color e = Color.Red;
+        //    ^ @eVariableDeclaration
+        //              ^ @RedEnumMemberAccess
         if (c == e)
+        //       ^ @eVariableAccess
             d = Color.Green;
         else
             d = c;
     }
 
     type Price is uint128;
+    //   ^^^^^ @PriceDeclaration
     function udlTest() public pure returns (uint128)
     {
         Price p = Price.wrap(128);
+    //  ^ @PriceSymbol
+    //            ^ @PriceInWrap
         return Price.unwrap(p);
     }
 
     function structCtorTest(uint8 v) public pure returns (uint8 result)
     {
         RGBColor memory c = RGBColor(v, 2 * v, 3 * v);
+        //                       ^ @RGBColorCursor
         result = c.red;
+        int a;
+//      ^^^^^ @unusedLocalVar
     }
 }
+// ----
+// goto_definition: @unusedLocalVar 2072
+// lib: @diagnostics 2072
+// -> textDocument/definition {
+//     "position": @importDirective
+// }
+// <- [
+//     {
+//         "range": {
+//             "end": {
+//                 "character": 0,
+//                 "line": 0
+//             },
+//             "start": {
+//                 "character": 0,
+//                 "line": 0
+//             }
+//         },
+//         "uri": "lib.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @usingIASymbol
+// }
+// <- [
+//     {
+//         "range": @IASymbol,
+//         "uri": "goto_definition.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @virtualFunctionLookup
+// }
+// <- [
+//     {
+//         "range": @functionF,
+//         "uri": "goto_definition.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @usingIntAdd
+// }
+// <- [
+//     {
+//         "range": @IntLibAdd,
+//         "uri": "goto_definition.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @LibSymbol
+// }
+// <- [
+//     {
+//         "range": @LibLibrary,
+//         "uri": "lib.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @LibAddSymbol
+// }
+// <- [
+//     {
+//         "range": @addSymbol,
+//         "uri": "lib.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @ColorSymbolInParameter
+// }
+// <- [
+//     {
+//         "range": @ColorEnum,
+//         "uri": "lib.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @RedEnumMemberAccess
+// }
+// <- [
+//     {
+//         "range": @EnumMemberRed,
+//         "uri": "lib.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @eVariableAccess
+// }
+// <- [
+//     {
+//         "range": @eVariableDeclaration,
+//         "uri": "goto_definition.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @PriceSymbol
+// }
+// <- [
+//     {
+//         "range": @PriceDeclaration,
+//         "uri": "goto_definition.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @PriceInWrap
+// }
+// <- [
+//     {
+//         "range": @PriceDeclaration,
+//         "uri": "goto_definition.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @RGBColorCursor
+// }
+// <- [
+//     {
+//         "range": @RGBColorStruct,
+//         "uri": "lib.sol"
+//     }
+// ]
diff --git a/test/libsolidity/lsp/goto_definition_imports.sol b/test/libsolidity/lsp/goto_definition_imports.sol
index b3df921fe1..dd0267d710 100644
--- a/test/libsolidity/lsp/goto_definition_imports.sol
+++ b/test/libsolidity/lsp/goto_definition_imports.sol
@@ -2,18 +2,70 @@
 pragma solidity >=0.8.0;
 
 import {Weather as Wetter} from "./lib.sol";
+//       ^ @wheatherImportCursor
 import "./lib.sol" as That;
+//                    ^^^^ @ThatImport
 
 contract C
 {
     function test_symbol_alias() public pure returns (Wetter result)
+                                             //        ^ @WetterCursor
     {
         result = Wetter.Sunny;
     }
 
     function test_library_alias() public pure returns (That.Color result)
+                                                //     ^ @ThatCursor
     {
         That.Color color = That.Color.Red;
+//      ^ @ThatVarCursor   ^ @ThatExpressionCursor
         result = color;
     }
 }
+// ----
+// lib: @diagnostics 2072
+// -> textDocument/definition {
+//     "position": @wheatherImportCursor
+// }
+// <- [
+//     {
+//         "range": @whetherEnum,
+//         "uri": "lib.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @WetterCursor
+// }
+// <- [
+//     {
+//         "range": @whetherEnum,
+//         "uri": "lib.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @ThatCursor
+// }
+// <- [
+//     {
+//         "range": @ColorEnum,
+//         "uri": "lib.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @ThatVarCursor
+// }
+// <- [
+//     {
+//         "range": @ColorEnum,
+//         "uri": "lib.sol"
+//     }
+// ]
+// -> textDocument/definition {
+//     "position": @ThatExpressionCursor
+// }
+// <- [
+//     {
+//         "range": @ThatImport,
+//         "uri": "goto_definition_imports.sol"
+//     }
+// ]
diff --git a/test/libsolidity/lsp/lib.sol b/test/libsolidity/lsp/lib.sol
index 031cf19adc..c476f2dc27 100644
--- a/test/libsolidity/lsp/lib.sol
+++ b/test/libsolidity/lsp/lib.sol
@@ -5,6 +5,7 @@ pragma solidity >=0.8.0;
 error E(uint, uint);
 
 enum Weather {
+//   ^^^^^^^ @whetherEnum
     Sunny,
     Cloudy,
     Rainy
@@ -12,8 +13,10 @@ enum Weather {
 
 /// Some custom Color enum type holding 3 colors.
 enum Color {
+//   ^^^^^ @ColorEnum
     /// Red color.
     Red,
+//  ^^^ @EnumMemberRed
     /// Green color.
     Green,
     /// Blue color.
@@ -21,9 +24,11 @@ enum Color {
 }
 
 library Lib
+//   @  ^^^ @LibLibrary
 {
     function add(uint a, uint b) public pure returns (uint result)
 // ^( @addFunction
+//           ^^^ @addSymbol
     {
         result = a + b;
     }
@@ -37,8 +42,11 @@ library Lib
 }
 
 struct RGBColor
+//     ^^^^^^^^ @RGBColorStruct
 {
     uint8 red;
     uint8 green;
     uint8 blue;
 }
+// ----
+// lib: @diagnostics 2072
diff --git a/test/libsolidity/lsp/publish_diagnostics_1.sol b/test/libsolidity/lsp/publish_diagnostics_1.sol
index be15a40908..357de7a353 100644
--- a/test/libsolidity/lsp/publish_diagnostics_1.sol
+++ b/test/libsolidity/lsp/publish_diagnostics_1.sol
@@ -19,3 +19,5 @@ contract D
    //   ^^^^^^^^^^^^ @unusedContractVariable
     }
 }
+// ----
+// publish_diagnostics_1: @unusedReturnVariable 6321 @unusedVariable 2072 @unusedContractVariable 2072
diff --git a/test/libsolidity/lsp/publish_diagnostics_2.sol b/test/libsolidity/lsp/publish_diagnostics_2.sol
index 65b4df5854..cf052e7c9c 100644
--- a/test/libsolidity/lsp/publish_diagnostics_2.sol
+++ b/test/libsolidity/lsp/publish_diagnostics_2.sol
@@ -22,3 +22,5 @@ contract D
           //   ^^^^^^^^^^^^^^^^^^^^^ @wrongArgumentsCount
     }
 }
+// ----
+// publish_diagnostics_2: @conversionError 9574 @argumentsRequired 6777 @wrongArgumentsCount 6160
diff --git a/test/lsp.py b/test/lsp.py
index 8b7398cf29..79be59f8e0 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -8,13 +8,93 @@
 import sys
 import traceback
 import re
-
+import tty
+import functools
+from collections import namedtuple
+from copy import deepcopy
 from typing import Any, List, Optional, Tuple, Union
+from itertools import islice
+
 from enum import Enum, auto
 
 import colorama # Enables the use of SGR & CUP terminal VT sequences on Windows.
 from deepdiff import DeepDiff
 
+"""
+Named tuple that holds various regexes used to parse the test specification.
+"""
+TestRegexesTuple = namedtuple("TestRegexesTuple", [
+    "sendRequest", # regex to find requests to be sent & tested
+    "findQuotedTag", # regex to find tags wrapped in quotes
+    "findTag", # regex to find tags
+    "fileDiagnostics", # regex to find diagnostic expectations for a file
+    "diagnostic" # regex to find a single diagnostic within the file expectations
+])
+"""
+Instance of the named tuple holding the regexes
+"""
+TEST_REGEXES = TestRegexesTuple(
+    re.compile(R'^// -> (?P<method>[\w\/]+) {'),
+    re.compile(R'(?P<tag>"@\w+")'),
+    re.compile(R'(?P<tag>@\w+)'),
+    re.compile(R'// (?P<testname>\w+):[ ]?(?P<diagnostics>[\w @]*)'),
+    re.compile(R'(?P<tag>@\w+) (?P<code>\d\d\d\d)')
+)
+
+"""
+Named tuple holding regexes to find tags in the solidity code
+"""
+TagRegexesTuple = namedtuple("TagRegexestuple", ["simpleRange", "multilineRange"])
+TAG_REGEXES = TagRegexesTuple(
+    re.compile(R"(?P<range>[\^]+) (?P<tag>@\w+)"),
+    re.compile(R"\^(?P<delimiter>[()]{1,2}) (?P<tag>@\w+)$")
+)
+
+
+def count_index(lines, start=0):
+    """
+    Takes an iterable of lines and adds the current byte index so it's available
+    when iterating or looping.
+    """
+    n = start
+    for elem in lines:
+        yield n, elem
+        n += 1 + len(elem)
+
+def tags_only(lines, start=0):
+    """
+    Filter the lines for tag comments and report line number that tags refer to.
+    """
+    n = start
+    numCommentLines = 0
+
+    def hasTag(line):
+        if line.find("// ") != -1:
+            for _, regex in TAG_REGEXES._asdict().items():
+                if regex.search(line[len("// "):]) is not None:
+                    return True
+        return False
+
+    for line in lines:
+        if hasTag(line):
+            numCommentLines += 1
+            yield n - numCommentLines, line
+        else:
+            numCommentLines = 0
+
+        n += 1
+
+
+def prepend_comments(sequence):
+    """
+    Prepends a comment indicator to each element
+    """
+    result = ""
+    for line in sequence.splitlines(True):
+        result = result + "// " + line
+    return result
+
+
 # {{{ JsonRpcProcess
 class BadHeader(Exception):
     def __init__(self, msg: str):
@@ -59,7 +139,7 @@ def receive_message(self) -> Union[None, dict]:
         while True:
             # read header
             line = self.process.stdout.readline()
-            if line == '':
+            if len(line) == 0:
                 # server quit
                 return None
             line = line.decode("utf-8")
@@ -118,12 +198,30 @@ def send_notification(self, name: str, params: Optional[dict] = None) -> None:
 SGR_STATUS_FAIL = '\033[1;31m'
 
 class ExpectationFailed(Exception):
-    def __init__(self, actual, expected):
-        self.actual = json.dumps(actual, sort_keys=True)
-        self.expected = json.dumps(expected, sort_keys=True)
-        diff = json.dumps(DeepDiff(actual, expected), indent=4)
+    class Part(Enum):
+        Diagnostics = auto()
+        Methods = auto()
+
+    def __init__(self, reason: str, part):
+        self.part = part
+        super().__init__(reason)
+
+class JSONExpectationFailed(ExpectationFailed):
+    def __init__(self, actual, expected, part):
+        self.actual = actual
+        self.expected = expected
+
+        expected_pretty = ""
+
+        if expected is not None:
+            expected_pretty = json.dumps(expected, sort_keys=True)
+
+        diff = DeepDiff(actual, expected)
+
         super().__init__(
-            f"\n\tExpected {self.expected}\n\tbut got {self.actual}.\n\t{diff}"
+            f"\n\tExpected {expected_pretty}" + \
+            f"\n\tbut got {json.dumps(actual, sort_keys=True)}.\n\t{diff}",
+            part
         )
 
 
@@ -180,15 +278,407 @@ class Counter:
     failed: int = 0
 
 
-class Marker(Enum):
-    SimpleRange = auto()
-    MultilineRange = auto()
-
-
 # Returns the given marker with the end extended by 'amount'
 def extendEnd(marker, amount=1):
-    marker["end"]["character"] += amount
-    return marker
+    newMarker = deepcopy(marker)
+    newMarker["end"]["character"] += amount
+    return newMarker
+
+class TestParserException(Exception):
+    def __init__(self, incompleteResult, msg: str):
+        self.result = incompleteResult
+        super().__init__("Failed to parse test specification: " + msg)
+
+class TestParser:
+    """
+    Parses test specifications.
+    Usage example:
+
+    parsed_testcases = TestParser(content).parse()
+
+    # First diagnostics are yielded
+    expected_diagnostics = next(parsed_testcases)
+    ...
+    # Now each request/response pair in the test definition
+    for testcase in self.parsed_testcases:
+        ...
+    """
+    RequestAndResponse = namedtuple('RequestAndResponse',
+        "method, request, response, responseBegin, responseEnd",
+        defaults=(None, None, None, None)
+    )
+    Diagnostics = namedtuple('Diagnostics', 'tests start end has_header')
+    Diagnostic = namedtuple('Diagnostic', 'marker code')
+
+    TEST_START = "// ----"
+
+    def __init__(self, content: str):
+        self.content = content
+        self.lines = None
+        self.current_line_tuple = None
+
+    def parse(self):
+        """
+        Starts parsing the test specifications.
+        Will first yield with the diagnostics expectations as type 'Diagnostics'.
+        After that, it will yield once for every Request/Response pair found in
+        the file, each time as type 'RequestAndResponse'.
+
+        """
+        testDefStartIdx = self.content.rfind(f"\n{self.TEST_START}\n")
+
+        if testDefStartIdx == -1:
+            # Set start/end to end of file if there is no test section
+            yield self.Diagnostics({}, len(self.content), len(self.content), False)
+            return
+
+        self.lines = islice(
+            count_index(self.content[testDefStartIdx+1:].splitlines(), testDefStartIdx+1),
+            1,
+            None
+        )
+        self.next_line()
+
+        yield self.parseDiagnostics()
+
+        while not self.at_end():
+            yield self.RequestAndResponse(**self.parseRequestAndResponse())
+            self.next_line()
+
+
+    def parseDiagnostics(self):
+        """
+        Parse diagnostic expectations specified in the file.
+        Returns a named tuple instance of "Diagnostics"
+        """
+        diagnostics = { "tests": {}, "has_header": True }
+
+        diagnostics["start"] = self.position()
+
+        while not self.at_end():
+            fileDiagMatch = TEST_REGEXES.fileDiagnostics.match(self.current_line())
+            if fileDiagMatch is None:
+                break
+
+            testDiagnostics = []
+
+            for diagnosticMatch in TEST_REGEXES.diagnostic.finditer(fileDiagMatch.group("diagnostics")):
+                testDiagnostics.append(self.Diagnostic(
+                    diagnosticMatch.group("tag"),
+                    int(diagnosticMatch.group("code"))
+                ))
+
+            diagnostics["tests"][fileDiagMatch.group("testname")] = testDiagnostics
+
+            self.next_line()
+
+        diagnostics["end"] = self.position()
+        return self.Diagnostics(**diagnostics)
+
+
+    def parseRequestAndResponse(self):
+        RESPONSE_START = "// <- "
+        REQUEST_END = "// }"
+        COMMENT_PREFIX = "// "
+
+        ret = {}
+        start_character = None
+
+        # Parse request header
+        requestResult = TEST_REGEXES.sendRequest.match(self.current_line())
+        if requestResult is not None:
+            ret["method"] = requestResult.group("method")
+            ret["request"] = "{\n"
+        else:
+            raise TestParserException(ret, "Method for request not found")
+
+        self.next_line()
+
+        # Search for request block end
+        while not self.at_end():
+            line = self.current_line()
+            ret["request"] += line[len(COMMENT_PREFIX):] + "\n"
+
+            self.next_line()
+
+            if line.startswith(REQUEST_END):
+                break
+
+            # Reached end without finding request_end. Abort.
+            if self.at_end():
+                raise TestParserException(ret, "Request body not found")
+
+
+        # Parse response header
+        if self.current_line().startswith(RESPONSE_START):
+            start_character = self.current_line()[len(RESPONSE_START)]
+            if start_character not in ("{", "["):
+                raise TestParserException(ret, "Response header malformed")
+            ret["response"] = self.current_line()[len(RESPONSE_START):] + "\n"
+            ret["responseBegin"] = self.position()
+        else:
+            raise TestParserException(ret, "Response header not found")
+
+        self.next_line()
+
+        end_character = "}" if start_character == "{" else "]"
+
+        # Search for request block end
+        while not self.at_end():
+            ret["response"] += self.current_line()[len(COMMENT_PREFIX):] + "\n"
+
+            if self.current_line().startswith(f"// {end_character}"):
+                ret["responseEnd"] = self.position() + len(self.current_line())
+                break
+
+            self.next_line()
+
+            # Reached end without finding block_end. Abort.
+            if self.at_end():
+                raise TestParserException(ret, "Response footer not found")
+
+        return ret
+
+    def next_line(self):
+        self.current_line_tuple = next(self.lines, None)
+
+    def current_line(self):
+        return self.current_line_tuple[1]
+
+    def position(self):
+        """
+        Returns current byte position
+        """
+        if self.current_line_tuple is None:
+            return len(self.content)
+        return self.current_line_tuple[0]
+
+    def at_end(self):
+        """
+        Returns True if we exhausted the lines
+        """
+        return self.current_line_tuple is None
+
+class FileTestRunner:
+    """
+    Runs all tests in a given file.
+    It is required to call test_diagnostics() before calling test_methods().
+
+    When a test fails, asks the user how to proceed.
+    Offers automatic test expectation updates and rerunning of the tests.
+    """
+
+    class TestResult(Enum):
+        SuccessOrIgnored = auto()
+        Reparse = auto()
+
+    def __init__(self, test_name, solc, suite):
+        self.test_name = test_name
+        self.suite = suite
+        self.solc = solc
+        self.open_tests = []
+        self.content = self.suite.get_test_file_contents(self.test_name)
+        self.markers = self.suite.get_file_tags(self.test_name)
+        self.parsed_testcases = None
+        self.expected_diagnostics = None
+
+    def test_diagnostics(self):
+        """
+        Test that the expected diagnostics match the actual diagnostics
+        """
+        try:
+            self.parsed_testcases = TestParser(self.content).parse()
+
+            # Process diagnostics first
+            self.expected_diagnostics = next(self.parsed_testcases)
+            assert isinstance(self.expected_diagnostics, TestParser.Diagnostics) is True
+
+            tests = self.expected_diagnostics.tests
+
+            # Add our own test diagnostics if they didn't exist
+            if self.test_name not in tests:
+                tests[self.test_name] = []
+
+            published_diagnostics = \
+                self.suite.open_file_and_wait_for_diagnostics(self.solc, self.test_name)
+
+            for diagnostics in published_diagnostics:
+                self.open_tests.append(diagnostics["uri"].replace(self.suite.project_root_uri + "/", "")[:-len(".sol")])
+
+            self.suite.expect_equal(
+                len(published_diagnostics),
+                len(tests),
+                description="Amount of reports does not match!")
+
+            for diagnostics in published_diagnostics:
+                testname = diagnostics["uri"].replace(self.suite.project_root_uri + "/", "")[:-len(".sol")]
+
+                expected_diagnostics = tests[testname]
+                self.suite.expect_equal(
+                    len(diagnostics["diagnostics"]),
+                    len(expected_diagnostics),
+                    description="Unexpected amount of diagnostics"
+                )
+                markers = self.suite.get_file_tags(testname)
+                for actual_diagnostic in diagnostics["diagnostics"]:
+                    expected_diagnostic = next((diagnostic for diagnostic in
+                        expected_diagnostics if actual_diagnostic['range'] ==
+                        markers[diagnostic.marker]), None)
+
+                    if expected_diagnostic is None:
+                        raise ExpectationFailed(
+                            f"Unexpected diagnostic: {json.dumps(actual_diagnostic, indent=4, sort_keys=True)}",
+                            ExpectationFailed.Part.Diagnostics
+                        )
+
+                    self.suite.expect_diagnostic(
+                        actual_diagnostic,
+                        code=expected_diagnostic.code,
+                        marker=markers[expected_diagnostic.marker]
+                    )
+
+        except Exception as e:
+            print(e)
+            self.close_all_open_files()
+            raise
+
+    def close_all_open_files(self):
+        for test in self.open_tests:
+            self.solc.send_message(
+                'textDocument/didClose',
+                { 'textDocument': { 'uri': self.suite.get_test_file_uri(test) }}
+            )
+            self.suite.wait_for_diagnostics(self.solc)
+
+        self.open_tests.clear()
+
+    def test_methods(self) -> bool:
+        """
+        Test all methods. Returns False if a reparsing is required, else True
+        """
+        try:
+            # Now handle each request/response pair in the test definition
+            for testcase in self.parsed_testcases:
+                try:
+                    self.run_testcase(testcase)
+                except JSONExpectationFailed as e:
+                    result = self.user_interaction_failed_method_test(testcase, e.actual, e.expected)
+
+                    if result == self.TestResult.Reparse:
+                        return False
+
+            return True
+        except TestParserException as e:
+            print(e)
+            print(e.result)
+            raise
+        finally:
+            self.close_all_open_files()
+
+    def user_interaction_failed_method_test(self, testcase, actual, expected):
+        actual_pretty = self.suite.replace_ranges_with_tags(actual)
+
+        if expected is None:
+            print("Failed to parse expected response, received:\n" + actual)
+        else:
+            print("Expected:\n" + \
+                self.suite.replace_ranges_with_tags(expected) + \
+                "\nbut got:\n" + actual_pretty
+            )
+
+        while True:
+            print("(u)pdate/(r)etry/(i)gnore?")
+            user_response = sys.stdin.read(1)
+            if user_response == "i":
+                return self.TestResult.SuccessOrIgnored
+
+            if user_response == "u":
+                actual = actual["result"]
+                self.content = self.content[:testcase.responseBegin] + \
+                    prepend_comments("<- " + self.suite.replace_ranges_with_tags(actual)) + \
+                    self.content[testcase.responseEnd:]
+
+                with open(self.suite.get_test_file_path(self.test_name), mode="w", encoding="utf-8", newline='') as f:
+                    f.write(self.content)
+                return self.TestResult.Reparse
+            if user_response == "r":
+                return self.TestResult.Reparse
+
+            print("Invalid response.")
+
+
+    def run_testcase(self, testcase: TestParser.RequestAndResponse):
+        """
+        Runs the given testcase.
+        """
+        requestBodyJson = self.parse_json_with_tags(testcase.request, self.markers)
+        # add textDocument/uri if missing
+        if 'textDocument' not in requestBodyJson:
+            requestBodyJson['textDocument'] = { 'uri': self.suite.get_test_file_uri(self.test_name) }
+        actualResponseJson = self.solc.call_method(testcase.method, requestBodyJson)
+
+        # simplify response
+        for result in actualResponseJson["result"]:
+            result["uri"] = result["uri"].replace(self.suite.project_root_uri + "/", "")
+        if "jsonrpc" in actualResponseJson:
+            actualResponseJson.pop("jsonrpc")
+
+        try:
+            expectedResponseJson = self.parse_json_with_tags(testcase.response, self.markers)
+        except json.decoder.JSONDecodeError:
+            expectedResponseJson = None
+
+        expectedResponseJson = { "result": expectedResponseJson }
+
+        self.suite.expect_equal(
+            actualResponseJson,
+            expectedResponseJson,
+            f"Request failed: \n{testcase.request}",
+            ExpectationFailed.Part.Methods
+        )
+
+
+    def parse_json_with_tags(self, content, markersFallback):
+        """
+        Replaces any tags with their actual content and parsers the result as
+        json to return it.
+        """
+        split_by_tag = TEST_REGEXES.findTag.split(content)
+
+        # add quotes so we can parse it as json
+        contentReplaced = '"'.join(split_by_tag)
+        contentJson = json.loads(contentReplaced)
+
+        def replace_tag(data, markers):
+
+            if isinstance(data, list):
+                for el in data:
+                    replace_tag(el, markers)
+                return data
+
+            # Check if we need markers from a specific file
+            # Needs to be done before the loop or it might be called only after
+            # we found "range" or "position"
+            if "uri" in data:
+                markers = self.suite.get_file_tags(data["uri"][:-len(".sol")])
+
+            for key, val in data.items():
+                if key == "range":
+                    for tag, tagRange in markers.items():
+                        if tag == val:
+                            data[key] = tagRange
+                elif key == "position":
+                    for tag, tagRange in markers.items():
+                        if tag == val:
+                            data[key] = tagRange["start"]
+                elif isinstance(val, dict):
+                    replace_tag(val, markers)
+                elif isinstance(val, list):
+                    for el in val:
+                        replace_tag(el, markers)
+            return data
+
+        return replace_tag(contentJson, markersFallback)
 
 
 class SolidityLSPTestSuite: # {{{
@@ -198,7 +688,6 @@ class SolidityLSPTestSuite: # {{{
     trace_io: bool = False
     fail_fast: bool = False
     test_pattern: str
-    marker_regexes: {}
 
     def __init__(self):
         colorama.init()
@@ -210,10 +699,6 @@ def __init__(self):
         self.trace_io = args.trace_io
         self.test_pattern = args.test_pattern
         self.fail_fast = args.fail_fast
-        self.marker_regexes = {
-            Marker.SimpleRange: re.compile(R"(?P<range>[\^]+) (?P<tag>@\w+)"),
-            Marker.MultilineRange: re.compile(R"\^(?P<delimiter>[()]) (?P<tag>@\w+)$")
-        }
 
         print(f"{SGR_NOTICE}test pattern: {self.test_pattern}{SGR_RESET}")
 
@@ -283,6 +768,9 @@ def setup_lsp(self, lsp: JsonRpcProcess, expose_project_root=True):
             params['rootUri'] = None
         lsp.call_method('initialize', params)
         lsp.send_notification('initialized')
+        # Enable traces to receive the amount of expected diagnostics before
+        # actually receiving them.
+        lsp.send_message("$/setTrace", { 'value': 'messages' })
 
     # {{{ helpers
     def get_test_file_path(self, test_case_name):
@@ -314,35 +802,86 @@ def require_params_for_method(self, method_name: str, message: dict) -> Any:
             raise RuntimeError(f"Error {code} received. {text}")
         if 'method' not in message.keys():
             raise RuntimeError("No method received but something else.")
-        self.expect_equal(message['method'], method_name, "Ensure expected method name")
+        self.expect_equal(message['method'], method_name, description="Ensure expected method name")
         return message['params']
 
-    def wait_for_diagnostics(self, solc: JsonRpcProcess, count: int) -> List[dict]:
+    def wait_for_diagnostics(self, solc: JsonRpcProcess) -> List[dict]:
         """
-        Return `count` number of published diagnostic reports sorted by file URI.
+        Return all published diagnostic reports sorted by file URI.
         """
         reports = []
-        for _ in range(0, count):
+
+        num_files = solc.receive_message()["params"]["openFileCount"]
+
+        for _ in range(0, num_files):
             message = solc.receive_message()
+
             assert message is not None # This can happen if the server aborts early.
+
             reports.append(
                 self.require_params_for_method(
                     'textDocument/publishDiagnostics',
                     message,
                 )
             )
+
         return sorted(reports, key=lambda x: x['uri'])
 
+    def fetch_and_format_diagnostics(self, solc: JsonRpcProcess, test):
+        expectations = ""
+
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, test)
+
+        for diagnostics in published_diagnostics:
+            testname = diagnostics["uri"].replace(self.project_root_uri + "/", "")[:-len(".sol")]
+
+            # Skip empty diagnostics within the same file
+            if len(diagnostics["diagnostics"]) == 0 and testname == test:
+                continue
+
+            expectations += f"// {testname}:"
+
+            for diagnostic in diagnostics["diagnostics"]:
+                tag = self.find_tag_with_range(testname, diagnostic['range'])
+
+                if tag is None:
+                    raise Exception(f"No tag found for diagnostic range {diagnostic['range']}")
+
+                expectations += f" {tag} {diagnostic['code']}"
+            expectations += "\n"
+
+        return expectations
+
+    def update_diagnostics_in_file(
+        self,
+        solc: JsonRpcProcess,
+        test,
+        content,
+        current_diagnostics: TestParser.Diagnostics
+    ):
+        test_header = ""
+
+        if not current_diagnostics.has_header:
+            test_header = f"{TestParser.TEST_START}\n"
+
+        content = content[:current_diagnostics.start] + \
+            test_header + \
+            self.fetch_and_format_diagnostics(solc, test) + \
+            content[current_diagnostics.end:]
+
+        with open(self.get_test_file_path(test), mode="w", encoding="utf-8", newline='') as f:
+            f.write(content)
+
+        return content
+
     def open_file_and_wait_for_diagnostics(
         self,
         solc_process: JsonRpcProcess,
         test_case_name: str,
-        max_diagnostic_reports: int = 1
     ) -> List[Any]:
         """
         Opens file for given test case and waits for diagnostics to be published.
         """
-        assert max_diagnostic_reports > 0
         solc_process.send_message(
             'textDocument/didOpen',
             {
@@ -355,9 +894,15 @@ def open_file_and_wait_for_diagnostics(
                 }
             }
         )
-        return self.wait_for_diagnostics(solc_process, max_diagnostic_reports)
+        return self.wait_for_diagnostics(solc_process)
 
-    def expect_equal(self, actual, expected, description="Equality") -> None:
+    def expect_equal(
+        self,
+        actual,
+        expected,
+        description="Equality",
+        part=ExpectationFailed.Part.Diagnostics
+    ) -> None:
         self.assertion_counter.total += 1
         prefix = f"[{self.assertion_counter.total}] {SGR_ASSERT_BEGIN}{description}: "
         diff = DeepDiff(actual, expected)
@@ -370,7 +915,7 @@ def expect_equal(self, actual, expected, description="Equality") -> None:
         # Failed assertions are always printed.
         self.assertion_counter.failed += 1
         print(prefix + SGR_STATUS_FAIL + 'FAILED' + SGR_RESET)
-        raise ExpectationFailed(actual, expected)
+        raise JSONExpectationFailed(actual, expected, part)
 
     def expect_empty_diagnostics(self, published_diagnostics: List[dict]) -> None:
         self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
@@ -384,10 +929,21 @@ def expect_diagnostic(
         startEndColumns: Tuple[int, int] = None,
         marker: {} = None
     ):
-        self.expect_equal(diagnostic['code'], code, f'diagnostic: {code}')
+        self.expect_equal(
+            diagnostic['code'],
+            code,
+            ExpectationFailed.Part.Diagnostics,
+            f'diagnostic: {code}'
+        )
 
         if marker:
-            self.expect_equal(diagnostic['range'], marker, "diagnostic: check range")
+            self.expect_equal(
+                diagnostic['range'],
+                marker,
+                ExpectationFailed.Part.Diagnostics,
+                "diagnostic: check range"
+            )
+
         else:
             assert len(startEndColumns) == 2
             [startColumn, endColumn] = startEndColumns
@@ -397,6 +953,7 @@ def expect_diagnostic(
                     'start': {'character': startColumn, 'line': lineNo},
                     'end': {'character': endColumn, 'line': lineNo}
                 },
+                ExpectationFailed.Part.Diagnostics,
                 "diagnostic: check range"
             )
 
@@ -446,44 +1003,102 @@ def expect_goto_definition_location(
         message = "Goto definition (" + description + ")"
         self.expect_equal(len(response['result']), 1, message)
         self.expect_location(response['result'][0], expected_uri, expected_lineNo, expected_startEndColumns)
-    # }}}
-
-    # {{{ actual tests
-    def test_publish_diagnostics_warnings(self, solc: JsonRpcProcess) -> None:
-        self.setup_lsp(solc)
-        TEST_NAME = 'publish_diagnostics_1'
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
 
-        self.expect_equal(len(published_diagnostics), 1, "One published_diagnostics message")
-        report = published_diagnostics[0]
 
-        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
-        diagnostics = report['diagnostics']
+    def find_tag_with_range(self, test, target_range):
+        """
+        Find and return the tag that represents the requested range otherwise
+        return None.
+        """
+        markers = self.get_file_tags(test)
 
-        markers = self.get_file_tags(TEST_NAME)
+        for tag, tag_range in markers.items():
+            if tag_range == target_range:
+                return str(tag)
 
-        self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
-        self.expect_diagnostic(diagnostics[0], code=6321, marker=markers["@unusedReturnVariable"])
-        self.expect_diagnostic(diagnostics[1], code=2072, marker=markers["@unusedVariable"])
-        self.expect_diagnostic(diagnostics[2], code=2072, marker=markers["@unusedContractVariable"])
+        return None
 
-    def test_publish_diagnostics_errors(self, solc: JsonRpcProcess) -> None:
-        self.setup_lsp(solc)
-        TEST_NAME = 'publish_diagnostics_2'
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
+    def replace_ranges_with_tags(self, content):
+        """
+        Replace matching ranges with "@<tagname>".
+        """
 
-        self.expect_equal(len(published_diagnostics), 1, "One published_diagnostics message")
-        report = published_diagnostics[0]
+        def recursive_iter(obj):
+            if isinstance(obj, dict):
+                yield obj
+                for item in obj.values():
+                    yield from recursive_iter(item)
+            elif any(isinstance(obj, t) for t in (list, tuple)):
+                for item in obj:
+                    yield from recursive_iter(item)
+
+        for item in recursive_iter(content):
+            if "uri" in item and "range" in item:
+                markers = self.get_file_tags(item["uri"][:-len(".sol")])
+                for tag, tagRange in markers.items():
+                    if tagRange == item["range"]:
+                        item["range"] = str(tag)
+
+        # Convert JSON to string and split it at the quoted tags
+        split_by_tag = TEST_REGEXES.findQuotedTag.split(json.dumps(content, indent=4, sort_keys=True))
+
+        # remove the quotes and return result
+        return "".join(map(lambda p: p[1:-1] if p.startswith('"@') else p, split_by_tag))
+
+    def user_interaction_failed_diagnostics(
+        self,
+        solc: JsonRpcProcess,
+        test,
+        content,
+        current_diagnostics: TestParser.Diagnostics
+    ):
+        """
+        Asks the user how to proceed after an error.
+        Returns True if the test/file should be ignored, otherwise False
+        """
+        while True:
+            print("(u)pdate/(r)etry/(s)kip file?")
+            user_response = sys.stdin.read(1)
+            if user_response == "u":
+                while True:
+                    try:
+                        self.update_diagnostics_in_file(solc, test, content, current_diagnostics)
+                        return False
+                    # pragma pylint: disable=broad-except
+                    except Exception as e:
+                        print(e)
+                        if ret := self.user_interaction_failed_autoupdate(test):
+                            return ret
+            elif user_response == 's':
+                return True
+            elif user_response == 'r':
+                return False
+
+    def user_interaction_failed_autoupdate(self, test):
+        print("(e)dit/(r)etry/(s)kip file?")
+        user_response = sys.stdin.read(1)
+        if user_response == "r":
+            print("retrying...")
+            # pragma pylint: disable=no-member
+            self.get_file_tags.cache_clear()
+            return False
+        if user_response == "e":
+            editor = os.environ.get('VISUAL', os.environ.get('EDITOR', 'vi'))
+            subprocess.run(
+                f'{editor} {self.get_test_file_path(test)}',
+                shell=True,
+                check=True
+            )
+            # pragma pylint: disable=no-member
+            self.get_file_tags.cache_clear()
+        elif user_response == "s":
+            print("skipping...")
 
-        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
-        diagnostics = report['diagnostics']
+        return True
 
-        markers = self.get_file_tags(TEST_NAME)
+    # }}}
 
-        self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
-        self.expect_diagnostic(diagnostics[0], code=9574, marker=markers["@conversionError"])
-        self.expect_diagnostic(diagnostics[1], code=6777, marker=markers["@argumentsRequired"])
-        self.expect_diagnostic(diagnostics[2], code=6160, marker=markers["@wrongArgumentsCount"])
+    # {{{ actual tests
 
     def test_publish_diagnostics_errors_multiline(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
@@ -510,7 +1125,7 @@ def test_publish_diagnostics_errors_multiline(self, solc: JsonRpcProcess) -> Non
     def test_textDocument_didOpen_with_relative_import(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
         TEST_NAME = 'didOpen_with_import'
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME, 2)
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
 
         self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
 
@@ -526,7 +1141,7 @@ def test_textDocument_didOpen_with_relative_import(self, solc: JsonRpcProcess) -
         marker = self.get_file_tags("lib")["@diagnostics"]
         self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
 
-
+    @functools.lru_cache # pragma pylint: disable=lru-cache-decorating-method
     def get_file_tags(self, test_name: str, verbose=False):
         """
         Finds all tags (e.g. @tagname) in the given test and returns them as a
@@ -541,14 +1156,12 @@ def get_file_tags(self, test_name: str, verbose=False):
 
         markers = {}
 
-        for lineNum, line in enumerate(content.splitlines(), start=-1):
+        for lineNum, line in tags_only(content.splitlines()):
             commentStart = line.find("//")
-            if commentStart == -1:
-                continue
 
-            for kind, regex in self.marker_regexes.items():
+            for kind, regex in TAG_REGEXES._asdict().items():
                 for match in regex.finditer(line[commentStart:]):
-                    if kind == Marker.SimpleRange:
+                    if kind == "simpleRange":
                         markers[match.group("tag")] = {
                             "start": {
                                 "line": lineNum,
@@ -558,7 +1171,7 @@ def get_file_tags(self, test_name: str, verbose=False):
                                 "line": lineNum,
                                 "character": match.end("range") + commentStart
                         }}
-                    elif kind == Marker.MultilineRange:
+                    elif kind == "multilineRange":
                         if match.group("delimiter") == "(":
                             markers[match.group("tag")] = \
                                 { "start": { "line": lineNum, "character": 0 } }
@@ -575,7 +1188,7 @@ def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
         # Reusing another test but now change some file that generates an error in the other.
         self.test_textDocument_didOpen_with_relative_import(solc)
         marker = self.get_file_tags("lib")["@addFunction"]
-        self.open_file_and_wait_for_diagnostics(solc, 'lib', 2)
+        self.open_file_and_wait_for_diagnostics(solc, 'lib')
         solc.send_message(
             'textDocument/didChange',
             {
@@ -592,7 +1205,7 @@ def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
                 ]
             }
         )
-        published_diagnostics = self.wait_for_diagnostics(solc, 2)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
 
         # Main file now contains a new diagnostic
@@ -612,7 +1225,7 @@ def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
     def test_textDocument_didOpen_with_relative_import_without_project_url(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc, expose_project_root=False)
         TEST_NAME = 'didOpen_with_import'
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME, 2)
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
         self.verify_didOpen_with_import_diagnostics(published_diagnostics)
 
     def verify_didOpen_with_import_diagnostics(
@@ -632,9 +1245,42 @@ def verify_didOpen_with_import_diagnostics(
         self.expect_equal(report['uri'], self.get_test_file_uri('lib'), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
 
-        marker = self.get_file_tags('lib')["@diagnostics"]
+        markers = self.get_file_tags('lib')
+        marker = markers["@diagnostics"]
         self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
 
+    def test_generic(self, solc: JsonRpcProcess) -> None:
+        self.setup_lsp(solc)
+
+        STATIC_TESTS = ['didChange_template', 'didOpen_with_import', 'publish_diagnostics_3']
+
+        tests = filter(
+            lambda x: x not in STATIC_TESTS,
+            map(lambda x: x[:-len(".sol")], os.listdir(self.project_root_dir))
+        )
+
+        for test in tests:
+            try_again = True
+            print(f"Running test {test}")
+
+            while try_again:
+                runner = FileTestRunner(test, solc, self)
+
+                try:
+                    runner.test_diagnostics()
+                    try_again = not runner.test_methods()
+                except ExpectationFailed as e:
+                    print(e)
+
+                    if e.part == e.Part.Diagnostics:
+                        try_again = not self.user_interaction_failed_diagnostics(
+                            solc,
+                            test,
+                            runner.content,
+                            runner.expected_diagnostics
+                        )
+                    else:
+                        raise
 
     def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
@@ -664,7 +1310,7 @@ def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess)
                 ]
             }
         )
-        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 1)
         report = published_diagnostics[0]
         self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
@@ -676,7 +1322,7 @@ def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess)
     def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess) -> None:
         # Reuse this test to prepare and ensure it is as expected
         self.test_textDocument_didOpen_with_relative_import(solc)
-        self.open_file_and_wait_for_diagnostics(solc, 'lib', 2)
+        self.open_file_and_wait_for_diagnostics(solc, 'lib')
 
         marker = self.get_file_tags('lib')["@diagnostics"]
 
@@ -697,7 +1343,7 @@ def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess
                 ]
             }
         )
-        published_diagnostics = self.wait_for_diagnostics(solc, 2)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 2, "published diagnostics count")
         report1 = published_diagnostics[0]
         self.expect_equal(report1['uri'], self.get_test_file_uri('didOpen_with_import'), "Correct file URI")
@@ -712,7 +1358,7 @@ def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess
             { 'textDocument': { 'uri': self.get_test_file_uri('lib') }}
         )
 
-        published_diagnostics = self.wait_for_diagnostics(solc, 2)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.verify_didOpen_with_import_diagnostics(published_diagnostics)
 
     def test_textDocument_opening_two_new_files_edit_and_close(self, solc: JsonRpcProcess) -> None:
@@ -734,7 +1380,7 @@ def test_textDocument_opening_two_new_files_edit_and_close(self, solc: JsonRpcPr
                 ])
             }
         })
-        reports = self.wait_for_diagnostics(solc, 1)
+        reports = self.wait_for_diagnostics(solc)
         self.expect_equal(len(reports), 1, "one publish diagnostics notification")
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
 
@@ -750,7 +1396,7 @@ def test_textDocument_opening_two_new_files_edit_and_close(self, solc: JsonRpcPr
                 ])
             }
         })
-        reports = self.wait_for_diagnostics(solc, 2)
+        reports = self.wait_for_diagnostics(solc)
         self.expect_equal(len(reports), 2, "one publish diagnostics notification")
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
         self.expect_equal(len(reports[1]['diagnostics']), 0, "should not contain diagnostics")
@@ -769,7 +1415,7 @@ def test_textDocument_opening_two_new_files_edit_and_close(self, solc: JsonRpcPr
                 }
             ]
         })
-        reports = self.wait_for_diagnostics(solc, 2)
+        reports = self.wait_for_diagnostics(solc)
         self.expect_equal(len(reports), 2, "one publish diagnostics notification")
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
         self.expect_equal(len(reports[1]['diagnostics']), 0, "should not contain diagnostics")
@@ -779,7 +1425,7 @@ def test_textDocument_opening_two_new_files_edit_and_close(self, solc: JsonRpcPr
             { 'textDocument': { 'uri': FILE_B_URI }}
         )
         # We only get one diagnostics message since the diagnostics for b.sol was empty.
-        reports = self.wait_for_diagnostics(solc, 1)
+        reports = self.wait_for_diagnostics(solc)
         self.expect_equal(len(reports), 1, "one publish diagnostics notification")
         self.expect_diagnostic(reports[0]['diagnostics'][0], 6275, 2, (0, 17)) # a.sol: File B not found
         self.expect_equal(reports[0]['uri'], FILE_A_URI, "Correct uri")
@@ -804,7 +1450,7 @@ def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc
                     'import "./lib.sol";\n'
             }
         })
-        reports = self.wait_for_diagnostics(solc, 2)
+        reports = self.wait_for_diagnostics(solc)
         self.expect_equal(len(reports), 2, '')
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
 
@@ -818,12 +1464,11 @@ def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc
             'textDocument/didClose',
             { 'textDocument': { 'uri': FILE_A_URI }}
         )
-        reports = self.wait_for_diagnostics(solc, 1)
+        reports = self.wait_for_diagnostics(solc)
         self.expect_equal(len(reports), 1, '')
         self.expect_equal(reports[0]['uri'], f'file://{self.project_root_dir}/lib.sol', "")
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
 
-
     def test_textDocument_didChange_at_eol(self, solc: JsonRpcProcess) -> None:
         """
         Append at one line and insert a new one below.
@@ -839,7 +1484,7 @@ def test_textDocument_didChange_at_eol(self, solc: JsonRpcProcess) -> None:
                 'text': self.get_test_file_contents(FILE_NAME)
             }
         })
-        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
         self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0, "no diagnostics")
         solc.send_message('textDocument/didChange', {
@@ -856,7 +1501,7 @@ def test_textDocument_didChange_at_eol(self, solc: JsonRpcProcess) -> None:
                 }
             ]
         })
-        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
         report2 = published_diagnostics[0]
         self.expect_equal(report2['uri'], FILE_URI, "Correct file URI")
@@ -875,238 +1520,13 @@ def test_textDocument_didChange_at_eol(self, solc: JsonRpcProcess) -> None:
                 }
             ]
         })
-        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
         report3 = published_diagnostics[0]
         self.expect_equal(report3['uri'], FILE_URI, "Correct file URI")
         self.expect_equal(len(report3['diagnostics']), 1, "one diagnostic")
         self.expect_diagnostic(report3['diagnostics'][0], 4126, 6, (1, 23))
 
-    def test_textDocument_definition(self, solc: JsonRpcProcess) -> None:
-        self.setup_lsp(solc)
-        FILE_NAME = 'goto_definition'
-        FILE_URI = self.get_test_file_uri(FILE_NAME)
-        LIB_URI = self.get_test_file_uri('lib')
-        solc.send_message('textDocument/didOpen', {
-            'textDocument': {
-                'uri': FILE_URI,
-                'languageId': 'Solidity',
-                'version': 1,
-                'text': self.get_test_file_contents(FILE_NAME)
-            }
-        })
-        published_diagnostics = self.wait_for_diagnostics(solc, 2)
-        self.expect_equal(len(published_diagnostics), 2, "publish diagnostics for 2 files")
-        self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0)
-        self.expect_equal(len(published_diagnostics[1]['diagnostics']), 1)
-        self.expect_diagnostic(published_diagnostics[1]['diagnostics'][0], 2072, 33, (8, 19)) # unused variable in lib.sol
-
-        # import directive
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(3, 9), # symbol `"./lib.sol"` in `import "./lib.sol"`
-            expected_uri=LIB_URI,
-            expected_lineNo=0,
-            expected_startEndColumns=(0, 0),
-            description="import directive"
-        )
-
-        # type symbol to jump to type defs (error, contract, enum, ...)
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(30, 19), # symbol `IA` in `new IA()`
-            expected_uri=FILE_URI,
-            expected_lineNo=10,
-            expected_startEndColumns=(9, 11),
-            description="type symbol to jump to definition"
-        )
-
-        # virtual function lookup?
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(31, 12), # symbol `f`, jumps to interface definition
-            expected_uri=FILE_URI,
-            expected_lineNo=7,
-            expected_startEndColumns=(13, 14),
-            description="virtual function lookup"
-        )
-
-        # using for
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(37, 10), # symbol `add` in `i.add(5)`
-            expected_uri=FILE_URI,
-            expected_lineNo=22,
-            expected_startEndColumns=(13, 16),
-            description="using for"
-        )
-
-        # library
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(43, 15), # symbol `Lib` in `Lib.add(n, 1)`
-            expected_uri=LIB_URI,
-            expected_lineNo=22,
-            expected_startEndColumns=(8, 11),
-            description="Library symbol from different file"
-        )
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(43, 19), # symbol `add` in `Lib.add(n, 1)`
-            expected_uri=LIB_URI,
-            expected_lineNo=24,
-            expected_startEndColumns=(13, 16),
-            description="Library member symbol from different file"
-        )
-
-        # enum type symbol and enum values
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(46, 19), # symbol `Color` in function signature's parameter
-            expected_uri=LIB_URI,
-            expected_lineNo=13,
-            expected_startEndColumns=(5, 10),
-            description="Enum type"
-        )
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(48, 24), # symbol `Red` in `Color.Red`
-            expected_uri=LIB_URI,
-            expected_lineNo=15,
-            expected_startEndColumns=(4, 7),
-            description="Enum value"
-        )
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(48, 24), # symbol `Red` in `Color.Red`
-            expected_uri=LIB_URI,
-            expected_lineNo=15,
-            expected_startEndColumns=(4, 7),
-            description="Enum value"
-        )
-
-        # local variable declarations
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(49, 17), # symbol `e` in `(c == e)`
-            expected_uri=FILE_URI,
-            expected_lineNo=48,
-            expected_startEndColumns=(14, 15),
-            description="local variable declaration"
-        )
-
-        # User defined type
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(58, 8), # symbol `Price` in `Price p ...`
-            expected_uri=FILE_URI,
-            expected_lineNo=55,
-            expected_startEndColumns=(9, 14),
-            description="User defined type on left hand side"
-        )
-
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(58, 18), # symbol `Price` in `Price.wrap()` expected_uri=FILE_URI,
-            expected_uri=FILE_URI,
-            expected_lineNo=55,
-            expected_startEndColumns=(9, 14),
-            description="User defined type on right hand side."
-        )
-
-        # struct constructor also properly jumps to the struct's declaration.
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(64, 33), # symbol `RGBColor` right hand side expression.
-            expected_uri=LIB_URI,
-            expected_lineNo=38,
-            expected_startEndColumns=(7, 15),
-            description="Struct constructor."
-        )
-
-    def test_textDocument_definition_imports(self, solc: JsonRpcProcess) -> None:
-        self.setup_lsp(solc)
-        FILE_NAME = 'goto_definition_imports'
-        FILE_URI = self.get_test_file_uri(FILE_NAME)
-        LIB_URI = self.get_test_file_uri('lib')
-        solc.send_message('textDocument/didOpen', {
-            'textDocument': {
-                'uri': FILE_URI,
-                'languageId': 'Solidity',
-                'version': 1,
-                'text': self.get_test_file_contents(FILE_NAME)
-            }
-        })
-        published_diagnostics = self.wait_for_diagnostics(solc, 2)
-        self.expect_equal(len(published_diagnostics), 2, "publish diagnostics for 2 files")
-        self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0)
-        self.expect_equal(len(published_diagnostics[1]['diagnostics']), 1)
-        self.expect_diagnostic(published_diagnostics[1]['diagnostics'][0], 2072, 33, (8, 19)) # unused variable in lib.sol
-
-        # import directive: test symbol alias
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(3, 9), #  in `Weather` of `import {Weather as Wetter} from "./lib.sol"`
-            expected_uri=LIB_URI,
-            expected_lineNo=6,
-            expected_startEndColumns=(5, 12),
-            description="goto definition of symbol in symbol alias import directive"
-        )
-
-        # import directive: test symbol alias
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(8, 55), # `Wetter` in return type declaration
-            expected_uri=LIB_URI,
-            expected_lineNo=6,
-            expected_startEndColumns=(5, 12),
-            description="goto definition of symbol in symbol alias import directive"
-        )
-
-        # That.Color tests with `That` being the aliased library to be imported.
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(13, 55), # `That` in return type declaration
-            expected_uri=LIB_URI,
-            expected_lineNo=13,
-            expected_startEndColumns=(5, 10),
-            description="goto definition of symbol in symbol alias import directive"
-        )
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(15, 8),
-            expected_uri=LIB_URI,
-            expected_lineNo=13,
-            expected_startEndColumns=(5, 10),
-            description="`That` in LHS variable assignment"
-        )
-        self.expect_goto_definition_location(
-            solc=solc,
-            document_uri=FILE_URI,
-            document_position=(15, 27),
-            expected_uri=FILE_URI,
-            expected_lineNo=4,
-            expected_startEndColumns=(22, 26),
-            description="`That` in expression"
-        )
-
     def test_textDocument_didChange_empty_file(self, solc: JsonRpcProcess) -> None:
         """
         Starts with an empty file and changes it to look like
@@ -1126,7 +1546,7 @@ def test_textDocument_didChange_empty_file(self, solc: JsonRpcProcess) -> None:
                 'text': ''
             }
         })
-        reports = self.wait_for_diagnostics(solc, 1)
+        reports = self.wait_for_diagnostics(solc)
         self.expect_equal(len(reports), 1)
         report = reports[0]
         published_diagnostics = report['diagnostics']
@@ -1147,7 +1567,7 @@ def test_textDocument_didChange_empty_file(self, solc: JsonRpcProcess) -> None:
                 }
             ]
         })
-        published_diagnostics = self.wait_for_diagnostics(solc, 2)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.verify_didOpen_with_import_diagnostics(published_diagnostics, 'a_new_file')
 
     def test_textDocument_didChange_multi_line(self, solc: JsonRpcProcess) -> None:
@@ -1166,7 +1586,7 @@ def test_textDocument_didChange_multi_line(self, solc: JsonRpcProcess) -> None:
                 'text': self.get_test_file_contents(FILE_NAME)
             }
         })
-        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
         self.expect_equal(len(published_diagnostics[0]['diagnostics']), 0, "no diagnostics")
         solc.send_message('textDocument/didChange', {
@@ -1181,7 +1601,7 @@ def test_textDocument_didChange_multi_line(self, solc: JsonRpcProcess) -> None:
                 }
             ]
         })
-        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
         report2 = published_diagnostics[0]
         self.expect_equal(report2['uri'], FILE_URI, "Correct file URI")
@@ -1201,7 +1621,7 @@ def test_textDocument_didChange_multi_line(self, solc: JsonRpcProcess) -> None:
                 }
             ]
         })
-        published_diagnostics = self.wait_for_diagnostics(solc, 1)
+        published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 1, "one publish diagnostics notification")
         report3 = published_diagnostics[0]
         self.expect_equal(report3['uri'], FILE_URI, "Correct file URI")
@@ -1233,6 +1653,9 @@ def test_textDocument_didChange_multi_line(self, solc: JsonRpcProcess) -> None:
     # }}}
 
 if __name__ == "__main__":
+    # Turn off user input buffering so we get the input immediately,
+    # not only after a line break
+    tty.setcbreak(sys.stdin.fileno())
     suite = SolidityLSPTestSuite()
     exit_code = suite.main()
     sys.exit(exit_code)

From e30d0a61992e423250b76855e1e3ef6088ed6c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 19 Jan 2022 18:17:38 +0100
Subject: [PATCH 0553/1748] externalTests: Allow adding extra settings to
 presets

---
 test/externalTests/common.sh | 45 +++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 9c68c88288..c510ebc92f 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -198,6 +198,8 @@ function force_truffle_compiler_settings
     local solc_path="$3"
     local preset="$4"
     local evm_version="${5:-"$CURRENT_EVM_VERSION"}"
+    local extra_settings="$6"
+    local extra_optimizer_settings="$7"
 
     [[ $binary_type == native || $binary_type == solcjs ]] || assertFail
 
@@ -209,14 +211,14 @@ function force_truffle_compiler_settings
     echo "Binary type: $binary_type"
     echo "Compiler path: $solc_path"
     echo "Settings preset: ${preset}"
-    echo "Settings: $(settings_from_preset "$preset" "$evm_version")"
+    echo "Settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
     echo "EVM version: $evm_version"
     echo "Compiler version: ${SOLCVERSION_SHORT}"
     echo "Compiler version (full): ${SOLCVERSION}"
     echo "-------------------------------------"
 
     local compiler_settings gas_reporter_settings
-    compiler_settings=$(truffle_compiler_settings "$solc_path" "$preset" "$evm_version")
+    compiler_settings=$(truffle_compiler_settings "$solc_path" "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")
     gas_reporter_settings=$(eth_gas_reporter_settings "$preset")
 
     {
@@ -307,19 +309,21 @@ function force_hardhat_compiler_settings
     local preset="$2"
     local config_var_name="$3"
     local evm_version="${4:-"$CURRENT_EVM_VERSION"}"
+    local extra_settings="$5"
+    local extra_optimizer_settings="$6"
 
     printLog "Configuring Hardhat..."
     echo "-------------------------------------"
     echo "Config file: ${config_file}"
     echo "Settings preset: ${preset}"
-    echo "Settings: $(settings_from_preset "$preset" "$evm_version")"
+    echo "Settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
     echo "EVM version: ${evm_version}"
     echo "Compiler version: ${SOLCVERSION_SHORT}"
     echo "Compiler version (full): ${SOLCVERSION}"
     echo "-------------------------------------"
 
     local compiler_settings gas_reporter_settings
-    compiler_settings=$(hardhat_compiler_settings "$SOLCVERSION_SHORT" "$preset" "$evm_version")
+    compiler_settings=$(hardhat_compiler_settings "$SOLCVERSION_SHORT" "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")
     gas_reporter_settings=$(eth_gas_reporter_settings "$preset")
     if [[ $config_file == *\.js ]]; then
         [[ $config_var_name == "" ]] || assertFail
@@ -372,17 +376,22 @@ function settings_from_preset
 {
     local preset="$1"
     local evm_version="$2"
+    local extra_settings="$3"
+    local extra_optimizer_settings="$4"
 
     [[ " ${AVAILABLE_PRESETS[*]} " == *" $preset "* ]] || assertFail
 
+    [[ $extra_settings == "" ]] || extra_settings="${extra_settings}, "
+    [[ $extra_optimizer_settings == "" ]] || extra_optimizer_settings="${extra_optimizer_settings}, "
+
     case "$preset" in
         # NOTE: Remember to update `parallelism` of `t_ems_ext` job in CI config if you add/remove presets
-        legacy-no-optimize)       echo "{evmVersion: '${evm_version}', viaIR: false, optimizer: {enabled: false}}" ;;
-        ir-no-optimize)           echo "{evmVersion: '${evm_version}', viaIR: true,  optimizer: {enabled: false}}" ;;
-        legacy-optimize-evm-only) echo "{evmVersion: '${evm_version}', viaIR: false, optimizer: {enabled: true, details: {yul: false}}}" ;;
-        ir-optimize-evm-only)     echo "{evmVersion: '${evm_version}', viaIR: true,  optimizer: {enabled: true, details: {yul: false}}}" ;;
-        legacy-optimize-evm+yul)  echo "{evmVersion: '${evm_version}', viaIR: false, optimizer: {enabled: true, details: {yul: true}}}" ;;
-        ir-optimize-evm+yul)      echo "{evmVersion: '${evm_version}', viaIR: true,  optimizer: {enabled: true, details: {yul: true}}}" ;;
+        legacy-no-optimize)       echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: false, optimizer: {${extra_optimizer_settings}enabled: false}}" ;;
+        ir-no-optimize)           echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: true,  optimizer: {${extra_optimizer_settings}enabled: false}}" ;;
+        legacy-optimize-evm-only) echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: false, optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: false}}}" ;;
+        ir-optimize-evm-only)     echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: true,  optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: false}}}" ;;
+        legacy-optimize-evm+yul)  echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: false, optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: true}}}" ;;
+        ir-optimize-evm+yul)      echo "{${extra_settings}evmVersion: '${evm_version}', viaIR: true,  optimizer: {${extra_optimizer_settings}enabled: true, details: {yul: true}}}" ;;
         *)
             fail "Unknown settings preset: '${preset}'."
             ;;
@@ -419,11 +428,13 @@ function truffle_compiler_settings
     local solc_path="$1"
     local preset="$2"
     local evm_version="$3"
+    local extra_settings="$4"
+    local extra_optimizer_settings="$5"
 
     echo "{"
     echo "    solc: {"
     echo "        version: \"${solc_path}\","
-    echo "        settings: $(settings_from_preset "$preset" "$evm_version")"
+    echo "        settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
     echo "    }"
     echo "}"
 }
@@ -468,10 +479,12 @@ function hardhat_compiler_settings {
     local solc_version="$1"
     local preset="$2"
     local evm_version="$3"
+    local extra_settings="$4"
+    local extra_optimizer_settings="$5"
 
     echo "{"
     echo "    version: '${solc_version}',"
-    echo "    settings: $(settings_from_preset "$preset" "$evm_version")"
+    echo "    settings: $(settings_from_preset "$preset" "$evm_version" "$extra_settings" "$extra_optimizer_settings")"
     echo "}"
 }
 
@@ -506,9 +519,11 @@ function truffle_run_test
     local compile_only_presets="$5"
     local compile_fn="$6"
     local test_fn="$7"
+    local extra_settings="$8"
+    local extra_optimizer_settings="$9"
 
     truffle_clean
-    force_truffle_compiler_settings "$config_file" "$binary_type" "$solc_path" "$preset"
+    force_truffle_compiler_settings "$config_file" "$binary_type" "$solc_path" "$preset" "$CURRENT_EVM_VERSION" "$extra_settings" "$extra_optimizer_settings"
     compile_and_run_test compile_fn test_fn truffle_verify_compiler_version "$preset" "$compile_only_presets"
 }
 
@@ -520,9 +535,11 @@ function hardhat_run_test
     local compile_fn="$4"
     local test_fn="$5"
     local config_var_name="$6"
+    local extra_settings="$7"
+    local extra_optimizer_settings="$8"
 
     hardhat_clean
-    force_hardhat_compiler_settings "$config_file" "$preset" "$config_var_name"
+    force_hardhat_compiler_settings "$config_file" "$preset" "$config_var_name" "$CURRENT_EVM_VERSION" "$extra_settings" "$extra_optimizer_settings"
     compile_and_run_test compile_fn test_fn hardhat_verify_compiler_version "$preset" "$compile_only_presets"
 }
 

From 8e085432bb7e9e6b1f4992d43a24fbf8dcf179b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 19 Jan 2022 19:24:24 +0100
Subject: [PATCH 0554/1748] External test for Brink

---
 .circleci/config.yml        |  8 ++++
 test/externalTests.sh       |  1 +
 test/externalTests/brink.sh | 83 +++++++++++++++++++++++++++++++++++++
 3 files changed, 92 insertions(+)
 create mode 100755 test/externalTests/brink.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a75e372ae3..d420213738 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -582,6 +582,12 @@ defaults:
       binary_type: native
       nodejs_version: '16'
       resource_class: medium
+  - job_native_test_ext_brink: &job_native_test_ext_brink
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_brink
+      project: brink
+      binary_type: native
+      nodejs_version: '16'
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *workflow_emscripten
       name: t_ems_test_ext_colony
@@ -1470,6 +1476,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_uniswap
       - t_ems_ext: *job_native_test_ext_prb_math
       - t_ems_ext: *job_native_test_ext_elementfi
+      - t_ems_ext: *job_native_test_ext_brink
 
       - c_ext_benchmarks:
           <<: *workflow_trigger_on_tags
@@ -1487,6 +1494,7 @@ workflows:
             - t_native_test_ext_uniswap
             - t_native_test_ext_prb_math
             - t_native_test_ext_elementfi
+            - t_native_test_ext_brink
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 89e7515d44..8c581a1650 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -50,3 +50,4 @@ printTask "Running external tests..."
 "${REPO_ROOT}/test/externalTests/uniswap.sh" "$@"
 "${REPO_ROOT}/test/externalTests/prb-math.sh" "$@"
 "${REPO_ROOT}/test/externalTests/elementfi.sh" "$@"
+"${REPO_ROOT}/test/externalTests/brink.sh" "$@"
diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
new file mode 100755
index 0000000000..1513350bbf
--- /dev/null
+++ b/test/externalTests/brink.sh
@@ -0,0 +1,83 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
+
+function compile_fn { yarn compile; }
+function test_fn { SNAPSHOT_UPDATE=1 npx --no hardhat test; }
+
+function brink_test
+{
+    local repo="https://github.com/brinktrade/brink-core"
+    local ref_type=branch
+    local ref=master
+    local config_file="hardhat.config.js"
+    local config_var=""
+    local extra_settings="metadata: {bytecodeHash: 'none'}"
+    local extra_optimizer_settings="runs: 800"
+
+    local compile_only_presets=(
+        #ir-no-optimize            # Compilation fails with "YulException: Variable var_signature_127_offset is 2 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_signature_127_offset is 2 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul        # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
+        legacy-optimize-evm+yul    # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
+        legacy-no-optimize         # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
+        legacy-optimize-evm-only   # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
+    )
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+
+    neutralize_package_lock
+    neutralize_package_json_hooks
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var" "$CURRENT_EVM_VERSION" "$extra_settings" "$extra_optimizer_settings"
+    yarn install
+    yarn add hardhat-gas-reporter
+
+    # TODO: Remove when https://github.com/brinktrade/brink-core/issues/48 is fixed.
+    yarn add chai
+
+    replace_version_pragmas
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var" "$extra_settings" "$extra_optimizer_settings"
+        store_benchmark_report hardhat brink "$repo" "$preset"
+    done
+}
+
+external_test Brink brink_test

From 5111e7543cabb388e75d46a7c8dd0064afc47e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 13 Apr 2022 19:50:11 +0200
Subject: [PATCH 0555/1748] soltest.sh: Prevent parallel tests from overwriting
 each other's XML test output

---
 .circleci/soltest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/soltest.sh b/.circleci/soltest.sh
index 30bd1274ca..91325f02e4 100755
--- a/.circleci/soltest.sh
+++ b/.circleci/soltest.sh
@@ -74,7 +74,7 @@ do
     BOOST_TEST_ARGS_RUN=(
         "--color_output=no"
         "--show_progress=yes"
-        "--logger=JUNIT,error,test_results/$(get_logfile_basename "$run").xml"
+        "--logger=JUNIT,error,test_results/$(get_logfile_basename "$((CPUs * CIRCLE_NODE_INDEX + run))").xml"
         "${BOOST_TEST_ARGS[@]}"
     )
     SOLTEST_ARGS=("--evm-version=$EVM" "${SOLTEST_FLAGS[@]}")

From 43ff61f1850c94434d85ae0a8062567dd1f7c311 Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Fri, 15 Apr 2022 12:24:48 -0700
Subject: [PATCH 0556/1748] Update functions.rst

---
 docs/contracts/functions.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index 8957d0f547..76304aaad0 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -317,12 +317,13 @@ will consume more gas than the 2300 gas stipend:
 - Sending Ether
 
 .. warning::
-    Contracts that receive Ether directly (without a function call, i.e. using ``send`` or ``transfer``)
-    but do not define a receive Ether function or a payable fallback function
-    throw an exception, sending back the Ether (this was different
-    before Solidity v0.4.0). So if you want your contract to receive Ether,
+    When Ether is sent directly to a contract (without a function call, i.e. sender uses ``send`` or ``transfer``)
+    but the receiving contract does not define a receive Ether function or a payable fallback function,
+    an exception will be thrown, sending back the Ether (this was different
+    before Solidity v0.4.0). If you want your contract to receive Ether,
     you have to implement a receive Ether function (using payable fallback functions for receiving Ether is
-    not recommended, since it would not fail on interface confusions).
+    not recommended, since the fallback is invoked and would not fail for interface confusions
+    on the part of the sender).
 
 
 .. warning::

From 048b253a9331f12ee931697844eefc9263d376fa Mon Sep 17 00:00:00 2001
From: a3d4 <a3d4@pm.me>
Date: Thu, 21 Apr 2022 01:44:25 +0200
Subject: [PATCH 0557/1748] Refix MSVC Debug crash

---
 libsolutil/Visitor.h                      | 13 ++++++-
 libyul/optimiser/StructuralSimplifier.cpp | 43 ++++++++++-------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/libsolutil/Visitor.h b/libsolutil/Visitor.h
index 497ed2f292..1147f9579b 100644
--- a/libsolutil/Visitor.h
+++ b/libsolutil/Visitor.h
@@ -56,6 +56,17 @@ struct VisitorFallback<R> { template<typename T> R operator()(T&&) const { retur
 template<>
 struct VisitorFallback<> { template<typename T> void operator()(T&&) const {} };
 
-template <typename... Visitors> struct GenericVisitor: Visitors... { using Visitors::operator()...; };
+// MSVC. Empty base class optimization does not happen in some scenarios.
+// Enforcing it with __declspec(empty_bases) avoids MSVC Debug test crash
+// (Run-Time Check Failure #2 - Stack around the variable '....' was corrupted).
+// See https://docs.microsoft.com/en-us/cpp/cpp/empty-bases,
+//     https://developercommunity.visualstudio.com/t/10005513.
+#if defined(_MSC_VER)
+#define SOLC_EMPTY_BASES __declspec(empty_bases)
+#else
+#define SOLC_EMPTY_BASES
+#endif
+
+template <typename... Visitors> struct SOLC_EMPTY_BASES GenericVisitor: Visitors... { using Visitors::operator()...; };
 template <typename... Visitors> GenericVisitor(Visitors...) -> GenericVisitor<Visitors...>;
 }
diff --git a/libyul/optimiser/StructuralSimplifier.cpp b/libyul/optimiser/StructuralSimplifier.cpp
index 0b80c42cdb..ca8f942392 100644
--- a/libyul/optimiser/StructuralSimplifier.cpp
+++ b/libyul/optimiser/StructuralSimplifier.cpp
@@ -93,32 +93,27 @@ void StructuralSimplifier::operator()(Block& _block)
 
 void StructuralSimplifier::simplify(std::vector<yul::Statement>& _statements)
 {
-	// Explicit local variables ifLambda, switchLambda, forLoopLambda are created to avoid MSVC C++17 Debug test crash
-	// (Run-Time Check Failure #2 - Stack around the variable '....' was corrupted).
-	// As soon as the issue is fixed, this workaround can be removed.
-	auto ifLambda = [&](If& _ifStmt) -> OptionalStatements
-	{
-		if (expressionAlwaysTrue(*_ifStmt.condition))
-			return {std::move(_ifStmt.body.statements)};
-		else if (expressionAlwaysFalse(*_ifStmt.condition))
-			return {vector<Statement>{}};
-		return {};
-	};
-	auto switchLambda = [&](Switch& _switchStmt) -> OptionalStatements
-	{
-		if (std::optional<u256> const constExprVal = hasLiteralValue(*_switchStmt.expression))
-			return replaceConstArgSwitch(_switchStmt, constExprVal.value());
-		return {};
-	};
-	auto forLoopLambda = [&](ForLoop& _forLoop) -> OptionalStatements
-	{
-		if (expressionAlwaysFalse(*_forLoop.condition))
-			return {std::move(_forLoop.pre.statements)};
-		return {};
+	util::GenericVisitor visitor{
+		util::VisitorFallback<OptionalStatements>{},
+		[&](If& _ifStmt) -> OptionalStatements {
+			if (expressionAlwaysTrue(*_ifStmt.condition))
+				return {std::move(_ifStmt.body.statements)};
+			else if (expressionAlwaysFalse(*_ifStmt.condition))
+				return {vector<Statement>{}};
+			return {};
+		},
+		[&](Switch& _switchStmt) -> OptionalStatements {
+			if (std::optional<u256> const constExprVal = hasLiteralValue(*_switchStmt.expression))
+				return replaceConstArgSwitch(_switchStmt, constExprVal.value());
+			return {};
+		},
+		[&](ForLoop& _forLoop) -> OptionalStatements {
+			if (expressionAlwaysFalse(*_forLoop.condition))
+				return {std::move(_forLoop.pre.statements)};
+			return {};
+		}
 	};
 
-	util::GenericVisitor visitor{util::VisitorFallback<OptionalStatements>{}, ifLambda, switchLambda, forLoopLambda};
-
 	util::iterateReplacing(
 		_statements,
 		[&](Statement& _stmt) -> OptionalStatements

From cb24e5d545fa295e9caf082103107bc327e535ca Mon Sep 17 00:00:00 2001
From: Alexey Shekhirin <a.shekhirin@gmail.com>
Date: Fri, 29 Apr 2022 16:13:04 +0400
Subject: [PATCH 0558/1748] fix(parser): error for unexpected token

---
 libsolidity/parsing/Parser.cpp                                  | 2 +-
 test/cmdlineTests/recovery_ast_empty_contract/err               | 2 +-
 test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol | 2 +-
 test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol    | 2 +-
 test/libsolidity/syntaxTests/freeFunctions/free_receive.sol     | 2 +-
 test/libsolidity/syntaxTests/unexpected.sol                     | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index a1b49a81f3..7bf0de045a 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -142,7 +142,7 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 					expectToken(Token::Semicolon);
 				}
 				else
-					fatalParserError(7858_error, "Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.");
+					fatalParserError(7858_error, "Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.");
 			}
 		}
 		solAssert(m_recursionDepth == 0, "");
diff --git a/test/cmdlineTests/recovery_ast_empty_contract/err b/test/cmdlineTests/recovery_ast_empty_contract/err
index f7324da63d..fed0544709 100644
--- a/test/cmdlineTests/recovery_ast_empty_contract/err
+++ b/test/cmdlineTests/recovery_ast_empty_contract/err
@@ -1,4 +1,4 @@
-Error: Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
+Error: Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
  --> recovery_ast_empty_contract/input.sol:3:1:
   |
 3 | c
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol b/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol
index e44356dc3e..7878983571 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_constructor.sol
@@ -1,3 +1,3 @@
 constructor() {}
 // ----
-// ParserError 7858: (0-11): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
+// ParserError 7858: (0-11): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol b/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol
index e813e58ee9..897ed59647 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_fallback.sol
@@ -1,3 +1,3 @@
 fallback(){}
 // ----
-// ParserError 7858: (0-8): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
+// ParserError 7858: (0-8): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol b/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol
index d1e790d7c4..83dfee4463 100644
--- a/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol
+++ b/test/libsolidity/syntaxTests/freeFunctions/free_receive.sol
@@ -1,3 +1,3 @@
 receive() {}
 // ----
-// ParserError 7858: (0-7): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
+// ParserError 7858: (0-7): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
diff --git a/test/libsolidity/syntaxTests/unexpected.sol b/test/libsolidity/syntaxTests/unexpected.sol
index 1ffa40c21c..c6fae414c3 100644
--- a/test/libsolidity/syntaxTests/unexpected.sol
+++ b/test/libsolidity/syntaxTests/unexpected.sol
@@ -1,3 +1,3 @@
 unexpected
 // ----
-// ParserError 7858: (0-10): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function definition.
+// ParserError 7858: (0-10): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.

From f6c0edc902f2dabdf67c81435061038bfe3dce98 Mon Sep 17 00:00:00 2001
From: Nobuhiko Otoba <44864310+nobutoba@users.noreply.github.com>
Date: Mon, 25 Apr 2022 11:10:23 +0900
Subject: [PATCH 0559/1748] Add a require statement to the Ballot contract

---
 docs/examples/voting.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/examples/voting.rst b/docs/examples/voting.rst
index 0e8901c3dd..a51c01b746 100644
--- a/docs/examples/voting.rst
+++ b/docs/examples/voting.rst
@@ -109,6 +109,7 @@ of votes.
         function delegate(address to) external {
             // assigns reference
             Voter storage sender = voters[msg.sender];
+            require(sender.weight != 0, "You have no right to vote");
             require(!sender.voted, "You already voted.");
 
             require(to != msg.sender, "Self-delegation is disallowed.");

From 505fa7763ff71fb5ae1fb2c8309ae064e2eb8885 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 23 Mar 2022 14:57:07 +0100
Subject: [PATCH 0560/1748] Fix checks for "using for ... global" for
 libraries.

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/TypeChecker.cpp          | 49 ++++++++++---------
 .../using/library_on_interface.sol            | 18 +++++++
 .../using/using_global_all_the_types.sol      | 38 ++++++++++++++
 .../using/global_inside_contract.sol          |  1 -
 .../using/global_library_for_builtin.sol      |  9 ++++
 .../global_library_for_defined_elsewhere.sol  |  6 +++
 .../using/global_library_for_interface.sol    |  6 +++
 .../using/global_library_foreign.sol          |  8 +++
 .../using/global_library_with_asterisk.sol    |  5 ++
 .../using/global_with_asterisk.sol            |  5 ++
 11 files changed, 122 insertions(+), 24 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/using/library_on_interface.sol
 create mode 100644 test/libsolidity/semanticTests/using/using_global_all_the_types.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_library_for_builtin.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_library_for_defined_elsewhere.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_library_for_interface.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_library_foreign.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_with_asterisk.sol

diff --git a/Changelog.md b/Changelog.md
index 26ba5965d8..b547c2aaa1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Type Checker: Properly check restrictions of ``using ... global`` in conjunction with libraries.
 * Assembly-Json: Fix assembly json export to store jump types of operations in `jumpType` field instead of `value`.
 * TypeChecker: Convert parameters of function type to how they would be called for ``abi.encodeCall``.
 
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index d83253b29f..ed9875fce3 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3638,11 +3638,36 @@ void TypeChecker::endVisit(Literal const& _literal)
 
 void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 {
+	if (_usingFor.global())
+	{
+		if (m_currentContract || !_usingFor.typeName())
+		{
+			solAssert(m_errorReporter.hasErrors());
+			return;
+		}
+		solAssert(_usingFor.typeName()->annotation().type);
+		if (Declaration const* typeDefinition = _usingFor.typeName()->annotation().type->typeDefinition())
+		{
+			if (typeDefinition->scope() != m_currentSourceUnit)
+				m_errorReporter.typeError(
+					4117_error,
+					_usingFor.location(),
+					"Can only use \"global\" with types defined in the same source unit at file level."
+				);
+		}
+		else
+			m_errorReporter.typeError(
+				8841_error,
+				_usingFor.location(),
+				"Can only use \"global\" with user-defined types."
+			);
+	}
+
 	if (!_usingFor.usesBraces())
 	{
 		solAssert(_usingFor.functionsOrLibrary().size() == 1);
 		ContractDefinition const* library = dynamic_cast<ContractDefinition const*>(
-				_usingFor.functionsOrLibrary().front()->annotation().referencedDeclaration
+			_usingFor.functionsOrLibrary().front()->annotation().referencedDeclaration
 		);
 		solAssert(library && library->isLibrary());
 		// No type checking for libraries
@@ -3662,28 +3687,6 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 	);
 	solAssert(normalizedType);
 
-	if (_usingFor.global())
-	{
-		if (m_currentContract)
-			solAssert(m_errorReporter.hasErrors());
-		if (Declaration const* typeDefinition = _usingFor.typeName()->annotation().type->typeDefinition())
-		{
-			if (typeDefinition->scope() != m_currentSourceUnit)
-				m_errorReporter.typeError(
-					4117_error,
-					_usingFor.location(),
-					"Can only use \"global\" with types defined in the same source unit at file level."
-				);
-		}
-		else
-			m_errorReporter.typeError(
-				8841_error,
-				_usingFor.location(),
-				"Can only use \"global\" with user-defined types."
-			);
-	}
-
-
 	for (ASTPointer<IdentifierPath> const& path: _usingFor.functionsOrLibrary())
 	{
 		solAssert(path->annotation().referencedDeclaration);
diff --git a/test/libsolidity/semanticTests/using/library_on_interface.sol b/test/libsolidity/semanticTests/using/library_on_interface.sol
new file mode 100644
index 0000000000..ff716dadbb
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/library_on_interface.sol
@@ -0,0 +1,18 @@
+using L for I;
+interface I { function f() external pure returns (uint); }
+library L {
+    function execute(I i) internal pure returns (uint) {
+        return i.f();
+    }
+}
+contract C is I {
+    function x() public view returns (uint) {
+        I i = this;
+        return i.execute();
+    }
+    function f() public pure returns (uint) { return 7; }
+}
+// ====
+// compileViaYul: also
+// ----
+// x() -> 7
diff --git a/test/libsolidity/semanticTests/using/using_global_all_the_types.sol b/test/libsolidity/semanticTests/using/using_global_all_the_types.sol
new file mode 100644
index 0000000000..b4f071fa21
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/using_global_all_the_types.sol
@@ -0,0 +1,38 @@
+==== Source: A ====
+enum E {A, B}
+struct S { uint x; }
+type T is uint;
+using L for E global;
+using L for S global;
+using L for T global;
+library L {
+    function f(E e) internal pure returns (uint) {
+        return uint(e);
+    }
+    function f(S memory s) internal pure returns (uint) {
+        return s.x;
+    }
+    function f(T t) internal pure returns (uint) {
+        return T.unwrap(t);
+    }
+}
+
+==== Source: B ====
+contract C {
+    function f() public pure returns (uint a, uint b, uint c) {
+        E e = E.B;
+        a = e.f();
+        S memory s;
+        s.x = 7;
+        b = s.f();
+        T t = T.wrap(9);
+        c = t.f();
+    }
+}
+
+import {E, S, T} from "A";
+
+// ====
+// compileViaYul: also
+// ----
+// f() -> 1, 7, 9
diff --git a/test/libsolidity/syntaxTests/using/global_inside_contract.sol b/test/libsolidity/syntaxTests/using/global_inside_contract.sol
index edaeea9223..54c01f99c6 100644
--- a/test/libsolidity/syntaxTests/using/global_inside_contract.sol
+++ b/test/libsolidity/syntaxTests/using/global_inside_contract.sol
@@ -4,4 +4,3 @@ contract C {
 function f(uint) pure{}
 // ----
 // SyntaxError 3367: (17-43): "global" can only be used at file level.
-// TypeError 8841: (17-43): Can only use "global" with user-defined types.
diff --git a/test/libsolidity/syntaxTests/using/global_library_for_builtin.sol b/test/libsolidity/syntaxTests/using/global_library_for_builtin.sol
new file mode 100644
index 0000000000..7ff956941b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_library_for_builtin.sol
@@ -0,0 +1,9 @@
+using L for uint global;
+using L for uint[] global;
+using L for function() returns (uint) global;
+library L {
+}
+// ----
+// TypeError 8841: (0-24): Can only use "global" with user-defined types.
+// TypeError 8841: (25-51): Can only use "global" with user-defined types.
+// TypeError 8841: (52-97): Can only use "global" with user-defined types.
diff --git a/test/libsolidity/syntaxTests/using/global_library_for_defined_elsewhere.sol b/test/libsolidity/syntaxTests/using/global_library_for_defined_elsewhere.sol
new file mode 100644
index 0000000000..f3f65890f6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_library_for_defined_elsewhere.sol
@@ -0,0 +1,6 @@
+using L for L.S global;
+library L {
+    struct S { uint x; }
+}
+// ----
+// TypeError 4117: (0-23): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_library_for_interface.sol b/test/libsolidity/syntaxTests/using/global_library_for_interface.sol
new file mode 100644
index 0000000000..06a644634a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_library_for_interface.sol
@@ -0,0 +1,6 @@
+interface I {}
+using L for I global;
+library L {
+}
+// ----
+// TypeError 8841: (15-36): Can only use "global" with user-defined types.
diff --git a/test/libsolidity/syntaxTests/using/global_library_foreign.sol b/test/libsolidity/syntaxTests/using/global_library_foreign.sol
new file mode 100644
index 0000000000..9eacc2c4b9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_library_foreign.sol
@@ -0,0 +1,8 @@
+==== Source: A ====
+struct S { uint x; }
+==== Source: B ====
+library L {}
+using L for S global;
+import {S} from "A";
+// ----
+// TypeError 4117: (B:13-34): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol b/test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol
new file mode 100644
index 0000000000..49ac6824dc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol
@@ -0,0 +1,5 @@
+using L for * global;
+library L {}
+// ----
+// SyntaxError 8118: (0-21): The type has to be specified explicitly at file level (cannot use '*').
+// SyntaxError 2854: (0-21): Can only globally bind functions to specific types.
diff --git a/test/libsolidity/syntaxTests/using/global_with_asterisk.sol b/test/libsolidity/syntaxTests/using/global_with_asterisk.sol
new file mode 100644
index 0000000000..b5f6d88272
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_with_asterisk.sol
@@ -0,0 +1,5 @@
+using {f} for * global;
+function f(uint) pure{}
+// ----
+// SyntaxError 8118: (0-23): The type has to be specified explicitly at file level (cannot use '*').
+// SyntaxError 2854: (0-23): Can only globally bind functions to specific types.

From 4fd7de36f10eefa5f09c3ebda794da896a72bc9b Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 3 May 2022 10:43:19 +0200
Subject: [PATCH 0561/1748] update smt tests z3 4.8.16

---
 .circleci/config.yml                          | 16 ++--
 .circleci/osx_install_dependencies.sh         |  4 +-
 CMakeLists.txt                                |  2 +-
 scripts/build_emscripten.sh                   |  4 +-
 .../model_checker_invariants_all/err          |  6 +-
 .../model_checker_invariants_contract/err     |  2 +-
 .../err                                       |  6 +-
 .../model_checker_invariants_reentrancy/err   |  2 +-
 .../output.json                               |  4 +-
 .../output.json                               | 12 +--
 .../output.json                               |  4 +-
 test/libsolidity/SMTCheckerTest.cpp           | 12 ++-
 .../array_members/push_as_lhs_1d.sol          |  2 +-
 .../array_members/push_as_lhs_bytes.sol       |  2 +-
 .../blockchain_state/balance_receive_4.sol    |  3 +-
 .../branches_in_modifiers_2.sol               |  2 +-
 ...same_input_over_state_same_output_fail.sol |  4 +-
 .../external_calls/call_with_value_1.sol      |  2 +-
 .../external_calls/call_with_value_2.sol      |  2 +-
 .../external_call_from_constructor_3.sol      |  2 +-
 ...nal_hash_known_code_state_reentrancy_2.sol |  4 +-
 ...h_known_code_state_reentrancy_indirect.sol |  4 +-
 .../smtCheckerTests/functions/payable_2.sol   |  2 +-
 .../loops/while_nested_continue_fail.sol      |  4 +-
 .../operators/compound_bitwise_or_uint_2.sol  |  2 +-
 .../special/block_vars_chc_internal.sol       |  2 +-
 .../special/tx_vars_reentrancy_1.sol          |  2 +-
 .../types/array_mapping_aliasing_2.sol        |  3 +-
 .../types/array_static_mapping_aliasing_2.sol |  3 +-
 ...array_struct_array_struct_storage_safe.sol |  1 +
 .../struct_aliasing_parameter_storage_2.sol   |  2 +-
 .../struct_aliasing_parameter_storage_3.sol   |  2 +-
 .../unchecked/checked_called_by_unchecked.sol |  2 +-
 .../smtCheckerTests/userTypes/conversion.sol  | 87 -------------------
 .../userTypes/conversion_1.sol                | 35 ++++++++
 .../userTypes/conversion_2.sol                | 32 +++++++
 .../userTypes/conversion_3.sol                | 34 ++++++++
 .../userTypes/conversion_4.sol                | 23 +++++
 38 files changed, 191 insertions(+), 146 deletions(-)
 delete mode 100644 test/libsolidity/smtCheckerTests/userTypes/conversion.sol
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d420213738..2d824c2497 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,20 +9,20 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-11
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:9928dc357829e475e8729c62a1c2d495dbb41cb9fe4c4b115a5568be8e1ed69e"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-12
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:5087cc068b48787e89887804e632120b3e65bc5c25086bdf7b152be4fe5fc9ba"
   ubuntu-2004-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-11
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:72fb9574c90e8ef908dce4c9dd9788ff4de708b504d970cd9146eed8911c313e"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-12
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7f53f1bc3d89bdfb0725f604efbbec570d80ffa9b731b47a4842f4e286de0355"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-16
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:fe54d8e5409827d43edb0dc8ad0d9e4232a675050ceb271c873b73e5ee267938"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-17
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:85b298c763adf5c516238246beb283640eb555e79e7ad6a8e7a6c9ed47ef6324"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-9
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d51534dfdd05ece86f69ed7beafd68c15b88606da00a4b7fe2873ccfbd0dce24"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-10
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:bd23831e0025e35a106005b4ac06cb3618f690bfa2833a5881b573c02d35d9fc"
   evm-version:
     type: string
     default: london
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index cd0637eac9..6b328e5a18 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -61,11 +61,11 @@ then
   ./scripts/install_obsolete_jsoncpp_1_7_4.sh
 
   # z3
-  z3_version="4.8.14"
+  z3_version="4.8.16"
   z3_dir="z3-${z3_version}-x64-osx-10.16"
   z3_package="${z3_dir}.zip"
   wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
-  validate_checksum "$z3_package" 1341671670e0c4e72da80815128a68975ee90816d50ceaf6bd820f06babe2cfd
+  validate_checksum "$z3_package" 71ed7b6d10c01198187df72cccb8eb6de6d9aa2bf9557b3dd052032524b598a5
   unzip "$z3_package"
   rm "$z3_package"
   cp "${z3_dir}/bin/libz3.a" /usr/local/lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 759f69a538..a298f40444 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/licens
 
 include(EthOptions)
 configure_project(TESTS)
-set(LATEST_Z3_VERSION "4.8.14")
+set(LATEST_Z3_VERSION "4.8.16")
 set(MINIMUM_Z3_VERSION "4.8.0")
 find_package(Z3)
 if (${Z3_FOUND})
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 16e9078f32..09d421e5a0 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -34,7 +34,7 @@ else
     BUILD_DIR="$1"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-9
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-10
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:d51534dfdd05ece86f69ed7beafd68c15b88606da00a4b7fe2873ccfbd0dce24\
+    solbuildpackpusher/solidity-buildpack-deps@sha256:bd23831e0025e35a106005b4ac06cb3618f690bfa2833a5881b573c02d35d9fc\
     ./scripts/ci/build_emscripten.sh "$BUILD_DIR"
diff --git a/test/cmdlineTests/model_checker_invariants_all/err b/test/cmdlineTests/model_checker_invariants_all/err
index 2f028037bc..66a76b3c8e 100644
--- a/test/cmdlineTests/model_checker_invariants_all/err
+++ b/test/cmdlineTests/model_checker_invariants_all/err
@@ -5,10 +5,10 @@ Warning: Return value of low-level calls not used.
   | 		^^^^^^^^^^^
 
 Info: Contract invariant(s) for model_checker_invariants_all/input.sol:test:
-(x <= 0)
+((x <= 0) || true || true)
 Reentrancy property(ies) for model_checker_invariants_all/input.sol:test:
-((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
-((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+(true || true || ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0))) || true)
+(true || true || ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 <errorCode> = 3 -> Assertion failed at assert(x < 10)
diff --git a/test/cmdlineTests/model_checker_invariants_contract/err b/test/cmdlineTests/model_checker_invariants_contract/err
index a5277bebf9..e3058cca5a 100644
--- a/test/cmdlineTests/model_checker_invariants_contract/err
+++ b/test/cmdlineTests/model_checker_invariants_contract/err
@@ -1,2 +1,2 @@
 Info: Contract invariant(s) for model_checker_invariants_contract/input.sol:test:
-(x <= 0)
+((x <= 0) || true)
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
index fad76665e4..694f512cd6 100644
--- a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
+++ b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
@@ -5,10 +5,10 @@ Warning: Return value of low-level calls not used.
   | 		^^^^^^^^^^^
 
 Info: Contract invariant(s) for model_checker_invariants_contract_reentrancy/input.sol:test:
-(x <= 0)
+((x <= 0) || true || true)
 Reentrancy property(ies) for model_checker_invariants_contract_reentrancy/input.sol:test:
-((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
-((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+(true || true || ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0))) || true)
+(true || true || ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 <errorCode> = 3 -> Assertion failed at assert(x < 10)
diff --git a/test/cmdlineTests/model_checker_invariants_reentrancy/err b/test/cmdlineTests/model_checker_invariants_reentrancy/err
index a2fd6075af..dc939704b3 100644
--- a/test/cmdlineTests/model_checker_invariants_reentrancy/err
+++ b/test/cmdlineTests/model_checker_invariants_reentrancy/err
@@ -5,6 +5,6 @@ Warning: Return value of low-level calls not used.
   | 		^^^^^^^^^^^
 
 Info: Reentrancy property(ies) for model_checker_invariants_reentrancy/input.sol:test:
-((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+(((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
index 1cd236baf0..385fcb31f9 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
@@ -1,7 +1,7 @@
 {"errors":[{"component":"general","errorCode":"1180","formattedMessage":"Info: Contract invariant(s) for A:test:
-(x <= 0)
+((x <= 0) || true)
 
 
 ","message":"Contract invariant(s) for A:test:
-(x <= 0)
+((x <= 0) || true)
 ","severity":"info","type":"Info"}],"sources":{"A":{"id":0}}}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
index f5ced72531..d560ff288c 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
@@ -5,20 +5,20 @@
   | \t\t\t\t\t\t^^^^^^^^^^^
 
 ","message":"Return value of low-level calls not used.","severity":"warning","sourceLocation":{"end":143,"file":"A","start":132},"type":"Warning"},{"component":"general","errorCode":"1180","formattedMessage":"Info: Contract invariant(s) for A:test:
-(x <= 0)
+((x <= 0) || true || true)
 Reentrancy property(ies) for A:test:
-((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
-((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+(true || true || ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0))) || true)
+(true || true || ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 <errorCode> = 3 -> Assertion failed at assert(x < 10)
 
 
 ","message":"Contract invariant(s) for A:test:
-(x <= 0)
+((x <= 0) || true || true)
 Reentrancy property(ies) for A:test:
-((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0)))
-((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+(true || true || ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0))) || true)
+(true || true || ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 <errorCode> = 3 -> Assertion failed at assert(x < 10)
diff --git a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
index 4158c3ae10..d7cb43429f 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
@@ -5,13 +5,13 @@
   | \t\t\t\t\t\t^^^^^^^^^^^
 
 ","message":"Return value of low-level calls not used.","severity":"warning","sourceLocation":{"end":143,"file":"A","start":132},"type":"Warning"},{"component":"general","errorCode":"1180","formattedMessage":"Info: Reentrancy property(ies) for A:test:
-((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+(((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 
 
 ","message":"Reentrancy property(ies) for A:test:
-((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))
+(((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 ","severity":"info","type":"Info"}],"sources":{"A":{"id":0}}}
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 3b6b8e1b80..10084b0143 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -69,7 +69,17 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	else
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT counterexample choice."));
 
-	auto const& ignoreInv = m_reader.stringSetting("SMTIgnoreInv", "no");
+	static auto removeInv = [](vector<SyntaxTestError>&& errors) {
+		vector<SyntaxTestError> filtered;
+		for (auto&& e: errors)
+			if (e.errorId != 1180_error)
+				filtered.emplace_back(e);
+		return filtered;
+	};
+	if (m_modelCheckerSettings.invariants.invariants.empty())
+		m_expectations = removeInv(move(m_expectations));
+
+	auto const& ignoreInv = m_reader.stringSetting("SMTIgnoreInv", "yes");
 	if (ignoreInv == "no")
 		m_modelCheckerSettings.invariants = ModelCheckerInvariants::All();
 	else if (ignoreInv == "yes")
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
index 0d16306b72..b38963b590 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
@@ -19,4 +19,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (199-229): CHC: Assertion violation happens here.\nCounterexample:\nb = [1]\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.g()
+// Warning 6328: (199-229): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
index 7bd74f6dc0..fd0229d788 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
@@ -19,4 +19,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (265-310): CHC: Assertion violation happens here.
+// Warning 6328: (265-310): CHC: Assertion violation happens here.\nCounterexample:\nb = [0x01]\none = 0x01\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
index 4fa420ff16..d72da3efa2 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
@@ -16,8 +16,7 @@ contract C {
 // Warning 4984: (82-85): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (154-160): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (212-218): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (180-219): CHC: Assertion violation happens here.\nCounterexample:\nc = 1\n\nTransaction trace:\nC.constructor()\nState: c = 0\nC.f(){ msg.value: 11 }\nState: c = 1\nC.inv()
-// Info 1180: Contract invariant(s) for :C:\n(((11 * c) + ((- 1) * (:var 1).balances[address(this)])) <= 0)\n
+// Warning 6328: (180-219): CHC: Assertion violation happens here.
 // Warning 2661: (82-85): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (154-160): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (212-218): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
index 98b551c17e..f08a26bf70 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
@@ -45,5 +45,5 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.test()\n    C.reset_if_overflow() -- internal call
-// Warning 6328: (502-519): CHC: Assertion violation happens here.
+// Warning 6328: (502-519): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\noldx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(1)\nState: x = 1\nC.test()\n    C.reset_if_overflow() -- internal call
 // Warning 6328: (615-629): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(10)\nState: x = 10\nC.test()\n    C.reset_if_overflow() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
index fd3b55a8cc..b89867c394 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
@@ -48,12 +48,10 @@ contract C {
 // Warning 1218: (693-712): CHC: Error trying to invoke SMT solver.
 // Warning 1218: (716-735): CHC: Error trying to invoke SMT solver.
 // Warning 1218: (739-758): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (762-781): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (693-712): CHC: Assertion violation might happen here.
 // Warning 6328: (716-735): CHC: Assertion violation might happen here.
 // Warning 6328: (739-758): CHC: Assertion violation might happen here.
-// Warning 6328: (762-781): CHC: Assertion violation might happen here.
+// Warning 6328: (762-781): CHC: Assertion violation happens here.
 // Warning 4661: (693-712): BMC: Assertion violation happens here.
 // Warning 4661: (716-735): BMC: Assertion violation happens here.
 // Warning 4661: (739-758): BMC: Assertion violation happens here.
-// Warning 4661: (762-781): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
index 813185adf4..f9293f6930 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
@@ -12,5 +12,5 @@ contract C {
 // ----
 // Warning 9302: (96-117): Return value of low-level calls not used.
 // Warning 6328: (121-156): CHC: Assertion violation might happen here.
-// Warning 6328: (175-211): CHC: Assertion violation happens here.
+// Warning 6328: (175-211): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0x0\n\nTransaction trace:\nC.constructor()\nC.g(0x0)\n    i.call{value: 10}("") -- untrusted external call
 // Warning 4661: (121-156): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
index c386580800..968095bb2b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
@@ -11,5 +11,5 @@ contract C {
 // ----
 // Warning 9302: (96-116): Return value of low-level calls not used.
 // Warning 6328: (120-156): CHC: Assertion violation might happen here.
-// Warning 6328: (175-210): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0x0\n\nTransaction trace:\nC.constructor()\nC.g(0x0)\n    i.call{value: 0}("") -- untrusted external call
+// Warning 6328: (175-210): CHC: Assertion violation happens here.
 // Warning 4661: (120-156): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
index eb5cd97ddd..9d27d6d3b4 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
@@ -20,4 +20,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (69-85): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
-// Warning 6328: (203-217): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 3\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 3\nC.f()
+// Warning 6328: (203-217): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 0\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
index be9f698e15..37509269b6 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
@@ -42,4 +42,6 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 2018: (33-88): Function state mutability can be restricted to view
-// Warning 6328: (367-381): CHC: Assertion violation happens here.
+// Warning 1218: (367-381): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (367-381): CHC: Assertion violation might happen here.
+// Warning 4661: (367-381): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
index ea9764e17b..bd779b56a5 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
@@ -44,7 +44,5 @@ contract C {
 // SMTIgnoreCex: yes
 // SMTIgnoreOS: macos
 // ----
-// Warning 1218: (437-463): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (419-433): CHC: Assertion violation happens here.
-// Warning 6328: (437-463): CHC: Assertion violation might happen here.
-// Warning 4661: (437-463): BMC: Assertion violation happens here.
+// Warning 6328: (437-463): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/payable_2.sol b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
index 98717b1331..04833ae027 100644
--- a/test/libsolidity/smtCheckerTests/functions/payable_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
@@ -24,4 +24,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (261-283): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g2(){ msg.value: 35 }\n    C.i() -- internal call
+// Warning 6328: (261-283): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g2(){ msg.value: 1 }\n    C.i() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol
index fe43db0dee..180d85adca 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_nested_continue_fail.sol
@@ -27,7 +27,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (290-305): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (290-305): CHC: Assertion violation might happen here.
+// Warning 6328: (290-305): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 15\nb = false\nc = false\n\nTransaction trace:\nC.constructor()\nC.f(0, 0, false, false)
 // Warning 6328: (329-344): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 15\ny = 0\nb = true\nc = false\n\nTransaction trace:\nC.constructor()\nC.f(0, 0, true, false)
-// Warning 4661: (290-305): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol
index 9b27a277b9..edd36047cf 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_2.sol
@@ -19,4 +19,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(s.x.length <= 2)\n
+// Warning 6368: (196-202): CHC: Out of bounds access might happen here.
diff --git a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
index 2ebf4d326b..6e4f5a6209 100644
--- a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
@@ -32,4 +32,4 @@ contract C {
 // ====
 // SMTEngine: chc
 // ----
-// Warning 6328: (770-799): CHC: Assertion violation happens here.\nCounterexample:\ncoin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\n\nTransaction trace:\nC.constructor()\nState: coin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\nC.f(){ block.coinbase: 0x0, block.difficulty: 0, block.gaslimit: 0, block.number: 0, block.timestamp: 0 }\n    C.g() -- internal call
+// Warning 6328: (770-799): CHC: Assertion violation happens here.\nCounterexample:\ncoin = 0x1e28, dif = 0, gas = 0, number = 0, timestamp = 0\n\nTransaction trace:\nC.constructor()\nState: coin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\nC.f(){ block.coinbase: 0x1e28, block.difficulty: 0, block.gaslimit: 0, block.number: 0, block.timestamp: 0 }\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
index 7729cebb9a..f1fed73c02 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
@@ -13,4 +13,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 2997\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 2803 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 2446 } -- reentrant call\n            _i.f() -- untrusted external call
+// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 9726\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 2070 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 0 } -- reentrant call\n            _i.f() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
index dd0d8e004e..cd1d77d8df 100644
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
@@ -36,11 +36,12 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6368: (439-453): CHC: Out of bounds access happens here.
+// Warning 6368: (465-480): CHC: Out of bounds access might happen here.
 // Warning 6368: (492-508): CHC: Out of bounds access happens here.
 // Warning 6368: (492-511): CHC: Out of bounds access happens here.
 // Warning 6368: (622-636): CHC: Out of bounds access happens here.
+// Warning 6368: (737-752): CHC: Out of bounds access might happen here.
 // Warning 6368: (850-866): CHC: Out of bounds access happens here.
 // Warning 6368: (850-869): CHC: Out of bounds access happens here.
 // Warning 6328: (936-956): CHC: Assertion violation happens here.
 // Warning 6368: (1029-1043): CHC: Out of bounds access might happen here.
-// Info 1180: Contract invariant(s) for :C:\n!(severalMaps8.length <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
index f9aa3a650d..ca1a580182 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
@@ -30,7 +30,8 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
+// Warning 6368: (340-355): CHC: Out of bounds access might happen here.
+// Warning 6368: (612-627): CHC: Out of bounds access might happen here.
 // Warning 6328: (860-880): CHC: Assertion violation happens here.
 // Warning 6368: (936-952): CHC: Out of bounds access might happen here.
 // Warning 6368: (936-955): CHC: Out of bounds access might happen here.
-// Info 1180: Contract invariant(s) for :C:\n!(severalMaps8.length <= 1)\n
diff --git a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
index 109fee7dc6..67f56d8c61 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
@@ -53,3 +53,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Warning 6368: (212-217): CHC: Out of bounds access might happen here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
index 6982623821..9d4623ae09 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (289-322): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 11}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 11}\nC.g(){ msg.sender: 0x0985 }
+// Warning 6328: (289-322): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 10}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 10}\nC.g(){ msg.sender: 0x0985 }
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
index fcf30555e9..8779cd0959 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
@@ -26,4 +26,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (307-327): CHC: Assertion violation happens here.\nCounterexample:\nt = {x: 11, s: {innerM, sum: 21239}}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: t = {x: 11, s: {innerM, sum: 21239}}\nC.g()
+// Warning 6328: (307-327): CHC: Assertion violation happens here.\nCounterexample:\nt = {x: 10, s: {innerM, sum: 21239}}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: t = {x: 10, s: {innerM, sum: 21239}}\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol b/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
index cb795f9c04..d3589fed59 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 1\nb = 65535\n = 0\n\nTransaction trace:\nC.constructor()\nC.add(1, 65535)
+// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 65535\nb = 1\n = 0\n\nTransaction trace:\nC.constructor()\nC.add(65535, 1)
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion.sol
deleted file mode 100644
index cad0233a71..0000000000
--- a/test/libsolidity/smtCheckerTests/userTypes/conversion.sol
+++ /dev/null
@@ -1,87 +0,0 @@
-pragma abicoder v2;
-
-type MyUInt8 is uint8;
-type MyInt8 is int8;
-type MyUInt16 is uint16;
-
-contract C {
-	function f(uint a) internal pure returns(MyUInt8) {
-		return MyUInt8.wrap(uint8(a));
-	}
-	function g(uint a) internal pure returns(MyInt8) {
-		return MyInt8.wrap(int8(int(a)));
-	}
-	function h(MyUInt8 a) internal pure returns (MyInt8) {
-		return MyInt8.wrap(int8(MyUInt8.unwrap(a)));
-	}
-	function i(MyUInt8 a) internal pure returns(MyUInt16) {
-		return MyUInt16.wrap(MyUInt8.unwrap(a));
-	}
-	function j(MyUInt8 a) internal pure returns (uint) {
-		return MyUInt8.unwrap(a);
-	}
-	function k(MyUInt8 a) internal pure returns (MyUInt16) {
-		return MyUInt16.wrap(MyUInt8.unwrap(a));
-	}
-	function m(MyUInt16 a) internal pure returns (MyUInt8) {
-		return MyUInt8.wrap(uint8(MyUInt16.unwrap(a)));
-	}
-
-	function p() public pure {
-		assert(MyUInt8.unwrap(f(1)) == 1);
-		assert(MyUInt8.unwrap(f(2)) == 2);
-		assert(MyUInt8.unwrap(f(257)) == 1);
-		assert(MyUInt8.unwrap(f(257)) == 257); // should fail
-	}
-
-	function q() public pure {
-		assert(MyInt8.unwrap(g(1)) == 1);
-		assert(MyInt8.unwrap(g(2)) == 2);
-		assert(MyInt8.unwrap(g(255)) == -1);
-		assert(MyInt8.unwrap(g(257)) == 1);
-		assert(MyInt8.unwrap(g(257)) == -1); // should fail
-	}
-
-	function r() public pure {
-		assert(MyInt8.unwrap(h(MyUInt8.wrap(1))) == 1);
-		assert(MyInt8.unwrap(h(MyUInt8.wrap(2))) == 2);
-		assert(MyInt8.unwrap(h(MyUInt8.wrap(255))) == -1);
-		assert(MyInt8.unwrap(h(MyUInt8.wrap(255))) == 1); // should fail
-	}
-
-	function s() public pure {
-		assert(MyUInt16.unwrap(i(MyUInt8.wrap(250))) == 250);
-		assert(MyUInt16.unwrap(i(MyUInt8.wrap(250))) == 0); // should fail
-	}
-
-	function t() public pure {
-		assert(j(MyUInt8.wrap(1)) == 1);
-		assert(j(MyUInt8.wrap(2)) == 2);
-		assert(j(MyUInt8.wrap(255)) == 0xff);
-		assert(j(MyUInt8.wrap(255)) == 1); // should fail
-	}
-
-	function v() public pure {
-		assert(MyUInt16.unwrap(k(MyUInt8.wrap(1))) == 1);
-		assert(MyUInt16.unwrap(k(MyUInt8.wrap(2))) == 2);
-		assert(MyUInt16.unwrap(k(MyUInt8.wrap(255))) == 0xff);
-		assert(MyUInt16.unwrap(k(MyUInt8.wrap(255))) == 1); // should fail
-	}
-
-	function w() public pure {
-		assert(MyUInt8.unwrap(m(MyUInt16.wrap(1))) == 1);
-		assert(MyUInt8.unwrap(m(MyUInt16.wrap(2))) == 2);
-		assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 0xff);
-		assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 1); // should fail
-	}
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6328: (937-974): CHC: Assertion violation happens here.
-// Warning 6328: (1174-1209): CHC: Assertion violation happens here.
-// Warning 6328: (1413-1461): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.r()\n    C.h(1) -- internal call\n    C.h(2) -- internal call\n    C.h(255) -- internal call\n    C.h(255) -- internal call
-// Warning 6328: (1568-1618): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.s()\n    C.i(250) -- internal call\n    C.i(250) -- internal call
-// Warning 6328: (1779-1812): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.t()\n    C.j(1) -- internal call\n    C.j(2) -- internal call\n    C.j(255) -- internal call\n    C.j(255) -- internal call
-// Warning 6328: (2024-2074): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.v()\n    C.k(1) -- internal call\n    C.k(2) -- internal call\n    C.k(255) -- internal call\n    C.k(255) -- internal call
-// Warning 6328: (2286-2336): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol
new file mode 100644
index 0000000000..fa56e11aba
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol
@@ -0,0 +1,35 @@
+pragma abicoder v2;
+
+type MyUInt8 is uint8;
+type MyInt8 is int8;
+type MyUInt16 is uint16;
+
+contract C {
+	function f(uint a) internal pure returns(MyUInt8) {
+		return MyUInt8.wrap(uint8(a));
+	}
+	function g(uint a) internal pure returns(MyInt8) {
+		return MyInt8.wrap(int8(int(a)));
+	}
+
+	function p() public pure {
+		assert(MyUInt8.unwrap(f(1)) == 1);
+		assert(MyUInt8.unwrap(f(2)) == 2);
+		assert(MyUInt8.unwrap(f(257)) == 1);
+		assert(MyUInt8.unwrap(f(257)) == 257); // should fail
+	}
+
+	function q() public pure {
+		assert(MyInt8.unwrap(g(1)) == 1);
+		assert(MyInt8.unwrap(g(2)) == 2);
+		assert(MyInt8.unwrap(g(255)) == -1);
+		assert(MyInt8.unwrap(g(257)) == 1);
+		assert(MyInt8.unwrap(g(257)) == -1); // should fail
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (428-465): CHC: Assertion violation happens here.
+// Warning 6328: (665-700): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n(true || true || true || true || true)\nReentrancy property(ies) for :C:\n(true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true || true || true)\n(true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true || true)\n(true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true)\n(true || true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true)\n(true || true || true || true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(MyUInt8.unwrap(f(1)) == 1)\n<errorCode> = 2 -> Assertion failed at assert(MyUInt8.unwrap(f(2)) == 2)\n<errorCode> = 3 -> Assertion failed at assert(MyUInt8.unwrap(f(257)) == 1)\n<errorCode> = 4 -> Assertion failed at assert(MyUInt8.unwrap(f(257)) == 257)\n<errorCode> = 6 -> Assertion failed at assert(MyInt8.unwrap(g(1)) == 1)\n<errorCode> = 7 -> Assertion failed at assert(MyInt8.unwrap(g(2)) == 2)\n<errorCode> = 8 -> Assertion failed at assert(MyInt8.unwrap(g(255)) == -1)\n<errorCode> = 9 -> Assertion failed at assert(MyInt8.unwrap(g(257)) == 1)\n<errorCode> = 10 -> Assertion failed at assert(MyInt8.unwrap(g(257)) == -1)\n
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol
new file mode 100644
index 0000000000..9b4f72d336
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol
@@ -0,0 +1,32 @@
+pragma abicoder v2;
+
+type MyUInt8 is uint8;
+type MyInt8 is int8;
+type MyUInt16 is uint16;
+
+contract C {
+	function h(MyUInt8 a) internal pure returns (MyInt8) {
+		return MyInt8.wrap(int8(MyUInt8.unwrap(a)));
+	}
+	function i(MyUInt8 a) internal pure returns(MyUInt16) {
+		return MyUInt16.wrap(MyUInt8.unwrap(a));
+	}
+
+	function r() public pure {
+		assert(MyInt8.unwrap(h(MyUInt8.wrap(1))) == 1);
+		assert(MyInt8.unwrap(h(MyUInt8.wrap(2))) == 2);
+		assert(MyInt8.unwrap(h(MyUInt8.wrap(255))) == -1);
+		assert(MyInt8.unwrap(h(MyUInt8.wrap(255))) == 1); // should fail
+	}
+
+	function s() public pure {
+		assert(MyUInt16.unwrap(i(MyUInt8.wrap(250))) == 250);
+		assert(MyUInt16.unwrap(i(MyUInt8.wrap(250))) == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (497-545): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.r()\n    C.h(1) -- internal call\n    C.h(2) -- internal call\n    C.h(255) -- internal call\n    C.h(255) -- internal call
+// Warning 6328: (652-702): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.s()\n    C.i(250) -- internal call\n    C.i(250) -- internal call
+// Info 1180: Contract invariant(s) for :C:\n(true || true || true || true || true)\nReentrancy property(ies) for :C:\n(((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true || true || true || true)\n(true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true || true || true)\n(true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true)\n(true || true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(MyInt8.unwrap(h(MyUInt8.wrap(1))) == 1)\n<errorCode> = 2 -> Assertion failed at assert(MyInt8.unwrap(h(MyUInt8.wrap(2))) == 2)\n<errorCode> = 3 -> Assertion failed at assert(MyInt8.unwrap(h(MyUInt8.wrap(255))) == -1)\n<errorCode> = 4 -> Assertion failed at assert(MyInt8.unwrap(h(MyUInt8.wrap(255))) == 1)\n<errorCode> = 6 -> Assertion failed at assert(MyUInt16.unwrap(i(MyUInt8.wrap(250))) == 250)\n<errorCode> = 7 -> Assertion failed at assert(MyUInt16.unwrap(i(MyUInt8.wrap(250))) == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol
new file mode 100644
index 0000000000..ea8e9804bc
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol
@@ -0,0 +1,34 @@
+pragma abicoder v2;
+
+type MyUInt8 is uint8;
+type MyInt8 is int8;
+type MyUInt16 is uint16;
+
+contract C {
+	function j(MyUInt8 a) internal pure returns (uint) {
+		return MyUInt8.unwrap(a);
+	}
+	function k(MyUInt8 a) internal pure returns (MyUInt16) {
+		return MyUInt16.wrap(MyUInt8.unwrap(a));
+	}
+
+	function t() public pure {
+		assert(j(MyUInt8.wrap(1)) == 1);
+		assert(j(MyUInt8.wrap(2)) == 2);
+		assert(j(MyUInt8.wrap(255)) == 0xff);
+		assert(j(MyUInt8.wrap(255)) == 1); // should fail
+	}
+
+	function v() public pure {
+		assert(MyUInt16.unwrap(k(MyUInt8.wrap(1))) == 1);
+		assert(MyUInt16.unwrap(k(MyUInt8.wrap(2))) == 2);
+		assert(MyUInt16.unwrap(k(MyUInt8.wrap(255))) == 0xff);
+		assert(MyUInt16.unwrap(k(MyUInt8.wrap(255))) == 1); // should fail
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (434-467): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.t()\n    C.j(1) -- internal call\n    C.j(2) -- internal call\n    C.j(255) -- internal call\n    C.j(255) -- internal call
+// Warning 6328: (679-729): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.v()\n    C.k(1) -- internal call\n    C.k(2) -- internal call\n    C.k(255) -- internal call\n    C.k(255) -- internal call
+// Info 1180: Contract invariant(s) for :C:\n(true || true || true || true || true)\nReentrancy property(ies) for :C:\n(((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true || true || true || true)\n(true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true)\n(true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true)\n(true || true || true || true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true)\n(true || true || true || true || true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(j(MyUInt8.wrap(1)) == 1)\n<errorCode> = 2 -> Assertion failed at assert(j(MyUInt8.wrap(2)) == 2)\n<errorCode> = 3 -> Assertion failed at assert(j(MyUInt8.wrap(255)) == 0xff)\n<errorCode> = 4 -> Assertion failed at assert(j(MyUInt8.wrap(255)) == 1)\n<errorCode> = 6 -> Assertion failed at assert(MyUInt16.unwrap(k(MyUInt8.wrap(1))) == 1)\n<errorCode> = 7 -> Assertion failed at assert(MyUInt16.unwrap(k(MyUInt8.wrap(2))) == 2)\n<errorCode> = 8 -> Assertion failed at assert(MyUInt16.unwrap(k(MyUInt8.wrap(255))) == 0xff)\n<errorCode> = 9 -> Assertion failed at assert(MyUInt16.unwrap(k(MyUInt8.wrap(255))) == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol
new file mode 100644
index 0000000000..ced7e37c47
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol
@@ -0,0 +1,23 @@
+pragma abicoder v2;
+
+type MyUInt8 is uint8;
+type MyInt8 is int8;
+type MyUInt16 is uint16;
+
+contract C {
+	function m(MyUInt16 a) internal pure returns (MyUInt8) {
+		return MyUInt8.wrap(uint8(MyUInt16.unwrap(a)));
+	}
+
+	function w() public pure {
+		assert(MyUInt8.unwrap(m(MyUInt16.wrap(1))) == 1);
+		assert(MyUInt8.unwrap(m(MyUInt16.wrap(2))) == 2);
+		assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 0xff);
+		assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 1); // should fail
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (407-457): CHC: Assertion violation happens here.
+// Info 1180: Contract invariant(s) for :C:\n(true || true || true)\nReentrancy property(ies) for :C:\n(((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true)\n(true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(1))) == 1)\n<errorCode> = 2 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(2))) == 2)\n<errorCode> = 3 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 0xff)\n<errorCode> = 4 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 1)\n

From cba3d18f6607bf1dac45fe2eb9fa1feb4871e604 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 4 May 2022 16:29:50 +0200
Subject: [PATCH 0562/1748] adjust for osx nondeterminism

---
 .../model_checker_invariants_all/err          |  8 ++--
 .../model_checker_invariants_all/input.sol    |  5 +--
 .../err                                       |  8 ++--
 .../input.sol                                 |  5 +--
 .../input.json                                |  5 +--
 .../output.json                               | 40 +++++++++++--------
 .../abi/abi_encode_with_selector_hash.sol     | 16 ++++----
 .../array_members/push_as_lhs_bytes.sol       |  3 +-
 .../array_members/push_as_lhs_bytes_2d.sol    |  1 +
 .../functions/getters/array_1.sol             |  3 +-
 .../overflow/unsigned_mul_overflow.sol        |  3 +-
 .../try_catch/try_nested_2.sol                |  3 +-
 .../struct_aliasing_parameter_storage_3.sol   |  3 +-
 .../unchecked/checked_called_by_unchecked.sol |  3 +-
 14 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/test/cmdlineTests/model_checker_invariants_all/err b/test/cmdlineTests/model_checker_invariants_all/err
index 66a76b3c8e..65228e880c 100644
--- a/test/cmdlineTests/model_checker_invariants_all/err
+++ b/test/cmdlineTests/model_checker_invariants_all/err
@@ -5,10 +5,8 @@ Warning: Return value of low-level calls not used.
   | 		^^^^^^^^^^^
 
 Info: Contract invariant(s) for model_checker_invariants_all/input.sol:test:
-((x <= 0) || true || true)
+((x <= 0) || true)
 Reentrancy property(ies) for model_checker_invariants_all/input.sol:test:
-(true || true || ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0))) || true)
-(true || true || ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
+(((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
-<errorCode> = 1 -> Assertion failed at assert(x < 10)
-<errorCode> = 3 -> Assertion failed at assert(x < 10)
+<errorCode> = 1 -> Assertion failed at assert(x == 0)
diff --git a/test/cmdlineTests/model_checker_invariants_all/input.sol b/test/cmdlineTests/model_checker_invariants_all/input.sol
index f8601cf4f4..8b90cb3c13 100644
--- a/test/cmdlineTests/model_checker_invariants_all/input.sol
+++ b/test/cmdlineTests/model_checker_invariants_all/input.sol
@@ -4,9 +4,6 @@ contract test {
 	uint x;
     function f(address _a) public {
 		_a.call("");
-		assert(x < 10);
+		assert(x == 0);
     }
-	function g() public view {
-		assert(x < 10);
-	}
 }
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
index 694f512cd6..8555218361 100644
--- a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
+++ b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
@@ -5,10 +5,8 @@ Warning: Return value of low-level calls not used.
   | 		^^^^^^^^^^^
 
 Info: Contract invariant(s) for model_checker_invariants_contract_reentrancy/input.sol:test:
-((x <= 0) || true || true)
+((x <= 0) || true)
 Reentrancy property(ies) for model_checker_invariants_contract_reentrancy/input.sol:test:
-(true || true || ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0))) || true)
-(true || true || ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
+(((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
-<errorCode> = 1 -> Assertion failed at assert(x < 10)
-<errorCode> = 3 -> Assertion failed at assert(x < 10)
+<errorCode> = 1 -> Assertion failed at assert(x == 0)
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol
index f8601cf4f4..8b90cb3c13 100644
--- a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol
+++ b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/input.sol
@@ -4,9 +4,6 @@ contract test {
 	uint x;
     function f(address _a) public {
 		_a.call("");
-		assert(x < 10);
+		assert(x == 0);
     }
-	function g() public view {
-		assert(x < 10);
-	}
 }
\ No newline at end of file
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json
index 56139e6a5a..38f6586536 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/input.json
@@ -8,10 +8,7 @@
 					uint x;
 					function f(address _a) public {
 						_a.call(\"\");
-						assert(x < 10);
-					}
-					function g() public view {
-						assert(x < 10);
+						assert(x == 10);
 					}
 				}"
 		}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
index d560ff288c..64d63c46c0 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
@@ -4,22 +4,28 @@
 7 | \t\t\t\t\t\t_a.call(\"\");
   | \t\t\t\t\t\t^^^^^^^^^^^
 
-","message":"Return value of low-level calls not used.","severity":"warning","sourceLocation":{"end":143,"file":"A","start":132},"type":"Warning"},{"component":"general","errorCode":"1180","formattedMessage":"Info: Contract invariant(s) for A:test:
-((x <= 0) || true || true)
-Reentrancy property(ies) for A:test:
-(true || true || ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0))) || true)
-(true || true || ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
-<errorCode> = 0 -> no errors
-<errorCode> = 1 -> Assertion failed at assert(x < 10)
-<errorCode> = 3 -> Assertion failed at assert(x < 10)
+","message":"Return value of low-level calls not used.","severity":"warning","sourceLocation":{"end":143,"file":"A","start":132},"type":"Warning"},{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+Counterexample:
+x = 0
+_a = 0x0
 
+Transaction trace:
+test.constructor()
+State: x = 0
+test.f(0x0)
+    _a.call(\"\") -- untrusted external call
+ --> A:8:7:
+  |
+8 | \t\t\t\t\t\tassert(x == 10);
+  | \t\t\t\t\t\t^^^^^^^^^^^^^^^
+
+","message":"CHC: Assertion violation happens here.
+Counterexample:
+x = 0
+_a = 0x0
 
-","message":"Contract invariant(s) for A:test:
-((x <= 0) || true || true)
-Reentrancy property(ies) for A:test:
-(true || true || ((!(x <= 0) || !(<errorCode> >= 3)) && (!(x <= 0) || (x' <= 0))) || true)
-(true || true || ((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
-<errorCode> = 0 -> no errors
-<errorCode> = 1 -> Assertion failed at assert(x < 10)
-<errorCode> = 3 -> Assertion failed at assert(x < 10)
-","severity":"info","type":"Info"}],"sources":{"A":{"id":0}}}
+Transaction trace:
+test.constructor()
+State: x = 0
+test.f(0x0)
+    _a.call(\"\") -- untrusted external call","severity":"warning","sourceLocation":{"end":166,"file":"A","start":151},"type":"Warning"}],"sources":{"A":{"id":0}}}
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol
index ca1b6b40ab..f60d5f52bc 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol
@@ -3,7 +3,8 @@ contract C {
 		require(a == b);
 		bytes memory b1 = abi.encodeWithSelector(sel, a, a, a, a);
 		bytes memory b2 = abi.encodeWithSelector(sel, b, a, b, a);
-		assert(keccak256(b1) == keccak256(b2));
+		// Disabled because of OSX nondeterminism
+		//assert(keccak256(b1) == keccak256(b2));
 
 		bytes memory b3 = abi.encodeWithSelector(0xcafecafe, a, a, a, a);
 		assert(keccak256(b1) == keccak256(b3)); // should fail
@@ -13,9 +14,10 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (333-371): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (390-428): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (333-371): CHC: Assertion violation might happen here.
-// Warning 6328: (390-428): CHC: Assertion violation might happen here.
-// Warning 4661: (333-371): BMC: Assertion violation happens here.
-// Warning 4661: (390-428): BMC: Assertion violation happens here.
+// Warning 2072: (161-176): Unused local variable.
+// Warning 1218: (379-417): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (436-474): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (379-417): CHC: Assertion violation might happen here.
+// Warning 6328: (436-474): CHC: Assertion violation might happen here.
+// Warning 4661: (379-417): BMC: Assertion violation happens here.
+// Warning 4661: (436-474): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
index fd0229d788..31eca9e925 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
@@ -18,5 +18,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (265-310): CHC: Assertion violation happens here.\nCounterexample:\nb = [0x01]\none = 0x01\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.g()
+// Warning 6328: (265-310): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol
index 7151d9304c..fcceeebfd5 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol
@@ -22,5 +22,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
 // Warning 6328: (435-508): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
index 421c4fd4f0..d44d15f284 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
@@ -14,6 +14,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (187-201): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0, 0, 0]\ny = 0\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0, 0, 0]\nC.f()
+// Warning 6328: (187-201): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
index 0a6d85a7ea..e809e041cc 100644
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/unsigned_mul_overflow.sol
@@ -5,5 +5,6 @@ contract C  {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 57896044618658097711785492504343953926634992332820282019728792003956564819968\ny = 2\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(57896044618658097711785492504343953926634992332820282019728792003956564819968, 2)
+// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
index 98a19731be..5c15fb54fa 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
@@ -19,5 +19,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (342-362): CHC: Assertion violation happens here.\nCounterexample:\n\nchoice = 3\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (342-362): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
index 8779cd0959..f9ae95e7c9 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
@@ -25,5 +25,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (307-327): CHC: Assertion violation happens here.\nCounterexample:\nt = {x: 10, s: {innerM, sum: 21239}}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: t = {x: 10, s: {innerM, sum: 21239}}\nC.g()
+// Warning 6328: (307-327): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol b/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
index d3589fed59..9d8df15eb0 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/checked_called_by_unchecked.sol
@@ -9,5 +9,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 65535) happens here.\nCounterexample:\n\na = 65535\nb = 1\n = 0\n\nTransaction trace:\nC.constructor()\nC.add(65535, 1)
+// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 65535) happens here.

From 201c6c68195b9dd72fa08c6f055aa7ff67fbabfe Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Thu, 5 May 2022 11:38:16 +0200
Subject: [PATCH 0563/1748] fix smt flaky test

---
 .../smtCheckerTests/operators/slice_default_end.sol        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol b/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
index 9c0db90076..c6f421a0cb 100644
--- a/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
+++ b/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
@@ -3,8 +3,9 @@ contract C {
 		require(b.length == 30);
 		require(b[10] == 0xff);
 		require(b[b.length - 1] == 0xaa);
-		assert(bytes(b[10:]).length == 20);
-		assert(bytes(b[10:])[0] == 0xff);
+		assert(bytes(b[10:]).length == 20); // should hold
+		// Disabled because of Spacer's nondeterminism.
+		//assert(bytes(b[10:])[0] == 0xff); // should hold
 		//assert(bytes(b[10:])[5] == 0xff); // Removed because of Spacer's nondeterminism
 		//assert(bytes(b[10:])[19] == 0xaa); // Removed because of Spacer nondeterminism
 	}
@@ -12,5 +13,3 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (188-220): CHC: Assertion violation might happen here.
-// Warning 4661: (188-220): BMC: Assertion violation happens here.

From 1ccdb92cdb45ae4324df352be3dc3b536851747e Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Mon, 2 May 2022 14:23:52 +0200
Subject: [PATCH 0564/1748] Update version & distributions for static z3 script

---
 scripts/deps-ppa/static_z3.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index 353a8a8d98..79393221c6 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -25,9 +25,9 @@ set -ev
 keyid=70D110489D66E2F6
 email=builds@ethereum.org
 packagename=z3-static
-version=4.8.14
+version=4.8.16
 
-DISTRIBUTIONS="focal hirsute impish jammy"
+DISTRIBUTIONS="focal impish jammy"
 
 for distribution in $DISTRIBUTIONS
 do

From 5ae17c8e652d2473e09e6367b6b586c3bdb954b2 Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Wed, 4 May 2022 23:55:40 +0200
Subject: [PATCH 0565/1748] Recommend `via-ir` whenever a stack too deep error
 is encountered.

---
 libevmasm/CommonSubexpressionEliminator.cpp |  7 +++---
 libsolidity/codegen/ArrayUtils.cpp          |  3 ++-
 libsolidity/codegen/CompilerContext.cpp     |  3 ++-
 libsolidity/codegen/CompilerUtils.cpp       | 13 +++++-----
 libsolidity/codegen/ContractCompiler.cpp    |  7 +++---
 libsolidity/codegen/ExpressionCompiler.cpp  |  5 ++--
 libsolidity/codegen/LValue.cpp              |  6 +++--
 libsolutil/CMakeLists.txt                   |  1 +
 libsolutil/StackTooDeepString.h             | 28 +++++++++++++++++++++
 libyul/backends/evm/AsmCodeGen.cpp          |  4 ++-
 test/libsolidity/StandardCompiler.cpp       |  2 +-
 11 files changed, 59 insertions(+), 20 deletions(-)
 create mode 100644 libsolutil/StackTooDeepString.h

diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
index 397d20f169..abae23a830 100644
--- a/libevmasm/CommonSubexpressionEliminator.cpp
+++ b/libevmasm/CommonSubexpressionEliminator.cpp
@@ -26,6 +26,7 @@
 #include <libsolutil/Keccak256.h>
 #include <libevmasm/CommonSubexpressionEliminator.h>
 #include <libevmasm/AssemblyItem.h>
+#include <libsolutil/StackTooDeepString.h>
 
 #include <range/v3/view/reverse.hpp>
 
@@ -163,7 +164,7 @@ AssemblyItems CSECodeGenerator::generateCode(
 				// Invalid sequenced operation.
 				// @todo quick fix for now. Proper fix needs to choose representative with higher
 				// sequence number during dependency analysis.
-				assertThrow(seqNr >= _initialSequenceNumber, StackTooDeepException, "");
+				assertThrow(seqNr >= _initialSequenceNumber, StackTooDeepException, util::stackTooDeepString);
 				sequencedExpressions.insert(make_pair(seqNr, id));
 			}
 
@@ -471,7 +472,7 @@ void CSECodeGenerator::appendDup(int _fromPosition, SourceLocation const& _locat
 {
 	assertThrow(_fromPosition != c_invalidPosition, OptimizerException, "");
 	int instructionNum = 1 + m_stackHeight - _fromPosition;
-	assertThrow(instructionNum <= 16, StackTooDeepException, "Stack too deep, try removing local variables.");
+	assertThrow(instructionNum <= 16, StackTooDeepException, util::stackTooDeepString);
 	assertThrow(1 <= instructionNum, OptimizerException, "Invalid stack access.");
 	appendItem(AssemblyItem(dupInstruction(static_cast<unsigned>(instructionNum)), _location));
 	m_stack[m_stackHeight] = m_stack[_fromPosition];
@@ -484,7 +485,7 @@ void CSECodeGenerator::appendOrRemoveSwap(int _fromPosition, SourceLocation cons
 	if (_fromPosition == m_stackHeight)
 		return;
 	int instructionNum = m_stackHeight - _fromPosition;
-	assertThrow(instructionNum <= 16, StackTooDeepException, "Stack too deep, try removing local variables.");
+	assertThrow(instructionNum <= 16, StackTooDeepException, util::stackTooDeepString);
 	assertThrow(1 <= instructionNum, OptimizerException, "Invalid stack access.");
 	appendItem(AssemblyItem(swapInstruction(static_cast<unsigned>(instructionNum)), _location));
 
diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
index d2691c8779..7257278693 100644
--- a/libsolidity/codegen/ArrayUtils.cpp
+++ b/libsolidity/codegen/ArrayUtils.cpp
@@ -31,6 +31,7 @@
 
 #include <libsolutil/FunctionSelector.h>
 #include <libsolutil/Whiskers.h>
+#include <libsolutil/StackTooDeepString.h>
 
 #include <libevmasm/Instruction.h>
 #include <liblangutil/Exceptions.h>
@@ -242,7 +243,7 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 				assertThrow(
 					2 + byteOffsetSize + sourceBaseType->sizeOnStack() <= 16,
 					StackTooDeepError,
-					"Stack too deep, try removing local variables."
+					util::stackTooDeepString
 				);
 				// fetch target storage reference
 				_context << dupInstruction(2 + byteOffsetSize + sourceBaseType->sizeOnStack());
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 99b87e5a70..55089dde1c 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -43,6 +43,7 @@
 
 #include <libsolutil/Whiskers.h>
 #include <libsolutil/FunctionSelector.h>
+#include <libsolutil/StackTooDeepString.h>
 
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Scanner.h>
@@ -422,7 +423,7 @@ void CompilerContext::appendInlineAssembly(
 			BOOST_THROW_EXCEPTION(
 				StackTooDeepError() <<
 				errinfo_sourceLocation(nativeLocationOf(_identifier)) <<
-				util::errinfo_comment("Stack too deep (" + to_string(stackDiff) + "), try removing local variables.")
+				util::errinfo_comment(util::stackTooDeepString)
 			);
 		if (_context == yul::IdentifierContext::RValue)
 			_assembly.appendInstruction(dupInstruction(static_cast<unsigned>(stackDiff)));
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index 0ad37241b4..32b1f1bba9 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -31,6 +31,7 @@
 #include <libsolutil/FunctionSelector.h>
 #include <libevmasm/Instruction.h>
 #include <libsolutil/Whiskers.h>
+#include <libsolutil/StackTooDeepString.h>
 
 using namespace std;
 using namespace solidity;
@@ -476,7 +477,7 @@ void CompilerUtils::encodeToMemory(
 			assertThrow(
 				(argSize + dynPointers) < 16,
 				StackTooDeepError,
-				"Stack too deep, try using fewer variables."
+				util::stackTooDeepString
 			);
 		}
 		else
@@ -537,7 +538,7 @@ void CompilerUtils::encodeToMemory(
 			assertThrow(
 				(2 + dynPointers) <= 16,
 				StackTooDeepError,
-				"Stack too deep(" + to_string(2 + dynPointers) + "), try using fewer variables."
+				util::stackTooDeepString
 			);
 			m_context << dupInstruction(2 + dynPointers) << Instruction::DUP2;
 			m_context << Instruction::SUB;
@@ -1418,7 +1419,7 @@ void CompilerUtils::moveToStackVariable(VariableDeclaration const& _variable)
 		BOOST_THROW_EXCEPTION(
 			StackTooDeepError() <<
 			errinfo_sourceLocation(_variable.location()) <<
-			util::errinfo_comment("Stack too deep, try removing local variables.")
+			util::errinfo_comment(util::stackTooDeepString)
 		);
 	for (unsigned i = 0; i < size; ++i)
 		m_context << swapInstruction(stackPosition - size + 1) << Instruction::POP;
@@ -1429,7 +1430,7 @@ void CompilerUtils::copyToStackTop(unsigned _stackDepth, unsigned _itemSize)
 	assertThrow(
 		_stackDepth <= 16,
 		StackTooDeepError,
-		"Stack too deep, try removing local variables."
+		util::stackTooDeepString
 	);
 	for (unsigned i = 0; i < _itemSize; ++i)
 		m_context << dupInstruction(_stackDepth);
@@ -1455,7 +1456,7 @@ void CompilerUtils::rotateStackUp(unsigned _items)
 	assertThrow(
 		_items - 1 <= 16,
 		StackTooDeepError,
-		"Stack too deep, try removing local variables."
+		util::stackTooDeepString
 	);
 	for (unsigned i = 1; i < _items; ++i)
 		m_context << swapInstruction(_items - i);
@@ -1466,7 +1467,7 @@ void CompilerUtils::rotateStackDown(unsigned _items)
 	assertThrow(
 		_items - 1 <= 16,
 		StackTooDeepError,
-		"Stack too deep, try removing local variables."
+		util::stackTooDeepString
 	);
 	for (unsigned i = 1; i < _items; ++i)
 		m_context << swapInstruction(i);
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index d2c71e2aff..bdad481731 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -48,6 +48,7 @@
 
 #include <libsolutil/Whiskers.h>
 #include <libsolutil/FunctionSelector.h>
+#include <libsolutil/StackTooDeepString.h>
 
 #include <range/v3/view/reverse.hpp>
 
@@ -672,7 +673,7 @@ bool ContractCompiler::visit(FunctionDefinition const& _function)
 		BOOST_THROW_EXCEPTION(
 			StackTooDeepError() <<
 			errinfo_sourceLocation(_function.location()) <<
-			util::errinfo_comment("Stack too deep, try removing local variables.")
+			util::errinfo_comment(util::stackTooDeepString)
 		);
 	while (!stackLayout.empty() && stackLayout.back() != static_cast<int>(stackLayout.size() - 1))
 		if (stackLayout.back() < 0)
@@ -842,7 +843,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 						BOOST_THROW_EXCEPTION(
 							StackTooDeepError() <<
 							errinfo_sourceLocation(_inlineAssembly.location()) <<
-							util::errinfo_comment("Stack too deep, try removing local variables.")
+							util::errinfo_comment(util::stackTooDeepString)
 						);
 					_assembly.appendInstruction(dupInstruction(stackDiff));
 				}
@@ -916,7 +917,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 				BOOST_THROW_EXCEPTION(
 					StackTooDeepError() <<
 					errinfo_sourceLocation(_inlineAssembly.location()) <<
-					util::errinfo_comment("Stack too deep(" + to_string(stackDiff) + "), try removing local variables.")
+					util::errinfo_comment(util::stackTooDeepString)
 				);
 			_assembly.appendInstruction(swapInstruction(stackDiff));
 			_assembly.appendInstruction(Instruction::POP);
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 21cb45e775..36646ea212 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -37,6 +37,7 @@
 #include <libsolutil/FunctionSelector.h>
 #include <libsolutil/Keccak256.h>
 #include <libsolutil/Whiskers.h>
+#include <libsolutil/StackTooDeepString.h>
 
 #include <boost/algorithm/string/replace.hpp>
 #include <numeric>
@@ -268,7 +269,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 		BOOST_THROW_EXCEPTION(
 			StackTooDeepError() <<
 			errinfo_sourceLocation(_varDecl.location()) <<
-			util::errinfo_comment("Stack too deep.")
+			util::errinfo_comment(util::stackTooDeepString)
 		);
 	m_context << dupInstruction(retSizeOnStack + 1);
 	m_context.appendJump(evmasm::AssemblyItem::JumpType::OutOfFunction);
@@ -350,7 +351,7 @@ bool ExpressionCompiler::visit(Assignment const& _assignment)
 				BOOST_THROW_EXCEPTION(
 					StackTooDeepError() <<
 					errinfo_sourceLocation(_assignment.location()) <<
-					util::errinfo_comment("Stack too deep, try removing local variables.")
+					util::errinfo_comment(util::stackTooDeepString)
 				);
 			// value [lvalue_ref] updated_value
 			for (unsigned i = 0; i < itemSize; ++i)
diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp
index 379e9818b6..aa7524c933 100644
--- a/libsolidity/codegen/LValue.cpp
+++ b/libsolidity/codegen/LValue.cpp
@@ -28,6 +28,8 @@
 #include <libsolidity/codegen/CompilerUtils.h>
 #include <libevmasm/Instruction.h>
 
+#include <libsolutil/StackTooDeepString.h>
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
@@ -50,7 +52,7 @@ void StackVariable::retrieveValue(SourceLocation const& _location, bool) const
 		BOOST_THROW_EXCEPTION(
 			StackTooDeepError() <<
 			errinfo_sourceLocation(_location) <<
-			util::errinfo_comment("Stack too deep, try removing local variables.")
+			util::errinfo_comment(util::stackTooDeepString)
 		);
 	solAssert(stackPos + 1 >= m_size, "Size and stack pos mismatch.");
 	for (unsigned i = 0; i < m_size; ++i)
@@ -64,7 +66,7 @@ void StackVariable::storeValue(Type const&, SourceLocation const& _location, boo
 		BOOST_THROW_EXCEPTION(
 			StackTooDeepError() <<
 			errinfo_sourceLocation(_location) <<
-			util::errinfo_comment("Stack too deep, try removing local variables.")
+			util::errinfo_comment(util::stackTooDeepString)
 		);
 	else if (stackDiff > 0)
 		for (unsigned i = 0; i < m_size; ++i)
diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
index e055317be7..363baba193 100644
--- a/libsolutil/CMakeLists.txt
+++ b/libsolutil/CMakeLists.txt
@@ -28,6 +28,7 @@ set(sources
 	picosha2.h
 	Result.h
 	SetOnce.h
+	StackTooDeepString.h
 	StringUtils.cpp
 	StringUtils.h
 	SwarmHash.cpp
diff --git a/libsolutil/StackTooDeepString.h b/libsolutil/StackTooDeepString.h
new file mode 100644
index 0000000000..75fe557e2c
--- /dev/null
+++ b/libsolutil/StackTooDeepString.h
@@ -0,0 +1,28 @@
+/*
+	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
+#pragma once
+
+#include <string>
+
+namespace solidity::util
+{
+	static std::string stackTooDeepString =
+		"Stack too deep. "
+		"Try compiling with `--via-ir` (cli) or the equivalent `viaIR: true` (standard JSON) "
+		"while enabling the optimizer. Otherwise, try removing local variables.";
+}
diff --git a/libyul/backends/evm/AsmCodeGen.cpp b/libyul/backends/evm/AsmCodeGen.cpp
index 6ef1429061..c4d276fa12 100644
--- a/libyul/backends/evm/AsmCodeGen.cpp
+++ b/libyul/backends/evm/AsmCodeGen.cpp
@@ -26,6 +26,8 @@
 #include <libyul/AST.h>
 #include <libyul/AsmAnalysisInfo.h>
 
+#include <libsolutil/StackTooDeepString.h>
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
@@ -61,7 +63,7 @@ void CodeGenerator::assemble(
 		assertThrow(
 			false,
 			langutil::StackTooDeepError,
-			"Stack too deep when compiling inline assembly" +
+			util::stackTooDeepString + " When compiling inline assembly" +
 			(transform.stackErrors().front().comment() ? ": " + *transform.stackErrors().front().comment() : ".")
 		);
 }
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 8497fc0c08..319a60885b 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -1428,7 +1428,7 @@ BOOST_AUTO_TEST_CASE(use_stack_optimization)
 	BOOST_REQUIRE(result["errors"].isArray());
 	BOOST_CHECK(result["errors"][0]["severity"] == "error");
 	BOOST_REQUIRE(result["errors"][0]["message"].isString());
-	BOOST_CHECK(result["errors"][0]["message"].asString().find("Stack too deep when compiling inline assembly") != std::string::npos);
+	BOOST_CHECK(result["errors"][0]["message"].asString().find("When compiling inline assembly") != std::string::npos);
 	BOOST_CHECK(result["errors"][0]["type"] == "CompilerError");
 }
 

From c7d57031b56f7c0513f2e790ad99b05abfe784ea Mon Sep 17 00:00:00 2001
From: Florian Sey <florian.sey@gmail.com>
Date: Fri, 6 May 2022 01:01:33 +0200
Subject: [PATCH 0566/1748] Improve wording on voting example

From a beginner perspective, it is the first time in the documentation
that the term wallets is used. Other terms such as accounts or addresses
are explained in the Introduction to smart contracts.
---
 docs/examples/voting.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/voting.rst b/docs/examples/voting.rst
index a51c01b746..6e36f4e510 100644
--- a/docs/examples/voting.rst
+++ b/docs/examples/voting.rst
@@ -133,7 +133,7 @@ of votes.
             // modifies `voters[msg.sender].voted`
             Voter storage delegate_ = voters[to];
 
-            // Voters cannot delegate to wallets that cannot vote.
+            // Voters cannot delegate to accounts that cannot vote.
             require(delegate_.weight >= 1);
             sender.voted = true;
             sender.delegate = to;

From 49d27eaa5d28a24aa2eb7baa3afc48ac3c3f9dda Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 16 Mar 2022 15:44:52 +0100
Subject: [PATCH 0567/1748] [Circle CI] Adds LSP tests to Windows CI.

---
 .circleci/config.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2d824c2497..e997fb3222 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1280,6 +1280,12 @@ jobs:
       - run:
           name: "Run soltest"
           command: .circleci/soltest.ps1
+      - run:
+          name: Install LSP test dependencies
+          command: python -m pip install --user deepdiff colorama
+      - run:
+          name: Executing solc LSP test suite
+          command: python ./test/lsp.py .\build\solc\Release\solc.exe
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
       - gitter_notify_failure_unless_pr

From f308f1a1f82acea226d70af16dd1ca14a75a9a6d Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 25 Apr 2022 15:35:41 +0200
Subject: [PATCH 0568/1748] Always allow full filesystem access to LSP.

---
 Changelog.md                       |   1 +
 libsolidity/CMakeLists.txt         |   1 +
 libsolidity/lsp/FileRepository.cpp | 126 ++++++++++++++++----
 libsolidity/lsp/FileRepository.h   |  38 ++++--
 libsolidity/lsp/HandlerBase.cpp    |   4 +-
 libsolidity/lsp/LanguageServer.cpp |  19 ++-
 libsolidity/lsp/LanguageServer.h   |   2 +-
 libsolidity/lsp/Transport.cpp      | 182 ++++++++++++++++++++---------
 libsolidity/lsp/Transport.h        |  69 ++++++++---
 libsolidity/lsp/Utils.cpp          |  13 ++-
 libsolidity/lsp/Utils.h            |   7 ++
 solc/CommandLineInterface.cpp      |   2 +-
 12 files changed, 339 insertions(+), 125 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 01c288a2e0..27ae4e30a3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
  * Assembly-Json: Export: Include source list in `sourceList` field.
  * Commandline Interface: option ``--pretty-json`` works also with the following options: ``--abi``, ``--asm-json``, ``--ast-compact-json``, ``--devdoc``, ``--storage-layout``, ``--userdoc``.
  * SMTChecker: Support ``abi.encodeCall`` taking into account the called selector.
+ * Language Server: Allow full filesystem access to language server.
 
 
 Bugfixes:
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 3d2845463c..26c14976e0 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -176,3 +176,4 @@ set(sources
 
 add_library(solidity ${sources})
 target_link_libraries(solidity PUBLIC yul evmasm langutil smtutil solutil Boost::boost fmt::fmt-header-only)
+
diff --git a/libsolidity/lsp/FileRepository.cpp b/libsolidity/lsp/FileRepository.cpp
index 9c7f72e0c4..e823439732 100644
--- a/libsolidity/lsp/FileRepository.cpp
+++ b/libsolidity/lsp/FileRepository.cpp
@@ -17,48 +17,130 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <libsolidity/lsp/FileRepository.h>
+#include <libsolidity/lsp/Utils.h>
+
+#include <libsolutil/StringUtils.h>
+#include <libsolutil/CommonIO.h>
+
+#include <range/v3/range/conversion.hpp>
+#include <range/v3/view/transform.hpp>
+
+#include <regex>
 
 using namespace std;
 using namespace solidity;
 using namespace solidity::lsp;
+using namespace solidity::frontend;
 
-namespace
-{
+using solidity::util::readFileAsString;
+using solidity::util::joinHumanReadable;
 
-string stripFilePrefix(string const& _path)
+FileRepository::FileRepository(boost::filesystem::path _basePath): m_basePath(std::move(_basePath))
 {
-	if (_path.find("file://") == 0)
-		return _path.substr(7);
-	else
-		return _path;
-}
-
 }
 
-string FileRepository::sourceUnitNameToClientPath(string const& _sourceUnitName) const
+string FileRepository::sourceUnitNameToUri(string const& _sourceUnitName) const
 {
-	if (m_sourceUnitNamesToClientPaths.count(_sourceUnitName))
-		return m_sourceUnitNamesToClientPaths.at(_sourceUnitName);
+	regex const windowsDriveLetterPath("^[a-zA-Z]:/");
+
+	if (m_sourceUnitNamesToUri.count(_sourceUnitName))
+		return m_sourceUnitNamesToUri.at(_sourceUnitName);
 	else if (_sourceUnitName.find("file://") == 0)
 		return _sourceUnitName;
+	else if (regex_search(_sourceUnitName, windowsDriveLetterPath))
+		return "file:///" + _sourceUnitName;
+	else if (_sourceUnitName.find("/") == 0)
+		return "file://" + _sourceUnitName;
 	else
-		return "file://" + (m_fileReader.basePath() / _sourceUnitName).generic_string();
+		return "file://" + m_basePath.generic_string() + "/" + _sourceUnitName;
 }
 
-string FileRepository::clientPathToSourceUnitName(string const& _path) const
+string FileRepository::uriToSourceUnitName(string const& _path) const
 {
-	return m_fileReader.cliPathToSourceUnitName(stripFilePrefix(_path));
+	return stripFileUriSchemePrefix(_path);
 }
 
-map<string, string> const& FileRepository::sourceUnits() const
+void FileRepository::setSourceByUri(string const& _uri, string _source)
 {
-	return m_fileReader.sourceUnits();
+	// This is needed for uris outside the base path. It can lead to collisions,
+	// but we need to mostly rewrite this in a future version anyway.
+	auto sourceUnitName = uriToSourceUnitName(_uri);
+	m_sourceUnitNamesToUri.emplace(sourceUnitName, _uri);
+	m_sourceCodes[sourceUnitName] = std::move(_source);
 }
 
-void FileRepository::setSourceByClientPath(string const& _uri, string _text)
+frontend::ReadCallback::Result FileRepository::readFile(string const& _kind, string const& _sourceUnitName)
 {
-	// This is needed for uris outside the base path. It can lead to collisions,
-	// but we need to mostly rewrite this in a future version anyway.
-	m_sourceUnitNamesToClientPaths.emplace(clientPathToSourceUnitName(_uri), _uri);
-	m_fileReader.addOrUpdateFile(stripFilePrefix(_uri), move(_text));
+	solAssert(
+		_kind == ReadCallback::kindString(ReadCallback::Kind::ReadFile),
+		"ReadFile callback used as callback kind " + _kind
+	);
+
+	try
+	{
+		// File was read already. Use local store.
+		if (m_sourceCodes.count(_sourceUnitName))
+			return ReadCallback::Result{true, m_sourceCodes.at(_sourceUnitName)};
+
+		string const strippedSourceUnitName = stripFileUriSchemePrefix(_sourceUnitName);
+
+		if (
+			boost::filesystem::path(strippedSourceUnitName).has_root_path() &&
+			boost::filesystem::exists(strippedSourceUnitName)
+		)
+		{
+			auto contents = readFileAsString(strippedSourceUnitName);
+			solAssert(m_sourceCodes.count(_sourceUnitName) == 0, "");
+			m_sourceCodes[_sourceUnitName] = contents;
+			return ReadCallback::Result{true, move(contents)};
+		}
+
+		vector<boost::filesystem::path> candidates;
+		vector<reference_wrapper<boost::filesystem::path>> prefixes = {m_basePath};
+		prefixes += (m_includePaths | ranges::to<vector<reference_wrapper<boost::filesystem::path>>>);
+
+		auto const pathToQuotedString = [](boost::filesystem::path const& _path) { return "\"" + _path.string() + "\""; };
+
+		for (auto const& prefix: prefixes)
+		{
+			boost::filesystem::path canonicalPath = boost::filesystem::path(prefix) / boost::filesystem::path(strippedSourceUnitName);
+
+			if (boost::filesystem::exists(canonicalPath))
+				candidates.push_back(move(canonicalPath));
+		}
+
+		if (candidates.empty())
+			return ReadCallback::Result{
+				false,
+				"File not found. Searched the following locations: " +
+				joinHumanReadable(prefixes | ranges::views::transform(pathToQuotedString), ", ") +
+				"."
+			};
+
+		if (candidates.size() >= 2)
+			return ReadCallback::Result{
+				false,
+				"Ambiguous import. "
+				"Multiple matching files found inside base path and/or include paths: " +
+				joinHumanReadable(candidates | ranges::views::transform(pathToQuotedString), ", ") +
+				"."
+			};
+
+		if (!boost::filesystem::is_regular_file(candidates[0]))
+			return ReadCallback::Result{false, "Not a valid file."};
+
+		auto contents = readFileAsString(candidates[0]);
+		solAssert(m_sourceCodes.count(_sourceUnitName) == 0, "");
+		m_sourceCodes[_sourceUnitName] = contents;
+		return ReadCallback::Result{true, move(contents)};
+	}
+	catch (std::exception const& _exception)
+	{
+		return ReadCallback::Result{false, "Exception in read callback: " + boost::diagnostic_information(_exception)};
+	}
+	catch (...)
+	{
+		return ReadCallback::Result{false, "Unknown exception in read callback: " + boost::current_exception_diagnostic_information()};
+	}
 }
+
diff --git a/libsolidity/lsp/FileRepository.h b/libsolidity/lsp/FileRepository.h
index b6aa5ee085..152c1d4bec 100644
--- a/libsolidity/lsp/FileRepository.h
+++ b/libsolidity/lsp/FileRepository.h
@@ -28,26 +28,42 @@ namespace solidity::lsp
 class FileRepository
 {
 public:
-	explicit FileRepository(boost::filesystem::path const& _basePath):
-		m_fileReader(_basePath) {}
+	explicit FileRepository(boost::filesystem::path _basePath);
 
-	boost::filesystem::path const& basePath() const { return m_fileReader.basePath(); }
+	boost::filesystem::path const& basePath() const { return m_basePath; }
 
 	/// Translates a compiler-internal source unit name to an LSP client path.
-	std::string sourceUnitNameToClientPath(std::string const& _sourceUnitName) const;
-	/// Translates an LSP client path into a compiler-internal source unit name.
-	std::string clientPathToSourceUnitName(std::string const& _uri) const;
+	std::string sourceUnitNameToUri(std::string const& _sourceUnitName) const;
+
+	/// Translates an LSP file URI into a compiler-internal source unit name.
+	std::string uriToSourceUnitName(std::string const& _uri) const;
 
 	/// @returns all sources by their compiler-internal source unit name.
-	std::map<std::string, std::string> const& sourceUnits() const;
+	StringMap const& sourceUnits() const noexcept { return m_sourceCodes; }
+
 	/// Changes the source identified by the LSP client path _uri to _text.
-	void setSourceByClientPath(std::string const& _uri, std::string _text);
+	void setSourceByUri(std::string const& _uri, std::string _text);
 
-	frontend::ReadCallback::Callback reader() { return m_fileReader.reader(); }
+	void addOrUpdateFile(boost::filesystem::path const& _path, frontend::SourceCode _source);
+	void setSourceUnits(StringMap _sources);
+	frontend::ReadCallback::Result readFile(std::string const& _kind, std::string const& _sourceUnitName);
+	frontend::ReadCallback::Callback reader()
+	{
+		return [this](std::string const& _kind, std::string const& _path) { return readFile(_kind, _path); };
+	}
 
 private:
-	std::map<std::string, std::string> m_sourceUnitNamesToClientPaths;
-	frontend::FileReader m_fileReader;
+	/// Base path without URI scheme.
+	boost::filesystem::path m_basePath;
+
+	/// Additional directories used for resolving relative paths in imports.
+	std::vector<boost::filesystem::path> m_includePaths;
+
+	/// Mapping of source unit names to their URIs as understood by the client.
+	StringMap m_sourceUnitNamesToUri;
+
+	/// Mapping of source unit names to their file content.
+	StringMap m_sourceCodes;
 };
 
 }
diff --git a/libsolidity/lsp/HandlerBase.cpp b/libsolidity/lsp/HandlerBase.cpp
index 0da19aad35..f40f189ab3 100644
--- a/libsolidity/lsp/HandlerBase.cpp
+++ b/libsolidity/lsp/HandlerBase.cpp
@@ -47,7 +47,7 @@ Json::Value HandlerBase::toJson(SourceLocation const& _location) const
 {
 	solAssert(_location.sourceName);
 	Json::Value item = Json::objectValue;
-	item["uri"] = fileRepository().sourceUnitNameToClientPath(*_location.sourceName);
+	item["uri"] = fileRepository().sourceUnitNameToUri(*_location.sourceName);
 	item["range"] = toRange(_location);
 	return item;
 }
@@ -55,7 +55,7 @@ Json::Value HandlerBase::toJson(SourceLocation const& _location) const
 pair<string, LineColumn> HandlerBase::extractSourceUnitNameAndLineColumn(Json::Value const& _args) const
 {
 	string const uri = _args["textDocument"]["uri"].asString();
-	string const sourceUnitName = fileRepository().clientPathToSourceUnitName(uri);
+	string const sourceUnitName = fileRepository().uriToSourceUnitName(uri);
 	if (!fileRepository().sourceUnits().count(sourceUnitName))
 		BOOST_THROW_EXCEPTION(
 			RequestError(ErrorCode::RequestFailed) <<
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 8a42ca1049..44b0cf041b 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -37,8 +37,6 @@
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
-#include <fmt/format.h>
-
 #include <ostream>
 #include <string>
 
@@ -114,9 +112,9 @@ void LanguageServer::compile()
 	swap(oldRepository, m_fileRepository);
 
 	for (string const& fileName: m_openFiles)
-		m_fileRepository.setSourceByClientPath(
+		m_fileRepository.setSourceByUri(
 			fileName,
-			oldRepository.sourceUnits().at(oldRepository.clientPathToSourceUnitName(fileName))
+			oldRepository.sourceUnits().at(oldRepository.uriToSourceUnitName(fileName))
 		);
 
 	// TODO: optimize! do not recompile if nothing has changed (file(s) not flagged dirty).
@@ -178,7 +176,7 @@ void LanguageServer::compileAndUpdateDiagnostics()
 	for (auto&& [sourceUnitName, diagnostics]: diagnosticsBySourceUnit)
 	{
 		Json::Value params;
-		params["uri"] = m_fileRepository.sourceUnitNameToClientPath(sourceUnitName);
+		params["uri"] = m_fileRepository.sourceUnitNameToUri(sourceUnitName);
 		if (!diagnostics.empty())
 			m_nonemptyDiagnostics.insert(sourceUnitName);
 		params["diagnostics"] = move(diagnostics);
@@ -252,13 +250,12 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 			ErrorCode::InvalidParams,
 			"rootUri only supports file URI scheme."
 		);
-
-		rootPath = rootPath.substr(7);
+		rootPath = stripFileUriSchemePrefix(rootPath);
 	}
 	else if (Json::Value rootPath = _args["rootPath"])
 		rootPath = rootPath.asString();
 
-	m_fileRepository = FileRepository(boost::filesystem::path(rootPath));
+	m_fileRepository = FileRepository(rootPath);
 	if (_args["initializationOptions"].isObject())
 		changeConfiguration(_args["initializationOptions"]);
 
@@ -309,7 +306,7 @@ void LanguageServer::handleTextDocumentDidOpen(Json::Value const& _args)
 	string text = _args["textDocument"]["text"].asString();
 	string uri = _args["textDocument"]["uri"].asString();
 	m_openFiles.insert(uri);
-	m_fileRepository.setSourceByClientPath(uri, move(text));
+	m_fileRepository.setSourceByUri(uri, move(text));
 	compileAndUpdateDiagnostics();
 }
 
@@ -327,7 +324,7 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 			"Invalid content reference."
 		);
 
-		string const sourceUnitName = m_fileRepository.clientPathToSourceUnitName(uri);
+		string const sourceUnitName = m_fileRepository.uriToSourceUnitName(uri);
 		lspAssert(
 			m_fileRepository.sourceUnits().count(sourceUnitName),
 			ErrorCode::RequestFailed,
@@ -348,7 +345,7 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 			buffer.replace(static_cast<size_t>(change->start), static_cast<size_t>(change->end - change->start), move(text));
 			text = move(buffer);
 		}
-		m_fileRepository.setSourceByClientPath(uri, move(text));
+		m_fileRepository.setSourceByUri(uri, move(text));
 	}
 
 	compileAndUpdateDiagnostics();
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
index e827f62598..2a7951fb02 100644
--- a/libsolidity/lsp/LanguageServer.h
+++ b/libsolidity/lsp/LanguageServer.h
@@ -92,7 +92,7 @@ class LanguageServer
 	Transport& m_client;
 	std::map<std::string, MessageHandler> m_handlers;
 
-	/// Set of files known to be open by the client.
+	/// Set of files (names in URI form) known to be open by the client.
 	std::set<std::string> m_openFiles;
 	/// Set of source unit names for which we sent diagnostics to the client in the last iteration.
 	std::set<std::string> m_nonemptyDiagnostics;
diff --git a/libsolidity/lsp/Transport.cpp b/libsolidity/lsp/Transport.cpp
index b82b34ec44..aa85fd6b1a 100644
--- a/libsolidity/lsp/Transport.cpp
+++ b/libsolidity/lsp/Transport.cpp
@@ -22,31 +22,25 @@
 #include <libsolutil/CommonIO.h>
 #include <liblangutil/Exceptions.h>
 
+#include <fmt/format.h>
+
 #include <boost/algorithm/string.hpp>
 
 #include <iostream>
 #include <sstream>
+#include <string>
 
-using namespace std;
-using namespace solidity::lsp;
 
-IOStreamTransport::IOStreamTransport(istream& _in, ostream& _out):
-	m_input{_in},
-	m_output{_out}
-{
-}
-
-IOStreamTransport::IOStreamTransport():
-	IOStreamTransport(cin, cout)
-{
-}
+#if defined(_WIN32)
+#include <io.h>
+#include <fcntl.h>
+#endif
 
-bool IOStreamTransport::closed() const noexcept
-{
-	return m_input.eof();
-}
+using namespace std;
+using namespace solidity::lsp;
 
-optional<Json::Value> IOStreamTransport::receive()
+// {{{ Transport
+optional<Json::Value> Transport::receive()
 {
 	auto const headers = parseHeaders();
 	if (!headers)
@@ -61,7 +55,7 @@ optional<Json::Value> IOStreamTransport::receive()
 		return nullopt;
 	}
 
-	string const data = util::readBytes(m_input, stoul(headers->at("content-length")));
+	string const data = readBytes(stoul(headers->at("content-length")));
 
 	Json::Value jsonMessage;
 	string jsonParsingErrors;
@@ -75,7 +69,41 @@ optional<Json::Value> IOStreamTransport::receive()
 	return {move(jsonMessage)};
 }
 
-void IOStreamTransport::notify(string _method, Json::Value _message)
+void Transport::trace(std::string _message, Json::Value _extra)
+{
+	if (m_logTrace != TraceValue::Off)
+	{
+		Json::Value params;
+		if (_extra.isObject())
+			params = move(_extra);
+		params["message"] = move(_message);
+		notify("$/logTrace", move(params));
+	}
+}
+
+optional<map<string, string>> Transport::parseHeaders()
+{
+	map<string, string> headers;
+
+	while (true)
+	{
+		auto line = getline();
+		if (boost::trim_copy(line).empty())
+			break;
+
+		auto const delimiterPos = line.find(':');
+		if (delimiterPos == string::npos)
+			return nullopt;
+
+		auto const name = boost::to_lower_copy(line.substr(0, delimiterPos));
+		auto const value = line.substr(delimiterPos + 1);
+		if (!headers.emplace(boost::trim_copy(name), boost::trim_copy(value)).second)
+			return nullopt;
+	}
+	return {move(headers)};
+}
+
+void Transport::notify(string _method, Json::Value _message)
 {
 	Json::Value json;
 	json["method"] = move(_method);
@@ -83,14 +111,14 @@ void IOStreamTransport::notify(string _method, Json::Value _message)
 	send(move(json));
 }
 
-void IOStreamTransport::reply(MessageID _id, Json::Value _message)
+void Transport::reply(MessageID _id, Json::Value _message)
 {
 	Json::Value json;
 	json["result"] = move(_message);
 	send(move(json), _id);
 }
 
-void IOStreamTransport::error(MessageID _id, ErrorCode _code, string _message)
+void Transport::error(MessageID _id, ErrorCode _code, string _message)
 {
 	Json::Value json;
 	json["error"]["code"] = static_cast<int>(_code);
@@ -98,56 +126,96 @@ void IOStreamTransport::error(MessageID _id, ErrorCode _code, string _message)
 	send(move(json), _id);
 }
 
-void Transport::trace(std::string _message, Json::Value _extra)
-{
-	if (m_logTrace != TraceValue::Off)
-	{
-		Json::Value params;
-		if (_extra.isObject())
-			params = move(_extra);
-		params["message"] = move(_message);
-		notify("$/logTrace", move(params));
-	}
-}
-
-void IOStreamTransport::send(Json::Value _json, MessageID _id)
+void Transport::send(Json::Value _json, MessageID _id)
 {
 	solAssert(_json.isObject());
 	_json["jsonrpc"] = "2.0";
 	if (_id != Json::nullValue)
 		_json["id"] = _id;
 
+	// Trailing CRLF only for easier readability.
 	string const jsonString = solidity::util::jsonCompactPrint(_json);
 
-	m_output << "Content-Length: " << jsonString.size() << "\r\n";
-	m_output << "\r\n";
-	m_output << jsonString;
+	writeBytes(fmt::format("Content-Length: {}\r\n\r\n", jsonString.size()));
+	writeBytes(jsonString);
+	flushOutput();
+}
+// }}}
+
+// {{{ IOStreamTransport
+IOStreamTransport::IOStreamTransport(istream& _in, ostream& _out):
+	m_input{_in},
+	m_output{_out}
+{
+}
+
+bool IOStreamTransport::closed() const noexcept
+{
+	return m_input.eof();
+}
 
+std::string IOStreamTransport::readBytes(size_t _length)
+{
+	return util::readBytes(m_input, _length);
+}
+
+std::string IOStreamTransport::getline()
+{
+	string line;
+	std::getline(m_input, line);
+	return line;
+}
+
+void IOStreamTransport::writeBytes(std::string_view _data)
+{
+	m_output.write(_data.data(), static_cast<std::streamsize>(_data.size()));
+}
+
+void IOStreamTransport::flushOutput()
+{
 	m_output.flush();
 }
+// }}}
 
-optional<map<string, string>> IOStreamTransport::parseHeaders()
+// {{{ StdioTransport
+StdioTransport::StdioTransport()
 {
-	map<string, string> headers;
+	#if defined(_WIN32)
+	// Attempt to change the modes of stdout from text to binary.
+	setmode(fileno(stdout), O_BINARY);
+	#endif
+}
 
-	while (true)
-	{
-		string line;
-		getline(m_input, line);
-		if (boost::trim_copy(line).empty())
-			break;
+bool StdioTransport::closed() const noexcept
+{
+	return feof(stdin);
+}
 
-		auto const delimiterPos = line.find(':');
-		if (delimiterPos == string::npos)
-			return nullopt;
+std::string StdioTransport::readBytes(size_t _byteCount)
+{
+	std::string buffer;
+	buffer.resize(_byteCount);
+	auto const n = fread(buffer.data(), 1, _byteCount, stdin);
+	if (n < _byteCount)
+		buffer.resize(n);
+	return buffer;
+}
 
-		string name = boost::to_lower_copy(line.substr(0, delimiterPos));
-		string value = line.substr(delimiterPos + 1);
-		if (!headers.emplace(
-			boost::trim_copy(name),
-			boost::trim_copy(value)
-		).second)
-			return nullopt;
-	}
-	return {move(headers)};
+std::string StdioTransport::getline()
+{
+	std::string line;
+	std::getline(std::cin, line);
+	return line;
+}
+
+void StdioTransport::writeBytes(std::string_view _data)
+{
+	auto const bytesWritten = fwrite(_data.data(), 1, _data.size(), stdout);
+	solAssert(bytesWritten == _data.size());
+}
+
+void StdioTransport::flushOutput()
+{
+	fflush(stdout);
 }
+// }}}
diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h
index d84edf49d3..8aa89b3d28 100644
--- a/libsolidity/lsp/Transport.h
+++ b/libsolidity/lsp/Transport.h
@@ -91,20 +91,44 @@ class Transport
 public:
 	virtual ~Transport() = default;
 
+	std::optional<Json::Value> receive();
+	void notify(std::string _method, Json::Value _params);
+	void reply(MessageID _id, Json::Value _result);
+	void error(MessageID _id, ErrorCode _code, std::string _message);
+
 	virtual bool closed() const noexcept = 0;
-	virtual std::optional<Json::Value> receive() = 0;
-	virtual void notify(std::string _method, Json::Value _params) = 0;
-	virtual void reply(MessageID _id, Json::Value _result) = 0;
-	virtual void error(MessageID _id, ErrorCode _code, std::string _message) = 0;
 
 	void trace(std::string _message, Json::Value _extra = Json::nullValue);
 
 	TraceValue traceValue() const noexcept { return m_logTrace; }
 	void setTrace(TraceValue _value) noexcept { m_logTrace = _value; }
 
-
 private:
 	TraceValue m_logTrace = TraceValue::Off;
+
+protected:
+	/// Reads from the transport and parses the headers until the beginning
+	/// of the contents.
+	std::optional<std::map<std::string, std::string>> parseHeaders();
+
+	/// Consumes exactly @p _byteCount bytes, as needed for consuming
+	/// the message body from the transport line.
+	virtual std::string readBytes(size_t _byteCount) = 0;
+
+	// Mimmicks std::getline() on this Transport API.
+	virtual std::string getline() = 0;
+
+	/// Writes the given payload @p _data to transport.
+	/// This call may or may not buffer.
+	virtual void writeBytes(std::string_view _data) = 0;
+
+	/// Ensures transport output is flushed.
+	virtual void flushOutput() = 0;
+
+	/// Sends an arbitrary raw message to the client.
+	///
+	/// Used by the notify/reply/error function family.
+	virtual void send(Json::Value _message, MessageID _id = Json::nullValue);
 };
 
 /**
@@ -119,27 +143,34 @@ class IOStreamTransport: public Transport
 	/// @param _out for example std::cout (stdout)
 	IOStreamTransport(std::istream& _in, std::ostream& _out);
 
-	// Constructs a JSON transport using standard I/O streams.
-	IOStreamTransport();
-
 	bool closed() const noexcept override;
-	std::optional<Json::Value> receive() override;
-	void notify(std::string _method, Json::Value _params) override;
-	void reply(MessageID _id, Json::Value _result) override;
-	void error(MessageID _id, ErrorCode _code, std::string _message) override;
 
 protected:
-	/// Sends an arbitrary raw message to the client.
-	///
-	/// Used by the notify/reply/error function family.
-	virtual void send(Json::Value _message, MessageID _id = Json::nullValue);
-
-	/// Parses header section from the client including message-delimiting empty line.
-	std::optional<std::map<std::string, std::string>> parseHeaders();
+	std::string readBytes(size_t _byteCount) override;
+	std::string getline() override;
+	void writeBytes(std::string_view _data) override;
+	void flushOutput() override;
 
 private:
 	std::istream& m_input;
 	std::ostream& m_output;
 };
 
+/**
+ * Standard I/O transport Layer utilizing stdin/stdout for communication.
+ */
+class StdioTransport: public Transport
+{
+public:
+	StdioTransport();
+
+	bool closed() const noexcept override;
+
+protected:
+	std::string readBytes(size_t _byteCount) override;
+	std::string getline() override;
+	void writeBytes(std::string_view _data) override;
+	void flushOutput() override;
+};
+
 }
diff --git a/libsolidity/lsp/Utils.cpp b/libsolidity/lsp/Utils.cpp
index 624d1f1502..ef19b4c2ef 100644
--- a/libsolidity/lsp/Utils.cpp
+++ b/libsolidity/lsp/Utils.cpp
@@ -22,7 +22,7 @@
 #include <libsolidity/lsp/FileRepository.h>
 #include <libsolidity/lsp/Utils.h>
 
-#include <fmt/format.h>
+#include <regex>
 #include <fstream>
 
 namespace solidity::lsp
@@ -115,4 +115,15 @@ optional<SourceLocation> parseRange(FileRepository const& _fileRepository, strin
 	return start;
 }
 
+string stripFileUriSchemePrefix(string const& _path)
+{
+	regex const windowsDriveLetterPath("^file:///[a-zA-Z]:/");
+	if (regex_search(_path, windowsDriveLetterPath))
+		return _path.substr(8);
+	if (_path.find("file://") == 0)
+		return _path.substr(7);
+	else
+		return _path;
+}
+
 }
diff --git a/libsolidity/lsp/Utils.h b/libsolidity/lsp/Utils.h
index 3594efba24..c6d40213e6 100644
--- a/libsolidity/lsp/Utils.h
+++ b/libsolidity/lsp/Utils.h
@@ -64,6 +64,13 @@ std::optional<langutil::SourceLocation> parseRange(
 	Json::Value const& _range
 );
 
+/// Strips the file:// URI prefix off the given path, if present,
+/// also taking special care of Windows-drive-letter paths.
+///
+/// So file:///path/to/some/file.txt returns /path/to/some/file.txt, as well as,
+/// file:///C:/file.txt will return C:/file.txt (forward-slash is okay on Windows).
+std::string stripFileUriSchemePrefix(std::string const& _path);
+
 /// Extracts the resolved declaration of the given expression AST node.
 ///
 /// This may for example be the type declaration of an identifier,
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 40a428c955..7e627208f3 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -912,7 +912,7 @@ void CommandLineInterface::handleAst()
 
 void CommandLineInterface::serveLSP()
 {
-	lsp::IOStreamTransport transport;
+	lsp::StdioTransport transport;
 	if (!lsp::LanguageServer{transport}.run())
 		solThrow(CommandLineExecutionError, "LSP terminated abnormally.");
 }

From c2f245b40a20bc053c744ae6011df6bf7150d0d8 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 25 Apr 2022 15:35:24 +0200
Subject: [PATCH 0569/1748] Fixes to lsp.py with respect to Windows
 drive-letter paths in URI.

---
 test/lsp.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/lsp.py b/test/lsp.py
index 79be59f8e0..33059c43d7 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -12,6 +12,7 @@
 import functools
 from collections import namedtuple
 from copy import deepcopy
+from pathlib import PurePath
 from typing import Any, List, Optional, Tuple, Union
 from itertools import islice
 
@@ -694,7 +695,7 @@ def __init__(self):
         args = create_cli_parser().parse_args()
         self.solc_path = args.solc_path
         self.project_root_dir = os.path.realpath(args.project_root_dir) + "/test/libsolidity/lsp"
-        self.project_root_uri = "file://" + self.project_root_dir
+        self.project_root_uri = PurePath(self.project_root_dir).as_uri()
         self.print_assertions = args.print_assertions
         self.trace_io = args.trace_io
         self.test_pattern = args.test_pattern
@@ -777,7 +778,7 @@ def get_test_file_path(self, test_case_name):
         return f"{self.project_root_dir}/{test_case_name}.sol"
 
     def get_test_file_uri(self, test_case_name):
-        return "file://" + self.get_test_file_path(test_case_name)
+        return PurePath(self.get_test_file_path(test_case_name)).as_uri()
 
     def get_test_file_contents(self, test_case_name):
         """
@@ -1438,7 +1439,7 @@ def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc
         """
 
         self.setup_lsp(solc)
-        FILE_A_URI = f'file://{self.project_root_dir}/a.sol'
+        FILE_A_URI = f'{self.project_root_uri}/a.sol'
         solc.send_message('textDocument/didOpen', {
             'textDocument': {
                 'uri': FILE_A_URI,
@@ -1466,7 +1467,7 @@ def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc
         )
         reports = self.wait_for_diagnostics(solc)
         self.expect_equal(len(reports), 1, '')
-        self.expect_equal(reports[0]['uri'], f'file://{self.project_root_dir}/lib.sol', "")
+        self.expect_equal(reports[0]['uri'], f'{self.project_root_uri}/lib.sol', "")
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
 
     def test_textDocument_didChange_at_eol(self, solc: JsonRpcProcess) -> None:

From e8d07772d907c3f7ec57b8e3f5a9be03273d72a1 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 25 Apr 2022 17:21:45 +0200
Subject: [PATCH 0570/1748] lsp.py: Port to support running on Windows & adapt
 to changes due to prior merged PR.

- lsp.py: Fixes invalid-syntax by Python interpreter on Windows CI (older Python version).
- lsp.py: Savely strip CRLF from right side of the string, ignoring accidental multiple occurrences of \r (such as \r\r\n).
- lsp.py: Fixes reading single character from stdin (wrt. Windows platform).
- lsp.py: Adds header line reading to I/O tracing (useful for debugging).
- lsp.py: When running the tests on Windows, don't care test file content's newlines but simply expect LFs (instead of CRLF for example).
- Apply pylint notes.
- Fixing use of @functools.lru_cache for older python versions (CircleCI Windows)
---
 .circleci/config.yml |  3 ++
 test/lsp.py          | 70 +++++++++++++++++++++++++++++++-------------
 2 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e997fb3222..06213ebcbf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1283,6 +1283,9 @@ jobs:
       - run:
           name: Install LSP test dependencies
           command: python -m pip install --user deepdiff colorama
+      - run:
+          name: Inspect lsp.py
+          command: Get-Content ./test/lsp.py
       - run:
           name: Executing solc LSP test suite
           command: python ./test/lsp.py .\build\solc\Release\solc.exe
diff --git a/test/lsp.py b/test/lsp.py
index 33059c43d7..3217fb79b2 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -1,26 +1,57 @@
 #!/usr/bin/env python3
 # pragma pylint: disable=too-many-lines
+# test line 1
 import argparse
 import fnmatch
+import functools
 import json
 import os
+import re
 import subprocess
 import sys
 import traceback
-import re
-import tty
-import functools
 from collections import namedtuple
 from copy import deepcopy
+from enum import Enum, auto
+from itertools import islice
 from pathlib import PurePath
 from typing import Any, List, Optional, Tuple, Union
-from itertools import islice
 
-from enum import Enum, auto
-
-import colorama # Enables the use of SGR & CUP terminal VT sequences on Windows.
+import colorama  # Enables the use of SGR & CUP terminal VT sequences on Windows.
 from deepdiff import DeepDiff
 
+if os.name == 'nt':
+    # pragma pylint: disable=import-error
+    import msvcrt
+else:
+    import tty
+    # Turn off user input buffering so we get the input immediately,
+    # not only after a line break
+    tty.setcbreak(sys.stdin.fileno())
+
+
+def escape_string(text: str) -> str:
+    """
+    Trivially escapes given input string's \r \n and \\.
+    """
+    return text.translate(str.maketrans({
+        "\r": r"\r",
+        "\n": r"\n",
+        "\\": r"\\"
+    }))
+
+
+def getCharFromStdin():
+    """
+    Gets a single character from stdin without line-buffering.
+    """
+    if os.name == 'nt':
+        # pragma pylint: disable=import-error
+        return msvcrt.getch().decode("utf-8")
+    else:
+        return sys.stdin.buffer.read(1)
+
+
 """
 Named tuple that holds various regexes used to parse the test specification.
 """
@@ -101,7 +132,6 @@ class BadHeader(Exception):
     def __init__(self, msg: str):
         super().__init__("Bad header: " + msg)
 
-
 class JsonRpcProcess:
     exe_path: str
     exe_args: List[str]
@@ -144,10 +174,12 @@ def receive_message(self) -> Union[None, dict]:
                 # server quit
                 return None
             line = line.decode("utf-8")
+            if self.trace_io:
+                print(f"Received header-line: {escape_string(line)}")
             if not line.endswith("\r\n"):
                 raise BadHeader("missing newline")
-            # remove the "\r\n"
-            line = line[:-2]
+            # Safely remove the "\r\n".
+            line = line.rstrip("\r\n")
             if line == '':
                 break # done with the headers
             if line.startswith(CONTENT_LENGTH_HEADER):
@@ -589,7 +621,7 @@ def user_interaction_failed_method_test(self, testcase, actual, expected):
 
         while True:
             print("(u)pdate/(r)etry/(i)gnore?")
-            user_response = sys.stdin.read(1)
+            user_response = getCharFromStdin()
             if user_response == "i":
                 return self.TestResult.SuccessOrIgnored
 
@@ -787,7 +819,7 @@ def get_test_file_contents(self, test_case_name):
         in the test path (test/libsolidity/lsp).
         """
         with open(self.get_test_file_path(test_case_name), mode="r", encoding="utf-8", newline='') as f:
-            return f.read()
+            return f.read().replace("\r\n", "\n")
 
     def require_params_for_method(self, method_name: str, message: dict) -> Any:
         """
@@ -1059,7 +1091,7 @@ def user_interaction_failed_diagnostics(
         """
         while True:
             print("(u)pdate/(r)etry/(s)kip file?")
-            user_response = sys.stdin.read(1)
+            user_response = getCharFromStdin()
             if user_response == "u":
                 while True:
                     try:
@@ -1068,8 +1100,8 @@ def user_interaction_failed_diagnostics(
                     # pragma pylint: disable=broad-except
                     except Exception as e:
                         print(e)
-                        if ret := self.user_interaction_failed_autoupdate(test):
-                            return ret
+                        if self.user_interaction_failed_autoupdate(test):
+                            return True
             elif user_response == 's':
                 return True
             elif user_response == 'r':
@@ -1077,7 +1109,7 @@ def user_interaction_failed_diagnostics(
 
     def user_interaction_failed_autoupdate(self, test):
         print("(e)dit/(r)etry/(s)kip file?")
-        user_response = sys.stdin.read(1)
+        user_response = getCharFromStdin()
         if user_response == "r":
             print("retrying...")
             # pragma pylint: disable=no-member
@@ -1142,7 +1174,7 @@ def test_textDocument_didOpen_with_relative_import(self, solc: JsonRpcProcess) -
         marker = self.get_file_tags("lib")["@diagnostics"]
         self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
 
-    @functools.lru_cache # pragma pylint: disable=lru-cache-decorating-method
+    @functools.lru_cache() # pragma pylint: disable=lru-cache-decorating-method
     def get_file_tags(self, test_name: str, verbose=False):
         """
         Finds all tags (e.g. @tagname) in the given test and returns them as a
@@ -1653,10 +1685,8 @@ def test_textDocument_didChange_multi_line(self, solc: JsonRpcProcess) -> None:
     # }}}
     # }}}
 
+
 if __name__ == "__main__":
-    # Turn off user input buffering so we get the input immediately,
-    # not only after a line break
-    tty.setcbreak(sys.stdin.fileno())
     suite = SolidityLSPTestSuite()
     exit_code = suite.main()
     sys.exit(exit_code)

From 02dfeb5427e790e8ee06c89fc267f7cdb5ab6370 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Mon, 25 Apr 2022 17:03:31 +0200
Subject: [PATCH 0571/1748] lsp.py: Trigger fatal error when importing outside
 of test dir

---
 test/lsp.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/lsp.py b/test/lsp.py
index 3217fb79b2..c14fc6a4cb 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -536,6 +536,10 @@ def test_diagnostics(self):
                 self.suite.open_file_and_wait_for_diagnostics(self.solc, self.test_name)
 
             for diagnostics in published_diagnostics:
+                if not diagnostics["uri"].startswith(self.suite.project_root_uri + "/"):
+                    raise Exception(
+                        f"'{self.test_name}.sol' imported file outside of test directory: '{diagnostics['uri']}'"
+                    )
                 self.open_tests.append(diagnostics["uri"].replace(self.suite.project_root_uri + "/", "")[:-len(".sol")])
 
             self.suite.expect_equal(
@@ -570,8 +574,7 @@ def test_diagnostics(self):
                         marker=markers[expected_diagnostic.marker]
                     )
 
-        except Exception as e:
-            print(e)
+        except Exception:
             self.close_all_open_files()
             raise
 

From be7da89cf56c3c0c008a0af462de83eccd716030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 14 Apr 2022 20:07:58 +0200
Subject: [PATCH 0572/1748] Script for keeping main branches of external repos
 in sync with upstream

---
 .../externalTests/update_external_repos.sh    | 120 ++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100755 scripts/externalTests/update_external_repos.sh

diff --git a/scripts/externalTests/update_external_repos.sh b/scripts/externalTests/update_external_repos.sh
new file mode 100755
index 0000000000..7d6ba949b8
--- /dev/null
+++ b/scripts/externalTests/update_external_repos.sh
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+
+#------------------------------------------------------------------------------
+# Clones external test repositories from solidity-external-tests organization
+# and for each of them pulls latest upstream changes from the main branch and
+# pushes them to our fork.
+#
+# The script assumes that the current user has write access to
+# solidity-external-tests and that git is configured to be able to push there
+# without specifying the password (e.g. with the key already unlocked and loaded
+# into ssh-agent). Otherwise git will keep asking for password for each repository.
+#
+# Usage:
+#
+#    ./update_external_repos.sh [<target_dir>]
+#
+# <target_dir>: directory where the clones of the repositories are stored.
+#               If omitted, a temporary directory will be created.
+#
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -euo pipefail
+
+target_dir="${1:-$(mktemp -d -t update_external_repos_XXXXXX)}"
+
+function clone_repo
+{
+    local upstream_user="$1"
+    local upstream_repo="$2"
+    local fork_name="${3:-$upstream_repo}"
+
+    if [[ ! -d $fork_name ]]; then
+        git clone "git@github.com:solidity-external-tests/${fork_name}.git" --no-checkout
+    else
+        echo "Reusing existing repo: ${fork_name}."
+    fi
+
+    pushd "$fork_name" > /dev/null
+    git remote rm upstream 2> /dev/null || true
+    git remote add upstream "https://github.com/${upstream_user}/${upstream_repo}"
+    popd > /dev/null
+}
+
+function sync_branch
+{
+    local fork_name="$1"
+    local branch="$2"
+
+    echo "${fork_name}: syncing branch ${branch}..."
+    pushd "$fork_name" > /dev/null
+    git fetch upstream "$branch" --quiet
+    git checkout "$branch" --quiet
+    git merge "upstream/${branch}" --ff-only --quiet
+    git push origin "$branch"
+    popd > /dev/null
+}
+
+echo "Entering ${target_dir}"
+cd "$target_dir"
+
+clone_repo brinktrade        brink-core
+clone_repo dapphub           dappsys-monolithic
+clone_repo element-fi        elf-contracts
+clone_repo ensdomains        ens
+clone_repo ensdomains        ens-contracts
+clone_repo euler-xyz         euler-contracts
+clone_repo gnosis            gp-v2-contracts
+clone_repo gnosis            mock-contract
+clone_repo gnosis            safe-contracts
+clone_repo gnosis            util-contracts
+clone_repo JoinColony        colonyNetwork
+clone_repo mycelium-ethereum perpetual-pools-contracts
+clone_repo OpenZeppelin      openzeppelin-contracts
+clone_repo paulrberg         prb-math
+clone_repo pooltogether      v4-core                   pooltogether-v4-core
+clone_repo smartcontractkit  chainlink
+clone_repo sushiswap         trident
+clone_repo Uniswap           v2-core                   uniswap-v2-core
+clone_repo Uniswap           v3-core                   uniswap-v3-core
+clone_repo wighawag          bleeps
+clone_repo yieldprotocol     yield-liquidator-v2
+
+sync_branch brink-core                master
+sync_branch dappsys-monolithic        master
+sync_branch elf-contracts             main
+sync_branch ens                       master
+sync_branch ens-contracts             master
+sync_branch euler-contracts           master
+sync_branch gp-v2-contracts           main
+sync_branch mock-contract             master
+sync_branch safe-contracts            main
+sync_branch util-contracts            main
+sync_branch colonyNetwork             develop
+sync_branch perpetual-pools-contracts develop
+sync_branch openzeppelin-contracts    master
+sync_branch prb-math                  main
+sync_branch pooltogether-v4-core      master
+sync_branch chainlink                 develop
+sync_branch trident                   master
+sync_branch uniswap-v2-core           master
+sync_branch uniswap-v3-core           main
+sync_branch bleeps                    main
+sync_branch yield-liquidator-v2       master

From 6d14f5059e6a08ffc493784f816f9899877f4619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 9 May 2022 14:50:30 +0200
Subject: [PATCH 0573/1748] fixup! Script for keeping main branches of external
 repos in sync with upstream

---
 scripts/externalTests/update_external_repos.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/scripts/externalTests/update_external_repos.sh b/scripts/externalTests/update_external_repos.sh
index 7d6ba949b8..2270691ec8 100755
--- a/scripts/externalTests/update_external_repos.sh
+++ b/scripts/externalTests/update_external_repos.sh
@@ -66,12 +66,14 @@ function sync_branch
     echo "${fork_name}: syncing branch ${branch}..."
     pushd "$fork_name" > /dev/null
     git fetch upstream "$branch" --quiet
-    git checkout "$branch" --quiet
+    git checkout -B "$branch" --track "upstream/$branch" --quiet
     git merge "upstream/${branch}" --ff-only --quiet
     git push origin "$branch"
     popd > /dev/null
 }
 
+mkdir -p "$target_dir"
+
 echo "Entering ${target_dir}"
 cd "$target_dir"
 
@@ -83,13 +85,13 @@ clone_repo ensdomains        ens-contracts
 clone_repo euler-xyz         euler-contracts
 clone_repo gnosis            gp-v2-contracts
 clone_repo gnosis            mock-contract
-clone_repo gnosis            safe-contracts
 clone_repo gnosis            util-contracts
 clone_repo JoinColony        colonyNetwork
 clone_repo mycelium-ethereum perpetual-pools-contracts
 clone_repo OpenZeppelin      openzeppelin-contracts
 clone_repo paulrberg         prb-math
 clone_repo pooltogether      v4-core                   pooltogether-v4-core
+clone_repo safe-global       safe-contracts
 clone_repo smartcontractkit  chainlink
 clone_repo sushiswap         trident
 clone_repo Uniswap           v2-core                   uniswap-v2-core
@@ -105,13 +107,13 @@ sync_branch ens-contracts             master
 sync_branch euler-contracts           master
 sync_branch gp-v2-contracts           main
 sync_branch mock-contract             master
-sync_branch safe-contracts            main
 sync_branch util-contracts            main
 sync_branch colonyNetwork             develop
 sync_branch perpetual-pools-contracts develop
 sync_branch openzeppelin-contracts    master
 sync_branch prb-math                  main
 sync_branch pooltogether-v4-core      master
+sync_branch safe-contracts            main
 sync_branch chainlink                 develop
 sync_branch trident                   master
 sync_branch uniswap-v2-core           master

From 893122eb89dc748cd6875c6b58fd82b038f18cfb Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 27 Apr 2022 15:22:26 +0200
Subject: [PATCH 0574/1748] lsp.py: Support subdirectories

---
 test/libsolidity/lsp/didOpen_with_import.sol  |   2 +-
 .../lsp/{ => goto}/goto_definition.sol        |   0
 .../{ => goto}/goto_definition_imports.sol    |   0
 test/libsolidity/lsp/{ => goto}/lib.sol       |   0
 .../lsp/{ => goto}/publish_diagnostics_1.sol  |   0
 .../lsp/{ => goto}/publish_diagnostics_2.sol  |   0
 test/lsp.py                                   | 219 ++++++++++--------
 7 files changed, 128 insertions(+), 93 deletions(-)
 rename test/libsolidity/lsp/{ => goto}/goto_definition.sol (100%)
 rename test/libsolidity/lsp/{ => goto}/goto_definition_imports.sol (100%)
 rename test/libsolidity/lsp/{ => goto}/lib.sol (100%)
 rename test/libsolidity/lsp/{ => goto}/publish_diagnostics_1.sol (100%)
 rename test/libsolidity/lsp/{ => goto}/publish_diagnostics_2.sol (100%)

diff --git a/test/libsolidity/lsp/didOpen_with_import.sol b/test/libsolidity/lsp/didOpen_with_import.sol
index a335df759c..93880e2cb8 100644
--- a/test/libsolidity/lsp/didOpen_with_import.sol
+++ b/test/libsolidity/lsp/didOpen_with_import.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.0;
 
-import './lib.sol';
+import './goto/lib.sol';
 
 contract C
 {
diff --git a/test/libsolidity/lsp/goto_definition.sol b/test/libsolidity/lsp/goto/goto_definition.sol
similarity index 100%
rename from test/libsolidity/lsp/goto_definition.sol
rename to test/libsolidity/lsp/goto/goto_definition.sol
diff --git a/test/libsolidity/lsp/goto_definition_imports.sol b/test/libsolidity/lsp/goto/goto_definition_imports.sol
similarity index 100%
rename from test/libsolidity/lsp/goto_definition_imports.sol
rename to test/libsolidity/lsp/goto/goto_definition_imports.sol
diff --git a/test/libsolidity/lsp/lib.sol b/test/libsolidity/lsp/goto/lib.sol
similarity index 100%
rename from test/libsolidity/lsp/lib.sol
rename to test/libsolidity/lsp/goto/lib.sol
diff --git a/test/libsolidity/lsp/publish_diagnostics_1.sol b/test/libsolidity/lsp/goto/publish_diagnostics_1.sol
similarity index 100%
rename from test/libsolidity/lsp/publish_diagnostics_1.sol
rename to test/libsolidity/lsp/goto/publish_diagnostics_1.sol
diff --git a/test/libsolidity/lsp/publish_diagnostics_2.sol b/test/libsolidity/lsp/goto/publish_diagnostics_2.sol
similarity index 100%
rename from test/libsolidity/lsp/publish_diagnostics_2.sol
rename to test/libsolidity/lsp/goto/publish_diagnostics_2.sol
diff --git a/test/lsp.py b/test/lsp.py
index c14fc6a4cb..9a4335d73f 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -82,6 +82,16 @@ def getCharFromStdin():
     re.compile(R"\^(?P<delimiter>[()]{1,2}) (?P<tag>@\w+)$")
 )
 
+def split_path(path):
+    """
+    Return the test name and the subdir path of the given path.
+    """
+    sub_dir_separator = path.find("/")
+
+    if sub_dir_separator == -1:
+        return (path, None)
+
+    return (path[sub_dir_separator+1:], path[:sub_dir_separator])
 
 def count_index(lines, start=0):
     """
@@ -419,11 +429,11 @@ def parseRequestAndResponse(self):
 
         # Parse request header
         requestResult = TEST_REGEXES.sendRequest.match(self.current_line())
-        if requestResult is not None:
-            ret["method"] = requestResult.group("method")
-            ret["request"] = "{\n"
-        else:
-            raise TestParserException(ret, "Method for request not found")
+        if requestResult is None:
+            raise TestParserException(ret, "Method for request not found on line " + self.current_line())
+
+        ret["method"] = requestResult.group("method")
+        ret["request"] = "{\n"
 
         self.next_line()
 
@@ -505,13 +515,14 @@ class TestResult(Enum):
         SuccessOrIgnored = auto()
         Reparse = auto()
 
-    def __init__(self, test_name, solc, suite):
+    def __init__(self, test_name, sub_dir, solc, suite):
         self.test_name = test_name
+        self.sub_dir = sub_dir
         self.suite = suite
         self.solc = solc
         self.open_tests = []
-        self.content = self.suite.get_test_file_contents(self.test_name)
-        self.markers = self.suite.get_file_tags(self.test_name)
+        self.content = self.suite.get_test_file_contents(self.test_name, self.sub_dir)
+        self.markers = self.suite.get_file_tags(self.test_name, self.sub_dir)
         self.parsed_testcases = None
         self.expected_diagnostics = None
 
@@ -533,7 +544,7 @@ def test_diagnostics(self):
                 tests[self.test_name] = []
 
             published_diagnostics = \
-                self.suite.open_file_and_wait_for_diagnostics(self.solc, self.test_name)
+                self.suite.open_file_and_wait_for_diagnostics(self.solc, self.test_name, self.sub_dir)
 
             for diagnostics in published_diagnostics:
                 if not diagnostics["uri"].startswith(self.suite.project_root_uri + "/"):
@@ -548,7 +559,8 @@ def test_diagnostics(self):
                 description="Amount of reports does not match!")
 
             for diagnostics in published_diagnostics:
-                testname = diagnostics["uri"].replace(self.suite.project_root_uri + "/", "")[:-len(".sol")]
+                testname_and_subdir = diagnostics["uri"].replace(self.suite.project_root_uri + "/", "")[:-len(".sol")]
+                testname, sub_dir = split_path(testname_and_subdir)
 
                 expected_diagnostics = tests[testname]
                 self.suite.expect_equal(
@@ -556,7 +568,7 @@ def test_diagnostics(self):
                     len(expected_diagnostics),
                     description="Unexpected amount of diagnostics"
                 )
-                markers = self.suite.get_file_tags(testname)
+                markers = self.suite.get_file_tags(testname, sub_dir)
                 for actual_diagnostic in diagnostics["diagnostics"]:
                     expected_diagnostic = next((diagnostic for diagnostic in
                         expected_diagnostics if actual_diagnostic['range'] ==
@@ -579,10 +591,12 @@ def test_diagnostics(self):
             raise
 
     def close_all_open_files(self):
-        for test in self.open_tests:
+        for testpath in self.open_tests:
+            test, sub_dir = split_path(testpath)
+
             self.solc.send_message(
                 'textDocument/didClose',
-                { 'textDocument': { 'uri': self.suite.get_test_file_uri(test) }}
+                { 'textDocument': { 'uri': self.suite.get_test_file_uri(test, sub_dir) }}
             )
             self.suite.wait_for_diagnostics(self.solc)
 
@@ -612,13 +626,13 @@ def test_methods(self) -> bool:
             self.close_all_open_files()
 
     def user_interaction_failed_method_test(self, testcase, actual, expected):
-        actual_pretty = self.suite.replace_ranges_with_tags(actual)
+        actual_pretty = self.suite.replace_ranges_with_tags(actual, self.sub_dir)
 
         if expected is None:
             print("Failed to parse expected response, received:\n" + actual)
         else:
             print("Expected:\n" + \
-                self.suite.replace_ranges_with_tags(expected) + \
+                self.suite.replace_ranges_with_tags(expected, self.sub_dir) + \
                 "\nbut got:\n" + actual_pretty
             )
 
@@ -631,10 +645,16 @@ def user_interaction_failed_method_test(self, testcase, actual, expected):
             if user_response == "u":
                 actual = actual["result"]
                 self.content = self.content[:testcase.responseBegin] + \
-                    prepend_comments("<- " + self.suite.replace_ranges_with_tags(actual)) + \
+                    prepend_comments(
+                        "<- " + \
+                        self.suite.replace_ranges_with_tags(actual, self.sub_dir)) + \
                     self.content[testcase.responseEnd:]
 
-                with open(self.suite.get_test_file_path(self.test_name), mode="w", encoding="utf-8", newline='') as f:
+                with open(self.suite.get_test_file_path(\
+                    self.test_name, self.sub_dir), \
+                    mode="w", \
+                    encoding="utf-8", \
+                    newline='') as f:
                     f.write(self.content)
                 return self.TestResult.Reparse
             if user_response == "r":
@@ -650,12 +670,13 @@ def run_testcase(self, testcase: TestParser.RequestAndResponse):
         requestBodyJson = self.parse_json_with_tags(testcase.request, self.markers)
         # add textDocument/uri if missing
         if 'textDocument' not in requestBodyJson:
-            requestBodyJson['textDocument'] = { 'uri': self.suite.get_test_file_uri(self.test_name) }
+            requestBodyJson['textDocument'] = { 'uri': self.suite.get_test_file_uri(self.test_name, self.sub_dir) }
         actualResponseJson = self.solc.call_method(testcase.method, requestBodyJson)
 
         # simplify response
         for result in actualResponseJson["result"]:
-            result["uri"] = result["uri"].replace(self.suite.project_root_uri + "/", "")
+            if "uri" in result:
+                result["uri"] = result["uri"].replace(self.suite.project_root_uri + "/" + self.sub_dir + "/", "")
         if "jsonrpc" in actualResponseJson:
             actualResponseJson.pop("jsonrpc")
 
@@ -692,11 +713,14 @@ def replace_tag(data, markers):
                     replace_tag(el, markers)
                 return data
 
+            if not isinstance(data, dict):
+                return data
+
             # Check if we need markers from a specific file
             # Needs to be done before the loop or it might be called only after
             # we found "range" or "position"
             if "uri" in data:
-                markers = self.suite.get_file_tags(data["uri"][:-len(".sol")])
+                markers = self.suite.get_file_tags(data["uri"][:-len(".sol")], self.sub_dir)
 
             for key, val in data.items():
                 if key == "range":
@@ -809,19 +833,21 @@ def setup_lsp(self, lsp: JsonRpcProcess, expose_project_root=True):
         lsp.send_message("$/setTrace", { 'value': 'messages' })
 
     # {{{ helpers
-    def get_test_file_path(self, test_case_name):
+    def get_test_file_path(self, test_case_name, sub_dir=None):
+        if sub_dir:
+            return f"{self.project_root_dir}/{sub_dir}/{test_case_name}.sol"
         return f"{self.project_root_dir}/{test_case_name}.sol"
 
-    def get_test_file_uri(self, test_case_name):
-        return PurePath(self.get_test_file_path(test_case_name)).as_uri()
+    def get_test_file_uri(self, test_case_name, sub_dir=None):
+        return PurePath(self.get_test_file_path(test_case_name, sub_dir)).as_uri()
 
-    def get_test_file_contents(self, test_case_name):
+    def get_test_file_contents(self, test_case_name, sub_dir=None):
         """
         Reads the file contents from disc for a given test case.
         The `test_case_name` will be the basename of the file
-        in the test path (test/libsolidity/lsp).
+        in the test path (test/libsolidity/lsp/{sub_dir}).
         """
-        with open(self.get_test_file_path(test_case_name), mode="r", encoding="utf-8", newline='') as f:
+        with open(self.get_test_file_path(test_case_name, sub_dir), mode="r", encoding="utf-8", newline='') as f:
             return f.read().replace("\r\n", "\n")
 
     def require_params_for_method(self, method_name: str, message: dict) -> Any:
@@ -863,13 +889,13 @@ def wait_for_diagnostics(self, solc: JsonRpcProcess) -> List[dict]:
 
         return sorted(reports, key=lambda x: x['uri'])
 
-    def fetch_and_format_diagnostics(self, solc: JsonRpcProcess, test):
+    def fetch_and_format_diagnostics(self, solc: JsonRpcProcess, test, sub_dir=None):
         expectations = ""
 
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, test)
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, test, sub_dir)
 
         for diagnostics in published_diagnostics:
-            testname = diagnostics["uri"].replace(self.project_root_uri + "/", "")[:-len(".sol")]
+            testname = diagnostics["uri"].replace(f"{self.project_root_uri}/{sub_dir}/", "")[:-len(".sol")]
 
             # Skip empty diagnostics within the same file
             if len(diagnostics["diagnostics"]) == 0 and testname == test:
@@ -878,7 +904,7 @@ def fetch_and_format_diagnostics(self, solc: JsonRpcProcess, test):
             expectations += f"// {testname}:"
 
             for diagnostic in diagnostics["diagnostics"]:
-                tag = self.find_tag_with_range(testname, diagnostic['range'])
+                tag = self.find_tag_with_range(testname, sub_dir, diagnostic['range'])
 
                 if tag is None:
                     raise Exception(f"No tag found for diagnostic range {diagnostic['range']}")
@@ -892,6 +918,7 @@ def update_diagnostics_in_file(
         self,
         solc: JsonRpcProcess,
         test,
+        sub_dir,
         content,
         current_diagnostics: TestParser.Diagnostics
     ):
@@ -902,10 +929,10 @@ def update_diagnostics_in_file(
 
         content = content[:current_diagnostics.start] + \
             test_header + \
-            self.fetch_and_format_diagnostics(solc, test) + \
+            self.fetch_and_format_diagnostics(solc, test, sub_dir) + \
             content[current_diagnostics.end:]
 
-        with open(self.get_test_file_path(test), mode="w", encoding="utf-8", newline='') as f:
+        with open(self.get_test_file_path(test, sub_dir), mode="w", encoding="utf-8", newline='') as f:
             f.write(content)
 
         return content
@@ -914,6 +941,7 @@ def open_file_and_wait_for_diagnostics(
         self,
         solc_process: JsonRpcProcess,
         test_case_name: str,
+        sub_dir=None
     ) -> List[Any]:
         """
         Opens file for given test case and waits for diagnostics to be published.
@@ -923,10 +951,10 @@ def open_file_and_wait_for_diagnostics(
             {
                 'textDocument':
                 {
-                    'uri': self.get_test_file_uri(test_case_name),
+                    'uri': self.get_test_file_uri(test_case_name, sub_dir),
                     'languageId': 'Solidity',
                     'version': 1,
-                    'text': self.get_test_file_contents(test_case_name)
+                    'text': self.get_test_file_contents(test_case_name, sub_dir)
                 }
             }
         )
@@ -1041,12 +1069,12 @@ def expect_goto_definition_location(
         self.expect_location(response['result'][0], expected_uri, expected_lineNo, expected_startEndColumns)
 
 
-    def find_tag_with_range(self, test, target_range):
+    def find_tag_with_range(self, test, sub_dir, target_range):
         """
         Find and return the tag that represents the requested range otherwise
         return None.
         """
-        markers = self.get_file_tags(test)
+        markers = self.get_file_tags(test, sub_dir)
 
         for tag, tag_range in markers.items():
             if tag_range == target_range:
@@ -1054,7 +1082,7 @@ def find_tag_with_range(self, test, target_range):
 
         return None
 
-    def replace_ranges_with_tags(self, content):
+    def replace_ranges_with_tags(self, content, sub_dir):
         """
         Replace matching ranges with "@<tagname>".
         """
@@ -1070,7 +1098,7 @@ def recursive_iter(obj):
 
         for item in recursive_iter(content):
             if "uri" in item and "range" in item:
-                markers = self.get_file_tags(item["uri"][:-len(".sol")])
+                markers = self.get_file_tags(item["uri"][:-len(".sol")], sub_dir)
                 for tag, tagRange in markers.items():
                     if tagRange == item["range"]:
                         item["range"] = str(tag)
@@ -1085,6 +1113,7 @@ def user_interaction_failed_diagnostics(
         self,
         solc: JsonRpcProcess,
         test,
+        sub_dir,
         content,
         current_diagnostics: TestParser.Diagnostics
     ):
@@ -1098,19 +1127,19 @@ def user_interaction_failed_diagnostics(
             if user_response == "u":
                 while True:
                     try:
-                        self.update_diagnostics_in_file(solc, test, content, current_diagnostics)
+                        self.update_diagnostics_in_file(solc, test, sub_dir, content, current_diagnostics)
                         return False
                     # pragma pylint: disable=broad-except
                     except Exception as e:
                         print(e)
-                        if self.user_interaction_failed_autoupdate(test):
+                        if self.user_interaction_failed_autoupdate(test, sub_dir):
                             return True
             elif user_response == 's':
                 return True
             elif user_response == 'r':
                 return False
 
-    def user_interaction_failed_autoupdate(self, test):
+    def user_interaction_failed_autoupdate(self, test, sub_dir):
         print("(e)dit/(r)etry/(s)kip file?")
         user_response = getCharFromStdin()
         if user_response == "r":
@@ -1121,7 +1150,7 @@ def user_interaction_failed_autoupdate(self, test):
         if user_response == "e":
             editor = os.environ.get('VISUAL', os.environ.get('EDITOR', 'vi'))
             subprocess.run(
-                f'{editor} {self.get_test_file_path(test)}',
+                f'{editor} {self.get_test_file_path(test, sub_dir)}',
                 shell=True,
                 check=True
             )
@@ -1170,15 +1199,15 @@ def test_textDocument_didOpen_with_relative_import(self, solc: JsonRpcProcess) -
         self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
 
-        # imported file (./lib.sol):
+        # imported file (goto/lib.sol):
         report = published_diagnostics[1]
-        self.expect_equal(report['uri'], self.get_test_file_uri('lib'), "Correct file URI")
+        self.expect_equal(report['uri'], self.get_test_file_uri('lib', 'goto'), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
-        marker = self.get_file_tags("lib")["@diagnostics"]
+        marker = self.get_file_tags("lib", "goto")["@diagnostics"]
         self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
 
     @functools.lru_cache() # pragma pylint: disable=lru-cache-decorating-method
-    def get_file_tags(self, test_name: str, verbose=False):
+    def get_file_tags(self, test_name: str, sub_dir=None, verbose=False):
         """
         Finds all tags (e.g. @tagname) in the given test and returns them as a
         dictionary having the following structure: {
@@ -1188,7 +1217,7 @@ def get_file_tags(self, test_name: str, verbose=False):
             }
         }
         """
-        content = self.get_test_file_contents(test_name)
+        content = self.get_test_file_contents(test_name, sub_dir)
 
         markers = {}
 
@@ -1223,14 +1252,14 @@ def get_file_tags(self, test_name: str, verbose=False):
     def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
         # Reusing another test but now change some file that generates an error in the other.
         self.test_textDocument_didOpen_with_relative_import(solc)
-        marker = self.get_file_tags("lib")["@addFunction"]
-        self.open_file_and_wait_for_diagnostics(solc, 'lib')
+        marker = self.get_file_tags("lib", "goto")["@addFunction"]
+        self.open_file_and_wait_for_diagnostics(solc, 'lib', "goto")
         solc.send_message(
             'textDocument/didChange',
             {
                 'textDocument':
                 {
-                    'uri': self.get_test_file_uri('lib')
+                    'uri': self.get_test_file_uri('lib', 'goto')
                 },
                 'contentChanges':
                 [
@@ -1254,7 +1283,7 @@ def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
 
         # The modified file retains the same diagnostics.
         report = published_diagnostics[1]
-        self.expect_equal(report['uri'], self.get_test_file_uri('lib'))
+        self.expect_equal(report['uri'], self.get_test_file_uri('lib', 'goto'))
         self.expect_equal(len(report['diagnostics']), 0)
         # The warning went away because the compiler aborts further processing after the error.
 
@@ -1276,58 +1305,64 @@ def verify_didOpen_with_import_diagnostics(
         self.expect_equal(report['uri'], self.get_test_file_uri(main_file_name), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 0, "one diagnostic")
 
-        # imported file (./lib.sol):
+        # imported file (./goto/lib.sol):
         report = published_diagnostics[1]
-        self.expect_equal(report['uri'], self.get_test_file_uri('lib'), "Correct file URI")
+        self.expect_equal(report['uri'], self.get_test_file_uri('lib', 'goto'), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
 
-        markers = self.get_file_tags('lib')
+        markers = self.get_file_tags('lib', 'goto')
         marker = markers["@diagnostics"]
         self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
 
     def test_generic(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
 
-        STATIC_TESTS = ['didChange_template', 'didOpen_with_import', 'publish_diagnostics_3']
-
-        tests = filter(
-            lambda x: x not in STATIC_TESTS,
-            map(lambda x: x[:-len(".sol")], os.listdir(self.project_root_dir))
+        sub_dirs = filter(
+            lambda filepath: filepath.is_dir(),
+            os.scandir(self.project_root_dir)
         )
 
-        for test in tests:
-            try_again = True
-            print(f"Running test {test}")
+        for sub_dir in map(lambda filepath: filepath.name, sub_dirs):
+            tests = map(
+                lambda filename: filename[:-len(".sol")],
+                os.listdir(f"{self.project_root_dir}/{sub_dir}")
+            )
 
-            while try_again:
-                runner = FileTestRunner(test, solc, self)
+            print(f"Running tests in subdirectory '{sub_dir}'...")
+            for test in tests:
+                try_again = True
+                print(f"\t{test}")
 
-                try:
-                    runner.test_diagnostics()
-                    try_again = not runner.test_methods()
-                except ExpectationFailed as e:
-                    print(e)
-
-                    if e.part == e.Part.Diagnostics:
-                        try_again = not self.user_interaction_failed_diagnostics(
-                            solc,
-                            test,
-                            runner.content,
-                            runner.expected_diagnostics
-                        )
-                    else:
-                        raise
+                while try_again:
+                    runner = FileTestRunner(test, sub_dir, solc, self)
+
+                    try:
+                        runner.test_diagnostics()
+                        try_again = not runner.test_methods()
+                    except ExpectationFailed as e:
+                        print(e)
+
+                        if e.part == e.Part.Diagnostics:
+                            try_again = not self.user_interaction_failed_diagnostics(
+                                solc,
+                                test,
+                                sub_dir,
+                                runner.content,
+                                runner.expected_diagnostics
+                            )
+                        else:
+                            raise
 
     def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
         TEST_NAME = 'publish_diagnostics_1'
-        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME)
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, TEST_NAME, "goto")
         self.expect_equal(len(published_diagnostics), 1, "One published_diagnostics message")
         report = published_diagnostics[0]
-        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
+        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME, "goto"), "Correct file URI")
         diagnostics = report['diagnostics']
         self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
-        markers = self.get_file_tags(TEST_NAME)
+        markers = self.get_file_tags(TEST_NAME, "goto")
         self.expect_diagnostic(diagnostics[0], code=6321, marker=markers["@unusedReturnVariable"])
         self.expect_diagnostic(diagnostics[1], code=2072, marker=markers["@unusedVariable"])
         self.expect_diagnostic(diagnostics[2], code=2072, marker=markers["@unusedContractVariable"])
@@ -1336,7 +1371,7 @@ def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess)
             'textDocument/didChange',
             {
                 'textDocument': {
-                    'uri': self.get_test_file_uri(TEST_NAME)
+                    'uri': self.get_test_file_uri(TEST_NAME, "goto")
                 },
                 'contentChanges': [
                     {
@@ -1349,7 +1384,7 @@ def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess)
         published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), 1)
         report = published_diagnostics[0]
-        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME), "Correct file URI")
+        self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME, "goto"), "Correct file URI")
         diagnostics = report['diagnostics']
         self.expect_equal(len(diagnostics), 2)
         self.expect_diagnostic(diagnostics[0], code=6321, marker=markers["@unusedReturnVariable"])
@@ -1358,9 +1393,9 @@ def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess)
     def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess) -> None:
         # Reuse this test to prepare and ensure it is as expected
         self.test_textDocument_didOpen_with_relative_import(solc)
-        self.open_file_and_wait_for_diagnostics(solc, 'lib')
+        self.open_file_and_wait_for_diagnostics(solc, 'lib', 'goto')
 
-        marker = self.get_file_tags('lib')["@diagnostics"]
+        marker = self.get_file_tags('lib', 'goto')["@diagnostics"]
 
         # lib.sol: Fix the unused variable message by removing it.
         solc.send_message(
@@ -1368,7 +1403,7 @@ def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess
             {
                 'textDocument':
                 {
-                    'uri': self.get_test_file_uri('lib')
+                    'uri': self.get_test_file_uri('lib', 'goto')
                 },
                 'contentChanges': # delete the in-body statement: `uint unused;`
                 [
@@ -1385,13 +1420,13 @@ def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess
         self.expect_equal(report1['uri'], self.get_test_file_uri('didOpen_with_import'), "Correct file URI")
         self.expect_equal(len(report1['diagnostics']), 0, "no diagnostics in didOpen_with_import.sol")
         report2 = published_diagnostics[1]
-        self.expect_equal(report2['uri'], self.get_test_file_uri('lib'), "Correct file URI")
+        self.expect_equal(report2['uri'], self.get_test_file_uri('lib', 'goto'), "Correct file URI")
         self.expect_equal(len(report2['diagnostics']), 0, "no diagnostics in lib.sol")
 
         # Now close the file and expect the warning to re-appear
         solc.send_message(
             'textDocument/didClose',
-            { 'textDocument': { 'uri': self.get_test_file_uri('lib') }}
+            { 'textDocument': { 'uri': self.get_test_file_uri('lib', 'goto') }}
         )
 
         published_diagnostics = self.wait_for_diagnostics(solc)
@@ -1483,14 +1518,14 @@ def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc
                 'text':
                     '// SPDX-License-Identifier: UNLICENSED\n'
                     'pragma solidity >=0.8.0;\n'
-                    'import "./lib.sol";\n'
+                    'import "./goto/lib.sol";\n'
             }
         })
         reports = self.wait_for_diagnostics(solc)
         self.expect_equal(len(reports), 2, '')
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
 
-        marker = self.get_file_tags("lib")["@diagnostics"]
+        marker = self.get_file_tags("lib", 'goto')["@diagnostics"]
 
         # unused variable in lib.sol
         self.expect_diagnostic(reports[1]['diagnostics'][0], code=2072, marker=marker)
@@ -1502,7 +1537,7 @@ def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc
         )
         reports = self.wait_for_diagnostics(solc)
         self.expect_equal(len(reports), 1, '')
-        self.expect_equal(reports[0]['uri'], f'{self.project_root_uri}/lib.sol', "")
+        self.expect_equal(reports[0]['uri'], f'{self.project_root_uri}/goto/lib.sol', "")
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
 
     def test_textDocument_didChange_at_eol(self, solc: JsonRpcProcess) -> None:

From 0e0d1972f9522815f8d459d482574bafac5f66b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 10 May 2022 12:43:27 +0200
Subject: [PATCH 0575/1748] Disable non-deterministic counterexamples in some
 SMT tests

- The counterexamples sometimes do appear and the tests fail.
---
 .../smtCheckerTests/blockchain_state/balance_receive_4.sol       | 1 +
 test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
index d72da3efa2..cd6e1ef9ba 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
@@ -11,6 +11,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // SMTIgnoreOS: macos
 // ----
 // Warning 4984: (82-85): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol
index ced7e37c47..699d220973 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol
@@ -18,6 +18,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
 // Warning 6328: (407-457): CHC: Assertion violation happens here.
 // Info 1180: Contract invariant(s) for :C:\n(true || true || true)\nReentrancy property(ies) for :C:\n(((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true)\n(true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(1))) == 1)\n<errorCode> = 2 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(2))) == 2)\n<errorCode> = 3 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 0xff)\n<errorCode> = 4 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 1)\n

From 571d94b0518a87f13907840062cedf1b60832e3b Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Thu, 28 Apr 2022 10:20:42 +0200
Subject: [PATCH 0576/1748] Update docker z3 version

---
 scripts/docker/buildpack-deps/Dockerfile.emscripten           | 4 ++--
 .../docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004           | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 0d1d1a28e8..81f9881d3e 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -33,12 +33,12 @@
 # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
 # dependencies automatically.
 FROM emscripten/emsdk:2.0.33 AS base
-LABEL version="9"
+LABEL version="10"
 
 ADD emscripten.jam /usr/src
 RUN set -ex; \
 	cd /usr/src; \
-	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.14 --depth 1 ; \
+	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.16 --depth 1 ; \
 	cd z3; \
 	mkdir build; \
 	cd build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index bbc554e0f9..d85700f338 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="16"
+LABEL version="17"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -61,7 +61,7 @@ RUN set -ex; \
 
 # Z3
 RUN set -ex; \
-    git clone --depth 1 -b z3-4.8.14 https://github.com/Z3Prover/z3.git \
+    git clone --depth 1 -b z3-4.8.16 https://github.com/Z3Prover/z3.git \
     /usr/src/z3; \
     cd /usr/src/z3; \
     mkdir build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 6a047aa275..4ef94d30a9 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="11"
+LABEL version="12"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
index 853969ecdd..4a0fadd255 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="11"
+LABEL version="12"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

From c64fb7a2581522fd0077e267ee41aa680c443378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 10 May 2022 13:18:03 +0200
Subject: [PATCH 0577/1748] docker_upgrade.sh: Workaround for git refusing to
 work with a repo in attached volume

---
 scripts/ci/docker_upgrade.sh | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/docker_upgrade.sh b/scripts/ci/docker_upgrade.sh
index a9c7acaf28..a6b59e157e 100755
--- a/scripts/ci/docker_upgrade.sh
+++ b/scripts/ci/docker_upgrade.sh
@@ -51,7 +51,17 @@ docker build "scripts/docker/${IMAGE_NAME}" --file "scripts/docker/${IMAGE_NAME}
 
 echo "-- test_docker @ '${PWD}'"
 
-docker run --rm --volume "${PWD}:/root/project" "${IMAGE_NAME}" "/root/project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh"
+# NOTE: Since /root/project/ is a dir from outside the container and the owner of the files is different,
+# git show in the script refuses to work. It must be marked as safe to use first.
+# See https://github.blog/2022-04-12-git-security-vulnerability-announced/
+docker run \
+  --rm \
+  --volume "${PWD}:/root/project" \
+  "${IMAGE_NAME}" \
+  bash -c "
+    git config --global --add safe.directory /root/project &&
+    /root/project/scripts/ci/${IMAGE_NAME}_test_${IMAGE_VARIANT}.sh
+  "
 
 echo "-- push_docker"
 

From ece547204a8e331c324c9e127f457a383f0ebe0e Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 11 May 2022 13:40:02 +0200
Subject: [PATCH 0578/1748] Reorder member variables of unique error reporter
 to ensure proper initialization order.

---
 liblangutil/UniqueErrorReporter.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/liblangutil/UniqueErrorReporter.h b/liblangutil/UniqueErrorReporter.h
index fd91b87dc6..ebcb8d9762 100644
--- a/liblangutil/UniqueErrorReporter.h
+++ b/liblangutil/UniqueErrorReporter.h
@@ -96,8 +96,8 @@ class UniqueErrorReporter
 	void clear() { m_errorReporter.clear(); }
 
 private:
-	ErrorReporter m_errorReporter;
 	ErrorList m_uniqueErrors;
+	ErrorReporter m_errorReporter;
 	std::map<std::pair<ErrorId, SourceLocation>, std::string> m_seenErrors;
 };
 

From cbf9a4f1ed6457d30a59420f136a0da6bae371e5 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 11 May 2022 13:58:06 +0200
Subject: [PATCH 0579/1748] Add bogus return to switch.

---
 test/Metadata.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/Metadata.cpp b/test/Metadata.cpp
index 687b9d73e6..3b27e31012 100644
--- a/test/Metadata.cpp
+++ b/test/Metadata.cpp
@@ -94,7 +94,10 @@ class TinyCBORParser
 				else if (value == 21)
 					return "true";
 				else
+				{
 					assertThrow(false, CBORException, "Unsupported simple value (not a boolean).");
+					return ""; // unreachable, but prevents compiler warning.
+				}
 			}
 			default:
 				assertThrow(false, CBORException, "Unsupported value type.");

From cf311e57806681eeb924248f7de80ebd7fcd7c69 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 11 May 2022 16:09:39 +0200
Subject: [PATCH 0580/1748] Disable maybe-unitialized warning for boost headers
 using a pragma.

---
 libsolutil/Numeric.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/libsolutil/Numeric.h b/libsolutil/Numeric.h
index 557f7e2bc4..384589764d 100644
--- a/libsolutil/Numeric.h
+++ b/libsolutil/Numeric.h
@@ -29,7 +29,15 @@
 #error "Unsupported Boost version. At least 1.65 required."
 #endif
 
+// TODO: do this only conditionally as soon as a boost version with gcc 12 support is released.
+#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 12)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#endif
 #include <boost/multiprecision/cpp_int.hpp>
+#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 12)
+#pragma GCC diagnostic pop
+#endif
 
 #include <limits>
 

From d92ed3fd294e3b0cc469b3b536cd10cf3873ce8d Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 7 Apr 2022 13:37:48 +0200
Subject: [PATCH 0581/1748] Test case for the buggy behaviour.

---
 .../calldata_nested_array_reencode.sol        | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol

diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
new file mode 100644
index 0000000000..d7ff1999b1
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
@@ -0,0 +1,23 @@
+pragma abicoder v2;
+
+contract C {
+	function h(uint[][] calldata a) public {
+		abi.encode(a);
+	}
+	struct S { uint[] x; }
+	function f(S calldata a) public {
+		abi.encode(a);
+	}
+}
+// ====
+// compileViaYul: also
+// revertStrings: debug
+// ----
+// h(uint256[][]): 0x20, 1, 0x20, 0 ->
+// h(uint256[][]): 0x20, 1, 0x20, 1 ->
+// h(uint256[][]): 0x20, 1, 0x20, 2 ->
+// h(uint256[][]): 0x20, 1, 0x20, 3 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
+// f((uint256[])): 0x20, 0x20, 0 ->
+// f((uint256[])): 0x20, 0x20, 1 ->
+// f((uint256[])): 0x20, 0x20, 2 ->
+// f((uint256[])): 0x20, 0x20, 3 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"

From d3a837b340876a2fe09d9c741330dd676975c9bd Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 7 Apr 2022 13:38:22 +0200
Subject: [PATCH 0582/1748] Bugfix.

---
 libsolidity/codegen/ABIFunctions.cpp                      | 2 +-
 .../abiEncoderV2/calldata_nested_array_reencode.sol       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libsolidity/codegen/ABIFunctions.cpp b/libsolidity/codegen/ABIFunctions.cpp
index 65f9e1723a..d24dfc0788 100644
--- a/libsolidity/codegen/ABIFunctions.cpp
+++ b/libsolidity/codegen/ABIFunctions.cpp
@@ -1454,7 +1454,7 @@ string ABIFunctions::calldataAccessFunction(Type const& _type)
 					length := calldataload(value)
 					value := add(value, 0x20)
 					if gt(length, 0xffffffffffffffff) { <revertStringLength>() }
-					if sgt(base_ref, sub(calldatasize(), mul(length, <calldataStride>))) { <revertStringStride>() }
+					if sgt(value, sub(calldatasize(), mul(length, <calldataStride>))) { <revertStringStride>() }
 				)")
 				("calldataStride", toCompactHexWithPrefix(arrayType->calldataStride()))
 				// TODO add test
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
index d7ff1999b1..042ad586e4 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
@@ -14,10 +14,10 @@ contract C {
 // revertStrings: debug
 // ----
 // h(uint256[][]): 0x20, 1, 0x20, 0 ->
-// h(uint256[][]): 0x20, 1, 0x20, 1 ->
-// h(uint256[][]): 0x20, 1, 0x20, 2 ->
+// h(uint256[][]): 0x20, 1, 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
+// h(uint256[][]): 0x20, 1, 0x20, 2 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
 // h(uint256[][]): 0x20, 1, 0x20, 3 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
 // f((uint256[])): 0x20, 0x20, 0 ->
-// f((uint256[])): 0x20, 0x20, 1 ->
-// f((uint256[])): 0x20, 0x20, 2 ->
+// f((uint256[])): 0x20, 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
+// f((uint256[])): 0x20, 0x20, 2 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
 // f((uint256[])): 0x20, 0x20, 3 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"

From 75d08ea92431429d3df247475c8a70ff8815226e Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 10 May 2022 19:04:37 +0200
Subject: [PATCH 0583/1748] Check early if solvers are available.

---
 libsolidity/formal/BMC.cpp      | 37 +++++++++------------
 libsolidity/formal/CHC.cpp      | 59 +++++++++++++++++----------------
 libsolidity/formal/CHC.h        |  3 ++
 libsolidity/formal/SMTEncoder.h |  2 --
 4 files changed, 48 insertions(+), 53 deletions(-)

diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index bf3e5ea056..bf36187916 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -63,15 +63,14 @@ void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<Verificatio
 {
 	if (m_interface->solvers() == 0)
 	{
-		if (!m_noSolverWarning)
-		{
-			m_noSolverWarning = true;
-			m_errorReporter.warning(
-				7710_error,
-				SourceLocation(),
-				"BMC analysis was not possible since no SMT solver was found and enabled."
-			);
-		}
+		m_errorReporter.warning(
+			7710_error,
+			SourceLocation(),
+			"BMC analysis was not possible since no SMT solver was found and enabled."
+#ifdef HAVE_Z3_DLOPEN
+			" Install libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION) + " to enable Z3."
+#endif
+		);
 		return;
 	}
 
@@ -108,21 +107,15 @@ void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<Verificatio
 		m_interface->solvers() == 1 &&
 		m_settings.solvers.smtlib2
 	)
-	{
-		if (!m_noSolverWarning)
-		{
-			m_noSolverWarning = true;
-			m_errorReporter.warning(
-				8084_error,
-				SourceLocation(),
-				"BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available."
-				" None of the installed solvers was enabled."
+		m_errorReporter.warning(
+			8084_error,
+			SourceLocation(),
+			"BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available."
+			" None of the installed solvers was enabled."
 #ifdef HAVE_Z3_DLOPEN
-				" Install libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION) + " to enable Z3."
+			" Install libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION) + " to enable Z3."
 #endif
-			);
-		}
-	}
+		);
 }
 
 bool BMC::shouldInlineFunctionCall(
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 58deaad4ad..267ea92699 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -60,21 +60,15 @@ using namespace solidity::frontend::smt;
 CHC::CHC(
 	EncodingContext& _context,
 	UniqueErrorReporter& _errorReporter,
-	[[maybe_unused]] map<util::h256, string> const& _smtlib2Responses,
-	[[maybe_unused]] ReadCallback::Callback const& _smtCallback,
+	map<util::h256, string> const& _smtlib2Responses,
+	ReadCallback::Callback const& _smtCallback,
 	ModelCheckerSettings const& _settings,
 	CharStreamProvider const& _charStreamProvider
 ):
-	SMTEncoder(_context, _settings, _errorReporter, _charStreamProvider)
+	SMTEncoder(_context, _settings, _errorReporter, _charStreamProvider),
+	m_smtlib2Responses(_smtlib2Responses),
+	m_smtCallback(_smtCallback)
 {
-	bool usesZ3 = m_settings.solvers.z3;
-#ifdef HAVE_Z3
-	usesZ3 = usesZ3 && Z3Interface::available();
-#else
-	usesZ3 = false;
-#endif
-	if (!usesZ3 && m_settings.solvers.smtlib2)
-		m_interface = make_unique<CHCSmtLib2Interface>(_smtlib2Responses, _smtCallback, m_settings.timeout);
 }
 
 void CHC::analyze(SourceUnit const& _source)
@@ -82,17 +76,26 @@ void CHC::analyze(SourceUnit const& _source)
 	if (!shouldAnalyze(_source))
 		return;
 
-	if (!m_settings.solvers.z3 && !m_settings.solvers.smtlib2)
+	bool usesZ3 = m_settings.solvers.z3;
+#ifdef HAVE_Z3_DLOPEN
+	if (m_settings.solvers.z3 && !Z3Interface::available())
 	{
-		if (!m_noSolverWarning)
-		{
-			m_noSolverWarning = true;
-			m_errorReporter.warning(
-				7649_error,
-				SourceLocation(),
-				"CHC analysis was not possible since no Horn solver was enabled."
-			);
-		}
+		usesZ3 = false;
+		m_errorReporter.warning(
+			8158_error,
+			SourceLocation(),
+			"z3 was selected as a Horn solver for CHC analysis but libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION) + " was not found."
+		);
+	}
+#endif
+
+	if (!usesZ3 && !m_settings.solvers.smtlib2)
+	{
+		m_errorReporter.warning(
+			7649_error,
+			SourceLocation(),
+			"CHC analysis was not possible since no Horn solver was found and enabled."
+		);
 		return;
 	}
 
@@ -115,20 +118,13 @@ void CHC::analyze(SourceUnit const& _source)
 	// actually given and the queries were solved.
 	if (auto const* smtLibInterface = dynamic_cast<CHCSmtLib2Interface const*>(m_interface.get()))
 		ranSolver = smtLibInterface->unhandledQueries().empty();
-	if (!ranSolver && !m_noSolverWarning)
-	{
-		m_noSolverWarning = true;
+	if (!ranSolver)
 		m_errorReporter.warning(
 			3996_error,
 			SourceLocation(),
-#ifdef HAVE_Z3_DLOPEN
-			"CHC analysis was not possible since libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION) + " was not found."
-#else
 			"CHC analysis was not possible. No Horn solver was available."
 			" None of the installed solvers was enabled."
-#endif
 		);
-	}
 }
 
 vector<string> CHC::unhandledQueries() const
@@ -1012,6 +1008,11 @@ void CHC::resetSourceAnalysis()
 #endif
 	if (!usesZ3)
 	{
+		solAssert(m_settings.solvers.smtlib2);
+
+		if (!m_interface)
+			m_interface = make_unique<CHCSmtLib2Interface>(m_smtlib2Responses, m_smtCallback, m_settings.timeout);
+
 		auto smtlib2Interface = dynamic_cast<CHCSmtLib2Interface*>(m_interface.get());
 		solAssert(smtlib2Interface, "");
 		smtlib2Interface->reset();
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index 1c74aa650b..fd54db6c2c 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -421,6 +421,9 @@ class CHC: public SMTEncoder
 
 	/// CHC solver.
 	std::unique_ptr<smtutil::CHCSolverInterface> m_interface;
+
+	std::map<util::h256, std::string> const& m_smtlib2Responses;
+	ReadCallback::Callback const& m_smtCallback;
 };
 
 }
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 84a80461d6..888bd6a3db 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -426,8 +426,6 @@ class SMTEncoder: public ASTConstVisitor
 
 	smt::VariableUsage m_variableUsage;
 	bool m_arrayAssignmentHappened = false;
-	// True if the "No SMT solver available" warning was already created.
-	bool m_noSolverWarning = false;
 
 	/// Stores the instances of an Uninterpreted Function applied to arguments.
 	/// These may be direct application of UFs or Array index access.

From 93f9638a1b84fd97c62904816228b1c11573eb55 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 10 May 2022 19:05:14 +0200
Subject: [PATCH 0584/1748] Add error id to script

---
 scripts/error_codes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index f3d35cae41..84ba08bc0c 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -232,7 +232,7 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "3893", "3996", "4010", "4802",
         "5272", "5622", "7128", "7400",
         "7589", "7593", "7649", "7710",
-        "8065", "8084", "8140",
+        "8065", "8084", "8140", "8158",
         "8312", "8592", "9134", "9609",
     }
 

From cbaba6f9136555550ad23ae3c365451f71ef9e2b Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 10 May 2022 19:25:27 +0200
Subject: [PATCH 0585/1748] update tests

---
 .../standard_model_checker_solvers_none/output.json           | 4 ++--
 .../smtCheckerTests/imports/duplicated_errors_1.sol           | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/cmdlineTests/standard_model_checker_solvers_none/output.json b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
index b237fadce5..d5672007e1 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_none/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
@@ -1,5 +1,5 @@
-{"errors":[{"component":"general","errorCode":"7649","formattedMessage":"Warning: CHC analysis was not possible since no Horn solver was enabled.
+{"errors":[{"component":"general","errorCode":"7649","formattedMessage":"Warning: CHC analysis was not possible since no Horn solver was found and enabled.
 
-","message":"CHC analysis was not possible since no Horn solver was enabled.","severity":"warning","type":"Warning"},{"component":"general","errorCode":"7710","formattedMessage":"Warning: BMC analysis was not possible since no SMT solver was found and enabled.
+","message":"CHC analysis was not possible since no Horn solver was found and enabled.","severity":"warning","type":"Warning"},{"component":"general","errorCode":"7710","formattedMessage":"Warning: BMC analysis was not possible since no SMT solver was found and enabled.
 
 ","message":"BMC analysis was not possible since no SMT solver was found and enabled.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
diff --git a/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol b/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
index c8285a0bcc..a98ba962a7 100644
--- a/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
+++ b/test/libsolidity/smtCheckerTests/imports/duplicated_errors_1.sol
@@ -21,4 +21,6 @@ contract C is B {
 // Warning 7812: (b.sol:62-75): BMC: Assertion violation might happen here.
 // Warning 8084: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
 // Warning 6328: (c.sol:68-81): CHC: Assertion violation might happen here.
+// Warning 3996: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
 // Warning 7812: (c.sol:68-81): BMC: Assertion violation might happen here.
+// Warning 8084: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.

From 4c00815c536443e63c716dbcb8895d470991ab7a Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 11 May 2022 11:52:33 +0200
Subject: [PATCH 0586/1748] Changelog entry

---
 Changelog.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 27ae4e30a3..2e4bbccc44 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,9 +13,10 @@ Compiler Features:
 
 Bugfixes:
  * Type Checker: Properly check restrictions of ``using ... global`` in conjunction with libraries.
-* Assembly-Json: Fix assembly json export to store jump types of operations in `jumpType` field instead of `value`.
-* TypeChecker: Convert parameters of function type to how they would be called for ``abi.encodeCall``.
-* View Pure Checker: Mark ``returndatasize`` and ``returndatacopy`` as view to disallow them in inline assembly blocks in pure functions.
+ * Assembly-Json: Fix assembly json export to store jump types of operations in `jumpType` field instead of `value`.
+ * SMTChecker: Fix bug when z3 is selected but not available at runtime.
+ * TypeChecker: Convert parameters of function type to how they would be called for ``abi.encodeCall``.
+ * View Pure Checker: Mark ``returndatasize`` and ``returndatacopy`` as view to disallow them in inline assembly blocks in pure functions.
 
 
 

From 60b405aaa9a29acabd65abe16ea6d59afd84983c Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 10 May 2022 11:23:51 +0200
Subject: [PATCH 0587/1748] Support new z3 AST node

---
 libsmtutil/Z3Interface.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
index 3a5c75bf32..a0d50d225c 100644
--- a/libsmtutil/Z3Interface.cpp
+++ b/libsmtutil/Z3Interface.cpp
@@ -298,6 +298,7 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 		arguments.push_back(fromZ3Expr(_expr.arg(i)));
 
 	auto kind = _expr.decl().decl_kind();
+
 	if (_expr.is_ite())
 		return Expression::ite(arguments[0], arguments[1], arguments[2]);
 	else if (_expr.is_not())
@@ -371,7 +372,10 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 		return Expression("dt_accessor_" + _expr.decl().name().str(), arguments, sort);
 	else if (kind == Z3_OP_DT_IS)
 		return Expression("dt_is", {arguments.at(0)}, sort);
-	else if (kind == Z3_OP_UNINTERPRETED)
+	else if (
+		kind == Z3_OP_UNINTERPRETED ||
+		kind == Z3_OP_RECURSIVE
+	)
 		return Expression(_expr.decl().name().str(), arguments, fromZ3Sort(_expr.get_sort()));
 
 	smtAssert(false, "");

From 352a3c5f4bf70a87f6fd372af3732902e7ec7c22 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 7 Apr 2022 14:22:04 +0200
Subject: [PATCH 0588/1748] Bug list entry, changelog entry and tests.

---
 Changelog.md                                  |  4 ++
 docs/bugs.json                                | 10 ++++
 docs/bugs_by_version.json                     | 53 +++++++++++++++++--
 .../abiEncoderV2/calldata_array_short.sol     | 12 +++++
 .../calldata_array_short_no_revert_string.sol | 10 ++++
 .../calldata_nested_array_static_reencode.sol | 27 ++++++++++
 6 files changed, 113 insertions(+), 3 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol

diff --git a/Changelog.md b/Changelog.md
index 27ae4e30a3..504caa8c07 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
 ### 0.8.14 (unreleased)
 
+Important Bugfixes:
+ * ABI Encoding: When ABI-encoding values from calldata that contain nested arrays, correctly validate the nested array length against ``calldatasize()`` in all cases.
+
+
 Language Features:
 
 
diff --git a/docs/bugs.json b/docs/bugs.json
index 9e24175b4b..6613f1964d 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -1,4 +1,14 @@
 [
+    {
+        "uid": "SOL-2022-2",
+        "name": "NestedCallataArrayAbiReencodingSizeValidation",
+        "summary": "ABI-reencoding of nested dynamic calldata arrays did not always perform proper size checks against the size of calldata and could read beyond ``calldatasize()``.",
+        "description": "Calldata validation for nested dynamic types is deferred until the first access to the nested values. Such an access may for example be a copy to memory or an index or member access to the outer type. While in most such accesses calldata validation correctly checks that the data area of the nested array is completely contained in the passed calldata (i.e. in the range [0, calldatasize()]), this check may not be performed, when ABI encoding such nested types again directly from calldata. For instance, this can happen, if a value in calldata with a nested dynamic array is passed to an external call, used in ``abi.encode`` or emitted as event. In such cases, if the data area of the nested array extends beyond ``calldatasize()``, ABI encoding it did not revert, but continued reading values from beyond ``calldatasize()`` (i.e. zero values).",
+        "link": "https://blog.soliditylang.org/2022/05/17/calldata-reencode-size-check-bug/",
+        "introduced": "0.5.8",
+        "fixed": "0.8.14",
+        "severity": "very low"
+    },
     {
         "uid": "SOL-2022-1",
         "name": "AbiEncodeCallLiteralAsFixedBytesBug",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 7b9a7fc3d5..0d103279ff 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1036,6 +1036,7 @@
     },
     "0.5.10": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1051,6 +1052,7 @@
     },
     "0.5.11": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1065,6 +1067,7 @@
     },
     "0.5.12": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1079,6 +1082,7 @@
     },
     "0.5.13": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1093,6 +1097,7 @@
     },
     "0.5.14": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1109,6 +1114,7 @@
     },
     "0.5.15": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1124,6 +1130,7 @@
     },
     "0.5.16": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1138,6 +1145,7 @@
     },
     "0.5.17": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1269,6 +1277,7 @@
     },
     "0.5.8": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1287,6 +1296,7 @@
     },
     "0.5.9": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1304,6 +1314,7 @@
     },
     "0.6.0": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1319,6 +1330,7 @@
     },
     "0.6.1": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1333,6 +1345,7 @@
     },
     "0.6.10": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1343,6 +1356,7 @@
     },
     "0.6.11": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1353,6 +1367,7 @@
     },
     "0.6.12": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1363,6 +1378,7 @@
     },
     "0.6.2": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1377,6 +1393,7 @@
     },
     "0.6.3": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1391,6 +1408,7 @@
     },
     "0.6.4": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1405,6 +1423,7 @@
     },
     "0.6.5": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1419,6 +1438,7 @@
     },
     "0.6.6": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1432,6 +1452,7 @@
     },
     "0.6.7": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1445,6 +1466,7 @@
     },
     "0.6.8": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1455,6 +1477,7 @@
     },
     "0.6.9": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1466,6 +1489,7 @@
     },
     "0.7.0": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1476,6 +1500,7 @@
     },
     "0.7.1": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1487,6 +1512,7 @@
     },
     "0.7.2": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1497,6 +1523,7 @@
     },
     "0.7.3": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1506,6 +1533,7 @@
     },
     "0.7.4": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1514,6 +1542,7 @@
     },
     "0.7.5": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1522,6 +1551,7 @@
     },
     "0.7.6": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1530,6 +1560,7 @@
     },
     "0.8.0": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1538,6 +1569,7 @@
     },
     "0.8.1": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1545,27 +1577,34 @@
         "released": "2021-01-27"
     },
     "0.8.10": {
-        "bugs": [],
+        "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation"
+        ],
         "released": "2021-11-09"
     },
     "0.8.11": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "AbiEncodeCallLiteralAsFixedBytesBug"
         ],
         "released": "2021-12-20"
     },
     "0.8.12": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "AbiEncodeCallLiteralAsFixedBytesBug"
         ],
         "released": "2022-02-16"
     },
     "0.8.13": {
-        "bugs": [],
+        "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation"
+        ],
         "released": "2022-03-16"
     },
     "0.8.2": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1574,6 +1613,7 @@
     },
     "0.8.3": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory"
         ],
@@ -1581,37 +1621,44 @@
     },
     "0.8.4": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
         "released": "2021-04-21"
     },
     "0.8.5": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
         "released": "2021-06-10"
     },
     "0.8.6": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
         "released": "2021-06-22"
     },
     "0.8.7": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
         "released": "2021-08-11"
     },
     "0.8.8": {
         "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation",
             "UserDefinedValueTypesBug",
             "SignedImmutables"
         ],
         "released": "2021-09-27"
     },
     "0.8.9": {
-        "bugs": [],
+        "bugs": [
+            "NestedCallataArrayAbiReencodingSizeValidation"
+        ],
         "released": "2021-09-29"
     }
 }
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol
new file mode 100644
index 0000000000..b2a126d506
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol
@@ -0,0 +1,12 @@
+pragma abicoder v2;
+
+contract C {
+	function f(uint[] calldata) public {}
+}
+// ====
+// revertStrings: debug
+// compileViaYul: also
+// ----
+// f(uint256[]): 0x20, 0 ->
+// f(uint256[]): 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 0x2b, "ABI decoding: invalid calldata a", "rray stride"
+// f(uint256[]): 0x20, 2 -> FAILURE, hex"08c379a0", 0x20, 0x2b, "ABI decoding: invalid calldata a", "rray stride"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
new file mode 100644
index 0000000000..19aa30a086
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
@@ -0,0 +1,10 @@
+contract C {
+	function f(uint[] calldata) public {}
+}
+// ====
+// compileViaYul: also
+// ----
+// f(uint256[]): 0x20, 0 ->
+// f(uint256[]): 0x20, 1 -> FAILURE
+// f(uint256[]): 0x20, 2 -> FAILURE
+
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol
new file mode 100644
index 0000000000..a0b5008765
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol
@@ -0,0 +1,27 @@
+pragma abicoder v2;
+
+contract C {
+	function f(uint[3][] calldata a) public {
+		abi.encode(a);
+	}
+	function f(uint[][3] calldata a) public {
+		abi.encode(a);
+	}
+	function f(uint[2][2] calldata a) public {
+		abi.encode(a);
+	}
+}
+// ====
+// compileViaYul: also
+// ----
+// f(uint256[3][]): 0x20, 1, 0x01 -> FAILURE
+// f(uint256[3][]): 0x20, 1, 0x01, 0x02 -> FAILURE
+// f(uint256[3][]): 0x20, 1, 0x01, 0x02, 0x03 ->
+// f(uint256[][3]): 0x20, 0x60, 0x60, 0x60, 3, 0x01 -> FAILURE
+// f(uint256[][3]): 0x20, 0x60, 0x60, 0x60, 3, 0x01, 0x02 -> FAILURE
+// f(uint256[][3]): 0x20, 0x60, 0x60, 0x60, 3, 0x01, 0x02, 0x03 ->
+// f(uint256[2][2]): 0x01 -> FAILURE
+// f(uint256[2][2]): 0x01, 0x02 -> FAILURE
+// f(uint256[2][2]): 0x01, 0x02, 0x03 -> FAILURE
+// f(uint256[2][2]): 0x01, 0x02, 0x03, 0x04 ->
+// f(uint256[2][2]): 0x01, 0x02, 0x03, 0x04, 0x05 ->

From d357d56b16ebb99e58f58e84e9102aeeac533e78 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 12 May 2022 13:41:38 +0200
Subject: [PATCH 0589/1748] Increase CircleCI node size for soltest_all runs.

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 06213ebcbf..c1192181cf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -990,7 +990,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   t_ubu_soltest_all: &t_ubu_soltest_all
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2004_large
     parallelism: 50
     <<: *steps_soltest_all
 

From 2fe143f7d0d0480bc39259adaf4248a6ca1e57ff Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 11 May 2022 17:16:10 +0200
Subject: [PATCH 0590/1748] add changelog entry and docs note

---
 Changelog.md        | 1 +
 docs/smtchecker.rst | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 2e4bbccc44..dcb364610b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -15,6 +15,7 @@ Bugfixes:
  * Type Checker: Properly check restrictions of ``using ... global`` in conjunction with libraries.
  * Assembly-Json: Fix assembly json export to store jump types of operations in `jumpType` field instead of `value`.
  * SMTChecker: Fix bug when z3 is selected but not available at runtime.
+ * SMTChecker: Fix ABI compatibility with z3 >=4.8.16.
  * TypeChecker: Convert parameters of function type to how they would be called for ``abi.encodeCall``.
  * View Pure Checker: Mark ``returndatasize`` and ``returndatacopy`` as view to disallow them in inline assembly blocks in pure functions.
 
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index 5093408a7e..caa901713c 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -629,6 +629,11 @@ option ``--model-checker-solvers {all,cvc4,smtlib2,z3}`` or the JSON option
   - if a dynamic ``z3`` library of version 4.8.x is installed in a Linux system (from Solidity 0.7.6);
   - statically in ``soljson.js`` (from Solidity 0.6.9), that is, the Javascript binary of the compiler.
 
+.. note::
+  z3 version 4.8.16 broke ABI compatibility with previous versions and cannot
+  be used with solc <=0.8.13. If you are using z3 >=4.8.16 please use solc
+  >=0.8.14.
+
 Since both BMC and CHC use ``z3``, and ``z3`` is available in a greater variety
 of environments, including in the browser, most users will almost never need to be
 concerned about this option. More advanced users might apply this option to try

From c0cc8ff7e7c0a3b898a45a5f8022bfa8c1b68e10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 12 May 2022 14:25:58 +0200
Subject: [PATCH 0591/1748] Switch to newly built buildpack-deps images in CI

---
 .circleci/config.yml        | 8 ++++----
 scripts/build_emscripten.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 06213ebcbf..b19682cb75 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,19 +10,19 @@ parameters:
   ubuntu-2004-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-12
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:5087cc068b48787e89887804e632120b3e65bc5c25086bdf7b152be4fe5fc9ba"
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:43675fb5225df7cebffbe10d26e37099ed70a8398ff348c3512c2a698e435a36"
   ubuntu-2004-clang-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-12
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7f53f1bc3d89bdfb0725f604efbbec570d80ffa9b731b47a4842f4e286de0355"
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:39a628620c35d61033b11f033dbcca342cbacc0e51fd190e06f7db1e74470197"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-17
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:85b298c763adf5c516238246beb283640eb555e79e7ad6a8e7a6c9ed47ef6324"
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:fd67ac47de58b0eff088c72ae1f6261b27df3d89b1f67ad3ed9c40fee8471228"
   emscripten-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:emscripten-10
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:bd23831e0025e35a106005b4ac06cb3618f690bfa2833a5881b573c02d35d9fc"
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:feac0e5fba12c346ad18d70eb10e98ffabba80da25074a71b22dced4f2148aed"
   evm-version:
     type: string
     default: london
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 09d421e5a0..36f23ec705 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -36,5 +36,5 @@ fi
 
 # solbuildpackpusher/solidity-buildpack-deps:emscripten-10
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:bd23831e0025e35a106005b4ac06cb3618f690bfa2833a5881b573c02d35d9fc\
+    solbuildpackpusher/solidity-buildpack-deps@sha256:feac0e5fba12c346ad18d70eb10e98ffabba80da25074a71b22dced4f2148aed \
     ./scripts/ci/build_emscripten.sh "$BUILD_DIR"

From 0153822d2e8b8edf4b16810c43919d59b10d27f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 22 Oct 2021 14:07:19 +0200
Subject: [PATCH 0592/1748] CI: Add c_release_binaries job that gathers release
 binaries from individual jobs

---
 .circleci/config.yml | 56 ++++++++++++++++++++++++++++++++++++++++++++
 ReleaseChecklist.md  | 23 ++++--------------
 2 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 06213ebcbf..51efa33459 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -418,6 +418,13 @@ defaults:
         tags:
           only: /.*/
 
+  - workflow_trigger_on_releases: &workflow_trigger_on_releases
+      filters:
+        tags:
+          only: /^v.*/
+        branches:
+          ignore: /.*/
+
   - workflow_ubuntu2004: &workflow_ubuntu2004
       <<: *workflow_trigger_on_tags
       requires:
@@ -1416,6 +1423,46 @@ jobs:
           path: all-bytecode-reports.zip
       - gitter_notify_failure_unless_pr
 
+  c_release_binaries:
+    <<: *base_ubuntu2004
+    steps:
+      - checkout
+      - attach_workspace:
+          at: workspace
+      - run:
+          name: Gather and rename binaries from dependent jobs
+          command: |
+            mkdir github/
+            cp workspace/solc/solc             github/solc-static-linux
+            cp workspace/build/solc/solc       github/solc-macos
+            cp workspace/solc/Release/solc.exe github/solc-windows.exe
+            cp workspace/soljson.js            github/soljson.js
+
+            cd github/
+            tar --create --file ../github-binaries.tar *
+      - store_artifacts:
+          path: github-binaries.tar
+      - run:
+          name: Rename binaries to solc-bin naming convention
+          command: |
+            full_version=$(
+              github/solc-static-linux --version |
+              sed -En 's/^Version: ([0-9.]+.*\+commit\.[0-9a-f]+(\.mod)?).*$/\1/p'
+            )
+
+            mkdir -p solc-bin/{linux-amd64,macosx-amd64,windows-amd64,bin}
+
+            mv github/solc-static-linux "solc-bin/linux-amd64/solc-linux-amd64-${full_version}"
+            mv github/solc-macos        "solc-bin/macosx-amd64/solc-macosx-amd64-${full_version}"
+            mv github/solc-windows.exe  "solc-bin/windows-amd64/solc-windows-amd64-${full_version}.exe"
+            mv github/soljson.js        "solc-bin/bin/soljson-${full_version}.js"
+
+            cd solc-bin/
+            tar --create --file ../solc-bin-binaries.tar *
+      - store_artifacts:
+          path: solc-bin-binaries.tar
+      - gitter_notify_failure_unless_pr
+
 workflows:
   version: 2
 
@@ -1536,6 +1583,15 @@ workflows:
             - b_bytecode_osx
             - b_bytecode_ems
 
+      # Final artifacts
+      - c_release_binaries:
+          <<: *workflow_trigger_on_releases
+          requires:
+            - b_ubu_static
+            - b_osx
+            - b_win_release
+            - b_ems
+
   nightly:
 
     triggers:
diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 6d5008cb37..df72de4eee 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -26,29 +26,16 @@
  - [ ] Click the `PUBLISH RELEASE` button on the release page, creating the tag.
  - [ ] Wait for the CI runs on the tag itself.
 
-### Upload Release Artifacts
+### Upload Release Artifacts and Publish Binaries
  - [ ] Switch to the tag that archives have to be created for.
  - [ ] Create the ``prerelease.txt`` file: (``echo -n > prerelease.txt``).
  - [ ] Run ``scripts/create_source_tarball.sh`` while being on the tag to create the source tarball. This will create the tarball in a directory called ``upload``.
  - [ ] Take the tarball from the upload directory (its name should be ``solidity_x.x.x.tar.gz``, otherwise ``prerelease.txt`` was missing in the step before) and upload the source tarball to the release page.
- - [ ] Take the ``solc.exe`` binary from the ``b_win_release`` run of the released commit in circle-ci and add it to the release page as ``solc-windows.exe``.
- - [ ] Take the ``solc`` binary from the ``b_osx`` run of the released commit in circle-ci and add it to the release page as ``solc-macos``.
- - [ ] Take the ``solc`` binary from the ``b_ubu_static`` run of the released commit in circle-ci and add it to the release page as ``solc-static-linux``.
- - [ ] Take the ``soljson.js`` binary from the ``b_ems`` run of the released commit in circle-ci and add it to the release page as ``soljson.js``.
-
-### Update [solc-bin](https://github.com/ethereum/solc-bin/)
- - [ ] Copy files to solc-bin:
-     ```bash
-     VERSION=0.8.4
-     COMMIT="c7e474f2"
-     SOLC_BIN="/home/me/solc-bin"
-     chmod +x solc-static-linux solc-macos
-     cp soljson.js $SOLC_BIN/bin/soljson-v$VERSION+commit.$COMMIT.js
-     cp solc-static-linux $SOLC_BIN/linux-amd64/solc-linux-amd64-v$VERSION+commit.$COMMIT
-     cp solc-macos $SOLC_BIN/macosx-amd64/solc-macosx-amd64-v$VERSION+commit.$COMMIT
-     cp solc-windows.exe $SOLC_BIN/windows-amd64/solc-windows-amd64-v$VERSION+commit.$COMMIT.exe
+ - [ ] Take the ``github-binaries.tar`` tarball from ``b_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to the release page.
+   Make sure it contains four binaries: ``solc-windows.exe``, ``solc-macos``, ``solc-static-linux`` and ``soljson.js``.
+ - [ ] Take the ``solc-bin-binaries.tar`` tarball from ``b_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to solc-bin.
  - [ ] Run ``./update --reuse-hashes`` in ``solc-bin`` and verify that the script has updated ``list.js``, ``list.txt`` and ``list.json`` files correctly and that symlinks to the new release have been added in ``solc-bin/wasm/`` and ``solc-bin/emscripten-wasm32/``.
- - [ ] Create a pull request and merge.
+ - [ ] Create a pull request in solc-bin and merge.
 
 ### Homebrew and MacOS
  - [ ] Update the version and the hash (``sha256sum solidity_$VERSION.tar.gz``) in https://github.com/Homebrew/homebrew-core/blob/master/Formula/solidity.rb

From dbcffb79a53b8ec6fd7386e7d4537a6b9d3b7af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 22 Oct 2021 14:44:21 +0200
Subject: [PATCH 0593/1748] CI: Post a notification to gitter when binaries are
 ready

---
 .circleci/config.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 51efa33459..2ede659e6f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -36,7 +36,7 @@ commands:
     parameters:
       event:
         type: enum
-        enum: ["failure", "success"]
+        enum: ["failure", "success", "release"]
       condition:
         type: string
     steps:
@@ -58,6 +58,10 @@ commands:
 
             [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ [${workflow_name}] Job ${job} failed on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
             [[ "<< parameters.event >>" == "success" ]] && message=" ✅ [${workflow_name}] Job ${job} succeeded on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
+            [[ "<< parameters.event >>" == "release" ]] && message=" 📦 Release binaries for version **${CIRCLE_TAG}** are ready and attached as artifacts to [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}). **Please make sure the whole workflow succeeded before using them.**"
+
+            # The release notification only makes sense on tagged commits. If the commit is untagged, just bail out.
+            [[ "<< parameters.event >>" == "release" ]] && { [[ $CIRCLE_TAG != "" ]] || { echo "Not a tagged commit - notification skipped."; exit 0; } }
 
             curl "https://api.gitter.im/v1/rooms/${GITTER_NOTIFY_ROOM_ID}/chatMessages" \
               --request POST \
@@ -81,6 +85,13 @@ commands:
           event: success
           condition: on_success
 
+  gitter_notify_release_unless_pr:
+    description: "Posts a release notification to the main room on Gitter (if not running on a PR)."
+    steps:
+      - gitter_notify_unless_pr:
+          event: release
+          condition: on_success
+
 defaults:
 
   # --------------------------------------------------------------------------
@@ -1462,6 +1473,7 @@ jobs:
       - store_artifacts:
           path: solc-bin-binaries.tar
       - gitter_notify_failure_unless_pr
+      - gitter_notify_release_unless_pr
 
 workflows:
   version: 2

From 35661479b622067d36ba869c80f4ea6d4d431c7f Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Thu, 12 May 2022 13:27:44 -0300
Subject: [PATCH 0594/1748] Revert "Disallow RETURNDATASIZE and RETURNDATACOPY
 in inline assembly blocks in pure functions"

This reverts commit f567eb1fb2a24dbd956fe65512d4b9015ba7f5ed.

Correcting Bugfixes section of Changelog.
---
 Changelog.md                                  |  2 -
 libevmasm/SemanticInformation.cpp             |  2 -
 .../inlineAssembly/evm_byzantium.sol          |  2 +-
 .../evm_byzantium_on_homestead.sol            |  2 +-
 ...ze_as_variable_call_post_byzantium.sol.sol |  2 +-
 ...urndatasize_as_variable_post_byzantium.sol |  2 +-
 ...turndatasize_as_variable_pre_byzantium.sol |  2 +-
 ...ine_assembly_instructions_allowed_pure.sol | 10 ++--
 ..._assembly_instructions_disallowed_pure.sol | 52 +++++++++----------
 9 files changed, 34 insertions(+), 42 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index edd218d313..5ffb45f787 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -21,8 +21,6 @@ Bugfixes:
  * SMTChecker: Fix bug when z3 is selected but not available at runtime.
  * SMTChecker: Fix ABI compatibility with z3 >=4.8.16.
  * TypeChecker: Convert parameters of function type to how they would be called for ``abi.encodeCall``.
- * View Pure Checker: Mark ``returndatasize`` and ``returndatacopy`` as view to disallow them in inline assembly blocks in pure functions.
-
 
 
 ### 0.8.13 (2022-03-16)
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index a2a2b1af21..acbcaa5c0f 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -479,8 +479,6 @@ bool SemanticInformation::invalidInPureFunctions(Instruction _instruction)
 	case Instruction::EXTCODESIZE:
 	case Instruction::EXTCODECOPY:
 	case Instruction::EXTCODEHASH:
-	case Instruction::RETURNDATASIZE:
-	case Instruction::RETURNDATACOPY:
 	case Instruction::BLOCKHASH:
 	case Instruction::COINBASE:
 	case Instruction::TIMESTAMP:
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol
index 28d3365776..b08172ebe4 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium.sol
@@ -1,5 +1,5 @@
 contract C {
-    function f() view external {
+    function f() pure external {
         assembly {
             let s := returndatasize()
             returndatacopy(0, 0, s)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol
index 5698f990fd..74316c5263 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/evm_byzantium_on_homestead.sol
@@ -1,5 +1,5 @@
 contract C {
-    function f() view external {
+    function f() pure external {
         assembly {
             let s := returndatasize()
             returndatacopy(0, 0, s)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol
index 403022846d..f959537b60 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_call_post_byzantium.sol.sol
@@ -1,5 +1,5 @@
 contract C {
-    function f() public view {
+    function f() public pure {
         uint returndatasize;
         returndatasize;
         assembly {
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
index 903da7223e..44a12aa06e 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_post_byzantium.sol
@@ -1,5 +1,5 @@
 contract C {
-    function f() public view {
+    function f() public pure {
         uint returndatasize;
         returndatasize;
         assembly {
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol
index 250a0755fb..07bae8ac89 100644
--- a/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol
+++ b/test/libsolidity/syntaxTests/inlineAssembly/returndatasize_as_variable_pre_byzantium.sol
@@ -1,4 +1,4 @@
-contract C { function f() public view { uint returndatasize; returndatasize; assembly { pop(returndatasize()) }}}
+contract C { function f() public pure { uint returndatasize; returndatasize; assembly { pop(returndatasize()) }}}
 // ====
 // EVMVersion: =homestead
 // ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
index 9c09bcc372..85d7b63008 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
@@ -47,8 +47,8 @@ contract C {
             codecopy(0, 1, 2)
             //pop(extcodesize(0))
             //extcodecopy(0, 1, 2, 3)
-            //pop(returndatasize())
-            //returndatacopy(0, 1, 2)
+            pop(returndatasize())
+            returndatacopy(0, 1, 2)
             //pop(extcodehash(0))
             //pop(create(0, 1, 2))
             //pop(create2(0, 1, 2, 3))
@@ -85,6 +85,6 @@ contract C {
 // ====
 // EVMVersion: >=london
 // ----
-// Warning 5740: (94-1759): Unreachable code.
-// Warning 5740: (1772-1784): Unreachable code.
-// Warning 5740: (1827-1836): Unreachable code.
+// Warning 5740: (94-1755): Unreachable code.
+// Warning 5740: (1768-1780): Unreachable code.
+// Warning 5740: (1823-1832): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
index 8da17390db..f9a652fdbd 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
@@ -11,8 +11,6 @@ contract C {
             pop(callvalue())
             pop(extcodesize(0))
             extcodecopy(0, 1, 2, 3)
-            pop(returndatasize())
-            returndatacopy(0, 1, 2)
             pop(extcodehash(0))
             pop(create(0, 1, 2))
             pop(create2(0, 1, 2, 3))
@@ -46,7 +44,7 @@ contract C {
 // ====
 // EVMVersion: >=london
 // ----
-// Warning 5740: (742-1153): Unreachable code.
+// Warning 5740: (672-1083): Unreachable code.
 // TypeError 2527: (79-87): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 8961: (101-113): Function cannot be declared as pure because this expression (potentially) modifies the state.
 // TypeError 2527: (130-135): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
@@ -57,28 +55,26 @@ contract C {
 // TypeError 2527: (265-276): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 2527: (294-308): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 2527: (322-345): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (362-378): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (392-415): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (432-446): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (464-479): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (497-516): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (534-559): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (577-606): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (624-654): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 2527: (672-700): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (714-729): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (742-752): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (765-778): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (791-807): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (820-839): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (852-874): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 2527: (891-900): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (918-927): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (945-953): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (971-981): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (999-1011): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1029-1039): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1057-1068): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1086-1094): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1112-1124): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1142-1152): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (362-376): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (394-409): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (427-446): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (464-489): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (507-536): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (554-584): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 2527: (602-630): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (644-659): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (672-682): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (695-708): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (721-737): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (750-769): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (782-804): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 2527: (821-830): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (848-857): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (875-883): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (901-911): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (929-941): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (959-969): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (987-998): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1016-1024): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1042-1054): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (1072-1082): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".

From 6a126f6ccb5e2f159f9117f10234b80396f7a77a Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Fri, 13 May 2022 14:30:52 +0200
Subject: [PATCH 0595/1748] Update tests and hashes for z3 4.8.17

---
 .circleci/config.yml                             | 16 ++++++++--------
 .circleci/osx_install_dependencies.sh            |  4 ++--
 CMakeLists.txt                                   |  2 +-
 scripts/build_emscripten.sh                      |  4 ++--
 .../external_calls/call_with_value_2.sol         |  2 +-
 .../external_call_with_value_3.sol               |  4 +++-
 .../try_catch/try_public_var_mapping.sol         |  3 +--
 7 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 357a93a229..e41500b1e9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,20 +9,20 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-12
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:43675fb5225df7cebffbe10d26e37099ed70a8398ff348c3512c2a698e435a36"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-13
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:aa64242ecba4f040a839eadfaf20e8489cf93d1cb96ab90df2b240cdbbfe7f7c"
   ubuntu-2004-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-12
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:39a628620c35d61033b11f033dbcca342cbacc0e51fd190e06f7db1e74470197"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-13
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:caaf8d42aaf07397d1540e570f096a4fb1ef11fda7da3f1141d8852ec8322a9e"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-17
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:fd67ac47de58b0eff088c72ae1f6261b27df3d89b1f67ad3ed9c40fee8471228"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-18
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:048002d71a1f86f83dedb79dd057760b752256c75646ba5ad5c1bbe92e1695aa"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-10
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:feac0e5fba12c346ad18d70eb10e98ffabba80da25074a71b22dced4f2148aed"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-11
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0ad7c65e8c54d926ba9cb80d56246e4fc49f9284ad5188aaaa4834f46ab0c315"
   evm-version:
     type: string
     default: london
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 6b328e5a18..37502a7422 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -61,11 +61,11 @@ then
   ./scripts/install_obsolete_jsoncpp_1_7_4.sh
 
   # z3
-  z3_version="4.8.16"
+  z3_version="4.8.17"
   z3_dir="z3-${z3_version}-x64-osx-10.16"
   z3_package="${z3_dir}.zip"
   wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
-  validate_checksum "$z3_package" 71ed7b6d10c01198187df72cccb8eb6de6d9aa2bf9557b3dd052032524b598a5
+  validate_checksum "$z3_package" 189667930517aee07f1ce36485d5924a9a2cb4f8c3c9586b03e714a2c657541a
   unzip "$z3_package"
   rm "$z3_package"
   cp "${z3_dir}/bin/libz3.a" /usr/local/lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a298f40444..7d1ebc53a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/licens
 
 include(EthOptions)
 configure_project(TESTS)
-set(LATEST_Z3_VERSION "4.8.16")
+set(LATEST_Z3_VERSION "4.8.17")
 set(MINIMUM_Z3_VERSION "4.8.0")
 find_package(Z3)
 if (${Z3_FOUND})
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 36f23ec705..841cc26b31 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -34,7 +34,7 @@ else
     BUILD_DIR="$1"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-10
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-11
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:feac0e5fba12c346ad18d70eb10e98ffabba80da25074a71b22dced4f2148aed \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:0ad7c65e8c54d926ba9cb80d56246e4fc49f9284ad5188aaaa4834f46ab0c315 \
     ./scripts/ci/build_emscripten.sh "$BUILD_DIR"
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
index 968095bb2b..c386580800 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
@@ -11,5 +11,5 @@ contract C {
 // ----
 // Warning 9302: (96-116): Return value of low-level calls not used.
 // Warning 6328: (120-156): CHC: Assertion violation might happen here.
-// Warning 6328: (175-210): CHC: Assertion violation happens here.
+// Warning 6328: (175-210): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0x0\n\nTransaction trace:\nC.constructor()\nC.g(0x0)\n    i.call{value: 0}("") -- untrusted external call
 // Warning 4661: (120-156): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
index 2a535329ac..fa7ef4462b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
@@ -14,6 +14,8 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
+// Warning 1218: (202-236): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (150-183): CHC: Assertion violation might happen here.
-// Warning 6328: (202-236): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    i.f{value: 20}() -- untrusted external call
+// Warning 6328: (202-236): CHC: Assertion violation might happen here.
 // Warning 4661: (150-183): BMC: Assertion violation happens here.
+// Warning 4661: (202-236): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
index 0854dedd17..627d06a2d0 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
@@ -21,5 +21,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (280-300): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n(!(m[0][1] >= 43) && !(m[0][1] <= 41))\n
+// Warning 6328: (280-300): CHC: Assertion violation happens here.

From 93755fcb70fd6734f37c6260495e58d835cef27a Mon Sep 17 00:00:00 2001
From: alpharush <0xalpharush@protonmail.com>
Date: Fri, 13 May 2022 09:45:55 -0500
Subject: [PATCH 0596/1748] document that pop does not return last element

It's already documented for push and this would clarify my incorrect assumption (that pop returns a value as in other languages) that caused confusion with https://github.com/ethereum/solidity/issues/13017
---
 docs/types/reference-types.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index 74b6daa7ff..5903ac3bec 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -349,7 +349,7 @@ Array Members
 **pop()**:
      Dynamic storage arrays and ``bytes`` (not ``string``) have a member
      function called ``pop()`` that you can use to remove an element from the
-     end of the array. This also implicitly calls :ref:`delete<delete>` on the removed element.
+     end of the array. This also implicitly calls :ref:`delete<delete>` on the removed element. The function returns nothing.
 
 .. note::
     Increasing the length of a storage array by calling ``push()``

From edd769a6dc2b7f84665179c212ac146288b35741 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 13 May 2022 10:20:15 +0200
Subject: [PATCH 0597/1748] Update Z3 deps ppa script.

---
 scripts/deps-ppa/static_z3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index 79393221c6..6fd353ad81 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -25,7 +25,7 @@ set -ev
 keyid=70D110489D66E2F6
 email=builds@ethereum.org
 packagename=z3-static
-version=4.8.16
+version=4.8.17
 
 DISTRIBUTIONS="focal impish jammy"
 

From 49badcd91ae4935c79906b5226863353d67c76eb Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 13 May 2022 10:38:00 +0200
Subject: [PATCH 0598/1748] Update docker images for new z3 version.

---
 scripts/docker/buildpack-deps/Dockerfile.emscripten           | 4 ++--
 .../docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004           | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 81f9881d3e..777d8b2ec3 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -33,12 +33,12 @@
 # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
 # dependencies automatically.
 FROM emscripten/emsdk:2.0.33 AS base
-LABEL version="10"
+LABEL version="11"
 
 ADD emscripten.jam /usr/src
 RUN set -ex; \
 	cd /usr/src; \
-	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.16 --depth 1 ; \
+	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.17 --depth 1 ; \
 	cd z3; \
 	mkdir build; \
 	cd build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index d85700f338..2fe04622bf 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="17"
+LABEL version="18"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -61,7 +61,7 @@ RUN set -ex; \
 
 # Z3
 RUN set -ex; \
-    git clone --depth 1 -b z3-4.8.16 https://github.com/Z3Prover/z3.git \
+    git clone --depth 1 -b z3-4.8.17 https://github.com/Z3Prover/z3.git \
     /usr/src/z3; \
     cd /usr/src/z3; \
     mkdir build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 4ef94d30a9..2f3304c1ee 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="12"
+LABEL version="13"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
index 4a0fadd255..0a11680b88 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="12"
+LABEL version="13"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

From 3bfb79df0c4eaf8be71f7261ab48c48c23bca13d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 13 May 2022 18:45:40 +0200
Subject: [PATCH 0599/1748] gnosis: Workaround for getStorageAt() bug in
 Hardhat 2.9.5

---
 test/externalTests/gnosis.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index b8553e4eb3..4ad66479a0 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -85,6 +85,10 @@ function gnosis_safe_test
     # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
     npm install ethers@5.6.1
 
+    # Hardhat 2.9.5 introduced a bug with handling padded arguments to getStorageAt().
+    # TODO: Remove when https://github.com/NomicFoundation/hardhat/issues/2709 is fixed.
+    npm install hardhat@2.9.4
+
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
 

From e9f1bd00ccecfc359d903d7d6e995eece89bba05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 16 May 2022 16:59:32 +0200
Subject: [PATCH 0600/1748] gnosis: Workaround for problems caused by forcing
 ethers@5.6.1 in external tests

---
 test/externalTests/gnosis.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 4ad66479a0..bbf35cae0c 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -85,6 +85,10 @@ function gnosis_safe_test
     # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
     npm install ethers@5.6.1
 
+    # Note that ethers@5.6.1 depends on @ethersproject/contracts@5.6.0 while the dependency on hardhat-deploy
+    # pulls @ethersproject/contracts@5.6.1 (latest). Force 5.6.0 to avoid errors due to having two copies.
+    npm install @ethersproject/contracts@5.6.0
+
     # Hardhat 2.9.5 introduced a bug with handling padded arguments to getStorageAt().
     # TODO: Remove when https://github.com/NomicFoundation/hardhat/issues/2709 is fixed.
     npm install hardhat@2.9.4

From 91177d74eea8b643042b32b47bac0c802736d3eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 16 May 2022 20:52:53 +0200
Subject: [PATCH 0601/1748] perpetual-pools: Remove the ethers@5.6.1 workaround

---
 test/externalTests/perpetual-pools.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index 1b54fc577f..8f90ed0b4d 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -66,10 +66,6 @@ function perpetual_pools_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     yarn install
 
-    # With ethers.js 5.6.2 many tests for revert messages fail.
-    # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
-    yarn add ethers@5.6.1
-
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do

From f021017bc000e55eefd1ee18495e073878759837 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 17 May 2022 10:38:26 +0200
Subject: [PATCH 0602/1748] Sort changelog.

---
 Changelog.md | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 5ffb45f787..51686bc740 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,25 +1,22 @@
 ### 0.8.14 (unreleased)
 
 Important Bugfixes:
- * ABI Encoding: When ABI-encoding values from calldata that contain nested arrays, correctly validate the nested array length against ``calldatasize()`` in all cases.
-
-
-Language Features:
+ * ABI Encoder: When ABI-encoding values from calldata that contain nested arrays, correctly validate the nested array length against ``calldatasize()`` in all cases.
 
 
 Compiler Features:
+ * Assembly-Json Exporter: Include source list in `sourceList` field.
+ * Commandline Interface: Option ``--pretty-json`` works also with the following options: ``--abi``, ``--asm-json``, ``--ast-compact-json``, ``--devdoc``, ``--storage-layout``, ``--userdoc``.
+ * Language Server: Allow full filesystem access to language server.
  * Peephole Optimizer: Remove operations without side effects before simple terminations.
- * Assembly-Json: Export: Include source list in `sourceList` field.
- * Commandline Interface: option ``--pretty-json`` works also with the following options: ``--abi``, ``--asm-json``, ``--ast-compact-json``, ``--devdoc``, ``--storage-layout``, ``--userdoc``.
  * SMTChecker: Support ``abi.encodeCall`` taking into account the called selector.
- * Language Server: Allow full filesystem access to language server.
 
 
 Bugfixes:
- * Type Checker: Properly check restrictions of ``using ... global`` in conjunction with libraries.
- * Assembly-Json: Fix assembly json export to store jump types of operations in `jumpType` field instead of `value`.
- * SMTChecker: Fix bug when z3 is selected but not available at runtime.
+ * Assembly-Json Exporter: Fix assembly json export to store jump types of operations in `jumpType` field instead of `value`.
  * SMTChecker: Fix ABI compatibility with z3 >=4.8.16.
+ * SMTChecker: Fix bug when z3 is selected but not available at runtime.
+ * Type Checker: Properly check restrictions of ``using ... global`` in conjunction with libraries.
  * TypeChecker: Convert parameters of function type to how they would be called for ``abi.encodeCall``.
 
 

From c57bc4706047915ed98288bc8dc42ee9a3d267bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 16 May 2022 22:43:50 +0200
Subject: [PATCH 0603/1748] gnosis: Disable newly added tests broken due to
 Hardhat heuristics

---
 test/externalTests/gnosis.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index bbf35cae0c..5c02baa16b 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -73,6 +73,11 @@ function gnosis_safe_test
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
     # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
     sed -i "s|\(it\)\(('should not allow to call setup on singleton'\)|\1.skip\2|g" test/core/GnosisSafe.Setup.spec.ts
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    sed -i 's|\(it\)\(("changes the expected storage slot without touching the most important ones"\)|\1.skip\2|g' test/libraries/SignMessageLib.spec.ts
+    sed -i "s|\(it\)\(('can be used only via DELEGATECALL opcode'\)|\1.skip\2|g" test/libraries/SignMessageLib.spec.ts
+    sed -i 's|\(describe\)\(("Upgrade from Safe 1.1.1"\)|\1.skip\2|g' test/migration/UpgradeFromSafe111.spec.ts
+    sed -i 's|\(describe\)\(("Upgrade from Safe 1.2.0"\)|\1.skip\2|g' test/migration/UpgradeFromSafe120.spec.ts
 
     neutralize_package_lock
     neutralize_package_json_hooks

From adf3eaac9bf0282cb2efd09861a66ba03c6d661c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 16 May 2022 22:43:31 +0200
Subject: [PATCH 0604/1748] gnosis: Update upstream repo URL

---
 test/externalTests/gnosis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 5c02baa16b..7d579f76c6 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -36,7 +36,7 @@ function test_fn { npm test; }
 
 function gnosis_safe_test
 {
-    local repo="https://github.com/gnosis/safe-contracts.git"
+    local repo="https://github.com/safe-global/safe-contracts.git"
     local ref_type=branch
     local ref=main
     local config_file="hardhat.config.ts"

From dfa0bcf760ddbebed102be227d906ebb066562f3 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 24 Mar 2022 15:03:02 +0100
Subject: [PATCH 0605/1748] More strict override check for data locations.

---
 libsolidity/analysis/ContractLevelChecker.cpp |  4 +-
 libsolidity/analysis/OverrideChecker.cpp      | 52 +++++++++++++++++--
 libsolidity/analysis/OverrideChecker.h        |  6 ++-
 libsolidity/ast/AST.cpp                       |  9 +++-
 .../dataLocation/external_public_calldata.sol | 18 +++++++
 .../external_overriding_external.sol          | 14 +++++
 ..._data_location_change_illegal_internal.sol | 13 +++++
 ..._change_calldata_memory_illegal_public.sol | 11 ++++
 ..._data_location_change_illegal_internal.sol | 16 ++++++
 ...er_data_location_change_illegal_public.sol | 16 ++++++
 .../return_type_data_location.sol             |  7 +++
 ...turn_type_data_location_change_illegal.sol |  8 +++
 tools/solidityUpgrade/Upgrade060.cpp          |  2 +-
 13 files changed, 165 insertions(+), 11 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/inheritance/dataLocation/external_public_calldata.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/dataLocation/external_overriding_external.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/dataLocation/modifier_parameter_data_location_change_illegal_internal.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_calldata_memory_illegal_public.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_internal.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_public.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location.sol
 create mode 100644 test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location_change_illegal.sol

diff --git a/libsolidity/analysis/ContractLevelChecker.cpp b/libsolidity/analysis/ContractLevelChecker.cpp
index c159b83576..9ecf76f130 100644
--- a/libsolidity/analysis/ContractLevelChecker.cpp
+++ b/libsolidity/analysis/ContractLevelChecker.cpp
@@ -39,7 +39,7 @@ namespace
 {
 
 template <class T, class B>
-bool hasEqualParameters(T const& _a, B const& _b)
+bool hasEqualExternalCallableParameters(T const& _a, B const& _b)
 {
 	return FunctionType(_a).asExternallyCallableFunction(false)->hasEqualParameterTypes(
 		*FunctionType(_b).asExternallyCallableFunction(false)
@@ -204,7 +204,7 @@ void ContractLevelChecker::findDuplicateDefinitions(map<string, vector<T>> const
 			SecondarySourceLocation ssl;
 
 			for (size_t j = i + 1; j < overloads.size(); ++j)
-				if (hasEqualParameters(*overloads[i], *overloads[j]))
+				if (hasEqualExternalCallableParameters(*overloads[i], *overloads[j]))
 				{
 					solAssert(
 						(
diff --git a/libsolidity/analysis/OverrideChecker.cpp b/libsolidity/analysis/OverrideChecker.cpp
index 2f83748fb4..d342ab1003 100644
--- a/libsolidity/analysis/OverrideChecker.cpp
+++ b/libsolidity/analysis/OverrideChecker.cpp
@@ -313,7 +313,7 @@ Token OverrideProxy::functionKind() const
 	}, m_item);
 }
 
-FunctionType const* OverrideProxy::functionType() const
+FunctionType const* OverrideProxy::externalFunctionType() const
 {
 	return std::visit(GenericVisitor{
 		[&](FunctionDefinition const* _item) { return FunctionType(*_item).asExternallyCallableFunction(false); },
@@ -322,6 +322,15 @@ FunctionType const* OverrideProxy::functionType() const
 	}, m_item);
 }
 
+FunctionType const* OverrideProxy::originalFunctionType() const
+{
+	return std::visit(GenericVisitor{
+		[&](FunctionDefinition const* _item) { return TypeProvider::function(*_item); },
+		[&](VariableDeclaration const*) -> FunctionType const* { solAssert(false, "Requested specific function type of variable."); return nullptr; },
+		[&](ModifierDefinition const*) -> FunctionType const* { solAssert(false, "Requested specific function type of modifier."); return nullptr; }
+	}, m_item);
+}
+
 ModifierType const* OverrideProxy::modifierType() const
 {
 	return std::visit(GenericVisitor{
@@ -413,7 +422,7 @@ OverrideProxy::OverrideComparator const& OverrideProxy::overrideComparator() con
 			[&](FunctionDefinition const* _function)
 			{
 				vector<string> paramTypes;
-				for (Type const* t: functionType()->parameterTypes())
+				for (Type const* t: externalFunctionType()->parameterTypes())
 					paramTypes.emplace_back(t->richIdentifier());
 				return OverrideComparator{
 					_function->name(),
@@ -424,7 +433,7 @@ OverrideProxy::OverrideComparator const& OverrideProxy::overrideComparator() con
 			[&](VariableDeclaration const* _var)
 			{
 				vector<string> paramTypes;
-				for (Type const* t: functionType()->parameterTypes())
+				for (Type const* t: externalFunctionType()->parameterTypes())
 					paramTypes.emplace_back(t->richIdentifier());
 				return OverrideComparator{
 					_var->name(),
@@ -589,14 +598,17 @@ void OverrideChecker::checkOverride(OverrideProxy const& _overriding, OverridePr
 
 	if (_super.isFunction())
 	{
-		FunctionType const* functionType = _overriding.functionType();
-		FunctionType const* superType = _super.functionType();
+		FunctionType const* functionType = _overriding.externalFunctionType();
+		FunctionType const* superType = _super.externalFunctionType();
 
+		bool returnTypesDifferAlready = false;
 		if (_overriding.functionKind() != Token::Fallback)
 		{
 			solAssert(functionType->hasEqualParameterTypes(*superType), "Override doesn't have equal parameters!");
 
 			if (!functionType->hasEqualReturnTypes(*superType))
+			{
+				returnTypesDifferAlready = true;
 				overrideError(
 					_overriding,
 					_super,
@@ -604,6 +616,36 @@ void OverrideChecker::checkOverride(OverrideProxy const& _overriding, OverridePr
 					"Overriding " + _overriding.astNodeName() + " return types differ.",
 					"Overridden " + _overriding.astNodeName() + " is here:"
 				);
+			}
+		}
+
+		// The override proxy considers calldata and memory the same data location.
+		// Here we do a more specific check:
+		// Data locations of parameters and return variables have to match
+		// unless we have a public function overriding an external one.
+		if (
+			_overriding.isFunction() &&
+			!returnTypesDifferAlready &&
+			_super.visibility() != Visibility::External &&
+			_overriding.functionKind() != Token::Fallback
+		)
+		{
+			if (!_overriding.originalFunctionType()->hasEqualParameterTypes(*_super.originalFunctionType()))
+				overrideError(
+					_overriding,
+					_super,
+					7723_error,
+					"Data locations of parameters have to be the same when overriding non-external functions, but they differ.",
+					"Overridden " + _overriding.astNodeName() + " is here:"
+				);
+			if (!_overriding.originalFunctionType()->hasEqualReturnTypes(*_super.originalFunctionType()))
+				overrideError(
+					_overriding,
+					_super,
+					1443_error,
+					"Data locations of return variables have to be the same when overriding non-external functions, but they differ.",
+					"Overridden " + _overriding.astNodeName() + " is here:"
+				);
 		}
 
 		// Stricter mutability is always okay except when super is Payable
diff --git a/libsolidity/analysis/OverrideChecker.h b/libsolidity/analysis/OverrideChecker.h
index 9178d179de..8242483253 100644
--- a/libsolidity/analysis/OverrideChecker.h
+++ b/libsolidity/analysis/OverrideChecker.h
@@ -84,7 +84,10 @@ class OverrideProxy
 	/// @returns receive / fallback / function (only the latter for modifiers and variables);
 	langutil::Token functionKind() const;
 
-	FunctionType const* functionType() const;
+	/// @returns the externally callable function type
+	FunctionType const* externalFunctionType() const;
+	/// @returns the (unmodified) function type
+	FunctionType const* originalFunctionType() const;
 	ModifierType const* modifierType() const;
 
 	Declaration const* declaration() const;
@@ -101,6 +104,7 @@ class OverrideProxy
 
 	/**
 	 * Struct to help comparing override items about whether they override each other.
+	 * Compares functions based on their "externally callable" type.
 	 * Does not produce a total order.
 	 */
 	struct OverrideComparator
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index be6f2fe9be..04c47a155f 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -480,7 +480,9 @@ FunctionDefinition const& FunctionDefinition::resolveVirtual(
 	solAssert(isOrdinary(), "");
 	solAssert(!libraryFunction(), "");
 
-	FunctionType const* functionType = TypeProvider::function(*this)->asExternallyCallableFunction(false);
+	// We actually do not want the externally callable function here.
+	// This is just to add an assertion since the comparison used to be less strict.
+	FunctionType const* externalFunctionType = TypeProvider::function(*this)->asExternallyCallableFunction(false);
 
 	bool foundSearchStart = (_searchStart == nullptr);
 	for (ContractDefinition const* c: _mostDerivedContract.annotation().linearizedBaseContracts)
@@ -495,9 +497,12 @@ FunctionDefinition const& FunctionDefinition::resolveVirtual(
 				// With super lookup analysis guarantees that there is an implemented function in the chain.
 				// With virtual lookup there are valid cases where returning an unimplemented one is fine.
 				(function->isImplemented() || _searchStart == nullptr) &&
-				FunctionType(*function).asExternallyCallableFunction(false)->hasEqualParameterTypes(*functionType)
+				FunctionType(*function).asExternallyCallableFunction(false)->hasEqualParameterTypes(*externalFunctionType)
 			)
+			{
+				solAssert(FunctionType(*function).hasEqualParameterTypes(*TypeProvider::function(*this)));
 				return *function;
+			}
 	}
 
 	solAssert(false, "Virtual function " + name() + " not found.");
diff --git a/test/libsolidity/semanticTests/inheritance/dataLocation/external_public_calldata.sol b/test/libsolidity/semanticTests/inheritance/dataLocation/external_public_calldata.sol
new file mode 100644
index 0000000000..4de95b0f1c
--- /dev/null
+++ b/test/libsolidity/semanticTests/inheritance/dataLocation/external_public_calldata.sol
@@ -0,0 +1,18 @@
+abstract contract A {
+    function f(uint256[] calldata a) external virtual returns (uint256[] calldata);
+}
+
+contract B is A {
+    function f(uint256[] memory a) public override returns (uint256[] memory) {
+        return a;
+    }
+
+    function g(uint[] calldata x) public returns (uint256[] memory) {
+        return f(x);
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// f(uint256[]): 0x20, 2, 9, 8 -> 0x20, 2, 9, 8
+// g(uint256[]): 0x20, 2, 9, 8 -> 0x20, 2, 9, 8
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/external_overriding_external.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/external_overriding_external.sol
new file mode 100644
index 0000000000..6105a50a28
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/dataLocation/external_overriding_external.sol
@@ -0,0 +1,14 @@
+abstract contract A {
+    function f(uint256[1] memory a) external virtual returns (uint256);
+}
+contract B is A {
+    function f(uint256[1] calldata a) external pure virtual override returns (uint256) {
+        return a[0];
+    }
+}
+contract C is A, B {
+    function f(uint256[1] memory a) external pure override(B, A) returns (uint256) {
+        return a[0];
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/modifier_parameter_data_location_change_illegal_internal.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/modifier_parameter_data_location_change_illegal_internal.sol
new file mode 100644
index 0000000000..a4856d9f03
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/dataLocation/modifier_parameter_data_location_change_illegal_internal.sol
@@ -0,0 +1,13 @@
+abstract contract A {
+    modifier m(uint256[1] memory a) virtual;
+    function test(uint256[1] memory a) m(a) external {
+    }
+}
+
+contract B is A {
+    modifier m(uint256[1] calldata a) override {
+        _;
+    }
+}
+// ----
+// TypeError 1078: (153-214): Override changes modifier signature.
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_calldata_memory_illegal_public.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_calldata_memory_illegal_public.sol
new file mode 100644
index 0000000000..e3fb069af2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_calldata_memory_illegal_public.sol
@@ -0,0 +1,11 @@
+abstract contract A {
+    function f(uint256[1] calldata a) public virtual returns (uint256);
+}
+
+contract B is A {
+    function f(uint256[1] memory a) public override returns (uint256) {
+        return a[0];
+    }
+}
+// ----
+// TypeError 7723: (119-213): Data locations of parameters have to be the same when overriding non-external functions, but they differ.
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_internal.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_internal.sol
new file mode 100644
index 0000000000..55b5b5fe6b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_internal.sol
@@ -0,0 +1,16 @@
+abstract contract A {
+    function f(uint256[1] memory a) internal virtual returns (uint256);
+    function test() external returns (uint) {
+        uint[1] memory t;
+        t[0] = 7;
+        return f(t);
+    }
+}
+
+contract B is A {
+    function f(uint256[1] calldata a) internal override returns (uint256) {
+        return a[0];
+    }
+}
+// ----
+// TypeError 7723: (236-334): Data locations of parameters have to be the same when overriding non-external functions, but they differ.
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_public.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_public.sol
new file mode 100644
index 0000000000..52123f68d4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/dataLocation/parameter_data_location_change_illegal_public.sol
@@ -0,0 +1,16 @@
+abstract contract A {
+    function f(uint256[1] memory a) public virtual returns (uint256);
+    function test() external returns (uint) {
+        uint[1] memory t;
+        t[0] = 7;
+        return f(t);
+    }
+}
+
+contract B is A {
+    function f(uint256[1] calldata a) public override returns (uint256) {
+        return a[0];
+    }
+}
+// ----
+// TypeError 7723: (234-330): Data locations of parameters have to be the same when overriding non-external functions, but they differ.
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location.sol
new file mode 100644
index 0000000000..1c7f4e926c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location.sol
@@ -0,0 +1,7 @@
+abstract contract A {
+	function foo() external virtual view returns(uint[] calldata);
+}
+contract X is A {
+	function foo() public view override returns(uint[] memory) {  }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location_change_illegal.sol b/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location_change_illegal.sol
new file mode 100644
index 0000000000..e06cd43ae5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inheritance/dataLocation/return_type_data_location_change_illegal.sol
@@ -0,0 +1,8 @@
+abstract contract A {
+	function foo() public virtual view returns(uint[] calldata);
+}
+contract X is A {
+	function foo() public view override returns(uint[] memory) {  }
+}
+// ----
+// TypeError 1443: (105-168): Data locations of return variables have to be the same when overriding non-external functions, but they differ.
diff --git a/tools/solidityUpgrade/Upgrade060.cpp b/tools/solidityUpgrade/Upgrade060.cpp
index 52010db39b..8caff02c9f 100644
--- a/tools/solidityUpgrade/Upgrade060.cpp
+++ b/tools/solidityUpgrade/Upgrade060.cpp
@@ -72,7 +72,7 @@ void OverridingFunction::endVisit(ContractDefinition const& _contract)
 			{
 				auto& super = (*begin);
 				auto functionType = FunctionType(*function).asExternallyCallableFunction(false);
-				auto superType = super.functionType()->asExternallyCallableFunction(false);
+				auto superType = super.externalFunctionType();
 
 				if (functionType && functionType->hasEqualParameterTypes(*superType))
 				{

From 27e5afa23d1c9f52b7cb36906f665d9c1f2c0f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 24 Mar 2022 20:00:00 +0100
Subject: [PATCH 0606/1748] Patch external tests for the override data
 alignment issue until our patches are accepted upstream

---
 test/externalTests/bleeps.sh | 8 ++++++++
 test/externalTests/brink.sh  | 3 +++
 test/externalTests/gnosis.sh | 3 +++
 3 files changed, 14 insertions(+)

diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index bd3b0255b1..a9d2b58a06 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -86,6 +86,14 @@ function bleeps_test
     npm install npm-run-all
     npm install
 
+    # TODO: Bleeps depends on OpenZeppelin 4.3.2, which is affected by
+    # https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3293.
+    # Forcing OZ >= 4.6.0 fixes this but it also causes a lot of unrelated compilation errors.
+    # Remove this when Bleeps gets updated to support newer OpenZeppelin.
+    perl -i -0pe \
+        "s/(function hashProposal\(\n        address\[\] )calldata( targets,\n        uint256\[\] )calldata( values,\n        bytes\[\] )calldata( calldatas,)/\1memory\2memory\3memory\4/g" \
+        node_modules/@openzeppelin/contracts/governance/IGovernor.sol
+
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do
diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
index 1513350bbf..bfbd993f23 100755
--- a/test/externalTests/brink.sh
+++ b/test/externalTests/brink.sh
@@ -62,6 +62,9 @@ function brink_test
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$ref_type" "$ref" "$DIR"
 
+    # TODO: Remove this when Brink merges https://github.com/brinktrade/brink-core/pull/52
+    sed -i "s|\(function isValidSignature(bytes \)calldata\( _data, bytes \)calldata\( _signature)\)|\1memory\2memory\3|g" contracts/Test/MockEIP1271Validator.sol
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 7d579f76c6..8995231e1b 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -79,6 +79,9 @@ function gnosis_safe_test
     sed -i 's|\(describe\)\(("Upgrade from Safe 1.1.1"\)|\1.skip\2|g' test/migration/UpgradeFromSafe111.spec.ts
     sed -i 's|\(describe\)\(("Upgrade from Safe 1.2.0"\)|\1.skip\2|g' test/migration/UpgradeFromSafe120.spec.ts
 
+    # TODO: Remove this when Gnosis merges https://github.com/gnosis/safe-contracts/pull/394
+    sed -i "s|\(function isValidSignature(bytes \)calldata\( _data, bytes \)calldata\( _signature)\)|\1memory\2memory\3|g" contracts/handler/CompatibilityFallbackHandler.sol
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"

From 1164d1b4dd1ab808ebd7149d50b983cdf59834b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 7 Apr 2022 21:07:48 +0200
Subject: [PATCH 0607/1748] Switch ENS external test to master branch

---
 test/externalTests/ens.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index bf018d0ce6..2b177afb2b 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -37,8 +37,8 @@ function test_fn { yarn test; }
 function ens_test
 {
     local repo="https://github.com/ensdomains/ens-contracts.git"
-    local ref_type=tag
-    local ref="v0.0.8"     # The project is in flux right now and master might be too unstable for us
+    local ref_type=branch
+    local ref="master"
     local config_file="hardhat.config.js"
 
     local compile_only_presets=(
@@ -72,6 +72,10 @@ function ens_test
     replace_version_pragmas
     neutralize_packaged_contracts
 
+    # In some cases Hardhat does not detect revert reasons properly via IR.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
+    sed -i "s|it\(('Does not allow wrapping a name you do not own',\)|it.skip\1|g" test/wrapper/NameWrapper.js
+
     find . -name "*.sol" -exec sed -i -e 's/^\(\s*\)\(assembly\)/\1\/\/\/ @solidity memory-safe-assembly\n\1\2/' '{}' \;
 
     for preset in $SELECTED_PRESETS; do

From 259edd4c98e10e31f580ba28c9ef6e14e4416ba7 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 2 May 2022 12:27:20 +0200
Subject: [PATCH 0608/1748] Changelog.

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 51686bc740..ebaa17f24d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 Important Bugfixes:
  * ABI Encoder: When ABI-encoding values from calldata that contain nested arrays, correctly validate the nested array length against ``calldatasize()`` in all cases.
+ * Override Checker: Allow changing data location for parameters only when overriding external functions.
 
 
 Compiler Features:

From f427247993c795b86ec66414b018ef3b9499cf21 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 2 May 2022 13:30:28 +0200
Subject: [PATCH 0609/1748] Bug list entry.

---
 docs/bugs.json            | 11 +++++++++++
 docs/bugs_by_version.json | 25 +++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/docs/bugs.json b/docs/bugs.json
index 6613f1964d..7bee4d10f3 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -1,4 +1,15 @@
 [
+    {
+        "uid": "SOL-2022-3",
+        "name": "DataLocationChangeInInternalOverride",
+        "summary": "It was possible to change the data location of the parameters or return variables from ``calldata`` to ``memory`` and vice-versa while overriding internal and public functions. This caused invalid code to be generated when calling such a function internally through virtual function calls.",
+        "description": "When calling external functions, it is irrelevant if the data location of the parameters is ``calldata`` or ``memory``, the encoding of the data does not change. Because of that, changing the data location when overriding external functions is allowed. The compiler incorrectly also allowed a change in the data location for overriding public and internal functions. Since public functions can be called internally as well as externally, this causes invalid code to be generated when such an incorrectly overridden function is called internally through the base contract. The caller provides a memory pointer, but the called function interprets it as a calldata pointer or vice-versa.",
+        "link": "https://blog.soliditylang.org/2022/05/17/data-location-inheritance-bug/",
+        "introduced": "0.6.9",
+        "fixed": "0.8.14",
+        "severity": "very low"
+
+    },
     {
         "uid": "SOL-2022-2",
         "name": "NestedCallataArrayAbiReencodingSizeValidation",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 0d103279ff..d6ee8bb8a9 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1345,6 +1345,7 @@
     },
     "0.6.10": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1356,6 +1357,7 @@
     },
     "0.6.11": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1367,6 +1369,7 @@
     },
     "0.6.12": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1477,6 +1480,7 @@
     },
     "0.6.9": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1489,6 +1493,7 @@
     },
     "0.7.0": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1500,6 +1505,7 @@
     },
     "0.7.1": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1512,6 +1518,7 @@
     },
     "0.7.2": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1523,6 +1530,7 @@
     },
     "0.7.3": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1533,6 +1541,7 @@
     },
     "0.7.4": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1542,6 +1551,7 @@
     },
     "0.7.5": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1551,6 +1561,7 @@
     },
     "0.7.6": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1560,6 +1571,7 @@
     },
     "0.8.0": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1569,6 +1581,7 @@
     },
     "0.8.1": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1578,12 +1591,14 @@
     },
     "0.8.10": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation"
         ],
         "released": "2021-11-09"
     },
     "0.8.11": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "AbiEncodeCallLiteralAsFixedBytesBug"
         ],
@@ -1591,6 +1606,7 @@
     },
     "0.8.12": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "AbiEncodeCallLiteralAsFixedBytesBug"
         ],
@@ -1598,12 +1614,14 @@
     },
     "0.8.13": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation"
         ],
         "released": "2022-03-16"
     },
     "0.8.2": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1613,6 +1631,7 @@
     },
     "0.8.3": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory"
@@ -1621,6 +1640,7 @@
     },
     "0.8.4": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
@@ -1628,6 +1648,7 @@
     },
     "0.8.5": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
@@ -1635,6 +1656,7 @@
     },
     "0.8.6": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
@@ -1642,6 +1664,7 @@
     },
     "0.8.7": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
@@ -1649,6 +1672,7 @@
     },
     "0.8.8": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "UserDefinedValueTypesBug",
             "SignedImmutables"
@@ -1657,6 +1681,7 @@
     },
     "0.8.9": {
         "bugs": [
+            "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation"
         ],
         "released": "2021-09-29"

From 0bd0bf4c7d8639f56617bd7b295d07870857ae41 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 17 May 2022 13:49:51 +0200
Subject: [PATCH 0610/1748] Set release date.

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index ebaa17f24d..a6c113997f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.14 (unreleased)
+### 0.8.14 (2022-05-17)
 
 Important Bugfixes:
  * ABI Encoder: When ABI-encoding values from calldata that contain nested arrays, correctly validate the nested array length against ``calldatasize()`` in all cases.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index d6ee8bb8a9..86203a72be 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1619,6 +1619,10 @@
         ],
         "released": "2022-03-16"
     },
+    "0.8.14": {
+        "bugs": [],
+        "released": "2022-05-17"
+    },
     "0.8.2": {
         "bugs": [
             "DataLocationChangeInInternalOverride",

From 79554b9a408be3f43b388181932fb22ae183be70 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 17 May 2022 18:03:53 +0200
Subject: [PATCH 0611/1748] Set version to 0.8.15.

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7d1ebc53a6..4265203833 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.14")
+set(PROJECT_VERSION "0.8.15")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index a6c113997f..b80d6fadfd 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.15 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.14 (2022-05-17)
 
 Important Bugfixes:

From ca3af4b2a25d7ddc6d9644e8e0c4792f31df7845 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 3 May 2022 16:32:48 +0200
Subject: [PATCH 0612/1748] LSP: Implement semantic tokens

---
 Changelog.md                                  |   1 +
 libsolidity/CMakeLists.txt                    |   2 +
 libsolidity/lsp/LanguageServer.cpp            |  65 ++++
 libsolidity/lsp/LanguageServer.h              |   1 +
 libsolidity/lsp/SemanticTokensBuilder.cpp     | 283 ++++++++++++++++++
 libsolidity/lsp/SemanticTokensBuilder.h       | 123 ++++++++
 test/libsolidity/lsp/semanticTokens/enums.sol |  42 +++
 .../lsp/semanticTokens/functions.sol          |  52 ++++
 .../lsp/semanticTokens/modifiers.sol          |  81 +++++
 .../lsp/semanticTokens/structs.sol            |  48 +++
 10 files changed, 698 insertions(+)
 create mode 100644 libsolidity/lsp/SemanticTokensBuilder.cpp
 create mode 100644 libsolidity/lsp/SemanticTokensBuilder.h
 create mode 100644 test/libsolidity/lsp/semanticTokens/enums.sol
 create mode 100644 test/libsolidity/lsp/semanticTokens/functions.sol
 create mode 100644 test/libsolidity/lsp/semanticTokens/modifiers.sol
 create mode 100644 test/libsolidity/lsp/semanticTokens/structs.sol

diff --git a/Changelog.md b/Changelog.md
index b80d6fadfd..e73633d702 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+* LSP: Add rudimentary support for semantic highlighting.
 
 
 Bugfixes:
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 26c14976e0..e8de5ea23c 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -163,6 +163,8 @@ set(sources
 	lsp/HandlerBase.h
 	lsp/LanguageServer.cpp
 	lsp/LanguageServer.h
+	lsp/SemanticTokensBuilder.cpp
+	lsp/SemanticTokensBuilder.h
 	lsp/Transport.cpp
 	lsp/Transport.h
 	lsp/Utils.cpp
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 44b0cf041b..ed1e5a6e10 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -26,6 +26,7 @@
 
 // LSP feature implementations
 #include <libsolidity/lsp/GotoDefinition.h>
+#include <libsolidity/lsp/SemanticTokensBuilder.h>
 
 #include <liblangutil/SourceReferenceExtractor.h>
 #include <liblangutil/CharStream.h>
@@ -64,6 +65,49 @@ int toDiagnosticSeverity(Error::Type _errorType)
 	return -1;
 }
 
+Json::Value semanticTokensLegend()
+{
+	Json::Value legend = Json::objectValue;
+
+	// NOTE! The (alphabetical) order and items must match exactly the items of
+	//       their respective enum class members.
+
+	Json::Value tokenTypes = Json::arrayValue;
+	tokenTypes.append("class");
+	tokenTypes.append("comment");
+	tokenTypes.append("enum");
+	tokenTypes.append("enumMember");
+	tokenTypes.append("event");
+	tokenTypes.append("function");
+	tokenTypes.append("interface");
+	tokenTypes.append("keyword");
+	tokenTypes.append("macro");
+	tokenTypes.append("method");
+	tokenTypes.append("modifier");
+	tokenTypes.append("number");
+	tokenTypes.append("operator");
+	tokenTypes.append("parameter");
+	tokenTypes.append("property");
+	tokenTypes.append("string");
+	tokenTypes.append("struct");
+	tokenTypes.append("type");
+	tokenTypes.append("typeParameter");
+	tokenTypes.append("variable");
+	legend["tokenTypes"] = tokenTypes;
+
+	Json::Value tokenModifiers = Json::arrayValue;
+	tokenModifiers.append("abstract");
+	tokenModifiers.append("declaration");
+	tokenModifiers.append("definition");
+	tokenModifiers.append("deprecated");
+	tokenModifiers.append("documentation");
+	tokenModifiers.append("modification");
+	tokenModifiers.append("readonly");
+	legend["tokenModifiers"] = tokenModifiers;
+
+	return legend;
+}
+
 }
 
 LanguageServer::LanguageServer(Transport& _transport):
@@ -81,6 +125,7 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"textDocument/didChange", bind(&LanguageServer::handleTextDocumentDidChange, this, _2)},
 		{"textDocument/didClose", bind(&LanguageServer::handleTextDocumentDidClose, this, _2)},
 		{"textDocument/implementation", GotoDefinition(*this) },
+		{"textDocument/semanticTokens/full", bind(&LanguageServer::semanticTokensFull, this, _1, _2)},
 		{"workspace/didChangeConfiguration", bind(&LanguageServer::handleWorkspaceDidChangeConfiguration, this, _2)},
 	},
 	m_fileRepository("/" /* basePath */),
@@ -266,10 +311,30 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	replyArgs["capabilities"]["implementationProvider"] = true;
 	replyArgs["capabilities"]["textDocumentSync"]["change"] = 2; // 0=none, 1=full, 2=incremental
 	replyArgs["capabilities"]["textDocumentSync"]["openClose"] = true;
+	replyArgs["capabilities"]["semanticTokensProvider"]["legend"] = semanticTokensLegend();
+	replyArgs["capabilities"]["semanticTokensProvider"]["range"] = false;
+	replyArgs["capabilities"]["semanticTokensProvider"]["full"] = true; // XOR requests.full.delta = true
 
 	m_client.reply(_id, move(replyArgs));
 }
 
+void LanguageServer::semanticTokensFull(MessageID _id, Json::Value const& _args)
+{
+	auto uri = _args["textDocument"]["uri"];
+
+	compile();
+
+	auto const sourceName = m_fileRepository.uriToSourceUnitName(uri.as<string>());
+	SourceUnit const& ast = m_compilerStack.ast(sourceName);
+	m_compilerStack.charStream(sourceName);
+	Json::Value data = SemanticTokensBuilder().build(ast, m_compilerStack.charStream(sourceName));
+
+	Json::Value reply = Json::objectValue;
+	reply["data"] = data;
+
+	m_client.reply(_id, std::move(reply));
+}
+
 void LanguageServer::handleWorkspaceDidChangeConfiguration(Json::Value const& _args)
 {
 	requireServerInitialized();
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
index 2a7951fb02..4a683e2904 100644
--- a/libsolidity/lsp/LanguageServer.h
+++ b/libsolidity/lsp/LanguageServer.h
@@ -73,6 +73,7 @@ class LanguageServer
 	void handleTextDocumentDidChange(Json::Value const& _args);
 	void handleTextDocumentDidClose(Json::Value const& _args);
 	void handleGotoDefinition(MessageID _id, Json::Value const& _args);
+	void semanticTokensFull(MessageID _id, Json::Value const& _args);
 
 	/// Invoked when the server user-supplied configuration changes (initiated by the client).
 	void changeConfiguration(Json::Value const&);
diff --git a/libsolidity/lsp/SemanticTokensBuilder.cpp b/libsolidity/lsp/SemanticTokensBuilder.cpp
new file mode 100644
index 0000000000..b1263139e0
--- /dev/null
+++ b/libsolidity/lsp/SemanticTokensBuilder.cpp
@@ -0,0 +1,283 @@
+/*
+	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 <libsolidity/lsp/SemanticTokensBuilder.h>
+#include <libsolidity/lsp/Utils.h>
+
+#include <liblangutil/CharStream.h>
+#include <liblangutil/SourceLocation.h>
+
+#include <fmt/format.h>
+
+using namespace std;
+using namespace solidity::langutil;
+using namespace solidity::frontend;
+
+namespace solidity::lsp
+{
+
+namespace
+{
+
+optional<SemanticTokenType> semanticTokenTypeForType(frontend::Type const* _type)
+{
+	if (!_type)
+		return nullopt;
+
+	switch (_type->category())
+	{
+	case frontend::Type::Category::Address: return SemanticTokenType::Class;
+	case frontend::Type::Category::Bool: return SemanticTokenType::Number;
+	case frontend::Type::Category::Enum: return SemanticTokenType::Enum;
+	case frontend::Type::Category::Function: return SemanticTokenType::Function;
+	case frontend::Type::Category::Integer: return SemanticTokenType::Number;
+	case frontend::Type::Category::RationalNumber: return SemanticTokenType::Number;
+	case frontend::Type::Category::StringLiteral: return SemanticTokenType::String;
+	case frontend::Type::Category::Struct: return SemanticTokenType::Struct;
+	case frontend::Type::Category::Contract: return SemanticTokenType::Class;
+	default:
+		lspDebug(fmt::format("semanticTokenTypeForType: unknown category: {}", static_cast<unsigned>(_type->category())));
+		return SemanticTokenType::Type;
+	}
+}
+
+SemanticTokenType semanticTokenTypeForExpression(frontend::Type const* _type)
+{
+	if (!_type)
+		return SemanticTokenType::Variable;
+
+	switch (_type->category())
+	{
+	case frontend::Type::Category::Enum:
+		return SemanticTokenType::Enum;
+	default:
+		return SemanticTokenType::Variable;
+	}
+}
+
+} // end namespace
+
+Json::Value SemanticTokensBuilder::build(SourceUnit const& _sourceUnit, CharStream const& _charStream)
+{
+	reset(&_charStream);
+	_sourceUnit.accept(*this);
+	return m_encodedTokens;
+}
+
+void SemanticTokensBuilder::reset(CharStream const* _charStream)
+{
+	m_encodedTokens = Json::arrayValue;
+	m_charStream = _charStream;
+	m_lastLine = 0;
+	m_lastStartChar = 0;
+}
+
+void SemanticTokensBuilder::encode(
+	SourceLocation const& _sourceLocation,
+	SemanticTokenType _tokenType,
+	SemanticTokenModifiers _modifiers
+)
+{
+	/*
+		https://microsoft.github.io/language-server-protocol/specifications/specification-3-17/#textDocument_semanticTokens
+
+		// Step-1: Absolute positions
+		{ line: 2, startChar:  5, length: 3, tokenType: 0, tokenModifiers: 3 },
+		{ line: 2, startChar: 10, length: 4, tokenType: 1, tokenModifiers: 0 },
+		{ line: 5, startChar:  2, length: 7, tokenType: 2, tokenModifiers: 0 }
+
+		// Step-2: Relative positions as intermediate step
+		{ deltaLine: 2, deltaStartChar: 5, length: 3, tokenType: 0, tokenModifiers: 3 },
+		{ deltaLine: 0, deltaStartChar: 5, length: 4, tokenType: 1, tokenModifiers: 0 },
+		{ deltaLine: 3, deltaStartChar: 2, length: 7, tokenType: 2, tokenModifiers: 0 }
+
+		// Step-3: final array result
+		// 1st token,  2nd token,  3rd token
+		[  2,5,3,0,3,  0,5,4,1,0,  3,2,7,2,0 ]
+
+		So traverse through the AST and assign each leaf a token 5-tuple.
+	*/
+
+	// solAssert(_sourceLocation.isValid());
+	if (!_sourceLocation.isValid())
+		return;
+
+	auto const [line, startChar] = m_charStream->translatePositionToLineColumn(_sourceLocation.start);
+	auto const length = _sourceLocation.end - _sourceLocation.start;
+
+	lspDebug(fmt::format("encode [{}:{}..{}] {}", line, startChar, length, _tokenType));
+
+	m_encodedTokens.append(line - m_lastLine);
+	if (line == m_lastLine)
+		m_encodedTokens.append(startChar - m_lastStartChar);
+	else
+		m_encodedTokens.append(startChar);
+	m_encodedTokens.append(length);
+	m_encodedTokens.append(static_cast<int>(_tokenType));
+	m_encodedTokens.append(static_cast<int>(_modifiers));
+
+	m_lastLine = line;
+	m_lastStartChar = startChar;
+}
+
+bool SemanticTokensBuilder::visit(frontend::ContractDefinition const& _node)
+{
+	encode(_node.nameLocation(), SemanticTokenType::Class);
+	return true;
+}
+
+bool SemanticTokensBuilder::visit(frontend::ElementaryTypeName const& _node)
+{
+	encode(_node.location(), SemanticTokenType::Type);
+	return true;
+}
+
+bool SemanticTokensBuilder::visit(frontend::ElementaryTypeNameExpression const& _node)
+{
+	if (auto const tokenType = semanticTokenTypeForType(_node.annotation().type); tokenType.has_value())
+		encode(_node.location(), tokenType.value());
+	return true;
+}
+
+bool SemanticTokensBuilder::visit(frontend::EnumDefinition const& _node)
+{
+	encode(_node.nameLocation(), SemanticTokenType::Enum);
+	return true;
+}
+
+bool SemanticTokensBuilder::visit(frontend::EnumValue const& _node)
+{
+	encode(_node.nameLocation(), SemanticTokenType::EnumMember);
+	return true;
+}
+
+bool SemanticTokensBuilder::visit(frontend::ErrorDefinition const& _node)
+{
+	encode(_node.nameLocation(), SemanticTokenType::Event);
+	return true;
+}
+
+bool SemanticTokensBuilder::visit(frontend::FunctionDefinition const& _node)
+{
+	encode(_node.nameLocation(), SemanticTokenType::Function);
+	return true;
+}
+
+bool SemanticTokensBuilder::visit(frontend::ModifierDefinition const& _node)
+{
+	encode(_node.nameLocation(), SemanticTokenType::Modifier);
+	return true;
+}
+
+void SemanticTokensBuilder::endVisit(frontend::Literal const& _literal)
+{
+	encode(_literal.location(), SemanticTokenType::Number);
+}
+
+void SemanticTokensBuilder::endVisit(frontend::StructuredDocumentation const& _documentation)
+{
+	encode(_documentation.location(), SemanticTokenType::Comment);
+}
+
+void SemanticTokensBuilder::endVisit(frontend::Identifier const& _identifier)
+{
+	lspDebug(fmt::format("Identifier: {}, {}..{} cat={}", _identifier.name(), _identifier.location().start, _identifier.location().end, _identifier.annotation().type->category()));
+
+	SemanticTokenModifiers modifiers = SemanticTokenModifiers::None;
+	if (_identifier.annotation().isConstant.set() && *_identifier.annotation().isConstant)
+	{
+		lspDebug("OMG We've found a const!");
+		modifiers = modifiers | SemanticTokenModifiers::Readonly;
+	}
+
+	encode(_identifier.location(), semanticTokenTypeForExpression(_identifier.annotation().type), modifiers);
+}
+
+void SemanticTokensBuilder::endVisit(frontend::IdentifierPath const& _node)
+{
+	lspDebug(fmt::format("IdentifierPath: identifier path [{}..{}]", _node.location().start, _node.location().end));
+	for (size_t i = 0; i < _node.path().size(); ++i)
+		lspDebug(fmt::format("  [{}]: {}", i, _node.path().at(i)));
+	if (dynamic_cast<EnumDefinition const*>(_node.annotation().referencedDeclaration))
+		encode(_node.location(), SemanticTokenType::EnumMember);
+	else
+		encode(_node.location(), SemanticTokenType::Variable);
+}
+
+bool SemanticTokensBuilder::visit(frontend::MemberAccess const& _node)
+{
+	lspDebug(fmt::format("[{}..{}] MemberAccess({}): {}", _node.location().start, _node.location().end, _node.annotation().referencedDeclaration ?  _node.annotation().referencedDeclaration->name() : "?", _node.memberName()));
+
+	auto const memberNameLength = static_cast<int>(_node.memberName().size());
+	auto const memberTokenType = semanticTokenTypeForExpression(_node.annotation().type);
+
+	auto lhsLocation = _node.location();
+	lhsLocation.end -= (memberNameLength + 1 /*exclude the dot*/);
+
+	auto rhsLocation = _node.location();
+	rhsLocation.start = rhsLocation.end - static_cast<int>(memberNameLength);
+
+	if (memberTokenType == SemanticTokenType::Enum)
+	{
+		// Special handling for enumeration symbols.
+		encode(lhsLocation, SemanticTokenType::Enum);
+		encode(rhsLocation, SemanticTokenType::EnumMember);
+	}
+	else if (memberTokenType == SemanticTokenType::Function)
+	{
+		// Special handling for function symbols.
+		encode(lhsLocation, SemanticTokenType::Variable);
+		encode(rhsLocation, memberTokenType);
+	}
+	else
+	{
+		encode(rhsLocation, memberTokenType);
+	}
+
+	return false; // we handle LHS and RHS explicitly above.
+}
+
+void SemanticTokensBuilder::endVisit(PragmaDirective const& _pragma)
+{
+	encode(_pragma.location(), SemanticTokenType::Macro);
+	// NOTE: It would be nice if we could highlight based on the symbols,
+	//       such as (version) numerics be different than identifiers.
+}
+
+bool SemanticTokensBuilder::visit(frontend::UserDefinedTypeName const& _node)
+{
+	if (auto const token = semanticTokenTypeForType(_node.annotation().type); token.has_value())
+		encode(_node.location(), *token);
+	return false;
+}
+
+bool SemanticTokensBuilder::visit(frontend::VariableDeclaration const& _node)
+{
+	lspDebug(fmt::format("VariableDeclaration: {}", _node.name()));
+
+	if (auto const token = semanticTokenTypeForType(_node.typeName().annotation().type); token.has_value())
+		encode(_node.typeName().location(), *token);
+
+	encode(_node.nameLocation(), SemanticTokenType::Variable);
+	if (_node.overrides())
+		_node.overrides()->accept(*this);
+	if (_node.value())
+		_node.value()->accept(*this);
+	return false;
+}
+
+} // end namespace
diff --git a/libsolidity/lsp/SemanticTokensBuilder.h b/libsolidity/lsp/SemanticTokensBuilder.h
new file mode 100644
index 0000000000..ca3c48d1c6
--- /dev/null
+++ b/libsolidity/lsp/SemanticTokensBuilder.h
@@ -0,0 +1,123 @@
+/*
+	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 <libsolidity/ast/AST.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <json/json.h>
+
+#include <fmt/format.h>
+
+namespace solidity::langutil
+{
+class CharStream;
+struct SourceLocation;
+}
+
+namespace solidity::lsp
+{
+
+// See: https://microsoft.github.io/language-server-protocol/specifications/specification-3-17/#semanticTokenTypes
+enum class SemanticTokenType
+{
+	Class,
+	Comment,
+	Enum,
+	EnumMember,
+	Event,
+	Function,
+	Interface,
+	Keyword,
+	Macro,
+	Method,
+	Modifier,
+	Number,
+	Operator,
+	Parameter,
+	Property,
+	String,
+	Struct,
+	Type,
+	TypeParameter,
+	Variable,
+
+	// Unused below:
+	// Namespace,
+	// Regexp,
+};
+
+enum class SemanticTokenModifiers
+{
+	None            = 0,
+
+	// Member integer values must be bit-values as
+	// they can be OR'd together.
+	Abstract        = 0x0001,
+	Declaration     = 0x0002,
+	Definition      = 0x0004,
+	Deprecated      = 0x0008,
+	Documentation   = 0x0010,
+	Modification    = 0x0020,
+	Readonly        = 0x0040,
+
+	// Unused below:
+	// Static,
+	// Async,
+	// DefaultLibrary,
+};
+
+constexpr SemanticTokenModifiers operator|(SemanticTokenModifiers a, SemanticTokenModifiers b) noexcept
+{
+	return static_cast<SemanticTokenModifiers>(static_cast<int>(a) | static_cast<int>(b));
+}
+
+class SemanticTokensBuilder: public frontend::ASTConstVisitor
+{
+public:
+	Json::Value build(frontend::SourceUnit const& _sourceUnit, langutil::CharStream const& _charStream);
+
+	void reset(langutil::CharStream const* _charStream);
+	void encode(
+		langutil::SourceLocation const& _sourceLocation,
+		SemanticTokenType _tokenType,
+		SemanticTokenModifiers _modifiers = SemanticTokenModifiers::None
+	);
+
+	bool visit(frontend::ContractDefinition const&) override;
+	bool visit(frontend::ElementaryTypeName const&) override;
+	bool visit(frontend::ElementaryTypeNameExpression const&) override;
+	bool visit(frontend::EnumDefinition const&) override;
+	bool visit(frontend::EnumValue const&) override;
+	bool visit(frontend::ErrorDefinition const&) override;
+	bool visit(frontend::FunctionDefinition const&) override;
+	bool visit(frontend::ModifierDefinition const&) override;
+	void endVisit(frontend::Literal const&) override;
+	void endVisit(frontend::StructuredDocumentation const&) override;
+	void endVisit(frontend::Identifier const&) override;
+	void endVisit(frontend::IdentifierPath const&) override;
+	bool visit(frontend::MemberAccess const&) override;
+	void endVisit(frontend::PragmaDirective const&) override;
+	bool visit(frontend::UserDefinedTypeName const&) override;
+	bool visit(frontend::VariableDeclaration const&) override;
+
+private:
+	Json::Value m_encodedTokens;
+	langutil::CharStream const* m_charStream;
+	int m_lastLine;
+	int m_lastStartChar;
+};
+
+} // end namespace
diff --git a/test/libsolidity/lsp/semanticTokens/enums.sol b/test/libsolidity/lsp/semanticTokens/enums.sol
new file mode 100644
index 0000000000..ea1655e1ef
--- /dev/null
+++ b/test/libsolidity/lsp/semanticTokens/enums.sol
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+enum Weather {
+    Sunny,
+    Cloudy,
+    Rainy
+}
+
+enum Color {
+    Red,
+    Green,
+    Blue
+}
+
+function getColorEnum() pure returns (Color result)
+{
+    result = Color.Red;
+}
+
+// ----
+// -> textDocument/semanticTokens/full {
+// }
+// <- {
+//     "data": [
+//         1, 0, 24, 8, 0,
+//         2, 5, 7, 2, 0,
+//         1, 4, 5, 3, 0,
+//         1, 4, 6, 3, 0,
+//         1, 4, 5, 3, 0,
+//         3, 5, 5, 2, 0,
+//         1, 4, 3, 3, 0,
+//         1, 4, 5, 3, 0,
+//         1, 4, 4, 3, 0,
+//         3, 9, 12, 5, 0,
+//         0, 29, 5, 2, 0,
+//         0, 6, 6, 19, 0,
+//         2, 4, 6, 2, 0,
+//         0, 9, 5, 2, 0,
+//         0, 6, 3, 3, 0
+//     ]
+// }
diff --git a/test/libsolidity/lsp/semanticTokens/functions.sol b/test/libsolidity/lsp/semanticTokens/functions.sol
new file mode 100644
index 0000000000..fee9af7887
--- /dev/null
+++ b/test/libsolidity/lsp/semanticTokens/functions.sol
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+library Lib
+{
+    function add(uint a, uint b) public pure returns (uint result)
+    {
+        result = a + b;
+    }
+
+    function warningWithUnused() public pure
+    {
+        uint unused;
+//      ^^^^^^^^^^^ @unusedVariable
+    }
+}
+
+contract Contract
+{
+    function doNothing() pure public returns (bool)
+    {
+        return true;
+    }
+}
+
+// ----
+// functions: @unusedVariable 2072
+// -> textDocument/semanticTokens/full {
+// }
+// <- {
+//     "data": [
+//         1, 0, 24, 8, 0,
+//         2, 8, 3, 0, 0,
+//         2, 13, 3, 5, 0,
+//         0, 4, 4, 11, 0,
+//         0, 5, 1, 19, 0,
+//         0, 3, 4, 11, 0,
+//         0, 5, 1, 19, 0,
+//         0, 24, 4, 11, 0,
+//         0, 5, 6, 19, 0,
+//         2, 8, 6, 19, 0,
+//         0, 9, 1, 19, 0,
+//         0, 4, 1, 19, 0,
+//         3, 13, 17, 5, 0,
+//         2, 8, 4, 11, 0,
+//         0, 5, 6, 19, 0,
+//         5, 9, 8, 0, 0,
+//         2, 13, 9, 5, 0,
+//         0, 33, 4, 11, 0,
+//         2, 15, 4, 11, 0
+//     ]
+// }
diff --git a/test/libsolidity/lsp/semanticTokens/modifiers.sol b/test/libsolidity/lsp/semanticTokens/modifiers.sol
new file mode 100644
index 0000000000..5a4b5a39c1
--- /dev/null
+++ b/test/libsolidity/lsp/semanticTokens/modifiers.sol
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract C
+{
+    bool public locked = false;
+    int public calls = 0;
+    int public totalSum = 0;
+
+    function add(uint a, uint b) lock() monitor(a, b) public returns (uint result)
+    {
+        result = a + b;
+    }
+
+    modifier lock()
+    {
+        require(!locked);
+        locked = true;
+        _;
+        locked = false;
+    }
+
+    modifier monitor(uint a, uint b)
+    {
+        calls++;
+        totalSum = totalSum + a + b;
+        //         ^^^^^^^^^^^^^^^^ @totalSumWarning
+        //         ^^^^^^^^^^^^ @totalSumWarningSub
+        _;
+    }
+}
+// ----
+// modifiers: @totalSumWarningSub 2271 @totalSumWarning 2271
+// -> textDocument/semanticTokens/full {
+// }
+// <- {
+//     "data": [
+//         1, 0, 24, 8, 0,
+//         2, 9, 1, 0, 0,
+//         2, 4, 4, 11, 0,
+//         0, 12, 6, 19, 0,
+//         0, 9, 5, 11, 0,
+//         1, 4, 3, 11, 0,
+//         0, 11, 5, 19, 0,
+//         0, 8, 1, 11, 0,
+//         1, 4, 3, 11, 0,
+//         0, 11, 8, 19, 0,
+//         0, 11, 1, 11, 0,
+//         2, 13, 3, 5, 0,
+//         0, 4, 4, 11, 0,
+//         0, 5, 1, 19, 0,
+//         0, 3, 4, 11, 0,
+//         0, 5, 1, 19, 0,
+//         0, 40, 4, 11, 0,
+//         0, 5, 6, 19, 0,
+//         0, -42, 4, 19, 0,
+//         0, 7, 7, 19, 0,
+//         0, 8, 1, 19, 0,
+//         0, 3, 1, 19, 0,
+//         2, 8, 6, 19, 0,
+//         0, 9, 1, 19, 0,
+//         0, 4, 1, 19, 0,
+//         3, 13, 4, 10, 0,
+//         2, 8, 7, 19, 0,
+//         0, 9, 6, 19, 0,
+//         1, 8, 6, 19, 0,
+//         0, 9, 4, 11, 0,
+//         2, 8, 6, 19, 0,
+//         0, 9, 5, 11, 0,
+//         3, 13, 7, 10, 0,
+//         0, 8, 4, 11, 0,
+//         0, 5, 1, 19, 0,
+//         0, 3, 4, 11, 0,
+//         0, 5, 1, 19, 0,
+//         2, 8, 5, 19, 0,
+//         1, 8, 8, 19, 0,
+//         0, 11, 8, 19, 0,
+//         0, 11, 1, 19, 0,
+//         0, 4, 1, 19, 0
+//     ]
+// }
diff --git a/test/libsolidity/lsp/semanticTokens/structs.sol b/test/libsolidity/lsp/semanticTokens/structs.sol
new file mode 100644
index 0000000000..ddbbcf3ce0
--- /dev/null
+++ b/test/libsolidity/lsp/semanticTokens/structs.sol
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+struct Tag
+{
+    uint id;
+    string name;
+}
+
+struct RGBColor
+{
+    uint8 red;
+    uint8 green;
+    uint8 blue;
+    Tag tag;
+}
+
+function memberAccess(RGBColor memory color) pure returns(uint)
+{
+    return color.red + color.green + color.blue;
+}
+// ----
+// -> textDocument/semanticTokens/full {
+// }
+// <- {
+//     "data": [
+//         1, 0, 24, 8, 0,
+//         4, 4, 4, 11, 0,
+//         0, 5, 2, 19, 0,
+//         1, 4, 6, 17, 0,
+//         0, 7, 4, 19, 0,
+//         5, 4, 5, 11, 0,
+//         0, 6, 3, 19, 0,
+//         1, 4, 5, 11, 0,
+//         0, 6, 5, 19, 0,
+//         1, 4, 5, 11, 0,
+//         0, 6, 4, 19, 0,
+//         1, 4, 3, 16, 0,
+//         0, 4, 3, 19, 0,
+//         3, 9, 12, 5, 0,
+//         0, 13, 8, 16, 0,
+//         0, 16, 5, 19, 0,
+//         0, 20, 4, 11, 0,
+//         2, 17, 3, 19, 0,
+//         0, 12, 5, 19, 0,
+//         0, 14, 4, 19, 0
+//     ]
+// }

From 0234e2aa6b3ba49c40cde1bc546425af0d1bd8f6 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 18 May 2022 14:46:26 +0200
Subject: [PATCH 0613/1748] lsp.py: Fix broken console reading

---
 test/lsp.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/lsp.py b/test/lsp.py
index 9a4335d73f..625d27e13b 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -41,7 +41,7 @@ def escape_string(text: str) -> str:
     }))
 
 
-def getCharFromStdin():
+def getCharFromStdin() -> str:
     """
     Gets a single character from stdin without line-buffering.
     """
@@ -49,7 +49,7 @@ def getCharFromStdin():
         # pragma pylint: disable=import-error
         return msvcrt.getch().decode("utf-8")
     else:
-        return sys.stdin.buffer.read(1)
+        return sys.stdin.read(1)
 
 
 """

From 33ea6a679dfdd90cdb6ef34e71335ea71fc090ff Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 10 May 2022 15:46:16 -0300
Subject: [PATCH 0614/1748] Fixed bug that added a superfluous empty slot for
 data when encoding an empty string coming from storage.

Added tests covering empty string, uninitialized string, emptry string literal, byte arrays and explicit call to `abi.encode`.
---
 Changelog.md                                  |   1 +
 libsolidity/codegen/ABIFunctions.cpp          |   2 +-
 .../copying/bytes_storage_to_storage.sol      |   2 +-
 .../copy_byte_array_in_struct_to_storage.sol  |   4 +-
 .../copying/storage_memory_nested_bytes.sol   |   2 +-
 .../array/pop/byte_array_pop_copy_long.sol    |   2 +-
 .../bytes_in_constructors_unpacker.sol        |   2 +-
 .../strings/empty_storage_string.sol          | 100 ++++++++++++++++++
 .../semanticTests/various/address_code.sol    |   2 +-
 .../skip_dynamic_types_for_structs.sol        |   2 +-
 10 files changed, 110 insertions(+), 9 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/strings/empty_storage_string.sol

diff --git a/Changelog.md b/Changelog.md
index e73633d702..c17b7e0b3e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * ABI Encoder: When encoding an empty string coming from storage do not add a superfluous empty slot for data.
 
 
 ### 0.8.14 (2022-05-17)
diff --git a/libsolidity/codegen/ABIFunctions.cpp b/libsolidity/codegen/ABIFunctions.cpp
index d24dfc0788..e83f940f51 100644
--- a/libsolidity/codegen/ABIFunctions.cpp
+++ b/libsolidity/codegen/ABIFunctions.cpp
@@ -699,7 +699,7 @@ string ABIFunctions::abiEncodingFunctionCompactStorageArray(
 					case 0 {
 						// short byte array
 						mstore(pos, and(slotValue, not(0xff)))
-						ret := add(pos, <lengthPaddedShort>)
+						ret := add(pos, mul(<lengthPaddedShort>, iszero(iszero(length))))
 					}
 					case 1 {
 						// long byte array
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 29a017e089..027a9e1871 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -19,7 +19,7 @@ contract c {
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 121735
+// gas irOptimized: 121752
 // gas legacy: 123884
 // gas legacyOptimized: 119139
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index 05f8bd2bf9..3aedfe6090 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -37,11 +37,11 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179895
+// gas irOptimized: 179912
 // gas legacy: 180676
 // gas legacyOptimized: 180070
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 107274
+// gas irOptimized: 107291
 // gas legacy: 107877
 // gas legacyOptimized: 107236
 // h() -> 0x40, 0x60, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index 35fd24fd80..f0c52e04ce 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -13,6 +13,6 @@ contract C {
 // compileViaYul: also
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
-// gas irOptimized: 202840
+// gas irOptimized: 202864
 // gas legacy: 204441
 // gas legacyOptimized: 203419
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index 227eb6afd7..1412340594 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -12,6 +12,6 @@ contract c {
 // compileViaYul: also
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
-// gas irOptimized: 109499
+// gas irOptimized: 109515
 // gas legacy: 126728
 // gas legacyOptimized: 123444
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index d0b3f64cbc..2edcf0b2d0 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -10,7 +10,7 @@ contract Test {
 // compileViaYul: also
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 283829
+// gas irOptimized: 284909
 // gas legacy: 309607
 // gas legacyOptimized: 260566
 // m_x() -> 7
diff --git a/test/libsolidity/semanticTests/strings/empty_storage_string.sol b/test/libsolidity/semanticTests/strings/empty_storage_string.sol
new file mode 100644
index 0000000000..70d85f24b4
--- /dev/null
+++ b/test/libsolidity/semanticTests/strings/empty_storage_string.sol
@@ -0,0 +1,100 @@
+contract C {
+
+    string uninitializedString;
+    string emptyString = "";
+    string nonEmptyString = "This is a non empty string";
+    string nonEmptyString2 = "Another string";
+    bytes uninitializedBytes;
+    bytes emptyBytes = "";
+    error EmptyError(string);
+    event EmptyEvent(string);
+
+    function f() public returns (string memory) {
+        return uninitializedString;
+    }
+
+    function g() public returns (string memory, string memory) {
+        return (uninitializedString, emptyString);
+    }
+
+    function h() public returns (string memory, string memory) {
+        return (uninitializedString, nonEmptyString);
+    }
+
+    function i() public returns (string memory, string memory) {
+        return (nonEmptyString, emptyString);
+    }
+
+    function j(string calldata _s) public returns (string memory) {
+        return _s;
+    }
+
+    function k() public returns (string memory) {
+        nonEmptyString2 = "";
+        return nonEmptyString2;
+    }
+
+    function l(string calldata _s) public returns (bytes memory) {
+        return abi.encode(_s);
+    }
+
+    function m() public returns (string memory) {
+        bytes memory b = abi.encode(emptyString);
+        return string(b);
+    }
+
+    function n() public {
+        revert EmptyError(uninitializedString);
+    }
+
+    function o() public {
+        emit EmptyEvent(emptyString);
+    }
+
+    function p() public {
+        emit EmptyEvent("");
+    }
+
+    function q() public returns (bytes memory) {
+        return uninitializedBytes;
+    }
+
+    function r() public returns (bytes memory) {
+        emptyBytes = abi.encode("");
+        return emptyBytes;
+    }
+
+    function s() public returns (bytes memory) {
+        emptyBytes = abi.encode(uninitializedString);
+        return emptyBytes;
+    }
+
+    function set(string calldata _s) public {
+        nonEmptyString = _s;
+    }
+
+    function get() public returns (string memory) {
+        return nonEmptyString;
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// f() -> 0x20, 0
+// g() -> 0x40, 0x60, 0, 0
+// h() -> 0x40, 0x60, 0, 0x1a, 38178759162904981154304545770567765692299154484752076569098748838215919075328
+// i() -> 0x40, 0x80, 0x1a, 38178759162904981154304545770567765692299154484752076569098748838215919075328, 0
+// j(string): 0x20, 0, "" -> 0x20, 0
+// k() -> 0x20, 0
+// l(string): 0x20, 0, "" -> 0x20, 0x40, 0x20, 0
+// m() -> 0x20, 0x40, 0x20, 0
+// n() -> FAILURE, hex"d3f13430", hex"0000000000000000000000000000000000000000000000000000000000000020", hex"0000000000000000000000000000000000000000000000000000000000000000"
+// o() ->
+// ~ emit EmptyEvent(string): 0x20, 0x00
+// p() ->
+// ~ emit EmptyEvent(string): 0x20, 0x00
+// q() -> 0x20, 0
+// r() -> 0x20, 0x40, 0x20, 0
+// s() -> 0x20, 0x40, 0x20, 0
+// set(string): 0x20, 0, "" ->
+// get() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 2adf317160..9e9bcab6be 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -17,7 +17,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 192317
+// gas irOptimized: 193397
 // gas legacy: 240889
 // gas legacyOptimized: 155314
 // initCode() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 971d83407b..db5f0e0991 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -22,6 +22,6 @@ contract C {
 // compileViaYul: also
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178805
+// gas irOptimized: 178822
 // gas legacy: 180753
 // gas legacyOptimized: 179472

From 7ff4cab0b9da378d3b87f26332e58bbceee8fa65 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Sat, 14 May 2022 13:27:27 +0530
Subject: [PATCH 0615/1748] issue has already been fixed. Adding test cases for
 confirmation

---
 ...rgs_internal_function_pointer_for_uint.sol | 10 +++++
 ...all_fail_args_internal_struct_for_uint.sol | 43 +++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args_internal_function_pointer_for_uint.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/encodecall_fail_args_internal_struct_for_uint.sol

diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args_internal_function_pointer_for_uint.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args_internal_function_pointer_for_uint.sol
new file mode 100644
index 0000000000..e835122225
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_args_internal_function_pointer_for_uint.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f(uint) external {}
+
+    function main() external view {
+        function () h;
+        abi.encodeCall(this.f, (h));
+    }
+}
+// ----
+// TypeError 5407: (137-140): Cannot implicitly convert component at position 0 from "function ()" to "uint256".
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodecall_fail_args_internal_struct_for_uint.sol b/test/libsolidity/syntaxTests/specialFunctions/encodecall_fail_args_internal_struct_for_uint.sol
new file mode 100644
index 0000000000..11b675fb7a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodecall_fail_args_internal_struct_for_uint.sol
@@ -0,0 +1,43 @@
+struct S {
+    function () f;
+}
+
+contract C {
+    enum testEnum { choice1, choice2, choice3 }
+
+    function f1(uint8) external {}
+    function f2(uint32) external {}
+    function f3(uint) external {}
+    function g1(bytes memory) external {}
+    function g2(bytes32) external {}
+    function h(string memory) external {}
+    function i(bool) external {}
+    function j(address) external {}
+    function k(address payable) external {}
+    function l(testEnum) external {}
+
+    function main() external view {
+        S memory s;
+        abi.encodeCall(this.f1, (s));
+        abi.encodeCall(this.f2, (s));
+        abi.encodeCall(this.f3, (s));
+        abi.encodeCall(this.g1, (s));
+        abi.encodeCall(this.g2, (s));
+        abi.encodeCall(this.h, (s));
+        abi.encodeCall(this.i, (s));
+        abi.encodeCall(this.j, (s));
+        abi.encodeCall(this.k, (s));
+        abi.encodeCall(this.l, (s));
+    }
+}
+// ----
+// TypeError 5407: (560-563): Cannot implicitly convert component at position 0 from "struct S memory" to "uint8".
+// TypeError 5407: (598-601): Cannot implicitly convert component at position 0 from "struct S memory" to "uint32".
+// TypeError 5407: (636-639): Cannot implicitly convert component at position 0 from "struct S memory" to "uint256".
+// TypeError 5407: (674-677): Cannot implicitly convert component at position 0 from "struct S memory" to "bytes memory".
+// TypeError 5407: (712-715): Cannot implicitly convert component at position 0 from "struct S memory" to "bytes32".
+// TypeError 5407: (749-752): Cannot implicitly convert component at position 0 from "struct S memory" to "string memory".
+// TypeError 5407: (786-789): Cannot implicitly convert component at position 0 from "struct S memory" to "bool".
+// TypeError 5407: (823-826): Cannot implicitly convert component at position 0 from "struct S memory" to "address".
+// TypeError 5407: (860-863): Cannot implicitly convert component at position 0 from "struct S memory" to "address payable".
+// TypeError 5407: (897-900): Cannot implicitly convert component at position 0 from "struct S memory" to "enum C.testEnum".

From e93ad30e4378492073a0288d55704efca4b68add Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 13 May 2022 18:41:55 +0200
Subject: [PATCH 0616/1748] Remove obsolete enforce-via-yul logic and CI run.

---
 .circleci/config.yml                          | 11 -------
 test/Common.cpp                               |  1 -
 test/Common.h                                 |  1 -
 test/TestCase.h                               |  1 -
 test/boostTest.cpp                            |  4 ---
 test/libsolidity/SemanticTest.cpp             | 32 +++++++------------
 test/libsolidity/SemanticTest.h               |  5 +--
 .../abiEncoderV1/bool_out_of_bounds.sol       |  1 +
 .../abiEncoderV1/cleanup/cleanup.sol          |  1 +
 .../semanticTests/abiEncoderV1/enums.sol      |  1 +
 .../abi_encode_empty_string_v1.sol            |  1 +
 .../arithmetics/checked_add_v1.sol            |  1 +
 .../cleanup/bool_conversion_v1.sol            |  1 +
 .../cleanup/cleanup_address_types_v1.sol      |  1 +
 .../cleanup/cleanup_bytes_types_v1.sol        |  1 +
 .../shifts/shift_right_garbled_signed_v1.sol  |  1 +
 .../shifts/shift_right_garbled_v1.sol         |  1 +
 ...ht_negative_lvalue_signextend_int16_v1.sol |  1 +
 ...ht_negative_lvalue_signextend_int32_v1.sol |  1 +
 ...ght_negative_lvalue_signextend_int8_v1.sol |  1 +
 .../revertStrings/calldata_too_short_v1.sol   |  1 +
 .../semanticTests/revertStrings/empty_v1.sol  |  2 +-
 .../semanticTests/revertStrings/enum_v1.sol   |  1 +
 .../function_entry_checks_v1.sol              |  2 +-
 .../invalid_abi_decoding_calldata_v1.sol      |  1 +
 .../invalid_abi_decoding_memory_v1.sol        |  1 +
 .../types/mapping_enum_key_getter_v1.sol      |  1 +
 .../types/mapping_enum_key_library_v1.sol     |  1 +
 test/tools/IsolTestOptions.cpp                |  1 -
 test/tools/isoltest.cpp                       |  1 -
 30 files changed, 34 insertions(+), 46 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d66bb3d45f..2e779adcb9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1035,16 +1035,6 @@ jobs:
           condition: true
           <<: *steps_soltest
 
-  t_ubu_soltest_enforce_yul: &t_ubu_soltest_enforce_yul
-    <<: *base_ubuntu2004
-    parallelism: 20
-    environment:
-      EVM: << pipeline.parameters.evm-version >>
-      SOLTEST_FLAGS: --enforce-via-yul
-      OPTIMIZE: 0
-      TERM: xterm
-    <<: *steps_soltest
-
   t_ubu_clang_soltest: &t_ubu_clang_soltest
     <<: *base_ubuntu2004_clang
     parallelism: 20
@@ -1515,7 +1505,6 @@ workflows:
       - t_ubu_cli: *workflow_ubuntu2004
       - t_ubu_locale: *workflow_ubuntu2004
       - t_ubu_soltest_all: *workflow_ubuntu2004
-      - t_ubu_soltest_enforce_yul: *workflow_ubuntu2004
       - b_ubu_clang: *workflow_trigger_on_tags
       - t_ubu_clang_soltest: *workflow_ubuntu2004_clang
       - t_ubu_lsp: *workflow_ubuntu2004
diff --git a/test/Common.cpp b/test/Common.cpp
index 8cdf0fed1c..cbe8068762 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -107,7 +107,6 @@ void CommonOptions::addOptions()
 		("no-semantic-tests", po::bool_switch(&disableSemanticTests)->default_value(disableSemanticTests), "disable semantic tests")
 		("no-smt", po::bool_switch(&disableSMT)->default_value(disableSMT), "disable SMT checker")
 		("optimize", po::bool_switch(&optimize)->default_value(optimize), "enables optimization")
-		("enforce-via-yul", po::value<bool>(&enforceViaYul)->default_value(enforceViaYul)->implicit_value(true), "Enforce compiling all tests via yul to see if additional tests can be activated.")
 		("enforce-compile-to-ewasm", po::bool_switch(&enforceCompileToEwasm)->default_value(enforceCompileToEwasm), "Enforce compiling all tests to Ewasm to see if additional tests can be activated.")
 		("enforce-gas-cost", po::value<bool>(&enforceGasTest)->default_value(enforceGasTest)->implicit_value(true), "Enforce checking gas cost in semantic tests.")
 		("enforce-gas-cost-min-value", po::value(&enforceGasTestMinValue)->default_value(enforceGasTestMinValue), "Threshold value to enforce adding gas checks to a test.")
diff --git a/test/Common.h b/test/Common.h
index 28862348f4..d57fe68b60 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -60,7 +60,6 @@ struct CommonOptions
 	boost::filesystem::path testPath;
 	bool ewasm = false;
 	bool optimize = false;
-	bool enforceViaYul = false;
 	bool enforceCompileToEwasm = false;
 	bool enforceGasTest = false;
 	u256 enforceGasTestMinValue = 100000;
diff --git a/test/TestCase.h b/test/TestCase.h
index d63c88b48a..181fb01200 100644
--- a/test/TestCase.h
+++ b/test/TestCase.h
@@ -40,7 +40,6 @@ class TestCase
 		std::string filename;
 		langutil::EVMVersion evmVersion;
 		std::vector<boost::filesystem::path> vmPaths;
-		bool enforceCompileViaYul = false;
 		bool enforceCompileToEwasm = false;
 		bool enforceGasCost = false;
 		u256 enforceGasCostMinValue;
diff --git a/test/boostTest.cpp b/test/boostTest.cpp
index b7a4c80f0a..c104cd8b4c 100644
--- a/test/boostTest.cpp
+++ b/test/boostTest.cpp
@@ -133,7 +133,6 @@ int registerTests(
 	boost::unit_test::test_suite& _suite,
 	boost::filesystem::path const& _basepath,
 	boost::filesystem::path const& _path,
-	bool _enforceViaYul,
 	bool _enforceCompileToEwasm,
 	vector<string> const& _labels,
 	TestCase::TestCaseCreator _testCaseCreator,
@@ -146,7 +145,6 @@ int registerTests(
 		fullpath.string(),
 		solidity::test::CommonOptions::get().evmVersion(),
 		solidity::test::CommonOptions::get().vmPaths,
-		_enforceViaYul,
 		_enforceCompileToEwasm,
 		solidity::test::CommonOptions::get().enforceGasTest,
 		solidity::test::CommonOptions::get().enforceGasTestMinValue,
@@ -165,7 +163,6 @@ int registerTests(
 				numTestsAdded += registerTests(
 					*sub_suite,
 					_basepath, _path / entry.path().filename(),
-					_enforceViaYul,
 					_enforceCompileToEwasm,
 					_labels,
 					_testCaseCreator,
@@ -271,7 +268,6 @@ test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])
 				master,
 				options.testPath / ts.path,
 				ts.subpath,
-				options.enforceViaYul,
 				options.enforceCompileToEwasm,
 				ts.labels,
 				ts.testCaseCreator,
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 3c26f5a97e..e064252863 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -49,7 +49,6 @@ SemanticTest::SemanticTest(
 	string const& _filename,
 	langutil::EVMVersion _evmVersion,
 	vector<boost::filesystem::path> const& _vmPaths,
-	bool _enforceViaYul,
 	bool _enforceCompileToEwasm,
 	bool _enforceGasCost,
 	u256 _enforceGasCostMinValue
@@ -60,27 +59,32 @@ SemanticTest::SemanticTest(
 	m_lineOffset(m_reader.lineNumber()),
 	m_builtins(makeBuiltins()),
 	m_sideEffectHooks(makeSideEffectHooks()),
-	m_enforceViaYul(_enforceViaYul),
 	m_enforceCompileToEwasm(_enforceCompileToEwasm),
 	m_enforceGasCost(_enforceGasCost),
 	m_enforceGasCostMinValue(move(_enforceGasCostMinValue))
 {
-	static set<string> const compileViaYulAllowedValues{"also", "true", "false", "default"};
+	static set<string> const compileViaYulAllowedValues{"also", "true", "false"};
 	static set<string> const yulRunTriggers{"also", "true"};
 	static set<string> const legacyRunTriggers{"also", "false", "default"};
 
+	m_runWithABIEncoderV1Only = m_reader.boolSetting("ABIEncoderV1Only", false);
+	if (m_runWithABIEncoderV1Only && !solidity::test::CommonOptions::get().useABIEncoderV1)
+		m_shouldRun = false;
+
 	string compileViaYul = m_reader.stringSetting("compileViaYul", "default");
+	if (m_runWithABIEncoderV1Only && compileViaYul != "false")
+		BOOST_THROW_EXCEPTION(runtime_error(
+			"ABIEncoderV1Only tests cannot be run via yul, "
+			"so they need to also specify ``compileViaYul: false``"
+		));
 	if (!util::contains(compileViaYulAllowedValues, compileViaYul))
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid compileViaYul value: " + compileViaYul + "."));
 	m_testCaseWantsYulRun = util::contains(yulRunTriggers, compileViaYul);
 	m_testCaseWantsLegacyRun = util::contains(legacyRunTriggers, compileViaYul);
 
-	// Do not enforce via yul and ewasm, if via yul was explicitly denied.
+	// Do not enforce ewasm, if via yul was explicitly denied.
 	if (compileViaYul == "false")
-	{
-		m_enforceViaYul = false;
 		m_enforceCompileToEwasm = false;
-	}
 
 	string compileToEwasm = m_reader.stringSetting("compileToEwasm", "false");
 	if (compileToEwasm == "also")
@@ -97,18 +101,6 @@ SemanticTest::SemanticTest(
 	if (m_testCaseWantsEwasmRun && !m_supportsEwasm)
 		m_testCaseWantsEwasmRun = false;
 
-	m_runWithABIEncoderV1Only = m_reader.boolSetting("ABIEncoderV1Only", false);
-	if (m_runWithABIEncoderV1Only && !solidity::test::CommonOptions::get().useABIEncoderV1)
-		m_shouldRun = false;
-
-	// Sanity check
-	if (m_runWithABIEncoderV1Only && (compileViaYul == "true" || compileViaYul == "also"))
-		BOOST_THROW_EXCEPTION(runtime_error(
-			"ABIEncoderV1Only can not be used with compileViaYul=" + compileViaYul +
-			", set it to false or omit the flag. The compileViaYul setting ignores the abicoder pragma"
-			" and runs everything with ABICoder V2."
-		));
-
 	auto revertStrings = revertStringsFromString(m_reader.stringSetting("revertStrings", "default"));
 	soltestAssert(revertStrings, "Invalid revertStrings setting.");
 	m_revertStrings = revertStrings.value();
@@ -307,7 +299,7 @@ TestCase::TestResult SemanticTest::run(ostream& _stream, string const& _linePref
 	if (m_testCaseWantsLegacyRun)
 		result = runTest(_stream, _linePrefix, _formatted, false, false);
 
-	if ((m_testCaseWantsYulRun || m_enforceViaYul) && result == TestResult::Success)
+	if (m_testCaseWantsYulRun && result == TestResult::Success)
 		result = runTest(_stream, _linePrefix, _formatted, true, false);
 
 	if ((m_testCaseWantsEwasmRun || m_enforceCompileToEwasm) && result == TestResult::Success)
diff --git a/test/libsolidity/SemanticTest.h b/test/libsolidity/SemanticTest.h
index b8093db220..a7507344ce 100644
--- a/test/libsolidity/SemanticTest.h
+++ b/test/libsolidity/SemanticTest.h
@@ -52,7 +52,6 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 			_options.filename,
 			_options.evmVersion,
 			_options.vmPaths,
-			_options.enforceCompileViaYul,
 			_options.enforceCompileToEwasm,
 			_options.enforceGasCost,
 			_options.enforceGasCostMinValue
@@ -63,7 +62,6 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 		std::string const& _filename,
 		langutil::EVMVersion _evmVersion,
 		std::vector<boost::filesystem::path> const& _vmPaths,
-		bool _enforceViaYul = false,
 		bool _enforceCompileToEwasm = false,
 		bool _enforceGasCost = false,
 		u256 _enforceGasCostMinValue = 100000
@@ -97,10 +95,9 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 	std::vector<TestFunctionCall> m_tests;
 	std::map<std::string, Builtin> const m_builtins;
 	std::vector<SideEffectHook> const m_sideEffectHooks;
-	bool m_testCaseWantsYulRun = false;
+	bool m_testCaseWantsYulRun = true;
 	bool m_testCaseWantsEwasmRun = false;
 	bool m_testCaseWantsLegacyRun = true;
-	bool m_enforceViaYul = false;
 	bool m_enforceCompileToEwasm = false;
 	bool m_runWithABIEncoderV1Only = false;
 	bool m_allowNonExistingFunctions = false;
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/bool_out_of_bounds.sol b/test/libsolidity/semanticTests/abiEncoderV1/bool_out_of_bounds.sol
index 92ca61f12e..d9b94ac2e6 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/bool_out_of_bounds.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/bool_out_of_bounds.sol
@@ -4,6 +4,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(bool): true -> true
 // f(bool): false -> false
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/cleanup/cleanup.sol b/test/libsolidity/semanticTests/abiEncoderV1/cleanup/cleanup.sol
index 3a671486fa..262c4412fd 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/cleanup/cleanup.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/cleanup/cleanup.sol
@@ -7,6 +7,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(uint16,int16,address,bytes3,bool): 1, 2, 3, "a", true -> 1, 2, 3, "a", true
 // f(uint16,int16,address,bytes3,bool): 0xffffff, 0x1ffff, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, "abcd", 1 -> 0xffff, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0xffffffffffffffffffffffffffffffffffffffff, "abc", true
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/enums.sol b/test/libsolidity/semanticTests/abiEncoderV1/enums.sol
index b3f32d01e0..a51aaebdef 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/enums.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/enums.sol
@@ -7,6 +7,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(uint8): 0 -> 0
 // f(uint8): 1 -> 1
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_empty_string_v1.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_empty_string_v1.sol
index b35266ced7..9f7216e6bc 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_empty_string_v1.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_empty_string_v1.sol
@@ -8,5 +8,6 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f() -> 0x40, 0xa0, 0x40, 0x20, 0x0, 0x0
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_add_v1.sol b/test/libsolidity/semanticTests/arithmetics/checked_add_v1.sol
index 600ddee079..03c2bb5675 100644
--- a/test/libsolidity/semanticTests/arithmetics/checked_add_v1.sol
+++ b/test/libsolidity/semanticTests/arithmetics/checked_add_v1.sol
@@ -7,6 +7,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(uint16,uint16): 65534, 0 -> 0xfffe
 // f(uint16,uint16): 65536, 0 -> 0x00
diff --git a/test/libsolidity/semanticTests/cleanup/bool_conversion_v1.sol b/test/libsolidity/semanticTests/cleanup/bool_conversion_v1.sol
index 531f4d05c9..18fa6ed651 100644
--- a/test/libsolidity/semanticTests/cleanup/bool_conversion_v1.sol
+++ b/test/libsolidity/semanticTests/cleanup/bool_conversion_v1.sol
@@ -11,6 +11,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(bool): 0x0 -> 0x0
 // f(bool): 0x1 -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v1.sol b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v1.sol
index 7c71d8bd64..a8622cb0b5 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v1.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v1.sol
@@ -13,6 +13,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(address): 0xffff1234567890123456789012345678901234567890 -> 0x0 # We input longer data on purpose.#
 // g(address): 0xffff1234567890123456789012345678901234567890 -> 0x0
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v1.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v1.sol
index ac085cd561..097da51e46 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v1.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v1.sol
@@ -10,5 +10,6 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(bytes2,uint16): "abc", 0x40102 -> 0x0 # We input longer data on purpose. #
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v1.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v1.sol
index 4e1779d271..094d75b683 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v1.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v1.sol
@@ -18,6 +18,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(int8,uint8): 0x00, 0x03 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
 // f(int8,uint8): 0x00, 0x04 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v1.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v1.sol
index 8649871a01..8412e372bb 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v1.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v1.sol
@@ -10,6 +10,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(uint8,uint8): 0x00, 0x04 -> 0x0f
 // f(uint8,uint8): 0x00, 0x1004 -> 0x0f
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v1.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v1.sol
index 8200f69cfe..0b8d0e833f 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v1.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v1.sol
@@ -6,6 +6,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(int16,uint16): 0xff99, 0x00 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff99
 // f(int16,uint16): 0xff99, 0x01 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcc
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v1.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v1.sol
index 245925b3de..a6b6378c65 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v1.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v1.sol
@@ -6,6 +6,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(int32,uint32): 0xffffff99, 0x00 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff99
 // f(int32,uint32): 0xffffff99, 0x01 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcc
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v1.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v1.sol
index 4b557fccc4..52529a85c9 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v1.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v1.sol
@@ -6,6 +6,7 @@ contract C {
 }
 // ====
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(int8,uint8): 0x99, 0x00 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff99
 // f(int8,uint8): 0x99, 0x01 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffcc
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_too_short_v1.sol b/test/libsolidity/semanticTests/revertStrings/calldata_too_short_v1.sol
index e9fc7e3313..4677d350f6 100644
--- a/test/libsolidity/semanticTests/revertStrings/calldata_too_short_v1.sol
+++ b/test/libsolidity/semanticTests/revertStrings/calldata_too_short_v1.sol
@@ -8,5 +8,6 @@ contract C {
 // EVMVersion: >=byzantium
 // revertStrings: debug
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // d(bytes): 0x20, 0x01, 0x0000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"08c379a0", 0x20, 18, "Calldata too short"
diff --git a/test/libsolidity/semanticTests/revertStrings/empty_v1.sol b/test/libsolidity/semanticTests/revertStrings/empty_v1.sol
index 4e6fffc79b..b9658c794d 100644
--- a/test/libsolidity/semanticTests/revertStrings/empty_v1.sol
+++ b/test/libsolidity/semanticTests/revertStrings/empty_v1.sol
@@ -10,8 +10,8 @@ contract C {
 // ====
 // ABIEncoderV1Only: true
 // EVMVersion: >=byzantium
-// compileViaYul: false
 // revertStrings: debug
+// compileViaYul: false
 // ----
 // f() -> FAILURE, hex"08c379a0", 0x20, 0
 // g(string): 0x20, 0, "" -> FAILURE, hex"08c379a0", 0x20, 0
diff --git a/test/libsolidity/semanticTests/revertStrings/enum_v1.sol b/test/libsolidity/semanticTests/revertStrings/enum_v1.sol
index ebf042653c..305e43a573 100644
--- a/test/libsolidity/semanticTests/revertStrings/enum_v1.sol
+++ b/test/libsolidity/semanticTests/revertStrings/enum_v1.sol
@@ -9,5 +9,6 @@ contract C {
 // EVMVersion: >=byzantium
 // revertStrings: debug
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(uint8[]): 0x20, 2, 3, 3 -> FAILURE, hex"08c379a0", 0x20, 17, "Enum out of range"
diff --git a/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol
index 2a57f728b5..13c3d8542b 100644
--- a/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol
+++ b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v1.sol
@@ -5,7 +5,7 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // ABIEncoderV1Only: true
-// compileViaYul: false
 // revertStrings: debug
+// compileViaYul: false
 // ----
 // t(uint256) -> FAILURE, hex"08c379a0", 0x20, 0x12, "Calldata too short"
diff --git a/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_calldata_v1.sol b/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_calldata_v1.sol
index a74af7c1cd..41cd0f4d26 100644
--- a/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_calldata_v1.sol
+++ b/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_calldata_v1.sol
@@ -8,6 +8,7 @@ contract C {
 // EVMVersion: >=byzantium
 // revertStrings: debug
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // d(bytes): 0x20, 0x20, 0x0000000000000000000000000000000000000000000000000000000000000000 -> 0
 // d(bytes): 0x100, 0x20, 0x0000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI calldata decoding: invalid h", "ead pointer"
diff --git a/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_memory_v1.sol b/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_memory_v1.sol
index 3f4c8cb3b6..af9d822dd6 100644
--- a/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_memory_v1.sol
+++ b/test/libsolidity/semanticTests/revertStrings/invalid_abi_decoding_memory_v1.sol
@@ -16,6 +16,7 @@ contract C {
 // EVMVersion: >=byzantium
 // revertStrings: debug
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // f(uint256,uint256,uint256): 0, 0x200, 0x60 -> FAILURE, hex"08c379a0", 0x20, 39, "ABI memory decoding: invalid dat", "a start"
 // f(uint256,uint256,uint256): 0, 0x20, 0x60 -> FAILURE, hex"08c379a0", 0x20, 40, "ABI memory decoding: invalid dat", "a length"
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v1.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v1.sol
index 973432d80e..b34ef77986 100644
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v1.sol
+++ b/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v1.sol
@@ -12,6 +12,7 @@ contract test {
 // ====
 // ABIEncoderV1Only: true
 // EVMVersion: >=byzantium
+// compileViaYul: false
 // ----
 // table(uint8): 0 -> 0
 // table(uint8): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_library_v1.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_library_v1.sol
index 3df034fc74..798ef812aa 100644
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_library_v1.sol
+++ b/test/libsolidity/semanticTests/types/mapping_enum_key_library_v1.sol
@@ -20,6 +20,7 @@ contract test {
 // ====
 // EVMVersion: >=byzantium
 // ABIEncoderV1Only: true
+// compileViaYul: false
 // ----
 // library: L
 // get(uint8): 0 -> 0
diff --git a/test/tools/IsolTestOptions.cpp b/test/tools/IsolTestOptions.cpp
index ca7761d744..0994b63a83 100644
--- a/test/tools/IsolTestOptions.cpp
+++ b/test/tools/IsolTestOptions.cpp
@@ -59,7 +59,6 @@ std::string editorPath()
 IsolTestOptions::IsolTestOptions():
 	CommonOptions(description)
 {
-	enforceViaYul = true;
 }
 
 void IsolTestOptions::addOptions()
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index ce45819b87..6e00b12d6e 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -160,7 +160,6 @@ TestTool::Result TestTool::process()
 				m_path.string(),
 				m_options.evmVersion(),
 				m_options.vmPaths,
-				m_options.enforceViaYul,
 				m_options.enforceCompileToEwasm,
 				m_options.enforceGasTest,
 				m_options.enforceGasTestMinValue

From 788dc6b4c83364ab32022ce01b6eebc346621e55 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 19 May 2022 19:21:19 +0200
Subject: [PATCH 0617/1748] Remove canEnableViaYul logic and default to
 compiling also via yul.

---
 test/libsolidity/SemanticTest.cpp | 27 ++++-----------------------
 test/libsolidity/SemanticTest.h   |  1 -
 2 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index e064252863..c2c95324c3 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -71,7 +71,7 @@ SemanticTest::SemanticTest(
 	if (m_runWithABIEncoderV1Only && !solidity::test::CommonOptions::get().useABIEncoderV1)
 		m_shouldRun = false;
 
-	string compileViaYul = m_reader.stringSetting("compileViaYul", "default");
+	string compileViaYul = m_reader.stringSetting("compileViaYul", "also");
 	if (m_runWithABIEncoderV1Only && compileViaYul != "false")
 		BOOST_THROW_EXCEPTION(runtime_error(
 			"ABIEncoderV1Only tests cannot be run via yul, "
@@ -345,7 +345,6 @@ TestCase::TestResult SemanticTest::runTest(
 		m_compileToEwasm = _isEwasmRun;
 	}
 
-	m_canEnableYulRun = false;
 	m_canEnableEwasmRun = false;
 
 	if (_isYulRun)
@@ -465,18 +464,6 @@ TestCase::TestResult SemanticTest::runTest(
 		success &= test.call().expectedSideEffects == test.call().actualSideEffects;
 	}
 
-	if (!m_testCaseWantsYulRun && _isYulRun)
-	{
-		m_canEnableYulRun = success;
-		string message = success ?
-			"Test can pass via Yul, but marked with \"compileViaYul: false.\"" :
-			"Test compiles via Yul, but it gives different test results.";
-		AnsiColorized(_stream, _formatted, {BOLD, success ? YELLOW : MAGENTA}) <<
-			_linePrefix << endl <<
-			_linePrefix << message << endl;
-		return TestResult::Failure;
-	}
-
 	// Right now we have sometimes different test results in Yul vs. Ewasm.
 	// The main reason is that Ewasm just returns a failure in some cases.
 	// TODO: If Ewasm support got fully implemented, we could implement this in the same way as above.
@@ -654,25 +641,19 @@ void SemanticTest::printUpdatedExpectations(ostream& _stream, string const&) con
 void SemanticTest::printUpdatedSettings(ostream& _stream, string const& _linePrefix)
 {
 	auto& settings = m_reader.settings();
-	if (settings.empty() && !m_canEnableYulRun)
+	if (settings.empty() && !m_canEnableEwasmRun)
 		return;
 
 	_stream << _linePrefix << "// ====" << endl;
 	if (m_canEnableEwasmRun)
 	{
-		soltestAssert(m_canEnableYulRun || m_testCaseWantsYulRun, "");
-		string compileViaYul = m_reader.stringSetting("compileViaYul", "");
-		if (!compileViaYul.empty())
-			_stream << _linePrefix << "// compileViaYul: " << compileViaYul << "\n";
+		soltestAssert(m_testCaseWantsYulRun, "");
 		_stream << _linePrefix << "// compileToEwasm: also\n";
 	}
-	else if (m_canEnableYulRun)
-		_stream << _linePrefix << "// compileViaYul: also\n";
 
 	for (auto const& [settingName, settingValue]: settings)
 		if (
-			!(settingName == "compileToEwasm" && m_canEnableEwasmRun) &&
-			!(settingName == "compileViaYul" && (m_canEnableYulRun || m_canEnableEwasmRun))
+			!(settingName == "compileToEwasm" && m_canEnableEwasmRun)
 		)
 			_stream << _linePrefix << "// " << settingName << ": " << settingValue<< endl;
 }
diff --git a/test/libsolidity/SemanticTest.h b/test/libsolidity/SemanticTest.h
index a7507344ce..dd189f1b53 100644
--- a/test/libsolidity/SemanticTest.h
+++ b/test/libsolidity/SemanticTest.h
@@ -101,7 +101,6 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 	bool m_enforceCompileToEwasm = false;
 	bool m_runWithABIEncoderV1Only = false;
 	bool m_allowNonExistingFunctions = false;
-	bool m_canEnableYulRun = false;
 	bool m_canEnableEwasmRun = false;
 	bool m_gasCostFailure = false;
 	bool m_enforceGasCost = false;

From 58d21f1e9dde6a1d491f50b07b1c4da45146fa3e Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 19 May 2022 19:31:10 +0200
Subject: [PATCH 0618/1748] Remove // compileViaYul: also

---
 .../semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol      | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol       | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_static_array.sol       | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol    | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_trivial.sol            | 1 -
 test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol    | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol        | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_v2_storage.sol         | 1 -
 test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol       | 1 -
 test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol  | 1 -
 .../semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol     | 1 -
 .../semanticTests/abiEncoderV1/abi_encode_decode_simple.sol      | 1 -
 .../semanticTests/abiEncoderV1/abi_encode_rational.sol           | 1 -
 test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol      | 1 -
 .../semanticTests/abiEncoderV1/calldata_arrays_too_large.sol     | 1 -
 test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol     | 1 -
 test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol   | 1 -
 .../semanticTests/abiEncoderV1/dynamic_memory_copy.sol           | 1 -
 .../abiEncoderV1/memory_params_in_external_function.sol          | 1 -
 .../abiEncoderV1/return_dynamic_types_cross_call_advanced.sol    | 1 -
 .../return_dynamic_types_cross_call_out_of_range_1.sol           | 1 -
 .../return_dynamic_types_cross_call_out_of_range_2.sol           | 1 -
 .../abiEncoderV1/return_dynamic_types_cross_call_simple.sol      | 1 -
 .../semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol     | 1 -
 .../semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol     | 1 -
 .../semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol    | 1 -
 .../semanticTests/abiEncoderV2/abi_encode_rational_v2.sol        | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol    | 1 -
 .../abi_encode_v2_in_function_inherited_in_v1_contract.sol       | 1 -
 .../abi_encode_v2_in_modifier_used_in_v1_contract.sol            | 1 -
 .../semanticTests/abiEncoderV2/bool_out_of_bounds.sol            | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol      | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol   | 1 -
 .../semanticTests/abiEncoderV2/calldata_array_dynamic.sol        | 1 -
 .../abiEncoderV2/calldata_array_dynamic_index_access.sol         | 1 -
 .../abiEncoderV2/calldata_array_dynamic_static_dynamic.sol       | 1 -
 .../abiEncoderV2/calldata_array_dynamic_static_short_decode.sol  | 1 -
 .../calldata_array_dynamic_static_short_reencode.sol             | 1 -
 .../semanticTests/abiEncoderV2/calldata_array_function_types.sol | 1 -
 .../semanticTests/abiEncoderV2/calldata_array_multi_dynamic.sol  | 1 -
 .../semanticTests/abiEncoderV2/calldata_array_short.sol          | 1 -
 .../abiEncoderV2/calldata_array_short_no_revert_string.sol       | 1 -
 .../semanticTests/abiEncoderV2/calldata_array_static.sol         | 1 -
 .../abiEncoderV2/calldata_array_static_dynamic_static.sol        | 1 -
 .../abiEncoderV2/calldata_array_static_index_access.sol          | 1 -
 .../semanticTests/abiEncoderV2/calldata_array_struct_dynamic.sol | 1 -
 .../semanticTests/abiEncoderV2/calldata_array_two_dynamic.sol    | 1 -
 .../semanticTests/abiEncoderV2/calldata_array_two_static.sol     | 1 -
 .../abiEncoderV2/calldata_nested_array_reencode.sol              | 1 -
 .../abiEncoderV2/calldata_nested_array_static_reencode.sol       | 1 -
 .../semanticTests/abiEncoderV2/calldata_struct_dynamic.sol       | 1 -
 .../semanticTests/abiEncoderV2/calldata_struct_member_offset.sol | 1 -
 .../semanticTests/abiEncoderV2/calldata_struct_simple.sol        | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol  | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol     | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol   | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol  | 1 -
 .../semanticTests/abiEncoderV2/cleanup/dynamic_array.sol         | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol     | 1 -
 .../semanticTests/abiEncoderV2/cleanup/simple_struct.sol         | 1 -
 .../semanticTests/abiEncoderV2/cleanup/static_array.sol          | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol    | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol   | 1 -
 .../semanticTests/abiEncoderV2/dynamic_nested_arrays.sol         | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/enums.sol            | 1 -
 .../abiEncoderV2/memory_params_in_external_function.sol          | 1 -
 .../semanticTests/abiEncoderV2/storage_array_encoding.sol        | 1 -
 .../semanticTests/abiEncoderV2/struct/mediocre2_struct.sol       | 1 -
 .../semanticTests/abiEncoderV2/struct/mediocre_struct.sol        | 1 -
 .../semanticTests/abiEncoderV2/struct/struct_function.sol        | 1 -
 .../semanticTests/abiEncoderV2/struct/struct_short.sol           | 1 -
 .../semanticTests/abiEncoderV2/struct/struct_simple.sol          | 1 -
 .../semanticTests/abiEncoderV2/struct/struct_validation.sol      | 1 -
 .../struct/validation_function_type_inside_struct.sol            | 1 -
 .../semanticTests/abiencodedecode/abi_decode_calldata.sol        | 1 -
 .../semanticTests/abiencodedecode/abi_decode_simple.sol          | 1 -
 .../semanticTests/abiencodedecode/abi_decode_simple_storage.sol  | 1 -
 .../semanticTests/abiencodedecode/abi_encode_call.sol            | 1 -
 .../abiencodedecode/abi_encode_call_declaration.sol              | 1 -
 .../abiencodedecode/abi_encode_call_is_consistent.sol            | 1 -
 .../semanticTests/abiencodedecode/abi_encode_call_memory.sol     | 1 -
 .../abiencodedecode/abi_encode_call_special_args.sol             | 1 -
 .../semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol | 1 -
 .../semanticTests/abiencodedecode/abi_encode_with_selector.sol   | 1 -
 .../semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol | 1 -
 .../semanticTests/abiencodedecode/abi_encode_with_signature.sol  | 1 -
 .../abiencodedecode/abi_encode_with_signaturev2.sol              | 1 -
 .../libsolidity/semanticTests/abiencodedecode/contract_array.sol | 1 -
 .../semanticTests/abiencodedecode/contract_array_v2.sol          | 1 -
 .../abiencodedecode/offset_overflow_in_array_decoding.sol        | 1 -
 .../abiencodedecode/offset_overflow_in_array_decoding_2.sol      | 1 -
 .../abiencodedecode/offset_overflow_in_array_decoding_3.sol      | 1 -
 .../semanticTests/accessor/accessor_for_const_state_variable.sol | 1 -
 .../semanticTests/accessor/accessor_for_state_variable.sol       | 1 -
 test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol     | 1 -
 .../libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol | 1 -
 .../semanticTests/arithmetics/block_inside_unchecked.sol         | 1 -
 test/libsolidity/semanticTests/arithmetics/check_var_init.sol    | 1 -
 test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol    | 1 -
 .../semanticTests/arithmetics/checked_called_by_unchecked.sol    | 1 -
 .../arithmetics/checked_modifier_called_by_unchecked.sol         | 1 -
 test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol  | 1 -
 test/libsolidity/semanticTests/arithmetics/exp_associativity.sol | 1 -
 test/libsolidity/semanticTests/arithmetics/signed_mod.sol        | 1 -
 .../semanticTests/arithmetics/unchecked_called_by_checked.sol    | 1 -
 .../semanticTests/arithmetics/unchecked_div_by_zero.sol          | 1 -
 .../semanticTests/array/arrays_complex_from_and_to_storage.sol   | 1 -
 .../semanticTests/array/byte_array_storage_layout.sol            | 1 -
 .../semanticTests/array/byte_array_transitional_2.sol            | 1 -
 test/libsolidity/semanticTests/array/bytes_length_member.sol     | 1 -
 .../semanticTests/array/bytes_to_fixed_bytes_simple.sol          | 1 -
 .../semanticTests/array/bytes_to_fixed_bytes_too_long.sol        | 1 -
 test/libsolidity/semanticTests/array/calldata_array.sol          | 1 -
 .../array/calldata_array_as_argument_internal_function.sol       | 1 -
 .../semanticTests/array/calldata_array_dynamic_invalid.sol       | 1 -
 .../array/calldata_array_dynamic_invalid_static_middle.sol       | 1 -
 .../libsolidity/semanticTests/array/calldata_array_of_struct.sol | 1 -
 .../semanticTests/array/calldata_array_two_dimensional.sol       | 1 -
 .../semanticTests/array/calldata_array_two_dimensional_1.sol     | 1 -
 .../semanticTests/array/calldata_bytes_array_bounds.sol          | 1 -
 test/libsolidity/semanticTests/array/calldata_slice_access.sol   | 1 -
 .../semanticTests/array/concat/bytes_concat_2_args.sol           | 1 -
 .../semanticTests/array/concat/bytes_concat_3_args.sol           | 1 -
 .../semanticTests/array/concat/bytes_concat_as_argument.sol      | 1 -
 .../semanticTests/array/concat/bytes_concat_different_types.sol  | 1 -
 .../array/concat/bytes_concat_empty_argument_list.sol            | 1 -
 .../semanticTests/array/concat/bytes_concat_empty_strings.sol    | 1 -
 .../semanticTests/array/concat/bytes_concat_nested.sol           | 1 -
 .../semanticTests/array/constant_var_as_array_length.sol         | 1 -
 .../semanticTests/array/copying/array_copy_calldata_storage.sol  | 1 -
 .../semanticTests/array/copying/array_copy_cleanup_uint128.sol   | 1 -
 .../semanticTests/array/copying/array_copy_cleanup_uint40.sol    | 1 -
 .../semanticTests/array/copying/array_copy_clear_storage.sol     | 1 -
 .../array/copying/array_copy_clear_storage_packed.sol            | 1 -
 .../semanticTests/array/copying/array_copy_different_packing.sol | 1 -
 .../semanticTests/array/copying/array_copy_including_array.sol   | 1 -
 .../semanticTests/array/copying/array_copy_memory_to_storage.sol | 1 -
 .../semanticTests/array/copying/array_copy_nested_array.sol      | 1 -
 .../array/copying/array_copy_storage_abi_signed.sol              | 1 -
 .../array/copying/array_copy_storage_storage_different_base.sol  | 1 -
 .../copying/array_copy_storage_storage_different_base_nested.sol | 1 -
 .../array/copying/array_copy_storage_storage_dyn_dyn.sol         | 1 -
 .../array/copying/array_copy_storage_storage_dynamic_dynamic.sol | 1 -
 .../array/copying/array_copy_storage_storage_static_dynamic.sol  | 1 -
 .../array/copying/array_copy_storage_storage_static_simple.sol   | 1 -
 .../array/copying/array_copy_storage_storage_static_static.sol   | 1 -
 .../array/copying/array_copy_storage_storage_struct.sol          | 1 -
 .../semanticTests/array/copying/array_copy_storage_to_memory.sol | 1 -
 .../array/copying/array_copy_storage_to_memory_nested.sol        | 1 -
 .../semanticTests/array/copying/array_copy_target_leftover.sol   | 1 -
 .../semanticTests/array/copying/array_copy_target_leftover2.sol  | 1 -
 .../semanticTests/array/copying/array_copy_target_simple.sol     | 1 -
 .../semanticTests/array/copying/array_copy_target_simple_2.sol   | 1 -
 .../array/copying/array_nested_calldata_to_memory.sol            | 1 -
 .../array/copying/array_nested_memory_to_storage.sol             | 1 -
 .../array_of_function_external_storage_to_storage_dynamic.sol    | 1 -
 ..._external_storage_to_storage_dynamic_different_mutability.sol | 1 -
 .../array/copying/array_of_struct_calldata_to_memory.sol         | 1 -
 .../array_of_structs_containing_arrays_calldata_to_memory.sol    | 1 -
 .../array/copying/array_storage_multi_items_per_slot.sol         | 1 -
 .../semanticTests/array/copying/arrays_from_and_to_storage.sol   | 1 -
 .../array/copying/bytes_calldata_to_string_calldata.sol          | 1 -
 .../semanticTests/array/copying/bytes_inside_mappings.sol        | 1 -
 .../semanticTests/array/copying/bytes_memory_to_storage.sol      | 1 -
 .../semanticTests/array/copying/bytes_storage_to_memory.sol      | 1 -
 .../semanticTests/array/copying/bytes_storage_to_storage.sol     | 1 -
 .../semanticTests/array/copying/calldata_2d_bytes_to_memory.sol  | 1 -
 .../array/copying/calldata_2d_bytes_to_memory_2.sol              | 1 -
 .../array/copying/calldata_array_dynamic_to_storage.sol          | 1 -
 .../array/copying/calldata_array_of_struct_to_memory.sol         | 1 -
 .../array/copying/calldata_array_static_to_memory.sol            | 1 -
 .../array/copying/calldata_bytes_array_to_memory.sol             | 1 -
 .../semanticTests/array/copying/calldata_bytes_to_storage.sol    | 1 -
 .../array/copying/calldata_dyn_2d_bytes_to_memory.sol            | 1 -
 .../array/copying/calldata_dynamic_array_to_memory.sol           | 1 -
 .../array/copying/calldata_nested_array_copy_to_memory.sol       | 1 -
 .../array/copying/calldata_to_storage_different_base.sol         | 1 -
 .../array/copying/copy_byte_array_in_struct_to_storage.sol       | 1 -
 .../semanticTests/array/copying/copy_byte_array_to_storage.sol   | 1 -
 .../array/copying/copy_function_internal_storage_array.sol       | 1 -
 .../array/copying/copy_internal_function_array_to_storage.sol    | 1 -
 .../semanticTests/array/copying/copy_removes_bytes_data.sol      | 1 -
 .../semanticTests/array/copying/copying_bytes_multiassign.sol    | 1 -
 .../libsolidity/semanticTests/array/copying/empty_bytes_copy.sol | 1 -
 .../array/copying/memory_dyn_2d_bytes_to_storage.sol             | 1 -
 .../array/copying/memory_to_storage_different_base.sol           | 1 -
 .../semanticTests/array/copying/storage_memory_nested.sol        | 1 -
 .../semanticTests/array/copying/storage_memory_nested_bytes.sol  | 1 -
 .../array/copying/storage_memory_nested_from_pointer.sol         | 1 -
 .../semanticTests/array/copying/storage_memory_nested_struct.sol | 1 -
 .../semanticTests/array/copying/storage_memory_packed.sol        | 1 -
 .../semanticTests/array/copying/storage_memory_packed_dyn.sol    | 1 -
 .../array/copying/string_calldata_to_bytes_calldata.sol          | 1 -
 .../array/create_dynamic_array_with_zero_length.sol              | 1 -
 test/libsolidity/semanticTests/array/create_memory_array.sol     | 1 -
 .../semanticTests/array/create_memory_array_too_large.sol        | 1 -
 .../libsolidity/semanticTests/array/create_memory_byte_array.sol | 1 -
 .../semanticTests/array/create_multiple_dynamic_arrays.sol       | 1 -
 .../semanticTests/array/delete/bytes_delete_element.sol          | 1 -
 .../semanticTests/array/delete/delete_bytes_array.sol            | 1 -
 .../semanticTests/array/delete/delete_memory_array.sol           | 1 -
 .../semanticTests/array/delete/delete_on_array_of_structs.sol    | 1 -
 .../semanticTests/array/delete/delete_removes_bytes_data.sol     | 1 -
 .../semanticTests/array/delete/delete_storage_array.sol          | 1 -
 .../semanticTests/array/delete/delete_storage_array_packed.sol   | 1 -
 .../semanticTests/array/delete/memory_arrays_delete.sol          | 1 -
 test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol   | 1 -
 .../semanticTests/array/dynamic_arrays_in_storage.sol            | 1 -
 .../semanticTests/array/dynamic_multi_array_cleanup.sol          | 1 -
 .../semanticTests/array/dynamic_out_of_bounds_array_access.sol   | 1 -
 .../semanticTests/array/evm_exceptions_out_of_band_access.sol    | 1 -
 test/libsolidity/semanticTests/array/external_array_args.sol     | 1 -
 test/libsolidity/semanticTests/array/fixed_array_cleanup.sol     | 1 -
 .../semanticTests/array/fixed_arrays_as_return_type.sol          | 1 -
 .../semanticTests/array/fixed_arrays_in_constructors.sol         | 1 -
 test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol | 1 -
 .../semanticTests/array/fixed_bytes_length_access.sol            | 1 -
 .../semanticTests/array/fixed_out_of_bounds_array_access.sol     | 1 -
 .../semanticTests/array/function_array_cross_calls.sol           | 1 -
 test/libsolidity/semanticTests/array/function_memory_array.sol   | 1 -
 .../array/indexAccess/arrays_complex_memory_index_access.sol     | 1 -
 .../semanticTests/array/indexAccess/bytes_index_access.sol       | 1 -
 .../array/indexAccess/bytes_index_access_memory.sol              | 1 -
 .../array/indexAccess/bytes_memory_index_access.sol              | 1 -
 .../semanticTests/array/indexAccess/fixed_bytes_index_access.sol | 1 -
 .../libsolidity/semanticTests/array/indexAccess/index_access.sol | 1 -
 .../array/indexAccess/inline_array_index_access_ints.sol         | 1 -
 .../array/indexAccess/inline_array_index_access_strings.sol      | 1 -
 .../indexAccess/memory_arrays_dynamic_index_access_write.sol     | 1 -
 .../array/indexAccess/memory_arrays_index_access_write.sol       | 1 -
 test/libsolidity/semanticTests/array/inline_array_return.sol     | 1 -
 test/libsolidity/semanticTests/array/inline_array_singleton.sol  | 1 -
 .../array/inline_array_storage_to_memory_conversion_ints.sol     | 1 -
 .../array/inline_array_storage_to_memory_conversion_strings.sol  | 1 -
 .../semanticTests/array/inline_array_strings_from_document.sol   | 1 -
 .../array/invalid_encoding_for_storage_byte_array.sol            | 1 -
 test/libsolidity/semanticTests/array/memory.sol                  | 1 -
 .../semanticTests/array/memory_arrays_of_various_sizes.sol       | 1 -
 test/libsolidity/semanticTests/array/pop/array_pop.sol           | 1 -
 .../semanticTests/array/pop/array_pop_array_transition.sol       | 1 -
 .../semanticTests/array/pop/array_pop_empty_exception.sol        | 1 -
 test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol  | 1 -
 .../semanticTests/array/pop/array_pop_storage_empty.sol          | 1 -
 .../semanticTests/array/pop/array_pop_uint16_transition.sol      | 1 -
 .../semanticTests/array/pop/array_pop_uint24_transition.sol      | 1 -
 test/libsolidity/semanticTests/array/pop/byte_array_pop.sol      | 1 -
 .../semanticTests/array/pop/byte_array_pop_copy_long.sol         | 1 -
 .../semanticTests/array/pop/byte_array_pop_empty_exception.sol   | 1 -
 .../semanticTests/array/pop/byte_array_pop_isolated.sol          | 1 -
 .../array/pop/byte_array_pop_long_storage_empty.sol              | 1 -
 .../array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol  | 1 -
 .../semanticTests/array/pop/byte_array_pop_masking_long.sol      | 1 -
 .../semanticTests/array/pop/byte_array_pop_storage_empty.sol     | 1 -
 test/libsolidity/semanticTests/array/pop/parenthesized.sol       | 1 -
 test/libsolidity/semanticTests/array/push/array_push.sol         | 1 -
 test/libsolidity/semanticTests/array/push/array_push_nested.sol  | 1 -
 .../semanticTests/array/push/array_push_nested_from_calldata.sol | 1 -
 .../semanticTests/array/push/array_push_nested_from_memory.sol   | 1 -
 .../semanticTests/array/push/array_push_packed_array.sol         | 1 -
 test/libsolidity/semanticTests/array/push/array_push_struct.sol  | 1 -
 .../semanticTests/array/push/array_push_struct_from_calldata.sol | 1 -
 test/libsolidity/semanticTests/array/push/byte_array_push.sol    | 1 -
 .../semanticTests/array/push/byte_array_push_transition.sol      | 1 -
 test/libsolidity/semanticTests/array/push/nested_bytes_push.sol  | 1 -
 test/libsolidity/semanticTests/array/push/push_no_args_1d.sol    | 1 -
 test/libsolidity/semanticTests/array/push/push_no_args_2d.sol    | 1 -
 test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol | 1 -
 .../libsolidity/semanticTests/array/push/push_no_args_struct.sol | 1 -
 test/libsolidity/semanticTests/array/reusing_memory.sol          | 1 -
 .../semanticTests/array/short_fixed_array_cleanup.sol            | 1 -
 .../semanticTests/array/slices/array_calldata_assignment.sol     | 1 -
 .../array_slice_calldata_as_argument_of_external_calls.sol       | 1 -
 .../array/slices/array_slice_calldata_to_calldata.sol            | 1 -
 .../array/slices/array_slice_calldata_to_memory.sol              | 1 -
 .../array/slices/array_slice_calldata_to_storage.sol             | 1 -
 test/libsolidity/semanticTests/array/storage_array_ref.sol       | 1 -
 test/libsolidity/semanticTests/array/string_allocation_bug.sol   | 1 -
 test/libsolidity/semanticTests/array/string_bytes_conversion.sol | 1 -
 .../array/string_literal_assign_to_storage_bytes.sol             | 1 -
 test/libsolidity/semanticTests/array/strings_in_struct.sol       | 1 -
 test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol     | 1 -
 test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol  | 1 -
 test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol    | 1 -
 .../assignment_to_const_var_involving_keccak.sol                 | 1 -
 test/libsolidity/semanticTests/builtinFunctions/blockhash.sol    | 1 -
 .../builtinFunctions/blockhash_shadow_resolution.sol             | 1 -
 .../semanticTests/builtinFunctions/function_types_sig.sol        | 1 -
 .../builtinFunctions/iterated_keccak256_with_bytes.sol           | 1 -
 .../semanticTests/builtinFunctions/keccak256_empty.sol           | 1 -
 .../builtinFunctions/keccak256_multiple_arguments.sol            | 1 -
 .../keccak256_multiple_arguments_with_numeric_literals.sol       | 1 -
 .../keccak256_multiple_arguments_with_string_literals.sol        | 1 -
 .../semanticTests/builtinFunctions/keccak256_with_bytes.sol      | 1 -
 test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol      | 1 -
 .../builtinFunctions/msg_sig_after_internal_call_is_same.sol     | 1 -
 .../semanticTests/builtinFunctions/ripemd160_empty.sol           | 1 -
 test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol | 1 -
 test/libsolidity/semanticTests/c99_scoping_activation.sol        | 1 -
 test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol | 1 -
 .../calldata/calldata_bound_dynamic_array_or_slice.sol           | 1 -
 .../semanticTests/calldata/calldata_bound_static_array.sol       | 1 -
 .../libsolidity/semanticTests/calldata/calldata_bound_struct.sol | 1 -
 .../semanticTests/calldata/calldata_bytes_external.sol           | 1 -
 .../semanticTests/calldata/calldata_bytes_internal.sol           | 1 -
 .../semanticTests/calldata/calldata_bytes_to_memory.sol          | 1 -
 .../semanticTests/calldata/calldata_bytes_to_memory_encode.sol   | 1 -
 .../calldata/calldata_internal_function_pointer.sol              | 1 -
 .../semanticTests/calldata/calldata_internal_library.sol         | 1 -
 .../semanticTests/calldata/calldata_internal_multi_array.sol     | 1 -
 .../calldata/calldata_internal_multi_fixed_array.sol             | 1 -
 .../libsolidity/semanticTests/calldata/calldata_memory_mixed.sol | 1 -
 .../libsolidity/semanticTests/calldata/calldata_string_array.sol | 1 -
 test/libsolidity/semanticTests/calldata/calldata_struct.sol      | 1 -
 .../semanticTests/calldata/calldata_struct_cleaning.sol          | 1 -
 .../semanticTests/calldata/calldata_struct_internal.sol          | 1 -
 .../calldata/copy_from_calldata_removes_bytes_data.sol           | 1 -
 test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol    | 1 -
 .../semanticTests/cleanup/cleanup_address_types_shortening.sol   | 1 -
 .../semanticTests/cleanup/cleanup_address_types_v2.sol           | 1 -
 .../libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol | 1 -
 .../semanticTests/cleanup/cleanup_in_compound_assign.sol         | 1 -
 test/libsolidity/semanticTests/cleanup/exp_cleanup.sol           | 1 -
 test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol    | 1 -
 .../semanticTests/cleanup/exp_cleanup_nonzero_base.sol           | 1 -
 .../semanticTests/cleanup/exp_cleanup_smaller_base.sol           | 1 -
 ...dexed_log_topic_during_explicit_downcast_during_emissions.sol | 1 -
 .../semanticTests/constantEvaluator/negative_fractional_mod.sol  | 1 -
 test/libsolidity/semanticTests/constantEvaluator/rounding.sol    | 1 -
 .../semanticTests/constants/asm_address_constant_regression.sol  | 1 -
 .../semanticTests/constants/asm_constant_file_level.sol          | 1 -
 test/libsolidity/semanticTests/constants/constant_string.sol     | 1 -
 .../semanticTests/constants/constant_string_at_file_level.sol    | 1 -
 test/libsolidity/semanticTests/constants/constant_variables.sol  | 1 -
 .../constants/constants_at_file_level_referencing.sol            | 1 -
 .../semanticTests/constants/function_unreferenced.sol            | 1 -
 .../semanticTests/constants/same_constants_different_files.sol   | 1 -
 .../semanticTests/constants/simple_constant_variables_test.sol   | 1 -
 .../semanticTests/constructor/arrays_in_constructors.sol         | 1 -
 .../semanticTests/constructor/base_constructor_arguments.sol     | 1 -
 .../semanticTests/constructor/bytes_in_constructors_packer.sol   | 1 -
 .../semanticTests/constructor/bytes_in_constructors_unpacker.sol | 1 -
 test/libsolidity/semanticTests/constructor/callvalue_check.sol   | 1 -
 .../semanticTests/constructor/constructor_arguments_external.sol | 1 -
 .../semanticTests/constructor/constructor_arguments_internal.sol | 1 -
 .../semanticTests/constructor/constructor_function_argument.sol  | 1 -
 .../semanticTests/constructor/constructor_function_complex.sol   | 1 -
 .../constructor/constructor_static_array_argument.sol            | 1 -
 .../constructor/evm_exceptions_in_constructor_call_fail.sol      | 1 -
 .../constructor/function_usage_in_constructor_arguments.sol      | 1 -
 .../constructor/functions_called_by_constructor.sol              | 1 -
 .../functions_called_by_constructor_through_dispatch.sol         | 1 -
 .../inline_member_init_inheritence_without_constructor.sol       | 1 -
 .../libsolidity/semanticTests/constructor/no_callvalue_check.sol | 1 -
 .../semanticTests/constructor/order_of_evaluation.sol            | 1 -
 .../semanticTests/constructor/payable_constructor.sol            | 1 -
 .../semanticTests/constructor/store_function_in_constructor.sol  | 1 -
 .../constructor/store_function_in_constructor_packed.sol         | 1 -
 .../store_internal_unused_function_in_constructor.sol            | 1 -
 .../store_internal_unused_library_function_in_constructor.sol    | 1 -
 .../semanticTests/constructor_inheritance_init_order_2.sol       | 1 -
 test/libsolidity/semanticTests/constructor_with_params.sol       | 1 -
 .../constructor_with_params_diamond_inheritance.sol              | 1 -
 .../semanticTests/constructor_with_params_inheritance.sol        | 1 -
 .../semanticTests/constructor_with_params_inheritance_2.sol      | 1 -
 .../semanticTests/conversions/function_type_array_to_storage.sol | 1 -
 test/libsolidity/semanticTests/conversions/string_to_bytes.sol   | 1 -
 test/libsolidity/semanticTests/dirty_calldata_bytes.sol          | 1 -
 test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol  | 1 -
 test/libsolidity/semanticTests/ecrecover/ecrecover.sol           | 1 -
 test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol     | 1 -
 .../semanticTests/ecrecover/failing_ecrecover_invalid_input.sol  | 1 -
 .../ecrecover/failing_ecrecover_invalid_input_asm.sol            | 1 -
 .../ecrecover/failing_ecrecover_invalid_input_proper.sol         | 1 -
 test/libsolidity/semanticTests/empty_contract.sol                | 1 -
 test/libsolidity/semanticTests/empty_for_loop.sol                | 1 -
 .../semanticTests/enums/constructing_enums_from_ints.sol         | 1 -
 test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol  | 1 -
 .../semanticTests/enums/enum_explicit_overflow_homestead.sol     | 1 -
 test/libsolidity/semanticTests/enums/enum_referencing.sol        | 1 -
 test/libsolidity/semanticTests/enums/enum_with_256_members.sol   | 1 -
 test/libsolidity/semanticTests/enums/invalid_enum_logged.sol     | 1 -
 test/libsolidity/semanticTests/enums/minmax.sol                  | 1 -
 .../enums/using_contract_enums_with_explicit_contract_name.sol   | 1 -
 test/libsolidity/semanticTests/enums/using_enums.sol             | 1 -
 test/libsolidity/semanticTests/enums/using_inherited_enum.sol    | 1 -
 .../semanticTests/enums/using_inherited_enum_excplicitly.sol     | 1 -
 test/libsolidity/semanticTests/error/selector.sol                | 1 -
 .../semanticTests/errors/error_in_library_and_interface.sol      | 1 -
 test/libsolidity/semanticTests/errors/named_error_args.sol       | 1 -
 .../semanticTests/errors/named_parameters_shadowing_types.sol    | 1 -
 test/libsolidity/semanticTests/errors/panic_via_import.sol       | 1 -
 test/libsolidity/semanticTests/errors/revert_conversion.sol      | 1 -
 test/libsolidity/semanticTests/errors/simple.sol                 | 1 -
 test/libsolidity/semanticTests/errors/using_structs.sol          | 1 -
 test/libsolidity/semanticTests/errors/via_contract_type.sol      | 1 -
 test/libsolidity/semanticTests/errors/via_import.sol             | 1 -
 test/libsolidity/semanticTests/errors/weird_name.sol             | 1 -
 test/libsolidity/semanticTests/events/event.sol                  | 1 -
 .../semanticTests/events/event_access_through_base_name_emit.sol | 1 -
 test/libsolidity/semanticTests/events/event_anonymous.sol        | 1 -
 .../events/event_anonymous_with_signature_collision.sol          | 1 -
 .../events/event_anonymous_with_signature_collision2.sol         | 1 -
 .../semanticTests/events/event_anonymous_with_topics.sol         | 1 -
 test/libsolidity/semanticTests/events/event_constructor.sol      | 1 -
 .../semanticTests/events/event_dynamic_array_memory.sol          | 1 -
 .../semanticTests/events/event_dynamic_array_memory_v2.sol       | 1 -
 .../semanticTests/events/event_dynamic_array_storage.sol         | 1 -
 .../semanticTests/events/event_dynamic_array_storage_v2.sol      | 1 -
 .../events/event_dynamic_nested_array_memory_v2.sol              | 1 -
 .../events/event_dynamic_nested_array_storage_v2.sol             | 1 -
 test/libsolidity/semanticTests/events/event_emit.sol             | 1 -
 .../semanticTests/events/event_emit_from_other_contract.sol      | 1 -
 test/libsolidity/semanticTests/events/event_indexed_function.sol | 1 -
 .../libsolidity/semanticTests/events/event_indexed_function2.sol | 1 -
 test/libsolidity/semanticTests/events/event_indexed_mixed.sol    | 1 -
 test/libsolidity/semanticTests/events/event_indexed_string.sol   | 1 -
 test/libsolidity/semanticTests/events/event_lots_of_data.sol     | 1 -
 test/libsolidity/semanticTests/events/event_no_arguments.sol     | 1 -
 .../semanticTests/events/event_really_lots_of_data.sol           | 1 -
 .../events/event_really_lots_of_data_from_storage.sol            | 1 -
 .../events/event_really_really_lots_of_data_from_storage.sol     | 1 -
 .../semanticTests/events/event_signature_in_library.sol          | 1 -
 test/libsolidity/semanticTests/events/event_string.sol           | 1 -
 test/libsolidity/semanticTests/events/event_struct_memory_v2.sol | 1 -
 .../libsolidity/semanticTests/events/event_struct_storage_v2.sol | 1 -
 test/libsolidity/semanticTests/events/events_with_same_name.sol  | 1 -
 .../events/events_with_same_name_inherited_emit.sol              | 1 -
 test/libsolidity/semanticTests/exponentiation/literal_base.sol   | 1 -
 test/libsolidity/semanticTests/exponentiation/signed_base.sol    | 1 -
 test/libsolidity/semanticTests/exponentiation/small_exp.sol      | 1 -
 test/libsolidity/semanticTests/expressions/bit_operators.sol     | 1 -
 test/libsolidity/semanticTests/expressions/bytes_comparison.sol  | 1 -
 .../expressions/conditional_expression_different_types.sol       | 1 -
 .../expressions/conditional_expression_false_literal.sol         | 1 -
 .../expressions/conditional_expression_functions.sol             | 1 -
 .../expressions/conditional_expression_multiple.sol              | 1 -
 .../expressions/conditional_expression_storage_memory_1.sol      | 1 -
 .../expressions/conditional_expression_storage_memory_2.sol      | 1 -
 .../expressions/conditional_expression_true_literal.sol          | 1 -
 .../semanticTests/expressions/conditional_expression_tuples.sol  | 1 -
 .../expressions/conditional_expression_with_return_values.sol    | 1 -
 .../libsolidity/semanticTests/expressions/exp_operator_const.sol | 1 -
 .../semanticTests/expressions/exp_operator_const_signed.sol      | 1 -
 test/libsolidity/semanticTests/expressions/exp_zero_literal.sol  | 1 -
 test/libsolidity/semanticTests/expressions/inc_dec_operators.sol | 1 -
 .../semanticTests/expressions/unary_too_long_literal.sol         | 1 -
 .../semanticTests/expressions/uncalled_address_transfer_send.sol | 1 -
 .../semanticTests/externalContracts/FixedFeeRegistrar.sol        | 1 -
 test/libsolidity/semanticTests/externalContracts/base64.sol      | 1 -
 .../semanticTests/externalContracts/deposit_contract.sol         | 1 -
 .../semanticTests/externalContracts/prbmath_signed.sol           | 1 -
 .../semanticTests/externalContracts/prbmath_unsigned.sol         | 1 -
 .../libsolidity/semanticTests/externalContracts/ramanujan_pi.sol | 1 -
 test/libsolidity/semanticTests/externalContracts/snark.sol       | 1 -
 test/libsolidity/semanticTests/externalContracts/strings.sol     | 1 -
 .../semanticTests/externalSource/multiple_equals_signs.sol       | 1 -
 .../semanticTests/externalSource/multiple_external_source.sol    | 1 -
 test/libsolidity/semanticTests/externalSource/multisource.sol    | 1 -
 .../semanticTests/externalSource/non_normalized_paths.sol        | 1 -
 .../semanticTests/externalSource/relative_imports.sol            | 1 -
 test/libsolidity/semanticTests/externalSource/source.sol         | 1 -
 test/libsolidity/semanticTests/externalSource/source_import.sol  | 1 -
 .../semanticTests/externalSource/source_import_subdir.sol        | 1 -
 .../externalSource/source_name_starting_with_dots.sol            | 1 -
 .../semanticTests/externalSource/source_remapping.sol            | 1 -
 test/libsolidity/semanticTests/fallback/call_forward_bytes.sol   | 1 -
 test/libsolidity/semanticTests/fallback/falback_return.sol       | 1 -
 test/libsolidity/semanticTests/fallback/fallback_argument.sol    | 1 -
 .../semanticTests/fallback/fallback_argument_to_storage.sol      | 1 -
 test/libsolidity/semanticTests/fallback/fallback_or_receive.sol  | 1 -
 test/libsolidity/semanticTests/fallback/fallback_override.sol    | 1 -
 test/libsolidity/semanticTests/fallback/fallback_override2.sol   | 1 -
 .../semanticTests/fallback/fallback_override_multi.sol           | 1 -
 test/libsolidity/semanticTests/fallback/fallback_return_data.sol | 1 -
 test/libsolidity/semanticTests/fallback/inherited.sol            | 1 -
 .../semanticTests/fallback/short_data_calls_fallback.sol         | 1 -
 test/libsolidity/semanticTests/freeFunctions/easy.sol            | 1 -
 .../freeFunctions/free_namesake_contract_function.sol            | 1 -
 .../libsolidity/semanticTests/freeFunctions/free_runtimecode.sol | 1 -
 test/libsolidity/semanticTests/freeFunctions/import.sol          | 1 -
 .../semanticTests/freeFunctions/libraries_from_free.sol          | 1 -
 test/libsolidity/semanticTests/freeFunctions/new_operator.sol    | 1 -
 test/libsolidity/semanticTests/freeFunctions/overloads.sol       | 1 -
 test/libsolidity/semanticTests/freeFunctions/recursion.sol       | 1 -
 .../semanticTests/freeFunctions/storage_calldata_refs.sol        | 1 -
 .../semanticTests/functionCall/array_multiple_local_vars.sol     | 1 -
 .../semanticTests/functionCall/bare_call_no_returndatacopy.sol   | 1 -
 .../semanticTests/functionCall/bound_function_in_function.sol    | 1 -
 .../semanticTests/functionCall/bound_function_in_var.sol         | 1 -
 .../semanticTests/functionCall/bound_function_to_string.sol      | 1 -
 .../functionCall/call_function_returning_function.sol            | 1 -
 .../functionCall/call_function_returning_nothing_via_pointer.sol | 1 -
 .../functionCall/call_internal_function_via_expression.sol       | 1 -
 ...ll_internal_function_with_multislot_arguments_via_pointer.sol | 1 -
 .../semanticTests/functionCall/call_options_overload.sol         | 1 -
 .../functionCall/calling_nonexisting_contract_throws.sol         | 1 -
 .../semanticTests/functionCall/calling_other_functions.sol       | 1 -
 .../functionCall/calling_uninitialized_function.sol              | 1 -
 .../functionCall/calling_uninitialized_function_in_detail.sol    | 1 -
 .../calling_uninitialized_function_through_array.sol             | 1 -
 .../semanticTests/functionCall/conditional_with_arguments.sol    | 1 -
 .../functionCall/creation_function_call_no_args.sol              | 1 -
 .../functionCall/creation_function_call_with_args.sol            | 1 -
 .../functionCall/creation_function_call_with_salt.sol            | 1 -
 .../semanticTests/functionCall/delegatecall_return_value.sol     | 1 -
 .../functionCall/delegatecall_return_value_pre_byzantium.sol     | 1 -
 .../semanticTests/functionCall/disordered_named_args.sol         | 1 -
 test/libsolidity/semanticTests/functionCall/external_call.sol    | 1 -
 .../functionCall/external_call_at_construction_time.sol          | 1 -
 .../functionCall/external_call_dynamic_returndata.sol            | 1 -
 .../semanticTests/functionCall/external_call_to_nonexisting.sol  | 1 -
 .../functionCall/external_call_to_nonexisting_debugstrings.sol   | 1 -
 .../semanticTests/functionCall/external_call_value.sol           | 1 -
 .../libsolidity/semanticTests/functionCall/external_function.sol | 1 -
 .../semanticTests/functionCall/external_public_override.sol      | 1 -
 test/libsolidity/semanticTests/functionCall/failed_create.sol    | 1 -
 .../semanticTests/functionCall/file_level_call_via_module.sol    | 1 -
 .../semanticTests/functionCall/gas_and_value_basic.sol           | 1 -
 .../semanticTests/functionCall/gas_and_value_brace_syntax.sol    | 1 -
 .../functionCall/inheritance/base_base_overload.sol              | 1 -
 .../semanticTests/functionCall/inheritance/base_overload.sol     | 1 -
 .../semanticTests/functionCall/inheritance/call_base.sol         | 1 -
 .../semanticTests/functionCall/inheritance/call_base_base.sol    | 1 -
 .../functionCall/inheritance/call_base_base_explicit.sol         | 1 -
 .../functionCall/inheritance/call_base_explicit.sol              | 1 -
 .../functionCall/inheritance/call_unimplemented_base.sol         | 1 -
 .../super_skip_unimplemented_in_abstract_contract.sol            | 1 -
 .../inheritance/super_skip_unimplemented_in_interface.sol        | 1 -
 .../functionCall/mapping_array_internal_argument.sol             | 1 -
 .../semanticTests/functionCall/mapping_internal_argument.sol     | 1 -
 .../semanticTests/functionCall/mapping_internal_return.sol       | 1 -
 test/libsolidity/semanticTests/functionCall/member_accessors.sol | 1 -
 .../semanticTests/functionCall/multiple_functions.sol            | 1 -
 .../semanticTests/functionCall/multiple_return_values.sol        | 1 -
 test/libsolidity/semanticTests/functionCall/named_args.sol       | 1 -
 .../semanticTests/functionCall/named_args_overload.sol           | 1 -
 .../semanticTests/functionCall/precompile_extcodesize_check.sol  | 1 -
 test/libsolidity/semanticTests/functionCall/send_zero_ether.sol  | 1 -
 .../semanticTests/functionCall/transaction_status.sol            | 1 -
 test/libsolidity/semanticTests/functionCall/value_test.sol       | 1 -
 .../functionSelector/function_selector_via_contract_name.sol     | 1 -
 test/libsolidity/semanticTests/functionTypes/address_member.sol  | 1 -
 ...mparison_operator_for_external_function_cleans_dirty_bits.sol | 1 -
 .../comparison_operators_for_external_functions.sol              | 1 -
 .../semanticTests/functionTypes/function_delete_stack.sol        | 1 -
 .../semanticTests/functionTypes/function_delete_storage.sol      | 1 -
 .../functionTypes/function_external_delete_storage.sol           | 1 -
 .../functionTypes/function_type_library_internal.sol             | 1 -
 .../functionTypes/inline_array_with_value_call_option.sol        | 1 -
 .../semanticTests/functionTypes/mapping_of_functions.sol         | 1 -
 .../functionTypes/pass_function_types_externally.sol             | 1 -
 .../functionTypes/pass_function_types_internally.sol             | 1 -
 .../functionTypes/same_function_in_construction_and_runtime.sol  | 1 -
 .../same_function_in_construction_and_runtime_equality_check.sol | 1 -
 .../stack_height_check_on_adding_gas_variable_to_function.sol    | 1 -
 test/libsolidity/semanticTests/functionTypes/store_function.sol  | 1 -
 .../functionTypes/struct_with_external_function.sol              | 1 -
 .../semanticTests/functionTypes/struct_with_functions.sol        | 1 -
 .../uninitialized_internal_storage_function_call.sol             | 1 -
 test/libsolidity/semanticTests/getters/array_mapping_struct.sol  | 1 -
 test/libsolidity/semanticTests/getters/arrays.sol                | 1 -
 test/libsolidity/semanticTests/getters/bytes.sol                 | 1 -
 test/libsolidity/semanticTests/getters/mapping.sol               | 1 -
 test/libsolidity/semanticTests/getters/mapping_array_struct.sol  | 1 -
 test/libsolidity/semanticTests/getters/mapping_of_string.sol     | 1 -
 test/libsolidity/semanticTests/getters/mapping_to_struct.sol     | 1 -
 test/libsolidity/semanticTests/getters/string_and_bytes.sol      | 1 -
 test/libsolidity/semanticTests/getters/struct_with_bytes.sol     | 1 -
 .../semanticTests/getters/struct_with_bytes_simple.sol           | 1 -
 test/libsolidity/semanticTests/getters/value_types.sol           | 1 -
 .../semanticTests/immutable/assign_at_declaration.sol            | 1 -
 .../semanticTests/immutable/assign_from_immutables.sol           | 1 -
 test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol    | 1 -
 test/libsolidity/semanticTests/immutable/getter.sol              | 1 -
 .../semanticTests/immutable/getter_call_in_constructor.sol       | 1 -
 test/libsolidity/semanticTests/immutable/immutable_signed.sol    | 1 -
 test/libsolidity/semanticTests/immutable/inheritance.sol         | 1 -
 .../semanticTests/immutable/internal_function_pointer.sol        | 1 -
 test/libsolidity/semanticTests/immutable/multi_creation.sol      | 1 -
 test/libsolidity/semanticTests/immutable/read_in_ctor.sol        | 1 -
 .../semanticTests/immutable/small_types_in_reverse.sol           | 1 -
 test/libsolidity/semanticTests/immutable/stub.sol                | 1 -
 test/libsolidity/semanticTests/immutable/use_scratch.sol         | 1 -
 .../semanticTests/inheritance/access_base_storage.sol            | 1 -
 .../semanticTests/inheritance/address_overload_resolution.sol    | 1 -
 .../inheritance/base_access_to_function_type_variables.sol       | 1 -
 .../inheritance/derived_overload_base_function_direct.sol        | 1 -
 .../inheritance/derived_overload_base_function_indirect.sol      | 1 -
 .../semanticTests/inheritance/explicit_base_class.sol            | 1 -
 .../semanticTests/inheritance/inherited_constant_state_var.sol   | 1 -
 .../libsolidity/semanticTests/inheritance/inherited_function.sol | 1 -
 .../inherited_function_calldata_calldata_interface.sol           | 1 -
 .../inheritance/inherited_function_calldata_memory.sol           | 1 -
 .../inheritance/inherited_function_calldata_memory_interface.sol | 1 -
 .../inheritance/inherited_function_from_a_library.sol            | 1 -
 .../inheritance/inherited_function_through_dispatch.sol          | 1 -
 .../semanticTests/inheritance/member_notation_ctor.sol           | 1 -
 .../inheritance/overloaded_function_call_resolve_to_first.sol    | 1 -
 .../inheritance/overloaded_function_call_resolve_to_second.sol   | 1 -
 .../inheritance/overloaded_function_call_with_if_else.sol        | 1 -
 .../inheritance/pass_dynamic_arguments_to_the_base.sol           | 1 -
 .../inheritance/pass_dynamic_arguments_to_the_base_base.sol      | 1 -
 .../pass_dynamic_arguments_to_the_base_base_with_gap.sol         | 1 -
 .../semanticTests/inheritance/super_in_constructor.sol           | 1 -
 .../inheritance/super_in_constructor_assignment.sol              | 1 -
 test/libsolidity/semanticTests/inheritance/super_overload.sol    | 1 -
 .../semanticTests/inheritance/value_for_constructor.sol          | 1 -
 .../semanticTests/inlineAssembly/basefee_berlin_function.sol     | 1 -
 .../inlineAssembly/calldata_array_assign_dynamic.sol             | 1 -
 .../inlineAssembly/calldata_array_assign_static.sol              | 1 -
 .../semanticTests/inlineAssembly/calldata_array_read.sol         | 1 -
 .../libsolidity/semanticTests/inlineAssembly/calldata_assign.sol | 1 -
 .../inlineAssembly/calldata_assign_from_nowhere.sol              | 1 -
 .../semanticTests/inlineAssembly/calldata_length_read.sol        | 1 -
 .../semanticTests/inlineAssembly/calldata_offset_read.sol        | 1 -
 .../semanticTests/inlineAssembly/calldata_offset_read_write.sol  | 1 -
 .../semanticTests/inlineAssembly/calldata_struct_assign.sol      | 1 -
 .../inlineAssembly/calldata_struct_assign_and_return.sol         | 1 -
 test/libsolidity/semanticTests/inlineAssembly/chainid.sol        | 1 -
 .../libsolidity/semanticTests/inlineAssembly/constant_access.sol | 1 -
 .../semanticTests/inlineAssembly/constant_access_referencing.sol | 1 -
 .../inlineAssembly/external_function_pointer_address.sol         | 1 -
 .../external_function_pointer_address_assignment.sol             | 1 -
 .../inlineAssembly/external_function_pointer_selector.sol        | 1 -
 .../external_function_pointer_selector_assignment.sol            | 1 -
 .../inlineAssembly/external_identifier_access_shadowing.sol      | 1 -
 .../semanticTests/inlineAssembly/function_name_clash.sol         | 1 -
 .../inlineAssembly/inline_assembly_embedded_function_call.sol    | 1 -
 .../semanticTests/inlineAssembly/inline_assembly_for.sol         | 1 -
 .../semanticTests/inlineAssembly/inline_assembly_for2.sol        | 1 -
 .../inlineAssembly/inline_assembly_function_call.sol             | 1 -
 .../inlineAssembly/inline_assembly_function_call2.sol            | 1 -
 .../inlineAssembly/inline_assembly_function_call_assignment.sol  | 1 -
 .../semanticTests/inlineAssembly/inline_assembly_if.sol          | 1 -
 .../inlineAssembly/inline_assembly_in_modifiers.sol              | 1 -
 .../inlineAssembly/inline_assembly_memory_access.sol             | 1 -
 .../inlineAssembly/inline_assembly_read_and_write_stack.sol      | 1 -
 .../semanticTests/inlineAssembly/inline_assembly_recursion.sol   | 1 -
 .../inlineAssembly/inline_assembly_storage_access.sol            | 1 -
 .../inline_assembly_storage_access_inside_function.sol           | 1 -
 .../inlineAssembly/inline_assembly_storage_access_local_var.sol  | 1 -
 .../inline_assembly_storage_access_via_pointer.sol               | 1 -
 .../semanticTests/inlineAssembly/inline_assembly_switch.sol      | 1 -
 .../inlineAssembly/inline_assembly_write_to_stack.sol            | 1 -
 .../semanticTests/inlineAssembly/inlineasm_empty_let.sol         | 1 -
 .../semanticTests/inlineAssembly/keccak256_assembly.sol          | 1 -
 .../semanticTests/inlineAssembly/keccak256_optimization.sol      | 1 -
 .../keccak256_optimizer_bug_different_memory_location.sol        | 1 -
 .../inlineAssembly/keccak256_optimizer_cache_bug.sol             | 1 -
 .../inlineAssembly/keccak_optimization_bug_string.sol            | 1 -
 .../semanticTests/inlineAssembly/keccak_yul_optimization.sol     | 1 -
 test/libsolidity/semanticTests/inlineAssembly/leave.sol          | 1 -
 test/libsolidity/semanticTests/inlineAssembly/selfbalance.sol    | 1 -
 .../inlineAssembly/shadowing_local_function_opcode.sol           | 1 -
 test/libsolidity/semanticTests/inlineAssembly/slot_access.sol    | 1 -
 test/libsolidity/semanticTests/inlineAssembly/truefalse.sol      | 1 -
 test/libsolidity/semanticTests/integer/basic.sol                 | 1 -
 test/libsolidity/semanticTests/integer/int.sol                   | 1 -
 test/libsolidity/semanticTests/integer/many_local_variables.sol  | 1 -
 test/libsolidity/semanticTests/integer/small_signed_types.sol    | 1 -
 test/libsolidity/semanticTests/integer/uint.sol                  | 1 -
 test/libsolidity/semanticTests/interfaceID/homer.sol             | 1 -
 test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol | 1 -
 .../libsolidity/semanticTests/interfaceID/interfaceId_events.sol | 1 -
 test/libsolidity/semanticTests/interfaceID/interfaces.sol        | 1 -
 test/libsolidity/semanticTests/interfaceID/lisa.sol              | 1 -
 test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol  | 1 -
 .../semanticTests/interface_inheritance_conversions.sol          | 1 -
 test/libsolidity/semanticTests/isoltestFormatting.sol            | 1 -
 test/libsolidity/semanticTests/isoltestTesting/account.sol       | 1 -
 .../semanticTests/isoltestTesting/balance_other_contract.sol     | 1 -
 .../semanticTests/isoltestTesting/balance_with_balance.sol       | 1 -
 .../semanticTests/isoltestTesting/balance_with_balance2.sol      | 1 -
 .../semanticTests/isoltestTesting/balance_without_balance.sol    | 1 -
 test/libsolidity/semanticTests/isoltestTesting/builtins.sol      | 1 -
 test/libsolidity/semanticTests/isoltestTesting/effects.sol       | 1 -
 .../isoltestTesting/format_raw_string_with_control_chars.sol     | 1 -
 .../semanticTests/isoltestTesting/storage/storage_empty.sol      | 1 -
 .../semanticTests/isoltestTesting/storage/storage_nonempty.sol   | 1 -
 .../semanticTests/libraries/bound_returning_calldata.sol         | 1 -
 .../libraries/bound_returning_calldata_external.sol              | 1 -
 test/libsolidity/semanticTests/libraries/bound_to_calldata.sol   | 1 -
 .../semanticTests/libraries/bound_to_calldata_external.sol       | 1 -
 .../libraries/external_call_with_function_pointer_parameter.sol  | 1 -
 .../libraries/external_call_with_storage_array_parameter.sol     | 1 -
 .../libraries/external_call_with_storage_mapping_parameter.sol   | 1 -
 .../libraries/internal_call_bound_with_parentheses.sol           | 1 -
 .../libraries/internal_call_bound_with_parentheses1.sol          | 1 -
 .../semanticTests/libraries/internal_library_function.sol        | 1 -
 .../semanticTests/libraries/internal_library_function_bound.sol  | 1 -
 .../libraries/internal_library_function_bound_to_address.sol     | 1 -
 ...nal_library_function_bound_to_address_named_send_transfer.sol | 1 -
 .../internal_library_function_bound_to_array_named_pop_push.sol  | 1 -
 .../libraries/internal_library_function_bound_to_bool.sol        | 1 -
 .../libraries/internal_library_function_bound_to_contract.sol    | 1 -
 .../internal_library_function_bound_to_dynamic_array.sol         | 1 -
 .../libraries/internal_library_function_bound_to_enum.sol        | 1 -
 .../internal_library_function_bound_to_external_function.sol     | 1 -
 .../libraries/internal_library_function_bound_to_fixed_array.sol | 1 -
 .../libraries/internal_library_function_bound_to_fixed_bytes.sol | 1 -
 ...nternal_library_function_bound_to_function_named_selector.sol | 1 -
 .../libraries/internal_library_function_bound_to_integer.sol     | 1 -
 .../libraries/internal_library_function_bound_to_interface.sol   | 1 -
 .../internal_library_function_bound_to_internal_function.sol     | 1 -
 .../libraries/internal_library_function_bound_to_literal.sol     | 1 -
 .../libraries/internal_library_function_bound_to_mapping.sol     | 1 -
 .../internal_library_function_bound_to_storage_string.sol        | 1 -
 .../libraries/internal_library_function_bound_to_string.sol      | 1 -
 .../libraries/internal_library_function_calling_private.sol      | 1 -
 .../libraries/internal_library_function_pointer.sol              | 1 -
 .../libraries/internal_library_function_return_var_size.sol      | 1 -
 .../semanticTests/libraries/internal_types_in_library.sol        | 1 -
 test/libsolidity/semanticTests/libraries/library_address.sol     | 1 -
 .../semanticTests/libraries/library_address_homestead.sol        | 1 -
 .../semanticTests/libraries/library_address_via_module.sol       | 1 -
 .../semanticTests/libraries/library_call_in_homestead.sol        | 1 -
 .../semanticTests/libraries/library_delegatecall_guard_pure.sol  | 1 -
 .../libraries/library_delegatecall_guard_view_needed.sol         | 1 -
 .../libraries/library_delegatecall_guard_view_not_needed.sol     | 1 -
 .../libraries/library_delegatecall_guard_view_staticcall.sol     | 1 -
 .../semanticTests/libraries/library_enum_as_an_expression.sol    | 1 -
 .../semanticTests/libraries/library_function_selectors.sol       | 1 -
 .../libraries/library_function_selectors_struct.sol              | 1 -
 .../libraries/library_return_struct_with_mapping.sol             | 1 -
 .../semanticTests/libraries/library_staticcall_delegatecall.sol  | 1 -
 .../libsolidity/semanticTests/libraries/library_stray_values.sol | 1 -
 .../semanticTests/libraries/library_struct_as_an_expression.sol  | 1 -
 .../semanticTests/libraries/mapping_arguments_in_library.sol     | 1 -
 .../semanticTests/libraries/mapping_returns_in_library.sol       | 1 -
 .../semanticTests/libraries/mapping_returns_in_library_named.sol | 1 -
 .../semanticTests/libraries/payable_function_calls_library.sol   | 1 -
 test/libsolidity/semanticTests/libraries/stub.sol                | 1 -
 test/libsolidity/semanticTests/libraries/stub_internal.sol       | 1 -
 test/libsolidity/semanticTests/libraries/using_for_by_name.sol   | 1 -
 .../semanticTests/libraries/using_for_function_on_int.sol        | 1 -
 test/libsolidity/semanticTests/libraries/using_for_overload.sol  | 1 -
 .../semanticTests/libraries/using_for_storage_structs.sol        | 1 -
 .../semanticTests/libraries/using_library_mappings_public.sol    | 1 -
 .../semanticTests/libraries/using_library_mappings_return.sol    | 1 -
 .../semanticTests/libraries/using_library_structs.sol            | 1 -
 test/libsolidity/semanticTests/literals/denominations.sol        | 1 -
 test/libsolidity/semanticTests/literals/escape.sol               | 1 -
 test/libsolidity/semanticTests/literals/ether.sol                | 1 -
 test/libsolidity/semanticTests/literals/gwei.sol                 | 1 -
 .../literals/hex_string_with_non_printable_characters.sol        | 1 -
 .../semanticTests/literals/hex_string_with_underscore.sol        | 1 -
 test/libsolidity/semanticTests/literals/scientific_notation.sol  | 1 -
 .../literals/ternary_operator_with_literal_types_overflow.sol    | 1 -
 test/libsolidity/semanticTests/literals/wei.sol                  | 1 -
 .../semanticTests/memoryManagement/assembly_access.sol           | 1 -
 .../memoryManagement/memory_types_initialisation.sol             | 1 -
 .../semanticTests/memoryManagement/return_variable.sol           | 1 -
 .../memoryManagement/static_memory_array_allocation.sol          | 1 -
 .../semanticTests/memoryManagement/struct_allocation.sol         | 1 -
 test/libsolidity/semanticTests/metaTypes/name_other_contract.sol | 1 -
 .../semanticTests/modifiers/access_through_contract_name.sol     | 1 -
 .../semanticTests/modifiers/access_through_module_name.sol       | 1 -
 test/libsolidity/semanticTests/modifiers/break_in_modifier.sol   | 1 -
 .../libsolidity/semanticTests/modifiers/continue_in_modifier.sol | 1 -
 test/libsolidity/semanticTests/modifiers/evaluation_order.sol    | 1 -
 test/libsolidity/semanticTests/modifiers/function_modifier.sol   | 1 -
 .../function_modifier_calling_functions_in_creation_context.sol  | 1 -
 .../semanticTests/modifiers/function_modifier_empty.sol          | 1 -
 .../modifiers/function_modifier_for_constructor.sol              | 1 -
 .../semanticTests/modifiers/function_modifier_library.sol        | 1 -
 .../modifiers/function_modifier_library_inheritance.sol          | 1 -
 .../modifiers/function_modifier_local_variables.sol              | 1 -
 .../semanticTests/modifiers/function_modifier_multiple_times.sol | 1 -
 .../modifiers/function_modifier_multiple_times_local_vars.sol    | 1 -
 .../semanticTests/modifiers/function_modifier_overriding.sol     | 1 -
 .../modifiers/function_modifier_return_reference.sol             | 1 -
 .../semanticTests/modifiers/function_return_parameter.sol        | 1 -
 .../modifiers/function_return_parameter_complex.sol              | 1 -
 test/libsolidity/semanticTests/modifiers/modifer_recursive.sol   | 1 -
 .../semanticTests/modifiers/modifier_in_constructor_ice.sol      | 1 -
 .../libsolidity/semanticTests/modifiers/modifier_init_return.sol | 1 -
 .../modifiers/modifiers_in_construction_context.sol              | 1 -
 .../semanticTests/modifiers/return_does_not_skip_modifier.sol    | 1 -
 test/libsolidity/semanticTests/modifiers/return_in_modifier.sol  | 1 -
 .../semanticTests/modifiers/stacked_return_with_modifiers.sol    | 1 -
 test/libsolidity/semanticTests/multiSource/circular_import.sol   | 1 -
 test/libsolidity/semanticTests/multiSource/circular_import_2.sol | 1 -
 test/libsolidity/semanticTests/multiSource/circular_reimport.sol | 1 -
 .../semanticTests/multiSource/circular_reimport_2.sol            | 1 -
 .../semanticTests/multiSource/free_different_interger_types.sol  | 1 -
 .../multiSource/free_function_resolution_base_contract.sol       | 1 -
 .../multiSource/free_function_resolution_override_virtual.sol    | 1 -
 .../free_function_resolution_override_virtual_super.sol          | 1 -
 .../free_function_resolution_override_virtual_transitive.sol     | 1 -
 .../multiSource/free_function_transitive_import.sol              | 1 -
 test/libsolidity/semanticTests/multiSource/import.sol            | 1 -
 .../semanticTests/multiSource/import_overloaded_function.sol     | 1 -
 .../multiSource/imported_free_function_via_alias.sol             | 1 -
 .../multiSource/imported_free_function_via_alias_direct_call.sol | 1 -
 .../semanticTests/multiSource/reimport_imported_function.sol     | 1 -
 test/libsolidity/semanticTests/operators/compound_assign.sol     | 1 -
 .../operators/shifts/bitwise_shifting_constantinople.sol         | 1 -
 .../shifts/bitwise_shifting_constantinople_combined.sol          | 1 -
 .../shifts/bitwise_shifting_constants_constantinople.sol         | 1 -
 .../libsolidity/semanticTests/operators/shifts/shift_cleanup.sol | 1 -
 .../semanticTests/operators/shifts/shift_cleanup_garbled.sol     | 1 -
 .../semanticTests/operators/shifts/shift_constant_left.sol       | 1 -
 .../operators/shifts/shift_constant_left_assignment.sol          | 1 -
 .../semanticTests/operators/shifts/shift_constant_right.sol      | 1 -
 .../operators/shifts/shift_constant_right_assignment.sol         | 1 -
 test/libsolidity/semanticTests/operators/shifts/shift_left.sol   | 1 -
 .../semanticTests/operators/shifts/shift_left_assignment.sol     | 1 -
 .../operators/shifts/shift_left_assignment_different_type.sol    | 1 -
 .../semanticTests/operators/shifts/shift_left_larger_type.sol    | 1 -
 .../semanticTests/operators/shifts/shift_left_uint32.sol         | 1 -
 .../semanticTests/operators/shifts/shift_left_uint8.sol          | 1 -
 .../operators/shifts/shift_negative_constant_left.sol            | 1 -
 .../operators/shifts/shift_negative_constant_right.sol           | 1 -
 .../semanticTests/operators/shifts/shift_overflow.sol            | 1 -
 test/libsolidity/semanticTests/operators/shifts/shift_right.sol  | 1 -
 .../semanticTests/operators/shifts/shift_right_assignment.sol    | 1 -
 .../operators/shifts/shift_right_garbled_signed_v2.sol           | 1 -
 .../semanticTests/operators/shifts/shift_right_garbled_v2.sol    | 1 -
 .../operators/shifts/shift_right_negative_literal.sol            | 1 -
 .../operators/shifts/shift_right_negative_lvalue.sol             | 1 -
 .../operators/shifts/shift_right_negative_lvalue_assignment.sol  | 1 -
 .../operators/shifts/shift_right_negative_lvalue_int16.sol       | 1 -
 .../operators/shifts/shift_right_negative_lvalue_int32.sol       | 1 -
 .../operators/shifts/shift_right_negative_lvalue_int8.sol        | 1 -
 .../shifts/shift_right_negative_lvalue_signextend_int16_v2.sol   | 1 -
 .../shifts/shift_right_negative_lvalue_signextend_int32_v2.sol   | 1 -
 .../shifts/shift_right_negative_lvalue_signextend_int8_v2.sol    | 1 -
 .../semanticTests/operators/shifts/shift_right_uint32.sol        | 1 -
 .../semanticTests/operators/shifts/shift_right_uint8.sol         | 1 -
 .../operators/shifts/shift_underflow_negative_rvalue.sol         | 1 -
 test/libsolidity/semanticTests/operators/shifts/shifts.sol       | 1 -
 test/libsolidity/semanticTests/optimizer/shift_bytes.sol         | 1 -
 .../payable/no_nonpayable_circumvention_by_modifier.sol          | 1 -
 .../semanticTests/receive/empty_calldata_calls_receive.sol       | 1 -
 test/libsolidity/semanticTests/receive/ether_and_data.sol        | 1 -
 test/libsolidity/semanticTests/receive/inherited.sol             | 1 -
 test/libsolidity/semanticTests/revertStrings/array_slices.sol    | 1 -
 test/libsolidity/semanticTests/revertStrings/bubble.sol          | 1 -
 .../revertStrings/calldata_array_dynamic_invalid.sol             | 1 -
 .../revertStrings/calldata_array_dynamic_static_short_decode.sol | 1 -
 .../calldata_array_dynamic_static_short_reencode.sol             | 1 -
 .../revertStrings/calldata_array_invalid_length.sol              | 1 -
 .../semanticTests/revertStrings/calldata_arrays_too_large.sol    | 1 -
 .../semanticTests/revertStrings/calldata_tail_short.sol          | 1 -
 .../semanticTests/revertStrings/called_contract_has_code.sol     | 1 -
 test/libsolidity/semanticTests/revertStrings/empty_v2.sol        | 1 -
 test/libsolidity/semanticTests/revertStrings/enum_v2.sol         | 1 -
 .../semanticTests/revertStrings/ether_non_payable_function.sol   | 1 -
 .../semanticTests/revertStrings/function_entry_checks_v2.sol     | 1 -
 .../semanticTests/revertStrings/library_non_view_call.sol        | 1 -
 .../semanticTests/revertStrings/short_input_array.sol            | 1 -
 .../semanticTests/revertStrings/short_input_bytes.sol            | 1 -
 test/libsolidity/semanticTests/revertStrings/transfer.sol        | 1 -
 .../semanticTests/revertStrings/unknown_sig_no_fallback.sol      | 1 -
 test/libsolidity/semanticTests/reverts/assert_require.sol        | 1 -
 test/libsolidity/semanticTests/reverts/error_struct.sol          | 1 -
 .../semanticTests/reverts/invalid_enum_as_external_arg.sol       | 1 -
 .../semanticTests/reverts/invalid_enum_as_external_ret.sol       | 1 -
 test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol | 1 -
 test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol   | 1 -
 test/libsolidity/semanticTests/reverts/invalid_instruction.sol   | 1 -
 test/libsolidity/semanticTests/reverts/revert.sol                | 1 -
 test/libsolidity/semanticTests/reverts/revert_return_area.sol    | 1 -
 test/libsolidity/semanticTests/reverts/simple_throw.sol          | 1 -
 test/libsolidity/semanticTests/salted_create/salted_create.sol   | 1 -
 .../semanticTests/salted_create/salted_create_with_value.sol     | 1 -
 test/libsolidity/semanticTests/smoke/alignment.sol               | 1 -
 test/libsolidity/semanticTests/smoke/arrays.sol                  | 1 -
 test/libsolidity/semanticTests/smoke/basic.sol                   | 1 -
 test/libsolidity/semanticTests/smoke/bytes_and_strings.sol       | 1 -
 test/libsolidity/semanticTests/smoke/constructor.sol             | 1 -
 test/libsolidity/semanticTests/smoke/failure.sol                 | 1 -
 test/libsolidity/semanticTests/smoke/fallback.sol                | 1 -
 test/libsolidity/semanticTests/smoke/multiline.sol               | 1 -
 test/libsolidity/semanticTests/smoke/multiline_comments.sol      | 1 -
 test/libsolidity/semanticTests/smoke/structs.sol                 | 1 -
 .../specialFunctions/abi_encode_with_signature_from_string.sol   | 1 -
 .../specialFunctions/abi_functions_member_access.sol             | 1 -
 .../semanticTests/specialFunctions/keccak256_optimized.sol       | 1 -
 test/libsolidity/semanticTests/state/block_basefee.sol           | 1 -
 test/libsolidity/semanticTests/state/block_chainid.sol           | 1 -
 test/libsolidity/semanticTests/state/block_coinbase.sol          | 1 -
 test/libsolidity/semanticTests/state/block_difficulty.sol        | 1 -
 test/libsolidity/semanticTests/state/block_gaslimit.sol          | 1 -
 test/libsolidity/semanticTests/state/block_number.sol            | 1 -
 test/libsolidity/semanticTests/state/block_timestamp.sol         | 1 -
 test/libsolidity/semanticTests/state/blockhash_basic.sol         | 1 -
 test/libsolidity/semanticTests/state/gasleft.sol                 | 1 -
 test/libsolidity/semanticTests/state/msg_data.sol                | 1 -
 test/libsolidity/semanticTests/state/msg_sender.sol              | 1 -
 test/libsolidity/semanticTests/state/msg_sig.sol                 | 1 -
 test/libsolidity/semanticTests/state/msg_value.sol               | 1 -
 test/libsolidity/semanticTests/state/tx_gasprice.sol             | 1 -
 test/libsolidity/semanticTests/state/tx_origin.sol               | 1 -
 test/libsolidity/semanticTests/state/uncalled_blockhash.sol      | 1 -
 test/libsolidity/semanticTests/state_var_initialization.sol      | 1 -
 test/libsolidity/semanticTests/state_variables_init_order.sol    | 1 -
 test/libsolidity/semanticTests/state_variables_init_order_2.sol  | 1 -
 .../semanticTests/statements/do_while_loop_continue.sol          | 1 -
 .../semanticTests/storage/accessors_mapping_for_array.sol        | 1 -
 test/libsolidity/semanticTests/storage/array_accessor.sol        | 1 -
 test/libsolidity/semanticTests/storage/chop_sign_bits.sol        | 1 -
 test/libsolidity/semanticTests/storage/complex_accessors.sol     | 1 -
 test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol  | 1 -
 test/libsolidity/semanticTests/storage/mapping_state.sol         | 1 -
 test/libsolidity/semanticTests/storage/mapping_string_key.sol    | 1 -
 .../semanticTests/storage/mappings_array2d_pop_delete.sol        | 1 -
 .../semanticTests/storage/mappings_array_pop_delete.sol          | 1 -
 test/libsolidity/semanticTests/storage/packed_functions.sol      | 1 -
 .../semanticTests/storage/packed_storage_overflow.sol            | 1 -
 test/libsolidity/semanticTests/storage/packed_storage_signed.sol | 1 -
 .../semanticTests/storage/packed_storage_structs_bytes.sol       | 1 -
 .../semanticTests/storage/packed_storage_structs_enum.sol        | 1 -
 .../semanticTests/storage/packed_storage_structs_uint.sol        | 1 -
 test/libsolidity/semanticTests/storage/simple_accessor.sol       | 1 -
 test/libsolidity/semanticTests/storage/state_smoke_test.sol      | 1 -
 test/libsolidity/semanticTests/storage/struct_accessor.sol       | 1 -
 .../semanticTests/strings/concat/string_concat_2_args.sol        | 1 -
 .../strings/concat/string_concat_different_types.sol             | 1 -
 .../strings/concat/string_concat_empty_argument_list.sol         | 1 -
 .../semanticTests/strings/concat/string_concat_empty_strings.sol | 1 -
 .../semanticTests/strings/concat/string_concat_nested.sol        | 1 -
 .../semanticTests/strings/constant_string_literal.sol            | 1 -
 test/libsolidity/semanticTests/strings/empty_string.sol          | 1 -
 test/libsolidity/semanticTests/strings/empty_string_input.sol    | 1 -
 test/libsolidity/semanticTests/strings/return_string.sol         | 1 -
 test/libsolidity/semanticTests/strings/string_escapes.sol        | 1 -
 test/libsolidity/semanticTests/strings/unicode_escapes.sol       | 1 -
 test/libsolidity/semanticTests/strings/unicode_string.sol        | 1 -
 .../semanticTests/structs/array_of_recursive_struct.sol          | 1 -
 .../semanticTests/structs/calldata/calldata_nested_structs.sol   | 1 -
 .../semanticTests/structs/calldata/calldata_struct.sol           | 1 -
 .../semanticTests/structs/calldata/calldata_struct_and_ints.sol  | 1 -
 .../structs/calldata/calldata_struct_array_member.sol            | 1 -
 .../structs/calldata/calldata_struct_array_member_dynamic.sol    | 1 -
 .../calldata/calldata_struct_as_argument_of_lib_function.sol     | 1 -
 .../structs/calldata/calldata_struct_as_memory_argument.sol      | 1 -
 .../structs/calldata/calldata_struct_struct_member.sol           | 1 -
 .../structs/calldata/calldata_struct_struct_member_dynamic.sol   | 1 -
 .../semanticTests/structs/calldata/calldata_struct_to_memory.sol | 1 -
 .../calldata/calldata_struct_to_memory_tuple_assignment.sol      | 1 -
 .../structs/calldata/calldata_struct_to_storage.sol              | 1 -
 .../structs/calldata/calldata_struct_with_array_to_memory.sol    | 1 -
 .../structs/calldata/calldata_struct_with_bytes_to_memory.sol    | 1 -
 .../calldata/calldata_struct_with_nested_array_to_memory.sol     | 1 -
 .../calldata/calldata_struct_with_nested_array_to_storage.sol    | 1 -
 .../semanticTests/structs/calldata/calldata_structs.sol          | 1 -
 .../semanticTests/structs/calldata/dynamic_nested.sol            | 1 -
 .../semanticTests/structs/calldata/dynamically_encoded.sol       | 1 -
 .../structs/conversion/recursive_storage_memory.sol              | 1 -
 .../structs/conversion/recursive_storage_memory_complex.sol      | 1 -
 test/libsolidity/semanticTests/structs/copy_from_calldata.sol    | 1 -
 test/libsolidity/semanticTests/structs/copy_from_storage.sol     | 1 -
 .../semanticTests/structs/copy_struct_array_from_storage.sol     | 1 -
 test/libsolidity/semanticTests/structs/delete_struct.sol         | 1 -
 test/libsolidity/semanticTests/structs/event.sol                 | 1 -
 test/libsolidity/semanticTests/structs/function_type_copy.sol    | 1 -
 test/libsolidity/semanticTests/structs/global.sol                | 1 -
 .../libsolidity/semanticTests/structs/lone_struct_array_type.sol | 1 -
 .../semanticTests/structs/memory_struct_named_constructor.sol    | 1 -
 .../semanticTests/structs/memory_structs_as_function_args.sol    | 1 -
 test/libsolidity/semanticTests/structs/memory_structs_nested.sol | 1 -
 .../semanticTests/structs/memory_structs_nested_load.sol         | 1 -
 .../semanticTests/structs/memory_structs_read_write.sol          | 1 -
 .../semanticTests/structs/msg_data_to_struct_member_copy.sol     | 1 -
 .../semanticTests/structs/multislot_struct_allocation.sol        | 1 -
 .../semanticTests/structs/nested_struct_allocation.sol           | 1 -
 .../semanticTests/structs/packed_storage_structs_delete.sol      | 1 -
 test/libsolidity/semanticTests/structs/recursive_struct_2.sol    | 1 -
 test/libsolidity/semanticTests/structs/recursive_structs.sol     | 1 -
 .../semanticTests/structs/simple_struct_allocation.sol           | 1 -
 .../semanticTests/structs/struct_assign_reference_to_struct.sol  | 1 -
 .../semanticTests/structs/struct_constructor_nested.sol          | 1 -
 .../structs/struct_containing_bytes_copy_and_delete.sol          | 1 -
 test/libsolidity/semanticTests/structs/struct_copy.sol           | 1 -
 test/libsolidity/semanticTests/structs/struct_copy_via_local.sol | 1 -
 test/libsolidity/semanticTests/structs/struct_delete_member.sol  | 1 -
 test/libsolidity/semanticTests/structs/struct_delete_storage.sol | 1 -
 .../semanticTests/structs/struct_delete_storage_with_array.sol   | 1 -
 .../semanticTests/structs/struct_delete_struct_in_mapping.sol    | 1 -
 .../semanticTests/structs/struct_memory_to_storage.sol           | 1 -
 .../structs/struct_memory_to_storage_function_ptr.sol            | 1 -
 .../semanticTests/structs/struct_named_constructor.sol           | 1 -
 test/libsolidity/semanticTests/structs/struct_reference.sol      | 1 -
 test/libsolidity/semanticTests/structs/struct_referencing.sol    | 1 -
 .../semanticTests/structs/struct_storage_push_zero_value.sol     | 1 -
 .../semanticTests/structs/struct_storage_to_mapping.sol          | 1 -
 .../semanticTests/structs/struct_storage_to_memory.sol           | 1 -
 .../structs/struct_storage_to_memory_function_ptr.sol            | 1 -
 test/libsolidity/semanticTests/structs/structs.sol               | 1 -
 .../semanticTests/structs/using_for_function_on_struct.sol       | 1 -
 test/libsolidity/semanticTests/tryCatch/assert.sol               | 1 -
 test/libsolidity/semanticTests/tryCatch/create.sol               | 1 -
 .../semanticTests/tryCatch/invalid_error_encoding.sol            | 1 -
 test/libsolidity/semanticTests/tryCatch/lowLevel.sol             | 1 -
 test/libsolidity/semanticTests/tryCatch/malformed_error.sol      | 1 -
 test/libsolidity/semanticTests/tryCatch/malformed_panic.sol      | 1 -
 test/libsolidity/semanticTests/tryCatch/malformed_panic_2.sol    | 1 -
 test/libsolidity/semanticTests/tryCatch/malformed_panic_3.sol    | 1 -
 test/libsolidity/semanticTests/tryCatch/malformed_panic_4.sol    | 1 -
 test/libsolidity/semanticTests/tryCatch/nested.sol               | 1 -
 test/libsolidity/semanticTests/tryCatch/panic.sol                | 1 -
 test/libsolidity/semanticTests/tryCatch/return_function.sol      | 1 -
 test/libsolidity/semanticTests/tryCatch/simple.sol               | 1 -
 test/libsolidity/semanticTests/tryCatch/simple_notuple.sol       | 1 -
 test/libsolidity/semanticTests/tryCatch/structured.sol           | 1 -
 .../libsolidity/semanticTests/tryCatch/structuredAndLowLevel.sol | 1 -
 test/libsolidity/semanticTests/tryCatch/super_trivial.sol        | 1 -
 test/libsolidity/semanticTests/tryCatch/trivial.sol              | 1 -
 .../semanticTests/tryCatch/try_catch_library_call.sol            | 1 -
 .../types/array_mapping_abstract_constructor_param.sol           | 1 -
 .../semanticTests/types/assign_calldata_value_type.sol           | 1 -
 .../types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol    | 1 -
 .../types/convert_fixed_bytes_to_fixed_bytes_same_size.sol       | 1 -
 .../types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol    | 1 -
 .../types/convert_fixed_bytes_to_uint_greater_size.sol           | 1 -
 .../types/convert_fixed_bytes_to_uint_same_min_size.sol          | 1 -
 .../types/convert_fixed_bytes_to_uint_same_type.sol              | 1 -
 .../types/convert_fixed_bytes_to_uint_smaller_size.sol           | 1 -
 .../types/convert_uint_to_fixed_bytes_greater_size.sol           | 1 -
 .../types/convert_uint_to_fixed_bytes_same_min_size.sol          | 1 -
 .../types/convert_uint_to_fixed_bytes_same_size.sol              | 1 -
 .../types/convert_uint_to_fixed_bytes_smaller_size.sol           | 1 -
 .../semanticTests/types/external_function_to_address.sol         | 1 -
 .../types/mapping/user_defined_types_mapping_storage.sol         | 1 -
 .../semanticTests/types/mapping_abstract_constructor_param.sol   | 1 -
 test/libsolidity/semanticTests/types/mapping_contract_key.sol    | 1 -
 .../semanticTests/types/mapping_contract_key_getter.sol          | 1 -
 .../semanticTests/types/mapping_contract_key_library.sol         | 1 -
 .../semanticTests/types/mapping_enum_key_getter_v2.sol           | 1 -
 .../semanticTests/types/mapping_enum_key_library_v2.sol          | 1 -
 test/libsolidity/semanticTests/types/mapping_enum_key_v2.sol     | 1 -
 test/libsolidity/semanticTests/types/mapping_simple.sol          | 1 -
 test/libsolidity/semanticTests/types/nested_tuples.sol           | 1 -
 test/libsolidity/semanticTests/types/packing_signed_types.sol    | 1 -
 test/libsolidity/semanticTests/types/packing_unpacking_types.sol | 1 -
 test/libsolidity/semanticTests/types/strings.sol                 | 1 -
 .../types/struct_mapping_abstract_constructor_param.sol          | 1 -
 .../semanticTests/types/tuple_assign_multi_slot_grow.sol         | 1 -
 test/libsolidity/semanticTests/types/type_conversion_cleanup.sol | 1 -
 test/libsolidity/semanticTests/underscore/as_function.sol        | 1 -
 .../uninitializedFunctionPointer/invalidInConstructor.sol        | 1 -
 .../uninitializedFunctionPointer/invalidStoredInConstructor.sol  | 1 -
 .../semanticTests/uninitializedFunctionPointer/store2.sol        | 1 -
 .../uninitializedFunctionPointer/storeInConstructor.sol          | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/abicodec.sol | 1 -
 .../userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol  | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/calldata.sol | 1 -
 .../semanticTests/userDefinedValueType/calldata_to_storage.sol   | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol  | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/constant.sol | 1 -
 .../semanticTests/userDefinedValueType/conversion.sol            | 1 -
 .../semanticTests/userDefinedValueType/dirty_slot.sol            | 1 -
 .../semanticTests/userDefinedValueType/dirty_uint8_read.sol      | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/erc20.sol    | 1 -
 .../semanticTests/userDefinedValueType/fixedpoint.sol            | 1 -
 .../semanticTests/userDefinedValueType/immutable_signed.sol      | 1 -
 .../semanticTests/userDefinedValueType/in_parenthesis.sol        | 1 -
 .../semanticTests/userDefinedValueType/mapping_key.sol           | 1 -
 .../semanticTests/userDefinedValueType/memory_to_storage.sol     | 1 -
 .../semanticTests/userDefinedValueType/multisource.sol           | 1 -
 .../semanticTests/userDefinedValueType/multisource_module.sol    | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/ownable.sol  | 1 -
 .../libsolidity/semanticTests/userDefinedValueType/parameter.sol | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/simple.sol   | 1 -
 .../semanticTests/userDefinedValueType/storage_layout.sol        | 1 -
 .../semanticTests/userDefinedValueType/storage_layout_struct.sol | 1 -
 .../semanticTests/userDefinedValueType/storage_signed.sol        | 1 -
 .../semanticTests/userDefinedValueType/wrap_unwrap.sol           | 1 -
 .../userDefinedValueType/wrap_unwrap_via_contract_name.sol       | 1 -
 .../zero_cost_abstraction_comparison_elementary.sol              | 1 -
 .../zero_cost_abstraction_comparison_userdefined.sol             | 1 -
 test/libsolidity/semanticTests/using/calldata_memory_copy.sol    | 1 -
 test/libsolidity/semanticTests/using/free_function_braces.sol    | 1 -
 test/libsolidity/semanticTests/using/free_function_multi.sol     | 1 -
 .../semanticTests/using/free_functions_individual.sol            | 1 -
 test/libsolidity/semanticTests/using/imported_functions.sol      | 1 -
 test/libsolidity/semanticTests/using/library_on_interface.sol    | 1 -
 test/libsolidity/semanticTests/using/library_through_module.sol  | 1 -
 test/libsolidity/semanticTests/using/module_renamed.sol          | 1 -
 test/libsolidity/semanticTests/using/recursive_import.sol        | 1 -
 .../semanticTests/using/using_global_all_the_types.sol           | 1 -
 test/libsolidity/semanticTests/using/using_global_for_global.sol | 1 -
 test/libsolidity/semanticTests/using/using_global_invisible.sol  | 1 -
 test/libsolidity/semanticTests/using/using_global_library.sol    | 1 -
 test/libsolidity/semanticTests/variables/delete_local.sol        | 1 -
 test/libsolidity/semanticTests/variables/delete_locals.sol       | 1 -
 .../semanticTests/variables/mapping_local_assignment.sol         | 1 -
 .../variables/mapping_local_compound_assignment.sol              | 1 -
 .../semanticTests/variables/mapping_local_tuple_assignment.sol   | 1 -
 .../semanticTests/variables/public_state_overridding.sol         | 1 -
 .../variables/public_state_overridding_dynamic_struct.sol        | 1 -
 .../public_state_overridding_mapping_to_dynamic_struct.sol       | 1 -
 .../semanticTests/variables/storing_invalid_boolean.sol          | 1 -
 test/libsolidity/semanticTests/various/address_code.sol          | 1 -
 test/libsolidity/semanticTests/various/address_code_complex.sol  | 1 -
 .../various/assignment_to_const_var_involving_expression.sol     | 1 -
 test/libsolidity/semanticTests/various/balance.sol               | 1 -
 test/libsolidity/semanticTests/various/byte_optimization_bug.sol | 1 -
 test/libsolidity/semanticTests/various/code_access_content.sol   | 1 -
 test/libsolidity/semanticTests/various/code_access_create.sol    | 1 -
 test/libsolidity/semanticTests/various/code_access_padding.sol   | 1 -
 test/libsolidity/semanticTests/various/code_access_runtime.sol   | 1 -
 test/libsolidity/semanticTests/various/code_length.sol           | 1 -
 .../semanticTests/various/code_length_contract_member.sol        | 1 -
 test/libsolidity/semanticTests/various/codebalance_assembly.sol  | 1 -
 test/libsolidity/semanticTests/various/codehash.sol              | 1 -
 test/libsolidity/semanticTests/various/codehash_assembly.sol     | 1 -
 .../semanticTests/various/contract_binary_dependencies.sol       | 1 -
 .../various/crazy_elementary_typenames_on_stack.sol              | 1 -
 test/libsolidity/semanticTests/various/cross_contract_types.sol  | 1 -
 test/libsolidity/semanticTests/various/decayed_tuple.sol         | 1 -
 .../semanticTests/various/destructuring_assignment.sol           | 1 -
 .../semanticTests/various/empty_name_return_parameter.sol        | 1 -
 test/libsolidity/semanticTests/various/erc20.sol                 | 1 -
 .../semanticTests/various/external_types_in_calls.sol            | 1 -
 test/libsolidity/semanticTests/various/flipping_sign_tests.sol   | 1 -
 test/libsolidity/semanticTests/various/gasleft_decrease.sol      | 1 -
 .../semanticTests/various/gasleft_shadow_resolution.sol          | 1 -
 test/libsolidity/semanticTests/various/inline_member_init.sol    | 1 -
 .../semanticTests/various/inline_member_init_inheritence.sol     | 1 -
 .../semanticTests/various/inline_tuple_with_rational_numbers.sol | 1 -
 test/libsolidity/semanticTests/various/iszero_bnot_correct.sol   | 1 -
 test/libsolidity/semanticTests/various/literal_empty_string.sol  | 1 -
 test/libsolidity/semanticTests/various/memory_overwrite.sol      | 1 -
 test/libsolidity/semanticTests/various/multi_modifiers.sol       | 1 -
 .../semanticTests/various/multi_variable_declaration.sol         | 1 -
 .../libsolidity/semanticTests/various/nested_calldata_struct.sol | 1 -
 .../semanticTests/various/nested_calldata_struct_to_memory.sol   | 1 -
 .../semanticTests/various/positive_integers_to_signed.sol        | 1 -
 test/libsolidity/semanticTests/various/senders_balance.sol       | 1 -
 .../various/single_copy_with_multiple_inheritance.sol            | 1 -
 test/libsolidity/semanticTests/various/skip_dynamic_types.sol    | 1 -
 ...kip_dynamic_types_for_static_arrays_with_dynamic_elements.sol | 1 -
 .../semanticTests/various/skip_dynamic_types_for_structs.sol     | 1 -
 .../various/state_variable_local_variable_mixture.sol            | 1 -
 .../semanticTests/various/state_variable_under_contract_name.sol | 1 -
 .../semanticTests/various/staticcall_for_view_and_pure.sol       | 1 -
 .../various/staticcall_for_view_and_pure_pre_byzantium.sol       | 1 -
 .../various/storage_string_as_mapping_key_without_variable.sol   | 1 -
 test/libsolidity/semanticTests/various/store_bytes.sol           | 1 -
 test/libsolidity/semanticTests/various/string_tuples.sol         | 1 -
 test/libsolidity/semanticTests/various/super.sol                 | 1 -
 test/libsolidity/semanticTests/various/super_alone.sol           | 1 -
 test/libsolidity/semanticTests/various/super_parentheses.sol     | 1 -
 .../semanticTests/various/swap_in_storage_overwrite.sol          | 1 -
 .../libsolidity/semanticTests/various/test_underscore_in_hex.sol | 1 -
 test/libsolidity/semanticTests/various/tuples.sol                | 1 -
 .../semanticTests/various/typed_multi_variable_declaration.sol   | 1 -
 test/libsolidity/semanticTests/various/value_complex.sol         | 1 -
 test/libsolidity/semanticTests/various/value_insane.sol          | 1 -
 .../libsolidity/semanticTests/various/write_storage_external.sol | 1 -
 test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol    | 1 -
 test/libsolidity/semanticTests/viaYul/array_2d_new.sol           | 1 -
 test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol    | 1 -
 test/libsolidity/semanticTests/viaYul/array_3d_new.sol           | 1 -
 .../libsolidity/semanticTests/viaYul/array_function_pointers.sol | 1 -
 .../array_2d_zeroed_memory_index_access.sol                      | 1 -
 .../viaYul/array_memory_allocation/array_array_static.sol        | 1 -
 .../array_static_return_param_zeroed_memory_index_access.sol     | 1 -
 .../array_static_zeroed_memory_index_access.sol                  | 1 -
 .../array_memory_allocation/array_zeroed_memory_index_access.sol | 1 -
 .../semanticTests/viaYul/array_memory_as_parameter.sol           | 1 -
 test/libsolidity/semanticTests/viaYul/array_memory_create.sol    | 1 -
 .../semanticTests/viaYul/array_memory_index_access.sol           | 1 -
 .../semanticTests/viaYul/array_push_return_reference.sol         | 1 -
 test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol    | 1 -
 .../semanticTests/viaYul/array_storage_index_access.sol          | 1 -
 .../semanticTests/viaYul/array_storage_index_boundary_test.sol   | 1 -
 .../semanticTests/viaYul/array_storage_index_zeroed_test.sol     | 1 -
 .../semanticTests/viaYul/array_storage_length_access.sol         | 1 -
 .../semanticTests/viaYul/array_storage_pop_zero_length.sol       | 1 -
 .../semanticTests/viaYul/array_storage_push_empty.sol            | 1 -
 .../viaYul/array_storage_push_empty_length_address.sol           | 1 -
 test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol | 1 -
 test/libsolidity/semanticTests/viaYul/assert.sol                 | 1 -
 test/libsolidity/semanticTests/viaYul/assert_and_require.sol     | 1 -
 .../semanticTests/viaYul/assign_tuple_from_function_call.sol     | 1 -
 test/libsolidity/semanticTests/viaYul/calldata_array_access.sol  | 1 -
 .../semanticTests/viaYul/calldata_array_index_range_access.sol   | 1 -
 test/libsolidity/semanticTests/viaYul/calldata_array_length.sol  | 1 -
 .../semanticTests/viaYul/calldata_array_three_dimensional.sol    | 1 -
 .../semanticTests/viaYul/calldata_bytes_array_bounds.sol         | 1 -
 test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol     | 1 -
 test/libsolidity/semanticTests/viaYul/comparison.sol             | 1 -
 test/libsolidity/semanticTests/viaYul/comparison_functions.sol   | 1 -
 .../semanticTests/viaYul/conditional/conditional_multiple.sol    | 1 -
 .../viaYul/conditional/conditional_true_false_literal.sol        | 1 -
 .../semanticTests/viaYul/conditional/conditional_tuple.sol       | 1 -
 .../viaYul/conditional/conditional_with_assignment.sol           | 1 -
 .../viaYul/conditional/conditional_with_variables.sol            | 1 -
 .../semanticTests/viaYul/conversion/explicit_cast_assignment.sol | 1 -
 .../viaYul/conversion/explicit_cast_function_call.sol            | 1 -
 .../viaYul/conversion/explicit_cast_local_assignment.sol         | 1 -
 .../viaYul/conversion/explicit_string_bytes_calldata_cast.sol    | 1 -
 .../semanticTests/viaYul/conversion/function_cast.sol            | 1 -
 .../semanticTests/viaYul/conversion/implicit_cast_assignment.sol | 1 -
 .../viaYul/conversion/implicit_cast_function_call.sol            | 1 -
 .../viaYul/conversion/implicit_cast_local_assignment.sol         | 1 -
 .../semanticTests/viaYul/copy_struct_invalid_ir_bug.sol          | 1 -
 .../semanticTests/viaYul/define_tuple_from_function_call.sol     | 1 -
 test/libsolidity/semanticTests/viaYul/delete.sol                 | 1 -
 test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol    | 1 -
 .../semanticTests/viaYul/detect_add_overflow_signed.sol          | 1 -
 test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol    | 1 -
 test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol        | 1 -
 test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol | 1 -
 test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol    | 1 -
 .../semanticTests/viaYul/detect_mul_overflow_signed.sol          | 1 -
 test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol    | 1 -
 .../semanticTests/viaYul/detect_sub_overflow_signed.sol          | 1 -
 .../viaYul/empty_return_corrupted_free_memory_pointer.sol        | 1 -
 test/libsolidity/semanticTests/viaYul/exp.sol                    | 1 -
 test/libsolidity/semanticTests/viaYul/exp_literals_success.sol   | 1 -
 test/libsolidity/semanticTests/viaYul/exp_neg.sol                | 1 -
 test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol       | 1 -
 test/libsolidity/semanticTests/viaYul/exp_overflow.sol           | 1 -
 test/libsolidity/semanticTests/viaYul/exp_various.sol            | 1 -
 test/libsolidity/semanticTests/viaYul/function_address.sol       | 1 -
 test/libsolidity/semanticTests/viaYul/function_entry_checks.sol  | 1 -
 test/libsolidity/semanticTests/viaYul/function_pointers.sol      | 1 -
 test/libsolidity/semanticTests/viaYul/function_selector.sol      | 1 -
 test/libsolidity/semanticTests/viaYul/if.sol                     | 1 -
 test/libsolidity/semanticTests/viaYul/keccak.sol                 | 1 -
 .../semanticTests/viaYul/local_address_assignment.sol            | 1 -
 test/libsolidity/semanticTests/viaYul/local_assignment.sol       | 1 -
 test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol  | 1 -
 test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol | 1 -
 .../semanticTests/viaYul/local_variable_without_init.sol         | 1 -
 test/libsolidity/semanticTests/viaYul/loops/break.sol            | 1 -
 test/libsolidity/semanticTests/viaYul/loops/continue.sol         | 1 -
 test/libsolidity/semanticTests/viaYul/loops/return.sol           | 1 -
 test/libsolidity/semanticTests/viaYul/loops/simple.sol           | 1 -
 .../libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol | 1 -
 test/libsolidity/semanticTests/viaYul/mapping_getters.sol        | 1 -
 test/libsolidity/semanticTests/viaYul/mapping_string_key.sol     | 1 -
 test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol    | 1 -
 test/libsolidity/semanticTests/viaYul/msg_sender.sol             | 1 -
 test/libsolidity/semanticTests/viaYul/negation_bug.sol           | 1 -
 test/libsolidity/semanticTests/viaYul/require.sol                | 1 -
 test/libsolidity/semanticTests/viaYul/return.sol                 | 1 -
 test/libsolidity/semanticTests/viaYul/return_and_convert.sol     | 1 -
 .../libsolidity/semanticTests/viaYul/return_storage_pointers.sol | 1 -
 test/libsolidity/semanticTests/viaYul/short_circuit.sol          | 1 -
 test/libsolidity/semanticTests/viaYul/simple_assignment.sol      | 1 -
 test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol      | 1 -
 test/libsolidity/semanticTests/viaYul/smoke_test.sol             | 1 -
 .../semanticTests/viaYul/storage/dirty_storage_bytes.sol         | 1 -
 .../semanticTests/viaYul/storage/dirty_storage_bytes_long.sol    | 1 -
 .../semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol | 1 -
 .../semanticTests/viaYul/storage/dirty_storage_static_array.sol  | 1 -
 .../semanticTests/viaYul/storage/dirty_storage_struct.sol        | 1 -
 test/libsolidity/semanticTests/viaYul/storage/mappings.sol       | 1 -
 test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol | 1 -
 test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol | 1 -
 test/libsolidity/semanticTests/viaYul/string_format.sol          | 1 -
 test/libsolidity/semanticTests/viaYul/string_literals.sol        | 1 -
 test/libsolidity/semanticTests/viaYul/struct_member_access.sol   | 1 -
 test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol | 1 -
 test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol       | 1 -
 test/libsolidity/semanticTests/viaYul/various_inline_asm.sol     | 1 -
 test/libsolidity/semanticTests/viaYul/virtual_functions.sol      | 1 -
 .../virtualFunctions/internal_virtual_function_calls.sol         | 1 -
 .../internal_virtual_function_calls_through_dispatch.sol         | 1 -
 .../semanticTests/virtualFunctions/virtual_function_calls.sol    | 1 -
 .../virtual_function_usage_in_constructor_arguments.sol          | 1 -
 1267 files changed, 1267 deletions(-)

diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
index 4a67993ee9..82cc456c09 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
@@ -5,6 +5,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0xc0, 0x20, 0x4, 0x3, 0x4, 0x5, 0x6 -> 0x20, 0x4, 0x3, 0x4, 0x5, 0x6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol
index b421f7bd01..f85da124cb 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol
@@ -5,6 +5,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint16[3],uint16[2][3],uint256,uint256,uint256): 1, 2, 3, 11, 12, 21, 22, 31, 32, 1, 2, 1 -> 2, 32
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
index eeb8bfc706..ddc9249118 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
@@ -9,6 +9,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0xc0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6 -> 1, 2, 3, 4, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
index 08467feb86..638a7ce57b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
@@ -12,6 +12,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0xc0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6 -> 1, 2, 3, 4, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
index f02d75d17c..ebd4a07252 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
@@ -5,6 +5,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x20, 0x21 -> 33
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
index 6f1c652a00..9f1f949419 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
@@ -19,6 +19,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
index bcb14d6845..2d11efa64b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
@@ -13,6 +13,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0xe0, 0x20, 0x21, 0x40, 0x3, 0xa, 0xb, 0xc -> 0x20, 0x21, 0x40, 0x3, 0xa, 0xb, 0xc
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index 07f4ab2756..810376454b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
@@ -21,7 +21,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
 // gas irOptimized: 203310
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol
index 1bd84a418e..773b7d2c66 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol
@@ -30,7 +30,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f0() -> 0x20, 0x0
 // f1() -> 0x20, 0x40, 0x1, 0x2
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
index d11914fce4..a0f3ca00f4 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
@@ -23,6 +23,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 8503e5790a..066891e2d0 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -57,7 +57,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // test_bytes() ->
 // gas irOptimized: 371912
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol
index 61aec760ac..fb093b41a7 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol
@@ -7,6 +7,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol
index d891ad8b46..c5ba49368f 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol
@@ -7,6 +7,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0x40, 0x1, -2
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol
index fbe533bb4c..887ba5dc33 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
 // f_external(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol b/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol
index 4d48a1dee8..b372a4c47a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256[],uint256): 6, 0x60, 9, 0x8000000000000000000000000000000000000000000000000000000000000002, 1, 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol
index a85504db48..11e79dec03 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol
@@ -8,6 +8,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 42, 23 -> 42, 23, 42, 23
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol
index 8813be109b..5fef532da6 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol
@@ -5,6 +5,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,uint16[],uint256): 6, 0x60, 9, 7, 11, 12, 13, 14, 15, 16, 17 -> 7, 17, 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
index 450dfa4d5d..32f8eba68a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
@@ -20,7 +20,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test(bytes): 0x20, 0x80, 0x40, 0x60, 0, 0 -> false, false
 // test(bytes): 0x20, 0xC0, 0x40, 0x80, 1, 0x42, 1, 0x42 -> false, false
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol b/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol
index b86129d773..2597057037 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol
@@ -13,6 +13,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 3, 0x6200000000000000000000000000000000000000000000000000000000000000, 3, 0x6600000000000000000000000000000000000000000000000000000000000000, 4, 7
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_advanced.sol b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_advanced.sol
index aee924a80f..24c1b2325a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_advanced.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_advanced.sol
@@ -13,6 +13,5 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f() -> 0x80, -1, 0xe0, 0x1234, 40, "12345678901234567890123456789012", "34567890", 4, 97767552542602192590433234714624, 0, 0, 537879995309340587922569878831104
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_1.sol b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_1.sol
index c90180f494..191b4e6be6 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_1.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_1.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // EVMVersion: =homestead
 // ----
 // f(uint256): 0x60 -> true
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_2.sol b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_2.sol
index c976be0647..cfbd003244 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_out_of_range_2.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256): 0x60 -> FAILURE
 // f(uint256): 0x61 -> true
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_simple.sol b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_simple.sol
index 4b52f70226..bd12b0a9b3 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_simple.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/return_dynamic_types_cross_call_simple.sol
@@ -8,6 +8,5 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f() -> 0x20, 40, "12345678901234567890123456789012", "34567890"
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index cfdecd7a04..44a193dfbd 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -22,7 +22,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 2710f202d0..316d43673c 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -58,7 +58,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // test_bytes() ->
 // gas irOptimized: 371912
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol
index 73222d1a9b..8db4674c22 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol
@@ -11,6 +11,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x40, 0xa0, 0x40, 0x20, 0x0, 0x0
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol
index e190171106..106c26ea97 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol
@@ -10,6 +10,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0x40, 0x1, -2
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index e1e2d0ab64..0854c580ac 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -46,7 +46,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f0() -> 0x20, 0x0
 // f1() -> 0x20, 0x40, 0x1, 0x2
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index b7d917dbf9..973d33b90c 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -29,7 +29,6 @@ contract C is B {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 77
 // gas irOptimized: 119711
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
index 1531183555..f49908d522 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
@@ -37,7 +37,6 @@ contract C is B {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 5, 10
 // gas irOptimized: 87337
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol b/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol
index abbbe7ab24..1a6856ff4d 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> true
 // f(bool): false -> false
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol
index 9155d8c6b5..5dce4902c0 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
 // f_external(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 63ee9bd029..8b68547ac8 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -16,7 +16,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic.sol
index 6fe3f6924d..c1208218bd 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic.sol
@@ -22,7 +22,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256[]): 32, 3, 23, 42, 87 -> 32, 160, 32, 3, 23, 42, 87
 // g(uint256[]): 32, 3, 23, 42, 87 -> 32, 160, 32, 3, 23, 42, 87
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_index_access.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_index_access.sol
index b8179a131e..a9e3d8b153 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_index_access.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_index_access.sol
@@ -22,7 +22,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256[]): 32, 3, 42, 23, 87 -> 32, 160, 32, 3, 42, 23, 87
 // g(uint256[][2],uint256): 0x40, 0, 0x40, 0xC0, 3, 42, 23, 87, 4, 11, 13, 17 -> 32, 160, 32, 3, 42, 23, 87
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_dynamic.sol
index 08180ab24b..ecea716bd0 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_dynamic.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_dynamic.sol
@@ -44,7 +44,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // g() -> 32, 196, hex"eccb829a", 32, 1, 32, 32, 1, 42, hex"00000000000000000000000000000000000000000000000000000000"
 // h() -> 32, 196, hex"eccb829a", 32, 1, 32, 32, 1, 42, hex"00000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol
index cd6cd9864b..9fab29f9f7 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol
@@ -7,7 +7,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256[][2][]): 0x20, 0x01, 0x20, 0x40, 0x60, 0x00, 0x00 -> 23 # this is the common encoding for x.length == 1 && x[0][0].length == 0 && x[0][1].length == 0 #
 // f(uint256[][2][]): 0x20, 0x01, 0x20, 0x00, 0x00 -> 23 # exotic, but still valid encoding #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol
index 2cf09b19b6..74557f96b8 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g(uint256[][2][]): 0x20, 0x01, 0x20, 0x40, 0x60, 0x00, 0x00 -> 42
 // g(uint256[][2][]): 0x20, 0x01, 0x20, 0x00, 0x00 -> 42
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol
index f5380901f1..ee3bf38d2f 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol
@@ -26,7 +26,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g(bool): false -> 23, 37, 71
 // g(bool): true -> 23, 37, 71
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_multi_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_multi_dynamic.sol
index c4e02ec269..b9b3bd1456 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_multi_dynamic.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_multi_dynamic.sol
@@ -22,7 +22,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256[][]): 0x20, 2, 0x40, 0xC0, 3, 13, 17, 23, 4, 27, 31, 37, 41 -> 32, 416, 32, 2, 64, 192, 3, 13, 17, 23, 4, 27, 31, 37, 41
 // g(uint256[][]): 0x20, 2, 0x40, 0xC0, 3, 13, 17, 23, 4, 27, 31, 37, 41 -> 32, 416, 32, 2, 64, 192, 3, 13, 17, 23, 4, 27, 31, 37, 41
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol
index b2a126d506..b8cb0226e1 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // revertStrings: debug
-// compileViaYul: also
 // ----
 // f(uint256[]): 0x20, 0 ->
 // f(uint256[]): 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 0x2b, "ABI decoding: invalid calldata a", "rray stride"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
index 19aa30a086..a6dcdc6ee8 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
@@ -2,7 +2,6 @@ contract C {
 	function f(uint[] calldata) public {}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[]): 0x20, 0 ->
 // f(uint256[]): 0x20, 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static.sol
index 86c2b139f1..aaf7616ec8 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static.sol
@@ -16,7 +16,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256[3]): 23, 42, 87 -> 32, 96, 23, 42, 87
 // g(uint256[3]): 23, 42, 87 -> 32, 96, 23, 42, 87
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_dynamic_static.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_dynamic_static.sol
index 6e5944fdca..dd59ac8cf6 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_dynamic_static.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_dynamic_static.sol
@@ -42,7 +42,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // g() -> 32, 132, hex"15cfcc01", 32, 32, 1, 42, hex"00000000000000000000000000000000000000000000000000000000"
 // h() -> 32, 132, hex"15cfcc01", 32, 32, 1, 42, hex"00000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_index_access.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_index_access.sol
index b89c8644de..a75e2c2e0d 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_index_access.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_static_index_access.sol
@@ -16,7 +16,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256[3]): 23, 42, 87 -> 32, 96, 23, 42, 87
 // g(uint256[3][2],uint256): 23, 42, 87, 123, 142, 187, 0 -> 32, 96, 23, 42, 87
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_struct_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_struct_dynamic.sol
index 3c05dacd63..68dbe88f74 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_struct_dynamic.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_struct_dynamic.sol
@@ -11,7 +11,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f((uint256[])[]): 32, 1, 32, 32, 3, 17, 42, 23 -> 32, 256, 32, 1, 32, 32, 3, 17, 42, 23
 // g((uint256[])[]): 32, 1, 32, 32, 3, 17, 42, 23 -> 32, 256, 32, 1, 32, 32, 3, 17, 42, 23
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_dynamic.sol
index ece02aa8ec..5e43a1c4b1 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_dynamic.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_dynamic.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256[],uint256[],bool): 0x60, 0xE0, true, 3, 23, 42, 87, 2, 51, 72 -> 32, 160, 0x20, 3, 23, 42, 87
 // f(uint256[],uint256[],bool): 0x60, 0xE0, false, 3, 23, 42, 87, 2, 51, 72 -> 32, 128, 0x20, 2, 51, 72
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_static.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_static.sol
index 9deff8bf73..554c06aa92 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_static.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_two_static.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256[3],uint256[2],bool): 23, 42, 87, 51, 72, true -> 32, 96, 23, 42, 87
 // f(uint256[3],uint256[2],bool): 23, 42, 87, 51, 72, false -> 32, 64, 51, 72
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
index 042ad586e4..0872a7f5d5 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
@@ -10,7 +10,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // h(uint256[][]): 0x20, 1, 0x20, 0 ->
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol
index a0b5008765..6280a70f6a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol
@@ -12,7 +12,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[3][]): 0x20, 1, 0x01 -> FAILURE
 // f(uint256[3][]): 0x20, 1, 0x01, 0x02 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_dynamic.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_dynamic.sol
index 8c49af8c9d..f275957c03 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_dynamic.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_dynamic.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f((uint256[])): 0x20, 0x20, 3, 42, 23, 17 -> 32, 192, 0x20, 0x20, 3, 42, 23, 17
 // g((uint256[])): 0x20, 0x20, 3, 42, 23, 17 -> 32, 192, 0x20, 0x20, 3, 42, 23, 17
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol
index 7744fbf627..e92a8cd847 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol
@@ -20,6 +20,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 11, 11
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_simple.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_simple.sol
index c10504841d..4c85fe767a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_simple.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_simple.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f((uint256)): 3 -> 32, 32, 3
 // g((uint256)): 3 -> 32, 32, 3
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol
index 3ac82eee5e..830128b614 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> 0
 // g(address): 0 -> 0 # test validation as well as sanity check #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol
index 79cf687951..93813558a4 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> false
 // gggg(bool): 0 -> false # test validation as well as sanity check #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol
index 26ff5fb697..6c55b70a59 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol
@@ -43,7 +43,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f1(bytes32): left(0) -> left(0)
 // gg1(bytes1): left(0) -> left(0) # test validation as well as sanity check #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol
index 0723d4d312..b680e9cd23 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint16,int16,address,bytes3,bool): 1, 2, 3, "a", true -> 1, 2, 3, "a", true
 // f(uint16,int16,address,bytes3,bool): 0xffffff, 0x1ffff, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, "abcd", 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/dynamic_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/dynamic_array.sol
index ec4d4dcf5e..240ec623ff 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/dynamic_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/dynamic_array.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256[]): 0x20, 2, 1, 1 -> 0x20, 0x84, hex"304a4c23", 0x20, 2, 1, 1, hex"00000000000000000000000000000000000000000000000000000000"
 // ggg(uint8[]): 0x20, 2, 1, 1 -> 0x20, 0x84, hex"304a4c23", 0x20, 2, 1, 1, hex"00000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol
index 7a4ec0ce56..31f7470a78 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // ffff(uint256): 0 -> 0, 0
 // ggg(function): 0 -> 0
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol
index db636986e8..18c32fe910 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol
@@ -43,7 +43,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f8(int256): 0 -> 0
 // ggg8(int8): 0 -> 0 # test validation as well as sanity check #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/simple_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/simple_struct.sol
index 1906750f88..2a019f5e78 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/simple_struct.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/simple_struct.sol
@@ -17,7 +17,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256,bytes32): 1, left(0x01) -> 0x20, 0x44, hex"b63240b0", 1, left(0x01), hex"00000000000000000000000000000000000000000000000000000000"
 // gg((uint8,bytes1)): 1, left(0x01) -> 0x20, 0x44, hex"b63240b0", 1, left(0x01), hex"00000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/static_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/static_array.sol
index a0a542b10c..ce8cbfad54 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/static_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/static_array.sol
@@ -16,7 +16,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 1, 1 -> 0x20, 0x44, hex"78b86ac6", 1, 1, hex"00000000000000000000000000000000000000000000000000000000"
 // gggggggg(uint8[2]): 1, 1 -> 0x20, 0x44, hex"78b86ac6", 1, 1, hex"00000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol
index cf17ef623d..2f27191205 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol
@@ -43,7 +43,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f8(uint256): 0 -> 0
 // ggg8(uint8): 0 -> 0 # test validation as well as sanity check #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol
index d4d7f03d0e..73b3190368 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol
@@ -7,6 +7,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,uint16[],uint256): 6, 0x60, 9, 7, 11, 12, 13, 14, 15, 16, 17 -> 7, 17, 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol
index 23faf0d895..7205fec559 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol
@@ -26,7 +26,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 12, 3, 4, 0x66, 5, 0x85, 13
 // f(uint256,uint16[][],uint256[2][][3],uint256): 12, 0x80, 0x220, 13, 3, 0x60, 0xC0, 0x160, 2, 85, 86, 4, 101, 102, 103, 104, 0, 0x60, 0xC0, 0x220, 1, 0, 117, 5, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0 -> 12, 3, 4, 0x66, 5, 0x85, 13
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/enums.sol b/test/libsolidity/semanticTests/abiEncoderV2/enums.sol
index d9637c23c4..285bf334f9 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/enums.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/enums.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint8): 0 -> 0
 // f(uint8): 1 -> 1
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol b/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol
index 549838f955..560cc1ecde 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol
@@ -15,6 +15,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 3, 0x6200000000000000000000000000000000000000000000000000000000000000, 3, 0x6600000000000000000000000000000000000000000000000000000000000000, 4, 7
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index 5499c2594e..90287c2b05 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -16,7 +16,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
 // gas irOptimized: 180924
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol
index afa16826dc..8b1c021a5b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol
@@ -9,6 +9,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,(address,uint256[])[2],uint256): 7, 0x60, 8, 0x40, 0xE0, 0x0, 0x40, 2, 0x11, 0x12, 0x99, 0x40, 4, 0x31, 0x32, 0x34, 0x35 -> 7, 0x0, 8
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol
index 7775423d47..802b3ee632 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol
@@ -9,6 +9,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,(address)[2],uint256): 7, 0, 0, 8 -> 7, 0, 8
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol
index 7e3031ba55..3e3dd3adb8 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol
@@ -11,6 +11,5 @@ contract C {
     function g() public returns (uint) { return 7; }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 7, 3
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol
index 55f09a3fdd..73fa9b415f 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((int256,uint256,bytes16)): 0xff010, 0xff0002, "abcd" -> 0xff010, 0xff0002, "abcd"
 // f((int256,uint256,bytes16)): 0xff010, 0xff0002, 0x1111222233334444555566667777888800000000000000000000000000000000 -> 0xff010, 0xff0002, left(0x11112222333344445555666677778888)
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol
index 9cfd19fd43..80fe3149b7 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol
@@ -11,6 +11,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint256,uint8,uint8,bytes2)): 1, 2, 3, "ab" -> 1, 2, 3, 0x6162
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol
index 39e6e2731d..3e26641024 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol
@@ -11,7 +11,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f((int16,uint8,bytes2)): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01, 0xff, "ab" -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01, 0xff, "ab"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol
index 1909047456..b1151c2fac 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol
@@ -7,7 +7,6 @@ contract C {
     function h(S calldata s) external pure returns (uint r) { s.x; r = 3; }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f((function)): "01234567890123456789abcd" -> 1
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
index 0574c4dd2c..7164c3220f 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
@@ -9,6 +9,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
index b3eb6724da..08f9064732 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
@@ -5,6 +5,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index 027ae4e169..2fb406b778 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -8,7 +8,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
 // gas irOptimized: 135918
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
index dc6ead60b2..3eca4cbb80 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
@@ -46,6 +46,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // callExternal() -> true
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
index a70c6b903c..8639961410 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
@@ -48,7 +48,6 @@ contract C is Base {
 }
 
 // ====
-// compileViaYul: also
 // EVMVersion: >=byzantium
 // ----
 // test() -> 11116
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
index 3c053e38a4..fec2c869ce 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
@@ -50,7 +50,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // assertConsistentSelectors() ->
 // fSignatureFromLiteral() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
index 781a6684f4..2cf4274f47 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
@@ -23,6 +23,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 0xa7a0d53700000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
index 24e6d065f9..2ff791ff04 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
@@ -37,7 +37,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // assertConsistentSelectors() ->
 // fSignatureFromLiteralNoArgs() -> 0x20, 0x04, 12200448252684243758085936796735499259670113115893304444050964496075123064832
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol
index d19a457f97..ec1ea14b59 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_uint_bytes.sol
@@ -14,7 +14,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // EVMVersion: >homestead
 // ----
 // f() -> 0x20, 0x60, 0x1234000000000000000000000000000000000000000000000000000000000000, 0x6162000000000000000000000000000000000000000000000000000000000000, 0x1234000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol
index 71a6e5e497..45c71e4d81 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol
@@ -16,7 +16,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f0() -> 0x20, 4, 8234104107246695022420661102507966550300666591269321702959126607540084801536
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol
index 648ba1f49b..a4f24a963e 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol
@@ -25,7 +25,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f0() -> 0x20, 4, 8234104107246695022420661102507966550300666591269321702959126607540084801536
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol
index 7247ede17a..ce3c952d16 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol
@@ -26,7 +26,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f0() -> 0x20, 4, -34435155370463444793260793355178157075203752403645521721995013737368954863616
 // f1() -> 0x20, 0x64, -34435155370463444793260793355178157075203752403645521721995013737368954863616, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
index 1968a76a83..f3520223d2 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
@@ -34,7 +34,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f0() -> 0x20, 4, -34435155370463444793260793355178157075203752403645521721995013737368954863616
 // f1() -> 0x20, 0x64, -34435155370463444793260793355178157075203752403645521721995013737368954863616, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol b/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol
index c26aea83ae..0fe8b45d55 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol
@@ -11,7 +11,6 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0xA0, 0x20, 3, 0x01, 0x02, 0x03 -> 0x20, 3, 0x01, 0x02, 0x03
 // g() -> 0x20, 0xa0, 0x20, 3, 0x42, 0x21, 0x23
diff --git a/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol b/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol
index 69360fe048..f676233096 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol
@@ -12,7 +12,6 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0xA0, 0x20, 3, 0x01, 0x02, 0x03 -> 0x20, 3, 0x01, 0x02, 0x03
 // f(bytes): 0x20, 0x60, 0x20, 1, 0x0102030405060708090a0b0c0d0e0f1011121314 -> 0x20, 1, 0x0102030405060708090a0b0c0d0e0f1011121314
diff --git a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol
index 12223ed0c8..736794dc4f 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol
@@ -24,7 +24,6 @@ contract Test {
 	}
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // test() -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol
index a727e57197..fe956322f1 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol
@@ -25,7 +25,6 @@ contract Test {
 	}
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // withinArray() -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol
index 4793b5e6e5..8a7e572cc8 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol
@@ -18,7 +18,6 @@ contract Test {
 	}
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // test() -> FAILURE
diff --git a/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol b/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol
index b180b2e6b3..1d6346259c 100644
--- a/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol
+++ b/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol
@@ -3,6 +3,5 @@ contract Lotto {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // ticketPrice() -> 555
diff --git a/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol b/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol
index a6066107ed..16b534585a 100644
--- a/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol
+++ b/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol
@@ -4,6 +4,5 @@ contract Lotto {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // ticketPrice() -> 500
diff --git a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol
index 6afd7458ad..034abce943 100644
--- a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol
+++ b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol
@@ -10,6 +10,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 0
diff --git a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol
index 51805ae115..cfcd9463fa 100644
--- a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol
+++ b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol
@@ -20,7 +20,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> FAILURE, hex"4e487b71", 0x12
 // g(uint256): 0 -> FAILURE, hex"4e487b71", 0x12
diff --git a/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol b/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol
index 59ffb44f8b..b626289104 100644
--- a/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol
+++ b/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol
@@ -9,6 +9,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x00
diff --git a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
index 7e3edc127a..d20919327a 100644
--- a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
+++ b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
@@ -14,7 +14,6 @@ contract D {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x11
 // g(), 100 wei -> 1
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol b/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol
index 884f4717ec..9fb32f712d 100644
--- a/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol
+++ b/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint16,uint16): 65534, 0 -> 0xfffe
 // f(uint16,uint16): 65536, 0 -> FAILURE
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol b/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol
index bf8b7bdfbe..4fc0ff189f 100644
--- a/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol
+++ b/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol
@@ -9,7 +9,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint16,uint16,uint16): 0xe000, 0xe500, 2 -> FAILURE, hex"4e487b71", 0x11
 // f(uint16,uint16,uint16): 0xe000, 0x1000, 0x1000 -> 0x00
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol b/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol
index 7a10212178..267489b419 100644
--- a/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol
+++ b/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol
@@ -9,7 +9,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint16,uint16,uint16): 0xe000, 0xe500, 2 -> 58626
diff --git a/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol b/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol
index 47e9e4c1fa..d996409ca8 100644
--- a/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol
+++ b/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol
@@ -9,7 +9,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // div(uint256,uint256): 7, 2 -> 3
 // div(uint256,uint256): 7, 0 -> FAILURE, hex"4e487b71", 0x12 # throws #
diff --git a/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol b/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
index 4b23419493..6609e683a3 100644
--- a/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
+++ b/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
@@ -31,7 +31,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test_hardcode1(uint256,uint256,uint256): 2, 3, 4 -> 2417851639229258349412352
 // test_hardcode2(uint256,uint256,uint256,uint256): 3, 2, 2, 2 -> 43046721
diff --git a/test/libsolidity/semanticTests/arithmetics/signed_mod.sol b/test/libsolidity/semanticTests/arithmetics/signed_mod.sol
index 68274de5af..0239810ab9 100644
--- a/test/libsolidity/semanticTests/arithmetics/signed_mod.sol
+++ b/test/libsolidity/semanticTests/arithmetics/signed_mod.sol
@@ -13,7 +13,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int256,int256): 7, 5 -> 2
diff --git a/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol b/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol
index 9fc665cb6d..f7859e6c13 100644
--- a/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol
+++ b/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol
@@ -11,7 +11,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint16): 7 -> 0x0207
 // f(uint16): 0xffff -> 511
diff --git a/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol b/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol
index 7bb1339606..6e9cc90aee 100644
--- a/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol
+++ b/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // div(uint256,uint256): 7, 2 -> 3
 // div(uint256,uint256): 7, 0 -> FAILURE, hex"4e487b71", 0x12 # throws #
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index 8d1851c817..8c1ad9982e 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -11,7 +11,6 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
 // gas irOptimized: 189800
diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
index b176c7e866..08562c89bd 100644
--- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
@@ -39,7 +39,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // storageEmpty -> 1
 // test_short() -> 1780731860627700044960722568376587075150542249149356309979516913770823710
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index f0b0d1bc0c..ac3b397fcf 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -16,7 +16,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 0
 // gas irOptimized: 157949
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index b4e018e659..36219409c8 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -11,7 +11,6 @@ contract c {
     bytes data;
 }
 // ====
-// compileViaYul: also
 // ----
 // getLength() -> 0
 // set(): 1, 2 -> true
diff --git a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol
index f495d880b2..cf8f55cc34 100644
--- a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol
+++ b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol
@@ -19,7 +19,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // fromMemory(bytes): 0x20, 16, "abcdefghabcdefgh" -> "abcdefghabcdefgh"
 // fromCalldata(bytes): 0x20, 16, "abcdefghabcdefgh" -> "abcdefghabcdefgh"
diff --git a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol
index 72aba092f4..f4834cdf5d 100644
--- a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol
+++ b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol
@@ -15,7 +15,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // fromMemory(bytes): 0x20, 33, "abcdefghabcdefghabcdefghabcdefgh", "a" -> "abcdefghabcdefghabcdefghabcdefgh"
 // fromCalldata(bytes): 0x20, 33, "abcdefghabcdefghabcdefghabcdefgh", "a" -> "abcdefghabcdefghabcdefghabcdefgh"
diff --git a/test/libsolidity/semanticTests/array/calldata_array.sol b/test/libsolidity/semanticTests/array/calldata_array.sol
index 6a985b4957..cdb1c9b6d5 100644
--- a/test/libsolidity/semanticTests/array/calldata_array.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array.sol
@@ -13,6 +13,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256[2]): 42, 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol b/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol
index bef9fc651d..99bd31c57f 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol
@@ -14,7 +14,6 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g(uint256[]): 0x20, 4, 1, 2, 3, 4 -> 4, 1
 // h(uint256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2, 2
diff --git a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol
index 89d7172c16..190d73d79a 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256[][]): 0x20, 0x0 -> 42 # valid access stub #
 // f(uint256[][]): 0x20, 0x1 -> FAILURE # invalid on argument decoding #
diff --git a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol
index d63b14302c..5363a15285 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[][1][]): 0x20, 0x0 -> 42 # valid access stub #
 // f(uint256[][1][]): 0x20, 0x1 -> FAILURE # invalid on argument decoding #
diff --git a/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol b/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol
index 2e0c871d6d..c31ffcb536 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol
@@ -22,6 +22,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint256,uint256)[]): 0x20, 0x2, 0x1, 0x2, 0x3, 0x4 -> 2, 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol b/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol
index 95e257beeb..3e19347a6d 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol
@@ -14,7 +14,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test(uint256[][2]): 0x20, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 2
 // test(uint256[][2],uint256): 0x40, 0, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 3
diff --git a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol b/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol
index 23c2513071..80870c2ebc 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol
@@ -14,7 +14,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test(uint256[][]): 0x20, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 2
 // test(uint256[][],uint256): 0x40, 0, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 3
diff --git a/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol b/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol
index df15ad38bb..68a15f5079 100644
--- a/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol
+++ b/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes[],uint256): 0x40, 0, 1, 0x20, 2, 0x6162000000000000000000000000000000000000000000000000000000000000 -> 0x61
 // f(bytes[],uint256): 0x40, 1, 1, 0x20, 2, 0x6162000000000000000000000000000000000000000000000000000000000000 -> 0x62
diff --git a/test/libsolidity/semanticTests/array/calldata_slice_access.sol b/test/libsolidity/semanticTests/array/calldata_slice_access.sol
index d898bf92f2..b8eb63829e 100644
--- a/test/libsolidity/semanticTests/array/calldata_slice_access.sol
+++ b/test/libsolidity/semanticTests/array/calldata_slice_access.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256[],uint256,uint256): 0x80, 0, 0, 0, 1, 42 ->
 // f(uint256[],uint256,uint256): 0x80, 0, 1, 0, 1, 42 ->
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol
index 239caf0425..95dfadbfc0 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 37, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdef"
 //
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol
index d5a3bdc4dc..686a82fcf9 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes,bytes,bytes): 0x60, 0xa0, 0xe0, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef", 3, "abc" -> 0x20, 40, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdefabc"
 // f(bytes,bytes,bytes): 0x60, 0xa0, 0xe0, 3, "abc", 2, "de", 3, "fgh" -> 0x20, 8, "abcdefgh"
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol
index 950ff33202..18cff2a36a 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x1106e19b6f06d1cce71c2d816754f83dfa5b95df958c5cbf12b7c472320c427c
 // g(bytes,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 37
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_different_types.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_different_types.sol
index bd28d478dd..a6b7f57373 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_different_types.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_different_types.sol
@@ -45,7 +45,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(bytes): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 37, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdef"
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol
index 74f2a87b9a..0485012e38 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol
index 0dc856262f..a83e5462b3 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol
@@ -20,7 +20,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0
 // g() -> 0x20, 6, "abcabc"
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol
index 6a469314b3..b5dfcafeba 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes,bytes,bytes): 0x60, 0x60, 0x60, 2, "ab" -> 0x20, 6, "ababab"
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
index 42d14ba242..f05aa25e04 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -8,7 +8,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // constructor(): 1, 2, 3 ->
 // gas irOptimized: 142640
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
index f80da35008..3df942b9b9 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -19,7 +19,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
 // gas irOptimized: 650608
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
index 3449cdc2d8..7ece68ac28 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
@@ -20,7 +20,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
 // gas irOptimized: 92740
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
index 73abd2cf7a..5936fb9ecd 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
@@ -45,7 +45,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
 // gas irOptimized: 153260
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
index e90cf7e58f..0d41687e03 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0
 // gas irOptimized: 135098
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
index bd596b86c2..2fd8381762 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
@@ -39,7 +39,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0
 // gas irOptimized: 92800
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 04b3b8e84f..46db8fb865 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -18,7 +18,6 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
 // gas irOptimized: 212564
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index 92495b1578..6bc82444ce 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -34,7 +34,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 0x02000202
 // gas irOptimized: 4652048
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol
index 7b1750acc3..086b819cff 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol
@@ -24,7 +24,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1, 3
 // g() -> 1, 2, 3
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index 88fed0d9be..8e2097c43f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -12,7 +12,6 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
 // gas irOptimized: 690203
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
index 1d2c978fb5..ecb08bdd3f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
@@ -17,6 +17,5 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 0x20, 0x8, -1, -1, 8, -16, -2, 6, 8, -1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
index bd45f49a98..b3036eeb85 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
@@ -16,7 +16,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 5, 4
 // gas irOptimized: 225954
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
index 4a475ac559..d8487421dc 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -21,7 +21,6 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 3, 4
 // gas irOptimized: 190480
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
index f90d4b8520..0cb14e95f7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
@@ -13,7 +13,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // setData1(uint256,uint256,uint256): 10, 5, 4 ->
 // copyStorageStorage() ->
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
index 3b8fe6212a..cb4faac001 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
@@ -17,7 +17,6 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 5, 4
 // gas irOptimized: 272736
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
index d2d7f4e486..4f09b49d60 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
@@ -11,7 +11,6 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 9, 4
 // gas irOptimized: 123162
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol
index a7dacd7498..00c69b7dee 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol
@@ -11,7 +11,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> left(0x01), left(0x02)
 // gas legacy: 90001
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
index ad12cad129..8f6dd822df 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
@@ -15,7 +15,6 @@ contract c {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 8, 0
 // gas irOptimized: 236079
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
index 676736dc11..c3b2f500bb 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
@@ -16,7 +16,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 4, 5
 // gas irOptimized: 238799
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol
index cd3c184d2c..65bce83fbe 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol
@@ -7,6 +7,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1, 3
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
index 3b2815526b..bed5113ce0 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
@@ -14,7 +14,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
 // gas irOptimized: 161780
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index 5325e9cdfa..318bf5cfda 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -17,7 +17,6 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
 // gas irOptimized: 129167
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
index b42b84dfe7..0e0a26fc9d 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
@@ -19,7 +19,6 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 0x04000000000000000000000000000000000000000000000000, 0x0, 0x0
 // gas irOptimized: 93858
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index 68817ba4c1..3bef131448 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -19,7 +19,6 @@ contract c {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
 // gas irOptimized: 294770
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index 346b1c469b..742ea5e2da 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -19,7 +19,6 @@ contract c {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
 // gas irOptimized: 273961
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol
index 7da4fc4ed7..092a1ab01a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol
@@ -30,7 +30,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index e199d37bc0..11167729f0 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -37,7 +37,6 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 24
 // gas irOptimized: 227133
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
index e358feaf7b..eb730e10d2 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
@@ -44,7 +44,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // copyExternalStorageArrayOfFunctionType() -> true
 // gas irOptimized: 104659
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
index 551ed4616c..8789adc1e6 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -47,7 +47,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // copyExternalStorageArraysOfFunctionType() -> true
 // gas irOptimized: 104332
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol
index 7e2a209bc3..0d73a07151 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol
@@ -16,7 +16,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f((uint128,uint64,uint128)[3]): 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
 // g((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol
index ba132fba3b..d488409daf 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol
@@ -18,6 +18,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
index de38034fd3..1901908973 100644
--- a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
@@ -12,7 +12,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1, 2, 3
 // gas irOptimized: 132298
diff --git a/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
index dadbceadcb..ea9ea362fd 100644
--- a/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
@@ -9,7 +9,6 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set(uint24[]): 0x20, 18, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 -> 18
 // gas irOptimized: 99616
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol b/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol
index 0d124f930f..4b63dfc24b 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 3, "abc" -> 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
index 26ad58f4cc..bbd7a9f749 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -4,7 +4,6 @@ contract c {
     mapping(uint => bytes) data;
 }
 // ====
-// compileViaYul: also
 // ----
 // set(uint256): 1, 2 -> true
 // gas irOptimized: 110604
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol
index 0e5009624b..6cdd48bf1c 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol
@@ -8,6 +8,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> "a"
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol
index 13a0e788c3..e996714ce2 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> "a"
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 29a017e089..990884a909 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -15,7 +15,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol
index 1687fb54a7..a69143d035 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol
@@ -9,6 +9,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes[2]): 0x20, 0x40, 0x40, 2, "ab" -> 0x20, 2, "ab"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol b/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol
index 4f43cc1ebd..0ab8485886 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes[2]): 0x20, 0x40, 0x40, 2, "ab" ->
 // f(bytes[2]): 0x20, 0x40, 0x40, 1, "a" -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
index d150440053..7ea13cc6b3 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
@@ -8,7 +8,6 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
 // gas irOptimized: 111159
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
index eba9105e5b..0e87f00ced 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
@@ -22,6 +22,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f((uint256,uint256)[]): 0x20, 0x2, 0x1, 0x2, 0x3, 0x4 -> 2, 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol
index e4b4742452..fbc1d03d94 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256[2]): 43, 57 -> 43, 57
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol
index 7a966f91f0..3521f1575e 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes[]): 0x20, 0x1, 0x20, 0x2, hex"6162000000000000000000000000000000000000000000000000000000000000" -> 0x1, 0x2, 0x60, 0x2, hex"6162000000000000000000000000000000000000000000000000000000000000"
 // f(bytes[]): 0x20, 0x1, 0x20, 0x20, hex"7878787878787878787878787878787878787878787878787878787878787878" -> 0x1, 0x20, 0x60, 0x20, hex"7878787878787878787878787878787878787878787878787878787878787878"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol
index d0ca949f94..57f6b3a3e7 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x08, "abcdefgh" -> "a"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol
index 07296aac09..7f76f7f27d 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol
@@ -6,6 +6,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes[]): 0x20, 2, 0x60, 0x60, 0x20, 2, "ab" -> 0x20, 2, 0x40, 0x80, 2, "ab", 2, "ab"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
index a1cd58194b..0a5458674e 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
@@ -12,6 +12,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[][]): 0x20, 0x1, 0x20, 0x2, 0x17, 0x2a -> 0x1, 0x40, 0x2, 0x17, 0x2a
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol
index bfcd5ead48..902cd3467f 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol
@@ -9,6 +9,5 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // killer(uint256[][2]): 0x20, 0x40, 0x40, 2, 1, 2 -> 0x20, 0x20, 0x40, 0xa0, 2, 1, 2, 2, 1, 2
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol
index d9771bf33c..c793ccc371 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol
@@ -8,6 +8,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes8[]): 0x20, 3, "abcd", "bcde", "cdef" -> 3, "abcd", "bcde", "cdef"
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index 05f8bd2bf9..83e33d4abf 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -34,7 +34,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
 // gas irOptimized: 179895
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index 41a5e99093..f02cc6c1c6 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -45,7 +45,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0xff
 // gas irOptimized: 121123
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index 4c223d30c2..bdd6f7cd0f 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -15,7 +15,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 7
 // gas irOptimized: 124034
diff --git a/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
index d2c7bb77da..b13d15e175 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
@@ -19,7 +19,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // one() -> 3
 // gas legacy: 140260
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
index cf8023a2f4..16efcc933b 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -6,7 +6,6 @@ contract c {
     bytes data2;
 }
 // ====
-// compileViaYul: also
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
 // gas irOptimized: 177386
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index 09457bb74b..0172782795 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -18,7 +18,6 @@ contract sender {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // (): 7 ->
 // gas irOptimized: 110954
diff --git a/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol b/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol
index 0f19eaa0ad..eb82c20248 100644
--- a/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol
+++ b/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol
@@ -23,7 +23,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // fromMemory() -> 0x00
 // fromCalldata(bytes): 0x40, 0x60, 0x00, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0x00
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index 8908caa55f..7f48e65268 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 3
 // gas irOptimized: 129910
diff --git a/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol
index 24ac2e2020..0d7d37f373 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol
@@ -12,6 +12,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 3, "abcd", "bcde", "cdef"
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
index c9c72543c3..1ecb19065c 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -16,7 +16,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
 // gas irOptimized: 207781
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index 35fd24fd80..099232ca08 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
 // gas irOptimized: 202840
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
index 8f98822e70..c6b24eb037 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
 // gas irOptimized: 207781
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
index d9a50e73d2..7790949572 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
@@ -23,7 +23,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 11, 0x0c, 1, 0x15, 22, 4
 // gas irOptimized: 291848
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol
index 4a4515ff64..b1410f7e27 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol
@@ -11,6 +11,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index f954701d5a..4cdf75c7a4 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2, 3, 4
 // gas irOptimized: 114114
diff --git a/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol b/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol
index 04a1257537..6dbf41af36 100644
--- a/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol
+++ b/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(string): 0x20, 3, "abc" -> 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol b/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol
index dfcb7aff2e..3856e23dc2 100644
--- a/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol
+++ b/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
index e107bd68a4..4c86e82e88 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> "A", 8, 4, "B"
 // gas irOptimized: 130592
diff --git a/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol b/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol
index 11d69df02f..ed6a374037 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol
@@ -21,7 +21,6 @@ contract C {
     }}
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x41
 // g() -> FAILURE, hex"4e487b71", 0x41
diff --git a/test/libsolidity/semanticTests/array/create_memory_byte_array.sol b/test/libsolidity/semanticTests/array/create_memory_byte_array.sol
index 67dcbffc3f..3c51f88731 100644
--- a/test/libsolidity/semanticTests/array/create_memory_byte_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_byte_array.sol
@@ -7,6 +7,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> "A"
diff --git a/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol b/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol
index c29dca43e0..ad5c392792 100644
--- a/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol
@@ -31,6 +31,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index f6208ea6f9..a8e05bd429 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -15,7 +15,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test1() -> true
 // gas irOptimized: 225890
diff --git a/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol b/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
index 2136f7895c..f8bd4aef4b 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
@@ -31,7 +31,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol b/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
index 64fc9a9724..d80bac725e 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
@@ -12,6 +12,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // len() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol b/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
index b415ac7f6e..1a096a8a42 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
@@ -17,6 +17,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> true # This code interprets x as an array length and thus will go out of gas. neither of the two should throw due to out-of-bounds access #
diff --git a/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol
index 4c573f6fa1..cf7d076239 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol
@@ -4,7 +4,6 @@ contract c {
     bytes data;
 }
 // ====
-// compileViaYul: also
 // ----
 // (): 7 ->
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
index d8bf81d8af..ca4b590acb 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
@@ -34,7 +34,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // len() -> 0
 // val() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
index 8d0f6358e3..b9c7b58ff5 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0, 0, 0
 // gas irOptimized: 90992
diff --git a/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol b/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol
index 31c86b3539..65fa91a844 100644
--- a/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol
+++ b/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol
@@ -10,6 +10,5 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // del() -> 0, 1, 2, 0, 0, 0, 0x20, 0x21, 0x22, 0x30, 0x31, 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index 01ba8dcfe3..f1cdb90bb3 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -12,7 +12,6 @@ contract c {
     function fullClear() public { delete dynamic; }
 }
 // ====
-// compileViaYul: also
 // ----
 // storageEmpty -> 1
 // fill() ->
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index be8f6eff31..392c9c62d9 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -40,7 +40,6 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
diff --git a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
index 5bbd9e2070..b4fe4275a8 100644
--- a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
@@ -14,7 +14,6 @@ contract c {
     function clear() public { delete data; }
 }
 // ====
-// compileViaYul: also
 // ----
 // storageEmpty -> 1
 // fill() -> 8
diff --git a/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol b/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
index e060ae2d9f..50d083f934 100644
--- a/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
@@ -21,7 +21,6 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // length() -> 0
 // get(uint256): 3 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol b/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol
index 02d56710be..96043e3265 100644
--- a/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol
+++ b/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol
@@ -13,7 +13,6 @@ contract A {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> false
 // testIt() -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/external_array_args.sol b/test/libsolidity/semanticTests/array/external_array_args.sol
index 72a8cdfc3a..53cc757725 100644
--- a/test/libsolidity/semanticTests/array/external_array_args.sol
+++ b/test/libsolidity/semanticTests/array/external_array_args.sol
@@ -8,6 +8,5 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test(uint256[8],uint256[],uint256[5],uint256,uint256,uint256): 1, 2, 3, 4, 5, 6, 7, 8, 0x220, 21, 22, 23, 24, 25, 0, 1, 2, 3, 11, 12, 13 -> 1, 12, 23
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index fba3119e1a..1cabe4219a 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -9,7 +9,6 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // storageEmpty -> 1
 // fill() ->
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 3ce5f1a8da..9af61a99e1 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -18,7 +18,6 @@ contract B {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
 // gas irOptimized: 127910
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index 3f66dca6fe..e5de25c977 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -8,7 +8,6 @@ contract Creator {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(): 1, 2, 3, 4 ->
 // gas irOptimized: 129013
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol
index dc7b673787..eb167ee0c8 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol
@@ -35,7 +35,6 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // setIDStatic(uint256): 0xb ->
 // getID(uint256): 0x2 -> 0xb
diff --git a/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol b/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol
index 9561a98e51..e22b56cfc1 100644
--- a/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol
+++ b/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bytes32): "789" -> 32, 16, 8
diff --git a/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol b/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol
index ad6d3769f9..d82ef152c9 100644
--- a/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol
+++ b/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol
@@ -17,7 +17,6 @@ contract c {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // length() -> 4
 // set(uint256,uint256): 3, 4 -> true
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 087ecf0a83..eb86b410d6 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -42,7 +42,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 5, 6, 7
 // gas irOptimized: 292502
diff --git a/test/libsolidity/semanticTests/array/function_memory_array.sol b/test/libsolidity/semanticTests/array/function_memory_array.sol
index 5c07c1f90b..322eed73ea 100644
--- a/test/libsolidity/semanticTests/array/function_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/function_memory_array.sol
@@ -32,7 +32,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test(uint256,uint256): 10, 0 -> 11
 // test(uint256,uint256): 10, 1 -> 12
diff --git a/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol
index d21bcc53f3..7757f529e8 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol
@@ -8,6 +8,5 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set(uint24[3][],uint256,uint256): 0x60, 0x03, 0x02, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06, 0x0c
diff --git a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol
index 9a0c85ac7c..ca91352b35 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol
@@ -20,7 +20,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // direct(bytes,uint256): 0x40, 33, 34, 0x000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F, left(0x2021) -> 0x21
 // storageCopyRead(bytes,uint256): 0x40, 33, 34, 0x000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F, left(0x2021) -> 0x21
diff --git a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol b/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol
index 1dcd448b4e..aafe01b170 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol
@@ -12,6 +12,5 @@ contract Main {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes,uint256,uint256,uint256): 0x80, 3, 4, 5, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> "d", "e", "f"
diff --git a/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol
index 5b7fd7ac3f..e7cb6e0ffb 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol
@@ -8,6 +8,5 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set(bytes,uint256): 0x40, 0x03, 0x08, "abcdefgh" -> 0x08, "d"
diff --git a/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol
index 40cc657633..78b87a3c86 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes32): "789" -> "9"
 // g(bytes32): "789" -> 0x35
diff --git a/test/libsolidity/semanticTests/array/indexAccess/index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/index_access.sol
index ad691a5885..b90bbb12e3 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/index_access.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/index_access.sol
@@ -14,7 +14,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // to_little_endian_64(uint64): 0 -> 0x20, 8, 0x00
diff --git a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol b/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol
index 1dd8073632..c1481fc997 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol
@@ -6,6 +6,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 3
diff --git a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol b/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol
index 9292ed89fa..b826dc13d0 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol
@@ -11,7 +11,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // test() ->
diff --git a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol b/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol
index 046be080c0..d500be1ea5 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol
@@ -16,6 +16,5 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x07
diff --git a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol b/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol
index 881f9c944a..ff83a43101 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol
@@ -12,6 +12,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x07
diff --git a/test/libsolidity/semanticTests/array/inline_array_return.sol b/test/libsolidity/semanticTests/array/inline_array_return.sol
index b3c97f2757..d6673882f6 100644
--- a/test/libsolidity/semanticTests/array/inline_array_return.sol
+++ b/test/libsolidity/semanticTests/array/inline_array_return.sol
@@ -13,6 +13,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/array/inline_array_singleton.sol b/test/libsolidity/semanticTests/array/inline_array_singleton.sol
index bf26cf9cb6..870c853e14 100644
--- a/test/libsolidity/semanticTests/array/inline_array_singleton.sol
+++ b/test/libsolidity/semanticTests/array/inline_array_singleton.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 4
diff --git a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol
index 62efbc25e0..18626b055d 100644
--- a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol
+++ b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol
@@ -9,6 +9,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 3, 6
diff --git a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
index dd598ca714..2b456ca9aa 100644
--- a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
+++ b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
@@ -10,6 +10,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x40, 0x80, 0x3, "ray", 0x2, "mi"
diff --git a/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol b/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol
index 1d58fc170e..23f2d89c70 100644
--- a/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol
+++ b/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol
@@ -7,7 +7,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> 0x20, 0x4, "This"
 // f(uint256): 1 -> 0x20, 0x2, "is"
diff --git a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
index 57bbbb9d40..5f5bf63f77 100644
--- a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
+++ b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
@@ -24,7 +24,6 @@ contract C {
     function del() public { delete x; }
 }
 // ====
-// compileViaYul: also
 // ----
 // x() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
 // abiEncode() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/array/memory.sol b/test/libsolidity/semanticTests/array/memory.sol
index dba62a3365..8ce6770215 100644
--- a/test/libsolidity/semanticTests/array/memory.sol
+++ b/test/libsolidity/semanticTests/array/memory.sol
@@ -11,7 +11,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // h(uint256[4]): 1, 2, 3, 4 -> 10
 // i(uint256[4]): 1, 2, 3, 4 -> 20
diff --git a/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol b/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol
index fd1fba0a1a..b52faa54ee 100644
--- a/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol
+++ b/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 3, 1 -> 1
 // f(uint256,uint256): 9, 5 -> 70
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop.sol b/test/libsolidity/semanticTests/array/pop/array_pop.sol
index 9e64119e98..ac1c673b44 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop.sol
@@ -12,6 +12,5 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 1, 0
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index 3b066cfaab..37a25fe03e 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -22,7 +22,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 1, 2, 3
 // gas irOptimized: 2271044
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol b/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol
index 02b8e99c95..1750711e13 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol
@@ -8,6 +8,5 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> FAILURE, hex"4e487b71", 0x31
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol b/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol
index 42213b96c7..ce41673e06 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol
@@ -10,6 +10,5 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 3
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol
index b49a738ec3..3c410adde9 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol
@@ -6,7 +6,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() ->
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index 6ec59a75e5..92da1764f3 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -17,7 +17,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 38, 28, 18
 // gas irOptimized: 188649
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index 06f3c6cc93..6700c8bc16 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -17,7 +17,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 20, 10
 // gas irOptimized: 159169
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol
index 260e6c3420..81e1eb020d 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol
@@ -14,6 +14,5 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 2, 1, 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index 227eb6afd7..0dce1b7276 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -9,7 +9,6 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
 // gas irOptimized: 109499
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol
index 0ef64aca2a..5d573a0962 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol
@@ -11,6 +11,5 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> FAILURE, hex"4e487b71", 0x31
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol
index 6eb76a7745..519b0c5abe 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol
@@ -10,6 +10,5 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 3
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index 146a4dfc34..e641918dea 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -15,7 +15,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> true
 // gas irOptimized: 196541
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index d5d004f5fd..ff2155bc8b 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -14,7 +14,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() ->
 // gas irOptimized: 142639
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index fb05db3507..8580c59318 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -9,7 +9,6 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
 // gas irOptimized: 108487
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol
index 52716ecb38..4b2e88ffa8 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol
@@ -11,7 +11,6 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() ->
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/parenthesized.sol b/test/libsolidity/semanticTests/array/pop/parenthesized.sol
index 04ac0c3e3a..fc6243639a 100644
--- a/test/libsolidity/semanticTests/array/pop/parenthesized.sol
+++ b/test/libsolidity/semanticTests/array/pop/parenthesized.sol
@@ -7,6 +7,5 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/array/push/array_push.sol b/test/libsolidity/semanticTests/array/push/array_push.sol
index e8ec366391..bc90ca054e 100644
--- a/test/libsolidity/semanticTests/array/push/array_push.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push.sol
@@ -15,7 +15,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 5, 4, 3, 3
 // gas irOptimized: 111317
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested.sol b/test/libsolidity/semanticTests/array/push/array_push_nested.sol
index 5829d54000..883f9093f3 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested.sol
@@ -12,6 +12,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
index 05299ae556..5c105c850b 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
 // gas irOptimized: 113256
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol
index 8a975e0b81..c949f258d0 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol b/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
index 04f9544a91..ede6aa872d 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
@@ -13,7 +13,6 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 1, 2, 3, 4
 // gas irOptimized: 93017
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
index 60e317770f..4c956dfe7c 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
@@ -19,7 +19,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 2, 3, 4, 5
 // gas irOptimized: 136894
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index a7b8d6d9d1..d2c7533b7e 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -15,7 +15,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
 // gas irOptimized: 138691
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push.sol b/test/libsolidity/semanticTests/array/push/byte_array_push.sol
index 14265fca93..28afd9f89c 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push.sol
@@ -15,6 +15,5 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> false
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index c4f7cb44a5..36303ee80c 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -14,7 +14,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 0
 // gas irOptimized: 176495
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index 7c4bdcb9a2..c7adb2ab75 100644
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() ->
 // gas irOptimized: 179590
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol
index daf8d43b14..07f1037e71 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol
@@ -20,7 +20,6 @@ contract C {
 
 }
 // ====
-// compileViaYul: also
 // ----
 // l() -> 0
 // lv(uint256): 42 ->
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index 5b470e829b..7d6dac3b70 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -25,7 +25,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 713c44ec14..0f3376f909 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -19,7 +19,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // l() -> 0
 // g(uint256): 70 ->
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol b/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol
index 89df694c66..1c334d638e 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol
@@ -32,7 +32,6 @@ contract C {
 
 }
 // ====
-// compileViaYul: also
 // ----
 // l() -> 0
 // f(uint256): 42 ->
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index 455d6f9484..ca642e73ed 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -23,7 +23,6 @@ contract Main {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
 // gas irOptimized: 113198
diff --git a/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol
index 3665a8784a..6fada19c57 100644
--- a/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol
@@ -9,7 +9,6 @@ contract c {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // storageEmpty -> 1
 // fill() ->
diff --git a/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol b/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol
index 739916e341..282ccba09b 100644
--- a/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol
+++ b/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256[],uint256[],uint256): 0x60, 0xA0, 1, 1, 0, 2, 1, 2 -> 2
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol
index 1f5e929d4a..be8a400e30 100644
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol
+++ b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol
@@ -28,7 +28,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f1(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcde" -> true
 // f1(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcdf" -> false
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol
index d1df5185d9..8ebd076985 100644
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol
+++ b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol
@@ -21,7 +21,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g((uint128,uint256[3],uint32)[],uint256,uint256): 0x60, 1, 3, 4, 55, 1, 2, 3, 66, 66, 2, 3, 4, 77, 77, 3, 4, 5, 88, 88, 4, 5, 6, 99 -> 0x20, 2, 66, 2, 3, 4, 77, 77, 3, 4, 5, 88
 // g1(uint256[3][],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> 0x20, 2, 4, 5, 6, 7, 8, 9
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol
index 02c439c514..43aa16906f 100644
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol
@@ -22,7 +22,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(int256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2
 // g(int256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 0x20, 2, 2, 3
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol
index 6c36372bc4..bcce7fd505 100644
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol
@@ -11,6 +11,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(int256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2
diff --git a/test/libsolidity/semanticTests/array/storage_array_ref.sol b/test/libsolidity/semanticTests/array/storage_array_ref.sol
index 4249fd2770..fa63c36054 100644
--- a/test/libsolidity/semanticTests/array/storage_array_ref.sol
+++ b/test/libsolidity/semanticTests/array/storage_array_ref.sol
@@ -40,7 +40,6 @@ contract Store is BinarySearch {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // find(uint256): 7 -> -1
 // add(uint256): 7 ->
diff --git a/test/libsolidity/semanticTests/array/string_allocation_bug.sol b/test/libsolidity/semanticTests/array/string_allocation_bug.sol
index cd1ad5fc52..bc974a4383 100644
--- a/test/libsolidity/semanticTests/array/string_allocation_bug.sol
+++ b/test/libsolidity/semanticTests/array/string_allocation_bug.sol
@@ -17,7 +17,6 @@ contract Sample {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // p(uint256): 0x0 -> 0xbbbb, 0xcccc, 0x80, 0xc0, 0x05, "hello", 0x05, "world"
diff --git a/test/libsolidity/semanticTests/array/string_bytes_conversion.sol b/test/libsolidity/semanticTests/array/string_bytes_conversion.sol
index 5f6e73422d..b9e92bb815 100644
--- a/test/libsolidity/semanticTests/array/string_bytes_conversion.sol
+++ b/test/libsolidity/semanticTests/array/string_bytes_conversion.sol
@@ -13,7 +13,6 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(string,uint256): 0x40, 0x02, 0x06, "abcdef" -> "c"
 // l() -> 0x06
diff --git a/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol b/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol
index ee3cda2d14..831716d2df 100644
--- a/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol
+++ b/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // s() -> 0x20, 3, "abc"
 // s1() -> 0x20, 4, "abcd"
diff --git a/test/libsolidity/semanticTests/array/strings_in_struct.sol b/test/libsolidity/semanticTests/array/strings_in_struct.sol
index 412d5a4089..1cc6b5a932 100644
--- a/test/libsolidity/semanticTests/array/strings_in_struct.sol
+++ b/test/libsolidity/semanticTests/array/strings_in_struct.sol
@@ -29,7 +29,6 @@ contract buggystruct {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // getFirst() -> 0x0a
diff --git a/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol b/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol
index 24a86d1ba4..c0c5800721 100644
--- a/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol
+++ b/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol
@@ -11,6 +11,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 6
diff --git a/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol b/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol
index 690f2489a3..4be20d6ba5 100644
--- a/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol
+++ b/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol
@@ -11,6 +11,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 5
diff --git a/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol b/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol
index fd10fd0729..620f2c3baa 100644
--- a/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol
+++ b/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> 2
 // f(uint256): 1 -> 18
diff --git a/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol b/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol
index 38b5cefebf..2e8a66363e 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
diff --git a/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol b/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol
index bd3d5a72f1..dc6e26f141 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol
@@ -11,7 +11,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x3737373737373737373737373737373737373737373737373737373737373738
 // g() -> 0x3737373737373737373737373737373737373737373737373737373737373739
diff --git a/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol b/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol
index ba6345bc22..fa1d01d403 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol
@@ -4,6 +4,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol b/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol
index cd67e657f9..9a8132950c 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol
@@ -21,7 +21,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x26121ff000000000000000000000000000000000000000000000000000000000
 // g() -> 0x26121ff000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol b/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol
index 9f34a52826..b0edf1edbc 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol
@@ -9,6 +9,5 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // foo() -> 0xb338eefce206f9f57b83aa738deecd5326dc4b72dd81ee6a7c621a6facb7acdc
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol
index 5a44d14da5..1898f03113 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol
@@ -6,6 +6,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol
index 4a31c67158..329034fe81 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol
@@ -4,6 +4,5 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // foo(uint256,uint256,uint256): 0xa, 0xc, 0xd -> 0xbc740a98aae5923e8f04c9aa798c9ee82f69e319997699f2782c40828db9fd81
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol
index 958975966b..d5472bc79c 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol
@@ -4,6 +4,5 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // foo(uint256,uint16): 0xa, 0xc -> 0x88acd45f75907e7c560318bc1a5249850a0999c4896717b1167d05d116e6dbad
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol
index c4e0b7d09a..cce1ac87e1 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol
@@ -8,7 +8,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // foo() -> 0x41b1a0649752af1b28b3dc29a1556eee781e4a4c3a1f7f53f90fa834de098c4d
 // bar(uint256,uint16): 0xa, 0xc -> 0x6990f36476dc412b1c4baa48e2d9f4aa4bb313f61fda367c8fdbbb2232dc6146
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
index b284b7f014..95dfff15af 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
@@ -10,6 +10,5 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // foo() -> true
diff --git a/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol b/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol
index 7457a2c8c3..21c5ed76db 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol
@@ -5,6 +5,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // foo(uint256): 0x0 -> 0x2fbebd3800000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol b/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol
index 7369ddedaf..a50521610f 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol
@@ -9,6 +9,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // foo(uint256): 0x0 -> 0x2fbebd3800000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
index ea0fda8450..25a0429c5b 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
@@ -5,6 +5,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x9c1185a5c5e9fc54612808977ee8f548b2258d31000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol
index ededa2fabf..996f594efe 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
diff --git a/test/libsolidity/semanticTests/c99_scoping_activation.sol b/test/libsolidity/semanticTests/c99_scoping_activation.sol
index bca43e78cb..394b211d62 100644
--- a/test/libsolidity/semanticTests/c99_scoping_activation.sol
+++ b/test/libsolidity/semanticTests/c99_scoping_activation.sol
@@ -36,7 +36,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 3
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol b/test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol
index 44126a18fa..1fc8ddec01 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol
@@ -15,6 +15,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test(uint256,bytes,uint256): 7, 0x60, 4, 2, "ab" -> "b", "a"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol b/test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol
index 251910eaec..07100311ad 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol
@@ -19,7 +19,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // testArray(uint256,uint256[],uint256): 7, 0x60, 4, 2, 66, 77 -> 77, 66
 // testSlice(uint256,uint256[],uint256): 7, 0x60, 4, 2, 66, 77 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol b/test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol
index 252c12579e..6cee890d37 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol
@@ -15,6 +15,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test(uint256,uint256[2],uint256): 7, 66, 77, 4 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol b/test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol
index 2d599ac12e..7b104249fe 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol
@@ -19,6 +19,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test(uint256,(uint256,uint256),uint256): 7, 66, 77, 4 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_external.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_external.sol
index c4686cc01f..a39758271f 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_external.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bytes_external.sol
@@ -8,6 +8,5 @@ contract CalldataTest {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // tester(bytes): 0x20, 0x08, "abcdefgh" -> "c"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol
index a0384f8871..2cbf527dfe 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol
@@ -7,6 +7,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,bytes,uint256): 7, 0x60, 7, 4, "abcd" -> "c"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol
index ca6a444d80..7e96b55f09 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol
@@ -4,6 +4,5 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x08, "abcdefgh" -> 0x48624fa43c68d5c552855a4e2919e74645f683f5384f72b5b051b71ea41d4f2d
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol
index 4bb97779c9..6d5051027c 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol
@@ -4,6 +4,5 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x08, "abcdefgh" -> 0x20, 0x60, 0x20, 8, 44048183304486788309563647967830685498285570828042699209880294173606615711744
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol
index d6871d7e43..3b05a05100 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 0x0700000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol
index fa44cc1440..f21d07178a 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 0x0800000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol
index 33f27a084a..d62fee1442 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol
@@ -18,6 +18,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 7, 8
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol
index 6fb892dde5..9bad6131a6 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 7, 8
diff --git a/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol b/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol
index 2798a6ab79..69b56856fa 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol
@@ -16,6 +16,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 0x0e, 0x0800000000000000000000000000000000000000000000000000000000000000, 0x0900000000000000000000000000000000000000000000000000000000000000, 0x0a00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/calldata/calldata_string_array.sol b/test/libsolidity/semanticTests/calldata/calldata_string_array.sol
index 1ab1b25a8a..c5877e005a 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_string_array.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_string_array.sol
@@ -12,6 +12,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(string[]): 0x20, 0x1, 0x20, 0x2, hex"6162000000000000000000000000000000000000000000000000000000000000" -> 1, 2, 97, 0x80, 2, "ab"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_struct.sol b/test/libsolidity/semanticTests/calldata/calldata_struct.sol
index 6eae8b0c54..64a990e3b4 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_struct.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_struct.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test(uint256,(uint256,uint256),uint256): 7, 66, 77, 4 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol b/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol
index 771f2591a8..493b1ef0b2 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol
@@ -18,7 +18,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint8,bytes1)): 0x12, hex"3400000000000000000000000000000000000000000000000000000000000000" -> 0x12, hex"3400000000000000000000000000000000000000000000000000000000000000" # double check that the valid case goes through #
 // f((uint8,bytes1)): 0x1234, hex"5678000000000000000000000000000000000000000000000000000000000000" -> FAILURE
diff --git a/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol b/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol
index 50351087e8..0c87dfc7b9 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,(uint256,uint256),uint256): 7, 1, 2, 4 -> 1, 2
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
index b8dbff46a8..52f189f181 100644
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -8,7 +8,6 @@ contract c {
 // ====
 // EVMVersion: >=byzantium
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // (): 1, 2, 3, 4, 5 ->
 // gas irOptimized: 155170
diff --git a/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol b/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol
index 4960b6e952..821da2dac6 100644
--- a/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol
+++ b/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): 0x0 -> 0x0
 // f(bool): 0x1 -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol
index 391fa49939..916f2e5aad 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol
@@ -28,7 +28,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x1122334455667788990011223344556677889900
 // g() -> 0x1122334455667788990011223344556677889900
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol
index d9f6fdafdf..d6157ab23e 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(address): 0xffff1234567890123456789012345678901234567890 -> FAILURE # We input longer data on purpose.#
 // g(address): 0xffff1234567890123456789012345678901234567890 -> FAILURE
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol
index a075a37639..f481ffed6b 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol
@@ -12,6 +12,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bytes2,uint16): "abc", 0x40102 -> FAILURE # We input longer data on purpose. #
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol b/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol
index b1cd6637a4..51815f5e96 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol
@@ -10,6 +10,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 0xff, 0xff
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol
index 19edfcc984..a5145bcebd 100644
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol
+++ b/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol
@@ -8,7 +8,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol
index 4efdd351ae..663716a126 100644
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol
+++ b/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol
@@ -7,7 +7,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol
index 92457e2a9f..12c3afba47 100644
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol
+++ b/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol
@@ -8,7 +8,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol
index f0ff36ad81..b282948cb0 100644
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol
+++ b/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x00
diff --git a/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol b/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol
index df6bc2192f..7374f4b3d2 100644
--- a/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol
+++ b/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor() ->
 // ~ emit ev0(bytes1): #"1"
diff --git a/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol b/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol
index 83388da1fc..0385a4c308 100644
--- a/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol
+++ b/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 11, 10
diff --git a/test/libsolidity/semanticTests/constantEvaluator/rounding.sol b/test/libsolidity/semanticTests/constantEvaluator/rounding.sol
index 6a3f953bdd..a7c1b4b452 100644
--- a/test/libsolidity/semanticTests/constantEvaluator/rounding.sol
+++ b/test/libsolidity/semanticTests/constantEvaluator/rounding.sol
@@ -11,6 +11,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2, 2, 2, 2
diff --git a/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol b/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol
index 0a4549858b..3da3ff646c 100644
--- a/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol
+++ b/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol
@@ -10,6 +10,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x00
diff --git a/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol b/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol
index 30f832d6bf..89d2e250d4 100644
--- a/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol
+++ b/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol
@@ -6,7 +6,6 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x1212121212121212121212121000002134593163
diff --git a/test/libsolidity/semanticTests/constants/constant_string.sol b/test/libsolidity/semanticTests/constants/constant_string.sol
index 53b1cf9700..638b243822 100644
--- a/test/libsolidity/semanticTests/constants/constant_string.sol
+++ b/test/libsolidity/semanticTests/constants/constant_string.sol
@@ -18,7 +18,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 3, "\x03\x01\x02"
 // g() -> 0x20, 3, "\x03\x01\x02"
diff --git a/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol b/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol
index 7b2e0ae99a..a8822176da 100644
--- a/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol
+++ b/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol
@@ -26,7 +26,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 3, "\x03\x01\x02"
 // g() -> 0x20, 3, "\x03\x01\x02"
diff --git a/test/libsolidity/semanticTests/constants/constant_variables.sol b/test/libsolidity/semanticTests/constants/constant_variables.sol
index 9ef73515ae..4ae4edb976 100644
--- a/test/libsolidity/semanticTests/constants/constant_variables.sol
+++ b/test/libsolidity/semanticTests/constants/constant_variables.sol
@@ -7,6 +7,5 @@ contract Foo {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // constructor() ->
diff --git a/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol b/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol
index 1e67573210..a1ae3911fc 100644
--- a/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol
+++ b/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol
@@ -34,7 +34,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 3, "\x03\x01\x02"
 // g() -> 0x20, 3, "\x03\x01\x02"
diff --git a/test/libsolidity/semanticTests/constants/function_unreferenced.sol b/test/libsolidity/semanticTests/constants/function_unreferenced.sol
index 399c5171db..2b80c440fc 100644
--- a/test/libsolidity/semanticTests/constants/function_unreferenced.sol
+++ b/test/libsolidity/semanticTests/constants/function_unreferenced.sol
@@ -6,7 +6,6 @@ contract C is B {
     function f() external pure returns (bytes4) { return s2; }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/constants/same_constants_different_files.sol b/test/libsolidity/semanticTests/constants/same_constants_different_files.sol
index 9af6723d38..5a85c5fd77 100644
--- a/test/libsolidity/semanticTests/constants/same_constants_different_files.sol
+++ b/test/libsolidity/semanticTests/constants/same_constants_different_files.sol
@@ -22,6 +22,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x0d, 0x59, 0x59, 0x59
diff --git a/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol b/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol
index 1df6224ac6..ea35262ef4 100644
--- a/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol
+++ b/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol
@@ -8,6 +8,5 @@ contract Foo {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // getX() -> 56
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 82050efa21..dff90c5504 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -23,7 +23,6 @@ contract Creator {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
 // gas irOptimized: 437093
diff --git a/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
index 76c18244e5..5b28577606 100644
--- a/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
+++ b/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
@@ -21,6 +21,5 @@ contract Derived is Base {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // getA() -> 49
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index bdd5c6eb50..105bb8bac4 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -23,7 +23,6 @@ contract Creator {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
 // gas irOptimized: 293203
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index d0b3f64cbc..69a6869151 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -7,7 +7,6 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
 // gas irOptimized: 283829
diff --git a/test/libsolidity/semanticTests/constructor/callvalue_check.sol b/test/libsolidity/semanticTests/constructor/callvalue_check.sol
index 3b7c63a9dd..f45fbed925 100644
--- a/test/libsolidity/semanticTests/constructor/callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/callvalue_check.sol
@@ -29,7 +29,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f(uint256), 2000 ether: 0 -> true
 // f(uint256), 2000 ether: 100 -> false
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
index 701f4accb1..50b56343e6 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -16,7 +16,6 @@ contract Main {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(): "abc", true
 // gas irOptimized: 106683
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
index c7534faaf5..ab6f4a4097 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
@@ -34,7 +34,6 @@ contract Main {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // getFlag() -> true
 // getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol
index b52f10de04..34f1fba51d 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol
@@ -4,6 +4,5 @@ contract D {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(): 0xfdd67305928fcac8d213d1e47bfa6165cd0b87b946644cd0000000000000000 ->
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
index f1043f559b..12ecb38866 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
@@ -16,7 +16,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 16
 // gas legacy: 103488
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index 0c38107cc8..0630680767 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -9,7 +9,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // constructor(): 1, 2, 3, 4 ->
 // gas irOptimized: 174020
diff --git a/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol b/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
index 5310d097bf..29d7047843 100644
--- a/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
+++ b/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
@@ -15,7 +15,6 @@ contract B {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // testIt() ->
 // test() -> 2
diff --git a/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
index 44d376cb63..78fd167883 100644
--- a/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
+++ b/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
@@ -21,6 +21,5 @@ contract Derived is Base {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // getA() -> 2
diff --git a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
index 716bef332a..397c314a9f 100644
--- a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
@@ -17,6 +17,5 @@ contract Test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol
index 41602c09e6..763393a998 100644
--- a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol
+++ b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol
@@ -27,6 +27,5 @@ contract Test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // getName() -> "def\x00\x00\x00"
diff --git a/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol b/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
index e4d3921158..6e1f46f864 100644
--- a/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
@@ -16,7 +16,6 @@ contract Derived is Base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // getBMember() -> 5
 // getDMember() -> 6
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index 9908b2386c..551e7f386c 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -16,7 +16,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(), 2000 ether -> true
 // gas irOptimized: 120037
diff --git a/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol b/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol
index c05c2104f0..22bc93592b 100644
--- a/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol
+++ b/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol
@@ -19,6 +19,5 @@ contract X is D, C, B, A {
     constructor() A(f(1)) C(f(2)) B(f(3)) D(f(4)) {}
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 0x20, 4, 1, 3, 2, 4
diff --git a/test/libsolidity/semanticTests/constructor/payable_constructor.sol b/test/libsolidity/semanticTests/constructor/payable_constructor.sol
index 260b302a74..0f19eb7e26 100644
--- a/test/libsolidity/semanticTests/constructor/payable_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/payable_constructor.sol
@@ -4,6 +4,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // constructor(), 27 wei ->
diff --git a/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
index ebe94bde93..7f0514041e 100644
--- a/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
@@ -18,7 +18,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // use(uint256): 3 -> 6
 // result_in_constructor() -> 4
diff --git a/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol b/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol
index 223a6ba077..7fef18a156 100644
--- a/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol
+++ b/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol
@@ -19,7 +19,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // use(uint16): 3 -> 0xfff9
 // result_in_constructor() -> 0xfffb
diff --git a/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
index 2004d045d8..6721329a12 100644
--- a/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
@@ -16,6 +16,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // t() -> 7
diff --git a/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
index 89795124a2..01a89d7431 100644
--- a/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
@@ -18,6 +18,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // t() -> 7
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
index a583bd39fb..1f10b62778 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
@@ -9,7 +9,6 @@ contract B is A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // constructor() ->
 // gas irOptimized: 121557
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index ca4cf5a054..988099fb28 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
 // gas irOptimized: 103630
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index 3e9ae1ab2a..7a671c85ab 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -20,7 +20,6 @@ contract D is B, C {
     constructor(uint newI, uint newK) B(newI) C(newI, newK + 1) {}
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
 // gas irOptimized: 156071
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index ede647d608..57a8578447 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -11,7 +11,6 @@ contract D is C {
     constructor(uint newI, uint newK) C(newI, newK + 1) {}
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(): 2, 0 ->
 // gas irOptimized: 124199
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol
index e009697269..f3cee053b4 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol
@@ -9,7 +9,6 @@ contract C {
 }
 contract D is C(2, 1) {}
 // ====
-// compileViaYul: also
 // ----
 // i() -> 2
 // k() -> 1
diff --git a/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol
index 4e0a8a5617..7ffb2e07f0 100644
--- a/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol
@@ -37,7 +37,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // testViewToDefault() -> 12, 22
 // testPureToDefault() -> 13, 23
diff --git a/test/libsolidity/semanticTests/conversions/string_to_bytes.sol b/test/libsolidity/semanticTests/conversions/string_to_bytes.sol
index ca258ca26b..56c1c90619 100644
--- a/test/libsolidity/semanticTests/conversions/string_to_bytes.sol
+++ b/test/libsolidity/semanticTests/conversions/string_to_bytes.sol
@@ -4,6 +4,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(string): 32, 5, "Hello" -> 32, 5, "Hello"
diff --git a/test/libsolidity/semanticTests/dirty_calldata_bytes.sol b/test/libsolidity/semanticTests/dirty_calldata_bytes.sol
index cd801c2d45..48dc5ee2f1 100644
--- a/test/libsolidity/semanticTests/dirty_calldata_bytes.sol
+++ b/test/libsolidity/semanticTests/dirty_calldata_bytes.sol
@@ -10,6 +10,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x04, "dead" -> true
diff --git a/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol b/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol
index 6b4763ab18..aef535fe9d 100644
--- a/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol
+++ b/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol
@@ -9,6 +9,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(int16[]): 0x20, 0x02, 0x7fff, 0x7fff -> true
diff --git a/test/libsolidity/semanticTests/ecrecover/ecrecover.sol b/test/libsolidity/semanticTests/ecrecover/ecrecover.sol
index 1f462752b1..6942c4990e 100644
--- a/test/libsolidity/semanticTests/ecrecover/ecrecover.sol
+++ b/test/libsolidity/semanticTests/ecrecover/ecrecover.sol
@@ -4,7 +4,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // a(bytes32,uint8,bytes32,bytes32):
 // 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,
diff --git a/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol b/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol
index 265e58bda3..04df0ccba9 100644
--- a/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol
+++ b/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol
@@ -5,7 +5,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // a(bytes32,uint8,bytes32,bytes32):
 // 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,
diff --git a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol
index 3ee606d36c..52c2838048 100644
--- a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol
+++ b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol
@@ -7,6 +7,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol
index 607f3ec1ac..755784880d 100644
--- a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol
+++ b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol
@@ -12,6 +12,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol
index 4fa1ec5143..22b0f1275d 100644
--- a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol
+++ b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/empty_contract.sol b/test/libsolidity/semanticTests/empty_contract.sol
index 3691eae35b..511b724692 100644
--- a/test/libsolidity/semanticTests/empty_contract.sol
+++ b/test/libsolidity/semanticTests/empty_contract.sol
@@ -3,6 +3,5 @@ contract test {
 // ====
 // allowNonExistingFunctions: true
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // i_am_not_there() -> FAILURE
diff --git a/test/libsolidity/semanticTests/empty_for_loop.sol b/test/libsolidity/semanticTests/empty_for_loop.sol
index 4df1ae82e6..d4ba09f139 100644
--- a/test/libsolidity/semanticTests/empty_for_loop.sol
+++ b/test/libsolidity/semanticTests/empty_for_loop.sol
@@ -9,6 +9,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 10
diff --git a/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol b/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol
index a1608e33a5..ddf1a66fa1 100644
--- a/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol
+++ b/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol
@@ -8,6 +8,5 @@ contract c {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 1
diff --git a/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol b/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol
index eee24bbc79..a538946ad5 100644
--- a/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol
+++ b/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol
@@ -22,7 +22,6 @@ contract test {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // EVMVersion: >=byzantium
 // ----
diff --git a/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol b/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol
index 90e5e1b3e6..9b783b4041 100644
--- a/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol
+++ b/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol
@@ -23,7 +23,6 @@ contract test {
 
 // ====
 // EVMVersion: <byzantium
-// compileViaYul: also
 // ----
 // getChoiceExp(uint256): 3 -> FAILURE # These should throw #
 // getChoiceFromSigned(int256): -1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/enums/enum_referencing.sol b/test/libsolidity/semanticTests/enums/enum_referencing.sol
index 537c05182b..a475f3748a 100644
--- a/test/libsolidity/semanticTests/enums/enum_referencing.sol
+++ b/test/libsolidity/semanticTests/enums/enum_referencing.sol
@@ -28,7 +28,6 @@ contract C is I {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: false
 // ----
 // library: L
diff --git a/test/libsolidity/semanticTests/enums/enum_with_256_members.sol b/test/libsolidity/semanticTests/enums/enum_with_256_members.sol
index ea94bc0c15..abd6907b54 100644
--- a/test/libsolidity/semanticTests/enums/enum_with_256_members.sol
+++ b/test/libsolidity/semanticTests/enums/enum_with_256_members.sol
@@ -47,7 +47,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // getMinMax() -> 0, 255
 // intToEnum(uint8): 0 -> 0
diff --git a/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol b/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
index 33cec7482a..305558e810 100644
--- a/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
+++ b/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test_log_ok() -> 1
 // ~ emit Log(uint8): 0x00
diff --git a/test/libsolidity/semanticTests/enums/minmax.sol b/test/libsolidity/semanticTests/enums/minmax.sol
index 3b298a6fac..8f16b628b5 100644
--- a/test/libsolidity/semanticTests/enums/minmax.sol
+++ b/test/libsolidity/semanticTests/enums/minmax.sol
@@ -6,7 +6,6 @@ contract test {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // min() -> 0
 // max() -> 3
diff --git a/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol b/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol
index 7e1c5b8c33..cda5d06ac3 100644
--- a/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol
+++ b/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol
@@ -8,6 +8,5 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // answer() -> 1
diff --git a/test/libsolidity/semanticTests/enums/using_enums.sol b/test/libsolidity/semanticTests/enums/using_enums.sol
index 5f5e3056e3..ec014160aa 100644
--- a/test/libsolidity/semanticTests/enums/using_enums.sol
+++ b/test/libsolidity/semanticTests/enums/using_enums.sol
@@ -14,6 +14,5 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // getChoice() -> 2
diff --git a/test/libsolidity/semanticTests/enums/using_inherited_enum.sol b/test/libsolidity/semanticTests/enums/using_inherited_enum.sol
index 615f90f01f..8d65aeac8e 100644
--- a/test/libsolidity/semanticTests/enums/using_inherited_enum.sol
+++ b/test/libsolidity/semanticTests/enums/using_inherited_enum.sol
@@ -10,6 +10,5 @@ contract test is base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // answer() -> 1
diff --git a/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol b/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol
index ce2415a1b8..cac059774c 100644
--- a/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol
+++ b/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol
@@ -10,6 +10,5 @@ contract test is base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // answer() -> 1
diff --git a/test/libsolidity/semanticTests/error/selector.sol b/test/libsolidity/semanticTests/error/selector.sol
index fab71f4439..f83606d7ff 100644
--- a/test/libsolidity/semanticTests/error/selector.sol
+++ b/test/libsolidity/semanticTests/error/selector.sol
@@ -15,6 +15,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x2ff06700000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol b/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol
index 81f6c15484..ba406e2a56 100644
--- a/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol
+++ b/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
 // g() -> FAILURE, hex"85208890", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000002"
diff --git a/test/libsolidity/semanticTests/errors/named_error_args.sol b/test/libsolidity/semanticTests/errors/named_error_args.sol
index e311d403a1..28df2c4ccb 100644
--- a/test/libsolidity/semanticTests/errors/named_error_args.sol
+++ b/test/libsolidity/semanticTests/errors/named_error_args.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"85208890", hex"0000000000000000000000000000000000000000000000000000000000000002", hex"0000000000000000000000000000000000000000000000000000000000000007"
diff --git a/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol b/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol
index 5af0205c61..a0d43c274f 100644
--- a/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol
+++ b/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol
@@ -20,7 +20,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"33a54193", hex"000000000000000000000000000000000000000000000000000000000000002a"
 // g() -> FAILURE, hex"374b9387", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"000000000000000000000000000000000000000000000000000000000000002a"
diff --git a/test/libsolidity/semanticTests/errors/panic_via_import.sol b/test/libsolidity/semanticTests/errors/panic_via_import.sol
index a2f7e70adb..b763164c9a 100644
--- a/test/libsolidity/semanticTests/errors/panic_via_import.sol
+++ b/test/libsolidity/semanticTests/errors/panic_via_import.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // a() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
diff --git a/test/libsolidity/semanticTests/errors/revert_conversion.sol b/test/libsolidity/semanticTests/errors/revert_conversion.sol
index fd8fb7dc93..3aa026e469 100644
--- a/test/libsolidity/semanticTests/errors/revert_conversion.sol
+++ b/test/libsolidity/semanticTests/errors/revert_conversion.sol
@@ -7,6 +7,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"59e4d4df", 0x40, 0x80, 3, "abc", 1, 7
diff --git a/test/libsolidity/semanticTests/errors/simple.sol b/test/libsolidity/semanticTests/errors/simple.sol
index 304e90e232..b8a8e0d609 100644
--- a/test/libsolidity/semanticTests/errors/simple.sol
+++ b/test/libsolidity/semanticTests/errors/simple.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"85208890", 2, 7
diff --git a/test/libsolidity/semanticTests/errors/using_structs.sol b/test/libsolidity/semanticTests/errors/using_structs.sol
index ac12f9d030..47979a9552 100644
--- a/test/libsolidity/semanticTests/errors/using_structs.sol
+++ b/test/libsolidity/semanticTests/errors/using_structs.sol
@@ -14,7 +14,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(bool): true -> FAILURE, hex"e96e07f0", hex"0000000000000000000000000000000000000000000000000000000000000002", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000007", hex"0000000000000000000000000000000000000000000000000000000000000009", hex"0000000000000000000000000000000000000000000000000000000000000040", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"6162630000000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/via_contract_type.sol b/test/libsolidity/semanticTests/errors/via_contract_type.sol
index 856b824c94..f0ea6ca3c8 100644
--- a/test/libsolidity/semanticTests/errors/via_contract_type.sol
+++ b/test/libsolidity/semanticTests/errors/via_contract_type.sol
@@ -11,7 +11,6 @@ contract B is A {
 
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
diff --git a/test/libsolidity/semanticTests/errors/via_import.sol b/test/libsolidity/semanticTests/errors/via_import.sol
index 1039dcd02a..6a6d3399ed 100644
--- a/test/libsolidity/semanticTests/errors/via_import.sol
+++ b/test/libsolidity/semanticTests/errors/via_import.sol
@@ -18,7 +18,6 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // x() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
diff --git a/test/libsolidity/semanticTests/errors/weird_name.sol b/test/libsolidity/semanticTests/errors/weird_name.sol
index 5998dc8517..d3d7545496 100644
--- a/test/libsolidity/semanticTests/errors/weird_name.sol
+++ b/test/libsolidity/semanticTests/errors/weird_name.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"b48fb6cf", hex"0000000000000000000000000000000000000000000000000000000000000002"
diff --git a/test/libsolidity/semanticTests/events/event.sol b/test/libsolidity/semanticTests/events/event.sol
index 0143b88358..0578cecbb6 100644
--- a/test/libsolidity/semanticTests/events/event.sol
+++ b/test/libsolidity/semanticTests/events/event.sol
@@ -15,7 +15,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit(bytes32,bool), 18 wei: 0x1234, true ->
 // ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol b/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol
index 2e55940de3..bda14281da 100644
--- a/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol
+++ b/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol
@@ -8,7 +8,6 @@ contract B is A {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1
 // ~ emit x()
diff --git a/test/libsolidity/semanticTests/events/event_anonymous.sol b/test/libsolidity/semanticTests/events/event_anonymous.sol
index e890fc1cb7..d130fbef98 100644
--- a/test/libsolidity/semanticTests/events/event_anonymous.sol
+++ b/test/libsolidity/semanticTests/events/event_anonymous.sol
@@ -5,7 +5,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit() ->
 // ~ emit <anonymous>
diff --git a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol b/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol
index 96b06cc12b..62e8f34007 100644
--- a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol
+++ b/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol
@@ -5,7 +5,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit <anonymous>: #0x2012159ca6b6372f102c535a4814d13a00bfc5568ddfd72151364061b00355d1, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol b/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol
index 1ddaa8d7b8..a74959d026 100644
--- a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol
+++ b/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol
@@ -6,7 +6,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Withdraw(uint256,string): #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol b/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol
index 0bbe9f09b8..a3fb31d05d 100644
--- a/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol
+++ b/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol
@@ -5,7 +5,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit <anonymous>: #0x1212121212121212121212121212120000000012, #0x1234, #0x12, #0x02, "abc"
diff --git a/test/libsolidity/semanticTests/events/event_constructor.sol b/test/libsolidity/semanticTests/events/event_constructor.sol
index f5fa4e119b..566ae8a1a5 100644
--- a/test/libsolidity/semanticTests/events/event_constructor.sol
+++ b/test/libsolidity/semanticTests/events/event_constructor.sol
@@ -5,7 +5,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #"abc", 0x07
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol
index 943d3b1ac8..a01b2c0d12 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol
@@ -9,7 +9,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol
index c7b564d38c..ffb9d5c8bd 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index dedffe232f..68ea33fd85 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
index 947e5ad9e5..b902071dc3 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol
index 13698e200c..174eb8b27f 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
index 552444dd8b..0f76061b46 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
diff --git a/test/libsolidity/semanticTests/events/event_emit.sol b/test/libsolidity/semanticTests/events/event_emit.sol
index 70cd705898..11be45f10d 100644
--- a/test/libsolidity/semanticTests/events/event_emit.sol
+++ b/test/libsolidity/semanticTests/events/event_emit.sol
@@ -5,7 +5,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 0f685b783a..9323e4a4fe 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -14,7 +14,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor() ->
 // gas irOptimized: 173094
diff --git a/test/libsolidity/semanticTests/events/event_indexed_function.sol b/test/libsolidity/semanticTests/events/event_indexed_function.sol
index 400d6d93fc..846b468cc0 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_function.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_function.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() ->
 // ~ emit Test(function): #0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b26121ff00000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_indexed_function2.sol b/test/libsolidity/semanticTests/events/event_indexed_function2.sol
index 508744ca12..5e4a3e3b29 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_function2.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_function2.sol
@@ -9,7 +9,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f1() ->
 // ~ emit TestA(function): #0x0fdd67305928fcac8d213d1e47bfa6165cd0b87bc27fc3050000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_indexed_mixed.sol b/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
index 47aca1e2ab..34ce442138 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
@@ -9,7 +9,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit() ->
 // ~ emit E(uint256,uint256,uint256,bytes): #0x02, 0x01, 0x03, 0x60, 0x03, "def"
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index 5d3ad58404..8c2be5c53c 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -15,7 +15,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit() ->
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
diff --git a/test/libsolidity/semanticTests/events/event_lots_of_data.sol b/test/libsolidity/semanticTests/events/event_lots_of_data.sol
index c38537f5a3..bef4a02555 100644
--- a/test/libsolidity/semanticTests/events/event_lots_of_data.sol
+++ b/test/libsolidity/semanticTests/events/event_lots_of_data.sol
@@ -5,7 +5,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Deposit(address,bytes32,uint256,bool): 0x1212121212121212121212121212120000000012, 0x1234, 0x12, true
diff --git a/test/libsolidity/semanticTests/events/event_no_arguments.sol b/test/libsolidity/semanticTests/events/event_no_arguments.sol
index ba40481070..a81ddcc309 100644
--- a/test/libsolidity/semanticTests/events/event_no_arguments.sol
+++ b/test/libsolidity/semanticTests/events/event_no_arguments.sol
@@ -5,7 +5,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit() ->
 // ~ emit Deposit()
diff --git a/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol b/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol
index 7322e56d31..ab62a85867 100644
--- a/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol
+++ b/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol
@@ -5,7 +5,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit() ->
 // ~ emit Deposit(uint256,bytes,uint256): 0x0a, 0x60, 0x0f, 0x04, 0xd0e30db000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol b/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol
index da8e7799d9..de5b155283 100644
--- a/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol
@@ -9,7 +9,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit() ->
 // ~ emit Deposit(uint256,bytes,uint256): 0x0a, 0x60, 0x0f, 0x03, "ABC"
diff --git a/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol b/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol
index f944163eb7..19e76b322a 100644
--- a/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol
@@ -11,7 +11,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit() ->
 // ~ emit Deposit(uint256,bytes,uint256): 0x0a, 0x60, 0x0f, 0x1f, "ABC\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Z"
diff --git a/test/libsolidity/semanticTests/events/event_signature_in_library.sol b/test/libsolidity/semanticTests/events/event_signature_in_library.sol
index b301ebfd5a..fa5f318390 100644
--- a/test/libsolidity/semanticTests/events/event_signature_in_library.sol
+++ b/test/libsolidity/semanticTests/events/event_signature_in_library.sol
@@ -16,7 +16,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // ~ emit E((uint8,int16),(uint8,int16)): #0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/events/event_string.sol b/test/libsolidity/semanticTests/events/event_string.sol
index e383ef9340..4cdbb4eab0 100644
--- a/test/libsolidity/semanticTests/events/event_string.sol
+++ b/test/libsolidity/semanticTests/events/event_string.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit() ->
 // ~ emit E(string): 0x20, 0x0b, "HELLO WORLD"
diff --git a/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol b/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol
index a08b4f5743..5c2a6b8309 100644
--- a/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E((uint256)): 0x2a
diff --git a/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol b/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol
index ae91efc3ee..4e8b412f6a 100644
--- a/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol
@@ -9,7 +9,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E((uint256)): 0x2a
diff --git a/test/libsolidity/semanticTests/events/events_with_same_name.sol b/test/libsolidity/semanticTests/events/events_with_same_name.sol
index 5eef0deb95..625762a61d 100644
--- a/test/libsolidity/semanticTests/events/events_with_same_name.sol
+++ b/test/libsolidity/semanticTests/events/events_with_same_name.sol
@@ -21,7 +21,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit() -> 1
 // ~ emit Deposit()
diff --git a/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol b/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol
index 4725025046..20179bfdd5 100644
--- a/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol
+++ b/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol
@@ -22,7 +22,6 @@ contract ClientReceipt is A, B {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // deposit() -> 1
 // ~ emit Deposit()
diff --git a/test/libsolidity/semanticTests/exponentiation/literal_base.sol b/test/libsolidity/semanticTests/exponentiation/literal_base.sol
index e1c178ec37..f00999c971 100644
--- a/test/libsolidity/semanticTests/exponentiation/literal_base.sol
+++ b/test/libsolidity/semanticTests/exponentiation/literal_base.sol
@@ -8,7 +8,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256): 0 -> 1, 1
diff --git a/test/libsolidity/semanticTests/exponentiation/signed_base.sol b/test/libsolidity/semanticTests/exponentiation/signed_base.sol
index f71208067d..105a8ef5f7 100644
--- a/test/libsolidity/semanticTests/exponentiation/signed_base.sol
+++ b/test/libsolidity/semanticTests/exponentiation/signed_base.sol
@@ -12,6 +12,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 9, -27
diff --git a/test/libsolidity/semanticTests/exponentiation/small_exp.sol b/test/libsolidity/semanticTests/exponentiation/small_exp.sol
index f124537951..945b65c9df 100644
--- a/test/libsolidity/semanticTests/exponentiation/small_exp.sol
+++ b/test/libsolidity/semanticTests/exponentiation/small_exp.sol
@@ -11,7 +11,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 4
diff --git a/test/libsolidity/semanticTests/expressions/bit_operators.sol b/test/libsolidity/semanticTests/expressions/bit_operators.sol
index 2cac78c7ef..733951e2c0 100644
--- a/test/libsolidity/semanticTests/expressions/bit_operators.sol
+++ b/test/libsolidity/semanticTests/expressions/bit_operators.sol
@@ -15,6 +15,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 3855, 268374015, 268370160
diff --git a/test/libsolidity/semanticTests/expressions/bytes_comparison.sol b/test/libsolidity/semanticTests/expressions/bytes_comparison.sol
index ee43abe1bd..634486d915 100644
--- a/test/libsolidity/semanticTests/expressions/bytes_comparison.sol
+++ b/test/libsolidity/semanticTests/expressions/bytes_comparison.sol
@@ -8,6 +8,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol
index 1dbb5ad83c..66eb86d505 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol
@@ -7,7 +7,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> 0xcd
 // f(bool): false -> 0xabab
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol
index 7f201b8cd3..f8c3abf2dd 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol
@@ -5,6 +5,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 10
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol
index 221dcf8050..5abc4e1e33 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol
@@ -9,7 +9,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol
index 536c1ea659..c51172b0d8 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol
@@ -8,7 +8,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 1001 -> 1000
 // f(uint256): 500 -> 100
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol
index be90b8db8e..40cfc7a9dd 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol
@@ -24,7 +24,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol
index f522ca6e56..2d6940647e 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol
@@ -24,7 +24,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol
index 21c4fcca60..968a4a02a8 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol
@@ -5,6 +5,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 5
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol
index 8f00a8afea..a28dd1f06d 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol
@@ -5,7 +5,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> 1, 2
 // f(bool): false -> 3, 4
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol
index 89308d30b1..fdf691ae43 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol
@@ -5,7 +5,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool,uint256): true, 20 -> 20, 0
 // f(bool,uint256): false, 20 -> 0, 20
diff --git a/test/libsolidity/semanticTests/expressions/exp_operator_const.sol b/test/libsolidity/semanticTests/expressions/exp_operator_const.sol
index 90ffdf7f1c..ef71a3d2b0 100644
--- a/test/libsolidity/semanticTests/expressions/exp_operator_const.sol
+++ b/test/libsolidity/semanticTests/expressions/exp_operator_const.sol
@@ -3,6 +3,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 8
diff --git a/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol b/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol
index 93333eadc8..4901f5c78f 100644
--- a/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol
+++ b/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol
@@ -3,6 +3,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> -8
diff --git a/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol b/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol
index 034ee7be1c..716f72aeeb 100644
--- a/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol
+++ b/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol
@@ -3,6 +3,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol b/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol
index c30a9a7f51..b9eaa64803 100644
--- a/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol
+++ b/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol
@@ -13,6 +13,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x053866
diff --git a/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol b/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol
index ea49d7d3fa..a22002184d 100644
--- a/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol
+++ b/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol
@@ -6,6 +6,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol b/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol
index a2f6287213..837f9f7410 100644
--- a/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol
+++ b/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol
@@ -8,6 +8,5 @@ contract TransferTest {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index 58087a3b55..b7ae23f90f 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -73,7 +73,6 @@ contract FixedFeeRegistrar is Registrar {
 	uint constant c_fee = 69 ether;
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // gas irOptimized: 402812
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index 7101af5941..f2d816a72b 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -31,7 +31,6 @@ contract test {
 //
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // constructor()
 // gas irOptimized: 443542
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 9e3211ecb4..23f012616c 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -175,7 +175,6 @@ contract DepositContract is IDepositContract, ERC165 {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // gas irOptimized: 1529797
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index e45d3360e3..cf7fa9f5d8 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -47,7 +47,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // gas irOptimized: 1926032
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index c37fe52b56..5160b70312 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -47,7 +47,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // gas irOptimized: 1780841
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index b1c4c0169a..e8d9e51d05 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -32,7 +32,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // gas irOptimized: 455866
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 05b4ddb25a..1daa25d53e 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -289,7 +289,6 @@ contract Test {
 //
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // library: Pairing
 // f() -> true
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index ce582e7c94..881d174e26 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -48,7 +48,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // gas irOptimized: 691317
diff --git a/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol b/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol
index d6bd1e27c1..f7c111e7ef 100644
--- a/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol
+++ b/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol
@@ -3,6 +3,5 @@ import {External} from "a";
 contract C {
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol b/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol
index 4b4c3d9bba..31e1ef0768 100644
--- a/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol
+++ b/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol
@@ -5,6 +5,5 @@ import {OtherExternal} from "_external/other_external.sol";
 contract C {
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/multisource.sol b/test/libsolidity/semanticTests/externalSource/multisource.sol
index 8291f66ae2..8669633a34 100644
--- a/test/libsolidity/semanticTests/externalSource/multisource.sol
+++ b/test/libsolidity/semanticTests/externalSource/multisource.sol
@@ -8,7 +8,6 @@ import {S1} from "s1.sol";
 contract C {
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 
diff --git a/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol b/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol
index 4d1854e96a..0c3fd4b563 100644
--- a/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol
+++ b/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol
@@ -7,6 +7,5 @@ import {D} from "C/../////D/d.sol";
 contract Contract {
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/relative_imports.sol b/test/libsolidity/semanticTests/externalSource/relative_imports.sol
index 744684f4f3..eee707034e 100644
--- a/test/libsolidity/semanticTests/externalSource/relative_imports.sol
+++ b/test/libsolidity/semanticTests/externalSource/relative_imports.sol
@@ -9,6 +9,5 @@ import {A, B, C, D, G, H, Contract} from "_relative_imports/dir/contract.sol";
 contract CC {
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source.sol b/test/libsolidity/semanticTests/externalSource/source.sol
index 5fc5a3b89b..f662fae78d 100644
--- a/test/libsolidity/semanticTests/externalSource/source.sol
+++ b/test/libsolidity/semanticTests/externalSource/source.sol
@@ -3,6 +3,5 @@ import {External} from "_external/external.sol";
 contract C {
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_import.sol b/test/libsolidity/semanticTests/externalSource/source_import.sol
index 4b4c3d9bba..31e1ef0768 100644
--- a/test/libsolidity/semanticTests/externalSource/source_import.sol
+++ b/test/libsolidity/semanticTests/externalSource/source_import.sol
@@ -5,6 +5,5 @@ import {OtherExternal} from "_external/other_external.sol";
 contract C {
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol b/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol
index f3fa73085a..a84bba1094 100644
--- a/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol
+++ b/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol
@@ -5,6 +5,5 @@ import {SubExternal} from "sub_external.sol";
 contract C {
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol b/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol
index 829485e6d3..b8d22039bd 100644
--- a/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol
+++ b/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol
@@ -7,6 +7,5 @@ import {A, B} from "_source_name_starting_with_dots/dir/contract.sol";
 contract Contract {
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_remapping.sol b/test/libsolidity/semanticTests/externalSource/source_remapping.sol
index 4edb2200f2..0347ef02c6 100644
--- a/test/libsolidity/semanticTests/externalSource/source_remapping.sol
+++ b/test/libsolidity/semanticTests/externalSource/source_remapping.sol
@@ -7,6 +7,5 @@ contract C {
     OtherExternal _otherExternal;
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol b/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
index 39122e7574..4a35fad1db 100644
--- a/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
+++ b/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
@@ -15,7 +15,6 @@ contract sender {
 // ====
 // allowNonExistingFunctions: true
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // recv(uint256): 7 ->
 // val() -> 0
diff --git a/test/libsolidity/semanticTests/fallback/falback_return.sol b/test/libsolidity/semanticTests/fallback/falback_return.sol
index 475a9f19b9..55e65348b1 100644
--- a/test/libsolidity/semanticTests/fallback/falback_return.sol
+++ b/test/libsolidity/semanticTests/fallback/falback_return.sol
@@ -7,7 +7,6 @@ contract A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // ()
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/fallback/fallback_argument.sol b/test/libsolidity/semanticTests/fallback/fallback_argument.sol
index f20c144931..d351720761 100644
--- a/test/libsolidity/semanticTests/fallback/fallback_argument.sol
+++ b/test/libsolidity/semanticTests/fallback/fallback_argument.sol
@@ -11,7 +11,6 @@ contract A {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f() -> 0x01, 0x40, 0x00
 // x() -> 3
diff --git a/test/libsolidity/semanticTests/fallback/fallback_argument_to_storage.sol b/test/libsolidity/semanticTests/fallback/fallback_argument_to_storage.sol
index 5e0c3fbdf5..1a995a8cd5 100644
--- a/test/libsolidity/semanticTests/fallback/fallback_argument_to_storage.sol
+++ b/test/libsolidity/semanticTests/fallback/fallback_argument_to_storage.sol
@@ -11,7 +11,6 @@ contract A {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f() -> 0x01, 0x40, 0x00
 // x() -> 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol b/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol
index 231f999bc6..14366886cb 100644
--- a/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol
+++ b/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol
@@ -7,7 +7,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0, 0
 // () ->
diff --git a/test/libsolidity/semanticTests/fallback/fallback_override.sol b/test/libsolidity/semanticTests/fallback/fallback_override.sol
index c1099e151c..5e5adb37c5 100644
--- a/test/libsolidity/semanticTests/fallback/fallback_override.sol
+++ b/test/libsolidity/semanticTests/fallback/fallback_override.sol
@@ -14,6 +14,5 @@ contract B is A {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f() -> 0x01, 0x40, 0x03, 0x78797a0000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/fallback/fallback_override2.sol b/test/libsolidity/semanticTests/fallback/fallback_override2.sol
index e92163476d..67925fd5bd 100644
--- a/test/libsolidity/semanticTests/fallback/fallback_override2.sol
+++ b/test/libsolidity/semanticTests/fallback/fallback_override2.sol
@@ -13,6 +13,5 @@ contract B is A {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f() -> 1, 0x40, 0x00
diff --git a/test/libsolidity/semanticTests/fallback/fallback_override_multi.sol b/test/libsolidity/semanticTests/fallback/fallback_override_multi.sol
index 1e2b3a630b..ce268e4f43 100644
--- a/test/libsolidity/semanticTests/fallback/fallback_override_multi.sol
+++ b/test/libsolidity/semanticTests/fallback/fallback_override_multi.sol
@@ -17,6 +17,5 @@ contract C is B, A {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f() -> 0x01, 0x40, 0x00
diff --git a/test/libsolidity/semanticTests/fallback/fallback_return_data.sol b/test/libsolidity/semanticTests/fallback/fallback_return_data.sol
index 5cef4466cb..d22c11e71c 100644
--- a/test/libsolidity/semanticTests/fallback/fallback_return_data.sol
+++ b/test/libsolidity/semanticTests/fallback/fallback_return_data.sol
@@ -9,6 +9,5 @@ contract A {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f() -> 0x01, 0x40, 0x03, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/fallback/inherited.sol b/test/libsolidity/semanticTests/fallback/inherited.sol
index 7139bb9c10..75ab307bfc 100644
--- a/test/libsolidity/semanticTests/fallback/inherited.sol
+++ b/test/libsolidity/semanticTests/fallback/inherited.sol
@@ -5,7 +5,6 @@ contract A {
 }
 contract B is A {}
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // getData() -> 0
diff --git a/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol b/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol
index ad2dec3730..cb62135edf 100644
--- a/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol
+++ b/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol
@@ -6,7 +6,6 @@ contract A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // (): hex"d88e0b"
 // x() -> 2
diff --git a/test/libsolidity/semanticTests/freeFunctions/easy.sol b/test/libsolidity/semanticTests/freeFunctions/easy.sol
index 8dae85e2d4..dae3b40377 100644
--- a/test/libsolidity/semanticTests/freeFunctions/easy.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/easy.sol
@@ -9,6 +9,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 7 -> 9
diff --git a/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol b/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol
index 9c88bb49f9..465b80f7a9 100644
--- a/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE
diff --git a/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol b/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
index 5c2e2f909a..527223af93 100644
--- a/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
@@ -12,6 +12,5 @@ contract D {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/freeFunctions/import.sol b/test/libsolidity/semanticTests/freeFunctions/import.sol
index d7d46d7b61..f4ecd6baca 100644
--- a/test/libsolidity/semanticTests/freeFunctions/import.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/import.sol
@@ -16,6 +16,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 7 -> 7, 8
diff --git a/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol b/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol
index 861313e923..1865eeac18 100644
--- a/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol
@@ -17,7 +17,6 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // f() -> 7, 8
diff --git a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
index 0e89c75604..a488ea95ce 100644
--- a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
@@ -12,7 +12,6 @@ contract D {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2
 // gas legacy: 101626
diff --git a/test/libsolidity/semanticTests/freeFunctions/overloads.sol b/test/libsolidity/semanticTests/freeFunctions/overloads.sol
index ae579e30ff..468f75be99 100644
--- a/test/libsolidity/semanticTests/freeFunctions/overloads.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/overloads.sol
@@ -12,6 +12,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 2, 3
diff --git a/test/libsolidity/semanticTests/freeFunctions/recursion.sol b/test/libsolidity/semanticTests/freeFunctions/recursion.sol
index ab68c2ffb8..b6a131b63b 100644
--- a/test/libsolidity/semanticTests/freeFunctions/recursion.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/recursion.sol
@@ -14,7 +14,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g(uint256,uint256): 0, 0 -> 1
 // g(uint256,uint256): 0, 1 -> 0x00
diff --git a/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol b/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol
index 3b94b06fce..c3dc9d5b6e 100644
--- a/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol
@@ -12,6 +12,5 @@ function fun(uint[] calldata _x, uint[] storage _y) view  returns (uint, uint[]
 	return (_y[0], _x);
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,uint256[]): 7, 0x40, 3, 8, 9, 10 -> 7, 9
diff --git a/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol b/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol
index bf3ac302d0..0605888d08 100644
--- a/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol
+++ b/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol
@@ -24,7 +24,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256[]): 32, 3, 1000, 1, 2 -> 3
 // f(uint256[]): 32, 3, 100, 500, 300 -> 600
diff --git a/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol b/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol
index e45eeaa4e2..f0f2bdf80d 100644
--- a/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol
+++ b/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol
@@ -5,6 +5,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol b/test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol
index 983de5e3ce..97bc083af9 100644
--- a/test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol
+++ b/test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol
@@ -10,7 +10,6 @@ contract C {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: L
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol b/test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol
index ad80241270..d8d55dc9bb 100644
--- a/test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol
+++ b/test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol
@@ -9,7 +9,6 @@ contract C {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: D
 // f(uint256): 7 -> 0x2a
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol b/test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol
index 376768b86d..d374573dc9 100644
--- a/test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol
+++ b/test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: D
 // f() -> 3
diff --git a/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol b/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol
index 6040b7a99f..82c38cca5a 100644
--- a/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol
@@ -24,6 +24,5 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol b/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol
index f05f0eb1c1..ea5edaaef6 100644
--- a/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol
@@ -14,7 +14,6 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
 // flag() -> true
diff --git a/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol b/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol
index 26c9596751..043ee05a82 100644
--- a/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol
@@ -19,7 +19,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // associated() -> 42
 // unassociated() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol b/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol
index 344d1dc635..d0de5e08fc 100644
--- a/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol
@@ -26,6 +26,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 12
diff --git a/test/libsolidity/semanticTests/functionCall/call_options_overload.sol b/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
index 0881c5bac3..645700752d 100644
--- a/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
@@ -11,7 +11,6 @@ contract C {
     receive() external payable {}
 }
 // ====
-// compileViaYul: also
 // ----
 // (), 1 ether
 // call() -> 1, 2, 2, 2
diff --git a/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol b/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol
index 7d4a947dae..9753015a45 100644
--- a/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol
+++ b/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol
@@ -24,7 +24,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE
 // g() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol b/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol
index 157d13aea9..12139fc684 100644
--- a/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol
+++ b/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol
@@ -14,7 +14,6 @@ contract collatz {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // run(uint256): 0 -> 0
 // run(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol
index d2bf644dd1..2f660c24c8 100644
--- a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol
+++ b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // intern() -> FAILURE, hex"4e487b71", 0x51 # This should throw exceptions #
 // extern() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol
index 0a2a102905..a7295928aa 100644
--- a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol
+++ b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol
@@ -18,6 +18,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // t() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol
index fc915792c1..f7d90c8f2d 100644
--- a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol
+++ b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol
@@ -17,6 +17,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // t() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol b/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol
index f476d9dbc0..65dbeaaeec 100644
--- a/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol
+++ b/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol
@@ -8,6 +8,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
index 0ab6fe0c3c..f673b8ad59 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
@@ -10,7 +10,6 @@ contract D {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2
 // gas legacy: 101599
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index 0f1b635239..ac9921ce00 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -14,7 +14,6 @@ contract D {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(): 2 ->
 // gas irOptimized: 200217
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index 462e9ad76c..5d6f34e09d 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -15,7 +15,6 @@ contract D {
 }
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // constructor(): 2 ->
 // gas irOptimized: 200380
diff --git a/test/libsolidity/semanticTests/functionCall/delegatecall_return_value.sol b/test/libsolidity/semanticTests/functionCall/delegatecall_return_value.sol
index 9fa72aeaa3..1e6d542cfc 100644
--- a/test/libsolidity/semanticTests/functionCall/delegatecall_return_value.sol
+++ b/test/libsolidity/semanticTests/functionCall/delegatecall_return_value.sol
@@ -23,7 +23,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // get() -> 0x00
 // assert0_delegated() -> 0x01, 0x40, 0x0
diff --git a/test/libsolidity/semanticTests/functionCall/delegatecall_return_value_pre_byzantium.sol b/test/libsolidity/semanticTests/functionCall/delegatecall_return_value_pre_byzantium.sol
index 00f1f8a777..498449d17d 100644
--- a/test/libsolidity/semanticTests/functionCall/delegatecall_return_value_pre_byzantium.sol
+++ b/test/libsolidity/semanticTests/functionCall/delegatecall_return_value_pre_byzantium.sol
@@ -24,7 +24,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // EVMVersion: <byzantium
 // ----
 // get() -> 0x00
diff --git a/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol b/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol
index dc34aa8a23..5529b90a01 100644
--- a/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol
@@ -4,6 +4,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // b() -> 123
diff --git a/test/libsolidity/semanticTests/functionCall/external_call.sol b/test/libsolidity/semanticTests/functionCall/external_call.sol
index b732f5e957..8bfeb4d6fc 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call.sol
@@ -11,7 +11,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // g(uint256): 4 -> 5
 // f(uint256): 2 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol b/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
index 2fb2f266d7..69a2193a30 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
@@ -19,7 +19,6 @@ contract C {
 
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> FAILURE
 // f(uint256): 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol b/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol
index c87f73f068..56a2876ed4 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol
@@ -19,6 +19,5 @@ contract C {
 
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // dt(uint256): 4 -> 6
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index 79c3adccb1..b9434abac7 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -22,7 +22,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 1 ether ->
 // gas irOptimized: 303935
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index 2e9be2ff5f..375db7ca51 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -23,7 +23,6 @@ contract C {
 
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_value.sol b/test/libsolidity/semanticTests/functionCall/external_call_value.sol
index 47e2bfb764..63eadcd9d7 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_value.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_value.sol
@@ -11,7 +11,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // g(uint256), 1 ether: 4 -> 1000000000000000000000, 4
 // f(uint256), 11 ether: 2 -> 10000, 2
diff --git a/test/libsolidity/semanticTests/functionCall/external_function.sol b/test/libsolidity/semanticTests/functionCall/external_function.sol
index 7f79350d83..d6c13a4ef2 100644
--- a/test/libsolidity/semanticTests/functionCall/external_function.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_function.sol
@@ -14,6 +14,5 @@ contract c {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test(uint256,uint256): 2, 3 -> 9, 3
diff --git a/test/libsolidity/semanticTests/functionCall/external_public_override.sol b/test/libsolidity/semanticTests/functionCall/external_public_override.sol
index 4f5c6aaa21..31f4742056 100644
--- a/test/libsolidity/semanticTests/functionCall/external_public_override.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_public_override.sol
@@ -17,7 +17,6 @@ contract B is A {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 19fd10bf65..38ce2eda98 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // constructor(), 20 wei
 // gas irOptimized: 212583
diff --git a/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol b/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol
index d50e2d95d7..7db64dafca 100644
--- a/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol
+++ b/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol
@@ -11,6 +11,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 7, 3
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 40de1b5092..2699c0afe8 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -38,7 +38,6 @@ contract test {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 270609
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 6b3f99deec..9ed56283a6 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -37,7 +37,6 @@ contract test {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 270609
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol b/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol
index cc6f0bb913..749e7c01bd 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol
@@ -36,7 +36,6 @@ contract Child is Base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // x() -> 0
 // y() -> 0
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol b/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol
index 9910318905..fa65755b85 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol
@@ -20,7 +20,6 @@ contract Child is Base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // x() -> 0
 // y() -> 0
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol
index 366c45a280..85302de766 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol
@@ -11,6 +11,5 @@ contract Child is Base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g(uint256): 4 -> 8
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol
index 673f3145f7..70ec4fd729 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol
@@ -24,7 +24,6 @@ contract Child is Base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g(uint256): 4 -> 12
 // h(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol
index a443585afe..169e1a6ba7 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol
@@ -27,7 +27,6 @@ contract Child is Base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g(uint256): 4 -> 8
 // k(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol
index ff29b9a914..7ff1eae99a 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol
@@ -11,6 +11,5 @@ contract Child is Base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g(uint256): 4 -> 8
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol
index 4d84dcd7a8..61b428303b 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol
@@ -16,6 +16,5 @@ contract C is V
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // b() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol b/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol
index 82dc5d513f..7dc726be2a 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol
@@ -17,6 +17,5 @@ contract B is A, I {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol b/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol
index 8f7914013a..218d1bca8e 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol
@@ -17,6 +17,5 @@ contract B is A, I {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index f422b43d92..7d566d94fc 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -17,7 +17,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
 // gas irOptimized: 111909
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol
index 4154baa9b9..63f2a13db9 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol
@@ -15,7 +15,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set(uint8,uint8,uint8): 1, 21, 42 -> 0, 0
 // get(uint8): 1 -> 21, 42
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol b/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol
index b152298b98..cb288e26dc 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol
@@ -18,7 +18,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 0, 42, 0, 0, 84, 21
 // h() -> 0, 42, 0, 0, 84, 17
diff --git a/test/libsolidity/semanticTests/functionCall/member_accessors.sol b/test/libsolidity/semanticTests/functionCall/member_accessors.sol
index 9bdade4a22..ad0b8a3e2e 100644
--- a/test/libsolidity/semanticTests/functionCall/member_accessors.sol
+++ b/test/libsolidity/semanticTests/functionCall/member_accessors.sol
@@ -15,7 +15,6 @@ contract test {
 // ====
 // allowNonExistingFunctions: true
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // data() -> 8
 // name() -> "Celina"
diff --git a/test/libsolidity/semanticTests/functionCall/multiple_functions.sol b/test/libsolidity/semanticTests/functionCall/multiple_functions.sol
index 834d20c3d2..63fac55e09 100644
--- a/test/libsolidity/semanticTests/functionCall/multiple_functions.sol
+++ b/test/libsolidity/semanticTests/functionCall/multiple_functions.sol
@@ -7,7 +7,6 @@ contract test {
 // ====
 // allowNonExistingFunctions: true
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // a() -> 0
 // b() -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol b/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol
index f46021bf25..ef746eb032 100644
--- a/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol
+++ b/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol
@@ -5,6 +5,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // run(bool,uint256): true, 0xcd -> 0xcd, true, 0
diff --git a/test/libsolidity/semanticTests/functionCall/named_args.sol b/test/libsolidity/semanticTests/functionCall/named_args.sol
index 171e0f2c71..4966f51860 100644
--- a/test/libsolidity/semanticTests/functionCall/named_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/named_args.sol
@@ -5,7 +5,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // b() -> 123
 // c() -> 123
diff --git a/test/libsolidity/semanticTests/functionCall/named_args_overload.sol b/test/libsolidity/semanticTests/functionCall/named_args_overload.sol
index 1de25455ed..0c31e47c50 100644
--- a/test/libsolidity/semanticTests/functionCall/named_args_overload.sol
+++ b/test/libsolidity/semanticTests/functionCall/named_args_overload.sol
@@ -28,7 +28,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // call(uint256): 0 -> 0
 // call(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol b/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
index b82c5f9b7d..beda5f9b18 100644
--- a/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
+++ b/test/libsolidity/semanticTests/functionCall/precompile_extcodesize_check.sol
@@ -27,7 +27,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // testHighLevel() -> true
 // testLowLevel() -> 0xc76596d400000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
index a3d93043de..1a120bebad 100644
--- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
+++ b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
@@ -16,7 +16,6 @@ contract Main {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 100264
diff --git a/test/libsolidity/semanticTests/functionCall/transaction_status.sol b/test/libsolidity/semanticTests/functionCall/transaction_status.sol
index 6251c833fc..309cb8ef18 100644
--- a/test/libsolidity/semanticTests/functionCall/transaction_status.sol
+++ b/test/libsolidity/semanticTests/functionCall/transaction_status.sol
@@ -5,7 +5,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() ->
 // g() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/value_test.sol b/test/libsolidity/semanticTests/functionCall/value_test.sol
index 46c566c6b7..c15e6332f1 100644
--- a/test/libsolidity/semanticTests/functionCall/value_test.sol
+++ b/test/libsolidity/semanticTests/functionCall/value_test.sol
@@ -4,7 +4,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(), 1 ether -> 1000000000000000000
diff --git a/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol b/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol
index 7fae986946..5052ad2b40 100644
--- a/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol
+++ b/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol
@@ -17,7 +17,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test1() -> left(0x26121ff0), left(0xe420264a), left(0x26121ff0), left(0xe420264a)
 // test2() -> left(0x26121ff0), left(0xe420264a), left(0x26121ff0), left(0xe420264a)
diff --git a/test/libsolidity/semanticTests/functionTypes/address_member.sol b/test/libsolidity/semanticTests/functionTypes/address_member.sol
index 029aac9500..91229be10a 100644
--- a/test/libsolidity/semanticTests/functionTypes/address_member.sol
+++ b/test/libsolidity/semanticTests/functionTypes/address_member.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 90572315268751552425567948436632610904688605307, 90572315268751552425567948436632610904688605307
diff --git a/test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol b/test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol
index 3347d9b779..da9c528fd6 100644
--- a/test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol
+++ b/test/libsolidity/semanticTests/functionTypes/comparison_operator_for_external_function_cleans_dirty_bits.sol
@@ -11,7 +11,6 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // EVMVersion: >=constantinople
 // ----
 // comparison_operators_for_external_function_pointers_with_dirty_bits() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol b/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
index da75ea0716..2e574726ef 100644
--- a/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
+++ b/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
@@ -75,7 +75,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // comparison_operators_for_external_functions() -> true
 // comparison_operators_for_local_external_function_pointers() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol b/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol
index 218afb00b4..409bb809eb 100644
--- a/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol
+++ b/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol
@@ -12,6 +12,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol b/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol
index 2bb710399b..4cf8be2040 100644
--- a/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol
+++ b/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol
@@ -22,7 +22,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // set() -> 7
 // ca() -> 7
diff --git a/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol b/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
index a7604872bc..7d3883882e 100644
--- a/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
+++ b/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
@@ -20,7 +20,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // x() -> 0
 // y() -> 0
diff --git a/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol b/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
index c4554740d3..d27004c7a8 100644
--- a/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
+++ b/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
@@ -23,6 +23,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[]): 0x20, 0x3, 0x1, 0x7, 0x3 -> 11
diff --git a/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol b/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol
index 3b9a70aa14..de6915a56e 100644
--- a/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol
+++ b/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol
@@ -7,6 +7,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // h(), 1 ether -> 1
diff --git a/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol b/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
index 64f55a4204..bb53b39ce0 100644
--- a/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
+++ b/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
@@ -26,7 +26,6 @@ contract Flow {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // success() -> false
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol b/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
index 2cb6428f7a..b476cbb47a 100644
--- a/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
+++ b/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
@@ -17,7 +17,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 7 -> 8
 // f2(uint256): 7 -> 8
diff --git a/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol b/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol
index b189a99092..a2bab40514 100644
--- a/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol
+++ b/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol
@@ -13,6 +13,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 7 -> 8
diff --git a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol
index 3a1dea9a1c..675c2d08b0 100644
--- a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol
+++ b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // runtime(uint256): 3 -> 6
 // initial() -> 4
diff --git a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol
index 7b371da319..d32db4d908 100644
--- a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol
+++ b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol
@@ -16,6 +16,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol b/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
index 5726860b9b..b34d466905 100644
--- a/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
@@ -20,6 +20,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test_function() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index dab82918a5..b05aa28bd1 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -25,7 +25,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // t() -> 9
 // gas irOptimized: 99064
diff --git a/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol b/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
index 19086df7a2..77b19f6d46 100644
--- a/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
@@ -29,6 +29,5 @@ contract Flow {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1, 2
diff --git a/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol b/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol
index 98624a0738..1ecd9eaf51 100644
--- a/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol
+++ b/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol
@@ -30,6 +30,5 @@ contract Flow {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1, 2
diff --git a/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol b/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol
index 43f54a52fe..fb34698bb8 100644
--- a/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol
+++ b/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol
@@ -9,6 +9,5 @@ contract Test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/getters/array_mapping_struct.sol b/test/libsolidity/semanticTests/getters/array_mapping_struct.sol
index 4aba178566..4e6e074b5a 100644
--- a/test/libsolidity/semanticTests/getters/array_mapping_struct.sol
+++ b/test/libsolidity/semanticTests/getters/array_mapping_struct.sol
@@ -19,7 +19,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // m(uint256,uint256): 0, 0 -> 0x00, 0x00
 // m(uint256,uint256): 1, 0 -> 1, 2
diff --git a/test/libsolidity/semanticTests/getters/arrays.sol b/test/libsolidity/semanticTests/getters/arrays.sol
index 184d6ce7ff..47c44fe653 100644
--- a/test/libsolidity/semanticTests/getters/arrays.sol
+++ b/test/libsolidity/semanticTests/getters/arrays.sol
@@ -6,7 +6,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // a(uint256,uint256): 0, 0 -> FAILURE
 // a(uint256,uint256): 1, 0 -> 3
diff --git a/test/libsolidity/semanticTests/getters/bytes.sol b/test/libsolidity/semanticTests/getters/bytes.sol
index 13c21daa35..24f384fa5c 100644
--- a/test/libsolidity/semanticTests/getters/bytes.sol
+++ b/test/libsolidity/semanticTests/getters/bytes.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // b() -> 0x20, 0x03, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/getters/mapping.sol b/test/libsolidity/semanticTests/getters/mapping.sol
index b54c028caa..5d6960638b 100644
--- a/test/libsolidity/semanticTests/getters/mapping.sol
+++ b/test/libsolidity/semanticTests/getters/mapping.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // x(uint256,uint256): 1, 2 -> 3
 // x(uint256,uint256): 0, 0 -> 0
diff --git a/test/libsolidity/semanticTests/getters/mapping_array_struct.sol b/test/libsolidity/semanticTests/getters/mapping_array_struct.sol
index 01c15320a7..c6a8884d99 100644
--- a/test/libsolidity/semanticTests/getters/mapping_array_struct.sol
+++ b/test/libsolidity/semanticTests/getters/mapping_array_struct.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // m(uint256,uint256): 0, 0 -> FAILURE
 // m(uint256,uint256): 1, 0 -> 1, 2
diff --git a/test/libsolidity/semanticTests/getters/mapping_of_string.sol b/test/libsolidity/semanticTests/getters/mapping_of_string.sol
index 319f0a655f..82951b10df 100644
--- a/test/libsolidity/semanticTests/getters/mapping_of_string.sol
+++ b/test/libsolidity/semanticTests/getters/mapping_of_string.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // x(string,uint256): 0x40, 0, 3, "abc" -> 1
 // x(string,uint256): 0x40, 1, 3, "abc" -> 2
diff --git a/test/libsolidity/semanticTests/getters/mapping_to_struct.sol b/test/libsolidity/semanticTests/getters/mapping_to_struct.sol
index c2d70a35a4..7dbddd56f1 100644
--- a/test/libsolidity/semanticTests/getters/mapping_to_struct.sol
+++ b/test/libsolidity/semanticTests/getters/mapping_to_struct.sol
@@ -14,7 +14,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // x(uint256,uint256): 1, 2 -> 3, 4, 5, 6
 // x(uint256,uint256): 0, 0 -> 0x00, 0x00, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/getters/string_and_bytes.sol b/test/libsolidity/semanticTests/getters/string_and_bytes.sol
index 0c81ad65be..9452ff97cd 100644
--- a/test/libsolidity/semanticTests/getters/string_and_bytes.sol
+++ b/test/libsolidity/semanticTests/getters/string_and_bytes.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // a() -> 0x20, 11, "hello world"
diff --git a/test/libsolidity/semanticTests/getters/struct_with_bytes.sol b/test/libsolidity/semanticTests/getters/struct_with_bytes.sol
index 92815d78ab..184310f7cc 100644
--- a/test/libsolidity/semanticTests/getters/struct_with_bytes.sol
+++ b/test/libsolidity/semanticTests/getters/struct_with_bytes.sol
@@ -15,6 +15,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // s() -> 7, 0x40, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol b/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol
index 59589be528..b1559a34f6 100644
--- a/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol
+++ b/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // s() -> 0x07, 0x40, 0x03, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/getters/value_types.sol b/test/libsolidity/semanticTests/getters/value_types.sol
index 3b0cbaa934..3d590ded16 100644
--- a/test/libsolidity/semanticTests/getters/value_types.sol
+++ b/test/libsolidity/semanticTests/getters/value_types.sol
@@ -22,7 +22,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // a() -> 3
 // b() -> 4
diff --git a/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol b/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol
index 030a3544cc..8e1965d002 100644
--- a/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol
+++ b/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol
@@ -5,6 +5,5 @@ contract A {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol b/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol
index 4e8610bb69..f14f5d2bd6 100644
--- a/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol
+++ b/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol
@@ -12,7 +12,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // a() -> 1
 // b() -> 1
diff --git a/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol b/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol
index b402ea8f27..a0d765d34c 100644
--- a/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol
+++ b/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol
@@ -16,7 +16,6 @@ contract A {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // readX() -> 3
 // readA() -> 3
diff --git a/test/libsolidity/semanticTests/immutable/getter.sol b/test/libsolidity/semanticTests/immutable/getter.sol
index c0997744ed..1824ae2970 100644
--- a/test/libsolidity/semanticTests/immutable/getter.sol
+++ b/test/libsolidity/semanticTests/immutable/getter.sol
@@ -2,6 +2,5 @@ contract C {
     uint immutable public x = 1;
 }
 // ====
-// compileViaYul: also
 // ----
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/immutable/getter_call_in_constructor.sol b/test/libsolidity/semanticTests/immutable/getter_call_in_constructor.sol
index ea59e8371a..2ef12c04aa 100644
--- a/test/libsolidity/semanticTests/immutable/getter_call_in_constructor.sol
+++ b/test/libsolidity/semanticTests/immutable/getter_call_in_constructor.sol
@@ -13,6 +13,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=tangerineWhistle
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/immutable/immutable_signed.sol b/test/libsolidity/semanticTests/immutable/immutable_signed.sol
index 7520487398..b47219976f 100644
--- a/test/libsolidity/semanticTests/immutable/immutable_signed.sol
+++ b/test/libsolidity/semanticTests/immutable/immutable_signed.sol
@@ -10,6 +10,5 @@ contract C {
     function g() internal pure returns (uint) { return 2; }
 }
 // ====
-// compileViaYul: also
 // ----
 // viaasm() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/immutable/inheritance.sol b/test/libsolidity/semanticTests/immutable/inheritance.sol
index 0e131535eb..d021f2ca4e 100644
--- a/test/libsolidity/semanticTests/immutable/inheritance.sol
+++ b/test/libsolidity/semanticTests/immutable/inheritance.sol
@@ -27,6 +27,5 @@ contract D is B, C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 4, 3, 2, 1
diff --git a/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol b/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol
index f046395d2b..069fa3d181 100644
--- a/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol
+++ b/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol
@@ -11,7 +11,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 7
 // callZ() -> 7
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index a66c86027c..107b810ab8 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -26,7 +26,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 3, 7, 5
 // gas irOptimized: 126136
diff --git a/test/libsolidity/semanticTests/immutable/read_in_ctor.sol b/test/libsolidity/semanticTests/immutable/read_in_ctor.sol
index 4b12013061..99988f72ec 100644
--- a/test/libsolidity/semanticTests/immutable/read_in_ctor.sol
+++ b/test/libsolidity/semanticTests/immutable/read_in_ctor.sol
@@ -12,6 +12,5 @@ contract A {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // readX() -> 3
diff --git a/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol b/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol
index 677b87d32d..347b4e9830 100644
--- a/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol
+++ b/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol
@@ -11,7 +11,6 @@ contract A {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // a() -> 4660
 // b() -> 0x0f0f
diff --git a/test/libsolidity/semanticTests/immutable/stub.sol b/test/libsolidity/semanticTests/immutable/stub.sol
index eda441c755..758fbc5973 100644
--- a/test/libsolidity/semanticTests/immutable/stub.sol
+++ b/test/libsolidity/semanticTests/immutable/stub.sol
@@ -10,6 +10,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 84, 23
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index 9dec409357..bfee62a9b5 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -14,7 +14,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(): 3 ->
 // gas irOptimized: 127454
diff --git a/test/libsolidity/semanticTests/inheritance/access_base_storage.sol b/test/libsolidity/semanticTests/inheritance/access_base_storage.sol
index 014a195344..4b11c3598a 100644
--- a/test/libsolidity/semanticTests/inheritance/access_base_storage.sol
+++ b/test/libsolidity/semanticTests/inheritance/access_base_storage.sol
@@ -24,7 +24,6 @@ contract Derived is Base {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // setData(uint256,uint256): 1, 2 -> true
 // getViaBase() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
index 6a9ff7c31a..4af02c4628 100644
--- a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
+++ b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
@@ -20,7 +20,6 @@ contract D {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1
 // gas irOptimized: 77051
diff --git a/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol b/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol
index 6bf594a97f..7b5e856d34 100644
--- a/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol
+++ b/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol
@@ -16,7 +16,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 2
 // h() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol b/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol
index c10180582f..87571f2d02 100644
--- a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol
+++ b/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol
@@ -17,6 +17,5 @@ contract C is B {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol b/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol
index 6f0d1e4493..23f01e4195 100644
--- a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol
+++ b/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol
@@ -24,7 +24,6 @@ contract C is A, B {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 10
 // h() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol b/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol
index a45fc23790..4c5468f038 100644
--- a/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol
+++ b/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol
@@ -23,7 +23,6 @@ contract Derived is Base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 3
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol b/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol
index 0373ca41a4..256367df45 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol
@@ -11,6 +11,5 @@ contract B is A {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function.sol b/test/libsolidity/semanticTests/inheritance/inherited_function.sol
index 655820edcf..471fe7943e 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function.sol
@@ -16,6 +16,5 @@ contract B is A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
index ed28477b2a..2f69413ad9 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
@@ -22,7 +22,6 @@ contract B {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // g() -> 42
 // gas irOptimized: 80813
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol
index a9956cc80f..8081ab5a23 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol
@@ -18,6 +18,5 @@ contract B is A {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 23
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index 2ce71c31fe..15344160cf 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -22,7 +22,6 @@ contract B {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // g() -> 42
 // gas irOptimized: 101944
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
index 3756a4e97c..8c0ba09e91 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
@@ -16,6 +16,5 @@ contract B {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // g() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol
index 36e4d33e57..e304fc2817 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol
@@ -17,6 +17,5 @@ contract B is A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
index a400531ca8..212df0b45e 100644
--- a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
+++ b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
@@ -19,7 +19,6 @@ contract A {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // g(int256): -1 -> -1
 // gas legacy: 103494
diff --git a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol
index ee0c1dc16e..b54f9bc27e 100644
--- a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol
+++ b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol
@@ -14,6 +14,5 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 3
diff --git a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol
index 7dc307415a..5479960ac0 100644
--- a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol
+++ b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol
@@ -14,6 +14,5 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 10
diff --git a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol
index 5af1a28f0d..70be159e88 100644
--- a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol
+++ b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol
@@ -15,7 +15,6 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g(bool): true -> 3
 // g(bool): false -> 10
diff --git a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol
index e564c560c6..054d9ce998 100644
--- a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol
+++ b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol
@@ -15,6 +15,5 @@ contract Derived is Base {
 contract Final is Derived(4) {}
 
 // ====
-// compileViaYul: also
 // ----
 // m_i() -> 4
diff --git a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol
index 0ae3e1ce49..7e2b7265a5 100644
--- a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol
+++ b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol
@@ -20,6 +20,5 @@ contract Derived is Base, Base1 {
 contract Final is Derived(4) {}
 
 // ====
-// compileViaYul: also
 // ----
 // m_i() -> 4
diff --git a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol
index def9963445..6c69b279b0 100644
--- a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol
+++ b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol
@@ -20,6 +20,5 @@ contract Derived is Base, Base1 {
 contract Final is Derived(4) {}
 
 // ====
-// compileViaYul: also
 // ----
 // m_i() -> 4
diff --git a/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol b/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol
index 6c2a4103da..c4b6774538 100644
--- a/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol
@@ -32,6 +32,5 @@ contract D is B, C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 15
diff --git a/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol b/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol
index 3bf4c590df..47978ddbc7 100644
--- a/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol
+++ b/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol
@@ -35,6 +35,5 @@ contract D is B, C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 15
diff --git a/test/libsolidity/semanticTests/inheritance/super_overload.sol b/test/libsolidity/semanticTests/inheritance/super_overload.sol
index 96ef080028..1bb36ca2ab 100644
--- a/test/libsolidity/semanticTests/inheritance/super_overload.sol
+++ b/test/libsolidity/semanticTests/inheritance/super_overload.sol
@@ -24,7 +24,6 @@ contract C is A, B {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 10
 // h() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index b38e9a6ad4..f7251bdbd7 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -39,7 +39,6 @@ contract Main {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 22 wei ->
 // gas irOptimized: 277680
diff --git a/test/libsolidity/semanticTests/inlineAssembly/basefee_berlin_function.sol b/test/libsolidity/semanticTests/inlineAssembly/basefee_berlin_function.sol
index 81c1ee4316..aba6b44b9c 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/basefee_berlin_function.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/basefee_berlin_function.sol
@@ -15,7 +15,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // EVMVersion: <=berlin
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol
index 91eff04e09..69c734953f 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol
@@ -5,6 +5,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[2][]): 0x0, 1, 8, 7, 6, 5 -> 0x20, 2, 8, 7, 6, 5
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol
index 3c04378198..038d622a58 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol
@@ -5,6 +5,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[2][2]): 0x0, 8, 7, 6, 5 -> 8, 7, 6, 5
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol
index bdb3ba51ae..21b52f84ea 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol
@@ -8,6 +8,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256[2][]): 0x20, 2, 1, 2, 3, 4 -> 0x44, 2, 0x84
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol
index f17dd975ca..a7bbf73fbb 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol
@@ -5,6 +5,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0, 0 -> 0x20, 3, 0x5754f80000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol
index 1b559f27b4..1385886e86 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 4, 0x26121ff000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol
index 559421f780..04ec0b614f 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol
@@ -9,7 +9,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // lenBytesRead(bytes): 0x20, 4, "abcd" -> 4
 // lenBytesRead(bytes): 0x20, 0, "abcd" -> 0x00
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol
index d819ff68b0..a9b82d11e0 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol
@@ -12,7 +12,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0, 0 -> 0x44
 // f(bytes): 0x22, 0, 0, 0 -> 0x46
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol
index 036c1af320..6375055fe2 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol
@@ -13,7 +13,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,bytes,uint256): 7, 0x60, 8, 2, 0 -> 8, 0x14
 // f(uint256,bytes,uint256): 0, 0, 0 -> 8, 0x14
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol
index bc8f9ffb73..abbed4f219 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol
@@ -13,6 +13,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f((uint256),(uint256,uint256)): 0x42, 0x07, 0x77 -> 0x07, 0x42
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol
index 56a67f3832..062ac64f30 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol
@@ -14,7 +14,6 @@ contract C {
   function i() public pure returns(uint256) { abi.decode(msg.data[4:], (S)); return 0x42; }
 }
 // ====
-// compileViaYul: also
 // ----
 // g(): 0xCAFFEE, 0x42, 0x21 -> 0x42, 0x21
 // g(): 0xCAFFEE, 0x4242, 0x2121 -> FAILURE
diff --git a/test/libsolidity/semanticTests/inlineAssembly/chainid.sol b/test/libsolidity/semanticTests/inlineAssembly/chainid.sol
index 8e6a368350..f93d87c99e 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/chainid.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/chainid.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=istanbul
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol b/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol
index 93b9566c28..130ebcd33d 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol
@@ -16,6 +16,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2, left(0xabcd), left(0x616263), true, 0x1212121212121212121212121212121212121212
diff --git a/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol b/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol
index ccf213f28a..91644d1ace 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol
@@ -24,6 +24,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2, left(0xabcd), left(0x616263), true, 0x1212121212121212121212121212121212121212
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
index 7c3ad6d50d..e3a6812dbb 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
@@ -13,7 +13,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // testYul() -> 0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b
 // testSol() -> 0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol
index 7550e77855..9010a9cde9 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol
@@ -12,7 +12,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // testYul(address): 0x1234567890 -> 0x1234567890
 // testYul(address): 0xC0FFEE3EA7 -> 0xC0FFEE3EA7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol
index 99ba2370f7..371f1be58e 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol
@@ -17,7 +17,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // testYul() -> 0xe16b4a9b
 // testSol() -> 0xe16b4a9b
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol
index 3bec26382d..b65e9e2cd0 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol
@@ -12,7 +12,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // testYul(uint32): 0x12345678 -> 0x12345678
 // testYul(uint32): 0xABCDEF00 -> 0xABCDEF00
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol b/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol
index f21dddfb41..4047249339 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol
@@ -7,6 +7,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol b/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
index 21fbdb28af..18e57ede7c 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
@@ -7,7 +7,6 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
index ca6b39f86b..5d917437e8 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
@@ -23,6 +23,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x1, 0x4, 0x7, 0x10
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol
index e869a97466..d074e677ff 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol
@@ -18,7 +18,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> 1
 // f(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol
index 15f9f6abbe..c4af2ea5fe 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol
@@ -23,7 +23,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> 0, 2, 0
 // f(uint256): 1 -> 1, 4, 3
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
index 52870e0856..48cceeb996 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
@@ -17,6 +17,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1, 2, 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
index a934d4baea..caf441dd46 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
@@ -20,6 +20,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x1, 0x2, 0x7, 0x10
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
index 648b6872e4..675ec3b1d5 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
@@ -19,6 +19,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1, 2, 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol
index 785b42aa9f..852f10ac83 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol
@@ -10,7 +10,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> 0
 // f(uint256): 1 -> 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol
index 48aafefe2e..f74fbbc638 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol
@@ -29,7 +29,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol
index 1efae8b683..448cc39914 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol
@@ -11,6 +11,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 0x20, 0x5, "12345"
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol
index 9f621e23f5..58c77a81d5 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol
@@ -9,6 +9,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 45
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol
index aff4dc7aaf..c3c9297bc0 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol
@@ -20,7 +20,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> 1
 // f(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol
index 819ab391c2..d81bff29e1 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol
@@ -18,7 +18,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
 // z() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol
index d94ac26379..039f133ecd 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol
@@ -19,7 +19,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
 // z() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol
index fcc6fcc64a..5544d90efb 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol
@@ -14,6 +14,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol
index f482b650cf..687b1d914a 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol
@@ -20,7 +20,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
 // a() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol
index 1cc2dfda4d..e4d8419b48 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol
@@ -17,7 +17,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 0 -> 2
 // f(uint256): 1 -> 8
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol
index d7651f273d..b181f82599 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol
@@ -9,6 +9,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 7, "abcdef"
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol b/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol
index d23413bacd..b9aa70aeda 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol
@@ -11,6 +11,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0, 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
index d4034f10be..8bd6d4df25 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
@@ -7,6 +7,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol
index 59b32a4c9e..df0f5fd38f 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol
@@ -11,6 +11,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol
index 1e9847be35..c236a9683a 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol
@@ -11,6 +11,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> false
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol
index 545ad36177..c428030a5d 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol
@@ -16,6 +16,5 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // val() -> true
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol
index 009b514e04..c0b7bfed41 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(string): "" -> false
 // f(string): 0x20, 5, "hello" -> false
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
index 85a93b3dc8..ccf0a3bf6e 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
@@ -23,7 +23,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0xcdb56c384a9682c600315e3470157a4cf7638d0d33e9dae5c40ffd2644fc5a80
 // gas irOptimized: 22239
diff --git a/test/libsolidity/semanticTests/inlineAssembly/leave.sol b/test/libsolidity/semanticTests/inlineAssembly/leave.sol
index 7efabfcda9..8dff599284 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/leave.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/leave.sol
@@ -12,6 +12,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/selfbalance.sol b/test/libsolidity/semanticTests/inlineAssembly/selfbalance.sol
index b166788339..1637de5b9e 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/selfbalance.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/selfbalance.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=istanbul
-// compileViaYul: also
 // ----
 // f(), 254 wei -> 254
diff --git a/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol b/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol
index 862088e172..ea24ec6c41 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // g() -> 7, 3
diff --git a/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol b/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol
index a1f9874eb7..3ba4a4aab5 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol
@@ -26,7 +26,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // get() -> 0
 // mappingAccess(uint256): 1 -> 0, 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol b/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol
index 4741538b62..eb57b80926 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol
@@ -8,6 +8,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1, 0
diff --git a/test/libsolidity/semanticTests/integer/basic.sol b/test/libsolidity/semanticTests/integer/basic.sol
index b7272365ad..b03cb20f24 100644
--- a/test/libsolidity/semanticTests/integer/basic.sol
+++ b/test/libsolidity/semanticTests/integer/basic.sol
@@ -20,6 +20,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // basic() -> true
diff --git a/test/libsolidity/semanticTests/integer/int.sol b/test/libsolidity/semanticTests/integer/int.sol
index 13db801ec1..770fa0be71 100644
--- a/test/libsolidity/semanticTests/integer/int.sol
+++ b/test/libsolidity/semanticTests/integer/int.sol
@@ -234,7 +234,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // intMinA() -> true
 // intMinB() -> true
diff --git a/test/libsolidity/semanticTests/integer/many_local_variables.sol b/test/libsolidity/semanticTests/integer/many_local_variables.sol
index 4f05c9d8f6..0f3f0f642e 100644
--- a/test/libsolidity/semanticTests/integer/many_local_variables.sol
+++ b/test/libsolidity/semanticTests/integer/many_local_variables.sol
@@ -7,6 +7,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // run(uint256,uint256,uint256): 0x1000, 0x10000, 0x100000 -> 0x121121
diff --git a/test/libsolidity/semanticTests/integer/small_signed_types.sol b/test/libsolidity/semanticTests/integer/small_signed_types.sol
index b807de5518..e1173b9555 100644
--- a/test/libsolidity/semanticTests/integer/small_signed_types.sol
+++ b/test/libsolidity/semanticTests/integer/small_signed_types.sol
@@ -5,6 +5,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // run() -> 200
diff --git a/test/libsolidity/semanticTests/integer/uint.sol b/test/libsolidity/semanticTests/integer/uint.sol
index 1855ae4b7e..2fa6028063 100644
--- a/test/libsolidity/semanticTests/integer/uint.sol
+++ b/test/libsolidity/semanticTests/integer/uint.sol
@@ -233,7 +233,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // uintMinA() -> true
 // uintMinB() -> true
diff --git a/test/libsolidity/semanticTests/interfaceID/homer.sol b/test/libsolidity/semanticTests/interfaceID/homer.sol
index df95816fe3..49b60b12f1 100644
--- a/test/libsolidity/semanticTests/interfaceID/homer.sol
+++ b/test/libsolidity/semanticTests/interfaceID/homer.sol
@@ -31,7 +31,6 @@ contract Homer is ERC165, Simpson {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // supportsInterface(bytes4): left(0x01ffc9a0) -> false
 // supportsInterface(bytes4): left(0x01ffc9a7) -> true
diff --git a/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol b/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol
index 5849e61828..9bf0e3c598 100644
--- a/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol
+++ b/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol
@@ -31,7 +31,6 @@ contract Homer is ERC165, Simpson {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // supportsInterface(bytes4): left(0x01ffc9a0) -> false
 // supportsInterface(bytes4): left(0x01ffc9a7) -> true
diff --git a/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol b/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol
index 6509c884b2..51d48f497c 100644
--- a/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol
+++ b/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol
@@ -16,7 +16,6 @@ contract Test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // hello_world() -> left(0xc6be8b58)
 // hello_world_with_event() -> left(0xc6be8b58)
diff --git a/test/libsolidity/semanticTests/interfaceID/interfaces.sol b/test/libsolidity/semanticTests/interfaceID/interfaces.sol
index 9a203fb762..77cf837072 100644
--- a/test/libsolidity/semanticTests/interfaceID/interfaces.sol
+++ b/test/libsolidity/semanticTests/interfaceID/interfaces.sol
@@ -53,7 +53,6 @@ contract Test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // hello() -> left(0x19ff1d21)
 // world() -> left(0xdf419679)
diff --git a/test/libsolidity/semanticTests/interfaceID/lisa.sol b/test/libsolidity/semanticTests/interfaceID/lisa.sol
index 7c50b5f161..96dd24fadb 100644
--- a/test/libsolidity/semanticTests/interfaceID/lisa.sol
+++ b/test/libsolidity/semanticTests/interfaceID/lisa.sol
@@ -41,7 +41,6 @@ contract Lisa is ERC165MappingImplementation, Simpson {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // supportsInterface(bytes4): left(0x01ffc9a0) -> false
 // supportsInterface(bytes4): left(0x01ffc9a7) -> true
diff --git a/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol b/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
index c535df5285..04fcfbf276 100644
--- a/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
+++ b/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
@@ -41,7 +41,6 @@ contract Lisa is ERC165MappingImplementation, Simpson {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // supportsInterface(bytes4): left(0x01ffc9a0) -> false
 // supportsInterface(bytes4): left(0x01ffc9a7) -> true
diff --git a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
index 95f831e243..d241243a0f 100644
--- a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
+++ b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
@@ -34,7 +34,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // convertParent() -> 1
 // gas irOptimized: 85524
diff --git a/test/libsolidity/semanticTests/isoltestFormatting.sol b/test/libsolidity/semanticTests/isoltestFormatting.sol
index 9206eb7c1c..88ec15f572 100644
--- a/test/libsolidity/semanticTests/isoltestFormatting.sol
+++ b/test/libsolidity/semanticTests/isoltestFormatting.sol
@@ -10,7 +10,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 4, 11, 0x0111, 0x333333, 2222222222222222222
 // g() -> 0x10, 0x0100, 0x0101, 0x333333, 2222222222222222222
diff --git a/test/libsolidity/semanticTests/isoltestTesting/account.sol b/test/libsolidity/semanticTests/isoltestTesting/account.sol
index 0703f4a37b..1cefbbf192 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/account.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/account.sol
@@ -4,7 +4,6 @@ contract AccountBuiltinTest {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // account: 0 -> 0x1212121212121212121212121212120000000012
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index b02e48804f..c0e682de41 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -15,7 +15,6 @@ contract ClientReceipt {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 2000 wei ->
 // gas irOptimized: 183544
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol
index 5b63249108..42d58e38d5 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol
@@ -2,7 +2,6 @@ contract ClientReceipt {
     constructor() payable {}
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 1000 wei ->
 // balance -> 1000
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol
index f7d62afe55..6c263a010c 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol
@@ -2,7 +2,6 @@ contract ClientReceipt {
     constructor() payable {}
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 1 ether ->
 // balance -> 1000000000000000000
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol
index b89977035f..c4ca10e241 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol
@@ -1,7 +1,6 @@
 contract ClientReceipt {
 }
 // ====
-// compileViaYul: also
 // ----
 // balance -> 0
 // balance: 0x0000000000000000000000000000000000000000 -> 0
diff --git a/test/libsolidity/semanticTests/isoltestTesting/builtins.sol b/test/libsolidity/semanticTests/isoltestTesting/builtins.sol
index c34cfa4e46..94f66b626e 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/builtins.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/builtins.sol
@@ -1,6 +1,5 @@
 contract SmokeTest {
 }
 // ====
-// compileViaYul: also
 // ----
 // isoltest_builtin_test -> 0x1234
diff --git a/test/libsolidity/semanticTests/isoltestTesting/effects.sol b/test/libsolidity/semanticTests/isoltestTesting/effects.sol
index 0f00e5de83..e190973615 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/effects.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/effects.sol
@@ -1,7 +1,6 @@
 contract SmokeTest {
 }
 // ====
-// compileViaYul: also
 // ----
 // isoltest_side_effects_test -> 0
 // isoltest_side_effects_test: 0x1234 -> 0x1234
diff --git a/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol b/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol
index 205a4ae3dd..922f826eb4 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol
@@ -7,6 +7,5 @@ contract C {
 // test expectations but unfortunately it can only be triggered manually. It does not test anything
 // unless you introduce a difference in expectations to force isoltest to reformat them.
 // ====
-// compileViaYul: also
 // ----
 // f(string): 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" -> 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" # Input/Output: "😃😃😃😃" #
diff --git a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol b/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol
index 8fd5a635e9..0883d76fd3 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol
@@ -1,6 +1,5 @@
 contract StorageEmpty {
 }
 // ====
-// compileViaYul: also
 // ----
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol b/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol
index 9c8a582e75..15d6d0a588 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol
@@ -3,7 +3,6 @@ contract StorageNotEmpty {
     function set(uint256 _a) public { x = _a; }
 }
 // ====
-// compileViaYul: also
 // ----
 // storageEmpty -> 1
 // set(uint256): 1 ->
diff --git a/test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol b/test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol
index 6cd9045b48..014f6acf28 100644
--- a/test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol
+++ b/test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 4, "abcd" -> 0x6100000000000000000000000000000000000000000000000000000000000000, 0x6100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/libraries/bound_returning_calldata_external.sol b/test/libsolidity/semanticTests/libraries/bound_returning_calldata_external.sol
index e3c6d9b391..c194af882f 100644
--- a/test/libsolidity/semanticTests/libraries/bound_returning_calldata_external.sol
+++ b/test/libsolidity/semanticTests/libraries/bound_returning_calldata_external.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // library: D
 // f(bytes): 0x20, 4, "abcd" -> 0x6100000000000000000000000000000000000000000000000000000000000000, 0x6100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/libraries/bound_to_calldata.sol b/test/libsolidity/semanticTests/libraries/bound_to_calldata.sol
index b80d2fdc78..38b31620cb 100644
--- a/test/libsolidity/semanticTests/libraries/bound_to_calldata.sol
+++ b/test/libsolidity/semanticTests/libraries/bound_to_calldata.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 4, "abcd" -> 0x6100000000000000000000000000000000000000000000000000000000000000, 0x6100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/libraries/bound_to_calldata_external.sol b/test/libsolidity/semanticTests/libraries/bound_to_calldata_external.sol
index 33a53f48f6..1c1f0457f1 100644
--- a/test/libsolidity/semanticTests/libraries/bound_to_calldata_external.sol
+++ b/test/libsolidity/semanticTests/libraries/bound_to_calldata_external.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // library: D
 // f(bytes): 0x20, 4, "abcd" -> 0x6100000000000000000000000000000000000000000000000000000000000000, 0x6100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol b/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol
index a0843bfcb9..5592b8426e 100644
--- a/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol
+++ b/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol
@@ -20,7 +20,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol b/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol
index 81268af7a5..19b395c766 100644
--- a/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol
+++ b/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol b/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol
index 821aebea75..5baed9427e 100644
--- a/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol
+++ b/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol b/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol
index 6d073c627c..ff0a2b7ff0 100644
--- a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol
@@ -22,6 +22,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x0a
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol b/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol
index 514cea6ba2..3fc52ce51c 100644
--- a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol
@@ -11,6 +11,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // foo() -> 3
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function.sol
index 8e8d561e9b..4b3a78864d 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function.sol
@@ -18,6 +18,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol
index a6ea94fedb..460b5c7b81 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol
@@ -23,6 +23,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol
index ffb854e07a..7ca3e1d576 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // foo(address,address): 0x111122223333444455556666777788889999aAaa, 0x111122223333444455556666777788889999aAaa -> true
 // foo(address,address): 0x111122223333444455556666777788889999aAaa, 0x0000000000000000000000000000000000000000 -> false
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol
index bfc5a3d629..2f06a91c70 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol
@@ -15,7 +15,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // useTransfer(address): 0x111122223333444455556666777788889999aAaa ->
 // useSend(address): 0x111122223333444455556666777788889999aAaa ->
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol
index c684cc77f3..c7d975004c 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() ->
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol
index 33f5535ce8..c68b1983a6 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // foo(bool,bool): true, true -> false
 // foo(bool,bool): true, false -> true
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol
index a9566ca59f..75a95e9275 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol
@@ -16,6 +16,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 42
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol
index 0ea7e4144d..098d8193c5 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol
@@ -16,6 +16,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // secondItem() -> 0x22
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol
index 93c5fd4a00..76c2792b0e 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol
@@ -15,7 +15,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // equalsA(uint256): 0 -> true
 // equalsA(uint256): 1 -> false
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol
index f68cb4e218..61b2bad81a 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol
@@ -18,6 +18,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol
index 8429110795..cdc91e7533 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol
@@ -16,6 +16,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // secondItem() -> 0x22
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol
index 02db545720..457535bbfe 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol
@@ -12,6 +12,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // sum(bytes2,bytes2): left(0x1100), left(0x0022) -> left(0x1122)
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol
index 75c4e4cb86..dbcf695650 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol
@@ -17,6 +17,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol
index 258e4940c4..028a0bf4a0 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol
@@ -12,6 +12,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // foo(uint256,uint256): 8, 42 -> 50
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol
index 47e58bb324..3ab5aca3ba 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol
@@ -17,6 +17,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 42
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol
index 519eafddda..7d7f5f6515 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol
@@ -17,6 +17,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol
index 632d527092..bacf096dc6 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol
@@ -20,7 +20,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // double42() -> 84
 // doubleABC() -> 0x20, 6, "abcabc"
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol
index ec1250a629..e2dc3dbbd3 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // mapValue(uint256): 42 -> 0x24
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol
index 6c15fa7351..33b7a62add 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test(string): 0x20, 3, "def" -> 0x40, 0x80, 3, "def", 3, "def"
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol
index d8d4205128..d9ced18091 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol
@@ -13,6 +13,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // secondChar() -> 98
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
index e9806aa4f9..63161eb8c2 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
@@ -23,6 +23,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol
index bc2f2da0a4..c730a48236 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol
@@ -12,6 +12,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 66
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
index 1406e01174..381d2bb5f7 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
@@ -23,6 +23,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index 9cf5f65ff2..b0d1c16b2b 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -21,7 +21,6 @@ contract Test {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: Lib
 // f() -> 4, 0x11
diff --git a/test/libsolidity/semanticTests/libraries/library_address.sol b/test/libsolidity/semanticTests/libraries/library_address.sol
index e8e60bc044..6ca0644450 100644
--- a/test/libsolidity/semanticTests/libraries/library_address.sol
+++ b/test/libsolidity/semanticTests/libraries/library_address.sol
@@ -36,7 +36,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // library: L
 // addr() -> false
diff --git a/test/libsolidity/semanticTests/libraries/library_address_homestead.sol b/test/libsolidity/semanticTests/libraries/library_address_homestead.sol
index 256b43d3ae..1c5b49ae1f 100644
--- a/test/libsolidity/semanticTests/libraries/library_address_homestead.sol
+++ b/test/libsolidity/semanticTests/libraries/library_address_homestead.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // g(uint256,uint256): 1, 1 -> true
diff --git a/test/libsolidity/semanticTests/libraries/library_address_via_module.sol b/test/libsolidity/semanticTests/libraries/library_address_via_module.sol
index effcd13c8e..4c96469024 100644
--- a/test/libsolidity/semanticTests/libraries/library_address_via_module.sol
+++ b/test/libsolidity/semanticTests/libraries/library_address_via_module.sol
@@ -40,7 +40,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // library: "a.sol":L
 // addr() -> false
diff --git a/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol b/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
index 6841221f41..a49dc602ad 100644
--- a/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
+++ b/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
@@ -6,7 +6,6 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: false
 // EVMVersion: >=homestead
 // ----
diff --git a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_pure.sol b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_pure.sol
index 61e182843b..b540e9a63f 100644
--- a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_pure.sol
+++ b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_pure.sol
@@ -25,7 +25,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // library: L
 // f() -> 23
diff --git a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_needed.sol b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_needed.sol
index 169738029b..3c5274990f 100644
--- a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_needed.sol
+++ b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_needed.sol
@@ -25,7 +25,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // library: L
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_not_needed.sol b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_not_needed.sol
index 9d31db25b7..2d4e6468e0 100644
--- a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_not_needed.sol
+++ b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_not_needed.sol
@@ -24,7 +24,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // library: L
 // f() -> 84
diff --git a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_staticcall.sol b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_staticcall.sol
index 2af36bb215..d8cdb9a4d4 100644
--- a/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_staticcall.sol
+++ b/test/libsolidity/semanticTests/libraries/library_delegatecall_guard_view_staticcall.sol
@@ -24,7 +24,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // library: L
 // f() -> 42
diff --git a/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol b/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
index 31a64ce206..d08db3cf4e 100644
--- a/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
+++ b/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
@@ -11,6 +11,5 @@ contract Tsra {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/library_function_selectors.sol b/test/libsolidity/semanticTests/libraries/library_function_selectors.sol
index e4347d15ab..baeb5ceddc 100644
--- a/test/libsolidity/semanticTests/libraries/library_function_selectors.sol
+++ b/test/libsolidity/semanticTests/libraries/library_function_selectors.sol
@@ -23,7 +23,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // library: L
 // f() -> true, true, 7
diff --git a/test/libsolidity/semanticTests/libraries/library_function_selectors_struct.sol b/test/libsolidity/semanticTests/libraries/library_function_selectors_struct.sol
index e57f5ce1a1..186fad7dbc 100644
--- a/test/libsolidity/semanticTests/libraries/library_function_selectors_struct.sol
+++ b/test/libsolidity/semanticTests/libraries/library_function_selectors_struct.sol
@@ -21,7 +21,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // library: L
 // f() -> true, true, 42
diff --git a/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol b/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol
index bb3c26f8cd..9c942f0ff2 100644
--- a/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol
+++ b/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: Lib
 // f() -> 123
diff --git a/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol b/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
index d566f71801..24ed78e0eb 100644
--- a/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
+++ b/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
@@ -14,7 +14,6 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: Lib
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/library_stray_values.sol b/test/libsolidity/semanticTests/libraries/library_stray_values.sol
index 1692b018a7..61f52b86c8 100644
--- a/test/libsolidity/semanticTests/libraries/library_stray_values.sol
+++ b/test/libsolidity/semanticTests/libraries/library_stray_values.sol
@@ -8,7 +8,6 @@ contract Test {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: Lib
 // f(uint256): 33 -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol b/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
index 9965a38158..744ee443f8 100644
--- a/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
+++ b/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
@@ -14,6 +14,5 @@ contract Tsra {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol b/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
index 06cfd6e1a1..8a82350dc4 100644
--- a/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
@@ -22,7 +22,6 @@ contract Test {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: Lib
 // set(uint256,uint256): 1, 42 -> 0
diff --git a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
index dd2b2953fa..a8188fcc65 100644
--- a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
@@ -26,7 +26,6 @@ contract Test {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: Lib
 // set(bool,uint256,uint256): true, 1, 42 -> 0
diff --git a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
index 23f851279a..6ddad7979b 100644
--- a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
+++ b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
@@ -24,7 +24,6 @@ contract Test {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: Lib
 // f() -> 0, 0x2a, 0, 0, 0x15, 0x54
diff --git a/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol b/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
index 6b0488f06f..5e78713b7e 100644
--- a/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
+++ b/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: L
 // f(): 27 -> 7
diff --git a/test/libsolidity/semanticTests/libraries/stub.sol b/test/libsolidity/semanticTests/libraries/stub.sol
index 4ed1f26734..15934fe1e7 100644
--- a/test/libsolidity/semanticTests/libraries/stub.sol
+++ b/test/libsolidity/semanticTests/libraries/stub.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // g(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/libraries/stub_internal.sol b/test/libsolidity/semanticTests/libraries/stub_internal.sol
index 4634d4e7af..ef29cacbbf 100644
--- a/test/libsolidity/semanticTests/libraries/stub_internal.sol
+++ b/test/libsolidity/semanticTests/libraries/stub_internal.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g(uint256): 1 -> 1
 // g(uint256): 2 -> 4
diff --git a/test/libsolidity/semanticTests/libraries/using_for_by_name.sol b/test/libsolidity/semanticTests/libraries/using_for_by_name.sol
index 8a84c8aaac..f9add4cb83 100644
--- a/test/libsolidity/semanticTests/libraries/using_for_by_name.sol
+++ b/test/libsolidity/semanticTests/libraries/using_for_by_name.sol
@@ -9,7 +9,6 @@ contract C {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: D
 // f(uint256): 7 -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol b/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol
index ffa07acc1f..500aaa865c 100644
--- a/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol
+++ b/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol
@@ -8,7 +8,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // library: D
 // f(uint256): 9 -> 18
diff --git a/test/libsolidity/semanticTests/libraries/using_for_overload.sol b/test/libsolidity/semanticTests/libraries/using_for_overload.sol
index 54cfe0ce10..5bc0bc948c 100644
--- a/test/libsolidity/semanticTests/libraries/using_for_overload.sol
+++ b/test/libsolidity/semanticTests/libraries/using_for_overload.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: D
 // f(uint256): 7 -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol b/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol
index 2749fb4447..0298051731 100644
--- a/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol
+++ b/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol
@@ -22,6 +22,5 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 7, 7
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index 6304e12d8c..be291971bf 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -18,7 +18,6 @@ contract Test {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
index 86e7fa3d75..d8ef57ef5f 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
@@ -16,7 +16,6 @@ contract Test {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
diff --git a/test/libsolidity/semanticTests/libraries/using_library_structs.sol b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
index 1f1ac6eb0c..888c9c0486 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_structs.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
@@ -19,7 +19,6 @@ contract Test {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: Lib
 // f() -> 7, 8
diff --git a/test/libsolidity/semanticTests/literals/denominations.sol b/test/libsolidity/semanticTests/literals/denominations.sol
index 8600e46b91..9aec493cd1 100644
--- a/test/libsolidity/semanticTests/literals/denominations.sol
+++ b/test/libsolidity/semanticTests/literals/denominations.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1000000001000000001
diff --git a/test/libsolidity/semanticTests/literals/escape.sol b/test/libsolidity/semanticTests/literals/escape.sol
index 54108ec53e..c198f21dc4 100644
--- a/test/libsolidity/semanticTests/literals/escape.sol
+++ b/test/libsolidity/semanticTests/literals/escape.sol
@@ -9,6 +9,5 @@ contract C
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2, 0x5c00000000000000000000000000000000000000000000000000000000000000, 0x5c00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/literals/ether.sol b/test/libsolidity/semanticTests/literals/ether.sol
index f640ddff35..d2942a0657 100644
--- a/test/libsolidity/semanticTests/literals/ether.sol
+++ b/test/libsolidity/semanticTests/literals/ether.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1000000000000000000
diff --git a/test/libsolidity/semanticTests/literals/gwei.sol b/test/libsolidity/semanticTests/literals/gwei.sol
index e154415ad7..3058ee720e 100644
--- a/test/libsolidity/semanticTests/literals/gwei.sol
+++ b/test/libsolidity/semanticTests/literals/gwei.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1000000000
diff --git a/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol b/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol
index 5b703b614e..d10904cfaf 100644
--- a/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol
+++ b/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
diff --git a/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol b/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol
index 118068654b..b14297a94a 100644
--- a/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol
+++ b/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 32, 5, left(0x123456789A)
diff --git a/test/libsolidity/semanticTests/literals/scientific_notation.sol b/test/libsolidity/semanticTests/literals/scientific_notation.sol
index 492d87de60..b03adee393 100644
--- a/test/libsolidity/semanticTests/literals/scientific_notation.sol
+++ b/test/libsolidity/semanticTests/literals/scientific_notation.sol
@@ -26,7 +26,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 20000000000
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol b/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
index 22d61c6c51..59c9f8b820 100644
--- a/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
+++ b/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
@@ -13,7 +13,6 @@ contract TestTernary
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> FAILURE, hex"4e487b71", 0x11
 // h() -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/literals/wei.sol b/test/libsolidity/semanticTests/literals/wei.sol
index 1fbf958620..bf115f1dce 100644
--- a/test/libsolidity/semanticTests/literals/wei.sol
+++ b/test/libsolidity/semanticTests/literals/wei.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol b/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol
index ec711ef3eb..e69c93e46b 100644
--- a/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol
+++ b/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol
@@ -12,6 +12,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol b/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
index 7ad6b61672..aa0a4eb79e 100644
--- a/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
+++ b/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
@@ -9,7 +9,6 @@ contract Test {
     function nestedStat() public returns (uint[3][7] memory) { stat(); }
 }
 // ====
-// compileViaYul: also
 // ----
 // stat() -> 0, 0, 0, 0, 0
 // dyn() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/memoryManagement/return_variable.sol b/test/libsolidity/semanticTests/memoryManagement/return_variable.sol
index 501fea0f13..71fbcd8faf 100644
--- a/test/libsolidity/semanticTests/memoryManagement/return_variable.sol
+++ b/test/libsolidity/semanticTests/memoryManagement/return_variable.sol
@@ -25,6 +25,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x0500, 0x0500, 0x0a00
diff --git a/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol b/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol
index 868d532b84..afd5d4aeb2 100644
--- a/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol
+++ b/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol
@@ -18,7 +18,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // withValue() -> 0x00
 // withoutValue() -> 0x0280
diff --git a/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol b/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol
index 78308eed35..f3a3265341 100644
--- a/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol
+++ b/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol
@@ -19,7 +19,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // withValue() -> 0x00
 // withoutValue() -> 0x60
diff --git a/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol b/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol
index aaf2874c8d..4f9bfe971e 100644
--- a/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol
+++ b/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol
@@ -23,7 +23,6 @@ contract Test is C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // c() -> 0x20, 1, "C"
diff --git a/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol b/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol
index 8c756419bd..f56d611c24 100644
--- a/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol
+++ b/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol
@@ -13,7 +13,6 @@ contract C is A {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol b/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol
index de36328083..925797b7eb 100644
--- a/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol
+++ b/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol
@@ -16,7 +16,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // x() -> 0x00
diff --git a/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol
index ff830d0750..b15a80df14 100644
--- a/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol
+++ b/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol
@@ -15,7 +15,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // x() -> 0
diff --git a/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol
index a81d4d6d2a..bc4c797393 100644
--- a/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol
+++ b/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol
@@ -15,7 +15,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // x() -> 0
diff --git a/test/libsolidity/semanticTests/modifiers/evaluation_order.sol b/test/libsolidity/semanticTests/modifiers/evaluation_order.sol
index b8b383e886..0b81533652 100644
--- a/test/libsolidity/semanticTests/modifiers/evaluation_order.sol
+++ b/test/libsolidity/semanticTests/modifiers/evaluation_order.sol
@@ -17,6 +17,5 @@ contract D is A, B, C {
     function f(uint y) internal returns (uint) { x.push(y); return 0; }
 }
 // ====
-// compileViaYul: also
 // ----
 // query() -> 0x20, 7, 4, 2, 6, 1, 3, 5, 7
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier.sol b/test/libsolidity/semanticTests/modifiers/function_modifier.sol
index 52ceb5c9cc..cca7e04b1a 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier.sol
@@ -9,7 +9,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // getOne() -> 0
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol
index 912b34b9a6..182baec8c5 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol
@@ -46,7 +46,6 @@ contract C is A {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // getData() -> 0x4300
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol
index 4c988229c0..222f87f97e 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol
@@ -14,7 +14,6 @@ contract C is A {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> false
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol
index de211b777f..71cbc42037 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol
@@ -23,7 +23,6 @@ contract C is A {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // getData() -> 6
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
index a47b4dea5a..2be71c52ba 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
@@ -25,6 +25,5 @@ contract Test {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x202
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
index 00779ef9b9..4902f26650 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
@@ -31,6 +31,5 @@ contract Test {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x202
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol
index 05c072eb8b..dc44d66598 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol
@@ -15,7 +15,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(bool): true -> 0
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol
index 708e5d6cb0..83f855d2c7 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol
@@ -11,7 +11,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256): 3 -> 10
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol
index cbb8709189..264d256bda 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol
@@ -14,7 +14,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256): 3 -> 10
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol
index 3107f5d203..bef92dac2e 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol
@@ -16,7 +16,6 @@ contract C is A {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> false
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol
index 1da6c011d1..c4ccc94243 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol
@@ -10,6 +10,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2, 3
diff --git a/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol b/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol
index d0d3321aa0..e1a0c36d3b 100644
--- a/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol
@@ -5,7 +5,6 @@ contract B {
     modifier mod2(bytes7 a) { while (a == "1234567") _; }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint8): 5 -> 0x00
diff --git a/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol b/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol
index 06de394be7..ab14d14c28 100644
--- a/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol
@@ -27,7 +27,6 @@ contract A {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x10, 0x20, 0x40
diff --git a/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol b/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol
index a0e550b25c..006af1c2cc 100644
--- a/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol
+++ b/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol
@@ -10,7 +10,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // called() -> 0x00
diff --git a/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol b/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol
index 4a3904de85..88a2fa1071 100644
--- a/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol
+++ b/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol
@@ -2,7 +2,6 @@
 contract A { modifier m1{_;} }
 contract B is A { constructor() A() m1{} }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // constructor() ->
diff --git a/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol b/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol
index 814011899b..df4fa914c6 100644
--- a/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol
+++ b/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol
@@ -9,7 +9,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256): 9 -> 0x00, 0x00, 0x00, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol b/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol
index 834a5f4461..3f2b4ebea1 100644
--- a/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol
+++ b/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol
@@ -8,7 +8,6 @@ contract B is A {
   constructor() A() m1 m2 {  }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // constructor() ->
diff --git a/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol b/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol
index 31b19b1110..1d71e5ac97 100644
--- a/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol
+++ b/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol
@@ -11,7 +11,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // x() -> 0
diff --git a/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol
index 50746d7069..ffc503ae20 100644
--- a/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol
+++ b/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol
@@ -15,7 +15,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // x() -> 0
diff --git a/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol b/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol
index a38969c021..a9b6bfa6c1 100644
--- a/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol
+++ b/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol
@@ -16,7 +16,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // x() -> 0
diff --git a/test/libsolidity/semanticTests/multiSource/circular_import.sol b/test/libsolidity/semanticTests/multiSource/circular_import.sol
index 74df4ac745..15d75fde50 100644
--- a/test/libsolidity/semanticTests/multiSource/circular_import.sol
+++ b/test/libsolidity/semanticTests/multiSource/circular_import.sol
@@ -11,6 +11,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // foo() -> 1
diff --git a/test/libsolidity/semanticTests/multiSource/circular_import_2.sol b/test/libsolidity/semanticTests/multiSource/circular_import_2.sol
index c1cf12150c..de47c0380f 100644
--- a/test/libsolidity/semanticTests/multiSource/circular_import_2.sol
+++ b/test/libsolidity/semanticTests/multiSource/circular_import_2.sol
@@ -12,6 +12,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // foo() -> 992
diff --git a/test/libsolidity/semanticTests/multiSource/circular_reimport.sol b/test/libsolidity/semanticTests/multiSource/circular_reimport.sol
index f4394e428f..8b7fc32a59 100644
--- a/test/libsolidity/semanticTests/multiSource/circular_reimport.sol
+++ b/test/libsolidity/semanticTests/multiSource/circular_reimport.sol
@@ -14,6 +14,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // foo() -> 0x60
diff --git a/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol b/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol
index b7c98118a7..3ae209daa8 100644
--- a/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol
+++ b/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol
@@ -14,6 +14,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // foo() -> 0x2324
diff --git a/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol b/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol
index 345b5de0f7..5c42863668 100644
--- a/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol
@@ -10,6 +10,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // foo() -> 24, true
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol
index dee4184bf8..4e91d42fb4 100644
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol
@@ -14,6 +14,5 @@ contract D is C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // h() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol
index c7726815ff..6df3631a76 100644
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol
@@ -14,6 +14,5 @@ contract D is C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol
index 5c14eefd20..71fed293ba 100644
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol
@@ -14,6 +14,5 @@ contract D is C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol
index aa026edccf..e31fdfa3db 100644
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol
@@ -21,6 +21,5 @@ contract E is D {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 1339
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol b/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol
index e10b0634cb..585ef8986d 100644
--- a/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol
@@ -23,6 +23,5 @@ contract E is D {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // i() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/import.sol b/test/libsolidity/semanticTests/multiSource/import.sol
index e7e3400d56..bcaf6f2906 100644
--- a/test/libsolidity/semanticTests/multiSource/import.sol
+++ b/test/libsolidity/semanticTests/multiSource/import.sol
@@ -9,7 +9,6 @@ contract B is A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 1337 -> 1337
 // g(uint256): 1337 -> 1338
diff --git a/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol b/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol
index 503f656802..6cf59f788e 100644
--- a/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol
+++ b/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol
@@ -10,6 +10,5 @@ contract C
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1, 2
diff --git a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol b/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol
index b8a6816db2..f980805ed9 100644
--- a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol
+++ b/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol
@@ -15,6 +15,5 @@ contract D is M.C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 61337
diff --git a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol b/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol
index b29fbcb3e2..5188f0e4a3 100644
--- a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol
+++ b/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol
@@ -10,6 +10,5 @@ contract D {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // h() -> 61337
diff --git a/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol b/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol
index 2c59b41262..a31b438ff8 100644
--- a/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol
+++ b/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol
@@ -11,6 +11,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // foo() -> 1337
diff --git a/test/libsolidity/semanticTests/operators/compound_assign.sol b/test/libsolidity/semanticTests/operators/compound_assign.sol
index 12c4da3480..6ede4522d4 100644
--- a/test/libsolidity/semanticTests/operators/compound_assign.sol
+++ b/test/libsolidity/semanticTests/operators/compound_assign.sol
@@ -11,7 +11,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 0, 6 -> 7
 // f(uint256,uint256): 1, 3 -> 0x23
diff --git a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople.sol b/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople.sol
index c6ada8c6a3..e4f0834a03 100644
--- a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople.sol
@@ -19,7 +19,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // shl(uint256,uint256): 0x01, 0x02 -> 0x04
 // shl(uint256,uint256): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 0x01 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
diff --git a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople_combined.sol b/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople_combined.sol
index 6cacbe3003..6e3bb173c3 100644
--- a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople_combined.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constantinople_combined.sol
@@ -85,7 +85,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // shl_zero(uint256): 0x00 -> 0x00
 // shl_zero(uint256): 0xffff -> 0xffff
diff --git a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constants_constantinople.sol b/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constants_constantinople.sol
index bbc5ddaa4b..526909c6c5 100644
--- a/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constants_constantinople.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/bitwise_shifting_constants_constantinople.sol
@@ -73,7 +73,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // shl_1() -> 0x01
 // shl_2() -> 0x01
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol b/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol
index 85a2739401..9f13f4bdce 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol
@@ -11,6 +11,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol b/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol
index 1e83d1038b..560def3b4e 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol
@@ -9,6 +9,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol
index b5121261b3..1af4930060 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol
@@ -3,6 +3,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // a() -> 0x4200
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol
index 7db6248deb..aa75ca4878 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol
@@ -7,6 +7,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x4200
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol
index 5e12394ab0..c394072155 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol
@@ -3,6 +3,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // a() -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol
index 4aebfcf86e..0a959aa11b 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol
@@ -7,6 +7,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left.sol
index d2b4cf6b34..058d233e90 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left.sol
@@ -6,7 +6,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 0x4266, 0x0 -> 0x4266
 // f(uint256,uint256): 0x4266, 0x8 -> 0x426600
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol
index be470e4d07..55883ddaef 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol
@@ -7,7 +7,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 0x4266, 0x0 -> 0x4266
 // f(uint256,uint256): 0x4266, 0x8 -> 0x426600
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol
index 21ad474d3b..2242d2a168 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol
@@ -7,7 +7,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint8): 0x4266, 0x0 -> 0x4266
 // f(uint256,uint8): 0x4266, 0x8 -> 0x426600
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol
index 8eb90736d6..a1c3fc4cfc 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol
@@ -8,6 +8,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol
index 737227697b..6a208e9fc0 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol
@@ -6,7 +6,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint32,uint32): 0x4266, 0x0 -> 0x4266
 // f(uint32,uint32): 0x4266, 0x8 -> 0x426600
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol
index 25c9e2c30d..f9517fb618 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol
@@ -6,7 +6,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint8,uint8): 0x66, 0x0 -> 0x66
 // f(uint8,uint8): 0x66, 0x8 -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol b/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol
index ceaad17990..e303e73eac 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol
@@ -3,6 +3,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // a() -> -16896
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol b/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol
index 02ddee654f..32ae16edcd 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol
@@ -3,6 +3,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // a() -> -66
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol b/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol
index 8303f4271c..3e63bc8eba 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol
@@ -10,7 +10,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // leftU(uint8,uint8): 255, 8 -> 0
 // leftU(uint8,uint8): 255, 1 -> 254
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right.sol
index 4e4e3a27a3..97ca0a5c43 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right.sol
@@ -6,7 +6,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 0x4266, 0x0 -> 0x4266
 // f(uint256,uint256): 0x4266, 0x8 -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol
index 74b1db2f9e..b427210843 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol
@@ -7,7 +7,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 0x4266, 0x0 -> 0x4266
 // f(uint256,uint256): 0x4266, 0x8 -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol
index c0cd5ad34c..c7fa354955 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol
@@ -20,7 +20,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(int8,uint8): 0x00, 0x03 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
 // f(int8,uint8): 0x00, 0x04 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol
index 39e6760f37..ecb51e902a 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol
@@ -12,7 +12,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint8,uint8): 0x00, 0x04 -> 0x0f
 // f(uint8,uint8): 0x00, 0x1004 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol
index 4e6487c578..630f4905ea 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol
@@ -50,7 +50,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f1() -> true
 // f2() -> true
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol
index 0147bb102e..6d2f7ae582 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol
@@ -5,7 +5,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int256,uint256): -4266, 0 -> -4266
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol
index d801c9a06a..74b704f48e 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol
@@ -6,7 +6,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int256,uint256): -4266, 0 -> -4266
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol
index 9c0a0879ec..533c93bc92 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol
@@ -5,7 +5,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int16,uint16): -4266, 0 -> -4266
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol
index f41be2fd57..3dc12b2230 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol
@@ -5,7 +5,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int32,uint32): -4266, 0 -> -4266
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol
index 61d4ab0800..f6dda70597 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol
@@ -5,7 +5,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int8,uint8): -66, 0 -> -66
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol
index 5c2ef4b198..d81e00fd52 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(int16,uint16): 0xff99, 0x00 -> FAILURE
 // f(int16,uint16): 0xff99, 0x01 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol
index 6f74dadd1c..cac3a53b6c 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(int32,uint32): 0xffffff99, 0x00 -> FAILURE
 // f(int32,uint32): 0xffffff99, 0x01 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol
index 0dbdb92ea4..0fe10c9379 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(int8,uint8): 0x99, 0x00 -> FAILURE
 // f(int8,uint8): 0x99, 0x01 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol
index a384e23eaa..a5d1ed51cf 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol
@@ -6,7 +6,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint32,uint32): 0x4266, 0x0 -> 0x4266
 // f(uint32,uint32): 0x4266, 0x8 -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol
index 5ae6556768..7ac59b3fc6 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol
@@ -6,7 +6,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint8,uint8): 0x66, 0x0 -> 0x66
 // f(uint8,uint8): 0x66, 0x8 -> 0x0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol b/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol
index 7bc85eb000..111357e9ee 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol
@@ -10,7 +10,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(int256,uint256): 1, -1 -> 0
 // g(int256,uint256): 1, -1 -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shifts.sol b/test/libsolidity/semanticTests/operators/shifts/shifts.sol
index 6e21956d5d..e202f28897 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shifts.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shifts.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // f(uint256): 7 -> 28
diff --git a/test/libsolidity/semanticTests/optimizer/shift_bytes.sol b/test/libsolidity/semanticTests/optimizer/shift_bytes.sol
index 1960ee6a8b..49d693a777 100644
--- a/test/libsolidity/semanticTests/optimizer/shift_bytes.sol
+++ b/test/libsolidity/semanticTests/optimizer/shift_bytes.sol
@@ -38,7 +38,6 @@ contract C {
   }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256): 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f -> 0x1f, 0x1f, 3
diff --git a/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol b/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol
index b24ca22912..4c6557cd7a 100644
--- a/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol
+++ b/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(), 27 wei -> FAILURE
diff --git a/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol b/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol
index fc87540a0c..1be435ff68 100644
--- a/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol
+++ b/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol
@@ -4,7 +4,6 @@ contract A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // x() -> 0
 // ()
diff --git a/test/libsolidity/semanticTests/receive/ether_and_data.sol b/test/libsolidity/semanticTests/receive/ether_and_data.sol
index 5776ecd80f..df3c89884b 100644
--- a/test/libsolidity/semanticTests/receive/ether_and_data.sol
+++ b/test/libsolidity/semanticTests/receive/ether_and_data.sol
@@ -3,7 +3,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // (), 1 ether
 // (), 1 ether: 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/receive/inherited.sol b/test/libsolidity/semanticTests/receive/inherited.sol
index 5a5df320a0..9ca685399f 100644
--- a/test/libsolidity/semanticTests/receive/inherited.sol
+++ b/test/libsolidity/semanticTests/receive/inherited.sol
@@ -6,7 +6,6 @@ contract A {
 contract B is A {}
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // getData() -> 0
 // () ->
diff --git a/test/libsolidity/semanticTests/revertStrings/array_slices.sol b/test/libsolidity/semanticTests/revertStrings/array_slices.sol
index 2966ab5343..dec3e916d7 100644
--- a/test/libsolidity/semanticTests/revertStrings/array_slices.sol
+++ b/test/libsolidity/semanticTests/revertStrings/array_slices.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(uint256,uint256,uint256[]): 2, 1, 0x80, 3, 1, 2, 3 -> FAILURE, hex"08c379a0", 0x20, 22, "Slice starts after end"
diff --git a/test/libsolidity/semanticTests/revertStrings/bubble.sol b/test/libsolidity/semanticTests/revertStrings/bubble.sol
index d143aeef85..5e9a0730df 100644
--- a/test/libsolidity/semanticTests/revertStrings/bubble.sol
+++ b/test/libsolidity/semanticTests/revertStrings/bubble.sol
@@ -10,7 +10,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f() -> FAILURE, hex"08c379a0", 0x20, 4, "fail"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_invalid.sol b/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_invalid.sol
index b28c05b44d..355c472230 100644
--- a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_invalid.sol
+++ b/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_invalid.sol
@@ -6,7 +6,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(uint256[][]): 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_decode.sol b/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_decode.sol
index f09dca5285..7c5ba33b73 100644
--- a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_decode.sol
+++ b/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_decode.sol
@@ -7,7 +7,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(uint256[][2][]): 0x20, 0x01, 0x20, 0x00 -> FAILURE, hex"08c379a0", 0x20, 28, "Invalid calldata tail offset"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_reencode.sol b/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_reencode.sol
index 2eb8d2fb9a..77341fa26a 100644
--- a/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_reencode.sol
+++ b/test/libsolidity/semanticTests/revertStrings/calldata_array_dynamic_static_short_reencode.sol
@@ -9,7 +9,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // g(uint256[][2][]): 0x20, 0x01, 0x20, 0x00 -> FAILURE, hex"08c379a0", 0x20, 30, "Invalid calldata access offset"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_array_invalid_length.sol b/test/libsolidity/semanticTests/revertStrings/calldata_array_invalid_length.sol
index 3405ef350f..4af015f33b 100644
--- a/test/libsolidity/semanticTests/revertStrings/calldata_array_invalid_length.sol
+++ b/test/libsolidity/semanticTests/revertStrings/calldata_array_invalid_length.sol
@@ -6,7 +6,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(uint256[][]): 0x20, 1, 0x20, 0x0100000000000000000000 -> FAILURE, hex"08c379a0", 0x20, 28, "Invalid calldata tail length"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_arrays_too_large.sol b/test/libsolidity/semanticTests/revertStrings/calldata_arrays_too_large.sol
index 3988dd892c..34a6f0a025 100644
--- a/test/libsolidity/semanticTests/revertStrings/calldata_arrays_too_large.sol
+++ b/test/libsolidity/semanticTests/revertStrings/calldata_arrays_too_large.sol
@@ -6,7 +6,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(uint256,uint256[],uint256): 6, 0x60, 9, 0x1000000000000000000000000000000000000000000000000000000000000002, 1, 2 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray length"
diff --git a/test/libsolidity/semanticTests/revertStrings/calldata_tail_short.sol b/test/libsolidity/semanticTests/revertStrings/calldata_tail_short.sol
index f60e97ef2f..c0c1e3f4c0 100644
--- a/test/libsolidity/semanticTests/revertStrings/calldata_tail_short.sol
+++ b/test/libsolidity/semanticTests/revertStrings/calldata_tail_short.sol
@@ -4,7 +4,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(uint256[][]): 0x20, 1, 0x20, 2, 0x42 -> FAILURE, hex"08c379a0", 0x20, 23, "Calldata tail too short"
diff --git a/test/libsolidity/semanticTests/revertStrings/called_contract_has_code.sol b/test/libsolidity/semanticTests/revertStrings/called_contract_has_code.sol
index 356a3f1d4a..110b1e50c7 100644
--- a/test/libsolidity/semanticTests/revertStrings/called_contract_has_code.sol
+++ b/test/libsolidity/semanticTests/revertStrings/called_contract_has_code.sol
@@ -7,7 +7,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // g() -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/revertStrings/empty_v2.sol b/test/libsolidity/semanticTests/revertStrings/empty_v2.sol
index ea81afbe8e..24a684904f 100644
--- a/test/libsolidity/semanticTests/revertStrings/empty_v2.sol
+++ b/test/libsolidity/semanticTests/revertStrings/empty_v2.sol
@@ -9,7 +9,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f() -> FAILURE, hex"08c379a0", 0x20, 0
diff --git a/test/libsolidity/semanticTests/revertStrings/enum_v2.sol b/test/libsolidity/semanticTests/revertStrings/enum_v2.sol
index 6952dc0ce7..e2f77e5516 100644
--- a/test/libsolidity/semanticTests/revertStrings/enum_v2.sol
+++ b/test/libsolidity/semanticTests/revertStrings/enum_v2.sol
@@ -7,7 +7,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(uint8[]): 0x20, 2, 3, 3 -> FAILURE
diff --git a/test/libsolidity/semanticTests/revertStrings/ether_non_payable_function.sol b/test/libsolidity/semanticTests/revertStrings/ether_non_payable_function.sol
index cabe385ef5..ffaea68787 100644
--- a/test/libsolidity/semanticTests/revertStrings/ether_non_payable_function.sol
+++ b/test/libsolidity/semanticTests/revertStrings/ether_non_payable_function.sol
@@ -3,7 +3,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(), 1 ether -> FAILURE, hex"08c379a0", 0x20, 34, "Ether sent to non-payable functi", "on"
diff --git a/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v2.sol b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v2.sol
index 92e0cc70c7..3412f58c6c 100644
--- a/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v2.sol
+++ b/test/libsolidity/semanticTests/revertStrings/function_entry_checks_v2.sol
@@ -4,7 +4,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // t(uint256) -> FAILURE, hex"08c379a0", 0x20, 34, "ABI decoding: tuple data too sho", "rt"
diff --git a/test/libsolidity/semanticTests/revertStrings/library_non_view_call.sol b/test/libsolidity/semanticTests/revertStrings/library_non_view_call.sol
index 9df7705caa..1a079a04ab 100644
--- a/test/libsolidity/semanticTests/revertStrings/library_non_view_call.sol
+++ b/test/libsolidity/semanticTests/revertStrings/library_non_view_call.sol
@@ -10,7 +10,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // library: L
diff --git a/test/libsolidity/semanticTests/revertStrings/short_input_array.sol b/test/libsolidity/semanticTests/revertStrings/short_input_array.sol
index d41e5128ff..4a96accf02 100644
--- a/test/libsolidity/semanticTests/revertStrings/short_input_array.sol
+++ b/test/libsolidity/semanticTests/revertStrings/short_input_array.sol
@@ -4,7 +4,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(uint256[]): 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 43, "ABI decoding: invalid calldata a", "rray stride"
diff --git a/test/libsolidity/semanticTests/revertStrings/short_input_bytes.sol b/test/libsolidity/semanticTests/revertStrings/short_input_bytes.sol
index a79b3cd2b5..2f275b86d6 100644
--- a/test/libsolidity/semanticTests/revertStrings/short_input_bytes.sol
+++ b/test/libsolidity/semanticTests/revertStrings/short_input_bytes.sol
@@ -4,7 +4,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // e(bytes): 0x20, 7 -> FAILURE, hex"08c379a0", 0x20, 39, "ABI decoding: invalid byte array", " length"
diff --git a/test/libsolidity/semanticTests/revertStrings/transfer.sol b/test/libsolidity/semanticTests/revertStrings/transfer.sol
index a9c9bc845c..ef2e728594 100644
--- a/test/libsolidity/semanticTests/revertStrings/transfer.sol
+++ b/test/libsolidity/semanticTests/revertStrings/transfer.sol
@@ -19,7 +19,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // (), 10 wei ->
diff --git a/test/libsolidity/semanticTests/revertStrings/unknown_sig_no_fallback.sol b/test/libsolidity/semanticTests/revertStrings/unknown_sig_no_fallback.sol
index fc128fb8ee..62b2458851 100644
--- a/test/libsolidity/semanticTests/revertStrings/unknown_sig_no_fallback.sol
+++ b/test/libsolidity/semanticTests/revertStrings/unknown_sig_no_fallback.sol
@@ -3,7 +3,6 @@ contract A {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // (): hex"00" -> FAILURE, hex"08c379a0", 0x20, 41, "Unknown signature and no fallbac", "k defined"
diff --git a/test/libsolidity/semanticTests/reverts/assert_require.sol b/test/libsolidity/semanticTests/reverts/assert_require.sol
index af2418061a..ee60fc192c 100644
--- a/test/libsolidity/semanticTests/reverts/assert_require.sol
+++ b/test/libsolidity/semanticTests/reverts/assert_require.sol
@@ -16,7 +16,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x01
 // g(bool): false -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/reverts/error_struct.sol b/test/libsolidity/semanticTests/reverts/error_struct.sol
index d837068a71..4ca57bd6ee 100644
--- a/test/libsolidity/semanticTests/reverts/error_struct.sol
+++ b/test/libsolidity/semanticTests/reverts/error_struct.sol
@@ -11,7 +11,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"f8a8fd6d"
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol
index 5c0ee13dcd..1e3e34cb1a 100644
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol
+++ b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol
@@ -18,6 +18,5 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> FAILURE, hex"4e487b71", 0x21 # should throw #
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol
index 81f514b4c4..987931fa7d 100644
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol
+++ b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol
@@ -27,7 +27,6 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test_return() -> FAILURE, hex"4e487b71", 33 # both should throw #
 // test_inline_assignment() -> FAILURE, hex"4e487b71", 33
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol
index bf99c63772..afdbd20b67 100644
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol
+++ b/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol
@@ -25,7 +25,6 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test_eq_ok() -> 1
 // test_eq() -> FAILURE, hex"4e487b71", 33 # both should throw #
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol
index b77076a70d..fdf5e6bbb1 100644
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol
+++ b/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol
@@ -19,7 +19,6 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test_store_ok() -> 1
 // x() -> 0
diff --git a/test/libsolidity/semanticTests/reverts/invalid_instruction.sol b/test/libsolidity/semanticTests/reverts/invalid_instruction.sol
index 1bb64db6e1..f4f64a11e5 100644
--- a/test/libsolidity/semanticTests/reverts/invalid_instruction.sol
+++ b/test/libsolidity/semanticTests/reverts/invalid_instruction.sol
@@ -8,6 +8,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE
diff --git a/test/libsolidity/semanticTests/reverts/revert.sol b/test/libsolidity/semanticTests/reverts/revert.sol
index 9f99ed86ef..cac02076d5 100644
--- a/test/libsolidity/semanticTests/reverts/revert.sol
+++ b/test/libsolidity/semanticTests/reverts/revert.sol
@@ -16,7 +16,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE
 // a() -> 42
diff --git a/test/libsolidity/semanticTests/reverts/revert_return_area.sol b/test/libsolidity/semanticTests/reverts/revert_return_area.sol
index 99ef69ce99..fa8156b300 100644
--- a/test/libsolidity/semanticTests/reverts/revert_return_area.sol
+++ b/test/libsolidity/semanticTests/reverts/revert_return_area.sol
@@ -15,6 +15,5 @@ contract C {
 
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f() -> 0x00, 0x08c379a000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/reverts/simple_throw.sol b/test/libsolidity/semanticTests/reverts/simple_throw.sol
index 0e075c0dc0..0d43c97e96 100644
--- a/test/libsolidity/semanticTests/reverts/simple_throw.sol
+++ b/test/libsolidity/semanticTests/reverts/simple_throw.sol
@@ -8,7 +8,6 @@ contract Test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 11 -> 21
 // f(uint256): 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create.sol b/test/libsolidity/semanticTests/salted_create/salted_create.sol
index 51b987c2ca..743e968952 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create.sol
@@ -18,7 +18,6 @@ contract A {
 }
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // different_salt() -> true
 // same_salt() -> true
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 6613e471bd..eb0cc8229d 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -19,7 +19,6 @@ contract A {
 }
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
 // gas irOptimized: 271831
diff --git a/test/libsolidity/semanticTests/smoke/alignment.sol b/test/libsolidity/semanticTests/smoke/alignment.sol
index 80c69bb438..33724cccf3 100644
--- a/test/libsolidity/semanticTests/smoke/alignment.sol
+++ b/test/libsolidity/semanticTests/smoke/alignment.sol
@@ -19,7 +19,6 @@ contract D {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // stateBool() -> true
 // stateBool() -> right(true)
diff --git a/test/libsolidity/semanticTests/smoke/arrays.sol b/test/libsolidity/semanticTests/smoke/arrays.sol
index 85d721d147..a6f4895335 100644
--- a/test/libsolidity/semanticTests/smoke/arrays.sol
+++ b/test/libsolidity/semanticTests/smoke/arrays.sol
@@ -33,7 +33,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // r() -> true, false, true
 // s() -> 123, 456, 789
diff --git a/test/libsolidity/semanticTests/smoke/basic.sol b/test/libsolidity/semanticTests/smoke/basic.sol
index 36ed181d51..81e8bd829c 100644
--- a/test/libsolidity/semanticTests/smoke/basic.sol
+++ b/test/libsolidity/semanticTests/smoke/basic.sol
@@ -29,7 +29,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // d() ->
diff --git a/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol b/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol
index f1094fe5f5..0a3c2e44f4 100644
--- a/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol
+++ b/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // e(bytes): 32, 3, hex"AB33BB" -> 32, 3, left(0xAB33BB)
 // e(bytes): 32, 32, 0x20 -> 32, 32, 0x20
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index 3003c5d8d9..ef19fd669a 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 2 wei: 3 ->
 // gas irOptimized: 107627
diff --git a/test/libsolidity/semanticTests/smoke/failure.sol b/test/libsolidity/semanticTests/smoke/failure.sol
index ed672dcf65..eeb82a3ce4 100644
--- a/test/libsolidity/semanticTests/smoke/failure.sol
+++ b/test/libsolidity/semanticTests/smoke/failure.sol
@@ -17,7 +17,6 @@ contract C {
 // EVMVersion: >homestead
 // allowNonExistingFunctions: true
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // _() -> FAILURE
 // e() -> FAILURE, hex"08c379a0", 0x20, 0x13, "Transaction failed."
diff --git a/test/libsolidity/semanticTests/smoke/fallback.sol b/test/libsolidity/semanticTests/smoke/fallback.sol
index f789ed276c..5a4f89d843 100644
--- a/test/libsolidity/semanticTests/smoke/fallback.sol
+++ b/test/libsolidity/semanticTests/smoke/fallback.sol
@@ -10,7 +10,6 @@ contract A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // data() -> 0
 // ()
diff --git a/test/libsolidity/semanticTests/smoke/multiline.sol b/test/libsolidity/semanticTests/smoke/multiline.sol
index 587532cfe6..97fbd5b3be 100644
--- a/test/libsolidity/semanticTests/smoke/multiline.sol
+++ b/test/libsolidity/semanticTests/smoke/multiline.sol
@@ -6,7 +6,6 @@ contract C {
 // ====
 // allowNonExistingFunctions: true
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256,uint256,uint256,uint256): 1, 1, 1, 1, 1
 // -> 5
diff --git a/test/libsolidity/semanticTests/smoke/multiline_comments.sol b/test/libsolidity/semanticTests/smoke/multiline_comments.sol
index 4fde637faf..cdfe43f5ec 100644
--- a/test/libsolidity/semanticTests/smoke/multiline_comments.sol
+++ b/test/libsolidity/semanticTests/smoke/multiline_comments.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256,uint256,uint256,uint256): 1, 1, 1, 1, 1
 // # A comment on the function parameters. #
diff --git a/test/libsolidity/semanticTests/smoke/structs.sol b/test/libsolidity/semanticTests/smoke/structs.sol
index d291e59ecf..813d6954c0 100644
--- a/test/libsolidity/semanticTests/smoke/structs.sol
+++ b/test/libsolidity/semanticTests/smoke/structs.sol
@@ -19,7 +19,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // s() -> 23, 42
 // t() -> 0x20, 23, 42, 0x60, 3, "any"
diff --git a/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol b/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol
index 7598d382a5..f38eee4297 100644
--- a/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol
+++ b/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol
@@ -10,6 +10,5 @@ contract C {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // f() -> 0x40, 0xa0, 0x24, -813742827273327954027712588510533233455028711326166692885570228492575965184, 26959946667150639794667015087019630673637144422540572481103610249216, 0x24, -813742827273327954027712588510533233455028711326166692885570228492575965184, 26959946667150639794667015087019630673637144422540572481103610249216
diff --git a/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol b/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol
index c377c616d5..4c46d1ea00 100644
--- a/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol
+++ b/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol
@@ -9,6 +9,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol b/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol
index cb3c8d6087..9ceddcfe87 100644
--- a/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol
+++ b/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // short() -> true
 // long() -> true, true
diff --git a/test/libsolidity/semanticTests/state/block_basefee.sol b/test/libsolidity/semanticTests/state/block_basefee.sol
index 0b54008b09..ebeaceec74 100644
--- a/test/libsolidity/semanticTests/state/block_basefee.sol
+++ b/test/libsolidity/semanticTests/state/block_basefee.sol
@@ -10,7 +10,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=london
-// compileViaYul: also
 // ----
 // f() -> 7
 // g() -> 7
diff --git a/test/libsolidity/semanticTests/state/block_chainid.sol b/test/libsolidity/semanticTests/state/block_chainid.sol
index 473629d8d9..5d157323ec 100644
--- a/test/libsolidity/semanticTests/state/block_chainid.sol
+++ b/test/libsolidity/semanticTests/state/block_chainid.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=istanbul
-// compileViaYul: also
 // ----
 // f() -> 1
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/state/block_coinbase.sol b/test/libsolidity/semanticTests/state/block_coinbase.sol
index 4d0f70539f..5087fe7323 100644
--- a/test/libsolidity/semanticTests/state/block_coinbase.sol
+++ b/test/libsolidity/semanticTests/state/block_coinbase.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x7878787878787878787878787878787878787878
 // f() -> 0x7878787878787878787878787878787878787878
diff --git a/test/libsolidity/semanticTests/state/block_difficulty.sol b/test/libsolidity/semanticTests/state/block_difficulty.sol
index cb25e87cb2..ae2a5b43a1 100644
--- a/test/libsolidity/semanticTests/state/block_difficulty.sol
+++ b/test/libsolidity/semanticTests/state/block_difficulty.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 200000000
diff --git a/test/libsolidity/semanticTests/state/block_gaslimit.sol b/test/libsolidity/semanticTests/state/block_gaslimit.sol
index 3ca0221820..3ccc37543c 100644
--- a/test/libsolidity/semanticTests/state/block_gaslimit.sol
+++ b/test/libsolidity/semanticTests/state/block_gaslimit.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 20000000
 // f() -> 20000000
diff --git a/test/libsolidity/semanticTests/state/block_number.sol b/test/libsolidity/semanticTests/state/block_number.sol
index 8faa72c146..a55c2a3cac 100644
--- a/test/libsolidity/semanticTests/state/block_number.sol
+++ b/test/libsolidity/semanticTests/state/block_number.sol
@@ -6,7 +6,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // constructor()
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/state/block_timestamp.sol b/test/libsolidity/semanticTests/state/block_timestamp.sol
index 4617ab0e08..84cfe3b9f4 100644
--- a/test/libsolidity/semanticTests/state/block_timestamp.sol
+++ b/test/libsolidity/semanticTests/state/block_timestamp.sol
@@ -6,7 +6,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // constructor() # This is the 1st block #
 // f() -> 0x1e # This is the 2nd block (each block is "15 seconds") #
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
index 829a8695d3..010893e7dc 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // gas irOptimized: 111584
diff --git a/test/libsolidity/semanticTests/state/gasleft.sol b/test/libsolidity/semanticTests/state/gasleft.sol
index 61edb54801..9f50ef46dc 100644
--- a/test/libsolidity/semanticTests/state/gasleft.sol
+++ b/test/libsolidity/semanticTests/state/gasleft.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
 // f() -> true
diff --git a/test/libsolidity/semanticTests/state/msg_data.sol b/test/libsolidity/semanticTests/state/msg_data.sol
index 6217da3b66..cc80650d7c 100644
--- a/test/libsolidity/semanticTests/state/msg_data.sol
+++ b/test/libsolidity/semanticTests/state/msg_data.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 4, 17219911917854084299749778639755835327755045716242581057573779540915269926912
 // g(uint256,bool): 1234, true -> 0x20, 0x44, 35691323728519381642872894128098848782337736632589179916067422734266033766400, 33268574187263889506619096617382224251268236217415066441681855047532544, 26959946667150639794667015087019630673637144422540572481103610249216
diff --git a/test/libsolidity/semanticTests/state/msg_sender.sol b/test/libsolidity/semanticTests/state/msg_sender.sol
index 45f384c5f9..eda4e5a059 100644
--- a/test/libsolidity/semanticTests/state/msg_sender.sol
+++ b/test/libsolidity/semanticTests/state/msg_sender.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x1212121212121212121212121212120000000012
diff --git a/test/libsolidity/semanticTests/state/msg_sig.sol b/test/libsolidity/semanticTests/state/msg_sig.sol
index 0003c2adab..858ee98539 100644
--- a/test/libsolidity/semanticTests/state/msg_sig.sol
+++ b/test/libsolidity/semanticTests/state/msg_sig.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x26121ff000000000000000000000000000000000000000000000000000000000
 // g() -> 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/state/msg_value.sol b/test/libsolidity/semanticTests/state/msg_value.sol
index e3a72f5994..2d14d1d7b8 100644
--- a/test/libsolidity/semanticTests/state/msg_value.sol
+++ b/test/libsolidity/semanticTests/state/msg_value.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/state/tx_gasprice.sol b/test/libsolidity/semanticTests/state/tx_gasprice.sol
index c41edc5904..59ddfbe5cf 100644
--- a/test/libsolidity/semanticTests/state/tx_gasprice.sol
+++ b/test/libsolidity/semanticTests/state/tx_gasprice.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 3000000000
diff --git a/test/libsolidity/semanticTests/state/tx_origin.sol b/test/libsolidity/semanticTests/state/tx_origin.sol
index 861ef3d6d0..8383538243 100644
--- a/test/libsolidity/semanticTests/state/tx_origin.sol
+++ b/test/libsolidity/semanticTests/state/tx_origin.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x9292929292929292929292929292929292929292
 // f() -> 0x9292929292929292929292929292929292929292
diff --git a/test/libsolidity/semanticTests/state/uncalled_blockhash.sol b/test/libsolidity/semanticTests/state/uncalled_blockhash.sol
index a038478e0d..02c55c7d33 100644
--- a/test/libsolidity/semanticTests/state/uncalled_blockhash.sol
+++ b/test/libsolidity/semanticTests/state/uncalled_blockhash.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x3737373737373737373737373737373737373737373737373737373737373738
diff --git a/test/libsolidity/semanticTests/state_var_initialization.sol b/test/libsolidity/semanticTests/state_var_initialization.sol
index df39976030..93b22bfa91 100644
--- a/test/libsolidity/semanticTests/state_var_initialization.sol
+++ b/test/libsolidity/semanticTests/state_var_initialization.sol
@@ -9,7 +9,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // i() -> 2
 // k() -> 0
diff --git a/test/libsolidity/semanticTests/state_variables_init_order.sol b/test/libsolidity/semanticTests/state_variables_init_order.sol
index 740bdb1523..b6ac20cd0e 100644
--- a/test/libsolidity/semanticTests/state_variables_init_order.sol
+++ b/test/libsolidity/semanticTests/state_variables_init_order.sol
@@ -10,6 +10,5 @@ contract B is A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/state_variables_init_order_2.sol b/test/libsolidity/semanticTests/state_variables_init_order_2.sol
index 8a339f2b8b..95c0b42007 100644
--- a/test/libsolidity/semanticTests/state_variables_init_order_2.sol
+++ b/test/libsolidity/semanticTests/state_variables_init_order_2.sol
@@ -14,6 +14,5 @@ contract B is A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // z() -> 1
diff --git a/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol b/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol
index 5242a2a193..761cc76bda 100644
--- a/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol
+++ b/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol
@@ -12,6 +12,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 42
diff --git a/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol b/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol
index 2a478f35f5..affc843935 100644
--- a/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol
+++ b/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol
@@ -9,7 +9,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // data(uint256,uint256): 2, 2 -> 8
 // data(uint256,uint256): 2, 8 -> FAILURE # NB: the original code contained a bug here #
diff --git a/test/libsolidity/semanticTests/storage/array_accessor.sol b/test/libsolidity/semanticTests/storage/array_accessor.sol
index f9efae437c..b51f2ccd67 100644
--- a/test/libsolidity/semanticTests/storage/array_accessor.sol
+++ b/test/libsolidity/semanticTests/storage/array_accessor.sol
@@ -23,7 +23,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // data(uint256): 0 -> 8
 // data(uint256): 8 -> FAILURE
diff --git a/test/libsolidity/semanticTests/storage/chop_sign_bits.sol b/test/libsolidity/semanticTests/storage/chop_sign_bits.sol
index 4993ecb35c..10674f3b24 100644
--- a/test/libsolidity/semanticTests/storage/chop_sign_bits.sol
+++ b/test/libsolidity/semanticTests/storage/chop_sign_bits.sol
@@ -20,7 +20,6 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // x(uint256): 0 -> -1
 // x(uint256): 1 -> -2
diff --git a/test/libsolidity/semanticTests/storage/complex_accessors.sol b/test/libsolidity/semanticTests/storage/complex_accessors.sol
index d1087f800b..143d3c5195 100644
--- a/test/libsolidity/semanticTests/storage/complex_accessors.sol
+++ b/test/libsolidity/semanticTests/storage/complex_accessors.sol
@@ -11,7 +11,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // to_string_map(uint256): 42 -> "24"
 // to_bool_map(uint256): 42 -> false
diff --git a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
index eeeea29432..d22e0d8164 100644
--- a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
+++ b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
@@ -3,7 +3,6 @@ contract Test {
     function set(bytes memory _a) public { x = _a; }
 }
 // ====
-// compileViaYul: also
 // ----
 // set(bytes): 0x20, 3, "abc"
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/storage/mapping_state.sol b/test/libsolidity/semanticTests/storage/mapping_state.sol
index 28178bca20..16ce615fcf 100644
--- a/test/libsolidity/semanticTests/storage/mapping_state.sol
+++ b/test/libsolidity/semanticTests/storage/mapping_state.sol
@@ -16,7 +16,6 @@ contract Ballot {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // getVoteCount(address): 0 -> 0
 // getVoteCount(address): 1 -> 0
diff --git a/test/libsolidity/semanticTests/storage/mapping_string_key.sol b/test/libsolidity/semanticTests/storage/mapping_string_key.sol
index 84ac9b09aa..eca07f164d 100644
--- a/test/libsolidity/semanticTests/storage/mapping_string_key.sol
+++ b/test/libsolidity/semanticTests/storage/mapping_string_key.sol
@@ -14,7 +14,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set(string,uint256): 0x40, 8, 3, "abc" ->
 // get(string): 0x20, 3, "abc" -> 8
diff --git a/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol b/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol
index f2def79bc8..77697f9176 100644
--- a/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol
+++ b/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol
@@ -29,7 +29,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // n1(uint256,uint256): 42, 64 ->
 // map(uint256): 42 -> 64
diff --git a/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol b/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol
index 5078103b81..b53d330172 100644
--- a/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol
+++ b/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol
@@ -24,7 +24,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // n1(uint256,uint256): 42, 64 ->
 // map(uint256): 42 -> 64
diff --git a/test/libsolidity/semanticTests/storage/packed_functions.sol b/test/libsolidity/semanticTests/storage/packed_functions.sol
index 32597923b8..40da588c66 100644
--- a/test/libsolidity/semanticTests/storage/packed_functions.sol
+++ b/test/libsolidity/semanticTests/storage/packed_functions.sol
@@ -40,7 +40,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // set() ->
 // t1() -> 7
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol b/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol
index 84dfae3c58..c10931f99d 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x1234, 0x0, 0x0, 0xfffe
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_signed.sol b/test/libsolidity/semanticTests/storage/packed_storage_signed.sol
index b1080a7b08..b457d0731b 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_signed.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_signed.sol
@@ -22,6 +22,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> -2, 4, -112, 0
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
index caa3858877..c44b694a58 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
@@ -43,7 +43,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> true
 // gas irOptimized: 134587
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol
index a24973fd12..d9e897762d 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol
@@ -31,6 +31,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 1
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol
index 509cad55ea..d01f072685 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol
@@ -28,6 +28,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 1
diff --git a/test/libsolidity/semanticTests/storage/simple_accessor.sol b/test/libsolidity/semanticTests/storage/simple_accessor.sol
index 1171753b6b..72398d9abb 100644
--- a/test/libsolidity/semanticTests/storage/simple_accessor.sol
+++ b/test/libsolidity/semanticTests/storage/simple_accessor.sol
@@ -6,6 +6,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // data() -> 8
diff --git a/test/libsolidity/semanticTests/storage/state_smoke_test.sol b/test/libsolidity/semanticTests/storage/state_smoke_test.sol
index 6d1bae1004..0bcdd1ad39 100644
--- a/test/libsolidity/semanticTests/storage/state_smoke_test.sol
+++ b/test/libsolidity/semanticTests/storage/state_smoke_test.sol
@@ -12,7 +12,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // get(uint8): 0x00 -> 0
 // get(uint8): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/storage/struct_accessor.sol b/test/libsolidity/semanticTests/storage/struct_accessor.sol
index ea030de1a6..0bbe9fd44e 100644
--- a/test/libsolidity/semanticTests/storage/struct_accessor.sol
+++ b/test/libsolidity/semanticTests/storage/struct_accessor.sol
@@ -9,6 +9,5 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // data(uint256): 7 -> 1, 2, true
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
index 7b7bc828cc..cf50830ba4 100644
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(string,string): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
 // f(string,string): 0x40, 0xa0, 64, "abcdabcdabcdabcdabcdabcdabcdabcd", "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 0x45, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
index ab59c1bf6e..1fd1093e33 100644
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
@@ -26,7 +26,6 @@ contract C{
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
 // g(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x42, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636465666768616263646566676861626364656667686162636465666768, 44047497324925121336511606693520958599579173549109180625971642598225011015680
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
index 70be494bae..b5db79e8f2 100644
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
index ca520884e3..f452c3b352 100644
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
@@ -20,7 +20,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0
 // g() -> 0x20, 6, "abcabc"
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
index 82931cd86c..92b62f5647 100644
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(string,string,string): 0x60, 0x60, 0x60, 2, "ab" -> 0x20, 6, "ababab"
diff --git a/test/libsolidity/semanticTests/strings/constant_string_literal.sol b/test/libsolidity/semanticTests/strings/constant_string_literal.sol
index 9c112c1faa..1efa60760e 100644
--- a/test/libsolidity/semanticTests/strings/constant_string_literal.sol
+++ b/test/libsolidity/semanticTests/strings/constant_string_literal.sol
@@ -15,7 +15,6 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // b() -> 0x6162636465666768696a6b6c6d6e6f7071000000000000000000000000000000
 // x() -> 0x20, 0x35, 0x616265666768696a6b6c6d6e6f70716162636465666768696a6b6c6d6e6f7071, 44048183304486788312148433451363384677562177293131179093971701692629931524096
diff --git a/test/libsolidity/semanticTests/strings/empty_string.sol b/test/libsolidity/semanticTests/strings/empty_string.sol
index abf72be38e..d1a6fc5849 100644
--- a/test/libsolidity/semanticTests/strings/empty_string.sol
+++ b/test/libsolidity/semanticTests/strings/empty_string.sol
@@ -5,6 +5,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/strings/empty_string_input.sol b/test/libsolidity/semanticTests/strings/empty_string_input.sol
index c1f0bca225..85c7a44a1a 100644
--- a/test/libsolidity/semanticTests/strings/empty_string_input.sol
+++ b/test/libsolidity/semanticTests/strings/empty_string_input.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0
 // g(string): 0x20, 0, "" -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/strings/return_string.sol b/test/libsolidity/semanticTests/strings/return_string.sol
index f221a5e156..4393d7dcc7 100644
--- a/test/libsolidity/semanticTests/strings/return_string.sol
+++ b/test/libsolidity/semanticTests/strings/return_string.sol
@@ -12,7 +12,6 @@ contract Main {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // set(string): 0x20, 5, "Julia" ->
 // get1() -> 0x20, 5, "Julia"
diff --git a/test/libsolidity/semanticTests/strings/string_escapes.sol b/test/libsolidity/semanticTests/strings/string_escapes.sol
index 89231e8519..3ccae698f0 100644
--- a/test/libsolidity/semanticTests/strings/string_escapes.sol
+++ b/test/libsolidity/semanticTests/strings/string_escapes.sol
@@ -6,6 +6,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x090a0d27225c0000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/strings/unicode_escapes.sol b/test/libsolidity/semanticTests/strings/unicode_escapes.sol
index 2c0e19121f..95c322f5b2 100644
--- a/test/libsolidity/semanticTests/strings/unicode_escapes.sol
+++ b/test/libsolidity/semanticTests/strings/unicode_escapes.sol
@@ -17,7 +17,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // oneByteUTF8() -> 0x20, 7, "aaa$aaa"
 // twoBytesUTF8() -> 0x20, 8, "aaa\xc2\xa2aaa"
diff --git a/test/libsolidity/semanticTests/strings/unicode_string.sol b/test/libsolidity/semanticTests/strings/unicode_string.sol
index f9d1cb1e35..516febe6ed 100644
--- a/test/libsolidity/semanticTests/strings/unicode_string.sol
+++ b/test/libsolidity/semanticTests/strings/unicode_string.sol
@@ -9,7 +9,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0x14, "\xf0\x9f\x98\x83, \xf0\x9f\x98\xad, and \xf0\x9f\x98\x88"
 // g() -> 0x20, 0x14, "\xf0\x9f\x98\x83, \xf0\x9f\x98\xad, and \xf0\x9f\x98\x88"
diff --git a/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol b/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol
index 1bfc7ce1f4..f62f4c0845 100644
--- a/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol
+++ b/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol
@@ -10,6 +10,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // func() ->
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol
index ac3d5a4e72..4aef7a593e 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol
@@ -42,7 +42,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f((uint128,(uint128,uint256[][2],uint32)),uint32): 0x40, 44, 11, 0x40, 22, 0x60, 33, 0x40, 0x40, 2, 1, 2 -> 44, 22, 1, 2, 33
 // g(((uint128,uint256[][2],uint32)[2])): 0x20, 0x20, 0x40, 0x40, 22, 0x60, 33, 0x40, 0x40, 2, 1, 2 -> 22, 1, 2, 33
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol
index 2fe78260ae..ca635aeb43 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol
@@ -15,6 +15,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint256,uint256)): 42, 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
index 7d4d124bb8..86ad706781 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
@@ -17,6 +17,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,(uint256,uint256),uint256): 1, 2, 3, 4 -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
index 0439aeff58..ca780bfb39 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
@@ -20,6 +20,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f((uint256,uint256[2],uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol
index 22e4547cd5..e6972e03f3 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol
@@ -20,6 +20,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint32,uint256[],uint64)): 0x20, 42, 0x60, 23, 2, 1, 2 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol
index 4849b47482..e4dc8f6f37 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol
@@ -23,7 +23,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // f((uint128,(uint128,uint256[][2],uint32)),uint32): 0x40, 44, 11, 0x40, 22, 0x60, 33, 0x40, 0x40, 2, 1, 2 -> 44, 22, 1, 2, 33
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol
index 8f092ace0e..bf75ba1e1c 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol
@@ -18,6 +18,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 78, 1, 2, 88
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol
index 6762368f1d..f22bc6deb1 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol
@@ -23,6 +23,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f((uint256,(uint64,uint64),uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol
index 28a8e57dd5..83047c2571 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol
@@ -23,6 +23,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f((uint256,(uint64,bytes),uint256)): 0x20, 42, 0x60, 23, 1, 0x40, 2, "ab" -> 42, 1, "a", 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol
index e4f911161a..76e6f7c1d8 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol
@@ -15,6 +15,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint256,uint256,bytes2)): 42, 23, "ab" -> 42, 23, "b"
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol
index 868fea9828..f18280fc70 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 78, 1, 2, 88
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol
index 2dc65bb11d..74d30f5052 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol
@@ -18,6 +18,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint32,(uint256,uint64,bytes2),uint256): 1, 42, 23, "ab", 1 -> 42, 23, "b"
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
index 25530a1815..fe15155842 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
@@ -18,6 +18,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f((uint256,uint256[2],uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
index f62742fa76..8fab357368 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
@@ -18,6 +18,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f((uint256,bytes,uint256)): 0x20, 42, 0x60, 23, 2, "ab" -> 42, "a", "b", 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol
index 4f9c3162aa..8c0f552b69 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol
@@ -18,6 +18,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 78, 1, 2, 88
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
index c5f2e73434..94267dc792 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
@@ -15,7 +15,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
 // gas irOptimized: 203299
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol
index 6cac49d8c3..6092b161d9 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol
@@ -25,6 +25,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint256,uint256),(uint256),(uint256,uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol b/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol
index 11ef1917e8..2b75441394 100644
--- a/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol
@@ -9,6 +9,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint256,(uint256)[])): 32, 17, 64, 2, 23, 42 -> 2, 17, 23, 42
diff --git a/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol b/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol
index 1b71f2f946..b4beff9416 100644
--- a/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol
@@ -8,6 +8,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint256[])): 32, 32, 2, 42, 23 -> 2, 42, 23
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
index 509fd29ed8..089b7c37e2 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
@@ -22,7 +22,6 @@ contract CopyTest {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // run() -> 2, 23, 42
 // gas irOptimized: 194003
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol
index 3f3a9a3d26..57538e392e 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol
@@ -47,6 +47,5 @@ contract CopyTest {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // run() -> 0x20, 10, 0x42, 0x4200, 0x420000, 0x420001, 0x420002, 0x4201, 0x420100, 0x420101, 0x420102, 0x420103
diff --git a/test/libsolidity/semanticTests/structs/copy_from_calldata.sol b/test/libsolidity/semanticTests/structs/copy_from_calldata.sol
index bfe6fc949c..e78d5bdd8a 100644
--- a/test/libsolidity/semanticTests/structs/copy_from_calldata.sol
+++ b/test/libsolidity/semanticTests/structs/copy_from_calldata.sol
@@ -33,6 +33,5 @@ contract Test {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/structs/copy_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_from_storage.sol
index d4a970bdce..2f2ffcf60f 100644
--- a/test/libsolidity/semanticTests/structs/copy_from_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_from_storage.sol
@@ -19,6 +19,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 1, 13
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
index 876a7f6c8e..1e17285fe9 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
@@ -85,7 +85,6 @@ contract Test {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // test1() -> true
 // gas irOptimized: 150533
diff --git a/test/libsolidity/semanticTests/structs/delete_struct.sol b/test/libsolidity/semanticTests/structs/delete_struct.sol
index fda4e20e12..5ea9a712b2 100644
--- a/test/libsolidity/semanticTests/structs/delete_struct.sol
+++ b/test/libsolidity/semanticTests/structs/delete_struct.sol
@@ -39,7 +39,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // getToDelete() -> 0
 // getTopValue() -> 0
diff --git a/test/libsolidity/semanticTests/structs/event.sol b/test/libsolidity/semanticTests/structs/event.sol
index 36df8787f0..8ddc5ef0ca 100644
--- a/test/libsolidity/semanticTests/structs/event.sol
+++ b/test/libsolidity/semanticTests/structs/event.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // f() ->
diff --git a/test/libsolidity/semanticTests/structs/function_type_copy.sol b/test/libsolidity/semanticTests/structs/function_type_copy.sol
index 79fe5ef4c8..6230d47f9b 100644
--- a/test/libsolidity/semanticTests/structs/function_type_copy.sol
+++ b/test/libsolidity/semanticTests/structs/function_type_copy.sol
@@ -39,6 +39,5 @@ contract Test {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/structs/global.sol b/test/libsolidity/semanticTests/structs/global.sol
index b0485aea07..d51194ca0a 100644
--- a/test/libsolidity/semanticTests/structs/global.sol
+++ b/test/libsolidity/semanticTests/structs/global.sol
@@ -8,6 +8,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint256,uint256)): 42, 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol b/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol
index 15854aca5e..fe6de19f46 100644
--- a/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol
+++ b/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol
@@ -12,6 +12,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 3
diff --git a/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol b/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol
index 0d2d0c1de2..445961e2da 100644
--- a/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol
+++ b/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol
@@ -14,6 +14,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // s() -> 8, true
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol b/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol
index 9459c34773..a76518684b 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol
@@ -30,6 +30,5 @@ contract Test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 1, 2, 3
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested.sol
index 786147c409..3fee9b2105 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested.sol
@@ -40,6 +40,5 @@ contract Test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
index 89f5755779..0708fae03d 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
@@ -66,7 +66,6 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // load() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
 // gas irOptimized: 111425
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol b/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol
index 5e47a42fb3..5cafe53232 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol
@@ -51,7 +51,6 @@ contract Test {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // testInit() -> 0, 0, 0, 0, true
diff --git a/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol b/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
index f28bbf477f..263ad03a54 100644
--- a/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
+++ b/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
@@ -36,7 +36,6 @@ contract C {
 
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0x20, 4, 0x26121ff000000000000000000000000000000000000000000000000000000000
 // g() -> 0x20, 0x20, 4, 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol b/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
index 9766880bf4..0c5bd7a08d 100644
--- a/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
+++ b/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
@@ -19,6 +19,5 @@ contract C {
 
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol b/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol
index d5f9e8dc72..64328b2dee 100644
--- a/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol
+++ b/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol
@@ -14,6 +14,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol b/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
index 8d4931554d..97c2822115 100644
--- a/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
+++ b/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
@@ -21,7 +21,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test() -> 1
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/structs/recursive_struct_2.sol b/test/libsolidity/semanticTests/structs/recursive_struct_2.sol
index 5214b1a483..50cc311f5d 100644
--- a/test/libsolidity/semanticTests/structs/recursive_struct_2.sol
+++ b/test/libsolidity/semanticTests/structs/recursive_struct_2.sol
@@ -21,6 +21,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0, 0, 0, 0
diff --git a/test/libsolidity/semanticTests/structs/recursive_structs.sol b/test/libsolidity/semanticTests/structs/recursive_structs.sol
index 4336b54db3..58f178e5ec 100644
--- a/test/libsolidity/semanticTests/structs/recursive_structs.sol
+++ b/test/libsolidity/semanticTests/structs/recursive_structs.sol
@@ -17,6 +17,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol b/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol
index f357474c6c..c05d87b37c 100644
--- a/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol
+++ b/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol
@@ -10,6 +10,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol b/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol
index 695b29a36f..357863abb4 100644
--- a/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol
+++ b/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol
@@ -34,6 +34,5 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // assign() -> 2, 2, 3, 3
diff --git a/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol b/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol
index 7868a620e5..f936417517 100644
--- a/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol
+++ b/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol
@@ -27,6 +27,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // get() -> 0x01, 0x00, 0x09, 0x00, 0x04, 0x05
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index f77156d643..ef0e9287d9 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -21,7 +21,6 @@ contract c {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index f7083c7a0b..1655324e53 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -35,7 +35,6 @@ contract c {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // set(uint256): 7 -> true
 // gas irOptimized: 110051
diff --git a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
index 4305687b7c..26fbeb3bf8 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
@@ -18,7 +18,6 @@ contract c {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> true
 // gas irOptimized: 110177
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_member.sol b/test/libsolidity/semanticTests/structs/struct_delete_member.sol
index 1db9edd4e9..c881d8a936 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_member.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_member.sol
@@ -18,6 +18,5 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // deleteMember() -> 0
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage.sol
index d57aea3c72..776ceddc6e 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage.sol
@@ -19,6 +19,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index bdb60b877b..347b65cf16 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -41,7 +41,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() ->
 // gas irOptimized: 121619
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol b/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
index 85d2c05561..bdd435b20e 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
@@ -15,6 +15,5 @@ contract test {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // deleteIt() -> 0
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol
index 3d4eafa349..66657fc676 100644
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol
@@ -24,6 +24,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 42, 23, 34
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
index 6c317598b9..75903b9b0b 100644
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
+++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
@@ -29,7 +29,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 42, 23, 34, 42, 42
 // gas irOptimized: 110843
diff --git a/test/libsolidity/semanticTests/structs/struct_named_constructor.sol b/test/libsolidity/semanticTests/structs/struct_named_constructor.sol
index cb0b0525f8..2433da8666 100644
--- a/test/libsolidity/semanticTests/structs/struct_named_constructor.sol
+++ b/test/libsolidity/semanticTests/structs/struct_named_constructor.sol
@@ -12,6 +12,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // s() -> 1, true
diff --git a/test/libsolidity/semanticTests/structs/struct_reference.sol b/test/libsolidity/semanticTests/structs/struct_reference.sol
index c836d3f1d3..feae7b01e2 100644
--- a/test/libsolidity/semanticTests/structs/struct_reference.sol
+++ b/test/libsolidity/semanticTests/structs/struct_reference.sol
@@ -19,7 +19,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // check() -> false
 // set() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_referencing.sol b/test/libsolidity/semanticTests/structs/struct_referencing.sol
index af2357a23e..0d7d1a7545 100644
--- a/test/libsolidity/semanticTests/structs/struct_referencing.sol
+++ b/test/libsolidity/semanticTests/structs/struct_referencing.sol
@@ -47,7 +47,6 @@ contract C is I {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: L
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol b/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol
index 2ef6f4cf48..11d87adf14 100644
--- a/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol
+++ b/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol
@@ -23,6 +23,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol b/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol
index 31952dede3..9ae412fcad 100644
--- a/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol
@@ -12,6 +12,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol b/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol
index e079f61e76..8b9035d188 100644
--- a/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol
@@ -22,6 +22,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 42, 23, 34
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol
index e420045712..c3aa23c3be 100644
--- a/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol
+++ b/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol
@@ -27,7 +27,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 42, 23, 34, 42, 42
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index 412b71d39f..ed04ba2dbd 100644
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ b/test/libsolidity/semanticTests/structs/structs.sol
@@ -28,7 +28,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // check() -> false
 // set() ->
diff --git a/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol b/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol
index 347aeb5951..f97935fb67 100644
--- a/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol
+++ b/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol
@@ -9,7 +9,6 @@ contract C {
 }
 // ====
 // compileToEwasm: false
-// compileViaYul: also
 // ----
 // library: D
 // f(uint256): 7 -> 0x15
diff --git a/test/libsolidity/semanticTests/tryCatch/assert.sol b/test/libsolidity/semanticTests/tryCatch/assert.sol
index be475a3f2c..f70760028d 100644
--- a/test/libsolidity/semanticTests/tryCatch/assert.sol
+++ b/test/libsolidity/semanticTests/tryCatch/assert.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/tryCatch/create.sol b/test/libsolidity/semanticTests/tryCatch/create.sol
index 6923b6cb6a..ad7f734c75 100644
--- a/test/libsolidity/semanticTests/tryCatch/create.sol
+++ b/test/libsolidity/semanticTests/tryCatch/create.sol
@@ -27,7 +27,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f() -> 0, 0, 96, 13, "test message."
 // g() -> 0xf01f7809444bd9a93a854361c6fae3f23d9e23db, 0, 96, 7, "success"
diff --git a/test/libsolidity/semanticTests/tryCatch/invalid_error_encoding.sol b/test/libsolidity/semanticTests/tryCatch/invalid_error_encoding.sol
index 1b89213cf2..2bfc23191f 100644
--- a/test/libsolidity/semanticTests/tryCatch/invalid_error_encoding.sol
+++ b/test/libsolidity/semanticTests/tryCatch/invalid_error_encoding.sol
@@ -149,7 +149,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f1() -> 2
 // f1a() -> 2
diff --git a/test/libsolidity/semanticTests/tryCatch/lowLevel.sol b/test/libsolidity/semanticTests/tryCatch/lowLevel.sol
index 06710050ec..ac275522d9 100644
--- a/test/libsolidity/semanticTests/tryCatch/lowLevel.sol
+++ b/test/libsolidity/semanticTests/tryCatch/lowLevel.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f(bool): true -> 1, 2, 96, 0
 // f(bool): false -> 0, 0, 96, 100, 0x8c379a000000000000000000000000000000000000000000000000000000000, 0x2000000000000000000000000000000000000000000000000000000000, 0x76d657373616765000000000000000000000000000000000000000000, 0
diff --git a/test/libsolidity/semanticTests/tryCatch/malformed_error.sol b/test/libsolidity/semanticTests/tryCatch/malformed_error.sol
index bcac7c1c64..95c29276e6 100644
--- a/test/libsolidity/semanticTests/tryCatch/malformed_error.sol
+++ b/test/libsolidity/semanticTests/tryCatch/malformed_error.sol
@@ -79,7 +79,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // a() -> 0x00
 // b() -> 0x00
diff --git a/test/libsolidity/semanticTests/tryCatch/malformed_panic.sol b/test/libsolidity/semanticTests/tryCatch/malformed_panic.sol
index 8bd2e822a8..816dab7c47 100644
--- a/test/libsolidity/semanticTests/tryCatch/malformed_panic.sol
+++ b/test/libsolidity/semanticTests/tryCatch/malformed_panic.sol
@@ -47,7 +47,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // a() -> 0x00
 // b() -> 0x00
diff --git a/test/libsolidity/semanticTests/tryCatch/malformed_panic_2.sol b/test/libsolidity/semanticTests/tryCatch/malformed_panic_2.sol
index bb7e48f32e..bf47c01a81 100644
--- a/test/libsolidity/semanticTests/tryCatch/malformed_panic_2.sol
+++ b/test/libsolidity/semanticTests/tryCatch/malformed_panic_2.sol
@@ -45,7 +45,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // a() -> FAILURE, hex"4e487b"
 // b() -> FAILURE, hex"4e487b710000"
diff --git a/test/libsolidity/semanticTests/tryCatch/malformed_panic_3.sol b/test/libsolidity/semanticTests/tryCatch/malformed_panic_3.sol
index 52a76f1813..cad5aaa464 100644
--- a/test/libsolidity/semanticTests/tryCatch/malformed_panic_3.sol
+++ b/test/libsolidity/semanticTests/tryCatch/malformed_panic_3.sol
@@ -51,7 +51,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // a() -> FAILURE, hex"4e487b"
 // b() -> FAILURE, hex"4e487b710000"
diff --git a/test/libsolidity/semanticTests/tryCatch/malformed_panic_4.sol b/test/libsolidity/semanticTests/tryCatch/malformed_panic_4.sol
index 2efce68533..ad096b9b8b 100644
--- a/test/libsolidity/semanticTests/tryCatch/malformed_panic_4.sol
+++ b/test/libsolidity/semanticTests/tryCatch/malformed_panic_4.sol
@@ -55,7 +55,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // a() -> 0x00
 // b() -> 0x00
diff --git a/test/libsolidity/semanticTests/tryCatch/nested.sol b/test/libsolidity/semanticTests/tryCatch/nested.sol
index 03e6ad5532..7c56a81b78 100644
--- a/test/libsolidity/semanticTests/tryCatch/nested.sol
+++ b/test/libsolidity/semanticTests/tryCatch/nested.sol
@@ -26,7 +26,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f(bool,bool): true, true -> 1, 2, 96, 7, "success"
 // f(bool,bool): true, false -> 12, 0, 96, 7, "failure"
diff --git a/test/libsolidity/semanticTests/tryCatch/panic.sol b/test/libsolidity/semanticTests/tryCatch/panic.sol
index 9211b4fa4a..eb7dd8c8b2 100644
--- a/test/libsolidity/semanticTests/tryCatch/panic.sol
+++ b/test/libsolidity/semanticTests/tryCatch/panic.sol
@@ -22,7 +22,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // onlyPanic(bool,uint256,uint256): true, 7, 6 -> 1, 0x00
 // onlyPanic(bool,uint256,uint256): true, 6, 7 -> 0x00, 0x11
diff --git a/test/libsolidity/semanticTests/tryCatch/return_function.sol b/test/libsolidity/semanticTests/tryCatch/return_function.sol
index b9c2d903fa..2e85942dd0 100644
--- a/test/libsolidity/semanticTests/tryCatch/return_function.sol
+++ b/test/libsolidity/semanticTests/tryCatch/return_function.sol
@@ -14,6 +14,5 @@ contract C {
     function fun() public pure {}
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x1, 0xfdd67305928fcac8d213d1e47bfa6165cd0b87b946644cd0000000000000000, 9
diff --git a/test/libsolidity/semanticTests/tryCatch/simple.sol b/test/libsolidity/semanticTests/tryCatch/simple.sol
index 1f12614a73..48bccfa5af 100644
--- a/test/libsolidity/semanticTests/tryCatch/simple.sol
+++ b/test/libsolidity/semanticTests/tryCatch/simple.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f(bool): true -> 1, 2
 // f(bool): false -> 9, 10
diff --git a/test/libsolidity/semanticTests/tryCatch/simple_notuple.sol b/test/libsolidity/semanticTests/tryCatch/simple_notuple.sol
index 7b58006f48..6368edf700 100644
--- a/test/libsolidity/semanticTests/tryCatch/simple_notuple.sol
+++ b/test/libsolidity/semanticTests/tryCatch/simple_notuple.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f(bool): true -> 13
 // f(bool): false -> 9
diff --git a/test/libsolidity/semanticTests/tryCatch/structured.sol b/test/libsolidity/semanticTests/tryCatch/structured.sol
index e4c04932ac..e5aa238b30 100644
--- a/test/libsolidity/semanticTests/tryCatch/structured.sol
+++ b/test/libsolidity/semanticTests/tryCatch/structured.sol
@@ -14,7 +14,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f(bool): true -> 1, 2, 0x60, 7, "success"
 // f(bool): false -> 0, 0, 0x60, 7, "message"
diff --git a/test/libsolidity/semanticTests/tryCatch/structuredAndLowLevel.sol b/test/libsolidity/semanticTests/tryCatch/structuredAndLowLevel.sol
index 91542d7ba2..8a8cb3d1b6 100644
--- a/test/libsolidity/semanticTests/tryCatch/structuredAndLowLevel.sol
+++ b/test/libsolidity/semanticTests/tryCatch/structuredAndLowLevel.sol
@@ -18,7 +18,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f(bool): true -> 1, 2, 96, 7, "success"
 // f(bool): false -> 99, 0, 96, 82, "message longer than 32 bytes 32 ", "bytes 32 bytes 32 bytes 32 bytes", " 32 bytes 32 bytes"
diff --git a/test/libsolidity/semanticTests/tryCatch/super_trivial.sol b/test/libsolidity/semanticTests/tryCatch/super_trivial.sol
index 9c03405224..98fbcddb21 100644
--- a/test/libsolidity/semanticTests/tryCatch/super_trivial.sol
+++ b/test/libsolidity/semanticTests/tryCatch/super_trivial.sol
@@ -12,7 +12,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/tryCatch/trivial.sol b/test/libsolidity/semanticTests/tryCatch/trivial.sol
index 567b4b7146..a69a51f449 100644
--- a/test/libsolidity/semanticTests/tryCatch/trivial.sol
+++ b/test/libsolidity/semanticTests/tryCatch/trivial.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/tryCatch/try_catch_library_call.sol b/test/libsolidity/semanticTests/tryCatch/try_catch_library_call.sol
index cccec9a3cf..e7bad76b08 100644
--- a/test/libsolidity/semanticTests/tryCatch/try_catch_library_call.sol
+++ b/test/libsolidity/semanticTests/tryCatch/try_catch_library_call.sol
@@ -37,7 +37,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // library: L
 // f(bool): true -> 8, 0x40, 0
diff --git a/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol b/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol
index 6ccfc5550a..f431f2d833 100644
--- a/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol
+++ b/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol
@@ -12,7 +12,6 @@ contract C is A {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // m(uint256,uint256,uint256): 0, 0, 0 -> FAILURE
 // m(uint256,uint256,uint256): 1, 0, 1 -> 2
diff --git a/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol b/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol
index 53f7fe9745..04724f4c79 100644
--- a/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol
+++ b/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol
index 83677d2eab..09558a697b 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // bytesToBytes(bytes2): "ab" -> "ab"
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol
index 6663b4dfe8..5417800271 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // bytesToBytes(bytes4): "abcd" -> "abcd"
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol
index 2c7029e696..5868492940 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // bytesToBytes(bytes4): "abcd" -> "ab"
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol
index fb2872418e..93906e6e0e 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // bytesToUint(bytes4): "abcd" -> 0x61626364
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol
index 00a0f748c9..52a99511d1 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // bytesToUint(bytes1): "a" -> 0x61
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol
index c17a192e8a..e13f99cd60 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // bytesToUint(bytes32): "abc2" -> left(0x61626332)
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol
index 65db2cd9c1..aae1576e5a 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // bytesToUint(bytes4): "abcd" -> 0x6364
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol
index 07313e0853..cf170a2aaf 100644
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // UintToBytes(uint16): 0x6162 -> "\x00\x00\x00\x00\x00\x00ab"
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol
index 454a92d4f6..18a09dfe54 100644
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // UintToBytes(uint8): 0x61 -> "a"
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol
index 3aa27fa2bd..10c3a351de 100644
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // uintToBytes(uint256): left(0x616263) -> left(0x616263)
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol
index 8ede41746e..8abc70d3d3 100644
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol
@@ -5,6 +5,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // uintToBytes(uint32): 0x61626364 -> "cd"
diff --git a/test/libsolidity/semanticTests/types/external_function_to_address.sol b/test/libsolidity/semanticTests/types/external_function_to_address.sol
index 5ebcbeb2b3..d2f5523b17 100644
--- a/test/libsolidity/semanticTests/types/external_function_to_address.sol
+++ b/test/libsolidity/semanticTests/types/external_function_to_address.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol b/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
index ae6756822e..1b499d542c 100644
--- a/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
+++ b/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
@@ -21,7 +21,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // testAB() -> true
diff --git a/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol b/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol
index 26a3b853e5..caf587b53b 100644
--- a/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol
+++ b/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol
@@ -11,7 +11,6 @@ contract C is A {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // m(uint256): 1 -> 0
 // m(uint256): 5 -> 20
diff --git a/test/libsolidity/semanticTests/types/mapping_contract_key.sol b/test/libsolidity/semanticTests/types/mapping_contract_key.sol
index 877ead6de1..bf424e7a4e 100644
--- a/test/libsolidity/semanticTests/types/mapping_contract_key.sol
+++ b/test/libsolidity/semanticTests/types/mapping_contract_key.sol
@@ -9,7 +9,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // get(address): 0 -> 0
 // get(address): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol b/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol
index 8e29ad63e3..d71642d87f 100644
--- a/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol
+++ b/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol
@@ -9,7 +9,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // table(address): 0 -> 0
 // table(address): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol b/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol
index 8b78209aed..dbf0fcede1 100644
--- a/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol
+++ b/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol
@@ -17,7 +17,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: L
 // get(address): 0 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol
index 834e866a32..7e2302d0fe 100644
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol
+++ b/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol
@@ -10,7 +10,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // table(uint8): 0 -> 0
 // table(uint8): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_library_v2.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_library_v2.sol
index 5d2218b357..87676aa0d6 100644
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_library_v2.sol
+++ b/test/libsolidity/semanticTests/types/mapping_enum_key_library_v2.sol
@@ -20,7 +20,6 @@ contract test {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // library: L
 // get(uint8): 0 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_v2.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_v2.sol
index b8c28d2496..a35fdd2273 100644
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_v2.sol
+++ b/test/libsolidity/semanticTests/types/mapping_enum_key_v2.sol
@@ -11,7 +11,6 @@ contract test {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // get(uint8): 0 -> 0
 // get(uint8): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_simple.sol b/test/libsolidity/semanticTests/types/mapping_simple.sol
index edee1d8557..a3a77d4d15 100644
--- a/test/libsolidity/semanticTests/types/mapping_simple.sol
+++ b/test/libsolidity/semanticTests/types/mapping_simple.sol
@@ -8,7 +8,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // get(uint8): 0 -> 0
 // get(uint8): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/types/nested_tuples.sol b/test/libsolidity/semanticTests/types/nested_tuples.sol
index 43cc88bf8e..c3e96240a5 100644
--- a/test/libsolidity/semanticTests/types/nested_tuples.sol
+++ b/test/libsolidity/semanticTests/types/nested_tuples.sol
@@ -28,7 +28,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f0() -> 2, true
 // f1() -> 1
diff --git a/test/libsolidity/semanticTests/types/packing_signed_types.sol b/test/libsolidity/semanticTests/types/packing_signed_types.sol
index 16b11061ad..392a52f2cf 100644
--- a/test/libsolidity/semanticTests/types/packing_signed_types.sol
+++ b/test/libsolidity/semanticTests/types/packing_signed_types.sol
@@ -6,6 +6,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // run() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa
diff --git a/test/libsolidity/semanticTests/types/packing_unpacking_types.sol b/test/libsolidity/semanticTests/types/packing_unpacking_types.sol
index 77015a9dcb..7d12c47a44 100644
--- a/test/libsolidity/semanticTests/types/packing_unpacking_types.sol
+++ b/test/libsolidity/semanticTests/types/packing_unpacking_types.sol
@@ -7,7 +7,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // run(bool,uint32,uint64): true, 0x0f0f0f0f, 0xf0f0f0f0f0f0f0f0
 // -> 0x0000000000000000000000000000000000000001f0f0f0f00f0f0f0f0f0f0f0f
diff --git a/test/libsolidity/semanticTests/types/strings.sol b/test/libsolidity/semanticTests/types/strings.sol
index 9f2df8ae64..9242eca2e0 100644
--- a/test/libsolidity/semanticTests/types/strings.sol
+++ b/test/libsolidity/semanticTests/types/strings.sol
@@ -13,7 +13,6 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // fixedBytesHex() -> "\xaa\xbb\x00\xff"
 // fixedBytes() -> "abc\x00\xff__"
diff --git a/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol b/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol
index 47eaf7dc49..6a6b271246 100644
--- a/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol
+++ b/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol
@@ -19,7 +19,6 @@ contract C is A {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // getM(uint256,uint256): 0, 0 -> 0
 // getM(uint256,uint256): 1, 5 -> 0x10
diff --git a/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol b/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol
index 0e0c66802a..5ac35853bf 100644
--- a/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol
+++ b/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol
@@ -9,6 +9,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x30, 0x31, 0x32
diff --git a/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol b/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol
index fda96b6cc0..320290c9f3 100644
--- a/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol
+++ b/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol
@@ -3,6 +3,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 0xffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/underscore/as_function.sol b/test/libsolidity/semanticTests/underscore/as_function.sol
index e97cc1705d..8f9fe0b597 100644
--- a/test/libsolidity/semanticTests/underscore/as_function.sol
+++ b/test/libsolidity/semanticTests/underscore/as_function.sol
@@ -14,7 +14,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // _() -> 88
 // g() -> 88
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol
index 85c12f0ad6..e2551a2a8f 100644
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol
+++ b/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol
@@ -21,6 +21,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol
index 0c5ac1e57c..209ad8bb24 100644
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol
+++ b/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol
@@ -21,6 +21,5 @@ contract Test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
index d791bbcb13..0f446f775b 100644
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
+++ b/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
@@ -37,6 +37,5 @@ contract InvalidTest {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // run() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol
index cd20189d4a..e534e42313 100644
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol
+++ b/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol
@@ -16,7 +16,6 @@ contract InvalidTest {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x51
 // f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/abicodec.sol b/test/libsolidity/semanticTests/userDefinedValueType/abicodec.sol
index 65c604d1b2..c2f89ba86c 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/abicodec.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/abicodec.sol
@@ -30,7 +30,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // EVMVersion: >=byzantium
 // ----
 // g() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol b/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol
index 6af03b847b..2e7933ad8c 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol
@@ -25,7 +25,6 @@ contract C {
 
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes2): "ab" -> 0x6162000000000000000000000000000000000000000000000000000000000000
 // g(bytes2): "ab" -> 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 433470160d..e41a337749 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -48,7 +48,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test_f() -> true
 // gas irOptimized: 122329
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
index 0305fd473b..88c27d58e0 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
@@ -21,7 +21,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // s() -> 0, 0, 0x00, 0
 // f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol b/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
index 771e0f80c4..0ee953f0b1 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
@@ -35,7 +35,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // ret() -> 0xff
 // f(uint8): 0x1ff -> FAILURE
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/constant.sol b/test/libsolidity/semanticTests/userDefinedValueType/constant.sol
index 9559c3d7ab..6411e174e2 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/constant.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/constant.sol
@@ -6,7 +6,6 @@ contract C {
   int224 constant public u = T.unwrap(t);
 }
 // ====
-// compileViaYul: also
 // ----
 // s() -> 165521356710917456517261742455526507355687727119203895813322792776
 // t() -> 165521356710917456517261742455526507355687727119203895813322792776
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol b/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
index bbf5dcf299..6229861ff3 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
@@ -29,7 +29,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 1 -> 1
 // f(uint256): 2 -> 2
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol b/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol
index a74d02ff15..ccdcd97964 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol
@@ -21,7 +21,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // a() -> 13
 // b() -> 0x0401000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol b/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol
index 4100e17f8b..c194dc45ca 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol
@@ -19,7 +19,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // x() -> -5
 // create_dirty_slot() ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index d65af8e8cc..b4350c43c4 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -111,7 +111,6 @@ contract ERC20 {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol b/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol
index 47140a773b..15253d24d4 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol
@@ -41,7 +41,6 @@ contract TestFixedMath {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // add(uint256,uint256): 0, 0 -> 0
 // add(uint256,uint256): 25, 45 -> 0x46
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol b/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol
index 8923984a49..74fe6ee406 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol
@@ -15,7 +15,6 @@ contract C {
     function g() internal pure returns (uint) { return 2; }
 }
 // ====
-// compileViaYul: also
 // ----
 // direct() -> -2, 0x6162000000000000000000000000000000000000000000000000000000000000
 // viaasm() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol b/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol
index 0691a4c3ae..24fdb765bc 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol
@@ -8,6 +8,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 5, 10
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol b/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol
index e698308b40..ebdc4c0dd3 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol
@@ -9,7 +9,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set(int256,int256): 1, 1 ->
 // m(int256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
index b250bea87c..60bb81737c 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
@@ -21,7 +21,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // s() -> 0, 0, 0x00, 0
 // f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol b/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol
index 67069157cd..c7db5dead0 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol
@@ -8,7 +8,6 @@ contract A {
     function f(address x) external view returns(OurAddress) { return OurAddress.wrap(x); }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(int256): 5 -> 5
 // f(address): 1 -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol b/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol
index 2d28330590..6823eec1d4 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol
@@ -7,7 +7,6 @@ contract C {
   function g(M.MyInt x) public pure returns (int) { return M.MyInt.unwrap(x); }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(int256): 5 -> 5
 // g(int256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol b/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol
index 3f31acaca5..cb0f01bf87 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol
@@ -22,7 +22,6 @@ contract Ownable {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // owner() -> 0x1212121212121212121212121212120000000012
 // setOwner(address): 0x1212121212121212121212121212120000000012 ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol b/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol
index 56cebc923d..270d024283 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol
@@ -23,7 +23,6 @@ contract C {
 
 }
 // ====
-// compileViaYul: also
 // ----
 // id(address): 5 -> 5
 // id(address): 0xffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/simple.sol b/test/libsolidity/semanticTests/userDefinedValueType/simple.sol
index fd5cdd07a1..be9afe4d3c 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/simple.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/simple.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0
 // g() -> 1, 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol
index aab0b86d84..58a0347e5f 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol
@@ -63,7 +63,6 @@ contract C {
 
 }
 // ====
-// compileViaYul: also
 // ----
 // storage_a() -> 0, 0
 // storage_b() -> 0, 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
index 219145a575..c3e86b5e75 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
@@ -152,7 +152,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // storage_a() -> 0, 0
 // set_a(int64,int64): 100, 200 ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol b/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol
index 80745866a7..d7380142ea 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol
@@ -24,7 +24,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // a() -> -2
 // direct() -> -2
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol b/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol
index c3b68e7c3e..17e42d728e 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol
@@ -6,6 +6,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol b/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol
index f6103c5967..fde37f5718 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol
@@ -16,7 +16,6 @@ contract D {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 0x42 -> 0x42
 // g(uint256): 0x42 -> 0x42
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
index d2d46c7088..e01c34b4f8 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
@@ -17,7 +17,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // getX() -> 0
 // gas irOptimized: 23379
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
index 44d87c397c..e0d0e236dd 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
@@ -18,7 +18,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // getX() -> 0
 // gas irOptimized: 23379
diff --git a/test/libsolidity/semanticTests/using/calldata_memory_copy.sol b/test/libsolidity/semanticTests/using/calldata_memory_copy.sol
index 493cfc29b0..c96f9b2322 100644
--- a/test/libsolidity/semanticTests/using/calldata_memory_copy.sol
+++ b/test/libsolidity/semanticTests/using/calldata_memory_copy.sol
@@ -14,6 +14,5 @@ function sum(uint[] memory arr) returns (uint result) {
 using {sum} for uint[];
 
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[]): 0x20, 3, 1, 2, 8 -> 11
diff --git a/test/libsolidity/semanticTests/using/free_function_braces.sol b/test/libsolidity/semanticTests/using/free_function_braces.sol
index e522ff61b2..6ea8be2978 100644
--- a/test/libsolidity/semanticTests/using/free_function_braces.sol
+++ b/test/libsolidity/semanticTests/using/free_function_braces.sol
@@ -18,7 +18,6 @@ contract C {
     using {id, zero} for uint;
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 10 -> 10
 // g(uint256): 10 -> 0
diff --git a/test/libsolidity/semanticTests/using/free_function_multi.sol b/test/libsolidity/semanticTests/using/free_function_multi.sol
index bf71e4d44b..c40ba9b334 100644
--- a/test/libsolidity/semanticTests/using/free_function_multi.sol
+++ b/test/libsolidity/semanticTests/using/free_function_multi.sol
@@ -19,7 +19,6 @@ function zero(uint) pure returns (uint) {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 10 -> 10
 // g(uint256): 10 -> 0
diff --git a/test/libsolidity/semanticTests/using/free_functions_individual.sol b/test/libsolidity/semanticTests/using/free_functions_individual.sol
index 334b427e13..2033291cbc 100644
--- a/test/libsolidity/semanticTests/using/free_functions_individual.sol
+++ b/test/libsolidity/semanticTests/using/free_functions_individual.sol
@@ -22,7 +22,6 @@ function zero(uint) pure returns (uint) {
 
 
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 10 -> 10
 // g(uint256): 10 -> 0
diff --git a/test/libsolidity/semanticTests/using/imported_functions.sol b/test/libsolidity/semanticTests/using/imported_functions.sol
index d99e558fdc..0ed92fd2ff 100644
--- a/test/libsolidity/semanticTests/using/imported_functions.sol
+++ b/test/libsolidity/semanticTests/using/imported_functions.sol
@@ -13,7 +13,6 @@ using {A.inc, f} for uint;
 import {inc as f} from "A";
 import "A" as A;
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 5 -> 12
 // f(uint256): 10 -> 0x16
diff --git a/test/libsolidity/semanticTests/using/library_on_interface.sol b/test/libsolidity/semanticTests/using/library_on_interface.sol
index ff716dadbb..5e49e3f196 100644
--- a/test/libsolidity/semanticTests/using/library_on_interface.sol
+++ b/test/libsolidity/semanticTests/using/library_on_interface.sol
@@ -13,6 +13,5 @@ contract C is I {
     function f() public pure returns (uint) { return 7; }
 }
 // ====
-// compileViaYul: also
 // ----
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/using/library_through_module.sol b/test/libsolidity/semanticTests/using/library_through_module.sol
index 6102f5a707..73fb60ae14 100644
--- a/test/libsolidity/semanticTests/using/library_through_module.sol
+++ b/test/libsolidity/semanticTests/using/library_through_module.sol
@@ -25,7 +25,6 @@ contract C {
 import "A" as M;
 
 // ====
-// compileViaYul: also
 // ----
 // library: "A":L
 // f(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/using/module_renamed.sol b/test/libsolidity/semanticTests/using/module_renamed.sol
index d648e88d1a..4317d434cc 100644
--- a/test/libsolidity/semanticTests/using/module_renamed.sol
+++ b/test/libsolidity/semanticTests/using/module_renamed.sol
@@ -21,6 +21,5 @@ using {M.g, M.f} for uint;
 import "B" as M;
 
 // ====
-// compileViaYul: also
 // ----
 // test(uint256,uint256): 1, 1 -> 9, 3
diff --git a/test/libsolidity/semanticTests/using/recursive_import.sol b/test/libsolidity/semanticTests/using/recursive_import.sol
index 09d27db60f..5b4d0f9582 100644
--- a/test/libsolidity/semanticTests/using/recursive_import.sol
+++ b/test/libsolidity/semanticTests/using/recursive_import.sol
@@ -20,6 +20,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 11
diff --git a/test/libsolidity/semanticTests/using/using_global_all_the_types.sol b/test/libsolidity/semanticTests/using/using_global_all_the_types.sol
index b4f071fa21..801132754b 100644
--- a/test/libsolidity/semanticTests/using/using_global_all_the_types.sol
+++ b/test/libsolidity/semanticTests/using/using_global_all_the_types.sol
@@ -33,6 +33,5 @@ contract C {
 import {E, S, T} from "A";
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 1, 7, 9
diff --git a/test/libsolidity/semanticTests/using/using_global_for_global.sol b/test/libsolidity/semanticTests/using/using_global_for_global.sol
index 7d7809d2ae..ced0c9e778 100644
--- a/test/libsolidity/semanticTests/using/using_global_for_global.sol
+++ b/test/libsolidity/semanticTests/using/using_global_for_global.sol
@@ -15,6 +15,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 100 -> 111
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/using/using_global_invisible.sol b/test/libsolidity/semanticTests/using/using_global_invisible.sol
index e4bf286eeb..b0a712f711 100644
--- a/test/libsolidity/semanticTests/using/using_global_invisible.sol
+++ b/test/libsolidity/semanticTests/using/using_global_invisible.sol
@@ -38,7 +38,6 @@ contract D {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // library: "A":L
 // test() -> 3
diff --git a/test/libsolidity/semanticTests/using/using_global_library.sol b/test/libsolidity/semanticTests/using/using_global_library.sol
index 747ed6bd04..3ac410b916 100644
--- a/test/libsolidity/semanticTests/using/using_global_library.sol
+++ b/test/libsolidity/semanticTests/using/using_global_library.sol
@@ -21,7 +21,6 @@ contract C {
 import {T} from "A";
 
 // ====
-// compileViaYul: also
 // ----
 // library: "A":L
 // f() -> 2, 1
diff --git a/test/libsolidity/semanticTests/variables/delete_local.sol b/test/libsolidity/semanticTests/variables/delete_local.sol
index 4b28e1966c..21f4c8edfc 100644
--- a/test/libsolidity/semanticTests/variables/delete_local.sol
+++ b/test/libsolidity/semanticTests/variables/delete_local.sol
@@ -7,6 +7,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // delLocal() -> 0
diff --git a/test/libsolidity/semanticTests/variables/delete_locals.sol b/test/libsolidity/semanticTests/variables/delete_locals.sol
index c900485897..8c14639d36 100644
--- a/test/libsolidity/semanticTests/variables/delete_locals.sol
+++ b/test/libsolidity/semanticTests/variables/delete_locals.sol
@@ -10,6 +10,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // delLocal() -> 6, 7
diff --git a/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol b/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol
index b4b158f623..6d8aa2f40f 100644
--- a/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol
+++ b/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol
@@ -12,6 +12,5 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 42, 0, 0, 21
diff --git a/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol b/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol
index 5e237ae176..399812cede 100644
--- a/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol
+++ b/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol
@@ -11,6 +11,5 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 42, 0, 0, 21
diff --git a/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol b/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol
index eb5e6b8540..7916c512b7 100644
--- a/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol
+++ b/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol
@@ -13,6 +13,5 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 42, 0, 0, 21
diff --git a/test/libsolidity/semanticTests/variables/public_state_overridding.sol b/test/libsolidity/semanticTests/variables/public_state_overridding.sol
index 05bd32ac2e..752c429cac 100644
--- a/test/libsolidity/semanticTests/variables/public_state_overridding.sol
+++ b/test/libsolidity/semanticTests/variables/public_state_overridding.sol
@@ -13,7 +13,6 @@ contract X is A
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> 0
 // set() ->
diff --git a/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol b/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol
index fb74e078c9..2195c85e10 100644
--- a/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol
+++ b/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol
@@ -19,7 +19,6 @@ contract X is A
 
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // test() -> 0, 64, 0
diff --git a/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol b/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
index befa5ab2a0..34d672cb6c 100644
--- a/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
+++ b/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
@@ -19,7 +19,6 @@ contract X is A
 
 
 // ====
-// compileViaYul: also
 // ----
 // test(uint256): 0 -> 0, 64, 0
 // test(uint256): 42 -> 0, 64, 0
diff --git a/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol b/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol
index 930ded40bf..af8d26a1a9 100644
--- a/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol
+++ b/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol
@@ -26,7 +26,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set() -> 1
 // perm() -> true
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 2adf317160..a91965580b 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -14,7 +14,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // constructor() ->
 // gas irOptimized: 192317
diff --git a/test/libsolidity/semanticTests/various/address_code_complex.sol b/test/libsolidity/semanticTests/various/address_code_complex.sol
index 0d3bf862a5..67d6ed14fc 100644
--- a/test/libsolidity/semanticTests/various/address_code_complex.sol
+++ b/test/libsolidity/semanticTests/various/address_code_complex.sol
@@ -13,7 +13,6 @@ contract C {
     function g() public returns (uint) { return address(new A()).code.length; }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0x20, 0x20, 0x48aa5566000000
 // g() -> 0x20
diff --git a/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol b/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol
index 4216c4d7e3..0aa7ceb954 100644
--- a/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol
+++ b/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol
@@ -8,6 +8,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x57a
diff --git a/test/libsolidity/semanticTests/various/balance.sol b/test/libsolidity/semanticTests/various/balance.sol
index 92c3889612..916c7fbff6 100644
--- a/test/libsolidity/semanticTests/various/balance.sol
+++ b/test/libsolidity/semanticTests/various/balance.sol
@@ -8,7 +8,6 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // constructor(), 23 wei ->
 // getBalance() -> 23
diff --git a/test/libsolidity/semanticTests/various/byte_optimization_bug.sol b/test/libsolidity/semanticTests/various/byte_optimization_bug.sol
index d217520215..f023e971f4 100644
--- a/test/libsolidity/semanticTests/various/byte_optimization_bug.sol
+++ b/test/libsolidity/semanticTests/various/byte_optimization_bug.sol
@@ -14,7 +14,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 2 -> 0
 // g(uint256): 2 -> 2
diff --git a/test/libsolidity/semanticTests/various/code_access_content.sol b/test/libsolidity/semanticTests/various/code_access_content.sol
index 39ac71b540..696d862064 100644
--- a/test/libsolidity/semanticTests/various/code_access_content.sol
+++ b/test/libsolidity/semanticTests/various/code_access_content.sol
@@ -37,7 +37,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // testRuntime() -> true
 // gas legacy: 101579
diff --git a/test/libsolidity/semanticTests/various/code_access_create.sol b/test/libsolidity/semanticTests/various/code_access_create.sol
index ce0d6305db..d28ca453e4 100644
--- a/test/libsolidity/semanticTests/various/code_access_create.sol
+++ b/test/libsolidity/semanticTests/various/code_access_create.sol
@@ -23,7 +23,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 7
 // gas legacy: 102264
diff --git a/test/libsolidity/semanticTests/various/code_access_padding.sol b/test/libsolidity/semanticTests/various/code_access_padding.sol
index d2f333bf2d..fab53bdac1 100644
--- a/test/libsolidity/semanticTests/various/code_access_padding.sol
+++ b/test/libsolidity/semanticTests/various/code_access_padding.sol
@@ -15,6 +15,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // diff() -> 0 # This checks that the allocation function pads to multiples of 32 bytes #
diff --git a/test/libsolidity/semanticTests/various/code_access_runtime.sol b/test/libsolidity/semanticTests/various/code_access_runtime.sol
index 49d0d9cebb..588ed3ac52 100644
--- a/test/libsolidity/semanticTests/various/code_access_runtime.sol
+++ b/test/libsolidity/semanticTests/various/code_access_runtime.sol
@@ -22,7 +22,6 @@ contract C {
 
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // test() -> 42
 // gas legacy: 101638
diff --git a/test/libsolidity/semanticTests/various/code_length.sol b/test/libsolidity/semanticTests/various/code_length.sol
index ad4b6f874c..0e17ae2a29 100644
--- a/test/libsolidity/semanticTests/various/code_length.sol
+++ b/test/libsolidity/semanticTests/various/code_length.sol
@@ -59,7 +59,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // constructor()
 // gas legacy: 126455
diff --git a/test/libsolidity/semanticTests/various/code_length_contract_member.sol b/test/libsolidity/semanticTests/various/code_length_contract_member.sol
index 0f697af30d..8486671ed8 100644
--- a/test/libsolidity/semanticTests/various/code_length_contract_member.sol
+++ b/test/libsolidity/semanticTests/various/code_length_contract_member.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x20, 0x20, true
diff --git a/test/libsolidity/semanticTests/various/codebalance_assembly.sol b/test/libsolidity/semanticTests/various/codebalance_assembly.sol
index 98f4e29693..be2b89f29e 100644
--- a/test/libsolidity/semanticTests/various/codebalance_assembly.sol
+++ b/test/libsolidity/semanticTests/various/codebalance_assembly.sol
@@ -20,7 +20,6 @@ contract C {
 
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // constructor(), 23 wei ->
 // gas legacy: 100517
diff --git a/test/libsolidity/semanticTests/various/codehash.sol b/test/libsolidity/semanticTests/various/codehash.sol
index c8730cca63..f787ca5be8 100644
--- a/test/libsolidity/semanticTests/various/codehash.sol
+++ b/test/libsolidity/semanticTests/various/codehash.sol
@@ -14,7 +14,6 @@ contract C {
 
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // f() -> 0x0
 // g() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
diff --git a/test/libsolidity/semanticTests/various/codehash_assembly.sol b/test/libsolidity/semanticTests/various/codehash_assembly.sol
index 4ac2a93f19..71e3a20ef5 100644
--- a/test/libsolidity/semanticTests/various/codehash_assembly.sol
+++ b/test/libsolidity/semanticTests/various/codehash_assembly.sol
@@ -18,7 +18,6 @@ contract C {
 
 // ====
 // EVMVersion: >=constantinople
-// compileViaYul: also
 // ----
 // f() -> 0
 // g() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
diff --git a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
index 9ff4fe5e22..351428c4f1 100644
--- a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
+++ b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
@@ -18,7 +18,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // constructor() ->
 // gas irOptimized: 101063
diff --git a/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol b/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol
index 473358bad0..135543898f 100644
--- a/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol
+++ b/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol
@@ -11,6 +11,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> -7
diff --git a/test/libsolidity/semanticTests/various/cross_contract_types.sol b/test/libsolidity/semanticTests/various/cross_contract_types.sol
index d2fd2aa282..b0cf070a7b 100644
--- a/test/libsolidity/semanticTests/various/cross_contract_types.sol
+++ b/test/libsolidity/semanticTests/various/cross_contract_types.sol
@@ -15,6 +15,5 @@ contract Test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 3
diff --git a/test/libsolidity/semanticTests/various/decayed_tuple.sol b/test/libsolidity/semanticTests/various/decayed_tuple.sol
index 486613036d..f143b98471 100644
--- a/test/libsolidity/semanticTests/various/decayed_tuple.sol
+++ b/test/libsolidity/semanticTests/various/decayed_tuple.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 23b6c9e58d..a3babc27db 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -33,7 +33,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
 // gas irOptimized: 240662
diff --git a/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol b/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol
index 6509db3f00..906df85cc8 100644
--- a/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol
+++ b/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol
@@ -6,6 +6,5 @@ contract test {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 9 -> 9
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index 109a27578f..ebe63ba917 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -94,7 +94,6 @@ contract ERC20 {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
diff --git a/test/libsolidity/semanticTests/various/external_types_in_calls.sol b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
index 1b50465b4f..8973130962 100644
--- a/test/libsolidity/semanticTests/various/external_types_in_calls.sol
+++ b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
@@ -24,7 +24,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // test() -> 9, 7
 // gas legacy: 129760
diff --git a/test/libsolidity/semanticTests/various/flipping_sign_tests.sol b/test/libsolidity/semanticTests/various/flipping_sign_tests.sol
index 42251caf56..f2f63575a1 100644
--- a/test/libsolidity/semanticTests/various/flipping_sign_tests.sol
+++ b/test/libsolidity/semanticTests/various/flipping_sign_tests.sol
@@ -7,7 +7,6 @@ contract test {
 }
 
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/various/gasleft_decrease.sol b/test/libsolidity/semanticTests/various/gasleft_decrease.sol
index 71810956af..22566bfb18 100644
--- a/test/libsolidity/semanticTests/various/gasleft_decrease.sol
+++ b/test/libsolidity/semanticTests/various/gasleft_decrease.sol
@@ -17,7 +17,6 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
 // g() -> true
diff --git a/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol b/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol
index 4cea82259a..3fe3ba10d3 100644
--- a/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol
+++ b/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol
@@ -10,6 +10,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/various/inline_member_init.sol b/test/libsolidity/semanticTests/various/inline_member_init.sol
index 6575b6161e..7d3b754928 100644
--- a/test/libsolidity/semanticTests/various/inline_member_init.sol
+++ b/test/libsolidity/semanticTests/various/inline_member_init.sol
@@ -16,6 +16,5 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // get() -> 5, 6, 8
diff --git a/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol b/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol
index c06233de4f..825bd6d2f9 100644
--- a/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol
+++ b/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol
@@ -20,7 +20,6 @@ contract Derived is Base {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // getBMember() -> 5
 // getDMember() -> 6
diff --git a/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol b/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol
index 73697c74a1..f8c396dd16 100644
--- a/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol
+++ b/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol
@@ -7,6 +7,5 @@ contract c {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol b/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol
index a1cd64725a..5744272cee 100644
--- a/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol
+++ b/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol
@@ -17,6 +17,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/various/literal_empty_string.sol b/test/libsolidity/semanticTests/various/literal_empty_string.sol
index ab916ae8c1..a02006fc94 100644
--- a/test/libsolidity/semanticTests/various/literal_empty_string.sol
+++ b/test/libsolidity/semanticTests/various/literal_empty_string.sol
@@ -13,7 +13,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // x() -> 0
 // a() -> 0
diff --git a/test/libsolidity/semanticTests/various/memory_overwrite.sol b/test/libsolidity/semanticTests/various/memory_overwrite.sol
index 028ee903b6..930b06f4a0 100644
--- a/test/libsolidity/semanticTests/various/memory_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/memory_overwrite.sol
@@ -8,6 +8,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x20, 5, "b23a5"
diff --git a/test/libsolidity/semanticTests/various/multi_modifiers.sol b/test/libsolidity/semanticTests/various/multi_modifiers.sol
index 59cceb4967..b6d8dd84c9 100644
--- a/test/libsolidity/semanticTests/various/multi_modifiers.sol
+++ b/test/libsolidity/semanticTests/various/multi_modifiers.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f1() ->
diff --git a/test/libsolidity/semanticTests/various/multi_variable_declaration.sol b/test/libsolidity/semanticTests/various/multi_variable_declaration.sol
index 3f8e40cdae..e054329c91 100644
--- a/test/libsolidity/semanticTests/various/multi_variable_declaration.sol
+++ b/test/libsolidity/semanticTests/various/multi_variable_declaration.sol
@@ -44,6 +44,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/various/nested_calldata_struct.sol b/test/libsolidity/semanticTests/various/nested_calldata_struct.sol
index 4971352b38..8ba68599e9 100644
--- a/test/libsolidity/semanticTests/various/nested_calldata_struct.sol
+++ b/test/libsolidity/semanticTests/various/nested_calldata_struct.sol
@@ -24,6 +24,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f((uint256,uint256,(uint256,uint256),uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol b/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
index 3e96f2a6f5..4de0e7b193 100644
--- a/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
+++ b/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
@@ -24,6 +24,5 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f((uint256,uint256,(uint256,uint256),uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol b/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol
index 56f072b2e5..4c23564995 100644
--- a/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol
+++ b/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol
@@ -5,7 +5,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // x() -> 2
 // y() -> 127
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 0e0e59996b..a783b1b0a4 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -16,7 +16,6 @@ contract D {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 27 wei ->
 // gas irOptimized: 175157
diff --git a/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol b/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol
index 68aac998e4..c1dab1895d 100644
--- a/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol
+++ b/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol
@@ -29,7 +29,6 @@ contract Derived is Base, B, A {}
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // getViaB() -> 0
 // setViaA(uint256): 23 ->
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types.sol
index a0231678f9..bbcea2f4dc 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types.sol
@@ -11,6 +11,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 7, 8
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol
index 65e0b47698..19ea890965 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol
@@ -20,6 +20,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // g() -> 5, 6
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 971d83407b..22ae7de4f0 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -19,7 +19,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // g() -> 2, 6
 // gas irOptimized: 178805
diff --git a/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol b/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol
index 4cea04c967..d3203160a6 100644
--- a/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol
+++ b/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol
@@ -8,6 +8,5 @@ contract A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // a() -> 2
diff --git a/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol b/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol
index 53306c88bb..e71d802fbf 100644
--- a/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol
+++ b/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol
@@ -7,6 +7,5 @@ contract Scope {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // getStateVar() -> 42
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index 90dd3a6f72..ed4815e80d 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -33,7 +33,6 @@ contract D {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileViaYul: also
 // ----
 // f() -> 0x1 # This should work, next should throw #
 // gas legacy: 103716
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure_pre_byzantium.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure_pre_byzantium.sol
index e9157e34cd..a193e87520 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure_pre_byzantium.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure_pre_byzantium.sol
@@ -32,7 +32,6 @@ contract D {
     }
 }
 // ====
-// compileViaYul: also
 // EVMVersion: <byzantium
 // ----
 // f() -> 0x1
diff --git a/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol b/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol
index d5f53c1205..bdec7e8a0e 100644
--- a/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol
+++ b/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol
@@ -7,6 +7,5 @@ contract Test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/various/store_bytes.sol b/test/libsolidity/semanticTests/various/store_bytes.sol
index 34c0b6f3d5..a1c9105339 100644
--- a/test/libsolidity/semanticTests/various/store_bytes.sol
+++ b/test/libsolidity/semanticTests/various/store_bytes.sol
@@ -9,7 +9,6 @@ contract C {
     bytes savedData;
 }
 // ====
-// compileViaYul: also
 // ----
 // save() -> 24 # empty copy loop #
 // save(): "abcdefg" -> 24
diff --git a/test/libsolidity/semanticTests/various/string_tuples.sol b/test/libsolidity/semanticTests/various/string_tuples.sol
index 4af1b83f3b..935c0b3c20 100644
--- a/test/libsolidity/semanticTests/various/string_tuples.sol
+++ b/test/libsolidity/semanticTests/various/string_tuples.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x40, 0x8, 0x3, "abc"
 // g() -> 0x40, 0x80, 0x3, "abc", 0x3, "def"
diff --git a/test/libsolidity/semanticTests/various/super.sol b/test/libsolidity/semanticTests/various/super.sol
index e730a7966b..9035f0ca2a 100644
--- a/test/libsolidity/semanticTests/various/super.sol
+++ b/test/libsolidity/semanticTests/various/super.sol
@@ -27,6 +27,5 @@ contract D is B, C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 15
diff --git a/test/libsolidity/semanticTests/various/super_alone.sol b/test/libsolidity/semanticTests/various/super_alone.sol
index 726b788ae9..069df9a91c 100644
--- a/test/libsolidity/semanticTests/various/super_alone.sol
+++ b/test/libsolidity/semanticTests/various/super_alone.sol
@@ -6,6 +6,5 @@ contract A {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/various/super_parentheses.sol b/test/libsolidity/semanticTests/various/super_parentheses.sol
index 0f54acdcbc..3c687d9c19 100644
--- a/test/libsolidity/semanticTests/various/super_parentheses.sol
+++ b/test/libsolidity/semanticTests/various/super_parentheses.sol
@@ -27,6 +27,5 @@ contract D is B, C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 15
diff --git a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
index 9b7a4306f3..f14b8d57a8 100644
--- a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
@@ -25,7 +25,6 @@ contract c {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // x() -> 0, 0
 // y() -> 0, 0
diff --git a/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol b/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol
index 05cb1d5d30..76c6828cd2 100644
--- a/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol
+++ b/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol
@@ -7,7 +7,6 @@ contract test {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> 0x1234ab
 // f(bool): false -> 0x1234abcd1234
diff --git a/test/libsolidity/semanticTests/various/tuples.sol b/test/libsolidity/semanticTests/various/tuples.sol
index b89928a72c..fdad90424e 100644
--- a/test/libsolidity/semanticTests/various/tuples.sol
+++ b/test/libsolidity/semanticTests/various/tuples.sol
@@ -26,6 +26,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol b/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol
index 2836953dc0..018ee96698 100644
--- a/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol
+++ b/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol
@@ -24,6 +24,5 @@ contract C {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index c868652a0f..396a564b91 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -19,7 +19,6 @@ contract test {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 190275
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index c304732bb9..4d4d4cfde8 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -18,7 +18,6 @@ contract test {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 191991
diff --git a/test/libsolidity/semanticTests/various/write_storage_external.sol b/test/libsolidity/semanticTests/various/write_storage_external.sol
index 7ed94b6f8c..c05148bf9c 100644
--- a/test/libsolidity/semanticTests/various/write_storage_external.sol
+++ b/test/libsolidity/semanticTests/various/write_storage_external.sol
@@ -35,7 +35,6 @@ contract D {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // f() -> 3
 // g() -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol b/test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol
index ff9c03cbe8..297ce20c91 100644
--- a/test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol
@@ -9,6 +9,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/viaYul/array_2d_new.sol b/test/libsolidity/semanticTests/viaYul/array_2d_new.sol
index bfc8b20136..255ea71f71 100644
--- a/test/libsolidity/semanticTests/viaYul/array_2d_new.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_2d_new.sol
@@ -7,6 +7,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol b/test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol
index a2b3de54f6..0984b22477 100644
--- a/test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol
@@ -14,6 +14,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/viaYul/array_3d_new.sol b/test/libsolidity/semanticTests/viaYul/array_3d_new.sol
index c3ff22ca35..9f7b8e4e41 100644
--- a/test/libsolidity/semanticTests/viaYul/array_3d_new.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_3d_new.sol
@@ -11,6 +11,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/viaYul/array_function_pointers.sol b/test/libsolidity/semanticTests/viaYul/array_function_pointers.sol
index 32fed9a234..72e871d270 100644
--- a/test/libsolidity/semanticTests/viaYul/array_function_pointers.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_function_pointers.sol
@@ -21,7 +21,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 1823621, 12323 -> FAILURE # Out of gas #
 // f2(uint256,uint256,uint256,uint256): 18723921, 1823621, 123, 12323 -> FAILURE # Out of gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
index 45e567e1df..d3dc75b5cf 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
@@ -16,7 +16,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // set(string,uint256,uint256,uint256,uint256): 0xa0, 2, 4, 0, 0, 32, "01234567890123456789012345678901" -> 0
 // set(string,uint256,uint256,uint256,uint256): 0xa0, 2, 4, 1, 3, 32, "01234567890123456789012345678901" -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol
index 8678e1aa3a..f182e58787 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol
@@ -14,7 +14,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // set(string,uint256,uint256): 0x60, 2, 0, 32, "01234567890123456789012345678901" -> 0
 // set(string,uint256,uint256): 0x60, 2, 1, 32, "01234567890123456789012345678901" -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
index 31dd0a66a6..c435e3ca71 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
@@ -12,6 +12,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // set(string): 0x20, 32, "01234567890123456789012345678901" -> 0, 0, 0, 0, 0, 0xe0, 0, 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol
index 6cf73bd8e8..5acb3d7755 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol
@@ -14,6 +14,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // set(string): 0x20, 32, "01234567890123456789012345678901" -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol
index 76a412adf4..7bce701374 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol
@@ -14,7 +14,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // set(string,uint256,uint256): 0x60, 5, 0, 32, "01234567890123456789012345678901" -> 0
 // set(string,uint256,uint256): 0x60, 5, 1, 32, "01234567890123456789012345678901" -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol b/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
index 55e10487e8..a7705889d5 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
@@ -18,7 +18,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // test(uint256,uint256): 0, 0 -> FAILURE, hex"4e487b71", 0x32
 // test(uint256,uint256): 1, 0 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_create.sol b/test/libsolidity/semanticTests/viaYul/array_memory_create.sol
index d1a9c5e2e6..6b7d387f26 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_create.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_create.sol
@@ -6,7 +6,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // create(uint256): 0 -> 0
 // create(uint256): 7 -> 7
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
index 5bd5fe137d..755380d9d7 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
@@ -22,7 +22,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // index(uint256): 0 -> true
 // index(uint256): 10 -> true
diff --git a/test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol b/test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol
index d83fd53ef6..4b639a0340 100644
--- a/test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // getLength() -> 0
 // test(uint256): 42 ->
diff --git a/test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol b/test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol
index a93778b3f9..c192d01ce4 100644
--- a/test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol
@@ -11,7 +11,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // getLength() -> 0
 // test(uint256): 42 ->
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index 31cf4ad690..2608c4cc67 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -14,7 +14,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
index ea64676a83..db41a60abd 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test_boundary_check(uint256,uint256): 10, 11 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 10, 9 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index 26c0d8394e..bd7fda8862 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -50,7 +50,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
index 1c3f8410cd..c5a82254d4 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set_get_length(uint256): 0 -> 0
 // set_get_length(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol b/test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol
index 2a09ba31ed..ed946e1975 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=petersburg
-// compileViaYul: also
 // ----
 // popEmpty() -> FAILURE, hex"4e487b71", 0x31
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
index 6e126a1507..54fe51499b 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
@@ -10,7 +10,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=petersburg
-// compileViaYul: also
 // ----
 // pushEmpty(uint256): 128
 // gas irOptimized: 412561
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
index cb23435d17..92f3108b36 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
@@ -11,7 +11,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=petersburg
-// compileViaYul: also
 // ----
 // set_get_length(uint256): 0 -> 0
 // set_get_length(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
index 25a2f5f9af..e031be79c6 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
@@ -9,7 +9,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // set_get_length(uint256): 0 -> 0
 // set_get_length(uint256): 1 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/assert.sol b/test/libsolidity/semanticTests/viaYul/assert.sol
index f7b2c3c3c8..aa8de1c277 100644
--- a/test/libsolidity/semanticTests/viaYul/assert.sol
+++ b/test/libsolidity/semanticTests/viaYul/assert.sol
@@ -15,7 +15,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> true
 // f(bool): false -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/viaYul/assert_and_require.sol b/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
index b163097e8d..290ef35b31 100644
--- a/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
+++ b/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
@@ -12,7 +12,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> true
 // f(bool): false -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol b/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol
index c371f8371f..c36cc26dc0 100644
--- a/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol
+++ b/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol
@@ -11,7 +11,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 3, 2, 1
 // h() -> 3
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_access.sol b/test/libsolidity/semanticTests/viaYul/calldata_array_access.sol
index f8ad6b9ec2..9ca62f8bc4 100644
--- a/test/libsolidity/semanticTests/viaYul/calldata_array_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/calldata_array_access.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[],uint256): 0x40, 0, 0 -> FAILURE, hex"4e487b71", 0x32
 // f(uint256[],uint256): 0x40, 0, 1, 23 -> 23
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_index_range_access.sol b/test/libsolidity/semanticTests/viaYul/calldata_array_index_range_access.sol
index 60ea3a8dde..6101359680 100644
--- a/test/libsolidity/semanticTests/viaYul/calldata_array_index_range_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/calldata_array_index_range_access.sol
@@ -27,7 +27,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256[],uint256,uint256): 0x60, 2, 4, 5, 1, 2, 3, 4, 5 -> 2
 // f(uint256[],uint256,uint256): 0x60, 2, 6, 5, 1, 2, 3, 4, 5 -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_length.sol b/test/libsolidity/semanticTests/viaYul/calldata_array_length.sol
index 5f7d9bbb83..fa4fe30237 100644
--- a/test/libsolidity/semanticTests/viaYul/calldata_array_length.sol
+++ b/test/libsolidity/semanticTests/viaYul/calldata_array_length.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256[]): 0x20, 0 -> 0
 // f(uint256[]): 0x20, 1, 23 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_three_dimensional.sol b/test/libsolidity/semanticTests/viaYul/calldata_array_three_dimensional.sol
index 37bb540588..826c5f723b 100644
--- a/test/libsolidity/semanticTests/viaYul/calldata_array_three_dimensional.sol
+++ b/test/libsolidity/semanticTests/viaYul/calldata_array_three_dimensional.sol
@@ -10,7 +10,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256[][2][],uint256,uint256,uint256): 0x80, 0, 0, 0, 1, 0x20, 0x40, 0x80, 1, 42, 1, 23 -> 1, 2, 1, 42
 // f(uint256[][2][],uint256,uint256,uint256): 0x80, 0, 1, 0, 1, 0x20, 0x40, 0x80, 1, 42, 1, 23 -> 1, 2, 1, 23
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol b/test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol
index 6bd1acbbf6..320a0c506f 100644
--- a/test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol
+++ b/test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol
@@ -5,7 +5,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f(bytes[],uint256): 0x40, 0, 1, 0x20, 2, hex"6162" -> 0x61
 // f(bytes[],uint256): 0x40, 1, 1, 0x20, 2, hex"6162" -> 0x62
diff --git a/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol b/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol
index 1ac815ea31..ab3d92a18b 100644
--- a/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol
+++ b/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol
@@ -32,7 +32,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // eq() -> true
 // neq() -> false
diff --git a/test/libsolidity/semanticTests/viaYul/comparison.sol b/test/libsolidity/semanticTests/viaYul/comparison.sol
index d84b2dd6fd..0b0763b6ea 100644
--- a/test/libsolidity/semanticTests/viaYul/comparison.sol
+++ b/test/libsolidity/semanticTests/viaYul/comparison.sol
@@ -37,7 +37,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(address): 0x1234 -> false
diff --git a/test/libsolidity/semanticTests/viaYul/comparison_functions.sol b/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
index d039f42821..89d90e577b 100644
--- a/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
+++ b/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
@@ -26,7 +26,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // equal() -> true, false, false
 // unequal() -> false, true, true
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol
index 5009b01e99..9e1e8c7787 100644
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol
+++ b/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol
@@ -6,6 +6,5 @@ contract A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol
index e80355f398..3eda8bfc76 100644
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol
+++ b/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol
@@ -7,6 +7,5 @@ contract A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol
index 257b243604..a0b206a128 100644
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol
+++ b/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol
@@ -6,7 +6,6 @@ contract A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> 1, 2
 // f(bool): false -> 3, 4
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol
index 7ab894a603..a132e88730 100644
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol
@@ -9,6 +9,5 @@ contract A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 6, 1, 5, 5
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol
index 260f4d688f..c5bf8e0185 100644
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol
+++ b/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol
@@ -9,6 +9,5 @@ contract A {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 3, 1, 3, 1
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
index 150bdcc2e8..5d0d50dadd 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
index 0e41b2a93e..34cc69ffeb 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
@@ -8,6 +8,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 0x1234567800000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
index 63f6cb8959..fe07146e18 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 0x12345678 -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol
index 4a5b01d39a..a7d6def0ce 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol
@@ -6,6 +6,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(string): 0x20, 3, "123" -> 0x20, 3, "123"
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol b/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
index 08462c5f8a..543d8c43c6 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
@@ -16,7 +16,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f(uint256): 2 -> 4
 // h(uint256): 2 -> 5
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
index 641d074b1b..05d265343c 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
@@ -10,6 +10,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
index f619355d1c..a2c2d92077 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
@@ -13,6 +13,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
index dd1d869c77..e582ff394e 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
@@ -9,6 +9,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index f1a6f592b2..5e899f50eb 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -20,7 +20,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f() ->
 // gas irOptimized: 112992
diff --git a/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol b/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol
index 1030748db1..24c72943ff 100644
--- a/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol
+++ b/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol
@@ -13,7 +13,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 3, 2, 1
 // h() -> 3
diff --git a/test/libsolidity/semanticTests/viaYul/delete.sol b/test/libsolidity/semanticTests/viaYul/delete.sol
index 90d3660bbb..3439bc4df9 100644
--- a/test/libsolidity/semanticTests/viaYul/delete.sol
+++ b/test/libsolidity/semanticTests/viaYul/delete.sol
@@ -20,7 +20,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // call_deleted_internal_func() -> FAILURE, hex"4e487b71", 0x51
 // call_internal_func() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol
index 0d06612214..6e6f108a62 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256,uint256): 5, 6 -> 11
diff --git a/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol
index e3fc39461c..0e7d2db37d 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int256,int256): 5, 6 -> 11
diff --git a/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol
index 54f291e6f0..ab3d97f46d 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256,uint256): 10, 3 -> 3
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol b/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol
index 5a4f2d8227..5307f95898 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 10, 3 -> 1
 // f(uint256,uint256): 10, 2 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol
index 8277a557ee..102df82f30 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int256,int256): 10, 3 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol
index 0c9c3f709b..8cc64ffa07 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint256,uint256): 5, 6 -> 30
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
index 5833dff138..dd1953d005 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int256,int256): 5, 6 -> 30
diff --git a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol
index 0ee16e27be..1f6a0d7e5a 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 6, 5 -> 1
 // f(uint256,uint256): 6, 6 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol
index b4d1d9e848..3499260790 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int256,int256): 5, 6 -> -1
diff --git a/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol b/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol
index cdc2f2448a..34af8e389e 100644
--- a/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol
+++ b/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/viaYul/exp.sol b/test/libsolidity/semanticTests/viaYul/exp.sol
index 23ac4ad976..1ca5842ab0 100644
--- a/test/libsolidity/semanticTests/viaYul/exp.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 0, 0 -> 1
 // f(uint256,uint256): 0, 1 -> 0x00
diff --git a/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol b/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol
index bc4f561185..d28a56eb4f 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol
@@ -30,7 +30,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // exp_2(uint256): 255 -> 57896044618658097711785492504343953926634992332820282019728792003956564819968
 // exp_minus_2(uint256): 255 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
diff --git a/test/libsolidity/semanticTests/viaYul/exp_neg.sol b/test/libsolidity/semanticTests/viaYul/exp_neg.sol
index cd3cca64ee..de58d65926 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_neg.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_neg.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int256,uint256): 0, 0 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol b/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol
index 1b668877e9..9d4b59d528 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(int8,uint256): 2, 6 -> 64
diff --git a/test/libsolidity/semanticTests/viaYul/exp_overflow.sol b/test/libsolidity/semanticTests/viaYul/exp_overflow.sol
index d8bcd0e6c8..8ba9c1d4ad 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_overflow.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f(uint8,uint8): 2, 7 -> 0x80
diff --git a/test/libsolidity/semanticTests/viaYul/exp_various.sol b/test/libsolidity/semanticTests/viaYul/exp_various.sol
index e9a5bc0263..a1a69ed031 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_various.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_various.sol
@@ -8,7 +8,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint8,uint8): 0, 0 -> 1
 // f(uint8,uint8): 0, 1 -> 0x00
diff --git a/test/libsolidity/semanticTests/viaYul/function_address.sol b/test/libsolidity/semanticTests/viaYul/function_address.sol
index 6904bf676b..af629a4fe2 100644
--- a/test/libsolidity/semanticTests/viaYul/function_address.sol
+++ b/test/libsolidity/semanticTests/viaYul/function_address.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> 0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b
diff --git a/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol b/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
index cf06479a78..29812e0189 100644
--- a/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
+++ b/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
@@ -18,7 +18,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0
 // g(uint256,uint256): 1, -2 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/function_pointers.sol b/test/libsolidity/semanticTests/viaYul/function_pointers.sol
index 30129ce534..8bc69baa87 100644
--- a/test/libsolidity/semanticTests/viaYul/function_pointers.sol
+++ b/test/libsolidity/semanticTests/viaYul/function_pointers.sol
@@ -18,7 +18,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x51
 // g() -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/function_selector.sol b/test/libsolidity/semanticTests/viaYul/function_selector.sol
index dea1d3a10f..d21afdcf54 100644
--- a/test/libsolidity/semanticTests/viaYul/function_selector.sol
+++ b/test/libsolidity/semanticTests/viaYul/function_selector.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // f() -> left(0x26121ff0)
diff --git a/test/libsolidity/semanticTests/viaYul/if.sol b/test/libsolidity/semanticTests/viaYul/if.sol
index 66af17f72d..d2f582bb1b 100644
--- a/test/libsolidity/semanticTests/viaYul/if.sol
+++ b/test/libsolidity/semanticTests/viaYul/if.sol
@@ -61,7 +61,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): 0 -> 23
 // f(bool): 1 -> 42
diff --git a/test/libsolidity/semanticTests/viaYul/keccak.sol b/test/libsolidity/semanticTests/viaYul/keccak.sol
index 1befe8f7c0..d0eb71ecdd 100644
--- a/test/libsolidity/semanticTests/viaYul/keccak.sol
+++ b/test/libsolidity/semanticTests/viaYul/keccak.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // keccak1() -> 0x64e604787cbf194841e7b68d7cd28786f6c9a0a3ab9f8b0a0e87cb4387ab0107
 // keccak2() -> 0x64e604787cbf194841e7b68d7cd28786f6c9a0a3ab9f8b0a0e87cb4387ab0107
diff --git a/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
index 9b8626db55..35a2765ff5 100644
--- a/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(address): 0x1234 -> 0x1234
diff --git a/test/libsolidity/semanticTests/viaYul/local_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_assignment.sol
index ac3beb492e..978b905e38 100644
--- a/test/libsolidity/semanticTests/viaYul/local_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_assignment.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256): 6 -> 6
diff --git a/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
index 32f7d4bacb..c95cbf41ac 100644
--- a/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> true
diff --git a/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol
index feeeb490e4..a6b14a9e02 100644
--- a/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol
@@ -23,7 +23,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // x() -> 17
 // f(uint256,uint256): 23, 42 -> 23, 42
diff --git a/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol b/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol
index e43c94a846..f11cd661f9 100644
--- a/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/loops/break.sol b/test/libsolidity/semanticTests/viaYul/loops/break.sol
index 433adbf111..939cd0b7f6 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/break.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/break.sol
@@ -25,7 +25,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/loops/continue.sol b/test/libsolidity/semanticTests/viaYul/loops/continue.sol
index 889a18e554..25e57dac19 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/continue.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/continue.sol
@@ -31,7 +31,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 11
 // g() -> 11
diff --git a/test/libsolidity/semanticTests/viaYul/loops/return.sol b/test/libsolidity/semanticTests/viaYul/loops/return.sol
index 3ad4abc861..3f3b709bae 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/return.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/return.sol
@@ -28,7 +28,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1
 // g() -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/loops/simple.sol b/test/libsolidity/semanticTests/viaYul/loops/simple.sol
index a4dcf38d10..3a09098ab2 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/simple.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/simple.sol
@@ -31,7 +31,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 1024
 // g() -> 1024
diff --git a/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol b/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol
index c7790aa0cf..47dadd04d7 100644
--- a/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol
+++ b/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol
@@ -7,7 +7,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // table(uint8): 0 -> 0
 // table(uint8): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/mapping_getters.sol b/test/libsolidity/semanticTests/viaYul/mapping_getters.sol
index 1db4eb8c59..edb3eabc63 100644
--- a/test/libsolidity/semanticTests/viaYul/mapping_getters.sol
+++ b/test/libsolidity/semanticTests/viaYul/mapping_getters.sol
@@ -9,7 +9,6 @@ contract test {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // m1(uint256): 0 -> 0
 // m1(uint256): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol b/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
index 299f790cef..15c7a3773d 100644
--- a/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
+++ b/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
@@ -5,6 +5,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // set(string): 0x20, 32, "01234567890123456789012345678901" ->
diff --git a/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol b/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol
index 02ec2fe95c..47213b7b48 100644
--- a/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol
+++ b/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol
@@ -17,6 +17,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 0, 0
diff --git a/test/libsolidity/semanticTests/viaYul/msg_sender.sol b/test/libsolidity/semanticTests/viaYul/msg_sender.sol
index d4177b4d6e..520c9be4e3 100644
--- a/test/libsolidity/semanticTests/viaYul/msg_sender.sol
+++ b/test/libsolidity/semanticTests/viaYul/msg_sender.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/negation_bug.sol b/test/libsolidity/semanticTests/viaYul/negation_bug.sol
index 6174eadd11..02819f33a7 100644
--- a/test/libsolidity/semanticTests/viaYul/negation_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/negation_bug.sol
@@ -8,6 +8,5 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/viaYul/require.sol b/test/libsolidity/semanticTests/viaYul/require.sol
index ca129a885a..7546921f18 100644
--- a/test/libsolidity/semanticTests/viaYul/require.sol
+++ b/test/libsolidity/semanticTests/viaYul/require.sol
@@ -31,7 +31,6 @@ contract C {
 // ====
 // EVMVersion: >=byzantium
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(bool): true -> true
 // f(bool): false -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/return.sol b/test/libsolidity/semanticTests/viaYul/return.sol
index 9988f6a295..c42353e60f 100644
--- a/test/libsolidity/semanticTests/viaYul/return.sol
+++ b/test/libsolidity/semanticTests/viaYul/return.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/viaYul/return_and_convert.sol b/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
index 57b92691a9..547838371e 100644
--- a/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
+++ b/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
@@ -7,6 +7,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 255
diff --git a/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol b/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol
index f99f7d0727..fd886596fd 100644
--- a/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol
+++ b/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol
@@ -12,6 +12,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 0, 0
diff --git a/test/libsolidity/semanticTests/viaYul/short_circuit.sol b/test/libsolidity/semanticTests/viaYul/short_circuit.sol
index 23172d02a8..5823f77340 100644
--- a/test/libsolidity/semanticTests/viaYul/short_circuit.sol
+++ b/test/libsolidity/semanticTests/viaYul/short_circuit.sol
@@ -10,7 +10,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // or(uint256): 0 -> true, 0
 // and(uint256): 0 -> true, 8
diff --git a/test/libsolidity/semanticTests/viaYul/simple_assignment.sol b/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
index 21576ebd10..016f7438df 100644
--- a/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
@@ -6,6 +6,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint256,uint256): 5, 6 -> 5, 6
diff --git a/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol b/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
index 1802fb956e..99e0cbcdfa 100644
--- a/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
+++ b/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
@@ -13,6 +13,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 6
diff --git a/test/libsolidity/semanticTests/viaYul/smoke_test.sol b/test/libsolidity/semanticTests/viaYul/smoke_test.sol
index c2dbce2754..6460ad90f3 100644
--- a/test/libsolidity/semanticTests/viaYul/smoke_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/smoke_test.sol
@@ -3,6 +3,5 @@ contract C {
 // ====
 // allowNonExistingFunctions: true
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol
index b968f92bae..f61808084b 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol
@@ -14,6 +14,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol
index 39f89c3707..3c7622e2eb 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol
@@ -15,6 +15,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol
index 011cf7d88a..c28c0ae4b2 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol
@@ -15,6 +15,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol
index 49d26789ed..59b63ddf2f 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol
@@ -14,6 +14,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol
index 695184c8ff..e7569605ba 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol
@@ -18,6 +18,5 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/mappings.sol b/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
index 5666635b52..4e1ebf0508 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
@@ -29,7 +29,6 @@ contract C {
     }
 }
 // ====
-// compileViaYul: also
 // ----
 // test_simple(uint256): 0 -> 3, 4, 5
 // test_simple(uint256): 1 -> 3, 4, 5
diff --git a/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol b/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
index 6049fb7cf1..a39c0797de 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
@@ -12,6 +12,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f(uint8): 6 -> 9
diff --git a/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol b/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
index a01b545d48..df2575a887 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
@@ -12,7 +12,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // setX(uint256): 6 -> 6
 // setY(uint256): 2 -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/string_format.sol b/test/libsolidity/semanticTests/viaYul/string_format.sol
index 76297e31da..49746adb46 100644
--- a/test/libsolidity/semanticTests/viaYul/string_format.sol
+++ b/test/libsolidity/semanticTests/viaYul/string_format.sol
@@ -6,7 +6,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f1() -> 0x20, 6, left(0x616263616263)
 // f2() -> 32, 47, 44048183223289766195424279195050628400112610419087780792899004030957505095210, 18165586057823232067963737336409268114628061002662705707816940456850361417728
diff --git a/test/libsolidity/semanticTests/viaYul/string_literals.sol b/test/libsolidity/semanticTests/viaYul/string_literals.sol
index 997ac38961..f1140ffb4d 100644
--- a/test/libsolidity/semanticTests/viaYul/string_literals.sol
+++ b/test/libsolidity/semanticTests/viaYul/string_literals.sol
@@ -20,7 +20,6 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // short_dyn() -> 0x20, 3, "abc"
 // long_dyn() -> 0x20, 80, "12345678901234567890123456789012", "34567890123456789012345678901234", "5678901234567890"
diff --git a/test/libsolidity/semanticTests/viaYul/struct_member_access.sol b/test/libsolidity/semanticTests/viaYul/struct_member_access.sol
index 108c94589f..a2d9a02fd6 100644
--- a/test/libsolidity/semanticTests/viaYul/struct_member_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/struct_member_access.sol
@@ -31,7 +31,6 @@ contract C {
 }
 // ====
 // EVMVersion: >homestead
-// compileViaYul: also
 // ----
 // f((uint256,uint256[],uint256)): 0x20, 42, 0x60, 21, 3, 1, 2, 3 -> 42, 0x60, 21, 3, 1, 2, 3
 // g((uint256,uint256[],uint256)): 0x20, 42, 0x60, 21, 3, 1, 2, 3 -> 42, 3, 21, 1, 2, 3
diff --git a/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol b/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol
index f8500b7db4..edde645880 100644
--- a/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol
+++ b/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol
@@ -10,6 +10,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 3, 1
diff --git a/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol b/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol
index bb211b27ce..f0e811ac23 100644
--- a/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol
+++ b/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol
@@ -59,7 +59,6 @@ contract C {
 	}
 }
 // ====
-// compileViaYul: also
 // compileToEwasm: also
 // ----
 // conv(bytes25): left(0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff) -> 0xff00ff00ff00ff00ff00ff00ff00ff00ffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol b/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
index 57c0285476..dc9057121d 100644
--- a/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
+++ b/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
@@ -19,6 +19,5 @@ contract C {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 70
diff --git a/test/libsolidity/semanticTests/viaYul/virtual_functions.sol b/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
index b7cb108373..ea43914b73 100644
--- a/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
+++ b/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
@@ -25,7 +25,6 @@ contract C is X {
 }
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 3
 // f1() -> 3
diff --git a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol b/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol
index 2f0ce489c5..7c5658ae2b 100644
--- a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol
+++ b/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol
@@ -17,6 +17,5 @@ contract Derived is Base {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol b/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol
index 6c387e2e09..f74a2df7a9 100644
--- a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol
+++ b/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol
@@ -22,6 +22,5 @@ contract Derived is Base {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // h() -> 2
diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol
index a351cf9900..d277712f0d 100644
--- a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol
+++ b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol
@@ -17,7 +17,6 @@ contract Derived is Base {
 
 // ====
 // compileToEwasm: also
-// compileViaYul: also
 // ----
 // g() -> 2
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
index 71ee82fd36..f3811fe6df 100644
--- a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
+++ b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
@@ -29,6 +29,5 @@ contract Derived is Base {
 }
 
 // ====
-// compileViaYul: also
 // ----
 // getA() -> 2

From a2f768d29a5b277bf3b5adc110a6bbb74a8e8f6d Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 19 May 2022 19:33:19 +0200
Subject: [PATCH 0619/1748] Remove empty settings.

---
 .../semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol      | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol       | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_static_array.sol       | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol    | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_trivial.sol            | 1 -
 test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol    | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol        | 1 -
 .../semanticTests/abiEncoderV1/abi_decode_v2_storage.sol         | 1 -
 test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol  | 1 -
 test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol      | 1 -
 test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol   | 1 -
 .../semanticTests/abiEncoderV1/dynamic_memory_copy.sol           | 1 -
 .../abiEncoderV1/memory_params_in_external_function.sol          | 1 -
 .../semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol     | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol    | 1 -
 .../abi_encode_v2_in_function_inherited_in_v1_contract.sol       | 1 -
 .../abi_encode_v2_in_modifier_used_in_v1_contract.sol            | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol      | 1 -
 .../calldata_array_dynamic_static_short_reencode.sol             | 1 -
 .../semanticTests/abiEncoderV2/calldata_array_function_types.sol | 1 -
 .../abiEncoderV2/calldata_array_short_no_revert_string.sol       | 1 -
 .../abiEncoderV2/calldata_nested_array_static_reencode.sol       | 1 -
 .../semanticTests/abiEncoderV2/calldata_struct_member_offset.sol | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol  | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol     | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol   | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol     | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol    | 1 -
 test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol   | 1 -
 .../semanticTests/abiEncoderV2/dynamic_nested_arrays.sol         | 1 -
 .../abiEncoderV2/memory_params_in_external_function.sol          | 1 -
 .../semanticTests/abiEncoderV2/struct/mediocre2_struct.sol       | 1 -
 .../semanticTests/abiEncoderV2/struct/mediocre_struct.sol        | 1 -
 .../semanticTests/abiEncoderV2/struct/struct_function.sol        | 1 -
 .../semanticTests/abiencodedecode/abi_decode_calldata.sol        | 1 -
 .../semanticTests/abiencodedecode/abi_decode_simple.sol          | 1 -
 .../semanticTests/abiencodedecode/abi_decode_simple_storage.sol  | 1 -
 .../semanticTests/abiencodedecode/abi_encode_call.sol            | 1 -
 .../abiencodedecode/abi_encode_call_is_consistent.sol            | 1 -
 .../semanticTests/abiencodedecode/abi_encode_call_memory.sol     | 1 -
 .../abiencodedecode/abi_encode_call_special_args.sol             | 1 -
 .../semanticTests/abiencodedecode/abi_encode_with_signature.sol  | 1 -
 .../abiencodedecode/abi_encode_with_signaturev2.sol              | 1 -
 .../libsolidity/semanticTests/abiencodedecode/contract_array.sol | 1 -
 .../semanticTests/abiencodedecode/contract_array_v2.sol          | 1 -
 test/libsolidity/semanticTests/arithmetics/check_var_init.sol    | 1 -
 test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol    | 1 -
 test/libsolidity/semanticTests/arithmetics/exp_associativity.sol | 1 -
 .../semanticTests/array/arrays_complex_from_and_to_storage.sol   | 1 -
 .../semanticTests/array/byte_array_storage_layout.sol            | 1 -
 .../semanticTests/array/byte_array_transitional_2.sol            | 1 -
 test/libsolidity/semanticTests/array/bytes_length_member.sol     | 1 -
 .../semanticTests/array/bytes_to_fixed_bytes_simple.sol          | 1 -
 .../semanticTests/array/bytes_to_fixed_bytes_too_long.sol        | 1 -
 .../array/calldata_array_dynamic_invalid_static_middle.sol       | 1 -
 .../semanticTests/array/calldata_array_two_dimensional.sol       | 1 -
 .../semanticTests/array/calldata_array_two_dimensional_1.sol     | 1 -
 .../semanticTests/array/calldata_bytes_array_bounds.sol          | 1 -
 .../semanticTests/array/concat/bytes_concat_2_args.sol           | 1 -
 .../semanticTests/array/concat/bytes_concat_3_args.sol           | 1 -
 .../semanticTests/array/concat/bytes_concat_as_argument.sol      | 1 -
 .../semanticTests/array/concat/bytes_concat_nested.sol           | 1 -
 .../semanticTests/array/constant_var_as_array_length.sol         | 1 -
 .../semanticTests/array/copying/array_copy_calldata_storage.sol  | 1 -
 .../semanticTests/array/copying/array_copy_cleanup_uint128.sol   | 1 -
 .../semanticTests/array/copying/array_copy_cleanup_uint40.sol    | 1 -
 .../semanticTests/array/copying/array_copy_clear_storage.sol     | 1 -
 .../array/copying/array_copy_clear_storage_packed.sol            | 1 -
 .../semanticTests/array/copying/array_copy_different_packing.sol | 1 -
 .../semanticTests/array/copying/array_copy_including_array.sol   | 1 -
 .../semanticTests/array/copying/array_copy_memory_to_storage.sol | 1 -
 .../semanticTests/array/copying/array_copy_nested_array.sol      | 1 -
 .../array/copying/array_copy_storage_abi_signed.sol              | 1 -
 .../array/copying/array_copy_storage_storage_different_base.sol  | 1 -
 .../array/copying/array_copy_storage_storage_dyn_dyn.sol         | 1 -
 .../array/copying/array_copy_storage_storage_dynamic_dynamic.sol | 1 -
 .../array/copying/array_copy_storage_storage_static_dynamic.sol  | 1 -
 .../array/copying/array_copy_storage_storage_struct.sol          | 1 -
 .../semanticTests/array/copying/array_copy_storage_to_memory.sol | 1 -
 .../array/copying/array_copy_storage_to_memory_nested.sol        | 1 -
 .../array/copying/array_nested_calldata_to_memory.sol            | 1 -
 .../array/copying/array_nested_memory_to_storage.sol             | 1 -
 .../array_of_function_external_storage_to_storage_dynamic.sol    | 1 -
 ..._external_storage_to_storage_dynamic_different_mutability.sol | 1 -
 .../array/copying/array_of_struct_calldata_to_memory.sol         | 1 -
 .../array_of_structs_containing_arrays_calldata_to_memory.sol    | 1 -
 .../semanticTests/array/copying/arrays_from_and_to_storage.sol   | 1 -
 .../array/copying/bytes_calldata_to_string_calldata.sol          | 1 -
 .../semanticTests/array/copying/bytes_inside_mappings.sol        | 1 -
 .../semanticTests/array/copying/bytes_storage_to_storage.sol     | 1 -
 .../semanticTests/array/copying/calldata_2d_bytes_to_memory.sol  | 1 -
 .../array/copying/calldata_2d_bytes_to_memory_2.sol              | 1 -
 .../array/copying/calldata_array_dynamic_to_storage.sol          | 1 -
 .../array/copying/calldata_array_of_struct_to_memory.sol         | 1 -
 .../array/copying/calldata_bytes_array_to_memory.sol             | 1 -
 .../array/copying/calldata_dyn_2d_bytes_to_memory.sol            | 1 -
 .../array/copying/calldata_dynamic_array_to_memory.sol           | 1 -
 .../array/copying/calldata_nested_array_copy_to_memory.sol       | 1 -
 .../array/copying/calldata_to_storage_different_base.sol         | 1 -
 .../array/copying/copy_byte_array_in_struct_to_storage.sol       | 1 -
 .../semanticTests/array/copying/copy_byte_array_to_storage.sol   | 1 -
 .../array/copying/copy_function_internal_storage_array.sol       | 1 -
 .../semanticTests/array/copying/copy_removes_bytes_data.sol      | 1 -
 .../libsolidity/semanticTests/array/copying/empty_bytes_copy.sol | 1 -
 .../array/copying/memory_dyn_2d_bytes_to_storage.sol             | 1 -
 .../array/copying/memory_to_storage_different_base.sol           | 1 -
 .../semanticTests/array/copying/storage_memory_nested.sol        | 1 -
 .../semanticTests/array/copying/storage_memory_nested_bytes.sol  | 1 -
 .../array/copying/storage_memory_nested_from_pointer.sol         | 1 -
 .../semanticTests/array/copying/storage_memory_nested_struct.sol | 1 -
 .../semanticTests/array/copying/storage_memory_packed_dyn.sol    | 1 -
 .../array/copying/string_calldata_to_bytes_calldata.sol          | 1 -
 test/libsolidity/semanticTests/array/create_memory_array.sol     | 1 -
 .../libsolidity/semanticTests/array/create_memory_byte_array.sol | 1 -
 .../semanticTests/array/delete/bytes_delete_element.sol          | 1 -
 .../semanticTests/array/delete/delete_bytes_array.sol            | 1 -
 .../semanticTests/array/delete/delete_memory_array.sol           | 1 -
 .../semanticTests/array/delete/delete_on_array_of_structs.sol    | 1 -
 .../semanticTests/array/delete/delete_removes_bytes_data.sol     | 1 -
 .../semanticTests/array/delete/delete_storage_array.sol          | 1 -
 .../semanticTests/array/delete/delete_storage_array_packed.sol   | 1 -
 .../semanticTests/array/delete/memory_arrays_delete.sol          | 1 -
 test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol   | 1 -
 .../semanticTests/array/dynamic_arrays_in_storage.sol            | 1 -
 .../semanticTests/array/dynamic_multi_array_cleanup.sol          | 1 -
 .../semanticTests/array/dynamic_out_of_bounds_array_access.sol   | 1 -
 .../semanticTests/array/evm_exceptions_out_of_band_access.sol    | 1 -
 .../semanticTests/array/fixed_arrays_as_return_type.sol          | 1 -
 .../semanticTests/array/fixed_arrays_in_constructors.sol         | 1 -
 .../semanticTests/array/function_array_cross_calls.sol           | 1 -
 .../array/indexAccess/arrays_complex_memory_index_access.sol     | 1 -
 .../semanticTests/array/indexAccess/bytes_index_access.sol       | 1 -
 .../array/indexAccess/bytes_index_access_memory.sol              | 1 -
 .../array/indexAccess/bytes_memory_index_access.sol              | 1 -
 .../semanticTests/array/indexAccess/fixed_bytes_index_access.sol | 1 -
 .../indexAccess/memory_arrays_dynamic_index_access_write.sol     | 1 -
 .../array/invalid_encoding_for_storage_byte_array.sol            | 1 -
 test/libsolidity/semanticTests/array/memory.sol                  | 1 -
 .../semanticTests/array/memory_arrays_of_various_sizes.sol       | 1 -
 test/libsolidity/semanticTests/array/pop/array_pop.sol           | 1 -
 .../semanticTests/array/pop/array_pop_array_transition.sol       | 1 -
 .../semanticTests/array/pop/array_pop_storage_empty.sol          | 1 -
 .../semanticTests/array/pop/array_pop_uint16_transition.sol      | 1 -
 .../semanticTests/array/pop/array_pop_uint24_transition.sol      | 1 -
 .../semanticTests/array/pop/byte_array_pop_copy_long.sol         | 1 -
 .../array/pop/byte_array_pop_long_storage_empty.sol              | 1 -
 .../array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol  | 1 -
 .../semanticTests/array/pop/byte_array_pop_masking_long.sol      | 1 -
 test/libsolidity/semanticTests/array/pop/parenthesized.sol       | 1 -
 test/libsolidity/semanticTests/array/push/array_push.sol         | 1 -
 test/libsolidity/semanticTests/array/push/array_push_nested.sol  | 1 -
 .../semanticTests/array/push/array_push_nested_from_calldata.sol | 1 -
 .../semanticTests/array/push/array_push_nested_from_memory.sol   | 1 -
 .../semanticTests/array/push/array_push_packed_array.sol         | 1 -
 test/libsolidity/semanticTests/array/push/array_push_struct.sol  | 1 -
 .../semanticTests/array/push/array_push_struct_from_calldata.sol | 1 -
 .../semanticTests/array/push/byte_array_push_transition.sol      | 1 -
 test/libsolidity/semanticTests/array/push/nested_bytes_push.sol  | 1 -
 test/libsolidity/semanticTests/array/push/push_no_args_1d.sol    | 1 -
 test/libsolidity/semanticTests/array/push/push_no_args_2d.sol    | 1 -
 test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol | 1 -
 .../libsolidity/semanticTests/array/push/push_no_args_struct.sol | 1 -
 test/libsolidity/semanticTests/array/reusing_memory.sol          | 1 -
 .../array_slice_calldata_as_argument_of_external_calls.sol       | 1 -
 .../array/slices/array_slice_calldata_to_calldata.sol            | 1 -
 .../array/slices/array_slice_calldata_to_memory.sol              | 1 -
 .../array/slices/array_slice_calldata_to_storage.sol             | 1 -
 test/libsolidity/semanticTests/array/storage_array_ref.sol       | 1 -
 test/libsolidity/semanticTests/array/string_bytes_conversion.sol | 1 -
 .../array/string_literal_assign_to_storage_bytes.sol             | 1 -
 .../builtinFunctions/iterated_keccak256_with_bytes.sol           | 1 -
 .../builtinFunctions/keccak256_multiple_arguments.sol            | 1 -
 .../keccak256_multiple_arguments_with_numeric_literals.sol       | 1 -
 .../keccak256_multiple_arguments_with_string_literals.sol        | 1 -
 .../semanticTests/builtinFunctions/keccak256_with_bytes.sol      | 1 -
 .../semanticTests/builtinFunctions/ripemd160_empty.sol           | 1 -
 test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol | 1 -
 test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol | 1 -
 .../calldata/calldata_bound_dynamic_array_or_slice.sol           | 1 -
 .../semanticTests/calldata/calldata_bound_static_array.sol       | 1 -
 .../libsolidity/semanticTests/calldata/calldata_bound_struct.sol | 1 -
 .../semanticTests/calldata/calldata_bytes_internal.sol           | 1 -
 .../semanticTests/calldata/calldata_bytes_to_memory.sol          | 1 -
 .../semanticTests/calldata/calldata_bytes_to_memory_encode.sol   | 1 -
 .../calldata/calldata_internal_function_pointer.sol              | 1 -
 .../semanticTests/calldata/calldata_internal_library.sol         | 1 -
 .../semanticTests/calldata/calldata_internal_multi_array.sol     | 1 -
 .../calldata/calldata_internal_multi_fixed_array.sol             | 1 -
 .../libsolidity/semanticTests/calldata/calldata_memory_mixed.sol | 1 -
 .../libsolidity/semanticTests/calldata/calldata_string_array.sol | 1 -
 test/libsolidity/semanticTests/calldata/calldata_struct.sol      | 1 -
 .../semanticTests/calldata/calldata_struct_internal.sol          | 1 -
 ...dexed_log_topic_during_explicit_downcast_during_emissions.sol | 1 -
 .../semanticTests/constructor/arrays_in_constructors.sol         | 1 -
 .../semanticTests/constructor/base_constructor_arguments.sol     | 1 -
 .../semanticTests/constructor/bytes_in_constructors_packer.sol   | 1 -
 .../semanticTests/constructor/bytes_in_constructors_unpacker.sol | 1 -
 .../semanticTests/constructor/constructor_arguments_external.sol | 1 -
 .../semanticTests/constructor/constructor_arguments_internal.sol | 1 -
 .../semanticTests/constructor/constructor_function_argument.sol  | 1 -
 .../semanticTests/constructor/constructor_function_complex.sol   | 1 -
 .../constructor/constructor_static_array_argument.sol            | 1 -
 .../constructor/evm_exceptions_in_constructor_call_fail.sol      | 1 -
 .../constructor/function_usage_in_constructor_arguments.sol      | 1 -
 .../libsolidity/semanticTests/constructor/no_callvalue_check.sol | 1 -
 .../semanticTests/constructor/order_of_evaluation.sol            | 1 -
 .../store_internal_unused_library_function_in_constructor.sol    | 1 -
 test/libsolidity/semanticTests/constructor_with_params.sol       | 1 -
 .../constructor_with_params_diamond_inheritance.sol              | 1 -
 .../semanticTests/constructor_with_params_inheritance.sol        | 1 -
 .../semanticTests/constructor_with_params_inheritance_2.sol      | 1 -
 .../semanticTests/conversions/function_type_array_to_storage.sol | 1 -
 test/libsolidity/semanticTests/conversions/string_to_bytes.sol   | 1 -
 test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol  | 1 -
 test/libsolidity/semanticTests/ecrecover/ecrecover.sol           | 1 -
 test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol     | 1 -
 .../semanticTests/ecrecover/failing_ecrecover_invalid_input.sol  | 1 -
 .../ecrecover/failing_ecrecover_invalid_input_asm.sol            | 1 -
 .../ecrecover/failing_ecrecover_invalid_input_proper.sol         | 1 -
 test/libsolidity/semanticTests/enums/enum_with_256_members.sol   | 1 -
 test/libsolidity/semanticTests/enums/invalid_enum_logged.sol     | 1 -
 test/libsolidity/semanticTests/enums/minmax.sol                  | 1 -
 test/libsolidity/semanticTests/error/selector.sol                | 1 -
 .../semanticTests/errors/error_in_library_and_interface.sol      | 1 -
 test/libsolidity/semanticTests/errors/revert_conversion.sol      | 1 -
 test/libsolidity/semanticTests/events/event.sol                  | 1 -
 .../semanticTests/events/event_access_through_base_name_emit.sol | 1 -
 test/libsolidity/semanticTests/events/event_anonymous.sol        | 1 -
 .../events/event_anonymous_with_signature_collision.sol          | 1 -
 .../events/event_anonymous_with_signature_collision2.sol         | 1 -
 .../semanticTests/events/event_anonymous_with_topics.sol         | 1 -
 test/libsolidity/semanticTests/events/event_constructor.sol      | 1 -
 .../semanticTests/events/event_dynamic_array_memory.sol          | 1 -
 .../semanticTests/events/event_dynamic_array_memory_v2.sol       | 1 -
 .../semanticTests/events/event_dynamic_array_storage.sol         | 1 -
 .../semanticTests/events/event_dynamic_array_storage_v2.sol      | 1 -
 .../events/event_dynamic_nested_array_memory_v2.sol              | 1 -
 .../events/event_dynamic_nested_array_storage_v2.sol             | 1 -
 test/libsolidity/semanticTests/events/event_emit.sol             | 1 -
 .../semanticTests/events/event_emit_from_other_contract.sol      | 1 -
 test/libsolidity/semanticTests/events/event_indexed_function.sol | 1 -
 .../libsolidity/semanticTests/events/event_indexed_function2.sol | 1 -
 test/libsolidity/semanticTests/events/event_indexed_mixed.sol    | 1 -
 test/libsolidity/semanticTests/events/event_indexed_string.sol   | 1 -
 test/libsolidity/semanticTests/events/event_lots_of_data.sol     | 1 -
 test/libsolidity/semanticTests/events/event_no_arguments.sol     | 1 -
 .../semanticTests/events/event_really_lots_of_data.sol           | 1 -
 .../events/event_really_lots_of_data_from_storage.sol            | 1 -
 .../events/event_really_really_lots_of_data_from_storage.sol     | 1 -
 .../semanticTests/events/event_signature_in_library.sol          | 1 -
 test/libsolidity/semanticTests/events/event_string.sol           | 1 -
 test/libsolidity/semanticTests/events/event_struct_memory_v2.sol | 1 -
 .../libsolidity/semanticTests/events/event_struct_storage_v2.sol | 1 -
 test/libsolidity/semanticTests/events/events_with_same_name.sol  | 1 -
 .../events/events_with_same_name_inherited_emit.sol              | 1 -
 .../expressions/conditional_expression_storage_memory_2.sol      | 1 -
 .../semanticTests/expressions/unary_too_long_literal.sol         | 1 -
 .../semanticTests/externalContracts/FixedFeeRegistrar.sol        | 1 -
 .../semanticTests/externalContracts/deposit_contract.sol         | 1 -
 .../semanticTests/externalContracts/prbmath_signed.sol           | 1 -
 .../semanticTests/externalContracts/prbmath_unsigned.sol         | 1 -
 .../libsolidity/semanticTests/externalContracts/ramanujan_pi.sol | 1 -
 test/libsolidity/semanticTests/externalContracts/strings.sol     | 1 -
 .../semanticTests/externalSource/multiple_equals_signs.sol       | 1 -
 .../semanticTests/externalSource/multiple_external_source.sol    | 1 -
 test/libsolidity/semanticTests/externalSource/multisource.sol    | 1 -
 .../semanticTests/externalSource/non_normalized_paths.sol        | 1 -
 .../semanticTests/externalSource/relative_imports.sol            | 1 -
 test/libsolidity/semanticTests/externalSource/source.sol         | 1 -
 test/libsolidity/semanticTests/externalSource/source_import.sol  | 1 -
 .../semanticTests/externalSource/source_import_subdir.sol        | 1 -
 .../externalSource/source_name_starting_with_dots.sol            | 1 -
 .../semanticTests/externalSource/source_remapping.sol            | 1 -
 .../libsolidity/semanticTests/freeFunctions/free_runtimecode.sol | 1 -
 .../semanticTests/freeFunctions/libraries_from_free.sol          | 1 -
 test/libsolidity/semanticTests/freeFunctions/new_operator.sol    | 1 -
 .../semanticTests/freeFunctions/storage_calldata_refs.sol        | 1 -
 .../semanticTests/functionCall/bare_call_no_returndatacopy.sol   | 1 -
 ...ll_internal_function_with_multislot_arguments_via_pointer.sol | 1 -
 .../semanticTests/functionCall/call_options_overload.sol         | 1 -
 .../functionCall/creation_function_call_no_args.sol              | 1 -
 .../functionCall/creation_function_call_with_args.sol            | 1 -
 test/libsolidity/semanticTests/functionCall/external_call.sol    | 1 -
 .../semanticTests/functionCall/external_call_to_nonexisting.sol  | 1 -
 .../semanticTests/functionCall/external_call_value.sol           | 1 -
 .../semanticTests/functionCall/gas_and_value_basic.sol           | 1 -
 .../semanticTests/functionCall/gas_and_value_brace_syntax.sol    | 1 -
 .../functionCall/mapping_array_internal_argument.sol             | 1 -
 .../semanticTests/functionCall/mapping_internal_argument.sol     | 1 -
 .../semanticTests/functionCall/mapping_internal_return.sol       | 1 -
 .../comparison_operators_for_external_functions.sol              | 1 -
 .../functionTypes/function_external_delete_storage.sol           | 1 -
 .../functionTypes/function_type_library_internal.sol             | 1 -
 .../functionTypes/inline_array_with_value_call_option.sol        | 1 -
 .../semanticTests/functionTypes/mapping_of_functions.sol         | 1 -
 .../functionTypes/pass_function_types_externally.sol             | 1 -
 .../stack_height_check_on_adding_gas_variable_to_function.sol    | 1 -
 test/libsolidity/semanticTests/functionTypes/store_function.sol  | 1 -
 .../functionTypes/struct_with_external_function.sol              | 1 -
 test/libsolidity/semanticTests/getters/array_mapping_struct.sol  | 1 -
 test/libsolidity/semanticTests/getters/arrays.sol                | 1 -
 test/libsolidity/semanticTests/getters/mapping.sol               | 1 -
 test/libsolidity/semanticTests/getters/mapping_array_struct.sol  | 1 -
 test/libsolidity/semanticTests/getters/mapping_of_string.sol     | 1 -
 test/libsolidity/semanticTests/getters/mapping_to_struct.sol     | 1 -
 test/libsolidity/semanticTests/getters/struct_with_bytes.sol     | 1 -
 .../semanticTests/getters/struct_with_bytes_simple.sol           | 1 -
 .../semanticTests/immutable/assign_at_declaration.sol            | 1 -
 .../semanticTests/immutable/assign_from_immutables.sol           | 1 -
 test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol    | 1 -
 test/libsolidity/semanticTests/immutable/getter.sol              | 1 -
 test/libsolidity/semanticTests/immutable/immutable_signed.sol    | 1 -
 test/libsolidity/semanticTests/immutable/inheritance.sol         | 1 -
 .../semanticTests/immutable/internal_function_pointer.sol        | 1 -
 test/libsolidity/semanticTests/immutable/multi_creation.sol      | 1 -
 test/libsolidity/semanticTests/immutable/read_in_ctor.sol        | 1 -
 .../semanticTests/immutable/small_types_in_reverse.sol           | 1 -
 test/libsolidity/semanticTests/immutable/stub.sol                | 1 -
 test/libsolidity/semanticTests/immutable/use_scratch.sol         | 1 -
 .../semanticTests/inheritance/address_overload_resolution.sol    | 1 -
 .../inherited_function_calldata_calldata_interface.sol           | 1 -
 .../inheritance/inherited_function_calldata_memory.sol           | 1 -
 .../inheritance/inherited_function_calldata_memory_interface.sol | 1 -
 .../inheritance/inherited_function_from_a_library.sol            | 1 -
 .../semanticTests/inheritance/member_notation_ctor.sol           | 1 -
 .../inheritance/pass_dynamic_arguments_to_the_base.sol           | 1 -
 .../inheritance/pass_dynamic_arguments_to_the_base_base.sol      | 1 -
 .../pass_dynamic_arguments_to_the_base_base_with_gap.sol         | 1 -
 .../semanticTests/inheritance/value_for_constructor.sol          | 1 -
 .../inlineAssembly/calldata_array_assign_dynamic.sol             | 1 -
 .../inlineAssembly/calldata_array_assign_static.sol              | 1 -
 .../libsolidity/semanticTests/inlineAssembly/calldata_assign.sol | 1 -
 .../inlineAssembly/calldata_assign_from_nowhere.sol              | 1 -
 .../semanticTests/inlineAssembly/calldata_struct_assign.sol      | 1 -
 .../inlineAssembly/calldata_struct_assign_and_return.sol         | 1 -
 .../inlineAssembly/external_function_pointer_address.sol         | 1 -
 .../external_function_pointer_address_assignment.sol             | 1 -
 .../inlineAssembly/external_function_pointer_selector.sol        | 1 -
 .../external_function_pointer_selector_assignment.sol            | 1 -
 .../inlineAssembly/external_identifier_access_shadowing.sol      | 1 -
 .../semanticTests/inlineAssembly/function_name_clash.sol         | 1 -
 .../semanticTests/inlineAssembly/keccak256_assembly.sol          | 1 -
 .../semanticTests/inlineAssembly/keccak256_optimization.sol      | 1 -
 .../keccak256_optimizer_bug_different_memory_location.sol        | 1 -
 .../inlineAssembly/keccak256_optimizer_cache_bug.sol             | 1 -
 .../inlineAssembly/keccak_optimization_bug_string.sol            | 1 -
 .../semanticTests/inlineAssembly/keccak_yul_optimization.sol     | 1 -
 test/libsolidity/semanticTests/inlineAssembly/slot_access.sol    | 1 -
 test/libsolidity/semanticTests/interfaceID/lisa.sol              | 1 -
 test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol  | 1 -
 .../semanticTests/interface_inheritance_conversions.sol          | 1 -
 test/libsolidity/semanticTests/isoltestTesting/account.sol       | 1 -
 .../semanticTests/isoltestTesting/balance_other_contract.sol     | 1 -
 .../semanticTests/isoltestTesting/balance_with_balance.sol       | 1 -
 .../semanticTests/isoltestTesting/balance_with_balance2.sol      | 1 -
 .../semanticTests/isoltestTesting/balance_without_balance.sol    | 1 -
 test/libsolidity/semanticTests/isoltestTesting/builtins.sol      | 1 -
 test/libsolidity/semanticTests/isoltestTesting/effects.sol       | 1 -
 .../isoltestTesting/format_raw_string_with_control_chars.sol     | 1 -
 .../semanticTests/isoltestTesting/storage/storage_empty.sol      | 1 -
 .../semanticTests/isoltestTesting/storage/storage_nonempty.sol   | 1 -
 .../semanticTests/libraries/bound_returning_calldata.sol         | 1 -
 test/libsolidity/semanticTests/libraries/bound_to_calldata.sol   | 1 -
 .../libraries/external_call_with_function_pointer_parameter.sol  | 1 -
 .../libraries/external_call_with_storage_array_parameter.sol     | 1 -
 .../libraries/external_call_with_storage_mapping_parameter.sol   | 1 -
 .../libraries/internal_call_bound_with_parentheses.sol           | 1 -
 .../libraries/internal_call_bound_with_parentheses1.sol          | 1 -
 .../semanticTests/libraries/internal_library_function.sol        | 1 -
 .../semanticTests/libraries/internal_library_function_bound.sol  | 1 -
 .../libraries/internal_library_function_bound_to_address.sol     | 1 -
 ...nal_library_function_bound_to_address_named_send_transfer.sol | 1 -
 .../internal_library_function_bound_to_array_named_pop_push.sol  | 1 -
 .../libraries/internal_library_function_bound_to_bool.sol        | 1 -
 .../libraries/internal_library_function_bound_to_contract.sol    | 1 -
 .../internal_library_function_bound_to_dynamic_array.sol         | 1 -
 .../libraries/internal_library_function_bound_to_enum.sol        | 1 -
 .../internal_library_function_bound_to_external_function.sol     | 1 -
 .../libraries/internal_library_function_bound_to_fixed_array.sol | 1 -
 .../libraries/internal_library_function_bound_to_fixed_bytes.sol | 1 -
 ...nternal_library_function_bound_to_function_named_selector.sol | 1 -
 .../libraries/internal_library_function_bound_to_integer.sol     | 1 -
 .../libraries/internal_library_function_bound_to_interface.sol   | 1 -
 .../internal_library_function_bound_to_internal_function.sol     | 1 -
 .../libraries/internal_library_function_bound_to_literal.sol     | 1 -
 .../libraries/internal_library_function_bound_to_mapping.sol     | 1 -
 .../internal_library_function_bound_to_storage_string.sol        | 1 -
 .../libraries/internal_library_function_bound_to_string.sol      | 1 -
 .../libraries/internal_library_function_calling_private.sol      | 1 -
 .../libraries/internal_library_function_pointer.sol              | 1 -
 .../libraries/internal_library_function_return_var_size.sol      | 1 -
 .../semanticTests/libraries/library_address_homestead.sol        | 1 -
 .../semanticTests/libraries/library_enum_as_an_expression.sol    | 1 -
 .../libraries/library_return_struct_with_mapping.sol             | 1 -
 .../semanticTests/libraries/library_staticcall_delegatecall.sol  | 1 -
 .../semanticTests/libraries/library_struct_as_an_expression.sol  | 1 -
 test/libsolidity/semanticTests/libraries/stub.sol                | 1 -
 test/libsolidity/semanticTests/libraries/stub_internal.sol       | 1 -
 .../semanticTests/libraries/using_for_function_on_int.sol        | 1 -
 .../semanticTests/libraries/using_for_storage_structs.sol        | 1 -
 .../literals/ternary_operator_with_literal_types_overflow.sol    | 1 -
 .../memoryManagement/memory_types_initialisation.sol             | 1 -
 .../semanticTests/memoryManagement/return_variable.sol           | 1 -
 .../memoryManagement/static_memory_array_allocation.sol          | 1 -
 test/libsolidity/semanticTests/modifiers/evaluation_order.sol    | 1 -
 .../semanticTests/modifiers/function_modifier_library.sol        | 1 -
 .../modifiers/function_modifier_library_inheritance.sol          | 1 -
 .../modifiers/function_modifier_return_reference.sol             | 1 -
 .../semanticTests/multiSource/import_overloaded_function.sol     | 1 -
 test/libsolidity/semanticTests/smoke/alignment.sol               | 1 -
 test/libsolidity/semanticTests/smoke/arrays.sol                  | 1 -
 test/libsolidity/semanticTests/smoke/bytes_and_strings.sol       | 1 -
 test/libsolidity/semanticTests/smoke/constructor.sol             | 1 -
 .../semanticTests/specialFunctions/keccak256_optimized.sol       | 1 -
 test/libsolidity/semanticTests/state/blockhash_basic.sol         | 1 -
 test/libsolidity/semanticTests/state/msg_data.sol                | 1 -
 .../semanticTests/storage/accessors_mapping_for_array.sol        | 1 -
 test/libsolidity/semanticTests/storage/array_accessor.sol        | 1 -
 test/libsolidity/semanticTests/storage/chop_sign_bits.sol        | 1 -
 test/libsolidity/semanticTests/storage/complex_accessors.sol     | 1 -
 test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol  | 1 -
 test/libsolidity/semanticTests/storage/mapping_state.sol         | 1 -
 test/libsolidity/semanticTests/storage/mapping_string_key.sol    | 1 -
 .../semanticTests/storage/mappings_array2d_pop_delete.sol        | 1 -
 .../semanticTests/storage/mappings_array_pop_delete.sol          | 1 -
 test/libsolidity/semanticTests/storage/packed_functions.sol      | 1 -
 test/libsolidity/semanticTests/storage/struct_accessor.sol       | 1 -
 .../semanticTests/strings/concat/string_concat_2_args.sol        | 1 -
 .../strings/concat/string_concat_different_types.sol             | 1 -
 .../semanticTests/strings/concat/string_concat_nested.sol        | 1 -
 .../semanticTests/strings/constant_string_literal.sol            | 1 -
 test/libsolidity/semanticTests/strings/empty_string_input.sol    | 1 -
 .../semanticTests/structs/calldata/calldata_nested_structs.sol   | 1 -
 .../semanticTests/structs/calldata/calldata_struct_and_ints.sol  | 1 -
 .../structs/calldata/calldata_struct_array_member.sol            | 1 -
 .../calldata/calldata_struct_as_argument_of_lib_function.sol     | 1 -
 .../structs/calldata/calldata_struct_as_memory_argument.sol      | 1 -
 .../structs/calldata/calldata_struct_struct_member.sol           | 1 -
 .../structs/calldata/calldata_struct_struct_member_dynamic.sol   | 1 -
 .../calldata/calldata_struct_to_memory_tuple_assignment.sol      | 1 -
 .../structs/calldata/calldata_struct_with_array_to_memory.sol    | 1 -
 .../structs/calldata/calldata_struct_with_bytes_to_memory.sol    | 1 -
 .../calldata/calldata_struct_with_nested_array_to_memory.sol     | 1 -
 .../calldata/calldata_struct_with_nested_array_to_storage.sol    | 1 -
 .../structs/conversion/recursive_storage_memory.sol              | 1 -
 .../structs/conversion/recursive_storage_memory_complex.sol      | 1 -
 test/libsolidity/semanticTests/structs/copy_from_storage.sol     | 1 -
 test/libsolidity/semanticTests/structs/delete_struct.sol         | 1 -
 test/libsolidity/semanticTests/structs/event.sol                 | 1 -
 .../semanticTests/structs/msg_data_to_struct_member_copy.sol     | 1 -
 .../semanticTests/structs/multislot_struct_allocation.sol        | 1 -
 .../semanticTests/structs/packed_storage_structs_delete.sol      | 1 -
 test/libsolidity/semanticTests/structs/recursive_struct_2.sol    | 1 -
 .../semanticTests/structs/struct_constructor_nested.sol          | 1 -
 .../structs/struct_containing_bytes_copy_and_delete.sol          | 1 -
 test/libsolidity/semanticTests/structs/struct_copy.sol           | 1 -
 .../semanticTests/structs/struct_delete_storage_with_array.sol   | 1 -
 .../semanticTests/structs/struct_delete_struct_in_mapping.sol    | 1 -
 test/libsolidity/semanticTests/structs/struct_reference.sol      | 1 -
 .../semanticTests/structs/struct_storage_push_zero_value.sol     | 1 -
 .../semanticTests/structs/struct_storage_to_mapping.sol          | 1 -
 test/libsolidity/semanticTests/structs/structs.sol               | 1 -
 test/libsolidity/semanticTests/tryCatch/assert.sol               | 1 -
 test/libsolidity/semanticTests/tryCatch/return_function.sol      | 1 -
 test/libsolidity/semanticTests/tryCatch/trivial.sol              | 1 -
 .../types/array_mapping_abstract_constructor_param.sol           | 1 -
 .../types/mapping/user_defined_types_mapping_storage.sol         | 1 -
 .../semanticTests/types/mapping_abstract_constructor_param.sol   | 1 -
 test/libsolidity/semanticTests/types/mapping_contract_key.sol    | 1 -
 .../semanticTests/types/mapping_contract_key_getter.sol          | 1 -
 .../semanticTests/types/mapping_contract_key_library.sol         | 1 -
 .../semanticTests/types/mapping_enum_key_getter_v2.sol           | 1 -
 test/libsolidity/semanticTests/types/mapping_simple.sol          | 1 -
 .../types/struct_mapping_abstract_constructor_param.sol          | 1 -
 .../userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol  | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/calldata.sol | 1 -
 .../semanticTests/userDefinedValueType/calldata_to_storage.sol   | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol  | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/constant.sol | 1 -
 .../semanticTests/userDefinedValueType/conversion.sol            | 1 -
 .../semanticTests/userDefinedValueType/dirty_slot.sol            | 1 -
 .../semanticTests/userDefinedValueType/dirty_uint8_read.sol      | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/erc20.sol    | 1 -
 .../semanticTests/userDefinedValueType/fixedpoint.sol            | 1 -
 .../semanticTests/userDefinedValueType/immutable_signed.sol      | 1 -
 .../semanticTests/userDefinedValueType/in_parenthesis.sol        | 1 -
 .../semanticTests/userDefinedValueType/mapping_key.sol           | 1 -
 .../semanticTests/userDefinedValueType/memory_to_storage.sol     | 1 -
 .../semanticTests/userDefinedValueType/multisource.sol           | 1 -
 .../semanticTests/userDefinedValueType/multisource_module.sol    | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/ownable.sol  | 1 -
 .../libsolidity/semanticTests/userDefinedValueType/parameter.sol | 1 -
 test/libsolidity/semanticTests/userDefinedValueType/simple.sol   | 1 -
 .../semanticTests/userDefinedValueType/storage_layout.sol        | 1 -
 .../semanticTests/userDefinedValueType/storage_layout_struct.sol | 1 -
 .../semanticTests/userDefinedValueType/storage_signed.sol        | 1 -
 .../semanticTests/userDefinedValueType/wrap_unwrap.sol           | 1 -
 .../userDefinedValueType/wrap_unwrap_via_contract_name.sol       | 1 -
 .../zero_cost_abstraction_comparison_elementary.sol              | 1 -
 .../zero_cost_abstraction_comparison_userdefined.sol             | 1 -
 test/libsolidity/semanticTests/using/calldata_memory_copy.sol    | 1 -
 test/libsolidity/semanticTests/using/free_function_braces.sol    | 1 -
 test/libsolidity/semanticTests/using/free_function_multi.sol     | 1 -
 .../semanticTests/using/free_functions_individual.sol            | 1 -
 test/libsolidity/semanticTests/using/imported_functions.sol      | 1 -
 test/libsolidity/semanticTests/using/library_on_interface.sol    | 1 -
 test/libsolidity/semanticTests/using/library_through_module.sol  | 1 -
 test/libsolidity/semanticTests/using/module_renamed.sol          | 1 -
 test/libsolidity/semanticTests/using/recursive_import.sol        | 1 -
 .../semanticTests/using/using_global_all_the_types.sol           | 1 -
 test/libsolidity/semanticTests/using/using_global_for_global.sol | 1 -
 test/libsolidity/semanticTests/using/using_global_invisible.sol  | 1 -
 test/libsolidity/semanticTests/using/using_global_library.sol    | 1 -
 .../semanticTests/variables/mapping_local_assignment.sol         | 1 -
 .../variables/mapping_local_compound_assignment.sol              | 1 -
 .../semanticTests/variables/mapping_local_tuple_assignment.sol   | 1 -
 .../public_state_overridding_mapping_to_dynamic_struct.sol       | 1 -
 .../semanticTests/variables/storing_invalid_boolean.sol          | 1 -
 test/libsolidity/semanticTests/various/address_code_complex.sol  | 1 -
 test/libsolidity/semanticTests/various/code_access_content.sol   | 1 -
 test/libsolidity/semanticTests/various/code_access_create.sol    | 1 -
 test/libsolidity/semanticTests/various/code_access_padding.sol   | 1 -
 .../semanticTests/various/destructuring_assignment.sol           | 1 -
 test/libsolidity/semanticTests/various/erc20.sol                 | 1 -
 .../semanticTests/various/external_types_in_calls.sol            | 1 -
 test/libsolidity/semanticTests/various/literal_empty_string.sol  | 1 -
 .../semanticTests/various/nested_calldata_struct_to_memory.sol   | 1 -
 test/libsolidity/semanticTests/various/senders_balance.sol       | 1 -
 test/libsolidity/semanticTests/various/skip_dynamic_types.sol    | 1 -
 ...kip_dynamic_types_for_static_arrays_with_dynamic_elements.sol | 1 -
 .../semanticTests/various/skip_dynamic_types_for_structs.sol     | 1 -
 .../various/storage_string_as_mapping_key_without_variable.sol   | 1 -
 test/libsolidity/semanticTests/various/store_bytes.sol           | 1 -
 test/libsolidity/semanticTests/various/tuples.sol                | 1 -
 test/libsolidity/semanticTests/various/value_complex.sol         | 1 -
 test/libsolidity/semanticTests/various/value_insane.sol          | 1 -
 .../libsolidity/semanticTests/various/write_storage_external.sol | 1 -
 test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol    | 1 -
 test/libsolidity/semanticTests/viaYul/array_2d_new.sol           | 1 -
 test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol    | 1 -
 test/libsolidity/semanticTests/viaYul/array_3d_new.sol           | 1 -
 .../libsolidity/semanticTests/viaYul/array_function_pointers.sol | 1 -
 .../array_2d_zeroed_memory_index_access.sol                      | 1 -
 .../viaYul/array_memory_allocation/array_array_static.sol        | 1 -
 .../array_static_return_param_zeroed_memory_index_access.sol     | 1 -
 .../array_static_zeroed_memory_index_access.sol                  | 1 -
 .../array_memory_allocation/array_zeroed_memory_index_access.sol | 1 -
 .../semanticTests/viaYul/array_memory_as_parameter.sol           | 1 -
 test/libsolidity/semanticTests/viaYul/array_memory_create.sol    | 1 -
 .../semanticTests/viaYul/array_memory_index_access.sol           | 1 -
 .../semanticTests/viaYul/array_push_return_reference.sol         | 1 -
 test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol    | 1 -
 .../semanticTests/viaYul/array_storage_index_access.sol          | 1 -
 .../semanticTests/viaYul/array_storage_index_boundary_test.sol   | 1 -
 .../semanticTests/viaYul/array_storage_index_zeroed_test.sol     | 1 -
 .../semanticTests/viaYul/array_storage_length_access.sol         | 1 -
 test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol | 1 -
 test/libsolidity/semanticTests/viaYul/calldata_array_access.sol  | 1 -
 test/libsolidity/semanticTests/viaYul/calldata_array_length.sol  | 1 -
 .../semanticTests/viaYul/calldata_bytes_array_bounds.sol         | 1 -
 .../viaYul/conversion/explicit_string_bytes_calldata_cast.sol    | 1 -
 .../semanticTests/viaYul/conversion/function_cast.sol            | 1 -
 .../semanticTests/viaYul/copy_struct_invalid_ir_bug.sol          | 1 -
 .../viaYul/empty_return_corrupted_free_memory_pointer.sol        | 1 -
 test/libsolidity/semanticTests/viaYul/keccak.sol                 | 1 -
 .../libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol | 1 -
 test/libsolidity/semanticTests/viaYul/mapping_getters.sol        | 1 -
 test/libsolidity/semanticTests/viaYul/mapping_string_key.sol     | 1 -
 test/libsolidity/semanticTests/viaYul/negation_bug.sol           | 1 -
 .../semanticTests/viaYul/storage/dirty_storage_bytes_long.sol    | 1 -
 .../semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol | 1 -
 .../semanticTests/viaYul/storage/dirty_storage_struct.sol        | 1 -
 test/libsolidity/semanticTests/viaYul/storage/mappings.sol       | 1 -
 .../virtual_function_usage_in_constructor_arguments.sol          | 1 -
 575 files changed, 575 deletions(-)

diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
index 82cc456c09..180d89ec18 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(bytes): 0x20, 0xc0, 0x20, 0x4, 0x3, 0x4, 0x5, 0x6 -> 0x20, 0x4, 0x3, 0x4, 0x5, 0x6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol
index f85da124cb..2624591abe 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_fixed_arrays.sol
@@ -4,6 +4,5 @@ contract C {
         return (a[i], b[j][k]);
     }
 }
-// ====
 // ----
 // f(uint16[3],uint16[2][3],uint256,uint256,uint256): 1, 2, 3, 11, 12, 21, 22, 31, 32, 1, 2, 1 -> 2, 32
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
index ddc9249118..270a5abc06 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
@@ -8,6 +8,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(bytes): 0x20, 0xc0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6 -> 1, 2, 3, 4, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
index 638a7ce57b..5e4d03a7e0 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
@@ -11,6 +11,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(bytes): 0x20, 0xc0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6 -> 1, 2, 3, 4, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
index ebd4a07252..7b873951f6 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(bytes): 0x20, 0x20, 0x21 -> 33
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
index 9f1f949419..eb4bd70fbc 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
@@ -18,6 +18,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
index 2d11efa64b..ddfe343294 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
@@ -12,6 +12,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(bytes): 0x20, 0xe0, 0x20, 0x21, 0x40, 0x3, 0xa, 0xb, 0xc -> 0x20, 0x21, 0x40, 0x3, 0xa, 0xb, 0xc
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index 810376454b..bec4adfbdd 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
@@ -20,7 +20,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
 // gas irOptimized: 203310
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
index a0f3ca00f4..d73db5da62 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
@@ -22,6 +22,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol
index 887ba5dc33..9895c666a0 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/byte_arrays.sol
@@ -9,7 +9,6 @@ contract C {
         return (a, b.length, b[3], c);
     }
 }
-// ====
 // ----
 // f(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
 // f_external(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol
index 5fef532da6..7eb9a3885c 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_arrays.sol
@@ -4,6 +4,5 @@ contract C {
         return (b.length, b[a], c);
     }
 }
-// ====
 // ----
 // f(uint256,uint16[],uint256): 6, 0x60, 9, 7, 11, 12, 13, 14, 15, 16, 17 -> 7, 17, 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
index 32f8eba68a..126c6c950b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
@@ -19,7 +19,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test(bytes): 0x20, 0x80, 0x40, 0x60, 0, 0 -> false, false
 // test(bytes): 0x20, 0xC0, 0x40, 0x80, 1, 0x42, 1, 0x42 -> false, false
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol b/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol
index 2597057037..dbabfc35b1 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/memory_params_in_external_function.sol
@@ -12,6 +12,5 @@ contract C {
         return this.f("abc", "def", x);
     }
 }
-// ====
 // ----
 // g() -> 3, 0x6200000000000000000000000000000000000000000000000000000000000000, 3, 0x6600000000000000000000000000000000000000000000000000000000000000, 4, 7
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index 44a193dfbd..659dabfb37 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -21,7 +21,6 @@ contract C {
 		return (r[2], s.x, a, b, c, d);
 	}
 }
-// ====
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index 0854c580ac..3119eaa279 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -45,7 +45,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f0() -> 0x20, 0x0
 // f1() -> 0x20, 0x40, 0x1, 0x2
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index 973d33b90c..46743becc3 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -28,7 +28,6 @@ contract C is B {
         return foo(new A());
     }
 }
-// ====
 // ----
 // test() -> 77
 // gas irOptimized: 119711
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
index f49908d522..407cbf7a13 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
@@ -36,7 +36,6 @@ contract C is B {
         return (x, y);
     }
 }
-// ====
 // ----
 // test() -> 5, 10
 // gas irOptimized: 87337
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol
index 5dce4902c0..078da3fdc7 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/byte_arrays.sol
@@ -11,7 +11,6 @@ contract C {
         return (a, b.length, b[3], c);
     }
 }
-// ====
 // ----
 // f(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
 // f_external(uint256,bytes,uint256): 6, 0x60, 9, 7, "abcdefg" -> 6, 7, "d", 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol
index 74557f96b8..170f886402 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_reencode.sol
@@ -7,7 +7,6 @@ contract C {
         return this.f(x);
     }
 }
-// ====
 // ----
 // g(uint256[][2][]): 0x20, 0x01, 0x20, 0x40, 0x60, 0x00, 0x00 -> 42
 // g(uint256[][2][]): 0x20, 0x01, 0x20, 0x00, 0x00 -> 42
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol
index ee3bf38d2f..a52a065e66 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_function_types.sol
@@ -25,7 +25,6 @@ contract C {
         return reenc ? this.f_reenc(a) : this.f(a);
     }
 }
-// ====
 // ----
 // g(bool): false -> 23, 37, 71
 // g(bool): true -> 23, 37, 71
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
index a6dcdc6ee8..7fc08caafb 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_short_no_revert_string.sol
@@ -1,7 +1,6 @@
 contract C {
 	function f(uint[] calldata) public {}
 }
-// ====
 // ----
 // f(uint256[]): 0x20, 0 ->
 // f(uint256[]): 0x20, 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol
index 6280a70f6a..440f8e14ca 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_static_reencode.sol
@@ -11,7 +11,6 @@ contract C {
 		abi.encode(a);
 	}
 }
-// ====
 // ----
 // f(uint256[3][]): 0x20, 1, 0x01 -> FAILURE
 // f(uint256[3][]): 0x20, 1, 0x01, 0x02 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol
index e92a8cd847..129373de66 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_member_offset.sol
@@ -19,6 +19,5 @@ contract C {
         return (b.b, this.g(b));
     }
 }
-// ====
 // ----
 // f() -> 11, 11
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol
index 830128b614..44a462d131 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/address.sol
@@ -10,7 +10,6 @@ contract C {
         return this.g(x);
     }
 }
-// ====
 // ----
 // f(uint256): 0 -> 0
 // g(address): 0 -> 0 # test validation as well as sanity check #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol
index 93813558a4..8e788ab85d 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bool.sol
@@ -10,7 +10,6 @@ contract C {
         return this.gggg(x);
     }
 }
-// ====
 // ----
 // f(uint256): 0 -> false
 // gggg(bool): 0 -> false # test validation as well as sanity check #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol
index 6c55b70a59..92cffdd8a9 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/bytesx.sol
@@ -42,7 +42,6 @@ contract C {
         return this.g16(x);
     }
 }
-// ====
 // ----
 // f1(bytes32): left(0) -> left(0)
 // gg1(bytes1): left(0) -> left(0) # test validation as well as sanity check #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol
index 31f7470a78..1ae459d29e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/function.sol
@@ -16,7 +16,6 @@ contract C {
         return (this.ggg(s.f), this.h(s));
     }
 }
-// ====
 // ----
 // ffff(uint256): 0 -> 0, 0
 // ggg(function): 0 -> 0
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol
index 18c32fe910..8e60d5c336 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/intx.sol
@@ -42,7 +42,6 @@ contract C {
         return this.g128(x);
     }
 }
-// ====
 // ----
 // f8(int256): 0 -> 0
 // ggg8(int8): 0 -> 0 # test validation as well as sanity check #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol
index 2f27191205..9a33edda29 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/uintx.sol
@@ -42,7 +42,6 @@ contract C {
         return this.g128(x);
     }
 }
-// ====
 // ----
 // f8(uint256): 0 -> 0
 // ggg8(uint8): 0 -> 0 # test validation as well as sanity check #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol
index 73b3190368..e8b64a1082 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/dynamic_arrays.sol
@@ -6,6 +6,5 @@ contract C {
         return (b.length, b[a], c);
     }
 }
-// ====
 // ----
 // f(uint256,uint16[],uint256): 6, 0x60, 9, 7, 11, 12, 13, 14, 15, 16, 17 -> 7, 17, 9
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol
index 7205fec559..e9816ef14c 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/dynamic_nested_arrays.sol
@@ -25,7 +25,6 @@ contract C {
 		return this.f(12, b, c, 13);
 	}
 }
-// ====
 // ----
 // test() -> 12, 3, 4, 0x66, 5, 0x85, 13
 // f(uint256,uint16[][],uint256[2][][3],uint256): 12, 0x80, 0x220, 13, 3, 0x60, 0xC0, 0x160, 2, 85, 86, 4, 101, 102, 103, 104, 0, 0x60, 0xC0, 0x220, 1, 0, 117, 5, 0, 0, 0, 133, 0, 0, 0, 0, 0, 0, 0 -> 12, 3, 4, 0x66, 5, 0x85, 13
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol b/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol
index 560cc1ecde..f8beb57030 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/memory_params_in_external_function.sol
@@ -14,6 +14,5 @@ contract C {
         return this.f("abc", "def", x);
     }
 }
-// ====
 // ----
 // g() -> 3, 0x6200000000000000000000000000000000000000000000000000000000000000, 3, 0x6600000000000000000000000000000000000000000000000000000000000000, 4, 7
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol
index 8b1c021a5b..5c13d79169 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre2_struct.sol
@@ -8,6 +8,5 @@ contract C {
         r3 = b;
     }
 }
-// ====
 // ----
 // f(uint256,(address,uint256[])[2],uint256): 7, 0x60, 8, 0x40, 0xE0, 0x0, 0x40, 2, 0x11, 0x12, 0x99, 0x40, 4, 0x31, 0x32, 0x34, 0x35 -> 7, 0x0, 8
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol
index 802b3ee632..c5ab31dc31 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/mediocre_struct.sol
@@ -8,6 +8,5 @@ contract C {
         r3 = b;
     }
 }
-// ====
 // ----
 // f(uint256,(address)[2],uint256): 7, 0, 0, 8 -> 7, 0, 8
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol
index 3e3dd3adb8..3217a17342 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_function.sol
@@ -10,6 +10,5 @@ contract C {
     }
     function g() public returns (uint) { return 7; }
 }
-// ====
 // ----
 // test() -> 7, 3
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
index 7164c3220f..3bab26b831 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
@@ -8,6 +8,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
index 08f9064732..2703f25e93 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index 2fb406b778..54c1c5a643 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
 // gas irOptimized: 135918
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
index 3eca4cbb80..ab7a94372e 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
@@ -45,6 +45,5 @@ contract C {
 	}
 }
 
-// ====
 // ----
 // callExternal() -> true
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
index fec2c869ce..c54d6083cb 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_is_consistent.sol
@@ -49,7 +49,6 @@ contract C {
 		assert(keccak256(fReturnedFunctionPointer()) == keccak256(fSignatureFromLiteral()));
 	}
 }
-// ====
 // ----
 // assertConsistentSelectors() ->
 // fSignatureFromLiteral() -> 0x20, 0x84, 23450202028776381066253055403048136312616272755117076566855971503345107992576, 26959946667150639794667015087019630673637144422540572481103610249216, 1725436586697640946858688965569256363112777243042596638790631055949824, 86060793054017993816230018372407419485142305772921726565498526629888, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
index 2cf4274f47..2e2420af35 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
@@ -22,6 +22,5 @@ contract C {
 	}
 }
 
-// ====
 // ----
 // test() -> 0xa7a0d53700000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
index 2ff791ff04..0ce29f406a 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_special_args.sol
@@ -36,7 +36,6 @@ contract C {
 		assert(keccak256(fSignatureFromLiteralUint()) == keccak256(fPointerUint()));
 	}
 }
-// ====
 // ----
 // assertConsistentSelectors() ->
 // fSignatureFromLiteralNoArgs() -> 0x20, 0x04, 12200448252684243758085936796735499259670113115893304444050964496075123064832
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol
index ce3c952d16..61a8d0b431 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signature.sol
@@ -25,7 +25,6 @@ contract C {
 		ar = new uint[](2);
 	}
 }
-// ====
 // ----
 // f0() -> 0x20, 4, -34435155370463444793260793355178157075203752403645521721995013737368954863616
 // f1() -> 0x20, 0x64, -34435155370463444793260793355178157075203752403645521721995013737368954863616, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
index f3520223d2..4020530864 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_signaturev2.sol
@@ -33,7 +33,6 @@ contract C {
         return abi.encodeWithSignature(s.b, type(uint).max, s, uint(3));
     }
 }
-// ====
 // ----
 // f0() -> 0x20, 4, -34435155370463444793260793355178157075203752403645521721995013737368954863616
 // f1() -> 0x20, 0x64, -34435155370463444793260793355178157075203752403645521721995013737368954863616, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol b/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol
index 0fe8b45d55..7187ccf5df 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/contract_array.sol
@@ -10,7 +10,6 @@ contract C {
     return abi.encode(c);
   }
 }
-// ====
 // ----
 // f(bytes): 0x20, 0xA0, 0x20, 3, 0x01, 0x02, 0x03 -> 0x20, 3, 0x01, 0x02, 0x03
 // g() -> 0x20, 0xa0, 0x20, 3, 0x42, 0x21, 0x23
diff --git a/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol b/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol
index f676233096..0e56ecf581 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/contract_array_v2.sol
@@ -11,7 +11,6 @@ contract C {
     return abi.encode(c);
   }
 }
-// ====
 // ----
 // f(bytes): 0x20, 0xA0, 0x20, 3, 0x01, 0x02, 0x03 -> 0x20, 3, 0x01, 0x02, 0x03
 // f(bytes): 0x20, 0x60, 0x20, 1, 0x0102030405060708090a0b0c0d0e0f1011121314 -> 0x20, 1, 0x0102030405060708090a0b0c0d0e0f1011121314
diff --git a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
index d20919327a..29fa81ffed 100644
--- a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
+++ b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
@@ -13,7 +13,6 @@ contract D {
         return (new C{value: 11}()).x();
     }
 }
-// ====
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x11
 // g(), 100 wei -> 1
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol b/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol
index 9fb32f712d..8a29cb2b23 100644
--- a/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol
+++ b/test/libsolidity/semanticTests/arithmetics/checked_add_v2.sol
@@ -4,7 +4,6 @@ contract C {
         return a + b;
     }
 }
-// ====
 // ----
 // f(uint16,uint16): 65534, 0 -> 0xfffe
 // f(uint16,uint16): 65536, 0 -> FAILURE
diff --git a/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol b/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
index 6609e683a3..730209fb58 100644
--- a/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
+++ b/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
@@ -30,7 +30,6 @@ contract C {
      }
 }
 
-// ====
 // ----
 // test_hardcode1(uint256,uint256,uint256): 2, 3, 4 -> 2417851639229258349412352
 // test_hardcode2(uint256,uint256,uint256,uint256): 3, 2, 2, 2 -> 43046721
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index 8c1ad9982e..9a4fe29c02 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -10,7 +10,6 @@ contract Test {
         return data;
     }
 }
-// ====
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
 // gas irOptimized: 189800
diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
index 08562c89bd..72fa6860f9 100644
--- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
@@ -38,7 +38,6 @@ contract c {
         }
     }
 }
-// ====
 // ----
 // storageEmpty -> 1
 // test_short() -> 1780731860627700044960722568376587075150542249149356309979516913770823710
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index ac3b397fcf..5bc726b2c9 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -15,7 +15,6 @@ contract c {
         return 0;
     }
 }
-// ====
 // ----
 // test() -> 0
 // gas irOptimized: 157949
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index 36219409c8..575c393f78 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -10,7 +10,6 @@ contract c {
 
     bytes data;
 }
-// ====
 // ----
 // getLength() -> 0
 // set(): 1, 2 -> true
diff --git a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol
index cf8f55cc34..4300d8a6f3 100644
--- a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol
+++ b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_simple.sol
@@ -18,7 +18,6 @@ contract C {
         return bytes8(c[1:9]);
     }
 }
-// ====
 // ----
 // fromMemory(bytes): 0x20, 16, "abcdefghabcdefgh" -> "abcdefghabcdefgh"
 // fromCalldata(bytes): 0x20, 16, "abcdefghabcdefgh" -> "abcdefghabcdefgh"
diff --git a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol
index f4834cdf5d..04bdd83fc7 100644
--- a/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol
+++ b/test/libsolidity/semanticTests/array/bytes_to_fixed_bytes_too_long.sol
@@ -14,7 +14,6 @@ contract C {
         return bytes32(c[0:33]);
     }
 }
-// ====
 // ----
 // fromMemory(bytes): 0x20, 33, "abcdefghabcdefghabcdefghabcdefgh", "a" -> "abcdefghabcdefghabcdefghabcdefgh"
 // fromCalldata(bytes): 0x20, 33, "abcdefghabcdefghabcdefghabcdefgh", "a" -> "abcdefghabcdefghabcdefghabcdefgh"
diff --git a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol
index 5363a15285..93470f1d22 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid_static_middle.sol
@@ -16,7 +16,6 @@ contract C {
         return 42;
     }
 }
-// ====
 // ----
 // f(uint256[][1][]): 0x20, 0x0 -> 42 # valid access stub #
 // f(uint256[][1][]): 0x20, 0x1 -> FAILURE # invalid on argument decoding #
diff --git a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol b/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol
index 3e19347a6d..69104d383c 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_two_dimensional.sol
@@ -13,7 +13,6 @@ contract C {
         return this.test(a, i, j);
     }
 }
-// ====
 // ----
 // test(uint256[][2]): 0x20, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 2
 // test(uint256[][2],uint256): 0x40, 0, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 3
diff --git a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol b/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol
index 80870c2ebc..e96f492841 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_two_dimensional_1.sol
@@ -13,7 +13,6 @@ contract C {
         return this.test(a, i, j);
     }
 }
-// ====
 // ----
 // test(uint256[][]): 0x20, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 2
 // test(uint256[][],uint256): 0x40, 0, 2, 0x40, 0xC0, 3, 0x0A01, 0x0A02, 0x0A03, 4, 0x0B01, 0x0B02, 0x0B03, 0x0B04 -> 3
diff --git a/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol b/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol
index 68a15f5079..d6ff4679fe 100644
--- a/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol
+++ b/test/libsolidity/semanticTests/array/calldata_bytes_array_bounds.sol
@@ -4,7 +4,6 @@ contract C {
         return uint8(a[0][i]);
     }
 }
-// ====
 // ----
 // f(bytes[],uint256): 0x40, 0, 1, 0x20, 2, 0x6162000000000000000000000000000000000000000000000000000000000000 -> 0x61
 // f(bytes[],uint256): 0x40, 1, 1, 0x20, 2, 0x6162000000000000000000000000000000000000000000000000000000000000 -> 0x62
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol
index 95dfadbfc0..84c5621161 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_2_args.sol
@@ -3,7 +3,6 @@ contract C {
         return bytes.concat(a, b);
     }
 }
-// ====
 // ----
 // f(bytes,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 37, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdef"
 //
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol
index 686a82fcf9..d6b9e37678 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_3_args.sol
@@ -3,7 +3,6 @@ contract C {
         return bytes.concat(a, b, c);
     }
 }
-// ====
 // ----
 // f(bytes,bytes,bytes): 0x60, 0xa0, 0xe0, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef", 3, "abc" -> 0x20, 40, "abcdabcdabcdabcdabcdabcdabcdabcd", "bcdefabc"
 // f(bytes,bytes,bytes): 0x60, 0xa0, 0xe0, 3, "abc", 2, "de", 3, "fgh" -> 0x20, 8, "abcdefgh"
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol
index 18cff2a36a..030a959a52 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_as_argument.sol
@@ -11,7 +11,6 @@ contract C {
         return h(bytes.concat(a, b));
     }
 }
-// ====
 // ----
 // f(bytes,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x1106e19b6f06d1cce71c2d816754f83dfa5b95df958c5cbf12b7c472320c427c
 // g(bytes,bytes): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 37
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol
index b5dfcafeba..f4190322f4 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_nested.sol
@@ -3,6 +3,5 @@ contract C {
         return bytes.concat(bytes.concat(a, b), c);
     }
 }
-// ====
 // ----
 // f(bytes,bytes,bytes): 0x60, 0x60, 0x60, 2, "ab" -> 0x20, 6, "ababab"
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
index f05aa25e04..25567742df 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -7,7 +7,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // constructor(): 1, 2, 3 ->
 // gas irOptimized: 142640
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
index 3df942b9b9..75b83bad3d 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -18,7 +18,6 @@ contract c {
         g = m_byte_data[3][1];
     }
 }
-// ====
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
 // gas irOptimized: 650608
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
index 7ece68ac28..761feebec9 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint128.sol
@@ -19,7 +19,6 @@ contract C {
         return true;
     }
 }
-// ====
 // ----
 // f() -> true
 // gas irOptimized: 92740
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
index 5936fb9ecd..c74ddcd35c 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
@@ -44,7 +44,6 @@ contract C {
 
     }
 }
-// ====
 // ----
 // f() -> true
 // gas irOptimized: 153260
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
index 0d41687e03..66ab6f0998 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
@@ -11,7 +11,6 @@ contract C {
         return x[3];
     }
 }
-// ====
 // ----
 // f() -> 0
 // gas irOptimized: 135098
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
index 2fd8381762..13cb9c28fd 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage_packed.sol
@@ -38,7 +38,6 @@ contract C {
         return x2[1];
     }
 }
-// ====
 // ----
 // f() -> 0
 // gas irOptimized: 92800
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 46db8fb865..040a954cd5 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -17,7 +17,6 @@ contract c {
     }
 }
 
-// ====
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
 // gas irOptimized: 212564
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index 6bc82444ce..d99e42cacf 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -33,7 +33,6 @@ contract c {
         return (small.length, large.length);
     }
 }
-// ====
 // ----
 // test() -> 0x02000202
 // gas irOptimized: 4652048
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol
index 086b819cff..205920f65c 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_memory_to_storage.sol
@@ -23,7 +23,6 @@ contract C {
         return (a[0], b[1], a[2]);
     }
 }
-// ====
 // ----
 // f() -> 1, 3
 // g() -> 1, 2, 3
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index 8e2097c43f..0e085f96ec 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -11,7 +11,6 @@ contract c {
     }
 }
 
-// ====
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
 // gas irOptimized: 690203
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
index ecb08bdd3f..0e225f1e59 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
@@ -16,6 +16,5 @@ contract c {
     }
 }
 
-// ====
 // ----
 // test() -> 0x20, 0x8, -1, -1, 8, -16, -2, 6, 8, -1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
index b3036eeb85..370449cb2c 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
@@ -15,7 +15,6 @@ contract c {
         y = data2[4];
     }
 }
-// ====
 // ----
 // test() -> 5, 4
 // gas irOptimized: 225954
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
index 0cb14e95f7..34c251871b 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
@@ -12,7 +12,6 @@ contract c {
         len = data2.length; if (index < len) val = data2[index];
     }
 }
-// ====
 // ----
 // setData1(uint256,uint256,uint256): 10, 5, 4 ->
 // copyStorageStorage() ->
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
index cb4faac001..0dfaf0a687 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
@@ -16,7 +16,6 @@ contract c {
     }
 }
 
-// ====
 // ----
 // test() -> 5, 4
 // gas irOptimized: 272736
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
index 4f09b49d60..a8e2930bf5 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
@@ -10,7 +10,6 @@ contract c {
     }
 }
 
-// ====
 // ----
 // test() -> 9, 4
 // gas irOptimized: 123162
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
index c3b2f500bb..3926ca56bd 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
@@ -15,7 +15,6 @@ contract c {
         data2 = data1;
     }
 }
-// ====
 // ----
 // test() -> 4, 5
 // gas irOptimized: 238799
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol
index 65bce83fbe..8bc6b86a29 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory.sol
@@ -6,6 +6,5 @@ contract C {
         return (b[0], b.length);
     }
 }
-// ====
 // ----
 // f() -> 1, 3
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
index bed5113ce0..ef3d06e9dd 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
@@ -13,7 +13,6 @@ contract C {
         return m;
     }
 }
-// ====
 // ----
 // f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
 // gas irOptimized: 161780
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol
index 092a1ab01a..8e92d05f74 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_memory.sol
@@ -29,7 +29,6 @@ contract c {
         return (a4[0][0] + a4[1][1]);
     }
 }
-// ====
 // ----
 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index 11167729f0..744ad87060 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -36,7 +36,6 @@ contract Test {
         return a[0][0] + a[1][0] + a[2][1];
     }
 }
-// ====
 // ----
 // test() -> 24
 // gas irOptimized: 227133
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
index eb730e10d2..af5cd5a55f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
@@ -43,7 +43,6 @@ contract C {
             internalArray0[2] == internalArray1[2];
     }
 }
-// ====
 // ----
 // copyExternalStorageArrayOfFunctionType() -> true
 // gas irOptimized: 104659
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
index 8789adc1e6..cc1863859b 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -46,7 +46,6 @@ contract C {
             internalArray0[2] == internalArray1[2];
     }
 }
-// ====
 // ----
 // copyExternalStorageArraysOfFunctionType() -> true
 // gas irOptimized: 104332
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol
index 0d73a07151..a43a941a67 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_memory.sol
@@ -15,7 +15,6 @@ contract C {
         return (m[2].a, m[1].b, m[0].c);
     }
 }
-// ====
 // ----
 // f((uint128,uint64,uint128)[3]): 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
 // g((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol
index d488409daf..482cecccc5 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_memory.sol
@@ -17,6 +17,5 @@ contract C {
         return (s[1].a.length, s[1].a[0]);
     }
 }
-// ====
 // ----
 // f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
diff --git a/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
index ea9ea362fd..d13381d804 100644
--- a/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
@@ -8,7 +8,6 @@ contract Test {
         return data;
     }
 }
-// ====
 // ----
 // set(uint24[]): 0x20, 18, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 -> 18
 // gas irOptimized: 99616
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol b/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol
index 4b63dfc24b..88cb47a57f 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_calldata_to_string_calldata.sol
@@ -3,6 +3,5 @@ contract C {
         return string(c);
     }
 }
-// ====
 // ----
 // f(bytes): 0x20, 3, "abc" -> 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
index bbd7a9f749..0d546e188c 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -3,7 +3,6 @@ contract c {
     function copy(uint from, uint to) public returns (bool) { data[to] = data[from]; return true; }
     mapping(uint => bytes) data;
 }
-// ====
 // ----
 // set(uint256): 1, 2 -> true
 // gas irOptimized: 110604
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 990884a909..4bf31f7059 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -14,7 +14,6 @@ contract c {
         return b;
     }
 }
-// ====
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol
index a69143d035..192ece49e5 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory.sol
@@ -8,6 +8,5 @@ contract C {
         return g(c);
     }
 }
-// ====
 // ----
 // f(bytes[2]): 0x20, 0x40, 0x40, 2, "ab" -> 0x20, 2, "ab"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol b/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol
index 0ab8485886..3bdda3045a 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_2d_bytes_to_memory_2.sol
@@ -11,7 +11,6 @@ contract C {
         g(c);
     }
 }
-// ====
 // ----
 // f(bytes[2]): 0x20, 0x40, 0x40, 2, "ab" ->
 // f(bytes[2]): 0x20, 0x40, 0x40, 1, "a" -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
index 7ea13cc6b3..1985ac6288 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
@@ -7,7 +7,6 @@ contract C {
     return s[0];
   }
 }
-// ====
 // ----
 // f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
 // gas irOptimized: 111159
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
index 0e87f00ced..25a2c05f16 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
@@ -21,6 +21,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f((uint256,uint256)[]): 0x20, 0x2, 0x1, 0x2, 0x3, 0x4 -> 2, 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol
index 3521f1575e..56be37250a 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_bytes_array_to_memory.sol
@@ -10,7 +10,6 @@ contract C {
         return (a.length, m.length, m);
     }
 }
-// ====
 // ----
 // f(bytes[]): 0x20, 0x1, 0x20, 0x2, hex"6162000000000000000000000000000000000000000000000000000000000000" -> 0x1, 0x2, 0x60, 0x2, hex"6162000000000000000000000000000000000000000000000000000000000000"
 // f(bytes[]): 0x20, 0x1, 0x20, 0x20, hex"7878787878787878787878787878787878787878787878787878787878787878" -> 0x1, 0x20, 0x60, 0x20, hex"7878787878787878787878787878787878787878787878787878787878787878"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol
index 7f76f7f27d..ff7e9f488b 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_dyn_2d_bytes_to_memory.sol
@@ -5,6 +5,5 @@ contract C {
         return c;
     }
 }
-// ====
 // ----
 // f(bytes[]): 0x20, 2, 0x60, 0x60, 0x20, 2, "ab" -> 0x20, 2, 0x40, 0x80, 2, "ab", 2, "ab"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
index 0a5458674e..28eecc4f2e 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
@@ -11,6 +11,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(uint256[][]): 0x20, 0x1, 0x20, 0x2, 0x17, 0x2a -> 0x1, 0x40, 0x2, 0x17, 0x2a
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol
index 902cd3467f..a26936c9d6 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_nested_array_copy_to_memory.sol
@@ -8,6 +8,5 @@ contract Test {
         return shouldBug(weapon);
     }
 }
-// ====
 // ----
 // killer(uint256[][2]): 0x20, 0x40, 0x40, 2, 1, 2 -> 0x20, 0x20, 0x40, 0xa0, 2, 1, 2, 2, 1, 2
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol
index c793ccc371..2fc3b0a0aa 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_to_storage_different_base.sol
@@ -7,6 +7,5 @@ contract C {
         return (s.length, s[0], s[1], s[2]);
     }
 }
-// ====
 // ----
 // f(bytes8[]): 0x20, 3, "abcd", "bcde", "cdef" -> 3, "abcd", "bcde", "cdef"
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index 83e33d4abf..99335817a5 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -33,7 +33,6 @@ contract C {
         return (data.a, data.b);
     }
 }
-// ====
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
 // gas irOptimized: 179895
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index f02cc6c1c6..6cdb4a075a 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -44,7 +44,6 @@ contract C {
         return 0xff;
     }
 }
-// ====
 // ----
 // f() -> 0xff
 // gas irOptimized: 121123
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index bdd6f7cd0f..e3a368a316 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -14,7 +14,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test() -> 7
 // gas irOptimized: 124034
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
index 16efcc933b..c111c7b89e 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -5,7 +5,6 @@ contract c {
     bytes data1;
     bytes data2;
 }
-// ====
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
 // gas irOptimized: 177386
diff --git a/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol b/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol
index eb82c20248..45ef42d467 100644
--- a/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol
+++ b/test/libsolidity/semanticTests/array/copying/empty_bytes_copy.sol
@@ -22,7 +22,6 @@ contract C {
         return data[0];
     }
 }
-// ====
 // ----
 // fromMemory() -> 0x00
 // fromCalldata(bytes): 0x40, 0x60, 0x00, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -> 0x00
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index 7f48e65268..ff4ca5e4fa 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -16,7 +16,6 @@ contract C {
         return s.length;
     }
 }
-// ====
 // ----
 // f() -> 3
 // gas irOptimized: 129910
diff --git a/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol
index 0d7d37f373..af54de1b99 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_to_storage_different_base.sol
@@ -11,6 +11,5 @@ contract C {
         return (s.length, s[0], s[1], s[2]);
     }
 }
-// ====
 // ----
 // f() -> 3, "abcd", "bcde", "cdef"
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
index 1ecb19065c..f20acfc51c 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -15,7 +15,6 @@ contract C {
         return (m[0][0], m[0][3], m[1][1], m[1][4], m[2][0], m[3][2], m[3][3]);
     }
 }
-// ====
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
 // gas irOptimized: 207781
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index 099232ca08..d19bbf6a84 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -9,7 +9,6 @@ contract C {
         return m;
     }
 }
-// ====
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
 // gas irOptimized: 202840
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
index c6b24eb037..6126dcde1e 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
@@ -16,7 +16,6 @@ contract C {
         return (m[0][0], m[0][3], m[1][1], m[1][4], m[2][0], m[3][2], m[3][3]);
     }
 }
-// ====
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
 // gas irOptimized: 207781
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
index 7790949572..ead1978848 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
@@ -22,7 +22,6 @@ contract C {
         );
     }
 }
-// ====
 // ----
 // f() -> 11, 0x0c, 1, 0x15, 22, 4
 // gas irOptimized: 291848
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index 4cdf75c7a4..3c61b76c85 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -11,7 +11,6 @@ contract C {
         return (m[0], m[16], m[32]);
     }
 }
-// ====
 // ----
 // f() -> 2, 3, 4
 // gas irOptimized: 114114
diff --git a/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol b/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol
index 6dbf41af36..dec1a2d10e 100644
--- a/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol
+++ b/test/libsolidity/semanticTests/array/copying/string_calldata_to_bytes_calldata.sol
@@ -3,6 +3,5 @@ contract C {
         return bytes(s);
     }
 }
-// ====
 // ----
 // f(string): 0x20, 3, "abc" -> 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
index 4c86e82e88..cc1d6b0a84 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array.sol
@@ -16,7 +16,6 @@ contract C {
         return (x[199], y[203][1], z[170].a[1], z[170].b[99]);
     }
 }
-// ====
 // ----
 // f() -> "A", 8, 4, "B"
 // gas irOptimized: 130592
diff --git a/test/libsolidity/semanticTests/array/create_memory_byte_array.sol b/test/libsolidity/semanticTests/array/create_memory_byte_array.sol
index 3c51f88731..b4c29d0fd3 100644
--- a/test/libsolidity/semanticTests/array/create_memory_byte_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_byte_array.sol
@@ -6,6 +6,5 @@ contract C {
         return (x[34]);
     }
 }
-// ====
 // ----
 // f() -> "A"
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index a8e05bd429..e7d0565bfb 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -14,7 +14,6 @@ contract c {
             uint8(data[97]) == 97;
     }
 }
-// ====
 // ----
 // test1() -> true
 // gas irOptimized: 225890
diff --git a/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol b/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
index f8bd4aef4b..77096a645c 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
@@ -30,7 +30,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> 0
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol b/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
index d80bac725e..54abc495c9 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
@@ -11,6 +11,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // len() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol b/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
index 1a096a8a42..316b8d9efd 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
@@ -16,6 +16,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> true # This code interprets x as an array length and thus will go out of gas. neither of the two should throw due to out-of-bounds access #
diff --git a/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol
index cf7d076239..c407eb73f8 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_removes_bytes_data.sol
@@ -3,7 +3,6 @@ contract c {
     function del() public returns (bool) { delete data; return true; }
     bytes data;
 }
-// ====
 // ----
 // (): 7 ->
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
index ca4b590acb..0bb4296747 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
@@ -33,7 +33,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // len() -> 0
 // val() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
index b9c7b58ff5..22f31b1ef1 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
@@ -12,7 +12,6 @@ contract C {
         return (data[0], data[1], data[2]);
     }
 }
-// ====
 // ----
 // f() -> 0, 0, 0
 // gas irOptimized: 90992
diff --git a/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol b/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol
index 65fa91a844..732e90adb6 100644
--- a/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol
+++ b/test/libsolidity/semanticTests/array/delete/memory_arrays_delete.sol
@@ -9,6 +9,5 @@ contract Test {
         return x;
     }
 }
-// ====
 // ----
 // del() -> 0, 1, 2, 0, 0, 0, 0x20, 0x21, 0x22, 0x30, 0x31, 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index f1cdb90bb3..bac47b6a4c 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -11,7 +11,6 @@ contract c {
     }
     function fullClear() public { delete dynamic; }
 }
-// ====
 // ----
 // storageEmpty -> 1
 // fill() ->
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index 392c9c62d9..2eea818e02 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -39,7 +39,6 @@ contract c {
     }
 }
 
-// ====
 // ----
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
diff --git a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
index b4fe4275a8..8eaabcc141 100644
--- a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
@@ -13,7 +13,6 @@ contract c {
     }
     function clear() public { delete data; }
 }
-// ====
 // ----
 // storageEmpty -> 1
 // fill() -> 8
diff --git a/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol b/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
index 50d083f934..844324f325 100644
--- a/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
@@ -20,7 +20,6 @@ contract c {
     }
 }
 
-// ====
 // ----
 // length() -> 0
 // get(uint256): 3 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol b/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol
index 96043e3265..f09757c6e0 100644
--- a/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol
+++ b/test/libsolidity/semanticTests/array/evm_exceptions_out_of_band_access.sol
@@ -12,7 +12,6 @@ contract A {
         return true;
     }
 }
-// ====
 // ----
 // test() -> false
 // testIt() -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 9af61a99e1..fc0f3a6e1e 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -17,7 +17,6 @@ contract B {
     }
 }
 
-// ====
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
 // gas irOptimized: 127910
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index e5de25c977..fef9151b1b 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -7,7 +7,6 @@ contract Creator {
         ch = s[2];
     }
 }
-// ====
 // ----
 // constructor(): 1, 2, 3, 4 ->
 // gas irOptimized: 129013
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index eb86b410d6..25db29de41 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -41,7 +41,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test() -> 5, 6, 7
 // gas irOptimized: 292502
diff --git a/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol
index 7757f529e8..79d8f20200 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/arrays_complex_memory_index_access.sol
@@ -7,6 +7,5 @@ contract Test {
         e = _data[a][b];
     }
 }
-// ====
 // ----
 // set(uint24[3][],uint256,uint256): 0x60, 0x03, 0x02, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06, 0x0c
diff --git a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol
index ca91352b35..0e9168bce4 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access.sol
@@ -19,7 +19,6 @@ contract c {
         return uint(uint8(data[30])) * 0x100 | uint(uint8(data[31])) * 0x10 | uint(uint8(data[32]));
     }
 }
-// ====
 // ----
 // direct(bytes,uint256): 0x40, 33, 34, 0x000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F, left(0x2021) -> 0x21
 // storageCopyRead(bytes,uint256): 0x40, 33, 34, 0x000102030405060708090A0B0C0D0E0F101112131415161718191A1B1C1D1E1F, left(0x2021) -> 0x21
diff --git a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol b/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol
index aafe01b170..fa65d25c0f 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/bytes_index_access_memory.sol
@@ -11,6 +11,5 @@ contract Main {
         return _s1;
     }
 }
-// ====
 // ----
 // f(bytes,uint256,uint256,uint256): 0x80, 3, 4, 5, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> "d", "e", "f"
diff --git a/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol
index e7cb6e0ffb..6dd6249936 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/bytes_memory_index_access.sol
@@ -7,6 +7,5 @@ contract Test {
         c = _data[i];
     }
 }
-// ====
 // ----
 // set(bytes,uint256): 0x40, 0x03, 0x08, "abcdefgh" -> 0x08, "d"
diff --git a/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol
index 78b87a3c86..9ab74eaf36 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/fixed_bytes_index_access.sol
@@ -11,7 +11,6 @@ contract C {
         return uint256(uint8(data[0][4]));
     }
 }
-// ====
 // ----
 // f(bytes32): "789" -> "9"
 // g(bytes32): "789" -> 0x35
diff --git a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol b/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol
index d500be1ea5..be824b759f 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_dynamic_index_access_write.sol
@@ -15,6 +15,5 @@ contract Test {
         return set(data)[1];
     }
 }
-// ====
 // ----
 // f() -> 0x20, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x07
diff --git a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
index 5f5bf63f77..27d7e241e9 100644
--- a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
+++ b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
@@ -23,7 +23,6 @@ contract C {
     function arrayPushEmpty() public { x.push(); }
     function del() public { delete x; }
 }
-// ====
 // ----
 // x() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
 // abiEncode() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/array/memory.sol b/test/libsolidity/semanticTests/array/memory.sol
index 8ce6770215..6bde7c26cd 100644
--- a/test/libsolidity/semanticTests/array/memory.sol
+++ b/test/libsolidity/semanticTests/array/memory.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // h(uint256[4]): 1, 2, 3, 4 -> 10
 // i(uint256[4]): 1, 2, 3, 4 -> 20
diff --git a/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol b/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol
index b52faa54ee..0ce758d9d7 100644
--- a/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol
+++ b/test/libsolidity/semanticTests/array/memory_arrays_of_various_sizes.sol
@@ -11,7 +11,6 @@ contract C {
         return rows[n][k - 1];
     }
 }
-// ====
 // ----
 // f(uint256,uint256): 3, 1 -> 1
 // f(uint256,uint256): 9, 5 -> 70
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop.sol b/test/libsolidity/semanticTests/array/pop/array_pop.sol
index ac1c673b44..bbb140a38e 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop.sol
@@ -11,6 +11,5 @@ contract c {
         l = data.length;
     }
 }
-// ====
 // ----
 // test() -> 1, 0
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index 37a25fe03e..c5ea1ca836 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -21,7 +21,6 @@ contract c {
         delete inner;
     }
 }
-// ====
 // ----
 // test() -> 1, 2, 3
 // gas irOptimized: 2271044
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol
index 3c410adde9..17890cd199 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_storage_empty.sol
@@ -5,7 +5,6 @@ contract c {
         data.pop();
     }
 }
-// ====
 // ----
 // test() ->
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index 92da1764f3..4f08b9a93d 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -16,7 +16,6 @@ contract c {
             data.pop();
     }
 }
-// ====
 // ----
 // test() -> 38, 28, 18
 // gas irOptimized: 188649
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index 6700c8bc16..6c2305a057 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -16,7 +16,6 @@ contract c {
             data.pop();
     }
 }
-// ====
 // ----
 // test() -> 20, 10
 // gas irOptimized: 159169
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index 0dce1b7276..1c7e2fd7d7 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -8,7 +8,6 @@ contract c {
     }
 }
 
-// ====
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
 // gas irOptimized: 109499
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index e641918dea..198f797d5d 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -14,7 +14,6 @@ contract c {
         return true;
     }
 }
-// ====
 // ----
 // test() -> true
 // gas irOptimized: 196541
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index ff2155bc8b..bef07f55b7 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -13,7 +13,6 @@ contract c {
         }
     }
 }
-// ====
 // ----
 // test() ->
 // gas irOptimized: 142639
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index 8580c59318..1c04096350 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -8,7 +8,6 @@ contract c {
     }
 }
 
-// ====
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
 // gas irOptimized: 108487
diff --git a/test/libsolidity/semanticTests/array/pop/parenthesized.sol b/test/libsolidity/semanticTests/array/pop/parenthesized.sol
index fc6243639a..478040fd2a 100644
--- a/test/libsolidity/semanticTests/array/pop/parenthesized.sol
+++ b/test/libsolidity/semanticTests/array/pop/parenthesized.sol
@@ -6,6 +6,5 @@ contract C {
     return data.length;
   }
 }
-// ====
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/array/push/array_push.sol b/test/libsolidity/semanticTests/array/push/array_push.sol
index bc90ca054e..bdd7a047e8 100644
--- a/test/libsolidity/semanticTests/array/push/array_push.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push.sol
@@ -14,7 +14,6 @@ contract c {
         z = data[2];
     }
 }
-// ====
 // ----
 // test() -> 5, 4, 3, 3
 // gas irOptimized: 111317
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested.sol b/test/libsolidity/semanticTests/array/push/array_push_nested.sol
index 883f9093f3..a86679d3d1 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested.sol
@@ -11,6 +11,5 @@ contract C {
         assert(s[0][0] == 0);
     }
 }
-// ====
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
index 5c105c850b..ac5e422dcf 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -10,7 +10,6 @@ contract C {
         return s[0][0];
     }
 }
-// ====
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
 // gas irOptimized: 113256
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol
index c949f258d0..0d85613f10 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_memory.sol
@@ -13,6 +13,5 @@ contract C {
         return s[0][0];
     }
 }
-// ====
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol b/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
index ede6aa872d..4341681192 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
@@ -12,7 +12,6 @@ contract c {
     }
 }
 
-// ====
 // ----
 // test() -> 1, 2, 3, 4
 // gas irOptimized: 93017
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
index 4c956dfe7c..b50775f84d 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
@@ -18,7 +18,6 @@ contract c {
         return (data[0].a, data[0].b, data[0].c[2], data[0].d[2]);
     }
 }
-// ====
 // ----
 // test() -> 2, 3, 4, 5
 // gas irOptimized: 136894
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index d2c7533b7e..22fe181753 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -14,7 +14,6 @@ contract c {
         return (data[0].a, data[0].b, data[0].c[2], data[0].d[2]);
     }
 }
-// ====
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
 // gas irOptimized: 138691
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 36303ee80c..35e79ccbfe 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -13,7 +13,6 @@ contract c {
         return 0;
     }
 }
-// ====
 // ----
 // test() -> 0
 // gas irOptimized: 176495
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index c7adb2ab75..3d26b05998 100644
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
@@ -11,7 +11,6 @@ contract C {
         assert(a[2][32] == "a");
     }
 }
-// ====
 // ----
 // f() ->
 // gas irOptimized: 179590
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol
index 07f1037e71..cf6f0687d9 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_1d.sol
@@ -19,7 +19,6 @@ contract C {
 	}
 
 }
-// ====
 // ----
 // l() -> 0
 // lv(uint256): 42 ->
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index 7d6dac3b70..27bbc330e6 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -24,7 +24,6 @@ contract C {
 		array2d.push().push() = value;
 	}
 }
-// ====
 // ----
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 0f3376f909..dc6baca102 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -18,7 +18,6 @@ contract C {
 		return array[index];
 	}
 }
-// ====
 // ----
 // l() -> 0
 // g(uint256): 70 ->
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol b/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol
index 1c334d638e..6f626d9c35 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_struct.sol
@@ -31,7 +31,6 @@ contract C {
 	}
 
 }
-// ====
 // ----
 // l() -> 0
 // f(uint256): 42 ->
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index ca642e73ed..28439cf81d 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -22,7 +22,6 @@ contract Main {
         return map[a];
     }
 }
-// ====
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
 // gas irOptimized: 113198
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol
index be8a400e30..079364d21f 100644
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol
+++ b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_as_argument_of_external_calls.sol
@@ -27,7 +27,6 @@ contract C {
         return true;
     }
 }
-// ====
 // ----
 // f1(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcde" -> true
 // f1(bytes,uint256,uint256,bytes): 0x80, 1, 5, 0xC0, 8, "abcdefgh", 4, "bcdf" -> false
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol
index 8ebd076985..89096c99a2 100644
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol
+++ b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_calldata.sol
@@ -20,7 +20,6 @@ contract C {
         return f1(c[s:e]);
     }
 }
-// ====
 // ----
 // g((uint128,uint256[3],uint32)[],uint256,uint256): 0x60, 1, 3, 4, 55, 1, 2, 3, 66, 66, 2, 3, 4, 77, 77, 3, 4, 5, 88, 88, 4, 5, 6, 99 -> 0x20, 2, 66, 2, 3, 4, 77, 77, 3, 4, 5, 88
 // g1(uint256[3][],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 -> 0x20, 2, 4, 5, 6, 7, 8, 9
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol
index 43aa16906f..e37bdf0c05 100644
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_memory.sol
@@ -21,7 +21,6 @@ contract C {
         return h1(b[start:end]);
     }
 }
-// ====
 // ----
 // f(int256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2
 // g(int256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 0x20, 2, 2, 3
diff --git a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol
index bcce7fd505..b50d74e4c3 100644
--- a/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/slices/array_slice_calldata_to_storage.sol
@@ -10,6 +10,5 @@ contract C {
         return s[0];
     }
 }
-// ====
 // ----
 // f(int256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2
diff --git a/test/libsolidity/semanticTests/array/storage_array_ref.sol b/test/libsolidity/semanticTests/array/storage_array_ref.sol
index fa63c36054..0a896fed4b 100644
--- a/test/libsolidity/semanticTests/array/storage_array_ref.sol
+++ b/test/libsolidity/semanticTests/array/storage_array_ref.sol
@@ -39,7 +39,6 @@ contract Store is BinarySearch {
     }
 }
 
-// ====
 // ----
 // find(uint256): 7 -> -1
 // add(uint256): 7 ->
diff --git a/test/libsolidity/semanticTests/array/string_bytes_conversion.sol b/test/libsolidity/semanticTests/array/string_bytes_conversion.sol
index b9e92bb815..9578fc4f75 100644
--- a/test/libsolidity/semanticTests/array/string_bytes_conversion.sol
+++ b/test/libsolidity/semanticTests/array/string_bytes_conversion.sol
@@ -12,7 +12,6 @@ contract Test {
         return bytes(s).length;
     }
 }
-// ====
 // ----
 // f(string,uint256): 0x40, 0x02, 0x06, "abcdef" -> "c"
 // l() -> 0x06
diff --git a/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol b/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol
index 831716d2df..dfabd26c09 100644
--- a/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol
+++ b/test/libsolidity/semanticTests/array/string_literal_assign_to_storage_bytes.sol
@@ -9,7 +9,6 @@ contract C {
         (s, s1) = ("abc", "abcd");
     }
 }
-// ====
 // ----
 // s() -> 0x20, 3, "abc"
 // s1() -> 0x20, 4, "abcd"
diff --git a/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol b/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol
index b0edf1edbc..91a26945cd 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/iterated_keccak256_with_bytes.sol
@@ -8,6 +8,5 @@ contract c {
         return keccak256(abi.encodePacked("b", keccak256(data), "a"));
     }
 }
-// ====
 // ----
 // foo() -> 0xb338eefce206f9f57b83aa738deecd5326dc4b72dd81ee6a7c621a6facb7acdc
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol
index 329034fe81..972aee839e 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments.sol
@@ -3,6 +3,5 @@ contract c {
         d = keccak256(abi.encodePacked(a, b, c));
     }
 }
-// ====
 // ----
 // foo(uint256,uint256,uint256): 0xa, 0xc, 0xd -> 0xbc740a98aae5923e8f04c9aa798c9ee82f69e319997699f2782c40828db9fd81
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol
index d5472bc79c..01397f55f8 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_numeric_literals.sol
@@ -3,6 +3,5 @@ contract c {
         d = keccak256(abi.encodePacked(a, b, uint8(145)));
     }
 }
-// ====
 // ----
 // foo(uint256,uint16): 0xa, 0xc -> 0x88acd45f75907e7c560318bc1a5249850a0999c4896717b1167d05d116e6dbad
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol
index cce1ac87e1..b157178fb8 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_multiple_arguments_with_string_literals.sol
@@ -7,7 +7,6 @@ contract c {
         d = keccak256(abi.encodePacked(a, b, uint8(145), "foo"));
     }
 }
-// ====
 // ----
 // foo() -> 0x41b1a0649752af1b28b3dc29a1556eee781e4a4c3a1f7f53f90fa834de098c4d
 // bar(uint256,uint16): 0xa, 0xc -> 0x6990f36476dc412b1c4baa48e2d9f4aa4bb313f61fda367c8fdbbb2232dc6146
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
index 95dfff15af..725d984d86 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
@@ -9,6 +9,5 @@ contract c {
     }
 }
 
-// ====
 // ----
 // foo() -> true
diff --git a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
index 25a0429c5b..c79625d3cc 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
@@ -4,6 +4,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> 0x9c1185a5c5e9fc54612808977ee8f548b2258d31000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol
index 996f594efe..bb9fc36161 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/sha256_empty.sol
@@ -3,6 +3,5 @@ contract C {
         return sha256("");
     }
 }
-// ====
 // ----
 // f() -> 0xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol b/test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol
index 1fc8ddec01..e41b75c2df 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test(uint256,bytes,uint256): 7, 0x60, 4, 2, "ab" -> "b", "a"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol b/test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol
index 07100311ad..3ebb4787ac 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol
@@ -18,7 +18,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // testArray(uint256,uint256[],uint256): 7, 0x60, 4, 2, 66, 77 -> 77, 66
 // testSlice(uint256,uint256[],uint256): 7, 0x60, 4, 2, 66, 77 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol b/test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol
index 6cee890d37..e43b17561c 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test(uint256,uint256[2],uint256): 7, 66, 77, 4 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol b/test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol
index 7b104249fe..ee44204702 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol
@@ -18,6 +18,5 @@ contract C {
         return _s.reverse();
     }
 }
-// ====
 // ----
 // test(uint256,(uint256,uint256),uint256): 7, 66, 77, 4 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol
index 2cbf527dfe..79cf94be16 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bytes_internal.sol
@@ -6,6 +6,5 @@ contract C {
         return f(b, 2);
     }
 }
-// ====
 // ----
 // f(uint256,bytes,uint256): 7, 0x60, 7, 4, "abcd" -> "c"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol
index 7e96b55f09..164ac8a8e6 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory.sol
@@ -3,6 +3,5 @@ contract C {
     return keccak256(bytes(data));
   }
 }
-// ====
 // ----
 // f(bytes): 0x20, 0x08, "abcdefgh" -> 0x48624fa43c68d5c552855a4e2919e74645f683f5384f72b5b051b71ea41d4f2d
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol
index 6d5051027c..5f30aff303 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_bytes_to_memory_encode.sol
@@ -3,6 +3,5 @@ contract C {
     return abi.encode(bytes(data));
   }
 }
-// ====
 // ----
 // f(bytes): 0x20, 0x08, "abcdefgh" -> 0x20, 0x60, 0x20, 8, 44048183304486788309563647967830685498285570828042699209880294173606615711744
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol
index 3b05a05100..ee4bdf58c0 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_internal_function_pointer.sol
@@ -13,6 +13,5 @@ contract C {
         return this.h(a);
     }
 }
-// ====
 // ----
 // g() -> 0x0700000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol
index f21d07178a..adc9963a2f 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_internal_library.sol
@@ -16,6 +16,5 @@ contract C {
         return this.f(x);
     }
 }
-// ====
 // ----
 // g() -> 0x0800000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol
index d62fee1442..26343b7e6b 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_internal_multi_array.sol
@@ -17,6 +17,5 @@ contract C {
         return this.f(4, x, 5);
     }
 }
-// ====
 // ----
 // g() -> 7, 8
diff --git a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol b/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol
index 9bad6131a6..cd5a8cfeb6 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_internal_multi_fixed_array.sol
@@ -13,6 +13,5 @@ contract C {
         return this.f(4, x, 5);
     }
 }
-// ====
 // ----
 // g() -> 7, 8
diff --git a/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol b/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol
index 69b56856fa..f5948d2d0e 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_memory_mixed.sol
@@ -15,6 +15,5 @@ contract C {
         return this.f(x, y, z);
     }
 }
-// ====
 // ----
 // g() -> 0x0e, 0x0800000000000000000000000000000000000000000000000000000000000000, 0x0900000000000000000000000000000000000000000000000000000000000000, 0x0a00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/calldata/calldata_string_array.sol b/test/libsolidity/semanticTests/calldata/calldata_string_array.sol
index c5877e005a..79efb17125 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_string_array.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_string_array.sol
@@ -11,6 +11,5 @@ contract C {
         return (a.length, m1.length, uint8(m1[0]), s1);
     }
 }
-// ====
 // ----
 // f(string[]): 0x20, 0x1, 0x20, 0x2, hex"6162000000000000000000000000000000000000000000000000000000000000" -> 1, 2, 97, 0x80, 2, "ab"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_struct.sol b/test/libsolidity/semanticTests/calldata/calldata_struct.sol
index 64a990e3b4..247c00a7eb 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_struct.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_struct.sol
@@ -16,6 +16,5 @@ contract C {
         return L.reverse(_s);
     }
 }
-// ====
 // ----
 // test(uint256,(uint256,uint256),uint256): 7, 66, 77, 4 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol b/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol
index 0c87dfc7b9..8a6c2687dd 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_struct_internal.sol
@@ -13,6 +13,5 @@ contract C {
         return f(s);
     }
 }
-// ====
 // ----
 // f(uint256,(uint256,uint256),uint256): 7, 1, 2, 4 -> 1, 2
diff --git a/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol b/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol
index 7374f4b3d2..742c02693d 100644
--- a/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol
+++ b/test/libsolidity/semanticTests/cleanup/indexed_log_topic_during_explicit_downcast_during_emissions.sol
@@ -9,7 +9,6 @@ contract C {
         emit ev0(x);
     }
 }
-// ====
 // ----
 // constructor() ->
 // ~ emit ev0(bytes1): #"1"
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index dff90c5504..a9e5f27b15 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -22,7 +22,6 @@ contract Creator {
         ch = c.part(x);
     }
 }
-// ====
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
 // gas irOptimized: 437093
diff --git a/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
index 5b28577606..d6d76adc5b 100644
--- a/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
+++ b/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
@@ -20,6 +20,5 @@ contract Derived is Base {
     }
 }
 
-// ====
 // ----
 // getA() -> 49
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 105bb8bac4..3257acac99 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -22,7 +22,6 @@ contract Creator {
         ch = c.part(x);
     }
 }
-// ====
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
 // gas irOptimized: 293203
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 69a6869151..b6c0c3ca98 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -6,7 +6,6 @@ contract Test {
         m_s = s;
     }
 }
-// ====
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
 // gas irOptimized: 283829
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
index 50b56343e6..22bf1d0f22 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -15,7 +15,6 @@ contract Main {
         return flag;
     }
 }
-// ====
 // ----
 // constructor(): "abc", true
 // gas irOptimized: 106683
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
index ab6f4a4097..bb7e7e596a 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
@@ -33,7 +33,6 @@ contract Main {
     }
 }
 
-// ====
 // ----
 // getFlag() -> true
 // getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol
index 34f1fba51d..159f2943d4 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_function_argument.sol
@@ -3,6 +3,5 @@ contract D {
     constructor(function() external returns (uint)) {
     }
 }
-// ====
 // ----
 // constructor(): 0xfdd67305928fcac8d213d1e47bfa6165cd0b87b946644cd0000000000000000 ->
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
index 12ecb38866..220db16d56 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
@@ -15,7 +15,6 @@ contract C {
         return 16;
     }
 }
-// ====
 // ----
 // f() -> 16
 // gas legacy: 103488
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index 0630680767..d427bcb49a 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // constructor(): 1, 2, 3, 4 ->
 // gas irOptimized: 174020
diff --git a/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol b/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
index 29d7047843..92633cdda9 100644
--- a/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
+++ b/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
@@ -14,7 +14,6 @@ contract B {
     }
 }
 
-// ====
 // ----
 // testIt() ->
 // test() -> 2
diff --git a/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
index 78fd167883..0c0b6e3144 100644
--- a/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
+++ b/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
@@ -20,6 +20,5 @@ contract Derived is Base {
     }
 }
 
-// ====
 // ----
 // getA() -> 2
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index 551e7f386c..881252042d 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -15,7 +15,6 @@ contract C {
 		return true;
 	}
 }
-// ====
 // ----
 // f(), 2000 ether -> true
 // gas irOptimized: 120037
diff --git a/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol b/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol
index 22bc93592b..2416f124ec 100644
--- a/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol
+++ b/test/libsolidity/semanticTests/constructor/order_of_evaluation.sol
@@ -18,6 +18,5 @@ contract X is D, C, B, A {
     function g() public view returns (uint[] memory) { return x; }
     constructor() A(f(1)) C(f(2)) B(f(3)) D(f(4)) {}
 }
-// ====
 // ----
 // g() -> 0x20, 4, 1, 3, 2, 4
diff --git a/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
index 01a89d7431..7b166489fb 100644
--- a/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // t() -> 7
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index 988099fb28..f7f0d5b597 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -7,7 +7,6 @@ contract C {
         k = newK;
     }
 }
-// ====
 // ----
 // constructor(): 2, 0 ->
 // gas irOptimized: 103630
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index 7a671c85ab..24429f0c8c 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -19,7 +19,6 @@ contract C is A {
 contract D is B, C {
     constructor(uint newI, uint newK) B(newI) C(newI, newK + 1) {}
 }
-// ====
 // ----
 // constructor(): 2, 0 ->
 // gas irOptimized: 156071
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index 57a8578447..96e2cf1559 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -10,7 +10,6 @@ contract C {
 contract D is C {
     constructor(uint newI, uint newK) C(newI, newK + 1) {}
 }
-// ====
 // ----
 // constructor(): 2, 0 ->
 // gas irOptimized: 124199
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol
index f3cee053b4..8a9fc03a7f 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance_2.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 contract D is C(2, 1) {}
-// ====
 // ----
 // i() -> 2
 // k() -> 1
diff --git a/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol
index 7ffb2e07f0..94dc0307b1 100644
--- a/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/conversions/function_type_array_to_storage.sol
@@ -36,7 +36,6 @@ contract C {
         return (externalViewArray[0](), internalViewArray[0]());
     }
 }
-// ====
 // ----
 // testViewToDefault() -> 12, 22
 // testPureToDefault() -> 13, 23
diff --git a/test/libsolidity/semanticTests/conversions/string_to_bytes.sol b/test/libsolidity/semanticTests/conversions/string_to_bytes.sol
index 56c1c90619..2f324588dc 100644
--- a/test/libsolidity/semanticTests/conversions/string_to_bytes.sol
+++ b/test/libsolidity/semanticTests/conversions/string_to_bytes.sol
@@ -3,6 +3,5 @@ contract C {
 		t = bytes(s);
 	}
 }
-// ====
 // ----
 // f(string): 32, 5, "Hello" -> 32, 5, "Hello"
diff --git a/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol b/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol
index aef535fe9d..b59eb922e7 100644
--- a/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol
+++ b/test/libsolidity/semanticTests/dirty_calldata_dynamic_array.sol
@@ -8,6 +8,5 @@ contract C {
         correct = r == 0x7fff;
     }
 }
-// ====
 // ----
 // f(int16[]): 0x20, 0x02, 0x7fff, 0x7fff -> true
diff --git a/test/libsolidity/semanticTests/ecrecover/ecrecover.sol b/test/libsolidity/semanticTests/ecrecover/ecrecover.sol
index 6942c4990e..1beb451de8 100644
--- a/test/libsolidity/semanticTests/ecrecover/ecrecover.sol
+++ b/test/libsolidity/semanticTests/ecrecover/ecrecover.sol
@@ -3,7 +3,6 @@ contract test {
         return ecrecover(h, v, r, s);
     }
 }
-// ====
 // ----
 // a(bytes32,uint8,bytes32,bytes32):
 // 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,
diff --git a/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol b/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol
index 04df0ccba9..995a1e4560 100644
--- a/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol
+++ b/test/libsolidity/semanticTests/ecrecover/ecrecover_abiV2.sol
@@ -4,7 +4,6 @@ contract test {
         return ecrecover(h, v, r, s);
     }
 }
-// ====
 // ----
 // a(bytes32,uint8,bytes32,bytes32):
 // 0x18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c,
diff --git a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol
index 52c2838048..55621bdcda 100644
--- a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol
+++ b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input.sol
@@ -6,6 +6,5 @@ contract C {
         return ecrecover(bytes32(type(uint256).max), 1, bytes32(uint(2)), bytes32(uint(3)));
     }
 }
-// ====
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol
index 755784880d..5e8c3cdbf7 100644
--- a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol
+++ b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_asm.sol
@@ -11,6 +11,5 @@ contract C {
         );
     }
 }
-// ====
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol
index 22b0f1275d..511bd4e41c 100644
--- a/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol
+++ b/test/libsolidity/semanticTests/ecrecover/failing_ecrecover_invalid_input_proper.sol
@@ -16,6 +16,5 @@ contract C {
         return ecrecover(hash, v, r, s);
     }
 }
-// ====
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/enums/enum_with_256_members.sol b/test/libsolidity/semanticTests/enums/enum_with_256_members.sol
index abd6907b54..8bfded3c25 100644
--- a/test/libsolidity/semanticTests/enums/enum_with_256_members.sol
+++ b/test/libsolidity/semanticTests/enums/enum_with_256_members.sol
@@ -46,7 +46,6 @@ contract C {
         return e;
     }
 }
-// ====
 // ----
 // getMinMax() -> 0, 255
 // intToEnum(uint8): 0 -> 0
diff --git a/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol b/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
index 305558e810..243a7920c5 100644
--- a/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
+++ b/test/libsolidity/semanticTests/enums/invalid_enum_logged.sol
@@ -16,7 +16,6 @@ contract C {
         return 1;
     }
 }
-// ====
 // ----
 // test_log_ok() -> 1
 // ~ emit Log(uint8): 0x00
diff --git a/test/libsolidity/semanticTests/enums/minmax.sol b/test/libsolidity/semanticTests/enums/minmax.sol
index 8f16b628b5..4b929c36cf 100644
--- a/test/libsolidity/semanticTests/enums/minmax.sol
+++ b/test/libsolidity/semanticTests/enums/minmax.sol
@@ -5,7 +5,6 @@ contract test {
 	function max() public returns(uint) { return uint(type(MinMax).max); }
 }
 
-// ====
 // ----
 // min() -> 0
 // max() -> 3
diff --git a/test/libsolidity/semanticTests/error/selector.sol b/test/libsolidity/semanticTests/error/selector.sol
index f83606d7ff..7629290263 100644
--- a/test/libsolidity/semanticTests/error/selector.sol
+++ b/test/libsolidity/semanticTests/error/selector.sol
@@ -14,6 +14,5 @@ contract C {
         return (L.E.selector, S.E.selector);
     }
 }
-// ====
 // ----
 // f() -> 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x2ff06700000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol b/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol
index ba406e2a56..fad9d8bbfc 100644
--- a/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol
+++ b/test/libsolidity/semanticTests/errors/error_in_library_and_interface.sol
@@ -16,7 +16,6 @@ contract C {
         revert I.E(1, 2, 3);
     }
 }
-// ====
 // ----
 // f() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
 // g() -> FAILURE, hex"85208890", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"0000000000000000000000000000000000000000000000000000000000000002"
diff --git a/test/libsolidity/semanticTests/errors/revert_conversion.sol b/test/libsolidity/semanticTests/errors/revert_conversion.sol
index 3aa026e469..bef34704fc 100644
--- a/test/libsolidity/semanticTests/errors/revert_conversion.sol
+++ b/test/libsolidity/semanticTests/errors/revert_conversion.sol
@@ -6,6 +6,5 @@ contract C {
         revert E("abc", x);
     }
 }
-// ====
 // ----
 // f() -> FAILURE, hex"59e4d4df", 0x40, 0x80, 3, "abc", 1, 7
diff --git a/test/libsolidity/semanticTests/events/event.sol b/test/libsolidity/semanticTests/events/event.sol
index 0578cecbb6..0f70dc6558 100644
--- a/test/libsolidity/semanticTests/events/event.sol
+++ b/test/libsolidity/semanticTests/events/event.sol
@@ -14,7 +14,6 @@ contract ClientReceipt {
         }
     }
 }
-// ====
 // ----
 // deposit(bytes32,bool), 18 wei: 0x1234, true ->
 // ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol b/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol
index bda14281da..dede5eacba 100644
--- a/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol
+++ b/test/libsolidity/semanticTests/events/event_access_through_base_name_emit.sol
@@ -7,7 +7,6 @@ contract B is A {
         return 1;
     }
 }
-// ====
 // ----
 // f() -> 1
 // ~ emit x()
diff --git a/test/libsolidity/semanticTests/events/event_anonymous.sol b/test/libsolidity/semanticTests/events/event_anonymous.sol
index d130fbef98..1aaffa39b7 100644
--- a/test/libsolidity/semanticTests/events/event_anonymous.sol
+++ b/test/libsolidity/semanticTests/events/event_anonymous.sol
@@ -4,7 +4,6 @@ contract ClientReceipt {
         emit Deposit();
     }
 }
-// ====
 // ----
 // deposit() ->
 // ~ emit <anonymous>
diff --git a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol b/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol
index 62e8f34007..c4ac4e83bd 100644
--- a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol
+++ b/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision.sol
@@ -4,7 +4,6 @@ contract ClientReceipt {
         emit Deposit(0x2012159ca6b6372f102c535a4814d13a00bfc5568ddfd72151364061b00355d1, _id, msg.value); // 0x2012159c -> 'Deposit(uint256,bytes32,uint256)'
     }
 }
-// ====
 // ----
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit <anonymous>: #0x2012159ca6b6372f102c535a4814d13a00bfc5568ddfd72151364061b00355d1, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol b/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol
index a74959d026..3d2b3bb741 100644
--- a/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol
+++ b/test/libsolidity/semanticTests/events/event_anonymous_with_signature_collision2.sol
@@ -5,7 +5,6 @@ contract ClientReceipt {
         emit Deposit(0x5ddaa77ac5bda319ba947e31bee594711f39ed1b20d079d438dbad5ed729fb30, _id, msg.value); // 0x5ddaa77a -> 'Withdraw(uint256,string)'
     }
 }
-// ====
 // ----
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Withdraw(uint256,string): #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol b/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol
index a3fb31d05d..a46d9799b3 100644
--- a/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol
+++ b/test/libsolidity/semanticTests/events/event_anonymous_with_topics.sol
@@ -4,7 +4,6 @@ contract ClientReceipt {
         emit Deposit(msg.sender, _id, msg.value, 2, "abc");
     }
 }
-// ====
 // ----
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit <anonymous>: #0x1212121212121212121212121212120000000012, #0x1234, #0x12, #0x02, "abc"
diff --git a/test/libsolidity/semanticTests/events/event_constructor.sol b/test/libsolidity/semanticTests/events/event_constructor.sol
index 566ae8a1a5..bbb66cbac0 100644
--- a/test/libsolidity/semanticTests/events/event_constructor.sol
+++ b/test/libsolidity/semanticTests/events/event_constructor.sol
@@ -4,7 +4,6 @@ contract ClientReceipt {
         emit Deposit(msg.sender, bytes32("abc"), 7);
     }
 }
-// ====
 // ----
 // constructor()
 // ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #"abc", 0x07
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol
index a01b2c0d12..4dd63819fd 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_memory.sol
@@ -8,7 +8,6 @@ contract C {
         emit E(arr);
     }
 }
-// ====
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol
index ffb9d5c8bd..8bde9a2a81 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_memory_v2.sol
@@ -9,7 +9,6 @@ contract C {
         emit E(arr);
     }
 }
-// ====
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index 68ea33fd85..f066ec80ba 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
@@ -10,7 +10,6 @@ contract C {
         emit E(arr);
     }
 }
-// ====
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
index b902071dc3..67d47bc976 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
@@ -11,7 +11,6 @@ contract C {
         emit E(arr);
     }
 }
-// ====
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol
index 174eb8b27f..00fda110fb 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_memory_v2.sol
@@ -12,7 +12,6 @@ contract C {
         emit E(arr);
     }
 }
-// ====
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
index 0f76061b46..ab0b6918bc 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
@@ -12,7 +12,6 @@ contract C {
         emit E(arr);
     }
 }
-// ====
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
diff --git a/test/libsolidity/semanticTests/events/event_emit.sol b/test/libsolidity/semanticTests/events/event_emit.sol
index 11be45f10d..07224d97b2 100644
--- a/test/libsolidity/semanticTests/events/event_emit.sol
+++ b/test/libsolidity/semanticTests/events/event_emit.sol
@@ -4,7 +4,6 @@ contract ClientReceipt {
         emit Deposit(msg.sender, _id, msg.value);
     }
 }
-// ====
 // ----
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 9323e4a4fe..5ca8a252b9 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -13,7 +13,6 @@ contract C {
         d.deposit(_id);
     }
 }
-// ====
 // ----
 // constructor() ->
 // gas irOptimized: 173094
diff --git a/test/libsolidity/semanticTests/events/event_indexed_function.sol b/test/libsolidity/semanticTests/events/event_indexed_function.sol
index 846b468cc0..d075270a84 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_function.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_function.sol
@@ -4,7 +4,6 @@ contract C {
         emit Test(this.f);
     }
 }
-// ====
 // ----
 // f() ->
 // ~ emit Test(function): #0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b26121ff00000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_indexed_function2.sol b/test/libsolidity/semanticTests/events/event_indexed_function2.sol
index 5e4a3e3b29..9c5ef3263f 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_function2.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_function2.sol
@@ -8,7 +8,6 @@ contract C {
         emit TestB(this.f2);
     }
 }
-// ====
 // ----
 // f1() ->
 // ~ emit TestA(function): #0x0fdd67305928fcac8d213d1e47bfa6165cd0b87bc27fc3050000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_indexed_mixed.sol b/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
index 34ce442138..ad753ef16f 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_mixed.sol
@@ -8,7 +8,6 @@ contract C {
         emit E(1, 2, 3, "def");
     }
 }
-// ====
 // ----
 // deposit() ->
 // ~ emit E(uint256,uint256,uint256,bytes): #0x02, 0x01, 0x03, 0x60, 0x03, "def"
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index 8c2be5c53c..24531f0d87 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -14,7 +14,6 @@ contract C {
         emit E(x, y);
     }
 }
-// ====
 // ----
 // deposit() ->
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
diff --git a/test/libsolidity/semanticTests/events/event_lots_of_data.sol b/test/libsolidity/semanticTests/events/event_lots_of_data.sol
index bef4a02555..b7926a8409 100644
--- a/test/libsolidity/semanticTests/events/event_lots_of_data.sol
+++ b/test/libsolidity/semanticTests/events/event_lots_of_data.sol
@@ -4,7 +4,6 @@ contract ClientReceipt {
         emit Deposit(msg.sender, _id, msg.value, true);
     }
 }
-// ====
 // ----
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Deposit(address,bytes32,uint256,bool): 0x1212121212121212121212121212120000000012, 0x1234, 0x12, true
diff --git a/test/libsolidity/semanticTests/events/event_no_arguments.sol b/test/libsolidity/semanticTests/events/event_no_arguments.sol
index a81ddcc309..235afeb6c1 100644
--- a/test/libsolidity/semanticTests/events/event_no_arguments.sol
+++ b/test/libsolidity/semanticTests/events/event_no_arguments.sol
@@ -4,7 +4,6 @@ contract ClientReceipt {
         emit Deposit();
     }
 }
-// ====
 // ----
 // deposit() ->
 // ~ emit Deposit()
diff --git a/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol b/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol
index ab62a85867..9e9c08063b 100644
--- a/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol
+++ b/test/libsolidity/semanticTests/events/event_really_lots_of_data.sol
@@ -4,7 +4,6 @@ contract ClientReceipt {
         emit Deposit(10, msg.data, 15);
     }
 }
-// ====
 // ----
 // deposit() ->
 // ~ emit Deposit(uint256,bytes,uint256): 0x0a, 0x60, 0x0f, 0x04, 0xd0e30db000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol b/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol
index de5b155283..1c993113c9 100644
--- a/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_really_lots_of_data_from_storage.sol
@@ -8,7 +8,6 @@ contract ClientReceipt {
         emit Deposit(10, x, 15);
     }
 }
-// ====
 // ----
 // deposit() ->
 // ~ emit Deposit(uint256,bytes,uint256): 0x0a, 0x60, 0x0f, 0x03, "ABC"
diff --git a/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol b/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol
index 19e76b322a..01fcc45654 100644
--- a/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_really_really_lots_of_data_from_storage.sol
@@ -10,7 +10,6 @@ contract ClientReceipt {
         emit Deposit(10, x, 15);
     }
 }
-// ====
 // ----
 // deposit() ->
 // ~ emit Deposit(uint256,bytes,uint256): 0x0a, 0x60, 0x0f, 0x1f, "ABC\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0Z"
diff --git a/test/libsolidity/semanticTests/events/event_signature_in_library.sol b/test/libsolidity/semanticTests/events/event_signature_in_library.sol
index fa5f318390..d8dc0f1580 100644
--- a/test/libsolidity/semanticTests/events/event_signature_in_library.sol
+++ b/test/libsolidity/semanticTests/events/event_signature_in_library.sol
@@ -15,7 +15,6 @@ contract C {
         L.f();
     }
 }
-// ====
 // ----
 // constructor()
 // ~ emit E((uint8,int16),(uint8,int16)): #0xad3228b676f7d3cd4284a5443f17f1962b36e491b30a40b2405849e597ba5fb5, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/events/event_string.sol b/test/libsolidity/semanticTests/events/event_string.sol
index 4cdbb4eab0..b299888772 100644
--- a/test/libsolidity/semanticTests/events/event_string.sol
+++ b/test/libsolidity/semanticTests/events/event_string.sol
@@ -4,7 +4,6 @@ contract C {
         emit E("HELLO WORLD");
     }
 }
-// ====
 // ----
 // deposit() ->
 // ~ emit E(string): 0x20, 0x0b, "HELLO WORLD"
diff --git a/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol b/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol
index 5c2a6b8309..a77c3150d0 100644
--- a/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_struct_memory_v2.sol
@@ -6,7 +6,6 @@ contract C {
         emit E(S(x));
     }
 }
-// ====
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E((uint256)): 0x2a
diff --git a/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol b/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol
index 4e8b412f6a..b64d8cff21 100644
--- a/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_struct_storage_v2.sol
@@ -8,7 +8,6 @@ contract C {
         emit E(s);
     }
 }
-// ====
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E((uint256)): 0x2a
diff --git a/test/libsolidity/semanticTests/events/events_with_same_name.sol b/test/libsolidity/semanticTests/events/events_with_same_name.sol
index 625762a61d..22a0895fb9 100644
--- a/test/libsolidity/semanticTests/events/events_with_same_name.sol
+++ b/test/libsolidity/semanticTests/events/events_with_same_name.sol
@@ -20,7 +20,6 @@ contract ClientReceipt {
         return 4;
     }
 }
-// ====
 // ----
 // deposit() -> 1
 // ~ emit Deposit()
diff --git a/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol b/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol
index 20179bfdd5..de87fe416f 100644
--- a/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol
+++ b/test/libsolidity/semanticTests/events/events_with_same_name_inherited_emit.sol
@@ -21,7 +21,6 @@ contract ClientReceipt is A, B {
         return 1;
     }
 }
-// ====
 // ----
 // deposit() -> 1
 // ~ emit Deposit()
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol
index 2d6940647e..8633d2bfab 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_2.sol
@@ -23,7 +23,6 @@ contract test {
         return ret;
     }
 }
-// ====
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol b/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol
index a22002184d..29bf661693 100644
--- a/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol
+++ b/test/libsolidity/semanticTests/expressions/unary_too_long_literal.sol
@@ -5,6 +5,5 @@ contract C {
 			~~84926290883049832306107864558384249403874903260938453235235091622489261765859;
 	}
 }
-// ====
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index b7ae23f90f..7d72fd5de9 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -72,7 +72,6 @@ contract FixedFeeRegistrar is Registrar {
 	}
 	uint constant c_fee = 69 ether;
 }
-// ====
 // ----
 // constructor()
 // gas irOptimized: 402812
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 23f012616c..4381827faa 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -174,7 +174,6 @@ contract DepositContract is IDepositContract, ERC165 {
         ret[7] = bytesValue[0];
     }
 }
-// ====
 // ----
 // constructor()
 // gas irOptimized: 1529797
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index cf7fa9f5d8..a6deda59c1 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -46,7 +46,6 @@ contract test {
         assert(z1 == z2);
     }
 }
-// ====
 // ----
 // constructor()
 // gas irOptimized: 1926032
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 5160b70312..be8ef326d5 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -46,7 +46,6 @@ contract test {
         assert(z1 == z2);
     }
 }
-// ====
 // ----
 // constructor()
 // gas irOptimized: 1780841
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index e8d9e51d05..16ef5784ca 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -31,7 +31,6 @@ contract test {
         ret = prb_scale(1).div(ret);
     }
 }
-// ====
 // ----
 // constructor()
 // gas irOptimized: 455866
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 881d174e26..cc7c0b9028 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -47,7 +47,6 @@ contract test {
         return d.toSlice().len();
     }
 }
-// ====
 // ----
 // constructor()
 // gas irOptimized: 691317
diff --git a/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol b/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol
index f7c111e7ef..149109f6d0 100644
--- a/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol
+++ b/test/libsolidity/semanticTests/externalSource/multiple_equals_signs.sol
@@ -2,6 +2,5 @@
 import {External} from "a";
 contract C {
 }
-// ====
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol b/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol
index 31e1ef0768..f16a7b0a16 100644
--- a/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol
+++ b/test/libsolidity/semanticTests/externalSource/multiple_external_source.sol
@@ -4,6 +4,5 @@ import {External} from "_external/external.sol";
 import {OtherExternal} from "_external/other_external.sol";
 contract C {
 }
-// ====
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/multisource.sol b/test/libsolidity/semanticTests/externalSource/multisource.sol
index 8669633a34..685f0b9daa 100644
--- a/test/libsolidity/semanticTests/externalSource/multisource.sol
+++ b/test/libsolidity/semanticTests/externalSource/multisource.sol
@@ -7,7 +7,6 @@ contract S1 {
 import {S1} from "s1.sol";
 contract C {
 }
-// ====
 // ----
 // constructor()
 
diff --git a/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol b/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol
index 0c3fd4b563..7316cc7d57 100644
--- a/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol
+++ b/test/libsolidity/semanticTests/externalSource/non_normalized_paths.sol
@@ -6,6 +6,5 @@ import {C} from "C/////c.sol";
 import {D} from "C/../////D/d.sol";
 contract Contract {
 }
-// ====
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/relative_imports.sol b/test/libsolidity/semanticTests/externalSource/relative_imports.sol
index eee707034e..9a37896bb5 100644
--- a/test/libsolidity/semanticTests/externalSource/relative_imports.sol
+++ b/test/libsolidity/semanticTests/externalSource/relative_imports.sol
@@ -8,6 +8,5 @@
 import {A, B, C, D, G, H, Contract} from "_relative_imports/dir/contract.sol";
 contract CC {
 }
-// ====
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source.sol b/test/libsolidity/semanticTests/externalSource/source.sol
index f662fae78d..12a50ff82a 100644
--- a/test/libsolidity/semanticTests/externalSource/source.sol
+++ b/test/libsolidity/semanticTests/externalSource/source.sol
@@ -2,6 +2,5 @@
 import {External} from "_external/external.sol";
 contract C {
 }
-// ====
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_import.sol b/test/libsolidity/semanticTests/externalSource/source_import.sol
index 31e1ef0768..f16a7b0a16 100644
--- a/test/libsolidity/semanticTests/externalSource/source_import.sol
+++ b/test/libsolidity/semanticTests/externalSource/source_import.sol
@@ -4,6 +4,5 @@ import {External} from "_external/external.sol";
 import {OtherExternal} from "_external/other_external.sol";
 contract C {
 }
-// ====
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol b/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol
index a84bba1094..35f3b5ba14 100644
--- a/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol
+++ b/test/libsolidity/semanticTests/externalSource/source_import_subdir.sol
@@ -4,6 +4,5 @@
 import {SubExternal} from "sub_external.sol";
 contract C {
 }
-// ====
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol b/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol
index b8d22039bd..b671c94f9f 100644
--- a/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol
+++ b/test/libsolidity/semanticTests/externalSource/source_name_starting_with_dots.sol
@@ -6,6 +6,5 @@
 import {A, B} from "_source_name_starting_with_dots/dir/contract.sol";
 contract Contract {
 }
-// ====
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/externalSource/source_remapping.sol b/test/libsolidity/semanticTests/externalSource/source_remapping.sol
index 0347ef02c6..079a222fd1 100644
--- a/test/libsolidity/semanticTests/externalSource/source_remapping.sol
+++ b/test/libsolidity/semanticTests/externalSource/source_remapping.sol
@@ -6,6 +6,5 @@ contract C {
     External _external;
     OtherExternal _otherExternal;
 }
-// ====
 // ----
 // constructor()
diff --git a/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol b/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
index 527223af93..7a05ff5d02 100644
--- a/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/free_runtimecode.sol
@@ -11,6 +11,5 @@ contract D {
     return test();
   }
 }
-// ====
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol b/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol
index 1865eeac18..f7d2cf20e1 100644
--- a/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/libraries_from_free.sol
@@ -16,7 +16,6 @@ contract C {
     return fu();
   }
 }
-// ====
 // ----
 // library: L
 // f() -> 7, 8
diff --git a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
index a488ea95ce..6daaa5407e 100644
--- a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
@@ -11,7 +11,6 @@ contract D {
     return test();
   }
 }
-// ====
 // ----
 // f() -> 2
 // gas legacy: 101626
diff --git a/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol b/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol
index c3dc9d5b6e..3633fa9573 100644
--- a/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/storage_calldata_refs.sol
@@ -11,6 +11,5 @@ contract C {
 function fun(uint[] calldata _x, uint[] storage _y) view  returns (uint, uint[] calldata) {
 	return (_y[0], _x);
 }
-// ====
 // ----
 // f(uint256,uint256[]): 7, 0x40, 3, 8, 9, 10 -> 7, 9
diff --git a/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol b/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol
index f0f2bdf80d..17b6f74c87 100644
--- a/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol
+++ b/test/libsolidity/semanticTests/functionCall/bare_call_no_returndatacopy.sol
@@ -4,6 +4,5 @@ contract C {
         return success;
     }
 }
-// ====
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol b/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol
index d0de5e08fc..a93adf2456 100644
--- a/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_internal_function_with_multislot_arguments_via_pointer.sol
@@ -25,6 +25,5 @@ contract C {
         return multi_slot_function(this.foo, this.foo)() + single_slot_function(5, 1);
     }
 }
-// ====
 // ----
 // test() -> 12
diff --git a/test/libsolidity/semanticTests/functionCall/call_options_overload.sol b/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
index 645700752d..5e889e925f 100644
--- a/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
@@ -10,7 +10,6 @@ contract C {
     function bal() external returns (uint) { return address(this).balance; }
     receive() external payable {}
 }
-// ====
 // ----
 // (), 1 ether
 // call() -> 1, 2, 2, 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
index f673b8ad59..b6c33fd07d 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
@@ -9,7 +9,6 @@ contract D {
         return new C().i();
     }
 }
-// ====
 // ----
 // f() -> 2
 // gas legacy: 101599
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index ac9921ce00..a04628f877 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -13,7 +13,6 @@ contract D {
         return c.i();
     }
 }
-// ====
 // ----
 // constructor(): 2 ->
 // gas irOptimized: 200217
diff --git a/test/libsolidity/semanticTests/functionCall/external_call.sol b/test/libsolidity/semanticTests/functionCall/external_call.sol
index 8bfeb4d6fc..48dddecec8 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // g(uint256): 4 -> 5
 // f(uint256): 2 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index b9434abac7..f2de97506e 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -21,7 +21,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // constructor(), 1 ether ->
 // gas irOptimized: 303935
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_value.sol b/test/libsolidity/semanticTests/functionCall/external_call_value.sol
index 63eadcd9d7..5a946533d5 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_value.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_value.sol
@@ -10,7 +10,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // g(uint256), 1 ether: 4 -> 1000000000000000000000, 4
 // f(uint256), 11 ether: 2 -> 10000, 2
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 2699c0afe8..1a3c0b1d50 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -37,7 +37,6 @@ contract test {
     }
 }
 
-// ====
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 270609
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 9ed56283a6..7557f220ff 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -36,7 +36,6 @@ contract test {
     }
 }
 
-// ====
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 270609
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index 7d566d94fc..cd8baf76c7 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -16,7 +16,6 @@ contract test {
         return (a[0][key], a[1][key], b[0][key], b[1][key]);
     }
 }
-// ====
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
 // gas irOptimized: 111909
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol
index 63f2a13db9..728be2c09c 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_internal_argument.sol
@@ -14,7 +14,6 @@ contract test {
         return (a[key], b[key]);
     }
 }
-// ====
 // ----
 // set(uint8,uint8,uint8): 1, 21, 42 -> 0, 0
 // get(uint8): 1 -> 21, 42
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol b/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol
index cb288e26dc..7756a92b10 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_internal_return.sol
@@ -17,7 +17,6 @@ contract test {
         return (a[0], a[1], a[2], b[0], b[1], b[2]);
     }
 }
-// ====
 // ----
 // g() -> 0, 42, 0, 0, 84, 21
 // h() -> 0, 42, 0, 0, 84, 17
diff --git a/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol b/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
index 2e574726ef..6c47752c60 100644
--- a/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
+++ b/test/libsolidity/semanticTests/functionTypes/comparison_operators_for_external_functions.sol
@@ -74,7 +74,6 @@ contract C {
         return true;
     }
 }
-// ====
 // ----
 // comparison_operators_for_external_functions() -> true
 // comparison_operators_for_local_external_function_pointers() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol b/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
index 7d3883882e..b432719ec0 100644
--- a/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
+++ b/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
@@ -19,7 +19,6 @@ contract C {
         delete x;
     }
 }
-// ====
 // ----
 // x() -> 0
 // y() -> 0
diff --git a/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol b/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
index d27004c7a8..f096a49794 100644
--- a/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
+++ b/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
@@ -22,6 +22,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(uint256[]): 0x20, 0x3, 0x1, 0x7, 0x3 -> 11
diff --git a/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol b/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol
index de6915a56e..e65da6e1e7 100644
--- a/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol
+++ b/test/libsolidity/semanticTests/functionTypes/inline_array_with_value_call_option.sol
@@ -6,6 +6,5 @@ contract C {
         return [this.f, this.g][0]{value: 1}();
     }
 }
-// ====
 // ----
 // h(), 1 ether -> 1
diff --git a/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol b/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
index bb53b39ce0..353844723c 100644
--- a/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
+++ b/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
@@ -25,7 +25,6 @@ contract Flow {
     }
 }
 
-// ====
 // ----
 // success() -> false
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol b/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
index b476cbb47a..ebef9a2549 100644
--- a/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
+++ b/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
@@ -16,7 +16,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(uint256): 7 -> 8
 // f2(uint256): 7 -> 8
diff --git a/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol b/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
index b34d466905..f811988fec 100644
--- a/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/stack_height_check_on_adding_gas_variable_to_function.sol
@@ -19,6 +19,5 @@ contract C {
         return true;
     }
 }
-// ====
 // ----
 // test_function() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index b05aa28bd1..d413acb79c 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -24,7 +24,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // t() -> 9
 // gas irOptimized: 99064
diff --git a/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol b/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
index 77b19f6d46..9c7684245e 100644
--- a/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
@@ -28,6 +28,5 @@ contract Flow {
     }
 }
 
-// ====
 // ----
 // f() -> 1, 2
diff --git a/test/libsolidity/semanticTests/getters/array_mapping_struct.sol b/test/libsolidity/semanticTests/getters/array_mapping_struct.sol
index 4e6e074b5a..d824897e83 100644
--- a/test/libsolidity/semanticTests/getters/array_mapping_struct.sol
+++ b/test/libsolidity/semanticTests/getters/array_mapping_struct.sol
@@ -18,7 +18,6 @@ contract C {
         n[1][1].b = 10;
     }
 }
-// ====
 // ----
 // m(uint256,uint256): 0, 0 -> 0x00, 0x00
 // m(uint256,uint256): 1, 0 -> 1, 2
diff --git a/test/libsolidity/semanticTests/getters/arrays.sol b/test/libsolidity/semanticTests/getters/arrays.sol
index 47c44fe653..0ce2cdfcb1 100644
--- a/test/libsolidity/semanticTests/getters/arrays.sol
+++ b/test/libsolidity/semanticTests/getters/arrays.sol
@@ -5,7 +5,6 @@ contract C {
         a[1].push(4);
     }
 }
-// ====
 // ----
 // a(uint256,uint256): 0, 0 -> FAILURE
 // a(uint256,uint256): 1, 0 -> 3
diff --git a/test/libsolidity/semanticTests/getters/mapping.sol b/test/libsolidity/semanticTests/getters/mapping.sol
index 5d6960638b..524cac3619 100644
--- a/test/libsolidity/semanticTests/getters/mapping.sol
+++ b/test/libsolidity/semanticTests/getters/mapping.sol
@@ -4,7 +4,6 @@ contract C {
         x[1][2] = 3;
     }
 }
-// ====
 // ----
 // x(uint256,uint256): 1, 2 -> 3
 // x(uint256,uint256): 0, 0 -> 0
diff --git a/test/libsolidity/semanticTests/getters/mapping_array_struct.sol b/test/libsolidity/semanticTests/getters/mapping_array_struct.sol
index c6a8884d99..60683dfc0a 100644
--- a/test/libsolidity/semanticTests/getters/mapping_array_struct.sol
+++ b/test/libsolidity/semanticTests/getters/mapping_array_struct.sol
@@ -16,7 +16,6 @@ contract C {
         n[1][1].b = 10;
     }
 }
-// ====
 // ----
 // m(uint256,uint256): 0, 0 -> FAILURE
 // m(uint256,uint256): 1, 0 -> 1, 2
diff --git a/test/libsolidity/semanticTests/getters/mapping_of_string.sol b/test/libsolidity/semanticTests/getters/mapping_of_string.sol
index 82951b10df..db8de80623 100644
--- a/test/libsolidity/semanticTests/getters/mapping_of_string.sol
+++ b/test/libsolidity/semanticTests/getters/mapping_of_string.sol
@@ -7,7 +7,6 @@ contract C {
         x["def"][1] = 9;
     }
 }
-// ====
 // ----
 // x(string,uint256): 0x40, 0, 3, "abc" -> 1
 // x(string,uint256): 0x40, 1, 3, "abc" -> 2
diff --git a/test/libsolidity/semanticTests/getters/mapping_to_struct.sol b/test/libsolidity/semanticTests/getters/mapping_to_struct.sol
index 7dbddd56f1..d601fd90fc 100644
--- a/test/libsolidity/semanticTests/getters/mapping_to_struct.sol
+++ b/test/libsolidity/semanticTests/getters/mapping_to_struct.sol
@@ -13,7 +13,6 @@ contract C {
         x[1][2].d = 6;
     }
 }
-// ====
 // ----
 // x(uint256,uint256): 1, 2 -> 3, 4, 5, 6
 // x(uint256,uint256): 0, 0 -> 0x00, 0x00, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/getters/struct_with_bytes.sol b/test/libsolidity/semanticTests/getters/struct_with_bytes.sol
index 184310f7cc..477a1297fb 100644
--- a/test/libsolidity/semanticTests/getters/struct_with_bytes.sol
+++ b/test/libsolidity/semanticTests/getters/struct_with_bytes.sol
@@ -14,6 +14,5 @@ contract C {
         s.d.push(10);
     }
 }
-// ====
 // ----
 // s() -> 7, 0x40, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol b/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol
index b1559a34f6..281b29c871 100644
--- a/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol
+++ b/test/libsolidity/semanticTests/getters/struct_with_bytes_simple.sol
@@ -13,6 +13,5 @@ contract C {
         s.c[0] = 9;
     }
 }
-// ====
 // ----
 // s() -> 0x07, 0x40, 0x03, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol b/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol
index 8e1965d002..3f71a31e0f 100644
--- a/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol
+++ b/test/libsolidity/semanticTests/immutable/assign_at_declaration.sol
@@ -4,6 +4,5 @@ contract A {
 		return a;
 	}
 }
-// ====
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol b/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol
index f14f5d2bd6..e1440be56d 100644
--- a/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol
+++ b/test/libsolidity/semanticTests/immutable/assign_from_immutables.sol
@@ -11,7 +11,6 @@ contract C {
 		d = c;
 	}
 }
-// ====
 // ----
 // a() -> 1
 // b() -> 1
diff --git a/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol b/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol
index a0d765d34c..0aafbae3ee 100644
--- a/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol
+++ b/test/libsolidity/semanticTests/immutable/fun_read_in_ctor.sol
@@ -15,7 +15,6 @@ contract A {
 		return a;
 	}
 }
-// ====
 // ----
 // readX() -> 3
 // readA() -> 3
diff --git a/test/libsolidity/semanticTests/immutable/getter.sol b/test/libsolidity/semanticTests/immutable/getter.sol
index 1824ae2970..bb4b191cf9 100644
--- a/test/libsolidity/semanticTests/immutable/getter.sol
+++ b/test/libsolidity/semanticTests/immutable/getter.sol
@@ -1,6 +1,5 @@
 contract C {
     uint immutable public x = 1;
 }
-// ====
 // ----
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/immutable/immutable_signed.sol b/test/libsolidity/semanticTests/immutable/immutable_signed.sol
index b47219976f..6bb193f826 100644
--- a/test/libsolidity/semanticTests/immutable/immutable_signed.sol
+++ b/test/libsolidity/semanticTests/immutable/immutable_signed.sol
@@ -9,6 +9,5 @@ contract C {
     }
     function g() internal pure returns (uint) { return 2; }
 }
-// ====
 // ----
 // viaasm() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/immutable/inheritance.sol b/test/libsolidity/semanticTests/immutable/inheritance.sol
index d021f2ca4e..889c273e46 100644
--- a/test/libsolidity/semanticTests/immutable/inheritance.sol
+++ b/test/libsolidity/semanticTests/immutable/inheritance.sol
@@ -26,6 +26,5 @@ contract D is B, C {
 		return (a, b, c, d);
 	}
 }
-// ====
 // ----
 // f() -> 4, 3, 2, 1
diff --git a/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol b/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol
index 069fa3d181..f56db7f277 100644
--- a/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol
+++ b/test/libsolidity/semanticTests/immutable/internal_function_pointer.sol
@@ -10,7 +10,6 @@ contract C {
 		return z();
 	}
 }
-// ====
 // ----
 // f() -> 7
 // callZ() -> 7
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index 107b810ab8..95e03d1897 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -25,7 +25,6 @@ contract C {
 		return (a, (new A()).f(), (new B()).f());
 	}
 }
-// ====
 // ----
 // f() -> 3, 7, 5
 // gas irOptimized: 126136
diff --git a/test/libsolidity/semanticTests/immutable/read_in_ctor.sol b/test/libsolidity/semanticTests/immutable/read_in_ctor.sol
index 99988f72ec..329a377644 100644
--- a/test/libsolidity/semanticTests/immutable/read_in_ctor.sol
+++ b/test/libsolidity/semanticTests/immutable/read_in_ctor.sol
@@ -11,6 +11,5 @@ contract A {
 		return x;
 	}
 }
-// ====
 // ----
 // readX() -> 3
diff --git a/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol b/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol
index 347b4e9830..167bd48a17 100644
--- a/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol
+++ b/test/libsolidity/semanticTests/immutable/small_types_in_reverse.sol
@@ -10,7 +10,6 @@ contract A {
 		x = [a, b, c];
 	}
 }
-// ====
 // ----
 // a() -> 4660
 // b() -> 0x0f0f
diff --git a/test/libsolidity/semanticTests/immutable/stub.sol b/test/libsolidity/semanticTests/immutable/stub.sol
index 758fbc5973..092edfab4f 100644
--- a/test/libsolidity/semanticTests/immutable/stub.sol
+++ b/test/libsolidity/semanticTests/immutable/stub.sol
@@ -9,6 +9,5 @@ contract C {
 		return (x+x,y);
 	}
 }
-// ====
 // ----
 // f() -> 84, 23
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index bfee62a9b5..7790f2fa7f 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -13,7 +13,6 @@ contract C {
 		return (x+x,y);
 	}
 }
-// ====
 // ----
 // constructor(): 3 ->
 // gas irOptimized: 127454
diff --git a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
index 4af02c4628..fac3a61ad2 100644
--- a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
+++ b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
@@ -19,7 +19,6 @@ contract D {
     }
 }
 
-// ====
 // ----
 // f() -> 1
 // gas irOptimized: 77051
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
index 2f69413ad9..cfa124c257 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
@@ -21,7 +21,6 @@ contract B {
     }
 }
 
-// ====
 // ----
 // g() -> 42
 // gas irOptimized: 80813
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol
index 8081ab5a23..a6274ed773 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory.sol
@@ -17,6 +17,5 @@ contract B is A {
         return A(this).f(m);
     }
 }
-// ====
 // ----
 // g() -> 23
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index 15344160cf..724e7d4bed 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -21,7 +21,6 @@ contract B {
     }
 }
 
-// ====
 // ----
 // g() -> 42
 // gas irOptimized: 101944
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
index 8c0ba09e91..42d4f711c9 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
@@ -15,6 +15,5 @@ contract B {
     }
 }
 
-// ====
 // ----
 // g() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
index 212df0b45e..44cbb1e141 100644
--- a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
+++ b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
@@ -18,7 +18,6 @@ contract A {
 	}
 }
 
-// ====
 // ----
 // g(int256): -1 -> -1
 // gas legacy: 103494
diff --git a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol
index 054d9ce998..7b8af54e9e 100644
--- a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol
+++ b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base.sol
@@ -14,6 +14,5 @@ contract Derived is Base {
 
 contract Final is Derived(4) {}
 
-// ====
 // ----
 // m_i() -> 4
diff --git a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol
index 7e2b7265a5..d028630e16 100644
--- a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol
+++ b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base.sol
@@ -19,6 +19,5 @@ contract Derived is Base, Base1 {
 
 contract Final is Derived(4) {}
 
-// ====
 // ----
 // m_i() -> 4
diff --git a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol
index 6c69b279b0..221368f0d0 100644
--- a/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol
+++ b/test/libsolidity/semanticTests/inheritance/pass_dynamic_arguments_to_the_base_base_with_gap.sol
@@ -19,6 +19,5 @@ contract Derived is Base, Base1 {
 
 contract Final is Derived(4) {}
 
-// ====
 // ----
 // m_i() -> 4
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index f7251bdbd7..b53d979269 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -38,7 +38,6 @@ contract Main {
     }
 }
 
-// ====
 // ----
 // constructor(), 22 wei ->
 // gas irOptimized: 277680
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol
index 69c734953f..631e61fe04 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_dynamic.sol
@@ -4,6 +4,5 @@ contract C {
         r = x;
     }
 }
-// ====
 // ----
 // f(uint256[2][]): 0x0, 1, 8, 7, 6, 5 -> 0x20, 2, 8, 7, 6, 5
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol
index 038d622a58..32931be180 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_assign_static.sol
@@ -4,6 +4,5 @@ contract C {
         r = x;
     }
 }
-// ====
 // ----
 // f(uint256[2][2]): 0x0, 8, 7, 6, 5 -> 8, 7, 6, 5
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol
index a7bbf73fbb..f5d557e552 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_assign.sol
@@ -4,6 +4,5 @@ contract C {
         return x;
     }
 }
-// ====
 // ----
 // f(bytes): 0x20, 0, 0 -> 0x20, 3, 0x5754f80000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol
index 1385886e86..876fffd42d 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_assign_from_nowhere.sol
@@ -3,6 +3,5 @@ contract C {
         assembly { x.offset := 0 x.length := 4 }
     }
 }
-// ====
 // ----
 // f() -> 0x20, 4, 0x26121ff000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol
index abbed4f219..96c01ae587 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign.sol
@@ -12,6 +12,5 @@ contract C {
 		r2 = s2.x;
 	}
 }
-// ====
 // ----
 // f((uint256),(uint256,uint256)): 0x42, 0x07, 0x77 -> 0x07, 0x42
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol
index 062ac64f30..4c699bc40d 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_struct_assign_and_return.sol
@@ -13,7 +13,6 @@ contract C {
   function h() public pure returns(uint256) { f(); return 0x42; }
   function i() public pure returns(uint256) { abi.decode(msg.data[4:], (S)); return 0x42; }
 }
-// ====
 // ----
 // g(): 0xCAFFEE, 0x42, 0x21 -> 0x42, 0x21
 // g(): 0xCAFFEE, 0x4242, 0x2121 -> FAILURE
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
index e3a6812dbb..d0461363c1 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
@@ -12,7 +12,6 @@ contract C {
 		return this.testFunction.address;
 	}
 }
-// ====
 // ----
 // testYul() -> 0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b
 // testSol() -> 0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol
index 9010a9cde9..eb28a6d201 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address_assignment.sol
@@ -11,7 +11,6 @@ contract C {
 		return fp.address;
 	}
 }
-// ====
 // ----
 // testYul(address): 0x1234567890 -> 0x1234567890
 // testYul(address): 0xC0FFEE3EA7 -> 0xC0FFEE3EA7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol
index 371f1be58e..2fa372f816 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector.sol
@@ -16,7 +16,6 @@ contract C {
 		return uint32(this.testFunction.selector);
 	}
 }
-// ====
 // ----
 // testYul() -> 0xe16b4a9b
 // testSol() -> 0xe16b4a9b
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol
index b65e9e2cd0..a8e886147d 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_selector_assignment.sol
@@ -11,7 +11,6 @@ contract C {
 		return uint32(fp.selector);
 	}
 }
-// ====
 // ----
 // testYul(uint32): 0x12345678 -> 0x12345678
 // testYul(uint32): 0xABCDEF00 -> 0xABCDEF00
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol b/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol
index 4047249339..19a4fbdb87 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_identifier_access_shadowing.sol
@@ -6,6 +6,5 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol b/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
index 18e57ede7c..e6ca33644f 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/function_name_clash.sol
@@ -6,7 +6,6 @@ contract C {
     assembly { function f() -> x { x := 2 } r := f() }
   }
 }
-// ====
 // ----
 // f() -> 1
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
index 8bd6d4df25..741d03a8b1 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
@@ -6,6 +6,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol
index df0f5fd38f..2a245b35c5 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimization.sol
@@ -10,6 +10,5 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol
index c236a9683a..233e4f7273 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_bug_different_memory_location.sol
@@ -10,6 +10,5 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // f() -> false
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol
index c428030a5d..4023a809bc 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak256_optimizer_cache_bug.sol
@@ -15,6 +15,5 @@ contract C {
     return true;
   }
 }
-// ====
 // ----
 // val() -> true
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol
index c0b7bfed41..35f8ae5ec6 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak_optimization_bug_string.sol
@@ -7,7 +7,6 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // f(string): "" -> false
 // f(string): 0x20, 5, "hello" -> false
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
index ccf0a3bf6e..88088bbda8 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak_yul_optimization.sol
@@ -22,7 +22,6 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // f() -> 0xcdb56c384a9682c600315e3470157a4cf7638d0d33e9dae5c40ffd2644fc5a80
 // gas irOptimized: 22239
diff --git a/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol b/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol
index 3ba4a4aab5..abfc6d09be 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/slot_access.sol
@@ -25,7 +25,6 @@ contract C {
         return data().a;
     }
 }
-// ====
 // ----
 // get() -> 0
 // mappingAccess(uint256): 1 -> 0, 0
diff --git a/test/libsolidity/semanticTests/interfaceID/lisa.sol b/test/libsolidity/semanticTests/interfaceID/lisa.sol
index 96dd24fadb..885cf9b246 100644
--- a/test/libsolidity/semanticTests/interfaceID/lisa.sol
+++ b/test/libsolidity/semanticTests/interfaceID/lisa.sol
@@ -40,7 +40,6 @@ contract Lisa is ERC165MappingImplementation, Simpson {
     }
 }
 
-// ====
 // ----
 // supportsInterface(bytes4): left(0x01ffc9a0) -> false
 // supportsInterface(bytes4): left(0x01ffc9a7) -> true
diff --git a/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol b/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
index 04fcfbf276..c9a7c49050 100644
--- a/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
+++ b/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
@@ -40,7 +40,6 @@ contract Lisa is ERC165MappingImplementation, Simpson {
     }
 }
 
-// ====
 // ----
 // supportsInterface(bytes4): left(0x01ffc9a0) -> false
 // supportsInterface(bytes4): left(0x01ffc9a7) -> true
diff --git a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
index d241243a0f..70c7fac402 100644
--- a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
+++ b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
@@ -33,7 +33,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // convertParent() -> 1
 // gas irOptimized: 85524
diff --git a/test/libsolidity/semanticTests/isoltestTesting/account.sol b/test/libsolidity/semanticTests/isoltestTesting/account.sol
index 1cefbbf192..7b6c55b1e7 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/account.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/account.sol
@@ -3,7 +3,6 @@ contract AccountBuiltinTest {
         result = msg.sender;
     }
 }
-// ====
 // ----
 // constructor()
 // account: 0 -> 0x1212121212121212121212121212120000000012
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index c0e682de41..620a94d0ce 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -14,7 +14,6 @@ contract ClientReceipt {
         return other.getAddress();
     }
 }
-// ====
 // ----
 // constructor(), 2000 wei ->
 // gas irOptimized: 183544
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol
index 42d58e38d5..3fd67d57ce 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance.sol
@@ -1,7 +1,6 @@
 contract ClientReceipt {
     constructor() payable {}
 }
-// ====
 // ----
 // constructor(), 1000 wei ->
 // balance -> 1000
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol
index 6c263a010c..4b940fe869 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_with_balance2.sol
@@ -1,7 +1,6 @@
 contract ClientReceipt {
     constructor() payable {}
 }
-// ====
 // ----
 // constructor(), 1 ether ->
 // balance -> 1000000000000000000
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol
index c4ca10e241..222fba4ecb 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_without_balance.sol
@@ -1,6 +1,5 @@
 contract ClientReceipt {
 }
-// ====
 // ----
 // balance -> 0
 // balance: 0x0000000000000000000000000000000000000000 -> 0
diff --git a/test/libsolidity/semanticTests/isoltestTesting/builtins.sol b/test/libsolidity/semanticTests/isoltestTesting/builtins.sol
index 94f66b626e..e8faa0cc40 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/builtins.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/builtins.sol
@@ -1,5 +1,4 @@
 contract SmokeTest {
 }
-// ====
 // ----
 // isoltest_builtin_test -> 0x1234
diff --git a/test/libsolidity/semanticTests/isoltestTesting/effects.sol b/test/libsolidity/semanticTests/isoltestTesting/effects.sol
index e190973615..c9ab6c3eb2 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/effects.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/effects.sol
@@ -1,6 +1,5 @@
 contract SmokeTest {
 }
-// ====
 // ----
 // isoltest_side_effects_test -> 0
 // isoltest_side_effects_test: 0x1234 -> 0x1234
diff --git a/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol b/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol
index 922f826eb4..a230cc9ab3 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/format_raw_string_with_control_chars.sol
@@ -6,6 +6,5 @@ contract C {
 // NOTE: The test is here to illustrate the problem with formatting control chars in strings in
 // test expectations but unfortunately it can only be triggered manually. It does not test anything
 // unless you introduce a difference in expectations to force isoltest to reformat them.
-// ====
 // ----
 // f(string): 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" -> 0x20, 16, "\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83\xf0\x9f\x98\x83" # Input/Output: "😃😃😃😃" #
diff --git a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol b/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol
index 0883d76fd3..11832a5191 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/storage/storage_empty.sol
@@ -1,5 +1,4 @@
 contract StorageEmpty {
 }
-// ====
 // ----
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol b/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol
index 15d6d0a588..33b1a4d69c 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/storage/storage_nonempty.sol
@@ -2,7 +2,6 @@ contract StorageNotEmpty {
     uint256 x;
     function set(uint256 _a) public { x = _a; }
 }
-// ====
 // ----
 // storageEmpty -> 1
 // set(uint256): 1 ->
diff --git a/test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol b/test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol
index 014f6acf28..5c32d31e7e 100644
--- a/test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol
+++ b/test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol
@@ -13,6 +13,5 @@ contract C {
         return (_x.f()[0], _x.g()[0]);
     }
 }
-// ====
 // ----
 // f(bytes): 0x20, 4, "abcd" -> 0x6100000000000000000000000000000000000000000000000000000000000000, 0x6100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/libraries/bound_to_calldata.sol b/test/libsolidity/semanticTests/libraries/bound_to_calldata.sol
index 38b31620cb..bc9e11de1e 100644
--- a/test/libsolidity/semanticTests/libraries/bound_to_calldata.sol
+++ b/test/libsolidity/semanticTests/libraries/bound_to_calldata.sol
@@ -13,6 +13,5 @@ contract C {
         return (_x.f(), _x.g());
     }
 }
-// ====
 // ----
 // f(bytes): 0x20, 4, "abcd" -> 0x6100000000000000000000000000000000000000000000000000000000000000, 0x6100000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol b/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol
index 5592b8426e..1808d61395 100644
--- a/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol
+++ b/test/libsolidity/semanticTests/libraries/external_call_with_function_pointer_parameter.sol
@@ -19,7 +19,6 @@ contract C {
         return L.run(this.double, _value);
     }
 }
-// ====
 // ----
 // library: L
 // g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol b/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol
index 19b395c766..e842fecaf3 100644
--- a/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol
+++ b/test/libsolidity/semanticTests/libraries/external_call_with_storage_array_parameter.sol
@@ -12,7 +12,6 @@ contract C {
         return L.f(x);
     }
 }
-// ====
 // ----
 // library: L
 // g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol b/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol
index 5baed9427e..d009bed5cb 100644
--- a/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol
+++ b/test/libsolidity/semanticTests/libraries/external_call_with_storage_mapping_parameter.sol
@@ -12,7 +12,6 @@ contract C {
         return L.f(x);
     }
 }
-// ====
 // ----
 // library: L
 // g(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol b/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol
index ff0a2b7ff0..43ce7ea664 100644
--- a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol
@@ -21,6 +21,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> 0x0a
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol b/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol
index 3fc52ce51c..4de0f4dc96 100644
--- a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol
@@ -10,6 +10,5 @@ contract C {
 	}
 }
 
-// ====
 // ----
 // foo() -> 3
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function.sol
index 4b3a78864d..a3c8a87001 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol
index 460b5c7b81..f59ec9440d 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol
@@ -22,6 +22,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol
index 7ca3e1d576..c5581b7991 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol
@@ -11,7 +11,6 @@ contract C {
         return a.equals(b);
     }
 }
-// ====
 // ----
 // foo(address,address): 0x111122223333444455556666777788889999aAaa, 0x111122223333444455556666777788889999aAaa -> true
 // foo(address,address): 0x111122223333444455556666777788889999aAaa, 0x0000000000000000000000000000000000000000 -> false
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol
index 2f06a91c70..a4facc02a9 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol
@@ -14,7 +14,6 @@ contract C {
         a.send();
     }
 }
-// ====
 // ----
 // useTransfer(address): 0x111122223333444455556666777788889999aAaa ->
 // useSend(address): 0x111122223333444455556666777788889999aAaa ->
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol
index c7d975004c..80e0153b66 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol
@@ -13,6 +13,5 @@ contract C {
         input.pop();
     }
 }
-// ====
 // ----
 // test() ->
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol
index c68b1983a6..bf49f4e7be 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol
@@ -11,7 +11,6 @@ contract C {
         return a.xor(b);
     }
 }
-// ====
 // ----
 // foo(bool,bool): true, true -> false
 // foo(bool,bool): true, false -> true
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol
index 75a95e9275..afe9b0deb9 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol
@@ -15,6 +15,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test() -> 42
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol
index 098d8193c5..f759ea78df 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol
@@ -15,6 +15,5 @@ contract C {
         return input.at(1);
     }
 }
-// ====
 // ----
 // secondItem() -> 0x22
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol
index 76c2792b0e..4dd3bad4e2 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol
@@ -14,7 +14,6 @@ contract C {
         return x.equals(L.E(choice));
     }
 }
-// ====
 // ----
 // equalsA(uint256): 0 -> true
 // equalsA(uint256): 1 -> false
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol
index 61b2bad81a..63ca1e0b7a 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol
index cdc91e7533..28f621d59b 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol
@@ -15,6 +15,5 @@ contract C {
         return input.at(1);
     }
 }
-// ====
 // ----
 // secondItem() -> 0x22
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol
index 457535bbfe..bf7d0ede84 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol
@@ -11,6 +11,5 @@ contract C {
         return a.add(b);
     }
 }
-// ====
 // ----
 // sum(bytes2,bytes2): left(0x1100), left(0x0022) -> left(0x1122)
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol
index dbcf695650..d66bac750f 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol
@@ -16,6 +16,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol
index 028a0bf4a0..5234fb5e40 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol
@@ -11,6 +11,5 @@ contract C {
         return a.add(b);
     }
 }
-// ====
 // ----
 // foo(uint256,uint256): 8, 42 -> 50
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol
index 3ab5aca3ba..e00fd46120 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol
@@ -16,6 +16,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test() -> 42
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol
index 7d7f5f6515..c566da79cb 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol
@@ -16,6 +16,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol
index bacf096dc6..da7ee6cccd 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol
@@ -19,7 +19,6 @@ contract C {
         return "abc".double();
     }
 }
-// ====
 // ----
 // double42() -> 84
 // doubleABC() -> 0x20, 6, "abcabc"
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol
index e2dc3dbbd3..d4cee5c977 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol
@@ -16,6 +16,5 @@ contract C {
         return map.at(a);
     }
 }
-// ====
 // ----
 // mapValue(uint256): 42 -> 0x24
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol
index 33b7a62add..b7bc103f41 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol
@@ -16,6 +16,5 @@ contract C {
         return (s.f(), s.g());
     }
 }
-// ====
 // ----
 // test(string): 0x20, 3, "def" -> 0x40, 0x80, 3, "def", 3, "def"
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol
index d9ced18091..3ed398f9ac 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol
@@ -12,6 +12,5 @@ contract C {
         return input.at(1);
     }
 }
-// ====
 // ----
 // secondChar() -> 98
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
index 63161eb8c2..2283c30ff5 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
@@ -22,6 +22,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol
index c730a48236..0681fd0d07 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_pointer.sol
@@ -11,6 +11,5 @@ contract C {
         return ptr();
     }
 }
-// ====
 // ----
 // g() -> 66
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
index 381d2bb5f7..21417b599b 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
@@ -22,6 +22,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/library_address_homestead.sol b/test/libsolidity/semanticTests/libraries/library_address_homestead.sol
index 1c5b49ae1f..ce7344f4ad 100644
--- a/test/libsolidity/semanticTests/libraries/library_address_homestead.sol
+++ b/test/libsolidity/semanticTests/libraries/library_address_homestead.sol
@@ -12,7 +12,6 @@ contract C {
         return success;
     }
 }
-// ====
 // ----
 // library: L
 // g(uint256,uint256): 1, 1 -> true
diff --git a/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol b/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
index d08db3cf4e..f24d93c2d9 100644
--- a/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
+++ b/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
@@ -10,6 +10,5 @@ contract Tsra {
     }
 }
 
-// ====
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol b/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol
index 9c942f0ff2..00001a2f83 100644
--- a/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol
+++ b/test/libsolidity/semanticTests/libraries/library_return_struct_with_mapping.sol
@@ -16,7 +16,6 @@ contract C {
         assembly { slot := ptr.slot }
     }
 }
-// ====
 // ----
 // library: Lib
 // f() -> 123
diff --git a/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol b/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
index 24ed78e0eb..e7692ed838 100644
--- a/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
+++ b/test/libsolidity/semanticTests/libraries/library_staticcall_delegatecall.sol
@@ -13,7 +13,6 @@ contract Test {
         return Lib.x();
     }
 }
-// ====
 // ----
 // library: Lib
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol b/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
index 744ee443f8..d7df524341 100644
--- a/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
+++ b/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
@@ -13,6 +13,5 @@ contract Tsra {
     }
 }
 
-// ====
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/stub.sol b/test/libsolidity/semanticTests/libraries/stub.sol
index 15934fe1e7..8bae3df272 100644
--- a/test/libsolidity/semanticTests/libraries/stub.sol
+++ b/test/libsolidity/semanticTests/libraries/stub.sol
@@ -6,7 +6,6 @@ contract C {
         return L.f(v);
     }
 }
-// ====
 // ----
 // library: L
 // g(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/libraries/stub_internal.sol b/test/libsolidity/semanticTests/libraries/stub_internal.sol
index ef29cacbbf..075b8dbb22 100644
--- a/test/libsolidity/semanticTests/libraries/stub_internal.sol
+++ b/test/libsolidity/semanticTests/libraries/stub_internal.sol
@@ -6,7 +6,6 @@ contract C {
         return L.f(v);
     }
 }
-// ====
 // ----
 // g(uint256): 1 -> 1
 // g(uint256): 2 -> 4
diff --git a/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol b/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol
index 500aaa865c..f44da5a8b8 100644
--- a/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol
+++ b/test/libsolidity/semanticTests/libraries/using_for_function_on_int.sol
@@ -7,7 +7,6 @@ contract C {
 		return a.double();
 	}
 }
-// ====
 // ----
 // library: D
 // f(uint256): 9 -> 18
diff --git a/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol b/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol
index 0298051731..cd45726b67 100644
--- a/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol
+++ b/test/libsolidity/semanticTests/libraries/using_for_storage_structs.sol
@@ -21,6 +21,5 @@ contract C {
     return (s.f(), h(s));
   }
 }
-// ====
 // ----
 // g() -> 7, 7
diff --git a/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol b/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
index 59c9f8b820..82ec72d80b 100644
--- a/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
+++ b/test/libsolidity/semanticTests/literals/ternary_operator_with_literal_types_overflow.sol
@@ -12,7 +12,6 @@ contract TestTernary
         a = (t ? 63 : 255) + (f ? 63 : 255);
     }
 }
-// ====
 // ----
 // g() -> FAILURE, hex"4e487b71", 0x11
 // h() -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol b/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
index aa0a4eb79e..ed51a59921 100644
--- a/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
+++ b/test/libsolidity/semanticTests/memoryManagement/memory_types_initialisation.sol
@@ -8,7 +8,6 @@ contract Test {
     function nested() public returns (uint[3][] memory) { stat(); }
     function nestedStat() public returns (uint[3][7] memory) { stat(); }
 }
-// ====
 // ----
 // stat() -> 0, 0, 0, 0, 0
 // dyn() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/memoryManagement/return_variable.sol b/test/libsolidity/semanticTests/memoryManagement/return_variable.sol
index 71fbcd8faf..a28672c93f 100644
--- a/test/libsolidity/semanticTests/memoryManagement/return_variable.sol
+++ b/test/libsolidity/semanticTests/memoryManagement/return_variable.sol
@@ -24,6 +24,5 @@ contract C {
         return x;
     }
 }
-// ====
 // ----
 // f() -> 0x0500, 0x0500, 0x0a00
diff --git a/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol b/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol
index afd5d4aeb2..9b27b3492e 100644
--- a/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol
+++ b/test/libsolidity/semanticTests/memoryManagement/static_memory_array_allocation.sol
@@ -17,7 +17,6 @@ contract C {
         return memorySizeAfter - memorySizeBefore;
     }
 }
-// ====
 // ----
 // withValue() -> 0x00
 // withoutValue() -> 0x0280
diff --git a/test/libsolidity/semanticTests/modifiers/evaluation_order.sol b/test/libsolidity/semanticTests/modifiers/evaluation_order.sol
index 0b81533652..b92df61f96 100644
--- a/test/libsolidity/semanticTests/modifiers/evaluation_order.sol
+++ b/test/libsolidity/semanticTests/modifiers/evaluation_order.sol
@@ -16,6 +16,5 @@ contract D is A, B, C {
 
     function f(uint y) internal returns (uint) { x.push(y); return 0; }
 }
-// ====
 // ----
 // query() -> 0x20, 7, 4, 2, 6, 1, 3, 5, 7
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
index 2be71c52ba..f10ebb0e74 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
@@ -24,6 +24,5 @@ contract Test {
     }
 }
 
-// ====
 // ----
 // f() -> 0x202
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
index 4902f26650..3d5e97de00 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
@@ -30,6 +30,5 @@ contract Test {
     }
 }
 
-// ====
 // ----
 // f() -> 0x202
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol
index c4ccc94243..f14496fa14 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_return_reference.sol
@@ -9,6 +9,5 @@ contract C {
     function f() public m1(x = 2) m2(y = 3) returns (uint x, uint y) {
     }
 }
-// ====
 // ----
 // f() -> 2, 3
diff --git a/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol b/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol
index 6cf59f788e..8d714dd45c 100644
--- a/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol
+++ b/test/libsolidity/semanticTests/multiSource/import_overloaded_function.sol
@@ -9,6 +9,5 @@ contract C
         return (sub(1, 2), sub(2));
     }
 }
-// ====
 // ----
 // f() -> 1, 2
diff --git a/test/libsolidity/semanticTests/smoke/alignment.sol b/test/libsolidity/semanticTests/smoke/alignment.sol
index 33724cccf3..bdf2ed446f 100644
--- a/test/libsolidity/semanticTests/smoke/alignment.sol
+++ b/test/libsolidity/semanticTests/smoke/alignment.sol
@@ -18,7 +18,6 @@ contract D {
         return (stateBool, stateDecimal, stateBytes);
     }
 }
-// ====
 // ----
 // stateBool() -> true
 // stateBool() -> right(true)
diff --git a/test/libsolidity/semanticTests/smoke/arrays.sol b/test/libsolidity/semanticTests/smoke/arrays.sol
index a6f4895335..404c7157fe 100644
--- a/test/libsolidity/semanticTests/smoke/arrays.sol
+++ b/test/libsolidity/semanticTests/smoke/arrays.sol
@@ -32,7 +32,6 @@ contract C {
         return (["any", "any"], ["any", "any", "any"]);
     }
 }
-// ====
 // ----
 // r() -> true, false, true
 // s() -> 123, 456, 789
diff --git a/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol b/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol
index 0a3c2e44f4..c20dd919e1 100644
--- a/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol
+++ b/test/libsolidity/semanticTests/smoke/bytes_and_strings.sol
@@ -12,7 +12,6 @@ contract C {
         return "any";
     }
 }
-// ====
 // ----
 // e(bytes): 32, 3, hex"AB33BB" -> 32, 3, left(0xAB33BB)
 // e(bytes): 32, 32, 0x20 -> 32, 32, 0x20
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index ef19fd669a..8c63d0c4a9 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -10,7 +10,6 @@ contract C {
         state = _state;
     }
 }
-// ====
 // ----
 // constructor(), 2 wei: 3 ->
 // gas irOptimized: 107627
diff --git a/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol b/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol
index 9ceddcfe87..6dcb53e2d5 100644
--- a/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol
+++ b/test/libsolidity/semanticTests/specialFunctions/keccak256_optimized.sol
@@ -12,7 +12,6 @@ contract C {
         return (a == keccak256(s), sc == keccak256(s));
     }
 }
-// ====
 // ----
 // short() -> true
 // long() -> true, true
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
index 010893e7dc..c425d127b1 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -10,7 +10,6 @@ contract C {
         return blockhash(blockNumber);
     }
 }
-// ====
 // ----
 // constructor()
 // gas irOptimized: 111584
diff --git a/test/libsolidity/semanticTests/state/msg_data.sol b/test/libsolidity/semanticTests/state/msg_data.sol
index cc80650d7c..5a240461a1 100644
--- a/test/libsolidity/semanticTests/state/msg_data.sol
+++ b/test/libsolidity/semanticTests/state/msg_data.sol
@@ -6,7 +6,6 @@ contract C {
         return msg.data;
     }
 }
-// ====
 // ----
 // f() -> 0x20, 4, 17219911917854084299749778639755835327755045716242581057573779540915269926912
 // g(uint256,bool): 1234, true -> 0x20, 0x44, 35691323728519381642872894128098848782337736632589179916067422734266033766400, 33268574187263889506619096617382224251268236217415066441681855047532544, 26959946667150639794667015087019630673637144422540572481103610249216
diff --git a/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol b/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol
index affc843935..f309bcf167 100644
--- a/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol
+++ b/test/libsolidity/semanticTests/storage/accessors_mapping_for_array.sol
@@ -8,7 +8,6 @@ contract test {
         dynamicData[2][2] = 8;
     }
 }
-// ====
 // ----
 // data(uint256,uint256): 2, 2 -> 8
 // data(uint256,uint256): 2, 8 -> FAILURE # NB: the original code contained a bug here #
diff --git a/test/libsolidity/semanticTests/storage/array_accessor.sol b/test/libsolidity/semanticTests/storage/array_accessor.sol
index b51f2ccd67..599931a372 100644
--- a/test/libsolidity/semanticTests/storage/array_accessor.sol
+++ b/test/libsolidity/semanticTests/storage/array_accessor.sol
@@ -22,7 +22,6 @@ contract test {
         multiple_map[2][1][2].finalArray[3] = 5;
     }
 }
-// ====
 // ----
 // data(uint256): 0 -> 8
 // data(uint256): 8 -> FAILURE
diff --git a/test/libsolidity/semanticTests/storage/chop_sign_bits.sol b/test/libsolidity/semanticTests/storage/chop_sign_bits.sol
index 10674f3b24..51cba02612 100644
--- a/test/libsolidity/semanticTests/storage/chop_sign_bits.sol
+++ b/test/libsolidity/semanticTests/storage/chop_sign_bits.sol
@@ -19,7 +19,6 @@ contract Test {
         return z;
     }
 }
-// ====
 // ----
 // x(uint256): 0 -> -1
 // x(uint256): 1 -> -2
diff --git a/test/libsolidity/semanticTests/storage/complex_accessors.sol b/test/libsolidity/semanticTests/storage/complex_accessors.sol
index 143d3c5195..59ad86a1a9 100644
--- a/test/libsolidity/semanticTests/storage/complex_accessors.sol
+++ b/test/libsolidity/semanticTests/storage/complex_accessors.sol
@@ -10,7 +10,6 @@ contract test {
         to_multiple_map[42][23] = 31;
     }
 }
-// ====
 // ----
 // to_string_map(uint256): 42 -> "24"
 // to_bool_map(uint256): 42 -> false
diff --git a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
index d22e0d8164..a010aeb136 100644
--- a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
+++ b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
@@ -2,7 +2,6 @@ contract Test {
     bytes x;
     function set(bytes memory _a) public { x = _a; }
 }
-// ====
 // ----
 // set(bytes): 0x20, 3, "abc"
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/storage/mapping_state.sol b/test/libsolidity/semanticTests/storage/mapping_state.sol
index 16ce615fcf..9059e72d0c 100644
--- a/test/libsolidity/semanticTests/storage/mapping_state.sol
+++ b/test/libsolidity/semanticTests/storage/mapping_state.sol
@@ -15,7 +15,6 @@ contract Ballot {
 		return true;
 	}
 }
-// ====
 // ----
 // getVoteCount(address): 0 -> 0
 // getVoteCount(address): 1 -> 0
diff --git a/test/libsolidity/semanticTests/storage/mapping_string_key.sol b/test/libsolidity/semanticTests/storage/mapping_string_key.sol
index eca07f164d..be7516926d 100644
--- a/test/libsolidity/semanticTests/storage/mapping_string_key.sol
+++ b/test/libsolidity/semanticTests/storage/mapping_string_key.sol
@@ -13,7 +13,6 @@ contract C {
         return m_nameToRecord["fixed"];
     }
 }
-// ====
 // ----
 // set(string,uint256): 0x40, 8, 3, "abc" ->
 // get(string): 0x20, 3, "abc" -> 8
diff --git a/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol b/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol
index 77697f9176..f4407bb6ca 100644
--- a/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol
+++ b/test/libsolidity/semanticTests/storage/mappings_array2d_pop_delete.sol
@@ -28,7 +28,6 @@ contract C {
 		return a.length;
 	}
 }
-// ====
 // ----
 // n1(uint256,uint256): 42, 64 ->
 // map(uint256): 42 -> 64
diff --git a/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol b/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol
index b53d330172..9739005763 100644
--- a/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol
+++ b/test/libsolidity/semanticTests/storage/mappings_array_pop_delete.sol
@@ -23,7 +23,6 @@ contract C {
 		return a.length;
 	}
 }
-// ====
 // ----
 // n1(uint256,uint256): 42, 64 ->
 // map(uint256): 42 -> 64
diff --git a/test/libsolidity/semanticTests/storage/packed_functions.sol b/test/libsolidity/semanticTests/storage/packed_functions.sol
index 40da588c66..4a49a614f3 100644
--- a/test/libsolidity/semanticTests/storage/packed_functions.sol
+++ b/test/libsolidity/semanticTests/storage/packed_functions.sol
@@ -39,7 +39,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // set() ->
 // t1() -> 7
diff --git a/test/libsolidity/semanticTests/storage/struct_accessor.sol b/test/libsolidity/semanticTests/storage/struct_accessor.sol
index 0bbe9fd44e..8d8fc178cf 100644
--- a/test/libsolidity/semanticTests/storage/struct_accessor.sol
+++ b/test/libsolidity/semanticTests/storage/struct_accessor.sol
@@ -8,6 +8,5 @@ contract test {
         data[7].d = true;
     }
 }
-// ====
 // ----
 // data(uint256): 7 -> 1, 2, true
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
index cf50830ba4..304ccecb4e 100644
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_2_args.sol
@@ -3,7 +3,6 @@ contract C {
         return string.concat(a, b);
     }
 }
-// ====
 // ----
 // f(string,string): 0x40, 0x80, 32, "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
 // f(string,string): 0x40, 0xa0, 64, "abcdabcdabcdabcdabcdabcdabcdabcd", "abcdabcdabcdabcdabcdabcdabcdabcd", 5, "bcdef" -> 0x20, 0x45, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
index 1fd1093e33..0891e30c9a 100644
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_different_types.sol
@@ -25,7 +25,6 @@ contract C{
         return string.concat(string(a), "bcdef");
     }
 }
-// ====
 // ----
 // f(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x25, 0x6162636461626364616263646162636461626364616263646162636461626364, 44502269928904312298000709931354278973409164155382318144318241583783949107200
 // g(string): 0x20, 32, "abcdabcdabcdabcdabcdabcdabcdabcd" -> 0x20, 0x42, 0x6162636461626364616263646162636461626364616263646162636461626364, 0x6162636465666768616263646566676861626364656667686162636465666768, 44047497324925121336511606693520958599579173549109180625971642598225011015680
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
index 92b62f5647..ce594b6a5a 100644
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_nested.sol
@@ -3,6 +3,5 @@ contract C {
         return string.concat(string.concat(a, b), c);
     }
 }
-// ====
 // ----
 // f(string,string,string): 0x60, 0x60, 0x60, 2, "ab" -> 0x20, 6, "ababab"
diff --git a/test/libsolidity/semanticTests/strings/constant_string_literal.sol b/test/libsolidity/semanticTests/strings/constant_string_literal.sol
index 1efa60760e..817a9081f9 100644
--- a/test/libsolidity/semanticTests/strings/constant_string_literal.sol
+++ b/test/libsolidity/semanticTests/strings/constant_string_literal.sol
@@ -14,7 +14,6 @@ contract Test {
         return 2;
     }
 }
-// ====
 // ----
 // b() -> 0x6162636465666768696a6b6c6d6e6f7071000000000000000000000000000000
 // x() -> 0x20, 0x35, 0x616265666768696a6b6c6d6e6f70716162636465666768696a6b6c6d6e6f7071, 44048183304486788312148433451363384677562177293131179093971701692629931524096
diff --git a/test/libsolidity/semanticTests/strings/empty_string_input.sol b/test/libsolidity/semanticTests/strings/empty_string_input.sol
index 85c7a44a1a..bd9fbc85fd 100644
--- a/test/libsolidity/semanticTests/strings/empty_string_input.sol
+++ b/test/libsolidity/semanticTests/strings/empty_string_input.sol
@@ -16,7 +16,6 @@ contract C {
         return (msg1, "", v);
     }
 }
-// ====
 // ----
 // f() -> 0x20, 0
 // g(string): 0x20, 0, "" -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol
index 4aef7a593e..4251444033 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_nested_structs.sol
@@ -41,7 +41,6 @@ contract C {
         return (p, m.p1, m.a[0][0], m.a[1][1], m.p2);
     }
 }
-// ====
 // ----
 // f((uint128,(uint128,uint256[][2],uint32)),uint32): 0x40, 44, 11, 0x40, 22, 0x60, 33, 0x40, 0x40, 2, 1, 2 -> 44, 22, 1, 2, 33
 // g(((uint128,uint256[][2],uint32)[2])): 0x20, 0x20, 0x40, 0x40, 22, 0x60, 33, 0x40, 0x40, 2, 1, 2 -> 22, 1, 2, 33
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
index 86ad706781..144df2d616 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
@@ -16,6 +16,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(uint256,(uint256,uint256),uint256): 1, 2, 3, 4 -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
index ca780bfb39..34d2bf4766 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member.sol
@@ -19,6 +19,5 @@ contract C {
         c = s.c;
     }
 }
-// ====
 // ----
 // f((uint256,uint256[2],uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol
index e4dc8f6f37..35d51d7b4e 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_argument_of_lib_function.sol
@@ -22,7 +22,6 @@ contract C {
         return L.f(c, p);
     }
 }
-// ====
 // ----
 // library: L
 // f((uint128,(uint128,uint256[][2],uint32)),uint32): 0x40, 44, 11, 0x40, 22, 0x60, 33, 0x40, 0x40, 2, 1, 2 -> 44, 22, 1, 2, 33
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol
index bf75ba1e1c..c43e6fb18f 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_as_memory_argument.sol
@@ -17,6 +17,5 @@ contract C {
         return g(p1, c);
     }
 }
-// ====
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 78, 1, 2, 88
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol
index f22bc6deb1..cc52880589 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member.sol
@@ -22,6 +22,5 @@ contract C {
         c = s1.c;
     }
 }
-// ====
 // ----
 // f((uint256,(uint64,uint64),uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol
index 83047c2571..7c84a096f6 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_struct_member_dynamic.sol
@@ -22,6 +22,5 @@ contract C {
         c = s1.c;
     }
 }
-// ====
 // ----
 // f((uint256,(uint64,bytes),uint256)): 0x20, 42, 0x60, 23, 1, 0x40, 2, "ab" -> 42, 1, "a", 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol
index f18280fc70..5161798040 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory_tuple_assignment.sol
@@ -16,6 +16,5 @@ contract C {
         return (p2, m.p1, m.a[0][0], m.a[1][1], m.p2);
     }
 }
-// ====
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 78, 1, 2, 88
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
index fe15155842..7ae085dbb5 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f((uint256,uint256[2],uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
index 8fab357368..0adc4c5a7b 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
@@ -17,6 +17,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f((uint256,bytes,uint256)): 0x20, 42, 0x60, 23, 2, "ab" -> 42, "a", "b", 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol
index 8c0f552b69..b3c7f4695e 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_memory.sol
@@ -17,6 +17,5 @@ contract C {
         return (p1, s.p1, s.a[0][0], s.a[1][1], s.p2);
     }
 }
-// ====
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 78, 1, 2, 88
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
index 94267dc792..1a0214a5db 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
@@ -14,7 +14,6 @@ contract C {
         return (p1, s.p1, s.a[0][0], s.a[1][1], s.p2);
     }
 }
-// ====
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
 // gas irOptimized: 203299
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
index 089b7c37e2..e651103669 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
@@ -21,7 +21,6 @@ contract CopyTest {
         return (memoryTree.children.length, memoryTree.children[0].children.length, memoryTree.children[1].children.length);
     }
 }
-// ====
 // ----
 // run() -> 2, 23, 42
 // gas irOptimized: 194003
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol
index 57538e392e..d14bff9696 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory_complex.sol
@@ -46,6 +46,5 @@ contract CopyTest {
         return result;
     }
 }
-// ====
 // ----
 // run() -> 0x20, 10, 0x42, 0x4200, 0x420000, 0x420001, 0x420002, 0x4201, 0x420100, 0x420101, 0x420102, 0x420103
diff --git a/test/libsolidity/semanticTests/structs/copy_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_from_storage.sol
index 2f2ffcf60f..b3d7304534 100644
--- a/test/libsolidity/semanticTests/structs/copy_from_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_from_storage.sol
@@ -18,6 +18,5 @@ contract C {
         return sMemory;
     }
 }
-// ====
 // ----
 // f() -> 0x20, 1, 13
diff --git a/test/libsolidity/semanticTests/structs/delete_struct.sol b/test/libsolidity/semanticTests/structs/delete_struct.sol
index 5ea9a712b2..39a1cf429c 100644
--- a/test/libsolidity/semanticTests/structs/delete_struct.sol
+++ b/test/libsolidity/semanticTests/structs/delete_struct.sol
@@ -38,7 +38,6 @@ contract test {
         return str.nstr.nestedMapping[index];
     }
 }
-// ====
 // ----
 // getToDelete() -> 0
 // getTopValue() -> 0
diff --git a/test/libsolidity/semanticTests/structs/event.sol b/test/libsolidity/semanticTests/structs/event.sol
index 8ddc5ef0ca..5a96c7cfa5 100644
--- a/test/libsolidity/semanticTests/structs/event.sol
+++ b/test/libsolidity/semanticTests/structs/event.sol
@@ -10,7 +10,6 @@ contract C {
         L.o();
     }
 }
-// ====
 // ----
 // library: L
 // f() ->
diff --git a/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol b/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
index 263ad03a54..d88797d57f 100644
--- a/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
+++ b/test/libsolidity/semanticTests/structs/msg_data_to_struct_member_copy.sol
@@ -35,7 +35,6 @@ contract C {
     }
 
 }
-// ====
 // ----
 // f() -> 0x20, 0x20, 4, 0x26121ff000000000000000000000000000000000000000000000000000000000
 // g() -> 0x20, 0x20, 4, 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol b/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
index 0c5bd7a08d..3336b30b1c 100644
--- a/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
+++ b/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
@@ -18,6 +18,5 @@ contract C {
 
 
 
-// ====
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol b/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
index 97c2822115..741b55f3f0 100644
--- a/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
+++ b/test/libsolidity/semanticTests/structs/packed_storage_structs_delete.sol
@@ -20,7 +20,6 @@ contract C {
         return 1;
     }
 }
-// ====
 // ----
 // test() -> 1
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/structs/recursive_struct_2.sol b/test/libsolidity/semanticTests/structs/recursive_struct_2.sol
index 50cc311f5d..65cfcf2094 100644
--- a/test/libsolidity/semanticTests/structs/recursive_struct_2.sol
+++ b/test/libsolidity/semanticTests/structs/recursive_struct_2.sol
@@ -20,6 +20,5 @@ contract C {
        assembly { a := sload(s.slot) b := sload(slot1) c := sload(slot2) d := sload(slot3) }
     }
 }
-// ====
 // ----
 // f() -> 0, 0, 0, 0
diff --git a/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol b/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol
index f936417517..7ce22e45aa 100644
--- a/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol
+++ b/test/libsolidity/semanticTests/structs/struct_constructor_nested.sol
@@ -26,6 +26,5 @@ contract C {
         x2 = s.s3.x2;
     }
 }
-// ====
 // ----
 // get() -> 0x01, 0x00, 0x09, 0x00, 0x04, 0x05
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index ef0e9287d9..fbfeb990a1 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -20,7 +20,6 @@ contract c {
         return data1.data[i];
     }
 }
-// ====
 // ----
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index 1655324e53..5a47b9807a 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -34,7 +34,6 @@ contract c {
     }
 }
 
-// ====
 // ----
 // set(uint256): 7 -> true
 // gas irOptimized: 110051
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index 347b65cf16..9fbe3eaafd 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -40,7 +40,6 @@ contract C {
         assert(s.b == 2);
     }
 }
-// ====
 // ----
 // f() ->
 // gas irOptimized: 121619
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol b/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
index bdd435b20e..b5c8a2cfa6 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
@@ -14,6 +14,5 @@ contract test {
     }
 }
 
-// ====
 // ----
 // deleteIt() -> 0
diff --git a/test/libsolidity/semanticTests/structs/struct_reference.sol b/test/libsolidity/semanticTests/structs/struct_reference.sol
index feae7b01e2..79eeccbe71 100644
--- a/test/libsolidity/semanticTests/structs/struct_reference.sol
+++ b/test/libsolidity/semanticTests/structs/struct_reference.sol
@@ -18,7 +18,6 @@ contract test {
         inner.recursive[0].z = inner.recursive[1].z + 1;
     }
 }
-// ====
 // ----
 // check() -> false
 // set() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol b/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol
index 11d87adf14..d427761894 100644
--- a/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol
+++ b/test/libsolidity/semanticTests/structs/struct_storage_push_zero_value.sol
@@ -22,6 +22,5 @@ contract C {
         assert(a == 17);
     }
 }
-// ====
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol b/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol
index 9ae412fcad..b77c696b4c 100644
--- a/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/struct_storage_to_mapping.sol
@@ -11,6 +11,5 @@ contract C {
         return m[1].a == 12;
     }
 }
-// ====
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index ed04ba2dbd..37411af73a 100644
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ b/test/libsolidity/semanticTests/structs/structs.sol
@@ -27,7 +27,6 @@ contract test {
         data.recursive[4].z = 9;
     }
 }
-// ====
 // ----
 // check() -> false
 // set() ->
diff --git a/test/libsolidity/semanticTests/tryCatch/assert.sol b/test/libsolidity/semanticTests/tryCatch/assert.sol
index f70760028d..8b6a7b9969 100644
--- a/test/libsolidity/semanticTests/tryCatch/assert.sol
+++ b/test/libsolidity/semanticTests/tryCatch/assert.sol
@@ -11,7 +11,6 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/tryCatch/return_function.sol b/test/libsolidity/semanticTests/tryCatch/return_function.sol
index 2e85942dd0..82d5dc8212 100644
--- a/test/libsolidity/semanticTests/tryCatch/return_function.sol
+++ b/test/libsolidity/semanticTests/tryCatch/return_function.sol
@@ -13,6 +13,5 @@ contract C {
     }
     function fun() public pure {}
 }
-// ====
 // ----
 // f() -> 0x1, 0xfdd67305928fcac8d213d1e47bfa6165cd0b87b946644cd0000000000000000, 9
diff --git a/test/libsolidity/semanticTests/tryCatch/trivial.sol b/test/libsolidity/semanticTests/tryCatch/trivial.sol
index a69a51f449..d43477e994 100644
--- a/test/libsolidity/semanticTests/tryCatch/trivial.sol
+++ b/test/libsolidity/semanticTests/tryCatch/trivial.sol
@@ -11,7 +11,6 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol b/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol
index f431f2d833..6a41ddbe9f 100644
--- a/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol
+++ b/test/libsolidity/semanticTests/types/array_mapping_abstract_constructor_param.sol
@@ -11,7 +11,6 @@ contract C is A {
 	constructor() A(m[1]) {
 	}
 }
-// ====
 // ----
 // m(uint256,uint256,uint256): 0, 0, 0 -> FAILURE
 // m(uint256,uint256,uint256): 1, 0, 1 -> 2
diff --git a/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol b/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
index 1b499d542c..ef092f3ea6 100644
--- a/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
+++ b/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
@@ -20,7 +20,6 @@ contract C {
 	}
 }
 
-// ====
 // ----
 // library: L
 // testAB() -> true
diff --git a/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol b/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol
index caf587b53b..e9ff60d5c2 100644
--- a/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol
+++ b/test/libsolidity/semanticTests/types/mapping_abstract_constructor_param.sol
@@ -10,7 +10,6 @@ contract C is A {
     constructor() A(m) {
     }
 }
-// ====
 // ----
 // m(uint256): 1 -> 0
 // m(uint256): 5 -> 20
diff --git a/test/libsolidity/semanticTests/types/mapping_contract_key.sol b/test/libsolidity/semanticTests/types/mapping_contract_key.sol
index bf424e7a4e..401776ffa8 100644
--- a/test/libsolidity/semanticTests/types/mapping_contract_key.sol
+++ b/test/libsolidity/semanticTests/types/mapping_contract_key.sol
@@ -8,7 +8,6 @@ contract test {
         table[k] = v;
     }
 }
-// ====
 // ----
 // get(address): 0 -> 0
 // get(address): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol b/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol
index d71642d87f..ee916a63d7 100644
--- a/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol
+++ b/test/libsolidity/semanticTests/types/mapping_contract_key_getter.sol
@@ -8,7 +8,6 @@ contract test {
         return this.table(k);
     }
 }
-// ====
 // ----
 // table(address): 0 -> 0
 // table(address): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol b/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol
index dbf0fcede1..bedb605c17 100644
--- a/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol
+++ b/test/libsolidity/semanticTests/types/mapping_contract_key_library.sol
@@ -16,7 +16,6 @@ contract test {
         L.set(table, k, v);
     }
 }
-// ====
 // ----
 // library: L
 // get(address): 0 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol b/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol
index 7e2302d0fe..cd252a3a5e 100644
--- a/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol
+++ b/test/libsolidity/semanticTests/types/mapping_enum_key_getter_v2.sol
@@ -9,7 +9,6 @@ contract test {
         return this.table(k);
     }
 }
-// ====
 // ----
 // table(uint8): 0 -> 0
 // table(uint8): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/types/mapping_simple.sol b/test/libsolidity/semanticTests/types/mapping_simple.sol
index a3a77d4d15..4da4c5b102 100644
--- a/test/libsolidity/semanticTests/types/mapping_simple.sol
+++ b/test/libsolidity/semanticTests/types/mapping_simple.sol
@@ -7,7 +7,6 @@ contract test {
         table[k] = v;
     }
 }
-// ====
 // ----
 // get(uint8): 0 -> 0
 // get(uint8): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol b/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol
index 6a6b271246..2040df1dd1 100644
--- a/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol
+++ b/test/libsolidity/semanticTests/types/struct_mapping_abstract_constructor_param.sol
@@ -18,7 +18,6 @@ contract C is A {
 		return m[a].m[b];
 	}
 }
-// ====
 // ----
 // getM(uint256,uint256): 0, 0 -> 0
 // getM(uint256,uint256): 1, 5 -> 0x10
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol b/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol
index 2e7933ad8c..67e6107a6d 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/assembly_access_bytes2_abicoder_v2.sol
@@ -24,7 +24,6 @@ contract C {
     }
 
 }
-// ====
 // ----
 // f(bytes2): "ab" -> 0x6162000000000000000000000000000000000000000000000000000000000000
 // g(bytes2): "ab" -> 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index e41a337749..4f7faea5ba 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -47,7 +47,6 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // test_f() -> true
 // gas irOptimized: 122329
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
index 88c27d58e0..c3d58811ae 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata_to_storage.sol
@@ -20,7 +20,6 @@ contract C {
         return l;
     }
 }
-// ====
 // ----
 // s() -> 0, 0, 0x00, 0
 // f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol b/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
index 0ee953f0b1..cc5304ed75 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
@@ -34,7 +34,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // ret() -> 0xff
 // f(uint8): 0x1ff -> FAILURE
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/constant.sol b/test/libsolidity/semanticTests/userDefinedValueType/constant.sol
index 6411e174e2..a1e587522f 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/constant.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/constant.sol
@@ -5,7 +5,6 @@ contract C {
   T constant public t = s;
   int224 constant public u = T.unwrap(t);
 }
-// ====
 // ----
 // s() -> 165521356710917456517261742455526507355687727119203895813322792776
 // t() -> 165521356710917456517261742455526507355687727119203895813322792776
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol b/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
index 6229861ff3..bcdc9440e9 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
@@ -28,7 +28,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(uint256): 1 -> 1
 // f(uint256): 2 -> 2
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol b/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol
index ccdcd97964..4936ba8085 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/dirty_slot.sol
@@ -20,7 +20,6 @@ contract C {
         return MyBytes2.unwrap(b)[index];
     }
 }
-// ====
 // ----
 // a() -> 13
 // b() -> 0x0401000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol b/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol
index c194dc45ca..a5a51461b1 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/dirty_uint8_read.sol
@@ -18,7 +18,6 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // x() -> -5
 // create_dirty_slot() ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index b4350c43c4..1d2f6bc9d2 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -110,7 +110,6 @@ contract ERC20 {
         _approve(account, msg.sender, _allowances[account][msg.sender].sub(value));
     }
 }
-// ====
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol b/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol
index 15253d24d4..4afd48087f 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/fixedpoint.sol
@@ -40,7 +40,6 @@ contract TestFixedMath {
         return FixedMath.toUFixed256x18(a);
     }
 }
-// ====
 // ----
 // add(uint256,uint256): 0, 0 -> 0
 // add(uint256,uint256): 25, 45 -> 0x46
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol b/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol
index 74fe6ee406..ec017a9828 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/immutable_signed.sol
@@ -14,7 +14,6 @@ contract C {
     }
     function g() internal pure returns (uint) { return 2; }
 }
-// ====
 // ----
 // direct() -> -2, 0x6162000000000000000000000000000000000000000000000000000000000000
 // viaasm() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 0x6162000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol b/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol
index 24fdb765bc..1b64dbceea 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/in_parenthesis.sol
@@ -7,6 +7,5 @@ contract C {
         b = (MyInt).unwrap((MyInt).wrap(10));
     }
 }
-// ====
 // ----
 // f() -> 5, 10
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol b/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol
index ebdc4c0dd3..f209c7a42e 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/mapping_key.sol
@@ -8,7 +8,6 @@ contract C {
         m[MyInt.wrap(key)] = value;
     }
 }
-// ====
 // ----
 // set(int256,int256): 1, 1 ->
 // m(int256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
index 60bb81737c..db745dce31 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/memory_to_storage.sol
@@ -20,7 +20,6 @@ contract C {
         return l;
     }
 }
-// ====
 // ----
 // s() -> 0, 0, 0x00, 0
 // f((uint8,uint16,bytes2,uint8)): 1, 0xff, "ab", 15 ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol b/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol
index c7db5dead0..d30c73605d 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/multisource.sol
@@ -7,7 +7,6 @@ contract A {
     function f(int x) external view returns(MyInt) { return MyInt.wrap(x); }
     function f(address x) external view returns(OurAddress) { return OurAddress.wrap(x); }
 }
-// ====
 // ----
 // f(int256): 5 -> 5
 // f(address): 1 -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol b/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol
index 6823eec1d4..5f107ce15f 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/multisource_module.sol
@@ -6,7 +6,6 @@ contract C {
   function f(int x) public pure returns (M.MyInt) { return M.MyInt.wrap(x); }
   function g(M.MyInt x) public pure returns (int) { return M.MyInt.unwrap(x); }
 }
-// ====
 // ----
 // f(int256): 5 -> 5
 // g(int256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol b/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol
index cb0f01bf87..3c9787fdc3 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/ownable.sol
@@ -21,7 +21,6 @@ contract Ownable {
         owner = Owner.wrap(address(0));
     }
 }
-// ====
 // ----
 // owner() -> 0x1212121212121212121212121212120000000012
 // setOwner(address): 0x1212121212121212121212121212120000000012 ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol b/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol
index 270d024283..bbabc1dd61 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/parameter.sol
@@ -22,7 +22,6 @@ contract C {
     }
 
 }
-// ====
 // ----
 // id(address): 5 -> 5
 // id(address): 0xffffffffffffffffffffffffffffffffffffffff -> 0xffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/simple.sol b/test/libsolidity/semanticTests/userDefinedValueType/simple.sol
index be9afe4d3c..e2c23c4f66 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/simple.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/simple.sol
@@ -7,7 +7,6 @@ contract C {
         c = MyInt.wrap(1);
     }
 }
-// ====
 // ----
 // f() -> 0
 // g() -> 1, 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol
index 58a0347e5f..284b41225a 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout.sol
@@ -62,7 +62,6 @@ contract C {
     }
 
 }
-// ====
 // ----
 // storage_a() -> 0, 0
 // storage_b() -> 0, 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
index c3e86b5e75..ee63c185d3 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
@@ -151,7 +151,6 @@ contract C {
    }
 }
 
-// ====
 // ----
 // storage_a() -> 0, 0
 // set_a(int64,int64): 100, 200 ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol b/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol
index d7380142ea..813931e02f 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/storage_signed.sol
@@ -23,7 +23,6 @@ contract C {
         assembly { x := st }
     }
 }
-// ====
 // ----
 // a() -> -2
 // direct() -> -2
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol b/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol
index 17e42d728e..117e0dd849 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap.sol
@@ -5,6 +5,5 @@ contract C {
         MyAddress.unwrap;
     }
 }
-// ====
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol b/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol
index fde37f5718..1da734fae1 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/wrap_unwrap_via_contract_name.sol
@@ -15,7 +15,6 @@ contract D {
         return g(f(x));
     }
 }
-// ====
 // ----
 // f(uint256): 0x42 -> 0x42
 // g(uint256): 0x42 -> 0x42
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
index e01c34b4f8..1c3b66b28d 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
@@ -16,7 +16,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // getX() -> 0
 // gas irOptimized: 23379
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
index e0d0e236dd..55e38689fc 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // getX() -> 0
 // gas irOptimized: 23379
diff --git a/test/libsolidity/semanticTests/using/calldata_memory_copy.sol b/test/libsolidity/semanticTests/using/calldata_memory_copy.sol
index c96f9b2322..a9b99dd346 100644
--- a/test/libsolidity/semanticTests/using/calldata_memory_copy.sol
+++ b/test/libsolidity/semanticTests/using/calldata_memory_copy.sol
@@ -13,6 +13,5 @@ function sum(uint[] memory arr) returns (uint result) {
 
 using {sum} for uint[];
 
-// ====
 // ----
 // f(uint256[]): 0x20, 3, 1, 2, 8 -> 11
diff --git a/test/libsolidity/semanticTests/using/free_function_braces.sol b/test/libsolidity/semanticTests/using/free_function_braces.sol
index 6ea8be2978..897914b9bc 100644
--- a/test/libsolidity/semanticTests/using/free_function_braces.sol
+++ b/test/libsolidity/semanticTests/using/free_function_braces.sol
@@ -17,7 +17,6 @@ contract C {
 
     using {id, zero} for uint;
 }
-// ====
 // ----
 // f(uint256): 10 -> 10
 // g(uint256): 10 -> 0
diff --git a/test/libsolidity/semanticTests/using/free_function_multi.sol b/test/libsolidity/semanticTests/using/free_function_multi.sol
index c40ba9b334..feec1beb39 100644
--- a/test/libsolidity/semanticTests/using/free_function_multi.sol
+++ b/test/libsolidity/semanticTests/using/free_function_multi.sol
@@ -18,7 +18,6 @@ function zero(uint) pure returns (uint) {
     return 0;
 }
 
-// ====
 // ----
 // f(uint256): 10 -> 10
 // g(uint256): 10 -> 0
diff --git a/test/libsolidity/semanticTests/using/free_functions_individual.sol b/test/libsolidity/semanticTests/using/free_functions_individual.sol
index 2033291cbc..170eae4d0f 100644
--- a/test/libsolidity/semanticTests/using/free_functions_individual.sol
+++ b/test/libsolidity/semanticTests/using/free_functions_individual.sol
@@ -21,7 +21,6 @@ function zero(uint) pure returns (uint) {
 }
 
 
-// ====
 // ----
 // f(uint256): 10 -> 10
 // g(uint256): 10 -> 0
diff --git a/test/libsolidity/semanticTests/using/imported_functions.sol b/test/libsolidity/semanticTests/using/imported_functions.sol
index 0ed92fd2ff..60a801ba34 100644
--- a/test/libsolidity/semanticTests/using/imported_functions.sol
+++ b/test/libsolidity/semanticTests/using/imported_functions.sol
@@ -12,7 +12,6 @@ contract C {
 using {A.inc, f} for uint;
 import {inc as f} from "A";
 import "A" as A;
-// ====
 // ----
 // f(uint256): 5 -> 12
 // f(uint256): 10 -> 0x16
diff --git a/test/libsolidity/semanticTests/using/library_on_interface.sol b/test/libsolidity/semanticTests/using/library_on_interface.sol
index 5e49e3f196..48553c218d 100644
--- a/test/libsolidity/semanticTests/using/library_on_interface.sol
+++ b/test/libsolidity/semanticTests/using/library_on_interface.sol
@@ -12,6 +12,5 @@ contract C is I {
     }
     function f() public pure returns (uint) { return 7; }
 }
-// ====
 // ----
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/using/library_through_module.sol b/test/libsolidity/semanticTests/using/library_through_module.sol
index 73fb60ae14..cb33613cb1 100644
--- a/test/libsolidity/semanticTests/using/library_through_module.sol
+++ b/test/libsolidity/semanticTests/using/library_through_module.sol
@@ -24,7 +24,6 @@ contract C {
 
 import "A" as M;
 
-// ====
 // ----
 // library: "A":L
 // f(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/using/module_renamed.sol b/test/libsolidity/semanticTests/using/module_renamed.sol
index 4317d434cc..427e220ffa 100644
--- a/test/libsolidity/semanticTests/using/module_renamed.sol
+++ b/test/libsolidity/semanticTests/using/module_renamed.sol
@@ -20,6 +20,5 @@ using {M.g, M.f} for uint;
 
 import "B" as M;
 
-// ====
 // ----
 // test(uint256,uint256): 1, 1 -> 9, 3
diff --git a/test/libsolidity/semanticTests/using/recursive_import.sol b/test/libsolidity/semanticTests/using/recursive_import.sol
index 5b4d0f9582..6c8962598b 100644
--- a/test/libsolidity/semanticTests/using/recursive_import.sol
+++ b/test/libsolidity/semanticTests/using/recursive_import.sol
@@ -19,6 +19,5 @@ contract C {
         return cr().f().g();
     }
 }
-// ====
 // ----
 // f() -> 11
diff --git a/test/libsolidity/semanticTests/using/using_global_all_the_types.sol b/test/libsolidity/semanticTests/using/using_global_all_the_types.sol
index 801132754b..f19c0c0fbd 100644
--- a/test/libsolidity/semanticTests/using/using_global_all_the_types.sol
+++ b/test/libsolidity/semanticTests/using/using_global_all_the_types.sol
@@ -32,6 +32,5 @@ contract C {
 
 import {E, S, T} from "A";
 
-// ====
 // ----
 // f() -> 1, 7, 9
diff --git a/test/libsolidity/semanticTests/using/using_global_for_global.sol b/test/libsolidity/semanticTests/using/using_global_for_global.sol
index ced0c9e778..77bbb896fa 100644
--- a/test/libsolidity/semanticTests/using/using_global_for_global.sol
+++ b/test/libsolidity/semanticTests/using/using_global_for_global.sol
@@ -14,6 +14,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(uint256): 100 -> 111
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/using/using_global_invisible.sol b/test/libsolidity/semanticTests/using/using_global_invisible.sol
index b0a712f711..820fdb40c8 100644
--- a/test/libsolidity/semanticTests/using/using_global_invisible.sol
+++ b/test/libsolidity/semanticTests/using/using_global_invisible.sol
@@ -37,7 +37,6 @@ contract D {
         return c.f().inc().inc().dec().unwrap();
     }
 }
-// ====
 // ----
 // library: "A":L
 // test() -> 3
diff --git a/test/libsolidity/semanticTests/using/using_global_library.sol b/test/libsolidity/semanticTests/using/using_global_library.sol
index 3ac410b916..f18024f378 100644
--- a/test/libsolidity/semanticTests/using/using_global_library.sol
+++ b/test/libsolidity/semanticTests/using/using_global_library.sol
@@ -20,7 +20,6 @@ contract C {
 
 import {T} from "A";
 
-// ====
 // ----
 // library: "A":L
 // f() -> 2, 1
diff --git a/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol b/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol
index 6d8aa2f40f..b993858238 100644
--- a/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol
+++ b/test/libsolidity/semanticTests/variables/mapping_local_assignment.sol
@@ -11,6 +11,5 @@ contract test {
         return (m1[1], m1[2], m2[1], m2[2]);
     }
 }
-// ====
 // ----
 // f() -> 42, 0, 0, 21
diff --git a/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol b/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol
index 399812cede..df3ee2f547 100644
--- a/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol
+++ b/test/libsolidity/semanticTests/variables/mapping_local_compound_assignment.sol
@@ -10,6 +10,5 @@ contract test {
         return (m1[1], m1[2], m2[1], m2[2]);
     }
 }
-// ====
 // ----
 // f() -> 42, 0, 0, 21
diff --git a/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol b/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol
index 7916c512b7..39dd04abbf 100644
--- a/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol
+++ b/test/libsolidity/semanticTests/variables/mapping_local_tuple_assignment.sol
@@ -12,6 +12,5 @@ contract test {
         return (m1[1], m1[2], m2[1], m2[2]);
     }
 }
-// ====
 // ----
 // f() -> 42, 0, 0, 21
diff --git a/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol b/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
index 34d672cb6c..5a3df6d214 100644
--- a/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
+++ b/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
@@ -18,7 +18,6 @@ contract X is A
 }
 
 
-// ====
 // ----
 // test(uint256): 0 -> 0, 64, 0
 // test(uint256): 42 -> 0, 64, 0
diff --git a/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol b/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol
index af8d26a1a9..7a4d362059 100644
--- a/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol
+++ b/test/libsolidity/semanticTests/variables/storing_invalid_boolean.sol
@@ -25,7 +25,6 @@ contract C {
         return 1;
     }
 }
-// ====
 // ----
 // set() -> 1
 // perm() -> true
diff --git a/test/libsolidity/semanticTests/various/address_code_complex.sol b/test/libsolidity/semanticTests/various/address_code_complex.sol
index 67d6ed14fc..f2d21c9069 100644
--- a/test/libsolidity/semanticTests/various/address_code_complex.sol
+++ b/test/libsolidity/semanticTests/various/address_code_complex.sol
@@ -12,7 +12,6 @@ contract C {
     function f() public returns (bytes memory) { return address(new A()).code; }
     function g() public returns (uint) { return address(new A()).code.length; }
 }
-// ====
 // ----
 // f() -> 0x20, 0x20, 0x48aa5566000000
 // g() -> 0x20
diff --git a/test/libsolidity/semanticTests/various/code_access_content.sol b/test/libsolidity/semanticTests/various/code_access_content.sol
index 696d862064..5ed7db5a37 100644
--- a/test/libsolidity/semanticTests/various/code_access_content.sol
+++ b/test/libsolidity/semanticTests/various/code_access_content.sol
@@ -36,7 +36,6 @@ contract C {
         return true;
     }
 }
-// ====
 // ----
 // testRuntime() -> true
 // gas legacy: 101579
diff --git a/test/libsolidity/semanticTests/various/code_access_create.sol b/test/libsolidity/semanticTests/various/code_access_create.sol
index d28ca453e4..ae38256519 100644
--- a/test/libsolidity/semanticTests/various/code_access_create.sol
+++ b/test/libsolidity/semanticTests/various/code_access_create.sol
@@ -22,7 +22,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test() -> 7
 // gas legacy: 102264
diff --git a/test/libsolidity/semanticTests/various/code_access_padding.sol b/test/libsolidity/semanticTests/various/code_access_padding.sol
index fab53bdac1..831d4bde4a 100644
--- a/test/libsolidity/semanticTests/various/code_access_padding.sol
+++ b/test/libsolidity/semanticTests/various/code_access_padding.sol
@@ -14,6 +14,5 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // diff() -> 0 # This checks that the allocation function pads to multiples of 32 bytes #
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index a3babc27db..6bf31268b0 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -32,7 +32,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
 // gas irOptimized: 240662
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index ebe63ba917..ea3afa6c42 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -93,7 +93,6 @@ contract ERC20 {
         _approve(account, msg.sender, _allowances[account][msg.sender] - value);
     }
 }
-// ====
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
diff --git a/test/libsolidity/semanticTests/various/external_types_in_calls.sol b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
index 8973130962..55c201513c 100644
--- a/test/libsolidity/semanticTests/various/external_types_in_calls.sol
+++ b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
@@ -23,7 +23,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // test() -> 9, 7
 // gas legacy: 129760
diff --git a/test/libsolidity/semanticTests/various/literal_empty_string.sol b/test/libsolidity/semanticTests/various/literal_empty_string.sol
index a02006fc94..bf4da54099 100644
--- a/test/libsolidity/semanticTests/various/literal_empty_string.sol
+++ b/test/libsolidity/semanticTests/various/literal_empty_string.sol
@@ -12,7 +12,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // x() -> 0
 // a() -> 0
diff --git a/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol b/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
index 4de0e7b193..595f88f545 100644
--- a/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
+++ b/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
@@ -23,6 +23,5 @@ contract C {
     }
 }
 
-// ====
 // ----
 // f((uint256,uint256,(uint256,uint256),uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index a783b1b0a4..e8ae454a2a 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -15,7 +15,6 @@ contract D {
     }
 }
 
-// ====
 // ----
 // constructor(), 27 wei ->
 // gas irOptimized: 175157
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types.sol
index bbcea2f4dc..186b162c25 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types.sol
@@ -10,6 +10,5 @@ contract C {
         return (a, b);
     }
 }
-// ====
 // ----
 // g() -> 7, 8
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol
index 19ea890965..75fdb1e8d8 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_static_arrays_with_dynamic_elements.sol
@@ -19,6 +19,5 @@ contract C {
         return (a, b);
     }
 }
-// ====
 // ----
 // g() -> 5, 6
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 22ae7de4f0..2e7c677a61 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -18,7 +18,6 @@ contract C {
     }
 }
 
-// ====
 // ----
 // g() -> 2, 6
 // gas irOptimized: 178805
diff --git a/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol b/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol
index bdec7e8a0e..df3f97ebfe 100644
--- a/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol
+++ b/test/libsolidity/semanticTests/various/storage_string_as_mapping_key_without_variable.sol
@@ -6,6 +6,5 @@ contract Test {
         return data["abc"];
     }
 }
-// ====
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/various/store_bytes.sol b/test/libsolidity/semanticTests/various/store_bytes.sol
index a1c9105339..4b92a251a0 100644
--- a/test/libsolidity/semanticTests/various/store_bytes.sol
+++ b/test/libsolidity/semanticTests/various/store_bytes.sol
@@ -8,7 +8,6 @@ contract C {
 
     bytes savedData;
 }
-// ====
 // ----
 // save() -> 24 # empty copy loop #
 // save(): "abcdefg" -> 24
diff --git a/test/libsolidity/semanticTests/various/tuples.sol b/test/libsolidity/semanticTests/various/tuples.sol
index fdad90424e..4580075954 100644
--- a/test/libsolidity/semanticTests/various/tuples.sol
+++ b/test/libsolidity/semanticTests/various/tuples.sol
@@ -25,6 +25,5 @@ contract C {
         if (a != 8 || b != 10) return 4;
     }
 }
-// ====
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 396a564b91..3ebb24108d 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -18,7 +18,6 @@ contract test {
     }
 }
 
-// ====
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 190275
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 4d4d4cfde8..f71cd6543d 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -17,7 +17,6 @@ contract test {
     }
 }
 
-// ====
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 191991
diff --git a/test/libsolidity/semanticTests/various/write_storage_external.sol b/test/libsolidity/semanticTests/various/write_storage_external.sol
index c05148bf9c..0bbe522484 100644
--- a/test/libsolidity/semanticTests/various/write_storage_external.sol
+++ b/test/libsolidity/semanticTests/various/write_storage_external.sol
@@ -34,7 +34,6 @@ contract D {
     }
 }
 
-// ====
 // ----
 // f() -> 3
 // g() -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol b/test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol
index 297ce20c91..9a4093c38a 100644
--- a/test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol
@@ -8,6 +8,5 @@ contract C {
 		return b[1];
 	}
 }
-// ====
 // ----
 // f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/viaYul/array_2d_new.sol b/test/libsolidity/semanticTests/viaYul/array_2d_new.sol
index 255ea71f71..13c0ac201c 100644
--- a/test/libsolidity/semanticTests/viaYul/array_2d_new.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_2d_new.sol
@@ -6,6 +6,5 @@ contract C {
 		return a[0][0] = n;
 	}
 }
-// ====
 // ----
 // f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol b/test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol
index 0984b22477..f987a17de2 100644
--- a/test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol
@@ -13,6 +13,5 @@ contract C {
 		return c[1];
 	}
 }
-// ====
 // ----
 // f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/viaYul/array_3d_new.sol b/test/libsolidity/semanticTests/viaYul/array_3d_new.sol
index 9f7b8e4e41..b4bb4e626f 100644
--- a/test/libsolidity/semanticTests/viaYul/array_3d_new.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_3d_new.sol
@@ -10,6 +10,5 @@ contract C {
 		return a[1][1][1] = n;
 	}
 }
-// ====
 // ----
 // f(uint256): 42 -> 42
diff --git a/test/libsolidity/semanticTests/viaYul/array_function_pointers.sol b/test/libsolidity/semanticTests/viaYul/array_function_pointers.sol
index 72e871d270..5d4707ec3c 100644
--- a/test/libsolidity/semanticTests/viaYul/array_function_pointers.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_function_pointers.sol
@@ -20,7 +20,6 @@ contract C {
 		arr[a][b]();
 	}
 }
-// ====
 // ----
 // f(uint256,uint256): 1823621, 12323 -> FAILURE # Out of gas #
 // f2(uint256,uint256,uint256,uint256): 18723921, 1823621, 123, 12323 -> FAILURE # Out of gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
index d3dc75b5cf..683eca9031 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
@@ -15,7 +15,6 @@ contract C {
 		return x[a][b];
 	}
 }
-// ====
 // ----
 // set(string,uint256,uint256,uint256,uint256): 0xa0, 2, 4, 0, 0, 32, "01234567890123456789012345678901" -> 0
 // set(string,uint256,uint256,uint256,uint256): 0xa0, 2, 4, 1, 3, 32, "01234567890123456789012345678901" -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol
index f182e58787..6113cfeefc 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol
@@ -13,7 +13,6 @@ contract C {
 		return x[m][0];
 	}
 }
-// ====
 // ----
 // set(string,uint256,uint256): 0x60, 2, 0, 32, "01234567890123456789012345678901" -> 0
 // set(string,uint256,uint256): 0x60, 2, 1, 32, "01234567890123456789012345678901" -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
index c435e3ca71..13af18a5e5 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
@@ -11,6 +11,5 @@ contract C {
 		map[s] = 0;
 	}
 }
-// ====
 // ----
 // set(string): 0x20, 32, "01234567890123456789012345678901" -> 0, 0, 0, 0, 0, 0xe0, 0, 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol
index 5acb3d7755..eddf0e720a 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol
@@ -13,6 +13,5 @@ contract C {
 		return x[2];
 	}
 }
-// ====
 // ----
 // set(string): 0x20, 32, "01234567890123456789012345678901" -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol
index 7bce701374..5eeaad7db5 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol
@@ -13,7 +13,6 @@ contract C {
 		return x[a];
 	}
 }
-// ====
 // ----
 // set(string,uint256,uint256): 0x60, 5, 0, 32, "01234567890123456789012345678901" -> 0
 // set(string,uint256,uint256): 0x60, 5, 1, 32, "01234567890123456789012345678901" -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol b/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
index a7705889d5..151fe08949 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
@@ -17,7 +17,6 @@ contract C {
 		return array[idx];
 	}
 }
-// ====
 // ----
 // test(uint256,uint256): 0, 0 -> FAILURE, hex"4e487b71", 0x32
 // test(uint256,uint256): 1, 0 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_create.sol b/test/libsolidity/semanticTests/viaYul/array_memory_create.sol
index 6b7d387f26..91e72bc9af 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_create.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_create.sol
@@ -5,7 +5,6 @@ contract C {
 		return array.length;
 	}
 }
-// ====
 // ----
 // create(uint256): 0 -> 0
 // create(uint256): 7 -> 7
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
index 755380d9d7..5b47191d6a 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
@@ -21,7 +21,6 @@ contract C {
 		return array[uint256(idx)];
 	}
 }
-// ====
 // ----
 // index(uint256): 0 -> true
 // index(uint256): 10 -> true
diff --git a/test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol b/test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol
index 4b639a0340..a7e5454bda 100644
--- a/test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol
@@ -10,7 +10,6 @@ contract C {
         return storageArray[a];
     }
 }
-// ====
 // ----
 // getLength() -> 0
 // test(uint256): 42 ->
diff --git a/test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol b/test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol
index c192d01ce4..b143c199ad 100644
--- a/test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol
@@ -10,7 +10,6 @@ contract C {
         return storageArray[a];
     }
 }
-// ====
 // ----
 // getLength() -> 0
 // test(uint256): 42 ->
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index 2608c4cc67..30e6c58166 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -13,7 +13,6 @@ contract C {
             require(storageArray[i] == i + 1);
     }
 }
-// ====
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
index db41a60abd..b3f84a061b 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
@@ -9,7 +9,6 @@ contract C {
         return storageArray[access];
     }
 }
-// ====
 // ----
 // test_boundary_check(uint256,uint256): 10, 11 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 10, 9 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index bd7fda8862..4780a099e8 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -49,7 +49,6 @@ contract C {
         }
     }
 }
-// ====
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
index c5a82254d4..007ee18529 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
@@ -6,7 +6,6 @@ contract C {
         return storageArray.length;
     }
 }
-// ====
 // ----
 // set_get_length(uint256): 0 -> 0
 // set_get_length(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
index e031be79c6..64605c0dfa 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
@@ -8,7 +8,6 @@ contract C {
         return storageArray.length;
     }
 }
-// ====
 // ----
 // set_get_length(uint256): 0 -> 0
 // set_get_length(uint256): 1 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_access.sol b/test/libsolidity/semanticTests/viaYul/calldata_array_access.sol
index 9ca62f8bc4..6dedc2a7fe 100644
--- a/test/libsolidity/semanticTests/viaYul/calldata_array_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/calldata_array_access.sol
@@ -7,7 +7,6 @@ contract C {
         return x[i][j];
     }
 }
-// ====
 // ----
 // f(uint256[],uint256): 0x40, 0, 0 -> FAILURE, hex"4e487b71", 0x32
 // f(uint256[],uint256): 0x40, 0, 1, 23 -> 23
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_length.sol b/test/libsolidity/semanticTests/viaYul/calldata_array_length.sol
index fa4fe30237..779d261a03 100644
--- a/test/libsolidity/semanticTests/viaYul/calldata_array_length.sol
+++ b/test/libsolidity/semanticTests/viaYul/calldata_array_length.sol
@@ -12,7 +12,6 @@ contract C {
         return x.length;
     }
 }
-// ====
 // ----
 // f(uint256[]): 0x20, 0 -> 0
 // f(uint256[]): 0x20, 1, 23 -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol b/test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol
index 320a0c506f..eb19897cc3 100644
--- a/test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol
+++ b/test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol
@@ -4,7 +4,6 @@ contract C {
         return uint8(a[0][i]);
     }
 }
-// ====
 // ----
 // f(bytes[],uint256): 0x40, 0, 1, 0x20, 2, hex"6162" -> 0x61
 // f(bytes[],uint256): 0x40, 1, 1, 0x20, 2, hex"6162" -> 0x62
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol
index a7d6def0ce..46d4492e98 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_string_bytes_calldata_cast.sol
@@ -5,6 +5,5 @@ contract C {
 		return string(test);
 	}
 }
-// ====
 // ----
 // f(string): 0x20, 3, "123" -> 0x20, 3, "123"
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol b/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
index 543d8c43c6..0d9eb6caee 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
@@ -15,7 +15,6 @@ contract C {
 		b = this.f;
 	}
 }
-// ====
 // ----
 // f(uint256): 2 -> 4
 // h(uint256): 2 -> 5
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index 5e899f50eb..7ccb700f83 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -19,7 +19,6 @@ contract C {
 		assert(externalCalled == 2);
 	}
 }
-// ====
 // ----
 // f() ->
 // gas irOptimized: 112992
diff --git a/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol b/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol
index 34af8e389e..ae6cff0e9b 100644
--- a/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol
+++ b/test/libsolidity/semanticTests/viaYul/empty_return_corrupted_free_memory_pointer.sol
@@ -3,6 +3,5 @@ contract C {
         assembly{ mstore(0x40, sub(0, 1)) }
     }
 }
-// ====
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/viaYul/keccak.sol b/test/libsolidity/semanticTests/viaYul/keccak.sol
index d0eb71ecdd..017d67c50f 100644
--- a/test/libsolidity/semanticTests/viaYul/keccak.sol
+++ b/test/libsolidity/semanticTests/viaYul/keccak.sol
@@ -7,7 +7,6 @@ contract C {
 		return keccak256(a);
     }
 }
-// ====
 // ----
 // keccak1() -> 0x64e604787cbf194841e7b68d7cd28786f6c9a0a3ab9f8b0a0e87cb4387ab0107
 // keccak2() -> 0x64e604787cbf194841e7b68d7cd28786f6c9a0a3ab9f8b0a0e87cb4387ab0107
diff --git a/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol b/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol
index 47dadd04d7..3064742747 100644
--- a/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol
+++ b/test/libsolidity/semanticTests/viaYul/mapping_enum_key_getter.sol
@@ -6,7 +6,6 @@ contract test {
         table[k] = v;
     }
 }
-// ====
 // ----
 // table(uint8): 0 -> 0
 // table(uint8): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/mapping_getters.sol b/test/libsolidity/semanticTests/viaYul/mapping_getters.sol
index edb3eabc63..a709bc168e 100644
--- a/test/libsolidity/semanticTests/viaYul/mapping_getters.sol
+++ b/test/libsolidity/semanticTests/viaYul/mapping_getters.sol
@@ -8,7 +8,6 @@ contract test {
         m2[k1][k2] = v;
     }
 }
-// ====
 // ----
 // m1(uint256): 0 -> 0
 // m1(uint256): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol b/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
index 15c7a3773d..8dcd767754 100644
--- a/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
+++ b/test/libsolidity/semanticTests/viaYul/mapping_string_key.sol
@@ -4,6 +4,5 @@ contract C {
 		map[s];
 	}
 }
-// ====
 // ----
 // set(string): 0x20, 32, "01234567890123456789012345678901" ->
diff --git a/test/libsolidity/semanticTests/viaYul/negation_bug.sol b/test/libsolidity/semanticTests/viaYul/negation_bug.sol
index 02819f33a7..d4d1b82ff1 100644
--- a/test/libsolidity/semanticTests/viaYul/negation_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/negation_bug.sol
@@ -7,6 +7,5 @@ contract C {
 		}
 	}
 }
-// ====
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol
index 3c7622e2eb..3f822cbbb9 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes_long.sol
@@ -14,6 +14,5 @@ contract C {
         correct = r == (0x66 << 248);
     }
 }
-// ====
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol
index c28c0ae4b2..e5d2c702ec 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_dynamic_array.sol
@@ -14,6 +14,5 @@ contract C {
         correct = (s[0] == 0x01) && (r == 0x01);
     }
 }
-// ====
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol
index e7569605ba..adcd09c7e0 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_struct.sol
@@ -17,6 +17,5 @@ contract C {
         correct = r == 0x01;
     }
 }
-// ====
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/mappings.sol b/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
index 4e1ebf0508..42b7fe8026 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/mappings.sol
@@ -28,7 +28,6 @@ contract C {
         b = twodim[2][3];
     }
 }
-// ====
 // ----
 // test_simple(uint256): 0 -> 3, 4, 5
 // test_simple(uint256): 1 -> 3, 4, 5
diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
index f3811fe6df..d8417e3e26 100644
--- a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
+++ b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
@@ -28,6 +28,5 @@ contract Derived is Base {
     }
 }
 
-// ====
 // ----
 // getA() -> 2

From 54c5b3de6833bd581f6a01cf7d8fa9bbbeab4329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 11 May 2022 19:02:56 +0200
Subject: [PATCH 0620/1748] Re-enable the optimized IR preset in all external
 tests

---
 test/externalTests/euler.sh           | 2 +-
 test/externalTests/perpetual-pools.sh | 2 +-
 test/externalTests/uniswap.sh         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 0d63ecd434..b4c5ade15f 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -49,7 +49,7 @@ function euler_test
         "${compile_only_presets[@]}"
         #ir-no-optimize           # Compilation fails with "YulException: Variable var_utilisation_307 is 6 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_utilisation_307 is 6 slot(s) too deep inside the stack."
-        #ir-optimize-evm+yul      # Compilation fails with "YulException: Variable var_status_mpos is 3 too deep in the stack"
+        ir-optimize-evm+yul
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
         legacy-no-optimize
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index 8f90ed0b4d..d17a81b157 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -47,7 +47,7 @@ function perpetual_pools_test
         "${compile_only_presets[@]}"
         #ir-no-optimize            # Compilation fails with "YulException: Variable var_amount_527 is 9 slot(s) too deep inside the stack."
         #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_amount_527 is 9 slot(s) too deep inside the stack."
-        #ir-optimize-evm+yul       # Compilation fails with "YulException: Variable expr_mpos is 1 too deep in the stack"
+        ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index efea480b6c..9672f9b068 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -47,7 +47,7 @@ function uniswap_test
         "${compile_only_presets[@]}"
         #ir-no-optimize           # Compilation fails with: "YulException: Variable ret_0 is 1 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # Compilation fails with: "YulException: Variable ret_0 is 1 slot(s) too deep inside the stack."
-        #ir-optimize-evm+yul      # Compilation fails with: "YulException: Variable var_slot0Start_mpos is 1 too deep in the stack"
+        ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul

From 2dee5dcfaeb41888d10eff3cb2a989ad2b786ea0 Mon Sep 17 00:00:00 2001
From: Samuel Osewa <osewaayomide4@gmail.com>
Date: Sun, 15 May 2022 14:35:15 +0100
Subject: [PATCH 0621/1748] Removed notes section

---
 docs/cheatsheet.rst | 29 -----------------------------
 1 file changed, 29 deletions(-)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index a7581aae57..eabf83931f 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -135,35 +135,6 @@ Global Variables
 - ``type(T).min`` (``T``): the minimum value representable by the integer type ``T``, see :ref:`Type Information<meta-type>`.
 - ``type(T).max`` (``T``): the maximum value representable by the integer type ``T``, see :ref:`Type Information<meta-type>`.
 
-.. note::
-    When contracts are evaluated off-chain rather than in context of a transaction included in a
-    block, you should not assume that ``block.*`` and ``tx.*`` refer to values from any specific
-    block or transaction. These values are provided by the EVM implementation that executes the
-    contract and can be arbitrary.
-
-.. note::
-    Do not rely on ``block.timestamp`` or ``blockhash`` as a source of randomness,
-    unless you know what you are doing.
-
-    Both the timestamp and the block hash can be influenced by miners to some degree.
-    Bad actors in the mining community can for example run a casino payout function on a chosen hash
-    and just retry a different hash if they did not receive any money.
-
-    The current block timestamp must be strictly larger than the timestamp of the last block,
-    but the only guarantee is that it will be somewhere between the timestamps of two
-    consecutive blocks in the canonical chain.
-
-.. note::
-    The block hashes are not available for all blocks for scalability reasons.
-    You can only access the hashes of the most recent 256 blocks, all other
-    values will be zero.
-
-.. note::
-    In version 0.5.0, the following aliases were removed: ``suicide`` as alias for ``selfdestruct``,
-    ``msg.gas`` as alias for ``gasleft``, ``block.blockhash`` as alias for ``blockhash`` and
-    ``sha3`` as alias for ``keccak256``.
-.. note::
-    In version 0.7.0, the alias ``now`` (for ``block.timestamp``) was removed.
 
 .. index:: visibility, public, private, external, internal
 

From 3f4d9cb035b6473eaabd24dd31aa46c836da2b62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 20 May 2022 15:40:17 +0200
Subject: [PATCH 0622/1748] Disable more external tests failing due to Hardhat
 heuristics

---
 test/externalTests/euler.sh           | 5 +++++
 test/externalTests/perpetual-pools.sh | 6 ++++++
 2 files changed, 11 insertions(+)

diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index b4c5ade15f..114a7d7817 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -61,6 +61,11 @@ function euler_test
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$ref_type" "$ref" "$DIR"
 
+    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
+    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    sed -i "/expectError: 'JUNK_UPGRADE_TEST_FAILURE'/d" test/moduleUpgrade.js
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index d17a81b157..c49c8371a0 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -59,6 +59,12 @@ function perpetual_pools_test
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$ref_type" "$ref" "$DIR"
 
+    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
+    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    sed -i 's|\(it\)\(("Should not allow commits that are too large"\)|\1.skip\2|g' test/PoolCommitter/commit.spec.ts
+    sed -i 's|\(it\)\(("Should not allow for too many commitments (that bring amount over a user'\''s balance)"\)|\1.skip\2|g' test/PoolCommitter/commit.spec.ts
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"

From 5575bb9d993b66b3d61dd1f418e61cfc183dfe04 Mon Sep 17 00:00:00 2001
From: Josep M Sobrepere <jm.sobrepere@gmail.com>
Date: Sat, 21 May 2022 23:28:18 +0200
Subject: [PATCH 0623/1748] nit: ABI docs use canonical representation

---
 docs/abi-spec.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 02e5f8b2a4..d67e85828a 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -308,7 +308,7 @@ In total:
 Use of Dynamic Types
 ====================
 
-A call to a function with the signature ``f(uint,uint32[],bytes10,bytes)`` with values
+A call to a function with the signature ``f(uint256,uint32[],bytes10,bytes)`` with values
 ``(0x123, [0x456, 0x789], "1234567890", "Hello, world!")`` is encoded in the following way:
 
 We take the first four bytes of ``sha3("f(uint256,uint32[],bytes10,bytes)")``, i.e. ``0x8be65246``.
@@ -348,7 +348,7 @@ All together, the encoding is (newline after function selector and each 32-bytes
       000000000000000000000000000000000000000000000000000000000000000d
       48656c6c6f2c20776f726c642100000000000000000000000000000000000000
 
-Let us apply the same principle to encode the data for a function with a signature ``g(uint[][],string[])``
+Let us apply the same principle to encode the data for a function with a signature ``g(uint256[][],string[])``
 with values ``([[1, 2], [3]], ["one", "two", "three"])`` but start from the most atomic parts of the encoding:
 
 First we encode the length and data of the first embedded dynamic array ``[1, 2]`` of the first root array ``[[1, 2], [3]]``:
@@ -417,7 +417,7 @@ thus ``e = 0x00000000000000000000000000000000000000000000000000000000000000e0``.
 
 
 Note that the encodings of the embedded elements of the root arrays are not dependent on each other
-and have the same encodings for a function with a signature ``g(string[],uint[][])``.
+and have the same encodings for a function with a signature ``g(string[],uint256[][])``.
 
 Then we encode the length of the first root array:
 

From d4c06d2b4eafdc50cf853b48dcf955ce7ad6c916 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Mon, 11 Apr 2022 12:50:20 +0530
Subject: [PATCH 0624/1748] Adding event and error selector fields on the lines
 of the function selector fields

---
 Changelog.md                                  |  2 +
 docs/contracts/events.rst                     | 10 ++++
 libsolidity/ast/AST.h                         |  2 +-
 libsolidity/ast/Types.cpp                     |  6 +++
 libsolidity/codegen/ExpressionCompiler.cpp    | 15 ++++--
 .../codegen/ir/IRGeneratorForStatements.cpp   | 15 +++++-
 .../semanticTests/error/error_selector.sol    | 48 +++++++++++++++++++
 .../semanticTests/events/event_selector.sol   | 47 ++++++++++++++++++
 .../semanticTests/events/simple.sol           | 17 +++++++
 .../errors/error_selector_syntax.sol          | 48 +++++++++++++++++++
 ...elector_library_called_inside_function.sol | 12 +++++
 ...red_outside_but_called_inside_function.sol | 13 +++++
 .../events/event_selector_syntax.sol          | 43 +++++++++++++++++
 13 files changed, 273 insertions(+), 5 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/error/error_selector.sol
 create mode 100644 test/libsolidity/semanticTests/events/event_selector.sol
 create mode 100644 test/libsolidity/semanticTests/events/simple.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_selector_syntax.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_selector_syntax.sol

diff --git a/Changelog.md b/Changelog.md
index e73633d702..f6bc9abf1e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,8 @@
 ### 0.8.15 (unreleased)
 
 Language Features:
+* General: Add `E.selector` for a non-anonymous event `E` to access the 32-byte selector topic.
+* General: Errors and Events allow qualified access from other contracts.
 
 
 Compiler Features:
diff --git a/docs/contracts/events.rst b/docs/contracts/events.rst
index 27df4dde16..2595527d10 100644
--- a/docs/contracts/events.rst
+++ b/docs/contracts/events.rst
@@ -73,6 +73,16 @@ four indexed arguments rather than three.
     In particular, it is possible to "fake" the signature of another event
     using an anonymous event.
 
+Members of Events
+=================
+
+- ``event.selector``: For non-anonymous events, this is a ``bytes32`` value
+  containing the ``keccak256`` hash of the event signature, as used in the default topic.
+
+
+Example
+=======
+
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 4eba73c5d8..7c6101bdd7 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -1216,7 +1216,7 @@ class EventDefinition: public CallableDeclaration, public StructurallyDocumented
 	FunctionTypePointer functionType(bool /*_internal*/) const override;
 
 	bool isVisibleInDerivedContracts() const override { return true; }
-	bool isVisibleViaContractTypeAccess() const override { return false; /* TODO */ }
+	bool isVisibleViaContractTypeAccess() const override { return true; }
 
 	EventDefinitionAnnotation& annotation() const override;
 
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index cedac68f32..48e4afa512 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -3335,6 +3335,12 @@ MemberList::MemberMap FunctionType::nativeMembers(ASTNode const* _scope) const
 	}
 	case Kind::Error:
 		return {{"selector", TypeProvider::fixedBytes(4)}};
+	case Kind::Event:
+	{
+		if (!(dynamic_cast<EventDefinition const&>(declaration()).isAnonymous()))
+			return {{"selector", TypeProvider::fixedBytes(32)}};
+		return MemberList::MemberMap();
+	}
 	default:
 		return MemberList::MemberMap();
 	}
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 36646ea212..95087aa02d 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1602,9 +1602,14 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 	{
 		if (functionType->hasDeclaration())
 		{
-			m_context << functionType->externalIdentifier();
-			/// need to store it as bytes4
-			utils().leftShiftNumberOnStack(224);
+			if (functionType->kind() == FunctionType::Kind::Event)
+				m_context << u256(h256::Arith(util::keccak256(functionType->externalSignature())));
+			else
+			{
+				m_context << functionType->externalIdentifier();
+				/// need to store it as bytes4
+				utils().leftShiftNumberOnStack(224);
+			}
 			return false;
 		}
 		else if (auto const* expr = dynamic_cast<MemberAccess const*>(&_memberAccess.expression()))
@@ -1775,9 +1780,13 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 		if (member == "selector")
 		{
 			auto const& functionType = dynamic_cast<FunctionType const&>(*_memberAccess.expression().annotation().type);
+			// all events should have already been caught by this stage
+			solAssert(!(functionType.kind() == FunctionType::Kind::Event));
+
 			if (functionType.kind() == FunctionType::Kind::External)
 				CompilerUtils(m_context).popStackSlots(functionType.sizeOnStack() - 2);
 			m_context << Instruction::SWAP1 << Instruction::POP;
+
 			/// need to store it as bytes4
 			utils().leftShiftNumberOnStack(224);
 		}
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 9e48c811c6..5eaeed743b 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1785,7 +1785,20 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 					functionType.declaration().isPartOfExternalInterface(),
 					""
 				);
-				define(IRVariable{_memberAccess}) << formatNumber(functionType.externalIdentifier() << 224) << "\n";
+				define(IRVariable{_memberAccess}) << formatNumber(
+					util::selectorFromSignature(functionType.externalSignature())
+				) << "\n";
+			}
+			else if (functionType.kind() == FunctionType::Kind::Event)
+			{
+				solAssert(functionType.hasDeclaration());
+				solAssert(functionType.kind() == FunctionType::Kind::Event);
+				solAssert(
+					!(dynamic_cast<EventDefinition const&>(functionType.declaration()).isAnonymous())
+				);
+				define(IRVariable{_memberAccess}) << formatNumber(
+					u256(h256::Arith(util::keccak256(functionType.externalSignature())))
+				) << "\n";
 			}
 			else
 				solAssert(false, "Invalid use of .selector: " + functionType.toString(false));
diff --git a/test/libsolidity/semanticTests/error/error_selector.sol b/test/libsolidity/semanticTests/error/error_selector.sol
new file mode 100644
index 0000000000..e7e40fd6ec
--- /dev/null
+++ b/test/libsolidity/semanticTests/error/error_selector.sol
@@ -0,0 +1,48 @@
+library L {
+    error E();
+}
+library S {
+    error E(uint);
+}
+library T {
+    error E();
+}
+
+error E();
+
+interface I {
+    error E();
+    function f() external pure;
+}
+
+contract D {
+    error F();
+}
+
+contract C is D {
+    function test1() public pure returns (bytes4, bytes4, bytes4, bytes4) {
+        assert(L.E.selector == T.E.selector);
+        assert(L.E.selector != S.E.selector);
+        assert(E.selector == L.E.selector);
+        assert(I.E.selector == L.E.selector);
+        return (L.E.selector, S.E.selector, E.selector, I.E.selector);
+    }
+
+    bytes4 s1 = L.E.selector;
+    bytes4 s2 = S.E.selector;
+    bytes4 s3 = T.E.selector;
+    bytes4 s4 = I.E.selector;
+    function test2() external returns (bytes4, bytes4, bytes4, bytes4) {
+        return (s1, s2, s3, s4);
+    }
+
+    function test3() external returns (bytes4) {
+        return (F.selector);
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// test1() -> 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x2ff06700000000000000000000000000000000000000000000000000000000, 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x92bbf6e800000000000000000000000000000000000000000000000000000000
+// test2() -> 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x2ff06700000000000000000000000000000000000000000000000000000000, 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x92bbf6e800000000000000000000000000000000000000000000000000000000
+// test3() -> 0x28811f5900000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_selector.sol b/test/libsolidity/semanticTests/events/event_selector.sol
new file mode 100644
index 0000000000..b6d9400935
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/event_selector.sol
@@ -0,0 +1,47 @@
+library L {
+    event E();
+}
+library S {
+    event E(uint);
+}
+library T {
+    event E();
+}
+interface I {
+    event E();
+}
+
+contract D {
+    event F();
+}
+
+contract C is D {
+    function test1() external pure returns (bytes32, bytes32, bytes32) {
+        assert(L.E.selector == T.E.selector);
+        assert(I.E.selector == L.E.selector);
+
+        assert(L.E.selector != S.E.selector);
+        assert(T.E.selector != S.E.selector);
+        assert(I.E.selector != S.E.selector);
+
+        return (L.E.selector, S.E.selector, I.E.selector);
+    }
+
+    bytes32 s1 = L.E.selector;
+    bytes32 s2 = S.E.selector;
+    bytes32 s3 = T.E.selector;
+    bytes32 s4 = I.E.selector;
+    function test2() external returns (bytes32, bytes32, bytes32, bytes32) {
+        return (s1, s2, s3, s4);
+    }
+
+    function test3() external returns (bytes32) {
+        return (F.selector);
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// test1() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
+// test2() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
+// test3() -> 0x28811f5935c16a099486acb976b3a6b4942950a1425a74e9eb3e9b7f7135e12a
diff --git a/test/libsolidity/semanticTests/events/simple.sol b/test/libsolidity/semanticTests/events/simple.sol
new file mode 100644
index 0000000000..7190de4137
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/simple.sol
@@ -0,0 +1,17 @@
+contract C {
+    event E();
+}
+
+contract Test {
+    event E(uint256, uint256);
+    function f() public {
+        emit C.E();
+        emit E(1,2);
+    }
+}
+// ====
+// compileViaYul: also
+// ----
+// f() ->
+// ~ emit E()
+// ~ emit E(uint256,uint256): 0x01, 0x02
diff --git a/test/libsolidity/syntaxTests/errors/error_selector_syntax.sol b/test/libsolidity/syntaxTests/errors/error_selector_syntax.sol
new file mode 100644
index 0000000000..ebd598cb2c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_selector_syntax.sol
@@ -0,0 +1,48 @@
+library L {
+    error E();
+}
+library S {
+    error E(uint);
+}
+library T {
+    error E();
+}
+
+error E();
+
+interface I {
+    error E();
+    function f() external pure;
+}
+
+contract D {
+    error F();
+}
+
+contract C is D {
+    function test1() public pure returns (bytes4, bytes4, bytes4, bytes4) {
+        assert(L.E.selector == T.E.selector);
+        assert(L.E.selector != S.E.selector);
+        assert(E.selector == L.E.selector);
+        assert(I.E.selector == L.E.selector);
+        return (L.E.selector, S.E.selector, E.selector, I.E.selector);
+    }
+
+    bytes4 s1 = L.E.selector;
+    bytes4 s2 = S.E.selector;
+    bytes4 s3 = T.E.selector;
+    bytes4 s4 = I.E.selector;
+
+    function test2() view external returns (bytes4, bytes4, bytes4, bytes4) {
+        return (s1, s2, s3, s4);
+    }
+
+    function test3() pure external returns (bytes4) {
+        return (F.selector);
+    }
+}
+// ----
+// Warning 2519: (16-26): This declaration shadows an existing declaration.
+// Warning 2519: (45-59): This declaration shadows an existing declaration.
+// Warning 2519: (78-88): This declaration shadows an existing declaration.
+// Warning 2519: (122-132): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol b/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
new file mode 100644
index 0000000000..49741a5ca9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
@@ -0,0 +1,12 @@
+library Y {
+    event E() anonymous;
+}
+
+contract D {
+    function test1() external pure returns (bytes32) {
+        return Y.E.selector;
+    }
+
+}
+// ----
+// TypeError 9582: (123-135): Member "selector" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol b/test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol
new file mode 100644
index 0000000000..72d224ba26
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol
@@ -0,0 +1,13 @@
+library Y {
+    event E() anonymous;
+}
+
+contract C {
+    bytes32 s5 = Y.E.selector;
+
+    function test2() view external returns (bytes32) {
+        return s5;
+    }
+}
+// ----
+// TypeError 9582: (70-82): Member "selector" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/events/event_selector_syntax.sol b/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
new file mode 100644
index 0000000000..14d2c94d80
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
@@ -0,0 +1,43 @@
+library L {
+    event E();
+}
+library S {
+    event E(uint);
+}
+library T {
+    event E();
+}
+interface I {
+    event E();
+}
+
+contract D {
+    event F();
+}
+
+contract C is D {
+    function test1() external pure returns (bytes32, bytes32, bytes32) {
+        assert(L.E.selector == T.E.selector);
+        assert(I.E.selector == L.E.selector);
+
+        assert(L.E.selector != S.E.selector);
+        assert(T.E.selector != S.E.selector);
+        assert(I.E.selector != S.E.selector);
+
+        return (L.E.selector, S.E.selector, I.E.selector);
+    }
+
+    bytes32 s1 = L.E.selector;
+    bytes32 s2 = S.E.selector;
+    bytes32 s3 = T.E.selector;
+    bytes32 s4 = I.E.selector;
+
+    function test2() view external returns (bytes32, bytes32, bytes32, bytes32) {
+        return (s1, s2, s3, s4);
+    }
+
+    function test3() pure external returns (bytes32) {
+        return (F.selector);
+    }
+}
+// ----

From 9fa907aac2d9b3c9b9aa8283c0a15776f656d507 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 18 May 2022 14:48:27 +0200
Subject: [PATCH 0625/1748] Do not remove potentially reverting returndatacopy
 cases.

---
 Changelog.md                                  |  1 +
 libyul/optimiser/UnusedStoreEliminator.cpp    | 20 ++++++++++++++++++-
 .../returndatacopy_fixed_size.yul             |  9 +++++++++
 .../returndatacopy_returndatasize.yul         | 15 ++++++++++++++
 ...ndatacopy_returndatasize_nonzero_start.yul | 13 ++++++++++++
 .../returndatacopy_returndatasize_var.yul     | 16 +++++++++++++++
 6 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_fixed_size.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_nonzero_start.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_var.yul

diff --git a/Changelog.md b/Changelog.md
index c17b7e0b3e..6eb4c5f5ba 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
 
 Bugfixes:
  * ABI Encoder: When encoding an empty string coming from storage do not add a superfluous empty slot for data.
+ * Yul Optimizer: Do not remove ``returndatacopy`` in cases in which it might perform out-of-bounds reads that unconditionally revert as out-of-gas. Previously, any ``returndatacopy`` that wrote to memory that was never read from was removed without accounting for the out-of-bounds condition.
 
 
 ### 0.8.14 (2022-05-17)
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index 343bd720a1..976c8c8424 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -157,7 +157,25 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 	yulAssert(isCandidateForRemoval == (isStorageWrite || (!m_ignoreMemory && isMemoryWrite)));
 	if (isCandidateForRemoval)
 	{
-		m_stores[YulString{}].insert({&_statement, State::Undecided});
+		State initialState = State::Undecided;
+		if (*instruction == Instruction::RETURNDATACOPY)
+		{
+			initialState = State::Used;
+			auto startOffset = identifierNameIfSSA(funCall->arguments.at(1));
+			auto length = identifierNameIfSSA(funCall->arguments.at(2));
+			KnowledgeBase knowledge(m_dialect, [this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
+			if (length && startOffset)
+			{
+				FunctionCall const* lengthCall = get_if<FunctionCall>(m_ssaValues.at(*length).value);
+				if (
+					knowledge.knownToBeZero(*startOffset) &&
+					lengthCall &&
+					toEVMInstruction(m_dialect, lengthCall->functionName.name) == Instruction::RETURNDATASIZE
+				)
+					initialState = State::Undecided;
+			}
+		}
+		m_stores[YulString{}].insert({&_statement, initialState});
 		vector<Operation> operations = operationsFromFunctionCall(*funCall);
 		yulAssert(operations.size() == 1, "");
 		m_storeOperations[&_statement] = move(operations.front());
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_fixed_size.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_fixed_size.yul
new file mode 100644
index 0000000000..50c05e8260
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_fixed_size.yul
@@ -0,0 +1,9 @@
+{
+  returndatacopy(0,0,32)
+}
+// ====
+// EVMVersion: >homestead
+// ----
+// step: unusedStoreEliminator
+//
+// { { returndatacopy(0, 0, 32) } }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize.yul
new file mode 100644
index 0000000000..e0d5cbf1c2
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize.yul
@@ -0,0 +1,15 @@
+{
+  returndatacopy(0,0,returndatasize())
+}
+// ====
+// EVMVersion: >homestead
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let _1 := returndatasize()
+//         let _2 := 0
+//         let _3 := 0
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_nonzero_start.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_nonzero_start.yul
new file mode 100644
index 0000000000..a40e76955b
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_nonzero_start.yul
@@ -0,0 +1,13 @@
+{
+  returndatacopy(0,1,returndatasize())
+}
+// ====
+// EVMVersion: >homestead
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         returndatacopy(0, 1, returndatasize())
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_var.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_var.yul
new file mode 100644
index 0000000000..eac2070f74
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/returndatacopy_returndatasize_var.yul
@@ -0,0 +1,16 @@
+{
+  let s := returndatasize()
+  returndatacopy(0,0,s)
+}
+// ====
+// EVMVersion: >homestead
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let s := returndatasize()
+//         let _1 := 0
+//         let _2 := 0
+//     }
+// }

From 98efb460315bfc31452347560acc1c8495fea86b Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Fri, 20 May 2022 20:04:10 -0300
Subject: [PATCH 0626/1748] Patches issue
 https://github.com/euler-xyz/euler-contracts/issues/119. After issue is
 resolved, this should be reverted/changed.

---
 test/externalTests/euler.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 114a7d7817..4eb89684a5 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -66,6 +66,10 @@ function euler_test
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
     sed -i "/expectError: 'JUNK_UPGRADE_TEST_FAILURE'/d" test/moduleUpgrade.js
 
+    # One of the tests is currently broken in the upstream, due to changed behavior of chainid in @ethereumjs/vm.
+    # TODO: Remove this when https://github.com/euler-xyz/euler-contracts/issues/119 gets fixed.
+    sed -i 's/domainSeparatorMatch)\.to\.equal(true/domainSeparatorMatch)\.to\.equal(false/g' test/eulStakes.js
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"

From 49d5c0a2924fce70e68a3a5ec7cf0967b0be4bf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 13 Apr 2022 22:00:07 +0200
Subject: [PATCH 0627/1748] Disable external test cases where Hardhat's
 heuristics break after relaxing inlining

---
 test/externalTests/ens.sh           | 10 ++++++++++
 test/externalTests/euler.sh         |  1 +
 test/externalTests/gnosis.sh        |  5 +++++
 test/externalTests/pool-together.sh |  4 ++++
 test/externalTests/trident.sh       |  3 +++
 test/externalTests/uniswap.sh       | 12 +++++++++++
 test/externalTests/zeppelin.sh      | 31 +++++++++++++++++++++++++++++
 7 files changed, 66 insertions(+)

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 2b177afb2b..834c1074be 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -75,6 +75,16 @@ function ens_test
     # In some cases Hardhat does not detect revert reasons properly via IR.
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
     sed -i "s|it\(('Does not allow wrapping a name you do not own',\)|it.skip\1|g" test/wrapper/NameWrapper.js
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    sed -i "s|it\(('can set fuses and then burn ability to burn fuses',\)|it.skip\1|g" test/wrapper/NameWrapper.js
+    sed -i "s|it\(('can set fuses and burn canSetResolver and canSetTTL',\)|it.skip\1|g" test/wrapper/NameWrapper.js
+    sed -i "s|it\(('Cannot be called if CANNOT_TRANSFER is burned\.',\)|it.skip\1|g" test/wrapper/NameWrapper.js
+    sed -i "s|it\(('Cannot be called if CANNOT_SET_RESOLVER is burned\.\?',\)|it.skip\1|g" test/wrapper/NameWrapper.js
+    sed -i "s|it\(('Cannot be called if CANNOT_SET_TTL is burned\.\?',\)|it.skip\1|g" test/wrapper/NameWrapper.js
+    sed -i "s|it\(('Cannot be called if CREATE_SUBDOMAIN is burned and is a new subdomain',\)|it.skip\1|g" test/wrapper/NameWrapper.js
+    sed -i "s|it\(('Cannot be called if REPLACE_SUBDOMAIN is burned and is an existing subdomain',\)|it.skip\1|g" test/wrapper/NameWrapper.js
+    sed -i "s|it\(('Cannot be called if CANNOT_CREATE_SUBDOMAIN is burned and is a new subdomain',\)|it.skip\1|g" test/wrapper/NameWrapper.js
+    sed -i "s|it\(('Cannot be called if PARENT_CANNOT_CONTROL is burned and is an existing subdomain',\)|it.skip\1|g" test/wrapper/NameWrapper.js
 
     find . -name "*.sol" -exec sed -i -e 's/^\(\s*\)\(assembly\)/\1\/\/\/ @solidity memory-safe-assembly\n\1\2/' '{}' \;
 
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 4eb89684a5..fe8680572f 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -65,6 +65,7 @@ function euler_test
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
     sed -i "/expectError: 'JUNK_UPGRADE_TEST_FAILURE'/d" test/moduleUpgrade.js
+    sed -i "/et\.expect(errMsg)\.to\.contain('e\/collateral-violation');/d" test/flashLoanNative.js
 
     # One of the tests is currently broken in the upstream, due to changed behavior of chainid in @ethereumjs/vm.
     # TODO: Remove this when https://github.com/euler-xyz/euler-contracts/issues/119 gets fixed.
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 8995231e1b..ae268603b3 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -82,6 +82,11 @@ function gnosis_safe_test
     # TODO: Remove this when Gnosis merges https://github.com/gnosis/safe-contracts/pull/394
     sed -i "s|\(function isValidSignature(bytes \)calldata\( _data, bytes \)calldata\( _signature)\)|\1memory\2memory\3|g" contracts/handler/CompatibilityFallbackHandler.sol
 
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    sed -i "s|it\(('should enforce delegatecall'\)|it.skip\1|g" test/accessors/SimulateTxAccessor.spec.ts
+    sed -i "s|it\(('can only be called from Safe itself'\)|it.skip\1|g" test/libraries/Migration.spec.ts
+    sed -i "s|it\(('should enforce delegatecall to MultiSend'\)|it.skip\1|g" test/libraries/MultiSend.spec.ts
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index b24cd6f4b2..e439949ce2 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -59,6 +59,10 @@ function pool_together_test
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$ref_type" "$ref" "$DIR"
 
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    sed -i "s|it\(('should fail to return value if value passed does not fit in [0-9]\+ bits'\)|it.skip\1|g" test/libraries/ExtendedSafeCast.test.ts
+    sed -i "s|it\(('should require an rng to be requested'\)|it.skip\1|g" test/DrawBeacon.test.ts
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index 6c1f56fbb1..288ff0cbf0 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -89,6 +89,9 @@ function trident_test
     sed -i 's|IStrategy(0)|IStrategy(address(0))|g' contracts/flat/BentoBoxV1Flat.sol
     find contracts -name "*.sol" -exec sed -i -e 's/^\(\s*\)\(assembly\)/\1\/\/\/ @solidity memory-safe-assembly\n\1\2/' '{}' \;
 
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    sed -i 's|it\(("Reverts on direct deployment via factory"\)|it.skip\1|g' test/MasterDeployer.test.ts
+
     # @sushiswap/core package contains contracts that get built with 0.6.12 and fail our compiler
     # version check. It's not used by tests so we can remove it.
     rm -r node_modules/@sushiswap/core/
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index 9672f9b068..48ec697d08 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -59,6 +59,18 @@ function uniswap_test
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$ref_type" "$ref" "$DIR"
 
+    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
+    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
+    sed -i "s|it\(('underpay zero for one and exact in',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
+    sed -i "s|it\(('pay in the wrong token zero for one and exact in',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
+    sed -i "s|it\(('underpay zero for one and exact out',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
+    sed -i "s|it\(('pay in the wrong token zero for one and exact out',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
+    sed -i "s|it\(('underpay one for zero and exact in',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
+    sed -i "s|it\(('pay in the wrong token one for zero and exact in',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
+    sed -i "s|it\(('underpay one for zero and exact out',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
+    sed -i "s|it\(('pay in the wrong token one for zero and exact out',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
+
     neutralize_package_json_hooks
     name_hardhat_default_export "$config_file" "$config_var"
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index ccbf7595ac..5af8dd6262 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -19,6 +19,9 @@
 # (c) 2019 solidity contributors.
 #------------------------------------------------------------------------------
 
+# Disable shellcheck errors on quoted special chars like backticks. Too many false-positives.
+# shellcheck disable=SC2016
+
 set -e
 
 source scripts/common.sh
@@ -70,6 +73,34 @@ function zeppelin_test
     # In some cases Hardhat does not detect revert reasons properly via IR.
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
     sed -i "s|it(\('reverts if the current value is 0'\)|it.skip(\1|g" test/utils/Counters.test.js
+    sed -i "s|it(\('prevent unauthorized maintenance'\)|it.skip(\1|g" test/governance/TimelockController.test.js
+    sed -i "s|it(\('cannot cancel invalid operation'\)|it.skip(\1|g" test/governance/TimelockController.test.js
+    sed -i "s|it(\('reverts if block number >= current block'\)|it.skip(\1|g" test/governance/utils/Votes.test.js
+    sed -i "s|it(\('reverts if block number >= current block'\)|it.skip(\1|g" test/governance/utils/Votes.behavior.js
+    sed -i "s|it(\('cannot call onlyInitializable function outside the scope of an initializable function'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
+    sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC20/presets/ERC20PresetMinterPauser.test.js
+    sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC1155/presets/ERC1155PresetMinterPauser.test.js
+    sed -i "s|it(\('other accounts cannot pause'\)|it.skip(\1|g" test/token/ERC20/presets/ERC20PresetMinterPauser.test.js
+    sed -i "s|it(\('other accounts cannot pause'\)|it.skip(\1|g" test/token/ERC1155/presets/ERC1155PresetMinterPauser.test.js
+    sed -i "s|it(\('reverts when decreasing the allowance'\)|it.skip(\1|g" test/token/ERC20/utils/SafeERC20.test.js
+    sed -i "s|it(\('reverts when decreasing the allowance to a negative value'\)|it.skip(\1|g" test/token/ERC20/utils/SafeERC20.test.js
+    sed -i "s|it(\('cannot be released before time limit'\)|it.skip(\1|g" test/token/ERC20/utils/TokenTimelock.test.js
+    sed -i "s|it(\('cannot be released just before time limit'\)|it.skip(\1|g" test/token/ERC20/utils/TokenTimelock.test.js
+    sed -i "s|it(\('reverts when sending non-zero amounts'\)|it.skip(\1|g" test/utils/Address.test.js
+    sed -i "s|it(\('reverts when sending more than the balance'\)|it.skip(\1|g" test/utils/Address.test.js
+    sed -i "s|it(\('reverts if block number >= current block'\)|it.skip(\1|g" test/utils/Checkpoints.test.js
+    sed -i "s|it(\('fails deploying a contract if the bytecode length is zero'\)|it.skip(\1|g" test/utils/Create2.test.js
+    sed -i "s|it(\('fails deploying a contract if factory contract does not have sufficient balance'\)|it.skip(\1|g" test/utils/Create2.test.js
+    sed -i "s|it(\('reverts on withdrawals'\)|it.skip(\1|g" test/utils/escrow/ConditionalEscrow.test.js
+    sed -i "s|it(\('does not allow beneficiary withdrawal'\)|it.skip(\1|g" test/utils/escrow/RefundEscrow.test.js
+    sed -i "s|it(\('rejects deposits'\)|it.skip(\1|g" test/utils/escrow/RefundEscrow.test.js
+    sed -i "s|it(\('does not allow 0xffffffff'\)|it.skip(\1|g" test/utils/introspection/ERC165Storage.test.js
+    sed -i "s|it(\('reverts when casting -1'\)|it.skip(\1|g" test/utils/math/SafeCast.test.js
+    sed -i 's|it(\(`reverts when downcasting 2^\${bits} (\${maxValue.addn(1)})`\)|it.skip(\1|g' test/utils/math/SafeCast.test.js
+    sed -i 's|it(\(`reverts when downcasting 2^\${bits} + 1 (\${maxValue.addn(2)})`\)|it.skip(\1|g' test/utils/math/SafeCast.test.js
+    sed -i 's|it(\(`reverts when casting [^`]\+`\)|it.skip(\1|g' test/utils/math/SafeCast.test.js
+    sed -i "s|it(\('missing value'\)|it.skip(\1|g" test/utils/structs/EnumerableMap.behavior.js
+
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
     sed -i "s|describe\(('Polygon-Child'\)|describe.skip\1|g" test/crosschain/CrossChainEnabled.test.js
 

From f08d349791b45e921f3b93310ffeffe4cc8496ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 13 Apr 2022 20:45:19 +0200
Subject: [PATCH 0628/1748] Separate some inlining tests into pre- and
 post-homestead

---
 .../no_inline_into_big_function.yul           |  4 +-
 .../no_inline_into_big_function_homestead.yul | 64 +++++++++++++++++++
 .../no_inline_into_big_global_context.yul     |  4 +-
 ...line_into_big_global_context_homestead.yul | 60 +++++++++++++++++
 4 files changed, 130 insertions(+), 2 deletions(-)
 create mode 100644 test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function_homestead.yul
 create mode 100644 test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context_homestead.yul

diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul
index fbc0ca8561..d120d01529 100644
--- a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function.yul
@@ -1,5 +1,5 @@
 {
-	function f(a) -> b {
+    function f(a) -> b {
         let x := mload(a)
         b := sload(x)
     }
@@ -9,6 +9,8 @@
         x := f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(2)))))))))))))))))))
     }
 }
+// ====
+// EVMVersion: >homestead
 // ----
 // step: fullInliner
 //
diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function_homestead.yul b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function_homestead.yul
new file mode 100644
index 0000000000..04a9417d23
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_function_homestead.yul
@@ -0,0 +1,64 @@
+{
+    function f(a) -> b {
+        let x := mload(a)
+        b := sload(x)
+    }
+    // This will stop inlining at some point because
+    // the function gets too big.
+    function g() -> x {
+        x := f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(2)))))))))))))))))))
+    }
+}
+// ====
+// EVMVersion: <=homestead
+// ----
+// step: fullInliner
+//
+// {
+//     { }
+//     function f(a) -> b
+//     { b := sload(mload(a)) }
+//     function g() -> x_1
+//     {
+//         let a_20 := 2
+//         let b_21 := 0
+//         b_21 := sload(mload(a_20))
+//         let a_23 := b_21
+//         let b_24 := 0
+//         b_24 := sload(mload(a_23))
+//         let a_26 := b_24
+//         let b_27 := 0
+//         b_27 := sload(mload(a_26))
+//         let a_29 := b_27
+//         let b_30 := 0
+//         b_30 := sload(mload(a_29))
+//         let a_32 := b_30
+//         let b_33 := 0
+//         b_33 := sload(mload(a_32))
+//         let a_35 := b_33
+//         let b_36 := 0
+//         b_36 := sload(mload(a_35))
+//         let a_38 := b_36
+//         let b_39 := 0
+//         b_39 := sload(mload(a_38))
+//         let a_41 := b_39
+//         let b_42 := 0
+//         b_42 := sload(mload(a_41))
+//         let a_44 := b_42
+//         let b_45 := 0
+//         b_45 := sload(mload(a_44))
+//         let a_47 := b_45
+//         let b_48 := 0
+//         b_48 := sload(mload(a_47))
+//         let a_50 := b_48
+//         let b_51 := 0
+//         b_51 := sload(mload(a_50))
+//         let a_53 := b_51
+//         let b_54 := 0
+//         b_54 := sload(mload(a_53))
+//         let a_56 := b_54
+//         let b_57 := 0
+//         b_57 := sload(mload(a_56))
+//         x_1 := f(f(f(f(f(f(b_57))))))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context.yul b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context.yul
index 10ccc2a379..875d715c5c 100644
--- a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context.yul
@@ -1,5 +1,5 @@
 {
-	function f(a) -> b {
+    function f(a) -> b {
         let x := mload(a)
         b := sload(x)
     }
@@ -7,6 +7,8 @@
     // the global context gets too big.
     let x := f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(2)))))))))))))))))))
 }
+// ====
+// EVMVersion: >homestead
 // ----
 // step: fullInliner
 //
diff --git a/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context_homestead.yul b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context_homestead.yul
new file mode 100644
index 0000000000..3d62caa2f3
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullInliner/no_inline_into_big_global_context_homestead.yul
@@ -0,0 +1,60 @@
+{
+    function f(a) -> b {
+        let x := mload(a)
+        b := sload(x)
+    }
+    // This will stop inlining at some point because
+    // the global context gets too big.
+    let x := f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(f(2)))))))))))))))))))
+}
+// ====
+// EVMVersion: <=homestead
+// ----
+// step: fullInliner
+//
+// {
+//     {
+//         let a_20 := 2
+//         let b_21 := 0
+//         b_21 := sload(mload(a_20))
+//         let a_23 := b_21
+//         let b_24 := 0
+//         b_24 := sload(mload(a_23))
+//         let a_26 := b_24
+//         let b_27 := 0
+//         b_27 := sload(mload(a_26))
+//         let a_29 := b_27
+//         let b_30 := 0
+//         b_30 := sload(mload(a_29))
+//         let a_32 := b_30
+//         let b_33 := 0
+//         b_33 := sload(mload(a_32))
+//         let a_35 := b_33
+//         let b_36 := 0
+//         b_36 := sload(mload(a_35))
+//         let a_38 := b_36
+//         let b_39 := 0
+//         b_39 := sload(mload(a_38))
+//         let a_41 := b_39
+//         let b_42 := 0
+//         b_42 := sload(mload(a_41))
+//         let a_44 := b_42
+//         let b_45 := 0
+//         b_45 := sload(mload(a_44))
+//         let a_47 := b_45
+//         let b_48 := 0
+//         b_48 := sload(mload(a_47))
+//         let a_50 := b_48
+//         let b_51 := 0
+//         b_51 := sload(mload(a_50))
+//         let a_53 := b_51
+//         let b_54 := 0
+//         b_54 := sload(mload(a_53))
+//         let a_56 := b_54
+//         let b_57 := 0
+//         b_57 := sload(mload(a_56))
+//         let x_1 := f(f(f(f(f(f(b_57))))))
+//     }
+//     function f(a) -> b
+//     { b := sload(mload(a)) }
+// }

From 7168c27f0d7f04519625023efd45c69a1f93dab6 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 2 Mar 2022 15:52:22 +0100
Subject: [PATCH 0629/1748] Relax inliner heuristics.

---
 Changelog.md                     |  1 +
 libyul/optimiser/FullInliner.cpp | 36 ++++++++++++++++++++++++++++----
 libyul/optimiser/FullInliner.h   |  4 ++++
 3 files changed, 37 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a8db61f6ec..10c65182c5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Language Features:
 
 Compiler Features:
 * LSP: Add rudimentary support for semantic highlighting.
+ * Yul Optimizer: Improve inlining heuristics for via IR code generation and pure Yul compilation.
 
 
 Bugfixes:
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index 61e2800b83..f4a8aee856 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -22,11 +22,14 @@
 #include <libyul/optimiser/FullInliner.h>
 
 #include <libyul/optimiser/ASTCopier.h>
+#include <libyul/optimiser/CallGraphGenerator.h>
+#include <libyul/optimiser/FunctionCallFinder.h>
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/SSAValueTracker.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
+#include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/Exceptions.h>
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
@@ -46,8 +49,12 @@ void FullInliner::run(OptimiserStepContext& _context, Block& _ast)
 }
 
 FullInliner::FullInliner(Block& _ast, NameDispenser& _dispenser, Dialect const& _dialect):
-	m_ast(_ast), m_nameDispenser(_dispenser), m_dialect(_dialect)
+	m_ast(_ast),
+	m_recursiveFunctions(CallGraphGenerator::callGraph(_ast).recursiveFunctions()),
+	m_nameDispenser(_dispenser),
+	m_dialect(_dialect)
 {
+
 	// Determine constants
 	SSAValueTracker tracker;
 	tracker(m_ast);
@@ -71,6 +78,15 @@ FullInliner::FullInliner(Block& _ast, NameDispenser& _dispenser, Dialect const&
 			m_singleUse.emplace(fun.name);
 		updateCodeSize(fun);
 	}
+
+	// Check for memory guard.
+	vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
+		_ast,
+		"memoryguard"_yulstring
+	);
+	// We will perform less aggressive inlining, if no ``memoryguard`` call is found.
+	if (!memoryGuardCalls.empty())
+		m_hasMemoryGuard = true;
 }
 
 void FullInliner::run(Pass _pass)
@@ -177,8 +193,20 @@ bool FullInliner::shallInline(FunctionCall const& _funCall, YulString _callSite)
 	if (m_pass == Pass::InlineTiny)
 		return false;
 
-	// Do not inline into already big functions.
-	if (m_functionSizes.at(_callSite) > 45)
+	bool aggressiveInlining = true;
+
+	if (
+		EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&m_dialect);
+		!evmDialect || !evmDialect->providesObjectAccess() || evmDialect->evmVersion() <= langutil::EVMVersion::homestead()
+	)
+		// No aggressive inlining with the old code transform.
+		aggressiveInlining = false;
+
+	// No aggressive inlining, if we cannot perform stack-to-memory.
+	if (!m_hasMemoryGuard || m_recursiveFunctions.count(_callSite))
+		aggressiveInlining = false;
+
+	if (!aggressiveInlining && m_functionSizes.at(_callSite) > 45)
 		return false;
 
 	if (m_singleUse.count(calledFunction->name))
@@ -196,7 +224,7 @@ bool FullInliner::shallInline(FunctionCall const& _funCall, YulString _callSite)
 			break;
 		}
 
-	return (size < 6 || (constantArg && size < 12));
+	return (size < (aggressiveInlining ? 8 : 6) || (constantArg && size < (aggressiveInlining ? 16 : 12)));
 }
 
 void FullInliner::tentativelyUpdateCodeSize(YulString _function, YulString _callSite)
diff --git a/libyul/optimiser/FullInliner.h b/libyul/optimiser/FullInliner.h
index a743bf3238..5029abf392 100644
--- a/libyul/optimiser/FullInliner.h
+++ b/libyul/optimiser/FullInliner.h
@@ -111,6 +111,10 @@ class FullInliner: public ASTModifier
 	std::map<YulString, FunctionDefinition*> m_functions;
 	/// Functions not to be inlined (because they contain the ``leave`` statement).
 	std::set<YulString> m_noInlineFunctions;
+	/// True, if the code contains a ``memoryguard`` and we can expect to be able to move variables to memory later.
+	bool m_hasMemoryGuard = false;
+	/// Set of recursive functions.
+	std::set<YulString> m_recursiveFunctions;
 	/// Names of functions to always inline.
 	std::set<YulString> m_singleUse;
 	/// Variables that are constants (used for inlining heuristic)

From 77038aa40e0301c6a9d76d5abcced32a84f96fec Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 23 May 2022 12:54:18 +0200
Subject: [PATCH 0630/1748] Update test expectations.

---
 .../debug_info_in_yul_snippet_escaping/output | 118 +--
 .../function_debug_info_via_yul/output        |  15 +-
 test/cmdlineTests/name_simplifier/output      | 194 ++---
 .../cmdlineTests/optimizer_array_sload/output |  53 +-
 .../output.json                               | 745 ++++++++----------
 .../output.json                               | 426 +++++-----
 .../viair_subobject_optimization/output       | 235 +++---
 .../abiEncoderV1/abi_decode_v2_storage.sol    |   2 +-
 .../abi_encode_calldata_slice.sol             |   4 +-
 .../struct/struct_storage_ptr.sol             |   2 +-
 .../abi_encode_calldata_slice.sol             |   4 +-
 .../abiEncoderV2/abi_encode_v2.sol            |   2 +-
 ...2_in_function_inherited_in_v1_contract.sol |   2 +-
 .../abiEncoderV2/calldata_array.sol           |   2 +-
 .../abiEncoderV2/storage_array_encoding.sol   |   4 +-
 .../abi_decode_simple_storage.sol             |   2 +-
 .../arrays_complex_from_and_to_storage.sol    |   2 +-
 .../array/byte_array_transitional_2.sol       |   2 +-
 .../array/bytes_length_member.sol             |   2 +-
 .../array/constant_var_as_array_length.sol    |   2 +-
 .../copying/array_copy_calldata_storage.sol   |   2 +-
 .../copying/array_copy_cleanup_uint40.sol     |   2 +-
 .../copying/array_copy_clear_storage.sol      |   2 +-
 .../copying/array_copy_different_packing.sol  |   2 +-
 .../copying/array_copy_including_array.sol    |   4 +-
 .../array/copying/array_copy_nested_array.sol |   2 +-
 ...ay_copy_storage_storage_different_base.sol |   2 +-
 ..._storage_storage_different_base_nested.sol |   2 +-
 .../array_copy_storage_storage_dyn_dyn.sol    |   2 +-
 ...y_copy_storage_storage_dynamic_dynamic.sol |   2 +-
 ...ay_copy_storage_storage_static_dynamic.sol |   2 +-
 .../array_copy_storage_storage_struct.sol     |   2 +-
 .../array_copy_storage_to_memory_nested.sol   |   2 +-
 .../copying/array_copy_target_leftover.sol    |   2 +-
 .../copying/array_copy_target_simple.sol      |   2 +-
 .../copying/array_copy_target_simple_2.sol    |   2 +-
 .../array_nested_calldata_to_storage.sol      |   8 +-
 .../array_nested_memory_to_storage.sol        |   4 +-
 ...on_external_storage_to_storage_dynamic.sol |   2 +-
 ...o_storage_dynamic_different_mutability.sol |   2 +-
 .../array_of_struct_calldata_to_storage.sol   |   2 +-
 .../array_of_struct_memory_to_storage.sol     |   2 +-
 ..._containing_arrays_calldata_to_storage.sol |   2 +-
 ...ts_containing_arrays_memory_to_storage.sol |   2 +-
 .../array_storage_multi_items_per_slot.sol    |   2 +-
 .../array/copying/bytes_inside_mappings.sol   |   4 +-
 .../copying/bytes_storage_to_storage.sol      |  10 +-
 .../calldata_array_dynamic_to_storage.sol     |   2 +-
 .../copy_byte_array_in_struct_to_storage.sol  |   4 +-
 .../copying/copy_byte_array_to_storage.sol    |   2 +-
 .../copy_function_internal_storage_array.sol  |   2 +-
 .../copying/copying_bytes_multiassign.sol     |   2 +-
 .../memory_dyn_2d_bytes_to_storage.sol        |   2 +-
 .../array/copying/storage_memory_nested.sol   |   2 +-
 .../copying/storage_memory_nested_bytes.sol   |   2 +-
 .../storage_memory_nested_from_pointer.sol    |   2 +-
 .../copying/storage_memory_nested_struct.sol  |   2 +-
 .../copying/storage_memory_packed_dyn.sol     |   2 +-
 .../array/create_memory_array.sol             |   2 +-
 .../array/delete/bytes_delete_element.sol     |   2 +-
 .../array/dynamic_array_cleanup.sol           |   2 +-
 .../array/dynamic_arrays_in_storage.sol       |   2 +-
 .../array/dynamic_multi_array_cleanup.sol     |   2 +-
 .../array/fixed_array_cleanup.sol             |   2 +-
 .../array/fixed_arrays_as_return_type.sol     |   2 +-
 .../array/fixed_arrays_in_constructors.sol    |   2 +-
 .../array/function_array_cross_calls.sol      |   2 +-
 .../array/pop/array_pop_array_transition.sol  |   2 +-
 .../array/pop/array_pop_uint16_transition.sol |   2 +-
 .../array/pop/array_pop_uint24_transition.sol |   2 +-
 .../array/pop/byte_array_pop_copy_long.sol    |   2 +-
 .../pop/byte_array_pop_long_storage_empty.sol |   2 +-
 .../array/pop/byte_array_pop_masking_long.sol |   2 +-
 .../semanticTests/array/push/array_push.sol   |   2 +-
 .../push/array_push_nested_from_calldata.sol  |   2 +-
 .../array/push/array_push_struct.sol          |   2 +-
 .../push/array_push_struct_from_calldata.sol  |   2 +-
 .../array/push/byte_array_push_transition.sol |   2 +-
 .../array/push/nested_bytes_push.sol          |   2 +-
 .../array/push/push_no_args_2d.sol            |   4 +-
 .../array/push/push_no_args_bytes.sol         |   2 +-
 .../semanticTests/array/reusing_memory.sol    |   2 +-
 .../copy_from_calldata_removes_bytes_data.sol |   2 +-
 .../constructor/arrays_in_constructors.sol    |   2 +-
 .../bytes_in_constructors_packer.sol          |   2 +-
 .../bytes_in_constructors_unpacker.sol        |   2 +-
 .../constructor_arguments_external.sol        |   2 +-
 .../constructor_static_array_argument.sol     |   2 +-
 .../constructor/no_callvalue_check.sol        |   2 +-
 .../semanticTests/constructor_with_params.sol |   2 +-
 ...ructor_with_params_diamond_inheritance.sol |   2 +-
 .../constructor_with_params_inheritance.sol   |   2 +-
 .../events/event_dynamic_array_storage.sol    |   2 +-
 .../events/event_dynamic_array_storage_v2.sol |   2 +-
 .../event_dynamic_nested_array_storage_v2.sol |   2 +-
 .../events/event_emit_from_other_contract.sol |   2 +-
 .../events/event_indexed_string.sol           |   2 +-
 .../externalContracts/FixedFeeRegistrar.sol   |   2 +-
 .../externalContracts/deposit_contract.sol    |  10 +-
 .../externalContracts/prbmath_signed.sol      |   2 +-
 .../externalContracts/prbmath_unsigned.sol    |   2 +-
 .../externalContracts/ramanujan_pi.sol        |   2 +-
 .../creation_function_call_with_args.sol      |   2 +-
 .../creation_function_call_with_salt.sol      |   2 +-
 .../external_call_to_nonexisting.sol          |   2 +-
 ...ernal_call_to_nonexisting_debugstrings.sol |   2 +-
 .../functionCall/failed_create.sol            |   4 +-
 .../functionCall/gas_and_value_basic.sol      |   2 +-
 .../gas_and_value_brace_syntax.sol            |   2 +-
 .../mapping_array_internal_argument.sol       |   2 +-
 .../immutable/multi_creation.sol              |   2 +-
 .../semanticTests/immutable/use_scratch.sol   |   2 +-
 ...ted_function_calldata_memory_interface.sol |   2 +-
 .../inheritance/value_for_constructor.sol     |   2 +-
 .../balance_other_contract.sol                |   2 +-
 .../libraries/internal_types_in_library.sol   |   2 +-
 .../using_library_mappings_public.sol         |   2 +-
 .../using_library_mappings_return.sol         |   2 +-
 .../salted_create/salted_create.sol           |   2 +-
 .../salted_create_with_value.sol              |   2 +-
 .../semanticTests/smoke/constructor.sol       |   2 +-
 .../semanticTests/state/blockhash_basic.sol   |   2 +-
 .../storage/packed_storage_structs_bytes.sol  |   2 +-
 ...ta_struct_with_nested_array_to_storage.sol |   2 +-
 .../conversion/recursive_storage_memory.sol   |   2 +-
 .../copy_struct_array_from_storage.sol        |   2 +-
 .../structs/memory_structs_nested_load.sol    |   2 +-
 ...truct_containing_bytes_copy_and_delete.sol |   2 +-
 .../semanticTests/structs/struct_copy.sol     |   4 +-
 .../structs/struct_copy_via_local.sol         |   2 +-
 .../struct_delete_storage_nested_small.sol    |   2 +-
 .../struct_delete_storage_with_array.sol      |   2 +-
 ...truct_delete_storage_with_arrays_small.sol |   2 +-
 .../struct_memory_to_storage_function_ptr.sol |   2 +-
 .../semanticTests/structs/structs.sol         |   2 +-
 .../userDefinedValueType/calldata.sol         |   2 +-
 .../userDefinedValueType/erc20.sol            |   2 +-
 .../semanticTests/various/address_code.sol    |   2 +-
 .../various/destructuring_assignment.sol      |   2 +-
 .../semanticTests/various/erc20.sol           |   2 +-
 .../semanticTests/various/senders_balance.sol |   2 +-
 .../skip_dynamic_types_for_structs.sol        |   2 +-
 .../various/staticcall_for_view_and_pure.sol  |   4 +-
 .../various/swap_in_storage_overwrite.sol     |   2 +-
 .../semanticTests/various/value_complex.sol   |   2 +-
 .../semanticTests/various/value_insane.sol    |   2 +-
 .../viaYul/array_memory_index_access.sol      |   2 +-
 .../viaYul/array_storage_index_access.sol     |  14 +-
 .../array_storage_index_boundary_test.sol     |   4 +-
 .../viaYul/array_storage_length_access.sol    |   2 +-
 .../viaYul/array_storage_push_empty.sol       |   4 +-
 ...rray_storage_push_empty_length_address.sol |   4 +-
 .../viaYul/array_storage_push_pop.sol         |   4 +-
 .../viaYul/copy_struct_invalid_ir_bug.sol     |   2 +-
 154 files changed, 1016 insertions(+), 1128 deletions(-)

diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
index 04a354e2ed..626731c13a 100644
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
@@ -434,77 +434,77 @@ object "D_27" {
             {
                 /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
                 let _1 := memoryguard(0x80)
-                mstore(64, _1)
+                let _2 := 64
+                mstore(_2, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _2 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_2)))
+                    let _3 := 0
+                    if eq(0x26121ff0, shr(224, calldataload(_3)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        if callvalue() { revert(_3, _3) }
+                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
                         /// @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..."
-                        let _3 := datasize("C_2")
-                        let _4 := add(_1, _3)
-                        if or(gt(_4, 0xffffffffffffffff), lt(_4, _1)) { panic_error_0x41() }
-                        datacopy(_1, dataoffset("C_2"), _3)
-                        if iszero(create(/** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ _2, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _1, sub(_4, _1)))
+                        let _4 := datasize("C_2")
+                        let _5 := add(_1, _4)
+                        let _6 := 0xffffffffffffffff
+                        if or(gt(_5, _6), lt(_5, _1))
                         {
                             /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-                            let pos := mload(64)
-                            returndatacopy(pos, _2, returndatasize())
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(4, 0x41)
+                            revert(_3, 0x24)
+                        }
+                        /// @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..."
+                        datacopy(_1, dataoffset("C_2"), _4)
+                        if iszero(create(/** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ _3, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _1, sub(_5, _1)))
+                        {
+                            /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
+                            let pos := mload(_2)
+                            returndatacopy(pos, _3, returndatasize())
                             revert(pos, returndatasize())
                         }
-                        mstore(add(allocate_memory_array_string(), 32), "/*")
-                        let memPtr := allocate_memory_array_string_546()
-                        mstore(add(memPtr, 32), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
-                        mstore(add(memPtr, 64), shl(200, 0x2e2e2e22202a2f))
-                        let memPos := mload(64)
-                        return(memPos, sub(abi_encode_string(memPos, memPtr), memPos))
+                        let memPtr := mload(_2)
+                        let newFreePtr := add(memPtr, _2)
+                        if or(gt(newFreePtr, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _6), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr, memPtr))
+                        {
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(4, 0x41)
+                            revert(_3, 0x24)
+                        }
+                        mstore(_2, newFreePtr)
+                        mstore(memPtr, 2)
+                        let _7 := 32
+                        mstore(add(memPtr, _7), "/*")
+                        let memPtr_1 := mload(_2)
+                        let newFreePtr_1 := add(memPtr_1, 96)
+                        if or(gt(newFreePtr_1, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _6), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_1))
+                        {
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(4, 0x41)
+                            revert(_3, 0x24)
+                        }
+                        mstore(_2, newFreePtr_1)
+                        mstore(memPtr_1, 39)
+                        mstore(add(memPtr_1, _7), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
+                        mstore(add(memPtr_1, _2), shl(200, 0x2e2e2e22202a2f))
+                        let memPos := mload(_2)
+                        mstore(memPos, _7)
+                        let length := mload(memPtr_1)
+                        mstore(add(memPos, _7), length)
+                        let i := _3
+                        for { } lt(i, length) { i := add(i, _7) }
+                        {
+                            mstore(add(add(memPos, i), _2), mload(add(add(memPtr_1, i), _7)))
+                        }
+                        if gt(i, length)
+                        {
+                            mstore(add(add(memPos, length), _2), _3)
+                        }
+                        return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
                     }
                 }
                 revert(0, 0)
             }
-            function abi_encode_string(headStart, value0) -> tail
-            {
-                let _1 := 32
-                mstore(headStart, _1)
-                let length := mload(value0)
-                mstore(add(headStart, _1), length)
-                let i := 0
-                for { } lt(i, length) { i := add(i, _1) }
-                {
-                    mstore(add(add(headStart, i), 64), mload(add(add(value0, i), _1)))
-                }
-                if gt(i, length)
-                {
-                    mstore(add(add(headStart, length), 64), 0)
-                }
-                tail := add(add(headStart, and(add(length, 31), not(31))), 64)
-            }
-            function panic_error_0x41()
-            {
-                mstore(0, shl(224, 0x4e487b71))
-                mstore(4, 0x41)
-                revert(0, 0x24)
-            }
-            function allocate_memory_array_string() -> memPtr
-            {
-                let memPtr_1 := mload(64)
-                let newFreePtr := add(memPtr_1, 64)
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr_1)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-                memPtr := memPtr_1
-                mstore(memPtr_1, 2)
-            }
-            function allocate_memory_array_string_546() -> memPtr
-            {
-                let memPtr_1 := mload(64)
-                let newFreePtr := add(memPtr_1, 96)
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr_1)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-                memPtr := memPtr_1
-                mstore(memPtr_1, 39)
-            }
         }
         /// @use-src 0:"debug_info_in_yul_snippet_escaping/input.sol"
         object "C_2" {
diff --git a/test/cmdlineTests/function_debug_info_via_yul/output b/test/cmdlineTests/function_debug_info_via_yul/output
index 97125e4b95..5af245ce4a 100644
--- a/test/cmdlineTests/function_debug_info_via_yul/output
+++ b/test/cmdlineTests/function_debug_info_via_yul/output
@@ -4,20 +4,7 @@
     "function_debug_info_via_yul/input.sol:C":
     {
       "function-debug": {},
-      "function-debug-runtime":
-      {
-        "abi_encode_uint256":
-        {
-          "parameterSlots": 2,
-          "returnSlots": 1
-        },
-        "calldata_array_index_access_uint256_dyn_calldata":
-        {
-          "entryPoint": 144,
-          "parameterSlots": 2,
-          "returnSlots": 1
-        }
-      }
+      "function-debug-runtime": {}
     }
   },
   "version": "<VERSION REMOVED>"
diff --git a/test/cmdlineTests/name_simplifier/output b/test/cmdlineTests/name_simplifier/output
index 219d767692..0e100122f7 100644
--- a/test/cmdlineTests/name_simplifier/output
+++ b/test/cmdlineTests/name_simplifier/output
@@ -17,112 +17,112 @@ object "C_59" {
         code {
             {
                 /// @src 0:346:625  "contract C {..."
-                mstore(64, memoryguard(0x80))
-                if iszero(lt(calldatasize(), 4))
+                let _1 := memoryguard(0x80)
+                let _2 := 4
+                if iszero(lt(calldatasize(), _2))
                 {
-                    let _1 := 0
-                    if eq(0xf8eddcc6, shr(224, calldataload(_1)))
+                    let _3 := 0
+                    if eq(0xf8eddcc6, shr(224, calldataload(_3)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        let _2 := 32
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_1, _1) }
-                        let offset := calldataload(4)
-                        let _3 := 0xffffffffffffffff
-                        if gt(offset, _3) { revert(_1, _1) }
-                        if iszero(slt(add(offset, 35), calldatasize())) { revert(_1, _1) }
-                        let _4 := calldataload(add(4, offset))
-                        if gt(_4, _3) { panic_error_0x41() }
-                        let _5 := shl(5, _4)
-                        let dst := allocate_memory(add(_5, _2))
+                        if callvalue() { revert(_3, _3) }
+                        let _4 := 32
+                        if slt(add(calldatasize(), not(3)), _4) { revert(_3, _3) }
+                        let offset := calldataload(_2)
+                        let _5 := 0xffffffffffffffff
+                        if gt(offset, _5) { revert(_3, _3) }
+                        if iszero(slt(add(offset, 35), calldatasize())) { revert(_3, _3) }
+                        let _6 := calldataload(add(_2, offset))
+                        let _7 := 36
+                        if gt(_6, _5)
+                        {
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(_2, 0x41)
+                            revert(_3, _7)
+                        }
+                        let _8 := shl(5, _6)
+                        let _9 := not(31)
+                        let newFreePtr := add(_1, and(add(_8, 63), _9))
+                        if or(gt(newFreePtr, _5), lt(newFreePtr, _1))
+                        {
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(_2, 0x41)
+                            revert(_3, _7)
+                        }
+                        let _10 := 64
+                        mstore(_10, newFreePtr)
+                        let dst := _1
+                        mstore(_1, _6)
+                        dst := add(_1, _4)
                         let dst_1 := dst
-                        mstore(dst, _4)
-                        dst := add(dst, _2)
-                        let srcEnd := add(add(offset, _5), 36)
-                        if gt(srcEnd, calldatasize()) { revert(_1, _1) }
-                        let src := add(offset, 36)
-                        for { } lt(src, srcEnd) { src := add(src, _2) }
+                        let srcEnd := add(add(offset, _8), _7)
+                        if gt(srcEnd, calldatasize()) { revert(_3, _3) }
+                        let src := add(offset, _7)
+                        for { } lt(src, srcEnd) { src := add(src, _4) }
+                        {
+                            if slt(sub(calldatasize(), src), _4) { revert(_3, _3) }
+                            let memPtr := mload(_10)
+                            let newFreePtr_1 := add(memPtr, _4)
+                            if or(gt(newFreePtr_1, _5), lt(newFreePtr_1, memPtr))
+                            {
+                                mstore(_3, shl(224, 0x4e487b71))
+                                mstore(_2, 0x41)
+                                revert(_3, _7)
+                            }
+                            mstore(_10, newFreePtr_1)
+                            mstore(memPtr, calldataload(src))
+                            mstore(dst, memPtr)
+                            dst := add(dst, _4)
+                        }
+                        if iszero(mload(_1))
+                        {
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(_2, 0x32)
+                            revert(_3, _7)
+                        }
+                        sstore(_3, mload(/** @src 0:469:474  "_s[0]" */ mload(dst_1)))
+                        /// @src 0:346:625  "contract C {..."
+                        if iszero(lt(/** @src 0:492:493  "1" */ 0x01, /** @src 0:346:625  "contract C {..." */ mload(_1)))
                         {
-                            if slt(sub(calldatasize(), src), _2) { revert(_1, _1) }
-                            let value := allocate_memory_1307()
-                            mstore(value, calldataload(src))
-                            mstore(dst, value)
-                            dst := add(dst, _2)
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(_2, 0x32)
+                            revert(_3, _7)
                         }
-                        let ret, ret_1 := fun_sumArray(dst_1)
-                        let memPos := mload(64)
-                        return(memPos, sub(abi_encode_uint256_string(memPos, ret, ret_1), memPos))
+                        let _11 := mload(/** @src 0:489:494  "_s[1]" */ mload(/** @src 0:346:625  "contract C {..." */ add(_1, _10)))
+                        sstore(0x02, _11)
+                        let memPtr_1 := mload(_10)
+                        let newFreePtr_2 := add(memPtr_1, 160)
+                        if or(gt(newFreePtr_2, _5), lt(newFreePtr_2, memPtr_1))
+                        {
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(_2, 0x41)
+                            revert(_3, _7)
+                        }
+                        mstore(_10, newFreePtr_2)
+                        mstore(memPtr_1, 100)
+                        mstore(add(memPtr_1, _4), "longstringlongstringlongstringlo")
+                        mstore(add(memPtr_1, _10), "ngstringlongstringlongstringlong")
+                        let _12 := 96
+                        mstore(add(memPtr_1, _12), "stringlongstringlongstringlongst")
+                        mstore(add(memPtr_1, 128), "ring")
+                        let memPos := mload(_10)
+                        mstore(memPos, _11)
+                        mstore(add(memPos, _4), _10)
+                        let length := mload(memPtr_1)
+                        mstore(add(memPos, _10), length)
+                        let i := _3
+                        for { } lt(i, length) { i := add(i, _4) }
+                        {
+                            mstore(add(add(memPos, i), _12), mload(add(add(memPtr_1, i), _4)))
+                        }
+                        if gt(i, length)
+                        {
+                            mstore(add(add(memPos, length), _12), _3)
+                        }
+                        return(memPos, add(sub(add(memPos, and(add(length, 31), _9)), memPos), _12))
                     }
                 }
                 revert(0, 0)
             }
-            function panic_error_0x41()
-            {
-                mstore(0, shl(224, 0x4e487b71))
-                mstore(4, 0x41)
-                revert(0, 0x24)
-            }
-            function allocate_memory_1307() -> memPtr
-            {
-                memPtr := mload(64)
-                let newFreePtr := add(memPtr, 32)
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-            }
-            function allocate_memory(size) -> memPtr
-            {
-                memPtr := mload(64)
-                let newFreePtr := add(memPtr, and(add(size, 31), not(31)))
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-            }
-            function abi_encode_uint256_string(headStart, value0, value1) -> tail
-            {
-                mstore(headStart, value0)
-                let _1 := 32
-                mstore(add(headStart, _1), 64)
-                let length := mload(value1)
-                mstore(add(headStart, 64), length)
-                let i := 0
-                for { } lt(i, length) { i := add(i, _1) }
-                {
-                    mstore(add(add(headStart, i), 96), mload(add(add(value1, i), _1)))
-                }
-                if gt(i, length)
-                {
-                    mstore(add(add(headStart, length), 96), 0)
-                }
-                tail := add(add(headStart, and(add(length, 31), not(31))), 96)
-            }
-            function panic_error_0x32()
-            {
-                mstore(0, shl(224, 0x4e487b71))
-                mstore(4, 0x32)
-                revert(0, 0x24)
-            }
-            /// @ast-id 58 @src 0:381:623  "function sumArray(S[] memory _s) public returns (uint, string memory) {..."
-            function fun_sumArray(var_s_mpos) -> var, var_mpos
-            {
-                /// @src 0:346:625  "contract C {..."
-                if iszero(mload(var_s_mpos)) { panic_error_0x32() }
-                sstore(/** @src 0:472:473  "0" */ 0x00, /** @src 0:346:625  "contract C {..." */ mload(/** @src 0:469:474  "_s[0]" */ mload(/** @src 0:346:625  "contract C {..." */ add(var_s_mpos, 32))))
-                if iszero(lt(1, mload(var_s_mpos))) { panic_error_0x32() }
-                let _1 := mload(/** @src 0:489:494  "_s[1]" */ mload(/** @src 0:346:625  "contract C {..." */ add(var_s_mpos, 64)))
-                sstore(0x02, _1)
-                /// @src 0:500:619  "return (t.y[0], \"longstringlongstringlongstringlongstringlongstringlongstringlongstringlongstringlongstringlongstring\")"
-                var := _1
-                /// @src 0:346:625  "contract C {..."
-                let memPtr := mload(64)
-                let newFreePtr := add(memPtr, 160)
-                if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, memPtr)) { panic_error_0x41() }
-                mstore(64, newFreePtr)
-                mstore(memPtr, 100)
-                mstore(add(memPtr, 32), "longstringlongstringlongstringlo")
-                mstore(add(memPtr, 64), "ngstringlongstringlongstringlong")
-                mstore(add(memPtr, 96), "stringlongstringlongstringlongst")
-                mstore(add(memPtr, 128), "ring")
-                /// @src 0:500:619  "return (t.y[0], \"longstringlongstringlongstringlongstringlongstringlongstringlongstringlongstringlongstringlongstring\")"
-                var_mpos := memPtr
-            }
         }
         data ".metadata" hex"<BYTECODE REMOVED>"
     }
diff --git a/test/cmdlineTests/optimizer_array_sload/output b/test/cmdlineTests/optimizer_array_sload/output
index bb0d0bf402..75d88d36f8 100644
--- a/test/cmdlineTests/optimizer_array_sload/output
+++ b/test/cmdlineTests/optimizer_array_sload/output
@@ -18,53 +18,54 @@ object "Arraysum_34" {
             {
                 /// @src 0:80:429  "contract Arraysum {..."
                 mstore(64, memoryguard(0x80))
-                if iszero(lt(calldatasize(), 4))
+                let _1 := 4
+                if iszero(lt(calldatasize(), _1))
                 {
-                    let _1 := 0
-                    if eq(0x81d73423, shr(224, calldataload(_1)))
+                    let _2 := 0
+                    if eq(0x81d73423, shr(224, calldataload(_2)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        let var_sum := _1
+                        if callvalue() { revert(_2, _2) }
+                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        let var_sum := _2
                         /// @src 0:368:378  "uint i = 0"
-                        let var_i := /** @src 0:80:429  "contract Arraysum {..." */ _1
-                        let _2 := sload(_1)
+                        let var_i := /** @src 0:80:429  "contract Arraysum {..." */ _2
+                        let _3 := sload(_2)
                         /// @src 0:364:423  "for(uint i = 0; i < values.length; i++)..."
                         for { }
-                        /** @src 0:380:397  "i < values.length" */ lt(var_i, _2)
+                        /** @src 0:380:397  "i < values.length" */ lt(var_i, _3)
                         /// @src 0:368:378  "uint i = 0"
                         {
                             /// @src 0:80:429  "contract Arraysum {..."
-                            if eq(var_i, not(0)) { panic_error_0x11() }
+                            if eq(var_i, not(0))
+                            {
+                                mstore(_2, shl(224, 0x4e487b71))
+                                mstore(_1, 0x11)
+                                revert(_2, 0x24)
+                            }
                             /// @src 0:399:402  "i++"
                             var_i := /** @src 0:80:429  "contract Arraysum {..." */ add(var_i, 1)
                         }
                         /// @src 0:399:402  "i++"
                         {
                             /// @src 0:80:429  "contract Arraysum {..."
-                            mstore(_1, _1)
-                            let _3 := sload(add(18569430475105882587588266137607568536673111973893317399460219858819262702947, var_i))
-                            if gt(var_sum, not(_3)) { panic_error_0x11() }
+                            mstore(_2, _2)
+                            let _4 := sload(add(18569430475105882587588266137607568536673111973893317399460219858819262702947, var_i))
+                            if gt(var_sum, not(_4))
+                            {
+                                mstore(_2, shl(224, 0x4e487b71))
+                                mstore(_1, 0x11)
+                                revert(_2, 0x24)
+                            }
                             /// @src 0:407:423  "sum += values[i]"
-                            var_sum := /** @src 0:80:429  "contract Arraysum {..." */ add(var_sum, _3)
+                            var_sum := /** @src 0:80:429  "contract Arraysum {..." */ add(var_sum, _4)
                         }
                         let memPos := mload(64)
-                        return(memPos, sub(abi_encode_uint256(memPos, var_sum), memPos))
+                        mstore(memPos, var_sum)
+                        return(memPos, 32)
                     }
                 }
                 revert(0, 0)
             }
-            function abi_encode_uint256(headStart, value0) -> tail
-            {
-                tail := add(headStart, 32)
-                mstore(headStart, value0)
-            }
-            function panic_error_0x11()
-            {
-                mstore(0, shl(224, 0x4e487b71))
-                mstore(4, 0x11)
-                revert(0, 0x24)
-            }
         }
         data ".metadata" hex"<BYTECODE REMOVED>"
     }
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index 3490a73426..ef4eb6a65e 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -1,6 +1,6 @@
 {"contracts":{"C":{"C":{"evm":{"assembly":"    /* \"C\":79:428  contract C... */
   0xa0
-  jumpi(tag_6, callvalue)
+  jumpi(tag_5, callvalue)
   0x1f
   bytecodeSize
   codesize
@@ -22,7 +22,7 @@
   dup5
   lt
   or
-  tag_4
+  tag_3
   jumpi
   dup1
   dup5
@@ -37,12 +37,11 @@
   add
   sub
   slt
-  tag_6
+  tag_5
   jumpi
   mload
     /* \"C\":147:149  42 */
   mstore(0x80, 0x2a)
-    /* \"C\":203:219  stateVar = _init */
   0x00
     /* \"C\":79:428  contract C... */
   sstore
@@ -53,15 +52,18 @@
   dataOffset(sub_0)
   dup3
   codecopy
-  mload(0x80)
+    /* \"C\":147:149  42 */
+  0x80
+    /* \"C\":79:428  contract C... */
+  mload
   dup2
   assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
   return
-tag_6:
+tag_5:
   0x00
   dup1
   revert
-tag_4:
+tag_3:
   mstore(0x00, shl(0xe0, 0x4e487b71))
   mstore(0x04, 0x41)
   revert(0x00, 0x24)
@@ -69,15 +71,19 @@ stop
 
 sub_0: assembly {
         /* \"C\":79:428  contract C... */
-      mstore(0x40, 0x80)
-      jumpi(tag_7, iszero(lt(calldatasize, 0x04)))
-    tag_8:
+      0x80
+      0x40
+      dup2
+      dup2
+      mstore
+      jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
       0x00
       dup1
       revert
-    tag_7:
+    tag_2:
       0x00
-      dup1
+      swap2
+      dup3
       calldataload
       0xe0
       shr
@@ -85,108 +91,45 @@ sub_0: assembly {
       dup2
       0x26121ff0
       eq
-      tag_9
+      tag_4
       jumpi
       pop
       dup1
       0x793816ec
       eq
-      tag_11
+      tag_6
       jumpi
       0x9942ec6f
       eq
-      tag_13
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_13:
-      tag_8
-      tag_3
-      jump\t// in
-    tag_11:
-      pop
       tag_8
-      tag_2
-      jump\t// in
-    tag_9:
-      jumpi(tag_19, callvalue)
-      dup1
-      add(calldatasize, not(0x03))
-      slt
-      tag_19
       jumpi
-      0x20
-        /* \"C\":290:298  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-      sub(shl(0xff, 0x01), 0x2a)
-        /* \"C\":117:119  41 */
-      dup2
-      sgt
-      0x01
-      and
-      tag_21
-      jumpi
-        /* \"C\":79:428  contract C... */
-    tag_22:
-      mload(0x40)
-        /* \"C\":117:119  41 */
-      swap1
-      0x29
-      add
-        /* \"C\":79:428  contract C... */
-      dup2
-      mstore
-      return
-        /* \"C\":117:119  41 */
-    tag_21:
-      tag_23
-      tag_4
-      jump\t// in
-    tag_23:
-      jump(tag_22)
-        /* \"C\":79:428  contract C... */
-    tag_19:
+      0x00
       dup1
       revert
-    tag_2:
-      pop
-      jumpi(tag_8, callvalue)
-      jumpi(tag_8, slt(add(not(0x03), calldatasize), 0x00))
-      0x20
-      sload(0x00)
-      mload(0x40)
-      swap1
+    tag_8:
+      jumpi(tag_12, callvalue)
       dup2
-      mstore
-      return
-    tag_3:
-      pop
-      jumpi(tag_8, callvalue)
-      0x00
-      dup1
       add(calldatasize, not(0x03))
       slt
-      tag_19
+      tag_12
       jumpi
-      dup1
+      dup2
       sload
-        /* \"C\":117:119  41 */
-      0x01
-      swap1
       sub(shl(0xff, 0x01), 0x01)
-        /* \"C\":79:428  contract C... */
       dup2
       eq
-      tag_32
+      tag_14
       jumpi
-    tag_33:
+        /* \"C\":117:119  41 */
+      0x01
+        /* \"C\":79:428  contract C... */
       add
-      swap1
-      dup2
+      swap2
+      dup3
       dup2
       sstore
-      mload(0x40)
+      dup2
+      mload
       shl(0xe4, 0x026121ff)
         /* \"C\":403:411  this.f() */
       dup2
@@ -205,124 +148,116 @@ sub_0: assembly {
       swap2
       dup3
       iszero
-      tag_34
+      tag_16
       jumpi
       dup1
       swap3
-      tag_36
+      tag_18
       jumpi
         /* \"C\":79:428  contract C... */
-    tag_37:
-      tag_38
+    tag_19:
+        /* \"C\":403:411  this.f() */
+      0x20
+        /* \"C\":392:411  stateVar + this.f() */
+      dup5
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_39
+      tag_20
         /* \"C\":392:411  stateVar + this.f() */
-      tag_40
-      dup6
-      dup8
-      tag_5
+      tag_21
+      dup7
+      dup10
+      tag_1
       jump\t// in
-    tag_40:
+    tag_21:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       swap1
-      tag_5
+      tag_1
       jump\t// in
-    tag_39:
+    tag_20:
         /* \"C\":79:428  contract C... */
-      mload(0x40)
       swap1
-      dup2
-      mstore
+      mload
       swap1
       dup2
-      swap1
-      0x20
-      dup3
-      add
-      swap1
-      jump
-    tag_38:
-      sub
-      swap1
+      mstore
       return
         /* \"C\":403:411  this.f() */
-    tag_36:
+    tag_18:
       swap1
       swap2
       pop
       0x20
-      swap1
       returndatasize
-      dup3
+      dup2
       gt
-      tag_41
+      tag_22
       jumpi
-    tag_42:
+    tag_23:
         /* \"C\":79:428  contract C... */
       0x1f
-      dup3
+      dup2
       add
       not(0x1f)
       and
       dup4
       add
-      swap1
       0xffffffffffffffff
-      dup3
+      dup2
       gt
       dup5
-      dup4
+      dup3
       lt
       or
-      tag_43
+      tag_24
       jumpi
-      pop
-      swap3
         /* \"C\":403:411  this.f() */
-      tag_45
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_39
-        /* \"C\":79:428  contract C... */
-      swap4
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_40
+      0x20
         /* \"C\":79:428  contract C... */
-      swap4
-      tag_38
-      swap7
-      0x40
+      swap2
+      dup5
+      swap2
+      dup7
       mstore
         /* \"C\":403:411  this.f() */
       dup2
       add
-      swap1
-      tag_6
-      jump\t// in
-    tag_45:
-      swap3
+        /* \"C\":79:428  contract C... */
+      sub
+      slt
+      tag_26
+      jumpi
       pop
-      swap3
-      jump(tag_37)
+      mload
+        /* \"C\":392:411  stateVar + this.f() */
+      tag_21
+        /* \"C\":403:411  this.f() */
+      0x20
+      jump(tag_19)
         /* \"C\":79:428  contract C... */
-    tag_43:
+    tag_26:
+      dup1
+      revert
+    tag_24:
       shl(0xe0, 0x4e487b71)
-      dup2
+      dup4
       mstore
       mstore(0x04, 0x41)
       0x24
-      swap1
+        /* \"C\":117:119  41 */
+      dup4
+        /* \"C\":79:428  contract C... */
       revert
         /* \"C\":403:411  this.f() */
-    tag_41:
-      returndatasize
-      swap2
+    tag_22:
       pop
-      jump(tag_42)
-    tag_34:
+      returndatasize
+      jump(tag_23)
+    tag_16:
         /* \"C\":79:428  contract C... */
-      mload(0x40)
+      dup4
+      mload
       swap1
       returndatasize
       swap1
@@ -331,23 +266,73 @@ sub_0: assembly {
       returndatasize
       swap1
       revert
-    tag_32:
-      tag_46
-      tag_4
-      jump\t// in
-    tag_46:
-      jump(tag_33)
+    tag_14:
+      shl(0xe0, 0x4e487b71)
         /* \"C\":117:119  41 */
-    tag_4:
+      dup4
+      mstore
+      0x11
+        /* \"C\":79:428  contract C... */
+      0x04
+        /* \"C\":117:119  41 */
+      mstore
+      0x24
+      dup4
+      revert
+        /* \"C\":79:428  contract C... */
+    tag_12:
+      pop
+      dup1
+      revert
+    tag_6:
       pop
+      jumpi(tag_12, callvalue)
+      dup2
+      add(calldatasize, not(0x03))
+      slt
+      tag_12
+      jumpi
+      0x20
+      swap2
+      sload
+      swap1
+      mload
+      swap1
+      dup2
+      mstore
+      return
+    tag_4:
+      dup4
+      swap1
+      jumpi(tag_12, callvalue)
+      dup2
+      add(calldatasize, not(0x03))
+      slt
+      tag_12
+      jumpi
+        /* \"C\":290:298  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+      sub(shl(0xff, 0x01), 0x2a)
+        /* \"C\":117:119  41 */
+      dup2
+      sgt
+      0x01
+      and
+      tag_14
+      jumpi
         /* \"C\":79:428  contract C... */
-      shl(0xe0, 0x4e487b71)
+      0x20
         /* \"C\":117:119  41 */
-      0x00
+      swap3
+      pop
+      0x29
+      add
+        /* \"C\":79:428  contract C... */
+      dup2
       mstore
-      mstore(0x04, 0x11)
-      revert(0x00, 0x24)
-    tag_5:
+      return
+        /* \"C\":117:119  41 */
+    tag_1:
       0x00
       dup2
       slt
@@ -360,9 +345,8 @@ sub_0: assembly {
       dup5
       sgt
       and
-      tag_47
+      tag_40
       jumpi
-    tag_48:
       shl(0xff, 0x01)
       dup3
       swap1
@@ -370,44 +354,21 @@ sub_0: assembly {
       dup4
       slt
       and
-      tag_49
+      tag_40
       jumpi
       add
       swap1
       jump\t// out
-    tag_49:
-      tag_51
-      tag_4
-      jump\t// in
-    tag_51:
-      add
-      swap1
-      jump\t// out
-    tag_47:
-      tag_52
-      tag_4
-      jump\t// in
-    tag_52:
-      jump(tag_48)
-        /* \"C\":79:428  contract C... */
-    tag_6:
-      swap1
-      dup2
-      0x20
-      swap2
-      sub
-      slt
-      tag_8
-      jumpi
-      mload
-      swap1
-      jump\t// out
+    tag_40:
+      mstore(0x00, shl(0xe0, 0x4e487b71))
+      mstore(0x04, 0x11)
+      revert(0x00, 0x24)
 
     auxdata: <AUXDATA REMOVED>
 }
 "}}},"D":{"D":{"evm":{"assembly":"    /* \"D\":91:166  contract D is C(3)... */
   0xa0
-  jumpi(tag_6, callvalue)
+  jumpi(tag_5, callvalue)
   0x1f
   bytecodeSize
   codesize
@@ -429,7 +390,7 @@ sub_0: assembly {
   dup5
   lt
   or
-  tag_4
+  tag_3
   jumpi
   dup1
   dup5
@@ -444,35 +405,9 @@ sub_0: assembly {
   add
   sub
   slt
-  tag_6
+  tag_5
   jumpi
-  tag_8
-  swap1
   mload
-  tag_1
-  jump\t// in
-tag_8:
-  mload(0x40)
-  dataSize(sub_0)
-  swap1
-  dup2
-  dataOffset(sub_0)
-  dup3
-  codecopy
-  mload(0x80)
-  dup2
-  assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-  return
-tag_6:
-  0x00
-  dup1
-  revert
-tag_4:
-  mstore(0x00, shl(0xe0, 0x4e487b71))
-  mstore(0x04, 0x41)
-  revert(0x00, 0x24)
-    /* \"D\":113:164  constructor(int _init2)... */
-tag_1:
     /* \"C\":147:149  42 */
   mstore(0x80, 0x2a)
   sub(shl(0xff, 0x01), 0x04)
@@ -481,7 +416,7 @@ tag_1:
   sgt
   0x01
   and
-  tag_9
+  tag_7
   jumpi
     /* \"D\":107:108  3 */
   0x03
@@ -489,26 +424,49 @@ tag_1:
   add
   0x00
   sstore
-    /* \"D\":113:164  constructor(int _init2)... */
-  jump\t// out
+  mload(0x40)
+  dataSize(sub_0)
+  swap1
+  dup2
+  dataOffset(sub_0)
+  dup3
+  codecopy
+    /* \"C\":147:149  42 */
+  0x80
     /* \"D\":91:166  contract D is C(3)... */
-tag_9:
+  mload
+  dup2
+  assignImmutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+  return
+tag_7:
   mstore(0x00, shl(0xe0, 0x4e487b71))
   mstore(0x04, 0x11)
   revert(0x00, 0x24)
+tag_5:
+  0x00
+  dup1
+  revert
+tag_3:
+  mstore(0x00, shl(0xe0, 0x4e487b71))
+  mstore(0x04, 0x41)
+  revert(0x00, 0x24)
 stop
 
 sub_0: assembly {
         /* \"D\":91:166  contract D is C(3)... */
-      mstore(0x40, 0x80)
-      jumpi(tag_7, iszero(lt(calldatasize, 0x04)))
-    tag_8:
+      0x80
+      0x40
+      dup2
+      dup2
+      mstore
+      jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
       0x00
       dup1
       revert
-    tag_7:
+    tag_2:
       0x00
-      dup1
+      swap2
+      dup3
       calldataload
       0xe0
       shr
@@ -516,108 +474,45 @@ sub_0: assembly {
       dup2
       0x26121ff0
       eq
-      tag_9
+      tag_4
       jumpi
       pop
       dup1
       0x793816ec
       eq
-      tag_11
+      tag_6
       jumpi
       0x9942ec6f
       eq
-      tag_13
-      jumpi
-      0x00
-      dup1
-      revert
-    tag_13:
-      tag_8
-      tag_3
-      jump\t// in
-    tag_11:
-      pop
       tag_8
-      tag_2
-      jump\t// in
-    tag_9:
-      jumpi(tag_19, callvalue)
-      dup1
-      add(calldatasize, not(0x03))
-      slt
-      tag_19
       jumpi
-      0x20
-        /* \"C\":290:298  immutVar */
-      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-      sub(shl(0xff, 0x01), 0x2a)
-        /* \"C\":117:119  41 */
-      dup2
-      sgt
-      0x01
-      and
-      tag_21
-      jumpi
-        /* \"D\":91:166  contract D is C(3)... */
-    tag_22:
-      mload(0x40)
-        /* \"C\":117:119  41 */
-      swap1
-      0x29
-      add
-        /* \"D\":91:166  contract D is C(3)... */
-      dup2
-      mstore
-      return
-        /* \"C\":117:119  41 */
-    tag_21:
-      tag_23
-      tag_4
-      jump\t// in
-    tag_23:
-      jump(tag_22)
-        /* \"D\":91:166  contract D is C(3)... */
-    tag_19:
+      0x00
       dup1
       revert
-    tag_2:
-      pop
-      jumpi(tag_8, callvalue)
-      jumpi(tag_8, slt(add(not(0x03), calldatasize), 0x00))
-      0x20
-      sload(0x00)
-      mload(0x40)
-      swap1
+    tag_8:
+      jumpi(tag_12, callvalue)
       dup2
-      mstore
-      return
-    tag_3:
-      pop
-      jumpi(tag_8, callvalue)
-      0x00
-      dup1
       add(calldatasize, not(0x03))
       slt
-      tag_19
+      tag_12
       jumpi
-      dup1
+      dup2
       sload
-        /* \"C\":117:119  41 */
-      0x01
-      swap1
       sub(shl(0xff, 0x01), 0x01)
-        /* \"D\":91:166  contract D is C(3)... */
       dup2
       eq
-      tag_32
+      tag_14
       jumpi
-    tag_33:
+        /* \"C\":117:119  41 */
+      0x01
+        /* \"D\":91:166  contract D is C(3)... */
       add
-      swap1
-      dup2
+      swap2
+      dup3
       dup2
       sstore
-      mload(0x40)
+      dup2
+      mload
       shl(0xe4, 0x026121ff)
         /* \"C\":403:411  this.f() */
       dup2
@@ -636,124 +531,116 @@ sub_0: assembly {
       swap2
       dup3
       iszero
-      tag_34
+      tag_16
       jumpi
       dup1
       swap3
-      tag_36
+      tag_18
       jumpi
         /* \"D\":91:166  contract D is C(3)... */
-    tag_37:
-      tag_38
+    tag_19:
+        /* \"C\":403:411  this.f() */
+      0x20
+        /* \"C\":392:411  stateVar + this.f() */
+      dup5
         /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_39
+      tag_20
         /* \"C\":392:411  stateVar + this.f() */
-      tag_40
-      dup6
-      dup8
-      tag_5
+      tag_21
+      dup7
+      dup10
+      tag_1
       jump\t// in
-    tag_40:
+    tag_21:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       swap1
-      tag_5
+      tag_1
       jump\t// in
-    tag_39:
+    tag_20:
         /* \"D\":91:166  contract D is C(3)... */
-      mload(0x40)
       swap1
-      dup2
-      mstore
+      mload
       swap1
       dup2
-      swap1
-      0x20
-      dup3
-      add
-      swap1
-      jump
-    tag_38:
-      sub
-      swap1
+      mstore
       return
         /* \"C\":403:411  this.f() */
-    tag_36:
+    tag_18:
       swap1
       swap2
       pop
       0x20
-      swap1
       returndatasize
-      dup3
+      dup2
       gt
-      tag_41
+      tag_22
       jumpi
-    tag_42:
+    tag_23:
         /* \"D\":91:166  contract D is C(3)... */
       0x1f
-      dup3
+      dup2
       add
       not(0x1f)
       and
       dup4
       add
-      swap1
       0xffffffffffffffff
-      dup3
+      dup2
       gt
       dup5
-      dup4
+      dup3
       lt
       or
-      tag_43
+      tag_24
       jumpi
-      pop
-      swap3
         /* \"C\":403:411  this.f() */
-      tag_45
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_39
-        /* \"D\":91:166  contract D is C(3)... */
-      swap4
-        /* \"C\":392:411  stateVar + this.f() */
-      tag_40
+      0x20
         /* \"D\":91:166  contract D is C(3)... */
-      swap4
-      tag_38
-      swap7
-      0x40
+      swap2
+      dup5
+      swap2
+      dup7
       mstore
         /* \"C\":403:411  this.f() */
       dup2
       add
-      swap1
-      tag_6
-      jump\t// in
-    tag_45:
-      swap3
+        /* \"D\":91:166  contract D is C(3)... */
+      sub
+      slt
+      tag_26
+      jumpi
       pop
-      swap3
-      jump(tag_37)
+      mload
+        /* \"C\":392:411  stateVar + this.f() */
+      tag_21
+        /* \"C\":403:411  this.f() */
+      0x20
+      jump(tag_19)
         /* \"D\":91:166  contract D is C(3)... */
-    tag_43:
+    tag_26:
+      dup1
+      revert
+    tag_24:
       shl(0xe0, 0x4e487b71)
-      dup2
+      dup4
       mstore
       mstore(0x04, 0x41)
       0x24
-      swap1
+        /* \"C\":117:119  41 */
+      dup4
+        /* \"D\":91:166  contract D is C(3)... */
       revert
         /* \"C\":403:411  this.f() */
-    tag_41:
-      returndatasize
-      swap2
+    tag_22:
       pop
-      jump(tag_42)
-    tag_34:
+      returndatasize
+      jump(tag_23)
+    tag_16:
         /* \"D\":91:166  contract D is C(3)... */
-      mload(0x40)
+      dup4
+      mload
       swap1
       returndatasize
       swap1
@@ -762,23 +649,73 @@ sub_0: assembly {
       returndatasize
       swap1
       revert
-    tag_32:
-      tag_46
-      tag_4
-      jump\t// in
-    tag_46:
-      jump(tag_33)
+    tag_14:
+      shl(0xe0, 0x4e487b71)
         /* \"C\":117:119  41 */
-    tag_4:
+      dup4
+      mstore
+      0x11
+        /* \"D\":91:166  contract D is C(3)... */
+      0x04
+        /* \"C\":117:119  41 */
+      mstore
+      0x24
+      dup4
+      revert
+        /* \"D\":91:166  contract D is C(3)... */
+    tag_12:
       pop
+      dup1
+      revert
+    tag_6:
+      pop
+      jumpi(tag_12, callvalue)
+      dup2
+      add(calldatasize, not(0x03))
+      slt
+      tag_12
+      jumpi
+      0x20
+      swap2
+      sload
+      swap1
+      mload
+      swap1
+      dup2
+      mstore
+      return
+    tag_4:
+      dup4
+      swap1
+      jumpi(tag_12, callvalue)
+      dup2
+      add(calldatasize, not(0x03))
+      slt
+      tag_12
+      jumpi
+        /* \"C\":290:298  immutVar */
+      immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
+      sub(shl(0xff, 0x01), 0x2a)
+        /* \"C\":117:119  41 */
+      dup2
+      sgt
+      0x01
+      and
+      tag_14
+      jumpi
         /* \"D\":91:166  contract D is C(3)... */
-      shl(0xe0, 0x4e487b71)
+      0x20
         /* \"C\":117:119  41 */
-      0x00
+      swap3
+      pop
+      0x29
+      add
+        /* \"D\":91:166  contract D is C(3)... */
+      dup2
       mstore
-      mstore(0x04, 0x11)
-      revert(0x00, 0x24)
-    tag_5:
+      return
+        /* \"C\":117:119  41 */
+    tag_1:
       0x00
       dup2
       slt
@@ -791,9 +728,8 @@ sub_0: assembly {
       dup5
       sgt
       and
-      tag_47
+      tag_40
       jumpi
-    tag_48:
       shl(0xff, 0x01)
       dup3
       swap1
@@ -801,38 +737,15 @@ sub_0: assembly {
       dup4
       slt
       and
-      tag_49
+      tag_40
       jumpi
       add
       swap1
       jump\t// out
-    tag_49:
-      tag_51
-      tag_4
-      jump\t// in
-    tag_51:
-      add
-      swap1
-      jump\t// out
-    tag_47:
-      tag_52
-      tag_4
-      jump\t// in
-    tag_52:
-      jump(tag_48)
-        /* \"D\":91:166  contract D is C(3)... */
-    tag_6:
-      swap1
-      dup2
-      0x20
-      swap2
-      sub
-      slt
-      tag_8
-      jumpi
-      mload
-      swap1
-      jump\t// out
+    tag_40:
+      mstore(0x00, shl(0xe0, 0x4e487b71))
+      mstore(0x04, 0x11)
+      revert(0x00, 0x24)
 
     auxdata: <AUXDATA REMOVED>
 }
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index a57dbdc35c..1d2a4d593d 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -625,20 +625,17 @@ object \"C_54\" {
                 revert(/** @src -1:-1:-1 */ 0, 0)
             }
             /// @src 0:79:435  \"contract C...\"
-            constructor_C(mload(_1))
+            let value := mload(_1)
+            /// @src 0:154:156  \"42\"
+            mstore(128, 0x2a)
+            /// @src 0:79:435  \"contract C...\"
+            sstore(/** @src -1:-1:-1 */ 0, /** @src 0:79:435  \"contract C...\" */ value)
             let _2 := mload(64)
             let _3 := datasize(\"C_54_deployed\")
             codecopy(_2, dataoffset(\"C_54_deployed\"), _3)
-            setimmutable(_2, \"8\", mload(128))
-            return(_2, _3)
-        }
-        /// @ast-id 20 @src 0:182:230  \"constructor(int _init)...\"
-        function constructor_C(var_init)
-        {
-            /// @src 0:154:156  \"42\"
-            mstore(128, 0x2a)
+            setimmutable(_2, \"8\", mload(/** @src 0:154:156  \"42\" */ 128))
             /// @src 0:79:435  \"contract C...\"
-            sstore(/** @src 0:210:226  \"stateVar = _init\" */ 0x00, /** @src 0:79:435  \"contract C...\" */ var_init)
+            return(_2, _3)
         }
     }
     /// @use-src 0:\"C\"
@@ -646,118 +643,120 @@ object \"C_54\" {
         code {
             {
                 /// @src 0:79:435  \"contract C...\"
-                mstore(64, memoryguard(0x80))
+                let _1 := memoryguard(0x80)
+                let _2 := 64
+                mstore(_2, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    switch shr(224, calldataload(_1))
+                    let _3 := 0
+                    switch shr(224, calldataload(_3))
                     case 0x26121ff0 {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        if callvalue() { revert(_3, _3) }
+                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
                         /// @src 0:297:305  \"immutVar\"
-                        let _2 := loadimmutable(\"8\")
+                        let _4 := loadimmutable(\"8\")
                         /// @src 0:79:435  \"contract C...\"
-                        if and(1, sgt(_2, sub(shl(255, 1), 42))) { panic_error_0x11() }
-                        let memPos := mload(64)
-                        mstore(memPos, add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 0:79:435  \"contract C...\" */ _2))
+                        if and(1, sgt(_4, sub(shl(255, 1), 42)))
+                        {
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(4, 0x11)
+                            revert(_3, 0x24)
+                        }
+                        mstore(_1, add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 0:79:435  \"contract C...\" */ _4))
+                        return(_1, 32)
+                    }
+                    case 0x793816ec {
+                        if callvalue() { revert(_3, _3) }
+                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        let _5 := sload(_3)
+                        let memPos := mload(_2)
+                        mstore(memPos, _5)
                         return(memPos, 32)
                     }
-                    case 0x793816ec { external_fun_stateVar() }
-                    case 0x9942ec6f { external_fun_f2() }
-                    case 0xa00b982b { external_fun_constVar() }
+                    case 0x9942ec6f {
+                        if callvalue() { revert(_3, _3) }
+                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        let _6 := sload(_3)
+                        if eq(_6, sub(shl(255, 1), 1))
+                        {
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(4, 0x11)
+                            revert(_3, 0x24)
+                        }
+                        let ret := add(_6, 1)
+                        sstore(_3, ret)
+                        /// @src 0:410:418  \"this.f()\"
+                        let _7 := /** @src 0:79:435  \"contract C...\" */ mload(_2)
+                        /// @src 0:410:418  \"this.f()\"
+                        mstore(_7, /** @src 0:79:435  \"contract C...\" */ shl(228, 0x026121ff))
+                        /// @src 0:410:418  \"this.f()\"
+                        let _8 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _7, /** @src 0:79:435  \"contract C...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _7, 32)
+                        if iszero(_8)
+                        {
+                            /// @src 0:79:435  \"contract C...\"
+                            let pos := mload(_2)
+                            returndatacopy(pos, _3, returndatasize())
+                            revert(pos, returndatasize())
+                        }
+                        /// @src 0:410:418  \"this.f()\"
+                        let expr := /** @src 0:79:435  \"contract C...\" */ _3
+                        /// @src 0:410:418  \"this.f()\"
+                        if _8
+                        {
+                            let _9 := 32
+                            if gt(_9, returndatasize()) { _9 := returndatasize() }
+                            /// @src 0:79:435  \"contract C...\"
+                            let newFreePtr := add(_7, and(add(_9, 31), not(31)))
+                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _7))
+                            {
+                                mstore(_3, shl(224, 0x4e487b71))
+                                mstore(4, 0x41)
+                                revert(_3, 0x24)
+                            }
+                            mstore(_2, newFreePtr)
+                            if slt(sub(/** @src 0:410:418  \"this.f()\" */ add(_7, _9), /** @src 0:79:435  \"contract C...\" */ _7), /** @src 0:410:418  \"this.f()\" */ 32)
+                            /// @src 0:79:435  \"contract C...\"
+                            { revert(_3, _3) }
+                            /// @src 0:410:418  \"this.f()\"
+                            expr := /** @src 0:79:435  \"contract C...\" */ mload(_7)
+                        }
+                        /// @src 0:399:418  \"stateVar + this.f()\"
+                        let expr_1 := checked_add_int256(ret, expr)
+                        /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
+                        let var := /** @src 0:399:429  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:421:429  \"immutVar\" */ loadimmutable(\"8\"))
+                        /// @src 0:79:435  \"contract C...\"
+                        let memPos_1 := mload(_2)
+                        mstore(memPos_1, var)
+                        return(memPos_1, /** @src 0:410:418  \"this.f()\" */ 32)
+                    }
+                    case /** @src 0:79:435  \"contract C...\" */ 0xa00b982b {
+                        if callvalue() { revert(_3, _3) }
+                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        let memPos_2 := mload(_2)
+                        mstore(memPos_2, /** @src 0:124:126  \"41\" */ 0x29)
+                        /// @src 0:79:435  \"contract C...\"
+                        return(memPos_2, 32)
+                    }
                 }
                 revert(0, 0)
             }
-            function abi_encode_int256(headStart, value0) -> tail
-            {
-                tail := add(headStart, 32)
-                mstore(headStart, value0)
-            }
-            function external_fun_stateVar()
-            {
-                if callvalue() { revert(0, 0) }
-                if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                let _1 := sload(0)
-                let memPos := mload(64)
-                mstore(memPos, _1)
-                return(memPos, 32)
-            }
-            function external_fun_f2()
+            function checked_add_int256(x, y) -> sum
             {
-                if callvalue() { revert(0, 0) }
-                let _1 := 0
-                if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                let _2 := sload(_1)
-                if eq(_2, sub(shl(255, 1), 1)) { panic_error_0x11() }
-                let ret := add(_2, 1)
-                sstore(_1, ret)
-                /// @src 0:410:418  \"this.f()\"
-                let _3 := /** @src 0:79:435  \"contract C...\" */ mload(64)
-                /// @src 0:410:418  \"this.f()\"
-                mstore(_3, /** @src 0:79:435  \"contract C...\" */ shl(228, 0x026121ff))
-                /// @src 0:410:418  \"this.f()\"
-                let _4 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _3, /** @src 0:79:435  \"contract C...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _3, 32)
-                if iszero(_4)
+                let _1 := slt(x, 0)
+                if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x)))
                 {
-                    /// @src 0:79:435  \"contract C...\"
-                    let pos := mload(64)
-                    returndatacopy(pos, _1, returndatasize())
-                    revert(pos, returndatasize())
+                    mstore(0, shl(224, 0x4e487b71))
+                    mstore(4, 0x11)
+                    revert(0, 0x24)
                 }
-                /// @src 0:410:418  \"this.f()\"
-                let expr := /** @src 0:79:435  \"contract C...\" */ _1
-                /// @src 0:410:418  \"this.f()\"
-                if _4
+                if and(_1, slt(y, sub(shl(255, 1), x)))
                 {
-                    let _5 := 32
-                    if gt(_5, returndatasize()) { _5 := returndatasize() }
-                    /// @src 0:79:435  \"contract C...\"
-                    let newFreePtr := add(_3, and(add(_5, 31), not(31)))
-                    if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _3))
-                    {
-                        mstore(_1, shl(224, 0x4e487b71))
-                        mstore(4, 0x41)
-                        revert(_1, 0x24)
-                    }
-                    mstore(64, newFreePtr)
-                    /// @src 0:410:418  \"this.f()\"
-                    expr := abi_decode_int256_fromMemory(_3, add(_3, _5))
+                    mstore(0, shl(224, 0x4e487b71))
+                    mstore(4, 0x11)
+                    revert(0, 0x24)
                 }
-                /// @src 0:399:418  \"stateVar + this.f()\"
-                let expr_1 := checked_add_int256(ret, expr)
-                /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
-                let var := /** @src 0:399:429  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:421:429  \"immutVar\" */ loadimmutable(\"8\"))
-                /// @src 0:79:435  \"contract C...\"
-                let memPos := mload(64)
-                return(memPos, sub(abi_encode_int256(memPos, var), memPos))
-            }
-            function external_fun_constVar()
-            {
-                if callvalue() { revert(0, 0) }
-                if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                let memPos := mload(64)
-                mstore(memPos, /** @src 0:124:126  \"41\" */ 0x29)
-                /// @src 0:79:435  \"contract C...\"
-                return(memPos, 32)
-            }
-            function panic_error_0x11()
-            {
-                mstore(0, shl(224, 0x4e487b71))
-                mstore(4, 0x11)
-                revert(0, 0x24)
-            }
-            function checked_add_int256(x, y) -> sum
-            {
-                let _1 := slt(x, 0)
-                if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x))) { panic_error_0x11() }
-                if and(_1, slt(y, sub(shl(255, 1), x))) { panic_error_0x11() }
                 sum := add(x, y)
             }
-            function abi_decode_int256_fromMemory(headStart, dataEnd) -> value0
-            {
-                if slt(sub(dataEnd, headStart), 32) { revert(0, 0) }
-                value0 := mload(headStart)
-            }
         }
         data \".metadata\" hex\"<BYTECODE REMOVED>\"
     }
@@ -1457,26 +1456,23 @@ object \"D_72\" {
                 revert(/** @src -1:-1:-1 */ 0, 0)
             }
             /// @src 1:91:166  \"contract D is C(3)...\"
-            constructor_D(mload(_1))
-            let _2 := mload(64)
-            let _3 := datasize(\"D_72_deployed\")
-            codecopy(_2, dataoffset(\"D_72_deployed\"), _3)
-            setimmutable(_2, \"8\", mload(128))
-            return(_2, _3)
-        }
-        /// @ast-id 71 @src 1:113:164  \"constructor(int _init2)...\"
-        function constructor_D(var_init2)
-        {
+            let value := mload(_1)
             /// @src 0:154:156  \"42\"
             mstore(128, 0x2a)
             /// @src 1:91:166  \"contract D is C(3)...\"
-            if and(1, sgt(var_init2, sub(shl(255, 1), 4)))
+            if and(1, sgt(value, sub(shl(255, 1), 4)))
             {
-                mstore(0, shl(224, 0x4e487b71))
+                mstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(224, 0x4e487b71))
                 mstore(4, 0x11)
-                revert(0, 0x24)
+                revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ 0x24)
             }
-            sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ add(/** @src 1:107:108  \"3\" */ 0x03, /** @src 1:91:166  \"contract D is C(3)...\" */ var_init2))
+            sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ add(/** @src 1:107:108  \"3\" */ 0x03, /** @src 1:91:166  \"contract D is C(3)...\" */ value))
+            let _2 := mload(64)
+            let _3 := datasize(\"D_72_deployed\")
+            codecopy(_2, dataoffset(\"D_72_deployed\"), _3)
+            setimmutable(_2, \"8\", mload(/** @src 0:154:156  \"42\" */ 128))
+            /// @src 1:91:166  \"contract D is C(3)...\"
+            return(_2, _3)
         }
     }
     /// @use-src 0:\"C\", 1:\"D\"
@@ -1484,118 +1480,120 @@ object \"D_72\" {
         code {
             {
                 /// @src 1:91:166  \"contract D is C(3)...\"
-                mstore(64, memoryguard(0x80))
+                let _1 := memoryguard(0x80)
+                let _2 := 64
+                mstore(_2, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    switch shr(224, calldataload(_1))
+                    let _3 := 0
+                    switch shr(224, calldataload(_3))
                     case 0x26121ff0 {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
+                        if callvalue() { revert(_3, _3) }
+                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
                         /// @src 0:297:305  \"immutVar\"
-                        let _2 := loadimmutable(\"8\")
+                        let _4 := loadimmutable(\"8\")
                         /// @src 1:91:166  \"contract D is C(3)...\"
-                        if and(1, sgt(_2, sub(shl(255, 1), 42))) { panic_error_0x11() }
-                        let memPos := mload(64)
-                        mstore(memPos, add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 1:91:166  \"contract D is C(3)...\" */ _2))
+                        if and(1, sgt(_4, sub(shl(255, 1), 42)))
+                        {
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(4, 0x11)
+                            revert(_3, 0x24)
+                        }
+                        mstore(_1, add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 1:91:166  \"contract D is C(3)...\" */ _4))
+                        return(_1, 32)
+                    }
+                    case 0x793816ec {
+                        if callvalue() { revert(_3, _3) }
+                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        let _5 := sload(_3)
+                        let memPos := mload(_2)
+                        mstore(memPos, _5)
                         return(memPos, 32)
                     }
-                    case 0x793816ec { external_fun_stateVar() }
-                    case 0x9942ec6f { external_fun_f2() }
-                    case 0xa00b982b { external_fun_constVar() }
+                    case 0x9942ec6f {
+                        if callvalue() { revert(_3, _3) }
+                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        let _6 := sload(_3)
+                        if eq(_6, sub(shl(255, 1), 1))
+                        {
+                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(4, 0x11)
+                            revert(_3, 0x24)
+                        }
+                        let ret := add(_6, 1)
+                        sstore(_3, ret)
+                        /// @src 0:410:418  \"this.f()\"
+                        let _7 := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_2)
+                        /// @src 0:410:418  \"this.f()\"
+                        mstore(_7, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
+                        /// @src 0:410:418  \"this.f()\"
+                        let _8 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _7, /** @src 1:91:166  \"contract D is C(3)...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _7, 32)
+                        if iszero(_8)
+                        {
+                            /// @src 1:91:166  \"contract D is C(3)...\"
+                            let pos := mload(_2)
+                            returndatacopy(pos, _3, returndatasize())
+                            revert(pos, returndatasize())
+                        }
+                        /// @src 0:410:418  \"this.f()\"
+                        let expr := /** @src 1:91:166  \"contract D is C(3)...\" */ _3
+                        /// @src 0:410:418  \"this.f()\"
+                        if _8
+                        {
+                            let _9 := 32
+                            if gt(_9, returndatasize()) { _9 := returndatasize() }
+                            /// @src 1:91:166  \"contract D is C(3)...\"
+                            let newFreePtr := add(_7, and(add(_9, 31), not(31)))
+                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _7))
+                            {
+                                mstore(_3, shl(224, 0x4e487b71))
+                                mstore(4, 0x41)
+                                revert(_3, 0x24)
+                            }
+                            mstore(_2, newFreePtr)
+                            if slt(sub(/** @src 0:410:418  \"this.f()\" */ add(_7, _9), /** @src 1:91:166  \"contract D is C(3)...\" */ _7), /** @src 0:410:418  \"this.f()\" */ 32)
+                            /// @src 1:91:166  \"contract D is C(3)...\"
+                            { revert(_3, _3) }
+                            /// @src 0:410:418  \"this.f()\"
+                            expr := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_7)
+                        }
+                        /// @src 0:399:418  \"stateVar + this.f()\"
+                        let expr_1 := checked_add_int256(ret, expr)
+                        /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
+                        let var := /** @src 0:399:429  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:421:429  \"immutVar\" */ loadimmutable(\"8\"))
+                        /// @src 1:91:166  \"contract D is C(3)...\"
+                        let memPos_1 := mload(_2)
+                        mstore(memPos_1, var)
+                        return(memPos_1, /** @src 0:410:418  \"this.f()\" */ 32)
+                    }
+                    case /** @src 1:91:166  \"contract D is C(3)...\" */ 0xa00b982b {
+                        if callvalue() { revert(_3, _3) }
+                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        let memPos_2 := mload(_2)
+                        mstore(memPos_2, /** @src 0:124:126  \"41\" */ 0x29)
+                        /// @src 1:91:166  \"contract D is C(3)...\"
+                        return(memPos_2, 32)
+                    }
                 }
                 revert(0, 0)
             }
-            function abi_encode_int256(headStart, value0) -> tail
-            {
-                tail := add(headStart, 32)
-                mstore(headStart, value0)
-            }
-            function external_fun_stateVar()
-            {
-                if callvalue() { revert(0, 0) }
-                if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                let _1 := sload(0)
-                let memPos := mload(64)
-                mstore(memPos, _1)
-                return(memPos, 32)
-            }
-            function external_fun_f2()
+            function checked_add_int256(x, y) -> sum
             {
-                if callvalue() { revert(0, 0) }
-                let _1 := 0
-                if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                let _2 := sload(_1)
-                if eq(_2, sub(shl(255, 1), 1)) { panic_error_0x11() }
-                let ret := add(_2, 1)
-                sstore(_1, ret)
-                /// @src 0:410:418  \"this.f()\"
-                let _3 := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(64)
-                /// @src 0:410:418  \"this.f()\"
-                mstore(_3, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
-                /// @src 0:410:418  \"this.f()\"
-                let _4 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _3, /** @src 1:91:166  \"contract D is C(3)...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _3, 32)
-                if iszero(_4)
+                let _1 := slt(x, 0)
+                if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x)))
                 {
-                    /// @src 1:91:166  \"contract D is C(3)...\"
-                    let pos := mload(64)
-                    returndatacopy(pos, _1, returndatasize())
-                    revert(pos, returndatasize())
+                    mstore(0, shl(224, 0x4e487b71))
+                    mstore(4, 0x11)
+                    revert(0, 0x24)
                 }
-                /// @src 0:410:418  \"this.f()\"
-                let expr := /** @src 1:91:166  \"contract D is C(3)...\" */ _1
-                /// @src 0:410:418  \"this.f()\"
-                if _4
+                if and(_1, slt(y, sub(shl(255, 1), x)))
                 {
-                    let _5 := 32
-                    if gt(_5, returndatasize()) { _5 := returndatasize() }
-                    /// @src 1:91:166  \"contract D is C(3)...\"
-                    let newFreePtr := add(_3, and(add(_5, 31), not(31)))
-                    if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _3))
-                    {
-                        mstore(_1, shl(224, 0x4e487b71))
-                        mstore(4, 0x41)
-                        revert(_1, 0x24)
-                    }
-                    mstore(64, newFreePtr)
-                    /// @src 0:410:418  \"this.f()\"
-                    expr := abi_decode_int256_fromMemory(_3, add(_3, _5))
+                    mstore(0, shl(224, 0x4e487b71))
+                    mstore(4, 0x11)
+                    revert(0, 0x24)
                 }
-                /// @src 0:399:418  \"stateVar + this.f()\"
-                let expr_1 := checked_add_int256(ret, expr)
-                /// @src 0:392:429  \"return stateVar + this.f() + immutVar\"
-                let var := /** @src 0:399:429  \"stateVar + this.f() + immutVar\" */ checked_add_int256(expr_1, /** @src 0:421:429  \"immutVar\" */ loadimmutable(\"8\"))
-                /// @src 1:91:166  \"contract D is C(3)...\"
-                let memPos := mload(64)
-                return(memPos, sub(abi_encode_int256(memPos, var), memPos))
-            }
-            function external_fun_constVar()
-            {
-                if callvalue() { revert(0, 0) }
-                if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
-                let memPos := mload(64)
-                mstore(memPos, /** @src 0:124:126  \"41\" */ 0x29)
-                /// @src 1:91:166  \"contract D is C(3)...\"
-                return(memPos, 32)
-            }
-            function panic_error_0x11()
-            {
-                mstore(0, shl(224, 0x4e487b71))
-                mstore(4, 0x11)
-                revert(0, 0x24)
-            }
-            function checked_add_int256(x, y) -> sum
-            {
-                let _1 := slt(x, 0)
-                if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x))) { panic_error_0x11() }
-                if and(_1, slt(y, sub(shl(255, 1), x))) { panic_error_0x11() }
                 sum := add(x, y)
             }
-            function abi_decode_int256_fromMemory(headStart, dataEnd) -> value0
-            {
-                if slt(sub(dataEnd, headStart), 32) { revert(0, 0) }
-                value0 := mload(headStart)
-            }
         }
         data \".metadata\" hex\"<BYTECODE REMOVED>\"
     }
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
index 5d4e894801..0cdfc6b8bd 100644
--- a/test/cmdlineTests/viair_subobject_optimization/output
+++ b/test/cmdlineTests/viair_subobject_optimization/output
@@ -3,7 +3,7 @@
 EVM assembly:
     /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
   0x80
-  jumpi(tag_6, callvalue)
+  jumpi(tag_7, callvalue)
   0x1f
   bytecodeSize
   codesize
@@ -25,7 +25,7 @@ EVM assembly:
   dup5
   lt
   or
-  tag_4
+  tag_3
   jumpi
   dup1
   dup5
@@ -40,14 +40,16 @@ EVM assembly:
   add
   sub
   slt
-  tag_6
+  tag_7
   jumpi
-  tag_8
-  swap1
   mload
-  tag_1
-  jump	// in
-tag_8:
+  sub(shl(0x48, 0x01), 0xbe)
+    /* "viair_subobject_optimization/input.sol":620:645  x == 0xFFFFFFFFFFFFFFFF42 */
+  eq
+    /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
+  tag_7
+  jumpi
+    /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
   mload(0x40)
   dataSize(sub_0)
   swap1
@@ -56,24 +58,17 @@ tag_8:
   dup3
   codecopy
   return
-tag_6:
+    /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
+tag_7:
   0x00
+    /* "viair_subobject_optimization/input.sol":653:661  revert() */
   dup1
   revert
-tag_4:
+    /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
+tag_3:
   mstore(0x00, shl(0xe0, 0x4e487b71))
   mstore(0x04, 0x41)
   revert(0x00, 0x24)
-    /* "viair_subobject_optimization/input.sol":76:666  constructor(uint x) {... */
-tag_1:
-  sub(shl(0x48, 0x01), 0xbe)
-    /* "viair_subobject_optimization/input.sol":620:645  x == 0xFFFFFFFFFFFFFFFF42 */
-  eq
-    /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
-  tag_6
-  jumpi
-    /* "viair_subobject_optimization/input.sol":76:666  constructor(uint x) {... */
-  jump	// out
 stop
 
 sub_0: assembly {
@@ -110,163 +105,162 @@ stop
 sub_0: assembly {
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
       0x80
-      jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
+      jumpi(tag_1, iszero(lt(calldatasize, 0x04)))
       0x00
       dup1
       revert
-    tag_2:
+    tag_1:
       0x00
-      swap1
-      dup2
+      dup1
       calldataload
       0xe0
       shr
       0x26121ff0
       eq
-      tag_4
+      tag_3
       jumpi
       0x00
       dup1
       revert
-    tag_4:
-      jumpi(tag_8, callvalue)
-      dup2
+    tag_3:
+      jumpi(tag_7, callvalue)
+      dup1
       add(calldatasize, not(0x03))
       slt
-      tag_8
+      tag_7
       jumpi
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
       dataSize(sub_0)
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      0x3f
+      not(0x1f)
+      swap1
       dup2
+      0x3f
+      dup3
       add
-      not(0x1f)
       and
-      dup3
+      dup5
       add
+      swap3
+      dup5
+      dup5
+      lt
       0xffffffffffffffff
-      dup2
+      dup6
       gt
-      dup4
-      dup3
-      lt
       or
-      tag_10
+      tag_9
       jumpi
-      tag_12
-      swap4
-      pop
+      swap3
+      swap2
+      dup5
       0x40
+      swap4
+      dup5
       mstore
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
-      dup1
       dup3
+      dup2
       mstore
-      dataOffset(sub_0)
       0x20
+      swap3
+      dataOffset(sub_0)
+      dup5
       dup4
       add
       codecopy
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      mload(0x40)
-      swap2
-      dup3
-      swap2
-      dup3
-      tag_1
-      jump	// in
-    tag_12:
-      sub
-      swap1
-      return
-    tag_10:
-      shl(0xe0, 0x4e487b71)
-      dup5
+      dup4
+      mload
+      swap5
+      dup4
+      dup7
+      swap5
+      dup6
       mstore
-      mstore(0x04, 0x41)
-      0x24
-      dup5
-      revert
-    tag_8:
-      pop
-      dup1
-      revert
-    tag_1:
-      swap2
-      swap1
-      swap2
-      0x20
-      dup1
       dup3
-      mstore
-      dup4
       mload
-      swap1
-      dup2
-      dup2
-      dup5
+      swap3
+      dup4
+      dup3
+      dup8
       add
       mstore
-      0x00
-      swap5
-    tag_13:
       dup3
-      dup7
+      swap2
+    tag_11:
+      dup5
+      dup4
       lt
-      tag_14
+      tag_12
       jumpi
       pop
       pop
-      dup1
-      0x40
+      swap1
+      dup3
+      0x1f
       swap4
-      swap5
+      swap3
       gt
-      tag_16
+      tag_14
       jumpi
-    tag_17:
-      0x1f
+    tag_15:
+      pop
       add
-      not(0x1f)
       and
+      dup2
       add
+      sub
       add
       swap1
-      jump	// out
-    tag_16:
-      0x00
-      dup4
+      return
+    tag_14:
+      dup6
       dup3
-      dup5
+      dup7
       add
       add
       mstore
-      jump(tag_17)
-    tag_14:
-      dup6
+      dup7
+      jump(tag_15)
+    tag_12:
       dup2
+      dup4
       add
-      dup3
+      dup2
       add
       mload
+      dup10
       dup5
-      dup8
       add
-      0x40
+      dup10
       add
       mstore
-      swap5
-      dup2
+      dup9
+      swap7
+      pop
+      swap2
+      dup3
       add
-      swap5
-      jump(tag_13)
+      swap2
+      jump(tag_11)
+    tag_9:
+      shl(0xe0, 0x4e487b71)
+      dup2
+      mstore
+      mstore(0x04, 0x41)
+      0x24
+      swap1
+      revert
+    tag_7:
+      dup1
+      revert
     stop
 
     sub_0: assembly {
             /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
           0x80
-          jumpi(tag_6, callvalue)
+          jumpi(tag_7, callvalue)
           0x1f
           bytecodeSize
           codesize
@@ -288,7 +282,7 @@ sub_0: assembly {
           dup5
           lt
           or
-          tag_4
+          tag_3
           jumpi
           dup1
           dup5
@@ -303,14 +297,16 @@ sub_0: assembly {
           add
           sub
           slt
-          tag_6
+          tag_7
           jumpi
-          tag_8
-          swap1
           mload
-          tag_1
-          jump	// in
-        tag_8:
+          sub(shl(0x48, 0x01), 0xbe)
+            /* "viair_subobject_optimization/input.sol":620:645  x == 0xFFFFFFFFFFFFFFFF42 */
+          eq
+            /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
+          tag_7
+          jumpi
+            /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
           mload(0x40)
           dataSize(sub_0)
           swap1
@@ -319,24 +315,17 @@ sub_0: assembly {
           dup3
           codecopy
           return
-        tag_6:
+            /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
+        tag_7:
           0x00
+            /* "viair_subobject_optimization/input.sol":653:661  revert() */
           dup1
           revert
-        tag_4:
+            /* "viair_subobject_optimization/input.sol":61:668  contract C {... */
+        tag_3:
           mstore(0x00, shl(0xe0, 0x4e487b71))
           mstore(0x04, 0x41)
           revert(0x00, 0x24)
-            /* "viair_subobject_optimization/input.sol":76:666  constructor(uint x) {... */
-        tag_1:
-          sub(shl(0x48, 0x01), 0xbe)
-            /* "viair_subobject_optimization/input.sol":620:645  x == 0xFFFFFFFFFFFFFFFF42 */
-          eq
-            /* "viair_subobject_optimization/input.sol":616:661  if (x == 0xFFFFFFFFFFFFFFFF42)... */
-          tag_6
-          jumpi
-            /* "viair_subobject_optimization/input.sol":76:666  constructor(uint x) {... */
-          jump	// out
         stop
 
         sub_0: assembly {
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index bec4adfbdd..a2b855b853 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
@@ -22,6 +22,6 @@ contract C {
 
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
-// gas irOptimized: 203310
+// gas irOptimized: 203172
 // gas legacy: 206075
 // gas legacyOptimized: 203059
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 066891e2d0..d1fe673a27 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -59,10 +59,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 371912
+// gas irOptimized: 367365
 // gas legacy: 416585
 // gas legacyOptimized: 322043
 // test_uint256() ->
-// gas irOptimized: 523016
+// gas irOptimized: 515982
 // gas legacy: 583100
 // gas legacyOptimized: 444161
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index 659dabfb37..4a9d86592e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -24,6 +24,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 167691
+// gas irOptimized: 166606
 // gas legacy: 169347
 // gas legacyOptimized: 167269
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 316d43673c..592595df36 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 371912
+// gas irOptimized: 367365
 // gas legacy: 416585
 // gas legacyOptimized: 322043
 // test_uint256() ->
-// gas irOptimized: 523016
+// gas irOptimized: 515982
 // gas legacy: 583100
 // gas legacyOptimized: 444161
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index 3119eaa279..5a1c2aebf8 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -51,6 +51,6 @@ contract C {
 // f2() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f4() -> 0x20, 0x160, 0x1, 0x80, 0xc0, 0x2, 0x3, "abc", 0x7, 0x40, 0x2, 0x2, 0x3
-// gas irOptimized: 113277
+// gas irOptimized: 112820
 // gas legacy: 114900
 // gas legacyOptimized: 112606
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index 46743becc3..e0ab2c97f6 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -30,6 +30,6 @@ contract C is B {
 }
 // ----
 // test() -> 77
-// gas irOptimized: 119711
+// gas irOptimized: 120170
 // gas legacy: 155093
 // gas legacyOptimized: 111550
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 8b68547ac8..3e3dcc274b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -20,6 +20,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 171829
+// gas irOptimized: 128098
 // gas legacy: 140672
 // gas legacyOptimized: 119588
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index 90287c2b05..def976b932 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -18,10 +18,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 180924
+// gas irOptimized: 180882
 // gas legacy: 184929
 // gas legacyOptimized: 181504
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112520
+// gas irOptimized: 112533
 // gas legacy: 115468
 // gas legacyOptimized: 112988
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index 54c1c5a643..524394ff81 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -9,6 +9,6 @@ contract C {
 
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
-// gas irOptimized: 135918
+// gas irOptimized: 135787
 // gas legacy: 137181
 // gas legacyOptimized: 136073
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index 9a4fe29c02..b03e5a8be1 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -12,7 +12,7 @@ contract Test {
 }
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 189800
+// gas irOptimized: 189640
 // gas legacy: 211149
 // gas legacyOptimized: 206054
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index 5bc726b2c9..fad9647ec1 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 157949
+// gas irOptimized: 157200
 // gas legacy: 188576
 // gas legacyOptimized: 183333
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index 575c393f78..8e7b526cfe 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -13,7 +13,7 @@ contract c {
 // ----
 // getLength() -> 0
 // set(): 1, 2 -> true
-// gas irOptimized: 110435
+// gas irOptimized: 110402
 // gas legacy: 110723
 // gas legacyOptimized: 110564
 // getLength() -> 68
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
index 25567742df..32e56ae1bb 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -9,7 +9,7 @@ contract C {
 
 // ----
 // constructor(): 1, 2, 3 ->
-// gas irOptimized: 142640
+// gas irOptimized: 141700
 // gas legacy: 183490
 // gas legacyOptimized: 151938
 // a(uint256): 0 -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
index 75b83bad3d..10564fb9be 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -20,7 +20,7 @@ contract c {
 }
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
-// gas irOptimized: 650608
+// gas irOptimized: 650748
 // gas legacy: 694515
 // gas legacyOptimized: 694013
 // retrieve() -> 9, 28, 9, 28, 4, 3, 32
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
index c74ddcd35c..be6b3350ed 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> true
-// gas irOptimized: 153260
+// gas irOptimized: 146913
 // gas legacy: 155961
 // gas legacyOptimized: 153588
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
index 66ab6f0998..5a50d7573b 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 0
-// gas irOptimized: 135098
+// gas irOptimized: 134352
 // gas legacy: 135313
 // gas legacyOptimized: 134548
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 040a954cd5..a7f05f80d7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -19,6 +19,6 @@ contract c {
 
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 212564
+// gas irOptimized: 209152
 // gas legacy: 221856
 // gas legacyOptimized: 220680
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index d99e42cacf..b98ddec9d7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -35,12 +35,12 @@ contract c {
 }
 // ----
 // test() -> 0x02000202
-// gas irOptimized: 4652048
+// gas irOptimized: 4649903
 // gas legacy: 4578320
 // gas legacyOptimized: 4548312
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4483170
+// gas irOptimized: 4477229
 // gas legacy: 4410748
 // gas legacyOptimized: 4382489
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index 0e085f96ec..9b693d0b7a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -13,6 +13,6 @@ contract c {
 
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
-// gas irOptimized: 690203
+// gas irOptimized: 689834
 // gas legacy: 686268
 // gas legacyOptimized: 685688
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
index 370449cb2c..a0e600d1a6 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4
-// gas irOptimized: 225954
+// gas irOptimized: 225027
 // gas legacy: 233801
 // gas legacyOptimized: 232816
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
index d8487421dc..3e59244bdc 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -23,6 +23,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 3, 4
-// gas irOptimized: 190480
+// gas irOptimized: 189690
 // gas legacy: 195353
 // gas legacyOptimized: 192441
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
index 34c251871b..aa508fe4df 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
@@ -15,7 +15,7 @@ contract c {
 // ----
 // setData1(uint256,uint256,uint256): 10, 5, 4 ->
 // copyStorageStorage() ->
-// gas irOptimized: 111387
+// gas irOptimized: 111374
 // gas legacy: 109278
 // gas legacyOptimized: 109268
 // getData2(uint256): 5 -> 10, 4
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
index 0dfaf0a687..c9ae2c0e63 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
@@ -18,6 +18,6 @@ contract c {
 
 // ----
 // test() -> 5, 4
-// gas irOptimized: 272736
+// gas irOptimized: 272950
 // gas legacy: 270834
 // gas legacyOptimized: 269960
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
index a8e2930bf5..99e6b06f0d 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
@@ -12,6 +12,6 @@ contract c {
 
 // ----
 // test() -> 9, 4
-// gas irOptimized: 123162
+// gas irOptimized: 123143
 // gas legacy: 123579
 // gas legacyOptimized: 123208
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
index 3926ca56bd..0225f421cf 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
@@ -17,7 +17,7 @@ contract c {
 }
 // ----
 // test() -> 4, 5
-// gas irOptimized: 238799
+// gas irOptimized: 238692
 // gas legacy: 238736
 // gas legacyOptimized: 237159
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
index ef3d06e9dd..0aa448e98a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
@@ -15,6 +15,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
-// gas irOptimized: 161780
+// gas irOptimized: 161777
 // gas legacy: 162278
 // gas legacyOptimized: 159955
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index 318bf5cfda..423d8a173c 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -19,6 +19,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 129167
+// gas irOptimized: 124757
 // gas legacy: 186184
 // gas legacyOptimized: 165682
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index 3bef131448..5c01bf2199 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -21,6 +21,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
-// gas irOptimized: 294770
+// gas irOptimized: 293621
 // gas legacy: 303626
 // gas legacyOptimized: 301945
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index 742ea5e2da..89e30b0d42 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -21,6 +21,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
-// gas irOptimized: 273961
+// gas irOptimized: 273177
 // gas legacy: 276360
 // gas legacyOptimized: 275411
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
index 834f4d28c6..6a88746812 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
@@ -38,10 +38,10 @@ contract c {
 // compileViaYul: true
 // ----
 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 181298
+// gas irOptimized: 180723
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 157929
+// gas irOptimized: 157518
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 135098
+// gas irOptimized: 134709
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
-// gas irOptimized: 111346
+// gas irOptimized: 111324
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index 744ad87060..afa1c8013e 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -38,12 +38,12 @@ contract Test {
 }
 // ----
 // test() -> 24
-// gas irOptimized: 227133
+// gas irOptimized: 226714
 // gas legacy: 227133
 // gas legacyOptimized: 226547
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 133590
+// gas irOptimized: 133317
 // gas legacy: 134295
 // gas legacyOptimized: 133383
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
index af5cd5a55f..3b150f4f78 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
@@ -45,7 +45,7 @@ contract C {
 }
 // ----
 // copyExternalStorageArrayOfFunctionType() -> true
-// gas irOptimized: 104659
+// gas irOptimized: 104615
 // gas legacy: 108722
 // gas legacyOptimized: 102438
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
index cc1863859b..6576149eb9 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -48,7 +48,7 @@ contract C {
 }
 // ----
 // copyExternalStorageArraysOfFunctionType() -> true
-// gas irOptimized: 104332
+// gas irOptimized: 104288
 // gas legacy: 108459
 // gas legacyOptimized: 102171
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
index c4aa6ac4b7..a8bacdda68 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
@@ -17,4 +17,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
-// gas irOptimized: 121019
+// gas irOptimized: 119740
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
index 0c554a32fe..09653d5369 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
@@ -19,4 +19,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 10, 11, 12
-// gas irOptimized: 119148
+// gas irOptimized: 118394
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
index 7d4e1f845f..e3c8eafdbc 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
@@ -23,4 +23,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
-// gas irOptimized: 328592
+// gas irOptimized: 327727
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
index 0b1d71bdf2..d818734649 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 3, 3, 3, 1
-// gas irOptimized: 183316
+// gas irOptimized: 182521
diff --git a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
index 1901908973..fbb7244c52 100644
--- a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
@@ -14,6 +14,6 @@ contract C {
 // compileToEwasm: also
 // ----
 // f() -> 1, 2, 3
-// gas irOptimized: 132298
+// gas irOptimized: 131933
 // gas legacy: 134619
 // gas legacyOptimized: 131940
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
index 0d546e188c..7358e1506d 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -5,11 +5,11 @@ contract c {
 }
 // ----
 // set(uint256): 1, 2 -> true
-// gas irOptimized: 110604
+// gas irOptimized: 110576
 // gas legacy: 111088
 // gas legacyOptimized: 110733
 // set(uint256): 2, 2, 3, 4, 5 -> true
-// gas irOptimized: 177564
+// gas irOptimized: 177527
 // gas legacy: 178018
 // gas legacyOptimized: 177663
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 6828a1bc91..9e10630971 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -17,25 +17,25 @@ contract c {
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 121752
+// gas irOptimized: 108395
 // gas legacy: 123884
 // gas legacyOptimized: 119139
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 130727
+// gas irOptimized: 117480
 // gas legacy: 134936
 // gas legacyOptimized: 130046
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 137726
+// gas irOptimized: 124117
 // gas legacy: 141728
 // gas legacyOptimized: 136711
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 152346
+// gas irOptimized: 126467
 // gas legacy: 159768
 // gas legacyOptimized: 150641
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 406083
+// gas irOptimized: 353326
 // gas legacy: 421067
 // gas legacyOptimized: 402910
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
index 1985ac6288..80e23b3e31 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
@@ -9,6 +9,6 @@ contract C {
 }
 // ----
 // f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
-// gas irOptimized: 111159
+// gas irOptimized: 111027
 // gas legacy: 111565
 // gas legacyOptimized: 111347
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index b005b01836..308e756aec 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -35,11 +35,11 @@ contract C {
 }
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179912
+// gas irOptimized: 179880
 // gas legacy: 180676
 // gas legacyOptimized: 180070
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 107291
+// gas irOptimized: 107211
 // gas legacy: 107877
 // gas legacyOptimized: 107236
 // h() -> 0x40, 0x60, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index 6cdb4a075a..33a70fa360 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> 0xff
-// gas irOptimized: 121123
+// gas irOptimized: 119584
 // gas legacy: 128005
 // gas legacyOptimized: 123446
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index e3a368a316..9a15bdeec9 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -16,6 +16,6 @@ contract C {
 
 // ----
 // test() -> 7
-// gas irOptimized: 124034
+// gas irOptimized: 123625
 // gas legacy: 205196
 // gas legacyOptimized: 204987
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index 0172782795..9b308a010f 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -20,7 +20,7 @@ contract sender {
 // compileToEwasm: false
 // ----
 // (): 7 ->
-// gas irOptimized: 110954
+// gas irOptimized: 110826
 // gas legacy: 111071
 // gas legacyOptimized: 111016
 // val() -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index ff4ca5e4fa..38c20b8fc8 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 3
-// gas irOptimized: 129910
+// gas irOptimized: 128172
 // gas legacy: 130181
 // gas legacyOptimized: 129198
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
index f20acfc51c..ddcae981f2 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -17,6 +17,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 207781
+// gas irOptimized: 205985
 // gas legacy: 212313
 // gas legacyOptimized: 211462
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index a866301509..fe0cf95839 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -11,6 +11,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
-// gas irOptimized: 202864
+// gas irOptimized: 202952
 // gas legacy: 204441
 // gas legacyOptimized: 203419
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
index 6126dcde1e..eabcb1666c 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 207781
+// gas irOptimized: 205985
 // gas legacy: 212318
 // gas legacyOptimized: 211467
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
index ead1978848..46eae913df 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
@@ -24,6 +24,6 @@ contract C {
 }
 // ----
 // f() -> 11, 0x0c, 1, 0x15, 22, 4
-// gas irOptimized: 291848
+// gas irOptimized: 291168
 // gas legacy: 293516
 // gas legacyOptimized: 290263
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index 3c61b76c85..7f3bf1798a 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 2, 3, 4
-// gas irOptimized: 114114
+// gas irOptimized: 110135
 // gas legacy: 126350
 // gas legacyOptimized: 120704
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
index cc1d6b0a84..fbef4ccfaa 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> "A", 8, 4, "B"
-// gas irOptimized: 130592
+// gas irOptimized: 125828
 // gas legacy: 121398
 // gas legacyOptimized: 115494
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index e7d0565bfb..b9e2aa8399 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test1() -> true
-// gas irOptimized: 225890
+// gas irOptimized: 207928
 // gas legacy: 254650
 // gas legacyOptimized: 247384
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index bac47b6a4c..aec5ad0e19 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -14,7 +14,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 519884
+// gas irOptimized: 519616
 // gas legacy: 521710
 // gas legacyOptimized: 516922
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index 2eea818e02..32ed7032da 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -42,7 +42,7 @@ contract c {
 // ----
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
-// gas irOptimized: 111295
+// gas irOptimized: 111450
 // gas legacy: 108571
 // gas legacyOptimized: 100417
 // getLengths() -> 48, 49
diff --git a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
index 8eaabcc141..2e5d032d3e 100644
--- a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
@@ -16,7 +16,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() -> 8
-// gas irOptimized: 122531
+// gas irOptimized: 123024
 // gas legacy: 121756
 // gas legacyOptimized: 120687
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index 1cabe4219a..a6bbbbefd6 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -12,7 +12,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 465542
+// gas irOptimized: 465440
 // gas legacy: 471400
 // gas legacyOptimized: 467400
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index fc0f3a6e1e..4416635b62 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -19,6 +19,6 @@ contract B {
 
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 127910
+// gas irOptimized: 116813
 // gas legacy: 234719
 // gas legacyOptimized: 132639
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index fef9151b1b..2749f01025 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -9,7 +9,7 @@ contract Creator {
 }
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 129013
+// gas irOptimized: 128288
 // gas legacy: 176789
 // gas legacyOptimized: 129585
 // r() -> 4
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 25db29de41..71bd36b900 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -43,6 +43,6 @@ contract C {
 
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 292502
+// gas irOptimized: 262057
 // gas legacy: 452136
 // gas legacyOptimized: 284945
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index c5ea1ca836..4271ee6ce6 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -23,7 +23,7 @@ contract c {
 }
 // ----
 // test() -> 1, 2, 3
-// gas irOptimized: 2271044
+// gas irOptimized: 2280132
 // gas legacy: 2273434
 // gas legacyOptimized: 2261820
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index 4f08b9a93d..c85e561573 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 38, 28, 18
-// gas irOptimized: 188649
+// gas irOptimized: 186364
 // gas legacy: 189492
 // gas legacyOptimized: 178294
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index 6c2305a057..257899c1fe 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 20, 10
-// gas irOptimized: 159169
+// gas irOptimized: 158009
 // gas legacy: 159279
 // gas legacyOptimized: 152921
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index d6223c54bc..743a848d9c 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -10,6 +10,6 @@ contract c {
 
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
-// gas irOptimized: 109515
+// gas irOptimized: 109341
 // gas legacy: 126728
 // gas legacyOptimized: 123444
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index 198f797d5d..0753535e5a 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -16,7 +16,7 @@ contract c {
 }
 // ----
 // test() -> true
-// gas irOptimized: 196541
+// gas irOptimized: 180539
 // gas legacy: 228685
 // gas legacyOptimized: 209662
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index 1c04096350..0be102f175 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -10,6 +10,6 @@ contract c {
 
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 108487
+// gas irOptimized: 108146
 // gas legacy: 125610
 // gas legacyOptimized: 122582
diff --git a/test/libsolidity/semanticTests/array/push/array_push.sol b/test/libsolidity/semanticTests/array/push/array_push.sol
index bdd7a047e8..e608c6bc12 100644
--- a/test/libsolidity/semanticTests/array/push/array_push.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4, 3, 3
-// gas irOptimized: 111317
+// gas irOptimized: 111448
 // gas legacy: 111838
 // gas legacyOptimized: 111128
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
index ac5e422dcf..640afafb3d 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -12,6 +12,6 @@ contract C {
 }
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
-// gas irOptimized: 113256
+// gas irOptimized: 112776
 // gas legacy: 113686
 // gas legacyOptimized: 113499
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
index b50775f84d..5bc91a1c5e 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
@@ -20,6 +20,6 @@ contract c {
 }
 // ----
 // test() -> 2, 3, 4, 5
-// gas irOptimized: 136894
+// gas irOptimized: 136277
 // gas legacy: 147484
 // gas legacyOptimized: 146456
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index 22fe181753..8a56e757c2 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
-// gas irOptimized: 138691
+// gas irOptimized: 138230
 // gas legacy: 145150
 // gas legacyOptimized: 139171
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 35e79ccbfe..6dff7da416 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -15,6 +15,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 176495
+// gas irOptimized: 173650
 // gas legacy: 216790
 // gas legacyOptimized: 203886
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index 3d26b05998..6c006ffd69 100644
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 179590
+// gas irOptimized: 179173
 // gas legacy: 180602
 // gas legacyOptimized: 180385
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index 27bbc330e6..a99d30b415 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -27,14 +27,14 @@ contract C {
 // ----
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
-// gas irOptimized: 112517
+// gas irOptimized: 112482
 // gas legacy: 108105
 // gas legacyOptimized: 101987
 // l() -> 1
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
-// gas irOptimized: 116389
+// gas irOptimized: 116270
 // gas legacy: 107525
 // gas legacyOptimized: 96331
 // l() -> 2
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index dc6baca102..3c7b8b44bb 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -21,7 +21,7 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 185922
+// gas irOptimized: 183587
 // gas legacy: 183811
 // gas legacyOptimized: 179218
 // l() -> 70
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index 28439cf81d..fa8e84931c 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -24,6 +24,6 @@ contract Main {
 }
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 113198
+// gas irOptimized: 112899
 // gas legacy: 126596
 // gas legacyOptimized: 113823
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
index 52f189f181..f567d752db 100644
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -10,7 +10,7 @@ contract c {
 // compileToEwasm: false
 // ----
 // (): 1, 2, 3, 4, 5 ->
-// gas irOptimized: 155170
+// gas irOptimized: 155158
 // gas legacy: 155249
 // gas legacyOptimized: 155212
 // checkIfDataIsEmpty() -> false
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index a9e5f27b15..df56059b41 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 437093
+// gas irOptimized: 430087
 // gas legacy: 590683
 // gas legacyOptimized: 448326
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 3257acac99..b855e898cf 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 293203
+// gas irOptimized: 282398
 // gas legacy: 428711
 // gas legacyOptimized: 297922
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 2a9e75ffe7..a160fafcc7 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -8,7 +8,7 @@ contract Test {
 }
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 284909
+// gas irOptimized: 273340
 // gas legacy: 309607
 // gas legacyOptimized: 260566
 // m_x() -> 7
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
index 22bf1d0f22..3f12c4e27b 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -17,7 +17,7 @@ contract Main {
 }
 // ----
 // constructor(): "abc", true
-// gas irOptimized: 106683
+// gas irOptimized: 106546
 // gas legacy: 145838
 // gas legacyOptimized: 104017
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index d427bcb49a..77ba821d53 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -10,7 +10,7 @@ contract C {
 
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 174020
+// gas irOptimized: 173087
 // gas legacy: 221377
 // gas legacyOptimized: 177671
 // a() -> 1
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index 881252042d..bad8902267 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -17,6 +17,6 @@ contract C {
 }
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 120037
+// gas irOptimized: 120052
 // gas legacy: 123226
 // gas legacyOptimized: 123092
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index f7f0d5b597..5304a9b1bd 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -9,7 +9,7 @@ contract C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 103630
+// gas irOptimized: 103531
 // gas legacy: 117158
 // i() -> 2
 // k() -> 0
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index 24429f0c8c..5b3d72e6cd 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -21,7 +21,7 @@ contract D is B, C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 156071
+// gas irOptimized: 154366
 // gas legacy: 170665
 // gas legacyOptimized: 145396
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index 96e2cf1559..81065d5e92 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -12,7 +12,7 @@ contract D is C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 124199
+// gas irOptimized: 123982
 // gas legacy: 139250
 // gas legacyOptimized: 119367
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index f066ec80ba..b0996b4995 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
@@ -13,6 +13,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 114741
+// gas irOptimized: 113517
 // gas legacy: 116393
 // gas legacyOptimized: 114415
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
index 67d47bc976..1167b3ad16 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
@@ -14,6 +14,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 114741
+// gas irOptimized: 113517
 // gas legacy: 116393
 // gas legacyOptimized: 114415
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
index ab0b6918bc..9acf6c2f25 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
@@ -15,6 +15,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
-// gas irOptimized: 185444
+// gas irOptimized: 185131
 // gas legacy: 187621
 // gas legacyOptimized: 184551
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 5ca8a252b9..2626a3b00f 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -15,7 +15,7 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 173094
+// gas irOptimized: 167934
 // gas legacy: 250376
 // gas legacyOptimized: 174522
 // deposit(bytes32), 18 wei: 0x1234 ->
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index 24531f0d87..1ef41edb7e 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -17,6 +17,6 @@ contract C {
 // ----
 // deposit() ->
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
-// gas irOptimized: 343396
+// gas irOptimized: 333479
 // gas legacy: 388679
 // gas legacyOptimized: 374441
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index 7d72fd5de9..10096c03b0 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -74,7 +74,7 @@ contract FixedFeeRegistrar is Registrar {
 }
 // ----
 // constructor()
-// gas irOptimized: 402812
+// gas irOptimized: 414897
 // gas legacy: 935817
 // gas legacyOptimized: 489951
 // reserve(string), 69 ether: 0x20, 3, "abc" ->
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 4381827faa..1f4a9f60fa 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,7 +176,7 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 1529797
+// gas irOptimized: 1433406
 // gas legacy: 2435803
 // gas legacyOptimized: 1775425
 // supportsInterface(bytes4): 0x0 -> 0
@@ -184,27 +184,27 @@ contract DepositContract is IDepositContract, ERC165 {
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 122134
+// gas irOptimized: 116284
 // gas legacy: 150273
 // gas legacyOptimized: 122510
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 122134
+// gas irOptimized: 116284
 // gas legacy: 150273
 // gas legacyOptimized: 122510
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 122113
+// gas irOptimized: 116269
 // gas legacy: 150283
 // gas legacyOptimized: 122523
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 122113
+// gas irOptimized: 116269
 // gas legacy: 150283
 // gas legacyOptimized: 122523
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index a6deda59c1..444a9a27b3 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -48,7 +48,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1926032
+// gas irOptimized: 1878547
 // gas legacy: 2478955
 // gas legacyOptimized: 1877737
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index be8ef326d5..f144f16aa1 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,7 +48,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1780841
+// gas irOptimized: 1737100
 // gas legacy: 2248594
 // gas legacyOptimized: 1749096
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index 16ef5784ca..d6cdffb075 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -33,7 +33,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 455866
+// gas irOptimized: 438112
 // gas legacy: 671453
 // gas legacyOptimized: 480242
 // prb_pi() -> 3141592656369545286
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index a04628f877..c6a556a19f 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -15,7 +15,7 @@ contract D {
 }
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 200217
+// gas irOptimized: 195258
 // gas legacy: 245842
 // gas legacyOptimized: 195676
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index 5d6f34e09d..0c81a0bae8 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -17,7 +17,7 @@ contract D {
 // EVMVersion: >=constantinople
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 200380
+// gas irOptimized: 195421
 // gas legacy: 246202
 // gas legacyOptimized: 195914
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index f2de97506e..794e336cc2 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -23,7 +23,7 @@ contract C {
 
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 303935
+// gas irOptimized: 270677
 // gas legacy: 464030
 // gas legacyOptimized: 304049
 // f(uint256): 0 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index 375db7ca51..7501d9ceca 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -26,7 +26,7 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 446871
+// gas irOptimized: 428679
 // gas legacy: 832976
 // gas legacyOptimized: 509560
 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 38ce2eda98..3f58c0d0eb 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -17,7 +17,7 @@ contract C {
 // EVMVersion: >=byzantium
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 212583
+// gas irOptimized: 184221
 // gas legacy: 294335
 // gas legacyOptimized: 174279
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
@@ -25,7 +25,7 @@ contract C {
 // f(uint256): 20 -> FAILURE
 // x() -> 1
 // stack(uint256): 1023 -> FAILURE
-// gas irOptimized: 314884
+// gas irOptimized: 260987
 // gas legacy: 483942
 // gas legacyOptimized: 298807
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 1a3c0b1d50..49e841690b 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -39,7 +39,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 270609
+// gas irOptimized: 262130
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 7557f220ff..4fbcaf1beb 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -38,7 +38,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 270609
+// gas irOptimized: 262130
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index cd8baf76c7..99ca5e3f7e 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -18,7 +18,7 @@ contract test {
 }
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
-// gas irOptimized: 111909
+// gas irOptimized: 111669
 // gas legacy: 113806
 // gas legacyOptimized: 111781
 // get(uint8): 1 -> 21, 22, 42, 43
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index 95e03d1897..88f3ed5eb7 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -27,7 +27,7 @@ contract C {
 }
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 126136
+// gas irOptimized: 126044
 // gas legacy: 151334
 // gas legacyOptimized: 125166
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index 7790f2fa7f..ffa6c7894d 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -15,7 +15,7 @@ contract C {
 }
 // ----
 // constructor(): 3 ->
-// gas irOptimized: 127454
+// gas irOptimized: 125477
 // gas legacy: 209361
 // gas legacyOptimized: 139324
 // f() -> 84, 23
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index 724e7d4bed..388a4de42e 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -23,6 +23,6 @@ contract B {
 
 // ----
 // g() -> 42
-// gas irOptimized: 101944
+// gas irOptimized: 100874
 // gas legacy: 185053
 // gas legacyOptimized: 114598
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index b53d979269..8917ad68e0 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -40,7 +40,7 @@ contract Main {
 
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 277680
+// gas irOptimized: 268544
 // gas legacy: 402045
 // gas legacyOptimized: 266772
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 620a94d0ce..c536367a43 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -16,7 +16,7 @@ contract ClientReceipt {
 }
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 183544
+// gas irOptimized: 173106
 // gas legacy: 235195
 // gas legacyOptimized: 176766
 // balance -> 1500
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index b0d1c16b2b..9caaa89b98 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -24,6 +24,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 4, 0x11
-// gas irOptimized: 115868
+// gas irOptimized: 112281
 // gas legacy: 135820
 // gas legacyOptimized: 119448
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index be291971bf..f4f9405b6c 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -21,6 +21,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 119499
+// gas irOptimized: 119659
 // gas legacy: 124793
 // gas legacyOptimized: 119694
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
index d8ef57ef5f..80e831a4cb 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
@@ -19,6 +19,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 120572
+// gas irOptimized: 120270
 // gas legacy: 125245
 // gas legacyOptimized: 120153
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create.sol b/test/libsolidity/semanticTests/salted_create/salted_create.sol
index 743e968952..80869b5aac 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create.sol
@@ -21,6 +21,6 @@ contract A {
 // ----
 // different_salt() -> true
 // same_salt() -> true
-// gas irOptimized: 98438898
+// gas irOptimized: 98438900
 // gas legacy: 98439116
 // gas legacyOptimized: 98438970
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index eb0cc8229d..5d0c4cd6af 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -21,6 +21,6 @@ contract A {
 // EVMVersion: >=constantinople
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 271831
+// gas irOptimized: 257206
 // gas legacy: 422501
 // gas legacyOptimized: 287472
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index 8c63d0c4a9..b834f8018a 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -12,7 +12,7 @@ contract C {
 }
 // ----
 // constructor(), 2 wei: 3 ->
-// gas irOptimized: 107627
+// gas irOptimized: 107003
 // gas legacy: 151416
 // gas legacyOptimized: 108388
 // state() -> 3
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
index c425d127b1..f6830a202f 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -12,7 +12,7 @@ contract C {
 }
 // ----
 // constructor()
-// gas irOptimized: 111584
+// gas irOptimized: 110504
 // gas legacy: 155081
 // gas legacyOptimized: 107997
 // genesisHash() -> 0x3737373737373737373737373737373737373737373737373737373737373737
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
index c44b694a58..a2f7ba1d8d 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
@@ -45,6 +45,6 @@ contract C {
 // compileToEwasm: also
 // ----
 // test() -> true
-// gas irOptimized: 134587
+// gas irOptimized: 132506
 // gas legacy: 136036
 // gas legacyOptimized: 133480
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
index 1a0214a5db..4f05346d42 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
@@ -16,6 +16,6 @@ contract C {
 }
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
-// gas irOptimized: 203299
+// gas irOptimized: 202828
 // gas legacy: 209194
 // gas legacyOptimized: 203583
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
index e651103669..3d062fc95a 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
@@ -23,6 +23,6 @@ contract CopyTest {
 }
 // ----
 // run() -> 2, 23, 42
-// gas irOptimized: 194003
+// gas irOptimized: 193756
 // gas legacy: 186016
 // gas legacyOptimized: 184668
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
index 1e17285fe9..33621c9eb5 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
@@ -87,7 +87,7 @@ contract Test {
 // EVMVersion: >homestead
 // ----
 // test1() -> true
-// gas irOptimized: 150533
+// gas irOptimized: 150163
 // gas legacy: 150266
 // gas legacyOptimized: 149875
 // test2() -> true
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
index 0708fae03d..9d157d70eb 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
@@ -68,7 +68,7 @@ contract Test {
 // compileToEwasm: also
 // ----
 // load() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
-// gas irOptimized: 111425
+// gas irOptimized: 110327
 // gas legacy: 112999
 // gas legacyOptimized: 110881
 // store() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index fbfeb990a1..34806a35b2 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -23,7 +23,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133728
+// gas irOptimized: 133599
 // gas legacy: 134433
 // gas legacyOptimized: 133876
 // test(uint256): 32 -> "3"
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index 5a47b9807a..27e726f154 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -36,12 +36,12 @@ contract c {
 
 // ----
 // set(uint256): 7 -> true
-// gas irOptimized: 110051
+// gas irOptimized: 110032
 // gas legacy: 110616
 // gas legacyOptimized: 110006
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // copy(uint256,uint256): 7, 8 -> true
-// gas irOptimized: 118581
+// gas irOptimized: 118594
 // gas legacy: 119166
 // gas legacyOptimized: 118622
 // retrieve(uint256): 7 -> 1, 3, 4, 2
diff --git a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
index 26fbeb3bf8..d33b8fd02f 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
@@ -20,6 +20,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> true
-// gas irOptimized: 110177
+// gas irOptimized: 109714
 // gas legacy: 110627
 // gas legacyOptimized: 109706
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
index ded05d8d60..57bf38e52c 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_nested_small.sol
@@ -33,4 +33,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 0, 0, 0
-// gas irOptimized: 117403
+// gas irOptimized: 117101
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index 9fbe3eaafd..a78b5dd65b 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -42,7 +42,7 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 121619
+// gas irOptimized: 121660
 // gas legacy: 122132
 // gas legacyOptimized: 121500
 // g() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
index abc10d8aa8..d07d14dd67 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
@@ -27,4 +27,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 0
-// gas irOptimized: 112129
+// gas irOptimized: 111594
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
index 75903b9b0b..e2821a5a6b 100644
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
+++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
@@ -31,6 +31,6 @@ contract C {
 // compileToEwasm: also
 // ----
 // f() -> 42, 23, 34, 42, 42
-// gas irOptimized: 110843
+// gas irOptimized: 110389
 // gas legacy: 112021
 // gas legacyOptimized: 110548
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index 37411af73a..a4cafdb0f2 100644
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ b/test/libsolidity/semanticTests/structs/structs.sol
@@ -30,7 +30,7 @@ contract test {
 // ----
 // check() -> false
 // set() ->
-// gas irOptimized: 134411
+// gas irOptimized: 134433
 // gas legacy: 135277
 // gas legacyOptimized: 134064
 // check() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 4f7faea5ba..6a9232a532 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -49,7 +49,7 @@ contract C {
 }
 // ----
 // test_f() -> true
-// gas irOptimized: 122329
+// gas irOptimized: 122154
 // gas legacy: 126150
 // gas legacyOptimized: 123163
 // test_g() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index 1d2f6bc9d2..4b01e87cb3 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -113,7 +113,7 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 418388
+// gas irOptimized: 364503
 // gas legacy: 860880
 // gas legacyOptimized: 420959
 // totalSupply() -> 20
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index dd0338e28f..73720fa5f8 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -16,7 +16,7 @@ contract C {
 // compileToEwasm: also
 // ----
 // constructor() ->
-// gas irOptimized: 193397
+// gas irOptimized: 177507
 // gas legacy: 240889
 // gas legacyOptimized: 155314
 // initCode() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 6bf31268b0..37c0d98ea0 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -34,6 +34,6 @@ contract C {
 
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 240662
+// gas irOptimized: 239194
 // gas legacy: 240349
 // gas legacyOptimized: 239673
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index ea3afa6c42..de8dc72ca6 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -96,7 +96,7 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 413852
+// gas irOptimized: 357114
 // gas legacy: 832643
 // gas legacyOptimized: 416135
 // totalSupply() -> 20
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index e8ae454a2a..8241ec554d 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -17,7 +17,7 @@ contract D {
 
 // ----
 // constructor(), 27 wei ->
-// gas irOptimized: 175157
+// gas irOptimized: 170627
 // gas legacy: 222977
 // gas legacyOptimized: 169779
 // f() -> 27
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index da3620d19f..1cc1bb039d 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -20,6 +20,6 @@ contract C {
 
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178822
+// gas irOptimized: 178677
 // gas legacy: 180753
 // gas legacyOptimized: 179472
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index ed4815e80d..413e129ef7 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -37,10 +37,10 @@ contract D {
 // f() -> 0x1 # This should work, next should throw #
 // gas legacy: 103716
 // fview() -> FAILURE
-// gas irOptimized: 98438619
+// gas irOptimized: 98438605
 // gas legacy: 98438801
 // gas legacyOptimized: 98438594
 // fpure() -> FAILURE
-// gas irOptimized: 98438619
+// gas irOptimized: 98438605
 // gas legacy: 98438801
 // gas legacyOptimized: 98438595
diff --git a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
index f14b8d57a8..713d711969 100644
--- a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
@@ -29,7 +29,7 @@ contract c {
 // x() -> 0, 0
 // y() -> 0, 0
 // set() ->
-// gas irOptimized: 109713
+// gas irOptimized: 109694
 // gas legacy: 109732
 // gas legacyOptimized: 109682
 // x() -> 1, 2
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 3ebb24108d..2802b6ae76 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -20,7 +20,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 190275
+// gas irOptimized: 176219
 // gas legacy: 265006
 // gas legacyOptimized: 182842
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index f71cd6543d..430a952a85 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -19,7 +19,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 191991
+// gas irOptimized: 177083
 // gas legacy: 266728
 // gas legacyOptimized: 184762
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
index 5b47191d6a..254d495f19 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
@@ -26,7 +26,7 @@ contract C {
 // index(uint256): 10 -> true
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
-// gas irOptimized: 137634
+// gas irOptimized: 135578
 // gas legacy: 247324
 // gas legacyOptimized: 149578
 // accessIndex(uint256,int256): 10, 1 -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index 30e6c58166..edcf931252 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -16,33 +16,33 @@ contract C {
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
-// gas irOptimized: 3032985
+// gas irOptimized: 3018687
 // gas legacy: 3070431
 // gas legacyOptimized: 3010325
 // test_indices(uint256): 5 ->
-// gas irOptimized: 367641
+// gas irOptimized: 372543
 // gas legacy: 369211
 // gas legacyOptimized: 366089
 // test_indices(uint256): 10 ->
 // test_indices(uint256): 15 ->
 // gas irOptimized: 72860
 // test_indices(uint256): 0xFF ->
-// gas irOptimized: 3438609
+// gas irOptimized: 3410255
 // gas legacy: 3512637
 // gas legacyOptimized: 3395047
 // test_indices(uint256): 1000 ->
-// gas irOptimized: 18318371
+// gas irOptimized: 18206122
 // gas legacy: 18611999
 // gas legacyOptimized: 18166944
 // test_indices(uint256): 129 ->
-// gas irOptimized: 2733569
+// gas irOptimized: 2756955
 // gas legacy: 2771961
 // gas legacyOptimized: 2714999
 // test_indices(uint256): 128 ->
-// gas irOptimized: 426681
+// gas irOptimized: 411903
 // gas legacy: 466504
 // gas legacyOptimized: 416888
 // test_indices(uint256): 1 ->
-// gas irOptimized: 363073
+// gas irOptimized: 368571
 // gas legacy: 363401
 // gas legacyOptimized: 361799
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
index b3f84a061b..e4e69ffa35 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
@@ -16,11 +16,11 @@ contract C {
 // test_boundary_check(uint256,uint256): 1, 1 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
-// gas irOptimized: 137834
+// gas irOptimized: 137831
 // gas legacy: 131830
 // gas legacyOptimized: 112054
 // test_boundary_check(uint256,uint256): 256, 255 -> 0
-// gas irOptimized: 140017
+// gas irOptimized: 139963
 // gas legacy: 134149
 // gas legacyOptimized: 114233
 // test_boundary_check(uint256,uint256): 256, 0xFFFF -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
index 007ee18529..5febab1c6d 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
@@ -16,7 +16,7 @@ contract C {
 // gas legacy: 126722
 // gas legacyOptimized: 107818
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1217851
+// gas irOptimized: 1217848
 // gas legacy: 1702119
 // gas legacyOptimized: 1398420
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
index 54fe51499b..7f402d7d13 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
@@ -12,11 +12,11 @@ contract C {
 // EVMVersion: >=petersburg
 // ----
 // pushEmpty(uint256): 128
-// gas irOptimized: 412561
+// gas irOptimized: 406801
 // gas legacy: 416903
 // gas legacyOptimized: 398280
 // pushEmpty(uint256): 256
-// gas irOptimized: 702549
+// gas irOptimized: 691029
 // gas legacy: 714315
 // gas legacyOptimized: 687372
 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
index 92f3108b36..c7561ba7a6 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
@@ -21,11 +21,11 @@ contract C {
 // gas legacy: 77730
 // gas legacyOptimized: 77162
 // set_get_length(uint256): 0xFF -> 0xFF
-// gas irOptimized: 141799
+// gas irOptimized: 141796
 // gas legacy: 678237
 // gas legacyOptimized: 115104
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1801666
+// gas irOptimized: 1801663
 // gas legacy: 9873774
 // gas legacyOptimized: 1398546
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
index 64605c0dfa..45c6a9fa39 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
@@ -17,11 +17,11 @@ contract C {
 // gas legacy: 85822
 // gas legacyOptimized: 83608
 // set_get_length(uint256): 0xFF -> 0
-// gas irOptimized: 821875
+// gas irOptimized: 821872
 // gas legacy: 810327
 // gas legacyOptimized: 786258
 // set_get_length(uint256): 0xFFF -> 0
-// gas irOptimized: 12841087
+// gas irOptimized: 12841084
 // gas legacy: 12649059
 // gas legacyOptimized: 12267870
 // set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index 7ccb700f83..de367f8daa 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -21,6 +21,6 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 112992
+// gas irOptimized: 112999
 // gas legacy: 112931
 // gas legacyOptimized: 112602

From 9618cb947d872479d9f7435b1b12a55886b895ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 18 Mar 2022 22:46:36 +0100
Subject: [PATCH 0631/1748] download_benchmarks: Script for downloading
 benchmark results from CircleCI

---
 .circleci/config.yml                          |  13 +-
 scripts/common/git_helpers.py                 |  19 ++
 scripts/common/rest_api_helpers.py            | 171 ++++++++++++
 scripts/externalTests/download_benchmarks.py  | 172 ++++++++++++
 ...test_externalTests_benchmark_downloader.py | 258 ++++++++++++++++++
 5 files changed, 630 insertions(+), 3 deletions(-)
 create mode 100644 scripts/common/git_helpers.py
 create mode 100644 scripts/common/rest_api_helpers.py
 create mode 100755 scripts/externalTests/download_benchmarks.py
 create mode 100644 test/scripts/test_externalTests_benchmark_downloader.py

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2e779adcb9..fd47dce0fd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -690,9 +690,16 @@ jobs:
           name: Install pip
           command: apt -q update && apt install -y python3-pip
       - run:
-          name: Install pylint
-          command: python3 -m pip install pylint z3-solver pygments-lexer-solidity parsec tabulate deepdiff colorama
-          # also z3-solver, parsec and tabulate to make sure pylint knows about this module, pygments-lexer-solidity for docs
+          name: Install pylint and dependencies of the scripts that will be linted
+          command: python3 -m pip install
+            pylint
+            z3-solver
+            pygments-lexer-solidity
+            parsec
+            tabulate
+            deepdiff
+            colorama
+            requests
       - run:
           name: Linting Python Scripts
           command: ./scripts/pylint_all.py
diff --git a/scripts/common/git_helpers.py b/scripts/common/git_helpers.py
new file mode 100644
index 0000000000..bb5b1f6134
--- /dev/null
+++ b/scripts/common/git_helpers.py
@@ -0,0 +1,19 @@
+import subprocess
+
+
+def run_git_command(command):
+    process = subprocess.run(
+        command,
+        encoding='utf8',
+        capture_output=True,
+        check=True,
+    )
+    return process.stdout.strip()
+
+
+def git_current_branch():
+    return run_git_command(['git', 'symbolic-ref', 'HEAD', '--short'])
+
+
+def git_commit_hash(ref: str = 'HEAD'):
+    return run_git_command(['git', 'rev-parse', '--verify', ref])
diff --git a/scripts/common/rest_api_helpers.py b/scripts/common/rest_api_helpers.py
new file mode 100644
index 0000000000..6dc3d13263
--- /dev/null
+++ b/scripts/common/rest_api_helpers.py
@@ -0,0 +1,171 @@
+from pathlib import Path
+from typing import List, Mapping, Optional
+import functools
+import json
+import operator
+import shutil
+
+import requests
+
+
+class APIHelperError(Exception):
+    pass
+
+class DataUnavailable(APIHelperError):
+    pass
+
+class InvalidResponse(APIHelperError):
+    pass
+
+class FileAlreadyExists(APIHelperError):
+    pass
+
+
+def query_api(url: str, params: Mapping[str, str], debug_requests=False) -> dict:
+    if debug_requests:
+        print(f'REQUEST URL: {url}')
+        if len(params) > 0:
+            print(f'QUERY: {params}')
+
+    response = requests.get(url, params=params)
+    response.raise_for_status()
+
+    if debug_requests:
+        json_response = response.json()
+        print('========== RESPONSE ==========')
+        if json_response is not None:
+            print(json.dumps(json_response, indent=4))
+        else:
+            print(response.content)
+        print('==============================')
+
+    return response.json()
+
+
+def download_file(url: str, target_path: Path, overwrite=False):
+    if not overwrite and target_path.exists():
+        raise FileAlreadyExists(f"Refusing to overwrite existing file: '{target_path}'.")
+
+    with requests.get(url, stream=True) as request:
+        with open(target_path, 'wb') as target_file:
+            shutil.copyfileobj(request.raw, target_file)
+
+
+class Github:
+    BASE_URL = 'https://api.github.com'
+
+    project_slug: str
+    debug_requests: bool
+
+    def __init__(self, project_slug: str, debug_requests: bool):
+        self.project_slug = project_slug
+        self.debug_requests = debug_requests
+
+    def pull_request(self, pr_id: int) -> dict:
+        return query_api(
+            f'{self.BASE_URL}/repos/{self.project_slug}/pulls/{pr_id}',
+            {},
+            self.debug_requests
+        )
+
+
+class CircleCI:
+    # None might be a more logical default for max_pages but in most cases we'll actually
+    # want some limit to prevent flooding the API with requests in case of a bug.
+    DEFAULT_MAX_PAGES = 10
+    BASE_URL = 'https://circleci.com/api/v2'
+
+    project_slug: str
+    debug_requests: bool
+
+    def __init__(self, project_slug: str, debug_requests: bool):
+        self.project_slug = project_slug
+        self.debug_requests = debug_requests
+
+    def paginated_query_api_iterator(self, url: str, params: Mapping[str, str], max_pages: int = DEFAULT_MAX_PAGES):
+        assert 'page-token' not in params
+
+        page_count = 0
+        next_page_token = None
+        while max_pages is None or page_count < max_pages:
+            if next_page_token is not None:
+                params = {**params, 'page-token': next_page_token}
+
+            json_response = query_api(url, params, self.debug_requests)
+
+            yield json_response['items']
+            next_page_token = json_response['next_page_token']
+            page_count += 1
+            if next_page_token is None:
+                break
+
+    def paginated_query_api(self, url: str, params: Mapping[str, str], max_pages: int = DEFAULT_MAX_PAGES):
+        return functools.reduce(operator.add, self.paginated_query_api_iterator(url, params, max_pages), [])
+
+    def pipelines(
+        self,
+        branch: Optional[str] = None,
+        commit_hash: Optional[str] = None,
+        excluded_trigger_types: List[str] = None,
+    ) -> List[dict]:
+        if excluded_trigger_types is None:
+            excluded_trigger_types = []
+
+        for items in self.paginated_query_api_iterator(
+            f'{self.BASE_URL}/project/gh/{self.project_slug}/pipeline',
+            {'branch': branch} if branch is not None else {},
+            max_pages=10,
+        ):
+            matching_items = [
+                item
+                for item in items
+                if (
+                    (commit_hash is None or item['vcs']['revision'] == commit_hash) and
+                    item['trigger']['type'] not in excluded_trigger_types
+                )
+            ]
+            if len(matching_items) > 0:
+                return matching_items
+
+        return []
+
+    def workflows(self, pipeline_id: str) -> dict:
+        return self.paginated_query_api(f'{self.BASE_URL}/pipeline/{pipeline_id}/workflow', {})
+
+    def jobs(self, workflow_id: str) -> Mapping[str, dict]:
+        items = self.paginated_query_api(f'{self.BASE_URL}/workflow/{workflow_id}/job', {})
+        jobs_by_name = {job['name']: job for job in items}
+
+        assert len(jobs_by_name) <= len(items)
+        if len(jobs_by_name) < len(items):
+            raise InvalidResponse("Job names in the workflow are not unique.")
+
+        return jobs_by_name
+
+    def job(self, workflow_id: str, name: str, require_success: bool = False) -> dict:
+        jobs = self.jobs(workflow_id)
+        if name not in jobs:
+            raise DataUnavailable(f"Job {name} is not present in the workflow.")
+
+        if require_success and jobs[name]['status'] != 'success':
+            raise DataUnavailable(
+                f"Job {name} has failed or is still running. "
+                f"Current status: {jobs[name]['status']}."
+            )
+
+        return jobs[name]
+
+    def artifacts(self, job_number: int) -> Mapping[str, dict]:
+        items = self.paginated_query_api(f'{self.BASE_URL}/project/gh/{self.project_slug}/{job_number}/artifacts', {})
+        artifacts_by_name = {artifact['path']: artifact for artifact in items}
+
+        assert len(artifacts_by_name) <= len(items)
+        if len(artifacts_by_name) < len(items):
+            raise InvalidResponse("Names of artifacts attached to the job are not unique.")
+
+        return artifacts_by_name
+
+    @staticmethod
+    def latest_item(items: dict) -> dict:
+        sorted_items = sorted(items, key=lambda item: item['created_at'], reverse=True)
+        return sorted_items[0] if len(sorted_items) > 0 else None
diff --git a/scripts/externalTests/download_benchmarks.py b/scripts/externalTests/download_benchmarks.py
new file mode 100755
index 0000000000..4ac7c0c4dc
--- /dev/null
+++ b/scripts/externalTests/download_benchmarks.py
@@ -0,0 +1,172 @@
+#!/usr/bin/env python3
+
+from argparse import ArgumentParser, Namespace
+from pathlib import Path
+from typing import Mapping, Optional
+import sys
+
+import requests
+
+# Our scripts/ is not a proper Python package so we need to modify PYTHONPATH to import from it
+# pragma pylint: disable=import-error,wrong-import-position
+SCRIPTS_DIR = Path(__file__).parent.parent
+sys.path.insert(0, str(SCRIPTS_DIR))
+
+from common.git_helpers import git_current_branch, git_commit_hash
+from common.rest_api_helpers import APIHelperError, CircleCI, Github, download_file
+# pragma pylint: enable=import-error,wrong-import-position
+
+
+def process_commandline() -> Namespace:
+    script_description = (
+        "Downloads benchmark results attached as artifacts to the c_ext_benchmarks job on CircleCI. "
+        "If no options are specified, downloads results for the currently checked out git branch."
+    )
+
+    parser = ArgumentParser(description=script_description)
+
+    target_definition = parser.add_mutually_exclusive_group()
+    target_definition.add_argument(
+        '--branch',
+        dest='branch',
+        help="Git branch that the job ran on.",
+    )
+    target_definition.add_argument(
+        '--pr',
+        dest='pull_request_id',
+        type=int,
+        help="Github PR ID that the job ran on.",
+    )
+    target_definition.add_argument(
+        '--base-of-pr',
+        dest='base_of_pr',
+        type=int,
+        help="ID of a Github PR that's based on top of the branch we're interested in."
+    )
+
+    parser.add_argument(
+        '--any-commit',
+        dest='ignore_commit_hash',
+        default=False,
+        action='store_true',
+        help="Include pipelines that ran on a different commit as long as branch/PR matches."
+    )
+    parser.add_argument(
+        '--overwrite',
+        dest='overwrite',
+        default=False,
+        action='store_true',
+        help="If artifacts already exist on disk, overwrite them.",
+    )
+    parser.add_argument(
+        '--debug-requests',
+        dest='debug_requests',
+        default=False,
+        action='store_true',
+        help="Print detailed info about performed API requests and received responses.",
+    )
+
+    return parser.parse_args()
+
+
+def download_benchmark_artifact(
+    artifacts: Mapping[str, dict],
+    benchmark_name: str,
+    branch: str,
+    commit_hash: str,
+    overwrite: bool,
+    silent: bool = False
+):
+    if not silent:
+        print(f"Downloading artifact: {benchmark_name}-{branch}-{commit_hash[:8]}.json.")
+
+    artifact_path = f'reports/externalTests/{benchmark_name}.json'
+
+    if artifact_path not in artifacts:
+        raise RuntimeError(f"Missing artifact: {artifact_path}.")
+
+    download_file(
+        artifacts[artifact_path]['url'],
+        Path(f'{benchmark_name}-{branch}-{commit_hash[:8]}.json'),
+        overwrite,
+    )
+
+
+def download_benchmarks(
+    branch: Optional[str],
+    pull_request_id: Optional[int],
+    base_of_pr: Optional[int],
+    ignore_commit_hash: bool = False,
+    overwrite: bool = False,
+    debug_requests: bool = False,
+    silent: bool = False,
+):
+    github = Github('ethereum/solidity', debug_requests)
+    circleci = CircleCI('ethereum/solidity', debug_requests)
+
+    expected_commit_hash = None
+    if branch is None and pull_request_id is None and base_of_pr is None:
+        branch = git_current_branch()
+        expected_commit_hash = git_commit_hash()
+    elif branch is not None:
+        expected_commit_hash = git_commit_hash(branch)
+    elif pull_request_id is not None:
+        pr_info = github.pull_request(pull_request_id)
+        branch = pr_info['head']['ref']
+        expected_commit_hash = pr_info['head']['sha']
+    elif base_of_pr is not None:
+        pr_info = github.pull_request(base_of_pr)
+        branch = pr_info['base']['ref']
+        expected_commit_hash = pr_info['base']['sha']
+
+    if not silent:
+        print(
+            f"Looking for pipelines that ran on branch {branch}" +
+            (f", commit {expected_commit_hash}." if not ignore_commit_hash else " (any commit).")
+        )
+
+    pipeline = circleci.latest_item(circleci.pipelines(
+        branch,
+        expected_commit_hash if not ignore_commit_hash else None,
+        # Skip nightly workflows. They don't have the c_ext_benchmarks job and even if they did,
+        # they would likely be running a different set of external tests.
+        excluded_trigger_types=['schedule'],
+    ))
+    if pipeline is None:
+        raise RuntimeError("No matching pipelines found.")
+
+    actual_commit_hash = pipeline['vcs']['revision']
+    workflow_id = circleci.latest_item(circleci.workflows(pipeline['id']))['id']
+    benchmark_collector_job = circleci.job(workflow_id, 'c_ext_benchmarks', require_success=True)
+
+    artifacts = circleci.artifacts(int(benchmark_collector_job['job_number']))
+
+    download_benchmark_artifact(artifacts, 'summarized-benchmarks', branch, actual_commit_hash, overwrite, silent)
+    download_benchmark_artifact(artifacts, 'all-benchmarks', branch, actual_commit_hash, overwrite, silent)
+
+
+def main():
+    try:
+        options = process_commandline()
+        download_benchmarks(
+            options.branch,
+            options.pull_request_id,
+            options.base_of_pr,
+            options.ignore_commit_hash,
+            options.overwrite,
+            options.debug_requests,
+        )
+
+        return 0
+    except APIHelperError as exception:
+        print(f"[ERROR] {exception}", file=sys.stderr)
+        return 1
+    except requests.exceptions.HTTPError as exception:
+        print(f"[ERROR] {exception}", file=sys.stderr)
+        return 1
+    except RuntimeError as exception:
+        print(f"[ERROR] {exception}", file=sys.stderr)
+        return 1
+
+if __name__ == '__main__':
+    sys.exit(main())
diff --git a/test/scripts/test_externalTests_benchmark_downloader.py b/test/scripts/test_externalTests_benchmark_downloader.py
new file mode 100644
index 0000000000..e29d140112
--- /dev/null
+++ b/test/scripts/test_externalTests_benchmark_downloader.py
@@ -0,0 +1,258 @@
+#!/usr/bin/env python3
+
+from pathlib import Path
+from unittest import TestCase
+from unittest.mock import call, Mock, patch
+
+# NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
+# pragma pylint: disable=import-error
+from externalTests.download_benchmarks import download_benchmarks
+# pragma pylint: enable=import-error
+
+
+def _git_run_command_mock(command):
+    if command == ['git', 'symbolic-ref', 'HEAD', '--short']:
+        return 'benchmark-downloader'
+
+    if len(command) == 4 and command[:3] == ['git', 'rev-parse', '--verify']:
+        ref = command[3]
+        if ref == 'HEAD':
+            ref = 'benchmark-downloader'
+
+        if ref == 'benchmark-downloader':
+            return 'fa1ddc6f412100d531f6d3a77008c73b474692d6'
+
+        if ref == 'develop':
+            return '43f29c00da02e19ff10d43f7eb6955d627c57728'
+
+    raise RuntimeError(
+        "The test tried to run an unexpected git command.\n"
+        f"command: {command}\n"
+        "If you have updated the code, please remember to add matching command fixtures above."
+    )
+
+def _requests_get_mock(url, params):
+    response_mock = Mock()
+
+    if url == 'https://api.github.com/repos/ethereum/solidity/pulls/12818':
+        response_mock.json.return_value = {
+            "head": {
+                "ref": "benchmark-downloader",
+                "sha": "fa1ddc6f412100d531f6d3a77008c73b474692d6",
+            },
+            "base": {
+                "ref": "develop",
+                "sha": "43f29c00da02e19ff10d43f7eb6955d627c57728",
+            },
+        }
+        return response_mock
+
+    if (
+        url == 'https://circleci.com/api/v2/project/gh/ethereum/solidity/pipeline' and
+        params.get('branch') == 'develop'
+    ):
+        response_mock.json.return_value = {
+            "next_page_token": None,
+            "items": [
+                {
+                    "id": "3b15a41f-6933-4a35-9823-08ebb1ff9336",
+                    "created_at": "2022-03-23T00:10:31.659Z",
+                    "trigger": {"type": "schedule"},
+                    "vcs": {
+                        "revision": "43f29c00da02e19ff10d43f7eb6955d627c57728",
+                        "branch": "develop"
+                    },
+                },
+                {
+                    "id": "f9036a2d-be2b-4315-bd57-4d35b87502d2",
+                    "created_at": "2022-03-22T00:10:30.304Z",
+                    "trigger": {"type": "webhook"},
+                    "vcs": {
+                        "revision": "43f29c00da02e19ff10d43f7eb6955d627c57728",
+                        "branch": "develop"
+                    },
+                },
+                {
+                    "id": "1d389e7c-b7dc-4d4d-9e58-c21ae48901a5",
+                    "created_at": "2022-03-21T00:10:30.579Z",
+                    "trigger": {"type": "schedule"},
+                    "vcs": {
+                        "revision": "430ecb6e16c346005315dbdd3edf3c3e64e9b1d8",
+                        "branch": "develop"
+                    },
+                },
+                {
+                    "id": "7185a3f6-6338-4c2c-952d-4c30e7561e61",
+                    "created_at": "2022-03-21T12:54:41.817Z",
+                    "trigger": {"type": "webhook"},
+                    "vcs": {
+                        "revision": "43f29c00da02e19ff10d43f7eb6955d627c57728",
+                        "branch": "develop"
+                    }
+                },
+            ]
+        }
+        return response_mock
+
+    if (
+        url == 'https://circleci.com/api/v2/project/gh/ethereum/solidity/pipeline' and
+        params.get('branch') == 'benchmark-downloader'
+    ):
+        response_mock.json.return_value = {
+            "next_page_token": None,
+            "items": [
+                {
+                    "id": "9af60346-a6b9-41b9-8a16-16ccf8996373",
+                    "created_at": "2022-03-23T10:11:34.683Z",
+                    "trigger": {"type": "webhook"},
+                    "vcs": {
+                        "revision": "fa1ddc6f412100d531f6d3a77008c73b474692d6",
+                        "branch": "benchmark-downloader"
+                    }
+                }
+            ]
+        }
+        return response_mock
+
+    if (url in [
+        # To reduce the number of fixtures, let's use this workflow for multiple pipelines.
+        # This would not be the case in practice.
+        'https://circleci.com/api/v2/pipeline/f9036a2d-be2b-4315-bd57-4d35b87502d2/workflow',
+        'https://circleci.com/api/v2/pipeline/9af60346-a6b9-41b9-8a16-16ccf8996373/workflow'
+    ]):
+        response_mock.json.return_value = {
+            "next_page_token": None,
+            "items": [
+                {
+                    "id": "7a54e9cc-513d-4134-afdb-db62ab8146e5",
+                    "created_at": "2022-03-21T12:54:42Z",
+                }
+            ]
+        }
+        return response_mock
+
+    if url == 'https://circleci.com/api/v2/workflow/7a54e9cc-513d-4134-afdb-db62ab8146e5/job':
+        response_mock.json.return_value = {
+            "next_page_token": None,
+            "items": [
+                {
+                    "job_number": 1017975,
+                    "name": "chk_coding_style",
+                    "status": "success",
+                },
+                {
+                    "job_number": 1017969,
+                    "name": "b_ubu",
+                    "status": "success",
+                },
+                {
+                    "job_number": 1018023,
+                    "name": "c_ext_benchmarks",
+                    "status": "success",
+                },
+            ]
+        }
+        return response_mock
+
+    if url == 'https://circleci.com/api/v2/project/gh/ethereum/solidity/1018023/artifacts':
+        response_mock.json.return_value = {
+            "next_page_token": None,
+            "items": [
+                {
+                    "path": "reports/externalTests/all-benchmarks.json",
+                    "url": "https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json"
+                },
+                {
+                    "path": "reports/externalTests/summarized-benchmarks.json",
+                    "url": "https://circle-artifacts.com/0/reports/externalTests/summarized-benchmarks.json"
+                }
+            ]
+        }
+        return response_mock
+
+    raise RuntimeError(
+        "The test tried to perform an unexpected GET request.\n"
+        f"URL: {url}\n" +
+        (f"query: {params}\n" if len(params) > 0 else "") +
+        "If you have updated the code, please remember to add matching response fixtures above."
+    )
+
+class TestBenchmarkDownloader(TestCase):
+    def setUp(self):
+        self.maxDiff = 10000
+
+    @staticmethod
+    @patch('externalTests.download_benchmarks.download_file')
+    @patch('requests.get', _requests_get_mock)
+    @patch('common.git_helpers.run_git_command',_git_run_command_mock)
+    def test_download_benchmarks(download_file_mock):
+        download_benchmarks(None, None, None, silent=True)
+        download_file_mock.assert_has_calls([
+            call(
+                'https://circle-artifacts.com/0/reports/externalTests/summarized-benchmarks.json',
+                Path('summarized-benchmarks-benchmark-downloader-fa1ddc6f.json'),
+                False
+            ),
+            call(
+                'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
+                Path('all-benchmarks-benchmark-downloader-fa1ddc6f.json'),
+                False
+            ),
+        ])
+
+    @staticmethod
+    @patch('externalTests.download_benchmarks.download_file')
+    @patch('requests.get', _requests_get_mock)
+    @patch('common.git_helpers.run_git_command',_git_run_command_mock)
+    def test_download_benchmarks_branch(download_file_mock):
+        download_benchmarks('develop', None, None, silent=True)
+        download_file_mock.assert_has_calls([
+            call(
+                'https://circle-artifacts.com/0/reports/externalTests/summarized-benchmarks.json',
+                Path('summarized-benchmarks-develop-43f29c00.json'),
+                False
+            ),
+            call(
+                'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
+                Path('all-benchmarks-develop-43f29c00.json'),
+                False
+            ),
+        ])
+
+    @staticmethod
+    @patch('externalTests.download_benchmarks.download_file')
+    @patch('requests.get', _requests_get_mock)
+    @patch('common.git_helpers.run_git_command',_git_run_command_mock)
+    def test_download_benchmarks_pr(download_file_mock):
+        download_benchmarks(None, 12818, None, silent=True)
+        download_file_mock.assert_has_calls([
+            call(
+                'https://circle-artifacts.com/0/reports/externalTests/summarized-benchmarks.json',
+                Path('summarized-benchmarks-benchmark-downloader-fa1ddc6f.json'),
+                False
+            ),
+            call(
+                'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
+                Path('all-benchmarks-benchmark-downloader-fa1ddc6f.json'),
+                False
+            ),
+        ])
+
+    @staticmethod
+    @patch('externalTests.download_benchmarks.download_file')
+    @patch('requests.get', _requests_get_mock)
+    @patch('common.git_helpers.run_git_command',_git_run_command_mock)
+    def test_download_benchmarks_base_of_pr(download_file_mock):
+        download_benchmarks(None, None, 12818, silent=True)
+        download_file_mock.assert_has_calls([
+            call(
+                'https://circle-artifacts.com/0/reports/externalTests/summarized-benchmarks.json',
+                Path('summarized-benchmarks-develop-43f29c00.json'),
+                False
+            ),
+            call(
+                'https://circle-artifacts.com/0/reports/externalTests/all-benchmarks.json',
+                Path('all-benchmarks-develop-43f29c00.json'),
+                False
+            ),
+        ])

From 45dffe598c531f9ac72f72a8e731584b5dcab4fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 21 Mar 2022 14:26:09 +0100
Subject: [PATCH 0632/1748] c_ext_benchmarks: Generate and store benchmark
 diffs

---
 .circleci/config.yml | 49 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fd47dce0fd..20d5ac6c2e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1234,16 +1234,65 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - run:
+          name: Install dependencies of helper scripts
+          command: |
+            sudo apt update
+            sudo apt install python3-pip --assume-yes --no-install-recommends
+            python3 -m pip install requests --user
       - run:
           name: Combine benchmark reports
           command: cat reports/externalTests/benchmark-*.json | scripts/externalTests/merge_benchmarks.sh > reports/externalTests/all-benchmarks.json
       - run:
           name: Summarize reports
           command: cat reports/externalTests/all-benchmarks.json | scripts/externalTests/summarize_benchmarks.sh > reports/externalTests/summarized-benchmarks.json
+      - run:
+          name: Download reports from base branch
+          command: |
+            if [[ $CIRCLE_PULL_REQUEST != "" ]]; then
+              mkdir reports/externalTests/base-branch/
+              cd reports/externalTests/base-branch/
+
+              pr_id=$(echo "$CIRCLE_PULL_REQUEST" | sed 's|\(.*\)\/||')
+              scripts_dir=../../../scripts
+
+              "${scripts_dir}/externalTests/download_benchmarks.py" --base-of-pr "$pr_id"
+            fi
+      - run:
+          name: Diff benchmarks
+          command: |
+            if [[ $CIRCLE_PULL_REQUEST != "" ]]; then
+              cd reports/externalTests/
+              mkdir diff/
+              scripts_dir=../../scripts
+
+              "${scripts_dir}/externalTests/benchmark_diff.py" table \
+                --output-format markdown \
+                --style humanized \
+                base-branch/summarized-benchmarks-*.json \
+                summarized-benchmarks.json > diff/benchmark-diff-summarized-table-markdown-humanized.md
+              "${scripts_dir}/externalTests/benchmark_diff.py" table \
+                --output-format markdown \
+                --style absolute \
+                base-branch/summarized-benchmarks-*.json \
+                summarized-benchmarks.json > diff/benchmark-diff-summarized-table-markdown-absolute.md
+              "${scripts_dir}/externalTests/benchmark_diff.py" inplace \
+                --style absolute \
+                base-branch/summarized-benchmarks-*.json \
+                summarized-benchmarks.json > diff/benchmark-diff-summarized-inplace-absolute.md
+              "${scripts_dir}/externalTests/benchmark_diff.py" inplace \
+                --style absolute \
+                base-branch/all-benchmarks-*.json \
+                all-benchmarks.json > diff/benchmark-diff-all-table-inplace-absolute.md
+            fi
       - store_artifacts:
           path: reports/externalTests/all-benchmarks.json
       - store_artifacts:
           path: reports/externalTests/summarized-benchmarks.json
+      - store_artifacts:
+          path: reports/externalTests/diff/
+      - store_artifacts:
+          path: reports/externalTests/base-branch/
 
   b_win: &b_win
     <<: *base_win_powershell_large

From 52ea572ec152cd43a63761b2dfe00b368880c937 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 23 May 2022 15:43:03 +0200
Subject: [PATCH 0633/1748] Copy editing changelog.

---
 Changelog.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 10c65182c5..b37938172f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,12 +1,12 @@
 ### 0.8.15 (unreleased)
 
 Language Features:
-* General: Add `E.selector` for a non-anonymous event `E` to access the 32-byte selector topic.
-* General: Errors and Events allow qualified access from other contracts.
+ * Add `E.selector` for a non-anonymous event `E` to access the 32-byte selector topic.
+ * Errors and Events allow qualified access from other contracts.
 
 
 Compiler Features:
-* LSP: Add rudimentary support for semantic highlighting.
+ * LSP: Add rudimentary support for semantic highlighting.
  * Yul Optimizer: Improve inlining heuristics for via IR code generation and pure Yul compilation.
 
 

From 10c991c3fffc585e7bec039c6f68b6aeaf049a35 Mon Sep 17 00:00:00 2001
From: Dustin Alandzes <5882512+DustinAlandzes@users.noreply.github.com>
Date: Tue, 24 May 2022 23:14:21 -0500
Subject: [PATCH 0634/1748] expect -> except in docs/contributing.rst

---
 docs/contributing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 0c2ee9124b..cd494e00eb 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -245,7 +245,7 @@ It offers several options for failing tests:
 - ``skip``: Skips the execution of this particular test.
 - ``quit``: Quits ``isoltest``.
 
-All of these options apply to the current contract, expect ``quit`` which stops the entire testing process.
+All of these options apply to the current contract, except ``quit`` which stops the entire testing process.
 
 Automatically updating the test above changes it to
 

From 6937799587fb2b60ff8e0d8a46cb5c4a99a70732 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 25 May 2022 15:38:01 +0200
Subject: [PATCH 0635/1748] gnosis: Pin typescript dependency at <= 4.7.0

---
 test/externalTests/gnosis.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index ae268603b3..4bd7c66fe3 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -94,6 +94,10 @@ function gnosis_safe_test
     npm install
     npm install hardhat-gas-reporter
 
+    # Typescript compilation fails with typescript >= 4.7:
+    # Error: Debug Failure. False expression: Non-string value passed to `ts.resolveTypeReferenceDirective`
+    npm install "typescript@<4.7.0"
+
     # With ethers.js 5.6.2 many tests for revert messages fail.
     # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
     npm install ethers@5.6.1

From c8612078c4f442255b83f5a850cd84ca1b7dca4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 25 May 2022 15:53:05 +0200
Subject: [PATCH 0636/1748] Remove the ethers.js 5.6.2 workaround from all ext
 tests except for gnosis and uniswap

---
 test/externalTests/ens.sh   | 4 ----
 test/externalTests/euler.sh | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 834c1074be..ca041afbc4 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -65,10 +65,6 @@ function ens_test
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
     yarn install
 
-    # With ethers.js 5.6.2 many tests for revert messages fail.
-    # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
-    yarn add ethers@5.6.1
-
     replace_version_pragmas
     neutralize_packaged_contracts
 
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index fe8680572f..01ac2c746c 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -78,10 +78,6 @@ function euler_test
     force_hardhat_unlimited_contract_size "$config_file"
     npm install
 
-    # With ethers.js 5.6.2 many tests for revert messages fail.
-    # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
-    npm install ethers@5.6.1
-
     replace_version_pragmas
     neutralize_packaged_contracts
 

From be12f90775c6b7851fdb3d6a16f3ad03dab17dfc Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 24 May 2022 15:27:59 -0300
Subject: [PATCH 0637/1748] Disable zeppelin test cases in which Hardhat's
 heuristics break after relaxing inilining. Also disabled one test because of
 hardhat issue 2115 (revert due to overflow misdetected).

---
 test/externalTests/zeppelin.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 5af8dd6262..2cdfb4626b 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -100,9 +100,16 @@ function zeppelin_test
     sed -i 's|it(\(`reverts when downcasting 2^\${bits} + 1 (\${maxValue.addn(2)})`\)|it.skip(\1|g' test/utils/math/SafeCast.test.js
     sed -i 's|it(\(`reverts when casting [^`]\+`\)|it.skip(\1|g' test/utils/math/SafeCast.test.js
     sed -i "s|it(\('missing value'\)|it.skip(\1|g" test/utils/structs/EnumerableMap.behavior.js
+    sed -i "s|it(\('reverts when queried for non existent token id'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
+    sed -i "s|it(\('reverts if index is greater than supply'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
+    sed -i "s|it(\('burns all tokens'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
+    sed -i "s|it(\('other accounts cannot pause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js
+    sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js
+    sed -i "s|it(\('prevents initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
 
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
     sed -i "s|describe\(('Polygon-Child'\)|describe.skip\1|g" test/crosschain/CrossChainEnabled.test.js
+    sed -i "s|it(\('revert with invalid multi proof #2'\)|it.skip(\1|g" test/utils/cryptography/MerkleProof.test.js
 
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"

From ecb7c0b008d43c7d959468b43a38a44702dd46d6 Mon Sep 17 00:00:00 2001
From: shady41 <abhinavjha2512@gmail.com>
Date: Sat, 21 May 2022 23:43:42 +0530
Subject: [PATCH 0638/1748] Moved operator precedence from the cheatsheet to
 the operator docs

---
 docs/cheatsheet.rst      | 62 ++------------------------------------
 docs/types/operators.rst | 64 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index eabf83931f..a60e7bca7f 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -2,70 +2,12 @@
 Cheatsheet
 **********
 
-.. index:: precedence
-
-.. _order:
+.. index:: operator; precedence
 
 Order of Precedence of Operators
 ================================
 
-The following is the order of precedence for operators, listed in order of evaluation.
-
-+------------+-------------------------------------+--------------------------------------------+
-| Precedence | Description                         | Operator                                   |
-+============+=====================================+============================================+
-| *1*        | Postfix increment and decrement     | ``++``, ``--``                             |
-+            +-------------------------------------+--------------------------------------------+
-|            | New expression                      | ``new <typename>``                         |
-+            +-------------------------------------+--------------------------------------------+
-|            | Array subscripting                  | ``<array>[<index>]``                       |
-+            +-------------------------------------+--------------------------------------------+
-|            | Member access                       | ``<object>.<member>``                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Function-like call                  | ``<func>(<args...>)``                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Parentheses                         | ``(<statement>)``                          |
-+------------+-------------------------------------+--------------------------------------------+
-| *2*        | Prefix increment and decrement      | ``++``, ``--``                             |
-+            +-------------------------------------+--------------------------------------------+
-|            | Unary minus                         | ``-``                                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Unary operations                    | ``delete``                                 |
-+            +-------------------------------------+--------------------------------------------+
-|            | Logical NOT                         | ``!``                                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Bitwise NOT                         | ``~``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *3*        | Exponentiation                      | ``**``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *4*        | Multiplication, division and modulo | ``*``, ``/``, ``%``                        |
-+------------+-------------------------------------+--------------------------------------------+
-| *5*        | Addition and subtraction            | ``+``, ``-``                               |
-+------------+-------------------------------------+--------------------------------------------+
-| *6*        | Bitwise shift operators             | ``<<``, ``>>``                             |
-+------------+-------------------------------------+--------------------------------------------+
-| *7*        | Bitwise AND                         | ``&``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *8*        | Bitwise XOR                         | ``^``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *9*        | Bitwise OR                          | ``|``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *10*       | Inequality operators                | ``<``, ``>``, ``<=``, ``>=``               |
-+------------+-------------------------------------+--------------------------------------------+
-| *11*       | Equality operators                  | ``==``, ``!=``                             |
-+------------+-------------------------------------+--------------------------------------------+
-| *12*       | Logical AND                         | ``&&``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *13*       | Logical OR                          | ``||``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *14*       | Ternary operator                    | ``<conditional> ? <if-true> : <if-false>`` |
-+            +-------------------------------------+--------------------------------------------+
-|            | Assignment operators                | ``=``, ``|=``, ``^=``, ``&=``, ``<<=``,    |
-|            |                                     | ``>>=``, ``+=``, ``-=``, ``*=``, ``/=``,   |
-|            |                                     | ``%=``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *15*       | Comma operator                      | ``,``                                      |
-+------------+-------------------------------------+--------------------------------------------+
+:ref:`order`
 
 .. index:: assert, block, coinbase, difficulty, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, gas price, origin, revert, require, keccak256, ripemd160, sha256, ecrecover, addmod, mulmod, cryptography, this, super, selfdestruct, balance, codehash, send
 
diff --git a/docs/types/operators.rst b/docs/types/operators.rst
index be5f0d4568..e998e03a5a 100644
--- a/docs/types/operators.rst
+++ b/docs/types/operators.rst
@@ -108,3 +108,67 @@ value it referred to previously.
             assert(y.length == 0);
         }
     }
+
+.. index:: ! operator; precedence
+.. _order:
+
+Order of Precedence of Operators
+--------------------------------
+
+The following is the order of precedence for operators, listed in order of evaluation.
+
++------------+-------------------------------------+--------------------------------------------+
+| Precedence | Description                         | Operator                                   |
++============+=====================================+============================================+
+| *1*        | Postfix increment and decrement     | ``++``, ``--``                             |
++            +-------------------------------------+--------------------------------------------+
+|            | New expression                      | ``new <typename>``                         |
++            +-------------------------------------+--------------------------------------------+
+|            | Array subscripting                  | ``<array>[<index>]``                       |
++            +-------------------------------------+--------------------------------------------+
+|            | Member access                       | ``<object>.<member>``                      |
++            +-------------------------------------+--------------------------------------------+
+|            | Function-like call                  | ``<func>(<args...>)``                      |
++            +-------------------------------------+--------------------------------------------+
+|            | Parentheses                         | ``(<statement>)``                          |
++------------+-------------------------------------+--------------------------------------------+
+| *2*        | Prefix increment and decrement      | ``++``, ``--``                             |
++            +-------------------------------------+--------------------------------------------+
+|            | Unary minus                         | ``-``                                      |
++            +-------------------------------------+--------------------------------------------+
+|            | Unary operations                    | ``delete``                                 |
++            +-------------------------------------+--------------------------------------------+
+|            | Logical NOT                         | ``!``                                      |
++            +-------------------------------------+--------------------------------------------+
+|            | Bitwise NOT                         | ``~``                                      |
++------------+-------------------------------------+--------------------------------------------+
+| *3*        | Exponentiation                      | ``**``                                     |
++------------+-------------------------------------+--------------------------------------------+
+| *4*        | Multiplication, division and modulo | ``*``, ``/``, ``%``                        |
++------------+-------------------------------------+--------------------------------------------+
+| *5*        | Addition and subtraction            | ``+``, ``-``                               |
++------------+-------------------------------------+--------------------------------------------+
+| *6*        | Bitwise shift operators             | ``<<``, ``>>``                             |
++------------+-------------------------------------+--------------------------------------------+
+| *7*        | Bitwise AND                         | ``&``                                      |
++------------+-------------------------------------+--------------------------------------------+
+| *8*        | Bitwise XOR                         | ``^``                                      |
++------------+-------------------------------------+--------------------------------------------+
+| *9*        | Bitwise OR                          | ``|``                                      |
++------------+-------------------------------------+--------------------------------------------+
+| *10*       | Inequality operators                | ``<``, ``>``, ``<=``, ``>=``               |
++------------+-------------------------------------+--------------------------------------------+
+| *11*       | Equality operators                  | ``==``, ``!=``                             |
++------------+-------------------------------------+--------------------------------------------+
+| *12*       | Logical AND                         | ``&&``                                     |
++------------+-------------------------------------+--------------------------------------------+
+| *13*       | Logical OR                          | ``||``                                     |
++------------+-------------------------------------+--------------------------------------------+
+| *14*       | Ternary operator                    | ``<conditional> ? <if-true> : <if-false>`` |
++            +-------------------------------------+--------------------------------------------+
+|            | Assignment operators                | ``=``, ``|=``, ``^=``, ``&=``, ``<<=``,    |
+|            |                                     | ``>>=``, ``+=``, ``-=``, ``*=``, ``/=``,   |
+|            |                                     | ``%=``                                     |
++------------+-------------------------------------+--------------------------------------------+
+| *15*       | Comma operator                      | ``,``                                      |
++------------+-------------------------------------+--------------------------------------------+

From 90514d88937e5f8976f5a647959804efbfedb7d7 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Thu, 26 May 2022 17:03:42 -0300
Subject: [PATCH 0639/1748] Added option to allow soltest in CI print errors to
 stderr in addition to the XML report.

---
 .circleci/soltest.ps1 | 6 +++---
 .circleci/soltest.sh  | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.circleci/soltest.ps1 b/.circleci/soltest.ps1
index 6b67adb139..3c800903be 100755
--- a/.circleci/soltest.ps1
+++ b/.circleci/soltest.ps1
@@ -6,7 +6,7 @@ cd "$PSScriptRoot\.."
 if ( -not $? ) { throw "Cannot execute solc --version." }
 
 mkdir test_results
-.\build\test\Release\soltest.exe --color_output=no --show_progress=yes --logger=JUNIT,error,test_results/result.xml -- --no-smt
+.\build\test\Release\soltest.exe --color_output=no --show_progress=yes --logger=JUNIT,error,test_results/result.xml --logger=HRF,error,stdout -- --no-smt
 if ( -not $? ) { throw "Unoptimized soltest run failed." }
-.\build\test\Release\soltest.exe --color_output=no --show_progress=yes --logger=JUNIT,error,test_results/result_opt.xml -- --optimize --no-smt
-if ( -not $? ) { throw "Optimized soltest run failed." }
\ No newline at end of file
+.\build\test\Release\soltest.exe --color_output=no --show_progress=yes --logger=JUNIT,error,test_results/result_opt.xml --logger=HRF,error,stdout -- --optimize --no-smt
+if ( -not $? ) { throw "Optimized soltest run failed." }
diff --git a/.circleci/soltest.sh b/.circleci/soltest.sh
index 91325f02e4..7b5b885935 100755
--- a/.circleci/soltest.sh
+++ b/.circleci/soltest.sh
@@ -75,6 +75,7 @@ do
         "--color_output=no"
         "--show_progress=yes"
         "--logger=JUNIT,error,test_results/$(get_logfile_basename "$((CPUs * CIRCLE_NODE_INDEX + run))").xml"
+        "--logger=HRF,error,stdout"
         "${BOOST_TEST_ARGS[@]}"
     )
     SOLTEST_ARGS=("--evm-version=$EVM" "${SOLTEST_FLAGS[@]}")

From 5f6f353953f48b3dd9bdce3eea4f876bfdc36633 Mon Sep 17 00:00:00 2001
From: uji <ujiprog@gmail.com>
Date: Mon, 30 May 2022 00:15:48 +0900
Subject: [PATCH 0640/1748] Sort grammer rules of SolidityLexer.g4

---
 docs/grammar/SolidityLexer.g4 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index 9250835dd2..c47dc411cd 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -9,10 +9,9 @@ ReservedKeywords:
 	| 'partial' | 'promise' | 'reference' | 'relocatable' | 'sealed' | 'sizeof' | 'static'
 	| 'supports' | 'switch' | 'typedef' | 'typeof' | 'var';
 
-Pragma: 'pragma' -> pushMode(PragmaMode);
 Abstract: 'abstract';
-Anonymous: 'anonymous';
 Address: 'address';
+Anonymous: 'anonymous';
 As: 'as';
 Assembly: 'assembly' -> pushMode(AssemblyBlockMode);
 Bool: 'bool';
@@ -30,13 +29,11 @@ Else: 'else';
 Emit: 'emit';
 Enum: 'enum';
 Error: 'error'; // not a real keyword
-Revert: 'revert'; // not a real keyword
 Event: 'event';
 External: 'external';
 Fallback: 'fallback';
 False: 'false';
 Fixed: 'fixed' | ('fixed' [1-9][0-9]* 'x' [1-9][0-9]*);
-From: 'from'; // not a real keyword
 /**
  * Bytes types of fixed length.
  */
@@ -46,6 +43,7 @@ FixedBytes:
 	'bytes17' | 'bytes18' | 'bytes19' | 'bytes20' | 'bytes21' | 'bytes22' | 'bytes23' | 'bytes24' |
 	'bytes25' | 'bytes26' | 'bytes27' | 'bytes28' | 'bytes29' | 'bytes30' | 'bytes31' | 'bytes32';
 For: 'for';
+From: 'from'; // not a real keyword
 Function: 'function';
 Global: 'global'; // not a real keyword
 Hex: 'hex';
@@ -67,12 +65,14 @@ New: 'new';
 NumberUnit: 'wei' | 'gwei' | 'ether' | 'seconds' | 'minutes' | 'hours' | 'days' | 'weeks' | 'years';
 Override: 'override';
 Payable: 'payable';
+Pragma: 'pragma' -> pushMode(PragmaMode);
 Private: 'private';
 Public: 'public';
 Pure: 'pure';
 Receive: 'receive';
 Return: 'return';
 Returns: 'returns';
+Revert: 'revert'; // not a real keyword
 /**
  * Sized signed integer types.
  * int is an alias of int256.

From 3904a0d5ce8a4ce7585c43f550153a7c551d8454 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 31 May 2022 09:00:00 -0300
Subject: [PATCH 0641/1748] Revert workaround introduced in euler tests because
 it is no longer needed.

This reverts commit 98efb460315bfc31452347560acc1c8495fea86b.
---
 test/externalTests/euler.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 01ac2c746c..59e9dea9e8 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -67,10 +67,6 @@ function euler_test
     sed -i "/expectError: 'JUNK_UPGRADE_TEST_FAILURE'/d" test/moduleUpgrade.js
     sed -i "/et\.expect(errMsg)\.to\.contain('e\/collateral-violation');/d" test/flashLoanNative.js
 
-    # One of the tests is currently broken in the upstream, due to changed behavior of chainid in @ethereumjs/vm.
-    # TODO: Remove this when https://github.com/euler-xyz/euler-contracts/issues/119 gets fixed.
-    sed -i 's/domainSeparatorMatch)\.to\.equal(true/domainSeparatorMatch)\.to\.equal(false/g' test/eulStakes.js
-
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"

From 606121964186bfbec416a72ab4c4efec92cbd647 Mon Sep 17 00:00:00 2001
From: Prajwal Borkar <48290911+PrajwalBorkar@users.noreply.github.com>
Date: Sat, 28 May 2022 16:22:49 +0530
Subject: [PATCH 0642/1748] Fix link to the optimizer step sequence in
 optimizer.rst

---
 docs/internals/optimizer.rst | 2 +-
 docs/yul.rst                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 1d6c214e5f..97a250eeda 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -330,7 +330,7 @@ the ``--yul-optimizations`` option:
 The sequence inside ``[...]`` will be applied multiple times in a loop until the Yul code
 remains unchanged or until the maximum number of rounds (currently 12) has been reached.
 
-Available abbreviations are listed in the `Yul optimizer docs <yul.rst#optimization-step-sequence>`_.
+Available abbreviations are listed in the :ref:`Yul optimizer docs <optimization-step-sequence>`.
 
 Preprocessing
 -------------
diff --git a/docs/yul.rst b/docs/yul.rst
index 8a584db1d4..8aad4f702f 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -1238,6 +1238,8 @@ and optionally specify the :ref:`expected number of contract executions <optimiz
 
 In Solidity mode, the Yul optimizer is activated together with the regular optimizer.
 
+.. _optimization-step-sequence:
+
 Optimization Step Sequence
 --------------------------
 

From 6c9754a784e5f3fd1e90422fc1806a0639f6bd9b Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Mon, 30 May 2022 19:51:43 +0200
Subject: [PATCH 0643/1748] lsp.py: Fix various problems with subdirectory edge
 cases

* fix properly path parsing with nested subdirectories
* fix regex to be able to handle `file://..`
* fix not checking all expected diagnostics
* Some extra comments and renames
---
 .circleci/config.yml |  4 +-
 test/lsp.py          | 93 ++++++++++++++++++++++++++++++--------------
 2 files changed, 66 insertions(+), 31 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 20d5ac6c2e..262f15dc04 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -222,7 +222,7 @@ defaults:
             command: pip install --user deepdiff colorama
         - run:
             name: Executing solc LSP test suite
-            command: ./test/lsp.py ./build/solc/solc
+            command: ./test/lsp.py ./build/solc/solc --non-interactive
         - gitter_notify_failure_unless_pr
 
   - steps_build: &steps_build
@@ -1352,7 +1352,7 @@ jobs:
           command: Get-Content ./test/lsp.py
       - run:
           name: Executing solc LSP test suite
-          command: python ./test/lsp.py .\build\solc\Release\solc.exe
+          command: python ./test/lsp.py .\build\solc\Release\solc.exe --non-interactive
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
       - gitter_notify_failure_unless_pr
diff --git a/test/lsp.py b/test/lsp.py
index 625d27e13b..117b65df29 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -69,7 +69,7 @@ def getCharFromStdin() -> str:
     re.compile(R'^// -> (?P<method>[\w\/]+) {'),
     re.compile(R'(?P<tag>"@\w+")'),
     re.compile(R'(?P<tag>@\w+)'),
-    re.compile(R'// (?P<testname>\w+):[ ]?(?P<diagnostics>[\w @]*)'),
+    re.compile(R'// (?P<testname>\S+):([ ](?P<diagnostics>[\w @]*))?'),
     re.compile(R'(?P<tag>@\w+) (?P<code>\d\d\d\d)')
 )
 
@@ -86,7 +86,7 @@ def split_path(path):
     """
     Return the test name and the subdir path of the given path.
     """
-    sub_dir_separator = path.find("/")
+    sub_dir_separator = path.rfind("/")
 
     if sub_dir_separator == -1:
         return (path, None)
@@ -105,7 +105,8 @@ def count_index(lines, start=0):
 
 def tags_only(lines, start=0):
     """
-    Filter the lines for tag comments and report line number that tags refer to.
+    Filter the lines for tag comments and report the line number that the tags
+    _refer_ to (which is not the line they are on!).
     """
     n = start
     numCommentLines = 0
@@ -272,27 +273,34 @@ def create_cli_parser() -> argparse.ArgumentParser:
     parser = argparse.ArgumentParser(description="Solidity LSP Test suite")
     parser.set_defaults(fail_fast=False)
     parser.add_argument(
-        "-f, --fail-fast",
+        "-f", "--fail-fast",
         dest="fail_fast",
         action="store_true",
         help="Terminates the running tests on first failure."
     )
+    parser.set_defaults(non_interactive=False)
+    parser.add_argument(
+        "-n", "--non-interactive",
+        dest="non_interactive",
+        action="store_true",
+        help="Prevent interactive queries and just fail instead."
+    )
     parser.set_defaults(trace_io=False)
     parser.add_argument(
-        "-T, --trace-io",
+        "-T", "--trace-io",
         dest="trace_io",
         action="store_true",
         help="Be more verbose by also printing assertions."
     )
     parser.set_defaults(print_assertions=False)
     parser.add_argument(
-        "-v, --print-assertions",
+        "-v", "--print-assertions",
         dest="print_assertions",
         action="store_true",
         help="Be more verbose by also printing assertions."
     )
     parser.add_argument(
-        "-t, --test-pattern",
+        "-t", "--test-pattern",
         dest="test_pattern",
         type=str,
         default="*",
@@ -405,11 +413,13 @@ def parseDiagnostics(self):
 
             testDiagnostics = []
 
-            for diagnosticMatch in TEST_REGEXES.diagnostic.finditer(fileDiagMatch.group("diagnostics")):
-                testDiagnostics.append(self.Diagnostic(
-                    diagnosticMatch.group("tag"),
-                    int(diagnosticMatch.group("code"))
-                ))
+            diagnostics_string = fileDiagMatch.group("diagnostics")
+            if diagnostics_string is not None:
+                for diagnosticMatch in TEST_REGEXES.diagnostic.finditer(diagnostics_string):
+                    testDiagnostics.append(self.Diagnostic(
+                        diagnosticMatch.group("tag"),
+                        int(diagnosticMatch.group("code"))
+                    ))
 
             diagnostics["tests"][fileDiagMatch.group("testname")] = testDiagnostics
 
@@ -537,11 +547,11 @@ def test_diagnostics(self):
             self.expected_diagnostics = next(self.parsed_testcases)
             assert isinstance(self.expected_diagnostics, TestParser.Diagnostics) is True
 
-            tests = self.expected_diagnostics.tests
+            expected_diagnostics_per_file = self.expected_diagnostics.tests
 
             # Add our own test diagnostics if they didn't exist
-            if self.test_name not in tests:
-                tests[self.test_name] = []
+            if self.test_name not in expected_diagnostics_per_file:
+                expected_diagnostics_per_file[self.test_name] = []
 
             published_diagnostics = \
                 self.suite.open_file_and_wait_for_diagnostics(self.solc, self.test_name, self.sub_dir)
@@ -551,25 +561,27 @@ def test_diagnostics(self):
                     raise Exception(
                         f"'{self.test_name}.sol' imported file outside of test directory: '{diagnostics['uri']}'"
                     )
-                self.open_tests.append(diagnostics["uri"].replace(self.suite.project_root_uri + "/", "")[:-len(".sol")])
+                self.open_tests.append(self.suite.normalizeUri(diagnostics["uri"]))
 
             self.suite.expect_equal(
                 len(published_diagnostics),
-                len(tests),
+                len(expected_diagnostics_per_file),
                 description="Amount of reports does not match!")
 
-            for diagnostics in published_diagnostics:
-                testname_and_subdir = diagnostics["uri"].replace(self.suite.project_root_uri + "/", "")[:-len(".sol")]
-                testname, sub_dir = split_path(testname_and_subdir)
+            for diagnostics_per_file in published_diagnostics:
+                testname, sub_dir = split_path(self.suite.normalizeUri(diagnostics_per_file['uri']))
+
+                # Clear all processed expectations so we can check at the end
+                # what's missing
+                expected_diagnostics = expected_diagnostics_per_file.pop(testname, {})
 
-                expected_diagnostics = tests[testname]
                 self.suite.expect_equal(
-                    len(diagnostics["diagnostics"]),
+                    len(diagnostics_per_file["diagnostics"]),
                     len(expected_diagnostics),
                     description="Unexpected amount of diagnostics"
                 )
                 markers = self.suite.get_file_tags(testname, sub_dir)
-                for actual_diagnostic in diagnostics["diagnostics"]:
+                for actual_diagnostic in diagnostics_per_file["diagnostics"]:
                     expected_diagnostic = next((diagnostic for diagnostic in
                         expected_diagnostics if actual_diagnostic['range'] ==
                         markers[diagnostic.marker]), None)
@@ -586,6 +598,12 @@ def test_diagnostics(self):
                         marker=markers[expected_diagnostic.marker]
                     )
 
+            if len(expected_diagnostics_per_file) > 0:
+                raise ExpectationFailed(
+                    f"Expected diagnostics but received none for {expected_diagnostics_per_file}",
+                    ExpectationFailed.Part.Diagnostics
+                )
+
         except Exception:
             self.close_all_open_files()
             raise
@@ -759,6 +777,7 @@ def __init__(self):
         self.trace_io = args.trace_io
         self.test_pattern = args.test_pattern
         self.fail_fast = args.fail_fast
+        self.non_interactive = args.non_interactive
 
         print(f"{SGR_NOTICE}test pattern: {self.test_pattern}{SGR_RESET}")
 
@@ -773,6 +792,9 @@ def main(self) -> int:
             if callable(getattr(SolidityLSPTestSuite, name)) and name.startswith("test_")
         ])
         filtered_tests = fnmatch.filter(all_tests, self.test_pattern)
+        if filtered_tests.count("generic") == 0:
+            filtered_tests.append("generic")
+
         for method_name in filtered_tests:
             test_fn = getattr(self, 'test_' + method_name)
             title: str = test_fn.__name__[5:]
@@ -889,22 +911,25 @@ def wait_for_diagnostics(self, solc: JsonRpcProcess) -> List[dict]:
 
         return sorted(reports, key=lambda x: x['uri'])
 
+    def normalizeUri(self, uri):
+        return uri.replace(self.project_root_uri + "/", "")[:-len(".sol")]
+
     def fetch_and_format_diagnostics(self, solc: JsonRpcProcess, test, sub_dir=None):
         expectations = ""
 
         published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, test, sub_dir)
 
-        for diagnostics in published_diagnostics:
-            testname = diagnostics["uri"].replace(f"{self.project_root_uri}/{sub_dir}/", "")[:-len(".sol")]
+        for file_diagnostics in published_diagnostics:
+            testname, local_sub_dir = split_path(self.normalizeUri(file_diagnostics["uri"]))
 
             # Skip empty diagnostics within the same file
-            if len(diagnostics["diagnostics"]) == 0 and testname == test:
+            if len(file_diagnostics["diagnostics"]) == 0 and testname == test:
                 continue
 
             expectations += f"// {testname}:"
 
-            for diagnostic in diagnostics["diagnostics"]:
-                tag = self.find_tag_with_range(testname, sub_dir, diagnostic['range'])
+            for diagnostic in file_diagnostics["diagnostics"]:
+                tag = self.find_tag_with_range(testname, local_sub_dir, diagnostic['range'])
 
                 if tag is None:
                     raise Exception(f"No tag found for diagnostic range {diagnostic['range']}")
@@ -1121,6 +1146,11 @@ def user_interaction_failed_diagnostics(
         Asks the user how to proceed after an error.
         Returns True if the test/file should be ignored, otherwise False
         """
+
+        # Prevent user interaction when in non-interactive mode
+        if self.non_interactive:
+            return False
+
         while True:
             print("(u)pdate/(r)etry/(s)kip file?")
             user_response = getCharFromStdin()
@@ -1324,10 +1354,15 @@ def test_generic(self, solc: JsonRpcProcess) -> None:
 
         for sub_dir in map(lambda filepath: filepath.name, sub_dirs):
             tests = map(
-                lambda filename: filename[:-len(".sol")],
+                lambda filename, sd=sub_dir: sd + "/" + filename[:-len(".sol")],
                 os.listdir(f"{self.project_root_dir}/{sub_dir}")
             )
 
+            tests = map(
+                lambda path, sd=sub_dir: path[len(sd)+1:],
+                fnmatch.filter(tests, self.test_pattern)
+            )
+
             print(f"Running tests in subdirectory '{sub_dir}'...")
             for test in tests:
                 try_again = True

From f4f4cfe294fd3ba4bb41ebbd8eebebf4c992f1fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 1 Jun 2022 20:19:12 +0200
Subject: [PATCH 0644/1748] CI: Print pylint version before running checks

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 262f15dc04..b637b58052 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -700,6 +700,7 @@ jobs:
             deepdiff
             colorama
             requests
+      - run: pylint --version
       - run:
           name: Linting Python Scripts
           command: ./scripts/pylint_all.py

From 6605dd084ac07048139e7d6976bda1ffb7005733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 1 Jun 2022 20:20:54 +0200
Subject: [PATCH 0645/1748] gas_diff_stats.py: Replace a list with a generator
 as suggested by pylint

---
 scripts/gas_diff_stats.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 5c7aa53385..56cd0cd430 100644
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -88,11 +88,11 @@ def try_parse(line):
     diff_kinds = [Diff.Minus, Diff.Plus]
     codegen_kinds = [Kind.IrOptimized, Kind.LegacyOptimized, Kind.Legacy]
     return tuple(
-        sum([
+        sum(
             val
             for (diff_kind, codegen_kind, val) in out
             if diff_kind == _diff_kind and codegen_kind == _codegen_kind
-        ])
+        )
         for _diff_kind in diff_kinds
         for _codegen_kind in codegen_kinds
     )

From f5e421ff9125a30105c9ca25948c988aed2d04e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 1 Jun 2022 20:32:13 +0200
Subject: [PATCH 0646/1748] pylintrc: Remove bad-whitespace form the list of
 disabled warnings

- pylint complains that it's not a valid value and removing it does not make any new warnings appear
---
 scripts/pylintrc | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/pylintrc b/scripts/pylintrc
index 02d529567d..3a2b852930 100644
--- a/scripts/pylintrc
+++ b/scripts/pylintrc
@@ -17,7 +17,6 @@
 # TODO: What could be eliminated in future PRs: invalid-name, pointless-string-statement, redefined-outer-name.
 disable=
     bad-indentation,
-    bad-whitespace,
     duplicate-code,
     invalid-name,
     missing-docstring,

From 539e1395556c1a3df7c30f687b931acc7679780d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 1 Jun 2022 19:56:30 +0200
Subject: [PATCH 0647/1748] Add explicit throws after some assertions to work
 around a spurious warning in GCC 12.1

---
 libsmtutil/CVC4Interface.cpp        |  4 ++++
 libsmtutil/Z3Interface.cpp          |  7 +++++++
 libsolidity/ast/ASTJsonImporter.cpp | 15 +++++++++++++++
 libsolidity/parsing/Parser.cpp      |  3 +++
 libyul/AsmJsonImporter.cpp          |  6 ++++++
 libyul/backends/evm/StackHelpers.h  |  3 +++
 tools/yulPhaser/Phaser.cpp          |  3 +++
 7 files changed, 41 insertions(+)

diff --git a/libsmtutil/CVC4Interface.cpp b/libsmtutil/CVC4Interface.cpp
index 8387b24cb8..06a28890c1 100644
--- a/libsmtutil/CVC4Interface.cpp
+++ b/libsmtutil/CVC4Interface.cpp
@@ -19,6 +19,7 @@
 #include <libsmtutil/CVC4Interface.h>
 
 #include <libsolutil/CommonIO.h>
+#include <libsolutil/Exceptions.h>
 
 #include <cvc4/util/bitvector.h>
 
@@ -289,6 +290,9 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 	}
 
 	smtAssert(false, "");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 CVC4::Type CVC4Interface::cvc4Sort(Sort const& _sort)
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
index a0d50d225c..597d80c321 100644
--- a/libsmtutil/Z3Interface.cpp
+++ b/libsmtutil/Z3Interface.cpp
@@ -20,6 +20,7 @@
 
 #include <libsolutil/CommonData.h>
 #include <libsolutil/CommonIO.h>
+#include <libsolutil/Exceptions.h>
 
 #ifdef HAVE_Z3_DLOPEN
 #include <libsmtutil/Z3Loader.h>
@@ -271,6 +272,9 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
 	}
 
 	smtAssert(false, "");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
@@ -379,6 +383,9 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 		return Expression(_expr.decl().name().str(), arguments, fromZ3Sort(_expr.get_sort()));
 
 	smtAssert(false, "");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 z3::sort Z3Interface::z3Sort(Sort const& _sort)
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 2f36cdead4..859a933503 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -229,6 +229,9 @@ ASTPointer<ASTNode> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _js
 		return createDocumentation(_json);
 	else
 		astAssert(false, "Unknown type of ASTNode: " + nodeType);
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 // ============ functions to instantiate the AST-Nodes from Json-Nodes ==============
@@ -1073,6 +1076,9 @@ Visibility ASTJsonImporter::visibility(Json::Value const& _node)
 		return Visibility::External;
 	else
 		astAssert(false, "Unknown visibility declaration");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 VariableDeclaration::Location ASTJsonImporter::location(Json::Value const& _node)
@@ -1092,6 +1098,9 @@ VariableDeclaration::Location ASTJsonImporter::location(Json::Value const& _node
 		return VariableDeclaration::Location::CallData;
 	else
 		astAssert(false, "Unknown location declaration");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _node)
@@ -1125,6 +1134,9 @@ Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _no
 		return Literal::SubDenomination::Year;
 	else
 		astAssert(false, "Unknown subdenomination");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 StateMutability ASTJsonImporter::stateMutability(Json::Value const& _node)
@@ -1142,6 +1154,9 @@ StateMutability ASTJsonImporter::stateMutability(Json::Value const& _node)
 		return StateMutability::Payable;
 	else
 		astAssert(false, "Unknown stateMutability");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 }
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 7bf0de045a..ae19804770 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1653,6 +1653,9 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&
 			solAssert(false, "");
 		}
 	}
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 bool Parser::IndexAccessedPath::empty() const
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index 8fb4eaeb37..1f108145f7 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -110,6 +110,9 @@ Statement AsmJsonImporter::createStatement(Json::Value const& _node)
 		return createBlock(_node);
 	else
 		yulAssert(false, "Invalid nodeType as statement");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 Expression AsmJsonImporter::createExpression(Json::Value const& _node)
@@ -129,6 +132,9 @@ Expression AsmJsonImporter::createExpression(Json::Value const& _node)
 		return createLiteral(_node);
 	else
 		yulAssert(false, "Invalid nodeType as expression");
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 vector<Expression> AsmJsonImporter::createExpressionVector(Json::Value const& _array)
diff --git a/libyul/backends/evm/StackHelpers.h b/libyul/backends/evm/StackHelpers.h
index a0a9428604..ff8887b24a 100644
--- a/libyul/backends/evm/StackHelpers.h
+++ b/libyul/backends/evm/StackHelpers.h
@@ -371,6 +371,9 @@ class Shuffler
 				return true;
 			}
 		yulAssert(false, "");
+
+		// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+		throw std::exception();
 	}
 };
 
diff --git a/tools/yulPhaser/Phaser.cpp b/tools/yulPhaser/Phaser.cpp
index ffcbd1d5ee..c49d9a2d87 100644
--- a/tools/yulPhaser/Phaser.cpp
+++ b/tools/yulPhaser/Phaser.cpp
@@ -276,6 +276,9 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(
 		default:
 			assertThrow(false, solidity::util::Exception, "Invalid MetricAggregatorChoice value.");
 	}
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	throw exception();
 }
 
 PopulationFactory::Options PopulationFactory::Options::fromCommandLine(po::variables_map const& _arguments)

From e19e6ad806a932f9f904aeb8425869598303ab82 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 1 Jun 2022 20:15:02 +0200
Subject: [PATCH 0648/1748] Remove empty assertion messages in a fews places

---
 libsmtutil/CVC4Interface.cpp   | 4 ++--
 libsmtutil/Z3Interface.cpp     | 6 +++---
 libsolidity/parsing/Parser.cpp | 9 ++++-----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/libsmtutil/CVC4Interface.cpp b/libsmtutil/CVC4Interface.cpp
index 06a28890c1..c335b18d14 100644
--- a/libsmtutil/CVC4Interface.cpp
+++ b/libsmtutil/CVC4Interface.cpp
@@ -278,7 +278,7 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 			return m_context.mkExpr(CVC4::kind::APPLY_CONSTRUCTOR, c, arguments);
 		}
 
-		smtAssert(false, "");
+		smtAssert(false);
 	}
 	catch (CVC4::TypeCheckingException const& _e)
 	{
@@ -289,7 +289,7 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 		smtAssert(false, _e.what());
 	}
 
-	smtAssert(false, "");
+	smtAssert(false);
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
 	throw exception();
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
index 597d80c321..74767d86c7 100644
--- a/libsmtutil/Z3Interface.cpp
+++ b/libsmtutil/Z3Interface.cpp
@@ -264,14 +264,14 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
 			return constructor(args);
 		}
 
-		smtAssert(false, "");
+		smtAssert(false);
 	}
 	catch (z3::exception const& _e)
 	{
 		smtAssert(false, _e.msg());
 	}
 
-	smtAssert(false, "");
+	smtAssert(false);
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
 	throw exception();
@@ -382,7 +382,7 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 	)
 		return Expression(_expr.decl().name().str(), arguments, fromZ3Sort(_expr.get_sort()));
 
-	smtAssert(false, "");
+	smtAssert(false);
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
 	throw exception();
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index ae19804770..0299ff0920 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1637,7 +1637,7 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&
 			return parseExpressionStatement(_docString, nodeFactory.createNode<TupleExpression>(components, false));
 		}
 		default:
-			solAssert(false, "");
+			solAssert(false);
 		}
 	}
 	else
@@ -1650,7 +1650,7 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&
 		case LookAheadInfo::Expression:
 			return parseExpressionStatement(_docString, expressionFromIndexAccessStructure(iap));
 		default:
-			solAssert(false, "");
+			solAssert(false);
 		}
 	}
 
@@ -1661,9 +1661,8 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&
 bool Parser::IndexAccessedPath::empty() const
 {
 	if (!indices.empty())
-	{
-		solAssert(!path.empty(), "");
-	}
+		solAssert(!path.empty());
+
 	return path.empty() && indices.empty();
 }
 

From 54ac1e8240d358ee62e74b19328c06810ba035c2 Mon Sep 17 00:00:00 2001
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Thu, 2 Jun 2022 09:43:18 -0700
Subject: [PATCH 0649/1748] Fix missing STL include in
 tools/solidityUpgrade/SourceUpgrade.cpp

---
 tools/solidityUpgrade/SourceUpgrade.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/solidityUpgrade/SourceUpgrade.cpp b/tools/solidityUpgrade/SourceUpgrade.cpp
index 7c70b1d165..b98b050d6f 100644
--- a/tools/solidityUpgrade/SourceUpgrade.cpp
+++ b/tools/solidityUpgrade/SourceUpgrade.cpp
@@ -26,6 +26,8 @@
 #include <boost/filesystem/operations.hpp>
 #include <boost/algorithm/string.hpp>
 
+#include <fstream>
+
 #ifdef _WIN32 // windows
 	#include <io.h>
 	#define isatty _isatty

From 61306a6f9da9cc977d9c4c165c1bf5a246921e4e Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Thu, 2 Jun 2022 19:55:15 +0530
Subject: [PATCH 0650/1748] disabling more zeppline tests that expect reverts
 with specific errors and they're broken via IR due to Hardhat heuristics.

Updated zeppelin.sh

Added cautionary comment for two sed commands that depend on the order of occurrence of the patterns in the files.
L122, and L123 both are referencing the 3rd occurrence of the patterns from their respective files.
This could result in an error in the future when the code is further modified.
---
 test/externalTests/zeppelin.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 2cdfb4626b..15ebf8b813 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -106,6 +106,11 @@ function zeppelin_test
     sed -i "s|it(\('other accounts cannot pause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js
     sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js
     sed -i "s|it(\('prevents initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
+    sed -i "s|it(\('divide by 0'\)|it.skip(\1|g" test/utils/math/Math.test.js
+    # CAUTION:: The following two sed commands depend on the order of occurrence of the relevant patterns in the mentioned files.
+    # Could result in an error in the future.
+    sed -zi "s|it(\('deposit'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC20TokenizedVault.test.js
+    sed -zi "s|it(\('withdraw'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC20TokenizedVault.test.js
 
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
     sed -i "s|describe\(('Polygon-Child'\)|describe.skip\1|g" test/crosschain/CrossChainEnabled.test.js

From 423f3d3088dcb85819ed2094e5c48beac1411e69 Mon Sep 17 00:00:00 2001
From: a3d4 <a3d4@pm.me>
Date: Thu, 28 Apr 2022 03:59:27 +0200
Subject: [PATCH 0651/1748] Fix ICE caused by an immutable struct

---
 Changelog.md                                      |  1 +
 libsolidity/interface/CompilerStack.cpp           | 15 +++++++++------
 .../immutable/non-value_type_struct.sol           |  9 +++++++++
 .../non-value_type_struct_with_mapping.sol        |  9 +++++++++
 4 files changed, 28 insertions(+), 6 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/immutable/non-value_type_struct.sol
 create mode 100644 test/libsolidity/syntaxTests/immutable/non-value_type_struct_with_mapping.sol

diff --git a/Changelog.md b/Changelog.md
index b37938172f..374a84ffc4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@ Compiler Features:
 Bugfixes:
  * ABI Encoder: When encoding an empty string coming from storage do not add a superfluous empty slot for data.
  * Yul Optimizer: Do not remove ``returndatacopy`` in cases in which it might perform out-of-bounds reads that unconditionally revert as out-of-gas. Previously, any ``returndatacopy`` that wrote to memory that was never read from was removed without accounting for the out-of-bounds condition.
+ * DocString Parser: Fix ICE caused by an immutable struct with mapping.
 
 
 ### 0.8.14 (2022-05-17)
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 6560b0be5e..22321a16dc 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -479,12 +479,6 @@ bool CompilerStack::analyze()
 			if (auto sourceAst = source->ast)
 				noErrors = contractLevelChecker.check(*sourceAst);
 
-		// Requires ContractLevelChecker
-		DocStringAnalyser docStringAnalyser(m_errorReporter);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !docStringAnalyser.analyseDocStrings(*source->ast))
-				noErrors = false;
-
 		// Now we run full type checks that go down to the expression level. This
 		// cannot be done earlier, because we need cross-contract types and information
 		// about whether a contract is abstract for the `new` expression.
@@ -497,6 +491,15 @@ bool CompilerStack::analyze()
 			if (source->ast && !typeChecker.checkTypeRequirements(*source->ast))
 				noErrors = false;
 
+		if (noErrors)
+		{
+			// Requires ContractLevelChecker and TypeChecker
+			DocStringAnalyser docStringAnalyser(m_errorReporter);
+			for (Source const* source: m_sourceOrder)
+				if (source->ast && !docStringAnalyser.analyseDocStrings(*source->ast))
+					noErrors = false;
+		}
+
 		if (noErrors)
 		{
 			// Checks that can only be done when all types of all AST nodes are known.
diff --git a/test/libsolidity/syntaxTests/immutable/non-value_type_struct.sol b/test/libsolidity/syntaxTests/immutable/non-value_type_struct.sol
new file mode 100644
index 0000000000..ad01e3b5e6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/non-value_type_struct.sol
@@ -0,0 +1,9 @@
+contract Contract {
+    struct S {
+        int k;
+    }
+
+    S immutable s;
+}
+// ----
+// TypeError 6377: (61-74): Immutable variables cannot have a non-value type.
diff --git a/test/libsolidity/syntaxTests/immutable/non-value_type_struct_with_mapping.sol b/test/libsolidity/syntaxTests/immutable/non-value_type_struct_with_mapping.sol
new file mode 100644
index 0000000000..b734db30fc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/non-value_type_struct_with_mapping.sol
@@ -0,0 +1,9 @@
+contract Contract {
+    struct S {
+        mapping(uint => address) map;
+    }
+
+    S immutable s;
+}
+// ----
+// TypeError 6377: (84-97): Immutable variables cannot have a non-value type.

From f40c9cdf1d6e60932ec69f4a00787bb3190f9c15 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Mon, 30 May 2022 07:56:18 +0200
Subject: [PATCH 0652/1748] Update changelog with information about changes to
 CommonSubexpressionEliminator

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index b37938172f..4151d533ae 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ Compiler Features:
 
 Bugfixes:
  * ABI Encoder: When encoding an empty string coming from storage do not add a superfluous empty slot for data.
+ * Common Subexpression Eliminator: Process assembly items in chunks with maximum size of 2000. It helps to avoid extremely time-consuming searches during code optimization.
  * Yul Optimizer: Do not remove ``returndatacopy`` in cases in which it might perform out-of-bounds reads that unconditionally revert as out-of-gas. Previously, any ``returndatacopy`` that wrote to memory that was never read from was removed without accounting for the out-of-bounds condition.
 
 

From 2cea70c04fb327da0d2b718dd01f4e0ebbb1bac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 6 Jun 2022 20:26:57 +0200
Subject: [PATCH 0653/1748] Skip external test benchmark diff instead of
 failing when previous run of the job did not succeed

---
 .circleci/config.yml                         |  9 +++-
 scripts/common/rest_api_helpers.py           | 30 +++++++++---
 scripts/externalTests/download_benchmarks.py | 48 ++++++++++++++------
 3 files changed, 66 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b637b58052..f99c28ee90 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1257,12 +1257,17 @@ jobs:
               pr_id=$(echo "$CIRCLE_PULL_REQUEST" | sed 's|\(.*\)\/||')
               scripts_dir=../../../scripts
 
-              "${scripts_dir}/externalTests/download_benchmarks.py" --base-of-pr "$pr_id"
+              # Our main goal here is to provide new benchmarks, the diff is optional. When benchmarks from
+              # the previous run are not available for whatever reason, we still succeed and just skip the diff.
+              # download_benchmarks.py exits with status 2 in that case.
+              if "${scripts_dir}/externalTests/download_benchmarks.py" --base-of-pr "$pr_id" || [[ $? == 2 ]]; then
+                echo 'export SKIP_BENCHMARK_DIFF=true' >> $BASH_ENV
+              fi
             fi
       - run:
           name: Diff benchmarks
           command: |
-            if [[ $CIRCLE_PULL_REQUEST != "" ]]; then
+            if [[ $CIRCLE_PULL_REQUEST != "" && $SKIP_BENCHMARK_DIFF != "true" ]]; then
               cd reports/externalTests/
               mkdir diff/
               scripts_dir=../../scripts
diff --git a/scripts/common/rest_api_helpers.py b/scripts/common/rest_api_helpers.py
index 6dc3d13263..4068a5e1e3 100644
--- a/scripts/common/rest_api_helpers.py
+++ b/scripts/common/rest_api_helpers.py
@@ -11,7 +11,28 @@
 class APIHelperError(Exception):
     pass
 
-class DataUnavailable(APIHelperError):
+class JobNotSuccessful(APIHelperError):
+    def __init__(self, name: str, status: str):
+        assert status != 'success'
+
+        self.name = name
+        self.status = status
+        self.job_finished = (status in ['failed', 'blocked'])
+
+        if status == 'not_running':
+            message = f"Job {name} has not started yet."
+        elif status == 'blocked':
+            message = f"Job {name} will not run because one of its dependencies failed."
+        elif status == 'running':
+            message = f"Job {name} is still running."
+        elif status == 'failed':
+            message = f"Job {name} failed."
+        else:
+            message = f"Job {name} did not finish successfully. Current status: {status}."
+
+        super().__init__(message)
+
+class JobMissing(APIHelperError):
     pass
 
 class InvalidResponse(APIHelperError):
@@ -145,13 +166,10 @@ def jobs(self, workflow_id: str) -> Mapping[str, dict]:
     def job(self, workflow_id: str, name: str, require_success: bool = False) -> dict:
         jobs = self.jobs(workflow_id)
         if name not in jobs:
-            raise DataUnavailable(f"Job {name} is not present in the workflow.")
+            raise JobMissing(f"Job {name} is not present in the workflow.")
 
         if require_success and jobs[name]['status'] != 'success':
-            raise DataUnavailable(
-                f"Job {name} has failed or is still running. "
-                f"Current status: {jobs[name]['status']}."
-            )
+            raise JobNotSuccessful(name, jobs[name]['status'])
 
         return jobs[name]
 
diff --git a/scripts/externalTests/download_benchmarks.py b/scripts/externalTests/download_benchmarks.py
index 4ac7c0c4dc..29f5fe4bc7 100755
--- a/scripts/externalTests/download_benchmarks.py
+++ b/scripts/externalTests/download_benchmarks.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 from argparse import ArgumentParser, Namespace
+from enum import Enum, unique
 from pathlib import Path
 from typing import Mapping, Optional
 import sys
@@ -13,10 +14,18 @@
 sys.path.insert(0, str(SCRIPTS_DIR))
 
 from common.git_helpers import git_current_branch, git_commit_hash
-from common.rest_api_helpers import APIHelperError, CircleCI, Github, download_file
+from common.rest_api_helpers import APIHelperError, JobNotSuccessful, CircleCI, Github, download_file
 # pragma pylint: enable=import-error,wrong-import-position
 
 
+@unique
+class Status(Enum):
+    OK = 0            # Benchmarks downloaded successfully
+    ERROR = 1         # Error in the script, bad API response, unexpected data, etc.
+    NO_BENCHMARK = 2  # Benchmark collector job did not finish successfully and/or benchmark artifacts are missing.
+    PENDING = 3       # Benchmark collector job has not finished yet.
+
+
 def process_commandline() -> Namespace:
     script_description = (
         "Downloads benchmark results attached as artifacts to the c_ext_benchmarks job on CircleCI. "
@@ -76,14 +85,16 @@ def download_benchmark_artifact(
     commit_hash: str,
     overwrite: bool,
     silent: bool = False
-):
+) -> bool:
     if not silent:
         print(f"Downloading artifact: {benchmark_name}-{branch}-{commit_hash[:8]}.json.")
 
     artifact_path = f'reports/externalTests/{benchmark_name}.json'
 
     if artifact_path not in artifacts:
-        raise RuntimeError(f"Missing artifact: {artifact_path}.")
+        if not silent:
+            print(f"Missing artifact: {artifact_path}.")
+        return False
 
     download_file(
         artifacts[artifact_path]['url'],
@@ -91,6 +102,8 @@ def download_benchmark_artifact(
         overwrite,
     )
 
+    return True
+
 
 def download_benchmarks(
     branch: Optional[str],
@@ -100,7 +113,7 @@ def download_benchmarks(
     overwrite: bool = False,
     debug_requests: bool = False,
     silent: bool = False,
-):
+) -> Status:
     github = Github('ethereum/solidity', debug_requests)
     circleci = CircleCI('ethereum/solidity', debug_requests)
 
@@ -141,32 +154,41 @@ def download_benchmarks(
 
     artifacts = circleci.artifacts(int(benchmark_collector_job['job_number']))
 
-    download_benchmark_artifact(artifacts, 'summarized-benchmarks', branch, actual_commit_hash, overwrite, silent)
-    download_benchmark_artifact(artifacts, 'all-benchmarks', branch, actual_commit_hash, overwrite, silent)
+    got_summary = download_benchmark_artifact(artifacts, 'summarized-benchmarks', branch, actual_commit_hash, overwrite, silent)
+    got_full = download_benchmark_artifact(artifacts, 'all-benchmarks', branch, actual_commit_hash, overwrite, silent)
+
+    return Status.OK if got_summary and got_full else Status.NO_BENCHMARK
 
 
 def main():
     try:
         options = process_commandline()
-        download_benchmarks(
+        return download_benchmarks(
             options.branch,
             options.pull_request_id,
             options.base_of_pr,
             options.ignore_commit_hash,
             options.overwrite,
             options.debug_requests,
-        )
-
-        return 0
+        ).value
+    except JobNotSuccessful as exception:
+        print(f"[ERROR] {exception}", file=sys.stderr)
+        if not exception.job_finished:
+            print("Please wait for the workflow to finish and try again.", file=sys.stderr)
+            return Status.PENDING.value
+        else:
+            print("Benchmarks from this run of the pipeline are not available.", file=sys.stderr)
+            return Status.NO_BENCHMARK.value
     except APIHelperError as exception:
         print(f"[ERROR] {exception}", file=sys.stderr)
-        return 1
+        return Status.ERROR.value
     except requests.exceptions.HTTPError as exception:
         print(f"[ERROR] {exception}", file=sys.stderr)
-        return 1
+        return Status.ERROR.value
     except RuntimeError as exception:
         print(f"[ERROR] {exception}", file=sys.stderr)
-        return 1
+        return Status.ERROR.value
+
 
 if __name__ == '__main__':
     sys.exit(main())

From 9c4ea1dc682f1a7ccf0c87887e7110fa3427b9fb Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 2 Jun 2022 16:45:25 +0200
Subject: [PATCH 0654/1748] lsp.py: Add missing check for non-interactive

---
 test/lsp.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/lsp.py b/test/lsp.py
index 117b65df29..f20e93953a 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -643,7 +643,7 @@ def test_methods(self) -> bool:
         finally:
             self.close_all_open_files()
 
-    def user_interaction_failed_method_test(self, testcase, actual, expected):
+    def user_interaction_failed_method_test(self, testcase, actual, expected) -> TestResult:
         actual_pretty = self.suite.replace_ranges_with_tags(actual, self.sub_dir)
 
         if expected is None:
@@ -654,6 +654,9 @@ def user_interaction_failed_method_test(self, testcase, actual, expected):
                 "\nbut got:\n" + actual_pretty
             )
 
+        if self.suite.non_interactive:
+            return self.TestResult.SuccessOrIgnored
+
         while True:
             print("(u)pdate/(r)etry/(i)gnore?")
             user_response = getCharFromStdin()

From 927da20ce4387404cb94028bf3ba94e399340bdb Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Tue, 7 Jun 2022 15:41:15 +0200
Subject: [PATCH 0655/1748] Adds solidity::util::unreachable() helper function.

---
 libsolutil/Assertions.h | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/libsolutil/Assertions.h b/libsolutil/Assertions.h
index 4924522d6e..6735cda166 100644
--- a/libsolutil/Assertions.h
+++ b/libsolutil/Assertions.h
@@ -40,6 +40,28 @@ namespace solidity::util
 #define ETH_FUNC __func__
 #endif
 
+#if defined(__GNUC__)
+// GCC 4.8+, Clang, Intel and other compilers compatible with GCC (-std=c++0x or above)
+[[noreturn]] inline __attribute__((always_inline)) void unreachable()
+{
+	__builtin_unreachable();
+}
+
+#elif defined(_MSC_VER) // MSVC
+
+[[noreturn]] __forceinline void unreachable()
+{
+	__assume(false);
+}
+
+#else
+
+[[noreturn]] inline void unreachable()
+{
+	solThrow(Exception, "Unreachable");
+}
+#endif
+
 namespace assertions
 {
 

From 4ae43884d0e4dd9ebfd1f4393fcd2f894f07c473 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Tue, 7 Jun 2022 15:43:14 +0200
Subject: [PATCH 0656/1748] Apply a better way to annotate unreachability to
 the C++ compiler.

---
 libsmtutil/CVC4Interface.cpp        |  2 +-
 libsmtutil/Z3Interface.cpp          |  4 ++--
 libsolidity/ast/ASTJsonImporter.cpp | 10 +++++-----
 libsolidity/parsing/Parser.cpp      |  2 +-
 libyul/AsmJsonImporter.cpp          |  4 ++--
 tools/yulPhaser/Phaser.cpp          |  2 +-
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/libsmtutil/CVC4Interface.cpp b/libsmtutil/CVC4Interface.cpp
index c335b18d14..ff356c0256 100644
--- a/libsmtutil/CVC4Interface.cpp
+++ b/libsmtutil/CVC4Interface.cpp
@@ -292,7 +292,7 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 	smtAssert(false);
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 CVC4::Type CVC4Interface::cvc4Sort(Sort const& _sort)
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
index 74767d86c7..4abeffa169 100644
--- a/libsmtutil/Z3Interface.cpp
+++ b/libsmtutil/Z3Interface.cpp
@@ -274,7 +274,7 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
 	smtAssert(false);
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
@@ -385,7 +385,7 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 	smtAssert(false);
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 z3::sort Z3Interface::z3Sort(Sort const& _sort)
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 859a933503..4fcea9aff2 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -231,7 +231,7 @@ ASTPointer<ASTNode> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _js
 		astAssert(false, "Unknown type of ASTNode: " + nodeType);
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 // ============ functions to instantiate the AST-Nodes from Json-Nodes ==============
@@ -1078,7 +1078,7 @@ Visibility ASTJsonImporter::visibility(Json::Value const& _node)
 		astAssert(false, "Unknown visibility declaration");
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 VariableDeclaration::Location ASTJsonImporter::location(Json::Value const& _node)
@@ -1100,7 +1100,7 @@ VariableDeclaration::Location ASTJsonImporter::location(Json::Value const& _node
 		astAssert(false, "Unknown location declaration");
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _node)
@@ -1136,7 +1136,7 @@ Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _no
 		astAssert(false, "Unknown subdenomination");
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 StateMutability ASTJsonImporter::stateMutability(Json::Value const& _node)
@@ -1156,7 +1156,7 @@ StateMutability ASTJsonImporter::stateMutability(Json::Value const& _node)
 		astAssert(false, "Unknown stateMutability");
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 }
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 0299ff0920..554ebf75ca 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1655,7 +1655,7 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&
 	}
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 bool Parser::IndexAccessedPath::empty() const
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index 1f108145f7..0a88cacf8d 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -112,7 +112,7 @@ Statement AsmJsonImporter::createStatement(Json::Value const& _node)
 		yulAssert(false, "Invalid nodeType as statement");
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 Expression AsmJsonImporter::createExpression(Json::Value const& _node)
@@ -134,7 +134,7 @@ Expression AsmJsonImporter::createExpression(Json::Value const& _node)
 		yulAssert(false, "Invalid nodeType as expression");
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 vector<Expression> AsmJsonImporter::createExpressionVector(Json::Value const& _array)
diff --git a/tools/yulPhaser/Phaser.cpp b/tools/yulPhaser/Phaser.cpp
index c49d9a2d87..213e6f15b9 100644
--- a/tools/yulPhaser/Phaser.cpp
+++ b/tools/yulPhaser/Phaser.cpp
@@ -278,7 +278,7 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(
 	}
 
 	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
-	throw exception();
+	util::unreachable();
 }
 
 PopulationFactory::Options PopulationFactory::Options::fromCommandLine(po::variables_map const& _arguments)

From 4b7ed2d47ac173b7ab54f54fa678630a18179e74 Mon Sep 17 00:00:00 2001
From: Ryan <ryan.guo99@gmail.com>
Date: Wed, 11 May 2022 00:24:52 -0500
Subject: [PATCH 0657/1748] Display human readable type name in conversion
 error message

---
 libsolidity/analysis/TypeChecker.cpp          | 10 +++---
 libsolidity/ast/Types.cpp                     | 32 ++++++++++++-----
 libsolidity/ast/Types.h                       |  2 ++
 .../explicit_conversion_error_to_bytes4.sol   | 11 ++++++
 .../explicit_conversion_event_to_bytes4.sol   |  9 +++++
 .../explicit_conversion_from_error.sol        | 28 +++++++++++++++
 .../explicit_conversion_from_event.sol        | 34 +++++++++++++++++++
 7 files changed, 113 insertions(+), 13 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/conversion/explicit_conversion_error_to_bytes4.sol
 create mode 100644 test/libsolidity/syntaxTests/conversion/explicit_conversion_event_to_bytes4.sol
 create mode 100644 test/libsolidity/syntaxTests/conversion/explicit_conversion_from_error.sol
 create mode 100644 test/libsolidity/syntaxTests/conversion/explicit_conversion_from_event.sol

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index ed9875fce3..7f31fb56fa 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1842,7 +1842,7 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
 					_functionCall.location(),
 					ssl,
 					"Explicit type conversion not allowed from non-payable \"address\" to \"" +
-					resultType->toString() +
+					resultType->humanReadableName() +
 					"\", which has a payable fallback function."
 				);
 			}
@@ -1856,9 +1856,9 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
 					5030_error,
 					_functionCall.location(),
 					"Explicit type conversion not allowed from \"" +
-					argType->toString() +
+					argType->humanReadableName() +
 					"\" to \"" +
-					resultType->toString() +
+					resultType->humanReadableName() +
 					"\". To obtain the address of the contract of the function, " +
 					"you can use the .address member of the function."
 				);
@@ -1867,9 +1867,9 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
 					9640_error,
 					_functionCall.location(),
 					"Explicit type conversion not allowed from \"" +
-					argType->toString() +
+					argType->humanReadableName() +
 					"\" to \"" +
-					resultType->toString() +
+					resultType->humanReadableName() +
 					"\".",
 					result.message()
 				);
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 48e4afa512..c1333c28b9 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -110,6 +110,14 @@ util::Result<TypePointers> transformParametersToExternal(TypePointers const& _pa
 	return transformed;
 }
 
+string toStringInParentheses(TypePointers const& _types, bool _short)
+{
+	return '(' + util::joinHumanReadable(
+		_types | ranges::views::transform([&](auto const* _type) { return _type->toString(_short); }),
+		","
+	) + ')';
+}
+
 }
 
 MemberList::Member::Member(Declaration const* _declaration, Type const* _type):
@@ -3090,6 +3098,19 @@ string FunctionType::canonicalName() const
 	return "function";
 }
 
+string FunctionType::humanReadableName() const
+{
+	switch (m_kind)
+	{
+	case Kind::Error:
+		return "error " + m_declaration->name() + toStringInParentheses(m_parameterTypes, /* _short */ true);
+	case Kind::Event:
+		return "event " + m_declaration->name() + toStringInParentheses(m_parameterTypes, /* _short */ true);
+	default:
+		return toString(/* _short */ false);
+	}
+}
+
 string FunctionType::toString(bool _short) const
 {
 	string name = "function ";
@@ -3101,20 +3122,15 @@ string FunctionType::toString(bool _short) const
 			name += *contract->annotation().canonicalName + ".";
 		name += functionDefinition->name();
 	}
-	name += '(';
-	for (auto it = m_parameterTypes.begin(); it != m_parameterTypes.end(); ++it)
-		name += (*it)->toString(_short) + (it + 1 == m_parameterTypes.end() ? "" : ",");
-	name += ")";
+	name += toStringInParentheses(m_parameterTypes, _short);
 	if (m_stateMutability != StateMutability::NonPayable)
 		name += " " + stateMutabilityToString(m_stateMutability);
 	if (m_kind == Kind::External)
 		name += " external";
 	if (!m_returnParameterTypes.empty())
 	{
-		name += " returns (";
-		for (auto it = m_returnParameterTypes.begin(); it != m_returnParameterTypes.end(); ++it)
-			name += (*it)->toString(_short) + (it + 1 == m_returnParameterTypes.end() ? "" : ",");
-		name += ")";
+		name += " returns ";
+		name += toStringInParentheses(m_returnParameterTypes, _short);
 	}
 	return name;
 }
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 9b30807691..45e77a0d4e 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -339,6 +339,7 @@ class Type
 	std::string toString() const { return toString(false); }
 	/// @returns the canonical name of this type for use in library function signatures.
 	virtual std::string canonicalName() const { return toString(true); }
+	virtual std::string humanReadableName() const { return toString(); }
 	/// @returns the signature of this type in external functions, i.e. `uint256` for integers
 	/// or `(uint256,bytes8)[2]` for an array of structs. If @a _structsByName,
 	/// structs are given by canonical name like `ContractName.StructName[2]`.
@@ -1378,6 +1379,7 @@ class FunctionType: public Type
 	TypeResult unaryOperatorResult(Token _operator) const override;
 	TypeResult binaryOperatorResult(Token, Type const*) const override;
 	std::string canonicalName() const override;
+	std::string humanReadableName() const override;
 	std::string toString(bool _short) const override;
 	unsigned calldataEncodedSize(bool _padded) const override;
 	bool canBeStored() const override { return m_kind == Kind::Internal || m_kind == Kind::External; }
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_error_to_bytes4.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_error_to_bytes4.sol
new file mode 100644
index 0000000000..309dccabd3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/explicit_conversion_error_to_bytes4.sol
@@ -0,0 +1,11 @@
+interface MyInterface {
+    error MyCustomError(uint256, bool);
+}
+
+contract Test {
+    function test() public returns(bytes4) {
+        return bytes4(MyInterface.MyCustomError);
+    }
+}
+// ----
+// TypeError 9640: (143-176): Explicit type conversion not allowed from "error MyCustomError(uint256,bool)" to "bytes4".
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_event_to_bytes4.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_event_to_bytes4.sol
new file mode 100644
index 0000000000..dd036791f5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/explicit_conversion_event_to_bytes4.sol
@@ -0,0 +1,9 @@
+contract Test {
+    event MyCustomEvent(uint256);
+
+    function test() public returns(bytes4) {
+        return bytes4(MyCustomEvent);
+    }
+}
+// ----
+// TypeError 9640: (111-132): Explicit type conversion not allowed from "event MyCustomEvent(uint256)" to "bytes4".
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_error.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_error.sol
new file mode 100644
index 0000000000..b13067e033
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_error.sol
@@ -0,0 +1,28 @@
+interface MyInterface {
+    enum MyEnum { E1, E2 }
+    error CustomError1(
+        uint256,
+        bool,
+        bool[],
+        address payable,
+        MyInterface,
+        MyEnum,
+        function (string memory) external returns (uint)
+    );
+}
+
+contract Test {
+    function testFunction(string memory) external returns (uint) {}
+
+    function test() public {
+        MyInterface instance = MyInterface(msg.sender);
+        bool[] calldata arr;
+        address payable addr;
+        bytes4(MyInterface.CustomEror1);
+        bytes4(MyInterface.CustomError1());
+        bytes4(MyInterface.CustomError1(1, true, arr, addr, instance, MyInterface.MyEnum.E1, this.testFunction));
+        address(MyInterface.CustomError1);
+    }
+}
+// ----
+// TypeError 9582: (495-518): Member "CustomEror1" not found or not visible after argument-dependent lookup in type(contract MyInterface).
diff --git a/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_event.sol b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_event.sol
new file mode 100644
index 0000000000..62edf7de83
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/explicit_conversion_from_event.sol
@@ -0,0 +1,34 @@
+interface MyInterface {
+    enum MyEnum { E1, E2 }
+}
+
+contract Test {
+    function testFunction(string memory) external returns (uint) {}
+
+    event CustomEvent1(
+        uint256,
+        bool,
+        bool[],
+        address payable,
+        MyInterface,
+        MyInterface.MyEnum,
+        function (string memory) external returns (uint)
+    );
+
+
+    function test() public {
+        MyInterface instance = MyInterface(msg.sender);
+        bool[] calldata arr;
+        address payable addr;
+        bytes4(CustomEvent1);
+        bytes4(CustomEvent1());
+        bytes4(CustomEvent1(1, true, arr, addr, instance, MyInterface.MyEnum.E1, this.testFunction));
+        address(CustomEvent1);
+    }
+}
+// ----
+// TypeError 9640: (502-522): Explicit type conversion not allowed from "event CustomEvent1(uint256,bool,bool[],address payable,contract MyInterface,enum MyInterface.MyEnum,function (string) external returns (uint256))" to "bytes4".
+// TypeError 6160: (539-553): Wrong argument count for function call: 0 arguments given but expected 7.
+// TypeError 9640: (532-554): Explicit type conversion not allowed from "tuple()" to "bytes4".
+// TypeError 9640: (564-656): Explicit type conversion not allowed from "tuple()" to "bytes4".
+// TypeError 9640: (666-687): Explicit type conversion not allowed from "event CustomEvent1(uint256,bool,bool[],address payable,contract MyInterface,enum MyInterface.MyEnum,function (string) external returns (uint256))" to "address".

From 5c76d8ee77352e54738c15ca4b6b28adda3fdee2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 24 Jan 2022 13:50:30 +0100
Subject: [PATCH 0658/1748] External test for Chainlink

---
 .circleci/config.yml            |   9 +++
 test/externalTests.sh           |   1 +
 test/externalTests/chainlink.sh | 120 ++++++++++++++++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100755 test/externalTests/chainlink.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f99c28ee90..cf9b148948 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -606,6 +606,13 @@ defaults:
       project: brink
       binary_type: native
       nodejs_version: '16'
+  - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_chainlink
+      project: chainlink
+      binary_type: native
+      nodejs_version: '16'
+      resource_class: large # Tests run out of memory on a smaller machine
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *workflow_emscripten
       name: t_ems_test_ext_colony
@@ -1596,6 +1603,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_prb_math
       - t_ems_ext: *job_native_test_ext_elementfi
       - t_ems_ext: *job_native_test_ext_brink
+      - t_ems_ext: *job_native_test_ext_chainlink
 
       - c_ext_benchmarks:
           <<: *workflow_trigger_on_tags
@@ -1614,6 +1622,7 @@ workflows:
             - t_native_test_ext_prb_math
             - t_native_test_ext_elementfi
             - t_native_test_ext_brink
+            - t_native_test_ext_chainlink
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index 8c581a1650..e25666c223 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -51,3 +51,4 @@ printTask "Running external tests..."
 "${REPO_ROOT}/test/externalTests/prb-math.sh" "$@"
 "${REPO_ROOT}/test/externalTests/elementfi.sh" "$@"
 "${REPO_ROOT}/test/externalTests/brink.sh" "$@"
+"${REPO_ROOT}/test/externalTests/chainlink.sh" "$@"
diff --git a/test/externalTests/chainlink.sh b/test/externalTests/chainlink.sh
new file mode 100755
index 0000000000..3aa3996f44
--- /dev/null
+++ b/test/externalTests/chainlink.sh
@@ -0,0 +1,120 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
+
+function compile_fn { yarn compile; }
+function test_fn { yarn test; }
+
+function chainlink_test
+{
+    local repo="https://github.com/solidity-external-tests/chainlink"
+    local ref_type=branch
+    local ref=develop_080
+    local config_file="hardhat.config.ts"
+    local config_var=config
+
+    local compile_only_presets=(
+        legacy-no-optimize        # Tests crash on a machine with 8 GB of RAM in CI "FATAL ERROR: Ineffective mark-compacts near heap limit Allocation failed - JavaScript heap out of memory"
+    )
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var__value_775 is 1 slot(s) too deep inside the stack."
+        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var__value_10 is 1 slot(s) too deep inside the stack"
+        ir-optimize-evm+yul
+        legacy-optimize-evm-only  # NOTE: This requires >= 4 GB RAM in CI not to crash
+        legacy-optimize-evm+yul   # NOTE: This requires >= 4 GB RAM in CI not to crash
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+
+    cd "contracts/"
+
+    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
+    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    sed -i "s|\(it\)\(('reverts'\)|\1.skip\2|g" test/v0.6/BasicConsumer.test.ts
+    sed -i "s|\(it\)\(('has a reasonable gas cost \[ @skip-coverage \]'\)|\1.skip\2|g" test/v0.6/BasicConsumer.test.ts
+    sed -i "s|\(describe\)\(('#add[^']*'\)|\1.skip\2|g" test/v0.6/Chainlink.test.ts
+    sed -i "s|\(it\)\(('throws'\)|\1.skip\2|g" test/v0.6/SignedSafeMath.test.ts
+    sed -i "s|\(it\)\(('reverts when not enough LINK in the contract'\)|\1.skip\2|g" test/v0.*/VRFD20.test.ts
+    sed -i "s|\(it\)\(('errors while parsing invalid cron strings'\)|\1.skip\2|g" test/v0.8/Cron.test.ts
+    sed -i "s|\(it\)\(('reverts if the amount passed in data mismatches actual amount sent'\)|\1.skip\2|g" test/v0.8/KeeperRegistrar.test.ts
+    sed -i "s|\(it\)\(('reverts if the sender passed in data mismatches actual sender'\)|\1.skip\2|g" test/v0.8/KeeperRegistrar.test.ts
+    sed -i "s|\(it\)\(('reverts if the admin address is 0x0000...'\)|\1.skip\2|g" test/v0.8/KeeperRegistrar.test.ts
+    sed -i "s|\(it\)\(('reverts if not called with more or less than 32 bytes'\)|\1.skip\2|g" test/v0.8/KeeperRegistry.test.ts
+    sed -i "s|\(context\)\(('when permissions are not set'\)|\1.skip\2|g" test/v0.8/KeeperRegistry.test.ts
+
+    # In some cases Hardhat does not detect revert reasons properly via IR.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    sed -i "s|\(it\)\(('does not allow the specified address to start new rounds'\)|\1.skip\2|g" test/v0.6/FluxAggregator.test.ts
+    sed -i "s|\(describe\)\(('when called by a stranger'\)|\1.skip\2|g" test/v0.6/FluxAggregator.test.ts
+    sed -i "s|\(describe\)\(('if the access control is turned on'\)|\1.skip\2|g" test/v0.*/Flags.test.ts
+    sed -i "s|\(it\)\(('respects the access controls of #getFlag'\)|\1.skip\2|g" test/v0.*/Flags.test.ts
+    sed -i "s|\(describe\)\(('setting 0 authorized senders'\)|\1.skip\2|g" test/v0.7/AuthorizedForwarder.test.ts
+    sed -i "s|\(it\)\(('cannot add an authorized node'\)|\1.skip\2|g" test/v0.7/AuthorizedForwarder.test.ts
+    sed -i "s|\(it\)\(('should disallow reads on AggregatorV2V3Interface functions when consuming contract is not whitelisted'\)|\1.skip\2|g" test/v0.8/dev/ArbitrumSequencerUptimeFeed.test.ts
+    sed -i "s|\(it\)\(('should not be callable by non-owners'\)|\1.skip\2|g" test/v0.8/dev/CrossDomainOwnable.test.ts
+    sed -i "s|\(it\)\(('should not be callable by non pending-owners'\)|\1.skip\2|g" test/v0.8/dev/CrossDomainOwnable.test.ts
+    sed -i "s|\(it\)\(('cannot add a consumer to a nonexistent subscription'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
+    sed -i "s|\(it\)\(('cannot remove a consumer from a nonexistent subscription'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
+    sed -i "s|\(it\)\(('cannot remove a consumer after it is already removed'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
+    sed -i "s|\(it\)\(('fails to fulfill without being a valid consumer'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
+
+    # Disable tests with hard-coded gas expectations.
+    sed -i "s|\(it\)\(('not use too much gas \[ @skip-coverage \]'\)|\1.skip\2|g" test/v0.6/FluxAggregator.test.ts
+    sed -i "s|\(it\)\(('has a large enough gas overhead to cover upkeeps that use all their gas \[ @skip-coverage \]'\)|\1.skip\2|g" test/v0.*/KeeperRegistry*.test.ts
+    sed -i "s|\(it\)\(('only pays .\+'\)|\1.skip\2|g" test/v0.*/KeeperRegistry*.test.ts
+    sed -i "s|\(it\)\(('uses a specific amount of gas \[ @skip-coverage \]'\)|\1.skip\2|g" test/v0.8/ValidatorProxy.test.ts
+    sed -i "s|\(describe\)\(('Gas costs'\)|\1.skip\2|g" test/v0.8/dev/ArbitrumSequencerUptimeFeed.test.ts
+
+    neutralize_package_lock
+    neutralize_package_json_hooks
+    name_hardhat_default_export "$config_file" "$config_var"
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
+    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
+    yarn install
+    yarn add hardhat-gas-reporter
+
+    replace_version_pragmas
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat chainlink "$repo" "$preset"
+    done
+}
+
+external_test Chainlink chainlink_test

From 0b80a56294e3dac76a219f37bc50b30b38b7ddf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 11 Jan 2022 20:26:28 +0100
Subject: [PATCH 0659/1748] External test for Gnosis Protocol v2

---
 .circleci/config.yml      |   9 ++++
 test/externalTests.sh     |   1 +
 test/externalTests/gp2.sh | 106 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 116 insertions(+)
 create mode 100755 test/externalTests/gp2.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cf9b148948..53636d149e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -613,6 +613,13 @@ defaults:
       binary_type: native
       nodejs_version: '16'
       resource_class: large # Tests run out of memory on a smaller machine
+  - job_native_test_ext_gp2: &job_native_test_ext_gp2
+      <<: *workflow_ubuntu2004_static
+      name: t_native_test_ext_gp2
+      project: gp2
+      binary_type: native
+      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
+      nodejs_version: '16'
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *workflow_emscripten
       name: t_ems_test_ext_colony
@@ -1604,6 +1611,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_elementfi
       - t_ems_ext: *job_native_test_ext_brink
       - t_ems_ext: *job_native_test_ext_chainlink
+      - t_ems_ext: *job_native_test_ext_gp2
 
       - c_ext_benchmarks:
           <<: *workflow_trigger_on_tags
@@ -1623,6 +1631,7 @@ workflows:
             - t_native_test_ext_elementfi
             - t_native_test_ext_brink
             - t_native_test_ext_chainlink
+            - t_native_test_ext_gp2
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
diff --git a/test/externalTests.sh b/test/externalTests.sh
index e25666c223..4746e2a587 100755
--- a/test/externalTests.sh
+++ b/test/externalTests.sh
@@ -52,3 +52,4 @@ printTask "Running external tests..."
 "${REPO_ROOT}/test/externalTests/elementfi.sh" "$@"
 "${REPO_ROOT}/test/externalTests/brink.sh" "$@"
 "${REPO_ROOT}/test/externalTests/chainlink.sh" "$@"
+"${REPO_ROOT}/test/externalTests/gp2.sh" "$@"
diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
new file mode 100755
index 0000000000..f3105f3980
--- /dev/null
+++ b/test/externalTests/gp2.sh
@@ -0,0 +1,106 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2019 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -e
+
+source scripts/common.sh
+source test/externalTests/common.sh
+
+REPO_ROOT=$(realpath "$(dirname "$0")/../..")
+
+verify_input "$@"
+BINARY_TYPE="$1"
+BINARY_PATH="$2"
+SELECTED_PRESETS="$3"
+
+function compile_fn { npm run build; }
+function test_fn { npm test; }
+
+function gp2_test
+{
+    local repo="https://github.com/gnosis/gp-v2-contracts.git"
+    local ref_type=branch
+    local ref=main
+    local config_file="hardhat.config.ts"
+    local config_var="config"
+
+    local compile_only_presets=(
+        legacy-no-optimize        # Tests doing `new GPv2VaultRelayer` fail with "Error: Transaction reverted: trying to deploy a contract whose code is too large"
+    )
+    local settings_presets=(
+        "${compile_only_presets[@]}"
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var_amount_1468 is 10 slot(s) too deep inside the stack."
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var_offset_3451 is 1 slot(s) too deep inside the stack."
+        ir-optimize-evm+yul
+        legacy-optimize-evm-only
+        legacy-optimize-evm+yul
+    )
+
+    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
+    print_presets_or_exit "$SELECTED_PRESETS"
+
+    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
+    download_project "$repo" "$ref_type" "$ref" "$DIR"
+    [[ $BINARY_TYPE == native ]] && replace_global_solc "$BINARY_PATH"
+
+    neutralize_package_lock
+    neutralize_package_json_hooks
+    name_hardhat_default_export "$config_file" "$config_var"
+    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
+    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
+    force_hardhat_unlimited_contract_size "$config_file" "$config_var"
+    npm install
+
+    # Some dependencies come with pre-built artifacts. We want to build from scratch.
+    rm -r node_modules/@gnosis.pm/safe-contracts/build/
+
+    # FIXME: One of the E2E tests tries to import artifacts from Gnosis Safe. We should rebuild them
+    # but it's not that easy because @gnosis.pm/safe-contracts does not come with Hardhat config.
+    rm test/e2e/contractOrdersWithGnosisSafe.test.ts
+
+    # Patch contracts for 0.8.x compatibility.
+    # NOTE: I'm patching OpenZeppelin as well instead of installing OZ 4.0 because it requires less
+    # work. The project imports files that were moved to different locations in 4.0.
+    sed -i 's|uint256(-1)|type(uint256).max|g' src/contracts/GPv2Settlement.sol
+    sed -i 's|return msg\.sender;|return payable(msg.sender);|g' node_modules/@openzeppelin/contracts/utils/Context.sol
+    perl -i -0pe \
+        "s/uint256 (executedBuyAmount = \(-tokenDeltas\[trade.buyTokenIndex\]\)\n\s+.toUint256\(\);)/uint256 executedBuyAmount; unchecked \{\1\}/g" \
+        src/contracts/GPv2Settlement.sol
+
+    # This test is not supposed to work. The compiler is supposed to enforce zero padding since
+    # at least 0.5.8 (see https://github.com/ethereum/solidity/pull/5815). For some reason the
+    # test worked on 0.7.6 but no longer works on 0.8.x.
+    sed -i 's|it\(("invalid EVM transaction encoding does not change order hash"\)|it.skip\1|g' test/GPv2Signing.test.ts
+
+    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
+    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    sed -i 's|it\(("should revert when encoding invalid flags"\)|it.skip\1|g' test/GPv2Trade.test.ts
+
+    replace_version_pragmas
+
+    for preset in $SELECTED_PRESETS; do
+        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
+        store_benchmark_report hardhat gp2 "$repo" "$preset"
+    done
+}
+
+external_test Gnosis-Protocol-V2 gp2_test

From 8405d167c1f6ec1278715946f7f520c819b0f340 Mon Sep 17 00:00:00 2001
From: "sourabh.xyz" <swasti@sourabh.xyz>
Date: Wed, 8 Jun 2022 19:12:14 +0530
Subject: [PATCH 0660/1748] using-for.rst: Fix free function visibility.

Example is incorrect in the sense that "Free functions" cannot have visibility specified.
---
 docs/contracts/using-for.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index 2c2817f150..b4a60585a9 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -87,7 +87,6 @@ instead of library functions.
     }
 
     function contains(Data storage self, uint value)
-        public
         view
         returns (bool)
     {

From 8e67b28e0f18250aa7d31fda616da3fe7fd67ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 8 Jun 2022 21:25:13 +0200
Subject: [PATCH 0661/1748] Make the checks that detect if a docs snippet
 should compile a bit more robust against comments

---
 test/cmdlineTests.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 91b233b89e..250d10a6ef 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -517,15 +517,16 @@ SOLTMPDIR=$(mktemp -d)
         opts=()
         # We expect errors if explicitly stated, or if imports
         # are used (in the style guide)
-        if grep -E "This will not compile|import \"" "$f" >/dev/null
+        if grep -E "// This will not compile" "$f" >/dev/null ||
+            sed -e 's|//.*||g' "$f" | grep -E "import \"" >/dev/null
         then
             opts=(--expect-errors)
         fi
-        if grep "This will report a warning" "$f" >/dev/null
+        if grep "// This will report a warning" "$f" >/dev/null
         then
             opts+=(--expect-warnings)
         fi
-        if grep "This may report a warning" "$f" >/dev/null
+        if grep "// This may report a warning" "$f" >/dev/null
         then
             opts+=(--ignore-warnings)
         fi

From 811fa193af313a231a3fb2aafce885495fcbbef9 Mon Sep 17 00:00:00 2001
From: Denis T <dev@denis-it.com>
Date: Thu, 9 Jun 2022 15:09:02 +0300
Subject: [PATCH 0662/1748] Fix comment position in the voting example

---
 docs/examples/voting.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/examples/voting.rst b/docs/examples/voting.rst
index 6e36f4e510..2961a88c0e 100644
--- a/docs/examples/voting.rst
+++ b/docs/examples/voting.rst
@@ -128,15 +128,17 @@ of votes.
                 // We found a loop in the delegation, not allowed.
                 require(to != msg.sender, "Found loop in delegation.");
             }
-
-            // Since `sender` is a reference, this
-            // modifies `voters[msg.sender].voted`
+            
             Voter storage delegate_ = voters[to];
 
             // Voters cannot delegate to accounts that cannot vote.
             require(delegate_.weight >= 1);
+            
+            // Since `sender` is a reference, this
+            // modifies `voters[msg.sender]`.
             sender.voted = true;
             sender.delegate = to;
+            
             if (delegate_.voted) {
                 // If the delegate already voted,
                 // directly add to the number of votes

From 4576333245a08854938b6bc5527cb494778fbba8 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 9 Jun 2022 15:00:03 +0200
Subject: [PATCH 0663/1748] Remove all-whitespace lines from docs.

---
 docs/examples/voting.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/examples/voting.rst b/docs/examples/voting.rst
index 2961a88c0e..ad1c2d30d4 100644
--- a/docs/examples/voting.rst
+++ b/docs/examples/voting.rst
@@ -128,17 +128,17 @@ of votes.
                 // We found a loop in the delegation, not allowed.
                 require(to != msg.sender, "Found loop in delegation.");
             }
-            
+
             Voter storage delegate_ = voters[to];
 
             // Voters cannot delegate to accounts that cannot vote.
             require(delegate_.weight >= 1);
-            
+
             // Since `sender` is a reference, this
             // modifies `voters[msg.sender]`.
             sender.voted = true;
             sender.delegate = to;
-            
+
             if (delegate_.voted) {
                 // If the delegate already voted,
                 // directly add to the number of votes

From f15e53ce4dd3ba637c9b78a371623e5147c6d673 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Fri, 27 May 2022 14:55:41 -0300
Subject: [PATCH 0664/1748] Added printSelectedOptions and toString as method
 of CommonOptions and used the former to print settings in failed
 semanticTests.

---
 test/Common.cpp                   | 40 +++++++++++++++++++++++++++++++
 test/Common.h                     |  6 +++++
 test/libsolidity/SemanticTest.cpp |  8 +++++++
 3 files changed, 54 insertions(+)

diff --git a/test/Common.cpp b/test/Common.cpp
index cbe8068762..7cd869934b 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -20,15 +20,20 @@
 #include <iostream>
 #include <test/Common.h>
 #include <test/EVMHost.h>
+#include <test/libsolidity/util/SoltestErrors.h>
 
 #include <libsolutil/Assertions.h>
+#include <libsolutil/StringUtils.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/program_options.hpp>
+#include <range/v3/all.hpp>
 
 namespace fs = boost::filesystem;
 namespace po = boost::program_options;
 
+using namespace std;
+
 namespace solidity::test
 {
 
@@ -207,6 +212,41 @@ bool CommonOptions::parse(int argc, char const* const* argv)
 	return true;
 }
 
+string CommonOptions::toString(vector<string> const& _selectedOptions) const
+{
+	if (_selectedOptions.empty())
+		return "";
+
+	auto boolToString = [](bool _value) -> string { return _value ? "true" : "false"; };
+	// Using std::map to avoid if-else/switch-case block
+	map<string, string> optionValueMap = {
+		{"evmVersion", evmVersion().name()},
+		{"optimize", boolToString(optimize)},
+		{"useABIEncoderV1", boolToString(useABIEncoderV1)},
+		{"batch", to_string(selectedBatch + 1) + "/" + to_string(batches)},
+		{"ewasm", boolToString(ewasm)},
+		{"enforceCompileToEwasm", boolToString(enforceCompileToEwasm)},
+		{"enforceGasTest", boolToString(enforceGasTest)},
+		{"enforceGasTestMinValue", enforceGasTestMinValue.str()},
+		{"disableSemanticTests", boolToString(disableSemanticTests)},
+		{"disableSMT", boolToString(disableSMT)},
+		{"showMessages", boolToString(showMessages)},
+		{"showMetadata", boolToString(showMetadata)}
+	};
+
+	soltestAssert(ranges::all_of(_selectedOptions, [&optionValueMap](string const& _option) { return optionValueMap.count(_option) > 0; }));
+
+	vector<string> optionsWithValues = _selectedOptions |
+		ranges::views::transform([&optionValueMap](string const& _option) { return _option + "=" + optionValueMap.at(_option); }) |
+		ranges::to<vector>();
+
+	return solidity::util::joinHumanReadable(optionsWithValues);
+}
+
+void CommonOptions::printSelectedOptions(ostream& _stream, string const& _linePrefix, vector<string> const& _selectedOptions) const
+{
+	_stream << _linePrefix << "Run Settings: " << toString(_selectedOptions) << endl;
+}
 
 langutil::EVMVersion CommonOptions::evmVersion() const
 {
diff --git a/test/Common.h b/test/Common.h
index d57fe68b60..bd76cd0df7 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -81,6 +81,12 @@ struct CommonOptions
 	// Throws a ConfigException on error
 	virtual void validate() const;
 
+	/// @returns string with a key=value list of the options separated by comma
+	/// Ex.: "evmVersion=london, optimize=true, useABIEncoderV1=false"
+	virtual std::string toString(std::vector<std::string> const& _selectedOptions) const;
+	/// Helper to print the value of settings used
+	virtual void printSelectedOptions(std::ostream& _stream, std::string const& _linePrefix, std::vector<std::string> const& _selectedOptions) const;
+
 	static CommonOptions const& get();
 	static void setSingleton(std::unique_ptr<CommonOptions const>&& _instance);
 
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index c2c95324c3..3ad191cee3 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -315,6 +315,14 @@ TestCase::TestResult SemanticTest::run(ostream& _stream, string const& _linePref
 				throw;
 		}
 	}
+
+	if (result != TestResult::Success)
+		solidity::test::CommonOptions::get().printSelectedOptions(
+			_stream,
+			_linePrefix,
+			{"evmVersion", "optimize", "useABIEncoderV1", "batch"}
+		);
+
 	return result;
 }
 

From 14cdb76e4b16376484dd33ce9a050925c663dabc Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 7 Jun 2022 12:42:50 +0200
Subject: [PATCH 0665/1748] Add failing test

---
 .../optimize_memory_store_multi_block.sol     | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol

diff --git a/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol b/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol
new file mode 100644
index 0000000000..023d178a93
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol
@@ -0,0 +1,23 @@
+contract Test {
+	uint256 x;
+
+	function test() public returns (uint256) {
+		uint256 a = myGetX();
+		x = 5;
+		uint256 b = myGetX();
+		assembly {
+			log0(0, 64)
+		}
+		return a + b + myGetX();
+	}
+
+	function myGetX() internal view returns (uint256) {
+		assembly {
+			mstore(1, 0x123456789abcdef)
+		}
+		return x;
+	}
+}
+// ----
+// test() -> 10
+// ~ emit <anonymous>: 0x0123456789abcd, 0xef00000000000000000000000000000000000000000000000000000000000000

From 51ef6a62dadd31733a8401fa32919fb4cff2666d Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 7 Jun 2022 12:30:13 +0200
Subject: [PATCH 0666/1748] Fix removal of memory stores in inline assembly
 blocks.

---
 Changelog.md                                           |  4 ++++
 libsolidity/codegen/CompilerContext.cpp                |  1 +
 libyul/optimiser/UnusedStoreEliminator.cpp             | 10 +++++++++-
 .../byte_array_pop_long_storage_empty_garbage_ref.sol  |  2 +-
 4 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4151d533ae..2a3f34bbd6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
 ### 0.8.15 (unreleased)
 
+Important Bugfixes:
+ * Yul Optimizer: Keep all memory side-effects of inline assembly blocks.
+
+
 Language Features:
  * Add `E.selector` for a non-anonymous event `E` to access the 32-byte selector topic.
  * Errors and Events allow qualified access from other contracts.
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 55089dde1c..dbd1a17300 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -485,6 +485,7 @@ void CompilerContext::appendInlineAssembly(
 		obj.code = parserResult;
 		obj.analysisInfo = make_shared<yul::AsmAnalysisInfo>(analysisInfo);
 
+		solAssert(!dialect.providesObjectAccess());
 		optimizeYul(obj, dialect, _optimiserSettings, externallyUsedIdentifiers);
 
 		if (_system)
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index 976c8c8424..0e6acdeea0 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -31,6 +31,8 @@
 #include <libyul/ControlFlowSideEffectsCollector.h>
 #include <libyul/AST.h>
 
+#include <libyul/backends/evm/EVMDialect.h>
+
 #include <libsolutil/CommonData.h>
 
 #include <libevmasm/Instruction.h>
@@ -76,7 +78,13 @@ void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
 		ignoreMemory
 	};
 	rse(_ast);
-	rse.changeUndecidedTo(State::Unused, Location::Memory);
+	if (
+		auto evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
+		evmDialect && evmDialect->providesObjectAccess()
+	)
+		rse.changeUndecidedTo(State::Unused, Location::Memory);
+	else
+		rse.changeUndecidedTo(State::Used, Location::Memory);
 	rse.changeUndecidedTo(State::Used, Location::Storage);
 	rse.scheduleUnusedForDeletion();
 
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index bef07f55b7..66fb16775b 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -17,5 +17,5 @@ contract c {
 // test() ->
 // gas irOptimized: 142639
 // gas legacy: 164430
-// gas legacyOptimized: 157898
+// gas legacyOptimized: 158513
 // storageEmpty -> 1

From 94dd6d0671cc32b3f2b545ec80bfcf84190aec34 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 10 Jun 2022 18:31:49 +0200
Subject: [PATCH 0667/1748] Bug list entry draft.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 docs/bugs.json            | 14 +++++++++++++-
 docs/bugs_by_version.json |  5 ++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/docs/bugs.json b/docs/bugs.json
index 7bee4d10f3..30b1769fd7 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -1,4 +1,17 @@
 [
+    {
+        "uid": "SOL-2022-4",
+        "name": "InlineAssemblyMemorySideEffects",
+        "summary": "The Yul optimizer may incorrectly remove memory writes from inline assembly blocks, that do not access solidity variables.",
+        "description": "The Yul optimizer considers all memory writes in the outermost Yul block that are never read from as unused and removes them. This is valid when that Yul block is the entire Yul program, which is always the case for the Yul code generated by the new via-IR pipeline. Inline assembly blocks are never optimized in isolation when using that pipeline. Instead they are optimized as a part of the whole Yul input. However, the legacy code generation pipeline (which is still the default) runs the Yul optimizer individually on an inline assembly block if the block does not refer to any local variables defined in the surrounding Solidity code. Consequently, memory writes in such inline assembly blocks are removed as well, if the written memory is never read from in the same assembly block, even if the written memory is accessed later, for example by a subsequent inline assembly block.",
+        "link": "https://blog.soliditylang.org/2022/06/15/inline-assembly-memory-side-effects-bug/",
+        "introduced": "0.8.13",
+        "fixed": "0.8.15",
+        "severity": "low/medium",
+        "conditions": {
+            "yulOptimizer": true
+        }
+    },
     {
         "uid": "SOL-2022-3",
         "name": "DataLocationChangeInInternalOverride",
@@ -8,7 +21,6 @@
         "introduced": "0.6.9",
         "fixed": "0.8.14",
         "severity": "very low"
-
     },
     {
         "uid": "SOL-2022-2",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 86203a72be..1b0f7d1caf 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1614,13 +1614,16 @@
     },
     "0.8.13": {
         "bugs": [
+            "InlineAssemblyMemorySideEffects",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation"
         ],
         "released": "2022-03-16"
     },
     "0.8.14": {
-        "bugs": [],
+        "bugs": [
+            "InlineAssemblyMemorySideEffects"
+        ],
         "released": "2022-05-17"
     },
     "0.8.2": {

From aa7e4e02bbfa5b8a0798f31ae59381cb123c366b Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 10 Jun 2022 20:12:09 +0200
Subject: [PATCH 0668/1748] A few more tests.

---
 .../optimize_memory_store_multi_block.sol     | 36 +++++++++++--------
 ...ize_memory_store_multi_block_bugreport.sol | 23 ++++++++++++
 2 files changed, 44 insertions(+), 15 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block_bugreport.sol

diff --git a/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol b/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol
index 023d178a93..1a72925d6f 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block.sol
@@ -1,23 +1,29 @@
-contract Test {
-	uint256 x;
-
-	function test() public returns (uint256) {
-		uint256 a = myGetX();
-		x = 5;
-		uint256 b = myGetX();
+contract C {
+	function f() external returns (uint256 x) {
 		assembly {
-			log0(0, 64)
+			mstore(0, 0x42)
+		}
+		assembly {
+			x := mload(0)
 		}
-		return a + b + myGetX();
 	}
-
-	function myGetX() internal view returns (uint256) {
+	function g() external returns (bool) {
+		uint initialFreeMemoryPointer;
+		assembly {
+			initialFreeMemoryPointer := mload(0x40)
+		}
+		assembly {
+			let ptr := mload(0x40)
+			mstore(0x40, add(ptr, 0x20))
+		}
+		uint finalFreeMemoryPointer;
 		assembly {
-			mstore(1, 0x123456789abcdef)
+			finalFreeMemoryPointer := mload(0x40)
 		}
-		return x;
+		assert(initialFreeMemoryPointer != finalFreeMemoryPointer);
+		return true;
 	}
 }
 // ----
-// test() -> 10
-// ~ emit <anonymous>: 0x0123456789abcd, 0xef00000000000000000000000000000000000000000000000000000000000000
+// f() -> 0x42
+// g() -> true
diff --git a/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block_bugreport.sol b/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block_bugreport.sol
new file mode 100644
index 0000000000..023d178a93
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/optimize_memory_store_multi_block_bugreport.sol
@@ -0,0 +1,23 @@
+contract Test {
+	uint256 x;
+
+	function test() public returns (uint256) {
+		uint256 a = myGetX();
+		x = 5;
+		uint256 b = myGetX();
+		assembly {
+			log0(0, 64)
+		}
+		return a + b + myGetX();
+	}
+
+	function myGetX() internal view returns (uint256) {
+		assembly {
+			mstore(1, 0x123456789abcdef)
+		}
+		return x;
+	}
+}
+// ----
+// test() -> 10
+// ~ emit <anonymous>: 0x0123456789abcd, 0xef00000000000000000000000000000000000000000000000000000000000000

From 3015afc5047214abef7020685a0ce25c0b291e6a Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 13 Jun 2022 17:18:13 +0200
Subject: [PATCH 0669/1748] Change severity of inline assembly bug to medium.

---
 docs/bugs.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/bugs.json b/docs/bugs.json
index 30b1769fd7..bc1bc622e6 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -7,7 +7,7 @@
         "link": "https://blog.soliditylang.org/2022/06/15/inline-assembly-memory-side-effects-bug/",
         "introduced": "0.8.13",
         "fixed": "0.8.15",
-        "severity": "low/medium",
+        "severity": "medium",
         "conditions": {
             "yulOptimizer": true
         }

From a265d9968a78ef332d333bde87262692f4ef5903 Mon Sep 17 00:00:00 2001
From: Saw-mon-and-Natalie <samangharib50233@gmail.com>
Date: Mon, 13 Jun 2022 17:38:43 -0700
Subject: [PATCH 0670/1748] removed a duplicate word from a comment.

---
 libsolidity/codegen/ContractCompiler.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/codegen/ContractCompiler.h b/libsolidity/codegen/ContractCompiler.h
index 74a2e3b5f7..592b670399 100644
--- a/libsolidity/codegen/ContractCompiler.h
+++ b/libsolidity/codegen/ContractCompiler.h
@@ -36,7 +36,7 @@ namespace solidity::frontend
 
 /**
  * Code generator at the contract level. Can be used to generate code for exactly one contract
- * either either in "runtime mode" or "creation mode".
+ * either in "runtime mode" or "creation mode".
  */
 class ContractCompiler: private ASTConstVisitor
 {

From acbdcc3711d7ca5e11c6a85fc4b71be54ac859a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 14 Jun 2022 10:17:23 +0200
Subject: [PATCH 0671/1748] Revert the change that made events accessible in
 other contacts via qualified access

---
 Changelog.md                                   |  1 -
 libsolidity/ast/AST.h                          |  2 +-
 .../semanticTests/events/event_selector.sol    | 18 ++++++------------
 .../semanticTests/events/simple.sol            |  2 +-
 .../event_selector_access_foreign_contract.sol | 11 +++++++++++
 .../events/event_selector_access_interface.sol | 11 +++++++++++
 .../events/event_selector_access_library.sol   | 10 ++++++++++
 .../events/event_selector_syntax.sol           | 14 ++++----------
 8 files changed, 44 insertions(+), 25 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_selector_access_interface.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_selector_access_library.sol

diff --git a/Changelog.md b/Changelog.md
index 2a3f34bbd6..ba091f2668 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,7 +6,6 @@ Important Bugfixes:
 
 Language Features:
  * Add `E.selector` for a non-anonymous event `E` to access the 32-byte selector topic.
- * Errors and Events allow qualified access from other contracts.
 
 
 Compiler Features:
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 7c6101bdd7..4eba73c5d8 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -1216,7 +1216,7 @@ class EventDefinition: public CallableDeclaration, public StructurallyDocumented
 	FunctionTypePointer functionType(bool /*_internal*/) const override;
 
 	bool isVisibleInDerivedContracts() const override { return true; }
-	bool isVisibleViaContractTypeAccess() const override { return true; }
+	bool isVisibleViaContractTypeAccess() const override { return false; /* TODO */ }
 
 	EventDefinitionAnnotation& annotation() const override;
 
diff --git a/test/libsolidity/semanticTests/events/event_selector.sol b/test/libsolidity/semanticTests/events/event_selector.sol
index b6d9400935..116e2329e6 100644
--- a/test/libsolidity/semanticTests/events/event_selector.sol
+++ b/test/libsolidity/semanticTests/events/event_selector.sol
@@ -7,32 +7,26 @@ library S {
 library T {
     event E();
 }
-interface I {
-    event E();
-}
 
 contract D {
     event F();
 }
 
 contract C is D {
-    function test1() external pure returns (bytes32, bytes32, bytes32) {
+    function test1() external pure returns (bytes32, bytes32) {
         assert(L.E.selector == T.E.selector);
-        assert(I.E.selector == L.E.selector);
 
         assert(L.E.selector != S.E.selector);
         assert(T.E.selector != S.E.selector);
-        assert(I.E.selector != S.E.selector);
 
-        return (L.E.selector, S.E.selector, I.E.selector);
+        return (L.E.selector, S.E.selector);
     }
 
     bytes32 s1 = L.E.selector;
     bytes32 s2 = S.E.selector;
     bytes32 s3 = T.E.selector;
-    bytes32 s4 = I.E.selector;
-    function test2() external returns (bytes32, bytes32, bytes32, bytes32) {
-        return (s1, s2, s3, s4);
+    function test2() external returns (bytes32, bytes32, bytes32) {
+        return (s1, s2, s3);
     }
 
     function test3() external returns (bytes32) {
@@ -42,6 +36,6 @@ contract C is D {
 // ====
 // compileViaYul: also
 // ----
-// test1() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
-// test2() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
+// test1() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0
+// test2() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
 // test3() -> 0x28811f5935c16a099486acb976b3a6b4942950a1425a74e9eb3e9b7f7135e12a
diff --git a/test/libsolidity/semanticTests/events/simple.sol b/test/libsolidity/semanticTests/events/simple.sol
index 7190de4137..018c91e70c 100644
--- a/test/libsolidity/semanticTests/events/simple.sol
+++ b/test/libsolidity/semanticTests/events/simple.sol
@@ -2,7 +2,7 @@ contract C {
     event E();
 }
 
-contract Test {
+contract Test is C {
     event E(uint256, uint256);
     function f() public {
         emit C.E();
diff --git a/test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol b/test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol
new file mode 100644
index 0000000000..b878543fc0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol
@@ -0,0 +1,11 @@
+contract D {
+    event E();
+}
+
+contract C {
+    function f() external pure returns (bytes32) {
+        return D.E.selector;
+    }
+}
+// ----
+// TypeError 9582: (110-113): Member "E" not found or not visible after argument-dependent lookup in type(contract D).
diff --git a/test/libsolidity/syntaxTests/events/event_selector_access_interface.sol b/test/libsolidity/syntaxTests/events/event_selector_access_interface.sol
new file mode 100644
index 0000000000..2877fee565
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_selector_access_interface.sol
@@ -0,0 +1,11 @@
+interface I {
+    event E();
+}
+
+contract C {
+    function f() external pure returns (bytes32) {
+        return I.E.selector;
+    }
+}
+// ----
+// TypeError 9582: (111-114): Member "E" not found or not visible after argument-dependent lookup in type(contract I).
diff --git a/test/libsolidity/syntaxTests/events/event_selector_access_library.sol b/test/libsolidity/syntaxTests/events/event_selector_access_library.sol
new file mode 100644
index 0000000000..2bf2484598
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_selector_access_library.sol
@@ -0,0 +1,10 @@
+library L {
+    event E();
+}
+
+contract C {
+    function f() external pure returns (bytes32) {
+        return L.E.selector;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/events/event_selector_syntax.sol b/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
index 14d2c94d80..ebb88d2982 100644
--- a/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
+++ b/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
@@ -7,33 +7,27 @@ library S {
 library T {
     event E();
 }
-interface I {
-    event E();
-}
 
 contract D {
     event F();
 }
 
 contract C is D {
-    function test1() external pure returns (bytes32, bytes32, bytes32) {
+    function test1() external pure returns (bytes32, bytes32) {
         assert(L.E.selector == T.E.selector);
-        assert(I.E.selector == L.E.selector);
 
         assert(L.E.selector != S.E.selector);
         assert(T.E.selector != S.E.selector);
-        assert(I.E.selector != S.E.selector);
 
-        return (L.E.selector, S.E.selector, I.E.selector);
+        return (L.E.selector, S.E.selector);
     }
 
     bytes32 s1 = L.E.selector;
     bytes32 s2 = S.E.selector;
     bytes32 s3 = T.E.selector;
-    bytes32 s4 = I.E.selector;
 
-    function test2() view external returns (bytes32, bytes32, bytes32, bytes32) {
-        return (s1, s2, s3, s4);
+    function test2() view external returns (bytes32, bytes32, bytes32) {
+        return (s1, s2, s3);
     }
 
     function test3() pure external returns (bytes32) {

From 5375dfff9dd7e97df34f1ae38341481a1eee5295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 14 Jun 2022 12:00:16 +0200
Subject: [PATCH 0672/1748] Refactor error/event selector tests

- Remove redundant semantic tests for error selector
- Consolidate semanticTests/error/ and semanticTests/errors/ dirs
- Make "selector syntax test" for errors and event an actual test for syntax rather than a copy of the same semantic test
---
 .../semanticTests/error/selector.sol          | 18 -------
 .../{error => errors}/error_selector.sol      |  0
 .../errors/error_selector_syntax.sol          | 54 +++++++------------
 ...elector_library_called_inside_function.sol |  1 -
 .../events/event_selector_syntax.sol          | 39 ++++----------
 5 files changed, 31 insertions(+), 81 deletions(-)
 delete mode 100644 test/libsolidity/semanticTests/error/selector.sol
 rename test/libsolidity/semanticTests/{error => errors}/error_selector.sol (100%)

diff --git a/test/libsolidity/semanticTests/error/selector.sol b/test/libsolidity/semanticTests/error/selector.sol
deleted file mode 100644
index 7629290263..0000000000
--- a/test/libsolidity/semanticTests/error/selector.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-library L {
-    error E();
-}
-library S {
-    error E(uint);
-}
-library T {
-    error E();
-}
-contract C {
-    function f() public pure returns (bytes4, bytes4) {
-        assert(L.E.selector == T.E.selector);
-        assert(L.E.selector != S.E.selector);
-        return (L.E.selector, S.E.selector);
-    }
-}
-// ----
-// f() -> 0x92bbf6e800000000000000000000000000000000000000000000000000000000, 0x2ff06700000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/error/error_selector.sol b/test/libsolidity/semanticTests/errors/error_selector.sol
similarity index 100%
rename from test/libsolidity/semanticTests/error/error_selector.sol
rename to test/libsolidity/semanticTests/errors/error_selector.sol
diff --git a/test/libsolidity/syntaxTests/errors/error_selector_syntax.sol b/test/libsolidity/syntaxTests/errors/error_selector_syntax.sol
index ebd598cb2c..1af3bbcd2c 100644
--- a/test/libsolidity/syntaxTests/errors/error_selector_syntax.sol
+++ b/test/libsolidity/syntaxTests/errors/error_selector_syntax.sol
@@ -1,48 +1,34 @@
 library L {
-    error E();
-}
-library S {
-    error E(uint);
-}
-library T {
-    error E();
+    error E(bytes4, bool, bytes);
 }
 
-error E();
+error E(bytes4, bool, bytes);
 
 interface I {
-    error E();
-    function f() external pure;
+    error E(bytes4, bool, bytes);
 }
 
-contract D {
-    error F();
+contract B {
+    error E(bytes4, bool, bytes);
 }
 
-contract C is D {
-    function test1() public pure returns (bytes4, bytes4, bytes4, bytes4) {
-        assert(L.E.selector == T.E.selector);
-        assert(L.E.selector != S.E.selector);
-        assert(E.selector == L.E.selector);
-        assert(I.E.selector == L.E.selector);
-        return (L.E.selector, S.E.selector, E.selector, I.E.selector);
-    }
+contract C is B {
+    bytes4 public librarySelector = L.E.selector;
+    bytes4 internal freeSelector = E.selector;
+    bytes4 internal contractSelector = B.E.selector;
+    bytes4 private interfaceSelector = I.E.selector;
 
-    bytes4 s1 = L.E.selector;
-    bytes4 s2 = S.E.selector;
-    bytes4 s3 = T.E.selector;
-    bytes4 s4 = I.E.selector;
-
-    function test2() view external returns (bytes4, bytes4, bytes4, bytes4) {
-        return (s1, s2, s3, s4);
-    }
+    function f(bool condition) public view {
+        assert(librarySelector == L.E.selector);
+        assert(E.selector == B.E.selector);
 
-    function test3() pure external returns (bytes4) {
-        return (F.selector);
+        if (condition)
+            revert E(E.selector, true, "123");
+        else
+            revert L.E((B.E.selector), true, "123");
     }
 }
 // ----
-// Warning 2519: (16-26): This declaration shadows an existing declaration.
-// Warning 2519: (45-59): This declaration shadows an existing declaration.
-// Warning 2519: (78-88): This declaration shadows an existing declaration.
-// Warning 2519: (122-132): This declaration shadows an existing declaration.
+// Warning 2519: (16-45): This declaration shadows an existing declaration.
+// Warning 2519: (98-127): This declaration shadows an existing declaration.
+// Warning 2519: (148-177): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol b/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
index 49741a5ca9..45e050e457 100644
--- a/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
+++ b/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
@@ -6,7 +6,6 @@ contract D {
     function test1() external pure returns (bytes32) {
         return Y.E.selector;
     }
-
 }
 // ----
 // TypeError 9582: (123-135): Member "selector" not found or not visible after argument-dependent lookup in function ().
diff --git a/test/libsolidity/syntaxTests/events/event_selector_syntax.sol b/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
index ebb88d2982..ecbfe9bc51 100644
--- a/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
+++ b/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
@@ -1,37 +1,20 @@
 library L {
-    event E();
-}
-library S {
-    event E(uint);
-}
-library T {
-    event E();
+    event E(bytes32, bool, bytes indexed);
 }
 
-contract D {
-    event F();
+contract B {
+    event E(bytes32, bool, bytes indexed);
 }
 
-contract C is D {
-    function test1() external pure returns (bytes32, bytes32) {
-        assert(L.E.selector == T.E.selector);
+contract C is B {
+    bytes32 public librarySelector = L.E.selector;
+    bytes32 inheritedSelector = E.selector;
 
-        assert(L.E.selector != S.E.selector);
-        assert(T.E.selector != S.E.selector);
-
-        return (L.E.selector, S.E.selector);
-    }
-
-    bytes32 s1 = L.E.selector;
-    bytes32 s2 = S.E.selector;
-    bytes32 s3 = T.E.selector;
-
-    function test2() view external returns (bytes32, bytes32, bytes32) {
-        return (s1, s2, s3);
-    }
+    function f() public {
+        assert(librarySelector == L.E.selector);
+        assert(E.selector == B.E.selector);
 
-    function test3() pure external returns (bytes32) {
-        return (F.selector);
+        emit E(E.selector, true, "123");
+        emit L.E((B.E.selector), true, "123");
     }
 }
-// ----

From 7785f46efd5259f1961cf9fb79bcf8d8439fb6c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 14 Jun 2022 10:36:43 +0200
Subject: [PATCH 0673/1748] Document the `.selector` member for errors

---
 docs/contracts/errors.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/contracts/errors.rst b/docs/contracts/errors.rst
index 7800317a85..77b224c4ee 100644
--- a/docs/contracts/errors.rst
+++ b/docs/contracts/errors.rst
@@ -1,5 +1,4 @@
-.. index:: ! error, revert
-
+.. index:: ! error, revert, selector; of an error
 .. _errors:
 
 *******************************
@@ -80,3 +79,8 @@ of the built-in type ``Panic(uint256)``.
     by default. This means that an inner call
     can "forge" revert data that looks like it could have come from the
     contract that called it.
+
+Members of Errors
+=================
+
+- ``error.selector``: A ``bytes4`` value containing the error selector.

From f323cb2ef56dfce8723ba969e9a1b26bd4995844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 14 Jun 2022 10:37:03 +0200
Subject: [PATCH 0674/1748] Improve index entries for selectors, events and
 selfdestruct

---
 docs/abi-spec.rst                        | 3 ++-
 docs/assembly.rst                        | 2 +-
 docs/contracts/errors.rst                | 2 +-
 docs/contracts/events.rst                | 6 ++++--
 docs/contracts/libraries.rst             | 2 +-
 docs/introduction-to-smart-contracts.rst | 2 +-
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index d67e85828a..08c75fbec5 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -19,7 +19,7 @@ We assume that all contracts will have the interface definitions of any contract
 This specification does not address contracts whose interface is dynamic or otherwise known only at run-time.
 
 .. _abi_function_selector:
-.. index:: selector
+.. index:: ! selector; of a function
 
 Function Selector
 =================
@@ -503,6 +503,7 @@ efficient search and arbitrary legibility by defining events with two arguments
 indexed, one not — intended to hold the same value.
 
 .. _abi_errors:
+.. index:: error, selector; of an error
 
 Errors
 ======
diff --git a/docs/assembly.rst b/docs/assembly.rst
index 70c4a458d0..d6cf68568c 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -116,7 +116,7 @@ efficient code, for example:
         }
     }
 
-
+.. index:: selector; of a function
 
 Access to External Variables, Functions and Libraries
 -----------------------------------------------------
diff --git a/docs/contracts/errors.rst b/docs/contracts/errors.rst
index 77b224c4ee..19577a3872 100644
--- a/docs/contracts/errors.rst
+++ b/docs/contracts/errors.rst
@@ -1,4 +1,4 @@
-.. index:: ! error, revert, selector; of an error
+.. index:: ! error, revert, ! selector; of an error
 .. _errors:
 
 *******************************
diff --git a/docs/contracts/events.rst b/docs/contracts/events.rst
index 2595527d10..8618e7524b 100644
--- a/docs/contracts/events.rst
+++ b/docs/contracts/events.rst
@@ -1,4 +1,4 @@
-.. index:: ! event
+.. index:: ! event, ! event; anonymous, ! event; indexed, ! event; topic
 
 .. _events:
 
@@ -73,6 +73,8 @@ four indexed arguments rather than three.
     In particular, it is possible to "fake" the signature of another event
     using an anonymous event.
 
+.. index:: ! selector; of an event
+
 Members of Events
 =================
 
@@ -147,7 +149,7 @@ The output of the above looks like the following (trimmed):
     }
 
 Additional Resources for Understanding Events
-==============================================
+=============================================
 
 - `Javascript documentation <https://github.com/ethereum/web3.js/blob/1.x/docs/web3-eth-contract.rst#events>`_
 - `Example usage of events <https://github.com/ethchange/smart-exchange/blob/master/lib/contracts/SmartExchange.sol>`_
diff --git a/docs/contracts/libraries.rst b/docs/contracts/libraries.rst
index c40284b499..7256ebe031 100644
--- a/docs/contracts/libraries.rst
+++ b/docs/contracts/libraries.rst
@@ -215,7 +215,7 @@ In comparison to contracts, libraries are restricted in the following ways:
 (These might be lifted at a later point.)
 
 .. _library-selectors:
-.. index:: selector
+.. index:: ! selector; of a library function
 
 Function Signatures and Selectors in Libraries
 ==============================================
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 9b2e5fceb5..ad98047cf7 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -548,7 +548,7 @@ these **create calls** and normal message calls is that the payload data is
 executed and the result stored as code and the caller / creator
 receives the address of the new contract on the stack.
 
-.. index:: selfdestruct, self-destruct, deactivate
+.. index:: ! selfdestruct, deactivate
 
 Deactivate and Self-destruct
 ============================

From 1ab84bb361829fb8e67933865c9d5492d9bb82da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 14 Jun 2022 14:41:41 +0200
Subject: [PATCH 0675/1748] Put the table with operator precedence in a
 separate file, included in both Operators and Cheatsheet

---
 docs/cheatsheet.rst                      |  3 +-
 docs/types/operator-precedence-table.rst | 57 +++++++++++++++++++++++
 docs/types/operators.rst                 | 58 +-----------------------
 3 files changed, 59 insertions(+), 59 deletions(-)
 create mode 100644 docs/types/operator-precedence-table.rst

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index a60e7bca7f..fb9f97b3ae 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -6,8 +6,7 @@ Cheatsheet
 
 Order of Precedence of Operators
 ================================
-
-:ref:`order`
+.. include:: types/operator-precedence-table.rst
 
 .. index:: assert, block, coinbase, difficulty, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, gas price, origin, revert, require, keccak256, ripemd160, sha256, ecrecover, addmod, mulmod, cryptography, this, super, selfdestruct, balance, codehash, send
 
diff --git a/docs/types/operator-precedence-table.rst b/docs/types/operator-precedence-table.rst
new file mode 100644
index 0000000000..65034045bb
--- /dev/null
+++ b/docs/types/operator-precedence-table.rst
@@ -0,0 +1,57 @@
+The following is the order of precedence for operators, listed in order of evaluation.
+
++------------+-------------------------------------+--------------------------------------------+
+| Precedence | Description                         | Operator                                   |
++============+=====================================+============================================+
+| *1*        | Postfix increment and decrement     | ``++``, ``--``                             |
++            +-------------------------------------+--------------------------------------------+
+|            | New expression                      | ``new <typename>``                         |
++            +-------------------------------------+--------------------------------------------+
+|            | Array subscripting                  | ``<array>[<index>]``                       |
++            +-------------------------------------+--------------------------------------------+
+|            | Member access                       | ``<object>.<member>``                      |
++            +-------------------------------------+--------------------------------------------+
+|            | Function-like call                  | ``<func>(<args...>)``                      |
++            +-------------------------------------+--------------------------------------------+
+|            | Parentheses                         | ``(<statement>)``                          |
++------------+-------------------------------------+--------------------------------------------+
+| *2*        | Prefix increment and decrement      | ``++``, ``--``                             |
++            +-------------------------------------+--------------------------------------------+
+|            | Unary minus                         | ``-``                                      |
++            +-------------------------------------+--------------------------------------------+
+|            | Unary operations                    | ``delete``                                 |
++            +-------------------------------------+--------------------------------------------+
+|            | Logical NOT                         | ``!``                                      |
++            +-------------------------------------+--------------------------------------------+
+|            | Bitwise NOT                         | ``~``                                      |
++------------+-------------------------------------+--------------------------------------------+
+| *3*        | Exponentiation                      | ``**``                                     |
++------------+-------------------------------------+--------------------------------------------+
+| *4*        | Multiplication, division and modulo | ``*``, ``/``, ``%``                        |
++------------+-------------------------------------+--------------------------------------------+
+| *5*        | Addition and subtraction            | ``+``, ``-``                               |
++------------+-------------------------------------+--------------------------------------------+
+| *6*        | Bitwise shift operators             | ``<<``, ``>>``                             |
++------------+-------------------------------------+--------------------------------------------+
+| *7*        | Bitwise AND                         | ``&``                                      |
++------------+-------------------------------------+--------------------------------------------+
+| *8*        | Bitwise XOR                         | ``^``                                      |
++------------+-------------------------------------+--------------------------------------------+
+| *9*        | Bitwise OR                          | ``|``                                      |
++------------+-------------------------------------+--------------------------------------------+
+| *10*       | Inequality operators                | ``<``, ``>``, ``<=``, ``>=``               |
++------------+-------------------------------------+--------------------------------------------+
+| *11*       | Equality operators                  | ``==``, ``!=``                             |
++------------+-------------------------------------+--------------------------------------------+
+| *12*       | Logical AND                         | ``&&``                                     |
++------------+-------------------------------------+--------------------------------------------+
+| *13*       | Logical OR                          | ``||``                                     |
++------------+-------------------------------------+--------------------------------------------+
+| *14*       | Ternary operator                    | ``<conditional> ? <if-true> : <if-false>`` |
++            +-------------------------------------+--------------------------------------------+
+|            | Assignment operators                | ``=``, ``|=``, ``^=``, ``&=``, ``<<=``,    |
+|            |                                     | ``>>=``, ``+=``, ``-=``, ``*=``, ``/=``,   |
+|            |                                     | ``%=``                                     |
++------------+-------------------------------------+--------------------------------------------+
+| *15*       | Comma operator                      | ``,``                                      |
++------------+-------------------------------------+--------------------------------------------+
diff --git a/docs/types/operators.rst b/docs/types/operators.rst
index e998e03a5a..3a3b548df5 100644
--- a/docs/types/operators.rst
+++ b/docs/types/operators.rst
@@ -115,60 +115,4 @@ value it referred to previously.
 Order of Precedence of Operators
 --------------------------------
 
-The following is the order of precedence for operators, listed in order of evaluation.
-
-+------------+-------------------------------------+--------------------------------------------+
-| Precedence | Description                         | Operator                                   |
-+============+=====================================+============================================+
-| *1*        | Postfix increment and decrement     | ``++``, ``--``                             |
-+            +-------------------------------------+--------------------------------------------+
-|            | New expression                      | ``new <typename>``                         |
-+            +-------------------------------------+--------------------------------------------+
-|            | Array subscripting                  | ``<array>[<index>]``                       |
-+            +-------------------------------------+--------------------------------------------+
-|            | Member access                       | ``<object>.<member>``                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Function-like call                  | ``<func>(<args...>)``                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Parentheses                         | ``(<statement>)``                          |
-+------------+-------------------------------------+--------------------------------------------+
-| *2*        | Prefix increment and decrement      | ``++``, ``--``                             |
-+            +-------------------------------------+--------------------------------------------+
-|            | Unary minus                         | ``-``                                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Unary operations                    | ``delete``                                 |
-+            +-------------------------------------+--------------------------------------------+
-|            | Logical NOT                         | ``!``                                      |
-+            +-------------------------------------+--------------------------------------------+
-|            | Bitwise NOT                         | ``~``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *3*        | Exponentiation                      | ``**``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *4*        | Multiplication, division and modulo | ``*``, ``/``, ``%``                        |
-+------------+-------------------------------------+--------------------------------------------+
-| *5*        | Addition and subtraction            | ``+``, ``-``                               |
-+------------+-------------------------------------+--------------------------------------------+
-| *6*        | Bitwise shift operators             | ``<<``, ``>>``                             |
-+------------+-------------------------------------+--------------------------------------------+
-| *7*        | Bitwise AND                         | ``&``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *8*        | Bitwise XOR                         | ``^``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *9*        | Bitwise OR                          | ``|``                                      |
-+------------+-------------------------------------+--------------------------------------------+
-| *10*       | Inequality operators                | ``<``, ``>``, ``<=``, ``>=``               |
-+------------+-------------------------------------+--------------------------------------------+
-| *11*       | Equality operators                  | ``==``, ``!=``                             |
-+------------+-------------------------------------+--------------------------------------------+
-| *12*       | Logical AND                         | ``&&``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *13*       | Logical OR                          | ``||``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *14*       | Ternary operator                    | ``<conditional> ? <if-true> : <if-false>`` |
-+            +-------------------------------------+--------------------------------------------+
-|            | Assignment operators                | ``=``, ``|=``, ``^=``, ``&=``, ``<<=``,    |
-|            |                                     | ``>>=``, ``+=``, ``-=``, ``*=``, ``/=``,   |
-|            |                                     | ``%=``                                     |
-+------------+-------------------------------------+--------------------------------------------+
-| *15*       | Comma operator                      | ``,``                                      |
-+------------+-------------------------------------+--------------------------------------------+
+.. include:: types/operator-precedence-table.rst

From d0d71714a170ecb11993062cef5931b34322aa1a Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 14 Jun 2022 10:32:57 -0300
Subject: [PATCH 0676/1748] Changed sed command in zeppelin.sh to match renamed
 test file.

---
 test/externalTests/zeppelin.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 15ebf8b813..5e8ebb6a9c 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -109,8 +109,8 @@ function zeppelin_test
     sed -i "s|it(\('divide by 0'\)|it.skip(\1|g" test/utils/math/Math.test.js
     # CAUTION:: The following two sed commands depend on the order of occurrence of the relevant patterns in the mentioned files.
     # Could result in an error in the future.
-    sed -zi "s|it(\('deposit'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC20TokenizedVault.test.js
-    sed -zi "s|it(\('withdraw'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC20TokenizedVault.test.js
+    sed -zi "s|it(\('deposit'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC4626.test.js
+    sed -zi "s|it(\('withdraw'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC4626.test.js
 
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
     sed -i "s|describe\(('Polygon-Child'\)|describe.skip\1|g" test/crosschain/CrossChainEnabled.test.js

From a27b063c10be48f303b499a90bf988c3ce5bc4ee Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 19 May 2022 20:50:41 +0200
Subject: [PATCH 0677/1748] Test for buggy behaviour.

---
 .../byte_array_to_storage_cleanup.sol         | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol

diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
new file mode 100644
index 0000000000..ed9b234fff
--- /dev/null
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -0,0 +1,36 @@
+contract C {
+  event ev0(uint[] i0, uint);
+  bytes public s2;
+  function h() external returns (bytes memory) {
+    uint[] memory x = new uint[](2);
+    emit ev0(x, 0x21);
+    bytes memory m = new bytes(63);
+    s2 = m;
+    s2.push();
+    return s2;
+  }
+  function g() external returns (bytes memory) {
+    bytes memory m = new bytes(63);
+    assembly {
+      mstore8(add(m, add(32, 63)), 0x42)
+    }
+    s2 = m;
+    s2.push();
+    return s2;
+  }
+  function f(bytes calldata c) external returns (bytes memory) {
+    s2 = c;
+    s2.push();
+    return s2;
+  }
+}
+// ====
+// compileViaYul: false
+// ----
+// constructor() ->
+// gas legacy: 616124
+// gas legacyOptimized: 450817
+// h() -> 0x20, 0x40, 0x00, 2
+// ~ emit ev0(uint256[],uint256): 0x40, 0x21, 0x02, 0x00, 0x00
+// g() -> 0x20, 0x40, 0, 0x42
+// f(bytes): 0x20, 33, 0, -1 -> 0x20, 0x22, 0, 0xffff000000000000000000000000000000000000000000000000000000000000

From 7a84e9c875f4abfb201bb35c956aa87550f08bb2 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 19 May 2022 20:50:50 +0200
Subject: [PATCH 0678/1748] Bugfix.

---
 libsolidity/codegen/ArrayUtils.cpp            | 91 ++++++++-----------
 .../byte_array_to_storage_cleanup.sol         | 13 +--
 2 files changed, 46 insertions(+), 58 deletions(-)

diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
index 7257278693..9b95463ba5 100644
--- a/libsolidity/codegen/ArrayUtils.cpp
+++ b/libsolidity/codegen/ArrayUtils.cpp
@@ -50,9 +50,8 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 	// stack layout: [source_ref] [source length] target_ref (top)
 	solAssert(_targetType.location() == DataLocation::Storage, "");
 
-	Type const* uint256 = TypeProvider::uint256();
-	Type const* targetBaseType = _targetType.isByteArrayOrString() ? uint256 : _targetType.baseType();
-	Type const* sourceBaseType = _sourceType.isByteArrayOrString() ? uint256 : _sourceType.baseType();
+	Type const* targetBaseType = _targetType.baseType();
+	Type const* sourceBaseType = _sourceType.baseType();
 
 	// TODO unroll loop for small sizes
 
@@ -68,7 +67,38 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 	for (unsigned i = _sourceType.sizeOnStack(); i > 0; --i)
 		m_context << swapInstruction(i);
 	// stack: target_ref source_ref [source_length]
-	// stack: target_ref source_ref [source_length]
+
+	if (_targetType.isByteArrayOrString())
+	{
+		// stack: target_ref source_ref [source_length]
+		if (fromCalldata && _sourceType.isDynamicallySized())
+		{
+			// stack: target_ref source_ref source_length
+			m_context << Instruction::SWAP1;
+			// stack: target_ref source_length source_ref
+			m_context << Instruction::DUP3;
+			// stack: target_ref source_length source_ref target_ref
+			m_context.callYulFunction(
+				m_context.utilFunctions().copyByteArrayToStorageFunction(_sourceType, _targetType),
+				3,
+				0
+			);
+		}
+		else
+		{
+			// stack: target_ref source_ref
+			m_context << Instruction::DUP2;
+			// stack: target_ref source_ref target_ref
+			m_context.callYulFunction(
+				m_context.utilFunctions().copyByteArrayToStorageFunction(_sourceType, _targetType),
+				2,
+				0
+			);
+		}
+		// stack: target_ref
+		return;
+	}
+
 	// retrieve source length
 	if (_sourceType.location() != DataLocation::CallData || !_sourceType.isDynamicallySized())
 		retrieveLength(_sourceType); // otherwise, length is already there
@@ -97,10 +127,11 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 			utils.retrieveLength(_targetType);
 			// stack: target_ref source_ref source_length target_ref target_length
 			if (_targetType.isDynamicallySized())
+			{
 				// store new target length
-				if (!_targetType.isByteArrayOrString())
-					// Otherwise, length will be stored below.
-					_context << Instruction::DUP3 << Instruction::DUP3 << Instruction::SSTORE;
+				solAssert(!_targetType.isByteArrayOrString());
+				_context << Instruction::DUP3 << Instruction::DUP3 << Instruction::SSTORE;
+			}
 			if (sourceBaseType->category() == Type::Category::Mapping)
 			{
 				solAssert(targetBaseType->category() == Type::Category::Mapping, "");
@@ -125,51 +156,7 @@ void ArrayUtils::copyArrayToStorage(ArrayType const& _targetType, ArrayType cons
 			// stack: target_ref target_data_end source_length target_data_pos source_ref
 
 			evmasm::AssemblyItem copyLoopEndWithoutByteOffset = _context.newTag();
-
-			// special case for short byte arrays: Store them together with their length.
-			if (_targetType.isByteArrayOrString())
-			{
-				// stack: target_ref target_data_end source_length target_data_pos source_ref
-				_context << Instruction::DUP3;
-				evmasm::AssemblyItem nonEmptyByteArray = _context.appendConditionalJump();
-				// Empty source, just zero out the main slot.
-				_context << u256(0) << Instruction::DUP6 << Instruction::SSTORE;
-				_context.appendJumpTo(copyLoopEndWithoutByteOffset);
-
-				_context << nonEmptyByteArray;
-				// Non-empty source.
-				// stack: target_ref target_data_end source_length target_data_pos source_ref
-				_context << Instruction::DUP3 << u256(31) << Instruction::LT;
-				evmasm::AssemblyItem longByteArray = _context.appendConditionalJump();
-				// store the short byte array
-				solAssert(_sourceType.isByteArrayOrString(), "");
-				if (_sourceType.location() == DataLocation::Storage)
-				{
-					// just copy the slot, it contains length and data
-					_context << Instruction::DUP1 << Instruction::SLOAD;
-					_context << Instruction::DUP6 << Instruction::SSTORE;
-				}
-				else
-				{
-					_context << Instruction::DUP1;
-					CompilerUtils(_context).loadFromMemoryDynamic(*sourceBaseType, fromCalldata, true, false);
-					// stack: target_ref target_data_end source_length target_data_pos source_ref value
-					// clear the lower-order byte - which will hold the length
-					_context << u256(0xff) << Instruction::NOT << Instruction::AND;
-					// fetch the length and shift it left by one
-					_context << Instruction::DUP4 << Instruction::DUP1 << Instruction::ADD;
-					// combine value and length and store them
-					_context << Instruction::OR << Instruction::DUP6 << Instruction::SSTORE;
-				}
-				// end of special case, jump right into cleaning target data area
-				_context.appendJumpTo(copyLoopEndWithoutByteOffset);
-				_context << longByteArray;
-				// Store length (2*length+1)
-				_context << Instruction::DUP3 << Instruction::DUP1 << Instruction::ADD;
-				_context << u256(1) << Instruction::ADD;
-				_context << Instruction::DUP6 << Instruction::SSTORE;
-			}
-
+			solAssert(!_targetType.isByteArrayOrString());
 			// skip copying if source length is zero
 			_context << Instruction::DUP3 << Instruction::ISZERO;
 			_context.appendConditionalJumpTo(copyLoopEndWithoutByteOffset);
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index ed9b234fff..f4e5f62e25 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -25,12 +25,13 @@ contract C {
   }
 }
 // ====
-// compileViaYul: false
+// compileViaYul: also
 // ----
 // constructor() ->
-// gas legacy: 616124
-// gas legacyOptimized: 450817
-// h() -> 0x20, 0x40, 0x00, 2
+// gas irOptimized: 520903
+// gas legacy: 731840
+// gas legacyOptimized: 494859
+// h() -> 0x20, 0x40, 0x00, 0
 // ~ emit ev0(uint256[],uint256): 0x40, 0x21, 0x02, 0x00, 0x00
-// g() -> 0x20, 0x40, 0, 0x42
-// f(bytes): 0x20, 33, 0, -1 -> 0x20, 0x22, 0, 0xffff000000000000000000000000000000000000000000000000000000000000
+// g() -> 0x20, 0x40, 0, 0x00
+// f(bytes): 0x20, 33, 0, -1 -> 0x20, 0x22, 0, 0xff00000000000000000000000000000000000000000000000000000000000000

From 5989f45e9eba2dbea26499b1ef670d70d9311d38 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 7 Jun 2022 14:45:10 +0200
Subject: [PATCH 0679/1748] Test updates.

---
 .../abiEncoderV1/abi_decode_v2_storage.sol    |  4 ++--
 .../abi_decode_simple_storage.sol             |  4 ++--
 .../array/bytes_length_member.sol             |  4 ++--
 .../array/copying/bytes_inside_mappings.sol   |  8 ++++----
 .../copying/bytes_storage_to_storage.sol      | 20 +++++++++----------
 .../copy_byte_array_in_struct_to_storage.sol  |  8 ++++----
 .../copying/copy_byte_array_to_storage.sol    |  4 ++--
 .../array/copying/copy_removes_bytes_data.sol |  4 ++--
 .../copying/copying_bytes_multiassign.sol     |  4 ++--
 .../dirty_memory_bytes_to_storage_copy.sol    |  2 +-
 .../memory_dyn_2d_bytes_to_storage.sol        |  4 ++--
 .../copying/storage_memory_nested_bytes.sol   |  4 ++--
 .../array/delete/bytes_delete_element.sol     |  4 ++--
 .../array/push/nested_bytes_push.sol          |  4 ++--
 .../byte_array_to_storage_cleanup.sol         |  2 +-
 .../copy_from_calldata_removes_bytes_data.sol |  4 ++--
 .../bytes_in_constructors_packer.sol          |  4 ++--
 .../bytes_in_constructors_unpacker.sol        |  4 ++--
 ...truct_containing_bytes_copy_and_delete.sol |  4 ++--
 .../semanticTests/various/address_code.sol    |  4 ++--
 .../various/destructuring_assignment.sol      |  4 ++--
 .../skip_dynamic_types_for_structs.sol        |  4 ++--
 22 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index a2b855b853..fd7bc20838 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
@@ -23,5 +23,5 @@ contract C {
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
 // gas irOptimized: 203172
-// gas legacy: 206075
-// gas legacyOptimized: 203059
+// gas legacy: 206343
+// gas legacyOptimized: 203162
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index 524394ff81..e877e627b0 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -10,5 +10,5 @@ contract C {
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
 // gas irOptimized: 135787
-// gas legacy: 137181
-// gas legacyOptimized: 136073
+// gas legacy: 137377
+// gas legacyOptimized: 136125
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index 8e7b526cfe..387ef09302 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -14,6 +14,6 @@ contract c {
 // getLength() -> 0
 // set(): 1, 2 -> true
 // gas irOptimized: 110402
-// gas legacy: 110723
-// gas legacyOptimized: 110564
+// gas legacy: 110968
+// gas legacyOptimized: 110585
 // getLength() -> 68
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
index 7358e1506d..99ee19d7a3 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -6,12 +6,12 @@ contract c {
 // ----
 // set(uint256): 1, 2 -> true
 // gas irOptimized: 110576
-// gas legacy: 111088
-// gas legacyOptimized: 110733
+// gas legacy: 111333
+// gas legacyOptimized: 110750
 // set(uint256): 2, 2, 3, 4, 5 -> true
 // gas irOptimized: 177527
-// gas legacy: 178018
-// gas legacyOptimized: 177663
+// gas legacy: 178335
+// gas legacyOptimized: 177725
 // storageEmpty -> 0
 // copy(uint256,uint256): 1, 2 -> true
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 9e10630971..0f0b4083f0 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -18,24 +18,24 @@ contract c {
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
 // gas irOptimized: 108395
-// gas legacy: 123884
-// gas legacyOptimized: 119139
+// gas legacy: 124322
+// gas legacyOptimized: 119141
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
 // gas irOptimized: 117480
-// gas legacy: 134936
-// gas legacyOptimized: 130046
+// gas legacy: 135259
+// gas legacyOptimized: 130089
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
 // gas irOptimized: 124117
-// gas legacy: 141728
-// gas legacyOptimized: 136711
+// gas legacy: 142861
+// gas legacyOptimized: 137030
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
 // gas irOptimized: 126467
-// gas legacy: 159768
-// gas legacyOptimized: 150641
+// gas legacy: 160901
+// gas legacyOptimized: 150960
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
 // gas irOptimized: 353326
-// gas legacy: 421067
-// gas legacyOptimized: 402910
+// gas legacy: 421700
+// gas legacyOptimized: 402999
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index 308e756aec..2a3e2044f1 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -36,11 +36,11 @@ contract C {
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
 // gas irOptimized: 179880
-// gas legacy: 180676
-// gas legacyOptimized: 180070
+// gas legacy: 181099
+// gas legacyOptimized: 180073
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
 // gas irOptimized: 107211
-// gas legacy: 107877
-// gas legacyOptimized: 107236
+// gas legacy: 110253
+// gas legacyOptimized: 107397
 // h() -> 0x40, 0x60, 0x00, 0x00
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index 33a70fa360..92f2a1f2e4 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -47,5 +47,5 @@ contract C {
 // ----
 // f() -> 0xff
 // gas irOptimized: 119584
-// gas legacy: 128005
-// gas legacyOptimized: 123446
+// gas legacy: 132274
+// gas legacyOptimized: 123756
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
index c111c7b89e..1c72666111 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -8,8 +8,8 @@ contract c {
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
 // gas irOptimized: 177386
-// gas legacy: 177653
-// gas legacyOptimized: 177493
+// gas legacy: 177970
+// gas legacyOptimized: 177559
 // storageEmpty -> 0
 // reset() -> true
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index 9b308a010f..cc61509d44 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -21,8 +21,8 @@ contract sender {
 // ----
 // (): 7 ->
 // gas irOptimized: 110826
-// gas legacy: 111071
-// gas legacyOptimized: 111016
+// gas legacy: 111408
+// gas legacyOptimized: 111078
 // val() -> 0
 // forward(bool): true -> true
 // val() -> 0x80
diff --git a/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy.sol b/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy.sol
index 767e268562..ca154eee91 100644
--- a/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy.sol
+++ b/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy.sol
@@ -16,4 +16,4 @@ contract C {
 // ====
 // compileViaYul: false
 // ----
-// f() -> 0x6465616462656566313564656164000000000000000000000000000000000010
+// f() -> 0x6465616462656566000000000000000000000000000000000000000000000010
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index 38c20b8fc8..16d10a36d2 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -19,5 +19,5 @@ contract C {
 // ----
 // f() -> 3
 // gas irOptimized: 128172
-// gas legacy: 130181
-// gas legacyOptimized: 129198
+// gas legacy: 130757
+// gas legacyOptimized: 129144
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index fe0cf95839..349bfd935c 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -12,5 +12,5 @@ contract C {
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
 // gas irOptimized: 202952
-// gas legacy: 204441
-// gas legacyOptimized: 203419
+// gas legacy: 204912
+// gas legacyOptimized: 203437
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index b9e2aa8399..652854cb8f 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -17,5 +17,5 @@ contract c {
 // ----
 // test1() -> true
 // gas irOptimized: 207928
-// gas legacy: 254650
-// gas legacyOptimized: 247384
+// gas legacy: 254905
+// gas legacyOptimized: 247415
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index 6c006ffd69..8a962ad43f 100644
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
@@ -14,5 +14,5 @@ contract C {
 // ----
 // f() ->
 // gas irOptimized: 179173
-// gas legacy: 180602
-// gas legacyOptimized: 180385
+// gas legacy: 181066
+// gas legacyOptimized: 180435
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index f4e5f62e25..f43166e78e 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,7 +28,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 520903
+// gas irOptimized: 521983
 // gas legacy: 731840
 // gas legacyOptimized: 494859
 // h() -> 0x20, 0x40, 0x00, 0
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
index f567d752db..9fc432e8c3 100644
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -11,8 +11,8 @@ contract c {
 // ----
 // (): 1, 2, 3, 4, 5 ->
 // gas irOptimized: 155158
-// gas legacy: 155249
-// gas legacyOptimized: 155212
+// gas legacy: 155483
+// gas legacyOptimized: 155303
 // checkIfDataIsEmpty() -> false
 // sendMessage() -> true, 0x40, 0
 // checkIfDataIsEmpty() -> true
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index b855e898cf..5c57963b22 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -25,5 +25,5 @@ contract Creator {
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
 // gas irOptimized: 282398
-// gas legacy: 428711
-// gas legacyOptimized: 297922
+// gas legacy: 429047
+// gas legacyOptimized: 297958
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index a160fafcc7..867a85a12c 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -9,7 +9,7 @@ contract Test {
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
 // gas irOptimized: 273340
-// gas legacy: 309607
-// gas legacyOptimized: 260566
+// gas legacy: 317746
+// gas legacyOptimized: 262368
 // m_x() -> 7
 // m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz"
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index 34806a35b2..9980075720 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -24,8 +24,8 @@ contract c {
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
 // gas irOptimized: 133599
-// gas legacy: 134433
-// gas legacyOptimized: 133876
+// gas legacy: 134654
+// gas legacyOptimized: 133882
 // test(uint256): 32 -> "3"
 // storageEmpty -> 0
 // copy() -> true
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 73720fa5f8..c44fd410ad 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -17,8 +17,8 @@ contract C {
 // ----
 // constructor() ->
 // gas irOptimized: 177507
-// gas legacy: 240889
-// gas legacyOptimized: 155314
+// gas legacy: 249207
+// gas legacyOptimized: 157489
 // initCode() -> 0x20, 0
 // f() -> true
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 37c0d98ea0..6be5ffd479 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -35,5 +35,5 @@ contract C {
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
 // gas irOptimized: 239194
-// gas legacy: 240349
-// gas legacyOptimized: 239673
+// gas legacy: 240541
+// gas legacyOptimized: 239654
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 1cc1bb039d..3e29dc2709 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -21,5 +21,5 @@ contract C {
 // ----
 // g() -> 2, 6
 // gas irOptimized: 178677
-// gas legacy: 180753
-// gas legacyOptimized: 179472
+// gas legacy: 180945
+// gas legacyOptimized: 179460

From 91ff02b988e99f319ecce24eecb923d89d25327e Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 13 Jun 2022 12:35:21 +0200
Subject: [PATCH 0680/1748] Changelog and buglist entries.

---
 Changelog.md              |  1 +
 docs/bugs.json            | 10 ++++
 docs/bugs_by_version.json | 98 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 109 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index ba091f2668..f85404b9d5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.15 (unreleased)
 
 Important Bugfixes:
+ * Code Generation: Avoid writing dirty bytes to storage when copying ``bytes`` arrays.
  * Yul Optimizer: Keep all memory side-effects of inline assembly blocks.
 
 
diff --git a/docs/bugs.json b/docs/bugs.json
index bc1bc622e6..979f4264fd 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -1,4 +1,14 @@
 [
+    {
+        "uid": "SOL-2022-5",
+        "name": "DirtyBytesArrayToStorage",
+        "summary": "Copying ``bytes`` arrays from memory or calldata to storage may result in dirty storage values.",
+        "description": "Copying ``bytes`` arrays from memory or calldata to storage is done in chunks of 32 bytes. Thereby, dirty values in calldata or memory can be written to storage, which may then become observable after a ``.push()`` on the bytes array in storage.",
+        "link": "https://blog.soliditylang.org/2022/06/15/dirty-bytes-array-to-storage-bug/",
+        "introduced": "0.0.1",
+        "fixed": "0.8.15",
+        "severity": "low"
+    },
     {
         "uid": "SOL-2022-4",
         "name": "InlineAssemblyMemorySideEffects",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 1b0f7d1caf..82eaa81417 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1,6 +1,7 @@
 {
     "0.1.0": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -22,6 +23,7 @@
     },
     "0.1.1": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -43,6 +45,7 @@
     },
     "0.1.2": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -64,6 +67,7 @@
     },
     "0.1.3": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -85,6 +89,7 @@
     },
     "0.1.4": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -107,6 +112,7 @@
     },
     "0.1.5": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -129,6 +135,7 @@
     },
     "0.1.6": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -153,6 +160,7 @@
     },
     "0.1.7": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -177,6 +185,7 @@
     },
     "0.2.0": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -202,6 +211,7 @@
     },
     "0.2.1": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -227,6 +237,7 @@
     },
     "0.2.2": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -252,6 +263,7 @@
     },
     "0.3.0": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -279,6 +291,7 @@
     },
     "0.3.1": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -305,6 +318,7 @@
     },
     "0.3.2": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -331,6 +345,7 @@
     },
     "0.3.3": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -356,6 +371,7 @@
     },
     "0.3.4": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -381,6 +397,7 @@
     },
     "0.3.5": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -406,6 +423,7 @@
     },
     "0.3.6": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -429,6 +447,7 @@
     },
     "0.4.0": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -452,6 +471,7 @@
     },
     "0.4.1": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -475,6 +495,7 @@
     },
     "0.4.10": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -497,6 +518,7 @@
     },
     "0.4.11": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -518,6 +540,7 @@
     },
     "0.4.12": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -538,6 +561,7 @@
     },
     "0.4.13": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -558,6 +582,7 @@
     },
     "0.4.14": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -577,6 +602,7 @@
     },
     "0.4.15": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -595,6 +621,7 @@
     },
     "0.4.16": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -616,6 +643,7 @@
     },
     "0.4.17": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -638,6 +666,7 @@
     },
     "0.4.18": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -659,6 +688,7 @@
     },
     "0.4.19": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -681,6 +711,7 @@
     },
     "0.4.2": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -703,6 +734,7 @@
     },
     "0.4.20": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -725,6 +757,7 @@
     },
     "0.4.21": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -747,6 +780,7 @@
     },
     "0.4.22": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -769,6 +803,7 @@
     },
     "0.4.23": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -790,6 +825,7 @@
     },
     "0.4.24": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -811,6 +847,7 @@
     },
     "0.4.25": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -830,6 +867,7 @@
     },
     "0.4.26": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -846,6 +884,7 @@
     },
     "0.4.3": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -867,6 +906,7 @@
     },
     "0.4.4": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -887,6 +927,7 @@
     },
     "0.4.5": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -910,6 +951,7 @@
     },
     "0.4.6": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -932,6 +974,7 @@
     },
     "0.4.7": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -954,6 +997,7 @@
     },
     "0.4.8": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -976,6 +1020,7 @@
     },
     "0.4.9": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "KeccakCaching",
             "EmptyByteArrayCopy",
             "DynamicArrayCleanup",
@@ -998,6 +1043,7 @@
     },
     "0.5.0": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1017,6 +1063,7 @@
     },
     "0.5.1": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1036,6 +1083,7 @@
     },
     "0.5.10": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1052,6 +1100,7 @@
     },
     "0.5.11": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1067,6 +1116,7 @@
     },
     "0.5.12": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1082,6 +1132,7 @@
     },
     "0.5.13": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1097,6 +1148,7 @@
     },
     "0.5.14": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1114,6 +1166,7 @@
     },
     "0.5.15": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1130,6 +1183,7 @@
     },
     "0.5.16": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1145,6 +1199,7 @@
     },
     "0.5.17": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1159,6 +1214,7 @@
     },
     "0.5.2": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1178,6 +1234,7 @@
     },
     "0.5.3": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1197,6 +1254,7 @@
     },
     "0.5.4": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1216,6 +1274,7 @@
     },
     "0.5.5": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1237,6 +1296,7 @@
     },
     "0.5.6": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1258,6 +1318,7 @@
     },
     "0.5.7": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1277,6 +1338,7 @@
     },
     "0.5.8": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1296,6 +1358,7 @@
     },
     "0.5.9": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1314,6 +1377,7 @@
     },
     "0.6.0": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1330,6 +1394,7 @@
     },
     "0.6.1": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1345,6 +1410,7 @@
     },
     "0.6.10": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1357,6 +1423,7 @@
     },
     "0.6.11": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1369,6 +1436,7 @@
     },
     "0.6.12": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1381,6 +1449,7 @@
     },
     "0.6.2": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1396,6 +1465,7 @@
     },
     "0.6.3": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1411,6 +1481,7 @@
     },
     "0.6.4": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1426,6 +1497,7 @@
     },
     "0.6.5": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1441,6 +1513,7 @@
     },
     "0.6.6": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1455,6 +1528,7 @@
     },
     "0.6.7": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1469,6 +1543,7 @@
     },
     "0.6.8": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1480,6 +1555,7 @@
     },
     "0.6.9": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1493,6 +1569,7 @@
     },
     "0.7.0": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1505,6 +1582,7 @@
     },
     "0.7.1": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1518,6 +1596,7 @@
     },
     "0.7.2": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1530,6 +1609,7 @@
     },
     "0.7.3": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1541,6 +1621,7 @@
     },
     "0.7.4": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1551,6 +1632,7 @@
     },
     "0.7.5": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1561,6 +1643,7 @@
     },
     "0.7.6": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1571,6 +1654,7 @@
     },
     "0.8.0": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1581,6 +1665,7 @@
     },
     "0.8.1": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1591,6 +1676,7 @@
     },
     "0.8.10": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation"
         ],
@@ -1598,6 +1684,7 @@
     },
     "0.8.11": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "AbiEncodeCallLiteralAsFixedBytesBug"
@@ -1606,6 +1693,7 @@
     },
     "0.8.12": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "AbiEncodeCallLiteralAsFixedBytesBug"
@@ -1614,6 +1702,7 @@
     },
     "0.8.13": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "InlineAssemblyMemorySideEffects",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation"
@@ -1622,12 +1711,14 @@
     },
     "0.8.14": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "InlineAssemblyMemorySideEffects"
         ],
         "released": "2022-05-17"
     },
     "0.8.2": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1638,6 +1729,7 @@
     },
     "0.8.3": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1647,6 +1739,7 @@
     },
     "0.8.4": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
@@ -1655,6 +1748,7 @@
     },
     "0.8.5": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
@@ -1663,6 +1757,7 @@
     },
     "0.8.6": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
@@ -1671,6 +1766,7 @@
     },
     "0.8.7": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
@@ -1679,6 +1775,7 @@
     },
     "0.8.8": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "UserDefinedValueTypesBug",
@@ -1688,6 +1785,7 @@
     },
     "0.8.9": {
         "bugs": [
+            "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation"
         ],

From 187f0f070d51700006dddb7dc833d8f384f10eda Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 14 Jun 2022 17:30:14 +0200
Subject: [PATCH 0681/1748] Some review suggestions.

---
 docs/bugs.json                                |  2 +-
 .../byte_array_to_storage_cleanup.sol         | 48 +++++++++----------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/docs/bugs.json b/docs/bugs.json
index 979f4264fd..b7108fac1a 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -3,7 +3,7 @@
         "uid": "SOL-2022-5",
         "name": "DirtyBytesArrayToStorage",
         "summary": "Copying ``bytes`` arrays from memory or calldata to storage may result in dirty storage values.",
-        "description": "Copying ``bytes`` arrays from memory or calldata to storage is done in chunks of 32 bytes. Thereby, dirty values in calldata or memory can be written to storage, which may then become observable after a ``.push()`` on the bytes array in storage.",
+        "description": "Copying ``bytes`` arrays from memory or calldata to storage is done in chunks of 32 bytes even if the length is not a multiple of 32. Thereby, extra bytes past the end of the array may be copied from calldata or memory to storage. These dirty bytes may then become observable after a ``.push()`` without arguments to the bytes array in storage, i.e. such a push will not result in a zero value at the end of the array as expected. This bug only affects the legacy code generation pipeline, the new code generation pipeline via IR is not affected.",
         "link": "https://blog.soliditylang.org/2022/06/15/dirty-bytes-array-to-storage-bug/",
         "introduced": "0.0.1",
         "fixed": "0.8.15",
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index f43166e78e..f275590e47 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -1,28 +1,28 @@
 contract C {
-  event ev0(uint[] i0, uint);
-  bytes public s2;
-  function h() external returns (bytes memory) {
-    uint[] memory x = new uint[](2);
-    emit ev0(x, 0x21);
-    bytes memory m = new bytes(63);
-    s2 = m;
-    s2.push();
-    return s2;
-  }
-  function g() external returns (bytes memory) {
-    bytes memory m = new bytes(63);
-    assembly {
-      mstore8(add(m, add(32, 63)), 0x42)
+    event ev(uint[], uint);
+    bytes public s;
+    function h() external returns (bytes memory) {
+        uint[] memory x = new uint[](2);
+        emit ev(x, 0x21);
+        bytes memory m = new bytes(63);
+        s = m;
+        s.push();
+        return s;
+    }
+    function g() external returns (bytes memory) {
+        bytes memory m = new bytes(63);
+        assembly {
+            mstore8(add(m, add(32, 63)), 0x42)
+        }
+        s = m;
+        s.push();
+        return s;
+    }
+    function f(bytes calldata c) external returns (bytes memory) {
+        s = c;
+        s.push();
+        return s;
     }
-    s2 = m;
-    s2.push();
-    return s2;
-  }
-  function f(bytes calldata c) external returns (bytes memory) {
-    s2 = c;
-    s2.push();
-    return s2;
-  }
 }
 // ====
 // compileViaYul: also
@@ -32,6 +32,6 @@ contract C {
 // gas legacy: 731840
 // gas legacyOptimized: 494859
 // h() -> 0x20, 0x40, 0x00, 0
-// ~ emit ev0(uint256[],uint256): 0x40, 0x21, 0x02, 0x00, 0x00
+// ~ emit ev(uint256[],uint256): 0x40, 0x21, 0x02, 0x00, 0x00
 // g() -> 0x20, 0x40, 0, 0x00
 // f(bytes): 0x20, 33, 0, -1 -> 0x20, 0x22, 0, 0xff00000000000000000000000000000000000000000000000000000000000000

From 27822dbca728b29e2314471fd0fffb121435a443 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 14 Jun 2022 17:30:24 +0200
Subject: [PATCH 0682/1748] Remove entry in IR breaking changes.

---
 docs/ir-breaking-changes.rst | 31 -------------------------------
 1 file changed, 31 deletions(-)

diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index 2b5905a96b..7e4efce688 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -154,37 +154,6 @@ hiding new and different behavior in existing code.
   - New code generator: ``0`` as all parameters, including return parameters, will be re-initialized before
     each ``_;`` evaluation.
 
-- Copying ``bytes`` arrays from memory to storage is implemented in a different way.
-  The old code generator always copies full words, while the new one cuts the byte
-  array after its end. The old behaviour can lead to dirty data being copied after
-  the end of the array (but still in the same storage slot).
-  This causes differences in some contracts, for example:
-
-  .. code-block:: solidity
-
-      // SPDX-License-Identifier: GPL-3.0
-      pragma solidity >=0.8.1;
-
-      contract C {
-          bytes x;
-          function f() public returns (uint r) {
-              bytes memory m = "tmp";
-              assembly {
-                  mstore(m, 8)
-                  mstore(add(m, 32), "deadbeef15dead")
-              }
-              x = m;
-              assembly {
-                  r := sload(x.slot)
-              }
-          }
-      }
-
-  Previously ``f()`` would return ``0x6465616462656566313564656164000000000000000000000000000000000010``
-  (it has correct length, and correct first 8 elements, but then it contains dirty data which was set via assembly).
-  Now it is returning ``0x6465616462656566000000000000000000000000000000000000000000000010`` (it has
-  correct length, and correct elements, but does not contain superfluous data).
-
   .. index:: ! evaluation order; expression
 
 - For the old code generator, the evaluation order of expressions is unspecified.

From 53c4facf4e01d603c21a8544fc3b016229628a16 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 Jun 2022 10:34:33 +0200
Subject: [PATCH 0683/1748] Fix compilation error.

---
 libevmasm/GasMeter.cpp                     | 2 +-
 libsolidity/analysis/ConstantEvaluator.cpp | 2 +-
 libsolutil/Numeric.cpp                     | 2 +-
 libsolutil/Numeric.h                       | 3 +++
 test/FilesystemUtils.cpp                   | 2 ++
 test/yulPhaser/AlgorithmRunner.cpp         | 1 +
 test/yulPhaser/Phaser.cpp                  | 1 +
 7 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
index 3ad9ba084c..d49ee98919 100644
--- a/libevmasm/GasMeter.cpp
+++ b/libevmasm/GasMeter.cpp
@@ -184,7 +184,7 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _
 				if (*value)
 				{
 					// Note: msb() counts from 0 and throws on 0 as input.
-					unsigned const significantByteCount  = (boost::multiprecision::msb(*value) + 1 + 7) / 8;
+					unsigned const significantByteCount  = (static_cast<unsigned>(boost::multiprecision::msb(*value)) + 1u + 7u) / 8u;
 					gas += GasCosts::expByteGas(m_evmVersion) * significantByteCount;
 				}
 			}
diff --git a/libsolidity/analysis/ConstantEvaluator.cpp b/libsolidity/analysis/ConstantEvaluator.cpp
index 0fc6761f7b..7fde36ec0e 100644
--- a/libsolidity/analysis/ConstantEvaluator.cpp
+++ b/libsolidity/analysis/ConstantEvaluator.cpp
@@ -49,7 +49,7 @@ bool fitsPrecisionExp(bigint const& _base, bigint const& _exp)
 
 	size_t const bitsMax = 4096;
 
-	unsigned mostSignificantBaseBit = boost::multiprecision::msb(_base);
+	size_t mostSignificantBaseBit = static_cast<size_t>(boost::multiprecision::msb(_base));
 	if (mostSignificantBaseBit == 0) // _base == 1
 		return true;
 	if (mostSignificantBaseBit > bitsMax) // _base >= 2 ^ 4096
diff --git a/libsolutil/Numeric.cpp b/libsolutil/Numeric.cpp
index f1d4057e08..97a7b04206 100644
--- a/libsolutil/Numeric.cpp
+++ b/libsolutil/Numeric.cpp
@@ -31,7 +31,7 @@ bool solidity::fitsPrecisionBaseX(bigint const& _mantissa, double _log2OfBase, u
 
 	size_t const bitsMax = 4096;
 
-	unsigned mostSignificantMantissaBit = boost::multiprecision::msb(_mantissa);
+	size_t mostSignificantMantissaBit = static_cast<size_t>(boost::multiprecision::msb(_mantissa));
 	if (mostSignificantMantissaBit > bitsMax) // _mantissa >= 2 ^ 4096
 		return false;
 
diff --git a/libsolutil/Numeric.h b/libsolutil/Numeric.h
index 384589764d..c0f33e4906 100644
--- a/libsolutil/Numeric.h
+++ b/libsolutil/Numeric.h
@@ -33,6 +33,9 @@
 #if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 12)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#pragma GCC diagnostic ignored "-Wstringop-overread"
+#pragma GCC diagnostic ignored "-Waggressive-loop-optimizations"
 #endif
 #include <boost/multiprecision/cpp_int.hpp>
 #if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 12)
diff --git a/test/FilesystemUtils.cpp b/test/FilesystemUtils.cpp
index 0d1de3af95..7506d677ec 100644
--- a/test/FilesystemUtils.cpp
+++ b/test/FilesystemUtils.cpp
@@ -20,6 +20,8 @@
 
 #include <test/libsolidity/util/SoltestErrors.h>
 
+#include <fstream>
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::test;
diff --git a/test/yulPhaser/AlgorithmRunner.cpp b/test/yulPhaser/AlgorithmRunner.cpp
index c0c1aabd24..c8a9f40e65 100644
--- a/test/yulPhaser/AlgorithmRunner.cpp
+++ b/test/yulPhaser/AlgorithmRunner.cpp
@@ -31,6 +31,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
 
+#include <fstream>
 #include <regex>
 #include <sstream>
 
diff --git a/test/yulPhaser/Phaser.cpp b/test/yulPhaser/Phaser.cpp
index d5d5dac594..60e9805227 100644
--- a/test/yulPhaser/Phaser.cpp
+++ b/test/yulPhaser/Phaser.cpp
@@ -30,6 +30,7 @@
 #include <boost/test/unit_test.hpp>
 
 #include <algorithm>
+#include <fstream>
 
 using namespace std;
 using namespace solidity::test;

From c21265f9f8a7fcabeb895b61237e8decc758aaef Mon Sep 17 00:00:00 2001
From: Samuel Osewa <osewaayomide4@gmail.com>
Date: Sun, 15 May 2022 14:24:23 +0100
Subject: [PATCH 0684/1748] Changed error message for for Unicode character in
 non-unicode string literal
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <cameel2@gmail.com>
---
 liblangutil/Scanner.cpp                                    | 7 ++++++-
 liblangutil/Scanner.h                                      | 3 +++
 test/liblangutil/Scanner.cpp                               | 2 +-
 .../string/control_character_returned_in_string.sol        | 7 +++++++
 .../syntaxTests/string/string_unicode_without_prefix.sol   | 2 +-
 ..._override.sol => unicode_string_direction_override.yul} | 0
 6 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/string/control_character_returned_in_string.sol
 rename test/libyul/yulSyntaxTests/invalid/{unicode_string_direction_override.sol => unicode_string_direction_override.yul} (100%)

diff --git a/liblangutil/Scanner.cpp b/liblangutil/Scanner.cpp
index fede6d3f8f..819dafaf5d 100644
--- a/liblangutil/Scanner.cpp
+++ b/liblangutil/Scanner.cpp
@@ -76,6 +76,7 @@ string to_string(ScannerError _errorCode)
 		case ScannerError::IllegalHexDigit: return "Hexadecimal digit missing or invalid.";
 		case ScannerError::IllegalCommentTerminator: return "Expected multi-line comment-terminator.";
 		case ScannerError::IllegalEscapeSequence: return "Invalid escape sequence.";
+		case ScannerError::UnicodeCharacterInNonUnicodeString: return "Invalid character in string. If you are trying to use Unicode characters, use a unicode\"...\" string literal.";
 		case ScannerError::IllegalCharacterInString: return "Invalid character in string.";
 		case ScannerError::IllegalStringEndQuote: return "Expected string end-quote.";
 		case ScannerError::IllegalNumberSeparator: return "Invalid use of number separator '_'.";
@@ -844,7 +845,11 @@ Token Scanner::scanString(bool const _isUnicode)
 			// We are using a manual range and not isprint() to avoid
 			// any potential complications with locale.
 			if (!_isUnicode && (static_cast<unsigned>(c) <= 0x1f || static_cast<unsigned>(c) >= 0x7f))
-				return setError(ScannerError::IllegalCharacterInString);
+			{
+				if (m_kind == ScannerKind::Yul)
+					return setError(ScannerError::IllegalCharacterInString);
+				return setError(ScannerError::UnicodeCharacterInNonUnicodeString);
+			}
 			addLiteralChar(c);
 		}
 	}
diff --git a/liblangutil/Scanner.h b/liblangutil/Scanner.h
index e9957850c4..c45a2ec243 100644
--- a/liblangutil/Scanner.h
+++ b/liblangutil/Scanner.h
@@ -81,6 +81,7 @@ enum class ScannerError
 	IllegalHexDigit,
 	IllegalCommentTerminator,
 	IllegalEscapeSequence,
+	UnicodeCharacterInNonUnicodeString,
 	IllegalCharacterInString,
 	IllegalStringEndQuote,
 	IllegalNumberSeparator,
@@ -160,6 +161,8 @@ class Scanner
 	/// Called by the parser during FunctionDefinition parsing to clear the current comment
 	void clearCurrentCommentLiteral() { m_skippedComments[Current].literal.clear(); }
 
+	ScannerKind scannerKind() const { return m_kind; }
+
 	///@}
 
 	///@{
diff --git a/test/liblangutil/Scanner.cpp b/test/liblangutil/Scanner.cpp
index 51d0512367..c8a88ec820 100644
--- a/test/liblangutil/Scanner.cpp
+++ b/test/liblangutil/Scanner.cpp
@@ -123,7 +123,7 @@ BOOST_AUTO_TEST_CASE(string_nonprintable)
 		if (v == '\n' || v == '\v' || v == '\f' || v == '\r')
 			BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalStringEndQuote);
 		else
-			BOOST_CHECK_EQUAL(scanner.currentError(), ScannerError::IllegalCharacterInString);
+			BOOST_CHECK_EQUAL(scanner.currentError(),ScannerError::UnicodeCharacterInNonUnicodeString);
 		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "");
 	}
 }
diff --git a/test/libsolidity/syntaxTests/string/control_character_returned_in_string.sol b/test/libsolidity/syntaxTests/string/control_character_returned_in_string.sol
new file mode 100644
index 0000000000..981f5fdd5e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/string/control_character_returned_in_string.sol
@@ -0,0 +1,7 @@
+contract test {
+    function f() public pure returns (string memory) {
+        return "
;
+    }
+}
+// ----
+// ParserError 8936: (86-88): Invalid character in string. If you are trying to use Unicode characters, use a unicode"..." string literal.
diff --git a/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol b/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol
index a204e84e5e..581d9dd7d7 100644
--- a/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol
+++ b/test/libsolidity/syntaxTests/string/string_unicode_without_prefix.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// ParserError 8936: (86-88): Invalid character in string.
+// ParserError 8936: (86-88): Invalid character in string. If you are trying to use Unicode characters, use a unicode"..." string literal.
diff --git a/test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.sol b/test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.yul
similarity index 100%
rename from test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.sol
rename to test/libyul/yulSyntaxTests/invalid/unicode_string_direction_override.yul

From 1cb8e17d949610ec2f9edbc81f2a783e1a461511 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 14 Jun 2022 16:34:20 +0200
Subject: [PATCH 0685/1748] Add documentation section about dangling
 references.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 docs/types/reference-types.rst | 113 +++++++++++++++++++++++++++++++++
 1 file changed, 113 insertions(+)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index 5903ac3bec..3502df1abd 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -468,6 +468,119 @@ Array Members
         }
     }
 
+.. index:: ! array;dangling storage references
+
+Dangling References to Storage Array Elements
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+When working with storage arrays, you need to take care to avoid dangling references.
+A dangling reference is a reference that points to something that no longer exists or has been
+moved without updating the reference. A dangling reference can for example occur, if you store a
+reference to an array element in a local variable and then ``.pop()`` from the containing array:
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity >=0.8.0 <0.9.0;
+
+    contract C {
+        uint[][] s;
+
+        function f() public {
+            // Stores a pointer to the last array element of s.
+            uint[] storage ptr = s[s.length - 1];
+            // Removes the last array element of s.
+            s.pop();
+            // Writes to the array element that is no longer within the array.
+            ptr.push(0x42);
+            // Adding a new element to ``s`` now will not add an empty array, but
+            // will result in an array of length 1 with ``0x42`` as element.
+            s.push();
+            assert(s[s.length - 1][0] == 0x42);
+        }
+    }
+
+The write in ``ptr.push(0x42)`` will **not** revert, despite the fact that ``ptr`` no
+longer refers to a valid element of ``s``. Since the compiler assumes that unused storage
+is always zeroed, a subsequent ``s.push()`` will not explicitly write zeroes to storage,
+so the last element of ``s`` after that ``push()`` will have length ``1`` and contain
+``0x42`` as its first element.
+
+Note that Solidity does not allow to declare references to value types in storage. These kinds
+of explicit dangling references are restricted to nested reference types. However, dangling references
+can also occur temporarily when using complex expressions in tuple assignments:
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity >=0.8.0 <0.9.0;
+
+    contract C {
+        uint[] s;
+        uint[] t;
+        constructor() {
+            // Push some initial values to the storage arrays.
+            s.push(0x07);
+            t.push(0x03);
+        }
+
+        function g() internal returns (uint[] storage) {
+            s.pop();
+            return t;
+        }
+
+        function f() public returns (uint[] memory) {
+            // The following will first evaluate ``s.push()`` to a reference to a new element
+            // at index 1. Afterwards, the call to ``g`` pops this new element, resulting in
+            // the left-most tuple element to become a dangling reference. The assignment still
+            // takes place and will write outside the data area of ``s``.
+            (s.push(), g()[0]) = (0x42, 0x17);
+            // A subsequent push to ``s`` will reveal the value written by the previous
+            // statement, i.e. the last element of ``s`` at the end of this function will have
+            // the value ``0x42``.
+            s.push();
+            return s;
+        }
+    }
+
+It is always safer to only assign to storage once per statement and to avoid
+complex expressions on the left-hand-side of an assignment.
+
+You need to take particular care when dealing with references to elements of
+``bytes`` arrays, since a ``.push()`` on a bytes array may switch :ref:`from short
+to long layout in storage<bytes-and-string>`.
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity >=0.8.0 <0.9.0;
+
+    contract C {
+        bytes x = "012345678901234567890123456789";
+
+        function test() external returns(uint) {
+            (x.push(), x.push()) = (0x01, 0x02);
+            return x.length;
+        }
+    }
+
+Here, when the first ``x.push()`` is evaluated, ``x`` is still stored in short
+layout, thereby ``x.push()`` returns a reference to an element in the first storage slot of
+``x``. However, the second ``x.push()`` switches the bytes array to large layout.
+Now the element that ``x.push()`` referred to is in the data area of the array while
+the reference still points at its original location, which is now a part of the length field
+and the assignment will effectively garble the length of ``x``.
+To be safe, only enlarge bytes arrays by at most one element during a single
+assignment and do not simultaneously index-access the array in the same statement.
+
+While the above describes the behaviour of dangling storage references in the
+current version of the compiler, any code with dangling references should be
+considered to have *undefined behaviour*. In particular, this means that
+any future version of the compiler may change the behaviour of code that
+involves dangling references.
+
+Be sure to avoid dangling references in your code!
+
 .. index:: ! array;slice
 
 .. _array-slices:

From d30b04674ea000c705749d0371e5086afdccec7a Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 14 Jun 2022 15:31:32 +0200
Subject: [PATCH 0686/1748] Add resolveUnaryTuples helper.

---
 libsolidity/analysis/ControlFlowBuilder.cpp |  7 ++-----
 libsolidity/ast/ASTUtils.cpp                | 10 ++++++++++
 libsolidity/ast/ASTUtils.h                  |  4 ++++
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/libsolidity/analysis/ControlFlowBuilder.cpp b/libsolidity/analysis/ControlFlowBuilder.cpp
index 7c568b18e1..06787a5120 100644
--- a/libsolidity/analysis/ControlFlowBuilder.cpp
+++ b/libsolidity/analysis/ControlFlowBuilder.cpp
@@ -17,6 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <libsolidity/analysis/ControlFlowBuilder.h>
+#include <libsolidity/ast/ASTUtils.h>
 #include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
@@ -617,11 +618,7 @@ bool ControlFlowBuilder::visit(VariableDeclarationStatement const& _variableDecl
 						solAssert(tupleExpression->components().size() > i, "");
 						expression = tupleExpression->components()[i].get();
 					}
-				while (auto tupleExpression = dynamic_cast<TupleExpression const*>(expression))
-					if (tupleExpression->components().size() == 1)
-						expression = tupleExpression->components().front().get();
-					else
-						break;
+				expression = resolveUnaryTuples(expression);
 				m_currentNode->variableOccurrences.emplace_back(
 					*var,
 					VariableOccurrence::Kind::Assignment,
diff --git a/libsolidity/ast/ASTUtils.cpp b/libsolidity/ast/ASTUtils.cpp
index 2b7ea74277..b4e75bace6 100644
--- a/libsolidity/ast/ASTUtils.cpp
+++ b/libsolidity/ast/ASTUtils.cpp
@@ -85,4 +85,14 @@ VariableDeclaration const* rootConstVariableDeclaration(VariableDeclaration cons
 	return rootDecl;
 }
 
+Expression const* resolveUnaryTuples(Expression const* _expr)
+{
+	while (auto const* tupleExpression = dynamic_cast<TupleExpression const*>(_expr))
+		if (tupleExpression->components().size() == 1)
+			_expr = tupleExpression->components().front().get();
+		else
+			break;
+	return _expr;
+}
+
 }
diff --git a/libsolidity/ast/ASTUtils.h b/libsolidity/ast/ASTUtils.h
index 2bfbb8fe9c..7ec79ef1b0 100644
--- a/libsolidity/ast/ASTUtils.h
+++ b/libsolidity/ast/ASTUtils.h
@@ -38,4 +38,8 @@ bool isConstantVariableRecursive(VariableDeclaration const& _varDecl);
 /// Returns the innermost AST node that covers the given location or nullptr if not found.
 ASTNode const* locateInnermostASTNode(int _offsetInFile, SourceUnit const& _sourceUnit);
 
+/// @returns @a _expr itself, in case it is not an unary tuple expression. Otherwise it descends recursively
+/// into unary tuples and returns the contained expression.
+Expression const* resolveUnaryTuples(Expression const* _expr);
+
 }

From 16245f7b9b86c1b524f4c5479c5694e91ff933de Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 14 Jun 2022 14:55:06 +0200
Subject: [PATCH 0687/1748] Warn about multiple assignments to storage byte
 pushes and fix warnings about multiple storage to storage copies.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 Changelog.md                                  |  1 +
 libsolidity/analysis/ControlFlowBuilder.cpp   |  2 +-
 libsolidity/analysis/TypeChecker.cpp          | 96 +++++++++++++++----
 libsolidity/ast/ASTUtils.cpp                  |  2 +-
 libsolidity/ast/ASTUtils.h                    |  4 +-
 .../array/bytes1_array_push_assign_multi.sol  | 14 +++
 .../array/bytes_assign_multi_fine.sol         |  8 ++
 .../array/bytes_push_assign_multi.sol         | 21 ++++
 .../warn_multiple_storage_storage_copies.sol  |  5 +
 9 files changed, 129 insertions(+), 24 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/array/bytes1_array_push_assign_multi.sol
 create mode 100644 test/libsolidity/syntaxTests/array/bytes_assign_multi_fine.sol
 create mode 100644 test/libsolidity/syntaxTests/array/bytes_push_assign_multi.sol

diff --git a/Changelog.md b/Changelog.md
index f85404b9d5..f6a8147e02 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,7 @@ Language Features:
 
 Compiler Features:
  * LSP: Add rudimentary support for semantic highlighting.
+ * Type Checker: Warn about assignments involving multiple pushes to storage ``bytes`` that may invalidate references.
  * Yul Optimizer: Improve inlining heuristics for via IR code generation and pure Yul compilation.
 
 
diff --git a/libsolidity/analysis/ControlFlowBuilder.cpp b/libsolidity/analysis/ControlFlowBuilder.cpp
index 06787a5120..1d1e33f506 100644
--- a/libsolidity/analysis/ControlFlowBuilder.cpp
+++ b/libsolidity/analysis/ControlFlowBuilder.cpp
@@ -618,7 +618,7 @@ bool ControlFlowBuilder::visit(VariableDeclarationStatement const& _variableDecl
 						solAssert(tupleExpression->components().size() > i, "");
 						expression = tupleExpression->components()[i].get();
 					}
-				expression = resolveUnaryTuples(expression);
+				expression = resolveOuterUnaryTuples(expression);
 				m_currentNode->variableOccurrences.emplace_back(
 					*var,
 					VariableOccurrence::Kind::Assignment,
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 7f31fb56fa..2467125d71 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -40,9 +40,10 @@
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
-#include <range/v3/view/zip.hpp>
-#include <range/v3/view/drop_exactly.hpp>
 #include <range/v3/algorithm/count_if.hpp>
+#include <range/v3/view/drop_exactly.hpp>
+#include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/zip.hpp>
 
 #include <memory>
 #include <vector>
@@ -105,26 +106,71 @@ bool TypeChecker::visit(ContractDefinition const& _contract)
 
 void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
 {
-	TupleType const& lhs = dynamic_cast<TupleType const&>(*type(_assignment.leftHandSide()));
-	TupleType const& rhs = dynamic_cast<TupleType const&>(*type(_assignment.rightHandSide()));
-
-	if (lhs.components().size() != rhs.components().size())
-	{
-		solAssert(m_errorReporter.hasErrors(), "");
-		return;
-	}
-
 	size_t storageToStorageCopies = 0;
 	size_t toStorageCopies = 0;
-	for (size_t i = 0; i < lhs.components().size(); ++i)
-	{
-		ReferenceType const* ref = dynamic_cast<ReferenceType const*>(lhs.components()[i]);
-		if (!ref || !ref->dataStoredIn(DataLocation::Storage) || ref->isPointer())
-			continue;
-		toStorageCopies++;
-		if (rhs.components()[i]->dataStoredIn(DataLocation::Storage))
-			storageToStorageCopies++;
-	}
+	size_t storageByteArrayPushes = 0;
+	size_t storageByteAccesses = 0;
+	auto count = [&](TupleExpression const& _lhs, TupleType const& _rhs, auto _recurse) -> void {
+		TupleType const& lhsType = dynamic_cast<TupleType const&>(*type(_lhs));
+
+		if (lhsType.components().size() != _rhs.components().size())
+		{
+			solAssert(m_errorReporter.hasErrors(), "");
+			return;
+		}
+
+		for (auto&& [index, componentType]: lhsType.components() | ranges::views::enumerate)
+		{
+			if (ReferenceType const* ref = dynamic_cast<ReferenceType const*>(componentType))
+			{
+				if (ref && ref->dataStoredIn(DataLocation::Storage) && !ref->isPointer())
+				{
+					toStorageCopies++;
+					if (_rhs.components()[index]->dataStoredIn(DataLocation::Storage))
+						storageToStorageCopies++;
+				}
+			}
+			else if (FixedBytesType const* bytesType = dynamic_cast<FixedBytesType const*>(componentType))
+			{
+				if (bytesType && bytesType->numBytes() == 1)
+				{
+					if (FunctionCall const* lhsCall = dynamic_cast<FunctionCall const*>(resolveOuterUnaryTuples(_lhs.components().at(index).get())))
+					{
+						FunctionType const& callType = dynamic_cast<FunctionType const&>(*type(lhsCall->expression()));
+						if (callType.kind() == FunctionType::Kind::ArrayPush)
+						{
+							ArrayType const& arrayType = dynamic_cast<ArrayType const&>(*callType.selfType());
+							if (arrayType.isByteArray() && arrayType.dataStoredIn(DataLocation::Storage))
+							{
+								++storageByteAccesses;
+								++storageByteArrayPushes;
+							}
+						}
+					}
+					else if (IndexAccess const* indexAccess = dynamic_cast<IndexAccess const*>(resolveOuterUnaryTuples(_lhs.components().at(index).get())))
+					{
+						if (ArrayType const* arrayType = dynamic_cast<ArrayType const*>(type(indexAccess->baseExpression())))
+							if (arrayType->isByteArray() && arrayType->dataStoredIn(DataLocation::Storage))
+								++storageByteAccesses;
+					}
+				}
+			}
+			else if (TupleType const* tupleType = dynamic_cast<TupleType const*>(componentType))
+				if (auto const* lhsNested = dynamic_cast<TupleExpression const*>(_lhs.components().at(index).get()))
+					if (auto const* rhsNestedType = dynamic_cast<TupleType const*>(_rhs.components().at(index)))
+						_recurse(
+							*lhsNested,
+							*rhsNestedType,
+							_recurse
+						);
+		}
+	};
+	count(
+		dynamic_cast<TupleExpression const&>(_assignment.leftHandSide()),
+		dynamic_cast<TupleType const&>(*type(_assignment.rightHandSide())),
+		count
+	);
+
 	if (storageToStorageCopies >= 1 && toStorageCopies >= 2)
 		m_errorReporter.warning(
 			7238_error,
@@ -134,6 +180,16 @@ void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
 			"is executed and thus may have unexpected effects. It is safer to perform the copies "
 			"separately or assign to storage pointers first."
 		);
+
+	if (storageByteArrayPushes >= 1 && storageByteAccesses >= 2)
+		m_errorReporter.warning(
+			7239_error,
+			_assignment.location(),
+			"This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. "
+			"When a bytes array is enlarged, it may transition from short storage layout to long storage layout, "
+			"which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single "
+			"operation, one element at a time."
+		);
 }
 
 TypePointers TypeChecker::typeCheckABIDecodeAndRetrieveReturnType(FunctionCall const& _functionCall, bool _abiEncoderV2)
diff --git a/libsolidity/ast/ASTUtils.cpp b/libsolidity/ast/ASTUtils.cpp
index b4e75bace6..27c0833d26 100644
--- a/libsolidity/ast/ASTUtils.cpp
+++ b/libsolidity/ast/ASTUtils.cpp
@@ -85,7 +85,7 @@ VariableDeclaration const* rootConstVariableDeclaration(VariableDeclaration cons
 	return rootDecl;
 }
 
-Expression const* resolveUnaryTuples(Expression const* _expr)
+Expression const* resolveOuterUnaryTuples(Expression const* _expr)
 {
 	while (auto const* tupleExpression = dynamic_cast<TupleExpression const*>(_expr))
 		if (tupleExpression->components().size() == 1)
diff --git a/libsolidity/ast/ASTUtils.h b/libsolidity/ast/ASTUtils.h
index 7ec79ef1b0..f6e3f0641d 100644
--- a/libsolidity/ast/ASTUtils.h
+++ b/libsolidity/ast/ASTUtils.h
@@ -38,8 +38,8 @@ bool isConstantVariableRecursive(VariableDeclaration const& _varDecl);
 /// Returns the innermost AST node that covers the given location or nullptr if not found.
 ASTNode const* locateInnermostASTNode(int _offsetInFile, SourceUnit const& _sourceUnit);
 
-/// @returns @a _expr itself, in case it is not an unary tuple expression. Otherwise it descends recursively
+/// @returns @a _expr itself, in case it is not a unary tuple expression. Otherwise it descends recursively
 /// into unary tuples and returns the contained expression.
-Expression const* resolveUnaryTuples(Expression const* _expr);
+Expression const* resolveOuterUnaryTuples(Expression const* _expr);
 
 }
diff --git a/test/libsolidity/syntaxTests/array/bytes1_array_push_assign_multi.sol b/test/libsolidity/syntaxTests/array/bytes1_array_push_assign_multi.sol
new file mode 100644
index 0000000000..dd7fcda97b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/array/bytes1_array_push_assign_multi.sol
@@ -0,0 +1,14 @@
+contract C {
+    bytes1[] x;
+    bytes1[] z;
+    function f() public {
+        (x.push(), x.push()) = (0, 0);
+        (((x.push())), (x.push())) = (0, 0);
+        ((x.push(), x.push()), x.push()) = ((0, 0), 0);
+        (x.push(), x[0]) = (0, 0);
+        bytes1[] storage y = x;
+        (x.push(), y.push()) = (0, 0);
+        (x.push(), z.push()) = (0, 0);
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/array/bytes_assign_multi_fine.sol b/test/libsolidity/syntaxTests/array/bytes_assign_multi_fine.sol
new file mode 100644
index 0000000000..1e954d1fb8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/array/bytes_assign_multi_fine.sol
@@ -0,0 +1,8 @@
+contract C {
+	bytes x;
+	function f() public {
+		(x[0], x[1]) = (0, 0);
+		(x[0], x[1]) = (x[1], x[0]);
+	}
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/array/bytes_push_assign_multi.sol b/test/libsolidity/syntaxTests/array/bytes_push_assign_multi.sol
new file mode 100644
index 0000000000..320e939638
--- /dev/null
+++ b/test/libsolidity/syntaxTests/array/bytes_push_assign_multi.sol
@@ -0,0 +1,21 @@
+contract C {
+    bytes x;
+    bytes z;
+    function f() public {
+        (x.push(), x.push()) = (0, 0);
+        (((x.push())), (x.push())) = (0, 0);
+        ((x.push(), x.push()), x.push()) = ((0, 0), 0);
+        (x.push(), x[0]) = (0, 0);
+        bytes storage y = x;
+        (x.push(), y.push()) = (0, 0);
+        // The following is a false positive.
+        (x.push(), z.push()) = (0, 0);
+    }
+}
+// ----
+// Warning 7239: (73-102): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
+// Warning 7239: (112-147): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
+// Warning 7239: (157-203): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
+// Warning 7239: (213-238): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
+// Warning 7239: (277-306): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
+// Warning 7239: (362-391): This assignment involves multiple accesses to a bytes array in storage while simultaneously enlarging it. When a bytes array is enlarged, it may transition from short storage layout to long storage layout, which invalidates all references to its elements. It is safer to only enlarge byte arrays in a single operation, one element at a time.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol b/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol
index 102bbea686..e35d361d21 100644
--- a/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol
+++ b/test/libsolidity/syntaxTests/tupleAssignments/warn_multiple_storage_storage_copies.sol
@@ -4,6 +4,11 @@ contract C {
 	function f() public {
 		(x, y) = (y, x);
 	}
+	function g() public {
+		uint z;
+		((x, y), z) = ((y, x), 0);
+	}
 }
 // ----
 // Warning 7238: (79-94): This assignment performs two copies to storage. Since storage copies do not first copy to a temporary location, one of them might be overwritten before the second is executed and thus may have unexpected effects. It is safer to perform the copies separately or assign to storage pointers first.
+// Warning 7238: (134-159): This assignment performs two copies to storage. Since storage copies do not first copy to a temporary location, one of them might be overwritten before the second is executed and thus may have unexpected effects. It is safer to perform the copies separately or assign to storage pointers first.

From 3f112280f8b315e98cd019d4c9bfac631cdfe8ef Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 Jun 2022 14:52:37 +0200
Subject: [PATCH 0688/1748] Add warning comment to dangling references docs.

---
 docs/types/reference-types.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index 3502df1abd..911a12eecb 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -555,6 +555,7 @@ to long layout in storage<bytes-and-string>`.
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0 <0.9.0;
 
+    // This will report a warning
     contract C {
         bytes x = "012345678901234567890123456789";
 

From 14d0776c9424827ab047f001b9ee86fe5e255065 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 Jun 2022 14:41:44 +0200
Subject: [PATCH 0689/1748] Set release date for 0.8.15.

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index f6a8147e02..275ac3e848 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.15 (unreleased)
+### 0.8.15 (2022-06-15)
 
 Important Bugfixes:
  * Code Generation: Avoid writing dirty bytes to storage when copying ``bytes`` arrays.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 82eaa81417..c11f32e19c 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1716,6 +1716,10 @@
         ],
         "released": "2022-05-17"
     },
+    "0.8.15": {
+        "bugs": [],
+        "released": "2022-06-15"
+    },
     "0.8.2": {
         "bugs": [
             "DirtyBytesArrayToStorage",

From 1e8faa8e83330b2e59bf9ac834cd28843588724a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 15 Jun 2022 18:03:14 +0200
Subject: [PATCH 0690/1748] CI: Fix binary naming for solc-bin

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 53636d149e..49f6f20854 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1529,10 +1529,10 @@ jobs:
 
             mkdir -p solc-bin/{linux-amd64,macosx-amd64,windows-amd64,bin}
 
-            mv github/solc-static-linux "solc-bin/linux-amd64/solc-linux-amd64-${full_version}"
-            mv github/solc-macos        "solc-bin/macosx-amd64/solc-macosx-amd64-${full_version}"
-            mv github/solc-windows.exe  "solc-bin/windows-amd64/solc-windows-amd64-${full_version}.exe"
-            mv github/soljson.js        "solc-bin/bin/soljson-${full_version}.js"
+            mv github/solc-static-linux "solc-bin/linux-amd64/solc-linux-amd64-v${full_version}"
+            mv github/solc-macos        "solc-bin/macosx-amd64/solc-macosx-amd64-v${full_version}"
+            mv github/solc-windows.exe  "solc-bin/windows-amd64/solc-windows-amd64-v${full_version}.exe"
+            mv github/soljson.js        "solc-bin/bin/soljson-v${full_version}.js"
 
             cd solc-bin/
             tar --create --file ../solc-bin-binaries.tar *

From 51e0ae514cd81255dc433a2701e20bdc6f26238d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 15 Jun 2022 18:04:47 +0200
Subject: [PATCH 0691/1748] ReleaseChecklist: Use the correct name for
 `c_release_binaries`

---
 ReleaseChecklist.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index df72de4eee..6d07ae011c 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -31,9 +31,9 @@
  - [ ] Create the ``prerelease.txt`` file: (``echo -n > prerelease.txt``).
  - [ ] Run ``scripts/create_source_tarball.sh`` while being on the tag to create the source tarball. This will create the tarball in a directory called ``upload``.
  - [ ] Take the tarball from the upload directory (its name should be ``solidity_x.x.x.tar.gz``, otherwise ``prerelease.txt`` was missing in the step before) and upload the source tarball to the release page.
- - [ ] Take the ``github-binaries.tar`` tarball from ``b_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to the release page.
+ - [ ] Take the ``github-binaries.tar`` tarball from ``c_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to the release page.
    Make sure it contains four binaries: ``solc-windows.exe``, ``solc-macos``, ``solc-static-linux`` and ``soljson.js``.
- - [ ] Take the ``solc-bin-binaries.tar`` tarball from ``b_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to solc-bin.
+ - [ ] Take the ``solc-bin-binaries.tar`` tarball from ``c_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to solc-bin.
  - [ ] Run ``./update --reuse-hashes`` in ``solc-bin`` and verify that the script has updated ``list.js``, ``list.txt`` and ``list.json`` files correctly and that symlinks to the new release have been added in ``solc-bin/wasm/`` and ``solc-bin/emscripten-wasm32/``.
  - [ ] Create a pull request in solc-bin and merge.
 

From 60004acfe90663e3617e1a34b57bf70b2c650b1f Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 Jun 2022 18:32:15 +0200
Subject: [PATCH 0692/1748] Set version to 0.8.16.

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4265203833..0662d118b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.15")
+set(PROJECT_VERSION "0.8.16")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 275ac3e848..660f13c9c5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.16 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.15 (2022-06-15)
 
 Important Bugfixes:

From 080d2f78684800842f59b3dcadcb11269da35cc7 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 Jun 2022 17:48:06 +0200
Subject: [PATCH 0693/1748] Fix release ppa script.

---
 scripts/deps-ppa/static_z3.sh | 2 +-
 scripts/release_ppa.sh        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index 6fd353ad81..a2a632cc2e 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -27,7 +27,7 @@ email=builds@ethereum.org
 packagename=z3-static
 version=4.8.17
 
-DISTRIBUTIONS="focal impish jammy"
+DISTRIBUTIONS="focal impish jammy kinetic"
 
 for distribution in $DISTRIBUTIONS
 do
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index fe1efda27a..8daf91c8d7 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -48,7 +48,7 @@ else
 fi
 
 is_release() {
-    [[ "${branch}" = "release" ]] || [[ "${branch}" =~ ^v[0-9]+(\.[0-9])*$ ]]
+    [[ "${branch}" =~ ^v[0-9]+(\.[0-9]+)*$ ]]
 }
 
 keyid=379F4801D622CDCF
@@ -57,7 +57,7 @@ packagename=solc
 
 static_build_distribution=impish
 
-DISTRIBUTIONS="focal impish jammy"
+DISTRIBUTIONS="focal impish jammy kinetic"
 
 if is_release
 then

From 697821b96bd973dedbf0ed8c885eb92283a287ac Mon Sep 17 00:00:00 2001
From: Midhun07 <midhun0407@gmail.com>
Date: Mon, 1 Nov 2021 19:17:30 +0530
Subject: [PATCH 0694/1748] Disallowed --metadata-literal,
 --model-checker-show-unproved, --model-checker-div-mod-no-slacks
 ----metadata-hash=swarm outside of compiler mode

---
 Changelog.md                    |  1 +
 solc/CommandLineParser.cpp      | 18 +++++++++++--
 test/solc/CommandLineParser.cpp | 46 ++++++++++++---------------------
 3 files changed, 33 insertions(+), 32 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 660f13c9c5..0f5e127b40 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
 
 
 ### 0.8.15 (2022-06-15)
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 1a3fbed0ee..9b4490875a 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -911,12 +911,26 @@ void CommandLineParser::processArgs()
 		// TODO: This should eventually contain all options.
 		{g_strErrorRecovery, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strExperimentalViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}}
+		{g_strViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strMetadataLiteral, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strMetadataHash, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerShowUnproved, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerDivModNoSlacks, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerEngine, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerInvariants, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerSolvers, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerTimeout, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerContracts, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerTargets, {InputMode::Compiler, InputMode::CompilerWithASTImport}}
 	};
 	vector<string> invalidOptionsForCurrentInputMode;
 	for (auto const& [optionName, inputModes]: validOptionInputModeCombinations)
 	{
-		if (m_args.count(optionName) > 0 && inputModes.count(m_options.input.mode) == 0)
+		if (
+			m_args.count(optionName) > 0 &&
+			inputModes.count(m_options.input.mode) == 0 &&
+			!m_args[optionName].defaulted()
+		)
 			invalidOptionsForCurrentInputMode.push_back(optionName);
 	}
 
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 22b3bd8355..47eda71ad3 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -281,20 +281,6 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 			"--libraries="
 				"dir1/file1.sol:L=0x1234567890123456789012345678901234567890,"
 				"dir2/file2.sol:L=0x1111122222333334444455555666667777788888",
-			"--metadata-hash=swarm",       // Ignored in assembly mode
-			"--metadata-literal",          // Ignored in assembly mode
-			"--model-checker-contracts="   // Ignored in assembly mode
-				"contract1.yul:A,"
-				"contract2.yul:B",
-			"--model-checker-div-mod-no-slacks", // Ignored in assembly mode
-			"--model-checker-engine=bmc",  // Ignored in assembly mode
-			"--model-checker-invariants=contract,reentrancy",  // Ignored in assembly mode
-			"--model-checker-show-unproved", // Ignored in assembly mode
-			"--model-checker-solvers=z3,smtlib2", // Ignored in assembly mode
-			"--model-checker-targets="     // Ignored in assembly mode
-				"underflow,"
-				"divByZero",
-			"--model-checker-timeout=5",   // Ignored in assembly mode
 			"--asm",
 			"--bin",
 			"--ir-optimized",
@@ -378,20 +364,6 @@ BOOST_AUTO_TEST_CASE(standard_json_mode_options)
 			"dir2/file2.sol:L=0x1111122222333334444455555666667777788888",
 		"--gas",                           // Accepted but has no effect in Standard JSON mode
 		"--combined-json=abi,bin",         // Accepted but has no effect in Standard JSON mode
-		"--metadata-hash=swarm",           // Ignored in Standard JSON mode
-		"--metadata-literal",              // Ignored in Standard JSON mode
-		"--model-checker-contracts="       // Ignored in Standard JSON mode
-			"contract1.yul:A,"
-			"contract2.yul:B",
-		"--model-checker-div-mod-no-slacks", // Ignored in Standard JSON mode
-		"--model-checker-engine=bmc",      // Ignored in Standard JSON mode
-		"--model-checker-invariants=contract,reentrancy",      // Ignored in Standard JSON mode
-		"--model-checker-show-unproved",      // Ignored in Standard JSON mode
-		"--model-checker-solvers=z3,smtlib2", // Ignored in Standard JSON mode
-		"--model-checker-targets="         // Ignored in Standard JSON mode
-			"underflow,"
-			"divByZero",
-		"--model-checker-timeout=5",       // Ignored in Standard JSON mode
 	};
 
 	CommandLineOptions expectedOptions;
@@ -424,16 +396,30 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 		// TODO: This should eventually contain all options.
 		{"--error-recovery", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--experimental-via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
-		{"--via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}}
+		{"--via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--metadata-literal", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--metadata-hash=swarm", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-show-unproved", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-div-mod-no-slacks", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-engine=bmc", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-invariants=contract,reentrancy", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-solvers=z3,smtlib2", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-timeout=5", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-contracts=contract1.yul:A,contract2.yul:B", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-targets=underflow,divByZero", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}}
 	};
 
 	for (auto const& [optionName, inputModes]: invalidOptionInputModeCombinations)
 		for (string const& inputMode: inputModes)
 		{
 			stringstream serr;
+			size_t separatorPosition = optionName.find("=");
+			string optionNameWithoutValue = optionName.substr(0, separatorPosition);
+			soltestAssert(!optionNameWithoutValue.empty());
+
 			vector<string> commandLine = {"solc", optionName, "file", inputMode};
 
-			string expectedMessage = "The following options are not supported in the current input mode: " + optionName;
+			string expectedMessage = "The following options are not supported in the current input mode: " + optionNameWithoutValue;
 			auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedMessage; };
 
 			BOOST_CHECK_EXCEPTION(parseCommandLine(commandLine), CommandLineValidationError, hasCorrectMessage);

From 3b2c6de61ca4ba940e82f546e9db2e4d029bf8a1 Mon Sep 17 00:00:00 2001
From: Ryan <ryan.guo99@gmail.com>
Date: Mon, 11 Apr 2022 21:45:20 -0500
Subject: [PATCH 0695/1748] Propagate purity information for member access to
 foreign pure variables

---
 Changelog.md                                  |  2 +-
 libsolidity/analysis/TypeChecker.cpp          |  7 ++++
 ...stant_variables_as_static_array_length.sol | 29 +++++++++++++++
 ...stant_with_dependencies_as_array_sizes.sol | 35 +++++++++++++++++++
 ...onstant_with_dependencies_on_constants.sol | 25 +++++++++++++
 ...h_dependencies_on_file_level_constants.sol | 11 ++++++
 ...encies_on_library_constants_multi_file.sol | 17 +++++++++
 ..._dependency_file_and_library_constants.sol | 15 ++++++++
 .../cyclic_dependency_file_constants.sol      | 13 +++++++
 .../cyclic_dependency_library_constants.sol   | 11 ++++++
 10 files changed, 164 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/constants/constant_variables_as_static_array_length.sol
 create mode 100644 test/libsolidity/syntaxTests/constants/constant_with_dependencies_as_array_sizes.sol
 create mode 100644 test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_constants.sol
 create mode 100644 test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_file_level_constants.sol
 create mode 100644 test/libsolidity/syntaxTests/constants/constants_with_dependencies_on_library_constants_multi_file.sol
 create mode 100644 test/libsolidity/syntaxTests/constants/cyclic_dependency_file_and_library_constants.sol
 create mode 100644 test/libsolidity/syntaxTests/constants/cyclic_dependency_file_constants.sol
 create mode 100644 test/libsolidity/syntaxTests/constants/cyclic_dependency_library_constants.sol

diff --git a/Changelog.md b/Changelog.md
index 660f13c9c5..bfe994da68 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,7 +4,7 @@ Language Features:
 
 
 Compiler Features:
-
+ * TypeChecker: Support using library constants in initializers of other constants.
 
 Bugfixes:
 
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 2467125d71..ae27741a85 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3214,6 +3214,13 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 
 			annotation.isPure = isPure;
 		}
+	if (
+		auto const* varDecl = dynamic_cast<VariableDeclaration const*>(annotation.referencedDeclaration);
+		!annotation.isPure.set() &&
+		varDecl &&
+		varDecl->isConstant()
+	)
+		annotation.isPure = true;
 
 	if (auto magicType = dynamic_cast<MagicType const*>(exprType))
 	{
diff --git a/test/libsolidity/syntaxTests/constants/constant_variables_as_static_array_length.sol b/test/libsolidity/syntaxTests/constants/constant_variables_as_static_array_length.sol
new file mode 100644
index 0000000000..19e8bfee21
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/constant_variables_as_static_array_length.sol
@@ -0,0 +1,29 @@
+uint256 constant MAX = 1;
+
+library L1 {
+    uint256 internal constant INT = 100;
+}
+
+contract C1 {
+    uint256 internal constant CONST1 = L1.INT;
+
+    uint256[L1.INT] internal arr1; // error, backward reference
+    uint256[L2.INT] internal arr2; // error, forward reference
+}
+
+contract C2 is C1 {
+    uint256 internal constant CONST2 = CONST1;
+
+    uint256[CONST1] internal arr3; // error, inherited constants
+    uint256[CONST2] internal arr4; // error, same contract constant
+}
+
+library L2 {
+    uint256 internal constant INT = 100;
+}
+
+// ----
+// TypeError 5462: (158-164): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (222-228): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (356-362): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (421-427): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/constants/constant_with_dependencies_as_array_sizes.sol b/test/libsolidity/syntaxTests/constants/constant_with_dependencies_as_array_sizes.sol
new file mode 100644
index 0000000000..a2a1ce20ee
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/constant_with_dependencies_as_array_sizes.sol
@@ -0,0 +1,35 @@
+uint256 constant MAX = 1;
+
+library L1 {
+    uint256 internal constant INT = 100;
+}
+
+contract C1 {
+    uint256 internal constant CONST = 20 + L2.INT; // forward reference
+    uint256 internal constant LIMIT = MAX * L1.INT;  // same file & external library constant
+    uint256 internal constant NESTED = LIMIT + CONST; // nested & same contract constant
+
+    uint256[L1.INT] internal arr1; // error, backward reference
+    uint256[L2.INT] internal arr2; // error, forward reference
+}
+
+contract C2 is C1 {
+    uint256 internal constant INHERITED = NESTED + CONST * LIMIT; // inherited constants
+}
+
+contract C3 is C2 {
+    uint256 internal constant NESTED_INHERITED = INHERITED + NESTED + CONST * LIMIT; // nest-inherited constants
+
+    uint256[CONST] internal arr3;            // error, nest-inherited constants
+    uint256[NESTED_INHERITED] internal arr4; // error, same contract constant
+}
+
+library L2 {
+    uint256 internal constant INT = 100;
+}
+
+// ----
+// TypeError 5462: (366-372): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (430-436): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (742-747): Invalid array length, expected integer literal or constant expression.
+// TypeError 5462: (822-838): Invalid array length, expected integer literal or constant expression.
diff --git a/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_constants.sol b/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_constants.sol
new file mode 100644
index 0000000000..964ffb5f2b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_constants.sol
@@ -0,0 +1,25 @@
+uint256 constant MAX = 1;
+
+library L1 {
+    uint256 internal constant INT = 100;
+}
+
+contract C1 {
+    uint256 internal constant CONST = 20 + L2.INT; // forward reference
+    uint256 internal constant LIMIT = MAX * L1.INT;  // same file & external library constant
+    uint256 internal constant NESTED = LIMIT + CONST; // nested & same contract constant
+}
+
+contract C2 is C1 {
+    uint256 internal constant INHERITED = NESTED + CONST * LIMIT; // inherited constants
+}
+
+contract C3 is C2 {
+    uint256 internal constant NESTED_INHERITED = INHERITED + NESTED + CONST * LIMIT; // nest-inherited constants
+}
+
+library L2 {
+    uint256 internal constant INT = 100;
+}
+
+// ----
diff --git a/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_file_level_constants.sol b/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_file_level_constants.sol
new file mode 100644
index 0000000000..9bb1723e7e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/constant_with_dependencies_on_file_level_constants.sol
@@ -0,0 +1,11 @@
+==== Source: A.sol ====
+import "B.sol" as B;
+
+uint constant X = 1;
+uint constant Y = B.Y;
+
+==== Source: B.sol ====
+import "A.sol" as A;
+
+uint constant X = A.X;
+uint constant Y = 2;
diff --git a/test/libsolidity/syntaxTests/constants/constants_with_dependencies_on_library_constants_multi_file.sol b/test/libsolidity/syntaxTests/constants/constants_with_dependencies_on_library_constants_multi_file.sol
new file mode 100644
index 0000000000..4518a510a6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/constants_with_dependencies_on_library_constants_multi_file.sol
@@ -0,0 +1,17 @@
+==== Source: A.sol ====
+import "B.sol";
+
+library L {
+    uint constant X = 1;
+    uint constant Y = K.Y;
+}
+
+==== Source: B.sol ====
+import "A.sol";
+
+library K {
+    uint constant X = L.X;
+    uint constant Y = 2;
+}
+
+// ====
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_and_library_constants.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_and_library_constants.sol
new file mode 100644
index 0000000000..92f5dfce6b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_and_library_constants.sol
@@ -0,0 +1,15 @@
+==== Source: A.sol ====
+import "B.sol";
+
+uint256 constant A = B.VAL + 1;
+
+==== Source: B.sol ====
+import "A.sol";
+
+library B {
+    uint256 constant VAL = A + 1;
+}
+
+// ----
+// TypeError 6161: (B.sol:33-61): The value of the constant VAL has a cyclic dependency via A.
+// TypeError 6161: (A.sol:17-47): The value of the constant A has a cyclic dependency via VAL.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_constants.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_constants.sol
new file mode 100644
index 0000000000..d874abba7d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/cyclic_dependency_file_constants.sol
@@ -0,0 +1,13 @@
+==== Source: A.sol ====
+import "B.sol";
+
+uint256 constant A = B + 1;
+
+==== Source: B.sol ====
+import "A.sol";
+
+uint256 constant B = A + 1;
+
+// ----
+// TypeError 6161: (B.sol:17-43): The value of the constant B has a cyclic dependency via A.
+// TypeError 6161: (A.sol:17-43): The value of the constant A has a cyclic dependency via B.
diff --git a/test/libsolidity/syntaxTests/constants/cyclic_dependency_library_constants.sol b/test/libsolidity/syntaxTests/constants/cyclic_dependency_library_constants.sol
new file mode 100644
index 0000000000..d72ea0a666
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/cyclic_dependency_library_constants.sol
@@ -0,0 +1,11 @@
+library A {
+    uint256 constant VAL = B.VAL + 1;
+}
+
+library B {
+    uint256 constant VAL = A.VAL + 1;
+}
+
+// ----
+// TypeError 6161: (16-48): The value of the constant VAL has a cyclic dependency via VAL.
+// TypeError 6161: (69-101): The value of the constant VAL has a cyclic dependency via VAL.

From cdf243a9af098737e656a27365d0e242a3ab808a Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 9 Jun 2022 15:39:58 +0200
Subject: [PATCH 0696/1748] Improved array copy routine for value type arrays
 from memory or calldata to storage.

---
 Changelog.md                             |   3 +
 libsolidity/codegen/YulUtilFunctions.cpp | 145 +++++++++++++----------
 libsolidity/codegen/YulUtilFunctions.h   |   6 +-
 3 files changed, 87 insertions(+), 67 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c1529a3360..6bc2f8af4c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,8 @@ Language Features:
 
 Compiler Features:
  * TypeChecker: Support using library constants in initializers of other constants.
+ * Yul IR Code Generation: Improved copy routines for arrays with packed storage layout.
+
 
 Bugfixes:
  * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
@@ -30,6 +32,7 @@ Compiler Features:
 Bugfixes:
  * ABI Encoder: When encoding an empty string coming from storage do not add a superfluous empty slot for data.
  * Common Subexpression Eliminator: Process assembly items in chunks with maximum size of 2000. It helps to avoid extremely time-consuming searches during code optimization.
+ * Yul IR Code Generation: More robust cleanup in corner cases during memory to storage copies.
  * Yul Optimizer: Do not remove ``returndatacopy`` in cases in which it might perform out-of-bounds reads that unconditionally revert as out-of-gas. Previously, any ``returndatacopy`` that wrote to memory that was never read from was removed without accounting for the out-of-bounds condition.
 
 
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 23f41efd2d..4b1f8024d8 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -1797,8 +1797,11 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 
 	if (_fromType.isByteArrayOrString())
 		return copyByteArrayToStorageFunction(_fromType, _toType);
-	if (_fromType.dataStoredIn(DataLocation::Storage) && _toType.baseType()->isValueType())
-		return copyValueArrayStorageToStorageFunction(_fromType, _toType);
+	if (_toType.baseType()->isValueType())
+		return copyValueArrayToStorageFunction(_fromType, _toType);
+
+	solAssert(_toType.storageStride() == 32);
+	solAssert(!_fromType.baseType()->isValueType());
 
 	string functionName = "copy_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
 	return m_functionCollector.createFunction(functionName, [&](){
@@ -1812,7 +1815,6 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 				let srcPtr := <srcDataLocation>(value)
 
 				let elementSlot := <dstDataLocation>(slot)
-				let elementOffset := 0
 
 				for { let i := 0 } lt(i, length) {i := add(i, 1)} {
 					<?fromCalldata>
@@ -1822,10 +1824,6 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 						<!dynamicallyEncodedBase>
 							srcPtr
 						</dynamicallyEncodedBase>
-
-						<?isValueType>
-							<elementValues> := <readFromCalldataOrMemory>(<elementValues>)
-						</isValueType>
 					</fromCalldata>
 
 					<?fromMemory>
@@ -1836,19 +1834,11 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 						let <elementValues> := srcPtr
 					</fromStorage>
 
-					<updateStorageValue>(elementSlot, elementOffset, <elementValues>)
+					<updateStorageValue>(elementSlot, <elementValues>)
 
 					srcPtr := add(srcPtr, <srcStride>)
 
-					<?multipleItemsPerSlot>
-						elementOffset := add(elementOffset, <storageStride>)
-						if gt(elementOffset, sub(32, <storageStride>)) {
-							elementOffset := 0
-							elementSlot := add(elementSlot, 1)
-						}
-					<!multipleItemsPerSlot>
-						elementSlot := add(elementSlot, <storageSize>)
-					</multipleItemsPerSlot>
+					elementSlot := add(elementSlot, <storageSize>)
 				}
 			}
 		)");
@@ -1870,7 +1860,6 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 		}
 		templ("resizeArray", resizeArrayFunction(_toType));
 		templ("arrayLength",arrayLengthFunction(_fromType));
-		templ("isValueType", _fromType.baseType()->isValueType());
 		templ("dstDataLocation", arrayDataAreaFunction(_toType));
 		if (fromMemory || (fromCalldata && _fromType.baseType()->isValueType()))
 			templ("readFromCalldataOrMemory", readFromMemoryOrCalldata(*_fromType.baseType(), fromCalldata));
@@ -1879,7 +1868,7 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 			0,
 			_fromType.baseType()->stackItems().size()
 		));
-		templ("updateStorageValue", updateStorageValueFunction(*_fromType.baseType(), *_toType.baseType()));
+		templ("updateStorageValue", updateStorageValueFunction(*_fromType.baseType(), *_toType.baseType(), 0));
 		templ("srcStride",
 			fromCalldata ?
 			to_string(_fromType.calldataStride()) :
@@ -1887,8 +1876,6 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 				to_string(_fromType.memoryStride()) :
 				formatNumber(_fromType.baseType()->storageSize())
 		);
-		templ("multipleItemsPerSlot", _toType.storageStride() <= 16);
-		templ("storageStride", to_string(_toType.storageStride()));
 		templ("storageSize", _toType.baseType()->storageSize().str());
 
 		return templ.render();
@@ -1973,8 +1960,7 @@ string YulUtilFunctions::copyByteArrayToStorageFunction(ArrayType const& _fromTy
 	});
 }
 
-
-string YulUtilFunctions::copyValueArrayStorageToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
+string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
 {
 	solAssert(_fromType.baseType()->isValueType(), "");
 	solAssert(_toType.baseType()->isValueType(), "");
@@ -1982,7 +1968,6 @@ string YulUtilFunctions::copyValueArrayStorageToStorageFunction(ArrayType const&
 
 	solAssert(!_fromType.isByteArrayOrString(), "");
 	solAssert(!_toType.isByteArrayOrString(), "");
-	solAssert(_fromType.dataStoredIn(DataLocation::Storage), "");
 	solAssert(_toType.dataStoredIn(DataLocation::Storage), "");
 
 	solAssert(_fromType.storageStride() <= _toType.storageStride(), "");
@@ -1991,32 +1976,41 @@ string YulUtilFunctions::copyValueArrayStorageToStorageFunction(ArrayType const&
 	string functionName = "copy_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
 	return m_functionCollector.createFunction(functionName, [&](){
 		Whiskers templ(R"(
-			function <functionName>(dst, src) {
+			function <functionName>(dst, src<?isFromDynamicCalldata>, len</isFromDynamicCalldata>) {
+				<?isFromStorage>
 				if eq(dst, src) { leave }
-				let length := <arrayLength>(src)
+				</isFromStorage>
+				let length := <arrayLength>(src<?isFromDynamicCalldata>, len</isFromDynamicCalldata>)
 				// Make sure array length is sane
 				if gt(length, 0xffffffffffffffff) { <panic>() }
 				<resizeArray>(dst, length)
 
-				let srcSlot := <srcDataLocation>(src)
+				let srcPtr := <srcDataLocation>(src)
 				let dstSlot := <dstDataLocation>(dst)
 
 				let fullSlots := div(length, <itemsPerSlot>)
 
-				let srcSlotValue := sload(srcSlot)
+				<?isFromStorage>
+				let srcSlotValue := sload(srcPtr)
 				let srcItemIndexInSlot := 0
+				</isFromStorage>
+
 				for { let i := 0 } lt(i, fullSlots) { i := add(i, 1) } {
 					let dstSlotValue := 0
-					<?sameType>
+					<?sameTypeFromStorage>
 						dstSlotValue := <maskFull>(srcSlotValue)
-						<updateSrcSlotValue>
-					<!sameType>
+						<updateSrcPtr>
+					<!sameTypeFromStorage>
 						<?multipleItemsPerSlotDst>for { let j := 0 } lt(j, <itemsPerSlot>) { j := add(j, 1) } </multipleItemsPerSlotDst>
 						{
-							let itemValue := <convert>(
+							<?isFromStorage>
+							let <elementValues> := <convert>(
 								<extractFromSlot>(srcSlotValue, mul(<srcStride>, srcItemIndexInSlot))
 							)
-							itemValue := <prepareStore>(itemValue)
+							<!isFromStorage>
+							let <elementValues> := <readFromCalldataOrMemory>(srcPtr)
+							</isFromStorage>
+							let itemValue := <prepareStore>(<elementValues>)
 							dstSlotValue :=
 							<?multipleItemsPerSlotDst>
 								<updateByteSlice>(dstSlotValue, mul(<dstStride>, j), itemValue)
@@ -2024,9 +2018,9 @@ string YulUtilFunctions::copyValueArrayStorageToStorageFunction(ArrayType const&
 								itemValue
 							</multipleItemsPerSlotDst>
 
-							<updateSrcSlotValue>
+							<updateSrcPtr>
 						}
-					</sameType>
+					</sameTypeFromStorage>
 
 					sstore(add(dstSlot, i), dstSlotValue)
 				}
@@ -2035,20 +2029,24 @@ string YulUtilFunctions::copyValueArrayStorageToStorageFunction(ArrayType const&
 					let spill := sub(length, mul(fullSlots, <itemsPerSlot>))
 					if gt(spill, 0) {
 						let dstSlotValue := 0
-						<?sameType>
+						<?sameTypeFromStorage>
 							dstSlotValue := <maskBytes>(srcSlotValue, mul(spill, <srcStride>))
-							<updateSrcSlotValue>
-						<!sameType>
+							<updateSrcPtr>
+						<!sameTypeFromStorage>
 							for { let j := 0 } lt(j, spill) { j := add(j, 1) } {
-								let itemValue := <convert>(
+								<?isFromStorage>
+								let <elementValues> := <convert>(
 									<extractFromSlot>(srcSlotValue, mul(<srcStride>, srcItemIndexInSlot))
 								)
-								itemValue := <prepareStore>(itemValue)
+								<!isFromStorage>
+								let <elementValues> := <readFromCalldataOrMemory>(srcPtr)
+								</isFromStorage>
+								let itemValue := <prepareStore>(<elementValues>)
 								dstSlotValue := <updateByteSlice>(dstSlotValue, mul(<dstStride>, j), itemValue)
 
-								<updateSrcSlotValue>
+								<updateSrcPtr>
 							}
-						</sameType>
+						</sameTypeFromStorage>
 						sstore(add(dstSlot, fullSlots), dstSlotValue)
 					}
 				</multipleItemsPerSlotDst>
@@ -2056,26 +2054,37 @@ string YulUtilFunctions::copyValueArrayStorageToStorageFunction(ArrayType const&
 		)");
 		if (_fromType.dataStoredIn(DataLocation::Storage))
 			solAssert(!_fromType.isValueType(), "");
+
+		bool fromCalldata = _fromType.dataStoredIn(DataLocation::CallData);
+		bool fromStorage = _fromType.dataStoredIn(DataLocation::Storage);
 		templ("functionName", functionName);
 		templ("resizeArray", resizeArrayFunction(_toType));
 		templ("arrayLength", arrayLengthFunction(_fromType));
 		templ("panic", panicFunction(PanicCode::ResourceError));
+		templ("isFromDynamicCalldata", _fromType.isDynamicallySized() && fromCalldata);
+		templ("isFromStorage", fromStorage);
+		templ("readFromCalldataOrMemory", readFromMemoryOrCalldata(*_fromType.baseType(), fromCalldata));
 		templ("srcDataLocation", arrayDataAreaFunction(_fromType));
 		templ("dstDataLocation", arrayDataAreaFunction(_toType));
 		templ("srcStride", to_string(_fromType.storageStride()));
+		templ("elementValues", suffixedVariableNameList(
+			"elementValue_",
+			0,
+			_fromType.baseType()->stackItems().size()
+		));
 		unsigned itemsPerSlot = 32 / _toType.storageStride();
 		templ("itemsPerSlot", to_string(itemsPerSlot));
 		templ("multipleItemsPerSlotDst", itemsPerSlot > 1);
-		bool sameType = *_fromType.baseType() == *_toType.baseType();
+		bool sameTypeFromStorage = fromStorage && (*_fromType.baseType() == *_toType.baseType());
 		if (auto functionType = dynamic_cast<FunctionType const*>(_fromType.baseType()))
 		{
 			solAssert(functionType->equalExcludingStateMutability(
 				dynamic_cast<FunctionType const&>(*_toType.baseType())
 			));
-			sameType = true;
+			sameTypeFromStorage = fromStorage;
 		}
-		templ("sameType", sameType);
-		if (sameType)
+		templ("sameTypeFromStorage", sameTypeFromStorage);
+		if (sameTypeFromStorage)
 		{
 			templ("maskFull", maskLowerOrderBytesFunction(itemsPerSlot * _toType.storageStride()));
 			templ("maskBytes", maskLowerOrderBytesFunctionDynamic());
@@ -2088,24 +2097,32 @@ string YulUtilFunctions::copyValueArrayStorageToStorageFunction(ArrayType const&
 			templ("convert", conversionFunction(*_fromType.baseType(), *_toType.baseType()));
 			templ("prepareStore", prepareStoreFunction(*_toType.baseType()));
 		}
-		templ("updateSrcSlotValue", Whiskers(R"(
-			<?srcReadMultiPerSlot>
-				srcItemIndexInSlot := add(srcItemIndexInSlot, 1)
-				if eq(srcItemIndexInSlot, <srcItemsPerSlot>) {
-					// here we are done with this slot, we need to read next one
-					srcSlot := add(srcSlot, 1)
-					srcSlotValue := sload(srcSlot)
-					srcItemIndexInSlot := 0
-				}
-			<!srcReadMultiPerSlot>
-				srcSlot := add(srcSlot, 1)
-				srcSlotValue := sload(srcSlot)
-			</srcReadMultiPerSlot>
-			)")
-			("srcReadMultiPerSlot", !sameType && _fromType.storageStride() <= 16)
-			("srcItemsPerSlot", to_string(32 / _fromType.storageStride()))
-			.render()
-		);
+		if (fromStorage)
+			templ("updateSrcPtr", Whiskers(R"(
+				<?srcReadMultiPerSlot>
+					srcItemIndexInSlot := add(srcItemIndexInSlot, 1)
+					if eq(srcItemIndexInSlot, <srcItemsPerSlot>) {
+						// here we are done with this slot, we need to read next one
+						srcPtr := add(srcPtr, 1)
+						srcSlotValue := sload(srcPtr)
+						srcItemIndexInSlot := 0
+					}
+				<!srcReadMultiPerSlot>
+					srcPtr := add(srcPtr, 1)
+					srcSlotValue := sload(srcPtr)
+				</srcReadMultiPerSlot>
+				)")
+				("srcReadMultiPerSlot", !sameTypeFromStorage && _fromType.storageStride() <= 16)
+				("srcItemsPerSlot", to_string(32 / _fromType.storageStride()))
+				.render()
+			);
+		else
+			templ("updateSrcPtr", Whiskers(R"(
+					srcPtr := add(srcPtr, <srcStride>)
+				)")
+				("srcStride", fromCalldata ? to_string(_fromType.calldataStride()) : to_string(_fromType.memoryStride()))
+				.render()
+			);
 
 		return templ.render();
 	});
diff --git a/libsolidity/codegen/YulUtilFunctions.h b/libsolidity/codegen/YulUtilFunctions.h
index 4d6e7efdac..7badf6db29 100644
--- a/libsolidity/codegen/YulUtilFunctions.h
+++ b/libsolidity/codegen/YulUtilFunctions.h
@@ -258,9 +258,9 @@ class YulUtilFunctions
 	/// signature (to_slot, from_ptr) ->
 	std::string copyByteArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType);
 
-	/// @returns the name of a function that will copy an array of value types from storage to storage.
-	/// signature (to_slot, from_slot) ->
-	std::string copyValueArrayStorageToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType);
+	/// @returns the name of a function that will copy an array of value types to storage.
+	/// signature (to_slot, from_ptr[, from_length]) ->
+	std::string copyValueArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType);
 
 	/// Returns the name of a function that will convert a given length to the
 	/// size in memory (number of storage slots or calldata/memory bytes) it

From 1a9e66f4b0bbf79e25d03b7cbc6784a6f820f869 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 9 Jun 2022 16:03:46 +0200
Subject: [PATCH 0697/1748] Tests

---
 ...nup_during_multi_element_per_slot_copy.sol | 22 ++++++++
 .../array/function_type_array_to_storage.sol  | 56 +++++++++++++++++++
 2 files changed, 78 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol
 create mode 100644 test/libsolidity/semanticTests/array/function_type_array_to_storage.sol

diff --git a/test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol b/test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol
new file mode 100644
index 0000000000..c3cc74c293
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol
@@ -0,0 +1,22 @@
+contract C {
+  uint32[] s;
+  constructor()
+  {
+    s.push();
+    s.push();
+  }
+  function f() external returns (uint)
+  {
+    (s[1], s) = (4, [0]);
+    s = [0];
+    s.push();
+    return s[1];
+    // used to return 4 via IR.
+  }
+}
+// ----
+// constructor()
+// gas irOptimized: 237351
+// gas legacy: 221315
+// gas legacyOptimized: 185247
+// f() -> 0
diff --git a/test/libsolidity/semanticTests/array/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/function_type_array_to_storage.sol
new file mode 100644
index 0000000000..94feaba3dd
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/function_type_array_to_storage.sol
@@ -0,0 +1,56 @@
+contract C {
+	string log;
+	function() external[] fs;
+	function() external[] gs;
+
+	function a() external {
+		log = string.concat(log, "[a called]");
+	}
+	function b() external {
+		log = string.concat(log, "[b called]");
+	}
+
+	function f(function() external[] calldata x) external {
+		fs = x;
+	}
+	function g(function() external[] memory x) public {
+		fs = x;
+	}
+	function test() external returns (string memory) {
+		log = "";
+		function() external[] memory x = new function() external[](2);
+		x[0] = this.a;
+		x[1] = this.b;
+		this.f(x);
+		fs[0]();
+		fs[1]();
+		return log;
+	}
+	function test2() external returns (string memory) {
+		log = "";
+		function() external[] memory x = new function() external[](2);
+		x[0] = this.b;
+		x[1] = this.a;
+		g(x);
+		fs[0]();
+		fs[1]();
+		return log;
+	}
+	function test3() external returns (string memory) {
+		log = "";
+		gs = fs;
+		gs[0]();
+		gs[1]();
+		return log;
+	}
+}
+// ----
+// test() -> 0x20, 0x14, "[a called][b called]"
+// gas irOptimized: 116724
+// gas legacy: 120707
+// gas legacyOptimized: 119241
+// test2() -> 0x20, 0x14, "[b called][a called]"
+// test3() -> 0x20, 0x14, "[b called][a called]"
+// gas irOptimized: 103304
+// gas legacy: 104648
+// gas legacyOptimized: 104075

From c3781f7a1ca483d07739e1a9eba6fcf92db9f357 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 9 Jun 2022 16:15:25 +0200
Subject: [PATCH 0698/1748] Gas cost updates.

---
 .../abiEncoderV1/struct/struct_storage_ptr.sol            | 2 +-
 .../semanticTests/abiEncoderV2/storage_array_encoding.sol | 4 ++--
 .../array/arrays_complex_from_and_to_storage.sol          | 2 +-
 .../semanticTests/array/constant_var_as_array_length.sol  | 2 +-
 .../array/copying/array_copy_calldata_storage.sol         | 2 +-
 .../array/copying/array_copy_cleanup_uint40.sol           | 2 +-
 .../array/copying/array_copy_clear_storage.sol            | 2 +-
 .../array/copying/array_copy_different_packing.sol        | 2 +-
 .../array/copying/array_copy_nested_array.sol             | 2 +-
 .../array/copying/array_nested_calldata_to_storage.sol    | 8 ++++----
 .../array/copying/array_nested_memory_to_storage.sol      | 4 ++--
 ...y_of_structs_containing_arrays_calldata_to_storage.sol | 2 +-
 ...ray_of_structs_containing_arrays_memory_to_storage.sol | 2 +-
 .../array/copying/calldata_array_dynamic_to_storage.sol   | 2 +-
 .../copying/copy_function_internal_storage_array.sol      | 2 +-
 .../array/push/array_push_nested_from_calldata.sol        | 2 +-
 .../semanticTests/array/push/array_push_struct.sol        | 2 +-
 .../array/push/array_push_struct_from_calldata.sol        | 6 +++---
 .../semanticTests/constructor/arrays_in_constructors.sol  | 2 +-
 .../constructor/constructor_static_array_argument.sol     | 2 +-
 .../events/event_dynamic_nested_array_storage_v2.sol      | 2 +-
 .../calldata_struct_with_nested_array_to_storage.sol      | 6 +++---
 .../semanticTests/userDefinedValueType/calldata.sol       | 2 +-
 .../semanticTests/various/destructuring_assignment.sol    | 4 ++--
 .../various/skip_dynamic_types_for_structs.sol            | 4 ++--
 25 files changed, 36 insertions(+), 36 deletions(-)

diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index 4a9d86592e..a6d601412c 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -24,6 +24,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 166606
+// gas irOptimized: 166525
 // gas legacy: 169347
 // gas legacyOptimized: 167269
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index def976b932..0ef6d88eb8 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -18,10 +18,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 180882
+// gas irOptimized: 180768
 // gas legacy: 184929
 // gas legacyOptimized: 181504
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112533
+// gas irOptimized: 112471
 // gas legacy: 115468
 // gas legacyOptimized: 112988
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index b03e5a8be1..17243226fd 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -12,7 +12,7 @@ contract Test {
 }
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 189640
+// gas irOptimized: 186766
 // gas legacy: 211149
 // gas legacyOptimized: 206054
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
index 32e56ae1bb..fc51f4e303 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -9,7 +9,7 @@ contract C {
 
 // ----
 // constructor(): 1, 2, 3 ->
-// gas irOptimized: 141700
+// gas irOptimized: 141581
 // gas legacy: 183490
 // gas legacyOptimized: 151938
 // a(uint256): 0 -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
index 10564fb9be..6afd8f88f4 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -20,7 +20,7 @@ contract c {
 }
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
-// gas irOptimized: 650748
+// gas irOptimized: 648324
 // gas legacy: 694515
 // gas legacyOptimized: 694013
 // retrieve() -> 9, 28, 9, 28, 4, 3, 32
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
index be6b3350ed..915c0aeed9 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> true
-// gas irOptimized: 146913
+// gas irOptimized: 146936
 // gas legacy: 155961
 // gas legacyOptimized: 153588
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
index 5a50d7573b..416b489684 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 0
-// gas irOptimized: 134352
+// gas irOptimized: 134365
 // gas legacy: 135313
 // gas legacyOptimized: 134548
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index a7f05f80d7..86da315c3f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -19,6 +19,6 @@ contract c {
 
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 209152
+// gas irOptimized: 208149
 // gas legacy: 221856
 // gas legacyOptimized: 220680
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index 9b693d0b7a..d8907cf030 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -13,6 +13,6 @@ contract c {
 
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
-// gas irOptimized: 689834
+// gas irOptimized: 689768
 // gas legacy: 686268
 // gas legacyOptimized: 685688
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
index 6a88746812..d2fe454453 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
@@ -38,10 +38,10 @@ contract c {
 // compileViaYul: true
 // ----
 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 180723
+// gas irOptimized: 180766
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 157518
+// gas irOptimized: 157564
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 134709
+// gas irOptimized: 134630
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
-// gas irOptimized: 111324
+// gas irOptimized: 111268
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index afa1c8013e..2e72d2b8ab 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -38,12 +38,12 @@ contract Test {
 }
 // ----
 // test() -> 24
-// gas irOptimized: 226714
+// gas irOptimized: 226694
 // gas legacy: 227133
 // gas legacyOptimized: 226547
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 133317
+// gas irOptimized: 133254
 // gas legacy: 134295
 // gas legacyOptimized: 133383
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
index e3c8eafdbc..49d307fe2d 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
@@ -23,4 +23,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
-// gas irOptimized: 327727
+// gas irOptimized: 327798
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
index d818734649..6701862b20 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 3, 3, 3, 1
-// gas irOptimized: 182521
+// gas irOptimized: 182237
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
index 80e23b3e31..0905266d82 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
@@ -9,6 +9,6 @@ contract C {
 }
 // ----
 // f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
-// gas irOptimized: 111027
+// gas irOptimized: 110971
 // gas legacy: 111565
 // gas legacyOptimized: 111347
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index 9a15bdeec9..e938b03d61 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -16,6 +16,6 @@ contract C {
 
 // ----
 // test() -> 7
-// gas irOptimized: 123625
+// gas irOptimized: 122483
 // gas legacy: 205196
 // gas legacyOptimized: 204987
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
index 640afafb3d..63f974498a 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -12,6 +12,6 @@ contract C {
 }
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
-// gas irOptimized: 112776
+// gas irOptimized: 112832
 // gas legacy: 113686
 // gas legacyOptimized: 113499
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
index 5bc91a1c5e..04f94b3dbb 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
@@ -20,6 +20,6 @@ contract c {
 }
 // ----
 // test() -> 2, 3, 4, 5
-// gas irOptimized: 136277
+// gas irOptimized: 135204
 // gas legacy: 147484
 // gas legacyOptimized: 146456
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index 8a56e757c2..9718f303c3 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
-// gas irOptimized: 138230
-// gas legacy: 145150
-// gas legacyOptimized: 139171
+// gas irOptimized: 137092
+// gas legacy: 142537
+// gas legacyOptimized: 138023
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index df56059b41..1d311be806 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 430087
+// gas irOptimized: 429680
 // gas legacy: 590683
 // gas legacyOptimized: 448326
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index 77ba821d53..7daf503d4c 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -10,7 +10,7 @@ contract C {
 
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 173087
+// gas irOptimized: 172948
 // gas legacy: 221377
 // gas legacyOptimized: 177671
 // a() -> 1
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
index 9acf6c2f25..7bd5bfa940 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
@@ -15,6 +15,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
-// gas irOptimized: 185131
+// gas irOptimized: 185145
 // gas legacy: 187621
 // gas legacyOptimized: 184551
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
index 4f05346d42..1f69871992 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
@@ -16,6 +16,6 @@ contract C {
 }
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
-// gas irOptimized: 202828
-// gas legacy: 209194
-// gas legacyOptimized: 203583
+// gas irOptimized: 202838
+// gas legacy: 207487
+// gas legacyOptimized: 203611
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 6a9232a532..c532603b67 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -49,7 +49,7 @@ contract C {
 }
 // ----
 // test_f() -> true
-// gas irOptimized: 122154
+// gas irOptimized: 122070
 // gas legacy: 126150
 // gas legacyOptimized: 123163
 // test_g() -> true
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 6be5ffd479..ae1a9ad6ce 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -34,6 +34,6 @@ contract C {
 
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 239194
+// gas irOptimized: 239090
 // gas legacy: 240541
-// gas legacyOptimized: 239654
+// gas legacyOptimized: 239673
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 3e29dc2709..74242c38d8 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -20,6 +20,6 @@ contract C {
 
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178677
+// gas irOptimized: 178637
 // gas legacy: 180945
-// gas legacyOptimized: 179460
+// gas legacyOptimized: 179472

From 4c84b77a4b269cfad3010b325ed2957bfa4204ec Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 Jun 2022 12:13:38 +0200
Subject: [PATCH 0699/1748] Review suggested renaming.

---
 libsolidity/codegen/YulUtilFunctions.cpp | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 4b1f8024d8..3ea3b2c842 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -1818,7 +1818,7 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 
 				for { let i := 0 } lt(i, length) {i := add(i, 1)} {
 					<?fromCalldata>
-						let <elementValues> :=
+						let <stackItems> :=
 						<?dynamicallyEncodedBase>
 							<accessCalldataTail>(value, srcPtr)
 						<!dynamicallyEncodedBase>
@@ -1827,14 +1827,14 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 					</fromCalldata>
 
 					<?fromMemory>
-						let <elementValues> := <readFromCalldataOrMemory>(srcPtr)
+						let <stackItems> := <readFromMemoryOrCalldata>(srcPtr)
 					</fromMemory>
 
 					<?fromStorage>
-						let <elementValues> := srcPtr
+						let <stackItems> := srcPtr
 					</fromStorage>
 
-					<updateStorageValue>(elementSlot, <elementValues>)
+					<updateStorageValue>(elementSlot, <stackItems>)
 
 					srcPtr := add(srcPtr, <srcStride>)
 
@@ -1862,9 +1862,9 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 		templ("arrayLength",arrayLengthFunction(_fromType));
 		templ("dstDataLocation", arrayDataAreaFunction(_toType));
 		if (fromMemory || (fromCalldata && _fromType.baseType()->isValueType()))
-			templ("readFromCalldataOrMemory", readFromMemoryOrCalldata(*_fromType.baseType(), fromCalldata));
-		templ("elementValues", suffixedVariableNameList(
-			"elementValue_",
+			templ("readFromMemoryOrCalldata", readFromMemoryOrCalldata(*_fromType.baseType(), fromCalldata));
+		templ("stackItems", suffixedVariableNameList(
+			"stackItem_",
 			0,
 			_fromType.baseType()->stackItems().size()
 		));
@@ -2004,13 +2004,13 @@ string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromT
 						<?multipleItemsPerSlotDst>for { let j := 0 } lt(j, <itemsPerSlot>) { j := add(j, 1) } </multipleItemsPerSlotDst>
 						{
 							<?isFromStorage>
-							let <elementValues> := <convert>(
+							let <stackItems> := <convert>(
 								<extractFromSlot>(srcSlotValue, mul(<srcStride>, srcItemIndexInSlot))
 							)
 							<!isFromStorage>
-							let <elementValues> := <readFromCalldataOrMemory>(srcPtr)
+							let <stackItems> := <readFromMemoryOrCalldata>(srcPtr)
 							</isFromStorage>
-							let itemValue := <prepareStore>(<elementValues>)
+							let itemValue := <prepareStore>(<stackItems>)
 							dstSlotValue :=
 							<?multipleItemsPerSlotDst>
 								<updateByteSlice>(dstSlotValue, mul(<dstStride>, j), itemValue)
@@ -2035,13 +2035,13 @@ string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromT
 						<!sameTypeFromStorage>
 							for { let j := 0 } lt(j, spill) { j := add(j, 1) } {
 								<?isFromStorage>
-								let <elementValues> := <convert>(
+								let <stackItems> := <convert>(
 									<extractFromSlot>(srcSlotValue, mul(<srcStride>, srcItemIndexInSlot))
 								)
 								<!isFromStorage>
-								let <elementValues> := <readFromCalldataOrMemory>(srcPtr)
+								let <stackItems> := <readFromMemoryOrCalldata>(srcPtr)
 								</isFromStorage>
-								let itemValue := <prepareStore>(<elementValues>)
+								let itemValue := <prepareStore>(<stackItems>)
 								dstSlotValue := <updateByteSlice>(dstSlotValue, mul(<dstStride>, j), itemValue)
 
 								<updateSrcPtr>
@@ -2063,12 +2063,12 @@ string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromT
 		templ("panic", panicFunction(PanicCode::ResourceError));
 		templ("isFromDynamicCalldata", _fromType.isDynamicallySized() && fromCalldata);
 		templ("isFromStorage", fromStorage);
-		templ("readFromCalldataOrMemory", readFromMemoryOrCalldata(*_fromType.baseType(), fromCalldata));
+		templ("readFromMemoryOrCalldata", readFromMemoryOrCalldata(*_fromType.baseType(), fromCalldata));
 		templ("srcDataLocation", arrayDataAreaFunction(_fromType));
 		templ("dstDataLocation", arrayDataAreaFunction(_toType));
 		templ("srcStride", to_string(_fromType.storageStride()));
-		templ("elementValues", suffixedVariableNameList(
-			"elementValue_",
+		templ("stackItems", suffixedVariableNameList(
+			"stackItem_",
 			0,
 			_fromType.baseType()->stackItems().size()
 		));

From 9c3a0f11f9fcf06a6396f4714402bb329987c1ef Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 15 Jun 2022 12:15:54 +0200
Subject: [PATCH 0700/1748] Review suggested test adjustments.

---
 ...nup_during_multi_element_per_slot_copy.sol | 22 -------------------
 ...nup_during_multi_element_per_slot_copy.sol | 22 +++++++++++++++++++
 .../function_type_array_to_storage.sol        |  0
 3 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
 rename test/libsolidity/semanticTests/array/{ => copying}/function_type_array_to_storage.sol (100%)

diff --git a/test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol b/test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol
deleted file mode 100644
index c3cc74c293..0000000000
--- a/test/libsolidity/semanticTests/array/cleanup_during_multi_element_per_slot_copy.sol
+++ /dev/null
@@ -1,22 +0,0 @@
-contract C {
-  uint32[] s;
-  constructor()
-  {
-    s.push();
-    s.push();
-  }
-  function f() external returns (uint)
-  {
-    (s[1], s) = (4, [0]);
-    s = [0];
-    s.push();
-    return s[1];
-    // used to return 4 via IR.
-  }
-}
-// ----
-// constructor()
-// gas irOptimized: 237351
-// gas legacy: 221315
-// gas legacyOptimized: 185247
-// f() -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
new file mode 100644
index 0000000000..999d49eaad
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
@@ -0,0 +1,22 @@
+contract C {
+    uint32[] s;
+    constructor()
+    {
+        s.push();
+        s.push();
+    }
+    function f() external returns (uint)
+    {
+        (s[1], s) = (4, [0]);
+        s = [0];
+        s.push();
+        return s[1];
+        // used to return 4 via IR.
+    }
+}
+// ----
+// constructor()
+// gas irOptimized: 237351
+// gas legacy: 221315
+// gas legacyOptimized: 185247
+// f() -> 0
diff --git a/test/libsolidity/semanticTests/array/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
similarity index 100%
rename from test/libsolidity/semanticTests/array/function_type_array_to_storage.sol
rename to test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol

From 384bb8b8f782cc2da78d933c89c202c9dd24389f Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 16 Jun 2022 15:24:22 +0200
Subject: [PATCH 0701/1748] More gas adjustments.

---
 .../array/copying/function_type_array_to_storage.sol      | 8 ++++----
 .../semanticTests/various/destructuring_assignment.sol    | 2 +-
 .../various/skip_dynamic_types_for_structs.sol            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
index 94feaba3dd..347f2f2eeb 100644
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
@@ -47,10 +47,10 @@ contract C {
 // ----
 // test() -> 0x20, 0x14, "[a called][b called]"
 // gas irOptimized: 116724
-// gas legacy: 120707
-// gas legacyOptimized: 119241
+// gas legacy: 119056
+// gas legacyOptimized: 117043
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
 // gas irOptimized: 103304
-// gas legacy: 104648
-// gas legacyOptimized: 104075
+// gas legacy: 102840
+// gas legacyOptimized: 101728
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index ae1a9ad6ce..99a8e8d4bc 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -36,4 +36,4 @@ contract C {
 // f(bytes): 0x20, 0x5, "abcde" -> 0
 // gas irOptimized: 239090
 // gas legacy: 240541
-// gas legacyOptimized: 239673
+// gas legacyOptimized: 239654
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 74242c38d8..0edb0e04ed 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -22,4 +22,4 @@ contract C {
 // g() -> 2, 6
 // gas irOptimized: 178637
 // gas legacy: 180945
-// gas legacyOptimized: 179472
+// gas legacyOptimized: 179460

From c88c74ceb80fb40bf9d318d6ebbc180cfd63520c Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 16 Jun 2022 18:05:51 +0200
Subject: [PATCH 0702/1748] Rename ASTJsonConverter to ASTJsonExporter

given that we have an ASTJsonImporter this name makes more sense.
---
 libsolidity/CMakeLists.txt                    |   4 +-
 ...TJsonConverter.cpp => ASTJsonExporter.cpp} | 152 +++++++++---------
 .../{ASTJsonConverter.h => ASTJsonExporter.h} |   4 +-
 libsolidity/interface/StandardCompiler.cpp    |   4 +-
 solc/CommandLineInterface.cpp                 |   8 +-
 test/libsolidity/ASTJSONTest.cpp              |   4 +-
 6 files changed, 88 insertions(+), 88 deletions(-)
 rename libsolidity/ast/{ASTJsonConverter.cpp => ASTJsonExporter.cpp} (86%)
 rename libsolidity/ast/{ASTJsonConverter.h => ASTJsonExporter.h} (99%)

diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index e8de5ea23c..b609f4fee2 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -53,8 +53,8 @@ set(sources
 	ast/ASTAnnotations.h
 	ast/ASTEnums.h
 	ast/ASTForward.h
-	ast/ASTJsonConverter.cpp
-	ast/ASTJsonConverter.h
+	ast/ASTJsonExporter.cpp
+	ast/ASTJsonExporter.h
 	ast/ASTUtils.cpp
 	ast/ASTUtils.h
 	ast/ASTJsonImporter.cpp
diff --git a/libsolidity/ast/ASTJsonConverter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
similarity index 86%
rename from libsolidity/ast/ASTJsonConverter.cpp
rename to libsolidity/ast/ASTJsonExporter.cpp
index f75f5bc15c..dffd51c30f 100644
--- a/libsolidity/ast/ASTJsonConverter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -20,7 +20,7 @@
  * Converts the AST into json format
  */
 
-#include <libsolidity/ast/ASTJsonConverter.h>
+#include <libsolidity/ast/ASTJsonExporter.h>
 
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/TypeProvider.h>
@@ -74,27 +74,27 @@ void addIfSet(std::vector<pair<string, Json::Value>>& _attributes, string const&
 namespace solidity::frontend
 {
 
-ASTJsonConverter::ASTJsonConverter(CompilerStack::State _stackState, map<string, unsigned> _sourceIndices):
+ASTJsonExporter::ASTJsonExporter(CompilerStack::State _stackState, map<string, unsigned> _sourceIndices):
 	m_stackState(_stackState),
 	m_sourceIndices(std::move(_sourceIndices))
 {
 }
 
 
-void ASTJsonConverter::setJsonNode(
+void ASTJsonExporter::setJsonNode(
 	ASTNode const& _node,
 	string const& _nodeName,
 	initializer_list<pair<string, Json::Value>>&& _attributes
 )
 {
-	ASTJsonConverter::setJsonNode(
+	ASTJsonExporter::setJsonNode(
 		_node,
 		_nodeName,
 		std::vector<pair<string, Json::Value>>(std::move(_attributes))
 	);
 }
 
-void ASTJsonConverter::setJsonNode(
+void ASTJsonExporter::setJsonNode(
 	ASTNode const& _node,
 	string const& _nodeType,
 	std::vector<pair<string, Json::Value>>&& _attributes
@@ -111,7 +111,7 @@ void ASTJsonConverter::setJsonNode(
 		m_currentValue[e.first] = std::move(e.second);
 }
 
-optional<size_t> ASTJsonConverter::sourceIndexFromLocation(SourceLocation const& _location) const
+optional<size_t> ASTJsonExporter::sourceIndexFromLocation(SourceLocation const& _location) const
 {
 	if (_location.sourceName && m_sourceIndices.count(*_location.sourceName))
 		return m_sourceIndices.at(*_location.sourceName);
@@ -119,7 +119,7 @@ optional<size_t> ASTJsonConverter::sourceIndexFromLocation(SourceLocation const&
 		return nullopt;
 }
 
-string ASTJsonConverter::sourceLocationToString(SourceLocation const& _location) const
+string ASTJsonExporter::sourceLocationToString(SourceLocation const& _location) const
 {
 	optional<size_t> sourceIndexOpt = sourceIndexFromLocation(_location);
 	int length = -1;
@@ -128,12 +128,12 @@ string ASTJsonConverter::sourceLocationToString(SourceLocation const& _location)
 	return to_string(_location.start) + ":" + to_string(length) + ":" + (sourceIndexOpt.has_value() ? to_string(sourceIndexOpt.value()) : "-1");
 }
 
-string ASTJsonConverter::namePathToString(std::vector<ASTString> const& _namePath)
+string ASTJsonExporter::namePathToString(std::vector<ASTString> const& _namePath)
 {
 	return boost::algorithm::join(_namePath, ".");
 }
 
-Json::Value ASTJsonConverter::typePointerToJson(Type const* _tp, bool _short)
+Json::Value ASTJsonExporter::typePointerToJson(Type const* _tp, bool _short)
 {
 	Json::Value typeDescriptions(Json::objectValue);
 	typeDescriptions["typeString"] = _tp ? Json::Value(_tp->toString(_short)) : Json::nullValue;
@@ -141,7 +141,7 @@ Json::Value ASTJsonConverter::typePointerToJson(Type const* _tp, bool _short)
 	return typeDescriptions;
 
 }
-Json::Value ASTJsonConverter::typePointerToJson(std::optional<FuncCallArguments> const& _tps)
+Json::Value ASTJsonExporter::typePointerToJson(std::optional<FuncCallArguments> const& _tps)
 {
 	if (_tps)
 	{
@@ -154,7 +154,7 @@ Json::Value ASTJsonConverter::typePointerToJson(std::optional<FuncCallArguments>
 		return Json::nullValue;
 }
 
-void ASTJsonConverter::appendExpressionAttributes(
+void ASTJsonExporter::appendExpressionAttributes(
 	std::vector<pair<string, Json::Value>>& _attributes,
 	ExpressionAnnotation const& _annotation
 )
@@ -174,7 +174,7 @@ void ASTJsonConverter::appendExpressionAttributes(
 	_attributes += exprAttributes;
 }
 
-Json::Value ASTJsonConverter::inlineAssemblyIdentifierToJson(pair<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const
+Json::Value ASTJsonExporter::inlineAssemblyIdentifierToJson(pair<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const
 {
 	Json::Value tuple(Json::objectValue);
 	tuple["src"] = sourceLocationToString(nativeLocationOf(*_info.first));
@@ -190,18 +190,18 @@ Json::Value ASTJsonConverter::inlineAssemblyIdentifierToJson(pair<yul::Identifie
 	return tuple;
 }
 
-void ASTJsonConverter::print(ostream& _stream, ASTNode const& _node, util::JsonFormat const& _format)
+void ASTJsonExporter::print(ostream& _stream, ASTNode const& _node, util::JsonFormat const& _format)
 {
 	_stream << util::jsonPrint(toJson(_node), _format);
 }
 
-Json::Value ASTJsonConverter::toJson(ASTNode const& _node)
+Json::Value ASTJsonExporter::toJson(ASTNode const& _node)
 {
 	_node.accept(*this);
 	return util::removeNullMembers(std::move(m_currentValue));
 }
 
-bool ASTJsonConverter::visit(SourceUnit const& _node)
+bool ASTJsonExporter::visit(SourceUnit const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("license", _node.licenseString() ? Json::Value(*_node.licenseString()) : Json::nullValue),
@@ -228,7 +228,7 @@ bool ASTJsonConverter::visit(SourceUnit const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(PragmaDirective const& _node)
+bool ASTJsonExporter::visit(PragmaDirective const& _node)
 {
 	Json::Value literals(Json::arrayValue);
 	for (auto const& literal: _node.literals())
@@ -239,7 +239,7 @@ bool ASTJsonConverter::visit(PragmaDirective const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ImportDirective const& _node)
+bool ASTJsonExporter::visit(ImportDirective const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("file", _node.path()),
@@ -267,7 +267,7 @@ bool ASTJsonConverter::visit(ImportDirective const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ContractDefinition const& _node)
+bool ASTJsonExporter::visit(ContractDefinition const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("name", _node.name()),
@@ -292,7 +292,7 @@ bool ASTJsonConverter::visit(ContractDefinition const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(IdentifierPath const& _node)
+bool ASTJsonExporter::visit(IdentifierPath const& _node)
 {
 	setJsonNode(_node, "IdentifierPath", {
 		make_pair("name", namePathToString(_node.path())),
@@ -301,7 +301,7 @@ bool ASTJsonConverter::visit(IdentifierPath const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(InheritanceSpecifier const& _node)
+bool ASTJsonExporter::visit(InheritanceSpecifier const& _node)
 {
 	setJsonNode(_node, "InheritanceSpecifier", {
 		make_pair("baseName", toJson(_node.name())),
@@ -310,7 +310,7 @@ bool ASTJsonConverter::visit(InheritanceSpecifier const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(UsingForDirective const& _node)
+bool ASTJsonExporter::visit(UsingForDirective const& _node)
 {
 	vector<pair<string, Json::Value>> attributes = {
 		make_pair("typeName", _node.typeName() ? toJson(*_node.typeName()) : Json::nullValue)
@@ -335,7 +335,7 @@ bool ASTJsonConverter::visit(UsingForDirective const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(StructDefinition const& _node)
+bool ASTJsonExporter::visit(StructDefinition const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("name", _node.name()),
@@ -352,7 +352,7 @@ bool ASTJsonConverter::visit(StructDefinition const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(EnumDefinition const& _node)
+bool ASTJsonExporter::visit(EnumDefinition const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("name", _node.name()),
@@ -367,7 +367,7 @@ bool ASTJsonConverter::visit(EnumDefinition const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(EnumValue const& _node)
+bool ASTJsonExporter::visit(EnumValue const& _node)
 {
 	setJsonNode(_node, "EnumValue", {
 		make_pair("name", _node.name()),
@@ -376,7 +376,7 @@ bool ASTJsonConverter::visit(EnumValue const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(UserDefinedValueTypeDefinition const& _node)
+bool ASTJsonExporter::visit(UserDefinedValueTypeDefinition const& _node)
 {
 	solAssert(_node.underlyingType(), "");
 	std::vector<pair<string, Json::Value>> attributes = {
@@ -391,7 +391,7 @@ bool ASTJsonConverter::visit(UserDefinedValueTypeDefinition const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ParameterList const& _node)
+bool ASTJsonExporter::visit(ParameterList const& _node)
 {
 	setJsonNode(_node, "ParameterList", {
 		make_pair("parameters", toJson(_node.parameters()))
@@ -399,7 +399,7 @@ bool ASTJsonConverter::visit(ParameterList const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(OverrideSpecifier const& _node)
+bool ASTJsonExporter::visit(OverrideSpecifier const& _node)
 {
 	setJsonNode(_node, "OverrideSpecifier", {
 		make_pair("overrides", toJson(_node.overrides()))
@@ -407,7 +407,7 @@ bool ASTJsonConverter::visit(OverrideSpecifier const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(FunctionDefinition const& _node)
+bool ASTJsonExporter::visit(FunctionDefinition const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("name", _node.name()),
@@ -445,7 +445,7 @@ bool ASTJsonConverter::visit(FunctionDefinition const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(VariableDeclaration const& _node)
+bool ASTJsonExporter::visit(VariableDeclaration const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("name", _node.name()),
@@ -473,7 +473,7 @@ bool ASTJsonConverter::visit(VariableDeclaration const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ModifierDefinition const& _node)
+bool ASTJsonExporter::visit(ModifierDefinition const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("name", _node.name()),
@@ -491,7 +491,7 @@ bool ASTJsonConverter::visit(ModifierDefinition const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ModifierInvocation const& _node)
+bool ASTJsonExporter::visit(ModifierInvocation const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes{
 		make_pair("modifierName", toJson(_node.name())),
@@ -508,7 +508,7 @@ bool ASTJsonConverter::visit(ModifierInvocation const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(EventDefinition const& _node)
+bool ASTJsonExporter::visit(EventDefinition const& _node)
 {
 	m_inEvent = true;
 	std::vector<pair<string, Json::Value>> _attributes = {
@@ -529,7 +529,7 @@ bool ASTJsonConverter::visit(EventDefinition const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ErrorDefinition const& _node)
+bool ASTJsonExporter::visit(ErrorDefinition const& _node)
 {
 	std::vector<pair<string, Json::Value>> _attributes = {
 		make_pair("name", _node.name()),
@@ -544,7 +544,7 @@ bool ASTJsonConverter::visit(ErrorDefinition const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ElementaryTypeName const& _node)
+bool ASTJsonExporter::visit(ElementaryTypeName const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("name", _node.typeName().toString()),
@@ -558,7 +558,7 @@ bool ASTJsonConverter::visit(ElementaryTypeName const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(UserDefinedTypeName const& _node)
+bool ASTJsonExporter::visit(UserDefinedTypeName const& _node)
 {
 	setJsonNode(_node, "UserDefinedTypeName", {
 		make_pair("pathNode", toJson(_node.pathNode())),
@@ -568,7 +568,7 @@ bool ASTJsonConverter::visit(UserDefinedTypeName const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(FunctionTypeName const& _node)
+bool ASTJsonExporter::visit(FunctionTypeName const& _node)
 {
 	setJsonNode(_node, "FunctionTypeName", {
 		make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
@@ -580,7 +580,7 @@ bool ASTJsonConverter::visit(FunctionTypeName const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(Mapping const& _node)
+bool ASTJsonExporter::visit(Mapping const& _node)
 {
 	setJsonNode(_node, "Mapping", {
 		make_pair("keyType", toJson(_node.keyType())),
@@ -590,7 +590,7 @@ bool ASTJsonConverter::visit(Mapping const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ArrayTypeName const& _node)
+bool ASTJsonExporter::visit(ArrayTypeName const& _node)
 {
 	setJsonNode(_node, "ArrayTypeName", {
 		make_pair("baseType", toJson(_node.baseType())),
@@ -600,7 +600,7 @@ bool ASTJsonConverter::visit(ArrayTypeName const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(InlineAssembly const& _node)
+bool ASTJsonExporter::visit(InlineAssembly const& _node)
 {
 	vector<pair<string, Json::Value>> externalReferences;
 
@@ -638,7 +638,7 @@ bool ASTJsonConverter::visit(InlineAssembly const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(Block const& _node)
+bool ASTJsonExporter::visit(Block const& _node)
 {
 	setJsonNode(_node, _node.unchecked() ? "UncheckedBlock" : "Block", {
 		make_pair("statements", toJson(_node.statements()))
@@ -646,13 +646,13 @@ bool ASTJsonConverter::visit(Block const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(PlaceholderStatement const& _node)
+bool ASTJsonExporter::visit(PlaceholderStatement const& _node)
 {
 	setJsonNode(_node, "PlaceholderStatement", {});
 	return false;
 }
 
-bool ASTJsonConverter::visit(IfStatement const& _node)
+bool ASTJsonExporter::visit(IfStatement const& _node)
 {
 	setJsonNode(_node, "IfStatement", {
 		make_pair("condition", toJson(_node.condition())),
@@ -662,7 +662,7 @@ bool ASTJsonConverter::visit(IfStatement const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(TryCatchClause const& _node)
+bool ASTJsonExporter::visit(TryCatchClause const& _node)
 {
 	setJsonNode(_node, "TryCatchClause", {
 		make_pair("errorName", _node.errorName()),
@@ -672,7 +672,7 @@ bool ASTJsonConverter::visit(TryCatchClause const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(TryStatement const& _node)
+bool ASTJsonExporter::visit(TryStatement const& _node)
 {
 	setJsonNode(_node, "TryStatement", {
 		make_pair("externalCall", toJson(_node.externalCall())),
@@ -681,7 +681,7 @@ bool ASTJsonConverter::visit(TryStatement const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(WhileStatement const& _node)
+bool ASTJsonExporter::visit(WhileStatement const& _node)
 {
 	setJsonNode(
 		_node,
@@ -694,7 +694,7 @@ bool ASTJsonConverter::visit(WhileStatement const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ForStatement const& _node)
+bool ASTJsonExporter::visit(ForStatement const& _node)
 {
 	setJsonNode(_node, "ForStatement", {
 		make_pair("initializationExpression", toJsonOrNull(_node.initializationExpression())),
@@ -705,19 +705,19 @@ bool ASTJsonConverter::visit(ForStatement const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(Continue const& _node)
+bool ASTJsonExporter::visit(Continue const& _node)
 {
 	setJsonNode(_node, "Continue", {});
 	return false;
 }
 
-bool ASTJsonConverter::visit(Break const& _node)
+bool ASTJsonExporter::visit(Break const& _node)
 {
 	setJsonNode(_node, "Break", {});
 	return false;
 }
 
-bool ASTJsonConverter::visit(Return const& _node)
+bool ASTJsonExporter::visit(Return const& _node)
 {
 	setJsonNode(_node, "Return", {
 		make_pair("expression", toJsonOrNull(_node.expression())),
@@ -726,13 +726,13 @@ bool ASTJsonConverter::visit(Return const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(Throw const& _node)
+bool ASTJsonExporter::visit(Throw const& _node)
 {
 	setJsonNode(_node, "Throw", {});
 	return false;
 }
 
-bool ASTJsonConverter::visit(EmitStatement const& _node)
+bool ASTJsonExporter::visit(EmitStatement const& _node)
 {
 	setJsonNode(_node, "EmitStatement", {
 		make_pair("eventCall", toJson(_node.eventCall()))
@@ -740,7 +740,7 @@ bool ASTJsonConverter::visit(EmitStatement const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(RevertStatement const& _node)
+bool ASTJsonExporter::visit(RevertStatement const& _node)
 {
 	setJsonNode(_node, "RevertStatement", {
 		make_pair("errorCall", toJson(_node.errorCall()))
@@ -748,7 +748,7 @@ bool ASTJsonConverter::visit(RevertStatement const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(VariableDeclarationStatement const& _node)
+bool ASTJsonExporter::visit(VariableDeclarationStatement const& _node)
 {
 	Json::Value varDecs(Json::arrayValue);
 	for (auto const& v: _node.declarations())
@@ -761,7 +761,7 @@ bool ASTJsonConverter::visit(VariableDeclarationStatement const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ExpressionStatement const& _node)
+bool ASTJsonExporter::visit(ExpressionStatement const& _node)
 {
 	setJsonNode(_node, "ExpressionStatement", {
 		make_pair("expression", toJson(_node.expression()))
@@ -769,7 +769,7 @@ bool ASTJsonConverter::visit(ExpressionStatement const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(Conditional const& _node)
+bool ASTJsonExporter::visit(Conditional const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("condition", toJson(_node.condition())),
@@ -781,7 +781,7 @@ bool ASTJsonConverter::visit(Conditional const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(Assignment const& _node)
+bool ASTJsonExporter::visit(Assignment const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("operator", TokenTraits::toString(_node.assignmentOperator())),
@@ -793,7 +793,7 @@ bool ASTJsonConverter::visit(Assignment const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(TupleExpression const& _node)
+bool ASTJsonExporter::visit(TupleExpression const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("isInlineArray", Json::Value(_node.isInlineArray())),
@@ -804,7 +804,7 @@ bool ASTJsonConverter::visit(TupleExpression const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(UnaryOperation const& _node)
+bool ASTJsonExporter::visit(UnaryOperation const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("prefix", _node.isPrefixOperation()),
@@ -816,7 +816,7 @@ bool ASTJsonConverter::visit(UnaryOperation const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(BinaryOperation const& _node)
+bool ASTJsonExporter::visit(BinaryOperation const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("operator", TokenTraits::toString(_node.getOperator())),
@@ -829,7 +829,7 @@ bool ASTJsonConverter::visit(BinaryOperation const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(FunctionCall const& _node)
+bool ASTJsonExporter::visit(FunctionCall const& _node)
 {
 	Json::Value names(Json::arrayValue);
 	for (auto const& name: _node.names())
@@ -852,7 +852,7 @@ bool ASTJsonConverter::visit(FunctionCall const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(FunctionCallOptions const& _node)
+bool ASTJsonExporter::visit(FunctionCallOptions const& _node)
 {
 	Json::Value names(Json::arrayValue);
 	for (auto const& name: _node.names())
@@ -869,7 +869,7 @@ bool ASTJsonConverter::visit(FunctionCallOptions const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(NewExpression const& _node)
+bool ASTJsonExporter::visit(NewExpression const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("typeName", toJson(_node.typeName()))
@@ -879,7 +879,7 @@ bool ASTJsonConverter::visit(NewExpression const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(MemberAccess const& _node)
+bool ASTJsonExporter::visit(MemberAccess const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("memberName", _node.memberName()),
@@ -891,7 +891,7 @@ bool ASTJsonConverter::visit(MemberAccess const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(IndexAccess const& _node)
+bool ASTJsonExporter::visit(IndexAccess const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("baseExpression", toJson(_node.baseExpression())),
@@ -902,7 +902,7 @@ bool ASTJsonConverter::visit(IndexAccess const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(IndexRangeAccess const& _node)
+bool ASTJsonExporter::visit(IndexRangeAccess const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("baseExpression", toJson(_node.baseExpression())),
@@ -914,7 +914,7 @@ bool ASTJsonConverter::visit(IndexRangeAccess const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(Identifier const& _node)
+bool ASTJsonExporter::visit(Identifier const& _node)
 {
 	Json::Value overloads(Json::arrayValue);
 	for (auto const& dec: _node.annotation().overloadedDeclarations)
@@ -929,7 +929,7 @@ bool ASTJsonConverter::visit(Identifier const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(ElementaryTypeNameExpression const& _node)
+bool ASTJsonExporter::visit(ElementaryTypeNameExpression const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("typeName", toJson(_node.type()))
@@ -939,7 +939,7 @@ bool ASTJsonConverter::visit(ElementaryTypeNameExpression const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(Literal const& _node)
+bool ASTJsonExporter::visit(Literal const& _node)
 {
 	Json::Value value{_node.value()};
 	if (!util::validateUTF8(_node.value()))
@@ -961,7 +961,7 @@ bool ASTJsonConverter::visit(Literal const& _node)
 	return false;
 }
 
-bool ASTJsonConverter::visit(StructuredDocumentation const& _node)
+bool ASTJsonExporter::visit(StructuredDocumentation const& _node)
 {
 	Json::Value text{*_node.text()};
 	std::vector<pair<string, Json::Value>> attributes = {
@@ -973,12 +973,12 @@ bool ASTJsonConverter::visit(StructuredDocumentation const& _node)
 
 
 
-void ASTJsonConverter::endVisit(EventDefinition const&)
+void ASTJsonExporter::endVisit(EventDefinition const&)
 {
 	m_inEvent = false;
 }
 
-string ASTJsonConverter::location(VariableDeclaration::Location _location)
+string ASTJsonExporter::location(VariableDeclaration::Location _location)
 {
 	switch (_location)
 	{
@@ -995,7 +995,7 @@ string ASTJsonConverter::location(VariableDeclaration::Location _location)
 	return {};
 }
 
-string ASTJsonConverter::contractKind(ContractKind _kind)
+string ASTJsonExporter::contractKind(ContractKind _kind)
 {
 	switch (_kind)
 	{
@@ -1011,7 +1011,7 @@ string ASTJsonConverter::contractKind(ContractKind _kind)
 	return {};
 }
 
-string ASTJsonConverter::functionCallKind(FunctionCallKind _kind)
+string ASTJsonExporter::functionCallKind(FunctionCallKind _kind)
 {
 	switch (_kind)
 	{
@@ -1026,7 +1026,7 @@ string ASTJsonConverter::functionCallKind(FunctionCallKind _kind)
 	}
 }
 
-string ASTJsonConverter::literalTokenKind(Token _token)
+string ASTJsonExporter::literalTokenKind(Token _token)
 {
 	switch (_token)
 	{
@@ -1046,12 +1046,12 @@ string ASTJsonConverter::literalTokenKind(Token _token)
 	}
 }
 
-string ASTJsonConverter::type(Expression const& _expression)
+string ASTJsonExporter::type(Expression const& _expression)
 {
 	return _expression.annotation().type ? _expression.annotation().type->toString() : "Unknown";
 }
 
-string ASTJsonConverter::type(VariableDeclaration const& _varDecl)
+string ASTJsonExporter::type(VariableDeclaration const& _varDecl)
 {
 	return _varDecl.annotation().type ? _varDecl.annotation().type->toString() : "Unknown";
 }
diff --git a/libsolidity/ast/ASTJsonConverter.h b/libsolidity/ast/ASTJsonExporter.h
similarity index 99%
rename from libsolidity/ast/ASTJsonConverter.h
rename to libsolidity/ast/ASTJsonExporter.h
index 88725299f6..fb3189ece4 100644
--- a/libsolidity/ast/ASTJsonConverter.h
+++ b/libsolidity/ast/ASTJsonExporter.h
@@ -48,13 +48,13 @@ namespace solidity::frontend
 /**
  * Converter of the AST into JSON format
  */
-class ASTJsonConverter: public ASTConstVisitor
+class ASTJsonExporter: public ASTConstVisitor
 {
 public:
 	/// Create a converter to JSON for the given abstract syntax tree.
 	/// @a _stackState state of the compiler stack to avoid outputting incomplete data
 	/// @a _sourceIndices is used to abbreviate source names in source locations.
-	explicit ASTJsonConverter(
+	explicit ASTJsonExporter(
 		CompilerStack::State _stackState,
 		std::map<std::string, unsigned> _sourceIndices = std::map<std::string, unsigned>()
 	);
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 9ca8de3eae..24bcddba9c 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -24,7 +24,7 @@
 #include <libsolidity/interface/StandardCompiler.h>
 #include <libsolidity/interface/ImportRemapper.h>
 
-#include <libsolidity/ast/ASTJsonConverter.h>
+#include <libsolidity/ast/ASTJsonExporter.h>
 #include <libyul/YulStack.h>
 #include <libyul/Exceptions.h>
 #include <libyul/optimiser/Suite.h>
@@ -1254,7 +1254,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 			Json::Value sourceResult = Json::objectValue;
 			sourceResult["id"] = sourceIndex++;
 			if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, "", "ast", wildcardMatchesExperimental))
-				sourceResult["ast"] = ASTJsonConverter(compilerStack.state(), compilerStack.sourceIndices()).toJson(compilerStack.ast(sourceName));
+				sourceResult["ast"] = ASTJsonExporter(compilerStack.state(), compilerStack.sourceIndices()).toJson(compilerStack.ast(sourceName));
 			output["sources"][sourceName] = sourceResult;
 		}
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 7e627208f3..f841c2b63c 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -29,7 +29,7 @@
 #include "solidity/BuildInfo.h"
 
 #include <libsolidity/interface/Version.h>
-#include <libsolidity/ast/ASTJsonConverter.h>
+#include <libsolidity/ast/ASTJsonExporter.h>
 #include <libsolidity/ast/ASTJsonImporter.h>
 #include <libsolidity/analysis/NameAndTypeResolver.h>
 #include <libsolidity/interface/CompilerStack.h>
@@ -863,7 +863,7 @@ void CommandLineInterface::handleCombinedJSON()
 		output[g_strSources] = Json::Value(Json::objectValue);
 		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
-			ASTJsonConverter converter(m_compiler->state(), m_compiler->sourceIndices());
+			ASTJsonExporter converter(m_compiler->state(), m_compiler->sourceIndices());
 			output[g_strSources][sourceCode.first] = Json::Value(Json::objectValue);
 			output[g_strSources][sourceCode.first]["AST"] = converter.toJson(m_compiler->ast(sourceCode.first));
 		}
@@ -893,7 +893,7 @@ void CommandLineInterface::handleAst()
 		{
 			stringstream data;
 			string postfix = "";
-			ASTJsonConverter(m_compiler->state(), m_compiler->sourceIndices()).print(data, m_compiler->ast(sourceCode.first), m_options.formatting.json);
+			ASTJsonExporter(m_compiler->state(), m_compiler->sourceIndices()).print(data, m_compiler->ast(sourceCode.first), m_options.formatting.json);
 			postfix += "_json";
 			boost::filesystem::path path(sourceCode.first);
 			createFile(path.filename().string() + postfix + ".ast", data.str());
@@ -905,7 +905,7 @@ void CommandLineInterface::handleAst()
 		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
 			sout() << endl << "======= " << sourceCode.first << " =======" << endl;
-			ASTJsonConverter(m_compiler->state(), m_compiler->sourceIndices()).print(sout(), m_compiler->ast(sourceCode.first), m_options.formatting.json);
+			ASTJsonExporter(m_compiler->state(), m_compiler->sourceIndices()).print(sout(), m_compiler->ast(sourceCode.first), m_options.formatting.json);
 		}
 	}
 }
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index a509adde6c..3602e14859 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -17,7 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <liblangutil/SourceReferenceFormatter.h>
-#include <libsolidity/ast/ASTJsonConverter.h>
+#include <libsolidity/ast/ASTJsonExporter.h>
 #include <libsolutil/AnsiColorized.h>
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/JSON.h>
@@ -249,7 +249,7 @@ bool ASTJSONTest::runTest(
 	for (size_t i = 0; i < m_sources.size(); i++)
 	{
 		ostringstream result;
-		ASTJsonConverter(_compiler.state(), _sourceIndices).print(result, _compiler.ast(m_sources[i].first), JsonFormat{ JsonFormat::Pretty });
+		ASTJsonExporter(_compiler.state(), _sourceIndices).print(result, _compiler.ast(m_sources[i].first), JsonFormat{ JsonFormat::Pretty });
 		_variant.result += result.str();
 		if (i != m_sources.size() - 1)
 			_variant.result += ",";

From d417fe135f9d449b6e36bc45ffd77ac4765aa44c Mon Sep 17 00:00:00 2001
From: Femi Bolaji <32209950+IMEF-FEMI@users.noreply.github.com>
Date: Fri, 17 Jun 2022 10:48:48 +0100
Subject: [PATCH 0703/1748] updated int assembly.rst (Sample program bug fix)

fixed for loop bug in VectorSum.sumPureAsm function at line 42
# updated { data := add(dataElementLocation, 0x20) } to ----->  { dataElementLocation := add(dataElementLocation, 0x20) }
 in order to update dataElementLocation after every iteration. (Hence ending the loop)
---
 docs/assembly.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index d6cf68568c..6ebffd1645 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -108,7 +108,7 @@ efficient code, for example:
                 for
                     { let end := add(dataElementLocation, mul(len, 0x20)) }
                     lt(dataElementLocation, end)
-                    { data := add(dataElementLocation, 0x20) }
+                    { dataElementLocation := add(dataElementLocation, 0x20) }
                 {
                     sum := add(sum, mload(dataElementLocation))
                 }

From 14ef22c112a913094b39246e68f4f6fad1b96462 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Fri, 17 Jun 2022 16:02:05 +0200
Subject: [PATCH 0704/1748] Hot fix for library name updates in isoltest
 semantics tests.

---
 test/libsolidity/SemanticTest.cpp          | 5 +----
 test/libsolidity/util/SoltestTypes.h       | 3 +++
 test/libsolidity/util/TestFileParser.cpp   | 6 +++---
 test/libsolidity/util/TestFunctionCall.cpp | 5 ++++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 3ad191cee3..785a32fdc3 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -386,10 +386,7 @@ TestCase::TestResult SemanticTest::runTest(
 			// For convenience, in semantic tests we assume that an unqualified name like `L` is equivalent to one
 			// with an empty source unit name (`:L`). This is fine because the compiler never uses unqualified
 			// names in the Yul code it produces and does not allow `linkersymbol()` at all in inline assembly.
-			if (test.call().signature.find(':') == string::npos)
-				libraries[":" + test.call().signature] = m_contractAddress;
-			else
-				libraries[test.call().signature] = m_contractAddress;
+			libraries[test.call().libraryFile + ":" + test.call().signature] = m_contractAddress;
 			continue;
 		}
 		else
diff --git a/test/libsolidity/util/SoltestTypes.h b/test/libsolidity/util/SoltestTypes.h
index bd954f0428..b5b746e325 100644
--- a/test/libsolidity/util/SoltestTypes.h
+++ b/test/libsolidity/util/SoltestTypes.h
@@ -268,6 +268,7 @@ struct FunctionValue
 struct FunctionCall
 {
 	/// Signature of the function call, e.g. `f(uint256, uint256)`.
+	/// For a library deployment, this contains the library name.
 	std::string signature;
 	/// Optional value that can be sent with the call.
 	/// Value is expressed in wei, smallest unit of ether
@@ -313,6 +314,8 @@ struct FunctionCall
 	std::vector<std::string> expectedSideEffects{};
 	/// A textual representation of the actual side-effect of the function call.
 	std::vector<std::string> actualSideEffects{};
+	/// File name of the library. Always empty, unless this is a library deployment call.
+	std::string libraryFile{};
 };
 
 using Builtin = std::function<std::optional<bytes>(FunctionCall const&)>;
diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp
index 11cfdbb867..4ad0701e48 100644
--- a/test/libsolidity/util/TestFileParser.cpp
+++ b/test/libsolidity/util/TestFileParser.cpp
@@ -107,15 +107,15 @@ vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctionCall
 							string libraryName;
 							if (accept(Token::String))
 							{
-								libraryName = m_scanner.currentLiteral();
+								call.libraryFile = m_scanner.currentLiteral();
 								expect(Token::String);
 								expect(Token::Colon);
-								libraryName += ':' + m_scanner.currentLiteral();
+								libraryName += m_scanner.currentLiteral();
 								expect(Token::Identifier);
 							}
 							else if (accept(Token::Colon, true))
 							{
-								libraryName = ':' + m_scanner.currentLiteral();
+								libraryName = m_scanner.currentLiteral();
 								expect(Token::Identifier);
 							}
 							else
diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index c51dbec971..7531d8ce53 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -58,7 +58,10 @@ string TestFunctionCall::format(
 
 		if (m_call.kind == FunctionCall::Kind::Library)
 		{
-			stream << _linePrefix << newline << ws << "library:" << ws << m_call.signature;
+			stream << _linePrefix << newline << ws << "library:" << ws;
+			if (!m_call.libraryFile.empty())
+				stream << "\"" << m_call.libraryFile << "\":";
+			stream << m_call.signature;
 			return;
 		}
 

From 9bc015071c38e288cc392be459ba706e6b613f7a Mon Sep 17 00:00:00 2001
From: Rohit Kumar Suman <99113868+RohitKS7@users.noreply.github.com>
Date: Sun, 19 Jun 2022 11:56:03 +0530
Subject: [PATCH 0705/1748] fix: Typo

Line 84!
By => With
to the them => to them
---
 docs/contracts/constant-state-variables.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contracts/constant-state-variables.rst b/docs/contracts/constant-state-variables.rst
index e917cad7f6..2e94397b12 100644
--- a/docs/contracts/constant-state-variables.rst
+++ b/docs/contracts/constant-state-variables.rst
@@ -81,7 +81,7 @@ construction time.
 
 The contract creation code generated by the compiler will modify the
 contract's runtime code before it is returned by replacing all references
-to immutables by the values assigned to the them. This is important if
+to immutables with the values assigned to them. This is important if
 you are comparing the
 runtime code generated by the compiler with the one actually stored in the
 blockchain.
@@ -95,4 +95,4 @@ blockchain.
 
   This is a safeguard against different interpretations about the order
   of state variable initialization and constructor execution, especially
-  with regards to inheritance.
\ No newline at end of file
+  with regards to inheritance.

From 18784cff81210cc55ddac793961d38611de1cbed Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 8 Jun 2022 18:12:27 +0200
Subject: [PATCH 0706/1748] Add all path declarations in IdentifierPath
 annotation

---
 libsolidity/analysis/NameAndTypeResolver.cpp | 22 +++++++++++++++++---
 libsolidity/analysis/NameAndTypeResolver.h   |  4 ++++
 libsolidity/analysis/ReferencesResolver.cpp  |  7 ++++---
 libsolidity/ast/ASTAnnotations.h             |  3 +++
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index 968aa744cc..239aadf45f 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -185,8 +185,18 @@ vector<Declaration const*> NameAndTypeResolver::nameFromCurrentScope(ASTString c
 }
 
 Declaration const* NameAndTypeResolver::pathFromCurrentScope(vector<ASTString> const& _path) const
+{
+	if (auto declarations = pathFromCurrentScopeWithAllDeclarations(_path); !declarations.empty())
+		return declarations.back();
+
+	return nullptr;
+}
+
+std::vector<Declaration const*> NameAndTypeResolver::pathFromCurrentScopeWithAllDeclarations(std::vector<ASTString> const& _path) const
 {
 	solAssert(!_path.empty(), "");
+	vector<Declaration const*> pathDeclarations;
+
 	vector<Declaration const*> candidates = m_currentScope->resolveName(
 		_path.front(),
 		/* _recursive */ true,
@@ -197,13 +207,19 @@ Declaration const* NameAndTypeResolver::pathFromCurrentScope(vector<ASTString> c
 	for (size_t i = 1; i < _path.size() && candidates.size() == 1; i++)
 	{
 		if (!m_scopes.count(candidates.front()))
-			return nullptr;
+			return {};
+
+		pathDeclarations.push_back(candidates.front());
+
 		candidates = m_scopes.at(candidates.front())->resolveName(_path[i], false);
 	}
 	if (candidates.size() == 1)
-		return candidates.front();
+	{
+		pathDeclarations.push_back(candidates.front());
+		return pathDeclarations;
+	}
 	else
-		return nullptr;
+		return {};
 }
 
 void NameAndTypeResolver::warnHomonymDeclarations() const
diff --git a/libsolidity/analysis/NameAndTypeResolver.h b/libsolidity/analysis/NameAndTypeResolver.h
index 36a22ed2eb..f0a6717622 100644
--- a/libsolidity/analysis/NameAndTypeResolver.h
+++ b/libsolidity/analysis/NameAndTypeResolver.h
@@ -93,6 +93,10 @@ class NameAndTypeResolver
 	/// Should only be called during the initial resolving phase.
 	/// @note Returns a null pointer if any component in the path was not unique or not found.
 	Declaration const* pathFromCurrentScope(std::vector<ASTString> const& _path) const;
+	/// Resolves a path starting from the "current" scope, but also searches parent scopes.
+	/// Should only be called during the initial resolving phase.
+	/// @note Returns an empty vector if any component in the path was not unique or not found otherwise all declarations along the path are returned.
+	std::vector<Declaration const*> pathFromCurrentScopeWithAllDeclarations(std::vector<ASTString> const& _path) const;
 
 	/// Generate and store warnings about declarations with the same name.
 	void warnHomonymDeclarations() const;
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index 6b58ab27c8..bf1fef7aa8 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -173,14 +173,15 @@ void ReferencesResolver::endVisit(ModifierDefinition const&)
 
 void ReferencesResolver::endVisit(IdentifierPath const& _path)
 {
-	Declaration const* declaration = m_resolver.pathFromCurrentScope(_path.path());
-	if (!declaration)
+	std::vector<Declaration const*> declarations = m_resolver.pathFromCurrentScopeWithAllDeclarations(_path.path());
+	if (declarations.empty())
 	{
 		m_errorReporter.fatalDeclarationError(7920_error, _path.location(), "Identifier not found or not unique.");
 		return;
 	}
 
-	_path.annotation().referencedDeclaration = declaration;
+	_path.annotation().referencedDeclaration = declarations.back();
+	_path.annotation().pathDeclarations = std::move(declarations);
 }
 
 bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly)
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index 3497a2ea82..2615e6af78 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -256,6 +256,9 @@ struct IdentifierPathAnnotation: ASTAnnotation
 	Declaration const* referencedDeclaration = nullptr;
 	/// What kind of lookup needs to be done (static, virtual, super) find the declaration.
 	util::SetOnce<VirtualLookup> requiredLookup;
+
+	/// Declaration of each path element.
+	std::vector<Declaration const*> pathDeclarations;
 };
 
 struct ExpressionAnnotation: ASTAnnotation

From 5d2e1343788f3374980091ee7fec87fa17d06c26 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 8 Jun 2022 18:13:49 +0200
Subject: [PATCH 0707/1748] Add all path locations to the IdentifierPath
 ASTNode

---
 libsolidity/ast/AST.h                         | 15 +++++++++--
 libsolidity/ast/ASTJsonExporter.cpp           |  6 +++++
 libsolidity/ast/ASTJsonImporter.cpp           | 19 ++++++++++++-
 libsolidity/parsing/Parser.cpp                | 27 +++++++++++++++----
 .../ASTJSON/assembly/slot_offset.json         |  4 +++
 .../assembly/slot_offset_parseOnly.json       |  4 +++
 .../ASTJSON/base_constructor_call.json        |  8 ++++++
 .../base_constructor_call_parseOnly.json      |  8 ++++++
 .../ASTJSON/contract_dep_order.json           | 16 +++++++++++
 .../ASTJSON/contract_dep_order_parseOnly.json | 16 +++++++++++
 .../ASTJSON/enum_value_declaration.json       |  4 +++
 .../enum_value_declaration_parseOnly.json     |  4 +++
 .../ASTJSON/fail_after_parsing_parseOnly.json | 12 +++++++++
 .../ASTJSON/inheritance_specifier.json        |  4 +++
 .../inheritance_specifier_parseOnly.json      |  4 +++
 test/libsolidity/ASTJSON/mappings.json        |  8 ++++++
 .../ASTJSON/mappings_parseOnly.json           |  8 ++++++
 .../ASTJSON/modifier_definition.json          |  4 +++
 .../modifier_definition_parseOnly.json        |  4 +++
 .../ASTJSON/modifier_invocation.json          |  4 +++
 .../modifier_invocation_parseOnly.json        |  4 +++
 .../not_existing_import_parseOnly.json        | 10 +++++++
 test/libsolidity/ASTJSON/override.json        |  8 ++++++
 .../ASTJSON/override_parseOnly.json           |  8 ++++++
 .../ASTJSON/two_base_functions.json           | 16 +++++++++++
 .../ASTJSON/two_base_functions_parseOnly.json | 16 +++++++++++
 .../ASTJSON/userDefinedValueType.json         | 16 +++++++++++
 .../userDefinedValueType_parseOnly.json       | 16 +++++++++++
 .../ASTJSON/using_for_directive.json          |  8 ++++++
 .../using_for_directive_parseOnly.json        |  8 ++++++
 30 files changed, 281 insertions(+), 8 deletions(-)

diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 4eba73c5d8..9c4c10b2fa 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -587,10 +587,19 @@ class ContractDefinition: public Declaration, public StructurallyDocumented, pub
 class IdentifierPath: public ASTNode
 {
 public:
-	IdentifierPath(int64_t _id, SourceLocation const& _location, std::vector<ASTString> _path):
-		ASTNode(_id, _location), m_path(std::move(_path)) {}
+	IdentifierPath(
+		int64_t _id,
+		SourceLocation const& _location,
+		std::vector<ASTString> _path,
+		std::vector<SourceLocation> _pathLocations
+	):
+		ASTNode(_id, _location), m_path(std::move(_path)), m_pathLocations(std::move(_pathLocations))
+	{
+		solAssert(m_pathLocations.size() == m_path.size());
+	}
 
 	std::vector<ASTString> const& path() const { return m_path; }
+	std::vector<SourceLocation > const& pathLocations() const { return m_pathLocations; }
 	IdentifierPathAnnotation& annotation() const override
 	{
 		return initAnnotation<IdentifierPathAnnotation>();
@@ -600,6 +609,8 @@ class IdentifierPath: public ASTNode
 	void accept(ASTConstVisitor& _visitor) const override;
 private:
 	std::vector<ASTString> m_path;
+	// Corresponding locations for m_path. Array has same length and indices as m_path.
+	std::vector<SourceLocation> m_pathLocations;
 };
 
 class InheritanceSpecifier: public ASTNode
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index dffd51c30f..dfd4a2f931 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -294,8 +294,14 @@ bool ASTJsonExporter::visit(ContractDefinition const& _node)
 
 bool ASTJsonExporter::visit(IdentifierPath const& _node)
 {
+	Json::Value nameLocations = Json::arrayValue;
+
+	for (SourceLocation location: _node.pathLocations())
+		nameLocations.append(sourceLocationToString(location));
+
 	setJsonNode(_node, "IdentifierPath", {
 		make_pair("name", namePathToString(_node.path())),
+		make_pair("nameLocations", nameLocations),
 		make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration))
 	});
 	return false;
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 4fcea9aff2..0f692376c2 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -325,6 +325,7 @@ ASTPointer<IdentifierPath> ASTJsonImporter::createIdentifierPath(Json::Value con
 	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
 
 	vector<ASTString> namePath;
+	vector<SourceLocation> namePathLocations;
 	vector<string> strs;
 	string nameString = member(_node, "name").asString();
 	boost::algorithm::split(strs, nameString, boost::is_any_of("."));
@@ -334,7 +335,23 @@ ASTPointer<IdentifierPath> ASTJsonImporter::createIdentifierPath(Json::Value con
 		astAssert(!s.empty(), "Expected non-empty string for IdentifierPath element.");
 		namePath.emplace_back(s);
 	}
-	return createASTNode<IdentifierPath>(_node, namePath);
+
+	if (_node.isMember("nameLocations") && _node["nameLocations"].isArray())
+		for (auto const& val: _node["nameLocations"])
+			namePathLocations.emplace_back(langutil::parseSourceLocation(val.asString(), m_sourceNames));
+	else
+		namePathLocations.resize(namePath.size());
+
+	astAssert(
+		namePath.size() == namePathLocations.size(),
+		"SourceLocations don't match name paths."
+	);
+
+	return createASTNode<IdentifierPath>(
+		_node,
+		namePath,
+		namePathLocations
+	);
 }
 
 ASTPointer<InheritanceSpecifier> ASTJsonImporter::createInheritanceSpecifier(Json::Value const& _node)
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 554ebf75ca..15e9f6c53d 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1061,14 +1061,24 @@ ASTPointer<IdentifierPath> Parser::parseIdentifierPath()
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
 	nodeFactory.markEndPosition();
-	vector<ASTString> identifierPath{*expectIdentifierToken()};
+
+	auto [name, nameLocation] = expectIdentifierWithLocation();
+
+	vector<ASTString> identifierPath{*name};
+	vector<SourceLocation> identifierPathLocations{nameLocation};
+
 	while (m_scanner->currentToken() == Token::Period)
 	{
 		advance();
+
 		nodeFactory.markEndPosition();
-		identifierPath.push_back(*expectIdentifierTokenOrAddress());
+
+		tie(name, nameLocation) = expectIdentifierWithLocation();
+
+		identifierPath.push_back(*name);
+		identifierPathLocations.push_back(nameLocation);
 	}
-	return nodeFactory.createNode<IdentifierPath>(identifierPath);
+	return nodeFactory.createNode<IdentifierPath>(identifierPath, identifierPathLocations);
 }
 
 ASTPointer<TypeName> Parser::parseTypeNameSuffix(ASTPointer<TypeName> type, ASTNodeFactory& nodeFactory)
@@ -2286,9 +2296,16 @@ ASTPointer<TypeName> Parser::typeNameFromIndexAccessStructure(Parser::IndexAcces
 	else
 	{
 		vector<ASTString> path;
+		vector<SourceLocation> pathLocations;
+
 		for (auto const& el: _iap.path)
-			path.push_back(dynamic_cast<Identifier const&>(*el).name());
-		type = nodeFactory.createNode<UserDefinedTypeName>(nodeFactory.createNode<IdentifierPath>(path));
+		{
+			auto& identifier = dynamic_cast<Identifier const&>(*el);
+			path.push_back(identifier.name());
+			pathLocations.push_back(identifier.location());
+		}
+
+		type = nodeFactory.createNode<UserDefinedTypeName>(nodeFactory.createNode<IdentifierPath>(path, pathLocations));
 	}
 	for (auto const& lengthExpression: _iap.indices)
 	{
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset.json b/test/libsolidity/ASTJSON/assembly/slot_offset.json
index cc22c76e86..1e6fe1447a 100644
--- a/test/libsolidity/ASTJSON/assembly/slot_offset.json
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset.json
@@ -95,6 +95,10 @@
             {
               "id": 4,
               "name": "S",
+              "nameLocations":
+              [
+                "42:1:1"
+              ],
               "nodeType": "IdentifierPath",
               "referencedDeclaration": 3,
               "src": "42:1:1"
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json b/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
index 6407e4519f..4135bb3437 100644
--- a/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
@@ -66,6 +66,10 @@
             {
               "id": 4,
               "name": "S",
+              "nameLocations":
+              [
+                "42:1:1"
+              ],
               "nodeType": "IdentifierPath",
               "src": "42:1:1"
             },
diff --git a/test/libsolidity/ASTJSON/base_constructor_call.json b/test/libsolidity/ASTJSON/base_constructor_call.json
index bfbd716da9..774981fa94 100644
--- a/test/libsolidity/ASTJSON/base_constructor_call.json
+++ b/test/libsolidity/ASTJSON/base_constructor_call.json
@@ -113,6 +113,10 @@
           {
             "id": 8,
             "name": "A",
+            "nameLocations":
+            [
+              "50:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 7,
             "src": "50:1:1"
@@ -177,6 +181,10 @@
               {
                 "id": 11,
                 "name": "A",
+                "nameLocations":
+                [
+                  "68:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "referencedDeclaration": 7,
                 "src": "68:1:1"
diff --git a/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json b/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
index bd101b9b89..8af0c0b2ca 100644
--- a/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
+++ b/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
@@ -84,6 +84,10 @@
           {
             "id": 8,
             "name": "A",
+            "nameLocations":
+            [
+              "50:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "50:1:1"
           },
@@ -131,6 +135,10 @@
               {
                 "id": 11,
                 "name": "A",
+                "nameLocations":
+                [
+                  "68:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "src": "68:1:1"
               },
diff --git a/test/libsolidity/ASTJSON/contract_dep_order.json b/test/libsolidity/ASTJSON/contract_dep_order.json
index 754e14f4db..83865d7d4c 100644
--- a/test/libsolidity/ASTJSON/contract_dep_order.json
+++ b/test/libsolidity/ASTJSON/contract_dep_order.json
@@ -56,6 +56,10 @@
           {
             "id": 2,
             "name": "A",
+            "nameLocations":
+            [
+              "29:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 1,
             "src": "29:1:1"
@@ -92,6 +96,10 @@
           {
             "id": 5,
             "name": "B",
+            "nameLocations":
+            [
+              "49:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 4,
             "src": "49:1:1"
@@ -129,6 +137,10 @@
           {
             "id": 8,
             "name": "C",
+            "nameLocations":
+            [
+              "69:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 7,
             "src": "69:1:1"
@@ -167,6 +179,10 @@
           {
             "id": 11,
             "name": "D",
+            "nameLocations":
+            [
+              "89:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 10,
             "src": "89:1:1"
diff --git a/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json b/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
index 5fe9bb1954..2c8bdc7456 100644
--- a/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
+++ b/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
@@ -26,6 +26,10 @@
           {
             "id": 2,
             "name": "A",
+            "nameLocations":
+            [
+              "29:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "29:1:1"
           },
@@ -53,6 +57,10 @@
           {
             "id": 5,
             "name": "B",
+            "nameLocations":
+            [
+              "49:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "49:1:1"
           },
@@ -80,6 +88,10 @@
           {
             "id": 8,
             "name": "C",
+            "nameLocations":
+            [
+              "69:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "69:1:1"
           },
@@ -107,6 +119,10 @@
           {
             "id": 11,
             "name": "D",
+            "nameLocations":
+            [
+              "89:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "89:1:1"
           },
diff --git a/test/libsolidity/ASTJSON/enum_value_declaration.json b/test/libsolidity/ASTJSON/enum_value_declaration.json
index fc8506c2a1..3e6e7c24c9 100644
--- a/test/libsolidity/ASTJSON/enum_value_declaration.json
+++ b/test/libsolidity/ASTJSON/enum_value_declaration.json
@@ -131,6 +131,10 @@
               {
                 "id": 5,
                 "name": "A",
+                "nameLocations":
+                [
+                  "43:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "referencedDeclaration": 3,
                 "src": "43:1:1"
diff --git a/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json b/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
index f99b7cb876..f19bb2d9b1 100644
--- a/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
+++ b/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
@@ -99,6 +99,10 @@
               {
                 "id": 5,
                 "name": "A",
+                "nameLocations":
+                [
+                  "43:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "src": "43:1:1"
               },
diff --git a/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json b/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
index a5c7669ef5..e13cd2bffb 100644
--- a/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
+++ b/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
@@ -65,6 +65,10 @@
                 {
                   "id": 4,
                   "name": "S",
+                  "nameLocations":
+                  [
+                    "50:1:1"
+                  ],
                   "nodeType": "IdentifierPath",
                   "src": "50:1:1"
                 },
@@ -114,6 +118,10 @@
                       {
                         "id": 13,
                         "name": "error",
+                        "nameLocations":
+                        [
+                          "95:5:1"
+                        ],
                         "nodeType": "IdentifierPath",
                         "src": "95:5:1"
                       },
@@ -251,6 +259,10 @@
                   {
                     "id": 8,
                     "name": "E",
+                    "nameLocations":
+                    [
+                      "72:1:1"
+                    ],
                     "nodeType": "IdentifierPath",
                     "src": "72:1:1"
                   },
diff --git a/test/libsolidity/ASTJSON/inheritance_specifier.json b/test/libsolidity/ASTJSON/inheritance_specifier.json
index b74604265d..8959d5b5d4 100644
--- a/test/libsolidity/ASTJSON/inheritance_specifier.json
+++ b/test/libsolidity/ASTJSON/inheritance_specifier.json
@@ -44,6 +44,10 @@
           {
             "id": 2,
             "name": "C1",
+            "nameLocations":
+            [
+              "30:2:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 1,
             "src": "30:2:1"
diff --git a/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json b/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
index deddb52247..72da9ad2cc 100644
--- a/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
+++ b/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
@@ -26,6 +26,10 @@
           {
             "id": 2,
             "name": "C1",
+            "nameLocations":
+            [
+              "30:2:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "30:2:1"
           },
diff --git a/test/libsolidity/ASTJSON/mappings.json b/test/libsolidity/ASTJSON/mappings.json
index 16904ec8ad..e414b56fad 100644
--- a/test/libsolidity/ASTJSON/mappings.json
+++ b/test/libsolidity/ASTJSON/mappings.json
@@ -87,6 +87,10 @@
               {
                 "id": 5,
                 "name": "C",
+                "nameLocations":
+                [
+                  "48:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "referencedDeclaration": 19,
                 "src": "48:1:1"
@@ -201,6 +205,10 @@
               {
                 "id": 14,
                 "name": "E",
+                "nameLocations":
+                [
+                  "106:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "referencedDeclaration": 4,
                 "src": "106:1:1"
diff --git a/test/libsolidity/ASTJSON/mappings_parseOnly.json b/test/libsolidity/ASTJSON/mappings_parseOnly.json
index 977ee776c3..e4f7ee21af 100644
--- a/test/libsolidity/ASTJSON/mappings_parseOnly.json
+++ b/test/libsolidity/ASTJSON/mappings_parseOnly.json
@@ -68,6 +68,10 @@
               {
                 "id": 5,
                 "name": "C",
+                "nameLocations":
+                [
+                  "48:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "src": "48:1:1"
               },
@@ -146,6 +150,10 @@
               {
                 "id": 14,
                 "name": "E",
+                "nameLocations":
+                [
+                  "106:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "src": "106:1:1"
               },
diff --git a/test/libsolidity/ASTJSON/modifier_definition.json b/test/libsolidity/ASTJSON/modifier_definition.json
index 67aa3e1eac..aa448568c1 100644
--- a/test/libsolidity/ASTJSON/modifier_definition.json
+++ b/test/libsolidity/ASTJSON/modifier_definition.json
@@ -131,6 +131,10 @@
               {
                 "id": 8,
                 "name": "M",
+                "nameLocations":
+                [
+                  "52:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "referencedDeclaration": 6,
                 "src": "52:1:1"
diff --git a/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json b/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
index a31b1f240c..9344e419a1 100644
--- a/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
+++ b/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
@@ -99,6 +99,10 @@
               {
                 "id": 8,
                 "name": "M",
+                "nameLocations":
+                [
+                  "52:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "src": "52:1:1"
               },
diff --git a/test/libsolidity/ASTJSON/modifier_invocation.json b/test/libsolidity/ASTJSON/modifier_invocation.json
index 67aa3e1eac..aa448568c1 100644
--- a/test/libsolidity/ASTJSON/modifier_invocation.json
+++ b/test/libsolidity/ASTJSON/modifier_invocation.json
@@ -131,6 +131,10 @@
               {
                 "id": 8,
                 "name": "M",
+                "nameLocations":
+                [
+                  "52:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "referencedDeclaration": 6,
                 "src": "52:1:1"
diff --git a/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json b/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
index a31b1f240c..9344e419a1 100644
--- a/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
+++ b/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
@@ -99,6 +99,10 @@
               {
                 "id": 8,
                 "name": "M",
+                "nameLocations":
+                [
+                  "52:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "src": "52:1:1"
               },
diff --git a/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json b/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
index a36c59fffb..de14043f34 100644
--- a/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
+++ b/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
@@ -23,6 +23,11 @@
           {
             "id": 2,
             "name": "NotExisting.X",
+            "nameLocations":
+            [
+              "55:11:1",
+              "67:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "55:13:1"
           },
@@ -58,6 +63,11 @@
             {
               "id": 4,
               "name": "NotExisting.SomeStruct",
+              "nameLocations":
+              [
+                "72:11:1",
+                "84:10:1"
+              ],
               "nodeType": "IdentifierPath",
               "src": "72:22:1"
             },
diff --git a/test/libsolidity/ASTJSON/override.json b/test/libsolidity/ASTJSON/override.json
index 639572c546..a7c43767f5 100644
--- a/test/libsolidity/ASTJSON/override.json
+++ b/test/libsolidity/ASTJSON/override.json
@@ -86,6 +86,10 @@
           {
             "id": 6,
             "name": "A",
+            "nameLocations":
+            [
+              "72:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 5,
             "src": "72:1:1"
@@ -200,6 +204,10 @@
           {
             "id": 17,
             "name": "B",
+            "nameLocations":
+            [
+              "167:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 16,
             "src": "167:1:1"
diff --git a/test/libsolidity/ASTJSON/override_parseOnly.json b/test/libsolidity/ASTJSON/override_parseOnly.json
index b092df4591..fe9d8a7c63 100644
--- a/test/libsolidity/ASTJSON/override_parseOnly.json
+++ b/test/libsolidity/ASTJSON/override_parseOnly.json
@@ -62,6 +62,10 @@
           {
             "id": 6,
             "name": "A",
+            "nameLocations":
+            [
+              "72:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "72:1:1"
           },
@@ -159,6 +163,10 @@
           {
             "id": 17,
             "name": "B",
+            "nameLocations":
+            [
+              "167:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "167:1:1"
           },
diff --git a/test/libsolidity/ASTJSON/two_base_functions.json b/test/libsolidity/ASTJSON/two_base_functions.json
index 2098b3cd53..23bdf6efe0 100644
--- a/test/libsolidity/ASTJSON/two_base_functions.json
+++ b/test/libsolidity/ASTJSON/two_base_functions.json
@@ -144,6 +144,10 @@
           {
             "id": 11,
             "name": "A",
+            "nameLocations":
+            [
+              "114:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 5,
             "src": "114:1:1"
@@ -157,6 +161,10 @@
           {
             "id": 13,
             "name": "B",
+            "nameLocations":
+            [
+              "117:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 10,
             "src": "117:1:1"
@@ -212,6 +220,10 @@
               {
                 "id": 16,
                 "name": "A",
+                "nameLocations":
+                [
+                  "154:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "referencedDeclaration": 5,
                 "src": "154:1:1"
@@ -219,6 +231,10 @@
               {
                 "id": 17,
                 "name": "B",
+                "nameLocations":
+                [
+                  "157:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "referencedDeclaration": 10,
                 "src": "157:1:1"
diff --git a/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json b/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
index 7a077e7052..078dc5daab 100644
--- a/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
+++ b/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
@@ -111,6 +111,10 @@
           {
             "id": 11,
             "name": "A",
+            "nameLocations":
+            [
+              "114:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "114:1:1"
           },
@@ -123,6 +127,10 @@
           {
             "id": 13,
             "name": "B",
+            "nameLocations":
+            [
+              "117:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "117:1:1"
           },
@@ -163,12 +171,20 @@
               {
                 "id": 16,
                 "name": "A",
+                "nameLocations":
+                [
+                  "154:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "src": "154:1:1"
               },
               {
                 "id": 17,
                 "name": "B",
+                "nameLocations":
+                [
+                  "157:1:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "src": "157:1:1"
               }
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType.json b/test/libsolidity/ASTJSON/userDefinedValueType.json
index df7aa69c89..17bb19efae 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType.json
@@ -103,6 +103,10 @@
                   {
                     "id": 7,
                     "name": "MyAddress",
+                    "nameLocations":
+                    [
+                      "67:9:1"
+                    ],
                     "nodeType": "IdentifierPath",
                     "referencedDeclaration": 2,
                     "src": "67:9:1"
@@ -153,6 +157,10 @@
                   {
                     "id": 11,
                     "name": "MyUInt",
+                    "nameLocations":
+                    [
+                      "84:6:1"
+                    ],
                     "nodeType": "IdentifierPath",
                     "referencedDeclaration": 4,
                     "src": "84:6:1"
@@ -287,6 +295,10 @@
               {
                 "id": 21,
                 "name": "MyAddress",
+                "nameLocations":
+                [
+                  "177:9:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "referencedDeclaration": 18,
                 "src": "177:9:1"
@@ -314,6 +326,10 @@
               {
                 "id": 23,
                 "name": "MyUInt",
+                "nameLocations":
+                [
+                  "190:6:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "referencedDeclaration": 20,
                 "src": "190:6:1"
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
index 36315b4435..3cef5ea47e 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
@@ -69,6 +69,10 @@
                   {
                     "id": 7,
                     "name": "MyAddress",
+                    "nameLocations":
+                    [
+                      "67:9:1"
+                    ],
                     "nodeType": "IdentifierPath",
                     "src": "67:9:1"
                   },
@@ -108,6 +112,10 @@
                   {
                     "id": 11,
                     "name": "MyUInt",
+                    "nameLocations":
+                    [
+                      "84:6:1"
+                    ],
                     "nodeType": "IdentifierPath",
                     "src": "84:6:1"
                   },
@@ -213,6 +221,10 @@
               {
                 "id": 21,
                 "name": "MyAddress",
+                "nameLocations":
+                [
+                  "177:9:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "src": "177:9:1"
               },
@@ -230,6 +242,10 @@
               {
                 "id": 23,
                 "name": "MyUInt",
+                "nameLocations":
+                [
+                  "190:6:1"
+                ],
                 "nodeType": "IdentifierPath",
                 "src": "190:6:1"
               },
diff --git a/test/libsolidity/ASTJSON/using_for_directive.json b/test/libsolidity/ASTJSON/using_for_directive.json
index c9052b0d7d..57658134dd 100644
--- a/test/libsolidity/ASTJSON/using_for_directive.json
+++ b/test/libsolidity/ASTJSON/using_for_directive.json
@@ -27,6 +27,10 @@
           {
             "id": 1,
             "name": "f",
+            "nameLocations":
+            [
+              "7:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 10,
             "src": "7:1:1"
@@ -161,6 +165,10 @@
           {
             "id": 11,
             "name": "L",
+            "nameLocations":
+            [
+              "72:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "referencedDeclaration": 4,
             "src": "72:1:1"
diff --git a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
index d704b4e815..84de310c00 100644
--- a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
+++ b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
@@ -12,6 +12,10 @@
           {
             "id": 1,
             "name": "f",
+            "nameLocations":
+            [
+              "7:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "7:1:1"
           }
@@ -118,6 +122,10 @@
           {
             "id": 11,
             "name": "L",
+            "nameLocations":
+            [
+              "72:1:1"
+            ],
             "nodeType": "IdentifierPath",
             "src": "72:1:1"
           },

From 8c5f5c7db09a565e8b1c897cbd5d5f2160e6c8bd Mon Sep 17 00:00:00 2001
From: Daniel Lupu <dflupu@gmail.com>
Date: Mon, 2 May 2022 00:10:37 +0300
Subject: [PATCH 0708/1748] add rules for mod(mul(X, Y), A) & mod(add(X, Y), A)

---
 libevmasm/RuleList.h                          | 20 ++++++++++++++++++-
 .../combine_add_and_mod_constant.yul          | 13 ++++++++++++
 .../combine_mul_and_mod_constant.yul          | 13 ++++++++++++
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 test/libyul/yulOptimizerTests/expressionSimplifier/combine_add_and_mod_constant.yul
 create mode 100644 test/libyul/yulOptimizerTests/expressionSimplifier/combine_mul_and_mod_constant.yul

diff --git a/libevmasm/RuleList.h b/libevmasm/RuleList.h
index ec0970e65a..1ed1014554 100644
--- a/libevmasm/RuleList.h
+++ b/libevmasm/RuleList.h
@@ -279,7 +279,7 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleListPart5(
 	Pattern B,
 	Pattern,
 	Pattern X,
-	Pattern
+	Pattern Y
 )
 {
 	using Word = typename Pattern::Word;
@@ -287,6 +287,24 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleListPart5(
 
 	std::vector<SimplificationRule<Pattern>> rules;
 
+	// Replace MOD(MUL(X, Y), A) with MULMOD(X, Y, A) iff A=2**N
+	rules.push_back({
+		Builtins::MOD(Builtins::MUL(X, Y), A),
+		[=]() -> Pattern { return Builtins::MULMOD(X, Y, A); },
+		[=] {
+			return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0);
+		}
+	});
+
+	// Replace MOD(ADD(X, Y), A) with ADDMOD(X, Y, A) iff A=2**N
+	rules.push_back({
+		Builtins::MOD(Builtins::ADD(X, Y), A),
+		[=]() -> Pattern { return Builtins::ADDMOD(X, Y, A); },
+		[=] {
+			return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0);
+		}
+	});
+
 	// Replace MOD X, <power-of-two> with AND X, <power-of-two> - 1
 	for (size_t i = 0; i < Pattern::WordSize; ++i)
 	{
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_add_and_mod_constant.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_add_and_mod_constant.yul
new file mode 100644
index 0000000000..f462486ea1
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_add_and_mod_constant.yul
@@ -0,0 +1,13 @@
+{
+    mstore(0, mod(add(mload(0), mload(1)), 32))
+}
+// ----
+// step: expressionSimplifier
+//
+// {
+//     {
+//         let _3 := mload(1)
+//         let _4 := 0
+//         mstore(_4, addmod(mload(_4), _3, 32))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/combine_mul_and_mod_constant.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_mul_and_mod_constant.yul
new file mode 100644
index 0000000000..93edb53196
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/combine_mul_and_mod_constant.yul
@@ -0,0 +1,13 @@
+{
+    mstore(0, mod(mul(mload(0), mload(1)), 32))
+}
+// ----
+// step: expressionSimplifier
+//
+// {
+//     {
+//         let _3 := mload(1)
+//         let _4 := 0
+//         mstore(_4, mulmod(mload(_4), _3, 32))
+//     }
+// }

From d1e382f2a883f2df8b67e0332c986b0801cd7a34 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 8 Jun 2022 18:07:55 +0200
Subject: [PATCH 0709/1748] Python Z3 proofs of the rules.

---
 test/formal/mod_add_to_addmod.py | 31 +++++++++++++++++++++++++++++++
 test/formal/mod_mul_to_mulmod.py | 31 +++++++++++++++++++++++++++++++
 test/formal/opcodes.py           |  8 +++++++-
 3 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 test/formal/mod_add_to_addmod.py
 create mode 100644 test/formal/mod_mul_to_mulmod.py

diff --git a/test/formal/mod_add_to_addmod.py b/test/formal/mod_add_to_addmod.py
new file mode 100644
index 0000000000..60093b7fed
--- /dev/null
+++ b/test/formal/mod_add_to_addmod.py
@@ -0,0 +1,31 @@
+from opcodes import MOD, ADD, ADDMOD
+from rule import Rule
+from z3 import BitVec
+
+"""
+Rule:
+MOD(ADD(X, Y), A) -> ADDMOD(X, Y, A)
+given
+    A > 0
+    A & (A - 1) == 0
+"""
+
+rule = Rule()
+
+n_bits = 32
+
+# Input vars
+X = BitVec('X', n_bits)
+Y = BitVec('Y', n_bits)
+A = BitVec('A', n_bits)
+
+# Non optimized result
+nonopt = MOD(ADD(X, Y), A)
+
+# Optimized result
+opt = ADDMOD(X, Y, A)
+
+rule.require(A > 0)
+rule.require(((A & (A - 1)) == 0))
+
+rule.check(nonopt, opt)
diff --git a/test/formal/mod_mul_to_mulmod.py b/test/formal/mod_mul_to_mulmod.py
new file mode 100644
index 0000000000..812f341ea8
--- /dev/null
+++ b/test/formal/mod_mul_to_mulmod.py
@@ -0,0 +1,31 @@
+from opcodes import MOD, MUL, MULMOD
+from rule import Rule
+from z3 import BitVec
+
+"""
+Rule:
+MOD(MUL(X, Y), A) -> MULMOD(X, Y, A)
+given
+    A > 0
+    A & (A - 1) == 0
+"""
+
+rule = Rule()
+
+n_bits = 8
+
+# Input vars
+X = BitVec('X', n_bits)
+Y = BitVec('Y', n_bits)
+A = BitVec('A', n_bits)
+
+# Non optimized result
+nonopt = MOD(MUL(X, Y), A)
+
+# Optimized result
+opt = MULMOD(X, Y, A)
+
+rule.require(A > 0)
+rule.require(((A & (A - 1)) == 0))
+
+rule.check(nonopt, opt)
diff --git a/test/formal/opcodes.py b/test/formal/opcodes.py
index 103e57a14c..e091e7847b 100644
--- a/test/formal/opcodes.py
+++ b/test/formal/opcodes.py
@@ -1,4 +1,4 @@
-from z3 import BitVecVal, BV2Int, If, LShR, UDiv, ULT, UGT, URem
+from z3 import BitVecVal, BV2Int, If, LShR, UDiv, ULT, UGT, URem, ZeroExt, Extract
 
 def ADD(x, y):
 	return x + y
@@ -18,6 +18,12 @@ def SDIV(x, y):
 def MOD(x, y):
 	return If(y == 0, 0, URem(x, y))
 
+def MULMOD(x, y, m):
+	return If(m == 0, 0, Extract(x.size() - 1, 0, URem(ZeroExt(x.size(), x) * ZeroExt(x.size(), y), ZeroExt(m.size(), m))))
+
+def ADDMOD(x, y, m):
+	return If(m == 0, 0, Extract(x.size() - 1, 0, URem(ZeroExt(1, x) + ZeroExt(1, y), ZeroExt(1, m))))
+
 def SMOD(x, y):
 	return If(y == 0, 0, x % y)
 

From b99f85ec65e0353051ff2efd4145aeb479950c51 Mon Sep 17 00:00:00 2001
From: Daniel Lupu <dflupu@gmail.com>
Date: Sat, 11 Jun 2022 13:43:55 +0300
Subject: [PATCH 0710/1748] Only apply rules for yul optimizer

---
 libevmasm/RuleList.h | 39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/libevmasm/RuleList.h b/libevmasm/RuleList.h
index 1ed1014554..9b20d0f8be 100644
--- a/libevmasm/RuleList.h
+++ b/libevmasm/RuleList.h
@@ -275,6 +275,7 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleListPart4_5(
 
 template <class Pattern>
 std::vector<SimplificationRule<Pattern>> simplificationRuleListPart5(
+	bool _forYulOptimizer,
 	Pattern A,
 	Pattern B,
 	Pattern,
@@ -287,23 +288,27 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleListPart5(
 
 	std::vector<SimplificationRule<Pattern>> rules;
 
-	// Replace MOD(MUL(X, Y), A) with MULMOD(X, Y, A) iff A=2**N
-	rules.push_back({
-		Builtins::MOD(Builtins::MUL(X, Y), A),
-		[=]() -> Pattern { return Builtins::MULMOD(X, Y, A); },
-		[=] {
-			return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0);
-		}
-	});
+	// The libevmasm optimizer does not support rules resulting in opcodes with more than two arguments.
+	if (_forYulOptimizer)
+	{
+		// Replace MOD(MUL(X, Y), A) with MULMOD(X, Y, A) iff A=2**N
+		rules.push_back({
+			Builtins::MOD(Builtins::MUL(X, Y), A),
+			[=]() -> Pattern { return Builtins::MULMOD(X, Y, A); },
+			[=] {
+				return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0);
+			}
+		});
 
-	// Replace MOD(ADD(X, Y), A) with ADDMOD(X, Y, A) iff A=2**N
-	rules.push_back({
-		Builtins::MOD(Builtins::ADD(X, Y), A),
-		[=]() -> Pattern { return Builtins::ADDMOD(X, Y, A); },
-		[=] {
-			return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0);
-		}
-	});
+		// Replace MOD(ADD(X, Y), A) with ADDMOD(X, Y, A) iff A=2**N
+		rules.push_back({
+			Builtins::MOD(Builtins::ADD(X, Y), A),
+			[=]() -> Pattern { return Builtins::ADDMOD(X, Y, A); },
+			[=] {
+				return A.d() > 0 && ((A.d() & (A.d() - 1)) == 0);
+			}
+		});
+	}
 
 	// Replace MOD X, <power-of-two> with AND X, <power-of-two> - 1
 	for (size_t i = 0; i < Pattern::WordSize; ++i)
@@ -816,7 +821,7 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleList(
 	rules += simplificationRuleListPart3(A, B, C, W, X);
 	rules += simplificationRuleListPart4(A, B, C, W, X);
 	rules += simplificationRuleListPart4_5(A, B, C, W, X);
-	rules += simplificationRuleListPart5(A, B, C, W, X);
+	rules += simplificationRuleListPart5(_evmVersion.has_value(), A, B, C, W, X);
 	rules += simplificationRuleListPart6(A, B, C, W, X);
 	rules += simplificationRuleListPart7(A, B, C, W, X);
 	rules += simplificationRuleListPart8(A, B, C, W, X);

From 8498fdf1d4978fc1759985f4921382d637a96e36 Mon Sep 17 00:00:00 2001
From: Daniel Lupu <dflupu@gmail.com>
Date: Wed, 15 Jun 2022 23:27:40 +0300
Subject: [PATCH 0711/1748] Add changelog entries

---
 Changelog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 6bc2f8af4c..ee03bffa21 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,8 @@ Language Features:
 Compiler Features:
  * TypeChecker: Support using library constants in initializers of other constants.
  * Yul IR Code Generation: Improved copy routines for arrays with packed storage layout.
+ * Yul Optimizer: Add rule to convert `mod(mul(X, Y), A)` into `mulmod(X, Y, A)`, if `A` is a power of two.
+ * Yul Optimizer: Add rule to convert `mod(add(X, Y), A)` into `addmod(X, Y, A)`, if `A` is a power of two.
 
 
 Bugfixes:

From 03409beb1d8d396612872da2163261f8471c6198 Mon Sep 17 00:00:00 2001
From: "Mathias L. Baumann" <Marenz@users.noreply.github.com>
Date: Wed, 22 Jun 2022 13:25:24 +0200
Subject: [PATCH 0712/1748] Update libsolidity/analysis/NameAndTypeResolver.h

Co-authored-by: Damian Wechman <damian.wechman.it@gmail.com>
---
 libsolidity/analysis/NameAndTypeResolver.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/analysis/NameAndTypeResolver.h b/libsolidity/analysis/NameAndTypeResolver.h
index f0a6717622..2bf238a00e 100644
--- a/libsolidity/analysis/NameAndTypeResolver.h
+++ b/libsolidity/analysis/NameAndTypeResolver.h
@@ -95,7 +95,7 @@ class NameAndTypeResolver
 	Declaration const* pathFromCurrentScope(std::vector<ASTString> const& _path) const;
 	/// Resolves a path starting from the "current" scope, but also searches parent scopes.
 	/// Should only be called during the initial resolving phase.
-	/// @note Returns an empty vector if any component in the path was not unique or not found otherwise all declarations along the path are returned.
+	/// @note Returns an empty vector if any component in the path was non-unique or not found. Otherwise, all declarations along the path are returned.
 	std::vector<Declaration const*> pathFromCurrentScopeWithAllDeclarations(std::vector<ASTString> const& _path) const;
 
 	/// Generate and store warnings about declarations with the same name.

From b78960c604a73f241424add4d568248873d1aa7e Mon Sep 17 00:00:00 2001
From: ywon0925 <9788667@gmail.com>
Date: Wed, 22 Jun 2022 20:52:58 +0900
Subject: [PATCH 0713/1748] Add a Catch to handle exception

---
 test/tools/isoltest.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index 6e00b12d6e..cb7ab1eb56 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -509,6 +509,11 @@ int main(int argc, char const *argv[])
 		cerr << exception.what() << endl;
 		return EXIT_FAILURE;
 	}
+	catch (solidity::test::ConfigException const& exception)
+	{
+		cerr << exception.what() << endl;
+		return EXIT_FAILURE;
+	}
 	catch (...)
 	{
 		cerr << "Unhandled exception caught." << endl;

From 0ee38c5d5410a369b20ba244c7f60a4114fcc227 Mon Sep 17 00:00:00 2001
From: ywon0925 <9788667@gmail.com>
Date: Wed, 22 Jun 2022 20:53:40 +0900
Subject: [PATCH 0714/1748] Rename boostTest.cpp to soltest.cpp, changed
 CMakeLists.txt accordingly

---
 test/CMakeLists.txt                 | 2 +-
 test/{boostTest.cpp => soltest.cpp} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename test/{boostTest.cpp => soltest.cpp} (100%)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 255218c159..cc7a61bae2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(sources
-    boostTest.cpp
+    soltest.cpp
     Common.cpp
     Common.h
     CommonSyntaxTest.cpp
diff --git a/test/boostTest.cpp b/test/soltest.cpp
similarity index 100%
rename from test/boostTest.cpp
rename to test/soltest.cpp

From 392b1872b3687e1c33e4f8987732180fe518f0ff Mon Sep 17 00:00:00 2001
From: Aiman Baharna <aiman@users.noreply.github.com>
Date: Wed, 22 Jun 2022 17:05:30 +0100
Subject: [PATCH 0715/1748] docs: Disallow decimal literals with trailing dots

Currently the documentation suggests that a decimal literal can omit the
fractional part [1]:

> Decimal fractional literals are formed by a `.` with at least one
> number on one side. Examples include `1.`, `.1` and `1.3`.

However, commit ac68710 (May 30, 2018) disallowed trailing dots that are
not followed by a number [2].

Using decimal literals of the form `1.` will actually result in a
`ParserError` and so the docs should no longer recommend this form.

[1] https://docs.soliditylang.org/en/v0.8.15/types.html#rational-and-integer-literals
[2] https://github.com/ethereum/solidity/commit/ac6871078940f0ae4a47380091fc46ed46a63d0a
---
 docs/types/value-types.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index cc3f17dd3b..6aebdaf4fc 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -448,8 +448,8 @@ Integer literals are formed from a sequence of digits in the range 0-9.
 They are interpreted as decimals. For example, ``69`` means sixty nine.
 Octal literals do not exist in Solidity and leading zeros are invalid.
 
-Decimal fractional literals are formed by a ``.`` with at least one number on
-one side.  Examples include ``1.``, ``.1`` and ``1.3``.
+Decimal fractional literals are formed by a ``.`` with at least one number after the decimal point.
+Examples include ``.1`` and ``1.3`` (but not ``1.``).
 
 Scientific notation in the form of ``2e10`` is also supported, where the
 mantissa can be fractional but the exponent has to be an integer.

From 4fd5c11af789d91731b31790e5131a1d90f3b00d Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Fri, 3 Jun 2022 17:04:16 -0300
Subject: [PATCH 0716/1748] Checks for overflow/underflow after add/sub
 operations.

---
 Changelog.md                                  |   2 +-
 libsolidity/codegen/YulUtilFunctions.cpp      |  56 +++++---
 test/cmdlineTests/asm_json/output             | 129 ++++++++----------
 .../asm_json_no_pretty_print/output           |   2 +-
 .../cmdlineTests/optimizer_array_sload/output |   7 +-
 .../output                                    |  72 +++++-----
 .../output                                    |  72 +++++-----
 .../output.json                               | 111 +++++++--------
 .../output.json                               |  77 ++++++-----
 test/formal/checked_int_add.py                |  15 +-
 test/formal/checked_int_sub.py                |  15 +-
 test/formal/checked_uint_add.py               |  12 +-
 test/formal/checked_uint_sub.py               |  12 +-
 .../copying/array_copy_target_leftover.sol    |   6 +-
 .../array_nested_calldata_to_storage.sol      |   8 +-
 .../array_nested_memory_to_storage.sol        |  12 +-
 .../array/dynamic_array_cleanup.sol           |   6 +-
 .../array/fixed_array_cleanup.sol             |   6 +-
 .../array/pop/array_pop_array_transition.sol  |   4 +-
 .../array/pop/array_pop_uint16_transition.sol |   4 +-
 .../array/pop/array_pop_uint24_transition.sol |   4 +-
 .../pop/byte_array_pop_long_storage_empty.sol |   6 +-
 .../array/push/byte_array_push_transition.sol |   4 +-
 ...ructor_with_params_diamond_inheritance.sol |   6 +-
 .../constructor_with_params_inheritance.sol   |   6 +-
 .../events/event_dynamic_array_storage.sol    |   6 +-
 .../events/event_dynamic_array_storage_v2.sol |   6 +-
 .../event_dynamic_nested_array_storage_v2.sol |   4 +-
 .../externalContracts/base64.sol              |  18 +--
 .../externalContracts/deposit_contract.sol    |   6 +-
 .../externalContracts/prbmath_signed.sol      |   6 +-
 .../externalContracts/prbmath_unsigned.sol    |   6 +-
 .../externalContracts/ramanujan_pi.sol        |   6 +-
 .../semanticTests/externalContracts/snark.sol |   2 +-
 .../externalContracts/strings.sol             |  12 +-
 .../external_call_to_nonexisting.sol          |   6 +-
 ...ernal_call_to_nonexisting_debugstrings.sol |   6 +-
 .../functionCall/failed_create.sol            |   6 +-
 .../functionTypes/store_function.sol          |   4 +-
 .../semanticTests/immutable/use_scratch.sol   |   4 +-
 .../salted_create_with_value.sol              |   6 +-
 .../userDefinedValueType/erc20.sol            |   6 +-
 .../using/using_global_invisible.sol          |   2 +-
 .../semanticTests/various/erc20.sol           |   6 +-
 .../semanticTests/various/value_complex.sol   |   6 +-
 .../semanticTests/various/value_insane.sol    |   6 +-
 .../viaYul/array_memory_index_access.sol      |   6 +-
 .../viaYul/array_storage_index_access.sol     |  28 ++--
 .../array_storage_index_zeroed_test.sol       |  24 ++--
 49 files changed, 429 insertions(+), 413 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0c249f84a6..1ae50b82c8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,7 +8,7 @@ Compiler Features:
  * Yul IR Code Generation: Improved copy routines for arrays with packed storage layout.
  * Yul Optimizer: Add rule to convert `mod(mul(X, Y), A)` into `mulmod(X, Y, A)`, if `A` is a power of two.
  * Yul Optimizer: Add rule to convert `mod(add(X, Y), A)` into `addmod(X, Y, A)`, if `A` is a power of two.
-
+ * Code Generator: More efficient code for checked addition and subtraction.
 
 Bugfixes:
  * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 3ea3b2c842..ee77a476f4 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -615,25 +615,34 @@ string YulUtilFunctions::divide32CeilFunction()
 string YulUtilFunctions::overflowCheckedIntAddFunction(IntegerType const& _type)
 {
 	string functionName = "checked_add_" + _type.identifier();
-	// TODO: Consider to add a special case for unsigned 256-bit integers
-	//       and use the following instead:
-	//       sum := add(x, y) if lt(sum, x) { <panic>() }
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
 			function <functionName>(x, y) -> sum {
 				x := <cleanupFunction>(x)
 				y := <cleanupFunction>(y)
+				sum := add(x, y)
 				<?signed>
-					// overflow, if x >= 0 and y > (maxValue - x)
-					if and(iszero(slt(x, 0)), sgt(y, sub(<maxValue>, x))) { <panic>() }
-					// underflow, if x < 0 and y < (minValue - x)
-					if and(slt(x, 0), slt(y, sub(<minValue>, x))) { <panic>() }
+					<?256bit>
+						// overflow, if x >= 0 and sum < y
+						// underflow, if x < 0 and sum >= y
+						if or(
+							and(iszero(slt(x, 0)), slt(sum, y)),
+							and(slt(x, 0), iszero(slt(sum, y)))
+						) { <panic>() }
+					<!256bit>
+						if or(
+							sgt(sum, <maxValue>),
+							slt(sum, <minValue>)
+						) { <panic>() }
+					</256bit>
 				<!signed>
-					// overflow, if x > (maxValue - y)
-					if gt(x, sub(<maxValue>, y)) { <panic>() }
+					<?256bit>
+						if gt(x, sum) { <panic>() }
+					<!256bit>
+						if gt(sum, <maxValue>) { <panic>() }
+					</256bit>
 				</signed>
-				sum := add(x, y)
 			}
 			)")
 			("functionName", functionName)
@@ -642,6 +651,7 @@ string YulUtilFunctions::overflowCheckedIntAddFunction(IntegerType const& _type)
 			("minValue", toCompactHexWithPrefix(u256(_type.minValue())))
 			("cleanupFunction", cleanupFunction(_type))
 			("panic", panicFunction(PanicCode::UnderOverflow))
+			("256bit", _type.numBits() == 256)
 			.render();
 	});
 }
@@ -795,15 +805,28 @@ string YulUtilFunctions::overflowCheckedIntSubFunction(IntegerType const& _type)
 			function <functionName>(x, y) -> diff {
 				x := <cleanupFunction>(x)
 				y := <cleanupFunction>(y)
+				diff := sub(x, y)
 				<?signed>
-					// underflow, if y >= 0 and x < (minValue + y)
-					if and(iszero(slt(y, 0)), slt(x, add(<minValue>, y))) { <panic>() }
-					// overflow, if y < 0 and x > (maxValue + y)
-					if and(slt(y, 0), sgt(x, add(<maxValue>, y))) { <panic>() }
+					<?256bit>
+						// underflow, if y >= 0 and diff > x
+						// overflow, if y < 0 and diff < x
+						if or(
+							and(iszero(slt(y, 0)), sgt(diff, x)),
+							and(slt(y, 0), slt(diff, x))
+						) { <panic>() }
+					<!256bit>
+						if or(
+							slt(diff, <minValue>),
+							sgt(diff, <maxValue>)
+						) { <panic>() }
+					</256bit>
 				<!signed>
-					if lt(x, y) { <panic>() }
+					<?256bit>
+						if gt(diff, x) { <panic>() }
+					<!256bit>
+						if gt(diff, <maxValue>) { <panic>() }
+					</256bit>
 				</signed>
-				diff := sub(x, y)
 			}
 			)")
 			("functionName", functionName)
@@ -812,6 +835,7 @@ string YulUtilFunctions::overflowCheckedIntSubFunction(IntegerType const& _type)
 			("minValue", toCompactHexWithPrefix(u256(_type.minValue())))
 			("cleanupFunction", cleanupFunction(_type))
 			("panic", panicFunction(PanicCode::UnderOverflow))
+			("256bit", _type.numBits() == 256)
 			.render();
 	});
 }
diff --git a/test/cmdlineTests/asm_json/output b/test/cmdlineTests/asm_json/output
index 000ad1b753..f6a0a4b190 100644
--- a/test/cmdlineTests/asm_json/output
+++ b/test/cmdlineTests/asm_json/output
@@ -1300,14 +1300,14 @@ EVM assembly:
         },
         {
           "begin": 1211,
-          "end": 1516,
+          "end": 1402,
           "name": "tag",
           "source": 1,
           "value": "10"
         },
         {
           "begin": 1211,
-          "end": 1516,
+          "end": 1402,
           "name": "JUMPDEST",
           "source": 1
         },
@@ -1423,159 +1423,146 @@ EVM assembly:
           "source": 1
         },
         {
-          "begin": 1458,
-          "end": 1459,
+          "begin": 1347,
+          "end": 1348,
           "name": "DUP3",
           "source": 1
         },
         {
-          "begin": 1390,
-          "end": 1456,
-          "name": "PUSH",
-          "source": 1,
-          "value": "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
+          "begin": 1344,
+          "end": 1345,
+          "name": "DUP3",
+          "source": 1
         },
         {
-          "begin": 1386,
-          "end": 1460,
-          "name": "SUB",
+          "begin": 1340,
+          "end": 1349,
+          "name": "ADD",
+          "source": 1
+        },
+        {
+          "begin": 1333,
+          "end": 1349,
+          "name": "SWAP1",
           "source": 1
         },
         {
-          "begin": 1383,
-          "end": 1384,
+          "begin": 1333,
+          "end": 1349,
+          "name": "POP",
+          "source": 1
+        },
+        {
+          "begin": 1368,
+          "end": 1371,
+          "name": "DUP1",
+          "source": 1
+        },
+        {
+          "begin": 1365,
+          "end": 1366,
           "name": "DUP3",
           "source": 1
         },
         {
-          "begin": 1380,
-          "end": 1461,
+          "begin": 1362,
+          "end": 1372,
           "name": "GT",
           "source": 1
         },
         {
-          "begin": 1377,
-          "end": 1484,
+          "begin": 1359,
+          "end": 1395,
           "name": "ISZERO",
           "source": 1
         },
         {
-          "begin": 1377,
-          "end": 1484,
+          "begin": 1359,
+          "end": 1395,
           "name": "PUSH [tag]",
           "source": 1,
           "value": "37"
         },
         {
-          "begin": 1377,
-          "end": 1484,
+          "begin": 1359,
+          "end": 1395,
           "name": "JUMPI",
           "source": 1
         },
         {
-          "begin": 1464,
-          "end": 1482,
+          "begin": 1375,
+          "end": 1393,
           "name": "PUSH [tag]",
           "source": 1,
           "value": "38"
         },
         {
-          "begin": 1464,
-          "end": 1482,
+          "begin": 1375,
+          "end": 1393,
           "name": "PUSH [tag]",
           "source": 1,
           "value": "18"
         },
         {
-          "begin": 1464,
-          "end": 1482,
+          "begin": 1375,
+          "end": 1393,
           "jumpType": "[in]",
           "name": "JUMP",
           "source": 1
         },
         {
-          "begin": 1464,
-          "end": 1482,
+          "begin": 1375,
+          "end": 1393,
           "name": "tag",
           "source": 1,
           "value": "38"
         },
         {
-          "begin": 1464,
-          "end": 1482,
+          "begin": 1375,
+          "end": 1393,
           "name": "JUMPDEST",
           "source": 1
         },
         {
-          "begin": 1377,
-          "end": 1484,
+          "begin": 1359,
+          "end": 1395,
           "name": "tag",
           "source": 1,
           "value": "37"
         },
         {
-          "begin": 1377,
-          "end": 1484,
+          "begin": 1359,
+          "end": 1395,
           "name": "JUMPDEST",
           "source": 1
         },
-        {
-          "begin": 1508,
-          "end": 1509,
-          "name": "DUP3",
-          "source": 1
-        },
-        {
-          "begin": 1505,
-          "end": 1506,
-          "name": "DUP3",
-          "source": 1
-        },
-        {
-          "begin": 1501,
-          "end": 1510,
-          "name": "ADD",
-          "source": 1
-        },
-        {
-          "begin": 1494,
-          "end": 1510,
-          "name": "SWAP1",
-          "source": 1
-        },
-        {
-          "begin": 1494,
-          "end": 1510,
-          "name": "POP",
-          "source": 1
-        },
         {
           "begin": 1211,
-          "end": 1516,
+          "end": 1402,
           "name": "SWAP3",
           "source": 1
         },
         {
           "begin": 1211,
-          "end": 1516,
+          "end": 1402,
           "name": "SWAP2",
           "source": 1
         },
         {
           "begin": 1211,
-          "end": 1516,
+          "end": 1402,
           "name": "POP",
           "source": 1
         },
         {
           "begin": 1211,
-          "end": 1516,
+          "end": 1402,
           "name": "POP",
           "source": 1
         },
         {
           "begin": 1211,
-          "end": 1516,
+          "end": 1402,
           "jumpType": "[out]",
           "name": "JUMP",
           "source": 1
diff --git a/test/cmdlineTests/asm_json_no_pretty_print/output b/test/cmdlineTests/asm_json_no_pretty_print/output
index 232d0bdea1..b713097bbc 100644
--- a/test/cmdlineTests/asm_json_no_pretty_print/output
+++ b/test/cmdlineTests/asm_json_no_pretty_print/output
@@ -1,4 +1,4 @@
 
 ======= asm_json_no_pretty_print/input.sol:C =======
 EVM assembly:
-{".code":[{"begin":60,"end":160,"name":"PUSH","source":0,"value":"80"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"40"},{"begin":60,"end":160,"name":"MSTORE","source":0},{"begin":60,"end":160,"name":"CALLVALUE","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"ISZERO","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"POP","source":0},{"begin":60,"end":160,"name":"PUSH #[$]","source":0,"value":"0000000000000000000000000000000000000000000000000000000000000000"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"PUSH [$]","source":0,"value":"0000000000000000000000000000000000000000000000000000000000000000"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"CODECOPY","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"RETURN","source":0}],".data":{"0":{".auxdata":"<BYTECODE REMOVED>",".code":[{"begin":60,"end":160,"name":"PUSH","source":0,"value":"80"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"40"},{"begin":60,"end":160,"name":"MSTORE","source":0},{"begin":60,"end":160,"name":"CALLVALUE","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"ISZERO","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"POP","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"4"},{"begin":60,"end":160,"name":"CALLDATASIZE","source":0},{"begin":60,"end":160,"name":"LT","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"2"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"CALLDATALOAD","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"E0"},{"begin":60,"end":160,"name":"SHR","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"B3DE648B"},{"begin":60,"end":160,"name":"EQ","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"3"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"2"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"3"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"4"},{"begin":77,"end":158,"name":"PUSH","source":0,"value":"4"},{"begin":77,"end":158,"name":"DUP1","source":0},{"begin":77,"end":158,"name":"CALLDATASIZE","source":0},{"begin":77,"end":158,"name":"SUB","source":0},{"begin":77,"end":158,"name":"DUP2","source":0},{"begin":77,"end":158,"name":"ADD","source":0},{"begin":77,"end":158,"name":"SWAP1","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"5"},{"begin":77,"end":158,"name":"SWAP2","source":0},{"begin":77,"end":158,"name":"SWAP1","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"6"},{"begin":77,"end":158,"jumpType":"[in]","name":"JUMP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"5"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"7"},{"begin":77,"end":158,"jumpType":"[in]","name":"JUMP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"4"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"STOP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"7"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":123,"end":125,"name":"PUSH","source":0,"value":"2A"},{"begin":118,"end":125,"name":"DUP2","source":0},{"begin":118,"end":125,"name":"PUSH [tag]","source":0,"value":"9"},{"begin":118,"end":125,"name":"SWAP2","source":0},{"begin":118,"end":125,"name":"SWAP1","source":0},{"begin":118,"end":125,"name":"PUSH [tag]","source":0,"value":"10"},{"begin":118,"end":125,"jumpType":"[in]","name":"JUMP","source":0},{"begin":118,"end":125,"name":"tag","source":0,"value":"9"},{"begin":118,"end":125,"name":"JUMPDEST","source":0},{"begin":118,"end":125,"name":"SWAP1","source":0},{"begin":118,"end":125,"name":"POP","source":0},{"begin":147,"end":150,"name":"PUSH","source":0,"value":"64"},{"begin":143,"end":144,"name":"DUP2","source":0},{"begin":143,"end":150,"name":"GT","source":0},{"begin":135,"end":151,"name":"PUSH [tag]","source":0,"value":"11"},{"begin":135,"end":151,"name":"JUMPI","source":0},{"begin":135,"end":151,"name":"PUSH","source":0,"value":"0"},{"begin":135,"end":151,"name":"DUP1","source":0},{"begin":135,"end":151,"name":"REVERT","source":0},{"begin":135,"end":151,"name":"tag","source":0,"value":"11"},{"begin":135,"end":151,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"POP","source":0},{"begin":77,"end":158,"jumpType":"[out]","name":"JUMP","source":0},{"begin":88,"end":205,"name":"tag","source":1,"value":"13"},{"begin":88,"end":205,"name":"JUMPDEST","source":1},{"begin":197,"end":198,"name":"PUSH","source":1,"value":"0"},{"begin":194,"end":195,"name":"DUP1","source":1},{"begin":187,"end":199,"name":"REVERT","source":1},{"begin":334,"end":411,"name":"tag","source":1,"value":"15"},{"begin":334,"end":411,"name":"JUMPDEST","source":1},{"begin":371,"end":378,"name":"PUSH","source":1,"value":"0"},{"begin":400,"end":405,"name":"DUP2","source":1},{"begin":389,"end":405,"name":"SWAP1","source":1},{"begin":389,"end":405,"name":"POP","source":1},{"begin":334,"end":411,"name":"SWAP2","source":1},{"begin":334,"end":411,"name":"SWAP1","source":1},{"begin":334,"end":411,"name":"POP","source":1},{"begin":334,"end":411,"jumpType":"[out]","name":"JUMP","source":1},{"begin":417,"end":539,"name":"tag","source":1,"value":"16"},{"begin":417,"end":539,"name":"JUMPDEST","source":1},{"begin":490,"end":514,"name":"PUSH [tag]","source":1,"value":"25"},{"begin":508,"end":513,"name":"DUP2","source":1},{"begin":490,"end":514,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":490,"end":514,"jumpType":"[in]","name":"JUMP","source":1},{"begin":490,"end":514,"name":"tag","source":1,"value":"25"},{"begin":490,"end":514,"name":"JUMPDEST","source":1},{"begin":483,"end":488,"name":"DUP2","source":1},{"begin":480,"end":515,"name":"EQ","source":1},{"begin":470,"end":533,"name":"PUSH [tag]","source":1,"value":"26"},{"begin":470,"end":533,"name":"JUMPI","source":1},{"begin":529,"end":530,"name":"PUSH","source":1,"value":"0"},{"begin":526,"end":527,"name":"DUP1","source":1},{"begin":519,"end":531,"name":"REVERT","source":1},{"begin":470,"end":533,"name":"tag","source":1,"value":"26"},{"begin":470,"end":533,"name":"JUMPDEST","source":1},{"begin":417,"end":539,"name":"POP","source":1},{"begin":417,"end":539,"jumpType":"[out]","name":"JUMP","source":1},{"begin":545,"end":684,"name":"tag","source":1,"value":"17"},{"begin":545,"end":684,"name":"JUMPDEST","source":1},{"begin":591,"end":596,"name":"PUSH","source":1,"value":"0"},{"begin":629,"end":635,"name":"DUP2","source":1},{"begin":616,"end":636,"name":"CALLDATALOAD","source":1},{"begin":607,"end":636,"name":"SWAP1","source":1},{"begin":607,"end":636,"name":"POP","source":1},{"begin":645,"end":678,"name":"PUSH [tag]","source":1,"value":"28"},{"begin":672,"end":677,"name":"DUP2","source":1},{"begin":645,"end":678,"name":"PUSH [tag]","source":1,"value":"16"},{"begin":645,"end":678,"jumpType":"[in]","name":"JUMP","source":1},{"begin":645,"end":678,"name":"tag","source":1,"value":"28"},{"begin":645,"end":678,"name":"JUMPDEST","source":1},{"begin":545,"end":684,"name":"SWAP3","source":1},{"begin":545,"end":684,"name":"SWAP2","source":1},{"begin":545,"end":684,"name":"POP","source":1},{"begin":545,"end":684,"name":"POP","source":1},{"begin":545,"end":684,"jumpType":"[out]","name":"JUMP","source":1},{"begin":690,"end":1019,"name":"tag","source":1,"value":"6"},{"begin":690,"end":1019,"name":"JUMPDEST","source":1},{"begin":749,"end":755,"name":"PUSH","source":1,"value":"0"},{"begin":798,"end":800,"name":"PUSH","source":1,"value":"20"},{"begin":786,"end":795,"name":"DUP3","source":1},{"begin":777,"end":784,"name":"DUP5","source":1},{"begin":773,"end":796,"name":"SUB","source":1},{"begin":769,"end":801,"name":"SLT","source":1},{"begin":766,"end":885,"name":"ISZERO","source":1},{"begin":766,"end":885,"name":"PUSH [tag]","source":1,"value":"30"},{"begin":766,"end":885,"name":"JUMPI","source":1},{"begin":804,"end":883,"name":"PUSH [tag]","source":1,"value":"31"},{"begin":804,"end":883,"name":"PUSH [tag]","source":1,"value":"13"},{"begin":804,"end":883,"jumpType":"[in]","name":"JUMP","source":1},{"begin":804,"end":883,"name":"tag","source":1,"value":"31"},{"begin":804,"end":883,"name":"JUMPDEST","source":1},{"begin":766,"end":885,"name":"tag","source":1,"value":"30"},{"begin":766,"end":885,"name":"JUMPDEST","source":1},{"begin":924,"end":925,"name":"PUSH","source":1,"value":"0"},{"begin":949,"end":1002,"name":"PUSH [tag]","source":1,"value":"32"},{"begin":994,"end":1001,"name":"DUP5","source":1},{"begin":985,"end":991,"name":"DUP3","source":1},{"begin":974,"end":983,"name":"DUP6","source":1},{"begin":970,"end":992,"name":"ADD","source":1},{"begin":949,"end":1002,"name":"PUSH [tag]","source":1,"value":"17"},{"begin":949,"end":1002,"jumpType":"[in]","name":"JUMP","source":1},{"begin":949,"end":1002,"name":"tag","source":1,"value":"32"},{"begin":949,"end":1002,"name":"JUMPDEST","source":1},{"begin":939,"end":1002,"name":"SWAP2","source":1},{"begin":939,"end":1002,"name":"POP","source":1},{"begin":895,"end":1012,"name":"POP","source":1},{"begin":690,"end":1019,"name":"SWAP3","source":1},{"begin":690,"end":1019,"name":"SWAP2","source":1},{"begin":690,"end":1019,"name":"POP","source":1},{"begin":690,"end":1019,"name":"POP","source":1},{"begin":690,"end":1019,"jumpType":"[out]","name":"JUMP","source":1},{"begin":1025,"end":1205,"name":"tag","source":1,"value":"18"},{"begin":1025,"end":1205,"name":"JUMPDEST","source":1},{"begin":1073,"end":1150,"name":"PUSH","source":1,"value":"4E487B7100000000000000000000000000000000000000000000000000000000"},{"begin":1070,"end":1071,"name":"PUSH","source":1,"value":"0"},{"begin":1063,"end":1151,"name":"MSTORE","source":1},{"begin":1170,"end":1174,"name":"PUSH","source":1,"value":"11"},{"begin":1167,"end":1168,"name":"PUSH","source":1,"value":"4"},{"begin":1160,"end":1175,"name":"MSTORE","source":1},{"begin":1194,"end":1198,"name":"PUSH","source":1,"value":"24"},{"begin":1191,"end":1192,"name":"PUSH","source":1,"value":"0"},{"begin":1184,"end":1199,"name":"REVERT","source":1},{"begin":1211,"end":1516,"name":"tag","source":1,"value":"10"},{"begin":1211,"end":1516,"name":"JUMPDEST","source":1},{"begin":1251,"end":1254,"name":"PUSH","source":1,"value":"0"},{"begin":1270,"end":1290,"name":"PUSH [tag]","source":1,"value":"35"},{"begin":1288,"end":1289,"name":"DUP3","source":1},{"begin":1270,"end":1290,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":1270,"end":1290,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1270,"end":1290,"name":"tag","source":1,"value":"35"},{"begin":1270,"end":1290,"name":"JUMPDEST","source":1},{"begin":1265,"end":1290,"name":"SWAP2","source":1},{"begin":1265,"end":1290,"name":"POP","source":1},{"begin":1304,"end":1324,"name":"PUSH [tag]","source":1,"value":"36"},{"begin":1322,"end":1323,"name":"DUP4","source":1},{"begin":1304,"end":1324,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":1304,"end":1324,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1304,"end":1324,"name":"tag","source":1,"value":"36"},{"begin":1304,"end":1324,"name":"JUMPDEST","source":1},{"begin":1299,"end":1324,"name":"SWAP3","source":1},{"begin":1299,"end":1324,"name":"POP","source":1},{"begin":1458,"end":1459,"name":"DUP3","source":1},{"begin":1390,"end":1456,"name":"PUSH","source":1,"value":"FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"},{"begin":1386,"end":1460,"name":"SUB","source":1},{"begin":1383,"end":1384,"name":"DUP3","source":1},{"begin":1380,"end":1461,"name":"GT","source":1},{"begin":1377,"end":1484,"name":"ISZERO","source":1},{"begin":1377,"end":1484,"name":"PUSH [tag]","source":1,"value":"37"},{"begin":1377,"end":1484,"name":"JUMPI","source":1},{"begin":1464,"end":1482,"name":"PUSH [tag]","source":1,"value":"38"},{"begin":1464,"end":1482,"name":"PUSH [tag]","source":1,"value":"18"},{"begin":1464,"end":1482,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1464,"end":1482,"name":"tag","source":1,"value":"38"},{"begin":1464,"end":1482,"name":"JUMPDEST","source":1},{"begin":1377,"end":1484,"name":"tag","source":1,"value":"37"},{"begin":1377,"end":1484,"name":"JUMPDEST","source":1},{"begin":1508,"end":1509,"name":"DUP3","source":1},{"begin":1505,"end":1506,"name":"DUP3","source":1},{"begin":1501,"end":1510,"name":"ADD","source":1},{"begin":1494,"end":1510,"name":"SWAP1","source":1},{"begin":1494,"end":1510,"name":"POP","source":1},{"begin":1211,"end":1516,"name":"SWAP3","source":1},{"begin":1211,"end":1516,"name":"SWAP2","source":1},{"begin":1211,"end":1516,"name":"POP","source":1},{"begin":1211,"end":1516,"name":"POP","source":1},{"begin":1211,"end":1516,"jumpType":"[out]","name":"JUMP","source":1}]}},"sourceList":["asm_json_no_pretty_print/input.sol","#utility.yul"]}
+{".code":[{"begin":60,"end":160,"name":"PUSH","source":0,"value":"80"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"40"},{"begin":60,"end":160,"name":"MSTORE","source":0},{"begin":60,"end":160,"name":"CALLVALUE","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"ISZERO","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"POP","source":0},{"begin":60,"end":160,"name":"PUSH #[$]","source":0,"value":"0000000000000000000000000000000000000000000000000000000000000000"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"PUSH [$]","source":0,"value":"0000000000000000000000000000000000000000000000000000000000000000"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"CODECOPY","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"RETURN","source":0}],".data":{"0":{".auxdata":"<BYTECODE REMOVED>",".code":[{"begin":60,"end":160,"name":"PUSH","source":0,"value":"80"},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"40"},{"begin":60,"end":160,"name":"MSTORE","source":0},{"begin":60,"end":160,"name":"CALLVALUE","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"ISZERO","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"1"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"POP","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"4"},{"begin":60,"end":160,"name":"CALLDATASIZE","source":0},{"begin":60,"end":160,"name":"LT","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"2"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"CALLDATALOAD","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"E0"},{"begin":60,"end":160,"name":"SHR","source":0},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"B3DE648B"},{"begin":60,"end":160,"name":"EQ","source":0},{"begin":60,"end":160,"name":"PUSH [tag]","source":0,"value":"3"},{"begin":60,"end":160,"name":"JUMPI","source":0},{"begin":60,"end":160,"name":"tag","source":0,"value":"2"},{"begin":60,"end":160,"name":"JUMPDEST","source":0},{"begin":60,"end":160,"name":"PUSH","source":0,"value":"0"},{"begin":60,"end":160,"name":"DUP1","source":0},{"begin":60,"end":160,"name":"REVERT","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"3"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"4"},{"begin":77,"end":158,"name":"PUSH","source":0,"value":"4"},{"begin":77,"end":158,"name":"DUP1","source":0},{"begin":77,"end":158,"name":"CALLDATASIZE","source":0},{"begin":77,"end":158,"name":"SUB","source":0},{"begin":77,"end":158,"name":"DUP2","source":0},{"begin":77,"end":158,"name":"ADD","source":0},{"begin":77,"end":158,"name":"SWAP1","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"5"},{"begin":77,"end":158,"name":"SWAP2","source":0},{"begin":77,"end":158,"name":"SWAP1","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"6"},{"begin":77,"end":158,"jumpType":"[in]","name":"JUMP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"5"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"PUSH [tag]","source":0,"value":"7"},{"begin":77,"end":158,"jumpType":"[in]","name":"JUMP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"4"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"STOP","source":0},{"begin":77,"end":158,"name":"tag","source":0,"value":"7"},{"begin":77,"end":158,"name":"JUMPDEST","source":0},{"begin":123,"end":125,"name":"PUSH","source":0,"value":"2A"},{"begin":118,"end":125,"name":"DUP2","source":0},{"begin":118,"end":125,"name":"PUSH [tag]","source":0,"value":"9"},{"begin":118,"end":125,"name":"SWAP2","source":0},{"begin":118,"end":125,"name":"SWAP1","source":0},{"begin":118,"end":125,"name":"PUSH [tag]","source":0,"value":"10"},{"begin":118,"end":125,"jumpType":"[in]","name":"JUMP","source":0},{"begin":118,"end":125,"name":"tag","source":0,"value":"9"},{"begin":118,"end":125,"name":"JUMPDEST","source":0},{"begin":118,"end":125,"name":"SWAP1","source":0},{"begin":118,"end":125,"name":"POP","source":0},{"begin":147,"end":150,"name":"PUSH","source":0,"value":"64"},{"begin":143,"end":144,"name":"DUP2","source":0},{"begin":143,"end":150,"name":"GT","source":0},{"begin":135,"end":151,"name":"PUSH [tag]","source":0,"value":"11"},{"begin":135,"end":151,"name":"JUMPI","source":0},{"begin":135,"end":151,"name":"PUSH","source":0,"value":"0"},{"begin":135,"end":151,"name":"DUP1","source":0},{"begin":135,"end":151,"name":"REVERT","source":0},{"begin":135,"end":151,"name":"tag","source":0,"value":"11"},{"begin":135,"end":151,"name":"JUMPDEST","source":0},{"begin":77,"end":158,"name":"POP","source":0},{"begin":77,"end":158,"jumpType":"[out]","name":"JUMP","source":0},{"begin":88,"end":205,"name":"tag","source":1,"value":"13"},{"begin":88,"end":205,"name":"JUMPDEST","source":1},{"begin":197,"end":198,"name":"PUSH","source":1,"value":"0"},{"begin":194,"end":195,"name":"DUP1","source":1},{"begin":187,"end":199,"name":"REVERT","source":1},{"begin":334,"end":411,"name":"tag","source":1,"value":"15"},{"begin":334,"end":411,"name":"JUMPDEST","source":1},{"begin":371,"end":378,"name":"PUSH","source":1,"value":"0"},{"begin":400,"end":405,"name":"DUP2","source":1},{"begin":389,"end":405,"name":"SWAP1","source":1},{"begin":389,"end":405,"name":"POP","source":1},{"begin":334,"end":411,"name":"SWAP2","source":1},{"begin":334,"end":411,"name":"SWAP1","source":1},{"begin":334,"end":411,"name":"POP","source":1},{"begin":334,"end":411,"jumpType":"[out]","name":"JUMP","source":1},{"begin":417,"end":539,"name":"tag","source":1,"value":"16"},{"begin":417,"end":539,"name":"JUMPDEST","source":1},{"begin":490,"end":514,"name":"PUSH [tag]","source":1,"value":"25"},{"begin":508,"end":513,"name":"DUP2","source":1},{"begin":490,"end":514,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":490,"end":514,"jumpType":"[in]","name":"JUMP","source":1},{"begin":490,"end":514,"name":"tag","source":1,"value":"25"},{"begin":490,"end":514,"name":"JUMPDEST","source":1},{"begin":483,"end":488,"name":"DUP2","source":1},{"begin":480,"end":515,"name":"EQ","source":1},{"begin":470,"end":533,"name":"PUSH [tag]","source":1,"value":"26"},{"begin":470,"end":533,"name":"JUMPI","source":1},{"begin":529,"end":530,"name":"PUSH","source":1,"value":"0"},{"begin":526,"end":527,"name":"DUP1","source":1},{"begin":519,"end":531,"name":"REVERT","source":1},{"begin":470,"end":533,"name":"tag","source":1,"value":"26"},{"begin":470,"end":533,"name":"JUMPDEST","source":1},{"begin":417,"end":539,"name":"POP","source":1},{"begin":417,"end":539,"jumpType":"[out]","name":"JUMP","source":1},{"begin":545,"end":684,"name":"tag","source":1,"value":"17"},{"begin":545,"end":684,"name":"JUMPDEST","source":1},{"begin":591,"end":596,"name":"PUSH","source":1,"value":"0"},{"begin":629,"end":635,"name":"DUP2","source":1},{"begin":616,"end":636,"name":"CALLDATALOAD","source":1},{"begin":607,"end":636,"name":"SWAP1","source":1},{"begin":607,"end":636,"name":"POP","source":1},{"begin":645,"end":678,"name":"PUSH [tag]","source":1,"value":"28"},{"begin":672,"end":677,"name":"DUP2","source":1},{"begin":645,"end":678,"name":"PUSH [tag]","source":1,"value":"16"},{"begin":645,"end":678,"jumpType":"[in]","name":"JUMP","source":1},{"begin":645,"end":678,"name":"tag","source":1,"value":"28"},{"begin":645,"end":678,"name":"JUMPDEST","source":1},{"begin":545,"end":684,"name":"SWAP3","source":1},{"begin":545,"end":684,"name":"SWAP2","source":1},{"begin":545,"end":684,"name":"POP","source":1},{"begin":545,"end":684,"name":"POP","source":1},{"begin":545,"end":684,"jumpType":"[out]","name":"JUMP","source":1},{"begin":690,"end":1019,"name":"tag","source":1,"value":"6"},{"begin":690,"end":1019,"name":"JUMPDEST","source":1},{"begin":749,"end":755,"name":"PUSH","source":1,"value":"0"},{"begin":798,"end":800,"name":"PUSH","source":1,"value":"20"},{"begin":786,"end":795,"name":"DUP3","source":1},{"begin":777,"end":784,"name":"DUP5","source":1},{"begin":773,"end":796,"name":"SUB","source":1},{"begin":769,"end":801,"name":"SLT","source":1},{"begin":766,"end":885,"name":"ISZERO","source":1},{"begin":766,"end":885,"name":"PUSH [tag]","source":1,"value":"30"},{"begin":766,"end":885,"name":"JUMPI","source":1},{"begin":804,"end":883,"name":"PUSH [tag]","source":1,"value":"31"},{"begin":804,"end":883,"name":"PUSH [tag]","source":1,"value":"13"},{"begin":804,"end":883,"jumpType":"[in]","name":"JUMP","source":1},{"begin":804,"end":883,"name":"tag","source":1,"value":"31"},{"begin":804,"end":883,"name":"JUMPDEST","source":1},{"begin":766,"end":885,"name":"tag","source":1,"value":"30"},{"begin":766,"end":885,"name":"JUMPDEST","source":1},{"begin":924,"end":925,"name":"PUSH","source":1,"value":"0"},{"begin":949,"end":1002,"name":"PUSH [tag]","source":1,"value":"32"},{"begin":994,"end":1001,"name":"DUP5","source":1},{"begin":985,"end":991,"name":"DUP3","source":1},{"begin":974,"end":983,"name":"DUP6","source":1},{"begin":970,"end":992,"name":"ADD","source":1},{"begin":949,"end":1002,"name":"PUSH [tag]","source":1,"value":"17"},{"begin":949,"end":1002,"jumpType":"[in]","name":"JUMP","source":1},{"begin":949,"end":1002,"name":"tag","source":1,"value":"32"},{"begin":949,"end":1002,"name":"JUMPDEST","source":1},{"begin":939,"end":1002,"name":"SWAP2","source":1},{"begin":939,"end":1002,"name":"POP","source":1},{"begin":895,"end":1012,"name":"POP","source":1},{"begin":690,"end":1019,"name":"SWAP3","source":1},{"begin":690,"end":1019,"name":"SWAP2","source":1},{"begin":690,"end":1019,"name":"POP","source":1},{"begin":690,"end":1019,"name":"POP","source":1},{"begin":690,"end":1019,"jumpType":"[out]","name":"JUMP","source":1},{"begin":1025,"end":1205,"name":"tag","source":1,"value":"18"},{"begin":1025,"end":1205,"name":"JUMPDEST","source":1},{"begin":1073,"end":1150,"name":"PUSH","source":1,"value":"4E487B7100000000000000000000000000000000000000000000000000000000"},{"begin":1070,"end":1071,"name":"PUSH","source":1,"value":"0"},{"begin":1063,"end":1151,"name":"MSTORE","source":1},{"begin":1170,"end":1174,"name":"PUSH","source":1,"value":"11"},{"begin":1167,"end":1168,"name":"PUSH","source":1,"value":"4"},{"begin":1160,"end":1175,"name":"MSTORE","source":1},{"begin":1194,"end":1198,"name":"PUSH","source":1,"value":"24"},{"begin":1191,"end":1192,"name":"PUSH","source":1,"value":"0"},{"begin":1184,"end":1199,"name":"REVERT","source":1},{"begin":1211,"end":1402,"name":"tag","source":1,"value":"10"},{"begin":1211,"end":1402,"name":"JUMPDEST","source":1},{"begin":1251,"end":1254,"name":"PUSH","source":1,"value":"0"},{"begin":1270,"end":1290,"name":"PUSH [tag]","source":1,"value":"35"},{"begin":1288,"end":1289,"name":"DUP3","source":1},{"begin":1270,"end":1290,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":1270,"end":1290,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1270,"end":1290,"name":"tag","source":1,"value":"35"},{"begin":1270,"end":1290,"name":"JUMPDEST","source":1},{"begin":1265,"end":1290,"name":"SWAP2","source":1},{"begin":1265,"end":1290,"name":"POP","source":1},{"begin":1304,"end":1324,"name":"PUSH [tag]","source":1,"value":"36"},{"begin":1322,"end":1323,"name":"DUP4","source":1},{"begin":1304,"end":1324,"name":"PUSH [tag]","source":1,"value":"15"},{"begin":1304,"end":1324,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1304,"end":1324,"name":"tag","source":1,"value":"36"},{"begin":1304,"end":1324,"name":"JUMPDEST","source":1},{"begin":1299,"end":1324,"name":"SWAP3","source":1},{"begin":1299,"end":1324,"name":"POP","source":1},{"begin":1347,"end":1348,"name":"DUP3","source":1},{"begin":1344,"end":1345,"name":"DUP3","source":1},{"begin":1340,"end":1349,"name":"ADD","source":1},{"begin":1333,"end":1349,"name":"SWAP1","source":1},{"begin":1333,"end":1349,"name":"POP","source":1},{"begin":1368,"end":1371,"name":"DUP1","source":1},{"begin":1365,"end":1366,"name":"DUP3","source":1},{"begin":1362,"end":1372,"name":"GT","source":1},{"begin":1359,"end":1395,"name":"ISZERO","source":1},{"begin":1359,"end":1395,"name":"PUSH [tag]","source":1,"value":"37"},{"begin":1359,"end":1395,"name":"JUMPI","source":1},{"begin":1375,"end":1393,"name":"PUSH [tag]","source":1,"value":"38"},{"begin":1375,"end":1393,"name":"PUSH [tag]","source":1,"value":"18"},{"begin":1375,"end":1393,"jumpType":"[in]","name":"JUMP","source":1},{"begin":1375,"end":1393,"name":"tag","source":1,"value":"38"},{"begin":1375,"end":1393,"name":"JUMPDEST","source":1},{"begin":1359,"end":1395,"name":"tag","source":1,"value":"37"},{"begin":1359,"end":1395,"name":"JUMPDEST","source":1},{"begin":1211,"end":1402,"name":"SWAP3","source":1},{"begin":1211,"end":1402,"name":"SWAP2","source":1},{"begin":1211,"end":1402,"name":"POP","source":1},{"begin":1211,"end":1402,"name":"POP","source":1},{"begin":1211,"end":1402,"jumpType":"[out]","name":"JUMP","source":1}]}},"sourceList":["asm_json_no_pretty_print/input.sol","#utility.yul"]}
diff --git a/test/cmdlineTests/optimizer_array_sload/output b/test/cmdlineTests/optimizer_array_sload/output
index 75d88d36f8..98b23306af 100644
--- a/test/cmdlineTests/optimizer_array_sload/output
+++ b/test/cmdlineTests/optimizer_array_sload/output
@@ -49,16 +49,17 @@ object "Arraysum_34" {
                         {
                             /// @src 0:80:429  "contract Arraysum {..."
                             mstore(_2, _2)
-                            let _4 := sload(add(18569430475105882587588266137607568536673111973893317399460219858819262702947, var_i))
-                            if gt(var_sum, not(_4))
+                            let sum := add(var_sum, sload(add(18569430475105882587588266137607568536673111973893317399460219858819262702947, var_i)))
+                            if gt(var_sum, sum)
                             {
                                 mstore(_2, shl(224, 0x4e487b71))
                                 mstore(_1, 0x11)
                                 revert(_2, 0x24)
                             }
                             /// @src 0:407:423  "sum += values[i]"
-                            var_sum := /** @src 0:80:429  "contract Arraysum {..." */ add(var_sum, _4)
+                            var_sum := sum
                         }
+                        /// @src 0:80:429  "contract Arraysum {..."
                         let memPos := mload(64)
                         mstore(memPos, var_sum)
                         return(memPos, 32)
diff --git a/test/cmdlineTests/optimizer_inliner_dynamic_reference/output b/test/cmdlineTests/optimizer_inliner_dynamic_reference/output
index ba32c364b5..2ddef4d768 100644
--- a/test/cmdlineTests/optimizer_inliner_dynamic_reference/output
+++ b/test/cmdlineTests/optimizer_inliner_dynamic_reference/output
@@ -150,75 +150,73 @@ sub_0: assembly {
       jump	// in
     tag_25:
       jump	// out
-        /* "#utility.yul":196:421   */
+        /* "#utility.yul":196:418   */
     tag_22:
-        /* "#utility.yul":236:239   */
-      0x00
-        /* "#utility.yul":267:268   */
+        /* "#utility.yul":261:270   */
+      dup1
       dup3
-        /* "#utility.yul":263:269   */
-      not
-        /* "#utility.yul":260:261   */
+      add
+        /* "#utility.yul":282:292   */
+      dup1
       dup3
-        /* "#utility.yul":257:270   */
       gt
-        /* "#utility.yul":254:390   */
+        /* "#utility.yul":279:412   */
       iszero
       tag_30
       jumpi
-        /* "#utility.yul":312:322   */
+        /* "#utility.yul":334:344   */
       0x4e487b71
-        /* "#utility.yul":307:310   */
+        /* "#utility.yul":329:332   */
       0xe0
-        /* "#utility.yul":303:323   */
+        /* "#utility.yul":325:345   */
       shl
-        /* "#utility.yul":300:301   */
+        /* "#utility.yul":322:323   */
       0x00
-        /* "#utility.yul":293:324   */
+        /* "#utility.yul":315:346   */
       mstore
-        /* "#utility.yul":347:351   */
+        /* "#utility.yul":369:373   */
       0x11
-        /* "#utility.yul":344:345   */
+        /* "#utility.yul":366:367   */
       0x04
-        /* "#utility.yul":337:352   */
+        /* "#utility.yul":359:374   */
       mstore
-        /* "#utility.yul":375:379   */
+        /* "#utility.yul":397:401   */
       0x24
-        /* "#utility.yul":372:373   */
+        /* "#utility.yul":394:395   */
       0x00
-        /* "#utility.yul":365:380   */
+        /* "#utility.yul":387:402   */
       revert
-        /* "#utility.yul":254:390   */
+        /* "#utility.yul":279:412   */
     tag_30:
+        /* "#utility.yul":196:418   */
+      swap3
+      swap2
+      pop
       pop
-        /* "#utility.yul":406:415   */
-      add
-      swap1
-        /* "#utility.yul":196:421   */
       jump	// out
-        /* "#utility.yul":426:553   */
+        /* "#utility.yul":423:550   */
     tag_26:
-        /* "#utility.yul":487:497   */
+        /* "#utility.yul":484:494   */
       0x4e487b71
-        /* "#utility.yul":482:485   */
+        /* "#utility.yul":479:482   */
       0xe0
-        /* "#utility.yul":478:498   */
+        /* "#utility.yul":475:495   */
       shl
-        /* "#utility.yul":475:476   */
+        /* "#utility.yul":472:473   */
       0x00
-        /* "#utility.yul":468:499   */
+        /* "#utility.yul":465:496   */
       mstore
-        /* "#utility.yul":518:522   */
+        /* "#utility.yul":515:519   */
       0x51
-        /* "#utility.yul":515:516   */
+        /* "#utility.yul":512:513   */
       0x04
-        /* "#utility.yul":508:523   */
+        /* "#utility.yul":505:520   */
       mstore
-        /* "#utility.yul":542:546   */
+        /* "#utility.yul":539:543   */
       0x24
-        /* "#utility.yul":539:540   */
+        /* "#utility.yul":536:537   */
       0x00
-        /* "#utility.yul":532:547   */
+        /* "#utility.yul":529:544   */
       revert
 
     auxdata: <AUXDATA REMOVED>
diff --git a/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output b/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
index 83f06edadf..edc93c0bec 100644
--- a/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
+++ b/test/cmdlineTests/optimizer_inliner_dynamic_reference_constructor/output
@@ -155,75 +155,73 @@ sub_0: assembly {
       jump	// in
     tag_21:
       jump	// out
-        /* "#utility.yul":196:421   */
+        /* "#utility.yul":196:418   */
     tag_19:
-        /* "#utility.yul":236:239   */
-      0x00
-        /* "#utility.yul":267:268   */
+        /* "#utility.yul":261:270   */
+      dup1
       dup3
-        /* "#utility.yul":263:269   */
-      not
-        /* "#utility.yul":260:261   */
+      add
+        /* "#utility.yul":282:292   */
+      dup1
       dup3
-        /* "#utility.yul":257:270   */
       gt
-        /* "#utility.yul":254:390   */
+        /* "#utility.yul":279:412   */
       iszero
       tag_26
       jumpi
-        /* "#utility.yul":312:322   */
+        /* "#utility.yul":334:344   */
       0x4e487b71
-        /* "#utility.yul":307:310   */
+        /* "#utility.yul":329:332   */
       0xe0
-        /* "#utility.yul":303:323   */
+        /* "#utility.yul":325:345   */
       shl
-        /* "#utility.yul":300:301   */
+        /* "#utility.yul":322:323   */
       0x00
-        /* "#utility.yul":293:324   */
+        /* "#utility.yul":315:346   */
       mstore
-        /* "#utility.yul":347:351   */
+        /* "#utility.yul":369:373   */
       0x11
-        /* "#utility.yul":344:345   */
+        /* "#utility.yul":366:367   */
       0x04
-        /* "#utility.yul":337:352   */
+        /* "#utility.yul":359:374   */
       mstore
-        /* "#utility.yul":375:379   */
+        /* "#utility.yul":397:401   */
       0x24
-        /* "#utility.yul":372:373   */
+        /* "#utility.yul":394:395   */
       0x00
-        /* "#utility.yul":365:380   */
+        /* "#utility.yul":387:402   */
       revert
-        /* "#utility.yul":254:390   */
+        /* "#utility.yul":279:412   */
     tag_26:
+        /* "#utility.yul":196:418   */
+      swap3
+      swap2
+      pop
       pop
-        /* "#utility.yul":406:415   */
-      add
-      swap1
-        /* "#utility.yul":196:421   */
       jump	// out
-        /* "#utility.yul":426:553   */
+        /* "#utility.yul":423:550   */
     tag_22:
-        /* "#utility.yul":487:497   */
+        /* "#utility.yul":484:494   */
       0x4e487b71
-        /* "#utility.yul":482:485   */
+        /* "#utility.yul":479:482   */
       0xe0
-        /* "#utility.yul":478:498   */
+        /* "#utility.yul":475:495   */
       shl
-        /* "#utility.yul":475:476   */
+        /* "#utility.yul":472:473   */
       0x00
-        /* "#utility.yul":468:499   */
+        /* "#utility.yul":465:496   */
       mstore
-        /* "#utility.yul":518:522   */
+        /* "#utility.yul":515:519   */
       0x51
-        /* "#utility.yul":515:516   */
+        /* "#utility.yul":512:513   */
       0x04
-        /* "#utility.yul":508:523   */
+        /* "#utility.yul":505:520   */
       mstore
-        /* "#utility.yul":542:546   */
+        /* "#utility.yul":539:543   */
       0x24
-        /* "#utility.yul":539:540   */
+        /* "#utility.yul":536:537   */
       0x00
-        /* "#utility.yul":532:547   */
+        /* "#utility.yul":529:544   */
       revert
 
     auxdata: <AUXDATA REMOVED>
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index ef4eb6a65e..5860991828 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -120,9 +120,7 @@ sub_0: assembly {
       eq
       tag_14
       jumpi
-        /* \"C\":117:119  41 */
       0x01
-        /* \"C\":79:428  contract C... */
       add
       swap2
       dup3
@@ -312,54 +310,51 @@ sub_0: assembly {
       jumpi
         /* \"C\":290:298  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-      sub(shl(0xff, 0x01), 0x2a)
         /* \"C\":117:119  41 */
+      dup1
+      0x29
+      add
+      swap1
       dup2
-      sgt
+      slt
       0x01
       and
       tag_14
       jumpi
         /* \"C\":79:428  contract C... */
       0x20
-        /* \"C\":117:119  41 */
       swap3
       pop
-      0x29
-      add
-        /* \"C\":79:428  contract C... */
       dup2
       mstore
       return
         /* \"C\":117:119  41 */
     tag_1:
+      swap2
+      swap1
+      swap2
       0x00
-      dup2
+      dup4
+      dup3
+      add
+      swap4
+      dup5
+      slt
+      swap2
       slt
+      swap1
       dup1
       iszero
-      sub(shl(0xff, 0x01), 0x01)
-      dup4
-      swap1
-      sub
-      dup5
-      sgt
-      and
-      tag_40
-      jumpi
-      shl(0xff, 0x01)
       dup3
-      swap1
-      sub
-      dup4
-      slt
       and
-      tag_40
+      swap2
+      iszero
+      and
+      or
+      tag_38
       jumpi
-      add
-      swap1
       jump\t// out
-    tag_40:
+    tag_38:
       mstore(0x00, shl(0xe0, 0x4e487b71))
       mstore(0x04, 0x11)
       revert(0x00, 0x24)
@@ -410,18 +405,19 @@ sub_0: assembly {
   mload
     /* \"C\":147:149  42 */
   mstore(0x80, 0x2a)
-  sub(shl(0xff, 0x01), 0x04)
     /* \"D\":91:166  contract D is C(3)... */
+  dup1
+    /* \"D\":107:108  3 */
+  0x03
+    /* \"D\":91:166  contract D is C(3)... */
+  add
+  swap1
   dup2
-  sgt
+  slt
   0x01
   and
   tag_7
   jumpi
-    /* \"D\":107:108  3 */
-  0x03
-    /* \"D\":91:166  contract D is C(3)... */
-  add
   0x00
   sstore
   mload(0x40)
@@ -503,9 +499,7 @@ sub_0: assembly {
       eq
       tag_14
       jumpi
-        /* \"C\":117:119  41 */
       0x01
-        /* \"D\":91:166  contract D is C(3)... */
       add
       swap2
       dup3
@@ -695,54 +689,51 @@ sub_0: assembly {
       jumpi
         /* \"C\":290:298  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
-      sub(shl(0xff, 0x01), 0x2a)
         /* \"C\":117:119  41 */
+      dup1
+      0x29
+      add
+      swap1
       dup2
-      sgt
+      slt
       0x01
       and
       tag_14
       jumpi
         /* \"D\":91:166  contract D is C(3)... */
       0x20
-        /* \"C\":117:119  41 */
       swap3
       pop
-      0x29
-      add
-        /* \"D\":91:166  contract D is C(3)... */
       dup2
       mstore
       return
         /* \"C\":117:119  41 */
     tag_1:
+      swap2
+      swap1
+      swap2
       0x00
-      dup2
+      dup4
+      dup3
+      add
+      swap4
+      dup5
+      slt
+      swap2
       slt
+      swap1
       dup1
       iszero
-      sub(shl(0xff, 0x01), 0x01)
-      dup4
-      swap1
-      sub
-      dup5
-      sgt
-      and
-      tag_40
-      jumpi
-      shl(0xff, 0x01)
       dup3
-      swap1
-      sub
-      dup4
-      slt
       and
-      tag_40
+      swap2
+      iszero
+      and
+      or
+      tag_38
       jumpi
-      add
-      swap1
       jump\t// out
-    tag_40:
+    tag_38:
       mstore(0x00, shl(0xe0, 0x4e487b71))
       mstore(0x04, 0x11)
       revert(0x00, 0x24)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index 1d2a4d593d..aff1f17aa7 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -354,13 +354,15 @@ object \"C_54\" {
             function checked_add_t_int256(x, y) -> sum {
                 x := cleanup_t_int256(x)
                 y := cleanup_t_int256(y)
+                sum := add(x, y)
 
-                // overflow, if x >= 0 and y > (maxValue - x)
-                if and(iszero(slt(x, 0)), sgt(y, sub(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x))) { panic_error_0x11() }
-                // underflow, if x < 0 and y < (minValue - x)
-                if and(slt(x, 0), slt(y, sub(0x8000000000000000000000000000000000000000000000000000000000000000, x))) { panic_error_0x11() }
+                // overflow, if x >= 0 and sum < y
+                // underflow, if x < 0 and sum >= y
+                if or(
+                    and(iszero(slt(x, 0)), slt(sum, y)),
+                    and(slt(x, 0), iszero(slt(sum, y)))
+                ) { panic_error_0x11() }
 
-                sum := add(x, y)
             }
 
             /// @ast-id 30
@@ -656,13 +658,14 @@ object \"C_54\" {
                         /// @src 0:297:305  \"immutVar\"
                         let _4 := loadimmutable(\"8\")
                         /// @src 0:79:435  \"contract C...\"
-                        if and(1, sgt(_4, sub(shl(255, 1), 42)))
+                        let sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 0:79:435  \"contract C...\" */ _4)
+                        if and(1, slt(sum, _4))
                         {
                             mstore(_3, shl(224, 0x4e487b71))
                             mstore(4, 0x11)
                             revert(_3, 0x24)
                         }
-                        mstore(_1, add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 0:79:435  \"contract C...\" */ _4))
+                        mstore(_1, sum)
                         return(_1, 32)
                     }
                     case 0x793816ec {
@@ -742,20 +745,15 @@ object \"C_54\" {
             }
             function checked_add_int256(x, y) -> sum
             {
-                let _1 := slt(x, 0)
-                if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x)))
-                {
-                    mstore(0, shl(224, 0x4e487b71))
-                    mstore(4, 0x11)
-                    revert(0, 0x24)
-                }
-                if and(_1, slt(y, sub(shl(255, 1), x)))
+                sum := add(x, y)
+                let _1 := slt(sum, y)
+                let _2 := slt(x, 0)
+                if or(and(iszero(_2), _1), and(_2, iszero(_1)))
                 {
                     mstore(0, shl(224, 0x4e487b71))
                     mstore(4, 0x11)
                     revert(0, 0x24)
                 }
-                sum := add(x, y)
             }
         }
         data \".metadata\" hex\"<BYTECODE REMOVED>\"
@@ -893,13 +891,15 @@ object \"D_72\" {
         function checked_add_t_int256(x, y) -> sum {
             x := cleanup_t_int256(x)
             y := cleanup_t_int256(y)
+            sum := add(x, y)
 
-            // overflow, if x >= 0 and y > (maxValue - x)
-            if and(iszero(slt(x, 0)), sgt(y, sub(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x))) { panic_error_0x11() }
-            // underflow, if x < 0 and y < (minValue - x)
-            if and(slt(x, 0), slt(y, sub(0x8000000000000000000000000000000000000000000000000000000000000000, x))) { panic_error_0x11() }
+            // overflow, if x >= 0 and sum < y
+            // underflow, if x < 0 and sum >= y
+            if or(
+                and(iszero(slt(x, 0)), slt(sum, y)),
+                and(slt(x, 0), iszero(slt(sum, y)))
+            ) { panic_error_0x11() }
 
-            sum := add(x, y)
         }
 
         function shift_left_0(value) -> newValue {
@@ -1185,13 +1185,15 @@ object \"D_72\" {
             function checked_add_t_int256(x, y) -> sum {
                 x := cleanup_t_int256(x)
                 y := cleanup_t_int256(y)
+                sum := add(x, y)
 
-                // overflow, if x >= 0 and y > (maxValue - x)
-                if and(iszero(slt(x, 0)), sgt(y, sub(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, x))) { panic_error_0x11() }
-                // underflow, if x < 0 and y < (minValue - x)
-                if and(slt(x, 0), slt(y, sub(0x8000000000000000000000000000000000000000000000000000000000000000, x))) { panic_error_0x11() }
+                // overflow, if x >= 0 and sum < y
+                // underflow, if x < 0 and sum >= y
+                if or(
+                    and(iszero(slt(x, 0)), slt(sum, y)),
+                    and(slt(x, 0), iszero(slt(sum, y)))
+                ) { panic_error_0x11() }
 
-                sum := add(x, y)
             }
 
             /// @ast-id 30
@@ -1460,13 +1462,14 @@ object \"D_72\" {
             /// @src 0:154:156  \"42\"
             mstore(128, 0x2a)
             /// @src 1:91:166  \"contract D is C(3)...\"
-            if and(1, sgt(value, sub(shl(255, 1), 4)))
+            let sum := add(/** @src 1:107:108  \"3\" */ 0x03, /** @src 1:91:166  \"contract D is C(3)...\" */ value)
+            if and(1, slt(sum, value))
             {
                 mstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(224, 0x4e487b71))
                 mstore(4, 0x11)
                 revert(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ 0x24)
             }
-            sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ add(/** @src 1:107:108  \"3\" */ 0x03, /** @src 1:91:166  \"contract D is C(3)...\" */ value))
+            sstore(/** @src -1:-1:-1 */ 0, /** @src 1:91:166  \"contract D is C(3)...\" */ sum)
             let _2 := mload(64)
             let _3 := datasize(\"D_72_deployed\")
             codecopy(_2, dataoffset(\"D_72_deployed\"), _3)
@@ -1493,13 +1496,14 @@ object \"D_72\" {
                         /// @src 0:297:305  \"immutVar\"
                         let _4 := loadimmutable(\"8\")
                         /// @src 1:91:166  \"contract D is C(3)...\"
-                        if and(1, sgt(_4, sub(shl(255, 1), 42)))
+                        let sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 1:91:166  \"contract D is C(3)...\" */ _4)
+                        if and(1, slt(sum, _4))
                         {
                             mstore(_3, shl(224, 0x4e487b71))
                             mstore(4, 0x11)
                             revert(_3, 0x24)
                         }
-                        mstore(_1, add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 1:91:166  \"contract D is C(3)...\" */ _4))
+                        mstore(_1, sum)
                         return(_1, 32)
                     }
                     case 0x793816ec {
@@ -1579,20 +1583,15 @@ object \"D_72\" {
             }
             function checked_add_int256(x, y) -> sum
             {
-                let _1 := slt(x, 0)
-                if and(iszero(_1), sgt(y, sub(sub(shl(255, 1), 1), x)))
-                {
-                    mstore(0, shl(224, 0x4e487b71))
-                    mstore(4, 0x11)
-                    revert(0, 0x24)
-                }
-                if and(_1, slt(y, sub(shl(255, 1), x)))
+                sum := add(x, y)
+                let _1 := slt(sum, y)
+                let _2 := slt(x, 0)
+                if or(and(iszero(_2), _1), and(_2, iszero(_1)))
                 {
                     mstore(0, shl(224, 0x4e487b71))
                     mstore(4, 0x11)
                     revert(0, 0x24)
                 }
-                sum := add(x, y)
             }
         }
         data \".metadata\" hex\"<BYTECODE REMOVED>\"
diff --git a/test/formal/checked_int_add.py b/test/formal/checked_int_add.py
index 43368a98da..c83ff6056f 100644
--- a/test/formal/checked_int_add.py
+++ b/test/formal/checked_int_add.py
@@ -1,4 +1,4 @@
-from opcodes import AND, ISZERO, SGT, SLT, SUB
+from opcodes import AND, ISZERO, SGT, SLT, ADD
 from rule import Rule
 from util import BVSignedMax, BVSignedMin, BVSignedUpCast
 from z3 import BitVec, BVAddNoOverflow, BVAddNoUnderflow, Not
@@ -25,16 +25,21 @@
 	# cast to full n_bits values
 	X = BVSignedUpCast(X_short, n_bits)
 	Y = BVSignedUpCast(Y_short, n_bits)
+	sum_ = ADD(X, Y)
 
 	# Constants
 	maxValue = BVSignedMax(type_bits, n_bits)
 	minValue = BVSignedMin(type_bits, n_bits)
 
 	# Overflow and underflow checks in YulUtilFunction::overflowCheckedIntAddFunction
-	overflow_check = AND(ISZERO(SLT(X, 0)), SGT(Y, SUB(maxValue, X)))
-	underflow_check = AND(SLT(X, 0), SLT(Y, SUB(minValue, X)))
+	if type_bits == 256:
+		overflow_check = AND(ISZERO(SLT(X, 0)), SLT(sum_, Y))
+		underflow_check = AND(SLT(X, 0), ISZERO(SLT(sum_, Y)))
+	else:
+		overflow_check = SGT(sum_, maxValue)
+		underflow_check = SLT(sum_, minValue)
+
+	type_bits += 8
 
 	rule.check(actual_overflow, overflow_check != 0)
 	rule.check(actual_underflow, underflow_check != 0)
-
-	type_bits *= 2
diff --git a/test/formal/checked_int_sub.py b/test/formal/checked_int_sub.py
index ed292bbe06..aafd46d530 100644
--- a/test/formal/checked_int_sub.py
+++ b/test/formal/checked_int_sub.py
@@ -1,4 +1,4 @@
-from opcodes import AND, ADD, ISZERO, SLT, SGT
+from opcodes import AND, ISZERO, SLT, SGT, SUB
 from rule import Rule
 from util import BVSignedMax, BVSignedMin, BVSignedUpCast
 from z3 import BitVec, BVSubNoOverflow, BVSubNoUnderflow, Not
@@ -25,16 +25,21 @@
 	# cast to full n_bits values
 	X = BVSignedUpCast(X_short, n_bits)
 	Y = BVSignedUpCast(Y_short, n_bits)
+	diff = SUB(X, Y)
 
 	# Constants
 	maxValue = BVSignedMax(type_bits, n_bits)
 	minValue = BVSignedMin(type_bits, n_bits)
 
 	# Overflow and underflow checks in YulUtilFunction::overflowCheckedIntSubFunction
-	underflow_check = AND(ISZERO(SLT(Y, 0)), SLT(X, ADD(minValue, Y)))
-	overflow_check = AND(SLT(Y, 0), SGT(X, ADD(maxValue, Y)))
+	if type_bits == 256:
+		underflow_check = AND(ISZERO(SLT(Y, 0)), SGT(diff, X))
+		overflow_check = AND(SLT(Y, 0), SLT(diff, X))
+	else:
+		underflow_check = SLT(diff, minValue)
+		overflow_check = SGT(diff, maxValue)
+
+	type_bits += 8
 
 	rule.check(actual_underflow, underflow_check != 0)
 	rule.check(actual_overflow, overflow_check != 0)
-
-	type_bits *= 2
diff --git a/test/formal/checked_uint_add.py b/test/formal/checked_uint_add.py
index e38b4dcdb7..45b242833d 100644
--- a/test/formal/checked_uint_add.py
+++ b/test/formal/checked_uint_add.py
@@ -1,4 +1,4 @@
-from opcodes import GT, SUB
+from opcodes import GT, ADD
 from rule import Rule
 from util import BVUnsignedMax, BVUnsignedUpCast
 from z3 import BitVec, BVAddNoOverflow, Not
@@ -24,13 +24,17 @@
 	# cast to full n_bits values
 	X = BVUnsignedUpCast(X_short, n_bits)
 	Y = BVUnsignedUpCast(Y_short, n_bits)
+	sum_ = ADD(X, Y)
 
 	# Constants
 	maxValue = BVUnsignedMax(type_bits, n_bits)
 
 	# Overflow check in YulUtilFunction::overflowCheckedIntAddFunction
-	overflow_check = GT(X, SUB(maxValue, Y))
+	if type_bits == 256:
+		overflow_check = GT(X, sum_)
+	else:
+		overflow_check = GT(sum_, maxValue)
 
-	rule.check(overflow_check != 0, actual_overflow)
+	type_bits += 8
 
-	type_bits *= 2
+	rule.check(overflow_check != 0, actual_overflow)
diff --git a/test/formal/checked_uint_sub.py b/test/formal/checked_uint_sub.py
index 65bcf74a49..40a72686e4 100644
--- a/test/formal/checked_uint_sub.py
+++ b/test/formal/checked_uint_sub.py
@@ -1,4 +1,4 @@
-from opcodes import LT
+from opcodes import SUB, GT
 from rule import Rule
 from util import BVUnsignedMax, BVUnsignedUpCast
 from z3 import BVSubNoUnderflow, BitVec, Not
@@ -24,13 +24,17 @@
 	# cast to full n_bits values
 	X = BVUnsignedUpCast(X_short, n_bits)
 	Y = BVUnsignedUpCast(Y_short, n_bits)
+	diff = SUB(X, Y)
 
 	# Constants
 	maxValue = BVUnsignedMax(type_bits, n_bits)
 
 	# Overflow check in YulUtilFunction::overflowCheckedIntSubFunction
-	overflow_check = LT(X, Y)
+	if type_bits == 256:
+		overflow_check = GT(diff, X)
+	else:
+		overflow_check = GT(diff, maxValue)
 
-	rule.check(overflow_check != 0, actual_overflow)
+	type_bits += 8
 
-	type_bits *= 2
+	rule.check(overflow_check != 0, actual_overflow)
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index 423d8a173c..6c07ceec7e 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -19,6 +19,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 124757
-// gas legacy: 186184
-// gas legacyOptimized: 165682
+// gas irOptimized: 124817
+// gas legacy: 186028
+// gas legacyOptimized: 165692
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
index d2fe454453..c737a5b044 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
@@ -38,10 +38,10 @@ contract c {
 // compileViaYul: true
 // ----
 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 180766
+// gas irOptimized: 180769
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 157564
+// gas irOptimized: 157567
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 134630
+// gas irOptimized: 134633
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
-// gas irOptimized: 111268
+// gas irOptimized: 111271
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index 2e72d2b8ab..8f8ed06eae 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -38,12 +38,12 @@ contract Test {
 }
 // ----
 // test() -> 24
-// gas irOptimized: 226694
-// gas legacy: 227133
-// gas legacyOptimized: 226547
+// gas irOptimized: 226700
+// gas legacy: 227121
+// gas legacyOptimized: 226557
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 133254
-// gas legacy: 134295
-// gas legacyOptimized: 133383
+// gas irOptimized: 133260
+// gas legacy: 134283
+// gas legacyOptimized: 133393
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index aec5ad0e19..dc11953cd8 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -14,9 +14,9 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 519616
-// gas legacy: 521710
-// gas legacyOptimized: 516922
+// gas irOptimized: 519490
+// gas legacy: 521584
+// gas legacyOptimized: 517027
 // storageEmpty -> 0
 // halfClear() ->
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index a6bbbbefd6..5a3116e0cf 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -12,9 +12,9 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 465440
-// gas legacy: 471400
-// gas legacyOptimized: 467400
+// gas irOptimized: 465380
+// gas legacy: 471280
+// gas legacyOptimized: 467500
 // storageEmpty -> 0
 // clear() ->
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index 4271ee6ce6..695f6c0293 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -23,7 +23,7 @@ contract c {
 }
 // ----
 // test() -> 1, 2, 3
-// gas irOptimized: 2280132
+// gas irOptimized: 2280147
 // gas legacy: 2273434
-// gas legacyOptimized: 2261820
+// gas legacyOptimized: 2261844
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index c85e561573..1b15ef84da 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 38, 28, 18
-// gas irOptimized: 186364
+// gas irOptimized: 186370
 // gas legacy: 189492
-// gas legacyOptimized: 178294
+// gas legacyOptimized: 178318
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index 257899c1fe..ac52c4dafd 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 20, 10
-// gas irOptimized: 158009
+// gas irOptimized: 158020
 // gas legacy: 159279
-// gas legacyOptimized: 152921
+// gas legacyOptimized: 152937
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index 0753535e5a..3d25e354d3 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -16,7 +16,7 @@ contract c {
 }
 // ----
 // test() -> true
-// gas irOptimized: 180539
-// gas legacy: 228685
-// gas legacyOptimized: 209662
+// gas irOptimized: 176111
+// gas legacy: 224093
+// gas legacyOptimized: 205152
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 6dff7da416..896fa47d48 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -15,6 +15,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 173650
+// gas irOptimized: 174126
 // gas legacy: 216790
-// gas legacyOptimized: 203886
+// gas legacyOptimized: 204003
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index 5b3d72e6cd..8580d21506 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -21,9 +21,9 @@ contract D is B, C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 154366
-// gas legacy: 170665
-// gas legacyOptimized: 145396
+// gas irOptimized: 154331
+// gas legacy: 170115
+// gas legacyOptimized: 145429
 // i() -> 2
 // j() -> 2
 // k() -> 1
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index 81065d5e92..d34fb896c6 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -12,8 +12,8 @@ contract D is C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 123982
-// gas legacy: 139250
-// gas legacyOptimized: 119367
+// gas irOptimized: 123966
+// gas legacy: 138700
+// gas legacyOptimized: 119400
 // i() -> 2
 // k() -> 1
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index b0996b4995..f0bd89903b 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
@@ -13,6 +13,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 113517
-// gas legacy: 116393
-// gas legacyOptimized: 114415
+// gas irOptimized: 113514
+// gas legacy: 116381
+// gas legacyOptimized: 114425
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
index 1167b3ad16..b8553d4b49 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
@@ -14,6 +14,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 113517
-// gas legacy: 116393
-// gas legacyOptimized: 114415
+// gas irOptimized: 113514
+// gas legacy: 116381
+// gas legacyOptimized: 114425
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
index 7bd5bfa940..bab70e69b7 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
@@ -16,5 +16,5 @@ contract C {
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
 // gas irOptimized: 185145
-// gas legacy: 187621
-// gas legacyOptimized: 184551
+// gas legacy: 187603
+// gas legacyOptimized: 184566
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index f2d816a72b..c0cf34627d 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,9 +33,9 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 443542
-// gas legacy: 765640
-// gas legacyOptimized: 541810
+// gas irOptimized: 444190
+// gas legacy: 757857
+// gas legacyOptimized: 539866
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
 // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
 // encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
@@ -51,10 +51,10 @@ contract test {
 // encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
 // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
 // encode_inline_asm_large()
-// gas irOptimized: 1385042
-// gas legacy: 1652033
-// gas legacyOptimized: 1201033
+// gas irOptimized: 1382042
+// gas legacy: 1646033
+// gas legacyOptimized: 1206033
 // encode_no_asm_large()
-// gas irOptimized: 3335099
-// gas legacy: 4777077
-// gas legacyOptimized: 2890077
+// gas irOptimized: 3311099
+// gas legacy: 4723077
+// gas legacyOptimized: 2909077
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 1f4a9f60fa..61a1f6bd63 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,9 +176,9 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 1433406
-// gas legacy: 2435803
-// gas legacyOptimized: 1775425
+// gas irOptimized: 1432633
+// gas legacy: 2427722
+// gas legacyOptimized: 1773892
 // supportsInterface(bytes4): 0x0 -> 0
 // supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index 444a9a27b3..bf257815af 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -48,9 +48,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1878547
-// gas legacy: 2478955
-// gas legacyOptimized: 1877737
+// gas irOptimized: 1876171
+// gas legacy: 2471603
+// gas legacyOptimized: 1876669
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
 // gas irOptimized: 22137
 // gas legacy: 22767
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index f144f16aa1..5cea75abec 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,9 +48,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1737100
-// gas legacy: 2248594
-// gas legacyOptimized: 1749096
+// gas irOptimized: 1735588
+// gas legacy: 2241243
+// gas legacyOptimized: 1748028
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
 // gas irOptimized: 22004
 // gas legacy: 22497
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index d6cdffb075..bf62bb81a0 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -33,9 +33,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 438112
-// gas legacy: 671453
-// gas legacyOptimized: 480242
+// gas irOptimized: 422763
+// gas legacy: 654526
+// gas legacyOptimized: 474842
 // prb_pi() -> 3141592656369545286
 // gas irOptimized: 57478
 // gas legacy: 98903
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 1daa25d53e..10c16c4b7d 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -297,5 +297,5 @@ contract Test {
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
 // gas irOptimized: 95261
-// gas legacy: 113731
+// gas legacy: 113239
 // gas legacyOptimized: 83670
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index cc7c0b9028..c604ff1422 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,9 +49,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 691317
-// gas legacy: 1127730
-// gas legacyOptimized: 753807
+// gas irOptimized: 678980
+// gas legacy: 1103242
+// gas legacyOptimized: 745184
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
 // gas irOptimized: 22660
 // gas legacy: 23190
@@ -69,6 +69,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 2040019
-// gas legacy: 4356286
-// gas legacyOptimized: 2268278
+// gas irOptimized: 2017767
+// gas legacy: 4294510
+// gas legacyOptimized: 2327982
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index 794e336cc2..558ce1c5bf 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -23,9 +23,9 @@ contract C {
 
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 270677
-// gas legacy: 464030
-// gas legacyOptimized: 304049
+// gas irOptimized: 270449
+// gas legacy: 456680
+// gas legacyOptimized: 302975
 // f(uint256): 0 -> FAILURE
 // f(uint256): 1 -> FAILURE
 // f(uint256): 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index 7501d9ceca..4af6f97f60 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -26,9 +26,9 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 428679
-// gas legacy: 832976
-// gas legacyOptimized: 509560
+// gas irOptimized: 428444
+// gas legacy: 825625
+// gas legacyOptimized: 508492
 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
 // f(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
 // f(uint256): 2 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 3f58c0d0eb..c963c0e209 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -17,9 +17,9 @@ contract C {
 // EVMVersion: >=byzantium
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 184221
+// gas irOptimized: 184005
 // gas legacy: 294335
-// gas legacyOptimized: 174279
+// gas legacyOptimized: 173427
 // f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
 // x() -> 1
 // f(uint256): 20 -> FAILURE
@@ -27,7 +27,7 @@ contract C {
 // stack(uint256): 1023 -> FAILURE
 // gas irOptimized: 260987
 // gas legacy: 483942
-// gas legacyOptimized: 298807
+// gas legacyOptimized: 302349
 // x() -> 1
 // stack(uint256): 10 -> 693016686122178122849713379390321835634789309880
 // x() -> 2
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index d413acb79c..ba8b65bbc7 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -27,5 +27,5 @@ contract C {
 // ----
 // t() -> 9
 // gas irOptimized: 99064
-// gas legacy: 158955
-// gas legacyOptimized: 108788
+// gas legacy: 152137
+// gas legacyOptimized: 107793
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index ffa6c7894d..364ac525e3 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -16,7 +16,7 @@ contract C {
 // ----
 // constructor(): 3 ->
 // gas irOptimized: 125477
-// gas legacy: 209361
-// gas legacyOptimized: 139324
+// gas legacy: 202011
+// gas legacyOptimized: 139552
 // f() -> 84, 23
 // m(uint256): 3 -> 7
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 5d0c4cd6af..8bd823e39d 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -21,6 +21,6 @@ contract A {
 // EVMVersion: >=constantinople
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 257206
-// gas legacy: 422501
-// gas legacyOptimized: 287472
+// gas irOptimized: 268645
+// gas legacy: 402016
+// gas legacyOptimized: 288087
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index 4b01e87cb3..167521bffa 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -113,9 +113,9 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 364503
-// gas legacy: 860880
-// gas legacyOptimized: 420959
+// gas irOptimized: 362054
+// gas legacy: 852973
+// gas legacyOptimized: 419237
 // totalSupply() -> 20
 // gas irOptimized: 23415
 // gas legacy: 23653
diff --git a/test/libsolidity/semanticTests/using/using_global_invisible.sol b/test/libsolidity/semanticTests/using/using_global_invisible.sol
index 820fdb40c8..2ad94f0500 100644
--- a/test/libsolidity/semanticTests/using/using_global_invisible.sol
+++ b/test/libsolidity/semanticTests/using/using_global_invisible.sol
@@ -40,4 +40,4 @@ contract D {
 // ----
 // library: "A":L
 // test() -> 3
-// gas legacy: 130369
+// gas legacy: 123521
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index de8dc72ca6..236ebbce56 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -96,9 +96,9 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 357114
-// gas legacy: 832643
-// gas legacyOptimized: 416135
+// gas irOptimized: 357746
+// gas legacy: 824737
+// gas legacyOptimized: 414462
 // totalSupply() -> 20
 // gas irOptimized: 23415
 // gas legacy: 23524
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 2802b6ae76..6f57e9e322 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -20,7 +20,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 176219
-// gas legacy: 265006
-// gas legacyOptimized: 182842
+// gas irOptimized: 176003
+// gas legacy: 257656
+// gas legacyOptimized: 183070
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 430a952a85..8aba90d964 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -19,7 +19,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 177083
-// gas legacy: 266728
-// gas legacyOptimized: 184762
+// gas irOptimized: 176867
+// gas legacy: 259378
+// gas legacyOptimized: 183682
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
index 254d495f19..d8cad3e8da 100644
--- a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
@@ -26,9 +26,9 @@ contract C {
 // index(uint256): 10 -> true
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
-// gas irOptimized: 135578
-// gas legacy: 247324
-// gas legacyOptimized: 149578
+// gas irOptimized: 135584
+// gas legacy: 244264
+// gas legacyOptimized: 152128
 // accessIndex(uint256,int256): 10, 1 -> 2
 // accessIndex(uint256,int256): 10, 0 -> 1
 // accessIndex(uint256,int256): 10, 11 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index edcf931252..4dd06e9984 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -17,32 +17,32 @@ contract C {
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
 // gas irOptimized: 3018687
-// gas legacy: 3070431
-// gas legacyOptimized: 3010325
+// gas legacy: 3068883
+// gas legacyOptimized: 3011615
 // test_indices(uint256): 5 ->
 // gas irOptimized: 372543
-// gas legacy: 369211
-// gas legacyOptimized: 366089
+// gas legacy: 369151
+// gas legacyOptimized: 366139
 // test_indices(uint256): 10 ->
 // test_indices(uint256): 15 ->
 // gas irOptimized: 72860
 // test_indices(uint256): 0xFF ->
 // gas irOptimized: 3410255
-// gas legacy: 3512637
-// gas legacyOptimized: 3395047
+// gas legacy: 3509577
+// gas legacyOptimized: 3397597
 // test_indices(uint256): 1000 ->
 // gas irOptimized: 18206122
-// gas legacy: 18611999
-// gas legacyOptimized: 18166944
+// gas legacy: 18599999
+// gas legacyOptimized: 18176944
 // test_indices(uint256): 129 ->
 // gas irOptimized: 2756955
-// gas legacy: 2771961
-// gas legacyOptimized: 2714999
+// gas legacy: 2770413
+// gas legacyOptimized: 2716289
 // test_indices(uint256): 128 ->
 // gas irOptimized: 411903
-// gas legacy: 466504
-// gas legacyOptimized: 416888
+// gas legacy: 464968
+// gas legacyOptimized: 418168
 // test_indices(uint256): 1 ->
 // gas irOptimized: 368571
-// gas legacy: 363401
-// gas legacyOptimized: 361799
+// gas legacy: 363389
+// gas legacyOptimized: 361809
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index 4780a099e8..8b83e1807b 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131192
-// gas legacy: 132331
-// gas legacyOptimized: 129514
+// gas irOptimized: 131177
+// gas legacy: 132301
+// gas legacyOptimized: 129539
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 174810
-// gas legacy: 177248
-// gas legacyOptimized: 172062
+// gas irOptimized: 174780
+// gas legacy: 177188
+// gas legacyOptimized: 172112
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 198070
-// gas legacy: 201828
-// gas legacyOptimized: 194352
+// gas irOptimized: 198025
+// gas legacy: 201738
+// gas legacyOptimized: 194427
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 6098680
-// gas legacy: 6160863
-// gas legacyOptimized: 6024902
+// gas irOptimized: 6097915
+// gas legacy: 6159333
+// gas legacyOptimized: 6026177

From 61febbd2491ead2140b88afb8623f664f064375a Mon Sep 17 00:00:00 2001
From: Ishtiaque Zahid <ruko97@gmail.com>
Date: Thu, 16 Jun 2022 11:41:16 +0600
Subject: [PATCH 0717/1748] formatNumberReadable now prints signed integers as
 well

---
 libsolutil/StringUtils.h                      | 45 ++++++++++----
 .../overflow/signed_guard_sum_overflow.sol    |  2 +-
 .../overflow/signed_mul_overflow.sol          |  2 +-
 .../overflow/signed_sub_overflow.sol          |  2 +-
 .../overflow/signed_sum_overflow.sol          |  2 +-
 test/libsolutil/StringUtils.cpp               | 58 +++++++++++++++++++
 6 files changed, 97 insertions(+), 14 deletions(-)

diff --git a/libsolutil/StringUtils.h b/libsolutil/StringUtils.h
index 7a48c296f8..a50d679e84 100644
--- a/libsolutil/StringUtils.h
+++ b/libsolutil/StringUtils.h
@@ -101,17 +101,9 @@ std::string joinHumanReadablePrefixed
 		return _separator + joinHumanReadable(_list, _separator, _lastSeparator);
 }
 
-/// Formats large numbers to be easily readable by humans.
-/// Returns decimal representation for smaller numbers; hex for large numbers.
-/// "Special" numbers, powers-of-two and powers-of-two minus 1, are returned in
-/// formulaic form like 0x01 * 2**24 - 1.
-/// @a T will typically by unsigned, u160, u256 or bigint.
-/// @param _value to be formatted
-/// @param _useTruncation if true, internal truncation is also applied,
-/// like  0x5555...{+56 more}...5555
-/// @example formatNumber((u256)0x7ffffff)
+/// Same as @ref formatNumberReadable but only for unsigned numbers
 template <class T>
-inline std::string formatNumberReadable(
+inline std::string formatUnsignedNumberReadable (
 	T const& _value,
 	bool _useTruncation = false
 )
@@ -181,6 +173,39 @@ inline std::string formatNumberReadable(
 	return str;
 }
 
+/// Formats large numbers to be easily readable by humans.
+/// Returns decimal representation for smaller numbers; hex for large numbers.
+/// "Special" numbers, powers-of-two and powers-of-two minus 1, are returned in
+/// formulaic form like 0x01 * 2**24 - 1.
+/// @a T can be any integer variable, will typically be u160, u256 or bigint.
+/// @param _value to be formatted
+/// @param _useTruncation if true, internal truncation is also applied,
+/// like  0x5555...{+56 more}...5555
+/// @example formatNumberReadable((u256)0x7ffffff) = "0x08 * 2**24"
+/// @example formatNumberReadable(-57896044618658097711785492504343953926634992332820282019728792003956564819968) = -0x80 * 2**248
+template <class T>
+inline std::string formatNumberReadable(
+	T const& _value,
+	bool _useTruncation = false
+)
+{
+	static_assert(
+		std::numeric_limits<T>::is_integer,
+		"only integer numbers are supported"
+	);
+
+	if (_value >= 0)
+	{
+		bigint const _v = bigint(_value);
+		return formatUnsignedNumberReadable(_v, _useTruncation);
+	}
+	else
+	{
+		bigint const _abs_value = bigint(-1) * _value;
+		return "-" + formatUnsignedNumberReadable(_abs_value, _useTruncation);
+	}
+}
+
 /// Safely converts an usigned integer as string into an unsigned int type.
 ///
 /// @return the converted number or nullopt in case of an failure (including if it would not fit).
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
index 4635ef966b..2e4b84b700 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
@@ -8,5 +8,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (78-83): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
+// Warning 3944: (78-83): CHC: Underflow (resulting value less than -0x80 * 2**248) happens here.
 // Warning 4984: (78-83): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
index 225d006893..e664174dfd 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
+// Warning 3944: (77-82): CHC: Underflow (resulting value less than -0x80 * 2**248) happens here.
 // Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
index 81de2d5feb..dfb228b9aa 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
+// Warning 3944: (77-82): CHC: Underflow (resulting value less than -0x80 * 2**248) happens here.
 // Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
index 7bb6588e37..5ac0c812bd 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -57896044618658097711785492504343953926634992332820282019728792003956564819968) happens here.
+// Warning 3944: (77-82): CHC: Underflow (resulting value less than -0x80 * 2**248) happens here.
 // Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
diff --git a/test/libsolutil/StringUtils.cpp b/test/libsolutil/StringUtils.cpp
index 0ef61cb0a7..db72297e7a 100644
--- a/test/libsolutil/StringUtils.cpp
+++ b/test/libsolutil/StringUtils.cpp
@@ -152,6 +152,64 @@ BOOST_AUTO_TEST_CASE(test_format_number_readable)
 			formatNumberReadable(frontend::IntegerType(256).maxValue()), "2**256 - 1");
 }
 
+BOOST_AUTO_TEST_CASE(test_format_number_readable_signed)
+{
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8000000)), "-0x08 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x80000000)), "-0x80 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x800000000)), "-0x08 * 2**32");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8000000000)), "-0x80 * 2**32");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x80000000000)), "-0x08 * 2**40");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffff)), "-0x08 * 2**24 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7fffffff)), "-0x80 * 2**24 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffffff)), "-0x08 * 2**32 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7fffffffff)), "-0x80 * 2**32 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffffffff)), "-0x08 * 2**40 - 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x88000000)), "-0x88 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8888888888000000)), "-0x8888888888 * 2**24");
+
+	s256 b = 0;
+	for (int i = 0; i < 32; i++)
+	{
+		b <<= 8;
+		b |= 0x55;
+	}
+	b = b * (-1);
+
+	s256 c = (-1) * u2s((u256)FixedHash<32>(
+		fromHex("0x0bcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789")
+	));
+
+	s256 d = (-1) * u2s(
+		u256(0x5555555555555555) << 192 |
+		u256(0xFFFFffffFFFFffff) << 128 |
+		u256(0xFFFFffffFFFFffff) << 64 |
+		u256(0xFFFFffffFFFFffff)
+	);
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(b, true), "-0x5555...{+56 more}...5555");
+	BOOST_CHECK_EQUAL(formatNumberReadable(c, true), "-0x0BCD...{+56 more}...6789");
+	BOOST_CHECK_EQUAL(formatNumberReadable(d, true), "-0x5555555555555556 * 2**192 - 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(s256(-1)), "-1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x10000)), "-65536");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xFFFF)), "-65535");
+
+	BOOST_CHECK_EQUAL(
+		formatNumberReadable(
+			frontend::IntegerType(256, frontend::IntegerType::Modifier::Signed).minValue()
+		),
+		"-0x80 * 2**248"
+	);
+	BOOST_CHECK_EQUAL(
+		formatNumberReadable(
+			frontend::IntegerType(256, frontend::IntegerType::Modifier::Signed).maxValue()
+		),
+		"0x80 * 2**248 - 1"
+	);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }

From 7445a4803f981fd83bcfc734edd5ccb5713b8d7f Mon Sep 17 00:00:00 2001
From: victorknox <vamshi.b@research.iiit.ac.in>
Date: Sun, 5 Jun 2022 08:44:54 +0530
Subject: [PATCH 0718/1748] Moved Keywords section from 'Cheatsheet' to 'Units
 and Globally Available Variables'

---
 docs/cheatsheet.rst                 | 10 ----------
 docs/units-and-global-variables.rst | 11 +++++++++++
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index fb9f97b3ae..3a7d478b1b 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -112,13 +112,3 @@ Modifiers
 - ``override``: States that this function, modifier or public state variable changes
   the behaviour of a function or modifier in a base contract.
 
-Reserved Keywords
-=================
-
-These keywords are reserved in Solidity. They might become part of the syntax in the future:
-
-``after``, ``alias``, ``apply``, ``auto``, ``byte``, ``case``, ``copyof``, ``default``,
-``define``, ``final``, ``implements``, ``in``, ``inline``, ``let``, ``macro``, ``match``,
-``mutable``, ``null``, ``of``, ``partial``, ``promise``, ``reference``, ``relocatable``,
-``sealed``, ``sizeof``, ``static``, ``supports``, ``switch``, ``typedef``, ``typeof``,
-``var``.
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index 7d172eb075..b19396299c 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -384,3 +384,14 @@ The following properties are available for an integer type ``T``:
 
 ``type(T).max``
     The largest value representable by type ``T``.
+
+Reserved Keywords
+=================
+
+These keywords are reserved in Solidity. They might become part of the syntax in the future:
+
+``after``, ``alias``, ``apply``, ``auto``, ``byte``, ``case``, ``copyof``, ``default``,
+``define``, ``final``, ``implements``, ``in``, ``inline``, ``let``, ``macro``, ``match``,
+``mutable``, ``null``, ``of``, ``partial``, ``promise``, ``reference``, ``relocatable``,
+``sealed``, ``sizeof``, ``static``, ``supports``, ``switch``, ``typedef``, ``typeof``,
+``var``.
\ No newline at end of file

From 4d8a14b65380208a8408f0ffd1e86499f92ddc79 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 29 Jun 2022 17:54:35 +0200
Subject: [PATCH 0719/1748] Fix external test ens

By using the last known working commit.
Only a temporary measure.
---
 test/externalTests/ens.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index ca041afbc4..c527d35cf6 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -37,8 +37,8 @@ function test_fn { yarn test; }
 function ens_test
 {
     local repo="https://github.com/ensdomains/ens-contracts.git"
-    local ref_type=branch
-    local ref="master"
+    local ref_type=commit
+    local ref="083d29a2c50cd0a8307386abf8fadc217b256256"
     local config_file="hardhat.config.js"
 
     local compile_only_presets=(

From ee710eadd4f550fa5b33ec7e31677b046b4abc98 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 14 Jun 2022 16:02:05 +0200
Subject: [PATCH 0720/1748] Add location for member in MemberAccess ASTNode

---
 libsolidity/ast/AST.h                                | 12 ++++++++++--
 libsolidity/ast/ASTJsonExporter.cpp                  |  1 +
 libsolidity/ast/ASTJsonImporter.cpp                  |  7 ++++++-
 libsolidity/parsing/Parser.cpp                       |  7 +++++--
 test/libsolidity/ASTJSON/enum_value_declaration.json |  1 +
 .../ASTJSON/enum_value_declaration_parseOnly.json    |  1 +
 6 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 9c4c10b2fa..8c1bf938e7 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -2190,19 +2190,27 @@ class MemberAccess: public Expression
 		int64_t _id,
 		SourceLocation const& _location,
 		ASTPointer<Expression> _expression,
-		ASTPointer<ASTString> _memberName
+		ASTPointer<ASTString> _memberName,
+		SourceLocation _memberLocation
 	):
-		Expression(_id, _location), m_expression(std::move(_expression)), m_memberName(std::move(_memberName)) {}
+		Expression(_id, _location),
+		m_expression(std::move(_expression)),
+		m_memberName(std::move(_memberName)),
+		m_memberLocation(std::move(_memberLocation))
+	{}
+
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
 	Expression const& expression() const { return *m_expression; }
 	ASTString const& memberName() const { return *m_memberName; }
+	SourceLocation const& memberLocation() const { return m_memberLocation; }
 
 	MemberAccessAnnotation& annotation() const override;
 
 private:
 	ASTPointer<Expression> m_expression;
 	ASTPointer<ASTString> m_memberName;
+	SourceLocation m_memberLocation;
 };
 
 /**
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index dfd4a2f931..82ac4ab297 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -889,6 +889,7 @@ bool ASTJsonExporter::visit(MemberAccess const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("memberName", _node.memberName()),
+		make_pair("memberLocation", Json::Value(sourceLocationToString(_node.memberLocation()))),
 		make_pair("expression", toJson(_node.expression())),
 		make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration)),
 	};
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 0f692376c2..c4a3426724 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -931,10 +931,15 @@ ASTPointer<NewExpression> ASTJsonImporter::createNewExpression(Json::Value const
 
 ASTPointer<MemberAccess> ASTJsonImporter::createMemberAccess(Json::Value const&  _node)
 {
+	SourceLocation memberLocation;
+	if (member(_node, "memberLocation").isString())
+		memberLocation = solidity::langutil::parseSourceLocation(_node["memberLocation"].asString(), m_sourceNames);
+
 	return createASTNode<MemberAccess>(
 		_node,
 		convertJsonToASTNode<Expression>(member(_node, "expression")),
-		memberAsASTString(_node, "memberName")
+		memberAsASTString(_node, "memberName"),
+		std::move(memberLocation)
 	);
 }
 
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 15e9f6c53d..37ef1af490 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1897,7 +1897,9 @@ ASTPointer<Expression> Parser::parseLeftHandSideExpression(
 		{
 			advance();
 			nodeFactory.markEndPosition();
-			expression = nodeFactory.createNode<MemberAccess>(expression, expectIdentifierTokenOrAddress());
+			SourceLocation memberLocation = currentLocation();
+			ASTPointer<ASTString> memberName = expectIdentifierTokenOrAddress();
+			expression = nodeFactory.createNode<MemberAccess>(expression, std::move(memberName), std::move(memberLocation));
 			break;
 		}
 		case Token::LParen:
@@ -2335,7 +2337,8 @@ ASTPointer<Expression> Parser::expressionFromIndexAccessStructure(
 		Identifier const& identifier = dynamic_cast<Identifier const&>(*_iap.path[i]);
 		expression = nodeFactory.createNode<MemberAccess>(
 			expression,
-			make_shared<ASTString>(identifier.name())
+			make_shared<ASTString>(identifier.name()),
+			identifier.location()
 		);
 	}
 	for (auto const& index: _iap.indices)
diff --git a/test/libsolidity/ASTJSON/enum_value_declaration.json b/test/libsolidity/ASTJSON/enum_value_declaration.json
index 3e6e7c24c9..acdcc736e2 100644
--- a/test/libsolidity/ASTJSON/enum_value_declaration.json
+++ b/test/libsolidity/ASTJSON/enum_value_declaration.json
@@ -70,6 +70,7 @@
               "isLValue": false,
               "isPure": true,
               "lValueRequested": false,
+              "memberLocation": "57:1:1",
               "memberName": "X",
               "nodeType": "MemberAccess",
               "referencedDeclaration": 1,
diff --git a/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json b/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
index f19bb2d9b1..8fa574fa74 100644
--- a/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
+++ b/test/libsolidity/ASTJSON/enum_value_declaration_parseOnly.json
@@ -49,6 +49,7 @@
                 "typeDescriptions": {}
               },
               "id": 10,
+              "memberLocation": "57:1:1",
               "memberName": "X",
               "nodeType": "MemberAccess",
               "src": "55:3:1",

From 3a5218d3d53cbd0fc2e453edc1bca5466da7182b Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 16 Jun 2022 19:21:38 +0200
Subject: [PATCH 0721/1748] Add location for parameter names in FunctionCall
 ASTNode

---
 libsolidity/ast/AST.h                         | 11 +++-
 libsolidity/ast/ASTJsonExporter.cpp           | 11 ++++
 libsolidity/ast/ASTJsonExporter.h             |  1 +
 libsolidity/ast/ASTJsonImporter.cpp           | 22 +++++++-
 libsolidity/ast/ASTJsonImporter.h             |  1 +
 libsolidity/parsing/Parser.cpp                | 56 ++++++++++++-------
 libsolidity/parsing/Parser.h                  | 13 ++++-
 test/libsolidity/ASTJSON/address_payable.json |  2 +
 .../ASTJSON/address_payable_parseOnly.json    |  2 +
 .../ASTJSON/fail_after_parsing_parseOnly.json |  1 +
 test/libsolidity/ASTJSON/non_utf8.json        |  2 +
 .../ASTJSON/non_utf8_parseOnly.json           |  2 +
 test/libsolidity/ASTJSON/used_errors.json     |  2 +
 .../ASTJSON/used_errors_parseOnly.json        |  2 +
 14 files changed, 103 insertions(+), 25 deletions(-)

diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 9c4c10b2fa..feca6fce1e 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -2105,9 +2105,14 @@ class FunctionCall: public Expression
 		SourceLocation const& _location,
 		ASTPointer<Expression> _expression,
 		std::vector<ASTPointer<Expression>> _arguments,
-		std::vector<ASTPointer<ASTString>> _names
+		std::vector<ASTPointer<ASTString>> _names,
+		std::vector<SourceLocation> _nameLocations
 	):
-		Expression(_id, _location), m_expression(std::move(_expression)), m_arguments(std::move(_arguments)), m_names(std::move(_names)) {}
+		Expression(_id, _location), m_expression(std::move(_expression)), m_arguments(std::move(_arguments)), m_names(std::move(_names)), m_nameLocations(std::move(_nameLocations))
+	{
+		solAssert(m_nameLocations.size() == m_names.size());
+	}
+
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
 
@@ -2120,6 +2125,7 @@ class FunctionCall: public Expression
 	/// in the order they were written.
 	/// If this is not a named call, this is empty.
 	std::vector<ASTPointer<ASTString>> const& names() const { return m_names; }
+	std::vector<SourceLocation> const& nameLocations() const { return m_nameLocations; }
 
 	FunctionCallAnnotation& annotation() const override;
 
@@ -2127,6 +2133,7 @@ class FunctionCall: public Expression
 	ASTPointer<Expression> m_expression;
 	std::vector<ASTPointer<Expression>> m_arguments;
 	std::vector<ASTPointer<ASTString>> m_names;
+	std::vector<SourceLocation> m_nameLocations;
 };
 
 /**
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index dfd4a2f931..359752fc7f 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -128,6 +128,16 @@ string ASTJsonExporter::sourceLocationToString(SourceLocation const& _location)
 	return to_string(_location.start) + ":" + to_string(length) + ":" + (sourceIndexOpt.has_value() ? to_string(sourceIndexOpt.value()) : "-1");
 }
 
+Json::Value ASTJsonExporter::sourceLocationsToJson(vector<SourceLocation> const& _sourceLocations) const
+{
+	Json::Value locations = Json::arrayValue;
+
+	for (SourceLocation const& location: _sourceLocations)
+		locations.append(sourceLocationToString(location));
+
+	return locations;
+}
+
 string ASTJsonExporter::namePathToString(std::vector<ASTString> const& _namePath)
 {
 	return boost::algorithm::join(_namePath, ".");
@@ -843,6 +853,7 @@ bool ASTJsonExporter::visit(FunctionCall const& _node)
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("expression", toJson(_node.expression())),
 		make_pair("names", std::move(names)),
+		make_pair("nameLocations", sourceLocationsToJson(_node.nameLocations())),
 		make_pair("arguments", toJson(_node.arguments())),
 		make_pair("tryCall", _node.annotation().tryCall)
 	};
diff --git a/libsolidity/ast/ASTJsonExporter.h b/libsolidity/ast/ASTJsonExporter.h
index fb3189ece4..566f13612f 100644
--- a/libsolidity/ast/ASTJsonExporter.h
+++ b/libsolidity/ast/ASTJsonExporter.h
@@ -144,6 +144,7 @@ class ASTJsonExporter: public ASTConstVisitor
 	/// Maps source location to an index, if source is valid and a mapping does exist, otherwise returns std::nullopt.
 	std::optional<size_t> sourceIndexFromLocation(langutil::SourceLocation const& _location) const;
 	std::string sourceLocationToString(langutil::SourceLocation const& _location) const;
+	Json::Value sourceLocationsToJson(std::vector<langutil::SourceLocation> const& _sourceLocations) const;
 	static std::string namePathToString(std::vector<ASTString> const& _namePath);
 	static Json::Value idOrNull(ASTNode const* _pt)
 	{
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 0f692376c2..4608652aad 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -95,6 +95,20 @@ SourceLocation const ASTJsonImporter::createSourceLocation(Json::Value const& _n
 	return solidity::langutil::parseSourceLocation(_node["src"].asString(), m_sourceNames);
 }
 
+optional<vector<SourceLocation>> ASTJsonImporter::createSourceLocations(Json::Value const& _node) const
+{
+	vector<SourceLocation> locations;
+
+	if (_node.isMember("nameLocations") && _node["nameLocations"].isArray())
+	{
+		for (auto const& val: _node["nameLocations"])
+			locations.emplace_back(langutil::parseSourceLocation(val.asString(), m_sourceNames));
+		return locations;
+	}
+
+	return nullopt;
+}
+
 SourceLocation ASTJsonImporter::createNameSourceLocation(Json::Value const& _node)
 {
 	astAssert(member(_node, "nameLocation").isString(), "'nameLocation' must be a string");
@@ -893,11 +907,17 @@ ASTPointer<FunctionCall> ASTJsonImporter::createFunctionCall(Json::Value const&
 		astAssert(name.isString(), "Expected 'names' members to be strings!");
 		names.push_back(make_shared<ASTString>(name.asString()));
 	}
+
+	optional<vector<SourceLocation>> sourceLocations = createSourceLocations(_node);
+
 	return createASTNode<FunctionCall>(
 		_node,
 		convertJsonToASTNode<Expression>(member(_node, "expression")),
 		arguments,
-		names
+		names,
+		sourceLocations ?
+			*sourceLocations :
+			vector<SourceLocation>(names.size())
 	);
 }
 
diff --git a/libsolidity/ast/ASTJsonImporter.h b/libsolidity/ast/ASTJsonImporter.h
index 4566a58a40..1216d29b15 100644
--- a/libsolidity/ast/ASTJsonImporter.h
+++ b/libsolidity/ast/ASTJsonImporter.h
@@ -59,6 +59,7 @@ class ASTJsonImporter
 	ASTPointer<T> createASTNode(Json::Value const& _node, Args&&... _args);
 	/// @returns the sourceLocation-object created from the string in the JSON node
 	langutil::SourceLocation const createSourceLocation(Json::Value const& _node);
+	std::optional<std::vector<langutil::SourceLocation>> createSourceLocations(Json::Value const& _node) const;
 	/// Creates an ASTNode for a given JSON-ast of unknown type
 	/// @returns Pointer to a new created ASTNode
 	ASTPointer<ASTNode> convertJsonToASTNode(Json::Value const& _ast);
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 15e9f6c53d..a9eafd72bf 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -38,6 +38,7 @@
 #include <cctype>
 #include <vector>
 #include <regex>
+#include <tuple>
 
 using namespace std;
 using namespace solidity::langutil;
@@ -1542,13 +1543,16 @@ ASTPointer<EmitStatement> Parser::parseEmitStatement(ASTPointer<ASTString> const
 	auto eventName = expressionFromIndexAccessStructure(iap);
 	expectToken(Token::LParen);
 
-	vector<ASTPointer<Expression>> arguments;
-	vector<ASTPointer<ASTString>> names;
-	std::tie(arguments, names) = parseFunctionCallArguments();
+	auto functionCallArguments = parseFunctionCallArguments();
 	eventCallNodeFactory.markEndPosition();
 	nodeFactory.markEndPosition();
 	expectToken(Token::RParen);
-	auto eventCall = eventCallNodeFactory.createNode<FunctionCall>(eventName, arguments, names);
+	auto eventCall = eventCallNodeFactory.createNode<FunctionCall>(
+		eventName,
+		functionCallArguments.arguments,
+		functionCallArguments.parameterNames,
+		functionCallArguments.parameterNameLocations
+	);
 	return nodeFactory.createNode<EmitStatement>(_docString, eventCall);
 }
 
@@ -1573,13 +1577,16 @@ ASTPointer<RevertStatement> Parser::parseRevertStatement(ASTPointer<ASTString> c
 	auto errorName = expressionFromIndexAccessStructure(iap);
 	expectToken(Token::LParen);
 
-	vector<ASTPointer<Expression>> arguments;
-	vector<ASTPointer<ASTString>> names;
-	std::tie(arguments, names) = parseFunctionCallArguments();
+	auto functionCallArguments = parseFunctionCallArguments();
 	errorCallNodeFactory.markEndPosition();
 	nodeFactory.markEndPosition();
 	expectToken(Token::RParen);
-	auto errorCall = errorCallNodeFactory.createNode<FunctionCall>(errorName, arguments, names);
+	auto errorCall = errorCallNodeFactory.createNode<FunctionCall>(
+		errorName,
+		functionCallArguments.arguments,
+		functionCallArguments.parameterNames,
+		functionCallArguments.parameterNameLocations
+	);
 	return nodeFactory.createNode<RevertStatement>(_docString, errorCall);
 }
 
@@ -1903,12 +1910,14 @@ ASTPointer<Expression> Parser::parseLeftHandSideExpression(
 		case Token::LParen:
 		{
 			advance();
-			vector<ASTPointer<Expression>> arguments;
-			vector<ASTPointer<ASTString>> names;
-			std::tie(arguments, names) = parseFunctionCallArguments();
+			auto functionCallArguments = parseFunctionCallArguments();
 			nodeFactory.markEndPosition();
 			expectToken(Token::RParen);
-			expression = nodeFactory.createNode<FunctionCall>(expression, arguments, names);
+			expression = nodeFactory.createNode<FunctionCall>(
+				expression,
+				functionCallArguments.arguments,
+				functionCallArguments.parameterNames,
+				functionCallArguments.parameterNameLocations);
 			break;
 		}
 		case Token::LBrace:
@@ -1927,7 +1936,7 @@ ASTPointer<Expression> Parser::parseLeftHandSideExpression(
 			nodeFactory.markEndPosition();
 			expectToken(Token::RBrace);
 
-			expression = nodeFactory.createNode<FunctionCallOptions>(expression, optionList.first, optionList.second);
+			expression = nodeFactory.createNode<FunctionCallOptions>(expression, optionList.arguments, optionList.parameterNames);
 			break;
 		}
 		default:
@@ -2071,10 +2080,11 @@ vector<ASTPointer<Expression>> Parser::parseFunctionCallListArguments()
 	return arguments;
 }
 
-pair<vector<ASTPointer<Expression>>, vector<ASTPointer<ASTString>>> Parser::parseFunctionCallArguments()
+Parser::FunctionCallArguments Parser::parseFunctionCallArguments()
 {
 	RecursionGuard recursionGuard(*this);
-	pair<vector<ASTPointer<Expression>>, vector<ASTPointer<ASTString>>> ret;
+	FunctionCallArguments ret;
+
 	Token token = m_scanner->currentToken();
 	if (token == Token::LBrace)
 	{
@@ -2084,13 +2094,13 @@ pair<vector<ASTPointer<Expression>>, vector<ASTPointer<ASTString>>> Parser::pars
 		expectToken(Token::RBrace);
 	}
 	else
-		ret.first = parseFunctionCallListArguments();
+		ret.arguments = parseFunctionCallListArguments();
 	return ret;
 }
 
-pair<vector<ASTPointer<Expression>>, vector<ASTPointer<ASTString>>> Parser::parseNamedArguments()
+Parser::FunctionCallArguments Parser::parseNamedArguments()
 {
-	pair<vector<ASTPointer<Expression>>, vector<ASTPointer<ASTString>>> ret;
+	FunctionCallArguments ret;
 
 	bool first = true;
 	while (m_scanner->currentToken() != Token::RBrace)
@@ -2098,9 +2108,15 @@ pair<vector<ASTPointer<Expression>>, vector<ASTPointer<ASTString>>> Parser::pars
 		if (!first)
 			expectToken(Token::Comma);
 
-		ret.second.push_back(expectIdentifierToken());
+		auto identifierWithLocation = expectIdentifierWithLocation();
+
+		// Add name
+		ret.parameterNames.emplace_back(std::move(identifierWithLocation.first));
+		// Add location
+		ret.parameterNameLocations.emplace_back(std::move(identifierWithLocation.second));
+
 		expectToken(Token::Colon);
-		ret.first.push_back(parseExpression());
+		ret.arguments.emplace_back(parseExpression());
 
 		if (
 			m_scanner->currentToken() == Token::Comma &&
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index e656c936d3..7a9b41318b 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -77,6 +77,14 @@ class Parser: public langutil::ParserBase
 		std::vector<ASTPointer<ModifierInvocation>> modifiers;
 	};
 
+	/// Struct to share parsed function call arguments.
+	struct FunctionCallArguments
+	{
+		std::vector<ASTPointer<Expression>> arguments;
+		std::vector<ASTPointer<ASTString>> parameterNames;
+		std::vector<langutil::SourceLocation> parameterNameLocations;
+	};
+
 	///@{
 	///@name Parsing functions for the AST nodes
 	void parsePragmaVersion(langutil::SourceLocation const& _location, std::vector<Token> const& _tokens, std::vector<std::string> const& _literals);
@@ -153,8 +161,9 @@ class Parser: public langutil::ParserBase
 	);
 	ASTPointer<Expression> parsePrimaryExpression();
 	std::vector<ASTPointer<Expression>> parseFunctionCallListArguments();
-	std::pair<std::vector<ASTPointer<Expression>>, std::vector<ASTPointer<ASTString>>> parseFunctionCallArguments();
-	std::pair<std::vector<ASTPointer<Expression>>, std::vector<ASTPointer<ASTString>>> parseNamedArguments();
+
+	FunctionCallArguments parseFunctionCallArguments();
+	FunctionCallArguments parseNamedArguments();
 	std::pair<ASTPointer<ASTString>, langutil::SourceLocation> expectIdentifierWithLocation();
 	///@}
 
diff --git a/test/libsolidity/ASTJSON/address_payable.json b/test/libsolidity/ASTJSON/address_payable.json
index 9aec1e510c..cc87fc3b9a 100644
--- a/test/libsolidity/ASTJSON/address_payable.json
+++ b/test/libsolidity/ASTJSON/address_payable.json
@@ -320,6 +320,7 @@
                   "isPure": false,
                   "kind": "typeConversion",
                   "lValueRequested": false,
+                  "nameLocations": [],
                   "names": [],
                   "nodeType": "FunctionCall",
                   "src": "209:13:1",
@@ -445,6 +446,7 @@
                     "isPure": true,
                     "kind": "typeConversion",
                     "lValueRequested": false,
+                    "nameLocations": [],
                     "names": [],
                     "nodeType": "FunctionCall",
                     "src": "239:10:1",
diff --git a/test/libsolidity/ASTJSON/address_payable_parseOnly.json b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
index 39e91de1cc..fd7f772f68 100644
--- a/test/libsolidity/ASTJSON/address_payable_parseOnly.json
+++ b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
@@ -210,6 +210,7 @@
                     }
                   },
                   "id": 26,
+                  "nameLocations": [],
                   "names": [],
                   "nodeType": "FunctionCall",
                   "src": "209:13:1",
@@ -281,6 +282,7 @@
                       }
                     },
                     "id": 34,
+                    "nameLocations": [],
                     "names": [],
                     "nodeType": "FunctionCall",
                     "src": "239:10:1",
diff --git a/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json b/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
index e13cd2bffb..5368d58624 100644
--- a/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
+++ b/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
@@ -149,6 +149,7 @@
                     "typeDescriptions": {}
                   },
                   "id": 18,
+                  "nameLocations": [],
                   "names": [],
                   "nodeType": "FunctionCall",
                   "src": "117:3:1",
diff --git a/test/libsolidity/ASTJSON/non_utf8.json b/test/libsolidity/ASTJSON/non_utf8.json
index 0e2a56f84b..926f858b5e 100644
--- a/test/libsolidity/ASTJSON/non_utf8.json
+++ b/test/libsolidity/ASTJSON/non_utf8.json
@@ -135,6 +135,7 @@
                       "isPure": true,
                       "kind": "typeConversion",
                       "lValueRequested": false,
+                      "nameLocations": [],
                       "names": [],
                       "nodeType": "FunctionCall",
                       "src": "60:14:1",
@@ -182,6 +183,7 @@
                   "isPure": true,
                   "kind": "typeConversion",
                   "lValueRequested": false,
+                  "nameLocations": [],
                   "names": [],
                   "nodeType": "FunctionCall",
                   "src": "53:22:1",
diff --git a/test/libsolidity/ASTJSON/non_utf8_parseOnly.json b/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
index df358ae362..ef265cbe4f 100644
--- a/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
+++ b/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
@@ -85,6 +85,7 @@
                         }
                       },
                       "id": 10,
+                      "nameLocations": [],
                       "names": [],
                       "nodeType": "FunctionCall",
                       "src": "60:14:1",
@@ -108,6 +109,7 @@
                     }
                   },
                   "id": 11,
+                  "nameLocations": [],
                   "names": [],
                   "nodeType": "FunctionCall",
                   "src": "53:22:1",
diff --git a/test/libsolidity/ASTJSON/used_errors.json b/test/libsolidity/ASTJSON/used_errors.json
index f00336d209..c59b4f5309 100644
--- a/test/libsolidity/ASTJSON/used_errors.json
+++ b/test/libsolidity/ASTJSON/used_errors.json
@@ -67,6 +67,7 @@
               "isPure": false,
               "kind": "functionCall",
               "lValueRequested": false,
+              "nameLocations": [],
               "names": [],
               "nodeType": "FunctionCall",
               "src": "38:3:1",
@@ -175,6 +176,7 @@
                   "isPure": false,
                   "kind": "functionCall",
                   "lValueRequested": false,
+                  "nameLocations": [],
                   "names": [],
                   "nodeType": "FunctionCall",
                   "src": "99:3:1",
diff --git a/test/libsolidity/ASTJSON/used_errors_parseOnly.json b/test/libsolidity/ASTJSON/used_errors_parseOnly.json
index b7500b445e..7a4b24b3c6 100644
--- a/test/libsolidity/ASTJSON/used_errors_parseOnly.json
+++ b/test/libsolidity/ASTJSON/used_errors_parseOnly.json
@@ -40,6 +40,7 @@
                 "typeDescriptions": {}
               },
               "id": 6,
+              "nameLocations": [],
               "names": [],
               "nodeType": "FunctionCall",
               "src": "38:3:1",
@@ -125,6 +126,7 @@
                     "typeDescriptions": {}
                   },
                   "id": 15,
+                  "nameLocations": [],
                   "names": [],
                   "nodeType": "FunctionCall",
                   "src": "99:3:1",

From 5b8a9509fc375555a934dc2d0a9cce8ab2ca45dd Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 21 Jun 2022 14:49:34 -0300
Subject: [PATCH 0722/1748] Enable each external script to work with solc
 binary relative path.

---
 test/externalTests/bleeps.sh           | 2 +-
 test/externalTests/brink.sh            | 2 +-
 test/externalTests/chainlink.sh        | 2 +-
 test/externalTests/colony.sh           | 2 +-
 test/externalTests/elementfi.sh        | 2 +-
 test/externalTests/ens.sh              | 2 +-
 test/externalTests/euler.sh            | 2 +-
 test/externalTests/gnosis.sh           | 2 +-
 test/externalTests/gp2.sh              | 2 +-
 test/externalTests/perpetual-pools.sh  | 2 +-
 test/externalTests/pool-together.sh    | 2 +-
 test/externalTests/prb-math.sh         | 2 +-
 test/externalTests/trident.sh          | 2 +-
 test/externalTests/uniswap.sh          | 2 +-
 test/externalTests/yield-liquidator.sh | 2 +-
 test/externalTests/zeppelin.sh         | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index a9d2b58a06..5ad80642e4 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { npm run compile; }
diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
index bfbd993f23..901a0cfc0d 100755
--- a/test/externalTests/brink.sh
+++ b/test/externalTests/brink.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn compile; }
diff --git a/test/externalTests/chainlink.sh b/test/externalTests/chainlink.sh
index 3aa3996f44..f99dbededb 100755
--- a/test/externalTests/chainlink.sh
+++ b/test/externalTests/chainlink.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn compile; }
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index e23ce11350..8582411b99 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn run provision:token:contracts; }
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index 898627da8d..17474b441e 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { npm run build; }
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index c527d35cf6..5cc2a574d4 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn build; }
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 59e9dea9e8..6ecba6c59e 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { npm run compile; }
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 4bd7c66fe3..03d7111873 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { npm run build; }
diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index f3105f3980..c59d67e08c 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { npm run build; }
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index c49c8371a0..a389e833f3 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn build; }
diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index e439949ce2..a3461a6b03 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn compile; }
diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
index 1d0a0dd86a..ffa2b7c01f 100755
--- a/test/externalTests/prb-math.sh
+++ b/test/externalTests/prb-math.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn compile; }
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index 288ff0cbf0..401446f998 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn build; }
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index 48ec697d08..5da068df8e 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { yarn compile; }
diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
index bf2ea93e22..d2afe2560f 100755
--- a/test/externalTests/yield-liquidator.sh
+++ b/test/externalTests/yield-liquidator.sh
@@ -28,7 +28,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { npm run build; }
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 5e8ebb6a9c..c533aa0364 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -31,7 +31,7 @@ REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
 verify_input "$@"
 BINARY_TYPE="$1"
-BINARY_PATH="$2"
+BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
 function compile_fn { npm run compile; }

From 2a957413d0da5d744056eb9e89a7b36cfbd37a84 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Mon, 27 Jun 2022 19:11:50 -0400
Subject: [PATCH 0723/1748] Update naming of Mainnet

---
 liblangutil/EVMVersion.h                                      | 2 +-
 libsolidity/interface/CompilerStack.cpp                       | 2 +-
 test/externalTests/elementfi.sh                               | 4 ++--
 test/libsolidity/syntaxTests/bytecode_too_large.sol           | 2 +-
 .../syntaxTests/bytecode_too_large_abiencoder_v1.sol          | 2 +-
 test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index bb6971ae32..c68441f01b 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -34,7 +34,7 @@ namespace solidity::langutil
 
 /**
  * A version specifier of the EVM we want to compile to.
- * Defaults to the latest version deployed on Ethereum mainnet at the time of compiler release.
+ * Defaults to the latest version deployed on Ethereum Mainnet at the time of compiler release.
  */
 class EVMVersion:
 	boost::less_than_comparable<EVMVersion>,
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 22321a16dc..2a8845bde4 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1285,7 +1285,7 @@ void CompilerStack::assemble(
 			"Contract code size is "s +
 			to_string(compiledContract.runtimeObject.bytecode.size()) +
 			" bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). "
-			"This contract may not be deployable on mainnet. "
+			"This contract may not be deployable on Mainnet. "
 			"Consider enabling the optimizer (with a low \"runs\" value!), "
 			"turning off revert strings, or using libraries."
 		);
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index 17474b441e..4901c6bf1c 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -43,7 +43,7 @@ function elementfi_test
     local config_var=config
 
     local compile_only_presets=(
-        # ElementFi's test suite is hard-coded for mainnet forked via alchemy.io.
+        # ElementFi's test suite is hard-coded for Mainnet forked via alchemy.io.
         # Locally we can only compile.
         #ir-no-optimize           # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack."
         #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack."
@@ -87,7 +87,7 @@ function elementfi_test
     sed -i 's|bytes32(uint256(pool))|bytes32(uint256(uint160(pool)))|g' vault/PoolRegistry.sol
     popd
 
-    # The test suite uses forked mainnet and an expiration period that's too short.
+    # The test suite uses forked Mainnet and an expiration period that's too short.
     # TODO: Remove when https://github.com/element-fi/elf-contracts/issues/243 is fixed.
     sed -i 's|^\s*require(_expiration - block\.timestamp < _unitSeconds);\s*$||g' contracts/ConvergentCurvePool.sol
 
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large.sol b/test/libsolidity/syntaxTests/bytecode_too_large.sol
index 55d637bfbd..e76c801a15 100644
--- a/test/libsolidity/syntaxTests/bytecode_too_large.sol
+++ b/test/libsolidity/syntaxTests/bytecode_too_large.sol
@@ -9,4 +9,4 @@ contract test {
 // ====
 // EVMVersion: >byzantium
 // ----
-// Warning 5574: (21-27154): Contract code size is 27199 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (21-27154): Contract code size is 27199 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol b/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol
index 69dc7ebd0c..df74ef7651 100644
--- a/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol
+++ b/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol
@@ -9,4 +9,4 @@ contract test {
 // ====
 // EVMVersion: >byzantium
 // ----
-// Warning 5574: (21-27154): Contract code size is 27209 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (21-27154): Contract code size is 27209 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol b/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol
index a95ed192a3..cdd83602f8 100644
--- a/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol
+++ b/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol
@@ -7,4 +7,4 @@ contract test {
 // ====
 // EVMVersion: =byzantium
 // ----
-// Warning 5574: (0-27133): Contract code size is 27227 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (0-27133): Contract code size is 27227 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.

From cae1571aa76b98db7a1d94eac8f63cc012aa1dcf Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Mon, 27 Jun 2022 16:44:15 +0200
Subject: [PATCH 0724/1748] Add whiskers test for weird case

---
 test/libsolutil/Whiskers.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/libsolutil/Whiskers.cpp b/test/libsolutil/Whiskers.cpp
index 3ccaa64dab..4f148f101d 100644
--- a/test/libsolutil/Whiskers.cpp
+++ b/test/libsolutil/Whiskers.cpp
@@ -85,6 +85,13 @@ BOOST_AUTO_TEST_CASE(conditional_with_else)
 	BOOST_CHECK_EQUAL(Whiskers(templ)("b", false).render(), "Y");
 }
 
+BOOST_AUTO_TEST_CASE(broken_conditional_with_else)
+{
+	string templ = "<?b>X<!bY</b>";
+	BOOST_CHECK_EQUAL(Whiskers(templ)("b", true).render(), "X<!bY");
+	BOOST_CHECK_EQUAL(Whiskers(templ)("b", false).render(), "");
+}
+
 BOOST_AUTO_TEST_CASE(conditional_plus_params)
 {
 	string templ = " - <?b>_<r><!b>^<t></b> - ";

From e4d3425ad9fdc500ad94a8799b82f041e01cac0d Mon Sep 17 00:00:00 2001
From: CJ42 <cavallerajean@gmail.com>
Date: Tue, 7 Jun 2022 18:30:57 +0100
Subject: [PATCH 0725/1748] docs: add `uint160` type in address conversion
 section
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

docs: add notice for uint conversion before 0.8.0

docs: edit sentence structure + remove 'result in `address payable`'

docs: add keyword 'explicitly' to be more specific for `address payable`

docs: edit notice uint to address conversion change since 0.8.0

Co-authored-by: Kamil Śliwak <cameel2@gmail.com>
---
 docs/types/conversion.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/types/conversion.rst b/docs/types/conversion.rst
index 7e266d1bd4..e6c68df412 100644
--- a/docs/types/conversion.rst
+++ b/docs/types/conversion.rst
@@ -188,6 +188,10 @@ Addresses
 As described in :ref:`address_literals`, hex literals of the correct size that pass the checksum
 test are of ``address`` type. No other literals can be implicitly converted to the ``address`` type.
 
-Explicit conversions from ``bytes20`` or any integer type to ``address`` result in ``address payable``.
+Explicit conversions to ``address`` are allowed only from ``bytes20`` and ``uint160``.
 
-An ``address a`` can be converted to ``address payable`` via ``payable(a)``.
+An ``address a`` can be converted explicitly to ``address payable`` via ``payable(a)``.
+
+.. note::
+    Prior to version 0.8.0, it was possible to explicitly convert from any integer type (of any size, signed or unsigned) to  ``address`` or ``address payable``.
+    Starting with in 0.8.0 only conversion from ``uint160`` is allowed.
\ No newline at end of file

From 0b2a670a949580006cf1a95d26c74caf29e6c96e Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Sun, 3 Jul 2022 14:03:00 +0200
Subject: [PATCH 0726/1748] Improved stack too deep message when compiled
 without --optimize

---
 libyul/backends/evm/EVMCodeTransform.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index 531fd1b92f..ce55782747 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -26,6 +26,7 @@
 #include <libyul/Utilities.h>
 
 #include <libsolutil/Visitor.h>
+#include <libsolutil/StackTooDeepString.h>
 
 #include <liblangutil/Exceptions.h>
 
@@ -785,7 +786,8 @@ size_t CodeTransform::variableHeightDiff(Scope::Variable const& _var, YulString
 			_varName.str() +
 			" is " +
 			to_string(heightDiff - limit) +
-			" slot(s) too deep inside the stack."
+			" slot(s) too deep inside the stack. " +
+			stackTooDeepString
 		);
 		m_assembly.markAsInvalid();
 		return _forSwap ? 2 : 1;

From 3f62ab069cf0ef58c5b9560487c098af6efb2a49 Mon Sep 17 00:00:00 2001
From: Derek Gottfrid <derek@codecubed.com>
Date: Sun, 3 Jul 2022 16:33:22 -0400
Subject: [PATCH 0727/1748] fix test w/ signed issues

---
 test/Metadata.cpp                      | 2 +-
 test/libevmasm/Optimiser.cpp           | 2 +-
 test/libsolidity/util/TestFileParser.h | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/Metadata.cpp b/test/Metadata.cpp
index 3b27e31012..27e5332af5 100644
--- a/test/Metadata.cpp
+++ b/test/Metadata.cpp
@@ -136,7 +136,7 @@ class TinyCBORParser
 	}
 	bytes readBytes(unsigned length)
 	{
-		bytes ret{m_metadata.begin() + m_pos, m_metadata.begin() + m_pos + length};
+		bytes ret{m_metadata.begin() + static_cast<int>(m_pos), m_metadata.begin() + static_cast<int>(m_pos + length)};
 		m_pos += length;
 		return ret;
 	}
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index 44fbde9274..aaf5498ec1 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -141,7 +141,7 @@ namespace
 			ControlFlowGraph cfg(output);
 			AssemblyItems optItems;
 			for (BasicBlock const& block: cfg.optimisedBlocks())
-				copy(output.begin() + block.begin, output.begin() + block.end,
+				copy(output.begin() + static_cast<int>(block.begin), output.begin() + static_cast<int>(block.end),
 					 back_inserter(optItems));
 			output = move(optItems);
 		}
diff --git a/test/libsolidity/util/TestFileParser.h b/test/libsolidity/util/TestFileParser.h
index 7e89ff09ed..80281126c6 100644
--- a/test/libsolidity/util/TestFileParser.h
+++ b/test/libsolidity/util/TestFileParser.h
@@ -98,7 +98,7 @@ class TestFileParser
 		void advance(unsigned n = 1)
 		{
 			solAssert(m_char != m_source.end(), "Cannot advance beyond end.");
-			m_char = std::next(m_char, n);
+			m_char = std::next(m_char, static_cast<int>(n));
 		}
 
 		/// Returns the current character or '\0' if at end of input.

From 290bd4fd2d372b3e2e7a19bdc8cb073393bc2d92 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Fri, 24 Jun 2022 20:37:52 -0300
Subject: [PATCH 0728/1748] Added a flag to record when a source is
 reconstructed from JSON so garbage code snippets are not printed after source
 location.

---
 liblangutil/CharStream.h                | 7 +++++++
 libsolidity/interface/CompilerStack.cpp | 3 ++-
 libyul/AsmPrinter.cpp                   | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/liblangutil/CharStream.h b/liblangutil/CharStream.h
index 08f86129b2..59ddf22d92 100644
--- a/liblangutil/CharStream.h
+++ b/liblangutil/CharStream.h
@@ -73,9 +73,15 @@ class CharStream
 	CharStream() = default;
 	CharStream(std::string _source, std::string _name):
 		m_source(std::move(_source)), m_name(std::move(_name)) {}
+	CharStream(std::string _source, std::string _name, bool _importedFromAST):
+		m_source(std::move(_source)),
+		m_name(std::move(_name)),
+		m_importedFromAST(_importedFromAST)
+	{ }
 
 	size_t position() const { return m_position; }
 	bool isPastEndOfInput(size_t _charsForward = 0) const { return (m_position + _charsForward) >= m_source.size(); }
+	bool isImportedFromAST() const { return m_importedFromAST; }
 
 	char get(size_t _charsForward = 0) const { return m_source[m_position + _charsForward]; }
 	char advanceAndGet(size_t _chars = 1);
@@ -138,6 +144,7 @@ class CharStream
 private:
 	std::string m_source;
 	std::string m_name;
+	bool m_importedFromAST{false};
 	size_t m_position{0};
 };
 
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 2a8845bde4..c53bf93216 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -404,7 +404,8 @@ void CompilerStack::importASTs(map<string, Json::Value> const& _sources)
 		source.ast = src.second;
 		source.charStream = make_shared<CharStream>(
 			util::jsonCompactPrint(m_sourceJsons[src.first]),
-			src.first
+			src.first,
+			true // imported from AST
 		);
 		m_sources[path] = move(source);
 	}
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index 46000bc10d..fb0fa565e4 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -278,7 +278,11 @@ string AsmPrinter::formatSourceLocation(
 	{
 		sourceIndex = to_string(_nameToSourceIndex.at(*_location.sourceName));
 
-		if (_debugInfoSelection.snippet && _soliditySourceProvider)
+		if (
+			_debugInfoSelection.snippet &&
+			_soliditySourceProvider &&
+			!_soliditySourceProvider->charStream(*_location.sourceName).isImportedFromAST()
+		)
 		{
 			solidityCodeSnippet = escapeAndQuoteString(
 				_soliditySourceProvider->charStream(*_location.sourceName).singleLineSnippet(_location)

From 2215b6d44b90f1d398212ac548b0271174913fff Mon Sep 17 00:00:00 2001
From: Duc Thanh Nguyen <ng.duc.tahn@gmail.com>
Date: Tue, 5 Jul 2022 15:30:02 -0400
Subject: [PATCH 0729/1748] Update rangev3 to 0.12.0

---
 cmake/range-v3.cmake   | 6 +++---
 scripts/release_ppa.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/range-v3.cmake b/cmake/range-v3.cmake
index d6d9cb7730..75ed5a92e3 100644
--- a/cmake/range-v3.cmake
+++ b/cmake/range-v3.cmake
@@ -12,9 +12,9 @@ set(RANGE_V3_INCLUDE_DIR "${prefix}/include")
 ExternalProject_Add(range-v3-project
     PREFIX "${prefix}"
     DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/downloads"
-    DOWNLOAD_NAME range-v3-0.11.0.tar.gz
-    URL https://github.com/ericniebler/range-v3/archive/0.11.0.tar.gz
-    URL_HASH SHA256=376376615dbba43d3bef75aa590931431ecb49eb36d07bb726a19f680c75e20c
+    DOWNLOAD_NAME range-v3-0.12.0.tar.gz
+    URL https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz
+    URL_HASH SHA256=015adb2300a98edfceaf0725beec3337f542af4915cec4d0b89fa0886f4ba9cb
     CMAKE_COMMAND ${RANGE_V3_CMAKE_COMMAND}
     CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
                -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 8daf91c8d7..827b1fa97f 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -108,7 +108,7 @@ mv solidity solc
 # Fetch dependencies
 mkdir -p ./solc/deps/downloads/ 2>/dev/null || true
 wget -O ./solc/deps/downloads/jsoncpp-1.9.3.tar.gz https://github.com/open-source-parsers/jsoncpp/archive/1.9.3.tar.gz
-wget -O ./solc/deps/downloads/range-v3-0.11.0.tar.gz https://github.com/ericniebler/range-v3/archive/0.11.0.tar.gz
+wget -O ./solc/deps/downloads/range-v3-0.12.0.tar.gz https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz
 wget -O ./solc/deps/downloads/fmt-8.0.1.tar.gz https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz
 
 # Determine version

From 0a143683152958eba45c72f3006136411e4925b1 Mon Sep 17 00:00:00 2001
From: Duc Thanh Nguyen <ng.duc.tahn@gmail.com>
Date: Mon, 27 Jun 2022 17:12:44 -0400
Subject: [PATCH 0730/1748] Display human readable type name in conversion
 error message

---
 Changelog.md                                  |   1 +
 libsolidity/analysis/TypeChecker.cpp          | 102 +++++++++---------
 libsolidity/ast/Types.cpp                     |  34 ++++++
 libsolidity/ast/Types.h                       |   5 +-
 ...all_to_v2_constructor_accepting_struct.sol |   2 +-
 ...on_accepting_struct_via_named_argument.sol |   2 +-
 ...ract_function_pointer_accepting_struct.sol |   2 +-
 ...unction_returning_dynamic_string_array.sol |   2 +-
 ..._v2_contract_function_returning_struct.sol |   2 +-
 ...on_returning_struct_with_dynamic_array.sol |   2 +-
 .../v1_call_to_v2_event_accepting_struct.sol  |   2 +-
 ...ibrary_bound_function_returning_struct.sol |   2 +-
 ...o_v2_library_function_returning_struct.sol |   2 +-
 ...namic_array_without_returndata_support.sol |   2 +-
 .../abiEncoder/v2_v1_v1_modifier_sandwich.sol |   2 +-
 .../abiEncoder/v2_v1_v2_modifier_sandwich.sol |   2 +-
 .../concat/bytes_concat_on_type_info.sol      |   2 +-
 ...es_concat_wrong_type_bytes_and_strings.sol |   6 +-
 .../concat/bytes_concat_wrong_type_misc.sol   |   6 +-
 ...ong_type_misc_literals_and_expressions.sol |   8 +-
 .../array/function_mapping_library.sol        |   2 +-
 ...sion_error_to_bytes4_function_argument.sol |  12 +++
 ...onversion_error_to_bytes4_return_value.sol |  11 ++
 ...sion_event_to_bytes4_function_argument.sol |   9 ++
 ...onversion_event_to_bytes4_return_value.sol |   9 ++
 ..._of_string_literals_to_calldata_string.sol |   2 +-
 .../bytes_concat_on_error_type_info.sol       |   9 ++
 .../syntaxTests/errors/error_abi_decode.sol   |   8 ++
 .../errors/error_bytes_concat_wrong_type.sol  |  10 ++
 .../errors/error_encodecall_fail_args.sol     |  40 +++++++
 .../errors/error_incompatible_binary_ops.sol  |  47 ++++++++
 .../error_incompatible_operator_for_type.sol  |  19 ++++
 .../error_incompatible_unary_operator.sol     |  11 ++
 .../error_invalid_function_modifier_type.sol  |   9 ++
 .../error_return_tuple_not_convertible.sol    |  10 ++
 ...error_ternary_operator_different_types.sol |  18 ++++
 .../errors/error_to_function_conversion.sol   |   7 ++
 ...riable_declaration_implicit_conversion.sol |  10 ++
 .../errors/error_wrong_type_base_arg.sol      |  10 ++
 test/libsolidity/syntaxTests/errors/using.sol |   2 +-
 .../bytes_concat_on_event_type_info.sol       |   9 ++
 .../syntaxTests/events/event_abi_decode.sol   |   8 ++
 .../events/event_bytes_concat_wrong_type.sol  |   9 ++
 .../events/event_encodecall_fail_args.sol     |  41 +++++++
 .../events/event_incompatible_binary_ops.sol  |  46 ++++++++
 .../event_incompatible_operator_for_type.sol  |  18 ++++
 .../event_incompatible_unary_operator.sol     |  10 ++
 .../event_invalid_function_modifier_type.sol  |   8 ++
 .../event_return_tuple_not_convertible.sol    |   9 ++
 ...elector_library_called_inside_function.sol |   2 +-
 ...red_outside_but_called_inside_function.sol |   2 +-
 ...event_ternary_operator_different_types.sol |  17 +++
 .../event_to_function_conversion.sol}         |   4 +-
 ...riable_declaration_implicit_conversion.sol |   9 ++
 .../events/event_wrong_type_base_arg.sol      |   9 ++
 .../memory_mapping_array.sol                  |   2 +-
 .../recursive_struct_memory.sol               |   2 +-
 .../indexing/error_type_without_index.sol     |  11 ++
 .../indexing/event_type_without_index.sol     |   8 ++
 ...tructs_with_mapping_array_struct_array.sol |   2 +-
 .../memory_structs_with_mappings.sol          |   2 +-
 ...rType.sol => unsupported_arg_for_type.sol} |   2 +-
 .../207_no_mappings_in_memory_array.sol       |   2 +-
 .../589_error_index_access.sol                |   9 ++
 .../590_event_index_access.sol                |   9 ++
 .../abi_decode_nested_dynamic_array.sol       |   2 +-
 .../mapping/function_type_argument_array.sol  |   2 +-
 .../types/mapping/library_nested_mapping.sol  |   2 +-
 .../types/mapping/memory_struct_recursive.sol |   2 +-
 .../mapping/memory_structs_with_mappings.sol  |   2 +-
 70 files changed, 610 insertions(+), 93 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_function_argument.sol
 create mode 100644 test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_return_value.sol
 create mode 100644 test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_function_argument.sol
 create mode 100644 test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_return_value.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/bytes_concat_on_error_type_info.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_abi_decode.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_bytes_concat_wrong_type.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_encodecall_fail_args.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_invalid_function_modifier_type.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_return_tuple_not_convertible.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_ternary_operator_different_types.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_variable_declaration_implicit_conversion.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_wrong_type_base_arg.sol
 create mode 100644 test/libsolidity/syntaxTests/events/bytes_concat_on_event_type_info.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_abi_decode.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_bytes_concat_wrong_type.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_encodecall_fail_args.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_invalid_function_modifier_type.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_return_tuple_not_convertible.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_ternary_operator_different_types.sol
 rename test/libsolidity/syntaxTests/{errors/weird1.sol => events/event_to_function_conversion.sol} (67%)
 create mode 100644 test/libsolidity/syntaxTests/events/event_variable_declaration_implicit_conversion.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_wrong_type_base_arg.sol
 create mode 100644 test/libsolidity/syntaxTests/indexing/error_type_without_index.sol
 create mode 100644 test/libsolidity/syntaxTests/indexing/event_type_without_index.sol
 rename test/libsolidity/syntaxTests/metaTypes/{unsupportedArgForType.sol => unsupported_arg_for_type.sol} (83%)
 create mode 100644 test/libsolidity/syntaxTests/nameAndTypeResolution/589_error_index_access.sol
 create mode 100644 test/libsolidity/syntaxTests/nameAndTypeResolution/590_event_index_access.sol

diff --git a/Changelog.md b/Changelog.md
index 1ae50b82c8..a86643987c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
  * Yul Optimizer: Add rule to convert `mod(mul(X, Y), A)` into `mulmod(X, Y, A)`, if `A` is a power of two.
  * Yul Optimizer: Add rule to convert `mod(add(X, Y), A)` into `addmod(X, Y, A)`, if `A` is a power of two.
  * Code Generator: More efficient code for checked addition and subtraction.
+ * Error Reporter: More readable and informative error/warning messages.
 
 Bugfixes:
  * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index ae27741a85..90359c4592 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -214,7 +214,7 @@ TypePointers TypeChecker::typeCheckABIDecodeAndRetrieveReturnType(FunctionCall c
 				arguments.front()->location(),
 				"The first argument to \"abi.decode\" must be implicitly convertible to "
 				"bytes memory or bytes calldata, but is of type " +
-				type(*arguments.front())->toString() +
+				type(*arguments.front())->humanReadableName() +
 				"."
 			);
 
@@ -258,7 +258,7 @@ TypePointers TypeChecker::typeCheckABIDecodeAndRetrieveReturnType(FunctionCall c
 				m_errorReporter.typeError(
 					9611_error,
 					typeArgument->location(),
-					"Decoding type " + actualType->toString(false) + " not supported."
+					"Decoding type " + actualType->humanReadableName() + " not supported."
 				);
 
 			if (auto referenceType = dynamic_cast<ReferenceType const*>(actualType))
@@ -318,7 +318,7 @@ TypePointers TypeChecker::typeCheckMetaTypeFunctionAndRetrieveReturnType(Functio
 			arguments.front()->location(),
 			"Invalid type for argument in the function call. "
 			"An enum type, contract type or an integer type is required, but " +
-			type(*arguments.front())->toString(true) + " provided."
+			type(*arguments.front())->humanReadableName() + " provided."
 		);
 
 	return {TypeProvider::meta(dynamic_cast<TypeType const&>(*firstArgType).actualType())};
@@ -367,9 +367,9 @@ void TypeChecker::endVisit(InheritanceSpecifier const& _inheritance)
 					(*arguments)[i]->location(),
 					"Invalid type for argument in constructor call. "
 					"Invalid implicit conversion from " +
-					type(*(*arguments)[i])->toString() +
+					type(*(*arguments)[i])->humanReadableName() +
 					" to " +
-					parameterTypes[i]->toString() +
+					parameterTypes[i]->humanReadableName() +
 					" requested.",
 					result.message()
 				);
@@ -623,7 +623,7 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
 				m_errorReporter.fatalTypeError(
 					4061_error,
 					_variable.location(),
-					"Type " + varType->toString(true) + " is only valid in storage because it contains a (nested) mapping."
+					"Type " + varType->humanReadableName() + " is only valid in storage because it contains a (nested) mapping."
 				);
 	}
 	else if (_variable.visibility() >= Visibility::Public)
@@ -634,7 +634,7 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
 			vector<string> unsupportedTypes;
 			for (auto const& param: getter.parameterTypes() + getter.returnParameterTypes())
 				if (!typeSupportedByOldABIEncoder(*param, false /* isLibrary */))
-					unsupportedTypes.emplace_back(param->toString());
+					unsupportedTypes.emplace_back(param->humanReadableName());
 			if (!unsupportedTypes.empty())
 				m_errorReporter.typeError(
 					2763_error,
@@ -776,9 +776,9 @@ void TypeChecker::visitManually(
 				arguments[i]->location(),
 				"Invalid type for argument in modifier invocation. "
 				"Invalid implicit conversion from " +
-				type(*arguments[i])->toString() +
+				type(*arguments[i])->humanReadableName() +
 				" to " +
-				type(*(*parameters)[i])->toString() +
+				type(*(*parameters)[i])->humanReadableName() +
 				" requested.",
 				result.message()
 			);
@@ -1115,9 +1115,9 @@ void TypeChecker::endVisit(TryStatement const& _tryStatement)
 					6509_error,
 					parameter->location(),
 					"Invalid type, expected " +
-					returnType->toString(false) +
+					returnType->humanReadableName() +
 					" but got " +
-					parameter->annotation().type->toString() +
+					parameter->annotation().type->humanReadableName() +
 					"."
 				);
 		}
@@ -1258,9 +1258,9 @@ void TypeChecker::endVisit(Return const& _return)
 					5992_error,
 					_return.expression()->location(),
 					"Return argument type " +
-					type(*_return.expression())->toString() +
+					type(*_return.expression())->humanReadableName() +
 					" is not implicitly convertible to expected type " +
-					TupleType(returnTypes).toString(false) + ".",
+					TupleType(returnTypes).humanReadableName() + ".",
 					result.message()
 				);
 		}
@@ -1276,9 +1276,9 @@ void TypeChecker::endVisit(Return const& _return)
 				6359_error,
 				_return.expression()->location(),
 				"Return argument type " +
-				type(*_return.expression())->toString() +
+				type(*_return.expression())->humanReadableName() +
 				" is not implicitly convertible to expected type (type of first return variable) " +
-				expected->toString() + ".",
+				expected->humanReadableName() + ".",
 				result.message()
 			);
 	}
@@ -1382,9 +1382,9 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
 		if (!result)
 		{
 			auto errorMsg = "Type " +
-				valueComponentType->toString() +
+				valueComponentType->humanReadableName() +
 				" is not implicitly convertible to expected type " +
-				var.annotation().type->toString();
+				var.annotation().type->humanReadableName();
 			if (
 				valueComponentType->category() == Type::Category::RationalNumber &&
 				dynamic_cast<RationalNumberType const&>(*valueComponentType).isFractional() &&
@@ -1403,7 +1403,7 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
 						_statement.location(),
 						errorMsg +
 						". Try converting to type " +
-						valueComponentType->mobileType()->toString() +
+						valueComponentType->mobileType()->humanReadableName() +
 						" or use an explicit conversion."
 					);
 			}
@@ -1486,9 +1486,9 @@ bool TypeChecker::visit(Conditional const& _conditional)
 					1080_error,
 					_conditional.location(),
 					"True expression's type " +
-					trueType->toString() +
+					trueType->humanReadableName() +
 					" does not match false expression's type " +
-					falseType->toString() +
+					falseType->humanReadableName() +
 					"."
 					);
 			// even we can't find a common type, we have to set a type here,
@@ -1598,9 +1598,9 @@ bool TypeChecker::visit(Assignment const& _assignment)
 				"Operator " +
 				string(TokenTraits::toString(_assignment.assignmentOperator())) +
 				" not compatible with types " +
-				t->toString() +
+				t->humanReadableName() +
 				" and " +
-				type(_assignment.rightHandSide())->toString()
+				type(_assignment.rightHandSide())->humanReadableName()
 			);
 	}
 	return false;
@@ -1691,7 +1691,7 @@ bool TypeChecker::visit(TupleExpression const& _tuple)
 				m_errorReporter.fatalTypeError(
 					1545_error,
 					_tuple.location(),
-					"Type " + inlineArrayType->toString(true) + " is only valid in storage."
+					"Type " + inlineArrayType->humanReadableName() + " is only valid in storage."
 				);
 
 			_tuple.annotation().type = TypeProvider::array(DataLocation::Memory, inlineArrayType, types.size());
@@ -1722,7 +1722,7 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 	TypeResult result = type(_operation.subExpression())->unaryOperatorResult(op);
 	if (!result)
 	{
-		string description = "Unary operator " + string(TokenTraits::toString(op)) + " cannot be applied to type " + subExprType->toString();
+		string description = "Unary operator " + string(TokenTraits::toString(op)) + " cannot be applied to type " + subExprType->humanReadableName();
 		if (!result.message().empty())
 			description += ". " + result.message();
 		if (modifying)
@@ -1756,9 +1756,9 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 			"Operator " +
 			string(TokenTraits::toString(_operation.getOperator())) +
 			" not compatible with types " +
-			leftType->toString() +
+			leftType->humanReadableName() +
 			" and " +
-			rightType->toString() +
+			rightType->humanReadableName() +
 			(!result.message().empty() ? ". " + result.message() : "")
 		);
 		commonType = leftType;
@@ -1800,9 +1800,9 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 				"The result type of the " +
 				operation +
 				" operation is equal to the type of the first operand (" +
-				commonType->toString() +
+				commonType->humanReadableName() +
 				") ignoring the (larger) type of the second operand (" +
-				rightType->toString() +
+				rightType->humanReadableName() +
 				") which might be unexpected. Silence this warning by either converting "
 				"the first or the second operand to the type of the other."
 			);
@@ -2183,7 +2183,7 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 			5511_error,
 			arguments.front()->location(),
 			"Expected first argument to be a function pointer, not \"" +
-			type(*arguments.front())->toString() +
+			type(*arguments.front())->humanReadableName() +
 			"\"."
 		);
 		return;
@@ -2272,9 +2272,9 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 				"Cannot implicitly convert component at position " +
 				to_string(i) +
 				" from \"" +
-				argType.toString() +
+				argType.humanReadableName() +
 				"\" to \"" +
-				externalFunctionType->parameterTypes()[i]->toString() +
+				externalFunctionType->parameterTypes()[i]->humanReadableName() +
 				"\"" +
 				(result.message().empty() ?  "." : ": " + result.message())
 			);
@@ -2334,7 +2334,7 @@ void TypeChecker::typeCheckBytesConcatFunction(
 				argument->location(),
 				"Invalid type for argument in the bytes.concat function call. "
 				"bytes or fixed bytes type is required, but " +
-				argumentType->toString(true) + " provided."
+				argumentType->humanReadableName() + " provided."
 			);
 	}
 }
@@ -2519,9 +2519,9 @@ void TypeChecker::typeCheckFunctionGeneralChecks(
 				string msg =
 					"Invalid type for argument in function call. "
 					"Invalid implicit conversion from " +
-					type(*paramArgMap[i])->toString() +
+					type(*paramArgMap[i])->humanReadableName() +
 					" to " +
-					parameterTypes[i]->toString() +
+					parameterTypes[i]->humanReadableName() +
 					" requested.";
 				if (!result.message().empty())
 					msg += " " + result.message();
@@ -2583,7 +2583,7 @@ void TypeChecker::typeCheckFunctionGeneralChecks(
 				m_errorReporter.typeError(
 					2443_error,
 					paramArgMap[i]->location(),
-					"The type of this parameter, " + parameterTypes[i]->toString(true) + ", "
+					"The type of this parameter, " + parameterTypes[i]->humanReadableName() + ", "
 					"is only supported in ABI coder v2. "
 					"Use \"pragma abicoder v2;\" to enable the feature."
 				);
@@ -2597,7 +2597,7 @@ void TypeChecker::typeCheckFunctionGeneralChecks(
 				m_errorReporter.typeError(
 					2428_error,
 					_functionCall.location(),
-					"The type of return parameter " + toString(i + 1) + ", " + returnParameterTypes[i]->toString(true) + ", "
+					"The type of return parameter " + toString(i + 1) + ", " + returnParameterTypes[i]->humanReadableName() + ", "
 					"is only supported in ABI coder v2. "
 					"Use \"pragma abicoder v2;\" to enable the feature."
 				);
@@ -2896,7 +2896,7 @@ bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
 					_functionCallOptions.location(),
 					kind == FunctionType::Kind::Creation ?
 						"Cannot set option \"value\", since the constructor of " +
-						expressionFunctionType->returnParameterTypes().front()->toString() +
+						expressionFunctionType->returnParameterTypes().front()->humanReadableName() +
 						" is not payable." :
 						"Cannot set option \"value\" on a non-payable function type."
 				);
@@ -3036,14 +3036,14 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 					4994_error,
 					_memberAccess.location(),
 					"Member \"" + memberName + "\" is not available in " +
-					exprType->toString() +
+					exprType->humanReadableName() +
 					" outside of storage."
 				);
 		}
 
 		auto [errorId, description] = [&]() -> tuple<ErrorId, string> {
 			string errorMsg = "Member \"" + memberName + "\" not found or not visible "
-				"after argument-dependent lookup in " + exprType->toString() + ".";
+				"after argument-dependent lookup in " + exprType->humanReadableName() + ".";
 
 			if (auto const* funType = dynamic_cast<FunctionType const*>(exprType))
 			{
@@ -3054,7 +3054,7 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 					if (funType->kind() == FunctionType::Kind::Creation)
 						return {
 							8827_error,
-							"Constructor for " + t.front()->toString() + " must be payable for member \"value\" to be available."
+							"Constructor for " + t.front()->humanReadableName() + " must be payable for member \"value\" to be available."
 						};
 					else if (
 						funType->kind() == FunctionType::Kind::DelegateCall ||
@@ -3093,7 +3093,7 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 						"Expected address not-payable as members were not found"
 					);
 
-					return { 9862_error, "\"send\" and \"transfer\" are only available for objects of type \"address payable\", not \"" + exprType->toString() + "\"." };
+					return { 9862_error, "\"send\" and \"transfer\" are only available for objects of type \"address payable\", not \"" + exprType->humanReadableName() + "\"." };
 				}
 			}
 
@@ -3111,7 +3111,7 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 			6675_error,
 			_memberAccess.location(),
 			"Member \"" + memberName + "\" not unique "
-			"after argument-dependent lookup in " + exprType->toString() +
+			"after argument-dependent lookup in " + exprType->humanReadableName() +
 			(memberName == "value" ? " - did you forget the \"payable\" modifier?" : ".")
 		);
 
@@ -3125,7 +3125,7 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 		solAssert(
 			!funType->bound() || exprType->isImplicitlyConvertibleTo(*funType->selfType()),
 			"Function \"" + memberName + "\" cannot be called on an object of type " +
-			exprType->toString() + " (expected " + funType->selfType()->toString() + ")."
+			exprType->humanReadableName() + " (expected " + funType->selfType()->humanReadableName() + ")."
 		);
 
 		if (
@@ -3388,7 +3388,7 @@ bool TypeChecker::visit(IndexAccess const& _access)
 		m_errorReporter.fatalTypeError(
 			2614_error,
 			_access.baseExpression().location(),
-			"Indexed expression has to be a type, mapping or array (is " + baseType->toString() + ")"
+			"Indexed expression has to be a type, mapping or array (is " + baseType->humanReadableName() + ")"
 		);
 	}
 	_access.annotation().type = resultType;
@@ -3543,7 +3543,7 @@ bool TypeChecker::visit(Identifier const& _identifier)
 						// Try to re-construct function definition
 						string description;
 						for (auto const& param: declaration->functionType(true)->parameterTypes())
-							description += (description.empty() ? "" : ", ") + param->toString(false);
+							description += (description.empty() ? "" : ", ") + param->humanReadableName();
 						description = "function " + _identifier.name() + "(" + description + ")";
 
 						ssl.append("Candidate: " + description, declaration->location());
@@ -3764,7 +3764,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 				path->location(),
 				"The function \"" + joinHumanReadable(path->path(), ".") + "\" " +
 				"does not have any parameters, and therefore cannot be bound to the type \"" +
-				(normalizedType ? normalizedType->toString(true) : "*") + "\"."
+				(normalizedType ? normalizedType->humanReadableName() : "*") + "\"."
 			);
 
 		FunctionType const* functionType = dynamic_cast<FunctionType const&>(*functionDefinition.type()).asBoundFunction();
@@ -3777,9 +3777,9 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 				3100_error,
 				path->location(),
 				"The function \"" + joinHumanReadable(path->path(), ".") + "\" "+
-				"cannot be bound to the type \"" + _usingFor.typeName()->annotation().type->toString() +
+				"cannot be bound to the type \"" + _usingFor.typeName()->annotation().type->humanReadableName() +
 				"\" because the type cannot be implicitly converted to the first argument" +
-				" of the function (\"" + functionType->selfType()->toString() + "\")" +
+				" of the function (\"" + functionType->selfType()->humanReadableName() + "\")" +
 				(
 					result.message().empty() ?
 					"." :
@@ -3834,9 +3834,9 @@ bool TypeChecker::expectType(Expression const& _expression, Type const& _expecte
 	if (!result)
 	{
 		auto errorMsg = "Type " +
-			type(_expression)->toString() +
+			type(_expression)->humanReadableName() +
 			" is not implicitly convertible to expected type " +
-			_expectedType.toString();
+			_expectedType.humanReadableName();
 		if (
 			type(_expression)->category() == Type::Category::RationalNumber &&
 			dynamic_cast<RationalNumberType const*>(type(_expression))->isFractional() &&
@@ -3855,7 +3855,7 @@ bool TypeChecker::expectType(Expression const& _expression, Type const& _expecte
 					_expression.location(),
 					errorMsg +
 					". Try converting to type " +
-					type(_expression)->mobileType()->toString() +
+					type(_expression)->mobileType()->humanReadableName() +
 					" or use an explicit conversion.",
 					result.message()
 				);
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index c1333c28b9..5a315555ba 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -1808,6 +1808,24 @@ string ArrayType::toString(bool _short) const
 	return ret;
 }
 
+string ArrayType::humanReadableName() const
+{
+	string ret;
+	if (isString())
+		ret = "string";
+	else if (isByteArrayOrString())
+		ret = "bytes";
+	else
+	{
+		ret = baseType()->toString(true) + "[";
+		if (!isDynamicallySized())
+			ret += length().str();
+		ret += "]";
+	}
+	ret += " " + stringForReferencePart();
+	return ret;
+}
+
 string ArrayType::canonicalName() const
 {
 	string ret;
@@ -1995,6 +2013,11 @@ string ArraySliceType::toString(bool _short) const
 	return m_arrayType.toString(_short) + " slice";
 }
 
+string ArraySliceType::humanReadableName() const
+{
+	return m_arrayType.humanReadableName() + " slice";
+}
+
 Type const* ArraySliceType::mobileType() const
 {
 	if (
@@ -2670,6 +2693,17 @@ string TupleType::toString(bool _short) const
 	return str + ")";
 }
 
+string TupleType::humanReadableName() const
+{
+	if (components().empty())
+		return "tuple()";
+	string str = "tuple(";
+	for (auto const& t: components())
+		str += (t ? t->humanReadableName() : "") + ",";
+	str.pop_back();
+	return str + ")";
+}
+
 u256 TupleType::storageSize() const
 {
 	solAssert(false, "Storage size of non-storable tuple type requested.");
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 45e77a0d4e..5eb10d8146 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -833,6 +833,7 @@ class ArrayType: public ReferenceType
 	bool nameable() const override { return true; }
 
 	std::string toString(bool _short) const override;
+	std::string humanReadableName() const override;
 	std::string canonicalName() const override;
 	std::string signatureInExternalFunction(bool _structsByName) const override;
 	MemberList::MemberMap nativeMembers(ASTNode const* _currentScope) const override;
@@ -897,6 +898,7 @@ class ArraySliceType: public ReferenceType
 	bool isDynamicallySized() const override { return true; }
 	bool isDynamicallyEncoded() const override { return true; }
 	std::string toString(bool _short) const override;
+	std::string humanReadableName() const override;
 	Type const* mobileType() const override;
 
 	BoolResult validForLocation(DataLocation _loc) const override { return m_arrayType.validForLocation(_loc); }
@@ -1177,7 +1179,8 @@ class TupleType: public CompositeType
 	std::string richIdentifier() const override;
 	bool operator==(Type const& _other) const override;
 	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
-	std::string toString(bool) const override;
+	std::string toString(bool _short) const override;
+	std::string humanReadableName() const override;
 	bool canBeStored() const override { return false; }
 	u256 storageSize() const override;
 	bool hasSimpleZeroValueInMemory() const override { return false; }
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
index 8ba00da1a5..3ee6f75a17 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_constructor_accepting_struct.sol
@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:91-100): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:91-100): The type of this parameter, struct C.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
index 417f5682f0..c02faba189 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_accepting_struct_via_named_argument.sol
@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:119-129): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:119-129): The type of this parameter, struct C.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
index 1b08439cc1..674ce4e32a 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_pointer_accepting_struct.sol
@@ -20,4 +20,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:166-175): The type of this parameter, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:166-175): The type of this parameter, struct C.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
index baadf362ea..5379bdb503 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_dynamic_string_array.sol
@@ -14,4 +14,4 @@ contract D {
     }
 }
 // ----
-// TypeError 2428: (B:85-105): The type of return parameter 1, string[], is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:85-105): The type of return parameter 1, string[] memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
index f84a13d49d..d2b0e1ffe2 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct.sol
@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
index a67394e0eb..0aa9973aa7 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_contract_function_returning_struct_with_dynamic_array.sol
@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-112): The type of return parameter 1, struct C.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
index 1269a29eec..e868418683 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_event_accepting_struct.sol
@@ -17,4 +17,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2443: (B:94-104): The type of this parameter, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2443: (B:94-104): The type of this parameter, struct L.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
index 149aefa96e..bb3651d4f8 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
@@ -20,4 +20,4 @@ contract D {
     }
 }
 // ----
-// TypeError 2428: (B:106-117): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:106-117): The type of return parameter 1, struct L.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
index b3d649e2c8..c6ba752259 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_function_returning_struct.sol
@@ -18,4 +18,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 2428: (B:90-97): The type of return parameter 1, struct L.Item, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:90-97): The type of return parameter 1, struct L.Item memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_without_returndata_support.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_without_returndata_support.sol
index 7e97b98da1..096ceea715 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_without_returndata_support.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v2_accessing_returned_dynamic_array_without_returndata_support.sol
@@ -10,4 +10,4 @@ contract C {
 // ====
 // EVMVersion: <byzantium
 // ----
-// TypeError 9574: (166-196): Type inaccessible dynamic type is not implicitly convertible to expected type uint256[] memory[] memory.
+// TypeError 9574: (166-196): Type inaccessible dynamic type is not implicitly convertible to expected type uint256[][] memory.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
index d7373ef7bd..45fed616c0 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v1_modifier_sandwich.sol
@@ -29,4 +29,4 @@ contract C is B {
     {}
 }
 // ----
-// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
index c3bf2c4301..5bc10f53ed 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v2_v1_v2_modifier_sandwich.sol
@@ -30,4 +30,4 @@ contract C is B {
     {}
 }
 // ----
-// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
+// TypeError 2428: (B:80-102): The type of return parameter 1, struct Data memory, is only supported in ABI coder v2. Use "pragma abicoder v2;" to enable the feature.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol
index 741667e7cd..8950217334 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_on_type_info.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4259: (93-98): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(bytes) provided.
+// TypeError 4259: (93-98): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(bytes storage pointer) provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol
index 753bc291c6..7bb257136a 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_bytes_and_strings.sol
@@ -9,6 +9,6 @@ contract C {
     }
 }
 // ----
-// TypeError 8015: (233-236): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[] provided.
-// TypeError 8015: (248-249): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes1[] provided.
-// TypeError 8015: (251-253): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but string provided.
+// TypeError 8015: (233-236): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[] memory provided.
+// TypeError 8015: (248-249): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes1[] memory provided.
+// TypeError 8015: (251-253): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but string calldata provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol
index 32ef03472b..42eb1a31d4 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc.sol
@@ -32,9 +32,9 @@ contract C {
 // TypeError 8015: (438-440): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but address payable provided.
 // TypeError 8015: (442-446): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () external provided.
 // TypeError 8015: (448-452): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
-// TypeError 8015: (454-462): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[] provided.
-// TypeError 8015: (464-471): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[2] provided.
+// TypeError 8015: (454-462): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[] memory provided.
+// TypeError 8015: (464-471): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint256[2] memory provided.
 // TypeError 8015: (473-474): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
-// TypeError 8015: (476-477): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S provided.
+// TypeError 8015: (476-477): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S memory provided.
 // TypeError 8015: (479-480): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
 // TypeError 8015: (482-483): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but mapping(uint256 => enum C.E) provided.
diff --git a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol
index bdc4519661..8d5374e844 100644
--- a/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol
+++ b/test/libsolidity/syntaxTests/array/concat/bytes_concat_wrong_type_misc_literals_and_expressions.sol
@@ -46,13 +46,13 @@ contract C {
 // TypeError 8015: (404-448): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 2494...(42 digits omitted)...0497 provided.
 // TypeError 8015: (495-561): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const 3027...(66 digits omitted)...5855 provided.
 // TypeError 8015: (596-663): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but int_const -1 provided.
-// TypeError 8015: (697-782): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes slice provided.
+// TypeError 8015: (697-782): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but bytes memory slice provided.
 // TypeError 8015: (796-797): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but function () provided.
 // TypeError 8015: (811-813): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple() provided.
 // TypeError 8015: (827-833): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but tuple(int_const 0,int_const 0) provided.
-// TypeError 8015: (847-850): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] provided.
-// TypeError 8015: (864-870): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] slice provided.
+// TypeError 8015: (847-850): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] memory provided.
+// TypeError 8015: (864-870): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8[1] memory slice provided.
 // TypeError 8015: (884-890): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but uint8 provided.
 // TypeError 8015: (904-911): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but contract C provided.
-// TypeError 8015: (925-929): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S provided.
+// TypeError 8015: (925-929): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but struct C.S memory provided.
 // TypeError 8015: (943-946): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but enum C.E provided.
diff --git a/test/libsolidity/syntaxTests/array/function_mapping_library.sol b/test/libsolidity/syntaxTests/array/function_mapping_library.sol
index f495362c9f..2099e0dd18 100644
--- a/test/libsolidity/syntaxTests/array/function_mapping_library.sol
+++ b/test/libsolidity/syntaxTests/array/function_mapping_library.sol
@@ -3,4 +3,4 @@ library L {
     function f(mapping(uint => uint)[2] memory a) external pure returns (mapping(uint => uint)[2] memory) {}
 }
 // ----
-// TypeError 4061: (61-94): Type mapping(uint256 => uint256)[2] is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (61-94): Type mapping(uint256 => uint256)[2] memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_function_argument.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_function_argument.sol
new file mode 100644
index 0000000000..51dce0986e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_function_argument.sol
@@ -0,0 +1,12 @@
+interface MyInterface {
+    error MyCustomError(uint256, bool);
+}
+
+contract MyContract {
+    function f(bytes4 arg) public {}
+    function test() public {
+        f(MyInterface.MyCustomError);
+    }
+}
+// ----
+//  TypeError 9553: (165-190): Invalid type for argument in function call. Invalid implicit conversion from error MyCustomError(uint256,bool) to bytes4 requested.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_return_value.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_return_value.sol
new file mode 100644
index 0000000000..c3deea881c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_error_to_bytes4_return_value.sol
@@ -0,0 +1,11 @@
+interface MyInterface {
+    error MyCustomError(uint256, bool);
+}
+
+contract Test {
+    function test() public returns(bytes4) {
+        return (MyInterface.MyCustomError);
+    }
+}
+// ----
+// TypeError 6359: (143-170): Return argument type error MyCustomError(uint256,bool) is not implicitly convertible to expected type (type of first return variable) bytes4.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_function_argument.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_function_argument.sol
new file mode 100644
index 0000000000..96b643a627
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_function_argument.sol
@@ -0,0 +1,9 @@
+contract MyContract {
+    event MyCustomEvent(uint256);
+    function f(bytes4 arg) public {}
+    function test() public {
+        f(MyCustomEvent);
+    }
+}
+// ----
+// TypeError 9553: (132-145): Invalid type for argument in function call. Invalid implicit conversion from event MyCustomEvent(uint256) to bytes4 requested.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_return_value.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_return_value.sol
new file mode 100644
index 0000000000..70523821d3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_event_to_bytes4_return_value.sol
@@ -0,0 +1,9 @@
+contract Test {
+    event MyCustomEvent(uint256);
+
+    function test() public returns(bytes4) {
+        return (MyCustomEvent);
+    }
+}
+// ----
+// TypeError 6359: (111-126): Return argument type event MyCustomEvent(uint256) is not implicitly convertible to expected type (type of first return variable) bytes4.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol
index b9f95df662..cd74b985cb 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_from_array_of_string_literals_to_calldata_string.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 6359: (122-147): Return argument type string memory[5] memory is not implicitly convertible to expected type (type of first return variable) string calldata[5] calldata.
+// TypeError 6359: (122-147): Return argument type string[5] memory is not implicitly convertible to expected type (type of first return variable) string[5] calldata.
diff --git a/test/libsolidity/syntaxTests/errors/bytes_concat_on_error_type_info.sol b/test/libsolidity/syntaxTests/errors/bytes_concat_on_error_type_info.sol
new file mode 100644
index 0000000000..4b8bbd4599
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/bytes_concat_on_error_type_info.sol
@@ -0,0 +1,9 @@
+error MyCustomError(uint, bool);
+contract C {
+    function f() public {
+        bytes memory a;
+        bytes memory b = type(MyCustomError).concat(a);
+    }
+}
+// ----
+// TypeError 4259: (126-139): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but error MyCustomError(uint256,bool) provided.
diff --git a/test/libsolidity/syntaxTests/errors/error_abi_decode.sol b/test/libsolidity/syntaxTests/errors/error_abi_decode.sol
new file mode 100644
index 0000000000..8f9f831dc8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_abi_decode.sol
@@ -0,0 +1,8 @@
+error MyCustomError(uint, bool);
+contract Test {
+    function f() public {
+        abi.decode(MyCustomError, (bool));
+    }
+}
+// ----
+// TypeError 1956: (94-107): The first argument to "abi.decode" must be implicitly convertible to bytes memory or bytes calldata, but is of type error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/errors/error_bytes_concat_wrong_type.sol b/test/libsolidity/syntaxTests/errors/error_bytes_concat_wrong_type.sol
new file mode 100644
index 0000000000..c26d7230e9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_bytes_concat_wrong_type.sol
@@ -0,0 +1,10 @@
+error MyCustomError(uint, bool);
+
+contract C {
+    function f() pure public {
+        bytes.concat(MyCustomError, MyCustomError);
+    }
+}
+// ----
+// TypeError 8015: (99-112): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but error MyCustomError(uint256,bool) provided.
+// TypeError 8015: (114-127): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but error MyCustomError(uint256,bool) provided.
diff --git a/test/libsolidity/syntaxTests/errors/error_encodecall_fail_args.sol b/test/libsolidity/syntaxTests/errors/error_encodecall_fail_args.sol
new file mode 100644
index 0000000000..b49b4be513
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_encodecall_fail_args.sol
@@ -0,0 +1,40 @@
+error MyCustomError(uint, bool);
+contract C {
+    enum testEnum { choice1, choice2, choice3 }
+
+    function f1(uint8, uint8) external {}
+    function f2(uint32) external {}
+    function f3(uint) external {}
+    function g1(bytes memory) external {}
+    function g2(bytes32) external {}
+    function h(string memory) external {}
+    function i(bool) external {}
+    function j(address) external {}
+    function k(address payable) external {}
+    function l(testEnum) external {}
+
+    function f() pure public {
+        abi.encodeCall(this.f1, (MyCustomError, MyCustomError));
+        abi.encodeCall(this.f2, (MyCustomError));
+        abi.encodeCall(this.f3, (MyCustomError));
+        abi.encodeCall(this.g1, (MyCustomError));
+        abi.encodeCall(this.g2, (MyCustomError));
+        abi.encodeCall(this.h, (MyCustomError));
+        abi.encodeCall(this.i, (MyCustomError));
+        abi.encodeCall(this.j, (MyCustomError));
+        abi.encodeCall(this.k, (MyCustomError));
+        abi.encodeCall(this.l, (MyCustomError));
+    }
+}
+// ----
+// TypeError 5407: (543-556): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "uint8".
+// TypeError 5407: (558-571): Cannot implicitly convert component at position 1 from "error MyCustomError(uint256,bool)" to "uint8".
+// TypeError 5407: (607-622): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "uint32".
+// TypeError 5407: (657-672): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "uint256".
+// TypeError 5407: (707-722): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "bytes memory".
+// TypeError 5407: (757-772): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "bytes32".
+// TypeError 5407: (806-821): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "string memory".
+// TypeError 5407: (855-870): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "bool".
+// TypeError 5407: (904-919): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "address".
+// TypeError 5407: (953-968): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "address payable".
+// TypeError 5407: (1002-1017): Cannot implicitly convert component at position 0 from "error MyCustomError(uint256,bool)" to "enum C.testEnum".
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
new file mode 100644
index 0000000000..28ba979d81
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
@@ -0,0 +1,47 @@
+error MyCustomError(uint, bool);
+
+contract C {
+    function f() pure public {
+        MyCustomError << MyCustomError;
+        MyCustomError >> MyCustomError;
+        MyCustomError ^ MyCustomError;
+        MyCustomError | MyCustomError;
+        MyCustomError & MyCustomError;
+
+        MyCustomError * MyCustomError;
+        MyCustomError / MyCustomError;
+        MyCustomError % MyCustomError;
+        MyCustomError + MyCustomError;
+        MyCustomError - MyCustomError;
+
+        MyCustomError == MyCustomError;
+        MyCustomError != MyCustomError;
+        MyCustomError >= MyCustomError;
+        MyCustomError <= MyCustomError;
+        MyCustomError < MyCustomError;
+        MyCustomError > MyCustomError;
+
+        MyCustomError || MyCustomError;
+        MyCustomError && MyCustomError;
+    }
+}
+
+// ----
+// TypeError 2271: (86-116): Operator << not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (126-156): Operator >> not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (166-195): Operator ^ not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (205-234): Operator | not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (244-273): Operator & not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (284-313): Operator * not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (323-352): Operator / not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (362-391): Operator % not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (401-430): Operator + not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (440-469): Operator - not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (480-510): Operator == not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (520-550): Operator != not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (560-590): Operator >= not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (600-630): Operator <= not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (640-669): Operator < not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (679-708): Operator > not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (719-749): Operator || not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (759-789): Operator && not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol
new file mode 100644
index 0000000000..7a2736b3d5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol
@@ -0,0 +1,19 @@
+error MyCustomError(uint, bool);
+
+contract C {
+    function f() pure public {
+        uint a;
+        MyCustomError += 1;
+        MyCustomError -= 1;
+        a += MyCustomError;
+        a -= MyCustomError;
+    }
+}
+
+// ----
+// TypeError 4247: (102-115): Expression has to be an lvalue.
+// TypeError 7366: (102-120): Operator += not compatible with types error MyCustomError(uint256,bool) and int_const 1
+// TypeError 4247: (130-143): Expression has to be an lvalue.
+// TypeError 7366: (130-148): Operator -= not compatible with types error MyCustomError(uint256,bool) and int_const 1
+// TypeError 7366: (158-176): Operator += not compatible with types uint256 and error MyCustomError(uint256,bool)
+// TypeError 7366: (186-204): Operator -= not compatible with types uint256 and error MyCustomError(uint256,bool)
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
new file mode 100644
index 0000000000..a89d8631db
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
@@ -0,0 +1,11 @@
+error MyCustomError(uint, bool);
+
+contract C {
+    function f() pure public {
+        MyCustomError++;
+    }
+}
+
+// ----
+// TypeError 4247: (86-99): Expression has to be an lvalue.
+// TypeError 9767: (86-101): Unary operator ++ cannot be applied to type error MyCustomError(uint256,bool)
diff --git a/test/libsolidity/syntaxTests/errors/error_invalid_function_modifier_type.sol b/test/libsolidity/syntaxTests/errors/error_invalid_function_modifier_type.sol
new file mode 100644
index 0000000000..0f1ce2c77e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_invalid_function_modifier_type.sol
@@ -0,0 +1,9 @@
+error MyCustomError(uint, bool);
+
+contract B {
+    function f() mod1(MyCustomError) public { }
+    modifier mod1(uint a) { if (a > 0) _; }
+}
+
+// ----
+// TypeError 4649: (69-82): Invalid type for argument in modifier invocation. Invalid implicit conversion from error MyCustomError(uint256,bool) to uint256 requested.
diff --git a/test/libsolidity/syntaxTests/errors/error_return_tuple_not_convertible.sol b/test/libsolidity/syntaxTests/errors/error_return_tuple_not_convertible.sol
new file mode 100644
index 0000000000..05d9df179b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_return_tuple_not_convertible.sol
@@ -0,0 +1,10 @@
+error MyCustomError(uint, bool);
+
+contract C {
+    function f() public returns (uint8, uint8, int) {
+        return ((MyCustomError, 8, MyCustomError));
+    }
+}
+
+// ----
+// TypeError 5992: (116-151): Return argument type tuple(error MyCustomError(uint256,bool),int_const 8,error MyCustomError(uint256,bool)) is not implicitly convertible to expected type tuple(uint8,uint8,int256).
diff --git a/test/libsolidity/syntaxTests/errors/error_ternary_operator_different_types.sol b/test/libsolidity/syntaxTests/errors/error_ternary_operator_different_types.sol
new file mode 100644
index 0000000000..680ab8058e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_ternary_operator_different_types.sol
@@ -0,0 +1,18 @@
+error MyCustomError(uint, bool);
+error MyCustomError2(uint, bool);
+error MyCustomError3(uint, bool, bool);
+
+contract C {
+    function f() pure public {
+        true ? MyCustomError : MyCustomError;
+        true ? MyCustomError : MyCustomError2;
+        true ? MyCustomError : MyCustomError3;
+        true ? MyCustomError : true;
+        true ? true : MyCustomError;
+    }
+}
+
+// ----
+// TypeError 1080: (253-290): True expression's type error MyCustomError(uint256,bool) does not match false expression's type error MyCustomError3(uint256,bool,bool).
+// TypeError 1080: (300-327): True expression's type error MyCustomError(uint256,bool) does not match false expression's type bool.
+// TypeError 1080: (337-364): True expression's type bool does not match false expression's type error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol b/test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol
new file mode 100644
index 0000000000..e37a6892d9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol
@@ -0,0 +1,7 @@
+error E();
+
+contract C {
+    function() internal pure x = E;
+}
+// ----
+// TypeError 7407: (58-59): Type error E() is not implicitly convertible to expected type function () pure. Special functions can not be converted to function types.
diff --git a/test/libsolidity/syntaxTests/errors/error_variable_declaration_implicit_conversion.sol b/test/libsolidity/syntaxTests/errors/error_variable_declaration_implicit_conversion.sol
new file mode 100644
index 0000000000..bca9acc0b2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_variable_declaration_implicit_conversion.sol
@@ -0,0 +1,10 @@
+error MyCustomError(uint, bool);
+
+contract C {
+    function f() public {
+        bytes4 a = MyCustomError;
+    }
+}
+
+// ----
+// TypeError 9574: (81-105): Type error MyCustomError(uint256,bool) is not implicitly convertible to expected type bytes4.
diff --git a/test/libsolidity/syntaxTests/errors/error_wrong_type_base_arg.sol b/test/libsolidity/syntaxTests/errors/error_wrong_type_base_arg.sol
new file mode 100644
index 0000000000..69fc60735b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_wrong_type_base_arg.sol
@@ -0,0 +1,10 @@
+error MyCustomError(uint, bool);
+
+contract Base {
+    constructor(uint8) {}
+}
+
+contract Derived is Base(MyCustomError) {}
+
+// ----
+// TypeError 9827: (104-117): Invalid type for argument in constructor call. Invalid implicit conversion from error MyCustomError(uint256,bool) to uint8 requested.
diff --git a/test/libsolidity/syntaxTests/errors/using.sol b/test/libsolidity/syntaxTests/errors/using.sol
index 388fa52abf..ad5a43f864 100644
--- a/test/libsolidity/syntaxTests/errors/using.sol
+++ b/test/libsolidity/syntaxTests/errors/using.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (133-136): Member "f" not found or not visible after argument-dependent lookup in function (uint256) pure.
+// TypeError 9582: (133-136): Member "f" not found or not visible after argument-dependent lookup in error E(uint256).
diff --git a/test/libsolidity/syntaxTests/events/bytes_concat_on_event_type_info.sol b/test/libsolidity/syntaxTests/events/bytes_concat_on_event_type_info.sol
new file mode 100644
index 0000000000..40323830e5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/bytes_concat_on_event_type_info.sol
@@ -0,0 +1,9 @@
+contract C {
+    event MyCustomEvent(uint);
+    function f() public {
+        bytes memory a;
+        bytes memory b = type(MyCustomEvent).concat(a);
+    }
+}
+// ----
+//  TypeError 4259: (124-137): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but event MyCustomEvent(uint256) provided.
diff --git a/test/libsolidity/syntaxTests/events/event_abi_decode.sol b/test/libsolidity/syntaxTests/events/event_abi_decode.sol
new file mode 100644
index 0000000000..6895d77909
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_abi_decode.sol
@@ -0,0 +1,8 @@
+contract Test {
+    event E(uint);
+    function f() public {
+        abi.decode(E, (bool));
+    }
+}
+// ----
+// TypeError 1956: (80-81): The first argument to "abi.decode" must be implicitly convertible to bytes memory or bytes calldata, but is of type event E(uint256).
diff --git a/test/libsolidity/syntaxTests/events/event_bytes_concat_wrong_type.sol b/test/libsolidity/syntaxTests/events/event_bytes_concat_wrong_type.sol
new file mode 100644
index 0000000000..7ec5188cc8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_bytes_concat_wrong_type.sol
@@ -0,0 +1,9 @@
+contract C {
+    event MyCustomEvent(uint);
+    function f() pure public {
+        bytes.concat(MyCustomEvent, MyCustomEvent);
+    }
+}
+// ----
+// TypeError 8015: (96-109): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but event MyCustomEvent(uint256) provided.
+// TypeError 8015: (111-124): Invalid type for argument in the bytes.concat function call. bytes or fixed bytes type is required, but event MyCustomEvent(uint256) provided.
diff --git a/test/libsolidity/syntaxTests/events/event_encodecall_fail_args.sol b/test/libsolidity/syntaxTests/events/event_encodecall_fail_args.sol
new file mode 100644
index 0000000000..9137fd26f4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_encodecall_fail_args.sol
@@ -0,0 +1,41 @@
+contract C {
+    event MyCustomEvent(uint);
+
+    enum testEnum { choice1, choice2, choice3 }
+
+    function f1(uint8, uint8) external {}
+    function f2(uint32) external {}
+    function f3(uint) external {}
+    function g1(bytes memory) external {}
+    function g2(bytes32) external {}
+    function h(string memory) external {}
+    function i(bool) external {}
+    function j(address) external {}
+    function k(address payable) external {}
+    function l(testEnum) external {}
+
+    function f() pure public {
+        abi.encodeCall(this.f1, (MyCustomEvent, MyCustomEvent));
+        abi.encodeCall(this.f2, (MyCustomEvent));
+        abi.encodeCall(this.f3, (MyCustomEvent));
+        abi.encodeCall(this.g1, (MyCustomEvent));
+        abi.encodeCall(this.g2, (MyCustomEvent));
+        abi.encodeCall(this.h, (MyCustomEvent));
+        abi.encodeCall(this.i, (MyCustomEvent));
+        abi.encodeCall(this.j, (MyCustomEvent));
+        abi.encodeCall(this.k, (MyCustomEvent));
+        abi.encodeCall(this.l, (MyCustomEvent));
+    }
+}
+// ----
+// TypeError 5407: (542-555): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "uint8".
+// TypeError 5407: (557-570): Cannot implicitly convert component at position 1 from "event MyCustomEvent(uint256)" to "uint8".
+// TypeError 5407: (606-621): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "uint32".
+// TypeError 5407: (656-671): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "uint256".
+// TypeError 5407: (706-721): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "bytes memory".
+// TypeError 5407: (756-771): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "bytes32".
+// TypeError 5407: (805-820): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "string memory".
+// TypeError 5407: (854-869): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "bool".
+// TypeError 5407: (903-918): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "address".
+// TypeError 5407: (952-967): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "address payable".
+// TypeError 5407: (1001-1016): Cannot implicitly convert component at position 0 from "event MyCustomEvent(uint256)" to "enum C.testEnum".
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol b/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
new file mode 100644
index 0000000000..79ed12d59e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
@@ -0,0 +1,46 @@
+contract C {
+    event MyCustomEvent(uint);
+    function f() pure public {
+        MyCustomEvent << MyCustomEvent;
+        MyCustomEvent >> MyCustomEvent;
+        MyCustomEvent ^ MyCustomEvent;
+        MyCustomEvent | MyCustomEvent;
+        MyCustomEvent & MyCustomEvent;
+
+        MyCustomEvent * MyCustomEvent;
+        MyCustomEvent / MyCustomEvent;
+        MyCustomEvent % MyCustomEvent;
+        MyCustomEvent + MyCustomEvent;
+        MyCustomEvent - MyCustomEvent;
+
+        MyCustomEvent == MyCustomEvent;
+        MyCustomEvent != MyCustomEvent;
+        MyCustomEvent >= MyCustomEvent;
+        MyCustomEvent <= MyCustomEvent;
+        MyCustomEvent < MyCustomEvent;
+        MyCustomEvent > MyCustomEvent;
+
+        MyCustomEvent || MyCustomEvent;
+        MyCustomEvent && MyCustomEvent;
+    }
+}
+
+// ----
+// TypeError 2271: (83-113): Operator << not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (123-153): Operator >> not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (163-192): Operator ^ not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (202-231): Operator | not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (241-270): Operator & not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (281-310): Operator * not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (320-349): Operator / not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (359-388): Operator % not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (398-427): Operator + not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (437-466): Operator - not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (477-507): Operator == not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (517-547): Operator != not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (557-587): Operator >= not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (597-627): Operator <= not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (637-666): Operator < not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (676-705): Operator > not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (716-746): Operator || not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (756-786): Operator && not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol b/test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol
new file mode 100644
index 0000000000..fd7418a14b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol
@@ -0,0 +1,18 @@
+contract C {
+    event MyCustomEvent(uint);
+    function f() pure public {
+        uint a;
+        MyCustomEvent += 1;
+        MyCustomEvent -= 1;
+        a += MyCustomEvent;
+        a -= MyCustomEvent;
+    }
+}
+
+// ----
+// TypeError 4247: (99-112): Expression has to be an lvalue.
+// TypeError 7366: (99-117): Operator += not compatible with types event MyCustomEvent(uint256) and int_const 1
+// TypeError 4247: (127-140): Expression has to be an lvalue.
+// TypeError 7366: (127-145): Operator -= not compatible with types event MyCustomEvent(uint256) and int_const 1
+// TypeError 7366: (155-173): Operator += not compatible with types uint256 and event MyCustomEvent(uint256)
+// TypeError 7366: (183-201): Operator -= not compatible with types uint256 and event MyCustomEvent(uint256)
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol b/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
new file mode 100644
index 0000000000..55ee62dea5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
@@ -0,0 +1,10 @@
+contract C {
+    event MyCustomEvent(uint);
+    function f() pure public {
+        MyCustomEvent++;
+    }
+}
+
+// ----
+// TypeError 4247: (83-96): Expression has to be an lvalue.
+// TypeError 9767: (83-98): Unary operator ++ cannot be applied to type event MyCustomEvent(uint256)
diff --git a/test/libsolidity/syntaxTests/events/event_invalid_function_modifier_type.sol b/test/libsolidity/syntaxTests/events/event_invalid_function_modifier_type.sol
new file mode 100644
index 0000000000..b534c3b1e6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_invalid_function_modifier_type.sol
@@ -0,0 +1,8 @@
+contract B {
+    event MyCustomEvent(uint);
+    function f() mod1(MyCustomEvent) public { }
+    modifier mod1(uint a) { if (a > 0) _; }
+}
+
+// ----
+// TypeError 4649: (66-79): Invalid type for argument in modifier invocation. Invalid implicit conversion from event MyCustomEvent(uint256) to uint256 requested.
diff --git a/test/libsolidity/syntaxTests/events/event_return_tuple_not_convertible.sol b/test/libsolidity/syntaxTests/events/event_return_tuple_not_convertible.sol
new file mode 100644
index 0000000000..87be3691f0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_return_tuple_not_convertible.sol
@@ -0,0 +1,9 @@
+contract C {
+    event MyCustomEvent(uint);
+    function f() public returns (uint8, uint8, int) {
+        return ((MyCustomEvent, 8, MyCustomEvent));
+    }
+}
+
+// ----
+// TypeError 5992: (113-148): Return argument type tuple(event MyCustomEvent(uint256),int_const 8,event MyCustomEvent(uint256)) is not implicitly convertible to expected type tuple(uint8,uint8,int256).
diff --git a/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol b/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
index 45e050e457..e94869732c 100644
--- a/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
+++ b/test/libsolidity/syntaxTests/events/event_selector_library_called_inside_function.sol
@@ -8,4 +8,4 @@ contract D {
     }
 }
 // ----
-// TypeError 9582: (123-135): Member "selector" not found or not visible after argument-dependent lookup in function ().
+// TypeError 9582: (123-135): Member "selector" not found or not visible after argument-dependent lookup in event E().
diff --git a/test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol b/test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol
index 72d224ba26..613d4ebcf7 100644
--- a/test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol
+++ b/test/libsolidity/syntaxTests/events/event_selector_library_declared_outside_but_called_inside_function.sol
@@ -10,4 +10,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (70-82): Member "selector" not found or not visible after argument-dependent lookup in function ().
+// TypeError 9582: (70-82): Member "selector" not found or not visible after argument-dependent lookup in event E().
diff --git a/test/libsolidity/syntaxTests/events/event_ternary_operator_different_types.sol b/test/libsolidity/syntaxTests/events/event_ternary_operator_different_types.sol
new file mode 100644
index 0000000000..ca2f1e1d68
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_ternary_operator_different_types.sol
@@ -0,0 +1,17 @@
+contract C {
+    event MyCustomEvent(uint);
+    event MyCustomEvent2(uint);
+    event MyCustomEvent3(uint, bool);
+    function f() pure public {
+        true ? MyCustomEvent : MyCustomEvent;
+        true ? MyCustomEvent : MyCustomEvent2;
+        true ? MyCustomEvent : MyCustomEvent3;
+        true ? MyCustomEvent : true;
+        true ? true : MyCustomEvent;
+    }
+}
+
+// ----
+// TypeError 1080: (246-283): True expression's type event MyCustomEvent(uint256) does not match false expression's type event MyCustomEvent3(uint256,bool).
+// TypeError 1080: (293-320): True expression's type event MyCustomEvent(uint256) does not match false expression's type bool.
+// TypeError 1080: (330-357): True expression's type bool does not match false expression's type event MyCustomEvent(uint256).
diff --git a/test/libsolidity/syntaxTests/errors/weird1.sol b/test/libsolidity/syntaxTests/events/event_to_function_conversion.sol
similarity index 67%
rename from test/libsolidity/syntaxTests/errors/weird1.sol
rename to test/libsolidity/syntaxTests/events/event_to_function_conversion.sol
index b57f34c222..931e485fce 100644
--- a/test/libsolidity/syntaxTests/errors/weird1.sol
+++ b/test/libsolidity/syntaxTests/events/event_to_function_conversion.sol
@@ -1,7 +1,7 @@
-error E();
 
 contract C {
+    event E(uint);
     function() internal pure x = E;
 }
 // ----
-// TypeError 7407: (58-59): Type function () pure is not implicitly convertible to expected type function () pure. Special functions can not be converted to function types.
+// TypeError 7407: (66-67): Type event E(uint256) is not implicitly convertible to expected type function () pure. Special functions can not be converted to function types.
diff --git a/test/libsolidity/syntaxTests/events/event_variable_declaration_implicit_conversion.sol b/test/libsolidity/syntaxTests/events/event_variable_declaration_implicit_conversion.sol
new file mode 100644
index 0000000000..60cdebddc9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_variable_declaration_implicit_conversion.sol
@@ -0,0 +1,9 @@
+contract C {
+    event MyCustomEvent(uint);
+    function f() public {
+        bytes4 a = MyCustomEvent;
+    }
+}
+
+// ----
+// TypeError 9574: (78-102): Type event MyCustomEvent(uint256) is not implicitly convertible to expected type bytes4.
diff --git a/test/libsolidity/syntaxTests/events/event_wrong_type_base_arg.sol b/test/libsolidity/syntaxTests/events/event_wrong_type_base_arg.sol
new file mode 100644
index 0000000000..adaaf4cccb
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_wrong_type_base_arg.sol
@@ -0,0 +1,9 @@
+contract Base {
+    event MyCustomEvent(uint);
+    constructor(uint8) {}
+}
+
+contract Derived is Base(Base.MyCustomEvent) {}
+
+// ----
+// TypeError 9827: (101-119): Invalid type for argument in constructor call. Invalid implicit conversion from event MyCustomEvent(uint256) to uint8 requested.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/memory_mapping_array.sol b/test/libsolidity/syntaxTests/iceRegressionTests/memory_mapping_array.sol
index aa1f63e4ce..d9a4cdd497 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/memory_mapping_array.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/memory_mapping_array.sol
@@ -4,4 +4,4 @@
         }
 }
 // ----
-// TypeError 4061: (91-136): Type mapping(string => uint24)[1] is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (91-136): Type mapping(string => uint24)[1] memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol b/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol
index 892cfdd8d3..9f53b9ed61 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/recursive_struct_memory.sol
@@ -11,4 +11,4 @@ contract Test {
 }
 // ----
 // DeclarationError 2333: (157-198): Identifier already declared.
-// TypeError 4061: (268-300): Type struct Test.RecursiveStruct[1] is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (268-300): Type struct Test.RecursiveStruct[1] memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/indexing/error_type_without_index.sol b/test/libsolidity/syntaxTests/indexing/error_type_without_index.sol
new file mode 100644
index 0000000000..66658a4c96
--- /dev/null
+++ b/test/libsolidity/syntaxTests/indexing/error_type_without_index.sol
@@ -0,0 +1,11 @@
+interface MyInterface {
+    error MyCustomError(uint256, bool);
+}
+
+contract MyContract {
+    function test() public {
+        MyInterface.MyCustomError[];
+    }
+}
+// ----
+// TypeError 2614: (126-151): Indexed expression has to be a type, mapping or array (is error MyCustomError(uint256,bool))
diff --git a/test/libsolidity/syntaxTests/indexing/event_type_without_index.sol b/test/libsolidity/syntaxTests/indexing/event_type_without_index.sol
new file mode 100644
index 0000000000..83d1ecc029
--- /dev/null
+++ b/test/libsolidity/syntaxTests/indexing/event_type_without_index.sol
@@ -0,0 +1,8 @@
+contract MyContract {
+    event MyCustomEvent(uint256);
+    function test() public {
+        MyCustomEvent[];
+    }
+}
+// ----
+// TypeError 2614: (93-106): Indexed expression has to be a type, mapping or array (is event MyCustomEvent(uint256))
diff --git a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol b/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol
index 164d32ff01..f92e4dbd57 100644
--- a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mapping_array_struct_array.sol
@@ -9,4 +9,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 4061: (161-172): Type struct Test.S2 is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (161-172): Type struct Test.S2 memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol b/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol
index fd510ed17d..0e8512a62e 100644
--- a/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol
+++ b/test/libsolidity/syntaxTests/memberLookup/memory_structs_with_mappings.sol
@@ -6,4 +6,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError 4061: (104-114): Type struct Test.S is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (104-114): Type struct Test.S memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/metaTypes/unsupportedArgForType.sol b/test/libsolidity/syntaxTests/metaTypes/unsupported_arg_for_type.sol
similarity index 83%
rename from test/libsolidity/syntaxTests/metaTypes/unsupportedArgForType.sol
rename to test/libsolidity/syntaxTests/metaTypes/unsupported_arg_for_type.sol
index 9ed26dc6fc..aa7686ed81 100644
--- a/test/libsolidity/syntaxTests/metaTypes/unsupportedArgForType.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/unsupported_arg_for_type.sol
@@ -6,4 +6,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 4259: (154-155): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(struct Test.S) provided.
+// TypeError 4259: (154-155): Invalid type for argument in the function call. An enum type, contract type or an integer type is required, but type(struct Test.S storage pointer) provided.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol
index d9e929da2a..1db651f37d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/207_no_mappings_in_memory_array.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 4061: (47-77): Type mapping(uint256 => uint256)[] is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (47-77): Type mapping(uint256 => uint256)[] memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/589_error_index_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/589_error_index_access.sol
new file mode 100644
index 0000000000..fbeae8141a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/589_error_index_access.sol
@@ -0,0 +1,9 @@
+error MyCustomError(uint, bool);
+contract Test {
+    function f() public {
+        uint[] memory a;
+        a[MyCustomError];
+    }
+}
+// ----
+// TypeError 7407: (110-123): Type error MyCustomError(uint256,bool) is not implicitly convertible to expected type uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/590_event_index_access.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/590_event_index_access.sol
new file mode 100644
index 0000000000..9b49f788ba
--- /dev/null
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/590_event_index_access.sol
@@ -0,0 +1,9 @@
+contract Test {
+    event MyCustomEvent(uint);
+    function f() public {
+        uint[] memory a;
+        a[MyCustomEvent];
+    }
+}
+// ----
+// TypeError 7407: (108-121): Type event MyCustomEvent(uint256) is not implicitly convertible to expected type uint256.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
index c705ab2ec1..1981b04bf3 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_nested_dynamic_array.sol
@@ -5,4 +5,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9611: (92-101): Decoding type uint256[] memory[3] memory not supported.
+// TypeError 9611: (92-101): Decoding type uint256[][3] memory not supported.
diff --git a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_array.sol b/test/libsolidity/syntaxTests/types/mapping/function_type_argument_array.sol
index e7587ad0cf..9be0688d56 100644
--- a/test/libsolidity/syntaxTests/types/mapping/function_type_argument_array.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/function_type_argument_array.sol
@@ -3,4 +3,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4061: (31-64): Type mapping(uint256 => uint256)[2] is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (31-64): Type mapping(uint256 => uint256)[2] memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol b/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol
index 5eb22d8335..4b1d77baa3 100644
--- a/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/library_nested_mapping.sol
@@ -4,4 +4,4 @@ library L {
     function f(S memory a) external pure returns (S memory) {}
 }
 // ----
-// TypeError 4061: (103-113): Type struct L.S is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (103-113): Type struct L.S memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol b/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol
index c6f8f48f3c..4da809bd5e 100644
--- a/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/memory_struct_recursive.sol
@@ -17,4 +17,4 @@ contract Test {
 	}
 }
 // ----
-// TypeError 4061: (143-153): Type struct Test.S is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (143-153): Type struct Test.S memory is only valid in storage because it contains a (nested) mapping.
diff --git a/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol b/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol
index f583b43142..6d6dd65e4a 100644
--- a/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol
+++ b/test/libsolidity/syntaxTests/types/mapping/memory_structs_with_mappings.sol
@@ -12,4 +12,4 @@ contract Test {
 }
 
 // ----
-// TypeError 4061: (172-182): Type struct Test.S is only valid in storage because it contains a (nested) mapping.
+// TypeError 4061: (172-182): Type struct Test.S memory is only valid in storage because it contains a (nested) mapping.

From e0ba7ef0d3c299c675615523ab858de72b3ae82b Mon Sep 17 00:00:00 2001
From: Duc Thanh Nguyen <ng.duc.tahn@gmail.com>
Date: Tue, 5 Jul 2022 13:45:01 -0400
Subject: [PATCH 0731/1748] Rename _short in toString to _withoutDataLocation

---
 libsolidity/ast/ASTJsonExporter.cpp |  4 +--
 libsolidity/ast/ASTJsonExporter.h   |  2 +-
 libsolidity/ast/Types.cpp           | 48 ++++++++++++++---------------
 libsolidity/ast/Types.h             | 36 +++++++++++-----------
 4 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index 8d5ed1a6cb..939fc79c6c 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -143,10 +143,10 @@ string ASTJsonExporter::namePathToString(std::vector<ASTString> const& _namePath
 	return boost::algorithm::join(_namePath, ".");
 }
 
-Json::Value ASTJsonExporter::typePointerToJson(Type const* _tp, bool _short)
+Json::Value ASTJsonExporter::typePointerToJson(Type const* _tp, bool _withoutDataLocation)
 {
 	Json::Value typeDescriptions(Json::objectValue);
-	typeDescriptions["typeString"] = _tp ? Json::Value(_tp->toString(_short)) : Json::nullValue;
+	typeDescriptions["typeString"] = _tp ? Json::Value(_tp->toString(_withoutDataLocation)) : Json::nullValue;
 	typeDescriptions["typeIdentifier"] = _tp ? Json::Value(_tp->identifier()) : Json::nullValue;
 	return typeDescriptions;
 
diff --git a/libsolidity/ast/ASTJsonExporter.h b/libsolidity/ast/ASTJsonExporter.h
index 566f13612f..71d15ce0a5 100644
--- a/libsolidity/ast/ASTJsonExporter.h
+++ b/libsolidity/ast/ASTJsonExporter.h
@@ -184,7 +184,7 @@ class ASTJsonExporter: public ASTConstVisitor
 
 		return json;
 	}
-	static Json::Value typePointerToJson(Type const* _tp, bool _short = false);
+	static Json::Value typePointerToJson(Type const* _tp, bool _withoutDataLocation = false);
 	static Json::Value typePointerToJson(std::optional<FuncCallArguments> const& _tps);
 	void appendExpressionAttributes(
 		std::vector<std::pair<std::string, Json::Value>> &_attributes,
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 5a315555ba..f88d1afcef 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -110,10 +110,10 @@ util::Result<TypePointers> transformParametersToExternal(TypePointers const& _pa
 	return transformed;
 }
 
-string toStringInParentheses(TypePointers const& _types, bool _short)
+string toStringInParentheses(TypePointers const& _types, bool _withoutDataLocation)
 {
 	return '(' + util::joinHumanReadable(
-		_types | ranges::views::transform([&](auto const* _type) { return _type->toString(_short); }),
+		_types | ranges::views::transform([&](auto const* _type) { return _type->toString(_withoutDataLocation); }),
 		","
 	) + ')';
 }
@@ -1789,7 +1789,7 @@ vector<tuple<string, Type const*>> ArrayType::makeStackItems() const
 	solAssert(false, "");
 }
 
-string ArrayType::toString(bool _short) const
+string ArrayType::toString(bool _withoutDataLocation) const
 {
 	string ret;
 	if (isString())
@@ -1798,12 +1798,12 @@ string ArrayType::toString(bool _short) const
 		ret = "bytes";
 	else
 	{
-		ret = baseType()->toString(_short) + "[";
+		ret = baseType()->toString(_withoutDataLocation) + "[";
 		if (!isDynamicallySized())
 			ret += length().str();
 		ret += "]";
 	}
-	if (!_short)
+	if (!_withoutDataLocation)
 		ret += " " + stringForReferencePart();
 	return ret;
 }
@@ -2008,9 +2008,9 @@ bool ArraySliceType::operator==(Type const& _other) const
 	return false;
 }
 
-string ArraySliceType::toString(bool _short) const
+string ArraySliceType::toString(bool _withoutDataLocation) const
 {
-	return m_arrayType.toString(_short) + " slice";
+	return m_arrayType.toString(_withoutDataLocation) + " slice";
 }
 
 string ArraySliceType::humanReadableName() const
@@ -2279,10 +2279,10 @@ bool StructType::containsNestedMapping() const
 	return m_struct.annotation().containsNestedMapping.value();
 }
 
-string StructType::toString(bool _short) const
+string StructType::toString(bool _withoutDataLocation) const
 {
 	string ret = "struct " + *m_struct.annotation().canonicalName;
-	if (!_short)
+	if (!_withoutDataLocation)
 		ret += " " + stringForReferencePart();
 	return ret;
 }
@@ -2634,7 +2634,7 @@ bool UserDefinedValueType::operator==(Type const& _other) const
 	return other.definition() == definition();
 }
 
-string UserDefinedValueType::toString(bool /* _short */) const
+string UserDefinedValueType::toString(bool /* _withoutDataLocation */) const
 {
 	return *definition().annotation().canonicalName;
 }
@@ -2682,13 +2682,13 @@ bool TupleType::operator==(Type const& _other) const
 		return false;
 }
 
-string TupleType::toString(bool _short) const
+string TupleType::toString(bool _withoutDataLocation) const
 {
 	if (components().empty())
 		return "tuple()";
 	string str = "tuple(";
 	for (auto const& t: components())
-		str += (t ? t->toString(_short) : "") + ",";
+		str += (t ? t->toString(_withoutDataLocation) : "") + ",";
 	str.pop_back();
 	return str + ")";
 }
@@ -3137,15 +3137,15 @@ string FunctionType::humanReadableName() const
 	switch (m_kind)
 	{
 	case Kind::Error:
-		return "error " + m_declaration->name() + toStringInParentheses(m_parameterTypes, /* _short */ true);
+		return "error " + m_declaration->name() + toStringInParentheses(m_parameterTypes, /* _withoutDataLocation */ true);
 	case Kind::Event:
-		return "event " + m_declaration->name() + toStringInParentheses(m_parameterTypes, /* _short */ true);
+		return "event " + m_declaration->name() + toStringInParentheses(m_parameterTypes, /* _withoutDataLocation */ true);
 	default:
-		return toString(/* _short */ false);
+		return toString(/* _withoutDataLocation */ false);
 	}
 }
 
-string FunctionType::toString(bool _short) const
+string FunctionType::toString(bool _withoutDataLocation) const
 {
 	string name = "function ";
 	if (m_kind == Kind::Declaration)
@@ -3156,7 +3156,7 @@ string FunctionType::toString(bool _short) const
 			name += *contract->annotation().canonicalName + ".";
 		name += functionDefinition->name();
 	}
-	name += toStringInParentheses(m_parameterTypes, _short);
+	name += toStringInParentheses(m_parameterTypes, _withoutDataLocation);
 	if (m_stateMutability != StateMutability::NonPayable)
 		name += " " + stateMutabilityToString(m_stateMutability);
 	if (m_kind == Kind::External)
@@ -3164,7 +3164,7 @@ string FunctionType::toString(bool _short) const
 	if (!m_returnParameterTypes.empty())
 	{
 		name += " returns ";
-		name += toStringInParentheses(m_returnParameterTypes, _short);
+		name += toStringInParentheses(m_returnParameterTypes, _withoutDataLocation);
 	}
 	return name;
 }
@@ -3756,9 +3756,9 @@ bool MappingType::operator==(Type const& _other) const
 	return *other.m_keyType == *m_keyType && *other.m_valueType == *m_valueType;
 }
 
-string MappingType::toString(bool _short) const
+string MappingType::toString(bool _withoutDataLocation) const
 {
-	return "mapping(" + keyType()->toString(_short) + " => " + valueType()->toString(_short) + ")";
+	return "mapping(" + keyType()->toString(_withoutDataLocation) + " => " + valueType()->toString(_withoutDataLocation) + ")";
 }
 
 string MappingType::canonicalName() const
@@ -3983,11 +3983,11 @@ bool ModifierType::operator==(Type const& _other) const
 	return true;
 }
 
-string ModifierType::toString(bool _short) const
+string ModifierType::toString(bool _withoutDataLocation) const
 {
 	string name = "modifier (";
 	for (auto it = m_parameterTypes.begin(); it != m_parameterTypes.end(); ++it)
-		name += (*it)->toString(_short) + (it + 1 == m_parameterTypes.end() ? "" : ",");
+		name += (*it)->toString(_withoutDataLocation) + (it + 1 == m_parameterTypes.end() ? "" : ",");
 	return name + ")";
 }
 
@@ -4183,7 +4183,7 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 	return {};
 }
 
-string MagicType::toString(bool _short) const
+string MagicType::toString(bool _withoutDataLocation) const
 {
 	switch (m_kind)
 	{
@@ -4197,7 +4197,7 @@ string MagicType::toString(bool _short) const
 		return "abi";
 	case Kind::MetaType:
 		solAssert(m_typeArgument, "");
-		return "type(" + m_typeArgument->toString(_short) + ")";
+		return "type(" + m_typeArgument->toString(_withoutDataLocation) + ")";
 	}
 	solAssert(false, "Unknown kind of magic.");
 	return {};
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 5eb10d8146..553af6c7d0 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -335,7 +335,7 @@ class Type
 		return members(_currentScope).memberType(_name);
 	}
 
-	virtual std::string toString(bool _short) const = 0;
+	virtual std::string toString(bool _withoutDataLocation) const = 0;
 	std::string toString() const { return toString(false); }
 	/// @returns the canonical name of this type for use in library function signatures.
 	virtual std::string canonicalName() const { return toString(true); }
@@ -428,7 +428,7 @@ class AddressType: public Type
 
 	MemberList::MemberMap nativeMembers(ASTNode const*) const override;
 
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 	std::string canonicalName() const override;
 
 	u256 literalValue(Literal const* _literal) const override;
@@ -471,7 +471,7 @@ class IntegerType: public Type
 	bool isValueType() const override { return true; }
 	bool nameable() const override { return true; }
 
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 
 	Type const* encodingType() const override { return this; }
 	TypeResult interfaceType(bool) const override { return this; }
@@ -518,7 +518,7 @@ class FixedPointType: public Type
 	bool isValueType() const override { return true; }
 	bool nameable() const override { return true; }
 
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 
 	Type const* encodingType() const override { return this; }
 	TypeResult interfaceType(bool) const override { return this; }
@@ -568,7 +568,7 @@ class RationalNumberType: public Type
 
 	bool canBeStored() const override { return false; }
 
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 	u256 literalValue(Literal const* _literal) const override;
 	Type const* mobileType() const override;
 
@@ -832,7 +832,7 @@ class ArrayType: public ReferenceType
 	bool containsNestedMapping() const override { return m_baseType->containsNestedMapping(); }
 	bool nameable() const override { return true; }
 
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 	std::string humanReadableName() const override;
 	std::string canonicalName() const override;
 	std::string signatureInExternalFunction(bool _structsByName) const override;
@@ -897,7 +897,7 @@ class ArraySliceType: public ReferenceType
 	unsigned calldataEncodedTailSize() const override { return 32; }
 	bool isDynamicallySized() const override { return true; }
 	bool isDynamicallyEncoded() const override { return true; }
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 	std::string humanReadableName() const override;
 	Type const* mobileType() const override;
 
@@ -942,7 +942,7 @@ class ContractType: public Type
 	bool leftAligned() const override { solAssert(!isSuper(), ""); return false; }
 	bool isValueType() const override { return !isSuper(); }
 	bool nameable() const override { return !isSuper(); }
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 	std::string canonicalName() const override;
 
 	MemberList::MemberMap nativeMembers(ASTNode const* _currentScope) const override;
@@ -1004,7 +1004,7 @@ class StructType: public ReferenceType
 	u256 storageSize() const override;
 	bool containsNestedMapping() const override;
 	bool nameable() const override { return true; }
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 
 	MemberList::MemberMap nativeMembers(ASTNode const* _currentScope) const override;
 
@@ -1066,7 +1066,7 @@ class EnumType: public Type
 	}
 	unsigned storageBytes() const override;
 	bool leftAligned() const override { return false; }
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 	std::string canonicalName() const override;
 	bool isValueType() const override { return true; }
 	bool nameable() const override { return true; }
@@ -1153,7 +1153,7 @@ class UserDefinedValueType: public Type
 		return false;
 	}
 
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 	std::string canonicalName() const override;
 	std::string signatureInExternalFunction(bool) const override { solAssert(false, ""); }
 
@@ -1179,7 +1179,7 @@ class TupleType: public CompositeType
 	std::string richIdentifier() const override;
 	bool operator==(Type const& _other) const override;
 	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 	std::string humanReadableName() const override;
 	bool canBeStored() const override { return false; }
 	u256 storageSize() const override;
@@ -1383,7 +1383,7 @@ class FunctionType: public Type
 	TypeResult binaryOperatorResult(Token, Type const*) const override;
 	std::string canonicalName() const override;
 	std::string humanReadableName() const override;
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 	unsigned calldataEncodedSize(bool _padded) const override;
 	bool canBeStored() const override { return m_kind == Kind::Internal || m_kind == Kind::External; }
 	u256 storageSize() const override;
@@ -1517,7 +1517,7 @@ class MappingType: public CompositeType
 
 	std::string richIdentifier() const override;
 	bool operator==(Type const& _other) const override;
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 	std::string canonicalName() const override;
 	bool containsNestedMapping() const override { return true; }
 	TypeResult binaryOperatorResult(Token, Type const*) const override { return nullptr; }
@@ -1558,7 +1558,7 @@ class TypeType: public Type
 	bool canBeStored() const override { return false; }
 	u256 storageSize() const override;
 	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
-	std::string toString(bool _short) const override { return "type(" + m_actualType->toString(_short) + ")"; }
+	std::string toString(bool _withoutDataLocation) const override { return "type(" + m_actualType->toString(_withoutDataLocation) + ")"; }
 	MemberList::MemberMap nativeMembers(ASTNode const* _currentScope) const override;
 
 	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
@@ -1585,7 +1585,7 @@ class ModifierType: public Type
 	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
 	std::string richIdentifier() const override;
 	bool operator==(Type const& _other) const override;
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 protected:
 	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override { return {}; }
 private:
@@ -1611,7 +1611,7 @@ class ModuleType: public Type
 	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
 	MemberList::MemberMap nativeMembers(ASTNode const*) const override;
 
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 
 protected:
 	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override { return {}; }
@@ -1650,7 +1650,7 @@ class MagicType: public Type
 	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
 	MemberList::MemberMap nativeMembers(ASTNode const*) const override;
 
-	std::string toString(bool _short) const override;
+	std::string toString(bool _withoutDataLocation) const override;
 
 	Kind kind() const { return m_kind; }
 

From a73bf9136c8c11830fff5ccda83e70ac20fed283 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 4 Jul 2022 19:01:30 -0300
Subject: [PATCH 0732/1748] Remove "garbage" code snippet from error message
 when in import-ast mode.

---
 liblangutil/SourceReferenceFormatter.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/liblangutil/SourceReferenceFormatter.cpp b/liblangutil/SourceReferenceFormatter.cpp
index 0edd551b8b..a38c5e617c 100644
--- a/liblangutil/SourceReferenceFormatter.cpp
+++ b/liblangutil/SourceReferenceFormatter.cpp
@@ -124,6 +124,9 @@ void SourceReferenceFormatter::printSourceLocation(SourceReference const& _ref)
 
 	string_view text = _ref.text;
 
+	if (m_charStreamProvider.charStream(_ref.sourceName).isImportedFromAST())
+		return;
+
 	if (!_ref.multiline)
 	{
 		size_t const locationLength = static_cast<size_t>(_ref.endColumn - _ref.startColumn);

From eb6b1291b7d78ee0fad7b3a337e7cbce4dbc0ac9 Mon Sep 17 00:00:00 2001
From: vdusart <43795504+vdusart@users.noreply.github.com>
Date: Thu, 7 Jul 2022 13:41:33 +0200
Subject: [PATCH 0733/1748] Fix type error

Fix type error according to #13144
---
 docs/types/operators.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/types/operators.rst b/docs/types/operators.rst
index 3a3b548df5..09278f0c57 100644
--- a/docs/types/operators.rst
+++ b/docs/types/operators.rst
@@ -5,7 +5,7 @@ Operators
 
 Arithmetic and bit operators can be applied even if the two operands do not have the same type.
 For example, you can compute ``y = x + z``, where ``x`` is a ``uint8`` and ``z`` has
-the type ``int32``. In these cases, the following mechanism will be used to determine
+the type ``int16``. In these cases, the following mechanism will be used to determine
 the type in which the operation is computed (this is important in case of overflow)
 and the type of the operator's result:
 

From f012a7798059789b1c48d3b6c5e86bbede4675e1 Mon Sep 17 00:00:00 2001
From: vdusart <43795504+vdusart@users.noreply.github.com>
Date: Thu, 7 Jul 2022 13:48:20 +0200
Subject: [PATCH 0734/1748] Fix mistake

---
 docs/types/operators.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/types/operators.rst b/docs/types/operators.rst
index 09278f0c57..1c26e627d5 100644
--- a/docs/types/operators.rst
+++ b/docs/types/operators.rst
@@ -5,7 +5,7 @@ Operators
 
 Arithmetic and bit operators can be applied even if the two operands do not have the same type.
 For example, you can compute ``y = x + z``, where ``x`` is a ``uint8`` and ``z`` has
-the type ``int16``. In these cases, the following mechanism will be used to determine
+the type ``uint32``. In these cases, the following mechanism will be used to determine
 the type in which the operation is computed (this is important in case of overflow)
 and the type of the operator's result:
 

From 16b64f3aeeda7d46c11a8249adde18b110bf416e Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Mon, 23 May 2022 14:20:03 +0200
Subject: [PATCH 0735/1748] LSP rename

---
 libsolidity/CMakeLists.txt                    |   2 +
 libsolidity/lsp/FileRepository.h              |   1 -
 libsolidity/lsp/HandlerBase.h                 |   4 +-
 libsolidity/lsp/LanguageServer.cpp            |   5 +
 libsolidity/lsp/LanguageServer.h              |   4 +-
 libsolidity/lsp/RenameSymbol.cpp              | 316 ++++++++++++++++++
 libsolidity/lsp/RenameSymbol.h                | 119 +++++++
 libsolidity/lsp/SemanticTokensBuilder.cpp     |   2 +-
 test/libsolidity/lsp/rename/contract.sol      | 307 +++++++++++++++++
 test/libsolidity/lsp/rename/function.sol      | 194 +++++++++++
 test/libsolidity/lsp/rename/functionCall.sol  | 202 +++++++++++
 .../lsp/rename/import_directive.sol           | 247 ++++++++++++++
 test/libsolidity/lsp/rename/variable.sol      | 132 ++++++++
 test/lsp.py                                   | 160 +++++++--
 14 files changed, 1654 insertions(+), 41 deletions(-)
 create mode 100644 libsolidity/lsp/RenameSymbol.cpp
 create mode 100644 libsolidity/lsp/RenameSymbol.h
 create mode 100644 test/libsolidity/lsp/rename/contract.sol
 create mode 100644 test/libsolidity/lsp/rename/function.sol
 create mode 100644 test/libsolidity/lsp/rename/functionCall.sol
 create mode 100644 test/libsolidity/lsp/rename/import_directive.sol
 create mode 100644 test/libsolidity/lsp/rename/variable.sol

diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index b609f4fee2..68e58e1c98 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -159,6 +159,8 @@ set(sources
 	lsp/FileRepository.h
 	lsp/GotoDefinition.cpp
 	lsp/GotoDefinition.h
+	lsp/RenameSymbol.cpp
+	lsp/RenameSymbol.h
 	lsp/HandlerBase.cpp
 	lsp/HandlerBase.h
 	lsp/LanguageServer.cpp
diff --git a/libsolidity/lsp/FileRepository.h b/libsolidity/lsp/FileRepository.h
index 152c1d4bec..52e50b3938 100644
--- a/libsolidity/lsp/FileRepository.h
+++ b/libsolidity/lsp/FileRepository.h
@@ -44,7 +44,6 @@ class FileRepository
 	/// Changes the source identified by the LSP client path _uri to _text.
 	void setSourceByUri(std::string const& _uri, std::string _text);
 
-	void addOrUpdateFile(boost::filesystem::path const& _path, frontend::SourceCode _source);
 	void setSourceUnits(StringMap _sources);
 	frontend::ReadCallback::Result readFile(std::string const& _kind, std::string const& _sourceUnitName);
 	frontend::ReadCallback::Callback reader()
diff --git a/libsolidity/lsp/HandlerBase.h b/libsolidity/lsp/HandlerBase.h
index 3ca1679be6..e2ccb88d82 100644
--- a/libsolidity/lsp/HandlerBase.h
+++ b/libsolidity/lsp/HandlerBase.h
@@ -45,8 +45,8 @@ class HandlerBase
 	/// from the JSON-RPC parameters.
 	std::pair<std::string, langutil::LineColumn> extractSourceUnitNameAndLineColumn(Json::Value const& _params) const;
 
-	langutil::CharStreamProvider const& charStreamProvider() const noexcept { return m_server.charStreamProvider(); }
-	FileRepository const& fileRepository() const noexcept { return m_server.fileRepository(); }
+	langutil::CharStreamProvider const& charStreamProvider() const noexcept { return m_server.compilerStack(); }
+	FileRepository& fileRepository() const noexcept { return m_server.fileRepository(); }
 	Transport& client() const noexcept { return m_server.client(); }
 
 protected:
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index ed1e5a6e10..685e0c6316 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -26,6 +26,7 @@
 
 // LSP feature implementations
 #include <libsolidity/lsp/GotoDefinition.h>
+#include <libsolidity/lsp/RenameSymbol.h>
 #include <libsolidity/lsp/SemanticTokensBuilder.h>
 
 #include <liblangutil/SourceReferenceExtractor.h>
@@ -124,6 +125,7 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"textDocument/didOpen", bind(&LanguageServer::handleTextDocumentDidOpen, this, _2)},
 		{"textDocument/didChange", bind(&LanguageServer::handleTextDocumentDidChange, this, _2)},
 		{"textDocument/didClose", bind(&LanguageServer::handleTextDocumentDidClose, this, _2)},
+		{"textDocument/rename", RenameSymbol(*this) },
 		{"textDocument/implementation", GotoDefinition(*this) },
 		{"textDocument/semanticTokens/full", bind(&LanguageServer::semanticTokensFull, this, _1, _2)},
 		{"workspace/didChangeConfiguration", bind(&LanguageServer::handleWorkspaceDidChangeConfiguration, this, _2)},
@@ -314,6 +316,8 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	replyArgs["capabilities"]["semanticTokensProvider"]["legend"] = semanticTokensLegend();
 	replyArgs["capabilities"]["semanticTokensProvider"]["range"] = false;
 	replyArgs["capabilities"]["semanticTokensProvider"]["full"] = true; // XOR requests.full.delta = true
+	replyArgs["capabilities"]["renameProvider"] = true;
+
 
 	m_client.reply(_id, move(replyArgs));
 }
@@ -432,6 +436,7 @@ void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
 	compileAndUpdateDiagnostics();
 }
 
+
 ASTNode const* LanguageServer::astNodeAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
 {
 	if (m_compilerStack.state() < CompilerStack::AnalysisPerformed)
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
index 4a683e2904..ee4f06957f 100644
--- a/libsolidity/lsp/LanguageServer.h
+++ b/libsolidity/lsp/LanguageServer.h
@@ -33,6 +33,7 @@
 namespace solidity::lsp
 {
 
+class RenameSymbol;
 enum class ErrorCode;
 
 /**
@@ -60,7 +61,7 @@ class LanguageServer
 	FileRepository& fileRepository() noexcept { return m_fileRepository; }
 	Transport& client() noexcept { return m_client; }
 	frontend::ASTNode const* astNodeAtSourceLocation(std::string const& _sourceUnitName, langutil::LineColumn const& _filePos);
-	langutil::CharStreamProvider const& charStreamProvider() const noexcept { return m_compilerStack; }
+	frontend::CompilerStack const& compilerStack() const noexcept { return m_compilerStack; }
 
 private:
 	/// Checks if the server is initialized (to be used by messages that need it to be initialized).
@@ -72,6 +73,7 @@ class LanguageServer
 	void handleTextDocumentDidOpen(Json::Value const& _args);
 	void handleTextDocumentDidChange(Json::Value const& _args);
 	void handleTextDocumentDidClose(Json::Value const& _args);
+	void handleRename(Json::Value const& _args);
 	void handleGotoDefinition(MessageID _id, Json::Value const& _args);
 	void semanticTokensFull(MessageID _id, Json::Value const& _args);
 
diff --git a/libsolidity/lsp/RenameSymbol.cpp b/libsolidity/lsp/RenameSymbol.cpp
new file mode 100644
index 0000000000..e205beb73f
--- /dev/null
+++ b/libsolidity/lsp/RenameSymbol.cpp
@@ -0,0 +1,316 @@
+/*
+	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 <libsolidity/lsp/RenameSymbol.h>
+#include <libsolidity/lsp/Utils.h>
+
+#include <libyul/AST.h>
+
+#include <fmt/format.h>
+
+#include <memory>
+#include <string>
+#include <vector>
+
+using namespace solidity::frontend;
+using namespace solidity::langutil;
+using namespace solidity::lsp;
+using namespace std;
+
+namespace
+{
+
+CallableDeclaration const* extractCallableDeclaration(FunctionCall const& _functionCall)
+{
+	if (
+		auto const* functionType = dynamic_cast<FunctionType const*>(_functionCall.expression().annotation().type);
+		functionType && functionType->hasDeclaration()
+	)
+		if (auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(&functionType->declaration()))
+			return functionDefinition;
+
+	return nullptr;
+}
+
+}
+
+void RenameSymbol::operator()(MessageID _id, Json::Value const& _args)
+{
+	auto const&& [sourceUnitName, lineColumn] = extractSourceUnitNameAndLineColumn(_args);
+	string const newName = _args["newName"].asString();
+	string const uri = _args["textDocument"]["uri"].asString();
+
+	ASTNode const* sourceNode = m_server.astNodeAtSourceLocation(sourceUnitName, lineColumn);
+
+	m_symbolName = {};
+	m_declarationToRename = nullptr;
+	m_sourceUnits = { &m_server.compilerStack().ast(sourceUnitName) };
+	m_locations.clear();
+
+	optional<int> cursorBytePosition = charStreamProvider()
+		.charStream(sourceUnitName)
+		.translateLineColumnToPosition(lineColumn);
+	solAssert(cursorBytePosition.has_value(), "Expected source pos");
+
+	extractNameAndDeclaration(*sourceNode, *cursorBytePosition);
+
+	// Find all source units using this symbol
+	for (auto const& [name, content]: fileRepository().sourceUnits())
+	{
+		auto const& sourceUnit = m_server.compilerStack().ast(name);
+		for (auto const* referencedSourceUnit: sourceUnit.referencedSourceUnits(true, util::convertContainer<set<SourceUnit const*>>(m_sourceUnits)))
+			if (*referencedSourceUnit->location().sourceName == sourceUnitName)
+			{
+				m_sourceUnits.insert(&sourceUnit);
+				break;
+			}
+	}
+
+	// Origin source unit should always be checked
+	m_sourceUnits.insert(&m_declarationToRename->sourceUnit());
+
+	Visitor visitor(*this);
+
+	for (auto const* sourceUnit: m_sourceUnits)
+		sourceUnit->accept(visitor);
+
+	// Apply changes in reverse order (will iterate in reverse)
+	sort(m_locations.begin(), m_locations.end());
+
+	Json::Value reply = Json::objectValue;
+	reply["changes"] = Json::objectValue;
+
+	Json::Value edits = Json::arrayValue;
+
+	for (auto i = m_locations.rbegin(); i != m_locations.rend(); i++)
+	{
+		solAssert(i->isValid());
+
+		// Replace in our file repository
+		string const uri = fileRepository().sourceUnitNameToUri(*i->sourceName);
+		string buffer = fileRepository().sourceUnits().at(*i->sourceName);
+		buffer.replace((size_t)i->start, (size_t)(i->end - i->start), newName);
+		fileRepository().setSourceByUri(uri, std::move(buffer));
+
+		Json::Value edit = Json::objectValue;
+		edit["range"] = toRange(*i);
+		edit["newText"] = newName;
+
+		// Record changes for the client
+		edits.append(edit);
+		if (i + 1 == m_locations.rend() || (i + 1)->sourceName != i->sourceName)
+		{
+			reply["changes"][uri] = edits;
+			edits = Json::arrayValue;
+		}
+	}
+
+	client().reply(_id, reply);
+}
+
+void RenameSymbol::extractNameAndDeclaration(ASTNode const& _node, int _cursorBytePosition)
+{
+	// Identify symbol name and node
+	if (auto const* declaration = dynamic_cast<Declaration const*>(&_node))
+	{
+		if (declaration->nameLocation().containsOffset(_cursorBytePosition))
+		{
+			m_symbolName = declaration->name();
+			m_declarationToRename = declaration;
+		}
+		else if (auto const* importDirective = dynamic_cast<ImportDirective const*>(declaration))
+			extractNameAndDeclaration(*importDirective, _cursorBytePosition);
+	}
+	else if (auto const* identifier = dynamic_cast<Identifier const*>(&_node))
+	{
+		if (auto const* declReference = dynamic_cast<Declaration const*>(identifier->annotation().referencedDeclaration))
+		{
+			m_symbolName = identifier->name();
+			m_declarationToRename = declReference;
+		}
+	}
+	else if (auto const* identifierPath = dynamic_cast<IdentifierPath const*>(&_node))
+		extractNameAndDeclaration(*identifierPath, _cursorBytePosition);
+	else if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(&_node))
+	{
+		m_symbolName = memberAccess->memberName();
+		m_declarationToRename = memberAccess->annotation().referencedDeclaration;
+	}
+	else if (auto const* functionCall = dynamic_cast<FunctionCall const*>(&_node))
+		extractNameAndDeclaration(*functionCall, _cursorBytePosition);
+	else if (auto const* inlineAssembly = dynamic_cast<InlineAssembly const*>(&_node))
+		extractNameAndDeclaration(*inlineAssembly, _cursorBytePosition);
+	else
+		solAssert(false, "Unexpected ASTNODE id: " + to_string(_node.id()));
+
+	lspDebug(fmt::format("Goal: rename '{}', loc: {}-{}", m_symbolName, m_declarationToRename->nameLocation().start, m_declarationToRename->nameLocation().end));
+}
+
+void RenameSymbol::extractNameAndDeclaration(ImportDirective const& _importDirective, int _cursorBytePosition)
+{
+	for (ImportDirective::SymbolAlias const& symbolAlias: _importDirective.symbolAliases())
+		if (symbolAlias.location.containsOffset(_cursorBytePosition))
+		{
+			solAssert(symbolAlias.alias);
+			m_symbolName = *symbolAlias.alias;
+			m_declarationToRename = symbolAlias.symbol->annotation().referencedDeclaration;
+			break;
+		}
+}
+
+void RenameSymbol::Visitor::endVisit(ImportDirective const& _node)
+{
+	// Handles SourceUnit aliases
+	if (handleGenericDeclaration(_node))
+		return;
+
+	for (ImportDirective::SymbolAlias const& symbolAlias: _node.symbolAliases())
+		if (
+			symbolAlias.alias != nullptr &&
+			*symbolAlias.alias == m_outer.m_symbolName &&
+			symbolAlias.symbol->annotation().referencedDeclaration == m_outer.m_declarationToRename
+		)
+			m_outer.m_locations.emplace_back(symbolAlias.location);
+}
+
+void RenameSymbol::extractNameAndDeclaration(FunctionCall const& _functionCall, int _cursorBytePosition)
+{
+	if (auto const* functionDefinition = extractCallableDeclaration(_functionCall))
+		for (size_t i = 0; i < _functionCall.names().size(); i++)
+			if (_functionCall.nameLocations()[i].containsOffset(_cursorBytePosition))
+			{
+				m_symbolName = *_functionCall.names()[i];
+				for (size_t j = 0; j < functionDefinition->parameters().size(); j++)
+					if (
+						functionDefinition->parameters()[j] &&
+						functionDefinition->parameters()[j]->name() == m_symbolName
+					)
+						m_declarationToRename =  functionDefinition->parameters()[j].get();
+				return;
+			}
+}
+
+void RenameSymbol::Visitor::endVisit(FunctionCall const& _node)
+{
+	SourceLocation nameLocationInFunctionCall;
+
+	for (size_t i = 0; i < _node.names().size(); i++)
+		if (_node.names()[i] && *_node.names()[i] == m_outer.m_symbolName)
+			nameLocationInFunctionCall = _node.nameLocations()[i];
+
+	if (!nameLocationInFunctionCall.isValid())
+		return;
+
+	if (auto const* functionDefinition = extractCallableDeclaration(_node))
+		for (size_t j = 0; j < functionDefinition->parameters().size(); j++)
+			if (
+				functionDefinition->parameters()[j] &&
+				*functionDefinition->parameters()[j] == *m_outer.m_declarationToRename
+			)
+				m_outer.m_locations.emplace_back(nameLocationInFunctionCall);
+}
+
+void RenameSymbol::Visitor::endVisit(MemberAccess const& _node)
+{
+	if (
+		m_outer.m_symbolName == _node.memberName() &&
+		*m_outer.m_declarationToRename == *_node.annotation().referencedDeclaration
+	)
+		m_outer.m_locations.emplace_back(_node.memberLocation());
+}
+
+void RenameSymbol::Visitor::endVisit(Identifier const& _node)
+{
+	if (
+		m_outer.m_symbolName == _node.name() &&
+		*m_outer.m_declarationToRename == *_node.annotation().referencedDeclaration
+	)
+		m_outer.m_locations.emplace_back(_node.location());
+}
+
+void RenameSymbol::extractNameAndDeclaration(IdentifierPath const& _identifierPath, int _cursorBytePosition)
+{
+	// iterate through the elements of the path to find the one the cursor is on
+	size_t numIdentifiers = _identifierPath.pathLocations().size();
+	for (size_t i = 0; i < numIdentifiers; i++)
+	{
+		auto& location = _identifierPath.pathLocations()[i];
+
+		if (location.containsOffset(_cursorBytePosition))
+		{
+			solAssert(_identifierPath.annotation().pathDeclarations.size() == numIdentifiers);
+			solAssert(_identifierPath.path().size() == numIdentifiers);
+
+			m_declarationToRename = _identifierPath.annotation().pathDeclarations[i];
+			m_symbolName = _identifierPath.path()[i];
+		}
+	}
+}
+
+void RenameSymbol::Visitor::endVisit(IdentifierPath const& _node)
+{
+	std::vector<Declaration const*>& declarations = _node.annotation().pathDeclarations;
+	solAssert(declarations.size() == _node.path().size());
+
+	for (size_t i = 0; i < _node.path().size(); i++)
+		if (
+			_node.path()[i] == m_outer.m_symbolName &&
+			declarations[i] == m_outer.m_declarationToRename
+		)
+			m_outer.m_locations.emplace_back(_node.pathLocations()[i]);
+}
+
+void RenameSymbol::extractNameAndDeclaration(InlineAssembly const& _inlineAssembly, int _cursorBytePosition)
+{
+	for (auto&& [identifier, externalReference]: _inlineAssembly.annotation().externalReferences)
+	{
+		SourceLocation location = yul::nativeLocationOf(*identifier);
+		location.end -= static_cast<int>(externalReference.suffix.size() + 1);
+
+		if (location.containsOffset(_cursorBytePosition))
+		{
+			m_declarationToRename = externalReference.declaration;
+			m_symbolName = identifier->name.str();
+
+			if (!externalReference.suffix.empty())
+				m_symbolName = m_symbolName.substr(0, m_symbolName.length() - externalReference.suffix.size() - 1);
+			break;
+		}
+	}
+}
+
+void RenameSymbol::Visitor::endVisit(InlineAssembly const& _node)
+{
+	for (auto&& [identifier, externalReference]: _node.annotation().externalReferences)
+	{
+		string identifierName = identifier->name.str();
+		if (!externalReference.suffix.empty())
+			identifierName = identifierName.substr(0, identifierName.length() - externalReference.suffix.size() - 1);
+
+		if (
+			externalReference.declaration == m_outer.m_declarationToRename &&
+			identifierName == m_outer.m_symbolName
+		)
+		{
+			SourceLocation location = yul::nativeLocationOf(*identifier);
+			location.end -= static_cast<int>(externalReference.suffix.size() + 1);
+
+			m_outer.m_locations.emplace_back(location);
+		}
+	}
+
+}
diff --git a/libsolidity/lsp/RenameSymbol.h b/libsolidity/lsp/RenameSymbol.h
new file mode 100644
index 0000000000..cafa8c067a
--- /dev/null
+++ b/libsolidity/lsp/RenameSymbol.h
@@ -0,0 +1,119 @@
+/*
+	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 <libsolidity/lsp/HandlerBase.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/ast/ASTVisitor.h>
+
+namespace solidity::lsp
+{
+
+class RenameSymbol: public HandlerBase
+{
+public:
+	explicit RenameSymbol(LanguageServer& _server): HandlerBase(_server) {}
+
+	void operator()(MessageID, Json::Value const&);
+protected:
+	// Nested class because otherwise `RenameSymbol` couldn't be easily used
+	// with LanguageServer::m_handlers as `ASTConstVisitor` deletes required
+	// c'tors
+	struct Visitor: public frontend::ASTConstVisitor
+	{
+		explicit Visitor(RenameSymbol& _outer): m_outer(_outer) {}
+		void endVisit(frontend::ImportDirective const& _node) override;
+		void endVisit(frontend::MemberAccess const& _node) override;
+		void endVisit(frontend::Identifier const& _node) override;
+		void endVisit(frontend::IdentifierPath const& _node) override;
+		void endVisit(frontend::FunctionCall const& _node) override;
+		void endVisit(frontend::InlineAssembly const& _node) override;
+
+		void endVisit(frontend::ContractDefinition const& _node) override
+		{
+			handleGenericDeclaration(_node);
+		}
+		void endVisit(frontend::StructDefinition const& _node) override
+		{
+			handleGenericDeclaration(_node);
+		}
+		void endVisit(frontend::EnumDefinition const& _node) override
+		{
+			handleGenericDeclaration(_node);
+		}
+		void endVisit(frontend::EnumValue const& _node) override
+		{
+			handleGenericDeclaration(_node);
+		}
+		void endVisit(frontend::UserDefinedValueTypeDefinition const& _node) override
+		{
+			handleGenericDeclaration(_node);
+		}
+		void endVisit(frontend::VariableDeclaration const& _node) override
+		{
+			handleGenericDeclaration(_node);
+		}
+		void endVisit(frontend::FunctionDefinition const& _node) override
+		{
+			handleGenericDeclaration(_node);
+		}
+		void endVisit(frontend::ModifierDefinition const& _node) override
+		{
+			handleGenericDeclaration(_node);
+		}
+		void endVisit(frontend::EventDefinition const& _node) override
+		{
+			handleGenericDeclaration(_node);
+		}
+		void endVisit(frontend::ErrorDefinition const& _node) override
+		{
+			handleGenericDeclaration(_node);
+		}
+
+		bool handleGenericDeclaration(frontend::Declaration const& _declaration)
+		{
+			if (
+				m_outer.m_symbolName == _declaration.name() &&
+				*m_outer.m_declarationToRename == _declaration
+			)
+			{
+				m_outer.m_locations.emplace_back(_declaration.nameLocation());
+				return true;
+			}
+			return false;
+		}
+
+		private:
+			RenameSymbol& m_outer;
+	};
+
+	void extractNameAndDeclaration(frontend::ASTNode const& _node, int _cursorBytePosition);
+	void extractNameAndDeclaration(frontend::IdentifierPath const& _identifierPath, int _cursorBytePosition);
+	void extractNameAndDeclaration(frontend::ImportDirective const& _importDirective, int _cursorBytePosition);
+	void extractNameAndDeclaration(frontend::FunctionCall const& _functionCall, int _cursorBytePosition);
+	void extractNameAndDeclaration(frontend::InlineAssembly const& _inlineAssembly, int _cursorBytePosition);
+
+	// Node to rename
+	frontend::Declaration const* m_declarationToRename = nullptr;
+	// Original name
+	frontend::ASTString m_symbolName = {};
+	// SourceUnits to search & replace symbol in
+	std::set<frontend::SourceUnit const*, frontend::ASTNode::CompareByID> m_sourceUnits = {};
+	// Source locations that need to be replaced
+	std::vector<langutil::SourceLocation> m_locations = {};
+};
+
+}
diff --git a/libsolidity/lsp/SemanticTokensBuilder.cpp b/libsolidity/lsp/SemanticTokensBuilder.cpp
index b1263139e0..dae48c1b50 100644
--- a/libsolidity/lsp/SemanticTokensBuilder.cpp
+++ b/libsolidity/lsp/SemanticTokensBuilder.cpp
@@ -195,7 +195,7 @@ void SemanticTokensBuilder::endVisit(frontend::StructuredDocumentation const& _d
 
 void SemanticTokensBuilder::endVisit(frontend::Identifier const& _identifier)
 {
-	lspDebug(fmt::format("Identifier: {}, {}..{} cat={}", _identifier.name(), _identifier.location().start, _identifier.location().end, _identifier.annotation().type->category()));
+	//lspDebug(fmt::format("Identifier: {}, {}..{} cat={}", _identifier.name(), _identifier.location().start, _identifier.location().end, _identifier.annotation().type->category()));
 
 	SemanticTokenModifiers modifiers = SemanticTokenModifiers::None;
 	if (_identifier.annotation().isConstant.set() && *_identifier.annotation().isConstant)
diff --git a/test/libsolidity/lsp/rename/contract.sol b/test/libsolidity/lsp/rename/contract.sol
new file mode 100644
index 0000000000..5bdc14fe61
--- /dev/null
+++ b/test/libsolidity/lsp/rename/contract.sol
@@ -0,0 +1,307 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract ToRename
+//       ^ @CursorOnContractDefinition
+//       ^^^^^^^^ @ContractInDefinition
+{
+}
+
+contract User
+//       ^^^^ @UserContractInContractTest
+{
+    ToRename public publicVariable;
+//  ^^^^^^^^ @ContractInPublicVariable
+//         ^ @CursorOnPublicVariableType
+
+    ToRename[10] previousContracts;
+//  ^^^^^^^^ @ContractInArrayType
+//   ^ @CursorOnArrayType
+
+    mapping(int => ToRename) contractMapping;
+    //             ^^^^^^^^ @ContractInMapping
+    //              ^ @CursorOnMapping
+
+    function getContract() public returns (ToRename)
+                                  //       ^^^^^^^^ @ContractInReturnParameter
+//                                            ^ @CursorOnReturnParameter
+    {
+        return new ToRename();
+        //         ^^^^^^^^ @ContractInReturnExpression
+//                    ^ @CursorOnReturnExpression
+    }
+
+    function setContract(ToRename _contract) public
+    //                   ^^^^^^^^ @ContractInParameter
+    //                        ^ @CursorOnParameter
+    {
+        publicVariable = _contract;
+    }
+}
+// ----
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnContractDefinition
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnExpression
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInMapping
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInArrayType
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnReturnParameter
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnExpression
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInMapping
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInArrayType
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnReturnExpression
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnExpression
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInMapping
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInArrayType
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnPublicVariableType
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnExpression
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInMapping
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInArrayType
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnArrayType
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnExpression
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInMapping
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInArrayType
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnMapping
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnExpression
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInMapping
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInArrayType
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnParameter
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnExpression
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInMapping
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInArrayType
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInDefinition
+//             }
+//         ]
+//     }
+// }
diff --git a/test/libsolidity/lsp/rename/function.sol b/test/libsolidity/lsp/rename/function.sol
new file mode 100644
index 0000000000..ffd8f6b589
--- /dev/null
+++ b/test/libsolidity/lsp/rename/function.sol
@@ -0,0 +1,194 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract C
+{
+    function renameMe() public pure returns (int)
+    //       ^^^^^^^^ @FunctionInDefinition
+    //            ^ @CursorInDefinition
+    {
+        return 1;
+    }
+
+    function other() public view
+    {
+        renameMe();
+//      ^^^^^^^^ @FunctionInFunctionSameContract
+//         ^ @CursorInFunctionSameContract
+        this.renameMe();
+     //      ^^^^^^^^ @FunctionInFunctionSameContractExternal
+         //         ^ @CursorInFunctionSameContractExternal
+    }
+}
+
+contract Other
+{
+    C m_contract;
+
+    function other() public view
+    {
+        m_contract.renameMe();
+           //      ^^^^^^^^ @FunctionInFunctionOtherContract
+        //         ^ @CursorInFunctionOtherContract
+    }
+}
+
+function free() pure
+{
+    C local_contract;
+    local_contract.renameMe();
+           //      ^^^^^^^^ @FunctionInFreeFunction
+        //         ^ @CursorInFreeFunction
+}
+
+// ----
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorInDefinition
+// }
+// <- {
+//     "changes": {
+//         "rename/function.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFreeFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionOtherContract
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionSameContractExternal
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionSameContract
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorInFunctionOtherContract
+// }
+// <- {
+//     "changes": {
+//         "rename/function.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFreeFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionOtherContract
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionSameContractExternal
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionSameContract
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorInFunctionSameContractExternal
+// }
+// <- {
+//     "changes": {
+//         "rename/function.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFreeFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionOtherContract
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionSameContractExternal
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionSameContract
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorInFunctionSameContract
+// }
+// <- {
+//     "changes": {
+//         "rename/function.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFreeFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionOtherContract
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionSameContractExternal
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionSameContract
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorInFreeFunction
+// }
+// <- {
+//     "changes": {
+//         "rename/function.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFreeFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionOtherContract
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionSameContractExternal
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInFunctionSameContract
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FunctionInDefinition
+//             }
+//         ]
+//     }
+// }
diff --git a/test/libsolidity/lsp/rename/functionCall.sol b/test/libsolidity/lsp/rename/functionCall.sol
new file mode 100644
index 0000000000..f8417fab90
--- /dev/null
+++ b/test/libsolidity/lsp/rename/functionCall.sol
@@ -0,0 +1,202 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract C
+{
+    function foo(int a, int b, int c) pure public returns(int)
+    //                      ^ @ParameterB
+    //               ^ @ParameterA
+    //                             ^ @ParameterC
+    {
+        return a + b + c;
+        //         ^ @ParameterBInFoo
+        //     ^ @ParameterAInFoo
+        //             ^ @ParameterCInFoo
+
+    }
+
+    function bar() public view
+    {
+        this.foo({c:1, b:2, a:3});
+        //             ^ @ParameterBInCall
+        //        ^ @ParameterCInCall
+        //                  ^ @ParameterAInCall
+    }
+}
+// ----
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @ParameterA
+// }
+// <- {
+//     "changes": {
+//         "rename/functionCall.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterAInCall
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterAInFoo
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterA
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @ParameterAInCall
+// }
+// <- {
+//     "changes": {
+//         "rename/functionCall.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterAInCall
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterAInFoo
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterA
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @ParameterAInFoo
+// }
+// <- {
+//     "changes": {
+//         "rename/functionCall.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterAInCall
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterAInFoo
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterA
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @ParameterC
+// }
+// <- {
+//     "changes": {
+//         "rename/functionCall.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterCInCall
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterCInFoo
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterC
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @ParameterCInCall
+// }
+// <- {
+//     "changes": {
+//         "rename/functionCall.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterCInCall
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterCInFoo
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterC
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @ParameterCInFoo
+// }
+// <- {
+//     "changes": {
+//         "rename/functionCall.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterCInCall
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterCInFoo
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterC
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @ParameterBInCall
+// }
+// <- {
+//     "changes": {
+//         "rename/functionCall.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterBInCall
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterBInFoo
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterB
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @ParameterBInFoo
+// }
+// <- {
+//     "changes": {
+//         "rename/functionCall.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterBInCall
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterBInFoo
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ParameterB
+//             }
+//         ]
+//     }
+// }
diff --git a/test/libsolidity/lsp/rename/import_directive.sol b/test/libsolidity/lsp/rename/import_directive.sol
new file mode 100644
index 0000000000..a6b596866a
--- /dev/null
+++ b/test/libsolidity/lsp/rename/import_directive.sol
@@ -0,0 +1,247 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+import "./contract.sol" as externalFile;
+//                         ^^^^^^^^^^^^ @FileAliasInImportDirective
+//                             ^ @CursorOnFileAliasInImportDirective
+import {ToRename as ExternalContract, User} from "./contract.sol";
+//                  ^^^^^^^^^^^^^^^^ @RenamedContractInImportDirective
+//                         ^ @CursorOnRenamedContractInImportDirective
+//      ^^^^^^^^ @OriginalNameInImportDirective
+//      ^ @CursorOnOriginalNameInImportDirective
+//                                    ^^^^ @UserInImportDirective
+//                                    ^ @CursorOnUserInImportDirective
+
+contract C
+{
+    ExternalContract public externalContract;
+//  ^^^^^^^^^^^^^^^^ @RenamedContractInPublicVariable
+//        ^ @CursorOnRenamedContractInPublicVariable
+    externalFile.ToRename public externalFileContract;
+//  ^^^^^^^^^^^^ @FileAliasInPublicVariable
+//  ^ @CursorOnFileAliasInPublicVariable
+//               ^^^^^^^^ @OriginalNameInPublicVariable
+//                      ^ @CursorOnOriginalNameInPublicVariable
+    User public externalUserContract;
+//  ^^^^ @UserInPublicVariable
+//     ^ @CursorOnUserInPublicVariable
+}
+
+// ----
+// contract:
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnFileAliasInImportDirective
+// }
+// <- {
+//     "changes": {
+//         "rename/import_directive.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FileAliasInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FileAliasInImportDirective
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnRenamedContractInImportDirective
+// }
+// <- {
+//     "changes": {
+//         "rename/import_directive.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @RenamedContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @RenamedContractInImportDirective
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnOriginalNameInImportDirective
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnExpression
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInMapping
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInArrayType
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInDefinition
+//             }
+//         ],
+//         "rename/import_directive.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @OriginalNameInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @OriginalNameInImportDirective
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnRenamedContractInPublicVariable
+// }
+// <- {
+//     "changes": {
+//         "rename/import_directive.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @RenamedContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @RenamedContractInImportDirective
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnFileAliasInPublicVariable
+// }
+// <- {
+//     "changes": {
+//         "rename/import_directive.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FileAliasInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @FileAliasInImportDirective
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnOriginalNameInPublicVariable
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnExpression
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInReturnParameter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInMapping
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInArrayType
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @ContractInDefinition
+//             }
+//         ],
+//         "rename/import_directive.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @OriginalNameInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @OriginalNameInImportDirective
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnUserInPublicVariable
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @UserContractInContractTest
+//             }
+//         ],
+//         "rename/import_directive.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @UserInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @UserInImportDirective
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnUserInImportDirective
+// }
+// <- {
+//     "changes": {
+//         "rename/contract.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @UserContractInContractTest
+//             }
+//         ],
+//         "rename/import_directive.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @UserInPublicVariable
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @UserInImportDirective
+//             }
+//         ]
+//     }
+// }
diff --git a/test/libsolidity/lsp/rename/variable.sol b/test/libsolidity/lsp/rename/variable.sol
new file mode 100644
index 0000000000..39c23bcd72
--- /dev/null
+++ b/test/libsolidity/lsp/rename/variable.sol
@@ -0,0 +1,132 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract C
+{
+    int public renameMe;
+    //         ^^^^^^^^ @VariableInDefinition
+    //         ^ @CursorOnVariableDefinition
+
+    function foo() public returns(int)
+    {
+        renameMe = 1;
+//      ^^^^^^^^ @VariableInFunction
+//             ^ @CursorOnVariableInFunction
+        return this.renameMe();
+//                  ^^^^^^^^ @VariableInGetter
+//                     ^ @CursorOnVariableInGetter
+    }
+}
+
+function freeFunction(C _contract) view returns(int)
+{
+    return _contract.renameMe();
+    //               ^^^^^^^^ @VariableInFreeFunction
+    //                 ^ @CursorOnVariableInFreeFunction
+}
+
+// ----
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnVariableInFunction
+// }
+// <- {
+//     "changes": {
+//         "rename/variable.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInFreeFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInGetter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnVariableDefinition
+// }
+// <- {
+//     "changes": {
+//         "rename/variable.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInFreeFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInGetter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnVariableInGetter
+// }
+// <- {
+//     "changes": {
+//         "rename/variable.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInFreeFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInGetter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInDefinition
+//             }
+//         ]
+//     }
+// }
+// -> textDocument/rename {
+//     "newName": "Renamed",
+//     "position": @CursorOnVariableInFreeFunction
+// }
+// <- {
+//     "changes": {
+//         "rename/variable.sol": [
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInFreeFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInGetter
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInFunction
+//             },
+//             {
+//                 "newText": "Renamed",
+//                 "range": @VariableInDefinition
+//             }
+//         ]
+//     }
+// }
diff --git a/test/lsp.py b/test/lsp.py
index f20e93953a..c3e5dcc9da 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -15,7 +15,7 @@
 from enum import Enum, auto
 from itertools import islice
 from pathlib import PurePath
-from typing import Any, List, Optional, Tuple, Union
+from typing import Any, List, Optional, Tuple, Union, NewType
 
 import colorama  # Enables the use of SGR & CUP terminal VT sequences on Windows.
 from deepdiff import DeepDiff
@@ -30,6 +30,13 @@
     tty.setcbreak(sys.stdin.fileno())
 
 
+# Type for the pure test name without .sol suffix or sub directory
+TestName = NewType("TestName", str)
+
+# Type for the test path, e.g.  subdir/mytest.sol
+RelativeTestPath = NewType("RelativeTestPath", str)
+
+
 def escape_string(text: str) -> str:
     """
     Trivially escapes given input string's \r \n and \\.
@@ -148,11 +155,13 @@ class JsonRpcProcess:
     exe_args: List[str]
     process: subprocess.Popen
     trace_io: bool
+    print_pid: bool
 
-    def __init__(self, exe_path: str, exe_args: List[str], trace_io: bool = True):
+    def __init__(self, exe_path: str, exe_args: List[str], trace_io: bool = True, print_pid = False):
         self.exe_path = exe_path
         self.exe_args = exe_args
         self.trace_io = trace_io
+        self.print_pid = print_pid
 
     def __enter__(self):
         self.process = subprocess.Popen(
@@ -161,6 +170,10 @@ def __enter__(self):
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE
         )
+
+        if self.print_pid:
+            print(f"solc pid: {self.process.pid}. Attach with sudo gdb -p {self.process.pid}")
+
         return self
 
     def __exit__(self, exception_type, exception_value, traceback) -> None:
@@ -285,6 +298,13 @@ def create_cli_parser() -> argparse.ArgumentParser:
         action="store_true",
         help="Prevent interactive queries and just fail instead."
     )
+    parser.set_defaults(print_solc_pid=False)
+    parser.add_argument(
+        "-p", "--print-solc-pid",
+        dest="print_solc_pid",
+        action="store_true",
+        help="Print pid of each started solc for debugging purposes."
+    )
     parser.set_defaults(trace_io=False)
     parser.add_argument(
         "-T", "--trace-io",
@@ -347,10 +367,13 @@ class TestParser:
 
     parsed_testcases = TestParser(content).parse()
 
-    # First diagnostics are yielded
+    # First diagnostics are yielded.
+    # Type is "TestParser.Diagnostics"
     expected_diagnostics = next(parsed_testcases)
+
     ...
     # Now each request/response pair in the test definition
+    # Type is "TestParser.RequestAndResponse"
     for testcase in self.parsed_testcases:
         ...
     """
@@ -393,11 +416,11 @@ def parse(self):
         yield self.parseDiagnostics()
 
         while not self.at_end():
-            yield self.RequestAndResponse(**self.parseRequestAndResponse())
+            yield self.parseRequestAndResponse()
             self.next_line()
 
 
-    def parseDiagnostics(self):
+    def parseDiagnostics(self) -> Diagnostics:
         """
         Parse diagnostic expectations specified in the file.
         Returns a named tuple instance of "Diagnostics"
@@ -429,7 +452,7 @@ def parseDiagnostics(self):
         return self.Diagnostics(**diagnostics)
 
 
-    def parseRequestAndResponse(self):
+    def parseRequestAndResponse(self) -> RequestAndResponse:
         RESPONSE_START = "// <- "
         REQUEST_END = "// }"
         COMMENT_PREFIX = "// "
@@ -490,7 +513,7 @@ def parseRequestAndResponse(self):
             if self.at_end():
                 raise TestParserException(ret, "Response footer not found")
 
-        return ret
+        return self.RequestAndResponse(**ret)
 
     def next_line(self):
         self.current_line_tuple = next(self.lines, None)
@@ -532,7 +555,7 @@ def __init__(self, test_name, sub_dir, solc, suite):
         self.solc = solc
         self.open_tests = []
         self.content = self.suite.get_test_file_contents(self.test_name, self.sub_dir)
-        self.markers = self.suite.get_file_tags(self.test_name, self.sub_dir)
+        self.markers = self.suite.get_test_tags(self.test_name, self.sub_dir)
         self.parsed_testcases = None
         self.expected_diagnostics = None
 
@@ -580,7 +603,7 @@ def test_diagnostics(self):
                     len(expected_diagnostics),
                     description="Unexpected amount of diagnostics"
                 )
-                markers = self.suite.get_file_tags(testname, sub_dir)
+                markers = self.suite.get_test_tags(testname, sub_dir)
                 for actual_diagnostic in diagnostics_per_file["diagnostics"]:
                     expected_diagnostic = next((diagnostic for diagnostic in
                         expected_diagnostics if actual_diagnostic['range'] ==
@@ -643,7 +666,13 @@ def test_methods(self) -> bool:
         finally:
             self.close_all_open_files()
 
-    def user_interaction_failed_method_test(self, testcase, actual, expected) -> TestResult:
+    def user_interaction_failed_method_test(
+        self,
+        testcase: TestParser.RequestAndResponse,
+        actual,
+        expected
+    ) -> TestResult:
+
         actual_pretty = self.suite.replace_ranges_with_tags(actual, self.sub_dir)
 
         if expected is None:
@@ -688,16 +717,29 @@ def run_testcase(self, testcase: TestParser.RequestAndResponse):
         """
         Runs the given testcase.
         """
+
         requestBodyJson = self.parse_json_with_tags(testcase.request, self.markers)
         # add textDocument/uri if missing
         if 'textDocument' not in requestBodyJson:
             requestBodyJson['textDocument'] = { 'uri': self.suite.get_test_file_uri(self.test_name, self.sub_dir) }
+
         actualResponseJson = self.solc.call_method(testcase.method, requestBodyJson)
 
         # simplify response
-        for result in actualResponseJson["result"]:
-            if "uri" in result:
-                result["uri"] = result["uri"].replace(self.suite.project_root_uri + "/" + self.sub_dir + "/", "")
+        if "result" in actualResponseJson:
+            if isinstance(actualResponseJson["result"], list):
+                for result in actualResponseJson["result"]:
+                    if "uri" in result:
+                        result["uri"] = result["uri"].replace(self.suite.project_root_uri + "/" + self.sub_dir + "/", "")
+
+            elif isinstance(actualResponseJson["result"], dict):
+                if "changes" in actualResponseJson["result"]:
+                    changes = actualResponseJson["result"]["changes"]
+                    for key in list(changes.keys()):
+                        new_key = key.replace(self.suite.project_root_uri + "/", "")
+                        changes[new_key] = changes[key]
+                        del changes[key]
+
         if "jsonrpc" in actualResponseJson:
             actualResponseJson.pop("jsonrpc")
 
@@ -737,21 +779,39 @@ def replace_tag(data, markers):
             if not isinstance(data, dict):
                 return data
 
+            def findMarker(desired_tag):
+                if not isinstance(desired_tag, str):
+                    return desired_tag
+
+                for tag, tagRange in markers.items():
+                    if tag == desired_tag:
+                        return tagRange
+                    elif tag.lower() == desired_tag.lower():
+                        raise Exception(f"Detected lower/upper case mismatch: Requested {desired_tag} but only found {tag}")
+
+                raise Exception(f"Marker {desired_tag} not found in file")
+
+
             # Check if we need markers from a specific file
             # Needs to be done before the loop or it might be called only after
             # we found "range" or "position"
             if "uri" in data:
-                markers = self.suite.get_file_tags(data["uri"][:-len(".sol")], self.sub_dir)
+                markers = self.suite.get_test_tags(data["uri"][:-len(".sol")], self.sub_dir)
 
             for key, val in data.items():
                 if key == "range":
-                    for tag, tagRange in markers.items():
-                        if tag == val:
-                            data[key] = tagRange
+                    data[key] = findMarker(val)
                 elif key == "position":
-                    for tag, tagRange in markers.items():
-                        if tag == val:
-                            data[key] = tagRange["start"]
+                    tag_range = findMarker(val)
+                    if "start" in tag_range:
+                        data[key] = tag_range["start"]
+                elif key == "changes":
+                    for path, list_of_changes in val.items():
+                        test_name, file_sub_dir = split_path(path)
+                        markers = self.suite.get_test_tags(test_name[:-len(".sol")], file_sub_dir)
+                        for change in list_of_changes:
+                            if "range" in change:
+                                change["range"] = findMarker(change["range"])
                 elif isinstance(val, dict):
                     replace_tag(val, markers)
                 elif isinstance(val, list):
@@ -781,6 +841,7 @@ def __init__(self):
         self.test_pattern = args.test_pattern
         self.fail_fast = args.fail_fast
         self.non_interactive = args.non_interactive
+        self.print_solc_pid = args.print_solc_pid
 
         print(f"{SGR_NOTICE}test pattern: {self.test_pattern}{SGR_RESET}")
 
@@ -803,7 +864,7 @@ def main(self) -> int:
             title: str = test_fn.__name__[5:]
             print(f"{SGR_TEST_BEGIN}Testing {title} ...{SGR_RESET}")
             try:
-                with JsonRpcProcess(self.solc_path, ["--lsp"], trace_io=self.trace_io) as solc:
+                with JsonRpcProcess(self.solc_path, ["--lsp"], trace_io=self.trace_io, print_pid=self.print_solc_pid) as solc:
                     test_fn(solc)
                     self.test_counter.passed += 1
             except ExpectationFailed:
@@ -1102,7 +1163,7 @@ def find_tag_with_range(self, test, sub_dir, target_range):
         Find and return the tag that represents the requested range otherwise
         return None.
         """
-        markers = self.get_file_tags(test, sub_dir)
+        markers = self.get_test_tags(test, sub_dir)
 
         for tag, tag_range in markers.items():
             if tag_range == target_range:
@@ -1113,8 +1174,18 @@ def find_tag_with_range(self, test, sub_dir, target_range):
     def replace_ranges_with_tags(self, content, sub_dir):
         """
         Replace matching ranges with "@<tagname>".
+
+        Recognized patterns:
+            { "changes": { "<uri>": { "range": "<range>" } } }
+            { "uri": "<uri>", "range": "<range> }
+
         """
 
+        def replace_range(item: dict, markers):
+            for tag, tagRange in markers.items():
+                if "range" in item and tagRange == item["range"]:
+                    item["range"] = str(tag)
+
         def recursive_iter(obj):
             if isinstance(obj, dict):
                 yield obj
@@ -1126,10 +1197,27 @@ def recursive_iter(obj):
 
         for item in recursive_iter(content):
             if "uri" in item and "range" in item:
-                markers = self.get_file_tags(item["uri"][:-len(".sol")], sub_dir)
-                for tag, tagRange in markers.items():
-                    if tagRange == item["range"]:
-                        item["range"] = str(tag)
+                try:
+                    markers = self.get_test_tags(item["uri"][:-len(".sol")], sub_dir)
+                    replace_range(item, markers)
+                except FileNotFoundError:
+                    # Skip over errors as this is user provided input that can
+                    # point to non-existing files
+                    pass
+            elif "changes" in item:
+                for file, changes_for_file in item["changes"].items():
+                    test_name, file_sub_dir = split_path(file)
+                    try:
+                        markers = self.get_test_tags(test_name[:-len(".sol")], file_sub_dir)
+                        for change in changes_for_file:
+                            replace_range(change, markers)
+
+                    except FileNotFoundError:
+                        # Skip over errors as this is user provided input that can
+                        # point to non-existing files
+                        pass
+
+
 
         # Convert JSON to string and split it at the quoted tags
         split_by_tag = TEST_REGEXES.findQuotedTag.split(json.dumps(content, indent=4, sort_keys=True))
@@ -1178,7 +1266,7 @@ def user_interaction_failed_autoupdate(self, test, sub_dir):
         if user_response == "r":
             print("retrying...")
             # pragma pylint: disable=no-member
-            self.get_file_tags.cache_clear()
+            self.get_test_tags.cache_clear()
             return False
         if user_response == "e":
             editor = os.environ.get('VISUAL', os.environ.get('EDITOR', 'vi'))
@@ -1188,7 +1276,7 @@ def user_interaction_failed_autoupdate(self, test, sub_dir):
                 check=True
             )
             # pragma pylint: disable=no-member
-            self.get_file_tags.cache_clear()
+            self.get_test_tags.cache_clear()
         elif user_response == "s":
             print("skipping...")
 
@@ -1236,11 +1324,11 @@ def test_textDocument_didOpen_with_relative_import(self, solc: JsonRpcProcess) -
         report = published_diagnostics[1]
         self.expect_equal(report['uri'], self.get_test_file_uri('lib', 'goto'), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
-        marker = self.get_file_tags("lib", "goto")["@diagnostics"]
+        marker = self.get_test_tags("lib", "goto")["@diagnostics"]
         self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
 
     @functools.lru_cache() # pragma pylint: disable=lru-cache-decorating-method
-    def get_file_tags(self, test_name: str, sub_dir=None, verbose=False):
+    def get_test_tags(self, test_name: TestName, sub_dir=None, verbose=False):
         """
         Finds all tags (e.g. @tagname) in the given test and returns them as a
         dictionary having the following structure: {
@@ -1285,7 +1373,7 @@ def get_file_tags(self, test_name: str, sub_dir=None, verbose=False):
     def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
         # Reusing another test but now change some file that generates an error in the other.
         self.test_textDocument_didOpen_with_relative_import(solc)
-        marker = self.get_file_tags("lib", "goto")["@addFunction"]
+        marker = self.get_test_tags("lib", "goto")["@addFunction"]
         self.open_file_and_wait_for_diagnostics(solc, 'lib', "goto")
         solc.send_message(
             'textDocument/didChange',
@@ -1310,7 +1398,7 @@ def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
         report = published_diagnostics[0]
         self.expect_equal(report['uri'], self.get_test_file_uri('didOpen_with_import'))
         diagnostics = report['diagnostics']
-        marker = self.get_file_tags("didOpen_with_import")["@diagnostics"]
+        marker = self.get_test_tags("didOpen_with_import")["@diagnostics"]
         self.expect_equal(len(diagnostics), 1, "now, no diagnostics")
         self.expect_diagnostic(diagnostics[0], code=9582, marker=marker)
 
@@ -1343,7 +1431,7 @@ def verify_didOpen_with_import_diagnostics(
         self.expect_equal(report['uri'], self.get_test_file_uri('lib', 'goto'), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 1, "one diagnostic")
 
-        markers = self.get_file_tags('lib', 'goto')
+        markers = self.get_test_tags('lib', 'goto')
         marker = markers["@diagnostics"]
         self.expect_diagnostic(report['diagnostics'][0], code=2072, marker=marker)
 
@@ -1400,7 +1488,7 @@ def test_textDocument_didChange_updates_diagnostics(self, solc: JsonRpcProcess)
         self.expect_equal(report['uri'], self.get_test_file_uri(TEST_NAME, "goto"), "Correct file URI")
         diagnostics = report['diagnostics']
         self.expect_equal(len(diagnostics), 3, "3 diagnostic messages")
-        markers = self.get_file_tags(TEST_NAME, "goto")
+        markers = self.get_test_tags(TEST_NAME, "goto")
         self.expect_diagnostic(diagnostics[0], code=6321, marker=markers["@unusedReturnVariable"])
         self.expect_diagnostic(diagnostics[1], code=2072, marker=markers["@unusedVariable"])
         self.expect_diagnostic(diagnostics[2], code=2072, marker=markers["@unusedContractVariable"])
@@ -1433,7 +1521,7 @@ def test_textDocument_didChange_delete_line_and_close(self, solc: JsonRpcProcess
         self.test_textDocument_didOpen_with_relative_import(solc)
         self.open_file_and_wait_for_diagnostics(solc, 'lib', 'goto')
 
-        marker = self.get_file_tags('lib', 'goto')["@diagnostics"]
+        marker = self.get_test_tags('lib', 'goto')["@diagnostics"]
 
         # lib.sol: Fix the unused variable message by removing it.
         solc.send_message(
@@ -1563,7 +1651,7 @@ def test_textDocument_closing_virtual_file_removes_imported_real_file(self, solc
         self.expect_equal(len(reports), 2, '')
         self.expect_equal(len(reports[0]['diagnostics']), 0, "should not contain diagnostics")
 
-        marker = self.get_file_tags("lib", 'goto')["@diagnostics"]
+        marker = self.get_test_tags("lib", 'goto')["@diagnostics"]
 
         # unused variable in lib.sol
         self.expect_diagnostic(reports[1]['diagnostics'][0], code=2072, marker=marker)

From db2b066d40210f4c8fffb91d12b1300e15e0fb5c Mon Sep 17 00:00:00 2001
From: Richie <devtooligan@gmail.com>
Date: Tue, 15 Feb 2022 20:15:12 -0800
Subject: [PATCH 0736/1748] tweak: update maximum line length

---
 docs/style-guide.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 2260a17595..75de18ac09 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -146,8 +146,7 @@ No:
 Maximum Line Length
 ===================
 
-Keeping lines under the `PEP 8 recommendation <https://www.python.org/dev/peps/pep-0008/#maximum-line-length>`_ to a maximum of 79 (or 99)
-characters helps readers easily parse the code.
+Maximum suggested line length is 120 characters.
 
 Wrapped lines should conform to the following guidelines.
 

From c12d15183420075e97fa07fa70b42c8f913660ec Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 11 Jul 2022 15:51:25 +0200
Subject: [PATCH 0737/1748] Only analyze memory in DataFlowAnalyzer if it is
 needed in the optimizer step.

---
 .../CommonSubexpressionEliminator.cpp         |  2 +-
 libyul/optimiser/DataFlowAnalyzer.cpp         | 73 +++++++++++--------
 libyul/optimiser/DataFlowAnalyzer.h           |  4 +
 libyul/optimiser/EqualStoreEliminator.h       |  2 +-
 libyul/optimiser/ExpressionSimplifier.h       |  4 +-
 libyul/optimiser/LoadResolver.h               |  2 +-
 libyul/optimiser/Rematerialiser.cpp           |  2 +-
 libyul/optimiser/Rematerialiser.h             |  2 +-
 libyul/optimiser/StackCompressor.cpp          |  2 +-
 9 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
index d25beb6bdd..d1d482877e 100644
--- a/libyul/optimiser/CommonSubexpressionEliminator.cpp
+++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@@ -48,7 +48,7 @@ CommonSubexpressionEliminator::CommonSubexpressionEliminator(
 	Dialect const& _dialect,
 	map<YulString, SideEffects> _functionSideEffects
 ):
-	DataFlowAnalyzer(_dialect, std::move(_functionSideEffects))
+	DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore, std::move(_functionSideEffects))
 {
 }
 
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 65cdf31c32..7e98fe5178 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -44,47 +44,54 @@ using namespace solidity::yul;
 
 DataFlowAnalyzer::DataFlowAnalyzer(
 	Dialect const& _dialect,
+	MemoryAndStorage _analyzeStores,
 	map<YulString, SideEffects> _functionSideEffects
 ):
 	m_dialect(_dialect),
 	m_functionSideEffects(std::move(_functionSideEffects)),
-	m_knowledgeBase(_dialect, [this](YulString _var) { return variableValue(_var); })
+	m_knowledgeBase(_dialect, [this](YulString _var) { return variableValue(_var); }),
+	m_analyzeStores(_analyzeStores == MemoryAndStorage::Analyze)
 {
-	if (auto const* builtin = _dialect.memoryStoreFunction(YulString{}))
-		m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
-	if (auto const* builtin = _dialect.memoryLoadFunction(YulString{}))
-		m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
-	if (auto const* builtin = _dialect.storageStoreFunction(YulString{}))
-		m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)] = builtin->name;
-	if (auto const* builtin = _dialect.storageLoadFunction(YulString{}))
-		m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)] = builtin->name;
+	if (m_analyzeStores)
+	{
+		if (auto const* builtin = _dialect.memoryStoreFunction(YulString{}))
+			m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
+		if (auto const* builtin = _dialect.memoryLoadFunction(YulString{}))
+			m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)] = builtin->name;
+		if (auto const* builtin = _dialect.storageStoreFunction(YulString{}))
+			m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)] = builtin->name;
+		if (auto const* builtin = _dialect.storageLoadFunction(YulString{}))
+			m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)] = builtin->name;
+	}
 }
 
 void DataFlowAnalyzer::operator()(ExpressionStatement& _statement)
 {
-	if (auto vars = isSimpleStore(StoreLoadLocation::Storage, _statement))
-	{
-		ASTModifier::operator()(_statement);
-		cxx20::erase_if(m_state.storage, mapTuple([&](auto&& key, auto&& value) {
-			return
-				!m_knowledgeBase.knownToBeDifferent(vars->first, key) &&
-				!m_knowledgeBase.knownToBeEqual(vars->second, value);
-		}));
-		m_state.storage[vars->first] = vars->second;
-	}
-	else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, _statement))
+	if (m_analyzeStores)
 	{
-		ASTModifier::operator()(_statement);
-		cxx20::erase_if(m_state.memory, mapTuple([&](auto&& key, auto&& /* value */) {
-			return !m_knowledgeBase.knownToBeDifferentByAtLeast32(vars->first, key);
-		}));
-		m_state.memory[vars->first] = vars->second;
-	}
-	else
-	{
-		clearKnowledgeIfInvalidated(_statement.expression);
-		ASTModifier::operator()(_statement);
+		if (auto vars = isSimpleStore(StoreLoadLocation::Storage, _statement))
+		{
+			ASTModifier::operator()(_statement);
+			cxx20::erase_if(m_state.storage, mapTuple([&](auto&& key, auto&& value) {
+				return
+					!m_knowledgeBase.knownToBeDifferent(vars->first, key) &&
+					!m_knowledgeBase.knownToBeEqual(vars->second, value);
+			}));
+			m_state.storage[vars->first] = vars->second;
+			return;
+		}
+		else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, _statement))
+		{
+			ASTModifier::operator()(_statement);
+			cxx20::erase_if(m_state.memory, mapTuple([&](auto&& key, auto&& /* value */) {
+				return !m_knowledgeBase.knownToBeDifferentByAtLeast32(vars->first, key);
+			}));
+			m_state.memory[vars->first] = vars->second;
+			return;
+		}
 	}
+	clearKnowledgeIfInvalidated(_statement.expression);
+	ASTModifier::operator()(_statement);
 }
 
 void DataFlowAnalyzer::operator()(Assignment& _assignment)
@@ -346,6 +353,8 @@ void DataFlowAnalyzer::assignValue(YulString _variable, Expression const* _value
 
 void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Block const& _block)
 {
+	if (!m_analyzeStores)
+		return;
 	SideEffectsCollector sideEffects(m_dialect, _block, &m_functionSideEffects);
 	if (sideEffects.invalidatesStorage())
 		m_state.storage.clear();
@@ -355,6 +364,8 @@ void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Block const& _block)
 
 void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Expression const& _expr)
 {
+	if (!m_analyzeStores)
+		return;
 	SideEffectsCollector sideEffects(m_dialect, _expr, &m_functionSideEffects);
 	if (sideEffects.invalidatesStorage())
 		m_state.storage.clear();
@@ -367,6 +378,8 @@ void DataFlowAnalyzer::joinKnowledge(
 	unordered_map<YulString, YulString> const& _olderMemory
 )
 {
+	if (!m_analyzeStores)
+		return;
 	joinKnowledgeHelper(m_state.storage, _olderStorage);
 	joinKnowledgeHelper(m_state.memory, _olderMemory);
 }
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index a8463360b1..4a8cc7445d 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -81,12 +81,14 @@ struct AssignedValue
 class DataFlowAnalyzer: public ASTModifier
 {
 public:
+	enum class MemoryAndStorage { Analyze, Ignore };
 	/// @param _functionSideEffects
 	///            Side-effects of user-defined functions. Worst-case side-effects are assumed
 	///            if this is not provided or the function is not found.
 	///            The parameter is mostly used to determine movability of expressions.
 	explicit DataFlowAnalyzer(
 		Dialect const& _dialect,
+		MemoryAndStorage _analyzeStores,
 		std::map<YulString, SideEffects> _functionSideEffects = {}
 	);
 
@@ -189,6 +191,8 @@ class DataFlowAnalyzer: public ASTModifier
 protected:
 	KnowledgeBase m_knowledgeBase;
 
+	/// If true, analyzes memory and storage content via mload/mstore and sload/sstore.
+	bool m_analyzeStores = true;
 	YulString m_storeFunctionName[static_cast<unsigned>(StoreLoadLocation::Last) + 1];
 	YulString m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Last) + 1];
 
diff --git a/libyul/optimiser/EqualStoreEliminator.h b/libyul/optimiser/EqualStoreEliminator.h
index 796fcc5383..b8572f4667 100644
--- a/libyul/optimiser/EqualStoreEliminator.h
+++ b/libyul/optimiser/EqualStoreEliminator.h
@@ -47,7 +47,7 @@ class EqualStoreEliminator: public DataFlowAnalyzer
 		Dialect const& _dialect,
 		std::map<YulString, SideEffects> _functionSideEffects
 	):
-		DataFlowAnalyzer(_dialect, std::move(_functionSideEffects))
+		DataFlowAnalyzer(_dialect, MemoryAndStorage::Analyze, std::move(_functionSideEffects))
 	{}
 
 protected:
diff --git a/libyul/optimiser/ExpressionSimplifier.h b/libyul/optimiser/ExpressionSimplifier.h
index f9d4e8da54..324ff419ad 100644
--- a/libyul/optimiser/ExpressionSimplifier.h
+++ b/libyul/optimiser/ExpressionSimplifier.h
@@ -51,7 +51,9 @@ class ExpressionSimplifier: public DataFlowAnalyzer
 	void visit(Expression& _expression) override;
 
 private:
-	explicit ExpressionSimplifier(Dialect const& _dialect): DataFlowAnalyzer(_dialect) {}
+	explicit ExpressionSimplifier(Dialect const& _dialect):
+		DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore)
+	{}
 };
 
 }
diff --git a/libyul/optimiser/LoadResolver.h b/libyul/optimiser/LoadResolver.h
index 93d37d7799..e56bc6c4a2 100644
--- a/libyul/optimiser/LoadResolver.h
+++ b/libyul/optimiser/LoadResolver.h
@@ -53,7 +53,7 @@ class LoadResolver: public DataFlowAnalyzer
 		bool _containsMSize,
 		std::optional<size_t> _expectedExecutionsPerDeployment
 	):
-		DataFlowAnalyzer(_dialect, std::move(_functionSideEffects)),
+		DataFlowAnalyzer(_dialect, MemoryAndStorage::Analyze, std::move(_functionSideEffects)),
 		m_containsMSize(_containsMSize),
 		m_expectedExecutionsPerDeployment(std::move(_expectedExecutionsPerDeployment))
 	{}
diff --git a/libyul/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp
index 7dff1df80f..fb42e65935 100644
--- a/libyul/optimiser/Rematerialiser.cpp
+++ b/libyul/optimiser/Rematerialiser.cpp
@@ -43,7 +43,7 @@ Rematerialiser::Rematerialiser(
 	set<YulString> _varsToAlwaysRematerialize,
 	bool _onlySelectedVariables
 ):
-	DataFlowAnalyzer(_dialect),
+	DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore),
 	m_referenceCounts(ReferencesCounter::countReferences(_ast)),
 	m_varsToAlwaysRematerialize(std::move(_varsToAlwaysRematerialize)),
 	m_onlySelectedVariables(_onlySelectedVariables)
diff --git a/libyul/optimiser/Rematerialiser.h b/libyul/optimiser/Rematerialiser.h
index 592f79d1be..9ee5209fdf 100644
--- a/libyul/optimiser/Rematerialiser.h
+++ b/libyul/optimiser/Rematerialiser.h
@@ -95,7 +95,7 @@ class LiteralRematerialiser: public DataFlowAnalyzer
 
 private:
 	LiteralRematerialiser(Dialect const& _dialect):
-		DataFlowAnalyzer(_dialect)
+		DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore)
 	{}
 };
 
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index b3402e4d7b..6e33078a0a 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -56,7 +56,7 @@ namespace
 class RematCandidateSelector: public DataFlowAnalyzer
 {
 public:
-	explicit RematCandidateSelector(Dialect const& _dialect): DataFlowAnalyzer(_dialect) {}
+	explicit RematCandidateSelector(Dialect const& _dialect): DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore) {}
 
 	/// @returns a map from function name to rematerialisation costs to a vector of variables to rematerialise
 	/// and variables that occur in their expression.

From 59189556154f8ac9474c696e194c176d6bbc3bd8 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 11 Jul 2022 16:57:08 +0200
Subject: [PATCH 0738/1748] lsp: Fixes lsp.py to not bail out when no response
 is expected.

This is required for another PR to support sending notifications as part of the I/O being documented as comments.
---
 test/lsp.py | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/test/lsp.py b/test/lsp.py
index c3e5dcc9da..a2bf08007a 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -237,8 +237,10 @@ def send_message(self, method_name: str, params: Optional[dict]) -> None:
         self.process.stdin.write(rpc_message.encode("utf-8"))
         self.process.stdin.flush()
 
-    def call_method(self, method_name: str, params: Optional[dict]) -> Any:
+    def call_method(self, method_name: str, params: Optional[dict], expects_response: bool = True) -> Any:
         self.send_message(method_name, params)
+        if not expects_response:
+            return None
         return self.receive_message()
 
     def send_notification(self, name: str, params: Optional[dict] = None) -> None:
@@ -484,6 +486,8 @@ def parseRequestAndResponse(self) -> RequestAndResponse:
             if self.at_end():
                 raise TestParserException(ret, "Request body not found")
 
+        if self.at_end():
+            return self.RequestAndResponse(**ret)
 
         # Parse response header
         if self.current_line().startswith(RESPONSE_START):
@@ -492,8 +496,6 @@ def parseRequestAndResponse(self) -> RequestAndResponse:
                 raise TestParserException(ret, "Response header malformed")
             ret["response"] = self.current_line()[len(RESPONSE_START):] + "\n"
             ret["responseBegin"] = self.position()
-        else:
-            raise TestParserException(ret, "Response header not found")
 
         self.next_line()
 
@@ -568,7 +570,9 @@ def test_diagnostics(self):
 
             # Process diagnostics first
             self.expected_diagnostics = next(self.parsed_testcases)
-            assert isinstance(self.expected_diagnostics, TestParser.Diagnostics) is True
+            assert isinstance(self.expected_diagnostics, TestParser.Diagnostics)
+            if not self.expected_diagnostics.has_header:
+                return
 
             expected_diagnostics_per_file = self.expected_diagnostics.tests
 
@@ -723,7 +727,14 @@ def run_testcase(self, testcase: TestParser.RequestAndResponse):
         if 'textDocument' not in requestBodyJson:
             requestBodyJson['textDocument'] = { 'uri': self.suite.get_test_file_uri(self.test_name, self.sub_dir) }
 
-        actualResponseJson = self.solc.call_method(testcase.method, requestBodyJson)
+        actualResponseJson = self.solc.call_method(
+            testcase.method,
+            requestBodyJson,
+            expects_response=testcase.response is not None
+        )
+
+        if testcase.response is None:
+            return
 
         # simplify response
         if "result" in actualResponseJson:
@@ -1445,8 +1456,11 @@ def test_generic(self, solc: JsonRpcProcess) -> None:
 
         for sub_dir in map(lambda filepath: filepath.name, sub_dirs):
             tests = map(
-                lambda filename, sd=sub_dir: sd + "/" + filename[:-len(".sol")],
-                os.listdir(f"{self.project_root_dir}/{sub_dir}")
+                lambda file_object, sd=sub_dir: sd + "/" + file_object.name[:-len(".sol")],
+                filter(
+                    lambda filepath: filepath.is_file() and filepath.name.endswith('.sol'),
+                    os.scandir(f"{self.project_root_dir}/{sub_dir}")
+                )
             )
 
             tests = map(

From 31227e442e6add02bb87d7911458054540f2c413 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 9 May 2022 17:34:35 +0200
Subject: [PATCH 0739/1748] lsp: Adds support for include paths and have
 {projectUri}/node_modules added by default.

- Factor out FileRepository's path resolving into own public function.
- Fixes sourceUnitNameToUri() path resolving in relation to include paths being used.
- Adding an solAssert().
- adds nother test for include-paths (bad include)
- Fixes a case on Windows there an ill-formed URI was generated.
- Dropping unnecessary if-branch when translating from sourceUnitName to URI.
---
 Changelog.md                                  |   3 +-
 libsolidity/lsp/FileRepository.cpp            | 131 +++++++++++-------
 libsolidity/lsp/FileRepository.h              |   8 +-
 libsolidity/lsp/LanguageServer.cpp            |  26 +++-
 .../lsp/include-paths/default_include.sol     |  14 ++
 .../include-paths/file_at_include_path.sol    |  10 ++
 .../file_not_found_in_searchpath.sol          |  11 ++
 .../lsp/node_modules/my-module/test.sol       |  10 ++
 test/libsolidity/lsp/node_modules/rootlib.sol |   6 +
 test/lsp.py                                   |   2 +-
 10 files changed, 165 insertions(+), 56 deletions(-)
 create mode 100644 test/libsolidity/lsp/include-paths/default_include.sol
 create mode 100644 test/libsolidity/lsp/include-paths/file_at_include_path.sol
 create mode 100644 test/libsolidity/lsp/include-paths/file_not_found_in_searchpath.sol
 create mode 100644 test/libsolidity/lsp/node_modules/my-module/test.sol
 create mode 100644 test/libsolidity/lsp/node_modules/rootlib.sol

diff --git a/Changelog.md b/Changelog.md
index a86643987c..09be3d9e9a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -30,7 +30,8 @@ Compiler Features:
  * LSP: Add rudimentary support for semantic highlighting.
  * Type Checker: Warn about assignments involving multiple pushes to storage ``bytes`` that may invalidate references.
  * Yul Optimizer: Improve inlining heuristics for via IR code generation and pure Yul compilation.
-
+ * Language Server: Always add ``{project_root}/node_modules`` to include search paths.
+ * Language Server: Adds support for configuring ``include-paths`` JSON settings object that can be passed during LSP configuration stage.
 
 Bugfixes:
  * ABI Encoder: When encoding an empty string coming from storage do not add a superfluous empty slot for data.
diff --git a/libsolidity/lsp/FileRepository.cpp b/libsolidity/lsp/FileRepository.cpp
index e823439732..6ba583c3a5 100644
--- a/libsolidity/lsp/FileRepository.cpp
+++ b/libsolidity/lsp/FileRepository.cpp
@@ -22,11 +22,14 @@
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/CommonIO.h>
 
+#include <range/v3/algorithm/none_of.hpp>
 #include <range/v3/range/conversion.hpp>
 #include <range/v3/view/transform.hpp>
 
 #include <regex>
 
+#include <boost/algorithm/string/predicate.hpp>
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::lsp;
@@ -34,25 +37,49 @@ using namespace solidity::frontend;
 
 using solidity::util::readFileAsString;
 using solidity::util::joinHumanReadable;
+using solidity::util::Result;
 
-FileRepository::FileRepository(boost::filesystem::path _basePath): m_basePath(std::move(_basePath))
+FileRepository::FileRepository(boost::filesystem::path _basePath, std::vector<boost::filesystem::path> _includePaths):
+	m_basePath(std::move(_basePath)),
+	m_includePaths(std::move(_includePaths))
 {
 }
 
+void FileRepository::setIncludePaths(std::vector<boost::filesystem::path> _paths)
+{
+	m_includePaths = std::move(_paths);
+}
+
 string FileRepository::sourceUnitNameToUri(string const& _sourceUnitName) const
 {
 	regex const windowsDriveLetterPath("^[a-zA-Z]:/");
 
+	auto const ensurePathIsUnixLike = [&](string inputPath) -> string {
+		if (!regex_search(inputPath, windowsDriveLetterPath))
+			return inputPath;
+		else
+			return "/" + move(inputPath);
+	};
+
 	if (m_sourceUnitNamesToUri.count(_sourceUnitName))
+	{
+		solAssert(boost::starts_with(m_sourceUnitNamesToUri.at(_sourceUnitName), "file://"), "");
 		return m_sourceUnitNamesToUri.at(_sourceUnitName);
+	}
 	else if (_sourceUnitName.find("file://") == 0)
 		return _sourceUnitName;
 	else if (regex_search(_sourceUnitName, windowsDriveLetterPath))
 		return "file:///" + _sourceUnitName;
-	else if (_sourceUnitName.find("/") == 0)
-		return "file://" + _sourceUnitName;
-	else
+	else if (
+		auto const resolvedPath = tryResolvePath(_sourceUnitName);
+		resolvedPath.message().empty()
+	)
+		return "file://" + ensurePathIsUnixLike(resolvedPath.get().generic_string());
+	else if (m_basePath.generic_string() != "/")
 		return "file://" + m_basePath.generic_string() + "/" + _sourceUnitName;
+	else
+		// Avoid double-/ in case base-path itself is simply a UNIX root filesystem root.
+		return "file:///" + _sourceUnitName;
 }
 
 string FileRepository::uriToSourceUnitName(string const& _path) const
@@ -69,6 +96,52 @@ void FileRepository::setSourceByUri(string const& _uri, string _source)
 	m_sourceCodes[sourceUnitName] = std::move(_source);
 }
 
+Result<boost::filesystem::path> FileRepository::tryResolvePath(std::string const& _strippedSourceUnitName) const
+{
+	if (
+		boost::filesystem::path(_strippedSourceUnitName).has_root_path() &&
+		boost::filesystem::exists(_strippedSourceUnitName)
+	)
+		return boost::filesystem::path(_strippedSourceUnitName);
+
+	vector<boost::filesystem::path> candidates;
+	vector<reference_wrapper<boost::filesystem::path const>> prefixes = {m_basePath};
+	prefixes += (m_includePaths | ranges::to<vector<reference_wrapper<boost::filesystem::path const>>>);
+	auto const defaultInclude = m_basePath / "node_modules";
+	if (m_includePaths.empty())
+		prefixes.emplace_back(defaultInclude);
+
+	auto const pathToQuotedString = [](boost::filesystem::path const& _path) { return "\"" + _path.string() + "\""; };
+
+	for (auto const& prefix: prefixes)
+	{
+		boost::filesystem::path canonicalPath = boost::filesystem::path(prefix) / boost::filesystem::path(_strippedSourceUnitName);
+
+		if (boost::filesystem::exists(canonicalPath))
+			candidates.push_back(move(canonicalPath));
+	}
+
+	if (candidates.empty())
+		return Result<boost::filesystem::path>::err(
+			"File not found. Searched the following locations: " +
+			joinHumanReadable(prefixes | ranges::views::transform(pathToQuotedString), ", ") +
+			"."
+		);
+
+	if (candidates.size() >= 2)
+		return Result<boost::filesystem::path>::err(
+			"Ambiguous import. "
+			"Multiple matching files found inside base path and/or include paths: " +
+			joinHumanReadable(candidates | ranges::views::transform(pathToQuotedString), ", ") +
+			"."
+		);
+
+	if (!boost::filesystem::is_regular_file(candidates[0]))
+		return Result<boost::filesystem::path>::err("Not a valid file.");
+
+	return candidates[0];
+}
+
 frontend::ReadCallback::Result FileRepository::readFile(string const& _kind, string const& _sourceUnitName)
 {
 	solAssert(
@@ -83,53 +156,11 @@ frontend::ReadCallback::Result FileRepository::readFile(string const& _kind, str
 			return ReadCallback::Result{true, m_sourceCodes.at(_sourceUnitName)};
 
 		string const strippedSourceUnitName = stripFileUriSchemePrefix(_sourceUnitName);
+		Result<boost::filesystem::path> const resolvedPath = tryResolvePath(strippedSourceUnitName);
+		if (!resolvedPath.message().empty())
+			return ReadCallback::Result{false, resolvedPath.message()};
 
-		if (
-			boost::filesystem::path(strippedSourceUnitName).has_root_path() &&
-			boost::filesystem::exists(strippedSourceUnitName)
-		)
-		{
-			auto contents = readFileAsString(strippedSourceUnitName);
-			solAssert(m_sourceCodes.count(_sourceUnitName) == 0, "");
-			m_sourceCodes[_sourceUnitName] = contents;
-			return ReadCallback::Result{true, move(contents)};
-		}
-
-		vector<boost::filesystem::path> candidates;
-		vector<reference_wrapper<boost::filesystem::path>> prefixes = {m_basePath};
-		prefixes += (m_includePaths | ranges::to<vector<reference_wrapper<boost::filesystem::path>>>);
-
-		auto const pathToQuotedString = [](boost::filesystem::path const& _path) { return "\"" + _path.string() + "\""; };
-
-		for (auto const& prefix: prefixes)
-		{
-			boost::filesystem::path canonicalPath = boost::filesystem::path(prefix) / boost::filesystem::path(strippedSourceUnitName);
-
-			if (boost::filesystem::exists(canonicalPath))
-				candidates.push_back(move(canonicalPath));
-		}
-
-		if (candidates.empty())
-			return ReadCallback::Result{
-				false,
-				"File not found. Searched the following locations: " +
-				joinHumanReadable(prefixes | ranges::views::transform(pathToQuotedString), ", ") +
-				"."
-			};
-
-		if (candidates.size() >= 2)
-			return ReadCallback::Result{
-				false,
-				"Ambiguous import. "
-				"Multiple matching files found inside base path and/or include paths: " +
-				joinHumanReadable(candidates | ranges::views::transform(pathToQuotedString), ", ") +
-				"."
-			};
-
-		if (!boost::filesystem::is_regular_file(candidates[0]))
-			return ReadCallback::Result{false, "Not a valid file."};
-
-		auto contents = readFileAsString(candidates[0]);
+		auto contents = readFileAsString(resolvedPath.get());
 		solAssert(m_sourceCodes.count(_sourceUnitName) == 0, "");
 		m_sourceCodes[_sourceUnitName] = contents;
 		return ReadCallback::Result{true, move(contents)};
diff --git a/libsolidity/lsp/FileRepository.h b/libsolidity/lsp/FileRepository.h
index 52e50b3938..dfd9319383 100644
--- a/libsolidity/lsp/FileRepository.h
+++ b/libsolidity/lsp/FileRepository.h
@@ -18,6 +18,7 @@
 #pragma once
 
 #include <libsolidity/interface/FileReader.h>
+#include <libsolutil/Result.h>
 
 #include <string>
 #include <map>
@@ -28,7 +29,10 @@ namespace solidity::lsp
 class FileRepository
 {
 public:
-	explicit FileRepository(boost::filesystem::path _basePath);
+	FileRepository(boost::filesystem::path _basePath, std::vector<boost::filesystem::path> _includePaths);
+
+	std::vector<boost::filesystem::path> const& includePaths() const noexcept { return m_includePaths; }
+	void setIncludePaths(std::vector<boost::filesystem::path> _paths);
 
 	boost::filesystem::path const& basePath() const { return m_basePath; }
 
@@ -51,6 +55,8 @@ class FileRepository
 		return [this](std::string const& _kind, std::string const& _path) { return readFile(_kind, _path); };
 	}
 
+	util::Result<boost::filesystem::path> tryResolvePath(std::string const& _sourceUnitName) const;
+
 private:
 	/// Base path without URI scheme.
 	boost::filesystem::path m_basePath;
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 685e0c6316..a2ed4688e0 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -130,7 +130,7 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"textDocument/semanticTokens/full", bind(&LanguageServer::semanticTokensFull, this, _1, _2)},
 		{"workspace/didChangeConfiguration", bind(&LanguageServer::handleWorkspaceDidChangeConfiguration, this, _2)},
 	},
-	m_fileRepository("/" /* basePath */),
+	m_fileRepository("/" /* basePath */, {} /* no search paths */),
 	m_compilerStack{m_fileRepository.reader()}
 {
 }
@@ -148,6 +148,26 @@ Json::Value LanguageServer::toJson(SourceLocation const& _location)
 void LanguageServer::changeConfiguration(Json::Value const& _settings)
 {
 	m_settingsObject = _settings;
+	Json::Value jsonIncludePaths = _settings["include-paths"];
+	int typeFailureCount = 0;
+
+	if (jsonIncludePaths && jsonIncludePaths.isArray())
+	{
+		vector<boost::filesystem::path> includePaths;
+		for (Json::Value const& jsonPath: jsonIncludePaths)
+		{
+			if (jsonPath.isString())
+				includePaths.emplace_back(boost::filesystem::path(jsonPath.asString()));
+			else
+				typeFailureCount++;
+		}
+		m_fileRepository.setIncludePaths(move(includePaths));
+	}
+	else
+		++typeFailureCount;
+
+	if (typeFailureCount)
+		m_client.trace("Invalid JSON configuration passed. \"include-paths\" must be an array of strings.");
 }
 
 void LanguageServer::compile()
@@ -155,7 +175,7 @@ void LanguageServer::compile()
 	// For files that are not open, we have to take changes on disk into account,
 	// so we just remove all non-open files.
 
-	FileRepository oldRepository(m_fileRepository.basePath());
+	FileRepository oldRepository(m_fileRepository.basePath(), m_fileRepository.includePaths());
 	swap(oldRepository, m_fileRepository);
 
 	for (string const& fileName: m_openFiles)
@@ -302,7 +322,7 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	else if (Json::Value rootPath = _args["rootPath"])
 		rootPath = rootPath.asString();
 
-	m_fileRepository = FileRepository(rootPath);
+	m_fileRepository = FileRepository(rootPath, {});
 	if (_args["initializationOptions"].isObject())
 		changeConfiguration(_args["initializationOptions"]);
 
diff --git a/test/libsolidity/lsp/include-paths/default_include.sol b/test/libsolidity/lsp/include-paths/default_include.sol
new file mode 100644
index 0000000000..54bc859e05
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths/default_include.sol
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+import "my-module/test.sol";
+
+contract MyContract
+{
+    function f(uint a, uint b) public pure returns (uint)
+    {
+        return MyModule.add(a, b);
+    }
+}
+// ----
+// test:
diff --git a/test/libsolidity/lsp/include-paths/file_at_include_path.sol b/test/libsolidity/lsp/include-paths/file_at_include_path.sol
new file mode 100644
index 0000000000..ec15e1533d
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths/file_at_include_path.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+import "rootlib.sol";
+
+contract MyContract
+{
+}
+// ----
+// rootlib:
diff --git a/test/libsolidity/lsp/include-paths/file_not_found_in_searchpath.sol b/test/libsolidity/lsp/include-paths/file_not_found_in_searchpath.sol
new file mode 100644
index 0000000000..8dcefeca2f
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths/file_not_found_in_searchpath.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+   import "test.sol";
+// ^^^^^^^^^^^^^^^^^^ @IncludeLocation
+
+contract SomeContract
+{
+}
+// ----
+// file_not_found_in_searchpath: @IncludeLocation 6275
diff --git a/test/libsolidity/lsp/node_modules/my-module/test.sol b/test/libsolidity/lsp/node_modules/my-module/test.sol
new file mode 100644
index 0000000000..dffcb719f5
--- /dev/null
+++ b/test/libsolidity/lsp/node_modules/my-module/test.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+library MyModule
+{
+    function add(uint a, uint b) public pure returns (uint)
+    {
+        return a + b;
+    }
+}
diff --git a/test/libsolidity/lsp/node_modules/rootlib.sol b/test/libsolidity/lsp/node_modules/rootlib.sol
new file mode 100644
index 0000000000..cbcf206a06
--- /dev/null
+++ b/test/libsolidity/lsp/node_modules/rootlib.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+library MyRootLib
+{
+}
diff --git a/test/lsp.py b/test/lsp.py
index a2bf08007a..48c2a54147 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -1450,7 +1450,7 @@ def test_generic(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
 
         sub_dirs = filter(
-            lambda filepath: filepath.is_dir(),
+            lambda filepath: filepath.is_dir() and filepath.name != 'node_modules',
             os.scandir(self.project_root_dir)
         )
 

From d89008da0a49456c5bfc0a48240c9a1d074ecbcf Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 11 Jul 2022 13:30:04 +0200
Subject: [PATCH 0740/1748] lsp: Adding test for custom include paths.

---
 .../include-paths/using-custom-includes.sol   | 11 ++++++++
 .../other-include-dir/otherlib/otherlib.sol   |  7 +++++
 test/lsp.py                                   | 28 +++++++++++++++++++
 3 files changed, 46 insertions(+)
 create mode 100644 test/libsolidity/lsp/include-paths/using-custom-includes.sol
 create mode 100644 test/libsolidity/lsp/other-include-dir/otherlib/otherlib.sol

diff --git a/test/libsolidity/lsp/include-paths/using-custom-includes.sol b/test/libsolidity/lsp/include-paths/using-custom-includes.sol
new file mode 100644
index 0000000000..2e2560d0d7
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths/using-custom-includes.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+   import "otherlib/otherlib.sol";
+// ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @NotFound
+
+contract MyContract
+{
+}
+// ----
+// using-custom-includes: @NotFound 6275
diff --git a/test/libsolidity/lsp/other-include-dir/otherlib/otherlib.sol b/test/libsolidity/lsp/other-include-dir/otherlib/otherlib.sol
new file mode 100644
index 0000000000..20a981ff9f
--- /dev/null
+++ b/test/libsolidity/lsp/other-include-dir/otherlib/otherlib.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+library OtherLib
+{
+    function f(uint n) public returns (uint) { return n + 1; }
+}
diff --git a/test/lsp.py b/test/lsp.py
index 48c2a54147..f4c428bafa 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -1381,6 +1381,34 @@ def get_test_tags(self, test_name: TestName, sub_dir=None, verbose=False):
         return markers
 
 
+    def test_custom_includes(self, solc: JsonRpcProcess) -> None:
+        self.setup_lsp(solc, expose_project_root=False)
+        solc.send_notification(
+            'workspace/didChangeConfiguration', {
+                'settings': {
+                    'include-paths': [
+                        f"{self.project_root_dir}/other-include-dir"
+                    ]
+                }
+            }
+        )
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, 'include-paths/using-custom-includes')
+
+        self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
+
+        # test file
+        report = published_diagnostics[0]
+        self.expect_equal(report['uri'], self.get_test_file_uri('using-custom-includes', 'include-paths'))
+        diagnostics = report['diagnostics']
+        self.expect_equal(len(diagnostics), 0, "no diagnostics")
+
+        # imported file
+        report = published_diagnostics[1]
+        self.expect_equal(report['uri'], f"{self.project_root_uri}/other-include-dir/otherlib/otherlib.sol")
+        diagnostics = report['diagnostics']
+        self.expect_equal(len(diagnostics), 1, "no diagnostics")
+        self.expect_diagnostic(diagnostics[0], code=2018, lineNo=5, startEndColumns=(4, 62))
+
     def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
         # Reusing another test but now change some file that generates an error in the other.
         self.test_textDocument_didOpen_with_relative_import(solc)

From 5567e30196cd4376574e15ee63e01aee840e7c43 Mon Sep 17 00:00:00 2001
From: maxisch <maximiliano.schultheis@gmail.com>
Date: Wed, 13 Jul 2022 09:02:29 -0300
Subject: [PATCH 0741/1748] Modular Contracts typo fix

---
 docs/examples/modular.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/modular.rst b/docs/examples/modular.rst
index 7903ae27fd..697699ae6e 100644
--- a/docs/examples/modular.rst
+++ b/docs/examples/modular.rst
@@ -7,7 +7,7 @@ Modular Contracts
 A modular approach to building your contracts helps you reduce the complexity
 and improve the readability which will help to identify bugs and vulnerabilities
 during development and code review.
-If you specify and control the behaviour or each module in isolation, the
+If you specify and control the behaviour of each module in isolation, the
 interactions you have to consider are only those between the module specifications
 and not every other moving part of the contract.
 In the example below, the contract uses the ``move`` method

From eb5a33273ef9358d0d62ea9798ee3a718abafded Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 13 Jul 2022 16:29:33 +0200
Subject: [PATCH 0742/1748] lsp: Fixes initialization phase if `include-paths`
 was not set at all, then also no error should be generated.

---
 libsolidity/lsp/LanguageServer.cpp | 31 ++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index a2ed4688e0..762a698a6b 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -149,25 +149,28 @@ void LanguageServer::changeConfiguration(Json::Value const& _settings)
 {
 	m_settingsObject = _settings;
 	Json::Value jsonIncludePaths = _settings["include-paths"];
-	int typeFailureCount = 0;
 
-	if (jsonIncludePaths && jsonIncludePaths.isArray())
+	if (jsonIncludePaths)
 	{
-		vector<boost::filesystem::path> includePaths;
-		for (Json::Value const& jsonPath: jsonIncludePaths)
+		int typeFailureCount = 0;
+		if (jsonIncludePaths.isArray())
 		{
-			if (jsonPath.isString())
-				includePaths.emplace_back(boost::filesystem::path(jsonPath.asString()));
-			else
-				typeFailureCount++;
+			vector<boost::filesystem::path> includePaths;
+			for (Json::Value const& jsonPath: jsonIncludePaths)
+			{
+				if (jsonPath.isString())
+					includePaths.emplace_back(boost::filesystem::path(jsonPath.asString()));
+				else
+					typeFailureCount++;
+			}
+			m_fileRepository.setIncludePaths(move(includePaths));
 		}
-		m_fileRepository.setIncludePaths(move(includePaths));
-	}
-	else
-		++typeFailureCount;
+		else
+			++typeFailureCount;
 
-	if (typeFailureCount)
-		m_client.trace("Invalid JSON configuration passed. \"include-paths\" must be an array of strings.");
+		if (typeFailureCount)
+			m_client.trace("Invalid JSON configuration passed. \"include-paths\" must be an array of strings.");
+	}
 }
 
 void LanguageServer::compile()

From 5aeb80ec3c254e6e6fb2025d8c745b4856b9fe68 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 13 Jul 2022 15:46:49 +0200
Subject: [PATCH 0743/1748] lsp.py: Pass trace option during initialization
 already.

---
 libsolidity/lsp/LanguageServer.cpp | 10 ++++++----
 test/lsp.py                        |  7 +++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 762a698a6b..5465406c0b 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -119,7 +119,7 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"exit", [this](auto, auto) { m_state = (m_state == State::ShutdownRequested ? State::ExitRequested : State::ExitWithoutShutdown); }},
 		{"initialize", bind(&LanguageServer::handleInitialize, this, _1, _2)},
 		{"initialized", [](auto, auto) {}},
-		{"$/setTrace", bind(&LanguageServer::setTrace, this, _2)},
+		{"$/setTrace", [this](auto, Json::Value const& args) { setTrace(args["value"]); }},
 		{"shutdown", [this](auto, auto) { m_state = State::ShutdownRequested; }},
 		{"textDocument/definition", GotoDefinition(*this) },
 		{"textDocument/didOpen", bind(&LanguageServer::handleTextDocumentDidOpen, this, _2)},
@@ -325,6 +325,9 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	else if (Json::Value rootPath = _args["rootPath"])
 		rootPath = rootPath.asString();
 
+	if (_args["trace"])
+		setTrace(_args["trace"]);
+
 	m_fileRepository = FileRepository(rootPath, {});
 	if (_args["initializationOptions"].isObject())
 		changeConfiguration(_args["initializationOptions"]);
@@ -341,7 +344,6 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	replyArgs["capabilities"]["semanticTokensProvider"]["full"] = true; // XOR requests.full.delta = true
 	replyArgs["capabilities"]["renameProvider"] = true;
 
-
 	m_client.reply(_id, move(replyArgs));
 }
 
@@ -372,11 +374,11 @@ void LanguageServer::handleWorkspaceDidChangeConfiguration(Json::Value const& _a
 
 void LanguageServer::setTrace(Json::Value const& _args)
 {
-	if (!_args["value"].isString())
+	if (!_args.isString())
 		// Simply ignore invalid parameter.
 		return;
 
-	string const stringValue = _args["value"].asString();
+	string const stringValue = _args.asString();
 	if (stringValue == "off")
 		m_client.setTrace(TraceValue::Off);
 	else if (stringValue == "messages")
diff --git a/test/lsp.py b/test/lsp.py
index f4c428bafa..543a7ca433 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -906,7 +906,9 @@ def setup_lsp(self, lsp: JsonRpcProcess, expose_project_root=True):
         params = {
             'processId': None,
             'rootUri': self.project_root_uri,
-            'trace': 'off',
+            # Enable traces to receive the amount of expected diagnostics before
+            # actually receiving them.
+            'trace': 'messages',
             'initializationOptions': {},
             'capabilities': {
                 'textDocument': {
@@ -925,9 +927,6 @@ def setup_lsp(self, lsp: JsonRpcProcess, expose_project_root=True):
             params['rootUri'] = None
         lsp.call_method('initialize', params)
         lsp.send_notification('initialized')
-        # Enable traces to receive the amount of expected diagnostics before
-        # actually receiving them.
-        lsp.send_message("$/setTrace", { 'value': 'messages' })
 
     # {{{ helpers
     def get_test_file_path(self, test_case_name, sub_dir=None):

From e2675002caf1570729d5e0d5e0c48fc831157675 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 14 Jul 2022 16:24:10 +0200
Subject: [PATCH 0744/1748] Settings struct for name resolution.

---
 libsolidity/analysis/DeclarationContainer.cpp | 19 +++++------
 libsolidity/analysis/DeclarationContainer.h   | 32 ++++++++++++-------
 libsolidity/analysis/NameAndTypeResolver.cpp  | 22 +++++++------
 3 files changed, 42 insertions(+), 31 deletions(-)

diff --git a/libsolidity/analysis/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp
index 7ca134c5d5..6d13243af4 100644
--- a/libsolidity/analysis/DeclarationContainer.cpp
+++ b/libsolidity/analysis/DeclarationContainer.cpp
@@ -144,9 +144,7 @@ bool DeclarationContainer::registerDeclaration(
 
 vector<Declaration const*> DeclarationContainer::resolveName(
 	ASTString const& _name,
-	bool _recursive,
-	bool _alsoInvisible,
-	bool _onlyVisibleAsUnqualifiedNames
+	ResolvingSettings _settings
 ) const
 {
 	solAssert(!_name.empty(), "Attempt to resolve empty name.");
@@ -154,22 +152,22 @@ vector<Declaration const*> DeclarationContainer::resolveName(
 
 	if (m_declarations.count(_name))
 	{
-		if (_onlyVisibleAsUnqualifiedNames)
+		if (_settings.onlyVisibleAsUnqualifiedNames)
 			result += m_declarations.at(_name) | ranges::views::filter(&Declaration::isVisibleAsUnqualifiedName) | ranges::to_vector;
 		else
 			result += m_declarations.at(_name);
 	}
 
-	if (_alsoInvisible && m_invisibleDeclarations.count(_name))
+	if (_settings.alsoInvisible && m_invisibleDeclarations.count(_name))
 	{
-		if (_onlyVisibleAsUnqualifiedNames)
+		if (_settings.onlyVisibleAsUnqualifiedNames)
 			result += m_invisibleDeclarations.at(_name) | ranges::views::filter(&Declaration::isVisibleAsUnqualifiedName) | ranges::to_vector;
 		else
 			result += m_invisibleDeclarations.at(_name);
 	}
 
-	if (result.empty() && _recursive && m_enclosingContainer)
-		result = m_enclosingContainer->resolveName(_name, true, _alsoInvisible, _onlyVisibleAsUnqualifiedNames);
+	if (result.empty() && _settings.recursive && m_enclosingContainer)
+		result = m_enclosingContainer->resolveName(_name, _settings);
 
 	return result;
 }
@@ -209,7 +207,10 @@ void DeclarationContainer::populateHomonyms(back_insert_iterator<Homonyms> _it)
 
 	for (auto [name, location]: m_homonymCandidates)
 	{
-		vector<Declaration const*> const& declarations = m_enclosingContainer->resolveName(name, true, true);
+		ResolvingSettings settings;
+		settings.recursive = true;
+		settings.alsoInvisible = true;
+		vector<Declaration const*> const& declarations = m_enclosingContainer->resolveName(name, move(settings));
 		if (!declarations.empty())
 			_it = make_pair(location, declarations);
 	}
diff --git a/libsolidity/analysis/DeclarationContainer.h b/libsolidity/analysis/DeclarationContainer.h
index 2dbed0098a..279ee18069 100644
--- a/libsolidity/analysis/DeclarationContainer.h
+++ b/libsolidity/analysis/DeclarationContainer.h
@@ -27,9 +27,27 @@
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/SourceLocation.h>
 
+#include <memory>
+
 namespace solidity::frontend
 {
 
+/**
+ * Settings for how the function DeclarationContainer::resolveName operates.
+ */
+struct ResolvingSettings
+{
+	/// if true and there are no matching declarations in the current container,
+	/// recursively searches the enclosing containers as well.
+	bool recursive = false;
+	/// if true, include invisible declaration in the results.
+	bool alsoInvisible = false;
+	/// if true, do not include declarations which can never actually be referenced using their
+	/// name alone (without being qualified with the name of scope in which they are declared).
+	bool onlyVisibleAsUnqualifiedNames = false;
+};
+
+
 /**
  * Container that stores mappings between names and declarations. It also contains a link to the
  * enclosing scope.
@@ -58,18 +76,8 @@ class DeclarationContainer
 
 	/// Finds all declarations that in the current scope can be referred to using specified name.
 	/// @param _name the name to look for.
-	/// @param _recursive if true and there are no matching declarations in the current container,
-	///        recursively searches the enclosing containers as well.
-	/// @param _alsoInvisible if true, include invisible declaration in the results.
-	/// @param _onlyVisibleAsUnqualifiedNames if true, do not include declarations which can never
-	///        actually be referenced using their name alone (without being qualified with the name
-	///        of scope in which they are declared).
-	std::vector<Declaration const*> resolveName(
-		ASTString const& _name,
-		bool _recursive = false,
-		bool _alsoInvisible = false,
-		bool _onlyVisibleAsUnqualifiedNames = false
-	) const;
+	/// @param _settings see ResolvingSettings
+	std::vector<Declaration const*> resolveName(ASTString const& _name, ResolvingSettings _settings = ResolvingSettings{}) const;
 	ASTNode const* enclosingNode() const { return m_enclosingNode; }
 	DeclarationContainer const* enclosingContainer() const { return m_enclosingContainer; }
 	std::map<ASTString, std::vector<Declaration const*>> const& declarations() const { return m_declarations; }
diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index 239aadf45f..63a19a4cb9 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -83,7 +83,7 @@ bool NameAndTypeResolver::performImports(SourceUnit& _sourceUnit, map<string, So
 			if (!imp->symbolAliases().empty())
 				for (auto const& alias: imp->symbolAliases())
 				{
-					auto declarations = scope->second->resolveName(alias.symbol->name(), false);
+					auto declarations = scope->second->resolveName(alias.symbol->name());
 					if (declarations.empty())
 					{
 						m_errorReporter.declarationError(
@@ -176,12 +176,15 @@ vector<Declaration const*> NameAndTypeResolver::resolveName(ASTString const& _na
 	auto iterator = m_scopes.find(_scope);
 	if (iterator == end(m_scopes))
 		return vector<Declaration const*>({});
-	return iterator->second->resolveName(_name, false);
+	return iterator->second->resolveName(_name);
 }
 
 vector<Declaration const*> NameAndTypeResolver::nameFromCurrentScope(ASTString const& _name, bool _includeInvisibles) const
 {
-	return m_currentScope->resolveName(_name, true, _includeInvisibles);
+	ResolvingSettings settings;
+	settings.recursive = true;
+	settings.alsoInvisible = _includeInvisibles;
+	return m_currentScope->resolveName(_name, move(settings));
 }
 
 Declaration const* NameAndTypeResolver::pathFromCurrentScope(vector<ASTString> const& _path) const
@@ -197,12 +200,11 @@ std::vector<Declaration const*> NameAndTypeResolver::pathFromCurrentScopeWithAll
 	solAssert(!_path.empty(), "");
 	vector<Declaration const*> pathDeclarations;
 
-	vector<Declaration const*> candidates = m_currentScope->resolveName(
-		_path.front(),
-		/* _recursive */ true,
-		/* _alsoInvisible */ false,
-		/* _onlyVisibleAsUnqualifiedNames */ true
-	);
+	ResolvingSettings settings;
+	settings.recursive = true;
+	settings.alsoInvisible = false;
+	settings.onlyVisibleAsUnqualifiedNames = true;
+	vector<Declaration const*> candidates = m_currentScope->resolveName(_path.front(), move(settings));
 
 	for (size_t i = 1; i < _path.size() && candidates.size() == 1; i++)
 	{
@@ -211,7 +213,7 @@ std::vector<Declaration const*> NameAndTypeResolver::pathFromCurrentScopeWithAll
 
 		pathDeclarations.push_back(candidates.front());
 
-		candidates = m_scopes.at(candidates.front())->resolveName(_path[i], false);
+		candidates = m_scopes.at(candidates.front())->resolveName(_path[i]);
 	}
 	if (candidates.size() == 1)
 	{

From ac5c26bbe9f740885e87e9e096a1d7966eece2df Mon Sep 17 00:00:00 2001
From: CJ42 <cavallerajean@gmail.com>
Date: Mon, 13 Jun 2022 02:52:06 +0200
Subject: [PATCH 0745/1748] docs: specifiy memory-safe in inline assembly is
 available since 0.8.13

---
 docs/assembly.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index 6ebffd1645..7b17c2e87a 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -364,8 +364,9 @@ in memory is automatically considered memory-safe and does not need to be annota
     an assembly block as memory-safe, but violate one of the memory assumptions, this **will** lead to incorrect and
     undefined behaviour that cannot easily be discovered by testing.
 
+The annotation was introduced in version 0.8.13 and is not supported by older compilers.
 In case you are developing a library that is meant to be compatible across multiple versions
-of solidity, you can use a special comment to annotate an assembly block as memory-safe:
+of Solidity, you can use a special Natspec comment that has the same effect but is ignored in older versions:
 
 .. code-block:: solidity
 

From b828da248f90951bf50d7468f57d46b88a74ef8f Mon Sep 17 00:00:00 2001
From: AN <108299225+krakxn@users.noreply.github.com>
Date: Sat, 23 Jul 2022 21:21:28 +0530
Subject: [PATCH 0746/1748] Grammatical fixes

---
 docs/assembly.rst | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index 7b17c2e87a..6ad9ebdad7 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -8,7 +8,7 @@ Inline Assembly
 
 
 You can interleave Solidity statements with inline assembly in a language close
-to the one of the Ethereum virtual machine. This gives you more fine-grained control,
+to the one of the Ethereum Virtual Machine. This gives you more fine-grained control,
 which is especially useful when you are enhancing the language by writing libraries.
 
 The language used for inline assembly in Solidity is called :ref:`Yul <yul>`
@@ -126,15 +126,15 @@ You can access Solidity variables and other identifiers by using their name.
 Local variables of value type are directly usable in inline assembly.
 They can both be read and assigned to.
 
-Local variables that refer to memory evaluate to the address of the variable in memory not the value itself.
+Local variables that refer to memory evaluate to the address of the variable in memory, not the value itself.
 Such variables can also be assigned to, but note that an assignment will only change the pointer and not the data
 and that it is your responsibility to respect Solidity's memory management.
 See :ref:`Conventions in Solidity <conventions-in-solidity>`.
 
 Similarly, local variables that refer to statically-sized calldata arrays or calldata structs
 evaluate to the address of the variable in calldata, not the value itself.
-The variable can also be assigned a new offset, but note that no validation to ensure that
-the variable will not point beyond ``calldatasize()`` is performed.
+The variable can also be assigned a new offset, but note that no validation is performed to ensure that
+the variable will not point beyond ``calldatasize()``.
 
 For external function pointers the address and the function selector can be
 accessed using ``x.address`` and ``x.selector``.
@@ -205,7 +205,7 @@ Local Solidity variables are available for assignments, for example:
     ``assembly { signextend(<num_bytes_of_x_minus_one>, x) }``
 
 
-Since Solidity 0.6.0 the name of a inline assembly variable may not
+Since Solidity 0.6.0, the name of a inline assembly variable may not
 shadow any declaration visible in the scope of the inline assembly block
 (including variable, contract and function declarations).
 
@@ -253,7 +253,7 @@ starting from where this pointer points at and update it.
 There is no guarantee that the memory has not been used before and thus
 you cannot assume that its contents are zero bytes.
 There is no built-in mechanism to release or free allocated memory.
-Here is an assembly snippet you can use for allocating memory that follows the process outlined above
+Here is an assembly snippet you can use for allocating memory that follows the process outlined above:
 
 .. code-block:: yul
 
@@ -276,7 +276,7 @@ first slot of the array and followed by the array elements.
 
 .. warning::
     Statically-sized memory arrays do not have a length field, but it might be added later
-    to allow better convertibility between statically- and dynamically-sized arrays, so
+    to allow better convertibility between statically and dynamically-sized arrays; so,
     do not rely on this.
 
 Memory Safety
@@ -290,7 +290,7 @@ perform additional memory optimizations, if it can rely on certain assumptions a
 While we recommend to always respect Solidity's memory model, inline assembly allows you to use memory
 in an incompatible way. Therefore, moving stack variables to memory and additional memory optimizations are,
 by default, disabled in the presence of any inline assembly block that contains a memory operation or assigns
-to solidity variables in memory.
+to Solidity variables in memory.
 
 However, you can specifically annotate an assembly block to indicate that it in fact respects Solidity's memory
 model as follows:
@@ -346,7 +346,7 @@ If the memory operations use a length of zero, it is also fine to just use any o
     }
 
 Note that not only memory operations in inline assembly itself can be memory-unsafe, but also assignments to
-solidity variables of reference type in memory. For example the following is not memory-safe:
+Solidity variables of reference type in memory. For example the following is not memory-safe:
 
 .. code-block:: solidity
 
@@ -356,7 +356,7 @@ solidity variables of reference type in memory. For example the following is not
     }
     x[0x20] = 0x42;
 
-Inline assembly that neither involves any operations that access memory nor assigns to any solidity variables
+Inline assembly that neither involves any operations that access memory nor assigns to any Solidity variables
 in memory is automatically considered memory-safe and does not need to be annotated.
 
 .. warning::
@@ -364,9 +364,8 @@ in memory is automatically considered memory-safe and does not need to be annota
     an assembly block as memory-safe, but violate one of the memory assumptions, this **will** lead to incorrect and
     undefined behaviour that cannot easily be discovered by testing.
 
-The annotation was introduced in version 0.8.13 and is not supported by older compilers.
 In case you are developing a library that is meant to be compatible across multiple versions
-of Solidity, you can use a special Natspec comment that has the same effect but is ignored in older versions:
+of Solidity, you can use a special comment to annotate an assembly block as memory-safe:
 
 .. code-block:: solidity
 
@@ -375,5 +374,5 @@ of Solidity, you can use a special Natspec comment that has the same effect but
         ...
     }
 
-Note that we will disallow the annotation via comment in a future breaking release, so if you are not concerned with
+Note that we will disallow the annotation via comment in a future breaking release; so, if you are not concerned with
 backwards-compatibility with older compiler versions, prefer using the dialect string.

From 98833b267fba527b1533ff9cbce908c24a6271af Mon Sep 17 00:00:00 2001
From: minami <minaminaoy@gmail.com>
Date: Mon, 25 Jul 2022 04:26:45 +0900
Subject: [PATCH 0747/1748] Fix dark mode bug

---
 docs/_static/js/toggle.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/_static/js/toggle.js b/docs/_static/js/toggle.js
index f46a3a6662..780ea9ee71 100644
--- a/docs/_static/js/toggle.js
+++ b/docs/_static/js/toggle.js
@@ -4,15 +4,16 @@ document.addEventListener('DOMContentLoaded', function() {
         var mode = (isDay ? "Day" : "Night");
         localStorage.setItem("css-mode", mode);
 
-        var daysheet = $('link[href="_static/pygments.css"]')[0].sheet;
+        var url_root = DOCUMENTATION_OPTIONS.URL_ROOT == "./" ? "" : DOCUMENTATION_OPTIONS.URL_ROOT;
+        var daysheet = $(`link[href="${url_root}_static/pygments.css"]`)[0].sheet;
         daysheet.disabled = !isDay;
 
-        var nightsheet = $('link[href="_static/css/dark.css"]')[0];
+        var nightsheet = $(`link[href="${url_root}_static/css/dark.css"]`)[0];
         if (!isDay && nightsheet === undefined) {
             var element = document.createElement("link");
             element.setAttribute("rel", "stylesheet");
             element.setAttribute("type", "text/css");
-            element.setAttribute("href", "_static/css/dark.css");
+            element.setAttribute("href", `${url_root}_static/css/dark.css`);
             document.getElementsByTagName("head")[0].appendChild(element);
             return;
         }

From 5072472917d587d0f18cc5c4ab193aa6fd29ec51 Mon Sep 17 00:00:00 2001
From: Duc Thanh Nguyen <ng.duc.tahn@gmail.com>
Date: Sun, 17 Jul 2022 01:00:12 -0400
Subject: [PATCH 0748/1748] Fix abi.encodeCall checks

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/TypeChecker.cpp          | 42 +++++++++++++------
 .../abi_encodeCall_error_free_function.sol    |  7 ++++
 .../abi_encodeCall_event_free_function.sol    |  9 ++++
 .../abiEncoder/abi_encodeCall_free_func.sol   |  7 ++++
 ...bi_encodeCall_on_lib_func_in_free_func.sol |  9 ++++
 6 files changed, 63 insertions(+), 12 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_error_free_function.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_event_free_function.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_free_func.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_on_lib_func_in_free_func.sol

diff --git a/Changelog.md b/Changelog.md
index 09be3d9e9a..a39c1cabd3 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@ Compiler Features:
 
 Bugfixes:
  * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
+ * Type Checker: Fix null dereference in `abi.encodeCall` type checking of free function.
 
 
 ### 0.8.15 (2022-06-15)
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 90359c4592..e2c8c52f79 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -2195,14 +2195,28 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 	)
 	{
 		string msg = "Expected regular external function type, or external view on public function.";
-		if (externalFunctionType->kind() == FunctionType::Kind::Internal)
-			msg += " Provided internal function.";
-		else if (externalFunctionType->kind() == FunctionType::Kind::DelegateCall)
-			msg += " Cannot use library functions for abi.encodeCall.";
-		else if (externalFunctionType->kind() == FunctionType::Kind::Creation)
-			msg += " Provided creation function.";
-		else
-			msg += " Cannot use special function.";
+
+		switch (externalFunctionType->kind())
+		{
+			case FunctionType::Kind::Internal:
+				msg += " Provided internal function.";
+				break;
+			case FunctionType::Kind::DelegateCall:
+				msg += " Cannot use library functions for abi.encodeCall.";
+				break;
+			case FunctionType::Kind::Creation:
+				msg += " Provided creation function.";
+				break;
+			case FunctionType::Kind::Event:
+				msg += " Cannot use events for abi.encodeCall.";
+				break;
+			case FunctionType::Kind::Error:
+				msg += " Cannot use errors for abi.encodeCall.";
+				break;
+			default:
+				msg += " Cannot use special function.";
+		}
+
 		SecondarySourceLocation ssl{};
 
 		if (externalFunctionType->hasDeclaration())
@@ -2213,10 +2227,14 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 				externalFunctionType->declaration().scope() == m_currentContract
 			)
 				msg += " Did you forget to prefix \"this.\"?";
-			else if (util::contains(
-				m_currentContract->annotation().linearizedBaseContracts,
-				externalFunctionType->declaration().scope()
-			) && externalFunctionType->declaration().scope() != m_currentContract)
+			else if (
+				m_currentContract &&
+				externalFunctionType->declaration().scope() != m_currentContract &&
+				util::contains(
+					m_currentContract->annotation().linearizedBaseContracts,
+					externalFunctionType->declaration().scope()
+				)
+			)
 				msg += " Functions from base contracts have to be external.";
 		}
 
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_error_free_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_error_free_function.sol
new file mode 100644
index 0000000000..c59b1b3f7f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_error_free_function.sol
@@ -0,0 +1,7 @@
+error E(uint);
+
+function f() {
+    abi.encodeCall(E, (1));
+}
+// ----
+// TypeError 3509: (50-51): Expected regular external function type, or external view on public function. Cannot use errors for abi.encodeCall.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_event_free_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_event_free_function.sol
new file mode 100644
index 0000000000..39930125bc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_event_free_function.sol
@@ -0,0 +1,9 @@
+library L {
+    event E(uint);
+}
+
+function f() {
+    abi.encodeCall(L.E, (1));
+}
+// ----
+// TypeError 3509: (68-71): Expected regular external function type, or external view on public function. Cannot use events for abi.encodeCall.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_free_func.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_free_func.sol
new file mode 100644
index 0000000000..5567810f42
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_free_func.sol
@@ -0,0 +1,7 @@
+function g(uint) {}
+
+function f() {
+    abi.encodeCall(g, (1));
+}
+// ----
+// TypeError 3509: (55-56): Expected regular external function type, or external view on public function. Provided internal function.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_on_lib_func_in_free_func.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_on_lib_func_in_free_func.sol
new file mode 100644
index 0000000000..ed2e02a11b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_on_lib_func_in_free_func.sol
@@ -0,0 +1,9 @@
+library L {
+    function g() external {}
+}
+
+function f() {
+    abi.encodeCall(L.g, (1));
+}
+// ----
+// TypeError 3509: (78-81): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.

From 991174074e5c66d9496932af7cfd291f1f21433b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?AN=20=E2=9D=A6?= <108299225+krakxn@users.noreply.github.com>
Date: Mon, 25 Jul 2022 23:36:36 +0530
Subject: [PATCH 0749/1748] Minor grammar fixes

---
 docs/contributing.rst | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index cd494e00eb..ceb0b44ed3 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -2,7 +2,7 @@
 Contributing
 ############
 
-Help is always welcome and there are plenty of options how you can contribute to Solidity.
+Help is always welcome and there are plenty of options to contribute to Solidity.
 
 In particular, we appreciate support in the following areas:
 
@@ -22,7 +22,7 @@ To get started, you can try :ref:`building-from-source` in order to familiarize
 yourself with the components of Solidity and the build process. Also, it may be
 useful to become well-versed at writing smart-contracts in Solidity.
 
-Please note that this project is released with a `Contributor Code of Conduct <https://raw.githubusercontent.com/ethereum/solidity/develop/CODE_OF_CONDUCT.md>`_. By participating in this project - in the issues, pull requests, or Gitter channels - you agree to abide by its terms.
+Please note that this project is released with a `Contributor Code of Conduct <https://raw.githubusercontent.com/ethereum/solidity/develop/CODE_OF_CONDUCT.md>`_. By participating in this project — in the issues, pull requests, or Gitter channels — you agree to abide by its terms.
 
 Team Calls
 ==========
@@ -49,7 +49,7 @@ reporting issues, please mention the following details:
 * Actual vs. expected behaviour.
 
 Reducing the source code that caused the issue to a bare minimum is always
-very helpful and sometimes even clarifies a misunderstanding.
+very helpful, and sometimes even clarifies a misunderstanding.
 
 Workflow for Pull Requests
 ==========================
@@ -67,7 +67,7 @@ Additionally, if you are writing a new feature, please ensure you add appropriat
 test cases under ``test/`` (see below).
 
 However, if you are making a larger change, please consult with the `Solidity Development Gitter channel
-<https://gitter.im/ethereum/solidity-dev>`_ (different from the one mentioned above, this one is
+<https://gitter.im/ethereum/solidity-dev>`_ (different from the one mentioned above — this one is
 focused on compiler and language development instead of language usage) first.
 
 New features and bugfixes should be added to the ``Changelog.md`` file: please
@@ -91,10 +91,10 @@ dependencies (`evmone <https://github.com/ethereum/evmone/releases>`_,
 `libz3 <https://github.com/Z3Prover/z3>`_, and
 `libhera <https://github.com/ewasm/hera>`_).
 
-On macOS some of the testing scripts expect GNU coreutils to be installed.
+On macOS systems, some of the testing scripts expect GNU coreutils to be installed.
 This can be easiest accomplished using Homebrew: ``brew install coreutils``.
 
-On Windows systems make sure that you have a privilege to create symlinks,
+On Windows systems, make sure that you have a privilege to create symlinks,
 otherwise several tests may fail.
 Administrators should have that privilege, but you may also
 `grant it to other users <https://docs.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/create-symbolic-links#policy-management>`_
@@ -117,7 +117,7 @@ The test system automatically tries to discover the location of
 the `evmone <https://github.com/ethereum/evmone/releases>`_ for running the semantic tests.
 
 The ``evmone`` library must be located in the ``deps`` or ``deps/lib`` directory relative to the
-current working directory, to its parent or its parent's parent. Alternatively an explicit location
+current working directory, to its parent or its parent's parent. Alternatively, an explicit location
 for the ``evmone`` shared object can be specified via the ``ETH_EVMONE`` environment variable.
 
 ``evmone`` is needed mainly for running semantic and gas tests.
@@ -292,7 +292,7 @@ Next, build Solidity (or just the ``solfuzzer`` binary) with AFL as your compile
     cmake .. -DCMAKE_C_COMPILER=path/to/afl-gcc -DCMAKE_CXX_COMPILER=path/to/afl-g++
     make solfuzzer
 
-At this stage you should be able to see a message similar to the following:
+At this stage, you should be able to see a message similar to the following:
 
 .. code-block:: text
 
@@ -481,7 +481,7 @@ needed for documentation and checks for any problems such as broken links or syn
 Solidity Language Design
 ========================
 
-To actively get involved in the language design process and share your ideas concerning the future of Solidity,
+To actively get involved in the language design process and to share your ideas concerning the future of Solidity,
 please join the `Solidity forum <https://forum.soliditylang.org/>`_.
 
 The Solidity forum serves as the place to propose and discuss new language features and their implementation in
@@ -500,7 +500,7 @@ If you want to know where the team is standing in terms or implementing new feat
 Issues in the design backlog need further specification and will either be discussed in a language design call or in a regular team call. You can
 see the upcoming changes for the next breaking release by changing from the default branch (`develop`) to the `breaking branch <https://github.com/ethereum/solidity/tree/breaking>`_.
 
-For ad-hoc cases and questions you can reach out to us via the `Solidity-dev Gitter channel <https://gitter.im/ethereum/solidity-dev>`_, a
+For ad-hoc cases and questions, you can reach out to us via the `Solidity-dev Gitter channel <https://gitter.im/ethereum/solidity-dev>`_ — a
 dedicated chatroom for conversations around the Solidity compiler and language development.
 
 We are happy to hear your thoughts on how we can improve the language design process to be even more collaborative and transparent.

From de857c27f3f4c339414d642709c49d67be8ee05f Mon Sep 17 00:00:00 2001
From: "Luoh Ren-Shan (LCamel)" <lcamel@gmail.com>
Date: Thu, 21 Jul 2022 20:55:45 +0800
Subject: [PATCH 0750/1748] Modify the metadata document.

---
 docs/metadata.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/metadata.rst b/docs/metadata.rst
index 1220f7822b..590b281c40 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -21,9 +21,12 @@ the :ref:`Standard JSON Interface<compiler-api>`.
 
 You have to publish the metadata file to IPFS, Swarm, or another service so
 that others can access it. You create the file by using the ``solc --metadata``
-command that generates a file called ``ContractName_meta.json``. It contains
-IPFS and Swarm references to the source code, so you have to upload all source
-files and the metadata file.
+command together with the ``--output-dir`` parameter. Without the parameter,
+it will only be written to standard out.
+It contains IPFS and Swarm references to the source code, so you have to
+upload all source files and the metadata file. For IPFS, The hash contained
+in the CID returned by ``ipfs add`` (not the direct sha2-256 hash of the file)
+shall match with the one contained in the bytecode.
 
 The metadata file has the following format. The example below is presented in a
 human-readable way. Properly formatted metadata should use quotes correctly,

From cd741b4162b21b041612886716803d9d10792e7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Jul 2022 17:38:55 +0200
Subject: [PATCH 0751/1748] CI: Disable SMT tests on Arch Linux

---
 .circleci/config.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 49f6f20854..510341ef54 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -927,11 +927,14 @@ jobs:
     environment:
       TERM: xterm
       MAKEFLAGS: -j 5
+      # Build without Z3. We won't be running SMT tests on Arch because that requires a specific
+      # version of Z3 and the one with the official repos is often not the one we need.
+      USE_Z3: OFF
     steps:
       - run:
           name: Install build dependencies
           command: |
-            pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake z3 cvc4 git openssh tar
+            pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake cvc4 git openssh tar
       - checkout
       - run: *run_build
       - store_artifacts: *artifacts_solc
@@ -1047,7 +1050,7 @@ jobs:
       TERM: xterm
       # For Archlinux we do not have prebuilt docker images and we would need to build evmone from source,
       # thus we forgo semantics tests to speed things up.
-      SOLTEST_FLAGS: --no-semantic-tests
+      SOLTEST_FLAGS: --no-semantic-tests --no-smt
     steps:
       - run:
           name: Install runtime dependencies

From 13dc5c29813bf910f0898627cc7cf27fd95d81eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Jul 2022 18:04:06 +0200
Subject: [PATCH 0752/1748] Changelog: Use Language Server instead of LSP when
 referring to the compiler component

---
 Changelog.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a39c1cabd3..dcdb309e45 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -28,7 +28,7 @@ Language Features:
 
 
 Compiler Features:
- * LSP: Add rudimentary support for semantic highlighting.
+ * Language Server: Add rudimentary support for semantic highlighting.
  * Type Checker: Warn about assignments involving multiple pushes to storage ``bytes`` that may invalidate references.
  * Yul Optimizer: Improve inlining heuristics for via IR code generation and pure Yul compilation.
  * Language Server: Always add ``{project_root}/node_modules`` to include search paths.
@@ -81,7 +81,7 @@ Compiler Features:
  * Commandline Interface: Allow the use of ``--via-ir`` in place of ``--experimental-via-ir``.
  * Compilation via Yul IR is no longer marked as experimental.
  * JSON-AST: Added selector field for errors and events.
- * LSP: Implements goto-definition.
+ * Language Server: Implements goto-definition.
  * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump.
  * Yul EVM Code Transform: Avoid unnecessary ``pop``s on terminating control flow.
  * Yul Optimizer: Remove ``sstore`` and ``mstore`` operations that are never read from.

From 8b05868895296eceb10887a1e2c3c15af8af4788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Jul 2022 18:04:50 +0200
Subject: [PATCH 0753/1748] Changelog: Sort 0.8.15 entries

---
 Changelog.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index dcdb309e45..580dd1bf3f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -29,17 +29,17 @@ Language Features:
 
 Compiler Features:
  * Language Server: Add rudimentary support for semantic highlighting.
+ * Language Server: Adds support for configuring ``include-paths`` JSON settings object that can be passed during LSP configuration stage.
+ * Language Server: Always add ``{project_root}/node_modules`` to include search paths.
  * Type Checker: Warn about assignments involving multiple pushes to storage ``bytes`` that may invalidate references.
  * Yul Optimizer: Improve inlining heuristics for via IR code generation and pure Yul compilation.
- * Language Server: Always add ``{project_root}/node_modules`` to include search paths.
- * Language Server: Adds support for configuring ``include-paths`` JSON settings object that can be passed during LSP configuration stage.
 
 Bugfixes:
  * ABI Encoder: When encoding an empty string coming from storage do not add a superfluous empty slot for data.
  * Common Subexpression Eliminator: Process assembly items in chunks with maximum size of 2000. It helps to avoid extremely time-consuming searches during code optimization.
+ * DocString Parser: Fix ICE caused by an immutable struct with mapping.
  * Yul IR Code Generation: More robust cleanup in corner cases during memory to storage copies.
  * Yul Optimizer: Do not remove ``returndatacopy`` in cases in which it might perform out-of-bounds reads that unconditionally revert as out-of-gas. Previously, any ``returndatacopy`` that wrote to memory that was never read from was removed without accounting for the out-of-bounds condition.
- * DocString Parser: Fix ICE caused by an immutable struct with mapping.
 
 
 ### 0.8.14 (2022-05-17)

From f91724911176306a1962361134dda2c36514e1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Jul 2022 18:05:16 +0200
Subject: [PATCH 0754/1748] Changelog: Remove the superfluous entry about error
 reporter

---
 Changelog.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 580dd1bf3f..1e3a0b0531 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,7 +9,6 @@ Compiler Features:
  * Yul Optimizer: Add rule to convert `mod(mul(X, Y), A)` into `mulmod(X, Y, A)`, if `A` is a power of two.
  * Yul Optimizer: Add rule to convert `mod(add(X, Y), A)` into `addmod(X, Y, A)`, if `A` is a power of two.
  * Code Generator: More efficient code for checked addition and subtraction.
- * Error Reporter: More readable and informative error/warning messages.
 
 Bugfixes:
  * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.

From 48835b3a73afab33e0e97d04662fbae080ba2a31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 26 Jul 2022 18:19:17 +0200
Subject: [PATCH 0755/1748] Changelog: Add missing entry for the 0.8.13 PR that
 caps the returndata copied for static returns

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 1e3a0b0531..f162a4d0a0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -83,6 +83,7 @@ Compiler Features:
  * Language Server: Implements goto-definition.
  * Peephole Optimizer: Optimize comparisons in front of conditional jumps and conditional jumps across a single unconditional jump.
  * Yul EVM Code Transform: Avoid unnecessary ``pop``s on terminating control flow.
+ * Yul IR Code Generation: When the result of an external call is statically-sized, ignore any returndata past the size expected by the compiler.
  * Yul Optimizer: Remove ``sstore`` and ``mstore`` operations that are never read from.
 
 

From a1f6a3da9b2add56f3c918c64adf7314363eda01 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 26 Jul 2022 18:35:17 +0200
Subject: [PATCH 0756/1748] Disable faulty zeppelin tests that detect a wrong
 revert reason

---
 test/externalTests/zeppelin.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index c533aa0364..dbb25a7e63 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -70,6 +70,7 @@ function zeppelin_test
     sed -i "s|it(\('reverts \)|it.skip(\1|g" structs/EnumerableSet.behavior.js
     popd
 
+
     # In some cases Hardhat does not detect revert reasons properly via IR.
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
     sed -i "s|it(\('reverts if the current value is 0'\)|it.skip(\1|g" test/utils/Counters.test.js
@@ -112,6 +113,11 @@ function zeppelin_test
     sed -zi "s|it(\('deposit'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC4626.test.js
     sed -zi "s|it(\('withdraw'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC4626.test.js
 
+    # Here only the testToInt(248) and testToInt(256) cases fail so change the loop range to skip them
+    sed -i "s|range(8, 256, 8)\(.forEach(bits => testToInt(bits));\)|range(8, 240, 8)\1|" test/utils/math/SafeCast.test.js
+
+
+
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
     sed -i "s|describe\(('Polygon-Child'\)|describe.skip\1|g" test/crosschain/CrossChainEnabled.test.js
     sed -i "s|it(\('revert with invalid multi proof #2'\)|it.skip(\1|g" test/utils/cryptography/MerkleProof.test.js

From 95bc553ffcea03c936c50b064495f1fb36b330c9 Mon Sep 17 00:00:00 2001
From: rodrigobaraglia <rodrigobaraglia@gmail.com>
Date: Mon, 13 Jun 2022 18:47:42 -0300
Subject: [PATCH 0757/1748] replace boost/range/for_each with standard for loop
 over rangev3/view/zip in ContractABIUtils::overwriteParameters

---
 test/libsolidity/util/ContractABIUtils.cpp | 30 ++++++++--------------
 1 file changed, 10 insertions(+), 20 deletions(-)

diff --git a/test/libsolidity/util/ContractABIUtils.cpp b/test/libsolidity/util/ContractABIUtils.cpp
index 3ffebbf100..b94de7bec4 100644
--- a/test/libsolidity/util/ContractABIUtils.cpp
+++ b/test/libsolidity/util/ContractABIUtils.cpp
@@ -29,7 +29,7 @@
 
 #include <boost/algorithm/string.hpp>
 #include <boost/assign/list_of.hpp>
-#include <boost/range/algorithm_ext/for_each.hpp>
+#include <range/v3/view/zip.hpp>
 
 #include <fstream>
 #include <memory>
@@ -281,26 +281,16 @@ void ContractABIUtils::overwriteParameters(
 )
 {
 	using namespace placeholders;
-	boost::for_each(
-		_sourceParameters,
-		_targetParameters,
-		std::bind<void>(
-			[&](Parameter _a, Parameter& _b) -> void
+	for (auto&& [source, target]: ranges::views::zip(_sourceParameters, _targetParameters))
+		if (
+				source.abiType.size != target.abiType.size ||
+				source.abiType.type != target.abiType.type ||
+				source.abiType.fractionalDigits != target.abiType.fractionalDigits
+			)
 			{
-				if (
-					_a.abiType.size != _b.abiType.size ||
-					_a.abiType.type != _b.abiType.type ||
-					_a.abiType.fractionalDigits != _b.abiType.fractionalDigits
-				)
-				{
-					_errorReporter.warning("Type or size of parameter(s) does not match.");
-					_b = _a;
-				}
-			},
-			_1,
-			_2
-		)
-	);
+				_errorReporter.warning("Type or size of parameter(s) does not match.");
+				target = source;
+			}
 }
 
 solidity::frontend::test::ParameterList ContractABIUtils::preferredParameters(

From b3fd11a66fb6cc5a1142f9e321f5e5b3b36f5a3f Mon Sep 17 00:00:00 2001
From: Quentin Garchery <garchery.quentin@gmail.com>
Date: Thu, 28 Jul 2022 11:12:14 +0200
Subject: [PATCH 0758/1748] fix: global state object in yul formal
 specification

---
 docs/yul.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index 8aad4f702f..d920f21240 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -663,10 +663,10 @@ We will use a destructuring notation for the AST nodes.
     E(G, L, <var_1, ..., var_n := rhs>: Assignment) =
         let G1, L1, v1, ..., vn = E(G, L, rhs)
         let L2 be a copy of L1 where L2[$var_i] = vi for i = 1, ..., n
-        G, L2, regular
+        G1, L2, regular
     E(G, L, <for { i1, ..., in } condition post body>: ForLoop) =
         if n >= 1:
-            let G1, L, mode = E(G, L, i1, ..., in)
+            let G1, L1, mode = E(G, L, i1, ..., in)
             // mode has to be regular or leave due to the syntactic restrictions
             if mode is leave then
                 G1, L1 restricted to variables of L, leave
@@ -686,7 +686,7 @@ We will use a destructuring notation for the AST nodes.
                 else:
                     G3, L3, mode = E(G2, L2, post)
                     if mode is leave:
-                        G2, L3, leave
+                        G3, L3, leave
                     otherwise
                         E(G3, L3, for {} condition post body)
     E(G, L, break: BreakContinue) =

From 4d4a030a01aa2d82c488af8c8e290ea24b221682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?AN=20=E2=9D=A6?= <108299225+krakxn@users.noreply.github.com>
Date: Tue, 26 Jul 2022 12:32:53 +0530
Subject: [PATCH 0759/1748] Minor grammar fixes

---
 docs/abi-spec.rst | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 08c75fbec5..9164ae6a12 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -13,7 +13,7 @@ The Contract Application Binary Interface (ABI) is the standard way to interact
 from outside the blockchain and for contract-to-contract interaction. Data is encoded according to its type,
 as described in this specification. The encoding is not self describing and thus requires a schema in order to decode.
 
-We assume the interface functions of a contract are strongly typed, known at compilation time and static.
+We assume that the interface functions of a contract are strongly typed, known at compilation time and static.
 We assume that all contracts will have the interface definitions of any contracts they call available at compile-time.
 
 This specification does not address contracts whose interface is dynamic or otherwise known only at run-time.
@@ -29,7 +29,7 @@ first (left, high-order in big-endian) four bytes of the Keccak-256 hash of the
 the function. The signature is defined as the canonical expression of the basic prototype without data
 location specifier, i.e.
 the function name with the parenthesised list of parameter types. Parameter types are split by a single
-comma - no spaces are used.
+comma — no spaces are used.
 
 .. note::
     The return type of a function is not part of this signature. In
@@ -133,7 +133,7 @@ The encoding is designed to have the following properties, which are especially
    previous version of the ABI, the number of reads scaled linearly with the total number of dynamic
    parameters in the worst case.
 
-2. The data of a variable or array element is not interleaved with other data and it is
+2. The data of a variable or an array element is not interleaved with other data and it is
    relocatable, i.e. it only uses relative "addresses".
 
 
@@ -252,7 +252,7 @@ Given the contract:
     }
 
 
-Thus for our ``Foo`` example if we wanted to call ``baz`` with the parameters ``69`` and
+Thus, for our ``Foo`` example if we wanted to call ``baz`` with the parameters ``69`` and
 ``true``, we would pass 68 bytes total, which can be broken down into:
 
 - ``0xcdcd77c0``: the Method ID. This is derived as the first 4 bytes of the Keccak hash of
@@ -597,7 +597,7 @@ Errors look as follows:
 
 .. note::
   There can be multiple errors with the same name and even with identical signature
-  in the JSON array, for example if the errors originate from different
+  in the JSON array; for example, if the errors originate from different
   files in the smart contract or are referenced from another smart contract.
   For the ABI, only the name of the error itself is relevant and not where it is
   defined.
@@ -646,7 +646,7 @@ would result in the JSON:
 Handling tuple types
 --------------------
 
-Despite that names are intentionally not part of the ABI encoding they do make a lot of sense to be included
+Despite the fact that names are intentionally not part of the ABI encoding, they do make a lot of sense to be included
 in the JSON to enable displaying it to the end user. The structure is nested in the following way:
 
 An object with members ``name``, ``type`` and potentially ``components`` describes a typed variable.
@@ -654,7 +654,7 @@ The canonical type is determined until a tuple type is reached and the string de
 to that point is stored in ``type`` prefix with the word ``tuple``, i.e. it will be ``tuple`` followed by
 a sequence of ``[]`` and ``[k]`` with
 integers ``k``. The components of the tuple are then stored in the member ``components``,
-which is of array type and has the same structure as the top-level object except that
+which is of an array type and has the same structure as the top-level object except that
 ``indexed`` is not allowed there.
 
 As an example, the code
@@ -738,10 +738,10 @@ Strict Encoding Mode
 ====================
 
 Strict encoding mode is the mode that leads to exactly the same encoding as defined in the formal specification above.
-This means offsets have to be as small as possible while still not creating overlaps in the data areas and thus no gaps are
+This means that offsets have to be as small as possible while still not creating overlaps in the data areas, and thus no gaps are
 allowed.
 
-Usually, ABI decoders are written in a straightforward way just following offset pointers, but some decoders
+Usually, ABI decoders are written in a straightforward way by just following offset pointers, but some decoders
 might enforce strict mode. The Solidity ABI decoder currently does not enforce strict mode, but the encoder
 always creates data in strict mode.
 
@@ -777,7 +777,7 @@ More specifically:
   encoding of its elements **with** padding.
 - Dynamically-sized types like ``string``, ``bytes`` or ``uint[]`` are encoded
   without their length field.
-- The encoding of ``string`` or ``bytes`` does not apply padding at the end
+- The encoding of ``string`` or ``bytes`` does not apply padding at the end,
   unless it is part of an array or struct (then it is padded to a multiple of
   32 bytes).
 
@@ -805,7 +805,7 @@ Encoding of Indexed Event Parameters
 ====================================
 
 Indexed event parameters that are not value types, i.e. arrays and structs are not
-stored directly but instead a keccak256-hash of an encoding is stored. This encoding
+stored directly but instead a Keccak-256 hash of an encoding is stored. This encoding
 is defined as follows:
 
 - the encoding of a ``bytes`` and ``string`` value is just the string contents

From 3e70a406af0e18b30e9fa4e9c75466e370e56f54 Mon Sep 17 00:00:00 2001
From: Ishtiaque Zahid <ruko97@gmail.com>
Date: Wed, 3 Aug 2022 11:18:10 +0600
Subject: [PATCH 0760/1748] fixed wrong tab alignment in YulUtilFunctions.h

---
 libsolidity/codegen/YulUtilFunctions.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsolidity/codegen/YulUtilFunctions.h b/libsolidity/codegen/YulUtilFunctions.h
index 7badf6db29..aff9c2406d 100644
--- a/libsolidity/codegen/YulUtilFunctions.h
+++ b/libsolidity/codegen/YulUtilFunctions.h
@@ -232,8 +232,8 @@ class YulUtilFunctions
 	std::string storageArrayPopFunction(ArrayType const& _type);
 
 	/// @returns the name of a function that pushes an element to a storage array
-/// @param _fromType represents the type of the element being pushed.
-/// If _fromType is ReferenceType the function will perform deep copy.
+	/// @param _fromType represents the type of the element being pushed.
+	/// If _fromType is ReferenceType the function will perform deep copy.
 	/// signature: (array, value)
 	std::string storageArrayPushFunction(ArrayType const& _type, Type const* _fromType = nullptr);
 
@@ -530,7 +530,7 @@ class YulUtilFunctions
 	std::string externalFunctionPointersEqualFunction();
 
 private:
-/// @returns the name of a function that copies a struct from calldata or memory to storage
+	/// @returns the name of a function that copies a struct from calldata or memory to storage
 	/// signature: (slot, value) ->
 	std::string copyStructToStorageFunction(StructType const& _from, StructType const& _to);
 

From 14f63cc7e804eab82d420b6d9ee8e86ff877bb96 Mon Sep 17 00:00:00 2001
From: LCamel <lcamel@gmail.com>
Date: Wed, 3 Aug 2022 22:12:11 +0800
Subject: [PATCH 0761/1748] Update docs/metadata.rst

Co-authored-by: Daniel Kirchner <daniel@ekpyron.org>
---
 docs/metadata.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/metadata.rst b/docs/metadata.rst
index 590b281c40..e92a7c0d58 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -22,9 +22,9 @@ the :ref:`Standard JSON Interface<compiler-api>`.
 You have to publish the metadata file to IPFS, Swarm, or another service so
 that others can access it. You create the file by using the ``solc --metadata``
 command together with the ``--output-dir`` parameter. Without the parameter,
-it will only be written to standard out.
-It contains IPFS and Swarm references to the source code, so you have to
-upload all source files and the metadata file. For IPFS, The hash contained
+the metadata will be written to standard output.
+The metadata contains IPFS and Swarm references to the source code, so you have to
+upload all source files in addition to the metadata file. For IPFS, the hash contained
 in the CID returned by ``ipfs add`` (not the direct sha2-256 hash of the file)
 shall match with the one contained in the bytecode.
 

From 9acf693aa249e08c1ca138ee9d6b601391ec7d4d Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 25 Jul 2022 20:34:00 -0300
Subject: [PATCH 0762/1748] Fixed bad cast when abiEncodeCall receives a tuple
 from a function.

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/TypeChecker.cpp          | 13 ++++++++--
 ...eCall_tuple_from_assignment_expression.sol | 24 +++++++++++++++++++
 ...le_from_conditional_ternary_expression.sol | 17 +++++++++++++
 .../abi_encodeCall_tuple_from_error_event.sol | 16 +++++++++++++
 ...encodeCall_tuple_from_invalid_operator.sol | 23 ++++++++++++++++++
 ...ncodeCall_tuple_returned_from_function.sol | 22 +++++++++++++++++
 ...itary_tuple_from_assignment_expression.sol | 13 ++++++++++
 ...le_from_conditional_ternary_expression.sol | 11 +++++++++
 ...l_unitary_tuple_returned_from_function.sol | 14 +++++++++++
 ...odePacked_tuple_returned_from_function.sol | 15 ++++++++++++
 ...d_unitary_tuple_returned_from_function.sol |  8 +++++++
 ...hSelector_tuple_returned_from_function.sol | 19 +++++++++++++++
 ...r_unitary_tuple_returned_from_function.sol | 10 ++++++++
 ...Signature_tuple_returned_from_function.sol | 15 ++++++++++++
 ...hSignature_unitary_tuple_from_function.sol |  8 +++++++
 ...bi_encode_tuple_returned_from_function.sol | 15 ++++++++++++
 ...e_unitary_tuple_returned_from_function.sol |  8 +++++++
 18 files changed, 250 insertions(+), 2 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_assignment_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_conditional_ternary_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_error_event.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_returned_from_function.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_assignment_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_conditional_ternary_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_returned_from_function.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_tuple_returned_from_function.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_unitary_tuple_returned_from_function.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_tuple_returned_from_function.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_unitary_tuple_returned_from_function.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_tuple_returned_from_function.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_unitary_tuple_from_function.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abi_encode_tuple_returned_from_function.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abi_encode_unitary_tuple_returned_from_function.sol

diff --git a/Changelog.md b/Changelog.md
index f162a4d0a0..4670f3ffb1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@ Compiler Features:
 Bugfixes:
  * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
  * Type Checker: Fix null dereference in `abi.encodeCall` type checking of free function.
+ * Type Checker: Fix compiler crash when `abi.encodeCall` received a tuple expression instead of an inline tuple.
 
 
 ### 0.8.15 (2022-06-15)
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index e2c8c52f79..6d872f2404 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -2248,8 +2248,17 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 	auto const* tupleType = dynamic_cast<TupleType const*>(type(*arguments[1]));
 	if (tupleType)
 	{
-		auto const& argumentTuple = dynamic_cast<TupleExpression const&>(*arguments[1].get());
-		callArguments = decltype(callArguments){argumentTuple.components().begin(), argumentTuple.components().end()};
+		if (TupleExpression const* argumentTuple = dynamic_cast<TupleExpression const*>(arguments[1].get()))
+			callArguments = decltype(callArguments){argumentTuple->components().begin(), argumentTuple->components().end()};
+		else
+		{
+			m_errorReporter.typeError(
+				9062_error,
+				arguments[1]->location(),
+				"Expected an inline tuple, not an expression of a tuple type."
+			);
+			return;
+		}
 	}
 	else
 		callArguments.push_back(arguments[1]);
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_assignment_expression.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_assignment_expression.sol
new file mode 100644
index 0000000000..955cea06ab
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_assignment_expression.sol
@@ -0,0 +1,24 @@
+contract C {
+    function g0() internal pure {}
+    function g2() internal pure returns (uint, uint) { return (2, 3); }
+
+    function f0() public {}
+    function f2(uint, uint) public {}
+
+    function h() public view {
+        uint a;
+        uint b;
+
+        abi.encodeCall(this.f0, () = g0());
+        abi.encodeCall(this.f0, () = ());
+        abi.encodeCall(this.f2, (a, b) = g2());
+        abi.encodeCall(this.f2, (a, b) = (2, 3));
+    }
+}
+// ----
+// TypeError 5547: (284-286): Empty tuple on the left hand side.
+// TypeError 9062: (284-293): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 5547: (328-330): Empty tuple on the left hand side.
+// TypeError 9062: (328-335): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 9062: (370-383): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 9062: (418-433): Expected an inline tuple, not an expression of a tuple type.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_conditional_ternary_expression.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_conditional_ternary_expression.sol
new file mode 100644
index 0000000000..3b8b549ba7
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_conditional_ternary_expression.sol
@@ -0,0 +1,17 @@
+contract C {
+    function g0() internal pure {}
+    function g2() internal pure returns (uint, uint) { return (2, 3); }
+
+    function f0() public {}
+    function f2(uint, uint) public {}
+
+    function h() public view {
+        abi.encodeCall(this.f0, true ? g0() : g0());
+        abi.encodeCall(this.f2, true ? g2() : g2());
+        abi.encodeCall(this.f2, true ? (1, 2) : (3, 4));
+    }
+}
+// ----
+// TypeError 9062: (251-269): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 9062: (304-322): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 9062: (357-379): Expected an inline tuple, not an expression of a tuple type.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_error_event.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_error_event.sol
new file mode 100644
index 0000000000..c96b829099
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_error_event.sol
@@ -0,0 +1,16 @@
+contract C {
+    event Ev();
+    error Er();
+
+    function f0() public {}
+
+    function h() public view {
+        abi.encodeCall(this.f0, Ev());
+        abi.encodeCall(this.f0, Er());
+        abi.encodeCall(this.f0, revert());
+    }
+}
+// ----
+// TypeError 9062: (138-142): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 9062: (177-181): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 9062: (216-224): Expected an inline tuple, not an expression of a tuple type.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
new file mode 100644
index 0000000000..1c9f63073d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
@@ -0,0 +1,23 @@
+contract C {
+    event Ev();
+    error Er();
+
+    function g0() internal pure {}
+    function g2() internal pure returns (uint, uint) { return (2, 3); }
+
+    function f0() public {}
+    function f2(uint, uint) public {}
+
+    function h() public view {
+        abi.encodeCall(this.f2, (1, 1) + (2, 2));
+        abi.encodeCall(this.f0, Ev() / Er());
+        abi.encodeCall(this.f0, !());
+    }
+}
+// ----
+// TypeError 2271: (284-299): Operator + not compatible with types tuple(int_const 1,int_const 1) and tuple(int_const 2,int_const 2)
+// TypeError 9062: (284-299): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 2271: (334-345): Operator / not compatible with types tuple() and tuple()
+// TypeError 9062: (334-345): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 4907: (380-383): Unary operator ! cannot be applied to type tuple()
+// TypeError 9062: (380-383): Expected an inline tuple, not an expression of a tuple type.
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_returned_from_function.sol
new file mode 100644
index 0000000000..ddb4934c4f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_returned_from_function.sol
@@ -0,0 +1,22 @@
+contract C {
+    function g0() internal pure {}
+    function g2() internal pure returns (uint, uint) { return (2, 3); }
+
+    function f0() public {}
+    function f2(uint, uint) public {}
+
+    function h() public view {
+        abi.encodeCall(this.f0, g0());
+        abi.encodeCall(this.f2, g2());
+
+        abi.encodeCall(this.f0, (g0()));
+        abi.encodeCall(this.f2, (g2()));
+    }
+}
+// ----
+// TypeError 9062: (251-255): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 9062: (290-294): Expected an inline tuple, not an expression of a tuple type.
+// TypeError 6473: (331-335): Tuple component cannot be empty.
+// TypeError 7788: (306-337): Expected 0 instead of 1 components for the tuple parameter.
+// TypeError 7788: (347-378): Expected 2 instead of 1 components for the tuple parameter.
+// TypeError 5407: (372-376): Cannot implicitly convert component at position 0 from "tuple(uint256,uint256)" to "uint256".
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_assignment_expression.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_assignment_expression.sol
new file mode 100644
index 0000000000..06bb650751
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_assignment_expression.sol
@@ -0,0 +1,13 @@
+contract C {
+    function g1() internal pure returns (uint) { return (1); }
+
+    function f1(uint) public {}
+
+    function h() public view {
+        uint a;
+
+        abi.encodeCall(this.f1, (a) = g1());
+        abi.encodeCall(this.f1, (a) = (1));
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_conditional_ternary_expression.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_conditional_ternary_expression.sol
new file mode 100644
index 0000000000..518d8d32f0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_from_conditional_ternary_expression.sol
@@ -0,0 +1,11 @@
+contract C {
+    function g1() internal pure returns (uint) { return (1); }
+
+    function f1(uint) public {}
+
+    function h() public view {
+        abi.encodeCall(this.f1, true ? (1) : (2));
+        abi.encodeCall(this.f1, true ? g1() : g1());
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_returned_from_function.sol
new file mode 100644
index 0000000000..6308ce8f18
--- /dev/null
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_unitary_tuple_returned_from_function.sol
@@ -0,0 +1,14 @@
+contract C {
+    function g1() internal pure returns (uint) { return (1); }
+    function g2() internal pure returns (uint, uint) { return (2, 3); }
+
+    function f1(uint) public {}
+    function f2(uint, uint) public {}
+
+    function h() public view {
+        abi.encodeCall(this.f1, g1());
+        abi.encodeCall(this.f1, (g1()));
+        abi.encodeCall(this.f2, (g1(), g1()));
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_tuple_returned_from_function.sol
new file mode 100644
index 0000000000..8dc796928e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_tuple_returned_from_function.sol
@@ -0,0 +1,15 @@
+contract C {
+    function g0() internal pure {}
+    function g1() internal pure returns (uint) { return (1); }
+    function g2() internal pure returns (uint, uint) { return (2, 3); }
+
+    function h() public pure {
+        abi.encodePacked(g0());
+        abi.encodePacked(g2());
+        abi.encodePacked((g1(), g1()));
+    }
+}
+// ----
+// TypeError 2056: (240-244): This type cannot be encoded.
+// TypeError 2056: (272-276): This type cannot be encoded.
+// TypeError 2056: (304-316): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_unitary_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_unitary_tuple_returned_from_function.sol
new file mode 100644
index 0000000000..4ac1c1d408
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encodePacked_unitary_tuple_returned_from_function.sol
@@ -0,0 +1,8 @@
+contract C {
+    function g1() internal pure returns (uint) { return (1); }
+
+    function h() public pure {
+        abi.encodePacked(g1());
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_tuple_returned_from_function.sol
new file mode 100644
index 0000000000..b8d0bcfcbe
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_tuple_returned_from_function.sol
@@ -0,0 +1,19 @@
+contract C {
+    function g0() internal pure {}
+    function g1() internal pure returns (uint) { return (1); }
+    function g2() internal pure returns (uint, uint) { return (2, 3); }
+
+    function f0() public {}
+    function f1(uint) public {}
+    function f2(uint, uint) public {}
+
+    function h() public pure {
+        abi.encodeWithSelector(this.f0.selector, g0());
+        abi.encodeWithSelector(this.f0.selector, g2());
+        abi.encodeWithSelector(this.f0.selector, (g1(), g1()));
+    }
+}
+// ----
+// TypeError 2056: (363-367): This type cannot be encoded.
+// TypeError 2056: (419-423): This type cannot be encoded.
+// TypeError 2056: (475-487): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_unitary_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_unitary_tuple_returned_from_function.sol
new file mode 100644
index 0000000000..1ef98b0783
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSelector_unitary_tuple_returned_from_function.sol
@@ -0,0 +1,10 @@
+contract C {
+    function g1() internal pure returns (uint) { return (1); }
+
+    function f0() public {}
+
+    function h() public pure {
+        abi.encodeWithSelector(this.f0.selector, g1());
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_tuple_returned_from_function.sol
new file mode 100644
index 0000000000..c618ec1b2c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_tuple_returned_from_function.sol
@@ -0,0 +1,15 @@
+contract C {
+    function g0() internal pure {}
+    function g1() internal pure returns (uint) { return (1); }
+    function g2() internal pure returns (uint, uint) { return (2, 3); }
+
+    function h() public pure {
+        abi.encodeWithSignature("f0()", g0());
+        abi.encodeWithSignature("f()", g2());
+        abi.encodeWithSignature("f()", (g1(), g1()));
+    }
+}
+// ----
+// TypeError 2056: (255-259): This type cannot be encoded.
+// TypeError 2056: (301-305): This type cannot be encoded.
+// TypeError 2056: (347-359): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_unitary_tuple_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_unitary_tuple_from_function.sol
new file mode 100644
index 0000000000..504871832d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encodeWithSignature_unitary_tuple_from_function.sol
@@ -0,0 +1,8 @@
+contract C {
+    function g1() internal pure returns (uint) { return (1); }
+
+    function h() public pure {
+        abi.encodeWithSignature("f()", g1());
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_tuple_returned_from_function.sol
new file mode 100644
index 0000000000..747ccdabfd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_tuple_returned_from_function.sol
@@ -0,0 +1,15 @@
+contract C {
+    function g0() internal pure {}
+    function g1() internal pure returns (uint) { return (1); }
+    function g2() internal pure returns (uint, uint) { return (2, 3); }
+
+    function h() public pure {
+        abi.encode(g0());
+        abi.encode(g2());
+        abi.encode((g1(), g1()));
+    }
+}
+// ----
+// TypeError 2056: (234-238): This type cannot be encoded.
+// TypeError 2056: (260-264): This type cannot be encoded.
+// TypeError 2056: (286-298): This type cannot be encoded.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abi_encode_unitary_tuple_returned_from_function.sol b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_unitary_tuple_returned_from_function.sol
new file mode 100644
index 0000000000..6c3cdf84ae
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abi_encode_unitary_tuple_returned_from_function.sol
@@ -0,0 +1,8 @@
+contract C {
+    function g1() internal pure returns (uint) { return (1); }
+
+    function h() public pure {
+        abi.encode(g1());
+    }
+}
+// ----

From 1543d236011761ff692dc288c6d032bb066e441a Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 4 Aug 2022 16:44:19 +0200
Subject: [PATCH 0763/1748] Disable failing zeppelin tests

---
 test/externalTests/zeppelin.sh | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index dbb25a7e63..8d73ad1d2e 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -121,6 +121,15 @@ function zeppelin_test
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
     sed -i "s|describe\(('Polygon-Child'\)|describe.skip\1|g" test/crosschain/CrossChainEnabled.test.js
     sed -i "s|it(\('revert with invalid multi proof #2'\)|it.skip(\1|g" test/utils/cryptography/MerkleProof.test.js
+    sed -i "s|describe(\('to a receiver contract that panics'\)|describe.skip(\1|g" test/token/ERC721/ERC721.behavior.js
+    sed -i "s|context(\('to a receiver contract that panics'\)|context.skip(\1|g" test/token/ERC721/ERC721.behavior.js
+    sed -i "s|describe(\('to a contract that does not implement the required function'\)|describe.skip(\1|g" test/token/ERC721/ERC721.behavior.js
+    sed -i "s|context(\('to a contract that does not implement the required function'\)|context.skip(\1|g" test/token/ERC721/ERC721.behavior.js
+    sed -i "s|it(\('reverts when the called function throws'\)|it.skip(\1|g" test/utils/Address.test.js
+    sed -i "s|it(\('reverts when function does not exist'\)|it.skip(\1|g" test/utils/Address.test.js
+    sed -i "s|it(\('reverting initialization'\)|it.skip(\1|g" test/proxy/beacon/BeaconProxy.test.js
+    sed -i "s|describe(\('reverting initialization'\)|describe.skip(\1|g" test/proxy/Proxy.behaviour.js
+    sed -i "s|it(\('does not allow remote callback'\)|it.skip(\1|g" test/security/ReentrancyGuard.test.js
 
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"

From a9e03f5e4a19d4c70af7c28f5cea4bc4ee066ff2 Mon Sep 17 00:00:00 2001
From: Duc Thanh Nguyen <ng.duc.tahn@gmail.com>
Date: Sat, 16 Jul 2022 13:29:10 -0400
Subject: [PATCH 0764/1748] Fix out-of-range compiler crash for nested tuple
 assignment involving outer unary tuple

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/TypeChecker.cpp          |  9 ++---
 .../empty_tuple_assignment.sol                | 35 +++++++++++++++++++
 .../fixed_byte_array_assignment_in_tuple.sol  |  7 ++++
 4 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/tupleAssignments/empty_tuple_assignment.sol
 create mode 100644 test/libsolidity/syntaxTests/tupleAssignments/fixed_byte_array_assignment_in_tuple.sol

diff --git a/Changelog.md b/Changelog.md
index 4670f3ffb1..148b67c985 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,6 +14,7 @@ Bugfixes:
  * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
  * Type Checker: Fix null dereference in `abi.encodeCall` type checking of free function.
  * Type Checker: Fix compiler crash when `abi.encodeCall` received a tuple expression instead of an inline tuple.
+ * Type Checker: Fix compiler crash on tuple assignments involving certain patterns with unary tuples on the left-hand side.
 
 
 ### 0.8.15 (2022-06-15)
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 6d872f2404..d3f37c3df8 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -112,8 +112,9 @@ void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
 	size_t storageByteAccesses = 0;
 	auto count = [&](TupleExpression const& _lhs, TupleType const& _rhs, auto _recurse) -> void {
 		TupleType const& lhsType = dynamic_cast<TupleType const&>(*type(_lhs));
+		TupleExpression const* lhsResolved = dynamic_cast<TupleExpression const*>(resolveOuterUnaryTuples(&_lhs));
 
-		if (lhsType.components().size() != _rhs.components().size())
+		if (lhsType.components().size() != _rhs.components().size() || lhsResolved->components().size() != _rhs.components().size())
 		{
 			solAssert(m_errorReporter.hasErrors(), "");
 			return;
@@ -134,7 +135,7 @@ void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
 			{
 				if (bytesType && bytesType->numBytes() == 1)
 				{
-					if (FunctionCall const* lhsCall = dynamic_cast<FunctionCall const*>(resolveOuterUnaryTuples(_lhs.components().at(index).get())))
+					if (FunctionCall const* lhsCall = dynamic_cast<FunctionCall const*>(resolveOuterUnaryTuples(lhsResolved->components().at(index).get())))
 					{
 						FunctionType const& callType = dynamic_cast<FunctionType const&>(*type(lhsCall->expression()));
 						if (callType.kind() == FunctionType::Kind::ArrayPush)
@@ -147,7 +148,7 @@ void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
 							}
 						}
 					}
-					else if (IndexAccess const* indexAccess = dynamic_cast<IndexAccess const*>(resolveOuterUnaryTuples(_lhs.components().at(index).get())))
+					else if (IndexAccess const* indexAccess = dynamic_cast<IndexAccess const*>(resolveOuterUnaryTuples(lhsResolved->components().at(index).get())))
 					{
 						if (ArrayType const* arrayType = dynamic_cast<ArrayType const*>(type(indexAccess->baseExpression())))
 							if (arrayType->isByteArray() && arrayType->dataStoredIn(DataLocation::Storage))
@@ -156,7 +157,7 @@ void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
 				}
 			}
 			else if (TupleType const* tupleType = dynamic_cast<TupleType const*>(componentType))
-				if (auto const* lhsNested = dynamic_cast<TupleExpression const*>(_lhs.components().at(index).get()))
+				if (auto const* lhsNested = dynamic_cast<TupleExpression const*>(lhsResolved->components().at(index).get()))
 					if (auto const* rhsNestedType = dynamic_cast<TupleType const*>(_rhs.components().at(index)))
 						_recurse(
 							*lhsNested,
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/empty_tuple_assignment.sol b/test/libsolidity/syntaxTests/tupleAssignments/empty_tuple_assignment.sol
new file mode 100644
index 0000000000..940ef6d04e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tupleAssignments/empty_tuple_assignment.sol
@@ -0,0 +1,35 @@
+function f() pure {
+    ((, ())) = (1, 3);
+}
+
+function g() pure {
+    ((, ((, ())))) = (1, 3);
+}
+
+function t() pure returns (int, int) {
+    return (4, 5);
+}
+
+function h() pure {
+    ((, ())) = t();
+}
+
+function ff() pure {
+    ((((, ())) , )) = ((1, 2), 3);
+}
+
+function fg() pure {
+    (((, ())) , ) = ((1, 2), 3);
+}
+
+// ----
+// TypeError 5547: (28-30): Empty tuple on the left hand side.
+// TypeError 7407: (35-41): Type tuple(int_const 1,int_const 3) is not implicitly convertible to expected type tuple(,tuple()).
+// TypeError 5547: (78-80): Empty tuple on the left hand side.
+// TypeError 7407: (87-93): Type tuple(int_const 1,int_const 3) is not implicitly convertible to expected type tuple(,tuple(,tuple())).
+// TypeError 5547: (187-189): Empty tuple on the left hand side.
+// TypeError 7407: (194-197): Type tuple(int256,int256) is not implicitly convertible to expected type tuple(,tuple()).
+// TypeError 5547: (233-235): Empty tuple on the left hand side.
+// TypeError 7407: (245-256): Type tuple(tuple(int_const 1,int_const 2),int_const 3) is not implicitly convertible to expected type tuple(tuple(,tuple()),).
+// TypeError 5547: (291-293): Empty tuple on the left hand side.
+// TypeError 7407: (302-313): Type tuple(tuple(int_const 1,int_const 2),int_const 3) is not implicitly convertible to expected type tuple(tuple(,tuple()),).
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/fixed_byte_array_assignment_in_tuple.sol b/test/libsolidity/syntaxTests/tupleAssignments/fixed_byte_array_assignment_in_tuple.sol
new file mode 100644
index 0000000000..287e092399
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tupleAssignments/fixed_byte_array_assignment_in_tuple.sol
@@ -0,0 +1,7 @@
+contract A {
+    function f() pure public {
+        bytes1 b;
+        bytes1 a;
+        (((, , b))) = (1, 2, a);
+    }
+}

From 40de2b0442dff213acfc91e2d31076f55c71907a Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 3 Aug 2022 10:44:25 +0200
Subject: [PATCH 0765/1748] Add full stops to error messages

---
 libsolidity/analysis/TypeChecker.cpp          | 11 +++--
 ...encodeCall_tuple_from_invalid_operator.sol |  6 +--
 ...icit_conversion_of_super_in_comparison.sol | 12 +++---
 ...licit_conversion_of_super_in_operators.sol | 42 +++++++++----------
 .../errors/error_incompatible_binary_ops.sol  | 36 ++++++++--------
 .../error_incompatible_operator_for_type.sol  |  8 ++--
 .../error_incompatible_unary_operator.sol     |  2 +-
 .../events/event_incompatible_binary_ops.sol  | 36 ++++++++--------
 .../event_incompatible_operator_for_type.sol  |  8 ++--
 .../event_incompatible_unary_operator.sol     |  2 +-
 .../comparison_of_function_types_gt_1.sol     |  2 +-
 .../comparison_of_function_types_gt_2.sol     |  2 +-
 .../comparison_of_function_types_lt_1.sol     |  2 +-
 .../comparison_of_function_types_lt_2.sol     |  2 +-
 ...xternal_functions_with_extra_gas_slots.sol |  4 +-
 ...nternal_and_external_function_pointers.sol |  4 +-
 ...al_functions_with_different_parameters.sol |  6 +--
 .../declaration_dec_tuple.sol                 |  2 +-
 .../declaration_delete_tuple.sol              |  2 +-
 .../declaration_inc_tuple.sol                 |  2 +-
 .../declaration_unary_tuple.sol               |  8 ++--
 .../literalOperations/division_by_zero.sol    |  2 +-
 .../division_by_zero_complex.sol              |  2 +-
 .../literalOperations/mod_zero.sol            |  2 +-
 .../literalOperations/mod_zero_complex.sol    |  2 +-
 .../syntaxTests/metaTypes/integer_err.sol     |  2 +-
 ...type_conversion_for_comparison_invalid.sol |  2 +-
 .../025_comparison_of_mapping_types.sol       |  2 +-
 .../112_exp_operator_exponent_too_big.sol     |  2 +-
 .../196_integer_boolean_or.sol                |  2 +-
 .../197_integer_boolean_and.sol               |  2 +-
 .../198_integer_boolean_not.sol               |  2 +-
 .../202_bytes_reference_compare_operators.sol |  2 +-
 ...203_struct_reference_compare_operators.sol |  2 +-
 .../213_no_delete_on_storage_pointers.sol     |  2 +-
 .../308_rational_unary_plus_operation.sol     |  2 +-
 .../329_rational_as_exponent_value_signed.sol |  2 +-
 ...30_rational_as_exponent_value_unsigned.sol |  2 +-
 .../331_rational_as_exponent_half.sol         |  2 +-
 ...rational_as_exponent_value_neg_quarter.sol |  2 +-
 .../338_rational_bitnot_unary_operation.sol   |  2 +-
 .../339_rational_bitor_binary_operation.sol   |  2 +-
 .../340_rational_bitxor_binary_operation.sol  |  2 +-
 .../341_rational_bitand_binary_operation.sol  |  2 +-
 ...68_shift_constant_left_negative_rvalue.sol |  2 +-
 ...9_shift_constant_right_negative_rvalue.sol |  2 +-
 ...0_shift_constant_left_excessive_rvalue.sol |  2 +-
 ..._shift_constant_right_excessive_rvalue.sol |  2 +-
 .../372_shift_constant_right_fractional.sol   |  2 +-
 .../compoundAssignment/incomp_types.sol       |  2 +-
 .../parsing/unary_plus_expression.sol         |  2 +-
 .../shifts/shift_singed_rvalue.sol            |  4 +-
 .../syntaxTests/types/bool_ops.sol            | 38 ++++++++---------
 .../syntaxTests/types/hex_literal_bitnot.sol  |  2 +-
 .../types/rational_number_bitshift_limit.sol  |  4 +-
 .../types/rational_number_exp_limit_fail.sol  | 32 +++++++-------
 56 files changed, 169 insertions(+), 170 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index d3f37c3df8..5b64bcea8b 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1601,7 +1601,8 @@ bool TypeChecker::visit(Assignment const& _assignment)
 				" not compatible with types " +
 				t->humanReadableName() +
 				" and " +
-				type(_assignment.rightHandSide())->humanReadableName()
+				type(_assignment.rightHandSide())->humanReadableName() +
+				"."
 			);
 	}
 	return false;
@@ -1723,9 +1724,7 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 	TypeResult result = type(_operation.subExpression())->unaryOperatorResult(op);
 	if (!result)
 	{
-		string description = "Unary operator " + string(TokenTraits::toString(op)) + " cannot be applied to type " + subExprType->humanReadableName();
-		if (!result.message().empty())
-			description += ". " + result.message();
+		string description = "Unary operator " + string(TokenTraits::toString(op)) + " cannot be applied to type " + subExprType->humanReadableName() + "." + (!result.message().empty() ? " " + result.message() : "");
 		if (modifying)
 			// Cannot just report the error, ignore the unary operator, and continue,
 			// because the sub-expression was already processed with requireLValue()
@@ -1759,8 +1758,8 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 			" not compatible with types " +
 			leftType->humanReadableName() +
 			" and " +
-			rightType->humanReadableName() +
-			(!result.message().empty() ? ". " + result.message() : "")
+			rightType->humanReadableName() + "." +
+			(!result.message().empty() ? " " + result.message() : "")
 		);
 		commonType = leftType;
 	}
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
index 1c9f63073d..cd98edf6cb 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
@@ -15,9 +15,9 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (284-299): Operator + not compatible with types tuple(int_const 1,int_const 1) and tuple(int_const 2,int_const 2)
+// TypeError 2271: (284-299): Operator + not compatible with types tuple(int_const 1,int_const 1) and tuple(int_const 2,int_const 2).
 // TypeError 9062: (284-299): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 2271: (334-345): Operator / not compatible with types tuple() and tuple()
+// TypeError 2271: (334-345): Operator / not compatible with types tuple() and tuple().
 // TypeError 9062: (334-345): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 4907: (380-383): Unary operator ! cannot be applied to type tuple()
+// TypeError 4907: (380-383): Unary operator ! cannot be applied to type tuple().
 // TypeError 9062: (380-383): Expected an inline tuple, not an expression of a tuple type.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
index d07594b09f..8087b6b33f 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
@@ -19,9 +19,9 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (144-157): Operator != not compatible with types type(contract super C) and contract C
-// TypeError 2271: (167-180): Operator != not compatible with types contract C and type(contract super C)
-// TypeError 2271: (254-264): Operator != not compatible with types type(contract super C) and contract C
-// TypeError 2271: (274-284): Operator != not compatible with types contract C and type(contract super C)
-// TypeError 2271: (349-359): Operator != not compatible with types type(contract super C) and contract D
-// TypeError 2271: (369-379): Operator != not compatible with types contract D and type(contract super C)
+// TypeError 2271: (144-157): Operator != not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (167-180): Operator != not compatible with types contract C and type(contract super C).
+// TypeError 2271: (254-264): Operator != not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (274-284): Operator != not compatible with types contract C and type(contract super C).
+// TypeError 2271: (349-359): Operator != not compatible with types type(contract super C) and contract D.
+// TypeError 2271: (369-379): Operator != not compatible with types contract D and type(contract super C).
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
index 8a803a2333..0456113062 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
@@ -30,27 +30,27 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (49-62): Operator << not compatible with types type(contract super C) and contract C
-// TypeError 2271: (72-85): Operator >> not compatible with types type(contract super C) and contract C
-// TypeError 2271: (95-107): Operator ^ not compatible with types type(contract super C) and contract C
-// TypeError 2271: (117-129): Operator | not compatible with types type(contract super C) and contract C
-// TypeError 2271: (139-151): Operator & not compatible with types type(contract super C) and contract C
-// TypeError 2271: (162-174): Operator * not compatible with types type(contract super C) and contract C
-// TypeError 2271: (184-196): Operator / not compatible with types type(contract super C) and contract C
-// TypeError 2271: (206-218): Operator % not compatible with types type(contract super C) and contract C
-// TypeError 2271: (228-240): Operator - not compatible with types type(contract super C) and contract C
-// TypeError 2271: (250-262): Operator + not compatible with types type(contract super C) and contract C
-// TypeError 2271: (272-285): Operator ** not compatible with types type(contract super C) and contract C
-// TypeError 2271: (296-309): Operator == not compatible with types type(contract super C) and contract C
-// TypeError 2271: (319-332): Operator != not compatible with types type(contract super C) and contract C
-// TypeError 2271: (342-355): Operator >= not compatible with types type(contract super C) and contract C
-// TypeError 2271: (365-378): Operator <= not compatible with types type(contract super C) and contract C
-// TypeError 2271: (388-400): Operator < not compatible with types type(contract super C) and contract C
-// TypeError 2271: (410-422): Operator > not compatible with types type(contract super C) and contract C
-// TypeError 2271: (433-446): Operator || not compatible with types type(contract super C) and contract C
-// TypeError 2271: (456-469): Operator && not compatible with types type(contract super C) and contract C
+// TypeError 2271: (49-62): Operator << not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (72-85): Operator >> not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (95-107): Operator ^ not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (117-129): Operator | not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (139-151): Operator & not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (162-174): Operator * not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (184-196): Operator / not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (206-218): Operator % not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (228-240): Operator - not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (250-262): Operator + not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (272-285): Operator ** not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (296-309): Operator == not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (319-332): Operator != not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (342-355): Operator >= not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (365-378): Operator <= not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (388-400): Operator < not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (410-422): Operator > not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (433-446): Operator || not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (456-469): Operator && not compatible with types type(contract super C) and contract C.
 // TypeError 4247: (480-485): Expression has to be an lvalue.
-// TypeError 7366: (480-493): Operator -= not compatible with types type(contract super C) and contract C
+// TypeError 7366: (480-493): Operator -= not compatible with types type(contract super C) and contract C.
 // TypeError 4247: (503-508): Expression has to be an lvalue.
-// TypeError 7366: (503-516): Operator += not compatible with types type(contract super C) and contract C
+// TypeError 7366: (503-516): Operator += not compatible with types type(contract super C) and contract C.
 // TypeError 1080: (527-546): True expression's type type(contract super C) does not match false expression's type contract C.
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
index 28ba979d81..3f18bbf19d 100644
--- a/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
+++ b/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
@@ -27,21 +27,21 @@ contract C {
 }
 
 // ----
-// TypeError 2271: (86-116): Operator << not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (126-156): Operator >> not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (166-195): Operator ^ not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (205-234): Operator | not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (244-273): Operator & not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (284-313): Operator * not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (323-352): Operator / not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (362-391): Operator % not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (401-430): Operator + not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (440-469): Operator - not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (480-510): Operator == not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (520-550): Operator != not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (560-590): Operator >= not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (600-630): Operator <= not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (640-669): Operator < not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (679-708): Operator > not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (719-749): Operator || not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
-// TypeError 2271: (759-789): Operator && not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool)
+// TypeError 2271: (86-116): Operator << not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (126-156): Operator >> not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (166-195): Operator ^ not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (205-234): Operator | not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (244-273): Operator & not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (284-313): Operator * not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (323-352): Operator / not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (362-391): Operator % not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (401-430): Operator + not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (440-469): Operator - not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (480-510): Operator == not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (520-550): Operator != not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (560-590): Operator >= not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (600-630): Operator <= not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (640-669): Operator < not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (679-708): Operator > not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (719-749): Operator || not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (759-789): Operator && not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol
index 7a2736b3d5..61463e587b 100644
--- a/test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol
+++ b/test/libsolidity/syntaxTests/errors/error_incompatible_operator_for_type.sol
@@ -12,8 +12,8 @@ contract C {
 
 // ----
 // TypeError 4247: (102-115): Expression has to be an lvalue.
-// TypeError 7366: (102-120): Operator += not compatible with types error MyCustomError(uint256,bool) and int_const 1
+// TypeError 7366: (102-120): Operator += not compatible with types error MyCustomError(uint256,bool) and int_const 1.
 // TypeError 4247: (130-143): Expression has to be an lvalue.
-// TypeError 7366: (130-148): Operator -= not compatible with types error MyCustomError(uint256,bool) and int_const 1
-// TypeError 7366: (158-176): Operator += not compatible with types uint256 and error MyCustomError(uint256,bool)
-// TypeError 7366: (186-204): Operator -= not compatible with types uint256 and error MyCustomError(uint256,bool)
+// TypeError 7366: (130-148): Operator -= not compatible with types error MyCustomError(uint256,bool) and int_const 1.
+// TypeError 7366: (158-176): Operator += not compatible with types uint256 and error MyCustomError(uint256,bool).
+// TypeError 7366: (186-204): Operator -= not compatible with types uint256 and error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
index a89d8631db..f4bc34ca48 100644
--- a/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
+++ b/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
@@ -8,4 +8,4 @@ contract C {
 
 // ----
 // TypeError 4247: (86-99): Expression has to be an lvalue.
-// TypeError 9767: (86-101): Unary operator ++ cannot be applied to type error MyCustomError(uint256,bool)
+// TypeError 9767: (86-101): Unary operator ++ cannot be applied to type error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol b/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
index 79ed12d59e..1537f8edfc 100644
--- a/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
+++ b/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
@@ -26,21 +26,21 @@ contract C {
 }
 
 // ----
-// TypeError 2271: (83-113): Operator << not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (123-153): Operator >> not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (163-192): Operator ^ not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (202-231): Operator | not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (241-270): Operator & not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (281-310): Operator * not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (320-349): Operator / not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (359-388): Operator % not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (398-427): Operator + not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (437-466): Operator - not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (477-507): Operator == not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (517-547): Operator != not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (557-587): Operator >= not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (597-627): Operator <= not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (637-666): Operator < not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (676-705): Operator > not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (716-746): Operator || not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
-// TypeError 2271: (756-786): Operator && not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256)
+// TypeError 2271: (83-113): Operator << not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (123-153): Operator >> not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (163-192): Operator ^ not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (202-231): Operator | not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (241-270): Operator & not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (281-310): Operator * not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (320-349): Operator / not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (359-388): Operator % not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (398-427): Operator + not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (437-466): Operator - not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (477-507): Operator == not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (517-547): Operator != not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (557-587): Operator >= not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (597-627): Operator <= not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (637-666): Operator < not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (676-705): Operator > not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (716-746): Operator || not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (756-786): Operator && not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol b/test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol
index fd7418a14b..64d6295510 100644
--- a/test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol
+++ b/test/libsolidity/syntaxTests/events/event_incompatible_operator_for_type.sol
@@ -11,8 +11,8 @@ contract C {
 
 // ----
 // TypeError 4247: (99-112): Expression has to be an lvalue.
-// TypeError 7366: (99-117): Operator += not compatible with types event MyCustomEvent(uint256) and int_const 1
+// TypeError 7366: (99-117): Operator += not compatible with types event MyCustomEvent(uint256) and int_const 1.
 // TypeError 4247: (127-140): Expression has to be an lvalue.
-// TypeError 7366: (127-145): Operator -= not compatible with types event MyCustomEvent(uint256) and int_const 1
-// TypeError 7366: (155-173): Operator += not compatible with types uint256 and event MyCustomEvent(uint256)
-// TypeError 7366: (183-201): Operator -= not compatible with types uint256 and event MyCustomEvent(uint256)
+// TypeError 7366: (127-145): Operator -= not compatible with types event MyCustomEvent(uint256) and int_const 1.
+// TypeError 7366: (155-173): Operator += not compatible with types uint256 and event MyCustomEvent(uint256).
+// TypeError 7366: (183-201): Operator -= not compatible with types uint256 and event MyCustomEvent(uint256).
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol b/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
index 55ee62dea5..110b8d2140 100644
--- a/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
+++ b/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
@@ -7,4 +7,4 @@ contract C {
 
 // ----
 // TypeError 4247: (83-96): Expression has to be an lvalue.
-// TypeError 9767: (83-98): Unary operator ++ cannot be applied to type event MyCustomEvent(uint256)
+// TypeError 9767: (83-98): Unary operator ++ cannot be applied to type event MyCustomEvent(uint256).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
index 32fed1f6a4..67911852ff 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-88): Operator > not compatible with types function () external returns (bool) and function () external returns (bool)
+// TypeError 2271: (73-88): Operator > not compatible with types function () external returns (bool) and function () external returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
index 70a391ed99..bc3882fdd8 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-78): Operator > not compatible with types function () returns (bool) and function () returns (bool)
+// TypeError 2271: (73-78): Operator > not compatible with types function () returns (bool) and function () returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
index 8eeaf36978..e924893f02 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-88): Operator < not compatible with types function () external returns (bool) and function () external returns (bool)
+// TypeError 2271: (73-88): Operator < not compatible with types function () external returns (bool) and function () external returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
index 6fa1c281a7..16dc981ad7 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-78): Operator < not compatible with types function () returns (bool) and function () returns (bool)
+// TypeError 2271: (73-78): Operator < not compatible with types function () returns (bool) and function () returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
index 7b0713cafa..824f2dbf86 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
@@ -8,5 +8,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (193-259): Operator == not compatible with types function () external and function () external
-// TypeError 2271: (277-351): Operator == not compatible with types function () external and function () external
+// TypeError 2271: (193-259): Operator == not compatible with types function () external and function () external.
+// TypeError 2271: (277-351): Operator == not compatible with types function () external and function () external.
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
index 19f44658f5..a562b2d3f6 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
@@ -19,5 +19,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (606-672): Operator != not compatible with types function () and function () external
-// TypeError 2271: (688-741): Operator != not compatible with types function () and function () external
+// TypeError 2271: (606-672): Operator != not compatible with types function () and function () external.
+// TypeError 2271: (688-741): Operator != not compatible with types function () and function () external.
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol
index 39381f454b..93facedb0c 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol
@@ -21,6 +21,6 @@ contract C {
 // ----
 // TypeError 9574: (249-333): Type function (uint256) external is not implicitly convertible to expected type function () external.
 // TypeError 9574: (343-427): Type function (bool) external is not implicitly convertible to expected type function () external.
-// TypeError 2271: (458-522): Operator == not compatible with types function (uint256) external and function () external
-// TypeError 2271: (538-602): Operator == not compatible with types function (bool) external and function () external
-// TypeError 2271: (726-786): Operator != not compatible with types function (bool) external and function (uint256) external
+// TypeError 2271: (458-522): Operator == not compatible with types function (uint256) external and function () external.
+// TypeError 2271: (538-602): Operator == not compatible with types function (bool) external and function () external.
+// TypeError 2271: (726-786): Operator != not compatible with types function (bool) external and function (uint256) external.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
index 568fe27ffb..fa1950d924 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
@@ -6,4 +6,4 @@ contract C
     }
 }
 // ----
-// TypeError 9767: (59-64): Unary operator -- cannot be applied to type tuple(,)
+// TypeError 9767: (59-64): Unary operator -- cannot be applied to type tuple(,).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
index 9727e53a51..c73fe7435e 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
@@ -7,4 +7,4 @@ contract C
 }
 // ----
 // TypeError 4247: (68-69): Expression has to be an lvalue.
-// TypeError 9767: (59-70): Unary operator delete cannot be applied to type tuple(,int_const 0)
+// TypeError 9767: (59-70): Unary operator delete cannot be applied to type tuple(,int_const 0).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
index 487c224be3..3cbab14234 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
@@ -6,4 +6,4 @@ contract C
     }
 }
 // ----
-// TypeError 9767: (61-66): Unary operator ++ cannot be applied to type tuple(,)
+// TypeError 9767: (61-66): Unary operator ++ cannot be applied to type tuple(,).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
index 2c568a4e72..01056ffe21 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
@@ -10,11 +10,11 @@ contract C
 }
 // ----
 // SyntaxError 9636: (59-66): Use of unary + is disallowed.
-// TypeError 4907: (59-66): Unary operator + cannot be applied to type tuple(int_const 0,int_const 0)
+// TypeError 4907: (59-66): Unary operator + cannot be applied to type tuple(int_const 0,int_const 0).
 // TypeError 7364: (51-66): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (84-91): Unary operator - cannot be applied to type tuple(int_const 0,int_const 0)
+// TypeError 4907: (84-91): Unary operator - cannot be applied to type tuple(int_const 0,int_const 0).
 // TypeError 7364: (76-91): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (111-118): Unary operator ~ cannot be applied to type tuple(int_const 0,int_const 0)
+// TypeError 4907: (111-118): Unary operator ~ cannot be applied to type tuple(int_const 0,int_const 0).
 // TypeError 7364: (101-118): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (138-145): Unary operator ! cannot be applied to type tuple(int_const 0,int_const 0)
+// TypeError 4907: (138-145): Unary operator ! cannot be applied to type tuple(int_const 0,int_const 0).
 // TypeError 7364: (128-145): Different number of components on the left hand side (1) than on the right hand side (2).
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
index 2b20cec4bf..211eabac22 100644
--- a/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant a = 1 / 0;
 }
 // ----
-// TypeError 2271: (35-40): Operator / not compatible with types int_const 1 and int_const 0
+// TypeError 2271: (35-40): Operator / not compatible with types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
index f6b494d3d8..afa0896fa8 100644
--- a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant a = 1 / ((1+3)-4);
 }
 // ----
-// TypeError 2271: (35-48): Operator / not compatible with types int_const 1 and int_const 0
+// TypeError 2271: (35-48): Operator / not compatible with types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
index a7d470b24b..28f95e3327 100644
--- a/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant b3 = 1 % 0;
 }
 // ----
-// TypeError 2271: (36-41): Operator % not compatible with types int_const 1 and int_const 0
+// TypeError 2271: (36-41): Operator % not compatible with types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
index 9aba4dd75f..54b6b309bd 100644
--- a/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant b3 = 1 % (-4+((2)*2));
 }
 // ----
-// TypeError 2271: (36-52): Operator % not compatible with types int_const 1 and int_const 0
+// TypeError 2271: (36-52): Operator % not compatible with types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/metaTypes/integer_err.sol b/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
index 0b1fab2e5f..b098a86029 100644
--- a/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
@@ -12,4 +12,4 @@ contract Test {
 // ----
 // TypeError 9574: (59-89): Type int256 is not implicitly convertible to expected type uint8.
 // TypeError 9574: (99-127): Type int256 is not implicitly convertible to expected type uint256.
-// TypeError 2271: (142-169): Operator == not compatible with types int256 and int_const 1157...(70 digits omitted)...9935
+// TypeError 2271: (142-169): Operator == not compatible with types int256 and int_const 1157...(70 digits omitted)...9935.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
index ea30647df0..528635b983 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
@@ -2,4 +2,4 @@ contract test {
     function f() public { int32(2) == uint64(2); }
 }
 // ----
-// TypeError 2271: (42-63): Operator == not compatible with types int32 and uint64
+// TypeError 2271: (42-63): Operator == not compatible with types int32 and uint64.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
index 9f50403cbf..7849588a40 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (147-153): Operator == not compatible with types mapping(uint256 => uint256) and mapping(uint256 => uint256)
+// TypeError 2271: (147-153): Operator == not compatible with types mapping(uint256 => uint256) and mapping(uint256 => uint256).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
index 49f9877e25..0dfeb892a6 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
@@ -2,4 +2,4 @@ contract test {
     function f() public returns (uint d) { return 2 ** 10000000000; }
 }
 // ----
-// TypeError 2271: (66-82): Operator ** not compatible with types int_const 2 and int_const 10000000000
+// TypeError 2271: (66-82): Operator ** not compatible with types int_const 2 and int_const 10000000000.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
index 5b19505f09..24c6ce13c7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 1; uint y = 2; x || y; } }
 // ----
-// TypeError 2271: (62-68): Operator || not compatible with types uint256 and uint256
+// TypeError 2271: (62-68): Operator || not compatible with types uint256 and uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
index 8981af1b13..1d1298b050 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 1; uint y = 2; x && y; } }
 // ----
-// TypeError 2271: (62-68): Operator && not compatible with types uint256 and uint256
+// TypeError 2271: (62-68): Operator && not compatible with types uint256 and uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
index 3c8fd4fc29..c4fff97b47 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 1; !x; } }
 // ----
-// TypeError 4907: (50-52): Unary operator ! cannot be applied to type uint256
+// TypeError 4907: (50-52): Unary operator ! cannot be applied to type uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
index b1f63003f2..60dffe643f 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
@@ -1,3 +1,3 @@
 contract test { bytes a; bytes b; fallback() external { a == b; } }
 // ----
-// TypeError 2271: (56-62): Operator == not compatible with types bytes storage ref and bytes storage ref
+// TypeError 2271: (56-62): Operator == not compatible with types bytes storage ref and bytes storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
index cdb7aeb01a..822db8dd55 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
@@ -7,4 +7,4 @@ contract test {
   }
 }
 // ----
-// TypeError 2271: (79-85): Operator == not compatible with types struct test.s storage ref and struct test.s storage ref
+// TypeError 2271: (79-85): Operator == not compatible with types struct test.s storage ref and struct test.s storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
index b1b43c6317..e0db21efab 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9767: (97-105): Unary operator delete cannot be applied to type uint256[] storage pointer
+// TypeError 9767: (97-105): Unary operator delete cannot be applied to type uint256[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
index 276c6533d0..eeaa66ebc4 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
@@ -7,4 +7,4 @@ contract test {
 }
 // ----
 // SyntaxError 9636: (70-75): Use of unary + is disallowed.
-// TypeError 4907: (70-75): Unary operator + cannot be applied to type rational_const 13 / 4
+// TypeError 4907: (70-75): Unary operator + cannot be applied to type rational_const 13 / 4.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
index 8aa8260091..47a1a617f6 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (60-69): Operator ** not compatible with types int_const 2 and rational_const -11 / 5
+// TypeError 2271: (60-69): Operator ** not compatible with types int_const 2 and rational_const -11 / 5.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
index 29b6f088d4..0f93157ed4 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (61-69): Operator ** not compatible with types int_const 3 and rational_const 5 / 2
+// TypeError 2271: (61-69): Operator ** not compatible with types int_const 3 and rational_const 5 / 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
index 95a8120bab..721ca806e4 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-60): Operator ** not compatible with types int_const 2 and rational_const 1 / 2
+// TypeError 2271: (50-60): Operator ** not compatible with types int_const 2 and rational_const 1 / 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
index 15d1f18d6b..6408f13c61 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-62): Operator ** not compatible with types int_const 42 and rational_const -1 / 4
+// TypeError 2271: (50-62): Operator ** not compatible with types int_const 42 and rational_const -1 / 4.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
index a084756e6a..4bf484ff1b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4907: (50-61): Unary operator ~ cannot be applied to type fixed128x18
+// TypeError 4907: (50-61): Unary operator ~ cannot be applied to type fixed128x18.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
index 5d5cd6a9b2..66f5e620a2 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-64): Operator | not compatible with types fixed128x18 and int_const 3
+// TypeError 2271: (50-64): Operator | not compatible with types fixed128x18 and int_const 3.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
index ee96badae6..791e1480c3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-65): Operator ^ not compatible with types fixed128x18 and int_const 3
+// TypeError 2271: (50-65): Operator ^ not compatible with types fixed128x18 and int_const 3.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
index da836f31a7..9e49de99b7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-65): Operator & not compatible with types fixed128x18 and int_const 3
+// TypeError 2271: (50-65): Operator & not compatible with types fixed128x18 and int_const 3.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
index fcd56bc0d2..aaa0903b69 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 << -8;
 }
 // ----
-// TypeError 2271: (33-43): Operator << not compatible with types int_const 66 and int_const -8
+// TypeError 2271: (33-43): Operator << not compatible with types int_const 66 and int_const -8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
index 344dce513e..edfb03d3d1 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 >> -8;
 }
 // ----
-// TypeError 2271: (33-43): Operator >> not compatible with types int_const 66 and int_const -8
+// TypeError 2271: (33-43): Operator >> not compatible with types int_const 66 and int_const -8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
index 1809a677b7..17e7cc7199 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 << 0x100000000;
 }
 // ----
-// TypeError 2271: (33-52): Operator << not compatible with types int_const 66 and int_const 4294967296
+// TypeError 2271: (33-52): Operator << not compatible with types int_const 66 and int_const 4294967296.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
index 858f547ddb..f96eeab2dc 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 >> 0x100000000;
 }
 // ----
-// TypeError 2271: (33-52): Operator >> not compatible with types int_const 66 and int_const 4294967296
+// TypeError 2271: (33-52): Operator >> not compatible with types int_const 66 and int_const 4294967296.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
index d377c315a2..8f005b9ec0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 >> (1 / 2);
 }
 // ----
-// TypeError 2271: (33-48): Operator >> not compatible with types int_const 66 and rational_const 1 / 2
+// TypeError 2271: (33-48): Operator >> not compatible with types int_const 66 and rational_const 1 / 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol
index 7b58b870f0..6cd7f99c6d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/compoundAssignment/incomp_types.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 7366: (72-83): Operator += not compatible with types uint256 and tuple(int_const 1,int_const 1)
+// TypeError 7366: (72-83): Operator += not compatible with types uint256 and tuple(int_const 1,int_const 1).
diff --git a/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol b/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
index 4d1afd7af2..7005c8848b 100644
--- a/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
+++ b/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
@@ -6,4 +6,4 @@ contract test {
 }
 // ----
 // SyntaxError 9636: (70-72): Use of unary + is disallowed.
-// TypeError 4907: (70-72): Unary operator + cannot be applied to type uint256
+// TypeError 4907: (70-72): Unary operator + cannot be applied to type uint256.
diff --git a/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol b/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
index adca80cc4a..87a2dee81b 100644
--- a/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
+++ b/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (89-95): Operator >> not compatible with types int256 and int256
-// TypeError 2271: (179-193): Operator >> not compatible with types int256 and int256
+// TypeError 2271: (89-95): Operator >> not compatible with types int256 and int256.
+// TypeError 2271: (179-193): Operator >> not compatible with types int256 and int256.
diff --git a/test/libsolidity/syntaxTests/types/bool_ops.sol b/test/libsolidity/syntaxTests/types/bool_ops.sol
index 7aac8729bd..b107c979a1 100644
--- a/test/libsolidity/syntaxTests/types/bool_ops.sol
+++ b/test/libsolidity/syntaxTests/types/bool_ops.sol
@@ -32,22 +32,22 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (231-236): Operator > not compatible with types bool and bool
-// TypeError 2271: (250-255): Operator < not compatible with types bool and bool
-// TypeError 2271: (269-275): Operator >= not compatible with types bool and bool
-// TypeError 2271: (289-295): Operator <= not compatible with types bool and bool
-// TypeError 2271: (309-314): Operator & not compatible with types bool and bool
-// TypeError 2271: (328-333): Operator | not compatible with types bool and bool
-// TypeError 2271: (347-352): Operator ^ not compatible with types bool and bool
-// TypeError 4907: (366-368): Unary operator ~ cannot be applied to type bool
-// TypeError 4907: (382-384): Unary operator ~ cannot be applied to type bool
-// TypeError 2271: (398-403): Operator + not compatible with types bool and bool
-// TypeError 2271: (417-422): Operator - not compatible with types bool and bool
-// TypeError 4907: (436-438): Unary operator - cannot be applied to type bool
-// TypeError 4907: (452-454): Unary operator - cannot be applied to type bool
-// TypeError 2271: (468-473): Operator * not compatible with types bool and bool
-// TypeError 2271: (487-492): Operator / not compatible with types bool and bool
-// TypeError 2271: (506-512): Operator ** not compatible with types bool and bool
-// TypeError 2271: (526-531): Operator % not compatible with types bool and bool
-// TypeError 2271: (545-551): Operator << not compatible with types bool and bool
-// TypeError 2271: (565-571): Operator >> not compatible with types bool and bool
+// TypeError 2271: (231-236): Operator > not compatible with types bool and bool.
+// TypeError 2271: (250-255): Operator < not compatible with types bool and bool.
+// TypeError 2271: (269-275): Operator >= not compatible with types bool and bool.
+// TypeError 2271: (289-295): Operator <= not compatible with types bool and bool.
+// TypeError 2271: (309-314): Operator & not compatible with types bool and bool.
+// TypeError 2271: (328-333): Operator | not compatible with types bool and bool.
+// TypeError 2271: (347-352): Operator ^ not compatible with types bool and bool.
+// TypeError 4907: (366-368): Unary operator ~ cannot be applied to type bool.
+// TypeError 4907: (382-384): Unary operator ~ cannot be applied to type bool.
+// TypeError 2271: (398-403): Operator + not compatible with types bool and bool.
+// TypeError 2271: (417-422): Operator - not compatible with types bool and bool.
+// TypeError 4907: (436-438): Unary operator - cannot be applied to type bool.
+// TypeError 4907: (452-454): Unary operator - cannot be applied to type bool.
+// TypeError 2271: (468-473): Operator * not compatible with types bool and bool.
+// TypeError 2271: (487-492): Operator / not compatible with types bool and bool.
+// TypeError 2271: (506-512): Operator ** not compatible with types bool and bool.
+// TypeError 2271: (526-531): Operator % not compatible with types bool and bool.
+// TypeError 2271: (545-551): Operator << not compatible with types bool and bool.
+// TypeError 2271: (565-571): Operator >> not compatible with types bool and bool.
diff --git a/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol b/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
index 5fbfa919a0..b5676f23c3 100644
--- a/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
+++ b/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
@@ -2,4 +2,4 @@ contract C {
     bytes32 b = ~hex"00ff11";
 }
 // ----
-// TypeError 4907: (29-41): Unary operator ~ cannot be applied to type literal_string hex"00ff11"
+// TypeError 4907: (29-41): Unary operator ~ cannot be applied to type literal_string hex"00ff11".
diff --git a/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
index 9c59b015c7..15146500a6 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
@@ -8,6 +8,6 @@ contract c {
 }
 // ----
 // TypeError 7407: (71-80): Type int_const 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (133-142): Operator << not compatible with types int_const 1 and int_const 4096
-// TypeError 2271: (169-182): Operator << not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 2
+// TypeError 2271: (133-142): Operator << not compatible with types int_const 1 and int_const 4096.
+// TypeError 2271: (169-182): Operator << not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 2.
 // TypeError 7407: (169-182): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol b/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
index 2d7fbdfad9..3ab4cdae3c 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
@@ -19,29 +19,29 @@ contract c {
     }
 }
 // ----
-// TypeError 2271: (71-112): Operator ** not compatible with types int_const 1797...(301 digits omitted)...7216 and int_const 4
+// TypeError 2271: (71-112): Operator ** not compatible with types int_const 1797...(301 digits omitted)...7216 and int_const 4.
 // TypeError 7407: (71-112): Type int_const 1797...(301 digits omitted)...7216 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (135-151): Operator ** not compatible with types int_const 4 and int_const 1157...(70 digits omitted)...9936
+// TypeError 2271: (135-151): Operator ** not compatible with types int_const 4 and int_const 1157...(70 digits omitted)...9936.
 // TypeError 7407: (126-169): Type int_const 1340...(147 digits omitted)...4096 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (201-217): Operator ** not compatible with types int_const 4 and int_const 1340...(147 digits omitted)...4096
-// TypeError 2271: (183-219): Operator ** not compatible with types int_const 4 and int_const -115...(71 digits omitted)...9936
-// TypeError 2271: (233-244): Operator ** not compatible with types int_const 2 and int_const 1000...(1226 digits omitted)...0000
-// TypeError 2271: (258-270): Operator ** not compatible with types int_const -2 and int_const 1000...(1226 digits omitted)...0000
-// TypeError 2271: (284-296): Operator ** not compatible with types int_const 2 and int_const -100...(1227 digits omitted)...0000
-// TypeError 2271: (310-323): Operator ** not compatible with types int_const -2 and int_const -100...(1227 digits omitted)...0000
-// TypeError 2271: (337-348): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 2
+// TypeError 2271: (201-217): Operator ** not compatible with types int_const 4 and int_const 1340...(147 digits omitted)...4096.
+// TypeError 2271: (183-219): Operator ** not compatible with types int_const 4 and int_const -115...(71 digits omitted)...9936.
+// TypeError 2271: (233-244): Operator ** not compatible with types int_const 2 and int_const 1000...(1226 digits omitted)...0000.
+// TypeError 2271: (258-270): Operator ** not compatible with types int_const -2 and int_const 1000...(1226 digits omitted)...0000.
+// TypeError 2271: (284-296): Operator ** not compatible with types int_const 2 and int_const -100...(1227 digits omitted)...0000.
+// TypeError 2271: (310-323): Operator ** not compatible with types int_const -2 and int_const -100...(1227 digits omitted)...0000.
+// TypeError 2271: (337-348): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 2.
 // TypeError 7407: (337-348): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (362-374): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const 2
+// TypeError 2271: (362-374): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const 2.
 // TypeError 7407: (362-374): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (388-400): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const -2
+// TypeError 2271: (388-400): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const -2.
 // TypeError 7407: (388-400): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (414-427): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const -2
+// TypeError 2271: (414-427): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const -2.
 // TypeError 7407: (414-427): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (441-457): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000
+// TypeError 2271: (441-457): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000.
 // TypeError 7407: (441-457): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (471-488): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000
+// TypeError 2271: (471-488): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000.
 // TypeError 7407: (471-488): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (502-519): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000
+// TypeError 2271: (502-519): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000.
 // TypeError 7407: (502-519): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (533-551): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000
+// TypeError 2271: (533-551): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000.
 // TypeError 7407: (533-551): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.

From 796fb2cfad3dd7172d648313a4cb8ca68735a5be Mon Sep 17 00:00:00 2001
From: minami <minaminaoy@gmail.com>
Date: Thu, 4 Aug 2022 15:17:32 +0900
Subject: [PATCH 0766/1748] Fix description of `this` in free functions

---
 docs/contracts/functions.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index 76304aaad0..eebd1d45a8 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -35,10 +35,10 @@ that call them, similar to internal library functions.
 
 .. note::
     Functions defined outside a contract are still always executed
-    in the context of a contract. They still have access to the variable ``this``,
-    can call other contracts, send them Ether and destroy the contract that called them,
+    in the context of a contract.
+    They still can call other contracts, send them Ether and destroy the contract that called them,
     among other things. The main difference to functions defined inside a contract
-    is that free functions do not have direct access to storage variables and functions
+    is that free functions do not have direct access to the variable ``this``, storage variables and functions
     not in their scope.
 
 .. _function-parameters-return-variables:

From 53947404e45d6ae614cfc582a7ac442e0213f174 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Fri, 5 Aug 2022 13:05:13 +0200
Subject: [PATCH 0767/1748] Place calldata to calldata coder sanity checks.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 test/tools/ossfuzz/abiV2ProtoFuzzer.cpp | 15 +++++++++++----
 test/tools/ossfuzz/protoToAbiV2.cpp     | 11 ++++++++++-
 test/tools/ossfuzz/protoToAbiV2.h       |  2 ++
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp b/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
index f24d4f12de..977d1bc455 100644
--- a/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
@@ -66,9 +66,16 @@ DEFINE_PROTO_FUZZER(Contract const& _input)
 		// We don't care about EVM One failures other than EVMC_REVERT
 		solAssert(result->status_code != EVMC_REVERT, "Proto ABIv2 fuzzer: EVM One reverted");
 		if (result->status_code == EVMC_SUCCESS)
-			solAssert(
-				EvmoneUtility::zeroWord(result->output_data, result->output_size),
-				"Proto ABIv2 fuzzer: ABIv2 coding failure found"
-			);
+			if (!EvmoneUtility::zeroWord(result->output_data, result->output_size))
+			{
+				solidity::bytes resultAsBytes;
+				for (size_t i = 0; i < result->output_size; i++)
+					resultAsBytes.push_back(result->output_data[i]);
+				cout << solidity::util::toHex(resultAsBytes) << endl;
+				solAssert(
+					false,
+					"Proto ABIv2 fuzzer: ABIv2 coding failure found"
+				);
+			}
 	}
 }
diff --git a/test/tools/ossfuzz/protoToAbiV2.cpp b/test/tools/ossfuzz/protoToAbiV2.cpp
index 47d3942bb0..a444228a1e 100644
--- a/test/tools/ossfuzz/protoToAbiV2.cpp
+++ b/test/tools/ossfuzz/protoToAbiV2.cpp
@@ -426,6 +426,10 @@ void ProtoConverter::appendTypedParamsExternal(
 		("type", qualifiedTypeString)
 		("varName", _varName)
 		.render();
+	m_untypedParamsExternal << Whiskers(R"(<delimiter><varName>)")
+		("delimiter", delimiterToString(_delimiter))
+		("varName", _varName)
+		.render();
 }
 
 // Adds the qualifier "memory" to non-value parameter of an external function.
@@ -671,7 +675,11 @@ string ProtoConverter::calldataHelperFunctions()
 		return 0;
 	}
 
-	function coder_calldata_external(<parameters_calldata>) external pure returns (uint) {
+	function coder_calldata_external(<parameters_calldata>) external view returns (uint) {
+		return this.coder_calldata_external_indirection(<untyped_parameters>);
+	}
+
+	function coder_calldata_external_indirection(<parameters_calldata>) external pure returns (uint) {
 <equality_checks>
 		return 0;
 	}
@@ -679,6 +687,7 @@ string ProtoConverter::calldataHelperFunctions()
 	("parameters_memory", typedParametersAsString(CalleeType::PUBLIC))
 	("equality_checks", equalityChecksAsString())
 	("parameters_calldata", typedParametersAsString(CalleeType::EXTERNAL))
+	("untyped_parameters", m_untypedParamsExternal.str())
 	.render();
 
 	return calldataHelperFuncs.str();
diff --git a/test/tools/ossfuzz/protoToAbiV2.h b/test/tools/ossfuzz/protoToAbiV2.h
index 83246ac53f..3e7f47994e 100644
--- a/test/tools/ossfuzz/protoToAbiV2.h
+++ b/test/tools/ossfuzz/protoToAbiV2.h
@@ -390,6 +390,8 @@ class ProtoConverter
 	/// Contains typed parameter list to be passed to callee functions
 	std::ostringstream m_typedParamsExternal;
 	std::ostringstream m_typedParamsPublic;
+	/// Contains parameter list to be passed to callee functions
+	std::ostringstream m_untypedParamsExternal;
 	/// Contains type string to be passed to Isabelle API
 	std::ostringstream m_isabelleTypeString;
 	/// Contains values to be encoded in the format accepted

From 22c7cd22b92d3e0c9d81880492cf8c56ea0370cd Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 27 Jul 2022 18:46:36 +0200
Subject: [PATCH 0768/1748] Fix wrong cleanup when copying from calldata to
 memory
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 Changelog.md                                  |  4 +
 docs/bugs.json                                | 12 +++
 docs/bugs_by_version.json                     | 49 ++++++++++-
 libsolidity/codegen/ABIFunctions.cpp          | 11 +--
 libsolidity/codegen/ABIFunctions.h            |  2 +-
 libsolidity/codegen/YulUtilFunctions.cpp      | 20 +++--
 libsolidity/codegen/YulUtilFunctions.h        |  5 +-
 .../debug_info_in_yul_snippet_escaping/output | 15 +---
 test/cmdlineTests/name_simplifier/output      |  5 +-
 .../viair_subobject_optimization/output       | 82 +++++++++----------
 .../yul_string_format_ascii/output.json       | 10 +--
 .../yul_string_format_ascii_long/output.json  | 10 +--
 test/libsolidity/gasTests/abiv2.sol           |  6 +-
 test/libsolidity/gasTests/abiv2_optimised.sol |  6 +-
 .../abi_encode_calldata_slice.sol             | 12 +--
 .../calldata_bytes_bytes32_arrays.sol         | 14 ++++
 ...emory_dynamic_array_and_calldata_bytes.sol | 17 ++++
 .../abi_encode_calldata_slice.sol             | 12 +--
 .../abiEncoderV2/abi_encode_v2.sol            |  6 +-
 ...overflow_with_static_array_cleanup_bug.sol | 17 ++++
 .../abiEncoderV2/calldata_array.sol           |  6 +-
 ...lldata_array_dynamic_static_in_library.sol | 17 ++++
 .../cleanup/reencoded_calldata_string.sol     | 27 ++++++
 ...emory_dynamic_array_and_calldata_bytes.sol | 13 +++
 ...ynamic_array_and_calldata_static_array.sol | 18 ++++
 .../abiEncoderV2/storage_array_encoding.sol   | 12 +--
 .../abi_decode_simple_storage.sol             |  6 +-
 .../copying/bytes_storage_to_storage.sol      | 30 +++----
 .../copy_byte_array_in_struct_to_storage.sol  | 12 +--
 .../function_type_array_to_storage.sol        | 12 +--
 .../copying/storage_memory_nested_bytes.sol   |  6 +-
 .../array/pop/byte_array_pop_copy_long.sol    |  6 +-
 .../array/pop/byte_array_pop_masking_long.sol |  6 +-
 .../byte_array_to_storage_cleanup.sol         |  6 +-
 .../bytes_in_constructors_packer.sol          |  6 +-
 .../bytes_in_constructors_unpacker.sol        |  6 +-
 ..._calldata_uint_array_and_dynamic_array.sol | 10 +++
 ..._calldata_uint_array_and_dynamic_array.sol | 11 +++
 .../externalContracts/FixedFeeRegistrar.sol   |  6 +-
 .../externalContracts/base64.sol              |  6 +-
 .../externalContracts/deposit_contract.sol    | 30 +++----
 .../externalContracts/strings.sol             |  6 +-
 .../external_call_to_nonexisting.sol          |  6 +-
 ...ernal_call_to_nonexisting_debugstrings.sol |  6 +-
 .../semanticTests/various/address_code.sol    |  6 +-
 .../skip_dynamic_types_for_structs.sol        |  6 +-
 .../syntaxTests/bytecode_too_large.sol        |  2 +-
 .../bytecode_too_large_byzantium.sol          |  2 +-
 48 files changed, 393 insertions(+), 208 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV1/calldata_bytes_bytes32_arrays.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/abi_encoder_v2_head_overflow_with_static_array_cleanup_bug.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_in_library.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/cleanup/reencoded_calldata_string.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol
 create mode 100644 test/libsolidity/semanticTests/errors/error_static_calldata_uint_array_and_dynamic_array.sol
 create mode 100644 test/libsolidity/semanticTests/events/event_static_calldata_uint_array_and_dynamic_array.sol

diff --git a/Changelog.md b/Changelog.md
index 148b67c985..4fceab86f9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,8 @@
 ### 0.8.16 (unreleased)
 
+Important Bugfixes:
+ * Code Generation: Fix data corruption that affected ABI-encoding of calldata values represented by tuples: structs at any nesting level; argument lists of external functions, events and errors; return value lists of external functions. The 32 leading bytes of the first dynamically-encoded value in the tuple would get zeroed when the last component contained a statically-encoded array.
+
 Language Features:
 
 
@@ -10,6 +13,7 @@ Compiler Features:
  * Yul Optimizer: Add rule to convert `mod(add(X, Y), A)` into `addmod(X, Y, A)`, if `A` is a power of two.
  * Code Generator: More efficient code for checked addition and subtraction.
 
+
 Bugfixes:
  * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
  * Type Checker: Fix null dereference in `abi.encodeCall` type checking of free function.
diff --git a/docs/bugs.json b/docs/bugs.json
index b7108fac1a..bdea0a7c2c 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -1,4 +1,16 @@
 [
+    {
+        "uid": "SOL-2022-6",
+        "name": "AbiReencodingHeadOverflowWithStaticArrayCleanup",
+        "summary": "ABI-encoding a tuple with a statically-sized calldata array in the last component would corrupt 32 leading bytes of its first dynamically encoded component.",
+        "description": "When ABI-encoding a statically-sized calldata array, the compiler always pads the data area to a multiple of 32-bytes and ensures that the padding bytes are zeroed. In some cases, this cleanup used to be performed by always writing exactly 32 bytes, regardless of how many needed to be zeroed. This was done with the assumption that the data that would eventually occupy the area past the end of the array had not yet been written, because the encoder processes tuple components in the order they were given. While this assumption is mostly true, there is an important corner case: dynamically encoded tuple components are stored separately from the statically-sized ones in an area called the *tail* of the encoding and the tail immediately follows the *head*, which is where the statically-sized components are placed. The aforementioned cleanup, if performed for the last component of the head would cross into the tail and overwrite up to 32 bytes of the first component stored there with zeros. The only array type for which the cleanup could actually result in an overwrite were arrays with ``uint256`` or ``bytes32`` as the base element type and in this case the size of the corrupted area was always exactly 32 bytes. The problem affected tuples at any nesting level. This included also structs, which are encoded as tuples in the ABI. Note also that lists of parameters and return values of functions, events and errors are encoded as tuples.",
+        "introduced": "0.5.8",
+        "fixed": "0.8.16",
+        "severity": "medium",
+        "conditions": {
+            "ABIEncoderV2": true
+        }
+    },
     {
         "uid": "SOL-2022-5",
         "name": "DirtyBytesArrayToStorage",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index c11f32e19c..9c1b7ad744 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1083,6 +1083,7 @@
     },
     "0.5.10": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1100,6 +1101,7 @@
     },
     "0.5.11": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1116,6 +1118,7 @@
     },
     "0.5.12": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1132,6 +1135,7 @@
     },
     "0.5.13": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1148,6 +1152,7 @@
     },
     "0.5.14": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1166,6 +1171,7 @@
     },
     "0.5.15": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1183,6 +1189,7 @@
     },
     "0.5.16": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1199,6 +1206,7 @@
     },
     "0.5.17": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1338,6 +1346,7 @@
     },
     "0.5.8": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1358,6 +1367,7 @@
     },
     "0.5.9": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1377,6 +1387,7 @@
     },
     "0.6.0": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1394,6 +1405,7 @@
     },
     "0.6.1": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1410,6 +1422,7 @@
     },
     "0.6.10": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1423,6 +1436,7 @@
     },
     "0.6.11": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1436,6 +1450,7 @@
     },
     "0.6.12": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1449,6 +1464,7 @@
     },
     "0.6.2": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1465,6 +1481,7 @@
     },
     "0.6.3": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1481,6 +1498,7 @@
     },
     "0.6.4": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
@@ -1497,6 +1515,7 @@
     },
     "0.6.5": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1513,6 +1532,7 @@
     },
     "0.6.6": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1528,6 +1548,7 @@
     },
     "0.6.7": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1543,6 +1564,7 @@
     },
     "0.6.8": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCallataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
@@ -1555,6 +1577,7 @@
     },
     "0.6.9": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1569,6 +1592,7 @@
     },
     "0.7.0": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1582,6 +1606,7 @@
     },
     "0.7.1": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1596,6 +1621,7 @@
     },
     "0.7.2": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1609,6 +1635,7 @@
     },
     "0.7.3": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1621,6 +1648,7 @@
     },
     "0.7.4": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1632,6 +1660,7 @@
     },
     "0.7.5": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1643,6 +1672,7 @@
     },
     "0.7.6": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1654,6 +1684,7 @@
     },
     "0.8.0": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1665,6 +1696,7 @@
     },
     "0.8.1": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1676,6 +1708,7 @@
     },
     "0.8.10": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation"
@@ -1684,6 +1717,7 @@
     },
     "0.8.11": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1693,6 +1727,7 @@
     },
     "0.8.12": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1702,6 +1737,7 @@
     },
     "0.8.13": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "InlineAssemblyMemorySideEffects",
             "DataLocationChangeInInternalOverride",
@@ -1711,17 +1747,21 @@
     },
     "0.8.14": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "InlineAssemblyMemorySideEffects"
         ],
         "released": "2022-05-17"
     },
     "0.8.15": {
-        "bugs": [],
+        "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup"
+        ],
         "released": "2022-06-15"
     },
     "0.8.2": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1733,6 +1773,7 @@
     },
     "0.8.3": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1743,6 +1784,7 @@
     },
     "0.8.4": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1752,6 +1794,7 @@
     },
     "0.8.5": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1761,6 +1804,7 @@
     },
     "0.8.6": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1770,6 +1814,7 @@
     },
     "0.8.7": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1779,6 +1824,7 @@
     },
     "0.8.8": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation",
@@ -1789,6 +1835,7 @@
     },
     "0.8.9": {
         "bugs": [
+            "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
             "NestedCallataArrayAbiReencodingSizeValidation"
diff --git a/libsolidity/codegen/ABIFunctions.cpp b/libsolidity/codegen/ABIFunctions.cpp
index e83f940f51..c92525f212 100644
--- a/libsolidity/codegen/ABIFunctions.cpp
+++ b/libsolidity/codegen/ABIFunctions.cpp
@@ -468,7 +468,8 @@ string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
 		_to.identifier() +
 		_options.toFunctionNameSuffix();
 	return createFunction(functionName, [&]() {
-		bool needsPadding = _options.padded && fromArrayType.isByteArrayOrString();
+		bool bytesOrString = fromArrayType.isByteArrayOrString();
+		bool needsPadding = _options.padded && bytesOrString;
 		if (fromArrayType.isDynamicallySized())
 		{
 			Whiskers templ(R"(
@@ -498,7 +499,7 @@ string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
 				);
 			templ("readableTypeNameFrom", _from.toString(true));
 			templ("readableTypeNameTo", _to.toString(true));
-			templ("copyFun", m_utils.copyToMemoryFunction(true));
+			templ("copyFun", m_utils.copyToMemoryFunction(true, /*cleanup*/bytesOrString));
 			templ("lengthPadded", needsPadding ? m_utils.roundUpFunction() + "(length)" : "length");
 			return templ.render();
 		}
@@ -514,7 +515,7 @@ string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
 			templ("functionName", functionName);
 			templ("readableTypeNameFrom", _from.toString(true));
 			templ("readableTypeNameTo", _to.toString(true));
-			templ("copyFun", m_utils.copyToMemoryFunction(true));
+			templ("copyFun", m_utils.copyToMemoryFunction(true, /*cleanup*/bytesOrString));
 			templ("byteLength", toCompactHexWithPrefix(fromArrayType.length() * fromArrayType.calldataStride()));
 			return templ.render();
 		}
@@ -662,7 +663,7 @@ string ABIFunctions::abiEncodingFunctionMemoryByteArray(
 		templ("functionName", functionName);
 		templ("lengthFun", m_utils.arrayLengthFunction(_from));
 		templ("storeLength", arrayStoreLengthForEncodingFunction(_to, _options));
-		templ("copyFun", m_utils.copyToMemoryFunction(false));
+		templ("copyFun", m_utils.copyToMemoryFunction(false, /*cleanup*/true));
 		templ("lengthPadded", _options.padded ? m_utils.roundUpFunction() + "(length)" : "length");
 		return templ.render();
 	});
@@ -1296,7 +1297,7 @@ string ABIFunctions::abiDecodingFunctionByteArrayAvailableLength(ArrayType const
 		templ("functionName", functionName);
 		templ("allocate", m_utils.allocationFunction());
 		templ("allocationSize", m_utils.arrayAllocationSizeFunction(_type));
-		templ("copyToMemFun", m_utils.copyToMemoryFunction(!_fromMemory));
+		templ("copyToMemFun", m_utils.copyToMemoryFunction(!_fromMemory, /*cleanup*/true));
 		return templ.render();
 	});
 }
diff --git a/libsolidity/codegen/ABIFunctions.h b/libsolidity/codegen/ABIFunctions.h
index 07088aa3b4..b7f7f8ae57 100644
--- a/libsolidity/codegen/ABIFunctions.h
+++ b/libsolidity/codegen/ABIFunctions.h
@@ -243,7 +243,7 @@ class ABIFunctions
 	std::string abiDecodingFunctionArray(ArrayType const& _type, bool _fromMemory);
 	/// Part of @a abiDecodingFunction for calldata array types.
 	std::string abiDecodingFunctionCalldataArray(ArrayType const& _type);
-	/// Part of @a abiDecodingFunctionArrayWithAvailableLength
+	/// Part of @a abiDecodingFunctionArrayAvailableLength
 	std::string abiDecodingFunctionByteArrayAvailableLength(ArrayType const& _type, bool _fromMemory);
 	/// Part of @a abiDecodingFunction for calldata struct types.
 	std::string abiDecodingFunctionCalldataStruct(StructType const& _type);
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index ee77a476f4..b24cf4f901 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -80,20 +80,25 @@ string YulUtilFunctions::splitExternalFunctionIdFunction()
 	});
 }
 
-string YulUtilFunctions::copyToMemoryFunction(bool _fromCalldata)
+string YulUtilFunctions::copyToMemoryFunction(bool _fromCalldata, bool _cleanup)
 {
-	string functionName = "copy_" + string(_fromCalldata ? "calldata" : "memory") + "_to_memory";
+	string functionName =
+		"copy_"s +
+		(_fromCalldata ? "calldata"s : "memory"s) +
+		"_to_memory"s +
+		(_cleanup ? "_with_cleanup"s : ""s);
+
 	return m_functionCollector.createFunction(functionName, [&]() {
 		if (_fromCalldata)
 		{
 			return Whiskers(R"(
 				function <functionName>(src, dst, length) {
 					calldatacopy(dst, src, length)
-					// clear end
-					mstore(add(dst, length), 0)
+					<?cleanup>mstore(add(dst, length), 0)</cleanup>
 				}
 			)")
 			("functionName", functionName)
+			("cleanup", _cleanup)
 			.render();
 		}
 		else
@@ -105,14 +110,11 @@ string YulUtilFunctions::copyToMemoryFunction(bool _fromCalldata)
 					{
 						mstore(add(dst, i), mload(add(src, i)))
 					}
-					if gt(i, length)
-					{
-						// clear end
-						mstore(add(dst, length), 0)
-					}
+					<?cleanup>mstore(add(dst, length), 0)</cleanup>
 				}
 			)")
 			("functionName", functionName)
+			("cleanup", _cleanup)
 			.render();
 		}
 	});
diff --git a/libsolidity/codegen/YulUtilFunctions.h b/libsolidity/codegen/YulUtilFunctions.h
index aff9c2406d..7d736df5b3 100644
--- a/libsolidity/codegen/YulUtilFunctions.h
+++ b/libsolidity/codegen/YulUtilFunctions.h
@@ -73,8 +73,9 @@ class YulUtilFunctions
 
 	/// @returns a function that copies raw bytes of dynamic length from calldata
 	/// or memory to memory.
-	/// Pads with zeros and might write more than exactly length.
-	std::string copyToMemoryFunction(bool _fromCalldata);
+	/// @params _cleanup If true, pads with zeros up to the 32 byte boundary after the specified length
+	/// signature: (src, dst, length) ->
+	std::string copyToMemoryFunction(bool _fromCalldata, bool _cleanup);
 
 	/// @returns the name of a function that copies a string literal to memory
 	/// and returns a pointer to the memory area containing the string literal.
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
index 626731c13a..9fb9a2dbc6 100644
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
@@ -179,17 +179,13 @@ object "D_27" {
                 updated_pos := add(pos, 0x20)
             }
 
-            function copy_memory_to_memory(src, dst, length) {
+            function copy_memory_to_memory_with_cleanup(src, dst, length) {
                 let i := 0
                 for { } lt(i, length) { i := add(i, 32) }
                 {
                     mstore(add(dst, i), mload(add(src, i)))
                 }
-                if gt(i, length)
-                {
-                    // clear end
-                    mstore(add(dst, length), 0)
-                }
+                mstore(add(dst, length), 0)
             }
 
             function round_up_to_mul_of_32(value) -> result {
@@ -199,7 +195,7 @@ object "D_27" {
             function abi_encode_t_string_memory_ptr_to_t_string_memory_ptr_fromStack(value, pos) -> end {
                 let length := array_length_t_string_memory_ptr(value)
                 pos := array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length)
-                copy_memory_to_memory(add(value, 0x20), pos, length)
+                copy_memory_to_memory_with_cleanup(add(value, 0x20), pos, length)
                 end := add(pos, round_up_to_mul_of_32(length))
             }
 
@@ -496,10 +492,7 @@ object "D_27" {
                         {
                             mstore(add(add(memPos, i), _2), mload(add(add(memPtr_1, i), _7)))
                         }
-                        if gt(i, length)
-                        {
-                            mstore(add(add(memPos, length), _2), _3)
-                        }
+                        mstore(add(add(memPos, length), _2), _3)
                         return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
                     }
                 }
diff --git a/test/cmdlineTests/name_simplifier/output b/test/cmdlineTests/name_simplifier/output
index 0e100122f7..170e58ffb1 100644
--- a/test/cmdlineTests/name_simplifier/output
+++ b/test/cmdlineTests/name_simplifier/output
@@ -114,10 +114,7 @@ object "C_59" {
                         {
                             mstore(add(add(memPos, i), _12), mload(add(add(memPtr_1, i), _4)))
                         }
-                        if gt(i, length)
-                        {
-                            mstore(add(add(memPos, length), _12), _3)
-                        }
+                        mstore(add(add(memPos, length), _12), _3)
                         return(memPos, add(sub(add(memPos, and(add(length, 31), _9)), memPos), _12))
                     }
                 }
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
index 0cdfc6b8bd..4d5aa7f70d 100644
--- a/test/cmdlineTests/viair_subobject_optimization/output
+++ b/test/cmdlineTests/viair_subobject_optimization/output
@@ -132,17 +132,18 @@ sub_0: assembly {
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
       dataSize(sub_0)
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
+      swap2
       not(0x1f)
       swap1
       dup2
       0x3f
-      dup3
+      dup6
       add
       and
-      dup5
+      dup2
       add
       swap3
-      dup5
+      dup2
       dup5
       lt
       0xffffffffffffffff
@@ -151,61 +152,61 @@ sub_0: assembly {
       or
       tag_9
       jumpi
-      swap3
+      swap1
       swap2
-      dup5
       0x40
       swap4
       dup5
       mstore
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
-      dup3
-      dup2
+      dup5
+      dup4
       mstore
       0x20
-      swap3
+      swap5
       dataOffset(sub_0)
-      dup5
-      dup4
+      dup7
+      dup6
       add
       codecopy
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
       dup4
       mload
       swap5
-      dup4
-      dup7
-      swap5
       dup6
+      swap3
+      dup2
+      dup5
       mstore
-      dup3
+      dup5
       mload
-      swap3
-      dup4
+      swap2
       dup3
-      dup8
+      dup2
+      dup7
       add
       mstore
-      dup3
-      swap2
+      dup2
+      swap6
     tag_11:
-      dup5
       dup4
+      dup8
       lt
       tag_12
       jumpi
       pop
       pop
-      swap1
+      dup4
+      swap5
+      pop
+      dup6
       dup3
       0x1f
-      swap4
-      swap3
-      gt
-      tag_14
-      jumpi
-    tag_15:
-      pop
+      swap5
+      swap6
+      add
+      add
+      mstore
       add
       and
       dup2
@@ -214,35 +215,26 @@ sub_0: assembly {
       add
       swap1
       return
-    tag_14:
-      dup6
-      dup3
-      dup7
-      add
-      add
-      mstore
-      dup7
-      jump(tag_15)
     tag_12:
+      dup7
       dup2
-      dup4
       add
-      dup2
+      dup3
       add
       mload
       dup10
-      dup5
+      dup9
       add
       dup10
       add
       mstore
+      swap6
+      dup2
+      add
+      swap6
       dup9
-      swap7
+      swap6
       pop
-      swap2
-      dup3
-      add
-      swap2
       jump(tag_11)
     tag_9:
       shl(0xe0, 0x4e487b71)
diff --git a/test/cmdlineTests/yul_string_format_ascii/output.json b/test/cmdlineTests/yul_string_format_ascii/output.json
index 3ff8779ffa..4bc66584cb 100644
--- a/test/cmdlineTests/yul_string_format_ascii/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii/output.json
@@ -88,17 +88,13 @@ object \"C_11\" {
                 updated_pos := add(pos, 0x20)
             }
 
-            function copy_memory_to_memory(src, dst, length) {
+            function copy_memory_to_memory_with_cleanup(src, dst, length) {
                 let i := 0
                 for { } lt(i, length) { i := add(i, 32) }
                 {
                     mstore(add(dst, i), mload(add(src, i)))
                 }
-                if gt(i, length)
-                {
-                    // clear end
-                    mstore(add(dst, length), 0)
-                }
+                mstore(add(dst, length), 0)
             }
 
             function round_up_to_mul_of_32(value) -> result {
@@ -108,7 +104,7 @@ object \"C_11\" {
             function abi_encode_t_string_memory_ptr_to_t_string_memory_ptr_fromStack(value, pos) -> end {
                 let length := array_length_t_string_memory_ptr(value)
                 pos := array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length)
-                copy_memory_to_memory(add(value, 0x20), pos, length)
+                copy_memory_to_memory_with_cleanup(add(value, 0x20), pos, length)
                 end := add(pos, round_up_to_mul_of_32(length))
             }
 
diff --git a/test/cmdlineTests/yul_string_format_ascii_long/output.json b/test/cmdlineTests/yul_string_format_ascii_long/output.json
index e019e5c2fc..68f033773c 100644
--- a/test/cmdlineTests/yul_string_format_ascii_long/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_long/output.json
@@ -88,17 +88,13 @@ object \"C_11\" {
                 updated_pos := add(pos, 0x20)
             }
 
-            function copy_memory_to_memory(src, dst, length) {
+            function copy_memory_to_memory_with_cleanup(src, dst, length) {
                 let i := 0
                 for { } lt(i, length) { i := add(i, 32) }
                 {
                     mstore(add(dst, i), mload(add(src, i)))
                 }
-                if gt(i, length)
-                {
-                    // clear end
-                    mstore(add(dst, length), 0)
-                }
+                mstore(add(dst, length), 0)
             }
 
             function round_up_to_mul_of_32(value) -> result {
@@ -108,7 +104,7 @@ object \"C_11\" {
             function abi_encode_t_string_memory_ptr_to_t_string_memory_ptr_fromStack(value, pos) -> end {
                 let length := array_length_t_string_memory_ptr(value)
                 pos := array_storeLengthForEncoding_t_string_memory_ptr_fromStack(pos, length)
-                copy_memory_to_memory(add(value, 0x20), pos, length)
+                copy_memory_to_memory_with_cleanup(add(value, 0x20), pos, length)
                 end := add(pos, round_up_to_mul_of_32(length))
             }
 
diff --git a/test/libsolidity/gasTests/abiv2.sol b/test/libsolidity/gasTests/abiv2.sol
index 2dbe334b3d..da433a9e52 100644
--- a/test/libsolidity/gasTests/abiv2.sol
+++ b/test/libsolidity/gasTests/abiv2.sol
@@ -14,9 +14,9 @@ contract C {
 }
 // ----
 // creation:
-//   codeDepositCost: 1243000
-//   executionCost: 1295
-//   totalCost: 1244295
+//   codeDepositCost: 1241200
+//   executionCost: 1288
+//   totalCost: 1242488
 // external:
 //   a(): 2430
 //   b(uint256): infinite
diff --git a/test/libsolidity/gasTests/abiv2_optimised.sol b/test/libsolidity/gasTests/abiv2_optimised.sol
index ca344afd06..26e2104f25 100644
--- a/test/libsolidity/gasTests/abiv2_optimised.sol
+++ b/test/libsolidity/gasTests/abiv2_optimised.sol
@@ -17,9 +17,9 @@ contract C {
 // optimize-yul: true
 // ----
 // creation:
-//   codeDepositCost: 660800
-//   executionCost: 696
-//   totalCost: 661496
+//   codeDepositCost: 659000
+//   executionCost: 689
+//   totalCost: 659689
 // external:
 //   a(): 2285
 //   b(uint256): 4652
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index d1fe673a27..069c32370e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -59,10 +59,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 367365
-// gas legacy: 416585
-// gas legacyOptimized: 322043
+// gas irOptimized: 362445
+// gas legacy: 414569
+// gas legacyOptimized: 319271
 // test_uint256() ->
-// gas irOptimized: 515982
-// gas legacy: 583100
-// gas legacyOptimized: 444161
+// gas irOptimized: 511910
+// gas legacy: 581876
+// gas legacyOptimized: 442757
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/calldata_bytes_bytes32_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV1/calldata_bytes_bytes32_arrays.sol
new file mode 100644
index 0000000000..18a4ee1a9e
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV1/calldata_bytes_bytes32_arrays.sol
@@ -0,0 +1,14 @@
+pragma abicoder v1;
+
+contract C {
+    function f(bool a, bytes calldata b, bytes32[2] calldata c)
+        public
+        returns (bool, bytes calldata, bytes32[2] calldata)
+    {
+        return (a, b, c);
+    }
+}
+// ====
+// compileViaYul: false
+// ----
+// f(bool,bytes,bytes32[2]): true, 0x80, "a", "b", 4, "abcd" -> true, 0x80, "a", "b", 4, "abcd"
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol b/test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol
new file mode 100644
index 0000000000..3b2b90c6c3
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol
@@ -0,0 +1,17 @@
+pragma abicoder v1;
+
+contract C {
+    function f(uint256[] memory a, bytes calldata b) public returns (bytes memory) {
+        return abi.encode(a, b);
+    }
+
+    function g(uint256[] memory a, bytes calldata b) external returns (bytes memory) {
+        return f(a, b);
+    }
+}
+
+// ====
+// EVMVersion: >homestead
+// ----
+// f(uint256[],bytes): 0x40, 0x80, 1, 0xFF, 6, "123456" -> 0x20, 0xc0, 0x40, 0x80, 1, 0xff, 6, "123456"
+// g(uint256[],bytes): 0x40, 0x80, 1, 0xffff, 8, "12345678" -> 0x20, 0xc0, 0x40, 0x80, 1, 0xffff, 8, "12345678"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 592595df36..7ebac64ea4 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 367365
-// gas legacy: 416585
-// gas legacyOptimized: 322043
+// gas irOptimized: 362445
+// gas legacy: 414569
+// gas legacyOptimized: 319271
 // test_uint256() ->
-// gas irOptimized: 515982
-// gas legacy: 583100
-// gas legacyOptimized: 444161
+// gas irOptimized: 511910
+// gas legacy: 581876
+// gas legacyOptimized: 442757
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index 5a1c2aebf8..58b38a9c38 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -51,6 +51,6 @@ contract C {
 // f2() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f4() -> 0x20, 0x160, 0x1, 0x80, 0xc0, 0x2, 0x3, "abc", 0x7, 0x40, 0x2, 0x2, 0x3
-// gas irOptimized: 112820
-// gas legacy: 114900
-// gas legacyOptimized: 112606
+// gas irOptimized: 112646
+// gas legacy: 114866
+// gas legacyOptimized: 112586
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encoder_v2_head_overflow_with_static_array_cleanup_bug.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encoder_v2_head_overflow_with_static_array_cleanup_bug.sol
new file mode 100644
index 0000000000..9e5d575527
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encoder_v2_head_overflow_with_static_array_cleanup_bug.sol
@@ -0,0 +1,17 @@
+pragma abicoder v2;
+
+struct T {
+    bytes x;
+    uint[3] y;
+}
+
+contract E {
+    function f(bool a, T calldata b, bytes32[2] calldata c)
+        public
+        returns (bool, T calldata, bytes32[2] calldata)
+    {
+        return (a, b, c);
+    }
+}
+// ----
+// f(bool,(bytes,uint256[3]),bytes32[2]): 1, 0x80, "a", "b", 0x80, 11, 12, 13, 4, "abcd" -> 1, 0x80, "a", "b", 0x80, 11, 12, 13, 4, "abcd"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 3e3dcc274b..689bb98101 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -20,6 +20,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 128098
-// gas legacy: 140672
-// gas legacyOptimized: 119588
+// gas irOptimized: 127347
+// gas legacy: 140553
+// gas legacyOptimized: 119450
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_in_library.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_in_library.sol
new file mode 100644
index 0000000000..b15a203f22
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_in_library.sol
@@ -0,0 +1,17 @@
+library L {
+    // This case used to be affected by the buggy cleanup due to ABIEncoderV2HeadOverflowWithStaticArrayCleanup bug.
+    function g(uint[] memory a, uint[1] calldata b) public returns (uint[] memory, uint[1] calldata) {
+        return (a, b);
+    }
+}
+
+contract C {
+    function f(uint[] memory a, uint[1] calldata b) public returns (uint[] memory, uint[1] memory) {
+        return L.g(a, b);
+    }
+}
+// ====
+// EVMVersion: >homestead
+// ----
+// library: L
+// f(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> 0x40, 0xff, 0x01, 0xffff
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/reencoded_calldata_string.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/reencoded_calldata_string.sol
new file mode 100644
index 0000000000..1cf129529a
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/reencoded_calldata_string.sol
@@ -0,0 +1,27 @@
+contract C {
+    function f(string calldata x) external returns (bytes memory r) {
+        uint mptr;
+        assembly {
+            // dirty memory
+            mptr := mload(0x40)
+            for { let i := mptr } lt(i, add(mptr, 0x0100)) { i := add(i, 32) }
+            {
+                mstore(i, sub(0, 1))
+            }
+        }
+        r = abi.encode(x);
+        assembly {
+            // assert that we dirtied the memory that was encoded to
+            if iszero(eq(mptr, r)) {
+                revert(0, 0)
+            }
+        }
+    }
+    function test() external returns (bytes memory) {
+        return this.f("abc");
+    }
+}
+// ====
+// EVMVersion: >homestead
+// ----
+// test() -> 0x20, 0x60, 0x20, 3, "abc"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol b/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol
new file mode 100644
index 0000000000..07d0350800
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f(uint256[] memory a, bytes calldata b) public returns (bytes memory) {
+        return abi.encode(a, b);
+    }
+
+    function g(uint256[] memory a, bytes calldata b) external returns (bytes memory) {
+        return f(a, b);
+    }
+}
+
+// ----
+// f(uint256[],bytes): 0x40, 0x80, 1, 0xFF, 6, "123456" -> 0x20, 0xc0, 0x40, 0x80, 1, 0xff, 6, "123456"
+// g(uint256[],bytes): 0x40, 0x80, 1, 0xffff, 8, "12345678" -> 0x20, 0xc0, 0x40, 0x80, 1, 0xffff, 8, "12345678"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol
new file mode 100644
index 0000000000..a8f4f55541
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol
@@ -0,0 +1,18 @@
+contract C {
+    function f(uint256[] memory a, uint256[1] calldata b) public returns (bytes memory) {
+        return abi.encode(a, b);
+    }
+
+    function g(uint256[] memory a, uint256[1] calldata b) external returns (bytes memory) {
+        return f(a, b);
+    }
+
+    function h(uint256[] memory a, uint256[1] calldata b) external returns (uint256[] memory, uint256[1] calldata) {
+        return (a, b);
+    }
+}
+
+// ----
+// f(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> 0x20, 0x80, 0x40, 0xff, 1, 0xffff
+// g(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> 0x20, 0x80, 0x40, 0xff, 1, 0xffff
+// h(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> 0x40, 0xff, 1, 0xffff
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index 0ef6d88eb8..5f71fc7e2a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -18,10 +18,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 180768
-// gas legacy: 184929
-// gas legacyOptimized: 181504
+// gas irOptimized: 180726
+// gas legacy: 184921
+// gas legacyOptimized: 181506
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112471
-// gas legacy: 115468
-// gas legacyOptimized: 112988
+// gas irOptimized: 112453
+// gas legacy: 115460
+// gas legacyOptimized: 112990
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index e877e627b0..15ba6f7de3 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -9,6 +9,6 @@ contract C {
 
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
-// gas irOptimized: 135787
-// gas legacy: 137377
-// gas legacyOptimized: 136125
+// gas irOptimized: 135699
+// gas legacy: 137325
+// gas legacyOptimized: 136059
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 0f0b4083f0..ae17b76b17 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -17,25 +17,25 @@ contract c {
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 108395
-// gas legacy: 124322
-// gas legacyOptimized: 119141
+// gas irOptimized: 109413
+// gas legacy: 124296
+// gas legacyOptimized: 119119
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 117480
-// gas legacy: 135259
-// gas legacyOptimized: 130089
+// gas irOptimized: 118565
+// gas legacy: 135251
+// gas legacyOptimized: 130091
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 124117
-// gas legacy: 142861
-// gas legacyOptimized: 137030
+// gas irOptimized: 125184
+// gas legacy: 142835
+// gas legacyOptimized: 137008
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 126467
-// gas legacy: 160901
-// gas legacyOptimized: 150960
+// gas irOptimized: 128584
+// gas legacy: 160875
+// gas legacyOptimized: 150938
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 353326
-// gas legacy: 421700
-// gas legacyOptimized: 402999
+// gas irOptimized: 357699
+// gas legacy: 421674
+// gas legacyOptimized: 402977
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index 2a3e2044f1..2b3cad19fb 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -35,12 +35,12 @@ contract C {
 }
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179880
-// gas legacy: 181099
-// gas legacyOptimized: 180073
+// gas irOptimized: 179766
+// gas legacy: 181047
+// gas legacyOptimized: 180029
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 107211
-// gas legacy: 110253
-// gas legacyOptimized: 107397
+// gas irOptimized: 107097
+// gas legacy: 110201
+// gas legacyOptimized: 107353
 // h() -> 0x40, 0x60, 0x00, 0x00
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
index 347f2f2eeb..17c97d2006 100644
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
@@ -46,11 +46,11 @@ contract C {
 }
 // ----
 // test() -> 0x20, 0x14, "[a called][b called]"
-// gas irOptimized: 116724
-// gas legacy: 119056
-// gas legacyOptimized: 117043
+// gas irOptimized: 116688
+// gas legacy: 119030
+// gas legacyOptimized: 117021
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 103304
-// gas legacy: 102840
-// gas legacyOptimized: 101728
+// gas irOptimized: 103268
+// gas legacy: 102814
+// gas legacyOptimized: 101706
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index 349bfd935c..550e74a6fa 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -11,6 +11,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
-// gas irOptimized: 202952
-// gas legacy: 204912
-// gas legacyOptimized: 203437
+// gas irOptimized: 202808
+// gas legacy: 204860
+// gas legacyOptimized: 203385
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index 743a848d9c..931069deec 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -10,6 +10,6 @@ contract c {
 
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
-// gas irOptimized: 109341
-// gas legacy: 126728
-// gas legacyOptimized: 123444
+// gas irOptimized: 109310
+// gas legacy: 126702
+// gas legacyOptimized: 123422
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index 0be102f175..9f3884dae8 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -10,6 +10,6 @@ contract c {
 
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 108146
-// gas legacy: 125610
-// gas legacyOptimized: 122582
+// gas irOptimized: 108115
+// gas legacy: 125584
+// gas legacyOptimized: 122560
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index f275590e47..745b8ee123 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,9 +28,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 521983
-// gas legacy: 731840
-// gas legacyOptimized: 494859
+// gas irOptimized: 518935
+// gas legacy: 729908
+// gas legacyOptimized: 493347
 // h() -> 0x20, 0x40, 0x00, 0
 // ~ emit ev(uint256[],uint256): 0x40, 0x21, 0x02, 0x00, 0x00
 // g() -> 0x20, 0x40, 0, 0x00
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 5c57963b22..4e3f92c81c 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 282398
-// gas legacy: 429047
-// gas legacyOptimized: 297958
+// gas irOptimized: 279069
+// gas legacy: 427192
+// gas legacyOptimized: 296504
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 867a85a12c..905114aba7 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -8,8 +8,8 @@ contract Test {
 }
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 273340
-// gas legacy: 317746
-// gas legacyOptimized: 262368
+// gas irOptimized: 270118
+// gas legacy: 315616
+// gas legacyOptimized: 260686
 // m_x() -> 7
 // m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz"
diff --git a/test/libsolidity/semanticTests/errors/error_static_calldata_uint_array_and_dynamic_array.sol b/test/libsolidity/semanticTests/errors/error_static_calldata_uint_array_and_dynamic_array.sol
new file mode 100644
index 0000000000..bfda3b1263
--- /dev/null
+++ b/test/libsolidity/semanticTests/errors/error_static_calldata_uint_array_and_dynamic_array.sol
@@ -0,0 +1,10 @@
+contract C {
+    error E(uint[], uint[1]);
+
+    // This case used to be affected by the buggy cleanup due to ABIEncoderV2HeadOverflowWithStaticArrayCleanup bug.
+    function f(uint[] memory a, uint[1] calldata b) public {
+        revert E(a, b);
+    }
+}
+// ----
+// f(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> FAILURE, hex"f42f106d", 0x40, 0xff, 1, 0xffff
diff --git a/test/libsolidity/semanticTests/events/event_static_calldata_uint_array_and_dynamic_array.sol b/test/libsolidity/semanticTests/events/event_static_calldata_uint_array_and_dynamic_array.sol
new file mode 100644
index 0000000000..a72ad938c2
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/event_static_calldata_uint_array_and_dynamic_array.sol
@@ -0,0 +1,11 @@
+contract C {
+    event E(uint[], uint[1]);
+
+    // This case used to be affected by the buggy cleanup due to ABIEncoderV2HeadOverflowWithStaticArrayCleanup bug.
+    function f(uint[] memory a, uint[1] calldata b) public {
+        emit E(a, b);
+    }
+}
+// ----
+// f(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff ->
+// ~ emit E(uint256[],uint256[1]): 0x40, 0xff, 0x01, 0xffff
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index 10096c03b0..b56ec7801f 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -74,9 +74,9 @@ contract FixedFeeRegistrar is Registrar {
 }
 // ----
 // constructor()
-// gas irOptimized: 414897
-// gas legacy: 935817
-// gas legacyOptimized: 489951
+// gas irOptimized: 411435
+// gas legacy: 933867
+// gas legacyOptimized: 487352
 // reserve(string), 69 ether: 0x20, 3, "abc" ->
 // ~ emit Changed(string): #0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
 // gas irOptimized: 45967
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index c0cf34627d..84ece36bea 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,9 +33,9 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 444190
-// gas legacy: 757857
-// gas legacyOptimized: 539866
+// gas irOptimized: 441142
+// gas legacy: 755907
+// gas legacyOptimized: 538354
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
 // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
 // encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 61a1f6bd63..7b5418ed14 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,35 +176,35 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 1432633
-// gas legacy: 2427722
-// gas legacyOptimized: 1773892
+// gas irOptimized: 1428137
+// gas legacy: 2425301
+// gas legacyOptimized: 1770477
 // supportsInterface(bytes4): 0x0 -> 0
 // supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 116284
-// gas legacy: 150273
-// gas legacyOptimized: 122510
+// gas irOptimized: 114626
+// gas legacy: 149888
+// gas legacyOptimized: 121887
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 116284
-// gas legacy: 150273
-// gas legacyOptimized: 122510
+// gas irOptimized: 114626
+// gas legacy: 149888
+// gas legacyOptimized: 121887
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 116269
-// gas legacy: 150283
-// gas legacyOptimized: 122523
+// gas irOptimized: 114611
+// gas legacy: 149898
+// gas legacyOptimized: 121900
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 116269
-// gas legacy: 150283
-// gas legacyOptimized: 122523
+// gas irOptimized: 114611
+// gas legacy: 149898
+// gas legacyOptimized: 121900
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index c604ff1422..edbf82a292 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,9 +49,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 678980
-// gas legacy: 1103242
-// gas legacyOptimized: 745184
+// gas irOptimized: 675980
+// gas legacy: 1101298
+// gas legacyOptimized: 743666
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
 // gas irOptimized: 22660
 // gas legacy: 23190
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index 558ce1c5bf..d0c3c4d805 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -23,9 +23,9 @@ contract C {
 
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 270449
-// gas legacy: 456680
-// gas legacyOptimized: 302975
+// gas irOptimized: 266135
+// gas legacy: 454729
+// gas legacyOptimized: 301679
 // f(uint256): 0 -> FAILURE
 // f(uint256): 1 -> FAILURE
 // f(uint256): 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index 4af6f97f60..9cc2846acc 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -26,9 +26,9 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 428444
-// gas legacy: 825625
-// gas legacyOptimized: 508492
+// gas irOptimized: 424088
+// gas legacy: 823681
+// gas legacyOptimized: 505900
 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
 // f(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
 // f(uint256): 2 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index c44fd410ad..8dcdd13e7c 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -16,9 +16,9 @@ contract C {
 // compileToEwasm: also
 // ----
 // constructor() ->
-// gas irOptimized: 177507
-// gas legacy: 249207
-// gas legacyOptimized: 157489
+// gas irOptimized: 175791
+// gas legacy: 247263
+// gas legacyOptimized: 155977
 // initCode() -> 0x20, 0
 // f() -> true
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index 0edb0e04ed..cd34a419dd 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -20,6 +20,6 @@ contract C {
 
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178637
-// gas legacy: 180945
-// gas legacyOptimized: 179460
+// gas irOptimized: 178549
+// gas legacy: 180893
+// gas legacyOptimized: 179394
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large.sol b/test/libsolidity/syntaxTests/bytecode_too_large.sol
index e76c801a15..1b4d02ecb9 100644
--- a/test/libsolidity/syntaxTests/bytecode_too_large.sol
+++ b/test/libsolidity/syntaxTests/bytecode_too_large.sol
@@ -9,4 +9,4 @@ contract test {
 // ====
 // EVMVersion: >byzantium
 // ----
-// Warning 5574: (21-27154): Contract code size is 27199 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (21-27154): Contract code size is 27192 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol b/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol
index cdd83602f8..4f3239c227 100644
--- a/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol
+++ b/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol
@@ -7,4 +7,4 @@ contract test {
 // ====
 // EVMVersion: =byzantium
 // ----
-// Warning 5574: (0-27133): Contract code size is 27227 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (0-27133): Contract code size is 27220 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.

From 0835e41626c769273ac215a58b1e066d63a4ca0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 13:53:55 +0200
Subject: [PATCH 0769/1748] Sort changelog for 0.8.16 alphabetically

---
 Changelog.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4fceab86f9..1ca5970c0d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,18 +7,18 @@ Language Features:
 
 
 Compiler Features:
+ * Code Generator: More efficient code for checked addition and subtraction.
  * TypeChecker: Support using library constants in initializers of other constants.
  * Yul IR Code Generation: Improved copy routines for arrays with packed storage layout.
- * Yul Optimizer: Add rule to convert `mod(mul(X, Y), A)` into `mulmod(X, Y, A)`, if `A` is a power of two.
  * Yul Optimizer: Add rule to convert `mod(add(X, Y), A)` into `addmod(X, Y, A)`, if `A` is a power of two.
- * Code Generator: More efficient code for checked addition and subtraction.
+ * Yul Optimizer: Add rule to convert `mod(mul(X, Y), A)` into `mulmod(X, Y, A)`, if `A` is a power of two.
 
 
 Bugfixes:
  * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
- * Type Checker: Fix null dereference in `abi.encodeCall` type checking of free function.
- * Type Checker: Fix compiler crash when `abi.encodeCall` received a tuple expression instead of an inline tuple.
  * Type Checker: Fix compiler crash on tuple assignments involving certain patterns with unary tuples on the left-hand side.
+ * Type Checker: Fix compiler crash when `abi.encodeCall` received a tuple expression instead of an inline tuple.
+ * Type Checker: Fix null dereference in `abi.encodeCall` type checking of free function.
 
 
 ### 0.8.15 (2022-06-15)

From fb51bd69a3689886d7ce48d79058660fa1d03051 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 13:57:19 +0200
Subject: [PATCH 0770/1748] Changelog cleanup for 0.8.16

---
 Changelog.md | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1ca5970c0d..3f9f7abc5d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,22 +3,20 @@
 Important Bugfixes:
  * Code Generation: Fix data corruption that affected ABI-encoding of calldata values represented by tuples: structs at any nesting level; argument lists of external functions, events and errors; return value lists of external functions. The 32 leading bytes of the first dynamically-encoded value in the tuple would get zeroed when the last component contained a statically-encoded array.
 
-Language Features:
-
 
 Compiler Features:
  * Code Generator: More efficient code for checked addition and subtraction.
  * TypeChecker: Support using library constants in initializers of other constants.
  * Yul IR Code Generation: Improved copy routines for arrays with packed storage layout.
- * Yul Optimizer: Add rule to convert `mod(add(X, Y), A)` into `addmod(X, Y, A)`, if `A` is a power of two.
- * Yul Optimizer: Add rule to convert `mod(mul(X, Y), A)` into `mulmod(X, Y, A)`, if `A` is a power of two.
+ * Yul Optimizer: Add rule to convert ``mod(add(X, Y), A)`` into ``addmod(X, Y, A)``, if ``A`` is a power of two.
+ * Yul Optimizer: Add rule to convert ``mod(mul(X, Y), A)`` into ``mulmod(X, Y, A)``, if ``A`` is a power of two.
 
 
 Bugfixes:
  * Commandline Interface: Disallow the following options outside of the compiler mode: ``--via-ir``,``--metadata-literal``, ``--metadata-hash``, ``--model-checker-show-unproved``, ``--model-checker-div-mod-no-slacks``, ``--model-checker-engine``, ``--model-checker-invariants``, ``--model-checker-solvers``, ``--model-checker-timeout``, ``--model-checker-contracts``, ``--model-checker-targets``.
  * Type Checker: Fix compiler crash on tuple assignments involving certain patterns with unary tuples on the left-hand side.
- * Type Checker: Fix compiler crash when `abi.encodeCall` received a tuple expression instead of an inline tuple.
- * Type Checker: Fix null dereference in `abi.encodeCall` type checking of free function.
+ * Type Checker: Fix compiler crash when ``abi.encodeCall`` received a tuple expression instead of an inline tuple.
+ * Type Checker: Fix null dereference in ``abi.encodeCall`` type checking of free function.
 
 
 ### 0.8.15 (2022-06-15)

From caba38db5cde40786895ba3c9d0d1dce3508fa21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 14:10:12 +0200
Subject: [PATCH 0771/1748] Set release date for 0.8.16 and update the bug list

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 3f9f7abc5d..f22e119c46 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.16 (unreleased)
+### 0.8.16 (2022-08-08)
 
 Important Bugfixes:
  * Code Generation: Fix data corruption that affected ABI-encoding of calldata values represented by tuples: structs at any nesting level; argument lists of external functions, events and errors; return value lists of external functions. The 32 leading bytes of the first dynamically-encoded value in the tuple would get zeroed when the last component contained a statically-encoded array.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 9c1b7ad744..3e3847c9b9 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1759,6 +1759,10 @@
         ],
         "released": "2022-06-15"
     },
+    "0.8.16": {
+        "bugs": [],
+        "released": "2022-08-08"
+    },
     "0.8.2": {
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",

From d7531b716fc09080cdee02098a53968e0d165dd4 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 8 Aug 2022 12:38:56 +0200
Subject: [PATCH 0772/1748] Tidy up and update .gitignore

---
 .gitignore | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0ec3f7ace8..f91c0207f5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,13 @@
-commit_hash.txt
-prerelease.txt
+/commit_hash.txt
+/prerelease.txt
 
 # Compiled Object files
 *.slo
 *.lo
 *.o
 *.obj
+*.pyc
+__pycache__
 
 # Precompiled Headers
 *.gch
@@ -16,9 +18,6 @@ prerelease.txt
 *.dylib
 *.dll
 
-# Fortran module files
-*.mod
-
 # Compiled Static libraries
 *.lai
 *.la
@@ -33,14 +32,9 @@ prerelease.txt
 # Build directory
 /build*
 emscripten_build/
-docs/_build
-docs/_static/robots.txt
-__pycache__
-docs/utils/*.pyc
-/deps/downloads/
-deps/install
-deps/cache
-cmake-build-*/
+/docs/_build
+/docs/_static/robots.txt
+/deps
 
 # vim stuff
 [._]*.sw[a-p]
@@ -50,18 +44,15 @@ cmake-build-*/
 *~
 
 # IDE files
-.idea
-.vscode
-browse.VC.db
-CMakeLists.txt.user
+/.idea/
+/.vscode/
+/browse.VC.db
+/CMakeLists.txt.user
 /CMakeSettings.json
 /.vs
 /.cproject
 /.project
 
-# place to put local temporary files
-tmp
-
 # OS specific local files
 .DS_Store
 Thumbs.db

From cc11c6f3d55ca01a350b0874d3f92584f8f773b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 15:24:48 +0200
Subject: [PATCH 0773/1748] Set version to 0.8.17

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0662d118b9..2aca61d300 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.16")
+set(PROJECT_VERSION "0.8.17")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index f22e119c46..8468321e9f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,17 @@
+### 0.8.17 (unreleased)
+
+Important Bugfixes:
+
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.16 (2022-08-08)
 
 Important Bugfixes:

From c1cbffc814348bd11cab356c5879749abd4f15a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 15:57:29 +0200
Subject: [PATCH 0774/1748] update_bugs_by_version: Use pathlib

---
 scripts/update_bugs_by_version.py | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/scripts/update_bugs_by_version.py b/scripts/update_bugs_by_version.py
index d1577bfc11..56daf1513d 100755
--- a/scripts/update_bugs_by_version.py
+++ b/scripts/update_bugs_by_version.py
@@ -6,20 +6,20 @@
 # This makes it possible to use this script as part of CI to check
 # that the list is up to date.
 
-import os
 import json
 import re
 import sys
+from pathlib import Path
 
 def comp(version_string):
     return [int(c) for c in version_string.split('.')]
 
-path = os.path.dirname(os.path.realpath(__file__))
-with open(path + '/../docs/bugs.json', encoding='utf8') as bugsFile:
-    bugs = json.load(bugsFile)
+root_path = Path(__file__).resolve().parent.parent
+
+bugs = json.loads((root_path / 'docs/bugs.json').read_text(encoding='utf8'))
 
 versions = {}
-with open(path + '/../Changelog.md', encoding='utf8') as changelog:
+with (root_path / 'Changelog.md').open(encoding='utf8') as changelog:
     for line in changelog:
         m = re.search(r'^### (\S+) \((\d+-\d+-\d+)\)$', line)
         if m:
@@ -36,8 +36,6 @@ def comp(version_string):
         value['bugs'] += [bug['name']]
 
 new_contents = json.dumps(versions, sort_keys=True, indent=4, separators=(',', ': '))
-with open(path + '/../docs/bugs_by_version.json', 'r', encoding='utf8') as bugs_by_version:
-    old_contents = bugs_by_version.read()
-with open(path + '/../docs/bugs_by_version.json', 'w', encoding='utf8') as bugs_by_version:
-    bugs_by_version.write(new_contents)
+old_contents = (root_path / 'docs/bugs_by_version.json').read_text(encoding='utf8')
+(root_path / 'docs/bugs_by_version.json').write_text(new_contents, encoding='utf8')
 sys.exit(old_contents != new_contents)

From 8874627ddaa6dab89f3e0862cea70362e64fdd52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 16:19:06 +0200
Subject: [PATCH 0775/1748] update_bugs_by_version: Don't fail when the list
 gets updated

---
 scripts/update_bugs_by_version.py | 11 ++++++-----
 test/cmdlineTests.sh              | 11 ++++++++---
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/scripts/update_bugs_by_version.py b/scripts/update_bugs_by_version.py
index 56daf1513d..442cd0fdcd 100755
--- a/scripts/update_bugs_by_version.py
+++ b/scripts/update_bugs_by_version.py
@@ -8,7 +8,6 @@
 
 import json
 import re
-import sys
 from pathlib import Path
 
 def comp(version_string):
@@ -35,7 +34,9 @@ def comp(version_string):
             continue
         value['bugs'] += [bug['name']]
 
-new_contents = json.dumps(versions, sort_keys=True, indent=4, separators=(',', ': '))
-old_contents = (root_path / 'docs/bugs_by_version.json').read_text(encoding='utf8')
-(root_path / 'docs/bugs_by_version.json').write_text(new_contents, encoding='utf8')
-sys.exit(old_contents != new_contents)
+(root_path / 'docs/bugs_by_version.json').write_text(json.dumps(
+    versions,
+    sort_keys=True,
+    indent=4,
+    separators=(',', ': ')
+), encoding='utf8')
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 250d10a6ef..79e9d64a58 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -355,7 +355,7 @@ function test_via_ir_equivalence()
 
     for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
         bin_output_two_stage+=$(
-	    msg_on_error --no-stderr "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" |
+        msg_on_error --no-stderr "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" |
                 sed '/^Binary representation:$/d' |
                 sed '/^=======/d'
         )
@@ -375,8 +375,13 @@ function test_via_ir_equivalence()
 
 ## RUN
 
-echo "Checking that the bug list is up to date..."
-"$REPO_ROOT"/scripts/update_bugs_by_version.py
+SOLTMPDIR=$(mktemp -d)
+printTask "Checking that the bug list is up to date..."
+cp "${REPO_ROOT}/docs/bugs_by_version.json" "${SOLTMPDIR}/original_bugs_by_version.json"
+"${REPO_ROOT}/scripts/update_bugs_by_version.py"
+diff --unified "${SOLTMPDIR}/original_bugs_by_version.json" "${REPO_ROOT}/docs/bugs_by_version.json" || \
+    fail "The bug list in bugs_by_version.json was out of date and has been updated. Please investigate and submit a bugfix if necessary."
+rm -r "$SOLTMPDIR"
 
 printTask "Testing unknown options..."
 (

From c2d4e03c55bea39d338e98c904c1c2fb8161e2eb Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 8 Aug 2022 17:40:32 +0200
Subject: [PATCH 0776/1748] Add blog post link to bug list.

---
 docs/bugs.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/bugs.json b/docs/bugs.json
index bdea0a7c2c..421bb007c0 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -4,6 +4,7 @@
         "name": "AbiReencodingHeadOverflowWithStaticArrayCleanup",
         "summary": "ABI-encoding a tuple with a statically-sized calldata array in the last component would corrupt 32 leading bytes of its first dynamically encoded component.",
         "description": "When ABI-encoding a statically-sized calldata array, the compiler always pads the data area to a multiple of 32-bytes and ensures that the padding bytes are zeroed. In some cases, this cleanup used to be performed by always writing exactly 32 bytes, regardless of how many needed to be zeroed. This was done with the assumption that the data that would eventually occupy the area past the end of the array had not yet been written, because the encoder processes tuple components in the order they were given. While this assumption is mostly true, there is an important corner case: dynamically encoded tuple components are stored separately from the statically-sized ones in an area called the *tail* of the encoding and the tail immediately follows the *head*, which is where the statically-sized components are placed. The aforementioned cleanup, if performed for the last component of the head would cross into the tail and overwrite up to 32 bytes of the first component stored there with zeros. The only array type for which the cleanup could actually result in an overwrite were arrays with ``uint256`` or ``bytes32`` as the base element type and in this case the size of the corrupted area was always exactly 32 bytes. The problem affected tuples at any nesting level. This included also structs, which are encoded as tuples in the ABI. Note also that lists of parameters and return values of functions, events and errors are encoded as tuples.",
+        "link": "https://blog.soliditylang.org/2022/08/08/calldata-tuple-reencoding-head-overflow-bug/",
         "introduced": "0.5.8",
         "fixed": "0.8.16",
         "severity": "medium",

From 9a429e23007a35da3177b540035314844f9c6cc5 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 9 Aug 2022 12:40:00 +0200
Subject: [PATCH 0777/1748] Fix ICE on invalid tuple assignments.

---
 Changelog.md                                    |  1 +
 libsolidity/analysis/TypeChecker.cpp            |  9 ++++++++-
 .../tuple_to_function_assignment.sol            | 17 +++++++++++++++++
 3 files changed, 26 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/tupleAssignments/tuple_to_function_assignment.sol

diff --git a/Changelog.md b/Changelog.md
index 8468321e9f..18066a7751 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Type Checker: Fix internal compiler error on tuple assignments with invalid left-hand side.
 
 
 ### 0.8.16 (2022-08-08)
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 5b64bcea8b..de3cdc847b 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -166,8 +166,15 @@ void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
 						);
 		}
 	};
+
+	TupleExpression const* lhsTupleExpression = dynamic_cast<TupleExpression const*>(&_assignment.leftHandSide());
+	if (!lhsTupleExpression)
+	{
+		solAssert(m_errorReporter.hasErrors());
+		return;
+	}
 	count(
-		dynamic_cast<TupleExpression const&>(_assignment.leftHandSide()),
+		*lhsTupleExpression,
 		dynamic_cast<TupleType const&>(*type(_assignment.rightHandSide())),
 		count
 	);
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/tuple_to_function_assignment.sol b/test/libsolidity/syntaxTests/tupleAssignments/tuple_to_function_assignment.sol
new file mode 100644
index 0000000000..898c791015
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tupleAssignments/tuple_to_function_assignment.sol
@@ -0,0 +1,17 @@
+contract C {
+	function f() internal pure {}
+	function g() internal pure returns (uint256) {}
+	function h() internal pure returns (uint256, uint256) {}
+	function test() public pure {
+		f() = ();
+		g() = (uint256(1));
+		h() = (uint256(1), uint256(2));
+		h() = ();
+	}
+}
+// ----
+// TypeError 4247: (184-187): Expression has to be an lvalue.
+// TypeError 4247: (196-199): Expression has to be an lvalue.
+// TypeError 4247: (218-221): Expression has to be an lvalue.
+// TypeError 4247: (252-255): Expression has to be an lvalue.
+// TypeError 7407: (258-260): Type tuple() is not implicitly convertible to expected type tuple(uint256,uint256).

From 6439955e834b1a1b6ae5f4a9aba857e04e4fefea Mon Sep 17 00:00:00 2001
From: Pranay <pranayreddy1024@gmail.com>
Date: Wed, 10 Aug 2022 13:54:02 +0530
Subject: [PATCH 0778/1748] Update the default free memory pointer in Yul.rst

The solidity docs and [Inline assembly memory management](https://docs.soliditylang.org/en/v0.8.15/assembly.html#memory-management) suggest the actual allocate-able memory starts from `0x80`. The above yul example defaults the free memory pointer to `0x60` in initialisation cases.
---
 docs/yul.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index d920f21240..6156d9ad67 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -1162,7 +1162,7 @@ An example Yul Object is shown below:
         code {
             function allocate(size) -> ptr {
                 ptr := mload(0x40)
-                if iszero(ptr) { ptr := 0x60 }
+                if iszero(ptr) { ptr := 0x80 }
                 mstore(0x40, add(ptr, size))
             }
 

From 664b7bfbdabef0391fd490618e38ed5c45108621 Mon Sep 17 00:00:00 2001
From: Roman Figurin <r_figurin@protonmail.com>
Date: Mon, 11 Jul 2022 22:28:10 +0800
Subject: [PATCH 0779/1748] [Docs] Fixed link to internal-function-calls

---
 docs/contracts/functions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index eebd1d45a8..94a427d72d 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -79,7 +79,7 @@ Function parameters can be used as any other local variable and they can also be
   parameter. This functionality is possible if you enable the ABI coder v2
   by adding ``pragma abicoder v2;`` to your source file.
 
-  An :ref:`internal function<external-function-calls>` can accept a
+  An :ref:`internal function<internal-function-calls>` can accept a
   multi-dimensional array without enabling the feature.
 
 .. index:: return array, return string, array, string, array of strings, dynamic array, variably sized array, return struct, struct

From bbf6ecf69dbd3fa8e93aad89fca15b3610cc091e Mon Sep 17 00:00:00 2001
From: Roman Figurin <r_figurin@protonmail.com>
Date: Wed, 13 Jul 2022 09:29:14 +0800
Subject: [PATCH 0780/1748] [Docs] Updated a part about abicoder v2 and
 multi-dimensional array for external-function-calls

---
 docs/contracts/functions.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index 94a427d72d..c7b7cc56b5 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -74,13 +74,13 @@ Function parameters can be used as any other local variable and they can also be
 
 .. note::
 
-  An :ref:`external function<external-function-calls>` cannot accept a
-  multi-dimensional array as an input
-  parameter. This functionality is possible if you enable the ABI coder v2
-  by adding ``pragma abicoder v2;`` to your source file.
+  Until version 0.6.0 it was not possible to use a multi-dimensional array or a struct
+  as an input for an :ref:`external function<external-function-calls>`.
+  ``abicoder v2`` made it possible and it's been enabled by default since version 0.8.0
+  (before that you had to enable it with ``pragma abicoder v2;``).
 
   An :ref:`internal function<internal-function-calls>` can accept a
-  multi-dimensional array without enabling the feature.
+  multi-dimensional array or a struct without any restrictions.
 
 .. index:: return array, return string, array, string, array of strings, dynamic array, variably sized array, return struct, struct
 

From 213f951dbb2a855366f27dd258b6b07f078ca945 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 10 Aug 2022 16:50:42 +0200
Subject: [PATCH 0781/1748] Make gas diff stats script executable.

---
 scripts/gas_diff_stats.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/gas_diff_stats.py

diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
old mode 100644
new mode 100755

From d066dd2bc0677e4b371471ede7f8ba034e36d21e Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Fri, 22 Jul 2022 10:16:04 +0200
Subject: [PATCH 0782/1748] Calldata validation tests

---
 .../calldata_dynamic_array_to_memory.sol      | 27 ++++++++
 .../calldata_nested_array_reencode.sol        | 45 ++++++++----
 .../calldata_overlapped_dynamic_arrays.sol    | 43 ++++++++++++
 ...ldata_overlapped_nested_dynamic_arrays.sol | 37 ++++++++++
 .../calldata_struct_array_reencode.sol        | 56 +++++++++++++++
 ...dimensional_dynamic_array_index_access.sol | 42 +++++++++++
 .../abiEncoderV2/calldata_with_garbage.sol    | 69 +++++++++++++++++++
 7 files changed, 304 insertions(+), 15 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
 create mode 100644 test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol

diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
new file mode 100644
index 0000000000..6bc20432db
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
@@ -0,0 +1,27 @@
+pragma abicoder v2;
+
+contract C {
+    function f(uint[][] calldata a) public returns (uint[][] memory) {
+        return a;
+    }
+
+    function g(uint[][][] calldata a) public returns (uint[][][] memory) {
+        return a;
+    }
+
+    function h(uint[2][][] calldata a) public returns (uint[2][][] memory) {
+        return a;
+    }
+}
+
+// ====
+// compileViaYul: also
+// ----
+// f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8 -> 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8
+// f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8, 9 -> 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8
+// f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8 -> FAILURE
+// g(uint256[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8 -> 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8
+// g(uint256[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0xa0, 2, 5, 6, 2, 7 -> FAILURE
+// h(uint256[2][][]): 0x20, 2, 0x40, 0x60, 0, 2, 5, 6, 7, 8 -> 0x20, 2, 0x40, 0x60, 0, 2, 5, 6, 7, 8
+// h(uint256[2][][]): 0x20, 2, 0x40, 0x60, 0, 2, 5, 6, 7, 8, 9 -> 0x20, 2, 0x40, 0x60, 0, 2, 5, 6, 7, 8
+// h(uint256[2][][]): 0x20, 2, 0x40, 0x60, 0, 2, 5, 6, 7 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
index 0872a7f5d5..f62f105c8f 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
@@ -1,22 +1,37 @@
 pragma abicoder v2;
 
 contract C {
-	function h(uint[][] calldata a) public {
-		abi.encode(a);
-	}
-	struct S { uint[] x; }
-	function f(S calldata a) public {
-		abi.encode(a);
-	}
+    function f(uint[][] calldata a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
+    function g(uint8[][][] calldata a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
+    function h(uint16[][2][] calldata a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
+    function i(uint16[][][1] calldata a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
+    function j(uint16[2][][] calldata a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
 }
 // ====
 // revertStrings: debug
+// compileViaYul: also
 // ----
-// h(uint256[][]): 0x20, 1, 0x20, 0 ->
-// h(uint256[][]): 0x20, 1, 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
-// h(uint256[][]): 0x20, 1, 0x20, 2 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
-// h(uint256[][]): 0x20, 1, 0x20, 3 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
-// f((uint256[])): 0x20, 0x20, 0 ->
-// f((uint256[])): 0x20, 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
-// f((uint256[])): 0x20, 0x20, 2 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
-// f((uint256[])): 0x20, 0x20, 3 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
+// f(uint256[][]): 0x20, 1, 0x20, 0 -> 0x20, 0x80, 0x20, 1, 0x20, 0
+// f(uint256[][]): 0x20, 1, 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
+// f(uint256[][]): 0x20, 1, 0x20, 2 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
+// f(uint256[][]): 0x20, 1, 0x20, 3 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
+// g(uint8[][][]): 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 0 -> 0x20, 0x01a0, 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 0
+// g(uint8[][][]): 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access offset"
+// g(uint8[][][]): 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 1, 0x20, 0 -> 0x20, 0x01e0, 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 1, 0x20, 0
+// g(uint8[][][]): 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 1, 0x20, 0, 1 -> 0x20, 0x01e0, 0x20, 2, 0x40, 0x0140, 2, 0x40, 0x80, 1, 10, 2, 11, 12, 1, 0x20, 0
+// h(uint16[][2][]): 0x20, 2, 0x40, 0x0120, 0x40, 0x80, 1, 10, 2, 11, 12, 0x40, 0x60, 0, 1, 13 -> 0x20, 0x0200, 0x20, 2, 0x40, 288, 0x40, 0x80, 1, 10, 2, 11, 12, 0x40, 0x60, 0, 1, 13
+// h(uint16[][2][]): 0x20, 2, 0x40, 0x0120, 0x40, 0x80, 1, 10, 2, 11, 12, 0x40, 0x60, 0, 1 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
+// i(uint16[][][1]): 0x20, 0x20, 2, 0x40, 0x80, 1, 10, 2, 11, 12 -> 0x20, 0x0140, 0x20, 0x20, 2, 0x40, 0x80, 1, 10, 2, 11, 12
+// i(uint16[][][1]): 0x20, 0x20, 2, 0x40, 0x80, 1, 10, 2, 11 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
+// j(uint16[2][][]): 0x20, 2, 0x40, 0xa0, 1, 0x0a, 11, 2, 12, 13, 14, 15 -> 0x20, 0x0180, 0x20, 2, 0x40, 0xa0, 1, 10, 11, 2, 12, 13, 14, 15
+// j(uint16[2][][]): 0x20, 2, 0x40, 0xa0, 1, 0x0a, 11, 2, 12, 13, 14 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
new file mode 100644
index 0000000000..7d197fcb58
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -0,0 +1,43 @@
+pragma abicoder v2;
+
+contract C {
+    uint[] s;
+    uint[2] n;
+
+    function f_memory(uint[] calldata a, uint[2] calldata b) public returns (uint[] memory, uint[2] memory) {
+        return (a, b);
+    }
+
+    function f_encode(uint[] calldata a, uint[2] calldata b) public returns (bytes memory) {
+        return abi.encode(a, b);
+    }
+
+    function f_which(uint[] calldata a, uint[2] calldata b, uint which) public returns (bytes memory) {
+	return abi.encode(a[which], b[1]);
+    }
+
+    function f_storage(uint[] calldata a, uint[2] calldata b ) public returns (bytes memory) {
+        s = a;
+        n = b;
+	return abi.encode(s);
+    }
+}
+
+// ====
+// compileViaYul: also
+// ----
+// f_memory(uint256[],uint256[2]): 0x20, 1, 2 -> 0x60, 0x01, 0x02, 1, 2
+// f_memory(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x60, 1, 2, 2, 5, 6
+// f_memory(uint256[],uint256[2]): 0x40, 1, 2, 5 -> FAILURE
+// f_encode(uint256[],uint256[2]): 0x20, 1, 2 -> 0x20, 0xa0, 0x60, 1, 2, 1, 2
+// f_encode(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x20, 0xc0, 0x60, 1, 2, 2, 5, 6
+// f_encode(uint256[],uint256[2]): 0x40, 1, 2, 5 -> FAILURE
+// f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1, 5 -> 0x20, 0x40, 5, 2
+// f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1, 5, 6 -> 0x20, 0x40, 5, 2
+// f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1 -> FAILURE
+// f_storage(uint256[],uint256[2]): 0x20, 1, 2 -> 0x20, 0x60, 0x20, 1, 2
+// gas irOptimized: 111653
+// gas legacy: 112987
+// gas legacyOptimized: 112104
+// f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x20, 0x80, 0x20, 2, 5, 6
+// f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
new file mode 100644
index 0000000000..6ec079a818
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
@@ -0,0 +1,37 @@
+pragma abicoder v2;
+
+contract C {
+    uint[] s;
+    uint[2] n;
+
+    function f_memory(uint[][] calldata a) public returns (uint[][] memory) {
+	return a;
+    }
+
+    function f_encode(uint[][] calldata a) public returns (bytes memory) {
+	return abi.encode(a);
+    }
+
+    function f_which(uint[][] calldata a, uint which) public returns (uint[] memory) {
+	return a[which];
+    }
+}
+
+// ====
+// compileViaYul: also
+// ----
+// f_memory(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 1, 2 -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 2, 1, 2
+// f_memory(uint256[][]): 0x20, 2, 0x40, 0x60, 2, 1, 2 -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 1, 2
+// f_memory(uint256[][]): 0x20, 2, 0, 0x60, 2, 1, 2 -> 0x20, 2, 0x40, 0x60, 0, 1, 2
+// f_memory(uint256[][]): 0x20, 2, 0, 0x60, 2, 2, 2 -> FAILURE
+// f_encode(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 1, 2 -> 0x20, 0x0140, 0x20, 2, 0x40, 0xa0, 2, 1, 2, 2, 1, 2
+// f_encode(uint256[][]): 0x20, 2, 0x40, 0x60, 2, 1, 2 -> 0x20, 0x0120, 0x20, 2, 0x40, 0xa0, 2, 1, 2, 1, 2
+// f_encode(uint256[][]): 0x20, 2, 0, 0x60, 2, 1, 2 -> 0x20, 0xe0, 0x20, 2, 0x40, 0x60, 0, 1, 2
+// f_encode(uint256[][]): 0x20, 2, 0, 0x60, 2, 2, 2 -> FAILURE
+// f_which(uint256[][],uint256): 0x40, 0, 2, 0x40, 0x40, 2, 1, 2 -> 0x20, 2, 1, 2
+// f_which(uint256[][],uint256): 0x40, 1, 2, 0x40, 0x40, 2, 1, 2 -> 0x20, 2, 1, 2
+// f_which(uint256[][],uint256): 0x40, 0, 2, 0x40, 0x60, 2, 1, 2 -> 0x20, 2, 1, 2
+// f_which(uint256[][],uint256): 0x40, 1, 2, 0x40, 0x60, 2, 1, 2 -> 0x20, 1, 2
+// f_which(uint256[][],uint256): 0x40, 0, 2, 0, 0x60, 2, 1, 2 -> 0x20, 0
+// f_which(uint256[][],uint256): 0x40, 1, 2, 0, 0x60, 2, 1, 2 -> 0x20, 1, 2
+// f_which(uint256[][],uint256): 0x40, 1, 2, 0, 0x60, 2, 2, 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
new file mode 100644
index 0000000000..17f0e1f84d
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
@@ -0,0 +1,56 @@
+pragma abicoder v2;
+
+contract C {
+    struct D { uint[] x; }
+    struct S { uint x; }
+
+    function f(D calldata a) public returns (bytes memory){
+        return abi.encode(a);
+    }
+
+    function g(D[2] calldata a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
+
+    function h(D[][] calldata a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
+
+    function i(D[2][] calldata a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
+
+    function j(S[] memory a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
+
+    function k(S[2] memory a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
+
+    function l(S[][] memory a) public returns (bytes memory) {
+        return abi.encode(a);
+    }
+
+}
+
+// ====
+// compileViaYul: also
+// ----
+// f((uint256[])): 0x20, 0x20, 0 -> 0x20, 0x60, 0x20, 0x20, 0
+// f((uint256[])): 0x20, 0x20, 1 -> FAILURE
+// f((uint256[])): 0x20, 0x20, 2 -> FAILURE
+// f((uint256[])): 0x20, 0x20, 3 -> FAILURE
+// g((uint256[])[2]): 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3 -> 0x20, 0x0140, 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3
+// g((uint256[])[2]): 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1 -> FAILURE
+// h((uint256[])[][]): 0x20, 0x02, 0x40, 0x0180, 2, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3, 1, 0x20, 0x20, 1, 1 -> 0x20, 0x0260, 0x20, 2, 0x40, 0x0180, 2, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3, 1, 0x20, 0x20, 1, 1
+// h((uint256[])[][]): 0x20, 0x02, 0x40, 0x0180, 2, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3, 1, 0x20, 0x20, 1 -> FAILURE
+// i((uint256[])[2][]): 0x20, 1, 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3 -> 0x20, 0x0180, 0x20, 1, 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1, 3
+// i((uint256[])[2][]): 0x20, 1, 0x20, 0x40, 0xc0, 0x20, 2, 1, 2, 0x20, 1 -> FAILURE
+// j((uint256)[]): 0x20, 2, 1, 2 -> 0x20, 0x80, 0x20, 2, 1, 2
+// j((uint256)[]): 0x20, 2, 1 -> FAILURE
+// k((uint256)[2]): 1, 2 -> 0x20, 0x40, 1, 2
+// k((uint256)[2]): 1 -> FAILURE
+// l((uint256)[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8, 9 -> 0x20, 0x0160, 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8, 9
+// l((uint256)[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8, 9, 10 -> 0x20, 0x0160, 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8, 9
+// l((uint256)[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 3, 7, 8 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
new file mode 100644
index 0000000000..073bb25e28
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
@@ -0,0 +1,42 @@
+pragma abicoder v2;
+
+contract C {
+    struct S { uint[] a; }
+
+    function f(uint[][] calldata s, uint i, uint j) public pure returns (bytes memory) {
+        return abi.encode(s[i][j]);
+    }
+
+    function g(uint[][][] calldata s, uint i, uint j, uint k) public pure returns (bytes memory) {
+        return abi.encode(s[i][j][k]);
+    }
+
+    function h(uint[][][1] calldata s, uint i) public pure returns (bytes memory) {
+        return abi.encode(s[0][i]);
+    }
+
+    function k(S[][] calldata s, uint i, uint j) public pure returns (bytes memory) {
+        return abi.encode(s[i][j].a);
+    }
+
+    function l(S[2][2] calldata s, uint i, uint j) public pure returns (bytes memory) {
+        return abi.encode(s[i][j].a);
+    }
+}
+
+// ====
+// compileViaYul: also
+// revertStrings: debug
+// ----
+// f(uint256[][],uint256,uint256): 0x60, 0, 0, 2, 0x40, 0x80, 1, 7, 1, 8 -> 0x20, 0x20, 7
+// f(uint256[][],uint256,uint256): 0x60, 1, 0, 2, 0x40, 0x80, 1, 7, 1, 8 -> 0x20, 0x20, 8
+// g(uint256[][][],uint256,uint256,uint256): 0x80, 0, 0, 0, 2, 0x40, 0xc0, 1, 0x20, 1, 4, 2, 0x40, 0xa0, 2, 5, 6, 1, 7 -> 0x20, 0x20, 4
+// g(uint256[][][],uint256,uint256,uint256): 0x80, 1, 0, 1, 2, 0x40, 0xc0, 1, 0x20, 1, 4, 2, 0x40, 0xa0, 2, 5, 6, 1, 7 -> 0x20, 0x20, 6
+// g(uint256[][][],uint256,uint256,uint256): 0x80, 1, 0, 2, 2, 0x40, 0xc0, 1, 0x20, 1, 4, 2, 0x40, 0xa0, 2, 5, 6, 1, 7 -> FAILURE, hex"4e487b71", 0x32
+// g(uint256[][][],uint256,uint256,uint256): 0x80, 2, 0, 1, 2, 0x40, 0xc0, 1, 0x20, 1, 4, 2, 0x40, 0xa0, 2, 5, 6, 1, 7 -> FAILURE, hex"4e487b71", 0x32
+// h(uint256[][][1],uint256): 0x40, 1, 0x20, 2, 0x40, 0xA0, 2, 5, 6, 3, 7, 8, 9 -> 0x20, 0xa0, 0x20, 3, 7, 8, 9
+// h(uint256[][][1],uint256): 0x40, 2, 0x20, 2, 0x40, 0xA0, 2, 5, 6, 3, 7, 8, 9 -> FAILURE, hex"4e487b71", 0x32
+// k((uint256[])[][],uint256,uint256): 0x60, 0, 0, 2, 0x40, 0xe0, 1, 0x20, 0x20, 1, 6, 2, 0x40, 0xa0, 0x20, 1, 7, 0x20, 2, 8, 9 -> 0x20, 0x60, 0x20, 1, 6
+// k((uint256[])[][],uint256,uint256): 0x60, 0, 1, 2, 0x40, 0xe0, 1, 0x20, 0x20, 1, 6, 2, 0x40, 0xa0, 0x20, 1, 7, 0x20, 2, 8, 9 -> FAILURE, hex"4e487b71", 0x32
+// l((uint256[])[2][2],uint256,uint256): 0x60, 1, 1, 0x40, 0x0140, 0x40, 0xa0, 0x20, 1, 5, 0x20, 1, 6, 0x40, 0xa0, 0x20, 1, 7, 0x20, 2, 8, 9 -> 0x20, 0x80, 0x20, 2, 8, 9
+// l((uint256[])[2][2],uint256,uint256): 0x60, 1, 2, 0x40, 0x0140, 0x40, 0xa0, 0x20, 1, 5, 0x20, 1, 6, 0x40, 0xa0, 0x20, 1, 7, 0x20, 2, 8, 9 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
new file mode 100644
index 0000000000..ef5ece3f0a
--- /dev/null
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
@@ -0,0 +1,69 @@
+pragma abicoder v2;
+
+contract C {
+    uint[] aTmp;
+    uint[2] bTmp;
+
+    function f_memory(uint[] calldata a) public returns (uint[] memory) {
+	return a;
+    }
+
+    function f_encode(uint[] calldata a) public returns (bytes memory) {
+	return abi.encode(a);
+    }
+
+    function f_storage(uint[] calldata a) public returns (bytes memory) {
+        aTmp = a;
+        return abi.encode(aTmp);
+    }
+
+    function f_index(uint[] calldata a, uint which) public returns (uint) {
+        return a[which];
+    }
+
+    function g_memory(uint[] calldata a, uint[2] calldata b) public returns (uint[] memory, uint[2] memory) {
+        return (a, b);
+    }
+
+    function g_encode(uint[] calldata a, uint[2] calldata b) public returns (bytes memory) {
+        return abi.encode(a, b);
+    }
+
+    function g_storage(uint[] calldata a, uint[2] calldata b) public returns (bytes memory) {
+        aTmp = a;
+        bTmp = b;
+        return abi.encode(aTmp, bTmp);
+    }
+
+    function g_index(uint[] calldata a, uint[2] calldata b, uint which) public returns (uint, uint) {
+        return (a[which], b[0]);
+    }
+}
+
+// ====
+// compileViaYul: also
+// ----
+// f_memory(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0
+// f_memory(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 1, 7
+// f_memory(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE
+// f_encode(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0x40, 0x20, 0
+// f_encode(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 0x60, 0x20, 1, 7
+// f_encode(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE
+// f_storage(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0x40, 0x20, 0
+// f_storage(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 0x60, 0x20, 1, 7
+// f_storage(uint256[]): 0x80, 9, 9, 9, 2, 7 -> FAILURE
+// f_index(uint256[],uint256): 0xa0, 0, 9, 9, 9, 2, 7, 8 -> 7
+// f_index(uint256[],uint256): 0xa0, 1, 9, 9, 9, 2, 7, 8 -> 8
+// f_index(uint256[],uint256): 0xa0, 2, 9, 9, 9, 2, 7, 8 -> FAILURE, hex"4e487b71", 0x32
+// g_memory(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 0 -> 0x60, 1, 2, 0
+// g_memory(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 1, 7 -> 0x60, 1, 2, 1, 7
+// g_memory(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE
+// g_encode(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 0 -> 0x20, 0x80, 0x60, 1, 2, 0
+// g_encode(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 1, 7 -> 0x20, 0xa0, 0x60, 1, 2, 1, 7
+// g_encode(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE
+// g_storage(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 0 -> 0x20, 0x80, 0x60, 1, 2, 0
+// g_storage(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 1, 7 -> 0x20, 0xa0, 0x60, 1, 2, 1, 7
+// g_storage(uint256[],uint256[2]): 0xc0, 1, 2, 9, 9, 9, 2, 7 -> FAILURE
+// g_index(uint256[],uint256[2],uint256): 0xe0, 1, 2, 0, 9, 9, 9, 2, 7, 8 -> 7, 1
+// g_index(uint256[],uint256[2],uint256): 0xe0, 1, 2, 1, 9, 9, 9, 2, 7, 8 -> 8, 1
+// g_index(uint256[],uint256[2],uint256): 0xe0, 1, 2, 1, 9, 9, 9, 2, 7 -> FAILURE

From 123a4107959df322d333ce957c54b61aa2b8cd02 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 10 Aug 2022 13:06:17 +0200
Subject: [PATCH 0783/1748] fixup! Calldata validation tests

---
 .../abiEncoderV2/calldata_overlapped_dynamic_arrays.sol     | 4 ++--
 .../calldata_overlapped_nested_dynamic_arrays.sol           | 6 +++---
 .../semanticTests/abiEncoderV2/calldata_with_garbage.sol    | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
index 7d197fcb58..d8bca264be 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -13,13 +13,13 @@ contract C {
     }
 
     function f_which(uint[] calldata a, uint[2] calldata b, uint which) public returns (bytes memory) {
-	return abi.encode(a[which], b[1]);
+        return abi.encode(a[which], b[1]);
     }
 
     function f_storage(uint[] calldata a, uint[2] calldata b ) public returns (bytes memory) {
         s = a;
         n = b;
-	return abi.encode(s);
+        return abi.encode(s);
     }
 }
 
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
index 6ec079a818..6dd4920299 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
@@ -5,15 +5,15 @@ contract C {
     uint[2] n;
 
     function f_memory(uint[][] calldata a) public returns (uint[][] memory) {
-	return a;
+        return a;
     }
 
     function f_encode(uint[][] calldata a) public returns (bytes memory) {
-	return abi.encode(a);
+        return abi.encode(a);
     }
 
     function f_which(uint[][] calldata a, uint which) public returns (uint[] memory) {
-	return a[which];
+        return a[which];
     }
 }
 
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
index ef5ece3f0a..1bc887c7dd 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
@@ -5,11 +5,11 @@ contract C {
     uint[2] bTmp;
 
     function f_memory(uint[] calldata a) public returns (uint[] memory) {
-	return a;
+        return a;
     }
 
     function f_encode(uint[] calldata a) public returns (bytes memory) {
-	return abi.encode(a);
+        return abi.encode(a);
     }
 
     function f_storage(uint[] calldata a) public returns (bytes memory) {

From 60e7e4a24c25b222b3376386cc549a2f72097fb4 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 10 Aug 2022 13:26:18 +0200
Subject: [PATCH 0784/1748] fixup! Calldata validation tests

---
 .../abiEncoderV2/calldata_dynamic_array_to_memory.sol           | 2 --
 .../abiEncoderV2/calldata_nested_array_reencode.sol             | 1 -
 .../abiEncoderV2/calldata_overlapped_dynamic_arrays.sol         | 2 --
 .../abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol  | 2 --
 .../abiEncoderV2/calldata_struct_array_reencode.sol             | 2 --
 .../calldata_three_dimensional_dynamic_array_index_access.sol   | 1 -
 .../semanticTests/abiEncoderV2/calldata_with_garbage.sol        | 2 --
 7 files changed, 12 deletions(-)

diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
index 6bc20432db..f044d6f05a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
@@ -14,8 +14,6 @@ contract C {
     }
 }
 
-// ====
-// compileViaYul: also
 // ----
 // f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8 -> 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8
 // f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8, 9 -> 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
index f62f105c8f..96573fb4ba 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_nested_array_reencode.sol
@@ -19,7 +19,6 @@ contract C {
 }
 // ====
 // revertStrings: debug
-// compileViaYul: also
 // ----
 // f(uint256[][]): 0x20, 1, 0x20, 0 -> 0x20, 0x80, 0x20, 1, 0x20, 0
 // f(uint256[][]): 0x20, 1, 0x20, 1 -> FAILURE, hex"08c379a0", 0x20, 0x1e, "Invalid calldata access stride"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
index d8bca264be..3b829d82cb 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -23,8 +23,6 @@ contract C {
     }
 }
 
-// ====
-// compileViaYul: also
 // ----
 // f_memory(uint256[],uint256[2]): 0x20, 1, 2 -> 0x60, 0x01, 0x02, 1, 2
 // f_memory(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x60, 1, 2, 2, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
index 6dd4920299..f7ed9daf45 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
@@ -17,8 +17,6 @@ contract C {
     }
 }
 
-// ====
-// compileViaYul: also
 // ----
 // f_memory(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 1, 2 -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 2, 1, 2
 // f_memory(uint256[][]): 0x20, 2, 0x40, 0x60, 2, 1, 2 -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 1, 2
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
index 17f0e1f84d..d456cdfcc2 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
@@ -34,8 +34,6 @@ contract C {
 
 }
 
-// ====
-// compileViaYul: also
 // ----
 // f((uint256[])): 0x20, 0x20, 0 -> 0x20, 0x60, 0x20, 0x20, 0
 // f((uint256[])): 0x20, 0x20, 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
index 073bb25e28..a97c4f6d8a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
@@ -25,7 +25,6 @@ contract C {
 }
 
 // ====
-// compileViaYul: also
 // revertStrings: debug
 // ----
 // f(uint256[][],uint256,uint256): 0x60, 0, 0, 2, 0x40, 0x80, 1, 7, 1, 8 -> 0x20, 0x20, 7
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
index 1bc887c7dd..b126928546 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
@@ -40,8 +40,6 @@ contract C {
     }
 }
 
-// ====
-// compileViaYul: also
 // ----
 // f_memory(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0
 // f_memory(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 1, 7

From 99ac7e09bb37e50104fa21b7a7b38e491ff2fd57 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Thu, 11 Aug 2022 07:55:10 +0200
Subject: [PATCH 0785/1748] fixup! Calldata validation tests

---
 .../abiEncoderV2/calldata_overlapped_dynamic_arrays.sol         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
index 3b829d82cb..1ec1ca4c56 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -35,7 +35,7 @@ contract C {
 // f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1 -> FAILURE
 // f_storage(uint256[],uint256[2]): 0x20, 1, 2 -> 0x20, 0x60, 0x20, 1, 2
 // gas irOptimized: 111653
-// gas legacy: 112987
+// gas legacy: 112979
 // gas legacyOptimized: 112104
 // f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x20, 0x80, 0x20, 2, 5, 6
 // f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5 -> FAILURE

From 9290ccb9087fd8f1fddcf496061c197bb9d05db2 Mon Sep 17 00:00:00 2001
From: Yuvraj Singh <yuvi56789@gmail.com>
Date: Fri, 8 Jul 2022 19:25:04 +0530
Subject: [PATCH 0786/1748] Added build flag to disable pedantic builds

---
 CMakeLists.txt                  |  4 +++
 cmake/EthCompilerSettings.cmake | 56 +++++++++++++++++++--------------
 2 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2aca61d300..d8de3d1498 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,6 +35,7 @@ endif()
 option(SOLC_LINK_STATIC "Link solc executable statically on supported platforms" OFF)
 option(SOLC_STATIC_STDLIBS "Link solc against static versions of libgcc and libstdc++ on supported platforms" OFF)
 option(STRICT_Z3_VERSION "Use the latest version of Z3" ON)
+option(PEDANTIC "Enable extra warnings and pedantic build flags. Treat all warnings as errors." ON)
 
 # Setup cccache.
 include(EthCcache)
@@ -48,6 +49,9 @@ include_directories(SYSTEM ${JSONCPP_INCLUDE_DIR})
 
 find_package(Threads)
 
+if(NOT PEDANTIC)
+  message(WARNING "-- Pedantic build flags turned off. Warnings will not make compilation fail. This is NOT recommended in development builds.")
+endif()
 # Figure out what compiler and system are we using
 include(EthCompilerSettings)
 
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 0ddeb452a9..01eee4b984 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -23,7 +23,9 @@ if(NOT EMSCRIPTEN)
 	endif()
 endif()
 
-eth_add_cxx_compiler_flag_if_supported(-Wimplicit-fallthrough)
+if(PEDANTIC)
+	eth_add_cxx_compiler_flag_if_supported(-Wimplicit-fallthrough)
+endif()
 
 # Prevent the path of the source directory from ending up in the binary via __FILE__ macros.
 eth_add_cxx_compiler_flag_if_supported("-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=/solidity")
@@ -32,39 +34,45 @@ eth_add_cxx_compiler_flag_if_supported("-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=/
 # if the argument was not wrapped in a call.  This happens when moving a local
 # variable in a return statement when the variable is the same type as the
 # return type or using a move to create a new object from a temporary object.
-eth_add_cxx_compiler_flag_if_supported(-Wpessimizing-move)
+if(PEDANTIC)
+	eth_add_cxx_compiler_flag_if_supported(-Wpessimizing-move)
+endif()
 
 # -Wredundant-move warns when an implicit move would already be made, so the
 # std::move call is not needed, such as when moving a local variable in a return
 # that is different from the return type.
-eth_add_cxx_compiler_flag_if_supported(-Wredundant-move)
+if(PEDANTIC)
+	eth_add_cxx_compiler_flag_if_supported(-Wredundant-move)
+endif()
 
 if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang"))
 	# Enables all the warnings about constructions that some users consider questionable,
 	# and that are easy to avoid.  Also enable some extra warning flags that are not
 	# enabled by -Wall.   Finally, treat at warnings-as-errors, which forces developers
 	# to fix warnings as they arise, so they don't accumulate "to be fixed later".
-	add_compile_options(-Wall)
-	add_compile_options(-Wextra)
-	add_compile_options(-Werror)
-	add_compile_options(-pedantic)
-	add_compile_options(-Wmissing-declarations)
-	add_compile_options(-Wno-unknown-pragmas)
-	add_compile_options(-Wimplicit-fallthrough)
-	add_compile_options(-Wsign-conversion)
-	add_compile_options(-Wconversion)
+	if(PEDANTIC)
+		add_compile_options(-Wall)
+		add_compile_options(-Wextra)
+		add_compile_options(-Werror)
+		add_compile_options(-pedantic)
+		add_compile_options(-Wmissing-declarations)
+		add_compile_options(-Wno-unknown-pragmas)
+		add_compile_options(-Wimplicit-fallthrough)
+		add_compile_options(-Wsign-conversion)
+		add_compile_options(-Wconversion)
 
-	check_cxx_compiler_flag(-Wextra-semi WEXTRA_SEMI)
-	if(WEXTRA_SEMI)
-		add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>)
+		check_cxx_compiler_flag(-Wextra-semi WEXTRA_SEMI)
+		if(WEXTRA_SEMI)
+			add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>)
+		endif()
+		eth_add_cxx_compiler_flag_if_supported(-Wfinal-dtor-non-final-class)
+		eth_add_cxx_compiler_flag_if_supported(-Wnewline-eof)
+		eth_add_cxx_compiler_flag_if_supported(-Wsuggest-destructor-override)
+		eth_add_cxx_compiler_flag_if_supported(-Wduplicated-cond)
+		eth_add_cxx_compiler_flag_if_supported(-Wduplicate-enum)
+		eth_add_cxx_compiler_flag_if_supported(-Wlogical-op)
+		eth_add_cxx_compiler_flag_if_supported(-Wno-unknown-attributes)
 	endif()
-	eth_add_cxx_compiler_flag_if_supported(-Wfinal-dtor-non-final-class)
-	eth_add_cxx_compiler_flag_if_supported(-Wnewline-eof)
-	eth_add_cxx_compiler_flag_if_supported(-Wsuggest-destructor-override)
-	eth_add_cxx_compiler_flag_if_supported(-Wduplicated-cond)
-	eth_add_cxx_compiler_flag_if_supported(-Wduplicate-enum)
-	eth_add_cxx_compiler_flag_if_supported(-Wlogical-op)
-	eth_add_cxx_compiler_flag_if_supported(-Wno-unknown-attributes)
 
 	# Configuration-specific compiler settings.
 	set(CMAKE_CXX_FLAGS_DEBUG          "-O0 -g3 -DETH_DEBUG")
@@ -158,7 +166,9 @@ elseif (DEFINED MSVC)
 
 	add_compile_options(/MP)						# enable parallel compilation
 	add_compile_options(/EHsc)						# specify Exception Handling Model in msvc
-	add_compile_options(/WX)						# enable warnings-as-errors
+	if(PEDANTIC)
+		add_compile_options(/WX)					# enable warnings-as-errors
+	endif()
 	add_compile_options(/wd4068)					# disable unknown pragma warning (4068)
 	add_compile_options(/wd4996)					# disable unsafe function warning (4996)
 	add_compile_options(/wd4503)					# disable decorated name length exceeded, name was truncated (4503)

From b7847c9f07869058215af2a79507414d3df1368a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 11 Aug 2022 15:35:38 +0200
Subject: [PATCH 0787/1748] installing-solidity.rst: Mention the PEDANTIC flag

---
 docs/installing-solidity.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 9d6e666d25..9a613d75d3 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -354,6 +354,17 @@ The following are dependencies for all builds of Solidity:
     If you do this, however, please remember to pass the ``--no-smt`` option to ``scripts/tests.sh``
     to skip the SMT tests.
 
+.. note::
+    By default the build is performed in *pedantic mode*, which enables extra warnings and tells the
+    compiler to treat all warnings as errors.
+    This forces developers to fix warnings as they arise, so they do not accumulate "to be fixed later".
+    If you are only interested in creating a release build and do not intend to modify the source code
+    to deal with such warnings, you can pass ``-DPEDANTIC=OFF`` option to CMake to disable this mode.
+    Doing this is not recommended for general use but may be necessary when using a toolchain we are
+    not testing with or trying to build an older version with newer tools.
+    If you encounter such warnings, please consider
+    `reporting them <https://github.com/ethereum/solidity/issues/new>`_.
+
 Minimum Compiler Versions
 ^^^^^^^^^^^^^^^^^^^^^^^^^
 

From 351efae5f8bc1c7da978fa210e7e6cff8ab2ad7c Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 9 Aug 2022 17:12:40 +0200
Subject: [PATCH 0788/1748] Little enhancements to the ppa release script

---
 .gitignore             |  3 +++
 scripts/release_ppa.sh | 53 ++++++++++++++++++++++++++++++++++--------
 2 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index f91c0207f5..4f17171816 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 /commit_hash.txt
 /prerelease.txt
 
+# Auth config for ppa release
+/.release_ppa_auth
+
 # Compiled Object files
 *.slo
 *.lo
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 827b1fa97f..aca49dca63 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -9,13 +9,18 @@
 ## If the given branch is "release", the resulting package will be uploaded to
 ## ethereum/ethereum PPA, or ethereum/ethereum-dev PPA otherwise.
 ##
-## The gnupg key for "builds@ethereum.org" has to be present in order to sign
-## the package.
-##
 ## It will clone the Solidity git from github, determine the version,
 ## create a source archive and push it to the ubuntu ppa servers.
 ##
-## This requires the following entries in /etc/dput.cf:
+## To interact with launchpad, you need to set the variables $LAUNCHPAD_EMAIL
+## and $LAUNCHPAD_KEYID in the file .release_ppa_auth in the root directory of
+## the project to your launchpad email and pgp keyid.
+## This could for example look like this:
+##
+##  LAUNCHPAD_EMAIL=your-launchpad-email@ethereum.org
+##  LAUNCHPAD_KEYID=123ABCFFFFFFFF
+##
+## Additionally the following entries in /etc/dput.cf are required:
 ##
 ##  [ethereum-dev]
 ##  fqdn			= ppa.launchpad.net
@@ -34,11 +39,17 @@
 ##  method			= ftp
 ##  incoming		= ~ethereum/ethereum-static
 ##  login			= anonymous
-
 ##
 ##############################################################################
 
-set -ev
+set -e
+
+
+REPO_ROOT="$(dirname "$0")/.."
+
+# for the "fail" function
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
 
 if [ -z "$1" ]
 then
@@ -51,17 +62,39 @@ is_release() {
     [[ "${branch}" =~ ^v[0-9]+(\.[0-9]+)*$ ]]
 }
 
-keyid=379F4801D622CDCF
-email=builds@ethereum.org
+# source keyid and email from .release_ppa_auth
+if [[ -e .release_ppa_auth ]]
+then
+    # shellcheck source=/dev/null
+    source "${REPO_ROOT}/.release_ppa_auth"
+fi
+
+[[ "$LAUNCHPAD_KEYID" != "" && "$LAUNCHPAD_EMAIL" != "" ]] || \
+    fail "Error: Couldn't find variables \$LAUNCHPAD_KEYID or \$LAUNCHPAD_EMAIL in sourced file .release_ppa_auth (check top comment in $0 for more information)."
+
 packagename=solc
 
+# This needs to be a still active release
 static_build_distribution=impish
 
 DISTRIBUTIONS="focal impish jammy kinetic"
 
+function checkDputEntries {
+    local pattern="$1"
+    grep "${pattern}" /etc/dput.cf --quiet || \
+        fail "Error: Missing ${pattern//\\/} section in /etc/dput.cf (check top comment in ${0} for more information)."
+}
+
 if is_release
 then
     DISTRIBUTIONS="$DISTRIBUTIONS STATIC"
+
+    # Sanity checks
+    checkDputEntries "\[ethereum\]"
+    checkDputEntries "\[ethereum-static\]"
+else
+    # Sanity check
+    checkDputEntries "\[ethereum-dev\]"
 fi
 
 for distribution in $DISTRIBUTIONS
@@ -245,7 +278,7 @@ chmod +x debian/rules
 
 versionsuffix=0ubuntu1~${distribution}
 # bump version / add entry to changelog
-EMAIL="$email" dch -v "1:${debversion}-${versionsuffix}" "git build of ${commithash}"
+EMAIL="$LAUNCHPAD_EMAIL" dch -v "1:${debversion}-${versionsuffix}" "git build of ${commithash}"
 
 
 # build source package
@@ -287,7 +320,7 @@ fi
 )
 
 # sign the package
-debsign --re-sign -k "${keyid}" "../${packagename}_${debversion}-${versionsuffix}_source.changes"
+debsign --re-sign -k "${LAUNCHPAD_KEYID}" "../${packagename}_${debversion}-${versionsuffix}_source.changes"
 
 # upload
 dput "${pparepo}" "../${packagename}_${debversion}-${versionsuffix}_source.changes"

From 0fab970eb932cc6886ddcbdfa260490c37515e81 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Wed, 10 Aug 2022 20:02:12 +0200
Subject: [PATCH 0789/1748] Remove old distributions in release_ppa script

---
 scripts/release_ppa.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index aca49dca63..6e3eae01cc 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -75,9 +75,9 @@ fi
 packagename=solc
 
 # This needs to be a still active release
-static_build_distribution=impish
+static_build_distribution=focal
 
-DISTRIBUTIONS="focal impish jammy kinetic"
+DISTRIBUTIONS="focal jammy kinetic"
 
 function checkDputEntries {
     local pattern="$1"

From e3ed29d3b3615bc3e0419c1b8a5db8cef68f3b90 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Mon, 8 Aug 2022 10:59:58 +0200
Subject: [PATCH 0790/1748] Permit multiple indirections in coding calldata to
 and from memory/calldata.

---
 test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp    | 17 ++---
 .../tools/ossfuzz/SolidityEvmoneInterface.cpp | 68 ++++++++-----------
 test/tools/ossfuzz/SolidityEvmoneInterface.h  |  2 +-
 test/tools/ossfuzz/abiV2Proto.proto           |  1 +
 test/tools/ossfuzz/abiV2ProtoFuzzer.cpp       | 33 ++++-----
 test/tools/ossfuzz/protoToAbiV2.cpp           | 67 +++++++++++++-----
 test/tools/ossfuzz/protoToAbiV2.h             | 34 +++++++++-
 test/tools/ossfuzz/solProtoFuzzer.cpp         |  9 +--
 8 files changed, 138 insertions(+), 93 deletions(-)

diff --git a/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp b/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
index 6a12878e15..78697a9ddd 100644
--- a/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
+++ b/test/tools/ossfuzz/AbiV2IsabelleFuzzer.cpp
@@ -36,7 +36,7 @@ static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
 
 DEFINE_PROTO_FUZZER(Contract const& _contract)
 {
-	ProtoConverter converter;
+	ProtoConverter converter(_contract.seed());
 	string contractSource = converter.contractToString(_contract);
 
 	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
@@ -69,14 +69,11 @@ DEFINE_PROTO_FUZZER(Contract const& _contract)
 			{}
 		);
 		auto result = evmoneUtil.compileDeployAndExecute(encodedData);
-		if (result.has_value())
-		{
-			solAssert(result->status_code != EVMC_REVERT, "Proto ABIv2 fuzzer: EVM One reverted.");
-			if (result->status_code == EVMC_SUCCESS)
-				solAssert(
-					EvmoneUtility::zeroWord(result->output_data, result->output_size),
-					"Proto ABIv2 fuzzer: ABIv2 coding failure found."
-				);
-		}
+		solAssert(result.status_code != EVMC_REVERT, "Proto ABIv2 fuzzer: EVM One reverted.");
+		if (result.status_code == EVMC_SUCCESS)
+			solAssert(
+				EvmoneUtility::zeroWord(result.output_data, result.output_size),
+				"Proto ABIv2 fuzzer: ABIv2 coding failure found."
+			);
 	}
 }
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
index ff9fcf2d8d..884e35a8c0 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
@@ -128,7 +128,7 @@ evmc::result EvmoneUtility::deployAndExecute(
 	return callResult;
 }
 
-optional<evmc::result> EvmoneUtility::compileDeployAndExecute(string _fuzzIsabelle)
+evmc::result EvmoneUtility::compileDeployAndExecute(string _fuzzIsabelle)
 {
 	map<string, h160> libraryAddressMap;
 	// Stage 1: Compile and deploy library if present.
@@ -136,51 +136,43 @@ optional<evmc::result> EvmoneUtility::compileDeployAndExecute(string _fuzzIsabel
 	{
 		m_compilationFramework.contractName(m_libraryName);
 		auto compilationOutput = m_compilationFramework.compileContract();
-		if (compilationOutput.has_value())
-		{
-			CompilerOutput cOutput = compilationOutput.value();
-			// Deploy contract and signal failure if deploy failed
-			evmc::result createResult = deployContract(cOutput.byteCode);
-			solAssert(
-				createResult.status_code == EVMC_SUCCESS,
-				"SolidityEvmoneInterface: Library deployment failed"
-			);
-			libraryAddressMap[m_libraryName] = EVMHost::convertFromEVMC(createResult.create_address);
-			m_compilationFramework.libraryAddresses(libraryAddressMap);
-		}
-		else
-			return {};
+		solAssert(compilationOutput.has_value(), "Compiling library failed");
+		CompilerOutput cOutput = compilationOutput.value();
+		// Deploy contract and signal failure if deploy failed
+		evmc::result createResult = deployContract(cOutput.byteCode);
+		solAssert(
+			createResult.status_code == EVMC_SUCCESS,
+			"SolidityEvmoneInterface: Library deployment failed"
+		);
+		libraryAddressMap[m_libraryName] = EVMHost::convertFromEVMC(createResult.create_address);
+		m_compilationFramework.libraryAddresses(libraryAddressMap);
 	}
 
 	// Stage 2: Compile, deploy, and execute contract, optionally using library
 	// address map.
 	m_compilationFramework.contractName(m_contractName);
 	auto cOutput = m_compilationFramework.compileContract();
-	if (cOutput.has_value())
-	{
-		solAssert(
-			!cOutput->byteCode.empty() && !cOutput->methodIdentifiersInContract.empty(),
-			"SolidityEvmoneInterface: Invalid compilation output."
-		);
-
-		string methodName;
-		if (!_fuzzIsabelle.empty())
-			// TODO: Remove this once a cleaner solution is found for querying
-			// isabelle test entry point. At the moment, we are sure that the
-			// entry point is the second method in the contract (hence the ++)
-			// but not its name.
-			methodName = (++cOutput->methodIdentifiersInContract.begin())->asString() +
-				_fuzzIsabelle.substr(2, _fuzzIsabelle.size());
-		else
-			methodName = cOutput->methodIdentifiersInContract[m_methodName].asString();
+	solAssert(cOutput.has_value(), "Compiling contract failed");
+	solAssert(
+		!cOutput->byteCode.empty() && !cOutput->methodIdentifiersInContract.empty(),
+		"SolidityEvmoneInterface: Invalid compilation output."
+	);
 
-		return deployAndExecute(
-			cOutput->byteCode,
-			methodName
-		);
-	}
+	string methodName;
+	if (!_fuzzIsabelle.empty())
+		// TODO: Remove this once a cleaner solution is found for querying
+		// isabelle test entry point. At the moment, we are sure that the
+		// entry point is the second method in the contract (hence the ++)
+		// but not its name.
+		methodName = (++cOutput->methodIdentifiersInContract.begin())->asString() +
+			_fuzzIsabelle.substr(2, _fuzzIsabelle.size());
 	else
-		return {};
+		methodName = cOutput->methodIdentifiersInContract[m_methodName].asString();
+
+	return deployAndExecute(
+		cOutput->byteCode,
+		methodName
+	);
 }
 
 optional<CompilerOutput> EvmoneUtility::compileContract()
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.h b/test/tools/ossfuzz/SolidityEvmoneInterface.h
index 734caf560a..d6826cb891 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.h
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.h
@@ -122,7 +122,7 @@ class EvmoneUtility
 	/// and executing test configuration.
 	/// @param _isabelleData contains encoding data to be passed to the
 	/// isabelle test entry point.
-	std::optional<evmc::result> compileDeployAndExecute(std::string _isabelleData = {});
+	evmc::result compileDeployAndExecute(std::string _isabelleData = {});
 	/// Compares the contents of the memory address pointed to
 	/// by `_result` of `_length` bytes to u256 zero.
 	/// @returns true if `_result` is zero, false
diff --git a/test/tools/ossfuzz/abiV2Proto.proto b/test/tools/ossfuzz/abiV2Proto.proto
index 1afc031767..ec6fe1d55e 100644
--- a/test/tools/ossfuzz/abiV2Proto.proto
+++ b/test/tools/ossfuzz/abiV2Proto.proto
@@ -92,6 +92,7 @@ message Contract {
     required VarDecl state_vars = 1;
     required TestFunction testfunction = 2;
     required Test test = 3;
+    required uint32 seed = 4;
 }
 
 package solidity.test.abiv2fuzzer;
diff --git a/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp b/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
index 977d1bc455..6d792a70c5 100644
--- a/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/abiV2ProtoFuzzer.cpp
@@ -35,7 +35,7 @@ static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
 
 DEFINE_PROTO_FUZZER(Contract const& _input)
 {
-	string contract_source = ProtoConverter{}.contractToString(_input);
+	string contract_source = ProtoConverter{_input.seed()}.contractToString(_input);
 
 	if (const char* dump_path = getenv("PROTO_FUZZER_DUMP_PATH"))
 	{
@@ -61,21 +61,18 @@ DEFINE_PROTO_FUZZER(Contract const& _input)
 	);
 	// Invoke test function
 	auto result = evmoneUtil.compileDeployAndExecute();
-	if (result.has_value())
-	{
-		// We don't care about EVM One failures other than EVMC_REVERT
-		solAssert(result->status_code != EVMC_REVERT, "Proto ABIv2 fuzzer: EVM One reverted");
-		if (result->status_code == EVMC_SUCCESS)
-			if (!EvmoneUtility::zeroWord(result->output_data, result->output_size))
-			{
-				solidity::bytes resultAsBytes;
-				for (size_t i = 0; i < result->output_size; i++)
-					resultAsBytes.push_back(result->output_data[i]);
-				cout << solidity::util::toHex(resultAsBytes) << endl;
-				solAssert(
-					false,
-					"Proto ABIv2 fuzzer: ABIv2 coding failure found"
-				);
-			}
-	}
+	// We don't care about EVM One failures other than EVMC_REVERT
+	solAssert(result.status_code != EVMC_REVERT, "Proto ABIv2 fuzzer: EVM One reverted");
+	if (result.status_code == EVMC_SUCCESS)
+		if (!EvmoneUtility::zeroWord(result.output_data, result.output_size))
+		{
+			solidity::bytes res;
+			for (size_t i = 0; i < result.output_size; i++)
+				res.push_back(result.output_data[i]);
+			cout << solidity::util::toHex(res) << endl;
+			solAssert(
+				false,
+				"Proto ABIv2 fuzzer: ABIv2 coding failure found"
+			);
+		}
 }
diff --git a/test/tools/ossfuzz/protoToAbiV2.cpp b/test/tools/ossfuzz/protoToAbiV2.cpp
index a444228a1e..f20c0482c9 100644
--- a/test/tools/ossfuzz/protoToAbiV2.cpp
+++ b/test/tools/ossfuzz/protoToAbiV2.cpp
@@ -416,16 +416,7 @@ void ProtoConverter::appendTypedParamsExternal(
     Delimiter _delimiter
 )
 {
-	std::string qualifiedTypeString = (
-		_isValueType ?
-		_typeString :
-		_typeString + " calldata"
-	);
-	m_typedParamsExternal << Whiskers(R"(<delimiter><type> <varName>)")
-		("delimiter", delimiterToString(_delimiter))
-		("type", qualifiedTypeString)
-		("varName", _varName)
-		.render();
+	m_externalParamsRep.push_back({_delimiter, _isValueType, _typeString, _varName});
 	m_untypedParamsExternal << Whiskers(R"(<delimiter><varName>)")
 		("delimiter", delimiterToString(_delimiter))
 		("varName", _varName)
@@ -475,7 +466,25 @@ std::string ProtoConverter::typedParametersAsString(CalleeType _calleeType)
 	case CalleeType::PUBLIC:
 		return m_typedParamsPublic.str();
 	case CalleeType::EXTERNAL:
-		return m_typedParamsExternal.str();
+	{
+		ostringstream typedParamsExternal;
+		for (auto const& i: m_externalParamsRep)
+		{
+			Delimiter del = get<0>(i);
+			bool valueType = get<1>(i);
+			string typeString = get<2>(i);
+			string varName = get<3>(i);
+			bool isCalldata = randomBool(/*probability=*/0.5);
+			string location = (isCalldata ? "calldata" : "memory");
+			string qualifiedTypeString = (valueType ? typeString : typeString + " " + location);
+			typedParamsExternal << Whiskers(R"(<delimiter><type> <varName>)")
+				("delimiter", delimiterToString(del))
+				("type", qualifiedTypeString)
+				("varName", varName)
+				.render();
+		}
+		return typedParamsExternal.str();
+	}
 	}
 }
 
@@ -666,6 +675,33 @@ string ProtoConverter::calldataHelperFunctions()
 		return 0;
 	})";
 
+	/// These are indirections to test memory-calldata codings more robustly.
+	stringstream indirections;
+	unsigned numIndirections = randomNumberOneToN(s_maxIndirections);
+	for (unsigned i = 1; i <= numIndirections; i++)
+	{
+		bool finalIndirection = i == numIndirections;
+		string mutability = (finalIndirection ? "pure" : "view");
+		indirections << Whiskers(R"(
+	function coder_calldata_external_i<N>(<parameters>) external <mutability> returns (uint) {
+<?finalIndirection>
+<equality_checks>
+		return 0;
+<!finalIndirection>
+		return this.coder_calldata_external_i<NPlusOne>(<untyped_parameters>);
+</finalIndirection>
+	}
+		)")
+		("N", to_string(i))
+		("parameters", typedParametersAsString(CalleeType::EXTERNAL))
+		("mutability", mutability)
+		("finalIndirection", finalIndirection)
+		("equality_checks", equalityChecksAsString())
+		("NPlusOne", to_string(i + 1))
+		("untyped_parameters", m_untypedParamsExternal.str())
+		.render();
+	}
+
 	// These are callee functions that encode from storage, decode to
 	// memory/calldata and check if decoded value matches storage value
 	// return true on successful match, false otherwise
@@ -676,18 +712,15 @@ string ProtoConverter::calldataHelperFunctions()
 	}
 
 	function coder_calldata_external(<parameters_calldata>) external view returns (uint) {
-		return this.coder_calldata_external_indirection(<untyped_parameters>);
-	}
-
-	function coder_calldata_external_indirection(<parameters_calldata>) external pure returns (uint) {
-<equality_checks>
-		return 0;
+		return this.coder_calldata_external_i1(<untyped_parameters>);
 	}
+<indirections>
 	)")
 	("parameters_memory", typedParametersAsString(CalleeType::PUBLIC))
 	("equality_checks", equalityChecksAsString())
 	("parameters_calldata", typedParametersAsString(CalleeType::EXTERNAL))
 	("untyped_parameters", m_untypedParamsExternal.str())
+	("indirections", indirections.str())
 	.render();
 
 	return calldataHelperFuncs.str();
diff --git a/test/tools/ossfuzz/protoToAbiV2.h b/test/tools/ossfuzz/protoToAbiV2.h
index 3e7f47994e..d549113537 100644
--- a/test/tools/ossfuzz/protoToAbiV2.h
+++ b/test/tools/ossfuzz/protoToAbiV2.h
@@ -15,6 +15,7 @@
 #include <boost/variant.hpp>
 
 #include <ostream>
+#include <random>
 #include <sstream>
 
 /**
@@ -134,13 +135,16 @@
 
 namespace solidity::test::abiv2fuzzer
 {
+using RandomEngine = std::mt19937_64;
+using Distribution = std::uniform_int_distribution<unsigned>;
+using Bernoulli = std::bernoulli_distribution;
 
 /// Converts a protobuf input into a Solidity program that tests
 /// abi coding.
 class ProtoConverter
 {
 public:
-	ProtoConverter():
+	ProtoConverter(unsigned _seed):
 		m_isStateVar(true),
 		m_counter(0),
 		m_varCounter(0),
@@ -148,7 +152,9 @@ class ProtoConverter
 		m_isLastDynParamRightPadded(false),
 		m_structCounter(0),
 		m_numStructsAdded(0)
-	{}
+	{
+		m_random = std::make_unique<RandomEngine>(_seed);
+	}
 
 	ProtoConverter(ProtoConverter const&) = delete;
 	ProtoConverter(ProtoConverter&&) = delete;
@@ -173,6 +179,13 @@ class ProtoConverter
 		EXTERNAL
 	};
 
+	/// Each external parameter representation contains the following:
+	/// - Delimiter prefix
+	/// - Boolean that is true if value type, false otherwise
+	/// - String representation of type
+	/// - Parameter name
+	using ParameterPack = std::tuple<Delimiter, bool, std::string, std::string>;
+
 	/// Visitors for various Protobuf types
 	/// Visit top-level contract specification
 	void visit(Contract const&);
@@ -381,6 +394,16 @@ class ProtoConverter
 
 	/// Convert delimter to a comma or null string.
 	static std::string delimiterToString(Delimiter _delimiter, bool _space = true);
+	/// Generates number in the range [1, @param _n] uniformly at random.
+	unsigned randomNumberOneToN(unsigned _n)
+	{
+		return Distribution(1, _n)(*m_random);
+	}
+	/// Generates boolean that has a bernoulli distribution defined by @param _p.
+	bool randomBool(double _p)
+	{
+		return Bernoulli{_p}(*m_random);
+	}
 
 	/// Contains the test program
 	std::ostringstream m_output;
@@ -388,7 +411,6 @@ class ProtoConverter
 	/// checks to be encoded in the test program
 	std::ostringstream m_checks;
 	/// Contains typed parameter list to be passed to callee functions
-	std::ostringstream m_typedParamsExternal;
 	std::ostringstream m_typedParamsPublic;
 	/// Contains parameter list to be passed to callee functions
 	std::ostringstream m_untypedParamsExternal;
@@ -418,10 +440,16 @@ class ProtoConverter
 	unsigned m_numStructsAdded;
 	/// Enum stating abiv2 coder to be tested
 	Contract_Test m_test;
+	/// Representation of external parameters
+	std::vector<ParameterPack> m_externalParamsRep;
+	/// Random number generator
+	std::unique_ptr<RandomEngine> m_random;
 	/// Prefixes for declared and parameterized variable names
 	static auto constexpr s_localVarNamePrefix = "lv_";
 	static auto constexpr s_stateVarNamePrefix = "sv_";
 	static auto constexpr s_paramNamePrefix = "p_";
+	/// Maximum number of indirections to test calldata coding
+	static unsigned constexpr s_maxIndirections = 5;
 };
 
 /// Visitor interface for Solidity protobuf types.
diff --git a/test/tools/ossfuzz/solProtoFuzzer.cpp b/test/tools/ossfuzz/solProtoFuzzer.cpp
index a752e21199..f7acc6c10d 100644
--- a/test/tools/ossfuzz/solProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/solProtoFuzzer.cpp
@@ -79,13 +79,10 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		methodName
 	);
 	auto minimalResult = evmoneUtil.compileDeployAndExecute();
-	if (minimalResult.has_value())
-	{
-		solAssert(minimalResult->status_code != EVMC_REVERT, "Sol proto fuzzer: Evmone reverted.");
-		if (minimalResult->status_code == EVMC_SUCCESS)
+	solAssert(minimalResult.status_code != EVMC_REVERT, "Sol proto fuzzer: Evmone reverted.");
+	if (minimalResult.status_code == EVMC_SUCCESS)
 		solAssert(
-			EvmoneUtility::zeroWord(minimalResult->output_data, minimalResult->output_size),
+			EvmoneUtility::zeroWord(minimalResult.output_data, minimalResult.output_size),
 			"Proto solc fuzzer: Output incorrect"
 		);
-	}
 }

From 2282ea5e56ab25ded9693d3b51b6dee1760c43ea Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 20 Jun 2022 19:19:20 -0300
Subject: [PATCH 0791/1748] Added overflow checks after multiplication
 operation is executed.

---
 Changelog.md                                  |  1 +
 libsolidity/codegen/YulUtilFunctions.cpp      | 44 ++++++++++++------
 test/formal/checked_int_mul_12.py             | 46 +++++++++++++++++++
 test/formal/checked_int_mul_16.py             | 43 -----------------
 ..._uint_mul_16.py => checked_uint_mul_12.py} | 24 +++++-----
 .../formal/signed_integer_cleanup_function.py | 41 +++++++++++++++++
 .../unsigned_integer_cleanup_function.py      | 40 ++++++++++++++++
 test/formal/util.py                           | 15 ++++++
 .../abiEncoderV2/storage_array_encoding.sol   |  4 +-
 .../copying/array_copy_including_array.sol    |  8 ++--
 .../array/copying/array_copy_nested_array.sol |  2 +-
 .../array_copy_storage_storage_struct.sol     |  2 +-
 .../copying/array_copy_target_leftover.sol    |  6 +--
 .../array_nested_calldata_to_storage.sol      |  2 +-
 .../array_of_struct_calldata_to_storage.sol   |  2 +-
 .../externalContracts/base64.sol              | 18 ++++----
 .../externalContracts/ramanujan_pi.sol        |  8 ++--
 .../semanticTests/externalContracts/snark.sol |  2 +-
 .../externalContracts/strings.sol             | 12 ++---
 .../salted_create_with_value.sol              |  6 +--
 .../viaYul/detect_mul_overflow_signed.sol     | 21 +++++++++
 21 files changed, 243 insertions(+), 104 deletions(-)
 create mode 100644 test/formal/checked_int_mul_12.py
 delete mode 100644 test/formal/checked_int_mul_16.py
 rename test/formal/{checked_uint_mul_16.py => checked_uint_mul_12.py} (58%)
 create mode 100644 test/formal/signed_integer_cleanup_function.py
 create mode 100644 test/formal/unsigned_integer_cleanup_function.py

diff --git a/Changelog.md b/Changelog.md
index 18066a7751..d91eccb314 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Language Features:
 
 
 Compiler Features:
+ * Code Generator: More efficient overflow checks for multiplication.
 
 
 Bugfixes:
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index b24cf4f901..b66189f054 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -684,28 +684,46 @@ string YulUtilFunctions::overflowCheckedIntMulFunction(IntegerType const& _type)
 			function <functionName>(x, y) -> product {
 				x := <cleanupFunction>(x)
 				y := <cleanupFunction>(y)
+				let product_raw := mul(x, y)
+				product := <cleanupFunction>(product_raw)
 				<?signed>
-					// overflow, if x > 0, y > 0 and x > (maxValue / y)
-					if and(and(sgt(x, 0), sgt(y, 0)), gt(x, div(<maxValue>, y))) { <panic>() }
-					// underflow, if x > 0, y < 0 and y < (minValue / x)
-					if and(and(sgt(x, 0), slt(y, 0)), slt(y, sdiv(<minValue>, x))) { <panic>() }
-					// underflow, if x < 0, y > 0 and x < (minValue / y)
-					if and(and(slt(x, 0), sgt(y, 0)), slt(x, sdiv(<minValue>, y))) { <panic>() }
-					// overflow, if x < 0, y < 0 and x < (maxValue / y)
-					if and(and(slt(x, 0), slt(y, 0)), slt(x, sdiv(<maxValue>, y))) { <panic>() }
+					<?gt128bit>
+						<?256bit>
+							// special case
+							if and(slt(x, 0), eq(y, <minValue>)) { <panic>() }
+						</256bit>
+						// overflow, if x != 0 and y != product/x
+						if iszero(
+							or(
+								iszero(x),
+								eq(y, sdiv(product, x))
+							)
+						) { <panic>() }
+					<!gt128bit>
+						if iszero(eq(product, product_raw)) { <panic>() }
+					</gt128bit>
 				<!signed>
-					// overflow, if x != 0 and y > (maxValue / x)
-					if and(iszero(iszero(x)), gt(y, div(<maxValue>, x))) { <panic>() }
+					<?gt128bit>
+						// overflow, if x != 0 and y != product/x
+						if iszero(
+							or(
+								iszero(x),
+								eq(y, div(product, x))
+							)
+						) { <panic>() }
+					<!gt128bit>
+						if iszero(eq(product, product_raw)) { <panic>() }
+					</gt128bit>
 				</signed>
-				product := mul(x, y)
 			}
 			)")
 			("functionName", functionName)
 			("signed", _type.isSigned())
-			("maxValue", toCompactHexWithPrefix(u256(_type.maxValue())))
-			("minValue", toCompactHexWithPrefix(u256(_type.minValue())))
 			("cleanupFunction", cleanupFunction(_type))
 			("panic", panicFunction(PanicCode::UnderOverflow))
+			("minValue", toCompactHexWithPrefix(u256(_type.minValue())))
+			("256bit", _type.numBits() == 256)
+			("gt128bit", _type.numBits() > 128)
 			.render();
 	});
 }
diff --git a/test/formal/checked_int_mul_12.py b/test/formal/checked_int_mul_12.py
new file mode 100644
index 0000000000..ea13f01940
--- /dev/null
+++ b/test/formal/checked_int_mul_12.py
@@ -0,0 +1,46 @@
+from opcodes import AND, SDIV, MUL, EQ, ISZERO, OR, SLT
+from rule import Rule
+from util import BVSignedUpCast, BVSignedMin, BVSignedCleanupFunction
+from z3 import BVMulNoOverflow, BVMulNoUnderflow, BitVec, Not, Or
+
+"""
+Overflow checked signed integer multiplication.
+"""
+
+# Approximation with 16-bit base types.
+n_bits = 12
+
+for type_bits in [4, 6, 8, 12]:
+
+	rule = Rule()
+
+	# Input vars
+	X_short = BitVec('X', type_bits)
+	Y_short = BitVec('Y', type_bits)
+
+	# Z3's overflow and underflow conditions
+	actual_overflow = Not(BVMulNoOverflow(X_short, Y_short, True))
+	actual_underflow = Not(BVMulNoUnderflow(X_short, Y_short))
+
+	# cast to full n_bits values
+	X = BVSignedUpCast(X_short, n_bits)
+	Y = BVSignedUpCast(Y_short, n_bits)
+	product_raw = MUL(X, Y)
+	#remove any overflown bits
+	product = BVSignedCleanupFunction(product_raw, type_bits)
+
+	# Constants
+	min_value = BVSignedMin(type_bits, n_bits)
+
+	# Overflow and underflow checks in YulUtilFunction::overflowCheckedIntMulFunction
+	if type_bits > n_bits / 2:
+		sol_overflow_check_1 = ISZERO(OR(ISZERO(X), EQ(Y, SDIV(product, X))))
+		if type_bits == n_bits:
+			sol_overflow_check_2 = AND(SLT(X, 0), EQ(Y, min_value))
+			sol_overflow_check = Or(sol_overflow_check_1 != 0, sol_overflow_check_2 != 0)
+		else:
+			sol_overflow_check = (sol_overflow_check_1 != 0)
+	else:
+		sol_overflow_check = (ISZERO(EQ(product, product_raw)) != 0)
+
+	rule.check(Or(actual_overflow, actual_underflow), sol_overflow_check)
diff --git a/test/formal/checked_int_mul_16.py b/test/formal/checked_int_mul_16.py
deleted file mode 100644
index b2f9eb852a..0000000000
--- a/test/formal/checked_int_mul_16.py
+++ /dev/null
@@ -1,43 +0,0 @@
-from opcodes import AND, DIV, GT, SDIV, SGT, SLT
-from rule import Rule
-from util import BVSignedMax, BVSignedMin, BVSignedUpCast
-from z3 import BVMulNoOverflow, BVMulNoUnderflow, BitVec, Not, Or
-
-"""
-Overflow checked signed integer multiplication.
-"""
-
-# Approximation with 16-bit base types.
-n_bits = 16
-type_bits = 8
-
-while type_bits <= n_bits:
-
-	rule = Rule()
-
-	# Input vars
-	X_short = BitVec('X', type_bits)
-	Y_short = BitVec('Y', type_bits)
-
-	# Z3's overflow and underflow conditions
-	actual_overflow = Not(BVMulNoOverflow(X_short, Y_short, True))
-	actual_underflow = Not(BVMulNoUnderflow(X_short, Y_short))
-
-	# cast to full n_bits values
-	X = BVSignedUpCast(X_short, n_bits)
-	Y = BVSignedUpCast(Y_short, n_bits)
-
-	# Constants
-	maxValue = BVSignedMax(type_bits, n_bits)
-	minValue = BVSignedMin(type_bits, n_bits)
-
-	# Overflow and underflow checks in YulUtilFunction::overflowCheckedIntMulFunction
-	overflow_check_1 = AND(AND(SGT(X, 0), SGT(Y, 0)), GT(X, DIV(maxValue, Y)))
-	underflow_check_1 = AND(AND(SGT(X, 0), SLT(Y, 0)), SLT(Y, SDIV(minValue, X)))
-	underflow_check_2 = AND(AND(SLT(X, 0), SGT(Y, 0)), SLT(X, SDIV(minValue, Y)))
-	overflow_check_2 = AND(AND(SLT(X, 0), SLT(Y, 0)), SLT(X, SDIV(maxValue, Y)))
-
-	rule.check(actual_overflow, Or(overflow_check_1 != 0, overflow_check_2 != 0))
-	rule.check(actual_underflow, Or(underflow_check_1 != 0, underflow_check_2 != 0))
-
-	type_bits *= 2
diff --git a/test/formal/checked_uint_mul_16.py b/test/formal/checked_uint_mul_12.py
similarity index 58%
rename from test/formal/checked_uint_mul_16.py
rename to test/formal/checked_uint_mul_12.py
index 1c60de47be..a386fcfa4f 100644
--- a/test/formal/checked_uint_mul_16.py
+++ b/test/formal/checked_uint_mul_12.py
@@ -1,6 +1,6 @@
-from opcodes import AND, ISZERO, GT, DIV
+from opcodes import ISZERO, DIV, MUL, EQ, OR
 from rule import Rule
-from util import BVUnsignedUpCast, BVUnsignedMax
+from util import BVUnsignedUpCast, BVUnsignedCleanupFunction
 from z3 import BitVec, Not, BVMulNoOverflow
 
 """
@@ -8,10 +8,9 @@
 """
 
 # Approximation with 16-bit base types.
-n_bits = 16
-type_bits = 8
+n_bits = 12
 
-while type_bits <= n_bits:
+for type_bits in [4, 6, 8, 12]:
 
 	rule = Rule()
 
@@ -25,13 +24,14 @@
 	# cast to full n_bits values
 	X = BVUnsignedUpCast(X_short, n_bits)
 	Y = BVUnsignedUpCast(Y_short, n_bits)
+	product_raw = MUL(X, Y)
+	#remove any overflown bits
+	product = BVUnsignedCleanupFunction(product_raw, type_bits)
 
-	# Constants
-	maxValue = BVUnsignedMax(type_bits, n_bits)
-
-	# Overflow check in YulUtilFunction::overflowCheckedIntMulFunction
-	overflow_check = AND(ISZERO(ISZERO(X)), GT(Y, DIV(maxValue, X)))
+	# Overflow check in YulUtilFunction::overflowCheckedIntMulFunctions
+	if type_bits > n_bits / 2:
+		overflow_check = ISZERO(OR(ISZERO(X), EQ(Y, DIV(product, X))))
+	else:
+		overflow_check = ISZERO(EQ(product, product_raw))
 
 	rule.check(overflow_check != 0, actual_overflow)
-
-	type_bits *= 2
diff --git a/test/formal/signed_integer_cleanup_function.py b/test/formal/signed_integer_cleanup_function.py
new file mode 100644
index 0000000000..2b7b0e440b
--- /dev/null
+++ b/test/formal/signed_integer_cleanup_function.py
@@ -0,0 +1,41 @@
+from opcodes import SIGNEXTEND
+from rule import Rule
+from util import BVSignedCleanupFunction, BVSignedUpCast
+from z3 import BitVec, BitVecVal, Concat
+
+"""
+Overflow checked signed integer multiplication.
+"""
+
+n_bits = 256
+
+# Check that YulUtilFunction::cleanupFunction cleanup matches BVSignedCleanupFunction
+for type_bits in range(8,256,8):
+
+	rule = Rule()
+
+	# Input vars
+	X = BitVec('X', n_bits)
+	arg = BitVecVal(type_bits / 8 - 1, n_bits)
+
+	cleaned_reference = BVSignedCleanupFunction(X, type_bits)
+	cleaned = SIGNEXTEND(arg, X)
+
+	rule.check(cleaned, cleaned_reference)
+
+
+# Check that BVSignedCleanupFunction properly cleans up values.
+for type_bits in range(8,256,8):
+
+	rule = Rule()
+
+	# Input vars
+	X_short = BitVec('X', type_bits)
+	dirt = BitVec('dirt', n_bits - type_bits)
+
+	X = BVSignedUpCast(X_short, n_bits)
+	X_dirty = Concat(dirt, X_short)
+	X_cleaned = BVSignedCleanupFunction(X_dirty, type_bits)
+
+
+	rule.check(X, X_cleaned)
diff --git a/test/formal/unsigned_integer_cleanup_function.py b/test/formal/unsigned_integer_cleanup_function.py
new file mode 100644
index 0000000000..42296f89ba
--- /dev/null
+++ b/test/formal/unsigned_integer_cleanup_function.py
@@ -0,0 +1,40 @@
+from opcodes import AND
+from rule import Rule
+from util import BVUnsignedCleanupFunction, BVUnsignedUpCast
+from z3 import BitVec, BitVecVal, Concat
+
+"""
+Overflow checked unsigned integer multiplication.
+"""
+
+n_bits = 256
+
+# Check that YulUtilFunction::cleanupFunction cleanup matches BVUnsignedCleanupFunction
+for type_bits in range(8,256,8):
+
+	rule = Rule()
+
+	# Input vars
+	X = BitVec('X', n_bits)
+	mask = BitVecVal((1 << type_bits) - 1, n_bits)
+
+	cleaned_reference = BVUnsignedCleanupFunction(X, type_bits)
+	cleaned = AND(X, mask)
+
+	rule.check(cleaned, cleaned_reference)
+
+# Check that BVUnsignedCleanupFunction properly cleans up values.
+for type_bits in range(8,256,8):
+
+	rule = Rule()
+
+	# Input vars
+	X_short = BitVec('X', type_bits)
+	dirt = BitVec('dirt', n_bits - type_bits)
+
+	X = BVUnsignedUpCast(X_short, n_bits)
+	X_dirty = Concat(dirt, X_short)
+	X_cleaned = BVUnsignedCleanupFunction(X_dirty, type_bits)
+
+
+	rule.check(X, X_cleaned)
diff --git a/test/formal/util.py b/test/formal/util.py
index 8d0debbef4..8fc261fdcf 100644
--- a/test/formal/util.py
+++ b/test/formal/util.py
@@ -25,3 +25,18 @@ def BVSignedMax(type_bits, n_bits):
 def BVSignedMin(type_bits, n_bits):
 	assert type_bits <= n_bits
 	return BitVecVal(-(1 << (type_bits - 1)), n_bits)
+
+def BVSignedCleanupFunction(x, type_bits):
+	assert x.size() >= type_bits
+	sign_mask = BitVecVal(1, x.size()) << (type_bits - 1)
+	bit_mask = (BitVecVal(1, x.size()) << type_bits) - 1
+	return If(
+		x & sign_mask == 0,
+		x & bit_mask,
+		x | ~bit_mask
+	)
+
+def BVUnsignedCleanupFunction(x, type_bits):
+	assert x.size() >= type_bits
+	bit_mask = (BitVecVal(1, x.size()) << type_bits) - 1
+	return x & bit_mask
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index 5f71fc7e2a..16f365bd43 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -18,10 +18,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 180726
+// gas irOptimized: 180829
 // gas legacy: 184921
 // gas legacyOptimized: 181506
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112453
+// gas irOptimized: 112464
 // gas legacy: 115460
 // gas legacyOptimized: 112990
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index b98ddec9d7..c3958abac6 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -35,12 +35,12 @@ contract c {
 }
 // ----
 // test() -> 0x02000202
-// gas irOptimized: 4649903
-// gas legacy: 4578320
-// gas legacyOptimized: 4548312
+// gas irOptimized: 4649835
+// gas legacy: 4578446
+// gas legacyOptimized: 4548309
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4477229
+// gas irOptimized: 4477223
 // gas legacy: 4410748
 // gas legacyOptimized: 4382489
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index d8907cf030..a85765cd98 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -13,6 +13,6 @@ contract c {
 
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
-// gas irOptimized: 689768
+// gas irOptimized: 689759
 // gas legacy: 686268
 // gas legacyOptimized: 685688
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
index 0225f421cf..3fc10b7a27 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
@@ -17,7 +17,7 @@ contract c {
 }
 // ----
 // test() -> 4, 5
-// gas irOptimized: 238692
+// gas irOptimized: 238623
 // gas legacy: 238736
 // gas legacyOptimized: 237159
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index 6c07ceec7e..f2d02ee578 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -19,6 +19,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 124817
-// gas legacy: 186028
-// gas legacyOptimized: 165692
+// gas irOptimized: 124910
+// gas legacy: 187414
+// gas legacyOptimized: 165659
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
index c737a5b044..02872f8dde 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
@@ -42,6 +42,6 @@ contract c {
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
 // gas irOptimized: 157567
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 134633
+// gas irOptimized: 134644
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
 // gas irOptimized: 111271
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
index a8bacdda68..a7487a64fe 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
@@ -17,4 +17,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
-// gas irOptimized: 119740
+// gas irOptimized: 119737
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index 84ece36bea..de5def9958 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,9 +33,9 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 441142
-// gas legacy: 755907
-// gas legacyOptimized: 538354
+// gas irOptimized: 438352
+// gas legacy: 750723
+// gas legacyOptimized: 536620
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
 // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
 // encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
@@ -51,10 +51,10 @@ contract test {
 // encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
 // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
 // encode_inline_asm_large()
-// gas irOptimized: 1382042
-// gas legacy: 1646033
-// gas legacyOptimized: 1206033
+// gas irOptimized: 1387042
+// gas legacy: 1688033
+// gas legacyOptimized: 1205033
 // encode_no_asm_large()
-// gas irOptimized: 3311099
-// gas legacy: 4723077
-// gas legacyOptimized: 2909077
+// gas irOptimized: 3316099
+// gas legacy: 4765077
+// gas legacyOptimized: 2908077
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index bf62bb81a0..b4b7054a4f 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -33,10 +33,10 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 422763
-// gas legacy: 654526
-// gas legacyOptimized: 474842
+// gas irOptimized: 430305
+// gas legacy: 649335
+// gas legacyOptimized: 473132
 // prb_pi() -> 3141592656369545286
 // gas irOptimized: 57478
-// gas legacy: 98903
+// gas legacy: 103112
 // gas legacyOptimized: 75735
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 10c16c4b7d..7d04b5af65 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -297,5 +297,5 @@ contract Test {
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
 // gas irOptimized: 95261
-// gas legacy: 113239
+// gas legacy: 116473
 // gas legacyOptimized: 83670
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index edbf82a292..654562ef09 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,9 +49,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 675980
-// gas legacy: 1101298
-// gas legacyOptimized: 743666
+// gas irOptimized: 670586
+// gas legacy: 1096108
+// gas legacyOptimized: 741962
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
 // gas irOptimized: 22660
 // gas legacy: 23190
@@ -69,6 +69,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 2017767
-// gas legacy: 4294510
-// gas legacyOptimized: 2327982
+// gas irOptimized: 2017770
+// gas legacy: 4294552
+// gas legacyOptimized: 2327981
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 8bd823e39d..d51b99b59a 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -21,6 +21,6 @@ contract A {
 // EVMVersion: >=constantinople
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 268645
-// gas legacy: 402016
-// gas legacyOptimized: 288087
+// gas irOptimized: 255997
+// gas legacy: 387712
+// gas legacyOptimized: 283266
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
index dd1953d005..a9581c49f7 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
@@ -5,6 +5,9 @@ contract C {
     function g(int8 a, int8 b) public pure returns (int8 x) {
         x = a * b;
     }
+    function h(int160 a, int160 b) public pure returns (int160 x) {
+        x = a * b;
+    }
 }
 // ====
 // compileToEwasm: also
@@ -15,6 +18,9 @@ contract C {
 // f(int256,int256): 0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 2 -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
 // f(int256,int256): 0x4000000000000000000000000000000000000000000000000000000000000000, 2 -> FAILURE, hex"4e487b71", 0x11
 // f(int256,int256): 2, 0x3FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF -> 0x7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+// f(int256,int256): 2, 0x4000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
+// f(int256,int256): -1, 0x8000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
+// f(int256,int256): 0x8000000000000000000000000000000000000000000000000000000000000000, -1 -> FAILURE, hex"4e487b71", 0x11
 // f(int256,int256): 2, 0x4000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11 # positive, negative #
 // f(int256,int256): 2, 0x4000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11 # positive, negative #
 // f(int256,int256): 2, 0x4000000000000000000000000000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11 # positive, negative #
@@ -61,3 +67,18 @@ contract C {
 // g(int8,int8): -64, -2 -> FAILURE, hex"4e487b71", 0x11
 // g(int8,int8): -2, -63 -> 126
 // g(int8,int8): -2, -64 -> FAILURE, hex"4e487b71", 0x11
+// h(int160,int160): -1, 1 -> -1
+// h(int160,int160): 1, -1 -> -1
+// h(int160,int160): -1, 2 -> -2
+// h(int160,int160): 2, -1 -> -2
+// h(int160,int160): -1, 0xFFFFFFFFFFFFFFFFFFFFFFFF8000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
+// h(int160,int160): -1, 0xFFFFFFFFFFFFFFFFFFFFFFFF8000000000000000000000000000000000000000 -> FAILURE, hex"4e487b71", 0x11
+// h(int160,int160): 0xFFFFFFFFFFFFFFFFFFFFFFFF8000000000000000000000000000000000000000, -1 -> FAILURE, hex"4e487b71", 0x11
+// h(int160,int160): 0x0000000000000000000000004000000000000000000000000000000000000000, -2 -> 0xFFFFFFFFFFFFFFFFFFFFFFFF8000000000000000000000000000000000000000
+// h(int160,int160): -2, 0x0000000000000000000000004000000000000000000000000000000000000000 -> 0xFFFFFFFFFFFFFFFFFFFFFFFF8000000000000000000000000000000000000000
+// h(int160,int160): -2, 0x0000000000000000000000004000000000000000000000000000000000000001 -> FAILURE, hex"4e487b71", 0x11
+// h(int160,int160): 0x0000000000000000000000004000000000000000000000000000000000000001, -2 -> FAILURE, hex"4e487b71", 0x11
+// h(int160,int160): 0x0000000000000000000000004000000000000000000000000000000000000001, 2 -> FAILURE, hex"4e487b71", 0x11
+// h(int160,int160): 2, 0x0000000000000000000000004000000000000000000000000000000000000001 -> FAILURE, hex"4e487b71", 0x11
+// h(int160,int160): 0x0000000000000000000000003FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF, 2 -> 0x0000000000000000000000007FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFE
+// h(int160,int160): 2, 0x0000000000000000000000004000000000000000000000000000000000000001 -> FAILURE, hex"4e487b71", 0x11

From f1a5bc7ed948be8354def3d896f55119ecceda3d Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Wed, 23 Mar 2022 09:07:34 -0700
Subject: [PATCH 0792/1748] Update reference-types.rst

Clarify comment using language similar to that in the Array section of the documentation. Previously it said simply "Because of that..." but what the word "that" was about, was not evident.
---
 docs/types/reference-types.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index 911a12eecb..a9f44d7100 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -379,8 +379,10 @@ Array Members
         uint[2**20] aLotOfIntegers;
         // Note that the following is not a pair of dynamic arrays but a
         // dynamic array of pairs (i.e. of fixed size arrays of length two).
-        // Because of that, T[] is always a dynamic array of T, even if T
-        // itself is an array.
+        // In Solidity, T[k] and T[] are always arrays with elements of type T,
+        // even if T itself is an array.
+        // Because of that, bool[2][] is a dynamic array of elements
+        // that are bool[2]. This is different from other languages, like C.
         // Data location for all state variables is storage.
         bool[2][] pairsOfFlags;
 

From 9d5fb1bf8bed9cb5aac6ce6021ced4489d3a757a Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Wed, 23 Mar 2022 21:39:16 -0700
Subject: [PATCH 0793/1748] Update operators.rst

---
 docs/types/operators.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/types/operators.rst b/docs/types/operators.rst
index 1c26e627d5..1d71352d60 100644
--- a/docs/types/operators.rst
+++ b/docs/types/operators.rst
@@ -18,7 +18,9 @@ and the type of the operator's result:
 In case one of the operands is a :ref:`literal number <rational_literals>` it is first converted to its
 "mobile type", which is the smallest type that can hold the value
 (unsigned types of the same bit-width are considered "smaller" than the signed types).
-If both are literal numbers, the operation is computed with arbitrary precision.
+If both are literal numbers, the operation is computed with effectively unlimited precision in
+that the expression is evaluated to whatever precision is necessary so that none is lost
+when the result is used with a non-literal type.
 
 The operator's result type is the same as the type the operation is performed in,
 except for comparison operators where the result is always ``bool``.

From 0561bd6b00e133876b7f51114c50709e1678f60b Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Thu, 24 Mar 2022 12:26:03 -0700
Subject: [PATCH 0794/1748] Update control-structures.rst

---
 docs/control-structures.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index de3b58485c..18a522217f 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -150,8 +150,8 @@ throws an exception or goes out of gas.
     use ``f.value(x).gas(g)()``. This was deprecated in Solidity 0.6.2 and is no
     longer possible since Solidity 0.7.0.
 
-Named Calls and Anonymous Function Parameters
----------------------------------------------
+Function Calls with Named Parameters
+------------------------------------
 
 Function call arguments can be given by name, in any order,
 if they are enclosed in ``{ }`` as can be seen in the following
@@ -176,11 +176,13 @@ parameters from the function declaration, but can be in arbitrary order.
 
     }
 
-Omitted Function Parameter Names
---------------------------------
+Omitted Names in Function Definitions
+-------------------------------------
 
-The names of unused parameters (especially return parameters) can be omitted.
-Those parameters will still be present on the stack, but they are inaccessible.
+The names of parameters and return values in the function declaration can be omitted.
+Those items with omitted names will still be present on the stack, but they are
+inaccessible by name. An omitted return value name
+can still return a value to the caller by use of the ``return`` statement.
 
 .. code-block:: solidity
 

From ffbb6f159e1e39cbd8fc0994f5ef63f5ec0e4f2d Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Sat, 23 Apr 2022 10:55:34 -0700
Subject: [PATCH 0795/1748] Update value-types.rst

---
 docs/types/value-types.rst | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 6aebdaf4fc..5972ea8182 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -210,6 +210,11 @@ an exception to this rule.
     declare its type as ``address payable`` to make this requirement visible. Also,
     try to make this distinction or conversion as early as possible.
 
+    The distinction between ``address`` and ``address payable`` was introduced with version 0.5.0.
+    Also starting from that version, contracts are not implicitly convertible to the ``address`` type, but can still be explicitly converted to
+    ``address`` or to ``address payable``, if they have a receive or payable fallback function.
+
+
 Operators:
 
 * ``<=``, ``<``, ``==``, ``!=``, ``>=`` and ``>``
@@ -223,9 +228,7 @@ Operators:
     or you can use ``address(uint160(uint256(b)))``, which results in ``0x777788889999AaAAbBbbCcccddDdeeeEfFFfCcCc``.
 
 .. note::
-    The distinction between ``address`` and ``address payable`` was introduced with version 0.5.0.
-    Also starting from that version, contracts do not derive from the address type, but can still be explicitly converted to
-    ``address`` or to ``address payable``, if they have a receive or payable fallback function.
+    Mixed-case hexadecimal numbers conforming to `EIP-55 <https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md>`_ are automatically treated as literals of the ``address`` type. See :ref:`Address Literals<address_literals>`.
 
 .. _members-of-addresses:
 

From 18ce69ebbd51e0e6e25a1638d85a2e766d758196 Mon Sep 17 00:00:00 2001
From: aathan <aathan_github@memeplex.com>
Date: Thu, 24 Mar 2022 10:25:01 -0700
Subject: [PATCH 0796/1748] Update reference-types.rst

---
 docs/types/reference-types.rst | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index a9f44d7100..c2b293ba13 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -85,8 +85,10 @@ Data locations are not only relevant for persistency of data, but also for the s
             // The following does not work; it would need to create a new temporary /
             // unnamed array in storage, but storage is "statically" allocated:
             // y = memoryArray;
-            // This does not work either, since it would "reset" the pointer, but there
-            // is no sensible location it could point to.
+            // On the other hand: "delete y" is not valid, as assignments to local variables
+            // referencing storage objects can only be made from existing storage objects.
+            // It would "reset" the pointer, but there is no sensible location it could point to.
+            // See "delete" under Operators
             // delete y;
             g(x); // calls g, handing over a reference to x
             h(x); // calls h and creates an independent, temporary copy in memory

From 898ad25aaba84ee4986ab5f3e0001a71aaec796d Mon Sep 17 00:00:00 2001
From: Leo <leo@ethereum.org>
Date: Sat, 13 Aug 2022 13:44:03 +0200
Subject: [PATCH 0797/1748] Review suggestions

---
 docs/types/reference-types.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index c2b293ba13..a6b5728c95 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -85,10 +85,10 @@ Data locations are not only relevant for persistency of data, but also for the s
             // The following does not work; it would need to create a new temporary /
             // unnamed array in storage, but storage is "statically" allocated:
             // y = memoryArray;
-            // On the other hand: "delete y" is not valid, as assignments to local variables
+            // Similarly, "delete y" is not valid, as assignments to local variables
             // referencing storage objects can only be made from existing storage objects.
             // It would "reset" the pointer, but there is no sensible location it could point to.
-            // See "delete" under Operators
+            // For more details see the documentation of the "delete" operator.
             // delete y;
             g(x); // calls g, handing over a reference to x
             h(x); // calls h and creates an independent, temporary copy in memory

From ec4ccf81830b39522fe9074b61fc67bf687954f7 Mon Sep 17 00:00:00 2001
From: minami <minaminaoy@gmail.com>
Date: Thu, 4 Aug 2022 15:51:22 +0900
Subject: [PATCH 0798/1748] Improve docs of possible function inputs and
 outputs

---
 docs/contracts/functions.rst    | 26 ++++++++++----------------
 docs/layout-of-source-files.rst | 21 ++++++++++++---------
 2 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index c7b7cc56b5..f14e4b8a54 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -72,16 +72,6 @@ with two integers, you would use something like the following:
 
 Function parameters can be used as any other local variable and they can also be assigned to.
 
-.. note::
-
-  Until version 0.6.0 it was not possible to use a multi-dimensional array or a struct
-  as an input for an :ref:`external function<external-function-calls>`.
-  ``abicoder v2`` made it possible and it's been enabled by default since version 0.8.0
-  (before that you had to enable it with ``pragma abicoder v2;``).
-
-  An :ref:`internal function<internal-function-calls>` can accept a
-  multi-dimensional array or a struct without any restrictions.
-
 .. index:: return array, return string, array, string, array of strings, dynamic array, variably sized array, return struct, struct
 
 Return Variables
@@ -139,12 +129,16 @@ If you use an early ``return`` to leave a function that has return variables,
 you must provide return values together with the return statement.
 
 .. note::
-    You cannot return some types from non-internal functions, notably
-    multi-dimensional dynamic arrays and structs. If you enable the
-    ABI coder v2 by adding ``pragma abicoder v2;``
-    to your source file then more types are available, but
-    ``mapping`` types are still limited to inside a single contract and you
-    cannot transfer them.
+    You cannot return some types from non-internal functions.
+    This includes the types listed below and any composite types that recursively contain them:
+
+    - mappings,
+    - internal function types,
+    - reference types with location set to ``storage``,
+    - multi-dimensional arrays (applies only to :ref:`ABI coder v1 <abi_coder>`),
+    - structs (applies only to :ref:`ABI coder v1 <abi_coder>`).
+
+    This restriction does not apply to library functions because of their different :ref:`internal ABI <library-selectors>`.
 
 .. _multi-return:
 
diff --git a/docs/layout-of-source-files.rst b/docs/layout-of-source-files.rst
index 729951142a..cd231c1fce 100644
--- a/docs/layout-of-source-files.rst
+++ b/docs/layout-of-source-files.rst
@@ -56,7 +56,7 @@ you have to add the pragma to all your files if you want to enable it
 in your whole project. If you :ref:`import<import>` another file, the pragma
 from that file does *not* automatically apply to the importing file.
 
-.. index:: ! pragma, version
+.. index:: ! pragma;version
 
 .. _version_pragma:
 
@@ -91,6 +91,9 @@ these follow the same syntax used by `npm <https://docs.npmjs.com/cli/v6/using-n
   required by the pragma. If it does not match, the compiler issues
   an error.
 
+.. index:: ! ABI coder, ! pragma; abicoder, pragma; ABIEncoderV2
+.. _abi_coder:
+
 ABI Coder Pragma
 ----------------
 
@@ -98,12 +101,11 @@ By using ``pragma abicoder v1`` or ``pragma abicoder v2`` you can
 select between the two implementations of the ABI encoder and decoder.
 
 The new ABI coder (v2) is able to encode and decode arbitrarily nested
-arrays and structs. It might produce less optimal code and has not
-received as much testing as the old encoder, but is considered
-non-experimental as of Solidity 0.6.0. You still have to explicitly
-activate it using ``pragma abicoder v2;``. Since it will be
-activated by default starting from Solidity 0.8.0, there is the option to select
-the old coder using ``pragma abicoder v1;``.
+arrays and structs. Apart from supporting more types, it involves more extensive
+validation and safety checks, which may result in higher gas costs, but also heightened
+security. It is considered
+non-experimental as of Solidity 0.6.0 and it is enabled by default starting
+with Solidity 0.8.0. There old coder can still be selected using ``pragma abicoder v1;``.
 
 The set of types supported by the new encoder is a strict superset of
 the ones supported by the old one. Contracts that use it can interact with ones
@@ -126,8 +128,7 @@ enough to make the error go away.
   by using ``pragma experimental ABIEncoderV2``, but it was not possible
   to explicitly select coder v1 because it was the default.
 
-.. index:: ! pragma, experimental
-
+.. index:: ! pragma; experimental
 .. _experimental_pragma:
 
 Experimental Pragma
@@ -137,6 +138,7 @@ The second pragma is the experimental pragma. It can be used to enable
 features of the compiler or language that are not yet enabled by default.
 The following experimental pragmas are currently supported:
 
+.. index:: ! pragma; ABIEncoderV2
 
 ABIEncoderV2
 ~~~~~~~~~~~~
@@ -145,6 +147,7 @@ Because the ABI coder v2 is not considered experimental anymore,
 it can be selected via ``pragma abicoder v2`` (please see above)
 since Solidity 0.7.4.
 
+.. index:: ! pragma; SMTChecker
 .. _smt_checker:
 
 SMTChecker

From 60d513c484c332dc816dad5ba17bf5c4da207e6f Mon Sep 17 00:00:00 2001
From: Pranay <pranayreddy1024@gmail.com>
Date: Sat, 13 Aug 2022 18:39:46 +0530
Subject: [PATCH 0799/1748] Updated yul.rst with feedback.

Updated yul.rst with explanation of 0x60 pointer choice.
---
 docs/yul.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index 6156d9ad67..7ce0101699 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -1162,7 +1162,8 @@ An example Yul Object is shown below:
         code {
             function allocate(size) -> ptr {
                 ptr := mload(0x40)
-                if iszero(ptr) { ptr := 0x80 }
+                // Note that Solidity generated IR code reserves memory offset ``0x60`` as well, but a pure Yul object is free to use memory as it chooses.
+                if iszero(ptr) { ptr := 0x60 }
                 mstore(0x40, add(ptr, size))
             }
 
@@ -1191,6 +1192,7 @@ An example Yul Object is shown below:
             code {
                 function allocate(size) -> ptr {
                     ptr := mload(0x40)
+                    // Note that Solidity generated IR code reserves memory offset ``0x60`` as well, but a pure Yul object is free to use memory as it chooses.
                     if iszero(ptr) { ptr := 0x60 }
                     mstore(0x40, add(ptr, size))
                 }

From 4682c0192038981184856c1151e6453c0df1dc8a Mon Sep 17 00:00:00 2001
From: Leonid Pospelov <pospelovlm@yandex.ru>
Date: Sun, 14 Aug 2022 03:07:01 +0300
Subject: [PATCH 0800/1748] Update ASTJsonExporter.cpp

---
 libsolidity/ast/ASTJsonExporter.cpp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index 939fc79c6c..e7e7a01439 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -37,8 +37,6 @@
 
 #include <boost/algorithm/string/join.hpp>
 
-#include <range/v3/algorithm/sort.hpp>
-
 #include <utility>
 #include <vector>
 #include <algorithm>
@@ -629,7 +627,7 @@ bool ASTJsonExporter::visit(InlineAssembly const& _node)
 
 	Json::Value externalReferencesJson = Json::arrayValue;
 
-	ranges::sort(externalReferences);
+	std::sort(externalReferences.begin(), externalReferences.end());
 	for (Json::Value& it: externalReferences | ranges::views::values)
 		externalReferencesJson.append(std::move(it));
 

From 32aa0003789776f9380a7e0cb80bcc91c012cc57 Mon Sep 17 00:00:00 2001
From: Leonid Pospelov <pospelovlm@yandex.ru>
Date: Sun, 14 Aug 2022 03:14:15 +0300
Subject: [PATCH 0801/1748] Update FullInliner.cpp

---
 libyul/optimiser/FullInliner.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index f4a8aee856..9ffe871faf 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -224,7 +224,7 @@ bool FullInliner::shallInline(FunctionCall const& _funCall, YulString _callSite)
 			break;
 		}
 
-	return (size < (aggressiveInlining ? 8 : 6) || (constantArg && size < (aggressiveInlining ? 16 : 12)));
+	return (size < (aggressiveInlining ? 8u : 6u) || (constantArg && size < (aggressiveInlining ? 16u : 12u)));
 }
 
 void FullInliner::tentativelyUpdateCodeSize(YulString _function, YulString _callSite)

From 5da46581bd71439871843b3833e641176fe6f14c Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 21 Jul 2022 17:27:24 +0200
Subject: [PATCH 0802/1748] Document in ``solc --help`` usage of ``--metadata``
 better.

---
 solc/CommandLineParser.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 9b4490875a..319f29de60 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -565,7 +565,7 @@ General Information)").c_str(),
 		(
 			(g_strOutputDir + ",o").c_str(),
 			po::value<string>()->value_name("path"),
-			"If given, creates one file per component and contract/file at the specified directory."
+			"If given, creates one file per output component and contract/file at the specified directory."
 		)
 		(
 			g_strOverwrite.c_str(),
@@ -718,7 +718,7 @@ General Information)").c_str(),
 		(CompilerOutputs::componentName(&CompilerOutputs::signatureHashes).c_str(), "Function signature hashes of the contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::natspecUser).c_str(), "Natspec user documentation of all contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::natspecDev).c_str(), "Natspec developer documentation of all contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::metadata).c_str(), "Combined Metadata JSON whose Swarm hash is stored on-chain.")
+		(CompilerOutputs::componentName(&CompilerOutputs::metadata).c_str(), "Combined Metadata JSON whose IPFS hash is stored on-chain.")
 		(CompilerOutputs::componentName(&CompilerOutputs::storageLayout).c_str(), "Slots, offsets and types of the contract's state variables.")
 	;
 	desc.add(outputComponents);

From 730950fb637c86cb6941ebf3dcf5ec18554618ab Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 15 Aug 2022 13:45:42 +0200
Subject: [PATCH 0803/1748] [buildpack] Switch from aarlt/comment-on-pr@v1.2.0
 to unsplash/comment-on-pr@v1.3.1.

---
 .github/workflows/buildpack-deps.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml
index 535d15239a..f07cdcf409 100644
--- a/.github/workflows/buildpack-deps.yml
+++ b/.github/workflows/buildpack-deps.yml
@@ -37,6 +37,6 @@ jobs:
 
       - name: comment PR
         if: "env.DOCKER_IMAGE"
-        uses: aarlt/comment-on-pr@v1.2.0
+        uses: unsplash/comment-on-pr@b5610c6125a7197eaec80072ea35ef53e1fc6035 #v1.3.1
         with:
           msg: "`${{ env.DOCKER_IMAGE }} ${{ env.DOCKER_REPO_DIGEST }}`."
\ No newline at end of file

From e996fe6247d34e28214909504c483c55fc50bf58 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 6 Apr 2022 18:33:42 +0200
Subject: [PATCH 0804/1748] Yul Optimizer: Simplify start offset of zero-length
 operations.

---
 Changelog.md                                  |  1 +
 libyul/optimiser/DataFlowAnalyzer.cpp         |  2 +-
 libyul/optimiser/DataFlowAnalyzer.h           |  2 +-
 libyul/optimiser/ExpressionSimplifier.cpp     | 29 +++++++++++++++++++
 libyul/optimiser/ExpressionSimplifier.h       |  1 +
 .../side_effects_in_for_condition.yul         |  4 +--
 .../expressionSimplifier/zero_length_read.yul | 21 ++++++++++++++
 7 files changed, 56 insertions(+), 4 deletions(-)
 create mode 100644 test/libyul/yulOptimizerTests/expressionSimplifier/zero_length_read.yul

diff --git a/Changelog.md b/Changelog.md
index d91eccb314..dfa237e2d6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Language Features:
 
 Compiler Features:
  * Code Generator: More efficient overflow checks for multiplication.
+ * Yul Optimizer: Simplify the starting offset of zero-length operations to zero.
 
 
 Bugfixes:
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 7e98fe5178..ba8e6fb88b 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -411,7 +411,7 @@ bool DataFlowAnalyzer::inScope(YulString _variableName) const
 	return false;
 }
 
-optional<u256> DataFlowAnalyzer::valueOfIdentifier(YulString const& _name)
+optional<u256> DataFlowAnalyzer::valueOfIdentifier(YulString const& _name) const
 {
 	if (AssignedValue const* value = variableValue(_name))
 		if (Literal const* literal = get_if<Literal>(value->value))
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index 4a8cc7445d..b82f437538 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -148,7 +148,7 @@ class DataFlowAnalyzer: public ASTModifier
 	bool inScope(YulString _variableName) const;
 
 	/// Returns the literal value of the identifier, if it exists.
-	std::optional<u256> valueOfIdentifier(YulString const& _name);
+	std::optional<u256> valueOfIdentifier(YulString const& _name) const;
 
 	enum class StoreLoadLocation {
 		Memory = 0,
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index 8c3a038f10..caf74cfb7a 100644
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -23,7 +23,11 @@
 
 #include <libyul/optimiser/SimplificationRules.h>
 #include <libyul/optimiser/OptimiserStep.h>
+#include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/AST.h>
+#include <libyul/Utilities.h>
+
+#include <libevmasm/SemanticInformation.h>
 
 using namespace std;
 using namespace solidity;
@@ -44,4 +48,29 @@ void ExpressionSimplifier::visit(Expression& _expression)
 		[this](YulString _var) { return variableValue(_var); }
 	))
 		_expression = match->action().toExpression(debugDataOf(_expression));
+
+	if (auto* functionCall = get_if<FunctionCall>(&_expression))
+		if (optional<evmasm::Instruction> instruction = toEVMInstruction(m_dialect, functionCall->functionName.name))
+			for (auto op: evmasm::SemanticInformation::readWriteOperations(*instruction))
+				if (op.startParameter && op.lengthParameter)
+				{
+					Expression& startArgument = functionCall->arguments.at(*op.startParameter);
+					Expression const& lengthArgument = functionCall->arguments.at(*op.lengthParameter);
+					if (
+						knownToBeZero(lengthArgument) &&
+						!knownToBeZero(startArgument) &&
+						!holds_alternative<FunctionCall>(startArgument)
+					)
+						startArgument = Literal{debugDataOf(startArgument), LiteralKind::Number, "0"_yulstring, {}};
+				}
+}
+
+bool ExpressionSimplifier::knownToBeZero(Expression const& _expression) const
+{
+	if (auto const* literal = get_if<Literal>(&_expression))
+		return valueOfLiteral(*literal) == 0;
+	else if (auto const* identifier = get_if<Identifier>(&_expression))
+		return valueOfIdentifier(identifier->name) == 0;
+	else
+		return false;
 }
diff --git a/libyul/optimiser/ExpressionSimplifier.h b/libyul/optimiser/ExpressionSimplifier.h
index 324ff419ad..662c8c3899 100644
--- a/libyul/optimiser/ExpressionSimplifier.h
+++ b/libyul/optimiser/ExpressionSimplifier.h
@@ -54,6 +54,7 @@ class ExpressionSimplifier: public DataFlowAnalyzer
 	explicit ExpressionSimplifier(Dialect const& _dialect):
 		DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore)
 	{}
+	bool knownToBeZero(Expression const& _expression) const;
 };
 
 }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul
index bd567a69a6..9c3a5c8ba2 100644
--- a/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/side_effects_in_for_condition.yul
@@ -1,5 +1,5 @@
 {
-  for {} div(create(0, 1, 0), shl(msize(), 1)) {}
+  for {} div(create(0, 1, 1), shl(msize(), 1)) {}
   {
   }
 }
@@ -10,7 +10,7 @@
 //
 // {
 //     {
-//         for { } div(create(0, 1, 0), shl(msize(), 1)) { }
+//         for { } div(create(0, 1, 1), shl(msize(), 1)) { }
 //         { }
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/zero_length_read.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/zero_length_read.yul
new file mode 100644
index 0000000000..ee7464932d
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/zero_length_read.yul
@@ -0,0 +1,21 @@
+{
+	revert(calldataload(0), 0)
+	revert(call(0,0,0,0,0,0,0), 0)
+	calldatacopy(calldataload(1), calldataload(2), 0)
+	return(calldataload(3), 0)
+	codecopy(calldataload(4), calldataload(5), sub(42,42))
+}
+// ----
+// step: expressionSimplifier
+//
+// {
+//     {
+//         let _1 := 0
+//         revert(0, _1)
+//         pop(call(_1, _1, _1, _1, _1, _1, _1))
+//         revert(0, _1)
+//         calldatacopy(0, calldataload(2), _1)
+//         return(0, _1)
+//         codecopy(0, calldataload(5), 0)
+//     }
+// }

From 733b0f63f6c333e110036e2160e07e9ec99922dc Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 16 Jun 2022 17:08:05 +0200
Subject: [PATCH 0805/1748] Disable failing chainlink tests.

---
 test/externalTests/chainlink.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/chainlink.sh b/test/externalTests/chainlink.sh
index f99dbededb..9f50e1486f 100755
--- a/test/externalTests/chainlink.sh
+++ b/test/externalTests/chainlink.sh
@@ -92,6 +92,10 @@ function chainlink_test
     sed -i "s|\(it\)\(('cannot remove a consumer from a nonexistent subscription'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
     sed -i "s|\(it\)\(('cannot remove a consumer after it is already removed'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
     sed -i "s|\(it\)\(('fails to fulfill without being a valid consumer'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
+    # TODO: check why these two are needed due to this PR.
+    sed -i "s|\(it\)\(('cannot fund a nonexistent subscription'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
+    sed -i "s|\(it\)\(('can cancel a subscription'\)|\1.skip\2|g" test/v0.8/dev/VRFCoordinatorV2Mock.test.ts
+
 
     # Disable tests with hard-coded gas expectations.
     sed -i "s|\(it\)\(('not use too much gas \[ @skip-coverage \]'\)|\1.skip\2|g" test/v0.6/FluxAggregator.test.ts

From a9c21863d481c3fdc8d0b50b006c7b229818edcd Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 10 Aug 2022 18:45:38 +0200
Subject: [PATCH 0806/1748] Update tests.

---
 .../debug_info_in_yul_and_evm_asm_print_all/output |  2 +-
 .../output                                         |  2 +-
 .../output                                         |  2 +-
 test/cmdlineTests/ir_compiler_subobjects/output    |  2 +-
 .../output                                         |  2 +-
 .../ir_with_assembly_no_memoryguard_runtime/output |  2 +-
 .../output.json                                    |  2 +-
 .../output.json                                    |  2 +-
 .../output.json                                    |  2 +-
 test/cmdlineTests/viair_subobjects/output          |  2 +-
 .../abiEncoderV1/abi_encode_calldata_slice.sol     |  4 ++--
 .../abiEncoderV2/abi_encode_calldata_slice.sol     |  4 ++--
 .../copying/array_copy_storage_storage_dyn_dyn.sol |  2 +-
 .../copying/function_type_array_to_storage.sol     |  4 ++--
 .../semanticTests/array/dynamic_array_cleanup.sol  |  2 +-
 .../array/dynamic_arrays_in_storage.sol            |  2 +-
 .../semanticTests/array/fixed_array_cleanup.sol    |  2 +-
 ...te_array_pop_long_storage_empty_garbage_ref.sol |  2 +-
 .../semanticTests/array/push/nested_bytes_push.sol |  2 +-
 .../semanticTests/array/push/push_no_args_2d.sol   |  4 ++--
 .../array/push/push_no_args_bytes.sol              |  2 +-
 .../events/event_dynamic_array_storage.sol         |  2 +-
 .../events/event_dynamic_array_storage_v2.sol      |  2 +-
 .../event_dynamic_nested_array_storage_v2.sol      |  2 +-
 .../events/event_emit_from_other_contract.sol      |  2 +-
 .../semanticTests/events/event_indexed_string.sol  |  2 +-
 .../externalContracts/FixedFeeRegistrar.sol        |  2 +-
 .../semanticTests/externalContracts/base64.sol     |  6 +++---
 .../functionCall/gas_and_value_basic.sol           |  2 +-
 .../functionCall/gas_and_value_brace_syntax.sol    |  2 +-
 .../structs/struct_delete_storage_with_array.sol   |  2 +-
 test/libsolidity/semanticTests/structs/structs.sol |  2 +-
 .../userDefinedValueType/calldata.sol              |  2 +-
 .../various/contract_binary_dependencies.sol       |  2 +-
 .../various/swap_in_storage_overwrite.sol          |  2 +-
 .../viaYul/array_storage_index_access.sol          | 14 +++++++-------
 .../viaYul/array_storage_index_zeroed_test.sol     |  8 ++++----
 .../viaYul/array_storage_push_empty.sol            |  4 ++--
 .../viaYul/copy_struct_invalid_ir_bug.sol          |  2 +-
 39 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
index af83c9f36a..115bf34cc2 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
@@ -194,7 +194,7 @@ object "C_6" {
                     {
                         if callvalue() { revert(_1, _1) }
                         if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(memoryguard(0x80), _1)
+                        return(_1, _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
index dc4ea45fd7..33faf3cf19 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
@@ -193,7 +193,7 @@ object "C_6" {
                     {
                         if callvalue() { revert(_1, _1) }
                         if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(memoryguard(0x80), _1)
+                        return(_1, _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
index b2ad57c308..3307150233 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
@@ -182,7 +182,7 @@ object "C_6" {
                     {
                         if callvalue() { revert(_1, _1) }
                         if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(memoryguard(0x80), _1)
+                        return(_1, _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/ir_compiler_subobjects/output b/test/cmdlineTests/ir_compiler_subobjects/output
index 5cacb6c16b..0a505a4acd 100644
--- a/test/cmdlineTests/ir_compiler_subobjects/output
+++ b/test/cmdlineTests/ir_compiler_subobjects/output
@@ -71,7 +71,7 @@ object "D_16" {
                             returndatacopy(pos, _2, returndatasize())
                             revert(pos, returndatasize())
                         }
-                        return(mload(64), _2)
+                        return(_2, _2)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
index 41f353269f..50915c8dc3 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
@@ -22,7 +22,7 @@ object "D_12" {
                     {
                         if callvalue() { revert(_1, _1) }
                         if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(memoryguard(0x80), _1)
+                        return(_1, _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
index c406d4f7ed..b81febf73d 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
@@ -24,7 +24,7 @@ object "D_8" {
                     {
                         if callvalue() { revert(_1, _1) }
                         if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(128, _1)
+                        return(_1, _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
index 30895c160a..2fe90b70ef 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
@@ -199,7 +199,7 @@ object \"C_6\" {
                     {
                         if callvalue() { revert(_1, _1) }
                         if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(memoryguard(0x80), _1)
+                        return(_1, _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
index 6ee9874d38..3600f633c8 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
@@ -198,7 +198,7 @@ object \"C_6\" {
                     {
                         if callvalue() { revert(_1, _1) }
                         if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(memoryguard(0x80), _1)
+                        return(_1, _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
index a32ee05806..7393f8b444 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
@@ -187,7 +187,7 @@ object \"C_6\" {
                     {
                         if callvalue() { revert(_1, _1) }
                         if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(memoryguard(0x80), _1)
+                        return(_1, _1)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/viair_subobjects/output b/test/cmdlineTests/viair_subobjects/output
index 51fdae9244..500472f8a8 100644
--- a/test/cmdlineTests/viair_subobjects/output
+++ b/test/cmdlineTests/viair_subobjects/output
@@ -83,7 +83,7 @@ object "D_16" {
                             returndatacopy(pos, _2, returndatasize())
                             revert(pos, returndatasize())
                         }
-                        return(mload(64), _2)
+                        return(_2, _2)
                     }
                 }
                 revert(0, 0)
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 069c32370e..67680b8527 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -59,10 +59,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 362445
+// gas irOptimized: 362400
 // gas legacy: 414569
 // gas legacyOptimized: 319271
 // test_uint256() ->
-// gas irOptimized: 511910
+// gas irOptimized: 511919
 // gas legacy: 581876
 // gas legacyOptimized: 442757
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 7ebac64ea4..0d2e4f9c07 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 362445
+// gas irOptimized: 362400
 // gas legacy: 414569
 // gas legacyOptimized: 319271
 // test_uint256() ->
-// gas irOptimized: 511910
+// gas irOptimized: 511919
 // gas legacy: 581876
 // gas legacyOptimized: 442757
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
index aa508fe4df..5e12fa657d 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
@@ -15,7 +15,7 @@ contract c {
 // ----
 // setData1(uint256,uint256,uint256): 10, 5, 4 ->
 // copyStorageStorage() ->
-// gas irOptimized: 111374
+// gas irOptimized: 111368
 // gas legacy: 109278
 // gas legacyOptimized: 109268
 // getData2(uint256): 5 -> 10, 4
diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
index 17c97d2006..1e8760250a 100644
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
@@ -46,11 +46,11 @@ contract C {
 }
 // ----
 // test() -> 0x20, 0x14, "[a called][b called]"
-// gas irOptimized: 116688
+// gas irOptimized: 116673
 // gas legacy: 119030
 // gas legacyOptimized: 117021
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 103268
+// gas irOptimized: 103256
 // gas legacy: 102814
 // gas legacyOptimized: 101706
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index dc11953cd8..4454914a97 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -14,7 +14,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 519490
+// gas irOptimized: 519487
 // gas legacy: 521584
 // gas legacyOptimized: 517027
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index 32ed7032da..8ff67048c3 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -42,7 +42,7 @@ contract c {
 // ----
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
-// gas irOptimized: 111450
+// gas irOptimized: 111448
 // gas legacy: 108571
 // gas legacyOptimized: 100417
 // getLengths() -> 48, 49
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index 5a3116e0cf..310217cfdc 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -12,7 +12,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 465380
+// gas irOptimized: 465345
 // gas legacy: 471280
 // gas legacyOptimized: 467500
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index 66fb16775b..ccb4de6e1c 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -15,7 +15,7 @@ contract c {
 }
 // ----
 // test() ->
-// gas irOptimized: 142639
+// gas irOptimized: 142636
 // gas legacy: 164430
 // gas legacyOptimized: 158513
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index 8a962ad43f..71a21820d2 100644
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 179173
+// gas irOptimized: 179170
 // gas legacy: 181066
 // gas legacyOptimized: 180435
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index a99d30b415..e9a521fbff 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -27,14 +27,14 @@ contract C {
 // ----
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
-// gas irOptimized: 112482
+// gas irOptimized: 112476
 // gas legacy: 108105
 // gas legacyOptimized: 101987
 // l() -> 1
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
-// gas irOptimized: 116270
+// gas irOptimized: 116264
 // gas legacy: 107525
 // gas legacyOptimized: 96331
 // l() -> 2
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 3c7b8b44bb..6027558455 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -21,7 +21,7 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 183587
+// gas irOptimized: 183584
 // gas legacy: 183811
 // gas legacyOptimized: 179218
 // l() -> 70
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index f0bd89903b..f9f06134fe 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
@@ -13,6 +13,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 113514
+// gas irOptimized: 113511
 // gas legacy: 116381
 // gas legacyOptimized: 114425
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
index b8553d4b49..a2862d6897 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
@@ -14,6 +14,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 113514
+// gas irOptimized: 113511
 // gas legacy: 116381
 // gas legacyOptimized: 114425
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
index bab70e69b7..a625e3de33 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
@@ -15,6 +15,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
-// gas irOptimized: 185145
+// gas irOptimized: 185142
 // gas legacy: 187603
 // gas legacyOptimized: 184566
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 2626a3b00f..300efd739c 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -15,7 +15,7 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 167934
+// gas irOptimized: 166854
 // gas legacy: 250376
 // gas legacyOptimized: 174522
 // deposit(bytes32), 18 wei: 0x1234 ->
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index 1ef41edb7e..08dd7ce66e 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -17,6 +17,6 @@ contract C {
 // ----
 // deposit() ->
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
-// gas irOptimized: 333479
+// gas irOptimized: 333476
 // gas legacy: 388679
 // gas legacyOptimized: 374441
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index b56ec7801f..d281d6f273 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -74,7 +74,7 @@ contract FixedFeeRegistrar is Registrar {
 }
 // ----
 // constructor()
-// gas irOptimized: 411435
+// gas irOptimized: 415761
 // gas legacy: 933867
 // gas legacyOptimized: 487352
 // reserve(string), 69 ether: 0x20, 3, "abc" ->
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index de5def9958..5133da878f 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,7 +33,7 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 438352
+// gas irOptimized: 438376
 // gas legacy: 750723
 // gas legacyOptimized: 536620
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
@@ -51,10 +51,10 @@ contract test {
 // encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
 // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
 // encode_inline_asm_large()
-// gas irOptimized: 1387042
+// gas irOptimized: 1387039
 // gas legacy: 1688033
 // gas legacyOptimized: 1205033
 // encode_no_asm_large()
-// gas irOptimized: 3316099
+// gas irOptimized: 3316107
 // gas legacy: 4765077
 // gas legacyOptimized: 2908077
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 49e841690b..977f1a56a4 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -39,7 +39,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 262130
+// gas irOptimized: 261698
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 4fbcaf1beb..48365a61ac 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -38,7 +38,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 262130
+// gas irOptimized: 261698
 // gas legacy: 402654
 // gas legacyOptimized: 274470
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index a78b5dd65b..15acf7a2fb 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -42,7 +42,7 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 121660
+// gas irOptimized: 121657
 // gas legacy: 122132
 // gas legacyOptimized: 121500
 // g() ->
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index a4cafdb0f2..ada5534ca5 100644
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ b/test/libsolidity/semanticTests/structs/structs.sol
@@ -30,7 +30,7 @@ contract test {
 // ----
 // check() -> false
 // set() ->
-// gas irOptimized: 134433
+// gas irOptimized: 134436
 // gas legacy: 135277
 // gas legacyOptimized: 134064
 // check() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index c532603b67..fe7ea4596a 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -49,7 +49,7 @@ contract C {
 }
 // ----
 // test_f() -> true
-// gas irOptimized: 122070
+// gas irOptimized: 122053
 // gas legacy: 126150
 // gas legacyOptimized: 123163
 // test_g() -> true
diff --git a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
index 351428c4f1..561e316880 100644
--- a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
+++ b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
@@ -20,4 +20,4 @@ contract C {
 // compileToEwasm: also
 // ----
 // constructor() ->
-// gas irOptimized: 101063
+// gas irOptimized: 100415
diff --git a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
index 713d711969..129a78931f 100644
--- a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
@@ -29,7 +29,7 @@ contract c {
 // x() -> 0, 0
 // y() -> 0, 0
 // set() ->
-// gas irOptimized: 109694
+// gas irOptimized: 109691
 // gas legacy: 109732
 // gas legacyOptimized: 109682
 // x() -> 1, 2
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index 4dd06e9984..8ef60a53b5 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -16,33 +16,33 @@ contract C {
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
-// gas irOptimized: 3018687
+// gas irOptimized: 3018684
 // gas legacy: 3068883
 // gas legacyOptimized: 3011615
 // test_indices(uint256): 5 ->
-// gas irOptimized: 372543
+// gas irOptimized: 372540
 // gas legacy: 369151
 // gas legacyOptimized: 366139
 // test_indices(uint256): 10 ->
 // test_indices(uint256): 15 ->
 // gas irOptimized: 72860
 // test_indices(uint256): 0xFF ->
-// gas irOptimized: 3410255
+// gas irOptimized: 3410252
 // gas legacy: 3509577
 // gas legacyOptimized: 3397597
 // test_indices(uint256): 1000 ->
-// gas irOptimized: 18206122
+// gas irOptimized: 18206119
 // gas legacy: 18599999
 // gas legacyOptimized: 18176944
 // test_indices(uint256): 129 ->
-// gas irOptimized: 2756955
+// gas irOptimized: 2756952
 // gas legacy: 2770413
 // gas legacyOptimized: 2716289
 // test_indices(uint256): 128 ->
-// gas irOptimized: 411903
+// gas irOptimized: 411900
 // gas legacy: 464968
 // gas legacyOptimized: 418168
 // test_indices(uint256): 1 ->
-// gas irOptimized: 368571
+// gas irOptimized: 368568
 // gas legacy: 363389
 // gas legacyOptimized: 361809
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index 8b83e1807b..b1bcd82733 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131177
+// gas irOptimized: 131174
 // gas legacy: 132301
 // gas legacyOptimized: 129539
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 174780
+// gas irOptimized: 174777
 // gas legacy: 177188
 // gas legacyOptimized: 172112
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 198025
+// gas irOptimized: 198022
 // gas legacy: 201738
 // gas legacyOptimized: 194427
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 6097915
+// gas irOptimized: 6097912
 // gas legacy: 6159333
 // gas legacyOptimized: 6026177
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
index 7f402d7d13..270b92ffaf 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
@@ -12,11 +12,11 @@ contract C {
 // EVMVersion: >=petersburg
 // ----
 // pushEmpty(uint256): 128
-// gas irOptimized: 406801
+// gas irOptimized: 406798
 // gas legacy: 416903
 // gas legacyOptimized: 398280
 // pushEmpty(uint256): 256
-// gas irOptimized: 691029
+// gas irOptimized: 691026
 // gas legacy: 714315
 // gas legacyOptimized: 687372
 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index de367f8daa..502e4bde17 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -21,6 +21,6 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 112999
+// gas irOptimized: 113019
 // gas legacy: 112931
 // gas legacyOptimized: 112602

From ee2c4cddcd3dc5ff4c24982966eb9e97c146c87b Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 15 Aug 2022 17:37:08 +0200
Subject: [PATCH 0807/1748] test/cmdlineTests.sh: fix verbosity.

---
 test/cmdlineTests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 79e9d64a58..7728f1f6de 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -311,7 +311,7 @@ function test_solc_assembly_output
 function test_via_ir_equivalence()
 {
     SOLTMPDIR=$(mktemp -d)
-    pushd "$SOLTMPDIR"
+    pushd "$SOLTMPDIR" > /dev/null
 
     (( $# <= 2 )) || fail "This function accepts at most two arguments."
 
@@ -369,7 +369,7 @@ function test_via_ir_equivalence()
 
     diff_values "$bin_output_two_stage" "$bin_output_via_ir" --ignore-space-change --ignore-blank-lines
 
-    popd
+    popd > /dev/null
     rm -r "$SOLTMPDIR"
 }
 

From b08454e49ddf1c35ef0f2edf4c93221f78db0687 Mon Sep 17 00:00:00 2001
From: minami <minaminaoy@gmail.com>
Date: Tue, 16 Aug 2022 01:12:43 +0900
Subject: [PATCH 0808/1748] Remove callcode in heading

---
 docs/introduction-to-smart-contracts.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index ad98047cf7..ef5e55b2a0 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -504,9 +504,9 @@ operations, loops should be preferred over recursive calls. Furthermore,
 only 63/64th of the gas can be forwarded in a message call, which causes a
 depth limit of a little less than 1000 in practice.
 
-.. index:: delegatecall, callcode, library
+.. index:: delegatecall, library
 
-Delegatecall / Callcode and Libraries
+Delegatecall and Libraries
 =====================================
 
 There exists a special variant of a message call, named **delegatecall**

From 1706db2776108bd6bfbd8c34e8391e17dc051e0d Mon Sep 17 00:00:00 2001
From: minami <minaminaoy@gmail.com>
Date: Tue, 16 Aug 2022 01:15:29 +0900
Subject: [PATCH 0809/1748] Fix underline

---
 docs/introduction-to-smart-contracts.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index ef5e55b2a0..6a31a95045 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -507,7 +507,7 @@ depth limit of a little less than 1000 in practice.
 .. index:: delegatecall, library
 
 Delegatecall and Libraries
-=====================================
+==========================
 
 There exists a special variant of a message call, named **delegatecall**
 which is identical to a message call apart from the fact that

From 0400b435b87763c72f0c7a03a7fa5b2016e637e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 16 Aug 2022 10:05:14 +0200
Subject: [PATCH 0810/1748] Enable highlighting for more code blocks in the
 docs

---
 docs/internals/layout_in_storage.rst     | 6 +++---
 docs/introduction-to-smart-contracts.rst | 4 +++-
 docs/natspec-format.rst                  | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/internals/layout_in_storage.rst b/docs/internals/layout_in_storage.rst
index 599cd03d3e..53670eeb85 100644
--- a/docs/internals/layout_in_storage.rst
+++ b/docs/internals/layout_in_storage.rst
@@ -153,7 +153,7 @@ the :ref:`standard JSON interface <compiler-api>`.  The output is a JSON object
 element has the following form:
 
 
-.. code::
+.. code-block:: json
 
 
     {
@@ -181,7 +181,7 @@ The given ``type``, in this case ``t_uint256`` represents an element in
 ``types``, which has the form:
 
 
-.. code::
+.. code-block:: json
 
     {
         "encoding": "inplace",
@@ -238,7 +238,7 @@ value and reference types, types that are encoded packed, and nested types.
         bytes b1;
     }
 
-.. code:: json
+.. code-block:: json
 
     {
       "storage": [
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 6a31a95045..875e5ebc86 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -186,7 +186,9 @@ transactions.
 
 To listen for this event, you could use the following
 JavaScript code, which uses `web3.js <https://github.com/ethereum/web3.js/>`_ to create the ``Coin`` contract object,
-and any user interface calls the automatically generated ``balances`` function from above::
+and any user interface calls the automatically generated ``balances`` function from above:
+
+.. code-block:: javascript
 
     Coin.Sent().watch({}, '', function(error, result) {
         if (!error) {
diff --git a/docs/natspec-format.rst b/docs/natspec-format.rst
index a66c104629..28848dae43 100644
--- a/docs/natspec-format.rst
+++ b/docs/natspec-format.rst
@@ -183,7 +183,7 @@ other to be used by the developer.
 If the above contract is saved as ``ex1.sol`` then you can generate the
 documentation using:
 
-.. code::
+.. code-block:: shell
 
    solc --userdoc --devdoc ex1.sol
 
@@ -202,7 +202,7 @@ User Documentation
 The above documentation will produce the following user documentation
 JSON file as output:
 
-.. code::
+.. code-block:: json
 
     {
       "version" : 1,
@@ -230,7 +230,7 @@ Developer Documentation
 Apart from the user documentation file, a developer documentation JSON
 file should also be produced and should look like this:
 
-.. code::
+.. code-block:: json
 
     {
       "version" : 1,

From 6b6cfa17950cc31dd22853bad4a2aedadc0cea4a Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 16 Aug 2022 16:43:13 +0200
Subject: [PATCH 0811/1748] Peg hardhat-ethers version

---
 test/externalTests/gnosis.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 03d7111873..af2b12508a 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -106,6 +106,11 @@ function gnosis_safe_test
     # pulls @ethersproject/contracts@5.6.1 (latest). Force 5.6.0 to avoid errors due to having two copies.
     npm install @ethersproject/contracts@5.6.0
 
+    # 2.1.1 started causing failures in safe-contracts external tests after a contract address check was introduced
+    # in https://github.com/NomicFoundation/hardhat/pull/2916, and so to avoid errors, the package is now pegged.
+    # TODO: Remove when https://github.com/safe-global/safe-contracts/issues/436 is resolved.
+    npm install @nomiclabs/hardhat-ethers@2.1.0
+
     # Hardhat 2.9.5 introduced a bug with handling padded arguments to getStorageAt().
     # TODO: Remove when https://github.com/NomicFoundation/hardhat/issues/2709 is fixed.
     npm install hardhat@2.9.4

From cf3bae0839b4fc6966743335a89488f313ff07b5 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Tue, 16 Aug 2022 12:34:17 +0200
Subject: [PATCH 0812/1748] Fix "slot" access via mapping reference in assembly

---
 libsolidity/ast/Types.cpp                     |  5 +++
 libsolidity/ast/Types.h                       |  2 ++
 .../codegen/ir/IRGeneratorForStatements.cpp   |  3 +-
 .../slot_access_via_mapping_pointer.sol       | 32 +++++++++++++++++++
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol

diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index f88d1afcef..6f37257fa2 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -3789,6 +3789,11 @@ TypeResult MappingType::interfaceType(bool _inLibrary) const
 	return this;
 }
 
+std::vector<std::tuple<std::string, Type const*>> MappingType::makeStackItems() const
+{
+	return {std::make_tuple("slot", TypeProvider::uint256())};
+}
+
 string TypeType::richIdentifier() const
 {
 	return "t_type" + identifierList(actualType());
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 553af6c7d0..735bd69025 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1528,6 +1528,8 @@ class MappingType: public CompositeType
 	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
 	bool nameable() const override { return true; }
 
+	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
+
 	Type const* keyType() const { return m_keyType; }
 	Type const* valueType() const { return m_valueType; }
 
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 5eaeed743b..c67bd65c4e 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -173,10 +173,9 @@ struct CopyTranslate: public yul::ASTCopier
 		{
 			solAssert(suffix == "slot" || suffix == "offset");
 			solAssert(varDecl->isLocalVariable());
+			solAssert(!varDecl->type()->isValueType());
 			if (suffix == "slot")
 				value = IRVariable{*varDecl}.part("slot").name();
-			else if (varDecl->type()->isValueType())
-				value = IRVariable{*varDecl}.part("offset").name();
 			else
 			{
 				solAssert(!IRVariable{*varDecl}.hasPart("offset"));
diff --git a/test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol b/test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol
new file mode 100644
index 0000000000..66f592bb67
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol
@@ -0,0 +1,32 @@
+contract C {
+    mapping(uint => uint) private m0;
+    mapping(uint => uint) private m1;
+    mapping(uint => uint) private m2;
+
+    function f(uint i) public returns (uint slot, uint offset) {
+        mapping(uint => uint) storage m0Ptr = m0;
+        mapping(uint => uint) storage m1Ptr = m1;
+        mapping(uint => uint) storage m2Ptr = m2;
+
+        assembly {
+            switch i
+            case 1 {
+                slot := m1Ptr.slot
+                offset := m1Ptr.offset
+            }
+            case 2 {
+                slot := m2Ptr.slot
+                offset := m2Ptr.offset
+            }
+            default {
+                slot := m0Ptr.slot
+                offset := m0Ptr.offset
+            }
+        }
+    }
+}
+
+// ----
+// f(uint256): 0 -> 0, 0
+// f(uint256): 1 -> 1, 0
+// f(uint256): 2 -> 2, 0

From 1b5332c2b95fd21ae7b172b1c31f870de84de863 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 18 Aug 2022 13:43:16 +0200
Subject: [PATCH 0813/1748] Fix spelling mistakes and CI spellcheck job

---
 .circleci/config.yml                          |  2 +-
 libevmasm/KnownState.h                        |  2 +-
 liblangutil/Scanner.cpp                       |  2 +-
 libsolutil/StringUtils.h                      |  2 +-
 scripts/codespell_ignored_lines.txt           | 20 +++++++++++++++++++
 scripts/codespell_whitelist.txt               | 13 ------------
 test/externalTests/README.md                  |  2 +-
 test/libevmasm/Optimiser.cpp                  |  4 ++--
 test/liblangutil/Scanner.cpp                  | 12 +++++------
 .../SolidityExpressionCompiler.cpp            |  2 +-
 .../_prbmath/PRBMathCommon.sol                |  2 +-
 .../_prbmath/PRBMathUD60x18.sol               |  2 +-
 12 files changed, 36 insertions(+), 29 deletions(-)
 create mode 100644 scripts/codespell_ignored_lines.txt

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 510341ef54..9717567ef1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -652,7 +652,7 @@ jobs:
             pip install --user codespell
       - run:
           name: Check spelling
-          command: ~/.local/bin/codespell -S "*.enc,.git,Dockerfile*" -I ./scripts/codespell_whitelist.txt
+          command: ~/.local/bin/codespell -S "*.enc,.git,Dockerfile*,LICENSE,codespell_whitelist.txt,codespell_ignored_lines.txt" -I ./scripts/codespell_whitelist.txt -x ./scripts/codespell_ignored_lines.txt
       - gitter_notify_failure_unless_pr
 
   chk_docs_examples:
diff --git a/libevmasm/KnownState.h b/libevmasm/KnownState.h
index 7231706104..8c28fbb622 100644
--- a/libevmasm/KnownState.h
+++ b/libevmasm/KnownState.h
@@ -132,7 +132,7 @@ class KnownState
 	/// @returns true if the knowledge about the state of both objects is (known to be) equal.
 	bool operator==(KnownState const& _other) const;
 
-	/// Retrieves the current equivalence class fo the given stack element (or generates a new
+	/// Retrieves the current equivalence class for the given stack element (or generates a new
 	/// one if it does not exist yet).
 	Id stackElement(int _stackHeight, langutil::SourceLocation const& _location);
 	/// @returns the stackElement relative to the current stack height.
diff --git a/liblangutil/Scanner.cpp b/liblangutil/Scanner.cpp
index 819dafaf5d..d769a93631 100644
--- a/liblangutil/Scanner.cpp
+++ b/liblangutil/Scanner.cpp
@@ -425,7 +425,7 @@ Token Scanner::scanMultiLineDocComment()
 
 	while (!isSourcePastEndOfInput())
 	{
-		//handle newlines in multline comments
+		// handle newlines in multiline comments
 		if (atEndOfLine())
 		{
 			skipWhitespace();
diff --git a/libsolutil/StringUtils.h b/libsolutil/StringUtils.h
index a50d679e84..d7e1238509 100644
--- a/libsolutil/StringUtils.h
+++ b/libsolutil/StringUtils.h
@@ -206,7 +206,7 @@ inline std::string formatNumberReadable(
 	}
 }
 
-/// Safely converts an usigned integer as string into an unsigned int type.
+/// Safely converts an unsigned integer as string into an unsigned int type.
 ///
 /// @return the converted number or nullopt in case of an failure (including if it would not fit).
 inline std::optional<unsigned> toUnsignedInt(std::string const& _value)
diff --git a/scripts/codespell_ignored_lines.txt b/scripts/codespell_ignored_lines.txt
new file mode 100644
index 0000000000..b7987cc001
--- /dev/null
+++ b/scripts/codespell_ignored_lines.txt
@@ -0,0 +1,20 @@
+    A constant BT = BU;
+    A constant BU = BV;
+    A constant FN = FO;
+    A constant FO = FP;
+    struct BT { BU m; }
+    struct BU { BV m; }
+    struct FN { FO m; }
+    struct FO { FP m; }
+// encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
+// encode_no_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
+	BOOST_TEST(mutation(chromosome) == Chromosome("fo"));
+docker run --rm -v "${OUTPUTDIR}":/tmp/output -v "${SCRIPTDIR}":/tmp/scripts:ro -it trzeci/emscripten:sdk-tag-1.39.3-64bit /tmp/scripts/docker-scripts/rebuild_tags.sh "${TAGS}" /tmp/output "$@"
+				<assignEnd>
+					<assignEnd>
+						<assignEnd>
+		templ("assignEnd", dynamic ? "end := pos" : "");
+			templ("assignEnd", dynamic ? "end := pos" : "");
+			templ("assignEnd", "end := pos");
+			templ("assignEnd", "end := tail");
+			templ("assignEnd", "");
diff --git a/scripts/codespell_whitelist.txt b/scripts/codespell_whitelist.txt
index 0350608666..7de8a42fe5 100644
--- a/scripts/codespell_whitelist.txt
+++ b/scripts/codespell_whitelist.txt
@@ -1,16 +1,3 @@
-iff
 nd
-assignend
-uint
-mut
-BA
-FO
-ba
-fo
 compilability
-errorstring
-hist
-otion
 keypair
-ether
-sur
diff --git a/test/externalTests/README.md b/test/externalTests/README.md
index 76e39a79b0..8df5b4dfe0 100644
--- a/test/externalTests/README.md
+++ b/test/externalTests/README.md
@@ -79,7 +79,7 @@ The above is the workflow to use when the update is straightforward and looks sa
 fine to just modify the branches directly. If this is not the case, it is recommended to first perform the
 operation on copies of these version-specific branches and test them by creating PRs on `develop` and
 `breaking` to see if tests pass. The PRs should just modify project scripts in `test/externalScripts/`
-to use the updated copies of the branches and can be discarded aferwards without being merged.
+to use the updated copies of the branches and can be discarded afterwards without being merged.
 
 #### Changes needed after a breaking release of the compiler
 When a non-backwards-compatible version becomes the most recent release, `breaking` branch
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index aaf5498ec1..f08f227cb3 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -714,10 +714,10 @@ BOOST_AUTO_TEST_CASE(cse_keccak256_twice_same_content_noninterfering_store_in_be
 		Instruction::MSTORE, // m[12] = DUP1
 		Instruction::DUP12,
 		u256(12 + 32),
-		Instruction::MSTORE, // does not destoy memory knowledge
+		Instruction::MSTORE, // does not destroy memory knowledge
 		Instruction::DUP13,
 		u256(128 - 32),
-		Instruction::MSTORE, // does not destoy memory knowledge
+		Instruction::MSTORE, // does not destroy memory knowledge
 		u256(0x20),
 		u256(12),
 		Instruction::KECCAK256 // keccak256(m[12..(12+32)])
diff --git a/test/liblangutil/Scanner.cpp b/test/liblangutil/Scanner.cpp
index c8a88ec820..c288ed8543 100644
--- a/test/liblangutil/Scanner.cpp
+++ b/test/liblangutil/Scanner.cpp
@@ -329,7 +329,7 @@ BOOST_AUTO_TEST_CASE(trailing_dot_in_numbers)
 
 BOOST_AUTO_TEST_CASE(leading_underscore_decimal_is_identifier)
 {
-	// Actual error is cought by SyntaxChecker.
+	// Actual error is caught by SyntaxChecker.
 	CharStream stream("_1.2", "");
 	Scanner scanner(stream);
 	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
@@ -339,7 +339,7 @@ BOOST_AUTO_TEST_CASE(leading_underscore_decimal_is_identifier)
 
 BOOST_AUTO_TEST_CASE(leading_underscore_decimal_after_dot_illegal)
 {
-	// Actual error is cought by SyntaxChecker.
+	// Actual error is caught by SyntaxChecker.
 	TestScanner scanner("1._2");
 	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
 	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
@@ -351,7 +351,7 @@ BOOST_AUTO_TEST_CASE(leading_underscore_decimal_after_dot_illegal)
 
 BOOST_AUTO_TEST_CASE(leading_underscore_exp_are_identifier)
 {
-	// Actual error is cought by SyntaxChecker.
+	// Actual error is caught by SyntaxChecker.
 	CharStream stream("_1e2", "");
 	Scanner scanner(stream);
 	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
@@ -360,7 +360,7 @@ BOOST_AUTO_TEST_CASE(leading_underscore_exp_are_identifier)
 
 BOOST_AUTO_TEST_CASE(leading_underscore_exp_after_e_illegal)
 {
-	// Actual error is cought by SyntaxChecker.
+	// Actual error is caught by SyntaxChecker.
 	CharStream stream("1e_2", "");
 	Scanner scanner(stream);
 	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
@@ -379,7 +379,7 @@ BOOST_AUTO_TEST_CASE(leading_underscore_hex_illegal)
 
 BOOST_AUTO_TEST_CASE(fixed_number_invalid_underscore_front)
 {
-	// Actual error is cought by SyntaxChecker.
+	// Actual error is caught by SyntaxChecker.
 	CharStream stream("12._1234_1234", "");
 	Scanner scanner(stream);
 	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
@@ -388,7 +388,7 @@ BOOST_AUTO_TEST_CASE(fixed_number_invalid_underscore_front)
 
 BOOST_AUTO_TEST_CASE(number_literals_with_trailing_underscore_at_eos)
 {
-	// Actual error is cought by SyntaxChecker.
+	// Actual error is caught by SyntaxChecker.
 	TestScanner scanner("0x123_");
 	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Number);
 	BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
index 4fef140e8f..2741290fc3 100644
--- a/test/libsolidity/SolidityExpressionCompiler.cpp
+++ b/test/libsolidity/SolidityExpressionCompiler.cpp
@@ -168,7 +168,7 @@ bytes compileFirstExpression(
 				));
 
 			context.appendMissingLowLevelFunctions();
-			// NOTE: We intentionally disable optimisations for utility functions to simplfy the tests
+			// NOTE: We intentionally disable optimisations for utility functions to simplify the tests
 			context.appendYulUtilityFunctions({});
 			BOOST_REQUIRE(context.appendYulUtilityFunctionsRan());
 
diff --git a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol b/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol
index 923b54c2d2..9ec351b6c4 100644
--- a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol
+++ b/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.0;
 
 /// @dev Common mathematical functions used in both PRBMathSD59x18 and PRBMathUD60x18. Note that this shared library
 /// does not always assume the signed 59.18-decimal fixed-point or the unsigned 60.18-decimal fixed-point
-// representation. When it does not, it is annonated in the function's NatSpec documentation.
+// representation. When it does not, it is annotated in the function's NatSpec documentation.
 library PRBMathCommon {
     /// @dev How many trailing decimals can be represented.
     uint256 internal constant SCALE = 1e18;
diff --git a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol b/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
index 2732d95b62..0313481f62 100644
--- a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
+++ b/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
@@ -28,7 +28,7 @@ library PRBMathUD60x18 {
     /// @notice Calculates arithmetic average of x and y, rounding down.
     /// @param x The first operand as an unsigned 60.18-decimal fixed-point number.
     /// @param y The second operand as an unsigned 60.18-decimal fixed-point number.
-    /// @return result The arithmetic average as an usigned 60.18-decimal fixed-point number.
+    /// @return result The arithmetic average as an unsigned 60.18-decimal fixed-point number.
     function avg(uint256 x, uint256 y) internal pure returns (uint256 result) {
         // The operations can never overflow.
         unchecked {

From 4addf1e0ade6d7b2d6d03660c98f354ef250a166 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 15 Aug 2022 19:32:38 +0200
Subject: [PATCH 0814/1748] [buildpack] Switch to
 unsplash/comment-on-pr@v1.3.0.

---
 .github/workflows/buildpack-deps.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml
index f07cdcf409..e2da2cdea8 100644
--- a/.github/workflows/buildpack-deps.yml
+++ b/.github/workflows/buildpack-deps.yml
@@ -37,6 +37,9 @@ jobs:
 
       - name: comment PR
         if: "env.DOCKER_IMAGE"
-        uses: unsplash/comment-on-pr@b5610c6125a7197eaec80072ea35ef53e1fc6035 #v1.3.1
+        # NOTE: Can't update to v1.3.1 due to an error: `/entrypoint.sh:5:in 'require_relative': cannot load such file -- /lib/github (LoadError)`
+        uses: unsplash/comment-on-pr@ffe8f97ccc63ce12c3c23c6885b169db67958d3b #v1.3.0
         with:
-          msg: "`${{ env.DOCKER_IMAGE }} ${{ env.DOCKER_REPO_DIGEST }}`."
\ No newline at end of file
+          msg: "`${{ env.DOCKER_IMAGE }} ${{ env.DOCKER_REPO_DIGEST }}`."
+          check_for_duplicate_msg: false
+

From 542ce5ad95e6a41cf12f715824dcb2b07caf2d74 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 18 Aug 2022 15:28:12 +0200
Subject: [PATCH 0815/1748] Use long option for spellchecker in CI

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9717567ef1..0b146ca0e7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -652,7 +652,7 @@ jobs:
             pip install --user codespell
       - run:
           name: Check spelling
-          command: ~/.local/bin/codespell -S "*.enc,.git,Dockerfile*,LICENSE,codespell_whitelist.txt,codespell_ignored_lines.txt" -I ./scripts/codespell_whitelist.txt -x ./scripts/codespell_ignored_lines.txt
+          command: ~/.local/bin/codespell --skip "*.enc,.git,Dockerfile*,LICENSE,codespell_whitelist.txt,codespell_ignored_lines.txt" --ignore-words ./scripts/codespell_whitelist.txt --exclude-file ./scripts/codespell_ignored_lines.txt
       - gitter_notify_failure_unless_pr
 
   chk_docs_examples:

From 0e2ab0500092dfb4c2ca6990b3a31e573be991b4 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 13 Jun 2022 15:50:59 +0200
Subject: [PATCH 0816/1748] libsolutil: Adding findFilesRecursively() helper to
 find files recursively.

---
 libsolutil/CommonIO.h | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/libsolutil/CommonIO.h b/libsolutil/CommonIO.h
index e6cd0c1616..56f62f0ac4 100644
--- a/libsolutil/CommonIO.h
+++ b/libsolutil/CommonIO.h
@@ -48,6 +48,46 @@ inline std::ostream& operator<<(std::ostream& os, bytes const& _bytes)
 namespace util
 {
 
+namespace detail
+{
+
+template <typename Predicate>
+struct RecursiveFileCollector
+{
+	Predicate predicate;
+	std::vector<boost::filesystem::path> result {};
+
+	RecursiveFileCollector& operator()(boost::filesystem::path const& _directory)
+	{
+		if (!boost::filesystem::is_directory(_directory))
+			return *this;
+		auto iterator = boost::filesystem::directory_iterator(_directory);
+		auto const iteratorEnd = boost::filesystem::directory_iterator();
+
+		while (iterator != iteratorEnd)
+		{
+			if (boost::filesystem::is_directory(iterator->status()))
+				(*this)(iterator->path());
+
+			if (predicate(iterator->path()))
+				result.push_back(iterator->path());
+
+			++iterator;
+		}
+		return *this;
+	}
+};
+
+template <typename Predicate>
+RecursiveFileCollector(Predicate) -> RecursiveFileCollector<Predicate>;
+}
+
+template <typename Predicate>
+std::vector<boost::filesystem::path> findFilesRecursively(boost::filesystem::path const& _rootDirectory, Predicate _predicate)
+{
+	return detail::RecursiveFileCollector{_predicate}(_rootDirectory).result;
+}
+
 /// Retrieves and returns the contents of the given file as a std::string.
 /// If the file doesn't exist, it will throw a FileNotFound exception.
 /// If the file exists but is not a regular file, it will throw NotAFile exception.

From b6ba43234e497ced4e14356207d8c621d3803c04 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 13 Jun 2022 15:56:55 +0200
Subject: [PATCH 0817/1748] lsp: Always load all solidity files from project
 for analyzing.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 Changelog.md                                  |  1 +
 libsolidity/lsp/FileRepository.cpp            |  6 ++
 libsolidity/lsp/LanguageServer.cpp            | 65 ++++++++++++++++-
 libsolidity/lsp/LanguageServer.h              | 22 ++++++
 libsolidity/lsp/Transport.cpp                 |  3 +
 libsolutil/CommonIO.h                         | 40 -----------
 .../lsp/analyze-full-project/C.sol            |  6 ++
 .../lsp/analyze-full-project/D.sol            |  6 ++
 .../lsp/analyze-full-project/E.sol            |  6 ++
 test/lsp.py                                   | 70 ++++++++++++++++++-
 10 files changed, 181 insertions(+), 44 deletions(-)
 create mode 100644 test/libsolidity/lsp/analyze-full-project/C.sol
 create mode 100644 test/libsolidity/lsp/analyze-full-project/D.sol
 create mode 100644 test/libsolidity/lsp/analyze-full-project/E.sol

diff --git a/Changelog.md b/Changelog.md
index dfa237e2d6..f0f8b8485c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Language Features:
 Compiler Features:
  * Code Generator: More efficient overflow checks for multiplication.
  * Yul Optimizer: Simplify the starting offset of zero-length operations to zero.
+ * Language Server: Analyze all files in a project by default (can be customized by setting ``'file-load-strategy'`` to ``'directly-opened-and-on-import'`` in LSP settings object).
 
 
 Bugfixes:
diff --git a/libsolidity/lsp/FileRepository.cpp b/libsolidity/lsp/FileRepository.cpp
index 6ba583c3a5..58bc0bf8de 100644
--- a/libsolidity/lsp/FileRepository.cpp
+++ b/libsolidity/lsp/FileRepository.cpp
@@ -17,6 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <libsolidity/lsp/FileRepository.h>
+#include <libsolidity/lsp/Transport.h>
 #include <libsolidity/lsp/Utils.h>
 
 #include <libsolutil/StringUtils.h>
@@ -25,11 +26,14 @@
 #include <range/v3/algorithm/none_of.hpp>
 #include <range/v3/range/conversion.hpp>
 #include <range/v3/view/transform.hpp>
+#include <boost/algorithm/string/predicate.hpp>
 
 #include <regex>
 
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <fmt/format.h>
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::lsp;
@@ -84,6 +88,7 @@ string FileRepository::sourceUnitNameToUri(string const& _sourceUnitName) const
 
 string FileRepository::uriToSourceUnitName(string const& _path) const
 {
+	lspAssert(boost::algorithm::starts_with(_path, "file://"), ErrorCode::InternalError, "URI must start with file://");
 	return stripFileUriSchemePrefix(_path);
 }
 
@@ -92,6 +97,7 @@ void FileRepository::setSourceByUri(string const& _uri, string _source)
 	// This is needed for uris outside the base path. It can lead to collisions,
 	// but we need to mostly rewrite this in a future version anyway.
 	auto sourceUnitName = uriToSourceUnitName(_uri);
+	lspDebug(fmt::format("FileRepository.setSourceByUri({}): {}", _uri, _source));
 	m_sourceUnitNamesToUri.emplace(sourceUnitName, _uri);
 	m_sourceCodes[sourceUnitName] = std::move(_source);
 }
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 5465406c0b..3020900c0b 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -32,6 +32,7 @@
 #include <liblangutil/SourceReferenceExtractor.h>
 #include <liblangutil/CharStream.h>
 
+#include <libsolutil/CommonIO.h>
 #include <libsolutil/Visitor.h>
 #include <libsolutil/JSON.h>
 
@@ -42,6 +43,8 @@
 #include <ostream>
 #include <string>
 
+#include <fmt/format.h>
+
 using namespace std;
 using namespace std::string_literals;
 using namespace std::placeholders;
@@ -118,7 +121,7 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"cancelRequest", [](auto, auto) {/*nothing for now as we are synchronous */}},
 		{"exit", [this](auto, auto) { m_state = (m_state == State::ShutdownRequested ? State::ExitRequested : State::ExitWithoutShutdown); }},
 		{"initialize", bind(&LanguageServer::handleInitialize, this, _1, _2)},
-		{"initialized", [](auto, auto) {}},
+		{"initialized", bind(&LanguageServer::handleInitialized, this, _1, _2)},
 		{"$/setTrace", [this](auto, Json::Value const& args) { setTrace(args["value"]); }},
 		{"shutdown", [this](auto, auto) { m_state = State::ShutdownRequested; }},
 		{"textDocument/definition", GotoDefinition(*this) },
@@ -147,6 +150,26 @@ Json::Value LanguageServer::toJson(SourceLocation const& _location)
 
 void LanguageServer::changeConfiguration(Json::Value const& _settings)
 {
+	// The settings item: "file-load-strategy" (enum) defaults to "project-directory" if not (or not correctly) set.
+	// It can be overridden during client's handshake or at runtime, as usual.
+	//
+	// If this value is set to "project-directory" (default), all .sol files located inside the project directory or reachable through symbolic links will be subject to operations.
+	//
+	// Operations include compiler analysis, but also finding all symbolic references or symbolic renaming.
+	//
+	// If this value is set to "directly-opened-and-on-import", then only currently directly opened files and
+	// those files being imported directly or indirectly will be included in operations.
+	if (_settings["file-load-strategy"])
+	{
+		auto const text = _settings["file-load-strategy"].asString();
+		if (text == "project-directory")
+			m_fileLoadStrategy = FileLoadStrategy::ProjectDirectory;
+		else if (text == "directly-opened-and-on-import")
+			m_fileLoadStrategy = FileLoadStrategy::DirectlyOpenedAndOnImported;
+		else
+			lspAssert(false, ErrorCode::InvalidParams, "Invalid file load strategy: " + text);
+	}
+
 	m_settingsObject = _settings;
 	Json::Value jsonIncludePaths = _settings["include-paths"];
 
@@ -173,6 +196,23 @@ void LanguageServer::changeConfiguration(Json::Value const& _settings)
 	}
 }
 
+vector<boost::filesystem::path> LanguageServer::allSolidityFilesFromProject() const
+{
+	namespace fs = boost::filesystem;
+
+	std::vector<fs::path> collectedPaths{};
+
+	// We explicitly decided against including all files from include paths but leave the possibility
+	// open for a future PR to enable such a feature to be optionally enabled (default disabled).
+
+	auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::symlink_option::recurse);
+	for (fs::directory_entry const& dirEntry: directoryIterator)
+		if (dirEntry.path().extension() == ".sol")
+			collectedPaths.push_back(dirEntry.path());
+
+	return collectedPaths;
+}
+
 void LanguageServer::compile()
 {
 	// For files that are not open, we have to take changes on disk into account,
@@ -181,6 +221,18 @@ void LanguageServer::compile()
 	FileRepository oldRepository(m_fileRepository.basePath(), m_fileRepository.includePaths());
 	swap(oldRepository, m_fileRepository);
 
+	// Load all solidity files from project.
+	if (m_fileLoadStrategy == FileLoadStrategy::ProjectDirectory)
+		for (auto const& projectFile: allSolidityFilesFromProject())
+		{
+			lspDebug(fmt::format("adding project file: {}", projectFile.generic_string()));
+			m_fileRepository.setSourceByUri(
+				m_fileRepository.sourceUnitNameToUri(projectFile.generic_string()),
+				util::readFileAsString(projectFile)
+			);
+		}
+
+	// Overwrite all files as opened by the client, including the ones which might potentially have changes.
 	for (string const& fileName: m_openFiles)
 		m_fileRepository.setSourceByUri(
 			fileName,
@@ -269,6 +321,7 @@ bool LanguageServer::run()
 			{
 				string const methodName = (*jsonMessage)["method"].asString();
 				id = (*jsonMessage)["id"];
+				lspDebug(fmt::format("received method call: {}", methodName));
 
 				if (auto handler = util::valueOrDefault(m_handlers, methodName))
 					handler(id, (*jsonMessage)["params"]);
@@ -278,6 +331,10 @@ bool LanguageServer::run()
 			else
 				m_client.error({}, ErrorCode::ParseError, "\"method\" has to be a string.");
 		}
+		catch (Json::Exception const&)
+		{
+			m_client.error(id, ErrorCode::InvalidParams, "JSON object access error. Most likely due to a badly formatted JSON request message."s);
+		}
 		catch (RequestError const& error)
 		{
 			m_client.error(id, error.code(), error.comment() ? *error.comment() : ""s);
@@ -347,6 +404,12 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	m_client.reply(_id, move(replyArgs));
 }
 
+void LanguageServer::handleInitialized(MessageID, Json::Value const&)
+{
+	if (m_fileLoadStrategy == FileLoadStrategy::ProjectDirectory)
+		compileAndUpdateDiagnostics();
+}
+
 void LanguageServer::semanticTokensFull(MessageID _id, Json::Value const& _args)
 {
 	auto uri = _args["textDocument"]["uri"];
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
index ee4f06957f..a05bec4976 100644
--- a/libsolidity/lsp/LanguageServer.h
+++ b/libsolidity/lsp/LanguageServer.h
@@ -36,6 +36,23 @@ namespace solidity::lsp
 class RenameSymbol;
 enum class ErrorCode;
 
+/**
+ * Enum to mandate what files to take into consideration for source code analysis.
+ */
+enum class FileLoadStrategy
+{
+	/// Takes only those files into consideration that are explicitly opened and those
+	/// that have been directly or indirectly imported.
+	DirectlyOpenedAndOnImported = 0,
+
+	/// Takes all Solidity (.sol) files within the project root into account.
+	/// Symbolic links will be followed, even if they lead outside of the project directory
+	/// (`--allowed-paths` is currently ignored by the LSP).
+	///
+	/// This resembles the closest what other LSPs should be doing already.
+	ProjectDirectory = 1,
+};
+
 /**
  * Solidity Language Server, managing one LSP client.
  * This implements a subset of LSP version 3.16 that can be found at:
@@ -68,6 +85,7 @@ class LanguageServer
 	/// Reports an error and returns false if not.
 	void requireServerInitialized();
 	void handleInitialize(MessageID _id, Json::Value const& _args);
+	void handleInitialized(MessageID _id, Json::Value const& _args);
 	void handleWorkspaceDidChangeConfiguration(Json::Value const& _args);
 	void setTrace(Json::Value const& _args);
 	void handleTextDocumentDidOpen(Json::Value const& _args);
@@ -82,6 +100,9 @@ class LanguageServer
 
 	/// Compile everything until after analysis phase.
 	void compile();
+
+	std::vector<boost::filesystem::path> allSolidityFilesFromProject() const;
+
 	using MessageHandler = std::function<void(MessageID, Json::Value const&)>;
 
 	Json::Value toRange(langutil::SourceLocation const& _location);
@@ -100,6 +121,7 @@ class LanguageServer
 	/// Set of source unit names for which we sent diagnostics to the client in the last iteration.
 	std::set<std::string> m_nonemptyDiagnostics;
 	FileRepository m_fileRepository;
+	FileLoadStrategy m_fileLoadStrategy = FileLoadStrategy::ProjectDirectory;
 
 	frontend::CompilerStack m_compilerStack;
 
diff --git a/libsolidity/lsp/Transport.cpp b/libsolidity/lsp/Transport.cpp
index aa85fd6b1a..90c0b20a7a 100644
--- a/libsolidity/lsp/Transport.cpp
+++ b/libsolidity/lsp/Transport.cpp
@@ -16,6 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 #include <libsolidity/lsp/Transport.h>
+#include <libsolidity/lsp/Utils.h>
 
 #include <libsolutil/JSON.h>
 #include <libsolutil/Visitor.h>
@@ -205,11 +206,13 @@ std::string StdioTransport::getline()
 {
 	std::string line;
 	std::getline(std::cin, line);
+	lspDebug(fmt::format("Received: {}", line));
 	return line;
 }
 
 void StdioTransport::writeBytes(std::string_view _data)
 {
+	lspDebug(fmt::format("Sending: {}", _data));
 	auto const bytesWritten = fwrite(_data.data(), 1, _data.size(), stdout);
 	solAssert(bytesWritten == _data.size());
 }
diff --git a/libsolutil/CommonIO.h b/libsolutil/CommonIO.h
index 56f62f0ac4..e6cd0c1616 100644
--- a/libsolutil/CommonIO.h
+++ b/libsolutil/CommonIO.h
@@ -48,46 +48,6 @@ inline std::ostream& operator<<(std::ostream& os, bytes const& _bytes)
 namespace util
 {
 
-namespace detail
-{
-
-template <typename Predicate>
-struct RecursiveFileCollector
-{
-	Predicate predicate;
-	std::vector<boost::filesystem::path> result {};
-
-	RecursiveFileCollector& operator()(boost::filesystem::path const& _directory)
-	{
-		if (!boost::filesystem::is_directory(_directory))
-			return *this;
-		auto iterator = boost::filesystem::directory_iterator(_directory);
-		auto const iteratorEnd = boost::filesystem::directory_iterator();
-
-		while (iterator != iteratorEnd)
-		{
-			if (boost::filesystem::is_directory(iterator->status()))
-				(*this)(iterator->path());
-
-			if (predicate(iterator->path()))
-				result.push_back(iterator->path());
-
-			++iterator;
-		}
-		return *this;
-	}
-};
-
-template <typename Predicate>
-RecursiveFileCollector(Predicate) -> RecursiveFileCollector<Predicate>;
-}
-
-template <typename Predicate>
-std::vector<boost::filesystem::path> findFilesRecursively(boost::filesystem::path const& _rootDirectory, Predicate _predicate)
-{
-	return detail::RecursiveFileCollector{_predicate}(_rootDirectory).result;
-}
-
 /// Retrieves and returns the contents of the given file as a std::string.
 /// If the file doesn't exist, it will throw a FileNotFound exception.
 /// If the file exists but is not a regular file, it will throw NotAFile exception.
diff --git a/test/libsolidity/lsp/analyze-full-project/C.sol b/test/libsolidity/lsp/analyze-full-project/C.sol
new file mode 100644
index 0000000000..d08ba140e5
--- /dev/null
+++ b/test/libsolidity/lsp/analyze-full-project/C.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract C
+{
+}
diff --git a/test/libsolidity/lsp/analyze-full-project/D.sol b/test/libsolidity/lsp/analyze-full-project/D.sol
new file mode 100644
index 0000000000..93c8e92fcf
--- /dev/null
+++ b/test/libsolidity/lsp/analyze-full-project/D.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract D
+{
+}
diff --git a/test/libsolidity/lsp/analyze-full-project/E.sol b/test/libsolidity/lsp/analyze-full-project/E.sol
new file mode 100644
index 0000000000..e0e5d19889
--- /dev/null
+++ b/test/libsolidity/lsp/analyze-full-project/E.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract E
+{
+}
diff --git a/test/lsp.py b/test/lsp.py
index 543a7ca433..98c16d3f55 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -537,6 +537,18 @@ def at_end(self):
         """
         return self.current_line_tuple is None
 
+class FileLoadStrategy(Enum):
+    Undefined = auto()
+    ProjectDirectory = auto()
+    DirectlyOpenedAndOnImport = auto()
+
+    def lsp_name(self):
+        if self == FileLoadStrategy.ProjectDirectory:
+            return 'project-directory'
+        elif self == FileLoadStrategy.DirectlyOpenedAndOnImport:
+            return 'directly-opened-and-on-import'
+        return None
+
 class FileTestRunner:
     """
     Runs all tests in a given file.
@@ -898,18 +910,27 @@ def main(self) -> int:
 
         return min(max(self.test_counter.failed, self.assertion_counter.failed), 127)
 
-    def setup_lsp(self, lsp: JsonRpcProcess, expose_project_root=True):
+    def setup_lsp(
+        self,
+        lsp: JsonRpcProcess,
+        expose_project_root=True,
+        file_load_strategy: FileLoadStrategy=FileLoadStrategy.DirectlyOpenedAndOnImport,
+        project_root_subdir=None
+    ):
         """
         Prepares the solc LSP server by calling `initialize`,
         and `initialized` methods.
         """
+        project_root_uri_with_maybe_subdir = self.project_root_uri
+        if project_root_subdir is not None:
+            project_root_uri_with_maybe_subdir = self.project_root_uri + '/' + project_root_subdir
         params = {
             'processId': None,
-            'rootUri': self.project_root_uri,
+            'rootUri': project_root_uri_with_maybe_subdir,
             # Enable traces to receive the amount of expected diagnostics before
             # actually receiving them.
             'trace': 'messages',
-            'initializationOptions': {},
+            # 'initializationOptions': {},
             'capabilities': {
                 'textDocument': {
                     'publishDiagnostics': {'relatedInformation': True}
@@ -923,6 +944,9 @@ def setup_lsp(self, lsp: JsonRpcProcess, expose_project_root=True):
                 }
             }
         }
+        if file_load_strategy != FileLoadStrategy.Undefined:
+            params['initializationOptions'] = {}
+            params['initializationOptions']['file-load-strategy'] = file_load_strategy.lsp_name()
         if not expose_project_root:
             params['rootUri'] = None
         lsp.call_method('initialize', params)
@@ -1059,6 +1083,14 @@ def open_file_and_wait_for_diagnostics(
         )
         return self.wait_for_diagnostics(solc_process)
 
+    def expect_true(
+        self,
+        actual,
+        description="Expected True value",
+        part=ExpectationFailed.Part.Diagnostics
+    ) -> None:
+        self.expect_equal(actual, True, description, part)
+
     def expect_equal(
         self,
         actual,
@@ -1295,6 +1327,38 @@ def user_interaction_failed_autoupdate(self, test, sub_dir):
     # }}}
 
     # {{{ actual tests
+    def test_analyze_all_project_files1(self, solc: JsonRpcProcess) -> None:
+        """
+        Tests the option (default) to analyze all .sol project files even when they have not been actively
+        opened yet. This is how other LSPs (at least for C++) work too and it makes cross-unit tasks
+        actually correct (e.g. symbolic rename, find all references, ...).
+
+        In this test, we simply open up a custom project and ensure we're receiving the diagnostics
+        for all existing files in that project (while having none of these files opened).
+        """
+        SUBDIR = 'analyze-full-project'
+        self.setup_lsp(
+            solc,
+            file_load_strategy=FileLoadStrategy.ProjectDirectory,
+            project_root_subdir=SUBDIR
+        )
+        published_diagnostics = self.wait_for_diagnostics(solc)
+        self.expect_equal(len(published_diagnostics), 3, "Diagnostic reports for 3 files")
+
+        # C.sol
+        report = published_diagnostics[0]
+        self.expect_equal(report['uri'], self.get_test_file_uri('C', SUBDIR), "Correct file URI")
+        self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
+
+        # D.sol
+        report = published_diagnostics[1]
+        self.expect_equal(report['uri'], self.get_test_file_uri('D', SUBDIR), "Correct file URI")
+        self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
+
+        # E.sol
+        report = published_diagnostics[2]
+        self.expect_equal(report['uri'], self.get_test_file_uri('E', SUBDIR), "Correct file URI")
+        self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
 
     def test_publish_diagnostics_errors_multiline(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)

From 122fbc6ff70ddd4a7f21616e1807a2506dbe912b Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 15 Aug 2022 12:36:47 +0200
Subject: [PATCH 0818/1748] Adds include-paths-nested test case.

---
 .../lsp/include-paths-nested/A/B/C/foo.sol    |  6 +++++
 .../lsp/include-paths-nested/A/B/foo.sol      |  6 +++++
 .../lsp/include-paths-nested/A/foo.sol        |  6 +++++
 .../lsp/include-paths-nested/foo.sol          |  6 +++++
 test/lsp.py                                   | 23 +++++++++++++++++++
 5 files changed, 47 insertions(+)
 create mode 100644 test/libsolidity/lsp/include-paths-nested/A/B/C/foo.sol
 create mode 100644 test/libsolidity/lsp/include-paths-nested/A/B/foo.sol
 create mode 100644 test/libsolidity/lsp/include-paths-nested/A/foo.sol
 create mode 100644 test/libsolidity/lsp/include-paths-nested/foo.sol

diff --git a/test/libsolidity/lsp/include-paths-nested/A/B/C/foo.sol b/test/libsolidity/lsp/include-paths-nested/A/B/C/foo.sol
new file mode 100644
index 0000000000..d08ba140e5
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths-nested/A/B/C/foo.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract C
+{
+}
diff --git a/test/libsolidity/lsp/include-paths-nested/A/B/foo.sol b/test/libsolidity/lsp/include-paths-nested/A/B/foo.sol
new file mode 100644
index 0000000000..0ab2f9c095
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths-nested/A/B/foo.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract B
+{
+}
diff --git a/test/libsolidity/lsp/include-paths-nested/A/foo.sol b/test/libsolidity/lsp/include-paths-nested/A/foo.sol
new file mode 100644
index 0000000000..1e31dbd990
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths-nested/A/foo.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract A
+{
+}
diff --git a/test/libsolidity/lsp/include-paths-nested/foo.sol b/test/libsolidity/lsp/include-paths-nested/foo.sol
new file mode 100644
index 0000000000..c589b6ae2c
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths-nested/foo.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract RootContract
+{
+}
diff --git a/test/lsp.py b/test/lsp.py
index 98c16d3f55..3e98bffc90 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -1360,6 +1360,29 @@ def test_analyze_all_project_files1(self, solc: JsonRpcProcess) -> None:
         self.expect_equal(report['uri'], self.get_test_file_uri('E', SUBDIR), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
 
+    def test_analyze_all_project_files2(self, solc: JsonRpcProcess) -> None:
+        """
+        Same as first test on that matter but with deeper nesting levels.
+        """
+        SUBDIR = 'include-paths-nested'
+        EXPECTED_FILES = [
+            "A/B/C/foo",
+            "A/B/foo",
+            "A/foo",
+            "foo",
+        ]
+        EXPECTED_URIS = [self.get_test_file_uri(x, SUBDIR) for x in EXPECTED_FILES]
+        self.setup_lsp(
+            solc,
+            file_load_strategy=FileLoadStrategy.ProjectDirectory,
+            project_root_subdir=SUBDIR
+        )
+        published_diagnostics = self.wait_for_diagnostics(solc)
+        self.expect_equal(len(published_diagnostics), len(EXPECTED_FILES), "Test number of files analyzed.")
+        for report in published_diagnostics:
+            self.expect_true(report['uri'] in EXPECTED_URIS, "Correct file URI")
+            self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
+
     def test_publish_diagnostics_errors_multiline(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
         TEST_NAME = 'publish_diagnostics_3'

From d31e4dcc0ada4d232c52ef29c918592dbf31a1e1 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 15 Aug 2022 14:53:38 +0200
Subject: [PATCH 0819/1748] lsp: Finishing last missing test wrt complex nested
 project directory structure and specifying custom includes, while using some
 (one) of them.

---
 .../lsp/include-paths-nested-2/A/B/C/foo.sol  |  8 ++
 .../lsp/include-paths-nested-2/A/B/foo.sol    |  6 ++
 .../lsp/include-paths-nested-2/A/foo.sol      |  6 ++
 .../lsp/include-paths-nested-2/foo.sol        |  6 ++
 .../lsp/other-include-dir/otherlib/second.sol |  7 ++
 test/lsp.py                                   | 80 +++++++++++++++++++
 6 files changed, 113 insertions(+)
 create mode 100644 test/libsolidity/lsp/include-paths-nested-2/A/B/C/foo.sol
 create mode 100644 test/libsolidity/lsp/include-paths-nested-2/A/B/foo.sol
 create mode 100644 test/libsolidity/lsp/include-paths-nested-2/A/foo.sol
 create mode 100644 test/libsolidity/lsp/include-paths-nested-2/foo.sol
 create mode 100644 test/libsolidity/lsp/other-include-dir/otherlib/second.sol

diff --git a/test/libsolidity/lsp/include-paths-nested-2/A/B/C/foo.sol b/test/libsolidity/lsp/include-paths-nested-2/A/B/C/foo.sol
new file mode 100644
index 0000000000..d53d359b12
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths-nested-2/A/B/C/foo.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+import "otherlib/second.sol";
+
+contract C
+{
+}
diff --git a/test/libsolidity/lsp/include-paths-nested-2/A/B/foo.sol b/test/libsolidity/lsp/include-paths-nested-2/A/B/foo.sol
new file mode 100644
index 0000000000..0ab2f9c095
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths-nested-2/A/B/foo.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract B
+{
+}
diff --git a/test/libsolidity/lsp/include-paths-nested-2/A/foo.sol b/test/libsolidity/lsp/include-paths-nested-2/A/foo.sol
new file mode 100644
index 0000000000..1e31dbd990
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths-nested-2/A/foo.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract A
+{
+}
diff --git a/test/libsolidity/lsp/include-paths-nested-2/foo.sol b/test/libsolidity/lsp/include-paths-nested-2/foo.sol
new file mode 100644
index 0000000000..c589b6ae2c
--- /dev/null
+++ b/test/libsolidity/lsp/include-paths-nested-2/foo.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+contract RootContract
+{
+}
diff --git a/test/libsolidity/lsp/other-include-dir/otherlib/second.sol b/test/libsolidity/lsp/other-include-dir/otherlib/second.sol
new file mode 100644
index 0000000000..2f32daac26
--- /dev/null
+++ b/test/libsolidity/lsp/other-include-dir/otherlib/second.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+library Second
+{
+    function f(uint n) public pure returns (uint) { return n + 1; }
+}
diff --git a/test/lsp.py b/test/lsp.py
index 3e98bffc90..e19a591a9f 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -915,6 +915,7 @@ def setup_lsp(
         lsp: JsonRpcProcess,
         expose_project_root=True,
         file_load_strategy: FileLoadStrategy=FileLoadStrategy.DirectlyOpenedAndOnImport,
+        custom_include_paths: list[str] = [],
         project_root_subdir=None
     ):
         """
@@ -944,11 +945,19 @@ def setup_lsp(
                 }
             }
         }
+
         if file_load_strategy != FileLoadStrategy.Undefined:
             params['initializationOptions'] = {}
             params['initializationOptions']['file-load-strategy'] = file_load_strategy.lsp_name()
+
+        if len(custom_include_paths) != 0:
+            if params['initializationOptions'] is None:
+                params['initializationOptions'] = {}
+            params['initializationOptions']['include-paths'] = custom_include_paths
+
         if not expose_project_root:
             params['rootUri'] = None
+
         lsp.call_method('initialize', params)
         lsp.send_notification('initialized')
 
@@ -1383,6 +1392,40 @@ def test_analyze_all_project_files2(self, solc: JsonRpcProcess) -> None:
             self.expect_true(report['uri'] in EXPECTED_URIS, "Correct file URI")
             self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
 
+    def test_analyze_all_project_files3(self, solc: JsonRpcProcess) -> None:
+        """
+        Same as first test on that matter but with deeper nesting levels.
+        """
+        SUBDIR = 'include-paths-nested-2'
+        EXPECTED_FILES = [
+            "A/B/C/foo",
+            "A/B/foo",
+            "A/foo",
+            "foo",
+        ]
+        IMPLICITLY_LOADED_FILE_COUNT = 1
+        EXPECTED_URIS = [self.get_test_file_uri(x, SUBDIR) for x in EXPECTED_FILES]
+        self.setup_lsp(
+            solc,
+            file_load_strategy=FileLoadStrategy.ProjectDirectory,
+            project_root_subdir=SUBDIR,
+            custom_include_paths=[f"{self.project_root_dir}/other-include-dir"]
+        )
+        published_diagnostics = self.wait_for_diagnostics(solc)
+        self.expect_equal(len(published_diagnostics), len(EXPECTED_FILES) + IMPLICITLY_LOADED_FILE_COUNT, "Test number of files analyzed.")
+
+        # All but the last report should be from expected files
+        for report in published_diagnostics[:-IMPLICITLY_LOADED_FILE_COUNT]:
+            self.expect_true(report['uri'] in EXPECTED_URIS, "Correct file URI")
+            self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
+
+        # Check last report (should be the custom imported lib).
+        # This file is analyzed because it was imported via "A/B/C/foo.sol".
+        report = published_diagnostics[len(EXPECTED_URIS)]
+        self.expect_equal(report['uri'], f"{self.project_root_uri}/other-include-dir/otherlib/second.sol", "Correct file URI")
+        self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
+
+
     def test_publish_diagnostics_errors_multiline(self, solc: JsonRpcProcess) -> None:
         self.setup_lsp(solc)
         TEST_NAME = 'publish_diagnostics_3'
@@ -1495,6 +1538,43 @@ def test_custom_includes(self, solc: JsonRpcProcess) -> None:
         self.expect_equal(len(diagnostics), 1, "no diagnostics")
         self.expect_diagnostic(diagnostics[0], code=2018, lineNo=5, startEndColumns=(4, 62))
 
+    def test_custom_includes_with_full_project(self, solc: JsonRpcProcess) -> None:
+        """
+        Tests loading all all project files while having custom include directories configured.
+        In such a scenario, all project files should be analyzed and those being included via search path
+        but not those include files that are not directly nor indirectly included.
+        """
+        self.setup_lsp(
+            solc,
+            expose_project_root=True,
+            project_root_subdir=''
+        )
+        solc.send_notification(
+            'workspace/didChangeConfiguration', {
+                'settings': {
+                    'include-paths': [
+                        f"{self.project_root_dir}/other-include-dir"
+                    ]
+                }
+            }
+        )
+        published_diagnostics = self.open_file_and_wait_for_diagnostics(solc, 'include-paths/using-custom-includes')
+
+        self.expect_equal(len(published_diagnostics), 2, "Diagnostic reports for 2 files")
+
+        # test file
+        report = published_diagnostics[0]
+        self.expect_equal(report['uri'], self.get_test_file_uri('using-custom-includes', 'include-paths'))
+        diagnostics = report['diagnostics']
+        self.expect_equal(len(diagnostics), 0, "no diagnostics")
+
+        # imported file
+        report = published_diagnostics[1]
+        self.expect_equal(report['uri'], f"{self.project_root_uri}/other-include-dir/otherlib/otherlib.sol")
+        diagnostics = report['diagnostics']
+        self.expect_equal(len(diagnostics), 1, "no diagnostics")
+        self.expect_diagnostic(diagnostics[0], code=2018, lineNo=5, startEndColumns=(4, 62))
+
     def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:
         # Reusing another test but now change some file that generates an error in the other.
         self.test_textDocument_didOpen_with_relative_import(solc)

From d0854cb485ad89b0fb8647b728642666b74f97b6 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 22 Aug 2022 11:09:08 +0200
Subject: [PATCH 0820/1748] Applying CI-reported fixes.

---
 test/lsp.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/test/lsp.py b/test/lsp.py
index e19a591a9f..eb28e2e55f 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 # pragma pylint: disable=too-many-lines
 # test line 1
+from __future__ import annotations # See: https://github.com/PyCQA/pylint/issues/3320
 import argparse
 import fnmatch
 import functools
@@ -422,7 +423,7 @@ def parse(self):
             self.next_line()
 
 
-    def parseDiagnostics(self) -> Diagnostics:
+    def parseDiagnostics(self) -> TestParser.Diagnostics:
         """
         Parse diagnostic expectations specified in the file.
         Returns a named tuple instance of "Diagnostics"
@@ -454,7 +455,7 @@ def parseDiagnostics(self) -> Diagnostics:
         return self.Diagnostics(**diagnostics)
 
 
-    def parseRequestAndResponse(self) -> RequestAndResponse:
+    def parseRequestAndResponse(self) -> TestParser.RequestAndResponse:
         RESPONSE_START = "// <- "
         REQUEST_END = "// }"
         COMMENT_PREFIX = "// "
@@ -915,7 +916,7 @@ def setup_lsp(
         lsp: JsonRpcProcess,
         expose_project_root=True,
         file_load_strategy: FileLoadStrategy=FileLoadStrategy.DirectlyOpenedAndOnImport,
-        custom_include_paths: list[str] = [],
+        custom_include_paths: list[str] = None,
         project_root_subdir=None
     ):
         """
@@ -950,7 +951,7 @@ def setup_lsp(
             params['initializationOptions'] = {}
             params['initializationOptions']['file-load-strategy'] = file_load_strategy.lsp_name()
 
-        if len(custom_include_paths) != 0:
+        if custom_include_paths is not None and len(custom_include_paths) != 0:
             if params['initializationOptions'] is None:
                 params['initializationOptions'] = {}
             params['initializationOptions']['include-paths'] = custom_include_paths
@@ -1412,7 +1413,11 @@ def test_analyze_all_project_files3(self, solc: JsonRpcProcess) -> None:
             custom_include_paths=[f"{self.project_root_dir}/other-include-dir"]
         )
         published_diagnostics = self.wait_for_diagnostics(solc)
-        self.expect_equal(len(published_diagnostics), len(EXPECTED_FILES) + IMPLICITLY_LOADED_FILE_COUNT, "Test number of files analyzed.")
+        self.expect_equal(
+            len(published_diagnostics),
+            len(EXPECTED_FILES) + IMPLICITLY_LOADED_FILE_COUNT,
+            "Test number of files analyzed."
+        )
 
         # All but the last report should be from expected files
         for report in published_diagnostics[:-IMPLICITLY_LOADED_FILE_COUNT]:

From b22d149e3c68eb353a4141e148f65f9b7d631cc3 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 22 Aug 2022 14:53:15 +0200
Subject: [PATCH 0821/1748] Adds extra check to only consider regular files
 (e.g. not directories / device files) for inclusion.

---
 libsolidity/lsp/LanguageServer.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 3020900c0b..e0c7dca8cb 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -207,8 +207,13 @@ vector<boost::filesystem::path> LanguageServer::allSolidityFilesFromProject() co
 
 	auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::symlink_option::recurse);
 	for (fs::directory_entry const& dirEntry: directoryIterator)
-		if (dirEntry.path().extension() == ".sol")
-			collectedPaths.push_back(dirEntry.path());
+	{
+		if (
+			dirEntry.status().type() == fs::file_type::regular_file &&
+			dirEntry.path().extension() == ".sol"
+		)
+		collectedPaths.push_back(dirEntry.path());
+	}
 
 	return collectedPaths;
 }

From 3fc7debbef5f1fbff4f1668cd272e458ccf2ed02 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 24 Aug 2022 10:31:16 +0200
Subject: [PATCH 0822/1748] lsp: Code-review fixups.

---
 libsolidity/lsp/LanguageServer.cpp | 27 +++++++++++-----
 test/lsp.py                        | 49 ++++++++++++------------------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index e0c7dca8cb..6ea60e0cf6 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -53,9 +53,24 @@ using namespace solidity::lsp;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 
+namespace fs = boost::filesystem;
+
 namespace
 {
 
+bool resolvesToRegularFile(boost::filesystem::path _path)
+{
+	fs::file_status fileStatus = fs::status(_path);
+
+	while (fileStatus.type() == fs::file_type::symlink_file)
+	{
+		_path = boost::filesystem::read_symlink(_path);
+		fileStatus = fs::status(_path);
+	}
+
+	return fileStatus.type() == fs::file_type::regular_file;
+}
+
 int toDiagnosticSeverity(Error::Type _errorType)
 {
 	// 1=Error, 2=Warning, 3=Info, 4=Hint
@@ -198,22 +213,18 @@ void LanguageServer::changeConfiguration(Json::Value const& _settings)
 
 vector<boost::filesystem::path> LanguageServer::allSolidityFilesFromProject() const
 {
-	namespace fs = boost::filesystem;
-
-	std::vector<fs::path> collectedPaths{};
+	vector<fs::path> collectedPaths{};
 
 	// We explicitly decided against including all files from include paths but leave the possibility
 	// open for a future PR to enable such a feature to be optionally enabled (default disabled).
 
 	auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::symlink_option::recurse);
 	for (fs::directory_entry const& dirEntry: directoryIterator)
-	{
 		if (
-			dirEntry.status().type() == fs::file_type::regular_file &&
-			dirEntry.path().extension() == ".sol"
+			dirEntry.path().extension() == ".sol" &&
+			(dirEntry.status().type() == fs::file_type::regular_file || resolvesToRegularFile(dirEntry.path()))
 		)
-		collectedPaths.push_back(dirEntry.path());
-	}
+			collectedPaths.push_back(dirEntry.path());
 
 	return collectedPaths;
 }
diff --git a/test/lsp.py b/test/lsp.py
index eb28e2e55f..2e097dab0a 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -539,16 +539,9 @@ def at_end(self):
         return self.current_line_tuple is None
 
 class FileLoadStrategy(Enum):
-    Undefined = auto()
-    ProjectDirectory = auto()
-    DirectlyOpenedAndOnImport = auto()
-
-    def lsp_name(self):
-        if self == FileLoadStrategy.ProjectDirectory:
-            return 'project-directory'
-        elif self == FileLoadStrategy.DirectlyOpenedAndOnImport:
-            return 'directly-opened-and-on-import'
-        return None
+    Undefined = None
+    ProjectDirectory = 'project-directory'
+    DirectlyOpenedAndOnImport =  'directly-opened-and-on-import'
 
 class FileTestRunner:
     """
@@ -932,7 +925,6 @@ def setup_lsp(
             # Enable traces to receive the amount of expected diagnostics before
             # actually receiving them.
             'trace': 'messages',
-            # 'initializationOptions': {},
             'capabilities': {
                 'textDocument': {
                     'publishDiagnostics': {'relatedInformation': True}
@@ -949,7 +941,7 @@ def setup_lsp(
 
         if file_load_strategy != FileLoadStrategy.Undefined:
             params['initializationOptions'] = {}
-            params['initializationOptions']['file-load-strategy'] = file_load_strategy.lsp_name()
+            params['initializationOptions']['file-load-strategy'] = file_load_strategy.value
 
         if custom_include_paths is not None and len(custom_include_paths) != 0:
             if params['initializationOptions'] is None:
@@ -1337,7 +1329,7 @@ def user_interaction_failed_autoupdate(self, test, sub_dir):
     # }}}
 
     # {{{ actual tests
-    def test_analyze_all_project_files1(self, solc: JsonRpcProcess) -> None:
+    def test_analyze_all_project_files_flat(self, solc: JsonRpcProcess) -> None:
         """
         Tests the option (default) to analyze all .sol project files even when they have not been actively
         opened yet. This is how other LSPs (at least for C++) work too and it makes cross-unit tasks
@@ -1370,18 +1362,18 @@ def test_analyze_all_project_files1(self, solc: JsonRpcProcess) -> None:
         self.expect_equal(report['uri'], self.get_test_file_uri('E', SUBDIR), "Correct file URI")
         self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
 
-    def test_analyze_all_project_files2(self, solc: JsonRpcProcess) -> None:
+    def test_analyze_all_project_files_nested(self, solc: JsonRpcProcess) -> None:
         """
         Same as first test on that matter but with deeper nesting levels.
         """
         SUBDIR = 'include-paths-nested'
-        EXPECTED_FILES = [
+        EXPECTED_FILES = {
             "A/B/C/foo",
             "A/B/foo",
             "A/foo",
             "foo",
-        ]
-        EXPECTED_URIS = [self.get_test_file_uri(x, SUBDIR) for x in EXPECTED_FILES]
+        }
+        EXPECTED_URIS = {self.get_test_file_uri(x, SUBDIR) for x in EXPECTED_FILES}
         self.setup_lsp(
             solc,
             file_load_strategy=FileLoadStrategy.ProjectDirectory,
@@ -1389,23 +1381,22 @@ def test_analyze_all_project_files2(self, solc: JsonRpcProcess) -> None:
         )
         published_diagnostics = self.wait_for_diagnostics(solc)
         self.expect_equal(len(published_diagnostics), len(EXPECTED_FILES), "Test number of files analyzed.")
-        for report in published_diagnostics:
-            self.expect_true(report['uri'] in EXPECTED_URIS, "Correct file URI")
-            self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
+        self.expect_equal({report['uri'] for report in published_diagnostics}, EXPECTED_URIS)
+        self.expect_equal([len(report['diagnostics']) for report in published_diagnostics], [0] * len(EXPECTED_URIS))
 
-    def test_analyze_all_project_files3(self, solc: JsonRpcProcess) -> None:
+    def test_analyze_all_project_files_nested_with_include_paths(self, solc: JsonRpcProcess) -> None:
         """
         Same as first test on that matter but with deeper nesting levels.
         """
         SUBDIR = 'include-paths-nested-2'
-        EXPECTED_FILES = [
+        EXPECTED_FILES = {
             "A/B/C/foo",
             "A/B/foo",
             "A/foo",
             "foo",
-        ]
+        }
         IMPLICITLY_LOADED_FILE_COUNT = 1
-        EXPECTED_URIS = [self.get_test_file_uri(x, SUBDIR) for x in EXPECTED_FILES]
+        EXPECTED_URIS = {self.get_test_file_uri(x, SUBDIR) for x in EXPECTED_FILES}
         self.setup_lsp(
             solc,
             file_load_strategy=FileLoadStrategy.ProjectDirectory,
@@ -1426,9 +1417,9 @@ def test_analyze_all_project_files3(self, solc: JsonRpcProcess) -> None:
 
         # Check last report (should be the custom imported lib).
         # This file is analyzed because it was imported via "A/B/C/foo.sol".
-        report = published_diagnostics[len(EXPECTED_URIS)]
-        self.expect_equal(report['uri'], f"{self.project_root_uri}/other-include-dir/otherlib/second.sol", "Correct file URI")
-        self.expect_equal(len(report['diagnostics']), 0, "no diagnostics")
+        last_report = published_diagnostics[len(EXPECTED_URIS)]
+        self.expect_equal(last_report['uri'], self.get_test_file_uri('second', 'other-include-dir/otherlib'), "Correct file URI")
+        self.expect_equal(len(last_report['diagnostics']), 0, "no diagnostics")
 
 
     def test_publish_diagnostics_errors_multiline(self, solc: JsonRpcProcess) -> None:
@@ -1545,7 +1536,7 @@ def test_custom_includes(self, solc: JsonRpcProcess) -> None:
 
     def test_custom_includes_with_full_project(self, solc: JsonRpcProcess) -> None:
         """
-        Tests loading all all project files while having custom include directories configured.
+        Tests loading all project files while having custom include directories configured.
         In such a scenario, all project files should be analyzed and those being included via search path
         but not those include files that are not directly nor indirectly included.
         """
@@ -1577,7 +1568,7 @@ def test_custom_includes_with_full_project(self, solc: JsonRpcProcess) -> None:
         report = published_diagnostics[1]
         self.expect_equal(report['uri'], f"{self.project_root_uri}/other-include-dir/otherlib/otherlib.sol")
         diagnostics = report['diagnostics']
-        self.expect_equal(len(diagnostics), 1, "no diagnostics")
+        self.expect_equal(len(diagnostics), 1)
         self.expect_diagnostic(diagnostics[0], code=2018, lineNo=5, startEndColumns=(4, 62))
 
     def test_didChange_in_A_causing_error_in_B(self, solc: JsonRpcProcess) -> None:

From c8074d2c6e5eaa228e6d37be9a682b4c5a393162 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 24 Aug 2022 15:46:08 +0200
Subject: [PATCH 0823/1748] lsp: Limit resolvesToRegularFile()'s recursion
 depth to 10.

---
 libsolidity/lsp/LanguageServer.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 6ea60e0cf6..65eeaf3d50 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -58,14 +58,15 @@ namespace fs = boost::filesystem;
 namespace
 {
 
-bool resolvesToRegularFile(boost::filesystem::path _path)
+bool resolvesToRegularFile(boost::filesystem::path _path, int maxRecursionDepth = 10)
 {
 	fs::file_status fileStatus = fs::status(_path);
 
-	while (fileStatus.type() == fs::file_type::symlink_file)
+	while (fileStatus.type() == fs::file_type::symlink_file && maxRecursionDepth > 0)
 	{
 		_path = boost::filesystem::read_symlink(_path);
 		fileStatus = fs::status(_path);
+		maxRecursionDepth--;
 	}
 
 	return fileStatus.type() == fs::file_type::regular_file;

From 66f48282cc527a531ffa3e850517221cf1b12423 Mon Sep 17 00:00:00 2001
From: khue <khue0011@gmail.com>
Date: Mon, 11 Apr 2022 16:50:10 +0700
Subject: [PATCH 0824/1748] change to common config of 1 job to reuse between
 osx and ubuntu

---
 .circleci/config.yml | 53 +++++++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0b146ca0e7..23fb3ae0a0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -92,6 +92,27 @@ commands:
           event: release
           condition: on_success
 
+  prepare_bytecode_report:
+    description: "Generate bytecode report and upload it as an artifact."
+    parameters:
+      label:
+        type: string
+    steps:
+      - run: mkdir test-cases/
+      - run: cd test-cases && ../scripts/isolate_tests.py ../test/
+      - run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface standard-json --report-file "../bytecode-report-<< parameters.label >>-json.txt"
+      - run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface cli --report-file "../bytecode-report-<< parameters.label >>-cli.txt"
+      - store_artifacts:
+          path: bytecode-report-<< parameters.label >>-json.txt
+      - store_artifacts:
+          path: bytecode-report-<< parameters.label >>-cli.txt
+      - persist_to_workspace:
+          root: .
+          paths:
+            - bytecode-report-<< parameters.label >>-json.txt
+            - bytecode-report-<< parameters.label >>-cli.txt
+      - gitter_notify_failure_unless_pr
+
 defaults:
 
   # --------------------------------------------------------------------------
@@ -1389,20 +1410,8 @@ jobs:
       - checkout
       - attach_workspace:
           at: build
-      - run: mkdir test-cases/
-      - run: cd test-cases && ../scripts/isolate_tests.py ../test/
-      - run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface standard-json --report-file ../bytecode-report-ubuntu-json.txt
-      - run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface cli --report-file ../bytecode-report-ubuntu-cli.txt
-      - store_artifacts:
-          path: bytecode-report-ubuntu-json.txt
-      - store_artifacts:
-          path: bytecode-report-ubuntu-cli.txt
-      - persist_to_workspace:
-          root: .
-          paths:
-            - bytecode-report-ubuntu-json.txt
-            - bytecode-report-ubuntu-cli.txt
-      - gitter_notify_failure_unless_pr
+      - prepare_bytecode_report:
+          label: "ubuntu"
 
   b_bytecode_osx:
     <<: *base_osx
@@ -1410,20 +1419,8 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
-      - run: mkdir test-cases/
-      - run: cd test-cases && ../scripts/isolate_tests.py ../test/
-      - run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface standard-json --report-file ../bytecode-report-osx-json.txt
-      - run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface cli --report-file ../bytecode-report-osx-cli.txt
-      - store_artifacts:
-          path: bytecode-report-osx-json.txt
-      - store_artifacts:
-          path: bytecode-report-osx-cli.txt
-      - persist_to_workspace:
-          root: .
-          paths:
-            - bytecode-report-osx-json.txt
-            - bytecode-report-osx-cli.txt
-      - gitter_notify_failure_unless_pr
+      - prepare_bytecode_report:
+          label: "osx"
 
   b_bytecode_win:
     <<: *base_win_cmd

From 1cd6f2a486154274a7db4bf57420017c804dfa5d Mon Sep 17 00:00:00 2001
From: Thanh Tran <thanh.tran@sotatek.com>
Date: Wed, 24 Aug 2022 15:18:27 +0700
Subject: [PATCH 0825/1748] Fix warning about DOWNLOAD_EXTRACT_TIMESTAMP on
 CMake 3.24

---
 cmake/EthPolicy.cmake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cmake/EthPolicy.cmake b/cmake/EthPolicy.cmake
index cc404e7942..f571a09cee 100644
--- a/cmake/EthPolicy.cmake
+++ b/cmake/EthPolicy.cmake
@@ -20,4 +20,9 @@ macro (eth_policy)
 		# Allow selecting MSVC runtime library using CMAKE_MSVC_RUNTIME_LIBRARY.
 		cmake_policy(SET CMP0091 NEW)
 	endif()
+
+	# Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
+	if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+		cmake_policy(SET CMP0135 NEW)
+	endif()
 endmacro()

From 318dedf4396f535031753c82de5b643bbce948ec Mon Sep 17 00:00:00 2001
From: Duc Thanh Nguyen <ng.duc.tahn@gmail.com>
Date: Fri, 12 Aug 2022 22:41:04 -0400
Subject: [PATCH 0826/1748] Update emscripten Dockerfile to 3.1.19

---
 scripts/ci/build_emscripten.sh                      | 11 ++++++++++-
 scripts/docker/buildpack-deps/Dockerfile.emscripten | 10 +++++++---
 scripts/docker/buildpack-deps/README.md             | 12 +++++++-----
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/scripts/ci/build_emscripten.sh b/scripts/ci/build_emscripten.sh
index 55d2288c3d..6bc1754f37 100755
--- a/scripts/ci/build_emscripten.sh
+++ b/scripts/ci/build_emscripten.sh
@@ -40,7 +40,8 @@ else
 	BUILD_DIR="$1"
 fi
 
-apt-get update && apt-get install lz4
+apt-get update
+apt-get install lz4 --no-install-recommends
 
 WORKSPACE=/root/project
 
@@ -61,12 +62,20 @@ then
 	echo -n "$CIRCLE_SHA1" >commit_hash.txt
 fi
 
+# Disable warnings for unqualified "move()" calls, introduced and enabled by
+# default in clang-16 which is what the emscripten docker image uses.
+# Additionally, disable the warning for unknown warnings here, as this script is
+# also used with earlier clang versions.
+CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call -Wno-unknown-warning-option"
+
+
 mkdir -p "$BUILD_DIR"
 cd "$BUILD_DIR"
 emcmake cmake \
 	-DCMAKE_BUILD_TYPE=Release \
 	-DBoost_USE_STATIC_LIBS=1 \
 	-DBoost_USE_STATIC_RUNTIME=1 \
+	-DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS}" \
 	-DTESTS=0 \
   ..
 make soljson
diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 777d8b2ec3..d52abc2e0f 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -32,11 +32,15 @@
 # apparently this currently breaks due to conflicting compatibility headers.
 # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
 # dependencies automatically.
-FROM emscripten/emsdk:2.0.33 AS base
-LABEL version="11"
+FROM emscripten/emsdk:3.1.19 AS base
+LABEL version="12"
 
 ADD emscripten.jam /usr/src
 RUN set -ex; \
+\
+	apt-get update && \
+	apt-get install lz4 --no-install-recommends && \
+\
 	cd /usr/src; \
 	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.17 --depth 1 ; \
 	cd z3; \
@@ -55,7 +59,7 @@ RUN set -ex; \
 	make ; make install; \
 	rm -r /usr/src/z3; \
 	cd /usr/src; \
-
+\
 	wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2' -O boost.tar.bz2; \
 	test "$(sha256sum boost.tar.bz2)" = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb  boost.tar.bz2"; \
 	tar -xf boost.tar.bz2; \
diff --git a/scripts/docker/buildpack-deps/README.md b/scripts/docker/buildpack-deps/README.md
index 004a89e91f..bce45e6159 100644
--- a/scripts/docker/buildpack-deps/README.md
+++ b/scripts/docker/buildpack-deps/README.md
@@ -18,18 +18,20 @@ located in `develop`.
 ### Build, Test & Push
 
 Note that the whole workflow - including all defined strategies (image variants) - will be triggered,
-even if only a single Dockerfile was change. The full workflow will only gets executed, if the corresponding
+even if only a single Dockerfile was changed. The full workflow will only get executed, if the corresponding
 Dockerfile was changed. The execution of workflows of unchanged Dockerfiles will not continue and just return success.
 See `scripts/ci/docker_upgrade.sh`.
 
 If the version check was successful, the docker image will be built using the Dockerfile located in
 `scripts/docker/buildpack-deps/Dockerfile.*`.
 
-The resulting docker image will be tested by executing
-the corresponding `scripts/ci/buildpack-deps_test_*` scripts. These scripts are normally symlinked to `scripts/ci/build.sh`,
-except for the `buildpack-deps-ubuntu1604.clang.ossfuzz` docker image, that is symlinked to `scripts/ci/build_ossfuzz.sh`.
+The resulting docker image will be tested by executing the corresponding `scripts/ci/buildpack-deps_test_*` scripts.
+Some of these scripts are symlinked to `scripts/ci/build.sh`, except the following two:
+ * `buildpack-deps-ubuntu1604.clang.ossfuzz` => `scripts/ci/build_ossfuzz.sh`
+ * `buildpack-deps_test_emscripten.sh` => `scripts/ci/build_emscripten.sh`
+
 These scripts `scripts/ci/build.sh` and `scripts/ci/build_ossfuzz.sh` are also used by CircleCI, see `.circleci/config.yml`.
 
 If the tests passed successfully, the docker image will get tagged by the version defined within the corresponding `Dockerfile`.
 Finally, a comment will be added to the PR that contains the full repository, version and repository digest
-of the freshly created docker image.
\ No newline at end of file
+of the freshly created docker image.

From 35870549db3accf00964f5cb85cf250663b73e19 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 23 Aug 2022 22:48:42 +0200
Subject: [PATCH 0827/1748] Dockerfile.emscripten: Use ``&&`` instead of ``;``
 everywhere

---
 .../buildpack-deps/Dockerfile.emscripten      | 45 ++++++++++---------
 1 file changed, 23 insertions(+), 22 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index d52abc2e0f..237405c4c6 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -36,16 +36,16 @@ FROM emscripten/emsdk:3.1.19 AS base
 LABEL version="12"
 
 ADD emscripten.jam /usr/src
-RUN set -ex; \
-\
+RUN set -ex && \
+	\
 	apt-get update && \
 	apt-get install lz4 --no-install-recommends && \
-\
-	cd /usr/src; \
-	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.17 --depth 1 ; \
-	cd z3; \
-	mkdir build; \
-	cd build; \
+	\
+	cd /usr/src && \
+	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.17 --depth 1 && \
+	cd z3 && \
+	mkdir build && \
+	cd build && \
 	emcmake cmake \
 		-DCMAKE_INSTALL_PREFIX=$(em-config CACHE)/sysroot/usr \
 		-DCMAKE_BUILD_TYPE=MinSizeRel \
@@ -55,21 +55,22 @@ RUN set -ex; \
 		-DZ3_BUILD_EXECUTABLE=OFF \
 		-DZ3_SINGLE_THREADED=ON \
 		-DCMAKE_CXX_FLAGS="-s DISABLE_EXCEPTION_CATCHING=0" \
-		..; \
-	make ; make install; \
-	rm -r /usr/src/z3; \
-	cd /usr/src; \
-\
-	wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2' -O boost.tar.bz2; \
-	test "$(sha256sum boost.tar.bz2)" = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb  boost.tar.bz2"; \
-	tar -xf boost.tar.bz2; \
-	rm boost.tar.bz2; \
-	cd boost_1_75_0; \
-	mv ../emscripten.jam .; \
-	./bootstrap.sh; \
-	echo "using emscripten : : em++ ;" >> project-config.jam ; \
+		.. && \
+	make && \
+	make install && \
+	rm -r /usr/src/z3 && \
+	cd /usr/src && \
+	\
+	wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.bz2' -O boost.tar.bz2 && \
+	test "$(sha256sum boost.tar.bz2)" = "953db31e016db7bb207f11432bef7df100516eeb746843fa0486a222e3fd49cb  boost.tar.bz2" && \
+	tar -xf boost.tar.bz2 && \
+	rm boost.tar.bz2 && \
+	cd boost_1_75_0 && \
+	mv ../emscripten.jam . && \
+	./bootstrap.sh && \
+	echo "using emscripten : : em++ ;" >> project-config.jam && \
 	./b2 toolset=emscripten link=static variant=release threading=single runtime-link=static \
 		--with-system --with-filesystem --with-test --with-program_options \
 		cxxflags="-s DISABLE_EXCEPTION_CATCHING=0 -Wno-unused-local-typedef -Wno-variadic-macros -Wno-c99-extensions -Wno-all" \
-	       --prefix=$(em-config CACHE)/sysroot/usr install; \
+	       --prefix=$(em-config CACHE)/sysroot/usr install && \
 	rm -r /usr/src/boost_1_75_0

From 3d54bfd0c35e8a9b480c67b28be27620387e8906 Mon Sep 17 00:00:00 2001
From: tcoyvwac <53616399+tcoyvwac@users.noreply.github.com>
Date: Wed, 17 Aug 2022 19:43:51 +0200
Subject: [PATCH 0828/1748] ast: condense duplicate code

AST.cpp:
* Added findClause() helper function to anonymous namespace.
---
 libsolidity/ast/AST.cpp | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index 04c47a155f..024fc3e38e 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -29,6 +29,8 @@
 #include <libsolidity/ast/TypeProvider.h>
 #include <libsolutil/Keccak256.h>
 
+#include <range/v3/view/tail.hpp>
+
 #include <boost/algorithm/string.hpp>
 
 #include <functional>
@@ -38,6 +40,17 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
+namespace
+{
+TryCatchClause const* findClause(vector<ASTPointer<TryCatchClause>> const& _clauses, optional<string> _errorName = {})
+{
+	for (auto const& clause: ranges::views::tail(_clauses))
+		if (_errorName.has_value() ? clause->errorName() == _errorName : clause->errorName().empty())
+			return clause.get();
+	return nullptr;
+}
+}
+
 ASTNode::ASTNode(int64_t _id, SourceLocation _location):
 	m_id(static_cast<size_t>(_id)),
 	m_location(std::move(_location))
@@ -981,26 +994,14 @@ TryCatchClause const* TryStatement::successClause() const
 	return m_clauses[0].get();
 }
 
-TryCatchClause const* TryStatement::panicClause() const
-{
-	for (size_t i = 1; i < m_clauses.size(); ++i)
-		if (m_clauses[i]->errorName() == "Panic")
-			return m_clauses[i].get();
-	return nullptr;
+TryCatchClause const* TryStatement::panicClause() const {
+	return findClause(m_clauses, "Panic");
 }
 
-TryCatchClause const* TryStatement::errorClause() const
-{
-	for (size_t i = 1; i < m_clauses.size(); ++i)
-		if (m_clauses[i]->errorName() == "Error")
-			return m_clauses[i].get();
-	return nullptr;
+TryCatchClause const* TryStatement::errorClause() const {
+	return findClause(m_clauses, "Error");
 }
 
-TryCatchClause const* TryStatement::fallbackClause() const
-{
-	for (size_t i = 1; i < m_clauses.size(); ++i)
-		if (m_clauses[i]->errorName().empty())
-			return m_clauses[i].get();
-	return nullptr;
+TryCatchClause const* TryStatement::fallbackClause() const {
+	return findClause(m_clauses);
 }

From 0475ec81f03e4cd06cb372a5abcfd1bcb8c27c59 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Mon, 22 Aug 2022 16:09:38 +0200
Subject: [PATCH 0829/1748] Cleanup static z3 script to work similar to
 release_ppa

---
 scripts/common.sh             | 22 +++++++++++++
 scripts/deps-ppa/static_z3.sh | 58 ++++++++++++++++++++++-------------
 scripts/release_ppa.sh        | 17 +---------
 3 files changed, 59 insertions(+), 38 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index 1ea0e1fc1f..98f63ecb80 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -40,6 +40,28 @@ else
     function printLog { echo "$(tput setaf 3)$1$(tput sgr0)"; }
 fi
 
+function checkDputEntries
+{
+    local pattern="$1"
+    grep "${pattern}" /etc/dput.cf --quiet || \
+        fail "Error: Missing ${pattern//\\/} section in /etc/dput.cf (check top comment in release_ppa.sh for more information)."
+}
+
+function sourcePPAConfig
+{
+    [[ "$LAUNCHPAD_KEYID" == "" && "$LAUNCHPAD_EMAIL" == "" ]] || fail
+
+    # source keyid and email from .release_ppa_auth
+    if [[ -e .release_ppa_auth ]]
+    then
+        # shellcheck source=/dev/null
+        source "${REPO_ROOT}/.release_ppa_auth"
+    fi
+
+    [[ "$LAUNCHPAD_KEYID" != "" && "$LAUNCHPAD_EMAIL" != "" ]] || \
+        fail "Error: Couldn't find variables \$LAUNCHPAD_KEYID or \$LAUNCHPAD_EMAIL in sourced file .release_ppa_auth (check top comment in $0 for more information)."
+}
+
 function printStackTrace
 {
     printWarning ""
diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index a2a632cc2e..e2a5cb6407 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -3,9 +3,6 @@
 ## This is used to package .deb packages and upload them to the launchpad
 ## ppa servers for building.
 ##
-## The gnupg key for "builds@ethereum.org" has to be present in order to sign
-## the package.
-##
 ## It will clone the Z3 git from github on the specified version tag,
 ## create a source archive and push it to the ubuntu ppa servers.
 ##
@@ -16,16 +13,33 @@
 ##  method			= ftp
 ##  incoming		= ~ethereum/cpp-build-deps
 ##  login			= anonymous
-
+##
+## To interact with launchpad, you need to set the variables $LAUNCHPAD_EMAIL
+## and $LAUNCHPAD_KEYID in the file .release_ppa_auth in the root directory of
+## the project to your launchpad email and pgp keyid.
+## This could for example look like this:
+##
+##  LAUNCHPAD_EMAIL=your-launchpad-email@ethereum.org
+##  LAUNCHPAD_KEYID=123ABCFFFFFFFF
 ##
 ##############################################################################
 
-set -ev
+set -e
 
-keyid=70D110489D66E2F6
-email=builds@ethereum.org
 packagename=z3-static
-version=4.8.17
+version="$1"
+
+REPO_ROOT="$(dirname "$0")/../.."
+
+# shellcheck source=/dev/null
+source "${REPO_ROOT}/scripts/common.sh"
+
+[[ $version != "" ]] || fail "Usage: $0 <version-without-leading-v>"
+
+sourcePPAConfig
+
+# Sanity check
+checkDputEntries "\[cpp-build-deps\]"
 
 DISTRIBUTIONS="focal impish jammy kinetic"
 
@@ -40,7 +54,7 @@ pparepo=cpp-build-deps
 ppafilesurl=https://launchpad.net/~ethereum/+archive/ubuntu/${pparepo}/+files
 
 # Fetch source
-git clone --branch z3-${version} https://github.com/Z3Prover/z3.git
+git clone --branch "z3-${version}" https://github.com/Z3Prover/z3.git
 cd z3
 
 debversion="${version}"
@@ -50,11 +64,11 @@ CMAKE_OPTIONS="-DZ3_BUILD_LIBZ3_SHARED=OFF -DCMAKE_BUILD_TYPE=Release"
 # gzip will create different tars all the time and we are not allowed
 # to upload the same file twice with different contents, so we only
 # create it once.
-if [ ! -e /tmp/${packagename}_${debversion}.orig.tar.gz ]
+if [ ! -e "/tmp/${packagename}_${debversion}.orig.tar.gz" ]
 then
-    tar --exclude .git -czf /tmp/${packagename}_${debversion}.orig.tar.gz .
+    tar --exclude .git -czf "/tmp/${packagename}_${debversion}.orig.tar.gz" .
 fi
-cp /tmp/${packagename}_${debversion}.orig.tar.gz ../
+cp "/tmp/${packagename}_${debversion}.orig.tar.gz" ../
 
 # Create debian package information
 
@@ -209,7 +223,7 @@ echo "3.0 (quilt)" > debian/source/format
 chmod +x debian/rules
 
 versionsuffix=1ubuntu0~${distribution}
-EMAIL="$email" dch -v "1:${debversion}-${versionsuffix}" "build of ${version}"
+EMAIL="$LAUNCHPAD_EMAIL" dch -v "1:${debversion}-${versionsuffix}" "build of ${version}"
 
 # build source package
 # If packages is rejected because original source is already present, add
@@ -226,26 +240,26 @@ cd ..
 orig="${packagename}_${debversion}.orig.tar.gz"
 # shellcheck disable=SC2012
 orig_size=$(ls -l "$orig" | cut -d ' ' -f 5)
-orig_sha1=$(sha1sum $orig | cut -d ' ' -f 1)
-orig_sha256=$(sha256sum $orig | cut -d ' ' -f 1)
-orig_md5=$(md5sum $orig | cut -d ' ' -f 1)
+orig_sha1=$(sha1sum "$orig" | cut -d ' ' -f 1)
+orig_sha256=$(sha256sum "$orig" | cut -d ' ' -f 1)
+orig_md5=$(md5sum "$orig" | cut -d ' ' -f 1)
 
-if wget --quiet -O $orig-tmp "$ppafilesurl/$orig"
+if wget --quiet -O "$orig-tmp" "$ppafilesurl/$orig"
 then
     echo "[WARN] Original tarball found in Ubuntu archive, using it instead"
-    mv $orig-tmp $orig
+    mv "${orig}-tmp" "$orig"
     # shellcheck disable=SC2012
     new_size=$(ls -l ./*.orig.tar.gz | cut -d ' ' -f 5)
-    new_sha1=$(sha1sum $orig | cut -d ' ' -f 1)
-    new_sha256=$(sha256sum $orig | cut -d ' ' -f 1)
-    new_md5=$(md5sum $orig | cut -d ' ' -f 1)
+    new_sha1=$(sha1sum "$orig" | cut -d ' ' -f 1)
+    new_sha256=$(sha256sum "$orig" | cut -d ' ' -f 1)
+    new_md5=$(md5sum "$orig" | cut -d ' ' -f 1)
     sed -i -e "s,$orig_sha1,$new_sha1,g" -e "s,$orig_sha256,$new_sha256,g" -e "s,$orig_size,$new_size,g" -e "s,$orig_md5,$new_md5,g" ./*.dsc
     sed -i -e "s,$orig_sha1,$new_sha1,g" -e "s,$orig_sha256,$new_sha256,g" -e "s,$orig_size,$new_size,g" -e "s,$orig_md5,$new_md5,g" ./*.changes
 fi
 )
 
 # sign the package
-debsign --re-sign -k "${keyid}" "../${packagename}_${debversion}-${versionsuffix}_source.changes"
+debsign --re-sign -k "${LAUNCHPAD_KEYID}" "../${packagename}_${debversion}-${versionsuffix}_source.changes"
 
 # upload
 dput "${pparepo}" "../${packagename}_${debversion}-${versionsuffix}_source.changes"
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 6e3eae01cc..ac0a689888 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -47,7 +47,6 @@ set -e
 
 REPO_ROOT="$(dirname "$0")/.."
 
-# for the "fail" function
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
@@ -62,15 +61,7 @@ is_release() {
     [[ "${branch}" =~ ^v[0-9]+(\.[0-9]+)*$ ]]
 }
 
-# source keyid and email from .release_ppa_auth
-if [[ -e .release_ppa_auth ]]
-then
-    # shellcheck source=/dev/null
-    source "${REPO_ROOT}/.release_ppa_auth"
-fi
-
-[[ "$LAUNCHPAD_KEYID" != "" && "$LAUNCHPAD_EMAIL" != "" ]] || \
-    fail "Error: Couldn't find variables \$LAUNCHPAD_KEYID or \$LAUNCHPAD_EMAIL in sourced file .release_ppa_auth (check top comment in $0 for more information)."
+sourcePPAConfig
 
 packagename=solc
 
@@ -79,12 +70,6 @@ static_build_distribution=focal
 
 DISTRIBUTIONS="focal jammy kinetic"
 
-function checkDputEntries {
-    local pattern="$1"
-    grep "${pattern}" /etc/dput.cf --quiet || \
-        fail "Error: Missing ${pattern//\\/} section in /etc/dput.cf (check top comment in ${0} for more information)."
-}
-
 if is_release
 then
     DISTRIBUTIONS="$DISTRIBUTIONS STATIC"

From c5e9b6e66604129fb14124e1d59147e54a9fa983 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 25 Aug 2022 15:07:06 +0200
Subject: [PATCH 0830/1748] static_z3.sh: Update releases to include only
 maintained ones

---
 scripts/deps-ppa/static_z3.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index e2a5cb6407..fa237ba08f 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -41,7 +41,7 @@ sourcePPAConfig
 # Sanity check
 checkDputEntries "\[cpp-build-deps\]"
 
-DISTRIBUTIONS="focal impish jammy kinetic"
+DISTRIBUTIONS="focal jammy kinetic"
 
 for distribution in $DISTRIBUTIONS
 do

From 5849fc3bf154a5ecb90614ec0befdaf591a937f6 Mon Sep 17 00:00:00 2001
From: kuzdogan <kaanuzdogan@hotmail.com>
Date: Thu, 25 Aug 2022 15:25:39 +0200
Subject: [PATCH 0831/1748] Update contract metadata docs

---
 docs/metadata.rst | 91 +++++++++++++++++++++++++++++++++++++----------
 1 file changed, 73 insertions(+), 18 deletions(-)

diff --git a/docs/metadata.rst b/docs/metadata.rst
index e92a7c0d58..317ad2204b 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -46,20 +46,20 @@ explanatory purposes.
       // to the language.
       "compiler": {
         // Required for Solidity: Version of the compiler
-        "version": "0.4.6+commit.2dabbdf0.Emscripten.clang",
+        "version": "0.8.2+commit.661d1103",
         // Optional: Hash of the compiler binary which produced this output
         "keccak256": "0x123..."
       },
-      // Required: Compilation source files/source units, keys are file names
+      // Required: Compilation source files/source units, keys are file paths
       "sources":
       {
-        "myFile.sol": {
+        "myDirectory/myFile.sol": {
           // Required: keccak256 hash of the source file
           "keccak256": "0x123...",
           // Required (unless "content" is used, see below): Sorted URL(s)
-          // to the source file, protocol is more or less arbitrary, but a
-          // Swarm URL is recommended
-          "urls": [ "bzzr://56ab..." ],
+          // to the source file, protocol is more or less arbitrary, but an
+          // IPFS URL is recommended
+          "urls": [ "bzz-raw://7d7a...", "dweb:/ipfs/QmN..." ],
           // Optional: SPDX license identifier as given in the source file
           "license": "MIT"
         },
@@ -73,7 +73,7 @@ explanatory purposes.
       // Required: Compiler settings
       "settings":
       {
-        // Required for Solidity: Sorted list of remappings
+        // Required for Solidity: Sorted list of import remappings
         "remappings": [ ":g=/dir" ],
         // Optional: Optimizer settings. The fields "enabled" and "runs" are deprecated
         // and are only given for backwards-compatibility.
@@ -100,15 +100,15 @@ explanatory purposes.
           }
         },
         "metadata": {
-          // Reflects the setting used in the input json, defaults to false
+          // Reflects the setting used in the input json, defaults to "false"
           "useLiteralContent": true,
           // Reflects the setting used in the input json, defaults to "ipfs"
           "bytecodeHash": "ipfs"
         },
-        // Required for Solidity: File and name of the contract or library this
+        // Required for Solidity: File path and the name of the contract or library this
         // metadata is created for.
         "compilationTarget": {
-          "myFile.sol": "MyContract"
+          "myDirectory/myFile.sol": "MyContract"
         },
         // Required for Solidity: Addresses for libraries used
         "libraries": {
@@ -118,12 +118,66 @@ explanatory purposes.
       // Required: Generated information about the contract.
       "output":
       {
-        // Required: ABI definition of the contract
+        // Required: ABI definition of the contract. See "Contract ABI Specification"
         "abi": [/* ... */],
+        // Required: NatSpec developer documentation of the contract.
+        "devdoc": {
+          "version": 1 // NatSpec version
+          "kind": "dev",
+          // Contents of the @author NatSpec field of the contract
+          "author": "John Doe",
+          // Contents of the @title NatSpec field of the contract
+          "title": "MyERC20: an example ERC20"
+          // Contents of the @dev NatSpec field of the contract
+          "details": "Interface of the ERC20 standard as defined in the EIP. See https://eips.ethereum.org/EIPS/eip-20 for details",
+          "methods": {
+            "transfer(address,uint256)": {
+              // Contents of the @dev NatSpec field of the method
+              "details": "Returns a boolean value indicating whether the operation succeeded. Must be called by the token holder address",
+              // Contents of the @param NatSpec fields of the method
+              "params": {
+                "_value": "The amount tokens to be transferred",
+                "_to": "The receiver address"
+              }
+              // Contents of the @return NatSpec field.
+              "returns": {
+                // Return var name (here "success") if exists. "_0" as key if return var is unnamed
+                "success": "a boolean value indicating whether the operation succeeded"
+              }
+            }
+          },
+          "stateVariables": {
+            "owner": {
+              // Contents of the @dev NatSpec field of the state variable
+              "details": "Must be set during contract creation. Can then only be changed by the owner"
+            }
+          }
+          "events": {
+             "Transfer(address,address,uint256)": {
+               "details": "Emitted when `value` tokens are moved from one account (`from`) toanother (`to`)."
+               "params": {
+                 "from": "The sender address"
+                 "to": "The receiver address"
+                 "value": "The token amount"
+               }
+             }
+          }
+        },
         // Required: NatSpec user documentation of the contract
-        "userdoc": [/* ... */],
-        // Required: NatSpec developer documentation of the contract
-        "devdoc": [/* ... */]
+        "userdoc": {
+          "version": 1 // NatSpec version
+          "kind": "user",
+          "methods": {
+            "transfer(address,uint256)": {
+              "notice": "Transfers `_value` tokens to address `_to`"
+            }
+          },
+          "events": {
+            "Transfer(address,address,uint256)": {
+              "notice": "`_value` tokens have been moved from `from` to `to`"
+            }
+          }
+        }
       }
     }
 
@@ -160,7 +214,7 @@ to the end of the deployed bytecode
     0x00 0x33
 
 So in order to retrieve the data, the end of the deployed bytecode can be checked
-to match that pattern and use the IPFS hash to retrieve the file.
+to match that pattern and the IPFS hash can be used to retrieve the file (if pinned/published).
 
 Whereas release builds of solc use a 3 byte encoding of the version as shown
 above (one byte each for major, minor and patch version number), prerelease builds
@@ -184,14 +238,15 @@ Usage for Automatic Interface Generation and NatSpec
 ====================================================
 
 The metadata is used in the following way: A component that wants to interact
-with a contract (e.g. Mist or any wallet) retrieves the code of the contract,
-from that the IPFS/Swarm hash of a file which is then retrieved.  That file
+with a contract (e.g. a wallet) retrieves the code of the contract.
+It decodes the CBOR encoded section containing the IPFS/Swarm hash of the
+metadata file. With that hash, the metadata file is retrieved. That file
 is JSON-decoded into a structure like above.
 
 The component can then use the ABI to automatically generate a rudimentary
 user interface for the contract.
 
-Furthermore, the wallet can use the NatSpec user documentation to display a confirmation message to the user
+Furthermore, the wallet can use the NatSpec user documentation to display a human-readable confirmation message to the user
 whenever they interact with the contract, together with requesting
 authorization for the transaction signature.
 

From 484c9d3ff0bfd2d5c76b5eff4b1dab13ee30572d Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 25 Aug 2022 16:33:56 +0200
Subject: [PATCH 0832/1748] Update docker images for emscripten.

---
 .circleci/config.yml                    | 4 ++--
 scripts/build_emscripten.sh             | 4 ++--
 scripts/ci/build_emscripten.sh          | 5 +++--
 scripts/docker/buildpack-deps/README.md | 2 ++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23fb3ae0a0..af193b50fe 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,8 +21,8 @@ parameters:
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:048002d71a1f86f83dedb79dd057760b752256c75646ba5ad5c1bbe92e1695aa"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-11
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0ad7c65e8c54d926ba9cb80d56246e4fc49f9284ad5188aaaa4834f46ab0c315"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-12
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:65a82268792a5a2ee85ad432baf04a056c3a4006941ab3a4416eb1a0614883f3"
   evm-version:
     type: string
     default: london
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 841cc26b31..a678d08ab3 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -34,7 +34,7 @@ else
     BUILD_DIR="$1"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-11
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-12
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:0ad7c65e8c54d926ba9cb80d56246e4fc49f9284ad5188aaaa4834f46ab0c315 \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:65a82268792a5a2ee85ad432baf04a056c3a4006941ab3a4416eb1a0614883f3 \
     ./scripts/ci/build_emscripten.sh "$BUILD_DIR"
diff --git a/scripts/ci/build_emscripten.sh b/scripts/ci/build_emscripten.sh
index 6bc1754f37..f2e475c2ae 100755
--- a/scripts/ci/build_emscripten.sh
+++ b/scripts/ci/build_emscripten.sh
@@ -62,11 +62,12 @@ then
 	echo -n "$CIRCLE_SHA1" >commit_hash.txt
 fi
 
-# Disable warnings for unqualified "move()" calls, introduced and enabled by
+# Disable warnings for unqualified `move()` calls, introduced and enabled by
 # default in clang-16 which is what the emscripten docker image uses.
 # Additionally, disable the warning for unknown warnings here, as this script is
 # also used with earlier clang versions.
-CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call -Wno-unknown-warning-option"
+# TODO: This can be removed if and when all usages of `move()` in our codebase use the `std::` qualifier.
+CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call"
 
 
 mkdir -p "$BUILD_DIR"
diff --git a/scripts/docker/buildpack-deps/README.md b/scripts/docker/buildpack-deps/README.md
index bce45e6159..7f6352581c 100644
--- a/scripts/docker/buildpack-deps/README.md
+++ b/scripts/docker/buildpack-deps/README.md
@@ -35,3 +35,5 @@ These scripts `scripts/ci/build.sh` and `scripts/ci/build_ossfuzz.sh` are also u
 If the tests passed successfully, the docker image will get tagged by the version defined within the corresponding `Dockerfile`.
 Finally, a comment will be added to the PR that contains the full repository, version and repository digest
 of the freshly created docker image.
+
+The files `.circleci/config.yml` and `scripts/build_emscripten.sh` need to be updated with the new hash posted in the comment.

From 71c3c26b2913880fa2e2945741409c844a659e15 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 24 Aug 2022 12:23:57 +0200
Subject: [PATCH 0833/1748] Fix inconsistent nested dependency in
 safe-contracts

---
 test/externalTests/gnosis.sh | 29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index af2b12508a..81e5180c60 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -31,8 +31,8 @@ BINARY_TYPE="$1"
 BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
-function compile_fn { npm run build; }
-function test_fn { npm test; }
+function compile_fn { npx npm run build; }
+function test_fn { npx npm test; }
 
 function gnosis_safe_test
 {
@@ -87,33 +87,44 @@ function gnosis_safe_test
     sed -i "s|it\(('can only be called from Safe itself'\)|it.skip\1|g" test/libraries/Migration.spec.ts
     sed -i "s|it\(('should enforce delegatecall to MultiSend'\)|it.skip\1|g" test/libraries/MultiSend.spec.ts
 
+    # Force nested abstract-provider dependencies to be at version 5.6.0. Version 5.7.0 of @ethersproject/abstract-provider
+    # introduced a new field in FeeData, which causes clashes unless all dependency packages of abstract-provider are pegged
+    # to the same version. As we've already had to peg @ethersproject/contracts to 5.6.0 earlier, we are doing so now with
+    # @ethersproject/abstract-provider as well.
+    jq '.overrides."@ethersproject/abstract-provider"="5.6.0" |
+        .overrides."@ethersproject/abstract-signer@5.6.0"
+                  ."@ethersproject/abstract-provider"="5.6.0"' package.json > package.json.tmp
+    mv package.json.tmp package.json
+
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    npm install
-    npm install hardhat-gas-reporter
+    # npm@8.3.0+ is required for `overrides` support
+    npm install npm@>8.3.0
+    npx npm install
+    npx npm install hardhat-gas-reporter
 
     # Typescript compilation fails with typescript >= 4.7:
     # Error: Debug Failure. False expression: Non-string value passed to `ts.resolveTypeReferenceDirective`
-    npm install "typescript@<4.7.0"
+    npx npm install "typescript@<4.7.0"
 
     # With ethers.js 5.6.2 many tests for revert messages fail.
     # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
-    npm install ethers@5.6.1
+    npx npm install ethers@5.6.1
 
     # Note that ethers@5.6.1 depends on @ethersproject/contracts@5.6.0 while the dependency on hardhat-deploy
     # pulls @ethersproject/contracts@5.6.1 (latest). Force 5.6.0 to avoid errors due to having two copies.
-    npm install @ethersproject/contracts@5.6.0
+    npx npm install @ethersproject/contracts@5.6.0
 
     # 2.1.1 started causing failures in safe-contracts external tests after a contract address check was introduced
     # in https://github.com/NomicFoundation/hardhat/pull/2916, and so to avoid errors, the package is now pegged.
     # TODO: Remove when https://github.com/safe-global/safe-contracts/issues/436 is resolved.
-    npm install @nomiclabs/hardhat-ethers@2.1.0
+    npx npm install @nomiclabs/hardhat-ethers@2.1.0
 
     # Hardhat 2.9.5 introduced a bug with handling padded arguments to getStorageAt().
     # TODO: Remove when https://github.com/NomicFoundation/hardhat/issues/2709 is fixed.
-    npm install hardhat@2.9.4
+    npx npm install hardhat@2.9.4
 
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"

From e99e93ff5b528912d51a2e3b7c0c67e37180214b Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 29 Aug 2022 11:15:53 +0200
Subject: [PATCH 0834/1748] Fix pylint warning

---
 scripts/common/rest_api_helpers.py                      | 4 ++--
 test/scripts/test_externalTests_benchmark_downloader.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/scripts/common/rest_api_helpers.py b/scripts/common/rest_api_helpers.py
index 4068a5e1e3..31f973e818 100644
--- a/scripts/common/rest_api_helpers.py
+++ b/scripts/common/rest_api_helpers.py
@@ -48,7 +48,7 @@ def query_api(url: str, params: Mapping[str, str], debug_requests=False) -> dict
         if len(params) > 0:
             print(f'QUERY: {params}')
 
-    response = requests.get(url, params=params)
+    response = requests.get(url, params=params, timeout=60)
     response.raise_for_status()
 
     if debug_requests:
@@ -67,7 +67,7 @@ def download_file(url: str, target_path: Path, overwrite=False):
     if not overwrite and target_path.exists():
         raise FileAlreadyExists(f"Refusing to overwrite existing file: '{target_path}'.")
 
-    with requests.get(url, stream=True) as request:
+    with requests.get(url, stream=True, timeout=60) as request:
         with open(target_path, 'wb') as target_file:
             shutil.copyfileobj(request.raw, target_file)
 
diff --git a/test/scripts/test_externalTests_benchmark_downloader.py b/test/scripts/test_externalTests_benchmark_downloader.py
index e29d140112..aead618470 100644
--- a/test/scripts/test_externalTests_benchmark_downloader.py
+++ b/test/scripts/test_externalTests_benchmark_downloader.py
@@ -31,7 +31,7 @@ def _git_run_command_mock(command):
         "If you have updated the code, please remember to add matching command fixtures above."
     )
 
-def _requests_get_mock(url, params):
+def _requests_get_mock(url, params, timeout):
     response_mock = Mock()
 
     if url == 'https://api.github.com/repos/ethereum/solidity/pulls/12818':
@@ -174,6 +174,7 @@ def _requests_get_mock(url, params):
         "The test tried to perform an unexpected GET request.\n"
         f"URL: {url}\n" +
         (f"query: {params}\n" if len(params) > 0 else "") +
+        f"timeout: {timeout}\n" +
         "If you have updated the code, please remember to add matching response fixtures above."
     )
 

From a2a80401ed4c54f8fc212edf577129f0d2087628 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Fri, 26 Aug 2022 20:48:30 +0530
Subject: [PATCH 0835/1748] Meetings on Mondays and Wednesdays should happen at
 the same time

---
 docs/contributing.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index ceb0b44ed3..9da7f02d0f 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -30,8 +30,7 @@ Team Calls
 If you have issues or pull requests to discuss, or are interested in hearing what
 the team and contributors are working on, you can join our public team calls:
 
-- Mondays at 3pm CET/CEST.
-- Wednesdays at 2pm CET/CEST.
+- Mondays and Wednesdays at 3pm CET/CEST.
 
 Both calls take place on `Jitsi <https://meet.ethereum.org/solidity>`_.
 

From eb644b1d8e53daf6123b273ec5f77276bc3c7da0 Mon Sep 17 00:00:00 2001
From: MeetRajput00 <rajputmeet10@gmail.com>
Date: Mon, 29 Aug 2022 16:48:14 +0530
Subject: [PATCH 0836/1748] fixed grammar typo in readme.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index ccd8dc6346..1f00465323 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ For a good overview and starting point, please check out the official [Solidity
 
 Solidity is a statically-typed curly-braces programming language designed for developing smart contracts
 that run on the Ethereum Virtual Machine. Smart contracts are programs that are executed inside a peer-to-peer
-network where nobody has special authority over the execution, and thus they allow to implement tokens of value,
+network where nobody has special authority over the execution, and thus they allow anyone to implement tokens of value,
 ownership, voting, and other kinds of logic.
 
 When deploying contracts, you should use the latest released version of

From f508494f52feb45f22404801389175ce12e77013 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Mon, 29 Aug 2022 15:23:29 +0200
Subject: [PATCH 0837/1748] Fix undefined order of evaluation

---
 libyul/backends/evm/EVMDialect.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 35fa5f88eb..c86be6f695 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -82,7 +82,8 @@ pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
 		_assembly.appendInstruction(_instruction);
 	};
 
-	return {f.name, move(f)};
+	YulString name = f.name;
+	return {name, move(f)};
 }
 
 pair<YulString, BuiltinFunctionForEVM> createFunction(

From 81c4604b8a880c02a6b850133845b5c8114f938b Mon Sep 17 00:00:00 2001
From: Francisco Giordano <frangio.1@gmail.com>
Date: Sun, 28 Aug 2022 19:26:34 -0300
Subject: [PATCH 0838/1748] Clarify effect of memory unsafe assembly

---
 docs/assembly.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/assembly.rst b/docs/assembly.rst
index 6ad9ebdad7..b527ffbafd 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -289,8 +289,8 @@ perform additional memory optimizations, if it can rely on certain assumptions a
 
 While we recommend to always respect Solidity's memory model, inline assembly allows you to use memory
 in an incompatible way. Therefore, moving stack variables to memory and additional memory optimizations are,
-by default, disabled in the presence of any inline assembly block that contains a memory operation or assigns
-to Solidity variables in memory.
+by default, globally disabled in the presence of any inline assembly block that contains a memory operation
+or assigns to Solidity variables in memory.
 
 However, you can specifically annotate an assembly block to indicate that it in fact respects Solidity's memory
 model as follows:

From 216d38cefebecc499818ec160153bdf969c59c5d Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Mon, 29 Aug 2022 22:41:19 +0530
Subject: [PATCH 0839/1748] added yul exception to compiler error types

---
 docs/using-the-compiler.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 3c2ec38f9b..d6bf94a2cb 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -614,8 +614,9 @@ Error Types
 10. ``Exception``: Unknown failure during compilation - this should be reported as an issue.
 11. ``CompilerError``: Invalid use of the compiler stack - this should be reported as an issue.
 12. ``FatalError``: Fatal error not processed correctly - this should be reported as an issue.
-13. ``Warning``: A warning, which didn't stop the compilation, but should be addressed if possible.
-14. ``Info``: Information that the compiler thinks the user might find useful, but is not dangerous and does not necessarily need to be addressed.
+13. ``YulException``: Error during Yul Code generation - this should be reported as an issue.
+14. ``Warning``: A warning, which didn't stop the compilation, but should be addressed if possible.
+15. ``Info``: Information that the compiler thinks the user might find useful, but is not dangerous and does not necessarily need to be addressed.
 
 
 .. _compiler-tools:

From 99400a6121a8709e2f9c1464ae92cb5de2fe2724 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 30 Aug 2022 09:35:12 +0900
Subject: [PATCH 0840/1748] Fix typo

---
 docs/internals/optimizer.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 97a250eeda..5ad0f19e55 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -683,7 +683,7 @@ Conflicting values are resolved in the following way:
 
 - "unused", "undecided" -> "undecided"
 - "unused", "used" -> "used"
-- "undecided, "used" -> "used"
+- "undecided", "used" -> "used"
 
 For for-loops, the condition, body and post-part are visited twice, taking
 the joining control-flow at the condition into account.

From a08d39ce8474887ad3eea8d84dd158e469bb3f0e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 30 Aug 2022 10:05:49 +0200
Subject: [PATCH 0841/1748] Update issue selector, and remove auto labeling

---
 .github/ISSUE_TEMPLATE/config.yml         | 11 +++++++----
 .github/ISSUE_TEMPLATE/feature_request.md |  2 ++
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index b4e9b3d505..c34dedb740 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,14 +1,17 @@
 blank_issues_enabled: false
 contact_links:
   - name: Bug Report
-    url: https://github.com/ethereum/solidity/issues/new?template=bug_report.md&projects=ethereum/solidity/43&labels=bug+%3Abug%3A
-    about: Bug reports about the Solidity Compiler.
+    url: https://github.com/ethereum/solidity/issues/new?template=bug_report.md&projects=ethereum/solidity/43
+    about: Bug reports for the Solidity Compiler.
   - name: Documentation Issue
-    url: https://github.com/ethereum/solidity/issues/new?template=documentation_issue.md&projects=ethereum/solidity/43&labels=documentation+%3Abook%3A
+    url: https://github.com/ethereum/solidity/issues/new?template=documentation_issue.md&projects=ethereum/solidity/43
     about: Solidity documentation.
   - name: Feature Request
-    url: https://github.com/ethereum/solidity/issues/new?template=feature_request.md&projects=ethereum/solidity/43&labels=feature
+    url: https://github.com/ethereum/solidity/issues/new?template=feature_request.md&projects=ethereum/solidity/43
     about: Solidity language or infrastructure feature requests.
   - name: Report a security vulnerability
     url: https://github.com/ethereum/solidity/security/policy
     about: Please review our security policy for more details.
+  - name: Initiate a language design or feedback discussion
+    url: https://forum.soliditylang.org
+    about: Open a thread on the Solidity forum.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 900e6977ce..e5cc0f79c1 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -10,6 +10,8 @@ name: Feature Request
     - [Solidity chat](https://gitter.im/ethereum/solidity)
     - [Stack Overflow](https://ethereum.stackexchange.com/)
 - Ensure the issue isn't already reported (check `feature` and `language design` labels).
+- If you feel uncertain about your feature request, perhaps it's better to open a language design or feedback forum thread via the issue selector, or by going to the forum directly.
+    - [Solidity forum](https://forum.soliditylang.org/)
 
 *Delete the above section and the instructions in the sections below before submitting*
 -->

From 776f74dc306ab4abbf9ab0b402e41e2a2a8dafdf Mon Sep 17 00:00:00 2001
From: Emmanuel Oaikhenan <emmaodia@users.noreply.github.com>
Date: Tue, 30 Aug 2022 09:23:15 +0100
Subject: [PATCH 0842/1748] Grammer fix

---
 docs/layout-of-source-files.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/layout-of-source-files.rst b/docs/layout-of-source-files.rst
index cd231c1fce..9a58478586 100644
--- a/docs/layout-of-source-files.rst
+++ b/docs/layout-of-source-files.rst
@@ -105,7 +105,7 @@ arrays and structs. Apart from supporting more types, it involves more extensive
 validation and safety checks, which may result in higher gas costs, but also heightened
 security. It is considered
 non-experimental as of Solidity 0.6.0 and it is enabled by default starting
-with Solidity 0.8.0. There old coder can still be selected using ``pragma abicoder v1;``.
+with Solidity 0.8.0. The old ABI coder can still be selected using ``pragma abicoder v1;``.
 
 The set of types supported by the new encoder is a strict superset of
 the ones supported by the old one. Contracts that use it can interact with ones

From f7cc29bec181e50d2942e600a7e077c27c2f77ef Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 23 Aug 2022 19:28:45 +0200
Subject: [PATCH 0843/1748] Add std:: qualifier to move() calls

---
 libevmasm/Assembly.cpp                        | 10 ++---
 libevmasm/CommonSubexpressionEliminator.cpp   |  4 +-
 libevmasm/ConstantOptimiser.cpp               |  4 +-
 libevmasm/ControlFlowGraph.cpp                |  4 +-
 libevmasm/Inliner.cpp                         |  4 +-
 libevmasm/KnownState.cpp                      |  6 +--
 libevmasm/PathGasMeter.cpp                    |  8 ++--
 libsmtutil/CHCSmtLib2Interface.cpp            |  4 +-
 libsmtutil/SMTLib2Interface.cpp               |  6 +--
 libsmtutil/SMTPortfolio.cpp                   |  2 +-
 libsmtutil/Z3CHCInterface.cpp                 |  2 +-
 libsolc/libsolc.cpp                           |  4 +-
 libsolidity/analysis/DeclarationContainer.cpp |  2 +-
 libsolidity/analysis/FunctionCallGraph.cpp    |  4 +-
 libsolidity/analysis/NameAndTypeResolver.cpp  |  4 +-
 libsolidity/analysis/ReferencesResolver.cpp   |  2 +-
 libsolidity/analysis/TypeChecker.cpp          |  8 ++--
 libsolidity/ast/AST.cpp                       |  2 +-
 libsolidity/ast/AST.h                         |  4 +-
 libsolidity/ast/ASTJsonExporter.cpp           | 12 +++---
 libsolidity/ast/ASTJsonImporter.cpp           |  6 +--
 libsolidity/ast/TypeProvider.cpp              |  2 +-
 libsolidity/ast/Types.cpp                     |  6 +--
 libsolidity/codegen/CompilerContext.cpp       |  2 +-
 libsolidity/codegen/ContractCompiler.cpp      |  2 +-
 libsolidity/codegen/ExpressionCompiler.cpp    |  8 ++--
 libsolidity/codegen/ExpressionCompiler.h      |  2 +-
 libsolidity/codegen/LValue.cpp                |  2 +-
 .../codegen/MultiUseYulFunctionCollector.cpp  |  4 +-
 .../codegen/ir/IRGenerationContext.cpp        |  6 +--
 libsolidity/codegen/ir/IRGenerator.cpp        | 14 +++----
 .../codegen/ir/IRGeneratorForStatements.cpp   | 14 +++----
 libsolidity/formal/ArraySlicePredicate.cpp    |  2 +-
 libsolidity/formal/BMC.cpp                    |  8 ++--
 libsolidity/formal/CHC.cpp                    |  6 +--
 libsolidity/formal/EncodingContext.cpp        |  2 +-
 libsolidity/formal/EncodingContext.h          |  2 +-
 libsolidity/formal/Invariants.cpp             |  4 +-
 libsolidity/formal/ModelChecker.cpp           |  2 +-
 libsolidity/formal/Predicate.cpp              |  6 +--
 libsolidity/formal/SMTEncoder.cpp             |  4 +-
 libsolidity/formal/SymbolicState.cpp          | 16 ++++----
 libsolidity/formal/SymbolicVariables.cpp      | 30 +++++++--------
 libsolidity/interface/ABI.cpp                 |  2 +-
 libsolidity/interface/CompilerStack.cpp       |  6 +--
 libsolidity/interface/ImportRemapper.cpp      |  2 +-
 libsolidity/interface/Natspec.cpp             |  8 ++--
 libsolidity/interface/StandardCompiler.cpp    |  8 ++--
 libsolidity/interface/StorageLayout.cpp       |  6 +--
 libsolidity/lsp/FileRepository.cpp            |  6 +--
 libsolidity/lsp/GotoDefinition.cpp            |  4 +-
 libsolidity/lsp/LanguageServer.cpp            | 18 ++++-----
 libsolidity/lsp/Transport.cpp                 | 24 ++++++------
 libsolidity/parsing/DocStringParser.cpp       |  2 +-
 libsolidity/parsing/Parser.cpp                | 24 ++++++------
 libsolutil/Whiskers.cpp                       |  8 ++--
 libyul/AsmParser.cpp                          | 18 ++++-----
 libyul/AsmPrinter.cpp                         |  2 +-
 libyul/ControlFlowSideEffectsCollector.cpp    |  2 +-
 libyul/ObjectParser.cpp                       |  8 ++--
 libyul/backends/evm/ConstantOptimiser.cpp     |  6 +--
 libyul/backends/evm/ControlFlowGraph.h        |  2 +-
 .../backends/evm/ControlFlowGraphBuilder.cpp  |  8 ++--
 libyul/backends/evm/EVMCodeTransform.cpp      | 10 ++---
 libyul/backends/evm/EVMDialect.cpp            |  2 +-
 libyul/backends/evm/EthAssemblyAdapter.cpp    |  2 +-
 .../evm/OptimizedEVMCodeTransform.cpp         |  4 +-
 libyul/backends/evm/StackLayoutGenerator.cpp  | 12 +++---
 libyul/backends/wasm/BinaryTransform.cpp      | 36 +++++++++---------
 libyul/backends/wasm/EVMToEwasmTranslator.cpp |  2 +-
 libyul/backends/wasm/TextTransform.cpp        |  8 ++--
 libyul/backends/wasm/WasmCodeTransform.cpp    | 22 +++++------
 libyul/backends/wasm/WasmDialect.cpp          |  2 +-
 libyul/optimiser/ConditionalSimplifier.h      |  2 +-
 libyul/optimiser/DeadCodeEliminator.h         |  2 +-
 libyul/optimiser/ForLoopInitRewriter.cpp      |  2 +-
 libyul/optimiser/FunctionSpecializer.cpp      | 12 +++---
 libyul/optimiser/KnowledgeBase.cpp            |  2 +-
 libyul/optimiser/NameDispenser.cpp            |  2 +-
 libyul/optimiser/NameSimplifier.cpp           |  2 +-
 libyul/optimiser/ReasoningBasedSimplifier.cpp |  4 +-
 libyul/optimiser/StackCompressor.cpp          |  2 +-
 libyul/optimiser/StackToMemoryMover.cpp       | 32 ++++++++--------
 .../UnusedFunctionParameterPruner.cpp         |  2 +-
 libyul/optimiser/UnusedStoreBase.cpp          | 28 +++++++-------
 libyul/optimiser/UnusedStoreEliminator.cpp    |  2 +-
 test/CommonSyntaxTest.cpp                     |  8 ++--
 test/EVMHost.cpp                              |  2 +-
 test/Metadata.cpp                             |  2 +-
 test/TestCaseReader.cpp                       |  2 +-
 test/libevmasm/Optimiser.cpp                  |  2 +-
 test/liblangutil/Scanner.cpp                  |  4 +-
 test/libsolidity/GasTest.cpp                  |  2 +-
 test/libsolidity/SMTCheckerTest.cpp           |  2 +-
 test/libsolidity/SemanticTest.cpp             |  6 +--
 .../SolidityExecutionFramework.cpp            |  2 +-
 test/libsolidity/util/TestFileParser.cpp      |  2 +-
 test/libyul/ObjectParser.cpp                  |  2 +-
 test/libyul/Parser.cpp                        |  2 +-
 test/solc/Common.cpp                          |  2 +-
 test/yulPhaser/FitnessMetrics.cpp             |  2 +-
 test/yulPhaser/ProgramCache.cpp               |  2 +-
 test/yulPhaser/TestHelpers.cpp                |  2 +-
 tools/yulPhaser/Chromosome.cpp                |  2 +-
 tools/yulPhaser/GeneticAlgorithms.cpp         |  2 +-
 tools/yulPhaser/Mutations.cpp                 |  8 ++--
 tools/yulPhaser/PairSelections.h              |  2 +-
 tools/yulPhaser/Phaser.cpp                    | 38 +++++++++----------
 tools/yulPhaser/Population.cpp                | 14 +++----
 tools/yulPhaser/Program.cpp                   |  6 +--
 tools/yulPhaser/Selections.h                  |  2 +-
 111 files changed, 362 insertions(+), 362 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 43e06ef9ba..8e06da8ae9 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -52,7 +52,7 @@ AssemblyItem const& Assembly::append(AssemblyItem _i)
 {
 	assertThrow(m_deposit >= 0, AssemblyException, "Stack underflow.");
 	m_deposit += static_cast<int>(_i.deposit());
-	m_items.emplace_back(move(_i));
+	m_items.emplace_back(std::move(_i));
 	if (!m_items.back().location().isValid() && m_currentSourceLocation.isValid())
 		m_items.back().setLocation(m_currentSourceLocation);
 	m_items.back().m_modifierDepth = m_currentModifierDepth;
@@ -254,7 +254,7 @@ Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices,
 		if (!data.empty())
 			jsonItem["value"] = data;
 		jsonItem["source"] = sourceIndex;
-		code.append(move(jsonItem));
+		code.append(std::move(jsonItem));
 
 		if (item.type() == AssemblyItemType::Tag)
 		{
@@ -265,7 +265,7 @@ Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices,
 			jumpdest["source"] = sourceIndex;
 			if (item.m_modifierDepth != 0)
 				jumpdest["modifierDepth"] = static_cast<int>(item.m_modifierDepth);
-			code.append(move(jumpdest));
+			code.append(std::move(jumpdest));
 		}
 	}
 	if (_includeSourceList)
@@ -464,7 +464,7 @@ map<u256, u256> const& Assembly::optimiseInternal(
 			}
 			if (optimisedItems.size() < m_items.size())
 			{
-				m_items = move(optimisedItems);
+				m_items = std::move(optimisedItems);
 				count++;
 			}
 		}
@@ -478,7 +478,7 @@ map<u256, u256> const& Assembly::optimiseInternal(
 			*this
 		);
 
-	m_tagReplacements = move(tagReplacements);
+	m_tagReplacements = std::move(tagReplacements);
 	return *m_tagReplacements;
 }
 
diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
index abae23a830..19b275cb6f 100644
--- a/libevmasm/CommonSubexpressionEliminator.cpp
+++ b/libevmasm/CommonSubexpressionEliminator.cpp
@@ -48,8 +48,8 @@ vector<AssemblyItem> CommonSubexpressionEliminator::getOptimizedItems()
 	{
 		m_breakingItem = nullptr;
 		m_storeOperations.clear();
-		m_initialState = move(nextInitialState);
-		m_state = move(nextState);
+		m_initialState = std::move(nextInitialState);
+		m_state = std::move(nextState);
 	});
 
 	map<int, Id> initialStackContents;
diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp
index a639bc6fc4..37ac4c18bd 100644
--- a/libevmasm/ConstantOptimiser.cpp
+++ b/libevmasm/ConstantOptimiser.cpp
@@ -244,8 +244,8 @@ AssemblyItems ComputeMethod::findRepresentation(u256 const& _value)
 			bigint newGas = gasNeeded(newRoutine);
 			if (newGas < bestGas)
 			{
-				bestGas = move(newGas);
-				routine = move(newRoutine);
+				bestGas = std::move(newGas);
+				routine = std::move(newRoutine);
 			}
 		}
 		return routine;
diff --git a/libevmasm/ControlFlowGraph.cpp b/libevmasm/ControlFlowGraph.cpp
index d6d8adf4a3..cb648f90f2 100644
--- a/libevmasm/ControlFlowGraph.cpp
+++ b/libevmasm/ControlFlowGraph.cpp
@@ -236,12 +236,12 @@ void ControlFlowGraph::gatherKnowledge()
 		item.state = _state->copy();
 		item.blocksSeen = _currentItem.blocksSeen;
 		item.blocksSeen.insert(_currentItem.blockId);
-		workQueue.push_back(move(item));
+		workQueue.push_back(std::move(item));
 	};
 
 	while (!workQueue.empty())
 	{
-		WorkQueueItem item = move(workQueue.back());
+		WorkQueueItem item = std::move(workQueue.back());
 		workQueue.pop_back();
 		//@todo we might have to do something like incrementing the sequence number for each JUMPDEST
 		assertThrow(!!item.blockId, OptimizerException, "");
diff --git a/libevmasm/Inliner.cpp b/libevmasm/Inliner.cpp
index 527e6ae388..d365e312a9 100644
--- a/libevmasm/Inliner.cpp
+++ b/libevmasm/Inliner.cpp
@@ -257,7 +257,7 @@ void Inliner::optimise()
 						if (auto exitItem = shouldInline(*tag, nextItem, *inlinableBlock))
 						{
 							newItems += inlinableBlock->items | ranges::views::drop_last(1);
-							newItems.emplace_back(move(*exitItem));
+							newItems.emplace_back(std::move(*exitItem));
 
 							// We are removing one push tag to the block we inline.
 							--inlinableBlock->pushTagCount;
@@ -277,5 +277,5 @@ void Inliner::optimise()
 		newItems.emplace_back(item);
 	}
 
-	m_items = move(newItems);
+	m_items = std::move(newItems);
 }
diff --git a/libevmasm/KnownState.cpp b/libevmasm/KnownState.cpp
index 841affab0a..1e886f7ab0 100644
--- a/libevmasm/KnownState.cpp
+++ b/libevmasm/KnownState.cpp
@@ -252,7 +252,7 @@ void KnownState::reduceToCommonKnowledge(KnownState const& _other, bool _combine
 		map<int, Id> shiftedStack;
 		for (auto const& stackElement: m_stackElements)
 			shiftedStack[stackElement.first - stackDiff] = stackElement.second;
-		m_stackElements = move(shiftedStack);
+		m_stackElements = std::move(shiftedStack);
 		m_stackHeight = _other.m_stackHeight;
 	}
 
@@ -333,7 +333,7 @@ KnownState::StoreOperation KnownState::storeInStorage(
 	for (auto const& storageItem: m_storageContent)
 		if (m_expressionClasses->knownToBeDifferent(storageItem.first, _slot) || storageItem.second == _value)
 			storageContents.insert(storageItem);
-	m_storageContent = move(storageContents);
+	m_storageContent = std::move(storageContents);
 
 	AssemblyItem item(Instruction::SSTORE, _location);
 	Id id = m_expressionClasses->find(item, {_slot, _value}, true, m_sequenceNumber);
@@ -365,7 +365,7 @@ KnownState::StoreOperation KnownState::storeInMemory(Id _slot, Id _value, Source
 	for (auto const& memoryItem: m_memoryContent)
 		if (m_expressionClasses->knownToBeDifferentBy32(memoryItem.first, _slot))
 			memoryContents.insert(memoryItem);
-	m_memoryContent = move(memoryContents);
+	m_memoryContent = std::move(memoryContents);
 
 	AssemblyItem item(Instruction::MSTORE, _location);
 	Id id = m_expressionClasses->find(item, {_slot, _value}, true, m_sequenceNumber);
diff --git a/libevmasm/PathGasMeter.cpp b/libevmasm/PathGasMeter.cpp
index b7c985f1bc..c165985cff 100644
--- a/libevmasm/PathGasMeter.cpp
+++ b/libevmasm/PathGasMeter.cpp
@@ -44,7 +44,7 @@ GasMeter::GasConsumption PathGasMeter::estimateMax(
 	auto path = make_unique<GasPath>();
 	path->index = _startIndex;
 	path->state = _state->copy();
-	queue(move(path));
+	queue(std::move(path));
 
 	GasMeter::GasConsumption gas;
 	while (!m_queue.empty() && !gas.isInfinite)
@@ -60,14 +60,14 @@ void PathGasMeter::queue(std::unique_ptr<GasPath>&& _newPath)
 	)
 		return;
 	m_highestGasUsagePerJumpdest[_newPath->index] = _newPath->gas;
-	m_queue[_newPath->index] = move(_newPath);
+	m_queue[_newPath->index] = std::move(_newPath);
 }
 
 GasMeter::GasConsumption PathGasMeter::handleQueueItem()
 {
 	assertThrow(!m_queue.empty(), OptimizerException, "");
 
-	unique_ptr<GasPath> path = move(m_queue.rbegin()->second);
+	unique_ptr<GasPath> path = std::move(m_queue.rbegin()->second);
 	m_queue.erase(--m_queue.end());
 
 	shared_ptr<KnownState> state = path->state;
@@ -129,7 +129,7 @@ GasMeter::GasConsumption PathGasMeter::handleQueueItem()
 			newPath->largestMemoryAccess = meter.largestMemoryAccess();
 			newPath->state = state->copy();
 			newPath->visitedJumpdests = path->visitedJumpdests;
-			queue(move(newPath));
+			queue(std::move(newPath));
 		}
 
 		if (branchStops)
diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index 630eb06193..c9b5f60531 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -44,7 +44,7 @@ CHCSmtLib2Interface::CHCSmtLib2Interface(
 ):
 	CHCSolverInterface(_queryTimeout),
 	m_smtlib2(make_unique<SMTLib2Interface>(_queryResponses, _smtCallback, m_queryTimeout)),
-	m_queryResponses(move(_queryResponses)),
+	m_queryResponses(std::move(_queryResponses)),
 	m_smtCallback(_smtCallback)
 {
 	reset();
@@ -195,7 +195,7 @@ void CHCSmtLib2Interface::declareFunction(string const& _name, SortPointer const
 
 void CHCSmtLib2Interface::write(string _data)
 {
-	m_accumulatedOutput += move(_data) + "\n";
+	m_accumulatedOutput += std::move(_data) + "\n";
 }
 
 string CHCSmtLib2Interface::querySolver(string const& _input)
diff --git a/libsmtutil/SMTLib2Interface.cpp b/libsmtutil/SMTLib2Interface.cpp
index bd74cf2c98..3e117913aa 100644
--- a/libsmtutil/SMTLib2Interface.cpp
+++ b/libsmtutil/SMTLib2Interface.cpp
@@ -45,8 +45,8 @@ SMTLib2Interface::SMTLib2Interface(
 	optional<unsigned> _queryTimeout
 ):
 	SolverInterface(_queryTimeout),
-	m_queryResponses(move(_queryResponses)),
-	m_smtCallback(move(_smtCallback))
+	m_queryResponses(std::move(_queryResponses)),
+	m_smtCallback(std::move(_smtCallback))
 {
 	reset();
 }
@@ -264,7 +264,7 @@ string SMTLib2Interface::toSmtLibSort(vector<SortPointer> const& _sorts)
 void SMTLib2Interface::write(string _data)
 {
 	smtAssert(!m_accumulatedOutput.empty(), "");
-	m_accumulatedOutput.back() += move(_data) + "\n";
+	m_accumulatedOutput.back() += std::move(_data) + "\n";
 }
 
 string SMTLib2Interface::checkSatAndGetValuesCommand(vector<Expression> const& _expressionsToEvaluate)
diff --git a/libsmtutil/SMTPortfolio.cpp b/libsmtutil/SMTPortfolio.cpp
index aec9b0a1cd..77a404a475 100644
--- a/libsmtutil/SMTPortfolio.cpp
+++ b/libsmtutil/SMTPortfolio.cpp
@@ -41,7 +41,7 @@ SMTPortfolio::SMTPortfolio(
 	SolverInterface(_queryTimeout)
 {
 	if (_enabledSolvers.smtlib2)
-		m_solvers.emplace_back(make_unique<SMTLib2Interface>(move(_smtlib2Responses), move(_smtCallback), m_queryTimeout));
+		m_solvers.emplace_back(make_unique<SMTLib2Interface>(std::move(_smtlib2Responses), std::move(_smtCallback), m_queryTimeout));
 #ifdef HAVE_Z3
 	if (_enabledSolvers.z3 && Z3Interface::available())
 		m_solvers.emplace_back(make_unique<Z3Interface>(m_queryTimeout));
diff --git a/libsmtutil/Z3CHCInterface.cpp b/libsmtutil/Z3CHCInterface.cpp
index 82dca48788..bfbc9841b6 100644
--- a/libsmtutil/Z3CHCInterface.cpp
+++ b/libsmtutil/Z3CHCInterface.cpp
@@ -101,7 +101,7 @@ tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> Z3CHCInterface::que
 		{
 			result = CheckResult::UNSATISFIABLE;
 			auto invariants = m_z3Interface->fromZ3Expr(m_solver.get_answer());
-			return {result, move(invariants), {}};
+			return {result, std::move(invariants), {}};
 		}
 		case z3::check_result::unknown:
 		{
diff --git a/libsolc/libsolc.cpp b/libsolc/libsolc.cpp
index 48cf7e0f88..4ceeeac6fa 100644
--- a/libsolc/libsolc.cpp
+++ b/libsolc/libsolc.cpp
@@ -56,7 +56,7 @@ string takeOverAllocation(char const* _data)
 	for (auto iter = begin(solidityAllocations); iter != end(solidityAllocations); ++iter)
 		if (iter->data() == _data)
 		{
-			string chunk = move(*iter);
+			string chunk = std::move(*iter);
 			solidityAllocations.erase(iter);
 			return chunk;
 		}
@@ -109,7 +109,7 @@ ReadCallback::Callback wrapReadCallback(CStyleReadFileCallback _readCallback, vo
 string compile(string _input, CStyleReadFileCallback _readCallback, void* _readContext)
 {
 	StandardCompiler compiler(wrapReadCallback(_readCallback, _readContext));
-	return compiler.compile(move(_input));
+	return compiler.compile(std::move(_input));
 }
 
 }
diff --git a/libsolidity/analysis/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp
index 6d13243af4..b6cd3eef01 100644
--- a/libsolidity/analysis/DeclarationContainer.cpp
+++ b/libsolidity/analysis/DeclarationContainer.cpp
@@ -210,7 +210,7 @@ void DeclarationContainer::populateHomonyms(back_insert_iterator<Homonyms> _it)
 		ResolvingSettings settings;
 		settings.recursive = true;
 		settings.alsoInvisible = true;
-		vector<Declaration const*> const& declarations = m_enclosingContainer->resolveName(name, move(settings));
+		vector<Declaration const*> const& declarations = m_enclosingContainer->resolveName(name, std::move(settings));
 		if (!declarations.empty())
 			_it = make_pair(location, declarations);
 	}
diff --git a/libsolidity/analysis/FunctionCallGraph.cpp b/libsolidity/analysis/FunctionCallGraph.cpp
index 45da1b4f0d..e941c99c55 100644
--- a/libsolidity/analysis/FunctionCallGraph.cpp
+++ b/libsolidity/analysis/FunctionCallGraph.cpp
@@ -61,7 +61,7 @@ CallGraph FunctionCallGraphBuilder::buildCreationGraph(ContractDefinition const&
 	builder.m_currentNode = CallGraph::SpecialNode::Entry;
 	builder.processQueue();
 
-	return move(builder.m_graph);
+	return std::move(builder.m_graph);
 }
 
 CallGraph FunctionCallGraphBuilder::buildDeployedGraph(
@@ -109,7 +109,7 @@ CallGraph FunctionCallGraphBuilder::buildDeployedGraph(
 	builder.m_currentNode = CallGraph::SpecialNode::Entry;
 	builder.processQueue();
 
-	return move(builder.m_graph);
+	return std::move(builder.m_graph);
 }
 
 bool FunctionCallGraphBuilder::visit(FunctionCall const& _functionCall)
diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index 63a19a4cb9..1b58d3c9ab 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -184,7 +184,7 @@ vector<Declaration const*> NameAndTypeResolver::nameFromCurrentScope(ASTString c
 	ResolvingSettings settings;
 	settings.recursive = true;
 	settings.alsoInvisible = _includeInvisibles;
-	return m_currentScope->resolveName(_name, move(settings));
+	return m_currentScope->resolveName(_name, std::move(settings));
 }
 
 Declaration const* NameAndTypeResolver::pathFromCurrentScope(vector<ASTString> const& _path) const
@@ -204,7 +204,7 @@ std::vector<Declaration const*> NameAndTypeResolver::pathFromCurrentScopeWithAll
 	settings.recursive = true;
 	settings.alsoInvisible = false;
 	settings.onlyVisibleAsUnqualifiedNames = true;
-	vector<Declaration const*> candidates = m_currentScope->resolveName(_path.front(), move(settings));
+	vector<Declaration const*> candidates = m_currentScope->resolveName(_path.front(), std::move(settings));
 
 	for (size_t i = 1; i < _path.size() && candidates.size() == 1; i++)
 	{
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index bf1fef7aa8..50b1656ef8 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -276,7 +276,7 @@ void ReferencesResolver::operator()(yul::Identifier const& _identifier)
 			return;
 		}
 
-	m_yulAnnotation->externalReferences[&_identifier].suffix = move(suffix);
+	m_yulAnnotation->externalReferences[&_identifier].suffix = std::move(suffix);
 	m_yulAnnotation->externalReferences[&_identifier].declaration = declarations.front();
 }
 
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index de3cdc847b..1025e6576f 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1639,7 +1639,7 @@ bool TypeChecker::visit(TupleExpression const& _tuple)
 		if (components.size() == 1)
 			_tuple.annotation().type = type(*components[0]);
 		else
-			_tuple.annotation().type = TypeProvider::tuple(move(types));
+			_tuple.annotation().type = TypeProvider::tuple(std::move(types));
 		// If some of the components are not LValues, the error is reported above.
 		_tuple.annotation().isLValue = true;
 		_tuple.annotation().isPure = false;
@@ -1710,7 +1710,7 @@ bool TypeChecker::visit(TupleExpression const& _tuple)
 			if (components.size() == 1)
 				_tuple.annotation().type = type(*components[0]);
 			else
-				_tuple.annotation().type = TypeProvider::tuple(move(types));
+				_tuple.annotation().type = TypeProvider::tuple(std::move(types));
 		}
 
 		_tuple.annotation().isLValue = false;
@@ -2811,8 +2811,8 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
 		}
 
 		funcCallAnno.type = returnTypes.size() == 1 ?
-			move(returnTypes.front()) :
-			TypeProvider::tuple(move(returnTypes));
+			std::move(returnTypes.front()) :
+			TypeProvider::tuple(std::move(returnTypes));
 
 		break;
 	}
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index 04c47a155f..9cb5ae0f9f 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -239,7 +239,7 @@ vector<ErrorDefinition const*> ContractDefinition::interfaceErrors(bool _require
 		result +=
 			(*annotation().creationCallGraph)->usedErrors +
 			(*annotation().deployedCallGraph)->usedErrors;
-	return util::convertContainer<vector<ErrorDefinition const*>>(move(result));
+	return util::convertContainer<vector<ErrorDefinition const*>>(std::move(result));
 }
 
 vector<pair<util::FixedHash<4>, FunctionTypePointer>> const& ContractDefinition::interfaceFunctionList(bool _includeInheritedFunctions) const
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index e688b66d19..d6e41bb5f0 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -358,7 +358,7 @@ class ImportDirective: public Declaration
 	):
 		Declaration(_id, _location, _unitAlias, std::move(_unitAliasLocation)),
 		m_path(std::move(_path)),
-		m_symbolAliases(move(_symbolAliases))
+		m_symbolAliases(std::move(_symbolAliases))
 	{ }
 
 	void accept(ASTVisitor& _visitor) override;
@@ -1503,7 +1503,7 @@ class InlineAssembly: public Statement
 	):
 		Statement(_id, _location, _docString),
 		m_dialect(_dialect),
-		m_flags(move(_flags)),
+		m_flags(std::move(_flags)),
 		m_operations(std::move(_operations))
 	{}
 	void accept(ASTVisitor& _visitor) override;
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index e7e7a01439..d308cd90ca 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -336,15 +336,15 @@ bool ASTJsonExporter::visit(UsingForDirective const& _node)
 		{
 			Json::Value functionNode;
 			functionNode["function"] = toJson(*function);
-			functionList.append(move(functionNode));
+			functionList.append(std::move(functionNode));
 		}
-		attributes.emplace_back("functionList", move(functionList));
+		attributes.emplace_back("functionList", std::move(functionList));
 	}
 	else
 		attributes.emplace_back("libraryName", toJson(*_node.functionsOrLibrary().front()));
 	attributes.emplace_back("global", _node.global());
 
-	setJsonNode(_node, "UsingForDirective", move(attributes));
+	setJsonNode(_node, "UsingForDirective", std::move(attributes));
 
 	return false;
 }
@@ -518,7 +518,7 @@ bool ASTJsonExporter::visit(ModifierInvocation const& _node)
 		else if (dynamic_cast<ContractDefinition const*>(declaration))
 			attributes.emplace_back("kind", "baseConstructorSpecifier");
 	}
-	setJsonNode(_node, "ModifierInvocation", move(attributes));
+	setJsonNode(_node, "ModifierInvocation", std::move(attributes));
 	return false;
 }
 
@@ -645,9 +645,9 @@ bool ASTJsonExporter::visit(InlineAssembly const& _node)
 				flags.append(*flag);
 			else
 				flags.append(Json::nullValue);
-		attributes.emplace_back(make_pair("flags", move(flags)));
+		attributes.emplace_back(make_pair("flags", std::move(flags)));
 	}
-	setJsonNode(_node, "InlineAssembly", move(attributes));
+	setJsonNode(_node, "InlineAssembly", std::move(attributes));
 
 	return false;
 }
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index df329ae720..96c37003e5 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -299,7 +299,7 @@ ASTPointer<ImportDirective> ASTJsonImporter::createImportDirective(Json::Value c
 		path,
 		unitAlias,
 		createNameSourceLocation(_node),
-		move(symbolAliases)
+		std::move(symbolAliases)
 	);
 
 	astAssert(_node["absolutePath"].isString(), "Expected 'absolutePath' to be a string!");
@@ -391,7 +391,7 @@ ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json::Val
 
 	return createASTNode<UsingForDirective>(
 		_node,
-		move(functions),
+		std::move(functions),
 		!_node.isMember("libraryName"),
 		_node["typeName"].isNull() ? nullptr  : convertJsonToASTNode<TypeName>(_node["typeName"]),
 		memberAsBool(_node, "global")
@@ -686,7 +686,7 @@ ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json::Value con
 		_node,
 		nullOrASTString(_node, "documentation"),
 		dialect,
-		move(flags),
+		std::move(flags),
 		operations
 	);
 }
diff --git a/libsolidity/ast/TypeProvider.cpp b/libsolidity/ast/TypeProvider.cpp
index 97d230d2e4..91d1da4be5 100644
--- a/libsolidity/ast/TypeProvider.cpp
+++ b/libsolidity/ast/TypeProvider.cpp
@@ -404,7 +404,7 @@ TupleType const* TypeProvider::tuple(vector<Type const*> members)
 	if (members.empty())
 		return &m_emptyTuple;
 
-	return createAndGet<TupleType>(move(members));
+	return createAndGet<TupleType>(std::move(members));
 }
 
 ReferenceType const* TypeProvider::withLocation(ReferenceType const* _type, DataLocation _location, bool _isPointer)
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index f88d1afcef..34a6f4268c 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -125,7 +125,7 @@ MemberList::Member::Member(Declaration const* _declaration, Type const* _type):
 {}
 
 MemberList::Member::Member(Declaration const* _declaration, Type const* _type, string _name):
-	name(move(_name)),
+	name(std::move(_name)),
 	type(_type),
 	declaration(_declaration)
 {
@@ -305,7 +305,7 @@ MemberList const& Type::members(ASTNode const* _currentScope) const
 		MemberList::MemberMap members = nativeMembers(_currentScope);
 		if (_currentScope)
 			members += boundFunctions(*this, *_currentScope);
-		m_members[_currentScope] = make_unique<MemberList>(move(members));
+		m_members[_currentScope] = make_unique<MemberList>(std::move(members));
 	}
 	return *m_members[_currentScope];
 }
@@ -2737,7 +2737,7 @@ Type const* TupleType::mobileType() const
 		else
 			mobiles.push_back(nullptr);
 	}
-	return TypeProvider::tuple(move(mobiles));
+	return TypeProvider::tuple(std::move(mobiles));
 }
 
 FunctionType::FunctionType(FunctionDefinition const& _function, Kind _kind):
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index dbd1a17300..f1cc5b6dd7 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -199,7 +199,7 @@ void CompilerContext::appendYulUtilityFunctions(OptimiserSettings const& _optimi
 	if (!code.empty())
 	{
 		appendInlineAssembly(
-			yul::reindent("{\n" + move(code) + "\n}"),
+			yul::reindent("{\n" + std::move(code) + "\n}"),
 			{},
 			m_externallyUsedYulFunctions,
 			true,
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index bdad481731..a89dbb21b8 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -1293,7 +1293,7 @@ bool ContractCompiler::visit(Return const& _return)
 
 		Type const* expectedType;
 		if (expression->annotation().type->category() == Type::Category::Tuple || types.size() != 1)
-			expectedType = TypeProvider::tuple(move(types));
+			expectedType = TypeProvider::tuple(std::move(types));
 		else
 			expectedType = types.front();
 		compileExpression(*expression, expectedType);
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 95087aa02d..3ee8244475 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -71,7 +71,7 @@ Type const* closestType(Type const* _type, Type const* _targetType, bool _isShif
 				solAssert(tempComponents[i], "");
 			}
 		}
-		return TypeProvider::tuple(move(tempComponents));
+		return TypeProvider::tuple(std::move(tempComponents));
 	}
 	else
 		return _targetType->dataStoredIn(DataLocation::Storage) ? _type->mobileType() : _targetType;
@@ -391,7 +391,7 @@ bool ExpressionCompiler::visit(TupleExpression const& _tuple)
 				if (_tuple.annotation().willBeWrittenTo)
 				{
 					solAssert(!!m_currentLValue, "");
-					lvalues.push_back(move(m_currentLValue));
+					lvalues.push_back(std::move(m_currentLValue));
 				}
 			}
 			else if (_tuple.annotation().willBeWrittenTo)
@@ -399,9 +399,9 @@ bool ExpressionCompiler::visit(TupleExpression const& _tuple)
 		if (_tuple.annotation().willBeWrittenTo)
 		{
 			if (_tuple.components().size() == 1)
-				m_currentLValue = move(lvalues[0]);
+				m_currentLValue = std::move(lvalues[0]);
 			else
-				m_currentLValue = make_unique<TupleObject>(m_context, move(lvalues));
+				m_currentLValue = make_unique<TupleObject>(m_context, std::move(lvalues));
 		}
 	}
 	return false;
diff --git a/libsolidity/codegen/ExpressionCompiler.h b/libsolidity/codegen/ExpressionCompiler.h
index b583b8327e..13e1e3106e 100644
--- a/libsolidity/codegen/ExpressionCompiler.h
+++ b/libsolidity/codegen/ExpressionCompiler.h
@@ -151,7 +151,7 @@ void ExpressionCompiler::setLValue(Expression const& _expression, Arguments cons
 	solAssert(!m_currentLValue, "Current LValue not reset before trying to set new one.");
 	std::unique_ptr<LValueType> lvalue = std::make_unique<LValueType>(m_context, _arguments...);
 	if (_expression.annotation().willBeWrittenTo)
-		m_currentLValue = move(lvalue);
+		m_currentLValue = std::move(lvalue);
 	else
 		lvalue->retrieveValue(_expression.location(), true);
 }
diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp
index aa7524c933..2708d319d8 100644
--- a/libsolidity/codegen/LValue.cpp
+++ b/libsolidity/codegen/LValue.cpp
@@ -557,7 +557,7 @@ TupleObject::TupleObject(
 	CompilerContext& _compilerContext,
 	std::vector<std::unique_ptr<LValue>>&& _lvalues
 ):
-	LValue(_compilerContext), m_lvalues(move(_lvalues))
+	LValue(_compilerContext), m_lvalues(std::move(_lvalues))
 {
 }
 
diff --git a/libsolidity/codegen/MultiUseYulFunctionCollector.cpp b/libsolidity/codegen/MultiUseYulFunctionCollector.cpp
index 69d30c6c83..39df884495 100644
--- a/libsolidity/codegen/MultiUseYulFunctionCollector.cpp
+++ b/libsolidity/codegen/MultiUseYulFunctionCollector.cpp
@@ -33,7 +33,7 @@ using namespace solidity::util;
 
 string MultiUseYulFunctionCollector::requestedFunctions()
 {
-	string result = move(m_code);
+	string result = std::move(m_code);
 	m_code.clear();
 	m_requestedFunctions.clear();
 	return result;
@@ -47,7 +47,7 @@ string MultiUseYulFunctionCollector::createFunction(string const& _name, functio
 		string fun = _creator();
 		solAssert(!fun.empty(), "");
 		solAssert(fun.find("function " + _name + "(") != string::npos, "Function not properly named.");
-		m_code += move(fun);
+		m_code += std::move(fun);
 	}
 	return _name;
 }
diff --git a/libsolidity/codegen/ir/IRGenerationContext.cpp b/libsolidity/codegen/ir/IRGenerationContext.cpp
index 5d39bf4b5f..cb1c371dc9 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.cpp
+++ b/libsolidity/codegen/ir/IRGenerationContext.cpp
@@ -121,7 +121,7 @@ void IRGenerationContext::addStateVariable(
 	unsigned _byteOffset
 )
 {
-	m_stateVariables[&_declaration] = make_pair(move(_storageOffset), _byteOffset);
+	m_stateVariables[&_declaration] = make_pair(std::move(_storageOffset), _byteOffset);
 }
 
 string IRGenerationContext::newYulVariable()
@@ -137,12 +137,12 @@ void IRGenerationContext::initializeInternalDispatch(InternalDispatchMap _intern
 		for (auto function: functions)
 			enqueueFunctionForCodeGeneration(*function);
 
-	m_internalDispatchMap = move(_internalDispatch);
+	m_internalDispatchMap = std::move(_internalDispatch);
 }
 
 InternalDispatchMap IRGenerationContext::consumeInternalDispatchMap()
 {
-	InternalDispatchMap internalDispatch = move(m_internalDispatchMap);
+	InternalDispatchMap internalDispatch = std::move(m_internalDispatchMap);
 	m_internalDispatchMap.clear();
 	return internalDispatch;
 }
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 7c76f8344b..a13a353015 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -113,7 +113,7 @@ pair<string, string> IRGenerator::run(
 	}
 	asmStack.optimize();
 
-	return {move(ir), asmStack.print(m_context.soliditySourceProvider())};
+	return {std::move(ir), asmStack.print(m_context.soliditySourceProvider())};
 }
 
 string IRGenerator::generate(
@@ -214,7 +214,7 @@ string IRGenerator::generate(
 	// NOTE: Function pointers can be passed from creation code via storage variables. We need to
 	// get all the functions they could point to into the dispatch functions even if they're never
 	// referenced by name in the deployed code.
-	m_context.initializeInternalDispatch(move(internalDispatchMap));
+	m_context.initializeInternalDispatch(std::move(internalDispatchMap));
 
 	// Do not register immutables to avoid assignment.
 	t("DeployedObject", IRNames::deployedObject(_contract));
@@ -236,8 +236,8 @@ string IRGenerator::generate(
 
 	solAssert(_contract.annotation().creationCallGraph->get() != nullptr, "");
 	solAssert(_contract.annotation().deployedCallGraph->get() != nullptr, "");
-	verifyCallGraph(collectReachableCallables(**_contract.annotation().creationCallGraph), move(creationFunctionList));
-	verifyCallGraph(collectReachableCallables(**_contract.annotation().deployedCallGraph), move(deployedFunctionList));
+	verifyCallGraph(collectReachableCallables(**_contract.annotation().creationCallGraph), std::move(creationFunctionList));
+	verifyCallGraph(collectReachableCallables(**_contract.annotation().deployedCallGraph), std::move(deployedFunctionList));
 
 	return t.render();
 }
@@ -317,7 +317,7 @@ InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefin
 				});
 			}
 
-			templ("cases", move(cases));
+			templ("cases", std::move(cases));
 			return templ.render();
 		});
 	}
@@ -944,7 +944,7 @@ void IRGenerator::generateConstructors(ContractDefinition const& _contract)
 					generateFunctionWithModifierInner(*constructor);
 				}
 			}
-			t("userDefinedConstructorBody", move(body));
+			t("userDefinedConstructorBody", std::move(body));
 
 			return t.render();
 		});
@@ -1117,7 +1117,7 @@ void IRGenerator::resetContext(ContractDefinition const& _contract, ExecutionCon
 		m_context.soliditySourceProvider()
 	);
 	newContext.copyFunctionIDsFrom(m_context);
-	m_context = move(newContext);
+	m_context = std::move(newContext);
 
 	m_context.setMostDerivedContract(_contract);
 	for (auto const& var: ContractType(_contract).stateVariables())
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 5eaeed743b..679510cd68 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -827,17 +827,17 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 				expr = "iszero(" + expr + ")";
 		}
 		else if (op == Token::Equal)
-			expr = "eq(" + move(args) + ")";
+			expr = "eq(" + std::move(args) + ")";
 		else if (op == Token::NotEqual)
-			expr = "iszero(eq(" + move(args) + "))";
+			expr = "iszero(eq(" + std::move(args) + "))";
 		else if (op == Token::GreaterThanOrEqual)
-			expr = "iszero(" + string(isSigned ? "slt(" : "lt(") + move(args) + "))";
+			expr = "iszero(" + string(isSigned ? "slt(" : "lt(") + std::move(args) + "))";
 		else if (op == Token::LessThanOrEqual)
-			expr = "iszero(" + string(isSigned ? "sgt(" : "gt(") + move(args) + "))";
+			expr = "iszero(" + string(isSigned ? "sgt(" : "gt(") + std::move(args) + "))";
 		else if (op == Token::GreaterThan)
-			expr = (isSigned ? "sgt(" : "gt(") + move(args) + ")";
+			expr = (isSigned ? "sgt(" : "gt(") + std::move(args) + ")";
 		else if (op == Token::LessThan)
-			expr = (isSigned ? "slt(" : "lt(") + move(args) + ")";
+			expr = (isSigned ? "slt(" : "lt(") + std::move(args) + ")";
 		else
 			solAssert(false, "Unknown comparison operator.");
 		define(_binOp) << expr << "\n";
@@ -1109,7 +1109,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 			messageArgumentType
 		);
 
-		appendCode() << move(requireOrAssertFunction) << "(" << IRVariable(*arguments[0]).name();
+		appendCode() << std::move(requireOrAssertFunction) << "(" << IRVariable(*arguments[0]).name();
 		if (messageArgumentType && messageArgumentType->sizeOnStack() > 0)
 			appendCode() << ", " << IRVariable(*arguments[1]).commaSeparatedList();
 		appendCode() << ")\n";
diff --git a/libsolidity/formal/ArraySlicePredicate.cpp b/libsolidity/formal/ArraySlicePredicate.cpp
index 85fced9062..f73985f181 100644
--- a/libsolidity/formal/ArraySlicePredicate.cpp
+++ b/libsolidity/formal/ArraySlicePredicate.cpp
@@ -86,6 +86,6 @@ pair<bool, ArraySlicePredicate::SliceData const&> ArraySlicePredicate::create(So
 
 	return {false, m_slicePredicates[tupleName] = {
 		{&slice, &header, &loop},
-		{move(rule1), move(rule2), move(rule3), move(rule4)}
+		{std::move(rule1), std::move(rule2), std::move(rule3), std::move(rule4)}
 	}};
 }
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index bf36187916..0466bfbac4 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -76,7 +76,7 @@ void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<Verificatio
 
 	SMTEncoder::resetSourceAnalysis();
 
-	m_solvedTargets = move(_solvedTargets);
+	m_solvedTargets = std::move(_solvedTargets);
 	m_context.setSolver(m_interface.get());
 	m_context.reset();
 	m_context.setAssertionAccumulation(true);
@@ -686,7 +686,7 @@ pair<vector<smtutil::Expression>, vector<string>> BMC::modelExpressions()
 				expressionName = m_charStreamProvider.charStream(*uf->location().sourceName).text(
 					uf->location()
 				);
-			expressionNames.push_back(move(expressionName));
+			expressionNames.push_back(std::move(expressionName));
 		}
 
 	return {expressionsToEvaluate, expressionNames};
@@ -888,7 +888,7 @@ void BMC::addVerificationTarget(
 	if (_type == VerificationTargetType::ConstantCondition)
 		checkVerificationTarget(target);
 	else
-		m_verificationTargets.emplace_back(move(target));
+		m_verificationTargets.emplace_back(std::move(target));
 }
 
 /// Solving.
@@ -964,7 +964,7 @@ void BMC::checkCondition(
 			message.str(),
 			SecondarySourceLocation().append(modelMessage.str(), SourceLocation{})
 			.append(SMTEncoder::callStackMessage(_callStack))
-			.append(move(secondaryLocation))
+			.append(std::move(secondaryLocation))
 		);
 		break;
 	}
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 267ea92699..3d5c3e6c3b 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1422,7 +1422,7 @@ vector<smtutil::Expression> CHC::currentStateVariables(ContractDefinition const&
 smtutil::Expression CHC::currentEqualInitialVarsConstraints(vector<VariableDeclaration const*> const& _vars) const
 {
 	return fold(_vars, smtutil::Expression(true), [this](auto&& _conj, auto _var) {
-		return move(_conj) && currentValue(*_var) == m_context.variable(*_var)->valueAtIndex(0);
+		return std::move(_conj) && currentValue(*_var) == m_context.variable(*_var)->valueAtIndex(0);
 	});
 }
 
@@ -1566,7 +1566,7 @@ tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query
 			tie(resultNoOpt, invariantNoOpt, cexNoOpt) = m_interface->query(_query);
 
 			if (resultNoOpt == CheckResult::SATISFIABLE)
-				cex = move(cexNoOpt);
+				cex = std::move(cexNoOpt);
 
 			spacer->setSpacerOptions(true);
 		}
@@ -1817,7 +1817,7 @@ void CHC::checkAndReportTarget(
 			predicates.insert(pred);
 		map<Predicate const*, set<string>> invariants = collectInvariants(invariant, predicates, m_settings.invariants);
 		for (auto pred: invariants | ranges::views::keys)
-			m_invariants[pred] += move(invariants.at(pred));
+			m_invariants[pred] += std::move(invariants.at(pred));
 	}
 	else if (result == CheckResult::SATISFIABLE)
 	{
diff --git a/libsolidity/formal/EncodingContext.cpp b/libsolidity/formal/EncodingContext.cpp
index f9edd7db32..2000efd07e 100644
--- a/libsolidity/formal/EncodingContext.cpp
+++ b/libsolidity/formal/EncodingContext.cpp
@@ -211,5 +211,5 @@ void EncodingContext::addAssertion(smtutil::Expression const& _expr)
 	if (m_assertions.empty())
 		m_assertions.push_back(_expr);
 	else
-		m_assertions.back() = _expr && move(m_assertions.back());
+		m_assertions.back() = _expr && std::move(m_assertions.back());
 }
diff --git a/libsolidity/formal/EncodingContext.h b/libsolidity/formal/EncodingContext.h
index 7c001f452b..35e54ed76b 100644
--- a/libsolidity/formal/EncodingContext.h
+++ b/libsolidity/formal/EncodingContext.h
@@ -63,7 +63,7 @@ class EncodingContext
 	smtutil::Expression newVariable(std::string _name, smtutil::SortPointer _sort)
 	{
 		solAssert(m_solver, "");
-		return m_solver->newVariable(move(_name), move(_sort));
+		return m_solver->newVariable(std::move(_name), std::move(_sort));
 	}
 
 	struct IdCompare
diff --git a/libsolidity/formal/Invariants.cpp b/libsolidity/formal/Invariants.cpp
index 10d342ed47..9177a4d431 100644
--- a/libsolidity/formal/Invariants.cpp
+++ b/libsolidity/formal/Invariants.cpp
@@ -55,9 +55,9 @@ map<Predicate const*, set<string>> collectInvariants(
 				auto arg0 = _expr->arguments.at(0);
 				auto arg1 = _expr->arguments.at(1);
 				if (starts_with(arg0.name, t))
-					equalities.insert({arg0.name, {arg0, move(arg1)}});
+					equalities.insert({arg0.name, {arg0, std::move(arg1)}});
 				else if (starts_with(arg1.name, t))
-					equalities.insert({arg1.name, {arg1, move(arg0)}});
+					equalities.insert({arg1.name, {arg1, std::move(arg0)}});
 			}
 		for (auto const& arg: _expr->arguments)
 			_addChild(&arg);
diff --git a/libsolidity/formal/ModelChecker.cpp b/libsolidity/formal/ModelChecker.cpp
index cf7a398ec2..0d624f9e08 100644
--- a/libsolidity/formal/ModelChecker.cpp
+++ b/libsolidity/formal/ModelChecker.cpp
@@ -38,7 +38,7 @@ ModelChecker::ModelChecker(
 	ReadCallback::Callback const& _smtCallback
 ):
 	m_errorReporter(_errorReporter),
-	m_settings(move(_settings)),
+	m_settings(std::move(_settings)),
 	m_context(),
 	m_bmc(m_context, m_uniqueErrorReporter, _smtlib2Responses, _smtCallback, m_settings, _charStreamProvider),
 	m_chc(m_context, m_uniqueErrorReporter, _smtlib2Responses, _smtCallback, m_settings, _charStreamProvider)
diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
index 91513a00c0..d4b6994cf5 100644
--- a/libsolidity/formal/Predicate.cpp
+++ b/libsolidity/formal/Predicate.cpp
@@ -50,13 +50,13 @@ Predicate const* Predicate::create(
 	vector<ScopeOpener const*> _scopeStack
 )
 {
-	smt::SymbolicFunctionVariable predicate{_sort, move(_name), _context};
+	smt::SymbolicFunctionVariable predicate{_sort, std::move(_name), _context};
 	string functorName = predicate.currentName();
 	solAssert(!m_predicates.count(functorName), "");
 	return &m_predicates.emplace(
 		std::piecewise_construct,
 		std::forward_as_tuple(functorName),
-		std::forward_as_tuple(move(predicate), _type, _node, _contractContext, move(_scopeStack))
+		std::forward_as_tuple(std::move(predicate), _type, _node, _contractContext, std::move(_scopeStack))
 	).first->second;
 }
 
@@ -67,7 +67,7 @@ Predicate::Predicate(
 	ContractDefinition const* _contractContext,
 	vector<ScopeOpener const*> _scopeStack
 ):
-	m_predicate(move(_predicate)),
+	m_predicate(std::move(_predicate)),
 	m_type(_type),
 	m_node(_node),
 	m_contractContext(_contractContext),
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 8c5dd647e2..e779fbeb88 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -2977,7 +2977,7 @@ set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contract
 					resolvedFunctions.insert(baseFunction);
 			}
 		}
-		m_contractFunctions.emplace(&_contract, move(resolvedFunctions));
+		m_contractFunctions.emplace(&_contract, std::move(resolvedFunctions));
 	}
 	return m_contractFunctions.at(&_contract);
 }
@@ -2991,7 +2991,7 @@ set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contract
 			for (auto const* baseFun: base->definedFunctions())
 				allFunctions.insert(baseFun);
 
-		m_contractFunctionsWithoutVirtual.emplace(&_contract, move(allFunctions));
+		m_contractFunctionsWithoutVirtual.emplace(&_contract, std::move(allFunctions));
 
 	}
 	return m_contractFunctionsWithoutVirtual.at(&_contract);
diff --git a/libsolidity/formal/SymbolicState.cpp b/libsolidity/formal/SymbolicState.cpp
index b1fd7978fa..0679cee8ab 100644
--- a/libsolidity/formal/SymbolicState.cpp
+++ b/libsolidity/formal/SymbolicState.cpp
@@ -32,8 +32,8 @@ BlockchainVariable::BlockchainVariable(
 	map<string, smtutil::SortPointer> _members,
 	EncodingContext& _context
 ):
-	m_name(move(_name)),
-	m_members(move(_members)),
+	m_name(std::move(_name)),
+	m_members(std::move(_members)),
 	m_context(_context)
 {
 	vector<string> members;
@@ -94,12 +94,12 @@ smtutil::Expression SymbolicState::balance() const
 
 smtutil::Expression SymbolicState::balance(smtutil::Expression _address) const
 {
-	return smtutil::Expression::select(balances(), move(_address));
+	return smtutil::Expression::select(balances(), std::move(_address));
 }
 
 smtutil::Expression SymbolicState::blockhash(smtutil::Expression _blockNumber) const
 {
-	return smtutil::Expression::select(m_tx.member("blockhash"), move(_blockNumber));
+	return smtutil::Expression::select(m_tx.member("blockhash"), std::move(_blockNumber));
 }
 
 void SymbolicState::newBalances()
@@ -114,13 +114,13 @@ void SymbolicState::transfer(smtutil::Expression _from, smtutil::Expression _to,
 {
 	unsigned indexBefore = m_state.index();
 	addBalance(_from, 0 - _value);
-	addBalance(_to, move(_value));
+	addBalance(_to, std::move(_value));
 	unsigned indexAfter = m_state.index();
 	solAssert(indexAfter > indexBefore, "");
 	m_state.newVar();
 	/// Do not apply the transfer operation if _from == _to.
 	auto newState = smtutil::Expression::ite(
-		move(_from) == move(_to),
+		std::move(_from) == std::move(_to),
 		m_state.value(indexBefore),
 		m_state.value(indexAfter)
 	);
@@ -132,7 +132,7 @@ void SymbolicState::addBalance(smtutil::Expression _address, smtutil::Expression
 	auto newBalances = smtutil::Expression::store(
 		balances(),
 		_address,
-		balance(_address) + move(_value)
+		balance(_address) + std::move(_value)
 	);
 	m_state.assignMember("balances", newBalances);
 }
@@ -322,7 +322,7 @@ void SymbolicState::buildABIFunctions(set<FunctionCall const*> const& _abiFuncti
 		functions[name] = functionSort;
 	}
 
-	m_abi = make_unique<BlockchainVariable>("abi", move(functions), m_context);
+	m_abi = make_unique<BlockchainVariable>("abi", std::move(functions), m_context);
 }
 
 smtutil::Expression SymbolicState::abiFunction(frontend::FunctionCall const* _funCall)
diff --git a/libsolidity/formal/SymbolicVariables.cpp b/libsolidity/formal/SymbolicVariables.cpp
index f0fa7df861..799ac4adb4 100644
--- a/libsolidity/formal/SymbolicVariables.cpp
+++ b/libsolidity/formal/SymbolicVariables.cpp
@@ -38,7 +38,7 @@ SymbolicVariable::SymbolicVariable(
 ):
 	m_type(_type),
 	m_originalType(_originalType),
-	m_uniqueName(move(_uniqueName)),
+	m_uniqueName(std::move(_uniqueName)),
 	m_context(_context),
 	m_ssa(make_unique<SSAVariable>())
 {
@@ -52,8 +52,8 @@ SymbolicVariable::SymbolicVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	m_sort(move(_sort)),
-	m_uniqueName(move(_uniqueName)),
+	m_sort(std::move(_sort)),
+	m_uniqueName(std::move(_uniqueName)),
 	m_context(_context),
 	m_ssa(make_unique<SSAVariable>())
 {
@@ -108,7 +108,7 @@ SymbolicBoolVariable::SymbolicBoolVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicVariable(_type, _type, move(_uniqueName), _context)
+	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
 {
 	solAssert(m_type->category() == frontend::Type::Category::Bool, "");
 }
@@ -119,7 +119,7 @@ SymbolicIntVariable::SymbolicIntVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicVariable(_type, _originalType, move(_uniqueName), _context)
+	SymbolicVariable(_type, _originalType, std::move(_uniqueName), _context)
 {
 	solAssert(isNumber(*m_type), "");
 }
@@ -128,7 +128,7 @@ SymbolicAddressVariable::SymbolicAddressVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicIntVariable(TypeProvider::uint(160), TypeProvider::uint(160), move(_uniqueName), _context)
+	SymbolicIntVariable(TypeProvider::uint(160), TypeProvider::uint(160), std::move(_uniqueName), _context)
 {
 }
 
@@ -138,7 +138,7 @@ SymbolicFixedBytesVariable::SymbolicFixedBytesVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicIntVariable(TypeProvider::uint(_numBytes * 8), _originalType, move(_uniqueName), _context)
+	SymbolicIntVariable(TypeProvider::uint(_numBytes * 8), _originalType, std::move(_uniqueName), _context)
 {
 }
 
@@ -147,7 +147,7 @@ SymbolicFunctionVariable::SymbolicFunctionVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicVariable(_type, _type, move(_uniqueName), _context),
+	SymbolicVariable(_type, _type, std::move(_uniqueName), _context),
 	m_declaration(m_context.newVariable(currentName(), m_sort))
 {
 	solAssert(m_type->category() == frontend::Type::Category::Function, "");
@@ -158,7 +158,7 @@ SymbolicFunctionVariable::SymbolicFunctionVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicVariable(move(_sort), move(_uniqueName), _context),
+	SymbolicVariable(std::move(_sort), std::move(_uniqueName), _context),
 	m_declaration(m_context.newVariable(currentName(), m_sort))
 {
 	solAssert(m_sort->kind == Kind::Function, "");
@@ -219,7 +219,7 @@ SymbolicEnumVariable::SymbolicEnumVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicVariable(_type, _type, move(_uniqueName), _context)
+	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
 {
 	solAssert(isEnum(*m_type), "");
 }
@@ -229,7 +229,7 @@ SymbolicTupleVariable::SymbolicTupleVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicVariable(_type, _type, move(_uniqueName), _context)
+	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
 {
 	solAssert(isTuple(*m_type), "");
 }
@@ -239,7 +239,7 @@ SymbolicTupleVariable::SymbolicTupleVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicVariable(move(_sort), move(_uniqueName), _context)
+	SymbolicVariable(std::move(_sort), std::move(_uniqueName), _context)
 {
 	solAssert(m_sort->kind == Kind::Tuple, "");
 }
@@ -288,7 +288,7 @@ SymbolicArrayVariable::SymbolicArrayVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicVariable(_type, _originalType, move(_uniqueName), _context),
+	SymbolicVariable(_type, _originalType, std::move(_uniqueName), _context),
 	m_pair(
 		smtSort(*_type),
 		m_uniqueName + "_length_pair",
@@ -303,7 +303,7 @@ SymbolicArrayVariable::SymbolicArrayVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicVariable(move(_sort), move(_uniqueName), _context),
+	SymbolicVariable(std::move(_sort), std::move(_uniqueName), _context),
 	m_pair(
 		std::make_shared<TupleSort>(
 			"array_length_pair",
@@ -346,7 +346,7 @@ SymbolicStructVariable::SymbolicStructVariable(
 	string _uniqueName,
 	EncodingContext& _context
 ):
-	SymbolicVariable(_type, _type, move(_uniqueName), _context)
+	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
 {
 	solAssert(isNonRecursiveStruct(*m_type), "");
 	auto const* structType = dynamic_cast<StructType const*>(_type);
diff --git a/libsolidity/interface/ABI.cpp b/libsolidity/interface/ABI.cpp
index eab1801c6a..cbfa361227 100644
--- a/libsolidity/interface/ABI.cpp
+++ b/libsolidity/interface/ABI.cpp
@@ -134,7 +134,7 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
 				formatType(p->name(), *type, *p->annotation().type, false)
 			);
 		}
-		abi.emplace(move(errorJson));
+		abi.emplace(std::move(errorJson));
 	}
 
 	Json::Value abiJson{Json::arrayValue};
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index c53bf93216..702d5a0d20 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -208,7 +208,7 @@ void CompilerStack::setRemappings(vector<ImportRemapper::Remapping> _remappings)
 		solThrow(CompilerError, "Must set remappings before parsing.");
 	for (auto const& remapping: _remappings)
 		solAssert(!remapping.prefix.empty(), "");
-	m_importRemapper.setRemappings(move(_remappings));
+	m_importRemapper.setRemappings(std::move(_remappings));
 }
 
 void CompilerStack::setViaIR(bool _viaIR)
@@ -407,7 +407,7 @@ void CompilerStack::importASTs(map<string, Json::Value> const& _sources)
 			src.first,
 			true // imported from AST
 		);
-		m_sources[path] = move(source);
+		m_sources[path] = std::move(source);
 	}
 	m_stackState = ParsedAndImported;
 	m_importedSources = true;
@@ -793,7 +793,7 @@ Json::Value CompilerStack::generatedSources(string const& _contractName, bool _r
 				sources[0]["name"] = sourceName;
 				sources[0]["id"] = sourceIndex;
 				sources[0]["language"] = "Yul";
-				sources[0]["contents"] = move(source);
+				sources[0]["contents"] = std::move(source);
 
 			}
 		}
diff --git a/libsolidity/interface/ImportRemapper.cpp b/libsolidity/interface/ImportRemapper.cpp
index 9d55610132..4d4fa42d45 100644
--- a/libsolidity/interface/ImportRemapper.cpp
+++ b/libsolidity/interface/ImportRemapper.cpp
@@ -35,7 +35,7 @@ void ImportRemapper::setRemappings(vector<Remapping> _remappings)
 {
 	for (auto const& remapping: _remappings)
 		solAssert(!remapping.prefix.empty(), "");
-	m_remappings = move(_remappings);
+	m_remappings = std::move(_remappings);
 }
 
 SourceUnitName ImportRemapper::apply(ImportPath const& _path, string const& _context) const
diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp
index 4496904937..566b676078 100644
--- a/libsolidity/interface/Natspec.cpp
+++ b/libsolidity/interface/Natspec.cpp
@@ -92,7 +92,7 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
 		{
 			Json::Value errorDoc{Json::objectValue};
 			errorDoc["notice"] = value;
-			doc["errors"][error->functionType(true)->externalSignature()].append(move(errorDoc));
+			doc["errors"][error->functionType(true)->externalSignature()].append(std::move(errorDoc));
 		}
 	}
 
@@ -140,10 +140,10 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
 			);
 
 			if (!jsonReturn.empty())
-				method["returns"] = move(jsonReturn);
+				method["returns"] = std::move(jsonReturn);
 
 			if (!method.empty())
-				doc["methods"][it.second->externalSignature()] = move(method);
+				doc["methods"][it.second->externalSignature()] = std::move(method);
 		}
 	}
 
@@ -230,7 +230,7 @@ Json::Value Natspec::extractCustomDoc(multimap<string, DocTag> const& _tags)
 		return Json::nullValue;
 	Json::Value result{Json::objectValue};
 	for (auto& [tag, value]: concatenated)
-		result[tag] = move(value);
+		result[tag] = std::move(value);
 	return result;
 }
 
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 24bcddba9c..c6cd741c15 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -403,7 +403,7 @@ Json::Value collectEVMObject(
 	if (_runtimeObject && _artifactRequested("immutableReferences"))
 		output["immutableReferences"] = formatImmutableReferences(_object.immutableReferences);
 	if (_artifactRequested("generatedSources"))
-		output["generatedSources"] = move(_generatedSources);
+		output["generatedSources"] = std::move(_generatedSources);
 	return output;
 }
 
@@ -966,7 +966,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 			if (sourceContracts[source].empty())
 				return formatFatalError("JSONError", "Source contracts must be a non-empty array.");
 		}
-		ret.modelCheckerSettings.contracts = {move(sourceContracts)};
+		ret.modelCheckerSettings.contracts = {std::move(sourceContracts)};
 	}
 
 	if (modelCheckerSettings.isMember("divModNoSlacks"))
@@ -1076,7 +1076,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	compilerStack.setViaIR(_inputsAndSettings.viaIR);
 	compilerStack.setEVMVersion(_inputsAndSettings.evmVersion);
 	compilerStack.setParserErrorRecovery(_inputsAndSettings.parserErrorRecovery);
-	compilerStack.setRemappings(move(_inputsAndSettings.remappings));
+	compilerStack.setRemappings(std::move(_inputsAndSettings.remappings));
 	compilerStack.setOptimiserSettings(std::move(_inputsAndSettings.optimiserSettings));
 	compilerStack.setRevertStringBehaviour(_inputsAndSettings.revertStrings);
 	if (_inputsAndSettings.debugInfoSelection.has_value())
@@ -1582,7 +1582,7 @@ Json::Value StandardCompiler::formatFunctionDebugData(
 			fun["entryPoint"] = Json::nullValue;
 		fun["parameterSlots"] = Json::UInt64(info.params);
 		fun["returnSlots"] = Json::UInt64(info.returns);
-		ret[name] = move(fun);
+		ret[name] = std::move(fun);
 	}
 
 	return ret;
diff --git a/libsolidity/interface/StorageLayout.cpp b/libsolidity/interface/StorageLayout.cpp
index 74d7ccf4bb..76c840db57 100644
--- a/libsolidity/interface/StorageLayout.cpp
+++ b/libsolidity/interface/StorageLayout.cpp
@@ -40,8 +40,8 @@ Json::Value StorageLayout::generate(ContractDefinition const& _contractDef)
 		variables.append(generate(*var, slot, offset));
 
 	Json::Value layout;
-	layout["storage"] = move(variables);
-	layout["types"] = move(m_types);
+	layout["storage"] = std::move(variables);
+	layout["types"] = std::move(m_types);
 	return layout;
 }
 
@@ -81,7 +81,7 @@ void StorageLayout::generate(Type const* _type)
 			auto const& offsets = structType->storageOffsetsOfMember(member->name());
 			members.append(generate(*member, offsets.first, offsets.second));
 		}
-		typeInfo["members"] = move(members);
+		typeInfo["members"] = std::move(members);
 		typeInfo["encoding"] = "inplace";
 	}
 	else if (auto mappingType = dynamic_cast<MappingType const*>(_type))
diff --git a/libsolidity/lsp/FileRepository.cpp b/libsolidity/lsp/FileRepository.cpp
index 58bc0bf8de..4e8ebbb123 100644
--- a/libsolidity/lsp/FileRepository.cpp
+++ b/libsolidity/lsp/FileRepository.cpp
@@ -62,7 +62,7 @@ string FileRepository::sourceUnitNameToUri(string const& _sourceUnitName) const
 		if (!regex_search(inputPath, windowsDriveLetterPath))
 			return inputPath;
 		else
-			return "/" + move(inputPath);
+			return "/" + std::move(inputPath);
 	};
 
 	if (m_sourceUnitNamesToUri.count(_sourceUnitName))
@@ -124,7 +124,7 @@ Result<boost::filesystem::path> FileRepository::tryResolvePath(std::string const
 		boost::filesystem::path canonicalPath = boost::filesystem::path(prefix) / boost::filesystem::path(_strippedSourceUnitName);
 
 		if (boost::filesystem::exists(canonicalPath))
-			candidates.push_back(move(canonicalPath));
+			candidates.push_back(std::move(canonicalPath));
 	}
 
 	if (candidates.empty())
@@ -169,7 +169,7 @@ frontend::ReadCallback::Result FileRepository::readFile(string const& _kind, str
 		auto contents = readFileAsString(resolvedPath.get());
 		solAssert(m_sourceCodes.count(_sourceUnitName) == 0, "");
 		m_sourceCodes[_sourceUnitName] = contents;
-		return ReadCallback::Result{true, move(contents)};
+		return ReadCallback::Result{true, std::move(contents)};
 	}
 	catch (std::exception const& _exception)
 	{
diff --git a/libsolidity/lsp/GotoDefinition.cpp b/libsolidity/lsp/GotoDefinition.cpp
index 26fb686dbb..532792c177 100644
--- a/libsolidity/lsp/GotoDefinition.cpp
+++ b/libsolidity/lsp/GotoDefinition.cpp
@@ -44,13 +44,13 @@ void GotoDefinition::operator()(MessageID _id, Json::Value const& _args)
 		// Handles all expressions that can have one or more declaration annotation.
 		if (auto const* declaration = referencedDeclaration(expression))
 			if (auto location = declarationLocation(declaration))
-				locations.emplace_back(move(location.value()));
+				locations.emplace_back(std::move(location.value()));
 	}
 	else if (auto const* identifierPath = dynamic_cast<IdentifierPath const*>(sourceNode))
 	{
 		if (auto const* declaration = identifierPath->annotation().referencedDeclaration)
 			if (auto location = declarationLocation(declaration))
-				locations.emplace_back(move(location.value()));
+				locations.emplace_back(std::move(location.value()));
 	}
 	else if (auto const* importDirective = dynamic_cast<ImportDirective const*>(sourceNode))
 	{
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 65eeaf3d50..ce68dbef35 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -202,7 +202,7 @@ void LanguageServer::changeConfiguration(Json::Value const& _settings)
 				else
 					typeFailureCount++;
 			}
-			m_fileRepository.setIncludePaths(move(includePaths));
+			m_fileRepository.setIncludePaths(std::move(includePaths));
 		}
 		else
 			++typeFailureCount;
@@ -289,7 +289,7 @@ void LanguageServer::compileAndUpdateDiagnostics()
 		string message = error->typeName() + ":";
 		if (string const* comment = error->comment())
 			message += " " + *comment;
-		jsonDiag["message"] = move(message);
+		jsonDiag["message"] = std::move(message);
 		jsonDiag["range"] = toRange(*location);
 
 		if (auto const* secondary = error->secondarySourceLocation())
@@ -318,8 +318,8 @@ void LanguageServer::compileAndUpdateDiagnostics()
 		params["uri"] = m_fileRepository.sourceUnitNameToUri(sourceUnitName);
 		if (!diagnostics.empty())
 			m_nonemptyDiagnostics.insert(sourceUnitName);
-		params["diagnostics"] = move(diagnostics);
-		m_client.notify("textDocument/publishDiagnostics", move(params));
+		params["diagnostics"] = std::move(diagnostics);
+		m_client.notify("textDocument/publishDiagnostics", std::move(params));
 	}
 }
 
@@ -418,7 +418,7 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	replyArgs["capabilities"]["semanticTokensProvider"]["full"] = true; // XOR requests.full.delta = true
 	replyArgs["capabilities"]["renameProvider"] = true;
 
-	m_client.reply(_id, move(replyArgs));
+	m_client.reply(_id, std::move(replyArgs));
 }
 
 void LanguageServer::handleInitialized(MessageID, Json::Value const&)
@@ -480,7 +480,7 @@ void LanguageServer::handleTextDocumentDidOpen(Json::Value const& _args)
 	string text = _args["textDocument"]["text"].asString();
 	string uri = _args["textDocument"]["uri"].asString();
 	m_openFiles.insert(uri);
-	m_fileRepository.setSourceByUri(uri, move(text));
+	m_fileRepository.setSourceByUri(uri, std::move(text));
 	compileAndUpdateDiagnostics();
 }
 
@@ -516,10 +516,10 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 			);
 
 			string buffer = m_fileRepository.sourceUnits().at(sourceUnitName);
-			buffer.replace(static_cast<size_t>(change->start), static_cast<size_t>(change->end - change->start), move(text));
-			text = move(buffer);
+			buffer.replace(static_cast<size_t>(change->start), static_cast<size_t>(change->end - change->start), std::move(text));
+			text = std::move(buffer);
 		}
-		m_fileRepository.setSourceByUri(uri, move(text));
+		m_fileRepository.setSourceByUri(uri, std::move(text));
 	}
 
 	compileAndUpdateDiagnostics();
diff --git a/libsolidity/lsp/Transport.cpp b/libsolidity/lsp/Transport.cpp
index 90c0b20a7a..5af723128a 100644
--- a/libsolidity/lsp/Transport.cpp
+++ b/libsolidity/lsp/Transport.cpp
@@ -67,7 +67,7 @@ optional<Json::Value> Transport::receive()
 		return nullopt;
 	}
 
-	return {move(jsonMessage)};
+	return {std::move(jsonMessage)};
 }
 
 void Transport::trace(std::string _message, Json::Value _extra)
@@ -76,9 +76,9 @@ void Transport::trace(std::string _message, Json::Value _extra)
 	{
 		Json::Value params;
 		if (_extra.isObject())
-			params = move(_extra);
-		params["message"] = move(_message);
-		notify("$/logTrace", move(params));
+			params = std::move(_extra);
+		params["message"] = std::move(_message);
+		notify("$/logTrace", std::move(params));
 	}
 }
 
@@ -101,30 +101,30 @@ optional<map<string, string>> Transport::parseHeaders()
 		if (!headers.emplace(boost::trim_copy(name), boost::trim_copy(value)).second)
 			return nullopt;
 	}
-	return {move(headers)};
+	return {std::move(headers)};
 }
 
 void Transport::notify(string _method, Json::Value _message)
 {
 	Json::Value json;
-	json["method"] = move(_method);
-	json["params"] = move(_message);
-	send(move(json));
+	json["method"] = std::move(_method);
+	json["params"] = std::move(_message);
+	send(std::move(json));
 }
 
 void Transport::reply(MessageID _id, Json::Value _message)
 {
 	Json::Value json;
-	json["result"] = move(_message);
-	send(move(json), _id);
+	json["result"] = std::move(_message);
+	send(std::move(json), _id);
 }
 
 void Transport::error(MessageID _id, ErrorCode _code, string _message)
 {
 	Json::Value json;
 	json["error"]["code"] = static_cast<int>(_code);
-	json["error"]["message"] = move(_message);
-	send(move(json), _id);
+	json["error"]["message"] = std::move(_message);
+	send(std::move(json), _id);
 }
 
 void Transport::send(Json::Value _json, MessageID _id)
diff --git a/libsolidity/parsing/DocStringParser.cpp b/libsolidity/parsing/DocStringParser.cpp
index 5c07950edc..7e6e158b76 100644
--- a/libsolidity/parsing/DocStringParser.cpp
+++ b/libsolidity/parsing/DocStringParser.cpp
@@ -116,7 +116,7 @@ multimap<string, DocTag> DocStringParser::parse()
 			currPos = nlPos + 1;
 		}
 	}
-	return move(m_docTags);
+	return std::move(m_docTags);
 }
 
 DocStringParser::iter DocStringParser::parseDocTagLine(iter _pos, iter _end, bool _appending)
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 9ccb1aca38..afa70609d9 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -274,7 +274,7 @@ ASTPointer<ImportDirective> Parser::parseImportDirective()
 					expectToken(Token::As);
 					tie(alias, aliasLocation) = expectIdentifierWithLocation();
 				}
-				symbolAliases.emplace_back(ImportDirective::SymbolAlias{move(id), move(alias), aliasLocation});
+				symbolAliases.emplace_back(ImportDirective::SymbolAlias{std::move(id), std::move(alias), aliasLocation});
 				if (m_scanner->currentToken() != Token::Comma)
 					break;
 				advance();
@@ -302,7 +302,7 @@ ASTPointer<ImportDirective> Parser::parseImportDirective()
 		fatalParserError(6326_error, "Import path cannot be empty.");
 	nodeFactory.markEndPosition();
 	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<ImportDirective>(path, unitAlias, unitAliasLocation, move(symbolAliases));
+	return nodeFactory.createNode<ImportDirective>(path, unitAlias, unitAliasLocation, std::move(symbolAliases));
 }
 
 std::pair<ContractKind, bool> Parser::parseContractKind()
@@ -496,7 +496,7 @@ ASTPointer<OverrideSpecifier> Parser::parseOverrideSpecifier()
 		expectToken(Token::RParen);
 	}
 
-	return nodeFactory.createNode<OverrideSpecifier>(move(overrides));
+	return nodeFactory.createNode<OverrideSpecifier>(std::move(overrides));
 }
 
 StateMutability Parser::parseStateMutability()
@@ -686,7 +686,7 @@ ASTPointer<StructDefinition> Parser::parseStructDefinition()
 	}
 	nodeFactory.markEndPosition();
 	expectToken(Token::RBrace);
-	return nodeFactory.createNode<StructDefinition>(move(name), move(nameLocation), move(members));
+	return nodeFactory.createNode<StructDefinition>(std::move(name), std::move(nameLocation), std::move(members));
 }
 
 ASTPointer<EnumValue> Parser::parseEnumValue()
@@ -918,7 +918,7 @@ pair<ASTPointer<ASTString>, SourceLocation> Parser::expectIdentifierWithLocation
 	SourceLocation nameLocation = currentLocation();
 	ASTPointer<ASTString> name = expectIdentifierToken();
 
-	return {move(name), move(nameLocation)};
+	return {std::move(name), std::move(nameLocation)};
 }
 
 ASTPointer<EventDefinition> Parser::parseEventDefinition()
@@ -957,7 +957,7 @@ ASTPointer<ErrorDefinition> Parser::parseErrorDefinition()
 	ASTPointer<ParameterList> parameters = parseParameterList({});
 	nodeFactory.markEndPosition();
 	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<ErrorDefinition>(name, move(nameLocation), documentation, parameters);
+	return nodeFactory.createNode<ErrorDefinition>(name, std::move(nameLocation), documentation, parameters);
 }
 
 ASTPointer<UsingForDirective> Parser::parseUsingDirective()
@@ -996,7 +996,7 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 	}
 	nodeFactory.markEndPosition();
 	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<UsingForDirective>(move(functions), usesBraces, typeName, global);
+	return nodeFactory.createNode<UsingForDirective>(std::move(functions), usesBraces, typeName, global);
 }
 
 ASTPointer<ModifierInvocation> Parser::parseModifierInvocation()
@@ -1014,7 +1014,7 @@ ASTPointer<ModifierInvocation> Parser::parseModifierInvocation()
 	}
 	else
 		nodeFactory.setEndPositionFromNode(name);
-	return nodeFactory.createNode<ModifierInvocation>(name, move(arguments));
+	return nodeFactory.createNode<ModifierInvocation>(name, std::move(arguments));
 }
 
 ASTPointer<Identifier> Parser::parseIdentifier()
@@ -1052,7 +1052,7 @@ ASTPointer<UserDefinedValueTypeDefinition> Parser::parseUserDefinedValueTypeDefi
 	expectToken(Token::Semicolon);
 	return nodeFactory.createNode<UserDefinedValueTypeDefinition>(
 		name,
-		move(nameLocation),
+		std::move(nameLocation),
 		typeName
 	);
 }
@@ -1377,7 +1377,7 @@ ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> con
 		BOOST_THROW_EXCEPTION(FatalError());
 
 	location.end = nativeLocationOf(*block).end;
-	return make_shared<InlineAssembly>(nextID(), location, _docString, dialect, move(flags), block);
+	return make_shared<InlineAssembly>(nextID(), location, _docString, dialect, std::move(flags), block);
 }
 
 ASTPointer<IfStatement> Parser::parseIfStatement(ASTPointer<ASTString> const& _docString)
@@ -1710,9 +1710,9 @@ pair<Parser::LookAheadInfo, Parser::IndexAccessedPath> Parser::tryParseIndexAcce
 	IndexAccessedPath iap = parseIndexAccessedPath();
 
 	if (m_scanner->currentToken() == Token::Identifier || TokenTraits::isLocationSpecifier(m_scanner->currentToken()))
-		return make_pair(LookAheadInfo::VariableDeclaration, move(iap));
+		return make_pair(LookAheadInfo::VariableDeclaration, std::move(iap));
 	else
-		return make_pair(LookAheadInfo::Expression, move(iap));
+		return make_pair(LookAheadInfo::Expression, std::move(iap));
 }
 
 ASTPointer<VariableDeclarationStatement> Parser::parseVariableDeclarationStatement(
diff --git a/libsolutil/Whiskers.cpp b/libsolutil/Whiskers.cpp
index 340527bdd1..043f2dd76e 100644
--- a/libsolutil/Whiskers.cpp
+++ b/libsolutil/Whiskers.cpp
@@ -32,7 +32,7 @@ using namespace std;
 using namespace solidity::util;
 
 Whiskers::Whiskers(string _template):
-	m_template(move(_template))
+	m_template(std::move(_template))
 {
 }
 
@@ -41,7 +41,7 @@ Whiskers& Whiskers::operator()(string _parameter, string _value)
 	checkParameterValid(_parameter);
 	checkParameterUnknown(_parameter);
 	checkTemplateContainsTags(_parameter, {""});
-	m_parameters[move(_parameter)] = move(_value);
+	m_parameters[std::move(_parameter)] = std::move(_value);
 	return *this;
 }
 
@@ -50,7 +50,7 @@ Whiskers& Whiskers::operator()(string _parameter, bool _value)
 	checkParameterValid(_parameter);
 	checkParameterUnknown(_parameter);
 	checkTemplateContainsTags(_parameter, {"?", "/"});
-	m_conditions[move(_parameter)] = _value;
+	m_conditions[std::move(_parameter)] = _value;
 	return *this;
 }
 
@@ -65,7 +65,7 @@ Whiskers& Whiskers::operator()(
 	for (auto const& element: _values)
 		for (auto const& val: element)
 			checkParameterValid(val.first);
-	m_listParameters[move(_listParameter)] = move(_values);
+	m_listParameters[std::move(_listParameter)] = std::move(_values);
 	return *this;
 }
 
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index ba4bf11157..8043c758a2 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -88,7 +88,7 @@ void Parser::updateLocationEndFrom(
 			DebugData updatedDebugData = *_debugData;
 			updatedDebugData.nativeLocation.end = _location.end;
 			updatedDebugData.originLocation.end = _location.end;
-			_debugData = make_shared<DebugData const>(move(updatedDebugData));
+			_debugData = make_shared<DebugData const>(std::move(updatedDebugData));
 			break;
 		}
 		case UseSourceLocationFrom::LocationOverride:
@@ -98,7 +98,7 @@ void Parser::updateLocationEndFrom(
 		{
 			DebugData updatedDebugData = *_debugData;
 			updatedDebugData.nativeLocation.end = _location.end;
-			_debugData = make_shared<DebugData const>(move(updatedDebugData));
+			_debugData = make_shared<DebugData const>(std::move(updatedDebugData));
 			break;
 		}
 	}
@@ -246,7 +246,7 @@ optional<pair<string_view, SourceLocation>> Parser::parseSrcComment(
 	{
 		shared_ptr<string const> sourceName = m_sourceNames->at(static_cast<unsigned>(sourceIndex.value()));
 		solAssert(sourceName, "");
-		return {{tail, SourceLocation{start.value(), end.value(), move(sourceName)}}};
+		return {{tail, SourceLocation{start.value(), end.value(), std::move(sourceName)}}};
 	}
 	return {{tail, SourceLocation{}}};
 }
@@ -313,7 +313,7 @@ Statement Parser::parseStatement()
 		_if.condition = make_unique<Expression>(parseExpression());
 		_if.body = parseBlock();
 		updateLocationEndFrom(_if.debugData, nativeLocationOf(_if.body));
-		return Statement{move(_if)};
+		return Statement{std::move(_if)};
 	}
 	case Token::Switch:
 	{
@@ -331,7 +331,7 @@ Statement Parser::parseStatement()
 		if (_switch.cases.empty())
 			fatalParserError(2418_error, "Switch statement without any cases.");
 		updateLocationEndFrom(_switch.debugData, nativeLocationOf(_switch.cases.back().body));
-		return Statement{move(_switch)};
+		return Statement{std::move(_switch)};
 	}
 	case Token::For:
 		return parseForLoop();
@@ -371,7 +371,7 @@ Statement Parser::parseStatement()
 	case Token::LParen:
 	{
 		Expression expr = parseCall(std::move(elementary));
-		return ExpressionStatement{debugDataOf(expr), move(expr)};
+		return ExpressionStatement{debugDataOf(expr), std::move(expr)};
 	}
 	case Token::Comma:
 	case Token::AssemblyAssign:
@@ -414,7 +414,7 @@ Statement Parser::parseStatement()
 		assignment.value = make_unique<Expression>(parseExpression());
 		updateLocationEndFrom(assignment.debugData, nativeLocationOf(*assignment.value));
 
-		return Statement{move(assignment)};
+		return Statement{std::move(assignment)};
 	}
 	default:
 		fatalParserError(6913_error, "Call or assignment expected.");
@@ -485,11 +485,11 @@ Expression Parser::parseExpression()
 					nativeLocationOf(_identifier),
 					"Builtin function \"" + _identifier.name.str() + "\" must be called."
 				);
-			return move(_identifier);
+			return std::move(_identifier);
 		},
 		[&](Literal& _literal) -> Expression
 		{
-			return move(_literal);
+			return std::move(_literal);
 		}
 	}, operation);
 }
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index fb0fa565e4..54733cc435 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -197,7 +197,7 @@ string AsmPrinter::operator()(ForLoop const& _forLoop)
 		delim = ' ';
 	return
 		locationComment +
-		("for " + move(pre) + delim + move(condition) + delim + move(post) + "\n") +
+		("for " + std::move(pre) + delim + std::move(condition) + delim + std::move(post) + "\n") +
 		(*this)(_forLoop.body);
 }
 
diff --git a/libyul/ControlFlowSideEffectsCollector.cpp b/libyul/ControlFlowSideEffectsCollector.cpp
index 6e96712a08..19eb8275d0 100644
--- a/libyul/ControlFlowSideEffectsCollector.cpp
+++ b/libyul/ControlFlowSideEffectsCollector.cpp
@@ -92,7 +92,7 @@ void ControlFlowBuilder::operator()(FunctionDefinition const& _function)
 
 	m_currentNode->successors.emplace_back(flow.exit);
 
-	m_functionFlows[&_function] = move(flow);
+	m_functionFlows[&_function] = std::move(flow);
 
 	m_leave = nullptr;
 }
diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
index afd4b7d94e..1a2d8b33a4 100644
--- a/libyul/ObjectParser.cpp
+++ b/libyul/ObjectParser.cpp
@@ -88,7 +88,7 @@ shared_ptr<Object> ObjectParser::parseObject(Object* _containingObject)
 
 	expectToken(Token::LBrace);
 
-	ret->code = parseCode(move(sourceNameMapping));
+	ret->code = parseCode(std::move(sourceNameMapping));
 
 	while (currentToken() != Token::RBrace)
 	{
@@ -113,7 +113,7 @@ shared_ptr<Block> ObjectParser::parseCode(optional<SourceNameMap> _sourceNames)
 		fatalParserError(4846_error, "Expected keyword \"code\".");
 	advance();
 
-	return parseBlock(move(_sourceNames));
+	return parseBlock(std::move(_sourceNames));
 }
 
 optional<SourceNameMap> ObjectParser::tryParseSourceNameMapping() const
@@ -156,7 +156,7 @@ optional<SourceNameMap> ObjectParser::tryParseSourceNameMapping() const
 
 		Token const next = scanner.next();
 		if (next == Token::EOS)
-			return {move(sourceNames)};
+			return {std::move(sourceNames)};
 		if (next != Token::Comma)
 			break;
 		scanner.next();
@@ -172,7 +172,7 @@ optional<SourceNameMap> ObjectParser::tryParseSourceNameMapping() const
 
 shared_ptr<Block> ObjectParser::parseBlock(optional<SourceNameMap> _sourceNames)
 {
-	Parser parser(m_errorReporter, m_dialect, move(_sourceNames));
+	Parser parser(m_errorReporter, m_dialect, std::move(_sourceNames));
 	shared_ptr<Block> block = parser.parseInline(m_scanner);
 	yulAssert(block || m_errorReporter.hasErrors(), "Invalid block but no error!");
 	return block;
diff --git a/libyul/backends/evm/ConstantOptimiser.cpp b/libyul/backends/evm/ConstantOptimiser.cpp
index aecd00bf4f..59e987b693 100644
--- a/libyul/backends/evm/ConstantOptimiser.cpp
+++ b/libyul/backends/evm/ConstantOptimiser.cpp
@@ -130,7 +130,7 @@ Representation const& RepresentationFinder::findRepresentation(u256 const& _valu
 
 	if (numberEncodingSize(~_value) < numberEncodingSize(_value))
 		// Negated is shorter to represent
-		routine = min(move(routine), represent("not"_yulstring, findRepresentation(~_value)));
+		routine = min(std::move(routine), represent("not"_yulstring, findRepresentation(~_value)));
 
 	// Decompose value into a * 2**k + b where abs(b) << 2**k
 	for (unsigned bits = 255; bits > 8 && m_maxSteps > 0; --bits)
@@ -171,10 +171,10 @@ Representation const& RepresentationFinder::findRepresentation(u256 const& _valu
 
 		if (m_maxSteps > 0)
 			m_maxSteps--;
-		routine = min(move(routine), move(newRoutine));
+		routine = min(std::move(routine), std::move(newRoutine));
 	}
 	yulAssert(MiniEVMInterpreter{m_dialect}.eval(*routine.expression) == _value, "Invalid expression generated.");
-	return m_cache[_value] = move(routine);
+	return m_cache[_value] = std::move(routine);
 }
 
 Representation RepresentationFinder::represent(u256 const& _value) const
diff --git a/libyul/backends/evm/ControlFlowGraph.h b/libyul/backends/evm/ControlFlowGraph.h
index 8ca2076a04..b267b8461f 100644
--- a/libyul/backends/evm/ControlFlowGraph.h
+++ b/libyul/backends/evm/ControlFlowGraph.h
@@ -236,7 +236,7 @@ struct CFG
 
 	BasicBlock& makeBlock(std::shared_ptr<DebugData const> _debugData)
 	{
-		return blocks.emplace_back(BasicBlock{move(_debugData), {}, {}});
+		return blocks.emplace_back(BasicBlock{std::move(_debugData), {}, {}});
 	}
 };
 
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index 855d96fbd3..1980fb4424 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -532,7 +532,7 @@ Stack const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _cal
 				return TemporarySlot{_call, _i};
 			}) | ranges::to<Stack>,
 			// operation
-			move(builtinCall)
+			std::move(builtinCall)
 		}).output;
 	}
 	else
@@ -607,8 +607,8 @@ void ControlFlowGraphBuilder::makeConditionalJump(
 {
 	yulAssert(m_currentBlock, "");
 	m_currentBlock->exit = CFG::BasicBlock::ConditionalJump{
-		move(_debugData),
-		move(_condition),
+		std::move(_debugData),
+		std::move(_condition),
 		&_nonZero,
 		&_zero
 	};
@@ -624,7 +624,7 @@ void ControlFlowGraphBuilder::jump(
 )
 {
 	yulAssert(m_currentBlock, "");
-	m_currentBlock->exit = CFG::BasicBlock::Jump{move(_debugData), &_target, backwards};
+	m_currentBlock->exit = CFG::BasicBlock::Jump{std::move(_debugData), &_target, backwards};
 	_target.entries.emplace_back(m_currentBlock);
 	m_currentBlock = &_target;
 }
diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index ce55782747..7c9bf05cf1 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -64,9 +64,9 @@ CodeTransform::CodeTransform(
 	m_builtinContext(_builtinContext),
 	m_allowStackOpt(_allowStackOpt),
 	m_useNamedLabelsForFunctions(_useNamedLabelsForFunctions),
-	m_identifierAccessCodeGen(move(_identifierAccessCodeGen)),
-	m_context(move(_context)),
-	m_delayedReturnVariables(move(_delayedReturnVariables)),
+	m_identifierAccessCodeGen(std::move(_identifierAccessCodeGen)),
+	m_context(std::move(_context)),
+	m_delayedReturnVariables(std::move(_delayedReturnVariables)),
 	m_functionExitLabel(_functionExitLabel)
 {
 	if (!m_context)
@@ -406,11 +406,11 @@ void CodeTransform::operator()(FunctionDefinition const& _function)
 	if (!m_allowStackOpt)
 		subTransform.setupReturnVariablesAndFunctionExit();
 
-	subTransform.m_assignedNamedLabels = move(m_assignedNamedLabels);
+	subTransform.m_assignedNamedLabels = std::move(m_assignedNamedLabels);
 
 	subTransform(_function.body);
 
-	m_assignedNamedLabels = move(subTransform.m_assignedNamedLabels);
+	m_assignedNamedLabels = std::move(subTransform.m_assignedNamedLabels);
 
 	m_assembly.setSourceLocation(originLocationOf(_function));
 	if (!subTransform.m_stackErrors.empty())
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index c86be6f695..0f5c307e32 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -383,7 +383,7 @@ BuiltinFunctionForEVM const* EVMDialect::verbatimFunction(size_t _arguments, siz
 			}
 		).second;
 		builtinFunction.isMSize = true;
-		function = make_shared<BuiltinFunctionForEVM const>(move(builtinFunction));
+		function = make_shared<BuiltinFunctionForEVM const>(std::move(builtinFunction));
 	}
 	return function.get();
 }
diff --git a/libyul/backends/evm/EthAssemblyAdapter.cpp b/libyul/backends/evm/EthAssemblyAdapter.cpp
index 5d7b4cbf45..685f56cbc0 100644
--- a/libyul/backends/evm/EthAssemblyAdapter.cpp
+++ b/libyul/backends/evm/EthAssemblyAdapter.cpp
@@ -96,7 +96,7 @@ void EthAssemblyAdapter::appendLinkerSymbol(std::string const& _linkerSymbol)
 
 void EthAssemblyAdapter::appendVerbatim(bytes _data, size_t _arguments, size_t _returnVariables)
 {
-	m_assembly.appendVerbatim(move(_data), _arguments, _returnVariables);
+	m_assembly.appendVerbatim(std::move(_data), _arguments, _returnVariables);
 }
 
 void EthAssemblyAdapter::appendJump(int _stackDiffAfter, JumpType _jumpType)
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index 08987b5654..db73ba2a7a 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -61,7 +61,7 @@ vector<StackTooDeepError> OptimizedEVMCodeTransform::run(
 	optimizedCodeTransform(*dfg->entry);
 	for (Scope::Function const* function: dfg->functions)
 		optimizedCodeTransform(dfg->functionInfo.at(function));
-	return move(optimizedCodeTransform.m_stackErrors);
+	return std::move(optimizedCodeTransform.m_stackErrors);
 }
 
 void OptimizedEVMCodeTransform::operator()(CFG::FunctionCall const& _call)
@@ -459,7 +459,7 @@ void OptimizedEVMCodeTransform::operator()(CFG::BasicBlock const& _block)
 			{
 				// Restore the stack afterwards for the non-zero case below.
 				ScopeGuard stackRestore([storedStack = m_stack, this]() {
-					m_stack = move(storedStack);
+					m_stack = std::move(storedStack);
 					m_assembly.setStackHeight(static_cast<int>(m_stack.size()));
 				});
 
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index 4f9a1e2a19..8b39b364f8 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -65,7 +65,7 @@ map<YulString, vector<StackLayoutGenerator::StackTooDeep>> StackLayoutGenerator:
 	stackTooDeepErrors[YulString{}] = reportStackTooDeep(_cfg, YulString{});
 	for (auto const& function: _cfg.functions)
 		if (auto errors = reportStackTooDeep(_cfg, function->name); !errors.empty())
-			stackTooDeepErrors[function->name] = move(errors);
+			stackTooDeepErrors[function->name] = std::move(errors);
 	return stackTooDeepErrors;
 }
 
@@ -324,8 +324,8 @@ Stack StackLayoutGenerator::propagateStackThroughBlock(Stack _exitStack, CFG::Ba
 		Stack newStack = propagateStackThroughOperation(stack, operation, _aggressiveStackCompression);
 		if (!_aggressiveStackCompression && !findStackTooDeep(newStack, stack).empty())
 			// If we had stack errors, run again with aggressive stack compression.
-			return propagateStackThroughBlock(move(_exitStack), _block, true);
-		stack = move(newStack);
+			return propagateStackThroughBlock(std::move(_exitStack), _block, true);
+		stack = std::move(newStack);
 	}
 
 	return stack;
@@ -715,13 +715,13 @@ void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block)
 		util::BreadthFirstSearch<CFG::BasicBlock const*> breadthFirstSearch{{_entry}};
 		breadthFirstSearch.run([&](CFG::BasicBlock const* _block, auto _addChild) {
 			auto& blockInfo = m_layout.blockInfos.at(_block);
-			blockInfo.entryLayout = Stack{_numJunk, JunkSlot{}} + move(blockInfo.entryLayout);
+			blockInfo.entryLayout = Stack{_numJunk, JunkSlot{}} + std::move(blockInfo.entryLayout);
 			for (auto const& operation: _block->operations)
 			{
 				auto& operationEntryLayout = m_layout.operationEntryLayout.at(&operation);
-				operationEntryLayout = Stack{_numJunk, JunkSlot{}} + move(operationEntryLayout);
+				operationEntryLayout = Stack{_numJunk, JunkSlot{}} + std::move(operationEntryLayout);
 			}
-			blockInfo.exitLayout = Stack{_numJunk, JunkSlot{}} + move(blockInfo.exitLayout);
+			blockInfo.exitLayout = Stack{_numJunk, JunkSlot{}} + std::move(blockInfo.exitLayout);
 
 			std::visit(util::GenericVisitor{
 				[&](CFG::BasicBlock::MainExit const&) {},
diff --git a/libyul/backends/wasm/BinaryTransform.cpp b/libyul/backends/wasm/BinaryTransform.cpp
index 321792b08d..03f385d805 100644
--- a/libyul/backends/wasm/BinaryTransform.cpp
+++ b/libyul/backends/wasm/BinaryTransform.cpp
@@ -239,12 +239,12 @@ static map<string, uint8_t> const builtins = {
 bytes prefixSize(bytes _data)
 {
 	size_t size = _data.size();
-	return lebEncode(size) + move(_data);
+	return lebEncode(size) + std::move(_data);
 }
 
 bytes makeSection(Section _section, bytes _data)
 {
-	return toBytes(_section) + prefixSize(move(_data));
+	return toBytes(_section) + prefixSize(std::move(_data));
 }
 
 /// This is a kind of run-length-encoding of local types.
@@ -306,7 +306,7 @@ bytes BinaryTransform::run(Module const& _module)
 		// TODO should we prefix and / or shorten the name?
 		bytes data = BinaryTransform::run(module);
 		size_t const length = data.size();
-		ret += customSection(name, move(data));
+		ret += customSection(name, std::move(data));
 		// Skip all the previous sections and the size field of this current custom section.
 		size_t const offset = ret.size() - length;
 		subModulePosAndSize[name] = {offset, length};
@@ -321,10 +321,10 @@ bytes BinaryTransform::run(Module const& _module)
 	}
 
 	BinaryTransform bt(
-		move(globalIDs),
-		move(functionIDs),
-		move(functionTypes),
-		move(subModulePosAndSize)
+		std::move(globalIDs),
+		std::move(functionIDs),
+		std::move(functionTypes),
+		std::move(subModulePosAndSize)
 	);
 
 	ret += bt.codeSection(_module.functions);
@@ -378,7 +378,7 @@ bytes BinaryTransform::operator()(BuiltinCall const& _call)
 	yulAssert(builtins.count(_call.functionName), "Builtin " + _call.functionName + " not found");
 	// NOTE: the dialect ensures we have the right amount of arguments
 	bytes args = visit(_call.arguments);
-	bytes ret = move(args) + toBytes(builtins.at(_call.functionName));
+	bytes ret = std::move(args) + toBytes(builtins.at(_call.functionName));
 	if (
 		_call.functionName.find(".load") != string::npos ||
 		_call.functionName.find(".store") != string::npos
@@ -500,7 +500,7 @@ bytes BinaryTransform::operator()(FunctionDefinition const& _function)
 
 	yulAssert(m_labels.empty(), "Stray labels.");
 
-	return prefixSize(move(ret));
+	return prefixSize(std::move(ret));
 }
 
 BinaryTransform::Type BinaryTransform::typeOf(FunctionImport const& _import)
@@ -602,7 +602,7 @@ bytes BinaryTransform::typeSection(map<BinaryTransform::Type, vector<string>> co
 		index++;
 	}
 
-	return makeSection(Section::TYPE, lebEncode(index) + move(result));
+	return makeSection(Section::TYPE, lebEncode(index) + std::move(result));
 }
 
 bytes BinaryTransform::importSection(
@@ -620,7 +620,7 @@ bytes BinaryTransform::importSection(
 			toBytes(importKind) +
 			lebEncode(_functionTypes.at(import.internalName));
 	}
-	return makeSection(Section::IMPORT, move(result));
+	return makeSection(Section::IMPORT, std::move(result));
 }
 
 bytes BinaryTransform::functionSection(
@@ -631,7 +631,7 @@ bytes BinaryTransform::functionSection(
 	bytes result = lebEncode(_functions.size());
 	for (auto const& fun: _functions)
 		result += lebEncode(_functionTypes.at(fun.name));
-	return makeSection(Section::FUNCTION, move(result));
+	return makeSection(Section::FUNCTION, std::move(result));
 }
 
 bytes BinaryTransform::memorySection()
@@ -639,7 +639,7 @@ bytes BinaryTransform::memorySection()
 	bytes result = lebEncode(1);
 	result.push_back(static_cast<uint8_t>(LimitsKind::Min));
 	result.push_back(1); // initial length
-	return makeSection(Section::MEMORY, move(result));
+	return makeSection(Section::MEMORY, std::move(result));
 }
 
 bytes BinaryTransform::globalSection(vector<wasm::GlobalVariableDeclaration> const& _globals)
@@ -656,7 +656,7 @@ bytes BinaryTransform::globalSection(vector<wasm::GlobalVariableDeclaration> con
 			toBytes(Opcode::End);
 	}
 
-	return makeSection(Section::GLOBAL, move(result));
+	return makeSection(Section::GLOBAL, std::move(result));
 }
 
 bytes BinaryTransform::exportSection(map<string, size_t> const& _functionIDs)
@@ -666,13 +666,13 @@ bytes BinaryTransform::exportSection(map<string, size_t> const& _functionIDs)
 	result += encodeName("memory") + toBytes(Export::Memory) + lebEncode(0);
 	if (hasMain)
 		result += encodeName("main") + toBytes(Export::Function) + lebEncode(_functionIDs.at("main"));
-	return makeSection(Section::EXPORT, move(result));
+	return makeSection(Section::EXPORT, std::move(result));
 }
 
 bytes BinaryTransform::customSection(string const& _name, bytes _data)
 {
-	bytes result = encodeName(_name) + move(_data);
-	return makeSection(Section::CUSTOM, move(result));
+	bytes result = encodeName(_name) + std::move(_data);
+	return makeSection(Section::CUSTOM, std::move(result));
 }
 
 bytes BinaryTransform::codeSection(vector<wasm::FunctionDefinition> const& _functions)
@@ -680,7 +680,7 @@ bytes BinaryTransform::codeSection(vector<wasm::FunctionDefinition> const& _func
 	bytes result = lebEncode(_functions.size());
 	for (FunctionDefinition const& fun: _functions)
 		result += (*this)(fun);
-	return makeSection(Section::CODE, move(result));
+	return makeSection(Section::CODE, std::move(result));
 }
 
 bytes BinaryTransform::visit(vector<Expression> const& _expressions)
diff --git a/libyul/backends/wasm/EVMToEwasmTranslator.cpp b/libyul/backends/wasm/EVMToEwasmTranslator.cpp
index 359cc023bb..d36b1cda39 100644
--- a/libyul/backends/wasm/EVMToEwasmTranslator.cpp
+++ b/libyul/backends/wasm/EVMToEwasmTranslator.cpp
@@ -92,7 +92,7 @@ Object EVMToEwasmTranslator::run(Object const& _object)
 
 	Object ret;
 	ret.name = _object.name;
-	ret.code = make_shared<Block>(move(ast));
+	ret.code = make_shared<Block>(std::move(ast));
 	ret.debugData = _object.debugData;
 	ret.analysisInfo = make_shared<AsmAnalysisInfo>();
 
diff --git a/libyul/backends/wasm/TextTransform.cpp b/libyul/backends/wasm/TextTransform.cpp
index 9880f5ee5f..62596ba6e8 100644
--- a/libyul/backends/wasm/TextTransform.cpp
+++ b/libyul/backends/wasm/TextTransform.cpp
@@ -90,7 +90,7 @@ string TextTransform::run(wasm::Module const& _module)
 	ret += "\n";
 	for (auto const& f: _module.functions)
 		ret += transform(f) + "\n";
-	return move(ret) + ")\n";
+	return std::move(ret) + ")\n";
 }
 
 string TextTransform::operator()(wasm::Literal const& _literal)
@@ -159,7 +159,7 @@ string TextTransform::operator()(wasm::If const& _if)
 string TextTransform::operator()(wasm::Loop const& _loop)
 {
 	string label = _loop.labelName.empty() ? "" : " $" + _loop.labelName;
-	return "(loop" + move(label) + "\n" + indented(joinTransformed(_loop.statements, '\n')) + ")\n";
+	return "(loop" + std::move(label) + "\n" + indented(joinTransformed(_loop.statements, '\n')) + ")\n";
 }
 
 string TextTransform::operator()(wasm::Branch const& _branch)
@@ -180,7 +180,7 @@ string TextTransform::operator()(wasm::Return const&)
 string TextTransform::operator()(wasm::Block const& _block)
 {
 	string label = _block.labelName.empty() ? "" : " $" + _block.labelName;
-	return "(block" + move(label) + "\n" + indented(joinTransformed(_block.statements, '\n')) + "\n)\n";
+	return "(block" + std::move(label) + "\n" + indented(joinTransformed(_block.statements, '\n')) + "\n)\n";
 }
 
 string TextTransform::indented(string const& _in)
@@ -230,7 +230,7 @@ string TextTransform::joinTransformed(vector<wasm::Expression> const& _expressio
 		string t = visit(e);
 		if (!t.empty() && !ret.empty() && ret.back() != '\n')
 			ret += _separator;
-		ret += move(t);
+		ret += std::move(t);
 	}
 	return ret;
 }
diff --git a/libyul/backends/wasm/WasmCodeTransform.cpp b/libyul/backends/wasm/WasmCodeTransform.cpp
index 32c7745334..2d895d3fe0 100644
--- a/libyul/backends/wasm/WasmCodeTransform.cpp
+++ b/libyul/backends/wasm/WasmCodeTransform.cpp
@@ -68,7 +68,7 @@ wasm::Expression WasmCodeTransform::generateMultiAssignment(
 )
 {
 	yulAssert(!_variableNames.empty(), "");
-	wasm::LocalAssignment assignment{move(_variableNames.front()), std::move(_firstValue)};
+	wasm::LocalAssignment assignment{std::move(_variableNames.front()), std::move(_firstValue)};
 
 	if (_variableNames.size() == 1)
 		return { std::move(assignment) };
@@ -80,10 +80,10 @@ wasm::Expression WasmCodeTransform::generateMultiAssignment(
 	yulAssert(allocatedIndices.size() == _variableNames.size() - 1, "");
 
 	wasm::Block block;
-	block.statements.emplace_back(move(assignment));
+	block.statements.emplace_back(std::move(assignment));
 	for (size_t i = 1; i < _variableNames.size(); ++i)
 		block.statements.emplace_back(wasm::LocalAssignment{
-			move(_variableNames.at(i)),
+			std::move(_variableNames.at(i)),
 			make_unique<wasm::Expression>(wasm::GlobalVariable{m_globalVariables.at(allocatedIndices[i - 1]).variableName})
 		});
 	return { std::move(block) };
@@ -99,7 +99,7 @@ wasm::Expression WasmCodeTransform::operator()(yul::VariableDeclaration const& _
 	}
 
 	if (_varDecl.value)
-		return generateMultiAssignment(move(variableNames), visit(*_varDecl.value));
+		return generateMultiAssignment(std::move(variableNames), visit(*_varDecl.value));
 	else
 		return wasm::BuiltinCall{"nop", {}};
 }
@@ -109,7 +109,7 @@ wasm::Expression WasmCodeTransform::operator()(yul::Assignment const& _assignmen
 	vector<string> variableNames;
 	for (auto const& var: _assignment.variableNames)
 		variableNames.emplace_back(var.name.str());
-	return generateMultiAssignment(move(variableNames), visit(*_assignment.value));
+	return generateMultiAssignment(std::move(variableNames), visit(*_assignment.value));
 }
 
 wasm::Expression WasmCodeTransform::operator()(yul::ExpressionStatement const& _statement)
@@ -134,7 +134,7 @@ void WasmCodeTransform::importBuiltinFunction(BuiltinFunction const* _builtin, s
 		};
 		for (auto const& param: _builtin->parameters)
 			imp.paramTypes.emplace_back(translatedType(param));
-		m_functionsToImport[internalName] = move(imp);
+		m_functionsToImport[internalName] = std::move(imp);
 	}
 }
 
@@ -199,7 +199,7 @@ wasm::Expression WasmCodeTransform::operator()(yul::If const& _if)
 	else
 		yulAssert(false, "Invalid condition type");
 
-	return wasm::If{make_unique<wasm::Expression>(move(condition)), visit(_if.body.statements), {}};
+	return wasm::If{make_unique<wasm::Expression>(std::move(condition)), visit(_if.body.statements), {}};
 }
 
 wasm::Expression WasmCodeTransform::operator()(yul::Switch const& _switch)
@@ -224,7 +224,7 @@ wasm::Expression WasmCodeTransform::operator()(yul::Switch const& _switch)
 				visitReturnByValue(*c.value)
 			)};
 			wasm::If ifStmnt{
-				make_unique<wasm::Expression>(move(comparison)),
+				make_unique<wasm::Expression>(std::move(comparison)),
 				visit(c.body.statements),
 				{}
 			};
@@ -234,7 +234,7 @@ wasm::Expression WasmCodeTransform::operator()(yul::Switch const& _switch)
 				ifStmnt.elseStatements = make_unique<vector<wasm::Expression>>();
 				nextBlock = ifStmnt.elseStatements.get();
 			}
-			currentBlock->emplace_back(move(ifStmnt));
+			currentBlock->emplace_back(std::move(ifStmnt));
 			currentBlock = nextBlock;
 		}
 		else
@@ -275,8 +275,8 @@ wasm::Expression WasmCodeTransform::operator()(yul::ForLoop const& _for)
 	loop.statements += visit(_for.post.statements);
 	loop.statements.emplace_back(wasm::Branch{wasm::Label{loop.labelName}});
 
-	statements += make_vector<wasm::Expression>(move(loop));
-	return wasm::Block{breakLabel, move(statements)};
+	statements += make_vector<wasm::Expression>(std::move(loop));
+	return wasm::Block{breakLabel, std::move(statements)};
 }
 
 wasm::Expression WasmCodeTransform::operator()(yul::Break const&)
diff --git a/libyul/backends/wasm/WasmDialect.cpp b/libyul/backends/wasm/WasmDialect.cpp
index 817d53467a..b724ba69e6 100644
--- a/libyul/backends/wasm/WasmDialect.cpp
+++ b/libyul/backends/wasm/WasmDialect.cpp
@@ -269,7 +269,7 @@ void WasmDialect::addFunction(
 	vector<optional<LiteralKind>> _literalArguments
 )
 {
-	YulString name{move(_name)};
+	YulString name{std::move(_name)};
 	BuiltinFunction& f = m_functions[name];
 	f.name = name;
 	f.parameters = std::move(_params);
diff --git a/libyul/optimiser/ConditionalSimplifier.h b/libyul/optimiser/ConditionalSimplifier.h
index 5df56476a3..e558a1c6cf 100644
--- a/libyul/optimiser/ConditionalSimplifier.h
+++ b/libyul/optimiser/ConditionalSimplifier.h
@@ -64,7 +64,7 @@ class ConditionalSimplifier: public ASTModifier
 		Dialect const& _dialect,
 		std::map<YulString, ControlFlowSideEffects> _sideEffects
 	):
-		m_dialect(_dialect), m_functionSideEffects(move(_sideEffects))
+		m_dialect(_dialect), m_functionSideEffects(std::move(_sideEffects))
 	{}
 	Dialect const& m_dialect;
 	std::map<YulString, ControlFlowSideEffects> m_functionSideEffects;
diff --git a/libyul/optimiser/DeadCodeEliminator.h b/libyul/optimiser/DeadCodeEliminator.h
index 2c166a8361..ae8c1b2a6a 100644
--- a/libyul/optimiser/DeadCodeEliminator.h
+++ b/libyul/optimiser/DeadCodeEliminator.h
@@ -63,7 +63,7 @@ class DeadCodeEliminator: public ASTModifier
 	DeadCodeEliminator(
 		Dialect const& _dialect,
 		std::map<YulString, ControlFlowSideEffects> _sideEffects
-	): m_dialect(_dialect), m_functionSideEffects(move(_sideEffects)) {}
+	): m_dialect(_dialect), m_functionSideEffects(std::move(_sideEffects)) {}
 
 	Dialect const& m_dialect;
 	std::map<YulString, ControlFlowSideEffects> m_functionSideEffects;
diff --git a/libyul/optimiser/ForLoopInitRewriter.cpp b/libyul/optimiser/ForLoopInitRewriter.cpp
index 345dd12664..7cfa16b4f7 100644
--- a/libyul/optimiser/ForLoopInitRewriter.cpp
+++ b/libyul/optimiser/ForLoopInitRewriter.cpp
@@ -40,7 +40,7 @@ void ForLoopInitRewriter::operator()(Block& _block)
 				(*this)(forLoop.post);
 				vector<Statement> rewrite;
 				swap(rewrite, forLoop.pre.statements);
-				rewrite.emplace_back(move(forLoop));
+				rewrite.emplace_back(std::move(forLoop));
 				return { std::move(rewrite) };
 			}
 			else
diff --git a/libyul/optimiser/FunctionSpecializer.cpp b/libyul/optimiser/FunctionSpecializer.cpp
index 1d14db18be..4555e2f8fc 100644
--- a/libyul/optimiser/FunctionSpecializer.cpp
+++ b/libyul/optimiser/FunctionSpecializer.cpp
@@ -65,7 +65,7 @@ void FunctionSpecializer::operator()(FunctionCall& _f)
 
 	if (ranges::any_of(arguments, [](auto& _a) { return _a.has_value(); }))
 	{
-		YulString oldName = move(_f.functionName.name);
+		YulString oldName = std::move(_f.functionName.name);
 		auto newName = m_nameDispenser.newName(oldName);
 
 		m_oldToNewMap[oldName].emplace_back(make_pair(newName, arguments));
@@ -106,12 +106,12 @@ FunctionDefinition FunctionSpecializer::specialize(
 				VariableDeclaration{
 					_f.debugData,
 					vector<TypedName>{newFunction.parameters[index]},
-					make_unique<Expression>(move(*argument))
+					make_unique<Expression>(std::move(*argument))
 				}
 			);
 
 	newFunction.body.statements =
-		move(missingVariableDeclarations) + move(newFunction.body.statements);
+		std::move(missingVariableDeclarations) + std::move(newFunction.body.statements);
 
 	// Only take those indices that cannot be specialized, i.e., whose value is `nullopt`.
 	newFunction.parameters =
@@ -120,7 +120,7 @@ FunctionDefinition FunctionSpecializer::specialize(
 			applyMap(_arguments, [&](auto const& _v) { return !_v; })
 		);
 
-	newFunction.name = move(_newName);
+	newFunction.name = std::move(_newName);
 
 	return newFunction;
 }
@@ -146,10 +146,10 @@ void FunctionSpecializer::run(OptimiserStepContext& _context, Block& _ast)
 					f.m_oldToNewMap.at(functionDefinition.name),
 					[&](auto& _p) -> Statement
 					{
-						return f.specialize(functionDefinition, move(_p.first), move(_p.second));
+						return f.specialize(functionDefinition, std::move(_p.first), std::move(_p.second));
 					}
 				);
-				return move(out) + make_vector<Statement>(move(functionDefinition));
+				return std::move(out) + make_vector<Statement>(std::move(functionDefinition));
 			}
 		}
 
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index 460f6707ff..77848cce04 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -89,7 +89,7 @@ optional<u256> KnowledgeBase::valueIfKnownConstant(YulString _a)
 Expression KnowledgeBase::simplify(Expression _expression)
 {
 	m_counter = 0;
-	return simplifyRecursively(move(_expression));
+	return simplifyRecursively(std::move(_expression));
 }
 
 Expression KnowledgeBase::simplifyRecursively(Expression _expression)
diff --git a/libyul/optimiser/NameDispenser.cpp b/libyul/optimiser/NameDispenser.cpp
index 01d33919f0..d43b6802fe 100644
--- a/libyul/optimiser/NameDispenser.cpp
+++ b/libyul/optimiser/NameDispenser.cpp
@@ -37,7 +37,7 @@ using namespace solidity::util;
 NameDispenser::NameDispenser(Dialect const& _dialect, Block const& _ast, set<YulString> _reservedNames):
 	NameDispenser(_dialect, NameCollector(_ast).names() + _reservedNames)
 {
-	m_reservedNames = move(_reservedNames);
+	m_reservedNames = std::move(_reservedNames);
 }
 
 NameDispenser::NameDispenser(Dialect const& _dialect, set<YulString> _usedNames):
diff --git a/libyul/optimiser/NameSimplifier.cpp b/libyul/optimiser/NameSimplifier.cpp
index dfe1df9f49..0eb568beb2 100644
--- a/libyul/optimiser/NameSimplifier.cpp
+++ b/libyul/optimiser/NameSimplifier.cpp
@@ -111,7 +111,7 @@ void NameSimplifier::findSimplification(YulString const& _name)
 	{
 		YulString newName{name};
 		m_context.dispenser.markUsed(newName);
-		m_translations[_name] = move(newName);
+		m_translations[_name] = std::move(newName);
 	}
 }
 
diff --git a/libyul/optimiser/ReasoningBasedSimplifier.cpp b/libyul/optimiser/ReasoningBasedSimplifier.cpp
index 94c7102bdc..af39978edb 100644
--- a/libyul/optimiser/ReasoningBasedSimplifier.cpp
+++ b/libyul/optimiser/ReasoningBasedSimplifier.cpp
@@ -71,7 +71,7 @@ void ReasoningBasedSimplifier::operator()(If& _if)
 	{
 		Literal trueCondition = m_dialect.trueLiteral();
 		trueCondition.debugData = debugDataOf(*_if.condition);
-		_if.condition = make_unique<yul::Expression>(move(trueCondition));
+		_if.condition = make_unique<yul::Expression>(std::move(trueCondition));
 	}
 	else
 	{
@@ -83,7 +83,7 @@ void ReasoningBasedSimplifier::operator()(If& _if)
 		{
 			Literal falseCondition = m_dialect.zeroLiteralForType(m_dialect.boolType);
 			falseCondition.debugData = debugDataOf(*_if.condition);
-			_if.condition = make_unique<yul::Expression>(move(falseCondition));
+			_if.condition = make_unique<yul::Expression>(std::move(falseCondition));
 			_if.body = yul::Block{};
 			// Nothing left to be done.
 			return;
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index 6e33078a0a..a6173996f2 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -176,7 +176,7 @@ void eliminateVariables(
 		varsToEliminate += chooseVarsToEliminate(candidates[functionName], static_cast<size_t>(numVariables));
 	}
 
-	Rematerialiser::run(_dialect, _ast, move(varsToEliminate));
+	Rematerialiser::run(_dialect, _ast, std::move(varsToEliminate));
 	// Do not remove functions.
 	set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
 	UnusedPruner::runUntilStabilised(_dialect, _ast, _allowMSizeOptimization, nullptr, allFunctions);
diff --git a/libyul/optimiser/StackToMemoryMover.cpp b/libyul/optimiser/StackToMemoryMover.cpp
index 4256809236..74d05635e3 100644
--- a/libyul/optimiser/StackToMemoryMover.cpp
+++ b/libyul/optimiser/StackToMemoryMover.cpp
@@ -50,7 +50,7 @@ vector<Statement> generateMemoryStore(
 		Identifier{_debugData, memoryStoreFunction->name},
 		{
 			Literal{_debugData, LiteralKind::Number, _mpos, {}},
-			move(_value)
+			std::move(_value)
 		}
 	}});
 	return result;
@@ -95,7 +95,7 @@ void StackToMemoryMover::run(
 		)
 	);
 	stackToMemoryMover(_block);
-	_block.statements += move(stackToMemoryMover.m_newFunctionDefinitions);
+	_block.statements += std::move(stackToMemoryMover.m_newFunctionDefinitions);
 }
 
 StackToMemoryMover::StackToMemoryMover(
@@ -106,7 +106,7 @@ StackToMemoryMover::StackToMemoryMover(
 m_context(_context),
 m_memoryOffsetTracker(_memoryOffsetTracker),
 m_nameDispenser(_context.dispenser),
-m_functionReturnVariables(move(_functionReturnVariables))
+m_functionReturnVariables(std::move(_functionReturnVariables))
 {
 	auto const* evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
 	yulAssert(
@@ -156,7 +156,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 			newFunctionName,
 			stackParameters,
 			{},
-			move(_functionDefinition.body)
+			std::move(_functionDefinition.body)
 		});
 		// Generate new names for the arguments to maintain disambiguation.
 		std::map<YulString, YulString> newArgumentNames;
@@ -165,7 +165,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 		for (auto& parameter: _functionDefinition.parameters)
 			parameter.name = util::valueOrDefault(newArgumentNames, parameter.name, parameter.name);
 		// Replace original function by a call to the new function and an assignment to the return variable from memory.
-		_functionDefinition.body = Block{_functionDefinition.debugData, move(memoryVariableInits)};
+		_functionDefinition.body = Block{_functionDefinition.debugData, std::move(memoryVariableInits)};
 		_functionDefinition.body.statements.emplace_back(ExpressionStatement{
 			_functionDefinition.debugData,
 			FunctionCall{
@@ -189,7 +189,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 	}
 
 	if (!memoryVariableInits.empty())
-		_functionDefinition.body.statements = move(memoryVariableInits) + move(_functionDefinition.body.statements);
+		_functionDefinition.body.statements = std::move(memoryVariableInits) + std::move(_functionDefinition.body.statements);
 
 	_functionDefinition.returnVariables = _functionDefinition.returnVariables | ranges::views::filter(
 		not_fn(m_memoryOffsetTracker)
@@ -214,7 +214,7 @@ void StackToMemoryMover::operator()(Block& _block)
 					m_context.dialect,
 					debugData,
 					*offset,
-					_stmt.value ? *move(_stmt.value) : Literal{debugData, LiteralKind::Number, "0"_yulstring, {}}
+					_stmt.value ? *std::move(_stmt.value) : Literal{debugData, LiteralKind::Number, "0"_yulstring, {}}
 				);
 			else
 				return {};
@@ -245,7 +245,7 @@ void StackToMemoryMover::operator()(Block& _block)
 
 		vector<Statement> memoryAssignments;
 		vector<Statement> variableAssignments;
-		VariableDeclaration tempDecl{debugData, {}, move(_stmt.value)};
+		VariableDeclaration tempDecl{debugData, {}, std::move(_stmt.value)};
 
 		yulAssert(rhsMemorySlots.size() == _lhsVars.size(), "");
 		for (auto&& [lhsVar, rhsSlot]: ranges::views::zip(_lhsVars, rhsMemorySlots))
@@ -265,26 +265,26 @@ void StackToMemoryMover::operator()(Block& _block)
 					m_context.dialect,
 					_stmt.debugData,
 					*offset,
-					move(*rhs)
+					std::move(*rhs)
 				);
 			else
 				variableAssignments.emplace_back(StatementType{
 					debugData,
-					{ move(lhsVar) },
-					move(rhs)
+					{ std::move(lhsVar) },
+					std::move(rhs)
 				});
 		}
 
 		vector<Statement> result;
 		if (tempDecl.variables.empty())
-			result.emplace_back(ExpressionStatement{debugData, *move(tempDecl.value)});
+			result.emplace_back(ExpressionStatement{debugData, *std::move(tempDecl.value)});
 		else
-			result.emplace_back(move(tempDecl));
+			result.emplace_back(std::move(tempDecl));
 		reverse(memoryAssignments.begin(), memoryAssignments.end());
-		result += move(memoryAssignments);
+		result += std::move(memoryAssignments);
 		reverse(variableAssignments.begin(), variableAssignments.end());
-		result += move(variableAssignments);
-		return OptionalStatements{move(result)};
+		result += std::move(variableAssignments);
+		return OptionalStatements{std::move(result)};
 	};
 
 	util::iterateReplacing(
diff --git a/libyul/optimiser/UnusedFunctionParameterPruner.cpp b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
index 75e8325a3e..6ce097f42d 100644
--- a/libyul/optimiser/UnusedFunctionParameterPruner.cpp
+++ b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
@@ -118,7 +118,7 @@ void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _
 				originalFunction.returnVariables =
 					filter(originalFunction.returnVariables, used.second);
 
-				return make_vector<Statement>(move(originalFunction), move(linkingFunction));
+				return make_vector<Statement>(std::move(originalFunction), std::move(linkingFunction));
 			}
 		}
 
diff --git a/libyul/optimiser/UnusedStoreBase.cpp b/libyul/optimiser/UnusedStoreBase.cpp
index de13a23ccb..49f5508427 100644
--- a/libyul/optimiser/UnusedStoreBase.cpp
+++ b/libyul/optimiser/UnusedStoreBase.cpp
@@ -40,7 +40,7 @@ void UnusedStoreBase::operator()(If const& _if)
 	TrackedStores skipBranch{m_stores};
 	(*this)(_if.body);
 
-	merge(m_stores, move(skipBranch));
+	merge(m_stores, std::move(skipBranch));
 }
 
 void UnusedStoreBase::operator()(Switch const& _switch)
@@ -56,17 +56,17 @@ void UnusedStoreBase::operator()(Switch const& _switch)
 		if (!c.value)
 			hasDefault = true;
 		(*this)(c.body);
-		branches.emplace_back(move(m_stores));
+		branches.emplace_back(std::move(m_stores));
 		m_stores = preState;
 	}
 
 	if (hasDefault)
 	{
-		m_stores = move(branches.back());
+		m_stores = std::move(branches.back());
 		branches.pop_back();
 	}
 	for (auto& branch: branches)
-		merge(m_stores, move(branch));
+		merge(m_stores, std::move(branch));
 }
 
 void UnusedStoreBase::operator()(FunctionDefinition const& _functionDefinition)
@@ -97,7 +97,7 @@ void UnusedStoreBase::operator()(ForLoop const& _forLoop)
 	TrackedStores zeroRuns{m_stores};
 
 	(*this)(_forLoop.body);
-	merge(m_stores, move(m_forLoopInfo.pendingContinueStmts));
+	merge(m_stores, std::move(m_forLoopInfo.pendingContinueStmts));
 	m_forLoopInfo.pendingContinueStmts = {};
 	(*this)(_forLoop.post);
 
@@ -110,50 +110,50 @@ void UnusedStoreBase::operator()(ForLoop const& _forLoop)
 
 		(*this)(_forLoop.body);
 
-		merge(m_stores, move(m_forLoopInfo.pendingContinueStmts));
+		merge(m_stores, std::move(m_forLoopInfo.pendingContinueStmts));
 		m_forLoopInfo.pendingContinueStmts.clear();
 		(*this)(_forLoop.post);
 
 		visit(*_forLoop.condition);
 		// Order of merging does not matter because "max" is commutative and associative.
-		merge(m_stores, move(oneRun));
+		merge(m_stores, std::move(oneRun));
 	}
 	else
 		// Shortcut to avoid horrible runtime.
 		shortcutNestedLoop(zeroRuns);
 
 	// Order of merging does not matter because "max" is commutative and associative.
-	merge(m_stores, move(zeroRuns));
-	merge(m_stores, move(m_forLoopInfo.pendingBreakStmts));
+	merge(m_stores, std::move(zeroRuns));
+	merge(m_stores, std::move(m_forLoopInfo.pendingBreakStmts));
 	m_forLoopInfo.pendingBreakStmts.clear();
 }
 
 void UnusedStoreBase::operator()(Break const&)
 {
-	m_forLoopInfo.pendingBreakStmts.emplace_back(move(m_stores));
+	m_forLoopInfo.pendingBreakStmts.emplace_back(std::move(m_stores));
 	m_stores.clear();
 }
 
 void UnusedStoreBase::operator()(Continue const&)
 {
-	m_forLoopInfo.pendingContinueStmts.emplace_back(move(m_stores));
+	m_forLoopInfo.pendingContinueStmts.emplace_back(std::move(m_stores));
 	m_stores.clear();
 }
 
 void UnusedStoreBase::merge(TrackedStores& _target, TrackedStores&& _other)
 {
-	util::joinMap(_target, move(_other), [](
+	util::joinMap(_target, std::move(_other), [](
 		map<Statement const*, State>& _assignmentHere,
 		map<Statement const*, State>&& _assignmentThere
 	)
 	{
-		return util::joinMap(_assignmentHere, move(_assignmentThere), State::join);
+		return util::joinMap(_assignmentHere, std::move(_assignmentThere), State::join);
 	});
 }
 
 void UnusedStoreBase::merge(TrackedStores& _target, vector<TrackedStores>&& _source)
 {
 	for (TrackedStores& ts: _source)
-		merge(_target, move(ts));
+		merge(_target, std::move(ts));
 	_source.clear();
 }
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index 0e6acdeea0..754c02ac5d 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -186,7 +186,7 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 		m_stores[YulString{}].insert({&_statement, initialState});
 		vector<Operation> operations = operationsFromFunctionCall(*funCall);
 		yulAssert(operations.size() == 1, "");
-		m_storeOperations[&_statement] = move(operations.front());
+		m_storeOperations[&_statement] = std::move(operations.front());
 	}
 }
 
diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index 5b66aea302..f794439de8 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -245,10 +245,10 @@ vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 
 		string errorMessage(it, line.end());
 		expectations.emplace_back(SyntaxTestError{
-			move(errorType),
-			move(errorId),
-			move(errorMessage),
-			move(sourceName),
+			std::move(errorType),
+			std::move(errorId),
+			std::move(errorMessage),
+			std::move(sourceName),
 			locationStart,
 			locationEnd
 		});
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 6c5cb6912f..118a517fba 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -50,7 +50,7 @@ evmc::VM& EVMHost::getVM(string const& _path)
 		if (vm && errorCode == EVMC_LOADER_SUCCESS)
 		{
 			if (vm.get_capabilities() & (EVMC_CAPABILITY_EVM1 | EVMC_CAPABILITY_EWASM))
-				vms[_path] = make_unique<evmc::VM>(evmc::VM(move(vm)));
+				vms[_path] = make_unique<evmc::VM>(evmc::VM(std::move(vm)));
 			else
 				cerr << "VM loaded neither supports EVM1 nor EWASM" << endl;
 		}
diff --git a/test/Metadata.cpp b/test/Metadata.cpp
index 27e5332af5..88a1f7b42f 100644
--- a/test/Metadata.cpp
+++ b/test/Metadata.cpp
@@ -162,7 +162,7 @@ std::optional<map<string, string>> parseCBORMetadata(bytes const& _metadata)
 		{
 			string key = parser.readKey();
 			string value = parser.readValue();
-			ret[move(key)] = move(value);
+			ret[std::move(key)] = std::move(value);
 		}
 		return ret;
 	}
diff --git a/test/TestCaseReader.cpp b/test/TestCaseReader.cpp
index d9015b55f6..43e4a6fc36 100644
--- a/test/TestCaseReader.cpp
+++ b/test/TestCaseReader.cpp
@@ -194,7 +194,7 @@ pair<SourceMap, size_t> TestCaseReader::parseSourcesAndSettingsWithLineNumber(is
 	}
 	// Register the last source as the main one
 	sources[currentSourceName] = currentSource;
-	return {{move(sources), move(externalSources), move(currentSourceName)}, lineNumber};
+	return {{std::move(sources), std::move(externalSources), std::move(currentSourceName)}, lineNumber};
 }
 
 string TestCaseReader::parseSimpleExpectations(istream& _file)
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index f08f227cb3..6fc3c5a743 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -143,7 +143,7 @@ namespace
 			for (BasicBlock const& block: cfg.optimisedBlocks())
 				copy(output.begin() + static_cast<int>(block.begin), output.begin() + static_cast<int>(block.end),
 					 back_inserter(optItems));
-			output = move(optItems);
+			output = std::move(optItems);
 		}
 		return output;
 	}
diff --git a/test/liblangutil/Scanner.cpp b/test/liblangutil/Scanner.cpp
index c288ed8543..9e196b0f54 100644
--- a/test/liblangutil/Scanner.cpp
+++ b/test/liblangutil/Scanner.cpp
@@ -150,11 +150,11 @@ struct TestScanner
 {
 	unique_ptr<CharStream> stream;
 	unique_ptr<Scanner> scanner;
-	explicit TestScanner(string _text) { reset(move(_text)); }
+	explicit TestScanner(string _text) { reset(std::move(_text)); }
 
 	void reset(std::string _text)
 	{
-		stream = make_unique<CharStream>(move(_text), "");
+		stream = make_unique<CharStream>(std::move(_text), "");
 		scanner = make_unique<Scanner>(*stream);
 	}
 
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index fd215cb940..030472e8a1 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -58,7 +58,7 @@ void GasTest::parseExpectations(std::istream& _stream)
 		{
 			string kind = line.substr(3, line.length() - 4);
 			boost::trim(kind);
-			currentKind = &m_expectations[move(kind)];
+			currentKind = &m_expectations[std::move(kind)];
 		}
 		else if (!currentKind)
 			BOOST_THROW_EXCEPTION(runtime_error("No function kind specified. Expected \"creation:\", \"external:\" or \"internal:\"."));
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 10084b0143..eed911b1a7 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -77,7 +77,7 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 		return filtered;
 	};
 	if (m_modelCheckerSettings.invariants.invariants.empty())
-		m_expectations = removeInv(move(m_expectations));
+		m_expectations = removeInv(std::move(m_expectations));
 
 	auto const& ignoreInv = m_reader.stringSetting("SMTIgnoreInv", "yes");
 	if (ignoreInv == "no")
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 785a32fdc3..9cf2b8d521 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -61,7 +61,7 @@ SemanticTest::SemanticTest(
 	m_sideEffectHooks(makeSideEffectHooks()),
 	m_enforceCompileToEwasm(_enforceCompileToEwasm),
 	m_enforceGasCost(_enforceGasCost),
-	m_enforceGasCostMinValue(move(_enforceGasCostMinValue))
+	m_enforceGasCostMinValue(std::move(_enforceGasCostMinValue))
 {
 	static set<string> const compileViaYulAllowedValues{"also", "true", "false"};
 	static set<string> const yulRunTriggers{"also", "true"};
@@ -457,14 +457,14 @@ TestCase::TestResult SemanticTest::runTest(
 				success = false;
 
 			test.setFailure(!m_transactionSuccessful);
-			test.setRawBytes(move(output));
+			test.setRawBytes(std::move(output));
 			test.setContractABI(m_compiler.contractABI(m_compiler.lastContractName(m_sources.mainSourceFile)));
 		}
 
 		vector<string> effects;
 		for (SideEffectHook const& hook: m_sideEffectHooks)
 			effects += hook(test.call());
-		test.setSideEffects(move(effects));
+		test.setSideEffects(std::move(effects));
 
 		success &= test.call().expectedSideEffects == test.call().actualSideEffects;
 	}
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index 70d0b2a6e4..cb47cf45e8 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -109,7 +109,7 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 				try
 				{
 					asmStack.optimize();
-					obj = move(*asmStack.assemble(yul::YulStack::Machine::EVM).bytecode);
+					obj = std::move(*asmStack.assemble(yul::YulStack::Machine::EVM).bytecode);
 					obj.link(_libraryAddresses);
 					break;
 				}
diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp
index 4ad0701e48..915586ad2d 100644
--- a/test/libsolidity/util/TestFileParser.cpp
+++ b/test/libsolidity/util/TestFileParser.cpp
@@ -178,7 +178,7 @@ vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctionCall
 						accept(Token::Newline, true);
 						call.expectedSideEffects = parseFunctionCallSideEffects();
 
-						calls.emplace_back(move(call));
+						calls.emplace_back(std::move(call));
 					}
 				}
 				catch (TestParserError const& _e)
diff --git a/test/libyul/ObjectParser.cpp b/test/libyul/ObjectParser.cpp
index bee0025afa..be3de930de 100644
--- a/test/libyul/ObjectParser.cpp
+++ b/test/libyul/ObjectParser.cpp
@@ -122,7 +122,7 @@ tuple<optional<SourceNameMap>, ErrorList> tryGetSourceLocationMapping(string _so
 	ErrorReporter reporter(errors);
 	Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(EVMVersion::berlin());
 	ObjectParser objectParser{reporter, dialect};
-	CharStream stream(move(source), "");
+	CharStream stream(std::move(source), "");
 	auto object = objectParser.parse(make_shared<Scanner>(stream), false);
 	BOOST_REQUIRE(object && object->debugData);
 	return {object->debugData->sourceNames, std::move(errors)};
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 49152e7f86..511ed6c190 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -65,7 +65,7 @@ shared_ptr<Block> parse(string const& _source, Dialect const& _dialect, ErrorRep
 		auto parserResult = yul::Parser(
 			errorReporter,
 			_dialect,
-			move(indicesToSourceNames)
+			std::move(indicesToSourceNames)
 		).parse(stream);
 		if (parserResult)
 		{
diff --git a/test/solc/Common.cpp b/test/solc/Common.cpp
index ead9b798da..8e2e329e4f 100644
--- a/test/solc/Common.cpp
+++ b/test/solc/Common.cpp
@@ -91,5 +91,5 @@ string test::stripPreReleaseWarning(string const& _stderrContent)
 	};
 
 	string output = regex_replace(_stderrContent, preReleaseWarningRegex, "");
-	return regex_replace(move(output), noOutputRegex, "");
+	return regex_replace(std::move(output), noOutputRegex, "");
 }
diff --git a/test/yulPhaser/FitnessMetrics.cpp b/test/yulPhaser/FitnessMetrics.cpp
index bd063bf1f4..bde15a537f 100644
--- a/test/yulPhaser/FitnessMetrics.cpp
+++ b/test/yulPhaser/FitnessMetrics.cpp
@@ -64,7 +64,7 @@ class ProgramBasedMetricFixture
 	Program optimisedProgram(Program _program) const
 	{
 		[[maybe_unused]] size_t originalSize = _program.codeSize(m_weights);
-		Program result = move(_program);
+		Program result = std::move(_program);
 		result.optimise(m_chromosome.optimisationSteps());
 
 		// Make sure that the program and the chromosome we have chosen are suitable for the test
diff --git a/test/yulPhaser/ProgramCache.cpp b/test/yulPhaser/ProgramCache.cpp
index 3a84aad679..2dab86fcda 100644
--- a/test/yulPhaser/ProgramCache.cpp
+++ b/test/yulPhaser/ProgramCache.cpp
@@ -52,7 +52,7 @@ class ProgramCacheFixture
 
 	Program optimisedProgram(Program _program, string _abbreviatedOptimisationSteps) const
 	{
-		Program result = move(_program);
+		Program result = std::move(_program);
 		result.optimise(Chromosome::genesToSteps(_abbreviatedOptimisationSteps));
 		return result;
 	}
diff --git a/test/yulPhaser/TestHelpers.cpp b/test/yulPhaser/TestHelpers.cpp
index 1df5c4e54d..50afd70a3e 100644
--- a/test/yulPhaser/TestHelpers.cpp
+++ b/test/yulPhaser/TestHelpers.cpp
@@ -30,7 +30,7 @@ using namespace solidity::phaser::test;
 
 function<Mutation> phaser::test::wholeChromosomeReplacement(Chromosome _newChromosome)
 {
-	return [_newChromosome = move(_newChromosome)](Chromosome const&) { return _newChromosome; };
+	return [_newChromosome = std::move(_newChromosome)](Chromosome const&) { return _newChromosome; };
 }
 
 function<Mutation> phaser::test::geneSubstitution(size_t _geneIndex, string _geneValue)
diff --git a/tools/yulPhaser/Chromosome.cpp b/tools/yulPhaser/Chromosome.cpp
index 687c669da5..6e8d3544e1 100644
--- a/tools/yulPhaser/Chromosome.cpp
+++ b/tools/yulPhaser/Chromosome.cpp
@@ -43,7 +43,7 @@ Chromosome Chromosome::makeRandom(size_t _length)
 	for (size_t i = 0; i < _length; ++i)
 		steps.push_back(randomOptimisationStep());
 
-	return Chromosome(move(steps));
+	return Chromosome(std::move(steps));
 }
 
 ostream& phaser::operator<<(ostream& _stream, Chromosome const& _chromosome)
diff --git a/tools/yulPhaser/GeneticAlgorithms.cpp b/tools/yulPhaser/GeneticAlgorithms.cpp
index 907703738a..ff40d222a7 100644
--- a/tools/yulPhaser/GeneticAlgorithms.cpp
+++ b/tools/yulPhaser/GeneticAlgorithms.cpp
@@ -71,7 +71,7 @@ Population RandomAlgorithm::runNextRound(Population _population)
 	size_t replacementCount = _population.individuals().size() - elitePopulation.individuals().size();
 
 	return
-		move(elitePopulation) +
+		std::move(elitePopulation) +
 		Population::makeRandom(
 			_population.fitnessMetric(),
 			replacementCount,
diff --git a/tools/yulPhaser/Mutations.cpp b/tools/yulPhaser/Mutations.cpp
index 69ec7fc499..873fbbb9ba 100644
--- a/tools/yulPhaser/Mutations.cpp
+++ b/tools/yulPhaser/Mutations.cpp
@@ -44,7 +44,7 @@ function<Mutation> phaser::geneRandomisation(double _chance)
 				gene
 			);
 
-		return Chromosome(move(genes));
+		return Chromosome(std::move(genes));
 	};
 }
 
@@ -57,7 +57,7 @@ function<Mutation> phaser::geneDeletion(double _chance)
 			if (!SimulationRNG::bernoulliTrial(_chance))
 				genes.push_back(gene);
 
-		return Chromosome(move(genes));
+		return Chromosome(std::move(genes));
 	};
 }
 
@@ -77,7 +77,7 @@ function<Mutation> phaser::geneAddition(double _chance)
 				genes.push_back(Chromosome::randomGene());
 		}
 
-		return Chromosome(move(genes));
+		return Chromosome(std::move(genes));
 	};
 }
 
@@ -102,7 +102,7 @@ function<Mutation> phaser::mutationSequence(vector<function<Mutation>> _mutation
 	{
 		Chromosome mutatedChromosome = _chromosome;
 		for (size_t i = 0; i < _mutations.size(); ++i)
-			mutatedChromosome = _mutations[i](move(mutatedChromosome));
+			mutatedChromosome = _mutations[i](std::move(mutatedChromosome));
 
 		return mutatedChromosome;
 	};
diff --git a/tools/yulPhaser/PairSelections.h b/tools/yulPhaser/PairSelections.h
index 2bdc62a242..12532c76ab 100644
--- a/tools/yulPhaser/PairSelections.h
+++ b/tools/yulPhaser/PairSelections.h
@@ -107,7 +107,7 @@ class PairMosaicSelection: public PairSelection
 {
 public:
 	explicit PairMosaicSelection(std::vector<std::tuple<size_t, size_t>> _pattern, double _selectionSize = 1.0):
-		m_pattern(move(_pattern)),
+		m_pattern(std::move(_pattern)),
 		m_selectionSize(_selectionSize)
 	{
 		assert(m_pattern.size() > 0 || _selectionSize == 0.0);
diff --git a/tools/yulPhaser/Phaser.cpp b/tools/yulPhaser/Phaser.cpp
index 213e6f15b9..db5ec35ced 100644
--- a/tools/yulPhaser/Phaser.cpp
+++ b/tools/yulPhaser/Phaser.cpp
@@ -239,8 +239,8 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(
 		{
 			for (size_t i = 0; i < _programs.size(); ++i)
 				metrics.push_back(make_unique<ProgramSize>(
-					_programCaches[i] != nullptr ? optional<Program>{} : move(_programs[i]),
-					move(_programCaches[i]),
+					_programCaches[i] != nullptr ? optional<Program>{} : std::move(_programs[i]),
+					std::move(_programCaches[i]),
 					_weights,
 					_options.chromosomeRepetitions
 				));
@@ -251,8 +251,8 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(
 		{
 			for (size_t i = 0; i < _programs.size(); ++i)
 				metrics.push_back(make_unique<RelativeProgramSize>(
-					_programCaches[i] != nullptr ? optional<Program>{} : move(_programs[i]),
-					move(_programCaches[i]),
+					_programCaches[i] != nullptr ? optional<Program>{} : std::move(_programs[i]),
+					std::move(_programCaches[i]),
 					_options.relativeMetricScale,
 					_weights,
 					_options.chromosomeRepetitions
@@ -266,13 +266,13 @@ unique_ptr<FitnessMetric> FitnessMetricFactory::build(
 	switch (_options.metricAggregator)
 	{
 		case MetricAggregatorChoice::Average:
-			return make_unique<FitnessMetricAverage>(move(metrics));
+			return make_unique<FitnessMetricAverage>(std::move(metrics));
 		case MetricAggregatorChoice::Sum:
-			return make_unique<FitnessMetricSum>(move(metrics));
+			return make_unique<FitnessMetricSum>(std::move(metrics));
 		case MetricAggregatorChoice::Maximum:
-			return make_unique<FitnessMetricMaximum>(move(metrics));
+			return make_unique<FitnessMetricMaximum>(std::move(metrics));
 		case MetricAggregatorChoice::Minimum:
-			return make_unique<FitnessMetricMinimum>(move(metrics));
+			return make_unique<FitnessMetricMinimum>(std::move(metrics));
 		default:
 			assertThrow(false, solidity::util::Exception, "Invalid MetricAggregatorChoice value.");
 	}
@@ -309,7 +309,7 @@ Population PopulationFactory::build(
 	for (size_t populationSize: _options.randomPopulation)
 		combinedSize += populationSize;
 
-	population = move(population) + buildRandom(
+	population = std::move(population) + buildRandom(
 		combinedSize,
 		_options.minChromosomeLength,
 		_options.maxChromosomeLength,
@@ -317,7 +317,7 @@ Population PopulationFactory::build(
 	);
 
 	for (string const& populationFilePath: _options.populationFromFile)
-		population = move(population) + buildFromFile(populationFilePath, _fitnessMetric);
+		population = std::move(population) + buildFromFile(populationFilePath, _fitnessMetric);
 
 	return population;
 }
@@ -331,7 +331,7 @@ Population PopulationFactory::buildFromStrings(
 	for (string const& geneSequence: _geneSequences)
 		chromosomes.emplace_back(geneSequence);
 
-	return Population(move(_fitnessMetric), move(chromosomes));
+	return Population(std::move(_fitnessMetric), std::move(chromosomes));
 }
 
 Population PopulationFactory::buildRandom(
@@ -342,7 +342,7 @@ Population PopulationFactory::buildRandom(
 )
 {
 	return Population::makeRandom(
-		move(_fitnessMetric),
+		std::move(_fitnessMetric),
 		_populationSize,
 		_minChromosomeLength,
 		_maxChromosomeLength
@@ -354,7 +354,7 @@ Population PopulationFactory::buildFromFile(
 	shared_ptr<FitnessMetric> _fitnessMetric
 )
 {
-	return buildFromStrings(readLinesFromFile(_filePath), move(_fitnessMetric));
+	return buildFromStrings(readLinesFromFile(_filePath), std::move(_fitnessMetric));
 }
 
 ProgramCacheFactory::Options ProgramCacheFactory::Options::fromCommandLine(po::variables_map const& _arguments)
@@ -371,7 +371,7 @@ vector<shared_ptr<ProgramCache>> ProgramCacheFactory::build(
 {
 	vector<shared_ptr<ProgramCache>> programCaches;
 	for (Program& program: _programs)
-		programCaches.push_back(_options.programCacheEnabled ? make_shared<ProgramCache>(move(program)) : nullptr);
+		programCaches.push_back(_options.programCacheEnabled ? make_shared<ProgramCache>(std::move(program)) : nullptr);
 
 	return programCaches;
 }
@@ -400,7 +400,7 @@ vector<Program> ProgramFactory::build(Options const& _options)
 		}
 
 		get<Program>(programOrErrors).optimise(Chromosome(_options.prefix).optimisationSteps());
-		inputPrograms.push_back(move(get<Program>(programOrErrors)));
+		inputPrograms.push_back(std::move(get<Program>(programOrErrors)));
 	}
 
 	return inputPrograms;
@@ -823,12 +823,12 @@ void Phaser::runPhaser(po::variables_map const& _arguments)
 		programCaches,
 		codeWeights
 	);
-	Population population = PopulationFactory::build(populationOptions, move(fitnessMetric));
+	Population population = PopulationFactory::build(populationOptions, std::move(fitnessMetric));
 
 	if (_arguments["mode"].as<PhaserMode>() == PhaserMode::RunAlgorithm)
-		runAlgorithm(_arguments, move(population), move(programCaches));
+		runAlgorithm(_arguments, std::move(population), std::move(programCaches));
 	else
-		printOptimisedProgramsOrASTs(_arguments, population, move(programs), _arguments["mode"].as<PhaserMode>());
+		printOptimisedProgramsOrASTs(_arguments, population, std::move(programs), _arguments["mode"].as<PhaserMode>());
 }
 
 void Phaser::runAlgorithm(
@@ -844,7 +844,7 @@ void Phaser::runAlgorithm(
 		_population.individuals().size()
 	);
 
-	AlgorithmRunner algorithmRunner(move(_population), move(_programCaches), buildAlgorithmRunnerOptions(_arguments), cout);
+	AlgorithmRunner algorithmRunner(std::move(_population), std::move(_programCaches), buildAlgorithmRunnerOptions(_arguments), cout);
 	algorithmRunner.run(*geneticAlgorithm);
 }
 
diff --git a/tools/yulPhaser/Population.cpp b/tools/yulPhaser/Population.cpp
index 1dba2e2fd3..d4fe1f0bd0 100644
--- a/tools/yulPhaser/Population.cpp
+++ b/tools/yulPhaser/Population.cpp
@@ -68,7 +68,7 @@ Population Population::makeRandom(
 	for (size_t i = 0; i < _size; ++i)
 		chromosomes.push_back(Chromosome::makeRandom(_chromosomeLengthGenerator()));
 
-	return Population(move(_fitnessMetric), move(chromosomes));
+	return Population(std::move(_fitnessMetric), std::move(chromosomes));
 }
 
 Population Population::makeRandom(
@@ -79,7 +79,7 @@ Population Population::makeRandom(
 )
 {
 	return makeRandom(
-		move(_fitnessMetric),
+		std::move(_fitnessMetric),
 		_size,
 		std::bind(uniformChromosomeLength, _minChromosomeLength, _maxChromosomeLength)
 	);
@@ -112,7 +112,7 @@ Population Population::crossover(PairSelection const& _selection, function<Cross
 			m_individuals[i].chromosome,
 			m_individuals[j].chromosome
 		);
-		crossedIndividuals.emplace_back(move(childChromosome), *m_fitnessMetric);
+		crossedIndividuals.emplace_back(std::move(childChromosome), *m_fitnessMetric);
 	}
 
 	return Population(m_fitnessMetric, crossedIndividuals);
@@ -132,8 +132,8 @@ tuple<Population, Population> Population::symmetricCrossoverWithRemainder(
 			m_individuals[i].chromosome,
 			m_individuals[j].chromosome
 		);
-		crossedIndividuals.emplace_back(move(get<0>(children)), *m_fitnessMetric);
-		crossedIndividuals.emplace_back(move(get<1>(children)), *m_fitnessMetric);
+		crossedIndividuals.emplace_back(std::move(get<0>(children)), *m_fitnessMetric);
+		crossedIndividuals.emplace_back(std::move(get<1>(children)), *m_fitnessMetric);
 		indexSelected[i] = true;
 		indexSelected[j] = true;
 	}
@@ -159,7 +159,7 @@ Population operator+(Population _a, Population _b)
 	assert(_a.m_fitnessMetric == _b.m_fitnessMetric);
 
 	using ::operator+; // Import the std::vector concat operator from CommonData.h
-	return Population(_a.m_fitnessMetric, move(_a.m_individuals) + move(_b.m_individuals));
+	return Population(_a.m_fitnessMetric, std::move(_a.m_individuals) + std::move(_b.m_individuals));
 }
 
 }
@@ -193,7 +193,7 @@ vector<Individual> Population::chromosomesToIndividuals(
 {
 	vector<Individual> individuals;
 	for (auto& chromosome: _chromosomes)
-		individuals.emplace_back(move(chromosome), _fitnessMetric);
+		individuals.emplace_back(std::move(chromosome), _fitnessMetric);
 
 	return individuals;
 }
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index 5c61701d83..c62b8e1303 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -102,7 +102,7 @@ variant<Program, ErrorList> Program::load(CharStream& _sourceCode)
 
 void Program::optimise(vector<string> const& _optimisationSteps)
 {
-	m_ast = applyOptimisationSteps(m_dialect, m_nameDispenser, move(m_ast), _optimisationSteps);
+	m_ast = applyOptimisationSteps(m_dialect, m_nameDispenser, std::move(m_ast), _optimisationSteps);
 }
 
 ostream& phaser::operator<<(ostream& _stream, Program const& _program)
@@ -153,7 +153,7 @@ variant<unique_ptr<Block>, ErrorList> Program::parseObject(Dialect const& _diale
 	// to refactor ObjectParser and Object to use unique_ptr instead).
 	auto astCopy = make_unique<Block>(get<Block>(ASTCopier{}(*selectedObject->code)));
 
-	return variant<unique_ptr<Block>, ErrorList>(move(astCopy));
+	return variant<unique_ptr<Block>, ErrorList>(std::move(astCopy));
 }
 
 variant<unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Dialect const& _dialect, Block const& _ast)
@@ -168,7 +168,7 @@ variant<unique_ptr<AsmAnalysisInfo>, ErrorList> Program::analyzeAST(Dialect cons
 		return errors;
 
 	assert(errorReporter.errors().empty());
-	return variant<unique_ptr<AsmAnalysisInfo>, ErrorList>(move(analysisInfo));
+	return variant<unique_ptr<AsmAnalysisInfo>, ErrorList>(std::move(analysisInfo));
 }
 
 unique_ptr<Block> Program::disambiguateAST(
diff --git a/tools/yulPhaser/Selections.h b/tools/yulPhaser/Selections.h
index 88264e25a9..bd51cfe78e 100644
--- a/tools/yulPhaser/Selections.h
+++ b/tools/yulPhaser/Selections.h
@@ -86,7 +86,7 @@ class MosaicSelection: public Selection
 {
 public:
 	explicit MosaicSelection(std::vector<size_t> _pattern, double _selectionSize = 1.0):
-		m_pattern(move(_pattern)),
+		m_pattern(std::move(_pattern)),
 		m_selectionSize(_selectionSize)
 	{
 		assert(m_pattern.size() > 0 || _selectionSize == 0.0);

From 16c0838f75b9e2f31bae1dd9d4ea3238f44060a3 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Fri, 26 Aug 2022 14:33:59 +0200
Subject: [PATCH 0844/1748] Update docker images and tests

---
 .circleci/config.yml                          | 16 ++++++------
 .circleci/osx_install_dependencies.sh         |  4 +--
 CMakeLists.txt                                |  2 +-
 scripts/build_emscripten.sh                   |  4 +--
 .../abi/abi_encode_packed_hash.sol            |  5 ++--
 .../abi/abi_encode_with_selector_hash.sol     |  9 +++----
 .../abi/abi_encode_with_selector_vs_sig.sol   |  1 +
 .../abi/abi_encode_with_sig_hash.sol          |  4 +--
 .../abi/abi_encode_with_sig_simple.sol        |  2 +-
 .../push_as_lhs_and_rhs_bytes.sol             |  3 ++-
 .../external_calls/call_with_value_1.sol      |  2 +-
 .../external_calls/call_with_value_2.sol      |  2 +-
 .../external_call_from_constructor_3.sol      |  3 ++-
 .../external_call_this_with_value_1.sol       |  2 +-
 .../external_call_with_value_3.sol            |  4 +--
 ...nal_hash_known_code_state_reentrancy_2.sol |  4 +--
 ...h_known_code_state_reentrancy_indirect.sol |  4 ++-
 .../external_calls/external_reentrancy_1.sol  |  1 +
 .../external_calls/external_reentrancy_2.sol  |  4 +--
 .../function_selector/homer.sol               |  2 +-
 .../functions_storage_var_1_fail.sol          |  1 +
 .../imports/import_as_module_2.sol            |  8 ++++--
 .../inheritance/receive_fallback.sol          |  2 +-
 .../modifier_inside_branch_assignment.sol     |  4 ++-
 .../compound_assignment_division_3.sol        |  2 +-
 .../compound_bitwise_string_literal_3.sol     |  3 +--
 .../smtCheckerTests/out_of_bounds/array_1.sol |  3 ++-
 .../overflow/signed_guard_sub_overflow.sol    |  2 +-
 .../overflow/simple_overflow.sol              |  2 +-
 .../special/block_vars_chc_internal.sol       |  3 ++-
 .../special/tx_vars_reentrancy_1.sol          |  2 +-
 .../try_catch/try_public_var_mapping.sol      |  2 +-
 .../typecast/bytes_to_fixed_bytes_1.sol       |  8 ------
 .../typecast/bytes_to_fixed_bytes_1_fail.sol  | 25 +++++++++++++++++++
 .../typecast/string_to_bytes_push_1.sol       |  2 +-
 .../smtCheckerTests/types/array_branch_1d.sol |  4 ++-
 36 files changed, 86 insertions(+), 65 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1_fail.sol

diff --git a/.circleci/config.yml b/.circleci/config.yml
index af193b50fe..f040085b28 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,20 +9,20 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-13
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:aa64242ecba4f040a839eadfaf20e8489cf93d1cb96ab90df2b240cdbbfe7f7c"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-14
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d1ef23849db4c5462b248d89c111da4009b153cbd5002cb8755b0580312be581"
   ubuntu-2004-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-13
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:caaf8d42aaf07397d1540e570f096a4fb1ef11fda7da3f1141d8852ec8322a9e"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-14
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:beb8c91998ec0df99a488900b3723a06f1122f0954fc73786b6c53fd73a6408d"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-18
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:048002d71a1f86f83dedb79dd057760b752256c75646ba5ad5c1bbe92e1695aa"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-19
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8c9bf1813c261d781f4c65fceed2dfb3ecf5be9ecf49bddbd250b570a7f3baea"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-12
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:65a82268792a5a2ee85ad432baf04a056c3a4006941ab3a4416eb1a0614883f3"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-13
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:f1c13f3450d1f2e53ea18ac1ac1a17e932573cb9a5ccd0fd9ef6dd44f6402fa9"
   evm-version:
     type: string
     default: london
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 37502a7422..766091fdf1 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -61,11 +61,11 @@ then
   ./scripts/install_obsolete_jsoncpp_1_7_4.sh
 
   # z3
-  z3_version="4.8.17"
+  z3_version="4.11.0"
   z3_dir="z3-${z3_version}-x64-osx-10.16"
   z3_package="${z3_dir}.zip"
   wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
-  validate_checksum "$z3_package" 189667930517aee07f1ce36485d5924a9a2cb4f8c3c9586b03e714a2c657541a
+  validate_checksum "$z3_package" b6a4a6d587e4bfb0643db81129f0f447692fae13d4bd1bd4d93f1c0301b75ffc
   unzip "$z3_package"
   rm "$z3_package"
   cp "${z3_dir}/bin/libz3.a" /usr/local/lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8de3d1498..6680b75b28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/licens
 
 include(EthOptions)
 configure_project(TESTS)
-set(LATEST_Z3_VERSION "4.8.17")
+set(LATEST_Z3_VERSION "4.11.0")
 set(MINIMUM_Z3_VERSION "4.8.0")
 find_package(Z3)
 if (${Z3_FOUND})
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index a678d08ab3..43a402fd63 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -34,7 +34,7 @@ else
     BUILD_DIR="$1"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-12
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-13
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:65a82268792a5a2ee85ad432baf04a056c3a4006941ab3a4416eb1a0614883f3 \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:f1c13f3450d1f2e53ea18ac1ac1a17e932573cb9a5ccd0fd9ef6dd44f6402fa9 \
     ./scripts/ci/build_emscripten.sh "$BUILD_DIR"
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol
index a9608a828a..1cde510697 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol
@@ -11,7 +11,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
-// Warning 1218: (281-319): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (281-319): CHC: Assertion violation might happen here.
-// Warning 4661: (281-319): BMC: Assertion violation happens here.
+// Warning 6328: (281-319): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 0\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedHash(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol
index f60d5f52bc..ae6ea018f1 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_hash.sol
@@ -13,11 +13,8 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
 // Warning 2072: (161-176): Unused local variable.
-// Warning 1218: (379-417): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (436-474): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (379-417): CHC: Assertion violation might happen here.
-// Warning 6328: (436-474): CHC: Assertion violation might happen here.
-// Warning 4661: (379-417): BMC: Assertion violation happens here.
-// Warning 4661: (436-474): BMC: Assertion violation happens here.
+// Warning 6328: (379-417): CHC: Assertion violation happens here.
+// Warning 6328: (436-474): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
index b5346b049b..66ec1c69bc 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
@@ -9,5 +9,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Warning 1218: (294-324): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (294-324): CHC: Assertion violation might happen here.
 // Warning 7812: (294-324): BMC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
index 61e755d82d..00836f2288 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
@@ -13,7 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (394-432): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (337-375): CHC: Assertion violation happens here.
-// Warning 6328: (394-432): CHC: Assertion violation might happen here.
-// Warning 4661: (394-432): BMC: Assertion violation happens here.
+// Warning 6328: (394-432): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
index 96f3e48d9c..1fe781974a 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
@@ -25,7 +25,7 @@ contract C {
 // ----
 // Warning 5667: (107-122): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Warning 1218: (824-854): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (543-573): CHC: Assertion violation happens here.
+// Warning 6328: (543-573): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(sig, false, 0, 0, 0, a, b)
 // Warning 6328: (664-694): CHC: Assertion violation happens here.
 // Warning 6328: (713-743): CHC: Assertion violation happens here.
 // Warning 6328: (824-854): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
index 6126b5b10b..cf86c7c4d5 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
@@ -12,5 +12,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
-// Warning 6328: (203-244): CHC: Assertion violation happens here.
+// Warning 6328: (203-244): CHC: Assertion violation happens here.\nCounterexample:\nb = [0x0, 0x0]\nlength = 2\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
index f9293f6930..813185adf4 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_1.sol
@@ -12,5 +12,5 @@ contract C {
 // ----
 // Warning 9302: (96-117): Return value of low-level calls not used.
 // Warning 6328: (121-156): CHC: Assertion violation might happen here.
-// Warning 6328: (175-211): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0x0\n\nTransaction trace:\nC.constructor()\nC.g(0x0)\n    i.call{value: 10}("") -- untrusted external call
+// Warning 6328: (175-211): CHC: Assertion violation happens here.
 // Warning 4661: (121-156): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
index c386580800..968095bb2b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_with_value_2.sol
@@ -11,5 +11,5 @@ contract C {
 // ----
 // Warning 9302: (96-116): Return value of low-level calls not used.
 // Warning 6328: (120-156): CHC: Assertion violation might happen here.
-// Warning 6328: (175-210): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0x0\n\nTransaction trace:\nC.constructor()\nC.g(0x0)\n    i.call{value: 0}("") -- untrusted external call
+// Warning 6328: (175-210): CHC: Assertion violation happens here.
 // Warning 4661: (120-156): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
index 9d27d6d3b4..ba0dc90b07 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
@@ -18,6 +18,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (69-85): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
-// Warning 6328: (203-217): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 0\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 0\nC.f()
+// Warning 6328: (203-217): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 3\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 3\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
index c52e0773fb..06390b12ca 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (157-192): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h() -- trusted external call
+// Warning 6328: (157-192): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
index fa7ef4462b..2a535329ac 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_with_value_3.sol
@@ -14,8 +14,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 1218: (202-236): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (150-183): CHC: Assertion violation might happen here.
-// Warning 6328: (202-236): CHC: Assertion violation might happen here.
+// Warning 6328: (202-236): CHC: Assertion violation happens here.\nCounterexample:\n\ni = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    i.f{value: 20}() -- untrusted external call
 // Warning 4661: (150-183): BMC: Assertion violation happens here.
-// Warning 4661: (202-236): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
index 37509269b6..be9f698e15 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
@@ -42,6 +42,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 2018: (33-88): Function state mutability can be restricted to view
-// Warning 1218: (367-381): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (367-381): CHC: Assertion violation might happen here.
-// Warning 4661: (367-381): BMC: Assertion violation happens here.
+// Warning 6328: (367-381): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
index bd779b56a5..ea9764e17b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
@@ -44,5 +44,7 @@ contract C {
 // SMTIgnoreCex: yes
 // SMTIgnoreOS: macos
 // ----
+// Warning 1218: (437-463): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (419-433): CHC: Assertion violation happens here.
-// Warning 6328: (437-463): CHC: Assertion violation happens here.
+// Warning 6328: (437-463): CHC: Assertion violation might happen here.
+// Warning 4661: (437-463): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
index 5683a5248b..9cf0d3643f 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
@@ -15,6 +15,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 1218: (206-220): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (206-220): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
index 1e8ce8816a..19ff2bbad8 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
@@ -13,6 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (117-131): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (117-131): CHC: Assertion violation might happen here.
-// Warning 4661: (117-131): BMC: Assertion violation happens here.
+// Warning 6328: (117-131): CHC: Assertion violation happens here.\nCounterexample:\nlocked = false\ntarget = 0x0\n\nTransaction trace:\nC.constructor()\nState: locked = true\nC.call(0x0)\n    D(target).e() -- untrusted external call, synthesized as:\n        C.call(0x0) -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/function_selector/homer.sol b/test/libsolidity/smtCheckerTests/function_selector/homer.sol
index 552a4d895c..aaab884880 100644
--- a/test/libsolidity/smtCheckerTests/function_selector/homer.sol
+++ b/test/libsolidity/smtCheckerTests/function_selector/homer.sol
@@ -43,4 +43,4 @@ contract Homer is ERC165, Simpson {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (1340-1395): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nHomer.constructor()\nHomer.check()\n    Homer.supportsInterface(0x73b6b492) -- internal call\n    Homer.supportsInterface(0x01ffc9a7) -- internal call\n    Homer.supportsInterface(0x8b9eb9ca) -- internal call
+// Warning 6328: (1340-1395): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nHomer.constructor()\nHomer.supportsInterface(0x01ffc9a7)\nHomer.check()\n    Homer.supportsInterface(0x73b6b492) -- internal call\n    Homer.supportsInterface(0x01ffc9a7) -- internal call\n    Homer.supportsInterface(0x8b9eb9ca) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
index a7f0c879f8..e775c97a9a 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
@@ -13,5 +13,6 @@ contract C
 
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (112-125): CHC: Assertion violation happens here.\nCounterexample:\na = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0\nC.g()\n    C.f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol b/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
index 8ddef2da9e..bdf2e349c4 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
@@ -18,5 +18,9 @@ function f(uint _x) pure {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (A:50-64): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call\n    A:f(10) -- internal call\n    A:f(0) -- internal call
-// Warning 6328: (s1.sol:28-44): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call
+// Warning 1218: (A:50-64): CHC: Error trying to invoke SMT solver.
+// Warning 1218: (s1.sol:28-44): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (A:50-64): CHC: Assertion violation might happen here.
+// Warning 6328: (s1.sol:28-44): CHC: Assertion violation might happen here.
+// Warning 4661: (s1.sol:28-44): BMC: Assertion violation happens here.
+// Warning 4661: (A:50-64): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol b/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol
index 95ae120198..3d4c5e06aa 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/receive_fallback.sol
@@ -21,6 +21,6 @@ contract B is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (87-101): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.receive(){ msg.value: 2 }
+// Warning 6328: (87-101): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.receive(){ msg.value: 1 }
 // Warning 6328: (136-150): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()
 // Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 0\n\nTransaction trace:\nB.constructor()\nState: y = 0, x = 0\nB.fallback()
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
index f8091f9dff..d496baf6c1 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
@@ -20,4 +20,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (254-267): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, owner = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, owner = 0x0\nC.g(1)\n    C.f() -- internal call
+// Warning 1218: (254-267): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (254-267): CHC: Assertion violation might happen here.
+// Warning 4661: (254-267): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
index aa90aa2529..3e646ec3da 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
@@ -12,4 +12,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (162-181): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\np = 0\n\nTransaction trace:\nC.constructor()\nC.f(2, 0)
+// Warning 6328: (162-181): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
index b2d56cb128..3ac248fb22 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
@@ -18,5 +18,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (229-276): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x6062606464666060606260646466606060626064646660606062606464666060\nz = 0x6062606464666060606260646466606060626064646660606062606464666060\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (394-437): CHC: Assertion violation might happen here.
-// Warning 4661: (394-437): BMC: Assertion violation happens here.
+// Warning 6328: (394-437): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x63666566676e616263666566676e616263666566676e616263666566676e6162\nz = 0x63666566676e616263666566676e616263666566676e616263666566676e6162\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
index c26e64fccb..ee57f069d4 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
@@ -21,6 +21,7 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 4984: (112-115): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 3944: (181-184): CHC: Underflow (resulting value less than 0) might happen here.
 // Warning 6368: (259-263): CHC: Out of bounds access happens here.\nCounterexample:\na = [0], l = 1\n = 0\n\nTransaction trace:\nC.constructor()\nState: a = [], l = 0\nC.p()\nState: a = [0], l = 1\nC.r()
-// Info 1180: Contract invariant(s) for :C:\n((a.length + ((- 1) * l)) <= 0)\n
 // Warning 2661: (112-115): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4144: (181-184): BMC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
index b28b6598c7..95221c912e 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
@@ -8,4 +8,4 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.\nCounterexample:\n\nx = 0\ny = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, (- 57896044618658097711785492504343953926634992332820282019728792003956564819968))
+// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.\nCounterexample:\n\nx = 57896044618658097711785492504343953926634992332820282019728792003956564819967\ny = (- 1)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(57896044618658097711785492504343953926634992332820282019728792003956564819967, (- 1))
diff --git a/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
index e8cf49a832..d872cb6694 100644
--- a/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
@@ -4,4 +4,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\na = 1\nb = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(1, 115792089237316195423570985008687907853269984665640564039457584007913129639935)
+// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\na = 115792089237316195423570985008687907853269984665640564039457584007913129639935\nb = 1\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(115792089237316195423570985008687907853269984665640564039457584007913129639935, 1)
diff --git a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
index 6e4f5a6209..ab355dbd25 100644
--- a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
@@ -31,5 +31,6 @@ contract C {
 }
 // ====
 // SMTEngine: chc
+// SMTIgnoreOS: macos
 // ----
-// Warning 6328: (770-799): CHC: Assertion violation happens here.\nCounterexample:\ncoin = 0x1e28, dif = 0, gas = 0, number = 0, timestamp = 0\n\nTransaction trace:\nC.constructor()\nState: coin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\nC.f(){ block.coinbase: 0x1e28, block.difficulty: 0, block.gaslimit: 0, block.number: 0, block.timestamp: 0 }\n    C.g() -- internal call
+// Warning 6328: (770-799): CHC: Assertion violation happens here.\nCounterexample:\ncoin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\n\nTransaction trace:\nC.constructor()\nState: coin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\nC.f(){ block.coinbase: 0x0, block.difficulty: 0, block.gaslimit: 0, block.number: 0, block.timestamp: 0 }\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
index f1fed73c02..7d9c0ca567 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
@@ -13,4 +13,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 9726\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 2070 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 0 } -- reentrant call\n            _i.f() -- untrusted external call
+// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 868\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 500 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 0 } -- reentrant call\n            _i.f() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
index 627d06a2d0..43f4b5f03f 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
@@ -21,4 +21,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (280-300): CHC: Assertion violation happens here.
+// Warning 6328: (280-300): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
index 91166baa8d..1d00e7fe3b 100644
--- a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
@@ -3,20 +3,12 @@ contract C {
 		bytes memory b = hex"00010203040506070809000102030405060708090001020304050607080900010203040506070809";
 		bytes8 c = bytes8(b);
 		assert(c == 0x0001020304050607); // should hold
-		assert(c == 0x0001020304050608); // should fail
 		bytes16 d = bytes16(b);
 		assert(d == 0x00010203040506070809000102030405);
-		assert(d == 0x00010203040506070809000102030406); // should fail
 		bytes24 e = bytes24(b);
 		assert(e == 0x000102030405060708090001020304050607080900010203); // should hold
-		assert(e == 0x000102030405060708090001020304050607080900010204); // should fail
 		bytes32 g = bytes32(b);
 		assert(g == 0x0001020304050607080900010203040506070809000102030405060708090001); // should hold
-		assert(g == 0x0001020304050607080900010203040506070809000102030405060708090002); // should fail
 	}
 }
 // ----
-// Warning 6328: (225-256): CHC: Assertion violation happens here.\nCounterexample:\n\nc = 0x01020304050607\nd = 0x0\ne = 0x0\ng = 0x0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (352-399): CHC: Assertion violation happens here.\nCounterexample:\n\nc = 0x01020304050607\nd = 0x010203040506070809000102030405\ne = 0x0\ng = 0x0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (526-589): CHC: Assertion violation happens here.\nCounterexample:\n\nc = 0x01020304050607\nd = 0x010203040506070809000102030405\ne = 0x0102030405060708090001020304050607080900010203\ng = 0x0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (732-811): CHC: Assertion violation happens here.\nCounterexample:\n\nc = 0x01020304050607\nd = 0x010203040506070809000102030405\ne = 0x0102030405060708090001020304050607080900010203\ng = 0x01020304050607080900010203040506070809000102030405060708090001\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1_fail.sol b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1_fail.sol
new file mode 100644
index 0000000000..40cd27776e
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1_fail.sol
@@ -0,0 +1,25 @@
+contract C {
+	function f() external pure {
+		bytes memory b = hex"00010203040506070809000102030405060708090001020304050607080900010203040506070809";
+		bytes8 c = bytes8(b);
+		//assert(c == 0x0001020304050607); // should hold
+		assert(c == 0x0001020304050608); // should fail
+		bytes16 d = bytes16(b);
+		//assert(d == 0x00010203040506070809000102030405);
+		assert(d == 0x00010203040506070809000102030406); // should fail
+		bytes24 e = bytes24(b);
+		//assert(e == 0x000102030405060708090001020304050607080900010203); // should hold
+		assert(e == 0x000102030405060708090001020304050607080900010204); // should fail
+		bytes32 g = bytes32(b);
+		//assert(g == 0x0001020304050607080900010203040506070809000102030405060708090001); // should hold
+		assert(g == 0x0001020304050607080900010203040506070809000102030405060708090002); // should fail
+	}
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (227-258): CHC: Assertion violation happens here.
+// Warning 6328: (356-403): CHC: Assertion violation happens here.
+// Warning 6328: (532-595): CHC: Assertion violation happens here.
+// Warning 6328: (740-819): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
index 4910c417e8..33546b49c0 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (132-160): CHC: Assertion violation happens here.\nCounterexample:\nx = [0x61, 0x62, 0x63, 0x61]\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.s()
+// Warning 6328: (132-160): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.s()
diff --git a/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
index b04c632e91..b6f19302b8 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
@@ -12,4 +12,6 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (143-159): CHC: Assertion violation happens here.
+// Warning 1218: (143-159): CHC: Error trying to invoke SMT solver.
+// Warning 6328: (143-159): CHC: Assertion violation might happen here.
+// Warning 4661: (143-159): BMC: Assertion violation happens here.

From 22e4e2cdc9770d836e57ee28cfc2a55072e51788 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 30 Aug 2022 11:02:14 +0200
Subject: [PATCH 0845/1748] disable SMT tests for the clang job

---
 .circleci/config.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f040085b28..f016a48c5e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1087,6 +1087,9 @@ jobs:
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
+      # The high parallelism in this job is causing the SMT tests to run out of memory,
+      # so disabling for now.
+      SOLTEST_FLAGS: --no-smt
     <<: *steps_soltest
 
   t_ubu_release_soltest_all: &t_ubu_release_soltest_all

From e96453d585e30dc04e1d9554c3bfd5af852dc3ca Mon Sep 17 00:00:00 2001
From: NoFaceDev <NoFaceDev@protonmail.com>
Date: Sat, 23 Jul 2022 18:22:06 +0400
Subject: [PATCH 0846/1748] Added details on placeholders in function-modifiers

Author:    NoFaceDev <NoFaceDev@protonmail.com>
Date:      Sat Jul 23 18:22:06 2022 +0400
---
 docs/contracts/function-modifiers.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/contracts/function-modifiers.rst b/docs/contracts/function-modifiers.rst
index 2445895e41..f231195448 100644
--- a/docs/contracts/function-modifiers.rst
+++ b/docs/contracts/function-modifiers.rst
@@ -111,6 +111,12 @@ whitespace-separated list and are evaluated in the order presented.
 Modifiers cannot implicitly access or change the arguments and return values of functions they modify.
 Their values can only be passed to them explicitly at the point of invocation.
 
+In function modifiers, it is necessary to specify when you want the function to which the modifier is
+applied to be run. The placeholder statement (denoted by a single underscore character ``_``) is used to
+denote where the body of the function being modified should be inserted. Note that the
+placeholder operator is different from using underscores as leading or trailing characters in variable
+names, which is a stylistic choice.
+
 Explicit returns from a modifier or function body only leave the current
 modifier or function body. Return variables are assigned and
 control flow continues after the ``_`` in the preceding modifier.

From cbcd8a724b1cccaad8bcfee3d54180fdd441d79b Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Fri, 26 Aug 2022 12:40:23 +0200
Subject: [PATCH 0847/1748] Update z3 to 4.11.0

---
 scripts/docker/buildpack-deps/Dockerfile.emscripten           | 4 ++--
 .../docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004           | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 237405c4c6..ba36541e55 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -33,7 +33,7 @@
 # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
 # dependencies automatically.
 FROM emscripten/emsdk:3.1.19 AS base
-LABEL version="12"
+LABEL version="13"
 
 ADD emscripten.jam /usr/src
 RUN set -ex && \
@@ -42,7 +42,7 @@ RUN set -ex && \
 	apt-get install lz4 --no-install-recommends && \
 	\
 	cd /usr/src && \
-	git clone https://github.com/Z3Prover/z3.git -b z3-4.8.17 --depth 1 && \
+	git clone https://github.com/Z3Prover/z3.git -b z3-4.11.0 --depth 1 && \
 	cd z3 && \
 	mkdir build && \
 	cd build && \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index 2fe04622bf..d5481604a7 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="18"
+LABEL version="19"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -61,7 +61,7 @@ RUN set -ex; \
 
 # Z3
 RUN set -ex; \
-    git clone --depth 1 -b z3-4.8.17 https://github.com/Z3Prover/z3.git \
+    git clone --depth 1 -b z3-4.11.0 https://github.com/Z3Prover/z3.git \
     /usr/src/z3; \
     cd /usr/src/z3; \
     mkdir build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 2f3304c1ee..6cac5cc867 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="13"
+LABEL version="14"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
index 0a11680b88..dc5acbcdc8 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="13"
+LABEL version="14"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -38,7 +38,7 @@ RUN set -ex; \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
 		clang \
-		libz3-static-dev jq \
+		libz3-static-dev z3-static jq \
 		; \
 	rm -rf /var/lib/apt/lists/*
 

From 79adec08f25e501226ea31a67711565f5140c390 Mon Sep 17 00:00:00 2001
From: Taylor Ferran <tailzpk@hotmail.co.uk>
Date: Sat, 13 Aug 2022 13:25:27 +0100
Subject: [PATCH 0848/1748] Add detail about limitation in voting contract
 example

---
 docs/examples/voting.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/docs/examples/voting.rst b/docs/examples/voting.rst
index ad1c2d30d4..de899da7ab 100644
--- a/docs/examples/voting.rst
+++ b/docs/examples/voting.rst
@@ -193,5 +193,8 @@ of votes.
 Possible Improvements
 =====================
 
-Currently, many transactions are needed to assign the rights
-to vote to all participants. Can you think of a better way?
+Currently, many transactions are needed to
+assign the rights to vote to all participants.
+Moreover, if two or more proposals have the same
+number of votes, ``winningProposal()`` is not able
+to register a tie. Can you think of a way to fix these issues?
\ No newline at end of file

From b676944c3ffd07fb5d1c4eccc6f8ac96cbadb9b7 Mon Sep 17 00:00:00 2001
From: Luke Hutchison <luke.hutch@gmail.com>
Date: Sat, 25 Jun 2022 17:49:28 -0600
Subject: [PATCH 0849/1748] Update security-considerations.rst

Explained Checks-Effects-Interactions and added info on Checks-Effects-Events-Interactions
---
 docs/security-considerations.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/security-considerations.rst b/docs/security-considerations.rst
index ceadfd0bc0..6507f7c1c2 100644
--- a/docs/security-considerations.rst
+++ b/docs/security-considerations.rst
@@ -98,7 +98,7 @@ as it uses ``call`` which forwards all remaining gas by default:
     }
 
 To avoid re-entrancy, you can use the Checks-Effects-Interactions pattern as
-outlined further below:
+demonstrated below:
 
 .. code-block:: solidity
 
@@ -116,6 +116,13 @@ outlined further below:
         }
     }
 
+The Checks-Effects-Interactions pattern ensures that all code paths through a contract complete all required checks
+of the supplied parameters before modifying the contract's state (Checks); only then it makes any changes to the state (Effects);
+it may make calls to functions in other contracts *after* all planned state changes have been written to
+storage (Interactions). This is a common foolproof way to prevent *re-entrancy attacks*, where an externally called
+malicious contract is able to double-spend an allowance, double-withdraw a balance, among other things, by using logic that calls back into the
+original contract before it has finalized its transaction.
+
 Note that re-entrancy is not only an effect of Ether transfer but of any
 function call on another contract. Furthermore, you also have to take
 multi-contract situations into account. A called contract could modify the

From 6e1f0e73b60ca7309e309560dc37694fb2ee3641 Mon Sep 17 00:00:00 2001
From: Leonid Pospelov <pospelovlm@yandex.ru>
Date: Wed, 31 Aug 2022 01:50:30 +0300
Subject: [PATCH 0850/1748] Set CMP0115 to new in EthPolicy

---
 cmake/EthPolicy.cmake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cmake/EthPolicy.cmake b/cmake/EthPolicy.cmake
index f571a09cee..adde3b742f 100644
--- a/cmake/EthPolicy.cmake
+++ b/cmake/EthPolicy.cmake
@@ -25,4 +25,10 @@ macro (eth_policy)
 	if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
 		cmake_policy(SET CMP0135 NEW)
 	endif()
+
+	if(POLICY CMP0115)
+		# speedup of cmake command on Windows
+		# https://gitlab.kitware.com/cmake/cmake/-/issues/23154
+		cmake_policy(SET CMP0115 NEW)
+	endif()
 endmacro()

From 6d331a8c8aa8db234ef7bb9d89a8cfa86452f00a Mon Sep 17 00:00:00 2001
From: Leonid Pospelov <pospelovlm@yandex.ru>
Date: Wed, 31 Aug 2022 12:12:15 +0300
Subject: [PATCH 0851/1748] Improve comment on CMP0115
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <cameel2@gmail.com>
---
 cmake/EthPolicy.cmake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/cmake/EthPolicy.cmake b/cmake/EthPolicy.cmake
index adde3b742f..eb5c37e246 100644
--- a/cmake/EthPolicy.cmake
+++ b/cmake/EthPolicy.cmake
@@ -27,7 +27,8 @@ macro (eth_policy)
 	endif()
 
 	if(POLICY CMP0115)
-		# speedup of cmake command on Windows
+		# Require explicit extensions for source files, do not guess.
+		# The extra calls to GetFileAttributesW significantly slow down cmake on Windows.
 		# https://gitlab.kitware.com/cmake/cmake/-/issues/23154
 		cmake_policy(SET CMP0115 NEW)
 	endif()

From 66994b68d797d7802e7d3bcb5dfa3cf73a38e8f0 Mon Sep 17 00:00:00 2001
From: xternet <pm@xternet.dev>
Date: Wed, 31 Aug 2022 15:01:46 +0200
Subject: [PATCH 0852/1748] README.md: added comma

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 1f00465323..9637503b0e 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ network where nobody has special authority over the execution, and thus they all
 ownership, voting, and other kinds of logic.
 
 When deploying contracts, you should use the latest released version of
-Solidity. This is because breaking changes, as well as new features and bug fixes are
+Solidity. This is because breaking changes, as well as new features and bug fixes, are
 introduced regularly. We currently use a 0.x version
 number [to indicate this fast pace of change](https://semver.org/#spec-item-4).
 

From e5769d784e9dec348835ec1a83f42dd6cce97b3f Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 5 Sep 2022 12:11:26 +0200
Subject: [PATCH 0853/1748] Fix compiler version check in hardhat artifacts
 json

---
 test/externalTests/common.sh   | 4 ++--
 test/externalTests/zeppelin.sh | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index c510ebc92f..d8f7e80b8e 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -357,8 +357,8 @@ function hardhat_verify_compiler_version
     local build_info_files
     build_info_files=$(find . -path '*artifacts/build-info/*.json')
     for build_info_file in $build_info_files; do
-        grep '"solcVersion": "'"${solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
-        grep '"solcLongVersion": "'"${full_solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
+        grep '"solcVersion":[[:blank:]]*"'"${solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
+        grep '"solcLongVersion":[[:blank:]]*"'"${full_solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
     done
 }
 
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 8d73ad1d2e..3cb7a720f1 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -108,6 +108,8 @@ function zeppelin_test
     sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js
     sed -i "s|it(\('prevents initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
     sed -i "s|it(\('divide by 0'\)|it.skip(\1|g" test/utils/math/Math.test.js
+    sed -i "s|it(\('pending owner resets after renouncing ownership'\)|it.skip(\1|g" test/access/Ownable2Step.test.js
+    sed -i "s|it(\('guards transfer against invalid user'\)|it.skip(\1|g" test/access/Ownable2Step.test.js
     # CAUTION:: The following two sed commands depend on the order of occurrence of the relevant patterns in the mentioned files.
     # Could result in an error in the future.
     sed -zi "s|it(\('deposit'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC4626.test.js

From 1f6a299062381ec3f317d50fa97efd1fbfb3e98e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 1 Sep 2022 10:55:29 +0200
Subject: [PATCH 0854/1748] Add a check for unqualified move

---
 libyul/backends/evm/EVMDialect.cpp |  2 +-
 scripts/check_style.sh             |  2 ++
 solc/CommandLineInterface.cpp      | 10 +++++-----
 solc/CommandLineParser.cpp         |  4 ++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 0f5c307e32..71b9dba4ce 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -83,7 +83,7 @@ pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
 	};
 
 	YulString name = f.name;
-	return {name, move(f)};
+	return {name, std::move(f)};
 }
 
 pair<YulString, BuiltinFunctionForEVM> createFunction(
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 601981b5cb..d1ad6bb9e9 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -54,6 +54,8 @@ FORMATERROR=$(
     preparedGrep "[a-zA-Z0-9_]\s*[&][a-zA-Z_]" | grep -E -v "return [&]" # right-aligned reference ampersand (needs to exclude return)
     # right-aligned reference pointer star (needs to exclude return and comments)
     preparedGrep "[a-zA-Z0-9_]\s*[*][a-zA-Z_]" | grep -E -v -e "return [*]" -e "^* [*]" -e "^*//.*"
+    # unqualified move check, i.e. make sure that std::move() is used instead of move()
+    preparedGrep "move\(.+\)" | grep -v "std::move" | grep -E "[^a-z]move"
 ) | grep -E -v -e "^[a-zA-Z\./]*:[0-9]*:\s*\/(\/|\*)" -e "^test/" || true
 )
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index f841c2b63c..e215405a12 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -498,11 +498,11 @@ void CommandLineInterface::readInputFiles()
 		if (m_options.input.mode == InputMode::StandardJson)
 		{
 			solAssert(!m_standardJsonInput.has_value(), "");
-			m_standardJsonInput = move(fileContent);
+			m_standardJsonInput = std::move(fileContent);
 		}
 		else
 		{
-			m_fileReader.addOrUpdateFile(infile, move(fileContent));
+			m_fileReader.addOrUpdateFile(infile, std::move(fileContent));
 			m_fileReader.allowDirectory(boost::filesystem::canonical(infile).remove_filename());
 		}
 	}
@@ -546,7 +546,7 @@ map<string, Json::Value> CommandLineInterface::parseAstFromInput()
 			astAssert(ast["sources"][src].isMember(astKey), "astkey is not member");
 			astAssert(ast["sources"][src][astKey]["nodeType"].asString() == "SourceUnit",  "Top-level node should be a 'SourceUnit'");
 			astAssert(sourceJsons.count(src) == 0, "All sources must have unique names");
-			sourceJsons.emplace(src, move(ast["sources"][src][astKey]));
+			sourceJsons.emplace(src, std::move(ast["sources"][src][astKey]));
 			tmpSources[src] = util::jsonCompactPrint(ast);
 		}
 	}
@@ -643,7 +643,7 @@ void CommandLineInterface::processInput()
 		solAssert(m_standardJsonInput.has_value(), "");
 
 		StandardCompiler compiler(m_fileReader.reader(), m_options.formatting.json);
-		sout() << compiler.compile(move(m_standardJsonInput.value())) << endl;
+		sout() << compiler.compile(std::move(m_standardJsonInput.value())) << endl;
 		m_standardJsonInput.reset();
 		break;
 	}
@@ -977,7 +977,7 @@ void CommandLineInterface::link()
 		while (!src.second.empty() && *prev(src.second.end()) == '\n')
 			src.second.resize(src.second.size() - 1);
 	}
-	m_fileReader.setSourceUnits(move(sourceCodes));
+	m_fileReader.setSourceUnits(std::move(sourceCodes));
 }
 
 void CommandLineInterface::writeLinkedFiles()
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 319f29de60..2c765d0e30 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -309,7 +309,7 @@ void CommandLineParser::parseInputPathsAndRemappings()
 					m_options.input.allowedDirectories.insert(remappingDir.empty() ? "." : remappingDir);
 				}
 
-				m_options.input.remappings.emplace_back(move(remapping.value()));
+				m_options.input.remappings.emplace_back(std::move(remapping.value()));
 			}
 			else if (positionalArg == "-")
 				m_options.input.addStdin = true;
@@ -1218,7 +1218,7 @@ void CommandLineParser::processArgs()
 		optional<ModelCheckerContracts> contracts = ModelCheckerContracts::fromString(contractsStr);
 		if (!contracts)
 			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerContracts + ": " + contractsStr);
-		m_options.modelChecker.settings.contracts = move(*contracts);
+		m_options.modelChecker.settings.contracts = std::move(*contracts);
 	}
 
 	if (m_args.count(g_strModelCheckerDivModNoSlacks))

From 71a9fb25ed211f0017dc26b71193b8a8e8f8d1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 15:39:11 +0200
Subject: [PATCH 0855/1748] ReleaseChecklist: Documentation now gets built
 automatically from tags

---
 ReleaseChecklist.md | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 6d07ae011c..e5d8cd8fc9 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -3,7 +3,6 @@
 ### Requirements
  - [ ] Lauchpad (Ubuntu One) account
  - [ ] gnupg key (has to be version 1, gpg2 won't work) for `your-name@ethereum.org` created and uploaded
- - [ ] Readthedocs account, access to the Solidity project
  - [ ] Write access to https://github.com/ethereum/homebrew-ethereum
 
 ### Documentation check
@@ -50,10 +49,6 @@
  - [ ] Run ``scripts/release_ppa.sh v$VERSION`` to create the PPA release (you need the relevant openssl key).
  - [ ] Wait for the ``~ethereum/ubuntu/ethereum-static`` PPA build to be finished and published for *all platforms*. SERIOUSLY: DO NOT PROCEED EARLIER!!! *After* the static builds are *published*, copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA for the destination series ``Trusty``, ``Xenial`` and ``Bionic`` while selecting ``Copy existing binaries``.
 
-### Documentation
- - [ ] Build the new version on https://readthedocs.org/projects/solidity/ (select `latest` at the bottom of the page and click `BUILD`).
- - [ ] In the admin panel, select `Versions` in the menu and set the default version to the released one.
-
 ### Release solc-js
  - [ ] Wait until solc-bin was properly deployed. You can test this via remix - a test run through remix is advisable anyway.
  - [ ] Increment the version number, create a pull request for that, merge it after tests succeeded.
@@ -62,6 +57,8 @@
  - [ ] Create a tag using ``git tag --annotate v$VERSION`` and push it with ``git push --tags``.
 
 ### Post-release
+ - [ ] Make sure the documentation for the new release has been published successfully.
+       Go to https://readthedocs.org/projects/solidity/ and verify that the new version is listed, works and is marked as default.
  - [ ] Publish the blog post.
  - [ ] Create a commit to increase the version number on ``develop`` in ``CMakeLists.txt`` and add a new skeleton changelog entry.
  - [ ] Announce on Twitter, including links to the release and the blog post.

From dd2f718b996556a5ee76e65b07e8772d2350727f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 16:21:38 +0200
Subject: [PATCH 0856/1748] ReleaseChecklist: Regenerating the bug list does
 not require running the whole tests.sh

---
 ReleaseChecklist.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index e5d8cd8fc9..2bd84b8842 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -14,7 +14,7 @@
 ### Changelog
  - [ ] Sort the changelog entries alphabetically and correct any errors you notice.
  - [ ] Create a commit on a new branch that updates the ``Changelog`` to include a release date.
- - [ ] Run ``./scripts/tests.sh`` to update the bug list.
+ - [ ] Run ``scripts/update_bugs_by_version.py`` to regenerate ``bugs_by_version.json`` from the changelog and ``bugs.json``.
  - [ ] Create a pull request and wait for the tests, merge it.
 
 ### Create the Release

From b9d06b48a2e559b87a5023e43cd9d49f920d4daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 17:46:44 +0200
Subject: [PATCH 0857/1748] ReleaseChecklist: More detailed steps related to
 blog posts

---
 ReleaseChecklist.md | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 2bd84b8842..7c78db457d 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -5,17 +5,19 @@
  - [ ] gnupg key (has to be version 1, gpg2 won't work) for `your-name@ethereum.org` created and uploaded
  - [ ] Write access to https://github.com/ethereum/homebrew-ethereum
 
+### Blog Post
+ - [ ] Create a post on [solidity-blog](https://github.com/ethereum/solidity-blog) in the ``Releases`` category and explain some of the new features or concepts.
+ - [ ] Create a post on [solidity-blog](https://github.com/ethereum/solidity-blog) in the ``Security Alerts`` category in case of important bug(s).
+
 ### Documentation check
  - [ ] Run `make linkcheck` from within `docs/` and fix any broken links it finds. Ignore false positives caused by `href` anchors and dummy links not meant to work.
 
-### Blog Post
- - [ ] Create a post on https://github.com/ethereum/solidity-blog and explain some of the new features or concepts.
-
 ### Changelog
  - [ ] Sort the changelog entries alphabetically and correct any errors you notice.
  - [ ] Create a commit on a new branch that updates the ``Changelog`` to include a release date.
  - [ ] Run ``scripts/update_bugs_by_version.py`` to regenerate ``bugs_by_version.json`` from the changelog and ``bugs.json``.
  - [ ] Create a pull request and wait for the tests, merge it.
+ - [ ] Copy the changelog into the release blog post.
 
 ### Create the Release
  - [ ] Create Github release page: https://github.com/ethereum/solidity/releases/new
@@ -59,9 +61,11 @@
 ### Post-release
  - [ ] Make sure the documentation for the new release has been published successfully.
        Go to https://readthedocs.org/projects/solidity/ and verify that the new version is listed, works and is marked as default.
- - [ ] Publish the blog post.
+ - [ ] Publish the blog posts.
  - [ ] Create a commit to increase the version number on ``develop`` in ``CMakeLists.txt`` and add a new skeleton changelog entry.
  - [ ] Announce on Twitter, including links to the release and the blog post.
- - [ ] Share announcement on Reddit and Solidity forum.
+       Use ``#xp`` at the end of the tweet to automatically cross post the announcement to Fosstodon.
+ - [ ] Share the announcement on Reddit in [``/r/ethdev``](https://reddit.com/r/ethdev/), cross-posted to [``/r/ethereum``](https://reddit.com/r/ethereum/).
+ - [ ] Share the announcement the [Solidity forum](https://forum.soliditylang.org) in the ``Announcements`` category.
  - [ ] Update the release information section on [soliditylang.org](https://github.com/ethereum/solidity-portal).
  - [ ] Lean back, wait for bug reports and repeat from step 1 :)

From 3f437da2a40fc1568b07b4003c336fea4a0211d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 18:14:25 +0200
Subject: [PATCH 0858/1748] ReleaseChecklist: Emphasize separate changelog and
 version commits

---
 ReleaseChecklist.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 7c78db457d..821588f37e 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -13,10 +13,11 @@
  - [ ] Run `make linkcheck` from within `docs/` and fix any broken links it finds. Ignore false positives caused by `href` anchors and dummy links not meant to work.
 
 ### Changelog
- - [ ] Sort the changelog entries alphabetically and correct any errors you notice.
- - [ ] Create a commit on a new branch that updates the ``Changelog`` to include a release date.
+ - [ ] Sort the changelog entries alphabetically and correct any errors you notice. Commit it.
+ - [ ] Update the changelog to include a release date.
  - [ ] Run ``scripts/update_bugs_by_version.py`` to regenerate ``bugs_by_version.json`` from the changelog and ``bugs.json``.
- - [ ] Create a pull request and wait for the tests, merge it.
+       Make sure that the resulting ``bugs_by_version.json`` has a new, empty entry for the new version.
+ - [ ] Commit changes, create a pull request and wait for the tests. Then merge it.
  - [ ] Copy the changelog into the release blog post.
 
 ### Create the Release

From 33883059ed1fb2f7915ffad8f2f8c0637f6f4de9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Aug 2022 18:17:38 +0200
Subject: [PATCH 0859/1748] ReleaseChecklist: Add "still in progress" warning
 and make the release page a single point

---
 ReleaseChecklist.md | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 821588f37e..2a680bd25d 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -21,11 +21,13 @@
  - [ ] Copy the changelog into the release blog post.
 
 ### Create the Release
- - [ ] Create Github release page: https://github.com/ethereum/solidity/releases/new
- - [ ] On the release page, select the ``develop`` branch as new target and set tag to the new version (e.g. `v0.8.5`) (make sure you only `SAVE DRAFT` instead of `PUBLISH RELEASE` before the actual release)
- - [ ] Thank voluntary contributors in the Github release page (use ``git shortlog -s -n -e v0.5.3..origin/develop``).
+ - [ ] Create a [release on github](https://github.com/ethereum/solidity/releases/new).
+       Set the target to the ``develop`` branch and the tag to the new version, e.g. `v0.8.5`.
+       Include the following warning: ``**The release is still in progress and the binaries may not yet be available from all sources.**``.
+       Don't publish it yet - click the ``Save draft`` button instead.
+ - [ ] Thank voluntary contributors in the Github release notes (use ``git shortlog -s -n -e v0.5.3..origin/develop``).
  - [ ] Check that all tests on the latest commit in ``develop`` are green.
- - [ ] Click the `PUBLISH RELEASE` button on the release page, creating the tag.
+ - [ ] Click the `Publish release` button on the release page, creating the tag.
  - [ ] Wait for the CI runs on the tag itself.
 
 ### Upload Release Artifacts and Publish Binaries
@@ -62,6 +64,7 @@
 ### Post-release
  - [ ] Make sure the documentation for the new release has been published successfully.
        Go to https://readthedocs.org/projects/solidity/ and verify that the new version is listed, works and is marked as default.
+ - [ ] Remove "still in progress" warning from the release notes.
  - [ ] Publish the blog posts.
  - [ ] Create a commit to increase the version number on ``develop`` in ``CMakeLists.txt`` and add a new skeleton changelog entry.
  - [ ] Announce on Twitter, including links to the release and the blog post.

From d9f169eb4b346ad1953bcca10f08b6fbe4486258 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 9 Aug 2022 10:57:33 +0200
Subject: [PATCH 0860/1748] ReleaseChecklist: Consistently use double backticks
 everywhere, fix indents and mismatched parentheses

---
 ReleaseChecklist.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 2a680bd25d..3df38321a7 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -2,7 +2,7 @@
 
 ### Requirements
  - [ ] Lauchpad (Ubuntu One) account
- - [ ] gnupg key (has to be version 1, gpg2 won't work) for `your-name@ethereum.org` created and uploaded
+ - [ ] gnupg key (has to be version 1, gpg2 won't work) for ``your-name@ethereum.org`` created and uploaded
  - [ ] Write access to https://github.com/ethereum/homebrew-ethereum
 
 ### Blog Post
@@ -10,7 +10,7 @@
  - [ ] Create a post on [solidity-blog](https://github.com/ethereum/solidity-blog) in the ``Security Alerts`` category in case of important bug(s).
 
 ### Documentation check
- - [ ] Run `make linkcheck` from within `docs/` and fix any broken links it finds. Ignore false positives caused by `href` anchors and dummy links not meant to work.
+ - [ ] Run ``make linkcheck`` from within ``docs/`` and fix any broken links it finds. Ignore false positives caused by ``href`` anchors and dummy links not meant to work.
 
 ### Changelog
  - [ ] Sort the changelog entries alphabetically and correct any errors you notice. Commit it.
@@ -22,12 +22,12 @@
 
 ### Create the Release
  - [ ] Create a [release on github](https://github.com/ethereum/solidity/releases/new).
-       Set the target to the ``develop`` branch and the tag to the new version, e.g. `v0.8.5`.
+       Set the target to the ``develop`` branch and the tag to the new version, e.g. ``v0.8.5``.
        Include the following warning: ``**The release is still in progress and the binaries may not yet be available from all sources.**``.
        Don't publish it yet - click the ``Save draft`` button instead.
  - [ ] Thank voluntary contributors in the Github release notes (use ``git shortlog -s -n -e v0.5.3..origin/develop``).
  - [ ] Check that all tests on the latest commit in ``develop`` are green.
- - [ ] Click the `Publish release` button on the release page, creating the tag.
+ - [ ] Click the ``Publish release`` button on the release page, creating the tag.
  - [ ] Wait for the CI runs on the tag itself.
 
 ### Upload Release Artifacts and Publish Binaries
@@ -36,7 +36,7 @@
  - [ ] Run ``scripts/create_source_tarball.sh`` while being on the tag to create the source tarball. This will create the tarball in a directory called ``upload``.
  - [ ] Take the tarball from the upload directory (its name should be ``solidity_x.x.x.tar.gz``, otherwise ``prerelease.txt`` was missing in the step before) and upload the source tarball to the release page.
  - [ ] Take the ``github-binaries.tar`` tarball from ``c_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to the release page.
-   Make sure it contains four binaries: ``solc-windows.exe``, ``solc-macos``, ``solc-static-linux`` and ``soljson.js``.
+       Make sure it contains four binaries: ``solc-windows.exe``, ``solc-macos``, ``solc-static-linux`` and ``soljson.js``.
  - [ ] Take the ``solc-bin-binaries.tar`` tarball from ``c_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to solc-bin.
  - [ ] Run ``./update --reuse-hashes`` in ``solc-bin`` and verify that the script has updated ``list.js``, ``list.txt`` and ``list.json`` files correctly and that symlinks to the new release have been added in ``solc-bin/wasm/`` and ``solc-bin/emscripten-wasm32/``.
  - [ ] Create a pull request in solc-bin and merge.
@@ -46,13 +46,17 @@
  - [ ] Update the version and the hash (``sha256sum solidity_$VERSION.tar.gz``) in https://github.com/ethereum/homebrew-ethereum/blob/master/solidity.rb
 
 ### Docker
- - [ ] Run ``./scripts/docker_deploy_manual.sh v$VERSION``).
+ - [ ] Run ``./scripts/docker_deploy_manual.sh v$VERSION``.
 
 ### PPA
- - [ ] Make sure the ``ethereum/cpp-build-deps`` PPA repository contains libz3-static-dev builds for all current versions of ubuntu. If not run ``scripts/deps-ppa/static-z3.sh`` (after changing email address and key id and adding the missing ubuntu version) and wait for the builds to succeed before continuing.
+ - [ ] Make sure the ``ethereum/cpp-build-deps`` PPA repository contains ``libz3-static-dev builds`` for all current versions of ubuntu.
+       If not run ``scripts/deps-ppa/static-z3.sh`` (after changing email address and key id and adding the missing ubuntu version) and wait for the builds to succeed before continuing.
  - [ ] Change ``scripts/release_ppa.sh`` to match your key's email and key id; double-check that ``DISTRIBUTIONS`` contains the most recent versions.
  - [ ] Run ``scripts/release_ppa.sh v$VERSION`` to create the PPA release (you need the relevant openssl key).
- - [ ] Wait for the ``~ethereum/ubuntu/ethereum-static`` PPA build to be finished and published for *all platforms*. SERIOUSLY: DO NOT PROCEED EARLIER!!! *After* the static builds are *published*, copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA for the destination series ``Trusty``, ``Xenial`` and ``Bionic`` while selecting ``Copy existing binaries``.
+ - [ ] Wait for the ``~ethereum/ubuntu/ethereum-static`` PPA build to be finished and published for *all platforms*.
+       **SERIOUSLY: DO NOT PROCEED EARLIER!!!**
+       *After* the static builds are *published*, copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA
+       for the destination series ``Trusty``, ``Xenial`` and ``Bionic`` while selecting ``Copy existing binaries``.
 
 ### Release solc-js
  - [ ] Wait until solc-bin was properly deployed. You can test this via remix - a test run through remix is advisable anyway.

From f5c91ec8421c2233133cde0019c8fcb2f3ce94c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 11 Aug 2022 14:42:31 +0200
Subject: [PATCH 0861/1748] ReleaseChecklist: Don't sort contributor list by
 number of commits and use long options

---
 ReleaseChecklist.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 3df38321a7..e8f94fb05e 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -25,7 +25,7 @@
        Set the target to the ``develop`` branch and the tag to the new version, e.g. ``v0.8.5``.
        Include the following warning: ``**The release is still in progress and the binaries may not yet be available from all sources.**``.
        Don't publish it yet - click the ``Save draft`` button instead.
- - [ ] Thank voluntary contributors in the Github release notes (use ``git shortlog -s -n -e v0.5.3..origin/develop``).
+ - [ ] Thank voluntary contributors in the Github release notes (use ``git shortlog --summary --email v0.5.3..origin/develop``).
  - [ ] Check that all tests on the latest commit in ``develop`` are green.
  - [ ] Click the ``Publish release`` button on the release page, creating the tag.
  - [ ] Wait for the CI runs on the tag itself.

From be67e76165990db62b3a20e493225555dc05e80b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 11 Aug 2022 14:40:03 +0200
Subject: [PATCH 0862/1748] ReleaseChecklist: Update the list of requirements

---
 ReleaseChecklist.md | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index e8f94fb05e..fa1d0bf34f 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -1,9 +1,15 @@
 ## Checklist for making a release:
 
 ### Requirements
- - [ ] Lauchpad (Ubuntu One) account
- - [ ] gnupg key (has to be version 1, gpg2 won't work) for ``your-name@ethereum.org`` created and uploaded
- - [ ] Write access to https://github.com/ethereum/homebrew-ethereum
+ - [ ] Github account with access to [solidity](https://github.com/ethereum/solidity), [solc-js](https://github.com/ethereum/solc-js),
+       [solc-bin](https://github.com/ethereum/solc-bin), [homebrew-ethereum](https://github.com/ethereum/homebrew-ethereum),
+       [solidity-blog](https://github.com/ethereum/solidity-blog) and [solidity-portal](https://github.com/ethereum/solidity-portal) repositories.
+ - [ ] DockerHub account with push rights to the [``solc`` image](https://hub.docker.com/r/ethereum/solc).
+ - [ ] Lauchpad (Ubuntu One) account with a membership in the ["Ethereum" team](https://launchpad.net/~ethereum) and
+       a gnupg key for your email in the ``ethereum.org`` domain (has to be version 1, gpg2 won't work).
+ - [ ] [npm Registry](https://www.npmjs.com) account added as a collaborator for the [``solc`` package](https://www.npmjs.com/package/solc).
+ - [ ] Access to the [solidity_lang Twitter account](https://twitter.com/solidity_lang).
+ - [ ] [Reddit](https://www.reddit.com) account that is at least 10 days old with a minimum of 20 comment karma (``/r/ethereum`` requirements).
 
 ### Blog Post
  - [ ] Create a post on [solidity-blog](https://github.com/ethereum/solidity-blog) in the ``Releases`` category and explain some of the new features or concepts.

From 98ad27d42ca0f3d0b423b0a1ba898ef7ffda5ba0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 16 Aug 2022 12:54:10 +0200
Subject: [PATCH 0863/1748] ReleaseChecklist: Update PPA instructions

---
 ReleaseChecklist.md | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index fa1d0bf34f..d5090ed7f0 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -55,13 +55,14 @@
  - [ ] Run ``./scripts/docker_deploy_manual.sh v$VERSION``.
 
 ### PPA
- - [ ] Make sure the ``ethereum/cpp-build-deps`` PPA repository contains ``libz3-static-dev builds`` for all current versions of ubuntu.
-       If not run ``scripts/deps-ppa/static-z3.sh`` (after changing email address and key id and adding the missing ubuntu version) and wait for the builds to succeed before continuing.
- - [ ] Change ``scripts/release_ppa.sh`` to match your key's email and key id; double-check that ``DISTRIBUTIONS`` contains the most recent versions.
- - [ ] Run ``scripts/release_ppa.sh v$VERSION`` to create the PPA release (you need the relevant openssl key).
- - [ ] Wait for the ``~ethereum/ubuntu/ethereum-static`` PPA build to be finished and published for *all platforms*.
+ - [ ] Create ``.release_ppa_auth`` at the root of your local Solidity checkout and set ``LAUNCHPAD_EMAIL`` and ``LAUNCHPAD_KEYID`` to your key's email and key id.
+ - [ ] Double-check that the ``DISTRIBUTIONS`` list in ``scripts/release_ppa.sh`` and ``scripts/deps-ppa/static-z3.sh`` contains the most recent versions of Ubuntu.
+ - [ ] Make sure the [``~ethereum/cpp-build-deps`` PPA repository](https://launchpad.net/~ethereum/+archive/ubuntu/cpp-build-deps) contains ``libz3-static-dev builds`` for all current versions of Ubuntu.
+       If not, run ``scripts/deps-ppa/static-z3.sh`` (after changing email address and key id) and wait for the builds to succeed before continuing.
+ - [ ] Run ``scripts/release_ppa.sh v$VERSION`` to create the PPA release.
+ - [ ] Wait for the [``~ethereum/ethereum-static`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum-static) build to be finished and published for *all platforms*.
        **SERIOUSLY: DO NOT PROCEED EARLIER!!!**
-       *After* the static builds are *published*, copy the static package to the ``~ethereum/ubuntu/ethereum`` PPA
+       *After* the static builds are *published*, copy the static package to the [``~ethereum/ethereum`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum)
        for the destination series ``Trusty``, ``Xenial`` and ``Bionic`` while selecting ``Copy existing binaries``.
 
 ### Release solc-js

From ccc331743cf76f1381730e08de83e22c69ae79e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 5 Sep 2022 18:19:51 +0200
Subject: [PATCH 0864/1748] ReleaseChecklist: Markdown formatting for all links

---
 ReleaseChecklist.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index d5090ed7f0..e1a6a4c1b8 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -48,8 +48,8 @@
  - [ ] Create a pull request in solc-bin and merge.
 
 ### Homebrew and MacOS
- - [ ] Update the version and the hash (``sha256sum solidity_$VERSION.tar.gz``) in https://github.com/Homebrew/homebrew-core/blob/master/Formula/solidity.rb
- - [ ] Update the version and the hash (``sha256sum solidity_$VERSION.tar.gz``) in https://github.com/ethereum/homebrew-ethereum/blob/master/solidity.rb
+ - [ ] Update the version and the hash (``sha256sum solidity_$VERSION.tar.gz``) in the [``solidity`` formula in Homebrew core repository](https://github.com/Homebrew/homebrew-core/blob/master/Formula/solidity.rb).
+ - [ ] Update the version and the hash (``sha256sum solidity_$VERSION.tar.gz``) in [our custom ``solidity`` Homebrew formula](https://github.com/ethereum/homebrew-ethereum/blob/master/solidity.rb).
 
 ### Docker
  - [ ] Run ``./scripts/docker_deploy_manual.sh v$VERSION``.
@@ -74,7 +74,7 @@
 
 ### Post-release
  - [ ] Make sure the documentation for the new release has been published successfully.
-       Go to https://readthedocs.org/projects/solidity/ and verify that the new version is listed, works and is marked as default.
+       Go to the [documentation status page at ReadTheDocs](https://readthedocs.org/projects/solidity/) and verify that the new version is listed, works and is marked as default.
  - [ ] Remove "still in progress" warning from the release notes.
  - [ ] Publish the blog posts.
  - [ ] Create a commit to increase the version number on ``develop`` in ``CMakeLists.txt`` and add a new skeleton changelog entry.

From 0d98436de6be9cf95b4c85ca8c07752d5a245c46 Mon Sep 17 00:00:00 2001
From: emmaodia <odia.emma@gmail.com>
Date: Wed, 31 Aug 2022 11:11:34 +0100
Subject: [PATCH 0865/1748] Grammar fix

---
 docs/types/value-types.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 5972ea8182..1e8e3e7fd9 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -221,7 +221,7 @@ Operators:
 
 .. warning::
     If you convert a type that uses a larger byte size to an ``address``, for example ``bytes32``, then the ``address`` is truncated.
-    To reduce conversion ambiguity version 0.4.24 and higher of the compiler force you make the truncation explicit in the conversion.
+    To reduce conversion ambiguity, starting with version 0.4.24, the compiler will force you to make the truncation explicit in the conversion.
     Take for example the 32-byte value ``0x111122223333444455556666777788889999AAAABBBBCCCCDDDDEEEEFFFFCCCC``.
 
     You can use ``address(uint160(bytes20(b)))``, which results in ``0x111122223333444455556666777788889999aAaa``,
@@ -336,7 +336,7 @@ on ``call``.
 * ``code`` and ``codehash``
 
 You can query the deployed code for any smart contract. Use ``.code`` to get the EVM bytecode as a
-``bytes memory``, which might be empty. Use ``.codehash`` get the Keccak-256 hash of that code
+``bytes memory``, which might be empty. Use ``.codehash`` to get the Keccak-256 hash of that code
 (as a ``bytes32``). Note that ``addr.codehash`` is cheaper than using ``keccak256(addr.code)``.
 
 .. note::

From 53059936cc64858eb9419f61ec0189b52f290722 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 5 Sep 2022 20:52:46 +0200
Subject: [PATCH 0866/1748] Pin hardhat version in GP2 external tests

---
 test/externalTests/gp2.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index c59d67e08c..7df9e9a287 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -69,6 +69,8 @@ function gp2_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     npm install
 
+    npm install hardhat@2.10.2
+
     # Some dependencies come with pre-built artifacts. We want to build from scratch.
     rm -r node_modules/@gnosis.pm/safe-contracts/build/
 

From deab2bf37e04547832f147813e8237bef18226a0 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 6 Sep 2022 08:10:55 +0200
Subject: [PATCH 0867/1748] Add comment to pinned GP2 hardhat version

---
 test/externalTests/gp2.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index 7df9e9a287..1676d2b78c 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -69,6 +69,8 @@ function gp2_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     npm install
 
+    # New hardhat release breaks GP2 tests, and since GP2 repository has been archived, we are pinning hardhat
+    # to the previous stable version. See https://github.com/ethereum/solidity/pull/13485
     npm install hardhat@2.10.2
 
     # Some dependencies come with pre-built artifacts. We want to build from scratch.

From 8c4bbf1f4e753ea2d2cffc7365b300ba9cb75df7 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 6 Sep 2022 11:06:31 +0200
Subject: [PATCH 0868/1748] Pin hardhat version in yield-liquidator tests

---
 test/externalTests/yield-liquidator.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
index d2afe2560f..a224433117 100755
--- a/test/externalTests/yield-liquidator.sh
+++ b/test/externalTests/yield-liquidator.sh
@@ -66,6 +66,10 @@ function yield_liquidator_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     npm install
 
+    # 2.11.0 Hardhat release breaks contract compilation.
+    # TODO: remove when https://github.com/yieldprotocol/yield-liquidator-v2/issues/34 is addressed.
+    npm install hardhat@2.10.2
+
     replace_version_pragmas
     neutralize_packaged_contracts
 

From 71d12099966dfff2a2f3d374990023f73977a03a Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 6 Sep 2022 17:55:23 +0200
Subject: [PATCH 0869/1748] Pin hardhat version in bleeps tests

---
 test/externalTests/bleeps.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index 5ad80642e4..22e54ac9ce 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -86,6 +86,10 @@ function bleeps_test
     npm install npm-run-all
     npm install
 
+    # Causes a test failure with hardhat 2.11.0 (latest at the moment of writing this)
+    # TODO: Remove when https://github.com/wighawag/bleeps/issues/4 is resolved
+    npm install hardhat@2.10.2
+
     # TODO: Bleeps depends on OpenZeppelin 4.3.2, which is affected by
     # https://github.com/OpenZeppelin/openzeppelin-contracts/pull/3293.
     # Forcing OZ >= 4.6.0 fixes this but it also causes a lot of unrelated compilation errors.

From efe558a989cdacf783bd2b936a6bc30e45f2e527 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Thu, 1 Sep 2022 16:51:11 -0300
Subject: [PATCH 0870/1748] Added note about PeepholeOptimizer in docs.

---
 docs/internals/optimizer.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 5ad0f19e55..3c12f0adfb 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -26,6 +26,10 @@ One can use ``solc --ir-optimized --optimize`` to produce an
 optimized Yul IR for a Solidity source. Similarly, one can use ``solc --strict-assembly --optimize``
 for a stand-alone Yul mode.
 
+.. note::
+    The `peephole optimizer <https://en.wikipedia.org/wiki/Peephole_optimization>`_ and the inliner are always
+    enabled by default and can only be turned off via the :ref:`Standard JSON <compiler-api>`.
+
 You can find more details on both optimizer modules and their optimization steps below.
 
 Benefits of Optimizing Solidity Code

From c5d8c5ad05bb583ebe0566e9c904552782bd282c Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 24 Aug 2022 10:18:56 +0200
Subject: [PATCH 0871/1748] Add test for copying reference types between data
 locations

---
 .../array_nested_storage_to_memory.sol        | 45 ++++++++++++
 .../copy_array_elements_to_mapping.sol        | 61 ++++++++++++++++
 .../array/copying/copy_array_to_mapping.sol   | 45 ++++++++++++
 .../copy_calldata_array_to_mapping.sol        | 18 +++++
 ...d_array_of_structs_calldata_to_storage.sol | 40 +++++++++++
 ...ted_array_of_structs_memory_to_storage.sol | 40 +++++++++++
 ...ested_array_element_calldata_to_memory.sol | 41 +++++++++++
 ...sted_array_element_calldata_to_storage.sol | 30 ++++++++
 .../nested_array_element_memory_to_memory.sol | 41 +++++++++++
 ...nested_array_element_memory_to_storage.sol | 30 ++++++++
 ...nested_array_element_storage_to_memory.sol | 71 +++++++++++++++++++
 ...ested_array_element_storage_to_storage.sol | 55 ++++++++++++++
 ...d_array_of_structs_calldata_to_storage.sol | 38 ++++++++++
 ...ted_array_of_structs_memory_to_storage.sol | 38 ++++++++++
 ...th_nested_array_from_storage_to_memory.sol | 45 ++++++++++++
 ...amic_array_element_calldata_to_storage.sol | 37 ++++++++++
 .../structs/copy_from_mapping.sol             | 44 ++++++++++++
 .../copy_substructures_from_mapping.sol       | 52 ++++++++++++++
 .../structs/copy_substructures_to_mapping.sol | 66 +++++++++++++++++
 .../semanticTests/structs/copy_to_mapping.sol | 63 ++++++++++++++++
 .../mapping/copy_from_mapping_to_mapping.sol  | 35 +++++++++
 ...copy_struct_to_array_stored_in_mapping.sol | 57 +++++++++++++++
 22 files changed, 992 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/copy_array_elements_to_mapping.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/copy_array_to_mapping.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/copy_calldata_array_to_mapping.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
 create mode 100644 test/libsolidity/semanticTests/structs/copy_from_mapping.sol
 create mode 100644 test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
 create mode 100644 test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
 create mode 100644 test/libsolidity/semanticTests/structs/copy_to_mapping.sol
 create mode 100644 test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
 create mode 100644 test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol

diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol
new file mode 100644
index 0000000000..40990ba812
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol
@@ -0,0 +1,45 @@
+pragma abicoder v2;
+
+contract C {
+    uint256[][] a1;
+    uint256[][2] a2;
+    uint256[2][] a3;
+    uint256[2][2] a4;
+
+    constructor() {
+        a1 = new uint256[][](2);
+        a1[0] = [1, 2];
+        a1[1] = [3, 4, 5];
+
+        a2[0] = [6, 7, 8];
+        a2[1] = [9];
+
+        a3.push([1, 2]);
+        a3.push([3, 4]);
+        a3.push([5, 6]);
+
+        a4 = [[10, 11], [12, 13]];
+    }
+
+    function test1() external returns (uint256[][] memory) {
+        return a1;
+    }
+
+    function test2() external returns (uint256[][2] memory) {
+        return a2;
+    }
+
+    function test3() external returns (uint256[2][] memory) {
+        return a3;
+    }
+
+    function test4() external returns (uint256[2][2] memory) {
+        return a4;
+    }
+}
+
+// ----
+// test1() -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 3, 3, 4, 5
+// test2() -> 0x20, 0x40, 0xc0, 3, 6, 7, 8, 1, 9
+// test3() -> 0x20, 3, 1, 2, 3, 4, 5, 6
+// test4() -> 10, 11, 12, 13
diff --git a/test/libsolidity/semanticTests/array/copying/copy_array_elements_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/copy_array_elements_to_mapping.sol
new file mode 100644
index 0000000000..4ee91191c6
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/copy_array_elements_to_mapping.sol
@@ -0,0 +1,61 @@
+pragma abicoder v2;
+
+contract C {
+    mapping (uint => uint8[][]) m;
+
+    uint8[][] s;
+
+    constructor() {
+        s = new uint8[][](2);
+
+        s[0] = new uint8[](2);
+        s[0][0] = 10;
+        s[0][1] = 11;
+
+        s[1] = new uint8[](3);
+        s[1][0] = 12;
+        s[1][1] = 13;
+        s[1][2] = 14;
+    }
+
+    function from_storage() public returns (uint8[][] memory) {
+        m[0] = new uint8[][](2);
+        m[0][0] = s[0];
+        m[0][1] = s[1];
+        return m[0];
+    }
+
+
+    function from_storage_ptr() public returns (uint8[][] memory) {
+        uint8[][] storage sPtr = s;
+        m[0] = new uint8[][](2);
+        m[0][0] = sPtr[0];
+        m[0][1] = sPtr[1];
+        return m[0];
+    }
+
+
+    function from_memory() public returns (uint8[][] memory) {
+        uint8[][] memory a = s;
+        m[0] = new uint8[][](2);
+        m[0][0] = a[0];
+        m[0][1] = a[1];
+        return m[0];
+    }
+
+    function from_calldata(uint8[][] calldata _a) public returns (uint8[][] memory) {
+        m[0] = new uint8[][](2);
+        m[0][0] = _a[0];
+        m[0][1] = _a[1];
+        return m[0];
+    }
+}
+
+// ----
+// from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// gas irOptimized: 150098
+// gas legacy: 150830
+// gas legacyOptimized: 148728
+// from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/copy_array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/copy_array_to_mapping.sol
new file mode 100644
index 0000000000..bd94446380
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/copy_array_to_mapping.sol
@@ -0,0 +1,45 @@
+pragma abicoder v2;
+
+contract C {
+    mapping (uint => uint8[][]) m;
+
+    uint8[][] s;
+
+    constructor() {
+        s = new uint8[][](2);
+
+        s[0] = new uint8[](2);
+        s[0][0] = 10;
+        s[0][1] = 11;
+
+        s[1] = new uint8[](3);
+        s[1][0] = 12;
+        s[1][1] = 13;
+        s[1][2] = 14;
+    }
+
+    function from_storage() public returns (uint8[][] memory) {
+        m[0] = s;
+        return m[0];
+    }
+
+    function from_storage_ptr() public returns (uint8[][] memory) {
+        uint8[][] storage sPtr = s;
+        m[0] = sPtr;
+        return m[0];
+    }
+
+    function from_memory() public returns (uint8[][] memory) {
+        uint8[][] memory a = s;
+        m[0] = a;
+        return m[0];
+    }
+}
+
+// ----
+// from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// gas irOptimized: 147913
+// gas legacy: 148965
+// gas legacyOptimized: 146935
+// from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/copy_calldata_array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/copy_calldata_array_to_mapping.sol
new file mode 100644
index 0000000000..0573760eb4
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/copy_calldata_array_to_mapping.sol
@@ -0,0 +1,18 @@
+pragma abicoder v2;
+
+contract C {
+    mapping (uint => uint8[][]) m;
+
+    uint8[][] s;
+
+    function from_calldata(uint8[][] calldata _a) public returns (uint8[][] memory) {
+        m[0] = _a;
+        return m[0];
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
+// gas irOptimized: 139927
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
new file mode 100644
index 0000000000..fe87b79ee2
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
@@ -0,0 +1,40 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[] a;
+        uint8[2] b;
+    }
+
+    S[][][] s1;
+    S[][1][] s2;
+    S[1][][1] s3;
+
+    function test1(S[][][] calldata _a) public returns (S[][] memory){
+        s1.push();
+        s1[0] = _a[0];
+        return s1[0];
+    }
+
+    function test2(S[][1][] calldata _a) public returns (S[][1] memory) {
+        s2.push();
+        s2[0] = _a[0];
+        return s2[0];
+    }
+
+    function test3(S[1][][2] calldata _a) public returns (S[1][] memory) {
+        s3[0] = _a[1];
+        return s3[0];
+    }
+}
+
+
+// ====
+// compileViaYul: true
+// ----
+// test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
+// gas irOptimized: 327878
+// test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 140894
+// test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 188509
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
new file mode 100644
index 0000000000..9c0bb74ca9
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
@@ -0,0 +1,40 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[] a;
+        uint8[2] b;
+    }
+
+    S[][][] s1;
+    S[][1][] s2;
+    S[1][][1] s3;
+
+    function test1(S[][][] memory _a) public returns (S[][] memory){
+        s1.push();
+        s1[0] = _a[0];
+        return s1[0];
+    }
+
+    function test2(S[][1][] memory _a) public returns (S[][1] memory) {
+        s2.push();
+        s2[0] = _a[0];
+        return s2[0];
+    }
+
+    function test3(S[1][][2] memory _a) public returns (S[1][] memory) {
+        s3[0] = _a[1];
+        return s3[0];
+    }
+}
+
+
+// ====
+// compileViaYul: true
+// ----
+// test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
+// gas irOptimized: 332334
+// test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 145029
+// test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 192344
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol
new file mode 100644
index 0000000000..ee715b5b6c
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol
@@ -0,0 +1,41 @@
+pragma abicoder v2;
+
+contract C {
+    function test1(uint8[][][] calldata _a) public returns (uint8[][] memory) {
+        return _a[1];
+    }
+
+    function test2(uint8[][1][] calldata _a) public returns (uint8[][1] memory) {
+        return _a[0];
+    }
+
+    function test3(uint8[2][][2] calldata _a) public returns (uint8[2][] memory) {
+        return _a[0];
+    }
+
+    function test4(uint16[][] calldata _a) public returns (uint16[][] memory) {
+        uint16[][][] memory tmp = new uint16[][][](2);
+        tmp[1] = _a;
+        return tmp[1];
+    }
+
+    function test5(uint32[][2] calldata _a) public returns (uint32[][2] memory) {
+        uint32[][2][] memory tmp = new uint32[][2][](1);
+        tmp[0] = _a;
+        return tmp[0];
+    }
+
+    function test6(uint32[2][] calldata _a) public returns (uint32[2][] memory) {
+        uint32[2][][] memory tmp = new uint32[2][][](1);
+        tmp[0] = _a;
+        return tmp[0];
+    }
+}
+
+// ----
+// test1(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
+// test2(uint8[][1][]): 0x20, 2, 0x40, 0xe0, 0x20, 3, 12, 13, 14, 0x20, 3, 15, 16, 17 -> 0x20, 0x20, 3, 12, 13, 14
+// test3(uint8[2][][2]): 0x20, 0x40, 0xa0, 1, 7, 7, 2, 8, 8, 0x09, 9 -> 0x20, 1, 7, 7
+// test4(uint16[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
+// test5(uint32[][2]): 0x20, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 0x40, 0x80, 1, 7, 2, 8, 9
+// test6(uint32[2][]): 0x20, 2, 5, 6, 7, 8 -> 0x20, 2, 5, 6, 7, 8
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol
new file mode 100644
index 0000000000..93c458341b
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol
@@ -0,0 +1,30 @@
+contract C {
+    uint8[2][2] a;
+    uint8[2][2][2] a2;
+
+    function test(uint8[2][2][2] calldata _a) public {
+        a = _a[0];
+        require(a[0][0] == 1);
+        require(a[0][1] == 2);
+        require(a[1][0] == 3);
+        require(a[1][1] == 4);
+    }
+
+    function test2(uint8[2][2] calldata _a) public {
+        a2[0] = _a;
+        require(a2[0][0][0] == 1);
+        require(a2[0][0][1] == 2);
+        require(a2[0][1][0] == 3);
+        require(a2[0][1][1] == 4);
+        require(a2[1][0][0] == 0);
+        require(a2[1][0][1] == 0);
+        require(a2[1][1][0] == 0);
+        require(a2[1][1][1] == 0);
+    }
+}
+
+// ----
+// test(uint8[2][2][2]): 1, 2, 3, 4, 5, 6, 7, 8
+// test2(uint8[2][2]): 1, 2, 3, 4
+// gas irOptimized: 119939
+// gas legacyOptimized: 120228
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol
new file mode 100644
index 0000000000..ab3d472d6f
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol
@@ -0,0 +1,41 @@
+pragma abicoder v2;
+
+contract C {
+    function test1(uint8[][][] memory _a) public returns (uint8[][] memory) {
+        return _a[1];
+    }
+
+    function test2(uint8[][1][] memory _a) public returns (uint8[][1] memory) {
+        return _a[0];
+    }
+
+    function test3(uint8[2][][2] memory _a) public returns (uint8[2][] memory) {
+        return _a[0];
+    }
+
+    function test4(uint16[][] memory _a) public returns (uint16[][] memory) {
+        uint16[][][] memory tmp = new uint16[][][](2);
+        tmp[1] = _a;
+        return tmp[1];
+    }
+
+    function test5(uint32[][2] memory _a) public returns (uint32[][2] memory) {
+        uint32[][2][] memory tmp = new uint32[][2][](1);
+        tmp[0] = _a;
+        return tmp[0];
+    }
+
+    function test6(uint32[2][] memory _a) public returns (uint32[2][] memory) {
+        uint32[2][][] memory tmp = new uint32[2][][](1);
+        tmp[0] = _a;
+        return tmp[0];
+    }
+}
+
+// ----
+// test1(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
+// test2(uint8[][1][]): 0x20, 2, 0x40, 0xe0, 0x20, 3, 12, 13, 14, 0x20, 3, 15, 16, 17 -> 0x20, 0x20, 3, 12, 13, 14
+// test3(uint8[2][][2]): 0x20, 0x40, 0xa0, 1, 7, 7, 2, 8, 8, 0x09, 9 -> 0x20, 1, 7, 7
+// test4(uint16[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
+// test5(uint32[][2]): 0x20, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 0x40, 0x80, 1, 7, 2, 8, 9
+// test6(uint32[2][]): 0x20, 2, 5, 6, 7, 8 -> 0x20, 2, 5, 6, 7, 8
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol
new file mode 100644
index 0000000000..2dd2e7aa37
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol
@@ -0,0 +1,30 @@
+contract C {
+    uint8[2][2] a1;
+    uint8[2][2][2] a2;
+
+    function test(uint8[2][2][2] memory _a) public {
+        a1 = _a[0];
+        require(a1[0][0] == 1);
+        require(a1[0][1] == 2);
+        require(a1[1][0] == 3);
+        require(a1[1][1] == 4);
+    }
+
+    function test2(uint8[2][2] memory _a) public {
+        a2[0] = _a;
+        require(a2[0][0][0] == 1);
+        require(a2[0][0][1] == 2);
+        require(a2[0][1][0] == 3);
+        require(a2[0][1][1] == 4);
+        require(a2[1][0][0] == 0);
+        require(a2[1][0][1] == 0);
+        require(a2[1][1][0] == 0);
+        require(a2[1][1][1] == 0);
+    }
+}
+
+// ----
+// test(uint8[2][2][2]): 1, 2, 3, 4, 5, 6, 7, 8
+// test2(uint8[2][2]): 1, 2, 3, 4
+// gas irOptimized: 119939
+// gas legacyOptimized: 120228
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol
new file mode 100644
index 0000000000..2f78042a48
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol
@@ -0,0 +1,71 @@
+pragma abicoder v2;
+
+contract C {
+    uint8[][][] a1 = new uint8[][][](2);
+    uint8[][][2] a2;
+    uint8[][2][] a3 = new uint8[][2][](1);
+    uint8[2][][] a4 = new uint8[2][][](2);
+
+    constructor() {
+        a1[1] = new uint8[][](2);
+        a1[1][0] = [3, 4];
+        a1[1][1] = [5, 6];
+
+        a2[0] = new uint8[][](2);
+        a2[0][0] = [6, 7];
+        a2[0][1] = [8, 9];
+        a2[1] = new uint8[][](2);
+        a2[1][0] = [10, 11];
+
+        a3[0][0] = [3, 4];
+        a3[0][1] = [5, 6];
+
+        a4[0] = new uint8[2][](1);
+        a4[0][0] = [17, 23];
+        a4[1] = new uint8[2][](1);
+        a4[1][0] = [19, 31];
+    }
+
+    function test1() public returns (uint8[][] memory) {
+        return a1[1];
+    }
+
+    function test2() public returns (uint8[][] memory) {
+        return a2[0];
+    }
+
+    function test3() public returns (uint8[][2] memory) {
+        return a3[0];
+    }
+
+    function test4() public returns (uint8[2][] memory) {
+        return a4[1];
+    }
+
+    function test5() public returns (uint8[][][] memory) {
+        uint8[][][] memory tmp = new uint8[][][](3);
+        tmp[1] = a1[1];
+        return tmp;
+    }
+
+    function test6() public returns (uint8[][2][] memory) {
+        uint8[][2][] memory tmp = new uint8[][2][](2);
+        tmp[0] = a3[0];
+        return tmp;
+    }
+
+    function test7() public returns (uint8[2][][] memory) {
+        uint8[2][][] memory tmp = new uint8[2][][](1);
+        tmp[0] = a4[0];
+        return tmp;
+    }
+}
+
+// ----
+// test1() -> 0x20, 2, 0x40, 0xa0, 2, 3, 4, 2, 5, 6
+// test2() -> 0x20, 2, 0x40, 0xa0, 2, 6, 7, 2, 8, 9
+// test3() -> 0x20, 0x40, 0xa0, 2, 3, 4, 2, 5, 6
+// test4() -> 0x20, 1, 19, 31
+// test5() -> 0x20, 3, 0x60, 0x80, 0x01a0, 0, 2, 0x40, 0xa0, 2, 3, 4, 2, 5, 6, 0
+// test6() -> 0x20, 2, 0x40, 0x0140, 0x40, 0xa0, 2, 3, 4, 2, 5, 6, 0x40, 0x60, 0, 0
+// test7() -> 0x20, 1, 0x20, 1, 17, 23
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
new file mode 100644
index 0000000000..c68a9c5d68
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
@@ -0,0 +1,55 @@
+contract C {
+    uint8[][][] src1 = new uint8[][][](2);
+    uint8[][2][] src2 = new uint8[][2][](1);
+    uint8[2][][] src3 = new uint8[2][][](2);
+
+    uint8[][][1] dst1;
+    uint8[][2][] dst2;
+    uint8[2][] dst3;
+
+    constructor() {
+        src1[1] = new uint8[][](2);
+        src1[1][0] = [3, 4];
+        src1[1][1] = [5, 6];
+
+        src2[0][0] = [3, 4];
+        src2[0][1] = [5, 6];
+
+        src3[0] = new uint8[2][](1);
+        src3[0][0] = [17, 23];
+        src3[1] = new uint8[2][](1);
+        src3[1][0] = [19, 31];
+    }
+
+    function test1() public {
+	dst1[0] = src1[1];
+        require(dst1[0].length == 2);
+	require(dst1[0][0][0] == src1[1][0][0]);
+        require(dst1[0][1][1] == src1[1][1][1]);
+    }
+
+    function test2() public {
+        dst2.push();
+	dst2[0][0] = src2[0][0];
+        dst2[0][1] = src2[0][1];
+        require(dst2[0][0][0] == src2[0][0][0]);
+        require(dst2[0][0][1] == src2[0][0][1]);
+    }
+
+    function test3() public {
+        dst3 = src3[1];
+        require(dst3[0][0] == src3[1][0][0]);
+        require(dst3[0][0] == src3[1][0][0]);
+    }
+}
+
+// ----
+// test1()
+// gas irOptimized: 147595
+// gas legacy: 148507
+// gas legacyOptimized: 148336
+// test2()
+// gas irOptimized: 145663
+// gas legacy: 146311
+// gas legacyOptimized: 146106
+// test3()
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
new file mode 100644
index 0000000000..1f9011abde
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
@@ -0,0 +1,38 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[] a;
+        uint8[2] b;
+    }
+
+    S[][] s1;
+    S[][1] s2;
+    S[1][] s3;
+
+    function test1(S[][] calldata _a) public returns (S[][] memory){
+        s1 = _a;
+        return s1;
+    }
+
+    function test2(S[][1] calldata _a) public returns (S[][1] memory) {
+        s2 = _a;
+        return s2;
+    }
+
+    function test3(S[1][] calldata _a) public returns (S[1][] memory) {
+        s3 = _a;
+        return s3;
+    }
+}
+
+
+// ====
+// compileViaYul: true
+// ----
+// test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
+// gas irOptimized: 304768
+// test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 116476
+// test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 187998
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
new file mode 100644
index 0000000000..688946aae8
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
@@ -0,0 +1,38 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[] a;
+        uint8[2] b;
+    }
+
+    S[][] s1;
+    S[][1] s2;
+    S[1][] s3;
+
+    function test1(S[][] memory _a) public returns (S[][] memory){
+        s1 = _a;
+        return s1;
+    }
+
+    function test2(S[][1] memory _a) public returns (S[][1] memory) {
+        s2 = _a;
+        return s2;
+    }
+
+    function test3(S[1][] memory _a) public returns (S[1][] memory) {
+        s3 = _a;
+        return s3;
+    }
+}
+
+
+// ====
+// compileViaYul: true
+// ----
+// test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
+// gas irOptimized: 308790
+// test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 118077
+// test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
+// gas irOptimized: 190775
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol
new file mode 100644
index 0000000000..58240492ca
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol
@@ -0,0 +1,45 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[] a;
+        uint8[2] b;
+    }
+
+    uint8[] a1;
+    uint8[] a2;
+    uint8[] a3;
+
+    S[][] s1;
+    S[1][1] s2;
+
+    constructor() {
+        a1.push(23);
+        a1.push(29);
+        a2.push(31);
+
+        s1 = new S[][](2);
+        s1[0] = new S[](2);
+        s1[0][0] = S({a: a1, b: [7, 11]});
+        s1[0][1] = S({a: a2, b: [17, 19]});
+
+        s1[1] = new S[](1);
+        s1[1][0] = S({a: a3, b: [37, 41]});
+
+        s2[0][0] = S({a: a3, b: [43, 47]});
+    }
+
+    function test1() public returns (S[] memory) {
+        return s1[0];
+    }
+
+    function test2() public returns (S[1] memory) {
+        return s2[0];
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// test1() -> 0x20, 2, 0x40, 0x0100, 0x60, 7, 11, 2, 23, 29, 0x60, 17, 19, 1, 31
+// test2() -> 0x20, 0x20, 0x60, 43, 47, 0
diff --git a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
new file mode 100644
index 0000000000..c519d11ce9
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
@@ -0,0 +1,37 @@
+pragma abicoder v2;
+
+contract C {
+    uint8[][] a;
+    uint8[][][] a2;
+
+    function test(uint8[][][] calldata _a) public {
+        a = _a[1];
+        require(a.length == 2);
+        require(a[0].length == 1);
+        require(a[0][0] == 7);
+        require(a[1].length == 2);
+        require(a[1][0] == 8);
+        require(a[1][1] == 9);
+    }
+
+    function test2(uint8[][] calldata _a) public {
+        a2 = new uint8[][][](2);
+        a2[0] = _a;
+        require(a2[0].length == 2);
+	require(a2[0][0].length == 1);
+	require(a2[0][0][0] == 7);
+	require(a2[0][1].length == 2);
+	require(a2[0][1][0] == 8);
+	require(a2[0][1][1] == 9);
+	require(a2[1].length == 0);
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// test(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9
+// gas irOptimized: 138083
+// test2(uint8[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
+// gas irOptimized: 164290
+// gas legacyOptimized: 120228
diff --git a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
new file mode 100644
index 0000000000..5057b0efab
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
@@ -0,0 +1,44 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        bytes b;
+        uint16[] a;
+        uint16 u;
+    }
+
+    constructor() {
+        uint16[] memory a = new uint16[](2);
+        a[0] = 13;
+        a[1] = 14;
+
+        m[7] = S({b: "foo", a: a, u: 7});
+    }
+
+    mapping (uint => S) m;
+    S s;
+
+    function to_state() public returns (S memory) {
+	s = m[7];
+        return s;
+    }
+
+    function to_storage() public returns (S memory) {
+        S storage sLocal = s;
+	sLocal = m[7];
+        return sLocal;
+    }
+
+    function to_memory() public returns (S memory) {
+	return m[7];
+    }
+
+}
+
+// ----
+// to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// gas irOptimized: 121513
+// gas legacy: 123120
+// gas legacyOptimized: 121776
+// to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
new file mode 100644
index 0000000000..e91fa839e7
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
@@ -0,0 +1,52 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        bytes b;
+        uint16[] a;
+        uint16 u;
+    }
+
+    constructor() {
+        uint16[] memory a = new uint16[](2);
+        a[0] = 13;
+        a[1] = 14;
+
+        m[7] = S({b: "foo", a: a, u: 7});
+    }
+
+    mapping (uint => S) m;
+    S s;
+
+    function to_state() public returns (S memory) {
+	s.b = m[7].b;
+	s.a = m[7].a;
+	s.u = m[7].u;
+        return s;
+    }
+
+    function to_storage() public returns (S memory) {
+        S storage sLocal = s;
+	sLocal.b = m[7].b;
+	sLocal.a = m[7].a;
+	sLocal.u = m[7].u;
+        return sLocal;
+    }
+
+    function to_memory() public returns (S memory) {
+        S memory sLocal;
+        sLocal.b = m[7].b;
+        sLocal.a = m[7].a;
+        sLocal.u = m[7].u;
+	return sLocal;
+    }
+
+}
+
+// ----
+// to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// gas irOptimized: 121616
+// gas legacy: 123263
+// gas legacyOptimized: 121785
+// to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
new file mode 100644
index 0000000000..cfec3844f6
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
@@ -0,0 +1,66 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        bytes b;
+        uint16[] a;
+        uint16 u;
+    }
+
+    S s;
+    constructor() {
+        uint16[] memory a = new uint16[](2);
+        a[0] = 13;
+        a[1] = 14;
+
+        s.b = "foo";
+        s.a = a;
+        s.u = 21;
+    }
+
+    mapping (uint => S) m;
+
+    function from_memory() public returns (S memory) {
+        S memory sMemory = s;
+        m[0].b = sMemory.b;
+        m[0].a = sMemory.a;
+        m[0].u = sMemory.u;
+        return m[0];
+    }
+
+    function from_state() public returns (S memory) {
+        m[1].b = s.b;
+        m[1].a = s.a;
+        m[1].u = s.u;
+        return m[1];
+    }
+
+    function from_storage() public returns (S memory) {
+        S storage sLocal = s;
+        m[1].b = sLocal.b;
+        m[1].a = sLocal.a;
+        m[1].u = sLocal.u;
+        return m[1];
+    }
+
+    function from_calldata(S calldata sCalldata) public returns (S memory) {
+        m[2].b = sCalldata.b;
+        m[2].a = sCalldata.a;
+        m[2].u = sCalldata.u;
+        return m[2];
+    }
+}
+
+// ----
+// from_memory() -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// gas irOptimized: 123062
+// gas legacy: 130289
+// gas legacyOptimized: 128785
+// from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// gas irOptimized: 121776
+// gas legacy: 123341
+// gas legacyOptimized: 121892
+// from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// gas irOptimized: 115169
+// gas legacy: 122579
+// gas legacyOptimized: 120829
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
new file mode 100644
index 0000000000..e575fb8f13
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
@@ -0,0 +1,63 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        bytes b;
+        uint16[] a;
+        uint16 u;
+    }
+
+    S s;
+    constructor() {
+        uint16[] memory a = new uint16[](2);
+        a[0] = 13;
+        a[1] = 14;
+
+        s.b = "foo";
+        s.a = a;
+        s.u = 21;
+    }
+
+    mapping (uint => S) m;
+
+    function from_state() public returns (S memory) {
+        m[0] = s;
+        return m[0];
+    }
+
+    function from_storage() public returns (S memory) {
+        S storage sLocal = s;
+        m[1] = sLocal;
+        return m[1];
+    }
+
+    function from_memory() public returns (S memory) {
+        S memory sMemory = s;
+        m[2] = sMemory;
+        return m[2];
+    }
+
+
+    function from_calldata(S calldata sCalldata) public returns (S memory) {
+        m[3] = sCalldata;
+        return m[3];
+    }
+}
+
+// ----
+// from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// gas irOptimized: 121709
+// gas legacy: 123198
+// gas legacyOptimized: 121830
+// from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// gas irOptimized: 121753
+// gas legacy: 123247
+// gas legacyOptimized: 121882
+// from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// gas irOptimized: 122954
+// gas legacy: 130146
+// gas legacyOptimized: 128779
+// from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 21, 3, 0x666f6f0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
+// gas irOptimized: 115067
+// gas legacy: 118383
+// gas legacyOptimized: 115458
diff --git a/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol b/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
new file mode 100644
index 0000000000..4315095ac8
--- /dev/null
+++ b/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
@@ -0,0 +1,35 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[3] x;
+        uint8[][] y;
+        uint16 z;
+    }
+
+    mapping (uint8 => S) src;
+    mapping (uint8 => S) dst;
+
+    constructor() {
+        uint8[] memory d = new uint8[](2);
+        d[0] = 3;
+        d[1] = 4;
+
+        uint8[][] memory y = new uint8[][](2);
+        y[0] = d;
+        y[1] = d;
+
+        src[0] = S({x: [7, 8, 9], y: y, z: 13});
+    }
+
+    function f() public returns (S memory) {
+        dst[0] = src[0];
+        return dst[0];
+    }
+}
+
+// ----
+// f() -> 0x20, 7, 8, 9, 0xa0, 13, 2, 0x40, 0xa0, 2, 3, 4, 2, 3, 4
+// gas irOptimized: 197113
+// gas legacy: 199986
+// gas legacyOptimized: 196847
diff --git a/test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol b/test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol
new file mode 100644
index 0000000000..26a33682d5
--- /dev/null
+++ b/test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol
@@ -0,0 +1,57 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8 x;
+    }
+
+    constructor() {
+        s = S({x: 7});
+        m2[0].push();
+    }
+
+    S s;
+
+    mapping (uint8 => S[2]) m1;
+    mapping (uint8 => S[]) m2;
+
+    function from_storage_to_static_array() public returns (S[2] memory) {
+        m1[0][1] = s;
+        return m1[0];
+    }
+
+    function from_storage_to_dynamic_array() public returns (S[] memory) {
+        m2[0][0] = s;
+        return m2[0];
+    }
+
+    function from_memory_to_static_array() public returns (S[2] memory) {
+        S memory sLocal = s;
+        m1[0][1] = sLocal;
+        return m1[0];
+    }
+
+    function from_memory_to_dynamic_array() public returns (S[] memory) {
+        S memory sLocal = s;
+        m2[0][0] = sLocal;
+        return m2[0];
+    }
+
+    function from_calldata_to_static_array(S calldata sCalldata) public returns (S[2] memory) {
+        m1[0][1] = sCalldata;
+        return m1[0];
+    }
+
+    function from_calldata_to_dynamic_array(S calldata sCalldata) public returns (S[] memory) {
+        m2[0][0] = sCalldata;
+        return m2[0];
+    }
+}
+
+// ----
+// from_storage_to_static_array() -> 0, 7
+// from_storage_to_dynamic_array() -> 0x20, 1, 7
+// from_memory_to_static_array() -> 0, 7
+// from_memory_to_dynamic_array() -> 0x20, 1, 7
+// from_calldata_to_static_array((uint8)): 8 -> 0, 8
+// from_calldata_to_dynamic_array((uint8)): 8 -> 0x20, 1, 8

From 0262621b9f68ad9758f501da199347fafcce6fbd Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 7 Sep 2022 10:45:35 +0200
Subject: [PATCH 0872/1748] fixup! Add test for copying reference types between
 data locations

---
 ...rray_elements_to_mapping.sol => array_elements_to_mapping.sol} | 0
 .../copying/{copy_array_to_mapping.sol => array_to_mapping.sol}   | 0
 ...alldata_array_to_mapping.sol => calldata_array_to_mapping.sol} | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename test/libsolidity/semanticTests/array/copying/{copy_array_elements_to_mapping.sol => array_elements_to_mapping.sol} (100%)
 rename test/libsolidity/semanticTests/array/copying/{copy_array_to_mapping.sol => array_to_mapping.sol} (100%)
 rename test/libsolidity/semanticTests/array/copying/{copy_calldata_array_to_mapping.sol => calldata_array_to_mapping.sol} (100%)

diff --git a/test/libsolidity/semanticTests/array/copying/copy_array_elements_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
similarity index 100%
rename from test/libsolidity/semanticTests/array/copying/copy_array_elements_to_mapping.sol
rename to test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
diff --git a/test/libsolidity/semanticTests/array/copying/copy_array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
similarity index 100%
rename from test/libsolidity/semanticTests/array/copying/copy_array_to_mapping.sol
rename to test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
diff --git a/test/libsolidity/semanticTests/array/copying/copy_calldata_array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
similarity index 100%
rename from test/libsolidity/semanticTests/array/copying/copy_calldata_array_to_mapping.sol
rename to test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol

From d5e292532669dc450c2c276da6caaf2055c8f228 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 5 Sep 2022 12:55:52 +0200
Subject: [PATCH 0873/1748] broken yul optimizer test

---
 .../function_side_effects_3.yul               | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_3.yul

diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_3.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_3.yul
new file mode 100644
index 0000000000..a663454234
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_3.yul
@@ -0,0 +1,27 @@
+{
+    function conditionallyStop() {
+        if calldataload(0) { leave }
+        return(0, 0)
+    }
+    let x := 0
+    let y := 1
+    sstore(x, y)
+    conditionallyStop()
+    sstore(x, y)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 0
+//         let y := 1
+//         conditionallyStop()
+//         sstore(x, y)
+//     }
+//     function conditionallyStop()
+//     {
+//         if calldataload(0) { leave }
+//         return(0, 0)
+//     }
+// }

From f5620219185ab1dbf9a0e36f454437a17040a1a7 Mon Sep 17 00:00:00 2001
From: Ikko Ashimine <eltociear@gmail.com>
Date: Thu, 8 Sep 2022 11:34:11 +0900
Subject: [PATCH 0874/1748] Update ReleaseChecklist.md

github -> GitHub
Github -> GitHub
---
 ReleaseChecklist.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index e1a6a4c1b8..ec510bbb16 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -1,7 +1,7 @@
 ## Checklist for making a release:
 
 ### Requirements
- - [ ] Github account with access to [solidity](https://github.com/ethereum/solidity), [solc-js](https://github.com/ethereum/solc-js),
+ - [ ] GitHub account with access to [solidity](https://github.com/ethereum/solidity), [solc-js](https://github.com/ethereum/solc-js),
        [solc-bin](https://github.com/ethereum/solc-bin), [homebrew-ethereum](https://github.com/ethereum/homebrew-ethereum),
        [solidity-blog](https://github.com/ethereum/solidity-blog) and [solidity-portal](https://github.com/ethereum/solidity-portal) repositories.
  - [ ] DockerHub account with push rights to the [``solc`` image](https://hub.docker.com/r/ethereum/solc).
@@ -27,11 +27,11 @@
  - [ ] Copy the changelog into the release blog post.
 
 ### Create the Release
- - [ ] Create a [release on github](https://github.com/ethereum/solidity/releases/new).
+ - [ ] Create a [release on GitHub](https://github.com/ethereum/solidity/releases/new).
        Set the target to the ``develop`` branch and the tag to the new version, e.g. ``v0.8.5``.
        Include the following warning: ``**The release is still in progress and the binaries may not yet be available from all sources.**``.
        Don't publish it yet - click the ``Save draft`` button instead.
- - [ ] Thank voluntary contributors in the Github release notes (use ``git shortlog --summary --email v0.5.3..origin/develop``).
+ - [ ] Thank voluntary contributors in the GitHub release notes (use ``git shortlog --summary --email v0.5.3..origin/develop``).
  - [ ] Check that all tests on the latest commit in ``develop`` are green.
  - [ ] Click the ``Publish release`` button on the release page, creating the tag.
  - [ ] Wait for the CI runs on the tag itself.

From a33da17300f919b2e730b911bd20813e84d41523 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 5 Sep 2022 11:31:09 +0200
Subject: [PATCH 0875/1748] Bugfix and tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 libyul/optimiser/UnusedStoreEliminator.cpp    |  5 +-
 .../unused_store_storage_removal_bug.sol      | 15 +++++
 ...nditionally_terminating_function_call.yul} |  3 +-
 ...ing_function_call_complex_control_flow.yul | 60 +++++++++++++++++++
 ...nally_terminating_function_call_revert.yul | 27 +++++++++
 ...onditionally_terminating_function_call.yul | 33 ++++++++++
 ...onditionally_terminating_function_call.yul | 23 +++++++
 7 files changed, 164 insertions(+), 2 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/unused_store_storage_removal_bug.sol
 rename test/libyul/yulOptimizerTests/unusedStoreEliminator/{function_side_effects_3.yul => store_before_conditionally_terminating_function_call.yul} (79%)
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_complex_control_flow.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_revert.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_indirectly_conditionally_terminating_function_call.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_unconditionally_terminating_function_call.yul

diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index 754c02ac5d..2e96be2e70 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -105,10 +105,13 @@ void UnusedStoreEliminator::operator()(FunctionCall const& _functionCall)
 	else
 		sideEffects = m_controlFlowSideEffects.at(_functionCall.functionName.name);
 
+	if (sideEffects.canTerminate)
+		changeUndecidedTo(State::Used, Location::Storage);
 	if (!sideEffects.canContinue)
 	{
 		changeUndecidedTo(State::Unused, Location::Memory);
-		changeUndecidedTo(sideEffects.canTerminate ? State::Used : State::Unused, Location::Storage);
+		if (!sideEffects.canTerminate)
+			changeUndecidedTo(State::Unused, Location::Storage);
 	}
 }
 
diff --git a/test/libsolidity/semanticTests/unused_store_storage_removal_bug.sol b/test/libsolidity/semanticTests/unused_store_storage_removal_bug.sol
new file mode 100644
index 0000000000..87d4ef429a
--- /dev/null
+++ b/test/libsolidity/semanticTests/unused_store_storage_removal_bug.sol
@@ -0,0 +1,15 @@
+contract C {
+	uint public x;
+	function f() public {
+		x = 1; // This write used to be removed by the Yul optimizer due to the StorageWriteRemovalBeforeConditionalTermination bug.
+		g();
+		x = 2;
+	}
+	function g() internal {
+		if (msg.data.length > 4) return;
+		assembly { return(0, 0) }
+	}
+}
+// ----
+// f() ->
+// x() -> 1
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_3.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call.yul
similarity index 79%
rename from test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_3.yul
rename to test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call.yul
index a663454234..44fbb70115 100644
--- a/test/libyul/yulOptimizerTests/unusedStoreEliminator/function_side_effects_3.yul
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call.yul
@@ -5,7 +5,7 @@
     }
     let x := 0
     let y := 1
-    sstore(x, y)
+    sstore(x, y) // used to be removed due to the StorageWriteRemovalBeforeConditionalTermination
     conditionallyStop()
     sstore(x, y)
 }
@@ -16,6 +16,7 @@
 //     {
 //         let x := 0
 //         let y := 1
+//         sstore(x, y)
 //         conditionallyStop()
 //         sstore(x, y)
 //     }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_complex_control_flow.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_complex_control_flow.yul
new file mode 100644
index 0000000000..dd88f4973a
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_complex_control_flow.yul
@@ -0,0 +1,60 @@
+{
+    function conditionallyStop() {
+        if calldataload(0) { leave }
+        return(0, 0)
+    }
+    function g() {
+        let a := 0
+        let b := 1
+        sstore(a, b)
+    }
+    let x := 0
+    let y := 1
+    let z := 2
+    switch calldataload(64)
+    case 0 {
+        sstore(z, x)
+        g()
+    }
+    default {
+        sstore(x, z) // used to be removed due to the StorageWriteRemovalBeforeConditionalTermination
+    }
+    conditionallyStop()
+    switch calldataload(32)
+    case 0 {
+        revert(0, 0)
+    }
+    default {
+        sstore(x, z)
+    }
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 0
+//         let y := 1
+//         let z := 2
+//         switch calldataload(64)
+//         case 0 {
+//             sstore(z, x)
+//             g()
+//         }
+//         default { sstore(x, z) }
+//         conditionallyStop()
+//         switch calldataload(32)
+//         case 0 { revert(0, 0) }
+//         default { sstore(x, z) }
+//     }
+//     function conditionallyStop()
+//     {
+//         if calldataload(0) { leave }
+//         return(0, 0)
+//     }
+//     function g()
+//     {
+//         let a := 0
+//         sstore(a, 1)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_revert.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_revert.yul
new file mode 100644
index 0000000000..fc45bb64c5
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_conditionally_terminating_function_call_revert.yul
@@ -0,0 +1,27 @@
+{
+    function conditionallyStop() {
+        if calldataload(0) { leave }
+        return(0, 0)
+    }
+    let x := 0
+    let y := 1
+    sstore(x, y) // used to be removed due to the to the StorageWriteRemovalBeforeConditionalTermination bug
+    conditionallyStop()
+    revert(0,0)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 0
+//         sstore(x, 1)
+//         conditionallyStop()
+//         revert(0, 0)
+//     }
+//     function conditionallyStop()
+//     {
+//         if calldataload(0) { leave }
+//         return(0, 0)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_indirectly_conditionally_terminating_function_call.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_indirectly_conditionally_terminating_function_call.yul
new file mode 100644
index 0000000000..1d15078eb9
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_indirectly_conditionally_terminating_function_call.yul
@@ -0,0 +1,33 @@
+{
+    function conditionallyStop() {
+        if calldataload(0) { leave }
+        returnEmpty()
+    }
+    function returnEmpty() {
+        return(0, 0)
+    }
+    let x := 0
+    let y := 1
+    sstore(x, y) // used to be removed due to a bug
+    conditionallyStop()
+    sstore(x, y)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 0
+//         let y := 1
+//         sstore(x, y)
+//         conditionallyStop()
+//         sstore(x, y)
+//     }
+//     function conditionallyStop()
+//     {
+//         if calldataload(0) { leave }
+//         returnEmpty()
+//     }
+//     function returnEmpty()
+//     { return(0, 0) }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_unconditionally_terminating_function_call.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_unconditionally_terminating_function_call.yul
new file mode 100644
index 0000000000..c104e4d9b7
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/store_before_unconditionally_terminating_function_call.yul
@@ -0,0 +1,23 @@
+{
+    function neverStop() {
+        if calldataload(0) { leave } // prevent inlining
+    }
+    let x := 0
+    let y := 1
+    sstore(x, y) // should be removed
+    neverStop()
+    sstore(x, y)
+}
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 0
+//         let y := 1
+//         neverStop()
+//         sstore(x, y)
+//     }
+//     function neverStop()
+//     { if calldataload(0) { leave } }
+// }

From d6eb255df4176d130c9275130824b9efd4ce0b46 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 5 Sep 2022 13:22:33 +0200
Subject: [PATCH 0876/1748] Changelog entry and bug list entry.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 Changelog.md              |  1 +
 docs/bugs.json            | 13 +++++++++++++
 docs/bugs_by_version.json |  7 ++++++-
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index f0f8b8485c..c03dbb6d1e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.17 (unreleased)
 
 Important Bugfixes:
+ * Yul Optimizer: Prevent the incorrect removal of storage writes before calls to Yul functions that conditionally terminate the external EVM call.
 
 
 Language Features:
diff --git a/docs/bugs.json b/docs/bugs.json
index 421bb007c0..03dafbe45b 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -1,4 +1,17 @@
 [
+    {
+        "uid": "SOL-2022-7",
+        "name": "StorageWriteRemovalBeforeConditionalTermination",
+        "summary": "Calling functions that conditionally terminate the external EVM call using the assembly statements ``return(...)`` or ``stop()`` may result in incorrect removals of prior storage writes.",
+        "description": "A call to a Yul function that conditionally terminates the external EVM call could result in prior storage writes being incorrectly removed by the Yul optimizer. This used to happen in cases in which it would have been valid to remove the store, if the Yul function in question never actually terminated the external call, and the control flow always returned back to the caller instead. Conditional termination within the same Yul block instead of within a called function was not affected. In Solidity with optimized via-IR code generation, any storage write before a function conditionally calling ``return(...)`` or ``stop()`` in inline assembly, may have been incorrectly removed, whenever it would have been valid to remove the write without the ``return(...)`` or ``stop()``. In optimized legacy code generation, only inline assembly that did not refer to any Solidity variables and that involved conditionally-terminating user-defined assembly functions could be affected.",
+        "link": "https://blog.soliditylang.org/2022/09/08/storage-write-removal-before-conditional-termination/",
+        "introduced": "0.8.13",
+        "fixed": "0.8.17",
+        "severity": "medium/high",
+        "conditions": {
+            "yulOptimizer": true
+        }
+    },
     {
         "uid": "SOL-2022-6",
         "name": "AbiReencodingHeadOverflowWithStaticArrayCleanup",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 3e3847c9b9..df8fdc6334 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1737,6 +1737,7 @@
     },
     "0.8.13": {
         "bugs": [
+            "StorageWriteRemovalBeforeConditionalTermination",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "InlineAssemblyMemorySideEffects",
@@ -1747,6 +1748,7 @@
     },
     "0.8.14": {
         "bugs": [
+            "StorageWriteRemovalBeforeConditionalTermination",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "InlineAssemblyMemorySideEffects"
@@ -1755,12 +1757,15 @@
     },
     "0.8.15": {
         "bugs": [
+            "StorageWriteRemovalBeforeConditionalTermination",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup"
         ],
         "released": "2022-06-15"
     },
     "0.8.16": {
-        "bugs": [],
+        "bugs": [
+            "StorageWriteRemovalBeforeConditionalTermination"
+        ],
         "released": "2022-08-08"
     },
     "0.8.2": {

From a39bce010e45ad96aff99593f9ef1de7a1a94bab Mon Sep 17 00:00:00 2001
From: Anton Paymyshev <anton.paymyshev@gmail.com>
Date: Thu, 8 Sep 2022 17:50:44 +0700
Subject: [PATCH 0877/1748] Fix dynamic array spec

---
 docs/abi-spec.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 9164ae6a12..fc65ffa329 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -191,7 +191,7 @@ on the type of ``X`` being
 
 - ``T[]`` where ``X`` has ``k`` elements (``k`` is assumed to be of type ``uint256``):
 
-  ``enc(X) = enc(k) enc([X[0], ..., X[k-1]])``
+  ``enc(X) = enc(k) enc(([X[0], ..., X[k-1]]))``
 
   i.e. it is encoded as if it were an array of static size ``k``, prefixed with
   the number of elements.

From f90b25449dd42d877578399b57a46ae0e3e4c6d3 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 8 Sep 2022 15:22:47 +0200
Subject: [PATCH 0878/1748] Fix SMT checker paper link

---
 docs/smtchecker.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index caa901713c..6d2f4373b2 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -684,7 +684,7 @@ Types that are not yet supported are abstracted by a single 256-bit unsigned
 integer, where their unsupported operations are ignored.
 
 For more details on how the SMT encoding works internally, see the paper
-`SMT-based Verification of Solidity Smart Contracts <https://github.com/leonardoalt/text/blob/master/solidity_isola_2018/main.pdf>`_.
+`SMT-based Verification of Solidity Smart Contracts <https://github.com/chriseth/solidity_isola/blob/master/main.pdf>`_.
 
 Function Calls
 ==============

From 1649f24767d3828a30ba8646181f1cb836dd8077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 8 Sep 2022 14:58:56 +0200
Subject: [PATCH 0879/1748] Add missing changelog entries for a few PRs that
 will go into 0.8.17

---
 Changelog.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index c03dbb6d1e..2f21b52dc4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -15,6 +15,12 @@ Compiler Features:
 
 Bugfixes:
  * Type Checker: Fix internal compiler error on tuple assignments with invalid left-hand side.
+ * Yul IR Code Generation: Fix internal compiler error when accessing the ``.slot`` member of a mapping through a storage reference in inline assembly.
+
+
+Build System:
+ * Allow disabling pedantic warnings and do not treat warnings as errors during compiler build when ``-DPEDANTIC=OFF`` flag is passed to CMake.
+ * Update emscripten to version 3.1.19.
 
 
 ### 0.8.16 (2022-08-08)

From 514842e2a4b52f4fd5576aaf6ccc9b94bc2c082c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 8 Sep 2022 14:38:23 +0200
Subject: [PATCH 0880/1748] Sort changelog for 0.8.17 alphabetically

---
 Changelog.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2f21b52dc4..500f859de9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,13 +4,10 @@ Important Bugfixes:
  * Yul Optimizer: Prevent the incorrect removal of storage writes before calls to Yul functions that conditionally terminate the external EVM call.
 
 
-Language Features:
-
-
 Compiler Features:
  * Code Generator: More efficient overflow checks for multiplication.
- * Yul Optimizer: Simplify the starting offset of zero-length operations to zero.
  * Language Server: Analyze all files in a project by default (can be customized by setting ``'file-load-strategy'`` to ``'directly-opened-and-on-import'`` in LSP settings object).
+ * Yul Optimizer: Simplify the starting offset of zero-length operations to zero.
 
 
 Bugfixes:

From 722e9d8693a6b479ee266e7ac2d6eac2310b9a30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 8 Sep 2022 14:39:36 +0200
Subject: [PATCH 0881/1748] Set release date for 0.8.17 and update the bug list

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 500f859de9..2167d5b703 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.17 (unreleased)
+### 0.8.17 (2022-09-08)
 
 Important Bugfixes:
  * Yul Optimizer: Prevent the incorrect removal of storage writes before calls to Yul functions that conditionally terminate the external EVM call.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index df8fdc6334..11ddd40b07 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1768,6 +1768,10 @@
         ],
         "released": "2022-08-08"
     },
+    "0.8.17": {
+        "bugs": [],
+        "released": "2022-09-08"
+    },
     "0.8.2": {
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",

From 3b524455c6ffc5f18942a7a2952f3b9d33bb90f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 8 Sep 2022 16:48:16 +0200
Subject: [PATCH 0882/1748] Set version to 0.8.18

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6680b75b28..81c5f96c2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.17")
+set(PROJECT_VERSION "0.8.18")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 2167d5b703..0e45c2ea58 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.18 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.17 (2022-09-08)
 
 Important Bugfixes:

From 918307a5423f3f424ef63e4651da46f4fdc9744e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 8 Sep 2022 16:51:35 +0200
Subject: [PATCH 0883/1748] ReleaseChecklist: Make sure the changelog is
 complete

---
 ReleaseChecklist.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index e1a6a4c1b8..df013994db 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -19,6 +19,7 @@
  - [ ] Run ``make linkcheck`` from within ``docs/`` and fix any broken links it finds. Ignore false positives caused by ``href`` anchors and dummy links not meant to work.
 
 ### Changelog
+ - [ ] Make sure that all merged PRs that should have changelog entries do have them.
  - [ ] Sort the changelog entries alphabetically and correct any errors you notice. Commit it.
  - [ ] Update the changelog to include a release date.
  - [ ] Run ``scripts/update_bugs_by_version.py`` to regenerate ``bugs_by_version.json`` from the changelog and ``bugs.json``.

From 46b9df92b14a248599ec9cb124fd310622023325 Mon Sep 17 00:00:00 2001
From: "Mathias L. Baumann" <Marenz@users.noreply.github.com>
Date: Thu, 8 Sep 2022 20:15:41 +0200
Subject: [PATCH 0884/1748] Update PPA instructions for Z3 in checklist

---
 ReleaseChecklist.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index e1a6a4c1b8..3b14bcfdcd 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -58,7 +58,7 @@
  - [ ] Create ``.release_ppa_auth`` at the root of your local Solidity checkout and set ``LAUNCHPAD_EMAIL`` and ``LAUNCHPAD_KEYID`` to your key's email and key id.
  - [ ] Double-check that the ``DISTRIBUTIONS`` list in ``scripts/release_ppa.sh`` and ``scripts/deps-ppa/static-z3.sh`` contains the most recent versions of Ubuntu.
  - [ ] Make sure the [``~ethereum/cpp-build-deps`` PPA repository](https://launchpad.net/~ethereum/+archive/ubuntu/cpp-build-deps) contains ``libz3-static-dev builds`` for all current versions of Ubuntu.
-       If not, run ``scripts/deps-ppa/static-z3.sh`` (after changing email address and key id) and wait for the builds to succeed before continuing.
+       If not, run ``scripts/deps-ppa/static-z3.sh`` and wait for the builds to succeed before continuing.
  - [ ] Run ``scripts/release_ppa.sh v$VERSION`` to create the PPA release.
  - [ ] Wait for the [``~ethereum/ethereum-static`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum-static) build to be finished and published for *all platforms*.
        **SERIOUSLY: DO NOT PROCEED EARLIER!!!**

From c4d97120bd6e0f552ca279602c482b6c4c6d1427 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Thu, 8 Sep 2022 11:21:12 +0200
Subject: [PATCH 0885/1748] Add test for copying elements of nested storage
 array

---
 ...ested_array_element_storage_to_storage.sol | 94 ++++++++++++-------
 1 file changed, 62 insertions(+), 32 deletions(-)

diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
index c68a9c5d68..0da09064cd 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
@@ -1,55 +1,85 @@
+pragma abicoder v2;
+
 contract C {
     uint8[][][] src1 = new uint8[][][](2);
-    uint8[][2][] src2 = new uint8[][2][](1);
-    uint8[2][][] src3 = new uint8[2][][](2);
+    uint8[][][2] src2;
+    uint8[][2][] src3 = new uint8[][2][](1);
+    uint8[2][][] src4 = new uint8[2][][](2);
 
-    uint8[][][1] dst1;
-    uint8[][2][] dst2;
-    uint8[2][] dst3;
+    uint8[][] dst1;
+    uint8[][] dst2;
+    uint8[][2] dst3;
+    uint8[][] dst4;
 
     constructor() {
         src1[1] = new uint8[][](2);
         src1[1][0] = [3, 4];
         src1[1][1] = [5, 6];
 
-        src2[0][0] = [3, 4];
-        src2[0][1] = [5, 6];
+        src2[0] = new uint8[][](2);
+        src2[0][0] = [6, 7];
+        src2[0][1] = [8, 9];
+        src2[1] = new uint8[][](2);
+        src2[1][0] = [10, 11];
+
+        src3[0][0] = [3, 4];
+        src3[0][1] = [5, 6];
 
-        src3[0] = new uint8[2][](1);
-        src3[0][0] = [17, 23];
-        src3[1] = new uint8[2][](1);
-        src3[1][0] = [19, 31];
+        src4[0] = new uint8[2][](1);
+        src4[0][0] = [17, 23];
+        src4[1] = new uint8[2][](1);
+        src4[1][0] = [19, 31];
     }
 
     function test1() public {
-	dst1[0] = src1[1];
-        require(dst1[0].length == 2);
-	require(dst1[0][0][0] == src1[1][0][0]);
-        require(dst1[0][1][1] == src1[1][1][1]);
+        dst1 = src1[1];
+
+        require(dst1.length == 2);
+        require(dst1[0][0] == src1[1][0][0]);
+        require(dst1[0][1] == src1[1][0][1]);
+        require(dst1[1][0] == src1[1][1][0]);
+        require(dst1[1][1] == src1[1][1][1]);
     }
 
     function test2() public {
-        dst2.push();
-	dst2[0][0] = src2[0][0];
-        dst2[0][1] = src2[0][1];
-        require(dst2[0][0][0] == src2[0][0][0]);
-        require(dst2[0][0][1] == src2[0][0][1]);
+        dst2 = src2[0];
+
+        require(dst2.length == 2);
+        require(dst2[0][0] == src2[1][0][0]);
+        require(dst2[0][1] == src2[1][0][1]);
+        require(dst2[1][0] == src2[1][1][0]);
+        require(dst2[1][1] == src2[1][1][1]);
     }
 
     function test3() public {
-        dst3 = src3[1];
-        require(dst3[0][0] == src3[1][0][0]);
-        require(dst3[0][0] == src3[1][0][0]);
+        dst3 = src3[0];
+        require(dst3[0][0] == src3[0][0][0]);
+        require(dst3[0][1] == src3[0][0][1]);
+        require(dst3[1][0] == src3[0][1][0]);
+        require(dst3[1][1] == src3[0][1][1]);
+    }
+
+    function test4() public {
+        dst4 = src4[1];
+        require(dst4.length == 2);
+        require(dst4[0][0] == src4[0][0][0]);
+        require(dst4[0][1] == src4[0][0][1]);
+        require(dst4[1][0] == src4[0][1][0]);
+        require(dst4[1][1] == src4[0][1][1]);
     }
 }
 
 // ----
-// test1()
-// gas irOptimized: 147595
-// gas legacy: 148507
-// gas legacyOptimized: 148336
-// test2()
-// gas irOptimized: 145663
-// gas legacy: 146311
-// gas legacyOptimized: 146106
-// test3()
+// test1() ->
+// gas irOptimized: 150570
+// gas legacy: 151017
+// gas legacyOptimized: 150970
+// test2() -> FAILURE
+// gas irOptimized: 150408
+// gas legacy: 150700
+// gas legacyOptimized: 150601
+// test3() ->
+// gas irOptimized: 123810
+// gas legacy: 125381
+// gas legacyOptimized: 125160
+// test4() -> FAILURE

From dfe8fce3696acab3e43b145d14850cadd791e426 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Thu, 8 Sep 2022 13:28:17 +0200
Subject: [PATCH 0886/1748] Tests for copying nested array of structs between
 data locations

---
 ...ed_array_of_structs_calldata_to_memory.sol | 25 +++++++
 ...sted_array_of_structs_memory_to_memory.sol | 25 +++++++
 ...ed_array_of_structs_storage_to_storage.sol | 70 +++++++++++++++++++
 3 files changed, 120 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol
 create mode 100644 test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol

diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol
new file mode 100644
index 0000000000..159486eda6
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol
@@ -0,0 +1,25 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8 x;
+        uint8 y;
+    }
+
+    function test1(S[1][2] calldata a) public returns (S[1][2] memory) {
+        return a;
+    }
+
+    function test2(S[1][] calldata a) public returns (S[1][] memory) {
+        return a;
+    }
+
+    function test3(S[][2] calldata a) public returns (S[][2] memory) {
+        return a;
+    }
+}
+
+// ----
+// test1((uint8,uint8)[1][2]): 1, 2, 3, 4 -> 1, 2, 3, 4
+// test2((uint8,uint8)[1][]): 0x20, 3, 7, 11, 13, 17, 19, 23 -> 0x20, 3, 7, 11, 13, 17, 19, 23
+// test3((uint8,uint8)[][2]): 0x20, 0x40, 0xa0, 1, 3, 7, 2, 11, 13, 17, 19 -> 0x20, 0x40, 0xa0, 1, 3, 7, 2, 11, 13, 17, 19
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol
new file mode 100644
index 0000000000..55a4d6aedb
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol
@@ -0,0 +1,25 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8 x;
+        uint8 y;
+    }
+
+    function test1(S[1][2] memory a) public returns (S[1][2] memory r) {
+        r = a;
+    }
+
+    function test2(S[1][] memory a) public returns (S[1][] memory r) {
+        r = a;
+    }
+
+    function test3(S[][2] memory a) public returns (S[][2] memory r) {
+        r = a;
+    }
+}
+
+// ----
+// test1((uint8,uint8)[1][2]): 1, 2, 3, 4 -> 1, 2, 3, 4
+// test2((uint8,uint8)[1][]): 0x20, 3, 7, 11, 13, 17, 19, 23 -> 0x20, 3, 7, 11, 13, 17, 19, 23
+// test3((uint8,uint8)[][2]): 0x20, 0x40, 0xa0, 1, 3, 7, 2, 11, 13, 17, 19 -> 0x20, 0x40, 0xa0, 1, 3, 7, 2, 11, 13, 17, 19
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
new file mode 100644
index 0000000000..b4ab1cc61e
--- /dev/null
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
@@ -0,0 +1,70 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8 x;
+        uint8 y;
+    }
+
+    S[][] src1;
+    S[][1] src2;
+    S[1][] src3;
+
+    S[][] dst1;
+    S[][1] dst2;
+    S[1][] dst3;
+
+    constructor() {
+        src1 = new S[][](1);
+        src1[0].push(S({x: 3, y: 7}));
+        src1[0].push(S({x: 11, y: 13}));
+
+        src2[0].push(S({x: 3, y: 7}));
+        src2[0].push(S({x: 11, y: 13}));
+        src2[0].push(S({x: 17, y: 19}));
+
+        src3.push([S({x: 3, y: 7})]);
+        src3.push([S({x: 11, y: 13})]);
+    }
+
+    function test1() public {
+        dst1 = src1;
+
+        require(dst1.length == 1);
+        require(dst1[0][0].x == src1[0][0].x);
+        require(dst1[0][0].y == src1[0][0].y);
+        require(dst1[0][1].x == src1[0][1].x);
+        require(dst1[0][1].y == src1[0][1].y);
+    }
+
+    function test2() public {
+        dst2 = src2;
+
+        require(dst2[0].length == 3);
+        require(dst2[0][0].x == src2[0][0].x);
+        require(dst2[0][0].y == src2[0][0].y);
+        require(dst2[0][1].x == src2[0][1].x);
+        require(dst2[0][1].y == src2[0][1].y);
+        require(dst2[0][2].x == src2[0][2].x);
+        require(dst2[0][2].y == src2[0][2].y);
+    }
+
+    function test3() public {
+        dst3 = src3;
+
+        require(dst3.length == 2);
+        require(dst3[0][0].x == src3[0][0].x);
+        require(dst3[0][0].y == src3[0][0].y);
+        require(dst3[1][0].x == src3[1][0].x);
+        require(dst3[1][0].y == src3[1][0].y);
+    }
+}
+
+// ====
+// compileViaYul: true
+// ----
+// test1()
+// gas irOptimized: 123279
+// test2()
+// gas irOptimized: 123073
+// test3()

From 0eae9e70ff02d9f5b6d6ffc63615a6f7ff572196 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Fri, 9 Sep 2022 06:57:27 +0200
Subject: [PATCH 0887/1748] Tests for copying structs between data locations

---
 ...h_nested_array_from_calldata_to_memory.sol | 16 +++++++++++
 ..._nested_array_from_calldata_to_storage.sol | 22 +++++++++++++++
 ...ith_nested_array_from_memory_to_memory.sol | 16 +++++++++++
 ...h_nested_array_from_storage_to_storage.sol | 27 +++++++++++++++++++
 4 files changed, 81 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol
 create mode 100644 test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol
 create mode 100644 test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol
 create mode 100644 test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol

diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol
new file mode 100644
index 0000000000..8ccc30936e
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol
@@ -0,0 +1,16 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[1] x;
+        uint8[] y;
+    }
+
+    function test(S calldata s) public returns (S memory) {
+        return s;
+    }
+}
+
+// ----
+// test((uint8[1],uint8[])): 0x20, 3, 0x40, 2, 7, 11 -> 0x20, 3, 0x40, 2, 7, 11
+// test((uint8[1],uint8[])): 0x20, 3, 0x40, 3, 17, 19, 23 -> 0x20, 3, 0x40, 3, 17, 19, 23
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol
new file mode 100644
index 0000000000..fa67deb2c0
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol
@@ -0,0 +1,22 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[1] x;
+        uint8[] y;
+    }
+
+    S s;
+
+    function test(S calldata src) public {
+        s = src;
+
+        require(s.x[0] == 3);
+        require(s.y.length == 2);
+        require(s.y[0] == 7);
+        require(s.y[1] == 11);
+    }
+}
+
+// ----
+// test((uint8[1],uint8[])): 0x20, 3, 0x40, 2, 7, 11
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol
new file mode 100644
index 0000000000..c340289adf
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol
@@ -0,0 +1,16 @@
+pragma abicoder v2;
+
+contract C {
+    struct S {
+        uint8[1] x;
+        uint8[] y;
+    }
+
+    function test(S memory s) public returns (S memory r) {
+        return r;
+    }
+}
+
+// ----
+// test((uint8[1],uint8[])): 0x20, 3, 0x40, 2, 7, 11 -> 0x20, 0, 0x40, 0
+// test((uint8[1],uint8[])): 0x20, 3, 0x40, 3, 17, 19, 23 -> 0x20, 0, 0x40, 0
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol
new file mode 100644
index 0000000000..3f29790d83
--- /dev/null
+++ b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol
@@ -0,0 +1,27 @@
+contract C {
+    struct S {
+        uint8[1] x;
+        uint8[] y;
+    }
+
+    S src;
+    S dst;
+
+    constructor() {
+        src.x = [3];
+        src.y.push(7);
+        src.y.push(11);
+    }
+
+    function test() public {
+        dst = src;
+
+        require(dst.x[0] == 3);
+        require(dst.y.length == 2);
+        require(dst.y[0] == 7);
+        require(dst.y[1] == 11);
+    }
+}
+
+// ----
+// test()

From ddea589ffce2c2f16070af2b35ecdff2846a8d99 Mon Sep 17 00:00:00 2001
From: Anton Paymyshev <anton.paymyshev@gmail.com>
Date: Fri, 9 Sep 2022 18:31:24 +0700
Subject: [PATCH 0888/1748] fix per review

---
 docs/abi-spec.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index fc65ffa329..2e6f7c56bb 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -191,7 +191,7 @@ on the type of ``X`` being
 
 - ``T[]`` where ``X`` has ``k`` elements (``k`` is assumed to be of type ``uint256``):
 
-  ``enc(X) = enc(k) enc(([X[0], ..., X[k-1]]))``
+  ``enc(X) = enc(k) enc((X[0], ..., X[k-1]))``
 
   i.e. it is encoded as if it were an array of static size ``k``, prefixed with
   the number of elements.

From faffe3e0a404f3afa80557e615340d6f1ace086b Mon Sep 17 00:00:00 2001
From: Anton Paymyshev <anton.paymyshev@gmail.com>
Date: Fri, 9 Sep 2022 18:38:49 +0700
Subject: [PATCH 0889/1748] Update docs/abi-spec.rst

Co-authored-by: Daniel Kirchner <daniel@ekpyron.org>
---
 docs/abi-spec.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 2e6f7c56bb..7906d75ffe 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -193,7 +193,7 @@ on the type of ``X`` being
 
   ``enc(X) = enc(k) enc((X[0], ..., X[k-1]))``
 
-  i.e. it is encoded as if it were an array of static size ``k``, prefixed with
+  i.e. it is encoded as if it were a tuple with ``k`` elements of the same type (resp. an array of static size ``k``), prefixed with
   the number of elements.
 
 - ``bytes``, of length ``k`` (which is assumed to be of type ``uint256``):

From 69d9869d219b2e6120063c5cbb98d2883087ecb2 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Fri, 9 Sep 2022 15:24:09 +0200
Subject: [PATCH 0890/1748] Fix create2 memory access in yul interpreter.

---
 test/libyul/yulInterpreterTests/create2.yul         | 13 +++++++++++++
 .../yulInterpreter/EVMInstructionInterpreter.cpp    |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 test/libyul/yulInterpreterTests/create2.yul

diff --git a/test/libyul/yulInterpreterTests/create2.yul b/test/libyul/yulInterpreterTests/create2.yul
new file mode 100644
index 0000000000..928a163046
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/create2.yul
@@ -0,0 +1,13 @@
+{
+    pop(create2(0, 0, 32, 32))
+    // This used to store 64
+    sstore(0, msize())
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Trace:
+//   CREATE2(0, 0, 32, 32)
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000020
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 810cf9d181..0a3c920a58 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -317,7 +317,7 @@ u256 EVMInstructionInterpreter::eval(
 		logTrace(_instruction, arg);
 		return (0xcccccc + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
 	case Instruction::CREATE2:
-		accessMemory(arg[2], arg[3]);
+		accessMemory(arg[1], arg[2]);
 		logTrace(_instruction, arg);
 		return (0xdddddd + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
 	case Instruction::CALL:

From f6f0d6a3602ba2c83ecfd7608fb9a27c20835eb2 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 10 Aug 2022 15:57:01 +0200
Subject: [PATCH 0891/1748] Make hardcoded parts of the optimizer sequence
 configurable

---
 libsolidity/codegen/CompilerContext.cpp       |  1 +
 libsolidity/interface/OptimiserSettings.h     |  7 ++++
 libsolidity/interface/StandardCompiler.cpp    | 11 +++--
 libyul/YulStack.cpp                           |  1 +
 libyul/optimiser/Suite.cpp                    | 11 ++++-
 libyul/optimiser/Suite.h                      |  3 +-
 solc/CommandLineParser.cpp                    |  9 +++-
 .../args                                      |  1 +
 .../in.sol                                    |  6 +++
 .../input.json                                | 16 +++++++
 .../output.json                               | 12 ++++++
 .../args                                      |  1 +
 .../in.sol                                    |  6 +++
 .../input.json                                | 16 +++++++
 .../output.json                               | 12 ++++++
 .../args                                      |  1 +
 .../in.sol                                    |  6 +++
 .../input.json                                | 16 +++++++
 .../output.json                               |  9 ++++
 .../args                                      |  1 +
 .../in.sol                                    |  6 +++
 .../input.json                                | 16 +++++++
 .../output.json                               |  9 ++++
 .../args                                      |  1 +
 .../in.sol                                    |  6 +++
 .../input.json                                | 16 +++++++
 .../output.json                               |  9 ++++
 .../args                                      |  1 +
 .../in.sol                                    |  6 +++
 .../input.json                                | 16 +++++++
 .../output.json                               |  9 ++++
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../exit                                      |  1 +
 .../input.sol                                 |  7 ++++
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../exit                                      |  1 +
 .../input.sol                                 |  7 ++++
 .../yul_optimizer_steps_short_sequence/args   |  1 +
 .../input.sol                                 | 12 ++++++
 .../yul_optimizer_steps_short_sequence/output | 24 +++++++++++
 .../args                                      |  1 +
 .../input.sol                                 |  8 ++++
 .../output                                    | 34 +++++++++++++++
 .../args                                      |  1 +
 .../input.sol                                 | 12 ++++++
 .../output                                    | 24 +++++++++++
 .../args                                      |  1 +
 .../input.sol                                 | 12 ++++++
 .../output                                    | 24 +++++++++++
 .../args                                      |  1 +
 .../input.sol                                 |  8 ++++
 .../output                                    | 42 +++++++++++++++++++
 test/libyul/YulOptimizerTestCommon.cpp        |  1 +
 55 files changed, 461 insertions(+), 6 deletions(-)
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/args
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/in.sol
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/args
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/in.sol
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/args
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/output.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/args
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/in.sol
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/output.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/args
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/in.sol
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/output.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/args
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/in.sol
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/output.json
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/args
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/exit
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/input.sol
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/args
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/exit
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/input.sol
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_short_sequence/args
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_short_sequence/input.sol
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_short_sequence/output
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/args
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/input.sol
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/output
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/args
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/args
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/args
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/input.sol
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/output

diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index f1cc5b6dd7..948502e690 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -547,6 +547,7 @@ void CompilerContext::optimizeYul(yul::Object& _object, yul::EVMDialect const& _
 		_object,
 		_optimiserSettings.optimizeStackAllocation,
 		_optimiserSettings.yulOptimiserSteps,
+		_optimiserSettings.yulOptimiserCleanupSteps,
 		isCreation? nullopt : make_optional(_optimiserSettings.expectedExecutionsPerDeployment),
 		_externalIdentifiers
 	);
diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h
index e233048c18..82324d3f7a 100644
--- a/libsolidity/interface/OptimiserSettings.h
+++ b/libsolidity/interface/OptimiserSettings.h
@@ -59,6 +59,8 @@ struct OptimiserSettings
 		"]"
 		"jmul[jul] VcTOcul jmul";      // Make source short and pretty
 
+	static char constexpr DefaultYulOptimiserCleanupSteps[] = "fDnTOc";
+
 	/// No optimisations at all - not recommended.
 	static OptimiserSettings none()
 	{
@@ -146,6 +148,11 @@ struct OptimiserSettings
 	/// them just by setting this to an empty string. Set @a runYulOptimiser to false if you want
 	/// no optimisations.
 	std::string yulOptimiserSteps = DefaultYulOptimiserSteps;
+	/// Sequence of clean up optimisation steps after the above (default or user supplied) set of
+	/// optimisation steps is completed. Note that if the string is left empty, there will still
+	/// be hard-coded optimisation steps that will run regardless. Set @a runYulOptimiser to false
+	/// if you want no optimisations.
+	std::string yulOptimiserCleanupSteps = DefaultYulOptimiserCleanupSteps;
 	/// This specifies an estimate on how often each opcode in this assembly will be executed,
 	/// i.e. use a small value to optimise for size and a large value to optimise for runtime gas usage.
 	size_t expectedExecutionsPerDeployment = 200;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index c6cd741c15..7ccb71d786 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -472,7 +472,7 @@ std::optional<Json::Value> checkOptimizerDetail(Json::Value const& _details, std
 	return {};
 }
 
-std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details, std::string const& _name, string& _setting)
+std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details, std::string const& _name, string& _optimiserSetting, string& _cleanupSetting)
 {
 	if (_details.isMember(_name))
 	{
@@ -490,7 +490,12 @@ std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details
 				);
 			}
 
-			_setting = _details[_name].asString();
+			std::string const fullSequence = _details[_name].asString();
+			auto const delimiterPos = fullSequence.find(":");
+			_optimiserSetting = fullSequence.substr(0, delimiterPos);
+
+			if (delimiterPos != string::npos)
+				_cleanupSetting = fullSequence.substr(delimiterPos + 1);
 		}
 		else
 			return formatFatalError("JSONError", "\"settings.optimizer.details." + _name + "\" must be a string");
@@ -616,7 +621,7 @@ std::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Value
 				return *result;
 			if (auto error = checkOptimizerDetail(details["yulDetails"], "stackAllocation", settings.optimizeStackAllocation))
 				return *error;
-			if (auto error = checkOptimizerDetailSteps(details["yulDetails"], "optimizerSteps", settings.yulOptimiserSteps))
+			if (auto error = checkOptimizerDetailSteps(details["yulDetails"], "optimizerSteps", settings.yulOptimiserSteps, settings.yulOptimiserCleanupSteps))
 				return *error;
 		}
 	}
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 3bca7288cb..7553ee4692 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -209,6 +209,7 @@ void YulStack::optimize(Object& _object, bool _isCreation)
 		_object,
 		m_optimiserSettings.optimizeStackAllocation,
 		m_optimiserSettings.yulOptimiserSteps,
+		m_optimiserSettings.yulOptimiserCleanupSteps,
 		_isCreation ? nullopt : make_optional(m_optimiserSettings.expectedExecutionsPerDeployment),
 		{}
 	);
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 181c9bdcba..ae32b25c37 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -93,6 +93,7 @@ void OptimiserSuite::run(
 	Object& _object,
 	bool _optimizeStackAllocation,
 	string_view _optimisationSequence,
+	string_view _optimisationCleanupSequence,
 	optional<size_t> _expectedExecutionsPerDeployment,
 	set<YulString> const& _externallyUsedIdentifiers
 )
@@ -139,7 +140,10 @@ void OptimiserSuite::run(
 			_optimizeStackAllocation,
 			stackCompressorMaxIterations
 		);
-	suite.runSequence("fDnTOc g", ast);
+
+	// Run the user supplied (otherwise default) clean up sequence
+	suite.runSequence(_optimisationCleanupSequence, ast);
+	suite.runSequence("g", ast);
 
 	if (evmDialect)
 	{
@@ -296,6 +300,7 @@ map<char, string> const& OptimiserSuite::stepAbbreviationToNameMap()
 void OptimiserSuite::validateSequence(string_view _stepAbbreviations)
 {
 	int8_t nestingLevel = 0;
+	int8_t colonDelimiters = 0;
 	for (char abbreviation: _stepAbbreviations)
 		switch (abbreviation)
 		{
@@ -310,6 +315,10 @@ void OptimiserSuite::validateSequence(string_view _stepAbbreviations)
 			nestingLevel--;
 			assertThrow(nestingLevel >= 0, OptimizerException, "Unbalanced brackets");
 			break;
+		case ':':
+			assertThrow(nestingLevel == 0, OptimizerException, "Cleanup delimiter may only be placed at nesting level zero");
+			assertThrow(++colonDelimiters <=1, OptimizerException, "Too many colon delimiters");
+			break;
 		default:
 		{
 			yulAssert(
diff --git a/libyul/optimiser/Suite.h b/libyul/optimiser/Suite.h
index 3c85fc559a..2db6288c0d 100644
--- a/libyul/optimiser/Suite.h
+++ b/libyul/optimiser/Suite.h
@@ -51,7 +51,7 @@ class OptimiserSuite
 
 	/// Special characters that do not represent optimiser steps but are allowed in abbreviation sequences.
 	/// Some of them (like whitespace) are ignored, others (like brackets) are a part of the syntax.
-	static constexpr char NonStepAbbreviations[] = " \n[]";
+	static constexpr char NonStepAbbreviations[] = " \n[]:";
 
 	enum class Debug
 	{
@@ -68,6 +68,7 @@ class OptimiserSuite
 		Object& _object,
 		bool _optimizeStackAllocation,
 		std::string_view _optimisationSequence,
+		std::string_view _optimisationCleanupSequence,
 		std::optional<size_t> _expectedExecutionsPerDeployment,
 		std::set<YulString> const& _externallyUsedIdentifiers = {}
 	);
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 2c765d0e30..ce2d4d044c 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -266,7 +266,14 @@ OptimiserSettings CommandLineOptions::optimiserSettings() const
 		settings.expectedExecutionsPerDeployment = optimizer.expectedExecutionsPerDeployment.value();
 
 	if (optimizer.yulSteps.has_value())
-		settings.yulOptimiserSteps = optimizer.yulSteps.value();
+	{
+		std::string const fullSequence = optimizer.yulSteps.value();
+		auto const delimiterPos = fullSequence.find(":");
+		settings.yulOptimiserSteps = fullSequence.substr(0, delimiterPos);
+
+		if (delimiterPos != string::npos)
+			settings.yulOptimiserCleanupSteps = fullSequence.substr(delimiterPos + 1);
+	}
 
 	return settings;
 }
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/in.sol
new file mode 100644
index 0000000000..9e5350072a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/input.json
new file mode 100644
index 0000000000..5be769f767
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/input.json
@@ -0,0 +1,16 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/in.sol"]}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": true,
+                "yulDetails": {
+                    "optimizerSteps": "dhfoDgvulfnTUtnIf\n[    xar:rscLM\n]\njmuljuljul VcTOcul jmul"
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json
new file mode 100644
index 0000000000..41c8a307f8
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Cleanup delimiter may only be placed at nesting level zero",
+            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Cleanup delimiter may only be placed at nesting level zero",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/in.sol
new file mode 100644
index 0000000000..9e5350072a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/input.json
new file mode 100644
index 0000000000..0bddd9d9dc
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/input.json
@@ -0,0 +1,16 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/in.sol"]}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": true,
+                "yulDetails": {
+                    "optimizerSteps": "dhfoDgvu:lfnTUtnIf\n[    xarrscLM\n]\njmuljulj:ul VcTOcul jmul"
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json
new file mode 100644
index 0000000000..b6778a4925
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Too many colon delimiters",
+            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Too many colon delimiters",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol
new file mode 100644
index 0000000000..9e5350072a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/input.json
new file mode 100644
index 0000000000..b557a9662d
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/input.json
@@ -0,0 +1,16 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": true,
+                "yulDetails": {
+                    "optimizerSteps": "dhfoDgvulfnTUtnIf\n[    xarrscLM\n]\njmuljuljul VcTOcul jmul:fDnTOc"
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/output.json
new file mode 100644
index 0000000000..acf3b74ef1
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/output.json
@@ -0,0 +1,9 @@
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/in.sol
new file mode 100644
index 0000000000..9e5350072a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json
new file mode 100644
index 0000000000..0903ccfebd
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json
@@ -0,0 +1,16 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": true,
+                "yulDetails": {
+                    "optimizerSteps": "dhfoDgvulfnTUtnIf\n[    xarrscLM\n]\njmuljuljul VcTOcul jmul:"
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/output.json
new file mode 100644
index 0000000000..acf3b74ef1
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/output.json
@@ -0,0 +1,9 @@
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/in.sol
new file mode 100644
index 0000000000..9e5350072a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json
new file mode 100644
index 0000000000..4086aff9fb
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json
@@ -0,0 +1,16 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": true,
+                "yulDetails": {
+                    "optimizerSteps": ":dhfoDgvulfnTUtnIf\n[    xarrscLM\n]\njmuljuljul VcTOcul jmul"
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/output.json
new file mode 100644
index 0000000000..acf3b74ef1
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/output.json
@@ -0,0 +1,9 @@
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/in.sol
new file mode 100644
index 0000000000..9e5350072a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json
new file mode 100644
index 0000000000..4f66682223
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json
@@ -0,0 +1,16 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": true,
+                "yulDetails": {
+                    "optimizerSteps": ":"
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/output.json
new file mode 100644
index 0000000000..acf3b74ef1
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/output.json
@@ -0,0 +1,9 @@
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/args b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/args
new file mode 100644
index 0000000000..c7bdc65636
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/args
@@ -0,0 +1 @@
+--ir-optimized --optimize --yul-optimizations dhfo[Dg:vu]lfnTUtnIf
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err
new file mode 100644
index 0000000000..cb7b570f17
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err
@@ -0,0 +1 @@
+Invalid optimizer step sequence in --yul-optimizations: Cleanup delimiter may only be placed at nesting level zero
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/exit b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/input.sol b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/input.sol
new file mode 100644
index 0000000000..0279d3b7d4
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/input.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C
+{
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/args b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/args
new file mode 100644
index 0000000000..4214dbbd11
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/args
@@ -0,0 +1 @@
+--ir-optimized --optimize --yul-optimizations dhfoDg:vulfn:TUtnIf
diff --git a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err
new file mode 100644
index 0000000000..70b1b2c215
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err
@@ -0,0 +1 @@
+Invalid optimizer step sequence in --yul-optimizations: Too many colon delimiters
diff --git a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/exit b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/input.sol b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/input.sol
new file mode 100644
index 0000000000..0279d3b7d4
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/input.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C
+{
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_short_sequence/args b/test/cmdlineTests/yul_optimizer_steps_short_sequence/args
new file mode 100644
index 0000000000..ba2f47ebe2
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_short_sequence/args
@@ -0,0 +1 @@
+--ir-optimized --optimize --yul-optimizations iDu
diff --git a/test/cmdlineTests/yul_optimizer_steps_short_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_short_sequence/input.sol
new file mode 100644
index 0000000000..2d82716f08
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_short_sequence/input.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+pragma abicoder v2;
+
+contract C {
+    constructor() payable {
+        assembly ("memory-safe") {
+            let a := 0
+            revert(0, a)
+        }
+    }
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_short_sequence/output b/test/cmdlineTests/yul_optimizer_steps_short_sequence/output
new file mode 100644
index 0000000000..0a4a2c5a2a
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_short_sequence/output
@@ -0,0 +1,24 @@
+Optimized IR:
+/// @use-src 0:"yul_optimizer_steps_short_sequence/input.sol"
+object "C_8" {
+    code {
+        {
+            /// @src 0:80:221  "contract C {..."
+            mstore(64, memoryguard(0x80))
+            /// @src 0:129:213  "assembly (\"memory-safe\") {..."
+            let usr$a := 0
+            revert(usr$a, usr$a)
+        }
+    }
+    /// @use-src 0:"yul_optimizer_steps_short_sequence/input.sol"
+    object "C_8_deployed" {
+        code {
+            {
+                /// @src 0:80:221  "contract C {..."
+                mstore(64, memoryguard(0x80))
+                revert(0, 0)
+            }
+        }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/args b/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/args
new file mode 100644
index 0000000000..872a81048e
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/args
@@ -0,0 +1 @@
+--ir-optimized --optimize --yul-optimizations dhfoDgvulfnTUtnIf:fDnTOc
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/input.sol
new file mode 100644
index 0000000000..ab0d98d675
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+pragma abicoder v2;
+
+contract C
+{
+    constructor() {}
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/output b/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/output
new file mode 100644
index 0000000000..32c0eba2e0
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/output
@@ -0,0 +1,34 @@
+Optimized IR:
+/// @use-src 0:"yul_optimizer_steps_with_cleanup_sequence/input.sol"
+object "C_7" {
+    code {
+        {
+            /// @src 0:80:115  "contract C..."
+            mstore(64, memoryguard(0x80))
+            if callvalue()
+            {
+                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+            }
+            let _1 := allocate_unbounded()
+            codecopy(_1, dataoffset("C_7_deployed"), datasize("C_7_deployed"))
+            return(_1, datasize("C_7_deployed"))
+        }
+        function allocate_unbounded() -> memPtr
+        { memPtr := mload(64) }
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+        { revert(0, 0) }
+    }
+    /// @use-src 0:"yul_optimizer_steps_with_cleanup_sequence/input.sol"
+    object "C_7_deployed" {
+        code {
+            {
+                /// @src 0:80:115  "contract C..."
+                mstore(64, memoryguard(0x80))
+                revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+            }
+            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+            { revert(0, 0) }
+        }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/args b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/args
new file mode 100644
index 0000000000..6673a776a7
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/args
@@ -0,0 +1 @@
+--ir-optimized --optimize --yul-optimizations iDu:
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
new file mode 100644
index 0000000000..2d82716f08
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+pragma abicoder v2;
+
+contract C {
+    constructor() payable {
+        assembly ("memory-safe") {
+            let a := 0
+            revert(0, a)
+        }
+    }
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output
new file mode 100644
index 0000000000..3f865bfe55
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output
@@ -0,0 +1,24 @@
+Optimized IR:
+/// @use-src 0:"yul_optimizer_steps_with_empty_cleanup_sequence/input.sol"
+object "C_8" {
+    code {
+        {
+            /// @src 0:80:221  "contract C {..."
+            mstore(64, memoryguard(0x80))
+            /// @src 0:129:213  "assembly (\"memory-safe\") {..."
+            let usr$a := 0
+            revert(0, usr$a)
+        }
+    }
+    /// @use-src 0:"yul_optimizer_steps_with_empty_cleanup_sequence/input.sol"
+    object "C_8_deployed" {
+        code {
+            {
+                /// @src 0:80:221  "contract C {..."
+                mstore(64, memoryguard(0x80))
+                revert(0, 0)
+            }
+        }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/args b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/args
new file mode 100644
index 0000000000..b5d1d3c659
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/args
@@ -0,0 +1 @@
+--ir-optimized --optimize --yul-optimizations :iDu
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
new file mode 100644
index 0000000000..2d82716f08
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+pragma abicoder v2;
+
+contract C {
+    constructor() payable {
+        assembly ("memory-safe") {
+            let a := 0
+            revert(0, a)
+        }
+    }
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output
new file mode 100644
index 0000000000..9685b43122
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output
@@ -0,0 +1,24 @@
+Optimized IR:
+/// @use-src 0:"yul_optimizer_steps_with_empty_optimization_sequence/input.sol"
+object "C_8" {
+    code {
+        {
+            /// @src 0:80:221  "contract C {..."
+            mstore(64, memoryguard(0x80))
+            /// @src 0:129:213  "assembly (\"memory-safe\") {..."
+            let usr$a := 0
+            revert(0, usr$a)
+        }
+    }
+    /// @use-src 0:"yul_optimizer_steps_with_empty_optimization_sequence/input.sol"
+    object "C_8_deployed" {
+        code {
+            {
+                /// @src 0:80:221  "contract C {..."
+                mstore(64, memoryguard(0x80))
+                revert(0, 0)
+            }
+        }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/args b/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/args
new file mode 100644
index 0000000000..d1f01a72ff
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/args
@@ -0,0 +1 @@
+--ir-optimized --optimize --yul-optimizations :
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/input.sol
new file mode 100644
index 0000000000..ab0d98d675
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+pragma abicoder v2;
+
+contract C
+{
+    constructor() {}
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/output b/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/output
new file mode 100644
index 0000000000..35ef9ca0bb
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/output
@@ -0,0 +1,42 @@
+Optimized IR:
+/// @use-src 0:"yul_optimizer_steps_with_empty_sequences/input.sol"
+object "C_7" {
+    code {
+        {
+            /// @src 0:80:115  "contract C..."
+            mstore(64, memoryguard(0x80))
+            if callvalue()
+            {
+                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+            }
+            constructor_C()
+            let _1 := allocate_unbounded()
+            codecopy(_1, dataoffset("C_7_deployed"), datasize("C_7_deployed"))
+            return(_1, datasize("C_7_deployed"))
+        }
+        function allocate_unbounded() -> memPtr
+        { memPtr := mload(64) }
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+        { revert(0, 0) }
+        /// @ast-id 6 @src 0:97:113  "constructor() {}"
+        function constructor_C()
+        { }
+    }
+    /// @use-src 0:"yul_optimizer_steps_with_empty_sequences/input.sol"
+    object "C_7_deployed" {
+        code {
+            {
+                /// @src 0:80:115  "contract C..."
+                mstore(64, memoryguard(0x80))
+                revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+            }
+            function shift_right_unsigned(value) -> newValue
+            { newValue := shr(224, value) }
+            function allocate_unbounded() -> memPtr
+            { memPtr := mload(64) }
+            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+            { revert(0, 0) }
+        }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+}
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 60826665a0..7623efc12c 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -339,6 +339,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 				*m_object,
 				true,
 				frontend::OptimiserSettings::DefaultYulOptimiserSteps,
+				frontend::OptimiserSettings::DefaultYulOptimiserCleanupSteps,
 				frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
 			);
 		}},

From ddf0d784ac9888a59200e242e130334c5b8a3e17 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 12 Aug 2022 12:51:16 +0200
Subject: [PATCH 0892/1748] Changelog and docs

---
 Changelog.md                                              | 4 ++--
 docs/internals/optimizer.rst                              | 6 +++++-
 docs/yul.rst                                              | 8 +++++++-
 .../input.sol                                             | 1 +
 .../output                                                | 6 +++---
 .../input.sol                                             | 1 +
 .../output                                                | 6 +++---
 7 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 0e45c2ea58..a18af9e68a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,7 +4,7 @@ Language Features:
 
 
 Compiler Features:
-
+* Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (`:`) in the sequence string.
 
 Bugfixes:
 
@@ -21,7 +21,7 @@ Compiler Features:
  * Yul Optimizer: Simplify the starting offset of zero-length operations to zero.
 
 
-Bugfixes:
+Bugfixes:`````
  * Type Checker: Fix internal compiler error on tuple assignments with invalid left-hand side.
  * Yul IR Code Generation: Fix internal compiler error when accessing the ``.slot`` member of a mapping through a storage reference in inline assembly.
 
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 3c12f0adfb..6650e79b5c 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -329,11 +329,15 @@ the ``--yul-optimizations`` option:
 
 .. code-block:: bash
 
-    solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul'
+    solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul:fDnTOc'
 
 The sequence inside ``[...]`` will be applied multiple times in a loop until the Yul code
 remains unchanged or until the maximum number of rounds (currently 12) has been reached.
 
+The colon delimiter ``:`` is used to supply a custom clean up sequence in order to replace the
+default (``fDnTOc``) one, which is run after the stack compressor when using the legacy EVM
+code transform.
+
 Available abbreviations are listed in the :ref:`Yul optimizer docs <optimization-step-sequence>`.
 
 Preprocessing
diff --git a/docs/yul.rst b/docs/yul.rst
index 7ce0101699..df409a3ac3 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -1250,7 +1250,7 @@ You can override this sequence and supply your own using the ``--yul-optimizatio
 
 .. code-block:: sh
 
-    solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul'
+    solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul:fDnTOc'
 
 The order of steps is significant and affects the quality of the output.
 Moreover, applying a step may uncover new optimization opportunities for others that were already
@@ -1259,6 +1259,12 @@ By enclosing part of the sequence in square brackets (``[]``) you tell the optim
 apply that part until it no longer improves the size of the resulting assembly.
 You can use brackets multiple times in a single sequence but they cannot be nested.
 
+The colon delimiter (``:``) in the example is used to specify a custom cleanup sequence, which is run after
+the main part of the sequence before the delimiter (and, when using the legacy EVM code transform,
+only *after* the stack compressor). If no such delimiter is present, the default cleanup sequence (``fDnTOc``)
+is run after the supplied sequence.
+
+
 The following optimization steps are available:
 
 ============ ===============================
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
index 2d82716f08..45fec390e2 100644
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
@@ -7,6 +7,7 @@ contract C {
         assembly ("memory-safe") {
             let a := 0
             revert(0, a)
+            // Without the cleanup sequence this will not be simplified to ``revert(a, a)``.
         }
     }
 }
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output
index 3f865bfe55..01641c53bc 100644
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/output
@@ -3,9 +3,9 @@ Optimized IR:
 object "C_8" {
     code {
         {
-            /// @src 0:80:221  "contract C {..."
+            /// @src 0:80:314  "contract C {..."
             mstore(64, memoryguard(0x80))
-            /// @src 0:129:213  "assembly (\"memory-safe\") {..."
+            /// @src 0:129:306  "assembly (\"memory-safe\") {..."
             let usr$a := 0
             revert(0, usr$a)
         }
@@ -14,7 +14,7 @@ object "C_8" {
     object "C_8_deployed" {
         code {
             {
-                /// @src 0:80:221  "contract C {..."
+                /// @src 0:80:314  "contract C {..."
                 mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
index 2d82716f08..45fec390e2 100644
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
@@ -7,6 +7,7 @@ contract C {
         assembly ("memory-safe") {
             let a := 0
             revert(0, a)
+            // Without the cleanup sequence this will not be simplified to ``revert(a, a)``.
         }
     }
 }
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output
index 9685b43122..b13e6e2823 100644
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/output
@@ -3,9 +3,9 @@ Optimized IR:
 object "C_8" {
     code {
         {
-            /// @src 0:80:221  "contract C {..."
+            /// @src 0:80:314  "contract C {..."
             mstore(64, memoryguard(0x80))
-            /// @src 0:129:213  "assembly (\"memory-safe\") {..."
+            /// @src 0:129:306  "assembly (\"memory-safe\") {..."
             let usr$a := 0
             revert(0, usr$a)
         }
@@ -14,7 +14,7 @@ object "C_8" {
     object "C_8_deployed" {
         code {
             {
-                /// @src 0:80:221  "contract C {..."
+                /// @src 0:80:314  "contract C {..."
                 mstore(64, memoryguard(0x80))
                 revert(0, 0)
             }

From 314a1cc92fa6c91cf4b35bbfa5d51f4ec13f93ce Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 23 Aug 2022 11:58:12 +0200
Subject: [PATCH 0893/1748] Command line tests and minor touch ups

---
 docs/internals/optimizer.rst                  | 18 +------
 docs/yul.rst                                  | 29 ++++++-----
 libsolidity/interface/CompilerStack.cpp       |  1 +
 libsolidity/interface/OptimiserSettings.h     |  7 ++-
 libsolidity/interface/StandardCompiler.cpp    |  2 +-
 libyul/optimiser/Suite.cpp                    |  7 +--
 solc/CommandLineParser.cpp                    |  2 +-
 .../output.json                               |  4 +-
 .../output.json                               |  4 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../input.sol                                 |  2 +-
 .../input.sol                                 |  2 +-
 test/libsolidity/StandardCompiler.cpp         |  3 +-
 test/solc/CommandLineParser.cpp               | 52 +++++++++++++++++++
 15 files changed, 89 insertions(+), 48 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 6650e79b5c..b752a0766f 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -323,22 +323,8 @@ on the individual steps and their sequence below.
 Selecting Optimizations
 -----------------------
 
-By default the optimizer applies its predefined sequence of optimization steps to
-the generated assembly. You can override this sequence and supply your own using
-the ``--yul-optimizations`` option:
-
-.. code-block:: bash
-
-    solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul:fDnTOc'
-
-The sequence inside ``[...]`` will be applied multiple times in a loop until the Yul code
-remains unchanged or until the maximum number of rounds (currently 12) has been reached.
-
-The colon delimiter ``:`` is used to supply a custom clean up sequence in order to replace the
-default (``fDnTOc``) one, which is run after the stack compressor when using the legacy EVM
-code transform.
-
-Available abbreviations are listed in the :ref:`Yul optimizer docs <optimization-step-sequence>`.
+Detailed information regrading the optimization sequence as well a list of abbreviations is
+available in the :ref:`Yul optimizer docs <optimization-step-sequence>`.
 
 Preprocessing
 -------------
diff --git a/docs/yul.rst b/docs/yul.rst
index df409a3ac3..31180b4329 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -1245,24 +1245,25 @@ In Solidity mode, the Yul optimizer is activated together with the regular optim
 Optimization Step Sequence
 --------------------------
 
-By default the Yul optimizer applies its predefined sequence of optimization steps to the generated assembly.
-You can override this sequence and supply your own using the ``--yul-optimizations`` option:
+By default the optimizer applies its predefined sequence of optimization steps to
+the generated assembly. You can override this sequence and supply your own using
+the ``--yul-optimizations`` option:
 
-.. code-block:: sh
+.. code-block:: bash
 
     solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul:fDnTOc'
 
-The order of steps is significant and affects the quality of the output.
-Moreover, applying a step may uncover new optimization opportunities for others that were already
-applied so repeating steps is often beneficial.
-By enclosing part of the sequence in square brackets (``[]``) you tell the optimizer to repeatedly
-apply that part until it no longer improves the size of the resulting assembly.
-You can use brackets multiple times in a single sequence but they cannot be nested.
-
-The colon delimiter (``:``) in the example is used to specify a custom cleanup sequence, which is run after
-the main part of the sequence before the delimiter (and, when using the legacy EVM code transform,
-only *after* the stack compressor). If no such delimiter is present, the default cleanup sequence (``fDnTOc``)
-is run after the supplied sequence.
+The sequence inside ``[...]`` will be applied multiple times in a loop until the Yul code
+remains unchanged or until the maximum number of rounds (currently 12) has been reached.
+
+An important thing to note, is that there are hardcoded sequences that are run before and after the
+user-supplied sequence, or the default sequence if one was not supplied by the user.
+
+The cleanup sequence delimiter ``:`` is optional, and is used to supply a custom cleanup sequence
+in order to replace the default one. If omitted, the optimizer will simply apply the default cleanup
+sequence. In addition, the delimiter may be placed at the beginning of the user-supplied sequence,
+which will be treated as an empty optimization sequence, whereas conversely, if placed at the end of
+the sequence, will be treated as an empty cleanup sequence.
 
 
 The following optimization steps are available:
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 702d5a0d20..167ef6e280 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1540,6 +1540,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 			details["yulDetails"] = Json::objectValue;
 			details["yulDetails"]["stackAllocation"] = m_optimiserSettings.optimizeStackAllocation;
 			details["yulDetails"]["optimizerSteps"] = m_optimiserSettings.yulOptimiserSteps;
+			details["yulDetails"]["optimizerCleanupSteps"] = m_optimiserSettings.yulOptimiserCleanupSteps;
 		}
 
 		meta["settings"]["optimizer"]["details"] = std::move(details);
diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h
index 82324d3f7a..bae343f2d1 100644
--- a/libsolidity/interface/OptimiserSettings.h
+++ b/libsolidity/interface/OptimiserSettings.h
@@ -148,10 +148,9 @@ struct OptimiserSettings
 	/// them just by setting this to an empty string. Set @a runYulOptimiser to false if you want
 	/// no optimisations.
 	std::string yulOptimiserSteps = DefaultYulOptimiserSteps;
-	/// Sequence of clean up optimisation steps after the above (default or user supplied) set of
-	/// optimisation steps is completed. Note that if the string is left empty, there will still
-	/// be hard-coded optimisation steps that will run regardless. Set @a runYulOptimiser to false
-	/// if you want no optimisations.
+	/// Sequence of clean-up optimisation steps after yulOptimiserSteps is run. Note that if the string
+	/// is left empty, there will still be hard-coded optimisation steps that will run regardless.
+	/// Set @a runYulOptimiser to false if you want no optimisations.
 	std::string yulOptimiserCleanupSteps = DefaultYulOptimiserCleanupSteps;
 	/// This specifies an estimate on how often each opcode in this assembly will be executed,
 	/// i.e. use a small value to optimise for size and a large value to optimise for runtime gas usage.
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 7ccb71d786..129ed845a3 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -490,7 +490,7 @@ std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details
 				);
 			}
 
-			std::string const fullSequence = _details[_name].asString();
+			string const fullSequence = _details[_name].asString();
 			auto const delimiterPos = fullSequence.find(":");
 			_optimiserSetting = fullSequence.substr(0, delimiterPos);
 
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index ae32b25c37..7b75ea9662 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -141,7 +141,7 @@ void OptimiserSuite::run(
 			stackCompressorMaxIterations
 		);
 
-	// Run the user supplied (otherwise default) clean up sequence
+	// Run the user-supplied clean up sequence
 	suite.runSequence(_optimisationCleanupSequence, ast);
 	suite.runSequence("g", ast);
 
@@ -316,8 +316,9 @@ void OptimiserSuite::validateSequence(string_view _stepAbbreviations)
 			assertThrow(nestingLevel >= 0, OptimizerException, "Unbalanced brackets");
 			break;
 		case ':':
-			assertThrow(nestingLevel == 0, OptimizerException, "Cleanup delimiter may only be placed at nesting level zero");
-			assertThrow(++colonDelimiters <=1, OptimizerException, "Too many colon delimiters");
+			++colonDelimiters;
+			assertThrow(nestingLevel == 0, OptimizerException, "Cleanup sequence delimiter cannot be placed inside the brackets");
+			assertThrow(colonDelimiters <=1, OptimizerException, "Too many cleanup sequence delimiters");
 			break;
 		default:
 		{
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index ce2d4d044c..18eef374c0 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -267,7 +267,7 @@ OptimiserSettings CommandLineOptions::optimiserSettings() const
 
 	if (optimizer.yulSteps.has_value())
 	{
-		std::string const fullSequence = optimizer.yulSteps.value();
+		string const fullSequence = optimizer.yulSteps.value();
 		auto const delimiterPos = fullSequence.find(":");
 		settings.yulOptimiserSteps = fullSequence.substr(0, delimiterPos);
 
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json
index 41c8a307f8..f44ca7e2e5 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/output.json
@@ -3,8 +3,8 @@
     [
         {
             "component": "general",
-            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Cleanup delimiter may only be placed at nesting level zero",
-            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Cleanup delimiter may only be placed at nesting level zero",
+            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Cleanup sequence delimiter cannot be placed inside the brackets",
+            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Cleanup sequence delimiter cannot be placed inside the brackets",
             "severity": "error",
             "type": "JSONError"
         }
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json
index b6778a4925..16cba14d70 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/output.json
@@ -3,8 +3,8 @@
     [
         {
             "component": "general",
-            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Too many colon delimiters",
-            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Too many colon delimiters",
+            "formattedMessage": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Too many cleanup sequence delimiters",
+            "message": "Invalid optimizer step sequence in \"settings.optimizer.details.optimizerSteps\": Too many cleanup sequence delimiters",
             "severity": "error",
             "type": "JSONError"
         }
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err
index cb7b570f17..8072127932 100644
--- a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err
+++ b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err
@@ -1 +1 @@
-Invalid optimizer step sequence in --yul-optimizations: Cleanup delimiter may only be placed at nesting level zero
+Invalid optimizer step sequence in --yul-optimizations: Cleanup sequence delimiter cannot be placed inside the brackets
diff --git a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err
index 70b1b2c215..5aa76bd431 100644
--- a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err
+++ b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err
@@ -1 +1 @@
-Invalid optimizer step sequence in --yul-optimizations: Too many colon delimiters
+Invalid optimizer step sequence in --yul-optimizations: Too many cleanup sequence delimiters
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
index 45fec390e2..fc9ba5baf6 100644
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_cleanup_sequence/input.sol
@@ -6,8 +6,8 @@ contract C {
     constructor() payable {
         assembly ("memory-safe") {
             let a := 0
-            revert(0, a)
             // Without the cleanup sequence this will not be simplified to ``revert(a, a)``.
+            revert(0, a)
         }
     }
 }
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
index 45fec390e2..fc9ba5baf6 100644
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
+++ b/test/cmdlineTests/yul_optimizer_steps_with_empty_optimization_sequence/input.sol
@@ -6,8 +6,8 @@ contract C {
     constructor() payable {
         assembly ("memory-safe") {
             let a := 0
-            revert(0, a)
             // Without the cleanup sequence this will not be simplified to ``revert(a, a)``.
+            revert(0, a)
         }
     }
 }
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 319a60885b..9480e7049b 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -1244,10 +1244,11 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_details_different)
 	BOOST_CHECK(optimizer["details"]["yulDetails"].isObject());
 	BOOST_CHECK(
 		util::convertContainer<set<string>>(optimizer["details"]["yulDetails"].getMemberNames()) ==
-		(set<string>{"stackAllocation", "optimizerSteps"})
+		(set<string>{"stackAllocation", "optimizerSteps", "optimizerCleanupSteps"})
 	);
 	BOOST_CHECK(optimizer["details"]["yulDetails"]["stackAllocation"].asBool() == true);
 	BOOST_CHECK(optimizer["details"]["yulDetails"]["optimizerSteps"].asString() == OptimiserSettings::DefaultYulOptimiserSteps);
+	BOOST_CHECK(optimizer["details"]["yulDetails"]["optimizerCleanupSteps"].asString() == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
 	BOOST_CHECK_EQUAL(optimizer["details"].getMemberNames().size(), 9);
 	BOOST_CHECK(optimizer["runs"].asUInt() == 600);
 }
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 47eda71ad3..74cb79cd69 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -426,6 +426,58 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 		}
 }
 
+BOOST_AUTO_TEST_CASE(default_optimiser_sequence)
+{
+	auto const& commandLineOptions = parseCommandLine({"solc", "contract.sol", "--optimize"});
+	BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserSteps, OptimiserSettings::DefaultYulOptimiserSteps);
+	BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserCleanupSteps, OptimiserSettings::DefaultYulOptimiserCleanupSteps);
+}
+
+BOOST_AUTO_TEST_CASE(valid_optimiser_sequences)
+{
+	vector<string> validSequenceInputs {
+		":", 						// Empty optimizaiton sequence and empty cleanup sequence
+		":fDn", 					// Empty optimization sequence and specified cleanup sequence
+		"dhfoDgvulfnTUtnIf:", 		// Specified optimizaiton sequence and empty cleanup sequence
+		"dhfoDgvulfnTUtnIf:fDn", 	// Specified optimization sequence and cleanup sequence
+		"dhfo[Dgvulfn]TUtnIf:f[D]n" // Specified and nested optimization and cleanup sequence
+	};
+
+	vector<tuple<string, string>> expectedParsedSequences {
+		{ "", "" },
+		{ "", "fDn"},
+		{ "dhfoDgvulfnTUtnIf", ""},
+		{ "dhfoDgvulfnTUtnIf", "fDn"},
+		{ "dhfo[Dgvulfn]TUtnIf", "f[D]n"}
+	};
+
+	BOOST_CHECK_EQUAL(validSequenceInputs.size(), expectedParsedSequences.size());
+
+	for (size_t i = 0; i < validSequenceInputs.size(); ++i)
+	{
+		auto const& commandLineOptions = parseCommandLine({"solc", "contract.sol", "--optimize", "--yul-optimizations=" + validSequenceInputs[i]});
+		auto const& [expectedYulOptimiserSteps, expectedYulCleanupSteps] = expectedParsedSequences[i];
+		BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserSteps, expectedYulOptimiserSteps);
+		BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserCleanupSteps, expectedYulCleanupSteps);
+	}
+}
+
+BOOST_AUTO_TEST_CASE(invalid_nested_cleanup_sequence_delimiter)
+{
+	vector<string> commandLine {"solc", "contract.sol", "--optimize", "--yul-optimizations=dhfoDgvulfnTUt[nIf:fd]N"};
+	string expectedMessage = "Invalid optimizer step sequence in --yul-optimizations: Cleanup sequence delimiter cannot be placed inside the brackets";
+	auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedMessage; };
+	BOOST_CHECK_EXCEPTION(parseCommandLine(commandLine), CommandLineValidationError, hasCorrectMessage);
+}
+
+BOOST_AUTO_TEST_CASE(too_many_cleanup_sequence_delimiters)
+{
+	vector<string> commandLine {"solc", "contract.sol", "--optimize", "--yul-optimizations=dhfoDgvulfnTU:tnIf:fdN"};
+	string expectedMessage = "Invalid optimizer step sequence in --yul-optimizations: Too many cleanup sequence delimiters";
+	auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedMessage; };
+	BOOST_CHECK_EXCEPTION(parseCommandLine(commandLine), CommandLineValidationError, hasCorrectMessage);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace solidity::frontend::test

From feba1bfeffc224eab781cc165091b750553bec28 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 5 Sep 2022 09:52:17 +0200
Subject: [PATCH 0894/1748] Rework metadata and cover with tests

---
 libsolidity/interface/CompilerStack.cpp |  3 +-
 test/libsolidity/Metadata.cpp           | 49 +++++++++++++++++++++++++
 test/libsolidity/StandardCompiler.cpp   |  6 +--
 3 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 167ef6e280..1096501303 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1539,8 +1539,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 		{
 			details["yulDetails"] = Json::objectValue;
 			details["yulDetails"]["stackAllocation"] = m_optimiserSettings.optimizeStackAllocation;
-			details["yulDetails"]["optimizerSteps"] = m_optimiserSettings.yulOptimiserSteps;
-			details["yulDetails"]["optimizerCleanupSteps"] = m_optimiserSettings.yulOptimiserCleanupSteps;
+			details["yulDetails"]["optimizerSteps"] = m_optimiserSettings.yulOptimiserSteps + ":" + m_optimiserSettings.yulOptimiserCleanupSteps;
 		}
 
 		meta["settings"]["optimizer"]["details"] = std::move(details);
diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
index 9cbf73f842..ea13286f11 100644
--- a/test/libsolidity/Metadata.cpp
+++ b/test/libsolidity/Metadata.cpp
@@ -400,6 +400,55 @@ BOOST_AUTO_TEST_CASE(metadata_revert_strings)
 	BOOST_CHECK_EQUAL(metadata["settings"]["debug"]["revertStrings"], "strip");
 }
 
+BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
+{
+	char const* sourceCode = R"(
+		pragma solidity >=0.0;
+		contract test {
+		}
+	)";
+
+	vector<tuple<string, string>> sequences =
+	{
+		// { "<optimizer sequence>", "<optimizer cleanup sequence>" }
+		{ "", "" },
+		{ "", "fDn" },
+		{ "dhfoDgvulfnTUtnIf", "" },
+		{ "dhfoDgvulfnTUtnIf", "fDn" }
+	};
+
+	auto check = [sourceCode](string const& optimizerSequence, string const& optimizerCleanupSequence)
+	{
+		OptimiserSettings optimizerSettings = OptimiserSettings::minimal();
+		optimizerSettings.runYulOptimiser = true;
+		optimizerSettings.yulOptimiserSteps = optimizerSequence;
+		optimizerSettings.yulOptimiserCleanupSteps = optimizerCleanupSequence;
+		CompilerStack compilerStack;
+		compilerStack.setSources({{"", std::string(sourceCode)}});
+		compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
+		compilerStack.setOptimiserSettings(optimizerSettings);
+
+		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
+
+		std::string const& serialisedMetadata = compilerStack.metadata("test");
+		Json::Value metadata;
+		BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
+		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
+		BOOST_CHECK(metadata["settings"]["optimizer"].isMember("details"));
+		BOOST_CHECK(metadata["settings"]["optimizer"]["details"].isMember("yulDetails"));
+		BOOST_CHECK(metadata["settings"]["optimizer"]["details"]["yulDetails"].isMember("optimizerSteps"));
+
+		string const metadataOptimizerSteps = metadata["settings"]["optimizer"]["details"]["yulDetails"]["optimizerSteps"].asString();
+		string const expectedMetadataOptimiserSteps = optimizerSequence + ":" + optimizerCleanupSequence;
+		BOOST_CHECK_EQUAL(metadataOptimizerSteps, expectedMetadataOptimiserSteps);
+	};
+
+	for (auto const& [sequence, cleanupSequence] : sequences)
+	{
+		check(sequence, cleanupSequence);
+	}
+}
+
 BOOST_AUTO_TEST_CASE(metadata_license_missing)
 {
 	char const* sourceCode = R"(
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 9480e7049b..c2011e409e 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -1244,11 +1244,11 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_details_different)
 	BOOST_CHECK(optimizer["details"]["yulDetails"].isObject());
 	BOOST_CHECK(
 		util::convertContainer<set<string>>(optimizer["details"]["yulDetails"].getMemberNames()) ==
-		(set<string>{"stackAllocation", "optimizerSteps", "optimizerCleanupSteps"})
+		(set<string>{"stackAllocation", "optimizerSteps"})
 	);
 	BOOST_CHECK(optimizer["details"]["yulDetails"]["stackAllocation"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["yulDetails"]["optimizerSteps"].asString() == OptimiserSettings::DefaultYulOptimiserSteps);
-	BOOST_CHECK(optimizer["details"]["yulDetails"]["optimizerCleanupSteps"].asString() == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
+	BOOST_CHECK(optimizer["details"]["yulDetails"]["optimizerSteps"].asString() ==
+				string{OptimiserSettings::DefaultYulOptimiserSteps} + ":" + string{OptimiserSettings::DefaultYulOptimiserCleanupSteps});
 	BOOST_CHECK_EQUAL(optimizer["details"].getMemberNames().size(), 9);
 	BOOST_CHECK(optimizer["runs"].asUInt() == 600);
 }

From e37dc8e9751f483e6ffe962dc7d9b739fecaf9b1 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 12 Sep 2022 10:57:02 +0200
Subject: [PATCH 0895/1748] Address review comments

---
 Changelog.md                                  |   5 +-
 docs/internals/optimizer.rst                  | 103 ++++++++++++------
 docs/yul.rst                                  |  68 +-----------
 libsolidity/interface/StandardCompiler.cpp    |   2 +
 libyul/optimiser/Suite.cpp                    |   5 +-
 solc/CommandLineParser.cpp                    |   2 +
 .../args                                      |   1 -
 .../err                                       |   1 -
 .../exit                                      |   1 -
 .../input.sol                                 |   7 --
 .../args                                      |   1 -
 .../err                                       |   1 -
 .../exit                                      |   1 -
 .../input.sol                                 |   7 --
 .../args                                      |   1 -
 .../input.sol                                 |   8 --
 .../output                                    |  34 ------
 .../args                                      |   1 -
 .../input.sol                                 |   8 --
 .../output                                    |  42 -------
 test/libsolidity/Metadata.cpp                 |  24 ++--
 test/libsolidity/StandardCompiler.cpp         |   6 +-
 test/solc/CommandLineParser.cpp               |  22 ++--
 23 files changed, 108 insertions(+), 243 deletions(-)
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/args
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/exit
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/input.sol
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/args
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/exit
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/input.sol
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/args
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/input.sol
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/output
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/args
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/input.sol
 delete mode 100644 test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/output

diff --git a/Changelog.md b/Changelog.md
index a18af9e68a..84aa530232 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,7 +4,8 @@ Language Features:
 
 
 Compiler Features:
-* Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (`:`) in the sequence string.
+* Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
+
 
 Bugfixes:
 
@@ -21,7 +22,7 @@ Compiler Features:
  * Yul Optimizer: Simplify the starting offset of zero-length operations to zero.
 
 
-Bugfixes:`````
+Bugfixes:
  * Type Checker: Fix internal compiler error on tuple assignments with invalid left-hand side.
  * Yul IR Code Generation: Fix internal compiler error when accessing the ``.slot`` member of a mapping through a storage reference in inline assembly.
 
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index b752a0766f..c9d10a8f6b 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -281,50 +281,85 @@ The following transformation steps are the main components:
 - Redundant Assign Eliminator
 - Full Inliner
 
+.. _optimizer-steps:
+
 Optimizer Steps
 ---------------
 
 This is a list of all steps the Yul-based optimizer sorted alphabetically. You can find more information
 on the individual steps and their sequence below.
 
-- :ref:`block-flattener`.
-- :ref:`circular-reference-pruner`.
-- :ref:`common-subexpression-eliminator`.
-- :ref:`conditional-simplifier`.
-- :ref:`conditional-unsimplifier`.
-- :ref:`control-flow-simplifier`.
-- :ref:`dead-code-eliminator`.
-- :ref:`equal-store-eliminator`.
-- :ref:`equivalent-function-combiner`.
-- :ref:`expression-joiner`.
-- :ref:`expression-simplifier`.
-- :ref:`expression-splitter`.
-- :ref:`for-loop-condition-into-body`.
-- :ref:`for-loop-condition-out-of-body`.
-- :ref:`for-loop-init-rewriter`.
-- :ref:`expression-inliner`.
-- :ref:`full-inliner`.
-- :ref:`function-grouper`.
-- :ref:`function-hoister`.
-- :ref:`function-specializer`.
-- :ref:`literal-rematerialiser`.
-- :ref:`load-resolver`.
-- :ref:`loop-invariant-code-motion`.
-- :ref:`redundant-assign-eliminator`.
-- :ref:`reasoning-based-simplifier`.
-- :ref:`rematerialiser`.
-- :ref:`SSA-reverser`.
-- :ref:`SSA-transform`.
-- :ref:`structural-simplifier`.
-- :ref:`unused-function-parameter-pruner`.
-- :ref:`unused-pruner`.
-- :ref:`var-decl-initializer`.
+============ ===============================
+Abbreviation Full name
+============ ===============================
+``f``        :ref:`block-flattener`
+``l``        :ref:`circular-reference-pruner`
+``c``        :ref:`common-subexpression-eliminator`
+``C``        :ref:`conditional-simplifier`
+``U``        :ref:`conditional-unsimplifier`
+``n``        :ref:`control-flow-simplifier`
+``D``        :ref:`dead-code-eliminator`
+``E``        :ref:`equal-store-eliminator`
+``v``        :ref:`equivalent-function-combiner`
+``e``        :ref:`expression-inliner`
+``j``        :ref:`expression-joiner`
+``s``        :ref:`expression-simplifier`
+``x``        :ref:`expression-splitter`
+``I``        :ref:`for-loop-condition-into-body`
+``O``        :ref:`for-loop-condition-out-of-body`
+``o``        :ref:`for-loop-init-rewriter`
+``i``        :ref:`full-inliner`
+``g``        :ref:`function-grouper`
+``h``        :ref:`function-hoister`
+``F``        :ref:`function-specializer`
+``T``        :ref:`literal-rematerialiser`
+``L``        :ref:`load-resolver`
+``M``        :ref:`loop-invariant-code-motion`
+``r``        :ref:`redundant-assign-eliminator`
+``R``        :ref:`reasoning-based-simplifier` - highly experimental
+``m``        :ref:`rematerialiser`
+``V``        :ref:`SSA-reverser`
+``a``        :ref:`SSA-transform`
+``t``        :ref:`structural-simplifier`
+``p``        :ref:`unused-function-parameter-pruner`
+``u``        :ref:`unused-pruner`
+``d``        :ref:`var-decl-initializer`
+============ ===============================
+
+Some steps depend on properties ensured by ``BlockFlattener``, ``FunctionGrouper``, ``ForLoopInitRewriter``.
+For this reason the Yul optimizer always applies them before applying any steps supplied by the user.
+
+The ReasoningBasedSimplifier is an optimizer step that is currently not enabled
+in the default set of steps. It uses an SMT solver to simplify arithmetic expressions
+and boolean conditions. It has not received thorough testing or validation yet and can produce
+non-reproducible results, so please use with care!
 
 Selecting Optimizations
 -----------------------
 
-Detailed information regrading the optimization sequence as well a list of abbreviations is
-available in the :ref:`Yul optimizer docs <optimization-step-sequence>`.
+By default the optimizer applies its predefined sequence of optimization steps to the generated assembly.
+You can override this sequence and supply your own using the ``--yul-optimizations`` option:
+
+.. code-block:: bash
+
+    solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul:fDnTOc'
+
+The order of steps is significant and affects the quality of the output.
+Moreover, applying a step may uncover new optimization opportunities for others that were already applied,
+so repeating steps is often beneficial.
+
+The sequence inside ``[...]`` will be applied multiple times in a loop until the Yul code
+remains unchanged or until the maximum number of rounds (currently 12) has been reached.
+Brackets (``[]``) may be used multiple times in a sequence, but can not be nested.
+
+An important thing to note, is that there are some hardcoded steps that are always run before and after the
+user-supplied sequence, or the default sequence if one was not supplied by the user.
+
+The cleanup sequence delimiter ``:`` is optional, and is used to supply a custom cleanup sequence
+in order to replace the default one. If omitted, the optimizer will simply apply the default cleanup
+sequence. In addition, the delimiter may be placed at the beginning of the user-supplied sequence,
+which will result in the optimization sequence being empty, whereas conversely, if placed at the end of
+the sequence, will be treated as an empty cleanup sequence.
 
 Preprocessing
 -------------
diff --git a/docs/yul.rst b/docs/yul.rst
index 31180b4329..f6109a1255 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -1245,72 +1245,8 @@ In Solidity mode, the Yul optimizer is activated together with the regular optim
 Optimization Step Sequence
 --------------------------
 
-By default the optimizer applies its predefined sequence of optimization steps to
-the generated assembly. You can override this sequence and supply your own using
-the ``--yul-optimizations`` option:
-
-.. code-block:: bash
-
-    solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul:fDnTOc'
-
-The sequence inside ``[...]`` will be applied multiple times in a loop until the Yul code
-remains unchanged or until the maximum number of rounds (currently 12) has been reached.
-
-An important thing to note, is that there are hardcoded sequences that are run before and after the
-user-supplied sequence, or the default sequence if one was not supplied by the user.
-
-The cleanup sequence delimiter ``:`` is optional, and is used to supply a custom cleanup sequence
-in order to replace the default one. If omitted, the optimizer will simply apply the default cleanup
-sequence. In addition, the delimiter may be placed at the beginning of the user-supplied sequence,
-which will be treated as an empty optimization sequence, whereas conversely, if placed at the end of
-the sequence, will be treated as an empty cleanup sequence.
-
-
-The following optimization steps are available:
-
-============ ===============================
-Abbreviation Full name
-============ ===============================
-``f``        ``BlockFlattener``
-``l``        ``CircularReferencesPruner``
-``c``        ``CommonSubexpressionEliminator``
-``C``        ``ConditionalSimplifier``
-``U``        ``ConditionalUnsimplifier``
-``n``        ``ControlFlowSimplifier``
-``D``        ``DeadCodeEliminator``
-``v``        ``EquivalentFunctionCombiner``
-``e``        ``ExpressionInliner``
-``j``        ``ExpressionJoiner``
-``s``        ``ExpressionSimplifier``
-``x``        ``ExpressionSplitter``
-``I``        ``ForLoopConditionIntoBody``
-``O``        ``ForLoopConditionOutOfBody``
-``o``        ``ForLoopInitRewriter``
-``i``        ``FullInliner``
-``g``        ``FunctionGrouper``
-``h``        ``FunctionHoister``
-``F``        ``FunctionSpecializer``
-``T``        ``LiteralRematerialiser``
-``L``        ``LoadResolver``
-``M``        ``LoopInvariantCodeMotion``
-``r``        ``RedundantAssignEliminator``
-``R``        ``ReasoningBasedSimplifier`` - highly experimental
-``m``        ``Rematerialiser``
-``V``        ``SSAReverser``
-``a``        ``SSATransform``
-``t``        ``StructuralSimplifier``
-``u``        ``UnusedPruner``
-``p``        ``UnusedFunctionParameterPruner``
-``d``        ``VarDeclInitializer``
-============ ===============================
-
-Some steps depend on properties ensured by ``BlockFlattener``, ``FunctionGrouper``, ``ForLoopInitRewriter``.
-For this reason the Yul optimizer always applies them before applying any steps supplied by the user.
-
-The ReasoningBasedSimplifier is an optimizer step that is currently not enabled
-in the default set of steps. It uses an SMT solver to simplify arithmetic expressions
-and boolean conditions. It has not received thorough testing or validation yet and can produce
-non-reproducible results, so please use with care!
+Detailed information regrading the optimization sequence as well a list of abbreviations is
+available in the :ref:`optimizer docs <optimizer-steps>`.
 
 .. _erc20yul:
 
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 129ed845a3..0af55df16b 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -496,6 +496,8 @@ std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details
 
 			if (delimiterPos != string::npos)
 				_cleanupSetting = fullSequence.substr(delimiterPos + 1);
+			else
+				solAssert(_cleanupSetting == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
 		}
 		else
 			return formatFatalError("JSONError", "\"settings.optimizer.details." + _name + "\" must be a string");
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 7b75ea9662..c71a440019 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -143,6 +143,9 @@ void OptimiserSuite::run(
 
 	// Run the user-supplied clean up sequence
 	suite.runSequence(_optimisationCleanupSequence, ast);
+	// Hard-coded FunctionGrouper step is used to bring the AST into a canonical form required by the StackCompressor
+	// and StackLimitEvader. This is hard-coded as the last step, as some previously executed steps may break the
+	// aforementioned form, thus causing the StackCompressor/StackLimitEvader to throw.
 	suite.runSequence("g", ast);
 
 	if (evmDialect)
@@ -318,7 +321,7 @@ void OptimiserSuite::validateSequence(string_view _stepAbbreviations)
 		case ':':
 			++colonDelimiters;
 			assertThrow(nestingLevel == 0, OptimizerException, "Cleanup sequence delimiter cannot be placed inside the brackets");
-			assertThrow(colonDelimiters <=1, OptimizerException, "Too many cleanup sequence delimiters");
+			assertThrow(colonDelimiters <= 1, OptimizerException, "Too many cleanup sequence delimiters");
 			break;
 		default:
 		{
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 18eef374c0..c6ddfec67f 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -273,6 +273,8 @@ OptimiserSettings CommandLineOptions::optimiserSettings() const
 
 		if (delimiterPos != string::npos)
 			settings.yulOptimiserCleanupSteps = fullSequence.substr(delimiterPos + 1);
+		else
+			solAssert(settings.yulOptimiserCleanupSteps == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
 	}
 
 	return settings;
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/args b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/args
deleted file mode 100644
index c7bdc65636..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations dhfo[Dg:vu]lfnTUtnIf
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err
deleted file mode 100644
index 8072127932..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/err
+++ /dev/null
@@ -1 +0,0 @@
-Invalid optimizer step sequence in --yul-optimizations: Cleanup sequence delimiter cannot be placed inside the brackets
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/exit b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/exit
deleted file mode 100644
index d00491fd7e..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/input.sol b/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/input.sol
deleted file mode 100644
index 0279d3b7d4..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_invalid_nested_delimiter/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C
-{
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/args b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/args
deleted file mode 100644
index 4214dbbd11..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations dhfoDg:vulfn:TUtnIf
diff --git a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err
deleted file mode 100644
index 5aa76bd431..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/err
+++ /dev/null
@@ -1 +0,0 @@
-Invalid optimizer step sequence in --yul-optimizations: Too many cleanup sequence delimiters
diff --git a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/exit b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/exit
deleted file mode 100644
index d00491fd7e..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/input.sol b/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/input.sol
deleted file mode 100644
index 0279d3b7d4..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_multiple_delimiters/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-
-contract C
-{
-    function f() public pure {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/args b/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/args
deleted file mode 100644
index 872a81048e..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations dhfoDgvulfnTUtnIf:fDnTOc
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/input.sol
deleted file mode 100644
index ab0d98d675..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v2;
-
-contract C
-{
-    constructor() {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/output b/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/output
deleted file mode 100644
index 32c0eba2e0..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_cleanup_sequence/output
+++ /dev/null
@@ -1,34 +0,0 @@
-Optimized IR:
-/// @use-src 0:"yul_optimizer_steps_with_cleanup_sequence/input.sol"
-object "C_7" {
-    code {
-        {
-            /// @src 0:80:115  "contract C..."
-            mstore(64, memoryguard(0x80))
-            if callvalue()
-            {
-                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-            }
-            let _1 := allocate_unbounded()
-            codecopy(_1, dataoffset("C_7_deployed"), datasize("C_7_deployed"))
-            return(_1, datasize("C_7_deployed"))
-        }
-        function allocate_unbounded() -> memPtr
-        { memPtr := mload(64) }
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-        { revert(0, 0) }
-    }
-    /// @use-src 0:"yul_optimizer_steps_with_cleanup_sequence/input.sol"
-    object "C_7_deployed" {
-        code {
-            {
-                /// @src 0:80:115  "contract C..."
-                mstore(64, memoryguard(0x80))
-                revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            }
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            { revert(0, 0) }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/args b/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/args
deleted file mode 100644
index d1f01a72ff..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/args
+++ /dev/null
@@ -1 +0,0 @@
---ir-optimized --optimize --yul-optimizations :
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/input.sol b/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/input.sol
deleted file mode 100644
index ab0d98d675..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/input.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-pragma abicoder v2;
-
-contract C
-{
-    constructor() {}
-}
diff --git a/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/output b/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/output
deleted file mode 100644
index 35ef9ca0bb..0000000000
--- a/test/cmdlineTests/yul_optimizer_steps_with_empty_sequences/output
+++ /dev/null
@@ -1,42 +0,0 @@
-Optimized IR:
-/// @use-src 0:"yul_optimizer_steps_with_empty_sequences/input.sol"
-object "C_7" {
-    code {
-        {
-            /// @src 0:80:115  "contract C..."
-            mstore(64, memoryguard(0x80))
-            if callvalue()
-            {
-                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-            }
-            constructor_C()
-            let _1 := allocate_unbounded()
-            codecopy(_1, dataoffset("C_7_deployed"), datasize("C_7_deployed"))
-            return(_1, datasize("C_7_deployed"))
-        }
-        function allocate_unbounded() -> memPtr
-        { memPtr := mload(64) }
-        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
-        { revert(0, 0) }
-        /// @ast-id 6 @src 0:97:113  "constructor() {}"
-        function constructor_C()
-        { }
-    }
-    /// @use-src 0:"yul_optimizer_steps_with_empty_sequences/input.sol"
-    object "C_7_deployed" {
-        code {
-            {
-                /// @src 0:80:115  "contract C..."
-                mstore(64, memoryguard(0x80))
-                revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            }
-            function shift_right_unsigned(value) -> newValue
-            { newValue := shr(224, value) }
-            function allocate_unbounded() -> memPtr
-            { memPtr := mload(64) }
-            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            { revert(0, 0) }
-        }
-        data ".metadata" hex"<BYTECODE REMOVED>"
-    }
-}
diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
index ea13286f11..a5383b5440 100644
--- a/test/libsolidity/Metadata.cpp
+++ b/test/libsolidity/Metadata.cpp
@@ -404,25 +404,25 @@ BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
 {
 	char const* sourceCode = R"(
 		pragma solidity >=0.0;
-		contract test {
+		contract C {
 		}
 	)";
 
 	vector<tuple<string, string>> sequences =
 	{
-		// { "<optimizer sequence>", "<optimizer cleanup sequence>" }
-		{ "", "" },
-		{ "", "fDn" },
-		{ "dhfoDgvulfnTUtnIf", "" },
-		{ "dhfoDgvulfnTUtnIf", "fDn" }
+		// {"<optimizer sequence>", "<optimizer cleanup sequence>"}
+		{"", ""},
+		{"", "fDn"},
+		{"dhfoDgvulfnTUtnIf", "" },
+		{"dhfoDgvulfnTUtnIf", "fDn"}
 	};
 
-	auto check = [sourceCode](string const& optimizerSequence, string const& optimizerCleanupSequence)
+	auto check = [sourceCode](string const& _optimizerSequence, string const& _optimizerCleanupSequence)
 	{
 		OptimiserSettings optimizerSettings = OptimiserSettings::minimal();
 		optimizerSettings.runYulOptimiser = true;
-		optimizerSettings.yulOptimiserSteps = optimizerSequence;
-		optimizerSettings.yulOptimiserCleanupSteps = optimizerCleanupSequence;
+		optimizerSettings.yulOptimiserSteps = _optimizerSequence;
+		optimizerSettings.yulOptimiserCleanupSteps = _optimizerCleanupSequence;
 		CompilerStack compilerStack;
 		compilerStack.setSources({{"", std::string(sourceCode)}});
 		compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
@@ -430,7 +430,7 @@ BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
 
 		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-		std::string const& serialisedMetadata = compilerStack.metadata("test");
+		std::string const& serialisedMetadata = compilerStack.metadata("C");
 		Json::Value metadata;
 		BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -439,14 +439,12 @@ BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
 		BOOST_CHECK(metadata["settings"]["optimizer"]["details"]["yulDetails"].isMember("optimizerSteps"));
 
 		string const metadataOptimizerSteps = metadata["settings"]["optimizer"]["details"]["yulDetails"]["optimizerSteps"].asString();
-		string const expectedMetadataOptimiserSteps = optimizerSequence + ":" + optimizerCleanupSequence;
+		string const expectedMetadataOptimiserSteps = _optimizerSequence + ":" + _optimizerCleanupSequence;
 		BOOST_CHECK_EQUAL(metadataOptimizerSteps, expectedMetadataOptimiserSteps);
 	};
 
 	for (auto const& [sequence, cleanupSequence] : sequences)
-	{
 		check(sequence, cleanupSequence);
-	}
 }
 
 BOOST_AUTO_TEST_CASE(metadata_license_missing)
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index c2011e409e..54c12d30cf 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -1247,8 +1247,10 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_details_different)
 		(set<string>{"stackAllocation", "optimizerSteps"})
 	);
 	BOOST_CHECK(optimizer["details"]["yulDetails"]["stackAllocation"].asBool() == true);
-	BOOST_CHECK(optimizer["details"]["yulDetails"]["optimizerSteps"].asString() ==
-				string{OptimiserSettings::DefaultYulOptimiserSteps} + ":" + string{OptimiserSettings::DefaultYulOptimiserCleanupSteps});
+	BOOST_CHECK(
+		optimizer["details"]["yulDetails"]["optimizerSteps"].asString() ==
+		OptimiserSettings::DefaultYulOptimiserSteps + ":"s + OptimiserSettings::DefaultYulOptimiserCleanupSteps
+ 	);
 	BOOST_CHECK_EQUAL(optimizer["details"].getMemberNames().size(), 9);
 	BOOST_CHECK(optimizer["runs"].asUInt() == 600);
 }
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 74cb79cd69..f2d020ae78 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -428,7 +428,7 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 
 BOOST_AUTO_TEST_CASE(default_optimiser_sequence)
 {
-	auto const& commandLineOptions = parseCommandLine({"solc", "contract.sol", "--optimize"});
+	CommandLineOptions const& commandLineOptions = parseCommandLine({"solc", "contract.sol", "--optimize"});
 	BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserSteps, OptimiserSettings::DefaultYulOptimiserSteps);
 	BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserCleanupSteps, OptimiserSettings::DefaultYulOptimiserCleanupSteps);
 }
@@ -436,26 +436,26 @@ BOOST_AUTO_TEST_CASE(default_optimiser_sequence)
 BOOST_AUTO_TEST_CASE(valid_optimiser_sequences)
 {
 	vector<string> validSequenceInputs {
-		":", 						// Empty optimizaiton sequence and empty cleanup sequence
-		":fDn", 					// Empty optimization sequence and specified cleanup sequence
-		"dhfoDgvulfnTUtnIf:", 		// Specified optimizaiton sequence and empty cleanup sequence
-		"dhfoDgvulfnTUtnIf:fDn", 	// Specified optimization sequence and cleanup sequence
+		":",                        // Empty optimization sequence and empty cleanup sequence
+		":fDn",                     // Empty optimization sequence and specified cleanup sequence
+		"dhfoDgvulfnTUtnIf:",       // Specified optimization sequence and empty cleanup sequence
+		"dhfoDgvulfnTUtnIf:fDn",    // Specified optimization sequence and cleanup sequence
 		"dhfo[Dgvulfn]TUtnIf:f[D]n" // Specified and nested optimization and cleanup sequence
 	};
 
 	vector<tuple<string, string>> expectedParsedSequences {
-		{ "", "" },
-		{ "", "fDn"},
-		{ "dhfoDgvulfnTUtnIf", ""},
-		{ "dhfoDgvulfnTUtnIf", "fDn"},
-		{ "dhfo[Dgvulfn]TUtnIf", "f[D]n"}
+		{"", ""},
+		{"", "fDn"},
+		{"dhfoDgvulfnTUtnIf", ""},
+		{"dhfoDgvulfnTUtnIf", "fDn"},
+		{"dhfo[Dgvulfn]TUtnIf", "f[D]n"}
 	};
 
 	BOOST_CHECK_EQUAL(validSequenceInputs.size(), expectedParsedSequences.size());
 
 	for (size_t i = 0; i < validSequenceInputs.size(); ++i)
 	{
-		auto const& commandLineOptions = parseCommandLine({"solc", "contract.sol", "--optimize", "--yul-optimizations=" + validSequenceInputs[i]});
+		CommandLineOptions const& commandLineOptions = parseCommandLine({"solc", "contract.sol", "--optimize", "--yul-optimizations=" + validSequenceInputs[i]});
 		auto const& [expectedYulOptimiserSteps, expectedYulCleanupSteps] = expectedParsedSequences[i];
 		BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserSteps, expectedYulOptimiserSteps);
 		BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserCleanupSteps, expectedYulCleanupSteps);

From 4a52be8fe73abffc7944a0dc8e40912bf666a0d3 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 13 Sep 2022 12:07:30 +0200
Subject: [PATCH 0896/1748] Boost tests for non-delimited optimizer sequence

---
 test/solc/CommandLineParser.cpp | 70 ++++++++++++++++++++++++---------
 1 file changed, 51 insertions(+), 19 deletions(-)

diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index f2d020ae78..5440218867 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -436,19 +436,25 @@ BOOST_AUTO_TEST_CASE(default_optimiser_sequence)
 BOOST_AUTO_TEST_CASE(valid_optimiser_sequences)
 {
 	vector<string> validSequenceInputs {
-		":",                        // Empty optimization sequence and empty cleanup sequence
-		":fDn",                     // Empty optimization sequence and specified cleanup sequence
-		"dhfoDgvulfnTUtnIf:",       // Specified optimization sequence and empty cleanup sequence
-		"dhfoDgvulfnTUtnIf:fDn",    // Specified optimization sequence and cleanup sequence
-		"dhfo[Dgvulfn]TUtnIf:f[D]n" // Specified and nested optimization and cleanup sequence
+		":",                         // Empty optimization sequence and empty cleanup sequence
+		":fDn",                      // Empty optimization sequence and specified cleanup sequence
+		"dhfoDgvulfnTUtnIf:",        // Specified optimization sequence and empty cleanup sequence
+		"dhfoDgvulfnTUtnIf:fDn",     // Specified optimization sequence and cleanup sequence
+		"dhfo[Dgvulfn]TUtnIf:f[D]n", // Specified and nested optimization and cleanup sequence
+		"dhfoDgvulfnTUtnIf",         // Specified optimizer sequence only
+		"iDu",                       // Short optimizer sequence
+		"a[[a][[aa]aa[aa]][]]aaa[aa[aa[aa]]]a[a][a][a]a[a]" // Nested brackets
 	};
 
-	vector<tuple<string, string>> expectedParsedSequences {
+	vector<tuple<string, string>> const expectedParsedSequences {
 		{"", ""},
 		{"", "fDn"},
 		{"dhfoDgvulfnTUtnIf", ""},
 		{"dhfoDgvulfnTUtnIf", "fDn"},
-		{"dhfo[Dgvulfn]TUtnIf", "f[D]n"}
+		{"dhfo[Dgvulfn]TUtnIf", "f[D]n"},
+		{"dhfoDgvulfnTUtnIf", OptimiserSettings::DefaultYulOptimiserCleanupSteps},
+		{"iDu", OptimiserSettings::DefaultYulOptimiserCleanupSteps},
+		{"a[[a][[aa]aa[aa]][]]aaa[aa[aa[aa]]]a[a][a][a]a[a]", OptimiserSettings::DefaultYulOptimiserCleanupSteps}
 	};
 
 	BOOST_CHECK_EQUAL(validSequenceInputs.size(), expectedParsedSequences.size());
@@ -462,20 +468,46 @@ BOOST_AUTO_TEST_CASE(valid_optimiser_sequences)
 	}
 }
 
-BOOST_AUTO_TEST_CASE(invalid_nested_cleanup_sequence_delimiter)
+BOOST_AUTO_TEST_CASE(invalid_optimiser_sequences)
 {
-	vector<string> commandLine {"solc", "contract.sol", "--optimize", "--yul-optimizations=dhfoDgvulfnTUt[nIf:fd]N"};
-	string expectedMessage = "Invalid optimizer step sequence in --yul-optimizations: Cleanup sequence delimiter cannot be placed inside the brackets";
-	auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedMessage; };
-	BOOST_CHECK_EXCEPTION(parseCommandLine(commandLine), CommandLineValidationError, hasCorrectMessage);
-}
+	vector<string> const invalidSequenceInputs {
+		"abcdefg{hijklmno}pqr[st]uvwxyz", // Invalid abbreviation
+		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
+		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
+		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
+		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
+		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[[a]"
+		"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
+		"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
+		"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
+		"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]]"
+		"]]]]]]]]]]]]]]]]]]]]]]]]]]]]]",  // Brackets nested too deep
+		"a]a][",                          // Unbalanced closing bracket
+		"a[a][",                          // Unbalanced opening bracket
+		"dhfoDgvulfnTUt[nIf:fd]N",        // Nested cleanup sequence delimiter
+		"dhfoDgvulfnTU:tnIf:fdN"          // Too many cleanup sequence delimiters
+	};
 
-BOOST_AUTO_TEST_CASE(too_many_cleanup_sequence_delimiters)
-{
-	vector<string> commandLine {"solc", "contract.sol", "--optimize", "--yul-optimizations=dhfoDgvulfnTU:tnIf:fdN"};
-	string expectedMessage = "Invalid optimizer step sequence in --yul-optimizations: Too many cleanup sequence delimiters";
-	auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedMessage; };
-	BOOST_CHECK_EXCEPTION(parseCommandLine(commandLine), CommandLineValidationError, hasCorrectMessage);
+	vector<string> const expectedErrorMessages {
+		"'b' is not a valid step abbreviation",
+		"Brackets nested too deep",
+		"Unbalanced brackets",
+		"Unbalanced brackets",
+		"Cleanup sequence delimiter cannot be placed inside the brackets",
+		"Too many cleanup sequence delimiters"
+	};
+
+	BOOST_CHECK_EQUAL(invalidSequenceInputs.size(), expectedErrorMessages.size());
+
+	string const baseExpectedErrorMessage = "Invalid optimizer step sequence in --yul-optimizations: ";
+
+	for (size_t i = 0; i < invalidSequenceInputs.size(); ++i)
+	{
+		vector<string> const commandLineOptions = {"solc", "contract.sol", "--optimize", "--yul-optimizations=" + invalidSequenceInputs[i]};
+		string const expectedErrorMessage = baseExpectedErrorMessage + expectedErrorMessages[i];
+		auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedErrorMessage; };
+		BOOST_CHECK_EXCEPTION(parseCommandLine(commandLineOptions), CommandLineValidationError, hasCorrectMessage);
+	}
 }
 
 BOOST_AUTO_TEST_SUITE_END()

From 12ea1158bf7fbff6657d66d79882a7dfa921f039 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 14 Sep 2022 09:12:03 +0200
Subject: [PATCH 0897/1748] Remove std qualifier from string in Metadata tests

---
 test/libsolidity/Metadata.cpp | 38 +++++++++++++++++------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
index a5383b5440..6814ae80ab 100644
--- a/test/libsolidity/Metadata.cpp
+++ b/test/libsolidity/Metadata.cpp
@@ -54,10 +54,10 @@ map<string, string> requireParsedCBORMetadata(bytes const& _bytecode, CompilerSt
 optional<string> compileAndCheckLicenseMetadata(string const& _contractName, char const* _sourceCode)
 {
 	CompilerStack compilerStack;
-	compilerStack.setSources({{"A.sol", std::string(_sourceCode)}});
+	compilerStack.setSources({{"A.sol", _sourceCode}});
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-	std::string const& serialisedMetadata = compilerStack.metadata(_contractName);
+	string const& serialisedMetadata = compilerStack.metadata(_contractName);
 	Json::Value metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -101,13 +101,13 @@ BOOST_AUTO_TEST_CASE(metadata_stamp)
 		{
 			CompilerStack compilerStack;
 			compilerStack.setMetadataFormat(metadataFormat);
-			compilerStack.setSources({{"", std::string(sourceCode)}});
+			compilerStack.setSources({{"", sourceCode}});
 			compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 			compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 			compilerStack.setMetadataHash(metadataHash);
 			BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 			bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
-			std::string const& metadata = compilerStack.metadata("test");
+			string const& metadata = compilerStack.metadata("test");
 			BOOST_CHECK(solidity::test::isValidMetadata(metadata));
 
 			auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
@@ -174,13 +174,13 @@ BOOST_AUTO_TEST_CASE(metadata_stamp_experimental)
 		{
 			CompilerStack compilerStack;
 			compilerStack.setMetadataFormat(metadataFormat);
-			compilerStack.setSources({{"", std::string(sourceCode)}});
+			compilerStack.setSources({{"", sourceCode}});
 			compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 			compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 			compilerStack.setMetadataHash(metadataHash);
 			BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 			bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
-			std::string const& metadata = compilerStack.metadata("test");
+			string const& metadata = compilerStack.metadata("test");
 			BOOST_CHECK(solidity::test::isValidMetadata(metadata));
 
 			auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
@@ -242,14 +242,14 @@ BOOST_AUTO_TEST_CASE(metadata_relevant_sources)
 		}
 	)";
 	compilerStack.setSources({
-		{"A", std::string(sourceCodeA)},
-		{"B", std::string(sourceCodeB)},
+		{"A", sourceCodeA},
+		{"B", sourceCodeB},
 	});
 	compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 	compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-	std::string const& serialisedMetadata = compilerStack.metadata("A");
+	string const& serialisedMetadata = compilerStack.metadata("A");
 	Json::Value metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -282,15 +282,15 @@ BOOST_AUTO_TEST_CASE(metadata_relevant_sources_imports)
 		}
 	)";
 	compilerStack.setSources({
-		{"A", std::string(sourceCodeA)},
-		{"B", std::string(sourceCodeB)},
-		{"C", std::string(sourceCodeC)}
+		{"A", sourceCodeA},
+		{"B", sourceCodeB},
+		{"C", sourceCodeC}
 	});
 	compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 	compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-	std::string const& serialisedMetadata = compilerStack.metadata("C");
+	string const& serialisedMetadata = compilerStack.metadata("C");
 	Json::Value metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -313,7 +313,7 @@ BOOST_AUTO_TEST_CASE(metadata_useLiteralContent)
 	auto check = [](char const* _src, bool _literal)
 	{
 		CompilerStack compilerStack;
-		compilerStack.setSources({{"", std::string(_src)}});
+		compilerStack.setSources({{"", _src}});
 		compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 		compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 		compilerStack.useMetadataLiteralSources(_literal);
@@ -347,7 +347,7 @@ BOOST_AUTO_TEST_CASE(metadata_viair)
 	auto check = [](char const* _src, bool _viaIR)
 	{
 		CompilerStack compilerStack;
-		compilerStack.setSources({{"", std::string(_src)}});
+		compilerStack.setSources({{"", _src}});
 		compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 		compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 		compilerStack.setViaIR(_viaIR);
@@ -388,11 +388,11 @@ BOOST_AUTO_TEST_CASE(metadata_revert_strings)
 		contract A {
 		}
 	)";
-	compilerStack.setSources({{"A", std::string(sourceCodeA)}});
+	compilerStack.setSources({{"A", sourceCodeA}});
 	compilerStack.setRevertStringBehaviour(RevertStrings::Strip);
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-	std::string const& serialisedMetadata = compilerStack.metadata("A");
+	string const& serialisedMetadata = compilerStack.metadata("A");
 	Json::Value metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -424,13 +424,13 @@ BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
 		optimizerSettings.yulOptimiserSteps = _optimizerSequence;
 		optimizerSettings.yulOptimiserCleanupSteps = _optimizerCleanupSequence;
 		CompilerStack compilerStack;
-		compilerStack.setSources({{"", std::string(sourceCode)}});
+		compilerStack.setSources({{"", sourceCode}});
 		compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 		compilerStack.setOptimiserSettings(optimizerSettings);
 
 		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-		std::string const& serialisedMetadata = compilerStack.metadata("C");
+		string const& serialisedMetadata = compilerStack.metadata("C");
 		Json::Value metadata;
 		BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 		BOOST_CHECK(solidity::test::isValidMetadata(metadata));

From 53b67334c539639f9b4b2178dec0a9641b6eecc6 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 19 Jul 2022 18:48:56 +0200
Subject: [PATCH 0898/1748] YulRunner: Add support for memoryguard() and
 literal parameters

---
 .../yulInterpreter/EVMInstructionInterpreter.cpp   |  2 ++
 test/tools/yulInterpreter/Interpreter.cpp          | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 0a3c920a58..9fcd08b779 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -475,6 +475,8 @@ u256 EVMInstructionInterpreter::evalBuiltin(
 			);
 		return 0;
 	}
+	else if (fun == "memoryguard")
+		return _evaluatedArguments.at(0);
 	else
 		yulAssert(false, "Unknown builtin: " + fun);
 	return 0;
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index bf0ad820b8..45b39f2ed7 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -351,7 +351,19 @@ void ExpressionEvaluator::evaluateArgs(
 		if (!_literalArguments || !_literalArguments->at(_expr.size() - i - 1))
 			visit(expr);
 		else
-			m_values = {0};
+		{
+			string literal = std::get<Literal>(expr).value.str();
+
+			try
+			{
+				m_values = {u256(literal)};
+			}
+			catch (exception&)
+			{
+				m_values = {u256(0)};
+			}
+		}
+
 		values.push_back(value());
 		++i;
 	}

From 4b69b5fdc1646cbbdff59d837b00c20840aa55c6 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 11 Aug 2022 15:01:15 +0200
Subject: [PATCH 0899/1748] YulRunner: Add support for external calls to the
 same contract

---
 libevmasm/Instruction.h                       |  15 +++
 test/libyul/EwasmTranslationTest.cpp          |   1 +
 test/libyul/YulInterpreterTest.cpp            |   1 +
 test/tools/ossfuzz/yulFuzzerCommon.cpp        |   2 +-
 .../EVMInstructionInterpreter.cpp             |  26 ++---
 .../EVMInstructionInterpreter.h               |   8 ++
 test/tools/yulInterpreter/Interpreter.cpp     | 108 ++++++++++++++++--
 test/tools/yulInterpreter/Interpreter.h       |  46 ++++++++
 test/tools/yulrun.cpp                         |   7 +-
 9 files changed, 187 insertions(+), 27 deletions(-)

diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index 52bda8bf1d..5d4432ca58 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -188,6 +188,21 @@ enum class Instruction: uint8_t
 	SELFDESTRUCT = 0xff	///< halt execution and register account for later deletion
 };
 
+/// @returns true if the instruction is of the CALL opcode family
+constexpr bool isCallInstruction(Instruction _inst) noexcept
+{
+	switch (_inst)
+	{
+		case Instruction::CALL:
+		case Instruction::CALLCODE:
+		case Instruction::DELEGATECALL:
+		case Instruction::STATICCALL:
+			return true;
+		default:
+			return false;
+	}
+}
+
 /// @returns true if the instruction is a PUSH
 inline bool isPushInstruction(Instruction _inst)
 {
diff --git a/test/libyul/EwasmTranslationTest.cpp b/test/libyul/EwasmTranslationTest.cpp
index 34a7144040..075d117951 100644
--- a/test/libyul/EwasmTranslationTest.cpp
+++ b/test/libyul/EwasmTranslationTest.cpp
@@ -112,6 +112,7 @@ string EwasmTranslationTest::interpret()
 			state,
 			WasmDialect{},
 			*m_object->code,
+			/*disableExternalCalls=*/true,
 			/*disableMemoryTracing=*/false
 		);
 	}
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index 3c890972ee..7008743491 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -98,6 +98,7 @@ string YulInterpreterTest::interpret()
 			state,
 			EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}),
 			*m_ast,
+			/*disableExternalCalls=*/true,
 			/*disableMemoryTracing=*/false
 		);
 	}
diff --git a/test/tools/ossfuzz/yulFuzzerCommon.cpp b/test/tools/ossfuzz/yulFuzzerCommon.cpp
index cfbbbaa484..57f930cfe1 100644
--- a/test/tools/ossfuzz/yulFuzzerCommon.cpp
+++ b/test/tools/ossfuzz/yulFuzzerCommon.cpp
@@ -53,7 +53,7 @@ yulFuzzerUtil::TerminationReason yulFuzzerUtil::interpret(
 	TerminationReason reason = TerminationReason::None;
 	try
 	{
-		Interpreter::run(state, _dialect, *_ast, _disableMemoryTracing);
+		Interpreter::run(state, _dialect, *_ast, true, _disableMemoryTracing);
 	}
 	catch (StepLimitReached const&)
 	{
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 9fcd08b779..30b2b57750 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -70,6 +70,10 @@ u256 readZeroExtended(bytes const& _data, u256 const& _offset)
 	}
 }
 
+}
+
+namespace solidity::yul::test
+{
 /// Copy @a _size bytes of @a _source at offset @a _sourceOffset to
 /// @a _target at offset @a _targetOffset. Behaves as if @a _source would
 /// continue with an infinite sequence of zero bytes beyond its end.
@@ -185,7 +189,7 @@ u256 EVMInstructionInterpreter::eval(
 			return u256("0x1234cafe1234cafe1234cafe") + arg[0];
 		uint64_t offset = uint64_t(arg[0] & uint64_t(-1));
 		uint64_t size = uint64_t(arg[1] & uint64_t(-1));
-		return u256(keccak256(readMemory(offset, size)));
+		return u256(keccak256(m_state.readMemory(offset, size)));
 	}
 	case Instruction::ADDRESS:
 		return h256(m_state.address, h256::AlignRight);
@@ -322,7 +326,6 @@ u256 EVMInstructionInterpreter::eval(
 		return (0xdddddd + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
 	case Instruction::CALL:
 	case Instruction::CALLCODE:
-		// TODO assign returndata
 		accessMemory(arg[3], arg[4]);
 		accessMemory(arg[5], arg[6]);
 		logTrace(_instruction, arg);
@@ -335,11 +338,11 @@ u256 EVMInstructionInterpreter::eval(
 		return 0;
 	case Instruction::RETURN:
 	{
-		bytes data;
+		m_state.returndata = {};
 		if (accessMemory(arg[0], arg[1]))
-			data = readMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg, data);
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
+			m_state.returndata = m_state.readMemory(arg[0], arg[1]);
+		logTrace(_instruction, arg, m_state.returndata);
+		BOOST_THROW_EXCEPTION(ExplicitlyTerminatedWithReturn());
 	}
 	case Instruction::REVERT:
 		accessMemory(arg[0], arg[1]);
@@ -499,18 +502,9 @@ bool EVMInstructionInterpreter::accessMemory(u256 const& _offset, u256 const& _s
 	return false;
 }
 
-bytes EVMInstructionInterpreter::readMemory(u256 const& _offset, u256 const& _size)
-{
-	yulAssert(_size <= 0xffff, "Too large read.");
-	bytes data(size_t(_size), uint8_t(0));
-	for (size_t i = 0; i < data.size(); ++i)
-		data[i] = m_state.memory[_offset + i];
-	return data;
-}
-
 u256 EVMInstructionInterpreter::readMemoryWord(u256 const& _offset)
 {
-	return u256(h256(readMemory(_offset, 32)));
+	return u256(h256(m_state.readMemory(_offset, 32)));
 }
 
 void EVMInstructionInterpreter::writeMemoryWord(u256 const& _offset, u256 const& _value)
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
index c05af8c1ae..37bfdb214b 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -42,6 +42,14 @@ struct BuiltinFunctionForEVM;
 namespace solidity::yul::test
 {
 
+/// Copy @a _size bytes of @a _source at offset @a _sourceOffset to
+/// @a _target at offset @a _targetOffset. Behaves as if @a _source would
+/// continue with an infinite sequence of zero bytes beyond its end.
+void copyZeroExtended(
+	std::map<u256, uint8_t>& _target, bytes const& _source,
+	size_t _targetOffset, size_t _sourceOffset, size_t _size
+);
+
 struct InterpreterState;
 
 /**
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index 45b39f2ed7..f24f8b7f1a 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -78,11 +78,12 @@ void Interpreter::run(
 	InterpreterState& _state,
 	Dialect const& _dialect,
 	Block const& _ast,
+	bool _disableExternalCalls,
 	bool _disableMemoryTrace
 )
 {
 	Scope scope;
-	Interpreter{_state, _dialect, scope, _disableMemoryTrace}(_ast);
+	Interpreter{_state, _dialect, scope, _disableExternalCalls, _disableMemoryTrace}(_ast);
 }
 
 void Interpreter::operator()(ExpressionStatement const& _expressionStatement)
@@ -217,14 +218,14 @@ void Interpreter::operator()(Block const& _block)
 
 u256 Interpreter::evaluate(Expression const& _expression)
 {
-	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables, m_disableMemoryTrace);
+	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables, m_disableExternalCalls, m_disableMemoryTrace);
 	ev.visit(_expression);
 	return ev.value();
 }
 
 vector<u256> Interpreter::evaluateMulti(Expression const& _expression)
 {
-	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables, m_disableMemoryTrace);
+	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables, m_disableExternalCalls, m_disableMemoryTrace);
 	ev.visit(_expression);
 	return ev.values();
 }
@@ -288,7 +289,17 @@ void ExpressionEvaluator::operator()(FunctionCall const& _funCall)
 		if (BuiltinFunctionForEVM const* fun = dialect->builtin(_funCall.functionName.name))
 		{
 			EVMInstructionInterpreter interpreter(m_state, m_disableMemoryTrace);
-			setValue(interpreter.evalBuiltin(*fun, _funCall.arguments, values()));
+
+			u256 const value = interpreter.evalBuiltin(*fun, _funCall.arguments, values());
+
+			if (
+				!m_disableExternalCalls &&
+				fun->instruction &&
+				evmasm::isCallInstruction(*fun->instruction)
+			)
+				runExternalCall(*fun->instruction);
+
+			setValue(value);
 			return;
 		}
 	}
@@ -316,13 +327,13 @@ void ExpressionEvaluator::operator()(FunctionCall const& _funCall)
 		variables[fun->returnVariables.at(i).name] = 0;
 
 	m_state.controlFlowState = ControlFlowState::Default;
-	Interpreter interpreter(m_state, m_dialect, *scope, m_disableMemoryTrace, std::move(variables));
-	interpreter(fun->body);
+	unique_ptr<Interpreter> interpreter = makeInterpreterCopy(std::move(variables));
+	(*interpreter)(fun->body);
 	m_state.controlFlowState = ControlFlowState::Default;
 
 	m_values.clear();
 	for (auto const& retVar: fun->returnVariables)
-		m_values.emplace_back(interpreter.valueOfVariable(retVar.name));
+		m_values.emplace_back(interpreter->valueOfVariable(retVar.name));
 }
 
 u256 ExpressionEvaluator::value() const
@@ -380,3 +391,86 @@ void ExpressionEvaluator::incrementStep()
 		BOOST_THROW_EXCEPTION(ExpressionNestingLimitReached());
 	}
 }
+
+void ExpressionEvaluator::runExternalCall(evmasm::Instruction _instruction)
+{
+	u256 memOutOffset = 0;
+	u256 memOutSize = 0;
+	u256 callvalue = 0;
+	u256 memInOffset = 0;
+	u256 memInSize = 0;
+
+	// Setup memOut* values
+	if (
+		_instruction == evmasm::Instruction::CALL ||
+		_instruction == evmasm::Instruction::CALLCODE
+	)
+	{
+		memOutOffset = values()[5];
+		memOutSize = values()[6];
+		callvalue = values()[2];
+		memInOffset = values()[3];
+		memInSize = values()[4];
+	}
+	else if (
+		_instruction == evmasm::Instruction::DELEGATECALL ||
+		_instruction == evmasm::Instruction::STATICCALL
+	)
+	{
+		memOutOffset = values()[4];
+		memOutSize = values()[5];
+		memInOffset = values()[2];
+		memInSize = values()[3];
+	}
+	else
+		yulAssert(false);
+
+	// Don't execute external call if it isn't our own address
+	if (values()[1] != util::h160::Arith(m_state.address))
+		return;
+
+	Scope tmpScope;
+	InterpreterState tmpState;
+	tmpState.calldata = m_state.readMemory(memInOffset, memInSize);
+	tmpState.callvalue = callvalue;
+
+	// Create new interpreter for the called contract
+	unique_ptr<Interpreter> newInterpreter = makeInterpreterNew(tmpState, tmpScope);
+
+	Scope* abstractRootScope = &m_scope;
+	Scope* fileScope = nullptr;
+	Block const* ast = nullptr;
+
+	// Find file scope
+	while (abstractRootScope->parent)
+	{
+		fileScope = abstractRootScope;
+		abstractRootScope = abstractRootScope->parent;
+	}
+
+	// Get AST for file scope
+	for (auto&& [block, scope]: abstractRootScope->subScopes)
+		if (scope.get() == fileScope)
+		{
+			ast = block;
+			break;
+		}
+
+	yulAssert(ast);
+
+	try
+	{
+		(*newInterpreter)(*ast);
+	}
+	catch (ExplicitlyTerminatedWithReturn const&)
+	{
+		// Copy return data to our memory
+		copyZeroExtended(
+			m_state.memory,
+			newInterpreter->returnData(),
+			memOutOffset.convert_to<size_t>(),
+			0,
+			memOutSize.convert_to<size_t>()
+		);
+	}
+}
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index cdc454401e..3eee09caae 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -24,6 +24,8 @@
 #include <libyul/ASTForward.h>
 #include <libyul/optimiser/ASTWalker.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <libsolutil/FixedHash.h>
 #include <libsolutil/CommonData.h>
 
@@ -47,6 +49,10 @@ class ExplicitlyTerminated: public InterpreterTerminatedGeneric
 {
 };
 
+class ExplicitlyTerminatedWithReturn: public ExplicitlyTerminated
+{
+};
+
 class StepLimitReached: public InterpreterTerminatedGeneric
 {
 };
@@ -108,6 +114,15 @@ struct InterpreterState
 	void dumpTraceAndState(std::ostream& _out, bool _disableMemoryTrace) const;
 	/// Prints non-zero storage to @param _out.
 	void dumpStorage(std::ostream& _out) const;
+
+	bytes readMemory(u256 const& _offset, u256 const& _size)
+	{
+		yulAssert(_size <= 0xffff, "Too large read.");
+		bytes data(size_t(_size), uint8_t(0));
+		for (size_t i = 0; i < data.size(); ++i)
+			data[i] = memory[_offset + i];
+		return data;
+	}
 };
 
 /**
@@ -135,6 +150,7 @@ class Interpreter: public ASTWalker
 		InterpreterState& _state,
 		Dialect const& _dialect,
 		Block const& _ast,
+		bool _disableExternalCalls,
 		bool _disableMemoryTracing
 	);
 
@@ -142,6 +158,7 @@ class Interpreter: public ASTWalker
 		InterpreterState& _state,
 		Dialect const& _dialect,
 		Scope& _scope,
+		bool _disableExternalCalls,
 		bool _disableMemoryTracing,
 		std::map<YulString, u256> _variables = {}
 	):
@@ -149,6 +166,7 @@ class Interpreter: public ASTWalker
 		m_state(_state),
 		m_variables(std::move(_variables)),
 		m_scope(&_scope),
+		m_disableExternalCalls(_disableExternalCalls),
 		m_disableMemoryTrace(_disableMemoryTracing)
 	{
 	}
@@ -165,6 +183,7 @@ class Interpreter: public ASTWalker
 	void operator()(Leave const&) override;
 	void operator()(Block const& _block) override;
 
+	bytes returnData() const { return m_state.returndata; }
 	std::vector<std::string> const& trace() const { return m_state.trace; }
 
 	u256 valueOfVariable(YulString _name) const { return m_variables.at(_name); }
@@ -187,6 +206,7 @@ class Interpreter: public ASTWalker
 	/// Values of variables.
 	std::map<YulString, u256> m_variables;
 	Scope* m_scope;
+	bool m_disableExternalCalls;
 	bool m_disableMemoryTrace;
 };
 
@@ -201,12 +221,14 @@ class ExpressionEvaluator: public ASTWalker
 		Dialect const& _dialect,
 		Scope& _scope,
 		std::map<YulString, u256> const& _variables,
+		bool _disableExternalCalls,
 		bool _disableMemoryTrace
 	):
 		m_state(_state),
 		m_dialect(_dialect),
 		m_variables(_variables),
 		m_scope(_scope),
+		m_disableExternalCalls(_disableExternalCalls),
 		m_disableMemoryTrace(_disableMemoryTrace)
 	{}
 
@@ -220,6 +242,29 @@ class ExpressionEvaluator: public ASTWalker
 	std::vector<u256> values() const { return m_values; }
 
 private:
+	void runExternalCall(evmasm::Instruction _instruction);
+	virtual std::unique_ptr<Interpreter> makeInterpreterCopy(std::map<YulString, u256> _variables = {}) const
+	{
+		return std::make_unique<Interpreter>(
+			m_state,
+			m_dialect,
+			m_scope,
+			m_disableExternalCalls,
+			m_disableMemoryTrace,
+			std::move(_variables)
+		);
+	}
+	virtual std::unique_ptr<Interpreter> makeInterpreterNew(InterpreterState& _state, Scope& _scope) const
+	{
+		return std::make_unique<Interpreter>(
+			_state,
+			m_dialect,
+			_scope,
+			m_disableExternalCalls,
+			m_disableMemoryTrace
+		);
+	}
+
 	void setValue(u256 _value);
 
 	/// Evaluates the given expression from right to left and
@@ -243,6 +288,7 @@ class ExpressionEvaluator: public ASTWalker
 	std::vector<u256> m_values;
 	/// Current expression nesting level
 	unsigned m_nestingLevel = 0;
+	bool m_disableExternalCalls;
 	/// Flag to disable memory tracing
 	bool m_disableMemoryTrace;
 };
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index fd43d222d2..4a273d3711 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -74,7 +74,7 @@ pair<shared_ptr<Block>, shared_ptr<AsmAnalysisInfo>> parse(string const& _source
 	}
 }
 
-void interpret(string const& _source)
+void interpret(string const& _source, bool _disableExternalCalls)
 {
 	shared_ptr<Block> ast;
 	shared_ptr<AsmAnalysisInfo> analysisInfo;
@@ -87,7 +87,7 @@ void interpret(string const& _source)
 	try
 	{
 		Dialect const& dialect(EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}));
-		Interpreter::run(state, dialect, *ast, /*disableMemoryTracing=*/false);
+		Interpreter::run(state, dialect, *ast, _disableExternalCalls, /*disableMemoryTracing=*/false);
 	}
 	catch (InterpreterTerminatedGeneric const&)
 	{
@@ -110,6 +110,7 @@ Allowed options)",
 		po::options_description::m_default_line_length - 23);
 	options.add_options()
 		("help", "Show this help screen.")
+		("enable-external-calls", "Enable external calls")
 		("input-file", po::value<vector<string>>(), "input file");
 	po::positional_options_description filesPositions;
 	filesPositions.add("input-file", -1);
@@ -153,7 +154,7 @@ Allowed options)",
 		else
 			input = readUntilEnd(cin);
 
-		interpret(input);
+		interpret(input, !arguments.count("enable-external-calls"));
 	}
 
 	return 0;

From b8699e7687488677704c993b6286c13edc66f036 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 11 Aug 2022 16:03:56 +0200
Subject: [PATCH 0900/1748] YulRunner: Add support for interactive inspection
 of the state

---
 test/tools/yulInterpreter/CMakeLists.txt  |   2 +
 test/tools/yulInterpreter/Inspector.cpp   | 156 ++++++++++++++++
 test/tools/yulInterpreter/Inspector.h     | 213 ++++++++++++++++++++++
 test/tools/yulInterpreter/Interpreter.cpp |  28 +++
 test/tools/yulInterpreter/Interpreter.h   |  10 +-
 test/tools/yulrun.cpp                     |  13 +-
 6 files changed, 415 insertions(+), 7 deletions(-)
 create mode 100644 test/tools/yulInterpreter/Inspector.cpp
 create mode 100644 test/tools/yulInterpreter/Inspector.h

diff --git a/test/tools/yulInterpreter/CMakeLists.txt b/test/tools/yulInterpreter/CMakeLists.txt
index d3ddac13d8..cc1b40f074 100644
--- a/test/tools/yulInterpreter/CMakeLists.txt
+++ b/test/tools/yulInterpreter/CMakeLists.txt
@@ -5,6 +5,8 @@ set(sources
 	EwasmBuiltinInterpreter.cpp
 	Interpreter.h
 	Interpreter.cpp
+	Inspector.h
+	Inspector.cpp
 )
 
 add_library(yulInterpreter ${sources})
diff --git a/test/tools/yulInterpreter/Inspector.cpp b/test/tools/yulInterpreter/Inspector.cpp
new file mode 100644
index 0000000000..3ded7367f6
--- /dev/null
+++ b/test/tools/yulInterpreter/Inspector.cpp
@@ -0,0 +1,156 @@
+/*
+	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
+/**
+ * Yul interpreter.
+ */
+
+#include <test/tools/yulInterpreter/Inspector.h>
+
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/algorithm/string.hpp>
+
+using namespace solidity;
+using namespace solidity::yul;
+using namespace solidity::yul::test;
+
+using namespace std;
+
+namespace
+{
+
+void printVariable(YulString const& _name, u256 const& _value)
+{
+	cout << "\t" << _name.str() << " = " << _value.str();
+
+	if (_value != 0)
+		cout << " (" << toCompactHexWithPrefix(_value) << ")";
+
+	cout << endl;
+}
+
+}
+
+void InspectedInterpreter::run(
+	std::shared_ptr<Inspector> _inspector,
+	InterpreterState& _state,
+	Dialect const& _dialect,
+	Block const& _ast,
+	bool _disableExternalCalls,
+	bool _disableMemoryTrace
+)
+{
+	Scope scope;
+	InspectedInterpreter{_inspector, _state, _dialect, scope, _disableExternalCalls, _disableMemoryTrace}(_ast);
+}
+
+Inspector::NodeAction Inspector::queryUser(DebugData const& _data, map<YulString, u256> const& _variables)
+{
+	if (m_stepMode == NodeAction::RunNode)
+	{
+		// Output instructions that are being skipped/run
+		cout << "Running " << currentSource(_data) << endl;
+
+		return NodeAction::StepThroughNode;
+	}
+
+	string input;
+
+	while (true)
+	{
+		// Output sourcecode about to run.
+		cout << "> " << currentSource(_data) << endl;
+
+		// Ask user for action
+		cout << endl
+			<< "(s)tep/(n)ext/(i)nspect/(p)rint/all (v)ariables?"
+			<< endl
+			<< "# ";
+
+		cout.flush();
+
+		getline(cin, input);
+		boost::algorithm::trim(input);
+
+		// Imitate GDB and repeat last cmd for empty string input.
+		if (input == "")
+			input = m_lastInput;
+		else
+			m_lastInput = input;
+
+		if (input == "next" || input == "n")
+			return NodeAction::RunNode;
+		else if (input == "step" || input == "s")
+			return NodeAction::StepThroughNode;
+		else if (input == "inspect" || input == "i")
+			m_state.dumpTraceAndState(cout, false);
+		else if (input == "variables" || input == "v")
+		{
+			for (auto &&[yulStr, val]: _variables)
+				printVariable(yulStr, val);
+			cout << endl;
+		}
+		else if (
+			boost::starts_with(input, "print") ||
+			boost::starts_with(input, "p")
+		)
+		{
+			size_t whitespacePos = input.find(' ');
+
+			if (whitespacePos == string::npos)
+				cout << "Error parsing command! Expected variable name." << endl;
+
+			string const varname = input.substr(whitespacePos + 1);
+
+			vector<string> candidates;
+
+			bool found = false;
+			for (auto &&[yulStr, val]: _variables)
+				if (yulStr.str() == varname)
+				{
+					printVariable(yulStr, val);
+					found = true;
+					break;
+				}
+
+			if (!found)
+				cout << varname << " not found." << endl;
+		}
+	}
+}
+
+std::string Inspector::currentSource(DebugData const& _data) const
+{
+	return m_source.substr(
+		static_cast<size_t>(_data.nativeLocation.start),
+		static_cast<size_t>(_data.nativeLocation.end - _data.nativeLocation.start)
+	);
+}
+
+u256 InspectedInterpreter::evaluate(Expression const& _expression)
+{
+	InspectedExpressionEvaluator ev(m_inspector, m_state, m_dialect, *m_scope, m_variables, m_disableExternalCalls, m_disableMemoryTrace);
+	ev.visit(_expression);
+	return ev.value();
+}
+
+std::vector<u256> InspectedInterpreter::evaluateMulti(Expression const& _expression)
+{
+	InspectedExpressionEvaluator ev(m_inspector, m_state, m_dialect, *m_scope, m_variables, m_disableExternalCalls, m_disableMemoryTrace);
+	ev.visit(_expression);
+	return ev.values();
+}
diff --git a/test/tools/yulInterpreter/Inspector.h b/test/tools/yulInterpreter/Inspector.h
new file mode 100644
index 0000000000..611279c6fe
--- /dev/null
+++ b/test/tools/yulInterpreter/Inspector.h
@@ -0,0 +1,213 @@
+/*
+	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
+/**
+ * Yul inspector.
+ */
+
+#include <test/tools/yulInterpreter/Interpreter.h>
+
+#include <libyul/AST.h>
+
+#include <string>
+
+#pragma once
+
+namespace solidity::yul::test
+{
+
+/**
+ * Inspector class to respond to queries by the user for:
+ *
+ * * Stepping through and over instructions.
+ * * Printing a specific or all variables.
+ * * Inspecting memory, storage and calldata memory.
+ */
+class Inspector
+{
+public:
+	enum class NodeAction
+	{
+		RunNode,
+		StepThroughNode,
+	};
+
+	Inspector(std::string const& _source, InterpreterState const& _state)
+		:m_source(_source), m_state(_state) {}
+
+	/* Asks the user what action to take.
+	 * @returns NodeAction::RunNode if the current AST node (and all children nodes!) should be
+	 *          processed without stopping, else NodeAction::StepThroughNode.
+	 */
+	NodeAction queryUser(DebugData const& _data, std::map<YulString, u256> const& _variables);
+
+	void stepMode(NodeAction _action) { m_stepMode = _action; }
+
+	std::string const& source() const { return m_source; }
+
+	void interactiveVisit(DebugData const& _debugData, std::map<YulString, u256> const& _variables, std::function<void()> _visitNode)
+	{
+		Inspector::NodeAction action = queryUser(_debugData, _variables);
+
+		if (action == NodeAction::RunNode)
+		{
+			// user requested to run the whole node without stopping
+			stepMode(Inspector::NodeAction::RunNode);
+
+			_visitNode();
+
+			// Reset step mode back
+			stepMode(Inspector::NodeAction::StepThroughNode);
+		}
+		else
+			_visitNode();
+	}
+
+private:
+	std::string currentSource(DebugData const& _data) const;
+
+	/// Source of the file
+	std::string const& m_source;
+
+	/// State of the interpreter
+	InterpreterState const& m_state;
+
+	/// Last user query command
+	std::string m_lastInput;
+
+	/// Used to run AST nodes without user interaction
+	NodeAction m_stepMode = NodeAction::StepThroughNode;
+};
+
+/**
+ * Yul Interpreter with inspection. Allows the user to go through the code step
+ * by step and inspect the state using the `Inspector` class
+ */
+class InspectedInterpreter: public Interpreter
+{
+public:
+	static void run(
+		std::shared_ptr<Inspector> _inspector,
+		InterpreterState& _state,
+		Dialect const& _dialect,
+		Block const& _ast,
+		bool _disableExternalCalls,
+		bool _disableMemoryTracing
+	);
+
+	InspectedInterpreter(
+		std::shared_ptr<Inspector> _inspector,
+		InterpreterState& _state,
+		Dialect const& _dialect,
+		Scope& _scope,
+		bool _disableExternalCalls,
+		bool _disableMemoryTracing,
+		std::map<YulString, u256> _variables = {}
+	):
+		Interpreter(_state, _dialect, _scope, _disableExternalCalls, _disableMemoryTracing, _variables),
+		m_inspector(_inspector)
+	{
+	}
+
+	void operator()(ExpressionStatement const& _node) override { helper(_node); }
+	void operator()(Assignment const& _node) override { helper(_node); }
+	void operator()(VariableDeclaration const& _node) override { helper(_node); }
+	void operator()(If const& _node) override { helper(_node); }
+	void operator()(Switch const& _node) override { helper(_node); }
+	void operator()(ForLoop const& _node) override { helper(_node); }
+	void operator()(Break const& _node) override { helper(_node); }
+	void operator()(Continue const& _node) override { helper(_node); }
+	void operator()(Leave const& _node) override { helper(_node); }
+	void operator()(Block const& _node) override { helper(_node); }
+protected:
+	/// Asserts that the expression evaluates to exactly one value and returns it.
+	u256 evaluate(Expression const& _expression) override;
+	/// Evaluates the expression and returns its value.
+	std::vector<u256> evaluateMulti(Expression const& _expression) override;
+private:
+	std::shared_ptr<Inspector> m_inspector;
+
+	template <typename ConcreteNode>
+	void helper(ConcreteNode const& _node)
+	{
+		m_inspector->interactiveVisit(*_node.debugData, m_variables, [&]() {
+			Interpreter::operator()(_node);
+		});
+	}
+
+};
+
+
+class InspectedExpressionEvaluator: public ExpressionEvaluator
+{
+public:
+	InspectedExpressionEvaluator(
+		std::shared_ptr<Inspector> _inspector,
+		InterpreterState& _state,
+		Dialect const& _dialect,
+		Scope& _scope,
+		std::map<YulString, u256> const& _variables,
+		bool _disableExternalCalls,
+		bool _disableMemoryTrace
+	):
+		ExpressionEvaluator(_state, _dialect, _scope, _variables, _disableExternalCalls, _disableMemoryTrace),
+		m_inspector(_inspector)
+	{}
+
+	template <typename ConcreteNode>
+	void helper(ConcreteNode const& _node)
+	{
+		m_inspector->interactiveVisit(*_node.debugData, m_variables, [&]() {
+			ExpressionEvaluator::operator()(_node);
+		});
+	}
+
+	void operator()(Literal const& _node) override { helper(_node); }
+	void operator()(Identifier const& _node) override { helper(_node); }
+	void operator()(FunctionCall const& _node) override { helper(_node); }
+protected:
+	std::unique_ptr<Interpreter> makeInterpreterCopy(std::map<YulString, u256> _variables = {}) const override
+	{
+		return std::make_unique<InspectedInterpreter>(
+			m_inspector,
+			m_state,
+			m_dialect,
+			m_scope,
+			m_disableExternalCalls,
+			m_disableMemoryTrace,
+			std::move(_variables)
+		);
+	}
+	std::unique_ptr<Interpreter> makeInterpreterNew(InterpreterState& _state, Scope& _scope) const override
+	{
+		return std::make_unique<InspectedInterpreter>(
+			std::make_unique<Inspector>(
+				m_inspector->source(),
+				_state
+			),
+			_state,
+			m_dialect,
+			_scope,
+			m_disableExternalCalls,
+			m_disableMemoryTrace
+		);
+	}
+private:
+	std::shared_ptr<Inspector> m_inspector;
+};
+
+}
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index f24f8b7f1a..9add485096 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -72,6 +72,34 @@ void InterpreterState::dumpTraceAndState(ostream& _out, bool _disableMemoryTrace
 	}
 	_out << "Storage dump:" << endl;
 	dumpStorage(_out);
+
+	if (!calldata.empty())
+	{
+		_out << "Calldata dump:";
+
+		for (size_t offset = 0; offset < calldata.size(); ++offset)
+			if (calldata[offset] != 0)
+			{
+				if (offset % 32 == 0)
+					_out <<
+						std::endl <<
+						"  " <<
+						std::uppercase <<
+						std::hex <<
+						std::setfill(' ') <<
+						std::setw(4) <<
+						offset <<
+						": ";
+
+				_out <<
+					std::hex <<
+					std::setw(2) <<
+					std::setfill('0') <<
+					static_cast<int>(calldata[offset]);
+			}
+
+		_out << endl;
+	}
 }
 
 void Interpreter::run(
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index 3eee09caae..5dcb328d98 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -188,11 +188,11 @@ class Interpreter: public ASTWalker
 
 	u256 valueOfVariable(YulString _name) const { return m_variables.at(_name); }
 
-private:
+protected:
 	/// Asserts that the expression evaluates to exactly one value and returns it.
-	u256 evaluate(Expression const& _expression);
+	virtual u256 evaluate(Expression const& _expression);
 	/// Evaluates the expression and returns its value.
-	std::vector<u256> evaluateMulti(Expression const& _expression);
+	virtual std::vector<u256> evaluateMulti(Expression const& _expression);
 
 	void enterScope(Block const& _block);
 	void leaveScope();
@@ -206,6 +206,8 @@ class Interpreter: public ASTWalker
 	/// Values of variables.
 	std::map<YulString, u256> m_variables;
 	Scope* m_scope;
+	/// If not set, external calls (e.g. using `call()`) to the same contract
+	/// are evaluated in a new parser instance.
 	bool m_disableExternalCalls;
 	bool m_disableMemoryTrace;
 };
@@ -241,7 +243,7 @@ class ExpressionEvaluator: public ASTWalker
 	/// Returns the list of values of the expression.
 	std::vector<u256> values() const { return m_values; }
 
-private:
+protected:
 	void runExternalCall(evmasm::Instruction _instruction);
 	virtual std::unique_ptr<Interpreter> makeInterpreterCopy(std::map<YulString, u256> _variables = {}) const
 	{
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index 4a273d3711..eee3424700 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <test/tools/yulInterpreter/Interpreter.h>
+#include <test/tools/yulInterpreter/Inspector.h>
 
 #include <libyul/AsmAnalysisInfo.h>
 #include <libyul/AsmAnalysis.h>
@@ -74,7 +75,7 @@ pair<shared_ptr<Block>, shared_ptr<AsmAnalysisInfo>> parse(string const& _source
 	}
 }
 
-void interpret(string const& _source, bool _disableExternalCalls)
+void interpret(string const& _source, bool _inspect, bool _disableExternalCalls)
 {
 	shared_ptr<Block> ast;
 	shared_ptr<AsmAnalysisInfo> analysisInfo;
@@ -87,7 +88,12 @@ void interpret(string const& _source, bool _disableExternalCalls)
 	try
 	{
 		Dialect const& dialect(EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}));
-		Interpreter::run(state, dialect, *ast, _disableExternalCalls, /*disableMemoryTracing=*/false);
+
+		if (_inspect)
+			InspectedInterpreter::run(std::make_shared<Inspector>(_source, state), state, dialect, *ast, _disableExternalCalls, /*disableMemoryTracing=*/false);
+
+		else
+			Interpreter::run(state, dialect, *ast, _disableExternalCalls, /*disableMemoryTracing=*/false);
 	}
 	catch (InterpreterTerminatedGeneric const&)
 	{
@@ -111,6 +117,7 @@ Allowed options)",
 	options.add_options()
 		("help", "Show this help screen.")
 		("enable-external-calls", "Enable external calls")
+		("interactive", "Run interactive")
 		("input-file", po::value<vector<string>>(), "input file");
 	po::positional_options_description filesPositions;
 	filesPositions.add("input-file", -1);
@@ -154,7 +161,7 @@ Allowed options)",
 		else
 			input = readUntilEnd(cin);
 
-		interpret(input, !arguments.count("enable-external-calls"));
+		interpret(input, arguments.count("interactive"), !arguments.count("enable-external-calls"));
 	}
 
 	return 0;

From d10d9670083df9161226013b8b76b41309956e58 Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 13 Sep 2022 13:16:59 +0200
Subject: [PATCH 0901/1748] yulRun: Fix unexpected return value for call*
 instructions and add tests

---
 test/libyul/YulInterpreterTest.cpp            |  5 +++--
 test/libyul/YulInterpreterTest.h              |  1 +
 .../external_call_to_self.yul                 | 22 +++++++++++++++++++
 ..._call.yul => external_call_unexecuted.yul} |  2 +-
 .../external_callcode_unexecuted.yul          | 10 +++++++++
 .../external_delegatecall_unexecuted.yul      | 10 +++++++++
 .../external_staticcall_unexecuted.yul        | 12 ++++++++++
 .../EVMInstructionInterpreter.cpp             | 15 +++++++++++--
 test/tools/yulInterpreter/Interpreter.cpp     |  1 +
 9 files changed, 73 insertions(+), 5 deletions(-)
 create mode 100644 test/libyul/yulInterpreterTests/external_call_to_self.yul
 rename test/libyul/yulInterpreterTests/{external_call.yul => external_call_unexecuted.yul} (94%)
 create mode 100644 test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul
 create mode 100644 test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul
 create mode 100644 test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul

diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index 7008743491..47b167c91e 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -51,6 +51,7 @@ YulInterpreterTest::YulInterpreterTest(string const& _filename):
 {
 	m_source = m_reader.source();
 	m_expectation = m_reader.simpleExpectations();
+	m_simulateExternalCallsToSelf = m_reader.boolSetting("simulateExternalCall", false);
 }
 
 TestCase::TestResult YulInterpreterTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
@@ -98,8 +99,8 @@ string YulInterpreterTest::interpret()
 			state,
 			EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}),
 			*m_ast,
-			/*disableExternalCalls=*/true,
-			/*disableMemoryTracing=*/false
+			/*disableExternalCalls=*/ !m_simulateExternalCallsToSelf,
+			/*disableMemoryTracing=*/ false
 		);
 	}
 	catch (InterpreterTerminatedGeneric const&)
diff --git a/test/libyul/YulInterpreterTest.h b/test/libyul/YulInterpreterTest.h
index fc362ecf60..a20b0688a2 100644
--- a/test/libyul/YulInterpreterTest.h
+++ b/test/libyul/YulInterpreterTest.h
@@ -47,6 +47,7 @@ class YulInterpreterTest: public solidity::frontend::test::EVMVersionRestrictedT
 
 	std::shared_ptr<Block> m_ast;
 	std::shared_ptr<AsmAnalysisInfo> m_analysisInfo;
+	bool m_simulateExternalCallsToSelf = false;
 };
 
 }
diff --git a/test/libyul/yulInterpreterTests/external_call_to_self.yul b/test/libyul/yulInterpreterTests/external_call_to_self.yul
new file mode 100644
index 0000000000..ad2d2bb77f
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/external_call_to_self.yul
@@ -0,0 +1,22 @@
+{
+	mstore(0x40, 0x42)
+
+	if iszero(calldatasize()) {
+		let x := call(gas(), address(), 0, 0x40, 0x20, 0x100, 0x20)
+		sstore(0x64, calldataload(0))
+		sstore(0x100, x)
+		return(0x0, 0)
+	}
+	return(0x40, 0x20)
+}
+// ====
+// simulateExternalCall: true
+// ----
+// Trace:
+//   CALL(153, 0x11111111, 0, 64, 32, 256, 32)
+//   RETURN(0, 0)
+// Memory dump:
+//     40: 0000000000000000000000000000000000000000000000000000000000000042
+//    100: 0000000000000000000000000000000000000000000000000000000000000042
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000100: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/yulInterpreterTests/external_call.yul b/test/libyul/yulInterpreterTests/external_call_unexecuted.yul
similarity index 94%
rename from test/libyul/yulInterpreterTests/external_call.yul
rename to test/libyul/yulInterpreterTests/external_call_unexecuted.yul
index b0d3383a44..5edfe600d2 100644
--- a/test/libyul/yulInterpreterTests/external_call.yul
+++ b/test/libyul/yulInterpreterTests/external_call_unexecuted.yul
@@ -1,6 +1,6 @@
 {
 	let x := call(gas(), 0x45, 0x5, 0, 0x20, 0x30, 0x20)
-	sstore(100, x)
+	sstore(0x64, x)
 }
 // ----
 // Trace:
diff --git a/test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul b/test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul
new file mode 100644
index 0000000000..427d5604b3
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul
@@ -0,0 +1,10 @@
+{
+	let x := callcode(gas(), 0x45, 0x5, 0, 0x20, 0x30, 0x20)
+	sstore(100, x)
+}
+// ----
+// Trace:
+//   CALLCODE(153, 69, 5, 0, 32, 48, 32)
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul b/test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul
new file mode 100644
index 0000000000..6617825894
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul
@@ -0,0 +1,10 @@
+{
+	let x := delegatecall(gas(), 0x45, 0, 0x20, 0x30, 0x20)
+	sstore(100, x)
+}
+// ----
+// Trace:
+//   DELEGATECALL(153, 69, 0, 32, 48, 32)
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul b/test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul
new file mode 100644
index 0000000000..32b50270da
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul
@@ -0,0 +1,12 @@
+{
+	let x := staticcall(gas(), 0x45, 0, 0x20, 0x30, 0x20)
+	sstore(0x64, x)
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
+// Trace:
+//   STATICCALL(153, 69, 0, 32, 48, 32)
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 30b2b57750..d16b6a5de0 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -329,13 +329,24 @@ u256 EVMInstructionInterpreter::eval(
 		accessMemory(arg[3], arg[4]);
 		accessMemory(arg[5], arg[6]);
 		logTrace(_instruction, arg);
-		return arg[0] & 1;
+		// Randomly fail based on the called address if it isn't a call to self.
+		// Used for fuzzing.
+		return (
+			(arg[0] > 0) &&
+			(arg[1] == util::h160::Arith(m_state.address) || (arg[1] & 1))
+		) ? 1 : 0;
 	case Instruction::DELEGATECALL:
 	case Instruction::STATICCALL:
 		accessMemory(arg[2], arg[3]);
 		accessMemory(arg[4], arg[5]);
 		logTrace(_instruction, arg);
-		return 0;
+
+		// Randomly fail based on the called address if it isn't a call to self.
+		// Used for fuzzing.
+		return (
+			(arg[0] > 0) &&
+			(arg[1] == util::h160::Arith(m_state.address) || (arg[1] & 1))
+		) ? 1 : 0;
 	case Instruction::RETURN:
 	{
 		m_state.returndata = {};
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index 9add485096..33546f7456 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -500,5 +500,6 @@ void ExpressionEvaluator::runExternalCall(evmasm::Instruction _instruction)
 			0,
 			memOutSize.convert_to<size_t>()
 		);
+		m_state.returndata = newInterpreter->returnData();
 	}
 }

From 692a99f8914f6e881d0e7be85ea3db76ca77e8bb Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Tue, 13 Sep 2022 14:05:50 +0200
Subject: [PATCH 0902/1748] yulRun: Add recursion protection

---
 test/tools/yulInterpreter/Interpreter.cpp | 3 +++
 test/tools/yulInterpreter/Interpreter.h   | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index 33546f7456..ec7a773215 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -461,6 +461,9 @@ void ExpressionEvaluator::runExternalCall(evmasm::Instruction _instruction)
 	InterpreterState tmpState;
 	tmpState.calldata = m_state.readMemory(memInOffset, memInSize);
 	tmpState.callvalue = callvalue;
+	tmpState.numInstance = m_state.numInstance + 1;
+
+	yulAssert(tmpState.numInstance < 1024, "Detected more than 1024 recursive calls, aborting...");
 
 	// Create new interpreter for the called contract
 	unique_ptr<Interpreter> newInterpreter = makeInterpreterNew(tmpState, tmpScope);
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index 5dcb328d98..949d0ce4ec 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -107,6 +107,9 @@ struct InterpreterState
 	size_t maxExprNesting = 0;
 	ControlFlowState controlFlowState = ControlFlowState::Default;
 
+	/// Number of the current state instance, used for recursion protection
+	size_t numInstance = 0;
+
 	/// Prints execution trace and non-zero storage to @param _out.
 	/// Flag @param _disableMemoryTrace, if set, does not produce a memory dump. This
 	/// avoids false positives reports by the fuzzer when certain optimizer steps are

From c8011d87198ef426ac9a0a0b359aecb6254afd0b Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Fri, 17 Jun 2022 08:55:52 +0530
Subject: [PATCH 0903/1748] Cleaning up helpers around errors

---
 liblangutil/Exceptions.cpp                    |  40 ---
 liblangutil/Exceptions.h                      |  73 ++++--
 liblangutil/SourceReferenceExtractor.cpp      |   7 +-
 liblangutil/SourceReferenceExtractor.h        |   4 +-
 liblangutil/SourceReferenceFormatter.cpp      |  34 +--
 liblangutil/SourceReferenceFormatter.h        |  15 +-
 libsolidity/interface/StandardCompiler.cpp    | 230 ++++++++----------
 libsolidity/lsp/LanguageServer.cpp            |   2 +-
 solc/CommandLineInterface.cpp                 |   4 +-
 .../standard_urls_existing_and_missing/args   |   1 +
 .../contract.sol                              |   2 +
 .../input.json                                |  13 +
 .../output.json                               |  18 ++
 test/cmdlineTests/standard_urls_missing/args  |   1 +
 .../standard_urls_missing/contract.sol        |   2 +
 .../standard_urls_missing/input.json          |  13 +
 .../standard_urls_missing/output.json         |  26 ++
 test/libsolidity/ErrorCheck.cpp               |   2 +-
 test/libsolidity/SyntaxTest.cpp               |   2 +-
 test/libyul/SyntaxTest.cpp                    |   2 +-
 test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp  |   5 +-
 21 files changed, 268 insertions(+), 228 deletions(-)
 create mode 100644 test/cmdlineTests/standard_urls_existing_and_missing/args
 create mode 100644 test/cmdlineTests/standard_urls_existing_and_missing/contract.sol
 create mode 100644 test/cmdlineTests/standard_urls_existing_and_missing/input.json
 create mode 100644 test/cmdlineTests/standard_urls_existing_and_missing/output.json
 create mode 100644 test/cmdlineTests/standard_urls_missing/args
 create mode 100644 test/cmdlineTests/standard_urls_missing/contract.sol
 create mode 100644 test/cmdlineTests/standard_urls_missing/input.json
 create mode 100644 test/cmdlineTests/standard_urls_missing/output.json

diff --git a/liblangutil/Exceptions.cpp b/liblangutil/Exceptions.cpp
index 2595c7755c..92fe2589ac 100644
--- a/liblangutil/Exceptions.cpp
+++ b/liblangutil/Exceptions.cpp
@@ -39,34 +39,6 @@ Error::Error(
 	m_errorId(_errorId),
 	m_type(_type)
 {
-	switch (m_type)
-	{
-	case Type::CodeGenerationError:
-		m_typeName = "CodeGenerationError";
-		break;
-	case Type::DeclarationError:
-		m_typeName = "DeclarationError";
-		break;
-	case Type::DocstringParsingError:
-		m_typeName = "DocstringParsingError";
-		break;
-	case Type::Info:
-		m_typeName = "Info";
-		break;
-	case Type::ParserError:
-		m_typeName = "ParserError";
-		break;
-	case Type::SyntaxError:
-		m_typeName = "SyntaxError";
-		break;
-	case Type::TypeError:
-		m_typeName = "TypeError";
-		break;
-	case Type::Warning:
-		m_typeName = "Warning";
-		break;
-	}
-
 	if (_location.isValid())
 		*this << errinfo_sourceLocation(_location);
 	if (!_secondaryLocation.infos.empty())
@@ -84,15 +56,3 @@ SecondarySourceLocation const* Error::secondarySourceLocation() const noexcept
 {
 	return boost::get_error_info<errinfo_secondarySourceLocation>(*this);
 }
-
-optional<Error::Severity> Error::severityFromString(string _input)
-{
-	boost::algorithm::to_lower(_input);
-	boost::algorithm::trim(_input);
-
-	for (Severity severity: {Severity::Error, Severity::Warning, Severity::Info})
-		if (_input == formatErrorSeverityLowercase(severity))
-			return severity;
-
-	return nullopt;
-}
diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
index fb6f23cf11..d74ee82c5e 100644
--- a/liblangutil/Exceptions.h
+++ b/liblangutil/Exceptions.h
@@ -31,6 +31,7 @@
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/facilities/empty.hpp>
 #include <boost/preprocessor/facilities/overload.hpp>
+#include <boost/algorithm/string/case_conv.hpp>
 
 #include <string>
 #include <utility>
@@ -174,6 +175,15 @@ class Error: virtual public util::Exception
 		ParserError,
 		TypeError,
 		SyntaxError,
+		IOError,
+		FatalError,
+		JSONError,
+		InternalCompilerError,
+		CompilerError,
+		Exception,
+		UnimplementedFeatureError,
+		YulException,
+		SMTLogicException,
 		Warning,
 		Info
 	};
@@ -195,7 +205,6 @@ class Error: virtual public util::Exception
 
 	ErrorId errorId() const { return m_errorId; }
 	Type type() const { return m_type; }
-	std::string const& typeName() const { return m_typeName; }
 
 	SourceLocation const* sourceLocation() const noexcept;
 	SecondarySourceLocation const* secondarySourceLocation() const noexcept;
@@ -211,11 +220,12 @@ class Error: virtual public util::Exception
 
 	static constexpr Severity errorSeverity(Type _type)
 	{
-		if (_type == Type::Info)
-			return Severity::Info;
-		if (_type == Type::Warning)
-			return Severity::Warning;
-		return Severity::Error;
+		switch (_type)
+		{
+			case Type::Info: return Severity::Info;
+			case Type::Warning: return Severity::Warning;
+			default: return Severity::Error;
+		}
 	}
 
 	static bool isError(Severity _severity)
@@ -238,35 +248,50 @@ class Error: virtual public util::Exception
 
 	static std::string formatErrorSeverity(Severity _severity)
 	{
-		if (_severity == Severity::Info)
-			return "Info";
-		if (_severity == Severity::Warning)
-			return "Warning";
-		solAssert(isError(_severity), "");
-		return "Error";
+		switch (_severity)
+		{
+		case Severity::Info: return "Info";
+		case Severity::Warning: return "Warning";
+		case Severity::Error: return "Error";
+		}
+		util::unreachable();
 	}
 
-	static std::string formatErrorSeverityLowercase(Severity _severity)
+	static std::string formatErrorType(Type _type)
 	{
-		switch (_severity)
+		switch (_type)
 		{
-		case Severity::Info:
-			return "info";
-		case Severity::Warning:
-			return "warning";
-		case Severity::Error:
-			solAssert(isError(_severity), "");
-			return "error";
+		case Type::IOError: return "IOError";
+		case Type::FatalError: return "FatalError";
+		case Type::JSONError: return "JSONError";
+		case Type::InternalCompilerError: return "InternalCompilerError";
+		case Type::CompilerError: return "CompilerError";
+		case Type::Exception: return "Exception";
+		case Type::CodeGenerationError: return "CodeGenerationError";
+		case Type::DeclarationError: return "DeclarationError";
+		case Type::DocstringParsingError: return "DocstringParsingError";
+		case Type::ParserError: return "ParserError";
+		case Type::SyntaxError: return "SyntaxError";
+		case Type::TypeError: return "TypeError";
+		case Type::UnimplementedFeatureError: return "UnimplementedFeatureError";
+		case Type::YulException: return "YulException";
+		case Type::SMTLogicException: return "SMTLogicException";
+		case Type::Warning: return "Warning";
+		case Type::Info: return "Info";
 		}
-		solAssert(false, "");
+		util::unreachable();
 	}
 
-	static std::optional<Severity> severityFromString(std::string _input);
+	static std::string formatErrorSeverityLowercase(Severity _severity)
+	{
+		std::string severityValue = formatErrorSeverity(_severity);
+		boost::algorithm::to_lower(severityValue);
+		return severityValue;
+	}
 
 private:
 	ErrorId m_errorId;
 	Type m_type;
-	std::string m_typeName;
 };
 
 }
diff --git a/liblangutil/SourceReferenceExtractor.cpp b/liblangutil/SourceReferenceExtractor.cpp
index 373ad6b18b..14dbc25e6b 100644
--- a/liblangutil/SourceReferenceExtractor.cpp
+++ b/liblangutil/SourceReferenceExtractor.cpp
@@ -30,7 +30,7 @@ using namespace solidity::langutil;
 SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
 	CharStreamProvider const& _charStreamProvider,
 	util::Exception const& _exception,
-	string _severity
+	Error::Type _type
 )
 {
 	SourceLocation const* location = boost::get_error_info<errinfo_sourceLocation>(_exception);
@@ -44,7 +44,7 @@ SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
 		for (auto const& info: secondaryLocation->infos)
 			secondary.emplace_back(extract(_charStreamProvider, &info.second, info.first));
 
-	return Message{std::move(primary), _severity, std::move(secondary), nullopt};
+	return Message{std::move(primary), _type, std::move(secondary), nullopt};
 }
 
 SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
@@ -52,8 +52,7 @@ SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
 	Error const& _error
 )
 {
-	string severity = Error::formatErrorSeverity(Error::errorSeverity(_error.type()));
-	Message message = extract(_charStreamProvider, _error, severity);
+	Message message = extract(_charStreamProvider, _error, _error.type());
 	message.errorId = _error.errorId();
 	return message;
 }
diff --git a/liblangutil/SourceReferenceExtractor.h b/liblangutil/SourceReferenceExtractor.h
index 3b418fcfa2..75e56b4d95 100644
--- a/liblangutil/SourceReferenceExtractor.h
+++ b/liblangutil/SourceReferenceExtractor.h
@@ -55,12 +55,12 @@ namespace SourceReferenceExtractor
 	struct Message
 	{
 		SourceReference primary;
-		std::string severity; // "Error", "Warning", "Info", ...
+		Error::Type type;
 		std::vector<SourceReference> secondary;
 		std::optional<ErrorId> errorId;
 	};
 
-	Message extract(CharStreamProvider const& _charStreamProvider, util::Exception const& _exception, std::string _severity);
+	Message extract(CharStreamProvider const& _charStreamProvider, util::Exception const& _exception, Error::Type _type);
 	Message extract(CharStreamProvider const& _charStreamProvider, Error const& _error);
 	SourceReference extract(CharStreamProvider const& _charStreamProvider, SourceLocation const* _location, std::string message = "");
 }
diff --git a/liblangutil/SourceReferenceFormatter.cpp b/liblangutil/SourceReferenceFormatter.cpp
index a38c5e617c..fa7bd47ade 100644
--- a/liblangutil/SourceReferenceFormatter.cpp
+++ b/liblangutil/SourceReferenceFormatter.cpp
@@ -65,19 +65,18 @@ AnsiColorized SourceReferenceFormatter::frameColored() const
 	return AnsiColorized(m_stream, m_colored, {BOLD, BLUE});
 }
 
-AnsiColorized SourceReferenceFormatter::errorColored(optional<Error::Severity> _severity) const
+AnsiColorized SourceReferenceFormatter::errorColored(Error::Severity _severity) const
 {
 	// We used to color messages of any severity as errors so this seems like a good default
 	// for cases where severity cannot be determined.
 	char const* textColor = RED;
 
-	if (_severity.has_value())
-		switch (_severity.value())
-		{
-		case Error::Severity::Error: textColor = RED; break;
-		case Error::Severity::Warning: textColor = YELLOW; break;
-		case Error::Severity::Info: textColor = WHITE; break;
-		}
+	switch (_severity)
+	{
+	case Error::Severity::Error: textColor = RED; break;
+	case Error::Severity::Warning: textColor = YELLOW; break;
+	case Error::Severity::Info: textColor = WHITE; break;
+	}
 
 	return AnsiColorized(m_stream, m_colored, {BOLD, textColor});
 }
@@ -176,15 +175,18 @@ void SourceReferenceFormatter::printSourceLocation(SourceReference const& _ref)
 	}
 }
 
-void SourceReferenceFormatter::printExceptionInformation(SourceReferenceExtractor::Message const& _msg)
+void SourceReferenceFormatter::printExceptionInformation(SourceReferenceExtractor::Message const& _msg, bool _printFullType)
 {
-	// exception header line
-	optional<Error::Severity> severity = Error::severityFromString(_msg.severity);
-	errorColored(severity) << _msg.severity;
+	errorColored(Error::errorSeverity(_msg.type)) << (
+		_printFullType ?
+		Error::formatErrorType(_msg.type) :
+		Error::formatErrorSeverity(Error::errorSeverity(_msg.type))
+	);
+
 	if (m_withErrorIds && _msg.errorId.has_value())
-		errorColored(severity) << " (" << _msg.errorId.value().error << ")";
-	messageColored() << ": " << _msg.primary.message << '\n';
+		errorColored(Error::errorSeverity(_msg.type)) << " (" << _msg.errorId.value().error << ")";
 
+	messageColored() << ": " << _msg.primary.message << '\n';
 	printSourceLocation(_msg.primary);
 
 	for (auto const& secondary: _msg.secondary)
@@ -197,9 +199,9 @@ void SourceReferenceFormatter::printExceptionInformation(SourceReferenceExtracto
 	m_stream << '\n';
 }
 
-void SourceReferenceFormatter::printExceptionInformation(util::Exception const& _exception, std::string const& _severity)
+void SourceReferenceFormatter::printExceptionInformation(util::Exception const& _exception, Error::Type _type, bool _printFullType)
 {
-	printExceptionInformation(SourceReferenceExtractor::extract(m_charStreamProvider, _exception, _severity));
+	printExceptionInformation(SourceReferenceExtractor::extract(m_charStreamProvider, _exception, _type), _printFullType);
 }
 
 void SourceReferenceFormatter::printErrorInformation(ErrorList const& _errors)
diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
index e18400b60a..b448989159 100644
--- a/liblangutil/SourceReferenceFormatter.h
+++ b/liblangutil/SourceReferenceFormatter.h
@@ -51,22 +51,23 @@ class SourceReferenceFormatter
 
 	/// Prints source location if it is given.
 	void printSourceLocation(SourceReference const& _ref);
-	void printExceptionInformation(SourceReferenceExtractor::Message const& _msg);
-	void printExceptionInformation(util::Exception const& _exception, std::string const& _severity);
+	void printExceptionInformation(SourceReferenceExtractor::Message const& _msg, bool _printFullType=false);
+	void printExceptionInformation(util::Exception const& _exception, Error::Type _type, bool _printFullType=false);
 	void printErrorInformation(langutil::ErrorList const& _errors);
 	void printErrorInformation(Error const& _error);
 
 	static std::string formatExceptionInformation(
 		util::Exception const& _exception,
-		std::string const& _name,
+		Error::Type _type,
 		CharStreamProvider const& _charStreamProvider,
 		bool _colored = false,
-		bool _withErrorIds = false
+		bool _withErrorIds = false,
+		bool _printFullType = false
 	)
 	{
 		std::ostringstream errorOutput;
 		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, _withErrorIds);
-		formatter.printExceptionInformation(_exception, _name);
+		formatter.printExceptionInformation(_exception, _type, _printFullType);
 		return errorOutput.str();
 	}
 
@@ -77,7 +78,7 @@ class SourceReferenceFormatter
 	{
 		return formatExceptionInformation(
 			_error,
-			Error::formatErrorSeverity(Error::errorSeverity(_error.type())),
+			_error.type(),
 			_charStreamProvider
 		);
 	}
@@ -87,7 +88,7 @@ class SourceReferenceFormatter
 private:
 	util::AnsiColorized normalColored() const;
 	util::AnsiColorized frameColored() const;
-	util::AnsiColorized errorColored(std::optional<langutil::Error::Severity> _severity) const;
+	util::AnsiColorized errorColored(langutil::Error::Severity _severity) const;
 	util::AnsiColorized messageColored() const;
 	util::AnsiColorized secondaryColored() const;
 	util::AnsiColorized highlightColored() const;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 0af55df16b..f393694c6e 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -54,8 +54,7 @@ namespace
 {
 
 Json::Value formatError(
-	Error::Severity _severity,
-	string const& _type,
+	Error::Type _type,
 	string const& _component,
 	string const& _message,
 	string const& _formattedMessage = "",
@@ -64,9 +63,9 @@ Json::Value formatError(
 )
 {
 	Json::Value error{Json::objectValue};
-	error["type"] = _type;
+	error["type"] = Error::formatErrorType(_type);
 	error["component"] = _component;
-	error["severity"] = Error::formatErrorSeverityLowercase(_severity);
+	error["severity"] = Error::formatErrorSeverityLowercase(Error::errorSeverity(_type));
 	error["message"] = _message;
 	error["formattedMessage"] = (_formattedMessage.length() > 0) ? _formattedMessage : _message;
 	if (_sourceLocation.isObject())
@@ -76,11 +75,11 @@ Json::Value formatError(
 	return error;
 }
 
-Json::Value formatFatalError(string const& _type, string const& _message)
+Json::Value formatFatalError(Error::Type _type, string const& _message)
 {
 	Json::Value output{Json::objectValue};
 	output["errors"] = Json::arrayValue;
-	output["errors"].append(formatError(Error::Severity::Error, _type, "general", _message));
+	output["errors"].append(formatError(_type, "general", _message));
 	return output;
 }
 
@@ -114,8 +113,7 @@ Json::Value formatSecondarySourceLocation(SecondarySourceLocation const* _second
 Json::Value formatErrorWithException(
 	CharStreamProvider const& _charStreamProvider,
 	util::Exception const& _exception,
-	Error::Severity _severity,
-	string const& _type,
+	Error::Type _type,
 	string const& _component,
 	string const& _message,
 	optional<ErrorId> _errorId = nullopt
@@ -126,7 +124,10 @@ Json::Value formatErrorWithException(
 	string formattedMessage = SourceReferenceFormatter::formatExceptionInformation(
 		_exception,
 		_type,
-		_charStreamProvider
+		_charStreamProvider,
+		false, // colored
+		false, // _withErrorIds
+		true // _printFullType
 	);
 
 	if (string const* description = _exception.comment())
@@ -135,7 +136,6 @@ Json::Value formatErrorWithException(
 		message = _message;
 
 	Json::Value error = formatError(
-		_severity,
 		_type,
 		_component,
 		message,
@@ -410,11 +410,11 @@ Json::Value collectEVMObject(
 std::optional<Json::Value> checkKeys(Json::Value const& _input, set<string> const& _keys, string const& _name)
 {
 	if (!!_input && !_input.isObject())
-		return formatFatalError("JSONError", "\"" + _name + "\" must be an object");
+		return formatFatalError(Error::Type::JSONError, "\"" + _name + "\" must be an object");
 
 	for (auto const& member: _input.getMemberNames())
 		if (!_keys.count(member))
-			return formatFatalError("JSONError", "Unknown key \"" + member + "\"");
+			return formatFatalError(Error::Type::JSONError, "Unknown key \"" + member + "\"");
 
 	return std::nullopt;
 }
@@ -466,7 +466,7 @@ std::optional<Json::Value> checkOptimizerDetail(Json::Value const& _details, std
 	if (_details.isMember(_name))
 	{
 		if (!_details[_name].isBool())
-			return formatFatalError("JSONError", "\"settings.optimizer.details." + _name + "\" must be Boolean");
+			return formatFatalError(Error::Type::JSONError, "\"settings.optimizer.details." + _name + "\" must be Boolean");
 		_setting = _details[_name].asBool();
 	}
 	return {};
@@ -485,7 +485,7 @@ std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details
 			catch (yul::OptimizerException const& _exception)
 			{
 				return formatFatalError(
-					"JSONError",
+					Error::Type::JSONError,
 					"Invalid optimizer step sequence in \"settings.optimizer.details." + _name + "\": " + _exception.what()
 				);
 			}
@@ -500,7 +500,7 @@ std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details
 				solAssert(_cleanupSetting == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
 		}
 		else
-			return formatFatalError("JSONError", "\"settings.optimizer.details." + _name + "\" must be a string");
+			return formatFatalError(Error::Type::JSONError, "\"settings.optimizer.details." + _name + "\" must be a string");
 
 	}
 	return {};
@@ -511,11 +511,11 @@ std::optional<Json::Value> checkMetadataKeys(Json::Value const& _input)
 	if (_input.isObject())
 	{
 		if (_input.isMember("useLiteralContent") && !_input["useLiteralContent"].isBool())
-			return formatFatalError("JSONError", "\"settings.metadata.useLiteralContent\" must be Boolean");
+			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.useLiteralContent\" must be Boolean");
 
 		static set<string> hashes{"ipfs", "bzzr1", "none"};
 		if (_input.isMember("bytecodeHash") && !hashes.count(_input["bytecodeHash"].asString()))
-			return formatFatalError("JSONError", "\"settings.metadata.bytecodeHash\" must be \"ipfs\", \"bzzr1\" or \"none\"");
+			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.bytecodeHash\" must be \"ipfs\", \"bzzr1\" or \"none\"");
 	}
 	static set<string> keys{"useLiteralContent", "bytecodeHash"};
 	return checkKeys(_input, keys, "settings.metadata");
@@ -524,7 +524,7 @@ std::optional<Json::Value> checkMetadataKeys(Json::Value const& _input)
 std::optional<Json::Value> checkOutputSelection(Json::Value const& _outputSelection)
 {
 	if (!!_outputSelection && !_outputSelection.isObject())
-		return formatFatalError("JSONError", "\"settings.outputSelection\" must be an object");
+		return formatFatalError(Error::Type::JSONError, "\"settings.outputSelection\" must be an object");
 
 	for (auto const& sourceName: _outputSelection.getMemberNames())
 	{
@@ -532,7 +532,7 @@ std::optional<Json::Value> checkOutputSelection(Json::Value const& _outputSelect
 
 		if (!sourceVal.isObject())
 			return formatFatalError(
-				"JSONError",
+				Error::Type::JSONError,
 				"\"settings.outputSelection." + sourceName + "\" must be an object"
 			);
 
@@ -542,7 +542,7 @@ std::optional<Json::Value> checkOutputSelection(Json::Value const& _outputSelect
 
 			if (!contractVal.isArray())
 				return formatFatalError(
-					"JSONError",
+					Error::Type::JSONError,
 					"\"settings.outputSelection." +
 					sourceName +
 					"." +
@@ -553,7 +553,7 @@ std::optional<Json::Value> checkOutputSelection(Json::Value const& _outputSelect
 			for (auto const& output: contractVal)
 				if (!output.isString())
 					return formatFatalError(
-						"JSONError",
+						Error::Type::JSONError,
 						"\"settings.outputSelection." +
 						sourceName +
 						"." +
@@ -578,7 +578,7 @@ std::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Value
 	if (_jsonInput.isMember("enabled"))
 	{
 		if (!_jsonInput["enabled"].isBool())
-			return formatFatalError("JSONError", "The \"enabled\" setting must be a Boolean.");
+			return formatFatalError(Error::Type::JSONError, "The \"enabled\" setting must be a Boolean.");
 
 		if (_jsonInput["enabled"].asBool())
 			settings = OptimiserSettings::standard();
@@ -587,7 +587,7 @@ std::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Value
 	if (_jsonInput.isMember("runs"))
 	{
 		if (!_jsonInput["runs"].isUInt())
-			return formatFatalError("JSONError", "The \"runs\" setting must be an unsigned number.");
+			return formatFatalError(Error::Type::JSONError, "The \"runs\" setting must be an unsigned number.");
 		settings.expectedExecutionsPerDeployment = _jsonInput["runs"].asUInt();
 	}
 
@@ -617,7 +617,7 @@ std::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Value
 		if (details.isMember("yulDetails"))
 		{
 			if (!settings.runYulOptimiser)
-				return formatFatalError("JSONError", "\"Providing yulDetails requires Yul optimizer to be enabled.");
+				return formatFatalError(Error::Type::JSONError, "\"Providing yulDetails requires Yul optimizer to be enabled.");
 
 			if (auto result = checkKeys(details["yulDetails"], {"stackAllocation", "optimizerSteps"}, "settings.optimizer.details.yulDetails"))
 				return *result;
@@ -638,7 +638,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	InputsAndSettings ret;
 
 	if (!_input.isObject())
-		return formatFatalError("JSONError", "Input is not a JSON object.");
+		return formatFatalError(Error::Type::JSONError, "Input is not a JSON object.");
 
 	if (auto result = checkRootKeys(_input))
 		return *result;
@@ -648,10 +648,10 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	Json::Value const& sources = _input["sources"];
 
 	if (!sources.isObject() && !sources.isNull())
-		return formatFatalError("JSONError", "\"sources\" is not a JSON object.");
+		return formatFatalError(Error::Type::JSONError, "\"sources\" is not a JSON object.");
 
 	if (sources.empty())
-		return formatFatalError("JSONError", "No input sources specified.");
+		return formatFatalError(Error::Type::JSONError, "No input sources specified.");
 
 	ret.errors = Json::arrayValue;
 
@@ -670,8 +670,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 			string content = sources[sourceName]["content"].asString();
 			if (!hash.empty() && !hashMatchesContent(hash, content))
 				ret.errors.append(formatError(
-					Error::Severity::Error,
-					"IOError",
+					Error::Type::IOError,
 					"general",
 					"Mismatch between content and supplied hash for \"" + sourceName + "\""
 				));
@@ -681,22 +680,21 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		else if (sources[sourceName]["urls"].isArray())
 		{
 			if (!m_readFile)
-				return formatFatalError("JSONError", "No import callback supplied, but URL is requested.");
+				return formatFatalError(Error::Type::JSONError, "No import callback supplied, but URL is requested.");
 
-			bool found = false;
 			vector<string> failures;
+			bool found = false;
 
 			for (auto const& url: sources[sourceName]["urls"])
 			{
 				if (!url.isString())
-					return formatFatalError("JSONError", "URL must be a string.");
+					return formatFatalError(Error::Type::JSONError, "URL must be a string.");
 				ReadCallback::Result result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), url.asString());
 				if (result.success)
 				{
 					if (!hash.empty() && !hashMatchesContent(hash, result.responseOrErrorMessage))
 						ret.errors.append(formatError(
-							Error::Severity::Error,
-							"IOError",
+							Error::Type::IOError,
 							"general",
 							"Mismatch between content and supplied hash for \"" + sourceName + "\" at \"" + url.asString() + "\""
 						));
@@ -715,15 +713,14 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 			{
 				/// If the import succeeded, let mark all the others as warnings, otherwise all of them are errors.
 				ret.errors.append(formatError(
-					found ? Error::Severity::Warning : Error::Severity::Error,
-					"IOError",
+					found ? Error::Type::Warning : Error::Type::IOError,
 					"general",
 					failure
 				));
 			}
 		}
 		else
-			return formatFatalError("JSONError", "Invalid input source specified.");
+			return formatFatalError(Error::Type::JSONError, "Invalid input source specified.");
 	}
 
 	Json::Value const& auxInputs = _input["auxiliaryInput"];
@@ -737,7 +734,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		if (!!smtlib2Responses)
 		{
 			if (!smtlib2Responses.isObject())
-				return formatFatalError("JSONError", "\"auxiliaryInput.smtlib2responses\" must be an object.");
+				return formatFatalError(Error::Type::JSONError, "\"auxiliaryInput.smtlib2responses\" must be an object.");
 
 			for (auto const& hashString: smtlib2Responses.getMemberNames())
 			{
@@ -748,12 +745,12 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 				}
 				catch (util::BadHexCharacter const&)
 				{
-					return formatFatalError("JSONError", "Invalid hex encoding of SMTLib2 auxiliary input.");
+					return formatFatalError(Error::Type::JSONError, "Invalid hex encoding of SMTLib2 auxiliary input.");
 				}
 
 				if (!smtlib2Responses[hashString].isString())
 					return formatFatalError(
-						"JSONError",
+						Error::Type::JSONError,
 						"\"smtlib2Responses." + hashString + "\" must be a string."
 					);
 
@@ -770,10 +767,10 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	if (settings.isMember("stopAfter"))
 	{
 		if (!settings["stopAfter"].isString())
-			return formatFatalError("JSONError", "\"settings.stopAfter\" must be a string.");
+			return formatFatalError(Error::Type::JSONError, "\"settings.stopAfter\" must be a string.");
 
 		if (settings["stopAfter"].asString() != "parsing")
-			return formatFatalError("JSONError", "Invalid value for \"settings.stopAfter\". Only valid value is \"parsing\".");
+			return formatFatalError(Error::Type::JSONError, "Invalid value for \"settings.stopAfter\". Only valid value is \"parsing\".");
 
 		ret.stopAfter = CompilerStack::State::Parsed;
 	}
@@ -781,24 +778,24 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	if (settings.isMember("parserErrorRecovery"))
 	{
 		if (!settings["parserErrorRecovery"].isBool())
-			return formatFatalError("JSONError", "\"settings.parserErrorRecovery\" must be a Boolean.");
+			return formatFatalError(Error::Type::JSONError, "\"settings.parserErrorRecovery\" must be a Boolean.");
 		ret.parserErrorRecovery = settings["parserErrorRecovery"].asBool();
 	}
 
 	if (settings.isMember("viaIR"))
 	{
 		if (!settings["viaIR"].isBool())
-			return formatFatalError("JSONError", "\"settings.viaIR\" must be a Boolean.");
+			return formatFatalError(Error::Type::JSONError, "\"settings.viaIR\" must be a Boolean.");
 		ret.viaIR = settings["viaIR"].asBool();
 	}
 
 	if (settings.isMember("evmVersion"))
 	{
 		if (!settings["evmVersion"].isString())
-			return formatFatalError("JSONError", "evmVersion must be a string.");
+			return formatFatalError(Error::Type::JSONError, "evmVersion must be a string.");
 		std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(settings["evmVersion"].asString());
 		if (!version)
-			return formatFatalError("JSONError", "Invalid EVM version requested.");
+			return formatFatalError(Error::Type::JSONError, "Invalid EVM version requested.");
 		ret.evmVersion = *version;
 	}
 
@@ -810,13 +807,13 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		if (settings["debug"].isMember("revertStrings"))
 		{
 			if (!settings["debug"]["revertStrings"].isString())
-				return formatFatalError("JSONError", "settings.debug.revertStrings must be a string.");
+				return formatFatalError(Error::Type::JSONError, "settings.debug.revertStrings must be a string.");
 			std::optional<RevertStrings> revertStrings = revertStringsFromString(settings["debug"]["revertStrings"].asString());
 			if (!revertStrings)
-				return formatFatalError("JSONError", "Invalid value for settings.debug.revertStrings.");
+				return formatFatalError(Error::Type::JSONError, "Invalid value for settings.debug.revertStrings.");
 			if (*revertStrings == RevertStrings::VerboseDebug)
 				return formatFatalError(
-					"UnimplementedFeatureError",
+					Error::Type::UnimplementedFeatureError,
 					"Only \"default\", \"strip\" and \"debug\" are implemented for settings.debug.revertStrings for now."
 				);
 			ret.revertStrings = *revertStrings;
@@ -825,7 +822,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		if (settings["debug"].isMember("debugInfo"))
 		{
 			if (!settings["debug"]["debugInfo"].isArray())
-				return formatFatalError("JSONError", "settings.debug.debugInfo must be an array.");
+				return formatFatalError(Error::Type::JSONError, "settings.debug.debugInfo must be an array.");
 
 			vector<string> components;
 			for (Json::Value const& arrayValue: settings["debug"]["debugInfo"])
@@ -836,11 +833,11 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 				true /* _acceptWildcards */
 			);
 			if (!debugInfoSelection.has_value())
-				return formatFatalError("JSONError", "Invalid value in settings.debug.debugInfo.");
+				return formatFatalError(Error::Type::JSONError, "Invalid value in settings.debug.debugInfo.");
 
 			if (debugInfoSelection->snippet && !debugInfoSelection->location)
 				return formatFatalError(
-					"JSONError",
+					Error::Type::JSONError,
 					"To use 'snippet' with settings.debug.debugInfo you must select also 'location'."
 				);
 
@@ -849,16 +846,16 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	}
 
 	if (settings.isMember("remappings") && !settings["remappings"].isArray())
-		return formatFatalError("JSONError", "\"settings.remappings\" must be an array of strings.");
+		return formatFatalError(Error::Type::JSONError, "\"settings.remappings\" must be an array of strings.");
 
 	for (auto const& remapping: settings.get("remappings", Json::Value()))
 	{
 		if (!remapping.isString())
-			return formatFatalError("JSONError", "\"settings.remappings\" must be an array of strings");
+			return formatFatalError(Error::Type::JSONError, "\"settings.remappings\" must be an array of strings");
 		if (auto r = ImportRemapper::parseRemapping(remapping.asString()))
 			ret.remappings.emplace_back(std::move(*r));
 		else
-			return formatFatalError("JSONError", "Invalid remapping: \"" + remapping.asString() + "\"");
+			return formatFatalError(Error::Type::JSONError, "Invalid remapping: \"" + remapping.asString() + "\"");
 	}
 
 	if (settings.isMember("optimizer"))
@@ -872,27 +869,27 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 
 	Json::Value jsonLibraries = settings.get("libraries", Json::Value(Json::objectValue));
 	if (!jsonLibraries.isObject())
-		return formatFatalError("JSONError", "\"libraries\" is not a JSON object.");
+		return formatFatalError(Error::Type::JSONError, "\"libraries\" is not a JSON object.");
 	for (auto const& sourceName: jsonLibraries.getMemberNames())
 	{
 		auto const& jsonSourceName = jsonLibraries[sourceName];
 		if (!jsonSourceName.isObject())
-			return formatFatalError("JSONError", "Library entry is not a JSON object.");
+			return formatFatalError(Error::Type::JSONError, "Library entry is not a JSON object.");
 		for (auto const& library: jsonSourceName.getMemberNames())
 		{
 			if (!jsonSourceName[library].isString())
-				return formatFatalError("JSONError", "Library address must be a string.");
+				return formatFatalError(Error::Type::JSONError, "Library address must be a string.");
 			string address = jsonSourceName[library].asString();
 
 			if (!boost::starts_with(address, "0x"))
 				return formatFatalError(
-					"JSONError",
+					Error::Type::JSONError,
 					"Library address is not prefixed with \"0x\"."
 				);
 
 			if (address.length() != 42)
 				return formatFatalError(
-					"JSONError",
+					Error::Type::JSONError,
 					"Library address is of invalid length."
 				);
 
@@ -903,7 +900,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 			catch (util::BadHexCharacter const&)
 			{
 				return formatFatalError(
-					"JSONError",
+					Error::Type::JSONError,
 					"Invalid library address (\"" + address + "\") supplied."
 				);
 			}
@@ -936,7 +933,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 
 	if (ret.stopAfter != CompilerStack::State::CompilationSuccessful && isBinaryRequested(ret.outputSelection))
 		return formatFatalError(
-			"JSONError",
+			Error::Type::JSONError,
 			"Requested output selection conflicts with \"settings.stopAfter\"."
 		);
 
@@ -949,29 +946,29 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	{
 		auto const& sources = modelCheckerSettings["contracts"];
 		if (!sources.isObject() && !sources.isNull())
-			return formatFatalError("JSONError", "settings.modelChecker.contracts is not a JSON object.");
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.contracts is not a JSON object.");
 
 		map<string, set<string>> sourceContracts;
 		for (auto const& source: sources.getMemberNames())
 		{
 			if (source.empty())
-				return formatFatalError("JSONError", "Source name cannot be empty.");
+				return formatFatalError(Error::Type::JSONError, "Source name cannot be empty.");
 
 			auto const& contracts = sources[source];
 			if (!contracts.isArray())
-				return formatFatalError("JSONError", "Source contracts must be an array.");
+				return formatFatalError(Error::Type::JSONError, "Source contracts must be an array.");
 
 			for (auto const& contract: contracts)
 			{
 				if (!contract.isString())
-					return formatFatalError("JSONError", "Every contract in settings.modelChecker.contracts must be a string.");
+					return formatFatalError(Error::Type::JSONError, "Every contract in settings.modelChecker.contracts must be a string.");
 				if (contract.asString().empty())
-					return formatFatalError("JSONError", "Contract name cannot be empty.");
+					return formatFatalError(Error::Type::JSONError, "Contract name cannot be empty.");
 				sourceContracts[source].insert(contract.asString());
 			}
 
 			if (sourceContracts[source].empty())
-				return formatFatalError("JSONError", "Source contracts must be a non-empty array.");
+				return formatFatalError(Error::Type::JSONError, "Source contracts must be a non-empty array.");
 		}
 		ret.modelCheckerSettings.contracts = {std::move(sourceContracts)};
 	}
@@ -980,17 +977,17 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	{
 		auto const& divModNoSlacks = modelCheckerSettings["divModNoSlacks"];
 		if (!divModNoSlacks.isBool())
-			return formatFatalError("JSONError", "settings.modelChecker.divModNoSlacks must be a Boolean.");
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.divModNoSlacks must be a Boolean.");
 		ret.modelCheckerSettings.divModNoSlacks = divModNoSlacks.asBool();
 	}
 
 	if (modelCheckerSettings.isMember("engine"))
 	{
 		if (!modelCheckerSettings["engine"].isString())
-			return formatFatalError("JSONError", "settings.modelChecker.engine must be a string.");
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.engine must be a string.");
 		std::optional<ModelCheckerEngine> engine = ModelCheckerEngine::fromString(modelCheckerSettings["engine"].asString());
 		if (!engine)
-			return formatFatalError("JSONError", "Invalid model checker engine requested.");
+			return formatFatalError(Error::Type::JSONError, "Invalid model checker engine requested.");
 		ret.modelCheckerSettings.engine = *engine;
 	}
 
@@ -998,19 +995,19 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	{
 		auto const& invariantsArray = modelCheckerSettings["invariants"];
 		if (!invariantsArray.isArray())
-			return formatFatalError("JSONError", "settings.modelChecker.invariants must be an array.");
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.invariants must be an array.");
 
 		ModelCheckerInvariants invariants;
 		for (auto const& i: invariantsArray)
 		{
 			if (!i.isString())
-				return formatFatalError("JSONError", "Every invariant type in settings.modelChecker.invariants must be a string.");
+				return formatFatalError(Error::Type::JSONError, "Every invariant type in settings.modelChecker.invariants must be a string.");
 			if (!invariants.setFromString(i.asString()))
-				return formatFatalError("JSONError", "Invalid model checker invariants requested.");
+				return formatFatalError(Error::Type::JSONError, "Invalid model checker invariants requested.");
 		}
 
 		if (invariants.invariants.empty())
-			return formatFatalError("JSONError", "settings.modelChecker.invariants must be a non-empty array.");
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.invariants must be a non-empty array.");
 
 		ret.modelCheckerSettings.invariants = invariants;
 	}
@@ -1019,7 +1016,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	{
 		auto const& showUnproved = modelCheckerSettings["showUnproved"];
 		if (!showUnproved.isBool())
-			return formatFatalError("JSONError", "settings.modelChecker.showUnproved must be a Boolean value.");
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.showUnproved must be a Boolean value.");
 		ret.modelCheckerSettings.showUnproved = showUnproved.asBool();
 	}
 
@@ -1027,15 +1024,15 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	{
 		auto const& solversArray = modelCheckerSettings["solvers"];
 		if (!solversArray.isArray())
-			return formatFatalError("JSONError", "settings.modelChecker.solvers must be an array.");
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.solvers must be an array.");
 
 		smtutil::SMTSolverChoice solvers;
 		for (auto const& s: solversArray)
 		{
 			if (!s.isString())
-				return formatFatalError("JSONError", "Every target in settings.modelChecker.solvers must be a string.");
+				return formatFatalError(Error::Type::JSONError, "Every target in settings.modelChecker.solvers must be a string.");
 			if (!solvers.setSolver(s.asString()))
-				return formatFatalError("JSONError", "Invalid model checker solvers requested.");
+				return formatFatalError(Error::Type::JSONError, "Invalid model checker solvers requested.");
 		}
 
 		ret.modelCheckerSettings.solvers = solvers;
@@ -1045,19 +1042,19 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	{
 		auto const& targetsArray = modelCheckerSettings["targets"];
 		if (!targetsArray.isArray())
-			return formatFatalError("JSONError", "settings.modelChecker.targets must be an array.");
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.targets must be an array.");
 
 		ModelCheckerTargets targets;
 		for (auto const& t: targetsArray)
 		{
 			if (!t.isString())
-				return formatFatalError("JSONError", "Every target in settings.modelChecker.targets must be a string.");
+				return formatFatalError(Error::Type::JSONError, "Every target in settings.modelChecker.targets must be a string.");
 			if (!targets.setFromString(t.asString()))
-				return formatFatalError("JSONError", "Invalid model checker targets requested.");
+				return formatFatalError(Error::Type::JSONError, "Invalid model checker targets requested.");
 		}
 
 		if (targets.targets.empty())
-			return formatFatalError("JSONError", "settings.modelChecker.targets must be a non-empty array.");
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.targets must be a non-empty array.");
 
 		ret.modelCheckerSettings.targets = targets;
 	}
@@ -1065,7 +1062,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	if (modelCheckerSettings.isMember("timeout"))
 	{
 		if (!modelCheckerSettings["timeout"].isUInt())
-			return formatFatalError("JSONError", "settings.modelChecker.timeout must be an unsigned integer.");
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.timeout must be an unsigned integer.");
 		ret.modelCheckerSettings.timeout = modelCheckerSettings["timeout"].asUInt();
 	}
 
@@ -1116,8 +1113,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 			errors.append(formatErrorWithException(
 				compilerStack,
 				*error,
-				Error::errorSeverity(err.type()),
-				err.typeName(),
+				err.type(),
 				"general",
 				"",
 				err.errorId()
@@ -1130,8 +1126,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		errors.append(formatErrorWithException(
 			compilerStack,
 			_error,
-			Error::Severity::Error,
-			_error.typeName(),
+			_error.type(),
 			"general",
 			"Uncaught error: "
 		));
@@ -1140,8 +1135,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	catch (FatalError const& _exception)
 	{
 		errors.append(formatError(
-			Error::Severity::Error,
-			"FatalError",
+			Error::Type::FatalError,
 			"general",
 			"Uncaught fatal error: " + boost::diagnostic_information(_exception)
 		));
@@ -1151,8 +1145,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		errors.append(formatErrorWithException(
 			compilerStack,
 			_exception,
-			Error::Severity::Error,
-			"CompilerError",
+			Error::Type::CompilerError,
 			"general",
 			"Compiler error (" + _exception.lineInfo() + ")"
 		));
@@ -1162,8 +1155,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		errors.append(formatErrorWithException(
 			compilerStack,
 			_exception,
-			Error::Severity::Error,
-			"InternalCompilerError",
+			Error::Type::InternalCompilerError,
 			"general",
 			"Internal compiler error (" + _exception.lineInfo() + ")"
 		));
@@ -1173,8 +1165,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		errors.append(formatErrorWithException(
 			compilerStack,
 			_exception,
-			Error::Severity::Error,
-			"UnimplementedFeatureError",
+			Error::Type::UnimplementedFeatureError,
 			"general",
 			"Unimplemented feature (" + _exception.lineInfo() + ")"
 		));
@@ -1184,8 +1175,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		errors.append(formatErrorWithException(
 			compilerStack,
 			_exception,
-			Error::Severity::Error,
-			"YulException",
+			Error::Type::YulException,
 			"general",
 			"Yul exception"
 		));
@@ -1195,8 +1185,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		errors.append(formatErrorWithException(
 			compilerStack,
 			_exception,
-			Error::Severity::Error,
-			"SMTLogicException",
+			Error::Type::SMTLogicException,
 			"general",
 			"SMT logic exception"
 		));
@@ -1204,8 +1193,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	catch (util::Exception const& _exception)
 	{
 		errors.append(formatError(
-			Error::Severity::Error,
-			"Exception",
+			Error::Type::Exception,
 			"general",
 			"Exception during compilation: " + boost::diagnostic_information(_exception)
 		));
@@ -1213,8 +1201,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	catch (std::exception const& _exception)
 	{
 		errors.append(formatError(
-			Error::Severity::Error,
-			"Exception",
+			Error::Type::Exception,
 			"general",
 			"Unknown exception during compilation: " + boost::diagnostic_information(_exception)
 		));
@@ -1222,8 +1209,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	catch (...)
 	{
 		errors.append(formatError(
-			Error::Severity::Error,
-			"Exception",
+			Error::Type::Exception,
 			"general",
 			"Unknown exception during compilation: " + boost::current_exception_diagnostic_information()
 		));
@@ -1240,7 +1226,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		((binariesRequested && !compilationSuccess) || !analysisPerformed) &&
 		(errors.empty() && _inputsAndSettings.stopAfter >= CompilerStack::State::AnalysisPerformed)
 	)
-		return formatFatalError("InternalCompilerError", "No error reported, but compilation failed.");
+		return formatFatalError(Error::Type::InternalCompilerError, "No error reported, but compilation failed.");
 
 	Json::Value output = Json::objectValue;
 
@@ -1376,8 +1362,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	if (_inputsAndSettings.sources.size() != 1)
 	{
 		output["errors"].append(formatError(
-			Error::Severity::Error,
-			"JSONError",
+			Error::Type::JSONError,
 			"general",
 			"Yul mode only supports exactly one input file."
 		));
@@ -1386,8 +1371,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	if (!_inputsAndSettings.smtLib2Responses.empty())
 	{
 		output["errors"].append(formatError(
-			Error::Severity::Error,
-			"JSONError",
+			Error::Type::JSONError,
 			"general",
 			"Yul mode does not support smtlib2responses."
 		));
@@ -1396,8 +1380,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	if (!_inputsAndSettings.remappings.empty())
 	{
 		output["errors"].append(formatError(
-			Error::Severity::Error,
-			"JSONError",
+			Error::Type::JSONError,
 			"general",
 			"Field \"settings.remappings\" cannot be used for Yul."
 		));
@@ -1406,8 +1389,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	if (_inputsAndSettings.revertStrings != RevertStrings::Default)
 	{
 		output["errors"].append(formatError(
-			Error::Severity::Error,
-			"JSONError",
+			Error::Type::JSONError,
 			"general",
 			"Field \"settings.debug.revertStrings\" cannot be used for Yul."
 		));
@@ -1429,8 +1411,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	if (!stack.parseAndAnalyze(sourceName, sourceContents) && stack.errors().empty())
 	{
 		output["errors"].append(formatError(
-			Error::Severity::Error,
-			"InternalCompilerError",
+			Error::Type::InternalCompilerError,
 			"general",
 			"No error reported, but compilation failed."
 		));
@@ -1446,8 +1427,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 			output["errors"].append(formatErrorWithException(
 				stack,
 				*error,
-				Error::errorSeverity(err->type()),
-				err->typeName(),
+				err->type(),
 				"general",
 				""
 			));
@@ -1523,23 +1503,23 @@ Json::Value StandardCompiler::compile(Json::Value const& _input) noexcept
 		else if (settings.language == "Yul")
 			return compileYul(std::move(settings));
 		else
-			return formatFatalError("JSONError", "Only \"Solidity\" or \"Yul\" is supported as a language.");
+			return formatFatalError(Error::Type::JSONError, "Only \"Solidity\" or \"Yul\" is supported as a language.");
 	}
 	catch (Json::LogicError const& _exception)
 	{
-		return formatFatalError("InternalCompilerError", string("JSON logic exception: ") + _exception.what());
+		return formatFatalError(Error::Type::InternalCompilerError, string("JSON logic exception: ") + _exception.what());
 	}
 	catch (Json::RuntimeError const& _exception)
 	{
-		return formatFatalError("InternalCompilerError", string("JSON runtime exception: ") + _exception.what());
+		return formatFatalError(Error::Type::InternalCompilerError, string("JSON runtime exception: ") + _exception.what());
 	}
 	catch (util::Exception const& _exception)
 	{
-		return formatFatalError("InternalCompilerError", "Internal exception in StandardCompiler::compile: " + boost::diagnostic_information(_exception));
+		return formatFatalError(Error::Type::InternalCompilerError, "Internal exception in StandardCompiler::compile: " + boost::diagnostic_information(_exception));
 	}
 	catch (...)
 	{
-		return formatFatalError("InternalCompilerError", "Internal exception in StandardCompiler::compile: " +  boost::current_exception_diagnostic_information());
+		return formatFatalError(Error::Type::InternalCompilerError, "Internal exception in StandardCompiler::compile: " +  boost::current_exception_diagnostic_information());
 	}
 }
 
@@ -1550,7 +1530,7 @@ string StandardCompiler::compile(string const& _input) noexcept
 	try
 	{
 		if (!util::jsonParseStrict(_input, input, &errors))
-			return util::jsonPrint(formatFatalError("JSONError", errors), m_jsonPrintingFormat);
+			return util::jsonPrint(formatFatalError(Error::Type::JSONError, errors), m_jsonPrintingFormat);
 	}
 	catch (...)
 	{
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index ce68dbef35..1a1f5faf0a 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -286,7 +286,7 @@ void LanguageServer::compileAndUpdateDiagnostics()
 		jsonDiag["source"] = "solc";
 		jsonDiag["severity"] = toDiagnosticSeverity(error->type());
 		jsonDiag["code"] = Json::UInt64{error->errorId().error};
-		string message = error->typeName() + ":";
+		string message = Error::formatErrorType(error->type()) + ":";
 		if (string const* comment = error->comment())
 			message += " " + *comment;
 		jsonDiag["message"] = std::move(message);
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index e215405a12..ebe76f8f06 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -765,7 +765,7 @@ void CommandLineInterface::compile()
 	catch (CompilerError const& _exception)
 	{
 		m_hasOutput = true;
-		formatter.printExceptionInformation(_exception, "Compiler error");
+		formatter.printExceptionInformation(_exception, Error::Type::CompilerError);
 		solThrow(CommandLineExecutionError, "");
 	}
 	catch (Error const& _error)
@@ -778,7 +778,7 @@ void CommandLineInterface::compile()
 		else
 		{
 			m_hasOutput = true;
-			formatter.printExceptionInformation(_error, _error.typeName());
+			formatter.printExceptionInformation(_error, _error.type());
 			solThrow(CommandLineExecutionError, "");
 		}
 	}
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/args b/test/cmdlineTests/standard_urls_existing_and_missing/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_urls_existing_and_missing/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/contract.sol b/test/cmdlineTests/standard_urls_existing_and_missing/contract.sol
new file mode 100644
index 0000000000..a32f63f78f
--- /dev/null
+++ b/test/cmdlineTests/standard_urls_existing_and_missing/contract.sol
@@ -0,0 +1,2 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/input.json b/test/cmdlineTests/standard_urls_existing_and_missing/input.json
new file mode 100644
index 0000000000..686e8128ec
--- /dev/null
+++ b/test/cmdlineTests/standard_urls_existing_and_missing/input.json
@@ -0,0 +1,13 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "url_not_found.sol": {
+            "urls": [
+                "standard_urls_existing_and_missing/non-existent-contract-1.sol",
+                "standard_urls_existing_and_missing/contract.sol",
+                "standard_urls_existing_and_missing/non-existent-contract-2.sol"
+            ]
+        }
+    },
+    "settings": {"outputSelection": {"*": { "*": ["metadata", "evm.bytecode"]}}}
+}
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/output.json b/test/cmdlineTests/standard_urls_existing_and_missing/output.json
new file mode 100644
index 0000000000..2089fc90e2
--- /dev/null
+++ b/test/cmdlineTests/standard_urls_existing_and_missing/output.json
@@ -0,0 +1,18 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
+            "message": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
+            "severity": "warning",
+            "type": "Warning"
+        }],
+    "sources":
+    {
+        "url_not_found.sol":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_urls_missing/args b/test/cmdlineTests/standard_urls_missing/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_urls_missing/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_urls_missing/contract.sol b/test/cmdlineTests/standard_urls_missing/contract.sol
new file mode 100644
index 0000000000..a32f63f78f
--- /dev/null
+++ b/test/cmdlineTests/standard_urls_missing/contract.sol
@@ -0,0 +1,2 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
diff --git a/test/cmdlineTests/standard_urls_missing/input.json b/test/cmdlineTests/standard_urls_missing/input.json
new file mode 100644
index 0000000000..fecc50eb03
--- /dev/null
+++ b/test/cmdlineTests/standard_urls_missing/input.json
@@ -0,0 +1,13 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "url_not_found.sol": {
+            "urls": [
+                "standard_urls_missing/non-existent-contract-1.sol",
+                "standard_urls_missing/non-existent-contract.sol",
+                "standard_urls_missing/non-existent-contract-2.sol"
+            ]
+        }
+    },
+    "settings": {"outputSelection": {"*": { "*": ["metadata", "evm.bytecode"]}}}
+}
diff --git a/test/cmdlineTests/standard_urls_missing/output.json b/test/cmdlineTests/standard_urls_missing/output.json
new file mode 100644
index 0000000000..49d93ab75c
--- /dev/null
+++ b/test/cmdlineTests/standard_urls_missing/output.json
@@ -0,0 +1,26 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
+            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
+            "severity": "error",
+            "type": "IOError"
+        },
+        {
+            "component": "general",
+            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".",
+            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".",
+            "severity": "error",
+            "type": "IOError"
+        },
+        {
+            "component": "general",
+            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".",
+            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".",
+            "severity": "error",
+            "type": "IOError"
+        }],
+    "sources": {}
+}
diff --git a/test/libsolidity/ErrorCheck.cpp b/test/libsolidity/ErrorCheck.cpp
index 418d7cc990..8a8b2166ce 100644
--- a/test/libsolidity/ErrorCheck.cpp
+++ b/test/libsolidity/ErrorCheck.cpp
@@ -71,7 +71,7 @@ string solidity::frontend::test::searchErrors(ErrorList const& _errors, vector<p
 				break;
 			}
 		if (!found)
-			return "Unexpected error: " + error->typeName() + ": " + msg;
+			return "Unexpected error: " + Error::formatErrorType(error->type()) + ": " + msg;
 	}
 	if (!expectations.empty())
 	{
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index d3e5124508..ee3c4b4b06 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -145,7 +145,7 @@ void SyntaxTest::filterObtainedErrors()
 			}
 		}
 		m_errorList.emplace_back(SyntaxTestError{
-			currentError->typeName(),
+			Error::formatErrorType(currentError->type()),
 			currentError->errorId(),
 			errorMessage(*currentError),
 			sourceName,
diff --git a/test/libyul/SyntaxTest.cpp b/test/libyul/SyntaxTest.cpp
index 8ab5bb9530..cea1d57450 100644
--- a/test/libyul/SyntaxTest.cpp
+++ b/test/libyul/SyntaxTest.cpp
@@ -61,7 +61,7 @@ void SyntaxTest::parseAndAnalyze()
 		}
 
 		m_errorList.emplace_back(SyntaxTestError{
-			error->typeName(),
+			Error::formatErrorType(error->type()),
 			error->errorId(),
 			errorMessage(*error),
 			name,
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index c3ad9c9f3f..395db4c0f7 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -79,10 +79,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		SourceReferenceFormatter formatter(std::cout, stack, false, false);
 
 		for (auto const& error: stack.errors())
-			formatter.printExceptionInformation(
-				*error,
-				(error->type() == Error::Type::Warning) ? "Warning" : "Error"
-			);
+			formatter.printExceptionInformation(*error, error->type());
 		yulAssert(false, "Proto fuzzer generated malformed program");
 	}
 

From 1f244cc1b32b69031a8a793aee46971a7552c09d Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 20 Sep 2022 14:12:57 +0200
Subject: [PATCH 0904/1748] Fix Euler tests by pinning v3-periphery

---
 test/externalTests/euler.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 6ecba6c59e..e26b892486 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -74,6 +74,9 @@ function euler_test
     force_hardhat_unlimited_contract_size "$config_file"
     npm install
 
+    # TODO: Remove this when https://github.com/Uniswap/v3-periphery/issues/313 gets fixed.
+    npm install @uniswap/v3-periphery@1.4.1
+
     replace_version_pragmas
     neutralize_packaged_contracts
 

From eafd7218b7410e9cedcc11a89448f9396057ad17 Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Tue, 6 Sep 2022 15:42:15 +0530
Subject: [PATCH 0905/1748] refactored struct message to use std::variant for
 _typeOrSeverity

---
 liblangutil/Exceptions.h                      | 15 ++++++++++
 liblangutil/SourceReferenceExtractor.cpp      | 10 ++++---
 liblangutil/SourceReferenceExtractor.h        | 14 ++++++++--
 liblangutil/SourceReferenceFormatter.cpp      | 28 ++++++++++++-------
 liblangutil/SourceReferenceFormatter.h        | 26 +++++++++++++----
 libsolidity/interface/StandardCompiler.cpp    |  3 +-
 solc/CommandLineInterface.cpp                 |  7 +++--
 .../standard_urls_existing_and_missing/args   |  1 -
 .../output.json                               | 19 +------------
 test/cmdlineTests/standard_urls_missing/args  |  1 -
 .../standard_urls_missing/output.json         | 27 +-----------------
 test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp  |  2 +-
 12 files changed, 80 insertions(+), 73 deletions(-)
 delete mode 100644 test/cmdlineTests/standard_urls_existing_and_missing/args
 delete mode 100644 test/cmdlineTests/standard_urls_missing/args

diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
index d74ee82c5e..fc7286ed1c 100644
--- a/liblangutil/Exceptions.h
+++ b/liblangutil/Exceptions.h
@@ -37,6 +37,7 @@
 #include <utility>
 #include <vector>
 #include <memory>
+#include <variant>
 
 namespace solidity::langutil
 {
@@ -228,6 +229,13 @@ class Error: virtual public util::Exception
 		}
 	}
 
+	static constexpr Severity errorSeverityOrType(std::variant<Error::Type, Error::Severity> _typeOrSeverity)
+	{
+		if (std::holds_alternative<Error::Type>(_typeOrSeverity))
+			return errorSeverity(std::get<Error::Type>(_typeOrSeverity));
+		return std::get<Error::Severity>(_typeOrSeverity);
+	}
+
 	static bool isError(Severity _severity)
 	{
 		return _severity == Severity::Error;
@@ -282,6 +290,13 @@ class Error: virtual public util::Exception
 		util::unreachable();
 	}
 
+	static std::string formatTypeOrSeverity(std::variant<Error::Type, Error::Severity> _typeOrSeverity)
+	{
+		if (std::holds_alternative<Error::Type>(_typeOrSeverity))
+			return formatErrorType(std::get<Error::Type>(_typeOrSeverity));
+		return formatErrorSeverity(std::get<Error::Severity>(_typeOrSeverity));
+	}
+
 	static std::string formatErrorSeverityLowercase(Severity _severity)
 	{
 		std::string severityValue = formatErrorSeverity(_severity);
diff --git a/liblangutil/SourceReferenceExtractor.cpp b/liblangutil/SourceReferenceExtractor.cpp
index 14dbc25e6b..01f22a1f77 100644
--- a/liblangutil/SourceReferenceExtractor.cpp
+++ b/liblangutil/SourceReferenceExtractor.cpp
@@ -22,6 +22,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <variant>
 
 using namespace std;
 using namespace solidity;
@@ -30,7 +31,7 @@ using namespace solidity::langutil;
 SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
 	CharStreamProvider const& _charStreamProvider,
 	util::Exception const& _exception,
-	Error::Type _type
+	std::variant<Error::Type, Error::Severity> _typeOrSeverity
 )
 {
 	SourceLocation const* location = boost::get_error_info<errinfo_sourceLocation>(_exception);
@@ -44,15 +45,16 @@ SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
 		for (auto const& info: secondaryLocation->infos)
 			secondary.emplace_back(extract(_charStreamProvider, &info.second, info.first));
 
-	return Message{std::move(primary), _type, std::move(secondary), nullopt};
+	return Message{std::move(primary), _typeOrSeverity, std::move(secondary), nullopt};
 }
 
 SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
 	CharStreamProvider const& _charStreamProvider,
-	Error const& _error
+	Error const& _error,
+	std::variant<Error::Type, Error::Severity> _typeOrSeverity
 )
 {
-	Message message = extract(_charStreamProvider, _error, _error.type());
+	Message message = extract(_charStreamProvider, static_cast<util::Exception>(_error), _typeOrSeverity);
 	message.errorId = _error.errorId();
 	return message;
 }
diff --git a/liblangutil/SourceReferenceExtractor.h b/liblangutil/SourceReferenceExtractor.h
index 75e56b4d95..3f7751f0b5 100644
--- a/liblangutil/SourceReferenceExtractor.h
+++ b/liblangutil/SourceReferenceExtractor.h
@@ -24,6 +24,7 @@
 #include <string>
 #include <tuple>
 #include <vector>
+#include <variant>
 
 namespace solidity::langutil
 {
@@ -55,12 +56,21 @@ namespace SourceReferenceExtractor
 	struct Message
 	{
 		SourceReference primary;
-		Error::Type type;
+		std::variant<Error::Type, Error::Severity> _typeOrSeverity;
 		std::vector<SourceReference> secondary;
 		std::optional<ErrorId> errorId;
 	};
 
-	Message extract(CharStreamProvider const& _charStreamProvider, util::Exception const& _exception, Error::Type _type);
+	Message extract(
+		CharStreamProvider const& _charStreamProvider,
+		util::Exception const& _exception,
+		std::variant<Error::Type, Error::Severity> _typeOrSeverity
+	);
+	Message extract(
+		CharStreamProvider const& _charStreamProvider,
+		Error const& _error,
+		std::variant<Error::Type, Error::Severity> _typeOrSeverity
+	);
 	Message extract(CharStreamProvider const& _charStreamProvider, Error const& _error);
 	SourceReference extract(CharStreamProvider const& _charStreamProvider, SourceLocation const* _location, std::string message = "");
 }
diff --git a/liblangutil/SourceReferenceFormatter.cpp b/liblangutil/SourceReferenceFormatter.cpp
index fa7bd47ade..4765b9fb24 100644
--- a/liblangutil/SourceReferenceFormatter.cpp
+++ b/liblangutil/SourceReferenceFormatter.cpp
@@ -26,6 +26,7 @@
 #include <libsolutil/UTF8.h>
 #include <iomanip>
 #include <string_view>
+#include <variant>
 
 using namespace std;
 using namespace solidity;
@@ -175,16 +176,12 @@ void SourceReferenceFormatter::printSourceLocation(SourceReference const& _ref)
 	}
 }
 
-void SourceReferenceFormatter::printExceptionInformation(SourceReferenceExtractor::Message const& _msg, bool _printFullType)
+void SourceReferenceFormatter::printExceptionInformation(SourceReferenceExtractor::Message const& _msg)
 {
-	errorColored(Error::errorSeverity(_msg.type)) << (
-		_printFullType ?
-		Error::formatErrorType(_msg.type) :
-		Error::formatErrorSeverity(Error::errorSeverity(_msg.type))
-	);
+	errorColored(Error::errorSeverityOrType(_msg._typeOrSeverity)) << Error::formatTypeOrSeverity(_msg._typeOrSeverity);
 
 	if (m_withErrorIds && _msg.errorId.has_value())
-		errorColored(Error::errorSeverity(_msg.type)) << " (" << _msg.errorId.value().error << ")";
+		errorColored(Error::errorSeverityOrType(_msg._typeOrSeverity)) << " (" << _msg.errorId.value().error << ")";
 
 	messageColored() << ": " << _msg.primary.message << '\n';
 	printSourceLocation(_msg.primary);
@@ -199,9 +196,14 @@ void SourceReferenceFormatter::printExceptionInformation(SourceReferenceExtracto
 	m_stream << '\n';
 }
 
-void SourceReferenceFormatter::printExceptionInformation(util::Exception const& _exception, Error::Type _type, bool _printFullType)
+void SourceReferenceFormatter::printExceptionInformation(util::Exception const& _exception, Error::Type _type)
 {
-	printExceptionInformation(SourceReferenceExtractor::extract(m_charStreamProvider, _exception, _type), _printFullType);
+	printExceptionInformation(SourceReferenceExtractor::extract(m_charStreamProvider, _exception, _type));
+}
+
+void SourceReferenceFormatter::printExceptionInformation(util::Exception const& _exception, Error::Severity _severity)
+{
+	printExceptionInformation(SourceReferenceExtractor::extract(m_charStreamProvider, _exception, _severity));
 }
 
 void SourceReferenceFormatter::printErrorInformation(ErrorList const& _errors)
@@ -212,5 +214,11 @@ void SourceReferenceFormatter::printErrorInformation(ErrorList const& _errors)
 
 void SourceReferenceFormatter::printErrorInformation(Error const& _error)
 {
-	printExceptionInformation(SourceReferenceExtractor::extract(m_charStreamProvider, _error));
+	SourceReferenceExtractor::Message message =
+		SourceReferenceExtractor::extract(
+			m_charStreamProvider,
+			_error,
+			Error::errorSeverity(_error.type())
+		);
+	printExceptionInformation(message);
 }
diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
index b448989159..def216efa1 100644
--- a/liblangutil/SourceReferenceFormatter.h
+++ b/liblangutil/SourceReferenceFormatter.h
@@ -51,8 +51,9 @@ class SourceReferenceFormatter
 
 	/// Prints source location if it is given.
 	void printSourceLocation(SourceReference const& _ref);
-	void printExceptionInformation(SourceReferenceExtractor::Message const& _msg, bool _printFullType=false);
-	void printExceptionInformation(util::Exception const& _exception, Error::Type _type, bool _printFullType=false);
+	void printExceptionInformation(SourceReferenceExtractor::Message const& _msg);
+	void printExceptionInformation(util::Exception const& _exception, Error::Type _type);
+	void printExceptionInformation(util::Exception const& _exception, Error::Severity _severity);
 	void printErrorInformation(langutil::ErrorList const& _errors);
 	void printErrorInformation(Error const& _error);
 
@@ -61,13 +62,26 @@ class SourceReferenceFormatter
 		Error::Type _type,
 		CharStreamProvider const& _charStreamProvider,
 		bool _colored = false,
-		bool _withErrorIds = false,
-		bool _printFullType = false
+		bool _withErrorIds = false
 	)
 	{
 		std::ostringstream errorOutput;
 		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, _withErrorIds);
-		formatter.printExceptionInformation(_exception, _type, _printFullType);
+		formatter.printExceptionInformation(_exception, _type);
+		return errorOutput.str();
+	}
+
+	static std::string formatExceptionInformation(
+		util::Exception const& _exception,
+		Error::Severity _severity,
+		CharStreamProvider const& _charStreamProvider,
+		bool _colored = false,
+		bool _withErrorIds = false
+	)
+	{
+		std::ostringstream errorOutput;
+		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, _withErrorIds);
+		formatter.printExceptionInformation(_exception, _severity);
 		return errorOutput.str();
 	}
 
@@ -78,7 +92,7 @@ class SourceReferenceFormatter
 	{
 		return formatExceptionInformation(
 			_error,
-			_error.type(),
+			Error::errorSeverity(_error.type()),
 			_charStreamProvider
 		);
 	}
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index f393694c6e..551bd6af7a 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -126,8 +126,7 @@ Json::Value formatErrorWithException(
 		_type,
 		_charStreamProvider,
 		false, // colored
-		false, // _withErrorIds
-		true // _printFullType
+		false // _withErrorIds
 	);
 
 	if (string const* description = _exception.comment())
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index ebe76f8f06..ccaa8df942 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -765,7 +765,10 @@ void CommandLineInterface::compile()
 	catch (CompilerError const& _exception)
 	{
 		m_hasOutput = true;
-		formatter.printExceptionInformation(_exception, Error::Type::CompilerError);
+		formatter.printExceptionInformation(
+			_exception,
+			Error::errorSeverity(Error::Type::CompilerError)
+		);
 		solThrow(CommandLineExecutionError, "");
 	}
 	catch (Error const& _error)
@@ -778,7 +781,7 @@ void CommandLineInterface::compile()
 		else
 		{
 			m_hasOutput = true;
-			formatter.printExceptionInformation(_error, _error.type());
+			formatter.printExceptionInformation(_error, Error::errorSeverity(_error.type()));
 			solThrow(CommandLineExecutionError, "");
 		}
 	}
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/args b/test/cmdlineTests/standard_urls_existing_and_missing/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_urls_existing_and_missing/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/output.json b/test/cmdlineTests/standard_urls_existing_and_missing/output.json
index 2089fc90e2..8cb0cc4c76 100644
--- a/test/cmdlineTests/standard_urls_existing_and_missing/output.json
+++ b/test/cmdlineTests/standard_urls_existing_and_missing/output.json
@@ -1,18 +1 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
-            "message": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
-            "severity": "warning",
-            "type": "Warning"
-        }],
-    "sources":
-    {
-        "url_not_found.sol":
-        {
-            "id": 0
-        }
-    }
-}
+{"errors":[{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","severity":"warning","type":"Warning"}],"sources":{"url_not_found.sol":{"id":0}}}
diff --git a/test/cmdlineTests/standard_urls_missing/args b/test/cmdlineTests/standard_urls_missing/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_urls_missing/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_urls_missing/output.json b/test/cmdlineTests/standard_urls_missing/output.json
index 49d93ab75c..2bead4831d 100644
--- a/test/cmdlineTests/standard_urls_missing/output.json
+++ b/test/cmdlineTests/standard_urls_missing/output.json
@@ -1,26 +1 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
-            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
-            "severity": "error",
-            "type": "IOError"
-        },
-        {
-            "component": "general",
-            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".",
-            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".",
-            "severity": "error",
-            "type": "IOError"
-        },
-        {
-            "component": "general",
-            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".",
-            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".",
-            "severity": "error",
-            "type": "IOError"
-        }],
-    "sources": {}
-}
+{"errors":[{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","severity":"error","type":"IOError"},{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".","severity":"error","type":"IOError"},{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".","severity":"error","type":"IOError"}],"sources":{}}
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index 395db4c0f7..2335bfbf5d 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -79,7 +79,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		SourceReferenceFormatter formatter(std::cout, stack, false, false);
 
 		for (auto const& error: stack.errors())
-			formatter.printExceptionInformation(*error, error->type());
+			formatter.printExceptionInformation(*error, Error::errorSeverity(error->type()));
 		yulAssert(false, "Proto fuzzer generated malformed program");
 	}
 

From f0f46a12afb926fb25742b61e5879efb3c98d605 Mon Sep 17 00:00:00 2001
From: Nathaniel Jensen <nathaniel@sigmaprime.io>
Date: Wed, 21 Sep 2022 17:50:29 +1000
Subject: [PATCH 0906/1748] Add v0.6.0 change notes for inline assembly opcode
 syntax changes.

---
 docs/060-breaking-changes.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/060-breaking-changes.rst b/docs/060-breaking-changes.rst
index 915a9f3352..4f5571d54a 100644
--- a/docs/060-breaking-changes.rst
+++ b/docs/060-breaking-changes.rst
@@ -53,6 +53,8 @@ For most of the topics the compiler will provide suggestions.
   If the name contains a dot, its prefix up to the dot may not conflict with any declaration outside the inline
   assembly block.
 
+* In inline assembly, opcodes that do not take arguments are now represented as "built-in functions" instead of standalone identifiers. So ``gas`` is now ``gas()``.
+
 * State variable shadowing is now disallowed.  A derived contract can only
   declare a state variable ``x``, if there is no visible state variable with
   the same name in any of its bases.
@@ -174,3 +176,6 @@ This section gives detailed instructions on how to update prior code for every b
   ``override`` to every overriding function. For multiple inheritance, add ``override(A, B, ..)``,
   where you list all contracts that define the overridden function in the parentheses. When
   multiple bases define the same function, the inheriting contract must override all conflicting functions.
+
+* In inline assembly, add ``()`` to all opcodes that do not otherwise accept an argument.
+  For example, change ``pc`` to ``pc()``, and ``gas`` to ``gas()``.

From 4e929ee1459f9ce14cdf211c1d9636251dce7fe9 Mon Sep 17 00:00:00 2001
From: Miles Liu <miles@bung.cc>
Date: Wed, 21 Sep 2022 21:23:05 +0800
Subject: [PATCH 0907/1748] Fix stripping in CLI tests does not produce correct
 JSON formatting

---
 test/cmdlineTests.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 7728f1f6de..b320da05e0 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -192,9 +192,9 @@ function test_solc_behaviour
 import re, sys
 json = open("$stdout_path", "r").read()
 json = re.sub(r"{[^{}]*Warning: This is a pre-release compiler version[^{}]*},?", "", json)
-json = re.sub(r"},\s*]", "}]", json)                  # },] -> }]
-json = re.sub(r"\"errors\":\s*\[\s*\],?\s*","",json)  # Remove "errors" array if it's not empty
-json = re.sub("\n\\s+\n", "\n\n", json)               # Remove any leftover trailing whitespace
+json = re.sub(r"\"errors\":\s*\[\s*\],?\s*","",json)    # Remove "errors" array if it's not empty
+json = re.sub("\n\\s+\n", "\n\n", json)                 # Remove trailing whitespace
+json = re.sub(r"},(\n{0,1})\n*(\s*])", r"}\1\2", json)  # },] -> }]
 open("$stdout_path", "w").write(json)
 EOF
         sed -i.bak -E -e 's/ Consider adding \\"pragma solidity \^[0-9.]*;\\"//g' "$stdout_path"

From dad1a56321096cc498f80695b2730cb060686f86 Mon Sep 17 00:00:00 2001
From: Miles Liu <miles@bung.cc>
Date: Thu, 22 Sep 2022 18:10:50 +0800
Subject: [PATCH 0908/1748] Pretty print expected json output of command line
 tests

---
 .../standard_urls_existing_and_missing/args   |  1 +
 .../output.json                               | 20 ++++++++++++-
 test/cmdlineTests/standard_urls_missing/args  |  1 +
 .../standard_urls_missing/output.json         | 28 ++++++++++++++++++-
 4 files changed, 48 insertions(+), 2 deletions(-)
 create mode 100644 test/cmdlineTests/standard_urls_existing_and_missing/args
 create mode 100644 test/cmdlineTests/standard_urls_missing/args

diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/args b/test/cmdlineTests/standard_urls_existing_and_missing/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_urls_existing_and_missing/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/output.json b/test/cmdlineTests/standard_urls_existing_and_missing/output.json
index 8cb0cc4c76..87db5f4db7 100644
--- a/test/cmdlineTests/standard_urls_existing_and_missing/output.json
+++ b/test/cmdlineTests/standard_urls_existing_and_missing/output.json
@@ -1 +1,19 @@
-{"errors":[{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","severity":"warning","type":"Warning"}],"sources":{"url_not_found.sol":{"id":0}}}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
+            "message": "Cannot import url (\"standard_urls_existing_and_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "url_not_found.sol":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_urls_missing/args b/test/cmdlineTests/standard_urls_missing/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/standard_urls_missing/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_urls_missing/output.json b/test/cmdlineTests/standard_urls_missing/output.json
index 2bead4831d..267618ee93 100644
--- a/test/cmdlineTests/standard_urls_missing/output.json
+++ b/test/cmdlineTests/standard_urls_missing/output.json
@@ -1 +1,27 @@
-{"errors":[{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".","severity":"error","type":"IOError"},{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".","severity":"error","type":"IOError"},{"component":"general","formattedMessage":"Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".","message":"Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".","severity":"error","type":"IOError"}],"sources":{}}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
+            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract-1.sol\"): File not found. Searched the following locations: \"\".",
+            "severity": "error",
+            "type": "IOError"
+        },
+        {
+            "component": "general",
+            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".",
+            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract.sol\"): File not found. Searched the following locations: \"\".",
+            "severity": "error",
+            "type": "IOError"
+        },
+        {
+            "component": "general",
+            "formattedMessage": "Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".",
+            "message": "Cannot import url (\"standard_urls_missing/non-existent-contract-2.sol\"): File not found. Searched the following locations: \"\".",
+            "severity": "error",
+            "type": "IOError"
+        }
+    ],
+    "sources": {}
+}

From e2767363db807e435536170b5bfba2005dc9eb1d Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 8 Sep 2022 10:53:52 +0200
Subject: [PATCH 0909/1748] Add workflow to label, comment and close stale pull
 requests
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <cameel2@gmail.com>
Co-authored-by: Daniel Kirchner <daniel@ekpyron.org>
---
 .github/workflows/stale-pull-requests.yml | 39 +++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 .github/workflows/stale-pull-requests.yml

diff --git a/.github/workflows/stale-pull-requests.yml b/.github/workflows/stale-pull-requests.yml
new file mode 100644
index 0000000000..74f1b69cd1
--- /dev/null
+++ b/.github/workflows/stale-pull-requests.yml
@@ -0,0 +1,39 @@
+name: Check stale pull requests
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: '0 12 * * *'
+
+permissions:
+  issues: read
+  pull-requests: write
+
+env:
+  BEFORE_STALE: 14
+  BEFORE_CLOSE: 7
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v5
+        with:
+          debug-only: true
+          # disable issues
+          days-before-issue-stale: -1
+          days-before-issue-close: -1
+          stale-pr-message: |
+            This pull request is stale because it has been open for ${{ env.BEFORE_STALE }} days with no activity.
+            It will be closed in ${{ env.BEFORE_CLOSE }} days unless the `stale` label is removed.
+          close-pr-message: |
+            This pull request was closed due to a lack of activity for ${{ env.BEFORE_CLOSE }} days after it was stale.
+          stale-pr-label: stale
+          close-pr-label: closed-due-inactivity
+          days-before-pr-stale: ${{ env.BEFORE_STALE }}
+          days-before-pr-close: ${{ env.BEFORE_CLOSE }}
+          exempt-pr-labels: 'external contribution'
+          exempt-draft-pr: true
+          exempt-all-milestones: true
+          remove-stale-when-updated: true
+          operations-per-run: 60

From c2a9e36c5cf4afed7d716086419b3f9412dd716f Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 23 Sep 2022 09:44:45 +0200
Subject: [PATCH 0910/1748] Add code style rule for std:: qualifier

---
 CODING_STYLE.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CODING_STYLE.md b/CODING_STYLE.md
index 674c2addd1..e9c2e4ad33 100644
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -55,6 +55,7 @@ To set indentation and tab width settings uniformly, the repository contains an
 3. All symbols should be declared in a namespace except for final applications.
 4. Use anonymous namespaces for helpers whose scope is a cpp file only.
 5. Preprocessor symbols should be prefixed with the namespace in all-caps and an underscore.
+6. Do not use `std::` qualifier in cpp files (see 2.), except for `std::move`, which will otherwise cause the `check_style` step to fail.
 
 Only in the header:
 ```cpp

From e3c7369413c3cde5c703b33a837ba6cd52fd301f Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 16 Sep 2022 12:57:29 +0200
Subject: [PATCH 0911/1748] EVMHost: Simplify some code and dcoument functions

---
 test/EVMHost.cpp |  7 +++++--
 test/EVMHost.h   | 16 +++++++++++-----
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 118a517fba..dd487b67bb 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -37,8 +37,6 @@ using namespace solidity::util;
 using namespace solidity::test;
 using namespace evmc::literals;
 
-using StorageMap = std::map<evmc::bytes32, evmc::storage_value>;
-
 evmc::VM& EVMHost::getVM(string const& _path)
 {
 	static evmc::VM NullVM{nullptr};
@@ -205,6 +203,8 @@ void EVMHost::recordCalls(evmc_message const& _message) noexcept
 		recorded_calls.emplace_back(_message);
 }
 
+// NOTE: this is used for both internal and external calls.
+// External calls are triggered from ExecutionFramework and contain only EVMC_CREATE or EVMC_CALL.
 evmc::result EVMHost::call(evmc_message const& _message) noexcept
 {
 	recordCalls(_message);
@@ -408,6 +408,7 @@ evmc::result EVMHost::precompileSha256(evmc_message const& _message) noexcept
 	));
 
 	evmc::result result({});
+	result.status_code = EVMC_SUCCESS;
 	result.gas_left = _message.gas;
 	result.output_data = hash.data();
 	result.output_size = hash.size();
@@ -485,7 +486,9 @@ evmc::result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
 	// static data so that we do not need a release routine...
 	bytes static data;
 	data = bytes(_message.input_data, _message.input_data + _message.input_size);
+
 	evmc::result result({});
+	result.status_code = EVMC_SUCCESS;
 	result.gas_left = _message.gas;
 	result.output_data = data.data();
 	result.output_size = data.size();
diff --git a/test/EVMHost.h b/test/EVMHost.h
index bd085b7c50..e91f252ab9 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -35,6 +35,7 @@
 namespace solidity::test
 {
 using Address = util::h160;
+using StorageMap = std::map<evmc::bytes32, evmc::storage_value>;
 
 class EVMHost: public evmc::MockedHost
 {
@@ -55,9 +56,10 @@ class EVMHost: public evmc::MockedHost
 
 	explicit EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm);
 
+	/// Reset entire state (including accounts).
 	void reset();
-	/// Clears EIP-2929 account and storage access indicator
-	void resetWarmAccess();
+
+	/// Start new block.
 	void newBlock()
 	{
 		tx_context.block_number++;
@@ -67,7 +69,7 @@ class EVMHost: public evmc::MockedHost
 	}
 
 	/// @returns contents of storage at @param _addr.
-	std::map<evmc::bytes32, evmc::storage_value> const& get_address_storage(evmc::address const& _addr);
+	StorageMap const& get_address_storage(evmc::address const& _addr);
 
 	bool account_exists(evmc::address const& _addr) const noexcept final
 	{
@@ -94,8 +96,12 @@ class EVMHost: public evmc::MockedHost
 private:
 	evmc::address m_currentAddress = {};
 
+	/// Transfer value between accounts. Checks for sufficient balance.
 	void transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recipient, u256 const& _value) noexcept;
 
+	/// Clears EIP-2929 account and storage access indicator
+	void resetWarmAccess();
+
 	/// Records calls made via @param _message.
 	void recordCalls(evmc_message const& _message) noexcept;
 
@@ -113,9 +119,9 @@ class EVMHost: public evmc::MockedHost
 	static evmc::result resultWithGas(evmc_message const& _message, bytes const& _data) noexcept;
 
 	evmc::VM& m_vm;
-	// EVM version requested by the testing tool
+	/// EVM version requested by the testing tool
 	langutil::EVMVersion m_evmVersion;
-	// EVM version requested from EVMC (matches the above)
+	/// EVM version requested from EVMC (matches the above)
 	evmc_revision m_evmRevision;
 };
 

From a260000a165b5320f201dc14e208a8f2ef6c0dc1 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Sun, 25 Sep 2022 18:22:34 +0200
Subject: [PATCH 0912/1748] EVMHost: Make it clear which MockedHost helpers are
 used

And also remove unused helpers.
---
 test/EVMHost.cpp |  1 +
 test/EVMHost.h   | 37 ++++++++++++++++++-------------------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index dd487b67bb..66a532a25a 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -190,6 +190,7 @@ void EVMHost::transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recip
 void EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _beneficiary) noexcept
 {
 	// TODO actual selfdestruct is even more complicated.
+	// TODO reuse MockedHost::selfdestruct.
 
 	transfer(accounts[_addr], accounts[_beneficiary], convertFromEVMC(accounts[_addr].balance));
 	accounts.erase(_addr);
diff --git a/test/EVMHost.h b/test/EVMHost.h
index e91f252ab9..c8005f7217 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -40,8 +40,25 @@ using StorageMap = std::map<evmc::bytes32, evmc::storage_value>;
 class EVMHost: public evmc::MockedHost
 {
 public:
-	using MockedHost::get_code_size;
+	// Verbatim features of MockedHost.
+	using MockedHost::account_exists;
+	using MockedHost::get_storage;
+	using MockedHost::set_storage;
 	using MockedHost::get_balance;
+	using MockedHost::get_code_size;
+	using MockedHost::get_code_hash;
+	using MockedHost::copy_code;
+	using MockedHost::get_tx_context;
+	using MockedHost::emit_log;
+	using MockedHost::access_account;
+	using MockedHost::access_storage;
+
+	// Modified features of MockedHost.
+	void selfdestruct(evmc::address const& _addr, evmc::address const& _beneficiary) noexcept final;
+	evmc::result call(evmc_message const& _message) noexcept final;
+	evmc::bytes32 get_block_hash(int64_t number) const noexcept final;
+
+	// Solidity testing specific features.
 
 	/// Tries to dynamically load an evmc vm supporting evm1 or ewasm and caches the loaded VM.
 	/// @returns vmc::VM(nullptr) on failure.
@@ -71,28 +88,10 @@ class EVMHost: public evmc::MockedHost
 	/// @returns contents of storage at @param _addr.
 	StorageMap const& get_address_storage(evmc::address const& _addr);
 
-	bool account_exists(evmc::address const& _addr) const noexcept final
-	{
-		return evmc::MockedHost::account_exists(_addr);
-	}
-
-	void selfdestruct(evmc::address const& _addr, evmc::address const& _beneficiary) noexcept final;
-
-	evmc::result call(evmc_message const& _message) noexcept final;
-
-	evmc::bytes32 get_block_hash(int64_t number) const noexcept final;
-
 	static Address convertFromEVMC(evmc::address const& _addr);
 	static evmc::address convertToEVMC(Address const& _addr);
 	static util::h256 convertFromEVMC(evmc::bytes32 const& _data);
 	static evmc::bytes32 convertToEVMC(util::h256 const& _data);
-
-	/// @returns true, if the evmc VM has the given capability.
-	bool hasCapability(evmc_capabilities capability) const noexcept
-	{
-		return m_vm.has_capability(capability);
-	}
-
 private:
 	evmc::address m_currentAddress = {};
 

From d07c596f42db3efec8e1641b66e5e3b24e03a588 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Mon, 19 Sep 2022 14:47:28 +0200
Subject: [PATCH 0913/1748] Renaming lspAssert to lspRequire plus adding some
 documentation to make it more clear what this function is supposed to be used
 for.

---
 libsolidity/lsp/FileRepository.cpp |  2 +-
 libsolidity/lsp/LanguageServer.cpp | 18 +++++++++---------
 libsolidity/lsp/Transport.h        |  9 ++++++++-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/libsolidity/lsp/FileRepository.cpp b/libsolidity/lsp/FileRepository.cpp
index 4e8ebbb123..ca40343af3 100644
--- a/libsolidity/lsp/FileRepository.cpp
+++ b/libsolidity/lsp/FileRepository.cpp
@@ -88,7 +88,7 @@ string FileRepository::sourceUnitNameToUri(string const& _sourceUnitName) const
 
 string FileRepository::uriToSourceUnitName(string const& _path) const
 {
-	lspAssert(boost::algorithm::starts_with(_path, "file://"), ErrorCode::InternalError, "URI must start with file://");
+	lspRequire(boost::algorithm::starts_with(_path, "file://"), ErrorCode::InternalError, "URI must start with file://");
 	return stripFileUriSchemePrefix(_path);
 }
 
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 1a1f5faf0a..f868a022ae 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -183,7 +183,7 @@ void LanguageServer::changeConfiguration(Json::Value const& _settings)
 		else if (text == "directly-opened-and-on-import")
 			m_fileLoadStrategy = FileLoadStrategy::DirectlyOpenedAndOnImported;
 		else
-			lspAssert(false, ErrorCode::InvalidParams, "Invalid file load strategy: " + text);
+			lspRequire(false, ErrorCode::InvalidParams, "Invalid file load strategy: " + text);
 	}
 
 	m_settingsObject = _settings;
@@ -366,7 +366,7 @@ bool LanguageServer::run()
 
 void LanguageServer::requireServerInitialized()
 {
-	lspAssert(
+	lspRequire(
 		m_state == State::Initialized,
 		ErrorCode::ServerNotInitialized,
 		"Server is not properly initialized."
@@ -375,7 +375,7 @@ void LanguageServer::requireServerInitialized()
 
 void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 {
-	lspAssert(
+	lspRequire(
 		m_state == State::Started,
 		ErrorCode::RequestFailed,
 		"Initialize called at the wrong time."
@@ -389,7 +389,7 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	if (Json::Value uri = _args["rootUri"])
 	{
 		rootPath = uri.asString();
-		lspAssert(
+		lspRequire(
 			boost::starts_with(rootPath, "file://"),
 			ErrorCode::InvalidParams,
 			"rootUri only supports file URI scheme."
@@ -471,7 +471,7 @@ void LanguageServer::handleTextDocumentDidOpen(Json::Value const& _args)
 {
 	requireServerInitialized();
 
-	lspAssert(
+	lspRequire(
 		_args["textDocument"],
 		ErrorCode::RequestFailed,
 		"Text document parameter missing."
@@ -492,14 +492,14 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 
 	for (Json::Value jsonContentChange: _args["contentChanges"])
 	{
-		lspAssert(
+		lspRequire(
 			jsonContentChange.isObject(),
 			ErrorCode::RequestFailed,
 			"Invalid content reference."
 		);
 
 		string const sourceUnitName = m_fileRepository.uriToSourceUnitName(uri);
-		lspAssert(
+		lspRequire(
 			m_fileRepository.sourceUnits().count(sourceUnitName),
 			ErrorCode::RequestFailed,
 			"Unknown file: " + uri
@@ -509,7 +509,7 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 		if (jsonContentChange["range"].isObject()) // otherwise full content update
 		{
 			optional<SourceLocation> change = parseRange(m_fileRepository, sourceUnitName, jsonContentChange["range"]);
-			lspAssert(
+			lspRequire(
 				change && change->hasText(),
 				ErrorCode::RequestFailed,
 				"Invalid source range: " + util::jsonCompactPrint(jsonContentChange["range"])
@@ -529,7 +529,7 @@ void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
 {
 	requireServerInitialized();
 
-	lspAssert(
+	lspRequire(
 		_args["textDocument"],
 		ErrorCode::RequestFailed,
 		"Text document parameter missing."
diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h
index 8aa89b3d28..3e94e03981 100644
--- a/libsolidity/lsp/Transport.h
+++ b/libsolidity/lsp/Transport.h
@@ -71,7 +71,14 @@ class RequestError: public util::Exception
 	ErrorCode m_code;
 };
 
-#define lspAssert(condition, errorCode, errorMessage) \
+/**
+ * Ensures precondition check is valid.
+ * This is supposed to be a recoverable error, that means, if the condition fails to be valid,
+ * an exception is being raised to be thrown out of the current request handlers
+ * of the current LSP's client RPC call and this will cause the current request to fail
+ * with the given error code - but subsequent calls shall be able to continue.
+ */
+#define lspRequire(condition, errorCode, errorMessage) \
 	if (!(condition)) \
 	{ \
 		BOOST_THROW_EXCEPTION( \

From c967a621eba240bce42deaf24ec7b3f71ac8031d Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Mon, 26 Sep 2022 15:02:05 +0200
Subject: [PATCH 0914/1748] EVMHost: Reduce code duplication in precompiles

---
 test/EVMHost.cpp | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 66a532a25a..30b584a904 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -394,8 +394,14 @@ evmc::result EVMHost::precompileECRecover(evmc_message const& _message) noexcept
 		}
 	};
 	evmc::result result = precompileGeneric(_message, inputOutput);
-	result.status_code = EVMC_SUCCESS;
-	result.gas_left = _message.gas;
+	// ECRecover will return success with empty response in case of failure
+	if (result.status_code != EVMC_SUCCESS)
+	{
+		result.status_code = EVMC_SUCCESS;
+		result.gas_left = _message.gas;
+		result.output_data = {};
+		result.output_size = 0;
+	}
 	return result;
 }
 
@@ -408,12 +414,7 @@ evmc::result EVMHost::precompileSha256(evmc_message const& _message) noexcept
 		_message.input_data + _message.input_size
 	));
 
-	evmc::result result({});
-	result.status_code = EVMC_SUCCESS;
-	result.gas_left = _message.gas;
-	result.output_data = hash.data();
-	result.output_size = hash.size();
-	return result;
+	return resultWithGas(_message, hash);
 }
 
 evmc::result EVMHost::precompileRipeMD160(evmc_message const& _message) noexcept
@@ -488,12 +489,7 @@ evmc::result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
 	bytes static data;
 	data = bytes(_message.input_data, _message.input_data + _message.input_size);
 
-	evmc::result result({});
-	result.status_code = EVMC_SUCCESS;
-	result.gas_left = _message.gas;
-	result.output_data = data.data();
-	result.output_size = data.size();
-	return result;
+	return resultWithGas(_message, data);
 }
 
 evmc::result EVMHost::precompileModExp(evmc_message const&) noexcept

From f96e802e7418cc52581de58128b31284c56fe1a3 Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Tue, 12 Jul 2022 00:50:32 +0200
Subject: [PATCH 0915/1748] Add `--no-append-metadata` in CLI and
 `metadata.append` in JSON

Skips appending metadata to the binary
---
 libsolidity/interface/CompilerStack.cpp    |  4 ++++
 libsolidity/interface/CompilerStack.h      |  7 ++++++-
 libsolidity/interface/StandardCompiler.cpp | 11 ++++++++++-
 libsolidity/interface/StandardCompiler.h   |  1 +
 solc/CommandLineInterface.cpp              |  1 +
 solc/CommandLineParser.cpp                 | 22 ++++++++++++++++++++++
 solc/CommandLineParser.h                   |  1 +
 7 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 1096501303..41574ce07e 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -308,6 +308,7 @@ void CompilerStack::reset(bool _keepSettings)
 		m_revertStrings = RevertStrings::Default;
 		m_optimiserSettings = OptimiserSettings::minimal();
 		m_metadataLiteralSources = false;
+		m_metadataFormat = defaultMetadataFormat();
 		m_metadataHash = MetadataHash::IPFS;
 		m_stopAfter = State::CompilationSuccessful;
 	}
@@ -1548,6 +1549,9 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 	if (m_revertStrings != RevertStrings::Default)
 		meta["settings"]["debug"]["revertStrings"] = revertStringsToString(m_revertStrings);
 
+	if (m_metadataFormat == MetadataFormat::NoMetadata)
+		meta["settings"]["metadata"]["appendCBOR"] = false;
+
 	if (m_metadataLiteralSources)
 		meta["settings"]["metadata"]["useLiteralContent"] = true;
 
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index e5bc9b3458..e267152df7 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -349,6 +349,11 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// caused by differences in metadata. Should only be used for testing.
 	void setMetadataFormat(MetadataFormat _metadataFormat) { m_metadataFormat = _metadataFormat; }
 
+	static MetadataFormat defaultMetadataFormat()
+	{
+		return VersionIsRelease ? MetadataFormat::WithReleaseVersionTag : MetadataFormat::WithPrereleaseVersionTag;
+	}
+
 private:
 	/// The state per source unit. Filled gradually during parsing.
 	struct Source
@@ -515,7 +520,7 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// Whether or not there has been an error during processing.
 	/// If this is true, the stack will refuse to generate code.
 	bool m_hasError = false;
-	MetadataFormat m_metadataFormat = VersionIsRelease ? MetadataFormat::WithReleaseVersionTag : MetadataFormat::WithPrereleaseVersionTag;
+	MetadataFormat m_metadataFormat = defaultMetadataFormat();
 };
 
 }
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 551bd6af7a..15e713d5bb 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -509,6 +509,8 @@ std::optional<Json::Value> checkMetadataKeys(Json::Value const& _input)
 {
 	if (_input.isObject())
 	{
+		if (_input.isMember("appendCBOR") && !_input["appendCBOR"].isBool())
+			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.appendCBOR\" must be Boolean");
 		if (_input.isMember("useLiteralContent") && !_input["useLiteralContent"].isBool())
 			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.useLiteralContent\" must be Boolean");
 
@@ -516,7 +518,7 @@ std::optional<Json::Value> checkMetadataKeys(Json::Value const& _input)
 		if (_input.isMember("bytecodeHash") && !hashes.count(_input["bytecodeHash"].asString()))
 			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.bytecodeHash\" must be \"ipfs\", \"bzzr1\" or \"none\"");
 	}
-	static set<string> keys{"useLiteralContent", "bytecodeHash"};
+	static set<string> keys{"appendCBOR", "useLiteralContent", "bytecodeHash"};
 	return checkKeys(_input, keys, "settings.metadata");
 }
 
@@ -911,6 +913,12 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	if (auto result = checkMetadataKeys(metadataSettings))
 		return *result;
 
+	solAssert(CompilerStack::defaultMetadataFormat() != CompilerStack::MetadataFormat::NoMetadata, "");
+	ret.metadataFormat =
+		metadataSettings.get("appendCBOR", Json::Value(true)).asBool() ?
+		CompilerStack::defaultMetadataFormat() :
+		CompilerStack::MetadataFormat::NoMetadata;
+
 	ret.metadataLiteralSources = metadataSettings.get("useLiteralContent", Json::Value(false)).asBool();
 	if (metadataSettings.isMember("bytecodeHash"))
 	{
@@ -1086,6 +1094,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		compilerStack.selectDebugInfo(_inputsAndSettings.debugInfoSelection.value());
 	compilerStack.setLibraries(_inputsAndSettings.libraries);
 	compilerStack.useMetadataLiteralSources(_inputsAndSettings.metadataLiteralSources);
+	compilerStack.setMetadataFormat(_inputsAndSettings.metadataFormat);
 	compilerStack.setMetadataHash(_inputsAndSettings.metadataHash);
 	compilerStack.setRequestedContractNames(requestedContractNames(_inputsAndSettings.outputSelection));
 	compilerStack.setModelCheckerSettings(_inputsAndSettings.modelCheckerSettings);
diff --git a/libsolidity/interface/StandardCompiler.h b/libsolidity/interface/StandardCompiler.h
index 679e731a2f..3e94f02319 100644
--- a/libsolidity/interface/StandardCompiler.h
+++ b/libsolidity/interface/StandardCompiler.h
@@ -83,6 +83,7 @@ class StandardCompiler
 		std::optional<langutil::DebugInfoSelection> debugInfoSelection;
 		std::map<std::string, util::h160> libraries;
 		bool metadataLiteralSources = false;
+		CompilerStack::MetadataFormat metadataFormat = CompilerStack::defaultMetadataFormat();
 		CompilerStack::MetadataHash metadataHash = CompilerStack::MetadataHash::IPFS;
 		Json::Value outputSelection;
 		ModelCheckerSettings modelCheckerSettings = ModelCheckerSettings{};
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index ccaa8df942..4bc8d5bb42 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -689,6 +689,7 @@ void CommandLineInterface::compile()
 	{
 		if (m_options.metadata.literalSources)
 			m_compiler->useMetadataLiteralSources(true);
+		m_compiler->setMetadataFormat(m_options.metadata.format);
 		m_compiler->setMetadataHash(m_options.metadata.hash);
 		if (m_options.modelChecker.initialize)
 			m_compiler->setModelCheckerSettings(m_options.modelChecker.settings);
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index c6ddfec67f..a2e4a0d661 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -62,6 +62,7 @@ static string const g_strLibraries = "libraries";
 static string const g_strLink = "link";
 static string const g_strLSP = "lsp";
 static string const g_strMachine = "machine";
+static string const g_strNoCBORMetadata = "no-cbor-metadata";
 static string const g_strMetadataHash = "metadata-hash";
 static string const g_strMetadataLiteral = "metadata-literal";
 static string const g_strModelCheckerContracts = "model-checker-contracts";
@@ -240,6 +241,7 @@ bool CommandLineOptions::operator==(CommandLineOptions const& _other) const noex
 		compiler.outputs == _other.compiler.outputs &&
 		compiler.estimateGas == _other.compiler.estimateGas &&
 		compiler.combinedJsonRequests == _other.compiler.combinedJsonRequests &&
+		metadata.format == _other.metadata.format &&
 		metadata.hash == _other.metadata.hash &&
 		metadata.literalSources == _other.metadata.literalSources &&
 		optimizer.enabled == _other.optimizer.enabled &&
@@ -748,6 +750,10 @@ General Information)").c_str(),
 
 	po::options_description metadataOptions("Metadata Options");
 	metadataOptions.add_options()
+		(
+			g_strNoCBORMetadata.c_str(),
+			"Do not append CBOR metadata to the end of the bytecode."
+		)
 		(
 			g_strMetadataHash.c_str(),
 			po::value<string>()->value_name(util::joinHumanReadable(g_metadataHashArgs, ",")),
@@ -922,6 +928,7 @@ void CommandLineParser::processArgs()
 		{g_strExperimentalViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strMetadataLiteral, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strNoCBORMetadata, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strMetadataHash, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerShowUnproved, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerDivModNoSlacks, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
@@ -1221,6 +1228,21 @@ void CommandLineParser::processArgs()
 			solThrow(CommandLineValidationError, "Invalid option for --" + g_strMetadataHash + ": " + hashStr);
 	}
 
+	if (m_args.count(g_strNoCBORMetadata))
+	{
+		if (
+			m_args.count(g_strMetadataHash) &&
+			m_options.metadata.hash != CompilerStack::MetadataHash::None
+		)
+			solThrow(
+				CommandLineValidationError,
+				"Cannot specify a metadata hashing method when --" +
+				g_strNoCBORMetadata + " is set."
+			);
+
+		m_options.metadata.format = CompilerStack::MetadataFormat::NoMetadata;
+	}
+
 	if (m_args.count(g_strModelCheckerContracts))
 	{
 		string contractsStr = m_args[g_strModelCheckerContracts].as<string>();
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 108a16cd23..d695a6eb69 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -215,6 +215,7 @@ struct CommandLineOptions
 
 	struct
 	{
+		CompilerStack::MetadataFormat format = CompilerStack::defaultMetadataFormat();
 		CompilerStack::MetadataHash hash = CompilerStack::MetadataHash::IPFS;
 		bool literalSources = false;
 	} metadata;

From d32661c0afa181a587734b99e7dae49d0dc29ab1 Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Mon, 25 Jul 2022 00:22:56 +0200
Subject: [PATCH 0916/1748] Added tests for --no-append-metadata

- Command line tests
- Documented the standard json
- Changelog
- A Change in SolidityExecutionFramework to prevent flaky gas tests
- A boost test for --no-append-metadata
- Removed an outdated comment
---
 Changelog.md                                  |  2 ++
 docs/metadata.rst                             |  4 +++
 docs/using-the-compiler.rst                   |  3 ++
 libsolidity/interface/CompilerStack.h         |  2 --
 .../metadata_append_standard_json/args        |  1 +
 .../metadata_append_standard_json/input.json  | 28 +++++++++++++++++
 .../metadata_append_standard_json/output.json | 30 +++++++++++++++++++
 .../no_append_incorrect_combination/args      |  1 +
 .../no_append_incorrect_combination/err       |  1 +
 .../no_append_incorrect_combination/exit      |  1 +
 .../no_append_incorrect_combination/input.sol | 10 +++++++
 test/cmdlineTests/no_append_metadata/args     |  1 +
 .../cmdlineTests/no_append_metadata/input.sol | 10 +++++++
 test/cmdlineTests/no_append_metadata/output   |  4 +++
 test/libsolidity/GasCosts.cpp                 |  1 +
 test/libsolidity/SemanticTest.cpp             |  2 +-
 .../SolidityExecutionFramework.cpp            |  3 ++
 test/libsolidity/SolidityExecutionFramework.h | 11 +++++--
 test/solc/CommandLineParser.cpp               |  9 ++++++
 19 files changed, 119 insertions(+), 5 deletions(-)
 create mode 100644 test/cmdlineTests/metadata_append_standard_json/args
 create mode 100644 test/cmdlineTests/metadata_append_standard_json/input.json
 create mode 100644 test/cmdlineTests/metadata_append_standard_json/output.json
 create mode 100644 test/cmdlineTests/no_append_incorrect_combination/args
 create mode 100644 test/cmdlineTests/no_append_incorrect_combination/err
 create mode 100644 test/cmdlineTests/no_append_incorrect_combination/exit
 create mode 100644 test/cmdlineTests/no_append_incorrect_combination/input.sol
 create mode 100644 test/cmdlineTests/no_append_metadata/args
 create mode 100644 test/cmdlineTests/no_append_metadata/input.sol
 create mode 100644 test/cmdlineTests/no_append_metadata/output

diff --git a/Changelog.md b/Changelog.md
index 84aa530232..98b36aab84 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,8 @@ Language Features:
 
 
 Compiler Features:
+* Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
+* Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
 * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
 
 
diff --git a/docs/metadata.rst b/docs/metadata.rst
index 317ad2204b..f2fffc0dd2 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -220,6 +220,10 @@ Whereas release builds of solc use a 3 byte encoding of the version as shown
 above (one byte each for major, minor and patch version number), prerelease builds
 will instead use a complete version string including commit hash and build date.
 
+The commandline flag ``--no-cbor-metadata`` can be used to skip metadata
+from getting appended at the end of the deployed bytecode. Equivalently, the
+boolean field ``settings.metadata.appendCBOR`` in Standard JSON input can be set to false.
+
 .. note::
   The CBOR mapping can also contain other keys, so it is better to fully
   decode the data instead of relying on it starting with ``0xa264``.
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index d6bf94a2cb..cf5e1b7688 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -323,6 +323,9 @@ Input Description
         },
         // Metadata settings (optional)
         "metadata": {
+          // The CBOR metadata is appended at the end of the bytecode by default.
+          // Setting this to false omits the metadata from the runtime and deploy time code.
+          "appendCBOR": true,
           // Use only literal content and not URLs (false by default)
           "useLiteralContent": true,
           // Use the given hash method for the metadata hash that is appended to the bytecode.
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index e267152df7..2f95246598 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -345,8 +345,6 @@ class CompilerStack: public langutil::CharStreamProvider
 	Json::Value gasEstimates(std::string const& _contractName) const;
 
 	/// Changes the format of the metadata appended at the end of the bytecode.
-	/// This is mostly a workaround to avoid bytecode and gas differences between compiler builds
-	/// caused by differences in metadata. Should only be used for testing.
 	void setMetadataFormat(MetadataFormat _metadataFormat) { m_metadataFormat = _metadataFormat; }
 
 	static MetadataFormat defaultMetadataFormat()
diff --git a/test/cmdlineTests/metadata_append_standard_json/args b/test/cmdlineTests/metadata_append_standard_json/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/metadata_append_standard_json/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/metadata_append_standard_json/input.json b/test/cmdlineTests/metadata_append_standard_json/input.json
new file mode 100644
index 0000000000..493325506d
--- /dev/null
+++ b/test/cmdlineTests/metadata_append_standard_json/input.json
@@ -0,0 +1,28 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {}"
+		}
+	},
+	"settings":
+	{
+		"viaIR": true,
+		"optimizer": {
+			"enabled": true
+		},
+		"metadata":
+		{
+			"appendCBOR": false
+		},
+		"outputSelection":
+		{
+			"A":
+			{
+				"test": ["evm.bytecode"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/metadata_append_standard_json/output.json b/test/cmdlineTests/metadata_append_standard_json/output.json
new file mode 100644
index 0000000000..990217c9e4
--- /dev/null
+++ b/test/cmdlineTests/metadata_append_standard_json/output.json
@@ -0,0 +1,30 @@
+{
+    "contracts":
+    {
+        "A":
+        {
+            "test":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "linkReferences": {},
+                        "object": "608080604052346013576004908160198239f35b600080fdfe600080fd",
+                        "opcodes": "PUSH1 0x80 DUP1 PUSH1 0x40 MSTORE CALLVALUE PUSH1 0x13 JUMPI PUSH1 0x4 SWAP1 DUP2 PUSH1 0x19 DUP3 CODECOPY RETURN JUMPDEST PUSH1 0x0 DUP1 REVERT INVALID PUSH1 0x0 DUP1 REVERT ",
+                        "sourceMap": "60:16:0:-:0;;;;;;;;;;;;;;;;;"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/no_append_incorrect_combination/args b/test/cmdlineTests/no_append_incorrect_combination/args
new file mode 100644
index 0000000000..eb524931d9
--- /dev/null
+++ b/test/cmdlineTests/no_append_incorrect_combination/args
@@ -0,0 +1 @@
+--no-cbor-metadata --metadata-hash ipfs
diff --git a/test/cmdlineTests/no_append_incorrect_combination/err b/test/cmdlineTests/no_append_incorrect_combination/err
new file mode 100644
index 0000000000..e1b8c7d356
--- /dev/null
+++ b/test/cmdlineTests/no_append_incorrect_combination/err
@@ -0,0 +1 @@
+Cannot specify a metadata hashing method when --no-cbor-metadata is set.
diff --git a/test/cmdlineTests/no_append_incorrect_combination/exit b/test/cmdlineTests/no_append_incorrect_combination/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/no_append_incorrect_combination/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/no_append_incorrect_combination/input.sol b/test/cmdlineTests/no_append_incorrect_combination/input.sol
new file mode 100644
index 0000000000..f22a20f189
--- /dev/null
+++ b/test/cmdlineTests/no_append_incorrect_combination/input.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >= 0.0.0;
+
+contract Empty {}
+
+contract C {
+    function f() external returns (bytes memory, bytes memory){
+        return (type(Empty).creationCode, type(Empty).runtimeCode);
+    }
+}
diff --git a/test/cmdlineTests/no_append_metadata/args b/test/cmdlineTests/no_append_metadata/args
new file mode 100644
index 0000000000..428810db52
--- /dev/null
+++ b/test/cmdlineTests/no_append_metadata/args
@@ -0,0 +1 @@
+--no-cbor-metadata --bin --via-ir --optimize
diff --git a/test/cmdlineTests/no_append_metadata/input.sol b/test/cmdlineTests/no_append_metadata/input.sol
new file mode 100644
index 0000000000..4ed3a2455a
--- /dev/null
+++ b/test/cmdlineTests/no_append_metadata/input.sol
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >= 0.0.0;
+
+// NOTE: The expected output would be the binary with no metadata.
+// The commandline tests would replace bytecode with metadata in it with
+// <BYTECODE REMOVED>
+// Therefore, not having that means success!
+
+contract C {
+}
diff --git a/test/cmdlineTests/no_append_metadata/output b/test/cmdlineTests/no_append_metadata/output
new file mode 100644
index 0000000000..8691c5faec
--- /dev/null
+++ b/test/cmdlineTests/no_append_metadata/output
@@ -0,0 +1,4 @@
+
+======= no_append_metadata/input.sol:C =======
+Binary:
+608080604052346013576004908160198239f35b600080fdfe600080fd
diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp
index b3fb9d8b70..1d67281ccc 100644
--- a/test/libsolidity/GasCosts.cpp
+++ b/test/libsolidity/GasCosts.cpp
@@ -92,6 +92,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
 		}
 	)";
 	m_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
+	m_appendCBORMetadata = false;
 	compileAndRun(sourceCode);
 
 	auto evmVersion = solidity::test::CommonOptions::get().evmVersion();
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 9cf2b8d521..0749f57148 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -53,7 +53,7 @@ SemanticTest::SemanticTest(
 	bool _enforceGasCost,
 	u256 _enforceGasCostMinValue
 ):
-	SolidityExecutionFramework(_evmVersion, _vmPaths),
+	SolidityExecutionFramework(_evmVersion, _vmPaths, false),
 	EVMVersionRestrictedTestCase(_filename),
 	m_sources(m_reader.sources()),
 	m_lineOffset(m_reader.lineNumber()),
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index cb47cf45e8..0450f290ae 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -62,6 +62,9 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 	m_compiler.enableEvmBytecodeGeneration(!m_compileViaYul);
 	m_compiler.enableIRGeneration(m_compileViaYul);
 	m_compiler.setRevertStringBehaviour(m_revertStrings);
+	if (!m_appendCBORMetadata) {
+		m_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
+	}
 	m_compiler.setMetadataHash(m_metadataHash);
 	if (!m_compiler.compile())
 	{
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
index dfa4951529..a273f2ad1c 100644
--- a/test/libsolidity/SolidityExecutionFramework.h
+++ b/test/libsolidity/SolidityExecutionFramework.h
@@ -40,8 +40,14 @@ class SolidityExecutionFramework: public solidity::test::ExecutionFramework
 
 public:
 	SolidityExecutionFramework(): m_showMetadata(solidity::test::CommonOptions::get().showMetadata) {}
-	explicit SolidityExecutionFramework(langutil::EVMVersion _evmVersion, std::vector<boost::filesystem::path> const& _vmPaths):
-		ExecutionFramework(_evmVersion, _vmPaths), m_showMetadata(solidity::test::CommonOptions::get().showMetadata)
+	explicit SolidityExecutionFramework(
+		langutil::EVMVersion _evmVersion,
+		std::vector<boost::filesystem::path> const& _vmPaths,
+		bool _appendCBORMetadata = true
+	):
+		ExecutionFramework(_evmVersion, _vmPaths),
+		m_showMetadata(solidity::test::CommonOptions::get().showMetadata),
+		m_appendCBORMetadata(_appendCBORMetadata)
 	{}
 
 	bytes const& compileAndRunWithoutCheck(
@@ -80,6 +86,7 @@ class SolidityExecutionFramework: public solidity::test::ExecutionFramework
 	bool m_compileViaYul = false;
 	bool m_compileToEwasm = false;
 	bool m_showMetadata = false;
+	bool m_appendCBORMetadata = true;
 	CompilerStack::MetadataHash m_metadataHash = CompilerStack::MetadataHash::IPFS;
 	RevertStrings m_revertStrings = RevertStrings::Default;
 };
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 5440218867..61e99f0423 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -224,6 +224,15 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(no_cbor_metadata)
+{
+	vector<string> commandLine = {"solc", "--no-cbor-metadata", "contract.sol"};
+	CommandLineOptions parsedOptions = parseCommandLine(commandLine);
+	bool assert = parsedOptions.metadata.format == CompilerStack::MetadataFormat::NoMetadata;
+
+	BOOST_TEST(assert);
+}
+
 BOOST_AUTO_TEST_CASE(via_ir_options)
 {
 	BOOST_TEST(!parseCommandLine({"solc", "contract.sol"}).output.viaIR);

From f40d1d654dea2366399b4fb52db4d67190c719a6 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Mon, 26 Sep 2022 20:41:16 +0200
Subject: [PATCH 0917/1748] EVMHost: Add size%192 check to bn128pairing

And also refactor resultWithFailure
---
 test/EVMHost.cpp | 22 ++++++++++++++--------
 test/EVMHost.h   |  1 +
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 30b584a904..a079cd217d 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -495,9 +495,7 @@ evmc::result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
 evmc::result EVMHost::precompileModExp(evmc_message const&) noexcept
 {
 	// TODO implement
-	evmc::result result({});
-	result.status_code = EVMC_FAILURE;
-	return result;
+	return resultWithFailure();
 }
 
 evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noexcept
@@ -773,6 +771,11 @@ evmc::result EVMHost::precompileALTBN128G1Mul(evmc_message const& _message) noex
 
 evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _message) noexcept
 {
+	// Input must be divisible by 192.
+	// TODO: validate points
+	if (_message.input_size % 192)
+		return resultWithFailure();
+
 	// This is a partial implementation - it always returns "success"
 	bytes static data = fromHex("0000000000000000000000000000000000000000000000000000000000000001");
 	return resultWithGas(_message, data);
@@ -786,11 +789,14 @@ evmc::result EVMHost::precompileGeneric(
 	if (_inOut.count(input))
 		return resultWithGas(_message, _inOut.at(input));
 	else
-	{
-		evmc::result result({});
-		result.status_code = EVMC_FAILURE;
-		return result;
-	}
+		return resultWithFailure();
+}
+
+evmc::result EVMHost::resultWithFailure() noexcept
+{
+	evmc::result result({});
+	result.status_code = EVMC_FAILURE;
+	return result;
 }
 
 evmc::result EVMHost::resultWithGas(
diff --git a/test/EVMHost.h b/test/EVMHost.h
index c8005f7217..bf0930512b 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -116,6 +116,7 @@ class EVMHost: public evmc::MockedHost
 	/// @returns a result object with no gas usage and result data taken from @a _data.
 	/// @note The return value is only valid as long as @a _data is alive!
 	static evmc::result resultWithGas(evmc_message const& _message, bytes const& _data) noexcept;
+	static evmc::result resultWithFailure() noexcept;
 
 	evmc::VM& m_vm;
 	/// EVM version requested by the testing tool

From 50182d7ee0487d8a4fe625deaa3ae9a408d02187 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Mon, 26 Sep 2022 21:35:25 +0200
Subject: [PATCH 0918/1748] EVMHost: replace precompileALTBN128PairingProduct
 with mapping

---
 test/EVMHost.cpp | 143 ++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 135 insertions(+), 8 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index a079cd217d..78f837d6fc 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -771,14 +771,141 @@ evmc::result EVMHost::precompileALTBN128G1Mul(evmc_message const& _message) noex
 
 evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _message) noexcept
 {
-	// Input must be divisible by 192.
-	// TODO: validate points
-	if (_message.input_size % 192)
-		return resultWithFailure();
-
-	// This is a partial implementation - it always returns "success"
-	bytes static data = fromHex("0000000000000000000000000000000000000000000000000000000000000001");
-	return resultWithGas(_message, data);
+	// NOTE this is a partial implementation for some inputs.
+	static map<bytes, bytes> const inputOutput{
+		{
+			fromHex(
+				"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa9"
+				"01e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c"
+				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
+				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
+				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
+				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
+				"0000000000000000000000000000000000000000000000000000000000000001"
+				"30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45"
+				"0a09ccf561b55fd99d1c1208dee1162457b57ac5af3759d50671e510e428b2a1"
+				"2e539c423b302d13f4e5773c603948eaf5db5df8ae8a9a9113708390a06410d8"
+				"19b763513924a736e4eebd0d78c91c1bc1d657fee4214057d21414011cfcc763"
+				"2f8d9f9ab83727c77a2fec063cb7b6e5eb23044ccf535ad49d46d394fb6f6bf6"
+			),
+			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+		},
+		{
+			fromHex(
+				"0000000000000000000000000000000000000000000000000000000000000001"
+				"0000000000000000000000000000000000000000000000000000000000000002"
+				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
+				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
+				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
+				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
+				"0000000000000000000000000000000000000000000000000000000000000001"
+				"30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd45"
+				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
+				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
+				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
+				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
+			),
+			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+		},
+		{
+			fromHex(
+				"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f59"
+				"3034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41"
+				"209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf7"
+				"04bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a41678"
+				"2bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d"
+				"120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550"
+				"111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c"
+				"2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411"
+				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
+				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
+				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
+				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
+			),
+			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+		},
+		{
+			fromHex(
+				"2eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc02"
+				"03d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db84"
+				"1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee"
+				"2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f"
+				"21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237"
+				"096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f"
+				"06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db9"
+				"22160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1"
+				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
+				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
+				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
+				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
+			),
+			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+		},
+		{
+			fromHex(
+				"0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2"
+				"16da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba"
+				"2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb"
+				"01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb3"
+				"14a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713"
+				"178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee24590"
+				"1b9e027bd5cfc2cb5db82d4dc9677ac795ec500ecd47deee3b5da006d6d049b8"
+				"11d7511c78158de484232fc68daf8a45cf217d1c2fae693ff5871e8752d73b21"
+				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
+				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
+				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
+				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
+			),
+			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+		},
+		{
+			fromHex(
+				"2f2ea0b3da1e8ef11914acf8b2e1b32d99df51f5f4f206fc6b947eae860eddb6"
+				"068134ddb33dc888ef446b648d72338684d678d2eb2371c61a50734d78da4b72"
+				"25f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb1"
+				"22acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d"
+				"065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf68"
+				"06d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb"
+				"186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008"
+				"122ae2b09e539e152ec5364e7e2204b03d11d3caa038bfc7cd499f8176aacbee"
+				"1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e"
+				"283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39"
+				"140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e"
+				"0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd4"
+				"15794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f21"
+				"1b88da1679b0b64a63b7e0e7bfe52aae524f73a55be7fe70c7e9bfc94b4cf0da"
+				"1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee"
+				"2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f"
+				"21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237"
+				"096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f"
+			),
+			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+		},
+		{
+			fromHex(
+				"20a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a"
+				"29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed3021"
+				"1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee"
+				"2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f"
+				"21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237"
+				"096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f"
+				"1abb4a25eb9379ae96c84fff9f0540abcfc0a0d11aeda02d4f37e4baf74cb0c1"
+				"1073b3ff2cdbb38755f8691ea59e9606696b3ff278acfc098fa8226470d03869"
+				"217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac29"
+				"0a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c"
+				"26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a9855"
+				"2fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d7"
+				"0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2"
+				"198a1f162a73261f112401aa2db79c7dab1533c9935c77290a6ce3b191f2318d"
+				"198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c2"
+				"1800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed"
+				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
+				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
+			),
+			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+		}
+	};
+	return precompileGeneric(_message, inputOutput);
 }
 
 evmc::result EVMHost::precompileGeneric(

From 44a2dd864ff69ffc63af9d80dff9e7c514d9fcae Mon Sep 17 00:00:00 2001
From: George Plotnikov <accembler@gmail.com>
Date: Fri, 23 Sep 2022 20:36:57 +0500
Subject: [PATCH 0919/1748] Update CVC4::BitVector ctor call

---
 libsmtutil/CVC4Interface.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsmtutil/CVC4Interface.cpp b/libsmtutil/CVC4Interface.cpp
index ff356c0256..3c047782a4 100644
--- a/libsmtutil/CVC4Interface.cpp
+++ b/libsmtutil/CVC4Interface.cpp
@@ -239,7 +239,7 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 				m_context.mkExpr(
 					CVC4::kind::EQUAL,
 					m_context.mkExpr(CVC4::kind::BITVECTOR_EXTRACT, extractOp, arguments[0]),
-					m_context.mkConst(CVC4::BitVector(1, size_t(0)))
+					m_context.mkConst(CVC4::BitVector(1, uint64_t{0}))
 				),
 				nat,
 				m_context.mkExpr(

From 565423c93461f7e926d834f90dda4f4371d3b1c7 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 27 Sep 2022 02:55:26 +0200
Subject: [PATCH 0920/1748] Replace use of boost::adapters::filtered with
 ranges::views::filter

---
 liblangutil/ErrorReporter.h   | 8 ++++----
 solc/CommandLineInterface.cpp | 1 -
 test/libyul/ObjectParser.cpp  | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/liblangutil/ErrorReporter.h b/liblangutil/ErrorReporter.h
index 67fc76e831..6901e87b94 100644
--- a/liblangutil/ErrorReporter.h
+++ b/liblangutil/ErrorReporter.h
@@ -30,7 +30,8 @@
 #include <liblangutil/SourceLocation.h>
 #include <libsolutil/StringUtils.h>
 
-#include <boost/range/adaptor/filtered.hpp>
+#include <range/v3/range/conversion.hpp>
+#include <range/v3/view/filter.hpp>
 
 namespace solidity::langutil
 {
@@ -106,9 +107,8 @@ class ErrorReporter
 		std::initializer_list<std::string> const descs = { _descriptions... };
 		solAssert(descs.size() > 0, "Need error descriptions!");
 
-		auto filterEmpty = boost::adaptors::filtered([](std::string const& _s) { return !_s.empty(); });
-
-		std::string errorStr = util::joinHumanReadable(descs | filterEmpty, " ");
+		auto nonEmpty = [](std::string const& _s) { return !_s.empty(); };
+		std::string errorStr = util::joinHumanReadable(descs | ranges::views::filter(nonEmpty) | ranges::to_vector, " ");
 
 		error(_error, Error::Type::TypeError, _location, errorStr);
 	}
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index ccaa8df942..db917d2b44 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -66,7 +66,6 @@
 
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <boost/range/adaptor/filtered.hpp>
 #include <boost/algorithm/string.hpp>
 
 #ifdef _WIN32 // windows
diff --git a/test/libyul/ObjectParser.cpp b/test/libyul/ObjectParser.cpp
index be3de930de..9e429177d3 100644
--- a/test/libyul/ObjectParser.cpp
+++ b/test/libyul/ObjectParser.cpp
@@ -43,7 +43,6 @@
 #include <string>
 #include <sstream>
 
-using namespace ranges;
 using namespace std;
 using namespace solidity::frontend;
 using namespace solidity::langutil;

From 8230022e18965c898fcc1caedecbd0794397343c Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 27 Sep 2022 03:14:10 +0200
Subject: [PATCH 0921/1748] Remove unused include of boost/variant

---
 libyul/AsmJsonConverter.h         | 2 +-
 test/tools/ossfuzz/protoToAbiV2.h | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/libyul/AsmJsonConverter.h b/libyul/AsmJsonConverter.h
index 6bb50002c3..52e36d5cdd 100644
--- a/libyul/AsmJsonConverter.h
+++ b/libyul/AsmJsonConverter.h
@@ -26,7 +26,7 @@
 #include <libyul/ASTForward.h>
 #include <liblangutil/SourceLocation.h>
 #include <json/json.h>
-#include <boost/variant.hpp>
+#include <boost/variant/static_visitor.hpp>
 #include <optional>
 #include <vector>
 
diff --git a/test/tools/ossfuzz/protoToAbiV2.h b/test/tools/ossfuzz/protoToAbiV2.h
index d549113537..7038ed7064 100644
--- a/test/tools/ossfuzz/protoToAbiV2.h
+++ b/test/tools/ossfuzz/protoToAbiV2.h
@@ -10,9 +10,7 @@
 
 #include <liblangutil/Exceptions.h>
 
-#include <boost/variant/static_visitor.hpp>
 #include <boost/algorithm/string.hpp>
-#include <boost/variant.hpp>
 
 #include <ostream>
 #include <random>

From 0f484ec93b8875e5d9e38c2b5a266bb268c9994a Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 27 Sep 2022 03:33:13 +0200
Subject: [PATCH 0922/1748] Replace use of boost::algorithm::all_of with
 ranges::all_of

---
 libyul/optimiser/UnusedFunctionParameterPruner.cpp | 4 ++--
 test/tools/yulInterpreter/Interpreter.cpp          | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/libyul/optimiser/UnusedFunctionParameterPruner.cpp b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
index 6ce097f42d..8f45f84063 100644
--- a/libyul/optimiser/UnusedFunctionParameterPruner.cpp
+++ b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
@@ -31,7 +31,7 @@
 
 #include <libsolutil/CommonData.h>
 
-#include <boost/algorithm/cxx11/all_of.hpp>
+#include <range/v3/algorithm/all_of.hpp>
 
 #include <optional>
 #include <variant>
@@ -64,7 +64,7 @@ void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _
 		{
 			FunctionDefinition const& f = std::get<FunctionDefinition>(statement);
 
-			if (tooSimpleToBePruned(f) || boost::algorithm::all_of(f.parameters + f.returnVariables, used))
+			if (tooSimpleToBePruned(f) || ranges::all_of(f.parameters + f.returnVariables, used))
 				continue;
 
 			usedParametersAndReturnVariables[f.name] = {
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index bf0ad820b8..0f298f558c 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -34,8 +34,6 @@
 
 #include <libsolutil/FixedHash.h>
 
-#include <boost/algorithm/cxx11/all_of.hpp>
-
 #include <range/v3/view/reverse.hpp>
 
 #include <ostream>

From 1480bf12930a26f05d9ff75b7fc67b3a475e4a81 Mon Sep 17 00:00:00 2001
From: franzihei <41991517+franzihei@users.noreply.github.com>
Date: Tue, 27 Sep 2022 12:37:45 +0200
Subject: [PATCH 0923/1748] Update meeting link to meet.soliditylang.org

---
 docs/contributing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 9da7f02d0f..dcdb3dc3a9 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -32,7 +32,7 @@ the team and contributors are working on, you can join our public team calls:
 
 - Mondays and Wednesdays at 3pm CET/CEST.
 
-Both calls take place on `Jitsi <https://meet.ethereum.org/solidity>`_.
+Both calls take place on `Jitsi <http://meet.soliditylang.org/>`_.
 
 How to Report Issues
 ====================

From bd57de6d68896d739e43423dee31e9653fcd6bad Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Tue, 27 Sep 2022 13:31:10 +0200
Subject: [PATCH 0924/1748] Document legacy and IR behavior for call to zero
 initialized variable of function type.

---
 ...l_to_zero_initialized_function_type_ir.sol | 27 +++++++++++++++++++
 ..._zero_initialized_function_type_legacy.sol | 27 +++++++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_ir.sol
 create mode 100644 test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_legacy.sol

diff --git a/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_ir.sol b/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_ir.sol
new file mode 100644
index 0000000000..a083ee1d9d
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_ir.sol
@@ -0,0 +1,27 @@
+contract Other {
+    function addTwo(uint256 x) public returns (uint256) {
+        return x + 2;
+    }
+}
+contract C {
+    function (function (uint) external returns (uint)) internal returns (uint) ev;
+    function (uint) external returns (uint) x;
+
+    function store(function(uint) external returns (uint) y) public {
+         x = y;
+    }
+
+    function eval(function(uint) external returns (uint) y) public returns (uint) {
+        return y(7);
+    }
+
+    function t() public returns (uint256) {
+        this.store((new Other()).addTwo);
+        // This call panics
+        return ev(x);
+    }
+}
+// ====
+// compileViaYul: true
+// ----
+// t() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_legacy.sol b/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_legacy.sol
new file mode 100644
index 0000000000..feca44e0c1
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/call_to_zero_initialized_function_type_legacy.sol
@@ -0,0 +1,27 @@
+contract Other {
+    function addTwo(uint256 x) public returns (uint256) {
+        return x + 2;
+    }
+}
+contract C {
+    function (function (uint) external returns (uint)) internal returns (uint) ev;
+    function (uint) external returns (uint) x;
+
+    function store(function(uint) external returns (uint) y) public {
+         x = y;
+    }
+
+    function eval(function(uint) external returns (uint) y) public returns (uint) {
+        return y(7);
+    }
+
+    function t() public returns (uint256) {
+        this.store((new Other()).addTwo);
+        // This call panics
+        return ev(x);
+    }
+}
+// ====
+// compileViaYul: false
+// ----
+// t() -> FAILURE

From 46531ac32bbc7edcdda56beb5986f10ec59b6abd Mon Sep 17 00:00:00 2001
From: franzihei <41991517+franzihei@users.noreply.github.com>
Date: Tue, 27 Sep 2022 15:09:16 +0200
Subject: [PATCH 0925/1748] Update contributing.rst

---
 docs/contributing.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index dcdb3dc3a9..46607194f7 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -30,9 +30,9 @@ Team Calls
 If you have issues or pull requests to discuss, or are interested in hearing what
 the team and contributors are working on, you can join our public team calls:
 
-- Mondays and Wednesdays at 3pm CET/CEST.
+- Mondays and Wednesdays at 3PM CET/CEST.
 
-Both calls take place on `Jitsi <http://meet.soliditylang.org/>`_.
+Both calls take place on `Jitsi <https://meet.soliditylang.org/>`_.
 
 How to Report Issues
 ====================

From 725253551ef9f408db328568e218f03474ceb788 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 27 Sep 2022 14:13:44 +0200
Subject: [PATCH 0926/1748] Improve FunctionSelector helpers

---
 libsolidity/analysis/PostTypeChecker.cpp      |  2 +-
 .../analysis/PostTypeContractLevelChecker.cpp |  2 +-
 libsolidity/ast/AST.cpp                       |  4 +-
 libsolidity/ast/Types.cpp                     |  4 +-
 libsolidity/codegen/ArrayUtils.cpp            |  2 +-
 libsolidity/codegen/CompilerUtils.cpp         |  4 +-
 libsolidity/codegen/ContractCompiler.cpp      |  6 +--
 libsolidity/codegen/ExpressionCompiler.cpp    |  2 +-
 libsolidity/codegen/YulUtilFunctions.cpp      |  6 +--
 .../codegen/ir/IRGeneratorForStatements.cpp   | 10 ++--
 libsolidity/interface/CompilerStack.cpp       |  2 +-
 libsolidity/interface/GasEstimator.cpp        |  3 +-
 libsolutil/FunctionSelector.h                 | 15 ++++--
 test/CMakeLists.txt                           |  1 +
 test/ExecutionFramework.cpp                   |  3 +-
 test/ExecutionFramework.h                     |  6 +--
 test/contracts/Wallet.cpp                     |  2 +-
 test/libsolidity/ABIEncoderTests.cpp          |  2 +-
 test/libsolidity/AnalysisFramework.cpp        |  5 +-
 test/libsolidity/GasMeter.cpp                 |  2 +-
 test/libsolidity/SolidityEndToEndTest.cpp     | 14 ++---
 test/libsolidity/util/ContractABIUtils.cpp    |  4 +-
 test/libsolutil/FunctionSelector.cpp          | 53 +++++++++++++++++++
 23 files changed, 105 insertions(+), 49 deletions(-)
 create mode 100644 test/libsolutil/FunctionSelector.cpp

diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp
index b5b973aa4c..c8b3b5f162 100644
--- a/libsolidity/analysis/PostTypeChecker.cpp
+++ b/libsolidity/analysis/PostTypeChecker.cpp
@@ -411,7 +411,7 @@ struct ReservedErrorSelector: public PostTypeChecker::Checker
 			);
 		else
 		{
-			uint32_t selector = util::selectorFromSignature32(_error.functionType(true)->externalSignature());
+			uint32_t selector = util::selectorFromSignatureU32(_error.functionType(true)->externalSignature());
 			if (selector == 0 || ~selector == 0)
 				m_errorReporter.syntaxError(
 					2855_error,
diff --git a/libsolidity/analysis/PostTypeContractLevelChecker.cpp b/libsolidity/analysis/PostTypeContractLevelChecker.cpp
index 38a192c226..67d0623aa0 100644
--- a/libsolidity/analysis/PostTypeContractLevelChecker.cpp
+++ b/libsolidity/analysis/PostTypeContractLevelChecker.cpp
@@ -52,7 +52,7 @@ bool PostTypeContractLevelChecker::check(ContractDefinition const& _contract)
 	for (ErrorDefinition const* error: _contract.interfaceErrors())
 	{
 		string signature = error->functionType(true)->externalSignature();
-		uint32_t hash = util::selectorFromSignature32(signature);
+		uint32_t hash = util::selectorFromSignatureU32(signature);
 		// Fail if there is a different signature for the same hash.
 		if (!errorHashes[hash].empty() && !errorHashes[hash].count(signature))
 		{
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index 97167818c7..8619ee6ae7 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -27,6 +27,7 @@
 #include <libsolidity/ast/ASTVisitor.h>
 #include <libsolidity/ast/AST_accept.h>
 #include <libsolidity/ast/TypeProvider.h>
+#include <libsolutil/FunctionSelector.h>
 #include <libsolutil/Keccak256.h>
 
 #include <range/v3/view/tail.hpp>
@@ -281,8 +282,7 @@ vector<pair<util::FixedHash<4>, FunctionTypePointer>> const& ContractDefinition:
 				if (signaturesSeen.count(functionSignature) == 0)
 				{
 					signaturesSeen.insert(functionSignature);
-					util::FixedHash<4> hash(util::keccak256(functionSignature));
-					interfaceFunctionList.emplace_back(hash, fun);
+					interfaceFunctionList.emplace_back(util::selectorFromSignatureH32(functionSignature), fun);
 				}
 			}
 		}
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index ebe7041035..9c0179edad 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -3583,12 +3583,12 @@ string FunctionType::externalSignature() const
 
 u256 FunctionType::externalIdentifier() const
 {
-	return util::selectorFromSignature32(externalSignature());
+	return util::selectorFromSignatureU32(externalSignature());
 }
 
 string FunctionType::externalIdentifierHex() const
 {
-	return util::FixedHash<4>(util::keccak256(externalSignature())).hex();
+	return util::selectorFromSignatureH32(externalSignature()).hex();
 }
 
 bool FunctionType::isPure() const
diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
index 9b95463ba5..609ff9993b 100644
--- a/libsolidity/codegen/ArrayUtils.cpp
+++ b/libsolidity/codegen/ArrayUtils.cpp
@@ -889,7 +889,7 @@ void ArrayUtils::popStorageArrayElement(ArrayType const& _type) const
 			}
 			sstore(ref, slot_value)
 		})");
-		code("panicSelector", util::selectorFromSignature("Panic(uint256)").str());
+		code("panicSelector", util::selectorFromSignatureU256("Panic(uint256)").str());
 		code("emptyArrayPop", to_string(unsigned(util::PanicCode::EmptyArrayPop)));
 		m_context.appendInlineAssembly(code.render(), {"ref", "slot_value", "length"});
 		m_context << Instruction::POP << Instruction::POP << Instruction::POP;
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index 32b1f1bba9..783a7b1a45 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -95,7 +95,7 @@ void CompilerUtils::revertWithStringData(Type const& _argumentType)
 {
 	solAssert(_argumentType.isImplicitlyConvertibleTo(*TypeProvider::fromElementaryTypeName("string memory")));
 	fetchFreeMemoryPointer();
-	m_context << util::selectorFromSignature("Error(string)");
+	m_context << util::selectorFromSignatureU256("Error(string)");
 	m_context << Instruction::DUP2 << Instruction::MSTORE;
 	m_context << u256(4) << Instruction::ADD;
 	// Stack: <string data> <mem pos of encoding start>
@@ -111,7 +111,7 @@ void CompilerUtils::revertWithError(
 )
 {
 	fetchFreeMemoryPointer();
-	m_context << util::selectorFromSignature(_signature);
+	m_context << util::selectorFromSignatureU256(_signature);
 	m_context << Instruction::DUP2 << Instruction::MSTORE;
 	m_context << u256(4) << Instruction::ADD;
 	// Stack: <arguments...> <mem pos of encoding start>
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index a89dbb21b8..a6e7ab2fb3 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -253,7 +253,7 @@ size_t ContractCompiler::deployLibrary(ContractDefinition const& _contract)
 			return(codepos, subSize)
 		}
 		)")
-		("panicSelector", util::selectorFromSignature("Panic(uint256)").str())
+		("panicSelector", util::selectorFromSignatureU256("Panic(uint256)").str())
 		("panicCode", "0")
 		.render(),
 		{"subSize", "subOffset"}
@@ -1046,7 +1046,7 @@ void ContractCompiler::handleCatch(vector<ASTPointer<TryCatchClause>> const& _ca
 		solAssert(m_context.evmVersion().supportsReturndata(), "");
 
 		// stack: <selector>
-		m_context << Instruction::DUP1 << util::selectorFromSignature32("Error(string)") << Instruction::EQ;
+		m_context << Instruction::DUP1 << util::selectorFromSignatureU32("Error(string)") << Instruction::EQ;
 		m_context << Instruction::ISZERO;
 		m_context.appendConditionalJumpTo(panicTag);
 		m_context << Instruction::POP; // remove selector
@@ -1078,7 +1078,7 @@ void ContractCompiler::handleCatch(vector<ASTPointer<TryCatchClause>> const& _ca
 		solAssert(m_context.evmVersion().supportsReturndata(), "");
 
 		// stack: <selector>
-		m_context << util::selectorFromSignature32("Panic(uint256)") << Instruction::EQ;
+		m_context << util::selectorFromSignatureU32("Panic(uint256)") << Instruction::EQ;
 		m_context << Instruction::ISZERO;
 		m_context.appendConditionalJumpTo(fallbackTag);
 
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 3ee8244475..461de5648d 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1329,7 +1329,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 					// hash the signature
 					if (auto const* stringType = dynamic_cast<StringLiteralType const*>(selectorType))
 					{
-						m_context << util::selectorFromSignature(stringType->value());
+						m_context << util::selectorFromSignatureU256(stringType->value());
 						dataOnStack = TypeProvider::fixedBytes(4);
 					}
 					else
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index b66189f054..fa55738107 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -233,7 +233,7 @@ string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _mess
 			.render();
 
 		int const hashHeaderSize = 4;
-		u256 const errorHash = util::selectorFromSignature("Error(string)");
+		u256 const errorHash = util::selectorFromSignatureU256("Error(string)");
 
 		string const encodeFunc = ABIFunctions(m_evmVersion, m_revertStrings, m_functionCollector)
 			.tupleEncoder(
@@ -4426,7 +4426,7 @@ string YulUtilFunctions::revertReasonIfDebugBody(
 		revert(start, <overallLength>)
 	)");
 	templ("allocate", _allocation);
-	templ("sig", util::selectorFromSignature("Error(string)").str());
+	templ("sig", util::selectorFromSignatureU256("Error(string)").str());
 	templ("length", to_string(_message.length()));
 
 	size_t words = (_message.length() + 31) / 32;
@@ -4454,7 +4454,7 @@ string YulUtilFunctions::panicFunction(util::PanicCode _code)
 			}
 		)")
 		("functionName", functionName)
-		("selector", util::selectorFromSignature("Panic(uint256)").str())
+		("selector", util::selectorFromSignatureU256("Panic(uint256)").str())
 		("code", toCompactHexWithPrefix(static_cast<unsigned>(_code)))
 		.render();
 	});
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 61ec2b1449..30575930c7 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1196,7 +1196,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 			// hash the signature
 			Type const& selectorType = type(*arguments.front());
 			if (auto const* stringType = dynamic_cast<StringLiteralType const*>(&selectorType))
-				selector = formatNumber(util::selectorFromSignature(stringType->value()));
+				selector = formatNumber(util::selectorFromSignatureU256(stringType->value()));
 			else
 			{
 				// Used to reset the free memory pointer later.
@@ -1785,7 +1785,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 					""
 				);
 				define(IRVariable{_memberAccess}) << formatNumber(
-					util::selectorFromSignature(functionType.externalSignature())
+					util::selectorFromSignatureU256(functionType.externalSignature())
 				) << "\n";
 			}
 			else if (functionType.kind() == FunctionType::Kind::Event)
@@ -3234,7 +3234,7 @@ void IRGeneratorForStatements::handleCatch(TryStatement const& _tryStatement)
 
 	if (TryCatchClause const* errorClause = _tryStatement.errorClause())
 	{
-		appendCode() << "case " << selectorFromSignature32("Error(string)") << " {\n";
+		appendCode() << "case " << selectorFromSignatureU32("Error(string)") << " {\n";
 		setLocation(*errorClause);
 		string const dataVariable = m_context.newYulVariable();
 		appendCode() << "let " << dataVariable << " := " << m_utils.tryDecodeErrorMessageFunction() << "()\n";
@@ -3254,7 +3254,7 @@ void IRGeneratorForStatements::handleCatch(TryStatement const& _tryStatement)
 	}
 	if (TryCatchClause const* panicClause = _tryStatement.panicClause())
 	{
-		appendCode() << "case " << selectorFromSignature32("Panic(uint256)") << " {\n";
+		appendCode() << "case " << selectorFromSignatureU32("Panic(uint256)") << " {\n";
 		setLocation(*panicClause);
 		string const success = m_context.newYulVariable();
 		string const code = m_context.newYulVariable();
@@ -3317,7 +3317,7 @@ void IRGeneratorForStatements::revertWithError(
 	})");
 	templ("pos", m_context.newYulVariable());
 	templ("end", m_context.newYulVariable());
-	templ("hash", util::selectorFromSignature(_signature).str());
+	templ("hash", util::selectorFromSignatureU256(_signature).str());
 	templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
 
 	vector<string> errorArgumentVars;
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 1096501303..ca700d764c 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1034,7 +1034,7 @@ Json::Value CompilerStack::interfaceSymbols(string const& _contractName) const
 	for (ErrorDefinition const* error: contractDefinition(_contractName).interfaceErrors())
 	{
 		string signature = error->functionType(true)->externalSignature();
-		interfaceSymbols["errors"][signature] = util::toHex(toCompactBigEndian(util::selectorFromSignature32(signature), 4));
+		interfaceSymbols["errors"][signature] = util::toHex(toCompactBigEndian(util::selectorFromSignatureU32(signature), 4));
 	}
 
 	for (EventDefinition const* event: ranges::concat_view(
diff --git a/libsolidity/interface/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp
index 8b7e79840e..512f91bee2 100644
--- a/libsolidity/interface/GasEstimator.cpp
+++ b/libsolidity/interface/GasEstimator.cpp
@@ -30,6 +30,7 @@
 #include <libevmasm/ControlFlowGraph.h>
 #include <libevmasm/KnownState.h>
 #include <libevmasm/PathGasMeter.h>
+#include <libsolutil/FunctionSelector.h>
 #include <libsolutil/Keccak256.h>
 
 #include <functional>
@@ -54,7 +55,7 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation(
 		ExpressionClasses& classes = state->expressionClasses();
 		using Id = ExpressionClasses::Id;
 		using Ids = vector<Id>;
-		Id hashValue = classes.find(u256(util::FixedHash<4>::Arith(util::FixedHash<4>(util::keccak256(_signature)))));
+		Id hashValue = classes.find(u256(util::selectorFromSignatureU32(_signature)));
 		Id calldata = classes.find(Instruction::CALLDATALOAD, Ids{classes.find(u256(0))});
 		if (!m_evmVersion.hasBitwiseShifting())
 			// div(calldataload(0), 1 << 224) equals to hashValue
diff --git a/libsolutil/FunctionSelector.h b/libsolutil/FunctionSelector.h
index da6feb4e0a..2712f6bad7 100644
--- a/libsolutil/FunctionSelector.h
+++ b/libsolutil/FunctionSelector.h
@@ -26,17 +26,22 @@
 namespace solidity::util
 {
 
+/// @returns the ABI selector for a given function signature, as a FixedHash h32.
+inline FixedHash<4> selectorFromSignatureH32(std::string const& _signature)
+{
+	return FixedHash<4>(util::keccak256(_signature), FixedHash<4>::AlignLeft);
+}
+
 /// @returns the ABI selector for a given function signature, as a 32 bit number.
-inline uint32_t selectorFromSignature32(std::string const& _signature)
+inline uint32_t selectorFromSignatureU32(std::string const& _signature)
 {
-	return uint32_t(FixedHash<4>::Arith(util::FixedHash<4>(util::keccak256(_signature))));
+	return uint32_t(FixedHash<4>::Arith(selectorFromSignatureH32(_signature)));
 }
 
 /// @returns the ABI selector for a given function signature, as a u256 (left aligned) number.
-inline u256 selectorFromSignature(std::string const& _signature)
+inline u256 selectorFromSignatureU256(std::string const& _signature)
 {
-	return u256(selectorFromSignature32(_signature)) << (256 - 32);
+	return u256(selectorFromSignatureU32(_signature)) << (256 - 32);
 }
 
-
 }
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index cc7a61bae2..637a62a0cf 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -35,6 +35,7 @@ set(libsolutil_sources
     libsolutil/CommonData.cpp
     libsolutil/CommonIO.cpp
     libsolutil/FixedHash.cpp
+    libsolutil/FunctionSelector.cpp
     libsolutil/IndentedWriter.cpp
     libsolutil/IpfsHash.cpp
     libsolutil/IterateReplacing.cpp
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index bb46f108d1..be2a283f7f 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -30,7 +30,6 @@
 #include <test/libsolidity/util/SoltestTypes.h>
 
 #include <libsolutil/CommonIO.h>
-#include <libsolutil/FunctionSelector.h>
 
 #include <liblangutil/Exceptions.h>
 
@@ -123,7 +122,7 @@ bytes ExecutionFramework::panicData(util::PanicCode _code)
 {
 	return
 		m_evmVersion.supportsReturndata() ?
-		toCompactBigEndian(selectorFromSignature32("Panic(uint256)"), 4) + encode(u256(static_cast<unsigned>(_code))) :
+		toCompactBigEndian(selectorFromSignatureU32("Panic(uint256)"), 4) + encode(u256(static_cast<unsigned>(_code))) :
 		bytes();
 }
 
diff --git a/test/ExecutionFramework.h b/test/ExecutionFramework.h
index ae2ab68943..cbde0ac4e6 100644
--- a/test/ExecutionFramework.h
+++ b/test/ExecutionFramework.h
@@ -31,8 +31,7 @@
 
 #include <liblangutil/EVMVersion.h>
 
-#include <libsolutil/FixedHash.h>
-#include <libsolutil/Keccak256.h>
+#include <libsolutil/FunctionSelector.h>
 #include <libsolutil/ErrorCodes.h>
 
 #include <functional>
@@ -108,8 +107,7 @@ class ExecutionFramework
 
 	bytes const& callContractFunctionWithValueNoEncoding(std::string _sig, u256 const& _value, bytes const& _arguments)
 	{
-		util::FixedHash<4> hash(util::keccak256(_sig));
-		sendMessage(hash.asBytes() + _arguments, false, _value);
+		sendMessage(util::selectorFromSignatureH32(_sig).asBytes() + _arguments, false, _value);
 		return m_output;
 	}
 
diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
index 72aac4f714..63a4bfc31e 100644
--- a/test/contracts/Wallet.cpp
+++ b/test/contracts/Wallet.cpp
@@ -591,7 +591,7 @@ BOOST_AUTO_TEST_CASE(revoke_addOwner)
 	BOOST_REQUIRE(callContractFunction("changeRequirement(uint256)", u256(3)) == encodeArgs());
 	// add a new owner
 	h160 deployer = m_sender;
-	h256 opHash = util::keccak256(FixedHash<4>(util::keccak256("addOwner(address)")).asBytes() + h256(0x33).asBytes());
+	h256 opHash = util::keccak256(util::selectorFromSignatureH32("addOwner(address)").asBytes() + h256(0x33).asBytes());
 	BOOST_REQUIRE(callContractFunction("addOwner(address)", h160(0x33)) == encodeArgs());
 	BOOST_REQUIRE(callContractFunction("isOwner(address)", h160(0x33)) == encodeArgs(false));
 	m_sender = account(0);
diff --git a/test/libsolidity/ABIEncoderTests.cpp b/test/libsolidity/ABIEncoderTests.cpp
index 6cb5240441..970bf1b3e0 100644
--- a/test/libsolidity/ABIEncoderTests.cpp
+++ b/test/libsolidity/ABIEncoderTests.cpp
@@ -342,7 +342,7 @@ BOOST_AUTO_TEST_CASE(external_function)
 	BOTH_ENCODERS(
 		compileAndRun(sourceCode);
 		callContractFunction("f(uint256)", u256(0));
-		string functionIdF = asString(m_contractAddress.ref()) + asString(FixedHash<4>(keccak256("f(uint256)")).ref());
+		string functionIdF = asString(m_contractAddress.ref()) + asString(util::selectorFromSignatureH32("f(uint256)").ref());
 		REQUIRE_LOG_DATA(encodeArgs(functionIdF, functionIdF));
 	)
 }
diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 5dce2211f9..7bbaaaa5d2 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -30,7 +30,7 @@
 
 #include <liblangutil/Scanner.h>
 
-#include <libsolutil/Keccak256.h>
+#include <libsolutil/FunctionSelector.h>
 
 #include <boost/test/unit_test.hpp>
 
@@ -170,6 +170,5 @@ FunctionTypePointer AnalysisFramework::retrieveFunctionBySignature(
 	std::string const& _signature
 )
 {
-	FixedHash<4> hash(util::keccak256(_signature));
-	return _contract.interfaceFunctions()[hash];
+	return _contract.interfaceFunctions()[util::selectorFromSignatureH32(_signature)];
 }
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index d77462eb95..0cb81ecb65 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -78,7 +78,7 @@ class GasMeterTestFramework: public SolidityExecutionFramework
 	{
 		u256 gasUsed = 0;
 		GasMeter::GasConsumption gas;
-		util::FixedHash<4> hash(util::keccak256(_sig));
+		util::FixedHash<4> hash = util::selectorFromSignatureH32(_sig);
 		for (bytes const& arguments: _argumentVariants)
 		{
 			sendMessage(hash.asBytes() + arguments, false, 0);
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 7509bed3c0..698f6de662 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -1627,7 +1627,7 @@ BOOST_AUTO_TEST_CASE(bytes_from_calldata_to_memory)
 	ALSO_VIA_YUL(
 		DISABLE_EWASM_TESTRUN();
 		compileAndRun(sourceCode);
-		bytes calldata1 = FixedHash<4>(util::keccak256("f()")).asBytes() + bytes(61, 0x22) + bytes(12, 0x12);
+		bytes calldata1 = util::selectorFromSignatureH32("f()").asBytes() + bytes(61, 0x22) + bytes(12, 0x12);
 		sendMessage(calldata1, false);
 		BOOST_CHECK(m_transactionSuccessful);
 		BOOST_CHECK(m_output == encodeArgs(util::keccak256(bytes{'a', 'b', 'c'} + calldata1)));
@@ -1872,8 +1872,8 @@ BOOST_AUTO_TEST_CASE(bytes_in_arguments)
 
 		compileAndRun(sourceCode);
 
-		string innercalldata1 = asString(FixedHash<4>(util::keccak256("f(uint256,uint256)")).asBytes() + encodeArgs(8, 9));
-		string innercalldata2 = asString(FixedHash<4>(util::keccak256("g(uint256)")).asBytes() + encodeArgs(3));
+		string innercalldata1 = asString(util::selectorFromSignatureH32("f(uint256,uint256)").asBytes() + encodeArgs(8, 9));
+		string innercalldata2 = asString(util::selectorFromSignatureH32("g(uint256)").asBytes() + encodeArgs(3));
 		bytes calldata = encodeArgs(
 			12, 32 * 4, u256(32 * 4 + 32 + (innercalldata1.length() + 31) / 32 * 32), 13,
 			u256(innercalldata1.length()), innercalldata1,
@@ -2205,8 +2205,8 @@ BOOST_AUTO_TEST_CASE(calldata_struct_function_type)
 	)";
 	compileAndRun(sourceCode, 0, "C");
 
-	bytes fn_C_g = m_contractAddress.asBytes() + FixedHash<4>(util::keccak256("g(uint256)")).asBytes() + bytes(8,0);
-	bytes fn_C_h = m_contractAddress.asBytes() + FixedHash<4>(util::keccak256("h(uint256)")).asBytes() + bytes(8,0);
+	bytes fn_C_g = m_contractAddress.asBytes() + util::selectorFromSignatureH32("g(uint256)").asBytes() + bytes(8,0);
+	bytes fn_C_h = m_contractAddress.asBytes() + util::selectorFromSignatureH32("h(uint256)").asBytes() + bytes(8,0);
 	ABI_CHECK(callContractFunctionNoEncoding("f((function))", fn_C_g), encodeArgs(42 * 3));
 	ABI_CHECK(callContractFunctionNoEncoding("f((function))", fn_C_h), encodeArgs(23));
 }
@@ -3007,7 +3007,7 @@ BOOST_AUTO_TEST_CASE(receive_external_function_type)
 		compileAndRun(sourceCode, 0, "C");
 		ABI_CHECK(callContractFunction(
 			"f(function)",
-			m_contractAddress.asBytes() + FixedHash<4>(util::keccak256("g()")).asBytes() + bytes(32 - 4 - 20, 0)
+			m_contractAddress.asBytes() + util::selectorFromSignatureH32("g()").asBytes() + bytes(32 - 4 - 20, 0)
 		), encodeArgs(u256(7)));
 	)
 }
@@ -3026,7 +3026,7 @@ BOOST_AUTO_TEST_CASE(return_external_function_type)
 	compileAndRun(sourceCode, 0, "C");
 	ABI_CHECK(
 		callContractFunction("f()"),
-		m_contractAddress.asBytes() + FixedHash<4>(util::keccak256("g()")).asBytes() + bytes(32 - 4 - 20, 0)
+		m_contractAddress.asBytes() + util::selectorFromSignatureH32("g()").asBytes() + bytes(32 - 4 - 20, 0)
 	);
 }
 
diff --git a/test/libsolidity/util/ContractABIUtils.cpp b/test/libsolidity/util/ContractABIUtils.cpp
index b94de7bec4..10363551bc 100644
--- a/test/libsolidity/util/ContractABIUtils.cpp
+++ b/test/libsolidity/util/ContractABIUtils.cpp
@@ -338,9 +338,9 @@ solidity::frontend::test::ParameterList ContractABIUtils::failureParameters(byte
 		parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::HexString, ABIType::AlignNone, 4}, FormatInfo{}});
 
 		uint64_t selector = fromBigEndian<uint64_t>(bytes{_bytes.begin(), _bytes.begin() + 4});
-		if (selector == selectorFromSignature32("Panic(uint256)"))
+		if (selector == selectorFromSignatureU32("Panic(uint256)"))
 			parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::Hex}, FormatInfo{}});
-		else if (selector == selectorFromSignature32("Error(string)"))
+		else if (selector == selectorFromSignatureU32("Error(string)"))
 		{
 			parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::Hex}, FormatInfo{}});
 			parameters.push_back(Parameter{bytes(), "", ABIType{ABIType::UnsignedDec}, FormatInfo{}});
diff --git a/test/libsolutil/FunctionSelector.cpp b/test/libsolutil/FunctionSelector.cpp
new file mode 100644
index 0000000000..2ddfe94000
--- /dev/null
+++ b/test/libsolutil/FunctionSelector.cpp
@@ -0,0 +1,53 @@
+/*
+	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/>.
+*/
+/**
+ * Unit tests for FunctionSelector.
+ */
+
+#include <libsolutil/FunctionSelector.h>
+
+#include <boost/test/unit_test.hpp>
+
+#include <cstdint>
+#include <sstream>
+
+using namespace std;
+
+namespace solidity::util::test
+{
+
+BOOST_AUTO_TEST_SUITE(FunctionSelectorTest)
+
+BOOST_AUTO_TEST_CASE(conversions)
+{
+	BOOST_CHECK_EQUAL(
+		util::selectorFromSignatureH32("test()"),
+		util::FixedHash<4>(0xf8a8fd6d)
+	);
+	BOOST_CHECK_EQUAL(
+		util::selectorFromSignatureU32("test()"),
+		0xf8a8fd6d
+	);
+	BOOST_CHECK_EQUAL(
+		util::selectorFromSignatureU256("test()"),
+		u256("0xf8a8fd6d00000000000000000000000000000000000000000000000000000000")
+	);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+}

From 2a41295d038555c521c2fec80e5d94e8ae265440 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 27 Sep 2022 14:26:10 +0200
Subject: [PATCH 0927/1748] Drop implicit alignment argument from FixedHash

---
 libsolutil/FixedHash.h                        |  2 +-
 test/EVMHost.cpp                              |  4 +--
 test/libsolutil/FixedHash.cpp                 | 27 ++++++++++---------
 .../EwasmBuiltinInterpreter.cpp               |  2 +-
 4 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/libsolutil/FixedHash.h b/libsolutil/FixedHash.h
index 97a80603ad..c4c72e9eb7 100644
--- a/libsolutil/FixedHash.h
+++ b/libsolutil/FixedHash.h
@@ -61,7 +61,7 @@ class FixedHash
 	explicit FixedHash() { m_data.fill(0); }
 
 	/// Construct from another hash, filling with zeroes or cropping as necessary.
-	template <unsigned M> explicit FixedHash(FixedHash<M> const& _h, ConstructFromHashType _t = AlignLeft)
+	template <unsigned M> explicit FixedHash(FixedHash<M> const& _h, ConstructFromHashType _t)
 	{
 		m_data.fill(0);
 		unsigned c = std::min(M, N);
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 30b584a904..7dea40b63c 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -255,7 +255,7 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
 		h160 createAddress(keccak256(
 			bytes(begin(message.sender.bytes), end(message.sender.bytes)) +
 			asBytes(to_string(sender.nonce++))
-		));
+		), h160::AlignLeft);
 		message.destination = convertToEVMC(createAddress);
 		code = evmc::bytes(message.input_data, message.input_data + message.input_size);
 	}
@@ -266,7 +266,7 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
 			bytes(begin(message.sender.bytes), end(message.sender.bytes)) +
 			bytes(begin(message.create2_salt.bytes), end(message.create2_salt.bytes)) +
 			keccak256(bytes(message.input_data, message.input_data + message.input_size)).asBytes()
-		));
+		), h160::AlignLeft);
 		message.destination = convertToEVMC(createAddress);
 		if (accounts.count(message.destination) && (
 			accounts[message.destination].nonce > 0 ||
diff --git a/test/libsolutil/FixedHash.cpp b/test/libsolutil/FixedHash.cpp
index 67397e9e1a..279f4246a2 100644
--- a/test/libsolutil/FixedHash.cpp
+++ b/test/libsolutil/FixedHash.cpp
@@ -146,29 +146,30 @@ BOOST_AUTO_TEST_CASE(string_constructor_frombytes)
 
 BOOST_AUTO_TEST_CASE(converting_constructor)
 {
-	// Truncation
-	FixedHash<8> a = FixedHash<8>(FixedHash<12>("112233445566778899001122"));
+	// Left-aligned truncation
+	FixedHash<8> a = FixedHash<8>(FixedHash<12>("112233445566778899001122"), FixedHash<8>::AlignLeft);
 	BOOST_CHECK_EQUAL(a.size, 8);
 	BOOST_CHECK_EQUAL(a.hex(), "1122334455667788");
 
-	// Left-aligned extension
-	FixedHash<12> b = FixedHash<12>(FixedHash<8>("1122334455667788"), FixedHash<12>::AlignLeft);
-	BOOST_CHECK_EQUAL(b.size, 12);
-	BOOST_CHECK_EQUAL(b.hex(), "112233445566778800000000");
+	// Right-aligned truncation
+	FixedHash<8> b = FixedHash<8>(FixedHash<12>("112233445566778899001122"), FixedHash<8>::AlignRight);
+	BOOST_CHECK_EQUAL(b.size, 8);
+	BOOST_CHECK_EQUAL(b.hex(), "5566778899001122");
 
-	// Right-aligned extension
-	FixedHash<12> c = FixedHash<12>(FixedHash<8>("1122334455667788"), FixedHash<12>::AlignRight);
+	// Left-aligned extension
+	FixedHash<12> c = FixedHash<12>(FixedHash<8>("1122334455667788"), FixedHash<12>::AlignLeft);
 	BOOST_CHECK_EQUAL(c.size, 12);
-	BOOST_CHECK_EQUAL(c.hex(), "000000001122334455667788");
+	BOOST_CHECK_EQUAL(c.hex(), "112233445566778800000000");
 
-	// Default setting
-	FixedHash<12> d = FixedHash<12>(FixedHash<8>("1122334455667788"));
-	BOOST_CHECK_EQUAL(d, b);
+	// Right-aligned extension
+	FixedHash<12> d = FixedHash<12>(FixedHash<8>("1122334455667788"), FixedHash<12>::AlignRight);
+	BOOST_CHECK_EQUAL(d.size, 12);
+	BOOST_CHECK_EQUAL(d.hex(), "000000001122334455667788");
 
 	// FailIfDifferent setting
 	// TODO: Shouldn't this throw?
 	FixedHash<12> e = FixedHash<12>(FixedHash<8>("1122334455667788"), FixedHash<12>::FailIfDifferent);
-	BOOST_CHECK_EQUAL(e, b);
+	BOOST_CHECK_EQUAL(e, c);
 }
 
 BOOST_AUTO_TEST_CASE(arith_constructor)
diff --git a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
index 25349f5d10..36f51b11c8 100644
--- a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
+++ b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
@@ -439,7 +439,7 @@ u256 EwasmBuiltinInterpreter::evalEthBuiltin(string const& _fun, vector<uint64_t
 	}
 	else if (_fun == "getExternalCodeSize")
 		// Generate "random" code length.
-		return uint32_t(u256(keccak256(h256(readAddress(arg[0])))) & 0xfff);
+		return uint32_t(u256(keccak256(h256(readAddress(arg[0]), h256::AlignLeft))) & 0xfff);
 	else if (_fun == "getGasLeft")
 		return 0x99;
 	else if (_fun == "getBlockGasLimit")

From 9aa304d43abeb0385eaf787927073f2e47803e80 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 16 Sep 2022 15:38:50 +0200
Subject: [PATCH 0928/1748] EVMHost: Calculate address for CREATE properly

---
 test/EVMHost.cpp | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index d5ce8e605c..7c9a8f4dd5 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -250,23 +250,48 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
 
 	if (message.kind == EVMC_CREATE)
 	{
-		// TODO this is not the right formula
 		// TODO is the nonce incremented on failure, too?
+		// NOTE: nonce for creation from contracts starts at 1
+		// TODO: check if sender is an EOA and do not pre-increment
+		sender.nonce++;
+
+		auto encodeRlpInteger = [](int value) -> bytes {
+			if (value == 0) {
+				return bytes{128};
+			} else if (value <= 127) {
+				return bytes{static_cast<uint8_t>(value)};
+			} else if (value <= 0xff) {
+				return bytes{128 + 1, static_cast<uint8_t>(value)};
+			} else if (value <= 0xffff) {
+				return bytes{128 + 55 + 2, static_cast<uint8_t>(value >> 8), static_cast<uint8_t>(value)};
+			} else {
+				assertThrow(false, Exception, "Can only encode RLP numbers <= 0xffff");
+			}
+		};
+
+		bytes encodedNonce = encodeRlpInteger(sender.nonce);
+
 		h160 createAddress(keccak256(
+			bytes{static_cast<uint8_t>(0xc0 + 21 + encodedNonce.size())} +
+			bytes{0x94} +
 			bytes(begin(message.sender.bytes), end(message.sender.bytes)) +
-			asBytes(to_string(sender.nonce++))
-		), h160::AlignLeft);
+			encodedNonce
+		), h160::AlignRight);
+
 		message.destination = convertToEVMC(createAddress);
+		assertThrow(accounts.count(message.destination) == 0, Exception, "Account cannot exist");
+
 		code = evmc::bytes(message.input_data, message.input_data + message.input_size);
 	}
 	else if (message.kind == EVMC_CREATE2)
 	{
 		h160 createAddress(keccak256(
-			bytes(1, 0xff) +
+			bytes{0xff} +
 			bytes(begin(message.sender.bytes), end(message.sender.bytes)) +
 			bytes(begin(message.create2_salt.bytes), end(message.create2_salt.bytes)) +
 			keccak256(bytes(message.input_data, message.input_data + message.input_size)).asBytes()
-		), h160::AlignLeft);
+		), h160::AlignRight);
+
 		message.destination = convertToEVMC(createAddress);
 		if (accounts.count(message.destination) && (
 			accounts[message.destination].nonce > 0 ||

From 0357cedb5c1901c60b33484640e36cf3c912c997 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 16 Sep 2022 15:53:19 +0200
Subject: [PATCH 0929/1748] Update tests and include new for create/create2
 calculation

---
 .../events/event_emit_from_other_contract.sol |  2 +-
 .../events/event_indexed_function.sol         |  2 +-
 .../events/event_indexed_function2.sol        |  4 +-
 .../functionCall/failed_create.sol            |  4 +-
 .../functionTypes/address_member.sol          |  2 +-
 .../function_external_delete_storage.sol      |  2 +-
 .../external_function_pointer_address.sol     |  4 +-
 .../balance_other_contract.sol                |  4 +-
 .../salted_create/prediction_example.sol      | 29 ++++++++++++++
 .../semanticTests/tryCatch/create.sol         |  2 +-
 .../tryCatch/return_function.sol              |  2 +-
 .../semanticTests/various/create_random.sol   | 39 +++++++++++++++++++
 .../viaYul/conversion/function_cast.sol       |  2 +-
 .../semanticTests/viaYul/function_address.sol |  2 +-
 14 files changed, 84 insertions(+), 16 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/salted_create/prediction_example.sol
 create mode 100644 test/libsolidity/semanticTests/various/create_random.sol

diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 300efd739c..aa5074fa2a 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -19,4 +19,4 @@ contract C {
 // gas legacy: 250376
 // gas legacyOptimized: 174522
 // deposit(bytes32), 18 wei: 0x1234 ->
-// ~ emit Deposit(address,bytes32,uint256) from 0xf01f7809444bd9a93a854361c6fae3f23d9e23db: #0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b, #0x1234, 0x00
+// ~ emit Deposit(address,bytes32,uint256) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: #0xc06afe3a8444fc0004668591e8306bfb9968e79e, #0x1234, 0x00
diff --git a/test/libsolidity/semanticTests/events/event_indexed_function.sol b/test/libsolidity/semanticTests/events/event_indexed_function.sol
index d075270a84..ea75741595 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_function.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_function.sol
@@ -6,4 +6,4 @@ contract C {
 }
 // ----
 // f() ->
-// ~ emit Test(function): #0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b26121ff00000000000000000
+// ~ emit Test(function): #0xc06afe3a8444fc0004668591e8306bfb9968e79e26121ff00000000000000000
diff --git a/test/libsolidity/semanticTests/events/event_indexed_function2.sol b/test/libsolidity/semanticTests/events/event_indexed_function2.sol
index 9c5ef3263f..d4c47e868a 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_function2.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_function2.sol
@@ -10,6 +10,6 @@ contract C {
 }
 // ----
 // f1() ->
-// ~ emit TestA(function): #0x0fdd67305928fcac8d213d1e47bfa6165cd0b87bc27fc3050000000000000000
+// ~ emit TestA(function): #0xc06afe3a8444fc0004668591e8306bfb9968e79ec27fc3050000000000000000
 // f2(uint256): 1 ->
-// ~ emit TestB(function): #0x0fdd67305928fcac8d213d1e47bfa6165cd0b87bbf3724af0000000000000000
+// ~ emit TestB(function): #0xc06afe3a8444fc0004668591e8306bfb9968e79ebf3724af0000000000000000
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index c963c0e209..cf865ff19d 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -20,7 +20,7 @@ contract C {
 // gas irOptimized: 184005
 // gas legacy: 294335
 // gas legacyOptimized: 173427
-// f(uint256): 20 -> 1370859564726510389319704988634906228201275401179
+// f(uint256): 20 -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
 // x() -> 1
 // f(uint256): 20 -> FAILURE
 // x() -> 1
@@ -29,5 +29,5 @@ contract C {
 // gas legacy: 483942
 // gas legacyOptimized: 302349
 // x() -> 1
-// stack(uint256): 10 -> 693016686122178122849713379390321835634789309880
+// stack(uint256): 10 -> 0x87948bd7ebbe13a00bfd930c93e4828ab18e3908
 // x() -> 2
diff --git a/test/libsolidity/semanticTests/functionTypes/address_member.sol b/test/libsolidity/semanticTests/functionTypes/address_member.sol
index 91229be10a..c407a3ab63 100644
--- a/test/libsolidity/semanticTests/functionTypes/address_member.sol
+++ b/test/libsolidity/semanticTests/functionTypes/address_member.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // compileToEwasm: also
 // ----
-// f() -> 90572315268751552425567948436632610904688605307, 90572315268751552425567948436632610904688605307
+// f() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e, 0xc06afe3a8444fc0004668591e8306bfb9968e79e
diff --git a/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol b/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
index b432719ec0..d5e105e5f5 100644
--- a/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
+++ b/test/libsolidity/semanticTests/functionTypes/function_external_delete_storage.sol
@@ -25,7 +25,7 @@ contract C {
 // increment() ->
 // y() -> 1
 // set() ->
-// x() -> 0xfdd67305928fcac8d213d1e47bfa6165cd0b87bd09de08a0000000000000000
+// x() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79ed09de08a0000000000000000
 // increment() ->
 // y() -> 2
 // incrementIndirectly() ->
diff --git a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
index d0461363c1..ae891df5dc 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/external_function_pointer_address.sol
@@ -13,5 +13,5 @@ contract C {
 	}
 }
 // ----
-// testYul() -> 0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b
-// testSol() -> 0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b
+// testYul() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e
+// testSol() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index c536367a43..5013ef4ced 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -23,5 +23,5 @@ contract ClientReceipt {
 // gas irOptimized: 191881
 // gas legacy: 235167
 // gas legacyOptimized: 180756
-// getAddress() -> 0xf01f7809444bd9a93a854361c6fae3f23d9e23db
-// balance: 0xf01f7809444bd9a93a854361c6fae3f23d9e23db -> 500
+// getAddress() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
+// balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 500
diff --git a/test/libsolidity/semanticTests/salted_create/prediction_example.sol b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
new file mode 100644
index 0000000000..1b138bdbb3
--- /dev/null
+++ b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
@@ -0,0 +1,29 @@
+contract D {
+    uint public x;
+    constructor(uint a) {
+        x = a;
+    }
+}
+
+contract C {
+    function createDSalted(bytes32 salt, uint arg) public {
+        address predictedAddress = address(uint160(uint(keccak256(abi.encodePacked(
+            bytes1(0xff),
+            address(this),
+            salt,
+            keccak256(abi.encodePacked(
+                type(D).creationCode,
+                arg
+            ))
+        )))));
+
+        D d = new D{salt: salt}(arg);
+        require(address(d) == predictedAddress, "Address mismatch.");
+    }
+}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: also
+// ----
+// createDSalted(bytes32,uint256): 42, 64 ->
+// gas legacy: 104365
diff --git a/test/libsolidity/semanticTests/tryCatch/create.sol b/test/libsolidity/semanticTests/tryCatch/create.sol
index ad7f734c75..43d0f22f65 100644
--- a/test/libsolidity/semanticTests/tryCatch/create.sol
+++ b/test/libsolidity/semanticTests/tryCatch/create.sol
@@ -29,4 +29,4 @@ contract C {
 // EVMVersion: >=byzantium
 // ----
 // f() -> 0, 0, 96, 13, "test message."
-// g() -> 0xf01f7809444bd9a93a854361c6fae3f23d9e23db, 0, 96, 7, "success"
+// g() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a, 0, 96, 7, "success"
diff --git a/test/libsolidity/semanticTests/tryCatch/return_function.sol b/test/libsolidity/semanticTests/tryCatch/return_function.sol
index 82d5dc8212..6aac30fe46 100644
--- a/test/libsolidity/semanticTests/tryCatch/return_function.sol
+++ b/test/libsolidity/semanticTests/tryCatch/return_function.sol
@@ -14,4 +14,4 @@ contract C {
     function fun() public pure {}
 }
 // ----
-// f() -> 0x1, 0xfdd67305928fcac8d213d1e47bfa6165cd0b87b946644cd0000000000000000, 9
+// f() -> 0x1, 0xc06afe3a8444fc0004668591e8306bfb9968e79e946644cd0000000000000000, 9
diff --git a/test/libsolidity/semanticTests/various/create_random.sol b/test/libsolidity/semanticTests/various/create_random.sol
new file mode 100644
index 0000000000..676ec32a89
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/create_random.sol
@@ -0,0 +1,39 @@
+contract C {
+    function addr() external returns (address) {
+        return address(this);
+    }
+
+    function testRunner() external returns (address a1, address a2) {
+        assembly {
+            // This is `return(0, 1)`. We are using a simplified/fixed initcode to avoid
+            // instability due to metadata changes.
+            let initcode := hex"60016000f3"
+            mstore(0, initcode)
+
+            a1 := create(0, 0, 5)
+            a2 := create2(0, 0, 5, address())
+        }
+    }
+
+    function testCalc() external returns (address a1, address a2) {
+        a1 = calculateCreate(address(this), 1);
+        a2 = calculateCreate2(address(this), keccak256(hex"60016000f3"), bytes32(uint256(uint160(address(this)))));
+    }
+
+    function calculateCreate(address from, uint256 nonce) private pure returns (address) {
+        assert(nonce <= 127);
+        bytes memory data =
+            bytes.concat(hex"d694", bytes20(uint160(from)), nonce == 0 ? bytes1(hex"80") : bytes1(uint8(nonce)));
+        return address(uint160(uint256(keccak256(data)))); // Take the lower 160-bits
+    }
+
+    function calculateCreate2(address creator, bytes32 codehash, bytes32 salt) private pure returns (address) {
+        return address(uint160(uint256(keccak256(abi.encodePacked(bytes1(0xff), creator, salt, codehash)))));
+    }
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// addr() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e
+// testRunner() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a, 0x2c1c30623ddd93e0b765a6caaca0c859eeb0644d
+// testCalc() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a, 0x2c1c30623ddd93e0b765a6caaca0c859eeb0644d
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol b/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
index 0d9eb6caee..843376baa5 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/function_cast.sol
@@ -18,4 +18,4 @@ contract C {
 // ----
 // f(uint256): 2 -> 4
 // h(uint256): 2 -> 5
-// t() -> 0xFDD67305928FCAC8D213D1E47BFA6165CD0B87BB3DE648B0000000000000000, 0xFDD67305928FCAC8D213D1E47BFA6165CD0B87BB3DE648B0000000000000000
+// t() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79eb3de648b0000000000000000, 0xc06afe3a8444fc0004668591e8306bfb9968e79eb3de648b0000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/function_address.sol b/test/libsolidity/semanticTests/viaYul/function_address.sol
index af629a4fe2..e7d6c49a22 100644
--- a/test/libsolidity/semanticTests/viaYul/function_address.sol
+++ b/test/libsolidity/semanticTests/viaYul/function_address.sol
@@ -12,6 +12,6 @@ contract C {
 // ====
 // compileToEwasm: also
 // ----
-// f() -> 0x0fdd67305928fcac8d213d1e47bfa6165cd0b87b
+// f() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e
 // g() -> true
 // h(function): left(0x1122334400112233445566778899AABBCCDDEEFF42424242) -> 0x1122334400112233445566778899AABBCCDDEEFF

From f5c85662ca95111cb433ecbf729c3b37d8215648 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Tue, 27 Sep 2022 23:32:12 +0200
Subject: [PATCH 0930/1748] Drop deprecated UndefMacros file

---
 liblangutil/CMakeLists.txt |  1 -
 liblangutil/Token.cpp      |  1 -
 liblangutil/Token.h        |  2 --
 liblangutil/UndefMacros.h  | 47 --------------------------------------
 4 files changed, 51 deletions(-)
 delete mode 100644 liblangutil/UndefMacros.h

diff --git a/liblangutil/CMakeLists.txt b/liblangutil/CMakeLists.txt
index 626d2945ab..53be57e79d 100644
--- a/liblangutil/CMakeLists.txt
+++ b/liblangutil/CMakeLists.txt
@@ -26,7 +26,6 @@ set(sources
 	SourceReferenceFormatter.h
 	Token.cpp
 	Token.h
-	UndefMacros.h
 	UniqueErrorReporter.h
 )
 
diff --git a/liblangutil/Token.cpp b/liblangutil/Token.cpp
index d7620ef13d..60b8aa7987 100644
--- a/liblangutil/Token.cpp
+++ b/liblangutil/Token.cpp
@@ -46,7 +46,6 @@
 
 #include <map>
 
-
 using namespace std;
 
 namespace solidity::langutil
diff --git a/liblangutil/Token.h b/liblangutil/Token.h
index eb8015f4d4..c4907aeace 100644
--- a/liblangutil/Token.h
+++ b/liblangutil/Token.h
@@ -42,8 +42,6 @@
 
 #pragma once
 
-#include <liblangutil/UndefMacros.h>
-
 #include <iosfwd>
 #include <string>
 #include <tuple>
diff --git a/liblangutil/UndefMacros.h b/liblangutil/UndefMacros.h
deleted file mode 100644
index e3dde6d315..0000000000
--- a/liblangutil/UndefMacros.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-	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
-/** @file UndefMacros.h
- * @author Lefteris  <lefteris@ethdev.com>
- * @date 2015
- *
- * This header should be used to #undef some really evil macros defined by
- * windows.h which result in conflict with our Token.h
- */
-#pragma once
-
-#if defined(_MSC_VER) || defined(__MINGW32__)
-
-#undef DELETE
-#undef IN
-#undef VOID
-#undef THIS
-#undef CONST
-
-// Conflicting define on MinGW in windows.h
-// windows.h(19): #define interface struct
-#ifdef interface
-#undef interface
-#endif
-
-#elif defined(DELETE) || defined(IN) || defined(VOID) || defined(THIS) || defined(CONST) || defined(interface)
-
-#error "The preceding macros in this header file are reserved for V8's "\
-"TOKEN_LIST. Please add a platform specific define above to undefine "\
-"overlapping macros."
-
-#endif

From 71308ce5ee8ef6c4b6a8da3248cbe3379d7643a2 Mon Sep 17 00:00:00 2001
From: Riley <32427668+R-Y-M-R@users.noreply.github.com>
Date: Wed, 28 Sep 2022 06:32:42 -0400
Subject: [PATCH 0931/1748] Improve phrasing.

---
 docs/examples/blind-auction.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/examples/blind-auction.rst b/docs/examples/blind-auction.rst
index b0a86f248d..3c7b3dcc69 100644
--- a/docs/examples/blind-auction.rst
+++ b/docs/examples/blind-auction.rst
@@ -177,7 +177,7 @@ During the **bidding period**, a bidder does not actually send their bid, but
 only a hashed version of it.  Since it is currently considered practically
 impossible to find two (sufficiently long) values whose hash values are equal,
 the bidder commits to the bid by that.  After the end of the bidding period,
-the bidders have to reveal their bids: They send their values unencrypted and
+the bidders have to reveal their bids: They send their values unencrypted, and
 the contract checks that the hash value is the same as the one provided during
 the bidding period.
 
@@ -189,7 +189,7 @@ transfers cannot be blinded in Ethereum, anyone can see the value.
 The following contract solves this problem by accepting any value that is
 larger than the highest bid. Since this can of course only be checked during
 the reveal phase, some bids might be **invalid**, and this is on purpose (it
-even provides an explicit flag to place invalid bids with high value
+even provides an explicit flag to place invalid bids with high-value
 transfers): Bidders can confuse competition by placing several high or low
 invalid bids.
 

From 269a0463e45a8afc31e7acab8e05250b3954ad8d Mon Sep 17 00:00:00 2001
From: Riley <32427668+R-Y-M-R@users.noreply.github.com>
Date: Wed, 28 Sep 2022 06:38:05 -0400
Subject: [PATCH 0932/1748] Update spelling and phrasing.

---
 docs/examples/micropayment.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/examples/micropayment.rst b/docs/examples/micropayment.rst
index c95d7c5e41..7ade926572 100644
--- a/docs/examples/micropayment.rst
+++ b/docs/examples/micropayment.rst
@@ -2,7 +2,7 @@
 Micropayment Channel
 ********************
 
-In this section we will learn how to build an example implementation
+In this section, we will learn how to build an example implementation
 of a payment channel. It uses cryptographic signatures to make
 repeated transfers of Ether between the same parties secure, instantaneous, and
 without transaction fees. For the example, we need to understand how to
@@ -17,14 +17,14 @@ Alice is the sender and Bob is the recipient.
 Alice only needs to send cryptographically signed messages off-chain
 (e.g. via email) to Bob and it is similar to writing checks.
 
-Alice and Bob use signatures to authorise transactions, which is possible with smart contracts on Ethereum.
+Alice and Bob use signatures to authorize transactions, which is possible with smart contracts on Ethereum.
 Alice will build a simple smart contract that lets her transmit Ether, but instead of calling a function herself
 to initiate a payment, she will let Bob do that, and therefore pay the transaction fee.
 
 The contract will work as follows:
 
     1. Alice deploys the ``ReceiverPays`` contract, attaching enough Ether to cover the payments that will be made.
-    2. Alice authorises a payment by signing a message with her private key.
+    2. Alice authorizes a payment by signing a message with her private key.
     3. Alice sends the cryptographically signed message to Bob. The message does not need to be kept secret
        (explained later), and the mechanism for sending it does not matter.
     4. Bob claims his payment by presenting the signed message to the smart contract, it verifies the
@@ -259,7 +259,7 @@ Messages are cryptographically signed by the sender and then transmitted directl
 Each message includes the following information:
 
     * The smart contract's address, used to prevent cross-contract replay attacks.
-    * The total amount of Ether that is owed the recipient so far.
+    * The total amount of Ether that is owed to the recipient so far.
 
 A payment channel is closed just once, at the end of a series of transfers.
 Because of this, only one of the messages sent is redeemed. This is why

From ac5d575e9c9da945333177286c5f6a70a8cc874b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 27 Sep 2022 15:33:22 +0200
Subject: [PATCH 0933/1748] path-resolution.rst: Typo, segument -> segment

---
 docs/path-resolution.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/path-resolution.rst b/docs/path-resolution.rst
index 40a727068b..2c2fab7663 100644
--- a/docs/path-resolution.rst
+++ b/docs/path-resolution.rst
@@ -197,7 +197,7 @@ source unit name.
 
     A source unit name is just an identifier and even if its value happens to look like a path, it
     is not subject to the normalization rules you would typically expect in a shell.
-    Any ``/./`` or ``/../`` seguments or sequences of multiple slashes remain a part of it.
+    Any ``/./`` or ``/../`` segments or sequences of multiple slashes remain a part of it.
     When the source is provided via Standard JSON interface it is entirely possible to associate
     different content with source unit names that would refer to the same file on disk.
 

From 1df95ed5520c77f172e72a0277ae69d7f8682235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 27 Sep 2022 15:34:29 +0200
Subject: [PATCH 0934/1748] path-resolution.rst: Rewrite relative import
 normalizatin rules to make them more precise

---
 docs/path-resolution.rst | 31 +++++++++++--------------------
 1 file changed, 11 insertions(+), 20 deletions(-)

diff --git a/docs/path-resolution.rst b/docs/path-resolution.rst
index 2c2fab7663..c61abce0a2 100644
--- a/docs/path-resolution.rst
+++ b/docs/path-resolution.rst
@@ -248,19 +248,14 @@ and is bounded by two path separators.
 A separator is a forward slash or the beginning/end of the string.
 For example in ``./abc/..//`` there are three path segments: ``.``, ``abc`` and ``..``.
 
-The compiler computes a source unit name from the import path in the following way:
+The compiler resolves the import into a source unit name based on the import path, in the following way:
 
-1. First a prefix is computed
-
-    - Prefix is initialized with the source unit name of the importing source unit.
-    - The last path segment with preceding slashes is removed from the prefix.
-    - Then, the leading part of the normalized import path, consisting only of ``/`` and ``.``
-      characters is considered.
-      For every ``..`` segment found in this part the last path segment with preceding slashes is
-      removed from the prefix.
-
-2. Then the prefix is prepended to the normalized import path.
-   If the prefix is non-empty, a single slash is inserted between it and the import path.
+#. We start with the source unit name of the importing source unit.
+#. The last path segment with preceding slashes is removed from the resolved name.
+#. Then, for every segment in the import path, starting from the leftmost one:
+    - If the segment is ``.``, it is skipped.
+    - If the segment is ``..``, the last path segment with preceding slashes is removed from the resolved name.
+    - Otherwise, the segment (preceded by a single slash if the resolved name is not empty), is appended to the resolved name.
 
 The removal of the last path segment with preceding slashes is understood to
 work as follows:
@@ -268,14 +263,10 @@ work as follows:
 1. Everything past the last slash is removed (i.e. ``a/b//c.sol`` becomes ``a/b//``).
 2. All trailing slashes are removed (i.e. ``a/b//`` becomes ``a/b``).
 
-The normalization rules are the same as for UNIX paths, namely:
-
-- All the internal ``.`` segments are removed.
-- Every internal ``..`` segment backtracks one level up in the hierarchy.
-- Multiple slashes are squashed into a single one.
-
-Note that normalization is performed only on the import path.
-The source unit name of the importing module that is used for the prefix remains unnormalized.
+Note that the process normalizes the part of the resolved source unit name that comes from the import path according
+to the usual rules for UNIX paths, i.e. all ``.`` and ``..`` are removed and multiple slashes are
+squashed into a single one.
+On the other hand, the part that comes from the source unit name of the importing module remains unnormalized.
 This ensures that the ``protocol://`` part does not turn into ``protocol:/`` if the importing file
 is identified with a URL.
 

From b3b9b88dee4c03e002ed6b3760a84a5ef54121d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 22 Sep 2022 16:55:45 +0200
Subject: [PATCH 0935/1748] Add review checklist

---
 ReviewChecklist.md    | 169 ++++++++++++++++++++++++++++++++++++++++++
 docs/contributing.rst |   5 ++
 2 files changed, 174 insertions(+)
 create mode 100644 ReviewChecklist.md

diff --git a/ReviewChecklist.md b/ReviewChecklist.md
new file mode 100644
index 0000000000..1c572cd0d3
--- /dev/null
+++ b/ReviewChecklist.md
@@ -0,0 +1,169 @@
+# PR Review Checklist
+The Solidity compiler is a critical piece of infrastructure in the Ethereum ecosystem.
+For this reason, our review process is quite strict and all PRs have to fulfill certain quality
+expectations and guidelines.
+The list below is meant to reduce the workload on the core team by helping contributors self-identify
+and solve common issues before they are pointed out in the review.
+It is also meant to serve as a final checklist for reviewers to go through before approving a PR.
+
+## Before You Submit a PR
+- [ ] **Is the issue ready to be worked on?**
+    - If the issue does not have a desirability label (`nice to have`, `should have`,
+        `must have eventually`, `must have`, `roadmap`) we have not yet decided whether to implement it.
+    - If the issue has the `needs design` label, we have not yet decided how it should be implemented.
+    - `good first issue candidate` means that the issue will potentially be a `good first issue`
+        eventually but at the moment it is not yet ready to be worked on.
+- [ ] **Is this a breaking change?** Breaking changes should be based on the `breaking` branch rather than on the `develop` branch.
+- [ ] **Does the PR actually address the issue?**
+    - [ ] Mention the issue number in the PR description.
+        If the PR solves it completely, use the `Fixes #<issue number>` form so that Github will close the issue automatically.
+    - [ ] Do not include the issue number in the PR title, branch name or commit description.
+- [ ] When submitting a PR from a fork **create a branch and give it a descriptive name.**
+    E.g. `fix-array-abi-encoding-bug`.
+    Do not submit PRs directly from the `develop` branch of your fork since it makes rebasing and fetching new changes harder.
+- [ ] **Does the PR depend on other PRs?**
+    - [ ] If the PR has dependencies, mention them in bold in the description.
+    - [ ] Avoid basing PRs from forks on branches other than `develop` or `breaking` because
+        GitHub closes them when the base branch gets merged.
+        Do this only for PRs created directly in the main repo.
+
+## Coding Style and Good Practices
+- [ ] Does the PR follow our [coding style](CODING_STYLE.md)?
+
+### Reliability
+- [ ] **Use assertions liberally.** If you are certain your assumption will not be broken, prove it with `solAssert()`.
+- [ ] **Validate inputs and handle errors**. Note that assertions are **not** validation.
+
+### Readability
+- [ ] **Choose good names.**
+    - [ ] Is the name straightforward to understand?
+        Do you feel the need to jump back to the definition and remind yourself what it was whenever you see it?
+    - [ ] Is the name unambiguous in the context where it is used?
+    - [ ] Avoid abbreviations.
+- [ ] **Source files, classes and public functions should have docstrings.**
+- [ ] **Avoid code duplication.** But not fanatically. Minimal amounts of duplication are acceptable if it aids readability.
+- [ ] **Do not leave dead or commented-out code behind.** You can still see old code in history.
+      If you really have a good reason to do it, always leave a comment explaining what it is and why it is there.
+- [ ] **Mark hacks as such.** If you have to leave behind a temporary workaround, make
+    sure to include a comment that explains why and in what circumstances it can be removed.
+    Preferably link to an issue you reported upstream.
+- [ ] **Avoid obvious comments.**
+- [ ] **Do include comments when the reader may need extra context to understand the code.**
+
+### Commits and PRs
+- [ ] **Avoid hiding functional changes inside refactors.**
+    E.g. when fixing a small bug, or changing user-visible behavior, put the change in a separate commit.
+    Do not mix it with another change that renames things or reformats the code around, making the fix itself hard to identify.
+- [ ] **Whenever possible, split off refactors or unrelated changes into separate PRs.**
+    Smaller PRs are easier and quicker to review.
+    Splitting off refactors helps focus on the main point of the PR.
+
+### Common Pitfalls
+The following points are all covered by the coding style but come up so often that it is worth singling them out here:
+- [ ] **Always initialize value types in the definition,** even if you are sure you will assign them later.
+- [ ] **Use "east const" style.** I.e. `T const*`, not `const T *`.
+- [ ] **Keep indentation consistent.** See our [`.editorconfig`](.editorconfig).
+    - [ ] Tabs for C++. But use them for indentation only. Any whitespace later on the line must consist of spaces.
+    - [ ] 4 spaces for most other file types.
+- [ ] **Use `auto` sparingly.** Only use it when the actual type is very long and complicated or when it is
+    already used elsewhere in the same expression.
+- [ ] **Indent braces and parentheses in a way that makes nesting clear.**
+- [ ] **Use `using namespace` only in `.cpp` files.** Use it for `std` and our own modules.
+    Avoid unnecessary `std::` prefix in `.cpp` files (except for `std::move`).
+- [ ] **Use range-based loops and destructuring.**
+- [ ] **Include any headers you use directly,** even if they are implicitly included through other headers.
+
+## Documentation
+- [ ] **Does the PR update relevant documentation?**
+
+### Documentation Style and Good Practices
+- [ ] **Use double backticks in RST (``` ``x`` ```). Prefer single backticks in Markdown (`` `x` ``),**
+    but note that double backticks are valid too and we use them in some cases for legacy reasons.
+- [ ] **Always start a new sentence on a new line.**
+    This way you do not have to rewrap the surrounding text when you rewrite the sentence.
+    This also makes changes actually easier to spot in the diff.
+
+## Testing
+
+### What to Test
+- [ ] **Is newly added code adequately covered by tests?** Have you considered all the important corner cases?
+- If it is a bugfix:
+    - [ ] **The PR must include tests that reproduce the bug.**
+    - [ ] **Are there gaps in test coverage of the buggy feature?** Fill them by adding more tests.
+    - [ ] **Try to break it.** Can you of any similar features that could also be buggy?
+        Play with the repro and include prominent variants as separate test cases, even if they don't trigger a bug.
+- [ ] **Positive cases (code that compiles) should have a semantic test.**
+- [ ] **Negative cases (code with compilation errors) should have a syntax test.**
+- [ ] **Avoid mixing positive and negative cases in the same syntax test.**
+    If the test produces an error, we stop at the analysis stage and we will not detect
+    problems that only occur in code generation, optimizer or assembler.
+    - [ ] If you have to do it, at least mark positive cases inside the file with a short comment.
+        - This way, when the test is updated, it is easier to verify that these cases still do not trigger an error.
+- [ ] New syntax: **does it have an [`ASTJSON`](test/libsolidity/ASTJSON/) test?**
+- [ ] New CLI or StandardJSON option:
+    - [ ] **Does it have a [command-line test](test/cmdlineTests/)?**
+    - [ ] **Is the option listed for every input mode in [`CommandLineParser` tests](test/solc/CommandLineParser.cpp)?**
+- [ ] **Did you consider interactions with other language features?**
+    - [ ] Are all types covered? Structs? Enums? Contracts/libraries/interfaces? User-defined value types?
+        Value types: integers, fixed bytes, `address`, `address payable`, `bool`? Function pointers?
+        Static and dynamic arrays? `string` and `bytes`? Mappings?
+        Values of types that cannot be named: literals, tuples, array slices, storage references?
+    - [ ] If it accepts a function, does it also accept an event or an error? These have function types but are not functions.
+    - [ ] If it affects free functions, what about internal library functions?
+    - [ ] Bound library functions? Functions bound with `using for`?
+    - [ ] Possible combinations of `storage`, `memory`, `calldata`, `immutable`, `constant`?
+        Remember that internal functions can take `storage` arguments.
+    - [ ] Does it work at construction time as well? What if you store it at construction time and read after deployment?
+    - [ ] What about importing it from a different module or inheriting it?
+    - [ ] Have you tested it with the ternary operator?
+
+### Test Style and Good Practices
+- [ ] **Make test case file names long and specific enough** so that it is easy to guess what is inside.
+    When checking if we have the case already covered the name is usually the only clue we see.
+    - [ ] Place them in the right subdirectory.
+    - [ ] **Avoid simply appending numbers to the name to distinguish similar cases.**
+        Coming up with good names is hard but figuring out if any of hundreds of tests with names that
+        match your search actually fits your case is even harder.
+- [ ] **Do not include version pragma and the SPDX comment in semantic and syntax test cases**.
+    In other test types include them if necessary to suppress warnings.
+- [ ] **If you have to use a version pragma, avoid hard-coding version.** Use `pragma solidity *`.
+- [ ] **Add `--pretty-print --pretty-json 4` to the `args` file of in command-line tests** to get
+    readable, indented output.
+- [ ] **When writing StandardJSON command-line tests, use `urls` instead of `content`** and put
+    the Solidity or Yul code in a separate file.
+
+## Compiler-specific
+- [ ] **Are error messages sensible and understandable to users?**
+- [ ] **Are error codes consistent?**
+    - [ ] Avoid randomly changing or reassigning error codes.
+    - [ ] Avoid defining separate codes for trivial variants of the same issue.
+        Make it easy for tools to consistently refer to the same error with the same code.
+- [ ] **Error messages should end with a full stop.**
+- [ ] **Prefer Ranges v3 to Boost where possible.**
+
+## Take a Step Back
+- [ ] **Do you fully understand what the PR does and why?**
+- [ ] **Are you confident that the code works and does not break unrelated functionality?**
+- [ ] **Is this a reasonable way to achieve the goal stated in the issue?**
+- [ ] **Is the code simple?** Does the PR achieve its objective at the cost of significant
+    complexity that may be a source of future bugs?
+- [ ] **Is the code efficient?** Does the PR introduce any major performance bottlenecks?
+- [ ] **Does the PR introduce any breaking changes beyond what was agreed in the issue?**
+
+## Final Checks Before Merging
+- [ ] **Is the PR rebased on top of the `develop` branch** (or `breaking` if it is a breaking change)?
+- [ ] **Did all CI checks pass?**
+    - Note that we have a few jobs that tend to randomly fail due to outside factors, especially external tests (with `_ext_` in the name).
+        If these fail, rebase on latest `develop` (or `breaking`) and try rerunning them.
+        Note also that not all of these checks are required for the PR to be merged.
+- [ ] If the change is visible to users, **does the PR have a [changelog](Changelog.md) entry?**
+    - [ ] Is the changelog entry in the right section?
+        Make sure to move it up if there was a release recently.
+- [ ] **Is commit history simple and understandable?**
+    - [ ] Each commit should be a self-contained, logical step leading the goal of the PR, without going back and forth.
+        In particular, review fixups should be squashed into the commits they fix.
+    - [ ] Do not include any merge commits in your branch. Please use rebase to keep up to date with the base branch.
+- [ ] **Is the PR properly labeled?**
+    - Use `external contribution` label to mark PRs not coming from the core team.
+    - If the PR depends on other PRs, use `has dependencies` and set the base branch accordingly.
+    - Labels like `documentation` or `optimizer` are helpful for filtering PRs.
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 9da7f02d0f..5c1a58a7e9 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -77,6 +77,11 @@ Finally, please make sure you respect the `coding style
 for this project. Also, even though we do CI testing, please test your code and
 ensure that it builds locally before submitting a pull request.
 
+We highly recommend going through our `review checklist <https://github.com/ethereum/solidity/blob/develop/ReviewChecklist.md>`
+before submitting the pull request.
+We thoroughly review every PR and will help you get it right, but there are many
+common problems that can be easily avoided, making the review much smoother.
+
 Thank you for your help!
 
 Running the Compiler Tests

From bfd83c966a1c40012ff50ceaacc0e319697698aa Mon Sep 17 00:00:00 2001
From: Rajkumar gaur <rajgaur98@gmail.com>
Date: Wed, 28 Sep 2022 08:24:54 +0530
Subject: [PATCH 0936/1748] Updated Whiskers for checking invalid tags

For Example, raise an error if it contains invalid tags like
<?ba<!b</b
---
 libsolutil/Whiskers.cpp      | 12 ++++++++++++
 libsolutil/Whiskers.h        |  1 +
 test/libsolutil/Whiskers.cpp | 30 ++++++++++++++++++++++++++++--
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/libsolutil/Whiskers.cpp b/libsolutil/Whiskers.cpp
index 043f2dd76e..b6d3ebde0c 100644
--- a/libsolutil/Whiskers.cpp
+++ b/libsolutil/Whiskers.cpp
@@ -34,6 +34,7 @@ using namespace solidity::util;
 Whiskers::Whiskers(string _template):
 	m_template(std::move(_template))
 {
+	checkTemplateValid();
 }
 
 Whiskers& Whiskers::operator()(string _parameter, string _value)
@@ -74,6 +75,17 @@ string Whiskers::render() const
 	return replace(m_template, m_parameters, m_conditions, m_listParameters);
 }
 
+void Whiskers::checkTemplateValid() const
+{
+	regex validTemplate("<[#?!\\/]\\+{0,1}[a-zA-Z0-9_$-]+(?:[^a-zA-Z0-9_$>-]|$)");
+	smatch match;
+	assertThrow(
+		!regex_search(m_template, match, validTemplate),
+		WhiskersError,
+		"Template contains an invalid/unclosed tag " + match.str()
+	);
+}
+
 void Whiskers::checkParameterValid(string const& _parameter) const
 {
 	static regex validParam("^" + paramRegex() + "$");
diff --git a/libsolutil/Whiskers.h b/libsolutil/Whiskers.h
index 7bbf74f096..e65e508ae7 100644
--- a/libsolutil/Whiskers.h
+++ b/libsolutil/Whiskers.h
@@ -92,6 +92,7 @@ class Whiskers
 private:
 	// Prevent implicit cast to bool
 	Whiskers& operator()(std::string _parameter, long long);
+	void checkTemplateValid() const;
 	void checkParameterValid(std::string const& _parameter) const;
 	void checkParameterUnknown(std::string const& _parameter) const;
 
diff --git a/test/libsolutil/Whiskers.cpp b/test/libsolutil/Whiskers.cpp
index 4f148f101d..5b43d8d543 100644
--- a/test/libsolutil/Whiskers.cpp
+++ b/test/libsolutil/Whiskers.cpp
@@ -88,8 +88,34 @@ BOOST_AUTO_TEST_CASE(conditional_with_else)
 BOOST_AUTO_TEST_CASE(broken_conditional_with_else)
 {
 	string templ = "<?b>X<!bY</b>";
-	BOOST_CHECK_EQUAL(Whiskers(templ)("b", true).render(), "X<!bY");
-	BOOST_CHECK_EQUAL(Whiskers(templ)("b", false).render(), "");
+	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
+
+	templ = "<?bX<!b>Y</b>";
+	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
+
+	templ = "<?b>X<!b>Y</b";
+	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
+}
+
+BOOST_AUTO_TEST_CASE(broken_conditional_value_with_else)
+{
+	string templ = "<?+b>X<!+bY</+b>";
+	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
+
+	templ = "<?+bX<!+b>Y</+b>";
+	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
+
+	templ = "<?+b>X<!+b>Y</+b";
+	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
+}
+
+BOOST_AUTO_TEST_CASE(broken_list_parameter)
+{
+	string templ = "<#b><a></b";
+	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
+
+	templ = "<#b<a></b>";
+	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
 }
 
 BOOST_AUTO_TEST_CASE(conditional_plus_params)

From 9e674ba0471d6859e905cf182271077ac0d261eb Mon Sep 17 00:00:00 2001
From: Marenz <github@supradigital.org>
Date: Thu, 29 Sep 2022 13:41:58 +0200
Subject: [PATCH 0937/1748] Forward declare Instruction enum in EVMVersion

---
 liblangutil/EVMVersion.cpp                        | 1 +
 liblangutil/EVMVersion.h                          | 8 ++++++--
 libyul/AsmAnalysis.cpp                            | 2 ++
 libyul/backends/evm/EVMCodeTransform.cpp          | 2 ++
 libyul/backends/evm/OptimizedEVMCodeTransform.cpp | 2 ++
 libyul/optimiser/ReasoningBasedSimplifier.cpp     | 2 ++
 6 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
index 7b34fe7d2e..24ef0673d8 100644
--- a/liblangutil/EVMVersion.cpp
+++ b/liblangutil/EVMVersion.cpp
@@ -20,6 +20,7 @@
  */
 
 #include <liblangutil/EVMVersion.h>
+#include <libevmasm/Instruction.h>
 
 using namespace solidity;
 using namespace solidity::evmasm;
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index c68441f01b..268df7d9d6 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -21,14 +21,18 @@
 
 #pragma once
 
-#include <libevmasm/Instruction.h>
-
 #include <optional>
 #include <string>
 
 #include <boost/operators.hpp>
 
 
+namespace solidity::evmasm
+{
+/// Virtual machine bytecode instruction. Forward declared from libevmasm/Instruction.h
+enum class Instruction: uint8_t;
+}
+
 namespace solidity::langutil
 {
 
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index c38c0ba8e2..2e9f8f1d3e 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -35,6 +35,8 @@
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/Visitor.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <boost/algorithm/string.hpp>
 
 #include <fmt/format.h>
diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index 7c9bf05cf1..d5e25a1d1e 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -30,6 +30,8 @@
 
 #include <liblangutil/Exceptions.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <range/v3/view/reverse.hpp>
 
 #include <range/v3/algorithm/max.hpp>
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index db73ba2a7a..2fa99ccb24 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -23,6 +23,8 @@
 
 #include <libyul/Utilities.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <libsolutil/Visitor.h>
 #include <libsolutil/cxx20.h>
 
diff --git a/libyul/optimiser/ReasoningBasedSimplifier.cpp b/libyul/optimiser/ReasoningBasedSimplifier.cpp
index af39978edb..24882d84e8 100644
--- a/libyul/optimiser/ReasoningBasedSimplifier.cpp
+++ b/libyul/optimiser/ReasoningBasedSimplifier.cpp
@@ -28,6 +28,8 @@
 
 #include <libsolutil/CommonData.h>
 
+#include <libevmasm/Instruction.h>
+
 #include <utility>
 #include <memory>
 

From 96168a143827aeff7c6f2f09d7c0161bb13558fb Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 30 Sep 2022 19:56:33 +0200
Subject: [PATCH 0938/1748] Add test for selfdestruct

Also drop less useful EndToEndTest
---
 test/libsolidity/SolidityEndToEndTest.cpp     | 23 ----------
 .../semanticTests/various/selfdestruct.sol    | 46 +++++++++++++++++++
 2 files changed, 46 insertions(+), 23 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/various/selfdestruct.sol

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 698f6de662..4d6a887bb9 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -912,29 +912,6 @@ BOOST_AUTO_TEST_CASE(transfer_ether)
 	)
 }
 
-BOOST_AUTO_TEST_CASE(selfdestruct)
-{
-	char const* sourceCode = R"(
-		contract test {
-			constructor() payable {}
-			function a(address payable receiver) public returns (uint ret) {
-				selfdestruct(receiver);
-				return 10;
-			}
-		}
-	)";
-	u256 amount(130);
-	h160 address(23);
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
-		compileAndRun(sourceCode, amount);
-		ABI_CHECK(callContractFunction("a(address)", address), bytes());
-		BOOST_CHECK(!addressHasCode(m_contractAddress));
-		BOOST_CHECK_EQUAL(balanceAt(address), amount);
-	)
-}
-
 BOOST_AUTO_TEST_CASE(keccak256)
 {
 	char const* sourceCode = R"(
diff --git a/test/libsolidity/semanticTests/various/selfdestruct.sol b/test/libsolidity/semanticTests/various/selfdestruct.sol
new file mode 100644
index 0000000000..b823bd14db
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/selfdestruct.sol
@@ -0,0 +1,46 @@
+contract C {
+  event Terminated();
+
+  constructor() payable {
+  }
+
+  function terminate() external {
+    emit Terminated();
+    selfdestruct(payable(msg.sender));
+    // Execution stops here, so the second one is not executed.
+    selfdestruct(payable(msg.sender));
+    emit Terminated();
+  }
+}
+
+contract D {
+  C public c;
+
+  constructor() payable {
+      c = new C{value: 1 ether}();
+  }
+
+  function f() external {
+      c.terminate();
+  }
+
+  function exists() external returns (bool) {
+      return address(c).code.length != 0;
+  }
+}
+// ----
+// constructor(), 1 ether ->
+// gas irOptimized: 188203
+// gas legacy: 261114
+// gas legacyOptimized: 181602
+// c() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
+// balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 1000000000000000000
+// balance -> 0
+// exists() -> true
+// f() ->
+// ~ emit Terminated() from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
+// balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 0
+// ~ emit Terminated() from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
+// balance -> 1000000000000000000
+// ~ emit Terminated() from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
+// exists() -> false

From 6c167374f7617f7307b2bfe7c86c59d2f3c62847 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 5 Oct 2022 10:13:55 +0200
Subject: [PATCH 0939/1748] Disable FETCHCONTENT_FULLY_DISCONNECTED on ppa
 release

---
 scripts/release_ppa.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index ac0a689888..2acd62cd36 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -217,7 +217,7 @@ override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DTESTS=OFF ${CMAKE_OPTIONS}
+	dh_auto_configure -- -DTESTS=OFF -DFETCHCONTENT_FULLY_DISCONNECTED=OFF ${CMAKE_OPTIONS}
 EOF
 cat <<EOF > debian/copyright
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/

From f39abf29b494af1c2320e0ab9143985b2749ac89 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 5 Oct 2022 14:25:09 +0200
Subject: [PATCH 0940/1748] Clarify github issues vs forum posts in docs.

Co-authored-by: Nuno Santos <nunofilipesantos@gmail.com>
---
 docs/contributing.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 1655438095..35af6ac0be 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -50,6 +50,9 @@ reporting issues, please mention the following details:
 Reducing the source code that caused the issue to a bare minimum is always
 very helpful, and sometimes even clarifies a misunderstanding.
 
+For technical discussions about language design, a post in the
+`Solidity forum <https://forum.soliditylang.org/>`_ is the correct place (see :ref:`solidity_language_design`).
+
 Workflow for Pull Requests
 ==========================
 
@@ -482,6 +485,8 @@ Running Documentation Tests
 Make sure your contributions pass our documentation tests by running ``./docs/docs.sh`` that installs dependencies
 needed for documentation and checks for any problems such as broken links or syntax issues.
 
+.. _solidity_language_design:
+
 Solidity Language Design
 ========================
 

From 2d4aa990fb44377b9ba0c30fa4102a542e6a8b9b Mon Sep 17 00:00:00 2001
From: Prusakova Katya <ekaterina.prusakova@f-secure.com>
Date: Wed, 21 Sep 2022 09:51:34 +0300
Subject: [PATCH 0941/1748] test copy_from_calldata.sol folder location update

Rename copy_from_calldata
---
 .../copying/calldata_1d_array_into_2d_memory_array_element.sol}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/libsolidity/semanticTests/{structs/copy_from_calldata.sol => array/copying/calldata_1d_array_into_2d_memory_array_element.sol} (100%)

diff --git a/test/libsolidity/semanticTests/structs/copy_from_calldata.sol b/test/libsolidity/semanticTests/array/copying/calldata_1d_array_into_2d_memory_array_element.sol
similarity index 100%
rename from test/libsolidity/semanticTests/structs/copy_from_calldata.sol
rename to test/libsolidity/semanticTests/array/copying/calldata_1d_array_into_2d_memory_array_element.sol

From a4ed92b546c6a1d7d373e433e3f7d75dfe5b9f28 Mon Sep 17 00:00:00 2001
From: Rafal Stozek <say4ne@gmail.com>
Date: Sat, 20 Aug 2022 23:49:12 +0200
Subject: [PATCH 0942/1748] Update misleading information about OpenZeppelin's
 ECDSA library

---
 docs/units-and-global-variables.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index b19396299c..cf4fb2bd7c 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -231,8 +231,8 @@ Mathematical and Cryptographic Functions
     for _transaction_ signatures (see `EIP-2 <https://eips.ethereum.org/EIPS/eip-2#specification>`_), but
     the ecrecover function remained unchanged.
 
-    This is usually not a problem unless you require signatures to be unique or
-    use them to identify items. OpenZeppelin have a `ECDSA helper library <https://docs.openzeppelin.com/contracts/2.x/api/cryptography#ECDSA>`_ that you can use as a wrapper for ``ecrecover`` without this issue.
+    This is usually not a problem unless you require signatures to be unique or use them to identify items.
+    OpenZeppelin have a `ECDSA helper library <https://docs.openzeppelin.com/contracts/4.x/api/utils#ECDSA>`_ that you can use as a wrapper for ``ecrecover`` without this issue.
 
 .. note::
 

From 43e8f7e381792a9fec31e932f7a91cfff4287cd2 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 15 Sep 2022 10:51:48 +0200
Subject: [PATCH 0943/1748] =?UTF-8?q?Move=20new=20issues=20to=20Triage=20c?=
 =?UTF-8?q?olumn=20in=20the=20repository=20project=20board=20Co-authored-b?=
 =?UTF-8?q?y:=20Kamil=20=C5=9Aliwak=20<kamil.sliwak@codepoets.it>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/triage.yml | 61 ++++++++++++++++++++++++++++++++++++
 1 file changed, 61 insertions(+)
 create mode 100644 .github/workflows/triage.yml

diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
new file mode 100644
index 0000000000..97bd23ae55
--- /dev/null
+++ b/.github/workflows/triage.yml
@@ -0,0 +1,61 @@
+name: Add new issues to triage column
+
+on:
+  issues:
+    types:
+      - opened
+
+env:
+  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  ORGANIZATION: ethereum
+  REPOSITORY: solidity
+  PROJECT_NUMBER: 43
+  DRY_RUN: true
+
+jobs:
+  triage_issues:
+    runs-on: ubuntu-latest
+    if: join(github.event.issue.labels) == ''
+    steps:
+      - name: Retrieve the content of all columns on the board
+        run: |
+          gh api graphql \
+            --raw-field owner="$ORGANIZATION" \
+            --field project_number="$PROJECT_NUMBER" \
+            --raw-field repository_name="$REPOSITORY" \
+            --raw-field query='
+              query($owner: String!, $repository_name: String!, $project_number: Int!) {
+                repository(owner: $owner, name: $repository_name) {
+                  project(number: $project_number) {
+                    columns(first: 10) {
+                      nodes {
+                        id,
+                        name
+                      }
+                    }
+                  }
+                }
+              }' > project_columns.json
+          echo 'COLUMN_ID='$(jq '.data.repository.project.columns.nodes[] | select(.name == "Triage") | .id' project_columns.json) >> $GITHUB_ENV
+          echo 'COLUMN_NAME='$(jq '.data.repository.project.columns.nodes[] | select(.name == "Triage") | .name' project_columns.json) >> $GITHUB_ENV
+
+      - name: Add issue#${{ github.event.issue.number }} to Triage column
+        env:
+          ISSUE_ID: ${{ github.event.issue.node_id }}
+        run: |
+          echo "Adding issue: ${{ github.event.issue.number }} to column $COLUMN_NAME in project $PROJECT_NUMBER"
+          if [[ $DRY_RUN == "false" ]]; then
+            gh api graphql \
+              --silent \
+              --raw-field column=$COLUMN_ID \
+              --raw-field issue=$ISSUE_ID \
+              --raw-field query='
+                mutation($column: ID!, $issue: ID!) {
+                  addProjectCard(input: {
+                    projectColumnId: $column,
+                    contentId: $issue
+                  }) {
+                    clientMutationId
+                  }
+                }'
+          fi

From 28a5448f21713f8b17c9a9a21aa7e13ae37ae16a Mon Sep 17 00:00:00 2001
From: omahs <73983677+omahs@users.noreply.github.com>
Date: Mon, 10 Oct 2022 08:33:44 +0200
Subject: [PATCH 0944/1748] Fix: minor typo

Fix: minor typo
---
 CODING_STYLE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODING_STYLE.md b/CODING_STYLE.md
index e9c2e4ad33..2b1e36fc66 100644
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -180,7 +180,7 @@ for (map<ComplexTypeOne, ComplexTypeTwo>::iterator i = l.begin(); i != l.end();
 
 ## 9. Naming
 
-1. Avoid unpronouncable names.
+1. Avoid unpronounceable names.
 2. Names should be shortened only if they are extremely common, but shortening should be generally avoided
 3. Avoid prefixes of initials (e.g. do not use `IMyInterface`, `CMyImplementation`)
 4. Find short, memorable & (at least semi-) descriptive names for commonly used classes or name-fragments:

From 898fbe93359cdaf0e81aa81abc1dd5365bc376c4 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Mon, 10 Oct 2022 11:29:00 +0200
Subject: [PATCH 0945/1748] Silence integer precision loss warning for protobuf
 fuzzers.

---
 test/tools/ossfuzz/CMakeLists.txt | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/test/tools/ossfuzz/CMakeLists.txt b/test/tools/ossfuzz/CMakeLists.txt
index 2655333975..9449eddbad 100644
--- a/test/tools/ossfuzz/CMakeLists.txt
+++ b/test/tools/ossfuzz/CMakeLists.txt
@@ -70,7 +70,11 @@ if (OSSFUZZ)
             protobuf.a
     )
     set_target_properties(yul_proto_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(yul_proto_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override)
+    # The -Wno-* compile options are required for source files that
+    # are auto-generated by the protobuf compiler because the compiler
+    # does not generate warning-free C++ bindings with regard to
+    # upstream Clang builds that are used by ossfuzz.
+    target_compile_options(yul_proto_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
 
     add_executable(
 	    yul_proto_diff_ossfuzz
@@ -88,7 +92,7 @@ if (OSSFUZZ)
             protobuf.a
     )
     set_target_properties(yul_proto_diff_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(yul_proto_diff_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override)
+    target_compile_options(yul_proto_diff_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
 
     add_executable(yul_proto_diff_custom_mutate_ossfuzz
             yulProto_diff_ossfuzz.cpp
@@ -106,7 +110,7 @@ if (OSSFUZZ)
             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 -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override)
+    target_compile_options(yul_proto_diff_custom_mutate_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
 
     add_executable(stack_reuse_codegen_ossfuzz
             StackReuseCodegenFuzzer.cpp
@@ -131,6 +135,7 @@ if (OSSFUZZ)
             -Wno-unused-parameter
             -Wno-zero-length-array
             -Wno-suggest-destructor-override
+            -Wno-shorten-64-to-32
     )
 
     add_executable(abiv2_proto_ossfuzz
@@ -151,7 +156,7 @@ if (OSSFUZZ)
             protobuf.a
     )
     set_target_properties(abiv2_proto_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(abiv2_proto_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override)
+    target_compile_options(abiv2_proto_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
 
     add_executable(abiv2_isabelle_ossfuzz
             AbiV2IsabelleFuzzer.cpp
@@ -173,7 +178,7 @@ if (OSSFUZZ)
             gmp.a
     )
     set_target_properties(abiv2_isabelle_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(abiv2_isabelle_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override)
+    target_compile_options(abiv2_isabelle_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
 
     add_executable(sol_proto_ossfuzz
             solProtoFuzzer.cpp
@@ -193,7 +198,7 @@ if (OSSFUZZ)
             protobuf.a
     )
     set_target_properties(sol_proto_ossfuzz PROPERTIES LINK_FLAGS ${LIB_FUZZING_ENGINE})
-    target_compile_options(sol_proto_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override)
+    target_compile_options(sol_proto_ossfuzz PUBLIC ${COMPILE_OPTIONS} -Wno-sign-conversion -Wno-suggest-destructor-override -Wno-inconsistent-missing-destructor-override -Wno-shorten-64-to-32)
 else()
     add_library(solc_ossfuzz
             solc_ossfuzz.cpp

From 6854e2b5d68fc19ac9310075d465f7876f0e5597 Mon Sep 17 00:00:00 2001
From: hrkrshnn <webmail.hari@gmail.com>
Date: Thu, 13 Oct 2022 02:04:48 +0200
Subject: [PATCH 0946/1748] fix: `bytecodeHash` cannot be set to non-none for
 `appendCBOR=false`

Testing: see `test/cmdlineTests/metadata_append_standard_json_error`

Closes: https://github.com/ethereum/solidity/issues/13628
---
 libsolidity/interface/StandardCompiler.cpp    |  7 +++++
 .../metadata_append_standard_json_error/args  |  1 +
 .../input.json                                | 29 +++++++++++++++++++
 .../output.json                               | 12 ++++++++
 4 files changed, 49 insertions(+)
 create mode 100644 test/cmdlineTests/metadata_append_standard_json_error/args
 create mode 100644 test/cmdlineTests/metadata_append_standard_json_error/input.json
 create mode 100644 test/cmdlineTests/metadata_append_standard_json_error/output.json

diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 15e713d5bb..676f02d627 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -929,6 +929,13 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 				metadataHash == "bzzr1" ?
 				CompilerStack::MetadataHash::Bzzr1 :
 				CompilerStack::MetadataHash::None;
+		if (ret.metadataFormat == CompilerStack::MetadataFormat::NoMetadata && ret.metadataHash != CompilerStack::MetadataHash::None)
+			return formatFatalError(
+				Error::Type::JSONError,
+				"When the parameter \"appendCBOR\" is set to false, the parameter \"bytecodeHash\" cannot be set to \"" +
+				metadataHash +
+				"\". The parameter \"bytecodeHash\" should either be skipped, or set to \"none\"."
+			);
 	}
 
 	Json::Value outputSelection = settings.get("outputSelection", Json::Value());
diff --git a/test/cmdlineTests/metadata_append_standard_json_error/args b/test/cmdlineTests/metadata_append_standard_json_error/args
new file mode 100644
index 0000000000..a905f1fe6a
--- /dev/null
+++ b/test/cmdlineTests/metadata_append_standard_json_error/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4
diff --git a/test/cmdlineTests/metadata_append_standard_json_error/input.json b/test/cmdlineTests/metadata_append_standard_json_error/input.json
new file mode 100644
index 0000000000..f12e45bf2f
--- /dev/null
+++ b/test/cmdlineTests/metadata_append_standard_json_error/input.json
@@ -0,0 +1,29 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {}"
+		}
+	},
+	"settings":
+	{
+		"viaIR": true,
+		"optimizer": {
+			"enabled": true
+		},
+		"metadata":
+		{
+			"appendCBOR": false,
+			"bytecodeHash": "ipfs"
+		},
+		"outputSelection":
+		{
+			"A":
+			{
+				"test": ["evm.bytecode"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/metadata_append_standard_json_error/output.json b/test/cmdlineTests/metadata_append_standard_json_error/output.json
new file mode 100644
index 0000000000..0c264f898a
--- /dev/null
+++ b/test/cmdlineTests/metadata_append_standard_json_error/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "When the parameter \"appendCBOR\" is set to false, the parameter \"bytecodeHash\" cannot be set to \"ipfs\". The parameter \"bytecodeHash\" should either be skipped, or set to \"none\".",
+            "message": "When the parameter \"appendCBOR\" is set to false, the parameter \"bytecodeHash\" cannot be set to \"ipfs\". The parameter \"bytecodeHash\" should either be skipped, or set to \"none\".",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}

From cd440fc5f964129d5e99a1ab2033c3b04752be03 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 28 Sep 2022 00:07:35 -0300
Subject: [PATCH 0947/1748] [solc] Refactor valid input modes.

---
 solc/CommandLineInterface.cpp | 74 ++++++++++++++++++++---------------
 1 file changed, 43 insertions(+), 31 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 0902e13f83..3e44f22c02 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -88,6 +88,16 @@ using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
 
+namespace
+{
+
+set<frontend::InputMode> const CompilerInputModes{
+	frontend::InputMode::Compiler,
+	frontend::InputMode::CompilerWithASTImport
+};
+
+} // anonymous namespace
+
 namespace solidity::frontend
 {
 
@@ -160,7 +170,7 @@ static bool coloredOutput(CommandLineOptions const& _options)
 
 void CommandLineInterface::handleBinary(string const& _contract)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (m_options.compiler.outputs.binary)
 	{
@@ -186,7 +196,7 @@ void CommandLineInterface::handleBinary(string const& _contract)
 
 void CommandLineInterface::handleOpcode(string const& _contract)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.output.dir.empty())
 		createFile(m_compiler->filesystemFriendlyName(_contract) + ".opcode", evmasm::disassemble(m_compiler->object(_contract).bytecode));
@@ -200,7 +210,7 @@ void CommandLineInterface::handleOpcode(string const& _contract)
 
 void CommandLineInterface::handleIR(string const& _contractName)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.ir)
 		return;
@@ -216,7 +226,7 @@ void CommandLineInterface::handleIR(string const& _contractName)
 
 void CommandLineInterface::handleIROptimized(string const& _contractName)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.irOptimized)
 		return;
@@ -232,7 +242,7 @@ void CommandLineInterface::handleIROptimized(string const& _contractName)
 
 void CommandLineInterface::handleEwasm(string const& _contractName)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.ewasm)
 		return;
@@ -255,7 +265,7 @@ void CommandLineInterface::handleEwasm(string const& _contractName)
 
 void CommandLineInterface::handleBytecode(string const& _contract)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (m_options.compiler.outputs.opcodes)
 		handleOpcode(_contract);
@@ -265,7 +275,7 @@ void CommandLineInterface::handleBytecode(string const& _contract)
 
 void CommandLineInterface::handleSignatureHashes(string const& _contract)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.signatureHashes)
 		return;
@@ -297,7 +307,7 @@ void CommandLineInterface::handleSignatureHashes(string const& _contract)
 
 void CommandLineInterface::handleMetadata(string const& _contract)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.metadata)
 		return;
@@ -311,7 +321,7 @@ void CommandLineInterface::handleMetadata(string const& _contract)
 
 void CommandLineInterface::handleABI(string const& _contract)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.abi)
 		return;
@@ -325,7 +335,7 @@ void CommandLineInterface::handleABI(string const& _contract)
 
 void CommandLineInterface::handleStorageLayout(string const& _contract)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.storageLayout)
 		return;
@@ -339,7 +349,7 @@ void CommandLineInterface::handleStorageLayout(string const& _contract)
 
 void CommandLineInterface::handleNatspec(bool _natspecDev, string const& _contract)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	bool enabled = false;
 	std::string suffix;
@@ -382,7 +392,7 @@ void CommandLineInterface::handleNatspec(bool _natspecDev, string const& _contra
 
 void CommandLineInterface::handleGasEstimation(string const& _contract)
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	Json::Value estimates = m_compiler->gasEstimates(_contract);
 	sout() << "Gas estimation:" << endl;
@@ -424,13 +434,15 @@ void CommandLineInterface::handleGasEstimation(string const& _contract)
 
 void CommandLineInterface::readInputFiles()
 {
-	solAssert(!m_standardJsonInput.has_value(), "");
+	solAssert(!m_standardJsonInput.has_value());
 
-	if (
-		m_options.input.mode == InputMode::Help ||
-		m_options.input.mode == InputMode::License ||
-		m_options.input.mode == InputMode::Version
-	)
+	static set<frontend::InputMode> const noInputFiles{
+		frontend::InputMode::Help,
+		frontend::InputMode::License,
+		frontend::InputMode::Version
+	};
+
+	if (noInputFiles.count(m_options.input.mode) == 1)
 		return;
 
 	m_fileReader.setBasePath(m_options.input.basePath);
@@ -496,7 +508,7 @@ void CommandLineInterface::readInputFiles()
 		string fileContent = readFileAsString(infile);
 		if (m_options.input.mode == InputMode::StandardJson)
 		{
-			solAssert(!m_standardJsonInput.has_value(), "");
+			solAssert(!m_standardJsonInput.has_value());
 			m_standardJsonInput = std::move(fileContent);
 		}
 		else
@@ -510,7 +522,7 @@ void CommandLineInterface::readInputFiles()
 	{
 		if (m_options.input.mode == InputMode::StandardJson)
 		{
-			solAssert(!m_standardJsonInput.has_value(), "");
+			solAssert(!m_standardJsonInput.has_value());
 			m_standardJsonInput = readUntilEnd(m_sin);
 		}
 		else
@@ -527,7 +539,7 @@ void CommandLineInterface::readInputFiles()
 
 map<string, Json::Value> CommandLineInterface::parseAstFromInput()
 {
-	solAssert(m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(m_options.input.mode == InputMode::CompilerWithASTImport);
 
 	map<string, Json::Value> sourceJsons;
 	map<string, string> tmpSources;
@@ -559,7 +571,7 @@ void CommandLineInterface::createFile(string const& _fileName, string const& _da
 {
 	namespace fs = boost::filesystem;
 
-	solAssert(!m_options.output.dir.empty(), "");
+	solAssert(!m_options.output.dir.empty());
 
 	// NOTE: create_directories() raises an exception if the path consists solely of '.' or '..'
 	// (or equivalent such as './././.'). Paths like 'a/b/.' and 'a/b/..' are fine though.
@@ -639,7 +651,7 @@ void CommandLineInterface::processInput()
 		break;
 	case InputMode::StandardJson:
 	{
-		solAssert(m_standardJsonInput.has_value(), "");
+		solAssert(m_standardJsonInput.has_value());
 
 		StandardCompiler compiler(m_fileReader.reader(), m_options.formatting.json);
 		sout() << compiler.compile(std::move(m_standardJsonInput.value())) << endl;
@@ -678,7 +690,7 @@ void CommandLineInterface::printLicense()
 
 void CommandLineInterface::compile()
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	m_compiler = make_unique<CompilerStack>(m_fileReader.reader());
 
@@ -789,7 +801,7 @@ void CommandLineInterface::compile()
 
 void CommandLineInterface::handleCombinedJSON()
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.combinedJsonRequests.has_value())
 		return;
@@ -881,7 +893,7 @@ void CommandLineInterface::handleCombinedJSON()
 
 void CommandLineInterface::handleAst()
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.astCompactJson)
 		return;
@@ -922,7 +934,7 @@ void CommandLineInterface::serveLSP()
 
 void CommandLineInterface::link()
 {
-	solAssert(m_options.input.mode == InputMode::Linker, "");
+	solAssert(m_options.input.mode == InputMode::Linker);
 
 	// Map from how the libraries will be named inside the bytecode to their addresses.
 	map<string, h160> librariesReplacements;
@@ -985,7 +997,7 @@ void CommandLineInterface::link()
 
 void CommandLineInterface::writeLinkedFiles()
 {
-	solAssert(m_options.input.mode == InputMode::Linker, "");
+	solAssert(m_options.input.mode == InputMode::Linker);
 
 	for (auto const& src: m_fileReader.sourceUnits())
 		if (src.first == g_stdinFileName)
@@ -1019,14 +1031,14 @@ string CommandLineInterface::objectWithLinkRefsHex(evmasm::LinkerObject const& _
 
 void CommandLineInterface::assemble(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine)
 {
-	solAssert(m_options.input.mode == InputMode::Assembler, "");
+	solAssert(m_options.input.mode == InputMode::Assembler);
 
 	bool successful = true;
 	map<string, yul::YulStack> yulStacks;
 	for (auto const& src: m_fileReader.sourceUnits())
 	{
 		// --no-optimize-yul option is not accepted in assembly mode.
-		solAssert(!m_options.optimizer.noOptimizeYul, "");
+		solAssert(!m_options.optimizer.noOptimizeYul);
 
 		auto& stack = yulStacks[src.first] = yul::YulStack(
 			m_options.output.evmVersion,
@@ -1123,7 +1135,7 @@ void CommandLineInterface::assemble(yul::YulStack::Language _language, yul::YulS
 
 void CommandLineInterface::outputCompilationResults()
 {
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport, "");
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	handleCombinedJSON();
 

From ed3d3959aa438498d8da95853f571aac111ca042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 19 Oct 2022 21:28:19 +0200
Subject: [PATCH 0948/1748] Rename command line tests for the
 --no-cbor-metadata/appendCBOR option

---
 test/cmdlineTests/{no_append_metadata => no_cbor_metadata}/args | 0
 .../{no_append_metadata => no_cbor_metadata}/input.sol          | 0
 .../{no_append_metadata => no_cbor_metadata}/output             | 2 +-
 .../args                                                        | 0
 .../err                                                         | 0
 .../exit                                                        | 0
 .../input.sol                                                   | 0
 .../args                                                        | 0
 .../input.json                                                  | 0
 .../output.json                                                 | 0
 .../args                                                        | 0
 .../input.json                                                  | 0
 .../output.json                                                 | 0
 13 files changed, 1 insertion(+), 1 deletion(-)
 rename test/cmdlineTests/{no_append_metadata => no_cbor_metadata}/args (100%)
 rename test/cmdlineTests/{no_append_metadata => no_cbor_metadata}/input.sol (100%)
 rename test/cmdlineTests/{no_append_metadata => no_cbor_metadata}/output (59%)
 rename test/cmdlineTests/{no_append_incorrect_combination => no_cbor_metadata_with_metadata_hash}/args (100%)
 rename test/cmdlineTests/{no_append_incorrect_combination => no_cbor_metadata_with_metadata_hash}/err (100%)
 rename test/cmdlineTests/{no_append_incorrect_combination => no_cbor_metadata_with_metadata_hash}/exit (100%)
 rename test/cmdlineTests/{no_append_incorrect_combination => no_cbor_metadata_with_metadata_hash}/input.sol (100%)
 rename test/cmdlineTests/{metadata_append_standard_json => standard_no_append_cbor}/args (100%)
 rename test/cmdlineTests/{metadata_append_standard_json => standard_no_append_cbor}/input.json (100%)
 rename test/cmdlineTests/{metadata_append_standard_json => standard_no_append_cbor}/output.json (100%)
 rename test/cmdlineTests/{metadata_append_standard_json_error => standard_no_append_cbor_with_metadata_hash}/args (100%)
 rename test/cmdlineTests/{metadata_append_standard_json_error => standard_no_append_cbor_with_metadata_hash}/input.json (100%)
 rename test/cmdlineTests/{metadata_append_standard_json_error => standard_no_append_cbor_with_metadata_hash}/output.json (100%)

diff --git a/test/cmdlineTests/no_append_metadata/args b/test/cmdlineTests/no_cbor_metadata/args
similarity index 100%
rename from test/cmdlineTests/no_append_metadata/args
rename to test/cmdlineTests/no_cbor_metadata/args
diff --git a/test/cmdlineTests/no_append_metadata/input.sol b/test/cmdlineTests/no_cbor_metadata/input.sol
similarity index 100%
rename from test/cmdlineTests/no_append_metadata/input.sol
rename to test/cmdlineTests/no_cbor_metadata/input.sol
diff --git a/test/cmdlineTests/no_append_metadata/output b/test/cmdlineTests/no_cbor_metadata/output
similarity index 59%
rename from test/cmdlineTests/no_append_metadata/output
rename to test/cmdlineTests/no_cbor_metadata/output
index 8691c5faec..16025d0614 100644
--- a/test/cmdlineTests/no_append_metadata/output
+++ b/test/cmdlineTests/no_cbor_metadata/output
@@ -1,4 +1,4 @@
 
-======= no_append_metadata/input.sol:C =======
+======= no_cbor_metadata/input.sol:C =======
 Binary:
 608080604052346013576004908160198239f35b600080fdfe600080fd
diff --git a/test/cmdlineTests/no_append_incorrect_combination/args b/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/args
similarity index 100%
rename from test/cmdlineTests/no_append_incorrect_combination/args
rename to test/cmdlineTests/no_cbor_metadata_with_metadata_hash/args
diff --git a/test/cmdlineTests/no_append_incorrect_combination/err b/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/err
similarity index 100%
rename from test/cmdlineTests/no_append_incorrect_combination/err
rename to test/cmdlineTests/no_cbor_metadata_with_metadata_hash/err
diff --git a/test/cmdlineTests/no_append_incorrect_combination/exit b/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/exit
similarity index 100%
rename from test/cmdlineTests/no_append_incorrect_combination/exit
rename to test/cmdlineTests/no_cbor_metadata_with_metadata_hash/exit
diff --git a/test/cmdlineTests/no_append_incorrect_combination/input.sol b/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/input.sol
similarity index 100%
rename from test/cmdlineTests/no_append_incorrect_combination/input.sol
rename to test/cmdlineTests/no_cbor_metadata_with_metadata_hash/input.sol
diff --git a/test/cmdlineTests/metadata_append_standard_json/args b/test/cmdlineTests/standard_no_append_cbor/args
similarity index 100%
rename from test/cmdlineTests/metadata_append_standard_json/args
rename to test/cmdlineTests/standard_no_append_cbor/args
diff --git a/test/cmdlineTests/metadata_append_standard_json/input.json b/test/cmdlineTests/standard_no_append_cbor/input.json
similarity index 100%
rename from test/cmdlineTests/metadata_append_standard_json/input.json
rename to test/cmdlineTests/standard_no_append_cbor/input.json
diff --git a/test/cmdlineTests/metadata_append_standard_json/output.json b/test/cmdlineTests/standard_no_append_cbor/output.json
similarity index 100%
rename from test/cmdlineTests/metadata_append_standard_json/output.json
rename to test/cmdlineTests/standard_no_append_cbor/output.json
diff --git a/test/cmdlineTests/metadata_append_standard_json_error/args b/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/args
similarity index 100%
rename from test/cmdlineTests/metadata_append_standard_json_error/args
rename to test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/args
diff --git a/test/cmdlineTests/metadata_append_standard_json_error/input.json b/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/input.json
similarity index 100%
rename from test/cmdlineTests/metadata_append_standard_json_error/input.json
rename to test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/input.json
diff --git a/test/cmdlineTests/metadata_append_standard_json_error/output.json b/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/output.json
similarity index 100%
rename from test/cmdlineTests/metadata_append_standard_json_error/output.json
rename to test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/output.json

From af9a1d8a18382f9c2218c6681946f3eec9e28cf8 Mon Sep 17 00:00:00 2001
From: Bojidar00 <bojidar_rusalinov@abv.bg>
Date: Thu, 20 Oct 2022 14:04:12 +0300
Subject: [PATCH 0949/1748] refactor: Move error generating tests to /invalid

---
 .../natspec/{ => invalid}/docstring_author_function.sol           | 0
 .../{ => invalid}/docstring_author_title_state_variable.sol       | 0
 .../natspec/{ => invalid}/docstring_empty_description.sol         | 0
 .../syntaxTests/natspec/{ => invalid}/docstring_empty_tag.sol     | 0
 .../docstring_non_public_state_variable_with_return.sol           | 0
 .../docstring_state_variable_too_many_return_tags.sol             | 0
 .../natspec/{ => invalid}/docstring_too_many_return_tags.sol      | 0
 7 files changed, 0 insertions(+), 0 deletions(-)
 rename test/libsolidity/syntaxTests/natspec/{ => invalid}/docstring_author_function.sol (100%)
 rename test/libsolidity/syntaxTests/natspec/{ => invalid}/docstring_author_title_state_variable.sol (100%)
 rename test/libsolidity/syntaxTests/natspec/{ => invalid}/docstring_empty_description.sol (100%)
 rename test/libsolidity/syntaxTests/natspec/{ => invalid}/docstring_empty_tag.sol (100%)
 rename test/libsolidity/syntaxTests/natspec/{ => invalid}/docstring_non_public_state_variable_with_return.sol (100%)
 rename test/libsolidity/syntaxTests/natspec/{ => invalid}/docstring_state_variable_too_many_return_tags.sol (100%)
 rename test/libsolidity/syntaxTests/natspec/{ => invalid}/docstring_too_many_return_tags.sol (100%)

diff --git a/test/libsolidity/syntaxTests/natspec/docstring_author_function.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_author_function.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_author_function.sol
rename to test/libsolidity/syntaxTests/natspec/invalid/docstring_author_function.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_author_title_state_variable.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_author_title_state_variable.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_author_title_state_variable.sol
rename to test/libsolidity/syntaxTests/natspec/invalid/docstring_author_title_state_variable.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_empty_description.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_description.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_empty_description.sol
rename to test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_description.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_empty_tag.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_tag.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_empty_tag.sol
rename to test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_tag.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_non_public_state_variable_with_return.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_non_public_state_variable_with_return.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_non_public_state_variable_with_return.sol
rename to test/libsolidity/syntaxTests/natspec/invalid/docstring_non_public_state_variable_with_return.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_state_variable_too_many_return_tags.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_state_variable_too_many_return_tags.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_state_variable_too_many_return_tags.sol
rename to test/libsolidity/syntaxTests/natspec/invalid/docstring_state_variable_too_many_return_tags.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_too_many_return_tags.sol b/test/libsolidity/syntaxTests/natspec/invalid/docstring_too_many_return_tags.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_too_many_return_tags.sol
rename to test/libsolidity/syntaxTests/natspec/invalid/docstring_too_many_return_tags.sol

From 0da1ce3a00218c364b80fbf614785b363bdc5f66 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 28 Sep 2022 00:18:59 -0300
Subject: [PATCH 0950/1748] [libsolidity] Refactor Compiler Stack imported
 source type.

---
 libsolidity/interface/CompilerStack.cpp | 14 ++++++++++++--
 libsolidity/interface/CompilerStack.h   |  9 ++++++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index ca700d764c..b91f500a20 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -410,7 +410,7 @@ void CompilerStack::importASTs(map<string, Json::Value> const& _sources)
 		m_sources[path] = std::move(source);
 	}
 	m_stackState = ParsedAndImported;
-	m_importedSources = true;
+	m_compilationSourceType = CompilationSourceType::SolidityAST;
 
 	storeContractDefinitions();
 }
@@ -1482,7 +1482,17 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 {
 	Json::Value meta{Json::objectValue};
 	meta["version"] = 1;
-	meta["language"] = m_importedSources ? "SolidityAST" : "Solidity";
+	string sourceType;
+	switch (m_compilationSourceType)
+	{
+	case CompilationSourceType::Solidity:
+		sourceType = "Solidity";
+		break;
+	case CompilationSourceType::SolidityAST:
+		sourceType = "SolidityAST";
+		break;
+	}
+	meta["language"] = sourceType;
 	meta["compiler"]["version"] = VersionStringStrict;
 
 	/// All the source files (including self), which should be included in the metadata.
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index e5bc9b3458..be7e1cf348 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -117,6 +117,13 @@ class CompilerStack: public langutil::CharStreamProvider
 		None
 	};
 
+	enum class CompilationSourceType {
+		/// Regular compilation from Solidity source files.
+		Solidity,
+		/// Compilation from an imported Solidity AST.
+		SolidityAST
+	};
+
 	/// Creates a new compiler stack.
 	/// @param _readFile callback used to read files for import statements. Must return
 	/// and must not emit exceptions.
@@ -511,7 +518,7 @@ class CompilerStack: public langutil::CharStreamProvider
 	langutil::DebugInfoSelection m_debugInfoSelection = langutil::DebugInfoSelection::Default();
 	bool m_parserErrorRecovery = false;
 	State m_stackState = Empty;
-	bool m_importedSources = false;
+	CompilationSourceType m_compilationSourceType = CompilationSourceType::Solidity;
 	/// Whether or not there has been an error during processing.
 	/// If this is true, the stack will refuse to generate code.
 	bool m_hasError = false;

From 24946ec31854665b931b9ad3999299e815e4ceaa Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 30 Sep 2022 17:56:54 +0200
Subject: [PATCH 0951/1748] EVMHost: implement selfdestruct better

---
 test/EVMHost.cpp | 13 ++++++++-----
 test/EVMHost.h   |  7 ++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 7c9a8f4dd5..c36c2aaf30 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -170,7 +170,7 @@ void EVMHost::reset()
 	}
 }
 
-void EVMHost::resetWarmAccess()
+void EVMHost::newTransactionFrame()
 {
 	// Clear EIP-2929 account access indicator
 	recorded_account_accesses.clear();
@@ -178,6 +178,10 @@ void EVMHost::resetWarmAccess()
 	for (auto& [address, account]: accounts)
 		for (auto& [slot, value]: account.storage)
 			value.access_status = EVMC_ACCESS_COLD;
+	// Process selfdestruct list
+	for (auto& [address, _]: recorded_selfdestructs)
+		accounts.erase(address);
+	recorded_selfdestructs.clear();
 }
 
 void EVMHost::transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recipient, u256 const& _value) noexcept
@@ -190,12 +194,11 @@ void EVMHost::transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recip
 void EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _beneficiary) noexcept
 {
 	// TODO actual selfdestruct is even more complicated.
-	// TODO reuse MockedHost::selfdestruct.
 
 	transfer(accounts[_addr], accounts[_beneficiary], convertFromEVMC(accounts[_addr].balance));
-	accounts.erase(_addr);
-	// Record self destructs
-	recorded_selfdestructs.push_back({_addr, _beneficiary});
+
+	// Record self destructs. Clearing will be done in newTransactionFrame().
+	MockedHost::selfdestruct(_addr, _beneficiary);
 }
 
 void EVMHost::recordCalls(evmc_message const& _message) noexcept
diff --git a/test/EVMHost.h b/test/EVMHost.h
index bf0930512b..584ba27ea2 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -82,7 +82,7 @@ class EVMHost: public evmc::MockedHost
 		tx_context.block_number++;
 		tx_context.block_timestamp += 15;
 		recorded_logs.clear();
-		resetWarmAccess();
+		newTransactionFrame();
 	}
 
 	/// @returns contents of storage at @param _addr.
@@ -98,8 +98,9 @@ class EVMHost: public evmc::MockedHost
 	/// Transfer value between accounts. Checks for sufficient balance.
 	void transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recipient, u256 const& _value) noexcept;
 
-	/// Clears EIP-2929 account and storage access indicator
-	void resetWarmAccess();
+	/// Start a new transaction frame.
+	/// This will perform selfdestructs and clear account/storage access indicator for EIP-2929.
+	void newTransactionFrame();
 
 	/// Records calls made via @param _message.
 	void recordCalls(evmc_message const& _message) noexcept;

From b0b8bf657ba71ae13009741eac97cf9f52296b49 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 20 Oct 2022 15:09:03 -0300
Subject: [PATCH 0952/1748] Update to v6 and minor fixes

---
 .github/workflows/stale-pull-requests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/stale-pull-requests.yml b/.github/workflows/stale-pull-requests.yml
index 74f1b69cd1..8a27edee25 100644
--- a/.github/workflows/stale-pull-requests.yml
+++ b/.github/workflows/stale-pull-requests.yml
@@ -17,7 +17,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v6
         with:
           debug-only: true
           # disable issues
@@ -32,8 +32,8 @@ jobs:
           close-pr-label: closed-due-inactivity
           days-before-pr-stale: ${{ env.BEFORE_STALE }}
           days-before-pr-close: ${{ env.BEFORE_CLOSE }}
-          exempt-pr-labels: 'external contribution'
+          exempt-pr-labels: 'external contribution :star:'
           exempt-draft-pr: true
           exempt-all-milestones: true
           remove-stale-when-updated: true
-          operations-per-run: 60
+          operations-per-run: 100

From 50670262c19e62477db20f020e466b0e9b4eb914 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 20 Oct 2022 18:53:07 -0300
Subject: [PATCH 0953/1748] Increase euler external tests resource class

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f016a48c5e..57771d5059 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -577,6 +577,7 @@ defaults:
       project: euler
       binary_type: native
       nodejs_version: '16'
+      resource_class: medium
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_yield_liquidator

From 9dbc3e0b82fd109740a4e866c75500ec11234a3c Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 14 Sep 2022 11:22:21 +0200
Subject: [PATCH 0954/1748] =?UTF-8?q?Add=20git=20`safe.directory`=20workar?=
 =?UTF-8?q?ound=20in=20emscripten=20build=20script=20Co-authored-by:=20Kam?=
 =?UTF-8?q?il=20=C5=9Aliwak=20<kamil.sliwak@codepoets.it>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/build_emscripten.sh    | 4 +++-
 scripts/ci/build_emscripten.sh | 5 +----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 43a402fd63..58acf22c2a 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -35,6 +35,8 @@ else
 fi
 
 # solbuildpackpusher/solidity-buildpack-deps:emscripten-13
+# NOTE: Without `safe.directory` git would assume it's not safe to operate on /root/project since it's owned by a different user.
+# See https://github.blog/2022-04-12-git-security-vulnerability-announced/
 docker run -v "$(pwd):/root/project" -w /root/project \
     solbuildpackpusher/solidity-buildpack-deps@sha256:f1c13f3450d1f2e53ea18ac1ac1a17e932573cb9a5ccd0fd9ef6dd44f6402fa9 \
-    ./scripts/ci/build_emscripten.sh "$BUILD_DIR"
+    /bin/bash -c "git config --global --add safe.directory /root/project && ./scripts/ci/build_emscripten.sh $BUILD_DIR"
diff --git a/scripts/ci/build_emscripten.sh b/scripts/ci/build_emscripten.sh
index f2e475c2ae..c1e117c6c6 100755
--- a/scripts/ci/build_emscripten.sh
+++ b/scripts/ci/build_emscripten.sh
@@ -40,12 +40,9 @@ else
 	BUILD_DIR="$1"
 fi
 
-apt-get update
-apt-get install lz4 --no-install-recommends
-
 WORKSPACE=/root/project
 
-cd $WORKSPACE
+cd "$WORKSPACE"
 
 # shellcheck disable=SC2166
 if [[ "$CIRCLE_BRANCH" = release || -n "$CIRCLE_TAG" || -n "$FORCE_RELEASE" || "$(git tag --points-at HEAD 2>/dev/null)" == v* ]]

From 11e13f5a41febc061fb1a89bbebced577250ddce Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 20 Oct 2022 20:32:36 -0300
Subject: [PATCH 0955/1748] Replace npm by yarn

---
 test/externalTests/gp2.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index 1676d2b78c..13b8bed3e8 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -31,12 +31,12 @@ BINARY_TYPE="$1"
 BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
-function compile_fn { npm run build; }
-function test_fn { npm test; }
+function compile_fn { yarn run build; }
+function test_fn { yarn test; }
 
 function gp2_test
 {
-    local repo="https://github.com/gnosis/gp-v2-contracts.git"
+    local repo="https://github.com/cowprotocol/contracts.git"
     local ref_type=branch
     local ref=main
     local config_file="hardhat.config.ts"
@@ -67,11 +67,11 @@ function gp2_test
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
-    npm install
+    yarn
 
     # New hardhat release breaks GP2 tests, and since GP2 repository has been archived, we are pinning hardhat
     # to the previous stable version. See https://github.com/ethereum/solidity/pull/13485
-    npm install hardhat@2.10.2
+    yarn add hardhat@2.10.2
 
     # Some dependencies come with pre-built artifacts. We want to build from scratch.
     rm -r node_modules/@gnosis.pm/safe-contracts/build/

From 9e505bd128f08d1a21399b957d23f43bc5147685 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 8 Sep 2022 13:11:48 +0200
Subject: [PATCH 0956/1748] Document UnusedStoreEliminator

Update comment in header file

Address review comments
---
 docs/internals/optimizer.rst             | 49 +++++++++++++++++++++++-
 libyul/optimiser/UnusedStoreEliminator.h | 11 +++++-
 2 files changed, 57 insertions(+), 3 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index c9d10a8f6b..11f55e0e3a 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -322,6 +322,7 @@ Abbreviation Full name
 ``a``        :ref:`SSA-transform`
 ``t``        :ref:`structural-simplifier`
 ``p``        :ref:`unused-function-parameter-pruner`
+``S``        :ref:`unused-store-eliminator`
 ``u``        :ref:`unused-pruner`
 ``d``        :ref:`var-decl-initializer`
 ============ ===============================
@@ -958,7 +959,7 @@ DeadCodeEliminator
 This optimization stage removes unreachable code.
 
 Unreachable code is any code within a block which is preceded by a
-leave, return, invalid, break, continue, selfdestruct or revert.
+leave, return, invalid, break, continue, selfdestruct, revert or by a call to a user-defined function that recurses infinitely.
 
 Function definitions are retained as they might be called by earlier
 code and thus are considered reachable.
@@ -1121,6 +1122,52 @@ The step LiteralRematerialiser is not required for correctness. It helps deal wi
 ``function f(x) -> y { revert(y, y} }`` where the literal ``y`` will be replaced by its value ``0``,
 allowing us to rewrite the function.
 
+.. index:: ! unused store eliminator
+.. _unused-store-eliminator:
+
+UnusedStoreEliminator
+^^^^^^^^^^^^^^^^^^^^^
+
+Optimizer component that removes redundant ``sstore`` and memory store statements.
+In case of an ``sstore``, if all outgoing code paths revert (due to an explicit ``revert()``, ``invalid()``, or infinite recursion) or
+lead to another ``sstore`` for which the optimizer can tell that it will overwrite the first store, the statement will be removed.
+However, if there is a read operation between the initial ``sstore`` and the revert, or the overwriting ``sstore``, the statement
+will not be removed.
+Such read operations include: external calls, user-defined functions with any storage access, and ``sload`` of a slot that cannot be
+proven to differ from the slot written by the initial ``sstore``.
+
+For example, the following code
+
+.. code-block:: yul
+
+    {
+        let c := calldataload(0)
+        sstore(c, 1)
+        if c {
+            sstore(c, 2)
+        }
+        sstore(c, 3)
+    }
+
+will be transformed into the code below after the Unused Store Eliminator step is run
+
+.. code-block:: yul
+
+    {
+        let c := calldataload(0)
+        if c { }
+        sstore(c, 3)
+    }
+
+For memory store operations, things are generally simpler, at least in the outermost yul block as all such
+statements will be removed if they are never read from in any code path.
+At function analysis level, however, the approach is similar to ``sstore``, as we do not know whether the memory location will
+be read once we leave the function's scope, so the statement will be removed only if all code code paths lead to a memory overwrite.
+
+Best run in SSA form.
+
+Prerequisites: Disambiguator, ForLoopInitRewriter.
+
 .. _equivalent-function-combiner:
 
 EquivalentFunctionCombiner
diff --git a/libyul/optimiser/UnusedStoreEliminator.h b/libyul/optimiser/UnusedStoreEliminator.h
index dc3065e45b..8b5bfd7b14 100644
--- a/libyul/optimiser/UnusedStoreEliminator.h
+++ b/libyul/optimiser/UnusedStoreEliminator.h
@@ -39,8 +39,15 @@ struct Dialect;
 struct AssignedValue;
 
 /**
- * Optimizer component that removes sstore statements if they
- * are overwritten in all code paths or never read from.
+ * Optimizer component that removes sstore and memory store statements if conditions are met for their removal.
+ * In case of an sstore, if all outgoing code paths revert (due to an explicit revert(), invalid(),
+ * or infinite recursion) or lead to another ``sstore`` for which the optimizer can tell that it will overwrite the first store,
+ * the statement will be removed.
+ *
+ * For memory store operations, things are generally simpler, at least in the outermost yul block as all such statements
+ * will be removed if they are never read from in any code path. At function analysis level however, the approach is similar
+ * to sstore, as we don't know whether the memory location will be read once we leave the function's scope,
+ * so the statement will be removed only if all code code paths lead to a memory overwrite.
  *
  * The m_store member of UnusedStoreBase is only used with the empty yul string
  * as key in the first dimension.

From 4f07be6348ca3a14b47009b71327ae0813f82f64 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Thu, 20 Oct 2022 16:02:33 +0200
Subject: [PATCH 0957/1748] test: Move hashing algorithm tests to semanticTests

---
 test/libsolidity/SolidityEndToEndTest.cpp     | 196 ------------------
 .../builtinFunctions/keccak256.sol            |   9 +
 .../builtinFunctions/keccak256_packed.sol     |  12 ++
 .../keccak256_packed_complex_types.sol        |  14 ++
 .../builtinFunctions/ripemd160.sol            |   9 +
 .../builtinFunctions/ripemd160_packed.sol     |  12 ++
 .../semanticTests/builtinFunctions/sha256.sol |   9 +
 .../builtinFunctions/sha256_packed.sol        |  12 ++
 8 files changed, 77 insertions(+), 196 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/builtinFunctions/keccak256.sol
 create mode 100644 test/libsolidity/semanticTests/builtinFunctions/keccak256_packed.sol
 create mode 100644 test/libsolidity/semanticTests/builtinFunctions/keccak256_packed_complex_types.sol
 create mode 100644 test/libsolidity/semanticTests/builtinFunctions/ripemd160.sol
 create mode 100644 test/libsolidity/semanticTests/builtinFunctions/ripemd160_packed.sol
 create mode 100644 test/libsolidity/semanticTests/builtinFunctions/sha256.sol
 create mode 100644 test/libsolidity/semanticTests/builtinFunctions/sha256_packed.sol

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 4d6a887bb9..beb622241f 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -912,202 +912,6 @@ BOOST_AUTO_TEST_CASE(transfer_ether)
 	)
 }
 
-BOOST_AUTO_TEST_CASE(keccak256)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function a(bytes32 input) public returns (bytes32 hash) {
-				return keccak256(abi.encodePacked(input));
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode);
-		auto f = [&](u256 const& _x) -> u256
-		{
-			return util::keccak256(toBigEndian(_x));
-		};
-		testContractAgainstCpp("a(bytes32)", f, u256(4));
-		testContractAgainstCpp("a(bytes32)", f, u256(5));
-		testContractAgainstCpp("a(bytes32)", f, u256(-1));
-	);
-}
-
-BOOST_AUTO_TEST_CASE(sha256)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function a(bytes32 input) public returns (bytes32 sha256hash) {
-				return sha256(abi.encodePacked(input));
-			}
-		}
-	)";
-	auto f = [&](u256 const& _x) -> bytes
-	{
-		if (_x == u256(4))
-			return fromHex("e38990d0c7fc009880a9c07c23842e886c6bbdc964ce6bdd5817ad357335ee6f");
-		if (_x == u256(5))
-			return fromHex("96de8fc8c256fa1e1556d41af431cace7dca68707c78dd88c3acab8b17164c47");
-		if (_x == u256(-1))
-			return fromHex("af9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051");
-		return fromHex("");
-	};
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode);
-		testContractAgainstCpp("a(bytes32)", f, u256(4));
-		testContractAgainstCpp("a(bytes32)", f, u256(5));
-		testContractAgainstCpp("a(bytes32)", f, u256(-1));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(ripemd)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function a(bytes32 input) public returns (bytes32 sha256hash) {
-				return ripemd160(abi.encodePacked(input));
-			}
-		}
-	)";
-	auto f = [&](u256 const& _x) -> bytes
-	{
-		if (_x == u256(4))
-			return fromHex("1b0f3c404d12075c68c938f9f60ebea4f74941a0000000000000000000000000");
-		if (_x == u256(5))
-			return fromHex("ee54aa84fc32d8fed5a5fe160442ae84626829d9000000000000000000000000");
-		if (_x == u256(-1))
-			return fromHex("1cf4e77f5966e13e109703cd8a0df7ceda7f3dc3000000000000000000000000");
-		return fromHex("");
-	};
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode);
-		testContractAgainstCpp("a(bytes32)", f, u256(4));
-		testContractAgainstCpp("a(bytes32)", f, u256(5));
-		testContractAgainstCpp("a(bytes32)", f, u256(-1));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(packed_keccak256)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function a(bytes32 input) public returns (bytes32 hash) {
-				uint24 b = 65536;
-				uint c = 256;
-				return keccak256(abi.encodePacked(uint8(8), input, b, input, c));
-			}
-		}
-	)";
-	auto f = [&](u256 const& _x) -> u256
-	{
-		return util::keccak256(
-			toCompactBigEndian(unsigned(8)) +
-			toBigEndian(_x) +
-			toCompactBigEndian(unsigned(65536)) +
-			toBigEndian(_x) +
-			toBigEndian(u256(256))
-		);
-	};
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode);
-		testContractAgainstCpp("a(bytes32)", f, u256(4));
-		testContractAgainstCpp("a(bytes32)", f, u256(5));
-		testContractAgainstCpp("a(bytes32)", f, u256(-1));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(packed_keccak256_complex_types)
-{
-	char const* sourceCode = R"(
-		contract test {
-			uint120[3] x;
-			function f() public returns (bytes32 hash1, bytes32 hash2, bytes32 hash3) {
-				uint120[] memory y = new uint120[](3);
-				x[0] = y[0] = uint120(type(uint).max - 1);
-				x[1] = y[1] = uint120(type(uint).max - 2);
-				x[2] = y[2] = uint120(type(uint).max - 3);
-				hash1 = keccak256(abi.encodePacked(x));
-				hash2 = keccak256(abi.encodePacked(y));
-				hash3 = keccak256(abi.encodePacked(this.f));
-			}
-		}
-	)";
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode);
-		// Strangely, arrays are encoded with intra-element padding.
-		ABI_CHECK(callContractFunction("f()"), encodeArgs(
-			util::keccak256(encodeArgs(u256("0xfffffffffffffffffffffffffffffe"), u256("0xfffffffffffffffffffffffffffffd"), u256("0xfffffffffffffffffffffffffffffc"))),
-			util::keccak256(encodeArgs(u256("0xfffffffffffffffffffffffffffffe"), u256("0xfffffffffffffffffffffffffffffd"), u256("0xfffffffffffffffffffffffffffffc"))),
-			util::keccak256(fromHex(m_contractAddress.hex() + "26121ff0"))
-		));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(packed_sha256)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function a(bytes32 input) public returns (bytes32 hash) {
-				uint24 b = 65536;
-				uint c = 256;
-				return sha256(abi.encodePacked(uint8(8), input, b, input, c));
-			}
-		}
-	)";
-	auto f = [&](u256 const& _x) -> bytes
-	{
-		if (_x == u256(4))
-			return fromHex("804e0d7003cfd70fc925dc103174d9f898ebb142ecc2a286da1abd22ac2ce3ac");
-		if (_x == u256(5))
-			return fromHex("e94921945f9068726c529a290a954f412bcac53184bb41224208a31edbf63cf0");
-		if (_x == u256(-1))
-			return fromHex("f14def4d07cd185ddd8b10a81b2238326196a38867e6e6adbcc956dc913488c7");
-		return fromHex("");
-	};
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode);
-		testContractAgainstCpp("a(bytes32)", f, u256(4));
-		testContractAgainstCpp("a(bytes32)", f, u256(5));
-		testContractAgainstCpp("a(bytes32)", f, u256(-1));
-	)
-}
-
-BOOST_AUTO_TEST_CASE(packed_ripemd160)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function a(bytes32 input) public returns (bytes32 hash) {
-				uint24 b = 65536;
-				uint c = 256;
-				return ripemd160(abi.encodePacked(uint8(8), input, b, input, c));
-			}
-		}
-	)";
-	auto f = [&](u256 const& _x) -> bytes
-	{
-		if (_x == u256(4))
-			return fromHex("f93175303eba2a7b372174fc9330237f5ad202fc000000000000000000000000");
-		if (_x == u256(5))
-			return fromHex("04f4fc112e2bfbe0d38f896a46629e08e2fcfad5000000000000000000000000");
-		if (_x == u256(-1))
-			return fromHex("c0a2e4b1f3ff766a9a0089e7a410391730872495000000000000000000000000");
-		return fromHex("");
-	};
-	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-		compileAndRun(sourceCode);
-		testContractAgainstCpp("a(bytes32)", f, u256(4));
-		testContractAgainstCpp("a(bytes32)", f, u256(5));
-		testContractAgainstCpp("a(bytes32)", f, u256(-1));
-	)
-}
-
 BOOST_AUTO_TEST_CASE(inter_contract_calls)
 {
 	char const* sourceCode = R"(
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256.sol
new file mode 100644
index 0000000000..e01a56956e
--- /dev/null
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f(int256 input) public returns (bytes32 sha256hash) {
+        return keccak256(abi.encodePacked(bytes32(uint256(input))));
+    }
+}
+// ----
+// f(int256): 4 -> 0x8a35acfbc15ff81a39ae7d344fd709f28e8600b4aa8c65c6b64bfe7fe36bd19b
+// f(int256): 5 -> 0x036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0
+// f(int256): -1 -> 0xa9c584056064687e149968cbab758a3376d22aedc6a55823d1b3ecbee81b8fb9
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed.sol
new file mode 100644
index 0000000000..cad49daec2
--- /dev/null
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f(int256 _input) public returns (bytes32 hash) {
+        uint24 b = 65536;
+        uint c = 256;
+        bytes32 input = bytes32(uint256(_input));
+        return keccak256(abi.encodePacked(uint8(8), input, b, input, c));
+    }
+}
+// ----
+// f(int256): 4 -> 0xd270285b9966fefc715561efcd09d5b6a8deb15596f7c53cb4a1bb73aa55ac3a
+// f(int256): 5 -> 0xf2f92566c5653600c1e527a7073e5d881576d12bb51887c0b8f3e1f81865b03d
+// f(int256): -1 -> 0xbc78b45e0db67af5af72e4ab62757c67aefa7388cdf0c4e74f8b5fe9dd5d9d13
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed_complex_types.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed_complex_types.sol
new file mode 100644
index 0000000000..ea6d781898
--- /dev/null
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_packed_complex_types.sol
@@ -0,0 +1,14 @@
+contract C {
+    uint120[3] x;
+    function f() public returns (bytes32 hash1, bytes32 hash2, bytes32 hash3) {
+        uint120[] memory y = new uint120[](3);
+        x[0] = y[0] = uint120(type(uint).max - 1);
+        x[1] = y[1] = uint120(type(uint).max - 2);
+        x[2] = y[2] = uint120(type(uint).max - 3);
+        hash1 = keccak256(abi.encodePacked(x));
+        hash2 = keccak256(abi.encodePacked(y));
+        hash3 = keccak256(abi.encodePacked(this.f));
+    }
+}
+// ----
+// f() -> 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0xba4f20407251e4607cd66b90bfea19ec6971699c03e4a4f3ea737d5818ac27ae, 0x0e9229fb1d2cd02cee4b6c9f25497777014a8766e3479666d1c619066d2887ec
diff --git a/test/libsolidity/semanticTests/builtinFunctions/ripemd160.sol b/test/libsolidity/semanticTests/builtinFunctions/ripemd160.sol
new file mode 100644
index 0000000000..e070a65f51
--- /dev/null
+++ b/test/libsolidity/semanticTests/builtinFunctions/ripemd160.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f(int256 input) public returns (bytes32 sha256hash) {
+        return ripemd160(abi.encodePacked(bytes32(uint256(input))));
+    }
+}
+// ----
+// f(int256): 4 -> 0x1b0f3c404d12075c68c938f9f60ebea4f74941a0000000000000000000000000
+// f(int256): 5 -> 0xee54aa84fc32d8fed5a5fe160442ae84626829d9000000000000000000000000
+// f(int256): -1 -> 0x1cf4e77f5966e13e109703cd8a0df7ceda7f3dc3000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_packed.sol b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_packed.sol
new file mode 100644
index 0000000000..733bd420d0
--- /dev/null
+++ b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_packed.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f(int256 _input) public returns (bytes32 hash) {
+        uint24 b = 65536;
+        uint c = 256;
+        bytes32 input = bytes32(uint256(_input));
+        return ripemd160(abi.encodePacked(uint8(8), input, b, input, c));
+    }
+}
+// ----
+// f(int256): 4 -> 0xf93175303eba2a7b372174fc9330237f5ad202fc000000000000000000000000
+// f(int256): 5 -> 0x04f4fc112e2bfbe0d38f896a46629e08e2fcfad5000000000000000000000000
+// f(int256): -1 -> 0xc0a2e4b1f3ff766a9a0089e7a410391730872495000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/sha256.sol b/test/libsolidity/semanticTests/builtinFunctions/sha256.sol
new file mode 100644
index 0000000000..4060a7fada
--- /dev/null
+++ b/test/libsolidity/semanticTests/builtinFunctions/sha256.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f(int256 input) public returns (bytes32 sha256hash) {
+        return sha256(abi.encodePacked(bytes32(uint256(input))));
+    }
+}
+// ----
+// f(int256): 4 -> 0xe38990d0c7fc009880a9c07c23842e886c6bbdc964ce6bdd5817ad357335ee6f
+// f(int256): 5 -> 0x96de8fc8c256fa1e1556d41af431cace7dca68707c78dd88c3acab8b17164c47
+// f(int256): -1 -> 0xaf9613760f72635fbdb44a5a0a63c39f12af30f950a6ee5c971be188e89c4051
diff --git a/test/libsolidity/semanticTests/builtinFunctions/sha256_packed.sol b/test/libsolidity/semanticTests/builtinFunctions/sha256_packed.sol
new file mode 100644
index 0000000000..19959c4405
--- /dev/null
+++ b/test/libsolidity/semanticTests/builtinFunctions/sha256_packed.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f(int256 _input) public returns (bytes32 hash) {
+        uint24 b = 65536;
+        uint c = 256;
+        bytes32 input = bytes32(uint256(_input));
+        return sha256(abi.encodePacked(uint8(8), input, b, input, c));
+    }
+}
+// ----
+// f(int256): 4 -> 0x804e0d7003cfd70fc925dc103174d9f898ebb142ecc2a286da1abd22ac2ce3ac
+// f(int256): 5 -> 0xe94921945f9068726c529a290a954f412bcac53184bb41224208a31edbf63cf0
+// f(int256): -1 -> 0xf14def4d07cd185ddd8b10a81b2238326196a38867e6e6adbcc956dc913488c7

From be0f6339666c5b32de2adf24c49f98bd561482c0 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 21 Oct 2022 16:59:50 -0300
Subject: [PATCH 0958/1748] Update gp2 fork

---
 scripts/externalTests/update_external_repos.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/externalTests/update_external_repos.sh b/scripts/externalTests/update_external_repos.sh
index 2270691ec8..3093c1a08a 100755
--- a/scripts/externalTests/update_external_repos.sh
+++ b/scripts/externalTests/update_external_repos.sh
@@ -83,7 +83,7 @@ clone_repo element-fi        elf-contracts
 clone_repo ensdomains        ens
 clone_repo ensdomains        ens-contracts
 clone_repo euler-xyz         euler-contracts
-clone_repo gnosis            gp-v2-contracts
+clone_repo cowprotocol       contracts                 gp2-contracts
 clone_repo gnosis            mock-contract
 clone_repo gnosis            util-contracts
 clone_repo JoinColony        colonyNetwork
@@ -105,7 +105,7 @@ sync_branch elf-contracts             main
 sync_branch ens                       master
 sync_branch ens-contracts             master
 sync_branch euler-contracts           master
-sync_branch gp-v2-contracts           main
+sync_branch gp2-contracts             main
 sync_branch mock-contract             master
 sync_branch util-contracts            main
 sync_branch colonyNetwork             develop

From bc7567244a4ad4fe383935a0c7e29d0ece36dd62 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Sun, 23 Oct 2022 17:58:13 -0300
Subject: [PATCH 0959/1748] Remove ens fork

---
 scripts/externalTests/update_external_repos.sh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/externalTests/update_external_repos.sh b/scripts/externalTests/update_external_repos.sh
index 3093c1a08a..8a25f37906 100755
--- a/scripts/externalTests/update_external_repos.sh
+++ b/scripts/externalTests/update_external_repos.sh
@@ -80,7 +80,6 @@ cd "$target_dir"
 clone_repo brinktrade        brink-core
 clone_repo dapphub           dappsys-monolithic
 clone_repo element-fi        elf-contracts
-clone_repo ensdomains        ens
 clone_repo ensdomains        ens-contracts
 clone_repo euler-xyz         euler-contracts
 clone_repo cowprotocol       contracts                 gp2-contracts
@@ -102,7 +101,6 @@ clone_repo yieldprotocol     yield-liquidator-v2
 sync_branch brink-core                master
 sync_branch dappsys-monolithic        master
 sync_branch elf-contracts             main
-sync_branch ens                       master
 sync_branch ens-contracts             master
 sync_branch euler-contracts           master
 sync_branch gp2-contracts             main

From 813a37592d8207a739e10b51effcde3422187973 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 19 Oct 2022 09:28:58 -0300
Subject: [PATCH 0960/1748] =?UTF-8?q?Add=20action=20to=20welcome=20externa?=
 =?UTF-8?q?l=20contributors=20with=20the=20contributing=20guidelines=20Co-?=
 =?UTF-8?q?authored-by:=20Kamil=20=C5=9Aliwak=20<kamil.sliwak@codepoets.it?=
 =?UTF-8?q?>=20Co-authored-by:=20Nuno=20Santos=20<nunofilipesantos@gmail.c?=
 =?UTF-8?q?om>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/welcome-external-pr.yml | 66 +++++++++++++++++++++++
 1 file changed, 66 insertions(+)
 create mode 100644 .github/workflows/welcome-external-pr.yml

diff --git a/.github/workflows/welcome-external-pr.yml b/.github/workflows/welcome-external-pr.yml
new file mode 100644
index 0000000000..1a034ffff3
--- /dev/null
+++ b/.github/workflows/welcome-external-pr.yml
@@ -0,0 +1,66 @@
+name: External contributor greeter
+
+on:
+  pull_request_target:
+    types:
+      - opened
+      - reopened
+
+env:
+  ORGANIZATION: Ethereum
+  DRY_RUN: false
+
+jobs:
+  comment-external-pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Get organization members
+        id: get_members
+        env:
+          GH_TOKEN: ${{ secrets.READ_ORG }}
+          CONTRIBUTOR: ${{ github.event.pull_request.user.login }}
+        run: |
+          gh api graphql \
+            --raw-field organization="$ORGANIZATION" \
+            --raw-field query='
+              query($organization: String!, $cursor: String) {
+                organization(login: $organization) {
+                  membersWithRole(first: 100, after: $cursor) {
+                    pageInfo {
+                      hasNextPage,
+                      endCursor
+                    }
+                    nodes {
+                      login
+                    }
+                  }
+                }
+              }' > org_members.json
+          echo "CONTRIBUTOR_IS_ORG_MEMBER=$(
+            jq \
+              --arg contributor $CONTRIBUTOR \
+              '.data.organization.membersWithRole | any(.nodes[].login; . == $contributor)' \
+              org_members.json
+          )" >> $GITHUB_OUTPUT
+
+      - name: Comment on external contribution PR
+        if: ${{ steps.get_members.outputs.CONTRIBUTOR_IS_ORG_MEMBER == 'false' }}
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          PR: ${{ github.event.pull_request.html_url }}
+        run: |
+          echo "Commenting in a newly submitted or reopened external PR: $PR"
+          if [[ $DRY_RUN == 'false' ]]; then
+            gh pr edit "$PR" --add-label "external contribution :star:"
+            comment_body=(
+              "Thank you for your contribution to the Solidity compiler! A team member will follow up shortly."
+              "\n\n"
+              "If you haven't read our [contributing guidelines](https://docs.soliditylang.org/en/latest/contributing.html) and our "
+              "[review checklist](https://github.com/ethereum/solidity/blob/develop/ReviewChecklist.md) before, "
+              "please do it now, this makes the reviewing process and accepting your contribution smoother."
+              "\n\n"
+              "If you have any questions or need our help, feel free to post them in the PR or talk to us directly on the "
+              "[#solidity-dev](https://matrix.to/#/#ethereum_solidity-dev:gitter.im) channel on Matrix."
+            )
+            gh pr comment $PR --body "$(IFS='' ; echo -e "${comment_body[*]}")"
+          fi

From 0bad372aee3b24fcf98343474d428d5ab8119b0c Mon Sep 17 00:00:00 2001
From: Yusuf Benli <yusufbenli00@gmail.com>
Date: Wed, 27 Jul 2022 19:50:25 +0300
Subject: [PATCH 0961/1748] Fix buglist typo:
 NestedCallataArrayAbiReencodingSizeValidation ->
 NestedCalldataArrayAbiReencodingSizeValidation

Misspelling fix
---
 docs/bugs.json            |  2 +-
 docs/bugs_by_version.json | 88 +++++++++++++++++++--------------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/docs/bugs.json b/docs/bugs.json
index 03dafbe45b..9c9780c935 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -60,7 +60,7 @@
     },
     {
         "uid": "SOL-2022-2",
-        "name": "NestedCallataArrayAbiReencodingSizeValidation",
+        "name": "NestedCalldataArrayAbiReencodingSizeValidation",
         "summary": "ABI-reencoding of nested dynamic calldata arrays did not always perform proper size checks against the size of calldata and could read beyond ``calldatasize()``.",
         "description": "Calldata validation for nested dynamic types is deferred until the first access to the nested values. Such an access may for example be a copy to memory or an index or member access to the outer type. While in most such accesses calldata validation correctly checks that the data area of the nested array is completely contained in the passed calldata (i.e. in the range [0, calldatasize()]), this check may not be performed, when ABI encoding such nested types again directly from calldata. For instance, this can happen, if a value in calldata with a nested dynamic array is passed to an external call, used in ``abi.encode`` or emitted as event. In such cases, if the data area of the nested array extends beyond ``calldatasize()``, ABI encoding it did not revert, but continued reading values from beyond ``calldatasize()`` (i.e. zero values).",
         "link": "https://blog.soliditylang.org/2022/05/17/calldata-reencode-size-check-bug/",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 11ddd40b07..4e7bca56b3 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1085,7 +1085,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1103,7 +1103,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1120,7 +1120,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1137,7 +1137,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1154,7 +1154,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1173,7 +1173,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1191,7 +1191,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1208,7 +1208,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1348,7 +1348,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1369,7 +1369,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1389,7 +1389,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1407,7 +1407,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1425,7 +1425,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1439,7 +1439,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1453,7 +1453,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1466,7 +1466,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1483,7 +1483,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1500,7 +1500,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
             "EmptyByteArrayCopy",
@@ -1517,7 +1517,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1534,7 +1534,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1550,7 +1550,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1566,7 +1566,7 @@
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1580,7 +1580,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1595,7 +1595,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1609,7 +1609,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1624,7 +1624,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1638,7 +1638,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching",
@@ -1651,7 +1651,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1663,7 +1663,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1675,7 +1675,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1687,7 +1687,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1699,7 +1699,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1711,7 +1711,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation"
+            "NestedCalldataArrayAbiReencodingSizeValidation"
         ],
         "released": "2021-11-09"
     },
@@ -1720,7 +1720,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "AbiEncodeCallLiteralAsFixedBytesBug"
         ],
         "released": "2021-12-20"
@@ -1730,7 +1730,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "AbiEncodeCallLiteralAsFixedBytesBug"
         ],
         "released": "2022-02-16"
@@ -1742,7 +1742,7 @@
             "DirtyBytesArrayToStorage",
             "InlineAssemblyMemorySideEffects",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation"
+            "NestedCalldataArrayAbiReencodingSizeValidation"
         ],
         "released": "2022-03-16"
     },
@@ -1777,7 +1777,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory",
             "KeccakCaching"
@@ -1789,7 +1789,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables",
             "ABIDecodeTwoDimensionalArrayMemory"
         ],
@@ -1800,7 +1800,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
         "released": "2021-04-21"
@@ -1810,7 +1810,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
         "released": "2021-06-10"
@@ -1820,7 +1820,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
         "released": "2021-06-22"
@@ -1830,7 +1830,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "SignedImmutables"
         ],
         "released": "2021-08-11"
@@ -1840,7 +1840,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation",
+            "NestedCalldataArrayAbiReencodingSizeValidation",
             "UserDefinedValueTypesBug",
             "SignedImmutables"
         ],
@@ -1851,7 +1851,7 @@
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
-            "NestedCallataArrayAbiReencodingSizeValidation"
+            "NestedCalldataArrayAbiReencodingSizeValidation"
         ],
         "released": "2021-09-29"
     }

From 2af6ca0eca424c45fcb981af3b360d241508a90c Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 24 Oct 2022 11:34:20 -0300
Subject: [PATCH 0962/1748] Disable debug mode and exempt roadmap and epic
 labels

---
 .github/workflows/stale-pull-requests.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/stale-pull-requests.yml b/.github/workflows/stale-pull-requests.yml
index 8a27edee25..70ab24c0ee 100644
--- a/.github/workflows/stale-pull-requests.yml
+++ b/.github/workflows/stale-pull-requests.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/stale@v6
         with:
-          debug-only: true
+          debug-only: false
           # disable issues
           days-before-issue-stale: -1
           days-before-issue-close: -1
@@ -32,8 +32,8 @@ jobs:
           close-pr-label: closed-due-inactivity
           days-before-pr-stale: ${{ env.BEFORE_STALE }}
           days-before-pr-close: ${{ env.BEFORE_CLOSE }}
-          exempt-pr-labels: 'external contribution :star:'
+          exempt-pr-labels: 'external contribution :star:,roadmap,epic'
           exempt-draft-pr: true
           exempt-all-milestones: true
           remove-stale-when-updated: true
-          operations-per-run: 100
+          operations-per-run: 128

From c47d3cd00f9473fbf90ba613f7b4e30081697bbc Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 24 Oct 2022 11:41:13 -0300
Subject: [PATCH 0963/1748] Disable dry-run

---
 .github/workflows/triage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
index 97bd23ae55..0737efc336 100644
--- a/.github/workflows/triage.yml
+++ b/.github/workflows/triage.yml
@@ -10,7 +10,7 @@ env:
   ORGANIZATION: ethereum
   REPOSITORY: solidity
   PROJECT_NUMBER: 43
-  DRY_RUN: true
+  DRY_RUN: false
 
 jobs:
   triage_issues:

From 54965fb0aeace0d1cc1d1343d8060d5e6a3a5e70 Mon Sep 17 00:00:00 2001
From: andy53 <andy@evilrobots.club>
Date: Mon, 24 Oct 2022 13:22:39 -0600
Subject: [PATCH 0964/1748] fix emit statments being printed on the same line
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update test/libsolidity/semanticTests/emit_three_identical_events.sol

Co-authored-by: Kamil Śliwak <cameel2@gmail.com>

Update test/libsolidity/semanticTests/emit_two_identical_events.sol

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
---
 .../semanticTests/emit_three_identical_events.sol  | 14 ++++++++++++++
 .../semanticTests/emit_two_identical_events.sol    | 12 ++++++++++++
 test/libsolidity/util/TestFunctionCall.cpp         | 10 ++++------
 3 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/emit_three_identical_events.sol
 create mode 100644 test/libsolidity/semanticTests/emit_two_identical_events.sol

diff --git a/test/libsolidity/semanticTests/emit_three_identical_events.sol b/test/libsolidity/semanticTests/emit_three_identical_events.sol
new file mode 100644
index 0000000000..dec367e1b7
--- /dev/null
+++ b/test/libsolidity/semanticTests/emit_three_identical_events.sol
@@ -0,0 +1,14 @@
+contract C {
+    event Terminated();
+
+    function terminate() external {
+        emit Terminated();
+        emit Terminated();
+        emit Terminated();
+    }
+}
+// ----
+// terminate() ->
+// ~ emit Terminated()
+// ~ emit Terminated()
+// ~ emit Terminated()
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/emit_two_identical_events.sol b/test/libsolidity/semanticTests/emit_two_identical_events.sol
new file mode 100644
index 0000000000..85cdceafc0
--- /dev/null
+++ b/test/libsolidity/semanticTests/emit_two_identical_events.sol
@@ -0,0 +1,12 @@
+contract C {
+    event Terminated();
+
+    function terminate() external {
+        emit Terminated();
+        emit Terminated();
+    }
+}
+// ----
+// terminate() ->
+// ~ emit Terminated()
+// ~ emit Terminated()
\ No newline at end of file
diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index 7531d8ce53..a50b3caf02 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -208,12 +208,10 @@ string TestFunctionCall::format(
 		if (!sideEffects.empty())
 		{
 			stream << std::endl;
-			for (string const& effect: sideEffects)
-			{
-				stream << _linePrefix << "// ~ " << effect;
-				if (effect != *sideEffects.rbegin())
-					stream << std::endl;
-			}
+			size_t i = 0;
+			for (; i < sideEffects.size() - 1; ++i)
+				stream << _linePrefix << "// ~ " << sideEffects[i] << std::endl;
+			stream << _linePrefix << "// ~ " << sideEffects[i];
 		}
 
 		stream << formatGasExpectations(_linePrefix, _renderMode == RenderMode::ExpectedValuesActualGas, _interactivePrint);

From 8c0740748e291c2244e1af86aee26045bef7082c Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Wed, 29 Jun 2022 17:42:58 +0530
Subject: [PATCH 0965/1748] functions taking calldata args should be assignable
 to function pointers of same type

---
 docs/types/value-types.rst                         | 12 ++++++++++++
 ...igned_to_function_pointers_with_memory_type.sol | 10 ++++++++++
 ..._assigned_to_function_pointers_of_same_type.sol | 14 ++++++++++++++
 ...igned_to_function_pointers_with_memory_type.sol |  9 +++++++++
 ..._assigned_to_function_pointers_of_same_type.sol |  9 +++++++++
 5 files changed, 54 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/internal_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 1e8e3e7fd9..cfec894a9a 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -789,6 +789,18 @@ This includes private, internal and public functions of both contracts and libra
 functions.
 External function types, on the other hand, are only compatible with public and external contract
 functions.
+
+.. note::
+    External functions with ``calldata`` parameters are incompatible with external function types with ``calldata`` parameters.
+    They are compatible with the corresponding types with ``memory`` parameters instead.
+    For example, there is no function that can be pointed at by a value of type ``function (string calldata) external`` while
+    ``function (string memory) external`` can point at both ``function f(string memory) external {}`` and
+    ``function g(string calldata) external {}``.
+    This is because for both locations the arguments are passed to the function in the same way.
+    The caller cannot pass its calldata directly to an external function and always ABI-encodes the arguments into memory.
+    Marking the parameters as ``calldata`` only affects the implementation of the external function and is
+    meaningless in a function pointer on the caller's side.
+
 Libraries are excluded because they require a ``delegatecall`` and use :ref:`a different ABI
 convention for their selectors <library-selectors>`.
 Functions declared in interfaces do not have definitions so pointing at them does not make sense either.
diff --git a/test/libsolidity/semanticTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol b/test/libsolidity/semanticTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol
new file mode 100644
index 0000000000..069d257f79
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol
@@ -0,0 +1,10 @@
+contract C {
+    function g(string calldata) external returns (bool) { return true; }
+
+    function main() external returns (bool) {
+        function (string memory) external returns (bool) ptr = this.g;
+        return ptr("testString");
+    }
+}
+// ----
+// main() -> true
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol
new file mode 100644
index 0000000000..b5bacb69b8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f(function (string calldata) external) external {}
+    function g(string calldata) external {}
+
+    function main() external {
+        function (string calldata) external ptr = this.g;
+        abi.encodeCall(this.f, (this.g));
+        this.f(this.g);
+    }
+}
+// ----
+// TypeError 9574: (161-209): Type function (string memory) external is not implicitly convertible to expected type function (string calldata) external.
+// TypeError 5407: (242-250): Cannot implicitly convert component at position 0 from "function (string memory) external" to "function (string calldata) external".
+// TypeError 9553: (268-274): Invalid type for argument in function call. Invalid implicit conversion from function (string memory) external to function (string calldata) external requested.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol
new file mode 100644
index 0000000000..8aab9fd18d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/external_functions_with_calldata_args_assigned_to_function_pointers_with_memory_type.sol
@@ -0,0 +1,9 @@
+contract C {
+    function g(string calldata) external {}
+
+    function main() view external {
+        function (string memory) external ptr = this.g;
+        ptr;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/internal_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol b/test/libsolidity/syntaxTests/functionTypes/internal_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol
new file mode 100644
index 0000000000..5e9014adae
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/internal_functions_with_calldata_args_assigned_to_function_pointers_of_same_type.sol
@@ -0,0 +1,9 @@
+contract C {
+    function g(bytes calldata b) pure internal {}
+
+    function main() pure external {
+        function (bytes calldata) internal ptr = g;
+        ptr;
+    }
+}
+// ----

From 376b923a7979d47373db49dfadbba7ad96c1f730 Mon Sep 17 00:00:00 2001
From: George Plotnikov <accembler@gmail.com>
Date: Wed, 26 Oct 2022 15:13:11 +0500
Subject: [PATCH 0966/1748] adding support for `no-pretty-print`

---
 test/cmdlineTests.sh | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index b320da05e0..6adc91538e 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -186,25 +186,25 @@ function test_solc_behaviour
     exitCode=$?
     set -e
 
-    if [[ " ${solc_args[*]} " == *" --standard-json "* ]]
+    if [[ " ${solc_args[*]} " == *" --standard-json "* ]] && [[ -s $stdout_path ]]
     then
         python3 - <<EOF
 import re, sys
 json = open("$stdout_path", "r").read()
 json = re.sub(r"{[^{}]*Warning: This is a pre-release compiler version[^{}]*},?", "", json)
-json = re.sub(r"\"errors\":\s*\[\s*\],?\s*","",json)    # Remove "errors" array if it's not empty
-json = re.sub("\n\\s+\n", "\n\n", json)                 # Remove trailing whitespace
-json = re.sub(r"},(\n{0,1})\n*(\s*])", r"}\1\2", json)  # },] -> }]
+json = re.sub(r"\"errors\":\s*\[\s*\],?","\n" if json[1] == " " else "",json)       # Remove "errors" array if it's not empty
+json = re.sub("\n\\s*\n", "\n", json)                                               # Remove trailing whitespace
+json = re.sub(r"},(\n{0,1})\n*(\s*(]|}))", r"}\1\2", json)                          # Remove trailing comma
 open("$stdout_path", "w").write(json)
 EOF
         sed -i.bak -E -e 's/ Consider adding \\"pragma solidity \^[0-9.]*;\\"//g' "$stdout_path"
-        sed -i.bak -E -e 's/\"opcodes\":\"[^"]+\"/\"opcodes\":\"<OPCODES REMOVED>\"/g' "$stdout_path"
-        sed -i.bak -E -e 's/\"sourceMap\":\"[0-9:;-]+\"/\"sourceMap\":\"<SOURCEMAP REMOVED>\"/g' "$stdout_path"
+        sed -i.bak -E -e 's/\"opcodes\":[[:space:]]*\"[^"]+\"/\"opcodes\":\"<OPCODES REMOVED>\"/g' "$stdout_path"
+        sed -i.bak -E -e 's/\"sourceMap\":[[:space:]]*\"[0-9:;-]+\"/\"sourceMap\":\"<SOURCEMAP REMOVED>\"/g' "$stdout_path"
 
         # Remove bytecode (but not linker references).
-        sed -i.bak -E -e 's/(\"object\":\")[0-9a-f]+([^"]*\")/\1<BYTECODE REMOVED>\2/g' "$stdout_path"
+        sed -i.bak -E -e 's/(\"object\":[[:space:]]*\")[0-9a-f]+([^"]*\")/\1<BYTECODE REMOVED>\2/g' "$stdout_path"
         # shellcheck disable=SC2016
-        sed -i.bak -E -e 's/(\"object\":\"[^"]+\$__)[0-9a-f]+(\")/\1<BYTECODE REMOVED>\2/g' "$stdout_path"
+        sed -i.bak -E -e 's/(\"object\":[[:space:]]*\"[^"]+\$__)[0-9a-f]+(\")/\1<BYTECODE REMOVED>\2/g' "$stdout_path"
         # shellcheck disable=SC2016
         sed -i.bak -E -e 's/([0-9a-f]{34}\$__)[0-9a-f]+(__\$[0-9a-f]{17})/\1<BYTECODE REMOVED>\2/g' "$stdout_path"
         # Remove metadata in assembly output (see below about the magic numbers)
@@ -215,7 +215,7 @@ EOF
         # Replace escaped newlines by actual newlines for readability
         # shellcheck disable=SC1003
         sed -i.bak -E -e 's/\\n/\'$'\n/g' "$stdout_path"
-        sed -i.bak -e 's/\(^[ ]*auxdata: \)0x[0-9a-f]*$/\1<AUXDATA REMOVED>/' "$stdout_path"
+        sed -i.bak -e 's/\(^[ ]*auxdata:[[:space:]]\)0x[0-9a-f]*$/\1<AUXDATA REMOVED>/' "$stdout_path"
         rm "$stdout_path.bak"
     else
         sed -i.bak -e '/^Warning: This is a pre-release compiler version, please do not use it in production./d' "$stderr_path"
@@ -458,7 +458,13 @@ printTask "Running general commandline tests..."
             inputFile=""
             stdout="$(cat "${tdir}/output.json" 2>/dev/null || true)"
             stdoutExpectationFile="${tdir}/output.json"
-            command_args="--standard-json "$(cat "${tdir}/args" 2>/dev/null || true)
+            prettyPrintFlags=""
+            if [[ ! -f "${tdir}/no-pretty-print" ]]
+            then
+                prettyPrintFlags="--pretty-json --json-indent 4"
+            fi
+
+            command_args="--standard-json ${prettyPrintFlags} "$(cat "${tdir}/args" 2>/dev/null || true)
         else
             if [ -e "${tdir}/stdin" ]
             then

From 6374b4fe23ec8dc989f430b8d4ee0f45e65a52f1 Mon Sep 17 00:00:00 2001
From: George Plotnikov <accembler@gmail.com>
Date: Wed, 26 Oct 2022 15:13:47 +0500
Subject: [PATCH 0967/1748] regenerating tests expectation

---
 .../linking_standard_solidity/output.json     |   27 +-
 .../output.json                               |   27 +-
 .../output.json                               |   43 +-
 .../linking_standard_yul/output.json          |   20 +-
 .../output.json                               |   20 +-
 .../output.json                               |   32 +-
 .../output_selection_all_A1/output.json       |   43 +-
 .../output_selection_all_A2/output.json       |   30 +-
 .../output_selection_all_blank/output.json    |   14 +-
 .../output_selection_all_star/output.json     |   63 +-
 .../output_selection_single_A1/output.json    |   30 +-
 .../output_selection_single_B1/output.json    |   30 +-
 .../output_selection_single_all/output.json   |   40 +-
 .../no-pretty-print}                          |    0
 .../pretty_json_standard/no-pretty-print      |    0
 .../no-pretty-print                           |    0
 .../recovery_standard_json/output.json        |   94 +-
 .../output.json                               |   41 +-
 .../args                                      |    2 +-
 .../args                                      |    2 +-
 .../args                                      |    2 +-
 .../args                                      |    2 +-
 .../output.json                               |   41 +-
 .../standard_default_success/output.json      |   10 +-
 .../standard_empty_file_name/output.json      |   29 +-
 .../standard_ewasm_requested/output.json      |   26 +-
 .../output.json                               |   24 +-
 .../standard_function_debug_info/output.json  |  186 +-
 .../standard_generatedSources/output.json     | 2388 ++++++++++++++++-
 .../standard_immutable_references/output.json |   35 +-
 .../output.json                               |   22 +-
 .../standard_ir_requested/output.json         |   22 +-
 .../no-pretty-print                           |    0
 .../output.json                               |   26 +-
 .../output.json                               |   23 +-
 .../output.json                               |   10 +-
 .../output.json                               |   49 +-
 .../output.json                               |   49 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   23 +-
 .../output.json                               |   71 +-
 .../output.json                               |   49 +-
 .../output.json                               |   23 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   22 +-
 .../output.json                               |   28 +-
 .../output.json                               |   10 +-
 .../output.json                               |   73 +-
 .../output.json                               |   28 +-
 .../output.json                               |   55 +-
 .../output.json                               |   13 +-
 .../output.json                               |   31 +-
 .../output.json                               |   52 +-
 .../output.json                               |   31 +-
 .../output.json                               |   10 +-
 .../output.json                               |   25 +-
 .../output.json                               |   47 +-
 .../output.json                               |   41 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   48 +-
 .../output.json                               |   48 +-
 .../output.json                               |   38 +-
 .../output.json                               |   23 +-
 .../output.json                               |   66 +-
 .../output.json                               |   50 +-
 .../output.json                               |   29 +-
 .../output.json                               |   13 +-
 .../output.json                               |   31 +-
 .../output.json                               |   33 +-
 .../output.json                               |   73 +-
 .../output.json                               |   31 +-
 .../output.json                               |   31 +-
 .../output.json                               |   52 +-
 .../output.json                               |   31 +-
 .../output.json                               |   52 +-
 .../output.json                               |   10 +-
 .../output.json                               |   47 +-
 .../output.json                               |   10 +-
 .../output.json                               |  152 +-
 .../output.json                               |  146 +-
 .../output.json                               |   85 +-
 .../output.json                               |   52 +-
 .../output.json                               |   31 +-
 .../output.json                               |   13 +-
 .../output.json                               |   10 +-
 .../output.json                               |   31 +-
 .../output.json                               |   52 +-
 .../output.json                               |   31 +-
 .../output.json                               |   10 +-
 .../output.json                               |   31 +-
 .../output.json                               |   52 +-
 .../output.json                               |   31 +-
 .../output.json                               |  118 +-
 .../output.json                               |   67 +-
 .../output.json                               |   85 +-
 .../output.json                               |   49 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   60 +-
 .../output.json                               |   62 +-
 .../output.json                               |   23 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../cmdlineTests/standard_no_append_cbor/args |    1 -
 .../standard_no_append_cbor/output.json       |    6 +-
 .../args                                      |    1 -
 .../standard_only_ast_requested/output.json   |   97 +-
 .../output.json                               | 1478 +++++++++-
 .../args                                      |    1 -
 .../standard_optimizer_invalid_details/args   |    1 -
 .../standard_optimizer_no_yul/args            |    1 -
 test/cmdlineTests/standard_optimizer_yul/args |    1 -
 .../standard_optimizer_yulDetails/args        |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../args                                      |    1 -
 .../output.json                               |   38 +-
 .../standard_urls_existing_and_missing/args   |    1 -
 test/cmdlineTests/standard_urls_missing/args  |    1 -
 .../standard_viair_requested/output.json      |   71 +-
 .../output.json                               |   13 +-
 .../standard_wrong_key_metadata/output.json   |   13 +-
 .../standard_wrong_key_optimizer/output.json  |   13 +-
 .../standard_wrong_key_root/output.json       |   13 +-
 .../standard_wrong_key_settings/output.json   |   13 +-
 .../standard_wrong_key_source/output.json     |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../standard_wrong_type_metadata/output.json  |   13 +-
 .../standard_wrong_type_optimizer/output.json |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../output.json                               |   13 +-
 .../standard_wrong_type_root/output.json      |   13 +-
 .../standard_wrong_type_settings/output.json  |   13 +-
 .../standard_wrong_type_source/output.json    |   13 +-
 .../standard_wrong_type_sources/output.json   |   13 +-
 .../output.json                               |   13 +-
 test/cmdlineTests/standard_yul/output.json    |   33 +-
 .../standard_yul_debug_info_print_all/args    |    2 +-
 .../output.json                               |    2 +-
 .../args                                      |    2 +-
 .../output.json                               |    2 +-
 .../standard_yul_debug_info_print_none/args   |    2 +-
 .../output.json                               |    2 +-
 .../args                                      |    2 +-
 .../output.json                               |    3 +-
 .../standard_yul_immutable_references/args    |    1 -
 .../output.json                               |   68 +-
 .../output.json                               |    3 +-
 .../standard_yul_multiple_files/output.json   |   13 +-
 .../output.json                               |   13 +-
 .../standard_yul_object/output.json           |   33 +-
 .../output.json                               |   21 +-
 .../standard_yul_object_name/output.json      |   43 +-
 .../standard_yul_optimiserSteps/output.json   |   33 +-
 .../standard_yul_optimized/output.json        |   33 +-
 .../standard_yul_single_file_via_urls/args    |    2 +-
 .../standard_yul_stack_opt/output.json        |   18 +-
 .../output.json                               |   18 +-
 .../storage_layout_bytes/output.json          |   50 +-
 .../storage_layout_dyn_array/output.json      |   70 +-
 .../storage_layout_many/output.json           |  199 +-
 .../storage_layout_mapping/output.json        |   86 +-
 .../storage_layout_smoke/output.json          |   24 +-
 .../output.json                               |   28 +-
 .../storage_layout_string/output.json         |   50 +-
 .../storage_layout_struct/output.json         |  127 +-
 .../storage_layout_struct_packed/output.json  |  133 +-
 .../storage_layout_value_types/output.json    |   79 +-
 .../output.json                               |   99 +-
 .../yul_string_format_ascii/output.json       |   22 +-
 .../output.json                               |   22 +-
 .../output.json                               |   22 +-
 .../yul_string_format_ascii_long/output.json  |   22 +-
 .../yul_string_format_hex/output.json         |   22 +-
 200 files changed, 9146 insertions(+), 482 deletions(-)
 rename test/cmdlineTests/{standard_json_no_pretty_print/args => pretty_json_indent_only/no-pretty-print} (100%)
 create mode 100644 test/cmdlineTests/pretty_json_standard/no-pretty-print
 create mode 100644 test/cmdlineTests/pretty_json_standard_indent/no-pretty-print
 create mode 100644 test/cmdlineTests/standard_json_no_pretty_print/no-pretty-print
 delete mode 100644 test/cmdlineTests/standard_no_append_cbor/args
 delete mode 100644 test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_invalid_detail_type/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_invalid_details/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_no_yul/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yul/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_no_object/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/args
 delete mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_without_yul/args
 delete mode 100644 test/cmdlineTests/standard_parsing_import_absolute_paths/args
 delete mode 100644 test/cmdlineTests/standard_urls_existing_and_missing/args
 delete mode 100644 test/cmdlineTests/standard_urls_missing/args
 delete mode 100644 test/cmdlineTests/standard_yul_immutable_references/args

diff --git a/test/cmdlineTests/linking_standard_solidity/output.json b/test/cmdlineTests/linking_standard_solidity/output.json
index acf3bbc008..83813d806b 100644
--- a/test/cmdlineTests/linking_standard_solidity/output.json
+++ b/test/cmdlineTests/linking_standard_solidity/output.json
@@ -1 +1,26 @@
-{"contracts":{"A":{"C":{"evm":{"bytecode":{"linkReferences":{},"object":"<BYTECODE REMOVED>"}}}}},"sources":{"A":{"id":0}}}
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/linking_standard_solidity_quote_in_file_name/output.json b/test/cmdlineTests/linking_standard_solidity_quote_in_file_name/output.json
index 370772d7da..38e0a1b5aa 100644
--- a/test/cmdlineTests/linking_standard_solidity_quote_in_file_name/output.json
+++ b/test/cmdlineTests/linking_standard_solidity_quote_in_file_name/output.json
@@ -1 +1,26 @@
-{"contracts":{"A\"B":{"C":{"evm":{"bytecode":{"linkReferences":{},"object":"<BYTECODE REMOVED>"}}}}},"sources":{"A\"B":{"id":0}}}
+{
+    "contracts":
+    {
+        "A\"B":
+        {
+            "C":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "A\"B":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json b/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json
index 65db86584d..d9684242a5 100644
--- a/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json
+++ b/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json
@@ -1 +1,42 @@
-{"contracts":{"A":{"C":{"evm":{"bytecode":{"linkReferences":{"A":{"L2":[{"length":20,"start":184},{"length":20,"start":368}]}},"object":"<BYTECODE REMOVED>__$622b2f540b6a16ff5db7bea656ad8fcf4f$__<BYTECODE REMOVED>__$622b2f540b6a16ff5db7bea656ad8fcf4f$__<BYTECODE REMOVED>"}}}}},"sources":{"A":{"id":0}}}
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "linkReferences":
+                        {
+                            "A":
+                            {
+                                "L2":
+                                [
+                                    {
+                                        "length": 20,
+                                        "start": 184
+                                    },
+                                    {
+                                        "length": 20,
+                                        "start": 368
+                                    }
+                                ]
+                            }
+                        },
+                        "object": "<BYTECODE REMOVED>__$622b2f540b6a16ff5db7bea656ad8fcf4f$__<BYTECODE REMOVED>__$622b2f540b6a16ff5db7bea656ad8fcf4f$__<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/linking_standard_yul/output.json b/test/cmdlineTests/linking_standard_yul/output.json
index 89fa9901cf..b9059bdfd6 100644
--- a/test/cmdlineTests/linking_standard_yul/output.json
+++ b/test/cmdlineTests/linking_standard_yul/output.json
@@ -1 +1,19 @@
-{"contracts":{"A":{"a":{"evm":{"bytecode":{"linkReferences":{},"object":"<BYTECODE REMOVED>"}}}}},}
+{
+    "contracts":
+    {
+        "A":
+        {
+            "a":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json b/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json
index 89fa9901cf..b9059bdfd6 100644
--- a/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json
+++ b/test/cmdlineTests/linking_standard_yul_quote_in_file_name/output.json
@@ -1 +1,19 @@
-{"contracts":{"A":{"a":{"evm":{"bytecode":{"linkReferences":{},"object":"<BYTECODE REMOVED>"}}}}},}
+{
+    "contracts":
+    {
+        "A":
+        {
+            "a":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json b/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json
index ec597c396e..ac1250cd4c 100644
--- a/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json
+++ b/test/cmdlineTests/linking_standard_yul_unresolved_references/output.json
@@ -1 +1,31 @@
-{"contracts":{"A":{"a":{"evm":{"bytecode":{"linkReferences":{"contract/test.sol":{"L2":[{"length":20,"start":22}]}},"object":"<BYTECODE REMOVED>__$fb58009a6b1ecea3b9d99bedd645df4ec3$__<BYTECODE REMOVED>"}}}}},}
+{
+    "contracts":
+    {
+        "A":
+        {
+            "a":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "linkReferences":
+                        {
+                            "contract/test.sol":
+                            {
+                                "L2":
+                                [
+                                    {
+                                        "length": 20,
+                                        "start": 22
+                                    }
+                                ]
+                            }
+                        },
+                        "object": "<BYTECODE REMOVED>__$fb58009a6b1ecea3b9d99bedd645df4ec3$__<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/output_selection_all_A1/output.json b/test/cmdlineTests/output_selection_all_A1/output.json
index 5592b43f0d..b21b632bdc 100644
--- a/test/cmdlineTests/output_selection_all_A1/output.json
+++ b/test/cmdlineTests/output_selection_all_A1/output.json
@@ -1 +1,42 @@
-{"contracts":{"a.sol":{"A1":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}}},"b.sol":{"A1":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}}}},"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}
+{
+    "contracts":
+    {
+        "a.sol":
+        {
+            "A1":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        },
+        "b.sol":
+        {
+            "A1":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        },
+        "b.sol":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/output_selection_all_A2/output.json b/test/cmdlineTests/output_selection_all_A2/output.json
index d300efa1cb..c33941c2f9 100644
--- a/test/cmdlineTests/output_selection_all_A2/output.json
+++ b/test/cmdlineTests/output_selection_all_A2/output.json
@@ -1 +1,29 @@
-{"contracts":{"a.sol":{"A2":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}}}},"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}
+{
+    "contracts":
+    {
+        "a.sol":
+        {
+            "A2":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        },
+        "b.sol":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/output_selection_all_blank/output.json b/test/cmdlineTests/output_selection_all_blank/output.json
index 8805140540..b4c60911cb 100644
--- a/test/cmdlineTests/output_selection_all_blank/output.json
+++ b/test/cmdlineTests/output_selection_all_blank/output.json
@@ -1 +1,13 @@
-{"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}
+{
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        },
+        "b.sol":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/output_selection_all_star/output.json b/test/cmdlineTests/output_selection_all_star/output.json
index 1744015006..f709636212 100644
--- a/test/cmdlineTests/output_selection_all_star/output.json
+++ b/test/cmdlineTests/output_selection_all_star/output.json
@@ -1 +1,62 @@
-{"contracts":{"a.sol":{"A1":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}},"A2":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}}},"b.sol":{"A1":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}},"B2":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}}}},"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}
+{
+    "contracts":
+    {
+        "a.sol":
+        {
+            "A1":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            },
+            "A2":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        },
+        "b.sol":
+        {
+            "A1":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            },
+            "B2":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        },
+        "b.sol":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/output_selection_single_A1/output.json b/test/cmdlineTests/output_selection_single_A1/output.json
index 43d5be4069..ab44a2d540 100644
--- a/test/cmdlineTests/output_selection_single_A1/output.json
+++ b/test/cmdlineTests/output_selection_single_A1/output.json
@@ -1 +1,29 @@
-{"contracts":{"a.sol":{"A1":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}}}},"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}
+{
+    "contracts":
+    {
+        "a.sol":
+        {
+            "A1":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        },
+        "b.sol":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/output_selection_single_B1/output.json b/test/cmdlineTests/output_selection_single_B1/output.json
index 101f2e7a20..ffaf266b4d 100644
--- a/test/cmdlineTests/output_selection_single_B1/output.json
+++ b/test/cmdlineTests/output_selection_single_B1/output.json
@@ -1 +1,29 @@
-{"contracts":{"b.sol":{"B2":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}}}},"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}
+{
+    "contracts":
+    {
+        "b.sol":
+        {
+            "B2":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        },
+        "b.sol":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/output_selection_single_all/output.json b/test/cmdlineTests/output_selection_single_all/output.json
index e04588cb47..52d04cb18d 100644
--- a/test/cmdlineTests/output_selection_single_all/output.json
+++ b/test/cmdlineTests/output_selection_single_all/output.json
@@ -1 +1,39 @@
-{"contracts":{"a.sol":{"A1":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}},"A2":{"evm":{"bytecode":{"object":"<BYTECODE REMOVED>"}}}}},"sources":{"a.sol":{"id":0},"b.sol":{"id":1}}}
+{
+    "contracts":
+    {
+        "a.sol":
+        {
+            "A1":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            },
+            "A2":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        },
+        "b.sol":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_json_no_pretty_print/args b/test/cmdlineTests/pretty_json_indent_only/no-pretty-print
similarity index 100%
rename from test/cmdlineTests/standard_json_no_pretty_print/args
rename to test/cmdlineTests/pretty_json_indent_only/no-pretty-print
diff --git a/test/cmdlineTests/pretty_json_standard/no-pretty-print b/test/cmdlineTests/pretty_json_standard/no-pretty-print
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/cmdlineTests/pretty_json_standard_indent/no-pretty-print b/test/cmdlineTests/pretty_json_standard_indent/no-pretty-print
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/cmdlineTests/recovery_standard_json/output.json b/test/cmdlineTests/recovery_standard_json/output.json
index 2378a20841..68415ac0cb 100644
--- a/test/cmdlineTests/recovery_standard_json/output.json
+++ b/test/cmdlineTests/recovery_standard_json/output.json
@@ -1,13 +1,101 @@
-{"errors":[{"component":"general","errorCode":"3546","formattedMessage":"ParserError: Expected type name
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "3546",
+            "formattedMessage": "ParserError: Expected type name
  --> A:2:58:
   |
 2 | pragma solidity >=0.0; contract Errort6 { using foo for  ; /* missing type name */ }
   |                                                          ^
 
-","message":"Expected type name","severity":"error","sourceLocation":{"end":94,"file":"A","start":93},"type":"ParserError"},{"component":"general","errorCode":"3796","formattedMessage":"Warning: Recovered in ContractDefinition at '}'.
+",
+            "message": "Expected type name",
+            "severity": "error",
+            "sourceLocation":
+            {
+                "end": 94,
+                "file": "A",
+                "start": 93
+            },
+            "type": "ParserError"
+        },
+        {
+            "component": "general",
+            "errorCode": "3796",
+            "formattedMessage": "Warning: Recovered in ContractDefinition at '}'.
  --> A:2:84:
   |
 2 | pragma solidity >=0.0; contract Errort6 { using foo for  ; /* missing type name */ }
   |                                                                                    ^
 
-","message":"Recovered in ContractDefinition at '}'.","severity":"warning","sourceLocation":{"end":120,"file":"A","start":119},"type":"Warning"}],"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"Errort6":[3]},"id":4,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"Errort6","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":3,"linearizedBaseContracts":[3],"name":"Errort6","nameLocation":"68:7:0","nodeType":"ContractDefinition","nodes":[],"scope":4,"src":"59:35:0","usedErrors":[]}],"src":"36:84:0"},"id":0}}}
+",
+            "message": "Recovered in ContractDefinition at '}'.",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 120,
+                "file": "A",
+                "start": 119
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "ast":
+            {
+                "absolutePath": "A",
+                "exportedSymbols":
+                {
+                    "Errort6":
+                    [
+                        3
+                    ]
+                },
+                "id": 4,
+                "license": "GPL-3.0",
+                "nodeType": "SourceUnit",
+                "nodes":
+                [
+                    {
+                        "id": 1,
+                        "literals":
+                        [
+                            "solidity",
+                            ">=",
+                            "0.0"
+                        ],
+                        "nodeType": "PragmaDirective",
+                        "src": "36:22:0"
+                    },
+                    {
+                        "abstract": false,
+                        "baseContracts": [],
+                        "canonicalName": "Errort6",
+                        "contractDependencies": [],
+                        "contractKind": "contract",
+                        "fullyImplemented": true,
+                        "id": 3,
+                        "linearizedBaseContracts":
+                        [
+                            3
+                        ],
+                        "name": "Errort6",
+                        "nameLocation": "68:7:0",
+                        "nodeType": "ContractDefinition",
+                        "nodes": [],
+                        "scope": 4,
+                        "src": "59:35:0",
+                        "usedErrors": []
+                    }
+                ],
+                "src": "36:84:0"
+            },
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index 5860991828..28a76eb956 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -1,4 +1,13 @@
-{"contracts":{"C":{"C":{"evm":{"assembly":"    /* \"C\":79:428  contract C... */
+{
+    "contracts":
+    {
+        "C":
+        {
+            "C":
+            {
+                "evm":
+                {
+                    "assembly": "    /* \"C\":79:428  contract C... */
   0xa0
   jumpi(tag_5, callvalue)
   0x1f
@@ -361,7 +370,17 @@ sub_0: assembly {
 
     auxdata: <AUXDATA REMOVED>
 }
-"}}},"D":{"D":{"evm":{"assembly":"    /* \"D\":91:166  contract D is C(3)... */
+"
+                }
+            }
+        },
+        "D":
+        {
+            "D":
+            {
+                "evm":
+                {
+                    "assembly": "    /* \"D\":91:166  contract D is C(3)... */
   0xa0
   jumpi(tag_5, callvalue)
   0x1f
@@ -740,4 +759,20 @@ sub_0: assembly {
 
     auxdata: <AUXDATA REMOVED>
 }
-"}}}},"sources":{"C":{"id":0},"D":{"id":1}}}
+"
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "C":
+        {
+            "id": 0
+        },
+        "D":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/args b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/args
index 24d48faf2a..18532c5a6d 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/args
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --allow-paths .
+--allow-paths .
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/args b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/args
index 24d48faf2a..18532c5a6d 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/args
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --allow-paths .
+--allow-paths .
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/args b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/args
index 24d48faf2a..18532c5a6d 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/args
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --allow-paths .
+--allow-paths .
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/args b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/args
index 24d48faf2a..18532c5a6d 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/args
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_snippet_only/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --allow-paths .
+--allow-paths .
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index aff1f17aa7..d564db75a7 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -1,4 +1,11 @@
-{"contracts":{"C":{"C":{"ir":"
+{
+    "contracts":
+    {
+        "C":
+        {
+            "C":
+            {
+                "ir": "
 /// @use-src 0:\"C\"
 object \"C_54\" {
     code {
@@ -604,7 +611,8 @@ object \"C_54\" {
 
 }
 
-","irOptimized":"/// @use-src 0:\"C\"
+",
+                "irOptimized": "/// @use-src 0:\"C\"
 object \"C_54\" {
     code {
         {
@@ -759,7 +767,14 @@ object \"C_54\" {
         data \".metadata\" hex\"<BYTECODE REMOVED>\"
     }
 }
-"}},"D":{"D":{"ir":"
+"
+            }
+        },
+        "D":
+        {
+            "D":
+            {
+                "ir": "
 /// @use-src 0:\"C\", 1:\"D\"
 object \"D_72\" {
     code {
@@ -1435,7 +1450,8 @@ object \"D_72\" {
 
 }
 
-","irOptimized":"/// @use-src 0:\"C\", 1:\"D\"
+",
+                "irOptimized": "/// @use-src 0:\"C\", 1:\"D\"
 object \"D_72\" {
     code {
         {
@@ -1597,4 +1613,19 @@ object \"D_72\" {
         data \".metadata\" hex\"<BYTECODE REMOVED>\"
     }
 }
-"}}},"sources":{"C":{"id":0},"D":{"id":1}}}
+"
+            }
+        }
+    },
+    "sources":
+    {
+        "C":
+        {
+            "id": 0
+        },
+        "D":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_default_success/output.json b/test/cmdlineTests/standard_default_success/output.json
index 59b90c8cc9..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_default_success/output.json
+++ b/test/cmdlineTests/standard_default_success/output.json
@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_empty_file_name/output.json b/test/cmdlineTests/standard_empty_file_name/output.json
index 88cbe7667c..e419d0a5ee 100644
--- a/test/cmdlineTests/standard_empty_file_name/output.json
+++ b/test/cmdlineTests/standard_empty_file_name/output.json
@@ -1,3 +1,28 @@
-{"errors":[{"component":"general","errorCode":"2904","formattedMessage":"DeclarationError: Declaration \"A\" not found in \"\" (referenced as \".\").
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2904",
+            "formattedMessage": "DeclarationError: Declaration \"A\" not found in \"\" (referenced as \".\").
 
-","message":"Declaration \"A\" not found in \"\" (referenced as \".\").","severity":"error","sourceLocation":{"end":79,"file":"","start":59},"type":"DeclarationError"}],"sources":{"":{"id":0}}}
+",
+            "message": "Declaration \"A\" not found in \"\" (referenced as \".\").",
+            "severity": "error",
+            "sourceLocation":
+            {
+                "end": 79,
+                "file": "",
+                "start": 59
+            },
+            "type": "DeclarationError"
+        }
+    ],
+    "sources":
+    {
+        "":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_ewasm_requested/output.json b/test/cmdlineTests/standard_ewasm_requested/output.json
index a8ab1fd0bf..1db94af7d1 100644
--- a/test/cmdlineTests/standard_ewasm_requested/output.json
+++ b/test/cmdlineTests/standard_ewasm_requested/output.json
@@ -1,4 +1,14 @@
-{"contracts":{"A":{"C":{"ewasm":{"wasm":"<BYTECODE REMOVED>","wast":"(module
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "ewasm":
+                {
+                    "wasm": "<BYTECODE REMOVED>",
+                    "wast": "(module
     ;; custom section for sub-module
     ;; The Keccak-256 hash of the text representation of <REMOVED>
     ;; (@custom \"C_3_deployed\" \"<BYTECODE REMOVED>\")
@@ -151,4 +161,16 @@
 )
 
 )
-"}}}},"sources":{"A":{"id":0}}}
+"
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_ewasm_requested_abstract/output.json b/test/cmdlineTests/standard_ewasm_requested_abstract/output.json
index 2858515dfa..14a4ef2df9 100644
--- a/test/cmdlineTests/standard_ewasm_requested_abstract/output.json
+++ b/test/cmdlineTests/standard_ewasm_requested_abstract/output.json
@@ -1 +1,23 @@
-{"contracts":{"A":{"C":{"ewasm":{"wasm":"","wast":""}}}},"sources":{"A":{"id":0}}}
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "ewasm":
+                {
+                    "wasm": "",
+                    "wast": ""
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_function_debug_info/output.json b/test/cmdlineTests/standard_function_debug_info/output.json
index bb86d09247..d4f6651863 100644
--- a/test/cmdlineTests/standard_function_debug_info/output.json
+++ b/test/cmdlineTests/standard_function_debug_info/output.json
@@ -1 +1,185 @@
-{"contracts":{"a.sol":{"A":{"evm":{"bytecode":{"functionDebugData":{}},"deployedBytecode":{"functionDebugData":{"@f_19":{"entryPoint":96,"id":19,"parameterSlots":1,"returnSlots":1},"abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":439,"id":null,"parameterSlots":3,"returnSlots":1},"abi_decode_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":544,"id":null,"parameterSlots":2,"returnSlots":1},"abi_decode_t_uint256":{"entryPoint":418,"id":null,"parameterSlots":2,"returnSlots":1},"abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":590,"id":null,"parameterSlots":2,"returnSlots":1},"abi_encode_t_uint256_to_t_uint256_fromStack":{"entryPoint":663,"id":null,"parameterSlots":2,"returnSlots":0},"abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed":{"entryPoint":678,"id":null,"parameterSlots":2,"returnSlots":1},"allocate_memory":{"entryPoint":309,"id":null,"parameterSlots":1,"returnSlots":1},"allocate_unbounded":{"entryPoint":171,"id":null,"parameterSlots":0,"returnSlots":1},"array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr":{"entryPoint":336,"id":null,"parameterSlots":1,"returnSlots":1},"checked_add_t_uint256":{"entryPoint":799,"id":null,"parameterSlots":2,"returnSlots":1},"cleanup_t_uint256":{"entryPoint":385,"id":null,"parameterSlots":1,"returnSlots":1},"finalize_allocation":{"entryPoint":260,"id":null,"parameterSlots":2,"returnSlots":0},"panic_error_0x11":{"entryPoint":752,"id":null,"parameterSlots":0,"returnSlots":0},"panic_error_0x32":{"entryPoint":705,"id":null,"parameterSlots":0,"returnSlots":0},"panic_error_0x41":{"entryPoint":213,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d":{"entryPoint":191,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef":{"entryPoint":380,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db":{"entryPoint":186,"id":null,"parameterSlots":0,"returnSlots":0},"revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":{"entryPoint":181,"id":null,"parameterSlots":0,"returnSlots":0},"round_up_to_mul_of_32":{"entryPoint":196,"id":null,"parameterSlots":1,"returnSlots":1},"validator_revert_t_uint256":{"entryPoint":395,"id":null,"parameterSlots":1,"returnSlots":0}}}}}}},"sources":{"a.sol":{"id":0}}}
+{
+    "contracts":
+    {
+        "a.sol":
+        {
+            "A":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "functionDebugData": {}
+                    },
+                    "deployedBytecode":
+                    {
+                        "functionDebugData":
+                        {
+                            "@f_19":
+                            {
+                                "entryPoint": 96,
+                                "id": 19,
+                                "parameterSlots": 1,
+                                "returnSlots": 1
+                            },
+                            "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr":
+                            {
+                                "entryPoint": 439,
+                                "id": null,
+                                "parameterSlots": 3,
+                                "returnSlots": 1
+                            },
+                            "abi_decode_t_array$_t_uint256_$dyn_memory_ptr":
+                            {
+                                "entryPoint": 544,
+                                "id": null,
+                                "parameterSlots": 2,
+                                "returnSlots": 1
+                            },
+                            "abi_decode_t_uint256":
+                            {
+                                "entryPoint": 418,
+                                "id": null,
+                                "parameterSlots": 2,
+                                "returnSlots": 1
+                            },
+                            "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr":
+                            {
+                                "entryPoint": 590,
+                                "id": null,
+                                "parameterSlots": 2,
+                                "returnSlots": 1
+                            },
+                            "abi_encode_t_uint256_to_t_uint256_fromStack":
+                            {
+                                "entryPoint": 663,
+                                "id": null,
+                                "parameterSlots": 2,
+                                "returnSlots": 0
+                            },
+                            "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed":
+                            {
+                                "entryPoint": 678,
+                                "id": null,
+                                "parameterSlots": 2,
+                                "returnSlots": 1
+                            },
+                            "allocate_memory":
+                            {
+                                "entryPoint": 309,
+                                "id": null,
+                                "parameterSlots": 1,
+                                "returnSlots": 1
+                            },
+                            "allocate_unbounded":
+                            {
+                                "entryPoint": 171,
+                                "id": null,
+                                "parameterSlots": 0,
+                                "returnSlots": 1
+                            },
+                            "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr":
+                            {
+                                "entryPoint": 336,
+                                "id": null,
+                                "parameterSlots": 1,
+                                "returnSlots": 1
+                            },
+                            "checked_add_t_uint256":
+                            {
+                                "entryPoint": 799,
+                                "id": null,
+                                "parameterSlots": 2,
+                                "returnSlots": 1
+                            },
+                            "cleanup_t_uint256":
+                            {
+                                "entryPoint": 385,
+                                "id": null,
+                                "parameterSlots": 1,
+                                "returnSlots": 1
+                            },
+                            "finalize_allocation":
+                            {
+                                "entryPoint": 260,
+                                "id": null,
+                                "parameterSlots": 2,
+                                "returnSlots": 0
+                            },
+                            "panic_error_0x11":
+                            {
+                                "entryPoint": 752,
+                                "id": null,
+                                "parameterSlots": 0,
+                                "returnSlots": 0
+                            },
+                            "panic_error_0x32":
+                            {
+                                "entryPoint": 705,
+                                "id": null,
+                                "parameterSlots": 0,
+                                "returnSlots": 0
+                            },
+                            "panic_error_0x41":
+                            {
+                                "entryPoint": 213,
+                                "id": null,
+                                "parameterSlots": 0,
+                                "returnSlots": 0
+                            },
+                            "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d":
+                            {
+                                "entryPoint": 191,
+                                "id": null,
+                                "parameterSlots": 0,
+                                "returnSlots": 0
+                            },
+                            "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef":
+                            {
+                                "entryPoint": 380,
+                                "id": null,
+                                "parameterSlots": 0,
+                                "returnSlots": 0
+                            },
+                            "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db":
+                            {
+                                "entryPoint": 186,
+                                "id": null,
+                                "parameterSlots": 0,
+                                "returnSlots": 0
+                            },
+                            "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
+                            {
+                                "entryPoint": 181,
+                                "id": null,
+                                "parameterSlots": 0,
+                                "returnSlots": 0
+                            },
+                            "round_up_to_mul_of_32":
+                            {
+                                "entryPoint": 196,
+                                "id": null,
+                                "parameterSlots": 1,
+                                "returnSlots": 1
+                            },
+                            "validator_revert_t_uint256":
+                            {
+                                "entryPoint": 395,
+                                "id": null,
+                                "parameterSlots": 1,
+                                "returnSlots": 0
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_generatedSources/output.json b/test/cmdlineTests/standard_generatedSources/output.json
index 05405ceabf..e56ddaa80a 100644
--- a/test/cmdlineTests/standard_generatedSources/output.json
+++ b/test/cmdlineTests/standard_generatedSources/output.json
@@ -1,4 +1,2351 @@
-{"contracts":{"a.sol":{"A":{"evm":{"bytecode":{"generatedSources":[],"object":"<BYTECODE REMOVED>"},"deployedBytecode":{"generatedSources":[{"ast":{"nodeType":"YulBlock","src":"0:3989:1","statements":[{"body":{"nodeType":"YulBlock","src":"47:35:1","statements":[{"nodeType":"YulAssignment","src":"57:19:1","value":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"73:2:1","type":"","value":"64"}],"functionName":{"name":"mload","nodeType":"YulIdentifier","src":"67:5:1"},"nodeType":"YulFunctionCall","src":"67:9:1"},"variableNames":[{"name":"memPtr","nodeType":"YulIdentifier","src":"57:6:1"}]}]},"name":"allocate_unbounded","nodeType":"YulFunctionDefinition","returnVariables":[{"name":"memPtr","nodeType":"YulTypedName","src":"40:6:1","type":""}],"src":"7:75:1"},{"body":{"nodeType":"YulBlock","src":"177:28:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"194:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"197:1:1","type":"","value":"0"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"187:6:1"},"nodeType":"YulFunctionCall","src":"187:12:1"},"nodeType":"YulExpressionStatement","src":"187:12:1"}]},"name":"revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b","nodeType":"YulFunctionDefinition","src":"88:117:1"},{"body":{"nodeType":"YulBlock","src":"300:28:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"317:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"320:1:1","type":"","value":"0"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"310:6:1"},"nodeType":"YulFunctionCall","src":"310:12:1"},"nodeType":"YulExpressionStatement","src":"310:12:1"}]},"name":"revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db","nodeType":"YulFunctionDefinition","src":"211:117:1"},{"body":{"nodeType":"YulBlock","src":"423:28:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"440:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"443:1:1","type":"","value":"0"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"433:6:1"},"nodeType":"YulFunctionCall","src":"433:12:1"},"nodeType":"YulExpressionStatement","src":"433:12:1"}]},"name":"revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d","nodeType":"YulFunctionDefinition","src":"334:117:1"},{"body":{"nodeType":"YulBlock","src":"505:54:1","statements":[{"nodeType":"YulAssignment","src":"515:38:1","value":{"arguments":[{"arguments":[{"name":"value","nodeType":"YulIdentifier","src":"533:5:1"},{"kind":"number","nodeType":"YulLiteral","src":"540:2:1","type":"","value":"31"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"529:3:1"},"nodeType":"YulFunctionCall","src":"529:14:1"},{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"549:2:1","type":"","value":"31"}],"functionName":{"name":"not","nodeType":"YulIdentifier","src":"545:3:1"},"nodeType":"YulFunctionCall","src":"545:7:1"}],"functionName":{"name":"and","nodeType":"YulIdentifier","src":"525:3:1"},"nodeType":"YulFunctionCall","src":"525:28:1"},"variableNames":[{"name":"result","nodeType":"YulIdentifier","src":"515:6:1"}]}]},"name":"round_up_to_mul_of_32","nodeType":"YulFunctionDefinition","parameters":[{"name":"value","nodeType":"YulTypedName","src":"488:5:1","type":""}],"returnVariables":[{"name":"result","nodeType":"YulTypedName","src":"498:6:1","type":""}],"src":"457:102:1"},{"body":{"nodeType":"YulBlock","src":"593:152:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"610:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"613:77:1","type":"","value":"35408467139433450592217433187231851964531694900788300625387963629091585785856"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"603:6:1"},"nodeType":"YulFunctionCall","src":"603:88:1"},"nodeType":"YulExpressionStatement","src":"603:88:1"},{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"707:1:1","type":"","value":"4"},{"kind":"number","nodeType":"YulLiteral","src":"710:4:1","type":"","value":"0x41"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"700:6:1"},"nodeType":"YulFunctionCall","src":"700:15:1"},"nodeType":"YulExpressionStatement","src":"700:15:1"},{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"731:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"734:4:1","type":"","value":"0x24"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"724:6:1"},"nodeType":"YulFunctionCall","src":"724:15:1"},"nodeType":"YulExpressionStatement","src":"724:15:1"}]},"name":"panic_error_0x41","nodeType":"YulFunctionDefinition","src":"565:180:1"},{"body":{"nodeType":"YulBlock","src":"794:238:1","statements":[{"nodeType":"YulVariableDeclaration","src":"804:58:1","value":{"arguments":[{"name":"memPtr","nodeType":"YulIdentifier","src":"826:6:1"},{"arguments":[{"name":"size","nodeType":"YulIdentifier","src":"856:4:1"}],"functionName":{"name":"round_up_to_mul_of_32","nodeType":"YulIdentifier","src":"834:21:1"},"nodeType":"YulFunctionCall","src":"834:27:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"822:3:1"},"nodeType":"YulFunctionCall","src":"822:40:1"},"variables":[{"name":"newFreePtr","nodeType":"YulTypedName","src":"808:10:1","type":""}]},{"body":{"nodeType":"YulBlock","src":"973:22:1","statements":[{"expression":{"arguments":[],"functionName":{"name":"panic_error_0x41","nodeType":"YulIdentifier","src":"975:16:1"},"nodeType":"YulFunctionCall","src":"975:18:1"},"nodeType":"YulExpressionStatement","src":"975:18:1"}]},"condition":{"arguments":[{"arguments":[{"name":"newFreePtr","nodeType":"YulIdentifier","src":"916:10:1"},{"kind":"number","nodeType":"YulLiteral","src":"928:18:1","type":"","value":"0xffffffffffffffff"}],"functionName":{"name":"gt","nodeType":"YulIdentifier","src":"913:2:1"},"nodeType":"YulFunctionCall","src":"913:34:1"},{"arguments":[{"name":"newFreePtr","nodeType":"YulIdentifier","src":"952:10:1"},{"name":"memPtr","nodeType":"YulIdentifier","src":"964:6:1"}],"functionName":{"name":"lt","nodeType":"YulIdentifier","src":"949:2:1"},"nodeType":"YulFunctionCall","src":"949:22:1"}],"functionName":{"name":"or","nodeType":"YulIdentifier","src":"910:2:1"},"nodeType":"YulFunctionCall","src":"910:62:1"},"nodeType":"YulIf","src":"907:88:1"},{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"1011:2:1","type":"","value":"64"},{"name":"newFreePtr","nodeType":"YulIdentifier","src":"1015:10:1"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"1004:6:1"},"nodeType":"YulFunctionCall","src":"1004:22:1"},"nodeType":"YulExpressionStatement","src":"1004:22:1"}]},"name":"finalize_allocation","nodeType":"YulFunctionDefinition","parameters":[{"name":"memPtr","nodeType":"YulTypedName","src":"780:6:1","type":""},{"name":"size","nodeType":"YulTypedName","src":"788:4:1","type":""}],"src":"751:281:1"},{"body":{"nodeType":"YulBlock","src":"1079:88:1","statements":[{"nodeType":"YulAssignment","src":"1089:30:1","value":{"arguments":[],"functionName":{"name":"allocate_unbounded","nodeType":"YulIdentifier","src":"1099:18:1"},"nodeType":"YulFunctionCall","src":"1099:20:1"},"variableNames":[{"name":"memPtr","nodeType":"YulIdentifier","src":"1089:6:1"}]},{"expression":{"arguments":[{"name":"memPtr","nodeType":"YulIdentifier","src":"1148:6:1"},{"name":"size","nodeType":"YulIdentifier","src":"1156:4:1"}],"functionName":{"name":"finalize_allocation","nodeType":"YulIdentifier","src":"1128:19:1"},"nodeType":"YulFunctionCall","src":"1128:33:1"},"nodeType":"YulExpressionStatement","src":"1128:33:1"}]},"name":"allocate_memory","nodeType":"YulFunctionDefinition","parameters":[{"name":"size","nodeType":"YulTypedName","src":"1063:4:1","type":""}],"returnVariables":[{"name":"memPtr","nodeType":"YulTypedName","src":"1072:6:1","type":""}],"src":"1038:129:1"},{"body":{"nodeType":"YulBlock","src":"1255:229:1","statements":[{"body":{"nodeType":"YulBlock","src":"1360:22:1","statements":[{"expression":{"arguments":[],"functionName":{"name":"panic_error_0x41","nodeType":"YulIdentifier","src":"1362:16:1"},"nodeType":"YulFunctionCall","src":"1362:18:1"},"nodeType":"YulExpressionStatement","src":"1362:18:1"}]},"condition":{"arguments":[{"name":"length","nodeType":"YulIdentifier","src":"1332:6:1"},{"kind":"number","nodeType":"YulLiteral","src":"1340:18:1","type":"","value":"0xffffffffffffffff"}],"functionName":{"name":"gt","nodeType":"YulIdentifier","src":"1329:2:1"},"nodeType":"YulFunctionCall","src":"1329:30:1"},"nodeType":"YulIf","src":"1326:56:1"},{"nodeType":"YulAssignment","src":"1392:25:1","value":{"arguments":[{"name":"length","nodeType":"YulIdentifier","src":"1404:6:1"},{"kind":"number","nodeType":"YulLiteral","src":"1412:4:1","type":"","value":"0x20"}],"functionName":{"name":"mul","nodeType":"YulIdentifier","src":"1400:3:1"},"nodeType":"YulFunctionCall","src":"1400:17:1"},"variableNames":[{"name":"size","nodeType":"YulIdentifier","src":"1392:4:1"}]},{"nodeType":"YulAssignment","src":"1454:23:1","value":{"arguments":[{"name":"size","nodeType":"YulIdentifier","src":"1466:4:1"},{"kind":"number","nodeType":"YulLiteral","src":"1472:4:1","type":"","value":"0x20"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1462:3:1"},"nodeType":"YulFunctionCall","src":"1462:15:1"},"variableNames":[{"name":"size","nodeType":"YulIdentifier","src":"1454:4:1"}]}]},"name":"array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr","nodeType":"YulFunctionDefinition","parameters":[{"name":"length","nodeType":"YulTypedName","src":"1239:6:1","type":""}],"returnVariables":[{"name":"size","nodeType":"YulTypedName","src":"1250:4:1","type":""}],"src":"1173:311:1"},{"body":{"nodeType":"YulBlock","src":"1579:28:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"1596:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"1599:1:1","type":"","value":"0"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"1589:6:1"},"nodeType":"YulFunctionCall","src":"1589:12:1"},"nodeType":"YulExpressionStatement","src":"1589:12:1"}]},"name":"revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef","nodeType":"YulFunctionDefinition","src":"1490:117:1"},{"body":{"nodeType":"YulBlock","src":"1658:32:1","statements":[{"nodeType":"YulAssignment","src":"1668:16:1","value":{"name":"value","nodeType":"YulIdentifier","src":"1679:5:1"},"variableNames":[{"name":"cleaned","nodeType":"YulIdentifier","src":"1668:7:1"}]}]},"name":"cleanup_t_uint256","nodeType":"YulFunctionDefinition","parameters":[{"name":"value","nodeType":"YulTypedName","src":"1640:5:1","type":""}],"returnVariables":[{"name":"cleaned","nodeType":"YulTypedName","src":"1650:7:1","type":""}],"src":"1613:77:1"},{"body":{"nodeType":"YulBlock","src":"1739:79:1","statements":[{"body":{"nodeType":"YulBlock","src":"1796:16:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"1805:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"1808:1:1","type":"","value":"0"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"1798:6:1"},"nodeType":"YulFunctionCall","src":"1798:12:1"},"nodeType":"YulExpressionStatement","src":"1798:12:1"}]},"condition":{"arguments":[{"arguments":[{"name":"value","nodeType":"YulIdentifier","src":"1762:5:1"},{"arguments":[{"name":"value","nodeType":"YulIdentifier","src":"1787:5:1"}],"functionName":{"name":"cleanup_t_uint256","nodeType":"YulIdentifier","src":"1769:17:1"},"nodeType":"YulFunctionCall","src":"1769:24:1"}],"functionName":{"name":"eq","nodeType":"YulIdentifier","src":"1759:2:1"},"nodeType":"YulFunctionCall","src":"1759:35:1"}],"functionName":{"name":"iszero","nodeType":"YulIdentifier","src":"1752:6:1"},"nodeType":"YulFunctionCall","src":"1752:43:1"},"nodeType":"YulIf","src":"1749:63:1"}]},"name":"validator_revert_t_uint256","nodeType":"YulFunctionDefinition","parameters":[{"name":"value","nodeType":"YulTypedName","src":"1732:5:1","type":""}],"src":"1696:122:1"},{"body":{"nodeType":"YulBlock","src":"1876:87:1","statements":[{"nodeType":"YulAssignment","src":"1886:29:1","value":{"arguments":[{"name":"offset","nodeType":"YulIdentifier","src":"1908:6:1"}],"functionName":{"name":"calldataload","nodeType":"YulIdentifier","src":"1895:12:1"},"nodeType":"YulFunctionCall","src":"1895:20:1"},"variableNames":[{"name":"value","nodeType":"YulIdentifier","src":"1886:5:1"}]},{"expression":{"arguments":[{"name":"value","nodeType":"YulIdentifier","src":"1951:5:1"}],"functionName":{"name":"validator_revert_t_uint256","nodeType":"YulIdentifier","src":"1924:26:1"},"nodeType":"YulFunctionCall","src":"1924:33:1"},"nodeType":"YulExpressionStatement","src":"1924:33:1"}]},"name":"abi_decode_t_uint256","nodeType":"YulFunctionDefinition","parameters":[{"name":"offset","nodeType":"YulTypedName","src":"1854:6:1","type":""},{"name":"end","nodeType":"YulTypedName","src":"1862:3:1","type":""}],"returnVariables":[{"name":"value","nodeType":"YulTypedName","src":"1870:5:1","type":""}],"src":"1824:139:1"},{"body":{"nodeType":"YulBlock","src":"2088:608:1","statements":[{"nodeType":"YulAssignment","src":"2098:90:1","value":{"arguments":[{"arguments":[{"name":"length","nodeType":"YulIdentifier","src":"2180:6:1"}],"functionName":{"name":"array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr","nodeType":"YulIdentifier","src":"2123:56:1"},"nodeType":"YulFunctionCall","src":"2123:64:1"}],"functionName":{"name":"allocate_memory","nodeType":"YulIdentifier","src":"2107:15:1"},"nodeType":"YulFunctionCall","src":"2107:81:1"},"variableNames":[{"name":"array","nodeType":"YulIdentifier","src":"2098:5:1"}]},{"nodeType":"YulVariableDeclaration","src":"2197:16:1","value":{"name":"array","nodeType":"YulIdentifier","src":"2208:5:1"},"variables":[{"name":"dst","nodeType":"YulTypedName","src":"2201:3:1","type":""}]},{"expression":{"arguments":[{"name":"array","nodeType":"YulIdentifier","src":"2230:5:1"},{"name":"length","nodeType":"YulIdentifier","src":"2237:6:1"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"2223:6:1"},"nodeType":"YulFunctionCall","src":"2223:21:1"},"nodeType":"YulExpressionStatement","src":"2223:21:1"},{"nodeType":"YulAssignment","src":"2253:23:1","value":{"arguments":[{"name":"array","nodeType":"YulIdentifier","src":"2264:5:1"},{"kind":"number","nodeType":"YulLiteral","src":"2271:4:1","type":"","value":"0x20"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"2260:3:1"},"nodeType":"YulFunctionCall","src":"2260:16:1"},"variableNames":[{"name":"dst","nodeType":"YulIdentifier","src":"2253:3:1"}]},{"nodeType":"YulVariableDeclaration","src":"2286:44:1","value":{"arguments":[{"name":"offset","nodeType":"YulIdentifier","src":"2304:6:1"},{"arguments":[{"name":"length","nodeType":"YulIdentifier","src":"2316:6:1"},{"kind":"number","nodeType":"YulLiteral","src":"2324:4:1","type":"","value":"0x20"}],"functionName":{"name":"mul","nodeType":"YulIdentifier","src":"2312:3:1"},"nodeType":"YulFunctionCall","src":"2312:17:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"2300:3:1"},"nodeType":"YulFunctionCall","src":"2300:30:1"},"variables":[{"name":"srcEnd","nodeType":"YulTypedName","src":"2290:6:1","type":""}]},{"body":{"nodeType":"YulBlock","src":"2358:103:1","statements":[{"expression":{"arguments":[],"functionName":{"name":"revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef","nodeType":"YulIdentifier","src":"2372:77:1"},"nodeType":"YulFunctionCall","src":"2372:79:1"},"nodeType":"YulExpressionStatement","src":"2372:79:1"}]},"condition":{"arguments":[{"name":"srcEnd","nodeType":"YulIdentifier","src":"2345:6:1"},{"name":"end","nodeType":"YulIdentifier","src":"2353:3:1"}],"functionName":{"name":"gt","nodeType":"YulIdentifier","src":"2342:2:1"},"nodeType":"YulFunctionCall","src":"2342:15:1"},"nodeType":"YulIf","src":"2339:122:1"},{"body":{"nodeType":"YulBlock","src":"2546:144:1","statements":[{"nodeType":"YulVariableDeclaration","src":"2561:21:1","value":{"name":"src","nodeType":"YulIdentifier","src":"2579:3:1"},"variables":[{"name":"elementPos","nodeType":"YulTypedName","src":"2565:10:1","type":""}]},{"expression":{"arguments":[{"name":"dst","nodeType":"YulIdentifier","src":"2603:3:1"},{"arguments":[{"name":"elementPos","nodeType":"YulIdentifier","src":"2629:10:1"},{"name":"end","nodeType":"YulIdentifier","src":"2641:3:1"}],"functionName":{"name":"abi_decode_t_uint256","nodeType":"YulIdentifier","src":"2608:20:1"},"nodeType":"YulFunctionCall","src":"2608:37:1"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"2596:6:1"},"nodeType":"YulFunctionCall","src":"2596:50:1"},"nodeType":"YulExpressionStatement","src":"2596:50:1"},{"nodeType":"YulAssignment","src":"2659:21:1","value":{"arguments":[{"name":"dst","nodeType":"YulIdentifier","src":"2670:3:1"},{"kind":"number","nodeType":"YulLiteral","src":"2675:4:1","type":"","value":"0x20"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"2666:3:1"},"nodeType":"YulFunctionCall","src":"2666:14:1"},"variableNames":[{"name":"dst","nodeType":"YulIdentifier","src":"2659:3:1"}]}]},"condition":{"arguments":[{"name":"src","nodeType":"YulIdentifier","src":"2499:3:1"},{"name":"srcEnd","nodeType":"YulIdentifier","src":"2504:6:1"}],"functionName":{"name":"lt","nodeType":"YulIdentifier","src":"2496:2:1"},"nodeType":"YulFunctionCall","src":"2496:15:1"},"nodeType":"YulForLoop","post":{"nodeType":"YulBlock","src":"2512:25:1","statements":[{"nodeType":"YulAssignment","src":"2514:21:1","value":{"arguments":[{"name":"src","nodeType":"YulIdentifier","src":"2525:3:1"},{"kind":"number","nodeType":"YulLiteral","src":"2530:4:1","type":"","value":"0x20"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"2521:3:1"},"nodeType":"YulFunctionCall","src":"2521:14:1"},"variableNames":[{"name":"src","nodeType":"YulIdentifier","src":"2514:3:1"}]}]},"pre":{"nodeType":"YulBlock","src":"2474:21:1","statements":[{"nodeType":"YulVariableDeclaration","src":"2476:17:1","value":{"name":"offset","nodeType":"YulIdentifier","src":"2487:6:1"},"variables":[{"name":"src","nodeType":"YulTypedName","src":"2480:3:1","type":""}]}]},"src":"2470:220:1"}]},"name":"abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr","nodeType":"YulFunctionDefinition","parameters":[{"name":"offset","nodeType":"YulTypedName","src":"2058:6:1","type":""},{"name":"length","nodeType":"YulTypedName","src":"2066:6:1","type":""},{"name":"end","nodeType":"YulTypedName","src":"2074:3:1","type":""}],"returnVariables":[{"name":"array","nodeType":"YulTypedName","src":"2082:5:1","type":""}],"src":"1986:710:1"},{"body":{"nodeType":"YulBlock","src":"2796:293:1","statements":[{"body":{"nodeType":"YulBlock","src":"2845:83:1","statements":[{"expression":{"arguments":[],"functionName":{"name":"revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d","nodeType":"YulIdentifier","src":"2847:77:1"},"nodeType":"YulFunctionCall","src":"2847:79:1"},"nodeType":"YulExpressionStatement","src":"2847:79:1"}]},"condition":{"arguments":[{"arguments":[{"arguments":[{"name":"offset","nodeType":"YulIdentifier","src":"2824:6:1"},{"kind":"number","nodeType":"YulLiteral","src":"2832:4:1","type":"","value":"0x1f"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"2820:3:1"},"nodeType":"YulFunctionCall","src":"2820:17:1"},{"name":"end","nodeType":"YulIdentifier","src":"2839:3:1"}],"functionName":{"name":"slt","nodeType":"YulIdentifier","src":"2816:3:1"},"nodeType":"YulFunctionCall","src":"2816:27:1"}],"functionName":{"name":"iszero","nodeType":"YulIdentifier","src":"2809:6:1"},"nodeType":"YulFunctionCall","src":"2809:35:1"},"nodeType":"YulIf","src":"2806:122:1"},{"nodeType":"YulVariableDeclaration","src":"2937:34:1","value":{"arguments":[{"name":"offset","nodeType":"YulIdentifier","src":"2964:6:1"}],"functionName":{"name":"calldataload","nodeType":"YulIdentifier","src":"2951:12:1"},"nodeType":"YulFunctionCall","src":"2951:20:1"},"variables":[{"name":"length","nodeType":"YulTypedName","src":"2941:6:1","type":""}]},{"nodeType":"YulAssignment","src":"2980:103:1","value":{"arguments":[{"arguments":[{"name":"offset","nodeType":"YulIdentifier","src":"3056:6:1"},{"kind":"number","nodeType":"YulLiteral","src":"3064:4:1","type":"","value":"0x20"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"3052:3:1"},"nodeType":"YulFunctionCall","src":"3052:17:1"},{"name":"length","nodeType":"YulIdentifier","src":"3071:6:1"},{"name":"end","nodeType":"YulIdentifier","src":"3079:3:1"}],"functionName":{"name":"abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr","nodeType":"YulIdentifier","src":"2989:62:1"},"nodeType":"YulFunctionCall","src":"2989:94:1"},"variableNames":[{"name":"array","nodeType":"YulIdentifier","src":"2980:5:1"}]}]},"name":"abi_decode_t_array$_t_uint256_$dyn_memory_ptr","nodeType":"YulFunctionDefinition","parameters":[{"name":"offset","nodeType":"YulTypedName","src":"2774:6:1","type":""},{"name":"end","nodeType":"YulTypedName","src":"2782:3:1","type":""}],"returnVariables":[{"name":"array","nodeType":"YulTypedName","src":"2790:5:1","type":""}],"src":"2719:370:1"},{"body":{"nodeType":"YulBlock","src":"3186:448:1","statements":[{"body":{"nodeType":"YulBlock","src":"3232:83:1","statements":[{"expression":{"arguments":[],"functionName":{"name":"revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b","nodeType":"YulIdentifier","src":"3234:77:1"},"nodeType":"YulFunctionCall","src":"3234:79:1"},"nodeType":"YulExpressionStatement","src":"3234:79:1"}]},"condition":{"arguments":[{"arguments":[{"name":"dataEnd","nodeType":"YulIdentifier","src":"3207:7:1"},{"name":"headStart","nodeType":"YulIdentifier","src":"3216:9:1"}],"functionName":{"name":"sub","nodeType":"YulIdentifier","src":"3203:3:1"},"nodeType":"YulFunctionCall","src":"3203:23:1"},{"kind":"number","nodeType":"YulLiteral","src":"3228:2:1","type":"","value":"32"}],"functionName":{"name":"slt","nodeType":"YulIdentifier","src":"3199:3:1"},"nodeType":"YulFunctionCall","src":"3199:32:1"},"nodeType":"YulIf","src":"3196:119:1"},{"nodeType":"YulBlock","src":"3325:302:1","statements":[{"nodeType":"YulVariableDeclaration","src":"3340:45:1","value":{"arguments":[{"arguments":[{"name":"headStart","nodeType":"YulIdentifier","src":"3371:9:1"},{"kind":"number","nodeType":"YulLiteral","src":"3382:1:1","type":"","value":"0"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"3367:3:1"},"nodeType":"YulFunctionCall","src":"3367:17:1"}],"functionName":{"name":"calldataload","nodeType":"YulIdentifier","src":"3354:12:1"},"nodeType":"YulFunctionCall","src":"3354:31:1"},"variables":[{"name":"offset","nodeType":"YulTypedName","src":"3344:6:1","type":""}]},{"body":{"nodeType":"YulBlock","src":"3432:83:1","statements":[{"expression":{"arguments":[],"functionName":{"name":"revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db","nodeType":"YulIdentifier","src":"3434:77:1"},"nodeType":"YulFunctionCall","src":"3434:79:1"},"nodeType":"YulExpressionStatement","src":"3434:79:1"}]},"condition":{"arguments":[{"name":"offset","nodeType":"YulIdentifier","src":"3404:6:1"},{"kind":"number","nodeType":"YulLiteral","src":"3412:18:1","type":"","value":"0xffffffffffffffff"}],"functionName":{"name":"gt","nodeType":"YulIdentifier","src":"3401:2:1"},"nodeType":"YulFunctionCall","src":"3401:30:1"},"nodeType":"YulIf","src":"3398:117:1"},{"nodeType":"YulAssignment","src":"3529:88:1","value":{"arguments":[{"arguments":[{"name":"headStart","nodeType":"YulIdentifier","src":"3589:9:1"},{"name":"offset","nodeType":"YulIdentifier","src":"3600:6:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"3585:3:1"},"nodeType":"YulFunctionCall","src":"3585:22:1"},{"name":"dataEnd","nodeType":"YulIdentifier","src":"3609:7:1"}],"functionName":{"name":"abi_decode_t_array$_t_uint256_$dyn_memory_ptr","nodeType":"YulIdentifier","src":"3539:45:1"},"nodeType":"YulFunctionCall","src":"3539:78:1"},"variableNames":[{"name":"value0","nodeType":"YulIdentifier","src":"3529:6:1"}]}]}]},"name":"abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr","nodeType":"YulFunctionDefinition","parameters":[{"name":"headStart","nodeType":"YulTypedName","src":"3156:9:1","type":""},{"name":"dataEnd","nodeType":"YulTypedName","src":"3167:7:1","type":""}],"returnVariables":[{"name":"value0","nodeType":"YulTypedName","src":"3179:6:1","type":""}],"src":"3095:539:1"},{"body":{"nodeType":"YulBlock","src":"3705:53:1","statements":[{"expression":{"arguments":[{"name":"pos","nodeType":"YulIdentifier","src":"3722:3:1"},{"arguments":[{"name":"value","nodeType":"YulIdentifier","src":"3745:5:1"}],"functionName":{"name":"cleanup_t_uint256","nodeType":"YulIdentifier","src":"3727:17:1"},"nodeType":"YulFunctionCall","src":"3727:24:1"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"3715:6:1"},"nodeType":"YulFunctionCall","src":"3715:37:1"},"nodeType":"YulExpressionStatement","src":"3715:37:1"}]},"name":"abi_encode_t_uint256_to_t_uint256_fromStack","nodeType":"YulFunctionDefinition","parameters":[{"name":"value","nodeType":"YulTypedName","src":"3693:5:1","type":""},{"name":"pos","nodeType":"YulTypedName","src":"3700:3:1","type":""}],"src":"3640:118:1"},{"body":{"nodeType":"YulBlock","src":"3862:124:1","statements":[{"nodeType":"YulAssignment","src":"3872:26:1","value":{"arguments":[{"name":"headStart","nodeType":"YulIdentifier","src":"3884:9:1"},{"kind":"number","nodeType":"YulLiteral","src":"3895:2:1","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"3880:3:1"},"nodeType":"YulFunctionCall","src":"3880:18:1"},"variableNames":[{"name":"tail","nodeType":"YulIdentifier","src":"3872:4:1"}]},{"expression":{"arguments":[{"name":"value0","nodeType":"YulIdentifier","src":"3952:6:1"},{"arguments":[{"name":"headStart","nodeType":"YulIdentifier","src":"3965:9:1"},{"kind":"number","nodeType":"YulLiteral","src":"3976:1:1","type":"","value":"0"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"3961:3:1"},"nodeType":"YulFunctionCall","src":"3961:17:1"}],"functionName":{"name":"abi_encode_t_uint256_to_t_uint256_fromStack","nodeType":"YulIdentifier","src":"3908:43:1"},"nodeType":"YulFunctionCall","src":"3908:71:1"},"nodeType":"YulExpressionStatement","src":"3908:71:1"}]},"name":"abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed","nodeType":"YulFunctionDefinition","parameters":[{"name":"headStart","nodeType":"YulTypedName","src":"3834:9:1","type":""},{"name":"value0","nodeType":"YulTypedName","src":"3846:6:1","type":""}],"returnVariables":[{"name":"tail","nodeType":"YulTypedName","src":"3857:4:1","type":""}],"src":"3764:222:1"}]},"contents":"{
+{
+    "contracts":
+    {
+        "a.sol":
+        {
+            "A":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "generatedSources": [],
+                        "object": "<BYTECODE REMOVED>"
+                    },
+                    "deployedBytecode":
+                    {
+                        "generatedSources":
+                        [
+                            {
+                                "ast":
+                                {
+                                    "nodeType": "YulBlock",
+                                    "src": "0:3989:1",
+                                    "statements":
+                                    [
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "47:35:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "57:19:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "73:2:1",
+                                                                    "type": "",
+                                                                    "value": "64"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mload",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "67:5:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "67:9:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "memPtr",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "57:6:1"
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "allocate_unbounded",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "memPtr",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "40:6:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "7:75:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "177:28:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "194:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "197:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "revert",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "187:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "187:12:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "187:12:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "src": "88:117:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "300:28:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "317:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "320:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "revert",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "310:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "310:12:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "310:12:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "src": "211:117:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "423:28:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "440:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "443:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "revert",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "433:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "433:12:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "433:12:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "src": "334:117:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "505:54:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "515:38:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "value",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "533:5:1"
+                                                                        },
+                                                                        {
+                                                                            "kind": "number",
+                                                                            "nodeType": "YulLiteral",
+                                                                            "src": "540:2:1",
+                                                                            "type": "",
+                                                                            "value": "31"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "add",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "529:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "529:14:1"
+                                                                },
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "kind": "number",
+                                                                            "nodeType": "YulLiteral",
+                                                                            "src": "549:2:1",
+                                                                            "type": "",
+                                                                            "value": "31"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "not",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "545:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "545:7:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "and",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "525:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "525:28:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "result",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "515:6:1"
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "round_up_to_mul_of_32",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "value",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "488:5:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "result",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "498:6:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "457:102:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "593:152:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "610:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "613:77:1",
+                                                                    "type": "",
+                                                                    "value": "35408467139433450592217433187231851964531694900788300625387963629091585785856"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mstore",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "603:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "603:88:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "603:88:1"
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "707:1:1",
+                                                                    "type": "",
+                                                                    "value": "4"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "710:4:1",
+                                                                    "type": "",
+                                                                    "value": "0x41"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mstore",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "700:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "700:15:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "700:15:1"
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "731:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "734:4:1",
+                                                                    "type": "",
+                                                                    "value": "0x24"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "revert",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "724:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "724:15:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "724:15:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "panic_error_0x41",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "src": "565:180:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "794:238:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "804:58:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "memPtr",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "826:6:1"
+                                                                },
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "size",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "856:4:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "round_up_to_mul_of_32",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "834:21:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "834:27:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "822:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "822:40:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "newFreePtr",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "808:10:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "973:22:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments": [],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "panic_error_0x41",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "975:16:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "975:18:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "975:18:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "newFreePtr",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "916:10:1"
+                                                                        },
+                                                                        {
+                                                                            "kind": "number",
+                                                                            "nodeType": "YulLiteral",
+                                                                            "src": "928:18:1",
+                                                                            "type": "",
+                                                                            "value": "0xffffffffffffffff"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "gt",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "913:2:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "913:34:1"
+                                                                },
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "newFreePtr",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "952:10:1"
+                                                                        },
+                                                                        {
+                                                                            "name": "memPtr",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "964:6:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "lt",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "949:2:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "949:22:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "or",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "910:2:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "910:62:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "907:88:1"
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "1011:2:1",
+                                                                    "type": "",
+                                                                    "value": "64"
+                                                                },
+                                                                {
+                                                                    "name": "newFreePtr",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1015:10:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mstore",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1004:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1004:22:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "1004:22:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "finalize_allocation",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "memPtr",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "780:6:1",
+                                                    "type": ""
+                                                },
+                                                {
+                                                    "name": "size",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "788:4:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "751:281:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "1079:88:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "1089:30:1",
+                                                        "value":
+                                                        {
+                                                            "arguments": [],
+                                                            "functionName":
+                                                            {
+                                                                "name": "allocate_unbounded",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1099:18:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1099:20:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "memPtr",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1089:6:1"
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "memPtr",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1148:6:1"
+                                                                },
+                                                                {
+                                                                    "name": "size",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1156:4:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "finalize_allocation",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1128:19:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1128:33:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "1128:33:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "allocate_memory",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "size",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1063:4:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "memPtr",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1072:6:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "1038:129:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "1255:229:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "1360:22:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments": [],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "panic_error_0x41",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1362:16:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "1362:18:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "1362:18:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "length",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1332:6:1"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "1340:18:1",
+                                                                    "type": "",
+                                                                    "value": "0xffffffffffffffff"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "gt",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1329:2:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1329:30:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "1326:56:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "1392:25:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "length",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1404:6:1"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "1412:4:1",
+                                                                    "type": "",
+                                                                    "value": "0x20"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mul",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1400:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1400:17:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "size",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1392:4:1"
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "1454:23:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "size",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1466:4:1"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "1472:4:1",
+                                                                    "type": "",
+                                                                    "value": "0x20"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1462:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1462:15:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "size",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1454:4:1"
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "length",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1239:6:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "size",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1250:4:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "1173:311:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "1579:28:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "1596:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "1599:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "revert",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1589:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1589:12:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "1589:12:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "src": "1490:117:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "1658:32:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "1668:16:1",
+                                                        "value":
+                                                        {
+                                                            "name": "value",
+                                                            "nodeType": "YulIdentifier",
+                                                            "src": "1679:5:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "cleaned",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1668:7:1"
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "cleanup_t_uint256",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "value",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1640:5:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "cleaned",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1650:7:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "1613:77:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "1739:79:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "1796:16:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "1805:1:1",
+                                                                                "type": "",
+                                                                                "value": "0"
+                                                                            },
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "1808:1:1",
+                                                                                "type": "",
+                                                                                "value": "0"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "revert",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1798:6:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "1798:12:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "1798:12:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "value",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1762:5:1"
+                                                                        },
+                                                                        {
+                                                                            "arguments":
+                                                                            [
+                                                                                {
+                                                                                    "name": "value",
+                                                                                    "nodeType": "YulIdentifier",
+                                                                                    "src": "1787:5:1"
+                                                                                }
+                                                                            ],
+                                                                            "functionName":
+                                                                            {
+                                                                                "name": "cleanup_t_uint256",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "1769:17:1"
+                                                                            },
+                                                                            "nodeType": "YulFunctionCall",
+                                                                            "src": "1769:24:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "eq",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "1759:2:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "1759:35:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "iszero",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1752:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1752:43:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "1749:63:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "validator_revert_t_uint256",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "value",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1732:5:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "1696:122:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "1876:87:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "1886:29:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "offset",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1908:6:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "calldataload",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1895:12:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1895:20:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "value",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1886:5:1"
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "value",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1951:5:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "validator_revert_t_uint256",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1924:26:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1924:33:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "1924:33:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "abi_decode_t_uint256",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "offset",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1854:6:1",
+                                                    "type": ""
+                                                },
+                                                {
+                                                    "name": "end",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1862:3:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "value",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1870:5:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "1824:139:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "2088:608:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "2098:90:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "length",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "2180:6:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "2123:56:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "2123:64:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "allocate_memory",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2107:15:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "2107:81:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "array",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2098:5:1"
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "2197:16:1",
+                                                        "value":
+                                                        {
+                                                            "name": "array",
+                                                            "nodeType": "YulIdentifier",
+                                                            "src": "2208:5:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "dst",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "2201:3:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "array",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "2230:5:1"
+                                                                },
+                                                                {
+                                                                    "name": "length",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "2237:6:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mstore",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2223:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "2223:21:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "2223:21:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "2253:23:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "array",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "2264:5:1"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "2271:4:1",
+                                                                    "type": "",
+                                                                    "value": "0x20"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2260:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "2260:16:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "dst",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2253:3:1"
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "2286:44:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "offset",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "2304:6:1"
+                                                                },
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "length",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "2316:6:1"
+                                                                        },
+                                                                        {
+                                                                            "kind": "number",
+                                                                            "nodeType": "YulLiteral",
+                                                                            "src": "2324:4:1",
+                                                                            "type": "",
+                                                                            "value": "0x20"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "mul",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "2312:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "2312:17:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2300:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "2300:30:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "srcEnd",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "2290:6:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "2358:103:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments": [],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "2372:77:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "2372:79:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "2372:79:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "srcEnd",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "2345:6:1"
+                                                                },
+                                                                {
+                                                                    "name": "end",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "2353:3:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "gt",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2342:2:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "2342:15:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "2339:122:1"
+                                                    },
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "2546:144:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "nodeType": "YulVariableDeclaration",
+                                                                    "src": "2561:21:1",
+                                                                    "value":
+                                                                    {
+                                                                        "name": "src",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "2579:3:1"
+                                                                    },
+                                                                    "variables":
+                                                                    [
+                                                                        {
+                                                                            "name": "elementPos",
+                                                                            "nodeType": "YulTypedName",
+                                                                            "src": "2565:10:1",
+                                                                            "type": ""
+                                                                        }
+                                                                    ]
+                                                                },
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "name": "dst",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "2603:3:1"
+                                                                            },
+                                                                            {
+                                                                                "arguments":
+                                                                                [
+                                                                                    {
+                                                                                        "name": "elementPos",
+                                                                                        "nodeType": "YulIdentifier",
+                                                                                        "src": "2629:10:1"
+                                                                                    },
+                                                                                    {
+                                                                                        "name": "end",
+                                                                                        "nodeType": "YulIdentifier",
+                                                                                        "src": "2641:3:1"
+                                                                                    }
+                                                                                ],
+                                                                                "functionName":
+                                                                                {
+                                                                                    "name": "abi_decode_t_uint256",
+                                                                                    "nodeType": "YulIdentifier",
+                                                                                    "src": "2608:20:1"
+                                                                                },
+                                                                                "nodeType": "YulFunctionCall",
+                                                                                "src": "2608:37:1"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "mstore",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "2596:6:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "2596:50:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "2596:50:1"
+                                                                },
+                                                                {
+                                                                    "nodeType": "YulAssignment",
+                                                                    "src": "2659:21:1",
+                                                                    "value":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "name": "dst",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "2670:3:1"
+                                                                            },
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "2675:4:1",
+                                                                                "type": "",
+                                                                                "value": "0x20"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "add",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "2666:3:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "2666:14:1"
+                                                                    },
+                                                                    "variableNames":
+                                                                    [
+                                                                        {
+                                                                            "name": "dst",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "2659:3:1"
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "src",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "2499:3:1"
+                                                                },
+                                                                {
+                                                                    "name": "srcEnd",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "2504:6:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "lt",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2496:2:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "2496:15:1"
+                                                        },
+                                                        "nodeType": "YulForLoop",
+                                                        "post":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "2512:25:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "nodeType": "YulAssignment",
+                                                                    "src": "2514:21:1",
+                                                                    "value":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "name": "src",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "2525:3:1"
+                                                                            },
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "2530:4:1",
+                                                                                "type": "",
+                                                                                "value": "0x20"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "add",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "2521:3:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "2521:14:1"
+                                                                    },
+                                                                    "variableNames":
+                                                                    [
+                                                                        {
+                                                                            "name": "src",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "2514:3:1"
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ]
+                                                        },
+                                                        "pre":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "2474:21:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "nodeType": "YulVariableDeclaration",
+                                                                    "src": "2476:17:1",
+                                                                    "value":
+                                                                    {
+                                                                        "name": "offset",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "2487:6:1"
+                                                                    },
+                                                                    "variables":
+                                                                    [
+                                                                        {
+                                                                            "name": "src",
+                                                                            "nodeType": "YulTypedName",
+                                                                            "src": "2480:3:1",
+                                                                            "type": ""
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ]
+                                                        },
+                                                        "src": "2470:220:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "offset",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "2058:6:1",
+                                                    "type": ""
+                                                },
+                                                {
+                                                    "name": "length",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "2066:6:1",
+                                                    "type": ""
+                                                },
+                                                {
+                                                    "name": "end",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "2074:3:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "array",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "2082:5:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "1986:710:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "2796:293:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "2845:83:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments": [],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "2847:77:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "2847:79:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "2847:79:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "arguments":
+                                                                            [
+                                                                                {
+                                                                                    "name": "offset",
+                                                                                    "nodeType": "YulIdentifier",
+                                                                                    "src": "2824:6:1"
+                                                                                },
+                                                                                {
+                                                                                    "kind": "number",
+                                                                                    "nodeType": "YulLiteral",
+                                                                                    "src": "2832:4:1",
+                                                                                    "type": "",
+                                                                                    "value": "0x1f"
+                                                                                }
+                                                                            ],
+                                                                            "functionName":
+                                                                            {
+                                                                                "name": "add",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "2820:3:1"
+                                                                            },
+                                                                            "nodeType": "YulFunctionCall",
+                                                                            "src": "2820:17:1"
+                                                                        },
+                                                                        {
+                                                                            "name": "end",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "2839:3:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "slt",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "2816:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "2816:27:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "iszero",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2809:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "2809:35:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "2806:122:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "2937:34:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "offset",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "2964:6:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "calldataload",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2951:12:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "2951:20:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "length",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "2941:6:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "2980:103:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "offset",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "3056:6:1"
+                                                                        },
+                                                                        {
+                                                                            "kind": "number",
+                                                                            "nodeType": "YulLiteral",
+                                                                            "src": "3064:4:1",
+                                                                            "type": "",
+                                                                            "value": "0x20"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "add",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "3052:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "3052:17:1"
+                                                                },
+                                                                {
+                                                                    "name": "length",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "3071:6:1"
+                                                                },
+                                                                {
+                                                                    "name": "end",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "3079:3:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2989:62:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "2989:94:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "array",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "2980:5:1"
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "abi_decode_t_array$_t_uint256_$dyn_memory_ptr",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "offset",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "2774:6:1",
+                                                    "type": ""
+                                                },
+                                                {
+                                                    "name": "end",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "2782:3:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "array",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "2790:5:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "2719:370:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "3186:448:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "3232:83:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments": [],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "3234:77:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "3234:79:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "3234:79:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "dataEnd",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "3207:7:1"
+                                                                        },
+                                                                        {
+                                                                            "name": "headStart",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "3216:9:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "sub",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "3203:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "3203:23:1"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "3228:2:1",
+                                                                    "type": "",
+                                                                    "value": "32"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "slt",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "3199:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "3199:32:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "3196:119:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulBlock",
+                                                        "src": "3325:302:1",
+                                                        "statements":
+                                                        [
+                                                            {
+                                                                "nodeType": "YulVariableDeclaration",
+                                                                "src": "3340:45:1",
+                                                                "value":
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "arguments":
+                                                                            [
+                                                                                {
+                                                                                    "name": "headStart",
+                                                                                    "nodeType": "YulIdentifier",
+                                                                                    "src": "3371:9:1"
+                                                                                },
+                                                                                {
+                                                                                    "kind": "number",
+                                                                                    "nodeType": "YulLiteral",
+                                                                                    "src": "3382:1:1",
+                                                                                    "type": "",
+                                                                                    "value": "0"
+                                                                                }
+                                                                            ],
+                                                                            "functionName":
+                                                                            {
+                                                                                "name": "add",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "3367:3:1"
+                                                                            },
+                                                                            "nodeType": "YulFunctionCall",
+                                                                            "src": "3367:17:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "calldataload",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "3354:12:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "3354:31:1"
+                                                                },
+                                                                "variables":
+                                                                [
+                                                                    {
+                                                                        "name": "offset",
+                                                                        "nodeType": "YulTypedName",
+                                                                        "src": "3344:6:1",
+                                                                        "type": ""
+                                                                    }
+                                                                ]
+                                                            },
+                                                            {
+                                                                "body":
+                                                                {
+                                                                    "nodeType": "YulBlock",
+                                                                    "src": "3432:83:1",
+                                                                    "statements":
+                                                                    [
+                                                                        {
+                                                                            "expression":
+                                                                            {
+                                                                                "arguments": [],
+                                                                                "functionName":
+                                                                                {
+                                                                                    "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
+                                                                                    "nodeType": "YulIdentifier",
+                                                                                    "src": "3434:77:1"
+                                                                                },
+                                                                                "nodeType": "YulFunctionCall",
+                                                                                "src": "3434:79:1"
+                                                                            },
+                                                                            "nodeType": "YulExpressionStatement",
+                                                                            "src": "3434:79:1"
+                                                                        }
+                                                                    ]
+                                                                },
+                                                                "condition":
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "offset",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "3404:6:1"
+                                                                        },
+                                                                        {
+                                                                            "kind": "number",
+                                                                            "nodeType": "YulLiteral",
+                                                                            "src": "3412:18:1",
+                                                                            "type": "",
+                                                                            "value": "0xffffffffffffffff"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "gt",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "3401:2:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "3401:30:1"
+                                                                },
+                                                                "nodeType": "YulIf",
+                                                                "src": "3398:117:1"
+                                                            },
+                                                            {
+                                                                "nodeType": "YulAssignment",
+                                                                "src": "3529:88:1",
+                                                                "value":
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "arguments":
+                                                                            [
+                                                                                {
+                                                                                    "name": "headStart",
+                                                                                    "nodeType": "YulIdentifier",
+                                                                                    "src": "3589:9:1"
+                                                                                },
+                                                                                {
+                                                                                    "name": "offset",
+                                                                                    "nodeType": "YulIdentifier",
+                                                                                    "src": "3600:6:1"
+                                                                                }
+                                                                            ],
+                                                                            "functionName":
+                                                                            {
+                                                                                "name": "add",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "3585:3:1"
+                                                                            },
+                                                                            "nodeType": "YulFunctionCall",
+                                                                            "src": "3585:22:1"
+                                                                        },
+                                                                        {
+                                                                            "name": "dataEnd",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "3609:7:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "abi_decode_t_array$_t_uint256_$dyn_memory_ptr",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "3539:45:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "3539:78:1"
+                                                                },
+                                                                "variableNames":
+                                                                [
+                                                                    {
+                                                                        "name": "value0",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "3529:6:1"
+                                                                    }
+                                                                ]
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "headStart",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "3156:9:1",
+                                                    "type": ""
+                                                },
+                                                {
+                                                    "name": "dataEnd",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "3167:7:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "value0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "3179:6:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "3095:539:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "3705:53:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "pos",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "3722:3:1"
+                                                                },
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "value",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "3745:5:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "cleanup_t_uint256",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "3727:17:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "3727:24:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mstore",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "3715:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "3715:37:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "3715:37:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "abi_encode_t_uint256_to_t_uint256_fromStack",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "value",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "3693:5:1",
+                                                    "type": ""
+                                                },
+                                                {
+                                                    "name": "pos",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "3700:3:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "3640:118:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "3862:124:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "3872:26:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "headStart",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "3884:9:1"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "3895:2:1",
+                                                                    "type": "",
+                                                                    "value": "32"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "3880:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "3880:18:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "tail",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "3872:4:1"
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "value0",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "3952:6:1"
+                                                                },
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "headStart",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "3965:9:1"
+                                                                        },
+                                                                        {
+                                                                            "kind": "number",
+                                                                            "nodeType": "YulLiteral",
+                                                                            "src": "3976:1:1",
+                                                                            "type": "",
+                                                                            "value": "0"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "add",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "3961:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "3961:17:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "abi_encode_t_uint256_to_t_uint256_fromStack",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "3908:43:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "3908:71:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "3908:71:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "headStart",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "3834:9:1",
+                                                    "type": ""
+                                                },
+                                                {
+                                                    "name": "value0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "3846:6:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "tail",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "3857:4:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "3764:222:1"
+                                        }
+                                    ]
+                                },
+                                "contents": "{
 
     function allocate_unbounded() -> memPtr {
         memPtr := mload(64)
@@ -120,7 +2467,42 @@
     }
 
 }
-","id":1,"language":"Yul","name":"#utility.yul"}]}}}}},"errors":[{"component":"general","errorCode":"3420","formattedMessage":"Warning: Source file does not specify required compiler version!
+",
+                                "id": 1,
+                                "language": "Yul",
+                                "name": "#utility.yul"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "3420",
+            "formattedMessage": "Warning: Source file does not specify required compiler version!
 --> a.sol
 
-","message":"Source file does not specify required compiler version!","severity":"warning","sourceLocation":{"end":-1,"file":"a.sol","start":-1},"type":"Warning"}],"sources":{"a.sol":{"id":0}}}
+",
+            "message": "Source file does not specify required compiler version!",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": -1,
+                "file": "a.sol",
+                "start": -1
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_immutable_references/output.json b/test/cmdlineTests/standard_immutable_references/output.json
index 9742233e6b..e25a911fff 100644
--- a/test/cmdlineTests/standard_immutable_references/output.json
+++ b/test/cmdlineTests/standard_immutable_references/output.json
@@ -1 +1,34 @@
-{"contracts":{"a.sol":{"A":{"evm":{"deployedBytecode":{"immutableReferences":{"6":[{"length":32,"start":75}]}}}}}},"sources":{"a.sol":{"id":0}}}
+{
+    "contracts":
+    {
+        "a.sol":
+        {
+            "A":
+            {
+                "evm":
+                {
+                    "deployedBytecode":
+                    {
+                        "immutableReferences":
+                        {
+                            "6":
+                            [
+                                {
+                                    "length": 32,
+                                    "start": 75
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_irOptimized_requested/output.json b/test/cmdlineTests/standard_irOptimized_requested/output.json
index f919764114..b3a27c5ca5 100644
--- a/test/cmdlineTests/standard_irOptimized_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_requested/output.json
@@ -1,4 +1,11 @@
-{"contracts":{"A":{"C":{"irOptimized":"/// @use-src 0:\"A\"
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "irOptimized": "/// @use-src 0:\"A\"
 object \"C_7\" {
     code {
         /// @src 0:79:121  \"contract C { function f() public pure {} }\"
@@ -69,4 +76,15 @@ object \"C_7\" {
         data \".metadata\" hex\"<BYTECODE REMOVED>\"
     }
 }
-"}}},"sources":{"A":{"id":0}}}
+"
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_ir_requested/output.json b/test/cmdlineTests/standard_ir_requested/output.json
index 78e2aebce6..ab38f0a589 100644
--- a/test/cmdlineTests/standard_ir_requested/output.json
+++ b/test/cmdlineTests/standard_ir_requested/output.json
@@ -1,4 +1,11 @@
-{"contracts":{"A":{"C":{"ir":"
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "ir": "
 /// @use-src 0:\"A\"
 object \"C_7\" {
     code {
@@ -111,4 +118,15 @@ object \"C_7\" {
 
 }
 
-"}}},"sources":{"A":{"id":0}}}
+"
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_json_no_pretty_print/no-pretty-print b/test/cmdlineTests/standard_json_no_pretty_print/no-pretty-print
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/cmdlineTests/standard_method_identifiers_requested/output.json b/test/cmdlineTests/standard_method_identifiers_requested/output.json
index 7e3f139f9b..35d4f50025 100644
--- a/test/cmdlineTests/standard_method_identifiers_requested/output.json
+++ b/test/cmdlineTests/standard_method_identifiers_requested/output.json
@@ -1 +1,25 @@
-{"contracts":{"A":{"C":{"evm":{"methodIdentifiers":{"f()":"26121ff0"}}}}},"sources":{"A":{"id":0}}}
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "evm":
+                {
+                    "methodIdentifiers":
+                    {
+                        "f()": "26121ff0"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json b/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json
index 7953dc1572..f90a33351b 100644
--- a/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json
+++ b/test/cmdlineTests/standard_method_identifiers_requested_empty/output.json
@@ -1 +1,22 @@
-{"contracts":{"A":{"C":{"evm":{"methodIdentifiers":{}}}}},"sources":{"A":{"id":0}}}
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "evm":
+                {
+                    "methodIdentifiers": {}
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json b/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json
index 59b90c8cc9..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json
+++ b/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json
@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_all/output.json b/test/cmdlineTests/standard_model_checker_contracts_all/output.json
index 33dcf989a6..b4bfd66b84 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_all/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 y = 0
@@ -11,14 +17,28 @@ B.g(0)
 5 | \t\t\t\t\t\tassert(y > 0);
   | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 y = 0
 
 Transaction trace:
 B.constructor()
-B.g(0)","severity":"warning","sourceLocation":{"end":137,"file":"Source","start":124},"type":"Warning"},{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+B.g(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 137,
+                "file": "Source",
+                "start": 124
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
@@ -31,11 +51,30 @@ A.f(0)
 10 | \t\t\t\t\t\tassert(x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
 
 Transaction trace:
 A.constructor()
-A.f(0)","severity":"warning","sourceLocation":{"end":231,"file":"Source","start":218},"type":"Warning"}],"sources":{"Source":{"id":0}}}
+A.f(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 231,
+                "file": "Source",
+                "start": 218
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "Source":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_all_explicit/output.json b/test/cmdlineTests/standard_model_checker_contracts_all_explicit/output.json
index 33dcf989a6..b4bfd66b84 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_all_explicit/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_all_explicit/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 y = 0
@@ -11,14 +17,28 @@ B.g(0)
 5 | \t\t\t\t\t\tassert(y > 0);
   | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 y = 0
 
 Transaction trace:
 B.constructor()
-B.g(0)","severity":"warning","sourceLocation":{"end":137,"file":"Source","start":124},"type":"Warning"},{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+B.g(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 137,
+                "file": "Source",
+                "start": 124
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
@@ -31,11 +51,30 @@ A.f(0)
 10 | \t\t\t\t\t\tassert(x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
 
 Transaction trace:
 A.constructor()
-A.f(0)","severity":"warning","sourceLocation":{"end":231,"file":"Source","start":218},"type":"Warning"}],"sources":{"Source":{"id":0}}}
+A.f(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 231,
+                "file": "Source",
+                "start": 218
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "Source":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_empty_array/output.json b/test/cmdlineTests/standard_model_checker_contracts_empty_array/output.json
index ca309b9819..ada440ad38 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_array/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_empty_array/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Source contracts must be a non-empty array.","message":"Source contracts must be a non-empty array.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Source contracts must be a non-empty array.",
+            "message": "Source contracts must be a non-empty array.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_empty_contract/output.json b/test/cmdlineTests/standard_model_checker_contracts_empty_contract/output.json
index 9dac3796bb..c3b171e99e 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_contract/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_empty_contract/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Contract name cannot be empty.","message":"Contract name cannot be empty.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Contract name cannot be empty.",
+            "message": "Contract name cannot be empty.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_empty_source/output.json b/test/cmdlineTests/standard_model_checker_contracts_empty_source/output.json
index 93ade03a6e..98dcc1afad 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_empty_source/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_empty_source/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Source name cannot be empty.","message":"Source name cannot be empty.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Source name cannot be empty.",
+            "message": "Source name cannot be empty.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json b/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json
index 1e19f7ed0f..e3714e8e68 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json
@@ -1,3 +1,22 @@
-{"errors":[{"component":"general","errorCode":"7400","formattedMessage":"Warning: Requested contract \"C\" does not exist in source \"Source\".
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "7400",
+            "formattedMessage": "Warning: Requested contract \"C\" does not exist in source \"Source\".
 
-","message":"Requested contract \"C\" does not exist in source \"Source\".","severity":"warning","type":"Warning"}],"sources":{"Source":{"id":0}}}
+",
+            "message": "Requested contract \"C\" does not exist in source \"Source\".",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "Source":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json b/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json
index 955b970256..a875665817 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 y = 0
@@ -11,14 +17,28 @@ B.g(0)
 5 | \t\t\t\t\t\tassert(y > 0);
   | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 y = 0
 
 Transaction trace:
 A.constructor()
-B.g(0)","severity":"warning","sourceLocation":{"end":137,"file":"Source","start":124},"type":"Warning"},{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+B.g(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 137,
+                "file": "Source",
+                "start": 124
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
@@ -31,14 +51,28 @@ A.f(0)
 10 | \t\t\t\t\t\tassert(x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
 
 Transaction trace:
 A.constructor()
-A.f(0)","severity":"warning","sourceLocation":{"end":231,"file":"Source","start":218},"type":"Warning"},{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+A.f(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 231,
+                "file": "Source",
+                "start": 218
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 z = 0
@@ -51,11 +85,34 @@ C.h(0)
 6 | \t\t\t\t\t\tassert(z > 100);
   | \t\t\t\t\t\t^^^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 z = 0
 
 Transaction trace:
 C.constructor()
-C.h(0)","severity":"warning","sourceLocation":{"end":165,"file":"Source2","start":150},"type":"Warning"}],"sources":{"Source":{"id":0},"Source2":{"id":1}}}
+C.h(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 165,
+                "file": "Source2",
+                "start": 150
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "Source":
+        {
+            "id": 0
+        },
+        "Source2":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json b/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json
index a996f530b3..57c4f10fac 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 y = 0
@@ -11,14 +17,28 @@ B.g(0)
 5 | \t\t\t\t\t\tassert(y > 0);
   | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 y = 0
 
 Transaction trace:
 A.constructor()
-B.g(0)","severity":"warning","sourceLocation":{"end":137,"file":"Source","start":124},"type":"Warning"},{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+B.g(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 137,
+                "file": "Source",
+                "start": 124
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
@@ -31,11 +51,30 @@ A.f(0)
 10 | \t\t\t\t\t\tassert(x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
 
 Transaction trace:
 A.constructor()
-A.f(0)","severity":"warning","sourceLocation":{"end":231,"file":"Source","start":218},"type":"Warning"}],"sources":{"Source":{"id":0}}}
+A.f(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 231,
+                "file": "Source",
+                "start": 218
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "Source":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources/output.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources/output.json
index 63570423ad..d38ad1b599 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources/output.json
@@ -1,3 +1,22 @@
-{"errors":[{"component":"general","errorCode":"9134","formattedMessage":"Warning: Requested source \"Sourceee\" does not exist.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "9134",
+            "formattedMessage": "Warning: Requested source \"Sourceee\" does not exist.
 
-","message":"Requested source \"Sourceee\" does not exist.","severity":"warning","type":"Warning"}],"sources":{"Source":{"id":0}}}
+",
+            "message": "Requested source \"Sourceee\" does not exist.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "Source":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_2/output.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_2/output.json
index 92c7402f3e..98365d1bf8 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_2/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_2/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"settings.modelChecker.contracts is not a JSON object.","message":"settings.modelChecker.contracts is not a JSON object.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.contracts is not a JSON object.",
+            "message": "settings.modelChecker.contracts is not a JSON object.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_3/output.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_3/output.json
index 5c5a2d6aa8..567db80afe 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_3/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_3/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Source contracts must be an array.","message":"Source contracts must be an array.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Source contracts must be an array.",
+            "message": "Source contracts must be an array.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_4/output.json b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_4/output.json
index 6e41c3a48b..30d4c2dcf0 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_4/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_wrong_key_sources_4/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Every contract in settings.modelChecker.contracts must be a string.","message":"Every contract in settings.modelChecker.contracts must be a string.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Every contract in settings.modelChecker.contracts must be a string.",
+            "message": "Every contract in settings.modelChecker.contracts must be a string.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
index 8d6a624a85..db2384cd9f 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x72b32f47722af7f889ab5740b229c1799f27d0a693995a581c00f65438255a15":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x72b32f47722af7f889ab5740b229c1799f27d0a693995a581c00f65438255a15": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |a_3_3| () Int)
 (declare-fun |b_5_3| () Int)
@@ -30,7 +35,8 @@
 
 (assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_15_1)))
 (check-sat)
-","0x825b322db572f1c2705128460f2af503aeeb571f1c2e15207ce4fd0355accee6":"(set-option :produce-models true)
+",
+            "0x825b322db572f1c2705128460f2af503aeeb571f1c2e15207ce4fd0355accee6": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |a_3_3| () Int)
 (declare-fun |b_5_3| () Int)
@@ -62,4 +68,14 @@
 
 (assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_15_1))
 (check-sat)
-"}},"sources":{"A":{"id":0}}}
+"
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
index 0bcabf1574..e733f8597e 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x4e97ac0812ea5c46e435c3db54d9e2eb4a3bcadff47f83ce1640429a0a47f6a4":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x4e97ac0812ea5c46e435c3db54d9e2eb4a3bcadff47f83ce1640429a0a47f6a4": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -47,7 +52,8 @@
 (assert (= |EVALEXPR_4| expr_19_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-","0x5e6c35c70ccbb1d9823ba3ab86fc9448ead56e6158f73aa8bed482232be56105":"(set-option :produce-models true)
+",
+            "0x5e6c35c70ccbb1d9823ba3ab86fc9448ead56e6158f73aa8bed482232be56105": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -96,7 +102,8 @@
 (assert (= |EVALEXPR_4| expr_22_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-","0x615d3f7e7a864c5b3fa9663d698ad3525d0345fa9b53c171d86493beded9023b":"(set-option :produce-models true)
+",
+            "0x615d3f7e7a864c5b3fa9663d698ad3525d0345fa9b53c171d86493beded9023b": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -120,7 +127,8 @@
 
 (assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_15_1)))
 (check-sat)
-","0x769f12e07b77225b4e96b3031839452b89976583e45e7924b8bf82ca53a0dd45":"(set-option :produce-models true)
+",
+            "0x769f12e07b77225b4e96b3031839452b89976583e45e7924b8bf82ca53a0dd45": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -144,4 +152,14 @@
 
 (assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_15_1))
 (check-sat)
-"}},"sources":{"A":{"id":0}}}
+"
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json
index 59b90c8cc9..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json
@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
index baad07867e..936ee3ffe4 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x591e1d66214247cc99275e22a55210a804c80e9939d5e515cd60a20b3a927c44":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x591e1d66214247cc99275e22a55210a804c80e9939d5e515cd60a20b3a927c44": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |a_3_3| () Int)
 (declare-fun |b_5_3| () Int)
@@ -51,7 +56,8 @@
 (assert (= |EVALEXPR_4| expr_19_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-","0x5d07befb0482a6d4e328641d57f10a2cbc89b2c287f8d5630bbe20ba4f829e7d":"(set-option :produce-models true)
+",
+            "0x5d07befb0482a6d4e328641d57f10a2cbc89b2c287f8d5630bbe20ba4f829e7d": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |a_3_3| () Int)
 (declare-fun |b_5_3| () Int)
@@ -104,7 +110,8 @@
 (assert (= |EVALEXPR_4| expr_22_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-","0x72b32f47722af7f889ab5740b229c1799f27d0a693995a581c00f65438255a15":"(set-option :produce-models true)
+",
+            "0x72b32f47722af7f889ab5740b229c1799f27d0a693995a581c00f65438255a15": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |a_3_3| () Int)
 (declare-fun |b_5_3| () Int)
@@ -136,7 +143,8 @@
 
 (assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_15_1)))
 (check-sat)
-","0x825b322db572f1c2705128460f2af503aeeb571f1c2e15207ce4fd0355accee6":"(set-option :produce-models true)
+",
+            "0x825b322db572f1c2705128460f2af503aeeb571f1c2e15207ce4fd0355accee6": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |a_3_3| () Int)
 (declare-fun |b_5_3| () Int)
@@ -168,18 +176,67 @@
 
 (assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_15_1))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"1218","formattedMessage":"Warning: CHC: Error trying to invoke SMT solver.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "1218",
+            "formattedMessage": "Warning: CHC: Error trying to invoke SMT solver.
  --> A:7:15:
   |
 7 | \t\t\t\t\t\treturn (a / b, a % b);
   | \t\t\t\t\t\t        ^^^^^
 
-","message":"CHC: Error trying to invoke SMT solver.","severity":"warning","sourceLocation":{"end":182,"file":"A","start":177},"type":"Warning"},{"component":"general","errorCode":"1218","formattedMessage":"Warning: CHC: Error trying to invoke SMT solver.
+",
+            "message": "CHC: Error trying to invoke SMT solver.",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 182,
+                "file": "A",
+                "start": 177
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1218",
+            "formattedMessage": "Warning: CHC: Error trying to invoke SMT solver.
  --> A:7:22:
   |
 7 | \t\t\t\t\t\treturn (a / b, a % b);
   | \t\t\t\t\t\t               ^^^^^
 
-","message":"CHC: Error trying to invoke SMT solver.","severity":"warning","sourceLocation":{"end":189,"file":"A","start":184},"type":"Warning"},{"component":"general","errorCode":"5840","formattedMessage":"Warning: CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+",
+            "message": "CHC: Error trying to invoke SMT solver.",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 189,
+                "file": "A",
+                "start": 184
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
index 401ad4d98b..ae3a76a25b 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x615d3f7e7a864c5b3fa9663d698ad3525d0345fa9b53c171d86493beded9023b":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x615d3f7e7a864c5b3fa9663d698ad3525d0345fa9b53c171d86493beded9023b": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -22,7 +27,8 @@
 
 (assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_15_1)))
 (check-sat)
-","0x769f12e07b77225b4e96b3031839452b89976583e45e7924b8bf82ca53a0dd45":"(set-option :produce-models true)
+",
+            "0x769f12e07b77225b4e96b3031839452b89976583e45e7924b8bf82ca53a0dd45": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -46,7 +52,8 @@
 
 (assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_15_1))
 (check-sat)
-","0x7eae514917329522604efe7292b9036d26ff191c3e65dfa51c727b3e7427c10b":"(set-option :produce-models true)
+",
+            "0x7eae514917329522604efe7292b9036d26ff191c3e65dfa51c727b3e7427c10b": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -91,7 +98,8 @@
 (assert (= |EVALEXPR_4| expr_19_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-","0xda96cf77e7e434e73e6c4dd847b2e0aa96dbdebf7a585f884ff024246977d02a":"(set-option :produce-models true)
+",
+            "0xda96cf77e7e434e73e6c4dd847b2e0aa96dbdebf7a585f884ff024246977d02a": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -136,4 +144,14 @@
 (assert (= |EVALEXPR_4| expr_22_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-"}},"sources":{"A":{"id":0}}}
+"
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/output.json
index c4e29b4e8f..fccd15838f 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_false_chc/output.json
@@ -1,15 +1,62 @@
-{"errors":[{"component":"general","errorCode":"1218","formattedMessage":"Warning: CHC: Error trying to invoke SMT solver.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "1218",
+            "formattedMessage": "Warning: CHC: Error trying to invoke SMT solver.
  --> A:7:15:
   |
 7 | \t\t\t\t\t\treturn (a / b, a % b);
   | \t\t\t\t\t\t        ^^^^^
 
-","message":"CHC: Error trying to invoke SMT solver.","severity":"warning","sourceLocation":{"end":182,"file":"A","start":177},"type":"Warning"},{"component":"general","errorCode":"1218","formattedMessage":"Warning: CHC: Error trying to invoke SMT solver.
+",
+            "message": "CHC: Error trying to invoke SMT solver.",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 182,
+                "file": "A",
+                "start": 177
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1218",
+            "formattedMessage": "Warning: CHC: Error trying to invoke SMT solver.
  --> A:7:22:
   |
 7 | \t\t\t\t\t\treturn (a / b, a % b);
   | \t\t\t\t\t\t               ^^^^^
 
-","message":"CHC: Error trying to invoke SMT solver.","severity":"warning","sourceLocation":{"end":189,"file":"A","start":184},"type":"Warning"},{"component":"general","errorCode":"5840","formattedMessage":"Warning: CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+",
+            "message": "CHC: Error trying to invoke SMT solver.",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 189,
+                "file": "A",
+                "start": 184
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/output.json
index 05cca29c42..457fb1ba0c 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_wrong/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"settings.modelChecker.divModNoSlacks must be a Boolean.","message":"settings.modelChecker.divModNoSlacks must be a Boolean.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.divModNoSlacks must be a Boolean.",
+            "message": "settings.modelChecker.divModNoSlacks must be a Boolean.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_engine_all/output.json b/test/cmdlineTests/standard_model_checker_engine_all/output.json
index 12dfe58719..2a2c394fdd 100644
--- a/test/cmdlineTests/standard_model_checker_engine_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_engine_all/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
@@ -11,11 +17,30 @@ C.f(0)
 4 | contract C { function f(uint x) public pure { assert(x > 0); } }
   |                                               ^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
 
 Transaction trace:
 C.constructor()
-C.f(0)","severity":"warning","sourceLocation":{"end":119,"file":"A","start":106},"type":"Warning"}],"sources":{"A":{"id":0}}}
+C.f(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 119,
+                "file": "A",
+                "start": 106
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_engine_bmc/output.json b/test/cmdlineTests/standard_model_checker_engine_bmc/output.json
index 77e6eeccde..4ddb024146 100644
--- a/test/cmdlineTests/standard_model_checker_engine_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_engine_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x7fe5be7672be6bc9bc2b750f3170bfa08ecd79fc95afb084539b74294c2dd24d":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x7fe5be7672be6bc9bc2b750f3170bfa08ecd79fc95afb084539b74294c2dd24d": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -22,7 +27,15 @@
 (assert (= |EVALEXPR_0| x_3_0))
 (check-sat)
 (get-value (|EVALEXPR_0| ))
-"}},"errors":[{"component":"general","errorCode":"4661","formattedMessage":"Warning: BMC: Assertion violation happens here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "4661",
+            "formattedMessage": "Warning: BMC: Assertion violation happens here.
  --> A:4:47:
   |
 4 | contract C { function f(uint x) public pure { assert(x > 0); } }
@@ -33,6 +46,37 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Assertion violation happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Assertion violation happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":119,"file":"A","start":106},"type":"Warning"}],"sources":{"A":{"id":0}}}
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 119,
+                "file": "A",
+                "start": 106
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_engine_chc/output.json b/test/cmdlineTests/standard_model_checker_engine_chc/output.json
index 12dfe58719..2a2c394fdd 100644
--- a/test/cmdlineTests/standard_model_checker_engine_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_engine_chc/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
@@ -11,11 +17,30 @@ C.f(0)
 4 | contract C { function f(uint x) public pure { assert(x > 0); } }
   |                                               ^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
 
 Transaction trace:
 C.constructor()
-C.f(0)","severity":"warning","sourceLocation":{"end":119,"file":"A","start":106},"type":"Warning"}],"sources":{"A":{"id":0}}}
+C.f(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 119,
+                "file": "A",
+                "start": 106
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_engine_none/output.json b/test/cmdlineTests/standard_model_checker_engine_none/output.json
index 59b90c8cc9..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_model_checker_engine_none/output.json
+++ b/test/cmdlineTests/standard_model_checker_engine_none/output.json
@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
index 385fcb31f9..1e61e18eb6 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
@@ -1,7 +1,26 @@
-{"errors":[{"component":"general","errorCode":"1180","formattedMessage":"Info: Contract invariant(s) for A:test:
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "1180",
+            "formattedMessage": "Info: Contract invariant(s) for A:test:
 ((x <= 0) || true)
 
 
-","message":"Contract invariant(s) for A:test:
+",
+            "message": "Contract invariant(s) for A:test:
 ((x <= 0) || true)
-","severity":"info","type":"Info"}],"sources":{"A":{"id":0}}}
+",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
index 64d63c46c0..5a83ba7ac7 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract_reentrancy/output.json
@@ -1,10 +1,30 @@
-{"errors":[{"component":"general","errorCode":"9302","formattedMessage":"Warning: Return value of low-level calls not used.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "9302",
+            "formattedMessage": "Warning: Return value of low-level calls not used.
  --> A:7:7:
   |
 7 | \t\t\t\t\t\t_a.call(\"\");
   | \t\t\t\t\t\t^^^^^^^^^^^
 
-","message":"Return value of low-level calls not used.","severity":"warning","sourceLocation":{"end":143,"file":"A","start":132},"type":"Warning"},{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+",
+            "message": "Return value of low-level calls not used.",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 143,
+                "file": "A",
+                "start": 132
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 x = 0
 _a = 0x0
@@ -19,7 +39,8 @@ test.f(0x0)
 8 | \t\t\t\t\t\tassert(x == 10);
   | \t\t\t\t\t\t^^^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 x = 0
 _a = 0x0
@@ -28,4 +49,22 @@ Transaction trace:
 test.constructor()
 State: x = 0
 test.f(0x0)
-    _a.call(\"\") -- untrusted external call","severity":"warning","sourceLocation":{"end":166,"file":"A","start":151},"type":"Warning"}],"sources":{"A":{"id":0}}}
+    _a.call(\"\") -- untrusted external call",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 166,
+                "file": "A",
+                "start": 151
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
index d7cb43429f..2d1d093bf5 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
@@ -1,17 +1,50 @@
-{"errors":[{"component":"general","errorCode":"9302","formattedMessage":"Warning: Return value of low-level calls not used.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "9302",
+            "formattedMessage": "Warning: Return value of low-level calls not used.
  --> A:7:7:
   |
 7 | \t\t\t\t\t\t_a.call(\"\");
   | \t\t\t\t\t\t^^^^^^^^^^^
 
-","message":"Return value of low-level calls not used.","severity":"warning","sourceLocation":{"end":143,"file":"A","start":132},"type":"Warning"},{"component":"general","errorCode":"1180","formattedMessage":"Info: Reentrancy property(ies) for A:test:
+",
+            "message": "Return value of low-level calls not used.",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 143,
+                "file": "A",
+                "start": 132
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1180",
+            "formattedMessage": "Info: Reentrancy property(ies) for A:test:
 (((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 
 
-","message":"Reentrancy property(ies) for A:test:
+",
+            "message": "Reentrancy property(ies) for A:test:
 (((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
-","severity":"info","type":"Info"}],"sources":{"A":{"id":0}}}
+",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json
index 7758b29ca2..45fcfbe984 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_key/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Invalid model checker invariants requested.","message":"Invalid model checker invariants requested.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid model checker invariants requested.",
+            "message": "Invalid model checker invariants requested.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json
index 5ad18a3b1c..d1992e464d 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_type/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Every invariant type in settings.modelChecker.invariants must be a string.","message":"Every invariant type in settings.modelChecker.invariants must be a string.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Every invariant type in settings.modelChecker.invariants must be a string.",
+            "message": "Every invariant type in settings.modelChecker.invariants must be a string.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json b/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json
index b4fba3576b..078edfc1d8 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_wrong_type_2/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"settings.modelChecker.invariants must be an array.","message":"settings.modelChecker.invariants must be an array.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.invariants must be an array.",
+            "message": "settings.modelChecker.invariants must be an array.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json
index 6f0aaa4e03..fafec12d37 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x4cd81a462deca8d6bf08b33a7f5bce9cf9306c7ee90b83c106ca7927066a23b1":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x4cd81a462deca8d6bf08b33a7f5bce9cf9306c7ee90b83c106ca7927066a23b1": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
 (declare-fun |s_7_3| () |struct test.S|)
@@ -24,7 +29,8 @@
 
 (assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) (not expr_15_0)))
 (check-sat)
-","0x65d23088fadc165b70d1947e1ba5191db247c8c5fab4e23d292c1168e94b4784":"(set-option :produce-models true)
+",
+            "0x65d23088fadc165b70d1947e1ba5191db247c8c5fab4e23d292c1168e94b4784": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
 (declare-fun |s_7_3| () |struct test.S|)
@@ -69,7 +75,8 @@
 (assert (= |EVALEXPR_0| b_9_0))
 (check-sat)
 (get-value (|EVALEXPR_0| ))
-","0xd6dbbd7b7e45b0360943223d07028611980d896347710102f264ffa0ae086fad":"(set-option :produce-models true)
+",
+            "0xd6dbbd7b7e45b0360943223d07028611980d896347710102f264ffa0ae086fad": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
 (declare-fun |s_7_3| () |struct test.S|)
@@ -95,8 +102,37 @@
 
 (assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) expr_15_0))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"5840","formattedMessage":"Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"},{"component":"general","errorCode":"2788","formattedMessage":"Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+",
+            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "2788",
+            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json
index 6f0aaa4e03..fafec12d37 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x4cd81a462deca8d6bf08b33a7f5bce9cf9306c7ee90b83c106ca7927066a23b1":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x4cd81a462deca8d6bf08b33a7f5bce9cf9306c7ee90b83c106ca7927066a23b1": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
 (declare-fun |s_7_3| () |struct test.S|)
@@ -24,7 +29,8 @@
 
 (assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) (not expr_15_0)))
 (check-sat)
-","0x65d23088fadc165b70d1947e1ba5191db247c8c5fab4e23d292c1168e94b4784":"(set-option :produce-models true)
+",
+            "0x65d23088fadc165b70d1947e1ba5191db247c8c5fab4e23d292c1168e94b4784": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
 (declare-fun |s_7_3| () |struct test.S|)
@@ -69,7 +75,8 @@
 (assert (= |EVALEXPR_0| b_9_0))
 (check-sat)
 (get-value (|EVALEXPR_0| ))
-","0xd6dbbd7b7e45b0360943223d07028611980d896347710102f264ffa0ae086fad":"(set-option :produce-models true)
+",
+            "0xd6dbbd7b7e45b0360943223d07028611980d896347710102f264ffa0ae086fad": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
 (declare-fun |s_7_3| () |struct test.S|)
@@ -95,8 +102,37 @@
 
 (assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) expr_15_0))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"5840","formattedMessage":"Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"},{"component":"general","errorCode":"2788","formattedMessage":"Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+",
+            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "2788",
+            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json
index 6893a9a5e9..a274a20c56 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x5953b22204605efc775a59974aec3ddf9f831e46e30a65e149873e6f48887590":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x5953b22204605efc775a59974aec3ddf9f831e46e30a65e149873e6f48887590": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -20,7 +25,8 @@
 
 (assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) (not expr_15_0)))
 (check-sat)
-","0x84635fcc37e5318fb46619945199a333750ee247769e97445a2f89b98b54fef9":"(set-option :produce-models true)
+",
+            "0x84635fcc37e5318fb46619945199a333750ee247769e97445a2f89b98b54fef9": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -61,7 +67,8 @@
 (assert (= |EVALEXPR_0| b_9_0))
 (check-sat)
 (get-value (|EVALEXPR_0| ))
-","0xd55ef003dcd6e8ebbd55fce4adaa36b4d898204d649e5426179dea4b7450a9f5":"(set-option :produce-models true)
+",
+            "0xd55ef003dcd6e8ebbd55fce4adaa36b4d898204d649e5426179dea4b7450a9f5": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -83,6 +90,27 @@
 
 (assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) expr_15_0))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"2788","formattedMessage":"Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2788",
+            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_chc/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_chc/output.json
index 5e66cb8992..7f0e676cb8 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_false_chc/output.json
@@ -1,3 +1,22 @@
-{"errors":[{"component":"general","errorCode":"5840","formattedMessage":"Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json
index a3626c64b1..6fcfb8bcfb 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x4cd81a462deca8d6bf08b33a7f5bce9cf9306c7ee90b83c106ca7927066a23b1":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x4cd81a462deca8d6bf08b33a7f5bce9cf9306c7ee90b83c106ca7927066a23b1": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
 (declare-fun |s_7_3| () |struct test.S|)
@@ -24,7 +29,8 @@
 
 (assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) (not expr_15_0)))
 (check-sat)
-","0x65d23088fadc165b70d1947e1ba5191db247c8c5fab4e23d292c1168e94b4784":"(set-option :produce-models true)
+",
+            "0x65d23088fadc165b70d1947e1ba5191db247c8c5fab4e23d292c1168e94b4784": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
 (declare-fun |s_7_3| () |struct test.S|)
@@ -69,7 +75,8 @@
 (assert (= |EVALEXPR_0| b_9_0))
 (check-sat)
 (get-value (|EVALEXPR_0| ))
-","0xd6dbbd7b7e45b0360943223d07028611980d896347710102f264ffa0ae086fad":"(set-option :produce-models true)
+",
+            "0xd6dbbd7b7e45b0360943223d07028611980d896347710102f264ffa0ae086fad": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
 (declare-fun |s_7_3| () |struct test.S|)
@@ -95,17 +102,64 @@
 
 (assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) expr_15_0))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation might happen here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation might happen here.
   --> A:11:7:
    |
 11 | \t\t\t\t\t\tassert(s.x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation might happen here.","severity":"warning","sourceLocation":{"end":201,"file":"A","start":186},"type":"Warning"},{"component":"general","errorCode":"7812","formattedMessage":"Warning: BMC: Assertion violation might happen here.
+",
+            "message": "CHC: Assertion violation might happen here.",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 201,
+                "file": "A",
+                "start": 186
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "7812",
+            "formattedMessage": "Warning: BMC: Assertion violation might happen here.
   --> A:11:7:
    |
 11 | \t\t\t\t\t\tassert(s.x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^^^
 Note:
 
-","message":"BMC: Assertion violation might happen here.","secondarySourceLocations":[{"message":""}],"severity":"warning","sourceLocation":{"end":201,"file":"A","start":186},"type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "BMC: Assertion violation might happen here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 201,
+                "file": "A",
+                "start": 186
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json
index 21422cec1c..006e1f03ba 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x5953b22204605efc775a59974aec3ddf9f831e46e30a65e149873e6f48887590":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x5953b22204605efc775a59974aec3ddf9f831e46e30a65e149873e6f48887590": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -20,7 +25,8 @@
 
 (assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) (not expr_15_0)))
 (check-sat)
-","0x84635fcc37e5318fb46619945199a333750ee247769e97445a2f89b98b54fef9":"(set-option :produce-models true)
+",
+            "0x84635fcc37e5318fb46619945199a333750ee247769e97445a2f89b98b54fef9": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -61,7 +67,8 @@
 (assert (= |EVALEXPR_0| b_9_0))
 (check-sat)
 (get-value (|EVALEXPR_0| ))
-","0xd55ef003dcd6e8ebbd55fce4adaa36b4d898204d649e5426179dea4b7450a9f5":"(set-option :produce-models true)
+",
+            "0xd55ef003dcd6e8ebbd55fce4adaa36b4d898204d649e5426179dea4b7450a9f5": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -83,11 +90,44 @@
 
 (assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) expr_15_0))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"7812","formattedMessage":"Warning: BMC: Assertion violation might happen here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "7812",
+            "formattedMessage": "Warning: BMC: Assertion violation might happen here.
   --> A:11:7:
    |
 11 | \t\t\t\t\t\tassert(s.x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^^^
 Note:
 
-","message":"BMC: Assertion violation might happen here.","secondarySourceLocations":[{"message":""}],"severity":"warning","sourceLocation":{"end":201,"file":"A","start":186},"type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "BMC: Assertion violation might happen here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 201,
+                "file": "A",
+                "start": 186
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_chc/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_chc/output.json
index 352b76d275..58956287fd 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_true_chc/output.json
@@ -1,7 +1,32 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation might happen here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation might happen here.
   --> A:11:7:
    |
 11 | \t\t\t\t\t\tassert(s.x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation might happen here.","severity":"warning","sourceLocation":{"end":201,"file":"A","start":186},"type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "CHC: Assertion violation might happen here.",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 201,
+                "file": "A",
+                "start": 186
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_wrong/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_wrong/output.json
index 394dbf925b..a9342cddfb 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_wrong/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_wrong/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"settings.modelChecker.showUnproved must be a Boolean value.","message":"settings.modelChecker.showUnproved must be a Boolean value.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.showUnproved must be a Boolean value.",
+            "message": "settings.modelChecker.showUnproved must be a Boolean value.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_all/output.json b/test/cmdlineTests/standard_model_checker_solvers_all/output.json
index 12dfe58719..2a2c394fdd 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_all/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
@@ -11,11 +17,30 @@ C.f(0)
 4 | contract C { function f(uint x) public pure { assert(x > 0); } }
   |                                               ^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
 
 Transaction trace:
 C.constructor()
-C.f(0)","severity":"warning","sourceLocation":{"end":119,"file":"A","start":106},"type":"Warning"}],"sources":{"A":{"id":0}}}
+C.f(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 119,
+                "file": "A",
+                "start": 106
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_none/output.json b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
index d5672007e1..ab989857cd 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_none/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
@@ -1,5 +1,32 @@
-{"errors":[{"component":"general","errorCode":"7649","formattedMessage":"Warning: CHC analysis was not possible since no Horn solver was found and enabled.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "7649",
+            "formattedMessage": "Warning: CHC analysis was not possible since no Horn solver was found and enabled.
 
-","message":"CHC analysis was not possible since no Horn solver was found and enabled.","severity":"warning","type":"Warning"},{"component":"general","errorCode":"7710","formattedMessage":"Warning: BMC analysis was not possible since no SMT solver was found and enabled.
+",
+            "message": "CHC analysis was not possible since no Horn solver was found and enabled.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "7710",
+            "formattedMessage": "Warning: BMC analysis was not possible since no SMT solver was found and enabled.
 
-","message":"BMC analysis was not possible since no SMT solver was found and enabled.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "BMC analysis was not possible since no SMT solver was found and enabled.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
index 866727f4b1..41ef018d92 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x2bcd3328dc8d31e869efd5e0dfdb16a6fa26f0a9c2829ea55670262be485e401":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x2bcd3328dc8d31e869efd5e0dfdb16a6fa26f0a9c2829ea55670262be485e401": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |x_3_3| () Int)
 (declare-fun |error_0| () Int)
@@ -24,7 +29,8 @@
 (assert (= |EVALEXPR_0| x_3_0))
 (check-sat)
 (get-value (|EVALEXPR_0| ))
-","0x4e70784a8a93c7429a716aa8b778f3de5d1f63b30158452534da5d44e5967d2b":"(set-logic HORN)
+",
+            "0x4e70784a8a93c7429a716aa8b778f3de5d1f63b30158452534da5d44e5967d2b": "(set-logic HORN)
 
 (declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
 (declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
@@ -145,12 +151,57 @@
 (assert
 (forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
 (=> error_target_3_0 false)))
-(check-sat)"}},"errors":[{"component":"general","errorCode":"5840","formattedMessage":"Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-","message":"CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"},{"component":"general","errorCode":"3996","formattedMessage":"Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
-
-","message":"CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.","severity":"warning","type":"Warning"},{"component":"general","errorCode":"2788","formattedMessage":"Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-
-","message":"BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"},{"component":"general","errorCode":"8084","formattedMessage":"Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
-
-","message":"BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+(check-sat)"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+",
+            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "3996",
+            "formattedMessage": "Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
+
+",
+            "message": "CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "2788",
+            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+",
+            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "8084",
+            "formattedMessage": "Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
+
+",
+            "message": "BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_z3/output.json b/test/cmdlineTests/standard_model_checker_solvers_z3/output.json
index 12dfe58719..2a2c394fdd 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_z3/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_z3/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
@@ -11,11 +17,30 @@ C.f(0)
 4 | contract C { function f(uint x) public pure { assert(x > 0); } }
   |                                               ^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
 
 Transaction trace:
 C.constructor()
-C.f(0)","severity":"warning","sourceLocation":{"end":119,"file":"A","start":106},"type":"Warning"}],"sources":{"A":{"id":0}}}
+C.f(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 119,
+                "file": "A",
+                "start": 106
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/output.json
index 12dfe58719..2a2c394fdd 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_z3_smtlib2/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
@@ -11,11 +17,30 @@ C.f(0)
 4 | contract C { function f(uint x) public pure { assert(x > 0); } }
   |                                               ^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 
 x = 0
 
 Transaction trace:
 C.constructor()
-C.f(0)","severity":"warning","sourceLocation":{"end":119,"file":"A","start":106},"type":"Warning"}],"sources":{"A":{"id":0}}}
+C.f(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 119,
+                "file": "A",
+                "start": 106
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json
index 6957724064..0393396edf 100644
--- a/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x67f6235b42fbb5cc636b1d18ccd5622020b45eef0c634965f9adf8b4bb923a64":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x67f6235b42fbb5cc636b1d18ccd5622020b45eef0c634965f9adf8b4bb923a64": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -53,7 +58,15 @@
 (assert (= |EVALEXPR_1| x_8_1))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-"}},"errors":[{"component":"general","errorCode":"4661","formattedMessage":"Warning: BMC: Assertion violation happens here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "4661",
+            "formattedMessage": "Warning: BMC: Assertion violation happens here.
   --> A:12:7:
    |
 12 | \t\t\t\t\t\tassert(x > 0);
@@ -65,7 +78,38 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Assertion violation happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Assertion violation happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":258,"file":"A","start":245},"type":"Warning"}],"sources":{"A":{"id":0}}}
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 258,
+                "file": "A",
+                "start": 245
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_assert_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_assert_chc/output.json
index fc4b9b9dad..5c43fe6b54 100644
--- a/test/cmdlineTests/standard_model_checker_targets_assert_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_assert_chc/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -13,7 +19,8 @@ test.f(0x0, 1)
 12 | \t\t\t\t\t\tassert(x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -22,4 +29,22 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":258,"file":"A","start":245},"type":"Warning"}],"sources":{"A":{"id":0}}}
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 258,
+                "file": "A",
+                "start": 245
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json
index aa8503d2d5..041f550797 100644
--- a/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0xa5a6f54f166338793f025832fad8408fccb5fa0ee7a8ab0cb4ed7ec5a8c034de":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0xa5a6f54f166338793f025832fad8408fccb5fa0ee7a8ab0cb4ed7ec5a8c034de": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -53,7 +58,15 @@
 (assert (= |EVALEXPR_1| x_8_1))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-"}},"errors":[{"component":"general","errorCode":"1236","formattedMessage":"Warning: BMC: Insufficient funds happens here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "1236",
+            "formattedMessage": "Warning: BMC: Insufficient funds happens here.
   --> A:11:7:
    |
 11 | \t\t\t\t\t\ta.transfer(x);
@@ -65,7 +78,38 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Insufficient funds happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Insufficient funds happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":237,"file":"A","start":224},"type":"Warning"}],"sources":{"A":{"id":0}}}
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 237,
+                "file": "A",
+                "start": 224
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json
index 59b90c8cc9..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_balance_chc/output.json
@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json
index 766289fb49..132f3e5a3b 100644
--- a/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0xca9972ec543d923e2e93a20db0b793a19de392a072a70371f575dbee55fe301c":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0xca9972ec543d923e2e93a20db0b793a19de392a072a70371f575dbee55fe301c": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -23,7 +28,8 @@
 
 (assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) (not expr_14_1)))
 (check-sat)
-","0xdda5d43b30361d8d706472ecb9bb78f49c5beb6ffe9eba3ff632d1cd5f17e317":"(set-option :produce-models true)
+",
+            "0xdda5d43b30361d8d706472ecb9bb78f49c5beb6ffe9eba3ff632d1cd5f17e317": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -48,11 +54,44 @@
 
 (assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) expr_14_1))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"6838","formattedMessage":"Warning: BMC: Condition is always true.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6838",
+            "formattedMessage": "Warning: BMC: Condition is always true.
  --> A:7:15:
   |
 7 | \t\t\t\t\t\trequire(x >= 0);
   | \t\t\t\t\t\t        ^^^^^^
 Note: Callstack:
 
-","message":"BMC: Condition is always true.","secondarySourceLocations":[{"message":"Callstack:"}],"severity":"warning","sourceLocation":{"end":165,"file":"A","start":159},"type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "BMC: Condition is always true.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Callstack:"
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 165,
+                "file": "A",
+                "start": 159
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/output.json
index 59b90c8cc9..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_constantCondition_chc/output.json
@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json b/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json
index ad64186363..c3033a5dc6 100644
--- a/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x03d0edb825a4f6251a71019a2075e51c5d4fce6236dfaa9b24ed56309b4cb52e":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x03d0edb825a4f6251a71019a2075e51c5d4fce6236dfaa9b24ed56309b4cb52e": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
 (declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
@@ -30,7 +35,8 @@
 
 (assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) (not expr_14_1)))
 (check-sat)
-","0xa7b2de16abc4c0f0f9e2c540a576178d99cb73a01cf0d0d1d62d51735c6d3b44":"(set-option :produce-models true)
+",
+            "0xa7b2de16abc4c0f0f9e2c540a576178d99cb73a01cf0d0d1d62d51735c6d3b44": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
 (declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
@@ -91,7 +97,8 @@
 (assert (= |EVALEXPR_1| x_8_1))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-","0xd43cc6edbb2db7e490ff38b099043a3d3f17f85031b33673e76cb1eaf0598122":"(set-option :produce-models true)
+",
+            "0xd43cc6edbb2db7e490ff38b099043a3d3f17f85031b33673e76cb1eaf0598122": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
 (declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
@@ -123,7 +130,15 @@
 
 (assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) expr_14_1))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"4281","formattedMessage":"Warning: CHC: Division by zero happens here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "4281",
+            "formattedMessage": "Warning: CHC: Division by zero happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -138,7 +153,8 @@ test.f(0x0, 1)
 10 | \t\t\t\t\t\t2 / x;
    | \t\t\t\t\t\t^^^^^
 
-","message":"CHC: Division by zero happens here.
+",
+            "message": "CHC: Division by zero happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -147,7 +163,20 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":216,"file":"A","start":211},"type":"Warning"},{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 216,
+                "file": "A",
+                "start": 211
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -162,7 +191,8 @@ test.f(0x0, 1)
 12 | \t\t\t\t\t\tassert(x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -171,7 +201,20 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":258,"file":"A","start":245},"type":"Warning"},{"component":"general","errorCode":"2529","formattedMessage":"Warning: CHC: Empty array \"pop\" happens here.
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 258,
+                "file": "A",
+                "start": 245
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "2529",
+            "formattedMessage": "Warning: CHC: Empty array \"pop\" happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -186,7 +229,8 @@ test.f(0x0, 1)
 13 | \t\t\t\t\t\tarr.pop();
    | \t\t\t\t\t\t^^^^^^^^^
 
-","message":"CHC: Empty array \"pop\" happens here.
+",
+            "message": "CHC: Empty array \"pop\" happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -195,7 +239,20 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":275,"file":"A","start":266},"type":"Warning"},{"component":"general","errorCode":"6368","formattedMessage":"Warning: CHC: Out of bounds access happens here.
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 275,
+                "file": "A",
+                "start": 266
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6368",
+            "formattedMessage": "Warning: CHC: Out of bounds access happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -210,7 +267,8 @@ test.f(0x0, 1)
 14 | \t\t\t\t\t\tarr[x];
    | \t\t\t\t\t\t^^^^^^
 
-","message":"CHC: Out of bounds access happens here.
+",
+            "message": "CHC: Out of bounds access happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -219,14 +277,47 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":289,"file":"A","start":283},"type":"Warning"},{"component":"general","errorCode":"6838","formattedMessage":"Warning: BMC: Condition is always true.
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 289,
+                "file": "A",
+                "start": 283
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6838",
+            "formattedMessage": "Warning: BMC: Condition is always true.
  --> A:7:15:
   |
 7 | \t\t\t\t\t\trequire(x >= 0);
   | \t\t\t\t\t\t        ^^^^^^
 Note: Callstack:
 
-","message":"BMC: Condition is always true.","secondarySourceLocations":[{"message":"Callstack:"}],"severity":"warning","sourceLocation":{"end":165,"file":"A","start":159},"type":"Warning"},{"component":"general","errorCode":"1236","formattedMessage":"Warning: BMC: Insufficient funds happens here.
+",
+            "message": "BMC: Condition is always true.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Callstack:"
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 165,
+                "file": "A",
+                "start": 159
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1236",
+            "formattedMessage": "Warning: BMC: Insufficient funds happens here.
   --> A:11:7:
    |
 11 | \t\t\t\t\t\ta.transfer(x);
@@ -238,7 +329,38 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Insufficient funds happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Insufficient funds happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":237,"file":"A","start":224},"type":"Warning"}],"sources":{"A":{"id":0}}}
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 237,
+                "file": "A",
+                "start": 224
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json
index acbe715bf3..6d0f6282bc 100644
--- a/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x540d6a4b18ea4181713b8f0e9b4b272f762e142ba1716a3960cfdbed3f1ae64e":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x540d6a4b18ea4181713b8f0e9b4b272f762e142ba1716a3960cfdbed3f1ae64e": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -55,7 +60,8 @@
 (assert (= |EVALEXPR_2| expr_29_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-","0x67f6235b42fbb5cc636b1d18ccd5622020b45eef0c634965f9adf8b4bb923a64":"(set-option :produce-models true)
+",
+            "0x67f6235b42fbb5cc636b1d18ccd5622020b45eef0c634965f9adf8b4bb923a64": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -110,7 +116,8 @@
 (assert (= |EVALEXPR_1| x_8_1))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-","0xa5a6f54f166338793f025832fad8408fccb5fa0ee7a8ab0cb4ed7ec5a8c034de":"(set-option :produce-models true)
+",
+            "0xa5a6f54f166338793f025832fad8408fccb5fa0ee7a8ab0cb4ed7ec5a8c034de": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -165,7 +172,8 @@
 (assert (= |EVALEXPR_1| x_8_1))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-","0xca9972ec543d923e2e93a20db0b793a19de392a072a70371f575dbee55fe301c":"(set-option :produce-models true)
+",
+            "0xca9972ec543d923e2e93a20db0b793a19de392a072a70371f575dbee55fe301c": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -190,7 +198,8 @@
 
 (assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) (not expr_14_1)))
 (check-sat)
-","0xdda5d43b30361d8d706472ecb9bb78f49c5beb6ffe9eba3ff632d1cd5f17e317":"(set-option :produce-models true)
+",
+            "0xdda5d43b30361d8d706472ecb9bb78f49c5beb6ffe9eba3ff632d1cd5f17e317": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -215,14 +224,42 @@
 
 (assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) expr_14_1))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"6838","formattedMessage":"Warning: BMC: Condition is always true.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6838",
+            "formattedMessage": "Warning: BMC: Condition is always true.
  --> A:7:15:
   |
 7 | \t\t\t\t\t\trequire(x >= 0);
   | \t\t\t\t\t\t        ^^^^^^
 Note: Callstack:
 
-","message":"BMC: Condition is always true.","secondarySourceLocations":[{"message":"Callstack:"}],"severity":"warning","sourceLocation":{"end":165,"file":"A","start":159},"type":"Warning"},{"component":"general","errorCode":"3046","formattedMessage":"Warning: BMC: Division by zero happens here.
+",
+            "message": "BMC: Condition is always true.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Callstack:"
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 165,
+                "file": "A",
+                "start": 159
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "3046",
+            "formattedMessage": "Warning: BMC: Division by zero happens here.
   --> A:10:7:
    |
 10 | \t\t\t\t\t\t2 / x;
@@ -235,11 +272,37 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Division by zero happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Division by zero happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   <result> = 0
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":216,"file":"A","start":211},"type":"Warning"},{"component":"general","errorCode":"1236","formattedMessage":"Warning: BMC: Insufficient funds happens here.
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 216,
+                "file": "A",
+                "start": 211
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1236",
+            "formattedMessage": "Warning: BMC: Insufficient funds happens here.
   --> A:11:7:
    |
 11 | \t\t\t\t\t\ta.transfer(x);
@@ -251,10 +314,36 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Insufficient funds happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Insufficient funds happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":237,"file":"A","start":224},"type":"Warning"},{"component":"general","errorCode":"4661","formattedMessage":"Warning: BMC: Assertion violation happens here.
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 237,
+                "file": "A",
+                "start": 224
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "4661",
+            "formattedMessage": "Warning: BMC: Assertion violation happens here.
   --> A:12:7:
    |
 12 | \t\t\t\t\t\tassert(x > 0);
@@ -266,7 +355,38 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Assertion violation happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Assertion violation happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":258,"file":"A","start":245},"type":"Warning"}],"sources":{"A":{"id":0}}}
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 258,
+                "file": "A",
+                "start": 245
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json
index bcdf48e50e..c3df366c99 100644
--- a/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_default_chc/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"4281","formattedMessage":"Warning: CHC: Division by zero happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "4281",
+            "formattedMessage": "Warning: CHC: Division by zero happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -13,7 +19,8 @@ test.f(0x0, 1)
 10 | \t\t\t\t\t\t2 / x;
    | \t\t\t\t\t\t^^^^^
 
-","message":"CHC: Division by zero happens here.
+",
+            "message": "CHC: Division by zero happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -22,7 +29,20 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":216,"file":"A","start":211},"type":"Warning"},{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 216,
+                "file": "A",
+                "start": 211
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -37,7 +57,8 @@ test.f(0x0, 1)
 12 | \t\t\t\t\t\tassert(x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -46,7 +67,20 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":258,"file":"A","start":245},"type":"Warning"},{"component":"general","errorCode":"2529","formattedMessage":"Warning: CHC: Empty array \"pop\" happens here.
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 258,
+                "file": "A",
+                "start": 245
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "2529",
+            "formattedMessage": "Warning: CHC: Empty array \"pop\" happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -61,7 +95,8 @@ test.f(0x0, 1)
 13 | \t\t\t\t\t\tarr.pop();
    | \t\t\t\t\t\t^^^^^^^^^
 
-","message":"CHC: Empty array \"pop\" happens here.
+",
+            "message": "CHC: Empty array \"pop\" happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -70,7 +105,20 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":275,"file":"A","start":266},"type":"Warning"},{"component":"general","errorCode":"6368","formattedMessage":"Warning: CHC: Out of bounds access happens here.
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 275,
+                "file": "A",
+                "start": 266
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6368",
+            "formattedMessage": "Warning: CHC: Out of bounds access happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -85,7 +133,8 @@ test.f(0x0, 1)
 14 | \t\t\t\t\t\tarr[x];
    | \t\t\t\t\t\t^^^^^^
 
-","message":"CHC: Out of bounds access happens here.
+",
+            "message": "CHC: Out of bounds access happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -94,4 +143,22 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":289,"file":"A","start":283},"type":"Warning"}],"sources":{"A":{"id":0}}}
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 289,
+                "file": "A",
+                "start": 283
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json
index 1f90958f25..2e8cb7b321 100644
--- a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x540d6a4b18ea4181713b8f0e9b4b272f762e142ba1716a3960cfdbed3f1ae64e":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x540d6a4b18ea4181713b8f0e9b4b272f762e142ba1716a3960cfdbed3f1ae64e": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -55,7 +60,15 @@
 (assert (= |EVALEXPR_2| expr_29_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-"}},"errors":[{"component":"general","errorCode":"3046","formattedMessage":"Warning: BMC: Division by zero happens here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "3046",
+            "formattedMessage": "Warning: BMC: Division by zero happens here.
   --> A:10:7:
    |
 10 | \t\t\t\t\t\t2 / x;
@@ -68,8 +81,39 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Division by zero happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Division by zero happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   <result> = 0
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":216,"file":"A","start":211},"type":"Warning"}],"sources":{"A":{"id":0}}}
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 216,
+                "file": "A",
+                "start": 211
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_div_by_zero_chc/output.json
index bd8b26c125..5c09175e72 100644
--- a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_div_by_zero_chc/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"4281","formattedMessage":"Warning: CHC: Division by zero happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "4281",
+            "formattedMessage": "Warning: CHC: Division by zero happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -13,7 +19,8 @@ test.f(0x0, 1)
 10 | \t\t\t\t\t\t2 / x;
    | \t\t\t\t\t\t^^^^^
 
-","message":"CHC: Division by zero happens here.
+",
+            "message": "CHC: Division by zero happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -22,4 +29,22 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":216,"file":"A","start":211},"type":"Warning"}],"sources":{"A":{"id":0}}}
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 216,
+                "file": "A",
+                "start": 211
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_empty_array/output.json b/test/cmdlineTests/standard_model_checker_targets_empty_array/output.json
index 94163d97d0..312af9741c 100644
--- a/test/cmdlineTests/standard_model_checker_targets_empty_array/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_empty_array/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"settings.modelChecker.targets must be a non-empty array.","message":"settings.modelChecker.targets must be a non-empty array.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.targets must be a non-empty array.",
+            "message": "settings.modelChecker.targets must be a non-empty array.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_bmc/output.json
index 59b90c8cc9..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_bmc/output.json
@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_chc/output.json
index 436942c456..b87480e74b 100644
--- a/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_out_of_bounds_chc/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"6368","formattedMessage":"Warning: CHC: Out of bounds access happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6368",
+            "formattedMessage": "Warning: CHC: Out of bounds access happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -13,7 +19,8 @@ test.f(0x0, 1)
 14 | \t\t\t\t\t\tarr[x];
    | \t\t\t\t\t\t^^^^^^
 
-","message":"CHC: Out of bounds access happens here.
+",
+            "message": "CHC: Out of bounds access happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -22,4 +29,22 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":289,"file":"A","start":283},"type":"Warning"}],"sources":{"A":{"id":0}}}
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 289,
+                "file": "A",
+                "start": 283
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json
index 51d1520e83..742f1ea754 100644
--- a/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0xb91b28779c6db8b1a6ceecabfa97788476fbb427474cd132376917103e4bc9d9":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0xb91b28779c6db8b1a6ceecabfa97788476fbb427474cd132376917103e4bc9d9": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -55,7 +60,15 @@
 (assert (= |EVALEXPR_2| (+ expr_20_0 expr_25_1)))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-"}},"errors":[{"component":"general","errorCode":"2661","formattedMessage":"Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2661",
+            "formattedMessage": "Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
  --> A:9:7:
   |
 9 | \t\t\t\t\t\tx + type(uint).max;
@@ -68,8 +81,39 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Overflow (resulting value larger than 2**256 - 1) happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Overflow (resulting value larger than 2**256 - 1) happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   <result> = 2**256
   a = 0
   x = 1
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":203,"file":"A","start":185},"type":"Warning"}],"sources":{"A":{"id":0}}}
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 203,
+                "file": "A",
+                "start": 185
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_overflow_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_overflow_chc/output.json
index 5a5410b0c6..b700a938ed 100644
--- a/test/cmdlineTests/standard_model_checker_targets_overflow_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_overflow_chc/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"4984","formattedMessage":"Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "4984",
+            "formattedMessage": "Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -13,7 +19,8 @@ test.f(0x0, 2)
 9 | \t\t\t\t\t\tx + type(uint).max;
   | \t\t\t\t\t\t^^^^^^^^^^^^^^^^^^
 
-","message":"CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+",
+            "message": "CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -22,4 +29,22 @@ x = 1
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 2)","severity":"warning","sourceLocation":{"end":203,"file":"A","start":185},"type":"Warning"}],"sources":{"A":{"id":0}}}
+test.f(0x0, 2)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 203,
+                "file": "A",
+                "start": 185
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_pop_empty_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_pop_empty_bmc/output.json
index 59b90c8cc9..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_model_checker_targets_pop_empty_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_pop_empty_bmc/output.json
@@ -1 +1,9 @@
-{"sources":{"A":{"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_pop_empty_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_pop_empty_chc/output.json
index 87edd534de..c670bb4f60 100644
--- a/test/cmdlineTests/standard_model_checker_targets_pop_empty_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_pop_empty_chc/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"2529","formattedMessage":"Warning: CHC: Empty array \"pop\" happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2529",
+            "formattedMessage": "Warning: CHC: Empty array \"pop\" happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -13,7 +19,8 @@ test.f(0x0, 1)
 13 | \t\t\t\t\t\tarr.pop();
    | \t\t\t\t\t\t^^^^^^^^^
 
-","message":"CHC: Empty array \"pop\" happens here.
+",
+            "message": "CHC: Empty array \"pop\" happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -22,4 +29,22 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":275,"file":"A","start":266},"type":"Warning"}],"sources":{"A":{"id":0}}}
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 275,
+                "file": "A",
+                "start": 266
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json
index f52b8948dd..238b46b593 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x6bfae35e234137f12dfe7bc10a8cd34cfa8f3cf1a3439e2e99418358e7bad911":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x6bfae35e234137f12dfe7bc10a8cd34cfa8f3cf1a3439e2e99418358e7bad911": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -55,7 +60,15 @@
 (assert (= |EVALEXPR_2| (- expr_17_0 1)))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-"}},"errors":[{"component":"general","errorCode":"4144","formattedMessage":"Warning: BMC: Underflow (resulting value less than 0) happens here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "4144",
+            "formattedMessage": "Warning: BMC: Underflow (resulting value less than 0) happens here.
  --> A:8:7:
   |
 8 | \t\t\t\t\t\t--x;
@@ -68,8 +81,39 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Underflow (resulting value less than 0) happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Underflow (resulting value less than 0) happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   <result> = (- 1)
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":177,"file":"A","start":174},"type":"Warning"}],"sources":{"A":{"id":0}}}
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 177,
+                "file": "A",
+                "start": 174
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_chc/output.json
index 096bb971bd..600d7fe6b8 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_chc/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"3944","formattedMessage":"Warning: CHC: Underflow (resulting value less than 0) happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "3944",
+            "formattedMessage": "Warning: CHC: Underflow (resulting value less than 0) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -13,7 +19,8 @@ test.f(0x0, 0)
 8 | \t\t\t\t\t\t--x;
   | \t\t\t\t\t\t^^^
 
-","message":"CHC: Underflow (resulting value less than 0) happens here.
+",
+            "message": "CHC: Underflow (resulting value less than 0) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -22,4 +29,22 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 0)","severity":"warning","sourceLocation":{"end":177,"file":"A","start":174},"type":"Warning"}],"sources":{"A":{"id":0}}}
+test.f(0x0, 0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 177,
+                "file": "A",
+                "start": 174
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json
index bebe82a979..e4a5bdbf42 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x67f6235b42fbb5cc636b1d18ccd5622020b45eef0c634965f9adf8b4bb923a64":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x67f6235b42fbb5cc636b1d18ccd5622020b45eef0c634965f9adf8b4bb923a64": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -53,7 +58,8 @@
 (assert (= |EVALEXPR_1| x_8_1))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-","0x6bfae35e234137f12dfe7bc10a8cd34cfa8f3cf1a3439e2e99418358e7bad911":"(set-option :produce-models true)
+",
+            "0x6bfae35e234137f12dfe7bc10a8cd34cfa8f3cf1a3439e2e99418358e7bad911": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -110,7 +116,8 @@
 (assert (= |EVALEXPR_2| (- expr_17_0 1)))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-","0xb91b28779c6db8b1a6ceecabfa97788476fbb427474cd132376917103e4bc9d9":"(set-option :produce-models true)
+",
+            "0xb91b28779c6db8b1a6ceecabfa97788476fbb427474cd132376917103e4bc9d9": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -167,7 +174,15 @@
 (assert (= |EVALEXPR_2| (+ expr_20_0 expr_25_1)))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-"}},"errors":[{"component":"general","errorCode":"4144","formattedMessage":"Warning: BMC: Underflow (resulting value less than 0) happens here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "4144",
+            "formattedMessage": "Warning: BMC: Underflow (resulting value less than 0) happens here.
  --> A:8:7:
   |
 8 | \t\t\t\t\t\t--x;
@@ -180,11 +195,37 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Underflow (resulting value less than 0) happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Underflow (resulting value less than 0) happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   <result> = (- 1)
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":177,"file":"A","start":174},"type":"Warning"},{"component":"general","errorCode":"2661","formattedMessage":"Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 177,
+                "file": "A",
+                "start": 174
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "2661",
+            "formattedMessage": "Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
  --> A:9:7:
   |
 9 | \t\t\t\t\t\tx + type(uint).max;
@@ -197,11 +238,37 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Overflow (resulting value larger than 2**256 - 1) happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Overflow (resulting value larger than 2**256 - 1) happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   <result> = 2**256
   a = 0
   x = 1
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":203,"file":"A","start":185},"type":"Warning"},{"component":"general","errorCode":"4661","formattedMessage":"Warning: BMC: Assertion violation happens here.
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 203,
+                "file": "A",
+                "start": 185
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "4661",
+            "formattedMessage": "Warning: BMC: Assertion violation happens here.
   --> A:12:7:
    |
 12 | \t\t\t\t\t\tassert(x > 0);
@@ -213,7 +280,38 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Assertion violation happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Assertion violation happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":258,"file":"A","start":245},"type":"Warning"}],"sources":{"A":{"id":0}}}
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 258,
+                "file": "A",
+                "start": 245
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_chc/output.json
index 3ea910cba0..5afeeaa940 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_chc/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"3944","formattedMessage":"Warning: CHC: Underflow (resulting value less than 0) happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "3944",
+            "formattedMessage": "Warning: CHC: Underflow (resulting value less than 0) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -13,7 +19,8 @@ test.f(0x0, 0)
 8 | \t\t\t\t\t\t--x;
   | \t\t\t\t\t\t^^^
 
-","message":"CHC: Underflow (resulting value less than 0) happens here.
+",
+            "message": "CHC: Underflow (resulting value less than 0) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -22,7 +29,20 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 0)","severity":"warning","sourceLocation":{"end":177,"file":"A","start":174},"type":"Warning"},{"component":"general","errorCode":"4984","formattedMessage":"Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+test.f(0x0, 0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 177,
+                "file": "A",
+                "start": 174
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "4984",
+            "formattedMessage": "Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -37,7 +57,8 @@ test.f(0x0, 2)
 9 | \t\t\t\t\t\tx + type(uint).max;
   | \t\t\t\t\t\t^^^^^^^^^^^^^^^^^^
 
-","message":"CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+",
+            "message": "CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -46,7 +67,20 @@ x = 1
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 2)","severity":"warning","sourceLocation":{"end":203,"file":"A","start":185},"type":"Warning"},{"component":"general","errorCode":"6328","formattedMessage":"Warning: CHC: Assertion violation happens here.
+test.f(0x0, 2)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 203,
+                "file": "A",
+                "start": 185
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -61,7 +95,8 @@ test.f(0x0, 1)
 12 | \t\t\t\t\t\tassert(x > 0);
    | \t\t\t\t\t\t^^^^^^^^^^^^^
 
-","message":"CHC: Assertion violation happens here.
+",
+            "message": "CHC: Assertion violation happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -70,4 +105,22 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 1)","severity":"warning","sourceLocation":{"end":258,"file":"A","start":245},"type":"Warning"}],"sources":{"A":{"id":0}}}
+test.f(0x0, 1)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 258,
+                "file": "A",
+                "start": 245
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json
index 954444392d..8a28f8cf35 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x6bfae35e234137f12dfe7bc10a8cd34cfa8f3cf1a3439e2e99418358e7bad911":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x6bfae35e234137f12dfe7bc10a8cd34cfa8f3cf1a3439e2e99418358e7bad911": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -55,7 +60,8 @@
 (assert (= |EVALEXPR_2| (- expr_17_0 1)))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-","0xb91b28779c6db8b1a6ceecabfa97788476fbb427474cd132376917103e4bc9d9":"(set-option :produce-models true)
+",
+            "0xb91b28779c6db8b1a6ceecabfa97788476fbb427474cd132376917103e4bc9d9": "(set-option :produce-models true)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
 (declare-fun |this_0| () Int)
@@ -112,7 +118,15 @@
 (assert (= |EVALEXPR_2| (+ expr_20_0 expr_25_1)))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-"}},"errors":[{"component":"general","errorCode":"4144","formattedMessage":"Warning: BMC: Underflow (resulting value less than 0) happens here.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "4144",
+            "formattedMessage": "Warning: BMC: Underflow (resulting value less than 0) happens here.
  --> A:8:7:
   |
 8 | \t\t\t\t\t\t--x;
@@ -125,11 +139,37 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Underflow (resulting value less than 0) happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Underflow (resulting value less than 0) happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   <result> = (- 1)
   a = 0
   x = 0
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":177,"file":"A","start":174},"type":"Warning"},{"component":"general","errorCode":"2661","formattedMessage":"Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 177,
+                "file": "A",
+                "start": 174
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "2661",
+            "formattedMessage": "Warning: BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
  --> A:9:7:
   |
 9 | \t\t\t\t\t\tx + type(uint).max;
@@ -142,8 +182,39 @@ Note: Counterexample:
 Note: Callstack:
 Note:
 
-","message":"BMC: Overflow (resulting value larger than 2**256 - 1) happens here.","secondarySourceLocations":[{"message":"Counterexample:
+",
+            "message": "BMC: Overflow (resulting value larger than 2**256 - 1) happens here.",
+            "secondarySourceLocations":
+            [
+                {
+                    "message": "Counterexample:
   <result> = 2**256
   a = 0
   x = 1
-"},{"message":"Callstack:"},{"message":""}],"severity":"warning","sourceLocation":{"end":203,"file":"A","start":185},"type":"Warning"}],"sources":{"A":{"id":0}}}
+"
+                },
+                {
+                    "message": "Callstack:"
+                },
+                {
+                    "message": ""
+                }
+            ],
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 203,
+                "file": "A",
+                "start": 185
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_chc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_chc/output.json
index 88ed4136b6..9a07b669ad 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_chc/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"3944","formattedMessage":"Warning: CHC: Underflow (resulting value less than 0) happens here.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "3944",
+            "formattedMessage": "Warning: CHC: Underflow (resulting value less than 0) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -13,7 +19,8 @@ test.f(0x0, 0)
 8 | \t\t\t\t\t\t--x;
   | \t\t\t\t\t\t^^^
 
-","message":"CHC: Underflow (resulting value less than 0) happens here.
+",
+            "message": "CHC: Underflow (resulting value less than 0) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -22,7 +29,20 @@ x = 0
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 0)","severity":"warning","sourceLocation":{"end":177,"file":"A","start":174},"type":"Warning"},{"component":"general","errorCode":"4984","formattedMessage":"Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+test.f(0x0, 0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 177,
+                "file": "A",
+                "start": 174
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "4984",
+            "formattedMessage": "Warning: CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -37,7 +57,8 @@ test.f(0x0, 2)
 9 | \t\t\t\t\t\tx + type(uint).max;
   | \t\t\t\t\t\t^^^^^^^^^^^^^^^^^^
 
-","message":"CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+",
+            "message": "CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 Counterexample:
 arr = []
 a = 0x0
@@ -46,4 +67,22 @@ x = 1
 Transaction trace:
 test.constructor()
 State: arr = []
-test.f(0x0, 2)","severity":"warning","sourceLocation":{"end":203,"file":"A","start":185},"type":"Warning"}],"sources":{"A":{"id":0}}}
+test.f(0x0, 2)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 203,
+                "file": "A",
+                "start": 185
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types/output.json b/test/cmdlineTests/standard_model_checker_targets_wrong_target_types/output.json
index 673493cc96..6e2af863ec 100644
--- a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_wrong_target_types/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Every target in settings.modelChecker.targets must be a string.","message":"Every target in settings.modelChecker.targets must be a string.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Every target in settings.modelChecker.targets must be a string.",
+            "message": "Every target in settings.modelChecker.targets must be a string.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types_2/output.json b/test/cmdlineTests/standard_model_checker_targets_wrong_target_types_2/output.json
index ee68dbef1e..c1e7759b5c 100644
--- a/test/cmdlineTests/standard_model_checker_targets_wrong_target_types_2/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_wrong_target_types_2/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"settings.modelChecker.targets must be an array.","message":"settings.modelChecker.targets must be an array.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.targets must be an array.",
+            "message": "settings.modelChecker.targets must be an array.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_targets_wrong_targets/output.json b/test/cmdlineTests/standard_model_checker_targets_wrong_targets/output.json
index eeee3fa936..d0bf7f56da 100644
--- a/test/cmdlineTests/standard_model_checker_targets_wrong_targets/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_wrong_targets/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Invalid model checker targets requested.","message":"Invalid model checker targets requested.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid model checker targets requested.",
+            "message": "Invalid model checker targets requested.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_all/output.json b/test/cmdlineTests/standard_model_checker_timeout_all/output.json
index 7f4d3ddb41..ef1a66d671 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_all/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x18c291cddb0272d6f9afaa62c0b2c2afbc1fae5b3a880c413000b0907aed4aeb":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x18c291cddb0272d6f9afaa62c0b2c2afbc1fae5b3a880c413000b0907aed4aeb": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |x_3_3| () Int)
@@ -38,7 +43,8 @@
 
 (assert (and (and (and true true) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_16_0)) (and (and (<= 0 r_div_mod_16_0) (or (= expr_18_0 0) (< r_div_mod_16_0 expr_18_0))) (and (= (+ (* d_div_mod_16_0 expr_18_0) r_div_mod_16_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))) (not expr_21_1)))
 (check-sat)
-","0x74e7fbb4ed837661c73d27b70acb3e91238303f8ec1d916f24d47bc9cbcf8710":"(set-option :produce-models true)
+",
+            "0x74e7fbb4ed837661c73d27b70acb3e91238303f8ec1d916f24d47bc9cbcf8710": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |x_3_3| () Int)
@@ -71,7 +77,8 @@
 
 (assert (and (and (and true true) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_13_1))
 (check-sat)
-","0x88bef994914e6778ed64a76b27254fc481b9a2d77f95d66ff288495bf4e55741":"(set-option :produce-models true)
+",
+            "0x88bef994914e6778ed64a76b27254fc481b9a2d77f95d66ff288495bf4e55741": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |x_3_3| () Int)
@@ -104,7 +111,8 @@
 
 (assert (and (and (and true true) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_13_1)))
 (check-sat)
-","0xc37900bf0c35dca7bc5c59eca0d169ec4baa8ac48960d828d2ffbef94b5be280":"(set-option :produce-models true)
+",
+            "0xc37900bf0c35dca7bc5c59eca0d169ec4baa8ac48960d828d2ffbef94b5be280": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |x_3_3| () Int)
@@ -151,7 +159,8 @@
 
 (assert (and (and (and true true) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_17_0)) (and (and (<= 0 r_div_mod_17_0) (or (= expr_26_0 0) (< r_div_mod_17_0 expr_26_0))) (and (= (+ (* d_div_mod_17_0 expr_26_0) r_div_mod_17_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_16_0)) (and (and (<= 0 r_div_mod_16_0) (or (= expr_18_0 0) (< r_div_mod_16_0 expr_18_0))) (and (= (+ (* d_div_mod_16_0 expr_18_0) r_div_mod_16_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))) expr_29_1))
 (check-sat)
-","0xcf75850659a91bcdeae2161dd859054b536a5b776454ab5fcbfe4b04394e82e4":"(set-option :produce-models true)
+",
+            "0xcf75850659a91bcdeae2161dd859054b536a5b776454ab5fcbfe4b04394e82e4": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |x_3_3| () Int)
@@ -191,7 +200,8 @@
 
 (assert (and (and (and true true) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_16_0)) (and (and (<= 0 r_div_mod_16_0) (or (= expr_18_0 0) (< r_div_mod_16_0 expr_18_0))) (and (= (+ (* d_div_mod_16_0 expr_18_0) r_div_mod_16_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))) expr_21_1))
 (check-sat)
-","0xe39f08760131429ca6c71cf526231ab81674474859187242afd8cec7ce0ce328":"(set-option :produce-models true)
+",
+            "0xe39f08760131429ca6c71cf526231ab81674474859187242afd8cec7ce0ce328": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |x_3_3| () Int)
@@ -263,7 +273,8 @@
 (assert (= |EVALEXPR_3| r_33_1))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| ))
-","0xf9f64bcc789d80a36748834de05ce2f0fa7a498fe6ff511d74e00b2c9ea54061":"(set-option :produce-models true)
+",
+            "0xf9f64bcc789d80a36748834de05ce2f0fa7a498fe6ff511d74e00b2c9ea54061": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |x_3_3| () Int)
@@ -310,8 +321,37 @@
 
 (assert (and (and (and true true) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_17_0)) (and (and (<= 0 r_div_mod_17_0) (or (= expr_26_0 0) (< r_div_mod_17_0 expr_26_0))) (and (= (+ (* d_div_mod_17_0 expr_26_0) r_div_mod_17_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_16_0)) (and (and (<= 0 r_div_mod_16_0) (or (= expr_18_0 0) (< r_div_mod_16_0 expr_18_0))) (and (= (+ (* d_div_mod_16_0 expr_18_0) r_div_mod_16_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))) (not expr_29_1)))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"5840","formattedMessage":"Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"},{"component":"general","errorCode":"2788","formattedMessage":"Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+",
+            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "2788",
+            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json b/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
index 6893009dc5..81f376d503 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
@@ -1,4 +1,9 @@
-{"auxiliaryInputRequested":{"smtlib2queries":{"0x18f1a56145e2b4c7e9c1ef433341d60b541a71e48c54ead52a17a93f8a053eca":"(set-option :produce-models true)
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x18f1a56145e2b4c7e9c1ef433341d60b541a71e48c54ead52a17a93f8a053eca": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -23,7 +28,8 @@
 
 (assert (and (and (and true true) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_13_1)))
 (check-sat)
-","0x1f43df4daea9eb9e59c5b2db499960a23bffb2cdac07fc883cd2c767d942105f":"(set-option :produce-models true)
+",
+            "0x1f43df4daea9eb9e59c5b2db499960a23bffb2cdac07fc883cd2c767d942105f": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -89,7 +95,8 @@
 (assert (= |EVALEXPR_4| expr_26_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-","0x2ea43ae8ad6d3cdc84a32665e0bd61d2f64aa5fa8e09c1419c53ca3f226af616":"(set-option :produce-models true)
+",
+            "0x2ea43ae8ad6d3cdc84a32665e0bd61d2f64aa5fa8e09c1419c53ca3f226af616": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -128,7 +135,8 @@
 
 (assert (and (and (and true true) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_1_0)) (and (and (<= 0 r_div_mod_1_0) (or (= expr_26_0 0) (< r_div_mod_1_0 expr_26_0))) (and (= (+ (* d_div_mod_1_0 expr_26_0) r_div_mod_1_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))) (not expr_29_1)))
 (check-sat)
-","0x5e036bb9ccee2986805fcd35aaa27c558abaea31e953b5e660af5e76e698d380":"(set-option :produce-models true)
+",
+            "0x5e036bb9ccee2986805fcd35aaa27c558abaea31e953b5e660af5e76e698d380": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -167,7 +175,8 @@
 
 (assert (and (and (and true true) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_1_0)) (and (and (<= 0 r_div_mod_1_0) (or (= expr_26_0 0) (< r_div_mod_1_0 expr_26_0))) (and (= (+ (* d_div_mod_1_0 expr_26_0) r_div_mod_1_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))) expr_29_1))
 (check-sat)
-","0x6490ffd45310ea9e88252dd18e4ee7a87801885c0d9ec688c0a04811bf4c3bd1":"(set-option :produce-models true)
+",
+            "0x6490ffd45310ea9e88252dd18e4ee7a87801885c0d9ec688c0a04811bf4c3bd1": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -233,7 +242,8 @@
 (assert (= |EVALEXPR_4| expr_18_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-","0x8b61d0b3f7435930ba41234874e4800cd8459f7bacac0b46af5bf0020e83c41a":"(set-option :produce-models true)
+",
+            "0x8b61d0b3f7435930ba41234874e4800cd8459f7bacac0b46af5bf0020e83c41a": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -297,7 +307,8 @@
 (assert (= |EVALEXPR_3| r_33_1))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| ))
-","0x90d07b7650deb5ef0f3634fa43fccdc46bb90524def99fc7787105bd332ce18c":"(set-option :produce-models true)
+",
+            "0x90d07b7650deb5ef0f3634fa43fccdc46bb90524def99fc7787105bd332ce18c": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -363,7 +374,8 @@
 (assert (= |EVALEXPR_4| expr_37_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-","0xc9acf5c2a281159171ca5133ba0856bb644c2c8afd233b6a7d618d290f4f5faa":"(set-option :produce-models true)
+",
+            "0xc9acf5c2a281159171ca5133ba0856bb644c2c8afd233b6a7d618d290f4f5faa": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -429,7 +441,8 @@
 (assert (= |EVALEXPR_4| expr_42_0))
 (check-sat)
 (get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-","0xcb840e71fb938bc7517d41d9315ff82d34fc0e15610d9d8bfa5fced2308c95f8":"(set-option :produce-models true)
+",
+            "0xcb840e71fb938bc7517d41d9315ff82d34fc0e15610d9d8bfa5fced2308c95f8": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -461,7 +474,8 @@
 
 (assert (and (and (and true true) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))) (not expr_21_1)))
 (check-sat)
-","0xe4a65aed9be739fdcb6ce76ede4dc9b65b256d38e2499b5dbf2f4e9fc1a2233f":"(set-option :produce-models true)
+",
+            "0xe4a65aed9be739fdcb6ce76ede4dc9b65b256d38e2499b5dbf2f4e9fc1a2233f": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -486,7 +500,8 @@
 
 (assert (and (and (and true true) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_13_1))
 (check-sat)
-","0xf8157c6d01d1321e17ba8e5f19f02386953f4078d481bba0a33fe50993605158":"(set-option :produce-models true)
+",
+            "0xf8157c6d01d1321e17ba8e5f19f02386953f4078d481bba0a33fe50993605158": "(set-option :produce-models true)
 (set-option :timeout 1000)
 (set-logic ALL)
 (declare-fun |error_0| () Int)
@@ -518,6 +533,27 @@
 
 (assert (and (and (and true true) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))) expr_21_1))
 (check-sat)
-"}},"errors":[{"component":"general","errorCode":"2788","formattedMessage":"Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2788",
+            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_chc/output.json b/test/cmdlineTests/standard_model_checker_timeout_chc/output.json
index 5e66cb8992..7f0e676cb8 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_chc/output.json
@@ -1,3 +1,22 @@
-{"errors":[{"component":"general","errorCode":"5840","formattedMessage":"Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
-","message":"CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.","severity":"warning","type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_wrong_key/output.json b/test/cmdlineTests/standard_model_checker_timeout_wrong_key/output.json
index a023290457..137562f419 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_wrong_key/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_wrong_key/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"atimeout\"","message":"Unknown key \"atimeout\"","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Unknown key \"atimeout\"",
+            "message": "Unknown key \"atimeout\"",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_wrong_value/output.json b/test/cmdlineTests/standard_model_checker_timeout_wrong_value/output.json
index c3a54e5149..ce630905c6 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_wrong_value/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_wrong_value/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"settings.modelChecker.timeout must be an unsigned integer.","message":"settings.modelChecker.timeout must be an unsigned integer.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.timeout must be an unsigned integer.",
+            "message": "settings.modelChecker.timeout must be an unsigned integer.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_no_append_cbor/args b/test/cmdlineTests/standard_no_append_cbor/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_no_append_cbor/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_no_append_cbor/output.json b/test/cmdlineTests/standard_no_append_cbor/output.json
index 990217c9e4..0fca3f2715 100644
--- a/test/cmdlineTests/standard_no_append_cbor/output.json
+++ b/test/cmdlineTests/standard_no_append_cbor/output.json
@@ -12,9 +12,9 @@
                         "functionDebugData": {},
                         "generatedSources": [],
                         "linkReferences": {},
-                        "object": "608080604052346013576004908160198239f35b600080fdfe600080fd",
-                        "opcodes": "PUSH1 0x80 DUP1 PUSH1 0x40 MSTORE CALLVALUE PUSH1 0x13 JUMPI PUSH1 0x4 SWAP1 DUP2 PUSH1 0x19 DUP3 CODECOPY RETURN JUMPDEST PUSH1 0x0 DUP1 REVERT INVALID PUSH1 0x0 DUP1 REVERT ",
-                        "sourceMap": "60:16:0:-:0;;;;;;;;;;;;;;;;;"
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
                     }
                 }
             }
diff --git a/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/args b/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_no_append_cbor_with_metadata_hash/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_only_ast_requested/output.json b/test/cmdlineTests/standard_only_ast_requested/output.json
index 0177dd7fc0..4caa8a7643 100644
--- a/test/cmdlineTests/standard_only_ast_requested/output.json
+++ b/test/cmdlineTests/standard_only_ast_requested/output.json
@@ -1 +1,96 @@
-{"sources":{"A":{"ast":{"absolutePath":"A","exportedSymbols":{"C":[6]},"id":7,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":6,"linearizedBaseContracts":[6],"name":"C","nameLocation":"68:1:0","nodeType":"ContractDefinition","nodes":[{"body":{"id":4,"nodeType":"Block","src":"97:2:0","statements":[]},"functionSelector":"26121ff0","id":5,"implemented":true,"kind":"function","modifiers":[],"name":"f","nameLocation":"81:1:0","nodeType":"FunctionDefinition","parameters":{"id":2,"nodeType":"ParameterList","parameters":[],"src":"82:2:0"},"returnParameters":{"id":3,"nodeType":"ParameterList","parameters":[],"src":"97:0:0"},"scope":6,"src":"72:27:0","stateMutability":"pure","virtual":false,"visibility":"public"}],"scope":7,"src":"59:42:0","usedErrors":[]}],"src":"36:65:0"},"id":0}}}
+{
+    "sources":
+    {
+        "A":
+        {
+            "ast":
+            {
+                "absolutePath": "A",
+                "exportedSymbols":
+                {
+                    "C":
+                    [
+                        6
+                    ]
+                },
+                "id": 7,
+                "license": "GPL-3.0",
+                "nodeType": "SourceUnit",
+                "nodes":
+                [
+                    {
+                        "id": 1,
+                        "literals":
+                        [
+                            "solidity",
+                            ">=",
+                            "0.0"
+                        ],
+                        "nodeType": "PragmaDirective",
+                        "src": "36:22:0"
+                    },
+                    {
+                        "abstract": false,
+                        "baseContracts": [],
+                        "canonicalName": "C",
+                        "contractDependencies": [],
+                        "contractKind": "contract",
+                        "fullyImplemented": true,
+                        "id": 6,
+                        "linearizedBaseContracts":
+                        [
+                            6
+                        ],
+                        "name": "C",
+                        "nameLocation": "68:1:0",
+                        "nodeType": "ContractDefinition",
+                        "nodes":
+                        [
+                            {
+                                "body":
+                                {
+                                    "id": 4,
+                                    "nodeType": "Block",
+                                    "src": "97:2:0",
+                                    "statements": []
+                                },
+                                "functionSelector": "26121ff0",
+                                "id": 5,
+                                "implemented": true,
+                                "kind": "function",
+                                "modifiers": [],
+                                "name": "f",
+                                "nameLocation": "81:1:0",
+                                "nodeType": "FunctionDefinition",
+                                "parameters":
+                                {
+                                    "id": 2,
+                                    "nodeType": "ParameterList",
+                                    "parameters": [],
+                                    "src": "82:2:0"
+                                },
+                                "returnParameters":
+                                {
+                                    "id": 3,
+                                    "nodeType": "ParameterList",
+                                    "parameters": [],
+                                    "src": "97:0:0"
+                                },
+                                "scope": 6,
+                                "src": "72:27:0",
+                                "stateMutability": "pure",
+                                "virtual": false,
+                                "visibility": "public"
+                            }
+                        ],
+                        "scope": 7,
+                        "src": "59:42:0",
+                        "usedErrors": []
+                    }
+                ],
+                "src": "36:65:0"
+            },
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_generatedSources/output.json b/test/cmdlineTests/standard_optimizer_generatedSources/output.json
index 9404508278..264241d036 100644
--- a/test/cmdlineTests/standard_optimizer_generatedSources/output.json
+++ b/test/cmdlineTests/standard_optimizer_generatedSources/output.json
@@ -1,4 +1,1460 @@
-{"contracts":{"a.sol":{"A":{"evm":{"bytecode":{"generatedSources":[],"object":"<BYTECODE REMOVED>"},"deployedBytecode":{"generatedSources":[{"ast":{"nodeType":"YulBlock","src":"0:1445:1","statements":[{"nodeType":"YulBlock","src":"6:3:1","statements":[]},{"body":{"nodeType":"YulBlock","src":"46:95:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"63:1:1","type":"","value":"0"},{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"70:3:1","type":"","value":"224"},{"kind":"number","nodeType":"YulLiteral","src":"75:10:1","type":"","value":"0x4e487b71"}],"functionName":{"name":"shl","nodeType":"YulIdentifier","src":"66:3:1"},"nodeType":"YulFunctionCall","src":"66:20:1"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"56:6:1"},"nodeType":"YulFunctionCall","src":"56:31:1"},"nodeType":"YulExpressionStatement","src":"56:31:1"},{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"103:1:1","type":"","value":"4"},{"kind":"number","nodeType":"YulLiteral","src":"106:4:1","type":"","value":"0x41"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"96:6:1"},"nodeType":"YulFunctionCall","src":"96:15:1"},"nodeType":"YulExpressionStatement","src":"96:15:1"},{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"127:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"130:4:1","type":"","value":"0x24"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"120:6:1"},"nodeType":"YulFunctionCall","src":"120:15:1"},"nodeType":"YulExpressionStatement","src":"120:15:1"}]},"name":"panic_error_0x41","nodeType":"YulFunctionDefinition","src":"14:127:1"},{"body":{"nodeType":"YulBlock","src":"241:1020:1","statements":[{"nodeType":"YulVariableDeclaration","src":"251:12:1","value":{"kind":"number","nodeType":"YulLiteral","src":"261:2:1","type":"","value":"32"},"variables":[{"name":"_1","nodeType":"YulTypedName","src":"255:2:1","type":""}]},{"body":{"nodeType":"YulBlock","src":"308:16:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"317:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"320:1:1","type":"","value":"0"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"310:6:1"},"nodeType":"YulFunctionCall","src":"310:12:1"},"nodeType":"YulExpressionStatement","src":"310:12:1"}]},"condition":{"arguments":[{"arguments":[{"name":"dataEnd","nodeType":"YulIdentifier","src":"283:7:1"},{"name":"headStart","nodeType":"YulIdentifier","src":"292:9:1"}],"functionName":{"name":"sub","nodeType":"YulIdentifier","src":"279:3:1"},"nodeType":"YulFunctionCall","src":"279:23:1"},{"name":"_1","nodeType":"YulIdentifier","src":"304:2:1"}],"functionName":{"name":"slt","nodeType":"YulIdentifier","src":"275:3:1"},"nodeType":"YulFunctionCall","src":"275:32:1"},"nodeType":"YulIf","src":"272:52:1"},{"nodeType":"YulVariableDeclaration","src":"333:37:1","value":{"arguments":[{"name":"headStart","nodeType":"YulIdentifier","src":"360:9:1"}],"functionName":{"name":"calldataload","nodeType":"YulIdentifier","src":"347:12:1"},"nodeType":"YulFunctionCall","src":"347:23:1"},"variables":[{"name":"offset","nodeType":"YulTypedName","src":"337:6:1","type":""}]},{"nodeType":"YulVariableDeclaration","src":"379:28:1","value":{"kind":"number","nodeType":"YulLiteral","src":"389:18:1","type":"","value":"0xffffffffffffffff"},"variables":[{"name":"_2","nodeType":"YulTypedName","src":"383:2:1","type":""}]},{"body":{"nodeType":"YulBlock","src":"434:16:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"443:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"446:1:1","type":"","value":"0"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"436:6:1"},"nodeType":"YulFunctionCall","src":"436:12:1"},"nodeType":"YulExpressionStatement","src":"436:12:1"}]},"condition":{"arguments":[{"name":"offset","nodeType":"YulIdentifier","src":"422:6:1"},{"name":"_2","nodeType":"YulIdentifier","src":"430:2:1"}],"functionName":{"name":"gt","nodeType":"YulIdentifier","src":"419:2:1"},"nodeType":"YulFunctionCall","src":"419:14:1"},"nodeType":"YulIf","src":"416:34:1"},{"nodeType":"YulVariableDeclaration","src":"459:32:1","value":{"arguments":[{"name":"headStart","nodeType":"YulIdentifier","src":"473:9:1"},{"name":"offset","nodeType":"YulIdentifier","src":"484:6:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"469:3:1"},"nodeType":"YulFunctionCall","src":"469:22:1"},"variables":[{"name":"_3","nodeType":"YulTypedName","src":"463:2:1","type":""}]},{"body":{"nodeType":"YulBlock","src":"539:16:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"548:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"551:1:1","type":"","value":"0"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"541:6:1"},"nodeType":"YulFunctionCall","src":"541:12:1"},"nodeType":"YulExpressionStatement","src":"541:12:1"}]},"condition":{"arguments":[{"arguments":[{"arguments":[{"name":"_3","nodeType":"YulIdentifier","src":"518:2:1"},{"kind":"number","nodeType":"YulLiteral","src":"522:4:1","type":"","value":"0x1f"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"514:3:1"},"nodeType":"YulFunctionCall","src":"514:13:1"},{"name":"dataEnd","nodeType":"YulIdentifier","src":"529:7:1"}],"functionName":{"name":"slt","nodeType":"YulIdentifier","src":"510:3:1"},"nodeType":"YulFunctionCall","src":"510:27:1"}],"functionName":{"name":"iszero","nodeType":"YulIdentifier","src":"503:6:1"},"nodeType":"YulFunctionCall","src":"503:35:1"},"nodeType":"YulIf","src":"500:55:1"},{"nodeType":"YulVariableDeclaration","src":"564:26:1","value":{"arguments":[{"name":"_3","nodeType":"YulIdentifier","src":"587:2:1"}],"functionName":{"name":"calldataload","nodeType":"YulIdentifier","src":"574:12:1"},"nodeType":"YulFunctionCall","src":"574:16:1"},"variables":[{"name":"_4","nodeType":"YulTypedName","src":"568:2:1","type":""}]},{"body":{"nodeType":"YulBlock","src":"613:22:1","statements":[{"expression":{"arguments":[],"functionName":{"name":"panic_error_0x41","nodeType":"YulIdentifier","src":"615:16:1"},"nodeType":"YulFunctionCall","src":"615:18:1"},"nodeType":"YulExpressionStatement","src":"615:18:1"}]},"condition":{"arguments":[{"name":"_4","nodeType":"YulIdentifier","src":"605:2:1"},{"name":"_2","nodeType":"YulIdentifier","src":"609:2:1"}],"functionName":{"name":"gt","nodeType":"YulIdentifier","src":"602:2:1"},"nodeType":"YulFunctionCall","src":"602:10:1"},"nodeType":"YulIf","src":"599:36:1"},{"nodeType":"YulVariableDeclaration","src":"644:20:1","value":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"658:1:1","type":"","value":"5"},{"name":"_4","nodeType":"YulIdentifier","src":"661:2:1"}],"functionName":{"name":"shl","nodeType":"YulIdentifier","src":"654:3:1"},"nodeType":"YulFunctionCall","src":"654:10:1"},"variables":[{"name":"_5","nodeType":"YulTypedName","src":"648:2:1","type":""}]},{"nodeType":"YulVariableDeclaration","src":"673:23:1","value":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"693:2:1","type":"","value":"64"}],"functionName":{"name":"mload","nodeType":"YulIdentifier","src":"687:5:1"},"nodeType":"YulFunctionCall","src":"687:9:1"},"variables":[{"name":"memPtr","nodeType":"YulTypedName","src":"677:6:1","type":""}]},{"nodeType":"YulVariableDeclaration","src":"705:56:1","value":{"arguments":[{"name":"memPtr","nodeType":"YulIdentifier","src":"727:6:1"},{"arguments":[{"arguments":[{"name":"_5","nodeType":"YulIdentifier","src":"743:2:1"},{"kind":"number","nodeType":"YulLiteral","src":"747:2:1","type":"","value":"63"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"739:3:1"},"nodeType":"YulFunctionCall","src":"739:11:1"},{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"756:2:1","type":"","value":"31"}],"functionName":{"name":"not","nodeType":"YulIdentifier","src":"752:3:1"},"nodeType":"YulFunctionCall","src":"752:7:1"}],"functionName":{"name":"and","nodeType":"YulIdentifier","src":"735:3:1"},"nodeType":"YulFunctionCall","src":"735:25:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"723:3:1"},"nodeType":"YulFunctionCall","src":"723:38:1"},"variables":[{"name":"newFreePtr","nodeType":"YulTypedName","src":"709:10:1","type":""}]},{"body":{"nodeType":"YulBlock","src":"820:22:1","statements":[{"expression":{"arguments":[],"functionName":{"name":"panic_error_0x41","nodeType":"YulIdentifier","src":"822:16:1"},"nodeType":"YulFunctionCall","src":"822:18:1"},"nodeType":"YulExpressionStatement","src":"822:18:1"}]},"condition":{"arguments":[{"arguments":[{"name":"newFreePtr","nodeType":"YulIdentifier","src":"779:10:1"},{"name":"_2","nodeType":"YulIdentifier","src":"791:2:1"}],"functionName":{"name":"gt","nodeType":"YulIdentifier","src":"776:2:1"},"nodeType":"YulFunctionCall","src":"776:18:1"},{"arguments":[{"name":"newFreePtr","nodeType":"YulIdentifier","src":"799:10:1"},{"name":"memPtr","nodeType":"YulIdentifier","src":"811:6:1"}],"functionName":{"name":"lt","nodeType":"YulIdentifier","src":"796:2:1"},"nodeType":"YulFunctionCall","src":"796:22:1"}],"functionName":{"name":"or","nodeType":"YulIdentifier","src":"773:2:1"},"nodeType":"YulFunctionCall","src":"773:46:1"},"nodeType":"YulIf","src":"770:72:1"},{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"858:2:1","type":"","value":"64"},{"name":"newFreePtr","nodeType":"YulIdentifier","src":"862:10:1"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"851:6:1"},"nodeType":"YulFunctionCall","src":"851:22:1"},"nodeType":"YulExpressionStatement","src":"851:22:1"},{"nodeType":"YulVariableDeclaration","src":"882:17:1","value":{"name":"memPtr","nodeType":"YulIdentifier","src":"893:6:1"},"variables":[{"name":"dst","nodeType":"YulTypedName","src":"886:3:1","type":""}]},{"expression":{"arguments":[{"name":"memPtr","nodeType":"YulIdentifier","src":"915:6:1"},{"name":"_4","nodeType":"YulIdentifier","src":"923:2:1"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"908:6:1"},"nodeType":"YulFunctionCall","src":"908:18:1"},"nodeType":"YulExpressionStatement","src":"908:18:1"},{"nodeType":"YulAssignment","src":"935:22:1","value":{"arguments":[{"name":"memPtr","nodeType":"YulIdentifier","src":"946:6:1"},{"name":"_1","nodeType":"YulIdentifier","src":"954:2:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"942:3:1"},"nodeType":"YulFunctionCall","src":"942:15:1"},"variableNames":[{"name":"dst","nodeType":"YulIdentifier","src":"935:3:1"}]},{"nodeType":"YulVariableDeclaration","src":"966:34:1","value":{"arguments":[{"arguments":[{"name":"_3","nodeType":"YulIdentifier","src":"988:2:1"},{"name":"_5","nodeType":"YulIdentifier","src":"992:2:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"984:3:1"},"nodeType":"YulFunctionCall","src":"984:11:1"},{"name":"_1","nodeType":"YulIdentifier","src":"997:2:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"980:3:1"},"nodeType":"YulFunctionCall","src":"980:20:1"},"variables":[{"name":"srcEnd","nodeType":"YulTypedName","src":"970:6:1","type":""}]},{"body":{"nodeType":"YulBlock","src":"1032:16:1","statements":[{"expression":{"arguments":[{"kind":"number","nodeType":"YulLiteral","src":"1041:1:1","type":"","value":"0"},{"kind":"number","nodeType":"YulLiteral","src":"1044:1:1","type":"","value":"0"}],"functionName":{"name":"revert","nodeType":"YulIdentifier","src":"1034:6:1"},"nodeType":"YulFunctionCall","src":"1034:12:1"},"nodeType":"YulExpressionStatement","src":"1034:12:1"}]},"condition":{"arguments":[{"name":"srcEnd","nodeType":"YulIdentifier","src":"1015:6:1"},{"name":"dataEnd","nodeType":"YulIdentifier","src":"1023:7:1"}],"functionName":{"name":"gt","nodeType":"YulIdentifier","src":"1012:2:1"},"nodeType":"YulFunctionCall","src":"1012:19:1"},"nodeType":"YulIf","src":"1009:39:1"},{"nodeType":"YulVariableDeclaration","src":"1057:22:1","value":{"arguments":[{"name":"_3","nodeType":"YulIdentifier","src":"1072:2:1"},{"name":"_1","nodeType":"YulIdentifier","src":"1076:2:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1068:3:1"},"nodeType":"YulFunctionCall","src":"1068:11:1"},"variables":[{"name":"src","nodeType":"YulTypedName","src":"1061:3:1","type":""}]},{"body":{"nodeType":"YulBlock","src":"1144:86:1","statements":[{"expression":{"arguments":[{"name":"dst","nodeType":"YulIdentifier","src":"1165:3:1"},{"arguments":[{"name":"src","nodeType":"YulIdentifier","src":"1183:3:1"}],"functionName":{"name":"calldataload","nodeType":"YulIdentifier","src":"1170:12:1"},"nodeType":"YulFunctionCall","src":"1170:17:1"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"1158:6:1"},"nodeType":"YulFunctionCall","src":"1158:30:1"},"nodeType":"YulExpressionStatement","src":"1158:30:1"},{"nodeType":"YulAssignment","src":"1201:19:1","value":{"arguments":[{"name":"dst","nodeType":"YulIdentifier","src":"1212:3:1"},{"name":"_1","nodeType":"YulIdentifier","src":"1217:2:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1208:3:1"},"nodeType":"YulFunctionCall","src":"1208:12:1"},"variableNames":[{"name":"dst","nodeType":"YulIdentifier","src":"1201:3:1"}]}]},"condition":{"arguments":[{"name":"src","nodeType":"YulIdentifier","src":"1099:3:1"},{"name":"srcEnd","nodeType":"YulIdentifier","src":"1104:6:1"}],"functionName":{"name":"lt","nodeType":"YulIdentifier","src":"1096:2:1"},"nodeType":"YulFunctionCall","src":"1096:15:1"},"nodeType":"YulForLoop","post":{"nodeType":"YulBlock","src":"1112:23:1","statements":[{"nodeType":"YulAssignment","src":"1114:19:1","value":{"arguments":[{"name":"src","nodeType":"YulIdentifier","src":"1125:3:1"},{"name":"_1","nodeType":"YulIdentifier","src":"1130:2:1"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1121:3:1"},"nodeType":"YulFunctionCall","src":"1121:12:1"},"variableNames":[{"name":"src","nodeType":"YulIdentifier","src":"1114:3:1"}]}]},"pre":{"nodeType":"YulBlock","src":"1092:3:1","statements":[]},"src":"1088:142:1"},{"nodeType":"YulAssignment","src":"1239:16:1","value":{"name":"memPtr","nodeType":"YulIdentifier","src":"1249:6:1"},"variableNames":[{"name":"value0","nodeType":"YulIdentifier","src":"1239:6:1"}]}]},"name":"abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr","nodeType":"YulFunctionDefinition","parameters":[{"name":"headStart","nodeType":"YulTypedName","src":"207:9:1","type":""},{"name":"dataEnd","nodeType":"YulTypedName","src":"218:7:1","type":""}],"returnVariables":[{"name":"value0","nodeType":"YulTypedName","src":"230:6:1","type":""}],"src":"146:1115:1"},{"body":{"nodeType":"YulBlock","src":"1367:76:1","statements":[{"nodeType":"YulAssignment","src":"1377:26:1","value":{"arguments":[{"name":"headStart","nodeType":"YulIdentifier","src":"1389:9:1"},{"kind":"number","nodeType":"YulLiteral","src":"1400:2:1","type":"","value":"32"}],"functionName":{"name":"add","nodeType":"YulIdentifier","src":"1385:3:1"},"nodeType":"YulFunctionCall","src":"1385:18:1"},"variableNames":[{"name":"tail","nodeType":"YulIdentifier","src":"1377:4:1"}]},{"expression":{"arguments":[{"name":"headStart","nodeType":"YulIdentifier","src":"1419:9:1"},{"name":"value0","nodeType":"YulIdentifier","src":"1430:6:1"}],"functionName":{"name":"mstore","nodeType":"YulIdentifier","src":"1412:6:1"},"nodeType":"YulFunctionCall","src":"1412:25:1"},"nodeType":"YulExpressionStatement","src":"1412:25:1"}]},"name":"abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed","nodeType":"YulFunctionDefinition","parameters":[{"name":"headStart","nodeType":"YulTypedName","src":"1336:9:1","type":""},{"name":"value0","nodeType":"YulTypedName","src":"1347:6:1","type":""}],"returnVariables":[{"name":"tail","nodeType":"YulTypedName","src":"1358:4:1","type":""}],"src":"1266:177:1"}]},"contents":"{
+{
+    "contracts":
+    {
+        "a.sol":
+        {
+            "A":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "generatedSources": [],
+                        "object": "<BYTECODE REMOVED>"
+                    },
+                    "deployedBytecode":
+                    {
+                        "generatedSources":
+                        [
+                            {
+                                "ast":
+                                {
+                                    "nodeType": "YulBlock",
+                                    "src": "0:1445:1",
+                                    "statements":
+                                    [
+                                        {
+                                            "nodeType": "YulBlock",
+                                            "src": "6:3:1",
+                                            "statements": []
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "46:95:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "63:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                },
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "kind": "number",
+                                                                            "nodeType": "YulLiteral",
+                                                                            "src": "70:3:1",
+                                                                            "type": "",
+                                                                            "value": "224"
+                                                                        },
+                                                                        {
+                                                                            "kind": "number",
+                                                                            "nodeType": "YulLiteral",
+                                                                            "src": "75:10:1",
+                                                                            "type": "",
+                                                                            "value": "0x4e487b71"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "shl",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "66:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "66:20:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mstore",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "56:31:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "56:31:1"
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "103:1:1",
+                                                                    "type": "",
+                                                                    "value": "4"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "106:4:1",
+                                                                    "type": "",
+                                                                    "value": "0x41"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mstore",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "96:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "96:15:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "96:15:1"
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "127:1:1",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "130:4:1",
+                                                                    "type": "",
+                                                                    "value": "0x24"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "revert",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "120:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "120:15:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "120:15:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "panic_error_0x41",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "src": "14:127:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "241:1020:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "251:12:1",
+                                                        "value":
+                                                        {
+                                                            "kind": "number",
+                                                            "nodeType": "YulLiteral",
+                                                            "src": "261:2:1",
+                                                            "type": "",
+                                                            "value": "32"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "_1",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "255:2:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "308:16:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "317:1:1",
+                                                                                "type": "",
+                                                                                "value": "0"
+                                                                            },
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "320:1:1",
+                                                                                "type": "",
+                                                                                "value": "0"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "revert",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "310:6:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "310:12:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "310:12:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "dataEnd",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "283:7:1"
+                                                                        },
+                                                                        {
+                                                                            "name": "headStart",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "292:9:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "sub",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "279:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "279:23:1"
+                                                                },
+                                                                {
+                                                                    "name": "_1",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "304:2:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "slt",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "275:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "275:32:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "272:52:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "333:37:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "headStart",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "360:9:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "calldataload",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "347:12:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "347:23:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "offset",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "337:6:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "379:28:1",
+                                                        "value":
+                                                        {
+                                                            "kind": "number",
+                                                            "nodeType": "YulLiteral",
+                                                            "src": "389:18:1",
+                                                            "type": "",
+                                                            "value": "0xffffffffffffffff"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "_2",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "383:2:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "434:16:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "443:1:1",
+                                                                                "type": "",
+                                                                                "value": "0"
+                                                                            },
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "446:1:1",
+                                                                                "type": "",
+                                                                                "value": "0"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "revert",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "436:6:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "436:12:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "436:12:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "offset",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "422:6:1"
+                                                                },
+                                                                {
+                                                                    "name": "_2",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "430:2:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "gt",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "419:2:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "419:14:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "416:34:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "459:32:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "headStart",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "473:9:1"
+                                                                },
+                                                                {
+                                                                    "name": "offset",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "484:6:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "469:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "469:22:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "_3",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "463:2:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "539:16:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "548:1:1",
+                                                                                "type": "",
+                                                                                "value": "0"
+                                                                            },
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "551:1:1",
+                                                                                "type": "",
+                                                                                "value": "0"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "revert",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "541:6:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "541:12:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "541:12:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "arguments":
+                                                                            [
+                                                                                {
+                                                                                    "name": "_3",
+                                                                                    "nodeType": "YulIdentifier",
+                                                                                    "src": "518:2:1"
+                                                                                },
+                                                                                {
+                                                                                    "kind": "number",
+                                                                                    "nodeType": "YulLiteral",
+                                                                                    "src": "522:4:1",
+                                                                                    "type": "",
+                                                                                    "value": "0x1f"
+                                                                                }
+                                                                            ],
+                                                                            "functionName":
+                                                                            {
+                                                                                "name": "add",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "514:3:1"
+                                                                            },
+                                                                            "nodeType": "YulFunctionCall",
+                                                                            "src": "514:13:1"
+                                                                        },
+                                                                        {
+                                                                            "name": "dataEnd",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "529:7:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "slt",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "510:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "510:27:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "iszero",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "503:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "503:35:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "500:55:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "564:26:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "_3",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "587:2:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "calldataload",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "574:12:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "574:16:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "_4",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "568:2:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "613:22:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments": [],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "panic_error_0x41",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "615:16:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "615:18:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "615:18:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "_4",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "605:2:1"
+                                                                },
+                                                                {
+                                                                    "name": "_2",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "609:2:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "gt",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "602:2:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "602:10:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "599:36:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "644:20:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "658:1:1",
+                                                                    "type": "",
+                                                                    "value": "5"
+                                                                },
+                                                                {
+                                                                    "name": "_4",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "661:2:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "shl",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "654:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "654:10:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "_5",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "648:2:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "673:23:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "693:2:1",
+                                                                    "type": "",
+                                                                    "value": "64"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mload",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "687:5:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "687:9:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "memPtr",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "677:6:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "705:56:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "memPtr",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "727:6:1"
+                                                                },
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "arguments":
+                                                                            [
+                                                                                {
+                                                                                    "name": "_5",
+                                                                                    "nodeType": "YulIdentifier",
+                                                                                    "src": "743:2:1"
+                                                                                },
+                                                                                {
+                                                                                    "kind": "number",
+                                                                                    "nodeType": "YulLiteral",
+                                                                                    "src": "747:2:1",
+                                                                                    "type": "",
+                                                                                    "value": "63"
+                                                                                }
+                                                                            ],
+                                                                            "functionName":
+                                                                            {
+                                                                                "name": "add",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "739:3:1"
+                                                                            },
+                                                                            "nodeType": "YulFunctionCall",
+                                                                            "src": "739:11:1"
+                                                                        },
+                                                                        {
+                                                                            "arguments":
+                                                                            [
+                                                                                {
+                                                                                    "kind": "number",
+                                                                                    "nodeType": "YulLiteral",
+                                                                                    "src": "756:2:1",
+                                                                                    "type": "",
+                                                                                    "value": "31"
+                                                                                }
+                                                                            ],
+                                                                            "functionName":
+                                                                            {
+                                                                                "name": "not",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "752:3:1"
+                                                                            },
+                                                                            "nodeType": "YulFunctionCall",
+                                                                            "src": "752:7:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "and",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "735:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "735:25:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "723:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "723:38:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "newFreePtr",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "709:10:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "820:22:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments": [],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "panic_error_0x41",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "822:16:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "822:18:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "822:18:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "newFreePtr",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "779:10:1"
+                                                                        },
+                                                                        {
+                                                                            "name": "_2",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "791:2:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "gt",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "776:2:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "776:18:1"
+                                                                },
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "newFreePtr",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "799:10:1"
+                                                                        },
+                                                                        {
+                                                                            "name": "memPtr",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "811:6:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "lt",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "796:2:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "796:22:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "or",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "773:2:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "773:46:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "770:72:1"
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "858:2:1",
+                                                                    "type": "",
+                                                                    "value": "64"
+                                                                },
+                                                                {
+                                                                    "name": "newFreePtr",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "862:10:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mstore",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "851:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "851:22:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "851:22:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "882:17:1",
+                                                        "value":
+                                                        {
+                                                            "name": "memPtr",
+                                                            "nodeType": "YulIdentifier",
+                                                            "src": "893:6:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "dst",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "886:3:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "memPtr",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "915:6:1"
+                                                                },
+                                                                {
+                                                                    "name": "_4",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "923:2:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mstore",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "908:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "908:18:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "908:18:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "935:22:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "memPtr",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "946:6:1"
+                                                                },
+                                                                {
+                                                                    "name": "_1",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "954:2:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "942:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "942:15:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "dst",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "935:3:1"
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "966:34:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "arguments":
+                                                                    [
+                                                                        {
+                                                                            "name": "_3",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "988:2:1"
+                                                                        },
+                                                                        {
+                                                                            "name": "_5",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "992:2:1"
+                                                                        }
+                                                                    ],
+                                                                    "functionName":
+                                                                    {
+                                                                        "name": "add",
+                                                                        "nodeType": "YulIdentifier",
+                                                                        "src": "984:3:1"
+                                                                    },
+                                                                    "nodeType": "YulFunctionCall",
+                                                                    "src": "984:11:1"
+                                                                },
+                                                                {
+                                                                    "name": "_1",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "997:2:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "980:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "980:20:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "srcEnd",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "970:6:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "1032:16:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "1041:1:1",
+                                                                                "type": "",
+                                                                                "value": "0"
+                                                                            },
+                                                                            {
+                                                                                "kind": "number",
+                                                                                "nodeType": "YulLiteral",
+                                                                                "src": "1044:1:1",
+                                                                                "type": "",
+                                                                                "value": "0"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "revert",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1034:6:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "1034:12:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "1034:12:1"
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "srcEnd",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1015:6:1"
+                                                                },
+                                                                {
+                                                                    "name": "dataEnd",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1023:7:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "gt",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1012:2:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1012:19:1"
+                                                        },
+                                                        "nodeType": "YulIf",
+                                                        "src": "1009:39:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulVariableDeclaration",
+                                                        "src": "1057:22:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "_3",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1072:2:1"
+                                                                },
+                                                                {
+                                                                    "name": "_1",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1076:2:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1068:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1068:11:1"
+                                                        },
+                                                        "variables":
+                                                        [
+                                                            {
+                                                                "name": "src",
+                                                                "nodeType": "YulTypedName",
+                                                                "src": "1061:3:1",
+                                                                "type": ""
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "body":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "1144:86:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "expression":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "name": "dst",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "1165:3:1"
+                                                                            },
+                                                                            {
+                                                                                "arguments":
+                                                                                [
+                                                                                    {
+                                                                                        "name": "src",
+                                                                                        "nodeType": "YulIdentifier",
+                                                                                        "src": "1183:3:1"
+                                                                                    }
+                                                                                ],
+                                                                                "functionName":
+                                                                                {
+                                                                                    "name": "calldataload",
+                                                                                    "nodeType": "YulIdentifier",
+                                                                                    "src": "1170:12:1"
+                                                                                },
+                                                                                "nodeType": "YulFunctionCall",
+                                                                                "src": "1170:17:1"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "mstore",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1158:6:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "1158:30:1"
+                                                                    },
+                                                                    "nodeType": "YulExpressionStatement",
+                                                                    "src": "1158:30:1"
+                                                                },
+                                                                {
+                                                                    "nodeType": "YulAssignment",
+                                                                    "src": "1201:19:1",
+                                                                    "value":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "name": "dst",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "1212:3:1"
+                                                                            },
+                                                                            {
+                                                                                "name": "_1",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "1217:2:1"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "add",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1208:3:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "1208:12:1"
+                                                                    },
+                                                                    "variableNames":
+                                                                    [
+                                                                        {
+                                                                            "name": "dst",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1201:3:1"
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ]
+                                                        },
+                                                        "condition":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "src",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1099:3:1"
+                                                                },
+                                                                {
+                                                                    "name": "srcEnd",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1104:6:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "lt",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1096:2:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1096:15:1"
+                                                        },
+                                                        "nodeType": "YulForLoop",
+                                                        "post":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "1112:23:1",
+                                                            "statements":
+                                                            [
+                                                                {
+                                                                    "nodeType": "YulAssignment",
+                                                                    "src": "1114:19:1",
+                                                                    "value":
+                                                                    {
+                                                                        "arguments":
+                                                                        [
+                                                                            {
+                                                                                "name": "src",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "1125:3:1"
+                                                                            },
+                                                                            {
+                                                                                "name": "_1",
+                                                                                "nodeType": "YulIdentifier",
+                                                                                "src": "1130:2:1"
+                                                                            }
+                                                                        ],
+                                                                        "functionName":
+                                                                        {
+                                                                            "name": "add",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1121:3:1"
+                                                                        },
+                                                                        "nodeType": "YulFunctionCall",
+                                                                        "src": "1121:12:1"
+                                                                    },
+                                                                    "variableNames":
+                                                                    [
+                                                                        {
+                                                                            "name": "src",
+                                                                            "nodeType": "YulIdentifier",
+                                                                            "src": "1114:3:1"
+                                                                        }
+                                                                    ]
+                                                                }
+                                                            ]
+                                                        },
+                                                        "pre":
+                                                        {
+                                                            "nodeType": "YulBlock",
+                                                            "src": "1092:3:1",
+                                                            "statements": []
+                                                        },
+                                                        "src": "1088:142:1"
+                                                    },
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "1239:16:1",
+                                                        "value":
+                                                        {
+                                                            "name": "memPtr",
+                                                            "nodeType": "YulIdentifier",
+                                                            "src": "1249:6:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "value0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1239:6:1"
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "headStart",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "207:9:1",
+                                                    "type": ""
+                                                },
+                                                {
+                                                    "name": "dataEnd",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "218:7:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "value0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "230:6:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "146:1115:1"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nodeType": "YulBlock",
+                                                "src": "1367:76:1",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "1377:26:1",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "headStart",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1389:9:1"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "1400:2:1",
+                                                                    "type": "",
+                                                                    "value": "32"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "add",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1385:3:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1385:18:1"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "tail",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1377:4:1"
+                                                            }
+                                                        ]
+                                                    },
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "name": "headStart",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1419:9:1"
+                                                                },
+                                                                {
+                                                                    "name": "value0",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "1430:6:1"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mstore",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "1412:6:1"
+                                                            },
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "1412:25:1"
+                                                        },
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "1412:25:1"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "headStart",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1336:9:1",
+                                                    "type": ""
+                                                },
+                                                {
+                                                    "name": "value0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1347:6:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "tail",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "1358:4:1",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "1266:177:1"
+                                        }
+                                    ]
+                                },
+                                "contents": "{
     { }
     function panic_error_0x41()
     {
@@ -40,4 +1496,22 @@
         tail := add(headStart, 32)
         mstore(headStart, value0)
     }
-}","id":1,"language":"Yul","name":"#utility.yul"}]}}}}},"sources":{"a.sol":{"id":0}}}
+}",
+                                "id": 1,
+                                "language": "Yul",
+                                "name": "#utility.yul"
+                            }
+                        ]
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "a.sol":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_invalid_detail_type/args b/test/cmdlineTests/standard_optimizer_invalid_detail_type/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_invalid_detail_type/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_invalid_details/args b/test/cmdlineTests/standard_optimizer_invalid_details/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_invalid_details/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_no_yul/args b/test/cmdlineTests/standard_optimizer_no_yul/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_no_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yul/args b/test/cmdlineTests/standard_optimizer_yul/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails/args b/test/cmdlineTests/standard_optimizer_yulDetails/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_no_object/args b/test/cmdlineTests/standard_optimizer_yulDetails_no_object/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_no_object/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_abbreviation/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_invalid_nested_delimiter/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_mutliple_delimiters/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nested_brackets/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_nesting_too_deep/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_type/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_closing_bracket/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_unbalanced_opening_bracket/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/args b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/args b/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_parsing_import_absolute_paths/args b/test/cmdlineTests/standard_parsing_import_absolute_paths/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_parsing_import_absolute_paths/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_secondary_source_location/output.json b/test/cmdlineTests/standard_secondary_source_location/output.json
index 9d09bc1947..6423769aab 100644
--- a/test/cmdlineTests/standard_secondary_source_location/output.json
+++ b/test/cmdlineTests/standard_secondary_source_location/output.json
@@ -1,4 +1,10 @@
-{"errors":[{"component":"general","errorCode":"3364","formattedMessage":"DeclarationError: Base constructor arguments given twice.
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "3364",
+            "formattedMessage": "DeclarationError: Base constructor arguments given twice.
  --> A:2:105:
   |
 2 | pragma solidity >=0.0; contract A { constructor(uint) {} } contract B is A(2) { } contract C is A(3) {} contract D is B, C {}
@@ -14,4 +20,32 @@ Note: Second constructor call is here:
 2 | pragma solidity >=0.0; contract A { constructor(uint) {} } contract B is A(2) { } contract C is A(3) {} contract D is B, C {}
   |                                                                                                 ^^^^
 
-","message":"Base constructor arguments given twice.","secondarySourceLocations":[{"end":112,"file":"A","message":"First constructor call is here:","start":108},{"end":135,"file":"A","message":"Second constructor call is here:","start":131}],"severity":"error","sourceLocation":{"end":160,"file":"A","start":139},"type":"DeclarationError"}],"sources":{}}
+",
+            "message": "Base constructor arguments given twice.",
+            "secondarySourceLocations":
+            [
+                {
+                    "end": 112,
+                    "file": "A",
+                    "message": "First constructor call is here:",
+                    "start": 108
+                },
+                {
+                    "end": 135,
+                    "file": "A",
+                    "message": "Second constructor call is here:",
+                    "start": 131
+                }
+            ],
+            "severity": "error",
+            "sourceLocation":
+            {
+                "end": 160,
+                "file": "A",
+                "start": 139
+            },
+            "type": "DeclarationError"
+        }
+    ],
+    "sources": {}
+}
diff --git a/test/cmdlineTests/standard_urls_existing_and_missing/args b/test/cmdlineTests/standard_urls_existing_and_missing/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_urls_existing_and_missing/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_urls_missing/args b/test/cmdlineTests/standard_urls_missing/args
deleted file mode 100644
index a905f1fe6a..0000000000
--- a/test/cmdlineTests/standard_urls_missing/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json --json-indent 4
diff --git a/test/cmdlineTests/standard_viair_requested/output.json b/test/cmdlineTests/standard_viair_requested/output.json
index f08a5d3027..3e459c56f9 100644
--- a/test/cmdlineTests/standard_viair_requested/output.json
+++ b/test/cmdlineTests/standard_viair_requested/output.json
@@ -1,4 +1,23 @@
-{"contracts":{"A":{"C":{"evm":{"bytecode":{"generatedSources":[],"object":"<BYTECODE REMOVED>"},"deployedBytecode":{"object":"<BYTECODE REMOVED>"}},"ir":"
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "generatedSources": [],
+                        "object": "<BYTECODE REMOVED>"
+                    },
+                    "deployedBytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                },
+                "ir": "
 /// @use-src 0:\"A\"
 object \"C_3\" {
     code {
@@ -60,7 +79,23 @@ object \"C_3\" {
 
 }
 
-"},"D":{"evm":{"bytecode":{"generatedSources":[],"object":"<BYTECODE REMOVED>"},"deployedBytecode":{"object":"<BYTECODE REMOVED>"}},"ir":"
+"
+            },
+            "D":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "generatedSources": [],
+                        "object": "<BYTECODE REMOVED>"
+                    },
+                    "deployedBytecode":
+                    {
+                        "object": "<BYTECODE REMOVED>"
+                    }
+                },
+                "ir": "
 /// @use-src 0:\"A\"
 object \"D_16\" {
     code {
@@ -260,10 +295,38 @@ object \"D_16\" {
 
 }
 
-"}}},"errors":[{"component":"general","errorCode":"2072","formattedMessage":"Warning: Unused local variable.
+"
+            }
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2072",
+            "formattedMessage": "Warning: Unused local variable.
  --> A:2:93:
   |
 2 | pragma solidity >=0.0; pragma abicoder v2; contract C {} contract D { function f() public { C c = new C(); } }
   |                                                                                             ^^^
 
-","message":"Unused local variable.","severity":"warning","sourceLocation":{"end":131,"file":"A","start":128},"type":"Warning"}],"sources":{"A":{"id":0}}}
+",
+            "message": "Unused local variable.",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 131,
+                "file": "A",
+                "start": 128
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json b/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
index 077ac47ec7..1e846d19c7 100644
--- a/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
+++ b/test/cmdlineTests/standard_wrong_key_auxiliary_input/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Unknown key \"key1\"",
+            "message": "Unknown key \"key1\"",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_key_metadata/output.json b/test/cmdlineTests/standard_wrong_key_metadata/output.json
index 077ac47ec7..1e846d19c7 100644
--- a/test/cmdlineTests/standard_wrong_key_metadata/output.json
+++ b/test/cmdlineTests/standard_wrong_key_metadata/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Unknown key \"key1\"",
+            "message": "Unknown key \"key1\"",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_key_optimizer/output.json b/test/cmdlineTests/standard_wrong_key_optimizer/output.json
index 077ac47ec7..1e846d19c7 100644
--- a/test/cmdlineTests/standard_wrong_key_optimizer/output.json
+++ b/test/cmdlineTests/standard_wrong_key_optimizer/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Unknown key \"key1\"",
+            "message": "Unknown key \"key1\"",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_key_root/output.json b/test/cmdlineTests/standard_wrong_key_root/output.json
index 077ac47ec7..1e846d19c7 100644
--- a/test/cmdlineTests/standard_wrong_key_root/output.json
+++ b/test/cmdlineTests/standard_wrong_key_root/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Unknown key \"key1\"",
+            "message": "Unknown key \"key1\"",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_key_settings/output.json b/test/cmdlineTests/standard_wrong_key_settings/output.json
index 077ac47ec7..1e846d19c7 100644
--- a/test/cmdlineTests/standard_wrong_key_settings/output.json
+++ b/test/cmdlineTests/standard_wrong_key_settings/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Unknown key \"key1\"",
+            "message": "Unknown key \"key1\"",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_key_source/output.json b/test/cmdlineTests/standard_wrong_key_source/output.json
index 077ac47ec7..1e846d19c7 100644
--- a/test/cmdlineTests/standard_wrong_key_source/output.json
+++ b/test/cmdlineTests/standard_wrong_key_source/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Unknown key \"key1\"","message":"Unknown key \"key1\"","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Unknown key \"key1\"",
+            "message": "Unknown key \"key1\"",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
index fe33dcd06c..877ecad4dc 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"auxiliaryInput\" must be an object","message":"\"auxiliaryInput\" must be an object","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"auxiliaryInput\" must be an object",
+            "message": "\"auxiliaryInput\" must be an object",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
index 3efaea208d..c28238145e 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"auxiliaryInput.smtlib2responses\" must be an object.","message":"\"auxiliaryInput.smtlib2responses\" must be an object.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"auxiliaryInput.smtlib2responses\" must be an object.",
+            "message": "\"auxiliaryInput.smtlib2responses\" must be an object.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json
index a05176be99..6676998c6c 100644
--- a/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json
+++ b/test/cmdlineTests/standard_wrong_type_auxiliary_input_smtlib2responses_member/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"smtlib2Responses.abc\" must be a string.","message":"\"smtlib2Responses.abc\" must be a string.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"smtlib2Responses.abc\" must be a string.",
+            "message": "\"smtlib2Responses.abc\" must be a string.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_metadata/output.json b/test/cmdlineTests/standard_wrong_type_metadata/output.json
index 7b997cec17..df9f8cae37 100644
--- a/test/cmdlineTests/standard_wrong_type_metadata/output.json
+++ b/test/cmdlineTests/standard_wrong_type_metadata/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.metadata\" must be an object","message":"\"settings.metadata\" must be an object","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.metadata\" must be an object",
+            "message": "\"settings.metadata\" must be an object",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_optimizer/output.json b/test/cmdlineTests/standard_wrong_type_optimizer/output.json
index d43b647086..d7ce30326b 100644
--- a/test/cmdlineTests/standard_wrong_type_optimizer/output.json
+++ b/test/cmdlineTests/standard_wrong_type_optimizer/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.optimizer\" must be an object","message":"\"settings.optimizer\" must be an object","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.optimizer\" must be an object",
+            "message": "\"settings.optimizer\" must be an object",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection/output.json b/test/cmdlineTests/standard_wrong_type_output_selection/output.json
index 39e748826a..d7d8f563fd 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection/output.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection\" must be an object","message":"\"settings.outputSelection\" must be an object","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.outputSelection\" must be an object",
+            "message": "\"settings.outputSelection\" must be an object",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json b/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
index a4ba320ee6..5a35419ef9 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_contract/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection.fileA.A\" must be a string array","message":"\"settings.outputSelection.fileA.A\" must be a string array","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.outputSelection.fileA.A\" must be a string array",
+            "message": "\"settings.outputSelection.fileA.A\" must be a string array",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json b/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
index 8874e63688..888efc75b0 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_file/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection.fileA\" must be an object","message":"\"settings.outputSelection.fileA\" must be an object","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.outputSelection.fileA\" must be an object",
+            "message": "\"settings.outputSelection.fileA\" must be an object",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json b/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
index a4ba320ee6..5a35419ef9 100644
--- a/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
+++ b/test/cmdlineTests/standard_wrong_type_output_selection_output/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.outputSelection.fileA.A\" must be a string array","message":"\"settings.outputSelection.fileA.A\" must be a string array","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.outputSelection.fileA.A\" must be a string array",
+            "message": "\"settings.outputSelection.fileA.A\" must be a string array",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings/output.json b/test/cmdlineTests/standard_wrong_type_remappings/output.json
index b5e4ea5cb9..b94919077e 100644
--- a/test/cmdlineTests/standard_wrong_type_remappings/output.json
+++ b/test/cmdlineTests/standard_wrong_type_remappings/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.remappings\" must be an array of strings.","message":"\"settings.remappings\" must be an array of strings.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.remappings\" must be an array of strings.",
+            "message": "\"settings.remappings\" must be an array of strings.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json b/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
index 0fc71ded4f..d083c85be3 100644
--- a/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
+++ b/test/cmdlineTests/standard_wrong_type_remappings_entry/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.remappings\" must be an array of strings","message":"\"settings.remappings\" must be an array of strings","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.remappings\" must be an array of strings",
+            "message": "\"settings.remappings\" must be an array of strings",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_root/output.json b/test/cmdlineTests/standard_wrong_type_root/output.json
index 15c12e7787..da8fefdf59 100644
--- a/test/cmdlineTests/standard_wrong_type_root/output.json
+++ b/test/cmdlineTests/standard_wrong_type_root/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Input is not a JSON object.","message":"Input is not a JSON object.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Input is not a JSON object.",
+            "message": "Input is not a JSON object.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_settings/output.json b/test/cmdlineTests/standard_wrong_type_settings/output.json
index c78c6086d4..a25071c858 100644
--- a/test/cmdlineTests/standard_wrong_type_settings/output.json
+++ b/test/cmdlineTests/standard_wrong_type_settings/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings\" must be an object","message":"\"settings\" must be an object","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings\" must be an object",
+            "message": "\"settings\" must be an object",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_source/output.json b/test/cmdlineTests/standard_wrong_type_source/output.json
index 98fe32fd94..98496c6433 100644
--- a/test/cmdlineTests/standard_wrong_type_source/output.json
+++ b/test/cmdlineTests/standard_wrong_type_source/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"sources.A\" must be an object","message":"\"sources.A\" must be an object","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"sources.A\" must be an object",
+            "message": "\"sources.A\" must be an object",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_sources/output.json b/test/cmdlineTests/standard_wrong_type_sources/output.json
index ac6c613f54..3f5f51fceb 100644
--- a/test/cmdlineTests/standard_wrong_type_sources/output.json
+++ b/test/cmdlineTests/standard_wrong_type_sources/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"sources\" is not a JSON object.","message":"\"sources\" is not a JSON object.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"sources\" is not a JSON object.",
+            "message": "\"sources\" is not a JSON object.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json b/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json
index 47eb32ec45..7135c98562 100644
--- a/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json
+++ b/test/cmdlineTests/standard_wrong_type_useLiteralContent/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"\"settings.metadata.useLiteralContent\" must be Boolean","message":"\"settings.metadata.useLiteralContent\" must be Boolean","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "\"settings.metadata.useLiteralContent\" must be Boolean",
+            "message": "\"settings.metadata.useLiteralContent\" must be Boolean",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_yul/output.json b/test/cmdlineTests/standard_yul/output.json
index 63da252cd2..33d5fc0bd3 100644
--- a/test/cmdlineTests/standard_yul/output.json
+++ b/test/cmdlineTests/standard_yul/output.json
@@ -1,4 +1,13 @@
-{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":17:18   */
+{
+    "contracts":
+    {
+        "A":
+        {
+            "object":
+            {
+                "evm":
+                {
+                    "assembly": "    /* \"A\":17:18   */
   0x00
     /* \"A\":11:19   */
   mload
@@ -14,16 +23,32 @@
   sstore
     /* \"A\":0:42   */
   pop
-","bytecode":{"functionDebugData":{},"generatedSources":[],"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"}},"ir":"object \"object\" {
+",
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    }
+                },
+                "ir": "object \"object\" {
     code {
         let x := mload(0)
         sstore(add(x, 0), 0)
     }
 }
-","irOptimized":"object \"object\" {
+",
+                "irOptimized": "object \"object\" {
     code {
         let x := mload(0)
         sstore(add(x, 0), 0)
     }
 }
-"}}},}
+"
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_all/args b/test/cmdlineTests/standard_yul_debug_info_print_all/args
index 24d48faf2a..18532c5a6d 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/args
+++ b/test/cmdlineTests/standard_yul_debug_info_print_all/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --allow-paths .
+--allow-paths .
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json b/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
index 70122b9a7c..78f14c08da 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
@@ -22,5 +22,5 @@ tag_3:
                 }
             }
         }
-    },
     }
+}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_location_only/args b/test/cmdlineTests/standard_yul_debug_info_print_location_only/args
index 24d48faf2a..18532c5a6d 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_location_only/args
+++ b/test/cmdlineTests/standard_yul_debug_info_print_location_only/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --allow-paths .
+--allow-paths .
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json b/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
index e7b1a69436..526a6a5c63 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
@@ -22,5 +22,5 @@ tag_3:
                 }
             }
         }
-    },
     }
+}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_none/args b/test/cmdlineTests/standard_yul_debug_info_print_none/args
index 24d48faf2a..18532c5a6d 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/args
+++ b/test/cmdlineTests/standard_yul_debug_info_print_none/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --allow-paths .
+--allow-paths .
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json b/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
index b8b5ff9130..f5b5c63644 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
@@ -20,5 +20,5 @@ tag_3:
                 }
             }
         }
-    },
     }
+}
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/args b/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/args
index 24d48faf2a..18532c5a6d 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/args
+++ b/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --allow-paths .
+--allow-paths .
diff --git a/test/cmdlineTests/standard_yul_embedded_object_name/output.json b/test/cmdlineTests/standard_yul_embedded_object_name/output.json
index 0967ef424b..2c63c08510 100644
--- a/test/cmdlineTests/standard_yul_embedded_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_embedded_object_name/output.json
@@ -1 +1,2 @@
-{}
+{
+}
diff --git a/test/cmdlineTests/standard_yul_immutable_references/args b/test/cmdlineTests/standard_yul_immutable_references/args
deleted file mode 100644
index d13a8ac44a..0000000000
--- a/test/cmdlineTests/standard_yul_immutable_references/args
+++ /dev/null
@@ -1 +0,0 @@
---pretty-json
diff --git a/test/cmdlineTests/standard_yul_immutable_references/output.json b/test/cmdlineTests/standard_yul_immutable_references/output.json
index fe9bd66a65..1f75e8ad20 100644
--- a/test/cmdlineTests/standard_yul_immutable_references/output.json
+++ b/test/cmdlineTests/standard_yul_immutable_references/output.json
@@ -1,42 +1,42 @@
 {
-  "contracts":
-  {
-    "A":
+    "contracts":
     {
-      "YulTest":
-      {
-        "evm":
+        "A":
         {
-          "bytecode":
-          {
-            "functionDebugData": {},
-            "generatedSources": [],
-            "linkReferences": {},
-            "object": "60298060156000396001600060010152806000f3fe7f000000000000000000000000000000000000000000000000000000000000000060005260206000f3",
-            "opcodes": "PUSH1 0x29 DUP1 PUSH1 0x15 PUSH1 0x0 CODECOPY PUSH1 0x1 PUSH1 0x0 PUSH1 0x1 ADD MSTORE DUP1 PUSH1 0x0 RETURN INVALID PUSH32 0x0 PUSH1 0x0 MSTORE PUSH1 0x20 PUSH1 0x0 RETURN ",
-            "sourceMap": "42:19:0:-:0;100:4;77:21;74:1;65:40;133:1;122;109:26;;;149:4;146:1;139:15"
-          },
-          "deployedBytecode":
-          {
-            "functionDebugData": {},
-            "generatedSources": [],
-            "immutableReferences":
+            "YulTest":
             {
-              "test":
-              [
+                "evm":
                 {
-                  "length": 32,
-                  "start": 1
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    },
+                    "deployedBytecode":
+                    {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "immutableReferences":
+                        {
+                            "test":
+                            [
+                                {
+                                    "length": 32,
+                                    "start": 1
+                                }
+                            ]
+                        },
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    }
                 }
-              ]
-            },
-            "linkReferences": {},
-            "object": "7f000000000000000000000000000000000000000000000000000000000000000060005260206000f3",
-            "opcodes": "PUSH32 0x0 PUSH1 0x0 MSTORE PUSH1 0x20 PUSH1 0x0 RETURN ",
-            "sourceMap": "203:21:0:-:0;200:1;193:32;241:4;238:1;231:15"
-          }
+            }
         }
-      }
     }
-  },
-  }
+}
diff --git a/test/cmdlineTests/standard_yul_invalid_object_name/output.json b/test/cmdlineTests/standard_yul_invalid_object_name/output.json
index 0967ef424b..2c63c08510 100644
--- a/test/cmdlineTests/standard_yul_invalid_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_invalid_object_name/output.json
@@ -1 +1,2 @@
-{}
+{
+}
diff --git a/test/cmdlineTests/standard_yul_multiple_files/output.json b/test/cmdlineTests/standard_yul_multiple_files/output.json
index 2f2da9310d..cdef28c267 100644
--- a/test/cmdlineTests/standard_yul_multiple_files/output.json
+++ b/test/cmdlineTests/standard_yul_multiple_files/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Yul mode only supports exactly one input file.","message":"Yul mode only supports exactly one input file.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Yul mode only supports exactly one input file.",
+            "message": "Yul mode only supports exactly one input file.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_yul_multiple_files_selected/output.json b/test/cmdlineTests/standard_yul_multiple_files_selected/output.json
index 2f2da9310d..cdef28c267 100644
--- a/test/cmdlineTests/standard_yul_multiple_files_selected/output.json
+++ b/test/cmdlineTests/standard_yul_multiple_files_selected/output.json
@@ -1 +1,12 @@
-{"errors":[{"component":"general","formattedMessage":"Yul mode only supports exactly one input file.","message":"Yul mode only supports exactly one input file.","severity":"error","type":"JSONError"}]}
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Yul mode only supports exactly one input file.",
+            "message": "Yul mode only supports exactly one input file.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_yul_object/output.json b/test/cmdlineTests/standard_yul_object/output.json
index 96903c4522..e5a5dadac5 100644
--- a/test/cmdlineTests/standard_yul_object/output.json
+++ b/test/cmdlineTests/standard_yul_object/output.json
@@ -1,4 +1,13 @@
-{"contracts":{"A":{"NamedObject":{"evm":{"assembly":"    /* \"A\":39:61   */
+{
+    "contracts":
+    {
+        "A":
+        {
+            "NamedObject":
+            {
+                "evm":
+                {
+                    "assembly": "    /* \"A\":39:61   */
   data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
     /* \"A\":80:81   */
   0x00
@@ -14,18 +23,34 @@
   pop
 stop
 data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
-","bytecode":{"functionDebugData":{},"generatedSources":[],"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"}},"ir":"object \"NamedObject\" {
+",
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    }
+                },
+                "ir": "object \"NamedObject\" {
     code {
         let x := dataoffset(\"DataName\")
         sstore(add(x, 0), 0)
     }
     data \"DataName\" hex\"616263\"
 }
-","irOptimized":"object \"NamedObject\" {
+",
+                "irOptimized": "object \"NamedObject\" {
     code {
         let x := dataoffset(\"DataName\")
         sstore(add(x, 0), 0)
     }
     data \"DataName\" hex\"616263\"
 }
-"}}},}
+"
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_yul_object_invalid_sub/output.json b/test/cmdlineTests/standard_yul_object_invalid_sub/output.json
index 44e04ecd86..98522145a6 100644
--- a/test/cmdlineTests/standard_yul_object_invalid_sub/output.json
+++ b/test/cmdlineTests/standard_yul_object_invalid_sub/output.json
@@ -1,7 +1,24 @@
-{"errors":[{"component":"general","formattedMessage":"TypeError: Unknown data object \"NamedObject.\".
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "TypeError: Unknown data object \"NamedObject.\".
  --> A:1:51:
   |
 1 | object \"NamedObject\" { code { let x := dataoffset(\"NamedObject.\") sstore(add(x, 0), 0) } object \"OtherObject\" { code { revert(0, 0) } } }
   |                                                   ^^^^^^^^^^^^^^
 
-","message":"Unknown data object \"NamedObject.\".","severity":"error","sourceLocation":{"end":64,"file":"A","start":50},"type":"TypeError"}]}
+",
+            "message": "Unknown data object \"NamedObject.\".",
+            "severity": "error",
+            "sourceLocation":
+            {
+                "end": 64,
+                "file": "A",
+                "start": 50
+            },
+            "type": "TypeError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_yul_object_name/output.json b/test/cmdlineTests/standard_yul_object_name/output.json
index b4a9e36856..57c7ce709d 100644
--- a/test/cmdlineTests/standard_yul_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_object_name/output.json
@@ -1,4 +1,13 @@
-{"contracts":{"A":{"NamedObject":{"evm":{"assembly":"    /* \"A\":39:61   */
+{
+    "contracts":
+    {
+        "A":
+        {
+            "NamedObject":
+            {
+                "evm":
+                {
+                    "assembly": "    /* \"A\":39:61   */
   data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
     /* \"A\":80:81   */
   0x00
@@ -23,7 +32,28 @@ sub_0: assembly {
         /* \"A\":137:149   */
       revert
 }
-","bytecode":{"functionDebugData":{},"generatedSources":[],"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"},"deployedBytecode":{"functionDebugData":{},"generatedSources":[],"immutableReferences":{},"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"}},"ir":"object \"NamedObject\" {
+",
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    },
+                    "deployedBytecode":
+                    {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "immutableReferences": {},
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    }
+                },
+                "ir": "object \"NamedObject\" {
     code {
         let x := dataoffset(\"DataName\")
         sstore(add(x, 0), 0)
@@ -33,7 +63,8 @@ sub_0: assembly {
         code { revert(0, 0) }
     }
 }
-","irOptimized":"object \"NamedObject\" {
+",
+                "irOptimized": "object \"NamedObject\" {
     code {
         let x := dataoffset(\"DataName\")
         sstore(add(x, 0), 0)
@@ -43,4 +74,8 @@ sub_0: assembly {
         code { revert(0, 0) }
     }
 }
-"}}},}
+"
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_yul_optimiserSteps/output.json b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
index c4b5f6e0e0..7df2f76952 100644
--- a/test/cmdlineTests/standard_yul_optimiserSteps/output.json
+++ b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
@@ -1,4 +1,13 @@
-{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":38:39   */
+{
+    "contracts":
+    {
+        "A":
+        {
+            "object":
+            {
+                "evm":
+                {
+                    "assembly": "    /* \"A\":38:39   */
   0x00
     /* \"A\":11:19   */
   dup1
@@ -7,13 +16,25 @@
   sstore
     /* \"A\":0:42   */
   stop
-","bytecode":{"functionDebugData":{},"generatedSources":[],"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"}},"ir":"object \"object\" {
+",
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    }
+                },
+                "ir": "object \"object\" {
     code {
         let x := mload(0)
         sstore(add(x, 0), 0)
     }
 }
-","irOptimized":"object \"object\" {
+",
+                "irOptimized": "object \"object\" {
     code {
         {
             let x := mload(0)
@@ -21,4 +42,8 @@
         }
     }
 }
-"}}},}
+"
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_yul_optimized/output.json b/test/cmdlineTests/standard_yul_optimized/output.json
index 40fd18d2b1..f5524c6df7 100644
--- a/test/cmdlineTests/standard_yul_optimized/output.json
+++ b/test/cmdlineTests/standard_yul_optimized/output.json
@@ -1,4 +1,13 @@
-{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":17:18   */
+{
+    "contracts":
+    {
+        "A":
+        {
+            "object":
+            {
+                "evm":
+                {
+                    "assembly": "    /* \"A\":17:18   */
   0x00
     /* \"A\":11:19   */
   dup1
@@ -7,13 +16,29 @@
   sstore
     /* \"A\":0:42   */
   stop
-","bytecode":{"functionDebugData":{},"generatedSources":[],"linkReferences":{},"object":"<BYTECODE REMOVED>","opcodes":"<OPCODES REMOVED>","sourceMap":"<SOURCEMAP REMOVED>"}},"ir":"object \"object\" {
+",
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    }
+                },
+                "ir": "object \"object\" {
     code {
         let x := mload(0)
         sstore(add(x, 0), 0)
     }
 }
-","irOptimized":"object \"object\" {
+",
+                "irOptimized": "object \"object\" {
     code { { sstore(mload(0), 0) } }
 }
-"}}},}
+"
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_yul_single_file_via_urls/args b/test/cmdlineTests/standard_yul_single_file_via_urls/args
index 24d48faf2a..18532c5a6d 100644
--- a/test/cmdlineTests/standard_yul_single_file_via_urls/args
+++ b/test/cmdlineTests/standard_yul_single_file_via_urls/args
@@ -1 +1 @@
---pretty-json --json-indent 4 --allow-paths .
+--allow-paths .
diff --git a/test/cmdlineTests/standard_yul_stack_opt/output.json b/test/cmdlineTests/standard_yul_stack_opt/output.json
index 1bc924d959..e10ef0c172 100644
--- a/test/cmdlineTests/standard_yul_stack_opt/output.json
+++ b/test/cmdlineTests/standard_yul_stack_opt/output.json
@@ -1,4 +1,13 @@
-{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":16:17   */
+{
+    "contracts":
+    {
+        "A":
+        {
+            "object":
+            {
+                "evm":
+                {
+                    "assembly": "    /* \"A\":16:17   */
   0x01
     /* \"A\":27:28   */
   0x00
@@ -12,4 +21,9 @@
   sstore
     /* \"A\":0:72   */
   stop
-"}}}},}
+"
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
index 8fa9f92ce0..c381936ef6 100644
--- a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
+++ b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
@@ -1,4 +1,13 @@
-{"contracts":{"A":{"object":{"evm":{"assembly":"    /* \"A\":16:17   */
+{
+    "contracts":
+    {
+        "A":
+        {
+            "object":
+            {
+                "evm":
+                {
+                    "assembly": "    /* \"A\":16:17   */
   0x01
   dup1
     /* \"A\":27:28   */
@@ -15,4 +24,9 @@
     /* \"A\":0:72   */
   pop
   pop
-"}}}},}
+"
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_bytes/output.json b/test/cmdlineTests/storage_layout_bytes/output.json
index b589a486f1..c2ca7813c6 100644
--- a/test/cmdlineTests/storage_layout_bytes/output.json
+++ b/test/cmdlineTests/storage_layout_bytes/output.json
@@ -1 +1,49 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[{"astId":4,"contract":"fileA:A","label":"s1","offset":0,"slot":"0","type":"t_bytes_storage"},{"astId":6,"contract":"fileA:A","label":"s2","offset":0,"slot":"1","type":"t_bytes_storage"}],"types":{"t_bytes_storage":{"encoding":"bytes","label":"bytes","numberOfBytes":"32"}}}}}},"sources":{"fileA":{"id":0}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage":
+                    [
+                        {
+                            "astId": 4,
+                            "contract": "fileA:A",
+                            "label": "s1",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_bytes_storage"
+                        },
+                        {
+                            "astId": 6,
+                            "contract": "fileA:A",
+                            "label": "s2",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_bytes_storage"
+                        }
+                    ],
+                    "types":
+                    {
+                        "t_bytes_storage":
+                        {
+                            "encoding": "bytes",
+                            "label": "bytes",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_dyn_array/output.json b/test/cmdlineTests/storage_layout_dyn_array/output.json
index 58e129ae7c..fa7ed04bad 100644
--- a/test/cmdlineTests/storage_layout_dyn_array/output.json
+++ b/test/cmdlineTests/storage_layout_dyn_array/output.json
@@ -1 +1,69 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[{"astId":4,"contract":"fileA:A","label":"array1","offset":0,"slot":"0","type":"t_array(t_uint256)dyn_storage"},{"astId":7,"contract":"fileA:A","label":"array2","offset":0,"slot":"1","type":"t_array(t_bool)dyn_storage"}],"types":{"t_array(t_bool)dyn_storage":{"base":"t_bool","encoding":"dynamic_array","label":"bool[]","numberOfBytes":"32"},"t_array(t_uint256)dyn_storage":{"base":"t_uint256","encoding":"dynamic_array","label":"uint256[]","numberOfBytes":"32"},"t_bool":{"encoding":"inplace","label":"bool","numberOfBytes":"1"},"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}}}}},"sources":{"fileA":{"id":0}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage":
+                    [
+                        {
+                            "astId": 4,
+                            "contract": "fileA:A",
+                            "label": "array1",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_array(t_uint256)dyn_storage"
+                        },
+                        {
+                            "astId": 7,
+                            "contract": "fileA:A",
+                            "label": "array2",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_array(t_bool)dyn_storage"
+                        }
+                    ],
+                    "types":
+                    {
+                        "t_array(t_bool)dyn_storage":
+                        {
+                            "base": "t_bool",
+                            "encoding": "dynamic_array",
+                            "label": "bool[]",
+                            "numberOfBytes": "32"
+                        },
+                        "t_array(t_uint256)dyn_storage":
+                        {
+                            "base": "t_uint256",
+                            "encoding": "dynamic_array",
+                            "label": "uint256[]",
+                            "numberOfBytes": "32"
+                        },
+                        "t_bool":
+                        {
+                            "encoding": "inplace",
+                            "label": "bool",
+                            "numberOfBytes": "1"
+                        },
+                        "t_uint256":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_many/output.json b/test/cmdlineTests/storage_layout_many/output.json
index 33c3005d04..68cb006824 100644
--- a/test/cmdlineTests/storage_layout_many/output.json
+++ b/test/cmdlineTests/storage_layout_many/output.json
@@ -1 +1,198 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[{"astId":15,"contract":"fileA:A","label":"x","offset":0,"slot":"0","type":"t_uint256"},{"astId":17,"contract":"fileA:A","label":"y","offset":0,"slot":"1","type":"t_uint256"},{"astId":20,"contract":"fileA:A","label":"s","offset":0,"slot":"2","type":"t_struct(S)13_storage"},{"astId":22,"contract":"fileA:A","label":"addr","offset":0,"slot":"6","type":"t_address"},{"astId":28,"contract":"fileA:A","label":"map","offset":0,"slot":"7","type":"t_mapping(t_uint256,t_mapping(t_address,t_bool))"},{"astId":31,"contract":"fileA:A","label":"array","offset":0,"slot":"8","type":"t_array(t_uint256)dyn_storage"},{"astId":33,"contract":"fileA:A","label":"s1","offset":0,"slot":"9","type":"t_string_storage"},{"astId":35,"contract":"fileA:A","label":"b1","offset":0,"slot":"10","type":"t_bytes_storage"}],"types":{"t_address":{"encoding":"inplace","label":"address","numberOfBytes":"20"},"t_array(t_uint256)2_storage":{"base":"t_uint256","encoding":"inplace","label":"uint256[2]","numberOfBytes":"64"},"t_array(t_uint256)dyn_storage":{"base":"t_uint256","encoding":"dynamic_array","label":"uint256[]","numberOfBytes":"32"},"t_bool":{"encoding":"inplace","label":"bool","numberOfBytes":"1"},"t_bytes_storage":{"encoding":"bytes","label":"bytes","numberOfBytes":"32"},"t_mapping(t_address,t_bool)":{"encoding":"mapping","key":"t_address","label":"mapping(address => bool)","numberOfBytes":"32","value":"t_bool"},"t_mapping(t_uint256,t_mapping(t_address,t_bool))":{"encoding":"mapping","key":"t_uint256","label":"mapping(uint256 => mapping(address => bool))","numberOfBytes":"32","value":"t_mapping(t_address,t_bool)"},"t_string_storage":{"encoding":"bytes","label":"string","numberOfBytes":"32"},"t_struct(S)13_storage":{"encoding":"inplace","label":"struct A.S","members":[{"astId":3,"contract":"fileA:A","label":"a","offset":0,"slot":"0","type":"t_uint128"},{"astId":5,"contract":"fileA:A","label":"b","offset":16,"slot":"0","type":"t_uint128"},{"astId":9,"contract":"fileA:A","label":"staticArray","offset":0,"slot":"1","type":"t_array(t_uint256)2_storage"},{"astId":12,"contract":"fileA:A","label":"dynArray","offset":0,"slot":"3","type":"t_array(t_uint256)dyn_storage"}],"numberOfBytes":"128"},"t_uint128":{"encoding":"inplace","label":"uint128","numberOfBytes":"16"},"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}}}}},"sources":{"fileA":{"id":0}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage":
+                    [
+                        {
+                            "astId": 15,
+                            "contract": "fileA:A",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 17,
+                            "contract": "fileA:A",
+                            "label": "y",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 20,
+                            "contract": "fileA:A",
+                            "label": "s",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_struct(S)13_storage"
+                        },
+                        {
+                            "astId": 22,
+                            "contract": "fileA:A",
+                            "label": "addr",
+                            "offset": 0,
+                            "slot": "6",
+                            "type": "t_address"
+                        },
+                        {
+                            "astId": 28,
+                            "contract": "fileA:A",
+                            "label": "map",
+                            "offset": 0,
+                            "slot": "7",
+                            "type": "t_mapping(t_uint256,t_mapping(t_address,t_bool))"
+                        },
+                        {
+                            "astId": 31,
+                            "contract": "fileA:A",
+                            "label": "array",
+                            "offset": 0,
+                            "slot": "8",
+                            "type": "t_array(t_uint256)dyn_storage"
+                        },
+                        {
+                            "astId": 33,
+                            "contract": "fileA:A",
+                            "label": "s1",
+                            "offset": 0,
+                            "slot": "9",
+                            "type": "t_string_storage"
+                        },
+                        {
+                            "astId": 35,
+                            "contract": "fileA:A",
+                            "label": "b1",
+                            "offset": 0,
+                            "slot": "10",
+                            "type": "t_bytes_storage"
+                        }
+                    ],
+                    "types":
+                    {
+                        "t_address":
+                        {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_array(t_uint256)2_storage":
+                        {
+                            "base": "t_uint256",
+                            "encoding": "inplace",
+                            "label": "uint256[2]",
+                            "numberOfBytes": "64"
+                        },
+                        "t_array(t_uint256)dyn_storage":
+                        {
+                            "base": "t_uint256",
+                            "encoding": "dynamic_array",
+                            "label": "uint256[]",
+                            "numberOfBytes": "32"
+                        },
+                        "t_bool":
+                        {
+                            "encoding": "inplace",
+                            "label": "bool",
+                            "numberOfBytes": "1"
+                        },
+                        "t_bytes_storage":
+                        {
+                            "encoding": "bytes",
+                            "label": "bytes",
+                            "numberOfBytes": "32"
+                        },
+                        "t_mapping(t_address,t_bool)":
+                        {
+                            "encoding": "mapping",
+                            "key": "t_address",
+                            "label": "mapping(address => bool)",
+                            "numberOfBytes": "32",
+                            "value": "t_bool"
+                        },
+                        "t_mapping(t_uint256,t_mapping(t_address,t_bool))":
+                        {
+                            "encoding": "mapping",
+                            "key": "t_uint256",
+                            "label": "mapping(uint256 => mapping(address => bool))",
+                            "numberOfBytes": "32",
+                            "value": "t_mapping(t_address,t_bool)"
+                        },
+                        "t_string_storage":
+                        {
+                            "encoding": "bytes",
+                            "label": "string",
+                            "numberOfBytes": "32"
+                        },
+                        "t_struct(S)13_storage":
+                        {
+                            "encoding": "inplace",
+                            "label": "struct A.S",
+                            "members":
+                            [
+                                {
+                                    "astId": 3,
+                                    "contract": "fileA:A",
+                                    "label": "a",
+                                    "offset": 0,
+                                    "slot": "0",
+                                    "type": "t_uint128"
+                                },
+                                {
+                                    "astId": 5,
+                                    "contract": "fileA:A",
+                                    "label": "b",
+                                    "offset": 16,
+                                    "slot": "0",
+                                    "type": "t_uint128"
+                                },
+                                {
+                                    "astId": 9,
+                                    "contract": "fileA:A",
+                                    "label": "staticArray",
+                                    "offset": 0,
+                                    "slot": "1",
+                                    "type": "t_array(t_uint256)2_storage"
+                                },
+                                {
+                                    "astId": 12,
+                                    "contract": "fileA:A",
+                                    "label": "dynArray",
+                                    "offset": 0,
+                                    "slot": "3",
+                                    "type": "t_array(t_uint256)dyn_storage"
+                                }
+                            ],
+                            "numberOfBytes": "128"
+                        },
+                        "t_uint128":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint128",
+                            "numberOfBytes": "16"
+                        },
+                        "t_uint256":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_mapping/output.json b/test/cmdlineTests/storage_layout_mapping/output.json
index e87ec77f16..8d13fb34b4 100644
--- a/test/cmdlineTests/storage_layout_mapping/output.json
+++ b/test/cmdlineTests/storage_layout_mapping/output.json
@@ -1 +1,85 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[{"astId":3,"contract":"fileA:A","label":"x","offset":0,"slot":"0","type":"t_uint256"},{"astId":5,"contract":"fileA:A","label":"y","offset":0,"slot":"1","type":"t_uint256"},{"astId":11,"contract":"fileA:A","label":"map","offset":0,"slot":"2","type":"t_mapping(t_uint256,t_mapping(t_address,t_bool))"}],"types":{"t_address":{"encoding":"inplace","label":"address","numberOfBytes":"20"},"t_bool":{"encoding":"inplace","label":"bool","numberOfBytes":"1"},"t_mapping(t_address,t_bool)":{"encoding":"mapping","key":"t_address","label":"mapping(address => bool)","numberOfBytes":"32","value":"t_bool"},"t_mapping(t_uint256,t_mapping(t_address,t_bool))":{"encoding":"mapping","key":"t_uint256","label":"mapping(uint256 => mapping(address => bool))","numberOfBytes":"32","value":"t_mapping(t_address,t_bool)"},"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}}}}},"sources":{"fileA":{"id":0}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage":
+                    [
+                        {
+                            "astId": 3,
+                            "contract": "fileA:A",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 5,
+                            "contract": "fileA:A",
+                            "label": "y",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 11,
+                            "contract": "fileA:A",
+                            "label": "map",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_mapping(t_uint256,t_mapping(t_address,t_bool))"
+                        }
+                    ],
+                    "types":
+                    {
+                        "t_address":
+                        {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_bool":
+                        {
+                            "encoding": "inplace",
+                            "label": "bool",
+                            "numberOfBytes": "1"
+                        },
+                        "t_mapping(t_address,t_bool)":
+                        {
+                            "encoding": "mapping",
+                            "key": "t_address",
+                            "label": "mapping(address => bool)",
+                            "numberOfBytes": "32",
+                            "value": "t_bool"
+                        },
+                        "t_mapping(t_uint256,t_mapping(t_address,t_bool))":
+                        {
+                            "encoding": "mapping",
+                            "key": "t_uint256",
+                            "label": "mapping(uint256 => mapping(address => bool))",
+                            "numberOfBytes": "32",
+                            "value": "t_mapping(t_address,t_bool)"
+                        },
+                        "t_uint256":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_smoke/output.json b/test/cmdlineTests/storage_layout_smoke/output.json
index 519cb1f041..9fe46bb673 100644
--- a/test/cmdlineTests/storage_layout_smoke/output.json
+++ b/test/cmdlineTests/storage_layout_smoke/output.json
@@ -1 +1,23 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[],"types":null}}}},"sources":{"fileA":{"id":0}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage": [],
+                    "types": null
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_smoke_two_contracts/output.json b/test/cmdlineTests/storage_layout_smoke_two_contracts/output.json
index c94f92eb80..fc4e422a5e 100644
--- a/test/cmdlineTests/storage_layout_smoke_two_contracts/output.json
+++ b/test/cmdlineTests/storage_layout_smoke_two_contracts/output.json
@@ -1 +1,27 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[],"types":null}}}},"sources":{"fileA":{"id":0},"fileB":{"id":1}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage": [],
+                    "types": null
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        },
+        "fileB":
+        {
+            "id": 1
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_string/output.json b/test/cmdlineTests/storage_layout_string/output.json
index a83f5a513d..20c6f64ccd 100644
--- a/test/cmdlineTests/storage_layout_string/output.json
+++ b/test/cmdlineTests/storage_layout_string/output.json
@@ -1 +1,49 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[{"astId":4,"contract":"fileA:A","label":"s1","offset":0,"slot":"0","type":"t_string_storage"},{"astId":6,"contract":"fileA:A","label":"s2","offset":0,"slot":"1","type":"t_string_storage"}],"types":{"t_string_storage":{"encoding":"bytes","label":"string","numberOfBytes":"32"}}}}}},"sources":{"fileA":{"id":0}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage":
+                    [
+                        {
+                            "astId": 4,
+                            "contract": "fileA:A",
+                            "label": "s1",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_string_storage"
+                        },
+                        {
+                            "astId": 6,
+                            "contract": "fileA:A",
+                            "label": "s2",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_string_storage"
+                        }
+                    ],
+                    "types":
+                    {
+                        "t_string_storage":
+                        {
+                            "encoding": "bytes",
+                            "label": "string",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_struct/output.json b/test/cmdlineTests/storage_layout_struct/output.json
index fed30fd361..f682d9634a 100644
--- a/test/cmdlineTests/storage_layout_struct/output.json
+++ b/test/cmdlineTests/storage_layout_struct/output.json
@@ -1 +1,126 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[{"astId":15,"contract":"fileA:A","label":"x","offset":0,"slot":"0","type":"t_uint256"},{"astId":17,"contract":"fileA:A","label":"y","offset":0,"slot":"1","type":"t_uint256"},{"astId":20,"contract":"fileA:A","label":"s","offset":0,"slot":"2","type":"t_struct(S)13_storage"},{"astId":22,"contract":"fileA:A","label":"addr","offset":0,"slot":"7","type":"t_address"}],"types":{"t_address":{"encoding":"inplace","label":"address","numberOfBytes":"20"},"t_array(t_uint256)2_storage":{"base":"t_uint256","encoding":"inplace","label":"uint256[2]","numberOfBytes":"64"},"t_array(t_uint256)dyn_storage":{"base":"t_uint256","encoding":"dynamic_array","label":"uint256[]","numberOfBytes":"32"},"t_struct(S)13_storage":{"encoding":"inplace","label":"struct A.S","members":[{"astId":3,"contract":"fileA:A","label":"a","offset":0,"slot":"0","type":"t_uint256"},{"astId":5,"contract":"fileA:A","label":"b","offset":0,"slot":"1","type":"t_uint256"},{"astId":9,"contract":"fileA:A","label":"staticArray","offset":0,"slot":"2","type":"t_array(t_uint256)2_storage"},{"astId":12,"contract":"fileA:A","label":"dynArray","offset":0,"slot":"4","type":"t_array(t_uint256)dyn_storage"}],"numberOfBytes":"160"},"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}}}}},"sources":{"fileA":{"id":0}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage":
+                    [
+                        {
+                            "astId": 15,
+                            "contract": "fileA:A",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 17,
+                            "contract": "fileA:A",
+                            "label": "y",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 20,
+                            "contract": "fileA:A",
+                            "label": "s",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_struct(S)13_storage"
+                        },
+                        {
+                            "astId": 22,
+                            "contract": "fileA:A",
+                            "label": "addr",
+                            "offset": 0,
+                            "slot": "7",
+                            "type": "t_address"
+                        }
+                    ],
+                    "types":
+                    {
+                        "t_address":
+                        {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_array(t_uint256)2_storage":
+                        {
+                            "base": "t_uint256",
+                            "encoding": "inplace",
+                            "label": "uint256[2]",
+                            "numberOfBytes": "64"
+                        },
+                        "t_array(t_uint256)dyn_storage":
+                        {
+                            "base": "t_uint256",
+                            "encoding": "dynamic_array",
+                            "label": "uint256[]",
+                            "numberOfBytes": "32"
+                        },
+                        "t_struct(S)13_storage":
+                        {
+                            "encoding": "inplace",
+                            "label": "struct A.S",
+                            "members":
+                            [
+                                {
+                                    "astId": 3,
+                                    "contract": "fileA:A",
+                                    "label": "a",
+                                    "offset": 0,
+                                    "slot": "0",
+                                    "type": "t_uint256"
+                                },
+                                {
+                                    "astId": 5,
+                                    "contract": "fileA:A",
+                                    "label": "b",
+                                    "offset": 0,
+                                    "slot": "1",
+                                    "type": "t_uint256"
+                                },
+                                {
+                                    "astId": 9,
+                                    "contract": "fileA:A",
+                                    "label": "staticArray",
+                                    "offset": 0,
+                                    "slot": "2",
+                                    "type": "t_array(t_uint256)2_storage"
+                                },
+                                {
+                                    "astId": 12,
+                                    "contract": "fileA:A",
+                                    "label": "dynArray",
+                                    "offset": 0,
+                                    "slot": "4",
+                                    "type": "t_array(t_uint256)dyn_storage"
+                                }
+                            ],
+                            "numberOfBytes": "160"
+                        },
+                        "t_uint256":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_struct_packed/output.json b/test/cmdlineTests/storage_layout_struct_packed/output.json
index 5f610719ce..7731bd2230 100644
--- a/test/cmdlineTests/storage_layout_struct_packed/output.json
+++ b/test/cmdlineTests/storage_layout_struct_packed/output.json
@@ -1 +1,132 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[{"astId":15,"contract":"fileA:A","label":"x","offset":0,"slot":"0","type":"t_uint256"},{"astId":17,"contract":"fileA:A","label":"y","offset":0,"slot":"1","type":"t_uint256"},{"astId":20,"contract":"fileA:A","label":"s","offset":0,"slot":"2","type":"t_struct(S)13_storage"},{"astId":22,"contract":"fileA:A","label":"addr","offset":0,"slot":"6","type":"t_address"}],"types":{"t_address":{"encoding":"inplace","label":"address","numberOfBytes":"20"},"t_array(t_uint256)2_storage":{"base":"t_uint256","encoding":"inplace","label":"uint256[2]","numberOfBytes":"64"},"t_array(t_uint256)dyn_storage":{"base":"t_uint256","encoding":"dynamic_array","label":"uint256[]","numberOfBytes":"32"},"t_struct(S)13_storage":{"encoding":"inplace","label":"struct A.S","members":[{"astId":3,"contract":"fileA:A","label":"a","offset":0,"slot":"0","type":"t_uint128"},{"astId":5,"contract":"fileA:A","label":"b","offset":16,"slot":"0","type":"t_uint128"},{"astId":9,"contract":"fileA:A","label":"staticArray","offset":0,"slot":"1","type":"t_array(t_uint256)2_storage"},{"astId":12,"contract":"fileA:A","label":"dynArray","offset":0,"slot":"3","type":"t_array(t_uint256)dyn_storage"}],"numberOfBytes":"128"},"t_uint128":{"encoding":"inplace","label":"uint128","numberOfBytes":"16"},"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}}}}},"sources":{"fileA":{"id":0}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage":
+                    [
+                        {
+                            "astId": 15,
+                            "contract": "fileA:A",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 17,
+                            "contract": "fileA:A",
+                            "label": "y",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 20,
+                            "contract": "fileA:A",
+                            "label": "s",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_struct(S)13_storage"
+                        },
+                        {
+                            "astId": 22,
+                            "contract": "fileA:A",
+                            "label": "addr",
+                            "offset": 0,
+                            "slot": "6",
+                            "type": "t_address"
+                        }
+                    ],
+                    "types":
+                    {
+                        "t_address":
+                        {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_array(t_uint256)2_storage":
+                        {
+                            "base": "t_uint256",
+                            "encoding": "inplace",
+                            "label": "uint256[2]",
+                            "numberOfBytes": "64"
+                        },
+                        "t_array(t_uint256)dyn_storage":
+                        {
+                            "base": "t_uint256",
+                            "encoding": "dynamic_array",
+                            "label": "uint256[]",
+                            "numberOfBytes": "32"
+                        },
+                        "t_struct(S)13_storage":
+                        {
+                            "encoding": "inplace",
+                            "label": "struct A.S",
+                            "members":
+                            [
+                                {
+                                    "astId": 3,
+                                    "contract": "fileA:A",
+                                    "label": "a",
+                                    "offset": 0,
+                                    "slot": "0",
+                                    "type": "t_uint128"
+                                },
+                                {
+                                    "astId": 5,
+                                    "contract": "fileA:A",
+                                    "label": "b",
+                                    "offset": 16,
+                                    "slot": "0",
+                                    "type": "t_uint128"
+                                },
+                                {
+                                    "astId": 9,
+                                    "contract": "fileA:A",
+                                    "label": "staticArray",
+                                    "offset": 0,
+                                    "slot": "1",
+                                    "type": "t_array(t_uint256)2_storage"
+                                },
+                                {
+                                    "astId": 12,
+                                    "contract": "fileA:A",
+                                    "label": "dynArray",
+                                    "offset": 0,
+                                    "slot": "3",
+                                    "type": "t_array(t_uint256)dyn_storage"
+                                }
+                            ],
+                            "numberOfBytes": "128"
+                        },
+                        "t_uint128":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint128",
+                            "numberOfBytes": "16"
+                        },
+                        "t_uint256":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_value_types/output.json b/test/cmdlineTests/storage_layout_value_types/output.json
index db690733ee..10fbd762b5 100644
--- a/test/cmdlineTests/storage_layout_value_types/output.json
+++ b/test/cmdlineTests/storage_layout_value_types/output.json
@@ -1 +1,78 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[{"astId":3,"contract":"fileA:A","label":"x","offset":0,"slot":"0","type":"t_uint256"},{"astId":5,"contract":"fileA:A","label":"y","offset":0,"slot":"1","type":"t_uint256"},{"astId":7,"contract":"fileA:A","label":"addr","offset":0,"slot":"2","type":"t_address"},{"astId":11,"contract":"fileA:A","label":"array","offset":0,"slot":"3","type":"t_array(t_uint256)2_storage"}],"types":{"t_address":{"encoding":"inplace","label":"address","numberOfBytes":"20"},"t_array(t_uint256)2_storage":{"base":"t_uint256","encoding":"inplace","label":"uint256[2]","numberOfBytes":"64"},"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"}}}}}},"sources":{"fileA":{"id":0}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage":
+                    [
+                        {
+                            "astId": 3,
+                            "contract": "fileA:A",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 5,
+                            "contract": "fileA:A",
+                            "label": "y",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_uint256"
+                        },
+                        {
+                            "astId": 7,
+                            "contract": "fileA:A",
+                            "label": "addr",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_address"
+                        },
+                        {
+                            "astId": 11,
+                            "contract": "fileA:A",
+                            "label": "array",
+                            "offset": 0,
+                            "slot": "3",
+                            "type": "t_array(t_uint256)2_storage"
+                        }
+                    ],
+                    "types":
+                    {
+                        "t_address":
+                        {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_array(t_uint256)2_storage":
+                        {
+                            "base": "t_uint256",
+                            "encoding": "inplace",
+                            "label": "uint256[2]",
+                            "numberOfBytes": "64"
+                        },
+                        "t_uint256":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/storage_layout_value_types_packed/output.json b/test/cmdlineTests/storage_layout_value_types_packed/output.json
index 1b01899a50..eefb69e667 100644
--- a/test/cmdlineTests/storage_layout_value_types_packed/output.json
+++ b/test/cmdlineTests/storage_layout_value_types_packed/output.json
@@ -1 +1,98 @@
-{"contracts":{"fileA":{"A":{"storageLayout":{"storage":[{"astId":3,"contract":"fileA:A","label":"x","offset":0,"slot":"0","type":"t_uint64"},{"astId":5,"contract":"fileA:A","label":"y","offset":8,"slot":"0","type":"t_uint128"},{"astId":7,"contract":"fileA:A","label":"z","offset":0,"slot":"1","type":"t_uint128"},{"astId":9,"contract":"fileA:A","label":"addr","offset":0,"slot":"2","type":"t_address"},{"astId":13,"contract":"fileA:A","label":"array","offset":0,"slot":"3","type":"t_array(t_uint256)2_storage"}],"types":{"t_address":{"encoding":"inplace","label":"address","numberOfBytes":"20"},"t_array(t_uint256)2_storage":{"base":"t_uint256","encoding":"inplace","label":"uint256[2]","numberOfBytes":"64"},"t_uint128":{"encoding":"inplace","label":"uint128","numberOfBytes":"16"},"t_uint256":{"encoding":"inplace","label":"uint256","numberOfBytes":"32"},"t_uint64":{"encoding":"inplace","label":"uint64","numberOfBytes":"8"}}}}}},"sources":{"fileA":{"id":0}}}
+{
+    "contracts":
+    {
+        "fileA":
+        {
+            "A":
+            {
+                "storageLayout":
+                {
+                    "storage":
+                    [
+                        {
+                            "astId": 3,
+                            "contract": "fileA:A",
+                            "label": "x",
+                            "offset": 0,
+                            "slot": "0",
+                            "type": "t_uint64"
+                        },
+                        {
+                            "astId": 5,
+                            "contract": "fileA:A",
+                            "label": "y",
+                            "offset": 8,
+                            "slot": "0",
+                            "type": "t_uint128"
+                        },
+                        {
+                            "astId": 7,
+                            "contract": "fileA:A",
+                            "label": "z",
+                            "offset": 0,
+                            "slot": "1",
+                            "type": "t_uint128"
+                        },
+                        {
+                            "astId": 9,
+                            "contract": "fileA:A",
+                            "label": "addr",
+                            "offset": 0,
+                            "slot": "2",
+                            "type": "t_address"
+                        },
+                        {
+                            "astId": 13,
+                            "contract": "fileA:A",
+                            "label": "array",
+                            "offset": 0,
+                            "slot": "3",
+                            "type": "t_array(t_uint256)2_storage"
+                        }
+                    ],
+                    "types":
+                    {
+                        "t_address":
+                        {
+                            "encoding": "inplace",
+                            "label": "address",
+                            "numberOfBytes": "20"
+                        },
+                        "t_array(t_uint256)2_storage":
+                        {
+                            "base": "t_uint256",
+                            "encoding": "inplace",
+                            "label": "uint256[2]",
+                            "numberOfBytes": "64"
+                        },
+                        "t_uint128":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint128",
+                            "numberOfBytes": "16"
+                        },
+                        "t_uint256":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint256",
+                            "numberOfBytes": "32"
+                        },
+                        "t_uint64":
+                        {
+                            "encoding": "inplace",
+                            "label": "uint64",
+                            "numberOfBytes": "8"
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "fileA":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/yul_string_format_ascii/output.json b/test/cmdlineTests/yul_string_format_ascii/output.json
index 4bc66584cb..aa830d1abe 100644
--- a/test/cmdlineTests/yul_string_format_ascii/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii/output.json
@@ -1,4 +1,11 @@
-{"contracts":{"A":{"C":{"ir":"
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "ir": "
 /// @use-src 0:\"A\"
 object \"C_11\" {
     code {
@@ -208,4 +215,15 @@ object \"C_11\" {
 
 }
 
-"}}},"sources":{"A":{"id":0}}}
+"
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json b/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
index a5aaa8633d..bfe775ca40 100644
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_bytes32/output.json
@@ -1,4 +1,11 @@
-{"contracts":{"A":{"C":{"ir":"
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "ir": "
 /// @use-src 0:\"A\"
 object \"C_11\" {
     code {
@@ -136,4 +143,15 @@ object \"C_11\" {
 
 }
 
-"}}},"sources":{"A":{"id":0}}}
+"
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json b/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
index 4cb4408cab..f4b14aadcf 100644
--- a/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_bytes32_from_number/output.json
@@ -1,4 +1,11 @@
-{"contracts":{"A":{"C":{"ir":"
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "ir": "
 /// @use-src 0:\"A\"
 object \"C_11\" {
     code {
@@ -149,4 +156,15 @@ object \"C_11\" {
 
 }
 
-"}}},"sources":{"A":{"id":0}}}
+"
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/yul_string_format_ascii_long/output.json b/test/cmdlineTests/yul_string_format_ascii_long/output.json
index 68f033773c..348e5a0b57 100644
--- a/test/cmdlineTests/yul_string_format_ascii_long/output.json
+++ b/test/cmdlineTests/yul_string_format_ascii_long/output.json
@@ -1,4 +1,11 @@
-{"contracts":{"A":{"C":{"ir":"
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "ir": "
 /// @use-src 0:\"A\"
 object \"C_11\" {
     code {
@@ -212,4 +219,15 @@ object \"C_11\" {
 
 }
 
-"}}},"sources":{"A":{"id":0}}}
+"
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/yul_string_format_hex/output.json b/test/cmdlineTests/yul_string_format_hex/output.json
index a4e1b1463c..5568fc7a0d 100644
--- a/test/cmdlineTests/yul_string_format_hex/output.json
+++ b/test/cmdlineTests/yul_string_format_hex/output.json
@@ -1,4 +1,11 @@
-{"contracts":{"A":{"C":{"ir":"
+{
+    "contracts":
+    {
+        "A":
+        {
+            "C":
+            {
+                "ir": "
 /// @use-src 0:\"A\"
 object \"C_11\" {
     code {
@@ -149,4 +156,15 @@ object \"C_11\" {
 
 }
 
-"}}},"sources":{"A":{"id":0}}}
+"
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}

From b0a729aab8e7a2a2b2d5819dbadd5ef2ce33ddb6 Mon Sep 17 00:00:00 2001
From: George Plotnikov <accembler@gmail.com>
Date: Wed, 26 Oct 2022 15:14:05 +0500
Subject: [PATCH 0968/1748] adding a point about expectations to checklist

---
 ReviewChecklist.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/ReviewChecklist.md b/ReviewChecklist.md
index 1c572cd0d3..2f4860fb84 100644
--- a/ReviewChecklist.md
+++ b/ReviewChecklist.md
@@ -26,6 +26,13 @@ It is also meant to serve as a final checklist for reviewers to go through befor
     - [ ] Avoid basing PRs from forks on branches other than `develop` or `breaking` because
         GitHub closes them when the base branch gets merged.
         Do this only for PRs created directly in the main repo.
+- [ ] **Does the PR update test expectations to match the modified code?** If not, your PR will not pass some of the `_soltest_`,  jobs in CI.
+    In many cases the expectations can be updated automatically:
+    - `cmdlineTests.sh --update` for command-line tests.
+    - `isoltest --enforce-gas-cost --accept-updates` for soltest-based tests.
+        - If your PR affects gas costs, an extra run of `isoltest --enforce-gas-cost --optimize --accept-updates` is needed to update gas expectations with optimizer enabled.
+    - Review updated files before committing them.
+        **Are expectations correct and do updated tests still serve their purpose?**
 
 ## Coding Style and Good Practices
 - [ ] Does the PR follow our [coding style](CODING_STYLE.md)?
@@ -127,8 +134,6 @@ The following points are all covered by the coding style but come up so often th
 - [ ] **Do not include version pragma and the SPDX comment in semantic and syntax test cases**.
     In other test types include them if necessary to suppress warnings.
 - [ ] **If you have to use a version pragma, avoid hard-coding version.** Use `pragma solidity *`.
-- [ ] **Add `--pretty-print --pretty-json 4` to the `args` file of in command-line tests** to get
-    readable, indented output.
 - [ ] **When writing StandardJSON command-line tests, use `urls` instead of `content`** and put
     the Solidity or Yul code in a separate file.
 

From 9e7fe985bf9c80fbb9fc9f5d423d8996ace0d3c2 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Tue, 4 Oct 2022 17:54:18 +0200
Subject: [PATCH 0969/1748] [Language Server]: Add basic document hover
 support.

---
 Changelog.md                             |   1 +
 libsolidity/CMakeLists.txt               |   2 +
 libsolidity/lsp/DocumentHoverHandler.cpp | 126 +++++++++++++++++++++++
 libsolidity/lsp/DocumentHoverHandler.h   |  32 ++++++
 libsolidity/lsp/LanguageServer.cpp       |  25 +++--
 libsolidity/lsp/LanguageServer.h         |   1 +
 test/libsolidity/lsp/hover/hover.sol     |  94 +++++++++++++++++
 7 files changed, 271 insertions(+), 10 deletions(-)
 create mode 100644 libsolidity/lsp/DocumentHoverHandler.cpp
 create mode 100644 libsolidity/lsp/DocumentHoverHandler.h
 create mode 100644 test/libsolidity/lsp/hover/hover.sol

diff --git a/Changelog.md b/Changelog.md
index 98b36aab84..e6fea266e1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
 * Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
 * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
 * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
+* Language Server: Add basic document hover support.
 
 
 Bugfixes:
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 68e58e1c98..4319e90ffc 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -155,6 +155,8 @@ set(sources
 	interface/StorageLayout.h
 	interface/Version.cpp
 	interface/Version.h
+	lsp/DocumentHoverHandler.cpp
+	lsp/DocumentHoverHandler.h
 	lsp/FileRepository.cpp
 	lsp/FileRepository.h
 	lsp/GotoDefinition.cpp
diff --git a/libsolidity/lsp/DocumentHoverHandler.cpp b/libsolidity/lsp/DocumentHoverHandler.cpp
new file mode 100644
index 0000000000..628b62fa1f
--- /dev/null
+++ b/libsolidity/lsp/DocumentHoverHandler.cpp
@@ -0,0 +1,126 @@
+/*
+	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 <libsolidity/lsp/DocumentHoverHandler.h>
+#include <libsolidity/lsp/Utils.h>
+
+#include <fmt/format.h>
+
+namespace solidity::lsp
+{
+
+using namespace std;
+
+using namespace solidity::lsp;
+using namespace solidity::langutil;
+using namespace solidity::frontend;
+
+namespace
+{
+
+struct MarkdownBuilder
+{
+	stringstream result;
+
+	MarkdownBuilder& solidityCode(string const& _code)
+	{
+		auto constexpr SolidityLanguageId = "solidity";
+		result << "```" << SolidityLanguageId << '\n' << _code << "\n```\n\n";
+		return *this;
+	}
+
+	MarkdownBuilder& paragraph(string const& _text)
+	{
+		if (!_text.empty())
+		{
+			result << _text << '\n';
+			if (_text.back() != '\n') // We want double-LF to ensure constructing a paragraph.
+				result << '\n';
+		}
+		return *this;
+	}
+};
+
+}
+
+void DocumentHoverHandler::operator()(MessageID _id, Json::Value const& _args)
+{
+	auto const [sourceUnitName, lineColumn] = HandlerBase(*this).extractSourceUnitNameAndLineColumn(_args);
+	auto const [sourceNode, sourceOffset] = m_server.astNodeAndOffsetAtSourceLocation(sourceUnitName, lineColumn);
+
+	MarkdownBuilder markdown{};
+	auto rangeToHighlight = toRange(sourceNode->location());
+
+	// Try getting the type definition of the underlying AST node, if available.
+	if (auto const* expression = dynamic_cast<Expression const*>(sourceNode))
+	{
+		if (auto const* declaration = ASTNode::referencedDeclaration(*expression))
+			if (declaration->type())
+				markdown.solidityCode(declaration->type()->toString(false));
+	}
+	else if (auto const* declaration = dynamic_cast<Declaration const*>(sourceNode))
+	{
+		if (declaration->type())
+			markdown.solidityCode(declaration->type()->toString(false));
+	}
+	else if (auto const* identifierPath = dynamic_cast<IdentifierPath const*>(sourceNode))
+	{
+		for (size_t i = 0; i < identifierPath->path().size(); ++i)
+		{
+			if (identifierPath->pathLocations()[i].containsOffset(sourceOffset))
+			{
+				rangeToHighlight = toRange(identifierPath->pathLocations()[i]);
+
+				if (i < identifierPath->annotation().pathDeclarations.size())
+				{
+					Declaration const* declaration = identifierPath->annotation().pathDeclarations[i];
+					if (declaration && declaration->type())
+						markdown.solidityCode(declaration->type()->toString(false));
+					if (auto const* structurallyDocumented = dynamic_cast<StructurallyDocumented const*>(declaration))
+						if (structurallyDocumented->documentation()->text())
+							markdown.paragraph(*structurallyDocumented->documentation()->text());
+				}
+				break;
+			}
+		}
+	}
+
+	// If this AST node contains documentation itself, append it.
+	if (auto const* documented = dynamic_cast<StructurallyDocumented const*>(sourceNode))
+	{
+		if (documented->documentation())
+			markdown.paragraph(*documented->documentation()->text());
+	}
+
+	auto tooltipText = markdown.result.str();
+
+	if (tooltipText.empty())
+	{
+		client().reply(_id, Json::nullValue);
+		return;
+	}
+
+	Json::Value reply = Json::objectValue;
+	reply["range"] = rangeToHighlight;
+	reply["contents"]["kind"] = "markdown";
+	reply["contents"]["value"] = std::move(tooltipText);
+
+	client().reply(_id, reply);
+}
+
+}
diff --git a/libsolidity/lsp/DocumentHoverHandler.h b/libsolidity/lsp/DocumentHoverHandler.h
new file mode 100644
index 0000000000..9bb4084c26
--- /dev/null
+++ b/libsolidity/lsp/DocumentHoverHandler.h
@@ -0,0 +1,32 @@
+/*
+	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
+#pragma once
+#include <libsolidity/lsp/HandlerBase.h>
+
+namespace solidity::lsp
+{
+
+class DocumentHoverHandler: public HandlerBase
+{
+public:
+	using HandlerBase::HandlerBase;
+
+	void operator()(MessageID, Json::Value const&);
+};
+
+}
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index f868a022ae..74d1b4d7cc 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -25,6 +25,7 @@
 #include <libsolidity/lsp/Utils.h>
 
 // LSP feature implementations
+#include <libsolidity/lsp/DocumentHoverHandler.h>
 #include <libsolidity/lsp/GotoDefinition.h>
 #include <libsolidity/lsp/RenameSymbol.h>
 #include <libsolidity/lsp/SemanticTokensBuilder.h>
@@ -144,6 +145,7 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"textDocument/didOpen", bind(&LanguageServer::handleTextDocumentDidOpen, this, _2)},
 		{"textDocument/didChange", bind(&LanguageServer::handleTextDocumentDidChange, this, _2)},
 		{"textDocument/didClose", bind(&LanguageServer::handleTextDocumentDidClose, this, _2)},
+		{"textDocument/hover", DocumentHoverHandler(*this) },
 		{"textDocument/rename", RenameSymbol(*this) },
 		{"textDocument/implementation", GotoDefinition(*this) },
 		{"textDocument/semanticTokens/full", bind(&LanguageServer::semanticTokensFull, this, _1, _2)},
@@ -417,6 +419,7 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 	replyArgs["capabilities"]["semanticTokensProvider"]["range"] = false;
 	replyArgs["capabilities"]["semanticTokensProvider"]["full"] = true; // XOR requests.full.delta = true
 	replyArgs["capabilities"]["renameProvider"] = true;
+	replyArgs["capabilities"]["hoverProvider"] = true;
 
 	m_client.reply(_id, std::move(replyArgs));
 }
@@ -541,19 +544,21 @@ void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
 	compileAndUpdateDiagnostics();
 }
 
-
 ASTNode const* LanguageServer::astNodeAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
 {
-	if (m_compilerStack.state() < CompilerStack::AnalysisPerformed)
-		return nullptr;
+	return get<ASTNode const*>(astNodeAndOffsetAtSourceLocation(_sourceUnitName, _filePos));
+}
 
+tuple<ASTNode const*, int> LanguageServer::astNodeAndOffsetAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
+{
+	if (m_compilerStack.state() < CompilerStack::AnalysisPerformed)
+		return {nullptr, -1};
 	if (!m_fileRepository.sourceUnits().count(_sourceUnitName))
-		return nullptr;
+		return {nullptr, -1};
 
-	if (optional<int> sourcePos =
-		m_compilerStack.charStream(_sourceUnitName).translateLineColumnToPosition(_filePos))
-		return locateInnermostASTNode(*sourcePos, m_compilerStack.ast(_sourceUnitName));
-	else
-		return nullptr;
-}
+	optional<int> sourcePos = m_compilerStack.charStream(_sourceUnitName).translateLineColumnToPosition(_filePos);
+	if (!sourcePos)
+		return {nullptr, -1};
 
+	return {locateInnermostASTNode(*sourcePos, m_compilerStack.ast(_sourceUnitName)), *sourcePos};
+}
diff --git a/libsolidity/lsp/LanguageServer.h b/libsolidity/lsp/LanguageServer.h
index a05bec4976..d80f8e879c 100644
--- a/libsolidity/lsp/LanguageServer.h
+++ b/libsolidity/lsp/LanguageServer.h
@@ -77,6 +77,7 @@ class LanguageServer
 
 	FileRepository& fileRepository() noexcept { return m_fileRepository; }
 	Transport& client() noexcept { return m_client; }
+	std::tuple<frontend::ASTNode const*, int> astNodeAndOffsetAtSourceLocation(std::string const& _sourceUnitName, langutil::LineColumn const& _filePos);
 	frontend::ASTNode const* astNodeAtSourceLocation(std::string const& _sourceUnitName, langutil::LineColumn const& _filePos);
 	frontend::CompilerStack const& compilerStack() const noexcept { return m_compilerStack; }
 
diff --git a/test/libsolidity/lsp/hover/hover.sol b/test/libsolidity/lsp/hover/hover.sol
new file mode 100644
index 0000000000..9a1ee034cf
--- /dev/null
+++ b/test/libsolidity/lsp/hover/hover.sol
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: UNLICENSED
+pragma solidity >=0.8.0;
+
+/// Documenting another contract here.
+contract AnotherContract {}
+
+/// User being documented.
+contract User
+{
+    /// Some enum value.
+    enum SomeEnum
+    {
+        Red,
+        Blue
+    }
+
+    /// publicVariable being documented.
+    SomeEnum public publicVariable;
+//  ^ @Cursor1
+//  ^^^^^^^^ @Cursor1Range
+
+    // not documented
+    mapping(int => User.SomeEnum) someRemapping;
+//                      ^ @Cursor2
+//                      ^^^^^^^^ @Cursor2Range
+
+    /// Documenting the setContract().
+    function setValue(User.SomeEnum _value) public
+//                    ^ @Cursor3
+//                    ^^^^ @Cursor3Range
+    {
+        publicVariable = _value;
+//      ^ @Cursor4
+//      ^^^^^^^^^^^^^^ @Cursor4Range
+    }
+
+    function createAnotherContract() public returns (AnotherContract)
+    {
+        return new AnotherContract();
+//                 ^ @Cursor5
+//                 ^^^^^^^^^^^^^^^ @Cursor5Range
+    }
+}
+// ----
+// -> textDocument/hover {
+//     "position": @Cursor1
+// }
+// <- {
+//     "contents": {
+//         "kind": "markdown",
+//         "value": "```solidity\ntype(enum User.SomeEnum)\n```\n\n"
+//     },
+//     "range": @Cursor1Range
+// }
+// -> textDocument/hover {
+//     "position": @Cursor2
+// }
+// <- {
+//     "contents": {
+//         "kind": "markdown",
+//         "value": "```solidity\ntype(enum User.SomeEnum)\n```\n\n"
+//     },
+//     "range": @Cursor2Range
+// }
+// -> textDocument/hover {
+//     "position": @Cursor3
+// }
+// <- {
+//     "contents": {
+//         "kind": "markdown",
+//         "value": "```solidity\ntype(contract User)\n```\n\nUser being documented.\n\n"
+//     },
+//     "range": @Cursor3Range
+// }
+// -> textDocument/hover {
+//     "position": @Cursor4
+// }
+// <- {
+//     "contents": {
+//         "kind": "markdown",
+//         "value": "```solidity\nenum User.SomeEnum\n```\n\n"
+//     },
+//     "range": @Cursor4Range
+// }
+// -> textDocument/hover {
+//     "position": @Cursor5
+// }
+// <- {
+//     "contents": {
+//         "kind": "markdown",
+//         "value": "```solidity\ntype(contract AnotherContract)\n```\n\nDocumenting another contract here.\n\n"
+//     },
+//     "range": @Cursor5Range
+// }

From b7abcb25aed242b4db623047b7003d3c3609c825 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 16 Aug 2022 18:06:53 +0200
Subject: [PATCH 0970/1748] [libevmasm] Add
 Assembly::OptimiserSettings::translateSettings.

---
 libevmasm/Assembly.cpp                  | 15 +++++++++++++++
 libevmasm/Assembly.h                    |  2 ++
 libsolidity/codegen/CompilerContext.cpp | 15 ---------------
 libsolidity/codegen/CompilerContext.h   |  4 +---
 libyul/YulStack.cpp                     | 23 +----------------------
 5 files changed, 19 insertions(+), 40 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 8e06da8ae9..5b6e2a86f3 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -792,3 +792,18 @@ Assembly const* Assembly::subAssemblyById(size_t _subId) const
 	assertThrow(currentAssembly != this, AssemblyException, "");
 	return currentAssembly;
 }
+
+Assembly::OptimiserSettings Assembly::OptimiserSettings::translateSettings(frontend::OptimiserSettings const& _settings, langutil::EVMVersion const& _evmVersion)
+{
+	// Constructing it this way so that we notice changes in the fields.
+	evmasm::Assembly::OptimiserSettings asmSettings{false,  false, false, false, false, false, _evmVersion, 0};
+	asmSettings.runInliner = _settings.runInliner;
+	asmSettings.runJumpdestRemover = _settings.runJumpdestRemover;
+	asmSettings.runPeephole = _settings.runPeephole;
+	asmSettings.runDeduplicate = _settings.runDeduplicate;
+	asmSettings.runCSE = _settings.runCSE;
+	asmSettings.runConstantOptimiser = _settings.runConstantOptimiser;
+	asmSettings.expectedExecutionsPerDeployment = _settings.expectedExecutionsPerDeployment;
+	asmSettings.evmVersion = _evmVersion;
+	return asmSettings;
+}
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index 592119f17f..7b8b4509d8 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -128,6 +128,8 @@ class Assembly
 		/// This specifies an estimate on how often each opcode in this assembly will be executed,
 		/// i.e. use a small value to optimise for size and a large value to optimise for runtime gas usage.
 		size_t expectedExecutionsPerDeployment = frontend::OptimiserSettings{}.expectedExecutionsPerDeployment;
+
+		static OptimiserSettings translateSettings(frontend::OptimiserSettings const& _settings, langutil::EVMVersion const& _evmVersion);
 	};
 
 	/// Modify and return the current assembly such that creation and execution gas usage
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index 948502e690..bc69f82c57 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -572,21 +572,6 @@ void CompilerContext::updateSourceLocation()
 	m_asm->setSourceLocation(m_visitedNodes.empty() ? SourceLocation() : m_visitedNodes.top()->location());
 }
 
-evmasm::Assembly::OptimiserSettings CompilerContext::translateOptimiserSettings(OptimiserSettings const& _settings)
-{
-	// Constructing it this way so that we notice changes in the fields.
-	evmasm::Assembly::OptimiserSettings asmSettings{false,  false, false, false, false, false, m_evmVersion, 0};
-	asmSettings.runInliner = _settings.runInliner;
-	asmSettings.runJumpdestRemover = _settings.runJumpdestRemover;
-	asmSettings.runPeephole = _settings.runPeephole;
-	asmSettings.runDeduplicate = _settings.runDeduplicate;
-	asmSettings.runCSE = _settings.runCSE;
-	asmSettings.runConstantOptimiser = _settings.runConstantOptimiser;
-	asmSettings.expectedExecutionsPerDeployment = _settings.expectedExecutionsPerDeployment;
-	asmSettings.evmVersion = m_evmVersion;
-	return asmSettings;
-}
-
 evmasm::AssemblyItem CompilerContext::FunctionCompilationQueue::entryLabel(
 	Declaration const& _declaration,
 	CompilerContext& _context
diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h
index a796ac60b2..4f7fd3abd1 100644
--- a/libsolidity/codegen/CompilerContext.h
+++ b/libsolidity/codegen/CompilerContext.h
@@ -283,7 +283,7 @@ class CompilerContext
 	void appendToAuxiliaryData(bytes const& _data) { m_asm->appendToAuxiliaryData(_data); }
 
 	/// Run optimisation step.
-	void optimise(OptimiserSettings const& _settings) { m_asm->optimise(translateOptimiserSettings(_settings)); }
+	void optimise(OptimiserSettings const& _settings) { m_asm->optimise(evmasm::Assembly::OptimiserSettings::translateSettings(_settings, m_evmVersion)); }
 
 	/// @returns the runtime context if in creation mode and runtime context is set, nullptr otherwise.
 	CompilerContext* runtimeContext() const { return m_runtimeContext; }
@@ -314,8 +314,6 @@ class CompilerContext
 	/// Updates source location set in the assembly.
 	void updateSourceLocation();
 
-	evmasm::Assembly::OptimiserSettings translateOptimiserSettings(OptimiserSettings const& _settings);
-
 	/**
 	 * Helper class that manages function labels and ensures that referenced functions are
 	 * compiled in a specific order.
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 7553ee4692..9bd80d256a 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -64,27 +64,6 @@ Dialect const& languageToDialect(YulStack::Language _language, EVMVersion _versi
 	return Dialect::yulDeprecated();
 }
 
-// Duplicated from libsolidity/codegen/CompilerContext.cpp
-// TODO: refactor and remove duplication
-evmasm::Assembly::OptimiserSettings translateOptimiserSettings(
-	frontend::OptimiserSettings const& _settings,
-	langutil::EVMVersion _evmVersion
-)
-{
-	// Constructing it this way so that we notice changes in the fields.
-	evmasm::Assembly::OptimiserSettings asmSettings{false,  false, false, false, false, false, _evmVersion, 0};
-	asmSettings.runInliner = _settings.runInliner;
-	asmSettings.runJumpdestRemover = _settings.runJumpdestRemover;
-	asmSettings.runPeephole = _settings.runPeephole;
-	asmSettings.runDeduplicate = _settings.runDeduplicate;
-	asmSettings.runCSE = _settings.runCSE;
-	asmSettings.runConstantOptimiser = _settings.runConstantOptimiser;
-	asmSettings.expectedExecutionsPerDeployment = _settings.expectedExecutionsPerDeployment;
-	asmSettings.evmVersion = _evmVersion;
-
-	return asmSettings;
-}
-
 }
 
 
@@ -289,7 +268,7 @@ YulStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
 	EthAssemblyAdapter adapter(assembly);
 	compileEVM(adapter, m_optimiserSettings.optimizeStackAllocation);
 
-	assembly.optimise(translateOptimiserSettings(m_optimiserSettings, m_evmVersion));
+	assembly.optimise(evmasm::Assembly::OptimiserSettings::translateSettings(m_optimiserSettings, m_evmVersion));
 
 	optional<size_t> subIndex;
 

From c23093e0f0a28bcc6a05fe06953d70be3f96cee3 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 28 Sep 2022 00:24:48 -0300
Subject: [PATCH 0971/1748] [libsolutil] Add new JSON helper functions.

---
 libsolutil/JSON.h        |  65 ++++++++++++++++++++
 test/libsolutil/JSON.cpp | 125 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/libsolutil/JSON.h b/libsolutil/JSON.h
index 43dddfd4a4..12c450a32c 100644
--- a/libsolutil/JSON.h
+++ b/libsolutil/JSON.h
@@ -67,4 +67,69 @@ std::string jsonPrint(Json::Value const& _input, JsonFormat const& _format);
 /// \return \c true if the document was successfully parsed, \c false if an error occurred.
 bool jsonParseStrict(std::string const& _input, Json::Value& _json, std::string* _errs = nullptr);
 
+namespace detail
+{
+
+template<typename T>
+struct helper;
+
+#define DEFINE_JSON_CONVERSION_HELPERS(TYPE, CHECK_TYPE_MEMBER, CONVERT_TYPE_MEMBER) \
+	template<>                                                                       \
+	struct helper<TYPE>                                                              \
+	{                                                                                \
+		static bool isOfType(Json::Value const& _input)                              \
+		{                                                                            \
+			return _input.CHECK_TYPE_MEMBER();                                       \
+		}                                                                            \
+		static TYPE get(Json::Value const& _input)                                   \
+		{                                                                            \
+			return _input.CONVERT_TYPE_MEMBER();                                     \
+		}                                                                            \
+		static TYPE getOrDefault(Json::Value const& _input, TYPE _default = {})      \
+		{                                                                            \
+			TYPE result = _default;                                                  \
+			if (helper::isOfType(_input))                                            \
+				result = _input.CONVERT_TYPE_MEMBER();                               \
+			return result;                                                           \
+		}                                                                            \
+	};
+
+DEFINE_JSON_CONVERSION_HELPERS(float, isDouble, asFloat)
+DEFINE_JSON_CONVERSION_HELPERS(double, isDouble, asDouble)
+DEFINE_JSON_CONVERSION_HELPERS(std::string, isString, asString)
+DEFINE_JSON_CONVERSION_HELPERS(Json::Int, isInt, asInt)
+DEFINE_JSON_CONVERSION_HELPERS(Json::Int64, isInt64, asInt64)
+DEFINE_JSON_CONVERSION_HELPERS(Json::UInt, isUInt, asUInt)
+DEFINE_JSON_CONVERSION_HELPERS(Json::UInt64, isUInt64, asUInt64)
+
+#undef DEFINE_JSON_CONVERSION_HELPERS
+
+} // namespace detail
+
+template<typename T>
+bool isOfType(Json::Value const& _input)
+{
+	return detail::helper<T>::isOfType(_input);
+}
+
+template<typename T>
+bool isOfTypeIfExists(Json::Value const& _input, std::string const& _name)
+{
+	if (_input.isMember(_name))
+		return isOfType<T>(_input[_name]);
+	return true;
+}
+
+template<typename T>
+T get(Json::Value const& _input)
+{
+	return detail::helper<T>::get(_input);
 }
+
+template<typename T>
+T getOrDefault(Json::Value const& _input, T _default = {})
+{
+	return detail::helper<T>::getOrDefault(_input, _default);
+}
+
+} // namespace solidity::util
diff --git a/test/libsolutil/JSON.cpp b/test/libsolutil/JSON.cpp
index 1b0ed93889..3679fbe7c1 100644
--- a/test/libsolutil/JSON.cpp
+++ b/test/libsolutil/JSON.cpp
@@ -184,6 +184,131 @@ BOOST_AUTO_TEST_CASE(parse_json_strict)
 	BOOST_CHECK(json[0] == "😊");
 }
 
+BOOST_AUTO_TEST_CASE(json_isOfType)
+{
+	Json::Value json;
+
+	json["float"] = 3.1f;
+	json["double"] = 3.1;
+	json["int"] = 2;
+	json["int64"] = Json::Int64{0x4000000000000000};
+	json["string"] = "Hello World!";
+
+	BOOST_CHECK(isOfType<float>(json["float"]));
+	BOOST_CHECK(isOfType<double>(json["double"]));
+	BOOST_CHECK(isOfType<int>(json["int"]));
+	BOOST_CHECK(isOfType<Json::Int>(json["int"]));
+	BOOST_CHECK(isOfType<Json::UInt>(json["int"]));
+	BOOST_CHECK(isOfType<Json::Int64>(json["int"]));
+	BOOST_CHECK(isOfType<Json::Int64>(json["int64"]));
+	BOOST_CHECK(isOfType<Json::UInt64>(json["int64"]));
+	BOOST_CHECK(isOfType<std::string>(json["string"]));
+	BOOST_CHECK(!isOfType<Json::Int>(json["int64"]));
+	BOOST_CHECK(!isOfType<int>(json["double"]));
+	BOOST_CHECK(!isOfType<float>(json["string"]));
+	BOOST_CHECK(!isOfType<double>(json["string"]));
+	BOOST_CHECK(!isOfType<Json::Int>(json["string"]));
+	BOOST_CHECK(!isOfType<Json::Int64>(json["string"]));
+	BOOST_CHECK(!isOfType<Json::UInt>(json["string"]));
+	BOOST_CHECK(!isOfType<Json::UInt64>(json["string"]));
+}
+
+BOOST_AUTO_TEST_CASE(json_isisOfTypeIfExists)
+{
+	Json::Value json;
+
+	json["float"] = 3.1f;
+	json["double"] = 3.1;
+	json["int"] = 2;
+	json["int64"] = Json::Int64{0x4000000000000000};
+	json["string"] = "Hello World!";
+
+	BOOST_CHECK(isOfTypeIfExists<float>(json, "float"));
+	BOOST_CHECK(isOfTypeIfExists<double>(json, "double"));
+	BOOST_CHECK(isOfTypeIfExists<int>(json, "int"));
+	BOOST_CHECK(isOfTypeIfExists<Json::Int>(json, "int"));
+	BOOST_CHECK(isOfTypeIfExists<Json::UInt>(json, "int"));
+	BOOST_CHECK(isOfTypeIfExists<Json::Int64>(json, "int"));
+	BOOST_CHECK(isOfTypeIfExists<Json::Int64>(json, "int64"));
+	BOOST_CHECK(isOfTypeIfExists<Json::UInt64>(json, "int64"));
+	BOOST_CHECK(isOfTypeIfExists<std::string>(json, "string"));
+	BOOST_CHECK(!isOfTypeIfExists<Json::Int>(json, "int64"));
+	BOOST_CHECK(!isOfTypeIfExists<int>(json, "double"));
+	BOOST_CHECK(!isOfTypeIfExists<float>(json, "string"));
+	BOOST_CHECK(!isOfTypeIfExists<double>(json, "string"));
+	BOOST_CHECK(!isOfTypeIfExists<Json::Int>(json, "string"));
+	BOOST_CHECK(!isOfTypeIfExists<Json::Int64>(json, "string"));
+	BOOST_CHECK(!isOfTypeIfExists<Json::UInt>(json, "string"));
+	BOOST_CHECK(!isOfTypeIfExists<Json::UInt64>(json, "string"));
+	BOOST_CHECK(isOfTypeIfExists<Json::UInt64>(json, "NOT_EXISTING"));
+}
+
+BOOST_AUTO_TEST_CASE(json_getOrDefault)
+{
+	Json::Value json;
+
+	json["float"] = 3.1f;
+	json["double"] = 3.1;
+	json["int"] = 2;
+	json["int64"] = Json::Int64{0x4000000000000000};
+	json["uint64"] = Json::UInt64{0x5000000000000000};
+	json["string"] = "Hello World!";
+
+	BOOST_CHECK(getOrDefault<float>(json["float"]) == 3.1f);
+	BOOST_CHECK(getOrDefault<float>(json["float"], -1.1f) == 3.1f);
+	BOOST_CHECK(getOrDefault<float>(json["no_float"], -1.1f) == -1.1f);
+	BOOST_CHECK(getOrDefault<double>(json["double"]) == 3.1);
+	BOOST_CHECK(getOrDefault<double>(json["double"], -1) == 3.1);
+	BOOST_CHECK(getOrDefault<double>(json["no_double"], -1.1) == -1.1);
+	BOOST_CHECK(getOrDefault<int>(json["int"]) == 2);
+	BOOST_CHECK(getOrDefault<int>(json["int"], -1) == 2);
+	BOOST_CHECK(getOrDefault<int>(json["no_int"], -1) == -1);
+	BOOST_CHECK(getOrDefault<Json::Int>(json["int"]) == 2);
+	BOOST_CHECK(getOrDefault<Json::Int>(json["int"], -1) == 2);
+	BOOST_CHECK(getOrDefault<Json::Int>(json["no_int"], -1) == -1);
+	BOOST_CHECK(getOrDefault<Json::UInt>(json["int"]) == 2);
+	BOOST_CHECK(getOrDefault<Json::UInt>(json["int"], 1) == 2);
+	BOOST_CHECK(getOrDefault<Json::UInt>(json["no_int"], 1) == 1);
+	BOOST_CHECK(getOrDefault<Json::Int64>(json["int"]) == 2);
+	BOOST_CHECK(getOrDefault<Json::Int64>(json["int"], -1) == 2);
+	BOOST_CHECK(getOrDefault<Json::Int64>(json["no_int"], -1) == -1);
+	BOOST_CHECK(getOrDefault<Json::Int64>(json["int64"]) == 0x4000000000000000);
+	BOOST_CHECK(getOrDefault<Json::Int64>(json["int64"], -1) == 0x4000000000000000);
+	BOOST_CHECK(getOrDefault<Json::Int64>(json["no_int64"], -1) == -1);
+	BOOST_CHECK(getOrDefault<Json::UInt64>(json["int64"]) == 0x4000000000000000);
+	BOOST_CHECK(getOrDefault<Json::UInt64>(json["int64"], 1) == 0x4000000000000000);
+	BOOST_CHECK(getOrDefault<Json::UInt64>(json["no_int64"], 1) == 1);
+	BOOST_CHECK(getOrDefault<Json::UInt64>(json["uint64"]) == 0x5000000000000000);
+	BOOST_CHECK(getOrDefault<Json::UInt64>(json["uint64"], 1) == 0x5000000000000000);
+	BOOST_CHECK(getOrDefault<Json::UInt64>(json["no_uint64"], 1) == 1);
+	BOOST_CHECK(getOrDefault<std::string>(json["string"], "ERROR") == "Hello World!");
+	BOOST_CHECK(getOrDefault<std::string>(json["no_string"]).empty());
+	BOOST_CHECK(getOrDefault<std::string>(json["no_string"], "ERROR") == "ERROR");
+}
+
+BOOST_AUTO_TEST_CASE(json_get)
+{
+	Json::Value json;
+
+	json["float"] = 3.1f;
+	json["double"] = 3.1;
+	json["int"] = 2;
+	json["int64"] = Json::Int64{0x4000000000000000};
+	json["uint64"] = Json::UInt64{0x5000000000000000};
+	json["string"] = "Hello World!";
+
+	BOOST_CHECK(get<float>(json["float"]) == 3.1f);
+	BOOST_CHECK(get<double>(json["double"]) == 3.1);
+	BOOST_CHECK(get<int>(json["int"]) == 2);
+	BOOST_CHECK(get<Json::Int>(json["int"]) == 2);
+	BOOST_CHECK(get<Json::UInt>(json["int"]) == 2);
+	BOOST_CHECK(get<Json::Int64>(json["int"]) == 2);
+	BOOST_CHECK(get<Json::Int64>(json["int64"]) == 0x4000000000000000);
+	BOOST_CHECK(get<Json::UInt64>(json["int64"]) == 0x4000000000000000);
+	BOOST_CHECK(get<Json::UInt64>(json["uint64"]) == 0x5000000000000000);
+	BOOST_CHECK(get<std::string>(json["string"]) == "Hello World!");
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }

From c3d9f001c7d3c7e878180406ab6955e7d8e94fa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 24 Oct 2022 19:33:36 +0200
Subject: [PATCH 0972/1748] Rename b_ubu_release to b_ubu_force_release

---
 .circleci/config.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 57771d5059..0d7ccdef13 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -472,10 +472,10 @@ defaults:
       requires:
         - b_ubu_clang
 
-  - workflow_ubuntu2004_release: &workflow_ubuntu2004_release
+  - workflow_ubuntu2004_force_release: &workflow_ubuntu2004_force_release
       <<: *workflow_trigger_on_tags
       requires:
-        - b_ubu_release
+        - b_ubu_force_release
 
   - workflow_ubuntu2004_static: &workflow_ubuntu2004_static
       <<: *workflow_trigger_on_tags
@@ -847,7 +847,7 @@ jobs:
       CMAKE_OPTIONS: << parameters.cmake_options >>
     <<: *steps_build
 
-  b_ubu_release: &b_ubu_release
+  b_ubu_force_release: &b_ubu_force_release
     <<: *b_ubu
     environment:
       FORCE_RELEASE: ON
@@ -1093,16 +1093,16 @@ jobs:
       SOLTEST_FLAGS: --no-smt
     <<: *steps_soltest
 
-  t_ubu_release_soltest_all: &t_ubu_release_soltest_all
+  t_ubu_force_release_soltest_all: &t_ubu_force_release_soltest_all
     # NOTE: This definition is identical to t_ubu_soltest_all but in the workflow we make it depend on
-    # a different job (b_ubu_release) so the workspace it attaches contains a different executable.
+    # a different job (b_ubu_force_release) so the workspace it attaches contains a different executable.
     <<: *t_ubu_soltest_all
 
   t_ubu_cli: &t_ubu_cli
     <<: *base_ubuntu2004_small
     <<: *steps_cmdline_tests
 
-  t_ubu_release_cli: &t_ubu_release_cli
+  t_ubu_force_release_cli: &t_ubu_force_release_cli
     <<: *t_ubu_cli
 
   t_ubu_locale:
@@ -1590,9 +1590,9 @@ workflows:
       - t_ubu_lsp: *workflow_ubuntu2004
 
       # Ubuntu fake release build and tests
-      - b_ubu_release: *workflow_trigger_on_tags
-      - t_ubu_release_cli: *workflow_ubuntu2004_release
-      - t_ubu_release_soltest_all: *workflow_ubuntu2004_release
+      - b_ubu_force_release: *workflow_trigger_on_tags
+      - t_ubu_force_release_cli: *workflow_ubuntu2004_force_release
+      - t_ubu_force_release_soltest_all: *workflow_ubuntu2004_force_release
 
       # Emscripten build and tests that take 15 minutes or less
       - b_ems: *workflow_trigger_on_tags

From 489fa38b5b7c7e01d0b94745f1f81e449591f157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 May 2022 15:06:53 +0200
Subject: [PATCH 0973/1748] CI: Remove b_win_release job

---
 .circleci/config.yml | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0d7ccdef13..e75eed4bde 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -527,11 +527,6 @@ defaults:
       requires:
         - b_win
 
-  - workflow_win_release: &workflow_win_release
-      <<: *workflow_trigger_on_tags
-      requires:
-        - b_win_release
-
   # --------------------------------------------------------------------------
   # Parameterized Job Templates
 
@@ -1373,11 +1368,6 @@ jobs:
             - .\test\*\soltest.exe
       - gitter_notify_failure_unless_pr
 
-  b_win_release:
-    <<: *b_win
-    environment:
-      FORCE_RELEASE: ON
-
   t_win_soltest: &t_win_soltest
     <<: *base_win_powershell
     steps:
@@ -1405,9 +1395,6 @@ jobs:
       - store_artifacts: *artifacts_test_results
       - gitter_notify_failure_unless_pr
 
-  t_win_release_soltest:
-    <<: *t_win_soltest
-
   b_bytecode_ubu:
     <<: *base_ubuntu2004_small
     steps:
@@ -1639,9 +1626,7 @@ workflows:
 
       # Windows build and tests
       - b_win: *workflow_trigger_on_tags
-      - b_win_release: *workflow_trigger_on_tags
       - t_win_soltest: *workflow_win
-      - t_win_release_soltest: *workflow_win_release
 
       # Bytecode comparison:
       - b_bytecode_ubu:
@@ -1674,7 +1659,7 @@ workflows:
           requires:
             - b_ubu_static
             - b_osx
-            - b_win_release
+            - b_win
             - b_ems
 
   nightly:

From 273edd2c8607b83a7d0c15f7d373ee02b61a400e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 May 2022 15:23:20 +0200
Subject: [PATCH 0974/1748] CI: Switch from deprecated circleci/node images to
 cimg/node

---
 .circleci/config.yml | 62 +++++++++++++++++++++++++++-----------------
 1 file changed, 38 insertions(+), 24 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e75eed4bde..a235bcbe01 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -428,7 +428,7 @@ defaults:
 
   - base_python_small: &base_python_small
       docker:
-        - image: circleci/python:3.6
+        - image: cimg/python:3.6
       resource_class: small
       environment:
         TERM: xterm
@@ -436,7 +436,7 @@ defaults:
 
   - base_node_small: &base_node_small
       docker:
-        - image: circleci/node
+        - image: cimg/node:current
       resource_class: small
       environment:
         TERM: xterm
@@ -537,98 +537,97 @@ defaults:
       project: colony
       binary_type: solcjs
       compile_only: 1
-      nodejs_version: '14'
+      nodejs_version: '14.20'
+      python2: true
 
   - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_gnosis
       project: gnosis
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
-      nodejs_version: '16'
+      nodejs_version: '16.18'
   - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_zeppelin
       project: zeppelin
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
-      nodejs_version: '16'
+      nodejs_version: '16.18'
       resource_class: large
   - job_native_test_ext_ens: &job_native_test_ext_ens
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_ens
       project: ens
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
   - job_native_test_ext_trident: &job_native_test_ext_trident
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_trident
       project: trident
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
   - job_native_test_ext_euler: &job_native_test_ext_euler
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_euler
       project: euler
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
       resource_class: medium
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_yield_liquidator
       project: yield-liquidator
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
   - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_bleeps
       project: bleeps
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
       resource_class: medium
   - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_pool_together
       project: pool-together
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
   - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_perpetual_pools
       project: perpetual-pools
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
   - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_uniswap
       project: uniswap
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
   - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_elementfi
       project: elementfi
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
       resource_class: medium
   - job_native_test_ext_brink: &job_native_test_ext_brink
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_brink
       project: brink
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
   - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_chainlink
       project: chainlink
       binary_type: native
-      nodejs_version: '16'
+      nodejs_version: '16.18'
       resource_class: large # Tests run out of memory on a smaller machine
   - job_native_test_ext_gp2: &job_native_test_ext_gp2
       <<: *workflow_ubuntu2004_static
@@ -636,14 +635,15 @@ defaults:
       project: gp2
       binary_type: native
       # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
-      nodejs_version: '16'
+      nodejs_version: '16.18'
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *workflow_emscripten
       name: t_ems_test_ext_colony
       project: colony
       binary_type: solcjs
-      nodejs_version: '14'
+      nodejs_version: '14.20'
       resource_class: medium
+      python2: true
 
   - job_b_ubu_asan_clang: &job_b_ubu_asan_clang
       <<: *workflow_trigger_on_tags
@@ -1178,7 +1178,7 @@ jobs:
   t_ems_ext_hardhat:
     <<: *base_node_small
     docker:
-      - image: circleci/node:16
+      - image: cimg/node:16.18
     environment:
       TERM: xterm
       HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
@@ -1217,12 +1217,15 @@ jobs:
         default: 0
       nodejs_version:
         type: string
-        default: latest
+        default: current
       resource_class:
         type: string
         default: small
+      python2:
+        type: boolean
+        default: false
     docker:
-      - image: circleci/node:<<parameters.nodejs_version>>
+      - image: cimg/node:<<parameters.nodejs_version>>
     resource_class: <<parameters.resource_class>>
     # NOTE: Each external test runs up to 6 independent settings presets. If parallelism is higher than
     # actual preset count, some runs will exit immediately. If it's lower, some runs will get more than one preset.
@@ -1238,7 +1241,18 @@ jobs:
           name: Install lsof
           command: |
             # lsof is used by Colony in its stop-blockchain-client.sh script
+            sudo apt update
             sudo apt-get --quiet --assume-yes --no-install-recommends install lsof
+      - when:
+          condition: << parameters.python2 >>
+          steps:
+            - run:
+                name: Install Python 2 and make it the default
+                command: |
+                  # python is used by node-gyp to build native modules (needed for Colony).
+                  # In the 14.x image node-gyp still requires Python 2.
+                  sudo apt install python2 --assume-yes --no-install-recommends
+                  sudo update-alternatives --install /usr/bin/python python /usr/bin/python2 1
       - when:
           condition:
             equal: [<< parameters.binary_type >>, "solcjs"]

From 10905ac51dad4947db3592cefe0dd9736812dc88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 24 Oct 2022 19:41:10 +0200
Subject: [PATCH 0975/1748] CI: Update external tests to run with latest node
 version supported by each

---
 .circleci/config.yml | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a235bcbe01..e7c64b1b69 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -551,14 +551,13 @@ defaults:
       name: t_native_test_ext_zeppelin
       project: zeppelin
       binary_type: native
-      nodejs_version: '16.18'
       resource_class: large
   - job_native_test_ext_ens: &job_native_test_ext_ens
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_ens
       project: ens
       binary_type: native
-      nodejs_version: '16.18'
+      nodejs_version: '18.11'
   - job_native_test_ext_trident: &job_native_test_ext_trident
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_trident
@@ -570,20 +569,17 @@ defaults:
       name: t_native_test_ext_euler
       project: euler
       binary_type: native
-      nodejs_version: '16.18'
       resource_class: medium
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_yield_liquidator
       project: yield-liquidator
       binary_type: native
-      nodejs_version: '16.18'
   - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_bleeps
       project: bleeps
       binary_type: native
-      nodejs_version: '16.18'
       resource_class: medium
   - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
       <<: *workflow_ubuntu2004_static
@@ -596,7 +592,7 @@ defaults:
       name: t_native_test_ext_perpetual_pools
       project: perpetual-pools
       binary_type: native
-      nodejs_version: '16.18'
+      nodejs_version: '18.11'
   - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_uniswap
@@ -608,20 +604,19 @@ defaults:
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
-      nodejs_version: '16.18'
+      nodejs_version: '18.11'
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_elementfi
       project: elementfi
       binary_type: native
-      nodejs_version: '16.18'
       resource_class: medium
   - job_native_test_ext_brink: &job_native_test_ext_brink
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_brink
       project: brink
       binary_type: native
-      nodejs_version: '16.18'
+      nodejs_version: '18.11'
   - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
       <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_chainlink
@@ -634,8 +629,7 @@ defaults:
       name: t_native_test_ext_gp2
       project: gp2
       binary_type: native
-      # NOTE: Tests crash on nodejs 17: "Error: error:0308010C:digital envelope routines::unsupported"
-      nodejs_version: '16.18'
+      nodejs_version: '18.11'
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *workflow_emscripten
       name: t_ems_test_ext_colony
@@ -1178,7 +1172,7 @@ jobs:
   t_ems_ext_hardhat:
     <<: *base_node_small
     docker:
-      - image: cimg/node:16.18
+      - image: cimg/node:18.11
     environment:
       TERM: xterm
       HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js

From fe118abb5351b4265ea87ef2a2717922b310866c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 May 2022 15:27:15 +0200
Subject: [PATCH 0976/1748] CI: Switch from deprecated circleci/buildpack-deps
 image to cimg/base

---
 .circleci/config.yml                          | 45 +++++++++++--------
 scripts/bytecodecompare/storebytecode.sh      |  3 ++
 .../bytecode_reports_for_modified_binaries.sh |  3 ++
 3 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e7c64b1b69..6efc45f73f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -356,17 +356,9 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j 10
 
-  - base_buildpack_focal_small: &base_buildpack_focal_small
+  - base_cimg_small: &base_cimg_small
       docker:
-        - image: buildpack-deps:focal
-      resource_class: small
-      environment:
-        TERM: xterm
-        MAKEFLAGS: -j 2
-
-  - base_buildpack_latest_small: &base_buildpack_latest_small
-      docker:
-        - image: buildpack-deps:latest
+        - image: cimg/base:current
       resource_class: small
       environment:
         TERM: xterm
@@ -681,12 +673,14 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_coding_style:
-    <<: *base_buildpack_focal_small
+    <<: *base_cimg_small
     steps:
       - checkout
       - run:
           name: Install shellcheck
-          command: apt -q update && apt install -y shellcheck
+          command: |
+            sudo apt -q update
+            sudo apt install -y shellcheck
       - run:
           name: Check for C++ coding style
           command: ./scripts/check_style.sh
@@ -708,12 +702,14 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_pylint:
-    <<: *base_buildpack_focal_small
+    <<: *base_cimg_small
     steps:
       - checkout
       - run:
           name: Install pip
-          command: apt -q update && apt install -y python3-pip
+          command: |
+            sudo apt -q update
+            sudo apt install -y python3-pip
       - run:
           name: Install pylint and dependencies of the scripts that will be linted
           command: python3 -m pip install
@@ -732,12 +728,14 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_antlr_grammar:
-    <<: *base_buildpack_focal_small
+    <<: *base_cimg_small
     steps:
       - checkout
       - run:
           name: Install Java
-          command: apt -q update && apt install -y openjdk-16-jdk
+          command: |
+            sudo apt -q update
+            sudo apt install -y openjdk-16-jdk
       - run:
           name: Run tests
           command: ./scripts/test_antlr_grammar.sh
@@ -759,14 +757,14 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_proofs:
-    <<: *base_buildpack_latest_small
+    <<: *base_cimg_small
     steps:
       - checkout
       - run:
           name: Z3 python deps
           command: |
-            apt-get -qq update
-            apt-get -qy install python3-pip
+            sudo apt-get -qq update
+            sudo apt-get -qy install python3-pip
             pip3 install --user z3-solver
       - run: *run_proofs
       - gitter_notify_failure_unless_pr
@@ -1405,6 +1403,10 @@ jobs:
 
   b_bytecode_ubu:
     <<: *base_ubuntu2004_small
+    environment:
+      TERM: xterm
+      MAKEFLAGS: -j 2
+      LC_ALL: C
     steps:
       - checkout
       - attach_workspace:
@@ -1414,6 +1416,10 @@ jobs:
 
   b_bytecode_osx:
     <<: *base_osx
+    environment:
+      TERM: xterm
+      MAKEFLAGS: -j 5
+      LC_ALL: C
     steps:
       - checkout
       - attach_workspace:
@@ -1449,6 +1455,7 @@ jobs:
     <<: *base_node_small
     environment:
       SOLC_EMSCRIPTEN: "On"
+      LC_ALL: C
     steps:
       - checkout
       - attach_workspace:
diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
index 2192960e4b..beeb79d093 100755
--- a/scripts/bytecodecompare/storebytecode.sh
+++ b/scripts/bytecodecompare/storebytecode.sh
@@ -35,6 +35,9 @@ REPO_ROOT=$(pwd) # make it absolute
 
 BUILD_DIR="${1:-${REPO_ROOT}/build}"
 
+# Set locale to C to prevent it from affecting glob sort order.
+export LC_ALL=C
+
 echo "Compiling all test contracts into bytecode..."
 TMPDIR=$(mktemp -d)
 (
diff --git a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
index 68ab995afc..92c522f8f5 100755
--- a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
+++ b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
@@ -104,6 +104,9 @@ tmp_dir=$(mktemp -d -t bytecode-reports-XXXXXX)
 solcjs_dir="$tmp_dir/solcjs"
 script_dir="$solidity_dir/scripts"
 
+# Set locale to C to prevent it from affecting glob sort order.
+export LC_ALL=C
+
 cd "$tmp_dir"
 
 git clone https://github.com/ethereum/solc-js.git "$solcjs_dir"

From c675266393b3882a04fe28050e264bb12dcba014 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 31 May 2022 15:51:50 +0200
Subject: [PATCH 0977/1748] Switch to bash.exe in b_bytecode_win to be able to
 control locale

---
 .circleci/config.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6efc45f73f..41b7da87c9 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -390,10 +390,10 @@ defaults:
         shell: powershell.exe
         size: large
 
-  - base_win_cmd: &base_win_cmd
+  - base_win_bash: &base_win_bash
       executor:
         name: win/default
-        shell: cmd.exe
+        shell: bash.exe
 
   - base_osx: &base_osx
       macos:
@@ -1428,7 +1428,9 @@ jobs:
           label: "osx"
 
   b_bytecode_win:
-    <<: *base_win_cmd
+    <<: *base_win_bash
+    environment:
+      LC_ALL: C
     steps:
       # NOTE: For bytecode generation we need the input files to be byte-for-byte identical on all
       # platforms so line ending conversions must absolutely be disabled.
@@ -1436,10 +1438,10 @@ jobs:
       - checkout
       - attach_workspace:
           at: build
-      - run: mkdir test-cases\
-      - run: cd test-cases\ && python ..\scripts\isolate_tests.py ..\test\
-      - run: cd test-cases\ && python ..\scripts\bytecodecompare\prepare_report.py ..\build\solc\Release\solc.exe --interface standard-json --report-file ..\bytecode-report-windows-json.txt
-      - run: cd test-cases\ && python ..\scripts\bytecodecompare\prepare_report.py ..\build\solc\Release\solc.exe --interface cli --report-file ..\bytecode-report-windows-cli.txt
+      - run: mkdir test-cases/
+      - run: cd test-cases/ && python ../scripts/isolate_tests.py ../test/
+      - run: cd test-cases/ && python ../scripts/bytecodecompare/prepare_report.py ../build/solc/Release/solc.exe --interface standard-json --report-file ../bytecode-report-windows-json.txt
+      - run: cd test-cases/ && python ../scripts/bytecodecompare/prepare_report.py ../build/solc/Release/solc.exe --interface cli --report-file ../bytecode-report-windows-cli.txt
       - store_artifacts:
           path: bytecode-report-windows-json.txt
       - store_artifacts:

From 339bf38584df0b12abd8d3cd8b1c81b66445835b Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 7 Oct 2022 14:25:52 +0200
Subject: [PATCH 0978/1748] Silence warning about improper quoting in
 .circleci/soltest.sh

---
 .circleci/soltest.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/soltest.sh b/.circleci/soltest.sh
index 7b5b885935..e350aa23d7 100755
--- a/.circleci/soltest.sh
+++ b/.circleci/soltest.sh
@@ -92,7 +92,7 @@ do
 done
 
 # wait for individual processes to get their exit status
-for pid in ${PIDs[*]}
+for pid in "${PIDs[@]}"
 do
     wait "$pid"
 done

From 6cef697246e0fa730d54f23f6514ac57d3b78ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 24 Oct 2022 19:21:05 +0200
Subject: [PATCH 0979/1748] chk_antlr_grammar: bump openJDK to version 17

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 41b7da87c9..09da282039 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -735,7 +735,7 @@ jobs:
           name: Install Java
           command: |
             sudo apt -q update
-            sudo apt install -y openjdk-16-jdk
+            sudo apt install -y openjdk-17-jdk
       - run:
           name: Run tests
           command: ./scripts/test_antlr_grammar.sh

From 5294ead64f57ae01869927fd2e6861c7a3a2ee33 Mon Sep 17 00:00:00 2001
From: Rhythm Bansal <rskbansal@outlook.com>
Date: Thu, 27 Oct 2022 16:41:57 +0530
Subject: [PATCH 0980/1748] removed 'Read the Docs' as it's no longer used

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9637503b0e..d43850f383 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ browser-based IDE. Here are some example contracts:
 
 ## Documentation
 
-The Solidity documentation is hosted at [Read the docs](https://docs.soliditylang.org).
+The Solidity documentation is hosted [here](https://docs.soliditylang.org).
 
 ## Development
 

From 6f63fb681c5457fbb99686bb06cf416ea924f0ce Mon Sep 17 00:00:00 2001
From: Rhythm Bansal <rskbansal@outlook.com>
Date: Thu, 27 Oct 2022 16:54:00 +0530
Subject: [PATCH 0981/1748] added credits for 'Read the Docs'

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d43850f383..c0c7d0cf6d 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ browser-based IDE. Here are some example contracts:
 
 ## Documentation
 
-The Solidity documentation is hosted [here](https://docs.soliditylang.org).
+The Solidity documentation is hosted [here](https://docs.soliditylang.org) using **Read the Docs**.
 
 ## Development
 

From 776952f9402fa9bdb487d316dfafc579b440bd55 Mon Sep 17 00:00:00 2001
From: Rhythm Bansal <rskbansal@outlook.com>
Date: Thu, 27 Oct 2022 17:09:37 +0530
Subject: [PATCH 0982/1748] using 'Read the Docs' should be apt

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c0c7d0cf6d..89ae6c89d4 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ browser-based IDE. Here are some example contracts:
 
 ## Documentation
 
-The Solidity documentation is hosted [here](https://docs.soliditylang.org) using **Read the Docs**.
+The Solidity documentation is hosted using [Read the Docs](https://docs.soliditylang.org).
 
 ## Development
 

From 8d4a354c69010aee410f30bc80950c66df7a280b Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Wed, 26 Oct 2022 22:47:52 +0530
Subject: [PATCH 0983/1748] raised resource class of cli tests to medium

---
 .circleci/config.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 57771d5059..334b8aa82a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -310,15 +310,6 @@ defaults:
         CXX: clang++
         MAKEFLAGS: -j 3
 
-  - base_ubuntu2004_clang_small: &base_ubuntu2004_clang_small
-      <<: *base_ubuntu2004_clang
-      resource_class: small
-      environment:
-        TERM: xterm
-        CC: clang
-        CXX: clang++
-        MAKEFLAGS: -j 2
-
   - base_ubuntu2004_clang_large: &base_ubuntu2004_clang_large
       <<: *base_ubuntu2004_clang
       resource_class: large
@@ -1156,7 +1147,7 @@ jobs:
     <<: *steps_soltest
 
   t_ubu_ubsan_clang_cli:
-    <<: *base_ubuntu2004_clang_small
+    <<: *base_ubuntu2004_clang
     <<: *steps_cmdline_tests
 
   t_ems_solcjs:

From d84050d15719ff6ec98ddd5552fcddc73f734a80 Mon Sep 17 00:00:00 2001
From: ligi <ligi@ligi.de>
Date: Mon, 31 Oct 2022 16:34:01 +0100
Subject: [PATCH 0984/1748] Remove the mention of RadSpec

---
 docs/natspec-format.rst | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/natspec-format.rst b/docs/natspec-format.rst
index 28848dae43..01726fe860 100644
--- a/docs/natspec-format.rst
+++ b/docs/natspec-format.rst
@@ -154,10 +154,6 @@ to the end-user as:
 
 if a function is being called and the input ``a`` is assigned a value of 10.
 
-Specifying these dynamic expressions is outside the scope of the Solidity
-documentation and you may read more at
-`the radspec project <https://github.com/aragon/radspec>`__.
-
 .. _header-inheritance:
 
 Inheritance Notes

From 91e9eadcf1f5aeb00d11d7dd6d0acd4c81a2f049 Mon Sep 17 00:00:00 2001
From: franzihei <franziheintel@gmail.com>
Date: Mon, 31 Oct 2022 12:43:11 +0100
Subject: [PATCH 0985/1748] [DOCS] Translations: Updated links and new
 languages

Update index.rst
---
 docs/contributing.rst |  4 ++--
 docs/index.rst        | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 35af6ac0be..0e1c92958f 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -12,7 +12,7 @@ In particular, we appreciate support in the following areas:
   `"good first issue" <https://github.com/ethereum/solidity/labels/good%20first%20issue>`_ which are
   meant as introductory issues for external contributors.
 * Improving the documentation.
-* Translating the documentation into more languages.
+* `Translating <https://github.com/solidity-docs>`_ the documentation into more languages.
 * Responding to questions from other users on `StackExchange
   <https://ethereum.stackexchange.com>`_ and the `Solidity Gitter Chat
   <https://gitter.im/ethereum/solidity>`_.
@@ -416,7 +416,7 @@ local slang and references, making your language as clear to all readers as poss
 .. note::
 
     While the official Solidity documentation is written in English, there are community contributed :ref:`translations`
-    in other languages available. Please refer to the `translation guide <https://github.com/solidity-docs/translation-guide>`_
+    in other languages available. Please refer to the `translation guide <https://github.com/solidity-docs#solidity-documentation-translation-guide>`_
     for information on how to contribute to the community translations.
 
 Title Case for Headings
diff --git a/docs/index.rst b/docs/index.rst
index 7576b36321..3cb27eaeda 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -95,17 +95,20 @@ version stands as a reference.
 You can switch between languages by clicking on the flyout menu in the bottom-left corner
 and selecting the preferred language.
 
+* `Chinese <https://github.com/solidity-docs/zh-cn-chinese/>`_
 * `French <https://docs.soliditylang.org/fr/latest/>`_
 * `Indonesian <https://github.com/solidity-docs/id-indonesian>`_
-* `Persian <https://github.com/solidity-docs/fa-persian>`_
 * `Japanese <https://github.com/solidity-docs/ja-japanese>`_
 * `Korean <https://github.com/solidity-docs/ko-korean>`_
-* `Chinese <https://github.com/solidity-docs/zh-cn-chinese/>`_
+* `Persian <https://github.com/solidity-docs/fa-persian>`_
+* `Russian <https://github.com/solidity-docs/ru-russian>`_
+* `Spanish <https://github.com/solidity-docs/es-spanish>`_
+* `Turkish <https://github.com/solidity-docs/tr-turkish>`_
 
 .. note::
 
-   We recently set up a new GitHub organization and translation workflow to help streamline the
-   community efforts. Please refer to the `translation guide <https://github.com/solidity-docs/translation-guide>`_
+   We set up a GitHub organization and translation workflow to help streamline the
+   community efforts. Please refer to the translation guide in the `solidity-docs org <https://github.com/solidity-docs>`_
    for information on how to start a new language or contribute to the community translations.
 
 Contents

From 74be2782422d4623afc419474ed6726136f75a8c Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 1 Nov 2022 12:49:22 +0100
Subject: [PATCH 0986/1748] De-macro helpers.

---
 libsolutil/JSON.h | 55 ++++++++++++++++++++++-------------------------
 1 file changed, 26 insertions(+), 29 deletions(-)

diff --git a/libsolutil/JSON.h b/libsolutil/JSON.h
index 12c450a32c..905859f6db 100644
--- a/libsolutil/JSON.h
+++ b/libsolutil/JSON.h
@@ -73,36 +73,33 @@ namespace detail
 template<typename T>
 struct helper;
 
-#define DEFINE_JSON_CONVERSION_HELPERS(TYPE, CHECK_TYPE_MEMBER, CONVERT_TYPE_MEMBER) \
-	template<>                                                                       \
-	struct helper<TYPE>                                                              \
-	{                                                                                \
-		static bool isOfType(Json::Value const& _input)                              \
-		{                                                                            \
-			return _input.CHECK_TYPE_MEMBER();                                       \
-		}                                                                            \
-		static TYPE get(Json::Value const& _input)                                   \
-		{                                                                            \
-			return _input.CONVERT_TYPE_MEMBER();                                     \
-		}                                                                            \
-		static TYPE getOrDefault(Json::Value const& _input, TYPE _default = {})      \
-		{                                                                            \
-			TYPE result = _default;                                                  \
-			if (helper::isOfType(_input))                                            \
-				result = _input.CONVERT_TYPE_MEMBER();                               \
-			return result;                                                           \
-		}                                                                            \
-	};
-
-DEFINE_JSON_CONVERSION_HELPERS(float, isDouble, asFloat)
-DEFINE_JSON_CONVERSION_HELPERS(double, isDouble, asDouble)
-DEFINE_JSON_CONVERSION_HELPERS(std::string, isString, asString)
-DEFINE_JSON_CONVERSION_HELPERS(Json::Int, isInt, asInt)
-DEFINE_JSON_CONVERSION_HELPERS(Json::Int64, isInt64, asInt64)
-DEFINE_JSON_CONVERSION_HELPERS(Json::UInt, isUInt, asUInt)
-DEFINE_JSON_CONVERSION_HELPERS(Json::UInt64, isUInt64, asUInt64)
+template<typename T, bool(Json::Value::*checkMember)() const, T(Json::Value::*convertMember)() const>
+struct helper_impl
+{
+	static bool isOfType(Json::Value const& _input)
+	{
+		return (_input.*checkMember)();
+	}
+	static T get(Json::Value const& _input)
+	{
+		return (_input.*convertMember)();
+	}
+	static T getOrDefault(Json::Value const& _input, T _default = {})
+	{
+		T result = _default;
+		if (isOfType(_input))
+			result = (_input.*convertMember)();
+		return result;
+	}
+};
 
-#undef DEFINE_JSON_CONVERSION_HELPERS
+template<> struct helper<float>: helper_impl<float, &Json::Value::isDouble, &Json::Value::asFloat> {};
+template<> struct helper<double>: helper_impl<double, &Json::Value::isDouble, &Json::Value::asDouble> {};
+template<> struct helper<std::string>: helper_impl<std::string, &Json::Value::isString, &Json::Value::asString> {};
+template<> struct helper<Json::Int>: helper_impl<Json::Int, &Json::Value::isInt, &Json::Value::asInt> {};
+template<> struct helper<Json::Int64>: helper_impl<Json::Int64, &Json::Value::isInt64, &Json::Value::asInt64> {};
+template<> struct helper<Json::UInt>: helper_impl<Json::UInt, &Json::Value::isUInt, &Json::Value::asUInt> {};
+template<> struct helper<Json::UInt64>: helper_impl<Json::UInt64, &Json::Value::isUInt64, &Json::Value::asUInt64> {};
 
 } // namespace detail
 

From 5b9096a381000e9cadcb0eb2ad4f751819cd374d Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 18 Oct 2022 14:43:41 -0500
Subject: [PATCH 0987/1748] [solc] Exit code 2 for exceptions.

---
 Changelog.md                   |  2 ++
 solc/main.cpp                  | 22 ++++-------------
 test/tools/isoltest.cpp        |  8 +++----
 tools/solidityUpgrade/main.cpp |  8 +++++--
 tools/yulPhaser/main.cpp       | 44 ++++------------------------------
 5 files changed, 22 insertions(+), 62 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e6fea266e1..68c755734a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+* Commandline Interface: Return exit code ``2`` on uncaught exceptions.
 * Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
 * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
 * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
@@ -11,6 +12,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Solidity Upgrade Tool ``solidity-upgrade``: Fix the tool returning success code on uncaught exceptions.
 
 
 ### 0.8.17 (2022-09-08)
diff --git a/solc/main.cpp b/solc/main.cpp
index 50a6a8fc52..a6fa5015b1 100644
--- a/solc/main.cpp
+++ b/solc/main.cpp
@@ -44,36 +44,24 @@ int main(int argc, char** argv)
 	{
 		cerr << "SMT logic error:" << endl;
 		cerr << boost::diagnostic_information(_exception);
-		return 1;
+		return 2;
 	}
 	catch (langutil::UnimplementedFeatureError const& _exception)
 	{
 		cerr << "Unimplemented feature:" << endl;
 		cerr << boost::diagnostic_information(_exception);
-		return 1;
+		return 2;
 	}
 	catch (langutil::InternalCompilerError const& _exception)
 	{
 		cerr << "Internal compiler error:" << endl;
 		cerr << boost::diagnostic_information(_exception);
-		return 1;
-	}
-	catch (boost::exception const& _exception)
-	{
-		cerr << "Uncaught exception:" << endl;
-		cerr << boost::diagnostic_information(_exception) << endl;
-		return 1;
-	}
-	catch (std::exception const& _exception)
-	{
-		cerr << "Uncaught exception:" << endl;
-		cerr << boost::diagnostic_information(_exception) << endl;
-		return 1;
+		return 2;
 	}
 	catch (...)
 	{
-		cerr << "Uncaught exception" << endl;
+		cerr << "Uncaught exception:" << endl;
 		cerr << boost::current_exception_diagnostic_information() << endl;
-		return 1;
+		return 2;
 	}
 }
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index cb7ab1eb56..cf1588b447 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -502,22 +502,22 @@ int main(int argc, char const *argv[])
 	catch (boost::program_options::error const& exception)
 	{
 		cerr << exception.what() << endl;
-		return EXIT_FAILURE;
+		return 2;
 	}
 	catch (std::runtime_error const& exception)
 	{
 		cerr << exception.what() << endl;
-		return EXIT_FAILURE;
+		return 2;
 	}
 	catch (solidity::test::ConfigException const& exception)
 	{
 		cerr << exception.what() << endl;
-		return EXIT_FAILURE;
+		return 2;
 	}
 	catch (...)
 	{
 		cerr << "Unhandled exception caught." << endl;
 		cerr << boost::current_exception_diagnostic_information() << endl;
-		return EXIT_FAILURE;
+		return 2;
 	}
 }
diff --git a/tools/solidityUpgrade/main.cpp b/tools/solidityUpgrade/main.cpp
index 55ed0118c6..5a6962661d 100644
--- a/tools/solidityUpgrade/main.cpp
+++ b/tools/solidityUpgrade/main.cpp
@@ -84,11 +84,15 @@ int main(int argc, char** argv)
 	}
 	catch (boost::exception const& _exception)
 	{
-		cerr << "Exception while processing input: " << boost::diagnostic_information(_exception) << endl;
+		cerr << "Exception while processing input:" << endl;
+		cerr << boost::diagnostic_information(_exception) << endl;
+		return 2;
 	}
 	catch (...)
 	{
-		cerr << "Unknown exception while processing input: " << boost::current_exception_diagnostic_information() << endl;
+		cerr << "Uncaught exception while processing input:" << endl;
+		cerr << boost::current_exception_diagnostic_information() << endl;
+		return 2;
 	}
 
 	return 0;
diff --git a/tools/yulPhaser/main.cpp b/tools/yulPhaser/main.cpp
index 1ec936dd43..21502b525f 100644
--- a/tools/yulPhaser/main.cpp
+++ b/tools/yulPhaser/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char** argv)
 
 		std::cerr << std::endl;
 		std::cerr << "ERROR: " << exception.what() << std::endl;
-		return 1;
+		return 2;
 	}
 	catch (solidity::phaser::BadInput const& exception)
 	{
@@ -45,46 +45,12 @@ int main(int argc, char** argv)
 
 		std::cerr << std::endl;
 		std::cerr << "ERROR: " << exception.what() << std::endl;
-		return 1;
-	}
-	catch (solidity::util::Exception const& exception)
-	{
-		// Something's seriously wrong. Probably a bug in the program or a missing handler (which
-		// is really also a bug). The exception should have been handled gracefully by this point
-		// if it's something that can happen in normal usage. E.g. an error in the input or a
-		// failure of some part of the system that's outside of control of the application (disk,
-		// network, etc.). The bug should be reported and investigated so our job here is just to
-		// provide as much useful information about it as possible.
-
-		std::cerr << std::endl;
-		std::cerr << "UNCAUGHT EXCEPTION!" << std::endl;
-
-		// We can print some useful diagnostic info for this particular exception type.
-		std::cerr << "Location: " << exception.lineInfo() << std::endl;
-
-		char const* const* function = boost::get_error_info<boost::throw_function>(exception);
-		if (function != nullptr)
-			std::cerr << "Function: " << *function << std::endl;
-
-		// Let it crash. The terminate() will print some more stuff useful for debugging like
-		// what() and the actual exception type.
-		throw;
-	}
-	catch (std::exception const&)
-	{
-		// Again, probably a bug but this time it's just plain std::exception so there's no point
-		// in doing anything special. terminate() will do an adequate job.
-		std::cerr << std::endl;
-		std::cerr << "UNCAUGHT EXCEPTION!" << std::endl;
-		throw;
+		return 2;
 	}
 	catch (...)
 	{
-		// Some people don't believe these exist.
-		// I have no idea what this is and it's flying towards me so technically speaking it's an
-		// unidentified flying object.
-		std::cerr << std::endl;
-		std::cerr << "UFO SPOTTED!" << std::endl;
-		throw;
+		std::cerr << "Uncaught exception:" << std::endl;
+		std::cerr << boost::current_exception_diagnostic_information() << std::endl;
+		return 2;
 	}
 }

From 564d541853eca1f798bf9da0edf5caf41040014a Mon Sep 17 00:00:00 2001
From: Phill <38789408+SavPhill@users.noreply.github.com>
Date: Mon, 31 Oct 2022 13:19:10 +0700
Subject: [PATCH 0988/1748] [Documentation] Change URL to be hyperlink
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The documentation link incorrectly displays in the text along with the angled brackets. I believe this is incorrect, and should be a standard markdown hyperlink. The error also disrupts the spacing of the line.  My small PR fixes both.

Apply suggestions from code review

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

Update docs/contributing.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
---
 docs/contributing.rst | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 35af6ac0be..6a35cbc3fa 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -80,10 +80,8 @@ Finally, please make sure you respect the `coding style
 for this project. Also, even though we do CI testing, please test your code and
 ensure that it builds locally before submitting a pull request.
 
-We highly recommend going through our `review checklist <https://github.com/ethereum/solidity/blob/develop/ReviewChecklist.md>`
-before submitting the pull request.
-We thoroughly review every PR and will help you get it right, but there are many
-common problems that can be easily avoided, making the review much smoother.
+We highly recommend going through our `review checklist <https://github.com/ethereum/solidity/blob/develop/ReviewChecklist.md>`_ before submitting the pull request.
+We thoroughly review every PR and will help you get it right, but there are many common problems that can be easily avoided, making the review much smoother.
 
 Thank you for your help!
 

From 788e45b66f364964ff39bb2ca3f8bbd4151c0098 Mon Sep 17 00:00:00 2001
From: Franco Victorio <victorio.franco@gmail.com>
Date: Wed, 2 Nov 2022 12:23:33 +0100
Subject: [PATCH 0989/1748] Add Hardhat+Solidity VSCode extension

---
 docs/resources.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/resources.rst b/docs/resources.rst
index c70b35fbf8..3b403cd6d0 100644
--- a/docs/resources.rst
+++ b/docs/resources.rst
@@ -85,6 +85,9 @@ Editor Integrations
     * `Solidity Visual Auditor extension <https://marketplace.visualstudio.com/items?itemName=tintinweb.solidity-visual-auditor>`_
         Adds security centric syntax and semantic highlighting to Visual Studio Code.
 
+    * `Hardhat + Solidity Visual Studio Code extension <https://marketplace.visualstudio.com/items?itemName=NomicFoundation.hardhat-solidity>`_
+        Solidity and Hardhat support by the Hardhat team.
+
 Solidity Tools
 ==============
 

From 6d4f541ae6c95d557f860029c457b3caa03806e0 Mon Sep 17 00:00:00 2001
From: Sebastian Supreme <106926150+SebastianSupreme@users.noreply.github.com>
Date: Wed, 2 Nov 2022 21:00:12 +0100
Subject: [PATCH 0990/1748] Fix grammar mistake

Enforced grammatical consistency for the last bullet point.
---
 ReleaseChecklist.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index e97f96cf72..f786a222e5 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -84,4 +84,4 @@
  - [ ] Share the announcement on Reddit in [``/r/ethdev``](https://reddit.com/r/ethdev/), cross-posted to [``/r/ethereum``](https://reddit.com/r/ethereum/).
  - [ ] Share the announcement the [Solidity forum](https://forum.soliditylang.org) in the ``Announcements`` category.
  - [ ] Update the release information section on [soliditylang.org](https://github.com/ethereum/solidity-portal).
- - [ ] Lean back, wait for bug reports and repeat from step 1 :)
+ - [ ] Lean back, wait for bug reports and repeat from step 1 :).

From d5d573dfbe00f61aeb0affc925beaa8e1e5712e6 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 2 Nov 2022 19:20:28 +0100
Subject: [PATCH 0991/1748] Peg hardhat-tenderly to fix GP2 external tests

Empty
---
 test/externalTests/gp2.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index 13b8bed3e8..ad75f83bdd 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -72,6 +72,9 @@ function gp2_test
     # New hardhat release breaks GP2 tests, and since GP2 repository has been archived, we are pinning hardhat
     # to the previous stable version. See https://github.com/ethereum/solidity/pull/13485
     yarn add hardhat@2.10.2
+    # hardhat-tenderly@1.2.0 and upwards break the build, hence we are pinning the version to the last stable one.
+    # See https://github.com/cowprotocol/contracts/issues/32
+    yarn add @tenderly/hardhat-tenderly@1.1.6
 
     # Some dependencies come with pre-built artifacts. We want to build from scratch.
     rm -r node_modules/@gnosis.pm/safe-contracts/build/

From c0c1ab766f3231189223695d9f5891518c330b5d Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 2 Nov 2022 21:50:39 -0300
Subject: [PATCH 0992/1748] Properly query team members

---
 .github/workflows/welcome-external-pr.yml | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/welcome-external-pr.yml b/.github/workflows/welcome-external-pr.yml
index 1a034ffff3..888bc8d3a2 100644
--- a/.github/workflows/welcome-external-pr.yml
+++ b/.github/workflows/welcome-external-pr.yml
@@ -23,15 +23,13 @@ jobs:
           gh api graphql \
             --raw-field organization="$ORGANIZATION" \
             --raw-field query='
-              query($organization: String!, $cursor: String) {
+              query($organization: String!) {
                 organization(login: $organization) {
-                  membersWithRole(first: 100, after: $cursor) {
-                    pageInfo {
-                      hasNextPage,
-                      endCursor
-                    }
-                    nodes {
-                      login
+                  team(slug: "Solidity") {
+                    members(first: 100) {
+                      nodes {
+                        login
+                      }
                     }
                   }
                 }
@@ -39,7 +37,7 @@ jobs:
           echo "CONTRIBUTOR_IS_ORG_MEMBER=$(
             jq \
               --arg contributor $CONTRIBUTOR \
-              '.data.organization.membersWithRole | any(.nodes[].login; . == $contributor)' \
+              '.data.organization.team.members | any(.nodes[].login; . == $contributor)' \
               org_members.json
           )" >> $GITHUB_OUTPUT
 

From 18a5aee38c9bcf7aaf4cd9721234cdcf2ce37090 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 10 Mar 2021 22:13:28 +0000
Subject: [PATCH 0993/1748] EVMHost: Introduce gas metering for precompiles

---
 test/EVMHost.cpp | 411 +++++++++++++++++++++++++++++++++++------------
 test/EVMHost.h   |  15 +-
 2 files changed, 316 insertions(+), 110 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index c36c2aaf30..28756c73de 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -223,11 +223,26 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
 	else if (_message.destination == 0x0000000000000000000000000000000000000005_address && m_evmVersion >= langutil::EVMVersion::byzantium())
 		return precompileModExp(_message);
 	else if (_message.destination == 0x0000000000000000000000000000000000000006_address && m_evmVersion >= langutil::EVMVersion::byzantium())
-		return precompileALTBN128G1Add(_message);
+	{
+		if (m_evmVersion <= langutil::EVMVersion::istanbul())
+			return precompileALTBN128G1Add<EVMC_ISTANBUL>(_message);
+		else
+			return precompileALTBN128G1Add<EVMC_LONDON>(_message);
+	}
 	else if (_message.destination == 0x0000000000000000000000000000000000000007_address && m_evmVersion >= langutil::EVMVersion::byzantium())
-		return precompileALTBN128G1Mul(_message);
+	{
+		if (m_evmVersion <= langutil::EVMVersion::istanbul())
+			return precompileALTBN128G1Mul<EVMC_ISTANBUL>(_message);
+		else
+			return precompileALTBN128G1Mul<EVMC_LONDON>(_message);
+	}
 	else if (_message.destination == 0x0000000000000000000000000000000000000008_address && m_evmVersion >= langutil::EVMVersion::byzantium())
-		return precompileALTBN128PairingProduct(_message);
+	{
+		if (m_evmVersion <= langutil::EVMVersion::istanbul())
+			return precompileALTBN128PairingProduct<EVMC_ISTANBUL>(_message);
+		else
+			return precompileALTBN128PairingProduct<EVMC_LONDON>(_message);
+	}
 
 	auto const stateBackup = accounts;
 
@@ -401,7 +416,11 @@ evmc::bytes32 EVMHost::convertToEVMC(h256 const& _data)
 evmc::result EVMHost::precompileECRecover(evmc_message const& _message) noexcept
 {
 	// NOTE this is a partial implementation for some inputs.
-	static map<bytes, bytes> const inputOutput{
+
+	// Fixed cost of 3000 gas.
+	constexpr int64_t gas_cost = 3000;
+
+	static map<bytes, EVMPrecompileOutput> const inputOutput{
 		{
 			fromHex(
 				"18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c"
@@ -409,7 +428,10 @@ evmc::result EVMHost::precompileECRecover(evmc_message const& _message) noexcept
 				"73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f"
 				"eeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549"
 			),
-			fromHex("000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b")
+			{
+				fromHex("000000000000000000000000a94f5374fce5edbc8e2a8697c15331677e6ebf0b"),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -418,15 +440,19 @@ evmc::result EVMHost::precompileECRecover(evmc_message const& _message) noexcept
 				"debaaa0cddb321b2dcaaf846d39605de7b97e77ba6106587855b9106cb104215"
 				"61a22d94fa8b8a687ff9c911c844d1c016d1a685a9166858f9c7c1bc85128aca"
 			),
-			fromHex("0000000000000000000000008743523d96a1b2cbe0c6909653a56da18ed484af")
+			{
+				fromHex("0000000000000000000000008743523d96a1b2cbe0c6909653a56da18ed484af"),
+				gas_cost
+			}
 		}
 	};
 	evmc::result result = precompileGeneric(_message, inputOutput);
 	// ECRecover will return success with empty response in case of failure
-	if (result.status_code != EVMC_SUCCESS)
+	if (result.status_code != EVMC_SUCCESS && result.status_code != EVMC_OUT_OF_GAS)
+//		return resultWithGas(_message.gas, gas_cost, {});
 	{
 		result.status_code = EVMC_SUCCESS;
-		result.gas_left = _message.gas;
+		result.gas_left = _message.gas - gas_cost;
 		result.output_data = {};
 		result.output_size = 0;
 	}
@@ -442,32 +468,56 @@ evmc::result EVMHost::precompileSha256(evmc_message const& _message) noexcept
 		_message.input_data + _message.input_size
 	));
 
-	return resultWithGas(_message, hash);
+	// Base 60 gas + 12 gas / word.
+	int64_t gas_cost = 60 + 12 * ((static_cast<int64_t>(_message.input_size) + 31) / 32);
+
+	return resultWithGas(_message.gas, gas_cost, hash);
 }
 
 evmc::result EVMHost::precompileRipeMD160(evmc_message const& _message) noexcept
 {
 	// NOTE this is a partial implementation for some inputs.
-	static map<bytes, bytes> const inputOutput{
+
+	// Base 600 gas + 120 gas / word.
+	constexpr auto calc_cost = [](int64_t size) -> int64_t {
+		return 600 + 120 * ((size + 31) / 32);
+	};
+
+	static map<bytes, EVMPrecompileOutput> const inputOutput{
 		{
 			bytes{},
-			fromHex("0000000000000000000000009c1185a5c5e9fc54612808977ee8f548b2258d31")
+			{
+				fromHex("0000000000000000000000009c1185a5c5e9fc54612808977ee8f548b2258d31"),
+				calc_cost(0)
+			}
 		},
 		{
 			fromHex("0000000000000000000000000000000000000000000000000000000000000004"),
-			fromHex("0000000000000000000000001b0f3c404d12075c68c938f9f60ebea4f74941a0")
+			{
+				fromHex("0000000000000000000000001b0f3c404d12075c68c938f9f60ebea4f74941a0"),
+				calc_cost(32)
+			}
 		},
 		{
 			fromHex("0000000000000000000000000000000000000000000000000000000000000005"),
-			fromHex("000000000000000000000000ee54aa84fc32d8fed5a5fe160442ae84626829d9")
+			{
+				fromHex("000000000000000000000000ee54aa84fc32d8fed5a5fe160442ae84626829d9"),
+				calc_cost(32)
+			}
 		},
 		{
 			fromHex("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"),
-			fromHex("0000000000000000000000001cf4e77f5966e13e109703cd8a0df7ceda7f3dc3")
+			{
+				fromHex("0000000000000000000000001cf4e77f5966e13e109703cd8a0df7ceda7f3dc3"),
+				calc_cost(32)
+			}
 		},
 		{
 			fromHex("0000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("000000000000000000000000f93175303eba2a7b372174fc9330237f5ad202fc")
+			{
+				fromHex("000000000000000000000000f93175303eba2a7b372174fc9330237f5ad202fc"),
+				calc_cost(32)
+			}
 		},
 		{
 			fromHex(
@@ -476,7 +526,10 @@ evmc::result EVMHost::precompileRipeMD160(evmc_message const& _message) noexcept
 				"0000000400000000000000000000000000000000000000000000000000000000"
 				"00000100"
 			),
-			fromHex("000000000000000000000000f93175303eba2a7b372174fc9330237f5ad202fc")
+			{
+				fromHex("000000000000000000000000f93175303eba2a7b372174fc9330237f5ad202fc"),
+				calc_cost(100)
+			}
 		},
 		{
 			fromHex(
@@ -485,7 +538,10 @@ evmc::result EVMHost::precompileRipeMD160(evmc_message const& _message) noexcept
 				"0000000500000000000000000000000000000000000000000000000000000000"
 				"00000100"
 			),
-			fromHex("0000000000000000000000004f4fc112e2bfbe0d38f896a46629e08e2fcfad5")
+			{
+				fromHex("0000000000000000000000004f4fc112e2bfbe0d38f896a46629e08e2fcfad5"),
+				calc_cost(100)
+			}
 		},
 		{
 			fromHex(
@@ -494,18 +550,27 @@ evmc::result EVMHost::precompileRipeMD160(evmc_message const& _message) noexcept
 				"ffffffff00000000000000000000000000000000000000000000000000000000"
 				"00000100"
 			),
-			fromHex("000000000000000000000000c0a2e4b1f3ff766a9a0089e7a410391730872495")
+			{
+				fromHex("000000000000000000000000c0a2e4b1f3ff766a9a0089e7a410391730872495"),
+				calc_cost(100)
+			}
 		},
 		{
 			fromHex(
 				"6162636465666768696a6b6c6d6e6f707172737475767778797a414243444546"
 				"4748494a4b4c4d4e4f505152535455565758595a303132333435363738393f21"
 			),
-			fromHex("00000000000000000000000036c6b90a49e17d4c1e1b0e634ec74124d9b207da")
+			{
+				fromHex("00000000000000000000000036c6b90a49e17d4c1e1b0e634ec74124d9b207da"),
+				calc_cost(64)
+			}
 		},
 		{
 			fromHex("6162636465666768696a6b6c6d6e6f707172737475767778797a414243444546"),
-			fromHex("000000000000000000000000ac5ab22e07b0fb80c69b6207902f725e2507e546")
+			{
+				fromHex("000000000000000000000000ac5ab22e07b0fb80c69b6207902f725e2507e546"),
+				calc_cost(32)
+			}
 		}
 	};
 	return precompileGeneric(_message, inputOutput);
@@ -517,7 +582,10 @@ evmc::result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
 	bytes static data;
 	data = bytes(_message.input_data, _message.input_data + _message.input_size);
 
-	return resultWithGas(_message, data);
+	// Base 15 gas + 3 gas / word.
+	int64_t gas_cost = 15 + 3 * ((static_cast<int64_t>(_message.input_size) + 31) / 32);
+
+	return resultWithGas(_message.gas, gas_cost, data);
 }
 
 evmc::result EVMHost::precompileModExp(evmc_message const&) noexcept
@@ -526,11 +594,15 @@ evmc::result EVMHost::precompileModExp(evmc_message const&) noexcept
 	return resultWithFailure();
 }
 
+template <evmc_revision Revision>
 evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noexcept
 {
 	// NOTE this is a partial implementation for some inputs.
 
-	static map<bytes, bytes> const inputOutput{
+	// Fixed 500 or 150 gas.
+	int64_t gas_cost = (Revision < EVMC_ISTANBUL) ? 500 : 150;
+
+	static map<bytes, EVMPrecompileOutput> const inputOutput{
 		{
 			fromHex(
 				"0000000000000000000000000000000000000000000000000000000000000000"
@@ -540,10 +612,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"1385281136ff5b2c326807ff0a824b6ca4f21fcc7c8764e9801bc4ad497d5012"
-				"02254594be8473dcf018a2aa66ea301e38fc865823acf75a9901721d1fc6bf4c"
-			)
+			{
+				fromHex(
+					"1385281136ff5b2c326807ff0a824b6ca4f21fcc7c8764e9801bc4ad497d5012"
+					"02254594be8473dcf018a2aa66ea301e38fc865823acf75a9901721d1fc6bf4c"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -554,10 +629,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd3"
-				"15ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4"
-			)
+			{
+				fromHex(
+					"030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd3"
+					"15ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -568,10 +646,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"0000000000000000000000000000000000000000000000000000000000000000"
-				"0000000000000000000000000000000000000000000000000000000000000000"
-			)
+			{
+				fromHex(
+					"0000000000000000000000000000000000000000000000000000000000000000"
+					"0000000000000000000000000000000000000000000000000000000000000000"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -582,10 +663,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"16aed5ed486df6b2fb38015ded41400009ed4f34bef65b87b1f90f47052f8d94"
-				"16dabf21b3f25b9665269d98dc17b1da6118251dc0b403ae50e96dfe91239375"
-			)
+			{
+				fromHex(
+					"16aed5ed486df6b2fb38015ded41400009ed4f34bef65b87b1f90f47052f8d94"
+					"16dabf21b3f25b9665269d98dc17b1da6118251dc0b403ae50e96dfe91239375"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -596,10 +680,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"1e018816fc9bbd91313301ae9c254bb7d64d6cd54f3b49b92925e43e256b5faa"
-				"1d1f2259c715327bedb42c095af6c0267e4e1be836b4e04b3f0502552f93cca9"
-			)
+			{
+				fromHex(
+					"1e018816fc9bbd91313301ae9c254bb7d64d6cd54f3b49b92925e43e256b5faa"
+					"1d1f2259c715327bedb42c095af6c0267e4e1be836b4e04b3f0502552f93cca9"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -610,10 +697,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"29d160febeef9770d47a32ee3b763850eb0594844fa57dd31b8ed02c78fdb797"
-				"2c7cdf62c2498486fd52646e577a06723ce97737b3c958262d78c4a413661e8a"
-			),
+			{
+				fromHex(
+					"29d160febeef9770d47a32ee3b763850eb0594844fa57dd31b8ed02c78fdb797"
+					"2c7cdf62c2498486fd52646e577a06723ce97737b3c958262d78c4a413661e8a"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -624,10 +714,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"2583ed10e418133e44619c336f1be5ddae9e20d634a7683d9661401c750d7df4"
-				"0185fbba22de9e698262925665735dbc4d6e8288bc3fc39fae10ca58e16e77f7"
-			)
+			{
+				fromHex(
+					"2583ed10e418133e44619c336f1be5ddae9e20d634a7683d9661401c750d7df4"
+					"0185fbba22de9e698262925665735dbc4d6e8288bc3fc39fae10ca58e16e77f7"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -638,10 +731,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"1496064626ba8bffeb7805f0d16143a65649bb0850333ea512c03fcdaf31e254"
-				"07b4f210ab542533f1ee5633ae4406cd16c63494b537ce3f1cf4afff6f76a48f"
-			),
+			{
+				fromHex(
+					"1496064626ba8bffeb7805f0d16143a65649bb0850333ea512c03fcdaf31e254"
+					"07b4f210ab542533f1ee5633ae4406cd16c63494b537ce3f1cf4afff6f76a48f"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -652,10 +748,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"2801b21090cbc48409e352647f3857134d373f81741f9d5e3d432f336d76f517"
-				"13cf106acf943c2a331de21c7d5e3351354e7412f2dba2918483a6593a6828d4"
-			)
+			{
+				fromHex(
+					"2801b21090cbc48409e352647f3857134d373f81741f9d5e3d432f336d76f517"
+					"13cf106acf943c2a331de21c7d5e3351354e7412f2dba2918483a6593a6828d4"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -666,10 +765,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"10b4876441e14a6be92a7fe66550848c01c676a12ac31d7cc13b21f49c4307c8"
-				"09f5528bdb0ef9354837a0f4b4c9da973bd5b805d359976f719ab0b74e0a7368"
-			)
+			{
+				fromHex(
+					"10b4876441e14a6be92a7fe66550848c01c676a12ac31d7cc13b21f49c4307c8"
+					"09f5528bdb0ef9354837a0f4b4c9da973bd5b805d359976f719ab0b74e0a7368"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -680,10 +782,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008"
-				"1e396bc242de0214898b0f68035f53ad5a6f96c6c8390ac56ed6ec9561d23159"
-			)
+			{
+				fromHex(
+					"186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008"
+					"1e396bc242de0214898b0f68035f53ad5a6f96c6c8390ac56ed6ec9561d23159"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -694,10 +799,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"20a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a"
-				"29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed3021"
-			)
+			{
+				fromHex(
+					"20a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a"
+					"29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed3021"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -708,10 +816,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"18014701594179c6b9ccae848e3d15c1f76f8a68b8092578296520e46c9bae0c"
-				"1b5ed0e9e8f3ff35589ea81a45cf63887d4a92c099a3be1d97b26f0db96323dd"
-			),
+			{
+				fromHex(
+					"18014701594179c6b9ccae848e3d15c1f76f8a68b8092578296520e46c9bae0c"
+					"1b5ed0e9e8f3ff35589ea81a45cf63887d4a92c099a3be1d97b26f0db96323dd"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -722,10 +833,13 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"27231d5cdd0011259ff75678cf5a8f7840c22cb71d52b25e21e071205e8d9bc4"
-				"26dd3d225c9a71476db0cf834232eba84020f3073c6d20c519963e0b98f235e1"
-			)
+			{
+				fromHex(
+					"27231d5cdd0011259ff75678cf5a8f7840c22cb71d52b25e21e071205e8d9bc4"
+					"26dd3d225c9a71476db0cf834232eba84020f3073c6d20c519963e0b98f235e1"
+				),
+				gas_cost
+			}
 		},
 		{
 			fromHex(
@@ -736,71 +850,121 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 				"0000000000000000000000000000000000000000000000000000000000000000"
 				"0000000000000000000000000000000000000000000000000000000000000000"
 			),
-			fromHex(
-				"26dcfbc2e0bc9d82efb4acd73cb3e99730e27e10177fcfb78b6399a4bfcdf391"
-				"27c440dbd5053253a3a692f9bf89b9b6e9612127cf97db1e11ffa9679acc933b"
-			)
+			{
+				fromHex(
+					"26dcfbc2e0bc9d82efb4acd73cb3e99730e27e10177fcfb78b6399a4bfcdf391"
+					"27c440dbd5053253a3a692f9bf89b9b6e9612127cf97db1e11ffa9679acc933b"
+				),
+				gas_cost
+			}
 		}
 	};
 	return precompileGeneric(_message, inputOutput);
 }
 
+template <evmc_revision Revision>
 evmc::result EVMHost::precompileALTBN128G1Mul(evmc_message const& _message) noexcept
 {
 	// NOTE this is a partial implementation for some inputs.
-	static map<bytes, bytes> const inputOutput{
+
+	// Fixed 40000 or 6000 gas.
+	int64_t gas_cost = (Revision < EVMC_ISTANBUL) ? 40000 : 6000;
+
+	static map<bytes, EVMPrecompileOutput> const inputOutput{
 		{
 			fromHex("0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4")
+			{
+				fromHex("030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4"),
+				gas_cost
+			}
 		},
 		{
 			fromHex("0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c")
+			{
+				fromHex("17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c"),
+				gas_cost
+			}
 		},
 		{
 			fromHex("09b54f111d3b2d1b2fe1ae9669b3db3d7bf93b70f00647e65c849275de6dc7fe18b2e77c63a3e400d6d1f1fbc6e1a1167bbca603d34d03edea231eb0ab7b14b4030f7b0c405c888aff922307ea2cd1c70f64664bab76899500341f4260a209290000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("16a1d378d1a98cf5383cdc512011234287ca43b6a078d1842d5c58c5b1f475cc1309377a7026d08ca1529eab74381a7e0d3a4b79d80bacec207cd52fc8e3769c")
+			{
+				fromHex("16a1d378d1a98cf5383cdc512011234287ca43b6a078d1842d5c58c5b1f475cc1309377a7026d08ca1529eab74381a7e0d3a4b79d80bacec207cd52fc8e3769c"),
+				gas_cost
+			}
 		},
 		{
 			fromHex("0a6de0e2240aa253f46ce0da883b61976e3588146e01c9d8976548c145fe6e4a04fbaa3a4aed4bb77f30ebb07a3ec1c7d77a7f2edd75636babfeff97b1ea686e1551dcd4965285ef049512d2d30cbfc1a91acd5baad4a6e19e22e93176197f170000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("28d3c57516712e7843a5b3cfa7d7274a037943f5bd57c227620ad207728e42832795fa9df21d4b8b329a45bae120f1fd9df9049ecacaa9dd1eca18bc6a55cd2f")
+			{
+				fromHex("28d3c57516712e7843a5b3cfa7d7274a037943f5bd57c227620ad207728e42832795fa9df21d4b8b329a45bae120f1fd9df9049ecacaa9dd1eca18bc6a55cd2f"),
+				gas_cost
+			}
 		},
 		{
 			fromHex("0c54b42137b67cc268cbb53ac62b00ecead23984092b494a88befe58445a244a18e3723d37fae9262d58b548a0575f59d9c3266db7afb4d5739555837f6b8b3e0c692b41f1acc961f6ea83bae2c3a1a55c54f766c63ba76989f52c149c17b5e70000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("258f1faa356e470cca19c928afa5ceed6215c756912af5725b8db5777cc8f3b6175ced8a58d0c132c2b95ba14c16dde93e7f7789214116ff69da6f44daa966e6")
+			{
+				fromHex("258f1faa356e470cca19c928afa5ceed6215c756912af5725b8db5777cc8f3b6175ced8a58d0c132c2b95ba14c16dde93e7f7789214116ff69da6f44daa966e6"),
+				gas_cost
+			}
 		},
 		{
 			fromHex("0f103f14a584d4203c27c26155b2c955f8dfa816980b24ba824e1972d6486a5d0c4165133b9f5be17c804203af781bcf168da7386620479f9b885ecbcd27b17b0ea71d0abb524cac7cfff5323e1d0b14ab705842426c978f96753ccce258ed930000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("2a49621e12910cd90f3e731083d454255bf1c533d6e15b8699156778d0f27f5d2590ee31824548d159aa2d22296bf149d564c0872f41b89b7dc5c6e6e3cd1c4d")
+			{
+				fromHex("2a49621e12910cd90f3e731083d454255bf1c533d6e15b8699156778d0f27f5d2590ee31824548d159aa2d22296bf149d564c0872f41b89b7dc5c6e6e3cd1c4d"),
+				gas_cost
+			}
 		},
 		{
 			fromHex("111e2e2a5f8828f80ddad08f9f74db56dac1cc16c1cb278036f79a84cf7a116f1d7d62e192b219b9808faa906c5ced871788f6339e8d91b83ac1343e20a16b3000000000000000000000000000000000000000e40800000000000000008cdcbc0000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("25ff95a3abccf32adc6a4c3c8caddca67723d8ada802e9b9f612e3ddb40b20050d82b09bb4ec927bbf182bdc402790429322b7e2f285f2aad8ea135cbf7143d8")
+			{
+				fromHex("25ff95a3abccf32adc6a4c3c8caddca67723d8ada802e9b9f612e3ddb40b20050d82b09bb4ec927bbf182bdc402790429322b7e2f285f2aad8ea135cbf7143d8"),
+				gas_cost
+			}
 		},
 		{
 			fromHex("17d5d09b4146424bff7e6fb01487c477bbfcd0cdbbc92d5d6457aae0b6717cc502b5636903efbf46db9235bbe74045d21c138897fda32e079040db1a16c1a7a11887420878c0c8e37605291c626585eabbec8d8b97a848fe8d58a37b004583510000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("2364294faf6b89fedeede9986aa777c4f6c2f5c4a4559ee93dfec9b7b94ef80b05aeae62655ea23865ae6661ae371a55c12098703d0f2301f4223e708c92efc6")
+			{
+				fromHex("2364294faf6b89fedeede9986aa777c4f6c2f5c4a4559ee93dfec9b7b94ef80b05aeae62655ea23865ae6661ae371a55c12098703d0f2301f4223e708c92efc6"),
+				gas_cost
+			}
 		},
 		{
 			fromHex("1c36e713d4d54e3a9644dffca1fc524be4868f66572516025a61ca542539d43f042dcc4525b82dfb242b09cb21909d5c22643dcdbe98c4d082cc2877e96b24db016086cc934d5cab679c6991a4efcedbab26d7e4fb23b6a1ad4e6b5c2fb59ce50000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("1644e84fef7b7fdc98254f0654580173307a3bc44db990581e7ab55a22446dcf28c2916b7e875692b195831945805438fcd30d2693d8a80cf8c88ec6ef4c315d")
+			{
+				fromHex("1644e84fef7b7fdc98254f0654580173307a3bc44db990581e7ab55a22446dcf28c2916b7e875692b195831945805438fcd30d2693d8a80cf8c88ec6ef4c315d"),
+				gas_cost
+			}
 		},
 		{
 			fromHex("1e39e9f0f91fa7ff8047ffd90de08785777fe61c0e3434e728fce4cf35047ddc2e0b64d75ebfa86d7f8f8e08abbe2e7ae6e0a1c0b34d028f19fa56e9450527cb1eec35a0e955cad4bee5846ae0f1d0b742d8636b278450c534e38e06a60509f90000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("1385281136ff5b2c326807ff0a824b6ca4f21fcc7c8764e9801bc4ad497d501202254594be8473dcf018a2aa66ea301e38fc865823acf75a9901721d1fc6bf4c")
+			{
+				fromHex("1385281136ff5b2c326807ff0a824b6ca4f21fcc7c8764e9801bc4ad497d501202254594be8473dcf018a2aa66ea301e38fc865823acf75a9901721d1fc6bf4c"),
+				gas_cost
+			}
 		},
 		{
 			fromHex("232063b584fb76c8d07995bee3a38fa7565405f3549c6a918ddaa90ab971e7f82ac9b135a81d96425c92d02296322ad56ffb16299633233e4880f95aafa7fda70689c3dc4311426ee11707866b2cbdf9751dacd07245bf99d2113d3f5a8cac470000000000000000000000000000000000000000000000000000000000000000"),
-			fromHex("2174f0221490cd9c15b0387f3251ec3d49517a51c37a8076eac12afb4a95a7071d1c3fcd3161e2a417b4df0955f02db1fffa9005210fb30c5aa3755307e9d1f5")
+			{
+				fromHex("2174f0221490cd9c15b0387f3251ec3d49517a51c37a8076eac12afb4a95a7071d1c3fcd3161e2a417b4df0955f02db1fffa9005210fb30c5aa3755307e9d1f5"),
+				gas_cost
+			}
 		}
 	};
 	return precompileGeneric(_message, inputOutput);
 }
 
+template <evmc_revision Revision>
 evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _message) noexcept
 {
+	// Base + per pairing gas.
+	constexpr auto calc_cost = [](unsigned points) -> int64_t {
+		// Number of 192-byte points.
+		return (Revision < EVMC_ISTANBUL) ?
+			(100000 + 80000 * points):
+			(45000 + 34000 * points);
+	};
+
 	// NOTE this is a partial implementation for some inputs.
-	static map<bytes, bytes> const inputOutput{
+	static map<bytes, EVMPrecompileOutput> const inputOutput{
 		{
 			fromHex(
 				"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa9"
@@ -816,7 +980,10 @@ evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 				"19b763513924a736e4eebd0d78c91c1bc1d657fee4214057d21414011cfcc763"
 				"2f8d9f9ab83727c77a2fec063cb7b6e5eb23044ccf535ad49d46d394fb6f6bf6"
 			),
-			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+			{
+				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
+				calc_cost(2)
+			}
 		},
 		{
 			fromHex(
@@ -833,7 +1000,10 @@ evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
 				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
 			),
-			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+			{
+				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
+				calc_cost(2)
+			}
 		},
 		{
 			fromHex(
@@ -850,7 +1020,10 @@ evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
 				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
 			),
-			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+			{
+				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
+				calc_cost(2)
+			}
 		},
 		{
 			fromHex(
@@ -867,7 +1040,10 @@ evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
 				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
 			),
-			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+			{
+				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
+				calc_cost(2)
+			}
 		},
 		{
 			fromHex(
@@ -884,7 +1060,10 @@ evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
 				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
 			),
-			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+			{
+				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
+				calc_cost(2)
+			}
 		},
 		{
 			fromHex(
@@ -907,7 +1086,10 @@ evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 				"21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237"
 				"096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f"
 			),
-			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+			{
+				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
+				calc_cost(3)
+			}
 		},
 		{
 			fromHex(
@@ -930,7 +1112,10 @@ evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 				"090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b"
 				"12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa"
 			),
-			fromHex("0000000000000000000000000000000000000000000000000000000000000001")
+			{
+				fromHex("0000000000000000000000000000000000000000000000000000000000000001"),
+				calc_cost(3)
+			}
 		}
 	};
 	return precompileGeneric(_message, inputOutput);
@@ -938,11 +1123,14 @@ evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 
 evmc::result EVMHost::precompileGeneric(
 	evmc_message const& _message,
-	map<bytes, bytes> const& _inOut) noexcept
+	map<bytes, EVMPrecompileOutput> const& _inOut) noexcept
 {
 	bytes input(_message.input_data, _message.input_data + _message.input_size);
 	if (_inOut.count(input))
-		return resultWithGas(_message, _inOut.at(input));
+	{
+		auto const& ret = _inOut.at(input);
+		return resultWithGas(_message.gas, ret.gas_used, ret.output);
+	}
 	else
 		return resultWithFailure();
 }
@@ -955,13 +1143,22 @@ evmc::result EVMHost::resultWithFailure() noexcept
 }
 
 evmc::result EVMHost::resultWithGas(
-	evmc_message const& _message,
+	int64_t gas_limit,
+	int64_t gas_required,
 	bytes const& _data
 ) noexcept
 {
 	evmc::result result({});
-	result.status_code = EVMC_SUCCESS;
-	result.gas_left = _message.gas;
+	if (gas_limit < gas_required)
+	{
+		result.status_code = EVMC_OUT_OF_GAS;
+		result.gas_left = 0;
+	}
+	else
+	{
+		result.status_code = EVMC_SUCCESS;
+		result.gas_left = gas_limit - gas_required;
+	}
 	result.output_data = _data.data();
 	result.output_size = _data.size();
 	return result;
diff --git a/test/EVMHost.h b/test/EVMHost.h
index 584ba27ea2..4b1f6748a1 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -37,6 +37,11 @@ namespace solidity::test
 using Address = util::h160;
 using StorageMap = std::map<evmc::bytes32, evmc::storage_value>;
 
+struct EVMPrecompileOutput {
+	bytes const output;
+	int64_t gas_used;
+};
+
 class EVMHost: public evmc::MockedHost
 {
 public:
@@ -110,13 +115,17 @@ class EVMHost: public evmc::MockedHost
 	static evmc::result precompileRipeMD160(evmc_message const& _message) noexcept;
 	static evmc::result precompileIdentity(evmc_message const& _message) noexcept;
 	static evmc::result precompileModExp(evmc_message const& _message) noexcept;
+	template <evmc_revision Revision>
 	static evmc::result precompileALTBN128G1Add(evmc_message const& _message) noexcept;
+	template <evmc_revision Revision>
 	static evmc::result precompileALTBN128G1Mul(evmc_message const& _message) noexcept;
+	template <evmc_revision Revision>
 	static evmc::result precompileALTBN128PairingProduct(evmc_message const& _message) noexcept;
-	static evmc::result precompileGeneric(evmc_message const& _message, std::map<bytes, bytes> const& _inOut) noexcept;
-	/// @returns a result object with no gas usage and result data taken from @a _data.
+	static evmc::result precompileGeneric(evmc_message const& _message, std::map<bytes, EVMPrecompileOutput> const& _inOut) noexcept;
+	/// @returns a result object with gas usage and result data taken from @a _data.
+	/// The outcome will be a failure if the limit < required.
 	/// @note The return value is only valid as long as @a _data is alive!
-	static evmc::result resultWithGas(evmc_message const& _message, bytes const& _data) noexcept;
+	static evmc::result resultWithGas(int64_t gas_limit, int64_t gas_required, bytes const& _data) noexcept;
 	static evmc::result resultWithFailure() noexcept;
 
 	evmc::VM& m_vm;

From c2971834670a4209b378a03217a198d1b12ef9c3 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 6 Jul 2022 09:17:59 +0200
Subject: [PATCH 0994/1748] Test that built-ins cannot be bound to structs

---
 .../using/free_functions_implicit_conversion_err.sol      | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
index 36f3f3032e..80c117cbba 100644
--- a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
+++ b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
@@ -1,8 +1,14 @@
+struct S {
+    uint8 x;
+}
+
 function id(uint16 x) pure returns(uint16) {
     return x;
 }
 contract C {
     using {id} for uint256;
+    using {id} for S;
 }
 // ----
-// TypeError 3100: (85-87): The function "id" cannot be bound to the type "uint256" because the type cannot be implicitly converted to the first argument of the function ("uint16").
+// TypeError 3100: (112-114): The function "id" cannot be bound to the type "uint256" because the type cannot be implicitly converted to the first argument of the function ("uint16").
+// TypeError 3100: (140-142): The function "id" cannot be bound to the type "struct S storage pointer" because the type cannot be implicitly converted to the first argument of the function ("uint16").

From d5428af5bbd993e3e8757e47f6cfb4e63aacc91f Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Mon, 1 Aug 2022 10:42:58 +0200
Subject: [PATCH 0995/1748]  Make the message about name not referring to a
 user-defined type more generic

---
 libsolidity/analysis/DeclarationTypeChecker.cpp                 | 2 +-
 test/libsolidity/syntaxTests/errors/error_as_function_param.sol | 2 +-
 test/libsolidity/syntaxTests/errors/using_2.sol                 | 2 +-
 test/libsolidity/syntaxTests/errors/weird3.sol                  | 2 +-
 test/libsolidity/syntaxTests/errors/weird4.sol                  | 2 +-
 .../iceRegressionTests/identifier_collision_return_declare.sol  | 2 +-
 .../291_modifier_is_not_a_valid_typename.sol                    | 2 +-
 .../292_modifier_is_not_a_valid_typename_is_not_fatal.sol       | 2 +-
 .../293_function_is_not_a_valid_typename.sol                    | 2 +-
 .../name_shadowing_function_parameter_vs_struct_enum.sol        | 2 +-
 .../name_shadowing_function_return_parameter_vs_struct_enum.sol | 2 +-
 test/libsolidity/syntaxTests/structs/member_type_func.sol       | 2 +-
 .../syntaxTests/types/constant_of_invalid_function_type.sol     | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index 54a7354e29..2088293878 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -190,7 +190,7 @@ void DeclarationTypeChecker::endVisit(UserDefinedTypeName const& _typeName)
 		m_errorReporter.fatalTypeError(
 			5172_error,
 			_typeName.location(),
-			"Name has to refer to a struct, enum or contract."
+			"Name has to refer to a user-defined type."
 		);
 	}
 }
diff --git a/test/libsolidity/syntaxTests/errors/error_as_function_param.sol b/test/libsolidity/syntaxTests/errors/error_as_function_param.sol
index 3741687f67..79f28a0085 100644
--- a/test/libsolidity/syntaxTests/errors/error_as_function_param.sol
+++ b/test/libsolidity/syntaxTests/errors/error_as_function_param.sol
@@ -1,4 +1,4 @@
 error E(uint);
 function f(E x) pure returns (uint) {}
 // ----
-// TypeError 5172: (26-27): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (26-27): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/errors/using_2.sol b/test/libsolidity/syntaxTests/errors/using_2.sol
index 2f60f3d045..6942513a19 100644
--- a/test/libsolidity/syntaxTests/errors/using_2.sol
+++ b/test/libsolidity/syntaxTests/errors/using_2.sol
@@ -9,4 +9,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5172: (91-92): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (91-92): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/errors/weird3.sol b/test/libsolidity/syntaxTests/errors/weird3.sol
index c81266969c..a059339c6c 100644
--- a/test/libsolidity/syntaxTests/errors/weird3.sol
+++ b/test/libsolidity/syntaxTests/errors/weird3.sol
@@ -4,4 +4,4 @@ contract C {
     E x;
 }
 // ----
-// TypeError 5172: (29-30): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (29-30): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/errors/weird4.sol b/test/libsolidity/syntaxTests/errors/weird4.sol
index be1ef90b6d..c4fff3747d 100644
--- a/test/libsolidity/syntaxTests/errors/weird4.sol
+++ b/test/libsolidity/syntaxTests/errors/weird4.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5172: (64-65): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (64-65): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol b/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol
index b2d10d205e..aa5aeec480 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/identifier_collision_return_declare.sol
@@ -2,4 +2,4 @@ contract C {
         function ( uint ) external returns ( a [ ] calldata ) public a = ( 1 / 2 ) ;
 }
 // ----
-// TypeError 5172: (58-59): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (58-59): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol
index 0c7b80e03a..30f240c1e1 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/291_modifier_is_not_a_valid_typename.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// TypeError 5172: (77-80): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (77-80): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol
index 589772a9da..92d7775509 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/292_modifier_is_not_a_valid_typename_is_not_fatal.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 5172: (77-80): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (77-80): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol
index c1cb83e470..66ff7cf359 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/293_function_is_not_a_valid_typename.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 5172: (85-88): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (85-88): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol
index 61441ece6a..5c63f65298 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_parameter_vs_struct_enum.sol
@@ -17,4 +17,4 @@ contract C {
 // Warning 2519: (207-226): This declaration shadows an existing declaration.
 // Warning 2519: (228-254): This declaration shadows an existing declaration.
 // Warning 2519: (314-327): This declaration shadows an existing declaration.
-// TypeError 5172: (104-114): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (104-114): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol
index ed4b2e0d2c..8afde69523 100644
--- a/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol
+++ b/test/libsolidity/syntaxTests/scoping/name_shadowing_function_return_parameter_vs_struct_enum.sol
@@ -17,4 +17,4 @@ contract C {
 // Warning 2519: (249-268): This declaration shadows an existing declaration.
 // Warning 2519: (270-296): This declaration shadows an existing declaration.
 // Warning 2519: (317-330): This declaration shadows an existing declaration.
-// TypeError 5172: (124-134): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (124-134): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/structs/member_type_func.sol b/test/libsolidity/syntaxTests/structs/member_type_func.sol
index 1200fa7af2..dca3086fe4 100644
--- a/test/libsolidity/syntaxTests/structs/member_type_func.sol
+++ b/test/libsolidity/syntaxTests/structs/member_type_func.sol
@@ -4,4 +4,4 @@ contract C {
   function g(function(S memory) external) public {}
 }
 // ----
-// TypeError 5172: (50-51): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (50-51): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol b/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol
index a371cb13b3..c3e58284d4 100644
--- a/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol
+++ b/test/libsolidity/syntaxTests/types/constant_of_invalid_function_type.sol
@@ -4,4 +4,4 @@ contract C {
 
 }
 // ----
-// TypeError 5172: (77-78): Name has to refer to a struct, enum or contract.
+// TypeError 5172: (77-78): Name has to refer to a user-defined type.

From c50f190c02bece17eb5d0bd21528715cbc998465 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 16 Sep 2022 13:41:53 +0200
Subject: [PATCH 0996/1748] Upgrade to evmone 0.9.1 and hera 0.6.0 in buildpack

---
 .../buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz      | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004         | 6 +++---
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang   | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index d5481604a7..2605240b14 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="19"
+LABEL version="20"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -93,7 +93,7 @@ RUN set -ex; \
 # EVMONE
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.8.2" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
 	cd evmone; \
 	mkdir build; \
 	cd build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 6cac5cc867..b6febf7e61 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="14"
+LABEL version="15"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -48,7 +48,7 @@ FROM base AS libraries
 # EVMONE
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.8.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
 	cd evmone; \
 	mkdir build; \
 	cd build; \
@@ -60,7 +60,7 @@ RUN set -ex; \
 # HERA
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.5.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
+	git clone --branch="v0.6.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
 	cd hera; \
 	mkdir build; \
 	cd build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
index dc5acbcdc8..85933e86c8 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="14"
+LABEL version="15"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -50,7 +50,7 @@ ENV CXX clang++
 # EVMONE
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.8.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
 	cd evmone; \
 	mkdir build; \
 	cd build; \
@@ -62,7 +62,7 @@ RUN set -ex; \
 # HERA
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.5.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
+	git clone --branch="v0.6.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
 	cd hera; \
 	mkdir build; \
 	cd build; \

From b74b55198d0d09ed1bba60d78e25899bd7c85acc Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Thu, 11 Mar 2021 00:33:37 +0000
Subject: [PATCH 0997/1748] Update tests

---
 .../externalContracts/deposit_contract.sol    | 30 +++++++++----------
 .../semanticTests/externalContracts/snark.sol |  9 ++++--
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 7b5418ed14..389661fd7a 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,35 +176,35 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 1428137
-// gas legacy: 2425301
-// gas legacyOptimized: 1770477
+// gas irOptimized: 1430741
+// gas legacy: 2427905
+// gas legacyOptimized: 1773081
 // supportsInterface(bytes4): 0x0 -> 0
 // supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 114626
-// gas legacy: 149888
-// gas legacyOptimized: 121887
+// gas irOptimized: 117398
+// gas legacy: 152660
+// gas legacyOptimized: 124659
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 114626
-// gas legacy: 149888
-// gas legacyOptimized: 121887
+// gas irOptimized: 117398
+// gas legacy: 152660
+// gas legacyOptimized: 124659
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 114611
-// gas legacy: 149898
-// gas legacyOptimized: 121900
+// gas irOptimized: 117383
+// gas legacy: 152670
+// gas legacyOptimized: 124672
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 114611
-// gas legacy: 149898
-// gas legacyOptimized: 121900
+// gas irOptimized: 117383
+// gas legacy: 152670
+// gas legacyOptimized: 124672
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 7d04b5af65..4c3cb78f9d 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -294,8 +294,11 @@ contract Test {
 // f() -> true
 // g() -> true
 // pair() -> true
+// gas irOptimized: 270080
+// gas legacy: 275952
+// gas legacyOptimized: 267239
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 95261
-// gas legacy: 116473
-// gas legacyOptimized: 83670
+// gas irOptimized: 783949
+// gas legacy: 805423
+// gas legacyOptimized: 772571

From 4c9a58eb0f186f0a6ea9d51ec3de4c800c02ec86 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Fri, 2 Sep 2022 13:47:09 +0200
Subject: [PATCH 0998/1748] Don't include location in a message about binding
 function to a type

---
 libsolidity/analysis/TypeChecker.cpp                         | 4 ++--
 .../using/free_functions_implicit_conversion_err.sol         | 2 +-
 .../using/using_free_no_parameters_struct_err.sol            | 5 +++++
 3 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 1025e6576f..2c331700a0 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3798,7 +3798,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 				path->location(),
 				"The function \"" + joinHumanReadable(path->path(), ".") + "\" " +
 				"does not have any parameters, and therefore cannot be bound to the type \"" +
-				(normalizedType ? normalizedType->humanReadableName() : "*") + "\"."
+				(normalizedType ? normalizedType->toString(true /* withoutDataLocation */) : "*") + "\"."
 			);
 
 		FunctionType const* functionType = dynamic_cast<FunctionType const&>(*functionDefinition.type()).asBoundFunction();
@@ -3811,7 +3811,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 				3100_error,
 				path->location(),
 				"The function \"" + joinHumanReadable(path->path(), ".") + "\" "+
-				"cannot be bound to the type \"" + _usingFor.typeName()->annotation().type->humanReadableName() +
+				"cannot be bound to the type \"" + _usingFor.typeName()->annotation().type->toString(true /* withoutDataLocation */) +
 				"\" because the type cannot be implicitly converted to the first argument" +
 				" of the function (\"" + functionType->selfType()->humanReadableName() + "\")" +
 				(
diff --git a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
index 80c117cbba..a1fe8c7b86 100644
--- a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
+++ b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
@@ -11,4 +11,4 @@ contract C {
 }
 // ----
 // TypeError 3100: (112-114): The function "id" cannot be bound to the type "uint256" because the type cannot be implicitly converted to the first argument of the function ("uint16").
-// TypeError 3100: (140-142): The function "id" cannot be bound to the type "struct S storage pointer" because the type cannot be implicitly converted to the first argument of the function ("uint16").
+// TypeError 3100: (140-142): The function "id" cannot be bound to the type "struct S" because the type cannot be implicitly converted to the first argument of the function ("uint16").
diff --git a/test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol b/test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol
new file mode 100644
index 0000000000..758993b160
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol
@@ -0,0 +1,5 @@
+struct S { uint8 x; }
+function f() {}
+using {f} for S;
+// ----
+// TypeError 4731: (45-46): The function "f" does not have any parameters, and therefore cannot be bound to the type "struct S".

From 6da09e8d9a20a53d52d46d095cfbdd61b76d8816 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Fri, 16 Sep 2022 13:17:46 +0200
Subject: [PATCH 0999/1748] Error message tweak: built-in unary/binary operator

---
 libsolidity/analysis/TypeChecker.cpp          |  6 +--
 ...encodeCall_tuple_from_invalid_operator.sol |  6 +--
 ...icit_conversion_of_super_in_comparison.sol | 12 +++---
 ...licit_conversion_of_super_in_operators.sol | 38 +++++++++----------
 .../errors/error_incompatible_binary_ops.sol  | 36 +++++++++---------
 .../error_incompatible_unary_operator.sol     |  2 +-
 .../events/event_incompatible_binary_ops.sol  | 36 +++++++++---------
 .../event_incompatible_unary_operator.sol     |  2 +-
 .../comparison_of_function_types_gt_1.sol     |  2 +-
 .../comparison_of_function_types_gt_2.sol     |  2 +-
 .../comparison_of_function_types_lt_1.sol     |  2 +-
 .../comparison_of_function_types_lt_2.sol     |  2 +-
 ...xternal_functions_with_extra_gas_slots.sol |  4 +-
 ...nternal_and_external_function_pointers.sol |  4 +-
 ...al_functions_with_different_parameters.sol |  6 +--
 .../declaration_dec_tuple.sol                 |  2 +-
 .../declaration_delete_tuple.sol              |  2 +-
 .../declaration_inc_tuple.sol                 |  2 +-
 .../declaration_unary_tuple.sol               |  8 ++--
 .../literalOperations/division_by_zero.sol    |  2 +-
 .../division_by_zero_complex.sol              |  2 +-
 .../literalOperations/exponent.sol            |  4 +-
 .../literalOperations/mod_zero.sol            |  2 +-
 .../literalOperations/mod_zero_complex.sol    |  2 +-
 .../syntaxTests/metaTypes/integer_err.sol     |  2 +-
 ...type_conversion_for_comparison_invalid.sol |  2 +-
 .../025_comparison_of_mapping_types.sol       |  2 +-
 .../112_exp_operator_exponent_too_big.sol     |  2 +-
 .../196_integer_boolean_or.sol                |  2 +-
 .../197_integer_boolean_and.sol               |  2 +-
 .../198_integer_boolean_not.sol               |  2 +-
 .../199_integer_unsigned_exp_signed.sol       |  2 +-
 .../201_integer_signed_exp_signed.sol         |  6 +--
 .../202_bytes_reference_compare_operators.sol |  2 +-
 ...203_struct_reference_compare_operators.sol |  2 +-
 .../213_no_delete_on_storage_pointers.sol     |  2 +-
 .../308_rational_unary_plus_operation.sol     |  2 +-
 .../329_rational_as_exponent_value_signed.sol |  2 +-
 ...30_rational_as_exponent_value_unsigned.sol |  2 +-
 .../331_rational_as_exponent_half.sol         |  2 +-
 ...rational_as_exponent_value_neg_quarter.sol |  2 +-
 .../333_fixed_point_casting_exponents_15.sol  |  2 +-
 .../334_fixed_point_casting_exponents_neg.sol |  2 +-
 .../338_rational_bitnot_unary_operation.sol   |  2 +-
 .../339_rational_bitor_binary_operation.sol   |  2 +-
 .../340_rational_bitxor_binary_operation.sol  |  2 +-
 .../341_rational_bitand_binary_operation.sol  |  2 +-
 ...68_shift_constant_left_negative_rvalue.sol |  2 +-
 ...9_shift_constant_right_negative_rvalue.sol |  2 +-
 ...0_shift_constant_left_excessive_rvalue.sol |  2 +-
 ..._shift_constant_right_excessive_rvalue.sol |  2 +-
 .../372_shift_constant_right_fractional.sol   |  2 +-
 test/libsolidity/syntaxTests/negation.sol     |  2 +-
 .../parsing/unary_plus_expression.sol         |  2 +-
 .../shifts/shift_singed_rvalue.sol            |  4 +-
 .../syntaxTests/signed_rational_modulus.sol   |  2 +-
 .../address/address_binary_operators.sol      |  8 ++--
 .../syntaxTests/types/bool_ops.sol            | 38 +++++++++----------
 .../syntaxTests/types/hex_literal_bitnot.sol  |  2 +-
 .../types/rational_number_bitshift_limit.sol  |  4 +-
 .../types/rational_number_div_limit.sol       |  2 +-
 .../types/rational_number_exp_limit_fail.sol  | 32 ++++++++--------
 .../types/rational_number_mul_limit.sol       |  2 +-
 63 files changed, 172 insertions(+), 172 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 2c331700a0..f5b2896b8a 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1731,7 +1731,7 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 	TypeResult result = type(_operation.subExpression())->unaryOperatorResult(op);
 	if (!result)
 	{
-		string description = "Unary operator " + string(TokenTraits::toString(op)) + " cannot be applied to type " + subExprType->humanReadableName() + "." + (!result.message().empty() ? " " + result.message() : "");
+		string description = "Built-in unary operator " + string(TokenTraits::toString(op)) + " cannot be applied to type " + subExprType->humanReadableName() + "." + (!result.message().empty() ? " " + result.message() : "");
 		if (modifying)
 			// Cannot just report the error, ignore the unary operator, and continue,
 			// because the sub-expression was already processed with requireLValue()
@@ -1760,9 +1760,9 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 		m_errorReporter.typeError(
 			2271_error,
 			_operation.location(),
-			"Operator " +
+			"Built-in binary operator " +
 			string(TokenTraits::toString(_operation.getOperator())) +
-			" not compatible with types " +
+			" cannot be applied to types " +
 			leftType->humanReadableName() +
 			" and " +
 			rightType->humanReadableName() + "." +
diff --git a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
index cd98edf6cb..f6035dd0af 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/abi_encodeCall_tuple_from_invalid_operator.sol
@@ -15,9 +15,9 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (284-299): Operator + not compatible with types tuple(int_const 1,int_const 1) and tuple(int_const 2,int_const 2).
+// TypeError 2271: (284-299): Built-in binary operator + cannot be applied to types tuple(int_const 1,int_const 1) and tuple(int_const 2,int_const 2).
 // TypeError 9062: (284-299): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 2271: (334-345): Operator / not compatible with types tuple() and tuple().
+// TypeError 2271: (334-345): Built-in binary operator / cannot be applied to types tuple() and tuple().
 // TypeError 9062: (334-345): Expected an inline tuple, not an expression of a tuple type.
-// TypeError 4907: (380-383): Unary operator ! cannot be applied to type tuple().
+// TypeError 4907: (380-383): Built-in unary operator ! cannot be applied to type tuple().
 // TypeError 9062: (380-383): Expected an inline tuple, not an expression of a tuple type.
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
index 8087b6b33f..708713b6b0 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_comparison.sol
@@ -19,9 +19,9 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (144-157): Operator != not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (167-180): Operator != not compatible with types contract C and type(contract super C).
-// TypeError 2271: (254-264): Operator != not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (274-284): Operator != not compatible with types contract C and type(contract super C).
-// TypeError 2271: (349-359): Operator != not compatible with types type(contract super C) and contract D.
-// TypeError 2271: (369-379): Operator != not compatible with types contract D and type(contract super C).
+// TypeError 2271: (144-157): Built-in binary operator != cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (167-180): Built-in binary operator != cannot be applied to types contract C and type(contract super C).
+// TypeError 2271: (254-264): Built-in binary operator != cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (274-284): Built-in binary operator != cannot be applied to types contract C and type(contract super C).
+// TypeError 2271: (349-359): Built-in binary operator != cannot be applied to types type(contract super C) and contract D.
+// TypeError 2271: (369-379): Built-in binary operator != cannot be applied to types contract D and type(contract super C).
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
index 0456113062..40e9075e1f 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
@@ -30,25 +30,25 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (49-62): Operator << not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (72-85): Operator >> not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (95-107): Operator ^ not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (117-129): Operator | not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (139-151): Operator & not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (162-174): Operator * not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (184-196): Operator / not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (206-218): Operator % not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (228-240): Operator - not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (250-262): Operator + not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (272-285): Operator ** not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (296-309): Operator == not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (319-332): Operator != not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (342-355): Operator >= not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (365-378): Operator <= not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (388-400): Operator < not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (410-422): Operator > not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (433-446): Operator || not compatible with types type(contract super C) and contract C.
-// TypeError 2271: (456-469): Operator && not compatible with types type(contract super C) and contract C.
+// TypeError 2271: (49-62): Built-in binary operator << cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (72-85): Built-in binary operator >> cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (95-107): Built-in binary operator ^ cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (117-129): Built-in binary operator | cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (139-151): Built-in binary operator & cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (162-174): Built-in binary operator * cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (184-196): Built-in binary operator / cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (206-218): Built-in binary operator % cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (228-240): Built-in binary operator - cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (250-262): Built-in binary operator + cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (272-285): Built-in binary operator ** cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (296-309): Built-in binary operator == cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (319-332): Built-in binary operator != cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (342-355): Built-in binary operator >= cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (365-378): Built-in binary operator <= cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (388-400): Built-in binary operator < cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (410-422): Built-in binary operator > cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (433-446): Built-in binary operator || cannot be applied to types type(contract super C) and contract C.
+// TypeError 2271: (456-469): Built-in binary operator && cannot be applied to types type(contract super C) and contract C.
 // TypeError 4247: (480-485): Expression has to be an lvalue.
 // TypeError 7366: (480-493): Operator -= not compatible with types type(contract super C) and contract C.
 // TypeError 4247: (503-508): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
index 3f18bbf19d..3a54c1c15c 100644
--- a/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
+++ b/test/libsolidity/syntaxTests/errors/error_incompatible_binary_ops.sol
@@ -27,21 +27,21 @@ contract C {
 }
 
 // ----
-// TypeError 2271: (86-116): Operator << not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (126-156): Operator >> not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (166-195): Operator ^ not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (205-234): Operator | not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (244-273): Operator & not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (284-313): Operator * not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (323-352): Operator / not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (362-391): Operator % not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (401-430): Operator + not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (440-469): Operator - not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (480-510): Operator == not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (520-550): Operator != not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (560-590): Operator >= not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (600-630): Operator <= not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (640-669): Operator < not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (679-708): Operator > not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (719-749): Operator || not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
-// TypeError 2271: (759-789): Operator && not compatible with types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (86-116): Built-in binary operator << cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (126-156): Built-in binary operator >> cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (166-195): Built-in binary operator ^ cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (205-234): Built-in binary operator | cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (244-273): Built-in binary operator & cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (284-313): Built-in binary operator * cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (323-352): Built-in binary operator / cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (362-391): Built-in binary operator % cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (401-430): Built-in binary operator + cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (440-469): Built-in binary operator - cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (480-510): Built-in binary operator == cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (520-550): Built-in binary operator != cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (560-590): Built-in binary operator >= cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (600-630): Built-in binary operator <= cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (640-669): Built-in binary operator < cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (679-708): Built-in binary operator > cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (719-749): Built-in binary operator || cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
+// TypeError 2271: (759-789): Built-in binary operator && cannot be applied to types error MyCustomError(uint256,bool) and error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol b/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
index f4bc34ca48..147d2a3e68 100644
--- a/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
+++ b/test/libsolidity/syntaxTests/errors/error_incompatible_unary_operator.sol
@@ -8,4 +8,4 @@ contract C {
 
 // ----
 // TypeError 4247: (86-99): Expression has to be an lvalue.
-// TypeError 9767: (86-101): Unary operator ++ cannot be applied to type error MyCustomError(uint256,bool).
+// TypeError 9767: (86-101): Built-in unary operator ++ cannot be applied to type error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol b/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
index 1537f8edfc..bf04c6a3b3 100644
--- a/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
+++ b/test/libsolidity/syntaxTests/events/event_incompatible_binary_ops.sol
@@ -26,21 +26,21 @@ contract C {
 }
 
 // ----
-// TypeError 2271: (83-113): Operator << not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (123-153): Operator >> not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (163-192): Operator ^ not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (202-231): Operator | not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (241-270): Operator & not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (281-310): Operator * not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (320-349): Operator / not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (359-388): Operator % not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (398-427): Operator + not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (437-466): Operator - not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (477-507): Operator == not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (517-547): Operator != not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (557-587): Operator >= not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (597-627): Operator <= not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (637-666): Operator < not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (676-705): Operator > not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (716-746): Operator || not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
-// TypeError 2271: (756-786): Operator && not compatible with types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (83-113): Built-in binary operator << cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (123-153): Built-in binary operator >> cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (163-192): Built-in binary operator ^ cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (202-231): Built-in binary operator | cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (241-270): Built-in binary operator & cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (281-310): Built-in binary operator * cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (320-349): Built-in binary operator / cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (359-388): Built-in binary operator % cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (398-427): Built-in binary operator + cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (437-466): Built-in binary operator - cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (477-507): Built-in binary operator == cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (517-547): Built-in binary operator != cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (557-587): Built-in binary operator >= cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (597-627): Built-in binary operator <= cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (637-666): Built-in binary operator < cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (676-705): Built-in binary operator > cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (716-746): Built-in binary operator || cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
+// TypeError 2271: (756-786): Built-in binary operator && cannot be applied to types event MyCustomEvent(uint256) and event MyCustomEvent(uint256).
diff --git a/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol b/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
index 110b8d2140..751be21324 100644
--- a/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
+++ b/test/libsolidity/syntaxTests/events/event_incompatible_unary_operator.sol
@@ -7,4 +7,4 @@ contract C {
 
 // ----
 // TypeError 4247: (83-96): Expression has to be an lvalue.
-// TypeError 9767: (83-98): Unary operator ++ cannot be applied to type event MyCustomEvent(uint256).
+// TypeError 9767: (83-98): Built-in unary operator ++ cannot be applied to type event MyCustomEvent(uint256).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
index 67911852ff..b88c257aef 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_1.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-88): Operator > not compatible with types function () external returns (bool) and function () external returns (bool).
+// TypeError 2271: (73-88): Built-in binary operator > cannot be applied to types function () external returns (bool) and function () external returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
index bc3882fdd8..000aea879d 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_gt_2.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-78): Operator > not compatible with types function () returns (bool) and function () returns (bool).
+// TypeError 2271: (73-78): Built-in binary operator > cannot be applied to types function () returns (bool) and function () returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
index e924893f02..ea1c55d3e3 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_1.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-88): Operator < not compatible with types function () external returns (bool) and function () external returns (bool).
+// TypeError 2271: (73-88): Built-in binary operator < cannot be applied to types function () external returns (bool) and function () external returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
index 16dc981ad7..dc973ff602 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_lt_2.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (73-78): Operator < not compatible with types function () returns (bool) and function () returns (bool).
+// TypeError 2271: (73-78): Built-in binary operator < cannot be applied to types function () returns (bool) and function () returns (bool).
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
index 824f2dbf86..12cbe2939b 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_operator_for_external_functions_with_extra_gas_slots.sol
@@ -8,5 +8,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (193-259): Operator == not compatible with types function () external and function () external.
-// TypeError 2271: (277-351): Operator == not compatible with types function () external and function () external.
+// TypeError 2271: (193-259): Built-in binary operator == cannot be applied to types function () external and function () external.
+// TypeError 2271: (277-351): Built-in binary operator == cannot be applied to types function () external and function () external.
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
index a562b2d3f6..7c0bf09606 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
@@ -19,5 +19,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (606-672): Operator != not compatible with types function () and function () external.
-// TypeError 2271: (688-741): Operator != not compatible with types function () and function () external.
+// TypeError 2271: (606-672): Built-in binary operator != cannot be applied to types function () and function () external.
+// TypeError 2271: (688-741): Built-in binary operator != cannot be applied to types function () and function () external.
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol
index 93facedb0c..599e9286e4 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_external_functions_with_different_parameters.sol
@@ -21,6 +21,6 @@ contract C {
 // ----
 // TypeError 9574: (249-333): Type function (uint256) external is not implicitly convertible to expected type function () external.
 // TypeError 9574: (343-427): Type function (bool) external is not implicitly convertible to expected type function () external.
-// TypeError 2271: (458-522): Operator == not compatible with types function (uint256) external and function () external.
-// TypeError 2271: (538-602): Operator == not compatible with types function (bool) external and function () external.
-// TypeError 2271: (726-786): Operator != not compatible with types function (bool) external and function (uint256) external.
+// TypeError 2271: (458-522): Built-in binary operator == cannot be applied to types function (uint256) external and function () external.
+// TypeError 2271: (538-602): Built-in binary operator == cannot be applied to types function (bool) external and function () external.
+// TypeError 2271: (726-786): Built-in binary operator != cannot be applied to types function (bool) external and function (uint256) external.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
index fa1950d924..9398ef4735 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_dec_tuple.sol
@@ -6,4 +6,4 @@ contract C
     }
 }
 // ----
-// TypeError 9767: (59-64): Unary operator -- cannot be applied to type tuple(,).
+// TypeError 9767: (59-64): Built-in unary operator -- cannot be applied to type tuple(,).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
index c73fe7435e..649eae56fa 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_delete_tuple.sol
@@ -7,4 +7,4 @@ contract C
 }
 // ----
 // TypeError 4247: (68-69): Expression has to be an lvalue.
-// TypeError 9767: (59-70): Unary operator delete cannot be applied to type tuple(,int_const 0).
+// TypeError 9767: (59-70): Built-in unary operator delete cannot be applied to type tuple(,int_const 0).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
index 3cbab14234..2f20a62164 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_inc_tuple.sol
@@ -6,4 +6,4 @@ contract C
     }
 }
 // ----
-// TypeError 9767: (61-66): Unary operator ++ cannot be applied to type tuple(,).
+// TypeError 9767: (61-66): Built-in unary operator ++ cannot be applied to type tuple(,).
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
index 01056ffe21..b6b2ec2e2f 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
@@ -10,11 +10,11 @@ contract C
 }
 // ----
 // SyntaxError 9636: (59-66): Use of unary + is disallowed.
-// TypeError 4907: (59-66): Unary operator + cannot be applied to type tuple(int_const 0,int_const 0).
+// TypeError 4907: (59-66): Built-in unary operator + cannot be applied to type tuple(int_const 0,int_const 0).
 // TypeError 7364: (51-66): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (84-91): Unary operator - cannot be applied to type tuple(int_const 0,int_const 0).
+// TypeError 4907: (84-91): Built-in unary operator - cannot be applied to type tuple(int_const 0,int_const 0).
 // TypeError 7364: (76-91): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (111-118): Unary operator ~ cannot be applied to type tuple(int_const 0,int_const 0).
+// TypeError 4907: (111-118): Built-in unary operator ~ cannot be applied to type tuple(int_const 0,int_const 0).
 // TypeError 7364: (101-118): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (138-145): Unary operator ! cannot be applied to type tuple(int_const 0,int_const 0).
+// TypeError 4907: (138-145): Built-in unary operator ! cannot be applied to type tuple(int_const 0,int_const 0).
 // TypeError 7364: (128-145): Different number of components on the left hand side (1) than on the right hand side (2).
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
index 211eabac22..5685084d55 100644
--- a/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/division_by_zero.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant a = 1 / 0;
 }
 // ----
-// TypeError 2271: (35-40): Operator / not compatible with types int_const 1 and int_const 0.
+// TypeError 2271: (35-40): Built-in binary operator / cannot be applied to types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
index afa0896fa8..195336e279 100644
--- a/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/division_by_zero_complex.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant a = 1 / ((1+3)-4);
 }
 // ----
-// TypeError 2271: (35-48): Operator / not compatible with types int_const 1 and int_const 0.
+// TypeError 2271: (35-48): Built-in binary operator / cannot be applied to types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/literalOperations/exponent.sol b/test/libsolidity/syntaxTests/literalOperations/exponent.sol
index c3469054c7..72dc5ecd4e 100644
--- a/test/libsolidity/syntaxTests/literalOperations/exponent.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/exponent.sol
@@ -6,5 +6,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (67-78): Operator ** not compatible with types int256 and int_const 1000...(1226 digits omitted)...0000. Exponent too large.
-// TypeError 2271: (88-98): Operator ** not compatible with types int256 and rational_const 1 / 2. Exponent is fractional.
+// TypeError 2271: (67-78): Built-in binary operator ** cannot be applied to types int256 and int_const 1000...(1226 digits omitted)...0000. Exponent too large.
+// TypeError 2271: (88-98): Built-in binary operator ** cannot be applied to types int256 and rational_const 1 / 2. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
index 28f95e3327..b4ca4d27b1 100644
--- a/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/mod_zero.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant b3 = 1 % 0;
 }
 // ----
-// TypeError 2271: (36-41): Operator % not compatible with types int_const 1 and int_const 0.
+// TypeError 2271: (36-41): Built-in binary operator % cannot be applied to types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol b/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
index 54b6b309bd..73cbd71fea 100644
--- a/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
+++ b/test/libsolidity/syntaxTests/literalOperations/mod_zero_complex.sol
@@ -2,4 +2,4 @@ contract C {
     uint constant b3 = 1 % (-4+((2)*2));
 }
 // ----
-// TypeError 2271: (36-52): Operator % not compatible with types int_const 1 and int_const 0.
+// TypeError 2271: (36-52): Built-in binary operator % cannot be applied to types int_const 1 and int_const 0.
diff --git a/test/libsolidity/syntaxTests/metaTypes/integer_err.sol b/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
index b098a86029..7e703b72e5 100644
--- a/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
+++ b/test/libsolidity/syntaxTests/metaTypes/integer_err.sol
@@ -12,4 +12,4 @@ contract Test {
 // ----
 // TypeError 9574: (59-89): Type int256 is not implicitly convertible to expected type uint8.
 // TypeError 9574: (99-127): Type int256 is not implicitly convertible to expected type uint256.
-// TypeError 2271: (142-169): Operator == not compatible with types int256 and int_const 1157...(70 digits omitted)...9935.
+// TypeError 2271: (142-169): Built-in binary operator == cannot be applied to types int256 and int_const 1157...(70 digits omitted)...9935.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
index 528635b983..f191d44789 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/011_type_conversion_for_comparison_invalid.sol
@@ -2,4 +2,4 @@ contract test {
     function f() public { int32(2) == uint64(2); }
 }
 // ----
-// TypeError 2271: (42-63): Operator == not compatible with types int32 and uint64.
+// TypeError 2271: (42-63): Built-in binary operator == cannot be applied to types int32 and uint64.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
index 7849588a40..d31f5fa3b3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/025_comparison_of_mapping_types.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (147-153): Operator == not compatible with types mapping(uint256 => uint256) and mapping(uint256 => uint256).
+// TypeError 2271: (147-153): Built-in binary operator == cannot be applied to types mapping(uint256 => uint256) and mapping(uint256 => uint256).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
index 0dfeb892a6..ea571b72af 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/112_exp_operator_exponent_too_big.sol
@@ -2,4 +2,4 @@ contract test {
     function f() public returns (uint d) { return 2 ** 10000000000; }
 }
 // ----
-// TypeError 2271: (66-82): Operator ** not compatible with types int_const 2 and int_const 10000000000.
+// TypeError 2271: (66-82): Built-in binary operator ** cannot be applied to types int_const 2 and int_const 10000000000.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
index 24c6ce13c7..e3e0dd2a3b 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/196_integer_boolean_or.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 1; uint y = 2; x || y; } }
 // ----
-// TypeError 2271: (62-68): Operator || not compatible with types uint256 and uint256.
+// TypeError 2271: (62-68): Built-in binary operator || cannot be applied to types uint256 and uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
index 1d1298b050..d8141a2aaa 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/197_integer_boolean_and.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 1; uint y = 2; x && y; } }
 // ----
-// TypeError 2271: (62-68): Operator && not compatible with types uint256 and uint256.
+// TypeError 2271: (62-68): Built-in binary operator && cannot be applied to types uint256 and uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
index c4fff97b47..83c39fbdad 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/198_integer_boolean_not.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 1; !x; } }
 // ----
-// TypeError 4907: (50-52): Unary operator ! cannot be applied to type uint256.
+// TypeError 4907: (50-52): Built-in unary operator ! cannot be applied to type uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol
index cabe9aa13c..5f5e820908 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/199_integer_unsigned_exp_signed.sol
@@ -1,3 +1,3 @@
 contract test { fallback() external { uint x = 3; int y = -4; x ** y; } }
 // ----
-// TypeError 2271: (62-68): Operator ** not compatible with types uint256 and int256. Exponentiation power is not allowed to be a signed integer type.
+// TypeError 2271: (62-68): Built-in binary operator ** cannot be applied to types uint256 and int256. Exponentiation power is not allowed to be a signed integer type.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol
index 188dda39c6..f7f3df9107 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/201_integer_signed_exp_signed.sol
@@ -4,7 +4,7 @@ contract test {
     function i() public { int16 x = 4; x ** -3; }
 }
 // ----
-// TypeError 2271: (64-70): Operator ** not compatible with types int256 and int256. Exponentiation power is not allowed to be a signed integer type.
-// TypeError 2271: (126-132): Operator ** not compatible with types uint8 and int16. Exponentiation power is not allowed to be a signed integer type.
+// TypeError 2271: (64-70): Built-in binary operator ** cannot be applied to types int256 and int256. Exponentiation power is not allowed to be a signed integer type.
+// TypeError 2271: (126-132): Built-in binary operator ** cannot be applied to types uint8 and int16. Exponentiation power is not allowed to be a signed integer type.
 // Warning 3149: (126-132): The result type of the exponentiation operation is equal to the type of the first operand (uint8) ignoring the (larger) type of the second operand (int16) which might be unexpected. Silence this warning by either converting the first or the second operand to the type of the other.
-// TypeError 2271: (175-182): Operator ** not compatible with types int16 and int_const -3. Exponentiation power is not allowed to be a negative integer literal.
+// TypeError 2271: (175-182): Built-in binary operator ** cannot be applied to types int16 and int_const -3. Exponentiation power is not allowed to be a negative integer literal.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
index 60dffe643f..064afd46bb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/202_bytes_reference_compare_operators.sol
@@ -1,3 +1,3 @@
 contract test { bytes a; bytes b; fallback() external { a == b; } }
 // ----
-// TypeError 2271: (56-62): Operator == not compatible with types bytes storage ref and bytes storage ref.
+// TypeError 2271: (56-62): Built-in binary operator == cannot be applied to types bytes storage ref and bytes storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
index 822db8dd55..930e79a3b7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
@@ -7,4 +7,4 @@ contract test {
   }
 }
 // ----
-// TypeError 2271: (79-85): Operator == not compatible with types struct test.s storage ref and struct test.s storage ref.
+// TypeError 2271: (79-85): Built-in binary operator == cannot be applied to types struct test.s storage ref and struct test.s storage ref.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
index e0db21efab..7d452197ee 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/213_no_delete_on_storage_pointers.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9767: (97-105): Unary operator delete cannot be applied to type uint256[] storage pointer.
+// TypeError 9767: (97-105): Built-in unary operator delete cannot be applied to type uint256[] storage pointer.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
index eeaa66ebc4..0c579062bf 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
@@ -7,4 +7,4 @@ contract test {
 }
 // ----
 // SyntaxError 9636: (70-75): Use of unary + is disallowed.
-// TypeError 4907: (70-75): Unary operator + cannot be applied to type rational_const 13 / 4.
+// TypeError 4907: (70-75): Built-in unary operator + cannot be applied to type rational_const 13 / 4.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
index 47a1a617f6..d604ac7b4d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/329_rational_as_exponent_value_signed.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (60-69): Operator ** not compatible with types int_const 2 and rational_const -11 / 5.
+// TypeError 2271: (60-69): Built-in binary operator ** cannot be applied to types int_const 2 and rational_const -11 / 5.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
index 0f93157ed4..8003975244 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/330_rational_as_exponent_value_unsigned.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (61-69): Operator ** not compatible with types int_const 3 and rational_const 5 / 2.
+// TypeError 2271: (61-69): Built-in binary operator ** cannot be applied to types int_const 3 and rational_const 5 / 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
index 721ca806e4..e2843d34fd 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/331_rational_as_exponent_half.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-60): Operator ** not compatible with types int_const 2 and rational_const 1 / 2.
+// TypeError 2271: (50-60): Built-in binary operator ** cannot be applied to types int_const 2 and rational_const 1 / 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
index 6408f13c61..5b84f1a500 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/332_rational_as_exponent_value_neg_quarter.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-62): Operator ** not compatible with types int_const 42 and rational_const -1 / 4.
+// TypeError 2271: (50-62): Built-in binary operator ** cannot be applied to types int_const 42 and rational_const -1 / 4.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
index f988745ea4..3c7082f17d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/333_fixed_point_casting_exponents_15.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (61-77): Operator ** not compatible with types int_const 3 and ufixed128x18. Exponent is fractional.
+// TypeError 2271: (61-77): Built-in binary operator ** cannot be applied to types int_const 3 and ufixed128x18. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
index 68e80e6352..c462d50151 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/334_fixed_point_casting_exponents_neg.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (61-78): Operator ** not compatible with types int_const 42 and fixed128x18. Exponent is fractional.
+// TypeError 2271: (61-78): Built-in binary operator ** cannot be applied to types int_const 42 and fixed128x18. Exponent is fractional.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
index 4bf484ff1b..46cda0a1cb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/338_rational_bitnot_unary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4907: (50-61): Unary operator ~ cannot be applied to type fixed128x18.
+// TypeError 4907: (50-61): Built-in unary operator ~ cannot be applied to type fixed128x18.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
index 66f5e620a2..93cbd9ce6d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/339_rational_bitor_binary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-64): Operator | not compatible with types fixed128x18 and int_const 3.
+// TypeError 2271: (50-64): Built-in binary operator | cannot be applied to types fixed128x18 and int_const 3.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
index 791e1480c3..d8792c6bc0 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/340_rational_bitxor_binary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-65): Operator ^ not compatible with types fixed128x18 and int_const 3.
+// TypeError 2271: (50-65): Built-in binary operator ^ cannot be applied to types fixed128x18 and int_const 3.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
index 9e49de99b7..0cd2d7f23e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/341_rational_bitand_binary_operation.sol
@@ -4,4 +4,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (50-65): Operator & not compatible with types fixed128x18 and int_const 3.
+// TypeError 2271: (50-65): Built-in binary operator & cannot be applied to types fixed128x18 and int_const 3.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
index aaa0903b69..6cbf058251 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/368_shift_constant_left_negative_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 << -8;
 }
 // ----
-// TypeError 2271: (33-43): Operator << not compatible with types int_const 66 and int_const -8.
+// TypeError 2271: (33-43): Built-in binary operator << cannot be applied to types int_const 66 and int_const -8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
index edfb03d3d1..b7eca3d2f8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/369_shift_constant_right_negative_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 >> -8;
 }
 // ----
-// TypeError 2271: (33-43): Operator >> not compatible with types int_const 66 and int_const -8.
+// TypeError 2271: (33-43): Built-in binary operator >> cannot be applied to types int_const 66 and int_const -8.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
index 17e7cc7199..4272c357b1 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/370_shift_constant_left_excessive_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 << 0x100000000;
 }
 // ----
-// TypeError 2271: (33-52): Operator << not compatible with types int_const 66 and int_const 4294967296.
+// TypeError 2271: (33-52): Built-in binary operator << cannot be applied to types int_const 66 and int_const 4294967296.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
index f96eeab2dc..2c3cec95eb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/371_shift_constant_right_excessive_rvalue.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 >> 0x100000000;
 }
 // ----
-// TypeError 2271: (33-52): Operator >> not compatible with types int_const 66 and int_const 4294967296.
+// TypeError 2271: (33-52): Built-in binary operator >> cannot be applied to types int_const 66 and int_const 4294967296.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
index 8f005b9ec0..913572d45e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/372_shift_constant_right_fractional.sol
@@ -2,4 +2,4 @@ contract C {
     uint public a = 0x42 >> (1 / 2);
 }
 // ----
-// TypeError 2271: (33-48): Operator >> not compatible with types int_const 66 and rational_const 1 / 2.
+// TypeError 2271: (33-48): Built-in binary operator >> cannot be applied to types int_const 66 and rational_const 1 / 2.
diff --git a/test/libsolidity/syntaxTests/negation.sol b/test/libsolidity/syntaxTests/negation.sol
index 4a9d87b8a0..c5805f4f78 100644
--- a/test/libsolidity/syntaxTests/negation.sol
+++ b/test/libsolidity/syntaxTests/negation.sol
@@ -6,4 +6,4 @@ contract test {
     }
 }
 // ----
-// TypeError 4907: (97-99): Unary operator - cannot be applied to type uint256. Unary negation is only allowed for signed integers.
+// TypeError 4907: (97-99): Built-in unary operator - cannot be applied to type uint256. Unary negation is only allowed for signed integers.
diff --git a/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol b/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
index 7005c8848b..41384d98f6 100644
--- a/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
+++ b/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
@@ -6,4 +6,4 @@ contract test {
 }
 // ----
 // SyntaxError 9636: (70-72): Use of unary + is disallowed.
-// TypeError 4907: (70-72): Unary operator + cannot be applied to type uint256.
+// TypeError 4907: (70-72): Built-in unary operator + cannot be applied to type uint256.
diff --git a/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol b/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
index 87a2dee81b..1ca57bdccf 100644
--- a/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
+++ b/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
@@ -7,5 +7,5 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (89-95): Operator >> not compatible with types int256 and int256.
-// TypeError 2271: (179-193): Operator >> not compatible with types int256 and int256.
+// TypeError 2271: (89-95): Built-in binary operator >> cannot be applied to types int256 and int256.
+// TypeError 2271: (179-193): Built-in binary operator >> cannot be applied to types int256 and int256.
diff --git a/test/libsolidity/syntaxTests/signed_rational_modulus.sol b/test/libsolidity/syntaxTests/signed_rational_modulus.sol
index 999086ae12..a3acf182fc 100644
--- a/test/libsolidity/syntaxTests/signed_rational_modulus.sol
+++ b/test/libsolidity/syntaxTests/signed_rational_modulus.sol
@@ -7,4 +7,4 @@ contract test {
     }
 }
 // ----
-// TypeError 2271: (117-123): Operator % not compatible with types rational_const 1 / 2 and fixed128x18. Fractional literals not supported.
+// TypeError 2271: (117-123): Built-in binary operator % cannot be applied to types rational_const 1 / 2 and fixed128x18. Fractional literals not supported.
diff --git a/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol b/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol
index f26eed18af..7535e6da51 100644
--- a/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_binary_operators.sol
@@ -9,7 +9,7 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (85-108): Operator + not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
-// TypeError 2271: (122-145): Operator - not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
-// TypeError 2271: (159-182): Operator * not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
-// TypeError 2271: (196-219): Operator / not compatible with types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
+// TypeError 2271: (85-108): Built-in binary operator + cannot be applied to types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
+// TypeError 2271: (122-145): Built-in binary operator - cannot be applied to types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
+// TypeError 2271: (159-182): Built-in binary operator * cannot be applied to types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
+// TypeError 2271: (196-219): Built-in binary operator / cannot be applied to types address and address. Arithmetic operations on addresses are not supported. Convert to integer first before using them.
diff --git a/test/libsolidity/syntaxTests/types/bool_ops.sol b/test/libsolidity/syntaxTests/types/bool_ops.sol
index b107c979a1..08501ff5b3 100644
--- a/test/libsolidity/syntaxTests/types/bool_ops.sol
+++ b/test/libsolidity/syntaxTests/types/bool_ops.sol
@@ -32,22 +32,22 @@ contract C {
     }
 }
 // ----
-// TypeError 2271: (231-236): Operator > not compatible with types bool and bool.
-// TypeError 2271: (250-255): Operator < not compatible with types bool and bool.
-// TypeError 2271: (269-275): Operator >= not compatible with types bool and bool.
-// TypeError 2271: (289-295): Operator <= not compatible with types bool and bool.
-// TypeError 2271: (309-314): Operator & not compatible with types bool and bool.
-// TypeError 2271: (328-333): Operator | not compatible with types bool and bool.
-// TypeError 2271: (347-352): Operator ^ not compatible with types bool and bool.
-// TypeError 4907: (366-368): Unary operator ~ cannot be applied to type bool.
-// TypeError 4907: (382-384): Unary operator ~ cannot be applied to type bool.
-// TypeError 2271: (398-403): Operator + not compatible with types bool and bool.
-// TypeError 2271: (417-422): Operator - not compatible with types bool and bool.
-// TypeError 4907: (436-438): Unary operator - cannot be applied to type bool.
-// TypeError 4907: (452-454): Unary operator - cannot be applied to type bool.
-// TypeError 2271: (468-473): Operator * not compatible with types bool and bool.
-// TypeError 2271: (487-492): Operator / not compatible with types bool and bool.
-// TypeError 2271: (506-512): Operator ** not compatible with types bool and bool.
-// TypeError 2271: (526-531): Operator % not compatible with types bool and bool.
-// TypeError 2271: (545-551): Operator << not compatible with types bool and bool.
-// TypeError 2271: (565-571): Operator >> not compatible with types bool and bool.
+// TypeError 2271: (231-236): Built-in binary operator > cannot be applied to types bool and bool.
+// TypeError 2271: (250-255): Built-in binary operator < cannot be applied to types bool and bool.
+// TypeError 2271: (269-275): Built-in binary operator >= cannot be applied to types bool and bool.
+// TypeError 2271: (289-295): Built-in binary operator <= cannot be applied to types bool and bool.
+// TypeError 2271: (309-314): Built-in binary operator & cannot be applied to types bool and bool.
+// TypeError 2271: (328-333): Built-in binary operator | cannot be applied to types bool and bool.
+// TypeError 2271: (347-352): Built-in binary operator ^ cannot be applied to types bool and bool.
+// TypeError 4907: (366-368): Built-in unary operator ~ cannot be applied to type bool.
+// TypeError 4907: (382-384): Built-in unary operator ~ cannot be applied to type bool.
+// TypeError 2271: (398-403): Built-in binary operator + cannot be applied to types bool and bool.
+// TypeError 2271: (417-422): Built-in binary operator - cannot be applied to types bool and bool.
+// TypeError 4907: (436-438): Built-in unary operator - cannot be applied to type bool.
+// TypeError 4907: (452-454): Built-in unary operator - cannot be applied to type bool.
+// TypeError 2271: (468-473): Built-in binary operator * cannot be applied to types bool and bool.
+// TypeError 2271: (487-492): Built-in binary operator / cannot be applied to types bool and bool.
+// TypeError 2271: (506-512): Built-in binary operator ** cannot be applied to types bool and bool.
+// TypeError 2271: (526-531): Built-in binary operator % cannot be applied to types bool and bool.
+// TypeError 2271: (545-551): Built-in binary operator << cannot be applied to types bool and bool.
+// TypeError 2271: (565-571): Built-in binary operator >> cannot be applied to types bool and bool.
diff --git a/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol b/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
index b5676f23c3..5b24153c8f 100644
--- a/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
+++ b/test/libsolidity/syntaxTests/types/hex_literal_bitnot.sol
@@ -2,4 +2,4 @@ contract C {
     bytes32 b = ~hex"00ff11";
 }
 // ----
-// TypeError 4907: (29-41): Unary operator ~ cannot be applied to type literal_string hex"00ff11".
+// TypeError 4907: (29-41): Built-in unary operator ~ cannot be applied to type literal_string hex"00ff11".
diff --git a/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
index 15146500a6..801773db29 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_bitshift_limit.sol
@@ -8,6 +8,6 @@ contract c {
 }
 // ----
 // TypeError 7407: (71-80): Type int_const 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (133-142): Operator << not compatible with types int_const 1 and int_const 4096.
-// TypeError 2271: (169-182): Operator << not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 2.
+// TypeError 2271: (133-142): Built-in binary operator << cannot be applied to types int_const 1 and int_const 4096.
+// TypeError 2271: (169-182): Built-in binary operator << cannot be applied to types int_const 1000...(1226 digits omitted)...0000 and int_const 2.
 // TypeError 7407: (169-182): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol
index 388e9d398b..ae42d5e5e4 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_div_limit.sol
@@ -5,5 +5,5 @@ contract c {
     }
 }
 // ----
-// TypeError 2271: (71-92): Operator / not compatible with types rational_const 1 / 5221...(1225 digits omitted)...5168 and int_const 5221...(1225 digits omitted)...5168. Precision of rational constants is limited to 4096 bits.
+// TypeError 2271: (71-92): Built-in binary operator / cannot be applied to types rational_const 1 / 5221...(1225 digits omitted)...5168 and int_const 5221...(1225 digits omitted)...5168. Precision of rational constants is limited to 4096 bits.
 // TypeError 2326: (71-92): Type rational_const 1 / 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Try converting to type ufixed8x80 or use an explicit conversion.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol b/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
index 3ab4cdae3c..fb029202f7 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_exp_limit_fail.sol
@@ -19,29 +19,29 @@ contract c {
     }
 }
 // ----
-// TypeError 2271: (71-112): Operator ** not compatible with types int_const 1797...(301 digits omitted)...7216 and int_const 4.
+// TypeError 2271: (71-112): Built-in binary operator ** cannot be applied to types int_const 1797...(301 digits omitted)...7216 and int_const 4.
 // TypeError 7407: (71-112): Type int_const 1797...(301 digits omitted)...7216 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (135-151): Operator ** not compatible with types int_const 4 and int_const 1157...(70 digits omitted)...9936.
+// TypeError 2271: (135-151): Built-in binary operator ** cannot be applied to types int_const 4 and int_const 1157...(70 digits omitted)...9936.
 // TypeError 7407: (126-169): Type int_const 1340...(147 digits omitted)...4096 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (201-217): Operator ** not compatible with types int_const 4 and int_const 1340...(147 digits omitted)...4096.
-// TypeError 2271: (183-219): Operator ** not compatible with types int_const 4 and int_const -115...(71 digits omitted)...9936.
-// TypeError 2271: (233-244): Operator ** not compatible with types int_const 2 and int_const 1000...(1226 digits omitted)...0000.
-// TypeError 2271: (258-270): Operator ** not compatible with types int_const -2 and int_const 1000...(1226 digits omitted)...0000.
-// TypeError 2271: (284-296): Operator ** not compatible with types int_const 2 and int_const -100...(1227 digits omitted)...0000.
-// TypeError 2271: (310-323): Operator ** not compatible with types int_const -2 and int_const -100...(1227 digits omitted)...0000.
-// TypeError 2271: (337-348): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 2.
+// TypeError 2271: (201-217): Built-in binary operator ** cannot be applied to types int_const 4 and int_const 1340...(147 digits omitted)...4096.
+// TypeError 2271: (183-219): Built-in binary operator ** cannot be applied to types int_const 4 and int_const -115...(71 digits omitted)...9936.
+// TypeError 2271: (233-244): Built-in binary operator ** cannot be applied to types int_const 2 and int_const 1000...(1226 digits omitted)...0000.
+// TypeError 2271: (258-270): Built-in binary operator ** cannot be applied to types int_const -2 and int_const 1000...(1226 digits omitted)...0000.
+// TypeError 2271: (284-296): Built-in binary operator ** cannot be applied to types int_const 2 and int_const -100...(1227 digits omitted)...0000.
+// TypeError 2271: (310-323): Built-in binary operator ** cannot be applied to types int_const -2 and int_const -100...(1227 digits omitted)...0000.
+// TypeError 2271: (337-348): Built-in binary operator ** cannot be applied to types int_const 1000...(1226 digits omitted)...0000 and int_const 2.
 // TypeError 7407: (337-348): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (362-374): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const 2.
+// TypeError 2271: (362-374): Built-in binary operator ** cannot be applied to types int_const -100...(1227 digits omitted)...0000 and int_const 2.
 // TypeError 7407: (362-374): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (388-400): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const -2.
+// TypeError 2271: (388-400): Built-in binary operator ** cannot be applied to types int_const 1000...(1226 digits omitted)...0000 and int_const -2.
 // TypeError 7407: (388-400): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (414-427): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const -2.
+// TypeError 2271: (414-427): Built-in binary operator ** cannot be applied to types int_const -100...(1227 digits omitted)...0000 and int_const -2.
 // TypeError 7407: (414-427): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (441-457): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000.
+// TypeError 2271: (441-457): Built-in binary operator ** cannot be applied to types int_const 1000...(1226 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000.
 // TypeError 7407: (441-457): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (471-488): Operator ** not compatible with types int_const 1000...(1226 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000.
+// TypeError 2271: (471-488): Built-in binary operator ** cannot be applied to types int_const 1000...(1226 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000.
 // TypeError 7407: (471-488): Type int_const 1000...(1226 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (502-519): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000.
+// TypeError 2271: (502-519): Built-in binary operator ** cannot be applied to types int_const -100...(1227 digits omitted)...0000 and int_const 1000...(1226 digits omitted)...0000.
 // TypeError 7407: (502-519): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
-// TypeError 2271: (533-551): Operator ** not compatible with types int_const -100...(1227 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000.
+// TypeError 2271: (533-551): Built-in binary operator ** cannot be applied to types int_const -100...(1227 digits omitted)...0000 and int_const -100...(1227 digits omitted)...0000.
 // TypeError 7407: (533-551): Type int_const -100...(1227 digits omitted)...0000 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.
diff --git a/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol b/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol
index a025784538..c23569c95f 100644
--- a/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol
+++ b/test/libsolidity/syntaxTests/types/rational_number_mul_limit.sol
@@ -5,5 +5,5 @@ contract c {
     }
 }
 // ----
-// TypeError 2271: (71-90): Operator * not compatible with types int_const 5221...(1225 digits omitted)...5168 and int_const 5221...(1225 digits omitted)...5168. Precision of rational constants is limited to 4096 bits.
+// TypeError 2271: (71-90): Built-in binary operator * cannot be applied to types int_const 5221...(1225 digits omitted)...5168 and int_const 5221...(1225 digits omitted)...5168. Precision of rational constants is limited to 4096 bits.
 // TypeError 7407: (71-90): Type int_const 5221...(1225 digits omitted)...5168 is not implicitly convertible to expected type int256. Literal is too large to fit in int256.

From a866aaebf34bef8346619d5042e7bc2216f95ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 7 Nov 2022 17:12:56 +0100
Subject: [PATCH 1000/1748] Refactor several error messages in TypeChecker to
 use fmtlib

---
 libsolidity/analysis/TypeChecker.cpp | 33 ++++++++++++++++++----------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index f5b2896b8a..0e2cc6c347 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -40,6 +40,8 @@
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
+#include <fmt/format.h>
+
 #include <range/v3/algorithm/count_if.hpp>
 #include <range/v3/view/drop_exactly.hpp>
 #include <range/v3/view/enumerate.hpp>
@@ -1731,7 +1733,13 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 	TypeResult result = type(_operation.subExpression())->unaryOperatorResult(op);
 	if (!result)
 	{
-		string description = "Built-in unary operator " + string(TokenTraits::toString(op)) + " cannot be applied to type " + subExprType->humanReadableName() + "." + (!result.message().empty() ? " " + result.message() : "");
+		string description = fmt::format(
+			"Built-in unary operator {} cannot be applied to type {}.{}",
+			TokenTraits::toString(op),
+			subExprType->humanReadableName(),
+			!result.message().empty() ? " " + result.message() : ""
+		);
+
 		if (modifying)
 			// Cannot just report the error, ignore the unary operator, and continue,
 			// because the sub-expression was already processed with requireLValue()
@@ -3796,9 +3804,11 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 			m_errorReporter.fatalTypeError(
 				4731_error,
 				path->location(),
-				"The function \"" + joinHumanReadable(path->path(), ".") + "\" " +
-				"does not have any parameters, and therefore cannot be bound to the type \"" +
-				(normalizedType ? normalizedType->toString(true /* withoutDataLocation */) : "*") + "\"."
+				fmt::format(
+					"The function \"{}\" does not have any parameters, and therefore cannot be bound to the type \"{}\".",
+					joinHumanReadable(path->path(), "."),
+					normalizedType ? normalizedType->toString(true /* withoutDataLocation */) : "*"
+				)
 			);
 
 		FunctionType const* functionType = dynamic_cast<FunctionType const&>(*functionDefinition.type()).asBoundFunction();
@@ -3810,14 +3820,13 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 			m_errorReporter.typeError(
 				3100_error,
 				path->location(),
-				"The function \"" + joinHumanReadable(path->path(), ".") + "\" "+
-				"cannot be bound to the type \"" + _usingFor.typeName()->annotation().type->toString(true /* withoutDataLocation */) +
-				"\" because the type cannot be implicitly converted to the first argument" +
-				" of the function (\"" + functionType->selfType()->humanReadableName() + "\")" +
-				(
-					result.message().empty() ?
-					"." :
-					": " +  result.message()
+				fmt::format(
+					"The function \"{}\" cannot be bound to the type \"{}\" because the type cannot "
+					"be implicitly converted to the first argument of the function (\"{}\"){}",
+					joinHumanReadable(path->path(), "."),
+					_usingFor.typeName()->annotation().type->toString(true /* withoutDataLocation */),
+					functionType->selfType()->humanReadableName(),
+					result.message().empty() ? "." : ": " +  result.message()
 				)
 			);
 	}

From 52bfb8bd2d6a4bf46a922495a6df7e2484aa8e5d Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 6 Jul 2022 09:17:59 +0200
Subject: [PATCH 1001/1748] Minor test naming/style corrections

---
 test/libsolidity/analysis/FunctionCallGraph.cpp             | 6 +++---
 .../localStorageVariables/ternary_assignment_fine.sol       | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/test/libsolidity/analysis/FunctionCallGraph.cpp b/test/libsolidity/analysis/FunctionCallGraph.cpp
index 7b67aeb44e..8c10ca72a2 100644
--- a/test/libsolidity/analysis/FunctionCallGraph.cpp
+++ b/test/libsolidity/analysis/FunctionCallGraph.cpp
@@ -1673,7 +1673,7 @@ BOOST_AUTO_TEST_CASE(using_for)
 		contract C {
 			using L for S;
 
-			function test() public {
+			function pub() public {
 				S memory s = S(42);
 
 				s.ext();
@@ -1693,8 +1693,8 @@ BOOST_AUTO_TEST_CASE(using_for)
 			{"Entry", "function L.ext(struct S)"},
 		}},
 		{"C", {
-			{"Entry", "function C.test()"},
-			{"function C.test()", "function L.inr(struct S)"},
+			{"Entry", "function C.pub()"},
+			{"function C.pub()", "function L.inr(struct S)"},
 		}},
 	};
 
diff --git a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_fine.sol b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_fine.sol
index 894ff936c8..10e9a67957 100644
--- a/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_fine.sol
+++ b/test/libsolidity/syntaxTests/controlFlow/localStorageVariables/ternary_assignment_fine.sol
@@ -6,5 +6,4 @@ contract C {
         y;
     }
 }
-// ---
 // ----

From df1f5eef72724d0cf27237607ee95c30d07f1b7b Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Tue, 2 Aug 2022 08:25:01 +0200
Subject: [PATCH 1002/1748] UsingForDirective: Rename m_functions to
 m_functionsOrLibrary

---
 libsolidity/ast/AST.h        | 8 ++++----
 libsolidity/ast/AST_accept.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index d6e41bb5f0..f5680acbc8 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -663,13 +663,13 @@ class UsingForDirective: public ASTNode
 	UsingForDirective(
 		int64_t _id,
 		SourceLocation const& _location,
-		std::vector<ASTPointer<IdentifierPath>> _functions,
+		std::vector<ASTPointer<IdentifierPath>> _functionsOrLibrary,
 		bool _usesBraces,
 		ASTPointer<TypeName> _typeName,
 		bool _global
 	):
 		ASTNode(_id, _location),
-		m_functions(_functions),
+		m_functionsOrLibrary(std::move(_functionsOrLibrary)),
 		m_usesBraces(_usesBraces),
 		m_typeName(std::move(_typeName)),
 		m_global{_global}
@@ -683,13 +683,13 @@ class UsingForDirective: public ASTNode
 	TypeName const* typeName() const { return m_typeName.get(); }
 
 	/// @returns a list of functions or the single library.
-	std::vector<ASTPointer<IdentifierPath>> const& functionsOrLibrary() const { return m_functions; }
+	std::vector<ASTPointer<IdentifierPath>> const& functionsOrLibrary() const { return m_functionsOrLibrary; }
 	bool usesBraces() const { return m_usesBraces; }
 	bool global() const { return m_global; }
 
 private:
 	/// Either the single library or a list of functions.
-	std::vector<ASTPointer<IdentifierPath>> m_functions;
+	std::vector<ASTPointer<IdentifierPath>> m_functionsOrLibrary;
 	bool m_usesBraces;
 	ASTPointer<TypeName> m_typeName;
 	bool m_global = false;
diff --git a/libsolidity/ast/AST_accept.h b/libsolidity/ast/AST_accept.h
index 6dab08f009..78dc0e5ddd 100644
--- a/libsolidity/ast/AST_accept.h
+++ b/libsolidity/ast/AST_accept.h
@@ -194,7 +194,7 @@ void UsingForDirective::accept(ASTVisitor& _visitor)
 {
 	if (_visitor.visit(*this))
 	{
-		listAccept(functionsOrLibrary(), _visitor);
+		listAccept(m_functionsOrLibrary, _visitor);
 		if (m_typeName)
 			m_typeName->accept(_visitor);
 	}
@@ -205,7 +205,7 @@ void UsingForDirective::accept(ASTConstVisitor& _visitor) const
 {
 	if (_visitor.visit(*this))
 	{
-		listAccept(functionsOrLibrary(), _visitor);
+		listAccept(m_functionsOrLibrary, _visitor);
 		if (m_typeName)
 			m_typeName->accept(_visitor);
 	}

From c42d577fc0dc6103af3639013361927b106da5c5 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 8 Nov 2022 12:17:04 +0100
Subject: [PATCH 1003/1748] Cache literal to number conversion.

---
 libyul/Utilities.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/libyul/Utilities.cpp b/libyul/Utilities.cpp
index 8db0e44ff9..b458210661 100644
--- a/libyul/Utilities.cpp
+++ b/libyul/Utilities.cpp
@@ -91,9 +91,17 @@ u256 solidity::yul::valueOfNumberLiteral(Literal const& _literal)
 {
 	yulAssert(_literal.kind == LiteralKind::Number, "Expected number literal!");
 
-	std::string const& literalString = _literal.value.str();
-	yulAssert(isValidDecimal(literalString) || isValidHex(literalString), "Invalid number literal!");
-	return u256(literalString);
+	static map<YulString, u256> numberCache;
+	static YulStringRepository::ResetCallback callback{[&] { numberCache.clear(); }};
+
+	auto&& [it, isNew] = numberCache.try_emplace(_literal.value, 0);
+	if (isNew)
+	{
+		std::string const& literalString = _literal.value.str();
+		yulAssert(isValidDecimal(literalString) || isValidHex(literalString), "Invalid number literal!");
+		it->second = u256(literalString);
+	}
+	return it->second;
 }
 
 u256 solidity::yul::valueOfStringLiteral(Literal const& _literal)

From 4aac4c7bc4b2053f771b47359e95da9cc7ded852 Mon Sep 17 00:00:00 2001
From: Duc Thanh Nguyen <ng.duc.tahn@gmail.com>
Date: Wed, 19 Oct 2022 20:51:41 -0400
Subject: [PATCH 1004/1748] Add Natspec devdoc inheritance support for events

---
 Changelog.md                             |  1 +
 libsolidity/interface/Natspec.cpp        |  2 +-
 test/libsolidity/SolidityNatspecJSON.cpp | 58 ++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 68c755734a..f41dfe4e14 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 Compiler Features:
 * Commandline Interface: Return exit code ``2`` on uncaught exceptions.
 * Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
+* Natspec: Add event Natspec inheritance for devdoc.
 * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
 * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
 * Language Server: Add basic document hover support.
diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp
index 566b676078..27efd1c245 100644
--- a/libsolidity/interface/Natspec.cpp
+++ b/libsolidity/interface/Natspec.cpp
@@ -168,7 +168,7 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
 			));
 	}
 
-	for (auto const& event: _contractDef.events())
+	for (auto const& event: _contractDef.definedInterfaceEvents())
 		if (auto devDoc = devDocumentation(event->annotation().docTags); !devDoc.empty())
 			doc["events"][event->functionType(true)->externalSignature()] = devDoc;
 
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index a785904b85..1a2c3af1ff 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -485,6 +485,64 @@ BOOST_AUTO_TEST_CASE(event)
 	checkNatspec(sourceCode, "ERC20", userDoc, true);
 }
 
+BOOST_AUTO_TEST_CASE(event_inheritance)
+{
+	char const* sourceCode = R"(
+		contract ERC20 {
+			/// @notice This event is emitted when a transfer occurs.
+			/// @param from The source account.
+			/// @param to The destination account.
+			/// @param amount The amount.
+			/// @dev A test case!
+			event Transfer(address indexed from, address indexed to, uint amount);
+		}
+
+		contract A is ERC20 {
+		}
+
+		contract B is A {
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"Transfer(address,address,uint256)":
+			{
+				"details": "A test case!",
+				"params":
+				{
+					"amount": "The amount.",
+					"from": "The source account.",
+					"to": "The destination account."
+				}
+			}
+		},
+		"methods": {}
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "ERC20", devDoc, false);
+	checkNatspec(sourceCode, "A", devDoc, false);
+	checkNatspec(sourceCode, "B", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"Transfer(address,address,uint256)":
+			{
+				"notice": "This event is emitted when a transfer occurs."
+			}
+		},
+		"methods": {}
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "ERC20", userDoc, true);
+	checkNatspec(sourceCode, "A", userDoc, true);
+	checkNatspec(sourceCode, "B", userDoc, true);
+}
+
 BOOST_AUTO_TEST_CASE(dev_desc_after_nl)
 {
 	char const* sourceCode = R"(

From b787c32233efa96f5c7ded0db1e0c5c9b47354f2 Mon Sep 17 00:00:00 2001
From: Doggo <51878487+Dev-Doggo@users.noreply.github.com>
Date: Mon, 17 Oct 2022 13:28:01 +0300
Subject: [PATCH 1005/1748] Update receive function documentation

The receive function documentation is slightly inaccurate currently, as a contract can still receive Ether through payable functions even if no receive or payable fallback function is present.
---
 docs/contracts/functions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index f14e4b8a54..902ad1ce5a 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -297,7 +297,7 @@ on plain Ether transfers (e.g. via ``.send()`` or ``.transfer()``). If no such
 function exists, but a payable :ref:`fallback function <fallback-function>`
 exists, the fallback function will be called on a plain Ether transfer. If
 neither a receive Ether nor a payable fallback function is present, the
-contract cannot receive Ether through regular transactions and throws an
+contract cannot receive Ether through a transaction that does not represent a payable function call and throws an
 exception.
 
 In the worst case, the ``receive`` function can only rely on 2300 gas being

From 350454d8a46be15de2e10366f54cb9c5f3d2cbc2 Mon Sep 17 00:00:00 2001
From: franzihei <franziheintel@gmail.com>
Date: Tue, 8 Nov 2022 11:07:58 +0100
Subject: [PATCH 1006/1748] Update README maintainers
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update README.md

Update README.md

Co-Authored-By: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 89ae6c89d4..6242a69f0b 100644
--- a/README.md
+++ b/README.md
@@ -79,8 +79,8 @@ You can find our current feature and bug priorities for forthcoming
 releases in the [projects section](https://github.com/ethereum/solidity/projects).
 
 ## Maintainers
-* [@axic](https://github.com/axic)
-* [@chriseth](https://github.com/chriseth)
+The Solidity programming language and compiler are open-source community projects governed by a core team.
+The core team is sponsored by the [Ethereum Foundation](https://ethereum.foundation/).
 
 ## License
 Solidity is licensed under [GNU General Public License v3.0](LICENSE.txt).

From c3899bd54961f6a98b76d48bafcb105a798f3391 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 8 Nov 2022 17:48:36 +0100
Subject: [PATCH 1007/1748] Indent changelog.

---
 Changelog.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f41dfe4e14..f0cfcb1475 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,12 +4,12 @@ Language Features:
 
 
 Compiler Features:
-* Commandline Interface: Return exit code ``2`` on uncaught exceptions.
-* Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
-* Natspec: Add event Natspec inheritance for devdoc.
-* Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
-* Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
-* Language Server: Add basic document hover support.
+ * Commandline Interface: Return exit code ``2`` on uncaught exceptions.
+ * Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
+ * Natspec: Add event Natspec inheritance for devdoc.
+ * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
+ * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
+ * Language Server: Add basic document hover support.
 
 
 Bugfixes:

From c4b6f5f00b983aef2a6001697eaebb42003314ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@hepcolgum.band>
Date: Tue, 8 Nov 2022 17:07:36 +0100
Subject: [PATCH 1008/1748] test: Properly clear storage dirty flag

Clear storage dirty flag between transactions in EVMHost. The EIP-2200
dirty flag should be persisted only in a single transaction.
---
 test/EVMHost.cpp                              |  7 ++-
 ...ode_v2_in_modifier_used_in_v1_contract.sol |  2 +-
 .../array/byte_array_storage_layout.sol       |  4 +-
 .../copying/array_copy_including_array.sol    |  6 +--
 .../array_nested_memory_to_storage.sol        |  6 +--
 .../copying/bytes_storage_to_storage.sol      | 24 ++++-----
 .../copy_byte_array_in_struct_to_storage.sol  |  6 +--
 .../function_type_array_to_storage.sol        |  6 +--
 .../array/dynamic_array_cleanup.sol           |  3 ++
 .../array/fixed_array_cleanup.sol             |  3 ++
 ...nvalid_encoding_for_storage_byte_array.sol |  3 ++
 .../array/pop/array_pop_array_transition.sol  |  6 +--
 .../array/push/push_no_args_2d.sol            |  4 +-
 .../storage/empty_nonempty_empty.sol          |  3 ++
 .../copy_struct_array_from_storage.sol        |  6 +--
 ...truct_containing_bytes_copy_and_delete.sol |  3 ++
 .../struct_delete_storage_with_array.sol      |  3 ++
 .../userDefinedValueType/calldata.sol         |  6 +--
 .../various/destructuring_assignment.sol      |  6 +--
 .../viaYul/array_storage_index_access.sol     | 49 ++++++++++---------
 .../array_storage_index_boundary_test.sol     | 12 ++---
 .../array_storage_index_zeroed_test.sol       | 24 ++++-----
 .../viaYul/array_storage_length_access.sol    | 10 ++--
 .../viaYul/array_storage_push_empty.sol       |  6 +--
 ...rray_storage_push_empty_length_address.sol | 12 ++---
 .../viaYul/array_storage_push_pop.sol         | 18 +++----
 26 files changed, 132 insertions(+), 106 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index c36c2aaf30..4e9097dde1 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -174,10 +174,13 @@ void EVMHost::newTransactionFrame()
 {
 	// Clear EIP-2929 account access indicator
 	recorded_account_accesses.clear();
-	// Clear EIP-2929 storage access indicator
+
 	for (auto& [address, account]: accounts)
 		for (auto& [slot, value]: account.storage)
-			value.access_status = EVMC_ACCESS_COLD;
+		{
+			value.access_status = EVMC_ACCESS_COLD; // Clear EIP-2929 storage access indicator
+			value.dirty = false;					// Clear EIP-2200 dirty slot flag
+		}
 	// Process selfdestruct list
 	for (auto& [address, _]: recorded_selfdestructs)
 		accounts.erase(address);
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
index 407cbf7a13..a45d8d5997 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
@@ -39,4 +39,4 @@ contract C is B {
 // ----
 // test() -> 5, 10
 // gas irOptimized: 87337
-// gas legacy: 98881
+// gas legacy: 104481
diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
index 72fa6860f9..bb1e904f0f 100644
--- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
@@ -46,8 +46,8 @@ contract c {
 // storageEmpty -> 0
 // test_long() -> 67
 // gas irOptimized: 89148
-// gas legacy: 103039
-// gas legacyOptimized: 100493
+// gas legacy: 105839
+// gas legacyOptimized: 103293
 // storageEmpty -> 0
 // test_pop() -> 1780731860627700044960722568376592200742329637303199754547598369979433020
 // gas legacy: 61930
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index c3958abac6..6d3da418d0 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -40,7 +40,7 @@ contract c {
 // gas legacyOptimized: 4548309
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4477223
-// gas legacy: 4410748
-// gas legacyOptimized: 4382489
+// gas irOptimized: 4517023
+// gas legacy: 4450548
+// gas legacyOptimized: 4422289
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index 8f8ed06eae..f13d1f0462 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -44,6 +44,6 @@ contract Test {
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 133260
-// gas legacy: 134283
-// gas legacyOptimized: 133393
+// gas irOptimized: 155660
+// gas legacy: 156683
+// gas legacyOptimized: 155793
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index ae17b76b17..f0f0b3fbdf 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -21,21 +21,21 @@ contract c {
 // gas legacy: 124296
 // gas legacyOptimized: 119119
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 118565
-// gas legacy: 135251
-// gas legacyOptimized: 130091
+// gas irOptimized: 124165
+// gas legacy: 140851
+// gas legacyOptimized: 135691
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 125184
-// gas legacy: 142835
-// gas legacyOptimized: 137008
+// gas irOptimized: 130784
+// gas legacy: 148435
+// gas legacyOptimized: 142608
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 128584
-// gas legacy: 160875
-// gas legacyOptimized: 150938
+// gas irOptimized: 139784
+// gas legacy: 172075
+// gas legacyOptimized: 162138
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 357699
-// gas legacy: 421674
-// gas legacyOptimized: 402977
+// gas irOptimized: 442899
+// gas legacy: 506874
+// gas legacyOptimized: 488177
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index 2b3cad19fb..0563ca2f17 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -39,8 +39,8 @@ contract C {
 // gas legacy: 181047
 // gas legacyOptimized: 180029
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 107097
-// gas legacy: 110201
-// gas legacyOptimized: 107353
+// gas irOptimized: 121097
+// gas legacy: 124201
+// gas legacyOptimized: 121353
 // h() -> 0x40, 0x60, 0x00, 0x00
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
index 1e8760250a..eabd4c0b86 100644
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
@@ -51,6 +51,6 @@ contract C {
 // gas legacyOptimized: 117021
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 103256
-// gas legacy: 102814
-// gas legacyOptimized: 101706
+// gas irOptimized: 106056
+// gas legacy: 105614
+// gas legacyOptimized: 104506
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index 4454914a97..342d98a11f 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -19,6 +19,9 @@ contract c {
 // gas legacyOptimized: 517027
 // storageEmpty -> 0
 // halfClear() ->
+// gas irOptimized: 113961
+// gas legacy: 113257
+// gas legacyOptimized: 113120
 // storageEmpty -> 0
 // fullClear() ->
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index 310217cfdc..cb4a14c051 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -17,4 +17,7 @@ contract c {
 // gas legacyOptimized: 467500
 // storageEmpty -> 0
 // clear() ->
+// gas irOptimized: 122148
+// gas legacy: 122440
+// gas legacyOptimized: 122259
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
index 27d7e241e9..0ff2ea5f89 100644
--- a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
+++ b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
@@ -40,6 +40,9 @@ contract C {
 // copyFromStorageShort()
 // x() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
 // copyFromStorageLong()
+// gas irOptimized: 121130
+// gas legacy: 121930
+// gas legacyOptimized: 121408
 // x() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
 // copyToStorage()
 // x() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index 695f6c0293..fda0c47bf2 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -23,7 +23,7 @@ contract c {
 }
 // ----
 // test() -> 1, 2, 3
-// gas irOptimized: 2280147
-// gas legacy: 2273434
-// gas legacyOptimized: 2261844
+// gas irOptimized: 2285747
+// gas legacy: 2279034
+// gas legacyOptimized: 2267444
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index e9a521fbff..c85d92a476 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -34,8 +34,8 @@ contract C {
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
-// gas irOptimized: 116264
-// gas legacy: 107525
+// gas irOptimized: 119064
+// gas legacy: 110325
 // gas legacyOptimized: 96331
 // l() -> 2
 // ll(uint256): 1 -> 85
diff --git a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
index a010aeb136..7341b85c6b 100644
--- a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
+++ b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
@@ -22,6 +22,9 @@ contract Test {
 // set(bytes): 0x20, 0
 // storageEmpty -> 1
 // set(bytes): 0x20, 66, "12345678901234567890123456789012", "12345678901234567890123456789012", "12"
+// gas irOptimized: 111897
+// gas legacy: 112756
+// gas legacyOptimized: 112116
 // storageEmpty -> 0
 // set(bytes): 0x20, 3, "abc"
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
index 33621c9eb5..ba890a4ae0 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
@@ -87,9 +87,9 @@ contract Test {
 // EVMVersion: >homestead
 // ----
 // test1() -> true
-// gas irOptimized: 150163
-// gas legacy: 150266
-// gas legacyOptimized: 149875
+// gas irOptimized: 152963
+// gas legacy: 153066
+// gas legacyOptimized: 152675
 // test2() -> true
 // test3() -> true
 // test4() -> true
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index 9980075720..48a4f08e01 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -31,6 +31,9 @@ contract c {
 // copy() -> true
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
+// gas irOptimized: 133599
+// gas legacy: 134654
+// gas legacyOptimized: 133882
 // storageEmpty -> 0
 // del() -> true
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index 15acf7a2fb..1bcd9685ac 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -46,3 +46,6 @@ contract C {
 // gas legacy: 122132
 // gas legacyOptimized: 121500
 // g() ->
+// gas irOptimized: 145472
+// gas legacy: 145707
+// gas legacyOptimized: 144940
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index fe7ea4596a..f395621d37 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -53,9 +53,9 @@ contract C {
 // gas legacy: 126150
 // gas legacyOptimized: 123163
 // test_g() -> true
-// gas irOptimized: 95980
-// gas legacy: 101281
-// gas legacyOptimized: 96566
+// gas irOptimized: 106138
+// gas legacy: 112481
+// gas legacyOptimized: 107706
 // addresses(uint256): 0 -> 0x18
 // addresses(uint256): 1 -> 0x19
 // addresses(uint256): 3 -> 0x1b
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 99a8e8d4bc..4581cb2f20 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -34,6 +34,6 @@ contract C {
 
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 239090
-// gas legacy: 240541
-// gas legacyOptimized: 239654
+// gas irOptimized: 241890
+// gas legacy: 243341
+// gas legacyOptimized: 242454
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index 8ef60a53b5..7df79912ae 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -16,33 +16,38 @@ contract C {
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
-// gas irOptimized: 3018684
-// gas legacy: 3068883
-// gas legacyOptimized: 3011615
+// gas irOptimized: 3021484
+// gas legacy: 3071683
+// gas legacyOptimized: 3014415
 // test_indices(uint256): 5 ->
-// gas irOptimized: 372540
-// gas legacy: 369151
-// gas legacyOptimized: 366139
+// gas irOptimized: 722540
+// gas legacy: 719151
+// gas legacyOptimized: 716139
 // test_indices(uint256): 10 ->
+// gas irOptimized: 158407
+// gas legacy: 162657
+// gas legacyOptimized: 158422
 // test_indices(uint256): 15 ->
-// gas irOptimized: 72860
+// gas irOptimized: 173467
+// gas legacy: 179782
+// gas legacyOptimized: 173727
 // test_indices(uint256): 0xFF ->
-// gas irOptimized: 3410252
-// gas legacy: 3509577
-// gas legacyOptimized: 3397597
+// gas irOptimized: 5681652
+// gas legacy: 5780977
+// gas legacyOptimized: 5668997
 // test_indices(uint256): 1000 ->
-// gas irOptimized: 18206119
-// gas legacy: 18599999
-// gas legacyOptimized: 18176944
+// gas irOptimized: 18208919
+// gas legacy: 18602799
+// gas legacyOptimized: 18179744
 // test_indices(uint256): 129 ->
-// gas irOptimized: 2756952
-// gas legacy: 2770413
-// gas legacyOptimized: 2716289
+// gas irOptimized: 5198552
+// gas legacy: 5212013
+// gas legacyOptimized: 5157889
 // test_indices(uint256): 128 ->
-// gas irOptimized: 411900
-// gas legacy: 464968
-// gas legacyOptimized: 418168
+// gas irOptimized: 417500
+// gas legacy: 470568
+// gas legacyOptimized: 423768
 // test_indices(uint256): 1 ->
-// gas irOptimized: 368568
-// gas legacy: 363389
-// gas legacyOptimized: 361809
+// gas irOptimized: 726968
+// gas legacy: 721789
+// gas legacyOptimized: 720209
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
index e4e69ffa35..daa78f0b40 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
@@ -16,12 +16,12 @@ contract C {
 // test_boundary_check(uint256,uint256): 1, 1 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
-// gas irOptimized: 137831
-// gas legacy: 131830
-// gas legacyOptimized: 112054
+// gas irOptimized: 140631
+// gas legacy: 134630
+// gas legacyOptimized: 114854
 // test_boundary_check(uint256,uint256): 256, 255 -> 0
-// gas irOptimized: 139963
-// gas legacy: 134149
-// gas legacyOptimized: 114233
+// gas irOptimized: 142763
+// gas legacy: 136949
+// gas legacyOptimized: 117033
 // test_boundary_check(uint256,uint256): 256, 0xFFFF -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 256, 2 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index b1bcd82733..f0a582277a 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131174
-// gas legacy: 132301
-// gas legacyOptimized: 129539
+// gas irOptimized: 153874
+// gas legacy: 155001
+// gas legacyOptimized: 152239
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 174777
-// gas legacy: 177188
-// gas legacyOptimized: 172112
+// gas irOptimized: 277077
+// gas legacy: 279488
+// gas legacyOptimized: 274412
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 198022
-// gas legacy: 201738
-// gas legacyOptimized: 194427
+// gas irOptimized: 399822
+// gas legacy: 403538
+// gas legacyOptimized: 396227
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 6097912
-// gas legacy: 6159333
-// gas legacyOptimized: 6026177
+// gas irOptimized: 6399212
+// gas legacy: 6460633
+// gas legacyOptimized: 6327477
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
index 5febab1c6d..c8083b6c3f 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
@@ -13,10 +13,10 @@ contract C {
 // set_get_length(uint256): 20 -> 20
 // set_get_length(uint256): 0xFF -> 0xFF
 // gas irOptimized: 96690
-// gas legacy: 126722
-// gas legacyOptimized: 107818
+// gas legacy: 129522
+// gas legacyOptimized: 110618
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1217848
-// gas legacy: 1702119
-// gas legacyOptimized: 1398420
+// gas irOptimized: 1220648
+// gas legacy: 1704919
+// gas legacyOptimized: 1401220
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
index 270b92ffaf..6772deab0b 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
@@ -16,9 +16,9 @@ contract C {
 // gas legacy: 416903
 // gas legacyOptimized: 398280
 // pushEmpty(uint256): 256
-// gas irOptimized: 691026
-// gas legacy: 714315
-// gas legacyOptimized: 687372
+// gas irOptimized: 693826
+// gas legacy: 717115
+// gas legacyOptimized: 690172
 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
 // gas irOptimized: 100000000
 // gas legacy: 100000000
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
index c7561ba7a6..e1de31f42c 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
@@ -21,13 +21,13 @@ contract C {
 // gas legacy: 77730
 // gas legacyOptimized: 77162
 // set_get_length(uint256): 0xFF -> 0xFF
-// gas irOptimized: 141796
-// gas legacy: 678237
-// gas legacyOptimized: 115104
+// gas irOptimized: 161696
+// gas legacy: 698137
+// gas legacyOptimized: 135004
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1801663
-// gas legacy: 9873774
-// gas legacyOptimized: 1398546
+// gas irOptimized: 1804463
+// gas legacy: 9876574
+// gas legacyOptimized: 1401346
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
 // gas irOptimized: 100000000
 // gas legacyOptimized: 100000000
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
index 45c6a9fa39..78d9361002 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
@@ -13,15 +13,15 @@ contract C {
 // set_get_length(uint256): 1 -> 0
 // set_get_length(uint256): 10 -> 0
 // set_get_length(uint256): 20 -> 0
-// gas irOptimized: 86331
-// gas legacy: 85822
-// gas legacyOptimized: 83608
+// gas irOptimized: 106222
+// gas legacy: 105722
+// gas legacyOptimized: 103508
 // set_get_length(uint256): 0xFF -> 0
-// gas irOptimized: 821872
-// gas legacy: 810327
-// gas legacyOptimized: 786258
+// gas irOptimized: 841772
+// gas legacy: 830227
+// gas legacyOptimized: 806158
 // set_get_length(uint256): 0xFFF -> 0
-// gas irOptimized: 12841084
-// gas legacy: 12649059
-// gas legacyOptimized: 12267870
+// gas irOptimized: 12860984
+// gas legacy: 12668959
+// gas legacyOptimized: 12287770
 // set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #

From cffacac9de8173e8c4387076c75105feb2cb86da Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 8 Nov 2022 11:14:01 +0100
Subject: [PATCH 1009/1748] Hash number literals according to their value
 instead of their string representation.

---
 Changelog.md                                    |  1 +
 libyul/optimiser/BlockHasher.cpp                |  5 ++++-
 ...ested_array_of_structs_memory_to_storage.sol |  6 +++---
 ...ested_array_of_structs_memory_to_storage.sol |  6 +++---
 .../byte_array_to_storage_cleanup.sol           |  2 +-
 .../semanticTests/externalContracts/snark.sol   |  2 +-
 .../userDefinedValueType/calldata.sol           |  4 ++--
 .../constant_representation.yul                 | 17 +++++++++++++++++
 8 files changed, 32 insertions(+), 11 deletions(-)
 create mode 100644 test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul

diff --git a/Changelog.md b/Changelog.md
index f0cfcb1475..882f77b60e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Yul Optimizer: Hash hex and decimal literals according to their value instead of their representation, improving the detection of equivalent functions.
  * Solidity Upgrade Tool ``solidity-upgrade``: Fix the tool returning success code on uncaught exceptions.
 
 
diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp
index 182e11dda9..53a3577397 100644
--- a/libyul/optimiser/BlockHasher.cpp
+++ b/libyul/optimiser/BlockHasher.cpp
@@ -54,7 +54,10 @@ std::map<Block const*, uint64_t> BlockHasher::run(Block const& _block)
 void BlockHasher::operator()(Literal const& _literal)
 {
 	hash64(compileTimeLiteralHash("Literal"));
-	hash64(_literal.value.hash());
+	if (_literal.kind == LiteralKind::Number)
+		hash64(std::hash<u256>{}(valueOfNumberLiteral(_literal)));
+	else
+		hash64(_literal.value.hash());
 	hash64(_literal.type.hash());
 	hash8(static_cast<uint8_t>(_literal.kind));
 }
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
index 9c0bb74ca9..8bd1eb18a0 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
@@ -33,8 +33,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 332334
+// gas irOptimized: 332586
 // test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 145029
+// gas irOptimized: 145182
 // test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 192344
+// gas irOptimized: 192512
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
index 688946aae8..218e8f1c7c 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
@@ -31,8 +31,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 308790
+// gas irOptimized: 309123
 // test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 118077
+// gas irOptimized: 118188
 // test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 190775
+// gas irOptimized: 190997
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index 745b8ee123..d7a5c8bf3d 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,7 +28,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 518935
+// gas irOptimized: 464753
 // gas legacy: 729908
 // gas legacyOptimized: 493347
 // h() -> 0x20, 0x40, 0x00, 0
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 4c3cb78f9d..7a341898ae 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -299,6 +299,6 @@ contract Test {
 // gas legacyOptimized: 267239
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 783949
+// gas irOptimized: 784027
 // gas legacy: 805423
 // gas legacyOptimized: 772571
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index f395621d37..b2acbb01f6 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -49,11 +49,11 @@ contract C {
 }
 // ----
 // test_f() -> true
-// gas irOptimized: 122053
+// gas irOptimized: 122510
 // gas legacy: 126150
 // gas legacyOptimized: 123163
 // test_g() -> true
-// gas irOptimized: 106138
+// gas irOptimized: 106903
 // gas legacy: 112481
 // gas legacyOptimized: 107706
 // addresses(uint256): 0 -> 0x18
diff --git a/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul
new file mode 100644
index 0000000000..b7a815dd97
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equivalentFunctionCombiner/constant_representation.yul
@@ -0,0 +1,17 @@
+{
+  f()
+  g()
+  function f() { mstore(0x01, mload(0x00)) }
+  function g() { mstore(1, mload(0)) }
+}
+// ----
+// step: equivalentFunctionCombiner
+//
+// {
+//     f()
+//     f()
+//     function f()
+//     { mstore(0x01, mload(0x00)) }
+//     function g()
+//     { mstore(1, mload(0)) }
+// }

From 211d1e733f90f8d80090caa3a2be1919e79e097a Mon Sep 17 00:00:00 2001
From: Mike Leach <6549498+VVander@users.noreply.github.com>
Date: Tue, 8 Nov 2022 21:03:00 -0600
Subject: [PATCH 1010/1748] Remove "miners" with "block builders"

---
 docs/security-considerations.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/security-considerations.rst b/docs/security-considerations.rst
index 6507f7c1c2..0375484316 100644
--- a/docs/security-considerations.rst
+++ b/docs/security-considerations.rst
@@ -45,7 +45,7 @@ Everything you use in a smart contract is publicly visible, even
 local variables and state variables marked ``private``.
 
 Using random numbers in smart contracts is quite tricky if you do not want
-miners to be able to cheat.
+block builders to be able to cheat.
 
 Re-Entrancy
 ===========

From 199f36585a90c59c5a90296a20c001198a90e7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@hepcolgum.band>
Date: Tue, 8 Nov 2022 21:48:56 +0100
Subject: [PATCH 1011/1748] test: Improve precision of SSTORE cost in EVMHost

Add "original" field to storage_value to precise track "dirty" state of
a storage slot as defined in EIP-2200. In case a current storage value
is restored to original (after multiple modifications in a single
transaction), the storage slot is not considered "dirty" any more.
Previously, we only had a bool dirty flag to model this and a storage
slot was always considered "dirty" after first modification.
---
 test/EVMHost.cpp            |  4 ++--
 test/ExecutionFramework.cpp |  2 +-
 test/evmc/mocked_host.hpp   | 33 +++++++++++----------------------
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 3e62a39dee..e997c394a6 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -179,7 +179,7 @@ void EVMHost::newTransactionFrame()
 		for (auto& [slot, value]: account.storage)
 		{
 			value.access_status = EVMC_ACCESS_COLD; // Clear EIP-2929 storage access indicator
-			value.dirty = false;					// Clear EIP-2200 dirty slot flag
+			value.original = value.current;			// Clear EIP-2200 dirty slot
 		}
 	// Process selfdestruct list
 	for (auto& [address, _]: recorded_selfdestructs)
@@ -1195,7 +1195,7 @@ void EVMHostPrinter::storage()
 			m_stateStream << "  "
 				<< m_host.convertFromEVMC(slot)
 				<< ": "
-				<< m_host.convertFromEVMC(value.value)
+				<< m_host.convertFromEVMC(value.current)
 				<< endl;
 }
 
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index be2a283f7f..ff0838c09b 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -282,7 +282,7 @@ bool ExecutionFramework::storageEmpty(h160 const& _addr) const
 	if (it != m_evmcHost->accounts.end())
 	{
 		for (auto const& entry: it->second.storage)
-			if (!(entry.second.value == evmc::bytes32{}))
+			if (entry.second.current != evmc::bytes32{})
 				return false;
 	}
 	return true;
diff --git a/test/evmc/mocked_host.hpp b/test/evmc/mocked_host.hpp
index c7d99e6adc..5aee8ab050 100644
--- a/test/evmc/mocked_host.hpp
+++ b/test/evmc/mocked_host.hpp
@@ -15,30 +15,20 @@ namespace evmc
 /// The string of bytes.
 using bytes = std::basic_string<uint8_t>;
 
-/// Extended value (by dirty flag) for account storage.
+/// Extended value (with original value and access flag) for account storage.
 struct storage_value
 {
-    /// The storage value.
-    bytes32 value;
+    /// The current storage value.
+    bytes32 current;
 
-    /// True means this value has been modified already by the current transaction.
-    bool dirty{false};
+    /// The original storage value.
+    bytes32 original;
 
     /// Is the storage key cold or warm.
-    evmc_access_status access_status{EVMC_ACCESS_COLD};
+    evmc_access_status access_status = EVMC_ACCESS_COLD;
 
     /// Default constructor.
     storage_value() noexcept = default;
-
-    /// Constructor.
-    storage_value(const bytes32& _value, bool _dirty = false) noexcept  // NOLINT
-      : value{_value}, dirty{_dirty}
-    {}
-
-    /// Constructor with initial access status.
-    storage_value(const bytes32& _value, evmc_access_status _access_status) noexcept
-      : value{_value}, access_status{_access_status}
-    {}
 };
 
 /// Mocked account.
@@ -176,7 +166,7 @@ class MockedHost : public Host
 
         const auto storage_iter = account_iter->second.storage.find(key);
         if (storage_iter != account_iter->second.storage.end())
-            return storage_iter->second.value;
+            return storage_iter->second.current;
         return {};
     }
 
@@ -195,14 +185,13 @@ class MockedHost : public Host
         // Follow https://eips.ethereum.org/EIPS/eip-1283 specification.
         // WARNING! This is not complete implementation as refund is not handled here.
 
-        if (old.value == value)
+        if (old.current == value)
             return EVMC_STORAGE_UNCHANGED;
 
         evmc_storage_status status{};
-        if (!old.dirty)
+        if (old.original == old.current)  // Storage slot not dirty
         {
-            old.dirty = true;
-            if (!old.value)
+            if (!old.current)
                 status = EVMC_STORAGE_ADDED;
             else if (value)
                 status = EVMC_STORAGE_MODIFIED;
@@ -212,7 +201,7 @@ class MockedHost : public Host
         else
             status = EVMC_STORAGE_MODIFIED_AGAIN;
 
-        old.value = value;
+        old.current = value;
         return status;
     }
 

From 4830194383d46b7f302965536efa4853493a78ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Bylica?= <pawel@hepcolgum.band>
Date: Tue, 8 Nov 2022 22:17:23 +0100
Subject: [PATCH 1012/1748] test: Update test expectations

---
 .../array/byte_array_storage_layout.sol       |  4 ++--
 ..._storage_storage_different_base_nested.sol |  4 ++--
 .../copying/copy_byte_array_to_storage.sol    |  6 ++---
 .../delete/delete_storage_array_packed.sol    |  2 ++
 .../struct_delete_storage_with_array.sol      | 12 +++++-----
 .../array_storage_index_zeroed_test.sol       | 24 +++++++++----------
 6 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
index bb1e904f0f..8c899d218c 100644
--- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
@@ -46,8 +46,8 @@ contract c {
 // storageEmpty -> 0
 // test_long() -> 67
 // gas irOptimized: 89148
-// gas legacy: 105839
-// gas legacyOptimized: 103293
+// gas legacy: 108639
+// gas legacyOptimized: 106093
 // storageEmpty -> 0
 // test_pop() -> 1780731860627700044960722568376592200742329637303199754547598369979433020
 // gas legacy: 61930
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
index 3e59244bdc..85a2f1905a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -24,5 +24,5 @@ contract c {
 // ----
 // test() -> 3, 4
 // gas irOptimized: 189690
-// gas legacy: 195353
-// gas legacyOptimized: 192441
+// gas legacy: 215253
+// gas legacyOptimized: 212341
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index 92f2a1f2e4..05eff8ac4a 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> 0xff
-// gas irOptimized: 119584
-// gas legacy: 132274
-// gas legacyOptimized: 123756
+// gas irOptimized: 179284
+// gas legacy: 191974
+// gas legacyOptimized: 183456
diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
index 22f31b1ef1..9665201c98 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_storage_array_packed.sol
@@ -15,3 +15,5 @@ contract C {
 // ----
 // f() -> 0, 0, 0
 // gas irOptimized: 90992
+// gas legacy: 111037
+// gas legacyOptimized: 109633
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index 1bcd9685ac..eb563b9474 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -42,10 +42,10 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 121657
-// gas legacy: 122132
-// gas legacyOptimized: 121500
+// gas irOptimized: 141557
+// gas legacy: 142032
+// gas legacyOptimized: 141400
 // g() ->
-// gas irOptimized: 145472
-// gas legacy: 145707
-// gas legacyOptimized: 144940
+// gas irOptimized: 148272
+// gas legacy: 148507
+// gas legacyOptimized: 147740
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index f0a582277a..3eb553fe90 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 153874
-// gas legacy: 155001
-// gas legacyOptimized: 152239
+// gas irOptimized: 165074
+// gas legacy: 166201
+// gas legacyOptimized: 163439
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 277077
-// gas legacy: 279488
-// gas legacyOptimized: 274412
+// gas irOptimized: 282677
+// gas legacy: 285088
+// gas legacyOptimized: 280012
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 399822
-// gas legacy: 403538
-// gas legacyOptimized: 396227
+// gas irOptimized: 405422
+// gas legacy: 409138
+// gas legacyOptimized: 401827
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 6399212
-// gas legacy: 6460633
-// gas legacyOptimized: 6327477
+// gas irOptimized: 6404812
+// gas legacy: 6466233
+// gas legacyOptimized: 6333077

From 458857d0d631bb7f4af4c80af43833dfe2e58a4a Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 16 Sep 2022 12:32:12 +0200
Subject: [PATCH 1013/1748] Upgrade to evmc 10.0.0

---
 test/evmc/README.md           |   2 +-
 test/evmc/evmc.h              | 217 +++++++++++++++++++++++++-------
 test/evmc/evmc.hpp            | 211 +++++++++++++++++--------------
 test/evmc/filter_iterator.hpp | 105 ++++++++++++++++
 test/evmc/helpers.h           | 109 +++++++++++++++-
 test/evmc/hex.hpp             | 158 +++++++++++++++++++++++
 test/evmc/loader.c            |  35 +++---
 test/evmc/loader.h            |  18 ++-
 test/evmc/mocked_host.hpp     | 227 +++++++++++++++++++++++++---------
 test/evmc/utils.h             |   7 +-
 10 files changed, 860 insertions(+), 229 deletions(-)
 create mode 100644 test/evmc/filter_iterator.hpp
 create mode 100644 test/evmc/hex.hpp

diff --git a/test/evmc/README.md b/test/evmc/README.md
index cae41f170f..6b7f76f61c 100644
--- a/test/evmc/README.md
+++ b/test/evmc/README.md
@@ -1,5 +1,5 @@
 # EVMC
 
-This is an import of [EVMC](https://github.com/ethereum/evmc) version [9.0.0](https://github.com/ethereum/evmc/releases/tag/v9.0.0).
+This is an import of [EVMC](https://github.com/ethereum/evmc) version [10.0.0](https://github.com/ethereum/evmc/releases/tag/v10.0.0).
 
 Important: The `MockedAccount.storage` is changed to a map from unordered_map as ordering is important for fuzzing.
diff --git a/test/evmc/evmc.h b/test/evmc/evmc.h
index c0d79d4e75..16d5686607 100644
--- a/test/evmc/evmc.h
+++ b/test/evmc/evmc.h
@@ -2,7 +2,7 @@
  * EVMC: Ethereum Client-VM Connector API
  *
  * @copyright
- * Copyright 2016-2019 The EVMC Authors.
+ * Copyright 2016 The EVMC Authors.
  * Licensed under the Apache License, Version 2.0.
  *
  * @defgroup EVMC EVMC
@@ -44,7 +44,7 @@ enum
      *
      * @see @ref versioning
      */
-    EVMC_ABI_VERSION = 9
+    EVMC_ABI_VERSION = 10
 };
 
 
@@ -89,8 +89,9 @@ enum evmc_flags
 };
 
 /**
- * The message describing an EVM call,
- * including a zero-depth calls from a transaction origin.
+ * The message describing an EVM call, including a zero-depth calls from a transaction origin.
+ *
+ * Most of the fields are modelled by the section 8. Message Call of the Ethereum Yellow Paper.
  */
 struct evmc_message
 {
@@ -103,21 +104,48 @@ struct evmc_message
      */
     uint32_t flags;
 
-    /** The call depth. */
+    /**
+     * The present depth of the message call stack.
+     *
+     * Defined as `e` in the Yellow Paper.
+     */
     int32_t depth;
 
-    /** The amount of gas for message execution. */
+    /**
+     * The amount of gas available to the message execution.
+     *
+     * Defined as `g` in the Yellow Paper.
+     */
     int64_t gas;
 
-    /** The destination of the message. */
-    evmc_address destination;
+    /**
+     * The recipient of the message.
+     *
+     * This is the address of the account which storage/balance/nonce is going to be modified
+     * by the message execution. In case of ::EVMC_CALL, this is also the account where the
+     * message value evmc_message::value is going to be transferred.
+     * For ::EVMC_CALLCODE or ::EVMC_DELEGATECALL, this may be different from
+     * the evmc_message::code_address.
+     *
+     * Defined as `r` in the Yellow Paper.
+     */
+    evmc_address recipient;
 
-    /** The sender of the message. */
+    /**
+     * The sender of the message.
+     *
+     * The address of the sender of a message call defined as `s` in the Yellow Paper.
+     * This must be the message recipient of the message at the previous (lower) depth,
+     * except for the ::EVMC_DELEGATECALL where recipient is the 2 levels above the present depth.
+     * At the depth 0 this must be the transaction origin.
+     */
     evmc_address sender;
 
     /**
      * The message input data.
      *
+     * The arbitrary length byte array of the input data of the call,
+     * defined as `d` in the Yellow Paper.
      * This MAY be NULL.
      */
     const uint8_t* input_data;
@@ -131,30 +159,49 @@ struct evmc_message
 
     /**
      * The amount of Ether transferred with the message.
+     *
+     * This is transferred value for ::EVMC_CALL or apparent value for ::EVMC_DELEGATECALL.
+     * Defined as `v` or `v~` in the Yellow Paper.
      */
     evmc_uint256be value;
 
     /**
      * The optional value used in new contract address construction.
      *
-     * Ignored unless kind is EVMC_CREATE2.
+     * Needed only for a Host to calculate created address when kind is ::EVMC_CREATE2.
+     * Ignored in evmc_execute_fn().
      */
     evmc_bytes32 create2_salt;
+
+    /**
+     * The address of the code to be executed.
+     *
+     * For ::EVMC_CALLCODE or ::EVMC_DELEGATECALL this may be different from
+     * the evmc_message::recipient.
+     * Not required when invoking evmc_execute_fn(), only when invoking evmc_call_fn().
+     * Ignored if kind is ::EVMC_CREATE or ::EVMC_CREATE2.
+     *
+     * In case of ::EVMC_CAPABILITY_PRECOMPILES implementation, this fields should be inspected
+     * to identify the requested precompile.
+     *
+     * Defined as `c` in the Yellow Paper.
+     */
+    evmc_address code_address;
 };
 
 
 /** The transaction and block data for execution. */
 struct evmc_tx_context
 {
-    evmc_uint256be tx_gas_price;     /**< The transaction gas price. */
-    evmc_address tx_origin;          /**< The transaction origin account. */
-    evmc_address block_coinbase;     /**< The miner of the block. */
-    int64_t block_number;            /**< The block number. */
-    int64_t block_timestamp;         /**< The block timestamp. */
-    int64_t block_gas_limit;         /**< The block gas limit. */
-    evmc_uint256be block_difficulty; /**< The block difficulty. */
-    evmc_uint256be chain_id;         /**< The blockchain's ChainID. */
-    evmc_uint256be block_base_fee;   /**< The block base fee per gas (EIP-1559, EIP-3198). */
+    evmc_uint256be tx_gas_price;      /**< The transaction gas price. */
+    evmc_address tx_origin;           /**< The transaction origin account. */
+    evmc_address block_coinbase;      /**< The miner of the block. */
+    int64_t block_number;             /**< The block number. */
+    int64_t block_timestamp;          /**< The block timestamp. */
+    int64_t block_gas_limit;          /**< The block gas limit. */
+    evmc_uint256be block_prev_randao; /**< The block previous RANDAO (EIP-4399). */
+    evmc_uint256be chain_id;          /**< The blockchain's ChainID. */
+    evmc_uint256be block_base_fee;    /**< The block base fee per gas (EIP-1559, EIP-3198). */
 };
 
 /**
@@ -354,6 +401,14 @@ struct evmc_result
      */
     int64_t gas_left;
 
+    /**
+     * The refunded gas accumulated from this execution and its sub-calls.
+     *
+     * The transaction gas refund limit is not applied.
+     * If evmc_result::status_code is other than ::EVMC_SUCCESS the value MUST be 0.
+     */
+    int64_t gas_refund;
+
     /**
      * The reference to output data.
      *
@@ -396,12 +451,11 @@ struct evmc_result
     evmc_release_result_fn release;
 
     /**
-     * The address of the contract created by create instructions.
+     * The address of the possibly created contract.
      *
-     * This field has valid value only if:
-     * - it is a result of the Host method evmc_host_interface::call
-     * - and the result describes successful contract creation
-     *   (evmc_result::status_code is ::EVMC_SUCCESS).
+     * The create address may be provided even though the contract creation has failed
+     * (evmc_result::status_code is not ::EVMC_SUCCESS). This is useful in situations
+     * when the address is observable, e.g. access to it remains warm.
      * In all other cases the address MUST be null bytes.
      */
     evmc_address create_address;
@@ -452,40 +506,97 @@ typedef evmc_bytes32 (*evmc_get_storage_fn)(struct evmc_host_context* context,
 /**
  * The effect of an attempt to modify a contract storage item.
  *
+ * See @ref storagestatus for additional information about design of this enum
+ * and analysis of the specification.
+ *
  * For the purpose of explaining the meaning of each element, the following
  * notation is used:
  * - 0 is zero value,
  * - X != 0 (X is any value other than 0),
- * - Y != X, Y != 0 (Y is any value other than X and 0),
- * - Z != Y (Z is any value other than Y),
- * - the "->" means the change from one value to another.
+ * - Y != 0, Y != X,  (Y is any value other than X and 0),
+ * - Z != 0, Z != X, Z != X (Z is any value other than Y and X and 0),
+ * - the "o -> c -> v" triple describes the change status in the context of:
+ *   - o: original value (cold value before a transaction started),
+ *   - c: current storage value,
+ *   - v: new storage value to be set.
+ *
+ * The order of elements follows EIPs introducing net storage gas costs:
+ * - EIP-2200: https://eips.ethereum.org/EIPS/eip-2200,
+ * - EIP-1283: https://eips.ethereum.org/EIPS/eip-1283.
  */
 enum evmc_storage_status
 {
     /**
-     * The value of a storage item has been left unchanged: 0 -> 0 and X -> X.
+     * The new/same value is assigned to the storage item without affecting the cost structure.
+     *
+     * The storage value item is either:
+     * - left unchanged (c == v) or
+     * - the dirty value (o != c) is modified again (c != v).
+     * This is the group of cases related to minimal gas cost of only accessing warm storage.
+     * 0|X   -> 0 -> 0 (current value unchanged)
+     * 0|X|Y -> Y -> Y (current value unchanged)
+     * 0|X   -> Y -> Z (modified previously added/modified value)
+     *
+     * This is "catch all remaining" status. I.e. if all other statuses are correctly matched
+     * this status should be assigned to all remaining cases.
+     */
+    EVMC_STORAGE_ASSIGNED = 0,
+
+    /**
+     * A new storage item is added by changing
+     * the current clean zero to a nonzero value.
+     * 0 -> 0 -> Z
+     */
+    EVMC_STORAGE_ADDED = 1,
+
+    /**
+     * A storage item is deleted by changing
+     * the current clean nonzero to the zero value.
+     * X -> X -> 0
+     */
+    EVMC_STORAGE_DELETED = 2,
+
+    /**
+     * A storage item is modified by changing
+     * the current clean nonzero to other nonzero value.
+     * X -> X -> Z
+     */
+    EVMC_STORAGE_MODIFIED = 3,
+
+    /**
+     * A storage item is added by changing
+     * the current dirty zero to a nonzero value other than the original value.
+     * X -> 0 -> Z
      */
-    EVMC_STORAGE_UNCHANGED = 0,
+    EVMC_STORAGE_DELETED_ADDED = 4,
 
     /**
-     * The value of a storage item has been modified: X -> Y.
+     * A storage item is deleted by changing
+     * the current dirty nonzero to the zero value and the original value is not zero.
+     * X -> Y -> 0
      */
-    EVMC_STORAGE_MODIFIED = 1,
+    EVMC_STORAGE_MODIFIED_DELETED = 5,
 
     /**
-     * A storage item has been modified after being modified before: X -> Y -> Z.
+     * A storage item is added by changing
+     * the current dirty zero to the original value.
+     * X -> 0 -> X
      */
-    EVMC_STORAGE_MODIFIED_AGAIN = 2,
+    EVMC_STORAGE_DELETED_RESTORED = 6,
 
     /**
-     * A new storage item has been added: 0 -> X.
+     * A storage item is deleted by changing
+     * the current dirty nonzero to the original zero value.
+     * 0 -> Y -> 0
      */
-    EVMC_STORAGE_ADDED = 3,
+    EVMC_STORAGE_ADDED_DELETED = 7,
 
     /**
-     * A storage item has been deleted: X -> 0.
+     * A storage item is modified by changing
+     * the current dirty nonzero to the original nonzero value other than the current value.
+     * X -> Y -> X
      */
-    EVMC_STORAGE_DELETED = 4
+    EVMC_STORAGE_MODIFIED_RESTORED = 8
 };
 
 
@@ -495,7 +606,7 @@ enum evmc_storage_status
  * This callback function is used by a VM to update the given account storage entry.
  * The VM MUST make sure that the account exists. This requirement is only a formality because
  * VM implementations only modify storage of the account of the current execution context
- * (i.e. referenced by evmc_message::destination).
+ * (i.e. referenced by evmc_message::recipient).
  *
  * @param context  The pointer to the Host execution context.
  * @param address  The address of the account.
@@ -579,8 +690,10 @@ typedef size_t (*evmc_copy_code_fn)(struct evmc_host_context* context,
  * @param context      The pointer to the Host execution context. See ::evmc_host_context.
  * @param address      The address of the contract to be selfdestructed.
  * @param beneficiary  The address where the remaining ETH is going to be transferred.
+ * @return             The information if the given address has not been registered as
+ *                     selfdestructed yet. True if registered for the first time, false otherwise.
  */
-typedef void (*evmc_selfdestruct_fn)(struct evmc_host_context* context,
+typedef bool (*evmc_selfdestruct_fn)(struct evmc_host_context* context,
                                      const evmc_address* address,
                                      const evmc_address* beneficiary);
 
@@ -821,26 +934,40 @@ enum evmc_revision
     /**
      * The Berlin revision.
      *
-     * https://github.com/ethereum/eth1.0-specs/blob/master/network-upgrades/mainnet-upgrades/berlin.md
+     * https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/berlin.md
      */
     EVMC_BERLIN = 8,
 
     /**
      * The London revision.
      *
-     * https://github.com/ethereum/eth1.0-specs/blob/master/network-upgrades/mainnet-upgrades/london.md
+     * https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/london.md
      */
     EVMC_LONDON = 9,
 
+    /**
+     * The Paris revision (aka The Merge).
+     *
+     * https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/paris.md
+     */
+    EVMC_PARIS = 10,
+
     /**
      * The Shanghai revision.
      *
-     * https://github.com/ethereum/eth1.0-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md
+     * https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/shanghai.md
+     */
+    EVMC_SHANGHAI = 11,
+
+    /**
+     * The Cancun revision.
+     *
+     * The future next revision after Shanghai.
      */
-    EVMC_SHANGHAI = 10,
+    EVMC_CANCUN = 12,
 
     /** The maximum EVM revision supported. */
-    EVMC_MAX_REVISION = EVMC_SHANGHAI,
+    EVMC_MAX_REVISION = EVMC_CANCUN,
 
     /**
      * The latest known EVM revision with finalized specification.
@@ -894,7 +1021,7 @@ enum evmc_capabilities
 
     /**
      * The VM is capable of executing the precompiled contracts
-     * defined for the range of destination addresses.
+     * defined for the range of code addresses.
      *
      * The EIP-1352 (https://eips.ethereum.org/EIPS/eip-1352) specifies
      * the range 0x000...0000 - 0x000...ffff of addresses
diff --git a/test/evmc/evmc.hpp b/test/evmc/evmc.hpp
index 6d0bac9f26..3d336894f9 100644
--- a/test/evmc/evmc.hpp
+++ b/test/evmc/evmc.hpp
@@ -1,20 +1,28 @@
-/* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018-2020 The EVMC Authors.
- * Licensed under the Apache License, Version 2.0.
- */
+// EVMC: Ethereum Client-VM Connector API.
+// Copyright 2018 The EVMC Authors.
+// Licensed under the Apache License, Version 2.0.
 #pragma once
 
 #include <evmc/evmc.h>
 #include <evmc/helpers.h>
+#include <evmc/hex.hpp>
 
 #include <functional>
 #include <initializer_list>
+#include <ostream>
+#include <string_view>
 #include <utility>
 
+static_assert(EVMC_LATEST_STABLE_REVISION <= EVMC_MAX_REVISION,
+              "latest stable revision ill-defined");
+
 /// EVMC C++ API - wrappers and bindings for C++
 /// @ingroup cpp
 namespace evmc
 {
+/// String view of uint8_t chars.
+using bytes_view = std::basic_string_view<uint8_t>;
+
 /// The big-endian 160-bit hash suitable for keeping an Ethereum address.
 ///
 /// This type wraps C ::evmc_address to make sure objects of this type are always initialized.
@@ -54,6 +62,9 @@ struct address : evmc_address
 
     /// Explicit operator converting to bool.
     inline constexpr explicit operator bool() const noexcept;
+
+    /// Implicit operator converting to bytes_view.
+    inline constexpr operator bytes_view() const noexcept { return {bytes, sizeof(bytes)}; }
 };
 
 /// The fixed size array of 32 bytes for storing 256-bit EVM values.
@@ -106,7 +117,10 @@ struct bytes32 : evmc_bytes32
     {}
 
     /// Explicit operator converting to bool.
-    constexpr inline explicit operator bool() const noexcept;
+    inline constexpr explicit operator bool() const noexcept;
+
+    /// Implicit operator converting to bytes_view.
+    inline constexpr operator bytes_view() const noexcept { return {bytes, sizeof(bytes)}; }
 };
 
 /// The alias for evmc::bytes32 to represent a big-endian 256-bit integer.
@@ -267,74 +281,45 @@ inline constexpr bytes32::operator bool() const noexcept
 
 namespace literals
 {
-namespace internal
-{
-constexpr int from_hex(char c) noexcept
-{
-    return (c >= 'a' && c <= 'f') ? c - ('a' - 10) :
-                                    (c >= 'A' && c <= 'F') ? c - ('A' - 10) : c - '0';
-}
-
-constexpr uint8_t byte(const char* s, size_t i) noexcept
-{
-    return static_cast<uint8_t>((from_hex(s[2 * i]) << 4) | from_hex(s[2 * i + 1]));
-}
-
+/// Converts a raw literal into value of type T.
+///
+/// This function is expected to be used on literals in constexpr context only.
+/// In case the input is invalid the std::terminate() is called.
+/// TODO(c++20): Use consteval.
 template <typename T>
-T from_hex(const char*) noexcept;
-
-template <>
-constexpr bytes32 from_hex<bytes32>(const char* s) noexcept
+constexpr T parse(std::string_view s) noexcept
 {
-    return {
-        {{byte(s, 0),  byte(s, 1),  byte(s, 2),  byte(s, 3),  byte(s, 4),  byte(s, 5),  byte(s, 6),
-          byte(s, 7),  byte(s, 8),  byte(s, 9),  byte(s, 10), byte(s, 11), byte(s, 12), byte(s, 13),
-          byte(s, 14), byte(s, 15), byte(s, 16), byte(s, 17), byte(s, 18), byte(s, 19), byte(s, 20),
-          byte(s, 21), byte(s, 22), byte(s, 23), byte(s, 24), byte(s, 25), byte(s, 26), byte(s, 27),
-          byte(s, 28), byte(s, 29), byte(s, 30), byte(s, 31)}}};
+    return from_hex<T>(s).value();
 }
 
-template <>
-constexpr address from_hex<address>(const char* s) noexcept
+/// Literal for evmc::address.
+constexpr address operator""_address(const char* s) noexcept
 {
-    return {
-        {{byte(s, 0),  byte(s, 1),  byte(s, 2),  byte(s, 3),  byte(s, 4),  byte(s, 5),  byte(s, 6),
-          byte(s, 7),  byte(s, 8),  byte(s, 9),  byte(s, 10), byte(s, 11), byte(s, 12), byte(s, 13),
-          byte(s, 14), byte(s, 15), byte(s, 16), byte(s, 17), byte(s, 18), byte(s, 19)}}};
+    return parse<address>(s);
 }
 
-template <typename T, char... c>
-constexpr T from_literal() noexcept
+/// Literal for evmc::bytes32.
+constexpr bytes32 operator""_bytes32(const char* s) noexcept
 {
-    constexpr auto size = sizeof...(c);
-    constexpr char literal[] = {c...};
-    constexpr bool is_simple_zero = size == 1 && literal[0] == '0';
+    return parse<bytes32>(s);
+}
+}  // namespace literals
 
-    static_assert(is_simple_zero || (literal[0] == '0' && literal[1] == 'x'),
-                  "literal must be in hexadecimal notation");
-    static_assert(is_simple_zero || size == 2 * sizeof(T) + 2,
-                  "literal must match the result type size");
+using namespace literals;
 
-    return is_simple_zero ? T{} : from_hex<T>(&literal[2]);
-}
-}  // namespace internal
 
-/// Literal for evmc::address.
-template <char... c>
-constexpr address operator""_address() noexcept
+/// @copydoc evmc_status_code_to_string
+inline const char* to_string(evmc_status_code status_code) noexcept
 {
-    return internal::from_literal<address, c...>();
+    return evmc_status_code_to_string(status_code);
 }
 
-/// Literal for evmc::bytes32.
-template <char... c>
-constexpr bytes32 operator""_bytes32() noexcept
+/// @copydoc evmc_revision_to_string
+inline const char* to_string(evmc_revision rev) noexcept
 {
-    return internal::from_literal<bytes32, c...>();
+    return evmc_revision_to_string(rev);
 }
-}  // namespace literals
 
-using namespace literals;
 
 /// Alias for evmc_make_result().
 constexpr auto make_result = evmc_make_result;
@@ -343,11 +328,12 @@ constexpr auto make_result = evmc_make_result;
 ///
 /// This is a RAII wrapper for evmc_result and objects of this type
 /// automatically release attached resources.
-class result : private evmc_result
+class Result : private evmc_result
 {
 public:
     using evmc_result::create_address;
     using evmc_result::gas_left;
+    using evmc_result::gas_refund;
     using evmc_result::output_data;
     using evmc_result::output_size;
     using evmc_result::status_code;
@@ -359,40 +345,70 @@ class result : private evmc_result
     ///
     /// @param _status_code  The status code.
     /// @param _gas_left     The amount of gas left.
+    /// @param _gas_refund   The amount of refunded gas.
     /// @param _output_data  The pointer to the output.
     /// @param _output_size  The output size.
-    result(evmc_status_code _status_code,
-           int64_t _gas_left,
-           const uint8_t* _output_data,
-           size_t _output_size) noexcept
-      : evmc_result{make_result(_status_code, _gas_left, _output_data, _output_size)}
+    explicit Result(evmc_status_code _status_code,
+                    int64_t _gas_left,
+                    int64_t _gas_refund,
+                    const uint8_t* _output_data,
+                    size_t _output_size) noexcept
+      : evmc_result{make_result(_status_code, _gas_left, _gas_refund, _output_data, _output_size)}
     {}
 
+    /// Creates the result without output.
+    ///
+    /// @param _status_code  The status code.
+    /// @param _gas_left     The amount of gas left.
+    /// @param _gas_refund   The amount of refunded gas.
+    explicit Result(evmc_status_code _status_code = EVMC_INTERNAL_ERROR,
+                    int64_t _gas_left = 0,
+                    int64_t _gas_refund = 0) noexcept
+      : evmc_result{make_result(_status_code, _gas_left, _gas_refund, nullptr, 0)}
+    {}
+
+    /// Creates the result of contract creation.
+    ///
+    /// @param _status_code     The status code.
+    /// @param _gas_left        The amount of gas left.
+    /// @param _gas_refund      The amount of refunded gas.
+    /// @param _create_address  The address of the possibly created account.
+    explicit Result(evmc_status_code _status_code,
+                    int64_t _gas_left,
+                    int64_t _gas_refund,
+                    const evmc_address& _create_address) noexcept
+      : evmc_result{make_result(_status_code, _gas_left, _gas_refund, nullptr, 0)}
+    {
+        create_address = _create_address;
+    }
+
     /// Converting constructor from raw evmc_result.
-    explicit result(evmc_result const& res) noexcept : evmc_result{res} {}
+    ///
+    /// This object takes ownership of the resources of @p res.
+    explicit Result(const evmc_result& res) noexcept : evmc_result{res} {}
 
     /// Destructor responsible for automatically releasing attached resources.
-    ~result() noexcept
+    ~Result() noexcept
     {
         if (release != nullptr)
             release(this);
     }
 
     /// Move constructor.
-    result(result&& other) noexcept : evmc_result{other}
+    Result(Result&& other) noexcept : evmc_result{other}
     {
         other.release = nullptr;  // Disable releasing of the rvalue object.
     }
 
     /// Move assignment operator.
     ///
-    /// The self-assigment MUST never happen.
+    /// The self-assignment MUST never happen.
     ///
     /// @param other The other result object.
     /// @return      The reference to the left-hand side object.
-    result& operator=(result&& other) noexcept
+    Result& operator=(Result&& other) noexcept
     {
-        this->~result();                           // Release this object.
+        this->~Result();                           // Release this object.
         static_cast<evmc_result&>(*this) = other;  // Copy data.
         other.release = nullptr;                   // Disable releasing of the rvalue object.
         return *this;
@@ -448,10 +464,10 @@ class HostInterface
                              size_t buffer_size) const noexcept = 0;
 
     /// @copydoc evmc_host_interface::selfdestruct
-    virtual void selfdestruct(const address& addr, const address& beneficiary) noexcept = 0;
+    virtual bool selfdestruct(const address& addr, const address& beneficiary) noexcept = 0;
 
     /// @copydoc evmc_host_interface::call
-    virtual result call(const evmc_message& msg) noexcept = 0;
+    virtual Result call(const evmc_message& msg) noexcept = 0;
 
     /// @copydoc evmc_host_interface::get_tx_context
     virtual evmc_tx_context get_tx_context() const noexcept = 0;
@@ -481,7 +497,6 @@ class HostContext : public HostInterface
 {
     const evmc_host_interface* host = nullptr;
     evmc_host_context* context = nullptr;
-    mutable evmc_tx_context tx_context = {};
 
 public:
     /// Default constructor for null Host context.
@@ -534,28 +549,18 @@ class HostContext : public HostInterface
         return host->copy_code(context, &address, code_offset, buffer_data, buffer_size);
     }
 
-    void selfdestruct(const address& addr, const address& beneficiary) noexcept final
+    bool selfdestruct(const address& addr, const address& beneficiary) noexcept final
     {
-        host->selfdestruct(context, &addr, &beneficiary);
+        return host->selfdestruct(context, &addr, &beneficiary);
     }
 
-    result call(const evmc_message& message) noexcept final
+    Result call(const evmc_message& message) noexcept final
     {
-        return result{host->call(context, &message)};
+        return Result{host->call(context, &message)};
     }
 
     /// @copydoc HostInterface::get_tx_context()
-    ///
-    /// The implementation caches the received transaction context
-    /// by assuming that the block timestamp should never be zero.
-    ///
-    /// @return The cached transaction context.
-    evmc_tx_context get_tx_context() const noexcept final
-    {
-        if (tx_context.block_timestamp == 0)
-            tx_context = host->get_tx_context(context);
-        return tx_context;
-    }
+    evmc_tx_context get_tx_context() const noexcept final { return host->get_tx_context(context); }
 
     bytes32 get_block_hash(int64_t number) const noexcept final
     {
@@ -685,18 +690,18 @@ class VM
     }
 
     /// @copydoc evmc_execute()
-    result execute(const evmc_host_interface& host,
+    Result execute(const evmc_host_interface& host,
                    evmc_host_context* ctx,
                    evmc_revision rev,
                    const evmc_message& msg,
                    const uint8_t* code,
                    size_t code_size) noexcept
     {
-        return result{m_instance->execute(m_instance, &host, ctx, rev, &msg, code, code_size)};
+        return Result{m_instance->execute(m_instance, &host, ctx, rev, &msg, code, code_size)};
     }
 
     /// Convenient variant of the VM::execute() that takes reference to evmc::Host class.
-    result execute(Host& host,
+    Result execute(Host& host,
                    evmc_revision rev,
                    const evmc_message& msg,
                    const uint8_t* code,
@@ -713,12 +718,12 @@ class VM
     /// but without providing the Host context and interface.
     /// This method is for experimental precompiles support where execution is
     /// guaranteed not to require any Host access.
-    result execute(evmc_revision rev,
+    Result execute(evmc_revision rev,
                    const evmc_message& msg,
                    const uint8_t* code,
                    size_t code_size) noexcept
     {
-        return result{
+        return Result{
             m_instance->execute(m_instance, nullptr, nullptr, rev, &msg, code, code_size)};
     }
 
@@ -789,11 +794,11 @@ inline size_t copy_code(evmc_host_context* h,
     return Host::from_context(h)->copy_code(*addr, code_offset, buffer_data, buffer_size);
 }
 
-inline void selfdestruct(evmc_host_context* h,
+inline bool selfdestruct(evmc_host_context* h,
                          const evmc_address* addr,
                          const evmc_address* beneficiary) noexcept
 {
-    Host::from_context(h)->selfdestruct(*addr, *beneficiary);
+    return Host::from_context(h)->selfdestruct(*addr, *beneficiary);
 }
 
 inline evmc_result call(evmc_host_context* h, const evmc_message* msg) noexcept
@@ -837,7 +842,7 @@ inline evmc_access_status access_storage(evmc_host_context* h,
 
 inline const evmc_host_interface& Host::get_interface() noexcept
 {
-    static constexpr evmc_host_interface interface{
+    static constexpr evmc_host_interface interface = {
         ::evmc::internal::account_exists, ::evmc::internal::get_storage,
         ::evmc::internal::set_storage,    ::evmc::internal::get_balance,
         ::evmc::internal::get_code_size,  ::evmc::internal::get_code_hash,
@@ -851,6 +856,24 @@ inline const evmc_host_interface& Host::get_interface() noexcept
 }  // namespace evmc
 
 
+/// "Stream out" operator implementation for ::evmc_status_code.
+///
+/// @note This is defined in global namespace to match ::evmc_status_code definition and allow
+///       convenient operator overloading usage.
+inline std::ostream& operator<<(std::ostream& os, evmc_status_code status_code)
+{
+    return os << evmc::to_string(status_code);
+}
+
+/// "Stream out" operator implementation for ::evmc_revision.
+///
+/// @note This is defined in global namespace to match ::evmc_revision definition and allow
+///       convenient operator overloading usage.
+inline std::ostream& operator<<(std::ostream& os, evmc_revision rev)
+{
+    return os << evmc::to_string(rev);
+}
+
 namespace std
 {
 /// Hash operator template specialization for evmc::address. Needed for unordered containers.
diff --git a/test/evmc/filter_iterator.hpp b/test/evmc/filter_iterator.hpp
new file mode 100644
index 0000000000..0a349fc93a
--- /dev/null
+++ b/test/evmc/filter_iterator.hpp
@@ -0,0 +1,105 @@
+// EVMC: Ethereum Client-VM Connector API.
+// Copyright 2022 The EVMC Authors.
+// Licensed under the Apache License, Version 2.0.
+#pragma once
+
+#include <iterator>
+
+namespace evmc
+{
+/// The constexpr variant of std::isspace().
+inline constexpr bool isspace(char ch) noexcept
+{
+    // Implementation taken from LLVM's libc.
+    return ch == ' ' || (static_cast<unsigned>(ch) - '\t') < 5;
+}
+
+/// Checks if a character is not a white space.
+inline constexpr bool is_not_space(char ch) noexcept
+{
+    return !isspace(ch);
+}
+
+/// The filter iterator adaptor creates a view of an iterator range in which some elements of the
+/// range are skipped. A predicate function controls which elements are skipped. When the predicate
+/// is applied to an element, if it returns true then the element is retained and if it returns
+/// false then the element is skipped over. When skipping over elements, it is necessary for the
+/// filter adaptor to know when to stop so as to avoid going past the end of the underlying range.
+/// A filter iterator is therefore constructed with pair of iterators indicating the range of
+/// elements in the unfiltered sequence to be traversed.
+///
+/// Similar to boost::filter_iterator.
+template <typename BaseIterator,
+          bool predicate(typename std::iterator_traits<BaseIterator>::value_type) noexcept>
+struct filter_iterator
+{
+    /// The iterator difference type.
+    using difference_type = typename std::iterator_traits<BaseIterator>::difference_type;
+
+    /// The iterator value type.
+    using value_type = typename std::iterator_traits<BaseIterator>::value_type;
+
+    /// The iterator pointer type.
+    using pointer = typename std::iterator_traits<BaseIterator>::pointer;
+
+    /// The iterator reference type.
+    using reference = typename std::iterator_traits<BaseIterator>::reference;
+
+    /// The iterator category.
+    using iterator_category = std::input_iterator_tag;
+
+private:
+    BaseIterator base;
+    BaseIterator base_end;
+    value_type value;
+
+    constexpr void forward_to_next_value() noexcept
+    {
+        for (; base != base_end; ++base)
+        {
+            value = *base;
+            if (predicate(value))
+                break;
+        }
+    }
+
+public:
+    /// The constructor of the base iterator pair.
+    constexpr filter_iterator(BaseIterator it, BaseIterator end) noexcept : base{it}, base_end{end}
+    {
+        forward_to_next_value();
+    }
+
+    /// The dereference operator.
+    constexpr auto operator*() noexcept
+    {
+        // We should not read from an input base iterator twice. So the only read is in
+        // forward_to_next_value() and here we return the cached value.
+        return value;
+    }
+
+    /// The increment operator.
+    constexpr void operator++() noexcept
+    {
+        ++base;
+        forward_to_next_value();
+    }
+
+    /// The equality operator.
+    constexpr bool operator==(const filter_iterator& o) const noexcept { return base == o.base; }
+
+    /// The inequality operator.
+    constexpr bool operator!=(const filter_iterator& o) const noexcept { return base != o.base; }
+};
+
+/// The input filter iterator which skips whitespace characters from the base input iterator.
+template <typename BaseIterator>
+struct skip_space_iterator : filter_iterator<BaseIterator, is_not_space>
+{
+    using filter_iterator<BaseIterator, is_not_space>::filter_iterator;
+};
+
+/// Class template argument deduction guide.
+template <typename BaseIterator>
+skip_space_iterator(BaseIterator, BaseIterator) -> skip_space_iterator<BaseIterator>;
+}  // namespace evmc
diff --git a/test/evmc/helpers.h b/test/evmc/helpers.h
index 36febfd72d..17db3d1941 100644
--- a/test/evmc/helpers.h
+++ b/test/evmc/helpers.h
@@ -1,7 +1,6 @@
-/* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018-2019 The EVMC Authors.
- * Licensed under the Apache License, Version 2.0.
- */
+// EVMC: Ethereum Client-VM Connector API.
+// Copyright 2018 The EVMC Authors.
+// Licensed under the Apache License, Version 2.0.
 
 /**
  * EVMC Helpers
@@ -10,8 +9,6 @@
  * These are convenient for languages where invoking function pointers
  * is "ugly" or impossible (such as Go).
  *
- * It also contains helpers (overloaded operators) for using EVMC types effectively in C++.
- *
  * @defgroup helpers EVMC Helpers
  * @{
  */
@@ -21,6 +18,12 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef __cplusplus
+extern "C" {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#endif
+
 /**
  * Returns true if the VM has a compatible ABI version.
  */
@@ -116,10 +119,12 @@ static void evmc_free_result_memory(const struct evmc_result* result)
 ///
 /// @param status_code  The status code.
 /// @param gas_left     The amount of gas left.
+/// @param gas_refund   The amount of refunded gas.
 /// @param output_data  The pointer to the output.
 /// @param output_size  The output size.
 static inline struct evmc_result evmc_make_result(enum evmc_status_code status_code,
                                                   int64_t gas_left,
+                                                  int64_t gas_refund,
                                                   const uint8_t* output_data,
                                                   size_t output_size)
 {
@@ -144,6 +149,7 @@ static inline struct evmc_result evmc_make_result(enum evmc_status_code status_c
 
     result.status_code = status_code;
     result.gas_left = gas_left;
+    result.gas_refund = gas_refund;
     return result;
 }
 
@@ -209,4 +215,95 @@ static inline const union evmc_result_optional_storage* evmc_get_const_optional_
 
 /** @} */
 
+/** Returns text representation of the ::evmc_status_code. */
+static inline const char* evmc_status_code_to_string(enum evmc_status_code status_code)
+{
+    switch (status_code)
+    {
+    case EVMC_SUCCESS:
+        return "success";
+    case EVMC_FAILURE:
+        return "failure";
+    case EVMC_REVERT:
+        return "revert";
+    case EVMC_OUT_OF_GAS:
+        return "out of gas";
+    case EVMC_INVALID_INSTRUCTION:
+        return "invalid instruction";
+    case EVMC_UNDEFINED_INSTRUCTION:
+        return "undefined instruction";
+    case EVMC_STACK_OVERFLOW:
+        return "stack overflow";
+    case EVMC_STACK_UNDERFLOW:
+        return "stack underflow";
+    case EVMC_BAD_JUMP_DESTINATION:
+        return "bad jump destination";
+    case EVMC_INVALID_MEMORY_ACCESS:
+        return "invalid memory access";
+    case EVMC_CALL_DEPTH_EXCEEDED:
+        return "call depth exceeded";
+    case EVMC_STATIC_MODE_VIOLATION:
+        return "static mode violation";
+    case EVMC_PRECOMPILE_FAILURE:
+        return "precompile failure";
+    case EVMC_CONTRACT_VALIDATION_FAILURE:
+        return "contract validation failure";
+    case EVMC_ARGUMENT_OUT_OF_RANGE:
+        return "argument out of range";
+    case EVMC_WASM_UNREACHABLE_INSTRUCTION:
+        return "wasm unreachable instruction";
+    case EVMC_WASM_TRAP:
+        return "wasm trap";
+    case EVMC_INSUFFICIENT_BALANCE:
+        return "insufficient balance";
+    case EVMC_INTERNAL_ERROR:
+        return "internal error";
+    case EVMC_REJECTED:
+        return "rejected";
+    case EVMC_OUT_OF_MEMORY:
+        return "out of memory";
+    }
+    return "<unknown>";
+}
+
+/** Returns the name of the ::evmc_revision. */
+static inline const char* evmc_revision_to_string(enum evmc_revision rev)
+{
+    switch (rev)
+    {
+    case EVMC_FRONTIER:
+        return "Frontier";
+    case EVMC_HOMESTEAD:
+        return "Homestead";
+    case EVMC_TANGERINE_WHISTLE:
+        return "Tangerine Whistle";
+    case EVMC_SPURIOUS_DRAGON:
+        return "Spurious Dragon";
+    case EVMC_BYZANTIUM:
+        return "Byzantium";
+    case EVMC_CONSTANTINOPLE:
+        return "Constantinople";
+    case EVMC_PETERSBURG:
+        return "Petersburg";
+    case EVMC_ISTANBUL:
+        return "Istanbul";
+    case EVMC_BERLIN:
+        return "Berlin";
+    case EVMC_LONDON:
+        return "London";
+    case EVMC_PARIS:
+        return "Paris";
+    case EVMC_SHANGHAI:
+        return "Shanghai";
+    case EVMC_CANCUN:
+        return "Cancun";
+    }
+    return "<unknown>";
+}
+
 /** @} */
+
+#ifdef __cplusplus
+#pragma GCC diagnostic pop
+}  // extern "C"
+#endif
diff --git a/test/evmc/hex.hpp b/test/evmc/hex.hpp
new file mode 100644
index 0000000000..31bbe51953
--- /dev/null
+++ b/test/evmc/hex.hpp
@@ -0,0 +1,158 @@
+// EVMC: Ethereum Client-VM Connector API.
+// Copyright 2021 The EVMC Authors.
+// Licensed under the Apache License, Version 2.0.
+#pragma once
+
+#include <evmc/filter_iterator.hpp>
+#include <cstdint>
+#include <optional>
+#include <string>
+#include <string_view>
+
+namespace evmc
+{
+/// String of uint8_t chars.
+using bytes = std::basic_string<uint8_t>;
+
+/// String view of uint8_t chars.
+using bytes_view = std::basic_string_view<uint8_t>;
+
+
+/// Encode a byte to a hex string.
+inline std::string hex(uint8_t b) noexcept
+{
+    static constexpr auto hex_digits = "0123456789abcdef";
+    return {hex_digits[b >> 4], hex_digits[b & 0xf]};
+}
+
+/// Encodes bytes as hex string.
+inline std::string hex(bytes_view bs)
+{
+    std::string str;
+    str.reserve(bs.size() * 2);
+    for (const auto b : bs)
+        str += hex(b);
+    return str;
+}
+
+namespace internal
+{
+/// Extracts the nibble value out of a hex digit.
+/// Returns -1 in case of invalid hex digit.
+inline constexpr int from_hex_digit(char h) noexcept
+{
+    if (h >= '0' && h <= '9')
+        return h - '0';
+    else if (h >= 'a' && h <= 'f')
+        return h - 'a' + 10;
+    else if (h >= 'A' && h <= 'F')
+        return h - 'A' + 10;
+    else
+        return -1;
+}
+}  // namespace internal
+
+/// Decodes hex-encoded sequence of characters.
+///
+/// It is guaranteed that the output will not be longer than half of the input length.
+///
+/// @param begin  The input begin iterator. It only must satisfy input iterator concept.
+/// @param end    The input end iterator. It only must satisfy input iterator concept.
+/// @param out    The output iterator. It must satisfy output iterator concept.
+/// @return       True if successful, false if input is invalid hex.
+template <typename InputIt, typename OutputIt>
+inline constexpr bool from_hex(InputIt begin, InputIt end, OutputIt out) noexcept
+{
+    int hi_nibble = -1;  // Init with invalid value, should never be used.
+    size_t i = 0;
+    for (auto it = begin; it != end; ++it, ++i)
+    {
+        const auto h = *it;
+        const int v = evmc::internal::from_hex_digit(h);
+        if (v < 0)
+        {
+            if (i == 1 && hi_nibble == 0 && h == 'x')  // 0x prefix
+                continue;
+            return false;
+        }
+
+        if (i % 2 == 0)
+            hi_nibble = v << 4;
+        else
+            *out++ = static_cast<uint8_t>(hi_nibble | v);
+    }
+
+    return i % 2 == 0;
+}
+
+/// Validates hex encoded string.
+///
+/// @return  True if the input is valid hex.
+inline bool validate_hex(std::string_view hex) noexcept
+{
+    struct noop_output_iterator
+    {
+        uint8_t sink = {};
+        uint8_t& operator*() noexcept { return sink; }
+        noop_output_iterator operator++(int) noexcept { return *this; }  // NOLINT(cert-dcl21-cpp)
+    };
+
+    return from_hex(hex.begin(), hex.end(), noop_output_iterator{});
+}
+
+/// Decodes hex encoded string to bytes.
+///
+/// In case the input is invalid the returned value is std::nullopt.
+/// This can happen if a non-hex digit or odd number of digits is encountered.
+inline std::optional<bytes> from_hex(std::string_view hex)
+{
+    bytes bs;
+    bs.reserve(hex.size() / 2);
+    if (!from_hex(hex.begin(), hex.end(), std::back_inserter(bs)))
+        return {};
+    return bs;
+}
+
+/// Decodes hex-encoded string into custom type T with .bytes array of uint8_t.
+///
+/// When the input is smaller than the result type, the result is padded with zeros on the left
+/// (the result bytes of lowest indices are filled with zeros).
+/// TODO: Support optional left alignment.
+template <typename T>
+constexpr std::optional<T> from_hex(std::string_view s) noexcept
+{
+    // Omit the optional 0x prefix.
+    if (s.size() >= 2 && s[0] == '0' && s[1] == 'x')
+        s.remove_prefix(2);
+
+    T r{};  // The T must have .bytes array. This may be lifted if std::bit_cast is available.
+    constexpr auto num_out_bytes = std::size(r.bytes);
+    const auto num_in_bytes = s.length() / 2;
+    if (num_in_bytes > num_out_bytes)
+        return {};
+    if (!from_hex(s.begin(), s.end(), &r.bytes[num_out_bytes - num_in_bytes]))
+        return {};
+    return r;
+}
+
+/// Decodes hex encoded string to bytes. The whitespace in the input is ignored.
+///
+/// In case the input is invalid the returned value is std::nullopt.
+/// This can happen if a non-hex digit or odd number of digits is encountered.
+/// The whitespace (as defined by std::isspace) in the input is ignored.
+template <typename InputIterator>
+std::optional<bytes> from_spaced_hex(InputIterator begin, InputIterator end) noexcept
+{
+    bytes bs;
+    if (!from_hex(skip_space_iterator{begin, end}, skip_space_iterator{end, end},
+                  std::back_inserter(bs)))
+        return {};
+    return bs;
+}
+
+/// @copydoc from_spaced_hex
+inline std::optional<bytes> from_spaced_hex(std::string_view hex) noexcept
+{
+    return from_spaced_hex(hex.begin(), hex.end());
+}
+}  // namespace evmc
diff --git a/test/evmc/loader.c b/test/evmc/loader.c
index 5b8b3c3a26..141b1d4f61 100644
--- a/test/evmc/loader.c
+++ b/test/evmc/loader.c
@@ -1,7 +1,6 @@
-/* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018-2019 The EVMC Authors.
- * Licensed under the Apache License, Version 2.0.
- */
+// EVMC: Ethereum Client-VM Connector API.
+// Copyright 2018 The EVMC Authors.
+// Licensed under the Apache License, Version 2.0.
 
 #include <evmc/loader.h>
 
@@ -27,6 +26,7 @@
 #define DLL_HANDLE void*
 #define DLL_OPEN(filename) dlopen(filename, RTLD_LAZY)
 #define DLL_CLOSE(handle) dlclose(handle)
+// NOLINTNEXTLINE(performance-no-int-to-ptr)
 #define DLL_GET_CREATE_FN(handle, name) (evmc_create_fn)(uintptr_t) dlsym(handle, name)
 #define DLL_GET_ERROR_MSG() dlerror()
 #endif
@@ -60,17 +60,20 @@ static
         dest[0] = 0;
         return 1;
     }
+    // NOLINTNEXTLINE(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
     memcpy(dest, src, len);
     dest[len] = 0;
     return 0;
 }
 
-#define PATH_MAX_LENGTH 4096
+enum
+{
+    PATH_MAX_LENGTH = 4096,
+    LAST_ERROR_MSG_BUFFER_SIZE = 511
+};
 
 static const char* last_error_msg = NULL;
 
-#define LAST_ERROR_MSG_BUFFER_SIZE 511
-
 // Buffer for formatted error messages.
 // It has one null byte extra to avoid buffer read overflow during concurrent access.
 static char last_error_msg_buffer[LAST_ERROR_MSG_BUFFER_SIZE + 1];
@@ -82,6 +85,7 @@ static enum evmc_loader_error_code set_error(enum evmc_loader_error_code error_c
 {
     va_list args;
     va_start(args, format);
+    // NOLINTNEXTLINE(clang-analyzer-security.insecureAPI.DeprecatedOrUnsafeBufferHandling)
     if (vsnprintf(last_error_msg_buffer, LAST_ERROR_MSG_BUFFER_SIZE, format, args) <
         LAST_ERROR_MSG_BUFFER_SIZE)
         last_error_msg = last_error_msg_buffer;
@@ -181,7 +185,7 @@ evmc_create_fn evmc_load(const char* filename, enum evmc_loader_error_code* erro
     return create_fn;
 }
 
-const char* evmc_last_error_msg()
+const char* evmc_last_error_msg(void)
 {
     const char* m = last_error_msg;
     last_error_msg = NULL;
@@ -267,16 +271,15 @@ struct evmc_vm* evmc_load_and_configure(const char* config, enum evmc_loader_err
     if (!vm)
         return NULL;
 
-    if (vm->set_option == NULL && strlen(options) != 0)
-    {
-        ec = set_error(EVMC_LOADER_INVALID_OPTION_NAME, "%s (%s) does not support any options",
-                       vm->name, path);
-        goto exit;
-    }
-
-
     while (strlen(options) != 0)
     {
+        if (vm->set_option == NULL)
+        {
+            ec = set_error(EVMC_LOADER_INVALID_OPTION_NAME, "%s (%s) does not support any options",
+                           vm->name, path);
+            goto exit;
+        }
+
         char* option = get_token(&options, ',');
 
         // Slit option into name and value by taking the name token.
diff --git a/test/evmc/loader.h b/test/evmc/loader.h
index 868751652b..c5ee7e3ae2 100644
--- a/test/evmc/loader.h
+++ b/test/evmc/loader.h
@@ -1,7 +1,6 @@
-/* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018-2019 The EVMC Authors.
- * Licensed under the Apache License, Version 2.0.
- */
+// EVMC: Ethereum Client-VM Connector API.
+// Copyright 2018 The EVMC Authors.
+// Licensed under the Apache License, Version 2.0.
 
 /**
  * EVMC Loader Library
@@ -21,7 +20,10 @@ extern "C" {
 /** The function pointer type for EVMC create functions. */
 typedef struct evmc_vm* (*evmc_create_fn)(void);
 
-/** Error codes for the EVMC loader. */
+/// Error codes for the EVMC loader.
+///
+/// Objects of this type SHOULD be initialized with ::EVMC_LOADER_UNSPECIFIED_ERROR
+/// before passing to the EVMC loader.
 enum evmc_loader_error_code
 {
     /** The loader succeeded. */
@@ -46,7 +48,11 @@ enum evmc_loader_error_code
     EVMC_LOADER_INVALID_OPTION_NAME = 6,
 
     /** The VM option value is invalid. */
-    EVMC_LOADER_INVALID_OPTION_VALUE = 7
+    EVMC_LOADER_INVALID_OPTION_VALUE = 7,
+
+    /// This error value will be never returned by the EVMC loader,
+    /// but can be used by users to init evmc_loader_error_code objects.
+    EVMC_LOADER_UNSPECIFIED_ERROR = -1
 };
 
 /**
diff --git a/test/evmc/mocked_host.hpp b/test/evmc/mocked_host.hpp
index 5aee8ab050..0e4ee824f6 100644
--- a/test/evmc/mocked_host.hpp
+++ b/test/evmc/mocked_host.hpp
@@ -5,6 +5,7 @@
 
 #include <evmc/evmc.hpp>
 #include <algorithm>
+#include <cassert>
 #include <string>
 #include <map>
 #include <unordered_map>
@@ -16,7 +17,7 @@ namespace evmc
 using bytes = std::basic_string<uint8_t>;
 
 /// Extended value (with original value and access flag) for account storage.
-struct storage_value
+struct StorageValue
 {
     /// The current storage value.
     bytes32 current;
@@ -28,7 +29,20 @@ struct storage_value
     evmc_access_status access_status = EVMC_ACCESS_COLD;
 
     /// Default constructor.
-    storage_value() noexcept = default;
+    StorageValue() noexcept = default;
+
+    /// Constructor sets the current and original to the same value. Optional access status.
+    StorageValue(const bytes32& _value,  // NOLINT(hicpp-explicit-conversions)
+                 evmc_access_status _access_status = EVMC_ACCESS_COLD) noexcept
+      : current{_value}, original{_value}, access_status{_access_status}
+    {}
+
+    /// Constructor with original value and optional access status
+    StorageValue(const bytes32& _value,
+                 const bytes32& _original,
+                 evmc_access_status _access_status = EVMC_ACCESS_COLD) noexcept
+      : current{_value}, original{_original}, access_status{_access_status}
+    {}
 };
 
 /// Mocked account.
@@ -47,7 +61,7 @@ struct MockedAccount
     uint256be balance;
 
     /// The account storage map.
-    std::map<bytes32, storage_value> storage;
+    std::map<bytes32, StorageValue> storage;
 
     /// Helper method for setting balance by numeric type.
     void set_balance(uint64_t x) noexcept
@@ -81,22 +95,6 @@ class MockedHost : public Host
         }
     };
 
-    /// SELFDESTRUCT record.
-    struct selfdestruct_record
-    {
-        /// The address of the account which has self-destructed.
-        address selfdestructed;
-
-        /// The address of the beneficiary account.
-        address beneficiary;
-
-        /// Equal operator.
-        bool operator==(const selfdestruct_record& other) const noexcept
-        {
-            return selfdestructed == other.selfdestructed && beneficiary == other.beneficiary;
-        }
-    };
-
     /// The set of all accounts in the Host, organized by their addresses.
     std::unordered_map<address, MockedAccount> accounts;
 
@@ -129,8 +127,9 @@ class MockedHost : public Host
     /// The record of all LOGs passed to the emit_log() method.
     std::vector<log_record> recorded_logs;
 
-    /// The record of all SELFDESTRUCTs from the selfdestruct() method.
-    std::vector<selfdestruct_record> recorded_selfdestructs;
+    /// The record of all SELFDESTRUCTs from the selfdestruct() method
+    /// as a map selfdestructed_address => [beneficiary1, beneficiary2, ...].
+    std::unordered_map<address, std::vector<address>> recorded_selfdestructs;
 
 private:
     /// The copy of call inputs for the recorded_calls record.
@@ -176,32 +175,142 @@ class MockedHost : public Host
                                     const bytes32& value) noexcept override
     {
         record_account_access(addr);
-        const auto it = accounts.find(addr);
-        if (it == accounts.end())
-            return EVMC_STORAGE_UNCHANGED;
 
-        auto& old = it->second.storage[key];
-
-        // Follow https://eips.ethereum.org/EIPS/eip-1283 specification.
-        // WARNING! This is not complete implementation as refund is not handled here.
-
-        if (old.current == value)
-            return EVMC_STORAGE_UNCHANGED;
-
-        evmc_storage_status status{};
-        if (old.original == old.current)  // Storage slot not dirty
-        {
-            if (!old.current)
-                status = EVMC_STORAGE_ADDED;
-            else if (value)
-                status = EVMC_STORAGE_MODIFIED;
+        // Get the reference to the storage entry value.
+        // This will create the account in case it was not present.
+        // This is convenient for unit testing and standalone EVM execution to preserve the
+        // storage values after the execution terminates.
+        auto& s = accounts[addr].storage[key];
+
+        // Follow the EIP-2200 specification as closely as possible.
+        // https://eips.ethereum.org/EIPS/eip-2200
+        // Warning: this is not the most efficient implementation. The storage status can be
+        // figured out by combining only 4 checks:
+        // - original != current (dirty)
+        // - original == value (restored)
+        // - current != 0
+        // - value != 0
+        const auto status = [&original = s.original, &current = s.current, &value]() {
+            // Clause 1 is irrelevant:
+            // 1. "If gasleft is less than or equal to gas stipend,
+            //    fail the current call frame with ‘out of gas’ exception"
+
+            // 2. "If current value equals new value (this is a no-op)"
+            if (current == value)
+            {
+                // "SLOAD_GAS is deducted"
+                return EVMC_STORAGE_ASSIGNED;
+            }
+            // 3. "If current value does not equal new value"
             else
-                status = EVMC_STORAGE_DELETED;
-        }
-        else
-            status = EVMC_STORAGE_MODIFIED_AGAIN;
+            {
+                // 3.1. "If original value equals current value
+                //      (this storage slot has not been changed by the current execution context)"
+                if (original == current)
+                {
+                    // 3.1.1 "If original value is 0"
+                    if (is_zero(original))
+                    {
+                        // "SSTORE_SET_GAS is deducted"
+                        return EVMC_STORAGE_ADDED;
+                    }
+                    // 3.1.2 "Otherwise"
+                    else
+                    {
+                        // "SSTORE_RESET_GAS gas is deducted"
+                        auto st = EVMC_STORAGE_MODIFIED;
+
+                        // "If new value is 0"
+                        if (is_zero(value))
+                        {
+                            // "add SSTORE_CLEARS_SCHEDULE gas to refund counter"
+                            st = EVMC_STORAGE_DELETED;
+                        }
+
+                        return st;
+                    }
+                }
+                // 3.2. "If original value does not equal current value
+                //      (this storage slot is dirty),
+                //      SLOAD_GAS gas is deducted.
+                //      Apply both of the following clauses."
+                else
+                {
+                    // Because we need to apply "both following clauses"
+                    // we first collect information which clause is triggered
+                    // then assign status code to combination of these clauses.
+                    enum
+                    {
+                        None = 0,
+                        RemoveClearsSchedule = 1 << 0,
+                        AddClearsSchedule = 1 << 1,
+                        RestoredBySet = 1 << 2,
+                        RestoredByReset = 1 << 3,
+                    };
+                    int triggered_clauses = None;
+
+                    // 3.2.1. "If original value is not 0"
+                    if (!is_zero(original))
+                    {
+                        // 3.2.1.1. "If current value is 0"
+                        if (is_zero(current))
+                        {
+                            // "(also means that new value is not 0)"
+                            assert(!is_zero(value));
+                            // "remove SSTORE_CLEARS_SCHEDULE gas from refund counter"
+                            triggered_clauses |= RemoveClearsSchedule;
+                        }
+                        // 3.2.1.2. "If new value is 0"
+                        if (is_zero(value))
+                        {
+                            // "(also means that current value is not 0)"
+                            assert(!is_zero(current));
+                            // "add SSTORE_CLEARS_SCHEDULE gas to refund counter"
+                            triggered_clauses |= AddClearsSchedule;
+                        }
+                    }
+
+                    // 3.2.2. "If original value equals new value (this storage slot is reset)"
+                    // Except: we use term 'storage slot restored'.
+                    if (original == value)
+                    {
+                        // 3.2.2.1. "If original value is 0"
+                        if (is_zero(original))
+                        {
+                            // "add SSTORE_SET_GAS - SLOAD_GAS to refund counter"
+                            triggered_clauses |= RestoredBySet;
+                        }
+                        // 3.2.2.2. "Otherwise"
+                        else
+                        {
+                            // "add SSTORE_RESET_GAS - SLOAD_GAS gas to refund counter"
+                            triggered_clauses |= RestoredByReset;
+                        }
+                    }
+
+                    switch (triggered_clauses)
+                    {
+                    case RemoveClearsSchedule:
+                        return EVMC_STORAGE_DELETED_ADDED;
+                    case AddClearsSchedule:
+                        return EVMC_STORAGE_MODIFIED_DELETED;
+                    case RemoveClearsSchedule | RestoredByReset:
+                        return EVMC_STORAGE_DELETED_RESTORED;
+                    case RestoredBySet:
+                        return EVMC_STORAGE_ADDED_DELETED;
+                    case RestoredByReset:
+                        return EVMC_STORAGE_MODIFIED_RESTORED;
+                    case None:
+                        return EVMC_STORAGE_ASSIGNED;
+                    default:
+                        assert(false);  // Other combinations are impossible.
+                        return evmc_storage_status{};
+                    }
+                }
+            }
+        }();
 
-        old.current = value;
+        s.current = value;  // Finally update the current storage value.
         return status;
     }
 
@@ -260,16 +369,18 @@ class MockedHost : public Host
     }
 
     /// Selfdestruct the account (EVMC host method).
-    void selfdestruct(const address& addr, const address& beneficiary) noexcept override
+    bool selfdestruct(const address& addr, const address& beneficiary) noexcept override
     {
         record_account_access(addr);
-        recorded_selfdestructs.push_back({addr, beneficiary});
+        auto& beneficiaries = recorded_selfdestructs[addr];
+        beneficiaries.emplace_back(beneficiary);
+        return beneficiaries.size() == 1;
     }
 
     /// Call/create other contract (EVMC host method).
-    result call(const evmc_message& msg) noexcept override
+    Result call(const evmc_message& msg) noexcept override
     {
-        record_account_access(msg.destination);
+        record_account_access(msg.recipient);
 
         if (recorded_calls.empty())
         {
@@ -288,7 +399,7 @@ class MockedHost : public Host
                 call_msg.input_data = input_copy.data();
             }
         }
-        return result{call_result};
+        return Result{call_result};
     }
 
     /// Get transaction context (EVMC host method).
@@ -316,11 +427,11 @@ class MockedHost : public Host
     /// This method is required by EIP-2929 introduced in ::EVMC_BERLIN. It will record the account
     /// access in MockedHost::recorded_account_accesses and return previous access status.
     /// This methods returns ::EVMC_ACCESS_WARM for known addresses of precompiles.
-    /// The EIP-2929 specifies that evmc_message::sender and evmc_message::destination are always
+    /// The EIP-2929 specifies that evmc_message::sender and evmc_message::recipient are always
     /// ::EVMC_ACCESS_WARM. Therefore, you should init the MockedHost with:
     ///
     ///     mocked_host.access_account(msg.sender);
-    ///     mocked_host.access_account(msg.destination);
+    ///     mocked_host.access_account(msg.recipient);
     ///
     /// The same way you can mock transaction access list (EIP-2930) for account addresses.
     ///
@@ -346,16 +457,18 @@ class MockedHost : public Host
 
     /// Access the account's storage value at the given key.
     ///
-    /// This method is required by EIP-2929 introduced in ::EVMC_BERLIN. In records that the given
-    /// account's storage key has been access and returns the previous access status.
-    /// To mock storage access list (EIP-2930), you can pre-init account's storage values with
-    /// the ::EVMC_ACCESS_WARM flag:
+    /// This method is required by EIP-2929 introduced in ::EVMC_BERLIN. In records
+    /// that the given account's storage key has been access and returns the
+    /// previous access status. To mock storage access list (EIP-2930), you can
+    /// pre-init account's storage values with the ::EVMC_ACCESS_WARM flag:
     ///
-    ///     mocked_host.accounts[msg.destination].storage[key] = {value, EVMC_ACCESS_WARM};
+    ///     mocked_host.accounts[msg.recipient].storage[key] = {value,
+    ///     EVMC_ACCESS_WARM};
     ///
     /// @param addr  The account address.
     /// @param key   The account's storage key.
-    /// @return      The ::EVMC_ACCESS_WARM if the storage key has been accessed before,
+    /// @return      The ::EVMC_ACCESS_WARM if the storage key has been accessed
+    /// before,
     ///              the ::EVMC_ACCESS_COLD otherwise.
     evmc_access_status access_storage(const address& addr, const bytes32& key) noexcept override
     {
diff --git a/test/evmc/utils.h b/test/evmc/utils.h
index 34cf26b2bf..8b8f742af1 100644
--- a/test/evmc/utils.h
+++ b/test/evmc/utils.h
@@ -1,7 +1,6 @@
-/* EVMC: Ethereum Client-VM Connector API.
- * Copyright 2018-2019 The EVMC Authors.
- * Licensed under the Apache License, Version 2.0.
- */
+// EVMC: Ethereum Client-VM Connector API.
+// Copyright 2018 The EVMC Authors.
+// Licensed under the Apache License, Version 2.0.
 
 #pragma once
 

From 7cc4c659cfad22ea74361f3be7845e616b45d5cf Mon Sep 17 00:00:00 2001
From: franzihei <franziheintel@gmail.com>
Date: Wed, 9 Nov 2022 11:47:53 +0100
Subject: [PATCH 1014/1748] Update CODE_OF_CONDUCT.md

Update CODE_OF_CONDUCT.md
---
 CODE_OF_CONDUCT.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 36813f36f8..4c75649ae8 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -55,10 +55,8 @@ further defined and clarified by project maintainers.
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at chris@ethereum.org which only goes to
-Christian Reitwiessner or axic@ethereum.org which only goes to Alex Beregszaszi.
-To report an issue involving either of them please email Hudson Jameson at
-hudson@ethereum.org.
+reported by contacting the project team at solidity@ethereum.org.
+To report an issue involving the Solidity team please email José Pedro Cabrita at zepedro@ethereum.org.
 All complaints will be reviewed and investigated and will result in a response that
 is deemed necessary and appropriate to the circumstances. The project team is
 obligated to maintain confidentiality with regard to the reporter of an incident.

From 40342264c26753c0fb74c052f3231d66b51e5077 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 7 Nov 2022 16:13:05 +0100
Subject: [PATCH 1015/1748] Use hash of candidates for CSE.

---
 libyul/optimiser/BlockHasher.cpp              | 33 ++++++-
 libyul/optimiser/BlockHasher.h                | 86 +++++++++++++------
 .../CommonSubexpressionEliminator.cpp         | 46 ++++++----
 .../optimiser/CommonSubexpressionEliminator.h | 10 +++
 libyul/optimiser/DataFlowAnalyzer.h           |  2 +-
 libyul/optimiser/SyntacticalEquality.cpp      |  6 ++
 libyul/optimiser/SyntacticalEquality.h        |  9 ++
 7 files changed, 146 insertions(+), 46 deletions(-)

diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp
index 53a3577397..ce07ac9f76 100644
--- a/libyul/optimiser/BlockHasher.cpp
+++ b/libyul/optimiser/BlockHasher.cpp
@@ -20,7 +20,6 @@
  */
 
 #include <libyul/optimiser/BlockHasher.h>
-#include <libyul/optimiser/SyntacticalEquality.h>
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
@@ -195,3 +194,35 @@ void BlockHasher::operator()(Block const& _block)
 	for (auto& externalReference: subBlockHasher.m_externalReferences)
 		(*this)(Identifier{{}, externalReference});
 }
+
+uint64_t ExpressionHasher::run(Expression const& _e)
+{
+	ExpressionHasher expressionHasher;
+	expressionHasher.visit(_e);
+	return expressionHasher.m_hash;
+}
+
+void ExpressionHasher::operator()(Literal const& _literal)
+{
+	hash64(compileTimeLiteralHash("Literal"));
+	if (_literal.kind == LiteralKind::Number)
+		hash64(std::hash<u256>{}(valueOfNumberLiteral(_literal)));
+	else
+		hash64(_literal.value.hash());
+	hash64(_literal.type.hash());
+	hash8(static_cast<uint8_t>(_literal.kind));
+}
+
+void ExpressionHasher::operator()(Identifier const& _identifier)
+{
+	hash64(compileTimeLiteralHash("Identifier"));
+	hash64(_identifier.name.hash());
+}
+
+void ExpressionHasher::operator()(FunctionCall const& _funCall)
+{
+	hash64(compileTimeLiteralHash("FunctionCall"));
+	hash64(_funCall.functionName.name.hash());
+	hash64(_funCall.arguments.size());
+	ASTWalker::operator()(_funCall);
+}
diff --git a/libyul/optimiser/BlockHasher.h b/libyul/optimiser/BlockHasher.h
index a831efa23c..6dc55371cc 100644
--- a/libyul/optimiser/BlockHasher.h
+++ b/libyul/optimiser/BlockHasher.h
@@ -27,6 +27,38 @@
 namespace solidity::yul
 {
 
+class HasherBase
+{
+public:
+	static constexpr uint64_t fnvPrime = 1099511628211u;
+	static constexpr uint64_t fnvEmptyHash = 14695981039346656037u;
+
+protected:
+	void hash8(uint8_t _value)
+	{
+		m_hash *= fnvPrime;
+		m_hash ^= _value;
+	}
+	void hash16(uint16_t _value)
+	{
+		hash8(static_cast<uint8_t>(_value & 0xFF));
+		hash8(static_cast<uint8_t>(_value >> 8));
+	}
+	void hash32(uint32_t _value)
+	{
+		hash16(static_cast<uint16_t>(_value & 0xFFFF));
+		hash16(static_cast<uint16_t>(_value >> 16));
+	}
+	void hash64(uint64_t _value)
+	{
+		hash32(static_cast<uint32_t>(_value & 0xFFFFFFFF));
+		hash32(static_cast<uint32_t>(_value >> 32));
+	}
+
+
+	uint64_t m_hash = fnvEmptyHash;
+};
+
 /**
  * Optimiser component that calculates hash values for blocks.
  * Syntactically equal blocks will have identical hashes and
@@ -41,7 +73,7 @@ namespace solidity::yul
  *
  * Prerequisite: Disambiguator, ForLoopInitRewriter
  */
-class BlockHasher: public ASTWalker
+class BlockHasher: public ASTWalker, public HasherBase
 {
 public:
 
@@ -64,36 +96,12 @@ class BlockHasher: public ASTWalker
 
 	static std::map<Block const*, uint64_t> run(Block const& _block);
 
-	static constexpr uint64_t fnvPrime = 1099511628211u;
-	static constexpr uint64_t fnvEmptyHash = 14695981039346656037u;
 
 private:
 	BlockHasher(std::map<Block const*, uint64_t>& _blockHashes): m_blockHashes(_blockHashes) {}
 
-	void hash8(uint8_t _value)
-	{
-		m_hash *= fnvPrime;
-		m_hash ^= _value;
-	}
-	void hash16(uint16_t _value)
-	{
-		hash8(static_cast<uint8_t>(_value & 0xFF));
-		hash8(static_cast<uint8_t>(_value >> 8));
-	}
-	void hash32(uint32_t _value)
-	{
-		hash16(static_cast<uint16_t>(_value & 0xFFFF));
-		hash16(static_cast<uint16_t>(_value >> 16));
-	}
-	void hash64(uint64_t _value)
-	{
-		hash32(static_cast<uint32_t>(_value & 0xFFFFFFFF));
-		hash32(static_cast<uint32_t>(_value >> 32));
-	}
-
 	std::map<Block const*, uint64_t>& m_blockHashes;
 
-	uint64_t m_hash = fnvEmptyHash;
 	struct VariableReference
 	{
 		size_t id = 0;
@@ -106,4 +114,32 @@ class BlockHasher: public ASTWalker
 };
 
 
+/**
+ * Computes hashes of expressions that are likely different for syntactically different expressions.
+ * In contrast to the BlockHasher, hashes of identifiers are likely different if the identifiers
+ * have a different name and the same if the name matches.
+ * This means this hasher should only be used on disambiguated sources.
+ */
+class ExpressionHasher: public ASTWalker, public HasherBase
+{
+public:
+	/// Computes a hash of an expression that (in contrast to the behaviour of the class)
+	/// distinguishes (up to hash collisions) variables with different names.
+	static uint64_t run(Expression const& _e);
+
+	using ASTWalker::operator();
+
+	void operator()(Literal const&) override;
+	void operator()(Identifier const&) override;
+	void operator()(FunctionCall const& _funCall) override;
+};
+
+struct ExpressionHash
+{
+	uint64_t operator()(Expression const& _expression) const
+	{
+		return ExpressionHasher::run(_expression);
+	}
+};
+
 }
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
index d1d482877e..5d085cdd41 100644
--- a/libyul/optimiser/CommonSubexpressionEliminator.cpp
+++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@@ -22,6 +22,7 @@
 #include <libyul/optimiser/CommonSubexpressionEliminator.h>
 
 #include <libyul/optimiser/SyntacticalEquality.h>
+#include <libyul/optimiser/BlockHasher.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/SideEffects.h>
@@ -55,6 +56,7 @@ CommonSubexpressionEliminator::CommonSubexpressionEliminator(
 void CommonSubexpressionEliminator::operator()(FunctionDefinition& _fun)
 {
 	ScopedSaveAndRestore returnVariables(m_returnVariables, {});
+	ScopedSaveAndRestore replacementCandidates(m_replacementCandidates, {});
 
 	for (auto const& v: _fun.returnVariables)
 		m_returnVariables.insert(v.name);
@@ -103,25 +105,31 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
 					_e = Identifier{debugDataOf(_e), value->name};
 		}
 	}
-	else
-	{
-		// TODO this search is rather inefficient.
-		for (auto const& [variable, value]: allValues())
-		{
-			assertThrow(value.value, OptimizerException, "");
-			// Prevent using the default value of return variables
-			// instead of literal zeros.
-			if (
-				m_returnVariables.count(variable) &&
-				holds_alternative<Literal>(*value.value) &&
-				valueOfLiteral(get<Literal>(*value.value)) == 0
-			)
-				continue;
-			if (SyntacticallyEqual{}(_e, *value.value) && inScope(variable))
+	else if (auto const* candidates = util::valueOrNullptr(m_replacementCandidates, _e))
+		for (auto const& variable: *candidates)
+			if (AssignedValue const* value = variableValue(variable))
 			{
-				_e = Identifier{debugDataOf(_e), variable};
-				break;
+				assertThrow(value->value, OptimizerException, "");
+				// Prevent using the default value of return variables
+				// instead of literal zeros.
+				if (
+					m_returnVariables.count(variable) &&
+					holds_alternative<Literal>(*value->value) &&
+					valueOfLiteral(get<Literal>(*value->value)) == 0
+				)
+					continue;
+				// We check for syntactic equality again because the value might have changed.
+				if (inScope(variable) && SyntacticallyEqual{}(_e, *value->value))
+				{
+					_e = Identifier{debugDataOf(_e), variable};
+					break;
+				}
 			}
-		}
-	}
+}
+
+void CommonSubexpressionEliminator::assignValue(YulString _variable, Expression const* _value)
+{
+	if (_value)
+		m_replacementCandidates[*_value].insert(_variable);
+	DataFlowAnalyzer::assignValue(_variable, _value);
 }
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.h b/libyul/optimiser/CommonSubexpressionEliminator.h
index 7099ad1811..163c9df994 100644
--- a/libyul/optimiser/CommonSubexpressionEliminator.h
+++ b/libyul/optimiser/CommonSubexpressionEliminator.h
@@ -24,6 +24,8 @@
 
 #include <libyul/optimiser/DataFlowAnalyzer.h>
 #include <libyul/optimiser/OptimiserStep.h>
+#include <libyul/optimiser/SyntacticalEquality.h>
+#include <libyul/optimiser/BlockHasher.h>
 
 #include <set>
 
@@ -58,8 +60,16 @@ class CommonSubexpressionEliminator: public DataFlowAnalyzer
 	using ASTModifier::visit;
 	void visit(Expression& _e) override;
 
+	void assignValue(YulString _variable, Expression const* _value) override;
 private:
 	std::set<YulString> m_returnVariables;
+	std::unordered_map<
+		std::reference_wrapper<Expression const>,
+		std::set<YulString>,
+		ExpressionHash,
+		SyntacticallyEqualExpression
+	> m_replacementCandidates;
 };
 
+
 }
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index b82f437538..fe5a75928e 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -123,7 +123,7 @@ class DataFlowAnalyzer: public ASTModifier
 	/// for example at points where control flow is merged.
 	void clearValues(std::set<YulString> _names);
 
-	void assignValue(YulString _variable, Expression const* _value);
+	virtual void assignValue(YulString _variable, Expression const* _value);
 
 	/// Clears knowledge about storage or memory if they may be modified inside the block.
 	void clearKnowledgeIfInvalidated(Block const& _block);
diff --git a/libyul/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp
index c7aed19379..dccdf62a52 100644
--- a/libyul/optimiser/SyntacticalEquality.cpp
+++ b/libyul/optimiser/SyntacticalEquality.cpp
@@ -165,3 +165,9 @@ bool SyntacticallyEqual::visitDeclaration(TypedName const& _lhs, TypedName const
 	m_identifiersRHS[_rhs.name] = id;
 	return true;
 }
+
+bool SyntacticallyEqualExpression::operator()(Expression const& _lhs, Expression const& _rhs) const
+{
+	return SyntacticallyEqual{}(_lhs, _rhs);
+}
+
diff --git a/libyul/optimiser/SyntacticalEquality.h b/libyul/optimiser/SyntacticalEquality.h
index 02a6d4b397..319da763e8 100644
--- a/libyul/optimiser/SyntacticalEquality.h
+++ b/libyul/optimiser/SyntacticalEquality.h
@@ -85,4 +85,13 @@ class SyntacticallyEqual
 	std::map<YulString, std::size_t> m_identifiersRHS;
 };
 
+/**
+ * Does the same as SyntacticallyEqual just that the operator() function is const.
+ */
+struct SyntacticallyEqualExpression
+{
+	bool operator()(Expression const& _lhs, Expression const& _rhs) const;
+};
+
+
 }

From fbe11815177ac1d221eb99695b1d931f7a1f29d6 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Tue, 30 Aug 2022 09:46:55 +0200
Subject: [PATCH 1016/1748] CFGNode: For function calls store a pointer to a
 resolved function definition rather than the FunctionCall AST node

---
 libsolidity/analysis/ControlFlowBuilder.cpp   |  5 +-
 libsolidity/analysis/ControlFlowBuilder.h     |  4 +-
 libsolidity/analysis/ControlFlowGraph.cpp     |  6 +-
 libsolidity/analysis/ControlFlowGraph.h       |  5 +-
 .../analysis/ControlFlowRevertPruner.cpp      | 78 +++++++++----------
 5 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/libsolidity/analysis/ControlFlowBuilder.cpp b/libsolidity/analysis/ControlFlowBuilder.cpp
index 1d1e33f506..3794dcf6f2 100644
--- a/libsolidity/analysis/ControlFlowBuilder.cpp
+++ b/libsolidity/analysis/ControlFlowBuilder.cpp
@@ -300,8 +300,7 @@ bool ControlFlowBuilder::visit(FunctionCall const& _functionCall)
 				_functionCall.expression().accept(*this);
 				ASTNode::listAccept(_functionCall.arguments(), *this);
 
-				solAssert(!m_currentNode->functionCall);
-				m_currentNode->functionCall = &_functionCall;
+				m_currentNode->functionDefinition = ASTNode::resolveFunctionCall(_functionCall, m_contract);
 
 				auto nextNode = newLabel();
 
@@ -318,6 +317,8 @@ bool ControlFlowBuilder::visit(FunctionCall const& _functionCall)
 
 bool ControlFlowBuilder::visit(ModifierInvocation const& _modifierInvocation)
 {
+	solAssert(m_contract, "Free functions cannot have modifiers");
+
 	if (auto arguments = _modifierInvocation.arguments())
 		for (auto& argument: *arguments)
 			appendControlFlow(*argument);
diff --git a/libsolidity/analysis/ControlFlowBuilder.h b/libsolidity/analysis/ControlFlowBuilder.h
index a150262f16..91ca0eefa1 100644
--- a/libsolidity/analysis/ControlFlowBuilder.h
+++ b/libsolidity/analysis/ControlFlowBuilder.h
@@ -38,14 +38,14 @@ class ControlFlowBuilder: private ASTConstVisitor, private yul::ASTWalker
 	static std::unique_ptr<FunctionFlow> createFunctionFlow(
 		CFG::NodeContainer& _nodeContainer,
 		FunctionDefinition const& _function,
-		ContractDefinition const* _contract = nullptr
+		ContractDefinition const* _contract
 	);
 
 private:
 	explicit ControlFlowBuilder(
 		CFG::NodeContainer& _nodeContainer,
 		FunctionFlow const& _functionFlow,
-		ContractDefinition const* _contract = nullptr
+		ContractDefinition const* _contract
 	);
 
 	// Visits for constructing the control flow.
diff --git a/libsolidity/analysis/ControlFlowGraph.cpp b/libsolidity/analysis/ControlFlowGraph.cpp
index ca36b421c3..71acb8a672 100644
--- a/libsolidity/analysis/ControlFlowGraph.cpp
+++ b/libsolidity/analysis/ControlFlowGraph.cpp
@@ -34,7 +34,11 @@ bool CFG::constructFlow(ASTNode const& _astRoot)
 bool CFG::visit(FunctionDefinition const& _function)
 {
 	if (_function.isImplemented() && _function.isFree())
-		m_functionControlFlow[{nullptr, &_function}] = ControlFlowBuilder::createFunctionFlow(m_nodeContainer, _function);
+		m_functionControlFlow[{nullptr, &_function}] = ControlFlowBuilder::createFunctionFlow(
+			m_nodeContainer,
+			_function,
+			nullptr /* _contract */
+		);
 	return false;
 }
 
diff --git a/libsolidity/analysis/ControlFlowGraph.h b/libsolidity/analysis/ControlFlowGraph.h
index 7383783fd6..4ded672680 100644
--- a/libsolidity/analysis/ControlFlowGraph.h
+++ b/libsolidity/analysis/ControlFlowGraph.h
@@ -98,9 +98,8 @@ struct CFGNode
 	std::vector<CFGNode*> entries;
 	/// Exit nodes. All CFG nodes to which control flow may continue after this node.
 	std::vector<CFGNode*> exits;
-	/// Function call done by this node
-	FunctionCall const* functionCall = nullptr;
-
+	/// Resolved definition of the function called by this node
+	FunctionDefinition const* functionDefinition = nullptr;
 	/// Variable occurrences in the node.
 	std::vector<VariableOccurrence> variableOccurrences;
 	// Source location of this control flow block.
diff --git a/libsolidity/analysis/ControlFlowRevertPruner.cpp b/libsolidity/analysis/ControlFlowRevertPruner.cpp
index ae9c18a13a..c96ad2b032 100644
--- a/libsolidity/analysis/ControlFlowRevertPruner.cpp
+++ b/libsolidity/analysis/ControlFlowRevertPruner.cpp
@@ -81,27 +81,23 @@ void ControlFlowRevertPruner::findRevertStates()
 				if (_node == functionFlow.exit)
 					foundExit = true;
 
-				if (auto const* functionCall = _node->functionCall)
+				auto const* resolvedFunction = _node->functionDefinition;
+				if (resolvedFunction && resolvedFunction->isImplemented())
 				{
-					auto const* resolvedFunction = ASTNode::resolveFunctionCall(*functionCall, item.contract);
-
-					if (resolvedFunction && resolvedFunction->isImplemented())
+					CFG::FunctionContractTuple calledFunctionTuple{
+						findScopeContract(*resolvedFunction, item.contract),
+						resolvedFunction
+					};
+					switch (m_functions.at(calledFunctionTuple))
 					{
-						CFG::FunctionContractTuple calledFunctionTuple{
-							findScopeContract(*resolvedFunction, item.contract),
-							resolvedFunction
-						};
-						switch (m_functions.at(calledFunctionTuple))
-						{
-							case RevertState::Unknown:
-								wakeUp[calledFunctionTuple].insert(item);
-								foundUnknown = true;
-								return;
-							case RevertState::AllPathsRevert:
-								return;
-							case RevertState::HasNonRevertingPath:
-								break;
-						}
+						case RevertState::Unknown:
+							wakeUp[calledFunctionTuple].insert(item);
+							foundUnknown = true;
+							return;
+						case RevertState::AllPathsRevert:
+							return;
+						case RevertState::HasNonRevertingPath:
+							break;
 					}
 				}
 
@@ -135,30 +131,26 @@ void ControlFlowRevertPruner::modifyFunctionFlows()
 		FunctionFlow const& functionFlow = m_cfg.functionFlow(*item.first.function, item.first.contract);
 		solidity::util::BreadthFirstSearch<CFGNode*>{{functionFlow.entry}}.run(
 			[&](CFGNode* _node, auto&& _addChild) {
-				if (auto const* functionCall = _node->functionCall)
-				{
-					auto const* resolvedFunction = ASTNode::resolveFunctionCall(*functionCall, item.first.contract);
-
-					if (resolvedFunction && resolvedFunction->isImplemented())
-						switch (m_functions.at({findScopeContract(*resolvedFunction, item.first.contract), resolvedFunction}))
-						{
-							case RevertState::Unknown:
-								[[fallthrough]];
-							case RevertState::AllPathsRevert:
-								// If the revert states of the functions do not
-								// change anymore, we treat all "unknown" states as
-								// "reverting", since they can only be caused by
-								// recursion.
-								for (CFGNode * node: _node->exits)
-									ranges::remove(node->entries, _node);
-
-								_node->exits = {functionFlow.revert};
-								functionFlow.revert->entries.push_back(_node);
-								return;
-							default:
-								break;
-						}
-				}
+				auto const* resolvedFunction = _node->functionDefinition;
+				if (resolvedFunction && resolvedFunction->isImplemented())
+					switch (m_functions.at({findScopeContract(*resolvedFunction, item.first.contract), resolvedFunction}))
+					{
+						case RevertState::Unknown:
+							[[fallthrough]];
+						case RevertState::AllPathsRevert:
+							// If the revert states of the functions do not
+							// change anymore, we treat all "unknown" states as
+							// "reverting", since they can only be caused by
+							// recursion.
+							for (CFGNode * node: _node->exits)
+								ranges::remove(node->entries, _node);
+
+							_node->exits = {functionFlow.revert};
+							functionFlow.revert->entries.push_back(_node);
+							return;
+						default:
+							break;
+					}
 
 				for (CFGNode* exit: _node->exits)
 					_addChild(exit);

From 27dba5c2d441b958ad53992d7f1e6bf9a42ae60f Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 11 Aug 2022 11:32:12 +0200
Subject: [PATCH 1017/1748] Clarify cleanup in docs.

Co-authored-by: matheusaaguiar <95899911+matheusaaguiar@users.noreply.github.com>
---
 docs/internals/variable_cleanup.rst | 109 +++++++++++++++++++++-------
 1 file changed, 84 insertions(+), 25 deletions(-)

diff --git a/docs/internals/variable_cleanup.rst b/docs/internals/variable_cleanup.rst
index 9fec6929f6..bab3c8bef2 100644
--- a/docs/internals/variable_cleanup.rst
+++ b/docs/internals/variable_cleanup.rst
@@ -4,9 +4,10 @@
 Cleaning Up Variables
 *********************
 
-When a value is shorter than 256 bit, in some cases the remaining bits
-must be cleaned.
-The Solidity compiler is designed to clean such remaining bits before any operations
+Ultimately, all values in the EVM are stored in 256 bit words.
+Thus, in some cases, when the type of a value has less than 256 bits,
+it is necessary to clean the remaining bits.
+The Solidity compiler is designed to do such cleaning before any operations
 that might be adversely affected by the potential garbage in the remaining bits.
 For example, before writing a value to  memory, the remaining bits need
 to be cleared because the memory contents can be used for computing
@@ -28,25 +29,83 @@ the boolean values before they are used as the condition for
 In addition to the design principle above, the Solidity compiler
 cleans input data when it is loaded onto the stack.
 
-Different types have different rules for cleaning up invalid values:
-
-+---------------+---------------+-------------------+
-|Type           |Valid Values   |Invalid Values Mean|
-+===============+===============+===================+
-|enum of n      |0 until n - 1  |exception          |
-|members        |               |                   |
-+---------------+---------------+-------------------+
-|bool           |0 or 1         |1                  |
-+---------------+---------------+-------------------+
-|signed integers|sign-extended  |currently silently |
-|               |word           |wraps; in the      |
-|               |               |future exceptions  |
-|               |               |will be thrown     |
-|               |               |                   |
-|               |               |                   |
-+---------------+---------------+-------------------+
-|unsigned       |higher bits    |currently silently |
-|integers       |zeroed         |wraps; in the      |
-|               |               |future exceptions  |
-|               |               |will be thrown     |
-+---------------+---------------+-------------------+
+The following table describes the cleaning rules applied to different types,
+where ``higher bits`` refers to the remaining bits in case the type has less than 256 bits.
+
++---------------+---------------+-------------------------+
+|Type           |Valid Values   |Cleanup of Invalid Values|
++===============+===============+=========================+
+|enum of n      |0 until n - 1  |throws exception         |
+|members        |               |                         |
++---------------+---------------+-------------------------+
+|bool           |0 or 1         |results in 1             |
++---------------+---------------+-------------------------+
+|signed integers|higher bits    |currently silently       |
+|               |set to the     |signextends to a valid   |
+|               |sign bit       |value, i.e. all higher   |
+|               |               |bits are set to the sign |
+|               |               |bit; may throw an        |
+|               |               |exception in the future  |
++---------------+---------------+-------------------------+
+|unsigned       |higher bits    |currently silently masks |
+|integers       |zeroed         |to a valid value, i.e.   |
+|               |               |all higher bits are set  |
+|               |               |to zero; may throw an    |
+|               |               |exception in the future  |
++---------------+---------------+-------------------------+
+
+Note that valid and invalid values are dependent on their type size.
+Consider ``uint8``, the unsigned 8-bit type, which has the following valid values:
+
+.. code-block:: none
+
+    0000...0000 0000 0000
+    0000...0000 0000 0001
+    0000...0000 0000 0010
+    ....
+    0000...0000 1111 1111
+
+Any invalid value will have the higher bits set to zero:
+
+.. code-block:: none
+
+    0101...1101 0010 1010   invalid value
+    0000...0000 0010 1010   cleaned value
+
+For ``int8``, the signed 8-bit type, the valid values are:
+
+Negative
+
+.. code-block:: none
+
+    1111...1111 1111 1111
+    1111...1111 1111 1110
+    ....
+    1111...1111 1000 0000
+
+Positive
+
+.. code-block:: none
+
+    0000...0000 0000 0000
+    0000...0000 0000 0001
+    0000...0000 0000 0010
+    ....
+    0000...0000 1111 1111
+
+The compiler will ``signextend`` the sign bit, which is 1 for negative and 0 for
+positive values, overwriting the higher bits:
+
+Negative
+
+.. code-block:: none
+
+    0010...1010 1111 1111   invalid value
+    1111...1111 1111 1111   cleaned value
+
+Positive
+
+.. code-block:: none
+
+    1101...0101 0000 0100   invalid value
+    0000...0000 0000 0100   cleaned value

From 5df92a374bc6c06a24580a3e03144137c77d3885 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 16 Sep 2022 12:56:23 +0200
Subject: [PATCH 1018/1748] Update EVMHost to match EVMC10 changes

---
 test/EVMHost.cpp                              | 108 ++++++++----------
 test/EVMHost.h                                |  33 +++---
 test/ExecutionFramework.cpp                   |  16 ++-
 test/ExecutionFramework.h                     |   1 -
 .../tools/ossfuzz/SolidityEvmoneInterface.cpp |  17 +--
 test/tools/ossfuzz/SolidityEvmoneInterface.h  |   8 +-
 .../tools/ossfuzz/StackReuseCodegenFuzzer.cpp |   8 +-
 test/tools/ossfuzz/YulEvmoneInterface.cpp     |   5 +-
 test/tools/ossfuzz/YulEvmoneInterface.h       |   2 +-
 9 files changed, 94 insertions(+), 104 deletions(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index e997c394a6..541110f3ba 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -125,7 +125,7 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 	else
 		assertThrow(false, Exception, "Unsupported EVM version");
 
-	tx_context.block_difficulty = evmc::uint256be{200000000};
+	tx_context.block_prev_randao = evmc::uint256be{200000000}; // TODO: should make it >2**64 for >Paris
 	tx_context.block_gas_limit = 20000000;
 	tx_context.block_coinbase = 0x7878787878787878787878787878787878787878_address;
 	tx_context.tx_gas_price = evmc::uint256be{3000000000};
@@ -145,7 +145,6 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 void EVMHost::reset()
 {
 	accounts.clear();
-	m_currentAddress = {};
 	// Clear self destruct records
 	recorded_selfdestructs.clear();
 	// Clear call records
@@ -194,14 +193,14 @@ void EVMHost::transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recip
 	_recipient.balance = convertToEVMC(u256(convertFromEVMC(_recipient.balance)) + _value);
 }
 
-void EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _beneficiary) noexcept
+bool EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _beneficiary) noexcept
 {
 	// TODO actual selfdestruct is even more complicated.
 
 	transfer(accounts[_addr], accounts[_beneficiary], convertFromEVMC(accounts[_addr].balance));
 
 	// Record self destructs. Clearing will be done in newTransactionFrame().
-	MockedHost::selfdestruct(_addr, _beneficiary);
+	return MockedHost::selfdestruct(_addr, _beneficiary);
 }
 
 void EVMHost::recordCalls(evmc_message const& _message) noexcept
@@ -212,34 +211,34 @@ void EVMHost::recordCalls(evmc_message const& _message) noexcept
 
 // NOTE: this is used for both internal and external calls.
 // External calls are triggered from ExecutionFramework and contain only EVMC_CREATE or EVMC_CALL.
-evmc::result EVMHost::call(evmc_message const& _message) noexcept
+evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 {
 	recordCalls(_message);
-	if (_message.destination == 0x0000000000000000000000000000000000000001_address)
+	if (_message.recipient == 0x0000000000000000000000000000000000000001_address)
 		return precompileECRecover(_message);
-	else if (_message.destination == 0x0000000000000000000000000000000000000002_address)
+	else if (_message.recipient == 0x0000000000000000000000000000000000000002_address)
 		return precompileSha256(_message);
-	else if (_message.destination == 0x0000000000000000000000000000000000000003_address)
+	else if (_message.recipient == 0x0000000000000000000000000000000000000003_address)
 		return precompileRipeMD160(_message);
-	else if (_message.destination == 0x0000000000000000000000000000000000000004_address)
+	else if (_message.recipient == 0x0000000000000000000000000000000000000004_address)
 		return precompileIdentity(_message);
-	else if (_message.destination == 0x0000000000000000000000000000000000000005_address && m_evmVersion >= langutil::EVMVersion::byzantium())
+	else if (_message.recipient == 0x0000000000000000000000000000000000000005_address && m_evmVersion >= langutil::EVMVersion::byzantium())
 		return precompileModExp(_message);
-	else if (_message.destination == 0x0000000000000000000000000000000000000006_address && m_evmVersion >= langutil::EVMVersion::byzantium())
+	else if (_message.recipient == 0x0000000000000000000000000000000000000006_address && m_evmVersion >= langutil::EVMVersion::byzantium())
 	{
 		if (m_evmVersion <= langutil::EVMVersion::istanbul())
 			return precompileALTBN128G1Add<EVMC_ISTANBUL>(_message);
 		else
 			return precompileALTBN128G1Add<EVMC_LONDON>(_message);
 	}
-	else if (_message.destination == 0x0000000000000000000000000000000000000007_address && m_evmVersion >= langutil::EVMVersion::byzantium())
+	else if (_message.recipient == 0x0000000000000000000000000000000000000007_address && m_evmVersion >= langutil::EVMVersion::byzantium())
 	{
 		if (m_evmVersion <= langutil::EVMVersion::istanbul())
 			return precompileALTBN128G1Mul<EVMC_ISTANBUL>(_message);
 		else
 			return precompileALTBN128G1Mul<EVMC_LONDON>(_message);
 	}
-	else if (_message.destination == 0x0000000000000000000000000000000000000008_address && m_evmVersion >= langutil::EVMVersion::byzantium())
+	else if (_message.recipient == 0x0000000000000000000000000000000000000008_address && m_evmVersion >= langutil::EVMVersion::byzantium())
 	{
 		if (m_evmVersion <= langutil::EVMVersion::istanbul())
 			return precompileALTBN128PairingProduct<EVMC_ISTANBUL>(_message);
@@ -262,7 +261,7 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
 			message.gas -= message.input_data[i] == 0 ? evmasm::GasCosts::txDataZeroGas : evmasm::GasCosts::txDataNonZeroGas(m_evmVersion);
 		if (message.gas < 0)
 		{
-			evmc::result result({});
+			evmc::Result result;
 			result.status_code = EVMC_OUT_OF_GAS;
 			accounts = stateBackup;
 			return result;
@@ -299,8 +298,8 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
 			encodedNonce
 		), h160::AlignRight);
 
-		message.destination = convertToEVMC(createAddress);
-		assertThrow(accounts.count(message.destination) == 0, Exception, "Account cannot exist");
+		message.recipient = convertToEVMC(createAddress);
+		assertThrow(accounts.count(message.recipient) == 0, Exception, "Account cannot exist");
 
 		code = evmc::bytes(message.input_data, message.input_data + message.input_size);
 	}
@@ -313,13 +312,13 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
 			keccak256(bytes(message.input_data, message.input_data + message.input_size)).asBytes()
 		), h160::AlignRight);
 
-		message.destination = convertToEVMC(createAddress);
-		if (accounts.count(message.destination) && (
-			accounts[message.destination].nonce > 0 ||
-			!accounts[message.destination].code.empty()
+		message.recipient = convertToEVMC(createAddress);
+		if (accounts.count(message.recipient) && (
+			accounts[message.recipient].nonce > 0 ||
+			!accounts[message.recipient].code.empty()
 		))
 		{
-			evmc::result result({});
+			evmc::Result result;
 			result.status_code = EVMC_OUT_OF_GAS;
 			accounts = stateBackup;
 			return result;
@@ -327,21 +326,16 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
 
 		code = evmc::bytes(message.input_data, message.input_data + message.input_size);
 	}
-	else if (message.kind == EVMC_DELEGATECALL || message.kind == EVMC_CALLCODE)
-	{
-		code = accounts[message.destination].code;
-		message.destination = m_currentAddress;
-	}
 	else
-		code = accounts[message.destination].code;
+		code = accounts[message.code_address].code;
 
-	auto& destination = accounts[message.destination];
+	auto& destination = accounts[message.recipient];
 
 	if (value != 0 && message.kind != EVMC_DELEGATECALL && message.kind != EVMC_CALLCODE)
 	{
 		if (value > convertFromEVMC(sender.balance))
 		{
-			evmc::result result({});
+			evmc::Result result;
 			result.status_code = EVMC_INSUFFICIENT_BALANCE;
 			accounts = stateBackup;
 			return result;
@@ -355,12 +349,9 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
 	if (m_evmRevision >= EVMC_BERLIN)
 	{
 		access_account(message.sender);
-		access_account(message.destination);
+		access_account(message.recipient);
 	}
-	evmc::address currentAddress = m_currentAddress;
-	m_currentAddress = message.destination;
-	evmc::result result = m_vm.execute(*this, m_evmRevision, message, code.data(), code.size());
-	m_currentAddress = currentAddress;
+	evmc::Result result = m_vm.execute(*this, m_evmRevision, message, code.data(), code.size());
 
 	if (message.kind == EVMC_CREATE || message.kind == EVMC_CREATE2)
 	{
@@ -373,7 +364,7 @@ evmc::result EVMHost::call(evmc_message const& _message) noexcept
 		}
 		else
 		{
-			result.create_address = message.destination;
+			result.create_address = message.recipient;
 			destination.code = evmc::bytes(result.output_data, result.output_data + result.output_size);
 			destination.codehash = convertToEVMC(keccak256({result.output_data, result.output_size}));
 		}
@@ -416,7 +407,7 @@ evmc::bytes32 EVMHost::convertToEVMC(h256 const& _data)
 	return d;
 }
 
-evmc::result EVMHost::precompileECRecover(evmc_message const& _message) noexcept
+evmc::Result EVMHost::precompileECRecover(evmc_message const& _message) noexcept
 {
 	// NOTE this is a partial implementation for some inputs.
 
@@ -449,20 +440,14 @@ evmc::result EVMHost::precompileECRecover(evmc_message const& _message) noexcept
 			}
 		}
 	};
-	evmc::result result = precompileGeneric(_message, inputOutput);
+	evmc::Result result = precompileGeneric(_message, inputOutput);
 	// ECRecover will return success with empty response in case of failure
 	if (result.status_code != EVMC_SUCCESS && result.status_code != EVMC_OUT_OF_GAS)
-//		return resultWithGas(_message.gas, gas_cost, {});
-	{
-		result.status_code = EVMC_SUCCESS;
-		result.gas_left = _message.gas - gas_cost;
-		result.output_data = {};
-		result.output_size = 0;
-	}
+		return resultWithGas(_message.gas, gas_cost, {});
 	return result;
 }
 
-evmc::result EVMHost::precompileSha256(evmc_message const& _message) noexcept
+evmc::Result EVMHost::precompileSha256(evmc_message const& _message) noexcept
 {
 	// static data so that we do not need a release routine...
 	bytes static hash;
@@ -477,7 +462,7 @@ evmc::result EVMHost::precompileSha256(evmc_message const& _message) noexcept
 	return resultWithGas(_message.gas, gas_cost, hash);
 }
 
-evmc::result EVMHost::precompileRipeMD160(evmc_message const& _message) noexcept
+evmc::Result EVMHost::precompileRipeMD160(evmc_message const& _message) noexcept
 {
 	// NOTE this is a partial implementation for some inputs.
 
@@ -579,7 +564,7 @@ evmc::result EVMHost::precompileRipeMD160(evmc_message const& _message) noexcept
 	return precompileGeneric(_message, inputOutput);
 }
 
-evmc::result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
+evmc::Result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
 {
 	// static data so that we do not need a release routine...
 	bytes static data;
@@ -591,14 +576,14 @@ evmc::result EVMHost::precompileIdentity(evmc_message const& _message) noexcept
 	return resultWithGas(_message.gas, gas_cost, data);
 }
 
-evmc::result EVMHost::precompileModExp(evmc_message const&) noexcept
+evmc::Result EVMHost::precompileModExp(evmc_message const&) noexcept
 {
 	// TODO implement
 	return resultWithFailure();
 }
 
 template <evmc_revision Revision>
-evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noexcept
+evmc::Result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noexcept
 {
 	// NOTE this is a partial implementation for some inputs.
 
@@ -866,7 +851,7 @@ evmc::result EVMHost::precompileALTBN128G1Add(evmc_message const& _message) noex
 }
 
 template <evmc_revision Revision>
-evmc::result EVMHost::precompileALTBN128G1Mul(evmc_message const& _message) noexcept
+evmc::Result EVMHost::precompileALTBN128G1Mul(evmc_message const& _message) noexcept
 {
 	// NOTE this is a partial implementation for some inputs.
 
@@ -956,7 +941,7 @@ evmc::result EVMHost::precompileALTBN128G1Mul(evmc_message const& _message) noex
 }
 
 template <evmc_revision Revision>
-evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _message) noexcept
+evmc::Result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _message) noexcept
 {
 	// Base + per pairing gas.
 	constexpr auto calc_cost = [](unsigned points) -> int64_t {
@@ -1124,7 +1109,7 @@ evmc::result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 	return precompileGeneric(_message, inputOutput);
 }
 
-evmc::result EVMHost::precompileGeneric(
+evmc::Result EVMHost::precompileGeneric(
 	evmc_message const& _message,
 	map<bytes, EVMPrecompileOutput> const& _inOut) noexcept
 {
@@ -1138,20 +1123,20 @@ evmc::result EVMHost::precompileGeneric(
 		return resultWithFailure();
 }
 
-evmc::result EVMHost::resultWithFailure() noexcept
+evmc::Result EVMHost::resultWithFailure() noexcept
 {
-	evmc::result result({});
+	evmc::Result result;
 	result.status_code = EVMC_FAILURE;
 	return result;
 }
 
-evmc::result EVMHost::resultWithGas(
+evmc::Result EVMHost::resultWithGas(
 	int64_t gas_limit,
 	int64_t gas_required,
 	bytes const& _data
 ) noexcept
 {
-	evmc::result result({});
+	evmc::Result result;
 	if (gas_limit < gas_required)
 	{
 		result.status_code = EVMC_OUT_OF_GAS;
@@ -1162,7 +1147,7 @@ evmc::result EVMHost::resultWithGas(
 		result.status_code = EVMC_SUCCESS;
 		result.gas_left = gas_limit - gas_required;
 	}
-	result.output_data = _data.data();
+	result.output_data = _data.empty() ? nullptr : _data.data();
 	result.output_size = _data.size();
 	return result;
 }
@@ -1209,10 +1194,11 @@ void EVMHostPrinter::balance()
 void EVMHostPrinter::selfdestructRecords()
 {
 	for (auto const& record: m_host.recorded_selfdestructs)
-		m_stateStream << "SELFDESTRUCT"
-			<< " BENEFICIARY "
-			<< m_host.convertFromEVMC(record.beneficiary)
-			<< endl;
+		for (auto const& beneficiary: record.second)
+			m_stateStream << "SELFDESTRUCT"
+				<< " BENEFICIARY "
+				<< m_host.convertFromEVMC(beneficiary)
+				<< endl;
 }
 
 void EVMHostPrinter::callRecords()
diff --git a/test/EVMHost.h b/test/EVMHost.h
index 4b1f6748a1..19bfe2a878 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -35,7 +35,7 @@
 namespace solidity::test
 {
 using Address = util::h160;
-using StorageMap = std::map<evmc::bytes32, evmc::storage_value>;
+using StorageMap = std::map<evmc::bytes32, evmc::StorageValue>;
 
 struct EVMPrecompileOutput {
 	bytes const output;
@@ -59,8 +59,8 @@ class EVMHost: public evmc::MockedHost
 	using MockedHost::access_storage;
 
 	// Modified features of MockedHost.
-	void selfdestruct(evmc::address const& _addr, evmc::address const& _beneficiary) noexcept final;
-	evmc::result call(evmc_message const& _message) noexcept final;
+	bool selfdestruct(evmc::address const& _addr, evmc::address const& _beneficiary) noexcept final;
+	evmc::Result call(evmc_message const& _message) noexcept final;
 	evmc::bytes32 get_block_hash(int64_t number) const noexcept final;
 
 	// Solidity testing specific features.
@@ -98,35 +98,34 @@ class EVMHost: public evmc::MockedHost
 	static util::h256 convertFromEVMC(evmc::bytes32 const& _data);
 	static evmc::bytes32 convertToEVMC(util::h256 const& _data);
 private:
-	evmc::address m_currentAddress = {};
-
 	/// Transfer value between accounts. Checks for sufficient balance.
 	void transfer(evmc::MockedAccount& _sender, evmc::MockedAccount& _recipient, u256 const& _value) noexcept;
 
 	/// Start a new transaction frame.
-	/// This will perform selfdestructs and clear account/storage access indicator for EIP-2929.
+	/// This will perform selfdestructs, apply storage status changes across all accounts,
+	/// and clear account/storage access indicator for EIP-2929.
 	void newTransactionFrame();
 
 	/// Records calls made via @param _message.
 	void recordCalls(evmc_message const& _message) noexcept;
 
-	static evmc::result precompileECRecover(evmc_message const& _message) noexcept;
-	static evmc::result precompileSha256(evmc_message const& _message) noexcept;
-	static evmc::result precompileRipeMD160(evmc_message const& _message) noexcept;
-	static evmc::result precompileIdentity(evmc_message const& _message) noexcept;
-	static evmc::result precompileModExp(evmc_message const& _message) noexcept;
+	static evmc::Result precompileECRecover(evmc_message const& _message) noexcept;
+	static evmc::Result precompileSha256(evmc_message const& _message) noexcept;
+	static evmc::Result precompileRipeMD160(evmc_message const& _message) noexcept;
+	static evmc::Result precompileIdentity(evmc_message const& _message) noexcept;
+	static evmc::Result precompileModExp(evmc_message const& _message) noexcept;
 	template <evmc_revision Revision>
-	static evmc::result precompileALTBN128G1Add(evmc_message const& _message) noexcept;
+	static evmc::Result precompileALTBN128G1Add(evmc_message const& _message) noexcept;
 	template <evmc_revision Revision>
-	static evmc::result precompileALTBN128G1Mul(evmc_message const& _message) noexcept;
+	static evmc::Result precompileALTBN128G1Mul(evmc_message const& _message) noexcept;
 	template <evmc_revision Revision>
-	static evmc::result precompileALTBN128PairingProduct(evmc_message const& _message) noexcept;
-	static evmc::result precompileGeneric(evmc_message const& _message, std::map<bytes, EVMPrecompileOutput> const& _inOut) noexcept;
+	static evmc::Result precompileALTBN128PairingProduct(evmc_message const& _message) noexcept;
+	static evmc::Result precompileGeneric(evmc_message const& _message, std::map<bytes, EVMPrecompileOutput> const& _inOut) noexcept;
 	/// @returns a result object with gas usage and result data taken from @a _data.
 	/// The outcome will be a failure if the limit < required.
 	/// @note The return value is only valid as long as @a _data is alive!
-	static evmc::result resultWithGas(int64_t gas_limit, int64_t gas_required, bytes const& _data) noexcept;
-	static evmc::result resultWithFailure() noexcept;
+	static evmc::Result resultWithGas(int64_t gas_limit, int64_t gas_required, bytes const& _data) noexcept;
+	static evmc::Result resultWithFailure() noexcept;
 
 	evmc::VM& m_vm;
 	/// EVM version requested by the testing tool
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index ff0838c09b..28701f4c0b 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -165,7 +165,7 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 			cout << " value: " << _value << endl;
 		cout << " in:      " << util::toHex(_data) << endl;
 	}
-	evmc_message message = {};
+	evmc_message message{};
 	message.input_data = _data.data();
 	message.input_size = _data.size();
 	message.sender = EVMHost::convertToEVMC(m_sender);
@@ -174,16 +174,19 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 	if (_isCreation)
 	{
 		message.kind = EVMC_CREATE;
-		message.destination = EVMHost::convertToEVMC(h160{});
+		message.recipient = {};
+		message.code_address = {};
 	}
 	else
 	{
 		message.kind = EVMC_CALL;
-		message.destination = EVMHost::convertToEVMC(m_contractAddress);
+		message.recipient = EVMHost::convertToEVMC(m_contractAddress);
+		message.code_address = message.recipient;
 	}
+
 	message.gas = InitialGas.convert_to<int64_t>();
 
-	evmc::result result = m_evmcHost->call(message);
+	evmc::Result result = m_evmcHost->call(message);
 
 	m_output = bytes(result.output_data, result.output_data + result.output_size);
 	if (_isCreation)
@@ -210,11 +213,12 @@ void ExecutionFramework::sendEther(h160 const& _addr, u256 const& _amount)
 		if (_amount > 0)
 			cout << " value: " << _amount << endl;
 	}
-	evmc_message message = {};
+	evmc_message message{};
 	message.sender = EVMHost::convertToEVMC(m_sender);
 	message.value = EVMHost::convertToEVMC(_amount);
 	message.kind = EVMC_CALL;
-	message.destination = EVMHost::convertToEVMC(_addr);
+	message.recipient = EVMHost::convertToEVMC(_addr);
+	message.code_address = message.recipient;
 	message.gas = InitialGas.convert_to<int64_t>();
 
 	m_evmcHost->call(message);
diff --git a/test/ExecutionFramework.h b/test/ExecutionFramework.h
index cbde0ac4e6..b397511428 100644
--- a/test/ExecutionFramework.h
+++ b/test/ExecutionFramework.h
@@ -272,7 +272,6 @@ class ExecutionFramework
 	}
 
 protected:
-	u256 const GasPrice = 10 * gwei;
 	u256 const InitialGas = 100000000;
 
 	void selectVM(evmc_capabilities _cap = evmc_capabilities::EVMC_CAPABILITY_EVM1);
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
index 884e35a8c0..d2d18bcf5e 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
@@ -83,31 +83,32 @@ evmc_message EvmoneUtility::initializeMessage(bytes const& _input)
 	return msg;
 }
 
-evmc::result EvmoneUtility::executeContract(
+evmc::Result EvmoneUtility::executeContract(
 	bytes const& _functionHash,
 	evmc_address _deployedAddress
 )
 {
 	evmc_message message = initializeMessage(_functionHash);
-	message.destination = _deployedAddress;
+	message.recipient = _deployedAddress;
+	message.code_address = _deployedAddress;
 	message.kind = EVMC_CALL;
 	return m_evmHost.call(message);
 }
 
-evmc::result EvmoneUtility::deployContract(bytes const& _code)
+evmc::Result EvmoneUtility::deployContract(bytes const& _code)
 {
 	evmc_message message = initializeMessage(_code);
 	message.kind = EVMC_CREATE;
 	return m_evmHost.call(message);
 }
 
-evmc::result EvmoneUtility::deployAndExecute(
+evmc::Result EvmoneUtility::deployAndExecute(
 	bytes const& _byteCode,
 	string const& _hexEncodedInput
 )
 {
 	// Deploy contract and signal failure if deploy failed
-	evmc::result createResult = deployContract(_byteCode);
+	evmc::Result createResult = deployContract(_byteCode);
 	solAssert(
 		createResult.status_code == EVMC_SUCCESS,
 		"SolidityEvmoneInterface: Contract creation failed"
@@ -115,7 +116,7 @@ evmc::result EvmoneUtility::deployAndExecute(
 
 	// Execute test function and signal failure if EVM reverted or
 	// did not return expected output on successful execution.
-	evmc::result callResult = executeContract(
+	evmc::Result callResult = executeContract(
 		util::fromHex(_hexEncodedInput),
 		createResult.create_address
 	);
@@ -128,7 +129,7 @@ evmc::result EvmoneUtility::deployAndExecute(
 	return callResult;
 }
 
-evmc::result EvmoneUtility::compileDeployAndExecute(string _fuzzIsabelle)
+evmc::Result EvmoneUtility::compileDeployAndExecute(string _fuzzIsabelle)
 {
 	map<string, h160> libraryAddressMap;
 	// Stage 1: Compile and deploy library if present.
@@ -139,7 +140,7 @@ evmc::result EvmoneUtility::compileDeployAndExecute(string _fuzzIsabelle)
 		solAssert(compilationOutput.has_value(), "Compiling library failed");
 		CompilerOutput cOutput = compilationOutput.value();
 		// Deploy contract and signal failure if deploy failed
-		evmc::result createResult = deployContract(cOutput.byteCode);
+		evmc::Result createResult = deployContract(cOutput.byteCode);
 		solAssert(
 			createResult.status_code == EVMC_SUCCESS,
 			"SolidityEvmoneInterface: Library deployment failed"
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.h b/test/tools/ossfuzz/SolidityEvmoneInterface.h
index d6826cb891..ea684ea723 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.h
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.h
@@ -122,7 +122,7 @@ class EvmoneUtility
 	/// and executing test configuration.
 	/// @param _isabelleData contains encoding data to be passed to the
 	/// isabelle test entry point.
-	evmc::result compileDeployAndExecute(std::string _isabelleData = {});
+	evmc::Result compileDeployAndExecute(std::string _isabelleData = {});
 	/// Compares the contents of the memory address pointed to
 	/// by `_result` of `_length` bytes to u256 zero.
 	/// @returns true if `_result` is zero, false
@@ -138,17 +138,17 @@ class EvmoneUtility
 	/// @returns the result of the execution of the function whose
 	/// keccak256 hash is @param _functionHash that is deployed at
 	/// @param _deployedAddress in @param _hostContext.
-	evmc::result executeContract(
+	evmc::Result executeContract(
 		bytes const& _functionHash,
 		evmc_address _deployedAddress
 	);
 	/// @returns the result of deployment of @param _code on @param _hostContext.
-	evmc::result deployContract(bytes const& _code);
+	evmc::Result deployContract(bytes const& _code);
 	/// Deploys and executes EVM byte code in @param _byteCode on
 	/// EVM Host referenced by @param _hostContext. Input passed
 	/// to execution context is @param _hexEncodedInput.
 	/// @returns result returning by @param _hostContext.
-	evmc::result deployAndExecute(
+	evmc::Result deployAndExecute(
 		bytes const& _byteCode,
 		std::string const& _hexEncodedInput
 	);
diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
index 5d29637c03..10ce76f482 100644
--- a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
+++ b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
@@ -87,11 +87,11 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		return;
 	}
 
-	evmc::result deployResult = YulEvmoneUtility{}.deployCode(unoptimisedByteCode, hostContext);
+	evmc::Result deployResult = YulEvmoneUtility{}.deployCode(unoptimisedByteCode, hostContext);
 	if (deployResult.status_code != EVMC_SUCCESS)
 		return;
 	auto callMessage = YulEvmoneUtility{}.callMessage(deployResult.create_address);
-	evmc::result callResult = hostContext.call(callMessage);
+	evmc::Result callResult = hostContext.call(callMessage);
 	// If the fuzzer synthesized input does not contain the revert opcode which
 	// we lazily check by string find, the EVM call should not revert.
 	bool noRevertInSource = yul_source.find("revert") == string::npos;
@@ -132,13 +132,13 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 
 	// Reset host before running optimised code.
 	hostContext.reset();
-	evmc::result deployResultOpt = YulEvmoneUtility{}.deployCode(optimisedByteCode, hostContext);
+	evmc::Result deployResultOpt = YulEvmoneUtility{}.deployCode(optimisedByteCode, hostContext);
 	solAssert(
 		deployResultOpt.status_code == EVMC_SUCCESS,
 		"Evmone: Optimized contract creation failed"
 	);
 	auto callMessageOpt = YulEvmoneUtility{}.callMessage(deployResultOpt.create_address);
-	evmc::result callResultOpt = hostContext.call(callMessageOpt);
+	evmc::Result callResultOpt = hostContext.call(callMessageOpt);
 	if (noRevertInSource)
 		solAssert(
 			callResultOpt.status_code != EVMC_REVERT,
diff --git a/test/tools/ossfuzz/YulEvmoneInterface.cpp b/test/tools/ossfuzz/YulEvmoneInterface.cpp
index 2d7ddccc18..f3a9f74453 100644
--- a/test/tools/ossfuzz/YulEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/YulEvmoneInterface.cpp
@@ -38,7 +38,7 @@ bytes YulAssembler::assemble()
 	return m_stack.assemble(YulStack::Machine::EVM).bytecode->bytecode;
 }
 
-evmc::result YulEvmoneUtility::deployCode(bytes const& _input, EVMHost& _host)
+evmc::Result YulEvmoneUtility::deployCode(bytes const& _input, EVMHost& _host)
 {
 	// Zero initialize all message fields
 	evmc_message msg = {};
@@ -74,7 +74,8 @@ evmc_message YulEvmoneUtility::callMessage(evmc_address _address)
 {
 	evmc_message call = {};
 	call.gas = std::numeric_limits<int64_t>::max();
-	call.destination = _address;
+	call.recipient = _address;
+	call.code_address = _address;
 	call.kind = EVMC_CALL;
 	return call;
 }
diff --git a/test/tools/ossfuzz/YulEvmoneInterface.h b/test/tools/ossfuzz/YulEvmoneInterface.h
index 709e5475f0..a875eeb817 100644
--- a/test/tools/ossfuzz/YulEvmoneInterface.h
+++ b/test/tools/ossfuzz/YulEvmoneInterface.h
@@ -54,7 +54,7 @@ class YulAssembler
 struct YulEvmoneUtility
 {
 	/// @returns the result of deploying bytecode @param _input on @param _host.
-	static evmc::result deployCode(solidity::bytes const& _input, EVMHost& _host);
+	static evmc::Result deployCode(solidity::bytes const& _input, EVMHost& _host);
 	/// @returns call message to be sent to @param _address.
 	static evmc_message callMessage(evmc_address _address);
 	/// @returns true if call result indicates a serious error, false otherwise.

From b49008af9e47c2effe72483bde5cda1ec4a5e719 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 16 Sep 2022 13:04:12 +0200
Subject: [PATCH 1019/1748] Support EVMC_PARIS with randao from merge block

---
 test/EVMHost.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 541110f3ba..21c7a58ed2 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -122,10 +122,15 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 		m_evmRevision = EVMC_BERLIN;
 	else if (_evmVersion == langutil::EVMVersion::london())
 		m_evmRevision = EVMC_LONDON;
+	// TODO: support EVMVersion::paris()
 	else
 		assertThrow(false, Exception, "Unsupported EVM version");
 
-	tx_context.block_prev_randao = evmc::uint256be{200000000}; // TODO: should make it >2**64 for >Paris
+	if (m_evmRevision >= EVMC_PARIS)
+		// This is the value from the merge block.
+		tx_context.block_prev_randao = 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777_bytes32;
+	else
+		tx_context.block_prev_randao = evmc::uint256be{200000000};
 	tx_context.block_gas_limit = 20000000;
 	tx_context.block_coinbase = 0x7878787878787878787878787878787878787878_address;
 	tx_context.tx_gas_price = evmc::uint256be{3000000000};

From 47ed36e0dbc728328b7b799805a4e49abb4ff461 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 16 Sep 2022 13:41:53 +0200
Subject: [PATCH 1020/1748] Upgrade CI and download instructions to evmone
 0.9.1 and hera 0.6.0

---
 .circleci/config.yml                  | 12 ++++++------
 .circleci/osx_install_dependencies.sh |  8 ++++----
 scripts/install_evmone.ps1            |  2 +-
 test/Common.h                         | 12 ++++++------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 66c04a6546..d4349614bf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,16 +9,16 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-14
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d1ef23849db4c5462b248d89c111da4009b153cbd5002cb8755b0580312be581"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-15
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e4f83457bf1d6475c3189e9013da77289793a5ecd6a0e15dbec9411880b11e22"
   ubuntu-2004-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-14
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:beb8c91998ec0df99a488900b3723a06f1122f0954fc73786b6c53fd73a6408d"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-15
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8dda4fdae312f840fbb4e25b9ef01ad3209e9014e49e4564ab0f0d2510225131"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-19
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8c9bf1813c261d781f4c65fceed2dfb3ecf5be9ecf49bddbd250b570a7f3baea"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-20
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7b3ccaed3b5d37dc2cc4bbe1a1e40949266292dcdbc3ad015271ab4e5e6f5038"
   emscripten-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:emscripten-13
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 766091fdf1..c87f08f294 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -74,18 +74,18 @@ then
   rm -r "$z3_dir"
 
   # evmone
-  evmone_version="0.8.0"
+  evmone_version="0.9.1"
   evmone_package="evmone-${evmone_version}-darwin-x86_64.tar.gz"
   wget "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/${evmone_package}"
-  validate_checksum "$evmone_package" e8efef478822f0ed6d0493e89004181e895893f93963152a2a81589acc3a0828
+  validate_checksum "$evmone_package" 70420a893a9b1036fcb63526b806d97658db8c373bcab1c3e8382594dc8593e4
   tar xzpf "$evmone_package" -C /usr/local
   rm "$evmone_package"
 
   # hera
-  hera_version="0.5.0"
+  hera_version="0.6.0"
   hera_package="hera-${hera_version}-darwin-x86_64.tar.gz"
   wget "https://github.com/ewasm/hera/releases/download/v${hera_version}/${hera_package}"
-  validate_checksum "$hera_package" 190050d7ace384ecd79ec1b1f607a9ff40e196b4eec75932958d4814d221d059
+  validate_checksum "$hera_package" 82ee57404862705ab314f7a4d04bf2cf29d71e8d209850d66c125527cd287f37
   tar xzpf "$hera_package" -C /usr/local
   rm "$hera_package"
 fi
diff --git a/scripts/install_evmone.ps1 b/scripts/install_evmone.ps1
index ace3e57519..70c38e815b 100644
--- a/scripts/install_evmone.ps1
+++ b/scripts/install_evmone.ps1
@@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop"
 # Needed for Invoke-WebRequest to work via CI.
 $progressPreference = "silentlyContinue"
 
-Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.8.0/evmone-0.8.0-windows-amd64.zip" -OutFile "evmone.zip"
+Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-windows-amd64.zip" -OutFile "evmone.zip"
 tar -xf evmone.zip "bin/evmone.dll"
 mkdir deps
 mv bin/evmone.dll deps
diff --git a/test/Common.h b/test/Common.h
index bd76cd0df7..d428e02616 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -33,19 +33,19 @@ namespace solidity::test
 
 #ifdef _WIN32
 static constexpr auto evmoneFilename = "evmone.dll";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.8.0/evmone-0.8.0-windows-amd64.zip";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-windows-amd64.zip";
 static constexpr auto heraFilename = "hera.dll";
-static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/archive/v0.3.2-evmc8.tar.gz";
+static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/archive/v0.6.0.tar.gz";
 #elif defined(__APPLE__)
 static constexpr auto evmoneFilename = "libevmone.dylib";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.8.0/evmone-0.8.0-darwin-x86_64.tar.gz";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-darwin-x86_64.tar.gz";
 static constexpr auto heraFilename = "libhera.dylib";
-static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.5.0/hera-0.5.0-darwin-x86_64.tar.gz";
+static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.6.0/hera-0.6.0-darwin-x86_64.tar.gz";
 #else
 static constexpr auto evmoneFilename = "libevmone.so";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.8.0/evmone-0.8.0-linux-x86_64.tar.gz";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-linux-x86_64.tar.gz";
 static constexpr auto heraFilename = "libhera.so";
-static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.5.0/hera-0.5.0-linux-x86_64.tar.gz";
+static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.6.0/hera-0.6.0-linux-x86_64.tar.gz";
 #endif
 
 struct ConfigException: public util::Exception {};

From 4e035c41b65d8eeb671111e851a11e9943a1c23b Mon Sep 17 00:00:00 2001
From: andy53 <andy@evilrobots.club>
Date: Mon, 24 Oct 2022 14:03:22 -0600
Subject: [PATCH 1021/1748] update using-the-compiler.rst with details of
 optimizer cleanup sequence

Removed duplicate lines and clarified the wording.

Removed trailing whitespace.

Update docs/using-the-compiler.rst

Co-authored-by: matheusaaguiar <95899911+matheusaaguiar@users.noreply.github.com>

Clarified behaviors.

Updated text to meet suggestions.
---
 docs/using-the-compiler.rst | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index cf5e1b7688..b9ecc60ab0 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -287,8 +287,18 @@ Input Description
               // Improve allocation of stack slots for variables, can free up stack slots early.
               // Activated by default if the Yul optimizer is activated.
               "stackAllocation": true,
-              // Select optimization steps to be applied.
-              // Optional, the optimizer will use the default sequence if omitted.
+              // Select optimization steps to be applied. It is also possible to modify both the
+              // optimization sequence and the clean-up sequence. Instructions for each sequence
+              // are separated with the ":" delimiter and the values are provided in the form of
+              // optimization-sequence:clean-up-sequence. For more information see
+              // "The Optimizer > Selecting Optimizations".
+              // This field is optional, and if not provided, the default sequences for both
+              // optimization and clean-up are used. If only one of the options is provivded
+              // the other will not be run.
+              // If only the delimiter ":" is provided then neither the optimization nor the clean-up
+              // sequence will be run.
+              // If set to an empty value, only the default clean-up sequence is used and
+              // no optimization steps are applied.
               "optimizerSteps": "dhfoDgvulfnTUtnIf..."
             }
           }

From 1e5c229a37ef91784552e776707e40bd9e2aedd4 Mon Sep 17 00:00:00 2001
From: andy53 <andy@evilrobots.club>
Date: Tue, 25 Oct 2022 20:15:18 -0600
Subject: [PATCH 1022/1748] update value-types.rst

---
 docs/types/value-types.rst | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index cfec894a9a..8048eea58c 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -770,6 +770,16 @@ confusing, but in essence, if a function is ``payable``, this means that it
 also accepts a payment of zero Ether, so it also is ``non-payable``.
 On the other hand, a ``non-payable`` function will reject Ether sent to it,
 so ``non-payable`` functions cannot be converted to ``payable`` functions.
+To clarify, rejecting ether is more restrictive than not rejecting ether.
+This means you can override a payable function with a non-payable but not the
+other way around.
+
+Additionally, When you define a ``non-payable`` function pointer,
+the compiler does not enforce that the pointed function will actually reject ether.
+Instead, it enforces that the function pointer is never used to send ether.
+Which makes it possible to assign a ``payable`` function pointer to a ``non-payable``
+function pointer ensuring both types behave the same way, i.e, both cannot be used
+to send ether.
 
 If a function type variable is not initialised, calling it results
 in a :ref:`Panic error<assert-and-require>`. The same happens if you call a function after using ``delete``

From efbd3666a72b3664c6b5838554c00072934f77fd Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Thu, 15 Sep 2022 15:49:18 +0530
Subject: [PATCH 1023/1748] added optimization. shl comes out from being
 distributed over and

---
 libevmasm/RuleList.h                          | 11 ++++++--
 test/formal/and_distributed_over_shl.py       | 25 +++++++++++++++++++
 .../struct/struct_storage_ptr.sol             |  2 +-
 .../arrays_complex_from_and_to_storage.sol    |  2 +-
 .../array/byte_array_transitional_2.sol       |  2 +-
 .../copying/array_copy_cleanup_uint40.sol     |  2 +-
 ...ay_copy_storage_storage_different_base.sol |  2 +-
 ..._storage_storage_different_base_nested.sol |  2 +-
 ...y_copy_storage_storage_dynamic_dynamic.sol |  2 +-
 .../array_copy_storage_to_memory_nested.sol   |  2 +-
 .../copying/array_copy_target_leftover.sol    |  2 +-
 .../copying/array_copy_target_simple.sol      |  2 +-
 .../copying/array_copy_target_simple_2.sol    |  2 +-
 ...ts_containing_arrays_memory_to_storage.sol |  2 +-
 ...nup_during_multi_element_per_slot_copy.sol |  2 +-
 .../copying/storage_memory_packed_dyn.sol     |  2 +-
 .../array/delete/bytes_delete_element.sol     |  2 +-
 .../array/dynamic_array_cleanup.sol           |  2 +-
 .../array/dynamic_multi_array_cleanup.sol     |  2 +-
 .../array/pop/array_pop_uint16_transition.sol |  2 +-
 .../array/pop/array_pop_uint24_transition.sol |  2 +-
 .../array/pop/byte_array_pop_copy_long.sol    |  2 +-
 .../pop/byte_array_pop_long_storage_empty.sol |  2 +-
 ...ray_pop_long_storage_empty_garbage_ref.sol |  2 +-
 .../array/pop/byte_array_pop_masking_long.sol |  2 +-
 .../semanticTests/array/push/array_push.sol   |  2 +-
 .../array/push/byte_array_push_transition.sol |  2 +-
 .../array/push/push_no_args_2d.sol            |  4 +--
 .../array/push/push_no_args_bytes.sol         |  2 +-
 .../event_dynamic_nested_array_storage_v2.sol |  2 +-
 .../events/event_indexed_string.sol           |  2 +-
 ...truct_delete_storage_with_arrays_small.sol |  2 +-
 .../various/destructuring_assignment.sol      |  2 +-
 .../viaYul/array_storage_index_access.sol     | 18 ++++++-------
 .../array_storage_index_zeroed_test.sol       |  8 +++---
 .../optimize_shl_over_and.yul                 | 15 +++++++++++
 36 files changed, 94 insertions(+), 47 deletions(-)
 create mode 100644 test/formal/and_distributed_over_shl.py
 create mode 100644 test/libyul/yulOptimizerTests/expressionSimplifier/optimize_shl_over_and.yul

diff --git a/libevmasm/RuleList.h b/libevmasm/RuleList.h
index 9b20d0f8be..34fe4992db 100644
--- a/libevmasm/RuleList.h
+++ b/libevmasm/RuleList.h
@@ -440,7 +440,8 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleListPart7(
 	Pattern B,
 	Pattern,
 	Pattern X,
-	Pattern Y
+	Pattern Y,
+	Pattern Z
 )
 {
 	using Word = typename Pattern::Word;
@@ -629,6 +630,12 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleListPart7(
 		feasibilityFunction
 	});
 
+	rules.push_back({
+		// AND(SHL(Z, X), SHL(Z, Y)) -> SHL(Z, AND(X, Y))
+		Builtins::AND(Builtins::SHL(Z, X), Builtins::SHL(Z, Y)),
+		[=]() -> Pattern { return Builtins::SHL(Z, Builtins::AND(X, Y)); }
+	});
+
 	rules.push_back({
 		Builtins::BYTE(A, Builtins::SHL(B, X)),
 		[=]() -> Pattern { return Builtins::BYTE(A.d() + B.d() / 8, X); },
@@ -823,7 +830,7 @@ std::vector<SimplificationRule<Pattern>> simplificationRuleList(
 	rules += simplificationRuleListPart4_5(A, B, C, W, X);
 	rules += simplificationRuleListPart5(_evmVersion.has_value(), A, B, C, W, X);
 	rules += simplificationRuleListPart6(A, B, C, W, X);
-	rules += simplificationRuleListPart7(A, B, C, W, X);
+	rules += simplificationRuleListPart7(A, B, C, W, X, Y);
 	rules += simplificationRuleListPart8(A, B, C, W, X);
 
 	if (_evmVersion.has_value())
diff --git a/test/formal/and_distributed_over_shl.py b/test/formal/and_distributed_over_shl.py
new file mode 100644
index 0000000000..ba1b379cf0
--- /dev/null
+++ b/test/formal/and_distributed_over_shl.py
@@ -0,0 +1,25 @@
+from opcodes import AND, SHL
+from rule import Rule
+from z3 import BitVec
+
+"""
+Rule:
+AND(SHL(Z,X), SHL(Z,Y)) -> SHL(Z, AND(X,Y))
+"""
+
+rule = Rule()
+
+n_bits = 128
+
+# Input vars
+X = BitVec('X', n_bits)
+Y = BitVec('Y', n_bits)
+Z = BitVec('Z', n_bits)
+
+# Non optimized result
+nonopt = AND(SHL(Z,X), SHL(Z,Y))
+
+# Optimized result
+opt = SHL(Z, AND(X,Y))
+
+rule.check(nonopt, opt)
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index a6d601412c..fa62b4f777 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -24,6 +24,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 166525
+// gas irOptimized: 166513
 // gas legacy: 169347
 // gas legacyOptimized: 167269
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index 17243226fd..ed54d0279f 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -12,7 +12,7 @@ contract Test {
 }
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 186766
+// gas irOptimized: 186550
 // gas legacy: 211149
 // gas legacyOptimized: 206054
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index fad9647ec1..5fdaca65b1 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 157200
+// gas irOptimized: 157188
 // gas legacy: 188576
 // gas legacyOptimized: 183333
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
index 915c0aeed9..a6f805d005 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> true
-// gas irOptimized: 146936
+// gas irOptimized: 146756
 // gas legacy: 155961
 // gas legacyOptimized: 153588
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
index a0e600d1a6..92d750a6ef 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4
-// gas irOptimized: 225027
+// gas irOptimized: 224973
 // gas legacy: 233801
 // gas legacyOptimized: 232816
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
index 85a2f1905a..ad7c080195 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -23,6 +23,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 3, 4
-// gas irOptimized: 189690
+// gas irOptimized: 189516
 // gas legacy: 215253
 // gas legacyOptimized: 212341
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
index c9ae2c0e63..6910fa80a6 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
@@ -18,6 +18,6 @@ contract c {
 
 // ----
 // test() -> 5, 4
-// gas irOptimized: 272950
+// gas irOptimized: 272893
 // gas legacy: 270834
 // gas legacyOptimized: 269960
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
index 0aa448e98a..27f1a6aa07 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
@@ -15,6 +15,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
-// gas irOptimized: 161777
+// gas irOptimized: 161735
 // gas legacy: 162278
 // gas legacyOptimized: 159955
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index f2d02ee578..0a4ac31da3 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -19,6 +19,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 124910
+// gas irOptimized: 124640
 // gas legacy: 187414
 // gas legacyOptimized: 165659
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index 5c01bf2199..bc89a904a2 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -21,6 +21,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
-// gas irOptimized: 293621
+// gas irOptimized: 293486
 // gas legacy: 303626
 // gas legacyOptimized: 301945
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index 89e30b0d42..554d6b8200 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -21,6 +21,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
-// gas irOptimized: 273177
+// gas irOptimized: 273093
 // gas legacy: 276360
 // gas legacyOptimized: 275411
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
index 6701862b20..0314610563 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 3, 3, 3, 1
-// gas irOptimized: 182237
+// gas irOptimized: 181997
diff --git a/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
index 999d49eaad..c2dda730d6 100644
--- a/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
+++ b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
@@ -16,7 +16,7 @@ contract C {
 }
 // ----
 // constructor()
-// gas irOptimized: 237351
+// gas irOptimized: 236265
 // gas legacy: 221315
 // gas legacyOptimized: 185247
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index 7f3bf1798a..8fed11241a 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 2, 3, 4
-// gas irOptimized: 110135
+// gas irOptimized: 109838
 // gas legacy: 126350
 // gas legacyOptimized: 120704
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index 652854cb8f..9aadf0db04 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test1() -> true
-// gas irOptimized: 207928
+// gas irOptimized: 206428
 // gas legacy: 254905
 // gas legacyOptimized: 247415
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index 342d98a11f..9d1b02b22d 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -14,7 +14,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 519487
+// gas irOptimized: 519361
 // gas legacy: 521584
 // gas legacyOptimized: 517027
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
index 2e5d032d3e..90957b0ddc 100644
--- a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
@@ -16,7 +16,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() -> 8
-// gas irOptimized: 123024
+// gas irOptimized: 123012
 // gas legacy: 121756
 // gas legacyOptimized: 120687
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index 1b15ef84da..93075959d5 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 38, 28, 18
-// gas irOptimized: 186370
+// gas irOptimized: 185650
 // gas legacy: 189492
 // gas legacyOptimized: 178318
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index ac52c4dafd..fbfca89d94 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 20, 10
-// gas irOptimized: 158020
+// gas irOptimized: 157570
 // gas legacy: 159279
 // gas legacyOptimized: 152937
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index 931069deec..a5332cfd78 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -10,6 +10,6 @@ contract c {
 
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
-// gas irOptimized: 109310
+// gas irOptimized: 109301
 // gas legacy: 126702
 // gas legacyOptimized: 123422
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index 3d25e354d3..2bebf21c69 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -16,7 +16,7 @@ contract c {
 }
 // ----
 // test() -> true
-// gas irOptimized: 176111
+// gas irOptimized: 175619
 // gas legacy: 224093
 // gas legacyOptimized: 205152
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index ccb4de6e1c..42a91e7ed3 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -15,7 +15,7 @@ contract c {
 }
 // ----
 // test() ->
-// gas irOptimized: 142636
+// gas irOptimized: 142528
 // gas legacy: 164430
 // gas legacyOptimized: 158513
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index 9f3884dae8..095109a186 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -10,6 +10,6 @@ contract c {
 
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 108115
+// gas irOptimized: 108097
 // gas legacy: 125584
 // gas legacyOptimized: 122560
diff --git a/test/libsolidity/semanticTests/array/push/array_push.sol b/test/libsolidity/semanticTests/array/push/array_push.sol
index e608c6bc12..18f20c021a 100644
--- a/test/libsolidity/semanticTests/array/push/array_push.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4, 3, 3
-// gas irOptimized: 111448
+// gas irOptimized: 111406
 // gas legacy: 111838
 // gas legacyOptimized: 111128
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 896fa47d48..119e4ca289 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -15,6 +15,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 174126
+// gas irOptimized: 173456
 // gas legacy: 216790
 // gas legacyOptimized: 204003
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index c85d92a476..4938e6e455 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -27,14 +27,14 @@ contract C {
 // ----
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
-// gas irOptimized: 112476
+// gas irOptimized: 112470
 // gas legacy: 108105
 // gas legacyOptimized: 101987
 // l() -> 1
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
-// gas irOptimized: 119064
+// gas irOptimized: 119058
 // gas legacy: 110325
 // gas legacyOptimized: 96331
 // l() -> 2
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 6027558455..dae522e579 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -21,7 +21,7 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 183584
+// gas irOptimized: 182534
 // gas legacy: 183811
 // gas legacyOptimized: 179218
 // l() -> 70
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
index a625e3de33..442a5299ad 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
@@ -15,6 +15,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
-// gas irOptimized: 185142
+// gas irOptimized: 185118
 // gas legacy: 187603
 // gas legacyOptimized: 184566
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index 08dd7ce66e..aeaf20c75b 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -17,6 +17,6 @@ contract C {
 // ----
 // deposit() ->
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
-// gas irOptimized: 333476
+// gas irOptimized: 332396
 // gas legacy: 388679
 // gas legacyOptimized: 374441
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
index d07d14dd67..2345fea3cf 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_arrays_small.sol
@@ -27,4 +27,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 0
-// gas irOptimized: 111594
+// gas irOptimized: 111570
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 4581cb2f20..59b468fce2 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -34,6 +34,6 @@ contract C {
 
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 241890
+// gas irOptimized: 241872
 // gas legacy: 243341
 // gas legacyOptimized: 242454
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index 7df79912ae..a0987895c0 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -16,38 +16,38 @@ contract C {
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
-// gas irOptimized: 3021484
+// gas irOptimized: 3020710
 // gas legacy: 3071683
 // gas legacyOptimized: 3014415
 // test_indices(uint256): 5 ->
-// gas irOptimized: 722540
+// gas irOptimized: 722510
 // gas legacy: 719151
 // gas legacyOptimized: 716139
 // test_indices(uint256): 10 ->
-// gas irOptimized: 158407
+// gas irOptimized: 158347
 // gas legacy: 162657
 // gas legacyOptimized: 158422
 // test_indices(uint256): 15 ->
-// gas irOptimized: 173467
+// gas irOptimized: 173377
 // gas legacy: 179782
 // gas legacyOptimized: 173727
 // test_indices(uint256): 0xFF ->
-// gas irOptimized: 5681652
+// gas irOptimized: 5680122
 // gas legacy: 5780977
 // gas legacyOptimized: 5668997
 // test_indices(uint256): 1000 ->
-// gas irOptimized: 18208919
+// gas irOptimized: 18202919
 // gas legacy: 18602799
 // gas legacyOptimized: 18179744
 // test_indices(uint256): 129 ->
-// gas irOptimized: 5198552
+// gas irOptimized: 5197778
 // gas legacy: 5212013
 // gas legacyOptimized: 5157889
 // test_indices(uint256): 128 ->
-// gas irOptimized: 417500
+// gas irOptimized: 416732
 // gas legacy: 470568
 // gas legacyOptimized: 423768
 // test_indices(uint256): 1 ->
-// gas irOptimized: 726968
+// gas irOptimized: 726962
 // gas legacy: 721789
 // gas legacyOptimized: 720209
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index 3eb553fe90..8b90995d3c 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 165074
+// gas irOptimized: 165044
 // gas legacy: 166201
 // gas legacyOptimized: 163439
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 282677
+// gas irOptimized: 282617
 // gas legacy: 285088
 // gas legacyOptimized: 280012
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 405422
+// gas irOptimized: 405332
 // gas legacy: 409138
 // gas legacyOptimized: 401827
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 6404812
+// gas irOptimized: 6403282
 // gas legacy: 6466233
 // gas legacyOptimized: 6333077
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/optimize_shl_over_and.yul b/test/libyul/yulOptimizerTests/expressionSimplifier/optimize_shl_over_and.yul
new file mode 100644
index 0000000000..27d1845f56
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/optimize_shl_over_and.yul
@@ -0,0 +1,15 @@
+{
+    let x := calldataload(0)
+    let a := and(shl(x, 248), shl(x, 12))
+    sstore(10, a)
+}
+// ====
+// EVMVersion: >byzantium
+// ----
+// step: expressionSimplifier
+//
+// {
+//     {
+//         sstore(10, shl(calldataload(0), 8))
+//     }
+// }

From 149303d02dc516b1c89b5fc3baef198a32b2718b Mon Sep 17 00:00:00 2001
From: nishant-sachdeva <nishant.sachdeva@research.iiit.ac.in>
Date: Fri, 11 Nov 2022 02:19:16 +0530
Subject: [PATCH 1024/1748] added changelog entry for optimizer

---
 Changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Changelog.md b/Changelog.md
index 882f77b60e..99177776ea 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ Compiler Features:
  * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
  * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
  * Language Server: Add basic document hover support.
+ * Optimizer: Added optimization rule ``and(shl(X, Y), shl(X, Z)) => shl(X, and(Y, Z))``.
 
 
 Bugfixes:

From 5a35c50d1690a170953cb1ea7b22f8ec4d555b98 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 9 Nov 2022 00:30:46 +0100
Subject: [PATCH 1025/1748] test: Support tracking gas refunds

---
 test/ExecutionFramework.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index 28701f4c0b..0b7c6ea80c 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -192,14 +192,21 @@ void ExecutionFramework::sendMessage(bytes const& _data, bool _isCreation, u256
 	if (_isCreation)
 		m_contractAddress = EVMHost::convertFromEVMC(result.create_address);
 
-	m_gasUsed = InitialGas - result.gas_left;
+	unsigned const refundRatio = (m_evmVersion >= langutil::EVMVersion::london() ? 5 : 2);
+	auto const totalGasUsed = InitialGas - result.gas_left;
+	auto const gasRefund = min(u256(result.gas_refund), totalGasUsed / refundRatio);
+
+	m_gasUsed = totalGasUsed - gasRefund;
 	m_transactionSuccessful = (result.status_code == EVMC_SUCCESS);
 
 	if (m_showMessages)
 	{
-		cout << " out:     " << util::toHex(m_output) << endl;
-		cout << " result: " << static_cast<size_t>(result.status_code) << endl;
-		cout << " gas used: " << m_gasUsed.str() << endl;
+		cout << " out:                       " << util::toHex(m_output) << endl;
+		cout << " result:                    " << static_cast<size_t>(result.status_code) << endl;
+		cout << " gas used:                  " << m_gasUsed.str() << endl;
+		cout << " gas used (without refund): " << totalGasUsed.str() << endl;
+		cout << " gas refund (total):        " << result.gas_refund << endl;
+		cout << " gas refund (bound):        " << gasRefund.str() << endl;
 	}
 }
 

From 0f65e17b7baa5356d254e93320383f71038ac810 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 9 Nov 2022 10:20:37 +0100
Subject: [PATCH 1026/1748] Update tests

---
 .../array/byte_array_storage_layout.sol       |  4 ++--
 .../array/byte_array_transitional_2.sol       |  6 ++---
 .../copying/array_copy_cleanup_uint40.sol     |  6 ++---
 .../copying/array_copy_clear_storage.sol      |  6 ++---
 .../copying/array_copy_including_array.sol    | 12 +++++-----
 ...ay_copy_storage_storage_different_base.sol |  6 ++---
 ..._storage_storage_different_base_nested.sol |  6 ++---
 ...y_copy_storage_storage_dynamic_dynamic.sol |  6 ++---
 ...ray_copy_storage_storage_static_static.sol |  6 ++---
 .../array_copy_storage_storage_struct.sol     |  6 ++---
 .../copying/array_copy_target_leftover.sol    |  6 ++---
 .../copying/array_copy_target_simple.sol      |  6 ++---
 .../copying/array_copy_target_simple_2.sol    |  6 ++---
 .../array_nested_memory_to_storage.sol        |  6 ++---
 .../copy_byte_array_in_struct_to_storage.sol  |  6 ++---
 .../copying/copy_byte_array_to_storage.sol    |  6 ++---
 .../function_type_array_to_storage.sol        |  6 ++---
 .../array/pop/array_pop_array_transition.sol  |  6 ++---
 .../array/pop/array_pop_uint16_transition.sol |  6 ++---
 .../array/pop/array_pop_uint24_transition.sol |  6 ++---
 .../array/pop/byte_array_pop_copy_long.sol    |  4 ++--
 .../pop/byte_array_pop_long_storage_empty.sol |  6 ++---
 ...ray_pop_long_storage_empty_garbage_ref.sol |  6 ++---
 .../struct_delete_storage_with_array.sol      | 12 +++++-----
 .../viaYul/array_storage_index_access.sol     | 24 +++++++++----------
 .../array_storage_index_zeroed_test.sol       | 24 +++++++++----------
 .../viaYul/array_storage_push_pop.sol         | 12 +++++-----
 27 files changed, 106 insertions(+), 106 deletions(-)

diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
index 8c899d218c..bb1e904f0f 100644
--- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
@@ -46,8 +46,8 @@ contract c {
 // storageEmpty -> 0
 // test_long() -> 67
 // gas irOptimized: 89148
-// gas legacy: 108639
-// gas legacyOptimized: 106093
+// gas legacy: 105839
+// gas legacyOptimized: 103293
 // storageEmpty -> 0
 // test_pop() -> 1780731860627700044960722568376592200742329637303199754547598369979433020
 // gas legacy: 61930
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index 5fdaca65b1..2165483ec4 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 157188
-// gas legacy: 188576
-// gas legacyOptimized: 183333
+// gas irOptimized: 125751
+// gas legacy: 150861
+// gas legacyOptimized: 146667
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
index a6f805d005..88506585e7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> true
-// gas irOptimized: 146756
-// gas legacy: 155961
-// gas legacyOptimized: 153588
+// gas irOptimized: 117405
+// gas legacy: 124769
+// gas legacyOptimized: 122871
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
index 416b489684..27f6873607 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 0
-// gas irOptimized: 134365
-// gas legacy: 135313
-// gas legacyOptimized: 134548
+// gas irOptimized: 107492
+// gas legacy: 108251
+// gas legacyOptimized: 107639
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index 6d3da418d0..1599f0d352 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -35,12 +35,12 @@ contract c {
 }
 // ----
 // test() -> 0x02000202
-// gas irOptimized: 4649835
-// gas legacy: 4578446
-// gas legacyOptimized: 4548309
+// gas irOptimized: 4550335
+// gas legacy: 4478946
+// gas legacyOptimized: 4448809
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4517023
-// gas legacy: 4450548
-// gas legacyOptimized: 4422289
+// gas irOptimized: 4477223
+// gas legacy: 4410748
+// gas legacyOptimized: 4382489
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
index 92d750a6ef..ed8e2746eb 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4
-// gas irOptimized: 224973
-// gas legacy: 233801
-// gas legacyOptimized: 232816
+// gas irOptimized: 205073
+// gas legacy: 213901
+// gas legacyOptimized: 212916
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
index ad7c080195..960343916d 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -23,6 +23,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 3, 4
-// gas irOptimized: 189516
-// gas legacy: 215253
-// gas legacyOptimized: 212341
+// gas irOptimized: 169616
+// gas legacy: 175453
+// gas legacyOptimized: 172541
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
index 6910fa80a6..749b70417a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
@@ -18,6 +18,6 @@ contract c {
 
 // ----
 // test() -> 5, 4
-// gas irOptimized: 272893
-// gas legacy: 270834
-// gas legacyOptimized: 269960
+// gas irOptimized: 252993
+// gas legacy: 250934
+// gas legacyOptimized: 250060
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
index 8f6dd822df..3f74616c25 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
@@ -17,6 +17,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 8, 0
-// gas irOptimized: 236079
-// gas legacy: 234695
-// gas legacyOptimized: 234103
+// gas irOptimized: 196279
+// gas legacy: 194895
+// gas legacyOptimized: 194303
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
index 3fc10b7a27..c42b679988 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
@@ -17,7 +17,7 @@ contract c {
 }
 // ----
 // test() -> 4, 5
-// gas irOptimized: 238623
-// gas legacy: 238736
-// gas legacyOptimized: 237159
+// gas irOptimized: 190899
+// gas legacy: 190989
+// gas legacyOptimized: 189728
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index 0a4ac31da3..fa73987bf9 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -19,6 +19,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 124640
-// gas legacy: 187414
-// gas legacyOptimized: 165659
+// gas irOptimized: 104740
+// gas legacy: 167514
+// gas legacyOptimized: 145759
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index bc89a904a2..fb0e49b478 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -21,6 +21,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
-// gas irOptimized: 293486
-// gas legacy: 303626
-// gas legacyOptimized: 301945
+// gas irOptimized: 273586
+// gas legacy: 283726
+// gas legacyOptimized: 282045
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index 554d6b8200..c4ffe543f8 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -21,6 +21,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
-// gas irOptimized: 273093
-// gas legacy: 276360
-// gas legacyOptimized: 275411
+// gas irOptimized: 233293
+// gas legacy: 236560
+// gas legacyOptimized: 235611
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index f13d1f0462..d86eb748d9 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -44,6 +44,6 @@ contract Test {
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 155660
-// gas legacy: 156683
-// gas legacyOptimized: 155793
+// gas irOptimized: 141260
+// gas legacy: 142283
+// gas legacyOptimized: 141393
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index 0563ca2f17..ef7ff3232c 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -39,8 +39,8 @@ contract C {
 // gas legacy: 181047
 // gas legacyOptimized: 180029
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 121097
-// gas legacy: 124201
-// gas legacyOptimized: 121353
+// gas irOptimized: 106697
+// gas legacy: 109801
+// gas legacyOptimized: 106953
 // h() -> 0x40, 0x60, 0x00, 0x00
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index 05eff8ac4a..a4c5566221 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> 0xff
-// gas irOptimized: 179284
-// gas legacy: 191974
-// gas legacyOptimized: 183456
+// gas irOptimized: 143428
+// gas legacy: 153580
+// gas legacyOptimized: 146765
diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
index eabd4c0b86..1e8760250a 100644
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
@@ -51,6 +51,6 @@ contract C {
 // gas legacyOptimized: 117021
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 106056
-// gas legacy: 105614
-// gas legacyOptimized: 104506
+// gas irOptimized: 103256
+// gas legacy: 102814
+// gas legacyOptimized: 101706
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index fda0c47bf2..5292182b95 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -23,7 +23,7 @@ contract c {
 }
 // ----
 // test() -> 1, 2, 3
-// gas irOptimized: 2285747
-// gas legacy: 2279034
-// gas legacyOptimized: 2267444
+// gas irOptimized: 1828598
+// gas legacy: 1823228
+// gas legacyOptimized: 1813956
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index 93075959d5..2ef781a703 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 38, 28, 18
-// gas irOptimized: 185650
-// gas legacy: 189492
-// gas legacyOptimized: 178318
+// gas irOptimized: 148520
+// gas legacy: 151594
+// gas legacyOptimized: 142655
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index fbfca89d94..a56aef2cd6 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 20, 10
-// gas irOptimized: 157570
-// gas legacy: 159279
-// gas legacyOptimized: 152937
+// gas irOptimized: 126056
+// gas legacy: 127424
+// gas legacyOptimized: 122350
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index a5332cfd78..cb917cef09 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -10,6 +10,6 @@ contract c {
 
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
-// gas irOptimized: 109301
-// gas legacy: 126702
+// gas irOptimized: 109310
+// gas legacy: 101362
 // gas legacyOptimized: 123422
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index 2bebf21c69..0c03436544 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -16,7 +16,7 @@ contract c {
 }
 // ----
 // test() -> true
-// gas irOptimized: 175619
-// gas legacy: 224093
-// gas legacyOptimized: 205152
+// gas irOptimized: 140496
+// gas legacy: 179275
+// gas legacyOptimized: 164122
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index 42a91e7ed3..e801dd0fcb 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -15,7 +15,7 @@ contract c {
 }
 // ----
 // test() ->
-// gas irOptimized: 142528
-// gas legacy: 164430
-// gas legacyOptimized: 158513
+// gas irOptimized: 114023
+// gas legacy: 131544
+// gas legacyOptimized: 126811
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index eb563b9474..d2300d4937 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -42,10 +42,10 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 141557
-// gas legacy: 142032
-// gas legacyOptimized: 141400
+// gas irOptimized: 113246
+// gas legacy: 113626
+// gas legacyOptimized: 113120
 // g() ->
-// gas irOptimized: 148272
-// gas legacy: 148507
-// gas legacyOptimized: 147740
+// gas irOptimized: 118618
+// gas legacy: 118806
+// gas legacyOptimized: 118192
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
index a0987895c0..676e3759e3 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
@@ -20,9 +20,9 @@ contract C {
 // gas legacy: 3071683
 // gas legacyOptimized: 3014415
 // test_indices(uint256): 5 ->
-// gas irOptimized: 722510
-// gas legacy: 719151
-// gas legacyOptimized: 716139
+// gas irOptimized: 578008
+// gas legacy: 575321
+// gas legacyOptimized: 572912
 // test_indices(uint256): 10 ->
 // gas irOptimized: 158347
 // gas legacy: 162657
@@ -40,14 +40,14 @@ contract C {
 // gas legacy: 18602799
 // gas legacyOptimized: 18179744
 // test_indices(uint256): 129 ->
-// gas irOptimized: 5197778
-// gas legacy: 5212013
-// gas legacyOptimized: 5157889
+// gas irOptimized: 4158223
+// gas legacy: 4169611
+// gas legacyOptimized: 4126312
 // test_indices(uint256): 128 ->
-// gas irOptimized: 416732
-// gas legacy: 470568
-// gas legacyOptimized: 423768
+// gas irOptimized: 411932
+// gas legacy: 465768
+// gas legacyOptimized: 418968
 // test_indices(uint256): 1 ->
-// gas irOptimized: 726962
-// gas legacy: 721789
-// gas legacyOptimized: 720209
+// gas irOptimized: 581570
+// gas legacy: 577432
+// gas legacyOptimized: 576168
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
index 8b90995d3c..b1ef599e92 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 165044
-// gas legacy: 166201
-// gas legacyOptimized: 163439
+// gas irOptimized: 132036
+// gas legacy: 132961
+// gas legacyOptimized: 130752
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 282617
-// gas legacy: 285088
-// gas legacyOptimized: 280012
+// gas irOptimized: 226094
+// gas legacy: 228071
+// gas legacyOptimized: 224010
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 405332
-// gas legacy: 409138
-// gas legacyOptimized: 401827
+// gas irOptimized: 324266
+// gas legacy: 327311
+// gas legacyOptimized: 321462
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 6403282
-// gas legacy: 6466233
-// gas legacyOptimized: 6333077
+// gas irOptimized: 5122626
+// gas legacy: 5172987
+// gas legacyOptimized: 5066462
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
index 78d9361002..97f7a1269b 100644
--- a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
@@ -17,11 +17,11 @@ contract C {
 // gas legacy: 105722
 // gas legacyOptimized: 103508
 // set_get_length(uint256): 0xFF -> 0
-// gas irOptimized: 841772
-// gas legacy: 830227
-// gas legacyOptimized: 806158
+// gas irOptimized: 821872
+// gas legacy: 810327
+// gas legacyOptimized: 786258
 // set_get_length(uint256): 0xFFF -> 0
-// gas irOptimized: 12860984
-// gas legacy: 12668959
-// gas legacyOptimized: 12287770
+// gas irOptimized: 12841084
+// gas legacy: 12649059
+// gas legacyOptimized: 12267870
 // set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #

From 54b45983902c4486badc229d31d062533d8bd9e1 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 9 Nov 2022 10:22:01 +0100
Subject: [PATCH 1027/1748] Move some tests from viaYul to appropriate groups

---
 .../semanticTests/{viaYul => array}/array_2d_assignment.sol       | 0
 test/libsolidity/semanticTests/{viaYul => array}/array_2d_new.sol | 0
 .../semanticTests/{viaYul => array}/array_3d_assignment.sol       | 0
 test/libsolidity/semanticTests/{viaYul => array}/array_3d_new.sol | 0
 .../semanticTests/{viaYul => array}/array_function_pointers.sol   | 0
 .../array_2d_zeroed_memory_index_access.sol                       | 0
 .../array_memory_allocation/array_array_static.sol                | 0
 .../array_static_return_param_zeroed_memory_index_access.sol      | 0
 .../array_static_zeroed_memory_index_access.sol                   | 0
 .../array_memory_allocation/array_zeroed_memory_index_access.sol  | 0
 .../semanticTests/{viaYul => array}/array_memory_as_parameter.sol | 0
 .../semanticTests/{viaYul => array}/array_memory_create.sol       | 0
 .../semanticTests/{viaYul => array}/array_memory_index_access.sol | 0
 .../{viaYul => array}/array_push_return_reference.sol             | 0
 .../semanticTests/{viaYul => array}/array_push_with_arg.sol       | 0
 .../{viaYul => array}/array_storage_index_access.sol              | 0
 .../{viaYul => array}/array_storage_index_boundary_test.sol       | 0
 .../{viaYul => array}/array_storage_index_zeroed_test.sol         | 0
 .../{viaYul => array}/array_storage_length_access.sol             | 0
 .../{viaYul => array}/array_storage_pop_zero_length.sol           | 0
 .../semanticTests/{viaYul => array}/array_storage_push_empty.sol  | 0
 .../{viaYul => array}/array_storage_push_empty_length_address.sol | 0
 .../semanticTests/{viaYul => array}/array_storage_push_pop.sol    | 0
 .../semanticTests/{viaYul => calldata}/calldata_array_access.sol  | 0
 .../{viaYul => calldata}/calldata_array_index_range_access.sol    | 0
 .../semanticTests/{viaYul => calldata}/calldata_array_length.sol  | 0
 .../{viaYul => calldata}/calldata_array_three_dimensional.sol     | 0
 .../{viaYul => calldata}/calldata_bytes_array_bounds.sol          | 0
 28 files changed, 0 insertions(+), 0 deletions(-)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_2d_assignment.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_2d_new.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_3d_assignment.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_3d_new.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_function_pointers.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_memory_allocation/array_2d_zeroed_memory_index_access.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_memory_allocation/array_array_static.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_memory_allocation/array_static_zeroed_memory_index_access.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_memory_allocation/array_zeroed_memory_index_access.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_memory_as_parameter.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_memory_create.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_memory_index_access.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_push_return_reference.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_push_with_arg.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_storage_index_access.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_storage_index_boundary_test.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_storage_index_zeroed_test.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_storage_length_access.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_storage_pop_zero_length.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_storage_push_empty.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_storage_push_empty_length_address.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => array}/array_storage_push_pop.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => calldata}/calldata_array_access.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => calldata}/calldata_array_index_range_access.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => calldata}/calldata_array_length.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => calldata}/calldata_array_three_dimensional.sol (100%)
 rename test/libsolidity/semanticTests/{viaYul => calldata}/calldata_bytes_array_bounds.sol (100%)

diff --git a/test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol b/test/libsolidity/semanticTests/array/array_2d_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_2d_assignment.sol
rename to test/libsolidity/semanticTests/array/array_2d_assignment.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_2d_new.sol b/test/libsolidity/semanticTests/array/array_2d_new.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_2d_new.sol
rename to test/libsolidity/semanticTests/array/array_2d_new.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol b/test/libsolidity/semanticTests/array/array_3d_assignment.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_3d_assignment.sol
rename to test/libsolidity/semanticTests/array/array_3d_assignment.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_3d_new.sol b/test/libsolidity/semanticTests/array/array_3d_new.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_3d_new.sol
rename to test/libsolidity/semanticTests/array/array_3d_new.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_function_pointers.sol b/test/libsolidity/semanticTests/array/array_function_pointers.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_function_pointers.sol
rename to test/libsolidity/semanticTests/array/array_function_pointers.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
rename to test/libsolidity/semanticTests/array/array_memory_allocation/array_2d_zeroed_memory_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_array_static.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_array_static.sol
rename to test/libsolidity/semanticTests/array/array_memory_allocation/array_array_static.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
rename to test/libsolidity/semanticTests/array/array_memory_allocation/array_static_return_param_zeroed_memory_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_static_zeroed_memory_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_static_zeroed_memory_index_access.sol
rename to test/libsolidity/semanticTests/array/array_memory_allocation/array_static_zeroed_memory_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_allocation/array_zeroed_memory_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_allocation/array_zeroed_memory_index_access.sol
rename to test/libsolidity/semanticTests/array/array_memory_allocation/array_zeroed_memory_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol b/test/libsolidity/semanticTests/array/array_memory_as_parameter.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_as_parameter.sol
rename to test/libsolidity/semanticTests/array/array_memory_as_parameter.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_create.sol b/test/libsolidity/semanticTests/array/array_memory_create.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_create.sol
rename to test/libsolidity/semanticTests/array/array_memory_create.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_memory_index_access.sol
rename to test/libsolidity/semanticTests/array/array_memory_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol b/test/libsolidity/semanticTests/array/array_push_return_reference.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_push_return_reference.sol
rename to test/libsolidity/semanticTests/array/array_push_return_reference.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol b/test/libsolidity/semanticTests/array/array_push_with_arg.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_push_with_arg.sol
rename to test/libsolidity/semanticTests/array/array_push_with_arg.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol b/test/libsolidity/semanticTests/array/array_storage_index_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_index_access.sol
rename to test/libsolidity/semanticTests/array/array_storage_index_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_index_boundary_test.sol
rename to test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_index_zeroed_test.sol
rename to test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol b/test/libsolidity/semanticTests/array/array_storage_length_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_length_access.sol
rename to test/libsolidity/semanticTests/array/array_storage_length_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol b/test/libsolidity/semanticTests/array/array_storage_pop_zero_length.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_pop_zero_length.sol
rename to test/libsolidity/semanticTests/array/array_storage_pop_zero_length.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_push_empty.sol
rename to test/libsolidity/semanticTests/array/array_storage_push_empty.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_push_empty_length_address.sol
rename to test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
diff --git a/test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol b/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/array_storage_push_pop.sol
rename to test/libsolidity/semanticTests/array/array_storage_push_pop.sol
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_access.sol b/test/libsolidity/semanticTests/calldata/calldata_array_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/calldata_array_access.sol
rename to test/libsolidity/semanticTests/calldata/calldata_array_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_index_range_access.sol b/test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/calldata_array_index_range_access.sol
rename to test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_length.sol b/test/libsolidity/semanticTests/calldata/calldata_array_length.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/calldata_array_length.sol
rename to test/libsolidity/semanticTests/calldata/calldata_array_length.sol
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_array_three_dimensional.sol b/test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/calldata_array_three_dimensional.sol
rename to test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol
diff --git a/test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol b/test/libsolidity/semanticTests/calldata/calldata_bytes_array_bounds.sol
similarity index 100%
rename from test/libsolidity/semanticTests/viaYul/calldata_bytes_array_bounds.sol
rename to test/libsolidity/semanticTests/calldata/calldata_bytes_array_bounds.sol

From f1febf69d08aaffceea7c88985ce342216456d7b Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Nov 2022 22:02:36 +0100
Subject: [PATCH 1028/1748] Only count variables if only variables are needed.

---
 libyul/backends/evm/EVMCodeTransform.cpp      |  7 ++-
 libyul/optimiser/ExpressionJoiner.cpp         |  2 +-
 libyul/optimiser/LoopInvariantCodeMotion.cpp  |  2 +-
 libyul/optimiser/NameCollector.cpp            | 54 +++++++++++++++----
 libyul/optimiser/NameCollector.h              | 30 +++++++----
 libyul/optimiser/Rematerialiser.cpp           |  6 ++-
 .../UnusedFunctionParameterPruner.cpp         |  2 +-
 7 files changed, 73 insertions(+), 30 deletions(-)

diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index d5e25a1d1e..8a268675c7 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -668,10 +668,9 @@ bool statementNeedsReturnVariableSetup(Statement const& _statement, vector<Typed
 		holds_alternative<Assignment>(_statement)
 	)
 	{
-		ReferencesCounter referencesCounter{ReferencesCounter::CountWhat::OnlyVariables};
-		referencesCounter.visit(_statement);
-		auto isReferenced = [&referencesCounter](TypedName const& _returnVariable) {
-			return referencesCounter.references().count(_returnVariable.name);
+		map<YulString, size_t> references = VariableReferencesCounter::countReferences(_statement);
+		auto isReferenced = [&references](TypedName const& _returnVariable) {
+			return references.count(_returnVariable.name);
 		};
 		if (ranges::none_of(_returnVariables, isReferenced))
 			return false;
diff --git a/libyul/optimiser/ExpressionJoiner.cpp b/libyul/optimiser/ExpressionJoiner.cpp
index dbb684007c..645bb6c3ed 100644
--- a/libyul/optimiser/ExpressionJoiner.cpp
+++ b/libyul/optimiser/ExpressionJoiner.cpp
@@ -86,7 +86,7 @@ void ExpressionJoiner::visit(Expression& _e)
 
 ExpressionJoiner::ExpressionJoiner(Block& _ast)
 {
-	m_references = ReferencesCounter::countReferences(_ast);
+	m_references = VariableReferencesCounter::countReferences(_ast);
 }
 
 void ExpressionJoiner::handleArguments(vector<Expression>& _arguments)
diff --git a/libyul/optimiser/LoopInvariantCodeMotion.cpp b/libyul/optimiser/LoopInvariantCodeMotion.cpp
index fe8ddff97e..87454dc96d 100644
--- a/libyul/optimiser/LoopInvariantCodeMotion.cpp
+++ b/libyul/optimiser/LoopInvariantCodeMotion.cpp
@@ -71,7 +71,7 @@ bool LoopInvariantCodeMotion::canBePromoted(
 			return false;
 	if (_varDecl.value)
 	{
-		for (auto const& ref: ReferencesCounter::countReferences(*_varDecl.value, ReferencesCounter::OnlyVariables))
+		for (auto const& ref: VariableReferencesCounter::countReferences(*_varDecl.value))
 			if (_varsDefinedInCurrentScope.count(ref.first) || !m_ssaVariables.count(ref.first))
 				return false;
 		SideEffectsCollector sideEffects{m_dialect, *_varDecl.value, &m_functionSideEffects};
diff --git a/libyul/optimiser/NameCollector.cpp b/libyul/optimiser/NameCollector.cpp
index c2a82d4946..2664b8f6dd 100644
--- a/libyul/optimiser/NameCollector.cpp
+++ b/libyul/optimiser/NameCollector.cpp
@@ -56,30 +56,62 @@ void ReferencesCounter::operator()(Identifier const& _identifier)
 
 void ReferencesCounter::operator()(FunctionCall const& _funCall)
 {
-	if (m_countWhat == VariablesAndFunctions)
-		++m_references[_funCall.functionName.name];
+	++m_references[_funCall.functionName.name];
 	ASTWalker::operator()(_funCall);
 }
 
-map<YulString, size_t> ReferencesCounter::countReferences(Block const& _block, CountWhat _countWhat)
+map<YulString, size_t> ReferencesCounter::countReferences(Block const& _block)
 {
-	ReferencesCounter counter(_countWhat);
+	ReferencesCounter counter;
 	counter(_block);
-	return counter.references();
+	return std::move(counter.m_references);
 }
 
-map<YulString, size_t> ReferencesCounter::countReferences(FunctionDefinition const& _function, CountWhat _countWhat)
+map<YulString, size_t> ReferencesCounter::countReferences(FunctionDefinition const& _function)
 {
-	ReferencesCounter counter(_countWhat);
+	ReferencesCounter counter;
 	counter(_function);
-	return counter.references();
+	return std::move(counter.m_references);
 }
 
-map<YulString, size_t> ReferencesCounter::countReferences(Expression const& _expression, CountWhat _countWhat)
+map<YulString, size_t> ReferencesCounter::countReferences(Expression const& _expression)
 {
-	ReferencesCounter counter(_countWhat);
+	ReferencesCounter counter;
 	counter.visit(_expression);
-	return counter.references();
+	return std::move(counter.m_references);
+}
+
+void VariableReferencesCounter::operator()(Identifier const& _identifier)
+{
+	++m_references[_identifier.name];
+}
+
+map<YulString, size_t> VariableReferencesCounter::countReferences(Block const& _block)
+{
+	VariableReferencesCounter counter;
+	counter(_block);
+	return std::move(counter.m_references);
+}
+
+map<YulString, size_t> VariableReferencesCounter::countReferences(FunctionDefinition const& _function)
+{
+	VariableReferencesCounter counter;
+	counter(_function);
+	return std::move(counter.m_references);
+}
+
+map<YulString, size_t> VariableReferencesCounter::countReferences(Expression const& _expression)
+{
+	VariableReferencesCounter counter;
+	counter.visit(_expression);
+	return std::move(counter.m_references);
+}
+
+map<YulString, size_t> VariableReferencesCounter::countReferences(Statement const& _statement)
+{
+	VariableReferencesCounter counter;
+	counter.visit(_statement);
+	return std::move(counter.m_references);
 }
 
 void AssignmentsSinceContinue::operator()(ForLoop const& _forLoop)
diff --git a/libyul/optimiser/NameCollector.h b/libyul/optimiser/NameCollector.h
index 34dd5f9b30..ad18e1e26b 100644
--- a/libyul/optimiser/NameCollector.h
+++ b/libyul/optimiser/NameCollector.h
@@ -71,23 +71,33 @@ class NameCollector: public ASTWalker
 class ReferencesCounter: public ASTWalker
 {
 public:
-	enum CountWhat { VariablesAndFunctions, OnlyVariables };
+	using ASTWalker::operator ();
+	void operator()(Identifier const& _identifier) override;
+	void operator()(FunctionCall const& _funCall) override;
 
-	explicit ReferencesCounter(CountWhat _countWhat = VariablesAndFunctions):
-		m_countWhat(_countWhat)
-	{}
+	static std::map<YulString, size_t> countReferences(Block const& _block);
+	static std::map<YulString, size_t> countReferences(FunctionDefinition const& _function);
+	static std::map<YulString, size_t> countReferences(Expression const& _expression);
+
+private:
+	std::map<YulString, size_t> m_references;
+};
 
+/**
+ * Specific AST walker that counts all references to all variable declarations.
+ */
+class VariableReferencesCounter: public ASTWalker
+{
+public:
 	using ASTWalker::operator ();
 	void operator()(Identifier const& _identifier) override;
-	void operator()(FunctionCall const& _funCall) override;
 
-	static std::map<YulString, size_t> countReferences(Block const& _block, CountWhat _countWhat = VariablesAndFunctions);
-	static std::map<YulString, size_t> countReferences(FunctionDefinition const& _function, CountWhat _countWhat = VariablesAndFunctions);
-	static std::map<YulString, size_t> countReferences(Expression const& _expression, CountWhat _countWhat = VariablesAndFunctions);
+	static std::map<YulString, size_t> countReferences(Block const& _block);
+	static std::map<YulString, size_t> countReferences(FunctionDefinition const& _function);
+	static std::map<YulString, size_t> countReferences(Expression const& _expression);
+	static std::map<YulString, size_t> countReferences(Statement const& _statement);
 
-	std::map<YulString, size_t> const& references() const { return m_references; }
 private:
-	CountWhat m_countWhat = CountWhat::VariablesAndFunctions;
 	std::map<YulString, size_t> m_references;
 };
 
diff --git a/libyul/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp
index fb42e65935..02221a17d6 100644
--- a/libyul/optimiser/Rematerialiser.cpp
+++ b/libyul/optimiser/Rematerialiser.cpp
@@ -44,7 +44,7 @@ Rematerialiser::Rematerialiser(
 	bool _onlySelectedVariables
 ):
 	DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore),
-	m_referenceCounts(ReferencesCounter::countReferences(_ast)),
+	m_referenceCounts(VariableReferencesCounter::countReferences(_ast)),
 	m_varsToAlwaysRematerialize(std::move(_varsToAlwaysRematerialize)),
 	m_onlySelectedVariables(_onlySelectedVariables)
 {
@@ -77,7 +77,9 @@ void Rematerialiser::visit(Expression& _e)
 				{
 					// update reference counts
 					m_referenceCounts[name]--;
-					for (auto const& ref: ReferencesCounter::countReferences(*value->value))
+					for (auto const& ref: VariableReferencesCounter::countReferences(
+						*value->value
+					))
 						m_referenceCounts[ref.first] += ref.second;
 					_e = (ASTCopier{}).translate(*value->value);
 				}
diff --git a/libyul/optimiser/UnusedFunctionParameterPruner.cpp b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
index 8f45f84063..1ada8224f9 100644
--- a/libyul/optimiser/UnusedFunctionParameterPruner.cpp
+++ b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
@@ -43,7 +43,7 @@ using namespace solidity::yul::unusedFunctionsCommon;
 
 void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _ast)
 {
-	map<YulString, size_t> references = ReferencesCounter::countReferences(_ast);
+	map<YulString, size_t> references = VariableReferencesCounter::countReferences(_ast);
 	auto used = [&](auto v) -> bool { return references.count(v.name); };
 
 	// Function name and a pair of boolean masks, the first corresponds to parameters and the second

From 62ab78bf7041b21761dd86d5e3bc1d7509c62273 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 17 Mar 2022 19:04:00 +0100
Subject: [PATCH 1029/1748] Refactor join knowledge.

---
 libyul/optimiser/DataFlowAnalyzer.cpp | 95 +++++++++++++--------------
 libyul/optimiser/DataFlowAnalyzer.h   | 33 +++++-----
 2 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index ba8e6fb88b..1d5519b578 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -72,21 +72,21 @@ void DataFlowAnalyzer::operator()(ExpressionStatement& _statement)
 		if (auto vars = isSimpleStore(StoreLoadLocation::Storage, _statement))
 		{
 			ASTModifier::operator()(_statement);
-			cxx20::erase_if(m_state.storage, mapTuple([&](auto&& key, auto&& value) {
+			cxx20::erase_if(m_state.environment.storage, mapTuple([&](auto&& key, auto&& value) {
 				return
 					!m_knowledgeBase.knownToBeDifferent(vars->first, key) &&
 					!m_knowledgeBase.knownToBeEqual(vars->second, value);
 			}));
-			m_state.storage[vars->first] = vars->second;
+			m_state.environment.storage[vars->first] = vars->second;
 			return;
 		}
 		else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, _statement))
 		{
 			ASTModifier::operator()(_statement);
-			cxx20::erase_if(m_state.memory, mapTuple([&](auto&& key, auto&& /* value */) {
+			cxx20::erase_if(m_state.environment.memory, mapTuple([&](auto&& key, auto&& /* value */) {
 				return !m_knowledgeBase.knownToBeDifferentByAtLeast32(vars->first, key);
 			}));
-			m_state.memory[vars->first] = vars->second;
+			m_state.environment.memory[vars->first] = vars->second;
 			return;
 		}
 	}
@@ -124,12 +124,11 @@ void DataFlowAnalyzer::operator()(VariableDeclaration& _varDecl)
 void DataFlowAnalyzer::operator()(If& _if)
 {
 	clearKnowledgeIfInvalidated(*_if.condition);
-	unordered_map<YulString, YulString> storage = m_state.storage;
-	unordered_map<YulString, YulString> memory = m_state.memory;
+	Environment preEnvironment = m_state.environment;
 
 	ASTModifier::operator()(_if);
 
-	joinKnowledge(storage, memory);
+	joinKnowledge(preEnvironment);
 
 	clearValues(assignedVariableNames(_if.body));
 }
@@ -141,10 +140,9 @@ void DataFlowAnalyzer::operator()(Switch& _switch)
 	set<YulString> assignedVariables;
 	for (auto& _case: _switch.cases)
 	{
-		unordered_map<YulString, YulString> storage = m_state.storage;
-		unordered_map<YulString, YulString> memory = m_state.memory;
+		Environment preEnvironment = m_state.environment;
 		(*this)(_case.body);
-		joinKnowledge(storage, memory);
+		joinKnowledge(preEnvironment);
 
 		set<YulString> variables = assignedVariableNames(_case.body);
 		assignedVariables += variables;
@@ -225,7 +223,7 @@ void DataFlowAnalyzer::operator()(Block& _block)
 
 optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
 {
-	if (YulString const* value = util::valueOrNullptr(m_state.storage, _key))
+	if (YulString const* value = util::valueOrNullptr(m_state.environment.storage, _key))
 		return *value;
 	else
 		return nullopt;
@@ -233,7 +231,7 @@ optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
 
 optional<YulString> DataFlowAnalyzer::memoryValue(YulString _key) const
 {
-	if (YulString const* value = util::valueOrNullptr(m_state.memory, _key))
+	if (YulString const* value = util::valueOrNullptr(m_state.environment.memory, _key))
 		return *value;
 	else
 		return nullopt;
@@ -267,13 +265,13 @@ void DataFlowAnalyzer::handleAssignment(set<YulString> const& _variables, Expres
 		if (!_isDeclaration)
 		{
 			// assignment to slot denoted by "name"
-			m_state.storage.erase(name);
+			m_state.environment.storage.erase(name);
 			// assignment to slot contents denoted by "name"
-			cxx20::erase_if(m_state.storage, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
+			cxx20::erase_if(m_state.environment.storage, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
 			// assignment to slot denoted by "name"
-			m_state.memory.erase(name);
+			m_state.environment.memory.erase(name);
 			// assignment to slot contents denoted by "name"
-			cxx20::erase_if(m_state.memory, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
+			cxx20::erase_if(m_state.environment.memory, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
 		}
 	}
 
@@ -286,9 +284,9 @@ void DataFlowAnalyzer::handleAssignment(set<YulString> const& _variables, Expres
 			// On the other hand, if we knew the value in the slot
 			// already, then the sload() / mload() would have been replaced by a variable anyway.
 			if (auto key = isSimpleLoad(StoreLoadLocation::Memory, *_value))
-				m_state.memory[*key] = variable;
+				m_state.environment.memory[*key] = variable;
 			else if (auto key = isSimpleLoad(StoreLoadLocation::Storage, *_value))
-				m_state.storage[*key] = variable;
+				m_state.environment.storage[*key] = variable;
 		}
 	}
 }
@@ -329,8 +327,8 @@ void DataFlowAnalyzer::clearValues(set<YulString> _variables)
 	auto eraseCondition = mapTuple([&_variables](auto&& key, auto&& value) {
 		return _variables.count(key) || _variables.count(value);
 	});
-	cxx20::erase_if(m_state.storage, eraseCondition);
-	cxx20::erase_if(m_state.memory, eraseCondition);
+	cxx20::erase_if(m_state.environment.storage, eraseCondition);
+	cxx20::erase_if(m_state.environment.memory, eraseCondition);
 
 	// Also clear variables that reference variables to be cleared.
 	for (auto const& variableToClear: _variables)
@@ -357,9 +355,9 @@ void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Block const& _block)
 		return;
 	SideEffectsCollector sideEffects(m_dialect, _block, &m_functionSideEffects);
 	if (sideEffects.invalidatesStorage())
-		m_state.storage.clear();
+		m_state.environment.storage.clear();
 	if (sideEffects.invalidatesMemory())
-		m_state.memory.clear();
+		m_state.environment.memory.clear();
 }
 
 void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Expression const& _expr)
@@ -368,35 +366,9 @@ void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Expression const& _expr)
 		return;
 	SideEffectsCollector sideEffects(m_dialect, _expr, &m_functionSideEffects);
 	if (sideEffects.invalidatesStorage())
-		m_state.storage.clear();
+		m_state.environment.storage.clear();
 	if (sideEffects.invalidatesMemory())
-		m_state.memory.clear();
-}
-
-void DataFlowAnalyzer::joinKnowledge(
-	unordered_map<YulString, YulString> const& _olderStorage,
-	unordered_map<YulString, YulString> const& _olderMemory
-)
-{
-	if (!m_analyzeStores)
-		return;
-	joinKnowledgeHelper(m_state.storage, _olderStorage);
-	joinKnowledgeHelper(m_state.memory, _olderMemory);
-}
-
-void DataFlowAnalyzer::joinKnowledgeHelper(
-	std::unordered_map<YulString, YulString>& _this,
-	std::unordered_map<YulString, YulString> const& _older
-)
-{
-	// We clear if the key does not exist in the older map or if the value is different.
-	// This also works for memory because _older is an "older version"
-	// of m_state.memory and thus any overlapping write would have cleared the keys
-	// that are not known to be different inside m_state.memory already.
-	cxx20::erase_if(_this, mapTuple([&_older](auto&& key, auto&& currentValue){
-		YulString const* oldValue = util::valueOrNullptr(_older, key);
-		return !oldValue || *oldValue != currentValue;
-	}));
+		m_state.environment.memory.clear();
 }
 
 bool DataFlowAnalyzer::inScope(YulString _variableName) const
@@ -443,3 +415,26 @@ std::optional<YulString> DataFlowAnalyzer::isSimpleLoad(
 				return key->name;
 	return {};
 }
+
+void DataFlowAnalyzer::joinKnowledge(Environment const& _olderEnvironment)
+{
+	if (!m_analyzeStores)
+		return;
+	joinKnowledgeHelper(m_state.environment.storage, _olderEnvironment.storage);
+	joinKnowledgeHelper(m_state.environment.memory, _olderEnvironment.memory);
+}
+
+void DataFlowAnalyzer::joinKnowledgeHelper(
+	std::unordered_map<YulString, YulString>& _this,
+	std::unordered_map<YulString, YulString> const& _older
+)
+{
+	// We clear if the key does not exist in the older map or if the value is different.
+	// This also works for memory because _older is an "older version"
+	// of m_state.environment.memory and thus any overlapping write would have cleared the keys
+	// that are not known to be different inside m_state.environment.memory already.
+	cxx20::erase_if(_this, mapTuple([&_older](auto&& key, auto&& currentValue){
+		YulString const* oldValue = util::valueOrNullptr(_older, key);
+		return !oldValue || *oldValue != currentValue;
+	}));
+}
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index fe5a75928e..ef8d49a879 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -131,19 +131,6 @@ class DataFlowAnalyzer: public ASTModifier
 	/// Clears knowledge about storage or memory if they may be modified inside the expression.
 	void clearKnowledgeIfInvalidated(Expression const& _expression);
 
-	/// Joins knowledge about storage and memory with an older point in the control-flow.
-	/// This only works if the current state is a direct successor of the older point,
-	/// i.e. `_otherStorage` and `_otherMemory` cannot have additional changes.
-	void joinKnowledge(
-		std::unordered_map<YulString, YulString> const& _olderStorage,
-		std::unordered_map<YulString, YulString> const& _olderMemory
-	);
-
-	static void joinKnowledgeHelper(
-		std::unordered_map<YulString, YulString>& _thisData,
-		std::unordered_map<YulString, YulString> const& _olderData
-	);
-
 	/// Returns true iff the variable is in scope.
 	bool inScope(YulString _variableName) const;
 
@@ -176,6 +163,11 @@ class DataFlowAnalyzer: public ASTModifier
 	std::map<YulString, SideEffects> m_functionSideEffects;
 
 private:
+	struct Environment
+	{
+		std::unordered_map<YulString, YulString> storage;
+		std::unordered_map<YulString, YulString> memory;
+	};
 	struct State
 	{
 		/// Current values of variables, always movable.
@@ -183,9 +175,20 @@ class DataFlowAnalyzer: public ASTModifier
 		/// m_references[a].contains(b) <=> the current expression assigned to a references b
 		std::unordered_map<YulString, std::set<YulString>> references;
 
-		std::unordered_map<YulString, YulString> storage;
-		std::unordered_map<YulString, YulString> memory;
+		Environment environment;
 	};
+
+	/// Joins knowledge about storage and memory with an older point in the control-flow.
+	/// This only works if the current state is a direct successor of the older point,
+	/// i.e. `_olderState.storage` and `_olderState.memory` cannot have additional changes.
+	/// Does nothing if memory and storage analysis is disabled / ignored.
+	void joinKnowledge(Environment const& _olderEnvironment);
+
+	static void joinKnowledgeHelper(
+		std::unordered_map<YulString, YulString>& _thisData,
+		std::unordered_map<YulString, YulString> const& _olderData
+	);
+
 	State m_state;
 
 protected:

From 3abf2724a193c693108ccc1b5d5f7e8f656a08ae Mon Sep 17 00:00:00 2001
From: Ishtiaque Zahid <ruko97@gmail.com>
Date: Fri, 15 Jul 2022 14:40:40 +0600
Subject: [PATCH 1030/1748] changed output of formatNumberReadable so that it
 shows powers of two and one-less-than powers of two in a more compact format

---
 Changelog.md                                  |   2 +
 libsolutil/CMakeLists.txt                     |   2 +-
 libsolutil/StringUtils.cpp                    |  78 ++++++++
 libsolutil/StringUtils.h                      | 103 +---------
 .../smtCheckerTests/operators/division_3.sol  |   2 +-
 .../overflow/signed_div_overflow.sol          |   2 +-
 .../overflow/signed_guard_sub_overflow.sol    |   2 +-
 .../overflow/signed_guard_sum_overflow.sol    |   4 +-
 .../overflow/signed_mul_overflow.sol          |   4 +-
 .../overflow/signed_sub_overflow.sol          |   4 +-
 .../overflow/signed_sum_overflow.sol          |   4 +-
 .../smtCheckerTests/unchecked/signed_mod.sol  |   2 +-
 test/libsolutil/StringUtils.cpp               | 180 +++++++++++++++---
 13 files changed, 252 insertions(+), 137 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 99177776ea..849a7625bc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,6 +16,8 @@ Compiler Features:
 Bugfixes:
  * Yul Optimizer: Hash hex and decimal literals according to their value instead of their representation, improving the detection of equivalent functions.
  * Solidity Upgrade Tool ``solidity-upgrade``: Fix the tool returning success code on uncaught exceptions.
+ * SMTChecker: Fix display error for negative integers that are one more than powers of two.
+ * SMTChecker: Improved readability for large integers that are powers of two or almost powers of two in error messages.
 
 
 ### 0.8.17 (2022-09-08)
diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
index 363baba193..8a78cafa19 100644
--- a/libsolutil/CMakeLists.txt
+++ b/libsolutil/CMakeLists.txt
@@ -43,7 +43,7 @@ set(sources
 )
 
 add_library(solutil ${sources})
-target_link_libraries(solutil PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system range-v3)
+target_link_libraries(solutil PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system range-v3 fmt::fmt-header-only)
 target_include_directories(solutil PUBLIC "${CMAKE_SOURCE_DIR}")
 add_dependencies(solutil solidity_BuildInfo.h)
 
diff --git a/libsolutil/StringUtils.cpp b/libsolutil/StringUtils.cpp
index a994b07c8f..d1c96fb2e2 100644
--- a/libsolutil/StringUtils.cpp
+++ b/libsolutil/StringUtils.cpp
@@ -27,6 +27,7 @@
 #include <vector>
 
 using namespace std;
+using namespace solidity;
 using namespace solidity::util;
 
 bool solidity::util::stringWithinDistance(string const& _str1, string const& _str2, size_t _maxDistance, size_t _lenThreshold)
@@ -113,3 +114,80 @@ string solidity::util::suffixedVariableNameList(string const& _baseName, size_t
 	}
 	return result;
 }
+
+namespace
+{
+
+/// Try to format as N * 2**x
+optional<string> tryFormatPowerOfTwo(bigint const& _value)
+{
+	bigint prefix = _value;
+
+	// when multiple trailing zero bytes, format as N * 2**x
+	int i = 0;
+	for (; (prefix & 0xff) == 0; prefix >>= 8)
+		++i;
+	if (i <= 2)
+		return nullopt;
+
+	// 0x100 yields 2**8 (N is 1 and redundant)
+	if (prefix == 1)
+		return {fmt::format("2**{}", i * 8)};
+	else if ((prefix & (prefix - 1)) == 0)
+	{
+		int j = 0;
+		for (; (prefix & 0x1) == 0; prefix >>= 1)
+			j++;
+		return {fmt::format("2**{}", i * 8 + j)};
+	}
+	else
+		return {fmt::format(
+			"{} * 2**{}",
+			toHex(toCompactBigEndian(prefix), HexPrefix::Add, HexCase::Mixed),
+			i * 8
+		)};
+}
+
+}
+
+string solidity::util::formatNumberReadable(bigint const& _value, bool _useTruncation)
+{
+	bool const isNegative = _value < 0;
+	bigint const absValue = isNegative ? (bigint(-1) * _value) : bigint(_value);
+	string const sign = isNegative ? "-" : "";
+
+	// smaller numbers return as decimal
+	if (absValue <= 0x1000000)
+		return sign + absValue.str();
+
+	if (auto result = tryFormatPowerOfTwo(absValue))
+		return {sign + *result};
+	else if (auto result = tryFormatPowerOfTwo(absValue + 1))
+		return {sign + *result + (isNegative ? " + 1" : " - 1")};
+
+	string str = toHex(toCompactBigEndian(absValue), HexPrefix::Add, HexCase::Mixed);
+
+	if (_useTruncation)
+	{
+		// return as interior-truncated hex.
+		size_t len = str.size();
+
+		if (len < 24)
+			return sign + str;
+
+		size_t const initialChars = 6;
+		size_t const finalChars = 4;
+		size_t numSkipped = len - initialChars - finalChars;
+
+		return fmt::format(
+			"{}{}...{{+{} more}}...{}",
+			sign,
+			str.substr(0, initialChars),
+			numSkipped,
+			str.substr(len-finalChars, len)
+		);
+	}
+
+	return sign + str;
+}
+
diff --git a/libsolutil/StringUtils.h b/libsolutil/StringUtils.h
index d7e1238509..0d5bc7839b 100644
--- a/libsolutil/StringUtils.h
+++ b/libsolutil/StringUtils.h
@@ -27,6 +27,8 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Numeric.h>
 
+#include <fmt/format.h>
+
 #include <algorithm>
 #include <limits>
 #include <locale>
@@ -101,110 +103,17 @@ std::string joinHumanReadablePrefixed
 		return _separator + joinHumanReadable(_list, _separator, _lastSeparator);
 }
 
-/// Same as @ref formatNumberReadable but only for unsigned numbers
-template <class T>
-inline std::string formatUnsignedNumberReadable (
-	T const& _value,
-	bool _useTruncation = false
-)
-{
-	static_assert(
-		std::is_same<bigint, T>::value || !std::numeric_limits<T>::is_signed,
-		"only unsigned types or bigint supported"
-	); //bigint does not carry sign bit on shift
-
-	// smaller numbers return as decimal
-	if (_value <= 0x1000000)
-		return _value.str();
-
-	HexCase hexcase = HexCase::Mixed;
-	HexPrefix prefix = HexPrefix::Add;
-
-	// when multiple trailing zero bytes, format as N * 2**x
-	int i = 0;
-	T v = _value;
-	for (; (v & 0xff) == 0; v >>= 8)
-		++i;
-	if (i > 2)
-	{
-		// 0x100 yields 2**8 (N is 1 and redundant)
-		if (v == 1)
-			return "2**" + std::to_string(i * 8);
-		return toHex(toCompactBigEndian(v), prefix, hexcase) +
-			" * 2**" +
-			std::to_string(i * 8);
-	}
-
-	// when multiple trailing FF bytes, format as N * 2**x - 1
-	i = 0;
-	for (v = _value; (v & 0xff) == 0xff; v >>= 8)
-		++i;
-	if (i > 2)
-	{
-		// 0xFF yields 2**8 - 1 (v is 0 in that case)
-		if (v == 0)
-			return "2**" + std::to_string(i * 8) + " - 1";
-		return toHex(toCompactBigEndian(T(v + 1)), prefix, hexcase) +
-			" * 2**" + std::to_string(i * 8) +
-			" - 1";
-	}
-
-	std::string str = toHex(toCompactBigEndian(_value), prefix, hexcase);
-	if (_useTruncation)
-	{
-		// return as interior-truncated hex.
-		size_t len = str.size();
-
-		if (len < 24)
-			return str;
-
-		size_t const initialChars = (prefix == HexPrefix::Add) ? 6 : 4;
-		size_t const finalChars = 4;
-		size_t numSkipped = len - initialChars - finalChars;
-
-		return str.substr(0, initialChars) +
-			"...{+" +
-			std::to_string(numSkipped) +
-			" more}..." +
-			str.substr(len-finalChars, len);
-	}
-
-	// otherwise, show whole value.
-	return str;
-}
-
 /// Formats large numbers to be easily readable by humans.
 /// Returns decimal representation for smaller numbers; hex for large numbers.
 /// "Special" numbers, powers-of-two and powers-of-two minus 1, are returned in
 /// formulaic form like 0x01 * 2**24 - 1.
-/// @a T can be any integer variable, will typically be u160, u256 or bigint.
+/// @a T can be any integer type, will typically be u160, u256 or bigint.
 /// @param _value to be formatted
 /// @param _useTruncation if true, internal truncation is also applied,
 /// like  0x5555...{+56 more}...5555
-/// @example formatNumberReadable((u256)0x7ffffff) = "0x08 * 2**24"
-/// @example formatNumberReadable(-57896044618658097711785492504343953926634992332820282019728792003956564819968) = -0x80 * 2**248
-template <class T>
-inline std::string formatNumberReadable(
-	T const& _value,
-	bool _useTruncation = false
-)
-{
-	static_assert(
-		std::numeric_limits<T>::is_integer,
-		"only integer numbers are supported"
-	);
-
-	if (_value >= 0)
-	{
-		bigint const _v = bigint(_value);
-		return formatUnsignedNumberReadable(_v, _useTruncation);
-	}
-	else
-	{
-		bigint const _abs_value = bigint(-1) * _value;
-		return "-" + formatUnsignedNumberReadable(_abs_value, _useTruncation);
-	}
-}
+/// @example formatNumberReadable((u256)0x7ffffff) = "2**27 - 1"
+/// @example formatNumberReadable(-57896044618658097711785492504343953926634992332820282019728792003956564819968) = -2**255
+std::string formatNumberReadable(bigint const& _value, bool _useTruncation = false);
 
 /// Safely converts an unsigned integer as string into an unsigned int type.
 ///
diff --git a/test/libsolidity/smtCheckerTests/operators/division_3.sol b/test/libsolidity/smtCheckerTests/operators/division_3.sol
index 67c1440639..99b5df2a4d 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_3.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (95-100): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.\nCounterexample:\n\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\ny = (- 1)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f((- 57896044618658097711785492504343953926634992332820282019728792003956564819968), (- 1))
+// Warning 4984: (95-100): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.\nCounterexample:\n\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\ny = (- 1)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f((- 57896044618658097711785492504343953926634992332820282019728792003956564819968), (- 1))
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol
index d7a309405b..1e55eb9770 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_div_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
+// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
 // Warning 4281: (77-82): CHC: Division by zero happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
index 95221c912e..9583597a34 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
@@ -8,4 +8,4 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.\nCounterexample:\n\nx = 57896044618658097711785492504343953926634992332820282019728792003956564819967\ny = (- 1)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(57896044618658097711785492504343953926634992332820282019728792003956564819967, (- 1))
+// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.\nCounterexample:\n\nx = 57896044618658097711785492504343953926634992332820282019728792003956564819967\ny = (- 1)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(57896044618658097711785492504343953926634992332820282019728792003956564819967, (- 1))
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
index 2e4b84b700..9c89abbe90 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
@@ -8,5 +8,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (78-83): CHC: Underflow (resulting value less than -0x80 * 2**248) happens here.
-// Warning 4984: (78-83): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
+// Warning 3944: (78-83): CHC: Underflow (resulting value less than -2**255) happens here.
+// Warning 4984: (78-83): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
index e664174dfd..c91b15da71 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_mul_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -0x80 * 2**248) happens here.
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
+// Warning 3944: (77-82): CHC: Underflow (resulting value less than -2**255) happens here.
+// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
index dfb228b9aa..000acfaeae 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_sub_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -0x80 * 2**248) happens here.
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
+// Warning 3944: (77-82): CHC: Underflow (resulting value less than -2**255) happens here.
+// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
index 5ac0c812bd..998944a55e 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_sum_overflow.sol
@@ -7,5 +7,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 3944: (77-82): CHC: Underflow (resulting value less than -0x80 * 2**248) happens here.
-// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.
+// Warning 3944: (77-82): CHC: Underflow (resulting value less than -2**255) happens here.
+// Warning 4984: (77-82): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol b/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
index 736b506e1a..4cc7a57f66 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
@@ -15,4 +15,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 4281: (85-90): CHC: Division by zero happens here.\nCounterexample:\n\na = 0\nb = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
-// Warning 4984: (242-248): CHC: Overflow (resulting value larger than 0x80 * 2**248 - 1) happens here.\nCounterexample:\n\n_check = true\n = 0\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n\nTransaction trace:\nC.constructor()\nC.g(true)
+// Warning 4984: (242-248): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.\nCounterexample:\n\n_check = true\n = 0\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n\nTransaction trace:\nC.constructor()\nC.g(true)
diff --git a/test/libsolutil/StringUtils.cpp b/test/libsolutil/StringUtils.cpp
index db72297e7a..8dd81d34e5 100644
--- a/test/libsolutil/StringUtils.cpp
+++ b/test/libsolutil/StringUtils.cpp
@@ -107,17 +107,23 @@ BOOST_AUTO_TEST_CASE(test_human_readable_join)
 
 BOOST_AUTO_TEST_CASE(test_format_number_readable)
 {
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x8000000)), "0x08 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x80000000)), "0x80 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x800000000)), "0x08 * 2**32");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x8000000000)), "0x80 * 2**32");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x80000000000)), "0x08 * 2**40");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7ffffff)), "0x08 * 2**24 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7fffffff)), "0x80 * 2**24 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7ffffffff)), "0x08 * 2**32 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7fffffffff)), "0x80 * 2**32 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7ffffffffff)), "0x08 * 2**40 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x10000000)), "2**28");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x100000000)), "2**32");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x8000000)), "2**27");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x80000000)), "2**31");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x800000000)), "2**35");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x8000000000)), "2**39");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x80000000000)), "2**43");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7ffffff)), "2**27 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7fffffff)), "2**31 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7ffffffff)), "2**35 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7fffffffff)), "2**39 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x7ffffffffff)), "2**43 - 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xfffffff)), "2**28 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xffffffff)), "2**32 - 1");
 
 	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x88000000)), "0x88 * 2**24");
 	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x8888888888000000)), "0x8888888888 * 2**24");
@@ -134,13 +140,73 @@ BOOST_AUTO_TEST_CASE(test_format_number_readable)
 	u256 c = (u256)FixedHash<32>(
 		fromHex("0xabcdef0123456789abcdef0123456789abcdef0123456789abcdef0123456789")
 	);
-	u256 d = u256(0xAAAAaaaaAAAAaaaa) << 192 |
+	u256 d = u256(0xAAAAaaaaAAAAaaaa) << 192;
+	u256 e = u256(0xAAAAaaaaAAAAaaaa) << 192 |
 		u256(0xFFFFffffFFFFffff) << 128 |
 		u256(0xFFFFffffFFFFffff) << 64 |
 		u256(0xFFFFffffFFFFffff);
 	BOOST_CHECK_EQUAL(formatNumberReadable(b, true), "0x5555...{+56 more}...5555");
 	BOOST_CHECK_EQUAL(formatNumberReadable(c, true), "0xABCD...{+56 more}...6789");
-	BOOST_CHECK_EQUAL(formatNumberReadable(d, true), "0xAAAAaaaaAAAAaaab * 2**192 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(d, true), "0xAAAAaaaaAAAAaaaa * 2**192");
+	BOOST_CHECK_EQUAL(formatNumberReadable(e, true), "0xAAAAaaaaAAAAaaab * 2**192 - 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x20000000)), "2**29");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x200000000)), "2**33");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x2000000000)), "2**37");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x20000000000)), "2**41");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x200000000000)), "2**45");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1FFFFFFF)), "2**29 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1FFFFFFFF)), "2**33 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1FFFFFFFFF)), "2**37 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1FFFFFFFFFF)), "2**41 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1FFFFFFFFFFF)), "2**45 - 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3000000)), "0x03 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x30000000)), "0x30 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x300000000)), "0x03 * 2**32");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3000000000)), "0x30 * 2**32");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x2FFFFFF)), "0x03 * 2**24 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x2FFFFFFF)), "0x30 * 2**24 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x2FFFFFFFF)), "0x03 * 2**32 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x2FFFFFFFFF)), "0x30 * 2**32 - 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA3000000)), "0xa3 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA30000000)), "0x0a30 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA300000000)), "0xa3 * 2**32");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA3000000000)), "0x0a30 * 2**32");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA2FFFFFF)), "0xa3 * 2**24 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA2FFFFFFF)), "0x0a30 * 2**24 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA2FFFFFFFF)), "0xa3 * 2**32 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xA2FFFFFFFFF)), "0x0a30 * 2**32 - 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 128, true), "0x03 * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 129, true), "0x06 * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 130, true), "0x0c * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 131, true), "0x18 * 2**128");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 248, true), "0x03 * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 249, true), "0x06 * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 250, true), "0x0c * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x3) << 251, true), "0x18 * 2**248");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 128, true), "0x09 * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 129, true), "0x12 * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 130, true), "0x24 * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 131, true), "0x48 * 2**128");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 248, true), "0x09 * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 249, true), "0x12 * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 250, true), "0x24 * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x9) << 251, true), "0x48 * 2**248");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0)), "0");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x10000)), "65536");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xFFFF)), "65535");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0x1000000)), "16777216");
+	BOOST_CHECK_EQUAL(formatNumberReadable(u256(0xFFFFFF)), "16777215");
 
 	//for codegen/ExpressionCompiler
 	BOOST_CHECK_EQUAL(formatNumberReadable(u256(-1)), "2**256 - 1");
@@ -154,17 +220,23 @@ BOOST_AUTO_TEST_CASE(test_format_number_readable)
 
 BOOST_AUTO_TEST_CASE(test_format_number_readable_signed)
 {
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8000000)), "-0x08 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x80000000)), "-0x80 * 2**24");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x800000000)), "-0x08 * 2**32");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8000000000)), "-0x80 * 2**32");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x80000000000)), "-0x08 * 2**40");
-
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffff)), "-0x08 * 2**24 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7fffffff)), "-0x80 * 2**24 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffffff)), "-0x08 * 2**32 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7fffffffff)), "-0x80 * 2**32 - 1");
-	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffffffff)), "-0x08 * 2**40 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x10000000)), "-2**28");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x100000000)), "-2**32");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8000000)), "-2**27");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x80000000)), "-2**31");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x800000000)), "-2**35");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8000000000)), "-2**39");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x80000000000)), "-2**43");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffff)), "-2**27 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7fffffff)), "-2**31 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffffff)), "-2**35 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7fffffffff)), "-2**39 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x7ffffffffff)), "-2**43 + 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xfffffff)), "-2**28 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xffffffff)), "-2**32 + 1");
 
 	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x88000000)), "-0x88 * 2**24");
 	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x8888888888000000)), "-0x8888888888 * 2**24");
@@ -190,23 +262,77 @@ BOOST_AUTO_TEST_CASE(test_format_number_readable_signed)
 
 	BOOST_CHECK_EQUAL(formatNumberReadable(b, true), "-0x5555...{+56 more}...5555");
 	BOOST_CHECK_EQUAL(formatNumberReadable(c, true), "-0x0BCD...{+56 more}...6789");
-	BOOST_CHECK_EQUAL(formatNumberReadable(d, true), "-0x5555555555555556 * 2**192 - 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable(d, true), "-0x5555555555555556 * 2**192 + 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x20000000)), "-2**29");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x200000000)), "-2**33");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x2000000000)), "-2**37");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x20000000000)), "-2**41");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x200000000000)), "-2**45");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1FFFFFFF)), "-2**29 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1FFFFFFFF)), "-2**33 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1FFFFFFFFF)), "-2**37 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1FFFFFFFFFF)), "-2**41 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1FFFFFFFFFFF)), "-2**45 + 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x3000000)), "-0x03 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x30000000)), "-0x30 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x300000000)), "-0x03 * 2**32");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x3000000000)), "-0x30 * 2**32");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x2FFFFFF)), "-0x03 * 2**24 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x2FFFFFFF)), "-0x30 * 2**24 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x2FFFFFFFF)), "-0x03 * 2**32 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x2FFFFFFFFF)), "-0x30 * 2**32 + 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA3000000)), "-0xa3 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA30000000)), "-0x0a30 * 2**24");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA300000000)), "-0xa3 * 2**32");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA3000000000)), "-0x0a30 * 2**32");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA2FFFFFF)), "-0xa3 * 2**24 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA2FFFFFFF)), "-0x0a30 * 2**24 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA2FFFFFFFF)), "-0xa3 * 2**32 + 1");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xA2FFFFFFFFF)), "-0x0a30 * 2**32 + 1");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 128, true), "-0x03 * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 129, true), "-0x06 * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 130, true), "-0x0c * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 131, true), "-0x18 * 2**128");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 248, true), "-0x03 * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 249, true), "-0x06 * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 250, true), "-0x0c * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x3)) << 251, true), "-0x18 * 2**248");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 128, true), "-0x09 * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 129, true), "-0x12 * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 130, true), "-0x24 * 2**128");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 131, true), "-0x48 * 2**128");
+
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 248, true), "-0x09 * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 249, true), "-0x12 * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 250, true), "-0x24 * 2**248");
+	BOOST_CHECK_EQUAL(formatNumberReadable(((-1) * s256(0x9)) << 251, true), "-0x48 * 2**248");
 
 	BOOST_CHECK_EQUAL(formatNumberReadable(s256(-1)), "-1");
 	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x10000)), "-65536");
 	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xFFFF)), "-65535");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0x1000000)), "-16777216");
+	BOOST_CHECK_EQUAL(formatNumberReadable((-1) * s256(0xFFFFFF)), "-16777215");
 
 	BOOST_CHECK_EQUAL(
 		formatNumberReadable(
 			frontend::IntegerType(256, frontend::IntegerType::Modifier::Signed).minValue()
 		),
-		"-0x80 * 2**248"
+		"-2**255"
 	);
 	BOOST_CHECK_EQUAL(
 		formatNumberReadable(
 			frontend::IntegerType(256, frontend::IntegerType::Modifier::Signed).maxValue()
 		),
-		"0x80 * 2**248 - 1"
+		"2**255 - 1"
 	);
 }
 

From 5ba8c109f42b93ca777b0d1beef6c9f28f277a16 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 13 Oct 2021 17:52:08 +0200
Subject: [PATCH 1031/1748] Use side-effects of user defined functions in evm
 code transform.

---
 Changelog.md                                  |  1 +
 libyul/backends/evm/ControlFlowGraph.h        |  4 +
 .../backends/evm/ControlFlowGraphBuilder.cpp  | 76 ++++++++++--------
 libyul/backends/evm/ControlFlowGraphBuilder.h |  3 +
 .../evm/OptimizedEVMCodeTransform.cpp         | 40 ++++++----
 libyul/backends/evm/StackLayoutGenerator.cpp  | 80 ++++++++++++-------
 libyul/backends/evm/StackLayoutGenerator.h    |  4 +-
 .../abi_encode_calldata_slice.sol             |  2 +-
 .../abi_encode_calldata_slice.sol             |  2 +-
 .../array/array_storage_index_zeroed_test.sol |  8 +-
 ...ray_pop_long_storage_empty_garbage_ref.sol |  2 +-
 .../byte_array_to_storage_cleanup.sol         |  2 +-
 .../externalContracts/base64.sol              |  6 +-
 .../semanticTests/externalContracts/snark.sol |  4 +-
 .../externalContracts/strings.sol             |  4 +-
 ...ernal_call_to_nonexisting_debugstrings.sol |  2 +-
 .../after_terminating_function.yul            | 22 +++++
 test/libyul/yulControlFlowGraph/function.yul  | 10 +--
 test/libyul/yulStackLayout/function.yul       | 32 +++-----
 19 files changed, 182 insertions(+), 122 deletions(-)
 create mode 100644 test/libyul/evmCodeTransform/after_terminating_function.yul

diff --git a/Changelog.md b/Changelog.md
index 99177776ea..7462e2bdeb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
  * Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
  * Natspec: Add event Natspec inheritance for devdoc.
  * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
+ * Yul EVM Code Transform: Generate more optimal code for user-defined functions that always terminate a transaction. No return labels will be pushed for calls to functions that always terminate.
  * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
  * Language Server: Add basic document hover support.
  * Optimizer: Added optimization rule ``and(shl(X, Y), shl(X, Z)) => shl(X, and(Y, Z))``.
diff --git a/libyul/backends/evm/ControlFlowGraph.h b/libyul/backends/evm/ControlFlowGraph.h
index b267b8461f..853a9e705d 100644
--- a/libyul/backends/evm/ControlFlowGraph.h
+++ b/libyul/backends/evm/ControlFlowGraph.h
@@ -148,6 +148,8 @@ struct CFG
 		/// True, if the call is recursive, i.e. entering the function involves a control flow path (potentially involving
 		/// more intermediate function calls) that leads back to this very call.
 		bool recursive = false;
+		/// True, if the call can return.
+		bool canContinue = true;
 	};
 	struct Assignment
 	{
@@ -210,10 +212,12 @@ struct CFG
 	{
 		std::shared_ptr<DebugData const> debugData;
 		Scope::Function const& function;
+		FunctionDefinition const& functionDefinition;
 		BasicBlock* entry = nullptr;
 		std::vector<VariableSlot> parameters;
 		std::vector<VariableSlot> returnVariables;
 		std::vector<BasicBlock*> exits;
+		bool canContinue = true;
 	};
 
 	/// The main entry point, i.e. the start of the outermost Yul block.
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index 1980fb4424..d08dcf16c2 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -23,6 +23,7 @@
 #include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 #include <libyul/Utilities.h>
+#include <libyul/ControlFlowSideEffectsCollector.h>
 
 #include <libsolutil/cxx20.h>
 #include <libsolutil/Visitor.h>
@@ -214,7 +215,8 @@ std::unique_ptr<CFG> ControlFlowGraphBuilder::build(
 	auto result = std::make_unique<CFG>();
 	result->entry = &result->makeBlock(debugDataOf(_block));
 
-	ControlFlowGraphBuilder builder(*result, _analysisInfo, _dialect);
+	ControlFlowSideEffectsCollector sideEffects(_dialect, _block);
+	ControlFlowGraphBuilder builder(*result, _analysisInfo, sideEffects.functionSideEffects(), _dialect);
 	builder.m_currentBlock = result->entry;
 	builder(_block);
 
@@ -232,10 +234,12 @@ std::unique_ptr<CFG> ControlFlowGraphBuilder::build(
 ControlFlowGraphBuilder::ControlFlowGraphBuilder(
 	CFG& _graph,
 	AsmAnalysisInfo const& _analysisInfo,
+	map<FunctionDefinition const*, ControlFlowSideEffects> const& _functionSideEffects,
 	Dialect const& _dialect
 ):
 	m_graph(_graph),
 	m_info(_analysisInfo),
+	m_functionSideEffects(_functionSideEffects),
 	m_dialect(_dialect)
 {
 }
@@ -285,10 +289,10 @@ void ControlFlowGraphBuilder::operator()(Assignment const& _assignment)
 		return VariableSlot{lookupVariable(_var.name), _var.debugData};
 	}) | ranges::to<vector<VariableSlot>>;
 
-	yulAssert(m_currentBlock, "");
+	Stack input = visitAssignmentRightHandSide(*_assignment.value, assignedVariables.size());
+	yulAssert(m_currentBlock);
 	m_currentBlock->operations.emplace_back(CFG::Operation{
-		// input
-		visitAssignmentRightHandSide(*_assignment.value, assignedVariables.size()),
+		std::move(input),
 		// output
 		assignedVariables | ranges::to<Stack>,
 		// operation
@@ -297,7 +301,6 @@ void ControlFlowGraphBuilder::operator()(Assignment const& _assignment)
 }
 void ControlFlowGraphBuilder::operator()(ExpressionStatement const& _exprStmt)
 {
-	yulAssert(m_currentBlock, "");
 	std::visit(util::GenericVisitor{
 		[&](FunctionCall const& _call) {
 			Stack const& output = visitFunctionCall(_call);
@@ -305,16 +308,6 @@ void ControlFlowGraphBuilder::operator()(ExpressionStatement const& _exprStmt)
 		},
 		[&](auto const&) { yulAssert(false, ""); }
 	}, _exprStmt.expression);
-
-	// TODO: Ideally this would be done on the expression label and for all functions that always revert,
-	//       not only for builtins.
-	if (auto const* funCall = get_if<FunctionCall>(&_exprStmt.expression))
-		if (BuiltinFunction const* builtin = m_dialect.builtin(funCall->functionName.name))
-			if (builtin->controlFlowSideEffects.terminatesOrReverts())
-			{
-				m_currentBlock->exit = CFG::BasicBlock::Terminated{};
-				m_currentBlock = &m_graph.makeBlock(debugDataOf(*m_currentBlock));
-			}
 }
 
 void ControlFlowGraphBuilder::operator()(Block const& _block)
@@ -331,7 +324,8 @@ void ControlFlowGraphBuilder::operator()(If const& _if)
 {
 	auto& ifBranch = m_graph.makeBlock(debugDataOf(_if.body));
 	auto& afterIf = m_graph.makeBlock(debugDataOf(*m_currentBlock));
-	makeConditionalJump(debugDataOf(_if), std::visit(*this, *_if.condition), ifBranch, afterIf);
+	StackSlot condition = std::visit(*this, *_if.condition);
+	makeConditionalJump(debugDataOf(_if), std::move(condition), ifBranch, afterIf);
 	m_currentBlock = &ifBranch;
 	(*this)(_if.body);
 	jump(debugDataOf(_if.body), afterIf);
@@ -349,8 +343,9 @@ void ControlFlowGraphBuilder::operator()(Switch const& _switch)
 	// Artificially generate:
 	// let <ghostVariable> := <switchExpression>
 	VariableSlot ghostVarSlot{ghostVar, debugDataOf(*_switch.expression)};
+	StackSlot expression = std::visit(*this, *_switch.expression);
 	m_currentBlock->operations.emplace_back(CFG::Operation{
-		Stack{std::visit(*this, *_switch.expression)},
+		Stack{std::move(expression)},
 		Stack{ghostVarSlot},
 		CFG::Assignment{_switch.debugData, {ghostVarSlot}}
 	});
@@ -430,7 +425,8 @@ void ControlFlowGraphBuilder::operator()(ForLoop const& _loop)
 	else
 	{
 		jump(debugDataOf(_loop.pre), loopCondition);
-		makeConditionalJump(debugDataOf(*_loop.condition), std::visit(*this, *_loop.condition), loopBody, afterLoop);
+		StackSlot condition = std::visit(*this, *_loop.condition);
+		makeConditionalJump(debugDataOf(*_loop.condition), std::move(condition), loopBody, afterLoop);
 		m_currentBlock = &loopBody;
 		(*this)(_loop.body);
 		jump(debugDataOf(_loop.body), post);
@@ -473,7 +469,7 @@ void ControlFlowGraphBuilder::operator()(FunctionDefinition const& _function)
 
 	CFG::FunctionInfo& functionInfo = m_graph.functionInfo.at(&function);
 
-	ControlFlowGraphBuilder builder{m_graph, m_info, m_dialect};
+	ControlFlowGraphBuilder builder{m_graph, m_info, m_functionSideEffects, m_dialect};
 	builder.m_currentFunction = &functionInfo;
 	builder.m_currentBlock = functionInfo.entry;
 	builder(_function.body);
@@ -481,33 +477,35 @@ void ControlFlowGraphBuilder::operator()(FunctionDefinition const& _function)
 	builder.m_currentBlock->exit = CFG::BasicBlock::FunctionReturn{debugDataOf(_function), &functionInfo};
 }
 
-void ControlFlowGraphBuilder::registerFunction(FunctionDefinition const& _function)
+void ControlFlowGraphBuilder::registerFunction(FunctionDefinition const& _functionDefinition)
 {
 	yulAssert(m_scope, "");
-	yulAssert(m_scope->identifiers.count(_function.name), "");
-	Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_function.name));
+	yulAssert(m_scope->identifiers.count(_functionDefinition.name), "");
+	Scope::Function& function = std::get<Scope::Function>(m_scope->identifiers.at(_functionDefinition.name));
 
-	yulAssert(m_info.scopes.at(&_function.body), "");
-	Scope* virtualFunctionScope = m_info.scopes.at(m_info.virtualBlocks.at(&_function).get()).get();
+	yulAssert(m_info.scopes.at(&_functionDefinition.body), "");
+	Scope* virtualFunctionScope = m_info.scopes.at(m_info.virtualBlocks.at(&_functionDefinition).get()).get();
 	yulAssert(virtualFunctionScope, "");
 
 	bool inserted = m_graph.functionInfo.emplace(std::make_pair(&function, CFG::FunctionInfo{
-		_function.debugData,
+		_functionDefinition.debugData,
 		function,
-		&m_graph.makeBlock(debugDataOf(_function.body)),
-		_function.parameters | ranges::views::transform([&](auto const& _param) {
+		_functionDefinition,
+		&m_graph.makeBlock(debugDataOf(_functionDefinition.body)),
+		_functionDefinition.parameters | ranges::views::transform([&](auto const& _param) {
 			return VariableSlot{
 				std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name)),
 				_param.debugData
 			};
 		}) | ranges::to<vector>,
-		_function.returnVariables | ranges::views::transform([&](auto const& _retVar) {
+		_functionDefinition.returnVariables | ranges::views::transform([&](auto const& _retVar) {
 			return VariableSlot{
 				std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_retVar.name)),
 				_retVar.debugData
 			};
 		}) | ranges::to<vector>,
-		{}
+		{},
+		m_functionSideEffects.at(&_functionDefinition).canContinue
 	})).second;
 	yulAssert(inserted);
 }
@@ -517,6 +515,8 @@ Stack const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _cal
 	yulAssert(m_scope, "");
 	yulAssert(m_currentBlock, "");
 
+	Stack const* output = nullptr;
+	bool canContinue = true;
 	if (BuiltinFunction const* builtin = m_dialect.builtin(_call.functionName.name))
 	{
 		Stack inputs;
@@ -524,7 +524,7 @@ Stack const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _cal
 			if (!builtin->literalArgument(idx).has_value())
 				inputs.emplace_back(std::visit(*this, arg));
 		CFG::BuiltinCall builtinCall{_call.debugData, *builtin, _call, inputs.size()};
-		return m_currentBlock->operations.emplace_back(CFG::Operation{
+		output = &m_currentBlock->operations.emplace_back(CFG::Operation{
 			// input
 			std::move(inputs),
 			// output
@@ -534,14 +534,18 @@ Stack const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _cal
 			// operation
 			std::move(builtinCall)
 		}).output;
+		canContinue = builtin->controlFlowSideEffects.canContinue;
 	}
 	else
 	{
 		Scope::Function const& function = lookupFunction(_call.functionName.name);
-		Stack inputs{FunctionCallReturnLabelSlot{_call}};
+		canContinue = m_graph.functionInfo.at(&function).canContinue;
+		Stack inputs;
+		if (canContinue)
+			inputs.emplace_back(FunctionCallReturnLabelSlot{_call});
 		for (auto const& arg: _call.arguments | ranges::views::reverse)
 			inputs.emplace_back(std::visit(*this, arg));
-		return m_currentBlock->operations.emplace_back(CFG::Operation{
+		output = &m_currentBlock->operations.emplace_back(CFG::Operation{
 			// input
 			std::move(inputs),
 			// output
@@ -549,9 +553,15 @@ Stack const& ControlFlowGraphBuilder::visitFunctionCall(FunctionCall const& _cal
 				return TemporarySlot{_call, _i};
 			}) | ranges::to<Stack>,
 			// operation
-			CFG::FunctionCall{_call.debugData, function, _call}
+			CFG::FunctionCall{_call.debugData, function, _call, /* recursive */ false, canContinue}
 		}).output;
 	}
+	if (!canContinue)
+	{
+		m_currentBlock->exit = CFG::BasicBlock::Terminated{};
+		m_currentBlock = &m_graph.makeBlock(debugDataOf(*m_currentBlock));
+	}
+	return *output;
 }
 
 Stack ControlFlowGraphBuilder::visitAssignmentRightHandSide(Expression const& _expression, size_t _expectedSlotCount)
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.h b/libyul/backends/evm/ControlFlowGraphBuilder.h
index 2a99cfe5ba..ffe935b0dd 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.h
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.h
@@ -21,6 +21,7 @@
 #pragma once
 
 #include <libyul/backends/evm/ControlFlowGraph.h>
+#include <libyul/ControlFlowSideEffects.h>
 
 namespace solidity::yul
 {
@@ -55,6 +56,7 @@ class ControlFlowGraphBuilder
 	ControlFlowGraphBuilder(
 		CFG& _graph,
 		AsmAnalysisInfo const& _analysisInfo,
+		std::map<FunctionDefinition const*, ControlFlowSideEffects> const& _functionSideEffects,
 		Dialect const& _dialect
 	);
 	void registerFunction(FunctionDefinition const& _function);
@@ -77,6 +79,7 @@ class ControlFlowGraphBuilder
 	);
 	CFG& m_graph;
 	AsmAnalysisInfo const& m_info;
+	std::map<FunctionDefinition const*, ControlFlowSideEffects> const& m_functionSideEffects;
 	Dialect const& m_dialect;
 	CFG::BasicBlock* m_currentBlock = nullptr;
 	Scope* m_scope = nullptr;
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index 2fa99ccb24..fd3a572e0a 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -71,7 +71,7 @@ void OptimizedEVMCodeTransform::operator()(CFG::FunctionCall const& _call)
 	// Validate stack.
 	{
 		yulAssert(m_assembly.stackHeight() == static_cast<int>(m_stack.size()), "");
-		yulAssert(m_stack.size() >= _call.function.get().arguments.size() + 1, "");
+		yulAssert(m_stack.size() >= _call.function.get().arguments.size() + (_call.canContinue ? 1 : 0), "");
 		// Assert that we got the correct arguments on stack for the call.
 		for (auto&& [arg, slot]: ranges::zip_view(
 			_call.functionCall.get().arguments | ranges::views::reverse,
@@ -79,10 +79,13 @@ void OptimizedEVMCodeTransform::operator()(CFG::FunctionCall const& _call)
 		))
 			validateSlot(slot, arg);
 		// Assert that we got the correct return label on stack.
-		auto const* returnLabelSlot = get_if<FunctionCallReturnLabelSlot>(
-			&m_stack.at(m_stack.size() - _call.functionCall.get().arguments.size() - 1)
-		);
-		yulAssert(returnLabelSlot && &returnLabelSlot->call.get() == &_call.functionCall.get(), "");
+		if (_call.canContinue)
+		{
+			auto const* returnLabelSlot = get_if<FunctionCallReturnLabelSlot>(
+				&m_stack.at(m_stack.size() - _call.functionCall.get().arguments.size() - 1)
+			);
+			yulAssert(returnLabelSlot && &returnLabelSlot->call.get() == &_call.functionCall.get(), "");
+		}
 	}
 
 	// Emit code.
@@ -90,16 +93,17 @@ void OptimizedEVMCodeTransform::operator()(CFG::FunctionCall const& _call)
 		m_assembly.setSourceLocation(originLocationOf(_call));
 		m_assembly.appendJumpTo(
 			getFunctionLabel(_call.function),
-			static_cast<int>(_call.function.get().returns.size() - _call.function.get().arguments.size()) - 1,
+			static_cast<int>(_call.function.get().returns.size() - _call.function.get().arguments.size()) - (_call.canContinue ? 1 : 0),
 			AbstractAssembly::JumpType::IntoFunction
 		);
-		m_assembly.appendLabel(m_returnLabels.at(&_call.functionCall.get()));
+		if (_call.canContinue)
+			m_assembly.appendLabel(m_returnLabels.at(&_call.functionCall.get()));
 	}
 
 	// Update stack.
 	{
 		// Remove arguments and return label from m_stack.
-		for (size_t i = 0; i < _call.function.get().arguments.size() + 1; ++i)
+		for (size_t i = 0; i < _call.function.get().arguments.size() + (_call.canContinue ? 1 : 0); ++i)
 			m_stack.pop_back();
 		// Push return values to m_stack.
 		for (size_t index: ranges::views::iota(0u, _call.function.get().returns.size()))
@@ -479,8 +483,9 @@ void OptimizedEVMCodeTransform::operator()(CFG::BasicBlock const& _block)
 		},
 		[&](CFG::BasicBlock::FunctionReturn const& _functionReturn)
 		{
-			yulAssert(m_currentFunctionInfo, "");
-			yulAssert(m_currentFunctionInfo == _functionReturn.info, "");
+			yulAssert(m_currentFunctionInfo);
+			yulAssert(m_currentFunctionInfo == _functionReturn.info);
+			yulAssert(m_currentFunctionInfo->canContinue);
 
 			// Construct the function return layout, which is fully determined by the function signature.
 			Stack exitStack = m_currentFunctionInfo->returnVariables | ranges::views::transform([](auto const& _varSlot){
@@ -494,11 +499,13 @@ void OptimizedEVMCodeTransform::operator()(CFG::BasicBlock const& _block)
 		},
 		[&](CFG::BasicBlock::Terminated const&)
 		{
-			// Assert that the last builtin call was in fact terminating.
-			yulAssert(!_block.operations.empty(), "");
-			CFG::BuiltinCall const* builtinCall = get_if<CFG::BuiltinCall>(&_block.operations.back().operation);
-			yulAssert(builtinCall, "");
-			yulAssert(builtinCall->builtin.get().controlFlowSideEffects.terminatesOrReverts(), "");
+			yulAssert(!_block.operations.empty());
+			if (CFG::BuiltinCall const* builtinCall = get_if<CFG::BuiltinCall>(&_block.operations.back().operation))
+				yulAssert(builtinCall->builtin.get().controlFlowSideEffects.terminatesOrReverts(), "");
+			else if (CFG::FunctionCall const* functionCall = get_if<CFG::FunctionCall>(&_block.operations.back().operation))
+				yulAssert(!functionCall->canContinue);
+			else
+				yulAssert(false);
 		}
 	}, _block.exit);
 	// TODO: We could assert that the last emitted assembly item terminated or was an (unconditional) jump.
@@ -515,7 +522,8 @@ void OptimizedEVMCodeTransform::operator()(CFG::FunctionInfo const& _functionInf
 	yulAssert(m_stack.empty() && m_assembly.stackHeight() == 0, "");
 
 	// Create function entry layout in m_stack.
-	m_stack.emplace_back(FunctionReturnLabelSlot{_functionInfo.function});
+	if (_functionInfo.canContinue)
+		m_stack.emplace_back(FunctionReturnLabelSlot{_functionInfo.function});
 	for (auto const& param: _functionInfo.parameters | ranges::views::reverse)
 		m_stack.emplace_back(param);
 	m_assembly.setStackHeight(static_cast<int>(m_stack.size()));
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index 8b39b364f8..95c840733d 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -54,7 +54,7 @@ StackLayout StackLayoutGenerator::run(CFG const& _cfg)
 	StackLayoutGenerator{stackLayout}.processEntryPoint(*_cfg.entry);
 
 	for (auto& functionInfo: _cfg.functionInfo | ranges::views::values)
-		StackLayoutGenerator{stackLayout}.processEntryPoint(*functionInfo.entry);
+		StackLayoutGenerator{stackLayout}.processEntryPoint(*functionInfo.entry, &functionInfo);
 
 	return stackLayout;
 }
@@ -331,7 +331,7 @@ Stack StackLayoutGenerator::propagateStackThroughBlock(Stack _exitStack, CFG::Ba
 	return stack;
 }
 
-void StackLayoutGenerator::processEntryPoint(CFG::BasicBlock const& _entry)
+void StackLayoutGenerator::processEntryPoint(CFG::BasicBlock const& _entry, CFG::FunctionInfo const* _functionInfo)
 {
 	list<CFG::BasicBlock const*> toVisit{&_entry};
 	set<CFG::BasicBlock const*> visited;
@@ -402,7 +402,7 @@ void StackLayoutGenerator::processEntryPoint(CFG::BasicBlock const& _entry)
 	}
 
 	stitchConditionalJumps(_entry);
-	fillInJunk(_entry);
+	fillInJunk(_entry, _functionInfo);
 }
 
 optional<Stack> StackLayoutGenerator::getExitLayoutOrStageDependencies(
@@ -707,7 +707,7 @@ Stack StackLayoutGenerator::compressStack(Stack _stack)
 	return _stack;
 }
 
-void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block)
+void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block, CFG::FunctionInfo const* _functionInfo)
 {
 	/// Recursively adds junk to the subgraph starting on @a _entry.
 	/// Since it is only called on cut-vertices, the full subgraph retains proper stack balance.
@@ -767,10 +767,56 @@ void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block)
 		createStackLayout(_source, _target, swap, dupOrPush, pop);
 		return opGas;
 	};
+	/// @returns the number of junk slots to be prepended to @a _targetLayout for an optimal transition from
+	/// @a _entryLayout to @a _targetLayout.
+	auto getBestNumJunk = [&](Stack const& _entryLayout, Stack const& _targetLayout) -> size_t {
+		size_t bestCost = evaluateTransform(_entryLayout, _targetLayout);
+		size_t bestNumJunk = 0;
+		size_t maxJunk = _entryLayout.size();
+		for (size_t numJunk = 1; numJunk <= maxJunk; ++numJunk)
+		{
+			size_t cost = evaluateTransform(_entryLayout, Stack{numJunk, JunkSlot{}} + _targetLayout);
+			if (cost < bestCost)
+			{
+				bestCost = cost;
+				bestNumJunk = numJunk;
+			}
+		}
+		return bestNumJunk;
+	};
+
+	if (_functionInfo && !_functionInfo->canContinue && _block.allowsJunk())
+	{
+		size_t bestNumJunk = getBestNumJunk(
+			_functionInfo->parameters | ranges::views::reverse | ranges::to<Stack>,
+			m_layout.blockInfos.at(&_block).entryLayout
+		);
+		if (bestNumJunk > 0)
+			addJunkRecursive(&_block, bestNumJunk);
+	}
+
 	/// Traverses the CFG and at each block that allows junk, i.e. that is a cut-vertex that never leads to a function
 	/// return, checks if adding junk reduces the shuffling cost upon entering and if so recursively adds junk
 	/// to the spanned subgraph.
 	util::BreadthFirstSearch<CFG::BasicBlock const*>{{&_block}}.run([&](CFG::BasicBlock const* _block, auto _addChild) {
+		if (_block->allowsJunk())
+		{
+			auto& blockInfo = m_layout.blockInfos.at(_block);
+			Stack entryLayout = blockInfo.entryLayout;
+			Stack const& nextLayout = _block->operations.empty() ? blockInfo.exitLayout : m_layout.operationEntryLayout.at(&_block->operations.front());
+			if (entryLayout != nextLayout)
+			{
+				size_t bestNumJunk = getBestNumJunk(
+					entryLayout,
+					nextLayout
+				);
+				if (bestNumJunk > 0)
+				{
+					addJunkRecursive(_block, bestNumJunk);
+					blockInfo.entryLayout = entryLayout;
+				}
+			}
+		}
 		std::visit(util::GenericVisitor{
 			[&](CFG::BasicBlock::MainExit const&) {},
 			[&](CFG::BasicBlock::Jump const& _jump)
@@ -779,32 +825,6 @@ void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block)
 			},
 			[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump)
 			{
-				for (CFG::BasicBlock* exit: {_conditionalJump.zero, _conditionalJump.nonZero})
-					if (exit->allowsJunk())
-					{
-						auto& blockInfo = m_layout.blockInfos.at(exit);
-						Stack entryLayout = blockInfo.entryLayout;
-						Stack nextLayout = exit->operations.empty() ? blockInfo.exitLayout : m_layout.operationEntryLayout.at(&exit->operations.front());
-
-						size_t bestCost = evaluateTransform(entryLayout, nextLayout);
-						size_t bestNumJunk = 0;
-						size_t maxJunk = entryLayout.size();
-						for (size_t numJunk = 1; numJunk <= maxJunk; ++numJunk)
-						{
-							size_t cost = evaluateTransform(entryLayout, Stack{numJunk, JunkSlot{}} + nextLayout);
-							if (cost < bestCost)
-							{
-								bestCost = cost;
-								bestNumJunk = numJunk;
-							}
-						}
-
-						if (bestNumJunk > 0)
-						{
-							addJunkRecursive(exit, bestNumJunk);
-							blockInfo.entryLayout = entryLayout;
-						}
-					}
 				_addChild(_conditionalJump.zero);
 				_addChild(_conditionalJump.nonZero);
 			},
diff --git a/libyul/backends/evm/StackLayoutGenerator.h b/libyul/backends/evm/StackLayoutGenerator.h
index 34cac6d39d..40b554cd60 100644
--- a/libyul/backends/evm/StackLayoutGenerator.h
+++ b/libyul/backends/evm/StackLayoutGenerator.h
@@ -79,7 +79,7 @@ class StackLayoutGenerator
 
 	/// Main algorithm walking the graph from entry to exit and propagating back the stack layouts to the entries.
 	/// Iteratively reruns itself along backwards jumps until the layout is stabilized.
-	void processEntryPoint(CFG::BasicBlock const& _entry);
+	void processEntryPoint(CFG::BasicBlock const& _entry, CFG::FunctionInfo const* _functionInfo = nullptr);
 
 	/// @returns the best known exit layout of @a _block, if all dependencies are already @a _visited.
 	/// If not, adds the dependencies to @a _dependencyList and @returns std::nullopt.
@@ -112,7 +112,7 @@ class StackLayoutGenerator
 	static Stack compressStack(Stack _stack);
 
 	//// Fills in junk when entering branches that do not need a clean stack in case the result is cheaper.
-	void fillInJunk(CFG::BasicBlock const& _block);
+	void fillInJunk(CFG::BasicBlock const& _block, CFG::FunctionInfo const* _functionInfo = nullptr);
 
 	StackLayout& m_layout;
 };
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 67680b8527..328de20a5e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -63,6 +63,6 @@ contract C {
 // gas legacy: 414569
 // gas legacyOptimized: 319271
 // test_uint256() ->
-// gas irOptimized: 511919
+// gas irOptimized: 511451
 // gas legacy: 581876
 // gas legacyOptimized: 442757
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 0d2e4f9c07..2eef62d177 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -64,6 +64,6 @@ contract C {
 // gas legacy: 414569
 // gas legacyOptimized: 319271
 // test_uint256() ->
-// gas irOptimized: 511919
+// gas irOptimized: 511451
 // gas legacy: 581876
 // gas legacyOptimized: 442757
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
index b1ef599e92..1d9d427aee 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 132036
+// gas irOptimized: 131998
 // gas legacy: 132961
 // gas legacyOptimized: 130752
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 226094
+// gas irOptimized: 226012
 // gas legacy: 228071
 // gas legacyOptimized: 224010
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 324266
+// gas irOptimized: 324140
 // gas legacy: 327311
 // gas legacyOptimized: 321462
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 5122626
+// gas irOptimized: 5120200
 // gas legacy: 5172987
 // gas legacyOptimized: 5066462
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index e801dd0fcb..7ce41ffffd 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -15,7 +15,7 @@ contract c {
 }
 // ----
 // test() ->
-// gas irOptimized: 114023
+// gas irOptimized: 113892
 // gas legacy: 131544
 // gas legacyOptimized: 126811
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index d7a5c8bf3d..e2d0ba7ac8 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,7 +28,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 464753
+// gas irOptimized: 449704
 // gas legacy: 729908
 // gas legacyOptimized: 493347
 // h() -> 0x20, 0x40, 0x00, 0
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index 5133da878f..37be5e14d0 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,7 +33,7 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 438376
+// gas irOptimized: 414909
 // gas legacy: 750723
 // gas legacyOptimized: 536620
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
@@ -51,10 +51,10 @@ contract test {
 // encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
 // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
 // encode_inline_asm_large()
-// gas irOptimized: 1387039
+// gas irOptimized: 1374039
 // gas legacy: 1688033
 // gas legacyOptimized: 1205033
 // encode_no_asm_large()
-// gas irOptimized: 3316107
+// gas irOptimized: 3291100
 // gas legacy: 4765077
 // gas legacyOptimized: 2908077
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 7a341898ae..be9fc00729 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -294,11 +294,11 @@ contract Test {
 // f() -> true
 // g() -> true
 // pair() -> true
-// gas irOptimized: 270080
+// gas irOptimized: 269938
 // gas legacy: 275952
 // gas legacyOptimized: 267239
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 784027
+// gas irOptimized: 783501
 // gas legacy: 805423
 // gas legacyOptimized: 772571
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 654562ef09..a134fe86ab 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,7 +49,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 670586
+// gas irOptimized: 642624
 // gas legacy: 1096108
 // gas legacyOptimized: 741962
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
@@ -69,6 +69,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 2017770
+// gas irOptimized: 1989966
 // gas legacy: 4294552
 // gas legacyOptimized: 2327981
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index 9cc2846acc..f004d94723 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -26,7 +26,7 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 424088
+// gas irOptimized: 391081
 // gas legacy: 823681
 // gas legacyOptimized: 505900
 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libyul/evmCodeTransform/after_terminating_function.yul b/test/libyul/evmCodeTransform/after_terminating_function.yul
new file mode 100644
index 0000000000..ee32b44315
--- /dev/null
+++ b/test/libyul/evmCodeTransform/after_terminating_function.yul
@@ -0,0 +1,22 @@
+{
+	let b := f(1, 2)
+	function f(a, r) -> t { revert(0, 0) }
+	b := f(3, 4)
+}
+// ====
+// stackOptimization: true
+// ----
+//     /* "":17:18   */
+//   0x02
+//     /* "":14:15   */
+//   0x01
+//     /* "":12:19   */
+//   tag_1
+//   jump	// in
+//     /* "":21:59   */
+// tag_1:
+//     /* "":55:56   */
+//   0x00
+//     /* "":45:57   */
+//   dup1
+//   revert
diff --git a/test/libyul/yulControlFlowGraph/function.yul b/test/libyul/yulControlFlowGraph/function.yul
index 862b1b9e63..90c4b380e4 100644
--- a/test/libyul/yulControlFlowGraph/function.yul
+++ b/test/libyul/yulControlFlowGraph/function.yul
@@ -28,10 +28,9 @@
 // Block0 [label="\
 // i: [ RET[i] ] => [ TMP[i, 0] TMP[i, 1] ]\l\
 // Assignment(x, y): [ TMP[i, 0] TMP[i, 1] ] => [ x y ]\l\
-// h: [ RET[h] x ] => [ ]\l\
-// h: [ RET[h] y ] => [ ]\l\
+// h: [ x ] => [ ]\l\
 // "];
-// Block0Exit [label="MainExit"];
+// Block0Exit [label="Terminated"];
 // Block0 -> Block0Exit;
 //
 // FunctionEntry_f_1 [label="function f(a, b) -> r"];
@@ -57,10 +56,9 @@
 // FunctionEntry_h_3 -> Block3;
 // Block3 [label="\
 // f: [ RET[f] 0x00 x ] => [ TMP[f, 0] ]\l\
-// h: [ RET[h] TMP[f, 0] ] => [ ]\l\
-// g: [ RET[g] ] => [ ]\l\
+// h: [ TMP[f, 0] ] => [ ]\l\
 // "];
-// Block3Exit [label="FunctionReturn[h]"];
+// Block3Exit [label="Terminated"];
 // Block3 -> Block3Exit;
 //
 // FunctionEntry_i_4 [label="function i() -> v, w"];
diff --git a/test/libyul/yulStackLayout/function.yul b/test/libyul/yulStackLayout/function.yul
index 343555123e..ccf97422f4 100644
--- a/test/libyul/yulStackLayout/function.yul
+++ b/test/libyul/yulStackLayout/function.yul
@@ -27,21 +27,18 @@
 // Entry -> Block0;
 // Block0 [label="\
 // [ ]\l\
-// [ RET[h] RET[h] RET[i] ]\l\
+// [ RET[i] ]\l\
 // i\l\
-// [ RET[h] RET[h] TMP[i, 0] TMP[i, 1] ]\l\
-// [ RET[h] RET[h] TMP[i, 0] TMP[i, 1] ]\l\
+// [ TMP[i, 0] TMP[i, 1] ]\l\
+// [ TMP[i, 0] TMP[i, 1] ]\l\
 // Assignment(x, y)\l\
-// [ RET[h] RET[h] x y ]\l\
-// [ RET[h] y RET[h] x ]\l\
-// h\l\
-// [ RET[h] y ]\l\
-// [ RET[h] y ]\l\
+// [ x y ]\l\
+// [ x ]\l\
 // h\l\
 // [ ]\l\
 // [ ]\l\
 // "];
-// Block0Exit [label="MainExit"];
+// Block0Exit [label="Terminated"];
 // Block0 -> Block0Exit;
 //
 // FunctionEntry_f [label="function f(a, b) -> r\l\
@@ -83,19 +80,16 @@
 // [ RET x ]"];
 // FunctionEntry_h -> Block3;
 // Block3 [label="\
-// [ RET RET[h] RET[f] 0x00 x ]\l\
-// [ RET RET[h] RET[f] 0x00 x ]\l\
+// [ RET[f] 0x00 x ]\l\
+// [ RET[f] 0x00 x ]\l\
 // f\l\
-// [ RET RET[h] TMP[f, 0] ]\l\
-// [ RET RET[h] TMP[f, 0] ]\l\
+// [ TMP[f, 0] ]\l\
+// [ TMP[f, 0] ]\l\
 // h\l\
-// [ RET ]\l\
-// [ RET RET[g] ]\l\
-// g\l\
-// [ RET ]\l\
-// [ RET ]\l\
+// [ ]\l\
+// [ ]\l\
 // "];
-// Block3Exit [label="FunctionReturn[h]"];
+// Block3Exit [label="Terminated"];
 // Block3 -> Block3Exit;
 //
 // FunctionEntry_i [label="function i() -> v, w\l\

From 1b6063ede46c00e2fc4446c232bb361ebd26a288 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 15 Mar 2022 19:15:41 +0100
Subject: [PATCH 1032/1748] Disable zeppelin test failing due to hardhat
 heuristics.

---
 test/externalTests/zeppelin.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 3cb7a720f1..fafa23ffb3 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -69,6 +69,9 @@ function zeppelin_test
     sed -i "s|it(\('reverts \)|it.skip(\1|g" math/SignedSafeMath.test.js
     sed -i "s|it(\('reverts \)|it.skip(\1|g" structs/EnumerableSet.behavior.js
     popd
+    pushd test/proxy/
+    sed -i "s|it(\('proxy admin cannot call delegated functions',\)|it.skip(\1|g" transparent/TransparentUpgradeableProxy.behaviour.js
+    popd
 
 
     # In some cases Hardhat does not detect revert reasons properly via IR.

From 76fcd0d53785c31a7ff63b11212e085be0d20acb Mon Sep 17 00:00:00 2001
From: Bulgantamir Gankhuyag <bulgaadev@gmail.com>
Date: Thu, 17 Nov 2022 14:17:10 +0800
Subject: [PATCH 1033/1748] Bug fix on Yul Object example code.

Related issue: #13711
---
 docs/yul.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index f6109a1255..c8068de981 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -1174,7 +1174,7 @@ An example Yul Object is shown below:
             datacopy(offset, dataoffset("Contract2"), size)
             // constructor parameter is a single number 0x1234
             mstore(add(offset, size), 0x1234)
-            pop(create(offset, add(size, 32), 0))
+            pop(create(0, offset, add(size, 32)))
 
             // now return the runtime object (the currently
             // executing code is the constructor code)

From 2c27405cbb5a61d22af0899c00a236c68d135df0 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Mon, 12 Sep 2022 11:00:14 +0200
Subject: [PATCH 1034/1748] Fix zero size memory expansion semantics in the yul
 interpreter.

---
 .../libyul/yulInterpreterTests/zero_range.yul | 10 ++++++++++
 .../EVMInstructionInterpreter.cpp             | 19 +++++++++++++++----
 .../EVMInstructionInterpreter.h               | 15 ++++++++++++---
 3 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 test/libyul/yulInterpreterTests/zero_range.yul

diff --git a/test/libyul/yulInterpreterTests/zero_range.yul b/test/libyul/yulInterpreterTests/zero_range.yul
new file mode 100644
index 0000000000..b39a10feb3
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/zero_range.yul
@@ -0,0 +1,10 @@
+{
+  calldatacopy(32, 0, 0)
+  // Used to store 32
+  sstore(0, msize())
+}
+// ----
+// Trace:
+//   CALLDATACOPY(32, 0, 0)
+// Memory dump:
+// Storage dump:
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index d16b6a5de0..f0691a8369 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -499,13 +499,15 @@ u256 EVMInstructionInterpreter::evalBuiltin(
 
 bool EVMInstructionInterpreter::accessMemory(u256 const& _offset, u256 const& _size)
 {
-	if (((_offset + _size) >= _offset) && ((_offset + _size + 0x1f) >= (_offset + _size)))
+	if (_size == 0)
+		return true;
+	else if (((_offset + _size) >= _offset) && ((_offset + _size + 0x1f) >= (_offset + _size)))
 	{
 		u256 newSize = (_offset + _size + 0x1f) & ~u256(0x1f);
 		m_state.msize = max(m_state.msize, newSize);
-		// We only record accesses to contiguous memory chunks that are at most 0xffff bytes
-		// in size and at an offset of at most numeric_limits<size_t>::max() - 0xffff
-		return _size <= 0xffff && _offset <= u256(numeric_limits<size_t>::max() - 0xffff);
+		// We only record accesses to contiguous memory chunks that are at most s_maxRangeSize bytes
+		// in size and at an offset of at most numeric_limits<size_t>::max() - s_maxRangeSize
+		return _size <= s_maxRangeSize && _offset <= u256(numeric_limits<size_t>::max() - s_maxRangeSize);
 	}
 	else
 		m_state.msize = u256(-1);
@@ -513,6 +515,15 @@ bool EVMInstructionInterpreter::accessMemory(u256 const& _offset, u256 const& _s
 	return false;
 }
 
+bytes EVMInstructionInterpreter::readMemory(u256 const& _offset, u256 const& _size)
+{
+	yulAssert(_size <= s_maxRangeSize, "Too large read.");
+	bytes data(size_t(_size), uint8_t(0));
+	for (size_t i = 0; i < data.size(); ++i)
+		data[i] = m_state.memory[_offset + i];
+	return data;
+}
+
 u256 EVMInstructionInterpreter::readMemoryWord(u256 const& _offset)
 {
 	return u256(h256(m_state.readMemory(_offset, 32)));
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
index 37bfdb214b..c60e4b4e7e 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -88,9 +88,15 @@ class EVMInstructionInterpreter
 	);
 
 private:
-	/// Checks if the memory access is not too large for the interpreter and adjusts
-	/// msize accordingly.
-	/// @returns false if the amount of bytes read is lager than 0xffff
+	/// Checks if the memory access is valid and adjusts msize accordingly.
+	/// @returns true if memory access is valid, false otherwise
+	/// A valid memory access must satisfy all of the following pre-requisites:
+	/// - Sum of @param _offset and @param _size do not overflow modulo u256
+	/// - Sum of @param _offset, @param _size, and 31 do not overflow modulo u256 (see note below)
+	/// - @param _size is lesser than or equal to @a s_maxRangeSize
+	/// - @param _offset is lesser than or equal to the difference of numeric_limits<size_t>::max()
+	/// and @a s_maxRangeSize
+	/// Note: Memory expansion is carried out in multiples of 32 bytes.
 	bool accessMemory(u256 const& _offset, u256 const& _size = 32);
 	/// @returns the memory contents at the provided address.
 	/// Does not adjust msize, use @a accessMemory for that
@@ -125,6 +131,9 @@ class EVMInstructionInterpreter
 	InterpreterState& m_state;
 	/// Flag to disable trace of instructions that write to memory.
 	bool m_disableMemoryWriteInstructions;
+public:
+	/// Maximum length for range-based memory access operations.
+	static constexpr unsigned s_maxRangeSize = 0xffff;
 };
 
 } // solidity::yul::test

From eb8af2caec99ffe65276b5f03976cd68800c0786 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Wed, 9 Nov 2022 12:12:18 +0100
Subject: [PATCH 1035/1748] Add basic support for the EVM version Paris

This mostly means testing with evmone, but instruction renaming of difficulty->prevrandao is omitted.
---
 .circleci/soltest_all.sh                             |  2 +-
 Changelog.md                                         |  1 +
 docs/using-the-compiler.rst                          |  5 +++--
 liblangutil/EVMVersion.h                             |  6 ++++--
 scripts/tests.sh                                     |  2 +-
 solc/CommandLineParser.cpp                           |  2 +-
 test/EVMHost.cpp                                     |  3 ++-
 test/libsolidity/StandardCompiler.cpp                |  2 ++
 .../semanticTests/state/block_difficulty.sol         |  1 +
 .../state/block_difficulty_post_paris.sol            | 12 ++++++++++++
 test/tools/fuzzer_common.cpp                         |  4 +++-
 test/tools/ossfuzz/protoToYul.cpp                    |  4 ++++
 test/tools/ossfuzz/yulProto.proto                    |  2 ++
 13 files changed, 37 insertions(+), 9 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol

diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 3e29d1d2eb..23663ce46e 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -31,7 +31,7 @@ REPODIR="$(realpath "$(dirname "$0")"/..)"
 # shellcheck source=scripts/common.sh
 source "${REPODIR}/scripts/common.sh"
 
-EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london)
+EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris)
 DEFAULT_EVM=london
 [[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
 OPTIMIZE_VALUES=(0 1)
diff --git a/Changelog.md b/Changelog.md
index 849a7625bc..6296cd3fb8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 Compiler Features:
  * Commandline Interface: Return exit code ``2`` on uncaught exceptions.
  * Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
+ * EVM: Basic support for the EVM version "Paris".
  * Natspec: Add event Natspec inheritance for devdoc.
  * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
  * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index b9ecc60ab0..89cce88a6a 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -172,7 +172,8 @@ at each version. Backward compatibility is not guaranteed between each version.
      the optimizer.
 - ``london`` (**default**)
    - The block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_) can be accessed via the global ``block.basefee`` or ``basefee()`` in inline assembly.
-
+- ``paris``
+   - No changes.
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
@@ -305,7 +306,7 @@ Input Description
         },
         // Version of the EVM to compile for.
         // Affects type checking and code generation. Can be homestead,
-        // tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg, istanbul or berlin
+        // tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg, istanbul, berlin, london or paris
         "evmVersion": "byzantium",
         // Optional: Change compilation pipeline to go through the Yul intermediate representation.
         // This is false by default.
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index 268df7d9d6..d366338451 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -56,10 +56,11 @@ class EVMVersion:
 	static EVMVersion istanbul() { return {Version::Istanbul}; }
 	static EVMVersion berlin() { return {Version::Berlin}; }
 	static EVMVersion london() { return {Version::London}; }
+	static EVMVersion paris() { return {Version::Paris}; }
 
 	static std::optional<EVMVersion> fromString(std::string const& _version)
 	{
-		for (auto const& v: {homestead(), tangerineWhistle(), spuriousDragon(), byzantium(), constantinople(), petersburg(), istanbul(), berlin(), london()})
+		for (auto const& v: {homestead(), tangerineWhistle(), spuriousDragon(), byzantium(), constantinople(), petersburg(), istanbul(), berlin(), london(), paris()})
 			if (_version == v.name())
 				return v;
 		return std::nullopt;
@@ -81,6 +82,7 @@ class EVMVersion:
 		case Version::Istanbul: return "istanbul";
 		case Version::Berlin: return "berlin";
 		case Version::London: return "london";
+		case Version::Paris: return "paris";
 		}
 		return "INVALID";
 	}
@@ -102,7 +104,7 @@ class EVMVersion:
 	bool canOverchargeGasForCall() const { return *this >= tangerineWhistle(); }
 
 private:
-	enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London };
+	enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London, Paris };
 
 	EVMVersion(Version _version): m_version(_version) {}
 
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 80559f5e21..f8230c54ad 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -105,7 +105,7 @@ EVM_VERSIONS="homestead byzantium"
 
 if [ -z "$CI" ]
 then
-    EVM_VERSIONS+=" constantinople petersburg istanbul berlin london"
+    EVM_VERSIONS+=" constantinople petersburg istanbul berlin london paris"
 fi
 
 # And then run the Solidity unit-tests in the matrix combination of optimizer / no optimizer
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index a2e4a0d661..2a1ce02280 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -586,7 +586,7 @@ General Information)").c_str(),
 			g_strEVMVersion.c_str(),
 			po::value<string>()->value_name("version")->default_value(EVMVersion{}.name()),
 			"Select desired EVM version. Either homestead, tangerineWhistle, spuriousDragon, "
-			"byzantium, constantinople, petersburg, istanbul, berlin or london."
+			"byzantium, constantinople, petersburg, istanbul, berlin, london or paris."
 		)
 		(
 			g_strExperimentalViaIR.c_str(),
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 21c7a58ed2..222b4e4436 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -122,7 +122,8 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 		m_evmRevision = EVMC_BERLIN;
 	else if (_evmVersion == langutil::EVMVersion::london())
 		m_evmRevision = EVMC_LONDON;
-	// TODO: support EVMVersion::paris()
+	else if (_evmVersion == langutil::EVMVersion::paris())
+		m_evmRevision = EVMC_PARIS;
 	else
 		assertThrow(false, Exception, "Unsupported EVM version");
 
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 54c12d30cf..61b28b11e7 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -1082,6 +1082,8 @@ BOOST_AUTO_TEST_CASE(evm_version)
 	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"berlin\"") != string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"london\","));
 	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"london\"") != string::npos);
+	result = compile(inputForVersion("\"evmVersion\": \"paris\","));
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"paris\"") != string::npos);
 	// test default
 	result = compile(inputForVersion(""));
 	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"london\"") != string::npos);
diff --git a/test/libsolidity/semanticTests/state/block_difficulty.sol b/test/libsolidity/semanticTests/state/block_difficulty.sol
index ae2a5b43a1..4f6a6b08ff 100644
--- a/test/libsolidity/semanticTests/state/block_difficulty.sol
+++ b/test/libsolidity/semanticTests/state/block_difficulty.sol
@@ -5,6 +5,7 @@ contract C {
 }
 // ====
 // compileToEwasm: also
+// EVMVersion: <paris
 // ----
 // f() -> 200000000
 // f() -> 200000000
diff --git a/test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol b/test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol
new file mode 100644
index 0000000000..9fb467e6f5
--- /dev/null
+++ b/test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() public returns (uint) {
+        return block.difficulty;
+    }
+}
+// ====
+// compileToEwasm: also
+// EVMVersion: >=paris
+// ----
+// f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
+// f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
+// f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 094a845548..25ad6986cb 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -48,7 +48,9 @@ static vector<EVMVersion> s_evmVersions = {
 	EVMVersion::constantinople(),
 	EVMVersion::petersburg(),
 	EVMVersion::istanbul(),
-	EVMVersion::berlin()
+	EVMVersion::berlin(),
+	EVMVersion::london(),
+	EVMVersion::paris()
 };
 
 void FuzzerUtil::testCompilerJsonInterface(string const& _input, bool _optimize, bool _quiet)
diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index f6759dddb4..cd2898e128 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -112,6 +112,10 @@ EVMVersion ProtoConverter::evmVersionMapping(Program_Version const& _ver)
 		return EVMVersion::istanbul();
 	case Program::BERLIN:
 		return EVMVersion::berlin();
+	case Program::LONDON:
+		return EVMVersion::london();
+	case Program::PARIS:
+		return EVMVersion::paris();
 	}
 }
 
diff --git a/test/tools/ossfuzz/yulProto.proto b/test/tools/ossfuzz/yulProto.proto
index 60f0ea1f6f..76d85068d3 100644
--- a/test/tools/ossfuzz/yulProto.proto
+++ b/test/tools/ossfuzz/yulProto.proto
@@ -396,6 +396,8 @@ message Program {
     PETERSBURG = 5;
     ISTANBUL = 6;
     BERLIN = 7;
+    LONDON = 8;
+    PARIS = 9;
   }
   oneof program_oneof {
     Block block = 1;

From c353eb0af53b46f28a2ea116a0d8240986c4d4d9 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Fri, 11 Nov 2022 12:15:35 +0100
Subject: [PATCH 1036/1748] Document difficulty vs. prevrandao

---
 docs/using-the-compiler.rst | 2 +-
 docs/yul.rst                | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 89cce88a6a..e5b5f00ec0 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -173,7 +173,7 @@ at each version. Backward compatibility is not guaranteed between each version.
 - ``london`` (**default**)
    - The block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_) can be accessed via the global ``block.basefee`` or ``basefee()`` in inline assembly.
 - ``paris``
-   - No changes.
+   - No changes, however the semantics of the ``difficulty`` value have changed (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
diff --git a/docs/yul.rst b/docs/yul.rst
index c8068de981..861f5d5329 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -933,7 +933,7 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | number()                |     | F | current block number                                            |
 +-------------------------+-----+---+-----------------------------------------------------------------+
-| difficulty()            |     | F | difficulty of the current block                                 |
+| difficulty()            |     | F | difficulty of the current block (see note below)                |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | gaslimit()              |     | F | block gas limit of the current block                            |
 +-------------------------+-----+---+-----------------------------------------------------------------+
@@ -948,6 +948,13 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
   You need to use the ``returndatasize`` opcode to check which part of this memory area contains the return data.
   The remaining bytes will retain their values as of before the call.
 
+.. note::
+  With the Paris network upgrade the semantics of ``difficulty`` have been changed.
+  It returns the value of ``prevrandao``, which is a 256-bit value, whereas the highest recorded
+  difficulty value within Ethash was ~54 bits.
+  This change is described in `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_.
+  Please note that irrelevant to which EVM version is selected in the compiler, the semantics of
+  instructions depend on the final chain of deployment.
 
 In some internal dialects, there are additional functions:
 

From 8f705fc32717c2d6d83cea6d833288495570ab67 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Fri, 4 Nov 2022 03:58:19 -0400
Subject: [PATCH 1037/1748] [Documentation] set error placement in contract,
 match example to prescription

Add example

fix order
---
 docs/style-guide.rst | 46 ++++++++++++++++++++++++++++++++++----------
 1 file changed, 36 insertions(+), 10 deletions(-)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 75de18ac09..08050c7511 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -1058,14 +1058,40 @@ Inside each contract, library or interface, use the following order:
 1. Type declarations
 2. State variables
 3. Events
-4. Modifiers
-5. Functions
+4. Errors
+5. Modifiers
+6. Functions
 
 .. note::
 
     It might be clearer to declare types close to their use in events or state
     variables.
 
+Yes:
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity >=0.8.4 <0.9.0;
+
+    abstract contract Math {
+        error DivideByZero();
+        function divide(int256 numerator, int256 denominator) public virtual returns (uint256);
+    }
+
+No:
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity >=0.8.4 <0.9.0;
+
+    abstract contract Math {
+        function divide(int256 numerator, int256 denominator) public virtual returns (uint256);
+        error DivideByZero();
+    }
+
+
 ******************
 Naming Conventions
 ******************
@@ -1130,15 +1156,15 @@ Yes:
     contract Owned {
         address public owner;
 
-        constructor() {
-            owner = msg.sender;
-        }
-
         modifier onlyOwner {
             require(msg.sender == owner);
             _;
         }
 
+        constructor() {
+            owner = msg.sender;
+        }
+
         function transferOwnership(address newOwner) public onlyOwner {
             owner = newOwner;
         }
@@ -1169,15 +1195,15 @@ No:
     contract owned {
         address public owner;
 
-        constructor() {
-            owner = msg.sender;
-        }
-
         modifier onlyOwner {
             require(msg.sender == owner);
             _;
         }
 
+        constructor() {
+            owner = msg.sender;
+        }
+
         function transferOwnership(address newOwner) public onlyOwner {
             owner = newOwner;
         }

From 5950ec306bcb52acf78759025eb364f751382bd1 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Nov 2022 16:43:58 +0100
Subject: [PATCH 1038/1748] Code to output performance metrics for optimizer
 steps.

---
 CMakeLists.txt             |  6 ++++
 libyul/optimiser/Suite.cpp | 58 +++++++++++++++++++++++++++++++++++++-
 libyul/optimiser/Suite.h   |  3 ++
 3 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 81c5f96c2e..c82ad7e480 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,6 +36,7 @@ option(SOLC_LINK_STATIC "Link solc executable statically on supported platforms"
 option(SOLC_STATIC_STDLIBS "Link solc against static versions of libgcc and libstdc++ on supported platforms" OFF)
 option(STRICT_Z3_VERSION "Use the latest version of Z3" ON)
 option(PEDANTIC "Enable extra warnings and pedantic build flags. Treat all warnings as errors." ON)
+option(PROFILE_OPTIMIZER_STEPS "Output performance metrics for the optimiser steps." OFF)
 
 # Setup cccache.
 include(EthCcache)
@@ -52,6 +53,11 @@ find_package(Threads)
 if(NOT PEDANTIC)
   message(WARNING "-- Pedantic build flags turned off. Warnings will not make compilation fail. This is NOT recommended in development builds.")
 endif()
+
+if (PROFILE_OPTIMIZER_STEPS)
+    add_definitions(-DPROFILE_OPTIMIZER_STEPS)
+endif()
+
 # Figure out what compiler and system are we using
 include(EthCompilerSettings)
 
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index c71a440019..0641328f14 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -83,9 +83,55 @@
 #include <limits>
 #include <tuple>
 
+#ifdef PROFILE_OPTIMIZER_STEPS
+#include <chrono>
+#include <fmt/format.h>
+#endif
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
+#ifdef PROFILE_OPTIMIZER_STEPS
+using namespace std::chrono;
+#endif
+
+namespace
+{
+
+#ifdef PROFILE_OPTIMIZER_STEPS
+void outputPerformanceMetrics(map<string, int64_t> const& _metrics)
+{
+	vector<pair<string, int64_t>> durations(_metrics.begin(), _metrics.end());
+	sort(
+		durations.begin(),
+		durations.end(),
+		[](pair<string, int64_t> const& _lhs, pair<string, int64_t> const& _rhs) -> bool
+		{
+			return _lhs.second < _rhs.second;
+		}
+	);
+
+	int64_t totalDurationInMicroseconds = 0;
+	for (auto&& [step, durationInMicroseconds]: durations)
+		totalDurationInMicroseconds += durationInMicroseconds;
+
+	cerr << "Performance metrics of optimizer steps" << endl;
+	cerr << "======================================" << endl;
+	constexpr double microsecondsInSecond = 1000000;
+	for (auto&& [step, durationInMicroseconds]: durations)
+	{
+		double percentage = 100.0 * static_cast<double>(durationInMicroseconds) / static_cast<double>(totalDurationInMicroseconds);
+		double sec = static_cast<double>(durationInMicroseconds) / microsecondsInSecond;
+		cerr << fmt::format("{:>7.3f}% ({} s): {}", percentage, sec, step) << endl;
+	}
+	double totalDurationInSeconds = static_cast<double>(totalDurationInMicroseconds) / microsecondsInSecond;
+	cerr << "--------------------------------------" << endl;
+	cerr << fmt::format("{:>7}% ({:.3f} s)", 100, totalDurationInSeconds) << endl;
+}
+#endif
+
+}
+
 
 void OptimiserSuite::run(
 	Dialect const& _dialect,
@@ -178,13 +224,16 @@ void OptimiserSuite::run(
 	NameSimplifier::run(suite.m_context, ast);
 	VarNameCleaner::run(suite.m_context, ast);
 
+#ifdef PROFILE_OPTIMIZER_STEPS
+	outputPerformanceMetrics(suite.m_durationPerStepInMicroseconds);
+#endif
+
 	*_object.analysisInfo = AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object);
 }
 
 namespace
 {
 
-
 template <class... Step>
 map<string, unique_ptr<OptimiserStep>> optimiserStepCollection()
 {
@@ -445,7 +494,14 @@ void OptimiserSuite::runSequence(std::vector<string> const& _steps, Block& _ast)
 	{
 		if (m_debug == Debug::PrintStep)
 			cout << "Running " << step << endl;
+#ifdef PROFILE_OPTIMIZER_STEPS
+		steady_clock::time_point startTime = steady_clock::now();
+#endif
 		allSteps().at(step)->run(m_context, _ast);
+#ifdef PROFILE_OPTIMIZER_STEPS
+		steady_clock::time_point endTime = steady_clock::now();
+		m_durationPerStepInMicroseconds[step] += duration_cast<microseconds>(endTime - startTime).count();
+#endif
 		if (m_debug == Debug::PrintChanges)
 		{
 			// TODO should add switch to also compare variable names!
diff --git a/libyul/optimiser/Suite.h b/libyul/optimiser/Suite.h
index 2db6288c0d..abed2720e2 100644
--- a/libyul/optimiser/Suite.h
+++ b/libyul/optimiser/Suite.h
@@ -87,6 +87,9 @@ class OptimiserSuite
 private:
 	OptimiserStepContext& m_context;
 	Debug m_debug;
+#ifdef PROFILE_OPTIMIZER_STEPS
+	std::map<std::string, int64_t> m_durationPerStepInMicroseconds;
+#endif
 };
 
 }

From 24df40de9abd7b77184852dd94fdb1d9df8e1b37 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Sun, 15 May 2022 17:45:43 +0200
Subject: [PATCH 1039/1748] Allow running Eldarica from the command line

---
 Changelog.md                                  |   2 +
 docs/smtchecker.rst                           |   6 +-
 libsmtutil/CHCSmtLib2Interface.cpp            |   7 +-
 libsmtutil/CHCSmtLib2Interface.h              |   2 +
 libsmtutil/SolverInterface.h                  |  35 +-
 libsolidity/CMakeLists.txt                    |   5 +-
 libsolidity/formal/BMC.cpp                    |  10 +-
 libsolidity/formal/BMC.h                      |   2 +-
 libsolidity/formal/CHC.cpp                    |  63 +-
 libsolidity/formal/CHC.h                      |   2 +-
 libsolidity/formal/ModelChecker.cpp           |  63 +-
 libsolidity/formal/ModelChecker.h             |   6 +-
 libsolidity/formal/ModelCheckerSettings.h     |   2 +-
 libsolidity/formal/SMTEncoder.cpp             |   4 +-
 libsolidity/formal/SMTEncoder.h               |   4 +-
 libsolidity/interface/CompilerStack.cpp       |  13 +-
 libsolidity/interface/SMTSolverCommand.cpp    |  85 +++
 libsolidity/interface/SMTSolverCommand.h      |  46 ++
 libsolidity/interface/UniversalCallback.h     |  53 ++
 libsolutil/CMakeLists.txt                     |   2 +
 {test => libsolutil}/TemporaryDirectory.cpp   |  20 +-
 {test => libsolutil}/TemporaryDirectory.h     |   6 +-
 scripts/error_codes.py                        |   4 +-
 solc/CommandLineInterface.cpp                 |   4 +-
 solc/CommandLineInterface.h                   |   4 +
 solc/CommandLineParser.cpp                    |   2 +-
 test/CMakeLists.txt                           |   4 +-
 .../model_checker_solvers_all/args            |   1 -
 .../model_checker_solvers_all_implicit/err    |  12 -
 .../input.sol                                 |   7 -
 .../args                                      |   0
 .../err                                       |   2 +-
 .../input.sol                                 |   0
 .../output.json                               |  72 ---
 .../output.json                               | 156 -----
 .../output.json                               | 180 ------
 .../output.json                               | 148 -----
 .../output.json                               |  31 -
 .../output.json                               | 106 ----
 .../output.json                               | 106 ----
 .../output.json                               |  94 ---
 .../output.json                               | 106 ----
 .../output.json                               |  94 ---
 .../input.json                                |  17 -
 .../output.json                               |  46 --
 .../output.json                               |   8 +-
 .../output.json                               |  62 --
 .../output.json                               |  62 --
 .../output.json                               |  58 --
 .../output.json                               | 134 -----
 .../output.json                               | 228 --------
 .../output.json                               |  64 ---
 .../output.json                               |  64 ---
 .../output.json                               |  64 ---
 .../output.json                               | 178 ------
 .../output.json                               | 122 ----
 .../output.json                               | 325 -----------
 .../output.json                               | 537 ------------------
 test/libsolidity/interface/FileReader.cpp     |   4 +-
 test/libsolutil/CommonIO.cpp                  |   2 +-
 .../TemporaryDirectoryTest.cpp                |   6 +-
 test/solc/CommandLineInterface.cpp            |   2 +-
 test/solc/CommandLineInterfaceAllowPaths.cpp  |   4 +-
 test/solc/CommandLineParser.cpp               |   2 +-
 test/yulPhaser/AlgorithmRunner.cpp            |   3 +-
 test/yulPhaser/Common.cpp                     |   3 +-
 test/yulPhaser/Phaser.cpp                     |   3 +-
 67 files changed, 384 insertions(+), 3185 deletions(-)
 create mode 100644 libsolidity/interface/SMTSolverCommand.cpp
 create mode 100644 libsolidity/interface/SMTSolverCommand.h
 create mode 100644 libsolidity/interface/UniversalCallback.h
 rename {test => libsolutil}/TemporaryDirectory.cpp (81%)
 rename {test => libsolutil}/TemporaryDirectory.h (93%)
 delete mode 100644 test/cmdlineTests/model_checker_solvers_all/args
 delete mode 100644 test/cmdlineTests/model_checker_solvers_all_implicit/err
 delete mode 100644 test/cmdlineTests/model_checker_solvers_all_implicit/input.sol
 rename test/cmdlineTests/{model_checker_solvers_all_implicit => model_checker_solvers_z3_implicit}/args (100%)
 rename test/cmdlineTests/{model_checker_solvers_all => model_checker_solvers_z3_implicit}/err (75%)
 rename test/cmdlineTests/{model_checker_solvers_all => model_checker_solvers_z3_implicit}/input.sol (100%)
 delete mode 100644 test/cmdlineTests/standard_model_checker_solvers_all/input.json
 delete mode 100644 test/cmdlineTests/standard_model_checker_solvers_all/output.json
 rename test/{ => libsolutil}/TemporaryDirectoryTest.cpp (96%)

diff --git a/Changelog.md b/Changelog.md
index 39ca56356e..7276df4d78 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,8 @@ Compiler Features:
  * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
  * Language Server: Add basic document hover support.
  * Optimizer: Added optimization rule ``and(shl(X, Y), shl(X, Z)) => shl(X, and(Y, Z))``.
+ * SMTChecker: Support Eldarica as a Horn solver for the CHC engine when using the CLI option ``--model-checker-solvers eld``. The binary `eld` must be available in the system.
+ * SMTChecker: Make ``z3`` the default solver for the BMC and CHC engines instead of all solvers.
 
 
 Bugfixes:
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index 6d2f4373b2..b1a39ee17d 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -614,19 +614,19 @@ which is primarily an SMT solver and makes `Spacer
 <https://github.com/uuverifiers/eldarica>`_ which does both.
 
 The user can choose which solvers should be used, if available, via the CLI
-option ``--model-checker-solvers {all,cvc4,smtlib2,z3}`` or the JSON option
+option ``--model-checker-solvers {all,cvc4,eld,smtlib2,z3}`` or the JSON option
 ``settings.modelChecker.solvers=[smtlib2,z3]``, where:
 
 - ``cvc4`` is only available if the ``solc`` binary is compiled with it. Only BMC uses ``cvc4``.
+- ``eld`` is used via its binary which must be installed in the system. Only CHC uses ``eld``, and only if ``z3`` is not enabled.
 - ``smtlib2`` outputs SMT/Horn queries in the `smtlib2 <http://smtlib.cs.uiowa.edu/>`_ format.
   These can be used together with the compiler's `callback mechanism <https://github.com/ethereum/solc-js>`_ so that
   any solver binary from the system can be employed to synchronously return the results of the queries to the compiler.
-  This is currently the only way to use Eldarica, for example, since it does not have a C++ API.
   This can be used by both BMC and CHC depending on which solvers are called.
 - ``z3`` is available
 
   - if ``solc`` is compiled with it;
-  - if a dynamic ``z3`` library of version 4.8.x is installed in a Linux system (from Solidity 0.7.6);
+  - if a dynamic ``z3`` library of version >=4.8.x is installed in a Linux system (from Solidity 0.7.6);
   - statically in ``soljson.js`` (from Solidity 0.6.9), that is, the Javascript binary of the compiler.
 
 .. note::
diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index c9b5f60531..e1f80e62bd 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -40,12 +40,14 @@ using namespace solidity::smtutil;
 CHCSmtLib2Interface::CHCSmtLib2Interface(
 	map<h256, string> const& _queryResponses,
 	ReadCallback::Callback _smtCallback,
+	SMTSolverChoice _enabledSolvers,
 	optional<unsigned> _queryTimeout
 ):
 	CHCSolverInterface(_queryTimeout),
 	m_smtlib2(make_unique<SMTLib2Interface>(_queryResponses, _smtCallback, m_queryTimeout)),
 	m_queryResponses(std::move(_queryResponses)),
-	m_smtCallback(_smtCallback)
+	m_smtCallback(_smtCallback),
+	m_enabledSolvers(_enabledSolvers)
 {
 	reset();
 }
@@ -203,12 +205,15 @@ string CHCSmtLib2Interface::querySolver(string const& _input)
 	util::h256 inputHash = util::keccak256(_input);
 	if (m_queryResponses.count(inputHash))
 		return m_queryResponses.at(inputHash);
+
+	smtAssert(m_enabledSolvers.smtlib2 || m_enabledSolvers.eld);
 	if (m_smtCallback)
 	{
 		auto result = m_smtCallback(ReadCallback::kindString(ReadCallback::Kind::SMTQuery), _input);
 		if (result.success)
 			return result.responseOrErrorMessage;
 	}
+
 	m_unhandledQueries.push_back(_input);
 	return "unknown\n";
 }
diff --git a/libsmtutil/CHCSmtLib2Interface.h b/libsmtutil/CHCSmtLib2Interface.h
index a7dfb76928..4748af8da6 100644
--- a/libsmtutil/CHCSmtLib2Interface.h
+++ b/libsmtutil/CHCSmtLib2Interface.h
@@ -35,6 +35,7 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 	explicit CHCSmtLib2Interface(
 		std::map<util::h256, std::string> const& _queryResponses = {},
 		frontend::ReadCallback::Callback _smtCallback = {},
+		SMTSolverChoice _enabledSolvers = SMTSolverChoice::All(),
 		std::optional<unsigned> _queryTimeout = {}
 	);
 
@@ -78,6 +79,7 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 	std::vector<std::string> m_unhandledQueries;
 
 	frontend::ReadCallback::Callback m_smtCallback;
+	SMTSolverChoice m_enabledSolvers;
 
 	std::map<Sort const*, std::string> m_sortNames;
 };
diff --git a/libsmtutil/SolverInterface.h b/libsmtutil/SolverInterface.h
index ca4c497ded..c9cf8f7004 100644
--- a/libsmtutil/SolverInterface.h
+++ b/libsmtutil/SolverInterface.h
@@ -42,28 +42,23 @@ namespace solidity::smtutil
 struct SMTSolverChoice
 {
 	bool cvc4 = false;
+	bool eld = false;
 	bool smtlib2 = false;
 	bool z3 = false;
 
-	static constexpr SMTSolverChoice All() noexcept { return {true, true, true}; }
-	static constexpr SMTSolverChoice CVC4() noexcept { return {true, false, false}; }
-	static constexpr SMTSolverChoice SMTLIB2() noexcept { return {false, true, false}; }
-	static constexpr SMTSolverChoice Z3() noexcept { return {false, false, true}; }
-	static constexpr SMTSolverChoice None() noexcept { return {false, false, false}; }
+	static constexpr SMTSolverChoice All() noexcept { return {true, true, true, true}; }
+	static constexpr SMTSolverChoice CVC4() noexcept { return {true, false, false, false}; }
+	static constexpr SMTSolverChoice ELD() noexcept { return {false, true, false, false}; }
+	static constexpr SMTSolverChoice SMTLIB2() noexcept { return {false, false, true, false}; }
+	static constexpr SMTSolverChoice Z3() noexcept { return {false, false, false, true}; }
+	static constexpr SMTSolverChoice None() noexcept { return {false, false, false, false}; }
 
 	static std::optional<SMTSolverChoice> fromString(std::string const& _solvers)
 	{
 		SMTSolverChoice solvers;
-		if (_solvers == "all")
-		{
-			smtAssert(solvers.setSolver("cvc4"), "");
-			smtAssert(solvers.setSolver("smtlib2"), "");
-			smtAssert(solvers.setSolver("z3"), "");
-		}
-		else
-			for (auto&& s: _solvers | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
-				if (!solvers.setSolver(s))
-					return {};
+		for (auto&& s: _solvers | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
+			if (!solvers.setSolver(s))
+				return {};
 
 		return solvers;
 	}
@@ -71,6 +66,7 @@ struct SMTSolverChoice
 	SMTSolverChoice& operator&=(SMTSolverChoice const& _other)
 	{
 		cvc4 &= _other.cvc4;
+		eld &= _other.eld;
 		smtlib2 &= _other.smtlib2;
 		z3 &= _other.z3;
 		return *this;
@@ -87,17 +83,20 @@ struct SMTSolverChoice
 	bool operator==(SMTSolverChoice const& _other) const noexcept
 	{
 		return cvc4 == _other.cvc4 &&
+			eld == _other.eld &&
 			smtlib2 == _other.smtlib2 &&
 			z3 == _other.z3;
 	}
 
 	bool setSolver(std::string const& _solver)
 	{
-		static std::set<std::string> const solvers{"cvc4", "smtlib2", "z3"};
+		static std::set<std::string> const solvers{"cvc4", "eld", "smtlib2", "z3"};
 		if (!solvers.count(_solver))
 			return false;
 		if (_solver == "cvc4")
 			cvc4 = true;
+		if (_solver == "eld")
+			eld = true;
 		else if (_solver == "smtlib2")
 			smtlib2 = true;
 		else if (_solver == "z3")
@@ -106,8 +105,8 @@ struct SMTSolverChoice
 	}
 
 	bool none() const noexcept { return !some(); }
-	bool some() const noexcept { return cvc4 || smtlib2 || z3; }
-	bool all() const noexcept { return cvc4 && smtlib2 && z3; }
+	bool some() const noexcept { return cvc4 || eld || smtlib2 || z3; }
+	bool all() const noexcept { return cvc4 && eld && smtlib2 && z3; }
 };
 
 enum class CheckResult
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 4319e90ffc..c331f1a4b6 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -149,10 +149,13 @@ set(sources
 	interface/Natspec.h
 	interface/OptimiserSettings.h
 	interface/ReadFile.h
+	interface/SMTSolverCommand.cpp
+	interface/SMTSolverCommand.h
 	interface/StandardCompiler.cpp
 	interface/StandardCompiler.h
 	interface/StorageLayout.cpp
 	interface/StorageLayout.h
+	interface/UniversalCallback.h
 	interface/Version.cpp
 	interface/Version.h
 	lsp/DocumentHoverHandler.cpp
@@ -181,5 +184,5 @@ set(sources
 )
 
 add_library(solidity ${sources})
-target_link_libraries(solidity PUBLIC yul evmasm langutil smtutil solutil Boost::boost fmt::fmt-header-only)
+target_link_libraries(solidity PUBLIC yul evmasm langutil smtutil solutil Boost::boost fmt::fmt-header-only Threads::Threads)
 
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index 0466bfbac4..0b4f347816 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -18,6 +18,7 @@
 
 #include <libsolidity/formal/BMC.h>
 
+#include <libsolidity/formal/ModelChecker.h>
 #include <libsolidity/formal/SymbolicTypes.h>
 
 #include <libsmtutil/SMTPortfolio.h>
@@ -40,7 +41,7 @@ BMC::BMC(
 	UniqueErrorReporter& _errorReporter,
 	map<h256, string> const& _smtlib2Responses,
 	ReadCallback::Callback const& _smtCallback,
-	ModelCheckerSettings const& _settings,
+	ModelCheckerSettings _settings,
 	CharStreamProvider const& _charStreamProvider
 ):
 	SMTEncoder(_context, _settings, _errorReporter, _charStreamProvider),
@@ -61,15 +62,14 @@ BMC::BMC(
 
 void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<VerificationTargetType>, smt::EncodingContext::IdCompare> _solvedTargets)
 {
-	if (m_interface->solvers() == 0)
+	// At this point every enabled solver is available.
+	if (!m_settings.solvers.cvc4 && !m_settings.solvers.smtlib2 && !m_settings.solvers.z3)
 	{
 		m_errorReporter.warning(
 			7710_error,
 			SourceLocation(),
 			"BMC analysis was not possible since no SMT solver was found and enabled."
-#ifdef HAVE_Z3_DLOPEN
-			" Install libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION) + " to enable Z3."
-#endif
+			" The accepted solvers for BMC are cvc4 and z3."
 		);
 		return;
 	}
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index 1990246070..daf8d834a9 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -62,7 +62,7 @@ class BMC: public SMTEncoder
 		langutil::UniqueErrorReporter& _errorReporter,
 		std::map<h256, std::string> const& _smtlib2Responses,
 		ReadCallback::Callback const& _smtCallback,
-		ModelCheckerSettings const& _settings,
+		ModelCheckerSettings _settings,
 		langutil::CharStreamProvider const& _charStreamProvider
 	);
 
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 3d5c3e6c3b..35c4033277 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -18,6 +18,8 @@
 
 #include <libsolidity/formal/CHC.h>
 
+#include <libsolidity/formal/ModelChecker.h>
+
 #ifdef HAVE_Z3
 #include <libsmtutil/Z3CHCInterface.h>
 #endif
@@ -62,7 +64,7 @@ CHC::CHC(
 	UniqueErrorReporter& _errorReporter,
 	map<util::h256, string> const& _smtlib2Responses,
 	ReadCallback::Callback const& _smtCallback,
-	ModelCheckerSettings const& _settings,
+	ModelCheckerSettings _settings,
 	CharStreamProvider const& _charStreamProvider
 ):
 	SMTEncoder(_context, _settings, _errorReporter, _charStreamProvider),
@@ -73,31 +75,29 @@ CHC::CHC(
 
 void CHC::analyze(SourceUnit const& _source)
 {
-	if (!shouldAnalyze(_source))
-		return;
-
-	bool usesZ3 = m_settings.solvers.z3;
-#ifdef HAVE_Z3_DLOPEN
-	if (m_settings.solvers.z3 && !Z3Interface::available())
+	// At this point every enabled solver is available.
+	if (!m_settings.solvers.eld && !m_settings.solvers.smtlib2 && !m_settings.solvers.z3)
 	{
-		usesZ3 = false;
 		m_errorReporter.warning(
-			8158_error,
+			7649_error,
 			SourceLocation(),
-			"z3 was selected as a Horn solver for CHC analysis but libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION) + " was not found."
+			"CHC analysis was not possible since no Horn solver was found and enabled."
+			" The accepted solvers for CHC are Eldarica and z3."
 		);
+		return;
 	}
-#endif
 
-	if (!usesZ3 && !m_settings.solvers.smtlib2)
-	{
+	if (m_settings.solvers.eld && m_settings.solvers.z3)
 		m_errorReporter.warning(
-			7649_error,
+			5798_error,
 			SourceLocation(),
-			"CHC analysis was not possible since no Horn solver was found and enabled."
+			"Multiple Horn solvers were selected for CHC."
+			" CHC only supports one solver at a time, therefore only z3 will be used."
+			" If you wish to use Eldarica, please enable Eldarica only."
 		);
+
+	if (!shouldAnalyze(_source))
 		return;
-	}
 
 	resetSourceAnalysis();
 
@@ -115,7 +115,8 @@ void CHC::analyze(SourceUnit const& _source)
 
 	bool ranSolver = true;
 	// If ranSolver is true here it's because an SMT solver callback was
-	// actually given and the queries were solved.
+	// actually given and the queries were solved,
+	// or Eldarica was chosen and was present in the system.
 	if (auto const* smtLibInterface = dynamic_cast<CHCSmtLib2Interface const*>(m_interface.get()))
 		ranSolver = smtLibInterface->unhandledQueries().empty();
 	if (!ranSolver)
@@ -994,24 +995,27 @@ void CHC::resetSourceAnalysis()
 	ArraySlicePredicate::reset();
 	m_blockCounter = 0;
 
-	bool usesZ3 = false;
-#ifdef HAVE_Z3
-	usesZ3 = m_settings.solvers.z3 && Z3Interface::available();
-	if (usesZ3)
+	// At this point every enabled solver is available.
+	// If more than one Horn solver is selected we go with z3.
+	// We still need the ifdef because of Z3CHCInterface.
+	if (m_settings.solvers.z3)
 	{
-		/// z3::fixedpoint does not have a reset mechanism, so we need to create another.
+#ifdef HAVE_Z3
+		// z3::fixedpoint does not have a reset mechanism, so we need to create another.
 		m_interface = std::make_unique<Z3CHCInterface>(m_settings.timeout);
 		auto z3Interface = dynamic_cast<Z3CHCInterface const*>(m_interface.get());
 		solAssert(z3Interface, "");
 		m_context.setSolver(z3Interface->z3Interface());
-	}
+#else
+		solAssert(false);
 #endif
-	if (!usesZ3)
+	}
+	if (!m_settings.solvers.z3)
 	{
-		solAssert(m_settings.solvers.smtlib2);
+		solAssert(m_settings.solvers.smtlib2 || m_settings.solvers.eld);
 
 		if (!m_interface)
-			m_interface = make_unique<CHCSmtLib2Interface>(m_smtlib2Responses, m_smtCallback, m_settings.timeout);
+			m_interface = make_unique<CHCSmtLib2Interface>(m_smtlib2Responses, m_smtCallback, m_settings.solvers, m_settings.timeout);
 
 		auto smtlib2Interface = dynamic_cast<CHCSmtLib2Interface*>(m_interface.get());
 		solAssert(smtlib2Interface, "");
@@ -1551,9 +1555,10 @@ tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query
 	{
 	case CheckResult::SATISFIABLE:
 	{
-#ifdef HAVE_Z3
+	// We still need the ifdef because of Z3CHCInterface.
 		if (m_settings.solvers.z3)
 		{
+#ifdef HAVE_Z3
 			// Even though the problem is SAT, Spacer's pre processing makes counterexamples incomplete.
 			// We now disable those optimizations and check whether we can still solve the problem.
 			auto* spacer = dynamic_cast<Z3CHCInterface*>(m_interface.get());
@@ -1569,8 +1574,10 @@ tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query
 				cex = std::move(cexNoOpt);
 
 			spacer->setSpacerOptions(true);
-		}
+#else
+			solAssert(false);
 #endif
+		}
 		break;
 	}
 	case CheckResult::UNSATISFIABLE:
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index fd54db6c2c..8b81ffb59a 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -59,7 +59,7 @@ class CHC: public SMTEncoder
 		langutil::UniqueErrorReporter& _errorReporter,
 		std::map<util::h256, std::string> const& _smtlib2Responses,
 		ReadCallback::Callback const& _smtCallback,
-		ModelCheckerSettings const& _settings,
+		ModelCheckerSettings _settings,
 		langutil::CharStreamProvider const& _charStreamProvider
 	);
 
diff --git a/libsolidity/formal/ModelChecker.cpp b/libsolidity/formal/ModelChecker.cpp
index 0d624f9e08..959bcbc75b 100644
--- a/libsolidity/formal/ModelChecker.cpp
+++ b/libsolidity/formal/ModelChecker.cpp
@@ -20,6 +20,13 @@
 #ifdef HAVE_Z3
 #include <libsmtutil/Z3Interface.h>
 #endif
+#ifdef HAVE_Z3_DLOPEN
+#include <z3_version.h>
+#endif
+
+#if defined(__linux) || defined(__APPLE__)
+#include <boost/process.hpp>
+#endif
 
 #include <range/v3/algorithm/any_of.hpp>
 #include <range/v3/view.hpp>
@@ -29,6 +36,7 @@ using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
+using namespace solidity::smtutil;
 
 ModelChecker::ModelChecker(
 	ErrorReporter& _errorReporter,
@@ -46,13 +54,11 @@ ModelChecker::ModelChecker(
 }
 
 // TODO This should be removed for 0.9.0.
-void ModelChecker::enableAllEnginesIfPragmaPresent(vector<shared_ptr<SourceUnit>> const& _sources)
+bool ModelChecker::isPragmaPresent(vector<shared_ptr<SourceUnit>> const& _sources)
 {
-	bool hasPragma = ranges::any_of(_sources, [](auto _source) {
+	return ranges::any_of(_sources, [](auto _source) {
 		return _source && _source->annotation().experimentalFeatures.count(ExperimentalFeature::SMTChecker);
 	});
-	if (hasPragma)
-		m_settings.engine = ModelCheckerEngine::All();
 }
 
 void ModelChecker::checkRequestedSourcesAndContracts(vector<shared_ptr<SourceUnit>> const& _sources)
@@ -135,9 +141,12 @@ vector<string> ModelChecker::unhandledQueries()
 	return m_bmc.unhandledQueries() + m_chc.unhandledQueries();
 }
 
-solidity::smtutil::SMTSolverChoice ModelChecker::availableSolvers()
+SMTSolverChoice ModelChecker::availableSolvers()
 {
 	smtutil::SMTSolverChoice available = smtutil::SMTSolverChoice::SMTLIB2();
+#if defined(__linux) || defined(__APPLE__)
+	available.eld = !boost::process::search_path("eld").empty();
+#endif
 #ifdef HAVE_Z3
 	available.z3 = solidity::smtutil::Z3Interface::available();
 #endif
@@ -146,3 +155,47 @@ solidity::smtutil::SMTSolverChoice ModelChecker::availableSolvers()
 #endif
 	return available;
 }
+
+SMTSolverChoice ModelChecker::checkRequestedSolvers(SMTSolverChoice _enabled, ErrorReporter& _errorReporter)
+{
+	SMTSolverChoice availableSolvers{ModelChecker::availableSolvers()};
+
+	if (_enabled.cvc4 && !availableSolvers.cvc4)
+	{
+		_enabled.cvc4 = false;
+		_errorReporter.warning(
+			4902_error,
+			SourceLocation(),
+			"Solver CVC4 was selected for SMTChecker but it is not available."
+		);
+	}
+
+	if (_enabled.eld && !availableSolvers.eld)
+	{
+		_enabled.eld = false;
+		_errorReporter.warning(
+			4458_error,
+			SourceLocation(),
+#if defined(__linux) || defined(__APPLE__)
+			"Solver Eldarica was selected for SMTChecker but it was not found in the system."
+#else
+			"Solver Eldarica was selected for SMTChecker but it is only supported on Linux and MacOS."
+#endif
+		);
+	}
+
+	if (_enabled.z3 && !availableSolvers.z3)
+	{
+		_enabled.z3 = false;
+		_errorReporter.warning(
+			8158_error,
+			SourceLocation(),
+			"Solver z3 was selected for SMTChecker but it is not available."
+#ifdef HAVE_Z3_DLOPEN
+			" libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION) + " was not found."
+#endif
+		);
+	}
+
+	return _enabled;
+}
diff --git a/libsolidity/formal/ModelChecker.h b/libsolidity/formal/ModelChecker.h
index ff1e19f3bd..2625bd1e06 100644
--- a/libsolidity/formal/ModelChecker.h
+++ b/libsolidity/formal/ModelChecker.h
@@ -58,7 +58,7 @@ class ModelChecker
 	);
 
 	// TODO This should be removed for 0.9.0.
-	void enableAllEnginesIfPragmaPresent(std::vector<std::shared_ptr<SourceUnit>> const& _sources);
+	static bool isPragmaPresent(std::vector<std::shared_ptr<SourceUnit>> const& _sources);
 
 	/// Generates error messages if the requested sources and contracts
 	/// do not exist.
@@ -74,6 +74,10 @@ class ModelChecker
 	/// @returns SMT solvers that are available via the C++ API.
 	static smtutil::SMTSolverChoice availableSolvers();
 
+	/// @returns the intersection of the enabled and available solvers,
+	/// reporting warnings when a solver is enabled but not available.
+	static smtutil::SMTSolverChoice checkRequestedSolvers(smtutil::SMTSolverChoice _enabled, langutil::ErrorReporter& _errorReporter);
+
 private:
 	/// Error reporter from CompilerStack.
 	/// We need to append m_uniqueErrorReporter
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index e3e93fcf40..2c86993b9d 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -153,7 +153,7 @@ struct ModelCheckerSettings
 	ModelCheckerEngine engine = ModelCheckerEngine::None();
 	ModelCheckerInvariants invariants = ModelCheckerInvariants::Default();
 	bool showUnproved = false;
-	smtutil::SMTSolverChoice solvers = smtutil::SMTSolverChoice::All();
+	smtutil::SMTSolverChoice solvers = smtutil::SMTSolverChoice::Z3();
 	ModelCheckerTargets targets = ModelCheckerTargets::Default();
 	std::optional<unsigned> timeout;
 
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index e779fbeb88..4b267bc81f 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -47,13 +47,13 @@ using namespace solidity::frontend;
 
 SMTEncoder::SMTEncoder(
 	smt::EncodingContext& _context,
-	ModelCheckerSettings const& _settings,
+	ModelCheckerSettings _settings,
 	UniqueErrorReporter& _errorReporter,
 	langutil::CharStreamProvider const& _charStreamProvider
 ):
 	m_errorReporter(_errorReporter),
 	m_context(_context),
-	m_settings(_settings),
+	m_settings(std::move(_settings)),
 	m_charStreamProvider(_charStreamProvider)
 {
 }
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 888bd6a3db..16b87be33e 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -54,7 +54,7 @@ class SMTEncoder: public ASTConstVisitor
 public:
 	SMTEncoder(
 		smt::EncodingContext& _context,
-		ModelCheckerSettings const& _settings,
+		ModelCheckerSettings _settings,
 		langutil::UniqueErrorReporter& _errorReporter,
 		langutil::CharStreamProvider const& _charStreamProvider
 	);
@@ -483,7 +483,7 @@ class SMTEncoder: public ASTConstVisitor
 	/// Stores the context of the encoding.
 	smt::EncodingContext& m_context;
 
-	ModelCheckerSettings const& m_settings;
+	ModelCheckerSettings m_settings;
 
 	/// Character stream for each source,
 	/// used for retrieving source text of expressions for e.g. counter-examples.
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index a936b055dd..f99603bf58 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -577,9 +577,18 @@ bool CompilerStack::analyze()
 
 		if (noErrors)
 		{
-			ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile);
+			// Run SMTChecker
+
 			auto allSources = util::applyMap(m_sourceOrder, [](Source const* _source) { return _source->ast; });
-			modelChecker.enableAllEnginesIfPragmaPresent(allSources);
+			if (ModelChecker::isPragmaPresent(allSources))
+				m_modelCheckerSettings.engine = ModelCheckerEngine::All();
+
+			// m_modelCheckerSettings is spread to engines and solver interfaces,
+			// so we need to check whether the enabled ones are available before building the classes.
+			if (m_modelCheckerSettings.engine.any())
+				m_modelCheckerSettings.solvers = ModelChecker::checkRequestedSolvers(m_modelCheckerSettings.solvers, m_errorReporter);
+
+			ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile);
 			modelChecker.checkRequestedSourcesAndContracts(allSources);
 			for (Source const* source: m_sourceOrder)
 				if (source->ast)
diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
new file mode 100644
index 0000000000..1896da3c64
--- /dev/null
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -0,0 +1,85 @@
+/*
+	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 <libsolidity/interface/SMTSolverCommand.h>
+
+#include <liblangutil/Exceptions.h>
+
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/Exceptions.h>
+#include <libsolutil/Keccak256.h>
+#include <libsolutil/TemporaryDirectory.h>
+
+#include <boost/algorithm/string/join.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+#include <boost/process.hpp>
+
+using solidity::langutil::InternalCompilerError;
+using solidity::util::errinfo_comment;
+
+using namespace std;
+
+namespace solidity::frontend
+{
+
+SMTSolverCommand::SMTSolverCommand(string _solverCmd) : m_solverCmd(_solverCmd) {}
+
+ReadCallback::Result SMTSolverCommand::solve(string const& _kind, string const& _query)
+{
+	try
+	{
+		if (_kind != ReadCallback::kindString(ReadCallback::Kind::SMTQuery))
+			solAssert(false, "SMTQuery callback used as callback kind " + _kind);
+
+		auto tempDir = solidity::util::TemporaryDirectory("smt");
+		util::h256 queryHash = util::keccak256(_query);
+		auto queryFileName = tempDir.path() / ("query_" + queryHash.hex() + ".smt2");
+
+		auto queryFile = boost::filesystem::ofstream(queryFileName);
+		queryFile << _query;
+
+		auto eldBin = boost::process::search_path(m_solverCmd);
+
+		if (eldBin.empty())
+			return ReadCallback::Result{false, m_solverCmd + " binary not found."};
+
+		boost::process::ipstream pipe;
+		boost::process::child eld(
+			eldBin,
+			queryFileName,
+			boost::process::std_out > pipe
+		);
+
+		vector<string> data;
+		string line;
+		while (eld.running() && std::getline(pipe, line))
+			if (!line.empty())
+				data.push_back(line);
+
+		eld.wait();
+
+		return ReadCallback::Result{true, boost::join(data, "\n")};
+	}
+	catch (...)
+	{
+		return ReadCallback::Result{false, "Unknown exception in SMTQuery callback: " + boost::current_exception_diagnostic_information()};
+	}
+}
+
+}
diff --git a/libsolidity/interface/SMTSolverCommand.h b/libsolidity/interface/SMTSolverCommand.h
new file mode 100644
index 0000000000..56a6ba1710
--- /dev/null
+++ b/libsolidity/interface/SMTSolverCommand.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
+#pragma once
+
+#include <libsolidity/interface/ReadFile.h>
+
+#include <boost/filesystem.hpp>
+
+namespace solidity::frontend
+{
+
+/// SMTSolverCommand wraps an SMT solver called via its binary in the OS.
+class SMTSolverCommand
+{
+public:
+	SMTSolverCommand(std::string _solverCmd);
+
+	/// Calls an SMT solver with the given query.
+	frontend::ReadCallback::Result solve(std::string const& _kind, std::string const& _query);
+
+	frontend::ReadCallback::Callback solver()
+	{
+		return [this](std::string const& _kind, std::string const& _query) { return solve(_kind, _query); };
+	}
+
+private:
+	/// The name of the solver's binary.
+	std::string const m_solverCmd;
+};
+
+}
diff --git a/libsolidity/interface/UniversalCallback.h b/libsolidity/interface/UniversalCallback.h
new file mode 100644
index 0000000000..1c7888f397
--- /dev/null
+++ b/libsolidity/interface/UniversalCallback.h
@@ -0,0 +1,53 @@
+/*
+	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
+#pragma once
+
+#include <libsolidity/interface/FileReader.h>
+#include <libsolidity/interface/SMTSolverCommand.h>
+
+namespace solidity::frontend
+{
+
+/// UniversalCallback is used to wrap both FileReader and SMTSolverCommand
+/// callbacks in a single callback.  It uses the Kind of the callback to
+/// determine which to call internally.
+class UniversalCallback
+{
+public:
+	UniversalCallback(FileReader&  _fileReader, SMTSolverCommand& _solver) :
+		m_fileReader{_fileReader},
+		m_solver{_solver}
+	{}
+
+	frontend::ReadCallback::Callback callback()
+	{
+		return [this](std::string const& _kind, std::string const& _data) -> ReadCallback::Result {
+			if (_kind == ReadCallback::kindString(ReadCallback::Kind::ReadFile))
+				return m_fileReader.readFile(_kind, _data);
+			else if (_kind == ReadCallback::kindString(ReadCallback::Kind::SMTQuery))
+				return m_solver.solve(_kind, _data);
+			solAssert(false, "Unknown callback kind.");
+		};
+	}
+
+private:
+	FileReader& m_fileReader;
+	SMTSolverCommand& m_solver;
+};
+
+}
diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
index 8a78cafa19..b368e12f9d 100644
--- a/libsolutil/CMakeLists.txt
+++ b/libsolutil/CMakeLists.txt
@@ -33,6 +33,8 @@ set(sources
 	StringUtils.h
 	SwarmHash.cpp
 	SwarmHash.h
+	TemporaryDirectory.cpp
+	TemporaryDirectory.h
 	UTF8.cpp
 	UTF8.h
 	vector_ref.h
diff --git a/test/TemporaryDirectory.cpp b/libsolutil/TemporaryDirectory.cpp
similarity index 81%
rename from test/TemporaryDirectory.cpp
rename to libsolutil/TemporaryDirectory.cpp
index 51c1ba9afe..e82d87cf21 100644
--- a/test/TemporaryDirectory.cpp
+++ b/libsolutil/TemporaryDirectory.cpp
@@ -16,9 +16,9 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <test/TemporaryDirectory.h>
+#include <libsolutil/TemporaryDirectory.h>
 
-#include <test/libsolidity/util/SoltestErrors.h>
+#include <liblangutil/Exceptions.h>
 
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
@@ -28,7 +28,7 @@
 
 using namespace std;
 using namespace solidity;
-using namespace solidity::test;
+using namespace solidity::util;
 
 namespace fs = boost::filesystem;
 
@@ -36,7 +36,7 @@ TemporaryDirectory::TemporaryDirectory(std::string const& _prefix):
 	m_path(fs::temp_directory_path() / fs::unique_path(_prefix + "-%%%%-%%%%-%%%%-%%%%"))
 {
 	// Prefix should just be a file name and not contain anything that would make us step out of /tmp.
-	soltestAssert(fs::path(_prefix) == fs::path(_prefix).stem(), "");
+	solAssert(fs::path(_prefix) == fs::path(_prefix).stem(), "");
 
 	fs::create_directory(m_path);
 }
@@ -49,8 +49,8 @@ TemporaryDirectory::TemporaryDirectory(
 {
 	for (boost::filesystem::path const& subdirectory: _subdirectories)
 	{
-		soltestAssert(!subdirectory.is_absolute() && subdirectory.root_path() != "/", "");
-		soltestAssert(
+		solAssert(!subdirectory.is_absolute() && subdirectory.root_path() != "/", "");
+		solAssert(
 			m_path.lexically_relative(subdirectory).empty() ||
 			*m_path.lexically_relative(subdirectory).begin() != "..",
 			""
@@ -62,10 +62,10 @@ TemporaryDirectory::TemporaryDirectory(
 TemporaryDirectory::~TemporaryDirectory()
 {
 	// A few paranoid sanity checks just to be extra sure we're not deleting someone's homework.
-	soltestAssert(m_path.string().find(fs::temp_directory_path().string()) == 0, "");
-	soltestAssert(!fs::equivalent(m_path, fs::temp_directory_path()), "");
-	soltestAssert(!fs::equivalent(m_path, m_path.root_path()), "");
-	soltestAssert(!m_path.empty(), "");
+	solAssert(m_path.string().find(fs::temp_directory_path().string()) == 0, "");
+	solAssert(!fs::equivalent(m_path, fs::temp_directory_path()), "");
+	solAssert(!fs::equivalent(m_path, m_path.root_path()), "");
+	solAssert(!m_path.empty(), "");
 
 	boost::system::error_code errorCode;
 	uintmax_t numRemoved = fs::remove_all(m_path, errorCode);
diff --git a/test/TemporaryDirectory.h b/libsolutil/TemporaryDirectory.h
similarity index 93%
rename from test/TemporaryDirectory.h
rename to libsolutil/TemporaryDirectory.h
index 94ecdca13c..4e42c6df41 100644
--- a/test/TemporaryDirectory.h
+++ b/libsolutil/TemporaryDirectory.h
@@ -27,7 +27,7 @@
 #include <string>
 #include <vector>
 
-namespace solidity::test
+namespace solidity::util
 {
 
 /**
@@ -41,10 +41,10 @@ namespace solidity::test
 class TemporaryDirectory
 {
 public:
-	TemporaryDirectory(std::string const& _prefix = "solidity-test");
+	TemporaryDirectory(std::string const& _prefix = "solidity");
 	TemporaryDirectory(
 		std::vector<boost::filesystem::path> const& _subdirectories,
-		std::string const& _prefix = "solidity-test"
+		std::string const& _prefix = "solidity"
 	);
 	~TemporaryDirectory();
 
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 84ba08bc0c..cba149b9dc 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -229,8 +229,8 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
     old_source_only_ids = {
         "1584", "1823",
         "1988", "2066", "2833", "3356",
-        "3893", "3996", "4010", "4802",
-        "5272", "5622", "7128", "7400",
+        "3893", "3996", "4010", "4458", "4802",
+        "4902", "5272", "5622", "5798", "7128", "7400",
         "7589", "7593", "7649", "7710",
         "8065", "8084", "8140", "8158",
         "8312", "8592", "9134", "9609",
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 3e44f22c02..1ac7c6bf4a 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -653,7 +653,7 @@ void CommandLineInterface::processInput()
 	{
 		solAssert(m_standardJsonInput.has_value());
 
-		StandardCompiler compiler(m_fileReader.reader(), m_options.formatting.json);
+		StandardCompiler compiler(m_universalCallback.callback(), m_options.formatting.json);
 		sout() << compiler.compile(std::move(m_standardJsonInput.value())) << endl;
 		m_standardJsonInput.reset();
 		break;
@@ -692,7 +692,7 @@ void CommandLineInterface::compile()
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
-	m_compiler = make_unique<CompilerStack>(m_fileReader.reader());
+	m_compiler = make_unique<CompilerStack>(m_universalCallback.callback());
 
 	SourceReferenceFormatter formatter(serr(false), *m_compiler, coloredOutput(m_options), m_options.formatting.withErrorIds);
 
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index b7ab158f9e..0eb69027ad 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -27,6 +27,8 @@
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/DebugSettings.h>
 #include <libsolidity/interface/FileReader.h>
+#include <libsolidity/interface/UniversalCallback.h>
+#include <libsolidity/interface/SMTSolverCommand.h>
 #include <libyul/YulStack.h>
 
 #include <iostream>
@@ -138,6 +140,8 @@ class CommandLineInterface
 	std::ostream& m_serr;
 	bool m_hasOutput = false;
 	FileReader m_fileReader;
+	SMTSolverCommand m_solverCommand{"eld"};
+	UniversalCallback m_universalCallback{m_fileReader, m_solverCommand};
 	std::optional<std::string> m_standardJsonInput;
 	std::unique_ptr<frontend::CompilerStack> m_compiler;
 	CommandLineOptions m_options;
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 2a1ce02280..6e96ad7c44 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -828,7 +828,7 @@ General Information)").c_str(),
 		)
 		(
 			g_strModelCheckerSolvers.c_str(),
-			po::value<string>()->value_name("all,cvc4,z3,smtlib2")->default_value("all"),
+			po::value<string>()->value_name("cvc4,eld,z3,smtlib2")->default_value("z3"),
 			"Select model checker solvers."
 		)
 		(
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 637a62a0cf..1b5187f33e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -13,9 +13,6 @@ set(sources
     InteractiveTests.h
     Metadata.cpp
     Metadata.h
-    TemporaryDirectory.cpp
-    TemporaryDirectory.h
-    TemporaryDirectoryTest.cpp
     TestCase.cpp
     TestCase.h
     TestCaseReader.cpp
@@ -45,6 +42,7 @@ set(libsolutil_sources
     libsolutil/LEB128.cpp
     libsolutil/StringUtils.cpp
     libsolutil/SwarmHash.cpp
+    libsolutil/TemporaryDirectoryTest.cpp
     libsolutil/UTF8.cpp
     libsolutil/Whiskers.cpp
 )
diff --git a/test/cmdlineTests/model_checker_solvers_all/args b/test/cmdlineTests/model_checker_solvers_all/args
deleted file mode 100644
index 4f09ccbe92..0000000000
--- a/test/cmdlineTests/model_checker_solvers_all/args
+++ /dev/null
@@ -1 +0,0 @@
---model-checker-engine all --model-checker-solvers all
diff --git a/test/cmdlineTests/model_checker_solvers_all_implicit/err b/test/cmdlineTests/model_checker_solvers_all_implicit/err
deleted file mode 100644
index 7fffab4ef1..0000000000
--- a/test/cmdlineTests/model_checker_solvers_all_implicit/err
+++ /dev/null
@@ -1,12 +0,0 @@
-Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-test.constructor()
-test.f(0)
- --> model_checker_solvers_all_implicit/input.sol:5:3:
-  |
-5 | 		assert(x > 0);
-  | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_solvers_all_implicit/input.sol b/test/cmdlineTests/model_checker_solvers_all_implicit/input.sol
deleted file mode 100644
index 7d05ef6e5f..0000000000
--- a/test/cmdlineTests/model_checker_solvers_all_implicit/input.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0;
-contract test {
-	function f(uint x) public pure {
-		assert(x > 0);
-	}
-}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_solvers_all_implicit/args b/test/cmdlineTests/model_checker_solvers_z3_implicit/args
similarity index 100%
rename from test/cmdlineTests/model_checker_solvers_all_implicit/args
rename to test/cmdlineTests/model_checker_solvers_z3_implicit/args
diff --git a/test/cmdlineTests/model_checker_solvers_all/err b/test/cmdlineTests/model_checker_solvers_z3_implicit/err
similarity index 75%
rename from test/cmdlineTests/model_checker_solvers_all/err
rename to test/cmdlineTests/model_checker_solvers_z3_implicit/err
index 3db918e25c..98d61828d9 100644
--- a/test/cmdlineTests/model_checker_solvers_all/err
+++ b/test/cmdlineTests/model_checker_solvers_z3_implicit/err
@@ -6,7 +6,7 @@ x = 0
 Transaction trace:
 test.constructor()
 test.f(0)
- --> model_checker_solvers_all/input.sol:5:3:
+ --> model_checker_solvers_z3_implicit/input.sol:5:3:
   |
 5 | 		assert(x > 0);
   | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_solvers_all/input.sol b/test/cmdlineTests/model_checker_solvers_z3_implicit/input.sol
similarity index 100%
rename from test/cmdlineTests/model_checker_solvers_all/input.sol
rename to test/cmdlineTests/model_checker_solvers_z3_implicit/input.sol
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
index db2384cd9f..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
@@ -1,76 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x72b32f47722af7f889ab5740b229c1799f27d0a693995a581c00f65438255a15": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |a_3_3| () Int)
-(declare-fun |b_5_3| () Int)
-(declare-fun |_8_3| () Int)
-(declare-fun |_10_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_4| () Int)
-(declare-fun |b_5_4| () Int)
-(declare-fun |_8_4| () Int)
-(declare-fun |_10_4| () Int)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_15_1)))
-(check-sat)
-",
-            "0x825b322db572f1c2705128460f2af503aeeb571f1c2e15207ce4fd0355accee6": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |a_3_3| () Int)
-(declare-fun |b_5_3| () Int)
-(declare-fun |_8_3| () Int)
-(declare-fun |_10_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_4| () Int)
-(declare-fun |b_5_4| () Int)
-(declare-fun |_8_4| () Int)
-(declare-fun |_10_4| () Int)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_15_1))
-(check-sat)
-"
-        }
-    },
     "sources":
     {
         "A":
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
index e733f8597e..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
@@ -1,160 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x4e97ac0812ea5c46e435c3db54d9e2eb4a3bcadff47f83ce1640429a0a47f6a4": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_19_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_20_1| () Int)
-(declare-fun |expr_21_0| () Int)
-(declare-fun |expr_22_0| () Int)
-(declare-fun |d_div_mod_1_0| () Int)
-(declare-fun |r_div_mod_1_0| () Int)
-(declare-fun |expr_23_1| () Int)
-(declare-datatypes ((|tuple(uint256,uint256)| 0)) (((|tuple(uint256,uint256)| (|tuple(uint256,uint256)_accessor_0| Int) (|tuple(uint256,uint256)_accessor_1| Int)))))
-(declare-fun |expr_24_1| () |tuple(uint256,uint256)|)
-(declare-fun |_8_1| () Int)
-(declare-fun |_10_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_19_0 0) (<= expr_19_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_0 b_5_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 a_3_0) (and (=> (and true true) expr_15_1) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))) (= expr_19_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| b_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| _8_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| _10_0))
-(declare-const |EVALEXPR_4| Int)
-(assert (= |EVALEXPR_4| expr_19_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-",
-            "0x5e6c35c70ccbb1d9823ba3ab86fc9448ead56e6158f73aa8bed482232be56105": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_19_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_20_1| () Int)
-(declare-fun |expr_21_0| () Int)
-(declare-fun |expr_22_0| () Int)
-(declare-fun |d_div_mod_1_0| () Int)
-(declare-fun |r_div_mod_1_0| () Int)
-(declare-fun |expr_23_1| () Int)
-(declare-datatypes ((|tuple(uint256,uint256)| 0)) (((|tuple(uint256,uint256)| (|tuple(uint256,uint256)_accessor_0| Int) (|tuple(uint256,uint256)_accessor_1| Int)))))
-(declare-fun |expr_24_1| () |tuple(uint256,uint256)|)
-(declare-fun |_8_1| () Int)
-(declare-fun |_10_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_22_0 0) (<= expr_22_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_22_0 b_5_0) (and (=> (and true true) (and (>= expr_21_0 0) (<= expr_21_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_21_0 a_3_0) (and (=> (and true true) (and (>= expr_20_1 0) (<= expr_20_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_1 (ite (= expr_19_0 0) 0 d_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_19_0 0) (< r_div_mod_0_0 expr_19_0))) (and (= (+ (* d_div_mod_0_0 expr_19_0) r_div_mod_0_0) expr_18_0) (and (=> (and true true) (and (>= expr_19_0 0) (<= expr_19_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_0 b_5_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 a_3_0) (and (=> (and true true) expr_15_1) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))) (= expr_22_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| b_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| _8_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| _10_0))
-(declare-const |EVALEXPR_4| Int)
-(assert (= |EVALEXPR_4| expr_22_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-",
-            "0x615d3f7e7a864c5b3fa9663d698ad3525d0345fa9b53c171d86493beded9023b": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_15_1)))
-(check-sat)
-",
-            "0x769f12e07b77225b4e96b3031839452b89976583e45e7924b8bf82ca53a0dd45": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_15_1))
-(check-sat)
-"
-        }
-    },
     "sources":
     {
         "A":
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
index 936ee3ffe4..fccd15838f 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
@@ -1,184 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x591e1d66214247cc99275e22a55210a804c80e9939d5e515cd60a20b3a927c44": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |a_3_3| () Int)
-(declare-fun |b_5_3| () Int)
-(declare-fun |_8_3| () Int)
-(declare-fun |_10_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_4| () Int)
-(declare-fun |b_5_4| () Int)
-(declare-fun |_8_4| () Int)
-(declare-fun |_10_4| () Int)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_19_0| () Int)
-(declare-fun |expr_20_1| () Int)
-(declare-fun |expr_21_0| () Int)
-(declare-fun |expr_22_0| () Int)
-(declare-fun |expr_23_1| () Int)
-(declare-datatypes ((|tuple(uint256,uint256)| 0)) (((|tuple(uint256,uint256)| (|tuple(uint256,uint256)_accessor_0| Int) (|tuple(uint256,uint256)_accessor_1| Int)))))
-(declare-fun |expr_24_1| () |tuple(uint256,uint256)|)
-(declare-fun |_8_1| () Int)
-(declare-fun |_10_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_19_0 0) (<= expr_19_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_0 b_5_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 a_3_0) (and (=> (and true true) expr_15_1) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))) (= expr_19_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| b_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| _8_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| _10_0))
-(declare-const |EVALEXPR_4| Int)
-(assert (= |EVALEXPR_4| expr_19_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-",
-            "0x5d07befb0482a6d4e328641d57f10a2cbc89b2c287f8d5630bbe20ba4f829e7d": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |a_3_3| () Int)
-(declare-fun |b_5_3| () Int)
-(declare-fun |_8_3| () Int)
-(declare-fun |_10_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_4| () Int)
-(declare-fun |b_5_4| () Int)
-(declare-fun |_8_4| () Int)
-(declare-fun |_10_4| () Int)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_19_0| () Int)
-(declare-fun |expr_20_1| () Int)
-(declare-fun |expr_21_0| () Int)
-(declare-fun |expr_22_0| () Int)
-(declare-fun |expr_23_1| () Int)
-(declare-datatypes ((|tuple(uint256,uint256)| 0)) (((|tuple(uint256,uint256)| (|tuple(uint256,uint256)_accessor_0| Int) (|tuple(uint256,uint256)_accessor_1| Int)))))
-(declare-fun |expr_24_1| () |tuple(uint256,uint256)|)
-(declare-fun |_8_1| () Int)
-(declare-fun |_10_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_22_0 0) (<= expr_22_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_22_0 b_5_0) (and (=> (and true true) (and (>= expr_21_0 0) (<= expr_21_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_21_0 a_3_0) (and (=> (and true true) (and (>= expr_20_1 0) (<= expr_20_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_1 (div expr_18_0 expr_19_0)) (and (=> (and true true) (and (>= expr_19_0 0) (<= expr_19_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_0 b_5_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 a_3_0) (and (=> (and true true) expr_15_1) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))) (= expr_22_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| b_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| _8_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| _10_0))
-(declare-const |EVALEXPR_4| Int)
-(assert (= |EVALEXPR_4| expr_22_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-",
-            "0x72b32f47722af7f889ab5740b229c1799f27d0a693995a581c00f65438255a15": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |a_3_3| () Int)
-(declare-fun |b_5_3| () Int)
-(declare-fun |_8_3| () Int)
-(declare-fun |_10_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_4| () Int)
-(declare-fun |b_5_4| () Int)
-(declare-fun |_8_4| () Int)
-(declare-fun |_10_4| () Int)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_15_1)))
-(check-sat)
-",
-            "0x825b322db572f1c2705128460f2af503aeeb571f1c2e15207ce4fd0355accee6": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |a_3_3| () Int)
-(declare-fun |b_5_3| () Int)
-(declare-fun |_8_3| () Int)
-(declare-fun |_10_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_4| () Int)
-(declare-fun |b_5_4| () Int)
-(declare-fun |_8_4| () Int)
-(declare-fun |_10_4| () Int)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_15_1))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
index ae3a76a25b..acf3b74ef1 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
@@ -1,152 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x615d3f7e7a864c5b3fa9663d698ad3525d0345fa9b53c171d86493beded9023b": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_15_1)))
-(check-sat)
-",
-            "0x769f12e07b77225b4e96b3031839452b89976583e45e7924b8bf82ca53a0dd45": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_15_1))
-(check-sat)
-",
-            "0x7eae514917329522604efe7292b9036d26ff191c3e65dfa51c727b3e7427c10b": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_19_0| () Int)
-(declare-fun |expr_20_1| () Int)
-(declare-fun |expr_21_0| () Int)
-(declare-fun |expr_22_0| () Int)
-(declare-fun |expr_23_1| () Int)
-(declare-datatypes ((|tuple(uint256,uint256)| 0)) (((|tuple(uint256,uint256)| (|tuple(uint256,uint256)_accessor_0| Int) (|tuple(uint256,uint256)_accessor_1| Int)))))
-(declare-fun |expr_24_1| () |tuple(uint256,uint256)|)
-(declare-fun |_8_1| () Int)
-(declare-fun |_10_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_19_0 0) (<= expr_19_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_0 b_5_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 a_3_0) (and (=> (and true true) expr_15_1) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))) (= expr_19_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| b_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| _8_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| _10_0))
-(declare-const |EVALEXPR_4| Int)
-(assert (= |EVALEXPR_4| expr_19_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-",
-            "0xda96cf77e7e434e73e6c4dd847b2e0aa96dbdebf7a585f884ff024246977d02a": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |a_3_0| () Int)
-(declare-fun |b_5_0| () Int)
-(declare-fun |_8_0| () Int)
-(declare-fun |_10_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_0| () Int)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_19_0| () Int)
-(declare-fun |expr_20_1| () Int)
-(declare-fun |expr_21_0| () Int)
-(declare-fun |expr_22_0| () Int)
-(declare-fun |expr_23_1| () Int)
-(declare-datatypes ((|tuple(uint256,uint256)| 0)) (((|tuple(uint256,uint256)| (|tuple(uint256,uint256)_accessor_0| Int) (|tuple(uint256,uint256)_accessor_1| Int)))))
-(declare-fun |expr_24_1| () |tuple(uint256,uint256)|)
-(declare-fun |_8_1| () Int)
-(declare-fun |_10_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_22_0 0) (<= expr_22_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_22_0 b_5_0) (and (=> (and true true) (and (>= expr_21_0 0) (<= expr_21_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_21_0 a_3_0) (and (=> (and true true) (and (>= expr_20_1 0) (<= expr_20_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_1 (div expr_18_0 expr_19_0)) (and (=> (and true true) (and (>= expr_19_0 0) (<= expr_19_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_0 b_5_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 a_3_0) (and (=> (and true true) expr_15_1) (and (= expr_15_1 (not (= expr_13_0 expr_14_0))) (and (=> (and true true) true) (and (= expr_14_0 0) (and (=> (and true true) (and (>= expr_13_0 0) (<= expr_13_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_13_0 b_5_0) (and (= _10_0 0) (and (= _8_0 0) (and (and (>= b_5_0 0) (<= b_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_3_0 0) (<= a_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 332507694)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 19)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 209)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 170)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 46)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))) (= expr_22_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| b_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| _8_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| _10_0))
-(declare-const |EVALEXPR_4| Int)
-(assert (= |EVALEXPR_4| expr_22_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-"
-        }
-    },
     "sources":
     {
         "A":
diff --git a/test/cmdlineTests/standard_model_checker_engine_bmc/output.json b/test/cmdlineTests/standard_model_checker_engine_bmc/output.json
index 4ddb024146..75e679ef47 100644
--- a/test/cmdlineTests/standard_model_checker_engine_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_engine_bmc/output.json
@@ -1,35 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x7fe5be7672be6bc9bc2b750f3170bfa08ecd79fc95afb084539b74294c2dd24d": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |expr_7_0| () Int)
-(declare-fun |expr_8_0| () Int)
-(declare-fun |expr_9_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_9_1 (> expr_7_0 expr_8_0)) (and (=> (and true true) true) (and (= expr_8_0 0) (and (=> (and true true) (and (>= expr_7_0 0) (<= expr_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_7_0 x_3_0) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3017696395)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 179)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 222)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 100)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 139)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))) (not expr_9_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_3_0))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json
index fafec12d37..fb599d21d2 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_default_all_engines/output.json
@@ -1,110 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x4cd81a462deca8d6bf08b33a7f5bce9cf9306c7ee90b83c106ca7927066a23b1": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_3| () |struct test.S|)
-(declare-fun |b_9_3| () Bool)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |s_7_4| () |struct test.S|)
-(declare-fun |b_9_4| () Bool)
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) (not expr_15_0)))
-(check-sat)
-",
-            "0x65d23088fadc165b70d1947e1ba5191db247c8c5fab4e23d292c1168e94b4784": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_3| () |struct test.S|)
-(declare-fun |b_9_3| () Bool)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |s_7_4| () |struct test.S|)
-(declare-fun |b_9_4| () Bool)
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_16_0| () Int)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_12_0| () |struct test.S|)
-(declare-fun |expr_14_1| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_12_1| () |struct test.S|)
-(declare-fun |expr_12_2| () |struct test.S|)
-(declare-fun |expr_14_2| () Int)
-(declare-fun |s_7_2| () |struct test.S|)
-(declare-fun |expr_12_3| () |struct test.S|)
-(declare-fun |expr_22_0| () |struct test.S|)
-(declare-fun |expr_23_1| () Int)
-(declare-fun |expr_24_0| () Int)
-(declare-fun |expr_25_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_25_1 (> expr_23_1 expr_24_0)) (and (=> (and true true) true) (and (= expr_24_0 0) (and (=> (and true true) (and (>= expr_23_1 0) (<= expr_23_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_23_1 (|struct test.S_accessor_x| expr_22_0)) (and (= expr_22_0 s_7_2) (and (= expr_12_3 s_7_2) (and (ite (and true true) (= s_7_2 expr_12_2) (= s_7_2 s_7_1)) (and (=> (and true true) (and (>= expr_14_2 0) (<= expr_14_2 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_14_2 (|struct test.S_accessor_x| expr_12_2)) (and (= (|struct test.S_accessor_x| expr_12_2) expr_19_1) (and (= expr_12_1 s_7_1) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (bv2nat (bvor (ite (>= expr_14_1 0) ((_ int2bv 256) expr_14_1) (bvneg ((_ int2bv 256) (- expr_14_1)))) (ite (>= expr_18_0 0) ((_ int2bv 256) expr_18_0) (bvneg ((_ int2bv 256) (- expr_18_0))))))) (and (=> (and true true) (and (>= expr_14_1 0) (<= expr_14_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_14_1 (|struct test.S_accessor_x| expr_12_0)) (and (= expr_12_0 s_7_1) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 255))) (and (= expr_18_0 (ite expr_15_1 expr_16_0 expr_17_0)) (and (=> (and (and true true) (not expr_15_1)) true) (and (= expr_17_0 2) (and (=> (and (and true true) expr_15_1) true) (and (= expr_16_0 1) (and (= expr_15_1 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))))) (not expr_25_1)))
-(declare-const |EVALEXPR_0| Bool)
-(assert (= |EVALEXPR_0| b_9_0))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-",
-            "0xd6dbbd7b7e45b0360943223d07028611980d896347710102f264ffa0ae086fad": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_3| () |struct test.S|)
-(declare-fun |b_9_3| () Bool)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |s_7_4| () |struct test.S|)
-(declare-fun |b_9_4| () Bool)
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) expr_15_0))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json
index fafec12d37..fb599d21d2 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_false_all_engines/output.json
@@ -1,110 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x4cd81a462deca8d6bf08b33a7f5bce9cf9306c7ee90b83c106ca7927066a23b1": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_3| () |struct test.S|)
-(declare-fun |b_9_3| () Bool)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |s_7_4| () |struct test.S|)
-(declare-fun |b_9_4| () Bool)
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) (not expr_15_0)))
-(check-sat)
-",
-            "0x65d23088fadc165b70d1947e1ba5191db247c8c5fab4e23d292c1168e94b4784": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_3| () |struct test.S|)
-(declare-fun |b_9_3| () Bool)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |s_7_4| () |struct test.S|)
-(declare-fun |b_9_4| () Bool)
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_16_0| () Int)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_12_0| () |struct test.S|)
-(declare-fun |expr_14_1| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_12_1| () |struct test.S|)
-(declare-fun |expr_12_2| () |struct test.S|)
-(declare-fun |expr_14_2| () Int)
-(declare-fun |s_7_2| () |struct test.S|)
-(declare-fun |expr_12_3| () |struct test.S|)
-(declare-fun |expr_22_0| () |struct test.S|)
-(declare-fun |expr_23_1| () Int)
-(declare-fun |expr_24_0| () Int)
-(declare-fun |expr_25_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_25_1 (> expr_23_1 expr_24_0)) (and (=> (and true true) true) (and (= expr_24_0 0) (and (=> (and true true) (and (>= expr_23_1 0) (<= expr_23_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_23_1 (|struct test.S_accessor_x| expr_22_0)) (and (= expr_22_0 s_7_2) (and (= expr_12_3 s_7_2) (and (ite (and true true) (= s_7_2 expr_12_2) (= s_7_2 s_7_1)) (and (=> (and true true) (and (>= expr_14_2 0) (<= expr_14_2 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_14_2 (|struct test.S_accessor_x| expr_12_2)) (and (= (|struct test.S_accessor_x| expr_12_2) expr_19_1) (and (= expr_12_1 s_7_1) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (bv2nat (bvor (ite (>= expr_14_1 0) ((_ int2bv 256) expr_14_1) (bvneg ((_ int2bv 256) (- expr_14_1)))) (ite (>= expr_18_0 0) ((_ int2bv 256) expr_18_0) (bvneg ((_ int2bv 256) (- expr_18_0))))))) (and (=> (and true true) (and (>= expr_14_1 0) (<= expr_14_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_14_1 (|struct test.S_accessor_x| expr_12_0)) (and (= expr_12_0 s_7_1) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 255))) (and (= expr_18_0 (ite expr_15_1 expr_16_0 expr_17_0)) (and (=> (and (and true true) (not expr_15_1)) true) (and (= expr_17_0 2) (and (=> (and (and true true) expr_15_1) true) (and (= expr_16_0 1) (and (= expr_15_1 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))))) (not expr_25_1)))
-(declare-const |EVALEXPR_0| Bool)
-(assert (= |EVALEXPR_0| b_9_0))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-",
-            "0xd6dbbd7b7e45b0360943223d07028611980d896347710102f264ffa0ae086fad": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_3| () |struct test.S|)
-(declare-fun |b_9_3| () Bool)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |s_7_4| () |struct test.S|)
-(declare-fun |b_9_4| () Bool)
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) expr_15_0))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json
index a274a20c56..4554ec69e9 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_false_bmc/output.json
@@ -1,98 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x5953b22204605efc775a59974aec3ddf9f831e46e30a65e149873e6f48887590": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) (not expr_15_0)))
-(check-sat)
-",
-            "0x84635fcc37e5318fb46619945199a333750ee247769e97445a2f89b98b54fef9": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_16_0| () Int)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_12_0| () |struct test.S|)
-(declare-fun |expr_14_1| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_12_1| () |struct test.S|)
-(declare-fun |expr_12_2| () |struct test.S|)
-(declare-fun |expr_14_2| () Int)
-(declare-fun |s_7_2| () |struct test.S|)
-(declare-fun |expr_12_3| () |struct test.S|)
-(declare-fun |expr_22_0| () |struct test.S|)
-(declare-fun |expr_23_1| () Int)
-(declare-fun |expr_24_0| () Int)
-(declare-fun |expr_25_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_25_1 (> expr_23_1 expr_24_0)) (and (=> (and true true) true) (and (= expr_24_0 0) (and (=> (and true true) (and (>= expr_23_1 0) (<= expr_23_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_23_1 (|struct test.S_accessor_x| expr_22_0)) (and (= expr_22_0 s_7_2) (and (= expr_12_3 s_7_2) (and (ite (and true true) (= s_7_2 expr_12_2) (= s_7_2 s_7_1)) (and (=> (and true true) (and (>= expr_14_2 0) (<= expr_14_2 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_14_2 (|struct test.S_accessor_x| expr_12_2)) (and (= (|struct test.S_accessor_x| expr_12_2) expr_19_1) (and (= expr_12_1 s_7_1) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (bv2nat (bvor (ite (>= expr_14_1 0) ((_ int2bv 256) expr_14_1) (bvneg ((_ int2bv 256) (- expr_14_1)))) (ite (>= expr_18_0 0) ((_ int2bv 256) expr_18_0) (bvneg ((_ int2bv 256) (- expr_18_0))))))) (and (=> (and true true) (and (>= expr_14_1 0) (<= expr_14_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_14_1 (|struct test.S_accessor_x| expr_12_0)) (and (= expr_12_0 s_7_1) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 255))) (and (= expr_18_0 (ite expr_15_1 expr_16_0 expr_17_0)) (and (=> (and (and true true) (not expr_15_1)) true) (and (= expr_17_0 2) (and (=> (and (and true true) expr_15_1) true) (and (= expr_16_0 1) (and (= expr_15_1 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))))) (not expr_25_1)))
-(declare-const |EVALEXPR_0| Bool)
-(assert (= |EVALEXPR_0| b_9_0))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-",
-            "0xd55ef003dcd6e8ebbd55fce4adaa36b4d898204d649e5426179dea4b7450a9f5": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) expr_15_0))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json
index 6fcfb8bcfb..ecb157f88f 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_true_all_engines/output.json
@@ -1,110 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x4cd81a462deca8d6bf08b33a7f5bce9cf9306c7ee90b83c106ca7927066a23b1": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_3| () |struct test.S|)
-(declare-fun |b_9_3| () Bool)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |s_7_4| () |struct test.S|)
-(declare-fun |b_9_4| () Bool)
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) (not expr_15_0)))
-(check-sat)
-",
-            "0x65d23088fadc165b70d1947e1ba5191db247c8c5fab4e23d292c1168e94b4784": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_3| () |struct test.S|)
-(declare-fun |b_9_3| () Bool)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |s_7_4| () |struct test.S|)
-(declare-fun |b_9_4| () Bool)
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_16_0| () Int)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_12_0| () |struct test.S|)
-(declare-fun |expr_14_1| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_12_1| () |struct test.S|)
-(declare-fun |expr_12_2| () |struct test.S|)
-(declare-fun |expr_14_2| () Int)
-(declare-fun |s_7_2| () |struct test.S|)
-(declare-fun |expr_12_3| () |struct test.S|)
-(declare-fun |expr_22_0| () |struct test.S|)
-(declare-fun |expr_23_1| () Int)
-(declare-fun |expr_24_0| () Int)
-(declare-fun |expr_25_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_25_1 (> expr_23_1 expr_24_0)) (and (=> (and true true) true) (and (= expr_24_0 0) (and (=> (and true true) (and (>= expr_23_1 0) (<= expr_23_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_23_1 (|struct test.S_accessor_x| expr_22_0)) (and (= expr_22_0 s_7_2) (and (= expr_12_3 s_7_2) (and (ite (and true true) (= s_7_2 expr_12_2) (= s_7_2 s_7_1)) (and (=> (and true true) (and (>= expr_14_2 0) (<= expr_14_2 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_14_2 (|struct test.S_accessor_x| expr_12_2)) (and (= (|struct test.S_accessor_x| expr_12_2) expr_19_1) (and (= expr_12_1 s_7_1) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (bv2nat (bvor (ite (>= expr_14_1 0) ((_ int2bv 256) expr_14_1) (bvneg ((_ int2bv 256) (- expr_14_1)))) (ite (>= expr_18_0 0) ((_ int2bv 256) expr_18_0) (bvneg ((_ int2bv 256) (- expr_18_0))))))) (and (=> (and true true) (and (>= expr_14_1 0) (<= expr_14_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_14_1 (|struct test.S_accessor_x| expr_12_0)) (and (= expr_12_0 s_7_1) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 255))) (and (= expr_18_0 (ite expr_15_1 expr_16_0 expr_17_0)) (and (=> (and (and true true) (not expr_15_1)) true) (and (= expr_17_0 2) (and (=> (and (and true true) expr_15_1) true) (and (= expr_16_0 1) (and (= expr_15_1 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))))) (not expr_25_1)))
-(declare-const |EVALEXPR_0| Bool)
-(assert (= |EVALEXPR_0| b_9_0))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-",
-            "0xd6dbbd7b7e45b0360943223d07028611980d896347710102f264ffa0ae086fad": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_3| () |struct test.S|)
-(declare-fun |b_9_3| () Bool)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |s_7_4| () |struct test.S|)
-(declare-fun |b_9_4| () Bool)
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) expr_15_0))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json
index 006e1f03ba..116af8dce2 100644
--- a/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_show_unproved_true_bmc/output.json
@@ -1,98 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x5953b22204605efc775a59974aec3ddf9f831e46e30a65e149873e6f48887590": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) (not expr_15_0)))
-(check-sat)
-",
-            "0x84635fcc37e5318fb46619945199a333750ee247769e97445a2f89b98b54fef9": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-(declare-fun |expr_15_1| () Bool)
-(declare-fun |expr_16_0| () Int)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |expr_12_0| () |struct test.S|)
-(declare-fun |expr_14_1| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_12_1| () |struct test.S|)
-(declare-fun |expr_12_2| () |struct test.S|)
-(declare-fun |expr_14_2| () Int)
-(declare-fun |s_7_2| () |struct test.S|)
-(declare-fun |expr_12_3| () |struct test.S|)
-(declare-fun |expr_22_0| () |struct test.S|)
-(declare-fun |expr_23_1| () Int)
-(declare-fun |expr_24_0| () Int)
-(declare-fun |expr_25_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_25_1 (> expr_23_1 expr_24_0)) (and (=> (and true true) true) (and (= expr_24_0 0) (and (=> (and true true) (and (>= expr_23_1 0) (<= expr_23_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_23_1 (|struct test.S_accessor_x| expr_22_0)) (and (= expr_22_0 s_7_2) (and (= expr_12_3 s_7_2) (and (ite (and true true) (= s_7_2 expr_12_2) (= s_7_2 s_7_1)) (and (=> (and true true) (and (>= expr_14_2 0) (<= expr_14_2 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_14_2 (|struct test.S_accessor_x| expr_12_2)) (and (= (|struct test.S_accessor_x| expr_12_2) expr_19_1) (and (= expr_12_1 s_7_1) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (bv2nat (bvor (ite (>= expr_14_1 0) ((_ int2bv 256) expr_14_1) (bvneg ((_ int2bv 256) (- expr_14_1)))) (ite (>= expr_18_0 0) ((_ int2bv 256) expr_18_0) (bvneg ((_ int2bv 256) (- expr_18_0))))))) (and (=> (and true true) (and (>= expr_14_1 0) (<= expr_14_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_14_1 (|struct test.S_accessor_x| expr_12_0)) (and (= expr_12_0 s_7_1) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 255))) (and (= expr_18_0 (ite expr_15_1 expr_16_0 expr_17_0)) (and (=> (and (and true true) (not expr_15_1)) true) (and (= expr_17_0 2) (and (=> (and (and true true) expr_15_1) true) (and (= expr_16_0 1) (and (= expr_15_1 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))))) (not expr_25_1)))
-(declare-const |EVALEXPR_0| Bool)
-(assert (= |EVALEXPR_0| b_9_0))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-",
-            "0xd55ef003dcd6e8ebbd55fce4adaa36b4d898204d649e5426179dea4b7450a9f5": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|struct test.S| 0)) (((|struct test.S| (|struct test.S_accessor_x| Int)))))
-(declare-fun |s_7_0| () |struct test.S|)
-(declare-fun |b_9_0| () Bool)
-(declare-fun |s_7_1| () |struct test.S|)
-(declare-fun |expr_15_0| () Bool)
-
-(assert (and (and (and true true) (and (= expr_15_0 b_9_0) (and true (and true (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 2562959041)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 152)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 195)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 166)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))) expr_15_0))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_solvers_all/input.json b/test/cmdlineTests/standard_model_checker_solvers_all/input.json
deleted file mode 100644
index db9f2232de..0000000000
--- a/test/cmdlineTests/standard_model_checker_solvers_all/input.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract C { function f(uint x) public pure { assert(x > 0); } }"
-		}
-	},
-	"settings":
-	{
-		"modelChecker":
-		{
-			"engine": "all"
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_all/output.json b/test/cmdlineTests/standard_model_checker_solvers_all/output.json
deleted file mode 100644
index 2a2c394fdd..0000000000
--- a/test/cmdlineTests/standard_model_checker_solvers_all/output.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "6328",
-            "formattedMessage": "Warning: CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-C.constructor()
-C.f(0)
- --> A:4:47:
-  |
-4 | contract C { function f(uint x) public pure { assert(x > 0); } }
-  |                                               ^^^^^^^^^^^^^
-
-",
-            "message": "CHC: Assertion violation happens here.
-Counterexample:
-
-x = 0
-
-Transaction trace:
-C.constructor()
-C.f(0)",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 119,
-                "file": "A",
-                "start": 106
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_none/output.json b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
index ab989857cd..e5d356ce5a 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_none/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_none/output.json
@@ -4,20 +4,20 @@
         {
             "component": "general",
             "errorCode": "7649",
-            "formattedMessage": "Warning: CHC analysis was not possible since no Horn solver was found and enabled.
+            "formattedMessage": "Warning: CHC analysis was not possible since no Horn solver was found and enabled. The accepted solvers for CHC are Eldarica and z3.
 
 ",
-            "message": "CHC analysis was not possible since no Horn solver was found and enabled.",
+            "message": "CHC analysis was not possible since no Horn solver was found and enabled. The accepted solvers for CHC are Eldarica and z3.",
             "severity": "warning",
             "type": "Warning"
         },
         {
             "component": "general",
             "errorCode": "7710",
-            "formattedMessage": "Warning: BMC analysis was not possible since no SMT solver was found and enabled.
+            "formattedMessage": "Warning: BMC analysis was not possible since no SMT solver was found and enabled. The accepted solvers for BMC are cvc4 and z3.
 
 ",
-            "message": "BMC analysis was not possible since no SMT solver was found and enabled.",
+            "message": "BMC analysis was not possible since no SMT solver was found and enabled. The accepted solvers for BMC are cvc4 and z3.",
             "severity": "warning",
             "type": "Warning"
         }
diff --git a/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json
index 0393396edf..18452ccbc9 100644
--- a/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_assert_bmc/output.json
@@ -1,66 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x67f6235b42fbb5cc636b1d18ccd5622020b45eef0c634965f9adf8b4bb923a64": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (= expr_41_1 (> expr_39_0 expr_40_0)) (and (=> (and true true) true) (and (= expr_40_0 0) (and (=> (and true true) (and (>= expr_39_0 0) (<= expr_39_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_39_0 x_8_1) (and (= state_3 (ite (= this_0 expr_32_0) state_0 state_2)) (and (= state_2 (|state_type| (store (|balances| state_1) expr_32_0 (+ (select (|balances| state_1) expr_32_0) expr_35_0)))) (and (= state_1 (|state_type| (store (|balances| state_0) this_0 (+ (select (|balances| state_0) this_0) (- 0 expr_35_0))))) (and (and (>= (select (|balances| state_0) this_0) 0) (<= (select (|balances| state_0) this_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (=> (and true true) (and (>= expr_35_0 0) (<= expr_35_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_35_0 x_8_1) (and (=> (and true true) (and (>= expr_32_0 0) (<= expr_32_0 1461501637330902918203684832716283019655932542975))) (and (= expr_32_0 a_6_0) (and (=> (and true true) (and (>= expr_30_1 0) (<= expr_30_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_30_1 (ite (= expr_29_0 0) 0 d_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_29_0 0) (< r_div_mod_0_0 expr_29_0))) (and (= (+ (* d_div_mod_0_0 expr_29_0) r_div_mod_0_0) expr_28_0) (and (=> (and true true) (and (>= expr_29_0 0) (<= expr_29_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_29_0 x_8_1) (and (=> (and true true) true) (and (= expr_28_0 2) (and (=> (and true true) (and (>= expr_26_1 0) (<= expr_26_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_1 (+ expr_20_0 expr_25_1)) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))))))))))) (not expr_41_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json
index 041f550797..9ee51daba1 100644
--- a/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_balance_bmc/output.json
@@ -1,66 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0xa5a6f54f166338793f025832fad8408fccb5fa0ee7a8ab0cb4ed7ec5a8c034de": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_35_0 0) (<= expr_35_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_35_0 x_8_1) (and (=> (and true true) (and (>= expr_32_0 0) (<= expr_32_0 1461501637330902918203684832716283019655932542975))) (and (= expr_32_0 a_6_0) (and (=> (and true true) (and (>= expr_30_1 0) (<= expr_30_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_30_1 (ite (= expr_29_0 0) 0 d_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_29_0 0) (< r_div_mod_0_0 expr_29_0))) (and (= (+ (* d_div_mod_0_0 expr_29_0) r_div_mod_0_0) expr_28_0) (and (=> (and true true) (and (>= expr_29_0 0) (<= expr_29_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_29_0 x_8_1) (and (=> (and true true) true) (and (= expr_28_0 2) (and (=> (and true true) (and (>= expr_26_1 0) (<= expr_26_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_1 (+ expr_20_0 expr_25_1)) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))))))))))) (< (select (|balances| state_0) this_0) expr_35_0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json
index 132f3e5a3b..94ba81c2be 100644
--- a/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_constantCondition_bmc/output.json
@@ -1,62 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0xca9972ec543d923e2e93a20db0b793a19de392a072a70371f575dbee55fe301c": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) (not expr_14_1)))
-(check-sat)
-",
-            "0xdda5d43b30361d8d706472ecb9bb78f49c5beb6ffe9eba3ff632d1cd5f17e317": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) expr_14_1))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json b/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json
index c3033a5dc6..4c967fa5d0 100644
--- a/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_default_all_engines/output.json
@@ -1,138 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x03d0edb825a4f6251a71019a2075e51c5d4fce6236dfaa9b24ed56309b4cb52e": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_3| () |uint_array_tuple|)
-(declare-fun |a_6_3| () Int)
-(declare-fun |x_8_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |arr_4_length_pair_4| () |uint_array_tuple|)
-(declare-fun |a_6_4| () Int)
-(declare-fun |x_8_4| () Int)
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) (not expr_14_1)))
-(check-sat)
-",
-            "0xa7b2de16abc4c0f0f9e2c540a576178d99cb73a01cf0d0d1d62d51735c6d3b44": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_3| () |uint_array_tuple|)
-(declare-fun |a_6_3| () Int)
-(declare-fun |x_8_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |arr_4_length_pair_4| () |uint_array_tuple|)
-(declare-fun |a_6_4| () Int)
-(declare-fun |x_8_4| () Int)
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_11_0| () Int)
-(declare-fun |r_div_mod_11_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_35_0 0) (<= expr_35_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_35_0 x_8_1) (and (=> (and true true) (and (>= expr_32_0 0) (<= expr_32_0 1461501637330902918203684832716283019655932542975))) (and (= expr_32_0 a_6_0) (and (=> (and true true) (and (>= expr_30_1 0) (<= expr_30_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_30_1 (ite (= expr_29_0 0) 0 d_div_mod_11_0)) (and (and (<= 0 r_div_mod_11_0) (or (= expr_29_0 0) (< r_div_mod_11_0 expr_29_0))) (and (= (+ (* d_div_mod_11_0 expr_29_0) r_div_mod_11_0) expr_28_0) (and (=> (and true true) (and (>= expr_29_0 0) (<= expr_29_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_29_0 x_8_1) (and (=> (and true true) true) (and (= expr_28_0 2) (and (=> (and true true) (and (>= expr_26_1 0) (<= expr_26_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_1 (+ expr_20_0 expr_25_1)) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))))))))))) (< (select (|balances| state_0) this_0) expr_35_0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-",
-            "0xd43cc6edbb2db7e490ff38b099043a3d3f17f85031b33673e76cb1eaf0598122": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_3| () |uint_array_tuple|)
-(declare-fun |a_6_3| () Int)
-(declare-fun |x_8_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |arr_4_length_pair_4| () |uint_array_tuple|)
-(declare-fun |a_6_4| () Int)
-(declare-fun |x_8_4| () Int)
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) expr_14_1))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json
index 6d0f6282bc..1be99ca455 100644
--- a/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_default_bmc/output.json
@@ -1,232 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x540d6a4b18ea4181713b8f0e9b4b272f762e142ba1716a3960cfdbed3f1ae64e": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_29_0 0) (<= expr_29_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_29_0 x_8_1) (and (=> (and true true) true) (and (= expr_28_0 2) (and (=> (and true true) (and (>= expr_26_1 0) (<= expr_26_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_1 (+ expr_20_0 expr_25_1)) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))) (= expr_29_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| expr_29_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-",
-            "0x67f6235b42fbb5cc636b1d18ccd5622020b45eef0c634965f9adf8b4bb923a64": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (= expr_41_1 (> expr_39_0 expr_40_0)) (and (=> (and true true) true) (and (= expr_40_0 0) (and (=> (and true true) (and (>= expr_39_0 0) (<= expr_39_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_39_0 x_8_1) (and (= state_3 (ite (= this_0 expr_32_0) state_0 state_2)) (and (= state_2 (|state_type| (store (|balances| state_1) expr_32_0 (+ (select (|balances| state_1) expr_32_0) expr_35_0)))) (and (= state_1 (|state_type| (store (|balances| state_0) this_0 (+ (select (|balances| state_0) this_0) (- 0 expr_35_0))))) (and (and (>= (select (|balances| state_0) this_0) 0) (<= (select (|balances| state_0) this_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (=> (and true true) (and (>= expr_35_0 0) (<= expr_35_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_35_0 x_8_1) (and (=> (and true true) (and (>= expr_32_0 0) (<= expr_32_0 1461501637330902918203684832716283019655932542975))) (and (= expr_32_0 a_6_0) (and (=> (and true true) (and (>= expr_30_1 0) (<= expr_30_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_30_1 (ite (= expr_29_0 0) 0 d_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_29_0 0) (< r_div_mod_0_0 expr_29_0))) (and (= (+ (* d_div_mod_0_0 expr_29_0) r_div_mod_0_0) expr_28_0) (and (=> (and true true) (and (>= expr_29_0 0) (<= expr_29_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_29_0 x_8_1) (and (=> (and true true) true) (and (= expr_28_0 2) (and (=> (and true true) (and (>= expr_26_1 0) (<= expr_26_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_1 (+ expr_20_0 expr_25_1)) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))))))))))) (not expr_41_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-",
-            "0xa5a6f54f166338793f025832fad8408fccb5fa0ee7a8ab0cb4ed7ec5a8c034de": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_35_0 0) (<= expr_35_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_35_0 x_8_1) (and (=> (and true true) (and (>= expr_32_0 0) (<= expr_32_0 1461501637330902918203684832716283019655932542975))) (and (= expr_32_0 a_6_0) (and (=> (and true true) (and (>= expr_30_1 0) (<= expr_30_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_30_1 (ite (= expr_29_0 0) 0 d_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_29_0 0) (< r_div_mod_0_0 expr_29_0))) (and (= (+ (* d_div_mod_0_0 expr_29_0) r_div_mod_0_0) expr_28_0) (and (=> (and true true) (and (>= expr_29_0 0) (<= expr_29_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_29_0 x_8_1) (and (=> (and true true) true) (and (= expr_28_0 2) (and (=> (and true true) (and (>= expr_26_1 0) (<= expr_26_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_1 (+ expr_20_0 expr_25_1)) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))))))))))) (< (select (|balances| state_0) this_0) expr_35_0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-",
-            "0xca9972ec543d923e2e93a20db0b793a19de392a072a70371f575dbee55fe301c": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) (not expr_14_1)))
-(check-sat)
-",
-            "0xdda5d43b30361d8d706472ecb9bb78f49c5beb6ffe9eba3ff632d1cd5f17e317": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))) expr_14_1))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json
index 2e8cb7b321..05ce12ca2c 100644
--- a/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_div_by_zero_bmc/output.json
@@ -1,68 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x540d6a4b18ea4181713b8f0e9b4b272f762e142ba1716a3960cfdbed3f1ae64e": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_29_0 0) (<= expr_29_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_29_0 x_8_1) (and (=> (and true true) true) (and (= expr_28_0 2) (and (=> (and true true) (and (>= expr_26_1 0) (<= expr_26_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_1 (+ expr_20_0 expr_25_1)) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))) (= expr_29_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| expr_29_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json
index 742f1ea754..09c1cdb5f1 100644
--- a/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_overflow_bmc/output.json
@@ -1,68 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0xb91b28779c6db8b1a6ceecabfa97788476fbb427474cd132376917103e4bc9d9": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))) (> (+ expr_20_0 expr_25_1) 115792089237316195423570985008687907853269984665640564039457584007913129639935)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| (+ expr_20_0 expr_25_1)))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json
index 238b46b593..c656eda21a 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_bmc/output.json
@@ -1,68 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x6bfae35e234137f12dfe7bc10a8cd34cfa8f3cf1a3439e2e99418358e7bad911": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))) (< (- expr_17_0 1) 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| (- expr_17_0 1)))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json
index e4a5bdbf42..004b98128e 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_assert_bmc/output.json
@@ -1,182 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x67f6235b42fbb5cc636b1d18ccd5622020b45eef0c634965f9adf8b4bb923a64": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (= expr_41_1 (> expr_39_0 expr_40_0)) (and (=> (and true true) true) (and (= expr_40_0 0) (and (=> (and true true) (and (>= expr_39_0 0) (<= expr_39_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_39_0 x_8_1) (and (= state_3 (ite (= this_0 expr_32_0) state_0 state_2)) (and (= state_2 (|state_type| (store (|balances| state_1) expr_32_0 (+ (select (|balances| state_1) expr_32_0) expr_35_0)))) (and (= state_1 (|state_type| (store (|balances| state_0) this_0 (+ (select (|balances| state_0) this_0) (- 0 expr_35_0))))) (and (and (>= (select (|balances| state_0) this_0) 0) (<= (select (|balances| state_0) this_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (=> (and true true) (and (>= expr_35_0 0) (<= expr_35_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_35_0 x_8_1) (and (=> (and true true) (and (>= expr_32_0 0) (<= expr_32_0 1461501637330902918203684832716283019655932542975))) (and (= expr_32_0 a_6_0) (and (=> (and true true) (and (>= expr_30_1 0) (<= expr_30_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_30_1 (ite (= expr_29_0 0) 0 d_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_29_0 0) (< r_div_mod_0_0 expr_29_0))) (and (= (+ (* d_div_mod_0_0 expr_29_0) r_div_mod_0_0) expr_28_0) (and (=> (and true true) (and (>= expr_29_0 0) (<= expr_29_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_29_0 x_8_1) (and (=> (and true true) true) (and (= expr_28_0 2) (and (=> (and true true) (and (>= expr_26_1 0) (<= expr_26_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_1 (+ expr_20_0 expr_25_1)) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))))))))))) (not expr_41_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| ))
-",
-            "0x6bfae35e234137f12dfe7bc10a8cd34cfa8f3cf1a3439e2e99418358e7bad911": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))) (< (- expr_17_0 1) 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| (- expr_17_0 1)))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-",
-            "0xb91b28779c6db8b1a6ceecabfa97788476fbb427474cd132376917103e4bc9d9": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))) (> (+ expr_20_0 expr_25_1) 115792089237316195423570985008687907853269984665640564039457584007913129639935)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| (+ expr_20_0 expr_25_1)))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json
index 8a28f8cf35..8a9452a7b8 100644
--- a/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_targets_underflow_overflow_bmc/output.json
@@ -1,126 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x6bfae35e234137f12dfe7bc10a8cd34cfa8f3cf1a3439e2e99418358e7bad911": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))) (< (- expr_17_0 1) 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| (- expr_17_0 1)))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-",
-            "0xb91b28779c6db8b1a6ceecabfa97788476fbb427474cd132376917103e4bc9d9": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-datatypes ((|uint_array_tuple| 0)) (((|uint_array_tuple| (|uint_array_tuple_accessor_array| (Array Int Int)) (|uint_array_tuple_accessor_length| Int)))))
-(declare-fun |arr_4_length_pair_0| () |uint_array_tuple|)
-(declare-fun |a_6_0| () Int)
-(declare-fun |x_8_0| () Int)
-(declare-fun |arr_4_length_pair_1| () |uint_array_tuple|)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_0| () Int)
-(declare-fun |expr_14_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_1| () Int)
-(declare-fun |x_8_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_25_1| () Int)
-(declare-fun |expr_26_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_30_1| () Int)
-(declare-fun |expr_32_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |state_1| () |state_type|)
-(declare-fun |state_2| () |state_type|)
-(declare-fun |state_3| () |state_type|)
-(declare-fun |expr_39_0| () Int)
-(declare-fun |expr_40_0| () Int)
-(declare-fun |expr_41_1| () Bool)
-(declare-fun |expr_44_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_44_length_pair_1| () |uint_array_tuple|)
-(declare-fun |arr_4_length_pair_2| () |uint_array_tuple|)
-(declare-fun |expr_49_length_pair_0| () |uint_array_tuple|)
-(declare-fun |expr_50_0| () Int)
-(declare-fun |expr_51_1| () Int)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_25_1 0) (<= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_1 115792089237316195423570985008687907853269984665640564039457584007913129639935) (and (=> (and true true) (and (>= expr_20_0 0) (<= expr_20_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_20_0 x_8_1) (and (ite (and true true) (= x_8_1 (- expr_17_0 1)) (= x_8_1 x_8_0)) (and (=> (and true true) (and (>= expr_18_1 0) (<= expr_18_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_1 (- expr_17_0 1)) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_8_0) (and (=> (and true true) expr_14_1) (and (= expr_14_1 (>= expr_12_0 expr_13_0)) (and (=> (and true true) true) (and (= expr_13_0 0) (and (=> (and true true) (and (>= expr_12_0 0) (<= expr_12_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_12_0 x_8_0) (and (and (>= x_8_0 0) (<= x_8_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= a_6_0 0) (<= a_6_0 1461501637330902918203684832716283019655932542975)) (and (>= (|uint_array_tuple_accessor_length| arr_4_length_pair_1) 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 1917212865)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 114)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 70)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 88)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 193)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))) (> (+ expr_20_0 expr_25_1) 115792089237316195423570985008687907853269984665640564039457584007913129639935)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| a_6_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| x_8_1))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| (+ expr_20_0 expr_25_1)))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| ))
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_timeout_all/output.json b/test/cmdlineTests/standard_model_checker_timeout_all/output.json
index ef1a66d671..fb599d21d2 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_all/output.json
@@ -1,329 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x18c291cddb0272d6f9afaa62c0b2c2afbc1fae5b3a880c413000b0907aed4aeb": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_3_3| () Int)
-(declare-fun |y_5_3| () Int)
-(declare-fun |k_7_3| () Int)
-(declare-fun |r_33_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_4| () Int)
-(declare-fun |y_5_4| () Int)
-(declare-fun |k_7_4| () Int)
-(declare-fun |r_33_4| () Int)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_16_0| () Int)
-(declare-fun |r_div_mod_16_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_16_0)) (and (and (<= 0 r_div_mod_16_0) (or (= expr_18_0 0) (< r_div_mod_16_0 expr_18_0))) (and (= (+ (* d_div_mod_16_0 expr_18_0) r_div_mod_16_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))) (not expr_21_1)))
-(check-sat)
-",
-            "0x74e7fbb4ed837661c73d27b70acb3e91238303f8ec1d916f24d47bc9cbcf8710": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_3_3| () Int)
-(declare-fun |y_5_3| () Int)
-(declare-fun |k_7_3| () Int)
-(declare-fun |r_33_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_4| () Int)
-(declare-fun |y_5_4| () Int)
-(declare-fun |k_7_4| () Int)
-(declare-fun |r_33_4| () Int)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_13_1))
-(check-sat)
-",
-            "0x88bef994914e6778ed64a76b27254fc481b9a2d77f95d66ff288495bf4e55741": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_3_3| () Int)
-(declare-fun |y_5_3| () Int)
-(declare-fun |k_7_3| () Int)
-(declare-fun |r_33_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_4| () Int)
-(declare-fun |y_5_4| () Int)
-(declare-fun |k_7_4| () Int)
-(declare-fun |r_33_4| () Int)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_13_1)))
-(check-sat)
-",
-            "0xc37900bf0c35dca7bc5c59eca0d169ec4baa8ac48960d828d2ffbef94b5be280": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_3_3| () Int)
-(declare-fun |y_5_3| () Int)
-(declare-fun |k_7_3| () Int)
-(declare-fun |r_33_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_4| () Int)
-(declare-fun |y_5_4| () Int)
-(declare-fun |k_7_4| () Int)
-(declare-fun |r_33_4| () Int)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_16_0| () Int)
-(declare-fun |r_div_mod_16_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-(declare-fun |expr_25_0| () Int)
-(declare-fun |expr_26_0| () Int)
-(declare-fun |d_div_mod_17_0| () Int)
-(declare-fun |r_div_mod_17_0| () Int)
-(declare-fun |expr_27_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_17_0)) (and (and (<= 0 r_div_mod_17_0) (or (= expr_26_0 0) (< r_div_mod_17_0 expr_26_0))) (and (= (+ (* d_div_mod_17_0 expr_26_0) r_div_mod_17_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_16_0)) (and (and (<= 0 r_div_mod_16_0) (or (= expr_18_0 0) (< r_div_mod_16_0 expr_18_0))) (and (= (+ (* d_div_mod_16_0 expr_18_0) r_div_mod_16_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))) expr_29_1))
-(check-sat)
-",
-            "0xcf75850659a91bcdeae2161dd859054b536a5b776454ab5fcbfe4b04394e82e4": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_3_3| () Int)
-(declare-fun |y_5_3| () Int)
-(declare-fun |k_7_3| () Int)
-(declare-fun |r_33_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_4| () Int)
-(declare-fun |y_5_4| () Int)
-(declare-fun |k_7_4| () Int)
-(declare-fun |r_33_4| () Int)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_16_0| () Int)
-(declare-fun |r_div_mod_16_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_16_0)) (and (and (<= 0 r_div_mod_16_0) (or (= expr_18_0 0) (< r_div_mod_16_0 expr_18_0))) (and (= (+ (* d_div_mod_16_0 expr_18_0) r_div_mod_16_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))) expr_21_1))
-(check-sat)
-",
-            "0xe39f08760131429ca6c71cf526231ab81674474859187242afd8cec7ce0ce328": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_3_3| () Int)
-(declare-fun |y_5_3| () Int)
-(declare-fun |k_7_3| () Int)
-(declare-fun |r_33_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_4| () Int)
-(declare-fun |y_5_4| () Int)
-(declare-fun |k_7_4| () Int)
-(declare-fun |r_33_4| () Int)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_16_0| () Int)
-(declare-fun |r_div_mod_16_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-(declare-fun |expr_25_0| () Int)
-(declare-fun |expr_26_0| () Int)
-(declare-fun |d_div_mod_17_0| () Int)
-(declare-fun |r_div_mod_17_0| () Int)
-(declare-fun |expr_27_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_1| () Bool)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_0| (Int Int Int ) Int)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_abstract_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |expr_36_0| () Int)
-(declare-fun |expr_37_0| () Int)
-(declare-fun |d_div_mod_18_0| () Int)
-(declare-fun |r_div_mod_18_0| () Int)
-(declare-fun |expr_38_1| () Int)
-(declare-fun |r_33_1| () Int)
-(declare-fun |expr_41_0| () Int)
-(declare-fun |expr_42_0| () Int)
-(declare-fun |d_div_mod_19_0| () Int)
-(declare-fun |r_div_mod_19_0| () Int)
-(declare-fun |expr_43_1| () Int)
-(declare-fun |expr_44_0| () Int)
-(declare-fun |expr_45_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_45_1 (= expr_43_1 expr_44_0)) (and (=> (and true true) true) (and (= expr_44_0 0) (and (=> (and true true) (and (>= expr_43_1 0) (<= expr_43_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_43_1 (ite (= expr_42_0 0) 0 r_div_mod_19_0)) (and (and (<= 0 r_div_mod_19_0) (or (= expr_42_0 0) (< r_div_mod_19_0 expr_42_0))) (and (= (+ (* d_div_mod_19_0 expr_42_0) r_div_mod_19_0) expr_41_0) (and (=> (and true true) (and (>= expr_42_0 0) (<= expr_42_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_42_0 k_7_0) (and (=> (and true true) (and (>= expr_41_0 0) (<= expr_41_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_41_0 r_33_1) (and (ite (and true true) (= r_33_1 expr_38_1) (= r_33_1 r_33_0)) (and (=> (and true true) (and (>= expr_38_1 0) (<= expr_38_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_38_1 (ite (= expr_37_0 0) 0 r_div_mod_18_0)) (and (and (<= 0 r_div_mod_18_0) (or (= expr_37_0 0) (< r_div_mod_18_0 expr_37_0))) (and (= (+ (* d_div_mod_18_0 expr_37_0) r_div_mod_18_0) (* expr_35_0 expr_36_0)) (and (=> (and true true) (and (>= expr_37_0 0) (<= expr_37_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_37_0 k_7_0) (and (=> (and true true) (and (>= expr_36_0 0) (<= expr_36_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_36_0 y_5_0) (and (=> (and true true) (and (>= expr_35_0 0) (<= expr_35_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_35_0 x_3_0) (and true (and (=> (and true true) expr_29_1) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_17_0)) (and (and (<= 0 r_div_mod_17_0) (or (= expr_26_0 0) (< r_div_mod_17_0 expr_26_0))) (and (= (+ (* d_div_mod_17_0 expr_26_0) r_div_mod_17_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_16_0)) (and (and (<= 0 r_div_mod_16_0) (or (= expr_18_0 0) (< r_div_mod_16_0 expr_18_0))) (and (= (+ (* d_div_mod_16_0 expr_18_0) r_div_mod_16_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) (not expr_45_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| y_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| k_7_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| r_33_1))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| ))
-",
-            "0xf9f64bcc789d80a36748834de05ce2f0fa7a498fe6ff511d74e00b2c9ea54061": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |x_3_3| () Int)
-(declare-fun |y_5_3| () Int)
-(declare-fun |k_7_3| () Int)
-(declare-fun |r_33_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_4| () Int)
-(declare-fun |y_5_4| () Int)
-(declare-fun |k_7_4| () Int)
-(declare-fun |r_33_4| () Int)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_16_0| () Int)
-(declare-fun |r_div_mod_16_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-(declare-fun |expr_25_0| () Int)
-(declare-fun |expr_26_0| () Int)
-(declare-fun |d_div_mod_17_0| () Int)
-(declare-fun |r_div_mod_17_0| () Int)
-(declare-fun |expr_27_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_17_0)) (and (and (<= 0 r_div_mod_17_0) (or (= expr_26_0 0) (< r_div_mod_17_0 expr_26_0))) (and (= (+ (* d_div_mod_17_0 expr_26_0) r_div_mod_17_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_16_0)) (and (and (<= 0 r_div_mod_16_0) (or (= expr_18_0 0) (< r_div_mod_16_0 expr_18_0))) (and (= (+ (* d_div_mod_16_0 expr_18_0) r_div_mod_16_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))) (not expr_29_1)))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json b/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
index 81f376d503..4554ec69e9 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
@@ -1,541 +1,4 @@
 {
-    "auxiliaryInputRequested":
-    {
-        "smtlib2queries":
-        {
-            "0x18f1a56145e2b4c7e9c1ef433341d60b541a71e48c54ead52a17a93f8a053eca": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_13_1)))
-(check-sat)
-",
-            "0x1f43df4daea9eb9e59c5b2db499960a23bffb2cdac07fc883cd2c767d942105f": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-(declare-fun |expr_25_0| () Int)
-(declare-fun |expr_26_0| () Int)
-(declare-fun |d_div_mod_1_0| () Int)
-(declare-fun |r_div_mod_1_0| () Int)
-(declare-fun |expr_27_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_1| () Bool)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_0| (Int Int Int ) Int)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_abstract_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |expr_36_0| () Int)
-(declare-fun |expr_37_0| () Int)
-(declare-fun |d_div_mod_2_0| () Int)
-(declare-fun |r_div_mod_2_0| () Int)
-(declare-fun |expr_38_1| () Int)
-(declare-fun |r_33_1| () Int)
-(declare-fun |expr_41_0| () Int)
-(declare-fun |expr_42_0| () Int)
-(declare-fun |d_div_mod_3_0| () Int)
-(declare-fun |r_div_mod_3_0| () Int)
-(declare-fun |expr_43_1| () Int)
-(declare-fun |expr_44_0| () Int)
-(declare-fun |expr_45_1| () Bool)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))))) (= expr_26_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| y_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| k_7_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| r_33_0))
-(declare-const |EVALEXPR_4| Int)
-(assert (= |EVALEXPR_4| expr_26_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-",
-            "0x2ea43ae8ad6d3cdc84a32665e0bd61d2f64aa5fa8e09c1419c53ca3f226af616": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-(declare-fun |expr_25_0| () Int)
-(declare-fun |expr_26_0| () Int)
-(declare-fun |d_div_mod_1_0| () Int)
-(declare-fun |r_div_mod_1_0| () Int)
-(declare-fun |expr_27_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_1_0)) (and (and (<= 0 r_div_mod_1_0) (or (= expr_26_0 0) (< r_div_mod_1_0 expr_26_0))) (and (= (+ (* d_div_mod_1_0 expr_26_0) r_div_mod_1_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))) (not expr_29_1)))
-(check-sat)
-",
-            "0x5e036bb9ccee2986805fcd35aaa27c558abaea31e953b5e660af5e76e698d380": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-(declare-fun |expr_25_0| () Int)
-(declare-fun |expr_26_0| () Int)
-(declare-fun |d_div_mod_1_0| () Int)
-(declare-fun |r_div_mod_1_0| () Int)
-(declare-fun |expr_27_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_1_0)) (and (and (<= 0 r_div_mod_1_0) (or (= expr_26_0 0) (< r_div_mod_1_0 expr_26_0))) (and (= (+ (* d_div_mod_1_0 expr_26_0) r_div_mod_1_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))) expr_29_1))
-(check-sat)
-",
-            "0x6490ffd45310ea9e88252dd18e4ee7a87801885c0d9ec688c0a04811bf4c3bd1": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-(declare-fun |expr_25_0| () Int)
-(declare-fun |expr_26_0| () Int)
-(declare-fun |d_div_mod_1_0| () Int)
-(declare-fun |r_div_mod_1_0| () Int)
-(declare-fun |expr_27_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_1| () Bool)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_0| (Int Int Int ) Int)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_abstract_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |expr_36_0| () Int)
-(declare-fun |expr_37_0| () Int)
-(declare-fun |d_div_mod_2_0| () Int)
-(declare-fun |r_div_mod_2_0| () Int)
-(declare-fun |expr_38_1| () Int)
-(declare-fun |r_33_1| () Int)
-(declare-fun |expr_41_0| () Int)
-(declare-fun |expr_42_0| () Int)
-(declare-fun |d_div_mod_3_0| () Int)
-(declare-fun |r_div_mod_3_0| () Int)
-(declare-fun |expr_43_1| () Int)
-(declare-fun |expr_44_0| () Int)
-(declare-fun |expr_45_1| () Bool)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))) (= expr_18_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| y_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| k_7_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| r_33_0))
-(declare-const |EVALEXPR_4| Int)
-(assert (= |EVALEXPR_4| expr_18_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-",
-            "0x8b61d0b3f7435930ba41234874e4800cd8459f7bacac0b46af5bf0020e83c41a": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-(declare-fun |expr_25_0| () Int)
-(declare-fun |expr_26_0| () Int)
-(declare-fun |d_div_mod_1_0| () Int)
-(declare-fun |r_div_mod_1_0| () Int)
-(declare-fun |expr_27_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_1| () Bool)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_0| (Int Int Int ) Int)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_abstract_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |expr_36_0| () Int)
-(declare-fun |expr_37_0| () Int)
-(declare-fun |d_div_mod_2_0| () Int)
-(declare-fun |r_div_mod_2_0| () Int)
-(declare-fun |expr_38_1| () Int)
-(declare-fun |r_33_1| () Int)
-(declare-fun |expr_41_0| () Int)
-(declare-fun |expr_42_0| () Int)
-(declare-fun |d_div_mod_3_0| () Int)
-(declare-fun |r_div_mod_3_0| () Int)
-(declare-fun |expr_43_1| () Int)
-(declare-fun |expr_44_0| () Int)
-(declare-fun |expr_45_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_45_1 (= expr_43_1 expr_44_0)) (and (=> (and true true) true) (and (= expr_44_0 0) (and (=> (and true true) (and (>= expr_43_1 0) (<= expr_43_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_43_1 (ite (= expr_42_0 0) 0 r_div_mod_3_0)) (and (and (<= 0 r_div_mod_3_0) (or (= expr_42_0 0) (< r_div_mod_3_0 expr_42_0))) (and (= (+ (* d_div_mod_3_0 expr_42_0) r_div_mod_3_0) expr_41_0) (and (=> (and true true) (and (>= expr_42_0 0) (<= expr_42_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_42_0 k_7_0) (and (=> (and true true) (and (>= expr_41_0 0) (<= expr_41_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_41_0 r_33_1) (and (ite (and true true) (= r_33_1 expr_38_1) (= r_33_1 r_33_0)) (and (=> (and true true) (and (>= expr_38_1 0) (<= expr_38_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_38_1 (ite (= expr_37_0 0) 0 r_div_mod_2_0)) (and (and (<= 0 r_div_mod_2_0) (or (= expr_37_0 0) (< r_div_mod_2_0 expr_37_0))) (and (= (+ (* d_div_mod_2_0 expr_37_0) r_div_mod_2_0) (* expr_35_0 expr_36_0)) (and (=> (and true true) (and (>= expr_37_0 0) (<= expr_37_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_37_0 k_7_0) (and (=> (and true true) (and (>= expr_36_0 0) (<= expr_36_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_36_0 y_5_0) (and (=> (and true true) (and (>= expr_35_0 0) (<= expr_35_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_35_0 x_3_0) (and true (and (=> (and true true) expr_29_1) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_1_0)) (and (and (<= 0 r_div_mod_1_0) (or (= expr_26_0 0) (< r_div_mod_1_0 expr_26_0))) (and (= (+ (* d_div_mod_1_0 expr_26_0) r_div_mod_1_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))))))))))))))))))))))))))) (not expr_45_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| y_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| k_7_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| r_33_1))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| ))
-",
-            "0x90d07b7650deb5ef0f3634fa43fccdc46bb90524def99fc7787105bd332ce18c": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-(declare-fun |expr_25_0| () Int)
-(declare-fun |expr_26_0| () Int)
-(declare-fun |d_div_mod_1_0| () Int)
-(declare-fun |r_div_mod_1_0| () Int)
-(declare-fun |expr_27_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_1| () Bool)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_0| (Int Int Int ) Int)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_abstract_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |expr_36_0| () Int)
-(declare-fun |expr_37_0| () Int)
-(declare-fun |d_div_mod_2_0| () Int)
-(declare-fun |r_div_mod_2_0| () Int)
-(declare-fun |expr_38_1| () Int)
-(declare-fun |r_33_1| () Int)
-(declare-fun |expr_41_0| () Int)
-(declare-fun |expr_42_0| () Int)
-(declare-fun |d_div_mod_3_0| () Int)
-(declare-fun |r_div_mod_3_0| () Int)
-(declare-fun |expr_43_1| () Int)
-(declare-fun |expr_44_0| () Int)
-(declare-fun |expr_45_1| () Bool)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_37_0 0) (<= expr_37_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_37_0 k_7_0) (and (=> (and true true) (and (>= expr_36_0 0) (<= expr_36_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_36_0 y_5_0) (and (=> (and true true) (and (>= expr_35_0 0) (<= expr_35_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_35_0 x_3_0) (and true (and (=> (and true true) expr_29_1) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_1_0)) (and (and (<= 0 r_div_mod_1_0) (or (= expr_26_0 0) (< r_div_mod_1_0 expr_26_0))) (and (= (+ (* d_div_mod_1_0 expr_26_0) r_div_mod_1_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))))))))))))))))))))))) (= expr_37_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| y_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| k_7_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| r_33_0))
-(declare-const |EVALEXPR_4| Int)
-(assert (= |EVALEXPR_4| expr_37_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-",
-            "0xc9acf5c2a281159171ca5133ba0856bb644c2c8afd233b6a7d618d290f4f5faa": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-(declare-fun |expr_25_0| () Int)
-(declare-fun |expr_26_0| () Int)
-(declare-fun |d_div_mod_1_0| () Int)
-(declare-fun |r_div_mod_1_0| () Int)
-(declare-fun |expr_27_1| () Int)
-(declare-fun |expr_28_0| () Int)
-(declare-fun |expr_29_1| () Bool)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_0| (Int Int Int ) Int)
-(declare-fun |t_function_mulmod_pure$_t_uint256_$_t_uint256_$_t_uint256_$returns$_t_uint256_$_abstract_0| () Int)
-(declare-fun |expr_35_0| () Int)
-(declare-fun |expr_36_0| () Int)
-(declare-fun |expr_37_0| () Int)
-(declare-fun |d_div_mod_2_0| () Int)
-(declare-fun |r_div_mod_2_0| () Int)
-(declare-fun |expr_38_1| () Int)
-(declare-fun |r_33_1| () Int)
-(declare-fun |expr_41_0| () Int)
-(declare-fun |expr_42_0| () Int)
-(declare-fun |d_div_mod_3_0| () Int)
-(declare-fun |r_div_mod_3_0| () Int)
-(declare-fun |expr_43_1| () Int)
-(declare-fun |expr_44_0| () Int)
-(declare-fun |expr_45_1| () Bool)
-
-(assert (and (and (and true true) (and (=> (and true true) (and (>= expr_42_0 0) (<= expr_42_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_42_0 k_7_0) (and (=> (and true true) (and (>= expr_41_0 0) (<= expr_41_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_41_0 r_33_1) (and (ite (and true true) (= r_33_1 expr_38_1) (= r_33_1 r_33_0)) (and (=> (and true true) (and (>= expr_38_1 0) (<= expr_38_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_38_1 (ite (= expr_37_0 0) 0 r_div_mod_2_0)) (and (and (<= 0 r_div_mod_2_0) (or (= expr_37_0 0) (< r_div_mod_2_0 expr_37_0))) (and (= (+ (* d_div_mod_2_0 expr_37_0) r_div_mod_2_0) (* expr_35_0 expr_36_0)) (and (=> (and true true) (and (>= expr_37_0 0) (<= expr_37_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_37_0 k_7_0) (and (=> (and true true) (and (>= expr_36_0 0) (<= expr_36_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_36_0 y_5_0) (and (=> (and true true) (and (>= expr_35_0 0) (<= expr_35_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_35_0 x_3_0) (and true (and (=> (and true true) expr_29_1) (and (= expr_29_1 (= expr_27_1 expr_28_0)) (and (=> (and true true) true) (and (= expr_28_0 0) (and (=> (and true true) (and (>= expr_27_1 0) (<= expr_27_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_27_1 (ite (= expr_26_0 0) 0 r_div_mod_1_0)) (and (and (<= 0 r_div_mod_1_0) (or (= expr_26_0 0) (< r_div_mod_1_0 expr_26_0))) (and (= (+ (* d_div_mod_1_0 expr_26_0) r_div_mod_1_0) expr_25_0) (and (=> (and true true) (and (>= expr_26_0 0) (<= expr_26_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_26_0 k_7_0) (and (=> (and true true) (and (>= expr_25_0 0) (<= expr_25_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_25_0 y_5_0) (and (=> (and true true) expr_21_1) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))))))))))))))))))))))))))))))))))))))))))))))) (= expr_42_0 0)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_3_0))
-(declare-const |EVALEXPR_1| Int)
-(assert (= |EVALEXPR_1| y_5_0))
-(declare-const |EVALEXPR_2| Int)
-(assert (= |EVALEXPR_2| k_7_0))
-(declare-const |EVALEXPR_3| Int)
-(assert (= |EVALEXPR_3| r_33_1))
-(declare-const |EVALEXPR_4| Int)
-(assert (= |EVALEXPR_4| expr_42_0))
-(check-sat)
-(get-value (|EVALEXPR_0| |EVALEXPR_1| |EVALEXPR_2| |EVALEXPR_3| |EVALEXPR_4| ))
-",
-            "0xcb840e71fb938bc7517d41d9315ff82d34fc0e15610d9d8bfa5fced2308c95f8": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))) (not expr_21_1)))
-(check-sat)
-",
-            "0xe4a65aed9be739fdcb6ce76ede4dc9b65b256d38e2499b5dbf2f4e9fc1a2233f": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) expr_13_1))
-(check-sat)
-",
-            "0xf8157c6d01d1321e17ba8e5f19f02386953f4078d481bba0a33fe50993605158": "(set-option :produce-models true)
-(set-option :timeout 1000)
-(set-logic ALL)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_0| () Int)
-(declare-fun |y_5_0| () Int)
-(declare-fun |k_7_0| () Int)
-(declare-fun |r_33_0| () Int)
-(declare-fun |expr_11_0| () Int)
-(declare-fun |expr_12_0| () Int)
-(declare-fun |expr_13_1| () Bool)
-(declare-fun |expr_17_0| () Int)
-(declare-fun |expr_18_0| () Int)
-(declare-fun |d_div_mod_0_0| () Int)
-(declare-fun |r_div_mod_0_0| () Int)
-(declare-fun |expr_19_1| () Int)
-(declare-fun |expr_20_0| () Int)
-(declare-fun |expr_21_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_21_1 (= expr_19_1 expr_20_0)) (and (=> (and true true) true) (and (= expr_20_0 0) (and (=> (and true true) (and (>= expr_19_1 0) (<= expr_19_1 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_19_1 (ite (= expr_18_0 0) 0 r_div_mod_0_0)) (and (and (<= 0 r_div_mod_0_0) (or (= expr_18_0 0) (< r_div_mod_0_0 expr_18_0))) (and (= (+ (* d_div_mod_0_0 expr_18_0) r_div_mod_0_0) expr_17_0) (and (=> (and true true) (and (>= expr_18_0 0) (<= expr_18_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_18_0 k_7_0) (and (=> (and true true) (and (>= expr_17_0 0) (<= expr_17_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_17_0 x_3_0) (and (=> (and true true) expr_13_1) (and (= expr_13_1 (> expr_11_0 expr_12_0)) (and (=> (and true true) true) (and (= expr_12_0 0) (and (=> (and true true) (and (>= expr_11_0 0) (<= expr_11_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_11_0 k_7_0) (and (and (>= k_7_0 0) (<= k_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= y_5_0 0) (<= y_5_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (= r_33_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3204897777)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 191)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 6)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 219)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 241)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))))))))))))))) expr_21_1))
-(check-sat)
-"
-        }
-    },
     "errors":
     [
         {
diff --git a/test/libsolidity/interface/FileReader.cpp b/test/libsolidity/interface/FileReader.cpp
index ea85685fd1..58ab9bfe9d 100644
--- a/test/libsolidity/interface/FileReader.cpp
+++ b/test/libsolidity/interface/FileReader.cpp
@@ -22,14 +22,16 @@
 
 #include <test/Common.h>
 #include <test/FilesystemUtils.h>
-#include <test/TemporaryDirectory.h>
 #include <test/libsolidity/util/SoltestErrors.h>
 
+#include <libsolutil/TemporaryDirectory.h>
+
 #include <boost/algorithm/string.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 
 using namespace std;
+using namespace solidity::util;
 using namespace solidity::test;
 
 #define TEST_CASE_NAME (boost::unit_test::framework::current_test_case().p_name)
diff --git a/test/libsolutil/CommonIO.cpp b/test/libsolutil/CommonIO.cpp
index 8b8c3d3263..93637fb9b7 100644
--- a/test/libsolutil/CommonIO.cpp
+++ b/test/libsolutil/CommonIO.cpp
@@ -19,10 +19,10 @@
 /// Unit tests for the CommonIO routines.
 
 #include <libsolutil/CommonIO.h>
+#include <libsolutil/TemporaryDirectory.h>
 
 #include <test/Common.h>
 #include <test/FilesystemUtils.h>
-#include <test/TemporaryDirectory.h>
 #include <test/libsolidity/util/SoltestErrors.h>
 
 #include <boost/test/unit_test.hpp>
diff --git a/test/TemporaryDirectoryTest.cpp b/test/libsolutil/TemporaryDirectoryTest.cpp
similarity index 96%
rename from test/TemporaryDirectoryTest.cpp
rename to test/libsolutil/TemporaryDirectoryTest.cpp
index 1fef44c3e5..35c3c28b48 100644
--- a/test/TemporaryDirectoryTest.cpp
+++ b/test/libsolutil/TemporaryDirectoryTest.cpp
@@ -16,9 +16,9 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <test/TemporaryDirectory.h>
+#include <libsolutil/TemporaryDirectory.h>
 
-#include <test/libsolidity/util/SoltestErrors.h>
+#include <libsolidity/util/SoltestErrors.h>
 
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
@@ -28,7 +28,7 @@
 using namespace std;
 using namespace boost::test_tools;
 
-namespace solidity::test
+namespace solidity::util::test
 {
 
 BOOST_AUTO_TEST_SUITE(TemporaryDirectoryTest)
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index d5cb39a83e..2ae57541bd 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -26,9 +26,9 @@
 #include <test/Common.h>
 #include <test/libsolidity/util/SoltestErrors.h>
 #include <test/FilesystemUtils.h>
-#include <test/TemporaryDirectory.h>
 
 #include <libsolutil/JSON.h>
+#include <libsolutil/TemporaryDirectory.h>
 
 #include <boost/algorithm/string.hpp>
 
diff --git a/test/solc/CommandLineInterfaceAllowPaths.cpp b/test/solc/CommandLineInterfaceAllowPaths.cpp
index 472f2184b4..cd301819de 100644
--- a/test/solc/CommandLineInterfaceAllowPaths.cpp
+++ b/test/solc/CommandLineInterfaceAllowPaths.cpp
@@ -24,9 +24,10 @@
 
 #include <test/Common.h>
 #include <test/FilesystemUtils.h>
-#include <test/TemporaryDirectory.h>
 #include <test/libsolidity/util/SoltestErrors.h>
 
+#include <libsolutil/TemporaryDirectory.h>
+
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <fstream>
@@ -36,6 +37,7 @@
 
 using namespace std;
 using namespace solidity::frontend;
+using namespace solidity::util;
 using namespace solidity::test;
 
 #define TEST_CASE_NAME (boost::unit_test::framework::current_test_case().p_name)
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 61e99f0423..e8206e4833 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -213,7 +213,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			{true, false},
 			{{InvariantType::Contract, InvariantType::Reentrancy}},
 			true,
-			{false, true, true},
+			{false, false, true, true},
 			{{VerificationTargetType::Underflow, VerificationTargetType::DivByZero}},
 			5,
 		};
diff --git a/test/yulPhaser/AlgorithmRunner.cpp b/test/yulPhaser/AlgorithmRunner.cpp
index c8a9f40e65..003403929e 100644
--- a/test/yulPhaser/AlgorithmRunner.cpp
+++ b/test/yulPhaser/AlgorithmRunner.cpp
@@ -16,7 +16,6 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <test/TemporaryDirectory.h>
 #include <test/yulPhaser/TestHelpers.h>
 
 #include <tools/yulPhaser/AlgorithmRunner.h>
@@ -26,6 +25,7 @@
 #include <liblangutil/CharStream.h>
 
 #include <libsolutil/CommonIO.h>
+#include <libsolutil/TemporaryDirectory.h>
 
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
@@ -39,7 +39,6 @@ using namespace std;
 using namespace boost::unit_test::framework;
 using namespace boost::test_tools;
 using namespace solidity::langutil;
-using namespace solidity::test;
 using namespace solidity::util;
 using namespace solidity::yul;
 
diff --git a/test/yulPhaser/Common.cpp b/test/yulPhaser/Common.cpp
index 0583860221..7347384835 100644
--- a/test/yulPhaser/Common.cpp
+++ b/test/yulPhaser/Common.cpp
@@ -16,12 +16,12 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <test/TemporaryDirectory.h>
 #include <test/yulPhaser/TestHelpers.h>
 
 #include <tools/yulPhaser/Common.h>
 
 #include <libsolutil/CommonData.h>
+#include <libsolutil/TemporaryDirectory.h>
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
@@ -32,7 +32,6 @@
 
 using namespace std;
 using namespace boost::test_tools;
-using namespace solidity::test;
 using namespace solidity::util;
 
 namespace solidity::phaser::test
diff --git a/test/yulPhaser/Phaser.cpp b/test/yulPhaser/Phaser.cpp
index 60e9805227..feee2269e7 100644
--- a/test/yulPhaser/Phaser.cpp
+++ b/test/yulPhaser/Phaser.cpp
@@ -16,7 +16,6 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 
-#include <test/TemporaryDirectory.h>
 #include <test/yulPhaser/TestHelpers.h>
 
 #include <tools/yulPhaser/Exceptions.h>
@@ -25,6 +24,7 @@
 #include <liblangutil/CharStream.h>
 
 #include <libsolutil/CommonIO.h>
+#include <libsolutil/TemporaryDirectory.h>
 
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
@@ -33,7 +33,6 @@
 #include <fstream>
 
 using namespace std;
-using namespace solidity::test;
 using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::yul;

From fa944a0673e77be163d249d1173c426f0e7b3ca9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20Uzdo=C4=9Fan?= <kaanuzdogan@hotmail.com>
Date: Wed, 23 Nov 2022 09:53:58 +0100
Subject: [PATCH 1040/1748] Add "appendCBOR" to example JSON in metadata docs

---
 docs/metadata.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/metadata.rst b/docs/metadata.rst
index f2fffc0dd2..23871ba09e 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -100,6 +100,8 @@ explanatory purposes.
           }
         },
         "metadata": {
+          // Reflects the setting used in the input json, defaults to "true"
+          "appendCBOR": true,
           // Reflects the setting used in the input json, defaults to "false"
           "useLiteralContent": true,
           // Reflects the setting used in the input json, defaults to "ipfs"

From 27df07c4cee3a3c31d4d854162812552f7fd5550 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Fri, 23 Sep 2022 13:35:38 +0200
Subject: [PATCH 1041/1748] TypeChecker: Minor simplifications for operators
 and `using for`

---
 libsolidity/analysis/TypeChecker.cpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 0e2cc6c347..2e81c62310 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1751,7 +1751,9 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 	else
 		_operation.annotation().type = result.get();
 	_operation.annotation().isConstant = false;
-	_operation.annotation().isPure = !modifying && *_operation.subExpression().annotation().isPure;
+	_operation.annotation().isPure =
+		!modifying &&
+		*_operation.subExpression().annotation().isPure;
 	_operation.annotation().isLValue = false;
 
 	return false;
@@ -3750,8 +3752,9 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 			solAssert(m_errorReporter.hasErrors());
 			return;
 		}
-		solAssert(_usingFor.typeName()->annotation().type);
-		if (Declaration const* typeDefinition = _usingFor.typeName()->annotation().type->typeDefinition())
+		Type const* usingForType = _usingFor.typeName()->annotation().type;
+		solAssert(usingForType);
+		if (Declaration const* typeDefinition = usingForType->typeDefinition())
 		{
 			if (typeDefinition->scope() != m_currentSourceUnit)
 				m_errorReporter.typeError(
@@ -3785,10 +3788,12 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 		return;
 	}
 
-	solAssert(_usingFor.typeName()->annotation().type);
+	Type const* usingForType = _usingFor.typeName()->annotation().type;
+	solAssert(usingForType);
+
 	Type const* normalizedType = TypeProvider::withLocationIfReference(
 		DataLocation::Storage,
-		_usingFor.typeName()->annotation().type
+		usingForType
 	);
 	solAssert(normalizedType);
 
@@ -3824,7 +3829,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 					"The function \"{}\" cannot be bound to the type \"{}\" because the type cannot "
 					"be implicitly converted to the first argument of the function (\"{}\"){}",
 					joinHumanReadable(path->path(), "."),
-					_usingFor.typeName()->annotation().type->toString(true /* withoutDataLocation */),
+					usingForType->toString(true /* withoutDataLocation */),
 					functionType->selfType()->humanReadableName(),
 					result.message().empty() ? "." : ": " +  result.message()
 				)

From edb4bfa3985f29e42d97e85b559619ecd9d9411a Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Tue, 12 Jul 2022 12:00:23 +0200
Subject: [PATCH 1042/1748] ViewPureChecker: Extract
 reportFunctionCallMutability() helper from endVisit(FunctionCall)

---
 libsolidity/analysis/ViewPureChecker.cpp | 17 ++++++++++++-----
 libsolidity/analysis/ViewPureChecker.h   |  2 ++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp
index 7483af8922..076430e133 100644
--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ b/libsolidity/analysis/ViewPureChecker.cpp
@@ -323,16 +323,23 @@ ViewPureChecker::MutabilityAndLocation const& ViewPureChecker::modifierMutabilit
 	return m_inferredMutability.at(&_modifier);
 }
 
+void ViewPureChecker::reportFunctionCallMutability(StateMutability _mutability, langutil::SourceLocation const& _location)
+{
+	// We only require "nonpayable" to call a payable function.
+	if (_mutability == StateMutability::Payable)
+		_mutability = StateMutability::NonPayable;
+	reportMutability(_mutability, _location);
+}
+
 void ViewPureChecker::endVisit(FunctionCall const& _functionCall)
 {
 	if (*_functionCall.annotation().kind != FunctionCallKind::FunctionCall)
 		return;
 
-	StateMutability mutability = dynamic_cast<FunctionType const&>(*_functionCall.expression().annotation().type).stateMutability();
-	// We only require "nonpayable" to call a payble function.
-	if (mutability == StateMutability::Payable)
-		mutability = StateMutability::NonPayable;
-	reportMutability(mutability, _functionCall.location());
+	reportFunctionCallMutability(
+		dynamic_cast<FunctionType const&>(*_functionCall.expression().annotation().type).stateMutability(),
+		_functionCall.location()
+	);
 }
 
 bool ViewPureChecker::visit(MemberAccess const& _memberAccess)
diff --git a/libsolidity/analysis/ViewPureChecker.h b/libsolidity/analysis/ViewPureChecker.h
index b0abe8fd83..6ba1384cec 100644
--- a/libsolidity/analysis/ViewPureChecker.h
+++ b/libsolidity/analysis/ViewPureChecker.h
@@ -73,6 +73,8 @@ class ViewPureChecker: private ASTConstVisitor
 		std::optional<langutil::SourceLocation> const& _nestedLocation = {}
 	);
 
+	void reportFunctionCallMutability(StateMutability _mutability, langutil::SourceLocation const& _location);
+
 	/// Determines the mutability of modifier if not already cached.
 	MutabilityAndLocation const& modifierMutability(ModifierDefinition const& _modifier);
 

From 261e819df746ef650724f592f054d675c1da22a4 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 1 Dec 2021 16:22:50 +0100
Subject: [PATCH 1043/1748] Type: Extract `usingForDirectivesForType()` helper

---
 libsolidity/ast/Types.cpp | 52 ++++++++++++++++++++++-----------------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 9c0179edad..5980f93668 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -48,6 +48,7 @@
 #include <range/v3/view/reverse.hpp>
 #include <range/v3/view/tail.hpp>
 #include <range/v3/view/transform.hpp>
+#include <range/v3/view/filter.hpp>
 
 #include <limits>
 #include <unordered_set>
@@ -337,7 +338,10 @@ Type const* Type::fullEncodingType(bool _inLibraryCall, bool _encoderV2, bool) c
 	return encodingType;
 }
 
-MemberList::MemberMap Type::boundFunctions(Type const& _type, ASTNode const& _scope)
+namespace
+{
+
+vector<UsingForDirective const*> usingForDirectivesForType(Type const& _type, ASTNode const& _scope)
 {
 	vector<UsingForDirective const*> usingForDirectives;
 	SourceUnit const* sourceUnit = dynamic_cast<SourceUnit const*>(&_scope);
@@ -362,6 +366,25 @@ MemberList::MemberMap Type::boundFunctions(Type const& _type, ASTNode const& _sc
 	if (auto refType = dynamic_cast<ReferenceType const*>(&_type))
 		typeLocation = refType->location();
 
+	return usingForDirectives | ranges::views::filter([&](UsingForDirective const* _directive) -> bool {
+		// Convert both types to pointers for comparison to see if the `using for` directive applies.
+		// Note that at this point we don't yet know if the functions are actually usable with the type.
+		// `_type` may not be convertible to the function parameter type.
+		return
+			!_directive->typeName() ||
+			*TypeProvider::withLocationIfReference(typeLocation, &_type, true) ==
+			*TypeProvider::withLocationIfReference(
+				typeLocation,
+				_directive->typeName()->annotation().type,
+				true
+			);
+	}) | ranges::to<vector<UsingForDirective const*>>;
+}
+
+}
+
+MemberList::MemberMap Type::boundFunctions(Type const& _type, ASTNode const& _scope)
+{
 	MemberList::MemberMap members;
 
 	set<pair<string, Declaration const*>> seenFunctions;
@@ -381,27 +404,11 @@ MemberList::MemberMap Type::boundFunctions(Type const& _type, ASTNode const& _sc
 				members.emplace_back(&_function, asBoundFunction, *_name);
 	};
 
-	for (UsingForDirective const* ufd: usingForDirectives)
-	{
-		// Convert both types to pointers for comparison to see if the `using for`
-		// directive applies.
-		// Further down, we check more detailed for each function if `_type` is
-		// convertible to the function parameter type.
-		if (
-			ufd->typeName() &&
-			*TypeProvider::withLocationIfReference(typeLocation, &_type, true) !=
-			*TypeProvider::withLocationIfReference(
-				typeLocation,
-				ufd->typeName()->annotation().type,
-				true
-			)
-		)
-			continue;
-
-		for (auto const& pathPointer: ufd->functionsOrLibrary())
+	for (UsingForDirective const* ufd: usingForDirectivesForType(_type, _scope))
+		for (auto const& identifierPath: ufd->functionsOrLibrary())
 		{
-			solAssert(pathPointer);
-			Declaration const* declaration = pathPointer->annotation().referencedDeclaration;
+			solAssert(identifierPath);
+			Declaration const* declaration = identifierPath->annotation().referencedDeclaration;
 			solAssert(declaration);
 
 			if (ContractDefinition const* library = dynamic_cast<ContractDefinition const*>(declaration))
@@ -417,10 +424,9 @@ MemberList::MemberMap Type::boundFunctions(Type const& _type, ASTNode const& _sc
 			else
 				addFunction(
 					dynamic_cast<FunctionDefinition const&>(*declaration),
-					pathPointer->path().back()
+					identifierPath->path().back()
 				);
 		}
-	}
 
 	return members;
 }

From bf26d3be5a3ef5c9ed222a25fcf479974ab9444f Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 22 Nov 2022 13:05:20 +0100
Subject: [PATCH 1044/1748] Add experimental EOF options for CLI and Standard
 JSON.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 libsolidity/codegen/ir/IRGenerator.cpp        |  1 +
 libsolidity/codegen/ir/IRGenerator.h          |  3 ++
 libsolidity/interface/CompilerStack.cpp       | 26 ++++++++++++-
 libsolidity/interface/CompilerStack.h         |  5 +++
 libsolidity/interface/StandardCompiler.cpp    | 11 ++++++
 libsolidity/interface/StandardCompiler.h      |  1 +
 libyul/YulStack.cpp                           |  2 +-
 libyul/YulStack.h                             |  4 ++
 libyul/backends/evm/EVMObjectCompiler.cpp     | 17 ++++++--
 libyul/backends/evm/EVMObjectCompiler.h       | 16 ++++++--
 solc/CommandLineInterface.cpp                 |  2 +
 solc/CommandLineParser.cpp                    | 27 ++++++++++++-
 solc/CommandLineParser.h                      |  5 ++-
 test/Common.cpp                               | 13 ++++++-
 test/Common.h                                 |  2 +
 test/TestCase.h                               |  1 +
 test/libsolidity/InlineAssembly.cpp           |  3 ++
 test/libsolidity/Metadata.cpp                 | 39 +++++++++++++++++++
 test/libsolidity/SemanticTest.cpp             |  7 ++--
 test/libsolidity/SemanticTest.h               |  2 +
 .../SolidityExecutionFramework.cpp            |  2 +
 test/libsolidity/SolidityExecutionFramework.h |  3 ++
 test/libyul/Common.cpp                        |  1 +
 test/libyul/EVMCodeTransformTest.cpp          |  4 +-
 test/libyul/EwasmTranslationTest.cpp          |  1 +
 test/libyul/ObjectCompilerTest.cpp            |  1 +
 test/libyul/ObjectParser.cpp                  |  2 +
 test/libyul/YulInterpreterTest.cpp            |  1 +
 test/soltest.cpp                              |  1 +
 test/tools/isoltest.cpp                       |  1 +
 .../tools/ossfuzz/StackReuseCodegenFuzzer.cpp |  4 +-
 test/tools/ossfuzz/YulEvmoneInterface.h       |  6 ++-
 .../ossfuzz/strictasm_assembly_ossfuzz.cpp    |  1 +
 test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp |  1 +
 test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp  |  1 +
 test/tools/ossfuzz/yulProtoFuzzer.cpp         |  1 +
 test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp  |  1 +
 test/tools/yulrun.cpp                         |  1 +
 38 files changed, 198 insertions(+), 22 deletions(-)

diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index a13a353015..3713018041 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -97,6 +97,7 @@ pair<string, string> IRGenerator::run(
 
 	yul::YulStack asmStack(
 		m_evmVersion,
+		m_eofVersion,
 		yul::YulStack::Language::StrictAssembly,
 		m_optimiserSettings,
 		m_context.debugInfoSelection()
diff --git a/libsolidity/codegen/ir/IRGenerator.h b/libsolidity/codegen/ir/IRGenerator.h
index f89dc127aa..00387842ed 100644
--- a/libsolidity/codegen/ir/IRGenerator.h
+++ b/libsolidity/codegen/ir/IRGenerator.h
@@ -46,6 +46,7 @@ class IRGenerator
 
 	IRGenerator(
 		langutil::EVMVersion _evmVersion,
+		std::optional<uint8_t> _eofVersion,
 		RevertStrings _revertStrings,
 		OptimiserSettings _optimiserSettings,
 		std::map<std::string, unsigned> _sourceIndices,
@@ -53,6 +54,7 @@ class IRGenerator
 		langutil::CharStreamProvider const* _soliditySourceProvider
 	):
 		m_evmVersion(_evmVersion),
+		m_eofVersion(_eofVersion),
 		m_optimiserSettings(_optimiserSettings),
 		m_context(
 			_evmVersion,
@@ -138,6 +140,7 @@ class IRGenerator
 	std::string dispenseLocationComment(ASTNode const& _node);
 
 	langutil::EVMVersion const m_evmVersion;
+	std::optional<uint8_t> const m_eofVersion;
 	OptimiserSettings const m_optimiserSettings;
 
 	IRGenerationContext m_context;
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index a936b055dd..96a298bf06 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -225,6 +225,15 @@ void CompilerStack::setEVMVersion(langutil::EVMVersion _version)
 	m_evmVersion = _version;
 }
 
+void CompilerStack::setEOFVersion(std::optional<uint8_t> _version)
+{
+	if (m_stackState >= CompilationSuccessful)
+		solThrow(CompilerError, "Must set EOF version before compiling.");
+	if (_version && _version != 1)
+		solThrow(CompilerError, "Invalid EOF version.");
+	m_eofVersion = _version;
+}
+
 void CompilerStack::setModelCheckerSettings(ModelCheckerSettings _settings)
 {
 	if (m_stackState >= ParsedAndImported)
@@ -1299,6 +1308,7 @@ void CompilerStack::compileContract(
 )
 {
 	solAssert(!m_viaIR, "");
+	solUnimplementedAssert(!m_eofVersion.has_value(), "Experimental EOF support is only available for via-IR compilation.");
 	solAssert(m_stackState >= AnalysisPerformed, "");
 	if (m_hasError)
 		solThrow(CompilerError, "Called compile with errors.");
@@ -1364,7 +1374,15 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 	for (auto const& pair: m_contracts)
 		otherYulSources.emplace(pair.second.contract, pair.second.yulIR);
 
-	IRGenerator generator(m_evmVersion, m_revertStrings, m_optimiserSettings, sourceIndices(), m_debugInfoSelection, this);
+	IRGenerator generator(
+		m_evmVersion,
+		m_eofVersion,
+		m_revertStrings,
+		m_optimiserSettings,
+		sourceIndices(),
+		m_debugInfoSelection,
+		this
+	);
 	tie(compiledContract.yulIR, compiledContract.yulIROptimized) = generator.run(
 		_contract,
 		createCBORMetadata(compiledContract, /* _forIR */ true),
@@ -1389,6 +1407,7 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 	// Re-parse the Yul IR in EVM dialect
 	yul::YulStack stack(
 		m_evmVersion,
+		m_eofVersion,
 		yul::YulStack::Language::StrictAssembly,
 		m_optimiserSettings,
 		m_debugInfoSelection
@@ -1421,6 +1440,7 @@ void CompilerStack::generateEwasm(ContractDefinition const& _contract)
 	// Re-parse the Yul IR in EVM dialect
 	yul::YulStack stack(
 		m_evmVersion,
+		m_eofVersion,
 		yul::YulStack::Language::StrictAssembly,
 		m_optimiserSettings,
 		m_debugInfoSelection
@@ -1571,6 +1591,8 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 	if (_forIR)
 		meta["settings"]["viaIR"] = _forIR;
 	meta["settings"]["evmVersion"] = m_evmVersion.name();
+	if (m_eofVersion.has_value())
+		meta["settings"]["eofVersion"] = *m_eofVersion;
 	meta["settings"]["compilationTarget"][_contract.contract->sourceUnitName()] =
 		*_contract.contract->annotation().canonicalName;
 
@@ -1695,7 +1717,7 @@ bytes CompilerStack::createCBORMetadata(Contract const& _contract, bool _forIR)
 	else
 		solAssert(m_metadataHash == MetadataHash::None, "Invalid metadata hash");
 
-	if (experimentalMode)
+	if (experimentalMode || m_eofVersion.has_value())
 		encoder.pushBool("experimental", true);
 	if (m_metadataFormat == MetadataFormat::WithReleaseVersionTag)
 		encoder.pushBytes("solc", VersionCompactBytes);
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 2ca7ba091b..099c1f0030 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -181,6 +181,10 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// Must be set before parsing.
 	void setEVMVersion(langutil::EVMVersion _version = langutil::EVMVersion{});
 
+	/// Set the EOF version used before running compile.
+	/// If set to std::nullopt (the default), legacy non-EOF bytecode is generated.
+	void setEOFVersion(std::optional<uint8_t> version);
+
 	/// Set model checker settings.
 	void setModelCheckerSettings(ModelCheckerSettings _settings);
 
@@ -498,6 +502,7 @@ class CompilerStack: public langutil::CharStreamProvider
 	State m_stopAfter = State::CompilationSuccessful;
 	bool m_viaIR = false;
 	langutil::EVMVersion m_evmVersion;
+	std::optional<uint8_t> m_eofVersion;
 	ModelCheckerSettings m_modelCheckerSettings;
 	std::map<std::string, std::set<std::string>> m_requestedContractNames;
 	bool m_generateEvmBytecode = true;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 676f02d627..823c7c2f21 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -800,6 +800,16 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.evmVersion = *version;
 	}
 
+	if (settings.isMember("eofVersion"))
+	{
+		if (!settings["eofVersion"].isUInt())
+			return formatFatalError(Error::Type::JSONError, "eofVersion must be an unsigned integer.");
+		auto eofVersion = settings["evmVersion"].asUInt();
+		if (eofVersion != 1)
+			return formatFatalError(Error::Type::JSONError, "Invalid EOF version requested.");
+		ret.eofVersion = 1;
+	}
+
 	if (settings.isMember("debug"))
 	{
 		if (auto result = checkKeys(settings["debug"], {"revertStrings", "debugInfo"}, "settings.debug"))
@@ -1413,6 +1423,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 
 	YulStack stack(
 		_inputsAndSettings.evmVersion,
+		_inputsAndSettings.eofVersion,
 		YulStack::Language::StrictAssembly,
 		_inputsAndSettings.optimiserSettings,
 		_inputsAndSettings.debugInfoSelection.has_value() ?
diff --git a/libsolidity/interface/StandardCompiler.h b/libsolidity/interface/StandardCompiler.h
index 3e94f02319..f06dd0c5ab 100644
--- a/libsolidity/interface/StandardCompiler.h
+++ b/libsolidity/interface/StandardCompiler.h
@@ -77,6 +77,7 @@ class StandardCompiler
 		std::map<std::string, std::string> sources;
 		std::map<util::h256, std::string> smtLib2Responses;
 		langutil::EVMVersion evmVersion;
+		std::optional<uint8_t> eofVersion;
 		std::vector<ImportRemapper::Remapping> remappings;
 		RevertStrings revertStrings = RevertStrings::Default;
 		OptimiserSettings optimiserSettings = OptimiserSettings::minimal();
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 9bd80d256a..b330269499 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -164,7 +164,7 @@ void YulStack::compileEVM(AbstractAssembly& _assembly, bool _optimize) const
 			break;
 	}
 
-	EVMObjectCompiler::compile(*m_parserResult, _assembly, *dialect, _optimize);
+	EVMObjectCompiler::compile(*m_parserResult, _assembly, *dialect, _optimize, m_eofVersion);
 }
 
 void YulStack::optimize(Object& _object, bool _isCreation)
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index 77d0025f14..5c57b56fa5 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -72,6 +72,7 @@ class YulStack: public langutil::CharStreamProvider
 	YulStack():
 		YulStack(
 			langutil::EVMVersion{},
+			std::nullopt,
 			Language::Assembly,
 			solidity::frontend::OptimiserSettings::none(),
 			langutil::DebugInfoSelection::Default()
@@ -80,12 +81,14 @@ class YulStack: public langutil::CharStreamProvider
 
 	YulStack(
 		langutil::EVMVersion _evmVersion,
+		std::optional<uint8_t> _eofVersion,
 		Language _language,
 		solidity::frontend::OptimiserSettings _optimiserSettings,
 		langutil::DebugInfoSelection const& _debugInfoSelection
 	):
 		m_language(_language),
 		m_evmVersion(_evmVersion),
+		m_eofVersion(_eofVersion),
 		m_optimiserSettings(std::move(_optimiserSettings)),
 		m_debugInfoSelection(_debugInfoSelection),
 		m_errorReporter(m_errors)
@@ -146,6 +149,7 @@ class YulStack: public langutil::CharStreamProvider
 
 	Language m_language = Language::Assembly;
 	langutil::EVMVersion m_evmVersion;
+	std::optional<uint8_t> m_eofVersion;
 	solidity::frontend::OptimiserSettings m_optimiserSettings;
 	langutil::DebugInfoSelection m_debugInfoSelection{};
 
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index 4dbf5cc1a3..e7eae69ba6 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -35,9 +35,15 @@
 using namespace solidity::yul;
 using namespace std;
 
-void EVMObjectCompiler::compile(Object& _object, AbstractAssembly& _assembly, EVMDialect const& _dialect, bool _optimize)
+void EVMObjectCompiler::compile(
+	Object& _object,
+	AbstractAssembly& _assembly,
+	EVMDialect const& _dialect,
+	bool _optimize,
+	std::optional<uint8_t> _eofVersion
+)
 {
-	EVMObjectCompiler compiler(_assembly, _dialect);
+	EVMObjectCompiler compiler(_assembly, _dialect, _eofVersion);
 	compiler.run(_object, _optimize);
 }
 
@@ -54,7 +60,7 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 			auto subAssemblyAndID = m_assembly.createSubAssembly(isCreation, subObject->name.str());
 			context.subIDs[subObject->name] = subAssemblyAndID.second;
 			subObject->subId = subAssemblyAndID.second;
-			compile(*subObject, *subAssemblyAndID.first, m_dialect, _optimize);
+			compile(*subObject, *subAssemblyAndID.first, m_dialect, _optimize, m_eofVersion);
 		}
 		else
 		{
@@ -68,6 +74,11 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 
 	yulAssert(_object.analysisInfo, "No analysis info.");
 	yulAssert(_object.code, "No code.");
+	if (m_eofVersion.has_value())
+		yulAssert(
+			_optimize && (m_dialect.evmVersion() == langutil::EVMVersion()),
+			"Experimental EOF support is only available for optimized via-IR compilation and the most recent EVM version."
+		);
 	if (_optimize && m_dialect.evmVersion().canOverchargeGasForCall())
 	{
 		auto stackErrors = OptimizedEVMCodeTransform::run(
diff --git a/libyul/backends/evm/EVMObjectCompiler.h b/libyul/backends/evm/EVMObjectCompiler.h
index 02ccc9181e..df8d71c2ce 100644
--- a/libyul/backends/evm/EVMObjectCompiler.h
+++ b/libyul/backends/evm/EVMObjectCompiler.h
@@ -21,6 +21,9 @@
 
 #pragma once
 
+#include <optional>
+#include <cstdint>
+
 namespace solidity::yul
 {
 struct Object;
@@ -30,16 +33,23 @@ struct EVMDialect;
 class EVMObjectCompiler
 {
 public:
-	static void compile(Object& _object, AbstractAssembly& _assembly, EVMDialect const& _dialect, bool _optimize);
+	static void compile(
+		Object& _object,
+		AbstractAssembly& _assembly,
+		EVMDialect const& _dialect,
+		bool _optimize,
+		std::optional<uint8_t> _eofVersion
+	);
 private:
-	EVMObjectCompiler(AbstractAssembly& _assembly, EVMDialect const& _dialect):
-		m_assembly(_assembly), m_dialect(_dialect)
+	EVMObjectCompiler(AbstractAssembly& _assembly, EVMDialect const& _dialect, std::optional<uint8_t> _eofVersion):
+		m_assembly(_assembly), m_dialect(_dialect), m_eofVersion(_eofVersion)
 	{}
 
 	void run(Object& _object, bool _optimize);
 
 	AbstractAssembly& m_assembly;
 	EVMDialect const& m_dialect;
+	std::optional<uint8_t> m_eofVersion;
 };
 
 }
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 3e44f22c02..0f751c2039 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -708,6 +708,7 @@ void CommandLineInterface::compile()
 		m_compiler->setLibraries(m_options.linker.libraries);
 		m_compiler->setViaIR(m_options.output.viaIR);
 		m_compiler->setEVMVersion(m_options.output.evmVersion);
+		m_compiler->setEOFVersion(m_options.output.eofVersion);
 		m_compiler->setRevertStringBehaviour(m_options.output.revertStrings);
 		if (m_options.output.debugInfoSelection.has_value())
 			m_compiler->selectDebugInfo(m_options.output.debugInfoSelection.value());
@@ -1042,6 +1043,7 @@ void CommandLineInterface::assemble(yul::YulStack::Language _language, yul::YulS
 
 		auto& stack = yulStacks[src.first] = yul::YulStack(
 			m_options.output.evmVersion,
+			m_options.output.eofVersion,
 			_language,
 			m_options.optimiserSettings(),
 			m_options.output.debugInfoSelection.has_value() ?
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 2a1ce02280..406e8111d5 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -47,6 +47,7 @@ static string const g_strErrorRecovery = "error-recovery";
 static string const g_strEVM = "evm";
 static string const g_strEVMVersion = "evm-version";
 static string const g_strEwasm = "ewasm";
+static string const g_strEOFVersion = "experimental-eof-version";
 static string const g_strViaIR = "via-ir";
 static string const g_strExperimentalViaIR = "experimental-via-ir";
 static string const g_strGas = "gas";
@@ -231,6 +232,7 @@ bool CommandLineOptions::operator==(CommandLineOptions const& _other) const noex
 		output.revertStrings == _other.output.revertStrings &&
 		output.debugInfoSelection == _other.output.debugInfoSelection &&
 		output.stopAfter == _other.output.stopAfter &&
+		output.eofVersion == _other.output.eofVersion &&
 		input.mode == _other.input.mode &&
 		assembly.targetMachine == _other.assembly.targetMachine &&
 		assembly.inputLanguage == _other.assembly.inputLanguage &&
@@ -509,9 +511,11 @@ void CommandLineParser::parseOutputSelection()
 			"The following outputs are not supported in " + g_inputModeName.at(m_options.input.mode) + " mode: " +
 			joinOptionNames(unsupportedOutputs) + "."
 		);
+
+	// TODO: restrict EOF version to correct EVM version.
 }
 
-po::options_description CommandLineParser::optionsDescription()
+po::options_description CommandLineParser::optionsDescription(bool _forHelp)
 {
 	// Declare the supported options.
 	po::options_description desc((R"(solc, the Solidity commandline compiler.
@@ -588,6 +592,18 @@ General Information)").c_str(),
 			"Select desired EVM version. Either homestead, tangerineWhistle, spuriousDragon, "
 			"byzantium, constantinople, petersburg, istanbul, berlin, london or paris."
 		)
+	;
+	if (!_forHelp) // Note: We intentionally keep this undocumented for now.
+		outputOptions.add_options()
+			(
+				g_strEOFVersion.c_str(),
+				// Declared as uint64_t, since uint8_t will be parsed as character by boost.
+				po::value<uint64_t>()->value_name("version")->implicit_value(1),
+				"Select desired EOF version. Currently the only valid value is 1. "
+				"If not specified, legacy non-EOF bytecode will be generated."
+			)
+		;
+	outputOptions.add_options()
 		(
 			g_strExperimentalViaIR.c_str(),
 			"Deprecated synonym of --via-ir."
@@ -1113,6 +1129,15 @@ void CommandLineParser::processArgs()
 		m_options.output.evmVersion = *versionOption;
 	}
 
+	if (m_args.count(g_strEOFVersion))
+	{
+		// Request as uint64_t, since uint8_t will be parsed as character by boost.
+		uint64_t versionOption = m_args[g_strEOFVersion].as<uint64_t>();
+		if (versionOption != 1)
+			solThrow(CommandLineValidationError, "Invalid option for --" + g_strEOFVersion + ": " + to_string(versionOption));
+		m_options.output.eofVersion = 1;
+	}
+
 	m_options.optimizer.enabled = (m_args.count(g_strOptimize) > 0);
 	m_options.optimizer.noOptimizeYul = (m_args.count(g_strNoOptimizeYul) > 0);
 	if (!m_args[g_strOptimizeRuns].defaulted())
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index d695a6eb69..7bcc8a0f0b 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -186,6 +186,7 @@ struct CommandLineOptions
 		RevertStrings revertStrings = RevertStrings::Default;
 		std::optional<langutil::DebugInfoSelection> debugInfoSelection;
 		CompilerStack::State stopAfter = CompilerStack::State::CompilationSuccessful;
+		std::optional<uint8_t> eofVersion;
 	} output;
 
 	struct
@@ -247,12 +248,12 @@ class CommandLineParser
 
 	CommandLineOptions const& options() const { return m_options; }
 
-	static void printHelp(std::ostream& _out) { _out << optionsDescription(); }
+	static void printHelp(std::ostream& _out) { _out << optionsDescription(true /* _forHelp */); }
 
 private:
 	/// @returns a specification of all named command-line options accepted by the compiler.
 	/// The object can be used to parse command-line arguments or to generate the help screen.
-	static boost::program_options::options_description optionsDescription();
+	static boost::program_options::options_description optionsDescription(bool _forHelp = false);
 
 	/// @returns a specification of all positional command-line arguments accepted by the compiler.
 	/// The object can be used to parse command-line arguments or to generate the help screen.
diff --git a/test/Common.cpp b/test/Common.cpp
index 7cd869934b..3af23c7827 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -103,7 +103,9 @@ CommonOptions::CommonOptions(std::string _caption):
 void CommonOptions::addOptions()
 {
 	options.add_options()
-		("evm-version", po::value(&evmVersionString), "which evm version to use")
+		("evm-version", po::value(&evmVersionString), "which EVM version to use")
+		// "eof-version" is declared as uint64_t, since uint8_t will be parsed as character by boost.
+		("eof-version", po::value<uint64_t>()->implicit_value(1u), "which EOF version to use")
 		("testpath", po::value<fs::path>(&this->testPath)->default_value(solidity::test::testPath()), "path to test files")
 		("vm", po::value<std::vector<fs::path>>(&vmPaths), "path to evmc library, can be supplied multiple times.")
 		("ewasm", po::bool_switch(&ewasm)->default_value(ewasm), "tries to automatically find an ewasm vm and enable ewasm test-execution.")
@@ -170,6 +172,14 @@ bool CommonOptions::parse(int argc, char const* const* argv)
 		auto parsedOptions = cmdLineParser.run();
 		po::store(parsedOptions, arguments);
 		po::notify(arguments);
+		if (arguments.count("eof-version"))
+		{
+			// Request as uint64_t, since uint8_t will be parsed as character by boost.
+			uint64_t eofVersion = arguments["eof-version"].as<uint64_t>();
+			if (eofVersion != 1)
+				BOOST_THROW_EXCEPTION(std::runtime_error("Invalid EOF version: " + to_string(eofVersion)));
+			m_eofVersion = 1;
+		}
 
 		for (auto const& parsedOption: parsedOptions.options)
 			if (parsedOption.position_key >= 0)
@@ -261,7 +271,6 @@ langutil::EVMVersion CommonOptions::evmVersion() const
 		return langutil::EVMVersion();
 }
 
-
 CommonOptions const& CommonOptions::get()
 {
 	if (!m_singleton)
diff --git a/test/Common.h b/test/Common.h
index d428e02616..91858d4b44 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -72,6 +72,7 @@ struct CommonOptions
 	size_t selectedBatch = 0;
 
 	langutil::EVMVersion evmVersion() const;
+	std::optional<uint8_t> eofVersion() const { return m_eofVersion; }
 
 	virtual void addOptions();
 	// @returns true if the program should continue, false if it should exit immediately without
@@ -98,6 +99,7 @@ struct CommonOptions
 
 private:
 	std::string evmVersionString;
+	std::optional<uint8_t> m_eofVersion;
 	static std::unique_ptr<CommonOptions const> m_singleton;
 };
 
diff --git a/test/TestCase.h b/test/TestCase.h
index 181fb01200..7a5c75c502 100644
--- a/test/TestCase.h
+++ b/test/TestCase.h
@@ -39,6 +39,7 @@ class TestCase
 	{
 		std::string filename;
 		langutil::EVMVersion evmVersion;
+		std::optional<uint8_t> eofVersion;
 		std::vector<boost::filesystem::path> vmPaths;
 		bool enforceCompileToEwasm = false;
 		bool enforceGasCost = false;
diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp
index 314a0d7604..4a8a9d6172 100644
--- a/test/libsolidity/InlineAssembly.cpp
+++ b/test/libsolidity/InlineAssembly.cpp
@@ -62,6 +62,7 @@ std::optional<Error> parseAndReturnFirstError(
 {
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
 		_language,
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::None()
@@ -133,6 +134,7 @@ void parsePrintCompare(string const& _source, bool _canWarn = false)
 {
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
 		YulStack::Language::Assembly,
 		OptimiserSettings::none(),
 		DebugInfoSelection::None()
@@ -223,6 +225,7 @@ BOOST_AUTO_TEST_CASE(print_string_literal_unicode)
 	string parsed = "object \"object\" {\n    code { let x := \"\\xe1\\xae\\xac\" }\n}\n";
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
 		YulStack::Language::Assembly,
 		OptimiserSettings::none(),
 		DebugInfoSelection::None()
diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
index 6814ae80ab..1dc3dfd268 100644
--- a/test/libsolidity/Metadata.cpp
+++ b/test/libsolidity/Metadata.cpp
@@ -226,6 +226,45 @@ BOOST_AUTO_TEST_CASE(metadata_stamp_experimental)
 		}
 }
 
+BOOST_AUTO_TEST_CASE(metadata_eof_experimental)
+{
+	// Check that setting an EOF version results in the experimental flag being set.
+	char const* sourceCode = R"(
+		pragma solidity >=0.0;
+		contract test {
+			function g(function(uint) external returns (uint) x) public {}
+		}
+	)";
+	for (auto metadataFormat: std::set<CompilerStack::MetadataFormat>{
+		CompilerStack::MetadataFormat::NoMetadata,
+		CompilerStack::MetadataFormat::WithReleaseVersionTag,
+		CompilerStack::MetadataFormat::WithPrereleaseVersionTag
+	})
+	{
+		CompilerStack compilerStack;
+		compilerStack.setMetadataFormat(metadataFormat);
+		compilerStack.setSources({{"", sourceCode}});
+		compilerStack.setEVMVersion({});
+		compilerStack.setViaIR(true);
+		compilerStack.setEOFVersion(1);
+		compilerStack.setOptimiserSettings(true);
+		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
+		bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
+		string const& metadata = compilerStack.metadata("test");
+		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
+
+		auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
+
+		if (metadataFormat == CompilerStack::MetadataFormat::NoMetadata)
+			BOOST_CHECK(cborMetadata.count("experimental") == 0);
+		else
+		{
+			BOOST_CHECK(cborMetadata.count("experimental") == 1);
+			BOOST_CHECK(cborMetadata.at("experimental") == "true");
+		}
+	}
+}
+
 BOOST_AUTO_TEST_CASE(metadata_relevant_sources)
 {
 	CompilerStack compilerStack;
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 0749f57148..4746999a3e 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -48,12 +48,13 @@ namespace fs = boost::filesystem;
 SemanticTest::SemanticTest(
 	string const& _filename,
 	langutil::EVMVersion _evmVersion,
+	optional<uint8_t> _eofVersion,
 	vector<boost::filesystem::path> const& _vmPaths,
 	bool _enforceCompileToEwasm,
 	bool _enforceGasCost,
 	u256 _enforceGasCostMinValue
 ):
-	SolidityExecutionFramework(_evmVersion, _vmPaths, false),
+	SolidityExecutionFramework(_evmVersion, _eofVersion, _vmPaths, false),
 	EVMVersionRestrictedTestCase(_filename),
 	m_sources(m_reader.sources()),
 	m_lineOffset(m_reader.lineNumber()),
@@ -296,13 +297,13 @@ TestCase::TestResult SemanticTest::run(ostream& _stream, string const& _linePref
 {
 	TestResult result = TestResult::Success;
 
-	if (m_testCaseWantsLegacyRun)
+	if (m_testCaseWantsLegacyRun && !m_eofVersion.has_value())
 		result = runTest(_stream, _linePrefix, _formatted, false, false);
 
 	if (m_testCaseWantsYulRun && result == TestResult::Success)
 		result = runTest(_stream, _linePrefix, _formatted, true, false);
 
-	if ((m_testCaseWantsEwasmRun || m_enforceCompileToEwasm) && result == TestResult::Success)
+	if (!m_eofVersion.has_value() && (m_testCaseWantsEwasmRun || m_enforceCompileToEwasm) && result == TestResult::Success)
 	{
 		// TODO: Once we have full Ewasm support, we could remove try/catch here.
 		try
diff --git a/test/libsolidity/SemanticTest.h b/test/libsolidity/SemanticTest.h
index dd189f1b53..c5abb93e27 100644
--- a/test/libsolidity/SemanticTest.h
+++ b/test/libsolidity/SemanticTest.h
@@ -51,6 +51,7 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 		return std::make_unique<SemanticTest>(
 			_options.filename,
 			_options.evmVersion,
+			_options.eofVersion,
 			_options.vmPaths,
 			_options.enforceCompileToEwasm,
 			_options.enforceGasCost,
@@ -61,6 +62,7 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 	explicit SemanticTest(
 		std::string const& _filename,
 		langutil::EVMVersion _evmVersion,
+		std::optional<uint8_t> _eofVersion,
 		std::vector<boost::filesystem::path> const& _vmPaths,
 		bool _enforceCompileToEwasm = false,
 		bool _enforceGasCost = false,
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index 0450f290ae..3e8372ef78 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -58,6 +58,7 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 	m_compiler.setLibraries(_libraryAddresses);
 	m_compiler.setRevertStringBehaviour(m_revertStrings);
 	m_compiler.setEVMVersion(m_evmVersion);
+	m_compiler.setEOFVersion(m_eofVersion);
 	m_compiler.setOptimiserSettings(m_optimiserSettings);
 	m_compiler.enableEvmBytecodeGeneration(!m_compileViaYul);
 	m_compiler.enableIRGeneration(m_compileViaYul);
@@ -102,6 +103,7 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 
 				yul::YulStack asmStack(
 					m_evmVersion,
+					m_eofVersion,
 					yul::YulStack::Language::StrictAssembly,
 					optimiserSettings,
 					DebugInfoSelection::All()
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
index a273f2ad1c..4865c68a22 100644
--- a/test/libsolidity/SolidityExecutionFramework.h
+++ b/test/libsolidity/SolidityExecutionFramework.h
@@ -42,10 +42,12 @@ class SolidityExecutionFramework: public solidity::test::ExecutionFramework
 	SolidityExecutionFramework(): m_showMetadata(solidity::test::CommonOptions::get().showMetadata) {}
 	explicit SolidityExecutionFramework(
 		langutil::EVMVersion _evmVersion,
+		std::optional<uint8_t> _eofVersion,
 		std::vector<boost::filesystem::path> const& _vmPaths,
 		bool _appendCBORMetadata = true
 	):
 		ExecutionFramework(_evmVersion, _vmPaths),
+		m_eofVersion(_eofVersion),
 		m_showMetadata(solidity::test::CommonOptions::get().showMetadata),
 		m_appendCBORMetadata(_appendCBORMetadata)
 	{}
@@ -82,6 +84,7 @@ class SolidityExecutionFramework: public solidity::test::ExecutionFramework
 	static std::string addPreamble(std::string const& _sourceCode);
 protected:
 	using CompilerStack = solidity::frontend::CompilerStack;
+	std::optional<uint8_t> m_eofVersion;
 	CompilerStack m_compiler;
 	bool m_compileViaYul = false;
 	bool m_compileToEwasm = false;
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index f40f422a8a..11896d2f91 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -57,6 +57,7 @@ pair<shared_ptr<Block>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(strin
 {
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
 		_yul ? YulStack::Language::Yul : YulStack::Language::StrictAssembly,
 		solidity::test::CommonOptions::get().optimize ?
 			solidity::frontend::OptimiserSettings::standard() :
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
index c1f6ae5df5..744fa8c033 100644
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ b/test/libyul/EVMCodeTransformTest.cpp
@@ -53,6 +53,7 @@ TestCase::TestResult EVMCodeTransformTest::run(ostream& _stream, string const& _
 	settings.optimizeStackAllocation = m_stackOpt;
 	YulStack stack(
 		EVMVersion{},
+		nullopt,
 		YulStack::Language::StrictAssembly,
 		settings,
 		DebugInfoSelection::All()
@@ -71,7 +72,8 @@ TestCase::TestResult EVMCodeTransformTest::run(ostream& _stream, string const& _
 		*stack.parserResult(),
 		adapter,
 		EVMDialect::strictAssemblyForEVMObjects(EVMVersion{}),
-		m_stackOpt
+		m_stackOpt,
+		nullopt
 	);
 
 	std::ostringstream output;
diff --git a/test/libyul/EwasmTranslationTest.cpp b/test/libyul/EwasmTranslationTest.cpp
index 075d117951..f40bc2e420 100644
--- a/test/libyul/EwasmTranslationTest.cpp
+++ b/test/libyul/EwasmTranslationTest.cpp
@@ -82,6 +82,7 @@ bool EwasmTranslationTest::parse(ostream& _stream, string const& _linePrefix, bo
 {
 	m_stack = YulStack(
 		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::All()
diff --git a/test/libyul/ObjectCompilerTest.cpp b/test/libyul/ObjectCompilerTest.cpp
index dcb7158c2f..190001a57a 100644
--- a/test/libyul/ObjectCompilerTest.cpp
+++ b/test/libyul/ObjectCompilerTest.cpp
@@ -65,6 +65,7 @@ TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _li
 {
 	YulStack stack(
 		EVMVersion(),
+		nullopt,
 		m_wasm ? YulStack::Language::Ewasm : YulStack::Language::StrictAssembly,
 		OptimiserSettings::preset(m_optimisationPreset),
 		DebugInfoSelection::All()
diff --git a/test/libyul/ObjectParser.cpp b/test/libyul/ObjectParser.cpp
index 9e429177d3..e78a8b0eb6 100644
--- a/test/libyul/ObjectParser.cpp
+++ b/test/libyul/ObjectParser.cpp
@@ -59,6 +59,7 @@ pair<bool, ErrorList> parse(string const& _source)
 	{
 		YulStack asmStack(
 			solidity::test::CommonOptions::get().evmVersion(),
+			solidity::test::CommonOptions::get().eofVersion(),
 			YulStack::Language::StrictAssembly,
 			solidity::frontend::OptimiserSettings::none(),
 			DebugInfoSelection::All()
@@ -181,6 +182,7 @@ BOOST_AUTO_TEST_CASE(to_string)
 	expectation = boost::replace_all_copy(expectation, "\t", "    ");
 	YulStack asmStack(
 		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::All()
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index 47b167c91e..3d1974e968 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -68,6 +68,7 @@ bool YulInterpreterTest::parse(ostream& _stream, string const& _linePrefix, bool
 {
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::All()
diff --git a/test/soltest.cpp b/test/soltest.cpp
index c104cd8b4c..2120acc2df 100644
--- a/test/soltest.cpp
+++ b/test/soltest.cpp
@@ -144,6 +144,7 @@ int registerTests(
 	TestCase::Config config{
 		fullpath.string(),
 		solidity::test::CommonOptions::get().evmVersion(),
+		solidity::test::CommonOptions::get().eofVersion(),
 		solidity::test::CommonOptions::get().vmPaths,
 		_enforceCompileToEwasm,
 		solidity::test::CommonOptions::get().enforceGasTest,
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index cf1588b447..c2035ab185 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -159,6 +159,7 @@ TestTool::Result TestTool::process()
 			m_test = m_testCaseCreator(TestCase::Config{
 				m_path.string(),
 				m_options.evmVersion(),
+				m_options.eofVersion(),
 				m_options.vmPaths,
 				m_options.enforceCompileToEwasm,
 				m_options.enforceGasTest,
diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
index 10ce76f482..d7779a58d9 100644
--- a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
+++ b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
@@ -80,7 +80,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	bytes unoptimisedByteCode;
 	try
 	{
-		unoptimisedByteCode = YulAssembler{version, settings, yul_source}.assemble();
+		unoptimisedByteCode = YulAssembler{version, nullopt, settings, yul_source}.assemble();
 	}
 	catch (solidity::yul::StackTooDeepError const&)
 	{
@@ -123,7 +123,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	bytes optimisedByteCode;
 	try
 	{
-		optimisedByteCode = YulAssembler{version, settings, yul_source}.assemble();
+		optimisedByteCode = YulAssembler{version, nullopt, settings, yul_source}.assemble();
 	}
 	catch (solidity::yul::StackTooDeepError const&)
 	{
diff --git a/test/tools/ossfuzz/YulEvmoneInterface.h b/test/tools/ossfuzz/YulEvmoneInterface.h
index a875eeb817..9224a949de 100644
--- a/test/tools/ossfuzz/YulEvmoneInterface.h
+++ b/test/tools/ossfuzz/YulEvmoneInterface.h
@@ -31,12 +31,14 @@ class YulAssembler
 {
 public:
 	YulAssembler(
-		langutil::EVMVersion _version,
+		langutil::EVMVersion _evmVersion,
+		std::optional<uint8_t> _eofVersion,
 		solidity::frontend::OptimiserSettings _optSettings,
 		std::string const& _yulSource
 	):
 		m_stack(
-			_version,
+			_evmVersion,
+			_eofVersion,
 			solidity::yul::YulStack::Language::StrictAssembly,
 			_optSettings,
 			langutil::DebugInfoSelection::All()
diff --git a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
index a353ca10b4..b9473f613a 100644
--- a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
@@ -39,6 +39,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	string input(reinterpret_cast<char const*>(_data), _size);
 	YulStack stack(
 		langutil::EVMVersion(),
+		nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		langutil::DebugInfoSelection::All()
diff --git a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
index dd66102c17..5c923a3ea7 100644
--- a/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_diff_ossfuzz.cpp
@@ -62,6 +62,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 
 	YulStack stack(
 		langutil::EVMVersion(),
+		nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
diff --git a/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
index 94a837d5ab..db35cc8652 100644
--- a/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_opt_ossfuzz.cpp
@@ -40,6 +40,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 	string input(reinterpret_cast<char const*>(_data), _size);
 	YulStack stack(
 		langutil::EVMVersion(),
+		nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
diff --git a/test/tools/ossfuzz/yulProtoFuzzer.cpp b/test/tools/ossfuzz/yulProtoFuzzer.cpp
index 74183aa3f1..c2ac680934 100644
--- a/test/tools/ossfuzz/yulProtoFuzzer.cpp
+++ b/test/tools/ossfuzz/yulProtoFuzzer.cpp
@@ -64,6 +64,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	// YulStack entry point
 	YulStack stack(
 		version,
+		nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index 2335bfbf5d..b1725a8fa8 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -63,6 +63,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	// YulStack entry point
 	YulStack stack(
 		version,
+		nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::full(),
 		DebugInfoSelection::All()
diff --git a/test/tools/yulrun.cpp b/test/tools/yulrun.cpp
index eee3424700..2e1bcc013e 100644
--- a/test/tools/yulrun.cpp
+++ b/test/tools/yulrun.cpp
@@ -59,6 +59,7 @@ pair<shared_ptr<Block>, shared_ptr<AsmAnalysisInfo>> parse(string const& _source
 {
 	YulStack stack(
 		langutil::EVMVersion(),
+		nullopt,
 		YulStack::Language::StrictAssembly,
 		solidity::frontend::OptimiserSettings::none(),
 		DebugInfoSelection::Default()

From f3d7dfba82cf162e869b62cc67e3ade47cb39990 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 23 Nov 2022 16:51:00 +0100
Subject: [PATCH 1045/1748] use new docker images

---
 .circleci/config.yml                  | 16 ++++++++--------
 .circleci/osx_install_dependencies.sh |  4 ++--
 scripts/build_emscripten.sh           |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d4349614bf..a4a7605d26 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,20 +9,20 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-15
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e4f83457bf1d6475c3189e9013da77289793a5ecd6a0e15dbec9411880b11e22"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-16
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ee1def5806f40c35d583234e172ec5769bb9a08b6f5bbc713c1a2658846dbced"
   ubuntu-2004-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-15
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8dda4fdae312f840fbb4e25b9ef01ad3209e9014e49e4564ab0f0d2510225131"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-16
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8f635529a10e0ddf955d6d72360261966e5fee0b5c5211070370ca2fc4e0ab7c"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-20
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7b3ccaed3b5d37dc2cc4bbe1a1e40949266292dcdbc3ad015271ab4e5e6f5038"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-21
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ae6b695fb8a0806702bb6a1a9616fbb33ac3288f25990fa799aab2c045c80ea1"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-13
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:f1c13f3450d1f2e53ea18ac1ac1a17e932573cb9a5ccd0fd9ef6dd44f6402fa9"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-14
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d7d4ec28cdc3e61fc6a048b88ebdff1c5e67f3353cf1739cbaea07ec2481eb16"
   evm-version:
     type: string
     default: london
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index c87f08f294..ff34e2fc98 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -61,11 +61,11 @@ then
   ./scripts/install_obsolete_jsoncpp_1_7_4.sh
 
   # z3
-  z3_version="4.11.0"
+  z3_version="4.11.2"
   z3_dir="z3-${z3_version}-x64-osx-10.16"
   z3_package="${z3_dir}.zip"
   wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
-  validate_checksum "$z3_package" b6a4a6d587e4bfb0643db81129f0f447692fae13d4bd1bd4d93f1c0301b75ffc
+  validate_checksum "$z3_package" a56b6c40d9251a963aabe1f15731dd88ad1cb801d0e7b16e45f8b232175e165c
   unzip "$z3_package"
   rm "$z3_package"
   cp "${z3_dir}/bin/libz3.a" /usr/local/lib
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 58acf22c2a..abe273ac26 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -34,7 +34,7 @@ else
     BUILD_DIR="$1"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-13
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-14
 # NOTE: Without `safe.directory` git would assume it's not safe to operate on /root/project since it's owned by a different user.
 # See https://github.blog/2022-04-12-git-security-vulnerability-announced/
 docker run -v "$(pwd):/root/project" -w /root/project \

From be0149dd47a72952d0e825c060a35fe51ab0394f Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 23 Nov 2022 17:07:19 +0100
Subject: [PATCH 1046/1748] new z3 version in cmakelist

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c82ad7e480..b43f244949 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/licens
 
 include(EthOptions)
 configure_project(TESTS)
-set(LATEST_Z3_VERSION "4.11.0")
+set(LATEST_Z3_VERSION "4.11.2")
 set(MINIMUM_Z3_VERSION "4.8.0")
 find_package(Z3)
 if (${Z3_FOUND})

From 87d277ec05ba37ce08444ce98d4e9a1bc495ccf3 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 23 Nov 2022 17:36:17 +0100
Subject: [PATCH 1047/1748] avoid unused error codes

---
 scripts/error_codes.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index cba149b9dc..464884344d 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -227,10 +227,10 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
             return False
 
     old_source_only_ids = {
-        "1584", "1823",
+        "1218", "1584", "1823",
         "1988", "2066", "2833", "3356",
         "3893", "3996", "4010", "4458", "4802",
-        "4902", "5272", "5622", "5798", "7128", "7400",
+        "4902", "5272", "5622", "5798", "5840", "7128", "7400",
         "7589", "7593", "7649", "7710",
         "8065", "8084", "8140", "8158",
         "8312", "8592", "9134", "9609",

From c3a7adad275437b2b1e506616fb8fa82ebaa8149 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 23 Nov 2022 17:38:50 +0100
Subject: [PATCH 1048/1748] update cli tests

---
 test/cmdlineTests/model_checker_invariants_all/err            | 4 ++--
 test/cmdlineTests/model_checker_invariants_contract/err       | 2 +-
 .../model_checker_invariants_contract_reentrancy/err          | 4 ++--
 test/cmdlineTests/model_checker_invariants_reentrancy/err     | 2 +-
 .../standard_model_checker_invariants_contract/output.json    | 4 ++--
 .../standard_model_checker_invariants_reentrancy/output.json  | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/cmdlineTests/model_checker_invariants_all/err b/test/cmdlineTests/model_checker_invariants_all/err
index 65228e880c..2f80a8a2ab 100644
--- a/test/cmdlineTests/model_checker_invariants_all/err
+++ b/test/cmdlineTests/model_checker_invariants_all/err
@@ -5,8 +5,8 @@ Warning: Return value of low-level calls not used.
   | 		^^^^^^^^^^^
 
 Info: Contract invariant(s) for model_checker_invariants_all/input.sol:test:
-((x <= 0) || true)
+(!(x >= 1) || true)
 Reentrancy property(ies) for model_checker_invariants_all/input.sol:test:
-(((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
+(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x == 0)
diff --git a/test/cmdlineTests/model_checker_invariants_contract/err b/test/cmdlineTests/model_checker_invariants_contract/err
index e3058cca5a..6c700a4053 100644
--- a/test/cmdlineTests/model_checker_invariants_contract/err
+++ b/test/cmdlineTests/model_checker_invariants_contract/err
@@ -1,2 +1,2 @@
 Info: Contract invariant(s) for model_checker_invariants_contract/input.sol:test:
-((x <= 0) || true)
+(!(x >= 1) || true)
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
index 8555218361..8bf527172c 100644
--- a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
+++ b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
@@ -5,8 +5,8 @@ Warning: Return value of low-level calls not used.
   | 		^^^^^^^^^^^
 
 Info: Contract invariant(s) for model_checker_invariants_contract_reentrancy/input.sol:test:
-((x <= 0) || true)
+(!(x >= 1) || true)
 Reentrancy property(ies) for model_checker_invariants_contract_reentrancy/input.sol:test:
-(((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
+(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x == 0)
diff --git a/test/cmdlineTests/model_checker_invariants_reentrancy/err b/test/cmdlineTests/model_checker_invariants_reentrancy/err
index dc939704b3..003d5d3895 100644
--- a/test/cmdlineTests/model_checker_invariants_reentrancy/err
+++ b/test/cmdlineTests/model_checker_invariants_reentrancy/err
@@ -5,6 +5,6 @@ Warning: Return value of low-level calls not used.
   | 		^^^^^^^^^^^
 
 Info: Reentrancy property(ies) for model_checker_invariants_reentrancy/input.sol:test:
-(((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
+(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
index 1e61e18eb6..4023977fbc 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
@@ -5,12 +5,12 @@
             "component": "general",
             "errorCode": "1180",
             "formattedMessage": "Info: Contract invariant(s) for A:test:
-((x <= 0) || true)
+(!(x >= 1) || true)
 
 
 ",
             "message": "Contract invariant(s) for A:test:
-((x <= 0) || true)
+(!(x >= 1) || true)
 ",
             "severity": "info",
             "type": "Info"
diff --git a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
index 2d1d093bf5..003fb099e9 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
@@ -25,14 +25,14 @@
             "component": "general",
             "errorCode": "1180",
             "formattedMessage": "Info: Reentrancy property(ies) for A:test:
-(((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
+(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 
 
 ",
             "message": "Reentrancy property(ies) for A:test:
-(((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0))) || true)
+(((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
 <errorCode> = 0 -> no errors
 <errorCode> = 1 -> Assertion failed at assert(x < 10)
 ",

From 504b70b6af355c3d782af7d43a67c24ee415f561 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 23 Nov 2022 16:51:06 +0100
Subject: [PATCH 1049/1748] update smt tests

---
 test/libsolidity/SMTCheckerTest.cpp           |  6 ++----
 .../smtCheckerTests/abi/abi_decode_simple.sol |  8 ++------
 .../abi/abi_encode_packed_simple.sol          | 16 ++++-----------
 .../abi/abi_encode_packed_string_literal.sol  | 20 +++++--------------
 ...code_packed_string_literal_no_unproved.sol | 16 +++++----------
 .../smtCheckerTests/abi/abi_encode_simple.sol | 12 +++--------
 .../abi/abi_encode_string_literal.sol         | 16 ++++-----------
 .../abi_encode_with_selector_array_slice.sol  | 11 +---------
 ...abi_encode_with_selector_array_slice_2.sol | 13 ++----------
 .../abi/abi_encode_with_selector_simple.sol   |  4 +---
 ...bi_encode_with_selector_string_literal.sol | 20 +++++--------------
 .../abi/abi_encode_with_selector_vs_sig.sol   |  1 -
 .../abi/abi_encode_with_sig_array_slice.sol   | 11 +---------
 .../abi/abi_encode_with_sig_array_slice_2.sol | 13 ++----------
 .../abi/abi_encode_with_sig_hash.sol          |  4 ++--
 .../abi/abi_encode_with_sig_simple.sol        |  8 +++-----
 .../abi_encode_with_sig_string_literal.sol    | 20 +++++--------------
 .../array_members/push_as_lhs_1d.sol          |  2 +-
 .../push_as_lhs_and_rhs_bytes.sol             |  2 +-
 .../balance_receive_ext_calls.sol             |  5 +----
 .../branches_inside_modifiers_2.sol           |  3 +--
 .../crypto_functions_compare_hashes.sol       | 12 +++--------
 .../crypto/crypto_functions_fail.sol          |  4 +---
 .../crypto/crypto_functions_not_same.sol      |  4 +---
 ...ions_same_input_over_state_same_output.sol | 12 -----------
 ...same_input_over_state_same_output_fail.sol | 12 +++--------
 .../external_call_from_constructor_3.sol      |  2 +-
 ...h_known_code_state_reentrancy_indirect.sol |  4 +---
 .../external_calls/external_reentrancy_1.sol  |  4 +---
 .../external_reentrancy_crypto.sol            |  7 +------
 .../internal_library_external_call_2.sol      |  2 +-
 .../internal_library_external_call_3.sol      |  2 +-
 .../function_selector/homer.sol               |  2 +-
 .../functions/getters/bytes.sol               |  4 +---
 .../functions/getters/string.sol              |  4 +---
 .../functions/getters/struct_3.sol            | 10 +---------
 .../smtCheckerTests/functions/payable_2.sol   |  2 +-
 .../imports/import_as_module_2.sol            |  8 ++------
 .../modifier_inside_branch_assignment.sol     |  4 +---
 .../modifiers/modifier_parameter_copy.sol     |  2 +-
 .../compound_assignment_division_3.sol        |  2 +-
 .../out_of_bounds/array_2d_4.sol              |  9 +++------
 .../overflow/signed_guard_sub_overflow.sol    |  2 +-
 .../overflow/simple_overflow.sol              |  2 +-
 .../special/abi_decode_simple.sol             |  2 +-
 .../special/tx_vars_chc_internal.sol          |  2 +-
 .../special/tx_vars_reentrancy_1.sol          |  2 +-
 .../special/tx_vars_reentrancy_2.sol          |  4 +---
 .../typecast/string_to_bytes_push_1.sol       |  2 +-
 .../smtCheckerTests/types/abi_type_type_1.sol |  2 +-
 .../types/array_aliasing_storage_3.sol        | 10 +++-------
 .../smtCheckerTests/types/array_branch_1d.sol |  4 +---
 .../types/array_static_aliasing_memory_5.sol  |  2 +-
 .../smtCheckerTests/types/bool_simple_2.sol   |  2 +-
 ...array_struct_array_struct_storage_safe.sol |  1 -
 .../struct_aliasing_parameter_storage_2.sol   |  2 +-
 .../types/struct_array_branches_2d.sol        |  1 -
 .../smtCheckerTests/userTypes/user_abi_1.sol  |  2 +-
 .../smtCheckerTests/userTypes/user_abi_2.sol  |  2 +-
 59 files changed, 95 insertions(+), 272 deletions(-)

diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index eed911b1a7..5bc9a0be90 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -38,10 +38,8 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT \"show unproved\" choice."));
 
 	m_modelCheckerSettings.solvers = smtutil::SMTSolverChoice::None();
-	auto const& choice = m_reader.stringSetting("SMTSolvers", "any");
-	if (choice == "any")
-		m_modelCheckerSettings.solvers = smtutil::SMTSolverChoice::All();
-	else if (choice == "none")
+	auto const& choice = m_reader.stringSetting("SMTSolvers", "z3");
+	if (choice == "none")
 		m_modelCheckerSettings.solvers = smtutil::SMTSolverChoice::None();
 	else if (!m_modelCheckerSettings.solvers.setSolver(choice))
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT solver choice."));
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
index 585020d0a5..2020ce7aee 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
@@ -21,14 +21,10 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (505-519): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (538-552): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (209-223): CHC: Assertion violation happens here.
 // Warning 6328: (260-274): CHC: Assertion violation happens here.
 // Warning 6328: (359-373): CHC: Assertion violation happens here.
 // Warning 6328: (392-406): CHC: Assertion violation happens here.
 // Warning 6328: (425-434): CHC: Assertion violation happens here.
-// Warning 6328: (505-519): CHC: Assertion violation might happen here.
-// Warning 6328: (538-552): CHC: Assertion violation might happen here.
-// Warning 4661: (505-519): BMC: Assertion violation happens here.
-// Warning 4661: (538-552): BMC: Assertion violation happens here.
+// Warning 6328: (505-519): CHC: Assertion violation happens here.
+// Warning 6328: (538-552): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
index 8257afd1eb..cc8723ff25 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
@@ -23,15 +23,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (322-352): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (419-449): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (528-558): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (577-607): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (322-352): CHC: Assertion violation might happen here.
-// Warning 6328: (419-449): CHC: Assertion violation might happen here.
-// Warning 6328: (528-558): CHC: Assertion violation might happen here.
-// Warning 6328: (577-607): CHC: Assertion violation might happen here.
-// Warning 4661: (322-352): BMC: Assertion violation happens here.
-// Warning 4661: (419-449): BMC: Assertion violation happens here.
-// Warning 4661: (528-558): BMC: Assertion violation happens here.
-// Warning 4661: (577-607): BMC: Assertion violation happens here.
+// Warning 6328: (322-352): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedSimple(false, 0, 0, 0, a, b)
+// Warning 6328: (419-449): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedSimple(false, 0, 0, 0, a, b)
+// Warning 6328: (528-558): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedSimple(false, 0, 0, 0, a, b)
+// Warning 6328: (577-607): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedSimple(false, 0, 0, 0, a, b)
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
index 31b9f59ce0..d775c23593 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
@@ -22,18 +22,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (226-256): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (310-340): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (483-513): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (568-598): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (654-684): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (226-256): CHC: Assertion violation might happen here.
-// Warning 6328: (310-340): CHC: Assertion violation might happen here.
-// Warning 6328: (483-513): CHC: Assertion violation might happen here.
-// Warning 6328: (568-598): CHC: Assertion violation might happen here.
-// Warning 6328: (654-684): CHC: Assertion violation might happen here.
-// Warning 4661: (226-256): BMC: Assertion violation happens here.
-// Warning 4661: (310-340): BMC: Assertion violation happens here.
-// Warning 4661: (483-513): BMC: Assertion violation happens here.
-// Warning 4661: (568-598): BMC: Assertion violation happens here.
-// Warning 4661: (654-684): BMC: Assertion violation happens here.
+// Warning 6328: (226-256): CHC: Assertion violation happens here.\nCounterexample:\n\nb1 = [0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (310-340): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (483-513): CHC: Assertion violation happens here.\nCounterexample:\n\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (568-598): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc]\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (654-684): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a]\nb6 = [0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117]\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
index 23501603c0..a211b83178 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
@@ -23,14 +23,8 @@ contract C {
 // SMTEngine: all
 // SMTShowUnproved: no
 // ----
-// Warning 1218: (226-256): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (310-340): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (483-513): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (568-598): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (654-684): CHC: Error trying to invoke SMT solver.
-// Warning 5840: CHC: 5 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
-// Warning 4661: (226-256): BMC: Assertion violation happens here.
-// Warning 4661: (310-340): BMC: Assertion violation happens here.
-// Warning 4661: (483-513): BMC: Assertion violation happens here.
-// Warning 4661: (568-598): BMC: Assertion violation happens here.
-// Warning 4661: (654-684): BMC: Assertion violation happens here.
+// Warning 6328: (226-256): CHC: Assertion violation happens here.\nCounterexample:\n\nb1 = [0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (310-340): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (483-513): CHC: Assertion violation happens here.\nCounterexample:\n\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (568-598): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc, 0xcc]\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
+// Warning 6328: (654-684): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a, 0x011a]\nb6 = [0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117]\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
index 3bff0d448c..6bb936795b 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
@@ -20,12 +20,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (298-328): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (389-419): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (492-522): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (298-328): CHC: Assertion violation might happen here.
-// Warning 6328: (389-419): CHC: Assertion violation might happen here.
-// Warning 6328: (492-522): CHC: Assertion violation might happen here.
-// Warning 4661: (298-328): BMC: Assertion violation happens here.
-// Warning 4661: (389-419): BMC: Assertion violation happens here.
-// Warning 4661: (492-522): BMC: Assertion violation happens here.
+// Warning 6328: (298-328): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(false, 0, 0, 0, a, b)
+// Warning 6328: (389-419): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(false, 0, 0, 0, a, b)
+// Warning 6328: (492-522): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb1 = []\nb2 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(false, 0, 0, 0, a, b)
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
index 9cdf6f248f..d4f88bcb26 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
@@ -19,15 +19,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (208-238): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (286-316): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (453-483): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (532-562): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (208-238): CHC: Assertion violation might happen here.
-// Warning 6328: (286-316): CHC: Assertion violation might happen here.
-// Warning 6328: (453-483): CHC: Assertion violation might happen here.
-// Warning 6328: (532-562): CHC: Assertion violation might happen here.
-// Warning 4661: (208-238): BMC: Assertion violation happens here.
-// Warning 4661: (286-316): BMC: Assertion violation happens here.
-// Warning 4661: (453-483): BMC: Assertion violation happens here.
-// Warning 4661: (532-562): BMC: Assertion violation happens here.
+// Warning 6328: (208-238): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = []\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
+// Warning 6328: (286-316): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d]\nb3 = [0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d]\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
+// Warning 6328: (453-483): CHC: Assertion violation happens here.\nCounterexample:\n\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
+// Warning 6328: (532-562): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca, 0xca]\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
index 4043617cbe..c6f523b37d 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
@@ -26,16 +26,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (578-608): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (691-721): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (959-989): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (1079-1109): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (325-355): CHC: Assertion violation happens here.
-// Warning 6328: (578-608): CHC: Assertion violation might happen here.
-// Warning 6328: (691-721): CHC: Assertion violation might happen here.
-// Warning 6328: (959-989): CHC: Assertion violation might happen here.
+// Warning 6328: (578-608): CHC: Assertion violation happens here.
 // Warning 6328: (1079-1109): CHC: Assertion violation might happen here.
-// Warning 4661: (578-608): BMC: Assertion violation happens here.
-// Warning 4661: (691-721): BMC: Assertion violation happens here.
-// Warning 4661: (959-989): BMC: Assertion violation happens here.
 // Warning 4661: (1079-1109): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
index c019af2eed..7994fa7c71 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
@@ -25,16 +25,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (579-609): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (692-722): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (960-990): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (1080-1110): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (326-356): CHC: Assertion violation happens here.
-// Warning 6328: (579-609): CHC: Assertion violation might happen here.
-// Warning 6328: (692-722): CHC: Assertion violation might happen here.
-// Warning 6328: (960-990): CHC: Assertion violation might happen here.
+// Warning 6328: (326-356): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\ndata = [55]\nb2 = [0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32]\nb3 = []\nb4 = []\nx = 0\ny = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSlice(0x0, [55])
+// Warning 6328: (579-609): CHC: Assertion violation happens here.
 // Warning 6328: (1080-1110): CHC: Assertion violation might happen here.
-// Warning 4661: (579-609): BMC: Assertion violation happens here.
-// Warning 4661: (692-722): BMC: Assertion violation happens here.
-// Warning 4661: (960-990): BMC: Assertion violation happens here.
 // Warning 4661: (1080-1110): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol
index 95ec1cf371..07090e1ef1 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_simple.sol
@@ -26,9 +26,7 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 5667: (100-115): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 1218: (855-885): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (571-601): CHC: Assertion violation happens here.
 // Warning 6328: (691-721): CHC: Assertion violation happens here.
 // Warning 6328: (740-770): CHC: Assertion violation happens here.
-// Warning 6328: (855-885): CHC: Assertion violation might happen here.
-// Warning 4661: (855-885): BMC: Assertion violation happens here.
+// Warning 6328: (855-885): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
index cbcc657341..0c9f4f553a 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
@@ -22,18 +22,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (252-282): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (347-377): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (531-561): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (627-657): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (746-776): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (252-282): CHC: Assertion violation might happen here.
-// Warning 6328: (347-377): CHC: Assertion violation might happen here.
-// Warning 6328: (531-561): CHC: Assertion violation might happen here.
-// Warning 6328: (627-657): CHC: Assertion violation might happen here.
-// Warning 6328: (746-776): CHC: Assertion violation might happen here.
-// Warning 4661: (252-282): BMC: Assertion violation happens here.
-// Warning 4661: (347-377): BMC: Assertion violation happens here.
-// Warning 4661: (531-561): BMC: Assertion violation happens here.
-// Warning 4661: (627-657): BMC: Assertion violation happens here.
-// Warning 4661: (746-776): BMC: Assertion violation happens here.
+// Warning 6328: (252-282): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb1 = [0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
+// Warning 6328: (347-377): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb3 = [0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
+// Warning 6328: (531-561): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb1 = [0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90]\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
+// Warning 6328: (627-657): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb5 = [0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1, 0xd1]\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
+// Warning 6328: (746-776): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb2 = []\nb5 = [0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2, 0xf2]\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
index 66ec1c69bc..b5346b049b 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
@@ -9,6 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (294-324): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (294-324): CHC: Assertion violation might happen here.
 // Warning 7812: (294-324): BMC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
index 70c06dab28..1ad701b775 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
@@ -25,16 +25,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (588-618): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (702-732): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (971-1001): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (1086-1116): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (334-364): CHC: Assertion violation happens here.
-// Warning 6328: (588-618): CHC: Assertion violation might happen here.
-// Warning 6328: (702-732): CHC: Assertion violation might happen here.
-// Warning 6328: (971-1001): CHC: Assertion violation might happen here.
+// Warning 6328: (588-618): CHC: Assertion violation happens here.
 // Warning 6328: (1086-1116): CHC: Assertion violation might happen here.
-// Warning 4661: (588-618): BMC: Assertion violation happens here.
-// Warning 4661: (702-732): BMC: Assertion violation happens here.
-// Warning 4661: (971-1001): BMC: Assertion violation happens here.
 // Warning 4661: (1086-1116): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
index 4ac60267ff..30c950beaa 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
@@ -25,16 +25,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (589-619): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (703-733): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (972-1002): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (1087-1117): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (335-365): CHC: Assertion violation happens here.
-// Warning 6328: (589-619): CHC: Assertion violation might happen here.
-// Warning 6328: (703-733): CHC: Assertion violation might happen here.
-// Warning 6328: (972-1002): CHC: Assertion violation might happen here.
+// Warning 6328: (335-365): CHC: Assertion violation happens here.\nCounterexample:\n\ndata = [69]\nb2 = [0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43]\nb3 = []\nb4 = []\nx = 0\ny = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSlice(sig, [69])
+// Warning 6328: (589-619): CHC: Assertion violation happens here.
 // Warning 6328: (1087-1117): CHC: Assertion violation might happen here.
-// Warning 4661: (589-619): BMC: Assertion violation happens here.
-// Warning 4661: (703-733): BMC: Assertion violation happens here.
-// Warning 4661: (972-1002): BMC: Assertion violation happens here.
 // Warning 4661: (1087-1117): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
index 00836f2288..48b1241e43 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
@@ -13,5 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (337-375): CHC: Assertion violation happens here.
-// Warning 6328: (394-432): CHC: Assertion violation happens here.
+// Warning 6328: (337-375): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 0\nb1 = [0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d]\nb2 = [0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d]\n\nTransaction trace:\nC.constructor()\nC.abiEncodeHash(sig, 0, 0)
+// Warning 6328: (394-432): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 0\n\nTransaction trace:\nC.constructor()\nC.abiEncodeHash(sig, 0, 0)
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
index 1fe781974a..9545cd2f32 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
@@ -24,9 +24,7 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 5667: (107-122): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 1218: (824-854): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (543-573): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(sig, false, 0, 0, 0, a, b)
-// Warning 6328: (664-694): CHC: Assertion violation happens here.
-// Warning 6328: (713-743): CHC: Assertion violation happens here.
-// Warning 6328: (824-854): CHC: Assertion violation might happen here.
-// Warning 4661: (824-854): BMC: Assertion violation happens here.
+// Warning 6328: (664-694): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(sig, false, 0, 0, 0, a, b)
+// Warning 6328: (713-743): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(sig, false, 0, 0, 0, a, b)
+// Warning 6328: (824-854): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
index d58b3f5b48..f559cac22a 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
@@ -22,18 +22,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (261-291): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (357-387): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (542-572): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (639-669): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (753-783): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (261-291): CHC: Assertion violation might happen here.
-// Warning 6328: (357-387): CHC: Assertion violation might happen here.
-// Warning 6328: (542-572): CHC: Assertion violation might happen here.
-// Warning 6328: (639-669): CHC: Assertion violation might happen here.
-// Warning 6328: (753-783): CHC: Assertion violation might happen here.
-// Warning 4661: (261-291): BMC: Assertion violation happens here.
-// Warning 4661: (357-387): BMC: Assertion violation happens here.
-// Warning 4661: (542-572): BMC: Assertion violation happens here.
-// Warning 4661: (639-669): BMC: Assertion violation happens here.
-// Warning 4661: (753-783): BMC: Assertion violation happens here.
+// Warning 6328: (261-291): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
+// Warning 6328: (357-387): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
+// Warning 6328: (542-572): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa]\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
+// Warning 6328: (639-669): CHC: Assertion violation happens here.\nCounterexample:\n\nb4 = [0x22, 0x22, 0x22, 0x22, 0x22, 0x0d, 0x22, 0x22, 0x22, 0x22, 0x09, 0x22, 0x0b, 0x22, 0x22, 0x0e, 0x22, 0x10, 0x22, 0x12, 0x22, 0x14, 0x22, 0x16, 0x22, 0x18, 0x22, 0x1a, 0x22, 0x1c, 0x22, 0x1e, 0x22, 0x20, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22]\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
+// Warning 6328: (753-783): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117, 0x0117]\nb4 = []\nb5 = [0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118, 0x0118]\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
index b38963b590..0d16306b72 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
@@ -19,4 +19,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (199-229): CHC: Assertion violation happens here.
+// Warning 6328: (199-229): CHC: Assertion violation happens here.\nCounterexample:\nb = [1]\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
index cf86c7c4d5..56bc859eb1 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
@@ -14,4 +14,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (203-244): CHC: Assertion violation happens here.\nCounterexample:\nb = [0x0, 0x0]\nlength = 2\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.f()
+// Warning 6328: (203-244): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
index 313da678ef..43b620ffc0 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
@@ -14,7 +14,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 1218: (131-165): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (131-165): CHC: Assertion violation might happen here.
-// Info 1180: Reentrancy property(ies) for :C:\n(!(<errorCode> >= 2) && (((:var 0).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) >= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance >= x)\n
-// Warning 4661: (131-165): BMC: Assertion violation happens here.
+// Warning 6328: (131-165): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 282\n\nTransaction trace:\nC.constructor()\nC.f(0)\n    _i.ext() -- untrusted external call, synthesized as:\n        C.f(0) -- reentrant call\n            _i.ext() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
index bf1da4275e..652a431852 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
@@ -22,5 +22,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (333-347): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
-// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 3))\n
+// Warning 6328: (333-347): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
index 79b30a1239..a49aeac090 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_compare_hashes.sol
@@ -12,12 +12,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (150-164): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (168-182): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (186-200): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (150-164): CHC: Assertion violation might happen here.
-// Warning 6328: (168-182): CHC: Assertion violation might happen here.
-// Warning 6328: (186-200): CHC: Assertion violation might happen here.
-// Warning 4661: (150-164): BMC: Assertion violation happens here.
-// Warning 4661: (168-182): BMC: Assertion violation happens here.
-// Warning 4661: (186-200): BMC: Assertion violation happens here.
+// Warning 6328: (150-164): CHC: Assertion violation happens here.
+// Warning 6328: (168-182): CHC: Assertion violation happens here.
+// Warning 6328: (186-200): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol
index 2791d3d643..8485b89a6b 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_fail.sol
@@ -33,6 +33,4 @@ contract C {
 // Warning 2072: (435-445): Unused local variable.
 // Warning 2072: (656-666): Unused local variable.
 // Warning 2072: (698-708): Unused local variable.
-// Warning 1218: (135-151): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (135-151): CHC: Assertion violation might happen here.
-// Warning 4661: (135-151): BMC: Assertion violation happens here.
+// Warning 6328: (135-151): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
index 59a011f240..a8c6199d0f 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_not_same.sol
@@ -12,6 +12,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (196-210): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (196-210): CHC: Assertion violation might happen here.
-// Warning 4661: (196-210): BMC: Assertion violation happens here.
+// Warning 6328: (196-210): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
index 94eedd5991..aae296695a 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
@@ -37,15 +37,3 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (544-563): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (567-586): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (590-609): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (613-632): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (544-563): CHC: Assertion violation might happen here.
-// Warning 6328: (567-586): CHC: Assertion violation might happen here.
-// Warning 6328: (590-609): CHC: Assertion violation might happen here.
-// Warning 6328: (613-632): CHC: Assertion violation might happen here.
-// Warning 4661: (544-563): BMC: Assertion violation happens here.
-// Warning 4661: (567-586): BMC: Assertion violation happens here.
-// Warning 4661: (590-609): BMC: Assertion violation happens here.
-// Warning 4661: (613-632): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
index b89867c394..584e7642db 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
@@ -45,13 +45,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (693-712): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (716-735): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (739-758): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (693-712): CHC: Assertion violation might happen here.
-// Warning 6328: (716-735): CHC: Assertion violation might happen here.
-// Warning 6328: (739-758): CHC: Assertion violation might happen here.
+// Warning 6328: (693-712): CHC: Assertion violation happens here.\nCounterexample:\nh = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x52f7, sha = 0x0, rip = 0x0, erc = 0x0\n_kec = 0x52f6\n_sha = 0x2e15\n_rip = 0x2297\n_erc = 0x0985\n\nTransaction trace:\nC.constructor(_data, 0x23c6, 198, 0x1599, 0x1980)\nState: h = 0x23c6, v = 198, r = 0x1599, s = 0x1980, kec = 0x52f7, sha = 0x0, rip = 0x0, erc = 0x0\nC.set(_data, 0x0, 0, 0x0, 0x0)\nState: h = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x52f7, sha = 0x0, rip = 0x0, erc = 0x0\nC.f()
+// Warning 6328: (716-735): CHC: Assertion violation happens here.\nCounterexample:\nh = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x0986, sha = 0x0, rip = 0x0, erc = 0x0\n_kec = 0x0985\n_sha = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdd68\n_rip = 0x20ad\n_erc = 0x2e15\n\nTransaction trace:\nC.constructor([0x19, 0x19, 0x19, 0x19, 0x19, 0x38, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x2b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x36, 0x19, 0x19, 0x39, 0x19, 0x3b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19], 0x1169, 88, 0x0a12, 0x1599)\nState: data = [0x19, 0x19, 0x19, 0x19, 0x19, 0x38, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x2b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x36, 0x19, 0x19, 0x39, 0x19, 0x3b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19], h = 0x1169, v = 88, r = 0x0a12, s = 0x1599, kec = 0x0986, sha = 0x0, rip = 0x0, erc = 0x0\nC.set(_data, 0x0, 0, 0x0, 0x0)\nState: h = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x0986, sha = 0x0, rip = 0x0, erc = 0x0\nC.f()
+// Warning 6328: (739-758): CHC: Assertion violation happens here.
 // Warning 6328: (762-781): CHC: Assertion violation happens here.
-// Warning 4661: (693-712): BMC: Assertion violation happens here.
-// Warning 4661: (716-735): BMC: Assertion violation happens here.
-// Warning 4661: (739-758): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
index ba0dc90b07..a468186b39 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3.sol
@@ -21,4 +21,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (69-85): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
-// Warning 6328: (203-217): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 3\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 3\nC.f()
+// Warning 6328: (203-217): CHC: Assertion violation happens here.\nCounterexample:\ns = 0, z = 0\n\nTransaction trace:\nC.constructor()\nState: s = 0, z = 0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
index ea9764e17b..bd779b56a5 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect.sol
@@ -44,7 +44,5 @@ contract C {
 // SMTIgnoreCex: yes
 // SMTIgnoreOS: macos
 // ----
-// Warning 1218: (437-463): CHC: Error trying to invoke SMT solver.
 // Warning 6328: (419-433): CHC: Assertion violation happens here.
-// Warning 6328: (437-463): CHC: Assertion violation might happen here.
-// Warning 4661: (437-463): BMC: Assertion violation happens here.
+// Warning 6328: (437-463): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
index 9cf0d3643f..4df99bfe15 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_1.sol
@@ -17,6 +17,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 1218: (206-220): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (206-220): CHC: Assertion violation might happen here.
-// Warning 4661: (206-220): BMC: Assertion violation happens here.
+// Warning 6328: (206-220): CHC: Assertion violation happens here.\nCounterexample:\nlocked = false\ntarget = 0x0\n\nTransaction trace:\nC.constructor()\nState: locked = true\nC.call(0x0)\n    D(target).e() -- untrusted external call, synthesized as:\n        C.broken() -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
index 46e8ac1487..84c741c10a 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
@@ -27,9 +27,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreInv: yes
 // ----
-// Warning 1218: (264-283): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (302-333): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (264-283): CHC: Assertion violation might happen here.
-// Warning 6328: (302-333): CHC: Assertion violation might happen here.
-// Warning 4661: (264-283): BMC: Assertion violation happens here.
-// Warning 4661: (302-333): BMC: Assertion violation happens here.
+// Warning 6328: (302-333): CHC: Assertion violation happens here.\nCounterexample:\nkec = 0x0\n_kec = 0x0\n\nTransaction trace:\nC.constructor(_data)\nState: kec = 0x0\nC.check(_data)
diff --git a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol
index eb4513d7fb..3dca6dd3da 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_2.sol
@@ -26,4 +26,4 @@ contract C {
     }
 }
 // ----
-// Warning 6328: (337-351): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, inG = true\n_i = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, inG = false\nC.g(0)\n    L.g(0) -- internal call\n        L.f(0) -- internal call\n            _i.i() -- untrusted external call, synthesized as:\n                C.s() -- reentrant call
+// Warning 6328: (337-351): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol
index 495c9dcc96..c9d35e6457 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/internal_library_external_call_3.sol
@@ -29,4 +29,4 @@ contract C {
     }
 }
 // ----
-// Warning 6328: (354-368): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, inG = true\n_i = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, inG = false\nC.g(0)\n    L.g(0) -- internal call\n        M.f(0) -- internal call\n            _i.i() -- untrusted external call, synthesized as:\n                C.s() -- reentrant call
+// Warning 6328: (354-368): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/function_selector/homer.sol b/test/libsolidity/smtCheckerTests/function_selector/homer.sol
index aaab884880..552a4d895c 100644
--- a/test/libsolidity/smtCheckerTests/function_selector/homer.sol
+++ b/test/libsolidity/smtCheckerTests/function_selector/homer.sol
@@ -43,4 +43,4 @@ contract Homer is ERC165, Simpson {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (1340-1395): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nHomer.constructor()\nHomer.supportsInterface(0x01ffc9a7)\nHomer.check()\n    Homer.supportsInterface(0x73b6b492) -- internal call\n    Homer.supportsInterface(0x01ffc9a7) -- internal call\n    Homer.supportsInterface(0x8b9eb9ca) -- internal call
+// Warning 6328: (1340-1395): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nHomer.constructor()\nHomer.check()\n    Homer.supportsInterface(0x73b6b492) -- internal call\n    Homer.supportsInterface(0x01ffc9a7) -- internal call\n    Homer.supportsInterface(0x8b9eb9ca) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol b/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol
index 01dec8bc1f..ec0531a4fb 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol
@@ -10,6 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (162-201): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (162-201): CHC: Assertion violation might happen here.
-// Warning 4661: (162-201): BMC: Assertion violation happens here.
+// Warning 6328: (162-201): CHC: Assertion violation happens here.\nCounterexample:\nstr2 = [0x63]\na2 = [0x63]\n\nTransaction trace:\nC.constructor()\nState: str2 = [0x63]\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/string.sol b/test/libsolidity/smtCheckerTests/functions/getters/string.sol
index 2f2319a167..7369fd0fb1 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/string.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/string.sol
@@ -10,6 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (178-224): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (178-224): CHC: Assertion violation might happen here.
-// Warning 4661: (178-224): BMC: Assertion violation happens here.
+// Warning 6328: (178-224): CHC: Assertion violation happens here.\nCounterexample:\nstr1 = [0x62]\na1 = [0x62]\n\nTransaction trace:\nC.constructor()\nState: str1 = [0x62]\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
index b5cdcc32dd..ddeaa655b2 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
@@ -21,12 +21,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (273-277): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (281-287): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (314-318): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (307-326): CHC: Error trying to invoke SMT solver.
-// Warning 6368: (273-277): CHC: Out of bounds access might happen here.
-// Warning 6368: (281-287): CHC: Out of bounds access might happen here.
-// Warning 6368: (314-318): CHC: Out of bounds access might happen here.
-// Warning 6328: (307-326): CHC: Assertion violation might happen here.
-// Warning 4661: (307-326): BMC: Assertion violation happens here.
+// Warning 6328: (307-326): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/payable_2.sol b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
index 04833ae027..2d1117a4b4 100644
--- a/test/libsolidity/smtCheckerTests/functions/payable_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
@@ -24,4 +24,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (261-283): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g2(){ msg.value: 1 }\n    C.i() -- internal call
+// Warning 6328: (261-283): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g2(){ msg.value: 3529 }\n    C.i() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol b/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
index bdf2e349c4..8ddef2da9e 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
@@ -18,9 +18,5 @@ function f(uint _x) pure {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (A:50-64): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (s1.sol:28-44): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (A:50-64): CHC: Assertion violation might happen here.
-// Warning 6328: (s1.sol:28-44): CHC: Assertion violation might happen here.
-// Warning 4661: (s1.sol:28-44): BMC: Assertion violation happens here.
-// Warning 4661: (A:50-64): BMC: Assertion violation happens here.
+// Warning 6328: (A:50-64): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call\n    A:f(10) -- internal call\n    A:f(0) -- internal call
+// Warning 6328: (s1.sol:28-44): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
index d496baf6c1..1d1fdbba2a 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
@@ -20,6 +20,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (254-267): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (254-267): CHC: Assertion violation might happen here.
-// Warning 4661: (254-267): BMC: Assertion violation happens here.
+// Warning 6328: (254-267): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, owner = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, owner = 0x0\nC.f()\nState: x = 0, owner = 0x0\nC.g(1)\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol
index b88c0a4eee..1612cb8e77 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_parameter_copy.sol
@@ -12,4 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (95-109): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\nx = 3\n\nTransaction trace:\nC.constructor()\nC.f(3)
+// Warning 6328: (95-109): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
index 3e646ec3da..aa90aa2529 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
@@ -12,4 +12,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (162-181): CHC: Assertion violation happens here.
+// Warning 6328: (162-181): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\np = 0\n\nTransaction trace:\nC.constructor()\nC.f(2, 0)
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
index ee3cdfd247..1976543363 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
@@ -14,15 +14,12 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 1218: (228-232): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (255-259): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (255-262): CHC: Error trying to invoke SMT solver.
 // Warning 4984: (184-197): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (199-202): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6368: (228-232): CHC: Out of bounds access might happen here.
+// Warning 6368: (228-232): CHC: Out of bounds access happens here.\nCounterexample:\na = []\ni = 0\nj = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.r()
 // Warning 4984: (228-244): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (246-249): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6368: (255-259): CHC: Out of bounds access might happen here.
-// Warning 6368: (255-262): CHC: Out of bounds access might happen here.
+// Warning 6368: (255-259): CHC: Out of bounds access happens here.\nCounterexample:\na = []\ni = 0\nj = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.r()
+// Warning 6368: (255-262): CHC: Out of bounds access happens here.
 // Warning 2661: (184-197): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (228-244): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
index 9583597a34..a26795e538 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
@@ -8,4 +8,4 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.\nCounterexample:\n\nx = 57896044618658097711785492504343953926634992332820282019728792003956564819967\ny = (- 1)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(57896044618658097711785492504343953926634992332820282019728792003956564819967, (- 1))
+// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.\nCounterexample:\n\nx = 0\ny = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, (- 57896044618658097711785492504343953926634992332820282019728792003956564819968))
diff --git a/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
index d872cb6694..e8cf49a832 100644
--- a/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/simple_overflow.sol
@@ -4,4 +4,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\na = 115792089237316195423570985008687907853269984665640564039457584007913129639935\nb = 1\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(115792089237316195423570985008687907853269984665640564039457584007913129639935, 1)
+// Warning 4984: (80-85): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\na = 1\nb = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(1, 115792089237316195423570985008687907853269984665640564039457584007913129639935)
diff --git a/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol b/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
index a015aba72a..eea3366093 100644
--- a/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
@@ -13,4 +13,4 @@ contract C {
 // Warning 2072: (82-86): Unused local variable.
 // Warning 2072: (140-150): Unused local variable.
 // Warning 2072: (152-156): Unused local variable.
-// Warning 6328: (220-236): CHC: Assertion violation happens here.
+// Warning 6328: (220-236): CHC: Assertion violation happens here.\nCounterexample:\n\na1 = 2437\nb1 = 0x0b\nc1 = 10\na2 = 2437\nb2 = 0x0b\nc2 = 10\n\nTransaction trace:\nC.constructor()\nC.f(data)
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
index 95e3390b45..6e876daf30 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
@@ -21,4 +21,4 @@ contract C {
 // SMTEngine: chc
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (343-377): CHC: Assertion violation happens here.\nCounterexample:\ngas = 0, origin = 0x52f7\n\nTransaction trace:\nC.constructor()\nState: gas = 0, origin = 0x0\nC.f(){ tx.gasprice: 0, tx.origin: 0x52f7 }\n    C.g() -- internal call
+// Warning 6328: (343-377): CHC: Assertion violation happens here.\nCounterexample:\ngas = 0, origin = 0x0\n\nTransaction trace:\nC.constructor()\nState: gas = 0, origin = 0x0\nC.f(){ tx.gasprice: 0, tx.origin: 0x0 }\n    C.g() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
index 7d9c0ca567..0f511a05d1 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
@@ -13,4 +13,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 868\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 500 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 0 } -- reentrant call\n            _i.f() -- untrusted external call
+// Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 5892\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 11 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 32278 } -- reentrant call\n            _i.f() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
index e704cfd71e..81de958b34 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_2.sol
@@ -13,6 +13,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 1218: (157-191): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (157-191): CHC: Assertion violation might happen here.
-// Warning 4661: (157-191): BMC: Assertion violation happens here.
+// Warning 6328: (157-191): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 101\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 83 }\n    _i.f{ value: 100 }() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
index 33546b49c0..4910c417e8 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (132-160): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.s()
+// Warning 6328: (132-160): CHC: Assertion violation happens here.\nCounterexample:\nx = [0x61, 0x62, 0x63, 0x61]\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.s()
diff --git a/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol b/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
index 3effe1c05e..2341b7c85b 100644
--- a/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/abi_type_type_1.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (107-128): CHC: Assertion violation happens here.
+// Warning 6328: (107-128): CHC: Assertion violation happens here.\nCounterexample:\n\na = false\nx = 2\n\nTransaction trace:\nC.constructor()\nC.f(d)
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
index 830d756b7f..f74fad8af1 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
@@ -35,11 +35,7 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 2072: (384-399): Unused local variable.
-// Warning 1218: (955-959): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (948-965): CHC: Error trying to invoke SMT solver.
-// Warning 1218: (976-980): CHC: Error trying to invoke SMT solver.
 // Warning 6368: (489-493): CHC: Out of bounds access happens here.
-// Warning 6368: (955-959): CHC: Out of bounds access might happen here.
-// Warning 6328: (948-965): CHC: Assertion violation might happen here.
-// Warning 6368: (976-980): CHC: Out of bounds access might happen here.
-// Warning 4661: (948-965): BMC: Assertion violation happens here.
+// Warning 6368: (955-959): CHC: Out of bounds access happens here.
+// Warning 6328: (948-965): CHC: Assertion violation happens here.
+// Warning 6368: (976-980): CHC: Out of bounds access happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
index b6f19302b8..b04c632e91 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
@@ -12,6 +12,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 1218: (143-159): CHC: Error trying to invoke SMT solver.
-// Warning 6328: (143-159): CHC: Assertion violation might happen here.
-// Warning 4661: (143-159): BMC: Assertion violation happens here.
+// Warning 6328: (143-159): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol b/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
index eb7ae6a35e..16bb147c99 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
@@ -16,4 +16,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (385-402): CHC: Assertion violation happens here.
+// Warning 6328: (385-402): CHC: Assertion violation happens here.\nCounterexample:\n\na = [2440, 11]\nb = [1, 8]\nc = [15, 15]\n\nTransaction trace:\nC.constructor()\nC.f([2, 13], [0, 8], [42, 12])
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
index ce35a65054..44daa89128 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
@@ -6,4 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (66-80): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\ny = true\n\nTransaction trace:\nC.constructor()\nC.f(false, true)
+// Warning 6328: (66-80): CHC: Assertion violation happens here.\nCounterexample:\n\nx = true\ny = false\n\nTransaction trace:\nC.constructor()\nC.f(true, false)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
index 67f56d8c61..109fee7dc6 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
@@ -53,4 +53,3 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (212-217): CHC: Out of bounds access might happen here.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
index 9d4623ae09..6982623821 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_2.sol
@@ -20,4 +20,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (289-322): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 10}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 10}\nC.g(){ msg.sender: 0x0985 }
+// Warning 6328: (289-322): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 11}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 11}\nC.g(){ msg.sender: 0x0985 }
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
index 0da530799a..f00b70a768 100644
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
@@ -17,4 +17,3 @@ contract C
 // SMTEngine: all
 // ----
 // Warning 6368: (216-225): CHC: Out of bounds access might happen here.
-// Warning 6328: (209-230): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
index e4a68df6b4..1d31cbe3d2 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (188-212): CHC: Assertion violation happens here.
+// Warning 6328: (188-212): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 2437\n\nTransaction trace:\nC.constructor()\nC.f(data)
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
index 358e5404ea..a4c4a3a29e 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-226): CHC: Assertion violation happens here.
+// Warning 6328: (192-226): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(data)

From d660f0cab081ead122d78edc915b82c206fa054b Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 23 Nov 2022 19:53:21 +0100
Subject: [PATCH 1050/1748] adjust nondeterministic tests

---
 .../smtCheckerTests/abi/abi_encode_packed_string_literal.sol   | 1 +
 .../abi/abi_encode_packed_string_literal_no_unproved.sol       | 1 +
 test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol     | 1 +
 .../smtCheckerTests/abi/abi_encode_string_literal.sol          | 1 +
 .../abi/abi_encode_with_selector_array_slice_2.sol             | 3 ++-
 .../abi/abi_encode_with_selector_string_literal.sol            | 1 +
 .../smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol    | 1 +
 .../smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol    | 1 +
 .../smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol  | 1 +
 .../smtCheckerTests/abi/abi_encode_with_sig_hash.sol           | 1 +
 .../smtCheckerTests/abi/abi_encode_with_sig_simple.sol         | 1 +
 .../smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol | 1 +
 .../array_members/push_storage_ref_unsafe_length.sol           | 1 +
 .../control_flow/branches_inside_modifiers_2.sol               | 1 +
 ...crypto_functions_same_input_over_state_same_output_fail.sol | 1 +
 .../external_calls/external_reentrancy_crypto.sol              | 3 ++-
 test/libsolidity/smtCheckerTests/functions/payable_2.sol       | 1 +
 .../libsolidity/smtCheckerTests/invariants/state_machine_1.sol | 1 +
 .../loops/for_loop_array_assignment_memory_storage.sol         | 1 +
 .../modifiers/modifier_inside_branch_assignment.sol            | 1 +
 .../operators/compound_bitwise_string_literal_3.sol            | 1 +
 .../smtCheckerTests/operators/compound_mul_array_index.sol     | 1 +
 .../smtCheckerTests/types/struct_array_branches_2d.sol         | 1 +
 23 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
index d775c23593..08c48cbd99 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal.sol
@@ -21,6 +21,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (226-256): CHC: Assertion violation happens here.\nCounterexample:\n\nb1 = [0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
 // Warning 6328: (310-340): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
index a211b83178..f800276261 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_string_literal_no_unproved.sol
@@ -22,6 +22,7 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTShowUnproved: no
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (226-256): CHC: Assertion violation happens here.\nCounterexample:\n\nb1 = [0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42, 0x42]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
 // Warning 6328: (310-340): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72, 0x72]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedStringLiteral()
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
index 6bb936795b..2b79850d78 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
@@ -19,6 +19,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (298-328): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(false, 0, 0, 0, a, b)
 // Warning 6328: (389-419): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(false, 0, 0, 0, a, b)
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
index d4f88bcb26..b55952ee74 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_string_literal.sol
@@ -18,6 +18,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (208-238): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = []\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
 // Warning 6328: (286-316): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d]\nb3 = [0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d]\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral()
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
index 7994fa7c71..2c2b975611 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
@@ -24,8 +24,9 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (326-356): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\ndata = [55]\nb2 = [0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32, 0x32]\nb3 = []\nb4 = []\nx = 0\ny = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSlice(0x0, [55])
+// Warning 6328: (326-356): CHC: Assertion violation happens here.
 // Warning 6328: (579-609): CHC: Assertion violation happens here.
 // Warning 6328: (1080-1110): CHC: Assertion violation might happen here.
 // Warning 4661: (1080-1110): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
index 0c9f4f553a..6d1ab3066c 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal.sol
@@ -21,6 +21,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (252-282): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb1 = [0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46, 0x46]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
 // Warning 6328: (347-377): CHC: Assertion violation happens here.\nCounterexample:\n\nsel = 0x0\nb3 = [0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d, 0x6d]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(0x0)
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
index b5346b049b..2e64613668 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
@@ -8,6 +8,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (294-324): CHC: Assertion violation might happen here.
 // Warning 7812: (294-324): BMC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
index 1ad701b775..bbb5a58bdd 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
@@ -24,6 +24,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (334-364): CHC: Assertion violation happens here.
 // Warning 6328: (588-618): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
index 30c950beaa..e015679581 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
@@ -24,6 +24,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (335-365): CHC: Assertion violation happens here.\nCounterexample:\n\ndata = [69]\nb2 = [0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43]\nb3 = []\nb4 = []\nx = 0\ny = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSlice(sig, [69])
 // Warning 6328: (589-619): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
index 48b1241e43..73575690d1 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
@@ -12,6 +12,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (337-375): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 0\nb1 = [0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d]\nb2 = [0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d]\n\nTransaction trace:\nC.constructor()\nC.abiEncodeHash(sig, 0, 0)
 // Warning 6328: (394-432): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 0\n\nTransaction trace:\nC.constructor()\nC.abiEncodeHash(sig, 0, 0)
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
index 9545cd2f32..b88a969730 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
@@ -22,6 +22,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 5667: (107-122): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Warning 6328: (543-573): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(sig, false, 0, 0, 0, a, b)
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
index f559cac22a..de218cfaa6 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_string_literal.sol
@@ -21,6 +21,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (261-291): CHC: Assertion violation happens here.\nCounterexample:\n\nb2 = [0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a, 0x5a]\nb3 = []\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
 // Warning 6328: (357-387): CHC: Assertion violation happens here.\nCounterexample:\n\nb3 = [0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90]\nb4 = []\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeStringLiteral(sig)
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
index ea55e3055b..4ddb195a1e 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
@@ -25,6 +25,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6368: (238-242): CHC: Out of bounds access happens here.
 // Warning 6368: (238-245): CHC: Out of bounds access might happen here.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
index 652a431852..aa79a71faf 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
@@ -21,5 +21,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (333-347): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
index 584e7642db..c088b121b1 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output_fail.sol
@@ -44,6 +44,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (693-712): CHC: Assertion violation happens here.\nCounterexample:\nh = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x52f7, sha = 0x0, rip = 0x0, erc = 0x0\n_kec = 0x52f6\n_sha = 0x2e15\n_rip = 0x2297\n_erc = 0x0985\n\nTransaction trace:\nC.constructor(_data, 0x23c6, 198, 0x1599, 0x1980)\nState: h = 0x23c6, v = 198, r = 0x1599, s = 0x1980, kec = 0x52f7, sha = 0x0, rip = 0x0, erc = 0x0\nC.set(_data, 0x0, 0, 0x0, 0x0)\nState: h = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x52f7, sha = 0x0, rip = 0x0, erc = 0x0\nC.f()
 // Warning 6328: (716-735): CHC: Assertion violation happens here.\nCounterexample:\nh = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x0986, sha = 0x0, rip = 0x0, erc = 0x0\n_kec = 0x0985\n_sha = 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffdd68\n_rip = 0x20ad\n_erc = 0x2e15\n\nTransaction trace:\nC.constructor([0x19, 0x19, 0x19, 0x19, 0x19, 0x38, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x2b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x36, 0x19, 0x19, 0x39, 0x19, 0x3b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19], 0x1169, 88, 0x0a12, 0x1599)\nState: data = [0x19, 0x19, 0x19, 0x19, 0x19, 0x38, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x2b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x36, 0x19, 0x19, 0x39, 0x19, 0x3b, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19], h = 0x1169, v = 88, r = 0x0a12, s = 0x1599, kec = 0x0986, sha = 0x0, rip = 0x0, erc = 0x0\nC.set(_data, 0x0, 0, 0x0, 0x0)\nState: h = 0x0, v = 0, r = 0x0, s = 0x0, kec = 0x0986, sha = 0x0, rip = 0x0, erc = 0x0\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
index 84c741c10a..ba9d4ce043 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
@@ -26,5 +26,6 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreInv: yes
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (302-333): CHC: Assertion violation happens here.\nCounterexample:\nkec = 0x0\n_kec = 0x0\n\nTransaction trace:\nC.constructor(_data)\nState: kec = 0x0\nC.check(_data)
+// Warning 6328: (302-333): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/payable_2.sol b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
index 2d1117a4b4..3035080eac 100644
--- a/test/libsolidity/smtCheckerTests/functions/payable_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
@@ -23,5 +23,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (261-283): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g2(){ msg.value: 3529 }\n    C.i() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol b/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
index 91b96f78c0..a4910e5d36 100644
--- a/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
+++ b/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
@@ -31,5 +31,6 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTSolvers: z3
+// SMTIgnoreOS: macos
 // ----
 // Info 1180: Contract invariant(s) for :C:\n!(x >= 7)\n
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
index 359f82838f..28f2028c6e 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
@@ -25,4 +25,5 @@ contract LoopFor2 {
 // ====
 // SMTEngine: all
 // SMTSolvers: z3
+// SMTIgnoreOS: macos
 // ----
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
index 1d1fdbba2a..caa67b0da9 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment.sol
@@ -19,5 +19,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (254-267): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, owner = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, owner = 0x0\nC.f()\nState: x = 0, owner = 0x0\nC.g(1)\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
index 3ac248fb22..396088e3c5 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
@@ -16,6 +16,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (229-276): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x6062606464666060606260646466606060626064646660606062606464666060\nz = 0x6062606464666060606260646466606060626064646660606062606464666060\n\nTransaction trace:\nC.constructor()\nC.f()
 // Warning 6328: (394-437): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x63666566676e616263666566676e616263666566676e616263666566676e6162\nz = 0x63666566676e616263666566676e616263666566676e616263666566676e6162\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
index 8fcd46b947..37a00b0638 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
@@ -13,5 +13,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (226-247): CHC: Assertion violation happens here.\nCounterexample:\narray = [100]\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.q()\nState: array = [0]\nC.f(0, 0)
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
index f00b70a768..2d2492a2e8 100644
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
@@ -15,5 +15,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6368: (216-225): CHC: Out of bounds access might happen here.

From e51d2ca5e9101646d46a891903f304358d6b789f Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 23 Nov 2022 11:49:19 +0100
Subject: [PATCH 1051/1748] update docker images with z3 4.11.2

---
 scripts/docker/buildpack-deps/Dockerfile.emscripten           | 4 ++--
 .../docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004           | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index ba36541e55..551cab4958 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -33,7 +33,7 @@
 # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
 # dependencies automatically.
 FROM emscripten/emsdk:3.1.19 AS base
-LABEL version="13"
+LABEL version="14"
 
 ADD emscripten.jam /usr/src
 RUN set -ex && \
@@ -42,7 +42,7 @@ RUN set -ex && \
 	apt-get install lz4 --no-install-recommends && \
 	\
 	cd /usr/src && \
-	git clone https://github.com/Z3Prover/z3.git -b z3-4.11.0 --depth 1 && \
+	git clone https://github.com/Z3Prover/z3.git -b z3-4.11.2 --depth 1 && \
 	cd z3 && \
 	mkdir build && \
 	cd build && \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index 2605240b14..0225f4b2da 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="20"
+LABEL version="21"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -61,7 +61,7 @@ RUN set -ex; \
 
 # Z3
 RUN set -ex; \
-    git clone --depth 1 -b z3-4.11.0 https://github.com/Z3Prover/z3.git \
+    git clone --depth 1 -b z3-4.11.2 https://github.com/Z3Prover/z3.git \
     /usr/src/z3; \
     cd /usr/src/z3; \
     mkdir build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index b6febf7e61..242f859e7c 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="15"
+LABEL version="16"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
index 85933e86c8..7b2ae75154 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="15"
+LABEL version="16"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

From fe68200f30bad12f4e8418615ec92670c2f4e2e3 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Thu, 24 Nov 2022 10:16:16 -0500
Subject: [PATCH 1052/1748] [tests] Refactor scripts/ASTImportTest.sh. (#13576)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* [tests] Refactor scripts/ASTImportTest.sh.

Co-authored-by: Nuno Santos <nuno.santos@ethereum.org>
Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 scripts/ASTImportTest.sh | 268 ++++++++++++++++++++++++++-------------
 scripts/common.sh        |  66 +++++++---
 test/cmdlineTests.sh     |   4 +-
 3 files changed, 232 insertions(+), 106 deletions(-)

diff --git a/scripts/ASTImportTest.sh b/scripts/ASTImportTest.sh
index daf5a61632..31faaf9d96 100755
--- a/scripts/ASTImportTest.sh
+++ b/scripts/ASTImportTest.sh
@@ -1,105 +1,200 @@
 #!/usr/bin/env bash
+# ------------------------------------------------------------------------------
+# vim:ts=4:et
+# 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/>
+#
+# (c) solidity contributors.
+# ------------------------------------------------------------------------------
+# Bash script to test the import/exports.
+# ast import/export tests:
+#   - first exporting a .sol file to JSON, then loading it into the compiler
+#     and exporting it again. The second JSON should be identical to the first.
+
+set -euo pipefail
 
-set -e
-
-# Bash script to test the ast-import option of the compiler by
-# first exporting a .sol file to JSON, then loading it into the compiler
-# and exporting it again. The second JSON should be identical to the first
 READLINK=readlink
 if [[ "$OSTYPE" == "darwin"* ]]; then
     READLINK=greadlink
 fi
 REPO_ROOT=$(${READLINK} -f "$(dirname "$0")"/..)
 SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
-SOLC=${SOLIDITY_BUILD_DIR}/solc/solc
-SPLITSOURCES=${REPO_ROOT}/scripts/splitSources.py
+SOLC="${SOLIDITY_BUILD_DIR}/solc/solc"
+SPLITSOURCES="${REPO_ROOT}/scripts/splitSources.py"
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+function print_usage
+{
+    echo "Usage: ${0} ast [--exit-on-error|--help]."
+}
+
+function print_used_commands
+{
+    local test_directory="$1"
+    local export_command="$2"
+    local import_command="$3"
+    printError "You can find the files used for this test here: ${test_directory}"
+    printError "Used commands for test:"
+    printError "# export"
+    echo "$ ${export_command}" >&2
+    printError "# import"
+    echo "$ ${import_command}" >&2
+}
+
+function print_stderr_stdout
+{
+    local error_message="$1"
+    local stderr_file="$2"
+    local stdout_file="$3"
+    printError "$error_message"
+    printError ""
+    printError "stderr:"
+    cat "$stderr_file" >&2
+    printError ""
+    printError "stdout:"
+    cat "$stdout_file" >&2
+}
+
+function check_import_test_type_unset
+{
+    [[ -z "$IMPORT_TEST_TYPE" ]] || fail "ERROR: Import test type can only be set once. Aborting."
+}
+
+IMPORT_TEST_TYPE=
+EXIT_ON_ERROR=0
+for PARAM in "$@"
+do
+    case "$PARAM" in
+        ast) check_import_test_type_unset ; IMPORT_TEST_TYPE="ast" ;;
+        --help) print_usage ; exit 0 ;;
+        --exit-on-error) EXIT_ON_ERROR=1 ;;
+        *) fail "Unknown option '$PARAM'. Aborting. $(print_usage)" ;;
+    esac
+done
 
 SYNTAXTESTS_DIR="${REPO_ROOT}/test/libsolidity/syntaxTests"
 ASTJSONTESTS_DIR="${REPO_ROOT}/test/libsolidity/ASTJSON"
-NSOURCES="$(find "$SYNTAXTESTS_DIR" -type f | wc -l)"
-
-# DEV_DIR="${REPO_ROOT}/../tmp/contracts/"
-# NSOURCES="$(find $DEV_DIR -type f | wc -l)" #TODO use find command
 
 FAILED=0
 UNCOMPILABLE=0
 TESTED=0
 
-if [[ "$(find . -maxdepth 0 -type d -empty)" == "" ]]; then
-    echo "Test directory not empty. Skipping!"
-    exit 1
-fi
+function test_ast_import_export_equivalence
+{
+    local sol_file="$1"
+    local input_files=( "${@:2}" )
 
-# function tests whether exporting and importing again leaves the JSON ast unchanged
-# Results are recorded by adding to FAILED or UNCOMPILABLE.
-# Also, in case of a mismatch a diff and the respective ASTs are printed
-# Expected parameters:
-# $1 name of the file to be exported and imported
-# $2 any files needed to do so that might be in parent directories
-function testImportExportEquivalence {
-    local nth_input_file="$1"
-    IFS=" " read -r -a all_input_files <<< "$2"
+    local export_command=("$SOLC" --combined-json ast --pretty-json --json-indent 4 "${input_files[@]}")
+    local import_command=("$SOLC" --import-ast --combined-json ast --pretty-json --json-indent 4 expected.json)
 
-    if $SOLC "$nth_input_file" "${all_input_files[@]}" > /dev/null 2>&1
+    # export ast - save ast json as expected result (silently)
+    if ! "${export_command[@]}" > expected.json 2> stderr_export.txt
     then
-        ! [[ -e stderr.txt ]] || { echo "stderr.txt already exists. Refusing to overwrite."; exit 1; }
+        print_stderr_stdout "ERROR: AST reimport failed (export) for input file ${sol_file}." ./stderr_export.txt ./expected.json
+        print_used_commands "$(pwd)" "${export_command[*]} > expected.json" "${import_command[*]}"
+        return 1
+    fi
+
+    # (re)import ast - and export it again as obtained result (silently)
+    if ! "${import_command[@]}" > obtained.json 2> stderr_import.txt
+    then
+        print_stderr_stdout "ERROR: AST reimport failed (import) for input file ${sol_file}." ./stderr_import.txt ./obtained.json
+        print_used_commands "$(pwd)" "${export_command[*]} > expected.json" "${import_command[*]}"
+        return 1
+    fi
 
-        # save exported json as expected result (silently)
-        $SOLC --combined-json ast --pretty-json "$nth_input_file" "${all_input_files[@]}" > expected.json 2> /dev/null
-        # import it, and export it again as obtained result (silently)
-        if ! $SOLC --import-ast --combined-json ast --pretty-json expected.json > obtained.json 2> stderr.txt
+    # compare expected and obtained ASTs
+    if ! diff_files expected.json obtained.json
+    then
+        printError "ERROR: AST reimport failed for ${sol_file}"
+        if (( EXIT_ON_ERROR == 1 ))
         then
-            # For investigating, use exit 1 here so the script stops at the
-            # first failing test
-            # exit 1
-            FAILED=$((FAILED + 1))
-            echo -e "ERROR: AST reimport failed for input file $nth_input_file"
-            echo
-            echo "Compiler stderr:"
-            cat ./stderr.txt
-            echo
-            echo "Compiler stdout:"
-            cat ./obtained.json
+            print_used_commands "$(pwd)" "${export_command[*]}" "${import_command[*]}"
             return 1
         fi
-        DIFF="$(diff expected.json obtained.json)"
-        if [ "$DIFF" != "" ]
-        then
-            if [ "$DIFFVIEW" == "" ]
-            then
-                echo -e "ERROR: JSONS differ for $1: \n $DIFF \n"
-                echo "Expected:"
-                cat ./expected.json
-                echo "Obtained:"
-                cat ./obtained.json
-            else
-                # Use user supplied diff view binary
-                $DIFFVIEW expected.json obtained.json
-            fi
-            FAILED=$((FAILED + 1))
-            return 2
-        fi
-        TESTED=$((TESTED + 1))
-        rm expected.json obtained.json
-        rm -f stderr.txt
+        FAILED=$((FAILED + 1))
+    fi
+    TESTED=$((TESTED + 1))
+}
+
+# function tests whether exporting and importing again is equivalent.
+# Results are recorded by incrementing the FAILED or UNCOMPILABLE global variable.
+# Also, in case of a mismatch a diff is printed
+# Expected parameters:
+# $1 name of the file to be exported and imported
+# $2 any files needed to do so that might be in parent directories
+function test_import_export_equivalence {
+    local sol_file="$1"
+    local input_files=( "${@:2}" )
+    local output
+    local solc_return_code
+    local compile_test
+
+    case "$IMPORT_TEST_TYPE" in
+        ast) compile_test="--ast-compact-json" ;;
+        *) assertFail "Unknown import test type '${IMPORT_TEST_TYPE}'. Aborting." ;;
+    esac
+
+    set +e
+    output=$("$SOLC" "${compile_test}" "${input_files[@]}" 2>&1)
+    solc_return_code=$?
+    set -e
+
+    # if input files where compilable with success
+    if (( solc_return_code == 0 ))
+    then
+        case "$IMPORT_TEST_TYPE" in
+            ast) test_ast_import_export_equivalence "${sol_file}" "${input_files[@]}" ;;
+            *) assertFail "Unknown import test type '${IMPORT_TEST_TYPE}'. Aborting." ;;
+        esac
     else
-        # echo "contract $solfile could not be compiled "
         UNCOMPILABLE=$((UNCOMPILABLE + 1))
+
+        # solc will return exit code 2, if it was terminated by an uncaught exception.
+        # This should normally not happen, so we terminate the test execution here
+        # and print some details about the corresponding solc invocation.
+        if (( solc_return_code == 2 ))
+        then
+            fail "\n\nERROR: Uncaught Exception while executing '$SOLC ${compile_test} ${input_files[*]}':\n${output}\n"
+        fi
     fi
-    # return 0
 }
-echo "Looking at $NSOURCES .sol files..."
 
 WORKINGDIR=$PWD
 
-# for solfile in $(find $DEV_DIR -name *.sol)
+command_available "$SOLC" --version
+command_available jq --version
+
+case "$IMPORT_TEST_TYPE" in
+    ast) TEST_DIRS=("${SYNTAXTESTS_DIR}" "${ASTJSONTESTS_DIR}") ;;
+    *) assertFail "Import test type not defined. $(print_usage)" ;;
+esac
+
 # boost_filesystem_bug specifically tests a local fix for a boost::filesystem
 # bug. Since the test involves a malformed path, there is no point in running
-# AST tests on it. See https://github.com/boostorg/filesystem/issues/176
-# shellcheck disable=SC2044
-for solfile in $(find "$SYNTAXTESTS_DIR" "$ASTJSONTESTS_DIR" -name "*.sol" -and -not -name "boost_filesystem_bug.sol")
+# tests on it. See https://github.com/boostorg/filesystem/issues/176
+IMPORT_TEST_FILES=$(find "${TEST_DIRS[@]}" -name "*.sol" -and -not -name "boost_filesystem_bug.sol")
+
+NSOURCES="$(echo "${IMPORT_TEST_FILES}" | wc -l)"
+echo "Looking at ${NSOURCES} .sol files..."
+
+for solfile in $IMPORT_TEST_FILES
 do
-    echo -n "."
+    echo -n "·"
     # create a temporary sub-directory
     FILETMP=$(mktemp -d)
     cd "$FILETMP"
@@ -108,29 +203,25 @@ do
     OUTPUT=$("$SPLITSOURCES" "$solfile")
     SPLITSOURCES_RC=$?
     set -e
-    if [ ${SPLITSOURCES_RC} == 0 ]
+
+    if (( SPLITSOURCES_RC == 0 ))
     then
-        # echo $OUTPUT
-        NSOURCES=$((NSOURCES - 1))
-        for i in $OUTPUT;
-        do
-            testImportExportEquivalence "$i" "$OUTPUT"
-            NSOURCES=$((NSOURCES + 1))
-        done
-    elif [ ${SPLITSOURCES_RC} == 1 ]
+        IFS=' ' read -ra OUTPUT_ARRAY <<< "$OUTPUT"
+        test_import_export_equivalence "$solfile" "${OUTPUT_ARRAY[@]}"
+    elif (( SPLITSOURCES_RC == 1 ))
     then
-        testImportExportEquivalence "$solfile"
-    elif [ ${SPLITSOURCES_RC} == 2 ]
+        test_import_export_equivalence "$solfile" "$solfile"
+    elif (( SPLITSOURCES_RC == 2 ))
     then
         # The script will exit with return code 2, if an UnicodeDecodeError occurred.
         # This is the case if e.g. some tests are using invalid utf-8 sequences. We will ignore
         # these errors, but print the actual output of the script.
-        echo -e "\n${OUTPUT}\n"
-        testImportExportEquivalence "$solfile"
+        printError "\n\n${OUTPUT}\n\n"
+        test_import_export_equivalence "$solfile" "$solfile"
     else
         # All other return codes will be treated as critical errors. The script will exit.
-        echo -e "\nGot unexpected return code ${SPLITSOURCES_RC} from ${SPLITSOURCES}. Aborting."
-        echo -e "\n${OUTPUT}\n"
+        printError "\n\nGot unexpected return code ${SPLITSOURCES_RC} from '${SPLITSOURCES} ${solfile}'. Aborting."
+        printError "\n\n${OUTPUT}\n\n"
 
         cd "$WORKINGDIR"
         # Delete temporary files
@@ -144,12 +235,11 @@ do
     rm -rf "$FILETMP"
 done
 
-echo ""
+echo
 
-if [ "$FAILED" = 0 ]
+if (( FAILED == 0 ))
 then
-    echo "SUCCESS: $TESTED syntaxTests passed, $FAILED failed, $UNCOMPILABLE could not be compiled ($NSOURCES sources total)."
+    echo "SUCCESS: ${TESTED} tests passed, ${FAILED} failed, ${UNCOMPILABLE} could not be compiled (${NSOURCES} sources total)."
 else
-    echo "FAILURE: Out of $NSOURCES sources, $FAILED failed, ($UNCOMPILABLE could not be compiled)."
-    exit 1
+    fail "FAILURE: Out of ${NSOURCES} sources, ${FAILED} failed, (${UNCOMPILABLE} could not be compiled)."
 fi
diff --git a/scripts/common.sh b/scripts/common.sh
index 98f63ecb80..b5c6ada914 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -26,18 +26,18 @@ set -e
 # changes directory. The paths returned by `caller` are relative to it.
 _initial_work_dir=$(pwd)
 
-if [ "$CIRCLECI" ]
+if [[ -n ${CIRCLECI:-} ]]
 then
     export TERM="${TERM:-xterm}"
-    function printTask { echo "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; }
-    function printError { >&2 echo "$(tput setaf 1)$1$(tput setaf 7)"; }
-    function printWarning { >&2 echo "$(tput setaf 11)$1$(tput setaf 7)"; }
-    function printLog { echo "$(tput setaf 3)$1$(tput setaf 7)"; }
+    function printTask { echo -e "$(tput bold)$(tput setaf 2)$1$(tput setaf 7)"; }
+    function printError { >&2 echo -e "$(tput setaf 1)$1$(tput setaf 7)"; }
+    function printWarning { >&2 echo -e "$(tput setaf 11)$1$(tput setaf 7)"; }
+    function printLog { echo -e "$(tput setaf 3)$1$(tput setaf 7)"; }
 else
-    function printTask { echo "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
-    function printError { >&2 echo "$(tput setaf 1)$1$(tput sgr0)"; }
-    function printWarning { >&2 echo "$(tput setaf 11)$1$(tput sgr0)"; }
-    function printLog { echo "$(tput setaf 3)$1$(tput sgr0)"; }
+    function printTask { echo -e "$(tput bold)$(tput setaf 2)$1$(tput sgr0)"; }
+    function printError { >&2 echo -e "$(tput setaf 1)$1$(tput sgr0)"; }
+    function printWarning { >&2 echo -e "$(tput setaf 11)$1$(tput sgr0)"; }
+    function printLog { echo -e "$(tput setaf 3)$1$(tput sgr0)"; }
 fi
 
 function checkDputEntries
@@ -75,9 +75,9 @@ function printStackTrace
         # `caller` returns something that could already be printed as a stacktrace but we can make
         # it more readable by rearranging the components.
         # NOTE: This assumes that paths do not contain spaces.
-        lineNumber=$(caller "$frame" | cut --delimiter " " --field 1)
-        function=$(caller "$frame" | cut --delimiter " " --field 2)
-        file=$(caller "$frame" | cut --delimiter " " --field 3)
+        lineNumber=$(caller "$frame" | cut -d " " -f 1)
+        function=$(caller "$frame" | cut -d " " -f 2)
+        file=$(caller "$frame" | cut -d " " -f 3)
 
         # Paths in the output from `caller` can be relative or absolute (depends on how the path
         # with which the script was invoked) and if they're relative, they're not necessarily
@@ -193,16 +193,42 @@ function msg_on_error
     fi
 }
 
+
 function diff_values
 {
     (( $# >= 2 )) || fail "diff_values requires at least 2 arguments."
 
     local value1="$1"
     local value2="$2"
-    shift
-    shift
+    shift 2
 
-    diff --unified=0 <(echo "$value1") <(echo "$value2") "$@"
+    if ! diff --unified=0 <(echo "$value1") <(echo "$value2") "$@"
+    then
+        if [[ -n ${DIFFVIEW:-} ]]
+        then
+            # Use user supplied diff view binary
+            "$DIFFVIEW" <(echo "$value1") <(echo "$value2")
+        fi
+        return 1
+    fi
+}
+
+function diff_files
+{
+    (( $# >= 2 )) || fail "diff_files requires at least 2 arguments."
+
+    local file1="$1"
+    local file2="$2"
+
+    if ! diff "${file1}" "${file2}"
+    then
+        if [[ -n ${DIFFVIEW:-} ]]
+        then
+            # Use user supplied diff view binary
+            "$DIFFVIEW" "${file1}" "${file2}"
+        fi
+        return 1
+    fi
 }
 
 function safe_kill
@@ -277,3 +303,13 @@ function split_on_empty_lines_into_numbered_files
 
     awk -v RS= "{print > (\"${path_prefix}_\"NR \"${path_suffix}\")}"
 }
+
+function command_available
+{
+    local program="$1"
+    local parameters=${*:2}
+    if ! "${program}" "${parameters}" > /dev/null 2>&1
+    then
+        fail "'${program}' not found or not executed successfully with parameter(s) '${parameters}'. aborting."
+    fi
+}
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 6adc91538e..d04117156a 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -668,11 +668,11 @@ SOLTMPDIR=$(mktemp -d)
 )
 rm -r "$SOLTMPDIR"
 
-printTask "Testing AST import..."
+printTask "Testing AST import/export..."
 SOLTMPDIR=$(mktemp -d)
 (
     cd "$SOLTMPDIR"
-    if ! "$REPO_ROOT/scripts/ASTImportTest.sh"
+    if ! "$REPO_ROOT/scripts/ASTImportTest.sh" ast
     then
         rm -r "$SOLTMPDIR"
         fail

From b4add1df68dbf3ba18b1ac49e2045ee8fb17b227 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 24 Nov 2022 20:38:11 +0100
Subject: [PATCH 1053/1748] Avoid run the action when PRs are reopened

---
 .github/workflows/welcome-external-pr.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/welcome-external-pr.yml b/.github/workflows/welcome-external-pr.yml
index 888bc8d3a2..eefc7d62bb 100644
--- a/.github/workflows/welcome-external-pr.yml
+++ b/.github/workflows/welcome-external-pr.yml
@@ -4,7 +4,6 @@ on:
   pull_request_target:
     types:
       - opened
-      - reopened
 
 env:
   ORGANIZATION: Ethereum

From e9cc770d80eacab5eba4e2677670db80445be36a Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 22 Nov 2022 20:07:38 +0100
Subject: [PATCH 1054/1748] Add performance benchmarks.

---
 test/benchmarks/chains.sol | 91 ++++++++++++++++++++++++++++++++++++++
 test/benchmarks/run.sh     | 60 +++++++++++++++++++++++++
 2 files changed, 151 insertions(+)
 create mode 100644 test/benchmarks/chains.sol
 create mode 100755 test/benchmarks/run.sh

diff --git a/test/benchmarks/chains.sol b/test/benchmarks/chains.sol
new file mode 100644
index 0000000000..344cfff2ce
--- /dev/null
+++ b/test/benchmarks/chains.sol
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+// This is an adapted version of StdCheats by foundry:
+// https://github.com/foundry-rs/forge-std/blob/master/src/StdCheats.sol
+contract StdCheatsSafe {
+    struct Chain {
+        string name;
+        uint256 chainId;
+        string rpcUrl;
+    }
+
+    struct Chains {
+        Chain Anvil;
+        Chain Hardhat;
+        Chain Mainnet;
+        Chain Goerli;
+        Chain Sepolia;
+        Chain Optimism;
+        Chain OptimismGoerli;
+        Chain ArbitrumOne;
+        Chain ArbitrumOneGoerli;
+        Chain ArbitrumNova;
+        Chain Polygon;
+        Chain PolygonMumbai;
+        Chain Avalanche;
+        Chain AvalancheFuji;
+        Chain BnbSmartChain;
+        Chain BnbSmartChainTestnet;
+        Chain GnosisChain;
+    }
+
+    Chains stdChains;
+
+    function f(string[2][] memory rpcs) public returns (uint256) {
+        stdChains = Chains({
+            Anvil: Chain("Anvil", 31337, "http://127.0.0.1:8545"),
+            Hardhat: Chain("Hardhat", 31337, "http://127.0.0.1:8545"),
+            Mainnet: Chain("Mainnet", 1, "https://api.mycryptoapi.com/eth"),
+            Goerli: Chain("Goerli", 5, "https://goerli.infura.io/v3/84842078b09946638c03157f83405213"),
+            Sepolia: Chain("Sepolia", 11155111, "https://rpc.sepolia.dev"),
+            Optimism: Chain("Optimism", 10, "https://mainnet.optimism.io"),
+            OptimismGoerli: Chain("OptimismGoerli", 420, "https://goerli.optimism.io"),
+            ArbitrumOne: Chain("ArbitrumOne", 42161, "https://arb1.arbitrum.io/rpc"),
+            ArbitrumOneGoerli: Chain("ArbitrumOneGoerli", 421613, "https://goerli-rollup.arbitrum.io/rpc"),
+            ArbitrumNova: Chain("ArbitrumNova", 42170, "https://nova.arbitrum.io/rpc"),
+            Polygon: Chain("Polygon", 137, "https://polygon-rpc.com"),
+            PolygonMumbai: Chain("PolygonMumbai", 80001, "https://rpc-mumbai.matic.today"),
+            Avalanche: Chain("Avalanche", 43114, "https://api.avax.network/ext/bc/C/rpc"),
+            AvalancheFuji: Chain("AvalancheFuji", 43113, "https://api.avax-test.network/ext/bc/C/rpc"),
+            BnbSmartChain: Chain("BnbSmartChain", 56, "https://bsc-dataseed1.binance.org"),
+            BnbSmartChainTestnet: Chain("BnbSmartChainTestnet", 97, "https://data-seed-prebsc-1-s1.binance.org:8545"),
+            GnosisChain: Chain("GnosisChain", 100, "https://rpc.gnosischain.com")
+        });
+
+        for (uint256 i = 0; i < rpcs.length; i++) {
+            (string memory name, string memory rpcUrl) = (rpcs[i][0], rpcs[i][1]);
+            // forgefmt: disable-start
+            if (isEqual(name, "anvil")) stdChains.Anvil.rpcUrl = rpcUrl;
+            else if (isEqual(name, "hardhat")) stdChains.Hardhat.rpcUrl = rpcUrl;
+            else if (isEqual(name, "mainnet")) stdChains.Mainnet.rpcUrl = rpcUrl;
+            else if (isEqual(name, "goerli")) stdChains.Goerli.rpcUrl = rpcUrl;
+            else if (isEqual(name, "sepolia")) stdChains.Sepolia.rpcUrl = rpcUrl;
+            else if (isEqual(name, "optimism")) stdChains.Optimism.rpcUrl = rpcUrl;
+            else if (isEqual(name, "optimism_goerli", "optimism-goerli")) stdChains.OptimismGoerli.rpcUrl = rpcUrl;
+            else if (isEqual(name, "arbitrum_one", "arbitrum-one")) stdChains.ArbitrumOne.rpcUrl = rpcUrl;
+            else if (isEqual(name, "arbitrum_one_goerli", "arbitrum-one-goerli")) stdChains.ArbitrumOneGoerli.rpcUrl = rpcUrl;
+            else if (isEqual(name, "arbitrum_nova", "arbitrum-nova")) stdChains.ArbitrumNova.rpcUrl = rpcUrl;
+            else if (isEqual(name, "polygon")) stdChains.Polygon.rpcUrl = rpcUrl;
+            else if (isEqual(name, "polygon_mumbai", "polygon-mumbai")) stdChains.PolygonMumbai.rpcUrl = rpcUrl;
+            else if (isEqual(name, "avalanche")) stdChains.Avalanche.rpcUrl = rpcUrl;
+            else if (isEqual(name, "avalanche_fuji", "avalanche-fuji")) stdChains.AvalancheFuji.rpcUrl = rpcUrl;
+            else if (isEqual(name, "bnb_smart_chain", "bnb-smart-chain")) stdChains.BnbSmartChain.rpcUrl = rpcUrl;
+            else if (isEqual(name, "bnb_smart_chain_testnet", "bnb-smart-chain-testnet")) stdChains.BnbSmartChainTestnet.rpcUrl = rpcUrl;
+            else if (isEqual(name, "gnosis_chain", "gnosis-chain")) stdChains.GnosisChain.rpcUrl = rpcUrl;
+            // forgefmt: disable-end
+        }
+        return 0;
+    }
+
+    function isEqual(string memory a, string memory b) private pure returns (bool) {
+        return keccak256(abi.encode(a)) == keccak256(abi.encode(b));
+    }
+
+    function isEqual(string memory a, string memory b, string memory c) private pure returns (bool) {
+        return keccak256(abi.encode(a)) == keccak256(abi.encode(b))
+            || keccak256(abi.encode(a)) == keccak256(abi.encode(c));
+    }
+}
+
+
diff --git a/test/benchmarks/run.sh b/test/benchmarks/run.sh
new file mode 100755
index 0000000000..01573170b5
--- /dev/null
+++ b/test/benchmarks/run.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+
+#------------------------------------------------------------------------------
+# Bash script to run optimizer performance tests.
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2022 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -euo pipefail
+
+REPO_ROOT=$(cd "$(dirname "$0")/../../" && pwd)
+SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
+
+result_legacy_file=$(mktemp -t benchmark-legacy-XXXXXX.txt)
+result_via_ir_file=$(mktemp -t benchmark-via-ir-XXXXXX.txt)
+
+function cleanup() {
+  rm "${result_legacy_file}"
+  rm "${result_via_ir_file}"
+  exit
+}
+
+trap cleanup SIGINT SIGTERM
+
+solc="${SOLIDITY_BUILD_DIR}/solc/solc"
+benchmarks_dir="${REPO_ROOT}/test/benchmarks"
+chains_sol="${benchmarks_dir}/chains.sol"
+time_bin_path=$(type -P time)
+
+solc_command_legacy=("${solc}" --optimize --bin "${chains_sol}")
+solc_command_via_ir=("${solc}" --via-ir --optimize --bin "${chains_sol}")
+
+"${time_bin_path}" --output "${result_legacy_file}" --format "%e" "${solc_command_legacy[@]}" >/dev/null
+"${time_bin_path}" --output "${result_via_ir_file}" --format "%e" "${solc_command_via_ir[@]}" >/dev/null
+
+time_legacy=$(<"${result_legacy_file}")
+time_via_ir=$(<"${result_via_ir_file}")
+
+echo "======================================================="
+echo "legacy pipeline took ${time_legacy} seconds to execute."
+echo "via-ir pipeline took ${time_via_ir} seconds to execute."
+echo "======================================================="
+
+cleanup
+

From cf5d0d3f8bbdfb97209beb78498029ad940fac08 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 24 Nov 2022 21:16:00 +0100
Subject: [PATCH 1055/1748] =?UTF-8?q?Let=20the=20nightlies=20call=20themse?=
 =?UTF-8?q?lves=20'nightly',=20the=20return.=20Co-authored-by:=20Kamil=20?=
 =?UTF-8?q?=C5=9Aliwak=20<cameel2@gmail.com>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/build_emscripten.sh    |   9 ++-
 scripts/ci/build.sh            |   9 ++-
 scripts/ci/build_emscripten.sh | 124 +++++++++++++++++++++------------
 3 files changed, 92 insertions(+), 50 deletions(-)

diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index abe273ac26..fe830dc582 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -28,10 +28,9 @@
 
 set -e
 
-if test -z "$1"; then
-    BUILD_DIR="emscripten_build"
-else
-    BUILD_DIR="$1"
+params=""
+if (( $# != 0 )); then
+    params="$(printf "%q " "${@}")"
 fi
 
 # solbuildpackpusher/solidity-buildpack-deps:emscripten-14
@@ -39,4 +38,4 @@ fi
 # See https://github.blog/2022-04-12-git-security-vulnerability-announced/
 docker run -v "$(pwd):/root/project" -w /root/project \
     solbuildpackpusher/solidity-buildpack-deps@sha256:f1c13f3450d1f2e53ea18ac1ac1a17e932573cb9a5ccd0fd9ef6dd44f6402fa9 \
-    /bin/bash -c "git config --global --add safe.directory /root/project && ./scripts/ci/build_emscripten.sh $BUILD_DIR"
+    /bin/bash -c "git config --global --add safe.directory /root/project && ./scripts/ci/build_emscripten.sh ${params}"
diff --git a/scripts/ci/build.sh b/scripts/ci/build.sh
index 87138fb056..d529b03c1a 100755
--- a/scripts/ci/build.sh
+++ b/scripts/ci/build.sh
@@ -2,17 +2,22 @@
 set -ex
 
 ROOTDIR="$(dirname "$0")/../.."
+# shellcheck source=scripts/common.sh
+source "${ROOTDIR}/scripts/common.sh"
+
+prerelease_source="${1:-ci}"
+
 cd "${ROOTDIR}"
 
 # shellcheck disable=SC2166
 if [ "$CIRCLE_BRANCH" = release -o -n "$CIRCLE_TAG" -o -n "$FORCE_RELEASE" ]
 then
-    echo -n "" >prerelease.txt
+    echo -n >prerelease.txt
 else
     # Use last commit date rather than build date to avoid ending up with builds for
     # different platforms having different version strings (and therefore producing different bytecode)
     # if the CI is triggered just before midnight.
-    TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="ci.%cd" >prerelease.txt
+    TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="${prerelease_source}.%cd" >prerelease.txt
 fi
 
 if [ -n "$CIRCLE_SHA1" ]
diff --git a/scripts/ci/build_emscripten.sh b/scripts/ci/build_emscripten.sh
index c1e117c6c6..04e16293fd 100755
--- a/scripts/ci/build_emscripten.sh
+++ b/scripts/ci/build_emscripten.sh
@@ -34,55 +34,93 @@
 
 set -ev
 
-if test -z "$1"; then
-	BUILD_DIR="emscripten_build"
-else
-	BUILD_DIR="$1"
-fi
+SCRIPT_DIR="$(realpath "$(dirname "$0")/..")"
+# shellcheck source=scripts/common.sh
+source "${SCRIPT_DIR}/common.sh"
 
-WORKSPACE=/root/project
+function build() {
+    local build_dir="$1"
+    local prerelease_source="${2:-ci}"
 
-cd "$WORKSPACE"
+    cd /root/project
 
-# shellcheck disable=SC2166
-if [[ "$CIRCLE_BRANCH" = release || -n "$CIRCLE_TAG" || -n "$FORCE_RELEASE" || "$(git tag --points-at HEAD 2>/dev/null)" == v* ]]
-then
-	echo -n >prerelease.txt
-else
-	# Use last commit date rather than build date to avoid ending up with builds for
-	# different platforms having different version strings (and therefore producing different bytecode)
-	# if the CI is triggered just before midnight.
-	TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="ci.%cd" >prerelease.txt
-fi
-if [ -n "$CIRCLE_SHA1" ]
-then
-	echo -n "$CIRCLE_SHA1" >commit_hash.txt
-fi
+    # shellcheck disable=SC2166
+    if [[ "$CIRCLE_BRANCH" = release || -n "$CIRCLE_TAG" || -n "$FORCE_RELEASE" || "$(git tag --points-at HEAD 2>/dev/null)" == v* ]]
+    then
+        echo -n >prerelease.txt
+    else
+        # Use last commit date rather than build date to avoid ending up with builds for
+        # different platforms having different version strings (and therefore producing different bytecode)
+        # if the CI is triggered just before midnight.
+        TZ=UTC git show --quiet --date="format-local:%Y.%-m.%-d" --format="${prerelease_source}.%cd" >prerelease.txt
+    fi
+    if [ -n "$CIRCLE_SHA1" ]
+    then
+        echo -n "$CIRCLE_SHA1" >commit_hash.txt
+    fi
 
-# Disable warnings for unqualified `move()` calls, introduced and enabled by
-# default in clang-16 which is what the emscripten docker image uses.
-# Additionally, disable the warning for unknown warnings here, as this script is
-# also used with earlier clang versions.
-# TODO: This can be removed if and when all usages of `move()` in our codebase use the `std::` qualifier.
-CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call"
+    # Disable warnings for unqualified `move()` calls, introduced and enabled by
+    # default in clang-16 which is what the emscripten docker image uses.
+    # Additionally, disable the warning for unknown warnings here, as this script is
+    # also used with earlier clang versions.
+    # TODO: This can be removed if and when all usages of `move()` in our codebase use the `std::` qualifier.
+    CMAKE_CXX_FLAGS="-Wno-unqualified-std-cast-call"
 
+    mkdir -p "$build_dir"
+    cd "$build_dir"
+    emcmake cmake \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DBoost_USE_STATIC_LIBS=1 \
+        -DBoost_USE_STATIC_RUNTIME=1 \
+        -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS}" \
+        -DTESTS=0 \
+    ..
+    make soljson
 
-mkdir -p "$BUILD_DIR"
-cd "$BUILD_DIR"
-emcmake cmake \
-	-DCMAKE_BUILD_TYPE=Release \
-	-DBoost_USE_STATIC_LIBS=1 \
-	-DBoost_USE_STATIC_RUNTIME=1 \
-	-DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS}" \
-	-DTESTS=0 \
-  ..
-make soljson
+    cd ..
+    mkdir -p upload
+    scripts/ci/pack_soljson.sh "$build_dir/libsolc/soljson.js" "$build_dir/libsolc/soljson.wasm" upload/soljson.js
+    cp upload/soljson.js ./
 
-cd ..
-mkdir -p upload
-scripts/ci/pack_soljson.sh "$BUILD_DIR/libsolc/soljson.js" "$BUILD_DIR/libsolc/soljson.wasm" upload/soljson.js
-cp upload/soljson.js ./
+    OUTPUT_SIZE=$(ls -la soljson.js)
 
-OUTPUT_SIZE=$(ls -la soljson.js)
+    echo "Emscripten output size: $OUTPUT_SIZE"
+}
 
-echo "Emscripten output size: $OUTPUT_SIZE"
+function show_help() {
+cat << EOF
+Usage: ${0##*/} [-h|--help] [--build-dir DIR] [--prerelease-source prerelease_source]
+Build Solidity emscripten binary
+    -h | --help          Display this help message
+    --build-dir          The emscripten build directory
+    --prerelease-source  The prerelease source string. E.g. 'nightly' or 'ci'.
+EOF
+}
+
+function main() {
+    local build_dir="emscripten_build"
+    local prerelease_source=""
+
+    while (( $# > 0 )); do
+        case "$1" in
+            -h|--help)
+                show_help
+                exit 0
+                ;;
+            --build-dir)
+                [[ -n "$2" ]] || fail "Option --build-dir cannot be empty"
+                build_dir="$2"
+                shift 2
+                ;;
+            --prerelease-source)
+                [[ -n "$2" ]] || fail "Option --prerelease-source cannot be empty"
+                prerelease_source="$2"
+                shift 2
+                ;;
+            *) fail "Invalid option: $1" ;;
+        esac
+    done
+    build "$build_dir" "$prerelease_source"
+}
+
+main "$@"

From 9e7b85ac4bea037f8c8d9ba2cd306e60dcd00dfc Mon Sep 17 00:00:00 2001
From: Vinay <vmanektalla@bmat.com>
Date: Tue, 15 Mar 2022 18:53:29 +0000
Subject: [PATCH 1056/1748] Improve Error Reporting of SemVer Parser

---
 Changelog.md                                  |  1 +
 liblangutil/SemVerHandler.cpp                 | 33 +++++++++----
 liblangutil/SemVerHandler.h                   |  9 ++--
 libsolidity/analysis/SyntaxChecker.cpp        | 38 ++++++++-------
 libsolidity/parsing/Parser.cpp                | 38 ++++++++-------
 test/libsolidity/SemVerMatcher.cpp            | 47 ++++++++++++++-----
 .../pragma/blank_space_version.sol            |  3 ++
 .../syntaxTests/pragma/broken_version_2.sol   |  2 +-
 .../syntaxTests/pragma/broken_version_4.sol   |  2 +-
 .../syntaxTests/pragma/broken_version_5.sol   |  2 +-
 .../syntaxTests/pragma/broken_version_6.sol   |  2 +-
 .../syntaxTests/pragma/broken_version_7.sol   |  2 +-
 .../syntaxTests/pragma/empty_version.sol      |  2 +-
 .../invalid_range_conjunction_range_first.sol |  3 ++
 ...invalid_range_conjunction_range_second.sol |  3 ++
 .../invalid_range_conjunction_two_ranges.sol  |  3 ++
 .../pragma/unterminated_version.sol           |  2 +-
 .../valid_range_disjunction_range_second.sol  |  2 +
 .../valid_range_disjunction_two_ranges.sol    |  2 +
 .../pragma/version_number_too_large.sol       |  3 ++
 20 files changed, 135 insertions(+), 64 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/pragma/blank_space_version.sol
 create mode 100644 test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_first.sol
 create mode 100644 test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_second.sol
 create mode 100644 test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_two_ranges.sol
 create mode 100644 test/libsolidity/syntaxTests/pragma/valid_range_disjunction_range_second.sol
 create mode 100644 test/libsolidity/syntaxTests/pragma/valid_range_disjunction_two_ranges.sol
 create mode 100644 test/libsolidity/syntaxTests/pragma/version_number_too_large.sol

diff --git a/Changelog.md b/Changelog.md
index 7276df4d78..f01abd6abf 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -15,6 +15,7 @@ Compiler Features:
  * Optimizer: Added optimization rule ``and(shl(X, Y), shl(X, Z)) => shl(X, and(Y, Z))``.
  * SMTChecker: Support Eldarica as a Horn solver for the CHC engine when using the CLI option ``--model-checker-solvers eld``. The binary `eld` must be available in the system.
  * SMTChecker: Make ``z3`` the default solver for the BMC and CHC engines instead of all solvers.
+ * Parser: More detailed error messages about invalid version pragmas.
 
 
 Bugfixes:
diff --git a/liblangutil/SemVerHandler.cpp b/liblangutil/SemVerHandler.cpp
index ceb562aed6..6e85e2609d 100644
--- a/liblangutil/SemVerHandler.cpp
+++ b/liblangutil/SemVerHandler.cpp
@@ -27,10 +27,12 @@
 
 #include <functional>
 #include <limits>
+#include <fmt/format.h>
 
 using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
+using namespace solidity::util;
 
 SemVerMatchExpressionParser::SemVerMatchExpressionParser(vector<Token> _tokens, vector<string> _literals):
 	m_tokens(std::move(_tokens)), m_literals(std::move(_literals))
@@ -52,7 +54,7 @@ SemVerVersion::SemVerVersion(string const& _versionString)
 		if (level < 2)
 		{
 			if (i == end || *i != '.')
-				BOOST_THROW_EXCEPTION(SemVerError());
+				solThrow(SemVerError, "Invalid versionString: "s + _versionString);
 			else
 				++i;
 		}
@@ -70,7 +72,7 @@ SemVerVersion::SemVerVersion(string const& _versionString)
 		build = string(buildStart, i);
 	}
 	if (i != end)
-		BOOST_THROW_EXCEPTION(SemVerError());
+		solThrow(SemVerError, "Invalid versionString "s + _versionString);
 }
 
 bool SemVerMatchExpression::MatchComponent::matches(SemVerVersion const& _version) const
@@ -156,12 +158,12 @@ bool SemVerMatchExpression::matches(SemVerVersion const& _version) const
 	return false;
 }
 
-optional<SemVerMatchExpression> SemVerMatchExpressionParser::parse()
+SemVerMatchExpression SemVerMatchExpressionParser::parse()
 {
 	reset();
 
 	if (m_tokens.empty())
-		return nullopt;
+		solThrow(SemVerError, "Empty version pragma.");
 
 	try
 	{
@@ -171,14 +173,19 @@ optional<SemVerMatchExpression> SemVerMatchExpressionParser::parse()
 			if (m_pos >= m_tokens.size())
 				break;
 			if (currentToken() != Token::Or)
-				BOOST_THROW_EXCEPTION(SemVerError());
+			{
+				solThrow(
+					SemVerError,
+					"You can only combine version ranges using the || operator."
+				);
+			}
 			nextToken();
 		}
 	}
-	catch (SemVerError const&)
+	catch (SemVerError const& e)
 	{
 		reset();
-		return nullopt;
+		throw e;
 	}
 
 	return m_expression;
@@ -265,14 +272,22 @@ unsigned SemVerMatchExpressionParser::parseVersionPart()
 		{
 			c = currentChar();
 			if (v * 10 < v || v * 10 + static_cast<unsigned>(c - '0') < v * 10)
-				BOOST_THROW_EXCEPTION(SemVerError());
+				solThrow(SemVerError, "Integer too large to be used in a version number.");
 			v = v * 10 + static_cast<unsigned>(c - '0');
 			nextChar();
 		}
 		return v;
 	}
+	else if (c == char(-1))
+		solThrow(SemVerError, "Expected version number but reached end of pragma.");
 	else
-		BOOST_THROW_EXCEPTION(SemVerError());
+		solThrow(
+			SemVerError, fmt::format(
+				"Expected the start of a version number but instead found character '{}'. "
+				"Version number is invalid or the pragma is not terminated with a semicolon.",
+				c
+			)
+		);
 }
 
 char SemVerMatchExpressionParser::currentChar() const
diff --git a/liblangutil/SemVerHandler.h b/liblangutil/SemVerHandler.h
index bce4d736b9..cf344502ea 100644
--- a/liblangutil/SemVerHandler.h
+++ b/liblangutil/SemVerHandler.h
@@ -25,17 +25,18 @@
 
 #include <liblangutil/Token.h>
 #include <libsolutil/Assertions.h>
+#include <liblangutil/Exceptions.h>
 
 #include <string>
-#include <optional>
 #include <utility>
 #include <vector>
 
 namespace solidity::langutil
 {
 
-class SemVerError: public util::Exception
+struct SemVerError: public util::Exception
 {
+
 };
 
 #undef major
@@ -87,8 +88,8 @@ class SemVerMatchExpressionParser
 public:
 	SemVerMatchExpressionParser(std::vector<Token> _tokens, std::vector<std::string> _literals);
 
-	/// Returns an expression if it was parseable, or nothing otherwise.
-	std::optional<SemVerMatchExpression> parse();
+	/// Returns an expression if it was parsable, or throws a SemVerError otherwise.
+	SemVerMatchExpression parse();
 
 private:
 	void reset();
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index bdf138e202..167242b2c5 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -153,22 +153,28 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
 	}
 	else if (_pragma.literals()[0] == "solidity")
 	{
-		vector<Token> tokens(_pragma.tokens().begin() + 1, _pragma.tokens().end());
-		vector<string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
-		SemVerMatchExpressionParser parser(tokens, literals);
-		auto matchExpression = parser.parse();
-		// An unparsable version pragma is an unrecoverable fatal error in the parser.
-		solAssert(matchExpression.has_value(), "");
-		static SemVerVersion const currentVersion{string(VersionString)};
-		if (!matchExpression->matches(currentVersion))
-			m_errorReporter.syntaxError(
-				3997_error,
-				_pragma.location(),
-				"Source file requires different compiler version (current compiler is " +
-				string(VersionString) + ") - note that nightly builds are considered to be "
-				"strictly less than the released version"
-			);
-		m_versionPragmaFound = true;
+		try
+		{
+			vector<Token> tokens(_pragma.tokens().begin() + 1, _pragma.tokens().end());
+			vector<string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
+			SemVerMatchExpressionParser parser(tokens, literals);
+			SemVerMatchExpression matchExpression = parser.parse();
+			static SemVerVersion const currentVersion{string(VersionString)};
+			if (!matchExpression.matches(currentVersion))
+				m_errorReporter.syntaxError(
+					3997_error,
+					_pragma.location(),
+					"Source file requires different compiler version (current compiler is " +
+					string(VersionString) + ") - note that nightly builds are considered to be "
+					"strictly less than the released version"
+				);
+			m_versionPragmaFound = true;
+		}
+		catch (SemVerError const&)
+		{
+			// An unparsable version pragma is an unrecoverable fatal error in the parser.
+			solAssert(false);
+		}
 	}
 	else
 		m_errorReporter.syntaxError(4936_error, _pragma.location(), "Unknown pragma \"" + _pragma.literals()[0] + "\"");
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index afa70609d9..8075e63e44 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -160,27 +160,31 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 void Parser::parsePragmaVersion(SourceLocation const& _location, vector<Token> const& _tokens, vector<string> const& _literals)
 {
 	SemVerMatchExpressionParser parser(_tokens, _literals);
-	auto matchExpression = parser.parse();
-	if (!matchExpression.has_value())
+	try
+	{
+		SemVerMatchExpression matchExpression = parser.parse();
+		static SemVerVersion const currentVersion{string(VersionString)};
+		// FIXME: only match for major version incompatibility
+		if (!matchExpression.matches(currentVersion))
+			// If m_parserErrorRecovery is true, the same message will appear from SyntaxChecker::visit(),
+			// so we don't need to report anything here.
+			if (!m_parserErrorRecovery)
+				m_errorReporter.fatalParserError(
+					5333_error,
+					_location,
+					"Source file requires different compiler version (current compiler is " +
+					string(VersionString) + ") - note that nightly builds are considered to be "
+					"strictly less than the released version"
+				);
+	}
+	catch (SemVerError const& matchError)
+	{
 		m_errorReporter.fatalParserError(
 			1684_error,
 			_location,
-			"Found version pragma, but failed to parse it. "
-			"Please ensure there is a trailing semicolon."
+			"Invalid version pragma. "s + matchError.what()
 		);
-	static SemVerVersion const currentVersion{string(VersionString)};
-	// FIXME: only match for major version incompatibility
-	if (!matchExpression->matches(currentVersion))
-		// If m_parserErrorRecovery is true, the same message will appear from SyntaxChecker::visit(),
-		// so we don't need to report anything here.
-		if (!m_parserErrorRecovery)
-			m_errorReporter.fatalParserError(
-				5333_error,
-				_location,
-				"Source file requires different compiler version (current compiler is " +
-				string(VersionString) + ") - note that nightly builds are considered to be "
-				"strictly less than the released version"
-			);
+	}
 }
 
 ASTPointer<StructuredDocumentation> Parser::parseStructuredDocumentation()
diff --git a/test/libsolidity/SemVerMatcher.cpp b/test/libsolidity/SemVerMatcher.cpp
index a69b2a39df..e1ad89445f 100644
--- a/test/libsolidity/SemVerMatcher.cpp
+++ b/test/libsolidity/SemVerMatcher.cpp
@@ -27,6 +27,7 @@
 #include <liblangutil/Scanner.h>
 #include <liblangutil/SemVerHandler.h>
 #include <test/Common.h>
+#include <test/libsolidity/util/SoltestErrors.h>
 
 #include <boost/test/unit_test.hpp>
 
@@ -58,15 +59,39 @@ SemVerMatchExpression parseExpression(string const& _input)
 		scanner.next();
 	}
 
-	auto expression = SemVerMatchExpressionParser(tokens, literals).parse();
-	BOOST_REQUIRE(expression.has_value());
-	BOOST_CHECK_MESSAGE(
-		expression->isValid(),
-		"Expression \"" + _input + "\" did not parse properly."
-	);
-	return *expression;
+	try
+	{
+		auto matchExpression = SemVerMatchExpressionParser(tokens, literals).parse();
+
+		BOOST_CHECK_MESSAGE(
+			matchExpression.isValid(),
+			"Expression \"" + _input + "\" did not parse properly."
+		);
+
+		return matchExpression;
+	}
+	catch (SemVerError const&)
+	{
+		// Ignored, since a test case should have a parsable version
+		soltestAssert(false);
+	}
+}
+
 }
 
+BOOST_AUTO_TEST_CASE(exception_on_invalid_version_in_semverversion_constructor)
+{
+	BOOST_CHECK_EXCEPTION(
+		SemVerVersion version("1.2"),
+		SemVerError,
+		[&](auto const& _exception) { BOOST_TEST(_exception.what() == "Invalid versionString: 1.2"); return true; }
+	);
+
+	BOOST_CHECK_EXCEPTION(
+		SemVerVersion version("-1.2.0"),
+		SemVerError,
+		[&](auto const& _exception) { BOOST_TEST(_exception.what() == "Invalid versionString: -1.2.0"); return true; }
+	);
 }
 
 BOOST_AUTO_TEST_CASE(positive_range)
@@ -159,9 +184,9 @@ BOOST_AUTO_TEST_CASE(positive_range)
 	for (auto const& t: tests)
 	{
 		SemVerVersion version(t.second);
-		SemVerMatchExpression expression = parseExpression(t.first);
+		SemVerMatchExpression matchExpression = parseExpression(t.first);
 		BOOST_CHECK_MESSAGE(
-			expression.matches(version),
+			matchExpression.matches(version),
 			"Version \"" + t.second + "\" did not satisfy expression \"" + t.first + "\""
 		);
 	}
@@ -235,9 +260,9 @@ BOOST_AUTO_TEST_CASE(negative_range)
 	for (auto const& t: tests)
 	{
 		SemVerVersion version(t.second);
-		SemVerMatchExpression expression = parseExpression(t.first);
+		auto matchExpression = parseExpression(t.first);
 		BOOST_CHECK_MESSAGE(
-			!expression.matches(version),
+			!matchExpression.matches(version),
 			"Version \"" + t.second + "\" did satisfy expression \"" + t.first + "\" " +
 			"(although it should not)"
 		);
diff --git a/test/libsolidity/syntaxTests/pragma/blank_space_version.sol b/test/libsolidity/syntaxTests/pragma/blank_space_version.sol
new file mode 100644
index 0000000000..d4c6eadcf4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/blank_space_version.sol
@@ -0,0 +1,3 @@
+pragma solidity ;
+// ----
+// ParserError 1684: (0-17): Invalid version pragma. Empty version pragma.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_2.sol b/test/libsolidity/syntaxTests/pragma/broken_version_2.sol
index 903ac4cd39..67c37fe647 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_2.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_2.sol
@@ -1,3 +1,3 @@
 pragma solidity pragma;
 // ----
-// ParserError 1684: (0-23): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-23): Invalid version pragma. Expected the start of a version number but instead found character 'p'. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_4.sol b/test/libsolidity/syntaxTests/pragma/broken_version_4.sol
index 76560fac62..ab9faa173e 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_4.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_4.sol
@@ -1,3 +1,3 @@
 pragma solidity (8.0.0);
 // ----
-// ParserError 1684: (0-24): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-24): Invalid version pragma. Expected the start of a version number but instead found character '('. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_5.sol b/test/libsolidity/syntaxTests/pragma/broken_version_5.sol
index 3c284be741..d858fdfa52 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_5.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_5.sol
@@ -1,3 +1,3 @@
 pragma solidity 88_;
 // ----
-// ParserError 1684: (0-20): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-20): Invalid version pragma. Expected the start of a version number but instead found character '_'. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_6.sol b/test/libsolidity/syntaxTests/pragma/broken_version_6.sol
index ab98e4f2a2..ee47523a31 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_6.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_6.sol
@@ -1,3 +1,3 @@
 pragma solidity v1.2.3;
 // ----
-// ParserError 1684: (0-23): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-23): Invalid version pragma. Expected the start of a version number but instead found character 'v'. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/broken_version_7.sol b/test/libsolidity/syntaxTests/pragma/broken_version_7.sol
index b4b6fea7a5..88fad9c999 100644
--- a/test/libsolidity/syntaxTests/pragma/broken_version_7.sol
+++ b/test/libsolidity/syntaxTests/pragma/broken_version_7.sol
@@ -1,3 +1,3 @@
 pragma solidity >0.5.0<;
 // ----
-// ParserError 1684: (0-24): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-24): Invalid version pragma. Expected version number but reached end of pragma.
diff --git a/test/libsolidity/syntaxTests/pragma/empty_version.sol b/test/libsolidity/syntaxTests/pragma/empty_version.sol
index cb8cc47d3b..b304283863 100644
--- a/test/libsolidity/syntaxTests/pragma/empty_version.sol
+++ b/test/libsolidity/syntaxTests/pragma/empty_version.sol
@@ -1,3 +1,3 @@
 pragma solidity;
 // ----
-// ParserError 1684: (0-16): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-16): Invalid version pragma. Empty version pragma.
diff --git a/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_first.sol b/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_first.sol
new file mode 100644
index 0000000000..235549c4c9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_first.sol
@@ -0,0 +1,3 @@
+pragma solidity 0.4.1 - 0.6.2 0.8.17;
+// ----
+// ParserError 1684: (0-37): Invalid version pragma. You can only combine version ranges using the || operator.
diff --git a/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_second.sol b/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_second.sol
new file mode 100644
index 0000000000..00c6aff60a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_range_second.sol
@@ -0,0 +1,3 @@
+pragma solidity 0.8.17 0.4.1 - 0.6.2;
+// ----
+// ParserError 1684: (0-37): Invalid version pragma. Expected the start of a version number but instead found character '-'. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_two_ranges.sol b/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_two_ranges.sol
new file mode 100644
index 0000000000..a5cb07a188
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/invalid_range_conjunction_two_ranges.sol
@@ -0,0 +1,3 @@
+pragma solidity 0.4.0 - 0.4.1 0.4.1 - 0.6.2;
+// ----
+// ParserError 1684: (0-44): Invalid version pragma. You can only combine version ranges using the || operator.
diff --git a/test/libsolidity/syntaxTests/pragma/unterminated_version.sol b/test/libsolidity/syntaxTests/pragma/unterminated_version.sol
index 6dc7373c04..2515a9679f 100644
--- a/test/libsolidity/syntaxTests/pragma/unterminated_version.sol
+++ b/test/libsolidity/syntaxTests/pragma/unterminated_version.sol
@@ -1,4 +1,4 @@
 pragma solidity 0.4.3
 pragma abicoder v2;
 // ----
-// ParserError 1684: (0-41): Found version pragma, but failed to parse it. Please ensure there is a trailing semicolon.
+// ParserError 1684: (0-41): Invalid version pragma. Expected the start of a version number but instead found character 'p'. Version number is invalid or the pragma is not terminated with a semicolon.
diff --git a/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_range_second.sol b/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_range_second.sol
new file mode 100644
index 0000000000..f318ec6f9f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_range_second.sol
@@ -0,0 +1,2 @@
+pragma solidity 0.8.17 || 0.4.1 - 0.9.0;
+// ----
diff --git a/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_two_ranges.sol b/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_two_ranges.sol
new file mode 100644
index 0000000000..6bf3a243e8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/valid_range_disjunction_two_ranges.sol
@@ -0,0 +1,2 @@
+pragma solidity 0.4.0 - 0.9.0 || 0.4.1 - 0.6.2;
+// ----
diff --git a/test/libsolidity/syntaxTests/pragma/version_number_too_large.sol b/test/libsolidity/syntaxTests/pragma/version_number_too_large.sol
new file mode 100644
index 0000000000..bde5a9aaef
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/version_number_too_large.sol
@@ -0,0 +1,3 @@
+pragma solidity 4294967296;
+// ----
+// ParserError 1684: (0-27): Invalid version pragma. Integer too large to be used in a version number.

From 0a4c7f3b0facfb272880f3fa3c961f30bbaab1b0 Mon Sep 17 00:00:00 2001
From: George Plotnikov <accembler@gmail.com>
Date: Fri, 25 Nov 2022 18:56:45 +0500
Subject: [PATCH 1057/1748] ReleaseChecklist.md: Update `update` call in
 solc-bin section

---
 ReleaseChecklist.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index f786a222e5..0e46522ba3 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -45,7 +45,7 @@
  - [ ] Take the ``github-binaries.tar`` tarball from ``c_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to the release page.
        Make sure it contains four binaries: ``solc-windows.exe``, ``solc-macos``, ``solc-static-linux`` and ``soljson.js``.
  - [ ] Take the ``solc-bin-binaries.tar`` tarball from ``c_release_binaries`` run of the tagged commit in circle-ci and add all binaries from it to solc-bin.
- - [ ] Run ``./update --reuse-hashes`` in ``solc-bin`` and verify that the script has updated ``list.js``, ``list.txt`` and ``list.json`` files correctly and that symlinks to the new release have been added in ``solc-bin/wasm/`` and ``solc-bin/emscripten-wasm32/``.
+ - [ ] Run ``npm run update -- --reuse-hashes`` in ``solc-bin`` and verify that the script has updated ``list.js``, ``list.txt`` and ``list.json`` files correctly and that symlinks to the new release have been added in ``solc-bin/wasm/`` and ``solc-bin/emscripten-wasm32/``.
  - [ ] Create a pull request in solc-bin and merge.
 
 ### Homebrew and MacOS

From 9a8dd4242f882d8f6e73d5bfaae3da2b09ee6dae Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 28 Nov 2022 11:00:13 +0100
Subject: [PATCH 1058/1748] Fix SMTChecker bug when a public library function
 is called internally by an internal library function, which in turn is called
 internally by a contract.

---
 Changelog.md                                  |  1 +
 libsolidity/formal/CHC.cpp                    |  9 ++++++-
 libsolidity/formal/SMTEncoder.cpp             |  7 +++--
 test/libsolidity/SMTCheckerTest.cpp           |  4 +++
 .../library_public_called_as_internal_1.sol   | 26 +++++++++++++++++++
 .../library_public_called_as_internal_2.sol   | 24 +++++++++++++++++
 6 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_2.sol

diff --git a/Changelog.md b/Changelog.md
index f01abd6abf..9d8a942ae9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -23,6 +23,7 @@ Bugfixes:
  * Solidity Upgrade Tool ``solidity-upgrade``: Fix the tool returning success code on uncaught exceptions.
  * SMTChecker: Fix display error for negative integers that are one more than powers of two.
  * SMTChecker: Improved readability for large integers that are powers of two or almost powers of two in error messages.
+ * SMTChecker: Fix internal error when a public library function is called internally.
 
 
 ### 0.8.17 (2022-09-08)
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 35c4033277..2baedde125 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1172,7 +1172,14 @@ void CHC::defineInterfacesAndSummaries(SourceUnit const& _source)
 
 				m_summaries[contract].emplace(function, createSummaryBlock(*function, *contract));
 
-				if (!function->isConstructor() && function->isPublic() && resolved.count(function))
+				if (
+					!function->isConstructor() &&
+					function->isPublic() &&
+					// Public library functions should have interfaces only for the libraries
+					// they're declared in.
+					(!function->libraryFunction() || (function->scope() == contract)) &&
+					resolved.count(function)
+				)
 				{
 					m_externalSummaries[contract].emplace(function, createSummaryBlock(*function, *contract));
 
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 4b267bc81f..818ac9278e 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -3162,11 +3162,10 @@ void SMTEncoder::collectFreeFunctions(set<SourceUnit const*, ASTNode::CompareByI
 				auto contract = dynamic_cast<ContractDefinition const*>(node.get());
 				contract && contract->isLibrary()
 			)
-			{
 				for (auto function: contract->definedFunctions())
-					if (!function->isPublic())
-						m_freeFunctions.insert(function);
-			}
+					// We need to add public library functions too because they can be called
+					// internally by internal library functions that are considered free functions.
+					m_freeFunctions.insert(function);
 }
 
 void SMTEncoder::createFreeConstants(set<SourceUnit const*, ASTNode::CompareByID> const& _sources)
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 5bc9a0be90..1d61091767 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -29,6 +29,10 @@ using namespace solidity::frontend::test;
 
 SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, EVMVersion{})
 {
+	auto contract = m_reader.stringSetting("SMTContract", "");
+	if (!contract.empty())
+		m_modelCheckerSettings.contracts.contracts[""] = {contract};
+
 	auto const& showUnproved = m_reader.stringSetting("SMTShowUnproved", "yes");
 	if (showUnproved == "no")
 		m_modelCheckerSettings.showUnproved = false;
diff --git a/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_1.sol b/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_1.sol
new file mode 100644
index 0000000000..fd763b8c55
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_1.sol
@@ -0,0 +1,26 @@
+library L {
+    function f1(uint x) public pure {
+        assert(x > 0); // should fail
+    }
+    function f(uint x) internal pure { f1(x); }
+}
+
+contract C {
+    function g(uint x) external pure {
+        // This should trigger the assertion failure
+        // since it calls `f` internally, which calls
+        // `f1` internally.
+        return L.f(x);
+    }
+
+    function h(uint x) external pure {
+        // This should not trigger the assertion failure
+        // since it delegatecalls and that's not supported.
+        return L.f1(x);
+    }
+}
+// ====
+// SMTContract: C
+// ----
+// Warning 4588: (533-540): Assertion checker does not yet implement this type of function call.
+// Warning 6328: (58-71): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)\n    L.f(0) -- internal call\n        L.f1(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_2.sol b/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_2.sol
new file mode 100644
index 0000000000..c0c62c2468
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/functions/library_public_called_as_internal_2.sol
@@ -0,0 +1,24 @@
+library L {
+    function f1(uint x) public pure {
+        assert(x > 0); // should fail
+    }
+    function f() internal pure {
+        f1(0); // should cause the assertion in `f1` to fail
+    }
+    function g() internal pure {
+        f1(1); // should not cause the assertion in `f1` to fail
+    }
+}
+
+contract C {
+    function f() external pure {
+        return L.f(); // should cause the assertion to fail
+    }
+    function g() external pure {
+        return L.g(); // should not cause the assertion to fail
+    }
+}
+// ====
+// SMTContract: C
+// ----
+// Warning 6328: (58-71): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()\n    L.f() -- internal call\n        L.f1(0) -- internal call

From a5dab6181ca7a2ba19be2c0f8a914be46e0c8410 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 28 Nov 2022 16:59:35 +0100
Subject: [PATCH 1059/1748] Fix internal error when the abstract-nondet
 SMTChecker natspec annotation is used with a wrong option multiple times for
 the same function

---
 Changelog.md                                           |  1 +
 libsolidity/formal/CHC.cpp                             |  6 +++++-
 .../natspec/natspec_smtchecker_multi_errors_1.sol      | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_multi_errors_1.sol

diff --git a/Changelog.md b/Changelog.md
index 9d8a942ae9..4ac7a0d268 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -24,6 +24,7 @@ Bugfixes:
  * SMTChecker: Fix display error for negative integers that are one more than powers of two.
  * SMTChecker: Improved readability for large integers that are powers of two or almost powers of two in error messages.
  * SMTChecker: Fix internal error when a public library function is called internally.
+ * SMTChecker: Fix internal error on multiple wrong SMTChecker natspec entries.
 
 
 ### 0.8.17 (2022-09-08)
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 2baedde125..83602ace34 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1102,14 +1102,18 @@ set<CHC::CHCNatspecOption> CHC::smtNatspecTags(FunctionDefinition const& _functi
 {
 	set<CHC::CHCNatspecOption> options;
 	string smtStr = "custom:smtchecker";
+	bool errorSeen = false;
 	for (auto const& [tag, value]: _function.annotation().docTags)
 		if (tag == smtStr)
 		{
 			string const& content = value.content;
 			if (auto option = natspecOptionFromString(content))
 				options.insert(*option);
-			else
+			else if (!errorSeen)
+			{
+				errorSeen = true;
 				m_errorReporter.warning(3130_error, _function.location(), "Unknown option for \"" + smtStr + "\": \"" + content + "\"");
+			}
 		}
 	return options;
 }
diff --git a/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_multi_errors_1.sol b/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_multi_errors_1.sol
new file mode 100644
index 0000000000..a19923c9cb
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/natspec/natspec_smtchecker_multi_errors_1.sol
@@ -0,0 +1,10 @@
+contract C {
+    /// @custom:smtchecker b
+    /// @custom:smtchecker
+    /// @custom:smtchecker a b c
+    function f() internal {}
+}
+
+contract D is C {}
+// ----
+// Warning 3130: (106-130): Unknown option for "custom:smtchecker": "b"

From eb550d839e0a3253ad5e02165d22ed3221fe37e7 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Sat, 26 Nov 2022 01:43:31 +0100
Subject: [PATCH 1060/1748] Modify stale pr action to also close old stale
 issues
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 .github/workflows/stale-pull-requests.yml | 37 +++++++++++++++--------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/stale-pull-requests.yml b/.github/workflows/stale-pull-requests.yml
index 70ab24c0ee..2e572c2096 100644
--- a/.github/workflows/stale-pull-requests.yml
+++ b/.github/workflows/stale-pull-requests.yml
@@ -1,4 +1,4 @@
-name: Check stale pull requests
+name: Check stale issues and pull requests
 
 on:
   workflow_dispatch:
@@ -6,12 +6,14 @@ on:
     - cron: '0 12 * * *'
 
 permissions:
-  issues: read
+  issues: write
   pull-requests: write
 
 env:
-  BEFORE_STALE: 14
-  BEFORE_CLOSE: 7
+  BEFORE_ISSUE_STALE: 180
+  BEFORE_ISSUE_CLOSE: 0 #FIXME: change to 14 days
+  BEFORE_PR_STALE: 14
+  BEFORE_PR_CLOSE: 7
 
 jobs:
   stale:
@@ -19,19 +21,28 @@ jobs:
     steps:
       - uses: actions/stale@v6
         with:
-          debug-only: false
-          # disable issues
-          days-before-issue-stale: -1
-          days-before-issue-close: -1
+          debug-only: true
+          days-before-issue-stale: ${{ env.BEFORE_ISSUE_STALE }}
+          days-before-issue-close: ${{ env.BEFORE_ISSUE_CLOSE }}
+          stale-issue-message: |
+            This issue has been marked as stale due to inactivity for the last ${{ env.BEFORE_ISSUE_STALE }} days.
+            It will be automatically closed in ${{ env.BEFORE_ISSUE_CLOSE }} days.
+          close-issue-message: |
+            Hi everyone! This issue has been closed due to inactivity.
+            If you think this issue is still relevant in the latest Solidity version and you have something to [contribute](https://docs.soliditylang.org/en/latest/contributing.html), feel free to reopen.
+            However, unless the issue is a concrete proposal that can be implemented, we recommend starting a language discussion on the [forum](https://forum.soliditylang.org) instead.
+          stale-issue-label: stale
+          close-issue-label: closed-due-inactivity
+          exempt-issue-labels: 'bug :bug:,roadmap,selected-for-development,must have'
           stale-pr-message: |
-            This pull request is stale because it has been open for ${{ env.BEFORE_STALE }} days with no activity.
-            It will be closed in ${{ env.BEFORE_CLOSE }} days unless the `stale` label is removed.
+            This pull request is stale because it has been open for ${{ env.BEFORE_PR_STALE }} days with no activity.
+            It will be closed in ${{ env.BEFORE_PR_CLOSE }} days unless the `stale` label is removed.
           close-pr-message: |
-            This pull request was closed due to a lack of activity for ${{ env.BEFORE_CLOSE }} days after it was stale.
+            This pull request was closed due to a lack of activity for ${{ env.BEFORE_PR_CLOSE }} days after it was stale.
           stale-pr-label: stale
           close-pr-label: closed-due-inactivity
-          days-before-pr-stale: ${{ env.BEFORE_STALE }}
-          days-before-pr-close: ${{ env.BEFORE_CLOSE }}
+          days-before-pr-stale: ${{ env.BEFORE_PR_STALE }}
+          days-before-pr-close: ${{ env.BEFORE_PR_CLOSE }}
           exempt-pr-labels: 'external contribution :star:,roadmap,epic'
           exempt-draft-pr: true
           exempt-all-milestones: true

From 0407ef744ac253dee59ad5f5fa2e2be022365b57 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 28 Nov 2022 17:59:45 +0100
Subject: [PATCH 1061/1748] Rename stale action

---
 .github/workflows/{stale-pull-requests.yml => stale.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{stale-pull-requests.yml => stale.yml} (100%)

diff --git a/.github/workflows/stale-pull-requests.yml b/.github/workflows/stale.yml
similarity index 100%
rename from .github/workflows/stale-pull-requests.yml
rename to .github/workflows/stale.yml

From 07870d031894505132843555652f88f4cdf45874 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 28 Nov 2022 18:45:50 +0100
Subject: [PATCH 1062/1748] Fix internal error in assignment chains that also
 assign to fully qualified state variables (, for example), where the contract
 expression is a tuble.

---
 Changelog.md                                  |  1 +
 libsolidity/formal/SMTEncoder.cpp             |  4 +++-
 .../assignment_chain_tuple_contract_1.sol     | 10 +++++++++
 .../assignment_chain_tuple_contract_2.sol     | 13 +++++++++++
 .../assignment_chain_tuple_contract_3.sol     | 22 +++++++++++++++++++
 5 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol

diff --git a/Changelog.md b/Changelog.md
index 4ac7a0d268..a78a8a5c5d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -25,6 +25,7 @@ Bugfixes:
  * SMTChecker: Improved readability for large integers that are powers of two or almost powers of two in error messages.
  * SMTChecker: Fix internal error when a public library function is called internally.
  * SMTChecker: Fix internal error on multiple wrong SMTChecker natspec entries.
+ * SMTChecker: Fix internal error on chain assignments using static fully specified state variables.
 
 
 ### 0.8.17 (2022-09-08)
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 818ac9278e..8d758e7840 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -2757,7 +2757,9 @@ VariableDeclaration const* SMTEncoder::identifierToVariable(Expression const& _e
 		}
 	// But we are interested in "contract.var", because that is the same as just "var".
 	if (auto const* memberAccess = dynamic_cast<MemberAccess const*>(&_expr))
-		if (dynamic_cast<ContractDefinition const*>(expressionToDeclaration(memberAccess->expression())))
+		if (dynamic_cast<ContractDefinition const*>(expressionToDeclaration(
+			*cleanExpression(memberAccess->expression())
+		)))
 			if (auto const* varDecl = dynamic_cast<VariableDeclaration const*>(memberAccess->annotation().referencedDeclaration))
 			{
 				solAssert(m_context.knownVariable(*varDecl), "");
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_1.sol b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_1.sol
new file mode 100644
index 0000000000..a0fd84c935
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_1.sol
@@ -0,0 +1,10 @@
+contract C {
+    string public name = (C).name = type(C).name;
+
+    function f() external view {
+        assert(keccak256(bytes(name)) == keccak256(bytes("C"))); // should fail because SMTChecker doesn't support type(C).name
+    }
+}
+// ----
+// Warning 7507: (49-61): Assertion checker does not yet support this expression.
+// Warning 6328: (105-160): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
new file mode 100644
index 0000000000..4c97f8a698
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
@@ -0,0 +1,13 @@
+contract C {
+    uint x = ((((C)))).x = ((C)).x = 2;
+
+    function f() external view {
+        assert(x == 2); // should hold
+    }
+
+    function g() external view {
+        assert(x != 2); // should fail
+    }
+}
+// ----
+// Warning 6328: (174-188): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 2\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol
new file mode 100644
index 0000000000..08b87282e0
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol
@@ -0,0 +1,22 @@
+contract C {
+    uint x = ((((C)))).x = ((C)).x = 2;
+
+    function f() external view {
+        assert(x == 2); // should fail for D
+    }
+
+    function g() external view {
+        assert(x != 2); // should fail for C
+    }
+}
+
+contract D is C {
+    uint y = ((C)).x = 3;
+
+    function h() external view {
+        assert(y == 3); // should hold
+    }
+}
+// ----
+// Warning 6328: (95-109): CHC: Assertion violation happens here.\nCounterexample:\ny = 3, x = 3\n\nTransaction trace:\nD.constructor()\nState: y = 3, x = 3\nC.f()
+// Warning 6328: (180-194): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 2\nC.g()

From be8b05e6bfed1cbf14c6caaae01085ced1984238 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 28 Nov 2022 18:59:51 +0100
Subject: [PATCH 1063/1748] Make isoltest not check SMTChecker counterexamples
 by default.

---
 test/libsolidity/SMTCheckerTest.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 1d61091767..e3e52491dd 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -63,7 +63,7 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	if (m_modelCheckerSettings.solvers.none() || m_modelCheckerSettings.engine.none())
 		m_shouldRun = false;
 
-	auto const& ignoreCex = m_reader.stringSetting("SMTIgnoreCex", "no");
+	auto const& ignoreCex = m_reader.stringSetting("SMTIgnoreCex", "yes");
 	if (ignoreCex == "no")
 		m_ignoreCex = false;
 	else if (ignoreCex == "yes")
@@ -129,5 +129,8 @@ void SMTCheckerTest::filterObtainedErrors()
 	};
 
 	if (m_ignoreCex)
+	{
+		removeCex(m_expectations);
 		removeCex(m_errorList);
+	}
 }

From 15b062e4669208f0ae1c9878ca93c6a76dcd1e3f Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 28 Nov 2022 21:06:51 +0100
Subject: [PATCH 1064/1748] Fix emscripten docker hash

---
 scripts/build_emscripten.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index fe830dc582..ca99e74a30 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -37,5 +37,5 @@ fi
 # NOTE: Without `safe.directory` git would assume it's not safe to operate on /root/project since it's owned by a different user.
 # See https://github.blog/2022-04-12-git-security-vulnerability-announced/
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:f1c13f3450d1f2e53ea18ac1ac1a17e932573cb9a5ccd0fd9ef6dd44f6402fa9 \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:d7d4ec28cdc3e61fc6a048b88ebdff1c5e67f3353cf1739cbaea07ec2481eb16 \
     /bin/bash -c "git config --global --add safe.directory /root/project && ./scripts/ci/build_emscripten.sh ${params}"

From 608b424afcd2339367ab60d24a591defc0ef8f68 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 29 Nov 2022 13:00:51 +0100
Subject: [PATCH 1065/1748] Fix internal error when using user defined value
 types as mapping indices or struct members.

---
 Changelog.md                                  |  1 +
 libsolidity/formal/SMTEncoder.cpp             |  5 ++-
 libsolidity/formal/SymbolicTypes.cpp          | 32 ++++++++++++++++++
 .../userTypes/user_type_as_array_elem_1.sol   | 16 +++++++++
 .../userTypes/user_type_as_array_elem_2.sol   | 16 +++++++++
 .../user_type_as_library_constant_1.sol       | 25 ++++++++++++++
 .../user_type_as_library_constant_2.sol       | 33 +++++++++++++++++++
 .../user_type_as_mapping_index_1.sol          | 20 +++++++++++
 .../user_type_as_mapping_index_2.sol          | 20 +++++++++++
 .../user_type_as_struct_member_1.sol          | 25 ++++++++++++++
 10 files changed, 192 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol

diff --git a/Changelog.md b/Changelog.md
index a78a8a5c5d..f075e4c325 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -26,6 +26,7 @@ Bugfixes:
  * SMTChecker: Fix internal error when a public library function is called internally.
  * SMTChecker: Fix internal error on multiple wrong SMTChecker natspec entries.
  * SMTChecker: Fix internal error on chain assignments using static fully specified state variables.
+ * SMTChecker: Fix internal error when using user defined types as mapping indices or struct members.
 
 
 ### 0.8.17 (2022-09-08)
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 8d758e7840..adae214120 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -1403,7 +1403,10 @@ bool SMTEncoder::visit(MemberAccess const& _memberAccess)
 		{
 			if (auto const* var = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
 			{
-				defineExpr(_memberAccess, currentValue(*var));
+				if (var->isConstant())
+					defineExpr(_memberAccess, constantExpr(_memberAccess, *var));
+				else
+					defineExpr(_memberAccess, currentValue(*var));
 				return false;
 			}
 		}
diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
index e40ff92451..d40b51cea4 100644
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ b/libsolidity/formal/SymbolicTypes.cpp
@@ -35,6 +35,9 @@ namespace solidity::frontend::smt
 
 SortPointer smtSort(frontend::Type const& _type)
 {
+	if (auto userType = dynamic_cast<UserDefinedValueType const*>(&_type))
+		return smtSort(userType->underlyingType());
+
 	switch (smtKind(_type))
 	{
 	case Kind::Int:
@@ -194,6 +197,9 @@ vector<SortPointer> smtSortAbstractFunction(vector<frontend::Type const*> const&
 
 Kind smtKind(frontend::Type const& _type)
 {
+	if (auto userType = dynamic_cast<UserDefinedValueType const*>(&_type))
+		return smtKind(userType->underlyingType());
+
 	if (isNumber(_type))
 		return Kind::Int;
 	else if (isBool(_type))
@@ -210,6 +216,9 @@ Kind smtKind(frontend::Type const& _type)
 
 bool isSupportedType(frontend::Type const& _type)
 {
+	if (auto userType = dynamic_cast<UserDefinedValueType const*>(&_type))
+		return isSupportedType(userType->underlyingType());
+
 	return isNumber(_type) ||
 		isBool(_type) ||
 		isMapping(_type) ||
@@ -402,6 +411,9 @@ smtutil::Expression minValue(frontend::IntegerType const& _type)
 
 smtutil::Expression minValue(frontend::Type const* _type)
 {
+	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
+		return minValue(&userType->underlyingType());
+
 	solAssert(isNumber(*_type), "");
 	if (auto const* intType = dynamic_cast<IntegerType const*>(_type))
 		return intType->minValue();
@@ -424,6 +436,9 @@ smtutil::Expression maxValue(frontend::IntegerType const& _type)
 
 smtutil::Expression maxValue(frontend::Type const* _type)
 {
+	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
+		return maxValue(&userType->underlyingType());
+
 	solAssert(isNumber(*_type), "");
 	if (auto const* intType = dynamic_cast<IntegerType const*>(_type))
 		return intType->maxValue();
@@ -455,6 +470,10 @@ void setSymbolicZeroValue(smtutil::Expression _expr, frontend::Type const* _type
 smtutil::Expression zeroValue(frontend::Type const* _type)
 {
 	solAssert(_type, "");
+
+	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
+		return zeroValue(&userType->underlyingType());
+
 	if (isSupportedType(*_type))
 	{
 		if (isNumber(*_type))
@@ -507,6 +526,9 @@ smtutil::Expression zeroValue(frontend::Type const* _type)
 
 bool isSigned(frontend::Type const* _type)
 {
+	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
+		return isSigned(&userType->underlyingType());
+
 	solAssert(smt::isNumber(*_type), "");
 	bool isSigned = false;
 	if (auto const* numberType = dynamic_cast<RationalNumberType const*>(_type))
@@ -530,6 +552,9 @@ bool isSigned(frontend::Type const* _type)
 
 pair<unsigned, bool> typeBvSizeAndSignedness(frontend::Type const* _type)
 {
+	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
+		return typeBvSizeAndSignedness(&userType->underlyingType());
+
 	if (auto const* intType = dynamic_cast<IntegerType const*>(_type))
 		return {intType->numBits(), intType->isSigned()};
 	else if (auto const* fixedType = dynamic_cast<FixedPointType const*>(_type))
@@ -553,6 +578,10 @@ void setSymbolicUnknownValue(smtutil::Expression _expr, frontend::Type const* _t
 smtutil::Expression symbolicUnknownConstraints(smtutil::Expression _expr, frontend::Type const* _type)
 {
 	solAssert(_type, "");
+
+	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
+		return symbolicUnknownConstraints(std::move(_expr), &userType->underlyingType());
+
 	if (isEnum(*_type) || isInteger(*_type) || isAddress(*_type) || isFixedBytes(*_type))
 		return _expr >= minValue(_type) && _expr <= maxValue(_type);
 	else if (
@@ -569,6 +598,9 @@ smtutil::Expression symbolicUnknownConstraints(smtutil::Expression _expr, fronte
 
 optional<smtutil::Expression> symbolicTypeConversion(frontend::Type const* _from, frontend::Type const* _to)
 {
+	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_to))
+		return symbolicTypeConversion(_from, &userType->underlyingType());
+
 	if (_to && _from)
 		// StringLiterals are encoded as SMT arrays in the generic case,
 		// but they can also be compared/assigned to fixed bytes, in which
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
new file mode 100644
index 0000000000..55a88fd7e2
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
@@ -0,0 +1,16 @@
+contract C {
+    type T is address;
+    T[] arr;
+
+    function p() public {
+        arr.push(T.wrap(address(42)));
+    }
+
+    function inv(uint i) external view {
+        require(i < arr.length);
+        assert(T.unwrap(arr[i]) == address(42)); // should hold
+    }
+}
+// ----
+// Warning 6328: (204-243): CHC: Assertion violation might happen here.
+// Warning 4661: (204-243): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol
new file mode 100644
index 0000000000..8ac6493661
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol
@@ -0,0 +1,16 @@
+contract C {
+    type T is address;
+    T[] arr;
+
+    function p() public {
+        arr.push(T.wrap(address(42)));
+    }
+
+    function inv2() external view {
+        if (arr.length > 0) {
+            assert(T.unwrap(arr[0]) == address(0)); // should fail
+        }
+    }
+}
+// ----
+// Warning 6328: (200-238): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.p()\nC.inv2()
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol
new file mode 100644
index 0000000000..3088a894b6
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol
@@ -0,0 +1,25 @@
+type T is bool;
+library L{
+    T constant c = T.wrap(true);
+    uint constant z = 42;
+}
+T constant g = T.wrap(true);
+
+contract C {
+    T constant b = T.wrap(true);
+    uint constant X = 42;
+
+    function f() external pure {
+        T x = T.wrap(true);
+        assert(T.unwrap(x)); // should hold
+
+        assert(L.z == 42); // should hold
+        assert(T.unwrap(L.c)); // should hold
+
+        assert(T.unwrap(g)); // should hold
+
+        assert(C.X == 42); // should hold
+        assert(T.unwrap(b)); // should hold
+        assert(T.unwrap(C.b)); // should hold
+    }
+}
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_2.sol
new file mode 100644
index 0000000000..5b7ebe2570
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_2.sol
@@ -0,0 +1,33 @@
+type T is bool;
+library L{
+    T constant c = T.wrap(false);
+    uint constant z = 43;
+}
+T constant g = T.wrap(false);
+
+contract C {
+    T constant b = T.wrap(false);
+    uint constant X = 43;
+
+    function f() external pure {
+        T x = T.wrap(false);
+        assert(T.unwrap(x)); // should fail
+
+        assert(L.z == 42); // should fail
+        assert(T.unwrap(L.c)); // should fail
+
+        assert(T.unwrap(g)); // should fail
+
+        assert(C.X == 42); // should fail
+        assert(T.unwrap(b)); // should fail
+        assert(T.unwrap(C.b)); // should fail
+    }
+}
+// ----
+// Warning 6328: (264-283): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
+// Warning 6328: (309-326): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
+// Warning 6328: (351-372): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
+// Warning 6328: (398-417): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
+// Warning 6328: (443-460): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
+// Warning 6328: (485-504): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
+// Warning 6328: (529-550): CHC: Assertion violation happens here.\nCounterexample:\nX = 43\n\nTransaction trace:\nC.constructor()\nState: X = 43\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol
new file mode 100644
index 0000000000..f1b6a79861
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol
@@ -0,0 +1,20 @@
+contract C {
+    type T is bool;
+    mapping (T => uint) s;
+
+    constructor() {
+        s[C.T.wrap(true)] = 42;
+        s[C.T.wrap(false)] = 2;
+    }
+
+    function f(bool b) external view {
+        assert(s[C.T.wrap(b)] > 0); // should hold
+    }
+
+    function g(T b) external view {
+        require(C.T.unwrap(b));
+        assert(s[b] == 2); // should fail
+    }
+}
+// ----
+// Warning 6328: (325-342): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\n\nTransaction trace:\nC.constructor()\nC.g(true)
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol
new file mode 100644
index 0000000000..1e53a35473
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol
@@ -0,0 +1,20 @@
+contract C {
+    type T is address;
+    mapping (T => uint) s;
+
+    constructor() {
+        s[T.wrap(address(0))] = 42;
+    }
+
+    function f(address a) external view {
+        require(a != address(0));
+        assert(s[C.T.wrap(a)] == 0); // should hold
+    }
+
+    function g(T a) external view {
+        require(C.T.unwrap(a) == address(0));
+        assert(s[a] != 42); // should fail
+    }
+}
+// ----
+// Warning 6328: (352-370): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x0\n\nTransaction trace:\nC.constructor()\nC.g(0x0)
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
new file mode 100644
index 0000000000..1a72cad3da
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
@@ -0,0 +1,25 @@
+contract C {
+    type T is address;
+
+    struct S {
+        T a;
+        uint x;
+    }
+
+    mapping (T => S) m;
+
+    constructor() {
+        m[T.wrap(address(0))] = S(T.wrap(address(0)), 0);
+    }
+
+    function set(address _a) external {
+        m[T.wrap(_a)] = S(T.wrap(_a), 0);
+    }
+
+    function inv(T t) external view {
+        assert( // should hold
+            T.unwrap(m[t].a) == T.unwrap(t) ||
+            T.unwrap(m[t].a) == address(0)
+        );
+    }
+}

From e31488ff7cb0e7da41077601109416dd48769bda Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 28 Nov 2022 21:07:25 +0100
Subject: [PATCH 1066/1748] Prefer old issues/prs and only issues already
 labeled as stale
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 .github/workflows/stale.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 2e572c2096..ede9ebe6f6 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -10,7 +10,7 @@ permissions:
   pull-requests: write
 
 env:
-  BEFORE_ISSUE_STALE: 180
+  BEFORE_ISSUE_STALE: 334
   BEFORE_ISSUE_CLOSE: 0 #FIXME: change to 14 days
   BEFORE_PR_STALE: 14
   BEFORE_PR_CLOSE: 7
@@ -31,6 +31,8 @@ jobs:
             Hi everyone! This issue has been closed due to inactivity.
             If you think this issue is still relevant in the latest Solidity version and you have something to [contribute](https://docs.soliditylang.org/en/latest/contributing.html), feel free to reopen.
             However, unless the issue is a concrete proposal that can be implemented, we recommend starting a language discussion on the [forum](https://forum.soliditylang.org) instead.
+          any-of-issue-labels: stale # TODO: remove this when we're done with closing ancient issues
+          ascending: true # TODO: remove this when we're done with closing ancient issues
           stale-issue-label: stale
           close-issue-label: closed-due-inactivity
           exempt-issue-labels: 'bug :bug:,roadmap,selected-for-development,must have'

From 35f4456be2b7693868cd0298fff5b0bf6aa6c859 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Tue, 29 Nov 2022 14:38:33 +0100
Subject: [PATCH 1067/1748] Ensure that stale label is not removed from
 processed ancient issues

---
 .github/workflows/stale.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index ede9ebe6f6..b63a6915e9 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -48,5 +48,6 @@ jobs:
           exempt-pr-labels: 'external contribution :star:,roadmap,epic'
           exempt-draft-pr: true
           exempt-all-milestones: true
-          remove-stale-when-updated: true
+          # remove-stale-when-updated: true # TODO: uncomment and remove the line below when we're done with closing ancient issues
+          remove-issue-stale-when-updated: false
           operations-per-run: 128

From d0fb8c2e87abb8b5b429acd5e0ce1812bc956017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 25 Nov 2022 21:36:53 +0100
Subject: [PATCH 1068/1748] Fix another instance of the spurious unreachable
 warning, this time in SemVerMatcher

---
 test/libsolidity/SemVerMatcher.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/libsolidity/SemVerMatcher.cpp b/test/libsolidity/SemVerMatcher.cpp
index e1ad89445f..fe82854e69 100644
--- a/test/libsolidity/SemVerMatcher.cpp
+++ b/test/libsolidity/SemVerMatcher.cpp
@@ -75,6 +75,9 @@ SemVerMatchExpression parseExpression(string const& _input)
 		// Ignored, since a test case should have a parsable version
 		soltestAssert(false);
 	}
+
+	// FIXME: Workaround for spurious GCC 12.1 warning (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105794)
+	util::unreachable();
 }
 
 }

From fdf4ec581f343b60c1ea69010d8c7cdff48e9755 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 25 Nov 2022 20:12:07 +0100
Subject: [PATCH 1069/1748] Update the review checklist to address common
 external PR problems

---
 ReviewChecklist.md | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/ReviewChecklist.md b/ReviewChecklist.md
index 2f4860fb84..c44c562156 100644
--- a/ReviewChecklist.md
+++ b/ReviewChecklist.md
@@ -7,6 +7,12 @@ and solve common issues before they are pointed out in the review.
 It is also meant to serve as a final checklist for reviewers to go through before approving a PR.
 
 ## Before You Submit a PR
+- [ ] **Do you have any other open PRs?**
+    Work on a PR is not done until it is merged or closed.
+    Our reviewing capacity is limited, so we require that external contributors work on **no more than one PR at a time**.
+    - If your PR is not getting reviewed, feel free to bring it to our attention on the [#solidity-dev](https://gitter.im/ethereum/solidity-dev) channel.
+    - Unless they were requested, we are going to close any excess PRs, leaving only the earliest one open.
+        You may reopen them, one at a time, when your current PR is done.
 - [ ] **Is the issue ready to be worked on?**
     - If the issue does not have a desirability label (`nice to have`, `should have`,
         `must have eventually`, `must have`, `roadmap`) we have not yet decided whether to implement it.
@@ -34,6 +40,26 @@ It is also meant to serve as a final checklist for reviewers to go through befor
     - Review updated files before committing them.
         **Are expectations correct and do updated tests still serve their purpose?**
 
+## Abandoned PRs
+- [ ] **Is the submitter still responsive?**
+    - If the PR had no activity from the submitter in the last 2 weeks (despite receiving reviews and our prompts) we consider it abandoned.
+- [ ] **Is the abandoned PR easy to finish or relevant?**
+    - Apply the `takeover` label if the PR can be finished without significant effort or is something that actually needs to be done right now.
+        Otherwise close it.
+        It can still be taken over later or reopened by the submitter but until then we should not be getting sidetracked by it.
+
+## Light Review
+Before an in-depth review, it is recommended to give new PRs a quick, superficial review, which
+is not meant to provide complete and detailed feedback, but instead give the submitter a rough idea
+if the PR is even on the right track and let them solve the obvious problems on their own.
+
+Light review should focus on the following three areas:
+- [ ] **Are there any obvious mistakes?** Style issues, bad practices, easy to identify bugs, etc.
+- [ ] **Is there anything missing?** Tests (of the right kind), documentation, etc. Does it address the whole issue?
+- [ ] **Is it the right solution?** Are there better ways to do this? Is the change even necessary?
+
+If the answers above are "Yes, Yes, No", thank the contributor for their effort and **close the PR**.
+
 ## Coding Style and Good Practices
 - [ ] Does the PR follow our [coding style](CODING_STYLE.md)?
 

From dbc1bc1515727bbaa491c21766320033da1ba261 Mon Sep 17 00:00:00 2001
From: Sabnock <24715302+Sabnock01@users.noreply.github.com>
Date: Tue, 29 Nov 2022 17:39:57 -0600
Subject: [PATCH 1070/1748] Array member clarification (#13763)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* clarify array members

Co-authored-by: Kamil Śliwak <cameel2@gmail.com>
---
 docs/types/reference-types.rst | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index a6b5728c95..6a7667b6b9 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -133,9 +133,13 @@ It is possible to mark state variable arrays ``public`` and have Solidity create
 The numeric index becomes a required parameter for the getter.
 
 Accessing an array past its end causes a failing assertion. Methods ``.push()`` and ``.push(value)`` can be used
-to append a new element at the end of the array, where ``.push()`` appends a zero-initialized element and returns
+to append a new element at the end of a dynamically-sized array, where ``.push()`` appends a zero-initialized element and returns
 a reference to it.
 
+.. note::
+    Dynamically-sized arrays can only be resized in storage.
+    In memory, such arrays can be of arbitrary size but the size cannot be changed once an array is allocated.
+
 .. index:: ! string, ! bytes
 
 .. _strings:

From 77698f8108e6fad115d46d37fdc6de0592607a4a Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 29 Nov 2022 13:14:40 +0100
Subject: [PATCH 1071/1748] Fix internal error when deleting struct member of
 function type

---
 Changelog.md                                  |  1 +
 libsolidity/formal/SMTEncoder.cpp             | 19 ++++++++-----------
 .../abi/abi_encode_function.sol               |  1 -
 .../functions/getters/function.sol            |  5 +++--
 .../functions/getters/struct_4.sol            |  3 ++-
 .../imports/import_library_2.sol              |  2 +-
 .../operators/delete_function_type_1.sol      | 16 ++++++++++++++++
 .../operators/delete_function_type_2.sol      | 13 +++++++++++++
 .../operators/delete_function_type_3.sol      | 19 +++++++++++++++++++
 .../types/address_transfer.sol                |  2 +-
 .../types/array_dynamic_2_fail.sol            |  2 +-
 .../types/array_dynamic_3_fail.sol            |  2 +-
 12 files changed, 66 insertions(+), 19 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol

diff --git a/Changelog.md b/Changelog.md
index f075e4c325..17294f6b22 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -27,6 +27,7 @@ Bugfixes:
  * SMTChecker: Fix internal error on multiple wrong SMTChecker natspec entries.
  * SMTChecker: Fix internal error on chain assignments using static fully specified state variables.
  * SMTChecker: Fix internal error when using user defined types as mapping indices or struct members.
+ * SMTChecker: Fix internal error when deleting struct member of function type.
 
 
 ### 0.8.17 (2022-09-08)
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index adae214120..eea4597374 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -586,15 +586,6 @@ bool SMTEncoder::visit(FunctionCall const& _funCall)
 			arg->accept(*this);
 		return false;
 	}
-	else if (funType.kind() == FunctionType::Kind::ABIEncodeCall)
-	{
-		auto fun = _funCall.arguments().front();
-		createExpr(*fun);
-		auto const* functionType = dynamic_cast<FunctionType const*>(fun->annotation().type);
-		if (functionType->hasDeclaration())
-			defineExpr(*fun, functionType->externalIdentifier());
-		return true;
-	}
 
 	// We do not really need to visit the expression in a wrap/unwrap no-op call,
 	// so we just ignore the function call expression to avoid "unsupported" warnings.
@@ -1323,11 +1314,17 @@ void SMTEncoder::endVisit(Return const& _return)
 
 bool SMTEncoder::visit(MemberAccess const& _memberAccess)
 {
+	createExpr(_memberAccess);
+
 	auto const& accessType = _memberAccess.annotation().type;
 	if (accessType->category() == Type::Category::Function)
-		return true;
+	{
+		auto const* functionType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type);
+		if (functionType && functionType->hasDeclaration())
+			defineExpr(_memberAccess, functionType->externalIdentifier());
 
-	createExpr(_memberAccess);
+		return true;
+	}
 
 	Expression const* memberExpr = innermostTuple(_memberAccess.expression());
 
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol
index 1a3c71982a..2bce234d4d 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_function.sol
@@ -6,4 +6,3 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6031: (54-60): Internal error: Expression undefined for SMT solver.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/function.sol b/test/libsolidity/smtCheckerTests/functions/getters/function.sol
index 95680f13d1..a5339f7a89 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/function.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/function.sol
@@ -15,5 +15,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (152-170): CHC: Assertion violation happens here.\nCounterexample:\ng = 0\ne = 0\n\nTransaction trace:\nC.constructor()\nState: g = 0\nC.f()\n    e() -- untrusted external call\n    g() -- untrusted external call
-// Warning 6328: (262-278): CHC: Assertion violation happens here.\nCounterexample:\ng = 0\ne = 0\n\nTransaction trace:\nC.constructor()\nState: g = 0\nC.f()\n    e() -- untrusted external call\n    g() -- untrusted external call\n    e() -- untrusted external call
+// Warning 8364: (140-146): Assertion checker does not yet implement type function () view external returns (function () external returns (uint256))
+// Warning 6328: (152-170): CHC: Assertion violation happens here.
+// Warning 6328: (262-278): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol
index 73c2fcc573..3e300edbb6 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol
@@ -19,4 +19,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 2072: (146-183): Unused local variable.
-// Warning 6328: (234-269): CHC: Assertion violation happens here.\nCounterexample:\ns = {d: 0, f: 0}\nd = 0\nf = 0\n\nTransaction trace:\nC.constructor()\nState: s = {d: 0, f: 0}\nC.test()
+// Warning 8364: (187-193): Assertion checker does not yet implement type function () view external returns (contract D,function () external returns (uint256))
+// Warning 6328: (234-269): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/imports/import_library_2.sol b/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
index 4d33d40023..acf2acda43 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
@@ -25,4 +25,4 @@ contract ERC20 {
 // ====
 // SMTEngine: all
 // ----
-// Warning 3944: (ERC20.sol:157-162): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\n\namount = 1\n\nTransaction trace:\nERC20.constructor()\nERC20.transferFrom(1){ msg.sender: 0x52f6 }\n    SafeMath.sub(0, 1) -- internal call
+// Warning 3944: (ERC20.sol:157-162): CHC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol b/test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol
new file mode 100644
index 0000000000..b6bc1f6a04
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol
@@ -0,0 +1,16 @@
+struct S {
+    function() e;
+}
+
+contract C {
+    S s;
+    function() f;
+
+    constructor() {
+        delete s.e;
+        assert(s.e == f); // should fail for now because function pointer comparisons are not supported
+    }
+}
+// ----
+// Warning 7229: (128-136): Assertion checker does not yet implement the type function () for comparisons
+// Warning 6328: (121-137): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol b/test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol
new file mode 100644
index 0000000000..ee7497aca0
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol
@@ -0,0 +1,13 @@
+contract C {
+    mapping (uint => function()) m;
+    function() f;
+
+    constructor() {
+        m[2] = f;
+        delete m[2];
+        assert(m[2] == f); // should fail for now because function pointer comparisons are not supported
+    }
+}
+// ----
+// Warning 7229: (142-151): Assertion checker does not yet implement the type function () for comparisons
+// Warning 6328: (135-152): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol b/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol
new file mode 100644
index 0000000000..b334b982ec
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol
@@ -0,0 +1,19 @@
+contract C {
+    function()[] arr;
+    function() f;
+
+    constructor() {
+        arr.push();
+        arr.push();
+        arr[1] = f;
+        delete arr[1];
+        assert(arr[1] == f); // should fail for now because function pointer comparisons are not supported
+    }
+}
+// ----
+// Warning 8364: (82-90): Assertion checker does not yet implement type function (function ()[] storage pointer) returns (function ())
+// Warning 8364: (102-110): Assertion checker does not yet implement type function (function ()[] storage pointer) returns (function ())
+// Warning 7229: (172-183): Assertion checker does not yet implement the type function () for comparisons
+// Warning 6368: (149-155): CHC: Out of bounds access happens here.
+// Warning 6368: (172-178): CHC: Out of bounds access happens here.
+// Warning 6328: (165-184): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer.sol b/test/libsolidity/smtCheckerTests/types/address_transfer.sol
index 654c249699..89e8ae1027 100644
--- a/test/libsolidity/smtCheckerTests/types/address_transfer.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_transfer.sol
@@ -11,5 +11,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (162-186): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x0\nx = 100\n\nTransaction trace:\nC.constructor()\nC.f(0x0)
+// Warning 6328: (162-186): CHC: Assertion violation happens here.
 // Warning 1236: (98-113): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
index 8de55bc9b9..fc53eb69b2 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
@@ -15,4 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (245-270): CHC: Assertion violation happens here.\nCounterexample:\narray = [[200]]\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.a()\nState: array = [[0]]\nC.f(0, 0, 0, 0)
+// Warning 6328: (245-270): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
index 53ac92a7ca..a98511ed18 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
@@ -16,4 +16,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (318-346): CHC: Assertion violation happens here.\nCounterexample:\narray = [[[200]]]\nx = 0\ny = 0\nz = 0\nt = 0\nw = 0\nv = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.p()\nState: array = [[[0]]]\nC.f(0, 0, 0, 0, 0, 0)
+// Warning 6328: (318-346): CHC: Assertion violation happens here.

From 0fb04432fa5b512efd9516ebadfc82889e1243e3 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 30 Nov 2022 16:24:44 +0100
Subject: [PATCH 1072/1748] Quick fix of prb-math

---
 test/externalTests/prb-math.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
index ffa2b7c01f..98a73627f8 100755
--- a/test/externalTests/prb-math.sh
+++ b/test/externalTests/prb-math.sh
@@ -39,7 +39,9 @@ function prb_math_test
 {
     local repo="https://github.com/paulrberg/prb-math"
     local ref_type=branch
-    local ref=main
+    # We currently pin the prb-math version to the latest version that support hardhat
+    # Please see here for details: https://github.com/ethereum/solidity/issues/13767
+    local ref=v2.5.0
     local config_file="hardhat.config.ts"
     local config_var="config"
 

From feade14fd62a566ee9c9c2da525b3b0ee346beeb Mon Sep 17 00:00:00 2001
From: ChrisXXXXXXX <95465284+ChrisXXXXXXX@users.noreply.github.com>
Date: Tue, 15 Nov 2022 12:29:55 +0300
Subject: [PATCH 1073/1748] Update ControlFlowSideEffectsCollector.cpp

There are errors in the function void ControlFlowBuilder::operator()(If const& _if) and function void ControlFlowBuilder::operator()(Switch const& _switch) when calculating CFG.
1. In the function void ControlFlowBuilder::operator()(If const& _if), the if.condion block is not the same block as the if.then block. The original code is calculated as one same block.
2. The switch.expression block are not the same block as all the cases block in cases, the original code is calculated as one same block.
This can cause some potential problems during the optimization phase.
---
 libyul/ControlFlowSideEffectsCollector.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/libyul/ControlFlowSideEffectsCollector.cpp b/libyul/ControlFlowSideEffectsCollector.cpp
index 19eb8275d0..ddf53743a2 100644
--- a/libyul/ControlFlowSideEffectsCollector.cpp
+++ b/libyul/ControlFlowSideEffectsCollector.cpp
@@ -51,9 +51,15 @@ void ControlFlowBuilder::operator()(If const& _if)
 {
 	visit(*_if.condition);
 	ControlFlowNode* node = m_currentNode;
-	(*this)(_if.body);
+
+	ControlFlowNode* ifEnd = newNode();
+	node->successors.emplace_back(ifEnd);
+
 	newConnectedNode();
-	node->successors.emplace_back(m_currentNode);
+	(*this)(_if.body);
+
+	m_currentNode->successors.emplace_back(ifEnd);
+	m_currentNode = ifEnd;
 }
 
 void ControlFlowBuilder::operator()(Switch const& _switch)
@@ -68,8 +74,8 @@ void ControlFlowBuilder::operator()(Switch const& _switch)
 	for (Case const& case_: _switch.cases)
 	{
 		m_currentNode = initialNode;
-		(*this)(case_.body);
 		newConnectedNode();
+		(*this)(case_.body);
 		m_currentNode->successors.emplace_back(finalNode);
 	}
 	m_currentNode = finalNode;
@@ -282,4 +288,3 @@ void ControlFlowSideEffectsCollector::recordReachabilityAndQueue(
 	if (m_processedNodes[&_function].insert(_node).second)
 		m_pendingNodes.at(&_function).push_front(_node);
 }
-

From 523aad175e87f56f6c60c3ecf80d212b2826019d Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 1 Dec 2022 18:23:03 +0100
Subject: [PATCH 1074/1748] Remove exempt of draft PRs in stale action

---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index b63a6915e9..c1a7bd45a6 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -46,7 +46,7 @@ jobs:
           days-before-pr-stale: ${{ env.BEFORE_PR_STALE }}
           days-before-pr-close: ${{ env.BEFORE_PR_CLOSE }}
           exempt-pr-labels: 'external contribution :star:,roadmap,epic'
-          exempt-draft-pr: true
+          exempt-draft-pr: false
           exempt-all-milestones: true
           # remove-stale-when-updated: true # TODO: uncomment and remove the line below when we're done with closing ancient issues
           remove-issue-stale-when-updated: false

From a0f8cc922f4682d11e199801e73326afe8c3fff4 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 29 Nov 2022 11:33:18 +0100
Subject: [PATCH 1075/1748] Add optimizor club benchmark.

---
 test/benchmarks/OptimizorClub.sol | 782 ++++++++++++++++++++++++++++++
 test/benchmarks/run.sh            |  28 +-
 2 files changed, 799 insertions(+), 11 deletions(-)
 create mode 100644 test/benchmarks/OptimizorClub.sol

diff --git a/test/benchmarks/OptimizorClub.sol b/test/benchmarks/OptimizorClub.sol
new file mode 100644
index 0000000000..418e26a3a8
--- /dev/null
+++ b/test/benchmarks/OptimizorClub.sol
@@ -0,0 +1,782 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.0;
+
+// Compressed form of https://github.com/OptimizorClub/optimizor and its dependencies
+
+library Base64 {
+    bytes private constant TABLE = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    function encode(bytes memory data) internal pure returns (string memory result) {
+        uint256 len = data.length;
+        if (len == 0) return "";
+        uint256 encodedLen;
+        unchecked {
+            encodedLen = 4 * ((len + 2) / 3);
+        }
+        unchecked {
+            result = new string(encodedLen + 32);
+        }
+        bytes memory table = TABLE;
+        assembly ("memory-safe") {
+            let tablePtr := add(table, 1)
+            let resultPtr := add(result, 32)
+            for { let i := 0 } lt(i, len) {} {
+                i := add(i, 3)
+                let input := and(mload(add(data, i)), 0xffffff)
+                let out := mload(add(tablePtr, and(shr(18, input), 0x3F)))
+                out := shl(8, out)
+                out := add(out, and(mload(add(tablePtr, and(shr(12, input), 0x3F))), 0xFF))
+                out := shl(8, out)
+                out := add(out, and(mload(add(tablePtr, and(shr(6, input), 0x3F))), 0xFF))
+                out := shl(8, out)
+                out := add(out, and(mload(add(tablePtr, and(input, 0x3F))), 0xFF))
+                out := shl(224, out)
+                mstore(resultPtr, out)
+                resultPtr := add(resultPtr, 4)
+            }
+            switch mod(len, 3)
+            case 1 { mstore(sub(resultPtr, 2), shl(240, 0x3d3d)) }
+            case 2 { mstore(sub(resultPtr, 1), shl(248, 0x3d)) }
+            mstore(result, encodedLen)
+        }
+        return result;
+    }
+}
+library Puretea {
+    function isMutating(bytes memory code) internal pure returns (bool) {
+        return check(code, 0xe43f0000000000000000001fffffffffffffffff0fff01ffffff00013fff0fff);
+    }
+    function isView(bytes memory code) internal pure returns (bool) {
+        return check(code, 0x640800000000000000000000ffffffffffffffff0fdf01ffffff00013fff0fff);
+    }
+    function isPureGlobal(bytes memory code) internal pure returns (bool) {
+        return check(code, 0x600800000000000000000000ffffffffffffffff0fdf01ff67ff00013fff0fff);
+    }
+    function isPureLocal(bytes memory code) internal pure returns (bool) {
+        return check(code, 0x600800000000000000000000ffffffffffffffff0fcf01ffffff00013fff0fff);
+    }
+    function check(bytes memory _code, uint256 _mask) internal pure returns (bool satisfied) {
+        assembly ("memory-safe") {
+            function matchesMask(mask, opcode) -> ret {
+                ret := and(mask, shl(opcode, 1))
+            }
+            function isPush(opcode) -> ret {
+                ret := and(gt(opcode, 0x5f), lt(opcode, 0x80))
+            }
+            function perform(mask, code) -> ret {
+                for {
+                    let offset := add(code, 32)
+                    let end := add(offset, mload(code ))
+                } lt(offset, end) {
+                    offset := add(offset, 1)
+                } {
+                    let opcode := byte(0, mload(offset))
+                    if iszero(matchesMask(mask, opcode)) {
+                        leave
+                    }
+                    if isPush(opcode) {
+                        let immLen := sub(opcode, 0x5f)
+                        offset := add(offset, immLen)
+                        if iszero(lt(offset, end)) {
+                            leave
+                        }
+                    }
+                }
+                ret := 1
+            }
+            satisfied := perform(_mask, _code)
+        }
+    }
+}
+abstract contract PurityChecker {
+    uint256 private constant acceptedOpcodesMask = 0x600800000000000000000000ffffffffffffffff0fdf01ff67ff00013fff0fff;
+    function check(address account) external view returns (bool) {
+        return Puretea.check(account.code, acceptedOpcodesMask);
+    }
+}
+interface IChallenge {
+    function run(address target, uint256 seed) external view returns (uint32);
+    function svg(uint256 tokenId) external view returns (string memory);
+    function name() external view returns (string memory);
+    function description() external view returns (string memory);
+}
+struct TokenDetails {
+    uint256 challengeId;
+    IChallenge challenge;
+    uint32 leaderGas;
+    uint32 leaderSolutionId;
+    address leaderSolver;
+    address leaderOwner;
+    address leaderSubmission;
+    uint32 gas;
+    uint32 solutionId;
+    uint32 rank;
+    uint32 improvementPercentage;
+    address solver;
+    address owner;
+    address submission;
+}
+library HexString {
+    error HexLengthInsufficient();
+    bytes16 private constant ALPHABET = "0123456789abcdef";
+    function toHexStringNoPrefix(uint256 value, uint256 length) internal pure returns (string memory) {
+        bytes memory buffer = new bytes(2 * length);
+        unchecked {
+            for (uint256 i = buffer.length; i > 0; --i) {
+                buffer[i - 1] = ALPHABET[value & 0xf];
+                value >>= 4;
+            }
+        }
+        if (value != 0) revert HexLengthInsufficient();
+        return string(buffer);
+    }
+    function toHexString(uint256 value, uint256 length) internal pure returns (string memory) {
+        bytes memory buffer = new bytes(2 * length + 2);
+        buffer[0] = "0";
+        buffer[1] = "x";
+        unchecked {
+            for (uint256 i = 2 * length + 1; i > 1; --i) {
+                buffer[i] = ALPHABET[value & 0xf];
+                value >>= 4;
+            }
+        }
+        if (value != 0) revert HexLengthInsufficient();
+        return string(buffer);
+    }
+}
+function packTokenId(uint256 challengeId, uint32 solutionId) pure returns (uint256) {
+    return (challengeId << 32) | solutionId;
+}
+function unpackTokenId(uint256 tokenId) pure returns (uint256 challengeId, uint32 solutionId) {
+    challengeId = tokenId >> 32;
+    solutionId = uint32(tokenId);
+}
+library NFTSVG {
+    struct SVGParams {
+        string projectName;
+        string challengeName;
+        string solverAddr;
+        string challengeAddr;
+        uint256 gasUsed;
+        uint256 gasOpti;
+        uint256 tokenId;
+        uint32 rank;
+        uint32 participants;
+        string color;
+        uint256 x1;
+        uint256 y1;
+        uint256 x2;
+        uint256 y2;
+        uint256 x3;
+        uint256 y3;
+    }
+    function generateSVG(SVGParams memory params, string memory challengeSVG)
+        internal
+        pure
+        returns (string memory svg)
+    {
+        return string.concat(
+            generateSVGDefs(params),
+            generateSVGBorderText(params.projectName, params.challengeName, params.solverAddr, params.challengeAddr),
+            generateSVGCardMantle(params.challengeName, params.rank, params.participants),
+            generateRankBorder(params.rank),
+            generateSvgCurve(challengeSVG),
+            generateSVGPositionDataAndLocationCurve(LibString.toString(params.tokenId), params.gasUsed, params.gasOpti),
+            generateOptimizorIcon(),
+            "</svg>"
+        );
+    }
+    function generateSVGDefs(SVGParams memory params) private pure returns (string memory svg) {
+        svg = string.concat(
+            '<svg width="290" height="500" viewBox="0 0 290 500" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">'
+            "<defs>"
+            '<filter id="icon"><feImage result="icon" xlink:href="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTY2LjU5NyIgaGVpZ2h0PSIxMjguOTQxIiB2aWV3Qm94PSIwIDAgNDQuMDc5IDM0LjExNiIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNMjAuNzkzIDEzLjMyMWgtLjYyM1YxMi43aC02LjIyNXYuNjIyaC42MjJ2LjYyM2gtLjYyMnYuNjIyaC0uNjIzdi0uNjIySDEyLjd2Ni4yMjVoLjYyMnYuNjIzaC42MjN2LjYyMmg2LjIyNXYtLjYyMmguNjIzdi0uNjIzaC42MjJ2LTYuMjI1aC0uNjIyem0tMy43MzUgNS42MDN2LTQuMzU4aDEuODY3djQuMzU4em0xMy42OTgtNi4yMjVoLTYuODQ4di42MjJoLjYyM3YuNjIzaC0uNjIzdi42MjJoLS42MjJ2LS42MjJoLS42MjN2Ni4yMjVoLjYyM3YuNjIzaC42MjJ2LjYyMmg2Ljg0OHYtLjYyMmguNjIydi0xLjI0NWgtLjYyMnYtLjYyM0gyNy4wMnYtNC4zNThoMy43MzV2LS42MjJoLjYyMnYtLjYyM2gtLjYyMnoiIHN0eWxlPSJmaWxsOiM2NjYiLz48L3N2Zz4="/></filter>'
+            '<filter id="f1"><feImage result="p0" xlink:href="data:image/svg+xml;base64,',
+            Base64.encode(
+                bytes(
+                    string.concat(
+                        "<svg width='290' height='500' viewBox='0 0 290 500' xmlns='http://www.w3.org/2000/svg'><rect width='290' height='500' fill='#",
+                        params.color,
+                        "'/></svg>"
+                    )
+                )
+            ),
+            '"/><feImage result="p1" xlink:href="data:image/svg+xml;base64,',
+            Base64.encode(
+                bytes(
+                    string.concat(
+                        "<svg width='290' height='500' viewBox='0 0 290 500' xmlns='http://www.w3.org/2000/svg'><circle cx='",
+                        LibString.toString(params.x1),
+                        "' cy='",
+                        LibString.toString(params.y1),
+                        "' r='120' fill='#",
+                        params.color,
+                        "'/></svg>"
+                    )
+                )
+            ),
+            '"/><feImage result="p2" xlink:href="data:image/svg+xml;base64,',
+            Base64.encode(
+                bytes(
+                    string.concat(
+                        "<svg width='290' height='500' viewBox='0 0 290 500' xmlns='http://www.w3.org/2000/svg'><circle cx='",
+                        LibString.toString(params.x2),
+                        "' cy='",
+                        LibString.toString(params.y2),
+                        "' r='120' fill='#",
+                        params.color,
+                        "'/></svg>"
+                    )
+                )
+            ),
+            '" />',
+            '<feImage result="p3" xlink:href="data:image/svg+xml;base64,',
+            Base64.encode(
+                bytes(
+                    string.concat(
+                        "<svg width='290' height='500' viewBox='0 0 290 500' xmlns='http://www.w3.org/2000/svg'><circle cx='",
+                        LibString.toString(params.x3),
+                        "' cy='",
+                        LibString.toString(params.y3),
+                        "' r='100' fill='#",
+                        params.color,
+                        "'/></svg>"
+                    )
+                )
+            ),
+            '"/><feBlend mode="overlay" in="p0" in2="p1"/><feBlend mode="exclusion" in2="p2"/><feBlend mode="overlay" in2="p3" result="blendOut"/><feGaussianBlur '
+            'in="blendOut" stdDeviation="42"/></filter><clipPath id="corners"><rect width="290" height="500" rx="42" ry="42"/></clipPath>'
+            '<path id="text-path-a" d="M40 12 H250 A28 28 0 0 1 278 40 V460 A28 28 0 0 1 250 488 H40 A28 28 0 0 1 12 460 V40 A28 28 0 0 1 40 12 z"/>'
+            '<path id="minimap" d="M234 444C234 457.949 242.21 463 253 463"/>'
+            '<filter id="top-region-blur"><feGaussianBlur in="SourceGraphic" stdDeviation="24"/></filter>'
+            '<linearGradient id="grad-up" x1="1" x2="0" y1="1" y2="0"><stop offset="0.0" stop-color="#fff" stop-opacity="1"/>'
+            '<stop offset=".9" stop-color="#fff" stop-opacity="0"/></linearGradient>'
+            '<linearGradient id="grad-down" x1="0" x2="1" y1="0" y2="1"><stop offset="0.0" stop-color="#fff" stop-opacity="1"/><stop offset="0.9" stop-color="#fff" stop-opacity="0"/></linearGradient>'
+            '<mask id="fade-up" maskContentUnits="objectBoundingBox"><rect width="1" height="1" fill="url(#grad-up)"/></mask>'
+            '<mask id="fade-down" maskContentUnits="objectBoundingBox"><rect width="1" height="1" fill="url(#grad-down)"/></mask>'
+            '<mask id="none" maskContentUnits="objectBoundingBox"><rect width="1" height="1" fill="#fff"/></mask>'
+            '<linearGradient id="grad-symbol"><stop offset="0.7" stop-color="#fff" stop-opacity="1"/><stop offset=".95" stop-color="#fff" stop-opacity="0"/></linearGradient>'
+            '<mask id="fade-symbol" maskContentUnits="userSpaceOnUse"><rect width="290" height="200" fill="url(#grad-symbol)"/></mask></defs>'
+            '<g clip-path="url(#corners)">' '<rect fill="',
+            params.color,
+            '" x="0" y="0" width="290" height="500"/>'
+            '<rect style="filter: url(#f1)" x="0" y="0" width="290" height="500"/>'
+            '<g style="filter:url(#top-region-blur); transform:scale(1.5); transform-origin:center top;">'
+            '<rect fill="none" x="0" y="0" width="290" height="500"/>'
+            '<ellipse cx="50%" cy="0" rx="180" ry="120" fill="#000" opacity="0.85"/></g>'
+            '<rect x="0" y="0" width="290" height="500" rx="42" ry="42" fill="rgba(0,0,0,0)" stroke="rgba(255,255,255,0.2)"/></g>'
+        );
+    }
+    function generateSVGBorderText(
+        string memory projectName,
+        string memory challengeName,
+        string memory solverAddr,
+        string memory challengeAddr
+    ) private pure returns (string memory svg) {
+        svg = string.concat(
+            '<text text-rendering="optimizeSpeed">'
+            '<textPath startOffset="-100%" fill="#fff" font-family="\'Courier New\', monospace" font-size="10px" xlink:href="#text-path-a">',
+            challengeName,
+            unicode" • ",
+            challengeAddr,
+            '<animate additive="sum" attributeName="startOffset" from="0%" to="100%" begin="0s" dur="30s" repeatCount="indefinite"/>'
+            '</textPath> <textPath startOffset="0%" fill="#fff" font-family="\'Courier New\', monospace" font-size="10px" xlink:href="#text-path-a">',
+            challengeName,
+            unicode" • ",
+            challengeAddr,
+            '<animate additive="sum" attributeName="startOffset" from="0%" to="100%" begin="0s" dur="30s" repeatCount="indefinite"/></textPath>'
+            '<textPath startOffset="50%" fill="#fff" font-family="\'Courier New\', monospace" font-size="10px" xlink:href="#text-path-a">',
+            projectName,
+            unicode" • ",
+            solverAddr,
+            '<animate additive="sum" attributeName="startOffset" from="0%" to="100%" begin="0s" dur="30s"'
+            ' repeatCount="indefinite"/></textPath><textPath startOffset="-50%" fill="#fff" font-family="\'Courier New\', monospace" font-size="10px" xlink:href="#text-path-a">',
+            projectName,
+            unicode" • ",
+            solverAddr,
+            '<animate additive="sum" attributeName="startOffset" from="0%" to="100%" begin="0s" dur="30s" repeatCount="indefinite"/></textPath></text>'
+        );
+    }
+    function generateSVGCardMantle(string memory challengeName, uint32 rank, uint32 participants)
+        private
+        pure
+        returns (string memory svg)
+    {
+        svg = string.concat(
+            '<g mask="url(#fade-symbol)"><rect fill="none" x="0" y="0" width="290" height="200"/><text y="70" x="32" fill="#fff" font-family="\'Courier New\', monospace" font-weight="200" font-size="28px">',
+            challengeName,
+            '</text><text y="115" x="32" fill="#fff" font-family="\'Courier New\', monospace" font-weight="200" font-size="20px">'
+            "Rank ",
+            LibString.toString(rank),
+            " of ",
+            LibString.toString(participants),
+            "</text></g>"
+        );
+    }
+    function generateRankBorder(uint32 rank) private pure returns (string memory svg) {
+        string memory color;
+        if (rank == 1) {
+            color = "rgba(255,215,0,1.0)";
+        } else if (rank == 2) {
+            color = "rgba(255,255,255,1.0)";
+        } else if (rank == 3) {
+            color = "rgba(205,127,50,1.0)";
+        } else {
+            color = "rgba(255,255,255,0.2)";
+        }
+        svg = string.concat(
+            '<rect x="16" y="16" width="258" height="468" rx="26" ry="26" fill="rgba(0,0,0,0)" stroke="', color, '"/>'
+        );
+    }
+    function generateSvgCurve(string memory challengeSVG) private pure returns (string memory svg) {
+        svg = string.concat('<g mask="url(#none)"', ' style="transform:translate(30px,130px)">', challengeSVG, "</g>");
+    }
+    function generateSVGPositionDataAndLocationCurve(string memory tokenId, uint256 gasUsed, uint256 gasOpti)
+        private
+        pure
+        returns (string memory svg)
+    {
+        string memory gasUsedStr = LibString.toString(gasUsed);
+        string memory gasOptiStr = LibString.toString(gasOpti);
+        uint256 str1length = bytes(tokenId).length + 4;
+        uint256 str2length = bytes(gasUsedStr).length + 10;
+        uint256 str3length = bytes(gasOptiStr).length + 14;
+        svg = string.concat(
+            '<g font-family="\'Courier New\', monospace" font-size="12" fill="#fff">'
+            '<g style="transform:translate(29px, 384px)">' '<rect width="',
+            LibString.toString(uint256(7 * (str1length + 4))),
+            '" height="26" rx="8" ry="8" fill="rgba(0,0,0,0.6)"/>' '<text x="12" y="17"><tspan fill="#999">ID: </tspan>',
+            tokenId,
+            "</text></g>" '<g style="transform:translate(29px, 414px)">' '<rect width="',
+            LibString.toString(uint256(7 * (str2length + 4))),
+            '" height="26" rx="8" ry="8" fill="rgba(0,0,0,0.6)"/>'
+            '<text x="12" y="17"><tspan fill="#999">Gas used: </tspan>',
+            gasUsedStr,
+            "</text></g>" '<g style="transform:translate(29px, 444px)">' '<rect width="',
+            LibString.toString(uint256(7 * (str3length + 4))),
+            '" height="26" rx="8" ry="8" fill="rgba(0,0,0,0.6)"/>'
+            '<text x="12" y="17"><tspan fill="#999">Improvement: </tspan>',
+            gasOptiStr,
+            "%" "</text></g></g>"
+        );
+    }
+    function generateOptimizorIcon() private pure returns (string memory svg) {
+        return
+        '<g style="transform:translate(180px, 365px)"><rect style="filter: url(#icon)" x="0" y="0" width="83" height="64"/></g>';
+    }
+    function getCircleCoord(address tokenAddress, uint256 offset, uint256 tokenId) internal pure returns (uint8) {
+        unchecked {
+            return uint8((((uint256(uint160(tokenAddress)) >> offset) & 0xFF) * tokenId) % 255);
+        }
+    }
+}
+library LibString {
+    function toString(uint256 value) internal pure returns (string memory str) {
+        assembly {
+            let newFreeMemoryPointer := add(mload(0x40), 160)
+            mstore(0x40, newFreeMemoryPointer)
+            str := sub(newFreeMemoryPointer, 32)
+            mstore(str, 0)
+            let end := str
+            for { let temp := value } 1 {} {
+                str := sub(str, 1)
+                mstore8(str, add(48, mod(temp, 10)))
+                temp := div(temp, 10)
+                if iszero(temp) { break }
+            }
+            let length := sub(end, str)
+            str := sub(str, 32)
+            mstore(str, length)
+        }
+    }
+}
+abstract contract Owned {
+    event OwnershipTransferred(address indexed user, address indexed newOwner);
+    address public owner;
+    modifier onlyOwner() virtual {
+        require(msg.sender == owner, "UNAUTHORIZED");
+        _;
+    }
+    constructor(address _owner) {
+        owner = _owner;
+        emit OwnershipTransferred(address(0), _owner);
+    }
+    function transferOwnership(address newOwner) public virtual onlyOwner {
+        owner = newOwner;
+        emit OwnershipTransferred(msg.sender, newOwner);
+    }
+}
+abstract contract ERC721 {
+    event Transfer(address indexed from, address indexed to, uint256 indexed id);
+    event Approval(address indexed owner, address indexed spender, uint256 indexed id);
+    event ApprovalForAll(address indexed owner, address indexed operator, bool approved);
+    string public name;
+    string public symbol;
+    function tokenURI(uint256 id) public view virtual returns (string memory);
+    mapping(uint256 => address) internal _ownerOf;
+    mapping(address => uint256) internal _balanceOf;
+    function ownerOf(uint256 id) public view virtual returns (address owner) {
+        require((owner = _ownerOf[id]) != address(0), "NOT_MINTED");
+    }
+    function balanceOf(address owner) public view virtual returns (uint256) {
+        require(owner != address(0), "ZERO_ADDRESS");
+        return _balanceOf[owner];
+    }
+    mapping(uint256 => address) public getApproved;
+    mapping(address => mapping(address => bool)) public isApprovedForAll;
+    constructor(string memory _name, string memory _symbol) {
+        name = _name;
+        symbol = _symbol;
+    }
+    function approve(address spender, uint256 id) public virtual {
+        address owner = _ownerOf[id];
+        require(msg.sender == owner || isApprovedForAll[owner][msg.sender], "NOT_AUTHORIZED");
+        getApproved[id] = spender;
+        emit Approval(owner, spender, id);
+    }
+    function setApprovalForAll(address operator, bool approved) public virtual {
+        isApprovedForAll[msg.sender][operator] = approved;
+        emit ApprovalForAll(msg.sender, operator, approved);
+    }
+    function transferFrom(
+        address from,
+        address to,
+        uint256 id
+    ) public virtual {
+        require(from == _ownerOf[id], "WRONG_FROM");
+        require(to != address(0), "INVALID_RECIPIENT");
+        require(
+            msg.sender == from || isApprovedForAll[from][msg.sender] || msg.sender == getApproved[id],
+            "NOT_AUTHORIZED"
+        );
+        unchecked {
+            _balanceOf[from]--;
+            _balanceOf[to]++;
+        }
+        _ownerOf[id] = to;
+        delete getApproved[id];
+        emit Transfer(from, to, id);
+    }
+    function safeTransferFrom(
+        address from,
+        address to,
+        uint256 id
+    ) public virtual {
+        transferFrom(from, to, id);
+        require(
+            to.code.length == 0 ||
+                ERC721TokenReceiver(to).onERC721Received(msg.sender, from, id, "") ==
+                ERC721TokenReceiver.onERC721Received.selector,
+            "UNSAFE_RECIPIENT"
+        );
+    }
+    function safeTransferFrom(
+        address from,
+        address to,
+        uint256 id,
+        bytes calldata data
+    ) public virtual {
+        transferFrom(from, to, id);
+        require(
+            to.code.length == 0 ||
+                ERC721TokenReceiver(to).onERC721Received(msg.sender, from, id, data) ==
+                ERC721TokenReceiver.onERC721Received.selector,
+            "UNSAFE_RECIPIENT"
+        );
+    }
+    function supportsInterface(bytes4 interfaceId) public view virtual returns (bool) {
+        return
+            interfaceId == 0x01ffc9a7 ||
+            interfaceId == 0x80ac58cd ||
+            interfaceId == 0x5b5e139f;
+    }
+    function _mint(address to, uint256 id) internal virtual {
+        require(to != address(0), "INVALID_RECIPIENT");
+        require(_ownerOf[id] == address(0), "ALREADY_MINTED");
+        unchecked {
+            _balanceOf[to]++;
+        }
+        _ownerOf[id] = to;
+        emit Transfer(address(0), to, id);
+    }
+    function _burn(uint256 id) internal virtual {
+        address owner = _ownerOf[id];
+        require(owner != address(0), "NOT_MINTED");
+        unchecked {
+            _balanceOf[owner]--;
+        }
+        delete _ownerOf[id];
+        delete getApproved[id];
+        emit Transfer(owner, address(0), id);
+    }
+    function _safeMint(address to, uint256 id) internal virtual {
+        _mint(to, id);
+        require(
+            to.code.length == 0 ||
+                ERC721TokenReceiver(to).onERC721Received(msg.sender, address(0), id, "") ==
+                ERC721TokenReceiver.onERC721Received.selector,
+            "UNSAFE_RECIPIENT"
+        );
+    }
+    function _safeMint(
+        address to,
+        uint256 id,
+        bytes memory data
+    ) internal virtual {
+        _mint(to, id);
+        require(
+            to.code.length == 0 ||
+                ERC721TokenReceiver(to).onERC721Received(msg.sender, address(0), id, data) ==
+                ERC721TokenReceiver.onERC721Received.selector,
+            "UNSAFE_RECIPIENT"
+        );
+    }
+}
+abstract contract ERC721TokenReceiver {
+    function onERC721Received(
+        address,
+        address,
+        uint256,
+        bytes calldata
+    ) external virtual returns (bytes4) {
+        return ERC721TokenReceiver.onERC721Received.selector;
+    }
+}
+abstract contract OptimizorNFT is ERC721 {
+    error InvalidSolutionId(uint256 challengeId, uint32 solutionId);
+    error ChallengeNotFound(uint256 challengeId);
+    struct ChallengeInfo {
+        IChallenge target;
+        uint32 solutions;
+    }
+    struct ExtraDetails {
+        address code;
+        address solver;
+        uint32 gas;
+    }
+    mapping(uint256 => ChallengeInfo) public challenges;
+    mapping(uint256 => ExtraDetails) public extraDetails;
+    constructor() ERC721("Optimizor Club", "OC") {}
+    function contractURI() external pure returns (string memory) {
+        return
+        "data:application/json;base64,eyJuYW1lIjoiT3B0aW1pem9yIENsdWIiLCJkZXNjcmlwdGlvbiI6IlRoZSBPcHRpbWl6b3IgQ2x1YiBORlQgY29sbGVjdGlvbiByZXdhcmRzIGdhcyBlZmZpY2llbnQgcGVvcGxlIGFuZCBtYWNoaW5lcyBieSBtaW50aW5nIG5ldyBpdGVtcyB3aGVuZXZlciBhIGNoZWFwZXIgc29sdXRpb24gaXMgc3VibWl0dGVkIGZvciBhIGNlcnRhaW4gY2hhbGxlbmdlLiIsImltYWdlIjoiZGF0YTppbWFnZS9zdmcreG1sO2Jhc2U2NCxQSE4yWnlCM2FXUjBhRDBpTVRZMkxqVTVOeUlnYUdWcFoyaDBQU0l4TWpndU9UUXhJaUIyYVdWM1FtOTRQU0l3SURBZ05EUXVNRGM1SURNMExqRXhOaUlnZUcxc2JuTTlJbWgwZEhBNkx5OTNkM2N1ZHpNdWIzSm5Mekl3TURBdmMzWm5JajQ4Y0dGMGFDQmtQU0pOTWpBdU56a3pJREV6TGpNeU1XZ3RMall5TTFZeE1pNDNhQzAyTGpJeU5YWXVOakl5YUM0Mk1qSjJMall5TTJndExqWXlNbll1TmpJeWFDMHVOakl6ZGkwdU5qSXlTREV5TGpkMk5pNHlNalZvTGpZeU1uWXVOakl6YUM0Mk1qTjJMall5TW1nMkxqSXlOWFl0TGpZeU1tZ3VOakl6ZGkwdU5qSXphQzQyTWpKMkxUWXVNakkxYUMwdU5qSXllbTB0TXk0M016VWdOUzQyTUROMkxUUXVNelU0YURFdU9EWTNkalF1TXpVNGVtMHhNeTQyT1RndE5pNHlNalZvTFRZdU9EUTRkaTQyTWpKb0xqWXlNM1l1TmpJemFDMHVOakl6ZGk0Mk1qSm9MUzQyTWpKMkxTNDJNakpvTFM0Mk1qTjJOaTR5TWpWb0xqWXlNM1l1TmpJemFDNDJNakoyTGpZeU1tZzJMamcwT0hZdExqWXlNbWd1TmpJeWRpMHhMakkwTldndExqWXlNbll0TGpZeU0wZ3lOeTR3TW5ZdE5DNHpOVGhvTXk0M016VjJMUzQyTWpKb0xqWXlNbll0TGpZeU0yZ3RMall5TW5vaUlITjBlV3hsUFNKbWFXeHNPaU0yTmpZaUx6NDhMM04yWno0PSIsImV4dGVybmFsX2xpbmsiOiJodHRwczovL29wdGltaXpvci5jbHViLyJ9";
+    }
+    function tokenDetails(uint256 tokenId) public view returns (TokenDetails memory) {
+        (uint256 challengeId, uint32 solutionId) = unpackTokenId(tokenId);
+        if (solutionId == 0) revert InvalidSolutionId(challengeId, solutionId);
+        ChallengeInfo storage chl = challenges[challengeId];
+        if (address(chl.target) == address(0)) revert ChallengeNotFound(challengeId);
+        if (solutionId > chl.solutions) revert InvalidSolutionId(challengeId, solutionId);
+        ExtraDetails storage details = extraDetails[tokenId];
+        uint256 leaderTokenId = packTokenId(challengeId, chl.solutions);
+        ExtraDetails storage leaderDetails = extraDetails[leaderTokenId];
+        uint32 leaderSolutionId = chl.solutions;
+        uint32 rank = leaderSolutionId - solutionId + 1;
+        uint32 percentage = 0;
+        if (solutionId > 1) {
+            ExtraDetails storage prevDetails = extraDetails[tokenId - 1];
+            percentage = (details.gas * 100) / prevDetails.gas;
+        }
+        return TokenDetails({
+            challengeId: challengeId,
+            challenge: chl.target,
+            leaderGas: leaderDetails.gas,
+            leaderSolutionId: leaderSolutionId,
+            leaderSolver: leaderDetails.solver,
+            leaderOwner: _ownerOf[leaderTokenId],
+            leaderSubmission: leaderDetails.code,
+            gas: details.gas,
+            solutionId: solutionId,
+            rank: rank,
+            improvementPercentage: percentage,
+            solver: details.solver,
+            owner: _ownerOf[tokenId],
+            submission: details.code
+        });
+    }
+    function tokenURI(uint256 tokenId) public view override returns (string memory) {
+        TokenDetails memory details = tokenDetails(tokenId);
+        string memory description = string.concat(details.challenge.description(), "\\n\\n", leaderboardString(tokenId));
+        return string.concat(
+            "data:application/json;base64,",
+            Base64.encode(
+                bytes(
+                    string.concat(
+                        '{"name":"Optimizor Club: ',
+                        details.challenge.name(),
+                        '","description":"',
+                        description,
+                        '","attributes":',
+                        attributesJSON(details),
+                        ',"image":"data:image/svg+xml;base64,',
+                        Base64.encode(bytes(svg(tokenId, details))),
+                        '"}'
+                    )
+                )
+            )
+        );
+    }
+    function leaderboard(uint256 tokenId) public view returns (address[] memory board) {
+        (uint256 challengeId,) = unpackTokenId(tokenId);
+        uint32 winners = challenges[challengeId].solutions;
+        board = new address[](winners);
+        unchecked {
+            for (uint32 i = 1; i <= winners; ++i) {
+                ExtraDetails storage details = extraDetails[packTokenId(challengeId, i)];
+                board[i - 1] = details.solver;
+            }
+        }
+    }
+    function leaderboardString(uint256 tokenId) private view returns (string memory) {
+        address[] memory leaders = leaderboard(tokenId);
+        string memory leadersStr = "";
+        uint256 lIdx = leaders.length;
+        unchecked {
+            for (uint256 i = 0; i < leaders.length; ++i) {
+                leadersStr = string.concat(
+                    "\\n",
+                    LibString.toString(lIdx),
+                    ". ",
+                    HexString.toHexString(uint256(uint160(leaders[i])), 20),
+                    leadersStr
+                );
+                --lIdx;
+            }
+        }
+        return string.concat("Leaderboard:\\n", leadersStr);
+    }
+    function attributesJSON(TokenDetails memory details) private view returns (string memory attributes) {
+        uint32 rank = details.rank;
+        attributes = string.concat(
+            '[{"trait_type":"Challenge","value":"',
+            details.challenge.name(),
+            '"},{"trait_type":"Gas used","value":',
+            LibString.toString(details.gas),
+            ',"display_type":"number"},{"trait_type":"Code size","value":',
+            LibString.toString(details.submission.code.length),
+            ',"display_type":"number"},{"trait_type":"Improvement percentage","value":"',
+            LibString.toString(details.improvementPercentage),
+            '%"},{"trait_type":"Solver","value":"',
+            HexString.toHexString(uint256(uint160(details.solver)), 20),
+            '"},{"trait_type":"Rank","value":',
+            LibString.toString(rank),
+            ',"display_type":"number"},{"trait_type":"Leader","value":"',
+            (rank == 1) ? "Yes" : "No",
+            '"},{"trait_type":"Top 3","value":"',
+            (rank <= 3) ? "Yes" : "No",
+            '"},{"trait_type":"Top 10","value":"',
+            (rank <= 10) ? "Yes" : "No",
+            '"}]'
+        );
+    }
+    function scale(uint8 value, uint256 minOut, uint256 maxOut) private pure returns (uint256) {
+        unchecked {
+            return ((uint256(value) * (maxOut - minOut)) / 255) + minOut;
+        }
+    }
+    function svg(uint256 tokenId, TokenDetails memory details) private view returns (string memory) {
+        uint256 gradRgb = 0;
+        if (details.rank > 10) {
+            gradRgb = 0xbebebe;
+        } else if (details.rank > 3) {
+            uint256 fRank;
+            uint256 init = 40;
+            uint256 factor = 15;
+            unchecked {
+                fRank = init + details.rank * factor;
+            }
+            gradRgb = (uint256(fRank) << 16) | (uint256(fRank) << 8) | uint256(fRank);
+        }
+        NFTSVG.SVGParams memory svgParams = NFTSVG.SVGParams({
+            projectName: "Optimizor Club",
+            challengeName: details.challenge.name(),
+            solverAddr: HexString.toHexString(uint256(uint160(address(details.owner))), 20),
+            challengeAddr: HexString.toHexString(uint256(uint160(address(details.challenge))), 20),
+            gasUsed: details.gas,
+            gasOpti: details.improvementPercentage,
+            tokenId: tokenId,
+            rank: details.rank,
+            participants: details.leaderSolutionId,
+            color: HexString.toHexStringNoPrefix(gradRgb, 3),
+            x1: scale(NFTSVG.getCircleCoord(address(details.challenge), 16, tokenId), 16, 274),
+            y1: scale(NFTSVG.getCircleCoord(address(details.solver), 16, tokenId), 100, 484),
+            x2: scale(NFTSVG.getCircleCoord(address(details.challenge), 32, tokenId), 16, 274),
+            y2: scale(NFTSVG.getCircleCoord(address(details.solver), 32, tokenId), 100, 484),
+            x3: scale(NFTSVG.getCircleCoord(address(details.challenge), 48, tokenId), 16, 274),
+            y3: scale(NFTSVG.getCircleCoord(address(details.solver), 48, tokenId), 100, 484)
+        });
+        return NFTSVG.generateSVG(svgParams, details.challenge.svg(tokenId));
+    }
+}
+abstract contract OptimizorAdmin is OptimizorNFT, Owned {
+    PurityChecker public purityChecker;
+    error ChallengeExists(uint256 challengeId);
+    event PurityCheckerUpdated(PurityChecker newPurityChecker);
+    event ChallengeAdded(uint256 challengeId, IChallenge);
+    constructor(PurityChecker _purityChecker) Owned(msg.sender) {
+        updatePurityChecker(_purityChecker);
+    }
+    function updatePurityChecker(PurityChecker _purityChecker) public onlyOwner {
+        purityChecker = _purityChecker;
+        emit PurityCheckerUpdated(_purityChecker);
+    }
+    function addChallenge(uint256 id, IChallenge challenge) external onlyOwner {
+        ChallengeInfo storage chl = challenges[id];
+        if (address(chl.target) != address(0)) {
+            revert ChallengeExists(id);
+        }
+        chl.target = challenge;
+        emit ChallengeAdded(id, challenge);
+    }
+}
+uint256 constant EPOCH = 64;
+contract Optimizor is OptimizorAdmin {
+    struct Submission {
+        address sender;
+        uint96 blockNumber;
+    }
+    mapping(bytes32 => Submission) public submissions;
+    error CodeAlreadySubmitted();
+    error TooEarlyToChallenge();
+    error InvalidRecipient();
+    error CodeNotSubmitted();
+    error NotPure();
+    error NotOptimizor();
+    constructor(PurityChecker _purityChecker) OptimizorAdmin(_purityChecker) {}
+    function commit(bytes32 key) external {
+        if (submissions[key].sender != address(0)) {
+            revert CodeAlreadySubmitted();
+        }
+        submissions[key] = Submission({sender: msg.sender, blockNumber: uint96(block.number)});
+    }
+    function challenge(uint256 id, address target, address recipient, uint256 salt) external {
+        ChallengeInfo storage chl = challenges[id];
+        bytes32 key = keccak256(abi.encode(msg.sender, target.codehash, salt));
+        if (submissions[key].blockNumber + EPOCH >= block.number) {
+            revert TooEarlyToChallenge();
+        }
+        if (submissions[key].sender == address(0)) {
+            revert CodeNotSubmitted();
+        }
+        if (address(chl.target) == address(0)) {
+            revert ChallengeNotFound(id);
+        }
+        if (recipient == address(0)) {
+            revert InvalidRecipient();
+        }
+        if (!purityChecker.check(target)) {
+            revert NotPure();
+        }
+        uint32 gas = chl.target.run(target, block.difficulty);
+        uint256 leaderTokenId = packTokenId(id, chl.solutions);
+        uint32 leaderGas = extraDetails[leaderTokenId].gas;
+        if ((leaderGas != 0) && (leaderGas <= gas)) {
+            revert NotOptimizor();
+        }
+        unchecked {
+            ++chl.solutions;
+        }
+        uint256 tokenId = packTokenId(id, chl.solutions);
+        ERC721._mint(recipient, tokenId);
+        extraDetails[tokenId] = ExtraDetails(target, recipient, gas);
+    }
+}
\ No newline at end of file
diff --git a/test/benchmarks/run.sh b/test/benchmarks/run.sh
index 01573170b5..89dc4e1453 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/run.sh
@@ -39,22 +39,28 @@ trap cleanup SIGINT SIGTERM
 
 solc="${SOLIDITY_BUILD_DIR}/solc/solc"
 benchmarks_dir="${REPO_ROOT}/test/benchmarks"
-chains_sol="${benchmarks_dir}/chains.sol"
 time_bin_path=$(type -P time)
 
-solc_command_legacy=("${solc}" --optimize --bin "${chains_sol}")
-solc_command_via_ir=("${solc}" --via-ir --optimize --bin "${chains_sol}")
+for input_file in "chains.sol" "OptimizorClub.sol"
+do
+  input_path="${benchmarks_dir}/${input_file}"
 
-"${time_bin_path}" --output "${result_legacy_file}" --format "%e" "${solc_command_legacy[@]}" >/dev/null
-"${time_bin_path}" --output "${result_via_ir_file}" --format "%e" "${solc_command_via_ir[@]}" >/dev/null
+  solc_command_legacy=("${solc}" --optimize --bin "${input_path}")
+  solc_command_via_ir=("${solc}" --via-ir --optimize --bin "${input_path}")
 
-time_legacy=$(<"${result_legacy_file}")
-time_via_ir=$(<"${result_via_ir_file}")
+  "${time_bin_path}" --output "${result_legacy_file}" --format "%e" "${solc_command_legacy[@]}" >/dev/null
+  "${time_bin_path}" --output "${result_via_ir_file}" --format "%e" "${solc_command_via_ir[@]}" >/dev/null
 
-echo "======================================================="
-echo "legacy pipeline took ${time_legacy} seconds to execute."
-echo "via-ir pipeline took ${time_via_ir} seconds to execute."
-echo "======================================================="
+  time_legacy=$(<"${result_legacy_file}")
+  time_via_ir=$(<"${result_via_ir_file}")
+
+  echo "======================================================="
+  echo "            ${input_file}"
+  echo "======================================================="
+  echo "legacy pipeline took ${time_legacy} seconds to execute."
+  echo "via-ir pipeline took ${time_via_ir} seconds to execute."
+  echo "======================================================="
+done
 
 cleanup
 

From 5e74e95b67dfdb0097a94e4045f3044184458f16 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 30 Nov 2022 15:47:47 +0100
Subject: [PATCH 1076/1748] Update test/benchmarks/run.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 test/benchmarks/run.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/benchmarks/run.sh b/test/benchmarks/run.sh
index 89dc4e1453..b50e708156 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/run.sh
@@ -56,7 +56,7 @@ do
 
   echo "======================================================="
   echo "            ${input_file}"
-  echo "======================================================="
+  echo "-------------------------------------------------------"
   echo "legacy pipeline took ${time_legacy} seconds to execute."
   echo "via-ir pipeline took ${time_via_ir} seconds to execute."
   echo "======================================================="

From a9bd337fac39c70d5b5f4166002038ee2367b733 Mon Sep 17 00:00:00 2001
From: franzihei <franziheintel@gmail.com>
Date: Wed, 30 Nov 2022 16:47:29 +0100
Subject: [PATCH 1077/1748] Update yul.rst

---
 docs/yul.rst | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index 861f5d5329..8ae454b2e0 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -9,13 +9,9 @@ Yul
 Yul (previously also called JULIA or IULIA) is an intermediate language that can be
 compiled to bytecode for different backends.
 
-Support for EVM 1.0, EVM 1.5 and Ewasm is planned, and it is designed to
-be a usable common denominator of all three
-platforms. It can already be used in stand-alone mode and
-for "inline assembly" inside Solidity
-and there is an experimental implementation of the Solidity compiler
-that uses Yul as an intermediate language. Yul is a good target for
-high-level optimisation stages that can benefit all target platforms equally.
+It can be used in stand-alone mode and for "inline assembly" inside Solidity.
+The compiler uses Yul as an intermediate language in the IR-based code generator ("new codegen" or "IR-based codegen").
+Yul is a good target for high-level optimisation stages that can benefit all target platforms equally.
 
 Motivation and High-level Description
 =====================================

From 0cf7236729e2ba4ea35fbab4a9a3f6a2ca6b37fc Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 29 Nov 2022 11:33:18 +0100
Subject: [PATCH 1078/1748] Add optimizor club benchmark.

---
 test/benchmarks/OptimizorClub.sol |  2 +-
 test/benchmarks/run.sh            | 47 ++++++++++++++++++-------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/test/benchmarks/OptimizorClub.sol b/test/benchmarks/OptimizorClub.sol
index 418e26a3a8..c21d42e65f 100644
--- a/test/benchmarks/OptimizorClub.sol
+++ b/test/benchmarks/OptimizorClub.sol
@@ -344,7 +344,7 @@ library NFTSVG {
             '<g font-family="\'Courier New\', monospace" font-size="12" fill="#fff">'
             '<g style="transform:translate(29px, 384px)">' '<rect width="',
             LibString.toString(uint256(7 * (str1length + 4))),
-            '" height="26" rx="8" ry="8" fill="rgba(0,0,0,0.6)"/>' '<text x="12" y="17"><tspan fill="#999">ID: </tspan>',
+            string.concat('" height="26" rx="8" ry="8" fill="rgba(0,0,0,0.6)"/>' '<text x="12" y="17"><tspan fill="#999">ID: </tspan>'),
             tokenId,
             "</text></g>" '<g style="transform:translate(29px, 414px)">' '<rect width="',
             LibString.toString(uint256(7 * (str2length + 4))),
diff --git a/test/benchmarks/run.sh b/test/benchmarks/run.sh
index b50e708156..c4f35ba477 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/run.sh
@@ -26,41 +26,50 @@ set -euo pipefail
 REPO_ROOT=$(cd "$(dirname "$0")/../../" && pwd)
 SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
 
-result_legacy_file=$(mktemp -t benchmark-legacy-XXXXXX.txt)
-result_via_ir_file=$(mktemp -t benchmark-via-ir-XXXXXX.txt)
+output_dir=$(mktemp -d -t solc-benchmark-XXXXXX)
+result_legacy_file="${output_dir}/benchmark-legacy.txt"
+result_via_ir_file="${output_dir}/benchmark-via-ir.txt"
+warnings_and_errors_file="${output_dir}/benchmark-warn-err.txt"
 
 function cleanup() {
-  rm "${result_legacy_file}"
-  rm "${result_via_ir_file}"
-  exit
+    rm -r "${output_dir}"
+    exit
 }
 
 trap cleanup SIGINT SIGTERM
 
 solc="${SOLIDITY_BUILD_DIR}/solc/solc"
 benchmarks_dir="${REPO_ROOT}/test/benchmarks"
+benchmarks=("chains.sol" "OptimizorClub.sol")
 time_bin_path=$(type -P time)
 
-for input_file in "chains.sol" "OptimizorClub.sol"
+for input_file in "${benchmarks[@]}"
 do
-  input_path="${benchmarks_dir}/${input_file}"
+    input_path="${benchmarks_dir}/${input_file}"
 
-  solc_command_legacy=("${solc}" --optimize --bin "${input_path}")
-  solc_command_via_ir=("${solc}" --via-ir --optimize --bin "${input_path}")
+    solc_command_legacy=("${solc}" --optimize --bin --color "${input_path}")
+    solc_command_via_ir=("${solc}" --via-ir --optimize --bin --color "${input_path}")
 
-  "${time_bin_path}" --output "${result_legacy_file}" --format "%e" "${solc_command_legacy[@]}" >/dev/null
-  "${time_bin_path}" --output "${result_via_ir_file}" --format "%e" "${solc_command_via_ir[@]}" >/dev/null
+    # Legacy can fail.
+    "${time_bin_path}" --output "${result_legacy_file}" --format "%e" "${solc_command_legacy[@]}" >/dev/null 2>>"${warnings_and_errors_file}"
+    "${time_bin_path}" --output "${result_via_ir_file}" --format "%e" "${solc_command_via_ir[@]}" >/dev/null 2>>"${warnings_and_errors_file}"
 
-  time_legacy=$(<"${result_legacy_file}")
-  time_via_ir=$(<"${result_via_ir_file}")
+    time_legacy=$(<"${result_legacy_file}")
+    time_via_ir=$(<"${result_via_ir_file}")
 
-  echo "======================================================="
-  echo "            ${input_file}"
-  echo "-------------------------------------------------------"
-  echo "legacy pipeline took ${time_legacy} seconds to execute."
-  echo "via-ir pipeline took ${time_via_ir} seconds to execute."
-  echo "======================================================="
+    echo "======================================================="
+    echo "            ${input_file}"
+    echo "-------------------------------------------------------"
+    echo "legacy pipeline took ${time_legacy} seconds to execute."
+    echo "via-ir pipeline took ${time_via_ir} seconds to execute."
+    echo "======================================================="
 done
 
+echo
+echo "======================================================="
+echo "Warnings and errors generated during run:"
+echo "======================================================="
+echo "$(<"${warnings_and_errors_file}")"
+
 cleanup
 

From 41b3f0521b096aeed9215a4d144cb36c1c661dd9 Mon Sep 17 00:00:00 2001
From: Minebuu <80020902+minebuu@users.noreply.github.com>
Date: Wed, 7 Dec 2022 14:18:04 +0900
Subject: [PATCH 1079/1748] Fixed typo in abi.encodeWithSignature description

In the description of abi.encodeWithSignature, a right parenthesis is missing in the function argument of abi.encodeWithSelector.
---
 docs/cheatsheet.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index 3a7d478b1b..412678953e 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -24,7 +24,7 @@ Global Variables
 - ``abi.encodeCall(function functionPointer, (...)) returns (bytes memory)``: ABI-encodes a call to ``functionPointer`` with the arguments found in the
   tuple. Performs a full type-check, ensuring the types match the function signature. Result equals ``abi.encodeWithSelector(functionPointer.selector, (...))``
 - ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``: Equivalent
-  to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature)), ...)``
+  to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature))), ...)``
 - ``bytes.concat(...) returns (bytes memory)``: :ref:`Concatenates variable number of
   arguments to one byte array<bytes-concat>`
 - ``string.concat(...) returns (string memory)``: :ref:`Concatenates variable number of

From 79c52b3c9e258a132b22826810646dbd5eb83d6b Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 14 Nov 2022 10:52:02 +0100
Subject: [PATCH 1080/1748] Re-use knowledge about keccak calls.

Re-use knowledge about keccak calls.

Update gas cost.

More tests.

Fix bug.

Update libyul/optimiser/DataFlowAnalyzer.cpp

Remove util prefixes

fix test

More test cases.

Add Changelog entry
---
 Changelog.md                                  |  1 +
 libyul/optimiser/DataFlowAnalyzer.cpp         | 51 +++++++++++++++++--
 libyul/optimiser/DataFlowAnalyzer.h           |  7 +++
 libyul/optimiser/LoadResolver.cpp             | 25 ++++++---
 .../semanticTests/array/reusing_memory.sol    |  2 +-
 .../structs/copy_substructures_to_mapping.sol |  6 +--
 .../semanticTests/structs/struct_copy.sol     |  2 +-
 .../loadResolver/keccak_reuse_basic.yul       | 19 +++++++
 .../loadResolver/keccak_reuse_expr_mstore.yul | 30 +++++++++++
 .../keccak_reuse_in_expression.yul            | 14 +++++
 .../loadResolver/keccak_reuse_msize.yul       | 18 +++++++
 .../loadResolver/keccak_reuse_mstore.yul      | 22 ++++++++
 .../keccak_reuse_reassigned_branch.yul        | 37 ++++++++++++++
 .../keccak_reuse_reassigned_value.yul         | 41 +++++++++++++++
 14 files changed, 257 insertions(+), 18 deletions(-)
 create mode 100644 test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_basic.yul
 create mode 100644 test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_expr_mstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_in_expression.yul
 create mode 100644 test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_msize.yul
 create mode 100644 test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_mstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_branch.yul
 create mode 100644 test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_value.yul

diff --git a/Changelog.md b/Changelog.md
index 17294f6b22..52addbb6ba 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,7 @@ Compiler Features:
  * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
  * Yul EVM Code Transform: Generate more optimal code for user-defined functions that always terminate a transaction. No return labels will be pushed for calls to functions that always terminate.
  * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
+ * Yul Optimizer: Eliminate ``keccak256`` calls if the value was already calculated by a previous call and can be reused.
  * Language Server: Add basic document hover support.
  * Optimizer: Added optimization rule ``and(shl(X, Y), shl(X, Z)) => shl(X, and(Y, Z))``.
  * SMTChecker: Support Eldarica as a Horn solver for the CHC engine when using the CLI option ``--model-checker-solvers eld``. The binary `eld` must be available in the system.
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 1d5519b578..59ba7c8f0e 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -24,6 +24,7 @@
 
 #include <libyul/optimiser/NameCollector.h>
 #include <libyul/optimiser/Semantics.h>
+#include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/optimiser/KnowledgeBase.h>
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
@@ -86,6 +87,8 @@ void DataFlowAnalyzer::operator()(ExpressionStatement& _statement)
 			cxx20::erase_if(m_state.environment.memory, mapTuple([&](auto&& key, auto&& /* value */) {
 				return !m_knowledgeBase.knownToBeDifferentByAtLeast32(vars->first, key);
 			}));
+			// TODO erase keccak knowledge, but in a more clever way
+			m_state.environment.keccak = {};
 			m_state.environment.memory[vars->first] = vars->second;
 			return;
 		}
@@ -127,7 +130,6 @@ void DataFlowAnalyzer::operator()(If& _if)
 	Environment preEnvironment = m_state.environment;
 
 	ASTModifier::operator()(_if);
-
 	joinKnowledge(preEnvironment);
 
 	clearValues(assignedVariableNames(_if.body));
@@ -223,7 +225,7 @@ void DataFlowAnalyzer::operator()(Block& _block)
 
 optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
 {
-	if (YulString const* value = util::valueOrNullptr(m_state.environment.storage, _key))
+	if (YulString const* value = valueOrNullptr(m_state.environment.storage, _key))
 		return *value;
 	else
 		return nullopt;
@@ -231,7 +233,15 @@ optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
 
 optional<YulString> DataFlowAnalyzer::memoryValue(YulString _key) const
 {
-	if (YulString const* value = util::valueOrNullptr(m_state.environment.memory, _key))
+	if (YulString const* value = valueOrNullptr(m_state.environment.memory, _key))
+		return *value;
+	else
+		return nullopt;
+}
+
+optional<YulString> DataFlowAnalyzer::keccakValue(YulString _start, YulString _length) const
+{
+	if (YulString const* value = valueOrNullptr(m_state.environment.keccak, make_pair(_start, _length)))
 		return *value;
 	else
 		return nullopt;
@@ -271,6 +281,9 @@ void DataFlowAnalyzer::handleAssignment(set<YulString> const& _variables, Expres
 			// assignment to slot denoted by "name"
 			m_state.environment.memory.erase(name);
 			// assignment to slot contents denoted by "name"
+			cxx20::erase_if(m_state.environment.keccak, [&name](auto&& _item) {
+				return _item.first.first == name || _item.first.second == name || _item.second == name;
+			});
 			cxx20::erase_if(m_state.environment.memory, mapTuple([&name](auto&& /* key */, auto&& value) { return value == name; }));
 		}
 	}
@@ -287,6 +300,8 @@ void DataFlowAnalyzer::handleAssignment(set<YulString> const& _variables, Expres
 				m_state.environment.memory[*key] = variable;
 			else if (auto key = isSimpleLoad(StoreLoadLocation::Storage, *_value))
 				m_state.environment.storage[*key] = variable;
+			else if (auto arguments = isKeccak(*_value))
+				m_state.environment.keccak[*arguments] = variable;
 		}
 	}
 }
@@ -314,7 +329,7 @@ void DataFlowAnalyzer::clearValues(set<YulString> _variables)
 	// let a := 1
 	// let b := a
 	// let c := b
-	// let a := 2
+	// a := 2
 	// add(b, c)
 	// In the last line, we can replace c by b, but not b by a.
 	//
@@ -329,6 +344,12 @@ void DataFlowAnalyzer::clearValues(set<YulString> _variables)
 	});
 	cxx20::erase_if(m_state.environment.storage, eraseCondition);
 	cxx20::erase_if(m_state.environment.memory, eraseCondition);
+	cxx20::erase_if(m_state.environment.keccak, [&_variables](auto&& _item) {
+		return
+			_variables.count(_item.first.first) ||
+			_variables.count(_item.first.second) ||
+			_variables.count(_item.second);
+	});
 
 	// Also clear variables that reference variables to be cleared.
 	for (auto const& variableToClear: _variables)
@@ -357,7 +378,10 @@ void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Block const& _block)
 	if (sideEffects.invalidatesStorage())
 		m_state.environment.storage.clear();
 	if (sideEffects.invalidatesMemory())
+	{
 		m_state.environment.memory.clear();
+		m_state.environment.keccak.clear();
+	}
 }
 
 void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Expression const& _expr)
@@ -368,7 +392,10 @@ void DataFlowAnalyzer::clearKnowledgeIfInvalidated(Expression const& _expr)
 	if (sideEffects.invalidatesStorage())
 		m_state.environment.storage.clear();
 	if (sideEffects.invalidatesMemory())
+	{
 		m_state.environment.memory.clear();
+		m_state.environment.keccak.clear();
+	}
 }
 
 bool DataFlowAnalyzer::inScope(YulString _variableName) const
@@ -416,12 +443,26 @@ std::optional<YulString> DataFlowAnalyzer::isSimpleLoad(
 	return {};
 }
 
+optional<pair<YulString, YulString>> DataFlowAnalyzer::isKeccak(Expression const& _expression) const
+{
+	if (FunctionCall const* funCall = get_if<FunctionCall>(&_expression))
+		if (funCall->functionName.name == m_dialect.hashFunction({}))
+			if (Identifier const* start = std::get_if<Identifier>(&funCall->arguments.at(0)))
+				if (Identifier const* length = std::get_if<Identifier>(&funCall->arguments.at(1)))
+					return make_pair(start->name, length->name);
+	return nullopt;
+}
+
 void DataFlowAnalyzer::joinKnowledge(Environment const& _olderEnvironment)
 {
 	if (!m_analyzeStores)
 		return;
 	joinKnowledgeHelper(m_state.environment.storage, _olderEnvironment.storage);
 	joinKnowledgeHelper(m_state.environment.memory, _olderEnvironment.memory);
+	cxx20::erase_if(m_state.environment.keccak, mapTuple([&_olderEnvironment](auto&& key, auto&& currentValue) {
+		YulString const* oldValue = valueOrNullptr(_olderEnvironment.keccak, key);
+		return !oldValue || *oldValue != currentValue;
+	}));
 }
 
 void DataFlowAnalyzer::joinKnowledgeHelper(
@@ -434,7 +475,7 @@ void DataFlowAnalyzer::joinKnowledgeHelper(
 	// of m_state.environment.memory and thus any overlapping write would have cleared the keys
 	// that are not known to be different inside m_state.environment.memory already.
 	cxx20::erase_if(_this, mapTuple([&_older](auto&& key, auto&& currentValue){
-		YulString const* oldValue = util::valueOrNullptr(_older, key);
+		YulString const* oldValue = valueOrNullptr(_older, key);
 		return !oldValue || *oldValue != currentValue;
 	}));
 }
diff --git a/libyul/optimiser/DataFlowAnalyzer.h b/libyul/optimiser/DataFlowAnalyzer.h
index ef8d49a879..b449357e66 100644
--- a/libyul/optimiser/DataFlowAnalyzer.h
+++ b/libyul/optimiser/DataFlowAnalyzer.h
@@ -108,6 +108,7 @@ class DataFlowAnalyzer: public ASTModifier
 	std::map<YulString, AssignedValue> const& allValues() const { return m_state.value; }
 	std::optional<YulString> storageValue(YulString _key) const;
 	std::optional<YulString> memoryValue(YulString _key) const;
+	std::optional<YulString> keccakValue(YulString _start, YulString _length) const;
 
 protected:
 	/// Registers the assignment.
@@ -157,6 +158,10 @@ class DataFlowAnalyzer: public ASTModifier
 		Expression const& _expression
 	) const;
 
+	/// Checks if the expression is keccak256(s, l)
+	/// where s and l are variables and returns these variables in that case.
+	std::optional<std::pair<YulString, YulString>> isKeccak(Expression const& _expression) const;
+
 	Dialect const& m_dialect;
 	/// Side-effects of user-defined functions. Worst-case side-effects are assumed
 	/// if this is not provided or the function is not found.
@@ -167,6 +172,8 @@ class DataFlowAnalyzer: public ASTModifier
 	{
 		std::unordered_map<YulString, YulString> storage;
 		std::unordered_map<YulString, YulString> memory;
+		/// If keccak[s, l] = y then y := keccak256(s, l) occurs in the code.
+		std::map<std::pair<YulString, YulString>, YulString> keccak;
 	};
 	struct State
 	{
diff --git a/libyul/optimiser/LoadResolver.cpp b/libyul/optimiser/LoadResolver.cpp
index abcfbaabb8..ce0ce730e7 100644
--- a/libyul/optimiser/LoadResolver.cpp
+++ b/libyul/optimiser/LoadResolver.cpp
@@ -26,6 +26,7 @@
 #include <libyul/backends/evm/EVMMetrics.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
+#include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/SideEffects.h>
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
@@ -58,15 +59,23 @@ void LoadResolver::visit(Expression& _e)
 
 	if (FunctionCall const* funCall = std::get_if<FunctionCall>(&_e))
 	{
-		for (auto location: { StoreLoadLocation::Memory, StoreLoadLocation::Storage })
-			if (funCall->functionName.name == m_loadFunctionName[static_cast<unsigned>(location)])
-			{
-				tryResolve(_e, location, funCall->arguments);
-				break;
-			}
-
-		if (!m_containsMSize && funCall->functionName.name == m_dialect.hashFunction({}))
+		if (funCall->functionName.name == m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Memory)])
+			tryResolve(_e, StoreLoadLocation::Memory, funCall->arguments);
+		else if (funCall->functionName.name == m_loadFunctionName[static_cast<unsigned>(StoreLoadLocation::Storage)])
+			tryResolve(_e, StoreLoadLocation::Storage, funCall->arguments);
+		else if (!m_containsMSize && funCall->functionName.name == m_dialect.hashFunction({}))
+		{
+			Identifier const* start = get_if<Identifier>(&funCall->arguments.at(0));
+			Identifier const* length = get_if<Identifier>(&funCall->arguments.at(1));
+			if (start && length)
+				if (auto const& value = keccakValue(start->name, length->name))
+					if (inScope(*value))
+					{
+						_e = Identifier{debugDataOf(_e), *value};
+						return;
+					}
 			tryEvaluateKeccak(_e, funCall->arguments);
+		}
 	}
 }
 
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index fa8e84931c..d4dafdb73b 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -24,6 +24,6 @@ contract Main {
 }
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 112899
+// gas irOptimized: 112757
 // gas legacy: 126596
 // gas legacyOptimized: 113823
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
index cfec3844f6..aecde10dce 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
@@ -53,14 +53,14 @@ contract C {
 
 // ----
 // from_memory() -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 123062
+// gas irOptimized: 123041
 // gas legacy: 130289
 // gas legacyOptimized: 128785
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121776
+// gas irOptimized: 121737
 // gas legacy: 123341
 // gas legacyOptimized: 121892
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115169
+// gas irOptimized: 115127
 // gas legacy: 122579
 // gas legacyOptimized: 120829
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index 27e726f154..e5960ce1ed 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -36,7 +36,7 @@ contract c {
 
 // ----
 // set(uint256): 7 -> true
-// gas irOptimized: 110032
+// gas irOptimized: 109897
 // gas legacy: 110616
 // gas legacyOptimized: 110006
 // retrieve(uint256): 7 -> 1, 3, 4, 2
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_basic.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_basic.yul
new file mode 100644
index 0000000000..b838c87e03
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_basic.yul
@@ -0,0 +1,19 @@
+{
+    let x := calldataload(0)
+    let a := keccak256(0, x)
+    sstore(a, 2)
+    let t := mload(2)
+    let b := keccak256(0, x)
+    sstore(b, 3)
+}
+// ----
+// step: loadResolver
+//
+// {
+//     {
+//         let _1 := 0
+//         let a := keccak256(_1, calldataload(_1))
+//         sstore(a, 2)
+//         sstore(a, 3)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_expr_mstore.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_expr_mstore.yul
new file mode 100644
index 0000000000..7b37f8c95f
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_expr_mstore.yul
@@ -0,0 +1,30 @@
+{
+    let a := calldataload(0)
+    sstore(f(keccak256(0, a)), keccak256(0, a))
+    sstore(f(keccak256(0, a)), keccak256(0, a))
+    sstore(keccak256(0, a), f(keccak256(0, a)))
+
+    function f(x) -> y {
+        mstore(x, 2)
+        y := mload(8)
+    }
+}
+// ----
+// step: loadResolver
+//
+// {
+//     {
+//         let _1 := 0
+//         let a := calldataload(_1)
+//         let _3 := keccak256(_1, a)
+//         sstore(f(_3), _3)
+//         let _8 := keccak256(_1, a)
+//         sstore(f(_8), _8)
+//         sstore(keccak256(_1, a), f(keccak256(_1, a)))
+//     }
+//     function f(x) -> y
+//     {
+//         mstore(x, 2)
+//         y := mload(8)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_in_expression.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_in_expression.yul
new file mode 100644
index 0000000000..f4d37d90e7
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_in_expression.yul
@@ -0,0 +1,14 @@
+{
+    let x := calldataload(0)
+    sstore(keccak256(0, x), keccak256(0, x))
+}
+// ----
+// step: loadResolver
+//
+// {
+//     {
+//         let _1 := 0
+//         let _3 := keccak256(_1, calldataload(_1))
+//         sstore(_3, _3)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_msize.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_msize.yul
new file mode 100644
index 0000000000..499a227c2c
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_msize.yul
@@ -0,0 +1,18 @@
+{
+    let a := calldataload(0)
+    let t := msize()
+    let x := keccak256(0, a)
+    let y := keccak256(0, a)
+    sstore(x, y)
+}
+// ----
+// step: loadResolver
+//
+// {
+//     {
+//         let _1 := 0
+//         let a := calldataload(_1)
+//         let x := keccak256(_1, a)
+//         sstore(x, keccak256(_1, a))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_mstore.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_mstore.yul
new file mode 100644
index 0000000000..65b5931a9d
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_mstore.yul
@@ -0,0 +1,22 @@
+{
+    let x := calldataload(0)
+    let a := keccak256(0x20, x)
+    sstore(a, 2)
+    // will disable loading for now, might improve later
+    mstore(0, 1)
+    let b := keccak256(0x20, x)
+    sstore(b, 3)
+}
+// ----
+// step: loadResolver
+//
+// {
+//     {
+//         let _1 := 0
+//         let x := calldataload(_1)
+//         let _2 := 0x20
+//         sstore(keccak256(_2, x), 2)
+//         mstore(_1, 1)
+//         sstore(keccak256(_2, x), 3)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_branch.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_branch.yul
new file mode 100644
index 0000000000..b780d62b0a
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_branch.yul
@@ -0,0 +1,37 @@
+{
+    let x := calldataload(0)
+    let y := calldataload(1)
+    let a := keccak256(x, y)
+    if calldataload(2) {
+        a := 8
+    }
+    let b := keccak256(x, y)
+    sstore(b, 2)
+    if calldataload(3) {
+        x := 8
+    }
+    let c := keccak256(x, y)
+    sstore(c, 2)
+    if calldataload(4) {
+        y := 8
+    }
+    let d := keccak256(x, y)
+    sstore(d, 2)
+}
+// ----
+// step: loadResolver
+//
+// {
+//     {
+//         let x := calldataload(0)
+//         let y := calldataload(1)
+//         let a := keccak256(x, y)
+//         let _3 := 2
+//         if calldataload(_3) { a := 8 }
+//         sstore(keccak256(x, y), _3)
+//         if calldataload(3) { x := 8 }
+//         sstore(keccak256(x, y), _3)
+//         if calldataload(4) { y := 8 }
+//         sstore(keccak256(x, y), _3)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_value.yul b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_value.yul
new file mode 100644
index 0000000000..232d76f145
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/loadResolver/keccak_reuse_reassigned_value.yul
@@ -0,0 +1,41 @@
+{
+    let x := calldataload(0)
+    let y := calldataload(1)
+    let a := keccak256(x, y)
+    sstore(a, 2)
+    // reassign value
+    a := calldataload(10)
+    let b := keccak256(x, y)
+    sstore(b, 3)
+    // reassign arg1
+    x := 10
+    let c := keccak256(x, y)
+    sstore(c, 4)
+    // reassign arg2
+    y := 9
+    let d := keccak256(x, y)
+    sstore(d, 5)
+    // no reassign, check that it is still working here.
+    let e := keccak256(x, y)
+    sstore(e, 6)
+}
+// ----
+// step: loadResolver
+//
+// {
+//     {
+//         let x := calldataload(0)
+//         let y := calldataload(1)
+//         let a := keccak256(x, y)
+//         sstore(a, 2)
+//         let _4 := 10
+//         a := calldataload(_4)
+//         sstore(keccak256(x, y), 3)
+//         x := _4
+//         sstore(keccak256(_4, y), 4)
+//         y := 9
+//         let d := keccak256(_4, y)
+//         sstore(d, 5)
+//         sstore(d, 6)
+//     }
+// }

From 64a4f32bc25bd028368f33b9ef27320d973a0b0c Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Tue, 30 Aug 2022 11:53:02 +0200
Subject: [PATCH 1081/1748] Consistent terminology for attached/bound functions

---
 ReviewChecklist.md                            |  2 +-
 docs/contracts/using-for.rst                  |  6 +-
 docs/grammar/SolidityParser.g4                |  2 +-
 docs/types/value-types.rst                    |  2 +-
 .../analysis/DeclarationTypeChecker.cpp       |  2 +-
 libsolidity/analysis/SyntaxChecker.cpp        |  2 +-
 libsolidity/analysis/TypeChecker.cpp          | 10 ++--
 libsolidity/ast/AST.h                         |  5 +-
 libsolidity/ast/TypeProvider.cpp              |  2 +-
 libsolidity/ast/Types.cpp                     | 60 +++++++++----------
 libsolidity/ast/Types.h                       | 30 +++++-----
 libsolidity/codegen/ExpressionCompiler.cpp    | 22 +++----
 libsolidity/codegen/LValue.cpp                |  2 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   | 16 ++---
 libsolidity/formal/SMTEncoder.cpp             |  8 +--
 libsolidity/formal/SMTEncoder.h               |  2 +-
 test/libsolidity/SolidityEndToEndTest.cpp     |  2 +-
 .../using/using_global_invisible.sol          |  2 +-
 ...rary_function_pointer_accepting_struct.sol |  2 +-
 ...nction_parameter_disallowed_conversion.sol |  6 +-
 .../errors/error_to_function_conversion.sol   |  2 +-
 .../events/event_library_function.sol         |  6 +-
 .../events/event_to_function_conversion.sol   |  2 +-
 .../functionTypes/assign_bound.sol            |  2 +-
 .../functionTypes/assign_builtin.sol          |  2 +-
 ...ary_function_to_external_function_type.sol |  4 +-
 ...nction_type_variable_external_internal.sol |  2 +-
 .../259_using_for_not_used.sol                |  6 +-
 .../261_using_for_arbitrary_mismatch.sol      |  4 +-
 .../262_bound_function_in_var.sol             |  2 +-
 .../encodeCall_fail_funType.sol               | 14 ++---
 .../assign_function_via_base_name_to_var.sol  |  4 +-
 ...sign_function_via_contract_name_to_var.sol |  4 +-
 .../wrap_unwrap_assign_err.sol                |  4 +-
 ...free_functions_implicit_conversion_err.sol |  4 +-
 .../syntaxTests/using/global_for_asterisk.sol |  2 +-
 .../using/global_library_with_asterisk.sol    |  2 +-
 .../syntaxTests/using/global_local_clash.sol  |  4 +-
 .../using/global_with_asterisk.sol            |  2 +-
 .../using/using_free_no_parameters_err.sol    |  2 +-
 .../using_free_no_parameters_struct_err.sol   |  2 +-
 .../using/using_non_free_function_err.sol     |  4 +-
 42 files changed, 132 insertions(+), 133 deletions(-)

diff --git a/ReviewChecklist.md b/ReviewChecklist.md
index c44c562156..c85a505460 100644
--- a/ReviewChecklist.md
+++ b/ReviewChecklist.md
@@ -143,7 +143,7 @@ The following points are all covered by the coding style but come up so often th
         Values of types that cannot be named: literals, tuples, array slices, storage references?
     - [ ] If it accepts a function, does it also accept an event or an error? These have function types but are not functions.
     - [ ] If it affects free functions, what about internal library functions?
-    - [ ] Bound library functions? Functions bound with `using for`?
+    - [ ] Attached library functions? Functions attached with `using for`?
     - [ ] Possible combinations of `storage`, `memory`, `calldata`, `immutable`, `constant`?
         Remember that internal functions can take `storage` arguments.
     - [ ] Does it work at construction time as well? What if you store it at construction time and read after deployment?
diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index b4a60585a9..3e9e1522e6 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -17,16 +17,16 @@ at contract level.
 The first part, ``A``, can be one of:
 
 - a list of file-level or library functions (``using {f, g, h, L.t} for uint;``) -
-  only those functions will be attached to the type.
+  only those functions will be attached to the type as member functions
 - the name of a library (``using L for uint;``) -
-  all functions (both public and internal ones) of the library are attached to the type
+  all functions (both public and internal ones) of the library are attached to the type.
 
 At file level, the second part, ``B``, has to be an explicit type (without data location specifier).
 Inside contracts, you can also use ``using L for *;``,
 which has the effect that all functions of the library ``L``
 are attached to *all* types.
 
-If you specify a library, *all* functions in the library are attached,
+If you specify a library, *all* functions in the library get attached,
 even those where the type of the first parameter does not
 match the type of the object. The type is checked at the
 point the function is called and function overload
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index 92718b9752..3068749895 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -312,7 +312,7 @@ errorDefinition:
 	Semicolon;
 
 /**
- * Using directive to bind library functions and free functions to types.
+ * Using directive to attach library functions and free functions to types.
  * Can occur within contracts and libraries and at the file level.
  */
 usingDirective: Using (identifierPath | (LBrace identifierPath (Comma identifierPath)* RBrace)) For (Mul | typeName) Global? Semicolon;
diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 8048eea58c..de2724afa9 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -664,7 +664,7 @@ introduced type and ``V`` has to be a built-in value type (the "underlying type"
 ``C.wrap`` is used to convert from the underlying type to the custom type. Similarly, the
 function ``C.unwrap`` is used to convert from the custom type to the underlying type.
 
-The type ``C`` does not have any operators or bound member functions. In particular, even the
+The type ``C`` does not have any operators or attached member functions. In particular, even the
 operator ``==`` is not defined. Explicit and implicit conversions to and from other types are
 disallowed.
 
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index 2088293878..e622cd7059 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -470,7 +470,7 @@ bool DeclarationTypeChecker::visit(UsingForDirective const& _usingFor)
 					m_errorReporter.typeError(
 						4167_error,
 						function->location(),
-						"Only file-level functions and library functions can be bound to a type in a \"using\" statement"
+						"Only file-level functions and library functions can be attached to a type in a \"using\" statement"
 					);
 			}
 			else
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index 167242b2c5..8b6cd37eb5 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -427,7 +427,7 @@ bool SyntaxChecker::visit(UsingForDirective const& _usingFor)
 		m_errorReporter.syntaxError(
 			2854_error,
 			_usingFor.location(),
-			"Can only globally bind functions to specific types."
+			"Can only globally attach functions to specific types."
 		);
 	if (_usingFor.global() && m_currentContractKind)
 		m_errorReporter.syntaxError(
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 2e81c62310..93558ff89a 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3167,7 +3167,7 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 	if (auto funType = dynamic_cast<FunctionType const*>(annotation.type))
 	{
 		solAssert(
-			!funType->bound() || exprType->isImplicitlyConvertibleTo(*funType->selfType()),
+			!funType->hasBoundFirstArgument() || exprType->isImplicitlyConvertibleTo(*funType->selfType()),
 			"Function \"" + memberName + "\" cannot be called on an object of type " +
 			exprType->humanReadableName() + " (expected " + funType->selfType()->humanReadableName() + ")."
 		);
@@ -3194,7 +3194,7 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 				"Storage arrays with nested mappings do not support .push(<arg>)."
 			);
 
-		if (!funType->bound())
+		if (!funType->hasBoundFirstArgument())
 			if (auto typeType = dynamic_cast<TypeType const*>(exprType))
 			{
 				auto contractType = dynamic_cast<ContractType const*>(typeType->actualType());
@@ -3810,13 +3810,13 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 				4731_error,
 				path->location(),
 				fmt::format(
-					"The function \"{}\" does not have any parameters, and therefore cannot be bound to the type \"{}\".",
+					"The function \"{}\" does not have any parameters, and therefore cannot be attached to the type \"{}\".",
 					joinHumanReadable(path->path(), "."),
 					normalizedType ? normalizedType->toString(true /* withoutDataLocation */) : "*"
 				)
 			);
 
-		FunctionType const* functionType = dynamic_cast<FunctionType const&>(*functionDefinition.type()).asBoundFunction();
+		FunctionType const* functionType = dynamic_cast<FunctionType const&>(*functionDefinition.type()).withBoundFirstArgument();
 		solAssert(functionType && functionType->selfType(), "");
 		BoolResult result = normalizedType->isImplicitlyConvertibleTo(
 			*TypeProvider::withLocationIfReference(DataLocation::Storage, functionType->selfType())
@@ -3826,7 +3826,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 				3100_error,
 				path->location(),
 				fmt::format(
-					"The function \"{}\" cannot be bound to the type \"{}\" because the type cannot "
+					"The function \"{}\" cannot be attached to the type \"{}\" because the type cannot "
 					"be implicitly converted to the first argument of the function (\"{}\"){}",
 					joinHumanReadable(path->path(), "."),
 					usingForType->toString(true /* withoutDataLocation */),
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index f5680acbc8..4b221141e3 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -644,10 +644,9 @@ class InheritanceSpecifier: public ASTNode
 /**
  * Using for directive:
  *
- * 1. `using LibraryName for T` attaches all functions from the library `LibraryName` to the type `T`
+ * 1. `using LibraryName for T` attaches all functions from the library `LibraryName` to the type `T`.
  * 2. `using LibraryName for *` attaches to all types.
- * 3. `using {f1, f2, ..., fn} for T` attaches the functions `f1`, `f2`, ...,
- *     `fn`, respectively to `T`.
+ * 3. `using {f1, f2, ..., fn} for T` attaches the functions `f1`, `f2`, ..., `fn`, respectively to `T`.
  *
  * For version 3, T has to be implicitly convertible to the first parameter type of
  * all functions, and this is checked at the point of the using statement. For versions 1 and
diff --git a/libsolidity/ast/TypeProvider.cpp b/libsolidity/ast/TypeProvider.cpp
index 91d1da4be5..9b90afdb27 100644
--- a/libsolidity/ast/TypeProvider.cpp
+++ b/libsolidity/ast/TypeProvider.cpp
@@ -450,7 +450,7 @@ FunctionType const* TypeProvider::function(
 )
 {
 	// Can only use this constructor for "arbitraryParameters".
-	solAssert(!_options.valueSet && !_options.gasSet && !_options.saltSet && !_options.bound);
+	solAssert(!_options.valueSet && !_options.gasSet && !_options.saltSet && !_options.hasBoundFirstArgument);
 	return createAndGet<FunctionType>(
 		_parameterTypes,
 		_returnParameterTypes,
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 5980f93668..f59a96577c 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -305,7 +305,7 @@ MemberList const& Type::members(ASTNode const* _currentScope) const
 		"");
 		MemberList::MemberMap members = nativeMembers(_currentScope);
 		if (_currentScope)
-			members += boundFunctions(*this, *_currentScope);
+			members += attachedFunctions(*this, *_currentScope);
 		m_members[_currentScope] = make_unique<MemberList>(std::move(members));
 	}
 	return *m_members[_currentScope];
@@ -383,7 +383,7 @@ vector<UsingForDirective const*> usingForDirectivesForType(Type const& _type, AS
 
 }
 
-MemberList::MemberMap Type::boundFunctions(Type const& _type, ASTNode const& _scope)
+MemberList::MemberMap Type::attachedFunctions(Type const& _type, ASTNode const& _scope)
 {
 	MemberList::MemberMap members;
 
@@ -395,13 +395,13 @@ MemberList::MemberMap Type::boundFunctions(Type const& _type, ASTNode const& _sc
 		Type const* functionType =
 			_function.libraryFunction() ? _function.typeViaContractName() : _function.type();
 		solAssert(functionType, "");
-		FunctionType const* asBoundFunction =
-			dynamic_cast<FunctionType const&>(*functionType).asBoundFunction();
-		solAssert(asBoundFunction, "");
+		FunctionType const* withBoundFirstArgument =
+			dynamic_cast<FunctionType const&>(*functionType).withBoundFirstArgument();
+		solAssert(withBoundFirstArgument, "");
 
-		if (_type.isImplicitlyConvertibleTo(*asBoundFunction->selfType()))
+		if (_type.isImplicitlyConvertibleTo(*withBoundFirstArgument->selfType()))
 			if (seenFunctions.insert(make_pair(*_name, &_function)).second)
-				members.emplace_back(&_function, asBoundFunction, *_name);
+				members.emplace_back(&_function, withBoundFirstArgument, *_name);
 	};
 
 	for (UsingForDirective const* ufd: usingForDirectivesForType(_type, _scope))
@@ -1879,21 +1879,21 @@ MemberList::MemberMap ArrayType::nativeMembers(ASTNode const*) const
 				strings{string()},
 				strings{string()},
 				FunctionType::Kind::ArrayPush
-			)->asBoundFunction());
+			)->withBoundFirstArgument());
 			members.emplace_back("push", TypeProvider::function(
 				TypePointers{thisAsPointer, baseType()},
 				TypePointers{},
 				strings{string(),string()},
 				strings{},
 				FunctionType::Kind::ArrayPush
-			)->asBoundFunction());
+			)->withBoundFirstArgument());
 			members.emplace_back("pop", TypeProvider::function(
 				TypePointers{thisAsPointer},
 				TypePointers{},
 				strings{string()},
 				strings{},
 				FunctionType::Kind::ArrayPop
-			)->asBoundFunction());
+			)->withBoundFirstArgument());
 		}
 	}
 	return members;
@@ -2952,7 +2952,7 @@ FunctionTypePointer FunctionType::newExpressionType(ContractDefinition const& _c
 
 vector<string> FunctionType::parameterNames() const
 {
-	if (!bound())
+	if (!hasBoundFirstArgument())
 		return m_parameterNames;
 	return vector<string>(m_parameterNames.cbegin() + 1, m_parameterNames.cend());
 }
@@ -2981,7 +2981,7 @@ TypePointers FunctionType::returnParameterTypesWithoutDynamicTypes() const
 
 TypePointers FunctionType::parameterTypes() const
 {
-	if (!bound())
+	if (!hasBoundFirstArgument())
 		return m_parameterTypes;
 	return TypePointers(m_parameterTypes.cbegin() + 1, m_parameterTypes.cend());
 }
@@ -3046,8 +3046,8 @@ string FunctionType::richIdentifier() const
 		id += "value";
 	if (saltSet())
 		id += "salt";
-	if (bound())
-		id += "bound_to" + identifierList(selfType());
+	if (hasBoundFirstArgument())
+		id += "attached_to" + identifierList(selfType());
 	return id;
 }
 
@@ -3081,11 +3081,11 @@ BoolResult FunctionType::isImplicitlyConvertibleTo(Type const& _convertTo) const
 	FunctionType const& convertTo = dynamic_cast<FunctionType const&>(_convertTo);
 
 	// These two checks are duplicated in equalExcludingStateMutability, but are added here for error reporting.
-	if (convertTo.bound() != bound())
-		return BoolResult::err("Bound functions can not be converted to non-bound functions.");
+	if (convertTo.hasBoundFirstArgument() != hasBoundFirstArgument())
+		return BoolResult::err("Attached functions cannot be converted into unattached functions.");
 
 	if (convertTo.kind() != kind())
-		return BoolResult::err("Special functions can not be converted to function types.");
+		return BoolResult::err("Special functions cannot be converted to function types.");
 
 	if (!equalExcludingStateMutability(convertTo))
 		return false;
@@ -3122,10 +3122,10 @@ TypeResult FunctionType::binaryOperatorResult(Token _operator, Type const* _othe
 	else if (
 		kind() == Kind::External &&
 		sizeOnStack() == 2 &&
-		!bound() &&
+		!hasBoundFirstArgument() &&
 		other.kind() == Kind::External &&
 		other.sizeOnStack() == 2 &&
-		!other.bound()
+		!other.hasBoundFirstArgument()
 	)
 		return commonType(this, _other);
 
@@ -3210,7 +3210,7 @@ bool FunctionType::nameable() const
 {
 	return
 		(m_kind == Kind::Internal || m_kind == Kind::External) &&
-		!bound() &&
+		!hasBoundFirstArgument() &&
 		!takesArbitraryParameters() &&
 		!gasSet() &&
 		!valueSet() &&
@@ -3249,7 +3249,7 @@ vector<tuple<string, Type const*>> FunctionType::makeStackItems() const
 		break;
 	case Kind::ArrayPush:
 	case Kind::ArrayPop:
-		solAssert(bound(), "");
+		solAssert(hasBoundFirstArgument(), "");
 		slots = {};
 		break;
 	default:
@@ -3262,7 +3262,7 @@ vector<tuple<string, Type const*>> FunctionType::makeStackItems() const
 		slots.emplace_back("value", TypeProvider::uint256());
 	if (saltSet())
 		slots.emplace_back("salt", TypeProvider::fixedBytes(32));
-	if (bound())
+	if (hasBoundFirstArgument())
 		slots.emplace_back("self", m_parameterTypes.front());
 	return slots;
 }
@@ -3423,7 +3423,7 @@ TypeResult FunctionType::interfaceType(bool /*_inLibrary*/) const
 
 Type const* FunctionType::mobileType() const
 {
-	if (valueSet() || gasSet() || saltSet() || bound())
+	if (valueSet() || gasSet() || saltSet() || hasBoundFirstArgument())
 		return nullptr;
 
 	// return function without parameter names
@@ -3444,8 +3444,8 @@ bool FunctionType::canTakeArguments(
 	Type const* _selfType
 ) const
 {
-	solAssert(!bound() || _selfType, "");
-	if (bound() && !_selfType->isImplicitlyConvertibleTo(*selfType()))
+	solAssert(!hasBoundFirstArgument() || _selfType, "");
+	if (hasBoundFirstArgument() && !_selfType->isImplicitlyConvertibleTo(*selfType()))
 		return false;
 	TypePointers paramTypes = parameterTypes();
 	std::vector<std::string> const paramNames = parameterNames();
@@ -3524,10 +3524,10 @@ bool FunctionType::equalExcludingStateMutability(FunctionType const& _other) con
 	if (gasSet() != _other.gasSet() || valueSet() != _other.valueSet() || saltSet() != _other.saltSet())
 		return false;
 
-	if (bound() != _other.bound())
+	if (hasBoundFirstArgument() != _other.hasBoundFirstArgument())
 		return false;
 
-	solAssert(!bound() || *selfType() == *_other.selfType(), "");
+	solAssert(!hasBoundFirstArgument() || *selfType() == *_other.selfType(), "");
 
 	return true;
 }
@@ -3648,14 +3648,14 @@ Type const* FunctionType::copyAndSetCallOptions(bool _setGas, bool _setValue, bo
 	);
 }
 
-FunctionTypePointer FunctionType::asBoundFunction() const
+FunctionTypePointer FunctionType::withBoundFirstArgument() const
 {
 	solAssert(!m_parameterTypes.empty(), "");
 	solAssert(!gasSet(), "");
 	solAssert(!valueSet(), "");
 	solAssert(!saltSet(), "");
 	Options options = Options::fromFunctionType(*this);
-	options.bound = true;
+	options.hasBoundFirstArgument = true;
 	return TypeProvider::function(
 		m_parameterTypes,
 		m_returnParameterTypes,
@@ -3710,7 +3710,7 @@ FunctionTypePointer FunctionType::asExternallyCallableFunction(bool _inLibrary)
 
 Type const* FunctionType::selfType() const
 {
-	solAssert(bound(), "Function is not bound.");
+	solAssert(hasBoundFirstArgument(), "Function is not attached to a type.");
 	solAssert(m_parameterTypes.size() > 0, "Function has no self type.");
 	return m_parameterTypes.at(0);
 }
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 735bd69025..9fe0b4d928 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -326,7 +326,7 @@ class Type
 	/// given location.
 	virtual bool dataStoredIn(DataLocation) const { return false; }
 
-	/// Returns the list of all members of this type. Default implementation: no members apart from bound.
+	/// Returns the list of all members of this type. Default implementation: no members apart from attached functions.
 	/// @param _currentScope scope in which the members are accessed.
 	MemberList const& members(ASTNode const* _currentScope) const;
 	/// Convenience method, returns the type of the given named member or an empty pointer if no such member exists.
@@ -379,11 +379,11 @@ class Type
 
 private:
 	/// @returns a member list containing all members added to this type by `using for` directives.
-	static MemberList::MemberMap boundFunctions(Type const& _type, ASTNode const& _scope);
+	static MemberList::MemberMap attachedFunctions(Type const& _type, ASTNode const& _scope);
 
 protected:
 	/// @returns the members native to this type depending on the given context. This function
-	/// is used (in conjunction with boundFunctions to fill m_members below.
+	/// is used (in conjunction with attachedFunctions to fill m_members below.
 	virtual MemberList::MemberMap nativeMembers(ASTNode const* /*_currentScope*/) const
 	{
 		return MemberList::MemberMap();
@@ -1272,7 +1272,7 @@ class FunctionType: public Type
 		bool saltSet = false;
 		/// true iff the function is called as arg1.fun(arg2, ..., argn).
 		/// This is achieved through the "using for" directive.
-		bool bound = false;
+		bool hasBoundFirstArgument = false;
 
 		static Options withArbitraryParameters()
 		{
@@ -1287,7 +1287,7 @@ class FunctionType: public Type
 			result.gasSet = _type.gasSet();
 			result.valueSet = _type.valueSet();
 			result.saltSet = _type.saltSet();
-			result.bound = _type.bound();
+			result.hasBoundFirstArgument = _type.hasBoundFirstArgument();
 			return result;
 		}
 	};
@@ -1322,7 +1322,7 @@ class FunctionType: public Type
 	)
 	{
 		// In this constructor, only the "arbitrary Parameters" option should be used.
-		solAssert(!bound() && !gasSet() && !valueSet() && !saltSet());
+		solAssert(!hasBoundFirstArgument() && !gasSet() && !valueSet() && !saltSet());
 	}
 
 	/// Detailed constructor, use with care.
@@ -1354,8 +1354,8 @@ class FunctionType: public Type
 			"Return parameter names list must match return parameter types list!"
 		);
 		solAssert(
-			!bound() || !m_parameterTypes.empty(),
-			"Attempted construction of bound function without self type"
+			!hasBoundFirstArgument() || !m_parameterTypes.empty(),
+			"Attempted construction of attached function without self type"
 		);
 	}
 
@@ -1372,7 +1372,7 @@ class FunctionType: public Type
 	/// storage pointers) are replaced by InaccessibleDynamicType instances.
 	TypePointers returnParameterTypesWithoutDynamicTypes() const;
 	std::vector<std::string> const& returnParameterNames() const { return m_returnParameterNames; }
-	/// @returns the "self" parameter type for a bound function
+	/// @returns the "self" parameter type for an attached function
 	Type const* selfType() const;
 
 	std::string richIdentifier() const override;
@@ -1406,8 +1406,8 @@ class FunctionType: public Type
 
 	/// @returns true if this function can take the given arguments (possibly
 	/// after implicit conversion).
-	/// @param _selfType if the function is bound, this has to be supplied and is the type of the
-	/// expression the function is called on.
+	/// @param _selfType if the function is attached as a member function, this has to be supplied
+	/// and is the type of the expression the function is called on.
 	bool canTakeArguments(
 		FuncCallArguments const& _arguments,
 		Type const* _selfType = nullptr
@@ -1471,20 +1471,20 @@ class FunctionType: public Type
 	bool gasSet() const { return m_options.gasSet; }
 	bool valueSet() const { return m_options.valueSet; }
 	bool saltSet() const { return m_options.saltSet; }
-	bool bound() const { return m_options.bound; }
+	bool hasBoundFirstArgument() const { return m_options.hasBoundFirstArgument; }
 
 	/// @returns a copy of this type, where gas or value are set manually. This will never set one
 	/// of the parameters to false.
 	Type const* copyAndSetCallOptions(bool _setGas, bool _setValue, bool _setSalt) const;
 
-	/// @returns a copy of this function type with the `bound` flag set to true.
+	/// @returns a copy of this function type with the `hasBoundFirstArgument` flag set to true.
 	/// Should only be called on library functions.
-	FunctionTypePointer asBoundFunction() const;
+	FunctionTypePointer withBoundFirstArgument() const;
 
 	/// @returns a copy of this function type where the location of reference types is changed
 	/// from CallData to Memory. This is the type that would be used when the function is
 	/// called externally, as opposed to the parameter types that are available inside the function body.
-	/// Also supports variants to be used for library or bound calls.
+	/// Also supports variants to be used for library or attached function calls.
 	/// @param _inLibrary if true, uses DelegateCall as location.
 	FunctionTypePointer asExternallyCallableFunction(bool _inLibrary) const;
 
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 461de5648d..b26825c778 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -612,7 +612,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 	else
 	{
 		FunctionType const& function = *functionType;
-		if (function.bound())
+		if (function.hasBoundFirstArgument())
 			solAssert(
 				function.kind() == FunctionType::Kind::DelegateCall ||
 				function.kind() == FunctionType::Kind::Internal ||
@@ -637,7 +637,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				bool shortcutTaken = false;
 				if (auto identifier = dynamic_cast<Identifier const*>(&_functionCall.expression()))
 				{
-					solAssert(!function.bound(), "");
+					solAssert(!function.hasBoundFirstArgument(), "");
 					if (auto functionDef = dynamic_cast<FunctionDefinition const*>(identifier->annotation().referencedDeclaration))
 					{
 						// Do not directly visit the identifier, because this way, we can avoid
@@ -657,7 +657,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 			}
 
 			unsigned parameterSize = CompilerUtils::sizeOnStack(function.parameterTypes());
-			if (function.bound())
+			if (function.hasBoundFirstArgument())
 			{
 				// stack: arg2, ..., argn, label, arg1
 				unsigned depth = parameterSize + 1;
@@ -906,7 +906,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 								argumentType &&
 								functionType->kind() == FunctionType::Kind::External &&
 								argumentType->kind() == FunctionType::Kind::External &&
-								!argumentType->bound(),
+								!argumentType->hasBoundFirstArgument(),
 								""
 							);
 
@@ -1029,7 +1029,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 		}
 		case FunctionType::Kind::ArrayPush:
 		{
-			solAssert(function.bound(), "");
+			solAssert(function.hasBoundFirstArgument(), "");
 			_functionCall.expression().accept(*this);
 
 			if (function.parameterTypes().size() == 0)
@@ -1095,7 +1095,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 		case FunctionType::Kind::ArrayPop:
 		{
 			_functionCall.expression().accept(*this);
-			solAssert(function.bound(), "");
+			solAssert(function.hasBoundFirstArgument(), "");
 			solAssert(function.parameterTypes().empty(), "");
 			ArrayType const* arrayType = dynamic_cast<ArrayType const*>(function.selfType());
 			solAssert(arrayType && arrayType->dataStoredIn(DataLocation::Storage), "");
@@ -1476,10 +1476,10 @@ bool ExpressionCompiler::visit(NewExpression const&)
 bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 {
 	CompilerContext::LocationSetter locationSetter(m_context, _memberAccess);
-	// Check whether the member is a bound function.
+	// Check whether the member is an attached function.
 	ASTString const& member = _memberAccess.memberName();
 	if (auto funType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type))
-		if (funType->bound())
+		if (funType->hasBoundFirstArgument())
 		{
 			acceptAndConvert(_memberAccess.expression(), *funType->selfType(), true);
 			if (funType->kind() == FunctionType::Kind::Internal)
@@ -2570,14 +2570,14 @@ void ExpressionCompiler::appendExternalFunctionCall(
 	// function identifier [unless bare]
 	// contract address
 
-	unsigned selfSize = _functionType.bound() ? _functionType.selfType()->sizeOnStack() : 0;
+	unsigned selfSize = _functionType.hasBoundFirstArgument() ? _functionType.selfType()->sizeOnStack() : 0;
 	unsigned gasValueSize = (_functionType.gasSet() ? 1u : 0u) + (_functionType.valueSet() ? 1u : 0u);
 	unsigned contractStackPos = m_context.currentToBaseStackOffset(1 + gasValueSize + selfSize + (_functionType.isBareCall() ? 0 : 1));
 	unsigned gasStackPos = m_context.currentToBaseStackOffset(gasValueSize);
 	unsigned valueStackPos = m_context.currentToBaseStackOffset(1);
 
 	// move self object to top
-	if (_functionType.bound())
+	if (_functionType.hasBoundFirstArgument())
 		utils().moveToStackTop(gasValueSize, _functionType.selfType()->sizeOnStack());
 
 	auto funKind = _functionType.kind();
@@ -2605,7 +2605,7 @@ void ExpressionCompiler::appendExternalFunctionCall(
 	// Evaluate arguments.
 	TypePointers argumentTypes;
 	TypePointers parameterTypes = _functionType.parameterTypes();
-	if (_functionType.bound())
+	if (_functionType.hasBoundFirstArgument())
 	{
 		argumentTypes.push_back(_functionType.selfType());
 		parameterTypes.insert(parameterTypes.begin(), _functionType.selfType());
diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp
index 2708d319d8..8f20cd992a 100644
--- a/libsolidity/codegen/LValue.cpp
+++ b/libsolidity/codegen/LValue.cpp
@@ -321,7 +321,7 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 					_sourceType.isImplicitlyConvertibleTo(*m_dataType),
 					"function item stored but target is not implicitly convertible to source"
 				);
-				solAssert(!fun->bound(), "");
+				solAssert(!fun->hasBoundFirstArgument(), "");
 				if (fun->kind() == FunctionType::Kind::External)
 				{
 					solAssert(fun->sizeOnStack() == 2, "");
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 30575930c7..1ec64b548d 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -953,7 +953,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		solAssert(!functionType->takesArbitraryParameters());
 
 		vector<string> args;
-		if (functionType->bound())
+		if (functionType->hasBoundFirstArgument())
 			args += IRVariable(_functionCall.expression()).part("self").stackSlots();
 
 		for (size_t i = 0; i < arguments.size(); ++i)
@@ -1024,7 +1024,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 					solAssert(
 						IRVariable(arg).type() == *functionType &&
 						functionType->kind() == FunctionType::Kind::External &&
-						!functionType->bound(),
+						!functionType->hasBoundFirstArgument(),
 						""
 					);
 					define(indexedArgs.emplace_back(m_context.newYulVariable(), *TypeProvider::fixedBytes(32))) <<
@@ -1353,7 +1353,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	}
 	case FunctionType::Kind::ArrayPop:
 	{
-		solAssert(functionType->bound());
+		solAssert(functionType->hasBoundFirstArgument());
 		solAssert(functionType->parameterTypes().empty());
 		ArrayType const* arrayType = dynamic_cast<ArrayType const*>(functionType->selfType());
 		solAssert(arrayType);
@@ -1557,7 +1557,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		solAssert(!_functionCall.annotation().tryCall);
 		solAssert(!functionType->valueSet());
 		solAssert(!functionType->gasSet());
-		solAssert(!functionType->bound());
+		solAssert(!functionType->hasBoundFirstArgument());
 
 		static map<FunctionType::Kind, std::tuple<unsigned, size_t>> precompiles = {
 			{FunctionType::Kind::ECRecover, std::make_tuple(1, 0)},
@@ -1623,7 +1623,7 @@ void IRGeneratorForStatements::endVisit(FunctionCallOptions const& _options)
 	setLocation(_options);
 	FunctionType const& previousType = dynamic_cast<FunctionType const&>(*_options.expression().annotation().type);
 
-	solUnimplementedAssert(!previousType.bound());
+	solUnimplementedAssert(!previousType.hasBoundFirstArgument());
 
 	// Copy over existing values.
 	for (auto const& item: previousType.stackItems())
@@ -1668,7 +1668,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 	auto memberFunctionType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type);
 	Type::Category objectCategory = _memberAccess.expression().annotation().type->category();
 
-	if (memberFunctionType && memberFunctionType->bound())
+	if (memberFunctionType && memberFunctionType->hasBoundFirstArgument())
 	{
 		define(IRVariable(_memberAccess).part("self"), _memberAccess.expression());
 		solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static);
@@ -2506,7 +2506,7 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 	TypePointers parameterTypes = funType.parameterTypes();
 	TypePointers argumentTypes;
 	vector<string> argumentStrings;
-	if (funType.bound())
+	if (funType.hasBoundFirstArgument())
 	{
 		parameterTypes.insert(parameterTypes.begin(), funType.selfType());
 		argumentTypes.emplace_back(funType.selfType());
@@ -2655,7 +2655,7 @@ void IRGeneratorForStatements::appendBareCall(
 {
 	FunctionType const& funType = dynamic_cast<FunctionType const&>(type(_functionCall.expression()));
 	solAssert(
-		!funType.bound() &&
+		!funType.hasBoundFirstArgument() &&
 		!funType.takesArbitraryParameters() &&
 		_arguments.size() == 1 &&
 		funType.parameterTypes().size() == 1, ""
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index eea4597374..25789a3b69 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -3120,12 +3120,12 @@ vector<smtutil::Expression> SMTEncoder::symbolicArguments(FunctionCall const& _f
 	vector<ASTPointer<Expression const>> arguments = _funCall.sortedArguments();
 	auto functionParams = funDef->parameters();
 	unsigned firstParam = 0;
-	if (funType->bound())
+	if (funType->hasBoundFirstArgument())
 	{
 		calledExpr = innermostTuple(*calledExpr);
-		auto const& boundFunction = dynamic_cast<MemberAccess const*>(calledExpr);
-		solAssert(boundFunction, "");
-		args.push_back(expr(boundFunction->expression(), functionParams.front()->type()));
+		auto const& attachedFunction = dynamic_cast<MemberAccess const*>(calledExpr);
+		solAssert(attachedFunction, "");
+		args.push_back(expr(attachedFunction->expression(), functionParams.front()->type()));
 		firstParam = 1;
 	}
 
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 16b87be33e..2ba491a0b0 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -401,7 +401,7 @@ class SMTEncoder: public ASTConstVisitor
 	void createReturnedExpressions(FunctionCall const& _funCall, ContractDefinition const* _contextContract);
 
 	/// @returns the symbolic arguments for a function call,
-	/// taking into account bound functions and
+	/// taking into account attached functions and
 	/// type conversion.
 	std::vector<smtutil::Expression> symbolicArguments(FunctionCall const& _funCall, ContractDefinition const* _contextContract);
 
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index beb622241f..2f0d1a5d08 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -2811,7 +2811,7 @@ BOOST_AUTO_TEST_CASE(return_external_function_type)
 	);
 }
 
-// TODO: store bound internal library functions
+// TODO: store attached internal library functions
 
 BOOST_AUTO_TEST_CASE(shift_bytes)
 {
diff --git a/test/libsolidity/semanticTests/using/using_global_invisible.sol b/test/libsolidity/semanticTests/using/using_global_invisible.sol
index 2ad94f0500..8db7a9a05d 100644
--- a/test/libsolidity/semanticTests/using/using_global_invisible.sol
+++ b/test/libsolidity/semanticTests/using/using_global_invisible.sol
@@ -29,7 +29,7 @@ import {C} from "B";
 contract D {
     function test() public returns (uint) {
         C c = new C();
-        // This tests that bound functions are available
+        // This tests that attached functions are available
         // even if the type is not available by name.
         // This is a regular function call, a
         // public and an internal library call
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_library_function_pointer_accepting_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_library_function_pointer_accepting_struct.sol
index 5682ede4d2..2d2e75684d 100644
--- a/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_library_function_pointer_accepting_struct.sol
+++ b/test/libsolidity/syntaxTests/abiEncoder/v2_call_to_v2_library_function_pointer_accepting_struct.sol
@@ -22,4 +22,4 @@ contract Test {
     }
 }
 // ----
-// TypeError 9574: (B:269-313): Type function (struct L.Item memory) is not implicitly convertible to expected type function (struct L.Item memory) external. Special functions can not be converted to function types.
+// TypeError 9574: (B:269-313): Type function (struct L.Item memory) is not implicitly convertible to expected type function (struct L.Item memory) external. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol b/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol
index c32dc60b51..e22462daad 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_function_parameter_disallowed_conversion.sol
@@ -53,7 +53,7 @@ contract C {
 // TypeError 9553: (415-428): Invalid type for argument in function call. Invalid implicit conversion from function () view external returns (uint256) to function () pure external returns (uint256) requested.
 // TypeError 9553: (465-481): Invalid type for argument in function call. Invalid implicit conversion from function () external returns (uint256) to function () pure external returns (uint256) requested.
 // TypeError 9553: (518-545): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) pure external returns (uint256) to function () pure external returns (uint256) requested.
-// TypeError 9553: (582-589): Invalid type for argument in function call. Invalid implicit conversion from function () view returns (uint256) to function () pure external returns (uint256) requested. Special functions can not be converted to function types.
-// TypeError 9553: (626-629): Invalid type for argument in function call. Invalid implicit conversion from function () pure returns (uint256) to function () pure external returns (uint256) requested. Special functions can not be converted to function types.
-// TypeError 9553: (666-686): Invalid type for argument in function call. Invalid implicit conversion from function () pure returns (uint256) to function () pure external returns (uint256) requested. Special functions can not be converted to function types.
+// TypeError 9553: (582-589): Invalid type for argument in function call. Invalid implicit conversion from function () view returns (uint256) to function () pure external returns (uint256) requested. Special functions cannot be converted to function types.
+// TypeError 9553: (626-629): Invalid type for argument in function call. Invalid implicit conversion from function () pure returns (uint256) to function () pure external returns (uint256) requested. Special functions cannot be converted to function types.
+// TypeError 9553: (666-686): Invalid type for argument in function call. Invalid implicit conversion from function () pure returns (uint256) to function () pure external returns (uint256) requested. Special functions cannot be converted to function types.
 // TypeError 9582: (723-748): Member "testInternalFunction" not found or not visible after argument-dependent lookup in contract C.
diff --git a/test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol b/test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol
index e37a6892d9..6b2350cd02 100644
--- a/test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol
+++ b/test/libsolidity/syntaxTests/errors/error_to_function_conversion.sol
@@ -4,4 +4,4 @@ contract C {
     function() internal pure x = E;
 }
 // ----
-// TypeError 7407: (58-59): Type error E() is not implicitly convertible to expected type function () pure. Special functions can not be converted to function types.
+// TypeError 7407: (58-59): Type error E() is not implicitly convertible to expected type function () pure. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/events/event_library_function.sol b/test/libsolidity/syntaxTests/events/event_library_function.sol
index 382786faa4..7a1b793f35 100644
--- a/test/libsolidity/syntaxTests/events/event_library_function.sol
+++ b/test/libsolidity/syntaxTests/events/event_library_function.sol
@@ -30,6 +30,6 @@ contract E {
 	}
 }
 // ----
-// TypeError 9553: (140-143): Invalid type for argument in function call. Invalid implicit conversion from function () to function () external requested. Special functions can not be converted to function types.
-// TypeError 9553: (230-233): Invalid type for argument in function call. Invalid implicit conversion from function () to function () external requested. Special functions can not be converted to function types.
-// TypeError 9553: (345-348): Invalid type for argument in function call. Invalid implicit conversion from function D.f() to function () external requested. Special functions can not be converted to function types.
+// TypeError 9553: (140-143): Invalid type for argument in function call. Invalid implicit conversion from function () to function () external requested. Special functions cannot be converted to function types.
+// TypeError 9553: (230-233): Invalid type for argument in function call. Invalid implicit conversion from function () to function () external requested. Special functions cannot be converted to function types.
+// TypeError 9553: (345-348): Invalid type for argument in function call. Invalid implicit conversion from function D.f() to function () external requested. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/events/event_to_function_conversion.sol b/test/libsolidity/syntaxTests/events/event_to_function_conversion.sol
index 931e485fce..76d0edc763 100644
--- a/test/libsolidity/syntaxTests/events/event_to_function_conversion.sol
+++ b/test/libsolidity/syntaxTests/events/event_to_function_conversion.sol
@@ -4,4 +4,4 @@ contract C {
     function() internal pure x = E;
 }
 // ----
-// TypeError 7407: (66-67): Type event E(uint256) is not implicitly convertible to expected type function () pure. Special functions can not be converted to function types.
+// TypeError 7407: (66-67): Type event E(uint256) is not implicitly convertible to expected type function () pure. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/functionTypes/assign_bound.sol b/test/libsolidity/syntaxTests/functionTypes/assign_bound.sol
index 37322114dd..fd60adce46 100644
--- a/test/libsolidity/syntaxTests/functionTypes/assign_bound.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/assign_bound.sol
@@ -12,4 +12,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (209-280): Type function (uint256,uint256) pure returns (uint256) is not implicitly convertible to expected type function (uint256,uint256) pure returns (uint256). Bound functions can not be converted to non-bound functions.
+// TypeError 9574: (209-280): Type function (uint256,uint256) pure returns (uint256) is not implicitly convertible to expected type function (uint256,uint256) pure returns (uint256). Attached functions cannot be converted into unattached functions.
diff --git a/test/libsolidity/syntaxTests/functionTypes/assign_builtin.sol b/test/libsolidity/syntaxTests/functionTypes/assign_builtin.sol
index cb795fede9..32cc005dfe 100644
--- a/test/libsolidity/syntaxTests/functionTypes/assign_builtin.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/assign_builtin.sol
@@ -4,4 +4,4 @@ contract C {
   }
 }
 // ----
-// TypeError 9574: (42-103): Type function (uint256) view returns (bytes32) is not implicitly convertible to expected type function (uint256) view returns (bytes32). Special functions can not be converted to function types.
+// TypeError 9574: (42-103): Type function (uint256) view returns (bytes32) is not implicitly convertible to expected type function (uint256) view returns (bytes32). Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol b/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol
index 0d70306064..c9c87a2ccc 100644
--- a/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/external_library_function_to_external_function_type.sol
@@ -10,5 +10,5 @@ contract C {
     }
 }
 // ----
-// TypeError 9553: (230-233): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) external returns (uint256) requested. Special functions can not be converted to function types.
-// TypeError 9574: (244-305): Type function (uint256) returns (uint256) is not implicitly convertible to expected type function (uint256) external returns (uint256). Special functions can not be converted to function types.
+// TypeError 9553: (230-233): Invalid type for argument in function call. Invalid implicit conversion from function (uint256) returns (uint256) to function (uint256) external returns (uint256) requested. Special functions cannot be converted to function types.
+// TypeError 9574: (244-305): Type function (uint256) returns (uint256) is not implicitly convertible to expected type function (uint256) external returns (uint256). Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol b/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol
index 08b1b26e3d..cd0800c3d9 100644
--- a/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/function_type_variable_external_internal.sol
@@ -3,4 +3,4 @@ contract test {
     function(bytes memory) external internal a = fa;
 }
 // ----
-// TypeError 7407: (106-108): Type function (bytes memory) is not implicitly convertible to expected type function (bytes memory) external. Special functions can not be converted to function types.
+// TypeError 7407: (106-108): Type function (bytes memory) is not implicitly convertible to expected type function (bytes memory) external. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol
index abda74579b..819ef969b3 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/259_using_for_not_used.sol
@@ -2,10 +2,10 @@ library D { function double(uint self) public returns (uint) { return 2; } }
 contract C {
     using D for uint;
     function f(uint16 a) public returns (uint) {
-        // This is an error because the function is only bound to uint.
-        // Had it been bound to *, it would have worked.
+        // This is an error because the function is only attached to uint.
+        // Had it been attached to *, it would have worked.
         return a.double();
     }
 }
 // ----
-// TypeError 9582: (305-313): Member "double" not found or not visible after argument-dependent lookup in uint16.
+// TypeError 9582: (311-319): Member "double" not found or not visible after argument-dependent lookup in uint16.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol
index 99aef98a88..f0076a15c8 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/261_using_for_arbitrary_mismatch.sol
@@ -2,9 +2,9 @@ library D { function double(bytes32 self) public returns (uint) { return 2; } }
 contract C {
     using D for *;
     function f(uint a) public returns (uint) {
-        // Bound to a, but self type does not match.
+        // Attached to a, but self type does not match.
         return a.double();
     }
 }
 // ----
-// TypeError 9582: (227-235): Member "double" not found or not visible after argument-dependent lookup in uint256.
+// TypeError 9582: (230-238): Member "double" not found or not visible after argument-dependent lookup in uint256.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol
index 2463bee5ec..277880b977 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// TypeError 9574: (218-271): Type function (struct D.s storage pointer,uint256) returns (uint256) is not implicitly convertible to expected type function (struct D.s storage pointer,uint256) returns (uint256). Bound functions can not be converted to non-bound functions.
+// TypeError 9574: (218-271): Type function (struct D.s storage pointer,uint256) returns (uint256) is not implicitly convertible to expected type function (struct D.s storage pointer,uint256) returns (uint256). Attached functions cannot be converted into unattached functions.
 // TypeError 6160: (298-302): Wrong argument count for function call: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol
index e2de483872..9ac254c99b 100644
--- a/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol
+++ b/test/libsolidity/syntaxTests/specialFunctions/encodeCall_fail_funType.sol
@@ -43,7 +43,7 @@ contract C is Base {
 		abi.encodeCall(L.fInternal, (1, "123"));
 		abi.encodeCall(L.fExternal, (1, "123"));
 	}
-	function failBoundLibraryPointerCall() public returns (bytes memory) {
+	function failAttachedLibraryPointerCall() public returns (bytes memory) {
 		uint256 x = 1;
 		return abi.encodeCall(x.fExternal, (1, "123"));
 	}
@@ -70,9 +70,9 @@ contract C is Base {
 // TypeError 3509: (1187-1207): Expected regular external function type, or external view on public function. Provided internal function.
 // TypeError 3509: (1286-1297): Expected regular external function type, or external view on public function. Provided internal function.
 // TypeError 3509: (1329-1340): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
-// TypeError 3509: (1471-1482): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
-// TypeError 3509: (1592-1601): Expected regular external function type, or external view on public function. Provided internal function. Did you forget to prefix "this."?
-// TypeError 3509: (1722-1745): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
-// TypeError 3509: (1771-1796): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
-// TypeError 3509: (1902-1911): Expected regular external function type, or external view on public function. Provided internal function.
-// TypeError 3509: (2010-2019): Expected regular external function type, or external view on public function. Provided creation function.
+// TypeError 3509: (1474-1485): Expected regular external function type, or external view on public function. Cannot use library functions for abi.encodeCall.
+// TypeError 3509: (1595-1604): Expected regular external function type, or external view on public function. Provided internal function. Did you forget to prefix "this."?
+// TypeError 3509: (1725-1748): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
+// TypeError 3509: (1774-1799): Expected regular external function type, or external view on public function. Provided internal function. Functions from base contracts have to be external.
+// TypeError 3509: (1905-1914): Expected regular external function type, or external view on public function. Provided internal function.
+// TypeError 3509: (2013-2022): Expected regular external function type, or external view on public function. Provided creation function.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol
index 9b988bb6e6..72c09455cd 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_base_name_to_var.sol
@@ -10,5 +10,5 @@ contract B is A {
     }
 }
 // ----
-// TypeError 9574: (133-160): Type function A.f() is not implicitly convertible to expected type function () external. Special functions can not be converted to function types.
-// TypeError 9574: (170-202): Type function A.g() pure is not implicitly convertible to expected type function () pure external. Special functions can not be converted to function types.
+// TypeError 9574: (133-160): Type function A.f() is not implicitly convertible to expected type function () external. Special functions cannot be converted to function types.
+// TypeError 9574: (170-202): Type function A.g() pure is not implicitly convertible to expected type function () pure external. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol b/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol
index 682a7a1109..6dcce143d2 100644
--- a/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol
+++ b/test/libsolidity/syntaxTests/types/contractTypeType/members/assign_function_via_contract_name_to_var.sol
@@ -10,5 +10,5 @@ contract B {
     }
 }
 // ----
-// TypeError 9574: (128-155): Type function A.f() is not implicitly convertible to expected type function () external. Special functions can not be converted to function types.
-// TypeError 9574: (165-197): Type function A.g() pure is not implicitly convertible to expected type function () pure external. Special functions can not be converted to function types.
+// TypeError 9574: (128-155): Type function A.f() is not implicitly convertible to expected type function () external. Special functions cannot be converted to function types.
+// TypeError 9574: (165-197): Type function A.g() pure is not implicitly convertible to expected type function () pure external. Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_assign_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_assign_err.sol
index 15bc15fa0d..30955f3102 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_assign_err.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/wrap_unwrap_assign_err.sol
@@ -4,5 +4,5 @@ function test() pure {
     function (int) returns (MyInt) g = MyInt.wrap;
 }
 // ----
-// TypeError 9574: (46-93): Type function (MyInt) pure returns (int256) is not implicitly convertible to expected type function (MyInt) returns (int256). Special functions can not be converted to function types.
-// TypeError 9574: (99-144): Type function (int256) pure returns (MyInt) is not implicitly convertible to expected type function (int256) returns (MyInt). Special functions can not be converted to function types.
+// TypeError 9574: (46-93): Type function (MyInt) pure returns (int256) is not implicitly convertible to expected type function (MyInt) returns (int256). Special functions cannot be converted to function types.
+// TypeError 9574: (99-144): Type function (int256) pure returns (MyInt) is not implicitly convertible to expected type function (int256) returns (MyInt). Special functions cannot be converted to function types.
diff --git a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
index a1fe8c7b86..32a49bbb77 100644
--- a/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
+++ b/test/libsolidity/syntaxTests/using/free_functions_implicit_conversion_err.sol
@@ -10,5 +10,5 @@ contract C {
     using {id} for S;
 }
 // ----
-// TypeError 3100: (112-114): The function "id" cannot be bound to the type "uint256" because the type cannot be implicitly converted to the first argument of the function ("uint16").
-// TypeError 3100: (140-142): The function "id" cannot be bound to the type "struct S" because the type cannot be implicitly converted to the first argument of the function ("uint16").
+// TypeError 3100: (112-114): The function "id" cannot be attached to the type "uint256" because the type cannot be implicitly converted to the first argument of the function ("uint16").
+// TypeError 3100: (140-142): The function "id" cannot be attached to the type "struct S" because the type cannot be implicitly converted to the first argument of the function ("uint16").
diff --git a/test/libsolidity/syntaxTests/using/global_for_asterisk.sol b/test/libsolidity/syntaxTests/using/global_for_asterisk.sol
index b5f6d88272..a4ee65a398 100644
--- a/test/libsolidity/syntaxTests/using/global_for_asterisk.sol
+++ b/test/libsolidity/syntaxTests/using/global_for_asterisk.sol
@@ -2,4 +2,4 @@ using {f} for * global;
 function f(uint) pure{}
 // ----
 // SyntaxError 8118: (0-23): The type has to be specified explicitly at file level (cannot use '*').
-// SyntaxError 2854: (0-23): Can only globally bind functions to specific types.
+// SyntaxError 2854: (0-23): Can only globally attach functions to specific types.
diff --git a/test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol b/test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol
index 49ac6824dc..50860de4a9 100644
--- a/test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol
+++ b/test/libsolidity/syntaxTests/using/global_library_with_asterisk.sol
@@ -2,4 +2,4 @@ using L for * global;
 library L {}
 // ----
 // SyntaxError 8118: (0-21): The type has to be specified explicitly at file level (cannot use '*').
-// SyntaxError 2854: (0-21): Can only globally bind functions to specific types.
+// SyntaxError 2854: (0-21): Can only globally attach functions to specific types.
diff --git a/test/libsolidity/syntaxTests/using/global_local_clash.sol b/test/libsolidity/syntaxTests/using/global_local_clash.sol
index 1d149417f2..5d5d8ae252 100644
--- a/test/libsolidity/syntaxTests/using/global_local_clash.sol
+++ b/test/libsolidity/syntaxTests/using/global_local_clash.sol
@@ -7,7 +7,7 @@ function f1(S memory _x) pure returns (uint) { return _x.x + 1; }
 ==== Source: B ====
 contract C {
     // Here, f points to f1, so we end up with two different functions
-    // bound as S.f
+    // attached as S.f
     using {f} for S;
 
     function test() pure public
@@ -18,4 +18,4 @@ contract C {
 import {gen as g, f1 as f, S} from "A";
 import "A" as A;
 // ----
-// TypeError 6675: (B:181-186): Member "f" not unique after argument-dependent lookup in struct S memory.
+// TypeError 6675: (B:184-189): Member "f" not unique after argument-dependent lookup in struct S memory.
diff --git a/test/libsolidity/syntaxTests/using/global_with_asterisk.sol b/test/libsolidity/syntaxTests/using/global_with_asterisk.sol
index b5f6d88272..a4ee65a398 100644
--- a/test/libsolidity/syntaxTests/using/global_with_asterisk.sol
+++ b/test/libsolidity/syntaxTests/using/global_with_asterisk.sol
@@ -2,4 +2,4 @@ using {f} for * global;
 function f(uint) pure{}
 // ----
 // SyntaxError 8118: (0-23): The type has to be specified explicitly at file level (cannot use '*').
-// SyntaxError 2854: (0-23): Can only globally bind functions to specific types.
+// SyntaxError 2854: (0-23): Can only globally attach functions to specific types.
diff --git a/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol b/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
index e03ba5d10d..54fdd825d7 100644
--- a/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
+++ b/test/libsolidity/syntaxTests/using/using_free_no_parameters_err.sol
@@ -4,4 +4,4 @@ function one() pure returns(uint) {
 
 using {one} for uint;
 // ----
-// TypeError 4731: (60-63): The function "one" does not have any parameters, and therefore cannot be bound to the type "uint256".
+// TypeError 4731: (60-63): The function "one" does not have any parameters, and therefore cannot be attached to the type "uint256".
diff --git a/test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol b/test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol
index 758993b160..4e15a9d880 100644
--- a/test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol
+++ b/test/libsolidity/syntaxTests/using/using_free_no_parameters_struct_err.sol
@@ -2,4 +2,4 @@ struct S { uint8 x; }
 function f() {}
 using {f} for S;
 // ----
-// TypeError 4731: (45-46): The function "f" does not have any parameters, and therefore cannot be bound to the type "struct S".
+// TypeError 4731: (45-46): The function "f" does not have any parameters, and therefore cannot be attached to the type "struct S".
diff --git a/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol b/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
index df3b3f65fa..fabfcd92c5 100644
--- a/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
+++ b/test/libsolidity/syntaxTests/using/using_non_free_function_err.sol
@@ -5,5 +5,5 @@ contract C {
     function g(uint) public { }
 }
 // ----
-// TypeError 4167: (24-25): Only file-level functions and library functions can be bound to a type in a "using" statement
-// TypeError 4167: (27-28): Only file-level functions and library functions can be bound to a type in a "using" statement
+// TypeError 4167: (24-25): Only file-level functions and library functions can be attached to a type in a "using" statement
+// TypeError 4167: (27-28): Only file-level functions and library functions can be attached to a type in a "using" statement

From 71506bd3b3bf1d5b3024f139774cebcafe1b6d0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 2 Dec 2022 22:50:32 +0100
Subject: [PATCH 1082/1748] Consistent terminology for attached/bound functions
 (file rename)

---
 .../{calldata_bound_bytes.sol => calldata_attached_to_bytes.sol}  | 0
 ..._slice.sol => calldata_attached_to_dynamic_array_or_slice.sol} | 0
 ...und_static_array.sol => calldata_attached_to_static_array.sol} | 0
 ...{calldata_bound_struct.sol => calldata_attached_to_struct.sol} | 0
 ...unction.sol => call_attached_library_function_on_function.sol} | 0
 ...sol => call_attached_library_function_on_storage_variable.sol} | 0
 ...to_string.sol => call_attached_library_function_on_string.sol} | 0
 ... => attached_internal_library_function_accepting_calldata.sol} | 0
 ... => attached_internal_library_function_returning_calldata.sol} | 0
 ...> attached_public_library_function_accepting_calldata.sol.sol} | 0
 ...ol => attached_public_library_function_returning_calldata.sol} | 0
 ...arentheses.sol => internal_call_attached_with_parentheses.sol} | 0
 ...ntheses1.sol => internal_call_unattached_with_parentheses.sol} | 0
 ...ress.sol => internal_library_function_attached_to_address.sol} | 0
 ..._library_function_attached_to_address_named_send_transfer.sol} | 0
 ...nternal_library_function_attached_to_array_named_pop_push.sol} | 0
 ...to_bool.sol => internal_library_function_attached_to_bool.sol} | 0
 ...act.sol => internal_library_function_attached_to_contract.sol} | 0
 ...ol => internal_library_function_attached_to_dynamic_array.sol} | 0
 ...to_enum.sol => internal_library_function_attached_to_enum.sol} | 0
 ...ernal_library_function_attached_to_external_function_type.sol} | 0
 ....sol => internal_library_function_attached_to_fixed_array.sol} | 0
 ....sol => internal_library_function_attached_to_fixed_bytes.sol} | 0
 ...eger.sol => internal_library_function_attached_to_integer.sol} | 0
 ...ce.sol => internal_library_function_attached_to_interface.sol} | 0
 ...ernal_library_function_attached_to_internal_function_type.sol} | 0
 ...unction_attached_to_internal_function_type_named_selector.sol} | 0
 ...eral.sol => internal_library_function_attached_to_literal.sol} | 0
 ...ping.sol => internal_library_function_attached_to_mapping.sol} | 0
 ...rnal_library_function_attached_to_string_accepting_memory.sol} | 0
 ...nal_library_function_attached_to_string_accepting_storage.sol} | 0
 ...bound.sol => internal_library_function_attached_to_struct.sol} | 0
 .../functions/{functions_bound_1.sol => functions_attached_1.sol} | 0
 .../{functions_bound_1_fail.sol => functions_attached_1_fail.sol} | 0
 ... v1_call_to_v2_library_attached_function_returning_struct.sol} | 0
 .../{assign_bound.sol => assign_attached_library_function.sol}    | 0
 .../assign_attached_library_function_storage_arg.sol}             | 0
 ...bound_function.sol => inline_array_with_attached_function.sol} | 0
 ...on_mixed.sol => inline_array_with_attached_function_mixed.sol} | 0
 ...th_bound_functions.sol => ternary_with_attached_functions.sol} | 0
 .../bound_calldata_parameter_accepting_calldata.sol}              | 0
 .../bound_calldata_parameter_not_accepting_memory.sol}            | 0
 .../syntaxTests/{bound => using}/interface_using_for.sol          | 0
 .../library_function_attached_and_called.sol}                     | 0
 .../library_function_attached_but_not_called.sol}                 | 0
 .../library_function_attached_to_all_types.sol}                   | 0
 .../using_for_library.sol => using/using_library_for_library.sol} | 0
 .../bound_to_struct.sol => using/using_struct_for_struct.sol}     | 0
 48 files changed, 0 insertions(+), 0 deletions(-)
 rename test/libsolidity/semanticTests/calldata/{calldata_bound_bytes.sol => calldata_attached_to_bytes.sol} (100%)
 rename test/libsolidity/semanticTests/calldata/{calldata_bound_dynamic_array_or_slice.sol => calldata_attached_to_dynamic_array_or_slice.sol} (100%)
 rename test/libsolidity/semanticTests/calldata/{calldata_bound_static_array.sol => calldata_attached_to_static_array.sol} (100%)
 rename test/libsolidity/semanticTests/calldata/{calldata_bound_struct.sol => calldata_attached_to_struct.sol} (100%)
 rename test/libsolidity/semanticTests/functionCall/{bound_function_in_function.sol => call_attached_library_function_on_function.sol} (100%)
 rename test/libsolidity/semanticTests/functionCall/{bound_function_in_var.sol => call_attached_library_function_on_storage_variable.sol} (100%)
 rename test/libsolidity/semanticTests/functionCall/{bound_function_to_string.sol => call_attached_library_function_on_string.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{bound_to_calldata.sol => attached_internal_library_function_accepting_calldata.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{bound_returning_calldata.sol => attached_internal_library_function_returning_calldata.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{bound_to_calldata_external.sol => attached_public_library_function_accepting_calldata.sol.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{bound_returning_calldata_external.sol => attached_public_library_function_returning_calldata.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_call_bound_with_parentheses.sol => internal_call_attached_with_parentheses.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_call_bound_with_parentheses1.sol => internal_call_unattached_with_parentheses.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_address.sol => internal_library_function_attached_to_address.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_address_named_send_transfer.sol => internal_library_function_attached_to_address_named_send_transfer.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_array_named_pop_push.sol => internal_library_function_attached_to_array_named_pop_push.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_bool.sol => internal_library_function_attached_to_bool.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_contract.sol => internal_library_function_attached_to_contract.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_dynamic_array.sol => internal_library_function_attached_to_dynamic_array.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_enum.sol => internal_library_function_attached_to_enum.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_external_function.sol => internal_library_function_attached_to_external_function_type.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_fixed_array.sol => internal_library_function_attached_to_fixed_array.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_fixed_bytes.sol => internal_library_function_attached_to_fixed_bytes.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_integer.sol => internal_library_function_attached_to_integer.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_interface.sol => internal_library_function_attached_to_interface.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_internal_function.sol => internal_library_function_attached_to_internal_function_type.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_function_named_selector.sol => internal_library_function_attached_to_internal_function_type_named_selector.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_literal.sol => internal_library_function_attached_to_literal.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_mapping.sol => internal_library_function_attached_to_mapping.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_string.sol => internal_library_function_attached_to_string_accepting_memory.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound_to_storage_string.sol => internal_library_function_attached_to_string_accepting_storage.sol} (100%)
 rename test/libsolidity/semanticTests/libraries/{internal_library_function_bound.sol => internal_library_function_attached_to_struct.sol} (100%)
 rename test/libsolidity/smtCheckerTests/functions/{functions_bound_1.sol => functions_attached_1.sol} (100%)
 rename test/libsolidity/smtCheckerTests/functions/{functions_bound_1_fail.sol => functions_attached_1_fail.sol} (100%)
 rename test/libsolidity/syntaxTests/abiEncoder/{v1_call_to_v2_library_bound_function_returning_struct.sol => v1_call_to_v2_library_attached_function_returning_struct.sol} (100%)
 rename test/libsolidity/syntaxTests/functionTypes/{assign_bound.sol => assign_attached_library_function.sol} (100%)
 rename test/libsolidity/syntaxTests/{nameAndTypeResolution/262_bound_function_in_var.sol => functionTypes/assign_attached_library_function_storage_arg.sol} (100%)
 rename test/libsolidity/syntaxTests/functionTypes/{inline_array_with_bound_function.sol => inline_array_with_attached_function.sol} (100%)
 rename test/libsolidity/syntaxTests/functionTypes/{inline_array_with_bound_function_mixed.sol => inline_array_with_attached_function_mixed.sol} (100%)
 rename test/libsolidity/syntaxTests/functionTypes/{ternary_with_bound_functions.sol => ternary_with_attached_functions.sol} (100%)
 rename test/libsolidity/syntaxTests/{bound/bound_to_calldata_struct.sol => using/bound_calldata_parameter_accepting_calldata.sol} (100%)
 rename test/libsolidity/syntaxTests/{bound/bound_calldata.sol => using/bound_calldata_parameter_not_accepting_memory.sol} (100%)
 rename test/libsolidity/syntaxTests/{bound => using}/interface_using_for.sol (100%)
 rename test/libsolidity/syntaxTests/{bound/bound_call.sol => using/library_function_attached_and_called.sol} (100%)
 rename test/libsolidity/syntaxTests/{bound/bound_no_call.sol => using/library_function_attached_but_not_called.sol} (100%)
 rename test/libsolidity/syntaxTests/{bound/bound_all.sol => using/library_function_attached_to_all_types.sol} (100%)
 rename test/libsolidity/syntaxTests/{bound/using_for_library.sol => using/using_library_for_library.sol} (100%)
 rename test/libsolidity/syntaxTests/{bound/bound_to_struct.sol => using/using_struct_for_struct.sol} (100%)

diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol
similarity index 100%
rename from test/libsolidity/semanticTests/calldata/calldata_bound_bytes.sol
rename to test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol
similarity index 100%
rename from test/libsolidity/semanticTests/calldata/calldata_bound_dynamic_array_or_slice.sol
rename to test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/calldata/calldata_bound_static_array.sol
rename to test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol
diff --git a/test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_struct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/calldata/calldata_bound_struct.sol
rename to test/libsolidity/semanticTests/calldata/calldata_attached_to_struct.sol
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol
similarity index 100%
rename from test/libsolidity/semanticTests/functionCall/bound_function_in_function.sol
rename to test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol
similarity index 100%
rename from test/libsolidity/semanticTests/functionCall/bound_function_in_var.sol
rename to test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol
diff --git a/test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol
similarity index 100%
rename from test/libsolidity/semanticTests/functionCall/bound_function_to_string.sol
rename to test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol
diff --git a/test/libsolidity/semanticTests/libraries/bound_to_calldata.sol b/test/libsolidity/semanticTests/libraries/attached_internal_library_function_accepting_calldata.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/bound_to_calldata.sol
rename to test/libsolidity/semanticTests/libraries/attached_internal_library_function_accepting_calldata.sol
diff --git a/test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol b/test/libsolidity/semanticTests/libraries/attached_internal_library_function_returning_calldata.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/bound_returning_calldata.sol
rename to test/libsolidity/semanticTests/libraries/attached_internal_library_function_returning_calldata.sol
diff --git a/test/libsolidity/semanticTests/libraries/bound_to_calldata_external.sol b/test/libsolidity/semanticTests/libraries/attached_public_library_function_accepting_calldata.sol.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/bound_to_calldata_external.sol
rename to test/libsolidity/semanticTests/libraries/attached_public_library_function_accepting_calldata.sol.sol
diff --git a/test/libsolidity/semanticTests/libraries/bound_returning_calldata_external.sol b/test/libsolidity/semanticTests/libraries/attached_public_library_function_returning_calldata.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/bound_returning_calldata_external.sol
rename to test/libsolidity/semanticTests/libraries/attached_public_library_function_returning_calldata.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol b/test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses.sol
rename to test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol b/test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_call_bound_with_parentheses1.sol
rename to test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address_named_send_transfer.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_address_named_send_transfer.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_address_named_send_transfer.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_array_named_pop_push.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_array_named_pop_push.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_array_named_pop_push.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_bool.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_bool.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_bool.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_contract.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_dynamic_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_dynamic_array.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_dynamic_array.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_enum.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_enum.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_enum.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_external_function.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_array.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_array.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_array.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_bytes.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_fixed_bytes.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_fixed_bytes.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_integer.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_integer.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_integer.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_interface.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_internal_function.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_function_named_selector.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_literal.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_literal.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_literal.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_mapping.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_mapping.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_mapping.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_memory.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_string.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_memory.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_storage.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound_to_storage_string.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_string_accepting_storage.sol
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol
similarity index 100%
rename from test/libsolidity/semanticTests/libraries/internal_library_function_bound.sol
rename to test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_bound_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol
similarity index 100%
rename from test/libsolidity/smtCheckerTests/functions/functions_bound_1.sol
rename to test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_bound_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol
similarity index 100%
rename from test/libsolidity/smtCheckerTests/functions/functions_bound_1_fail.sol
rename to test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol
diff --git a/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol b/test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_attached_function_returning_struct.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_bound_function_returning_struct.sol
rename to test/libsolidity/syntaxTests/abiEncoder/v1_call_to_v2_library_attached_function_returning_struct.sol
diff --git a/test/libsolidity/syntaxTests/functionTypes/assign_bound.sol b/test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/functionTypes/assign_bound.sol
rename to test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function.sol
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol b/test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function_storage_arg.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/nameAndTypeResolution/262_bound_function_in_var.sol
rename to test/libsolidity/syntaxTests/functionTypes/assign_attached_library_function_storage_arg.sol
diff --git a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function.sol b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function.sol
rename to test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function.sol
diff --git a/test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function_mixed.sol b/test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function_mixed.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/functionTypes/inline_array_with_bound_function_mixed.sol
rename to test/libsolidity/syntaxTests/functionTypes/inline_array_with_attached_function_mixed.sol
diff --git a/test/libsolidity/syntaxTests/functionTypes/ternary_with_bound_functions.sol b/test/libsolidity/syntaxTests/functionTypes/ternary_with_attached_functions.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/functionTypes/ternary_with_bound_functions.sol
rename to test/libsolidity/syntaxTests/functionTypes/ternary_with_attached_functions.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_to_calldata_struct.sol b/test/libsolidity/syntaxTests/using/bound_calldata_parameter_accepting_calldata.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_to_calldata_struct.sol
rename to test/libsolidity/syntaxTests/using/bound_calldata_parameter_accepting_calldata.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_calldata.sol b/test/libsolidity/syntaxTests/using/bound_calldata_parameter_not_accepting_memory.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_calldata.sol
rename to test/libsolidity/syntaxTests/using/bound_calldata_parameter_not_accepting_memory.sol
diff --git a/test/libsolidity/syntaxTests/bound/interface_using_for.sol b/test/libsolidity/syntaxTests/using/interface_using_for.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/interface_using_for.sol
rename to test/libsolidity/syntaxTests/using/interface_using_for.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_call.sol b/test/libsolidity/syntaxTests/using/library_function_attached_and_called.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_call.sol
rename to test/libsolidity/syntaxTests/using/library_function_attached_and_called.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_no_call.sol b/test/libsolidity/syntaxTests/using/library_function_attached_but_not_called.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_no_call.sol
rename to test/libsolidity/syntaxTests/using/library_function_attached_but_not_called.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_all.sol b/test/libsolidity/syntaxTests/using/library_function_attached_to_all_types.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_all.sol
rename to test/libsolidity/syntaxTests/using/library_function_attached_to_all_types.sol
diff --git a/test/libsolidity/syntaxTests/bound/using_for_library.sol b/test/libsolidity/syntaxTests/using/using_library_for_library.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/using_for_library.sol
rename to test/libsolidity/syntaxTests/using/using_library_for_library.sol
diff --git a/test/libsolidity/syntaxTests/bound/bound_to_struct.sol b/test/libsolidity/syntaxTests/using/using_struct_for_struct.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bound/bound_to_struct.sol
rename to test/libsolidity/syntaxTests/using/using_struct_for_struct.sol

From c2e6452b90e3db39111f052a9dfb513aed14b135 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 10 Aug 2022 10:42:02 +0200
Subject: [PATCH 1083/1748] using-for.rst: Clarify which library functions can
 be used with `using for`

---
 docs/contracts/using-for.rst | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index 3e9e1522e6..7ca58771db 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -16,10 +16,11 @@ at contract level.
 
 The first part, ``A``, can be one of:
 
-- a list of file-level or library functions (``using {f, g, h, L.t} for uint;``) -
-  only those functions will be attached to the type as member functions
-- the name of a library (``using L for uint;``) -
-  all functions (both public and internal ones) of the library are attached to the type.
+- A list of file-level or library functions (``using {f, g, h, L.t} for uint;``) -
+  only those functions will be attached to the type as member functions.
+  Note that private library functions can only be specified when ``using for`` is inside the library.
+- The name of a library (``using L for uint;``) -
+  all non-private functions of the library are attached to the type.
 
 At file level, the second part, ``B``, has to be an explicit type (without data location specifier).
 Inside contracts, you can also use ``using L for *;``,

From abbf2cb6d631f144983745e131c8ed5bf55e96b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 2 Dec 2022 23:33:57 +0100
Subject: [PATCH 1084/1748] using-for-rst: Make it clearer where snippets are
 just examples

---
 docs/contracts/using-for.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index 7ca58771db..20299e1a4b 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -16,14 +16,14 @@ at contract level.
 
 The first part, ``A``, can be one of:
 
-- A list of file-level or library functions (``using {f, g, h, L.t} for uint;``) -
+- A list of file-level or library functions (e.g. ``using {f, g, h, L.t} for uint;``) -
   only those functions will be attached to the type as member functions.
   Note that private library functions can only be specified when ``using for`` is inside the library.
-- The name of a library (``using L for uint;``) -
+- The name of a library (e.g. ``using L for uint;``) -
   all non-private functions of the library are attached to the type.
 
 At file level, the second part, ``B``, has to be an explicit type (without data location specifier).
-Inside contracts, you can also use ``using L for *;``,
+Inside contracts, you can also use ``*`` in place of the type (e.g. ``using L for *;``),
 which has the effect that all functions of the library ``L``
 are attached to *all* types.
 
@@ -33,7 +33,7 @@ match the type of the object. The type is checked at the
 point the function is called and function overload
 resolution is performed.
 
-If you use a list of functions (``using {f, g, h, L.t} for uint;``),
+If you use a list of functions (e.g. ``using {f, g, h, L.t} for uint;``),
 then the type (``uint``) has to be implicitly convertible to the
 first parameter of each of these functions. This check is
 performed even if none of these functions are called.

From fa78e0f3d44b27901aca53857c7478cd5846b080 Mon Sep 17 00:00:00 2001
From: Soham Zemse <22412996+zemse@users.noreply.github.com>
Date: Thu, 11 Aug 2022 17:05:59 +0530
Subject: [PATCH 1085/1748] feat: allow named parameters in mapping types
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Hari <webmail.hari@gmail.com>

test: add parser and abi test cases

docs: add example on using named parameters for mappings

- Add changelog

feat: update antlr grammar to allow named parameters in mappings

fix: prevent conflicting mapping parameter names

ref: change order of mapping initializers

test: update expectations and fix build

test: add more tests

fix: use common error & code for conflicting params

fix: issue with accessing nested mapping

test: add conflicting params tests for more nested levels

Update libsolidity/analysis/DeclarationTypeChecker.cpp

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

fix: error reported with the same code twice

test: add more tests for 3 level nested mapping

Address review comments
---
 Changelog.md                                  |  1 +
 docs/grammar/SolidityParser.g4                |  2 +-
 docs/types/mapping-types.rst                  | 38 +++++++--
 .../analysis/DeclarationTypeChecker.cpp       | 47 ++++++++++-
 libsolidity/ast/AST.h                         | 15 +++-
 libsolidity/ast/ASTJsonExporter.cpp           |  2 +
 libsolidity/ast/ASTJsonImporter.cpp           |  4 +-
 libsolidity/ast/TypeProvider.cpp              |  4 +-
 libsolidity/ast/TypeProvider.h                |  2 +-
 libsolidity/ast/Types.cpp                     |  6 +-
 libsolidity/ast/Types.h                       |  8 +-
 libsolidity/parsing/Parser.cpp                | 12 ++-
 test/libsolidity/ABIJson/mapping.sol          | 77 +++++++++++++++++++
 test/libsolidity/ASTJSON/address_payable.json |  2 +
 .../ASTJSON/address_payable_parseOnly.json    |  2 +
 test/libsolidity/ASTJSON/mappings.json        |  6 ++
 .../ASTJSON/mappings_parseOnly.json           |  6 ++
 .../ASTJSON/userDefinedValueType.json         |  2 +
 .../userDefinedValueType_parseOnly.json       |  2 +
 test/libsolidity/SolidityTypes.cpp            | 12 ++-
 .../do_not_delete_at_error.sol                |  4 +-
 .../errorRecoveryTests/error_to_eos.sol       |  9 ++-
 .../getters/mapping_with_names.sol            |  9 +++
 .../invalid/return_param_amount_differs2.sol  |  1 +
 .../parsing/mapping_with_names_1.sol          |  4 +
 .../parsing/mapping_with_names_2.sol          |  4 +
 .../parsing/mapping_with_names_3.sol          |  4 +
 .../parsing/mapping_with_names_5.sol          |  4 +
 .../parsing/mapping_with_names_6.sol          |  5 ++
 .../parsing/mapping_with_names_7.sol          |  4 +
 .../parsing/mapping_with_names_8.sol          |  4 +
 .../parsing/mapping_with_names_conflict_1.sol |  5 ++
 .../parsing/mapping_with_names_conflict_2.sol |  5 ++
 .../parsing/mapping_with_names_conflict_3.sol |  7 ++
 .../parsing/mapping_with_names_conflict_4.sol |  5 ++
 .../parsing/mapping_with_names_conflict_5.sol |  5 ++
 .../parsing/mapping_with_names_conflict_6.sol |  5 ++
 .../mapping_with_names_func_param_1.sol       |  6 ++
 .../mapping_with_names_func_param_2.sol       |  6 ++
 .../mapping_with_names_func_param_3.sol       |  6 ++
 .../mapping_with_names_func_param_4.sol       |  6 ++
 .../mapping_with_names_func_param_5.sol       |  6 ++
 .../mapping_with_names_func_param_6.sol       |  7 ++
 .../mapping_with_names_func_param_7.sol       |  6 ++
 .../mapping_with_names_func_type_param_1.sol  |  4 +
 .../mapping_with_names_func_type_param_2.sol  |  4 +
 .../mapping_with_names_func_type_param_3.sol  |  4 +
 .../mapping_with_names_func_type_param_4.sol  |  4 +
 .../mapping_with_names_func_type_param_5.sol  |  4 +
 .../mapping_with_names_func_type_param_6.sol  |  5 ++
 .../mapping_with_names_func_type_param_7.sol  |  4 +
 .../parsing/mapping_with_names_local_1.sol    |  9 +++
 .../parsing/mapping_with_names_local_2.sol    |  9 +++
 .../parsing/mapping_with_names_local_3.sol    |  9 +++
 .../parsing/mapping_with_names_local_4.sol    |  9 +++
 .../parsing/mapping_with_names_local_5.sol    |  9 +++
 .../parsing/mapping_with_names_local_6.sol    | 10 +++
 .../parsing/mapping_with_names_local_7.sol    | 11 +++
 .../parsing/mapping_with_names_local_8.sol    |  9 +++
 .../parsing/mapping_with_names_nested_1.sol   |  4 +
 .../parsing/mapping_with_names_nested_2.sol   |  4 +
 .../parsing/mapping_with_names_nested_3.sol   |  4 +
 .../parsing/mapping_with_names_nested_4.sol   |  4 +
 .../parsing/mapping_with_names_nested_5.sol   |  5 ++
 .../parsing/mapping_with_names_nested_6.sol   |  5 ++
 .../parsing/mapping_with_names_nested_7.sol   |  5 ++
 .../parsing/mapping_with_names_nested_8.sol   |  4 +
 .../mapping_with_names_struct_member_1.sol    |  6 ++
 .../mapping_with_names_struct_member_2.sol    |  6 ++
 .../mapping_with_names_struct_member_3.sol    |  6 ++
 .../mapping_with_names_struct_member_4.sol    |  6 ++
 .../mapping_with_names_struct_member_5.sol    |  6 ++
 .../mapping_with_names_struct_member_6.sol    |  7 ++
 .../mapping_with_names_struct_member_7.sol    |  6 ++
 .../userDefinedValueType/mapping_key.sol      |  1 +
 75 files changed, 530 insertions(+), 30 deletions(-)
 create mode 100644 test/libsolidity/ABIJson/mapping.sol
 create mode 100644 test/libsolidity/semanticTests/getters/mapping_with_names.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_1.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_2.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_3.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_5.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_6.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_7.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_8.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_1.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_2.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_3.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_4.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_5.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_6.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_1.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_2.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_3.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_4.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_5.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_6.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_7.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_1.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_2.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_3.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_4.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_5.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_6.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_7.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_local_1.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_local_2.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_local_3.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_local_4.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_local_5.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_local_6.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_local_7.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_local_8.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_1.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_2.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_3.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_4.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_5.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_6.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_7.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_8.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_1.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_2.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_3.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_4.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_5.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_6.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_7.sol

diff --git a/Changelog.md b/Changelog.md
index 52addbb6ba..b77be4f396 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.18 (unreleased)
 
 Language Features:
+* Allow named parameters in mapping types.
 
 
 Compiler Features:
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index 92718b9752..10613c9f24 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -504,7 +504,7 @@ variableDeclarationTuple:
 variableDeclarationStatement: ((variableDeclaration (Assign expression)?) | (variableDeclarationTuple Assign expression)) Semicolon;
 expressionStatement: expression Semicolon;
 
-mappingType: Mapping LParen key=mappingKeyType DoubleArrow value=typeName RParen;
+mappingType: Mapping LParen key=mappingKeyType name=identifier? DoubleArrow value=typeName name=identifier? RParen;
 /**
  * Only elementary types or user defined types are viable as mapping keys.
  */
diff --git a/docs/types/mapping-types.rst b/docs/types/mapping-types.rst
index c59d6e8454..68f963753e 100644
--- a/docs/types/mapping-types.rst
+++ b/docs/types/mapping-types.rst
@@ -4,12 +4,13 @@
 Mapping Types
 =============
 
-Mapping types use the syntax ``mapping(KeyType => ValueType)`` and variables
-of mapping type are declared using the syntax ``mapping(KeyType => ValueType) VariableName``.
-The ``KeyType`` can be any
-built-in value type, ``bytes``, ``string``, or any contract or enum type. Other user-defined
-or complex types, such as mappings, structs or array types are not allowed.
-``ValueType`` can be any type, including mappings, arrays and structs.
+Mapping types use the syntax ``mapping(KeyType KeyName? => ValueType ValueName?)`` and variables of
+mapping type are declared using the syntax ``mapping(KeyType KeyName? => ValueType ValueName?)
+VariableName``. The ``KeyType`` can be any built-in value type, ``bytes``, ``string``, or any
+contract or enum type. Other user-defined or complex types, such as mappings, structs or array types
+are not allowed. ``ValueType`` can be any type, including mappings, arrays and structs. ``KeyName``
+and ``ValueName`` are optional (so ``mapping(KeyType => ValueType)`` works as well) and can be any
+valid identifier that is not a type.
 
 You can think of mappings as `hash tables <https://en.wikipedia.org/wiki/Hash_table>`_, which are virtually initialised
 such that every possible key exists and is mapped to a value whose
@@ -29,8 +30,10 @@ of contract functions that are publicly visible.
 These restrictions are also true for arrays and structs that contain mappings.
 
 You can mark state variables of mapping type as ``public`` and Solidity creates a
-:ref:`getter <visibility-and-getters>` for you. The ``KeyType`` becomes a parameter for the getter.
-If ``ValueType`` is a value type or a struct, the getter returns ``ValueType``.
+:ref:`getter <visibility-and-getters>` for you. The ``KeyType`` becomes a parameter
+with name ``KeyName`` (if specified) for the getter.
+If ``ValueType`` is a value type or a struct, the getter returns ``ValueType`` with
+name ``ValueName`` (if specified).
 If ``ValueType`` is an array or a mapping, the getter has one parameter for
 each ``KeyType``, recursively.
 
@@ -64,6 +67,25 @@ contract that returns the value at the specified address.
 The example below is a simplified version of an
 `ERC20 token <https://github.com/OpenZeppelin/openzeppelin-contracts/blob/master/contracts/token/ERC20/ERC20.sol>`_.
 ``_allowances`` is an example of a mapping type inside another mapping type.
+
+In the example below, the optional ``KeyName`` and ``ValueName`` are provided for the mapping.
+It does not affect any contract functionality or bytecode, it only sets the ``name`` field
+for the inputs and outputs in the ABI for the mapping's getter.
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity ^0.8.18;
+
+    contract MappingExampleWithNames {
+        mapping(address user => uint balance) public balances;
+
+        function update(uint newBalance) public {
+            balances[msg.sender] = newBalance;
+        }
+    }
+
+
 The example below uses ``_allowances`` to record the amount someone else is allowed to withdraw from your account.
 
 .. code-block:: solidity
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index 2088293878..effbcb7e77 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -267,14 +267,59 @@ void DeclarationTypeChecker::endVisit(Mapping const& _mapping)
 		solAssert(dynamic_cast<ElementaryTypeName const*>(&_mapping.keyType()), "");
 
 	Type const* keyType = _mapping.keyType().annotation().type;
+	ASTString keyName = _mapping.keyName();
+
 	Type const* valueType = _mapping.valueType().annotation().type;
+	ASTString valueName = _mapping.valueName();
 
 	// Convert key type to memory.
 	keyType = TypeProvider::withLocationIfReference(DataLocation::Memory, keyType);
 
 	// Convert value type to storage reference.
 	valueType = TypeProvider::withLocationIfReference(DataLocation::Storage, valueType);
-	_mapping.annotation().type = TypeProvider::mapping(keyType, valueType);
+	_mapping.annotation().type = TypeProvider::mapping(keyType, keyName, valueType, valueName);
+
+	// Check if parameter names are conflicting.
+	if (!keyName.empty())
+	{
+		auto childMappingType = dynamic_cast<MappingType const*>(valueType);
+		ASTString currentValueName = valueName;
+		bool loop = true;
+		while (loop)
+		{
+			bool isError = false;
+			// Value type is a mapping.
+			if (childMappingType)
+			{
+				// Compare top mapping's key name with child mapping's key name.
+				ASTString childKeyName = childMappingType->keyName();
+				if (keyName == childKeyName)
+					isError = true;
+
+				auto valueType = childMappingType->valueType();
+				currentValueName = childMappingType->valueName();
+				childMappingType = dynamic_cast<MappingType const*>(valueType);
+			}
+			else
+			{
+				// Compare top mapping's key name with the value name.
+				if (keyName == currentValueName)
+					isError = true;
+
+				loop = false; // We arrived at the end of mapping recursion.
+			}
+
+			// Report error.
+			if (isError)
+			{
+				m_errorReporter.declarationError(
+					1809_error,
+					_mapping.location(),
+					"Conflicting parameter name \"" + keyName + "\" in mapping."
+				);
+			}
+		}
+	}
 }
 
 void DeclarationTypeChecker::endVisit(ArrayTypeName const& _typeName)
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index f5680acbc8..75b86bc754 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -1428,18 +1428,29 @@ class Mapping: public TypeName
 		int64_t _id,
 		SourceLocation const& _location,
 		ASTPointer<TypeName> _keyType,
-		ASTPointer<TypeName> _valueType
+		ASTPointer<ASTString> _keyName,
+		ASTPointer<TypeName> _valueType,
+		ASTPointer<ASTString> _valueName
 	):
-		TypeName(_id, _location), m_keyType(std::move(_keyType)), m_valueType(std::move(_valueType)) {}
+		TypeName(_id, _location),
+		m_keyType(std::move(_keyType)),
+		m_keyName(std::move(_keyName)),
+		m_valueType(std::move(_valueType)),
+		m_valueName(std::move(_valueName))
+	{}
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
 
 	TypeName const& keyType() const { return *m_keyType; }
+	ASTString keyName() const { return *m_keyName; }
 	TypeName const& valueType() const { return *m_valueType; }
+	ASTString valueName() const { return *m_valueName; }
 
 private:
 	ASTPointer<TypeName> m_keyType;
+	ASTPointer<ASTString> m_keyName;
 	ASTPointer<TypeName> m_valueType;
+	ASTPointer<ASTString> m_valueName;
 };
 
 /**
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index d308cd90ca..7ae528fcda 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -598,7 +598,9 @@ bool ASTJsonExporter::visit(Mapping const& _node)
 {
 	setJsonNode(_node, "Mapping", {
 		make_pair("keyType", toJson(_node.keyType())),
+		make_pair("keyName", _node.keyName()),
 		make_pair("valueType", toJson(_node.valueType())),
+		make_pair("valueName", _node.valueName()),
 		make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
 	});
 	return false;
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 96c37003e5..22b53aa474 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -648,7 +648,9 @@ ASTPointer<Mapping> ASTJsonImporter::createMapping(Json::Value const&  _node)
 	return createASTNode<Mapping>(
 		_node,
 		convertJsonToASTNode<TypeName>(member(_node, "keyType")),
-		convertJsonToASTNode<TypeName>(member(_node, "valueType"))
+		memberAsASTString(_node, "keyName"),
+		convertJsonToASTNode<TypeName>(member(_node, "valueType")),
+		memberAsASTString(_node, "valueName")
 	);
 }
 
diff --git a/libsolidity/ast/TypeProvider.cpp b/libsolidity/ast/TypeProvider.cpp
index 91d1da4be5..5112784b25 100644
--- a/libsolidity/ast/TypeProvider.cpp
+++ b/libsolidity/ast/TypeProvider.cpp
@@ -571,9 +571,9 @@ MagicType const* TypeProvider::meta(Type const* _type)
 	return createAndGet<MagicType>(_type);
 }
 
-MappingType const* TypeProvider::mapping(Type const* _keyType, Type const* _valueType)
+MappingType const* TypeProvider::mapping(Type const* _keyType, ASTString _keyName, Type const* _valueType, ASTString _valueName)
 {
-	return createAndGet<MappingType>(_keyType, _valueType);
+	return createAndGet<MappingType>(_keyType, _keyName, _valueType, _valueName);
 }
 
 UserDefinedValueType const* TypeProvider::userDefinedValueType(UserDefinedValueTypeDefinition const& _definition)
diff --git a/libsolidity/ast/TypeProvider.h b/libsolidity/ast/TypeProvider.h
index b089ff1efe..02b9eb35d2 100644
--- a/libsolidity/ast/TypeProvider.h
+++ b/libsolidity/ast/TypeProvider.h
@@ -195,7 +195,7 @@ class TypeProvider
 
 	static MagicType const* meta(Type const* _type);
 
-	static MappingType const* mapping(Type const* _keyType, Type const* _valueType);
+	static MappingType const* mapping(Type const* _keyType, ASTString _keyName, Type const* _valueType, ASTString _valueName);
 
 	static UserDefinedValueType const* userDefinedValueType(UserDefinedValueTypeDefinition const& _definition);
 
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 5980f93668..c5d36ce652 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -2788,14 +2788,16 @@ FunctionType::FunctionType(VariableDeclaration const& _varDecl):
 	m_declaration(&_varDecl)
 {
 	auto returnType = _varDecl.annotation().type;
+	ASTString returnName;
 
 	while (true)
 	{
 		if (auto mappingType = dynamic_cast<MappingType const*>(returnType))
 		{
 			m_parameterTypes.push_back(mappingType->keyType());
-			m_parameterNames.emplace_back("");
+			m_parameterNames.push_back(mappingType->keyName());
 			returnType = mappingType->valueType();
+			returnName = mappingType->valueName();
 		}
 		else if (auto arrayType = dynamic_cast<ArrayType const*>(returnType))
 		{
@@ -2834,7 +2836,7 @@ FunctionType::FunctionType(VariableDeclaration const& _varDecl):
 			DataLocation::Memory,
 			returnType
 		));
-		m_returnParameterNames.emplace_back("");
+		m_returnParameterNames.emplace_back(returnName);
 	}
 
 	solAssert(
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 735bd69025..9d8d3daf01 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1510,8 +1510,8 @@ class FunctionType: public Type
 class MappingType: public CompositeType
 {
 public:
-	MappingType(Type const* _keyType, Type const* _valueType):
-		m_keyType(_keyType), m_valueType(_valueType) {}
+	MappingType(Type const* _keyType, ASTString _keyName, Type const* _valueType, ASTString _valueName):
+		m_keyType(_keyType), m_keyName(_keyName), m_valueType(_valueType), m_valueName(_valueName) {}
 
 	Category category() const override { return Category::Mapping; }
 
@@ -1531,14 +1531,18 @@ class MappingType: public CompositeType
 	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override;
 
 	Type const* keyType() const { return m_keyType; }
+	ASTString keyName() const { return m_keyName; }
 	Type const* valueType() const { return m_valueType; }
+	ASTString valueName() const { return m_valueName; }
 
 protected:
 	std::vector<Type const*> decomposition() const override { return {m_valueType}; }
 
 private:
 	Type const* m_keyType;
+	ASTString m_keyName;
 	Type const* m_valueType;
+	ASTString m_valueName;
 };
 
 /**
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 8075e63e44..e81f0713fd 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1187,11 +1187,21 @@ ASTPointer<Mapping> Parser::parseMapping()
 	}
 	else
 		fatalParserError(1005_error, "Expected elementary type name or identifier for mapping key type");
+	ASTPointer<ASTString> keyName;
+	if (m_scanner->currentToken() == Token::Identifier)
+		keyName = getLiteralAndAdvance();
+	else
+		keyName = make_shared<ASTString>("");
 	expectToken(Token::DoubleArrow);
 	ASTPointer<TypeName> valueType = parseTypeName();
+	ASTPointer<ASTString> valueName;
+	if (m_scanner->currentToken() == Token::Identifier)
+		valueName = getLiteralAndAdvance();
+	else
+		valueName = make_shared<ASTString>("");
 	nodeFactory.markEndPosition();
 	expectToken(Token::RParen);
-	return nodeFactory.createNode<Mapping>(keyType, valueType);
+	return nodeFactory.createNode<Mapping>(keyType, keyName, valueType, valueName);
 }
 
 ASTPointer<ParameterList> Parser::parseParameterList(
diff --git a/test/libsolidity/ABIJson/mapping.sol b/test/libsolidity/ABIJson/mapping.sol
new file mode 100644
index 0000000000..e84b716f2a
--- /dev/null
+++ b/test/libsolidity/ABIJson/mapping.sol
@@ -0,0 +1,77 @@
+contract test {
+    mapping(address owner => mapping(address spender => uint value)) public allowance;
+    mapping(bytes32 => address sender) public commits;
+    mapping(bytes32 => bytes32) public something;
+}
+// ----
+//     :test
+// [
+//   {
+//     "inputs":
+//     [
+//       {
+//         "internalType": "address",
+//         "name": "owner",
+//         "type": "address"
+//       },
+//       {
+//         "internalType": "address",
+//         "name": "spender",
+//         "type": "address"
+//       }
+//     ],
+//     "name": "allowance",
+//     "outputs":
+//     [
+//       {
+//         "internalType": "uint256",
+//         "name": "value",
+//         "type": "uint256"
+//       }
+//     ],
+//     "stateMutability": "view",
+//     "type": "function"
+//   },
+//   {
+//     "inputs":
+//     [
+//       {
+//         "internalType": "bytes32",
+//         "name": "",
+//         "type": "bytes32"
+//       }
+//     ],
+//     "name": "commits",
+//     "outputs":
+//     [
+//       {
+//         "internalType": "address",
+//         "name": "sender",
+//         "type": "address"
+//       }
+//     ],
+//     "stateMutability": "view",
+//     "type": "function"
+//   },
+//   {
+//     "inputs":
+//     [
+//       {
+//         "internalType": "bytes32",
+//         "name": "",
+//         "type": "bytes32"
+//       }
+//     ],
+//     "name": "something",
+//     "outputs":
+//     [
+//       {
+//         "internalType": "bytes32",
+//         "name": "",
+//         "type": "bytes32"
+//       }
+//     ],
+//     "stateMutability": "view",
+//     "type": "function"
+//   }
+// ]
diff --git a/test/libsolidity/ASTJSON/address_payable.json b/test/libsolidity/ASTJSON/address_payable.json
index cc87fc3b9a..bf56f067fc 100644
--- a/test/libsolidity/ASTJSON/address_payable.json
+++ b/test/libsolidity/ASTJSON/address_payable.json
@@ -48,6 +48,7 @@
           "typeName":
           {
             "id": 3,
+            "keyName": "",
             "keyType":
             {
               "id": 1,
@@ -67,6 +68,7 @@
               "typeIdentifier": "t_mapping$_t_address_$_t_address_payable_$",
               "typeString": "mapping(address => address payable)"
             },
+            "valueName": "",
             "valueType":
             {
               "id": 2,
diff --git a/test/libsolidity/ASTJSON/address_payable_parseOnly.json b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
index fd7f772f68..6b72b6fb3c 100644
--- a/test/libsolidity/ASTJSON/address_payable_parseOnly.json
+++ b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
@@ -29,6 +29,7 @@
           "typeName":
           {
             "id": 3,
+            "keyName": "",
             "keyType":
             {
               "id": 1,
@@ -40,6 +41,7 @@
             "nodeType": "Mapping",
             "src": "17:35:1",
             "typeDescriptions": {},
+            "valueName": "",
             "valueType":
             {
               "id": 2,
diff --git a/test/libsolidity/ASTJSON/mappings.json b/test/libsolidity/ASTJSON/mappings.json
index e414b56fad..f63f6689fd 100644
--- a/test/libsolidity/ASTJSON/mappings.json
+++ b/test/libsolidity/ASTJSON/mappings.json
@@ -79,6 +79,7 @@
           "typeName":
           {
             "id": 8,
+            "keyName": "",
             "keyType":
             {
               "id": 6,
@@ -110,6 +111,7 @@
               "typeIdentifier": "t_mapping$_t_contract$_C_$19_$_t_bool_$",
               "typeString": "mapping(contract C => bool)"
             },
+            "valueName": "",
             "valueType":
             {
               "id": 7,
@@ -144,6 +146,7 @@
           "typeName":
           {
             "id": 12,
+            "keyName": "",
             "keyType":
             {
               "id": 10,
@@ -163,6 +166,7 @@
               "typeIdentifier": "t_mapping$_t_address_$_t_bool_$",
               "typeString": "mapping(address => bool)"
             },
+            "valueName": "",
             "valueType":
             {
               "id": 11,
@@ -197,6 +201,7 @@
           "typeName":
           {
             "id": 17,
+            "keyName": "",
             "keyType":
             {
               "id": 15,
@@ -228,6 +233,7 @@
               "typeIdentifier": "t_mapping$_t_enum$_E_$4_$_t_bool_$",
               "typeString": "mapping(enum C.E => bool)"
             },
+            "valueName": "",
             "valueType":
             {
               "id": 16,
diff --git a/test/libsolidity/ASTJSON/mappings_parseOnly.json b/test/libsolidity/ASTJSON/mappings_parseOnly.json
index e4f7ee21af..2471148492 100644
--- a/test/libsolidity/ASTJSON/mappings_parseOnly.json
+++ b/test/libsolidity/ASTJSON/mappings_parseOnly.json
@@ -60,6 +60,7 @@
           "typeName":
           {
             "id": 8,
+            "keyName": "",
             "keyType":
             {
               "id": 6,
@@ -81,6 +82,7 @@
             "nodeType": "Mapping",
             "src": "40:18:1",
             "typeDescriptions": {},
+            "valueName": "",
             "valueType":
             {
               "id": 7,
@@ -106,6 +108,7 @@
           "typeName":
           {
             "id": 12,
+            "keyName": "",
             "keyType":
             {
               "id": 10,
@@ -117,6 +120,7 @@
             "nodeType": "Mapping",
             "src": "66:24:1",
             "typeDescriptions": {},
+            "valueName": "",
             "valueType":
             {
               "id": 11,
@@ -142,6 +146,7 @@
           "typeName":
           {
             "id": 17,
+            "keyName": "",
             "keyType":
             {
               "id": 15,
@@ -163,6 +168,7 @@
             "nodeType": "Mapping",
             "src": "98:18:1",
             "typeDescriptions": {},
+            "valueName": "",
             "valueType":
             {
               "id": 16,
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType.json b/test/libsolidity/ASTJSON/userDefinedValueType.json
index 17bb19efae..743716548b 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType.json
@@ -287,6 +287,7 @@
           "typeName":
           {
             "id": 25,
+            "keyName": "",
             "keyType":
             {
               "id": 22,
@@ -318,6 +319,7 @@
               "typeIdentifier": "t_mapping$_t_userDefinedValueType$_MyAddress_$18_$_t_userDefinedValueType$_MyUInt_$20_$",
               "typeString": "mapping(C.MyAddress => C.MyUInt)"
             },
+            "valueName": "",
             "valueType":
             {
               "id": 24,
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
index 3cef5ea47e..5e263eaea8 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
@@ -213,6 +213,7 @@
           "typeName":
           {
             "id": 25,
+            "keyName": "",
             "keyType":
             {
               "id": 22,
@@ -234,6 +235,7 @@
             "nodeType": "Mapping",
             "src": "169:28:1",
             "typeDescriptions": {},
+            "valueName": "",
             "valueType":
             {
               "id": 24,
diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp
index d5fb1a08e8..63b943e979 100644
--- a/test/libsolidity/SolidityTypes.cpp
+++ b/test/libsolidity/SolidityTypes.cpp
@@ -97,12 +97,16 @@ BOOST_AUTO_TEST_CASE(storage_layout_mapping)
 		{"first", TypeProvider::fromElementaryTypeName("uint128")},
 		{"second", TypeProvider::mapping(
 			TypeProvider::fromElementaryTypeName("uint8"),
-			TypeProvider::fromElementaryTypeName("uint8")
+			"",
+			TypeProvider::fromElementaryTypeName("uint8"),
+			""
 		)},
 		{"third", TypeProvider::fromElementaryTypeName("uint16")},
 		{"final", TypeProvider::mapping(
 			TypeProvider::fromElementaryTypeName("uint8"),
-			TypeProvider::fromElementaryTypeName("uint8")
+			"",
+			TypeProvider::fromElementaryTypeName("uint8"),
+			""
 		)},
 	}));
 	BOOST_REQUIRE_EQUAL(u256(4), members.storageSize());
@@ -199,8 +203,8 @@ BOOST_AUTO_TEST_CASE(type_identifiers)
 	FunctionType metaFun(TypePointers{keccak256fun}, TypePointers{s.type()}, strings{""}, strings{""});
 	BOOST_CHECK_EQUAL(metaFun.identifier(), "t_function_internal_nonpayable$_t_function_keccak256_nonpayable$__$returns$__$_$returns$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$");
 
-	Type const* m = TypeProvider::mapping(TypeProvider::fromElementaryTypeName("bytes32"), s.type());
-	MappingType m2(TypeProvider::fromElementaryTypeName("uint64"), m);
+	Type const* m = TypeProvider::mapping(TypeProvider::fromElementaryTypeName("bytes32"), "", s.type(), "");
+	MappingType m2(TypeProvider::fromElementaryTypeName("uint64"), "", m, "");
 	BOOST_CHECK_EQUAL(m2.identifier(), "t_mapping$_t_uint64_$_t_mapping$_t_bytes32_$_t_type$_t_struct$_Struct_$3_storage_ptr_$_$_$");
 
 	// TypeType is tested with contract
diff --git a/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol b/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol
index cc3c1561af..ad228a7e13 100644
--- a/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol
+++ b/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol
@@ -10,4 +10,6 @@ contract Error2 {
 	mapping (address => uint balances; // missing ) before "balances"
 }
 // ----
-// ParserError 6635: (417-425): Expected ')' but got identifier
+// ParserError 6635: (425-426): Expected ')' but got ';'
+// ParserError 6635: (425-426): Expected identifier but got ';'
+// ParserError 6635: (458-459): Expected ';' but got '}'
diff --git a/test/libsolidity/errorRecoveryTests/error_to_eos.sol b/test/libsolidity/errorRecoveryTests/error_to_eos.sol
index 17d51a62d3..6ecc6d9d63 100644
--- a/test/libsolidity/errorRecoveryTests/error_to_eos.sol
+++ b/test/libsolidity/errorRecoveryTests/error_to_eos.sol
@@ -17,7 +17,8 @@ contract SendCoin {
 }
 
 // ----
-// ParserError 6635: (212-220): Expected ')' but got identifier
-// ParserError 6635: (220-221): Expected ';' but got ')'
-// ParserError 9182: (220-221): Function, variable, struct or modifier declaration expected.
-// Warning 3796: (235-236): Recovered in ContractDefinition at '}'.
+// ParserError 6635: (235-236): Expected identifier but got '}'
+// ParserError 6635: (276-284): Expected ';' but got 'contract'
+// ParserError 9182: (276-284): Function, variable, struct or modifier declaration expected.
+// Warning 3796: (572-573): Recovered in ContractDefinition at '}'.
+// ParserError 7858: (574-575): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
diff --git a/test/libsolidity/semanticTests/getters/mapping_with_names.sol b/test/libsolidity/semanticTests/getters/mapping_with_names.sol
new file mode 100644
index 0000000000..290a888094
--- /dev/null
+++ b/test/libsolidity/semanticTests/getters/mapping_with_names.sol
@@ -0,0 +1,9 @@
+contract C {
+    mapping(uint a => mapping(uint b => uint c)) public x;
+    constructor() {
+        x[1][2] = 3;
+    }
+}
+// ----
+// x(uint256,uint256): 1, 2 -> 3
+// x(uint256,uint256): 0, 0 -> 0
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs2.sol b/test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs2.sol
index 929075be10..cffe2b390f 100644
--- a/test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs2.sol
+++ b/test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs2.sol
@@ -13,3 +13,4 @@ contract Thing is IThing {
 
     mapping(uint256=>Value) public override value;
 }
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_1.sol
new file mode 100644
index 0000000000..2cdcb419e8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_1.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(address user => bytes32 ipfs) names;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_2.sol
new file mode 100644
index 0000000000..63be7caeee
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_2.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(address => bytes32 ipfs) names;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_3.sol
new file mode 100644
index 0000000000..c2458c3903
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_3.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(address user => bytes32) names;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_5.sol
new file mode 100644
index 0000000000..e2e510acd4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_5.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(address owner => mapping(address spender => bytes32[] notes)) names;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_6.sol
new file mode 100644
index 0000000000..ed3b11075a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_6.sol
@@ -0,0 +1,5 @@
+contract test {
+    mapping(address uint => bytes32 ipfs) names;
+}
+// ----
+// ParserError 2314: (36-40): Expected '=>' but got 'uint'
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_7.sol
new file mode 100644
index 0000000000..548129d04d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_7.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(address owner => bytes32[] note) notes;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_8.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_8.sol
new file mode 100644
index 0000000000..881b285045
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_8.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(address => mapping(address => address) hello) world;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_1.sol
new file mode 100644
index 0000000000..551bad6766
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_1.sol
@@ -0,0 +1,5 @@
+contract test {
+    address owner;
+    mapping(address owner => bytes32 ipfs) names;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_2.sol
new file mode 100644
index 0000000000..c8db832565
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_2.sol
@@ -0,0 +1,5 @@
+contract test {
+    mapping(address owner => address owner) owner;
+}
+// ----
+// DeclarationError 1809: (20-59): Conflicting parameter name "owner" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_3.sol
new file mode 100644
index 0000000000..172acceccd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_3.sol
@@ -0,0 +1,7 @@
+contract test {
+    mapping(address owner => mapping(address owner => address owner)) owner;
+}
+// ----
+// DeclarationError 1809: (45-84): Conflicting parameter name "owner" in mapping.
+// DeclarationError 1809: (20-85): Conflicting parameter name "owner" in mapping.
+// DeclarationError 1809: (20-85): Conflicting parameter name "owner" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_4.sol
new file mode 100644
index 0000000000..4e4a858924
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_4.sol
@@ -0,0 +1,5 @@
+contract test {
+    mapping(address owner => mapping(address owner => address hello)) world;
+}
+// ----
+// DeclarationError 1809: (20-85): Conflicting parameter name "owner" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_5.sol
new file mode 100644
index 0000000000..f2ea8315d6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_5.sol
@@ -0,0 +1,5 @@
+contract test {
+    mapping(address owner => mapping(address hello => address owner)) world;
+}
+// ----
+// DeclarationError 1809: (20-85): Conflicting parameter name "owner" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_6.sol
new file mode 100644
index 0000000000..56b3de07c2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_conflict_6.sol
@@ -0,0 +1,5 @@
+contract test {
+    mapping(address hello => mapping(address owner => address owner)) world;
+}
+// ----
+// DeclarationError 1809: (45-84): Conflicting parameter name "owner" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_1.sol
new file mode 100644
index 0000000000..aaf0d4ed9a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_1.sol
@@ -0,0 +1,6 @@
+contract test {
+    function _main(mapping(uint name1 => uint name2) storage map) internal {
+        map[1] = 2;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_2.sol
new file mode 100644
index 0000000000..de3e146803
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_2.sol
@@ -0,0 +1,6 @@
+contract test {
+    function _main(mapping(uint name1 => uint) storage map) internal {
+        map[1] = 2;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_3.sol
new file mode 100644
index 0000000000..d0edd59d9a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_3.sol
@@ -0,0 +1,6 @@
+contract test {
+    function _main(mapping(uint => uint name2) storage map) internal {
+        map[1] = 2;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_4.sol
new file mode 100644
index 0000000000..896a5fdce9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_4.sol
@@ -0,0 +1,6 @@
+contract test {
+    function _main(mapping(uint name1 => mapping(uint name2 => uint name3) name4) storage map) internal {
+        map[1][2] = 3;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_5.sol
new file mode 100644
index 0000000000..40f4a44be9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_5.sol
@@ -0,0 +1,6 @@
+contract test {
+    function _main(mapping(uint name1 => uint[] name2) storage map) internal {
+        map[1].push(2);
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_6.sol
new file mode 100644
index 0000000000..660f69907c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_6.sol
@@ -0,0 +1,7 @@
+contract test {
+    function _main(mapping(uint nameSame => mapping(uint name2 => mapping(uint nameSame => uint name3) name4) name5) storage map) internal {
+        map[1][2][3] = 4;
+    }
+}
+// ----
+// DeclarationError 1809: (35-132): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_7.sol
new file mode 100644
index 0000000000..5234e246b8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_param_7.sol
@@ -0,0 +1,6 @@
+contract test {
+    function _main(mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) storage map) internal {
+        map[1][2][3] = 4;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_1.sol
new file mode 100644
index 0000000000..c59ab1f1e9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_1.sol
@@ -0,0 +1,4 @@
+contract test {
+    function(mapping(uint name1 => uint name2) storage) internal stateVariableName;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_2.sol
new file mode 100644
index 0000000000..ce5d6e2097
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_2.sol
@@ -0,0 +1,4 @@
+contract test {
+    function(mapping(uint name1 => uint) storage) internal stateVariableName;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_3.sol
new file mode 100644
index 0000000000..8e44113386
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_3.sol
@@ -0,0 +1,4 @@
+contract test {
+    function(mapping(uint => uint name2) storage) internal stateVariableName;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_4.sol
new file mode 100644
index 0000000000..22922611aa
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_4.sol
@@ -0,0 +1,4 @@
+contract test {
+    function(mapping(uint name1 => mapping(uint name2 => uint name3) name4) storage) internal stateVariableName;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_5.sol
new file mode 100644
index 0000000000..38b9c6b123
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_5.sol
@@ -0,0 +1,4 @@
+contract test {
+    function(mapping(uint name1 => uint[] name2) storage) internal stateVariableName;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_6.sol
new file mode 100644
index 0000000000..daf9adc585
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_6.sol
@@ -0,0 +1,5 @@
+contract test {
+    function(mapping(uint nameSame => mapping(uint name2 => mapping(uint nameSame => uint name3) name4) name5) storage) internal stateVariableName;
+}
+// ----
+// DeclarationError 1809: (29-126): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_7.sol
new file mode 100644
index 0000000000..78e3a513b1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_func_type_param_7.sol
@@ -0,0 +1,4 @@
+contract test {
+    function(mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) storage) internal stateVariableName;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_1.sol
new file mode 100644
index 0000000000..dad80d594d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_1.sol
@@ -0,0 +1,9 @@
+contract test {
+    mapping(uint name1 => uint name2) map;
+
+    function main() external {
+        mapping(uint name3 => uint name4) storage _map = map;
+        _map[1] = 2;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_2.sol
new file mode 100644
index 0000000000..ee61e084dd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_2.sol
@@ -0,0 +1,9 @@
+contract test {
+    mapping(uint name1 => uint) map;
+
+    function main() external {
+        mapping(uint => uint name4) storage _map = map;
+        _map[1] = 2;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_3.sol
new file mode 100644
index 0000000000..963ff82bf4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_3.sol
@@ -0,0 +1,9 @@
+contract test {
+    mapping(uint => uint name2) map;
+
+    function main() external {
+        mapping(uint name3 => uint) storage _map = map;
+        _map[1] = 2;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_4.sol
new file mode 100644
index 0000000000..e4ebf16a37
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_4.sol
@@ -0,0 +1,9 @@
+contract test {
+    mapping(uint name1 => mapping(uint name2 => uint name3) name4) map;
+
+    function main() external {
+        mapping(uint name5 => uint name6) storage _map = map[1];
+        _map[1] = 2;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_5.sol
new file mode 100644
index 0000000000..7558274105
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_5.sol
@@ -0,0 +1,9 @@
+contract test {
+    mapping(uint name1 => uint[] name4) map;
+
+    function main() external {
+        mapping(uint name5 => uint[] name6) storage _map = map;
+        _map[1].push(2);
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_6.sol
new file mode 100644
index 0000000000..d1bda36fcb
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_6.sol
@@ -0,0 +1,10 @@
+contract test {
+    mapping(uint name1 => mapping(uint name2 => uint name3) name4) map;
+
+    function main() external {
+        mapping(uint nameSame => mapping(uint name2 => uint nameSame) name4) storage _map = map;
+        _map[1][2] = 3;
+    }
+}
+// ----
+// DeclarationError 1809: (128-196): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_7.sol
new file mode 100644
index 0000000000..ccb44f860d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_7.sol
@@ -0,0 +1,11 @@
+contract test {
+    mapping(uint nameSame => mapping(uint name1 => mapping(uint nameSame => uint name3) name6) name4) map;
+
+    function main() external {
+        mapping(uint nameSame => mapping(uint name1 => mapping(uint nameSame => uint name3) name6) name4) storage _map = map;
+        _map[1][2][3] = 4;
+    }
+}
+// ----
+// DeclarationError 1809: (20-117): Conflicting parameter name "nameSame" in mapping.
+// DeclarationError 1809: (163-260): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_8.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_8.sol
new file mode 100644
index 0000000000..08bb80c9e1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_local_8.sol
@@ -0,0 +1,9 @@
+contract test {
+    mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) map;
+
+    function main() external {
+        mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) storage _map = map;
+        _map[1][2][3] = 4;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_1.sol
new file mode 100644
index 0000000000..b5b2bc55d8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_1.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(address owner => mapping(address spender => bytes32 note)) names;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_2.sol
new file mode 100644
index 0000000000..e65e3be2bf
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_2.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(address => mapping(address spender => bytes32 note)) names;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_3.sol
new file mode 100644
index 0000000000..c0a7472a24
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_3.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(address owner => mapping(address => bytes32 note)) names;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_4.sol
new file mode 100644
index 0000000000..011ab97fa6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_4.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(address owner => mapping(address spender => bytes32)) names;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_5.sol
new file mode 100644
index 0000000000..30e37bfae8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_5.sol
@@ -0,0 +1,5 @@
+contract test {
+    mapping(address owner => mapping(address spender => bytes32 note));
+}
+// ----
+// ParserError 2314: (86-87): Expected identifier but got ';'
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_6.sol
new file mode 100644
index 0000000000..a31c8d4ca6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_6.sol
@@ -0,0 +1,5 @@
+contract test {
+    mapping(uint nameSame => mapping(uint name1 => mapping(uint nameSame => uint name2) name3) name4) name5;
+}
+// ----
+// DeclarationError 1809: (20-117): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_7.sol
new file mode 100644
index 0000000000..848f2b5e39
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_7.sol
@@ -0,0 +1,5 @@
+contract test {
+    mapping(uint nameSame => mapping(uint name1 => mapping(uint nameSame => uint name3) name6) name4) public name5;
+}
+// ----
+// DeclarationError 1809: (20-117): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_8.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_8.sol
new file mode 100644
index 0000000000..a3d839a51a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_nested_8.sol
@@ -0,0 +1,4 @@
+contract test {
+    mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) public name7;
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_1.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_1.sol
new file mode 100644
index 0000000000..ce3d88813c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_1.sol
@@ -0,0 +1,6 @@
+contract test {
+    struct Person {
+        mapping(uint phone => uint calls) friends;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_2.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_2.sol
new file mode 100644
index 0000000000..69c733009f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_2.sol
@@ -0,0 +1,6 @@
+contract test {
+    struct Person {
+        mapping(uint phone => uint) friends;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_3.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_3.sol
new file mode 100644
index 0000000000..ec078ab26e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_3.sol
@@ -0,0 +1,6 @@
+contract test {
+    struct Person {
+        mapping(uint => uint calls) friends;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_4.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_4.sol
new file mode 100644
index 0000000000..d3ee618ac7
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_4.sol
@@ -0,0 +1,6 @@
+contract test {
+    struct Person {
+        mapping(uint phone => mapping(uint call => uint time) callTimes) friends;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_5.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_5.sol
new file mode 100644
index 0000000000..ccc6d1a553
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_5.sol
@@ -0,0 +1,6 @@
+contract test {
+    struct Person {
+        mapping(uint phone => uint[] calls) friends;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_6.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_6.sol
new file mode 100644
index 0000000000..8b65f281de
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_6.sol
@@ -0,0 +1,7 @@
+contract test {
+    struct Person {
+        mapping(uint nameSame => mapping(uint name1 => mapping(uint nameSame => uint name2) name3) name4) name5;
+    }
+}
+// ----
+// DeclarationError 1809: (44-141): Conflicting parameter name "nameSame" in mapping.
diff --git a/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_7.sol b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_7.sol
new file mode 100644
index 0000000000..08ce99da29
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/mapping_with_names_struct_member_7.sol
@@ -0,0 +1,6 @@
+contract test {
+    struct Person {
+        mapping(uint name1 => mapping(uint name2 => mapping(uint name3 => uint name4) name5) name6) name7;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/mapping_key.sol b/test/libsolidity/syntaxTests/userDefinedValueType/mapping_key.sol
index ae83ae4c73..d2d5585c16 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/mapping_key.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/mapping_key.sol
@@ -2,3 +2,4 @@ type MyInt is int;
 contract C {
     mapping(MyInt => int) m;
 }
+// ----

From 1f1b5910dc9c1979ace05477174599407bc6f252 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 9 Dec 2022 13:38:25 +0100
Subject: [PATCH 1086/1748] Change base image of t_ubu_asan_cli and
 t_ubu_codecov to image with higher resource_class

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a4a7605d26..784b561d91 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -862,7 +862,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   t_ubu_codecov:
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2004_large
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 1
@@ -1099,7 +1099,7 @@ jobs:
 
   t_ubu_asan_cli:
     # Runs slightly faster on medium but we only run it nightly so efficiency matters more.
-    <<: *base_ubuntu2004_small
+    <<: *base_ubuntu2004
     environment:
       TERM: xterm
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2

From f5858a118d5a4dfc30c0049add0d15e6284e4ab7 Mon Sep 17 00:00:00 2001
From: John Kane <john@kanej.me>
Date: Mon, 5 Dec 2022 11:30:37 +0000
Subject: [PATCH 1087/1748] docs(resources.rst): update editor extensions

Update the editor extensions section of the resources page:

1. Remove the Atom section - as Atom is being deprecated on
   2022-12-15. See https://github.blog/2022-06-08-sunsetting-atom/.
2. Update the vim syntax plugins - remove the tomlion extension as
   no longer maintained, add the thesis and TovarishFin forks of
   the tomlion vim syntax highlighter as these are both maintained.
3. add/rename vscode extensions - add truffle and remix extensions,
   rename the two Solidity extensions to include the authors for
   disambiguation.
4. Clarify the Visual Studio Code title by including `VS Code` in
   brackets, as many people only know it as `VS Code`.
5. Use Sublime Text's full name.

Co-authored-by: franzihei <41991517+franzihei@users.noreply.github.com>
Co-authored-by: Nuno Santos <nunofilipesantos@gmail.com>
---
 docs/resources.rst | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/docs/resources.rst b/docs/resources.rst
index 3b403cd6d0..9084037d9d 100644
--- a/docs/resources.rst
+++ b/docs/resources.rst
@@ -43,17 +43,6 @@ Integrated (Ethereum) Development Environments
 Editor Integrations
 ===================
 
-* Atom
-
-    * `Etheratom <https://github.com/0mkara/etheratom>`_
-        Plugin for the Atom editor that features syntax highlighting, compilation and a runtime environment (Backend node & VM compatible).
-
-    * `Atom Solidity Linter <https://atom.io/packages/linter-solidity>`_
-        Plugin for the Atom editor that provides Solidity linting.
-
-    * `Atom Solium Linter <https://atom.io/packages/linter-solium>`_
-        Configurable Solidity linter for Atom using Solium (now Ethlint) as a base.
-
 * Emacs
 
     * `Emacs Solidity <https://github.com/ethereum/emacs-solidity/>`_
@@ -62,31 +51,40 @@ Editor Integrations
 * IntelliJ
 
     * `IntelliJ IDEA plugin <https://plugins.jetbrains.com/plugin/9475-intellij-solidity>`_
-        Solidity plugin for IntelliJ IDEA (and all other JetBrains IDEs)
+        Solidity plugin for IntelliJ IDEA (and all other JetBrains IDEs).
 
-* Sublime
+* Sublime Text
 
     * `Package for SublimeText - Solidity language syntax <https://packagecontrol.io/packages/Ethereum/>`_
         Solidity syntax highlighting for SublimeText editor.
 
 * Vim
 
-    * `Vim Solidity <https://github.com/tomlion/vim-solidity/>`_
-        Plugin for the Vim editor providing syntax highlighting.
+    * `Vim Solidity by Thesis <https://github.com/thesis/vim-solidity/>`_
+        Syntax highlighting for Solidity in Vim.
+
+    * `Vim Solidity by TovarishFin <https://github.com/TovarishFin/vim-solidity>`_
+        Vim syntax file for Solidity.
 
     * `Vim Syntastic <https://github.com/vim-syntastic/syntastic>`_
         Plugin for the Vim editor providing compile checking.
 
-* Visual Studio Code
+* Visual Studio Code (VS Code)
+
+    * `Ethereum Remix Visual Studio Code extension <https://marketplace.visualstudio.com/items?itemName=RemixProject.ethereum-remix>`_
+        Ethereum Remix extension pack for VS Code
 
-    * `Visual Studio Code extension <https://juan.blanco.ws/solidity-contracts-in-visual-studio-code/>`_
+    * `Solidity Visual Studio Code extension, by Juan Blanco <https://juan.blanco.ws/solidity-contracts-in-visual-studio-code/>`_
         Solidity plugin for Microsoft Visual Studio Code that includes syntax highlighting and the Solidity compiler.
 
+    * `Solidity Visual Studio Code extension, by Nomic Foundation <https://marketplace.visualstudio.com/items?itemName=NomicFoundation.hardhat-solidity>`_
+        Solidity and Hardhat support by the Hardhat team, including: syntax highlighting, jump to definition, renames, quick fixes and inline solc warnings and errors.
+
     * `Solidity Visual Auditor extension <https://marketplace.visualstudio.com/items?itemName=tintinweb.solidity-visual-auditor>`_
         Adds security centric syntax and semantic highlighting to Visual Studio Code.
 
-    * `Hardhat + Solidity Visual Studio Code extension <https://marketplace.visualstudio.com/items?itemName=NomicFoundation.hardhat-solidity>`_
-        Solidity and Hardhat support by the Hardhat team.
+    * `Truffle for VS Code <https://marketplace.visualstudio.com/items?itemName=trufflesuite-csi.truffle-vscode>`_
+        Build, debug and deploy smart contracts on Ethereum and EVM-compatible blockchains.
 
 Solidity Tools
 ==============

From a98bb41bd3d120df687ae54c170939fc3a6dbcf6 Mon Sep 17 00:00:00 2001
From: Kaan Uzdogan <kaanuzdogan@hotmail.com>
Date: Wed, 14 Dec 2022 18:15:50 +0100
Subject: [PATCH 1088/1748] Add Solidity favicon to docs

---
 docs/_static/img/favicon.png | Bin 0 -> 949 bytes
 docs/conf.py                 |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 docs/_static/img/favicon.png

diff --git a/docs/_static/img/favicon.png b/docs/_static/img/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..3991d87e98b9348b5e7a7c52ccd67a795361edec
GIT binary patch
literal 949
zcmV;m14{gfP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px&Z%IT!R9HvtmQ6^LaU93LbDPc=Cc3%ws<V-jq?Z(YNxM`;XxX7U_%cK7pq81=
zP_c`z-OQQ6w1X2P%uXp`dJ@YZHS*xLJS=44bn0Tmw=I4TI9z+`d4_@n{$Pjkf1dB}
z^LzXM9>L}>ha1Oef)jxMDg$n}8%Co6J3Bk9T_cxAL7`Ci)lq)+z})OC?v<AzI3(D|
zNkBjV($h1bsecTySj-!OH^AQB9*PSKF!OnaiBc#OdO4BH<%o`s#*O@&$jr<-dVsO9
zQQWVpgxlppa7YLuA|gCaL?RKC%6N!GLP*2IQCFuyXlNKO2woX*I2_2oo`<ES?~JHG
zAOJ-y4h&@e$Hc@yCX;y_X6IZ)Zf@Su0rd6h(B9hOB^VSG1esh8Nst6_$~XpU-{|aN
z%_Arjr#K-vGqAF<g4}CYv9`A6BNh=E36)9(sZ{E7b}l&ug@r|4U~Dv;0HdSt(A3z#
z8cA|;3e;*f)r55_lFlZ1%JjEXZ~|;^Z=<aAE{sN_mj;bmS64UABqVUA`Ckuk0?^A-
zQ&Xtd)WYR*d9*HFz5<P=o-@T<bi4q_acyl4K2A?FdSPK<(Dl7!=Ki3qt*#>Sz%+0<
zXC{j8E-)-EqP)BmR1#{gVs(j^{>H`zswykc(b);QlKC2M0NMkc9qpKz`NTv|SvY7t
z+HUCe1I+wCsII2icrow>AT=7vg@td(%DUhsZZ?}yqAr5d=>**Y+MZr0mCB<BU{j>b
zJZWym`1pIzaavj$T3Xvd3yRD9$^e@fZOE#s3ed9JH*(z8)`9b>sa*cKn~)-;ADfX=
za{hIG-se~u9}lheIa88D-2*?&X7u;#;Bxsw(DghyIe}f450t1V1%^l7dTmWM5Y7@%
z^nE%V=H|Y5y-#<8$!Nm*#yV_&><L;-4UJ8>b^FfYOF#-1iv>?R+nGCH->fTESbkcV
zzgDXi+gn?nv(qXShF-mfL?SsF08$xwGmMFe4~*dM?k)@lgQxKbY}IOIdW9OWt6Pig
z>>N(#^Z;iG_Eqe5JK9=XV7G5#d3o7qJ=<(HI2{gTWMrbJ_XV#J^b3F<riL5T55QzH
z`Ah~)#JbG}{ooK15)*kv?>7K_j%&N0F*Rqi*w|PU@c0Nh_%81f@D9n(2TuTwJp;c1
XVEC$#J{^j000000NkvXXu0mjfsa3e@

literal 0
HcmV?d00001

diff --git a/docs/conf.py b/docs/conf.py
index 10aa406f28..61df2b53ec 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -152,7 +152,7 @@ def setup(sphinx):
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+html_favicon = "_static/img/favicon.png"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,

From ab78f69bf531ad30c388073f368d7111e4a2e245 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 15 Dec 2022 12:53:57 +0100
Subject: [PATCH 1089/1748] Pin v4-core dependecy to fix failing exteral
 pooltogether test

---
 test/externalTests/pool-together.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index a3461a6b03..80a8f4ad05 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -69,6 +69,9 @@ function pool_together_test
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
     yarn install
 
+    # TODO: Remove this when https://github.com/pooltogether/v4-core/issues/287 gets fixed.
+    npm install @pooltogether/pooltogether-rng-contracts@1.4.0
+
     # These come with already compiled artifacts. We want them recompiled with latest compiler.
     rm -r node_modules/@pooltogether/yield-source-interface/artifacts/
     rm -r node_modules/@pooltogether/uniform-random-number/artifacts/

From cca1b460c95c230eabd853aa5c806aaa4545a620 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 15 Dec 2022 15:55:52 +0100
Subject: [PATCH 1090/1748] Unpeg fixed dependency from elementfi external test

---
 test/externalTests/elementfi.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index 4901c6bf1c..bf68b9adf3 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -87,10 +87,6 @@ function elementfi_test
     sed -i 's|bytes32(uint256(pool))|bytes32(uint256(uint160(pool)))|g' vault/PoolRegistry.sol
     popd
 
-    # The test suite uses forked Mainnet and an expiration period that's too short.
-    # TODO: Remove when https://github.com/element-fi/elf-contracts/issues/243 is fixed.
-    sed -i 's|^\s*require(_expiration - block\.timestamp < _unitSeconds);\s*$||g' contracts/ConvergentCurvePool.sol
-
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
     # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).

From d1a158368a0f67a2673f323a70a20f3508725482 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 16 Dec 2022 11:34:00 +0100
Subject: [PATCH 1091/1748] External tests maintenance

---
 .gitignore                            |  1 +
 test/externalTests/chainlink.sh       |  4 ++--
 test/externalTests/elementfi.sh       |  2 +-
 test/externalTests/ens.sh             |  4 ++--
 test/externalTests/euler.sh           |  6 +-----
 test/externalTests/gnosis.sh          | 10 +++-------
 test/externalTests/gp2.sh             |  2 +-
 test/externalTests/perpetual-pools.sh |  2 +-
 test/externalTests/pool-together.sh   |  2 +-
 test/externalTests/prb-math.sh        |  2 +-
 test/externalTests/trident.sh         |  2 +-
 test/externalTests/uniswap.sh         |  2 +-
 test/externalTests/zeppelin.sh        |  6 +++---
 13 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f17171816..773f09be6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,7 @@ emscripten_build/
 /docs/_build
 /docs/_static/robots.txt
 /deps
+/reports
 
 # vim stuff
 [._]*.sw[a-p]
diff --git a/test/externalTests/chainlink.sh b/test/externalTests/chainlink.sh
index 9f50e1486f..249a1254cd 100755
--- a/test/externalTests/chainlink.sh
+++ b/test/externalTests/chainlink.sh
@@ -64,7 +64,7 @@ function chainlink_test
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
     sed -i "s|\(it\)\(('reverts'\)|\1.skip\2|g" test/v0.6/BasicConsumer.test.ts
     sed -i "s|\(it\)\(('has a reasonable gas cost \[ @skip-coverage \]'\)|\1.skip\2|g" test/v0.6/BasicConsumer.test.ts
     sed -i "s|\(describe\)\(('#add[^']*'\)|\1.skip\2|g" test/v0.6/Chainlink.test.ts
@@ -78,7 +78,7 @@ function chainlink_test
     sed -i "s|\(context\)\(('when permissions are not set'\)|\1.skip\2|g" test/v0.8/KeeperRegistry.test.ts
 
     # In some cases Hardhat does not detect revert reasons properly via IR.
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|\(it\)\(('does not allow the specified address to start new rounds'\)|\1.skip\2|g" test/v0.6/FluxAggregator.test.ts
     sed -i "s|\(describe\)\(('when called by a stranger'\)|\1.skip\2|g" test/v0.6/FluxAggregator.test.ts
     sed -i "s|\(describe\)\(('if the access control is turned on'\)|\1.skip\2|g" test/v0.*/Flags.test.ts
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index bf68b9adf3..b667a4bbc0 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -89,7 +89,7 @@ function elementfi_test
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
     sed -i 's|it(\("fails to withdraw more shares than in balance"\)|it.skip(\1|g' test/compoundAssetProxyTest.ts
     sed -i 's|it(\("should prevent withdrawal of Principal Tokens and Interest Tokens before the tranche expires "\)|it.skip(\1|g' test/trancheTest.ts
     sed -i 's|it(\("should prevent withdrawal of more Principal Tokens and Interest Tokens than the user has"\)|it.skip(\1|g' test/trancheTest.ts
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 5cc2a574d4..1233085382 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -69,9 +69,9 @@ function ens_test
     neutralize_packaged_contracts
 
     # In some cases Hardhat does not detect revert reasons properly via IR.
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|it\(('Does not allow wrapping a name you do not own',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|it\(('can set fuses and then burn ability to burn fuses',\)|it.skip\1|g" test/wrapper/NameWrapper.js
     sed -i "s|it\(('can set fuses and burn canSetResolver and canSetTTL',\)|it.skip\1|g" test/wrapper/NameWrapper.js
     sed -i "s|it\(('Cannot be called if CANNOT_TRANSFER is burned\.',\)|it.skip\1|g" test/wrapper/NameWrapper.js
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index e26b892486..78e89d147b 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -63,7 +63,7 @@ function euler_test
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "/expectError: 'JUNK_UPGRADE_TEST_FAILURE'/d" test/moduleUpgrade.js
     sed -i "/et\.expect(errMsg)\.to\.contain('e\/collateral-violation');/d" test/flashLoanNative.js
 
@@ -73,10 +73,6 @@ function euler_test
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
     force_hardhat_unlimited_contract_size "$config_file"
     npm install
-
-    # TODO: Remove this when https://github.com/Uniswap/v3-periphery/issues/313 gets fixed.
-    npm install @uniswap/v3-periphery@1.4.1
-
     replace_version_pragmas
     neutralize_packaged_contracts
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 81e5180c60..a6ded27e16 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -71,9 +71,9 @@ function gnosis_safe_test
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
     sed -i "s|\(it\)\(('should not allow to call setup on singleton'\)|\1.skip\2|g" test/core/GnosisSafe.Setup.spec.ts
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i 's|\(it\)\(("changes the expected storage slot without touching the most important ones"\)|\1.skip\2|g' test/libraries/SignMessageLib.spec.ts
     sed -i "s|\(it\)\(('can be used only via DELEGATECALL opcode'\)|\1.skip\2|g" test/libraries/SignMessageLib.spec.ts
     sed -i 's|\(describe\)\(("Upgrade from Safe 1.1.1"\)|\1.skip\2|g' test/migration/UpgradeFromSafe111.spec.ts
@@ -82,7 +82,7 @@ function gnosis_safe_test
     # TODO: Remove this when Gnosis merges https://github.com/gnosis/safe-contracts/pull/394
     sed -i "s|\(function isValidSignature(bytes \)calldata\( _data, bytes \)calldata\( _signature)\)|\1memory\2memory\3|g" contracts/handler/CompatibilityFallbackHandler.sol
 
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|it\(('should enforce delegatecall'\)|it.skip\1|g" test/accessors/SimulateTxAccessor.spec.ts
     sed -i "s|it\(('can only be called from Safe itself'\)|it.skip\1|g" test/libraries/Migration.spec.ts
     sed -i "s|it\(('should enforce delegatecall to MultiSend'\)|it.skip\1|g" test/libraries/MultiSend.spec.ts
@@ -122,10 +122,6 @@ function gnosis_safe_test
     # TODO: Remove when https://github.com/safe-global/safe-contracts/issues/436 is resolved.
     npx npm install @nomiclabs/hardhat-ethers@2.1.0
 
-    # Hardhat 2.9.5 introduced a bug with handling padded arguments to getStorageAt().
-    # TODO: Remove when https://github.com/NomicFoundation/hardhat/issues/2709 is fixed.
-    npx npm install hardhat@2.9.4
-
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"
 
diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index ad75f83bdd..9e9ee72af2 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -99,7 +99,7 @@ function gp2_test
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
     sed -i 's|it\(("should revert when encoding invalid flags"\)|it.skip\1|g' test/GPv2Trade.test.ts
 
     replace_version_pragmas
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index a389e833f3..18fb308af4 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -61,7 +61,7 @@ function perpetual_pools_test
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
     sed -i 's|\(it\)\(("Should not allow commits that are too large"\)|\1.skip\2|g' test/PoolCommitter/commit.spec.ts
     sed -i 's|\(it\)\(("Should not allow for too many commitments (that bring amount over a user'\''s balance)"\)|\1.skip\2|g' test/PoolCommitter/commit.spec.ts
 
diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index 80a8f4ad05..14c7853f4e 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -59,7 +59,7 @@ function pool_together_test
     setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
     download_project "$repo" "$ref_type" "$ref" "$DIR"
 
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|it\(('should fail to return value if value passed does not fit in [0-9]\+ bits'\)|it.skip\1|g" test/libraries/ExtendedSafeCast.test.ts
     sed -i "s|it\(('should require an rng to be requested'\)|it.skip\1|g" test/DrawBeacon.test.ts
 
diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
index 98a73627f8..78a39519e4 100755
--- a/test/externalTests/prb-math.sh
+++ b/test/externalTests/prb-math.sh
@@ -71,7 +71,7 @@ function prb_math_test
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
     pushd test/contracts/prbMathUd60x18/pure/
     sed -i 's|context(\("when the sum overflows"\)|context.skip(\1|g' add.test.ts
     sed -i 's|context(\("when the sum does not overflow"\)|context.skip(\1|g' add.test.ts
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index 401446f998..b5d48b500a 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -89,7 +89,7 @@ function trident_test
     sed -i 's|IStrategy(0)|IStrategy(address(0))|g' contracts/flat/BentoBoxV1Flat.sol
     find contracts -name "*.sol" -exec sed -i -e 's/^\(\s*\)\(assembly\)/\1\/\/\/ @solidity memory-safe-assembly\n\1\2/' '{}' \;
 
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i 's|it\(("Reverts on direct deployment via factory"\)|it.skip\1|g' test/MasterDeployer.test.ts
 
     # @sushiswap/core package contains contracts that get built with 0.6.12 and fail our compiler
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index 5da068df8e..8b07aee84e 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -61,7 +61,7 @@ function uniswap_test
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|it\(('underpay zero for one and exact in',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
     sed -i "s|it\(('pay in the wrong token zero for one and exact in',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
     sed -i "s|it\(('underpay zero for one and exact out',\)|it.skip\1|g" test/UniswapV3Pool.spec.ts
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index fafa23ffb3..27198a8f0e 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -63,7 +63,7 @@ function zeppelin_test
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/2115).
+    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
     pushd test/utils/
     sed -i "s|it(\('reverts \)|it.skip(\1|g" math/SafeMath.test.js
     sed -i "s|it(\('reverts \)|it.skip(\1|g" math/SignedSafeMath.test.js
@@ -75,7 +75,7 @@ function zeppelin_test
 
 
     # In some cases Hardhat does not detect revert reasons properly via IR.
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2453 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|it(\('reverts if the current value is 0'\)|it.skip(\1|g" test/utils/Counters.test.js
     sed -i "s|it(\('prevent unauthorized maintenance'\)|it.skip(\1|g" test/governance/TimelockController.test.js
     sed -i "s|it(\('cannot cancel invalid operation'\)|it.skip(\1|g" test/governance/TimelockController.test.js
@@ -123,7 +123,7 @@ function zeppelin_test
 
 
 
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/2115 gets fixed.
+    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|describe\(('Polygon-Child'\)|describe.skip\1|g" test/crosschain/CrossChainEnabled.test.js
     sed -i "s|it(\('revert with invalid multi proof #2'\)|it.skip(\1|g" test/utils/cryptography/MerkleProof.test.js
     sed -i "s|describe(\('to a receiver contract that panics'\)|describe.skip(\1|g" test/token/ERC721/ERC721.behavior.js

From d5c6fd881b41b0fc11b65a63d34540d752c6cfdc Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Fri, 9 Dec 2022 10:44:38 +0100
Subject: [PATCH 1092/1748] update docs on the required z3 version

---
 CMakeLists.txt               | 2 +-
 docs/installing-solidity.rst | 2 +-
 docs/smtchecker.rst          | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b43f244949..d04d708ae2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/licens
 include(EthOptions)
 configure_project(TESTS)
 set(LATEST_Z3_VERSION "4.11.2")
-set(MINIMUM_Z3_VERSION "4.8.0")
+set(MINIMUM_Z3_VERSION "4.8.16")
 find_package(Z3)
 if (${Z3_FOUND})
   if (${STRICT_Z3_VERSION})
diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 9a613d75d3..1b6ac66354 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -326,7 +326,7 @@ The following are dependencies for all builds of Solidity:
 +-----------------------------------+-------------------------------------------------------+
 | `Git`_                            | Command-line tool for retrieving source code.         |
 +-----------------------------------+-------------------------------------------------------+
-| `z3`_ (version 4.8+, Optional)    | For use with SMT checker.                             |
+| `z3`_ (version 4.8.16+, Optional) | For use with SMT checker.                             |
 +-----------------------------------+-------------------------------------------------------+
 | `cvc4`_ (Optional)                | For use with SMT checker.                             |
 +-----------------------------------+-------------------------------------------------------+
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index b1a39ee17d..c16a3e5d71 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -632,7 +632,8 @@ option ``--model-checker-solvers {all,cvc4,eld,smtlib2,z3}`` or the JSON option
 .. note::
   z3 version 4.8.16 broke ABI compatibility with previous versions and cannot
   be used with solc <=0.8.13. If you are using z3 >=4.8.16 please use solc
-  >=0.8.14.
+  >=0.8.14, and conversely, only use older z3 with older solc releases.
+  We also recommend using the latest z3 release which is what SMTChecker also does.
 
 Since both BMC and CHC use ``z3``, and ``z3`` is available in a greater variety
 of environments, including in the browser, most users will almost never need to be

From 4d627e6fc4c32c2db9a1a89ba63da652792a9b6e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 16 Dec 2022 14:49:01 +0100
Subject: [PATCH 1093/1748] fixup! External tests maintenance

---
 test/externalTests/ens.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 1233085382..77395160d3 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -71,7 +71,6 @@ function ens_test
     # In some cases Hardhat does not detect revert reasons properly via IR.
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|it\(('Does not allow wrapping a name you do not own',\)|it.skip\1|g" test/wrapper/NameWrapper.js
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|it\(('can set fuses and then burn ability to burn fuses',\)|it.skip\1|g" test/wrapper/NameWrapper.js
     sed -i "s|it\(('can set fuses and burn canSetResolver and canSetTTL',\)|it.skip\1|g" test/wrapper/NameWrapper.js
     sed -i "s|it\(('Cannot be called if CANNOT_TRANSFER is burned\.',\)|it.skip\1|g" test/wrapper/NameWrapper.js

From e295964f50c317d1e6b0ce6e5273984e956e9692 Mon Sep 17 00:00:00 2001
From: Saw-mon-and-Natalie <samangharib50233@gmail.com>
Date: Fri, 16 Dec 2022 14:58:41 +0000
Subject: [PATCH 1094/1748] fixed some comments in Types.h

---
 libsolidity/ast/Types.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 9fe0b4d928..2f9277808f 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -802,14 +802,14 @@ class ArrayType: public ReferenceType
 	/// Constructor for a byte array ("bytes") and string.
 	explicit ArrayType(DataLocation _location, bool _isString = false);
 
-	/// Constructor for a dynamically sized array type ("type[]")
+	/// Constructor for a dynamically sized array type ("<type>[]")
 	ArrayType(DataLocation _location, Type const* _baseType):
 		ReferenceType(_location),
 		m_baseType(copyForLocationIfReference(_baseType))
 	{
 	}
 
-	/// Constructor for a fixed-size array type ("type[20]")
+	/// Constructor for a fixed-size array type ("<type>[<length>]")
 	ArrayType(DataLocation _location, Type const* _baseType, u256 _length):
 		ReferenceType(_location),
 		m_baseType(copyForLocationIfReference(_baseType)),

From 3bc535e1a1b9c3d6d32d21c798b9bc2f5f12b71f Mon Sep 17 00:00:00 2001
From: andy53 <andy@evilrobots.club>
Date: Wed, 2 Nov 2022 20:46:54 -0600
Subject: [PATCH 1095/1748] Report when no contracts to compile

updates
---
 solc/CommandLineInterface.cpp                 |  5 ++-
 test/cmdlineTests.sh                          |  5 +++
 .../no_contract_combined_json/args            |  1 +
 .../no_contract_combined_json/input.sol       |  2 +
 .../no_contract_combined_json/output          | 36 +++++++++++++++
 test/solc/CommandLineInterface.cpp            | 45 ++++++++++++++++++-
 6 files changed, 91 insertions(+), 3 deletions(-)
 create mode 100644 test/cmdlineTests/no_contract_combined_json/args
 create mode 100644 test/cmdlineTests/no_contract_combined_json/input.sol
 create mode 100644 test/cmdlineTests/no_contract_combined_json/output

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 3973008f95..c687d44b54 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -48,7 +48,6 @@
 #include <libevmasm/GasMeter.h>
 
 #include <liblangutil/Exceptions.h>
-#include <liblangutil/Scanner.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
 #include <libsmtutil/Exceptions.h>
@@ -1193,8 +1192,10 @@ void CommandLineInterface::outputCompilationResults()
 	{
 		if (!m_options.output.dir.empty())
 			sout() << "Compiler run successful. Artifact(s) can be found in directory " << m_options.output.dir << "." << endl;
+		else if (contracts.empty())
+			sout() << "Compiler run successful. No contracts to compile." << endl;
 		else
-			serr() << "Compiler run successful, no output requested." << endl;
+			sout() << "Compiler run successful. No output generated." << endl;
 	}
 }
 
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index d04117156a..ce9af142fc 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -225,6 +225,11 @@ EOF
         sed -i.bak -e 's/ Consider adding "pragma .*$//' "$stderr_path"
         sed -i.bak -e 's/\(Unimplemented feature error.* in \).*$/\1<FILENAME REMOVED>/' "$stderr_path"
         sed -i.bak -e 's/"version":[ ]*"[^"]*"/"version": "<VERSION REMOVED>"/' "$stdout_path"
+    if [[ $stdout_expectation_file != "" &&  $stderr_expectation_file != "" ]]
+    then
+        sed -i.bak -e '/^Compiler run successful\. No contracts to compile\.$/d' "$stdout_path"
+        sed -i.bak -e '/^Compiler run successful\. No output generated\.$/d' "$stdout_path"
+    fi
 
         # Remove bytecode (but not linker references). Since non-JSON output is unstructured,
         # use metadata markers for detection to have some confidence that it's actually bytecode
diff --git a/test/cmdlineTests/no_contract_combined_json/args b/test/cmdlineTests/no_contract_combined_json/args
new file mode 100644
index 0000000000..8d81d1c0f2
--- /dev/null
+++ b/test/cmdlineTests/no_contract_combined_json/args
@@ -0,0 +1 @@
+--combined-json ast --pretty-json --json-indent 4
\ No newline at end of file
diff --git a/test/cmdlineTests/no_contract_combined_json/input.sol b/test/cmdlineTests/no_contract_combined_json/input.sol
new file mode 100644
index 0000000000..b926e9263b
--- /dev/null
+++ b/test/cmdlineTests/no_contract_combined_json/input.sol
@@ -0,0 +1,2 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
\ No newline at end of file
diff --git a/test/cmdlineTests/no_contract_combined_json/output b/test/cmdlineTests/no_contract_combined_json/output
new file mode 100644
index 0000000000..af73008960
--- /dev/null
+++ b/test/cmdlineTests/no_contract_combined_json/output
@@ -0,0 +1,36 @@
+{
+    "sourceList":
+    [
+        "no_contract_combined_json/input.sol"
+    ],
+    "sources":
+    {
+        "no_contract_combined_json/input.sol":
+        {
+            "AST":
+            {
+                "absolutePath": "no_contract_combined_json/input.sol",
+                "exportedSymbols": {},
+                "id": 2,
+                "license": "GPL-3.0",
+                "nodeType": "SourceUnit",
+                "nodes":
+                [
+                    {
+                        "id": 1,
+                        "literals":
+                        [
+                            "solidity",
+                            ">=",
+                            "0.0"
+                        ],
+                        "nodeType": "PragmaDirective",
+                        "src": "36:22:0"
+                    }
+                ],
+                "src": "36:22:0"
+            }
+        }
+    },
+    "version": "<VERSION REMOVED>"
+}
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 2ae57541bd..8124b1545f 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -25,6 +25,7 @@
 
 #include <test/Common.h>
 #include <test/libsolidity/util/SoltestErrors.h>
+#include <liblangutil/SemVerHandler.h>
 #include <test/FilesystemUtils.h>
 
 #include <libsolutil/JSON.h>
@@ -44,6 +45,7 @@ using namespace std;
 using namespace solidity::frontend;
 using namespace solidity::test;
 using namespace solidity::util;
+using namespace solidity::langutil;
 
 using PathSet = set<boost::filesystem::path>;
 
@@ -1006,10 +1008,14 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 		canonicalWorkDir / "lib",
 	};
 
+	string const expectedStdoutContent = "Compiler run successful. No contracts to compile.\n";
 	OptionsReaderAndMessages result = runCLI(commandLine, "");
 
 	BOOST_TEST(result.stderrContent == "");
-	BOOST_TEST(result.stdoutContent == "");
+	if (SemVerVersion{string(VersionString)}.isPrerelease())
+		BOOST_TEST(result.stdoutContent == "");
+	else
+		BOOST_TEST(result.stdoutContent == expectedStdoutContent);
 	BOOST_REQUIRE(result.success);
 	BOOST_TEST(result.options == expectedOptions);
 	BOOST_TEST(result.reader.sourceUnits() == expectedSources);
@@ -1018,6 +1024,43 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 	BOOST_TEST(result.reader.basePath() == expectedWorkDir / "base/");
 }
 
+BOOST_AUTO_TEST_CASE(cli_no_contracts_to_compile)
+{
+	string const contractSource = R"(
+		// SPDX-License-Identifier: GPL-3.0
+		pragma solidity >=0.0;
+		enum Status { test }
+	)";
+
+	string const expectedStdoutContent = "Compiler run successful. No contracts to compile.\n";
+	OptionsReaderAndMessages result = runCLI({"solc", "-"}, contractSource);
+
+	if (SemVerVersion{string(VersionString)}.isPrerelease())
+		BOOST_TEST(result.stdoutContent == "");
+	else
+		BOOST_TEST(result.stdoutContent == expectedStdoutContent);
+	BOOST_REQUIRE(result.success);
+}
+
+BOOST_AUTO_TEST_CASE(cli_no_output)
+{
+	string const contractSource = R"(
+		// SPDX-License-Identifier: GPL-3.0
+		pragma solidity >=0.0;
+		abstract contract A {
+			function B() public virtual returns(uint);
+		})";
+
+	string const expectedStdoutContent = "Compiler run successful. No output generated.\n";
+	OptionsReaderAndMessages result = runCLI({"solc", "-"}, contractSource);
+
+	if (SemVerVersion{string(VersionString)}.isPrerelease())
+		BOOST_TEST(result.stdoutContent == "");
+	else
+		BOOST_TEST(result.stdoutContent == expectedStdoutContent);
+	BOOST_REQUIRE(result.success);
+}
+
 BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 {
 	TemporaryDirectory tempDir({"base/", "include/", "lib/nested/"}, TEST_CASE_NAME);

From 7242d9c2cfc77a416532b470104808e92b824db7 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Tue, 20 Dec 2022 13:21:27 +0100
Subject: [PATCH 1096/1748] Fix sphinx-a4doc version to 1.3.0

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 23c8f90432..cee188db03 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -4,7 +4,7 @@
 sphinx_rtd_theme>=0.5.2
 
 pygments-lexer-solidity>=0.7.0
-sphinx-a4doc>=1.2.1
+sphinx-a4doc==1.3.0
 
 # Sphinx 2.1.0 is the oldest version that accepts a lexer class in add_lexer()
 sphinx>=2.1.0

From b314e1b37de5554b8f1e4ae56550038d9404ffcd Mon Sep 17 00:00:00 2001
From: Pierre Grimaud <grimaud.pierre@gmail.com>
Date: Sun, 25 Dec 2022 22:39:50 +0100
Subject: [PATCH 1097/1748] docs: fix typos

---
 test/libsolidity/AnalysisFramework.h                        | 4 ++--
 test/libsolidity/SolidityEndToEndTest.cpp                   | 2 +-
 test/libsolidity/semanticTests/externalContracts/snark.sol  | 6 +++---
 .../semanticTests/structs/struct_referencing.sol            | 2 +-
 test/tools/ossfuzz/protoToAbiV2.cpp                         | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index c4b4eda33b..7dbbb902ff 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -72,7 +72,7 @@ class AnalysisFramework
 	std::vector<std::string> m_warningsToFilter = {"This is a pre-release compiler version"};
 	std::vector<std::string> m_messagesToCut = {"Source file requires different compiler version (current compiler is"};
 
-	/// @returns reference to lazy-instanciated CompilerStack.
+	/// @returns reference to lazy-instantiated CompilerStack.
 	solidity::frontend::CompilerStack& compiler()
 	{
 		if (!m_compiler)
@@ -80,7 +80,7 @@ class AnalysisFramework
 		return *m_compiler;
 	}
 
-	/// @returns reference to lazy-instanciated CompilerStack.
+	/// @returns reference to lazy-instantiated CompilerStack.
 	solidity::frontend::CompilerStack const& compiler() const
 	{
 		if (!m_compiler)
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 2f0d1a5d08..268861fd2a 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -1538,7 +1538,7 @@ BOOST_AUTO_TEST_CASE(struct_referencing)
 				s.a = 4;
 				return s;
 			}
-			// argument-dependant lookup tests
+			// argument-dependent lookup tests
 			function a(I.S memory) public pure returns (uint) { return 1; }
 			function a(S memory) public pure returns (uint) { return 2; }
 		}
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index be9fc00729..bb76542111 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -164,10 +164,10 @@ contract Test {
 		Pairing.G1Point memory p2;
 		p1.X = 1; p1.Y = 2;
 		p2.X = 1; p2.Y = 2;
-		Pairing.G1Point memory explict_sum = Pairing.add(p1, p2);
+		Pairing.G1Point memory explicit_sum = Pairing.add(p1, p2);
 		Pairing.G1Point memory scalar_prod = Pairing.mul(p1, 2);
-		return (explict_sum.X == scalar_prod.X &&
-			explict_sum.Y == scalar_prod.Y);
+		return (explicit_sum.X == scalar_prod.X &&
+			explicit_sum.Y == scalar_prod.Y);
 	}
 	function g() public returns (bool) {
 		Pairing.G1Point memory x = Pairing.add(Pairing.P1(), Pairing.negate(Pairing.P1()));
diff --git a/test/libsolidity/semanticTests/structs/struct_referencing.sol b/test/libsolidity/semanticTests/structs/struct_referencing.sol
index 0d7d1a7545..cbe8a72bfc 100644
--- a/test/libsolidity/semanticTests/structs/struct_referencing.sol
+++ b/test/libsolidity/semanticTests/structs/struct_referencing.sol
@@ -15,7 +15,7 @@ library L {
         s.a = 4;
         return s;
     }
-    // argument-dependant lookup tests
+    // argument-dependent lookup tests
     function a(I.S memory) public pure returns (uint) { return 1; }
     function a(S memory) public pure returns (uint) { return 2; }
 }
diff --git a/test/tools/ossfuzz/protoToAbiV2.cpp b/test/tools/ossfuzz/protoToAbiV2.cpp
index f20c0482c9..98de7dd359 100644
--- a/test/tools/ossfuzz/protoToAbiV2.cpp
+++ b/test/tools/ossfuzz/protoToAbiV2.cpp
@@ -944,7 +944,7 @@ string TypeVisitor::visit(StructType const& _type)
 		structDefinition(_type);
 		// Set last dyn param if struct contains a dyn param e.g., bytes, array etc.
 		m_isLastDynParamRightPadded = DynParamVisitor().visit(_type);
-		// If top-level struct is a non-emtpy struct, assign the name S<suffix>
+		// If top-level struct is a non-empty struct, assign the name S<suffix>
 		m_baseType = s_structTypeName + to_string(m_structStartCounter);
 	}
 	else

From f48cd743d911d6c42aa9dbe64be22e2abc25257f Mon Sep 17 00:00:00 2001
From: vlad <quant13@gmail.com>
Date: Fri, 30 Dec 2022 00:46:32 +0400
Subject: [PATCH 1098/1748] fix sphinx version to 5.* since 6.0 is not
 supported by code

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index cee188db03..7f1fc578c3 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -7,4 +7,4 @@ pygments-lexer-solidity>=0.7.0
 sphinx-a4doc==1.3.0
 
 # Sphinx 2.1.0 is the oldest version that accepts a lexer class in add_lexer()
-sphinx>=2.1.0
+sphinx>=2.1.0, <6.0

From 0694f639e4626ba27c3bf1e6b9fb761c79939499 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 2 Jan 2023 11:50:10 +0100
Subject: [PATCH 1099/1748] Update sphinx-a4doc version

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 7f1fc578c3..b1b21a8691 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -4,7 +4,7 @@
 sphinx_rtd_theme>=0.5.2
 
 pygments-lexer-solidity>=0.7.0
-sphinx-a4doc==1.3.0
+sphinx-a4doc>=1.6.0
 
 # Sphinx 2.1.0 is the oldest version that accepts a lexer class in add_lexer()
 sphinx>=2.1.0, <6.0

From 17d57da0821050df93130ab5aac58044432e29ce Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 4 Jan 2023 09:48:02 +0100
Subject: [PATCH 1100/1748] Unpin v4-core dependency and neutralize packages

---
 test/externalTests/pool-together.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index 14c7853f4e..86cd3ee684 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -69,15 +69,13 @@ function pool_together_test
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
     yarn install
 
-    # TODO: Remove this when https://github.com/pooltogether/v4-core/issues/287 gets fixed.
-    npm install @pooltogether/pooltogether-rng-contracts@1.4.0
-
     # These come with already compiled artifacts. We want them recompiled with latest compiler.
     rm -r node_modules/@pooltogether/yield-source-interface/artifacts/
     rm -r node_modules/@pooltogether/uniform-random-number/artifacts/
     rm -r node_modules/@pooltogether/owner-manager-contracts/artifacts/
 
     replace_version_pragmas
+    neutralize_packaged_contracts
 
     for preset in $SELECTED_PRESETS; do
         hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"

From 5ecf3075fbbd2690ad3bbb821d930ecdc7b720ee Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 5 Jan 2023 13:10:42 +0100
Subject: [PATCH 1101/1748] Silence version check grep and up the node heap
 limit

---
 test/externalTests/common.sh   | 6 +++---
 test/externalTests/zeppelin.sh | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index d8f7e80b8e..144c68a890 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -345,7 +345,7 @@ function truffle_verify_compiler_version
     local full_solc_version="$2"
 
     printLog "Verify that the correct version (${solc_version}/${full_solc_version}) of the compiler was used to compile the contracts..."
-    grep "$full_solc_version" --with-filename --recursive build/contracts || fail "Wrong compiler version detected."
+    grep "$full_solc_version" --recursive --quiet build/contracts || fail "Wrong compiler version detected."
 }
 
 function hardhat_verify_compiler_version
@@ -357,8 +357,8 @@ function hardhat_verify_compiler_version
     local build_info_files
     build_info_files=$(find . -path '*artifacts/build-info/*.json')
     for build_info_file in $build_info_files; do
-        grep '"solcVersion":[[:blank:]]*"'"${solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
-        grep '"solcLongVersion":[[:blank:]]*"'"${full_solc_version}"'"' --with-filename "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
+        grep '"solcVersion":[[:blank:]]*"'"${solc_version}"'"' --quiet "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
+        grep '"solcLongVersion":[[:blank:]]*"'"${full_solc_version}"'"' --quiet "$build_info_file" || fail "Wrong compiler version detected in ${build_info_file}."
     done
 }
 
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 27198a8f0e..11e148c182 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -23,6 +23,8 @@
 # shellcheck disable=SC2016
 
 set -e
+# Temporary(?) fix to up the heap limit for node in order to prevent 'out of heap errors'
+export NODE_OPTIONS="--max-old-space-size=4096"
 
 source scripts/common.sh
 source test/externalTests/common.sh

From 03eb17a50f49f3729cbc45752cb55001c0474446 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 5 Jan 2023 12:51:01 +0100
Subject: [PATCH 1102/1748] Disable t_ubu_ossfuzz gitter notifications.

---
 .circleci/config.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 784b561d91..802499969b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -919,8 +919,6 @@ jobs:
             scripts/regressions.py -o test_results
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
-      - gitter_notify_failure_unless_pr
-      - gitter_notify_success_unless_pr
 
   b_archlinux:
     <<: *base_archlinux_large

From d4f9383185db10253ce1c1a602bf2cd3ee5c982d Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 12 Jan 2023 09:08:39 +0100
Subject: [PATCH 1103/1748] Drop `ewasm` from tests

---
 .circleci/osx_install_dependencies.sh | 7 -------
 .circleci/soltest_all.sh              | 7 ++-----
 scripts/tests.sh                      | 5 +----
 3 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index ff34e2fc98..f742d131b2 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -81,11 +81,4 @@ then
   tar xzpf "$evmone_package" -C /usr/local
   rm "$evmone_package"
 
-  # hera
-  hera_version="0.6.0"
-  hera_package="hera-${hera_version}-darwin-x86_64.tar.gz"
-  wget "https://github.com/ewasm/hera/releases/download/v${hera_version}/${hera_package}"
-  validate_checksum "$hera_package" 82ee57404862705ab314f7a4d04bf2cf29d71e8d209850d66c125527cd287f37
-  tar xzpf "$hera_package" -C /usr/local
-  rm "$hera_package"
 fi
diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 23663ce46e..5a5449a948 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -50,9 +50,6 @@ for OPTIMIZE in "${OPTIMIZE_VALUES[@]}"
 do
     for EVM in "${EVM_VALUES[@]}"
     do
-        # run tests against hera ewasm evmc vm, only if OPTIMIZE == 0 and evm version is byzantium
-        EWASM_ARGS=""
-        [ "${EVM}" = "byzantium" ] && [ "${OPTIMIZE}" = "0" ] && EWASM_ARGS="--ewasm"
         ENFORCE_GAS_ARGS=""
         [ "${EVM}" = "${DEFAULT_EVM}" ] && ENFORCE_GAS_ARGS="--enforce-gas-cost"
         # Run SMTChecker tests only when OPTIMIZE == 0
@@ -61,11 +58,11 @@ do
 
         EVM="$EVM" \
         OPTIMIZE="$OPTIMIZE" \
-        SOLTEST_FLAGS="$SOLTEST_FLAGS $ENFORCE_GAS_ARGS $EWASM_ARGS" \
+        SOLTEST_FLAGS="$SOLTEST_FLAGS $ENFORCE_GAS_ARGS" \
         BOOST_TEST_ARGS="-t !@nooptions $DISABLE_SMTCHECKER" \
         INDEX_SHIFT="$INDEX_SHIFT" \
         "${REPODIR}/.circleci/soltest.sh"
 
         INDEX_SHIFT=$((INDEX_SHIFT + 1))
     done
-done
\ No newline at end of file
+done
diff --git a/scripts/tests.sh b/scripts/tests.sh
index f8230c54ad..c9a7471343 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -139,11 +139,8 @@ do
                 fi
             fi
 
-            EWASM_ARGS=""
-            [ "${vm}" = "byzantium" ] && [ "${optimize}" = "" ] && EWASM_ARGS="--ewasm"
-
             set +e
-            "${SOLIDITY_BUILD_DIR}"/test/soltest --show-progress "${log[@]}" -- ${EWASM_ARGS} --testpath "$REPO_ROOT"/test "$optimize" --evm-version "$vm" "${SMT_FLAGS[@]}" "${force_abiv1_flag[@]}"
+            "${SOLIDITY_BUILD_DIR}"/test/soltest --show-progress "${log[@]}" -- --testpath "$REPO_ROOT"/test "$optimize" --evm-version "$vm" "${SMT_FLAGS[@]}" "${force_abiv1_flag[@]}"
 
             if test "0" -ne "$?"; then
                 exit 1

From 1da82045c4881e5ccd6f15f7abf472272e1028cd Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 11 Jan 2023 10:18:49 +0100
Subject: [PATCH 1104/1748] Use directory_options instead of deprecated
 symlink_option

basename to step
---
 libsolidity/lsp/LanguageServer.cpp | 2 +-
 solc/CommandLineInterface.cpp      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 74d1b4d7cc..2d85c08b0e 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -221,7 +221,7 @@ vector<boost::filesystem::path> LanguageServer::allSolidityFilesFromProject() co
 	// We explicitly decided against including all files from include paths but leave the possibility
 	// open for a future PR to enable such a feature to be optionally enabled (default disabled).
 
-	auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::symlink_option::recurse);
+	auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::directory_options::follow_directory_symlink);
 	for (fs::directory_entry const& dirEntry: directoryIterator)
 		if (
 			dirEntry.path().extension() == ".sol" &&
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index c687d44b54..1d64fa4946 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -589,7 +589,7 @@ void CommandLineInterface::createFile(string const& _fileName, string const& _da
 
 void CommandLineInterface::createJson(string const& _fileName, string const& _json)
 {
-	createFile(boost::filesystem::basename(_fileName) + string(".json"), _json);
+	createFile(boost::filesystem::path(_fileName).stem().string() + string(".json"), _json);
 }
 
 bool CommandLineInterface::run(int _argc, char const* const* _argv)

From 7063fabf1f5666fad0eaf9790617b61e65eecf30 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 11 Jan 2023 20:55:02 +0100
Subject: [PATCH 1105/1748] Update CI ubuntu version to 2204

Minor fix

replace deprecated is_pod
---
 .circleci/README.md     |  10 +--
 .circleci/config.yml    | 162 ++++++++++++++++++++--------------------
 libsolutil/CommonData.h |   2 +-
 libsolutil/vector_ref.h |   2 +-
 4 files changed, 88 insertions(+), 88 deletions(-)

diff --git a/.circleci/README.md b/.circleci/README.md
index 338e858d9c..6af7fd45cc 100644
--- a/.circleci/README.md
+++ b/.circleci/README.md
@@ -7,15 +7,15 @@ The docker images are build locally on the developer machine:
 ```sh
 cd .circleci/docker/
 
-docker build -t ethereum/solidity-buildpack-deps:ubuntu2004-<revision> -f Dockerfile.ubuntu2004 .
-docker push ethereum/solidity-buildpack-deps:ubuntu2004-<revision>
+docker build -t ethereum/solidity-buildpack-deps:ubuntu2204-<revision> -f Dockerfile.ubuntu2204 .
+docker push ethereum/solidity-buildpack-deps:ubuntu2204-<revision>
 ```
 
-The current revisions per docker image are stored in [circle ci pipeline parameters](https://github.com/CircleCI-Public/api-preview-docs/blob/master/docs/pipeline-parameters.md#pipeline-parameters) called `<image-desc>-docker-image-rev` (e.g., `ubuntu-2004-docker-image-rev`). Please update the value assigned to the parameter(s) corresponding to the docker image(s) being updated at the time of the update. Please verify that the value assigned to the parameter matches the revision part of the docker image tag (`<revision>` in the docker build/push snippet shown above). Otherwise, the docker image used by circle ci and the one actually pushed to docker hub will differ.
+The current revisions per docker image are stored in [circle ci pipeline parameters](https://github.com/CircleCI-Public/api-preview-docs/blob/master/docs/pipeline-parameters.md#pipeline-parameters) called `<image-desc>-docker-image-rev` (e.g., `ubuntu-2204-docker-image-rev`). Please update the value assigned to the parameter(s) corresponding to the docker image(s) being updated at the time of the update. Please verify that the value assigned to the parameter matches the revision part of the docker image tag (`<revision>` in the docker build/push snippet shown above). Otherwise, the docker image used by circle ci and the one actually pushed to docker hub will differ.
 
 Once the docker image has been built and pushed to Dockerhub, you can find it at:
 
-    https://hub.docker.com/r/ethereum/solidity-buildpack-deps:ubuntu2004-<revision>
+    https://hub.docker.com/r/ethereum/solidity-buildpack-deps:ubuntu2204-<revision>
 
 where the image tag reflects the target OS and revision to build Solidity and run its tests on.
 
@@ -24,7 +24,7 @@ where the image tag reflects the target OS and revision to build Solidity and ru
 ```sh
 cd solidity
 # Mounts your local solidity directory in docker container for testing
-docker run -v `pwd`:/src/solidity -ti ethereum/solidity-buildpack-deps:ubuntu2004-<revision> /bin/bash
+docker run -v `pwd`:/src/solidity -ti ethereum/solidity-buildpack-deps:ubuntu2204-<revision> /bin/bash
 cd /src/solidity
 <commands_to_test_build_with_new_docker_image>
 ```
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 802499969b..28253f943a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,18 +7,18 @@
 #     - ems: Emscripten
 version: 2.1
 parameters:
-  ubuntu-2004-docker-image:
+  ubuntu-2204-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-16
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ee1def5806f40c35d583234e172ec5769bb9a08b6f5bbc713c1a2658846dbced"
-  ubuntu-2004-clang-docker-image:
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-1
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:07419ed58537cbca9d4c30701fb84f6bb517ce2fce7f3b5dccb3db8bf1c30183"
+  ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004.clang-16
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:8f635529a10e0ddf955d6d72360261966e5fee0b5c5211070370ca2fc4e0ab7c"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-1
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e515710752bfb38ee0e9b2f92ca71612c03ed85290c36c3b3c0a3d9f90187aef"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-21
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ae6b695fb8a0806702bb6a1a9616fbb33ac3288f25990fa799aab2c045c80ea1"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-22
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:baf46ad78b131eb6b0bf98d50e9330437a338c6893b53af3853b36f6f4ab18ae"
   emscripten-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:emscripten-14
@@ -301,17 +301,17 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j 2
 
-  - base_ubuntu2004_clang: &base_ubuntu2004_clang
+  - base_ubuntu2204_clang: &base_ubuntu2204_clang
       docker:
-        - image: << pipeline.parameters.ubuntu-2004-clang-docker-image >>
+        - image: << pipeline.parameters.ubuntu-2204-clang-docker-image >>
       environment:
         TERM: xterm
         CC: clang
         CXX: clang++
         MAKEFLAGS: -j 3
 
-  - base_ubuntu2004_clang_large: &base_ubuntu2004_clang_large
-      <<: *base_ubuntu2004_clang
+  - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
+      <<: *base_ubuntu2204_clang
       resource_class: large
       environment:
         TERM: xterm
@@ -319,29 +319,29 @@ defaults:
         CXX: clang++
         MAKEFLAGS: -j 5
 
-  - base_ubuntu2004: &base_ubuntu2004
+  - base_ubuntu2204: &base_ubuntu2204
       docker:
-        - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+        - image: << pipeline.parameters.ubuntu-2204-docker-image >>
       environment:
         TERM: xterm
         MAKEFLAGS: -j 3
 
-  - base_ubuntu2004_small: &base_ubuntu2004_small
-      <<: *base_ubuntu2004
+  - base_ubuntu2204_small: &base_ubuntu2204_small
+      <<: *base_ubuntu2204
       resource_class: small
       environment:
         TERM: xterm
         MAKEFLAGS: -j 2
 
-  - base_ubuntu2004_large: &base_ubuntu2004_large
-      <<: *base_ubuntu2004
+  - base_ubuntu2204_large: &base_ubuntu2204_large
+      <<: *base_ubuntu2204
       resource_class: large
       environment:
         TERM: xterm
         MAKEFLAGS: -j 5
 
-  - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
-      <<: *base_ubuntu2004
+  - base_ubuntu2204_xlarge: &base_ubuntu2204_xlarge
+      <<: *base_ubuntu2204
       resource_class: xlarge
       environment:
         TERM: xterm
@@ -440,7 +440,7 @@ defaults:
         branches:
           ignore: /.*/
 
-  - workflow_ubuntu2004: &workflow_ubuntu2004
+  - workflow_ubuntu2204: &workflow_ubuntu2204
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu
@@ -450,17 +450,17 @@ defaults:
       requires:
         - b_ubu_ossfuzz
 
-  - workflow_ubuntu2004_clang: &workflow_ubuntu2004_clang
+  - workflow_ubuntu2204_clang: &workflow_ubuntu2204_clang
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu_clang
 
-  - workflow_ubuntu2004_force_release: &workflow_ubuntu2004_force_release
+  - workflow_ubuntu2204_force_release: &workflow_ubuntu2204_force_release
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu_force_release
 
-  - workflow_ubuntu2004_static: &workflow_ubuntu2004_static
+  - workflow_ubuntu2204_static: &workflow_ubuntu2204_static
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu_static
@@ -470,7 +470,7 @@ defaults:
       requires:
         - b_archlinux
 
-  - workflow_ubuntu2004_codecov: &workflow_ubuntu2004_codecov
+  - workflow_ubuntu2204_codecov: &workflow_ubuntu2204_codecov
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu_codecov
@@ -480,17 +480,17 @@ defaults:
       requires:
         - b_osx
 
-  - workflow_ubuntu2004_asan: &workflow_ubuntu2004_asan
+  - workflow_ubuntu2204_asan: &workflow_ubuntu2204_asan
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu_asan
 
-  - workflow_ubuntu2004_asan_clang: &workflow_ubuntu2004_asan_clang
+  - workflow_ubuntu2204_asan_clang: &workflow_ubuntu2204_asan_clang
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu_asan_clang
 
-  - workflow_ubuntu2004_ubsan_clang: &workflow_ubuntu2004_ubsan_clang
+  - workflow_ubuntu2204_ubsan_clang: &workflow_ubuntu2204_ubsan_clang
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu_ubsan_clang
@@ -524,91 +524,91 @@ defaults:
       python2: true
 
   - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_gnosis
       project: gnosis
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_zeppelin
       project: zeppelin
       binary_type: native
       resource_class: large
   - job_native_test_ext_ens: &job_native_test_ext_ens
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_ens
       project: ens
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_trident: &job_native_test_ext_trident
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_trident
       project: trident
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_euler: &job_native_test_ext_euler
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_euler
       project: euler
       binary_type: native
       resource_class: medium
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_yield_liquidator
       project: yield-liquidator
       binary_type: native
   - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_bleeps
       project: bleeps
       binary_type: native
       resource_class: medium
   - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_pool_together
       project: pool-together
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_perpetual_pools
       project: perpetual-pools
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_uniswap
       project: uniswap
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_elementfi
       project: elementfi
       binary_type: native
       resource_class: medium
   - job_native_test_ext_brink: &job_native_test_ext_brink
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_brink
       project: brink
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_chainlink
       project: chainlink
       binary_type: native
       nodejs_version: '16.18'
       resource_class: large # Tests run out of memory on a smaller machine
   - job_native_test_ext_gp2: &job_native_test_ext_gp2
-      <<: *workflow_ubuntu2004_static
+      <<: *workflow_ubuntu2204_static
       name: t_native_test_ext_gp2
       project: gp2
       binary_type: native
@@ -761,14 +761,14 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   chk_docs_pragma_min_version:
-    <<: *base_ubuntu2004_small
+    <<: *base_ubuntu2204_small
     steps:
       - checkout
       - run: *run_docs_pragma_min_version
       - gitter_notify_failure_unless_pr
 
   t_ubu_pyscripts:
-    <<: *base_ubuntu2004_small
+    <<: *base_ubuntu2204_small
     steps:
       - checkout
       - run:
@@ -789,13 +789,13 @@ jobs:
   b_ubu: &b_ubu
     # this runs 2x faster on xlarge but takes 4x more resources (compared to medium).
     # Enough other jobs depend on it that it's worth it though.
-    <<: *base_ubuntu2004_xlarge
+    <<: *base_ubuntu2204_xlarge
     <<: *steps_build
 
   # x64 ASAN build, for testing for memory related bugs
   b_ubu_asan: &b_ubu_asan
     # Runs slightly faster on large and xlarge but we only run it nightly so efficiency matters more.
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2204
     environment:
       CMAKE_OPTIONS: -DSANITIZE=address
       MAKEFLAGS: -j 3
@@ -803,7 +803,7 @@ jobs:
     <<: *steps_build
 
   b_ubu_clang: &b_ubu_clang
-    <<: *base_ubuntu2004_clang_large
+    <<: *base_ubuntu2204_clang_large
     environment:
       TERM: xterm
       CC: clang
@@ -816,7 +816,7 @@ jobs:
     parameters:
       cmake_options:
         type: string
-    <<: *base_ubuntu2004_clang
+    <<: *base_ubuntu2204_clang
     environment:
       TERM: xterm
       CC: clang
@@ -833,7 +833,7 @@ jobs:
 
   b_ubu_static:
     # On large runs 2x faster than on medium. 3x on xlarge.
-    <<: *base_ubuntu2004_xlarge
+    <<: *base_ubuntu2204_xlarge
     environment:
       TERM: xterm
       MAKEFLAGS: -j 10
@@ -850,7 +850,7 @@ jobs:
 
   b_ubu_codecov:
     # Runs ~30% faster on large but we only run it nightly so efficiency matters more.
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2204
     environment:
       COVERAGE: ON
       CMAKE_BUILD_TYPE: Debug
@@ -862,7 +862,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   t_ubu_codecov:
-    <<: *base_ubuntu2004_large
+    <<: *base_ubuntu2204_large
     environment:
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 1
@@ -886,7 +886,7 @@ jobs:
   # Builds in C++20 mode and uses debug build in order to speed up.
   # Do *NOT* store any artifacts or workspace as we don't run tests on this build.
   b_ubu_cxx20:
-    <<: *base_ubuntu2004_large
+    <<: *base_ubuntu2204_large
     environment:
       CMAKE_BUILD_TYPE: Debug
       CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20 -DUSE_CVC4=OFF
@@ -1018,7 +1018,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_docs:
-    <<: *base_ubuntu2004_small
+    <<: *base_ubuntu2204_small
     steps:
       - checkout
       - run: *setup_prerelease_commit_hash
@@ -1031,12 +1031,12 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   t_ubu_soltest_all: &t_ubu_soltest_all
-    <<: *base_ubuntu2004_large
+    <<: *base_ubuntu2204_large
     parallelism: 50
     <<: *steps_soltest_all
 
   t_ubu_lsp: &t_ubu_lsp
-    <<: *base_ubuntu2004_small
+    <<: *base_ubuntu2204_small
     <<: *steps_test_lsp
 
   t_archlinux_soltest: &t_archlinux_soltest
@@ -1059,7 +1059,7 @@ jobs:
           <<: *steps_soltest
 
   t_ubu_clang_soltest: &t_ubu_clang_soltest
-    <<: *base_ubuntu2004_clang
+    <<: *base_ubuntu2204_clang
     parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
@@ -1075,14 +1075,14 @@ jobs:
     <<: *t_ubu_soltest_all
 
   t_ubu_cli: &t_ubu_cli
-    <<: *base_ubuntu2004_small
+    <<: *base_ubuntu2204_small
     <<: *steps_cmdline_tests
 
   t_ubu_force_release_cli: &t_ubu_force_release_cli
     <<: *t_ubu_cli
 
   t_ubu_locale:
-    <<: *base_ubuntu2004_small
+    <<: *base_ubuntu2204_small
     steps:
       - checkout
       - attach_workspace:
@@ -1097,14 +1097,14 @@ jobs:
 
   t_ubu_asan_cli:
     # Runs slightly faster on medium but we only run it nightly so efficiency matters more.
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2204
     environment:
       TERM: xterm
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
     <<: *steps_cmdline_tests
 
   t_ubu_asan_soltest:
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2204
     parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
@@ -1114,7 +1114,7 @@ jobs:
     <<: *steps_soltest
 
   t_ubu_asan_clang_soltest:
-    <<: *base_ubuntu2004_clang
+    <<: *base_ubuntu2204_clang
     parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
@@ -1124,7 +1124,7 @@ jobs:
     <<: *steps_soltest
 
   t_ubu_ubsan_clang_soltest:
-    <<: *base_ubuntu2004_clang
+    <<: *base_ubuntu2204_clang
     parallelism: 20
     environment:
       EVM: << pipeline.parameters.evm-version >>
@@ -1132,12 +1132,12 @@ jobs:
     <<: *steps_soltest
 
   t_ubu_ubsan_clang_cli:
-    <<: *base_ubuntu2004_clang
+    <<: *base_ubuntu2204_clang
     <<: *steps_cmdline_tests
 
   t_ems_solcjs:
     # Unlike other t_ems jobs this one actually runs 2x faster on medium (compared to small).
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2204
     steps:
       - checkout
       - attach_workspace:
@@ -1391,7 +1391,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   b_bytecode_ubu:
-    <<: *base_ubuntu2004_small
+    <<: *base_ubuntu2204_small
     environment:
       TERM: xterm
       MAKEFLAGS: -j 2
@@ -1461,7 +1461,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   t_bytecode_compare:
-    <<: *base_ubuntu2004_small
+    <<: *base_ubuntu2204_small
     environment:
       REPORT_FILES: |
         bytecode-report-emscripten.txt
@@ -1498,7 +1498,7 @@ jobs:
       - gitter_notify_failure_unless_pr
 
   c_release_binaries:
-    <<: *base_ubuntu2004
+    <<: *base_ubuntu2204
     steps:
       - checkout
       - attach_workspace:
@@ -1575,17 +1575,17 @@ workflows:
 
       # Ubuntu build and tests
       - b_ubu: *workflow_trigger_on_tags
-      - t_ubu_cli: *workflow_ubuntu2004
-      - t_ubu_locale: *workflow_ubuntu2004
-      - t_ubu_soltest_all: *workflow_ubuntu2004
+      - t_ubu_cli: *workflow_ubuntu2204
+      - t_ubu_locale: *workflow_ubuntu2204
+      - t_ubu_soltest_all: *workflow_ubuntu2204
       - b_ubu_clang: *workflow_trigger_on_tags
-      - t_ubu_clang_soltest: *workflow_ubuntu2004_clang
-      - t_ubu_lsp: *workflow_ubuntu2004
+      - t_ubu_clang_soltest: *workflow_ubuntu2204_clang
+      - t_ubu_lsp: *workflow_ubuntu2204
 
       # Ubuntu fake release build and tests
       - b_ubu_force_release: *workflow_trigger_on_tags
-      - t_ubu_force_release_cli: *workflow_ubuntu2004_force_release
-      - t_ubu_force_release_soltest_all: *workflow_ubuntu2004_force_release
+      - t_ubu_force_release_cli: *workflow_ubuntu2204_force_release
+      - t_ubu_force_release_soltest_all: *workflow_ubuntu2204_force_release
 
       # Emscripten build and tests that take 15 minutes or less
       - b_ems: *workflow_trigger_on_tags
@@ -1685,19 +1685,19 @@ workflows:
 
       # Code Coverage enabled build and tests
       - b_ubu_codecov: *workflow_trigger_on_tags
-      - t_ubu_codecov: *workflow_ubuntu2004_codecov
+      - t_ubu_codecov: *workflow_ubuntu2204_codecov
 
       # ASan build and tests
       - b_ubu_asan: *workflow_trigger_on_tags
       - b_ubu_san_clang: *job_b_ubu_asan_clang
-      - t_ubu_asan_soltest: *workflow_ubuntu2004_asan
-      - t_ubu_asan_clang_soltest: *workflow_ubuntu2004_asan_clang
-      - t_ubu_asan_cli: *workflow_ubuntu2004_asan
+      - t_ubu_asan_soltest: *workflow_ubuntu2204_asan
+      - t_ubu_asan_clang_soltest: *workflow_ubuntu2204_asan_clang
+      - t_ubu_asan_cli: *workflow_ubuntu2204_asan
 
       # UBSan build and tests
       - b_ubu_san_clang: *job_b_ubu_ubsan_clang
-      - t_ubu_ubsan_clang_soltest: *workflow_ubuntu2004_ubsan_clang
-      - t_ubu_ubsan_clang_cli: *workflow_ubuntu2004_ubsan_clang
+      - t_ubu_ubsan_clang_soltest: *workflow_ubuntu2204_ubsan_clang
+      - t_ubu_ubsan_clang_cli: *workflow_ubuntu2204_ubsan_clang
 
       # Emscripten build and tests that take more than 15 minutes to execute
       - b_ems: *workflow_trigger_on_tags
diff --git a/libsolutil/CommonData.h b/libsolutil/CommonData.h
index b117c27728..f3c168e651 100644
--- a/libsolutil/CommonData.h
+++ b/libsolutil/CommonData.h
@@ -267,7 +267,7 @@ template<
 	typename MapType,
 	typename KeyType,
 	typename ValueType = std::decay_t<decltype(std::declval<MapType>().find(std::declval<KeyType>())->second)> const&,
-	typename AllowCopyType = std::conditional_t<std::is_pod_v<ValueType> || std::is_pointer_v<ValueType>, detail::allow_copy, void*>
+	typename AllowCopyType = std::conditional_t<(std::is_trivial_v<ValueType> && std::is_standard_layout_v<ValueType>) || std::is_pointer_v<ValueType>, detail::allow_copy, void*>
 >
 decltype(auto) valueOrDefault(
 	MapType&& _map,
diff --git a/libsolutil/vector_ref.h b/libsolutil/vector_ref.h
index 46901a46e5..56942b9abb 100644
--- a/libsolutil/vector_ref.h
+++ b/libsolutil/vector_ref.h
@@ -28,7 +28,7 @@ class vector_ref
 	using iterator = T*;
 	using const_iterator = T const*;
 
-	static_assert(std::is_pod<value_type>::value, "vector_ref can only be used with PODs due to its low-level treatment of data.");
+	static_assert(std::is_standard_layout_v<value_type> && std::is_trivial_v<value_type>, "vector_ref can only be used with PODs due to its low-level treatment of data.");
 
 	vector_ref(): m_data(nullptr), m_count(0) {}
 	/// Creates a new vector_ref to point to @a _count elements starting at @a _data.

From f2e053e0c8a801f2d3404af9b83bde57b4127c7d Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 11 Jan 2023 21:46:26 +0100
Subject: [PATCH 1106/1748] disable cxx20 job

---
 .circleci/config.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 28253f943a..2783532d8e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1558,7 +1558,8 @@ workflows:
 
       # build-only
       - b_docs: *workflow_trigger_on_tags
-      - b_ubu_cxx20: *workflow_trigger_on_tags
+      # DISABLED FOR 0.8.18 - b_ubu_cxx20: *workflow_trigger_on_tags
+      # Issue: https://github.com/ethereum/solidity/issues/13868
       - b_ubu_ossfuzz: *workflow_trigger_on_tags
 
       # OS/X build and tests

From a01936d5fc7d399caa738d00172ed21320c24404 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 11 Jan 2023 13:51:32 +0100
Subject: [PATCH 1107/1748] Bumping ubuntu images to use boost 1_74_0

---
 .../buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 10 +++++-----
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004    |  4 ++--
 .../docker/buildpack-deps/Dockerfile.ubuntu2004.clang  |  4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index 0225f4b2da..469424ab8b 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="21"
+LABEL version="22"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -46,18 +46,18 @@ FROM base AS libraries
 # Boost
 RUN set -ex; \
     cd /usr/src; \
-    wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.73.0/source/boost_1_73_0.tar.bz2' -O boost.tar.bz2; \
-    test "$(sha256sum boost.tar.bz2)" = "4eb3b8d442b426dc35346235c8733b5ae35ba431690e38c6a8263dce9fcbb402  boost.tar.bz2"; \
+    wget -q 'https://boostorg.jfrog.io/artifactory/main/release/1.74.0/source/boost_1_74_0.tar.bz2' -O boost.tar.bz2; \
+    test "$(sha256sum boost.tar.bz2)" = "83bfc1507731a0906e387fc28b7ef5417d591429e51e788417fe9ff025e116b1  boost.tar.bz2" && \
     tar -xf boost.tar.bz2; \
     rm boost.tar.bz2; \
-    cd boost_1_73_0; \
+    cd boost_1_74_0; \
     CXXFLAGS="-stdlib=libc++ -pthread" LDFLAGS="-stdlib=libc++" ./bootstrap.sh --with-toolset=clang --prefix=/usr; \
     ./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" headers; \
     ./b2 toolset=clang cxxflags="-stdlib=libc++ -pthread" linkflags="-stdlib=libc++ -pthread" \
         link=static variant=release runtime-link=static \
         system filesystem unit_test_framework program_options \
         install -j $(($(nproc)/2)); \
-    rm -rf /usr/src/boost_1_73_0
+    rm -rf /usr/src/boost_1_74_0
 
 # Z3
 RUN set -ex; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 242f859e7c..e10c20f196 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -21,8 +21,8 @@
 #
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
-FROM buildpack-deps:focal AS base
-LABEL version="16"
+FROM buildpack-deps:jammy AS base
+LABEL version="17"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
index 7b2ae75154..eb257ae48b 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
@@ -21,8 +21,8 @@
 #
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
-FROM buildpack-deps:focal AS base
-LABEL version="16"
+FROM buildpack-deps:jammy AS base
+LABEL version="17"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

From 904afd8963a309cbfe92b4d676a1714e6e3e7555 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 11 Jan 2023 13:53:05 +0100
Subject: [PATCH 1108/1748] Rename ubuntu dockerfiles

---
 .github/workflows/buildpack-deps.yml                        | 6 +++---
 .../{Dockerfile.ubuntu2004 => Dockerfile.ubuntu2204}        | 0
 ...kerfile.ubuntu2004.clang => Dockerfile.ubuntu2204.clang} | 0
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename scripts/docker/buildpack-deps/{Dockerfile.ubuntu2004 => Dockerfile.ubuntu2204} (100%)
 rename scripts/docker/buildpack-deps/{Dockerfile.ubuntu2004.clang => Dockerfile.ubuntu2204.clang} (100%)

diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml
index e2da2cdea8..afdf03c8f3 100644
--- a/.github/workflows/buildpack-deps.yml
+++ b/.github/workflows/buildpack-deps.yml
@@ -6,8 +6,8 @@ on:
     paths:
       - 'scripts/docker/buildpack-deps/Dockerfile.emscripten'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz'
-      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang'
-      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004'
+      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang'
+      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204'
 
 jobs:
   buildpack-deps:
@@ -22,7 +22,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2004.clang, ubuntu2004]
+        image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2204.clang, ubuntu2204]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
similarity index 100%
rename from scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
rename to scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
similarity index 100%
rename from scripts/docker/buildpack-deps/Dockerfile.ubuntu2004.clang
rename to scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang

From 0178024903448039364e6db34f1ae8e0f2a61859 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 11 Jan 2023 13:55:10 +0100
Subject: [PATCH 1109/1748] Reset label version for new image

---
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204       | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index e10c20f196..2e7fe79053 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="17"
+LABEL version="1"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index eb257ae48b..ea2220ed3c 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="17"
+LABEL version="1"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

From 43032433fdf0b8bcbc588abc79ea51311786ec69 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 11 Jan 2023 14:08:39 +0100
Subject: [PATCH 1110/1748] Rename buildpack-deps ci scripts

---
 ...buntu2004.clang.sh => buildpack-deps_test_ubuntu2204.clang.sh} | 0
 ...-deps_test_ubuntu2004.sh => buildpack-deps_test_ubuntu2204.sh} | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename scripts/ci/{buildpack-deps_test_ubuntu2004.clang.sh => buildpack-deps_test_ubuntu2204.clang.sh} (100%)
 rename scripts/ci/{buildpack-deps_test_ubuntu2004.sh => buildpack-deps_test_ubuntu2204.sh} (100%)

diff --git a/scripts/ci/buildpack-deps_test_ubuntu2004.clang.sh b/scripts/ci/buildpack-deps_test_ubuntu2204.clang.sh
similarity index 100%
rename from scripts/ci/buildpack-deps_test_ubuntu2004.clang.sh
rename to scripts/ci/buildpack-deps_test_ubuntu2204.clang.sh
diff --git a/scripts/ci/buildpack-deps_test_ubuntu2004.sh b/scripts/ci/buildpack-deps_test_ubuntu2204.sh
similarity index 100%
rename from scripts/ci/buildpack-deps_test_ubuntu2004.sh
rename to scripts/ci/buildpack-deps_test_ubuntu2204.sh

From b07ccd56e18783fc0b2ff0d63a583c17e6e33f2b Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 11 Jan 2023 14:27:02 +0100
Subject: [PATCH 1111/1748] Add CLN library

---
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204       | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 2e7fe79053..74e61d0ad6 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -38,7 +38,7 @@ RUN set -ex; \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
 		libcvc4-dev libz3-static-dev z3-static jq \
-		; \
+		libcln-dev; \
 	apt-get install -qy python3-pip python3-sphinx; \
 	pip3 install codecov; \
 	rm -rf /var/lib/apt/lists/*
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index ea2220ed3c..21bd3b3483 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -39,7 +39,7 @@ RUN set -ex; \
 		libboost-program-options-dev \
 		clang \
 		libz3-static-dev z3-static jq \
-		; \
+		libcln-dev; \
 	rm -rf /var/lib/apt/lists/*
 
 FROM base AS libraries

From b1f728efcdfe486ff3365b44116c059276d2f191 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 12 Jan 2023 09:14:00 +0100
Subject: [PATCH 1112/1748] Remove `hera` build

---
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204  | 12 ------------
 .../buildpack-deps/Dockerfile.ubuntu2204.clang       | 12 ------------
 2 files changed, 24 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 74e61d0ad6..85cd85ecf2 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -57,18 +57,6 @@ RUN set -ex; \
 	ninja install/strip; \
 	rm -rf /usr/src/evmone
 
-# HERA
-RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.6.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
-	cd hera; \
-	mkdir build; \
-	cd build; \
-	cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
-	ninja; \
-	ninja install/strip; \
-	rm -rf /usr/src/hera
-
 FROM base
 COPY --from=libraries /usr/lib /usr/lib
 COPY --from=libraries /usr/bin /usr/bin
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index 21bd3b3483..d7f1c95f1e 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -59,18 +59,6 @@ RUN set -ex; \
 	ninja install/strip; \
 	rm -rf /usr/src/evmone
 
-# HERA
-RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.6.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
-	cd hera; \
-	mkdir build; \
-	cd build; \
-	cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
-	ninja; \
-	ninja install/strip; \
-	rm -rf /usr/src/hera
-
 FROM base
 COPY --from=libraries /usr/lib /usr/lib
 COPY --from=libraries /usr/bin /usr/bin

From 0ca97ba8b876388167b188f48ebe672e0a80288c Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 10 Jan 2023 13:16:59 +0100
Subject: [PATCH 1113/1748] Add snark verifier benchmark test

---
 test/benchmarks/run.sh       |   2 +-
 test/benchmarks/verifier.sol | 208 +++++++++++++++++++++++++++++++++++
 2 files changed, 209 insertions(+), 1 deletion(-)
 create mode 100644 test/benchmarks/verifier.sol

diff --git a/test/benchmarks/run.sh b/test/benchmarks/run.sh
index c4f35ba477..ef1c146f00 100755
--- a/test/benchmarks/run.sh
+++ b/test/benchmarks/run.sh
@@ -40,7 +40,7 @@ trap cleanup SIGINT SIGTERM
 
 solc="${SOLIDITY_BUILD_DIR}/solc/solc"
 benchmarks_dir="${REPO_ROOT}/test/benchmarks"
-benchmarks=("chains.sol" "OptimizorClub.sol")
+benchmarks=("chains.sol" "OptimizorClub.sol" "verifier.sol")
 time_bin_path=$(type -P time)
 
 for input_file in "${benchmarks[@]}"
diff --git a/test/benchmarks/verifier.sol b/test/benchmarks/verifier.sol
new file mode 100644
index 0000000000..dcfc97abf7
--- /dev/null
+++ b/test/benchmarks/verifier.sol
@@ -0,0 +1,208 @@
+// This file is MIT Licensed.
+//
+// Copyright 2017 Christian Reitwiessner
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+pragma solidity ^0.8.0;
+library Pairing {
+    struct G1Point {
+        uint X;
+        uint Y;
+    }
+    // Encoding of field elements is: X[0] * z + X[1]
+    struct G2Point {
+        uint[2] X;
+        uint[2] Y;
+    }
+    /// @return the generator of G1
+    function P1() pure internal returns (G1Point memory) {
+        return G1Point(1, 2);
+    }
+    /// @return the generator of G2
+    function P2() pure internal returns (G2Point memory) {
+        return G2Point(
+            [10857046999023057135944570762232829481370756359578518086990519993285655852781,
+             11559732032986387107991004021392285783925812861821192530917403151452391805634],
+            [8495653923123431417604973247489272438418190587263600148770280649306958101930,
+             4082367875863433681332203403145435568316851327593401208105741076214120093531]
+        );
+    }
+    /// @return the negation of p, i.e. p.addition(p.negate()) should be zero.
+    function negate(G1Point memory p) pure internal returns (G1Point memory) {
+        // The prime q in the base field F_q for G1
+        uint q = 21888242871839275222246405745257275088696311157297823662689037894645226208583;
+        if (p.X == 0 && p.Y == 0)
+            return G1Point(0, 0);
+        return G1Point(p.X, q - (p.Y % q));
+    }
+    /// @return r the sum of two points of G1
+    function addition(G1Point memory p1, G1Point memory p2) internal view returns (G1Point memory r) {
+        uint[4] memory input;
+        input[0] = p1.X;
+        input[1] = p1.Y;
+        input[2] = p2.X;
+        input[3] = p2.Y;
+        bool success;
+        assembly {
+            success := staticcall(sub(gas(), 2000), 6, input, 0xc0, r, 0x60)
+            // Use "invalid" to make gas estimation work
+            switch success case 0 { invalid() }
+        }
+        require(success);
+    }
+
+
+    /// @return r the product of a point on G1 and a scalar, i.e.
+    /// p == p.scalar_mul(1) and p.addition(p) == p.scalar_mul(2) for all points p.
+    function scalar_mul(G1Point memory p, uint s) internal view returns (G1Point memory r) {
+        uint[3] memory input;
+        input[0] = p.X;
+        input[1] = p.Y;
+        input[2] = s;
+        bool success;
+        assembly {
+            success := staticcall(sub(gas(), 2000), 7, input, 0x80, r, 0x60)
+            // Use "invalid" to make gas estimation work
+            switch success case 0 { invalid() }
+        }
+        require (success);
+    }
+    /// @return the result of computing the pairing check
+    /// e(p1[0], p2[0]) *  .... * e(p1[n], p2[n]) == 1
+    /// For example pairing([P1(), P1().negate()], [P2(), P2()]) should
+    /// return true.
+    function pairing(G1Point[] memory p1, G2Point[] memory p2) internal view returns (bool) {
+        require(p1.length == p2.length);
+        uint elements = p1.length;
+        uint inputSize = elements * 6;
+        uint[] memory input = new uint[](inputSize);
+        for (uint i = 0; i < elements; i++)
+        {
+            input[i * 6 + 0] = p1[i].X;
+            input[i * 6 + 1] = p1[i].Y;
+            input[i * 6 + 2] = p2[i].X[1];
+            input[i * 6 + 3] = p2[i].X[0];
+            input[i * 6 + 4] = p2[i].Y[1];
+            input[i * 6 + 5] = p2[i].Y[0];
+        }
+        uint[1] memory out;
+        bool success;
+        assembly {
+            success := staticcall(sub(gas(), 2000), 8, add(input, 0x20), mul(inputSize, 0x20), out, 0x20)
+            // Use "invalid" to make gas estimation work
+            switch success case 0 { invalid() }
+        }
+        require(success);
+        return out[0] != 0;
+    }
+    /// Convenience method for a pairing check for two pairs.
+    function pairingProd2(G1Point memory a1, G2Point memory a2, G1Point memory b1, G2Point memory b2) internal view returns (bool) {
+        G1Point[] memory p1 = new G1Point[](2);
+        G2Point[] memory p2 = new G2Point[](2);
+        p1[0] = a1;
+        p1[1] = b1;
+        p2[0] = a2;
+        p2[1] = b2;
+        return pairing(p1, p2);
+    }
+    /// Convenience method for a pairing check for three pairs.
+    function pairingProd3(
+            G1Point memory a1, G2Point memory a2,
+            G1Point memory b1, G2Point memory b2,
+            G1Point memory c1, G2Point memory c2
+    ) internal view returns (bool) {
+        G1Point[] memory p1 = new G1Point[](3);
+        G2Point[] memory p2 = new G2Point[](3);
+        p1[0] = a1;
+        p1[1] = b1;
+        p1[2] = c1;
+        p2[0] = a2;
+        p2[1] = b2;
+        p2[2] = c2;
+        return pairing(p1, p2);
+    }
+    /// Convenience method for a pairing check for four pairs.
+    function pairingProd4(
+            G1Point memory a1, G2Point memory a2,
+            G1Point memory b1, G2Point memory b2,
+            G1Point memory c1, G2Point memory c2,
+            G1Point memory d1, G2Point memory d2
+    ) internal view returns (bool) {
+        G1Point[] memory p1 = new G1Point[](4);
+        G2Point[] memory p2 = new G2Point[](4);
+        p1[0] = a1;
+        p1[1] = b1;
+        p1[2] = c1;
+        p1[3] = d1;
+        p2[0] = a2;
+        p2[1] = b2;
+        p2[2] = c2;
+        p2[3] = d2;
+        return pairing(p1, p2);
+    }
+}
+
+contract Verifier {
+    using Pairing for *;
+    struct VerifyingKey {
+        Pairing.G1Point alpha;
+        Pairing.G2Point beta;
+        Pairing.G2Point gamma;
+        Pairing.G2Point delta;
+        Pairing.G1Point[] gamma_abc;
+    }
+    struct Proof {
+        Pairing.G1Point a;
+        Pairing.G2Point b;
+        Pairing.G1Point c;
+    }
+    function verifyingKey() pure internal returns (VerifyingKey memory vk) {
+        vk.alpha = Pairing.G1Point(uint256(0x1e19a8a58ad52243374aeded373b7e89656ea339b9fa8ace98dd5fb221885ea2), uint256(0x2e66a9a67f1a9060a51da039c91c3402d1f46b71bbf10c7348ac4f13c3906736));
+        vk.beta = Pairing.G2Point([uint256(0x1ca3e556290187c64a1057061f419a078dc71353f6af1066c03d7e1448bbc119), uint256(0x2bbc1b80e59743b489ec811b4ebf30a1ff540c2c37ced63d360b94f92f0a41fb)], [uint256(0x07eceb98d2fb10fa7363b45f51aa3d3ef3d511b482790645039a2562e2070f30), uint256(0x1c3e076d2aaf914abd6a49b72c4205669d3d1cbe4a4bf97b9ee49ac0fbbdbda9)]);
+        vk.gamma = Pairing.G2Point([uint256(0x222c0019521d3e52881431be17cacaf8a7379398dd0833f60a2ac45f1c3fcd42), uint256(0x1018dbb94cd920bd55af4e2b12a9f740c6b38748a163b5dbd37c5ef6cf74708f)], [uint256(0x18bf34dc86b549a92f316f7a32070a3ce45a0f38fa45dda1162c4b6498baf286), uint256(0x12848d5a670b6102d5bd45d2b8250d50361001ea335ff6a1405a52504c22b8ac)]);
+        vk.delta = Pairing.G2Point([uint256(0x13b8e16c40a6a299ea42107a97f881f9fa89986dcd5234ecb6919caf756ac1cb), uint256(0x25b64e4978690cd7cb531dbab0119148c96f5fc0c984c0cafb290bb75f033a09)], [uint256(0x1758eaa970929deff5e96e5852d21790c32591dbb13bc63e3df046f0271479a4), uint256(0x14d0b4222ad1710c6330e4bd8ad8f0d7b8f4cff0a37793d53001800e49f41192)]);
+        vk.gamma_abc = new Pairing.G1Point[](9);
+        vk.gamma_abc[0] = Pairing.G1Point(uint256(0x0925dc800d3a577859439a049f8ed0ae7a37dcd36652de478d662c08907a7626), uint256(0x1f7f76e299220ebf3da17bb415d25e6574e142391972dbd1513cf81341975cb5));
+        vk.gamma_abc[1] = Pairing.G1Point(uint256(0x0e67dddfd91adad72376c56cbd98d5cfa4df5217d6115ff26ec741d0154f0bd8), uint256(0x0b97b2ddfdf4c31916d98e384bee3b24bfa0fc59a21ab489153f4dcd1a9a48ca));
+        vk.gamma_abc[2] = Pairing.G1Point(uint256(0x1416b354665883cbbc5f5541012d1f8dd87ebb4415b3ee431be0804fff290bbf), uint256(0x1a284dd2eff43e6cb5aaea43dd9bee022ef0c91d90d0803cf5f7e4677e94a271));
+        vk.gamma_abc[3] = Pairing.G1Point(uint256(0x2526852e7f009b4afa1fe0e1d30334c6e516fac223866b81a830b472164bdfe7), uint256(0x28adf6fbe54ba40afa91555c18477ad3a2f0a460f68d55a15b4e0c264b9c11c2));
+        vk.gamma_abc[4] = Pairing.G1Point(uint256(0x22feae4a12bfb751638cd76b2373e84884ba4adef575ea14ed50c5954d31d410), uint256(0x108c3da0ffd7eda1fe7789e41693146beb979bd1644b19bbd517742ca3841348));
+        vk.gamma_abc[5] = Pairing.G1Point(uint256(0x081477a5c52f41533cf6ca4f778ab922d59ba44b5a5e3fbdbf34ed8dc1a47a8d), uint256(0x0f2624780bd75b9f6c47f7bee582d02f1f983529b8aa9493ca848e38f2ec8447));
+        vk.gamma_abc[6] = Pairing.G1Point(uint256(0x0603e7413c605d1e9b9352a62f0208e2bbd247d3cf3b3721f72c3a9407d679b9), uint256(0x0ce2d2dca8ae14ac4fd2f3fd89e602cdb45de815cf3ba183a25a47d877d9f6f5));
+        vk.gamma_abc[7] = Pairing.G1Point(uint256(0x05bbe6b58285021fb843123971f8e2cfdd207b02c0aef5923ffe7ac841ee0cc9), uint256(0x2da1d3c2049546a7b46aaf89a8a7de493470087ce9af8ba37673f5ee8c35eb1b));
+        vk.gamma_abc[8] = Pairing.G1Point(uint256(0x2c721270df9ba8884d309140f3a4b150a8e53a6c9d09bd8fc7c9aa3c4901aa8d), uint256(0x0de2cb1684759e693e855711fa1c381ae737e463447c3817df507a02064b470f));
+    }
+    function verify(uint[] memory input, Proof memory proof) internal view returns (uint) {
+        uint256 snark_scalar_field = 21888242871839275222246405745257275088548364400416034343698204186575808495617;
+        VerifyingKey memory vk = verifyingKey();
+        require(input.length + 1 == vk.gamma_abc.length);
+        // Compute the linear combination vk_x
+        Pairing.G1Point memory vk_x = Pairing.G1Point(0, 0);
+        for (uint i = 0; i < input.length; i++) {
+            require(input[i] < snark_scalar_field);
+            vk_x = Pairing.addition(vk_x, Pairing.scalar_mul(vk.gamma_abc[i + 1], input[i]));
+        }
+        vk_x = Pairing.addition(vk_x, vk.gamma_abc[0]);
+        if(!Pairing.pairingProd4(
+             proof.a, proof.b,
+             Pairing.negate(vk_x), vk.gamma,
+             Pairing.negate(proof.c), vk.delta,
+             Pairing.negate(vk.alpha), vk.beta)) return 1;
+        return 0;
+    }
+    function verifyTx(
+            Proof memory proof, uint[8] memory input
+        ) public view returns (bool r) {
+        uint[] memory inputValues = new uint[](8);
+
+        for(uint i = 0; i < input.length; i++){
+            inputValues[i] = input[i];
+        }
+        if (verify(inputValues, proof) == 0) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}

From 82806c4236af8aa7fb9ee1a270bc9b2fcf887485 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 16 Jan 2023 12:54:02 -0300
Subject: [PATCH 1114/1748] Change filename in sed command

---
 test/externalTests/gnosis.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index a6ded27e16..f33e723b6d 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -72,7 +72,7 @@ function gnosis_safe_test
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
     # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
-    sed -i "s|\(it\)\(('should not allow to call setup on singleton'\)|\1.skip\2|g" test/core/GnosisSafe.Setup.spec.ts
+    sed -i "s|\(it\)\(('should not allow to call setup on singleton'\)|\1.skip\2|g" test/core/Safe.Setup.spec.ts
     # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i 's|\(it\)\(("changes the expected storage slot without touching the most important ones"\)|\1.skip\2|g' test/libraries/SignMessageLib.spec.ts
     sed -i "s|\(it\)\(('can be used only via DELEGATECALL opcode'\)|\1.skip\2|g" test/libraries/SignMessageLib.spec.ts

From 83774c28bfe300c73bfc54b535c0f5e893e069c2 Mon Sep 17 00:00:00 2001
From: Big-Aaron <37289216+Big-Aaron@users.noreply.github.com>
Date: Tue, 17 Jan 2023 11:30:30 +0800
Subject: [PATCH 1115/1748] Update ir-breaking-changes.rst

Fix errors in the doc
---
 docs/ir-breaking-changes.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index 7e4efce688..2d972baa79 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -122,8 +122,8 @@ hiding new and different behavior in existing code.
           modifier mod() { _; _; }
       }
 
-  If you execute ``f(0)`` in the old code generator, it will return ``2``, while
-  it will return ``1`` when using the new code generator.
+  If you execute ``f(0)`` in the old code generator, it will return ``1``, while
+  it will return ``0`` when using the new code generator.
 
   .. code-block:: solidity
 

From 83c1f620263433418383e88e0b67fc167ca5a3c0 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 17 Jan 2023 11:52:45 +0100
Subject: [PATCH 1116/1748] Source location for named mapping keys

---
 libsolidity/ast/AST.h                         | 12 ++-
 libsolidity/ast/ASTJsonExporter.cpp           |  2 +
 libsolidity/ast/ASTJsonImporter.cpp           | 18 +++-
 libsolidity/ast/ASTJsonImporter.h             |  4 +
 libsolidity/parsing/Parser.cpp                | 16 ++--
 test/libsolidity/ASTJSON/address_payable.json |  2 +
 .../ASTJSON/address_payable_parseOnly.json    |  2 +
 test/libsolidity/ASTJSON/mappings.json        | 93 ++++++++++++++++---
 test/libsolidity/ASTJSON/mappings.sol         |  1 +
 .../ASTJSON/mappings_parseOnly.json           | 54 ++++++++++-
 .../ASTJSON/userDefinedValueType.json         |  2 +
 .../userDefinedValueType_parseOnly.json       |  2 +
 12 files changed, 177 insertions(+), 31 deletions(-)

diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 3ba28a4390..06575beece 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -1428,28 +1428,36 @@ class Mapping: public TypeName
 		SourceLocation const& _location,
 		ASTPointer<TypeName> _keyType,
 		ASTPointer<ASTString> _keyName,
+		SourceLocation _keyNameLocation,
 		ASTPointer<TypeName> _valueType,
-		ASTPointer<ASTString> _valueName
+		ASTPointer<ASTString> _valueName,
+		SourceLocation _valueNameLocation
 	):
 		TypeName(_id, _location),
 		m_keyType(std::move(_keyType)),
 		m_keyName(std::move(_keyName)),
+		m_keyNameLocation(std::move(_keyNameLocation)),
 		m_valueType(std::move(_valueType)),
-		m_valueName(std::move(_valueName))
+		m_valueName(std::move(_valueName)),
+		m_valueNameLocation(std::move(_valueNameLocation))
 	{}
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
 
 	TypeName const& keyType() const { return *m_keyType; }
 	ASTString keyName() const { return *m_keyName; }
+	SourceLocation keyNameLocation() const { return m_keyNameLocation; }
 	TypeName const& valueType() const { return *m_valueType; }
 	ASTString valueName() const { return *m_valueName; }
+	SourceLocation valueNameLocation() const { return m_valueNameLocation; }
 
 private:
 	ASTPointer<TypeName> m_keyType;
 	ASTPointer<ASTString> m_keyName;
+	SourceLocation m_keyNameLocation;
 	ASTPointer<TypeName> m_valueType;
 	ASTPointer<ASTString> m_valueName;
+	SourceLocation m_valueNameLocation;
 };
 
 /**
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index 7ae528fcda..8b46684bc4 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -599,8 +599,10 @@ bool ASTJsonExporter::visit(Mapping const& _node)
 	setJsonNode(_node, "Mapping", {
 		make_pair("keyType", toJson(_node.keyType())),
 		make_pair("keyName", _node.keyName()),
+		make_pair("keyNameLocation", sourceLocationToString(_node.keyNameLocation())),
 		make_pair("valueType", toJson(_node.valueType())),
 		make_pair("valueName", _node.valueName()),
+		make_pair("valueNameLocation", sourceLocationToString(_node.valueNameLocation())),
 		make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
 	});
 	return false;
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 22b53aa474..0797049468 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -116,6 +116,20 @@ SourceLocation ASTJsonImporter::createNameSourceLocation(Json::Value const& _nod
 	return solidity::langutil::parseSourceLocation(_node["nameLocation"].asString(), m_sourceNames);
 }
 
+SourceLocation ASTJsonImporter::createKeyNameSourceLocation(Json::Value const& _node)
+{
+	astAssert(member(_node, "keyNameLocation").isString(), "'keyNameLocation' must be a string");
+
+	return solidity::langutil::parseSourceLocation(_node["keyNameLocation"].asString(), m_sourceNames);
+}
+
+SourceLocation ASTJsonImporter::createValueNameSourceLocation(Json::Value const& _node)
+{
+	astAssert(member(_node, "valueNameLocation").isString(), "'valueNameLocation' must be a string");
+
+	return solidity::langutil::parseSourceLocation(_node["valueNameLocation"].asString(), m_sourceNames);
+}
+
 template<class T>
 ASTPointer<T> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _node)
 {
@@ -649,8 +663,10 @@ ASTPointer<Mapping> ASTJsonImporter::createMapping(Json::Value const&  _node)
 		_node,
 		convertJsonToASTNode<TypeName>(member(_node, "keyType")),
 		memberAsASTString(_node, "keyName"),
+		createKeyNameSourceLocation(_node),
 		convertJsonToASTNode<TypeName>(member(_node, "valueType")),
-		memberAsASTString(_node, "valueName")
+		memberAsASTString(_node, "valueName"),
+		createValueNameSourceLocation(_node)
 	);
 }
 
diff --git a/libsolidity/ast/ASTJsonImporter.h b/libsolidity/ast/ASTJsonImporter.h
index 1216d29b15..b9a4d49505 100644
--- a/libsolidity/ast/ASTJsonImporter.h
+++ b/libsolidity/ast/ASTJsonImporter.h
@@ -69,6 +69,10 @@ class ASTJsonImporter
 	ASTPointer<T> convertJsonToASTNode(Json::Value const& _node);
 
 	langutil::SourceLocation createNameSourceLocation(Json::Value const& _node);
+	/// @returns source location of a mapping key name
+	langutil::SourceLocation createKeyNameSourceLocation(Json::Value const& _node);
+	/// @returns source location of a mapping value name
+	langutil::SourceLocation createValueNameSourceLocation(Json::Value const& _node);
 
 	/// \defgroup nodeCreators JSON to AST-Nodes
 	///@{
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index e81f0713fd..fee21e5184 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1187,21 +1187,19 @@ ASTPointer<Mapping> Parser::parseMapping()
 	}
 	else
 		fatalParserError(1005_error, "Expected elementary type name or identifier for mapping key type");
-	ASTPointer<ASTString> keyName;
+	ASTPointer<ASTString> keyName = make_shared<ASTString>("");
+	SourceLocation keyNameLocation{};
 	if (m_scanner->currentToken() == Token::Identifier)
-		keyName = getLiteralAndAdvance();
-	else
-		keyName = make_shared<ASTString>("");
+		tie(keyName, keyNameLocation) = expectIdentifierWithLocation();
 	expectToken(Token::DoubleArrow);
 	ASTPointer<TypeName> valueType = parseTypeName();
-	ASTPointer<ASTString> valueName;
+	ASTPointer<ASTString> valueName = make_shared<ASTString>("");
+	SourceLocation valueNameLocation{};
 	if (m_scanner->currentToken() == Token::Identifier)
-		valueName = getLiteralAndAdvance();
-	else
-		valueName = make_shared<ASTString>("");
+		tie(valueName, valueNameLocation) = expectIdentifierWithLocation();
 	nodeFactory.markEndPosition();
 	expectToken(Token::RParen);
-	return nodeFactory.createNode<Mapping>(keyType, keyName, valueType, valueName);
+	return nodeFactory.createNode<Mapping>(keyType, keyName, keyNameLocation, valueType, valueName, valueNameLocation);
 }
 
 ASTPointer<ParameterList> Parser::parseParameterList(
diff --git a/test/libsolidity/ASTJSON/address_payable.json b/test/libsolidity/ASTJSON/address_payable.json
index bf56f067fc..83ba2c6d7c 100644
--- a/test/libsolidity/ASTJSON/address_payable.json
+++ b/test/libsolidity/ASTJSON/address_payable.json
@@ -49,6 +49,7 @@
           {
             "id": 3,
             "keyName": "",
+            "keyNameLocation": "-1:-1:-1",
             "keyType":
             {
               "id": 1,
@@ -69,6 +70,7 @@
               "typeString": "mapping(address => address payable)"
             },
             "valueName": "",
+            "valueNameLocation": "-1:-1:-1",
             "valueType":
             {
               "id": 2,
diff --git a/test/libsolidity/ASTJSON/address_payable_parseOnly.json b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
index 6b72b6fb3c..9d095dc686 100644
--- a/test/libsolidity/ASTJSON/address_payable_parseOnly.json
+++ b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
@@ -30,6 +30,7 @@
           {
             "id": 3,
             "keyName": "",
+            "keyNameLocation": "-1:-1:-1",
             "keyType":
             {
               "id": 1,
@@ -42,6 +43,7 @@
             "src": "17:35:1",
             "typeDescriptions": {},
             "valueName": "",
+            "valueNameLocation": "-1:-1:-1",
             "valueType":
             {
               "id": 2,
diff --git a/test/libsolidity/ASTJSON/mappings.json b/test/libsolidity/ASTJSON/mappings.json
index f63f6689fd..0bf816eb49 100644
--- a/test/libsolidity/ASTJSON/mappings.json
+++ b/test/libsolidity/ASTJSON/mappings.json
@@ -4,10 +4,10 @@
   {
     "C":
     [
-      19
+      23
     ]
   },
-  "id": 20,
+  "id": 24,
   "nodeType": "SourceUnit",
   "nodes":
   [
@@ -18,10 +18,10 @@
       "contractDependencies": [],
       "contractKind": "contract",
       "fullyImplemented": true,
-      "id": 19,
+      "id": 23,
       "linearizedBaseContracts":
       [
-        19
+        23
       ],
       "name": "C",
       "nameLocation": "9:1:1",
@@ -67,19 +67,20 @@
           "name": "a",
           "nameLocation": "59:1:1",
           "nodeType": "VariableDeclaration",
-          "scope": 19,
+          "scope": 23,
           "src": "40:20:1",
           "stateVariable": true,
           "storageLocation": "default",
           "typeDescriptions":
           {
-            "typeIdentifier": "t_mapping$_t_contract$_C_$19_$_t_bool_$",
+            "typeIdentifier": "t_mapping$_t_contract$_C_$23_$_t_bool_$",
             "typeString": "mapping(contract C => bool)"
           },
           "typeName":
           {
             "id": 8,
             "keyName": "",
+            "keyNameLocation": "-1:-1:-1",
             "keyType":
             {
               "id": 6,
@@ -93,14 +94,14 @@
                   "48:1:1"
                 ],
                 "nodeType": "IdentifierPath",
-                "referencedDeclaration": 19,
+                "referencedDeclaration": 23,
                 "src": "48:1:1"
               },
-              "referencedDeclaration": 19,
+              "referencedDeclaration": 23,
               "src": "48:1:1",
               "typeDescriptions":
               {
-                "typeIdentifier": "t_contract$_C_$19",
+                "typeIdentifier": "t_contract$_C_$23",
                 "typeString": "contract C"
               }
             },
@@ -108,10 +109,11 @@
             "src": "40:18:1",
             "typeDescriptions":
             {
-              "typeIdentifier": "t_mapping$_t_contract$_C_$19_$_t_bool_$",
+              "typeIdentifier": "t_mapping$_t_contract$_C_$23_$_t_bool_$",
               "typeString": "mapping(contract C => bool)"
             },
             "valueName": "",
+            "valueNameLocation": "-1:-1:-1",
             "valueType":
             {
               "id": 7,
@@ -134,7 +136,7 @@
           "name": "b",
           "nameLocation": "91:1:1",
           "nodeType": "VariableDeclaration",
-          "scope": 19,
+          "scope": 23,
           "src": "66:26:1",
           "stateVariable": true,
           "storageLocation": "default",
@@ -147,6 +149,7 @@
           {
             "id": 12,
             "keyName": "",
+            "keyNameLocation": "-1:-1:-1",
             "keyType":
             {
               "id": 10,
@@ -167,6 +170,7 @@
               "typeString": "mapping(address => bool)"
             },
             "valueName": "",
+            "valueNameLocation": "-1:-1:-1",
             "valueType":
             {
               "id": 11,
@@ -189,7 +193,7 @@
           "name": "c",
           "nameLocation": "117:1:1",
           "nodeType": "VariableDeclaration",
-          "scope": 19,
+          "scope": 23,
           "src": "98:20:1",
           "stateVariable": true,
           "storageLocation": "default",
@@ -202,6 +206,7 @@
           {
             "id": 17,
             "keyName": "",
+            "keyNameLocation": "-1:-1:-1",
             "keyType":
             {
               "id": 15,
@@ -234,6 +239,7 @@
               "typeString": "mapping(enum C.E => bool)"
             },
             "valueName": "",
+            "valueNameLocation": "-1:-1:-1",
             "valueType":
             {
               "id": 16,
@@ -248,12 +254,69 @@
             }
           },
           "visibility": "internal"
+        },
+        {
+          "constant": false,
+          "id": 22,
+          "mutability": "mutable",
+          "name": "d",
+          "nameLocation": "169:1:1",
+          "nodeType": "VariableDeclaration",
+          "scope": 23,
+          "src": "124:46:1",
+          "stateVariable": true,
+          "storageLocation": "default",
+          "typeDescriptions":
+          {
+            "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
+            "typeString": "mapping(address => uint256)"
+          },
+          "typeName":
+          {
+            "id": 21,
+            "keyName": "keyAddress",
+            "keyNameLocation": "140:10:1",
+            "keyType":
+            {
+              "id": 19,
+              "name": "address",
+              "nodeType": "ElementaryTypeName",
+              "src": "132:7:1",
+              "typeDescriptions":
+              {
+                "typeIdentifier": "t_address",
+                "typeString": "address"
+              }
+            },
+            "nodeType": "Mapping",
+            "src": "124:44:1",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_mapping$_t_address_$_t_uint256_$",
+              "typeString": "mapping(address => uint256)"
+            },
+            "valueName": "value",
+            "valueNameLocation": "162:5:1",
+            "valueType":
+            {
+              "id": 20,
+              "name": "uint256",
+              "nodeType": "ElementaryTypeName",
+              "src": "154:7:1",
+              "typeDescriptions":
+              {
+                "typeIdentifier": "t_uint256",
+                "typeString": "uint256"
+              }
+            }
+          },
+          "visibility": "internal"
         }
       ],
-      "scope": 20,
-      "src": "0:121:1",
+      "scope": 24,
+      "src": "0:173:1",
       "usedErrors": []
     }
   ],
-  "src": "0:122:1"
+  "src": "0:174:1"
 }
diff --git a/test/libsolidity/ASTJSON/mappings.sol b/test/libsolidity/ASTJSON/mappings.sol
index 794396a7d2..05912d21f7 100644
--- a/test/libsolidity/ASTJSON/mappings.sol
+++ b/test/libsolidity/ASTJSON/mappings.sol
@@ -3,6 +3,7 @@ contract C {
     mapping(C => bool) a;
     mapping(address => bool) b;
     mapping(E => bool) c;
+    mapping(address keyAddress => uint256 value) d;
 }
 
 // ----
diff --git a/test/libsolidity/ASTJSON/mappings_parseOnly.json b/test/libsolidity/ASTJSON/mappings_parseOnly.json
index 2471148492..9690f7c9ef 100644
--- a/test/libsolidity/ASTJSON/mappings_parseOnly.json
+++ b/test/libsolidity/ASTJSON/mappings_parseOnly.json
@@ -1,6 +1,6 @@
 {
   "absolutePath": "a",
-  "id": 20,
+  "id": 24,
   "nodeType": "SourceUnit",
   "nodes":
   [
@@ -9,7 +9,7 @@
       "baseContracts": [],
       "contractDependencies": [],
       "contractKind": "contract",
-      "id": 19,
+      "id": 23,
       "name": "C",
       "nameLocation": "9:1:1",
       "nodeType": "ContractDefinition",
@@ -61,6 +61,7 @@
           {
             "id": 8,
             "keyName": "",
+            "keyNameLocation": "-1:-1:-1",
             "keyType":
             {
               "id": 6,
@@ -83,6 +84,7 @@
             "src": "40:18:1",
             "typeDescriptions": {},
             "valueName": "",
+            "valueNameLocation": "-1:-1:-1",
             "valueType":
             {
               "id": 7,
@@ -109,6 +111,7 @@
           {
             "id": 12,
             "keyName": "",
+            "keyNameLocation": "-1:-1:-1",
             "keyType":
             {
               "id": 10,
@@ -121,6 +124,7 @@
             "src": "66:24:1",
             "typeDescriptions": {},
             "valueName": "",
+            "valueNameLocation": "-1:-1:-1",
             "valueType":
             {
               "id": 11,
@@ -147,6 +151,7 @@
           {
             "id": 17,
             "keyName": "",
+            "keyNameLocation": "-1:-1:-1",
             "keyType":
             {
               "id": 15,
@@ -169,6 +174,7 @@
             "src": "98:18:1",
             "typeDescriptions": {},
             "valueName": "",
+            "valueNameLocation": "-1:-1:-1",
             "valueType":
             {
               "id": 16,
@@ -179,11 +185,51 @@
             }
           },
           "visibility": "internal"
+        },
+        {
+          "constant": false,
+          "id": 22,
+          "mutability": "mutable",
+          "name": "d",
+          "nameLocation": "169:1:1",
+          "nodeType": "VariableDeclaration",
+          "src": "124:46:1",
+          "stateVariable": false,
+          "storageLocation": "default",
+          "typeDescriptions": {},
+          "typeName":
+          {
+            "id": 21,
+            "keyName": "keyAddress",
+            "keyNameLocation": "140:10:1",
+            "keyType":
+            {
+              "id": 19,
+              "name": "address",
+              "nodeType": "ElementaryTypeName",
+              "src": "132:7:1",
+              "typeDescriptions": {}
+            },
+            "nodeType": "Mapping",
+            "src": "124:44:1",
+            "typeDescriptions": {},
+            "valueName": "value",
+            "valueNameLocation": "162:5:1",
+            "valueType":
+            {
+              "id": 20,
+              "name": "uint256",
+              "nodeType": "ElementaryTypeName",
+              "src": "154:7:1",
+              "typeDescriptions": {}
+            }
+          },
+          "visibility": "internal"
         }
       ],
-      "src": "0:121:1",
+      "src": "0:173:1",
       "usedErrors": []
     }
   ],
-  "src": "0:122:1"
+  "src": "0:174:1"
 }
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType.json b/test/libsolidity/ASTJSON/userDefinedValueType.json
index 743716548b..eb44509466 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType.json
@@ -288,6 +288,7 @@
           {
             "id": 25,
             "keyName": "",
+            "keyNameLocation": "-1:-1:-1",
             "keyType":
             {
               "id": 22,
@@ -320,6 +321,7 @@
               "typeString": "mapping(C.MyAddress => C.MyUInt)"
             },
             "valueName": "",
+            "valueNameLocation": "-1:-1:-1",
             "valueType":
             {
               "id": 24,
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
index 5e263eaea8..0dc95e13f9 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
@@ -214,6 +214,7 @@
           {
             "id": 25,
             "keyName": "",
+            "keyNameLocation": "-1:-1:-1",
             "keyType":
             {
               "id": 22,
@@ -236,6 +237,7 @@
             "src": "169:28:1",
             "typeDescriptions": {},
             "valueName": "",
+            "valueNameLocation": "-1:-1:-1",
             "valueType":
             {
               "id": 24,

From df2ea195350aa3ad1eb8ce7271c60463999457de Mon Sep 17 00:00:00 2001
From: andy53 <andy@evilrobots.club>
Date: Sat, 3 Dec 2022 12:07:06 -0700
Subject: [PATCH 1117/1748] Remove solidity-upgrade

update config.yaml

Update using-the-compiler.rst

removed bug reports section

added changelog entry

removed trailing whitespace

removed trailing whitespace
---
 .circleci/config.yml                          |   7 -
 Changelog.md                                  |   1 +
 docs/using-the-compiler.rst                   | 227 +-------
 tools/CMakeLists.txt                          |  14 -
 tools/solidityUpgrade/SourceTransform.h       | 309 ----------
 tools/solidityUpgrade/SourceUpgrade.cpp       | 541 ------------------
 tools/solidityUpgrade/SourceUpgrade.h         | 173 ------
 tools/solidityUpgrade/Upgrade050.cpp          |  55 --
 tools/solidityUpgrade/Upgrade050.h            |  59 --
 tools/solidityUpgrade/Upgrade060.cpp          | 197 -------
 tools/solidityUpgrade/Upgrade060.h            |  79 ---
 tools/solidityUpgrade/Upgrade070.cpp          |  85 ---
 tools/solidityUpgrade/Upgrade070.h            |  53 --
 tools/solidityUpgrade/UpgradeChange.cpp       |  80 ---
 tools/solidityUpgrade/UpgradeChange.h         |  79 ---
 tools/solidityUpgrade/UpgradeSuite.h          |  99 ----
 .../contracts/DocsExamplePass.sol             |  23 -
 tools/solidityUpgrade/contracts/Test.sol      |  18 -
 .../contracts/TestMultiline.sol               |  21 -
 .../contracts/TestNonFixable.sol              |  15 -
 tools/solidityUpgrade/main.cpp                |  99 ----
 21 files changed, 2 insertions(+), 2232 deletions(-)
 delete mode 100644 tools/solidityUpgrade/SourceTransform.h
 delete mode 100644 tools/solidityUpgrade/SourceUpgrade.cpp
 delete mode 100644 tools/solidityUpgrade/SourceUpgrade.h
 delete mode 100644 tools/solidityUpgrade/Upgrade050.cpp
 delete mode 100644 tools/solidityUpgrade/Upgrade050.h
 delete mode 100644 tools/solidityUpgrade/Upgrade060.cpp
 delete mode 100644 tools/solidityUpgrade/Upgrade060.h
 delete mode 100644 tools/solidityUpgrade/Upgrade070.cpp
 delete mode 100644 tools/solidityUpgrade/Upgrade070.h
 delete mode 100644 tools/solidityUpgrade/UpgradeChange.cpp
 delete mode 100644 tools/solidityUpgrade/UpgradeChange.h
 delete mode 100644 tools/solidityUpgrade/UpgradeSuite.h
 delete mode 100644 tools/solidityUpgrade/contracts/DocsExamplePass.sol
 delete mode 100644 tools/solidityUpgrade/contracts/Test.sol
 delete mode 100644 tools/solidityUpgrade/contracts/TestMultiline.sol
 delete mode 100644 tools/solidityUpgrade/contracts/TestNonFixable.sol
 delete mode 100644 tools/solidityUpgrade/main.cpp

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2783532d8e..b2c1ab9209 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -173,11 +173,6 @@ defaults:
   - artifact_solc_windows: &artifact_solc_windows
       path: upload/
 
-  # compiled tool executable target
-  - artifact_solidity_upgrade: &artifact_solidity_upgrade
-      path: build/tools/solidity-upgrade
-      destination: solidity-upgrade
-
   - artifact_yul_phaser: &artifact_yul_phaser
       path: build/tools/yul-phaser
       destination: yul-phaser
@@ -251,7 +246,6 @@ defaults:
         - checkout
         - run: *run_build
         - store_artifacts: *artifacts_solc
-        - store_artifacts: *artifact_solidity_upgrade
         - store_artifacts: *artifact_yul_phaser
         - persist_to_workspace: *artifacts_executables
         - gitter_notify_failure_unless_pr
@@ -952,7 +946,6 @@ jobs:
           <<: *steps_install_dependencies_osx
       - run: *run_build
       - store_artifacts: *artifacts_solc
-      - store_artifacts: *artifact_solidity_upgrade
       - store_artifacts: *artifact_yul_phaser
       - persist_to_workspace:
           root: .
diff --git a/Changelog.md b/Changelog.md
index b77be4f396..ad463630b4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -18,6 +18,7 @@ Compiler Features:
  * SMTChecker: Support Eldarica as a Horn solver for the CHC engine when using the CLI option ``--model-checker-solvers eld``. The binary `eld` must be available in the system.
  * SMTChecker: Make ``z3`` the default solver for the BMC and CHC engines instead of all solvers.
  * Parser: More detailed error messages about invalid version pragmas.
+ * Removed support for the ``solidity-upgrade`` tool.
 
 
 Bugfixes:
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index e5b5f00ec0..fca81760c4 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -630,229 +630,4 @@ Error Types
 12. ``FatalError``: Fatal error not processed correctly - this should be reported as an issue.
 13. ``YulException``: Error during Yul Code generation - this should be reported as an issue.
 14. ``Warning``: A warning, which didn't stop the compilation, but should be addressed if possible.
-15. ``Info``: Information that the compiler thinks the user might find useful, but is not dangerous and does not necessarily need to be addressed.
-
-
-.. _compiler-tools:
-
-Compiler Tools
-**************
-
-solidity-upgrade
-----------------
-
-``solidity-upgrade`` can help you to semi-automatically upgrade your contracts
-to breaking language changes. While it does not and cannot implement all
-required changes for every breaking release, it still supports the ones, that
-would need plenty of repetitive manual adjustments otherwise.
-
-.. note::
-
-    ``solidity-upgrade`` carries out a large part of the work, but your
-    contracts will most likely need further manual adjustments. We recommend
-    using a version control system for your files. This helps reviewing and
-    eventually rolling back the changes made.
-
-.. warning::
-
-    ``solidity-upgrade`` is not considered to be complete or free from bugs, so
-    please use with care.
-
-How it Works
-~~~~~~~~~~~~
-
-You can pass (a) Solidity source file(s) to ``solidity-upgrade [files]``. If
-these make use of ``import`` statement which refer to files outside the
-current source file's directory, you need to specify directories that
-are allowed to read and import files from, by passing
-``--allow-paths [directory]``. You can ignore missing files by passing
-``--ignore-missing``.
-
-``solidity-upgrade`` is based on ``libsolidity`` and can parse, compile and
-analyse your source files, and might find applicable source upgrades in them.
-
-Source upgrades are considered to be small textual changes to your source code.
-They are applied to an in-memory representation of the source files
-given. The corresponding source file is updated by default, but you can pass
-``--dry-run`` to simulate to whole upgrade process without writing to any file.
-
-The upgrade process itself has two phases. In the first phase source files are
-parsed, and since it is not possible to upgrade source code on that level,
-errors are collected and can be logged by passing ``--verbose``. No source
-upgrades available at this point.
-
-In the second phase, all sources are compiled and all activated upgrade analysis
-modules are run alongside compilation. By default, all available modules are
-activated. Please read the documentation on
-:ref:`available modules <upgrade-modules>` for further details.
-
-
-This can result in compilation errors that may
-be fixed by source upgrades. If no errors occur, no source upgrades are being
-reported and you're done.
-If errors occur and some upgrade module reported a source upgrade, the first
-reported one gets applied and compilation is triggered again for all given
-source files. The previous step is repeated as long as source upgrades are
-reported. If errors still occur, you can log them by passing ``--verbose``.
-If no errors occur, your contracts are up to date and can be compiled with
-the latest version of the compiler.
-
-.. _upgrade-modules:
-
-Available Upgrade Modules
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-+----------------------------+---------+--------------------------------------------------+
-| Module                     | Version | Description                                      |
-+============================+=========+==================================================+
-| ``constructor``            | 0.5.0   | Constructors must now be defined using the       |
-|                            |         | ``constructor`` keyword.                         |
-+----------------------------+---------+--------------------------------------------------+
-| ``visibility``             | 0.5.0   | Explicit function visibility is now mandatory,   |
-|                            |         | defaults to ``public``.                          |
-+----------------------------+---------+--------------------------------------------------+
-| ``abstract``               | 0.6.0   | The keyword ``abstract`` has to be used if a     |
-|                            |         | contract does not implement all its functions.   |
-+----------------------------+---------+--------------------------------------------------+
-| ``virtual``                | 0.6.0   | Functions without implementation outside an      |
-|                            |         | interface have to be marked ``virtual``.         |
-+----------------------------+---------+--------------------------------------------------+
-| ``override``               | 0.6.0   | When overriding a function or modifier, the new  |
-|                            |         | keyword ``override`` must be used.               |
-+----------------------------+---------+--------------------------------------------------+
-| ``dotsyntax``              | 0.7.0   | The following syntax is deprecated:              |
-|                            |         | ``f.gas(...)()``, ``f.value(...)()`` and         |
-|                            |         | ``(new C).value(...)()``. Replace these calls by |
-|                            |         | ``f{gas: ..., value: ...}()`` and                |
-|                            |         | ``(new C){value: ...}()``.                       |
-+----------------------------+---------+--------------------------------------------------+
-| ``now``                    | 0.7.0   | The ``now`` keyword is deprecated. Use           |
-|                            |         | ``block.timestamp`` instead.                     |
-+----------------------------+---------+--------------------------------------------------+
-| ``constructor-visibility`` | 0.7.0   | Removes visibility of constructors.              |
-|                            |         |                                                  |
-+----------------------------+---------+--------------------------------------------------+
-
-Please read :doc:`0.5.0 release notes <050-breaking-changes>`,
-:doc:`0.6.0 release notes <060-breaking-changes>`,
-:doc:`0.7.0 release notes <070-breaking-changes>` and :doc:`0.8.0 release notes <080-breaking-changes>` for further details.
-
-Synopsis
-~~~~~~~~
-
-.. code-block:: none
-
-    Usage: solidity-upgrade [options] contract.sol
-
-    Allowed options:
-        --help               Show help message and exit.
-        --version            Show version and exit.
-        --allow-paths path(s)
-                             Allow a given path for imports. A list of paths can be
-                             supplied by separating them with a comma.
-        --ignore-missing     Ignore missing files.
-        --modules module(s)  Only activate a specific upgrade module. A list of
-                             modules can be supplied by separating them with a comma.
-        --dry-run            Apply changes in-memory only and don't write to input
-                             file.
-        --verbose            Print logs, errors and changes. Shortens output of
-                             upgrade patches.
-        --unsafe             Accept *unsafe* changes.
-
-
-
-Bug Reports / Feature Requests
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-If you found a bug or if you have a feature request, please
-`file an issue <https://github.com/ethereum/solidity/issues/new/choose>`_ on Github.
-
-
-Example
-~~~~~~~
-
-Assume that you have the following contract in ``Source.sol``:
-
-.. code-block:: Solidity
-
-    pragma solidity >=0.6.0 <0.6.4;
-    // This will not compile after 0.7.0
-    // SPDX-License-Identifier: GPL-3.0
-    contract C {
-        // FIXME: remove constructor visibility and make the contract abstract
-        constructor() internal {}
-    }
-
-    contract D {
-        uint time;
-
-        function f() public payable {
-            // FIXME: change now to block.timestamp
-            time = now;
-        }
-    }
-
-    contract E {
-        D d;
-
-        // FIXME: remove constructor visibility
-        constructor() public {}
-
-        function g() public {
-            // FIXME: change .value(5) =>  {value: 5}
-            d.f.value(5)();
-        }
-    }
-
-
-
-Required Changes
-^^^^^^^^^^^^^^^^
-
-The above contract will not compile starting from 0.7.0. To bring the contract up to date with the
-current Solidity version, the following upgrade modules have to be executed:
-``constructor-visibility``, ``now`` and ``dotsyntax``. Please read the documentation on
-:ref:`available modules <upgrade-modules>` for further details.
-
-
-Running the Upgrade
-^^^^^^^^^^^^^^^^^^^
-
-It is recommended to explicitly specify the upgrade modules by using ``--modules`` argument.
-
-.. code-block:: bash
-
-    solidity-upgrade --modules constructor-visibility,now,dotsyntax Source.sol
-
-The command above applies all changes as shown below. Please review them carefully (the pragmas will
-have to be updated manually.)
-
-.. code-block:: Solidity
-
-    // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.7.0 <0.9.0;
-    abstract contract C {
-        // FIXME: remove constructor visibility and make the contract abstract
-        constructor() {}
-    }
-
-    contract D {
-        uint time;
-
-        function f() public payable {
-            // FIXME: change now to block.timestamp
-            time = block.timestamp;
-        }
-    }
-
-    contract E {
-        D d;
-
-        // FIXME: remove constructor visibility
-        constructor() {}
-
-        function g() public {
-            // FIXME: change .value(5) =>  {value: 5}
-            d.f{value: 5}();
-        }
-    }
+15. ``Info``: Information that the compiler thinks the user might find useful, but is not dangerous and does not necessarily need to be addressed.
\ No newline at end of file
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index b442ba96a6..c67a509e1b 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,18 +1,4 @@
-add_executable(solidity-upgrade
-    solidityUpgrade/main.cpp
-    solidityUpgrade/UpgradeChange.h
-    solidityUpgrade/UpgradeChange.cpp
-    solidityUpgrade/UpgradeSuite.h
-    solidityUpgrade/Upgrade050.cpp
-    solidityUpgrade/Upgrade060.cpp
-    solidityUpgrade/Upgrade070.cpp
-    solidityUpgrade/SourceTransform.h
-    solidityUpgrade/SourceUpgrade.cpp
-)
-target_link_libraries(solidity-upgrade PRIVATE solidity Boost::boost Boost::program_options Boost::system)
-
 include(GNUInstallDirs)
-install(TARGETS solidity-upgrade DESTINATION "${CMAKE_INSTALL_BINDIR}")
 
 set(libphaser_sources
 	yulPhaser/Common.h
diff --git a/tools/solidityUpgrade/SourceTransform.h b/tools/solidityUpgrade/SourceTransform.h
deleted file mode 100644
index 04d1282981..0000000000
--- a/tools/solidityUpgrade/SourceTransform.h
+++ /dev/null
@@ -1,309 +0,0 @@
-/*
-	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
-
-#pragma once
-
-#include <libsolidity/analysis/OverrideChecker.h>
-
-#include <libsolidity/ast/AST.h>
-
-#include <liblangutil/CharStreamProvider.h>
-#include <liblangutil/Scanner.h>
-
-#include <sstream>
-#include <regex>
-
-namespace solidity::tools
-{
-
-/**
- * Helper for displaying location during asserts
- */
-class LocationHelper
-{
-	std::stringstream m_stream;
-
-public:
-
-	template <typename T>
-	LocationHelper& operator<<(T const& data)
-	{
-		m_stream << data;
-		return *this;
-	}
-
-	operator std::string() { return m_stream.str(); }
-};
-
-class SourceTextRetriever
-{
-public:
-	explicit SourceTextRetriever(langutil::CharStreamProvider const& _charStreamProvider):
-		m_charStreamProvider(_charStreamProvider) {}
-	std::string text(langutil::SourceLocation const& _location) const
-	{
-		solAssert(_location.hasText(), "");
-		return std::string{m_charStreamProvider.charStream(*_location.sourceName).text(_location)};
-	}
-protected:
-	langutil::CharStreamProvider const& m_charStreamProvider;
-};
-
-/**
- * Helper that provides functions which analyze certain source locations
- * on a textual base. They utilize regular expression to search for
- * keywords or to determine formatting.
- */
-class SourceAnalysis: public SourceTextRetriever
-{
-public:
-	using SourceTextRetriever::SourceTextRetriever;
-
-	bool isMultilineKeyword(
-		langutil::SourceLocation const& _location,
-		std::string const& _keyword
-	) const
-	{
-		return regex_search(
-			text(_location),
-			std::regex{"(\\b" + _keyword + "\\b\\n|\\r|\\r\\n)"}
-		);
-	}
-
-	bool hasMutabilityKeyword(langutil::SourceLocation const& _location) const
-	{
-		return regex_search(
-			text(_location),
-			std::regex{"(\\b(pure|view|nonpayable|payable)\\b)"}
-		);
-	}
-
-	bool hasVirtualKeyword(langutil::SourceLocation const& _location) const
-	{
-		return regex_search(text(_location), std::regex{"(\\b(virtual)\\b)"});
-	}
-
-	bool hasVisibilityKeyword(langutil::SourceLocation const& _location) const
-	{
-		return regex_search(text(_location), std::regex{"\\bpublic\\b"});
-	}
-};
-
-/**
- * Helper that provides functions which can analyse declarations and
- * generate source snippets based on the information retrieved.
- */
-class SourceGeneration
-{
-public:
-	using CompareFunction = frontend::OverrideChecker::CompareByID;
-	using Contracts = std::set<frontend::ContractDefinition const*, CompareFunction>;
-
-	/// Generates an `override` declaration for single overrides
-	/// or `override(...)` with contract list for multiple overrides.
-	static std::string functionOverride(Contracts const& _contracts)
-	{
-		if (_contracts.size() <= 1)
-			return "override";
-
-		std::string overrideList;
-		for (auto inheritedContract: _contracts)
-			overrideList += inheritedContract->name() + ",";
-
-		// Note: Can create incorrect replacements
-		return "override(" + overrideList.substr(0, overrideList.size() - 1) + ")";
-	}
-};
-
-/**
- * Helper that provides functions which apply changes to Solidity source code
- * on a textual base. In general, these utilize regular expressions applied
- * to the given source location.
- */
-class SourceTransform: public SourceTextRetriever
-{
-public:
-	using SourceTextRetriever::SourceTextRetriever;
-
-	/// Searches for the keyword given and prepends the expression.
-	/// E.g. `function f() view;` -> `function f() public view;`
-	std::string insertBeforeKeyword(
-		langutil::SourceLocation const& _location,
-		std::string const& _keyword,
-		std::string const& _expression
-	) const
-	{
-		auto _regex = std::regex{"(\\b" + _keyword + "\\b)"};
-		if (regex_search(text(_location), _regex))
-			return regex_replace(
-				text(_location),
-				_regex,
-				_expression + " " + _keyword,
-				std::regex_constants::format_first_only
-			);
-		else
-			solAssert(
-				false,
-				LocationHelper() << "Could not fix: " << text(_location) << " at " << _location <<
-				"\nNeeds to be fixed manually."
-			);
-
-		return "";
-	}
-
-	/// Searches for the keyword given and appends the expression.
-	/// E.g. `function f() public {}` -> `function f() public override {}`
-	std::string insertAfterKeyword(
-		langutil::SourceLocation const& _location,
-		std::string const& _keyword,
-		std::string const& _expression
-	) const
-	{
-		bool isMultiline = SourceAnalysis{m_charStreamProvider}.isMultilineKeyword(_location, _keyword);
-		std::string toAppend = isMultiline ? ("\n        " + _expression) : (" " + _expression);
-		std::regex keyword{"(\\b" + _keyword + "\\b)"};
-
-		if (regex_search(text(_location), keyword))
-			return regex_replace(text(_location), keyword, _keyword + toAppend);
-		else
-			solAssert(
-				false,
-				LocationHelper() << "Could not fix: " << text(_location) << " at " << _location <<
-				"\nNeeds to be fixed manually."
-			);
-
-		return "";
-
-	}
-
-	/// Searches for the first right parenthesis and appends the expression
-	/// given.
-	/// E.g. `function f() {}` -> `function f() public {}`
-	std::string insertAfterRightParenthesis(
-		langutil::SourceLocation const& _location,
-		std::string const& _expression
-	) const
-	{
-		auto _regex = std::regex{"(\\))"};
-		if (regex_search(text(_location), _regex))
-			return regex_replace(
-				text(_location),
-				std::regex{"(\\))"},
-				") " + _expression
-			);
-		else
-			solAssert(
-				false,
-				LocationHelper() << "Could not fix: " << text(_location) << " at " << _location <<
-				"\nNeeds to be fixed manually."
-			);
-
-		return "";
-	}
-
-	/// Searches for the `function` keyword and its identifier and replaces
-	/// both by the expression given.
-	/// E.g. `function Storage() {}` -> `constructor() {}`
-	std::string replaceFunctionName(
-		langutil::SourceLocation const& _location,
-		std::string const& _name,
-		std::string const& _expression
-	) const
-	{
-		auto _regex = std::regex{ "(\\bfunction\\s*" + _name + "\\b)"};
-		if (regex_search(text(_location), _regex))
-			return regex_replace(
-				text(_location),
-				_regex,
-				_expression
-			);
-		else
-			solAssert(
-				false,
-				LocationHelper() << "Could not fix: " << text(_location) << " at " << _location <<
-				"\nNeeds to be fixed manually."
-			);
-
-		return "";
-	}
-
-	std::string gasUpdate(langutil::SourceLocation const& _location) const
-	{
-		// dot, "gas", any number of whitespaces, left bracket
-		std::regex gasReg{"\\.gas\\s*\\("};
-
-		if (regex_search(text(_location), gasReg))
-		{
-			std::string out = regex_replace(
-				text(_location),
-				gasReg,
-				"{gas: ",
-				std::regex_constants::format_first_only
-			);
-			return regex_replace(out, std::regex{"\\)$"}, "}");
-		}
-		else
-			solAssert(
-				false,
-				LocationHelper() << "Could not fix: " << text(_location) << " at " << _location <<
-				"\nNeeds to be fixed manually."
-			);
-
-		return "";
-	}
-
-	std::string valueUpdate(langutil::SourceLocation const& _location) const
-	{
-		// dot, "value", any number of whitespaces, left bracket
-		std::regex valueReg{"\\.value\\s*\\("};
-
-		if (regex_search(text(_location), valueReg))
-		{
-			std::string out = regex_replace(
-					text(_location),
-					valueReg,
-					"{value: ",
-					std::regex_constants::format_first_only
-			);
-			return regex_replace(out, std::regex{"\\)$"}, "}");
-		}
-		else
-			solAssert(
-				false,
-				LocationHelper() << "Could not fix: " << text(_location) << " at " << _location <<
-				"\nNeeds to be fixed manually."
-			);
-
-		return "";
-	}
-
-	std::string nowUpdate(langutil::SourceLocation const& _location) const
-	{
-		return regex_replace(text(_location), std::regex{"now"}, "block.timestamp");
-	}
-
-	std::string removeVisibility(langutil::SourceLocation const& _location) const
-	{
-		std::string replacement = text(_location);
-		for (auto const& replace: {"public ", "public", "internal ", "internal", "external ", "external"})
-			replacement = regex_replace(replacement, std::regex{replace}, "");
-		return replacement;
-	}
-};
-
-}
diff --git a/tools/solidityUpgrade/SourceUpgrade.cpp b/tools/solidityUpgrade/SourceUpgrade.cpp
deleted file mode 100644
index b98b050d6f..0000000000
--- a/tools/solidityUpgrade/SourceUpgrade.cpp
+++ /dev/null
@@ -1,541 +0,0 @@
-/*
-	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 <tools/solidityUpgrade/SourceUpgrade.h>
-
-#include <liblangutil/Exceptions.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libsolidity/ast/AST.h>
-
-#include <boost/filesystem.hpp>
-#include <boost/filesystem/operations.hpp>
-#include <boost/algorithm/string.hpp>
-
-#include <fstream>
-
-#ifdef _WIN32 // windows
-	#include <io.h>
-	#define isatty _isatty
-	#define fileno _fileno
-#else // unix
-	#include <unistd.h>
-#endif
-
-
-namespace po = boost::program_options;
-namespace fs = boost::filesystem;
-
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::tools;
-using namespace solidity::util;
-using namespace solidity::frontend;
-using namespace std;
-
-
-static string const g_argHelp = "help";
-static string const g_argVersion = "version";
-static string const g_argInputFile = "input-file";
-static string const g_argModules = "modules";
-static string const g_argDryRun = "dry-run";
-static string const g_argUnsafe = "unsafe";
-static string const g_argVerbose = "verbose";
-static string const g_argIgnoreMissingFiles = "ignore-missing";
-static string const g_argAllowPaths = "allow-paths";
-
-namespace
-{
-
-ostream& out()
-{
-	return cout;
-}
-
-AnsiColorized log()
-{
-	return AnsiColorized(cout, true, {});
-}
-
-AnsiColorized success()
-{
-	return AnsiColorized(cout, true, {formatting::CYAN});
-}
-
-AnsiColorized warning()
-{
-	return AnsiColorized(cout, true, {formatting::YELLOW});
-}
-
-AnsiColorized error()
-{
-	return AnsiColorized(cout, true, {formatting::MAGENTA});
-}
-
-void logVersion()
-{
-	/// TODO Replace by variable that can be set during build.
-	out() << "0.1.0" << endl;
-}
-
-void logProgress()
-{
-	out() << ".";
-	out().flush();
-}
-
-}
-
-bool SourceUpgrade::parseArguments(int _argc, char** _argv)
-{
-	po::options_description desc(R"(solidity-upgrade, the Solidity upgrade assistant.
-
-The solidity-upgrade tool can help upgrade smart contracts to breaking language features.
-
-It does not support all breaking changes for each version, but will hopefully assist
-upgrading your contracts to the desired Solidity version.
-
-solidity-upgrade is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY. Please be careful when running upgrades on
-your contracts.
-
-Usage: solidity-upgrade [options] contract.sol
-
-Allowed options)",
-		po::options_description::m_default_line_length,
-		po::options_description::m_default_line_length - 23
-	);
-	desc.add_options()
-		(g_argHelp.c_str(), "Show help message and exit.")
-		(g_argVersion.c_str(), "Show version and exit.")
-		(
-			g_argAllowPaths.c_str(),
-			po::value<string>()->value_name("path(s)"),
-			"Allow a given path for imports. A list of paths can be supplied by separating them "
-			"with a comma."
-		)
-		(g_argIgnoreMissingFiles.c_str(), "Ignore missing files.")
-		(
-			g_argModules.c_str(),
-			po::value<string>()->value_name("module(s)"),
-			"Only activate a specific upgrade module. A list of "
-			"modules can be supplied by separating them with a comma."
-		)
-		(g_argDryRun.c_str(), "Apply changes in-memory only and don't write to input file.")
-		(g_argVerbose.c_str(), "Print logs, errors and changes. Shortens output of upgrade patches.")
-		(g_argUnsafe.c_str(), "Accept *unsafe* changes.");
-
-
-	po::options_description allOptions = desc;
-	allOptions.add_options()("input-file", po::value<vector<string>>(), "input file");
-
-	po::positional_options_description filesPositions;
-	filesPositions.add("input-file", -1);
-
-	// parse the compiler arguments
-	try
-	{
-		po::command_line_parser cmdLineParser(_argc, _argv);
-		cmdLineParser.style(
-			po::command_line_style::default_style & (~po::command_line_style::allow_guessing)
-		);
-		cmdLineParser.options(allOptions).positional(filesPositions);
-		po::store(cmdLineParser.run(), m_args);
-	}
-	catch (po::error const& _exception)
-	{
-		error() << _exception.what() << endl;
-		return false;
-	}
-
-	if (m_args.count(g_argHelp) || (isatty(fileno(stdin)) && _argc == 1))
-	{
-		out() << endl;
-		log() << desc;
-		return false;
-	}
-
-	if (m_args.count(g_argVersion))
-	{
-		logVersion();
-		return false;
-	}
-
-	if (m_args.count(g_argModules))
-	{
-		vector<string> moduleArgs;
-		auto modules = boost::split(
-			moduleArgs, m_args[g_argModules].as<string>(), boost::is_any_of(",")
-		);
-
-		/// All modules are activated by default. Clear them before activating single ones.
-		m_suite.deactivateModules();
-
-		for (string const& module: modules)
-		{
-			if (module == "constructor")
-				m_suite.activateModule(Module::ConstructorKeyword);
-			else if (module == "visibility")
-				m_suite.activateModule(Module::VisibilitySpecifier);
-			else if (module == "abstract")
-				m_suite.activateModule(Module::AbstractContract);
-			else if (module == "override")
-				m_suite.activateModule(Module::OverridingFunction);
-			else if (module == "virtual")
-				m_suite.activateModule(Module::VirtualFunction);
-			else if (module == "dotsyntax")
-				m_suite.activateModule(Module::DotSyntax);
-			else if (module == "now")
-				m_suite.activateModule(Module::NowKeyword);
-			else if (module == "constructor-visibility")
-				m_suite.activateModule(Module::ConstrutorVisibility);
-			else
-			{
-				error() << "Unknown upgrade module \"" + module + "\"" << endl;
-				return false;
-			}
-		}
-	}
-
-	/// TODO Share with solc commandline interface.
-	if (m_args.count(g_argAllowPaths))
-	{
-		vector<string> paths;
-		auto allowedPaths = boost::split(
-			paths, m_args[g_argAllowPaths].as<string>(), boost::is_any_of(",")
-		);
-		for (string const& path: allowedPaths)
-		{
-			auto filesystem_path = boost::filesystem::path(path);
-			/// If the given path had a trailing slash, the Boost filesystem
-			/// path will have it's last component set to '.'. This breaks
-			/// path comparison in later parts of the code, so we need to strip
-			/// it.
-			if (filesystem_path.filename() == ".")
-				filesystem_path.remove_filename();
-			m_allowedDirectories.push_back(filesystem_path);
-		}
-	}
-
-
-	return true;
-}
-
-void SourceUpgrade::printPrologue()
-{
-	out() << endl;
-	out() << endl;
-
-	log() <<
-		"solidity-upgrade does not support all breaking changes for each version." <<
-		endl <<
-		"Please run `solidity-upgrade --help` and get a list of implemented upgrades." <<
-		endl <<
-		endl;
-
-	log() <<
-		"Running analysis (and upgrade) on given source files." <<
-		endl;
-}
-
-bool SourceUpgrade::processInput()
-{
-	if (!readInputFiles())
-		return false;
-
-	resetCompiler(fileReader());
-
-	tryCompile();
-	runUpgrade();
-
-	printStatistics();
-
-	return true;
-}
-
-void SourceUpgrade::tryCompile() const
-{
-	bool verbose = m_args.count(g_argVerbose);
-
-	if (verbose)
-		log() << "Running compilation phases." << endl << endl;
-	else
-		logProgress();
-
-	try
-	{
-		if (m_compiler->parse())
-		{
-			if (m_compiler->analyze())
-				m_compiler->compile();
-			else
-				if (verbose)
-				{
-					error() <<
-						"Compilation errors that solidity-upgrade may resolve occurred." <<
-						endl <<
-						endl;
-
-					printErrors();
-				}
-		}
-		else
-			if (verbose)
-			{
-				error() <<
-					"Compilation errors that solidity-upgrade cannot resolve occurred." <<
-					endl <<
-					endl;
-
-				printErrors();
-			}
-	}
-	catch (Exception const& _exception)
-	{
-		error() << "Exception during compilation: " << boost::diagnostic_information(_exception) << endl;
-	}
-	catch (std::exception const& _exception)
-	{
-		error() << "Exception during compilation: " << boost::diagnostic_information(_exception) << endl;
-	}
-	catch (...)
-	{
-		error() << "Unknown exception during compilation: " << boost::current_exception_diagnostic_information() << endl;
-	}
-}
-
-void SourceUpgrade::runUpgrade()
-{
-	bool recompile = true;
-
-	while (recompile && !m_compiler->errors().empty())
-	{
-		for (auto& sourceCode: m_sourceCodes)
-		{
-			recompile = analyzeAndUpgrade(sourceCode);
-			if (recompile)
-				break;
-		}
-
-		if (recompile)
-		{
-			m_suite.reset();
-			resetCompiler();
-			tryCompile();
-		}
-	}
-}
-
-bool SourceUpgrade::analyzeAndUpgrade(pair<string, string> const& _sourceCode)
-{
-	bool applyUnsafe = m_args.count(g_argUnsafe);
-	bool verbose = m_args.count(g_argVerbose);
-
-	if (verbose)
-		log() << "Analyzing and upgrading " << _sourceCode.first << "." << endl;
-
-	if (m_compiler->state() >= CompilerStack::State::AnalysisPerformed)
-		m_suite.analyze(*m_compiler, m_compiler->ast(_sourceCode.first));
-
-	if (!m_suite.changes().empty())
-	{
-		auto& change = m_suite.changes().front();
-
-		if (verbose)
-			change.log(*m_compiler, true);
-
-		if (change.level() == UpgradeChange::Level::Safe)
-		{
-			applyChange(_sourceCode, change);
-			return true;
-		}
-		else if (change.level() == UpgradeChange::Level::Unsafe)
-		{
-			if (applyUnsafe)
-			{
-				applyChange(_sourceCode, change);
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
-
-void SourceUpgrade::applyChange(
-	pair<string, string> const& _sourceCode,
-	UpgradeChange& _change
-)
-{
-	bool dryRun = m_args.count(g_argDryRun);
-	bool verbose = m_args.count(g_argVerbose);
-
-	if (verbose)
-	{
-		log() << "Applying change to " << _sourceCode.first << endl << endl;
-		log() << _change.patch();
-	}
-
-	m_sourceCodes[_sourceCode.first] = _change.apply(_sourceCode.second);
-
-	if (!dryRun)
-		writeInputFile(_sourceCode.first, m_sourceCodes[_sourceCode.first]);
-}
-
-void SourceUpgrade::printErrors() const
-{
-	langutil::SourceReferenceFormatter formatter{cout, *m_compiler, true, false};
-
-	for (auto const& error: m_compiler->errors())
-		if (error->type() != langutil::Error::Type::Warning)
-			formatter.printErrorInformation(*error);
-}
-
-void SourceUpgrade::printStatistics() const
-{
-	out() << endl;
-	out() << endl;
-	out() << "After upgrade:" << endl;
-	out() << endl;
-	error() << "Found " << m_compiler->errors().size() << " errors." << endl;
-	success() << "Found " << m_suite.changes().size() << " upgrades." << endl;
-}
-
-bool SourceUpgrade::readInputFiles()
-{
-	bool ignoreMissing = m_args.count(g_argIgnoreMissingFiles);
-
-	/// TODO Share with solc commandline interface.
-	if (m_args.count(g_argInputFile))
-		for (string path: m_args[g_argInputFile].as<vector<string>>())
-		{
-			boost::filesystem::path infile = path;
-			if (!boost::filesystem::exists(infile))
-			{
-				if (!ignoreMissing)
-				{
-					error() << infile << " is not found." << endl;
-					return false;
-				}
-				else
-					error() << infile << " is not found. Skipping." << endl;
-
-				continue;
-			}
-
-			if (!boost::filesystem::is_regular_file(infile))
-			{
-				if (!ignoreMissing)
-				{
-					error() << infile << " is not a valid file." << endl;
-					return false;
-				}
-				else
-					error() << infile << " is not a valid file. Skipping." << endl;
-
-				continue;
-			}
-
-			m_sourceCodes[infile.generic_string()] = readFileAsString(infile);
-		}
-
-	if (m_sourceCodes.size() == 0)
-	{
-		warning() << "No input files given." << endl;
-		return false;
-	}
-
-	return true;
-}
-
-bool SourceUpgrade::writeInputFile(string const& _path, string const& _source)
-{
-	bool verbose = m_args.count(g_argVerbose);
-
-	if (verbose)
-	{
-		out() << endl;
-		log() << "Writing to input file " << _path << "." << endl;
-	}
-
-	ofstream file(_path, ios::trunc);
-	file << _source;
-
-	return true;
-}
-
-ReadCallback::Callback SourceUpgrade::fileReader()
-{
-	/// TODO Share with solc commandline interface.
-	ReadCallback::Callback fileReader = [this](string const&, string const& _path)
-	{
-		try
-		{
-			boost::filesystem::path path = _path;
-			boost::filesystem::path canonicalPath = boost::filesystem::weakly_canonical(path);
-			bool isAllowed = false;
-			for (auto const& allowedDir: m_allowedDirectories)
-			{
-				// If dir is a prefix of boostPath, we are fine.
-				if (
-					std::distance(allowedDir.begin(), allowedDir.end()) <= std::distance(canonicalPath.begin(), canonicalPath.end()) &&
-					std::equal(allowedDir.begin(), allowedDir.end(), canonicalPath.begin())
-				)
-				{
-					isAllowed = true;
-					break;
-				}
-			}
-			if (!isAllowed)
-				return ReadCallback::Result{false, "File outside of allowed directories."};
-
-			if (!boost::filesystem::exists(canonicalPath))
-				return ReadCallback::Result{false, "File not found."};
-
-			if (!boost::filesystem::is_regular_file(canonicalPath))
-				return ReadCallback::Result{false, "Not a valid file."};
-
-			string contents = readFileAsString(canonicalPath);
-			m_sourceCodes[path.generic_string()] = contents;
-			return ReadCallback::Result{true, contents};
-		}
-		catch (Exception const& _exception)
-		{
-			return ReadCallback::Result{false, "Exception in read callback: " + boost::diagnostic_information(_exception)};
-		}
-		catch (...)
-		{
-			return ReadCallback::Result{false, "Unknown exception in read callback: " + boost::current_exception_diagnostic_information()};
-		}
-	};
-
-	return fileReader;
-}
-
-void SourceUpgrade::resetCompiler()
-{
-	m_compiler->reset();
-	m_compiler->setSources(m_sourceCodes);
-	m_compiler->setParserErrorRecovery(true);
-}
-
-void SourceUpgrade::resetCompiler(ReadCallback::Callback const& _callback)
-{
-	m_compiler = std::make_unique<CompilerStack>(_callback);
-	m_compiler->setSources(m_sourceCodes);
-	m_compiler->setParserErrorRecovery(true);
-}
diff --git a/tools/solidityUpgrade/SourceUpgrade.h b/tools/solidityUpgrade/SourceUpgrade.h
deleted file mode 100644
index f3b5d3572a..0000000000
--- a/tools/solidityUpgrade/SourceUpgrade.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
-	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
-#pragma once
-
-#include <tools/solidityUpgrade/UpgradeChange.h>
-#include <tools/solidityUpgrade/Upgrade050.h>
-#include <tools/solidityUpgrade/Upgrade060.h>
-#include <tools/solidityUpgrade/Upgrade070.h>
-
-#include <libsolidity/interface/CompilerStack.h>
-#include <libsolidity/interface/DebugSettings.h>
-#include <liblangutil/EVMVersion.h>
-
-#include <boost/program_options.hpp>
-#include <boost/filesystem/path.hpp>
-
-#include <memory>
-
-namespace solidity::tools
-{
-
-/**
- * The Solidity source upgrade tool. It supplies a command line interface
- * and connects this to a compiler stack that the upgrade logic is facilitated
- * with.
- */
-class SourceUpgrade
-{
-public:
-	/// Parse command line arguments and return false in case of a failure.
-	bool parseArguments(int _argc, char** _argv);
-	/// Prints additional information on the upgrade tool.
-	void printPrologue();
-	/// Parse / compile files and runs upgrade analysis on them.
-	bool processInput();
-
-private:
-	/// All available upgrade modules
-	enum class Module
-	{
-		ConstructorKeyword,
-		VisibilitySpecifier,
-		AbstractContract,
-		OverridingFunction,
-		VirtualFunction,
-		DotSyntax,
-		NowKeyword,
-		ConstrutorVisibility
-	};
-
-	/// Upgrade suite that hosts all available modules.
-	class Suite: public UpgradeSuite
-	{
-	public:
-		void analyze(langutil::CharStreamProvider const& _charStreamProvider, frontend::SourceUnit const& _sourceUnit)
-		{
-			/// Solidity 0.5.0
-			if (isActivated(Module::ConstructorKeyword))
-				ConstructorKeyword{_charStreamProvider, m_changes}.analyze(_sourceUnit);
-			if (isActivated(Module::VisibilitySpecifier))
-				VisibilitySpecifier{_charStreamProvider, m_changes}.analyze(_sourceUnit);
-
-			/// Solidity 0.6.0
-			if (isActivated(Module::AbstractContract))
-				AbstractContract{_charStreamProvider, m_changes}.analyze(_sourceUnit);
-			if (isActivated(Module::OverridingFunction))
-				OverridingFunction{_charStreamProvider, m_changes}.analyze(_sourceUnit);
-			if (isActivated(Module::VirtualFunction))
-				VirtualFunction{_charStreamProvider, m_changes}.analyze(_sourceUnit);
-
-			/// Solidity 0.7.0
-			if (isActivated(Module::DotSyntax))
-				DotSyntax{_charStreamProvider, m_changes}.analyze(_sourceUnit);
-			if (isActivated(Module::NowKeyword))
-				NowKeyword{_charStreamProvider, m_changes}.analyze(_sourceUnit);
-			if (isActivated(Module::ConstrutorVisibility))
-				ConstructorVisibility{_charStreamProvider, m_changes}.analyze(_sourceUnit);
-		}
-
-		void activateModule(Module _module) { m_modules.insert(_module); }
-		void deactivateModules() { m_modules.clear(); }
-
-	private:
-		bool isActivated(Module _module) const
-		{
-			return m_modules.find(_module) != m_modules.end();
-		}
-
-		/// All modules are activated by default. Clear them before activating
-		/// single ones.
-		std::set<Module> m_modules = {
-			Module::ConstructorKeyword,
-			Module::VisibilitySpecifier,
-			Module::AbstractContract,
-			Module::OverridingFunction,
-			Module::VirtualFunction,
-			Module::DotSyntax,
-			Module::NowKeyword,
-			Module::ConstrutorVisibility
-		};
-	};
-
-	/// Parses the current sources and runs analyses as well as compilation on
-	/// them if parsing was successful.
-	void tryCompile() const;
-	/// Analyses and upgrades the sources given. The upgrade happens in a loop,
-	/// applying one change at a time, which is run until no applicable changes
-	/// are found any more. Only one change is done at a time and all sources
-	/// are being compiled again after each change.
-	void runUpgrade();
-	/// Runs upgrade analysis on source and applies upgrades changes to it.
-	/// Returns `true` if there're still changes that can be applied,
-	/// `false` otherwise.
-	bool analyzeAndUpgrade(
-		std::pair<std::string, std::string> const& _sourceCode
-	);
-
-	/// Applies the change given to its source code. If no `--dry-run` was
-	/// passed via the commandline, the upgraded source code is written back
-	/// to its file.
-	void applyChange(
-		std::pair<std::string, std::string> const& _sourceCode,
-		UpgradeChange& _change
-	);
-
-	/// Prints all errors (excluding warnings) the compiler currently reported.
-	void printErrors() const;
-	/// Prints error and upgrade overview at the end of each full run.
-	void printStatistics() const;
-
-	/// Reads all input files given and stores sources in the internal data
-	/// structure. Reports errors if files cannot be found.
-	bool readInputFiles();
-	/// Writes source to file given.
-	bool writeInputFile(std::string const& _path, std::string const& _source);
-	/// Returns a file reader function that fills `m_sources`.
-	frontend::ReadCallback::Callback fileReader();
-
-	/// Resets the compiler stack and configures sources to compile.
-	/// Also enables error recovery.
-	void resetCompiler();
-	/// Resets the compiler stack and configures sources to compile.
-	/// Also enables error recovery. Passes read callback to the compiler stack.
-	void resetCompiler(frontend::ReadCallback::Callback const& _callback);
-
-	/// Compiler arguments variable map
-	boost::program_options::variables_map m_args;
-	/// Map of input files to source code strings
-	std::map<std::string, std::string> m_sourceCodes;
-	/// Solidity compiler stack
-	std::unique_ptr<frontend::CompilerStack> m_compiler;
-	/// List of allowed directories to read files from
-	std::vector<boost::filesystem::path> m_allowedDirectories;
-	/// Holds all upgrade modules and source upgrades.
-	Suite m_suite;
-};
-
-}
diff --git a/tools/solidityUpgrade/Upgrade050.cpp b/tools/solidityUpgrade/Upgrade050.cpp
deleted file mode 100644
index c8b4de9e84..0000000000
--- a/tools/solidityUpgrade/Upgrade050.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-	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 <tools/solidityUpgrade/Upgrade050.h>
-#include <tools/solidityUpgrade/SourceTransform.h>
-
-#include <libsolidity/analysis/OverrideChecker.h>
-
-#include <libyul/AST.h>
-
-#include <regex>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::tools;
-
-void ConstructorKeyword::endVisit(ContractDefinition const& _contract)
-{
-	for (auto const* function: _contract.definedFunctions())
-		if (function->name() == _contract.name())
-			m_changes.emplace_back(
-					UpgradeChange::Level::Safe,
-					function->location(),
-					SourceTransform{m_charStreamProvider}.replaceFunctionName(
-						function->location(),
-						function->name(),
-						"constructor"
-					)
-			);
-}
-
-void VisibilitySpecifier::endVisit(FunctionDefinition const& _function)
-{
-	if (_function.noVisibilitySpecified())
-		m_changes.emplace_back(
-				UpgradeChange::Level::Safe,
-				_function.location(),
-				SourceTransform{m_charStreamProvider}.insertAfterRightParenthesis(_function.location(), "public")
-		);
-}
diff --git a/tools/solidityUpgrade/Upgrade050.h b/tools/solidityUpgrade/Upgrade050.h
deleted file mode 100644
index a678b04e5a..0000000000
--- a/tools/solidityUpgrade/Upgrade050.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-	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
-#pragma once
-
-#include <tools/solidityUpgrade/UpgradeChange.h>
-#include <tools/solidityUpgrade/UpgradeSuite.h>
-
-#include <libsolidity/ast/ASTVisitor.h>
-
-namespace solidity::tools
-{
-
-/**
- * Module that performs analysis on the AST. It visits all contract
- * definitions and its defined functions and reports a source upgrade,
- * if one of the declared functions is the constructor but does not
- * use the `constructor` keyword.
- */
-class ConstructorKeyword: public AnalysisUpgrade
-{
-public:
-	using AnalysisUpgrade::AnalysisUpgrade;
-
-	void analyze(frontend::SourceUnit const& _sourceUnit) { _sourceUnit.accept(*this); }
-private:
-	void endVisit(frontend::ContractDefinition const& _contract) override;
-};
-
-/**
- * Module that performs analysis on the AST. It visits function definitions
- * and reports a source upgrade, if this function's visibility is `public`,
- * but not marked explicitly as such.
- */
-class VisibilitySpecifier: public AnalysisUpgrade
-{
-public:
-	using AnalysisUpgrade::AnalysisUpgrade;
-
-	void analyze(frontend::SourceUnit const& _sourceUnit) { _sourceUnit.accept(*this); }
-private:
-	void endVisit(frontend::FunctionDefinition const& _function) override;
-};
-
-}
diff --git a/tools/solidityUpgrade/Upgrade060.cpp b/tools/solidityUpgrade/Upgrade060.cpp
deleted file mode 100644
index 8caff02c9f..0000000000
--- a/tools/solidityUpgrade/Upgrade060.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
-	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 <tools/solidityUpgrade/Upgrade060.h>
-#include <tools/solidityUpgrade/SourceTransform.h>
-
-#include <libsolidity/analysis/OverrideChecker.h>
-
-#include <libyul/AST.h>
-
-#include <regex>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::frontend;
-using namespace solidity::tools;
-
-void AbstractContract::endVisit(ContractDefinition const& _contract)
-{
-	bool isFullyImplemented = _contract.annotation().unimplementedDeclarations->empty();
-
-	if (
-		!isFullyImplemented &&
-		!_contract.abstract() &&
-		!_contract.isInterface()
-	)
-		m_changes.emplace_back(
-				UpgradeChange::Level::Safe,
-				_contract.location(),
-				SourceTransform{m_charStreamProvider}.insertBeforeKeyword(_contract.location(), "contract", "abstract")
-		);
-}
-
-void OverridingFunction::endVisit(ContractDefinition const& _contract)
-{
-	auto const& inheritedFunctions = m_overrideChecker.inheritedFunctions(_contract);
-
-	for (auto const* function: _contract.definedFunctions())
-	{
-		Contracts expectedContracts;
-		OverrideProxy proxy{function};
-
-		if (!function->isConstructor())
-		{
-			/// Build list of contracts expected to be mentioned in the override list (if any).
-			for (auto [begin, end] = inheritedFunctions.equal_range(proxy); begin != end; begin++)
-				expectedContracts.insert(&begin->contract());
-
-			/// Add override with contract list, if needed.
-			if (!function->overrides() && expectedContracts.size() > 1)
-				m_changes.emplace_back(
-						UpgradeChange::Level::Safe,
-						function->location(),
-						appendOverride(*function, expectedContracts)
-				);
-
-			for (auto [begin, end] = inheritedFunctions.equal_range(proxy); begin != end; begin++)
-			{
-				auto& super = (*begin);
-				auto functionType = FunctionType(*function).asExternallyCallableFunction(false);
-				auto superType = super.externalFunctionType();
-
-				if (functionType && functionType->hasEqualParameterTypes(*superType))
-				{
-					/// If function does not specify override and no override with
-					/// contract list was added before.
-					if (!function->overrides() && expectedContracts.size() <= 1)
-						m_changes.emplace_back(
-								UpgradeChange::Level::Safe,
-								function->location(),
-								appendOverride(*function, expectedContracts)
-						);
-				}
-			}
-		}
-	}
-}
-
-string OverridingFunction::appendOverride(
-	FunctionDefinition const& _function,
-	Contracts const& _expectedContracts
-)
-{
-	auto location = _function.location();
-	string upgradedCode;
-	string overrideExpression = SourceGeneration::functionOverride(_expectedContracts);
-
-	if (SourceAnalysis{m_charStreamProvider}.hasVirtualKeyword(location))
-		upgradedCode = SourceTransform{m_charStreamProvider}.insertAfterKeyword(
-			location,
-			"virtual",
-			overrideExpression
-		);
-	else if (SourceAnalysis{m_charStreamProvider}.hasMutabilityKeyword(location))
-		upgradedCode = SourceTransform{m_charStreamProvider}.insertAfterKeyword(
-			location,
-			stateMutabilityToString(_function.stateMutability()),
-			overrideExpression
-		);
-	else if (SourceAnalysis{m_charStreamProvider}.hasVisibilityKeyword(location))
-		upgradedCode = SourceTransform{m_charStreamProvider}.insertAfterKeyword(
-			location,
-			Declaration::visibilityToString(_function.visibility()),
-			overrideExpression
-		);
-	else
-		upgradedCode = SourceTransform{m_charStreamProvider}.insertAfterRightParenthesis(
-			location,
-			overrideExpression
-		);
-
-	return upgradedCode;
-}
-
-void VirtualFunction::endVisit(ContractDefinition const& _contract)
-{
-	auto const& inheritedFunctions = m_overrideChecker.inheritedFunctions(_contract);
-
-	for (FunctionDefinition const* function: _contract.definedFunctions())
-	{
-		OverrideProxy proxy{function};
-
-		if (!function->isConstructor())
-		{
-			if (
-				!function->markedVirtual() &&
-				!function->isImplemented() &&
-				!function->virtualSemantics() &&
-				function->visibility() > Visibility::Private
-			)
-			{
-				m_changes.emplace_back(
-						UpgradeChange::Level::Safe,
-						function->location(),
-						appendVirtual(*function)
-				);
-			}
-
-			for (auto [begin, end] = inheritedFunctions.equal_range(proxy); begin != end; begin++)
-			{
-				auto& super = (*begin);
-				if (
-					!function->markedVirtual() &&
-					!super.virtualSemantics()
-				)
-				{
-					m_changes.emplace_back(
-						UpgradeChange::Level::Safe,
-						function->location(),
-						appendVirtual(*function)
-					);
-				}
-			}
-		}
-	}
-}
-
-string VirtualFunction::appendVirtual(FunctionDefinition const& _function) const
-{
-	auto location = _function.location();
-	string upgradedCode;
-
-	if (SourceAnalysis{m_charStreamProvider}.hasMutabilityKeyword(location))
-		upgradedCode = SourceTransform{m_charStreamProvider}.insertAfterKeyword(
-			location,
-			stateMutabilityToString(_function.stateMutability()),
-			"virtual"
-		);
-	else if (SourceAnalysis{m_charStreamProvider}.hasVisibilityKeyword(location))
-		upgradedCode = SourceTransform{m_charStreamProvider}.insertAfterKeyword(
-			location,
-			Declaration::visibilityToString(_function.visibility()),
-			"virtual"
-		);
-	else
-		upgradedCode = SourceTransform{m_charStreamProvider}.insertAfterRightParenthesis(
-			_function.location(),
-			"virtual"
-		);
-
-	return upgradedCode;
-}
-
diff --git a/tools/solidityUpgrade/Upgrade060.h b/tools/solidityUpgrade/Upgrade060.h
deleted file mode 100644
index 46b10a3a0f..0000000000
--- a/tools/solidityUpgrade/Upgrade060.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-	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
-#pragma once
-
-#include <tools/solidityUpgrade/UpgradeChange.h>
-#include <tools/solidityUpgrade/UpgradeSuite.h>
-
-#include <libsolidity/ast/ASTVisitor.h>
-
-namespace solidity::tools
-{
-
-/**
- * Module that performs analysis on the AST. Finds abstract contracts that are
- * not marked as such and adds the `abstract` keyword.
- */
-class AbstractContract: public AnalysisUpgrade
-{
-public:
-	using AnalysisUpgrade::AnalysisUpgrade;
-
-	void analyze(frontend::SourceUnit const& _sourceUnit) { _sourceUnit.accept(*this); }
-private:
-	void endVisit(frontend::ContractDefinition const& _contract) override;
-};
-
-/**
- * Module that performs analysis on the AST. Finds functions that need to be
- * marked `override` and adds the keyword to the function header.
- */
-class OverridingFunction: public AnalysisUpgrade
-{
-public:
-	using AnalysisUpgrade::AnalysisUpgrade;
-
-	void analyze(frontend::SourceUnit const& _sourceUnit) { _sourceUnit.accept(*this); }
-private:
-	using Contracts = std::set<frontend::ContractDefinition const*, frontend::OverrideChecker::CompareByID>;
-
-	void endVisit(frontend::ContractDefinition const& _contract) override;
-
-	std::string appendOverride(
-		frontend::FunctionDefinition const& _function,
-		Contracts const& _expectedContracts
-	);
-};
-
-/**
- * Module that performs analysis on the AST. Finds functions that need to be
- * marked `virtual` and adds the keyword to the function header.
- */
-class VirtualFunction: public AnalysisUpgrade
-{
-public:
-	using AnalysisUpgrade::AnalysisUpgrade;
-
-	void analyze(frontend::SourceUnit const& _sourceUnit) { _sourceUnit.accept(*this); }
-private:
-	void endVisit(frontend::ContractDefinition const& _function) override;
-
-	std::string appendVirtual(frontend::FunctionDefinition const& _function) const;
-};
-
-}
diff --git a/tools/solidityUpgrade/Upgrade070.cpp b/tools/solidityUpgrade/Upgrade070.cpp
deleted file mode 100644
index 6a26b14008..0000000000
--- a/tools/solidityUpgrade/Upgrade070.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-	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.
-
-n	You should have received a copy of the GNU General Public License
-	along with solidity.  If not, see <http://www.gnu.org/licenses/>.
-*/
-#include <tools/solidityUpgrade/Upgrade070.h>
-#include <tools/solidityUpgrade/SourceTransform.h>
-
-using namespace solidity::frontend;
-using namespace solidity::tools;
-
-void DotSyntax::endVisit(FunctionCall const& _functionCall)
-{
-	Type const* type = _functionCall.annotation().type;
-	if (auto const funcType = dynamic_cast<FunctionType const*>(type))
-	{
-		if (funcType->valueSet())
-			m_changes.emplace_back(
-				UpgradeChange::Level::Safe,
-				_functionCall.location(),
-				SourceTransform{m_charStreamProvider}.valueUpdate(_functionCall.location())
-			);
-
-		if (funcType->gasSet())
-			m_changes.emplace_back(
-				UpgradeChange::Level::Safe,
-				_functionCall.location(),
-				SourceTransform{m_charStreamProvider}.gasUpdate(_functionCall.location())
-			);
-	}
-}
-
-void NowKeyword::endVisit(Identifier const& _identifier)
-{
-	IdentifierAnnotation& annotation = _identifier.annotation();
-
-	if (
-		MagicVariableDeclaration const* magicVar =
-		dynamic_cast<MagicVariableDeclaration const*>(annotation.referencedDeclaration)
-	)
-		if (magicVar->type()->category() == Type::Category::Integer)
-		{
-			solAssert(_identifier.name() == "now", "");
-			m_changes.emplace_back(
-				UpgradeChange::Level::Safe,
-				_identifier.location(),
-				SourceTransform{m_charStreamProvider}.nowUpdate(_identifier.location())
-			);
-		}
-}
-
-void ConstructorVisibility::endVisit(ContractDefinition const& _contract)
-{
-	if (!_contract.abstract())
-		for (FunctionDefinition const* function: _contract.definedFunctions())
-			if (
-				function->isConstructor() &&
-				!function->noVisibilitySpecified() &&
-				function->visibility() == Visibility::Internal
-			)
-				m_changes.emplace_back(
-					UpgradeChange::Level::Safe,
-					_contract.location(),
-					SourceTransform{m_charStreamProvider}.insertBeforeKeyword(_contract.location(), "contract", "abstract")
-				);
-
-	for (FunctionDefinition const* function: _contract.definedFunctions())
-		if (function->isConstructor() && !function->noVisibilitySpecified())
-			m_changes.emplace_back(
-				UpgradeChange::Level::Safe,
-				function->location(),
-				SourceTransform{m_charStreamProvider}.removeVisibility(function->location())
-			);
-}
diff --git a/tools/solidityUpgrade/Upgrade070.h b/tools/solidityUpgrade/Upgrade070.h
deleted file mode 100644
index b99f9d306a..0000000000
--- a/tools/solidityUpgrade/Upgrade070.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-	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/>.
-*/
-#pragma once
-
-#include <tools/solidityUpgrade/UpgradeSuite.h>
-
-#include <libsolidity/ast/AST.h>
-
-namespace solidity::tools
-{
-
-class DotSyntax: public AnalysisUpgrade
-{
-public:
-	using AnalysisUpgrade::AnalysisUpgrade;
-	void analyze(frontend::SourceUnit const& _sourceUnit) { _sourceUnit.accept(*this); }
-private:
-	void endVisit(frontend::FunctionCall const& _expression) override;
-};
-
-class NowKeyword: public AnalysisUpgrade
-{
-public:
-	using AnalysisUpgrade::AnalysisUpgrade;
-	void analyze(frontend::SourceUnit const& _sourceUnit) { _sourceUnit.accept(*this); }
-private:
-	void endVisit(frontend::Identifier const& _expression) override;
-};
-
-class ConstructorVisibility: public AnalysisUpgrade
-{
-public:
-	using AnalysisUpgrade::AnalysisUpgrade;
-	void analyze(frontend::SourceUnit const& _sourceUnit) { _sourceUnit.accept(*this); }
-private:
-	void endVisit(frontend::ContractDefinition const& _contract) override;
-};
-
-}
diff --git a/tools/solidityUpgrade/UpgradeChange.cpp b/tools/solidityUpgrade/UpgradeChange.cpp
deleted file mode 100644
index ce1627d0a7..0000000000
--- a/tools/solidityUpgrade/UpgradeChange.cpp
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-	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 <tools/solidityUpgrade/UpgradeChange.h>
-
-#include <liblangutil/SourceReferenceExtractor.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-#include <libsolutil/Numeric.h>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::langutil;
-using namespace solidity::util;
-using namespace solidity::tools;
-
-string UpgradeChange::apply(string _source) const
-{
-	_source.replace(
-		static_cast<size_t>(m_location.start),
-		static_cast<size_t>(m_location.end - m_location.start),
-		m_patch
-	);
-	return _source;
-}
-
-void UpgradeChange::log(CharStreamProvider const& _charStreamProvider, bool const _shorten) const
-{
-	stringstream os;
-	SourceReferenceFormatter formatter{os, _charStreamProvider, true, false};
-
-	string start = to_string(m_location.start);
-	string end = to_string(m_location.end);
-
-	auto color = m_level == Level::Unsafe ? formatting::MAGENTA : formatting::CYAN;
-	auto level = m_level == Level::Unsafe ? "unsafe" : "safe";
-
-	os << endl;
-	AnsiColorized(os, true, {formatting::BOLD, color}) << "Upgrade change (" << level << ")" << endl;
-	os << "=======================" << endl;
-	formatter.printSourceLocation(SourceReferenceExtractor::extract(_charStreamProvider, &m_location));
-	os << endl;
-
-	LineColumn lineEnd = _charStreamProvider.charStream(*m_location.sourceName).translatePositionToLineColumn(m_location.end);
-	int const leftpad = static_cast<int>(log10(max(lineEnd.line, 1))) + 2;
-
-	stringstream output;
-	output << (_shorten ? shortenSource(m_patch) : m_patch);
-
-	string line;
-	while (getline(output, line))
-	{
-		os << string(static_cast<size_t>(leftpad), ' ');
-		AnsiColorized(os, true, {formatting::BOLD, formatting::BLUE}) << "| ";
-		AnsiColorized(os, true, {}) << line << endl;
-	}
-	cout << os.str();
-	cout << endl;
-}
-
-string UpgradeChange::shortenSource(string const& _source)
-{
-	size_t constexpr maxSourceLength = 1000;
-	if (_source.size() > maxSourceLength)
-		return _source.substr(0, min(_source.size(), maxSourceLength)) + "...";
-	return _source;
-}
diff --git a/tools/solidityUpgrade/UpgradeChange.h b/tools/solidityUpgrade/UpgradeChange.h
deleted file mode 100644
index 6cccc154bc..0000000000
--- a/tools/solidityUpgrade/UpgradeChange.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-	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/>.
-*/
-#pragma once
-
-#include <libsolutil/AnsiColorized.h>
-
-#include <liblangutil/SourceLocation.h>
-#include <liblangutil/CharStreamProvider.h>
-
-#include <algorithm>
-#include <utility>
-
-namespace solidity::tools
-{
-
-/**
- * Models a single source code change, based on the initial source location
- * and a patch, which needs to be applied.
- * It implements the concept of level of confidence in the change and distiguishes
- * safe from unsafe changes. A "safe" change is considered to not break
- * compilation or change semantics. An "unsafe" change is considered to potentially
- * change semantics or require further manual management.
- */
-class UpgradeChange
-{
-public:
-	enum class Level
-	{
-		Safe,
-		Unsafe
-	};
-
-	UpgradeChange(
-		Level _level,
-		langutil::SourceLocation _location,
-		std::string _patch
-	):
-		m_location(_location),
-		m_patch(std::move(_patch)),
-		m_level(_level)
-	{}
-
-	~UpgradeChange() {}
-
-	langutil::SourceLocation const& location() const { return m_location; }
-	std::string patch() const { return m_patch; }
-	Level level() const { return m_level; }
-
-	/// Performs the actual replacement on the provided original source code
-	/// and returns the modified source code.
-	std::string apply(std::string _source) const;
-	/// Does a pretty-print of this upgrade change. Since the patch
-	/// can contain a lot of code lines, it can be shortened, which is signaled
-	/// by setting the flag.
-	void log(langutil::CharStreamProvider const& _charStreamProvider, bool const _shorten = true) const;
-private:
-	langutil::SourceLocation m_location;
-	std::string m_patch;
-	Level m_level;
-
-	/// Shortens the given source to a constant limit.
-	static std::string shortenSource(std::string const& _source);
-};
-
-}
diff --git a/tools/solidityUpgrade/UpgradeSuite.h b/tools/solidityUpgrade/UpgradeSuite.h
deleted file mode 100644
index 2bde6ec0e2..0000000000
--- a/tools/solidityUpgrade/UpgradeSuite.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-	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
-#pragma once
-
-#include <tools/solidityUpgrade/UpgradeChange.h>
-
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/CharStreamProvider.h>
-
-#include <libsolidity/ast/ASTVisitor.h>
-#include <libsolidity/analysis/OverrideChecker.h>
-
-#include <regex>
-
-namespace solidity::tools
-{
-
-/**
- * The base upgrade module that can be inherited from. Doing so
- * creates a basic upgrade module that facilitates access to
- * change reporting.
- */
-class Upgrade
-{
-public:
-	Upgrade(
-		langutil::CharStreamProvider const& _charStreamProvider,
-		std::vector<UpgradeChange>& _changes
-	): m_changes(_changes), m_charStreamProvider(_charStreamProvider) {}
-
-protected:
-	/// A reference to a suite-specific set of changes.
-	/// It is passed to all upgrade modules and meant to collect
-	/// reported changes.
-	std::vector<UpgradeChange>& m_changes;
-	langutil::CharStreamProvider const& m_charStreamProvider;
-};
-
-/**
- * A specific upgrade module meant to be run after the analysis phase
- * of the compiler.
- */
-class AnalysisUpgrade: public Upgrade, public frontend::ASTConstVisitor
-{
-public:
-	AnalysisUpgrade(
-		langutil::CharStreamProvider const& _charStreamProvider,
-		std::vector<UpgradeChange>& _changes
-	):
-		Upgrade(_charStreamProvider, _changes),
-		m_errorReporter(m_errors),
-		m_overrideChecker(m_errorReporter)
-	{}
-	/// Interface function for all upgrade modules that are meant
-	/// be run after the analysis phase of the compiler.
-	void analyze(frontend::SourceUnit const&) {}
-protected:
-	langutil::ErrorList m_errors;
-	langutil::ErrorReporter m_errorReporter;
-	frontend::OverrideChecker m_overrideChecker;
-};
-
-/**
- * The generic upgrade suite. Should be inherited from for each set of
- * desired upgrade modules.
- */
-class UpgradeSuite
-{
-public:
-	/// The base interface function that needs to be implemented for each
-	/// suite. It should create suite-specific upgrade modules and trigger
-	/// their analysis.
-	void analyze(frontend::SourceUnit const& _sourceUnit);
-	/// Resets all changes collected so far.
-	void reset() { m_changes.clear(); }
-
-	std::vector<UpgradeChange>& changes() { return m_changes; }
-	std::vector<UpgradeChange> const& changes() const { return m_changes; }
-
-protected:
-	std::vector<UpgradeChange> m_changes;
-};
-
-}
diff --git a/tools/solidityUpgrade/contracts/DocsExamplePass.sol b/tools/solidityUpgrade/contracts/DocsExamplePass.sol
deleted file mode 100644
index d8e4dc8e09..0000000000
--- a/tools/solidityUpgrade/contracts/DocsExamplePass.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-pragma solidity >0.4.23;
-
-contract Updateable {
-    function run() public view returns (bool);
-    function update() public;
-}
-
-contract Upgradable {
-    function run() public view returns (bool);
-    function upgrade();
-}
-
-contract Source is Updateable, Upgradable {
-    function Source() public {}
-
-    function run()
-        public
-        view
-        returns (bool) {}
-
-    function update() {}
-    function upgrade() {}
-}
\ No newline at end of file
diff --git a/tools/solidityUpgrade/contracts/Test.sol b/tools/solidityUpgrade/contracts/Test.sol
deleted file mode 100644
index 8958a091a0..0000000000
--- a/tools/solidityUpgrade/contracts/Test.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-pragma solidity >0.4.23;
-
-contract Storage {
-    function Storage() public {}
-    function start();
-    function state() public view returns (bool);
-    function stop() public;
-}
-
-contract Observable {
-    function state() public view returns (bool);
-}
-
-contract VolatileStorage is Storage, Observable {
-    function start() {}
-    function state() public view returns (bool) {}
-    function stop() {}
-}
\ No newline at end of file
diff --git a/tools/solidityUpgrade/contracts/TestMultiline.sol b/tools/solidityUpgrade/contracts/TestMultiline.sol
deleted file mode 100644
index 7083da4ea6..0000000000
--- a/tools/solidityUpgrade/contracts/TestMultiline.sol
+++ /dev/null
@@ -1,21 +0,0 @@
-pragma solidity >0.4.23;
-
-contract Storage {
-    function Storage() {}
-    function init() public;
-    function idle();
-    function destroy() public view;
-}
-
-contract VolatileStorage is Storage {
-    function init()
-        public
-    {}
-
-    function idle() {}
-
-    function destroy()
-        public
-        view
-    {}
-}
\ No newline at end of file
diff --git a/tools/solidityUpgrade/contracts/TestNonFixable.sol b/tools/solidityUpgrade/contracts/TestNonFixable.sol
deleted file mode 100644
index 0a5c2f00e8..0000000000
--- a/tools/solidityUpgrade/contracts/TestNonFixable.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma solidity >0.4.23;
-
-contract Storage {
-    function Storage() {}
-    function init() public;
-    function idle();
-    function destroy() public view;
-}
-
-contract VolatileStorage is Storage {
-    uint[] array;
-    function init() public { array.length = 3; }
-    function idle() {}
-    function destroy() public view {}
-}
\ No newline at end of file
diff --git a/tools/solidityUpgrade/main.cpp b/tools/solidityUpgrade/main.cpp
deleted file mode 100644
index 5a6962661d..0000000000
--- a/tools/solidityUpgrade/main.cpp
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-	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 <tools/solidityUpgrade/SourceUpgrade.h>
-
-#include <libsolutil/CommonIO.h>
-#include <libsolutil/AnsiColorized.h>
-
-//#include <test/Common.h>
-
-#include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/replace.hpp>
-#include <boost/exception/all.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/program_options.hpp>
-
-#include <cstdlib>
-#include <iostream>
-#include <fstream>
-#include <queue>
-#include <regex>
-
-#if defined(_WIN32)
-#include <windows.h>
-#endif
-
-using namespace solidity;
-using namespace std;
-namespace po = boost::program_options;
-namespace fs = boost::filesystem;
-
-namespace
-{
-
-void setupTerminal()
-{
-#if defined(_WIN32) && defined(ENABLE_VIRTUAL_TERMINAL_PROCESSING)
-	// Set output mode to handle virtual terminal (ANSI escape sequences)
-	// ignore any error, as this is just a "nice-to-have"
-	// only windows needs to be taken care of, as other platforms (Linux/OSX) support them natively.
-	HANDLE hOut = GetStdHandle(STD_OUTPUT_HANDLE);
-	if (hOut == INVALID_HANDLE_VALUE)
-		return;
-
-	DWORD dwMode = 0;
-	if (!GetConsoleMode(hOut, &dwMode))
-		return;
-
-	dwMode |= ENABLE_VIRTUAL_TERMINAL_PROCESSING;
-	if (!SetConsoleMode(hOut, dwMode))
-		return;
-#endif
-}
-
-}
-
-int main(int argc, char** argv)
-{
-	setupTerminal();
-
-	tools::SourceUpgrade upgrade;
-	if (!upgrade.parseArguments(argc, argv))
-		return 1;
-	upgrade.printPrologue();
-
-	try
-	{
-		if (!upgrade.processInput())
-			return 1;
-	}
-	catch (boost::exception const& _exception)
-	{
-		cerr << "Exception while processing input:" << endl;
-		cerr << boost::diagnostic_information(_exception) << endl;
-		return 2;
-	}
-	catch (...)
-	{
-		cerr << "Uncaught exception while processing input:" << endl;
-		cerr << boost::current_exception_diagnostic_information() << endl;
-		return 2;
-	}
-
-	return 0;
-}

From 7779b6f3523a7c6951cbacac2cd323a260fe035a Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 10 Jan 2023 18:16:56 -0300
Subject: [PATCH 1118/1748] Forbid private library functions to be attached
 outside their declaration scope

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/TypeChecker.cpp          | 25 +++++++++++++++++++
 .../using/private_library_function.sol        | 10 ++++++++
 .../private_library_function_inside_scope.sol |  5 ++++
 ...private_library_function_outside_scope.sol | 12 +++++++++
 5 files changed, 53 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/using/private_library_function.sol
 create mode 100644 test/libsolidity/syntaxTests/using/private_library_function_inside_scope.sol
 create mode 100644 test/libsolidity/syntaxTests/using/private_library_function_outside_scope.sol

diff --git a/Changelog.md b/Changelog.md
index b77be4f396..aaadcae9db 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -30,6 +30,7 @@ Bugfixes:
  * SMTChecker: Fix internal error on chain assignments using static fully specified state variables.
  * SMTChecker: Fix internal error when using user defined types as mapping indices or struct members.
  * SMTChecker: Fix internal error when deleting struct member of function type.
+ * TypeChecker: Fix bug where private library functions could be attached with ``using for`` outside of their declaration scope.
 
 
 ### 0.8.17 (2022-09-08)
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 93558ff89a..00c763a90b 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3809,6 +3809,10 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 			m_errorReporter.fatalTypeError(
 				4731_error,
 				path->location(),
+				SecondarySourceLocation().append(
+						"Function defined here:",
+						functionDefinition.location()
+				),
 				fmt::format(
 					"The function \"{}\" does not have any parameters, and therefore cannot be attached to the type \"{}\".",
 					joinHumanReadable(path->path(), "."),
@@ -3816,6 +3820,27 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 				)
 			);
 
+		if (
+			functionDefinition.visibility() == Visibility::Private &&
+			functionDefinition.scope() != m_currentContract
+		)
+		{
+			solAssert(functionDefinition.libraryFunction());
+			m_errorReporter.typeError(
+				6772_error,
+				path->location(),
+				SecondarySourceLocation().append(
+						"Function defined here:",
+						functionDefinition.location()
+				),
+				fmt::format(
+					"Function \"{}\" is private and therefore cannot be attached"
+					" to a type outside of the library where it is defined.",
+					joinHumanReadable(path->path(), ".")
+				)
+			);
+		}
+
 		FunctionType const* functionType = dynamic_cast<FunctionType const&>(*functionDefinition.type()).withBoundFirstArgument();
 		solAssert(functionType && functionType->selfType(), "");
 		BoolResult result = normalizedType->isImplicitlyConvertibleTo(
diff --git a/test/libsolidity/semanticTests/using/private_library_function.sol b/test/libsolidity/semanticTests/using/private_library_function.sol
new file mode 100644
index 0000000000..e144049219
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/private_library_function.sol
@@ -0,0 +1,10 @@
+library L {
+    using {L.privateFunction} for uint;
+    function privateFunction(uint x) private pure returns (uint) { return x + 1; }
+    function f() public pure returns (uint) {
+        uint x = 1;
+        return x.privateFunction();
+    }
+}
+// ----
+// f() -> 2
diff --git a/test/libsolidity/syntaxTests/using/private_library_function_inside_scope.sol b/test/libsolidity/syntaxTests/using/private_library_function_inside_scope.sol
new file mode 100644
index 0000000000..1f036d83b2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/private_library_function_inside_scope.sol
@@ -0,0 +1,5 @@
+library L {
+    using {L.privateFunction} for uint;
+    function privateFunction(uint) private pure {}
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/using/private_library_function_outside_scope.sol b/test/libsolidity/syntaxTests/using/private_library_function_outside_scope.sol
new file mode 100644
index 0000000000..2be2010c6e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/private_library_function_outside_scope.sol
@@ -0,0 +1,12 @@
+library L {
+    function privateFunction(uint) private pure {}
+}
+
+using {L.privateFunction} for uint;
+
+contract C {
+    using {L.privateFunction} for uint;
+}
+// ----
+// TypeError 6772: (73-90): Function "L.privateFunction" is private and therefore cannot be attached to a type outside of the library where it is defined.
+// TypeError 6772: (127-144): Function "L.privateFunction" is private and therefore cannot be attached to a type outside of the library where it is defined.

From 6df65ca1a1514c09d86752dd8b263f4d93932e1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 17 Jan 2023 13:53:37 +0100
Subject: [PATCH 1119/1748] gnosis ext test: Remove workarounds that used to be
 necessary to make the test work with latest versions of its dependencies

---
 test/externalTests/gnosis.sh | 42 ++++--------------------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index f33e723b6d..ace87d3b80 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -31,8 +31,8 @@ BINARY_TYPE="$1"
 BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
-function compile_fn { npx npm run build; }
-function test_fn { npx npm test; }
+function compile_fn { npm run build; }
+function test_fn { npm test; }
 
 function gnosis_safe_test
 {
@@ -73,54 +73,20 @@ function gnosis_safe_test
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
     # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
     sed -i "s|\(it\)\(('should not allow to call setup on singleton'\)|\1.skip\2|g" test/core/Safe.Setup.spec.ts
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i 's|\(it\)\(("changes the expected storage slot without touching the most important ones"\)|\1.skip\2|g' test/libraries/SignMessageLib.spec.ts
     sed -i "s|\(it\)\(('can be used only via DELEGATECALL opcode'\)|\1.skip\2|g" test/libraries/SignMessageLib.spec.ts
     sed -i 's|\(describe\)\(("Upgrade from Safe 1.1.1"\)|\1.skip\2|g' test/migration/UpgradeFromSafe111.spec.ts
     sed -i 's|\(describe\)\(("Upgrade from Safe 1.2.0"\)|\1.skip\2|g' test/migration/UpgradeFromSafe120.spec.ts
-
-    # TODO: Remove this when Gnosis merges https://github.com/gnosis/safe-contracts/pull/394
-    sed -i "s|\(function isValidSignature(bytes \)calldata\( _data, bytes \)calldata\( _signature)\)|\1memory\2memory\3|g" contracts/handler/CompatibilityFallbackHandler.sol
-
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|it\(('should enforce delegatecall'\)|it.skip\1|g" test/accessors/SimulateTxAccessor.spec.ts
     sed -i "s|it\(('can only be called from Safe itself'\)|it.skip\1|g" test/libraries/Migration.spec.ts
     sed -i "s|it\(('should enforce delegatecall to MultiSend'\)|it.skip\1|g" test/libraries/MultiSend.spec.ts
 
-    # Force nested abstract-provider dependencies to be at version 5.6.0. Version 5.7.0 of @ethersproject/abstract-provider
-    # introduced a new field in FeeData, which causes clashes unless all dependency packages of abstract-provider are pegged
-    # to the same version. As we've already had to peg @ethersproject/contracts to 5.6.0 earlier, we are doing so now with
-    # @ethersproject/abstract-provider as well.
-    jq '.overrides."@ethersproject/abstract-provider"="5.6.0" |
-        .overrides."@ethersproject/abstract-signer@5.6.0"
-                  ."@ethersproject/abstract-provider"="5.6.0"' package.json > package.json.tmp
-    mv package.json.tmp package.json
-
     neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    # npm@8.3.0+ is required for `overrides` support
-    npm install npm@>8.3.0
-    npx npm install
-    npx npm install hardhat-gas-reporter
-
-    # Typescript compilation fails with typescript >= 4.7:
-    # Error: Debug Failure. False expression: Non-string value passed to `ts.resolveTypeReferenceDirective`
-    npx npm install "typescript@<4.7.0"
-
-    # With ethers.js 5.6.2 many tests for revert messages fail.
-    # TODO: Remove when https://github.com/ethers-io/ethers.js/discussions/2849 is resolved.
-    npx npm install ethers@5.6.1
-
-    # Note that ethers@5.6.1 depends on @ethersproject/contracts@5.6.0 while the dependency on hardhat-deploy
-    # pulls @ethersproject/contracts@5.6.1 (latest). Force 5.6.0 to avoid errors due to having two copies.
-    npx npm install @ethersproject/contracts@5.6.0
-
-    # 2.1.1 started causing failures in safe-contracts external tests after a contract address check was introduced
-    # in https://github.com/NomicFoundation/hardhat/pull/2916, and so to avoid errors, the package is now pegged.
-    # TODO: Remove when https://github.com/safe-global/safe-contracts/issues/436 is resolved.
-    npx npm install @nomiclabs/hardhat-ethers@2.1.0
+    npm install
+    npm install hardhat-gas-reporter
 
     replace_version_pragmas
     [[ $BINARY_TYPE == solcjs ]] && force_solc_modules "${DIR}/solc/dist"

From a9757e963eb2f1c7beb8de0cc3792836036d00ea Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 18 Jan 2023 09:24:23 +0000
Subject: [PATCH 1120/1748] Remove more workarounds

---
 test/externalTests/gnosis.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index ace87d3b80..ab1fbf3e17 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -73,13 +73,8 @@ function gnosis_safe_test
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
     # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
     sed -i "s|\(it\)\(('should not allow to call setup on singleton'\)|\1.skip\2|g" test/core/Safe.Setup.spec.ts
-    sed -i 's|\(it\)\(("changes the expected storage slot without touching the most important ones"\)|\1.skip\2|g' test/libraries/SignMessageLib.spec.ts
     sed -i "s|\(it\)\(('can be used only via DELEGATECALL opcode'\)|\1.skip\2|g" test/libraries/SignMessageLib.spec.ts
-    sed -i 's|\(describe\)\(("Upgrade from Safe 1.1.1"\)|\1.skip\2|g' test/migration/UpgradeFromSafe111.spec.ts
-    sed -i 's|\(describe\)\(("Upgrade from Safe 1.2.0"\)|\1.skip\2|g' test/migration/UpgradeFromSafe120.spec.ts
-    sed -i "s|it\(('should enforce delegatecall'\)|it.skip\1|g" test/accessors/SimulateTxAccessor.spec.ts
     sed -i "s|it\(('can only be called from Safe itself'\)|it.skip\1|g" test/libraries/Migration.spec.ts
-    sed -i "s|it\(('should enforce delegatecall to MultiSend'\)|it.skip\1|g" test/libraries/MultiSend.spec.ts
 
     neutralize_package_lock
     neutralize_package_json_hooks

From c2e2adb953a397b322eb875a42d58406fee64a15 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 18 Jan 2023 09:01:33 +0100
Subject: [PATCH 1121/1748] Allow support for older boost and adjust docs

---
 docs/installing-solidity.rst       | 7 ++++---
 libsolidity/lsp/LanguageServer.cpp | 6 +++++-
 libsolutil/Common.h                | 3 ---
 libsolutil/Numeric.h               | 3 ---
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 1b6ac66354..8c2830451c 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -319,9 +319,10 @@ The following are dependencies for all builds of Solidity:
 +-----------------------------------+-------------------------------------------------------+
 | Software                          | Notes                                                 |
 +===================================+=======================================================+
-| `CMake`_ (version 3.13+)          | Cross-platform build file generator.                  |
+| `CMake`_ (version 3.21.3+ on      | Cross-platform build file generator.                  |
+| Windows, 3.13+ otherwise)         |                                                       |
 +-----------------------------------+-------------------------------------------------------+
-| `Boost`_ (version 1.77+ on        | C++ libraries.                                        |
+| `Boost`_ (version 1.77 on         | C++ libraries.                                        |
 | Windows, 1.65+ otherwise)         |                                                       |
 +-----------------------------------+-------------------------------------------------------+
 | `Git`_                            | Command-line tool for retrieving source code.         |
@@ -408,7 +409,7 @@ You need to install the following dependencies for Windows builds of Solidity:
 +-----------------------------------+-------------------------------------------------------+
 | `Visual Studio 2019`_  (Optional) | C++ compiler and dev environment.                     |
 +-----------------------------------+-------------------------------------------------------+
-| `Boost`_ (version 1.77+)          | C++ libraries.                                        |
+| `Boost`_ (version 1.77)           | C++ libraries.                                        |
 +-----------------------------------+-------------------------------------------------------+
 
 If you already have one IDE and only need the compiler and libraries,
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 2d85c08b0e..aaa63b7f84 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -220,8 +220,12 @@ vector<boost::filesystem::path> LanguageServer::allSolidityFilesFromProject() co
 
 	// We explicitly decided against including all files from include paths but leave the possibility
 	// open for a future PR to enable such a feature to be optionally enabled (default disabled).
-
+	// Note: Newer versions of boost have deprecated symlink_option::recurse
+#if (BOOST_VERSION < 107200)
+	auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::symlink_option::recurse);
+#else
 	auto directoryIterator = fs::recursive_directory_iterator(m_fileRepository.basePath(), fs::directory_options::follow_directory_symlink);
+#endif
 	for (fs::directory_entry const& dirEntry: directoryIterator)
 		if (
 			dirEntry.path().extension() == ".sol" &&
diff --git a/libsolutil/Common.h b/libsolutil/Common.h
index 5c78146137..eea9dacd54 100644
--- a/libsolutil/Common.h
+++ b/libsolutil/Common.h
@@ -41,9 +41,6 @@
 #include <libsolutil/vector_ref.h>
 
 #include <boost/version.hpp>
-#if (BOOST_VERSION < 106500)
-#error "Unsupported Boost version. At least 1.65 required."
-#endif
 
 #include <map>
 #include <utility>
diff --git a/libsolutil/Numeric.h b/libsolutil/Numeric.h
index c0f33e4906..be9f0bea24 100644
--- a/libsolutil/Numeric.h
+++ b/libsolutil/Numeric.h
@@ -25,9 +25,6 @@
 #include <libsolutil/CommonData.h>
 
 #include <boost/version.hpp>
-#if (BOOST_VERSION < 106500)
-#error "Unsupported Boost version. At least 1.65 required."
-#endif
 
 // TODO: do this only conditionally as soon as a boost version with gcc 12 support is released.
 #if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ >= 12)

From 6a0ea174b845efffeac2c854132a7659af10340e Mon Sep 17 00:00:00 2001
From: vlad <quant13@gmail.com>
Date: Sat, 17 Dec 2022 14:16:24 +0400
Subject: [PATCH 1122/1748] Disallow several indexed attributes for the same
 event parameter

---
 Changelog.md                                             | 1 +
 libsolidity/parsing/Parser.cpp                           | 5 +++++
 .../events/event_several_indexed_of_one_parameter.sol    | 9 +++++++++
 3 files changed, 15 insertions(+)
 create mode 100644 test/libsolidity/syntaxTests/events/event_several_indexed_of_one_parameter.sol

diff --git a/Changelog.md b/Changelog.md
index a665eb5761..954518dc5d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -22,6 +22,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Parser: Disallow several ``indexed`` attributes for the same event parameter.
  * Yul Optimizer: Hash hex and decimal literals according to their value instead of their representation, improving the detection of equivalent functions.
  * Solidity Upgrade Tool ``solidity-upgrade``: Fix the tool returning success code on uncaught exceptions.
  * SMTChecker: Fix display error for negative integers that are one more than powers of two.
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index fee21e5184..e028b13ac6 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -785,7 +785,12 @@ ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration(
 		else
 		{
 			if (_options.allowIndexed && token == Token::Indexed)
+			{
+				if (isIndexed)
+					parserError(5399_error, "Indexed already specified.");
+
 				isIndexed = true;
+			}
 			else if (token == Token::Constant || token == Token::Immutable)
 			{
 				if (mutability != VariableDeclaration::Mutability::Mutable)
diff --git a/test/libsolidity/syntaxTests/events/event_several_indexed_of_one_parameter.sol b/test/libsolidity/syntaxTests/events/event_several_indexed_of_one_parameter.sol
new file mode 100644
index 0000000000..dd6edd825e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_several_indexed_of_one_parameter.sol
@@ -0,0 +1,9 @@
+contract c {
+    event e(uint indexed a, bytes3 indexed indexed s, bool indexed indexed indexed b);
+    event e2(uint indexed indexed a, bytes3 indexed s);
+}
+// ----
+// ParserError 5399: (56-63): Indexed already specified.
+// ParserError 5399: (80-87): Indexed already specified.
+// ParserError 5399: (88-95): Indexed already specified.
+// ParserError 5399: (126-133): Indexed already specified.

From 7fbd36855d643f09f591613961c367396c858e31 Mon Sep 17 00:00:00 2001
From: vlad <quant13@gmail.com>
Date: Sun, 25 Dec 2022 20:14:23 +0400
Subject: [PATCH 1123/1748] Disallow usage of the indexed attribute for
 modifier parameters Added tests for edge cases of several keywords

---
 Changelog.md                                                 | 1 +
 libsolidity/parsing/Parser.cpp                               | 1 -
 .../syntaxTests/modifiers/invalid_parameter_indexed.sol      | 5 +++++
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/modifiers/invalid_parameter_indexed.sol

diff --git a/Changelog.md b/Changelog.md
index 954518dc5d..2877bbf8c5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -23,6 +23,7 @@ Compiler Features:
 
 Bugfixes:
  * Parser: Disallow several ``indexed`` attributes for the same event parameter.
+ * Parser: Disallow usage of the ``indexed`` attribute for modifier parameters.
  * Yul Optimizer: Hash hex and decimal literals according to their value instead of their representation, improving the detection of equivalent functions.
  * Solidity Upgrade Tool ``solidity-upgrade``: Fix the tool returning success code on uncaught exceptions.
  * SMTChecker: Fix display error for negative integers that are one more than powers of two.
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index e028b13ac6..a9065b176b 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -879,7 +879,6 @@ ASTPointer<ModifierDefinition> Parser::parseModifierDefinition()
 	if (m_scanner->currentToken() == Token::LParen)
 	{
 		VarDeclParserOptions options;
-		options.allowIndexed = true;
 		options.allowLocationSpecifier = true;
 		parameters = parseParameterList(options);
 	}
diff --git a/test/libsolidity/syntaxTests/modifiers/invalid_parameter_indexed.sol b/test/libsolidity/syntaxTests/modifiers/invalid_parameter_indexed.sol
new file mode 100644
index 0000000000..a19d7beb2d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/modifiers/invalid_parameter_indexed.sol
@@ -0,0 +1,5 @@
+contract B {
+    modifier mod1(uint indexed a) { _; }
+}
+// ----
+// ParserError 2314: (36-43): Expected ',' but got 'indexed'

From 484ee8a62162680acea3fbc37ab2a8eadc5758dd Mon Sep 17 00:00:00 2001
From: vlad <quant13@gmail.com>
Date: Thu, 29 Dec 2022 23:43:12 +0400
Subject: [PATCH 1124/1748] Additional tests for edge cases for mutability,
 visibility, location, experimental, global, indexed and anonymous

---
 .../file_level_multiple_constant_keywords.sol |   4 +
 ...ddress_state_mutability_error_argument.sol |  85 +++++++++
 .../errors/invalid_parameter_indexed.sol      |   5 +
 .../errors/invalid_parameter_location.sol     |  16 ++
 .../errors/invalid_parameter_mutability.sol   |   7 +
 .../errors/invalid_parameter_visibility.sol   |  21 +++
 ...us_event_multiple_anonymous_specifiers.sol |   5 +
 ...ddress_state_mutability_event_argument.sol |  85 +++++++++
 ...ent_multiple_indexed_of_one_parameter.sol} |   0
 .../events/invalid_parameter_location.sol     |  16 ++
 .../events/invalid_parameter_mutability.sol   |   7 +
 .../events/invalid_parameter_visibility.sol   |  21 +++
 ...ess_state_mutability_modifier_argument.sol |  85 +++++++++
 .../invalid_parameter_mutability.sol          |   7 +
 .../invalid_parameter_visibility.sol          |  21 +++
 .../modifiers/multiple_parameter_location.sol |  21 +++
 .../address_invalid_state_mutability.sol      |  70 +++++---
 ...ary_non_address_payable_state_variable.sol |  29 ----
 ...lementary_non_address_payable_argument.sol |  29 ----
 .../elementary_non_address_payable_local.sol  |  31 ----
 .../elementary_non_address_payable_return.sol |  29 ----
 ..._non_address_state_mutability_argument.sol |  85 +++++++++
 ..._non_address_state_mutability_file_var.sol |  81 +++++++++
 ...ary_non_address_state_mutability_local.sol |  91 ++++++++++
 ...ry_non_address_state_mutability_return.sol |  85 +++++++++
 ...ddress_state_mutability_state_variable.sol |  85 +++++++++
 ...ction_parameter_and_return_var_indexed.sol |  11 ++
 ...on_parameter_and_return_var_mutability.sol |   9 +
 .../invalid_state_variable_location.sol       |  11 ++
 .../parsing/invalid_variable_indexed.sol      |  16 ++
 .../parsing/invalid_variable_mutablity.sol    |  15 ++
 ...location_specifiers_for_file_level_var.sol |  10 ++
 ...cation_specifiers_for_fn_returns_multi.sol |  21 +++
 .../location_specifiers_for_locals_multi.sol  |  16 ++
 .../location_specifiers_for_params_multi.sol  |  14 ++
 ...n_specifiers_for_state_variables_multi.sol |   8 +-
 .../multiple_mutability_specifiers.sol        |  11 ++
 .../multiple_state_mutability_specifiers.sol  | 103 +++++++++++
 .../multiple_statemutability_specifiers.sol   |  29 ----
 .../multiple_visibility_specifiers.sol        |   7 -
 .../syntaxTests/parsing/payable_accessor.sol  |   5 -
 .../experimental_multiple_experimental.sol    |   4 +
 ...ary_non_address_state_mutability_catch.sol |  31 ++++
 ...n_address_state_mutability_try_returns.sol | 163 ++++++++++++++++++
 ...alid_catch_parameter_location_calldata.sol |   7 +
 ...valid_catch_parameter_location_storage.sol |   7 +
 .../tryCatch/invalid_returns_var_location.sol |   7 +
 ...turns_vars_and_catch_parameter_indexed.sol |  27 +++
 ...ns_vars_and_catch_parameter_mutability.sol |  30 ++++
 ...ns_vars_and_catch_parameter_visibility.sol | 105 +++++++++++
 ...urns_vars_and_catch_parameter_location.sol | 132 ++++++++++++++
 .../using/global_multiple_global_keywords.sol |   5 +
 .../file_level_variable_visibility.sol        |  13 ++
 ...on_parameter_and_return_var_visibility.sol |  41 +++++
 .../invalid_variable_visibility.sol           |  29 ++++
 .../multiple_visibility_specifiers.sol        |  53 ++++++
 ...ultiple_visibility_specifiers_external.sol |  16 ++
 57 files changed, 1794 insertions(+), 183 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/constants/file_level_multiple_constant_keywords.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/elementary_non_address_state_mutability_error_argument.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/invalid_parameter_indexed.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/invalid_parameter_mutability.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/invalid_parameter_visibility.sol
 create mode 100644 test/libsolidity/syntaxTests/events/anonymous_event_multiple_anonymous_specifiers.sol
 create mode 100644 test/libsolidity/syntaxTests/events/elementary_non_address_state_mutability_event_argument.sol
 rename test/libsolidity/syntaxTests/events/{event_several_indexed_of_one_parameter.sol => event_multiple_indexed_of_one_parameter.sol} (100%)
 create mode 100644 test/libsolidity/syntaxTests/events/invalid_parameter_location.sol
 create mode 100644 test/libsolidity/syntaxTests/events/invalid_parameter_mutability.sol
 create mode 100644 test/libsolidity/syntaxTests/events/invalid_parameter_visibility.sol
 create mode 100644 test/libsolidity/syntaxTests/modifiers/elementary_non_address_state_mutability_modifier_argument.sol
 create mode 100644 test/libsolidity/syntaxTests/modifiers/invalid_parameter_mutability.sol
 create mode 100644 test/libsolidity/syntaxTests/modifiers/invalid_parameter_visibility.sol
 create mode 100644 test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol
 delete mode 100644 test/libsolidity/syntaxTests/parsing/elemantary_non_address_payable_state_variable.sol
 delete mode 100644 test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_argument.sol
 delete mode 100644 test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_local.sol
 delete mode 100644 test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_return.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_argument.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_file_var.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_local.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_return.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_state_variable.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_indexed.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_mutability.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/invalid_state_variable_location.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/invalid_variable_indexed.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/invalid_variable_mutablity.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/location_specifiers_for_file_level_var.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/location_specifiers_for_fn_returns_multi.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/multiple_mutability_specifiers.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/multiple_state_mutability_specifiers.sol
 delete mode 100644 test/libsolidity/syntaxTests/parsing/multiple_statemutability_specifiers.sol
 delete mode 100644 test/libsolidity/syntaxTests/parsing/multiple_visibility_specifiers.sol
 delete mode 100644 test/libsolidity/syntaxTests/parsing/payable_accessor.sol
 create mode 100644 test/libsolidity/syntaxTests/pragma/experimental_multiple_experimental.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_catch.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_try_returns.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_calldata.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_storage.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/invalid_returns_var_location.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_indexed.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_mutability.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_visibility.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/multiple_returns_vars_and_catch_parameter_location.sol
 create mode 100644 test/libsolidity/syntaxTests/using/global_multiple_global_keywords.sol
 create mode 100644 test/libsolidity/syntaxTests/visibility/file_level_variable_visibility.sol
 create mode 100644 test/libsolidity/syntaxTests/visibility/invalid_function_parameter_and_return_var_visibility.sol
 create mode 100644 test/libsolidity/syntaxTests/visibility/invalid_variable_visibility.sol
 create mode 100644 test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers.sol
 create mode 100644 test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers_external.sol

diff --git a/test/libsolidity/syntaxTests/constants/file_level_multiple_constant_keywords.sol b/test/libsolidity/syntaxTests/constants/file_level_multiple_constant_keywords.sol
new file mode 100644
index 0000000000..1ca07c6607
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/file_level_multiple_constant_keywords.sol
@@ -0,0 +1,4 @@
+uint constant constant x;
+// ----
+// ParserError 3109: (14-22): Mutability already set to "constant"
+
diff --git a/test/libsolidity/syntaxTests/errors/elementary_non_address_state_mutability_error_argument.sol b/test/libsolidity/syntaxTests/errors/elementary_non_address_state_mutability_error_argument.sol
new file mode 100644
index 0000000000..110af7e34c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/elementary_non_address_state_mutability_error_argument.sol
@@ -0,0 +1,85 @@
+contract C {
+    error a(bool payable);
+    error b(string payable);
+    error c(int payable);
+    error d(int256 payable);
+    error e(uint payable);
+    error f(uint256 payable);
+    error g(bytes1 payable);
+    error h(bytes payable);
+    error i(bytes32 payable);
+    error j(fixed payable);
+    error k(fixed80x80 payable);
+    error l(ufixed payable);
+    error m(ufixed80x80 payable);
+}
+contract C2 {
+    error a(bool view);
+    error b(string view);
+    error c(int view);
+    error d(int256 view);
+    error e(uint view);
+    error f(uint256 view);
+    error g(bytes1 view);
+    error h(bytes view);
+    error i(bytes32 view);
+    error j(fixed view);
+    error k(fixed80x80 view);
+    error l(ufixed view);
+    error m(ufixed80x80 view);
+}
+contract C3 {
+    error a(bool pure);
+    error b(string pure);
+    error c(int pure);
+    error d(int256 pure);
+    error e(uint pure);
+    error f(uint256 pure);
+    error g(bytes1 pure);
+    error h(bytes pure);
+    error i(bytes32 pure);
+    error j(fixed pure);
+    error k(fixed80x80 pure);
+    error l(ufixed pure);
+    error m(ufixed80x80 pure);
+}
+// ----
+// ParserError 9106: (30-37): State mutability can only be specified for address types.
+// ParserError 9106: (59-66): State mutability can only be specified for address types.
+// ParserError 9106: (85-92): State mutability can only be specified for address types.
+// ParserError 9106: (114-121): State mutability can only be specified for address types.
+// ParserError 9106: (141-148): State mutability can only be specified for address types.
+// ParserError 9106: (171-178): State mutability can only be specified for address types.
+// ParserError 9106: (200-207): State mutability can only be specified for address types.
+// ParserError 9106: (228-235): State mutability can only be specified for address types.
+// ParserError 9106: (258-265): State mutability can only be specified for address types.
+// ParserError 9106: (286-293): State mutability can only be specified for address types.
+// ParserError 9106: (319-326): State mutability can only be specified for address types.
+// ParserError 9106: (348-355): State mutability can only be specified for address types.
+// ParserError 9106: (382-389): State mutability can only be specified for address types.
+// ParserError 9106: (425-429): State mutability can only be specified for address types.
+// ParserError 9106: (451-455): State mutability can only be specified for address types.
+// ParserError 9106: (474-478): State mutability can only be specified for address types.
+// ParserError 9106: (500-504): State mutability can only be specified for address types.
+// ParserError 9106: (524-528): State mutability can only be specified for address types.
+// ParserError 9106: (551-555): State mutability can only be specified for address types.
+// ParserError 9106: (577-581): State mutability can only be specified for address types.
+// ParserError 9106: (602-606): State mutability can only be specified for address types.
+// ParserError 9106: (629-633): State mutability can only be specified for address types.
+// ParserError 9106: (654-658): State mutability can only be specified for address types.
+// ParserError 9106: (684-688): State mutability can only be specified for address types.
+// ParserError 9106: (710-714): State mutability can only be specified for address types.
+// ParserError 9106: (741-745): State mutability can only be specified for address types.
+// ParserError 9106: (781-785): State mutability can only be specified for address types.
+// ParserError 9106: (807-811): State mutability can only be specified for address types.
+// ParserError 9106: (830-834): State mutability can only be specified for address types.
+// ParserError 9106: (856-860): State mutability can only be specified for address types.
+// ParserError 9106: (880-884): State mutability can only be specified for address types.
+// ParserError 9106: (907-911): State mutability can only be specified for address types.
+// ParserError 9106: (933-937): State mutability can only be specified for address types.
+// ParserError 9106: (958-962): State mutability can only be specified for address types.
+// ParserError 9106: (985-989): State mutability can only be specified for address types.
+// ParserError 9106: (1010-1014): State mutability can only be specified for address types.
+// ParserError 9106: (1040-1044): State mutability can only be specified for address types.
+// ParserError 9106: (1066-1070): State mutability can only be specified for address types.
+// ParserError 9106: (1097-1101): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/errors/invalid_parameter_indexed.sol b/test/libsolidity/syntaxTests/errors/invalid_parameter_indexed.sol
new file mode 100644
index 0000000000..99b629cd37
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/invalid_parameter_indexed.sol
@@ -0,0 +1,5 @@
+contract C {
+    error e1(uint indexed x);
+}
+// ----
+// ParserError 2314: (31-38): Expected ',' but got 'indexed'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol b/test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol
new file mode 100644
index 0000000000..a116188d23
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/invalid_parameter_location.sol
@@ -0,0 +1,16 @@
+==== Source: A ====
+contract test {
+    error e1(string storage a);
+}
+==== Source: B ====
+contract test {
+    error e1(string memory a);
+}
+==== Source: C ====
+contract test {
+    error e1(string calldata a);
+}
+// ----
+// ParserError 2314: (A:36-43): Expected ',' but got 'storage'
+// ParserError 2314: (B:36-42): Expected ',' but got 'memory'
+// ParserError 2314: (C:36-44): Expected ',' but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/errors/invalid_parameter_mutability.sol b/test/libsolidity/syntaxTests/errors/invalid_parameter_mutability.sol
new file mode 100644
index 0000000000..fc5b4609b9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/invalid_parameter_mutability.sol
@@ -0,0 +1,7 @@
+contract C {
+    error e1(uint constant x);
+    error e2(uint immutable x);
+}
+// ----
+// DeclarationError 1788: (26-41): The "constant" keyword can only be used for state variables or variables at file level.
+// DeclarationError 8297: (57-73): The "immutable" keyword can only be used for state variables.
diff --git a/test/libsolidity/syntaxTests/errors/invalid_parameter_visibility.sol b/test/libsolidity/syntaxTests/errors/invalid_parameter_visibility.sol
new file mode 100644
index 0000000000..c35e759df5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/invalid_parameter_visibility.sol
@@ -0,0 +1,21 @@
+==== Source: A ====
+contract C {
+    error e1(uint external x);
+}
+==== Source: B ====
+contract C {
+    error e1(uint internal x);
+}
+==== Source: C ====
+contract C {
+    error e1(uint public x);
+}
+==== Source: D ====
+contract C {
+    error e1(uint private x);
+}
+// ----
+// ParserError 2314: (A:31-39): Expected ',' but got 'external'
+// ParserError 2314: (B:31-39): Expected ',' but got 'internal'
+// ParserError 2314: (C:31-37): Expected ',' but got 'public'
+// ParserError 2314: (D:31-38): Expected ',' but got 'private'
diff --git a/test/libsolidity/syntaxTests/events/anonymous_event_multiple_anonymous_specifiers.sol b/test/libsolidity/syntaxTests/events/anonymous_event_multiple_anonymous_specifiers.sol
new file mode 100644
index 0000000000..fd3e317b82
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/anonymous_event_multiple_anonymous_specifiers.sol
@@ -0,0 +1,5 @@
+contract c {
+    event e(uint a) anonymous anonymous;
+}
+// ----
+// ParserError 2314: (43-52): Expected ';' but got 'anonymous'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/events/elementary_non_address_state_mutability_event_argument.sol b/test/libsolidity/syntaxTests/events/elementary_non_address_state_mutability_event_argument.sol
new file mode 100644
index 0000000000..a3e08411b1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/elementary_non_address_state_mutability_event_argument.sol
@@ -0,0 +1,85 @@
+contract C {
+    event a(bool payable);
+    event b(string payable);
+    event c(int payable);
+    event d(int256 payable);
+    event e(uint payable);
+    event f(uint256 payable);
+    event g(bytes1 payable);
+    event h(bytes payable);
+    event i(bytes32 payable);
+    event j(fixed payable);
+    event k(fixed80x80 payable);
+    event l(ufixed payable);
+    event m(ufixed80x80 payable);
+}
+contract C2 {
+    event a(bool view);
+    event b(string view);
+    event c(int view);
+    event d(int256 view);
+    event e(uint view);
+    event f(uint256 view);
+    event g(bytes1 view);
+    event h(bytes view);
+    event i(bytes32 view);
+    event j(fixed view);
+    event k(fixed80x80 view);
+    event l(ufixed view);
+    event m(ufixed80x80 view);
+}
+contract C3 {
+    event a(bool pure);
+    event b(string pure);
+    event c(int pure);
+    event d(int256 pure);
+    event e(uint pure);
+    event f(uint256 pure);
+    event g(bytes1 pure);
+    event h(bytes pure);
+    event i(bytes32 pure);
+    event j(fixed pure);
+    event k(fixed80x80 pure);
+    event l(ufixed pure);
+    event m(ufixed80x80 pure);
+}
+// ----
+// ParserError 9106: (30-37): State mutability can only be specified for address types.
+// ParserError 9106: (59-66): State mutability can only be specified for address types.
+// ParserError 9106: (85-92): State mutability can only be specified for address types.
+// ParserError 9106: (114-121): State mutability can only be specified for address types.
+// ParserError 9106: (141-148): State mutability can only be specified for address types.
+// ParserError 9106: (171-178): State mutability can only be specified for address types.
+// ParserError 9106: (200-207): State mutability can only be specified for address types.
+// ParserError 9106: (228-235): State mutability can only be specified for address types.
+// ParserError 9106: (258-265): State mutability can only be specified for address types.
+// ParserError 9106: (286-293): State mutability can only be specified for address types.
+// ParserError 9106: (319-326): State mutability can only be specified for address types.
+// ParserError 9106: (348-355): State mutability can only be specified for address types.
+// ParserError 9106: (382-389): State mutability can only be specified for address types.
+// ParserError 9106: (425-429): State mutability can only be specified for address types.
+// ParserError 9106: (451-455): State mutability can only be specified for address types.
+// ParserError 9106: (474-478): State mutability can only be specified for address types.
+// ParserError 9106: (500-504): State mutability can only be specified for address types.
+// ParserError 9106: (524-528): State mutability can only be specified for address types.
+// ParserError 9106: (551-555): State mutability can only be specified for address types.
+// ParserError 9106: (577-581): State mutability can only be specified for address types.
+// ParserError 9106: (602-606): State mutability can only be specified for address types.
+// ParserError 9106: (629-633): State mutability can only be specified for address types.
+// ParserError 9106: (654-658): State mutability can only be specified for address types.
+// ParserError 9106: (684-688): State mutability can only be specified for address types.
+// ParserError 9106: (710-714): State mutability can only be specified for address types.
+// ParserError 9106: (741-745): State mutability can only be specified for address types.
+// ParserError 9106: (781-785): State mutability can only be specified for address types.
+// ParserError 9106: (807-811): State mutability can only be specified for address types.
+// ParserError 9106: (830-834): State mutability can only be specified for address types.
+// ParserError 9106: (856-860): State mutability can only be specified for address types.
+// ParserError 9106: (880-884): State mutability can only be specified for address types.
+// ParserError 9106: (907-911): State mutability can only be specified for address types.
+// ParserError 9106: (933-937): State mutability can only be specified for address types.
+// ParserError 9106: (958-962): State mutability can only be specified for address types.
+// ParserError 9106: (985-989): State mutability can only be specified for address types.
+// ParserError 9106: (1010-1014): State mutability can only be specified for address types.
+// ParserError 9106: (1040-1044): State mutability can only be specified for address types.
+// ParserError 9106: (1066-1070): State mutability can only be specified for address types.
+// ParserError 9106: (1097-1101): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/events/event_several_indexed_of_one_parameter.sol b/test/libsolidity/syntaxTests/events/event_multiple_indexed_of_one_parameter.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/events/event_several_indexed_of_one_parameter.sol
rename to test/libsolidity/syntaxTests/events/event_multiple_indexed_of_one_parameter.sol
diff --git a/test/libsolidity/syntaxTests/events/invalid_parameter_location.sol b/test/libsolidity/syntaxTests/events/invalid_parameter_location.sol
new file mode 100644
index 0000000000..04ee9b7bc4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/invalid_parameter_location.sol
@@ -0,0 +1,16 @@
+==== Source: A ====
+contract test {
+    event e1(string storage a);
+}
+==== Source: B ====
+contract test {
+    event e1(string memory a);
+}
+==== Source: C ====
+contract test {
+    event e1(string calldata a);
+}
+// ----
+// ParserError 2314: (A:36-43): Expected ',' but got 'storage'
+// ParserError 2314: (B:36-42): Expected ',' but got 'memory'
+// ParserError 2314: (C:36-44): Expected ',' but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/events/invalid_parameter_mutability.sol b/test/libsolidity/syntaxTests/events/invalid_parameter_mutability.sol
new file mode 100644
index 0000000000..f7314e6f59
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/invalid_parameter_mutability.sol
@@ -0,0 +1,7 @@
+contract test {
+    event e1(uint constant a);
+    event e2(uint immutable a);
+}
+// ----
+// DeclarationError 1788: (29-44): The "constant" keyword can only be used for state variables or variables at file level.
+// DeclarationError 8297: (60-76): The "immutable" keyword can only be used for state variables.
diff --git a/test/libsolidity/syntaxTests/events/invalid_parameter_visibility.sol b/test/libsolidity/syntaxTests/events/invalid_parameter_visibility.sol
new file mode 100644
index 0000000000..bcb6d4306d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/invalid_parameter_visibility.sol
@@ -0,0 +1,21 @@
+==== Source: A ====
+contract test {
+    event e1(uint external a);
+}
+==== Source: B ====
+contract test {
+    event e1(uint internal a);
+}
+==== Source: C ====
+contract test {
+    event e1(uint public a);
+}
+==== Source: D ====
+contract test {
+    event e1(uint private a);
+}
+// ----
+// ParserError 2314: (A:34-42): Expected ',' but got 'external'
+// ParserError 2314: (B:34-42): Expected ',' but got 'internal'
+// ParserError 2314: (C:34-40): Expected ',' but got 'public'
+// ParserError 2314: (D:34-41): Expected ',' but got 'private'
diff --git a/test/libsolidity/syntaxTests/modifiers/elementary_non_address_state_mutability_modifier_argument.sol b/test/libsolidity/syntaxTests/modifiers/elementary_non_address_state_mutability_modifier_argument.sol
new file mode 100644
index 0000000000..568743b363
--- /dev/null
+++ b/test/libsolidity/syntaxTests/modifiers/elementary_non_address_state_mutability_modifier_argument.sol
@@ -0,0 +1,85 @@
+contract C {
+    modifier a(bool payable) {}
+    modifier b(string payable) {}
+    modifier c(int payable) {}
+    modifier d(int256 payable) {}
+    modifier e(uint payable) {}
+    modifier f(uint256 payable) {}
+    modifier g(bytes1 payable) {}
+    modifier h(bytes payable) {}
+    modifier i(bytes32 payable) {}
+    modifier j(fixed payable) {}
+    modifier k(fixed80x80 payable) {}
+    modifier l(ufixed payable) {}
+    modifier m(ufixed80x80 payable) {}
+}
+contract C2 {
+    modifier a(bool view) {}
+    modifier b(string view) {}
+    modifier c(int view) {}
+    modifier d(int256 view) {}
+    modifier e(uint view) {}
+    modifier f(uint256 view) {}
+    modifier g(bytes1 view) {}
+    modifier h(bytes view) {}
+    modifier i(bytes32 view) {}
+    modifier j(fixed view) {}
+    modifier k(fixed80x80 view) {}
+    modifier l(ufixed view) {}
+    modifier m(ufixed80x80 view) {}
+}
+contract C3 {
+    modifier a(bool pure) {}
+    modifier b(string pure) {}
+    modifier c(int pure) {}
+    modifier d(int256 pure) {}
+    modifier e(uint pure) {}
+    modifier f(uint256 pure) {}
+    modifier g(bytes1 pure) {}
+    modifier h(bytes pure) {}
+    modifier i(bytes32 pure) {}
+    modifier j(fixed pure) {}
+    modifier k(fixed80x80 pure) {}
+    modifier l(ufixed pure) {}
+    modifier m(ufixed80x80 pure) {}
+}
+// ----
+// ParserError 9106: (33-40): State mutability can only be specified for address types.
+// ParserError 9106: (67-74): State mutability can only be specified for address types.
+// ParserError 9106: (98-105): State mutability can only be specified for address types.
+// ParserError 9106: (132-139): State mutability can only be specified for address types.
+// ParserError 9106: (164-171): State mutability can only be specified for address types.
+// ParserError 9106: (199-206): State mutability can only be specified for address types.
+// ParserError 9106: (233-240): State mutability can only be specified for address types.
+// ParserError 9106: (266-273): State mutability can only be specified for address types.
+// ParserError 9106: (301-308): State mutability can only be specified for address types.
+// ParserError 9106: (334-341): State mutability can only be specified for address types.
+// ParserError 9106: (372-379): State mutability can only be specified for address types.
+// ParserError 9106: (406-413): State mutability can only be specified for address types.
+// ParserError 9106: (445-452): State mutability can only be specified for address types.
+// ParserError 9106: (493-497): State mutability can only be specified for address types.
+// ParserError 9106: (524-528): State mutability can only be specified for address types.
+// ParserError 9106: (552-556): State mutability can only be specified for address types.
+// ParserError 9106: (583-587): State mutability can only be specified for address types.
+// ParserError 9106: (612-616): State mutability can only be specified for address types.
+// ParserError 9106: (644-648): State mutability can only be specified for address types.
+// ParserError 9106: (675-679): State mutability can only be specified for address types.
+// ParserError 9106: (705-709): State mutability can only be specified for address types.
+// ParserError 9106: (737-741): State mutability can only be specified for address types.
+// ParserError 9106: (767-771): State mutability can only be specified for address types.
+// ParserError 9106: (802-806): State mutability can only be specified for address types.
+// ParserError 9106: (833-837): State mutability can only be specified for address types.
+// ParserError 9106: (869-873): State mutability can only be specified for address types.
+// ParserError 9106: (914-918): State mutability can only be specified for address types.
+// ParserError 9106: (945-949): State mutability can only be specified for address types.
+// ParserError 9106: (973-977): State mutability can only be specified for address types.
+// ParserError 9106: (1004-1008): State mutability can only be specified for address types.
+// ParserError 9106: (1033-1037): State mutability can only be specified for address types.
+// ParserError 9106: (1065-1069): State mutability can only be specified for address types.
+// ParserError 9106: (1096-1100): State mutability can only be specified for address types.
+// ParserError 9106: (1126-1130): State mutability can only be specified for address types.
+// ParserError 9106: (1158-1162): State mutability can only be specified for address types.
+// ParserError 9106: (1188-1192): State mutability can only be specified for address types.
+// ParserError 9106: (1223-1227): State mutability can only be specified for address types.
+// ParserError 9106: (1254-1258): State mutability can only be specified for address types.
+// ParserError 9106: (1290-1294): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/modifiers/invalid_parameter_mutability.sol b/test/libsolidity/syntaxTests/modifiers/invalid_parameter_mutability.sol
new file mode 100644
index 0000000000..f23861ebf4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/modifiers/invalid_parameter_mutability.sol
@@ -0,0 +1,7 @@
+contract A {
+    modifier mod1(uint constant a) { _; }
+    modifier mod2(uint immutable a) { _; }
+}
+// ----
+// DeclarationError 1788: (31-46): The "constant" keyword can only be used for state variables or variables at file level.
+// DeclarationError 8297: (73-89): The "immutable" keyword can only be used for state variables.
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/modifiers/invalid_parameter_visibility.sol b/test/libsolidity/syntaxTests/modifiers/invalid_parameter_visibility.sol
new file mode 100644
index 0000000000..0ef9e5c056
--- /dev/null
+++ b/test/libsolidity/syntaxTests/modifiers/invalid_parameter_visibility.sol
@@ -0,0 +1,21 @@
+==== Source: A ====
+contract A {
+    modifier mod(uint internal a) { _; }
+}
+==== Source: B ====
+contract A {
+    modifier mod(uint external a) { _; }
+}
+==== Source: C ====
+contract A {
+    modifier mod(uint public a) { _; }
+}
+==== Source: D ====
+contract A {
+    modifier mod(uint private a) { _; }
+}
+// ----
+// ParserError 2314: (A:35-43): Expected ',' but got 'internal'
+// ParserError 2314: (B:35-43): Expected ',' but got 'external'
+// ParserError 2314: (C:35-41): Expected ',' but got 'public'
+// ParserError 2314: (D:35-42): Expected ',' but got 'private'
diff --git a/test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol b/test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol
new file mode 100644
index 0000000000..e264a593ff
--- /dev/null
+++ b/test/libsolidity/syntaxTests/modifiers/multiple_parameter_location.sol
@@ -0,0 +1,21 @@
+contract A {
+    modifier mod1(string storage storage a) { _; }
+    modifier mod2(string storage memory a) { _; }
+    modifier mod3(string storage calldata a) { _; }
+    modifier mod4(string memory storage a) { _; }
+    modifier mod5(string memory memory a) { _; }
+    modifier mod6(string memory calldata a) { _; }
+    modifier mod7(string calldata storage a) { _; }
+    modifier mod8(string calldata memory a) { _; }
+    modifier mod9(string calldata calldata a) { _; }
+}
+// ----
+// ParserError 3548: (46-53): Location already specified.
+// ParserError 3548: (97-103): Location already specified.
+// ParserError 3548: (147-155): Location already specified.
+// ParserError 3548: (198-205): Location already specified.
+// ParserError 3548: (248-254): Location already specified.
+// ParserError 3548: (297-305): Location already specified.
+// ParserError 3548: (350-357): Location already specified.
+// ParserError 3548: (402-408): Location already specified.
+// ParserError 3548: (453-461): Location already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol b/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol
index 90968ebc69..2aa4dd344d 100644
--- a/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol
+++ b/test/libsolidity/syntaxTests/parsing/address_invalid_state_mutability.sol
@@ -1,26 +1,50 @@
 contract C {
-	address view m_a;
-	address pure m_b;
-	address view[] m_c;
-	mapping(uint => address view) m_d;
-	function f() public pure {
-		address view a;
-		address pure b;
-		a; b;
-	}
-	function g(address view) public pure {}
-	function h(address pure) public pure {}
-	function i() public pure returns (address view) {}
-	function j() public pure returns (address pure) {}
+    address view m_a;
+    address pure m_b;
+    address view[] m_c;
+    mapping(uint => address view) m_d;
+    function f() public pure {
+        address view a;
+        address pure b;
+        a; b;
+    }
+    function g(address view) public pure {}
+    function h(address pure) public pure {}
+    function i() public pure returns (address view) {}
+    function j() public pure returns (address pure) {}
+    modifier m1(address view) {_;}
+    modifier m2(address pure) {_;}
+    event e1(address view);
+    event e2(address pure);
+    error err1(address view);
+    error err2(address pure);
+    function f2() public pure returns (address) {
+        try this.f2() returns (address view res) {} catch {}
+    }
+    function f3() public pure returns (address) {
+        try this.f3() returns (address pure res) {} catch {}
+    }
 }
+address view constant f_a;
+address pure constant f_b;
 // ----
-// TypeError 2311: (14-26): Address types can only be payable or non-payable.
-// TypeError 2311: (33-45): Address types can only be payable or non-payable.
-// TypeError 2311: (52-64): Address types can only be payable or non-payable.
-// TypeError 2311: (89-101): Address types can only be payable or non-payable.
-// TypeError 2311: (138-150): Address types can only be payable or non-payable.
-// TypeError 2311: (156-168): Address types can only be payable or non-payable.
-// TypeError 2311: (195-207): Address types can only be payable or non-payable.
-// TypeError 2311: (236-248): Address types can only be payable or non-payable.
-// TypeError 2311: (300-312): Address types can only be payable or non-payable.
-// TypeError 2311: (352-364): Address types can only be payable or non-payable.
+// TypeError 2311: (17-29): Address types can only be payable or non-payable.
+// TypeError 2311: (39-51): Address types can only be payable or non-payable.
+// TypeError 2311: (61-73): Address types can only be payable or non-payable.
+// TypeError 2311: (101-113): Address types can only be payable or non-payable.
+// TypeError 2311: (159-171): Address types can only be payable or non-payable.
+// TypeError 2311: (183-195): Address types can only be payable or non-payable.
+// TypeError 2311: (234-246): Address types can only be payable or non-payable.
+// TypeError 2311: (278-290): Address types can only be payable or non-payable.
+// TypeError 2311: (345-357): Address types can only be payable or non-payable.
+// TypeError 2311: (400-412): Address types can only be payable or non-payable.
+// TypeError 2311: (433-445): Address types can only be payable or non-payable.
+// TypeError 2311: (468-480): Address types can only be payable or non-payable.
+// TypeError 2311: (500-512): Address types can only be payable or non-payable.
+// TypeError 2311: (528-540): Address types can only be payable or non-payable.
+// TypeError 2311: (558-570): Address types can only be payable or non-payable.
+// TypeError 2311: (588-600): Address types can only be payable or non-payable.
+// TypeError 2311: (684-696): Address types can only be payable or non-payable.
+// TypeError 2311: (801-813): Address types can only be payable or non-payable.
+// TypeError 2311: (839-851): Address types can only be payable or non-payable.
+// TypeError 2311: (866-878): Address types can only be payable or non-payable.
diff --git a/test/libsolidity/syntaxTests/parsing/elemantary_non_address_payable_state_variable.sol b/test/libsolidity/syntaxTests/parsing/elemantary_non_address_payable_state_variable.sol
deleted file mode 100644
index bc5db10bae..0000000000
--- a/test/libsolidity/syntaxTests/parsing/elemantary_non_address_payable_state_variable.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    bool payable a;
-    string payable b;
-    int payable c;
-    int256 payable d;
-    uint payable e;
-    uint256 payable f;
-    bytes1 payable g;
-    bytes payable h;
-    bytes32 payable i;
-    fixed payable j;
-    fixed80x80 payable k;
-    ufixed payable l;
-    ufixed80x80 payable m;
-}
-// ----
-// ParserError 9106: (22-29): State mutability can only be specified for address types.
-// ParserError 9106: (44-51): State mutability can only be specified for address types.
-// ParserError 9106: (63-70): State mutability can only be specified for address types.
-// ParserError 9106: (85-92): State mutability can only be specified for address types.
-// ParserError 9106: (105-112): State mutability can only be specified for address types.
-// ParserError 9106: (128-135): State mutability can only be specified for address types.
-// ParserError 9106: (150-157): State mutability can only be specified for address types.
-// ParserError 9106: (171-178): State mutability can only be specified for address types.
-// ParserError 9106: (194-201): State mutability can only be specified for address types.
-// ParserError 9106: (215-222): State mutability can only be specified for address types.
-// ParserError 9106: (241-248): State mutability can only be specified for address types.
-// ParserError 9106: (263-270): State mutability can only be specified for address types.
-// ParserError 9106: (290-297): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_argument.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_argument.sol
deleted file mode 100644
index 7d26f74c07..0000000000
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_argument.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    function a(bool payable) public pure {}
-    function b(string payable) public pure {}
-    function c(int payable) public pure {}
-    function d(int256 payable) public pure {}
-    function e(uint payable) public pure {}
-    function f(uint256 payable) public pure {}
-    function g(bytes1 payable) public pure {}
-    function h(bytes payable) public pure {}
-    function i(bytes32 payable) public pure {}
-    function j(fixed payable) public pure {}
-    function k(fixed80x80 payable) public pure {}
-    function l(ufixed payable) public pure {}
-    function m(ufixed80x80 payable) public pure {}
-}
-// ----
-// ParserError 9106: (33-40): State mutability can only be specified for address types.
-// ParserError 9106: (79-86): State mutability can only be specified for address types.
-// ParserError 9106: (122-129): State mutability can only be specified for address types.
-// ParserError 9106: (168-175): State mutability can only be specified for address types.
-// ParserError 9106: (212-219): State mutability can only be specified for address types.
-// ParserError 9106: (259-266): State mutability can only be specified for address types.
-// ParserError 9106: (305-312): State mutability can only be specified for address types.
-// ParserError 9106: (350-357): State mutability can only be specified for address types.
-// ParserError 9106: (397-404): State mutability can only be specified for address types.
-// ParserError 9106: (442-449): State mutability can only be specified for address types.
-// ParserError 9106: (492-499): State mutability can only be specified for address types.
-// ParserError 9106: (538-545): State mutability can only be specified for address types.
-// ParserError 9106: (589-596): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_local.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_local.sol
deleted file mode 100644
index 2aad9cd04e..0000000000
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_local.sol
+++ /dev/null
@@ -1,31 +0,0 @@
-contract C {
-    function f() public pure {
-        bool payable a;
-        string payable b;
-        int payable c;
-        int256 payable d;
-        uint payable e;
-        uint256 payable f;
-        bytes1 payable g;
-        bytes payable h;
-        bytes32 payable i;
-        fixed payable j;
-        fixed80x80 payable k;
-        ufixed payable l;
-        ufixed80x80 payable m;
-    }
-}
-// ----
-// ParserError 9106: (57-64): State mutability can only be specified for address types.
-// ParserError 9106: (83-90): State mutability can only be specified for address types.
-// ParserError 9106: (106-113): State mutability can only be specified for address types.
-// ParserError 9106: (132-139): State mutability can only be specified for address types.
-// ParserError 9106: (156-163): State mutability can only be specified for address types.
-// ParserError 9106: (183-190): State mutability can only be specified for address types.
-// ParserError 9106: (209-216): State mutability can only be specified for address types.
-// ParserError 9106: (234-241): State mutability can only be specified for address types.
-// ParserError 9106: (261-268): State mutability can only be specified for address types.
-// ParserError 9106: (286-293): State mutability can only be specified for address types.
-// ParserError 9106: (316-323): State mutability can only be specified for address types.
-// ParserError 9106: (342-349): State mutability can only be specified for address types.
-// ParserError 9106: (373-380): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_return.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_return.sol
deleted file mode 100644
index 026138cde6..0000000000
--- a/test/libsolidity/syntaxTests/parsing/elementary_non_address_payable_return.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract C {
-    function a() public pure returns (bool payable) {}
-    function b() public pure returns (string payable) {}
-    function c() public pure returns (int payable) {}
-    function d() public pure returns (int256 payable) {}
-    function e() public pure returns (uint payable) {}
-    function f() public pure returns (uint256 payable) {}
-    function g() public pure returns (bytes1 payable) {}
-    function h() public pure returns (bytes payable) {}
-    function i() public pure returns (bytes32 payable) {}
-    function j() public pure returns (fixed payable) {}
-    function k() public pure returns (fixed80x80 payable) {}
-    function l() public pure returns (ufixed payable) {}
-    function m() public pure returns (ufixed80x80 payable) {}
-}
-// ----
-// ParserError 9106: (56-63): State mutability can only be specified for address types.
-// ParserError 9106: (113-120): State mutability can only be specified for address types.
-// ParserError 9106: (167-174): State mutability can only be specified for address types.
-// ParserError 9106: (224-231): State mutability can only be specified for address types.
-// ParserError 9106: (279-286): State mutability can only be specified for address types.
-// ParserError 9106: (337-344): State mutability can only be specified for address types.
-// ParserError 9106: (394-401): State mutability can only be specified for address types.
-// ParserError 9106: (450-457): State mutability can only be specified for address types.
-// ParserError 9106: (508-515): State mutability can only be specified for address types.
-// ParserError 9106: (564-571): State mutability can only be specified for address types.
-// ParserError 9106: (625-632): State mutability can only be specified for address types.
-// ParserError 9106: (682-689): State mutability can only be specified for address types.
-// ParserError 9106: (744-751): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_argument.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_argument.sol
new file mode 100644
index 0000000000..aefb4748c1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_argument.sol
@@ -0,0 +1,85 @@
+contract C {
+    function a(bool payable) public pure {}
+    function b(string payable) public pure {}
+    function c(int payable) public pure {}
+    function d(int256 payable) public pure {}
+    function e(uint payable) public pure {}
+    function f(uint256 payable) public pure {}
+    function g(bytes1 payable) public pure {}
+    function h(bytes payable) public pure {}
+    function i(bytes32 payable) public pure {}
+    function j(fixed payable) public pure {}
+    function k(fixed80x80 payable) public pure {}
+    function l(ufixed payable) public pure {}
+    function m(ufixed80x80 payable) public pure {}
+}
+contract C1 {
+    function a(bool view) public pure {}
+    function b(string view) public pure {}
+    function c(int view) public pure {}
+    function d(int256 view) public pure {}
+    function e(uint view) public pure {}
+    function f(uint256 view) public pure {}
+    function g(bytes1 view) public pure {}
+    function h(bytes view) public pure {}
+    function i(bytes32 view) public pure {}
+    function j(fixed view) public pure {}
+    function k(fixed80x80 view) public pure {}
+    function l(ufixed view) public pure {}
+    function m(ufixed80x80 view) public pure {}
+}
+contract C2 {
+    function a(bool pure) public pure {}
+    function b(string pure) public pure {}
+    function c(int pure) public pure {}
+    function d(int256 pure) public pure {}
+    function e(uint pure) public pure {}
+    function f(uint256 pure) public pure {}
+    function g(bytes1 pure) public pure {}
+    function h(bytes pure) public pure {}
+    function i(bytes32 pure) public pure {}
+    function j(fixed pure) public pure {}
+    function k(fixed80x80 pure) public pure {}
+    function l(ufixed pure) public pure {}
+    function m(ufixed80x80 pure) public pure {}
+}
+// ----
+// ParserError 9106: (33-40): State mutability can only be specified for address types.
+// ParserError 9106: (79-86): State mutability can only be specified for address types.
+// ParserError 9106: (122-129): State mutability can only be specified for address types.
+// ParserError 9106: (168-175): State mutability can only be specified for address types.
+// ParserError 9106: (212-219): State mutability can only be specified for address types.
+// ParserError 9106: (259-266): State mutability can only be specified for address types.
+// ParserError 9106: (305-312): State mutability can only be specified for address types.
+// ParserError 9106: (350-357): State mutability can only be specified for address types.
+// ParserError 9106: (397-404): State mutability can only be specified for address types.
+// ParserError 9106: (442-449): State mutability can only be specified for address types.
+// ParserError 9106: (492-499): State mutability can only be specified for address types.
+// ParserError 9106: (538-545): State mutability can only be specified for address types.
+// ParserError 9106: (589-596): State mutability can only be specified for address types.
+// ParserError 9106: (649-653): State mutability can only be specified for address types.
+// ParserError 9106: (692-696): State mutability can only be specified for address types.
+// ParserError 9106: (732-736): State mutability can only be specified for address types.
+// ParserError 9106: (775-779): State mutability can only be specified for address types.
+// ParserError 9106: (816-820): State mutability can only be specified for address types.
+// ParserError 9106: (860-864): State mutability can only be specified for address types.
+// ParserError 9106: (903-907): State mutability can only be specified for address types.
+// ParserError 9106: (945-949): State mutability can only be specified for address types.
+// ParserError 9106: (989-993): State mutability can only be specified for address types.
+// ParserError 9106: (1031-1035): State mutability can only be specified for address types.
+// ParserError 9106: (1078-1082): State mutability can only be specified for address types.
+// ParserError 9106: (1121-1125): State mutability can only be specified for address types.
+// ParserError 9106: (1169-1173): State mutability can only be specified for address types.
+// ParserError 9106: (1226-1230): State mutability can only be specified for address types.
+// ParserError 9106: (1269-1273): State mutability can only be specified for address types.
+// ParserError 9106: (1309-1313): State mutability can only be specified for address types.
+// ParserError 9106: (1352-1356): State mutability can only be specified for address types.
+// ParserError 9106: (1393-1397): State mutability can only be specified for address types.
+// ParserError 9106: (1437-1441): State mutability can only be specified for address types.
+// ParserError 9106: (1480-1484): State mutability can only be specified for address types.
+// ParserError 9106: (1522-1526): State mutability can only be specified for address types.
+// ParserError 9106: (1566-1570): State mutability can only be specified for address types.
+// ParserError 9106: (1608-1612): State mutability can only be specified for address types.
+// ParserError 9106: (1655-1659): State mutability can only be specified for address types.
+// ParserError 9106: (1698-1702): State mutability can only be specified for address types.
+// ParserError 9106: (1746-1750): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_file_var.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_file_var.sol
new file mode 100644
index 0000000000..25b9acc9fc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_file_var.sol
@@ -0,0 +1,81 @@
+bool payable a;
+string payable b;
+int payable c;
+int256 payable d;
+uint payable e;
+uint256 payable f;
+bytes1 payable g;
+bytes payable h;
+bytes32 payable i;
+fixed payable j;
+fixed80x80 payable k;
+ufixed payable l;
+ufixed80x80 payable m;
+
+bool view a2;
+string view b2;
+int view c2;
+int256 view d2;
+uint view e2;
+uint256 view f2;
+bytes1 view g2;
+bytes view h2;
+bytes32 view i2;
+fixed view j2;
+fixed80x80 view k2;
+ufixed view l2;
+ufixed80x80 view m2;
+
+bool pure a3;
+string pure b3;
+int pure c3;
+int256 pure d3;
+uint pure e3;
+uint256 pure f3;
+bytes1 pure g3;
+bytes pure h3;
+bytes32 pure i3;
+fixed pure j3;
+fixed80x80 pure k3;
+ufixed pure l3;
+ufixed80x80 pure m3;
+// ----
+// ParserError 9106: (5-12): State mutability can only be specified for address types.
+// ParserError 9106: (23-30): State mutability can only be specified for address types.
+// ParserError 9106: (38-45): State mutability can only be specified for address types.
+// ParserError 9106: (56-63): State mutability can only be specified for address types.
+// ParserError 9106: (72-79): State mutability can only be specified for address types.
+// ParserError 9106: (91-98): State mutability can only be specified for address types.
+// ParserError 9106: (109-116): State mutability can only be specified for address types.
+// ParserError 9106: (126-133): State mutability can only be specified for address types.
+// ParserError 9106: (145-152): State mutability can only be specified for address types.
+// ParserError 9106: (162-169): State mutability can only be specified for address types.
+// ParserError 9106: (184-191): State mutability can only be specified for address types.
+// ParserError 9106: (202-209): State mutability can only be specified for address types.
+// ParserError 9106: (225-232): State mutability can only be specified for address types.
+// ParserError 9106: (242-246): State mutability can only be specified for address types.
+// ParserError 9106: (258-262): State mutability can only be specified for address types.
+// ParserError 9106: (271-275): State mutability can only be specified for address types.
+// ParserError 9106: (287-291): State mutability can only be specified for address types.
+// ParserError 9106: (301-305): State mutability can only be specified for address types.
+// ParserError 9106: (318-322): State mutability can only be specified for address types.
+// ParserError 9106: (334-338): State mutability can only be specified for address types.
+// ParserError 9106: (349-353): State mutability can only be specified for address types.
+// ParserError 9106: (366-370): State mutability can only be specified for address types.
+// ParserError 9106: (381-385): State mutability can only be specified for address types.
+// ParserError 9106: (401-405): State mutability can only be specified for address types.
+// ParserError 9106: (417-421): State mutability can only be specified for address types.
+// ParserError 9106: (438-442): State mutability can only be specified for address types.
+// ParserError 9106: (453-457): State mutability can only be specified for address types.
+// ParserError 9106: (469-473): State mutability can only be specified for address types.
+// ParserError 9106: (482-486): State mutability can only be specified for address types.
+// ParserError 9106: (498-502): State mutability can only be specified for address types.
+// ParserError 9106: (512-516): State mutability can only be specified for address types.
+// ParserError 9106: (529-533): State mutability can only be specified for address types.
+// ParserError 9106: (545-549): State mutability can only be specified for address types.
+// ParserError 9106: (560-564): State mutability can only be specified for address types.
+// ParserError 9106: (577-581): State mutability can only be specified for address types.
+// ParserError 9106: (592-596): State mutability can only be specified for address types.
+// ParserError 9106: (612-616): State mutability can only be specified for address types.
+// ParserError 9106: (628-632): State mutability can only be specified for address types.
+// ParserError 9106: (649-653): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_local.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_local.sol
new file mode 100644
index 0000000000..d0b25a539b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_local.sol
@@ -0,0 +1,91 @@
+contract C {
+    function f() public pure {
+        bool payable a;
+        string payable b;
+        int payable c;
+        int256 payable d;
+        uint payable e;
+        uint256 payable f;
+        bytes1 payable g;
+        bytes payable h;
+        bytes32 payable i;
+        fixed payable j;
+        fixed80x80 payable k;
+        ufixed payable l;
+        ufixed80x80 payable m;
+    }
+}
+contract C2 {
+    function f() public pure {
+        bool view a;
+        string view b;
+        int view c;
+        int256 view d;
+        uint view e;
+        uint256 view f;
+        bytes1 view g;
+        bytes view h;
+        bytes32 view i;
+        fixed view j;
+        fixed80x80 view k;
+        ufixed view l;
+        ufixed80x80 view m;
+    }
+}
+contract C3 {
+    function f() public pure {
+        bool pure a;
+        string pure b;
+        int pure c;
+        int256 pure d;
+        uint pure e;
+        uint256 pure f;
+        bytes1 pure g;
+        bytes pure h;
+        bytes32 pure i;
+        fixed pure j;
+        fixed80x80 pure k;
+        ufixed pure l;
+        ufixed80x80 pure m;
+    }
+}
+// ----
+// ParserError 9106: (57-64): State mutability can only be specified for address types.
+// ParserError 9106: (83-90): State mutability can only be specified for address types.
+// ParserError 9106: (106-113): State mutability can only be specified for address types.
+// ParserError 9106: (132-139): State mutability can only be specified for address types.
+// ParserError 9106: (156-163): State mutability can only be specified for address types.
+// ParserError 9106: (183-190): State mutability can only be specified for address types.
+// ParserError 9106: (209-216): State mutability can only be specified for address types.
+// ParserError 9106: (234-241): State mutability can only be specified for address types.
+// ParserError 9106: (261-268): State mutability can only be specified for address types.
+// ParserError 9106: (286-293): State mutability can only be specified for address types.
+// ParserError 9106: (316-323): State mutability can only be specified for address types.
+// ParserError 9106: (342-349): State mutability can only be specified for address types.
+// ParserError 9106: (373-380): State mutability can only be specified for address types.
+// ParserError 9106: (450-454): State mutability can only be specified for address types.
+// ParserError 9106: (473-477): State mutability can only be specified for address types.
+// ParserError 9106: (493-497): State mutability can only be specified for address types.
+// ParserError 9106: (516-520): State mutability can only be specified for address types.
+// ParserError 9106: (537-541): State mutability can only be specified for address types.
+// ParserError 9106: (561-565): State mutability can only be specified for address types.
+// ParserError 9106: (584-588): State mutability can only be specified for address types.
+// ParserError 9106: (606-610): State mutability can only be specified for address types.
+// ParserError 9106: (630-634): State mutability can only be specified for address types.
+// ParserError 9106: (652-656): State mutability can only be specified for address types.
+// ParserError 9106: (679-683): State mutability can only be specified for address types.
+// ParserError 9106: (702-706): State mutability can only be specified for address types.
+// ParserError 9106: (730-734): State mutability can only be specified for address types.
+// ParserError 9106: (804-808): State mutability can only be specified for address types.
+// ParserError 9106: (827-831): State mutability can only be specified for address types.
+// ParserError 9106: (847-851): State mutability can only be specified for address types.
+// ParserError 9106: (870-874): State mutability can only be specified for address types.
+// ParserError 9106: (891-895): State mutability can only be specified for address types.
+// ParserError 9106: (915-919): State mutability can only be specified for address types.
+// ParserError 9106: (938-942): State mutability can only be specified for address types.
+// ParserError 9106: (960-964): State mutability can only be specified for address types.
+// ParserError 9106: (984-988): State mutability can only be specified for address types.
+// ParserError 9106: (1006-1010): State mutability can only be specified for address types.
+// ParserError 9106: (1033-1037): State mutability can only be specified for address types.
+// ParserError 9106: (1056-1060): State mutability can only be specified for address types.
+// ParserError 9106: (1084-1088): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_return.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_return.sol
new file mode 100644
index 0000000000..9e428fa9dd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_return.sol
@@ -0,0 +1,85 @@
+contract C {
+    function a() public pure returns (bool payable) {}
+    function b() public pure returns (string payable) {}
+    function c() public pure returns (int payable) {}
+    function d() public pure returns (int256 payable) {}
+    function e() public pure returns (uint payable) {}
+    function f() public pure returns (uint256 payable) {}
+    function g() public pure returns (bytes1 payable) {}
+    function h() public pure returns (bytes payable) {}
+    function i() public pure returns (bytes32 payable) {}
+    function j() public pure returns (fixed payable) {}
+    function k() public pure returns (fixed80x80 payable) {}
+    function l() public pure returns (ufixed payable) {}
+    function m() public pure returns (ufixed80x80 payable) {}
+}
+contract C1 {
+    function a() public pure returns (bool view) {}
+    function b() public pure returns (string view) {}
+    function c() public pure returns (int view) {}
+    function d() public pure returns (int256 view) {}
+    function e() public pure returns (uint view) {}
+    function f() public pure returns (uint256 view) {}
+    function g() public pure returns (bytes1 view) {}
+    function h() public pure returns (bytes view) {}
+    function i() public pure returns (bytes32 view) {}
+    function j() public pure returns (fixed view) {}
+    function k() public pure returns (fixed80x80 view) {}
+    function l() public pure returns (ufixed view) {}
+    function m() public pure returns (ufixed80x80 view) {}
+}
+contract C2 {
+    function a() public pure returns (bool pure) {}
+    function b() public pure returns (string pure) {}
+    function c() public pure returns (int pure) {}
+    function d() public pure returns (int256 pure) {}
+    function e() public pure returns (uint pure) {}
+    function f() public pure returns (uint256 pure) {}
+    function g() public pure returns (bytes1 pure) {}
+    function h() public pure returns (bytes pure) {}
+    function i() public pure returns (bytes32 pure) {}
+    function j() public pure returns (fixed pure) {}
+    function k() public pure returns (fixed80x80 pure) {}
+    function l() public pure returns (ufixed pure) {}
+    function m() public pure returns (ufixed80x80 pure) {}
+}
+// ----
+// ParserError 9106: (56-63): State mutability can only be specified for address types.
+// ParserError 9106: (113-120): State mutability can only be specified for address types.
+// ParserError 9106: (167-174): State mutability can only be specified for address types.
+// ParserError 9106: (224-231): State mutability can only be specified for address types.
+// ParserError 9106: (279-286): State mutability can only be specified for address types.
+// ParserError 9106: (337-344): State mutability can only be specified for address types.
+// ParserError 9106: (394-401): State mutability can only be specified for address types.
+// ParserError 9106: (450-457): State mutability can only be specified for address types.
+// ParserError 9106: (508-515): State mutability can only be specified for address types.
+// ParserError 9106: (564-571): State mutability can only be specified for address types.
+// ParserError 9106: (625-632): State mutability can only be specified for address types.
+// ParserError 9106: (682-689): State mutability can only be specified for address types.
+// ParserError 9106: (744-751): State mutability can only be specified for address types.
+// ParserError 9106: (815-819): State mutability can only be specified for address types.
+// ParserError 9106: (869-873): State mutability can only be specified for address types.
+// ParserError 9106: (920-924): State mutability can only be specified for address types.
+// ParserError 9106: (974-978): State mutability can only be specified for address types.
+// ParserError 9106: (1026-1030): State mutability can only be specified for address types.
+// ParserError 9106: (1081-1085): State mutability can only be specified for address types.
+// ParserError 9106: (1135-1139): State mutability can only be specified for address types.
+// ParserError 9106: (1188-1192): State mutability can only be specified for address types.
+// ParserError 9106: (1243-1247): State mutability can only be specified for address types.
+// ParserError 9106: (1296-1300): State mutability can only be specified for address types.
+// ParserError 9106: (1354-1358): State mutability can only be specified for address types.
+// ParserError 9106: (1408-1412): State mutability can only be specified for address types.
+// ParserError 9106: (1467-1471): State mutability can only be specified for address types.
+// ParserError 9106: (1535-1539): State mutability can only be specified for address types.
+// ParserError 9106: (1589-1593): State mutability can only be specified for address types.
+// ParserError 9106: (1640-1644): State mutability can only be specified for address types.
+// ParserError 9106: (1694-1698): State mutability can only be specified for address types.
+// ParserError 9106: (1746-1750): State mutability can only be specified for address types.
+// ParserError 9106: (1801-1805): State mutability can only be specified for address types.
+// ParserError 9106: (1855-1859): State mutability can only be specified for address types.
+// ParserError 9106: (1908-1912): State mutability can only be specified for address types.
+// ParserError 9106: (1963-1967): State mutability can only be specified for address types.
+// ParserError 9106: (2016-2020): State mutability can only be specified for address types.
+// ParserError 9106: (2074-2078): State mutability can only be specified for address types.
+// ParserError 9106: (2128-2132): State mutability can only be specified for address types.
+// ParserError 9106: (2187-2191): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_state_variable.sol b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_state_variable.sol
new file mode 100644
index 0000000000..960929f919
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/elementary_non_address_state_mutability_state_variable.sol
@@ -0,0 +1,85 @@
+contract C {
+    bool payable a;
+    string payable b;
+    int payable c;
+    int256 payable d;
+    uint payable e;
+    uint256 payable f;
+    bytes1 payable g;
+    bytes payable h;
+    bytes32 payable i;
+    fixed payable j;
+    fixed80x80 payable k;
+    ufixed payable l;
+    ufixed80x80 payable m;
+}
+contract C2 {
+    bool view a;
+    string view b;
+    int view c;
+    int256 view d;
+    uint view e;
+    uint256 view f;
+    bytes1 view g;
+    bytes view h;
+    bytes32 view i;
+    fixed view j;
+    fixed80x80 view k;
+    ufixed view l;
+    ufixed80x80 view m;
+}
+contract C3 {
+    bool pure a;
+    string pure b;
+    int pure c;
+    int256 pure d;
+    uint pure e;
+    uint256 pure f;
+    bytes1 pure g;
+    bytes pure h;
+    bytes32 pure i;
+    fixed pure j;
+    fixed80x80 pure k;
+    ufixed pure l;
+    ufixed80x80 pure m;
+}
+// ----
+// ParserError 9106: (22-29): State mutability can only be specified for address types.
+// ParserError 9106: (44-51): State mutability can only be specified for address types.
+// ParserError 9106: (63-70): State mutability can only be specified for address types.
+// ParserError 9106: (85-92): State mutability can only be specified for address types.
+// ParserError 9106: (105-112): State mutability can only be specified for address types.
+// ParserError 9106: (128-135): State mutability can only be specified for address types.
+// ParserError 9106: (150-157): State mutability can only be specified for address types.
+// ParserError 9106: (171-178): State mutability can only be specified for address types.
+// ParserError 9106: (194-201): State mutability can only be specified for address types.
+// ParserError 9106: (215-222): State mutability can only be specified for address types.
+// ParserError 9106: (241-248): State mutability can only be specified for address types.
+// ParserError 9106: (263-270): State mutability can only be specified for address types.
+// ParserError 9106: (290-297): State mutability can only be specified for address types.
+// ParserError 9106: (326-330): State mutability can only be specified for address types.
+// ParserError 9106: (345-349): State mutability can only be specified for address types.
+// ParserError 9106: (361-365): State mutability can only be specified for address types.
+// ParserError 9106: (380-384): State mutability can only be specified for address types.
+// ParserError 9106: (397-401): State mutability can only be specified for address types.
+// ParserError 9106: (417-421): State mutability can only be specified for address types.
+// ParserError 9106: (436-440): State mutability can only be specified for address types.
+// ParserError 9106: (454-458): State mutability can only be specified for address types.
+// ParserError 9106: (474-478): State mutability can only be specified for address types.
+// ParserError 9106: (492-496): State mutability can only be specified for address types.
+// ParserError 9106: (515-519): State mutability can only be specified for address types.
+// ParserError 9106: (534-538): State mutability can only be specified for address types.
+// ParserError 9106: (558-562): State mutability can only be specified for address types.
+// ParserError 9106: (591-595): State mutability can only be specified for address types.
+// ParserError 9106: (610-614): State mutability can only be specified for address types.
+// ParserError 9106: (626-630): State mutability can only be specified for address types.
+// ParserError 9106: (645-649): State mutability can only be specified for address types.
+// ParserError 9106: (662-666): State mutability can only be specified for address types.
+// ParserError 9106: (682-686): State mutability can only be specified for address types.
+// ParserError 9106: (701-705): State mutability can only be specified for address types.
+// ParserError 9106: (719-723): State mutability can only be specified for address types.
+// ParserError 9106: (739-743): State mutability can only be specified for address types.
+// ParserError 9106: (757-761): State mutability can only be specified for address types.
+// ParserError 9106: (780-784): State mutability can only be specified for address types.
+// ParserError 9106: (799-803): State mutability can only be specified for address types.
+// ParserError 9106: (823-827): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_indexed.sol b/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_indexed.sol
new file mode 100644
index 0000000000..0dd79bae79
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_indexed.sol
@@ -0,0 +1,11 @@
+==== Source: A ====
+contract test {
+    function f1(uint indexed a) public returns (uint) { }
+}
+==== Source: B ====
+contract test {
+    function f1(uint a) public returns (uint indexed) { }
+}
+// ----
+// ParserError 2314: (A:37-44): Expected ',' but got 'indexed'
+// ParserError 2314: (B:61-68): Expected ',' but got 'indexed'
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_mutability.sol b/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_mutability.sol
new file mode 100644
index 0000000000..6024141925
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/invalid_function_parameter_and_return_var_mutability.sol
@@ -0,0 +1,9 @@
+contract test {
+    function f1(uint immutable a) public returns (uint immutable) { }
+    function f2(uint constant a) public returns (uint constant) { }
+}
+// ----
+// DeclarationError 8297: (32-48): The "immutable" keyword can only be used for state variables.
+// DeclarationError 8297: (66-80): The "immutable" keyword can only be used for state variables.
+// DeclarationError 1788: (102-117): The "constant" keyword can only be used for state variables or variables at file level.
+// DeclarationError 1788: (135-148): The "constant" keyword can only be used for state variables or variables at file level.
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_state_variable_location.sol b/test/libsolidity/syntaxTests/parsing/invalid_state_variable_location.sol
new file mode 100644
index 0000000000..b5b3439f42
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/invalid_state_variable_location.sol
@@ -0,0 +1,11 @@
+==== Source: A ====
+contract test {
+    string memory a;
+}
+==== Source: B ====
+contract test {
+    string calldata a;
+}
+// ----
+// ParserError 2314: (A:27-33): Expected identifier but got 'memory'
+// ParserError 2314: (B:27-35): Expected identifier but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_variable_indexed.sol b/test/libsolidity/syntaxTests/parsing/invalid_variable_indexed.sol
new file mode 100644
index 0000000000..9508e795ac
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/invalid_variable_indexed.sol
@@ -0,0 +1,16 @@
+==== Source: A ====
+uint indexed a;
+==== Source: B ====
+contract test {
+    function f(uint a) public {
+        uint indexed a;
+    }
+}
+==== Source: C ====
+contract test {
+    uint indexed a;
+}
+// ----
+// ParserError 2314: (A:5-12): Expected identifier but got 'indexed'
+// ParserError 2314: (B:61-68): Expected ';' but got 'indexed'
+// ParserError 2314: (C:25-32): Expected identifier but got 'indexed'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_variable_mutablity.sol b/test/libsolidity/syntaxTests/parsing/invalid_variable_mutablity.sol
new file mode 100644
index 0000000000..874a185123
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/invalid_variable_mutablity.sol
@@ -0,0 +1,15 @@
+==== Source: A ====
+contract test {
+    function f(uint a) public {
+        uint constant a;
+    }
+}
+==== Source: B ====
+contract test {
+    function f(uint a) public {
+        uint immutable a;
+    }
+}
+// ----
+// ParserError 2314: (A:61-69): Expected ';' but got 'constant'
+// ParserError 2314: (B:61-70): Expected ';' but got 'immutable'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_file_level_var.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_file_level_var.sol
new file mode 100644
index 0000000000..c7b1558e61
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_file_level_var.sol
@@ -0,0 +1,10 @@
+==== Source: A ====
+uint[] storage a;
+==== Source: B ====
+uint[] memory b;
+==== Source: C ====
+uint[] calldata c;
+// ----
+// ParserError 2314: (A:7-14): Expected identifier but got 'storage'
+// ParserError 2314: (B:7-13): Expected identifier but got 'memory'
+// ParserError 2314: (C:7-15): Expected identifier but got 'calldata'
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_fn_returns_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_fn_returns_multi.sol
new file mode 100644
index 0000000000..06627bd649
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_fn_returns_multi.sol
@@ -0,0 +1,21 @@
+contract Foo {
+    function f1() returns (string calldata calldata) {}
+    function f2() returns (string calldata memory) {}
+    function f3() returns (string calldata storage) {}
+    function f4() returns (string memory calldata) {}
+    function f5() returns (string memory memory) {}
+    function f6() returns (string memory storage) {}
+    function f7() returns (string storage calldata) {}
+    function f8() returns (string storage memory) {}
+    function f9() returns (string storage storage) {}
+}
+// ----
+// ParserError 3548: (58-66): Location already specified.
+// ParserError 3548: (114-120): Location already specified.
+// ParserError 3548: (168-175): Location already specified.
+// ParserError 3548: (221-229): Location already specified.
+// ParserError 3548: (275-281): Location already specified.
+// ParserError 3548: (327-334): Location already specified.
+// ParserError 3548: (381-389): Location already specified.
+// ParserError 3548: (436-442): Location already specified.
+// ParserError 3548: (489-496): Location already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol
index f660c0953e..f61cd9498e 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_locals_multi.sol
@@ -3,6 +3,14 @@ contract Foo {
     function f() public view {
         uint[] storage memory x = m_x;
         uint[] memory storage calldata y;
+        uint[] storage calldata x2;
+        uint[] storage storage x3;
+        uint[] calldata memory x4;
+        uint[] calldata calldata x5;
+        uint[] calldata storage x6;
+        uint[] storage memory x4;
+        uint[] storage calldata x5;
+        uint[] storage storage x6;
         x; y;
     }
 }
@@ -10,3 +18,11 @@ contract Foo {
 // ParserError 3548: (85-91): Location already specified.
 // ParserError 3548: (123-130): Location already specified.
 // ParserError 3548: (131-139): Location already specified.
+// ParserError 3548: (166-174): Location already specified.
+// ParserError 3548: (202-209): Location already specified.
+// ParserError 3548: (238-244): Location already specified.
+// ParserError 3548: (273-281): Location already specified.
+// ParserError 3548: (310-317): Location already specified.
+// ParserError 3548: (345-351): Location already specified.
+// ParserError 3548: (379-387): Location already specified.
+// ParserError 3548: (415-422): Location already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol
index 25d1e02d3c..8d1985cd6f 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_params_multi.sol
@@ -1,6 +1,20 @@
 contract Foo {
     function f(uint[] storage memory constant x, uint[] memory calldata y) internal { }
+    function f2(uint[] storage storage x) internal { }
+    function f3(uint[] storage calldata x) internal { }
+    function f4(uint[] memory storage x) internal { }
+    function f5(uint[] memory memory x) internal { }
+    function f6(uint[] calldata storage x) internal { }
+    function f7(uint[] calldata memory x) internal { }
+    function f8(uint[] calldata calldata x) internal { }
 }
 // ----
 // ParserError 3548: (45-51): Location already specified.
 // ParserError 3548: (78-86): Location already specified.
+// ParserError 3548: (134-141): Location already specified.
+// ParserError 3548: (189-197): Location already specified.
+// ParserError 3548: (244-251): Location already specified.
+// ParserError 3548: (298-304): Location already specified.
+// ParserError 3548: (353-360): Location already specified.
+// ParserError 3548: (409-415): Location already specified.
+// ParserError 3548: (464-472): Location already specified.
diff --git a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol
index 134397fec6..d53f247571 100644
--- a/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol
+++ b/test/libsolidity/syntaxTests/parsing/location_specifiers_for_state_variables_multi.sol
@@ -1,5 +1,11 @@
+==== Source: A ====
 contract Foo {
 	uint[] memory storage calldata x;
 }
+==== Source: B ====
+contract Foo {
+	uint[] storage storage x;
+}
 // ----
-// ParserError 2314: (23-29): Expected identifier but got 'memory'
+// ParserError 2314: (A:23-29): Expected identifier but got 'memory'
+// ParserError 2314: (B:23-30): Expected identifier but got 'storage'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_mutability_specifiers.sol b/test/libsolidity/syntaxTests/parsing/multiple_mutability_specifiers.sol
new file mode 100644
index 0000000000..50579054c8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/multiple_mutability_specifiers.sol
@@ -0,0 +1,11 @@
+contract C {
+    uint constant constant a;
+    uint immutable immutable b;
+    uint constant immutable c;
+    uint immutable constant d;
+}
+// ----
+// ParserError 3109: (31-39): Mutability already set to "constant"
+// ParserError 3109: (62-71): Mutability already set to "immutable"
+// ParserError 3109: (93-102): Mutability already set to "constant"
+// ParserError 3109: (125-133): Mutability already set to "immutable"
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_state_mutability_specifiers.sol b/test/libsolidity/syntaxTests/parsing/multiple_state_mutability_specifiers.sol
new file mode 100644
index 0000000000..e9c4401054
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/multiple_state_mutability_specifiers.sol
@@ -0,0 +1,103 @@
+==== Source: A ====
+contract c1 {
+    function f() payable payable {}
+}
+contract c2 {
+    function f() view view {}
+}
+contract c3 {
+    function f() pure pure {}
+}
+contract c4 {
+    function f() pure view {}
+}
+contract c5 {
+    function f() payable view {}
+}
+contract c6 {
+    function f() pure payable {}
+}
+contract c7 {
+    function f() view payable {}
+}
+contract c8 {
+    function f() payable pure {}
+}
+contract c9 {
+    function f() view pure {}
+}
+==== Source: B ====
+contract c {
+    address payable payable v;
+}
+==== Source: C ====
+contract c {
+    function fn(address payable payable) public { }
+}
+==== Source: D ====
+contract c {
+    function fn() public returns (address payable payable) { }
+}
+==== Source: E ====
+contract c {
+    function fn() public {
+        address payable payable v;
+    }
+}
+==== Source: F ====
+contract c {
+    function fn(address payable payable v) public { }
+}
+==== Source: G ====
+contract c {
+    function fn() public returns (address payable payable res) { }
+}
+==== Source: H ====
+address payable payable v;
+==== Source: I ====
+contract c {
+    modifier m(address payable payable x)  { _; }
+}
+==== Source: J ====
+contract c {
+    event e(address payable payable x);
+}
+==== Source: K ====
+contract c {
+    error e1(address payable payable x);
+}
+==== Source: L ====
+contract c {
+    function f() public returns (address payable) {
+        try this.f() returns (address payable payable) { } catch { }
+    }
+}
+==== Source: M ====
+contract c {
+    function f() public returns (address payable) {
+        try this.f() returns (address payable) { } catch Error(address payable payable) { }
+    }
+}
+// ----
+// ParserError 9680: (A:39-46): State mutability already specified as "payable".
+// ParserError 9680: (A:88-92): State mutability already specified as "view".
+// ParserError 9680: (A:134-138): State mutability already specified as "pure".
+// ParserError 9680: (A:180-184): State mutability already specified as "pure".
+// ParserError 9680: (A:229-233): State mutability already specified as "payable".
+// ParserError 9680: (A:275-282): State mutability already specified as "pure".
+// ParserError 9680: (A:324-331): State mutability already specified as "view".
+// ParserError 9680: (A:376-380): State mutability already specified as "payable".
+// ParserError 9680: (A:422-426): State mutability already specified as "view".
+// ParserError 2314: (B:33-40): Expected identifier but got 'payable'
+// ParserError 2314: (C:45-52): Expected ',' but got 'payable'
+// ParserError 2314: (D:63-70): Expected ',' but got 'payable'
+// ParserError 2314: (E:64-71): Expected identifier but got 'payable'
+// ParserError 2314: (F:45-52): Expected ',' but got 'payable'
+// ParserError 2314: (G:63-70): Expected ',' but got 'payable'
+// ParserError 2314: (H:16-23): Expected identifier but got 'payable'
+// ParserError 2314: (I:44-51): Expected ',' but got 'payable'
+// ParserError 2314: (J:41-48): Expected ',' but got 'payable'
+// ParserError 2314: (K:42-49): Expected ',' but got 'payable'
+// ParserError 2314: (L:111-118): Expected ',' but got 'payable'
+// ParserError 2314: (M:144-151): Expected ',' but got 'payable'
+
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_statemutability_specifiers.sol b/test/libsolidity/syntaxTests/parsing/multiple_statemutability_specifiers.sol
deleted file mode 100644
index e2c56ae577..0000000000
--- a/test/libsolidity/syntaxTests/parsing/multiple_statemutability_specifiers.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-contract c1 {
-    function f() payable payable {}
-}
-contract c2 {
-    function f() view view {}
-}
-contract c3 {
-    function f() pure pure {}
-}
-contract c4 {
-    function f() pure view {}
-}
-contract c5 {
-    function f() payable view {}
-}
-contract c6 {
-    function f() pure payable {}
-}
-contract c7 {
-    function f() view payable {}
-}
-// ----
-// ParserError 9680: (39-46): State mutability already specified as "payable".
-// ParserError 9680: (88-92): State mutability already specified as "view".
-// ParserError 9680: (134-138): State mutability already specified as "pure".
-// ParserError 9680: (180-184): State mutability already specified as "pure".
-// ParserError 9680: (229-233): State mutability already specified as "payable".
-// ParserError 9680: (275-282): State mutability already specified as "pure".
-// ParserError 9680: (324-331): State mutability already specified as "view".
diff --git a/test/libsolidity/syntaxTests/parsing/multiple_visibility_specifiers.sol b/test/libsolidity/syntaxTests/parsing/multiple_visibility_specifiers.sol
deleted file mode 100644
index c04558171d..0000000000
--- a/test/libsolidity/syntaxTests/parsing/multiple_visibility_specifiers.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract C {
-    uint private internal a;
-    function f() private external {}
-}
-// ----
-// ParserError 4110: (30-38): Visibility already specified as "private".
-// ParserError 9439: (67-75): Visibility already specified as "private".
diff --git a/test/libsolidity/syntaxTests/parsing/payable_accessor.sol b/test/libsolidity/syntaxTests/parsing/payable_accessor.sol
deleted file mode 100644
index 4df1b18df8..0000000000
--- a/test/libsolidity/syntaxTests/parsing/payable_accessor.sol
+++ /dev/null
@@ -1,5 +0,0 @@
-contract test {
-	uint payable x;
-}
-// ----
-// ParserError 9106: (22-29): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_multiple_experimental.sol b/test/libsolidity/syntaxTests/pragma/experimental_multiple_experimental.sol
new file mode 100644
index 0000000000..49fe597ec3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/experimental_multiple_experimental.sol
@@ -0,0 +1,4 @@
+pragma experimental experimental __test;
+// ----
+// SyntaxError 6022: (0-40): Stray arguments.
+
diff --git a/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_catch.sol b/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_catch.sol
new file mode 100644
index 0000000000..edb3c5301f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_catch.sol
@@ -0,0 +1,31 @@
+contract C {
+    function a() public pure {
+        try this.a() {} catch (string payable memory) {}
+    }
+    function c() public pure {
+        try this.c() {} catch (bytes payable memory) {}
+    }
+}
+contract C2 {
+    function a() public pure {
+        try this.a() {} catch (string view memory) {}
+    }
+    function c() public pure {
+        try this.c() {} catch (bytes view memory) {}
+    }
+}
+contract C3 {
+    function a() public pure {
+        try this.a() {} catch (string pure memory) {}
+    }
+    function c() public pure {
+        try this.c() {} catch (bytes pure memory) {}
+    }
+}
+// ----
+// ParserError 9106: (82-89): State mutability can only be specified for address types.
+// ParserError 9106: (175-182): State mutability can only be specified for address types.
+// ParserError 9106: (285-289): State mutability can only be specified for address types.
+// ParserError 9106: (375-379): State mutability can only be specified for address types.
+// ParserError 9106: (482-486): State mutability can only be specified for address types.
+// ParserError 9106: (572-576): State mutability can only be specified for address types.
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_try_returns.sol b/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_try_returns.sol
new file mode 100644
index 0000000000..bc16f19c7a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/elementary_non_address_state_mutability_try_returns.sol
@@ -0,0 +1,163 @@
+contract C {
+    function a() public pure returns (bool) {
+        try this.a() returns (bool payable res) {} catch {}
+    }
+    function b() public pure returns (string) {
+        try this.b() returns (string payable res) {} catch {}
+    }
+    function c() public pure returns (int) {
+        try this.c() returns (int payable res) {} catch {}
+    }
+    function d() public pure returns (int256) {
+        try this.d() returns (int256 payable res) {} catch {}
+    }
+    function e() public pure returns (uint) {
+        try this.e() returns (uint payable res) {} catch {}
+    }
+    function f() public pure returns (uint256) {
+        try this.f() returns (uint256 payable res) {} catch {}
+    }
+    function g() public pure returns (bytes1) {
+        try this.g() returns (bytes1 payable res) {} catch {}
+    }
+    function h() public pure returns (bytes) {
+        try this.h() returns (bytes payable res) {} catch {}
+    }
+    function i() public pure returns (bytes32) {
+        try this.i() returns (bytes32 payable res) {} catch {}
+    }
+    function j() public pure returns (fixed) {
+        try this.j() returns (fixed payable res) {} catch {}
+    }
+    function k() public pure returns (fixed80x80) {
+        try this.k() returns (fixed80x80 payable res) {} catch {}
+    }
+    function l() public pure returns (ufixed) {
+        try this.l() returns (ufixed payable res) {} catch {}
+    }
+    function m() public pure returns (ufixed80x80) {
+        try this.m() returns (ufixed80x80 payable res) {} catch {}
+    }
+}
+contract C1 {
+    function a() public pure returns (bool) {
+        try this.a() returns (bool view res) {} catch {}
+    }
+    function b() public pure returns (string) {
+        try this.b() returns (string view res) {} catch {}
+    }
+    function c() public pure returns (int) {
+        try this.c() returns (int view res) {} catch {}
+    }
+    function d() public pure returns (int256) {
+        try this.d() returns (int256 view res) {} catch {}
+    }
+    function e() public pure returns (uint) {
+        try this.e() returns (uint view res) {} catch {}
+    }
+    function f() public pure returns (uint256) {
+        try this.f() returns (uint256 view res) {} catch {}
+    }
+    function g() public pure returns (bytes1) {
+        try this.g() returns (bytes1 view res) {} catch {}
+    }
+    function h() public pure returns (bytes) {
+        try this.h() returns (bytes view res) {} catch {}
+    }
+    function i() public pure returns (bytes32) {
+        try this.i() returns (bytes32 view res) {} catch {}
+    }
+    function j() public pure returns (fixed) {
+        try this.j() returns (fixed view res) {} catch {}
+    }
+    function k() public pure returns (fixed80x80) {
+        try this.k() returns (fixed80x80 view res) {} catch {}
+    }
+    function l() public pure returns (ufixed) {
+        try this.l() returns (ufixed view res) {} catch {}
+    }
+    function m() public pure returns (ufixed80x80) {
+        try this.m() returns (ufixed80x80 view res) {} catch {}
+    }
+}
+contract C2 {
+    function a() public pure returns (bool) {
+        try this.a() returns (bool pure res) {} catch {}
+    }
+    function b() public pure returns (string) {
+        try this.b() returns (string pure res) {} catch {}
+    }
+    function c() public pure returns (int) {
+        try this.c() returns (int pure res) {} catch {}
+    }
+    function d() public pure returns (int256) {
+        try this.d() returns (int256 pure res) {} catch {}
+    }
+    function e() public pure returns (uint) {
+        try this.e() returns (uint pure res) {} catch {}
+    }
+    function f() public pure returns (uint256) {
+        try this.f() returns (uint256 pure res) {} catch {}
+    }
+    function g() public pure returns (bytes1) {
+        try this.g() returns (bytes1 pure res) {} catch {}
+    }
+    function h() public pure returns (bytes) {
+        try this.h() returns (bytes pure res) {} catch {}
+    }
+    function i() public pure returns (bytes32) {
+        try this.i() returns (bytes32 pure res) {} catch {}
+    }
+    function j() public pure returns (fixed) {
+        try this.j() returns (fixed pure res) {} catch {}
+    }
+    function k() public pure returns (fixed80x80) {
+        try this.k() returns (fixed80x80 pure res) {} catch {}
+    }
+    function l() public pure returns (ufixed) {
+        try this.l() returns (ufixed pure res) {} catch {}
+    }
+    function m() public pure returns (ufixed80x80) {
+        try this.m() returns (ufixed80x80 pure res) {} catch {}
+    }
+}
+// ----
+// ParserError 9106: (94-101): State mutability can only be specified for address types.
+// ParserError 9106: (210-217): State mutability can only be specified for address types.
+// ParserError 9106: (320-327): State mutability can only be specified for address types.
+// ParserError 9106: (436-443): State mutability can only be specified for address types.
+// ParserError 9106: (548-555): State mutability can only be specified for address types.
+// ParserError 9106: (666-673): State mutability can only be specified for address types.
+// ParserError 9106: (782-789): State mutability can only be specified for address types.
+// ParserError 9106: (896-903): State mutability can only be specified for address types.
+// ParserError 9106: (1014-1021): State mutability can only be specified for address types.
+// ParserError 9106: (1128-1135): State mutability can only be specified for address types.
+// ParserError 9106: (1252-1259): State mutability can only be specified for address types.
+// ParserError 9106: (1368-1375): State mutability can only be specified for address types.
+// ParserError 9106: (1494-1501): State mutability can only be specified for address types.
+// ParserError 9106: (1622-1626): State mutability can only be specified for address types.
+// ParserError 9106: (1735-1739): State mutability can only be specified for address types.
+// ParserError 9106: (1842-1846): State mutability can only be specified for address types.
+// ParserError 9106: (1955-1959): State mutability can only be specified for address types.
+// ParserError 9106: (2064-2068): State mutability can only be specified for address types.
+// ParserError 9106: (2179-2183): State mutability can only be specified for address types.
+// ParserError 9106: (2292-2296): State mutability can only be specified for address types.
+// ParserError 9106: (2403-2407): State mutability can only be specified for address types.
+// ParserError 9106: (2518-2522): State mutability can only be specified for address types.
+// ParserError 9106: (2629-2633): State mutability can only be specified for address types.
+// ParserError 9106: (2750-2754): State mutability can only be specified for address types.
+// ParserError 9106: (2863-2867): State mutability can only be specified for address types.
+// ParserError 9106: (2986-2990): State mutability can only be specified for address types.
+// ParserError 9106: (3111-3115): State mutability can only be specified for address types.
+// ParserError 9106: (3224-3228): State mutability can only be specified for address types.
+// ParserError 9106: (3331-3335): State mutability can only be specified for address types.
+// ParserError 9106: (3444-3448): State mutability can only be specified for address types.
+// ParserError 9106: (3553-3557): State mutability can only be specified for address types.
+// ParserError 9106: (3668-3672): State mutability can only be specified for address types.
+// ParserError 9106: (3781-3785): State mutability can only be specified for address types.
+// ParserError 9106: (3892-3896): State mutability can only be specified for address types.
+// ParserError 9106: (4007-4011): State mutability can only be specified for address types.
+// ParserError 9106: (4118-4122): State mutability can only be specified for address types.
+// ParserError 9106: (4239-4243): State mutability can only be specified for address types.
+// ParserError 9106: (4352-4356): State mutability can only be specified for address types.
+// ParserError 9106: (4475-4479): State mutability can only be specified for address types.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_calldata.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_calldata.sol
new file mode 100644
index 0000000000..d9302ef1f0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_calldata.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() public {
+        try this.f() {} catch (string calldata a) { }
+    }
+}
+// ----
+// TypeError 6651: (70-87): Data location must be "memory" for parameter in function, but "calldata" was given.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_storage.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_storage.sol
new file mode 100644
index 0000000000..066b1ebfe9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/invalid_catch_parameter_location_storage.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() public {
+        try this.f() {} catch (string storage a) { }
+    }
+}
+// ----
+// TypeError 6651: (70-86): Data location must be "memory" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_var_location.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_var_location.sol
new file mode 100644
index 0000000000..c9980026f5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_var_location.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() public returns (string memory) {
+        try this.f() returns (string storage a) {} catch { }
+    }
+}
+// ----
+// TypeError 6651: (93-109): Data location must be "memory" for parameter in function, but "storage" was given.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_indexed.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_indexed.sol
new file mode 100644
index 0000000000..43e04583ac
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_indexed.sol
@@ -0,0 +1,27 @@
+==== Source: A ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint indexed a) {
+        } catch { }
+    }
+}
+==== Source: E ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint) {
+        } catch Error(string memory indexed x) {
+        }
+    }
+}
+==== Source: I ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint) {
+        } catch (bytes memory indexed x) {
+        }
+    }
+}
+// ----
+// ParserError 2314: (A:89-96): Expected ',' but got 'indexed'
+// ParserError 2314: (E:128-135): Expected ',' but got 'indexed'
+// ParserError 2314: (I:122-129): Expected ',' but got 'indexed'
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_mutability.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_mutability.sol
new file mode 100644
index 0000000000..bbc267f899
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_mutability.sol
@@ -0,0 +1,30 @@
+contract C {
+    function f() public returns (uint, uint) {
+        try this.f() returns (uint constant a, uint immutable b) {
+        } catch Error(string memory immutable x) {
+            x;
+        }
+
+        try this.f() returns (uint a, uint b) {
+        } catch (bytes memory immutable x) {
+            x;
+        }
+
+        try this.f() returns (uint a, uint b) {
+        } catch Error(string memory constant x) {
+            x;
+        }
+
+        try this.f() returns (uint a, uint b) {
+        } catch (bytes memory constant x) {
+            x;
+        }
+    }
+}
+// ----
+// DeclarationError 1788: (90-105): The "constant" keyword can only be used for state variables or variables at file level.
+// DeclarationError 8297: (107-123): The "immutable" keyword can only be used for state variables.
+// DeclarationError 8297: (149-174): The "immutable" keyword can only be used for state variables.
+// DeclarationError 8297: (269-293): The "immutable" keyword can only be used for state variables.
+// DeclarationError 1788: (393-417): The "constant" keyword can only be used for state variables or variables at file level.
+// DeclarationError 1788: (512-535): The "constant" keyword can only be used for state variables or variables at file level.
diff --git a/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_visibility.sol b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_visibility.sol
new file mode 100644
index 0000000000..1828f25d3c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/invalid_returns_vars_and_catch_parameter_visibility.sol
@@ -0,0 +1,105 @@
+==== Source: A ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint public a) {
+        } catch { }
+    }
+}
+==== Source: B ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint private a) {
+        } catch { }
+    }
+}
+==== Source: C ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint external a) {
+        } catch { }
+    }
+}
+==== Source: D ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint internal a) {
+        } catch { }
+    }
+}
+==== Source: E ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint) {
+        } catch Error(string memory public x) {
+        }
+    }
+}
+==== Source: F ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint) {
+        } catch Error(string memory private x) {
+        }
+    }
+}
+==== Source: G ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint) {
+        } catch Error(string memory external x) {
+        }
+    }
+}
+==== Source: H ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint) {
+        } catch Error(string memory internal x) {
+        }
+    }
+}
+==== Source: I ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint) {
+        } catch (bytes memory public x) {
+        }
+    }
+}
+==== Source: J ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint) {
+        } catch (bytes memory private x) {
+        }
+    }
+}
+==== Source: K ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint) {
+        } catch (bytes memory external x) {
+        }
+    }
+}
+==== Source: L ====
+contract C {
+    function f() public returns (uint) {
+        try this.f() returns (uint) {
+        } catch (bytes memory internal x) {
+        }
+    }
+}
+// ----
+// ParserError 2314: (A:89-95): Expected ',' but got 'public'
+// ParserError 2314: (B:89-96): Expected ',' but got 'private'
+// ParserError 2314: (C:89-97): Expected ',' but got 'external'
+// ParserError 2314: (D:89-97): Expected ',' but got 'internal'
+// ParserError 2314: (E:128-134): Expected ',' but got 'public'
+// ParserError 2314: (F:128-135): Expected ',' but got 'private'
+// ParserError 2314: (G:128-136): Expected ',' but got 'external'
+// ParserError 2314: (H:128-136): Expected ',' but got 'internal'
+// ParserError 2314: (I:122-128): Expected ',' but got 'public'
+// ParserError 2314: (J:122-129): Expected ',' but got 'private'
+// ParserError 2314: (K:122-130): Expected ',' but got 'external'
+// ParserError 2314: (L:122-130): Expected ',' but got 'internal'
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/tryCatch/multiple_returns_vars_and_catch_parameter_location.sol b/test/libsolidity/syntaxTests/tryCatch/multiple_returns_vars_and_catch_parameter_location.sol
new file mode 100644
index 0000000000..88df3f5bad
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/multiple_returns_vars_and_catch_parameter_location.sol
@@ -0,0 +1,132 @@
+==== Source: A1 ====
+contract C {
+    function f() public returns (string memory) {
+        try this.f() returns (string memory memory a) { } catch { }
+    }
+}
+==== Source: A2 ====
+contract C {
+    function f() public returns (string memory) {
+        try this.f() returns (string memory storage a) { } catch { }
+    }
+}
+==== Source: A3 ====
+contract C {
+    function f() public returns (string memory) {
+        try this.f() returns (string memory calldata a) { } catch { }
+    }
+}
+
+==== Source: B1 ====
+contract C {
+    function f() public returns (string memory) {
+        try this.f() returns (string calldata memory a) { } catch { }
+    }
+}
+==== Source: B2 ====
+contract C {
+    function f() public returns (string memory) {
+        try this.f() returns (string calldata storage a) { } catch { }
+    }
+}
+==== Source: B3 ====
+contract C {
+    function f() public returns (string memory) {
+        try this.f() returns (string calldata calldata a) { } catch { }
+    }
+}
+
+==== Source: C1 ====
+contract C {
+    function f() public returns (string memory) {
+        try this.f() returns (string storage memory a) { } catch { }
+    }
+}
+==== Source: C2 ====
+contract C {
+    function f() public returns (string memory) {
+        try this.f() returns (string storage storage a) { } catch { }
+    }
+}
+==== Source: C3 ====
+contract C {
+    function f() public returns (string memory) {
+        try this.f() returns (string storage calldata a) { } catch { }
+    }
+}
+
+==== Source: D1 ====
+contract C {
+    function f() public {
+        try this.f() {}  catch (string memory memory x) { }
+    }
+}
+==== Source: D2 ====
+contract C {
+    function f() public {
+        try this.f() {}  catch (string memory calldata x) { }
+    }
+}
+==== Source: D3 ====
+contract C {
+    function f() public {
+        try this.f() {}  catch (string memory storage x) { }
+    }
+}
+
+==== Source: E1 ====
+contract C {
+    function f() public {
+        try this.f() {}  catch (string calldata memory x) { }
+    }
+}
+==== Source: E2 ====
+contract C {
+    function f() public {
+        try this.f() {}  catch (string calldata calldata x) { }
+    }
+}
+==== Source: E3 ====
+contract C {
+    function f() public {
+        try this.f() {}  catch (string calldata storage x) { }
+    }
+}
+
+==== Source: G1 ====
+contract C {
+    function f() public {
+        try this.f() {}  catch (string storage memory x) { }
+    }
+}
+==== Source: G2 ====
+contract C {
+    function f() public {
+        try this.f() {}  catch (string storage calldata x) { }
+    }
+}
+==== Source: G3 ====
+contract C {
+    function f() public {
+        try this.f() {}  catch (string storage storage x) { }
+    }
+}
+// ----
+// ParserError 3548: (A1:107-113): Location already specified.
+// ParserError 3548: (A2:107-114): Location already specified.
+// ParserError 3548: (A3:107-115): Location already specified.
+// ParserError 3548: (B1:109-115): Location already specified.
+// ParserError 3548: (B2:109-116): Location already specified.
+// ParserError 3548: (B3:109-117): Location already specified.
+// ParserError 3548: (C1:108-114): Location already specified.
+// ParserError 3548: (C2:108-115): Location already specified.
+// ParserError 3548: (C3:108-116): Location already specified.
+// ParserError 3548: (D1:85-91): Location already specified.
+// ParserError 3548: (D2:85-93): Location already specified.
+// ParserError 3548: (D3:85-92): Location already specified.
+// ParserError 3548: (E1:87-93): Location already specified.
+// ParserError 3548: (E2:87-95): Location already specified.
+// ParserError 3548: (E3:87-94): Location already specified.
+// ParserError 3548: (G1:86-92): Location already specified.
+// ParserError 3548: (G2:86-94): Location already specified.
+// ParserError 3548: (G3:86-93): Location already specified.
diff --git a/test/libsolidity/syntaxTests/using/global_multiple_global_keywords.sol b/test/libsolidity/syntaxTests/using/global_multiple_global_keywords.sol
new file mode 100644
index 0000000000..48ce7f1119
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/global_multiple_global_keywords.sol
@@ -0,0 +1,5 @@
+using {f} for S global global;
+struct S { uint x; }
+function f(S memory _x) pure returns (uint) { return _x.x; }
+// ----
+// ParserError 2314: (23-29): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/visibility/file_level_variable_visibility.sol b/test/libsolidity/syntaxTests/visibility/file_level_variable_visibility.sol
new file mode 100644
index 0000000000..3de9f3ae23
--- /dev/null
+++ b/test/libsolidity/syntaxTests/visibility/file_level_variable_visibility.sol
@@ -0,0 +1,13 @@
+==== Source: A ====
+uint external a;
+==== Source: B ====
+uint internal a;
+==== Source: C ====
+uint public a;
+==== Source: D ====
+uint private a;
+// ----
+// ParserError 2314: (A:5-13): Expected identifier but got 'external'
+// ParserError 2314: (B:5-13): Expected identifier but got 'internal'
+// ParserError 2314: (C:5-11): Expected identifier but got 'public'
+// ParserError 2314: (D:5-12): Expected identifier but got 'private'
diff --git a/test/libsolidity/syntaxTests/visibility/invalid_function_parameter_and_return_var_visibility.sol b/test/libsolidity/syntaxTests/visibility/invalid_function_parameter_and_return_var_visibility.sol
new file mode 100644
index 0000000000..4f73e884d9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/visibility/invalid_function_parameter_and_return_var_visibility.sol
@@ -0,0 +1,41 @@
+==== Source: A ====
+contract test {
+    function f(uint external a) public returns (uint) { }
+}
+==== Source: B ====
+contract test {
+    function f(uint internal a) public returns (uint) { }
+}
+==== Source: C ====
+contract test {
+    function f(uint public a) public returns (uint) { }
+}
+==== Source: D ====
+contract test {
+    function f(uint private a) public returns (uint) { }
+}
+==== Source: E ====
+contract test {
+    function f(uint a) public returns (uint external) { }
+}
+==== Source: F ====
+contract test {
+    function f(uint a) public returns (uint internal) { }
+}
+==== Source: G ====
+contract test {
+    function f(uint a) public returns (uint public) { }
+}
+==== Source: H ====
+contract test {
+    function f(uint a) public returns (uint private) { }
+}
+// ----
+// ParserError 2314: (A:36-44): Expected ',' but got 'external'
+// ParserError 2314: (B:36-44): Expected ',' but got 'internal'
+// ParserError 2314: (C:36-42): Expected ',' but got 'public'
+// ParserError 2314: (D:36-43): Expected ',' but got 'private'
+// ParserError 2314: (E:60-68): Expected ',' but got 'external'
+// ParserError 2314: (F:60-68): Expected ',' but got 'internal'
+// ParserError 2314: (G:60-66): Expected ',' but got 'public'
+// ParserError 2314: (H:60-67): Expected ',' but got 'private'
diff --git a/test/libsolidity/syntaxTests/visibility/invalid_variable_visibility.sol b/test/libsolidity/syntaxTests/visibility/invalid_variable_visibility.sol
new file mode 100644
index 0000000000..4fc73dfbe1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/visibility/invalid_variable_visibility.sol
@@ -0,0 +1,29 @@
+==== Source: A ====
+contract test {
+    function f(uint a) public {
+        uint public a;
+    }
+}
+==== Source: B ====
+contract test {
+    function f(uint a) public {
+        uint private a;
+    }
+}
+==== Source: C ====
+contract test {
+    function f(uint a) public {
+        uint external a;
+    }
+}
+==== Source: D ====
+contract test {
+    function f(uint a) public {
+        uint internal a;
+    }
+}
+// ----
+// ParserError 2314: (A:61-67): Expected ';' but got 'public'
+// ParserError 2314: (B:61-68): Expected ';' but got 'private'
+// ParserError 2314: (C:61-69): Expected ';' but got 'external'
+// ParserError 2314: (D:61-69): Expected ';' but got 'internal'
diff --git a/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers.sol b/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers.sol
new file mode 100644
index 0000000000..5f3d6d6876
--- /dev/null
+++ b/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers.sol
@@ -0,0 +1,53 @@
+contract C {
+    uint private internal a;
+    uint private public b;
+    uint private private c;
+    uint internal internal e;
+    uint internal public f;
+    uint internal private g;
+    uint public internal h;
+    uint public public i;
+    uint public private j;
+    function f1() private external {}
+    function f2() private internal {}
+    function f3() private public {}
+    function f4() private private {}
+    function f5() external external {}
+    function f6() external internal {}
+    function f7() external public {}
+    function f8() external private {}
+    function f9() internal external {}
+    function f10() internal internal {}
+    function f11() internal public {}
+    function f12() internal private {}
+    function f13() public external {}
+    function f14() public internal {}
+    function f15() public public {}
+    function f16() public private {}
+}
+// ----
+// ParserError 4110: (30-38): Visibility already specified as "private".
+// ParserError 4110: (59-65): Visibility already specified as "private".
+// ParserError 4110: (86-93): Visibility already specified as "private".
+// ParserError 4110: (115-123): Visibility already specified as "internal".
+// ParserError 4110: (145-151): Visibility already specified as "internal".
+// ParserError 4110: (173-180): Visibility already specified as "internal".
+// ParserError 4110: (200-208): Visibility already specified as "public".
+// ParserError 4110: (228-234): Visibility already specified as "public".
+// ParserError 4110: (254-261): Visibility already specified as "public".
+// ParserError 9439: (291-299): Visibility already specified as "private".
+// ParserError 9439: (329-337): Visibility already specified as "private".
+// ParserError 9439: (367-373): Visibility already specified as "private".
+// ParserError 9439: (403-410): Visibility already specified as "private".
+// ParserError 9439: (441-449): Visibility already specified as "external".
+// ParserError 9439: (480-488): Visibility already specified as "external".
+// ParserError 9439: (519-525): Visibility already specified as "external".
+// ParserError 9439: (556-563): Visibility already specified as "external".
+// ParserError 9439: (594-602): Visibility already specified as "internal".
+// ParserError 9439: (634-642): Visibility already specified as "internal".
+// ParserError 9439: (674-680): Visibility already specified as "internal".
+// ParserError 9439: (712-719): Visibility already specified as "internal".
+// ParserError 9439: (749-757): Visibility already specified as "public".
+// ParserError 9439: (787-795): Visibility already specified as "public".
+// ParserError 9439: (825-831): Visibility already specified as "public".
+// ParserError 9439: (861-868): Visibility already specified as "public".
diff --git a/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers_external.sol b/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers_external.sol
new file mode 100644
index 0000000000..b543e10a4f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/visibility/multiple_visibility_specifiers_external.sol
@@ -0,0 +1,16 @@
+==== Source: A ====
+contract C {
+    uint external external x;
+}
+==== Source: B ====
+contract C {
+    uint internal external x;
+}
+==== Source: C ====
+contract C {
+    uint external internal x;
+}
+// ----
+// ParserError 2314: (A:22-30): Expected identifier but got 'external'
+// ParserError 2314: (B:31-39): Expected identifier but got 'external'
+// ParserError 2314: (C:22-30): Expected identifier but got 'external'

From ef6ff2f05550e4386f2fec7753a44fe39a124488 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 23 Nov 2022 11:51:34 +0100
Subject: [PATCH 1125/1748] Adds support for the EVM version "Paris".
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Deprecates `block.difficulty` and disallow `difficulty()` in inline assembly for EVM versions >= paris.
The change is due to the renaming introduced by EIP-4399 (see: https://eips.ethereum.org/EIPS/eip-4399).
Introduces `block.prevrandao` in Solidity and `prevrandao()` in inline assembly for EVM versions >= paris.

Co-authored-by: Alex Beregszaszi <alex@rtfs.hu>
Co-authored-by: Daniel <daniel@ekpyron.org>
Co-authored-by: matheusaaguiar <95899911+matheusaaguiar@users.noreply.github.com>
Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
---
 Changelog.md                                  |  4 +-
 docs/cheatsheet.rst                           |  5 +-
 docs/grammar/SolidityLexer.g4                 |  4 +-
 docs/units-and-global-variables.rst           |  7 +-
 docs/yul.rst                                  | 12 ++-
 libevmasm/Assembly.cpp                        |  2 +-
 libevmasm/Assembly.h                          |  5 +-
 libevmasm/AssemblyItem.cpp                    | 17 +++--
 libevmasm/AssemblyItem.h                      |  3 +-
 libevmasm/CommonSubexpressionEliminator.cpp   |  4 +-
 libevmasm/ConstantOptimiser.cpp               | 12 +--
 libevmasm/ConstantOptimiser.h                 |  2 +-
 libevmasm/Disassemble.cpp                     |  9 ++-
 libevmasm/Disassemble.h                       |  4 +-
 libevmasm/GasMeter.cpp                        | 24 +++---
 libevmasm/GasMeter.h                          |  3 +-
 libevmasm/Instruction.cpp                     | 10 ++-
 libevmasm/Instruction.h                       |  5 +-
 libevmasm/KnownState.cpp                      |  4 +-
 libevmasm/PeepholeOptimiser.cpp               | 73 +++++++++++++------
 libevmasm/SemanticInformation.cpp             | 10 +--
 libevmasm/SimplificationRule.h                |  2 +-
 libevmasm/SimplificationRules.cpp             |  3 +-
 liblangutil/EVMVersion.h                      |  1 +
 libsolidity/analysis/TypeChecker.cpp          | 39 +++++++---
 libsolidity/ast/Types.cpp                     |  1 +
 libsolidity/codegen/CompilerContext.h         |  2 +-
 libsolidity/codegen/ExpressionCompiler.cpp    |  4 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   |  9 ++-
 libsolidity/interface/StandardCompiler.cpp    |  6 +-
 libyul/AsmAnalysis.cpp                        |  4 +-
 libyul/CompilabilityChecker.cpp               |  2 +-
 libyul/YulStack.cpp                           |  2 +-
 libyul/backends/evm/AbstractAssembly.h        |  1 +
 libyul/backends/evm/EVMDialect.cpp            | 25 ++++++-
 libyul/backends/evm/EVMMetrics.cpp            |  6 +-
 libyul/backends/evm/EthAssemblyAdapter.cpp    |  2 +-
 libyul/backends/evm/NoOutputAssembly.cpp      |  2 +-
 libyul/backends/evm/NoOutputAssembly.h        |  3 +-
 libyul/backends/evm/StackLayoutGenerator.cpp  |  8 +-
 libyul/optimiser/ExpressionSimplifier.cpp     |  2 +-
 libyul/optimiser/KnowledgeBase.cpp            |  2 +-
 libyul/optimiser/Metrics.cpp                  |  3 +-
 libyul/optimiser/OptimizerUtilities.cpp       |  7 ++
 libyul/optimiser/OptimizerUtilities.h         |  5 ++
 libyul/optimiser/SimplificationRules.cpp      |  6 +-
 libyul/optimiser/SimplificationRules.h        |  2 +-
 scripts/check_style.sh                        |  3 +-
 scripts/test_antlr_grammar.sh                 |  3 +
 solc/CommandLineInterface.cpp                 |  6 +-
 .../evmasm_difficulty_post_paris/args         |  1 +
 .../evmasm_difficulty_post_paris/err          |  5 ++
 .../evmasm_difficulty_post_paris/input.sol    | 18 +++++
 .../evmasm_difficulty_post_paris/output       | 13 ++++
 .../evmasm_difficulty_pre_paris/args          |  1 +
 .../evmasm_difficulty_pre_paris/input.sol     | 18 +++++
 .../evmasm_difficulty_pre_paris/output        | 13 ++++
 .../evmasm_prevrandao_post_paris/args         |  1 +
 .../evmasm_prevrandao_post_paris/input.sol    | 18 +++++
 .../evmasm_prevrandao_post_paris/output       | 13 ++++
 .../evmasm_prevrandao_pre_paris/args          |  1 +
 .../evmasm_prevrandao_pre_paris/err           |  5 ++
 .../evmasm_prevrandao_pre_paris/input.sol     | 18 +++++
 .../evmasm_prevrandao_pre_paris/output        | 13 ++++
 test/libevmasm/Assembler.cpp                  | 27 ++++---
 test/libevmasm/Optimiser.cpp                  | 24 +++---
 test/libsolidity/SolidityOptimizer.cpp        |  6 +-
 .../analysis/FunctionCallGraph.cpp            |  1 +
 .../inlineAssembly/difficulty.sol             | 12 +++
 .../inlineAssembly/prevrandao.sol             | 12 +++
 .../semanticTests/state/block_prevrandao.sol  | 10 +++
 .../state/block_prevrandao_pre_paris.sol      | 10 +++
 .../difficulty_builtin_pre_paris.sol          | 14 ++++
 ...fficulty_disallowed_function_pre_paris.sol | 21 ++++++
 ...difficulty_magic_block_warn_post_paris.sol |  9 +++
 .../difficulty_nobuiltin_post_paris.sol       | 12 +++
 .../difficulty_reserved_post_paris.sol        | 22 ++++++
 .../prevrandao_allowed_function_pre_paris.sol | 20 +++++
 .../prevrandao_builtin_post_paris.sol         | 14 ++++
 ...vrandao_disallowed_function_post_paris.sol | 21 ++++++
 .../prevrandao_magic_block_warn_pre_paris.sol |  9 +++
 .../prevrandao_nobuitin_pre_paris.sol         | 12 +++
 ...-byzantium.sol => low_level_homestead.sol} |  2 +-
 .../tryCatch/low_level_spuriousDragon.sol     | 13 ++++
 .../tryCatch/low_level_tangerineWhistle.sol   | 13 ++++
 ...byzantium.sol => structured_homestead.sol} |  2 +-
 .../tryCatch/structured_spuriousDragon.sol    | 13 ++++
 .../tryCatch/structured_tangerineWhistle.sol  | 13 ++++
 .../types/magic_block_istanbul.sol            |  7 +-
 .../syntaxTests/types/magic_block_paris.sol   | 13 ++++
 .../inline_assembly_instructions_allowed.sol  |  4 +-
 ...e_assembly_instructions_allowed_london.sol | 11 +++
 ...ine_assembly_instructions_allowed_pure.sol |  1 -
 ...ine_assembly_instructions_allowed_view.sol |  4 +-
 ...embly_instructions_allowed_view_london.sol | 10 +++
 ..._assembly_instructions_disallowed_pure.sol | 60 ++++++---------
 ...instructions_disallowed_pure_byzantium.sol | 11 +++
 ...uctions_disallowed_pure_constantinople.sol | 13 ++++
 ..._instructions_disallowed_pure_istanbul.sol | 13 ++++
 ...ly_instructions_disallowed_pure_london.sol | 11 +++
 ...bly_instructions_disallowed_pure_paris.sol | 11 +++
 ...instructions_disallowed_pure_pre_paris.sol | 11 +++
 test/libyul/EVMCodeTransformTest.cpp          |  4 +-
 test/libyul/ObjectCompilerTest.cpp            |  4 +-
 test/libyul/YulInterpreterTest.cpp            |  2 +-
 .../ewasmTranslationTests/difficulty.yul      |  2 +
 .../libyul/yulInterpreterTests/difficulty.yul | 10 +++
 .../libyul/yulInterpreterTests/prevrandao.yul | 10 +++
 test/tools/fuzzer_common.cpp                  |  2 +-
 .../EVMInstructionInterpreter.cpp             |  8 +-
 .../EVMInstructionInterpreter.h               |  6 +-
 .../EwasmBuiltinInterpreter.cpp               |  2 +-
 test/tools/yulInterpreter/Interpreter.cpp     |  2 +-
 test/tools/yulInterpreter/Interpreter.h       |  1 +
 114 files changed, 842 insertions(+), 221 deletions(-)
 create mode 100644 test/cmdlineTests/evmasm_difficulty_post_paris/args
 create mode 100644 test/cmdlineTests/evmasm_difficulty_post_paris/err
 create mode 100644 test/cmdlineTests/evmasm_difficulty_post_paris/input.sol
 create mode 100644 test/cmdlineTests/evmasm_difficulty_post_paris/output
 create mode 100644 test/cmdlineTests/evmasm_difficulty_pre_paris/args
 create mode 100644 test/cmdlineTests/evmasm_difficulty_pre_paris/input.sol
 create mode 100644 test/cmdlineTests/evmasm_difficulty_pre_paris/output
 create mode 100644 test/cmdlineTests/evmasm_prevrandao_post_paris/args
 create mode 100644 test/cmdlineTests/evmasm_prevrandao_post_paris/input.sol
 create mode 100644 test/cmdlineTests/evmasm_prevrandao_post_paris/output
 create mode 100644 test/cmdlineTests/evmasm_prevrandao_pre_paris/args
 create mode 100644 test/cmdlineTests/evmasm_prevrandao_pre_paris/err
 create mode 100644 test/cmdlineTests/evmasm_prevrandao_pre_paris/input.sol
 create mode 100644 test/cmdlineTests/evmasm_prevrandao_pre_paris/output
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/difficulty.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol
 create mode 100644 test/libsolidity/semanticTests/state/block_prevrandao.sol
 create mode 100644 test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/difficulty_builtin_pre_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/difficulty_disallowed_function_pre_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/difficulty_magic_block_warn_post_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/difficulty_nobuiltin_post_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/difficulty_reserved_post_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/prevrandao_allowed_function_pre_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/prevrandao_builtin_post_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/prevrandao_disallowed_function_post_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/prevrandao_magic_block_warn_pre_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/prevrandao_nobuitin_pre_paris.sol
 rename test/libsolidity/syntaxTests/tryCatch/{low_level_pre-byzantium.sol => low_level_homestead.sol} (92%)
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/low_level_spuriousDragon.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/low_level_tangerineWhistle.sol
 rename test/libsolidity/syntaxTests/tryCatch/{structured_pre_byzantium.sol => structured_homestead.sol} (92%)
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/structured_spuriousDragon.sol
 create mode 100644 test/libsolidity/syntaxTests/tryCatch/structured_tangerineWhistle.sol
 create mode 100644 test/libsolidity/syntaxTests/types/magic_block_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_london.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_london.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_byzantium.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_constantinople.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_istanbul.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_london.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_pre_paris.sol
 create mode 100644 test/libyul/yulInterpreterTests/difficulty.yul
 create mode 100644 test/libyul/yulInterpreterTests/prevrandao.yul

diff --git a/Changelog.md b/Changelog.md
index 2877bbf8c5..251144b378 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,7 +7,9 @@ Language Features:
 Compiler Features:
  * Commandline Interface: Return exit code ``2`` on uncaught exceptions.
  * Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
- * EVM: Basic support for the EVM version "Paris".
+ * EVM: Deprecate ``block.difficulty`` and disallow ``difficulty()`` in inline assembly for EVM versions >= paris. The change is due to the renaming introduced by [EIP-4399](https://eips.ethereum.org/EIPS/eip-4399).
+ * EVM: Introduce ``block.prevrandao`` in Solidity and ``prevrandao()`` in inline assembly for EVM versions >= paris.
+ * EVM: Support for the EVM version "Paris".
  * Natspec: Add event Natspec inheritance for devdoc.
  * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
  * Yul EVM Code Transform: Generate more optimal code for user-defined functions that always terminate a transaction. No return labels will be pushed for calls to functions that always terminate.
diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index 412678953e..5d8e6ede76 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -8,7 +8,7 @@ Order of Precedence of Operators
 ================================
 .. include:: types/operator-precedence-table.rst
 
-.. index:: assert, block, coinbase, difficulty, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, gas price, origin, revert, require, keccak256, ripemd160, sha256, ecrecover, addmod, mulmod, cryptography, this, super, selfdestruct, balance, codehash, send
+.. index:: assert, block, coinbase, difficulty, prevrandao, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, gas price, origin, revert, require, keccak256, ripemd160, sha256, ecrecover, addmod, mulmod, cryptography, this, super, selfdestruct, balance, codehash, send
 
 Global Variables
 ================
@@ -32,9 +32,10 @@ Global Variables
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)
 - ``block.chainid`` (``uint``): current chain id
 - ``block.coinbase`` (``address payable``): current block miner's address
-- ``block.difficulty`` (``uint``): current block difficulty
+- ``block.difficulty`` (``uint``): current block difficulty (``EVM < Paris``). For other EVM versions it behaves as a deprecated alias for ``block.prevrandao`` that will be removed in the next breaking release
 - ``block.gaslimit`` (``uint``): current block gaslimit
 - ``block.number`` (``uint``): current block number
+- ``block.prevrandao`` (``uint``): random number provided by the beacon chain (``EVM >= Paris``) (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_ )
 - ``block.timestamp`` (``uint``): current block timestamp in seconds since Unix epoch
 - ``gasleft() returns (uint256)``: remaining gas
 - ``msg.data`` (``bytes``): complete calldata
diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index c47dc411cd..b0dfca0c47 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -291,8 +291,8 @@ YulEVMBuiltin:
 	| 'returndatacopy' | 'extcodehash' | 'create' | 'create2' | 'call' | 'callcode'
 	| 'delegatecall' | 'staticcall' | 'return' | 'revert' | 'selfdestruct' | 'invalid'
 	| 'log0' | 'log1' | 'log2' | 'log3' | 'log4' | 'chainid' | 'origin' | 'gasprice'
-	| 'blockhash' | 'coinbase' | 'timestamp' | 'number' | 'difficulty' | 'gaslimit'
-	| 'basefee';
+	| 'blockhash' | 'coinbase' | 'timestamp' | 'number' | 'difficulty' | 'prevrandao'
+	| 'gaslimit' | 'basefee';
 
 YulLBrace: '{' -> pushMode(YulMode);
 YulRBrace: '}' -> popMode;
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index cf4fb2bd7c..6e49665907 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -65,7 +65,7 @@ There are special variables and functions which always exist in the global
 namespace and are mainly used to provide information about the blockchain
 or are general-use utility functions.
 
-.. index:: abi, block, coinbase, difficulty, encode, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, gas price, origin
+.. index:: abi, block, coinbase, difficulty, prevrandao, encode, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, gas price, origin
 
 
 Block and Transaction Properties
@@ -75,9 +75,10 @@ Block and Transaction Properties
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)
 - ``block.chainid`` (``uint``): current chain id
 - ``block.coinbase`` (``address payable``): current block miner's address
-- ``block.difficulty`` (``uint``): current block difficulty
+- ``block.difficulty`` (``uint``): current block difficulty (``EVM < Paris``). For other EVM versions it behaves as a deprecated alias for ``block.prevrandao`` (`EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_ )
 - ``block.gaslimit`` (``uint``): current block gaslimit
 - ``block.number`` (``uint``): current block number
+- ``block.prevrandao`` (``uint``): random number provided by the beacon chain (``EVM >= Paris``)
 - ``block.timestamp`` (``uint``): current block timestamp as seconds since unix epoch
 - ``gasleft() returns (uint256)``: remaining gas
 - ``msg.data`` (``bytes calldata``): complete calldata
@@ -394,4 +395,4 @@ These keywords are reserved in Solidity. They might become part of the syntax in
 ``define``, ``final``, ``implements``, ``in``, ``inline``, ``let``, ``macro``, ``match``,
 ``mutable``, ``null``, ``of``, ``partial``, ``promise``, ``reference``, ``relocatable``,
 ``sealed``, ``sizeof``, ``static``, ``supports``, ``switch``, ``typedef``, ``typeof``,
-``var``.
\ No newline at end of file
+``var``.
diff --git a/docs/yul.rst b/docs/yul.rst
index 8ae454b2e0..206f80cace 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -751,8 +751,8 @@ This document does not want to be a full description of the Ethereum virtual mac
 Please refer to a different document if you are interested in the precise semantics.
 
 Opcodes marked with ``-`` do not return a result and all others return exactly one value.
-Opcodes marked with ``F``, ``H``, ``B``, ``C``, ``I`` and ``L`` are present since Frontier, Homestead,
-Byzantium, Constantinople, Istanbul or London respectively.
+Opcodes marked with ``F``, ``H``, ``B``, ``C``, ``I``, ``L`` and ``P`` are present since Frontier,
+Homestead, Byzantium, Constantinople, Istanbul, London or Paris respectively.
 
 In the following, ``mem[a...b)`` signifies the bytes of memory starting at position ``a`` up to
 but not including position ``b`` and ``storage[p]`` signifies the storage contents at slot ``p``.
@@ -931,6 +931,8 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | difficulty()            |     | F | difficulty of the current block (see note below)                |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+| prevrandao()            |     | P | randomness provided by the beacon chain (see note below)        |
++-------------------------+-----+---+-----------------------------------------------------------------+
 | gaslimit()              |     | F | block gas limit of the current block                            |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 
@@ -945,8 +947,10 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
   The remaining bytes will retain their values as of before the call.
 
 .. note::
-  With the Paris network upgrade the semantics of ``difficulty`` have been changed.
-  It returns the value of ``prevrandao``, which is a 256-bit value, whereas the highest recorded
+  The `difficulty()` instruction is disallowed in EVM version >= Paris.
+  With the Paris network upgrade the semantics of the instruction that was previously called
+  ``difficulty`` have been changed and the instruction was renamed to ``prevrandao``.
+  It can now return arbitrary values in the full 256-bit range, whereas the highest recorded
   difficulty value within Ethash was ~54 bits.
   This change is described in `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_.
   Please note that irrelevant to which EVM version is selected in the compiler, the semantics of
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 5b6e2a86f3..f596f63038 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -237,7 +237,7 @@ Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices,
 				sourceIndex = static_cast<int>(iter->second);
 		}
 
-		auto [name, data] = item.nameAndData();
+		auto [name, data] = item.nameAndData(m_evmVersion);
 		Json::Value jsonItem;
 		jsonItem["name"] = name;
 		jsonItem["begin"] = item.location().start;
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index 7b8b4509d8..bd37b3a7fd 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -49,7 +49,7 @@ using AssemblyPointer = std::shared_ptr<Assembly>;
 class Assembly
 {
 public:
-	Assembly(bool _creation, std::string _name): m_creation(_creation), m_name(std::move(_name)) { }
+	Assembly(langutil::EVMVersion _evmVersion, bool _creation, std::string _name): m_evmVersion(_evmVersion), m_creation(_creation), m_name(std::move(_name)) { }
 
 	AssemblyItem newTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(Tag, m_usedTags++); }
 	AssemblyItem newPushTag() { assertThrow(m_usedTags < 0xffffffff, AssemblyException, ""); return AssemblyItem(PushTag, m_usedTags++); }
@@ -112,6 +112,7 @@ class Assembly
 	/// Changes the source location used for each appended item.
 	void setSourceLocation(langutil::SourceLocation const& _location) { m_currentSourceLocation = _location; }
 	langutil::SourceLocation const& currentSourceLocation() const { return m_currentSourceLocation; }
+	langutil::EVMVersion const& evmVersion() const { return m_evmVersion; }
 
 	/// Assembles the assembly into bytecode. The assembly should not be modified after this call, since the assembled version is cached.
 	LinkerObject const& assemble() const;
@@ -208,6 +209,8 @@ class Assembly
 	mutable LinkerObject m_assembledObject;
 	mutable std::vector<size_t> m_tagPositionsInBytecode;
 
+	langutil::EVMVersion m_evmVersion;
+
 	int m_deposit = 0;
 	/// True, if the assembly contains contract creation code.
 	bool const m_creation = false;
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
index a36e0ddb1d..ce60c25161 100644
--- a/libevmasm/AssemblyItem.cpp
+++ b/libevmasm/AssemblyItem.cpp
@@ -69,12 +69,12 @@ pair<size_t, size_t> AssemblyItem::splitForeignPushTag() const
 	return make_pair(subId, tag);
 }
 
-pair<string, string> AssemblyItem::nameAndData() const
+pair<string, string> AssemblyItem::nameAndData(langutil::EVMVersion _evmVersion) const
 {
 	switch (type())
 	{
 	case Operation:
-		return {instructionInfo(instruction()).name, m_data != nullptr ? toStringInHex(*m_data) : ""};
+		return {instructionInfo(instruction(), _evmVersion).name, m_data != nullptr ? toStringInHex(*m_data) : ""};
 	case Push:
 		return {"PUSH", toStringInHex(data())};
 	case PushTag:
@@ -168,7 +168,9 @@ size_t AssemblyItem::bytesRequired(size_t _addressLength, Precision _precision)
 size_t AssemblyItem::arguments() const
 {
 	if (type() == Operation)
-		return static_cast<size_t>(instructionInfo(instruction()).args);
+		// The latest EVMVersion is used here, since the InstructionInfo is assumed to be
+		// the same across all EVM versions except for the instruction name.
+		return static_cast<size_t>(instructionInfo(instruction(), EVMVersion()).args);
 	else if (type() == VerbatimBytecode)
 		return get<0>(*m_verbatimBytecode);
 	else if (type() == AssignImmutable)
@@ -182,7 +184,9 @@ size_t AssemblyItem::returnValues() const
 	switch (m_type)
 	{
 	case Operation:
-		return static_cast<size_t>(instructionInfo(instruction()).ret);
+		// The latest EVMVersion is used here, since the InstructionInfo is assumed to be
+		// the same across all EVM versions except for the instruction name.
+		return static_cast<size_t>(instructionInfo(instruction(), EVMVersion()).ret);
 	case Push:
 	case PushTag:
 	case PushData:
@@ -251,7 +255,7 @@ string AssemblyItem::toAssemblyText(Assembly const& _assembly) const
 	case Operation:
 	{
 		assertThrow(isValidInstruction(instruction()), AssemblyException, "Invalid instruction.");
-		text = util::toLower(instructionInfo(instruction()).name);
+		text = util::toLower(instructionInfo(instruction(), _assembly.evmVersion()).name);
 		break;
 	}
 	case Push:
@@ -323,12 +327,13 @@ string AssemblyItem::toAssemblyText(Assembly const& _assembly) const
 	return text;
 }
 
+// Note: This method is exclusively used for debugging.
 ostream& solidity::evmasm::operator<<(ostream& _out, AssemblyItem const& _item)
 {
 	switch (_item.type())
 	{
 	case Operation:
-		_out << " " << instructionInfo(_item.instruction()).name;
+		_out << " " << instructionInfo(_item.instruction(), EVMVersion()).name;
 		if (_item.instruction() == Instruction::JUMP || _item.instruction() == Instruction::JUMPI)
 			_out << "\t" << _item.getJumpTypeAsString();
 		break;
diff --git a/libevmasm/AssemblyItem.h b/libevmasm/AssemblyItem.h
index 4aef82d8b2..077c1912d2 100644
--- a/libevmasm/AssemblyItem.h
+++ b/libevmasm/AssemblyItem.h
@@ -108,10 +108,11 @@ class AssemblyItem
 
 	/// This function is used in `Assembly::assemblyJSON`.
 	/// It returns the name & data of the current assembly item.
+	/// @param _evmVersion the EVM version.
 	/// @returns a pair, where the first element is the json-assembly
 	/// item name, where second element is the string representation
 	/// of it's data.
-	std::pair<std::string, std::string> nameAndData() const;
+	std::pair<std::string, std::string> nameAndData(langutil::EVMVersion _evmVersion) const;
 
 	bytes const& verbatimData() const { assertThrow(m_type == VerbatimBytecode, util::Exception, ""); return std::get<2>(*m_verbatimBytecode); }
 
diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
index 19b275cb6f..d097f3c725 100644
--- a/libevmasm/CommonSubexpressionEliminator.cpp
+++ b/libevmasm/CommonSubexpressionEliminator.cpp
@@ -406,7 +406,7 @@ void CSECodeGenerator::generateClassElement(Id _c, bool _allowSequenced)
 		m_stack.erase(m_stackHeight - static_cast<int>(i));
 	}
 	appendItem(*expr.item);
-	if (expr.item->type() != Operation || instructionInfo(expr.item->instruction()).ret == 1)
+	if (expr.item->type() != Operation || instructionInfo(expr.item->instruction(), EVMVersion()).ret == 1)
 	{
 		m_stack[m_stackHeight] = _c;
 		m_classPositions[_c].insert(m_stackHeight);
@@ -414,7 +414,7 @@ void CSECodeGenerator::generateClassElement(Id _c, bool _allowSequenced)
 	else
 	{
 		assertThrow(
-			instructionInfo(expr.item->instruction()).ret == 0,
+			instructionInfo(expr.item->instruction(), EVMVersion()).ret == 0,
 			OptimizerException,
 			"Invalid number of return values."
 		);
diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp
index 37ac4c18bd..5bce21cf1e 100644
--- a/libevmasm/ConstantOptimiser.cpp
+++ b/libevmasm/ConstantOptimiser.cpp
@@ -79,18 +79,18 @@ unsigned ConstantOptimisationMethod::optimiseConstants(
 	return optimisations;
 }
 
-bigint ConstantOptimisationMethod::simpleRunGas(AssemblyItems const& _items)
+bigint ConstantOptimisationMethod::simpleRunGas(AssemblyItems const& _items, langutil::EVMVersion _evmVersion)
 {
 	bigint gas = 0;
 	for (AssemblyItem const& item: _items)
 		if (item.type() == Push)
-			gas += GasMeter::runGas(Instruction::PUSH1);
+			gas += GasMeter::runGas(Instruction::PUSH1, _evmVersion);
 		else if (item.type() == Operation)
 		{
 			if (item.instruction() == Instruction::EXP)
 				gas += GasCosts::expGas;
 			else
-				gas += GasMeter::runGas(item.instruction());
+				gas += GasMeter::runGas(item.instruction(), _evmVersion);
 		}
 	return gas;
 }
@@ -131,7 +131,7 @@ void ConstantOptimisationMethod::replaceConstants(
 bigint LiteralMethod::gasNeeded() const
 {
 	return combineGas(
-		simpleRunGas({Instruction::PUSH1}),
+		simpleRunGas({Instruction::PUSH1}, m_params.evmVersion),
 		// PUSHX plus data
 		(m_params.isCreation ? GasCosts::txDataNonZeroGas(m_params.evmVersion) : GasCosts::createDataGas) + dataGas(toCompactBigEndian(m_value, 1)),
 		0
@@ -142,7 +142,7 @@ bigint CodeCopyMethod::gasNeeded() const
 {
 	return combineGas(
 		// Run gas: we ignore memory increase costs
-		simpleRunGas(copyRoutine()) + GasCosts::copyGas,
+		simpleRunGas(copyRoutine(), m_params.evmVersion) + GasCosts::copyGas,
 		// Data gas for copy routines: Some bytes are zero, but we ignore them.
 		bytesRequired(copyRoutine()) * (m_params.isCreation ? GasCosts::txDataNonZeroGas(m_params.evmVersion) : GasCosts::createDataGas),
 		// Data gas for data itself
@@ -322,7 +322,7 @@ bigint ComputeMethod::gasNeeded(AssemblyItems const& _routine) const
 {
 	auto numExps = static_cast<size_t>(count(_routine.begin(), _routine.end(), Instruction::EXP));
 	return combineGas(
-		simpleRunGas(_routine) + numExps * (GasCosts::expGas + GasCosts::expByteGas(m_params.evmVersion)),
+		simpleRunGas(_routine, m_params.evmVersion) + numExps * (GasCosts::expGas + GasCosts::expByteGas(m_params.evmVersion)),
 		// Data gas for routine: Some bytes are zero, but we ignore them.
 		bytesRequired(_routine) * (m_params.isCreation ? GasCosts::txDataNonZeroGas(m_params.evmVersion) : GasCosts::createDataGas),
 		0
diff --git a/libevmasm/ConstantOptimiser.h b/libevmasm/ConstantOptimiser.h
index ece28d2496..b491fb0042 100644
--- a/libevmasm/ConstantOptimiser.h
+++ b/libevmasm/ConstantOptimiser.h
@@ -76,7 +76,7 @@ class ConstantOptimisationMethod
 
 protected:
 	/// @returns the run gas for the given items ignoring special gas costs
-	static bigint simpleRunGas(AssemblyItems const& _items);
+	static bigint simpleRunGas(AssemblyItems const& _items, langutil::EVMVersion _evmVersion);
 	/// @returns the gas needed to store the given data literally
 	bigint dataGas(bytes const& _data) const;
 	static size_t bytesRequired(AssemblyItems const& _items);
diff --git a/libevmasm/Disassemble.cpp b/libevmasm/Disassemble.cpp
index aa5b2820c4..f1c904b699 100644
--- a/libevmasm/Disassemble.cpp
+++ b/libevmasm/Disassemble.cpp
@@ -30,6 +30,7 @@ using namespace solidity::evmasm;
 
 void solidity::evmasm::eachInstruction(
 	bytes const& _mem,
+	langutil::EVMVersion _evmVersion,
 	function<void(Instruction,u256 const&)> const& _onInstruction
 )
 {
@@ -38,7 +39,7 @@ void solidity::evmasm::eachInstruction(
 		Instruction const instr{*it};
 		int additional = 0;
 		if (isValidInstruction(instr))
-			additional = instructionInfo(instr).additional;
+			additional = instructionInfo(instr, _evmVersion).additional;
 
 		u256 data{};
 
@@ -57,15 +58,15 @@ void solidity::evmasm::eachInstruction(
 	}
 }
 
-string solidity::evmasm::disassemble(bytes const& _mem, string const& _delimiter)
+string solidity::evmasm::disassemble(bytes const& _mem, langutil::EVMVersion _evmVersion, string const& _delimiter)
 {
 	stringstream ret;
-	eachInstruction(_mem, [&](Instruction _instr, u256 const& _data) {
+	eachInstruction(_mem, _evmVersion, [&](Instruction _instr, u256 const& _data) {
 		if (!isValidInstruction(_instr))
 			ret << "0x" << std::uppercase << std::hex << static_cast<int>(_instr) << _delimiter;
 		else
 		{
-			InstructionInfo info = instructionInfo(_instr);
+			InstructionInfo info = instructionInfo(_instr, _evmVersion);
 			ret << info.name;
 			if (info.additional)
 				ret << " 0x" << std::uppercase << std::hex << _data;
diff --git a/libevmasm/Disassemble.h b/libevmasm/Disassemble.h
index cf194e24b7..2e03a5d35c 100644
--- a/libevmasm/Disassemble.h
+++ b/libevmasm/Disassemble.h
@@ -30,9 +30,9 @@ namespace solidity::evmasm
 {
 
 /// Iterate through EVM code and call a function on each instruction.
-void eachInstruction(bytes const& _mem, std::function<void(Instruction, u256 const&)> const& _onInstruction);
+void eachInstruction(bytes const& _mem, langutil::EVMVersion _evmVersion, std::function<void(Instruction, u256 const&)> const& _onInstruction);
 
 /// Convert from EVM code to simple EVM assembly language.
-std::string disassemble(bytes const& _mem, std::string const& _delimiter = " ");
+std::string disassemble(bytes const& _mem, langutil::EVMVersion _evmVersion, std::string const& _delimiter = " ");
 
 }
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
index d49ee98919..258f68b31f 100644
--- a/libevmasm/GasMeter.cpp
+++ b/libevmasm/GasMeter.cpp
@@ -52,10 +52,10 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _
 	case PushProgramSize:
 	case PushLibraryAddress:
 	case PushDeployTimeAddress:
-		gas = runGas(Instruction::PUSH1);
+		gas = runGas(Instruction::PUSH1, m_evmVersion);
 		break;
 	case Tag:
-		gas = runGas(Instruction::JUMPDEST);
+		gas = runGas(Instruction::JUMPDEST, m_evmVersion);
 		break;
 	case Operation:
 	{
@@ -80,19 +80,19 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _
 			break;
 		case Instruction::RETURN:
 		case Instruction::REVERT:
-			gas = runGas(_item.instruction());
+			gas = runGas(_item.instruction(), m_evmVersion);
 			gas += memoryGas(0, -1);
 			break;
 		case Instruction::MLOAD:
 		case Instruction::MSTORE:
-			gas = runGas(_item.instruction());
+			gas = runGas(_item.instruction(), m_evmVersion);
 			gas += memoryGas(classes.find(Instruction::ADD, {
 				m_state->relativeStackElement(0),
 				classes.find(AssemblyItem(32))
 			}));
 			break;
 		case Instruction::MSTORE8:
-			gas = runGas(_item.instruction());
+			gas = runGas(_item.instruction(), m_evmVersion);
 			gas += memoryGas(classes.find(Instruction::ADD, {
 				m_state->relativeStackElement(0),
 				classes.find(AssemblyItem(1))
@@ -106,7 +106,7 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _
 		case Instruction::CALLDATACOPY:
 		case Instruction::CODECOPY:
 		case Instruction::RETURNDATACOPY:
-			gas = runGas(_item.instruction());
+			gas = runGas(_item.instruction(), m_evmVersion);
 			gas += memoryGas(0, -2);
 			gas += wordGas(GasCosts::copyGas, m_state->relativeStackElement(-2));
 			break;
@@ -195,13 +195,13 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _
 			gas = GasCosts::balanceGas(m_evmVersion);
 			break;
 		case Instruction::CHAINID:
-			gas = runGas(Instruction::CHAINID);
+			gas = runGas(Instruction::CHAINID, m_evmVersion);
 			break;
 		case Instruction::SELFBALANCE:
-			gas = runGas(Instruction::SELFBALANCE);
+			gas = runGas(Instruction::SELFBALANCE, m_evmVersion);
 			break;
 		default:
-			gas = runGas(_item.instruction());
+			gas = runGas(_item.instruction(), m_evmVersion);
 			break;
 		}
 		break;
@@ -252,12 +252,12 @@ GasMeter::GasConsumption GasMeter::memoryGas(int _stackPosOffset, int _stackPosS
 		}));
 }
 
-unsigned GasMeter::runGas(Instruction _instruction)
+unsigned GasMeter::runGas(Instruction _instruction, langutil::EVMVersion _evmVersion)
 {
 	if (_instruction == Instruction::JUMPDEST)
 		return 1;
 
-	switch (instructionInfo(_instruction).gasPriceTier)
+	switch (instructionInfo(_instruction, _evmVersion).gasPriceTier)
 	{
 	case Tier::Zero:    return GasCosts::tier0Gas;
 	case Tier::Base:    return GasCosts::tier1Gas;
@@ -268,7 +268,7 @@ unsigned GasMeter::runGas(Instruction _instruction)
 	case Tier::Ext:     return GasCosts::tier6Gas;
 	default: break;
 	}
-	assertThrow(false, OptimizerException, "Invalid gas tier for instruction " + instructionInfo(_instruction).name);
+	assertThrow(false, OptimizerException, "Invalid gas tier for instruction " + instructionInfo(_instruction, _evmVersion).name);
 	return 0;
 }
 
diff --git a/libevmasm/GasMeter.h b/libevmasm/GasMeter.h
index 306fc02088..ec19466447 100644
--- a/libevmasm/GasMeter.h
+++ b/libevmasm/GasMeter.h
@@ -221,7 +221,7 @@ class GasMeter
 
 	/// @returns gas costs for simple instructions with constant gas costs (that do not
 	/// change with EVM versions)
-	static unsigned runGas(Instruction _instruction);
+	static unsigned runGas(Instruction _instruction, langutil::EVMVersion _evmVersion);
 
 	/// @returns the gas cost of the supplied data, depending whether it is in creation code, or not.
 	/// In case of @a _inCreation, the data is only sent as a transaction and is not stored, whereas
@@ -257,5 +257,4 @@ inline std::ostream& operator<<(std::ostream& _str, GasMeter::GasConsumption con
 		return _str << std::dec << _consumption.value;
 }
 
-
 }
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index e2ce48b7f1..418a6e1856 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -76,7 +76,8 @@ std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
 	{ "COINBASE", Instruction::COINBASE },
 	{ "TIMESTAMP", Instruction::TIMESTAMP },
 	{ "NUMBER", Instruction::NUMBER },
-	{ "DIFFICULTY", Instruction::DIFFICULTY },
+	{ "DIFFICULTY", Instruction::PREVRANDAO },
+	{ "PREVRANDAO", Instruction::PREVRANDAO },
 	{ "GASLIMIT", Instruction::GASLIMIT },
 	{ "CHAINID", Instruction::CHAINID },
 	{ "SELFBALANCE", Instruction::SELFBALANCE },
@@ -174,6 +175,7 @@ std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
 	{ "SELFDESTRUCT", Instruction::SELFDESTRUCT }
 };
 
+/// @note InstructionInfo is assumed to be the same across all EVM versions except for the instruction name.
 static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 { //												Add, Args, Ret, SideEffects, GasPriceTier
 	{ Instruction::STOP,		{ "STOP",			0, 0, 0, true,  Tier::Zero } },
@@ -223,7 +225,7 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::COINBASE,	{ "COINBASE",		0, 0, 1, false, Tier::Base } },
 	{ Instruction::TIMESTAMP,	{ "TIMESTAMP",		0, 0, 1, false, Tier::Base } },
 	{ Instruction::NUMBER,		{ "NUMBER",			0, 0, 1, false, Tier::Base } },
-	{ Instruction::DIFFICULTY,	{ "DIFFICULTY",		0, 0, 1, false, Tier::Base } },
+	{ Instruction::PREVRANDAO,	{ "PREVRANDAO",		0, 0, 1, false, Tier::Base } },
 	{ Instruction::GASLIMIT,	{ "GASLIMIT",		0, 0, 1, false, Tier::Base } },
 	{ Instruction::CHAINID,		{ "CHAINID",		0, 0, 1, false, Tier::Base } },
 	{ Instruction::SELFBALANCE,	{ "SELFBALANCE",	0, 0, 1, false, Tier::Low } },
@@ -321,10 +323,12 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::SELFDESTRUCT,	{ "SELFDESTRUCT",		0, 1, 0, true, Tier::Special } }
 };
 
-InstructionInfo solidity::evmasm::instructionInfo(Instruction _inst)
+InstructionInfo solidity::evmasm::instructionInfo(Instruction _inst, langutil::EVMVersion _evmVersion)
 {
 	try
 	{
+		if (_inst == Instruction::PREVRANDAO && _evmVersion < langutil::EVMVersion::paris())
+			return InstructionInfo({ "DIFFICULTY", 0, 0, 1, false, Tier::Base });
 		return c_instructionInfo.at(_inst);
 	}
 	catch (...)
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index 5d4432ca58..48ee37b5c7 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -25,6 +25,7 @@
 #include <libevmasm/Exceptions.h>
 #include <libsolutil/Common.h>
 #include <libsolutil/Assertions.h>
+#include <liblangutil/EVMVersion.h>
 
 namespace solidity::evmasm
 {
@@ -83,7 +84,7 @@ enum class Instruction: uint8_t
 	COINBASE,			///< get the block's coinbase address
 	TIMESTAMP,			///< get the block's timestamp
 	NUMBER,				///< get the block's number
-	DIFFICULTY,			///< get the block's difficulty
+	PREVRANDAO,			///< get randomness provided by the beacon chain
 	GASLIMIT,			///< get the block's gas limit
 	CHAINID,			///< get the config's chainid param
 	SELFBALANCE,		///< get balance of the current account
@@ -306,7 +307,7 @@ struct InstructionInfo
 };
 
 /// Information on all the instructions.
-InstructionInfo instructionInfo(Instruction _inst);
+InstructionInfo instructionInfo(Instruction _inst, langutil::EVMVersion _evmVersion);
 
 /// check whether instructions exists.
 bool isValidInstruction(Instruction _inst);
diff --git a/libevmasm/KnownState.cpp b/libevmasm/KnownState.cpp
index 1e886f7ab0..a2bda5af71 100644
--- a/libevmasm/KnownState.cpp
+++ b/libevmasm/KnownState.cpp
@@ -130,7 +130,9 @@ KnownState::StoreOperation KnownState::feedItem(AssemblyItem const& _item, bool
 	else
 	{
 		Instruction instruction = _item.instruction();
-		InstructionInfo info = instructionInfo(instruction);
+		// The latest EVMVersion is used here, since the InstructionInfo is assumed to be
+		// the same across all EVM versions except for the instruction name.
+		InstructionInfo info = instructionInfo(instruction, EVMVersion());
 		if (SemanticInformation::isDupInstruction(_item))
 			setStackElement(
 				m_stackHeight + 1,
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
index 334903c92b..22d40c8ea1 100644
--- a/libevmasm/PeepholeOptimiser.cpp
+++ b/libevmasm/PeepholeOptimiser.cpp
@@ -38,7 +38,7 @@ struct OptimiserState
 {
 	AssemblyItems const& items;
 	size_t i;
-	std::back_insert_iterator<AssemblyItems> out;
+	back_insert_iterator<AssemblyItems> out;
 };
 
 template<typename FunctionType>
@@ -53,7 +53,11 @@ template <class Method>
 struct SimplePeepholeOptimizerMethod
 {
 	template <size_t... Indices>
-	static bool applyRule(AssemblyItems::const_iterator _in, back_insert_iterator<AssemblyItems> _out, index_sequence<Indices...>)
+	static bool applyRule(
+		AssemblyItems::const_iterator _in,
+		back_insert_iterator<AssemblyItems> _out,
+		index_sequence<Indices...>
+	)
 	{
 		return Method::applySimple(_in[Indices]..., _out);
 	}
@@ -75,7 +79,10 @@ struct SimplePeepholeOptimizerMethod
 
 struct Identity: SimplePeepholeOptimizerMethod<Identity>
 {
-	static bool applySimple(AssemblyItem const& _item, std::back_insert_iterator<AssemblyItems> _out)
+	static bool applySimple(
+		AssemblyItem const& _item,
+		back_insert_iterator<AssemblyItems> _out
+	)
 	{
 		*_out = _item;
 		return true;
@@ -84,7 +91,11 @@ struct Identity: SimplePeepholeOptimizerMethod<Identity>
 
 struct PushPop: SimplePeepholeOptimizerMethod<PushPop>
 {
-	static bool applySimple(AssemblyItem const& _push, AssemblyItem const& _pop, std::back_insert_iterator<AssemblyItems>)
+	static bool applySimple(
+		AssemblyItem const& _push,
+		AssemblyItem const& _pop,
+		back_insert_iterator<AssemblyItems>
+	)
 	{
 		auto t = _push.type();
 		return _pop == Instruction::POP && (
@@ -100,15 +111,15 @@ struct OpPop: SimplePeepholeOptimizerMethod<OpPop>
 	static bool applySimple(
 		AssemblyItem const& _op,
 		AssemblyItem const& _pop,
-		std::back_insert_iterator<AssemblyItems> _out
+		back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (_pop == Instruction::POP && _op.type() == Operation)
 		{
 			Instruction instr = _op.instruction();
-			if (instructionInfo(instr).ret == 1 && !instructionInfo(instr).sideEffects)
+			if (instructionInfo(instr, langutil::EVMVersion()).ret == 1 && !instructionInfo(instr, langutil::EVMVersion()).sideEffects)
 			{
-				for (int j = 0; j < instructionInfo(instr).args; j++)
+				for (int j = 0; j < instructionInfo(instr, langutil::EVMVersion()).args; j++)
 					*_out = {Instruction::POP, _op.location()};
 				return true;
 			}
@@ -122,7 +133,7 @@ struct OpStop: SimplePeepholeOptimizerMethod<OpStop>
 	static bool applySimple(
 		AssemblyItem const& _op,
 		AssemblyItem const& _stop,
-		std::back_insert_iterator<AssemblyItems> _out
+		back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (_stop == Instruction::STOP)
@@ -130,7 +141,7 @@ struct OpStop: SimplePeepholeOptimizerMethod<OpStop>
 			if (_op.type() == Operation)
 			{
 				Instruction instr = _op.instruction();
-				if (!instructionInfo(instr).sideEffects)
+				if (!instructionInfo(instr, langutil::EVMVersion()).sideEffects)
 				{
 					*_out = {Instruction::STOP, _op.location()};
 					return true;
@@ -153,7 +164,7 @@ struct OpReturnRevert: SimplePeepholeOptimizerMethod<OpReturnRevert>
 		AssemblyItem const& _push,
 		AssemblyItem const& _pushOrDup,
 		AssemblyItem const& _returnRevert,
-		std::back_insert_iterator<AssemblyItems> _out
+		back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -162,7 +173,7 @@ struct OpReturnRevert: SimplePeepholeOptimizerMethod<OpReturnRevert>
 			(_pushOrDup.type() == Push || _pushOrDup == dupInstruction(1))
 		)
 			if (
-				(_op.type() == Operation && !instructionInfo(_op.instruction()).sideEffects) ||
+				(_op.type() == Operation && !instructionInfo(_op.instruction(), langutil::EVMVersion()).sideEffects) ||
 				_op.type() == Push
 			)
 			{
@@ -177,7 +188,11 @@ struct OpReturnRevert: SimplePeepholeOptimizerMethod<OpReturnRevert>
 
 struct DoubleSwap: SimplePeepholeOptimizerMethod<DoubleSwap>
 {
-	static size_t applySimple(AssemblyItem const& _s1, AssemblyItem const& _s2, std::back_insert_iterator<AssemblyItems>)
+	static size_t applySimple(
+		AssemblyItem const& _s1,
+		AssemblyItem const& _s2,
+		back_insert_iterator<AssemblyItems>
+	)
 	{
 		return _s1 == _s2 && SemanticInformation::isSwapInstruction(_s1);
 	}
@@ -185,7 +200,11 @@ struct DoubleSwap: SimplePeepholeOptimizerMethod<DoubleSwap>
 
 struct DoublePush: SimplePeepholeOptimizerMethod<DoublePush>
 {
-	static bool applySimple(AssemblyItem const& _push1, AssemblyItem const& _push2, std::back_insert_iterator<AssemblyItems> _out)
+	static bool applySimple(
+		AssemblyItem const& _push1,
+		AssemblyItem const& _push2,
+		back_insert_iterator<AssemblyItems> _out
+	)
 	{
 		if (_push1.type() == Push && _push2.type() == Push && _push1.data() == _push2.data())
 		{
@@ -200,7 +219,11 @@ struct DoublePush: SimplePeepholeOptimizerMethod<DoublePush>
 
 struct CommutativeSwap: SimplePeepholeOptimizerMethod<CommutativeSwap>
 {
-	static bool applySimple(AssemblyItem const& _swap, AssemblyItem const& _op, std::back_insert_iterator<AssemblyItems> _out)
+	static bool applySimple(
+		AssemblyItem const& _swap,
+		AssemblyItem const& _op,
+		back_insert_iterator<AssemblyItems> _out
+	)
 	{
 		// Remove SWAP1 if following instruction is commutative
 		if (
@@ -218,7 +241,11 @@ struct CommutativeSwap: SimplePeepholeOptimizerMethod<CommutativeSwap>
 
 struct SwapComparison: SimplePeepholeOptimizerMethod<SwapComparison>
 {
-	static bool applySimple(AssemblyItem const& _swap, AssemblyItem const& _op, std::back_insert_iterator<AssemblyItems> _out)
+	static bool applySimple(
+		AssemblyItem const& _swap,
+		AssemblyItem const& _op,
+		back_insert_iterator<AssemblyItems> _out
+	)
 	{
 		static map<Instruction, Instruction> const swappableOps{
 			{ Instruction::LT, Instruction::GT },
@@ -247,7 +274,7 @@ struct DupSwap: SimplePeepholeOptimizerMethod<DupSwap>
 	static size_t applySimple(
 		AssemblyItem const& _dupN,
 		AssemblyItem const& _swapN,
-		std::back_insert_iterator<AssemblyItems> _out
+		back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -272,7 +299,7 @@ struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod<IsZeroIsZeroJumpI>
 		AssemblyItem const& _iszero2,
 		AssemblyItem const& _pushTag,
 		AssemblyItem const& _jumpi,
-		std::back_insert_iterator<AssemblyItems> _out
+		back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -298,7 +325,7 @@ struct EqIsZeroJumpI: SimplePeepholeOptimizerMethod<EqIsZeroJumpI>
 		AssemblyItem const& _iszero,
 		AssemblyItem const& _pushTag,
 		AssemblyItem const& _jumpi,
-		std::back_insert_iterator<AssemblyItems> _out
+		back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -327,7 +354,7 @@ struct DoubleJump: SimplePeepholeOptimizerMethod<DoubleJump>
 		AssemblyItem const& _pushTag2,
 		AssemblyItem const& _jump,
 		AssemblyItem const& _tag1,
-		std::back_insert_iterator<AssemblyItems> _out
+		back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -356,7 +383,7 @@ struct JumpToNext: SimplePeepholeOptimizerMethod<JumpToNext>
 		AssemblyItem const& _pushTag,
 		AssemblyItem const& _jump,
 		AssemblyItem const& _tag,
-		std::back_insert_iterator<AssemblyItems> _out
+		back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -382,7 +409,7 @@ struct TagConjunctions: SimplePeepholeOptimizerMethod<TagConjunctions>
 		AssemblyItem const& _pushTag,
 		AssemblyItem const& _pushConstant,
 		AssemblyItem const& _and,
-		std::back_insert_iterator<AssemblyItems> _out
+		back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (_and != Instruction::AND)
@@ -417,7 +444,7 @@ struct TruthyAnd: SimplePeepholeOptimizerMethod<TruthyAnd>
 		AssemblyItem const& _push,
 		AssemblyItem const& _not,
 		AssemblyItem const& _and,
-		std::back_insert_iterator<AssemblyItems>
+		back_insert_iterator<AssemblyItems>
 	)
 	{
 		return (
@@ -484,7 +511,7 @@ bool PeepholeOptimiser::optimise()
 {
 	// Avoid referencing immutables too early by using approx. counting in bytesRequired()
 	auto const approx = evmasm::Precision::Approximate;
-	OptimiserState state {m_items, 0, std::back_inserter(m_optimisedItems)};
+	OptimiserState state {m_items, 0, back_inserter(m_optimisedItems)};
 	while (state.i < m_items.size())
 		applyMethods(
 			state,
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index acbcaa5c0f..b6bcc82802 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -110,7 +110,7 @@ vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(
 	case Instruction::CALLCODE:
 	case Instruction::DELEGATECALL:
 	{
-		size_t paramCount = static_cast<size_t>(instructionInfo(_instruction).args);
+		size_t paramCount = static_cast<size_t>(instructionInfo(_instruction, langutil::EVMVersion()).args);
 		vector<Operation> operations{
 			Operation{Location::Memory, Effect::Read, paramCount - 4, paramCount - 3, {}},
 			Operation{Location::Storage, Effect::Read, {}, {}, {}}
@@ -178,7 +178,7 @@ bool SemanticInformation::breaksCSEAnalysisBlock(AssemblyItem const& _item, bool
 			return true; // GAS and PC assume a specific order of opcodes
 		if (_item.instruction() == Instruction::MSIZE)
 			return true; // msize is modified already by memory access, avoid that for now
-		InstructionInfo info = instructionInfo(_item.instruction());
+		InstructionInfo info = instructionInfo(_item.instruction(), langutil::EVMVersion());
 		if (_item.instruction() == Instruction::SSTORE)
 			return false;
 		if (_item.instruction() == Instruction::MSTORE)
@@ -318,7 +318,7 @@ bool SemanticInformation::movable(Instruction _instruction)
 	// These are not really functional.
 	if (isDupInstruction(_instruction) || isSwapInstruction(_instruction))
 		return false;
-	InstructionInfo info = instructionInfo(_instruction);
+	InstructionInfo info = instructionInfo(_instruction, langutil::EVMVersion());
 	if (info.sideEffects)
 		return false;
 	switch (_instruction)
@@ -345,7 +345,7 @@ bool SemanticInformation::canBeRemoved(Instruction _instruction)
 	// These are not really functional.
 	assertThrow(!isDupInstruction(_instruction) && !isSwapInstruction(_instruction), AssemblyException, "");
 
-	return !instructionInfo(_instruction).sideEffects;
+	return !instructionInfo(_instruction, langutil::EVMVersion()).sideEffects;
 }
 
 bool SemanticInformation::canBeRemovedIfNoMSize(Instruction _instruction)
@@ -483,7 +483,7 @@ bool SemanticInformation::invalidInPureFunctions(Instruction _instruction)
 	case Instruction::COINBASE:
 	case Instruction::TIMESTAMP:
 	case Instruction::NUMBER:
-	case Instruction::DIFFICULTY:
+	case Instruction::PREVRANDAO:
 	case Instruction::GASLIMIT:
 	case Instruction::STATICCALL:
 	case Instruction::SLOAD:
diff --git a/libevmasm/SimplificationRule.h b/libevmasm/SimplificationRule.h
index d548a00dfb..e970068fbd 100644
--- a/libevmasm/SimplificationRule.h
+++ b/libevmasm/SimplificationRule.h
@@ -122,7 +122,7 @@ struct EVMBuiltins
 	static auto constexpr COINBASE = PatternGenerator<Instruction::COINBASE>{};
 	static auto constexpr TIMESTAMP = PatternGenerator<Instruction::TIMESTAMP>{};
 	static auto constexpr NUMBER = PatternGenerator<Instruction::NUMBER>{};
-	static auto constexpr DIFFICULTY = PatternGenerator<Instruction::DIFFICULTY>{};
+	static auto constexpr PREVRANDAO = PatternGenerator<Instruction::PREVRANDAO>{};
 	static auto constexpr GASLIMIT = PatternGenerator<Instruction::GASLIMIT>{};
 	static auto constexpr CHAINID = PatternGenerator<Instruction::CHAINID>{};
 	static auto constexpr SELFBALANCE = PatternGenerator<Instruction::SELFBALANCE>{};
diff --git a/libevmasm/SimplificationRules.cpp b/libevmasm/SimplificationRules.cpp
index a21ed41951..bcb8da3882 100644
--- a/libevmasm/SimplificationRules.cpp
+++ b/libevmasm/SimplificationRules.cpp
@@ -141,7 +141,8 @@ string Pattern::toString() const
 	switch (m_type)
 	{
 	case Operation:
-		s << instructionInfo(m_instruction).name;
+		// Note: This function is exclusively used for debugging.
+		s << instructionInfo(m_instruction, EVMVersion()).name;
 		break;
 	case Push:
 		if (m_data)
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index d366338451..f985b4aff8 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -96,6 +96,7 @@ class EVMVersion:
 	bool hasChainID() const { return *this >= istanbul(); }
 	bool hasSelfBalance() const { return *this >= istanbul(); }
 	bool hasBaseFee() const { return *this >= london(); }
+	bool hasPrevRandao() const { return *this >= paris(); }
 
 	bool hasOpcode(evmasm::Instruction _opcode) const;
 
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 00c763a90b..ac00ab7fe5 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3296,18 +3296,33 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 			(memberName == "min" ||	memberName == "max")
 		)
 			annotation.isPure = true;
-		else if (magicType->kind() == MagicType::Kind::Block && memberName == "chainid" && !m_evmVersion.hasChainID())
-			m_errorReporter.typeError(
-				3081_error,
-				_memberAccess.location(),
-				"\"chainid\" is not supported by the VM version."
-			);
-		else if (magicType->kind() == MagicType::Kind::Block && memberName == "basefee" && !m_evmVersion.hasBaseFee())
-			m_errorReporter.typeError(
-				5921_error,
-				_memberAccess.location(),
-				"\"basefee\" is not supported by the VM version."
-			);
+		else if (magicType->kind() == MagicType::Kind::Block)
+		{
+			if (memberName == "chainid" && !m_evmVersion.hasChainID())
+				m_errorReporter.typeError(
+					3081_error,
+					_memberAccess.location(),
+					"\"chainid\" is not supported by the VM version."
+				);
+			else if (memberName == "basefee" && !m_evmVersion.hasBaseFee())
+				m_errorReporter.typeError(
+					5921_error,
+					_memberAccess.location(),
+					"\"basefee\" is not supported by the VM version."
+				);
+			else if (memberName == "prevrandao" && !m_evmVersion.hasPrevRandao())
+				m_errorReporter.warning(
+					9432_error,
+					_memberAccess.location(),
+					"\"prevrandao\" is not supported by the VM version and will be treated as \"difficulty\"."
+				);
+			else if (memberName == "difficulty" && m_evmVersion.hasPrevRandao())
+				m_errorReporter.warning(
+					8417_error,
+					_memberAccess.location(),
+					"Since the VM version paris, \"difficulty\" was replaced by \"prevrandao\", which now returns a random number based on the beacon chain."
+				);
+		}
 	}
 
 	if (
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 9bbd70a675..0a148f2fb2 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -4067,6 +4067,7 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 			{"timestamp", TypeProvider::uint256()},
 			{"blockhash", TypeProvider::function(strings{"uint"}, strings{"bytes32"}, FunctionType::Kind::BlockHash, StateMutability::View)},
 			{"difficulty", TypeProvider::uint256()},
+			{"prevrandao", TypeProvider::uint256()},
 			{"number", TypeProvider::uint256()},
 			{"gaslimit", TypeProvider::uint256()},
 			{"chainid", TypeProvider::uint256()},
diff --git a/libsolidity/codegen/CompilerContext.h b/libsolidity/codegen/CompilerContext.h
index 4f7fd3abd1..8eba084eba 100644
--- a/libsolidity/codegen/CompilerContext.h
+++ b/libsolidity/codegen/CompilerContext.h
@@ -65,7 +65,7 @@ class CompilerContext
 		RevertStrings _revertStrings,
 		CompilerContext* _runtimeContext = nullptr
 	):
-		m_asm(std::make_shared<evmasm::Assembly>(_runtimeContext != nullptr, std::string{})),
+		m_asm(std::make_shared<evmasm::Assembly>(_evmVersion, _runtimeContext != nullptr, std::string{})),
 		m_evmVersion(_evmVersion),
 		m_revertStrings(_revertStrings),
 		m_reservedMemory{0},
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index b26825c778..2aa2315f91 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1808,8 +1808,8 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 			m_context << Instruction::COINBASE;
 		else if (member == "timestamp")
 			m_context << Instruction::TIMESTAMP;
-		else if (member == "difficulty")
-			m_context << Instruction::DIFFICULTY;
+		else if (member == "difficulty" || member == "prevrandao")
+			m_context << Instruction::PREVRANDAO;
 		else if (member == "number")
 			m_context << Instruction::NUMBER;
 		else if (member == "gaslimit")
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 1ec64b548d..3e3041bc10 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1822,8 +1822,13 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 			define(_memberAccess) << "coinbase()\n";
 		else if (member == "timestamp")
 			define(_memberAccess) << "timestamp()\n";
-		else if (member == "difficulty")
-			define(_memberAccess) << "difficulty()\n";
+		else if (member == "difficulty" || member == "prevrandao")
+		{
+			if (m_context.evmVersion().hasPrevRandao())
+				define(_memberAccess) << "prevrandao()\n";
+			else
+				define(_memberAccess) << "difficulty()\n";
+		}
 		else if (member == "number")
 			define(_memberAccess) << "number()\n";
 		else if (member == "gaslimit")
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 823c7c2f21..27fa1c9896 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -381,6 +381,7 @@ Json::Value formatImmutableReferences(map<u256, pair<string, vector<size_t>>> co
 }
 
 Json::Value collectEVMObject(
+	langutil::EVMVersion _evmVersion,
 	evmasm::LinkerObject const& _object,
 	string const* _sourceMap,
 	Json::Value _generatedSources,
@@ -392,7 +393,7 @@ Json::Value collectEVMObject(
 	if (_artifactRequested("object"))
 		output["object"] = _object.toHex();
 	if (_artifactRequested("opcodes"))
-		output["opcodes"] = evmasm::disassemble(_object.bytecode);
+		output["opcodes"] = evmasm::disassemble(_object.bytecode, _evmVersion);
 	if (_artifactRequested("sourceMap"))
 		output["sourceMap"] = _sourceMap ? *_sourceMap : "";
 	if (_artifactRequested("functionDebugData"))
@@ -1328,6 +1329,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 			wildcardMatchesExperimental
 		))
 			evmData["bytecode"] = collectEVMObject(
+				_inputsAndSettings.evmVersion,
 				compilerStack.object(contractName),
 				compilerStack.sourceMapping(contractName),
 				compilerStack.generatedSources(contractName),
@@ -1349,6 +1351,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 			wildcardMatchesExperimental
 		))
 			evmData["deployedBytecode"] = collectEVMObject(
+				_inputsAndSettings.evmVersion,
 				compilerStack.runtimeObject(contractName),
 				compilerStack.runtimeSourceMapping(contractName),
 				compilerStack.generatedSources(contractName, true),
@@ -1491,6 +1494,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 			if (o.bytecode)
 				output["contracts"][sourceName][contractName]["evm"][kind] =
 					collectEVMObject(
+						_inputsAndSettings.evmVersion,
 						*o.bytecode,
 						o.sourceMappings.get(),
 						Json::arrayValue,
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 2e9f8f1d3e..4c9abdaddf 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -119,7 +119,6 @@ vector<YulString> AsmAnalyzer::operator()(Literal const& _literal)
 			"Invalid type \"" + _literal.type.str() + "\" for literal \"" + _literal.value.str() + "\"."
 		);
 
-
 	return {_literal.type};
 }
 
@@ -619,7 +618,6 @@ Scope& AsmAnalyzer::scope(Block const* _block)
 void AsmAnalyzer::expectValidIdentifier(YulString _identifier, SourceLocation const& _location)
 {
 	// NOTE: the leading dot case is handled by the parser not allowing it.
-
 	if (boost::ends_with(_identifier.str(), "."))
 		m_errorReporter.syntaxError(
 			3384_error,
@@ -692,7 +690,7 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 			_location,
 			fmt::format(
 				"The \"{instruction}\" instruction is {kind} VMs (you are currently compiling for \"{version}\").",
-				fmt::arg("instruction", boost::to_lower_copy(instructionInfo(_instr).name)),
+				fmt::arg("instruction", boost::to_lower_copy(instructionInfo(_instr, m_evmVersion).name)),
 				fmt::arg("kind", vmKindMessage),
 				fmt::arg("version", m_evmVersion.name())
 			)
diff --git a/libyul/CompilabilityChecker.cpp b/libyul/CompilabilityChecker.cpp
index 270773cbcc..acb48cfa54 100644
--- a/libyul/CompilabilityChecker.cpp
+++ b/libyul/CompilabilityChecker.cpp
@@ -50,7 +50,7 @@ CompilabilityChecker::CompilabilityChecker(
 			builtinContext.subIDs[_object.name] = 1;
 		for (auto const& subNode: _object.subObjects)
 			builtinContext.subIDs[subNode->name] = 1;
-		NoOutputAssembly assembly;
+		NoOutputAssembly assembly{evmDialect->evmVersion()};
 		CodeTransform transform(
 			assembly,
 			analysisInfo,
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index b330269499..f258de6a84 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -264,7 +264,7 @@ YulStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
 	yulAssert(m_parserResult->code, "");
 	yulAssert(m_parserResult->analysisInfo, "");
 
-	evmasm::Assembly assembly(true, {});
+	evmasm::Assembly assembly(m_evmVersion, true, {});
 	EthAssemblyAdapter adapter(assembly);
 	compileEVM(adapter, m_optimiserSettings.optimizeStackAllocation);
 
diff --git a/libyul/backends/evm/AbstractAssembly.h b/libyul/backends/evm/AbstractAssembly.h
index 2d7be90019..c64669abea 100644
--- a/libyul/backends/evm/AbstractAssembly.h
+++ b/libyul/backends/evm/AbstractAssembly.h
@@ -28,6 +28,7 @@
 #include <libsolutil/Common.h>
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Numeric.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <functional>
 #include <memory>
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 71b9dba4ce..b66738b9db 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -47,11 +47,12 @@ namespace
 {
 
 pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
+	langutil::EVMVersion _evmVersion,
 	string const& _name,
 	evmasm::Instruction _instruction
 )
 {
-	evmasm::InstructionInfo info = evmasm::instructionInfo(_instruction);
+	evmasm::InstructionInfo info = evmasm::instructionInfo(_instruction, _evmVersion);
 	BuiltinFunctionForEVM f;
 	f.name = YulString{_name};
 	f.parameters.resize(static_cast<size_t>(info.args));
@@ -119,11 +120,19 @@ set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 		return _instr == evmasm::Instruction::BASEFEE && _evmVersion < langutil::EVMVersion::london();
 	};
 
+	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
+	// prevrandao for VMs before paris.
+	auto prevRandaoException = [&](string const& _instrName) -> bool
+	{
+		// Using string comparison as the opcode is the same as for "difficulty"
+		return _instrName == "prevrandao" && _evmVersion < langutil::EVMVersion::paris();
+	};
+
 	set<YulString> reserved;
 	for (auto const& instr: evmasm::c_instructions)
 	{
 		string name = toLower(instr.first);
-		if (!baseFeeException(instr.second))
+		if (!baseFeeException(instr.second) && !prevRandaoException(name))
 			reserved.emplace(name);
 	}
 	reserved += vector<YulString>{
@@ -139,6 +148,13 @@ set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 
 map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVersion, bool _objectAccess)
 {
+
+	// Exclude prevrandao as builtin for VMs before paris and difficulty for VMs after paris.
+	auto prevRandaoException = [&](string const& _instrName) -> bool
+	{
+		return (_instrName == "prevrandao" && _evmVersion < langutil::EVMVersion::paris()) || (_instrName == "difficulty" && _evmVersion >= langutil::EVMVersion::paris());
+	};
+
 	map<YulString, BuiltinFunctionForEVM> builtins;
 	for (auto const& instr: evmasm::c_instructions)
 	{
@@ -152,9 +168,10 @@ map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVe
 			opcode != evmasm::Instruction::JUMP &&
 			opcode != evmasm::Instruction::JUMPI &&
 			opcode != evmasm::Instruction::JUMPDEST &&
-			_evmVersion.hasOpcode(opcode)
+			_evmVersion.hasOpcode(opcode) &&
+			!prevRandaoException(name)
 		)
-			builtins.emplace(createEVMFunction(name, opcode));
+			builtins.emplace(createEVMFunction(_evmVersion, name, opcode));
 	}
 
 	if (_objectAccess)
diff --git a/libyul/backends/evm/EVMMetrics.cpp b/libyul/backends/evm/EVMMetrics.cpp
index bd39f966f5..0959698389 100644
--- a/libyul/backends/evm/EVMMetrics.cpp
+++ b/libyul/backends/evm/EVMMetrics.cpp
@@ -88,7 +88,7 @@ void GasMeterVisitor::operator()(FunctionCall const& _funCall)
 
 void GasMeterVisitor::operator()(Literal const& _lit)
 {
-	m_runGas += evmasm::GasMeter::runGas(evmasm::Instruction::PUSH1);
+	m_runGas += evmasm::GasMeter::runGas(evmasm::Instruction::PUSH1, m_dialect.evmVersion());
 	m_dataGas +=
 		singleByteDataGas() +
 		evmasm::GasMeter::dataGas(
@@ -100,7 +100,7 @@ void GasMeterVisitor::operator()(Literal const& _lit)
 
 void GasMeterVisitor::operator()(Identifier const&)
 {
-	m_runGas += evmasm::GasMeter::runGas(evmasm::Instruction::DUP1);
+	m_runGas += evmasm::GasMeter::runGas(evmasm::Instruction::DUP1, m_dialect.evmVersion());
 	m_dataGas += singleByteDataGas();
 }
 
@@ -120,6 +120,6 @@ void GasMeterVisitor::instructionCostsInternal(evmasm::Instruction _instruction)
 		// Assumes that Keccak-256 is computed on a single word (rounded up).
 		m_runGas += evmasm::GasCosts::keccak256Gas + evmasm::GasCosts::keccak256WordGas;
 	else
-		m_runGas += evmasm::GasMeter::runGas(_instruction);
+		m_runGas += evmasm::GasMeter::runGas(_instruction, m_dialect.evmVersion());
 	m_dataGas += singleByteDataGas();
 }
diff --git a/libyul/backends/evm/EthAssemblyAdapter.cpp b/libyul/backends/evm/EthAssemblyAdapter.cpp
index 685f56cbc0..28a4e4ae29 100644
--- a/libyul/backends/evm/EthAssemblyAdapter.cpp
+++ b/libyul/backends/evm/EthAssemblyAdapter.cpp
@@ -124,7 +124,7 @@ void EthAssemblyAdapter::appendAssemblySize()
 
 pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> EthAssemblyAdapter::createSubAssembly(bool _creation, string _name)
 {
-	shared_ptr<evmasm::Assembly> assembly{make_shared<evmasm::Assembly>(_creation, std::move(_name))};
+	shared_ptr<evmasm::Assembly> assembly{make_shared<evmasm::Assembly>(m_assembly.evmVersion(), _creation, std::move(_name))};
 	auto sub = m_assembly.newSub(assembly);
 	return {make_shared<EthAssemblyAdapter>(*assembly), static_cast<size_t>(sub.data())};
 }
diff --git a/libyul/backends/evm/NoOutputAssembly.cpp b/libyul/backends/evm/NoOutputAssembly.cpp
index e262042014..ac64418ad8 100644
--- a/libyul/backends/evm/NoOutputAssembly.cpp
+++ b/libyul/backends/evm/NoOutputAssembly.cpp
@@ -37,7 +37,7 @@ using namespace solidity::langutil;
 
 void NoOutputAssembly::appendInstruction(evmasm::Instruction _instr)
 {
-	m_stackHeight += instructionInfo(_instr).ret - instructionInfo(_instr).args;
+	m_stackHeight += instructionInfo(_instr, m_evmVersion).ret - instructionInfo(_instr, m_evmVersion).args;
 }
 
 void NoOutputAssembly::appendConstant(u256 const&)
diff --git a/libyul/backends/evm/NoOutputAssembly.h b/libyul/backends/evm/NoOutputAssembly.h
index 1103392ef9..eeb00039c5 100644
--- a/libyul/backends/evm/NoOutputAssembly.h
+++ b/libyul/backends/evm/NoOutputAssembly.h
@@ -45,7 +45,7 @@ namespace solidity::yul
 class NoOutputAssembly: public AbstractAssembly
 {
 public:
-	explicit NoOutputAssembly() { }
+	explicit NoOutputAssembly(langutil::EVMVersion _evmVersion): m_evmVersion(_evmVersion) { }
 	~NoOutputAssembly() override = default;
 
 	void setSourceLocation(langutil::SourceLocation const&) override {}
@@ -79,6 +79,7 @@ class NoOutputAssembly: public AbstractAssembly
 
 private:
 	int m_stackHeight = 0;
+	langutil::EVMVersion m_evmVersion;
 };
 
 
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index 95c840733d..ddb1b63793 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -747,23 +747,23 @@ void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block, CFG::Functi
 			if (_swapDepth > 16)
 				opGas += 1000;
 			else
-				opGas += evmasm::GasMeter::runGas(evmasm::swapInstruction(_swapDepth));
+				opGas += evmasm::GasMeter::runGas(evmasm::swapInstruction(_swapDepth), langutil::EVMVersion());
 		};
 		auto dupOrPush = [&](StackSlot const& _slot)
 		{
 			if (canBeFreelyGenerated(_slot))
-				opGas += evmasm::GasMeter::runGas(evmasm::pushInstruction(32));
+				opGas += evmasm::GasMeter::runGas(evmasm::pushInstruction(32), langutil::EVMVersion());
 			else
 			{
 				auto depth = util::findOffset(_source | ranges::views::reverse, _slot);
 				yulAssert(depth);
 				if (*depth < 16)
-					opGas += evmasm::GasMeter::runGas(evmasm::dupInstruction(static_cast<unsigned>(*depth + 1)));
+					opGas += evmasm::GasMeter::runGas(evmasm::dupInstruction(static_cast<unsigned>(*depth + 1)), langutil::EVMVersion());
 				else
 					opGas += 1000;
 			}
 		};
-		auto pop = [&]() { opGas += evmasm::GasMeter::runGas(evmasm::Instruction::POP); };
+		auto pop = [&]() { opGas += evmasm::GasMeter::runGas(evmasm::Instruction::POP,langutil::EVMVersion()); };
 		createStackLayout(_source, _target, swap, dupOrPush, pop);
 		return opGas;
 	};
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index caf74cfb7a..4a423fe465 100644
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -47,7 +47,7 @@ void ExpressionSimplifier::visit(Expression& _expression)
 		m_dialect,
 		[this](YulString _var) { return variableValue(_var); }
 	))
-		_expression = match->action().toExpression(debugDataOf(_expression));
+		_expression = match->action().toExpression(debugDataOf(_expression), evmVersionFromDialect(m_dialect));
 
 	if (auto* functionCall = get_if<FunctionCall>(&_expression))
 		if (optional<evmasm::Instruction> instruction = toEVMInstruction(m_dialect, functionCall->functionName.name))
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index 77848cce04..c706d529b6 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -102,7 +102,7 @@ Expression KnowledgeBase::simplifyRecursively(Expression _expression)
 			arg = simplifyRecursively(arg);
 
 	if (auto match = SimplificationRules::findFirstMatch(_expression, m_dialect, m_variableValues))
-		return simplifyRecursively(match->action().toExpression(debugDataOf(_expression)));
+		return simplifyRecursively(match->action().toExpression(debugDataOf(_expression), langutil::EVMVersion()));
 
 	return _expression;
 }
diff --git a/libyul/optimiser/Metrics.cpp b/libyul/optimiser/Metrics.cpp
index 298dfe9c15..2eac515956 100644
--- a/libyul/optimiser/Metrics.cpp
+++ b/libyul/optimiser/Metrics.cpp
@@ -20,6 +20,7 @@
 
 #include <libyul/optimiser/Metrics.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
+#include <libyul/backends/evm/EVMDialect.h>
 
 #include <libyul/AST.h>
 #include <libyul/Exceptions.h>
@@ -180,7 +181,7 @@ void CodeCost::visit(Expression const& _expression)
 
 void CodeCost::addInstructionCost(evmasm::Instruction _instruction)
 {
-	evmasm::Tier gasPriceTier = evmasm::instructionInfo(_instruction).gasPriceTier;
+	evmasm::Tier gasPriceTier = evmasm::instructionInfo(_instruction, evmVersionFromDialect(m_dialect)).gasPriceTier;
 	if (gasPriceTier < evmasm::Tier::VeryLow)
 		m_cost -= 1;
 	else if (gasPriceTier < evmasm::Tier::High)
diff --git a/libyul/optimiser/OptimizerUtilities.cpp b/libyul/optimiser/OptimizerUtilities.cpp
index ba06b2180b..bd474f7482 100644
--- a/libyul/optimiser/OptimizerUtilities.cpp
+++ b/libyul/optimiser/OptimizerUtilities.cpp
@@ -58,6 +58,13 @@ optional<evmasm::Instruction> yul::toEVMInstruction(Dialect const& _dialect, Yul
 	return nullopt;
 }
 
+langutil::EVMVersion const yul::evmVersionFromDialect(Dialect const& _dialect)
+{
+	if (auto const* dialect = dynamic_cast<EVMDialect const*>(&_dialect))
+		return dialect->evmVersion();
+	return langutil::EVMVersion();
+}
+
 void StatementRemover::operator()(Block& _block)
 {
 	util::iterateReplacing(
diff --git a/libyul/optimiser/OptimizerUtilities.h b/libyul/optimiser/OptimizerUtilities.h
index b491e57e1f..cb07f7a530 100644
--- a/libyul/optimiser/OptimizerUtilities.h
+++ b/libyul/optimiser/OptimizerUtilities.h
@@ -26,6 +26,7 @@
 #include <libyul/Dialect.h>
 #include <libyul/YulString.h>
 #include <libyul/optimiser/ASTWalker.h>
+#include <liblangutil/EVMVersion.h>
 
 #include <optional>
 
@@ -49,6 +50,10 @@ bool isRestrictedIdentifier(Dialect const& _dialect, YulString const& _identifie
 /// Helper function that returns the instruction, if the `_name` is a BuiltinFunction
 std::optional<evmasm::Instruction> toEVMInstruction(Dialect const& _dialect, YulString const& _name);
 
+/// Helper function that returns the EVM version from a dialect.
+/// It returns the default EVM version if dialect is not an EVMDialect.
+langutil::EVMVersion const evmVersionFromDialect(Dialect const& _dialect);
+
 class StatementRemover: public ASTModifier
 {
 public:
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index 9d0144750d..c3c4d5a533 100644
--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -235,7 +235,7 @@ evmasm::Instruction Pattern::instruction() const
 	return m_instruction;
 }
 
-Expression Pattern::toExpression(shared_ptr<DebugData const> const& _debugData) const
+Expression Pattern::toExpression(shared_ptr<DebugData const> const& _debugData, langutil::EVMVersion _evmVersion) const
 {
 	if (matchGroup())
 		return ASTCopier().translate(matchGroupValue());
@@ -248,9 +248,9 @@ Expression Pattern::toExpression(shared_ptr<DebugData const> const& _debugData)
 	{
 		vector<Expression> arguments;
 		for (auto const& arg: m_arguments)
-			arguments.emplace_back(arg.toExpression(_debugData));
+			arguments.emplace_back(arg.toExpression(_debugData, _evmVersion));
 
-		string name = util::toLower(instructionInfo(m_instruction).name);
+		string name = util::toLower(instructionInfo(m_instruction, _evmVersion).name);
 
 		return FunctionCall{_debugData,
 			Identifier{_debugData, YulString{name}},
diff --git a/libyul/optimiser/SimplificationRules.h b/libyul/optimiser/SimplificationRules.h
index 7444c47fb8..e36730f054 100644
--- a/libyul/optimiser/SimplificationRules.h
+++ b/libyul/optimiser/SimplificationRules.h
@@ -131,7 +131,7 @@ class Pattern
 
 	/// Turns this pattern into an actual expression. Should only be called
 	/// for patterns resulting from an action, i.e. with match groups assigned.
-	Expression toExpression(std::shared_ptr<DebugData const> const& _debugData) const;
+	Expression toExpression(std::shared_ptr<DebugData const> const& _debugData, langutil::EVMVersion _evmVersion) const;
 
 private:
 	Expression const& matchGroupValue() const;
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index d1ad6bb9e9..e3dbe6cb6a 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -5,9 +5,10 @@ set -eu
 ERROR_LOG="$(mktemp -t check_style_XXXXXX.log)"
 
 EXCLUDE_FILES=(
+    # The line below is left unquoted to allow the shell globbing path expansion
+    test/cmdlineTests/*/{err,output}
     "libsolutil/picosha2.h"
     "test/cmdlineTests/strict_asm_only_cr/input.yul"
-    "test/cmdlineTests/strict_asm_only_cr/err"
     "test/libsolutil/UTF8.cpp"
     "test/libsolidity/syntaxTests/license/license_cr_endings.sol"
     "test/libsolidity/syntaxTests/license/license_crlf_endings.sol"
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
index 5745f01be3..3394534f8d 100755
--- a/scripts/test_antlr_grammar.sh
+++ b/scripts/test_antlr_grammar.sh
@@ -121,6 +121,9 @@ done < <(
       grep -v -E 'revertStatement/non_called.sol' |
       # Skipping a test with "let basefee := ..."
       grep -v -E 'inlineAssembly/basefee_berlin_function.sol' |
+      # Skipping tests with "let prevrandao := ..."
+      grep -v -E 'inlineAssembly/prevrandao_allowed_function_pre_paris.sol' |
+      grep -v -E 'inlineAssembly/prevrandao_disallowed_function_post_paris.sol' |
       # Skipping license error, unrelated to the grammar
       grep -v -E 'license/license_double5.sol' |
       grep -v -E 'license/license_hidden_unicode.sol' |
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 1d64fa4946..e9688cda3f 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -198,11 +198,11 @@ void CommandLineInterface::handleOpcode(string const& _contract)
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.output.dir.empty())
-		createFile(m_compiler->filesystemFriendlyName(_contract) + ".opcode", evmasm::disassemble(m_compiler->object(_contract).bytecode));
+		createFile(m_compiler->filesystemFriendlyName(_contract) + ".opcode", evmasm::disassemble(m_compiler->object(_contract).bytecode, m_options.output.evmVersion));
 	else
 	{
 		sout() << "Opcodes:" << endl;
-		sout() << std::uppercase << evmasm::disassemble(m_compiler->object(_contract).bytecode);
+		sout() << std::uppercase << evmasm::disassemble(m_compiler->object(_contract).bytecode, m_options.output.evmVersion);
 		sout() << endl;
 	}
 }
@@ -825,7 +825,7 @@ void CommandLineInterface::handleCombinedJSON()
 		if (m_options.compiler.combinedJsonRequests->binaryRuntime && m_compiler->compilationSuccessful())
 			contractData[g_strBinaryRuntime] = m_compiler->runtimeObject(contractName).toHex();
 		if (m_options.compiler.combinedJsonRequests->opcodes && m_compiler->compilationSuccessful())
-			contractData[g_strOpcodes] = evmasm::disassemble(m_compiler->object(contractName).bytecode);
+			contractData[g_strOpcodes] = evmasm::disassemble(m_compiler->object(contractName).bytecode, m_options.output.evmVersion);
 		if (m_options.compiler.combinedJsonRequests->asm_ && m_compiler->compilationSuccessful())
 			contractData[g_strAsm] = m_compiler->assemblyJSON(contractName);
 		if (m_options.compiler.combinedJsonRequests->storageLayout && m_compiler->compilationSuccessful())
diff --git a/test/cmdlineTests/evmasm_difficulty_post_paris/args b/test/cmdlineTests/evmasm_difficulty_post_paris/args
new file mode 100644
index 0000000000..a0588fcfc2
--- /dev/null
+++ b/test/cmdlineTests/evmasm_difficulty_post_paris/args
@@ -0,0 +1 @@
+--no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none --evm-version paris
diff --git a/test/cmdlineTests/evmasm_difficulty_post_paris/err b/test/cmdlineTests/evmasm_difficulty_post_paris/err
new file mode 100644
index 0000000000..d8210184e1
--- /dev/null
+++ b/test/cmdlineTests/evmasm_difficulty_post_paris/err
@@ -0,0 +1,5 @@
+Warning: Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+ --> evmasm_difficulty_post_paris/input.sol:6:21:
+  |
+6 |         uint256 x = block.difficulty;
+  |                     ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/evmasm_difficulty_post_paris/input.sol b/test/cmdlineTests/evmasm_difficulty_post_paris/input.sol
new file mode 100644
index 0000000000..e81c034e78
--- /dev/null
+++ b/test/cmdlineTests/evmasm_difficulty_post_paris/input.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    constructor() payable {
+        uint256 x = block.difficulty;
+        assembly {
+            sstore(0, x)
+            stop()
+        }
+    }
+
+    fallback() external payable {
+        assembly {
+            stop()
+        }
+    }
+}
diff --git a/test/cmdlineTests/evmasm_difficulty_post_paris/output b/test/cmdlineTests/evmasm_difficulty_post_paris/output
new file mode 100644
index 0000000000..f8c1611e02
--- /dev/null
+++ b/test/cmdlineTests/evmasm_difficulty_post_paris/output
@@ -0,0 +1,13 @@
+
+======= evmasm_difficulty_post_paris/input.sol:C =======
+EVM assembly:
+  sstore(0x00, prevrandao)
+  stop
+stop
+
+sub_0: assembly {
+      stop
+}
+
+Opcodes:
+PREVRANDAO PUSH1 0x0 SSTORE STOP INVALID 
diff --git a/test/cmdlineTests/evmasm_difficulty_pre_paris/args b/test/cmdlineTests/evmasm_difficulty_pre_paris/args
new file mode 100644
index 0000000000..67d6f9a650
--- /dev/null
+++ b/test/cmdlineTests/evmasm_difficulty_pre_paris/args
@@ -0,0 +1 @@
+--no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none --evm-version london
diff --git a/test/cmdlineTests/evmasm_difficulty_pre_paris/input.sol b/test/cmdlineTests/evmasm_difficulty_pre_paris/input.sol
new file mode 100644
index 0000000000..e81c034e78
--- /dev/null
+++ b/test/cmdlineTests/evmasm_difficulty_pre_paris/input.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    constructor() payable {
+        uint256 x = block.difficulty;
+        assembly {
+            sstore(0, x)
+            stop()
+        }
+    }
+
+    fallback() external payable {
+        assembly {
+            stop()
+        }
+    }
+}
diff --git a/test/cmdlineTests/evmasm_difficulty_pre_paris/output b/test/cmdlineTests/evmasm_difficulty_pre_paris/output
new file mode 100644
index 0000000000..ad75355f5b
--- /dev/null
+++ b/test/cmdlineTests/evmasm_difficulty_pre_paris/output
@@ -0,0 +1,13 @@
+
+======= evmasm_difficulty_pre_paris/input.sol:C =======
+EVM assembly:
+  sstore(0x00, difficulty)
+  stop
+stop
+
+sub_0: assembly {
+      stop
+}
+
+Opcodes:
+DIFFICULTY PUSH1 0x0 SSTORE STOP INVALID 
diff --git a/test/cmdlineTests/evmasm_prevrandao_post_paris/args b/test/cmdlineTests/evmasm_prevrandao_post_paris/args
new file mode 100644
index 0000000000..a0588fcfc2
--- /dev/null
+++ b/test/cmdlineTests/evmasm_prevrandao_post_paris/args
@@ -0,0 +1 @@
+--no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none --evm-version paris
diff --git a/test/cmdlineTests/evmasm_prevrandao_post_paris/input.sol b/test/cmdlineTests/evmasm_prevrandao_post_paris/input.sol
new file mode 100644
index 0000000000..707d12d745
--- /dev/null
+++ b/test/cmdlineTests/evmasm_prevrandao_post_paris/input.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    constructor() payable {
+        uint256 x = block.prevrandao;
+        assembly {
+            sstore(0, x)
+            stop()
+        }
+    }
+
+    fallback() external payable {
+        assembly {
+            stop()
+        }
+    }
+}
diff --git a/test/cmdlineTests/evmasm_prevrandao_post_paris/output b/test/cmdlineTests/evmasm_prevrandao_post_paris/output
new file mode 100644
index 0000000000..47c85bb50f
--- /dev/null
+++ b/test/cmdlineTests/evmasm_prevrandao_post_paris/output
@@ -0,0 +1,13 @@
+
+======= evmasm_prevrandao_post_paris/input.sol:C =======
+EVM assembly:
+  sstore(0x00, prevrandao)
+  stop
+stop
+
+sub_0: assembly {
+      stop
+}
+
+Opcodes:
+PREVRANDAO PUSH1 0x0 SSTORE STOP INVALID 
diff --git a/test/cmdlineTests/evmasm_prevrandao_pre_paris/args b/test/cmdlineTests/evmasm_prevrandao_pre_paris/args
new file mode 100644
index 0000000000..67d6f9a650
--- /dev/null
+++ b/test/cmdlineTests/evmasm_prevrandao_pre_paris/args
@@ -0,0 +1 @@
+--no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none --evm-version london
diff --git a/test/cmdlineTests/evmasm_prevrandao_pre_paris/err b/test/cmdlineTests/evmasm_prevrandao_pre_paris/err
new file mode 100644
index 0000000000..5970ec2020
--- /dev/null
+++ b/test/cmdlineTests/evmasm_prevrandao_pre_paris/err
@@ -0,0 +1,5 @@
+Warning: "prevrandao" is not supported by the VM version and will be treated as "difficulty".
+ --> evmasm_prevrandao_pre_paris/input.sol:6:21:
+  |
+6 |         uint256 x = block.prevrandao;
+  |                     ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/evmasm_prevrandao_pre_paris/input.sol b/test/cmdlineTests/evmasm_prevrandao_pre_paris/input.sol
new file mode 100644
index 0000000000..707d12d745
--- /dev/null
+++ b/test/cmdlineTests/evmasm_prevrandao_pre_paris/input.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    constructor() payable {
+        uint256 x = block.prevrandao;
+        assembly {
+            sstore(0, x)
+            stop()
+        }
+    }
+
+    fallback() external payable {
+        assembly {
+            stop()
+        }
+    }
+}
diff --git a/test/cmdlineTests/evmasm_prevrandao_pre_paris/output b/test/cmdlineTests/evmasm_prevrandao_pre_paris/output
new file mode 100644
index 0000000000..e41148a833
--- /dev/null
+++ b/test/cmdlineTests/evmasm_prevrandao_pre_paris/output
@@ -0,0 +1,13 @@
+
+======= evmasm_prevrandao_pre_paris/input.sol:C =======
+EVM assembly:
+  sstore(0x00, difficulty)
+  stop
+stop
+
+sub_0: assembly {
+      stop
+}
+
+Opcodes:
+DIFFICULTY PUSH1 0x0 SSTORE STOP INVALID 
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index 680531799d..12c3be67d6 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -20,6 +20,7 @@
  * @date 2018
  * Tests for the assembler.
  */
+#include <test/Common.h>
 
 #include <libevmasm/Assembly.h>
 #include <libsolutil/JSON.h>
@@ -59,15 +60,16 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 		{ "sub.asm", 1 },
 		{ "verbatim.asm", 2 }
 	};
-	Assembly _assembly{false, {}};
+	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
+	Assembly _assembly{evmVersion, false, {}};
 	auto root_asm = make_shared<string>("root.asm");
 	_assembly.setSourceLocation({1, 3, root_asm});
 
-	Assembly _subAsm{false, {}};
+	Assembly _subAsm{evmVersion, false, {}};
 	auto sub_asm = make_shared<string>("sub.asm");
 	_subAsm.setSourceLocation({6, 8, sub_asm});
 
-	Assembly _verbatimAsm(true, "");
+	Assembly _verbatimAsm(evmVersion, true, "");
 	auto verbatim_asm = make_shared<string>("verbatim.asm");
 	_verbatimAsm.setSourceLocation({8, 18, verbatim_asm});
 
@@ -215,6 +217,7 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 
 BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 {
+	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
 	// Tests for 1, 2, 3 number of immutables.
 	for (int numImmutables = 1; numImmutables <= 3; ++numImmutables)
 	{
@@ -243,7 +246,7 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 				{ *subName, 1 }
 			};
 
-			auto subAsm = make_shared<Assembly>(false, string{});
+			auto subAsm = make_shared<Assembly>(evmVersion, false, string{});
 			for (char i = 0; i < numImmutables; ++i)
 			{
 				for (int r = 0; r < numActualRefs; ++r)
@@ -253,7 +256,7 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 				}
 			}
 
-			Assembly assembly{true, {}};
+			Assembly assembly{evmVersion, true, {}};
 			for (char i = 1; i <= numImmutables; ++i)
 			{
 				assembly.setSourceLocation({10*i, 10*i + 3+i, assemblyName});
@@ -270,7 +273,7 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 			auto const numberOfMappings = std::count(sourceMappings.begin(), sourceMappings.end(), ';');
 
 			LinkerObject const& obj = assembly.assemble();
-			string const disassembly = disassemble(obj.bytecode, "\n");
+			string const disassembly = disassemble(obj.bytecode, evmVersion, "\n");
 			auto const numberOfOpcodes = std::count(disassembly.begin(), disassembly.end(), '\n');
 
 			#if 0 // {{{ debug prints
@@ -302,11 +305,12 @@ BOOST_AUTO_TEST_CASE(immutable)
 		{ "root.asm", 0 },
 		{ "sub.asm", 1 }
 	};
-	Assembly _assembly{true, {}};
+	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
+	Assembly _assembly{evmVersion, true, {}};
 	auto root_asm = make_shared<string>("root.asm");
 	_assembly.setSourceLocation({1, 3, root_asm});
 
-	Assembly _subAsm{false, {}};
+	Assembly _subAsm{evmVersion, false, {}};
 	auto sub_asm = make_shared<string>("sub.asm");
 	_subAsm.setSourceLocation({6, 8, sub_asm});
 	_subAsm.appendImmutable("someImmutable");
@@ -395,10 +399,11 @@ BOOST_AUTO_TEST_CASE(immutable)
 
 BOOST_AUTO_TEST_CASE(subobject_encode_decode)
 {
-	Assembly assembly{true, {}};
+	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
+	Assembly assembly{evmVersion, true, {}};
 
-	shared_ptr<Assembly> subAsmPtr = make_shared<Assembly>(false, string{});
-	shared_ptr<Assembly> subSubAsmPtr = make_shared<Assembly>(false, string{});
+	shared_ptr<Assembly> subAsmPtr = make_shared<Assembly>(evmVersion, false, string{});
+	shared_ptr<Assembly> subSubAsmPtr = make_shared<Assembly>(evmVersion, false, string{});
 
 	assembly.appendSubroutine(subAsmPtr);
 	subAsmPtr->appendSubroutine(subSubAsmPtr);
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index 6fc3c5a743..6f1a137599 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -1250,8 +1250,18 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
 	// tag unifications (due to block deduplication) is also
 	// visible at the super-assembly.
 
-	Assembly main{false, {}};
-	AssemblyPointer sub = make_shared<Assembly>(true, string{});
+	Assembly::OptimiserSettings settings;
+	settings.runInliner = false;
+	settings.runJumpdestRemover = true;
+	settings.runPeephole = true;
+	settings.runDeduplicate = true;
+	settings.runCSE = true;
+	settings.runConstantOptimiser = true;
+	settings.evmVersion = solidity::test::CommonOptions::get().evmVersion();
+	settings.expectedExecutionsPerDeployment = OptimiserSettings{}.expectedExecutionsPerDeployment;
+
+	Assembly main{settings.evmVersion, false, {}};
+	AssemblyPointer sub = make_shared<Assembly>(settings.evmVersion, true, string{});
 
 	sub->append(u256(1));
 	auto t1 = sub->newTag();
@@ -1277,16 +1287,6 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
 	main.append(t1.toSubAssemblyTag(subId));
 	main.append(u256(8));
 
-	Assembly::OptimiserSettings settings;
-	settings.runInliner = false;
-	settings.runJumpdestRemover = true;
-	settings.runPeephole = true;
-	settings.runDeduplicate = true;
-	settings.runCSE = true;
-	settings.runConstantOptimiser = true;
-	settings.evmVersion = solidity::test::CommonOptions::get().evmVersion();
-	settings.expectedExecutionsPerDeployment = OptimiserSettings{}.expectedExecutionsPerDeployment;
-
 	main.optimise(settings);
 
 	AssemblyItems expectationMain{
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index a1580fb539..e775bb6d0e 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -109,7 +109,7 @@ class OptimizerTestFramework: public SolidityExecutionFramework
 		bytes realCode = bytecodeSansMetadata(_bytecode);
 		BOOST_REQUIRE_MESSAGE(!realCode.empty(), "Invalid or missing metadata in bytecode.");
 		size_t instructions = 0;
-		evmasm::eachInstruction(realCode, [&](Instruction _instr, u256 const&) {
+		evmasm::eachInstruction(realCode, m_evmVersion, [&](Instruction _instr, u256 const&) {
 			if (!_which || *_which == _instr)
 				instructions++;
 		});
@@ -287,7 +287,7 @@ BOOST_AUTO_TEST_CASE(retain_information_in_branches)
 
 	bytes optimizedBytecode = compileAndRunWithOptimizer(sourceCode, 0, "c", true);
 	size_t numSHA3s = 0;
-	eachInstruction(optimizedBytecode, [&](Instruction _instr, u256 const&) {
+	eachInstruction(optimizedBytecode, m_evmVersion, [&](Instruction _instr, u256 const&) {
 		if (_instr == Instruction::KECCAK256)
 			numSHA3s++;
 	});
@@ -330,7 +330,7 @@ BOOST_AUTO_TEST_CASE(store_tags_as_unions)
 
 	bytes optimizedBytecode = compileAndRunWithOptimizer(sourceCode, 0, "test", true);
 	size_t numSHA3s = 0;
-	eachInstruction(optimizedBytecode, [&](Instruction _instr, u256 const&) {
+	eachInstruction(optimizedBytecode, m_evmVersion, [&](Instruction _instr, u256 const&) {
 		if (_instr == Instruction::KECCAK256)
 			numSHA3s++;
 	});
diff --git a/test/libsolidity/analysis/FunctionCallGraph.cpp b/test/libsolidity/analysis/FunctionCallGraph.cpp
index 8c10ca72a2..fcc8d14239 100644
--- a/test/libsolidity/analysis/FunctionCallGraph.cpp
+++ b/test/libsolidity/analysis/FunctionCallGraph.cpp
@@ -1860,6 +1860,7 @@ BOOST_AUTO_TEST_CASE(builtins)
 				block.chainid;
 				block.coinbase;
 				block.difficulty;
+				block.prevrandao;
 				block.gaslimit;
 				block.number;
 				block.timestamp;
diff --git a/test/libsolidity/semanticTests/inlineAssembly/difficulty.sol b/test/libsolidity/semanticTests/inlineAssembly/difficulty.sol
new file mode 100644
index 0000000000..7ae286110c
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/difficulty.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() public view returns (uint ret) {
+        assembly {
+            ret := difficulty()
+        }
+    }
+}
+// ====
+// compileToEwasm: also
+// EVMVersion: <paris
+// ----
+// f() -> 200000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol b/test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol
new file mode 100644
index 0000000000..5a3b791feb
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() public view returns (uint ret) {
+        assembly {
+            ret := prevrandao()
+        }
+    }
+}
+// ====
+// compileToEwasm: also
+// EVMVersion: >=paris
+// ----
+// f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
diff --git a/test/libsolidity/semanticTests/state/block_prevrandao.sol b/test/libsolidity/semanticTests/state/block_prevrandao.sol
new file mode 100644
index 0000000000..24d5f2af63
--- /dev/null
+++ b/test/libsolidity/semanticTests/state/block_prevrandao.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public view returns (uint) {
+        return block.prevrandao;
+    }
+}
+// ====
+// compileToEwasm: also
+// EVMVersion: >=paris
+// ----
+// f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
diff --git a/test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol b/test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol
new file mode 100644
index 0000000000..efc4d226f5
--- /dev/null
+++ b/test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public view returns (uint) {
+        return block.prevrandao;
+    }
+}
+// ====
+// compileToEwasm: also
+// EVMVersion: <paris
+// ----
+// f() -> 200000000
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_builtin_pre_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_builtin_pre_paris.sol
new file mode 100644
index 0000000000..13ea92c526
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_builtin_pre_paris.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f() public view returns (uint256) {
+        return block.difficulty;
+    }
+
+    function g() public view returns (uint256 ret) {
+        assembly {
+            ret := difficulty()
+        }
+    }
+}
+// ====
+// EVMVersion: <paris
+// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_disallowed_function_pre_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_disallowed_function_pre_paris.sol
new file mode 100644
index 0000000000..a177e8f630
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_disallowed_function_pre_paris.sol
@@ -0,0 +1,21 @@
+contract C {
+    function f() public view returns (uint256 ret) {
+        assembly {
+            let difficulty := sload(0)
+            ret := difficulty
+        }
+    }
+
+    function g() public pure returns (uint256 ret) {
+        assembly {
+            function difficulty() -> r {
+                r := 1000
+            }
+            ret := difficulty()
+        }
+    }
+}
+// ====
+// EVMVersion: <paris
+// ----
+// ParserError 5568: (101-111): Cannot use builtin function name "difficulty" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_magic_block_warn_post_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_magic_block_warn_post_paris.sol
new file mode 100644
index 0000000000..8fb75340e1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_magic_block_warn_post_paris.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() public view returns (uint256) {
+        return block.difficulty;
+    }
+}
+// ====
+// EVMVersion: >=paris
+// ----
+// Warning 8417: (77-93): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_nobuiltin_post_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_nobuiltin_post_paris.sol
new file mode 100644
index 0000000000..65fe4c15c1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_nobuiltin_post_paris.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() public {
+        assembly {
+            pop(difficulty())
+        }
+    }
+}
+// ====
+// EVMVersion: >=paris
+// ----
+// DeclarationError 4619: (74-84): Function "difficulty" not found.
+// TypeError 3950: (74-86): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/difficulty_reserved_post_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_reserved_post_paris.sol
new file mode 100644
index 0000000000..5121a110ba
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/difficulty_reserved_post_paris.sol
@@ -0,0 +1,22 @@
+contract C {
+    function f() public view returns (uint256 ret) {
+        assembly {
+            let difficulty := sload(0)
+            ret := difficulty
+        }
+    }
+
+    function g() public pure returns (uint256 ret) {
+        assembly {
+            function difficulty() -> r {
+                r := 1000
+            }
+            ret := difficulty()
+        }
+    }
+}
+// ====
+// EVMVersion: >=paris
+// ----
+// DeclarationError 5017: (101-111): The identifier "difficulty" is reserved and can not be used.
+// DeclarationError 5017: (255-323): The identifier "difficulty" is reserved and can not be used.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_allowed_function_pre_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_allowed_function_pre_paris.sol
new file mode 100644
index 0000000000..d85e77a45e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_allowed_function_pre_paris.sol
@@ -0,0 +1,20 @@
+contract C {
+    function f() public view returns (uint256 ret) {
+        assembly {
+            let prevrandao := sload(0)
+            ret := prevrandao
+        }
+    }
+
+    function g() public pure returns (uint256 ret) {
+        assembly {
+            function prevrandao() -> r {
+                r := 1000
+            }
+            ret := prevrandao()
+        }
+    }
+}
+// ====
+// EVMVersion: <paris
+// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_builtin_post_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_builtin_post_paris.sol
new file mode 100644
index 0000000000..66dbc110ae
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_builtin_post_paris.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f() public view returns (uint256) {
+        return block.prevrandao;
+    }
+
+    function g() public view returns (uint256 ret) {
+        assembly {
+            ret := prevrandao()
+        }
+    }
+}
+// ====
+// EVMVersion: >=paris
+// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_disallowed_function_post_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_disallowed_function_post_paris.sol
new file mode 100644
index 0000000000..6c284a0059
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_disallowed_function_post_paris.sol
@@ -0,0 +1,21 @@
+contract C {
+    function f() public view returns (uint256 ret) {
+        assembly {
+            let prevrandao := sload(0)
+            ret := prevrandao
+        }
+    }
+
+    function g() public pure returns (uint256 ret) {
+        assembly {
+            function prevrandao() -> r {
+                r := 1000
+            }
+            ret := prevrandao()
+        }
+    }
+}
+// ====
+// EVMVersion: >=paris
+// ----
+// ParserError 5568: (101-111): Cannot use builtin function name "prevrandao" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_magic_block_warn_pre_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_magic_block_warn_pre_paris.sol
new file mode 100644
index 0000000000..2086892b1c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_magic_block_warn_pre_paris.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() public view returns (uint256) {
+        return block.prevrandao;
+    }
+}
+// ====
+// EVMVersion: <paris
+// ----
+// Warning 9432: (77-93): "prevrandao" is not supported by the VM version and will be treated as "difficulty".
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_nobuitin_pre_paris.sol b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_nobuitin_pre_paris.sol
new file mode 100644
index 0000000000..34e7763988
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/prevrandao_nobuitin_pre_paris.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() public {
+        assembly {
+            pop(prevrandao())
+        }
+    }
+}
+// ====
+// EVMVersion: <paris
+// ----
+// DeclarationError 4619: (74-84): Function "prevrandao" not found.
+// TypeError 3950: (74-86): Expected expression to evaluate to one value, but got 0 values instead.
diff --git a/test/libsolidity/syntaxTests/tryCatch/low_level_pre-byzantium.sol b/test/libsolidity/syntaxTests/tryCatch/low_level_homestead.sol
similarity index 92%
rename from test/libsolidity/syntaxTests/tryCatch/low_level_pre-byzantium.sol
rename to test/libsolidity/syntaxTests/tryCatch/low_level_homestead.sol
index 0f99b5593d..1588301bb8 100644
--- a/test/libsolidity/syntaxTests/tryCatch/low_level_pre-byzantium.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/low_level_homestead.sol
@@ -8,6 +8,6 @@ contract C {
     }
 }
 // ====
-// EVMVersion: <byzantium
+// EVMVersion: =homestead
 // ----
 // TypeError 9908: (73-106): This catch clause type cannot be used on the selected EVM version (homestead). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/low_level_spuriousDragon.sol b/test/libsolidity/syntaxTests/tryCatch/low_level_spuriousDragon.sol
new file mode 100644
index 0000000000..19728ca22d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/low_level_spuriousDragon.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public {
+        try this.f() {
+
+        } catch (bytes memory) {
+
+        }
+    }
+}
+// ====
+// EVMVersion: =spuriousDragon
+// ----
+// TypeError 9908: (73-106): This catch clause type cannot be used on the selected EVM version (spuriousDragon). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/low_level_tangerineWhistle.sol b/test/libsolidity/syntaxTests/tryCatch/low_level_tangerineWhistle.sol
new file mode 100644
index 0000000000..33d17d8467
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/low_level_tangerineWhistle.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public {
+        try this.f() {
+
+        } catch (bytes memory) {
+
+        }
+    }
+}
+// ====
+// EVMVersion: =tangerineWhistle
+// ----
+// TypeError 9908: (73-106): This catch clause type cannot be used on the selected EVM version (tangerineWhistle). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/structured_pre_byzantium.sol b/test/libsolidity/syntaxTests/tryCatch/structured_homestead.sol
similarity index 92%
rename from test/libsolidity/syntaxTests/tryCatch/structured_pre_byzantium.sol
rename to test/libsolidity/syntaxTests/tryCatch/structured_homestead.sol
index e2878386cd..b77e6b4e07 100644
--- a/test/libsolidity/syntaxTests/tryCatch/structured_pre_byzantium.sol
+++ b/test/libsolidity/syntaxTests/tryCatch/structured_homestead.sol
@@ -8,6 +8,6 @@ contract C {
     }
 }
 // ====
-// EVMVersion: <byzantium
+// EVMVersion: =homestead
 // ----
 // TypeError 1812: (73-112): This catch clause type cannot be used on the selected EVM version (homestead). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/structured_spuriousDragon.sol b/test/libsolidity/syntaxTests/tryCatch/structured_spuriousDragon.sol
new file mode 100644
index 0000000000..64863d58d2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/structured_spuriousDragon.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public {
+        try this.f() {
+
+        } catch Error(string memory) {
+
+        }
+    }
+}
+// ====
+// EVMVersion: =spuriousDragon
+// ----
+// TypeError 1812: (73-112): This catch clause type cannot be used on the selected EVM version (spuriousDragon). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/tryCatch/structured_tangerineWhistle.sol b/test/libsolidity/syntaxTests/tryCatch/structured_tangerineWhistle.sol
new file mode 100644
index 0000000000..c57d1d66d6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/tryCatch/structured_tangerineWhistle.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public {
+        try this.f() {
+
+        } catch Error(string memory) {
+
+        }
+    }
+}
+// ====
+// EVMVersion: =tangerineWhistle
+// ----
+// TypeError 1812: (73-112): This catch clause type cannot be used on the selected EVM version (tangerineWhistle). You need at least a Byzantium-compatible EVM or use `catch { ... }`.
diff --git a/test/libsolidity/syntaxTests/types/magic_block_istanbul.sol b/test/libsolidity/syntaxTests/types/magic_block_istanbul.sol
index 66b13fcc55..62ac0e1f74 100644
--- a/test/libsolidity/syntaxTests/types/magic_block_istanbul.sol
+++ b/test/libsolidity/syntaxTests/types/magic_block_istanbul.sol
@@ -3,15 +3,12 @@ contract C {
         return block.coinbase;
     }
     function g() public view returns (uint) {
-        return block.difficulty;
-    }
-    function h() public view returns (uint) {
         return block.gaslimit;
     }
-    function i() public view returns (uint) {
+    function h() public view returns (uint) {
         return block.timestamp;
     }
-    function j() public view returns (uint) {
+    function i() public view returns (uint) {
         return block.chainid;
     }
 }
diff --git a/test/libsolidity/syntaxTests/types/magic_block_paris.sol b/test/libsolidity/syntaxTests/types/magic_block_paris.sol
new file mode 100644
index 0000000000..7875d9b0e5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/magic_block_paris.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public view returns (uint) {
+        return block.prevrandao;
+    }
+    function g() public view returns (uint ret) {
+        assembly {
+            ret := prevrandao()
+        }
+    }
+}
+// ====
+// EVMVersion: >=paris
+// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
index 8b634c2195..2b9e5ae5fb 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
@@ -73,7 +73,7 @@ contract C {
             pop(coinbase())
             pop(timestamp())
             pop(number())
-            pop(difficulty())
+            pop(prevrandao())
             pop(gaslimit())
 
             // NOTE: msize() is allowed only with optimizer disabled
@@ -83,7 +83,7 @@ contract C {
     }
 }
 // ====
-// EVMVersion: >=london
+// EVMVersion: >=paris
 // ----
 // Warning 5740: (89-1716): Unreachable code.
 // Warning 5740: (1729-1741): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_london.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_london.sol
new file mode 100644
index 0000000000..be9f7281f2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_london.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public {
+        assembly {
+            pop(difficulty())
+        }
+    }
+}
+// ====
+// EVMVersion: <=london
+// ----
+// Warning 2018: (17-103): Function state mutability can be restricted to view
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
index 85d7b63008..16c75d6f72 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure.sol
@@ -73,7 +73,6 @@ contract C {
             //pop(coinbase())
             //pop(timestamp())
             //pop(number())
-            //pop(difficulty())
             //pop(gaslimit())
 
             // NOTE: msize() is allowed only with optimizer disabled
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol
index af30bc21ae..0bb92c1fd2 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view.sol
@@ -73,7 +73,7 @@ contract C {
             pop(coinbase())
             pop(timestamp())
             pop(number())
-            pop(difficulty())
+            pop(prevrandao())
             pop(gaslimit())
 
             // NOTE: msize() is allowed only with optimizer disabled
@@ -83,7 +83,7 @@ contract C {
     }
 }
 // ====
-// EVMVersion: >=london
+// EVMVersion: >=paris
 // ----
 // Warning 5740: (94-1733): Unreachable code.
 // Warning 5740: (1746-1758): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_london.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_london.sol
new file mode 100644
index 0000000000..ffc757a19f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_london.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public view {
+        assembly {
+            pop(difficulty())
+        }
+    }
+}
+// ====
+// EVMVersion: <=london
+// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
index f9a652fdbd..9b3806f4d6 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
@@ -6,33 +6,26 @@ contract C {
             pop(gas())
             pop(address())
             pop(balance(0))
-            pop(selfbalance())
             pop(caller())
             pop(callvalue())
             pop(extcodesize(0))
             extcodecopy(0, 1, 2, 3)
-            pop(extcodehash(0))
             pop(create(0, 1, 2))
-            pop(create2(0, 1, 2, 3))
             pop(call(0, 1, 2, 3, 4, 5, 6))
             pop(callcode(0, 1, 2, 3, 4, 5, 6))
             pop(delegatecall(0, 1, 2, 3, 4, 5))
-            pop(staticcall(0, 1, 2, 3, 4, 5))
             selfdestruct(0)
             log0(0, 1)
             log1(0, 1, 2)
             log2(0, 1, 2, 3)
             log3(0, 1, 2, 3, 4)
             log4(0, 1, 2, 3, 4, 5)
-            pop(chainid())
-            pop(basefee())
             pop(origin())
             pop(gasprice())
             pop(blockhash(0))
             pop(coinbase())
             pop(timestamp())
             pop(number())
-            pop(difficulty())
             pop(gaslimit())
 
             // These two are disallowed too but the error suppresses other errors.
@@ -41,40 +34,31 @@ contract C {
         }
     }
 }
-// ====
-// EVMVersion: >=london
 // ----
-// Warning 5740: (672-1083): Unreachable code.
+// Warning 5740: (526-853): Unreachable code.
 // TypeError 2527: (79-87): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 8961: (101-113): Function cannot be declared as pure because this expression (potentially) modifies the state.
 // TypeError 2527: (130-135): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 2527: (153-162): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 2527: (180-190): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (208-221): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (239-247): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (265-276): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (294-308): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (322-345): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (362-376): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (394-409): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (427-446): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (464-489): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (507-536): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (554-584): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 2527: (602-630): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 8961: (644-659): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (672-682): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (695-708): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (721-737): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (750-769): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 8961: (782-804): Function cannot be declared as pure because this expression (potentially) modifies the state.
-// TypeError 2527: (821-830): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (848-857): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (875-883): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (901-911): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (929-941): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (959-969): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (987-998): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1016-1024): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1042-1054): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
-// TypeError 2527: (1072-1082): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (208-216): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (234-245): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (263-277): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (291-314): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (331-346): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (364-389): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (407-436): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (454-484): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (498-513): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (526-536): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (549-562): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (575-591): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (604-623): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (636-658): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 2527: (675-683): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (701-711): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (729-741): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (759-769): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (787-798): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (816-824): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (842-852): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_byzantium.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_byzantium.sol
new file mode 100644
index 0000000000..f0320d8b08
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_byzantium.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public pure {
+        assembly {
+            pop(staticcall(0, 1, 2, 3, 4, 5))
+        }
+    }
+}
+// ====
+// EVMVersion: >=byzantium
+// ----
+// TypeError 2527: (79-107): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_constantinople.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_constantinople.sol
new file mode 100644
index 0000000000..30210efc32
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_constantinople.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public pure {
+        assembly {
+            pop(extcodehash(0))
+            pop(create2(0, 1, 2, 3))
+        }
+    }
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// TypeError 2527: (79-93): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 8961: (111-130): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_istanbul.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_istanbul.sol
new file mode 100644
index 0000000000..b4e0224834
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_istanbul.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public pure {
+        assembly {
+            pop(selfbalance())
+            pop(chainid())
+        }
+    }
+}
+// ====
+// EVMVersion: >=istanbul
+// ----
+// TypeError 2527: (79-92): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (110-119): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_london.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_london.sol
new file mode 100644
index 0000000000..ba47d44472
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_london.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public pure {
+        assembly {
+            pop(basefee())
+        }
+    }
+}
+// ====
+// EVMVersion: >=london
+// ----
+// TypeError 2527: (79-88): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_paris.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_paris.sol
new file mode 100644
index 0000000000..e374522a1f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_paris.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public pure {
+        assembly {
+            pop(prevrandao())
+        }
+    }
+}
+// ====
+// EVMVersion: >=paris
+// ----
+// TypeError 2527: (79-91): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_pre_paris.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_pre_paris.sol
new file mode 100644
index 0000000000..e348fd98be
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_pre_paris.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public pure {
+        assembly {
+            pop(difficulty())
+        }
+    }
+}
+// ====
+// EVMVersion: <=london
+// ----
+// TypeError 2527: (79-91): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
index 744fa8c033..73042b18b6 100644
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ b/test/libyul/EVMCodeTransformTest.cpp
@@ -19,6 +19,8 @@
 #include <test/libyul/EVMCodeTransformTest.h>
 #include <test/libyul/Common.h>
 
+#include <test/Common.h>
+
 #include <libyul/YulStack.h>
 #include <libyul/backends/evm/EthAssemblyAdapter.h>
 #include <libyul/backends/evm/EVMObjectCompiler.h>
@@ -66,7 +68,7 @@ TestCase::TestResult EVMCodeTransformTest::run(ostream& _stream, string const& _
 		return TestResult::FatalError;
 	}
 
-	evmasm::Assembly assembly{false, {}};
+	evmasm::Assembly assembly{solidity::test::CommonOptions::get().evmVersion(), false, {}};
 	EthAssemblyAdapter adapter(assembly);
 	EVMObjectCompiler::compile(
 		*stack.parserResult(),
diff --git a/test/libyul/ObjectCompilerTest.cpp b/test/libyul/ObjectCompilerTest.cpp
index 190001a57a..3a8d966922 100644
--- a/test/libyul/ObjectCompilerTest.cpp
+++ b/test/libyul/ObjectCompilerTest.cpp
@@ -20,6 +20,8 @@
 
 #include <test/libsolidity/util/SoltestErrors.h>
 
+#include <test/Common.h>
+
 #include <libsolutil/AnsiColorized.h>
 
 #include <libyul/YulStack.h>
@@ -101,7 +103,7 @@ TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _li
 				"Bytecode: " +
 				util::toHex(obj.bytecode->bytecode) +
 				"\nOpcodes: " +
-				boost::trim_copy(evmasm::disassemble(obj.bytecode->bytecode)) +
+				boost::trim_copy(evmasm::disassemble(obj.bytecode->bytecode, solidity::test::CommonOptions::get().evmVersion())) +
 				"\nSourceMappings:" +
 				(obj.sourceMappings->empty() ? "" : " " + *obj.sourceMappings) +
 				"\n";
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index 3d1974e968..a1ada928b8 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -98,7 +98,7 @@ string YulInterpreterTest::interpret()
 	{
 		Interpreter::run(
 			state,
-			EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion{}),
+			EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion()),
 			*m_ast,
 			/*disableExternalCalls=*/ !m_simulateExternalCallsToSelf,
 			/*disableMemoryTracing=*/ false
diff --git a/test/libyul/ewasmTranslationTests/difficulty.yul b/test/libyul/ewasmTranslationTests/difficulty.yul
index c467d51a7b..52e4275b43 100644
--- a/test/libyul/ewasmTranslationTests/difficulty.yul
+++ b/test/libyul/ewasmTranslationTests/difficulty.yul
@@ -1,6 +1,8 @@
 {
   sstore(0, difficulty())
 }
+// ====
+// EVMVersion: <paris
 // ----
 // Trace:
 // Memory dump:
diff --git a/test/libyul/yulInterpreterTests/difficulty.yul b/test/libyul/yulInterpreterTests/difficulty.yul
new file mode 100644
index 0000000000..7a59bade2a
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/difficulty.yul
@@ -0,0 +1,10 @@
+{
+  sstore(0, difficulty())
+}
+// ====
+// EVMVersion: <paris
+// ----
+// Trace:
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000009999999
diff --git a/test/libyul/yulInterpreterTests/prevrandao.yul b/test/libyul/yulInterpreterTests/prevrandao.yul
new file mode 100644
index 0000000000..809506c9fe
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/prevrandao.yul
@@ -0,0 +1,10 @@
+{
+  sstore(0, prevrandao())
+}
+// ====
+// EVMVersion: >=paris
+// ----
+// Trace:
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000010000000000000001
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 25ad6986cb..895957f4d2 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -189,7 +189,7 @@ void FuzzerUtil::testConstantOptimizer(string const& _input, bool _quiet)
 
 	for (bool isCreation: {false, true})
 	{
-		Assembly assembly{isCreation, {}};
+		Assembly assembly{langutil::EVMVersion{}, isCreation, {}};
 		for (u256 const& n: numbers)
 		{
 			if (!_quiet)
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index f0691a8369..db0e648286 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -98,7 +98,7 @@ u256 EVMInstructionInterpreter::eval(
 	using namespace solidity::evmasm;
 	using evmasm::Instruction;
 
-	auto info = instructionInfo(_instruction);
+	auto info = instructionInfo(_instruction, m_evmVersion);
 	yulAssert(static_cast<size_t>(info.args) == _arguments.size(), "");
 
 	auto const& arg = _arguments;
@@ -268,8 +268,8 @@ u256 EVMInstructionInterpreter::eval(
 		return m_state.timestamp;
 	case Instruction::NUMBER:
 		return m_state.blockNumber;
-	case Instruction::DIFFICULTY:
-		return m_state.difficulty;
+	case Instruction::PREVRANDAO:
+		return (m_evmVersion < langutil::EVMVersion::paris()) ? m_state.difficulty : m_state.prevrandao;
 	case Instruction::GASLIMIT:
 		return m_state.gaslimit;
 	// --------------- memory / storage / logs ---------------
@@ -543,7 +543,7 @@ void EVMInstructionInterpreter::logTrace(
 )
 {
 	logTrace(
-		evmasm::instructionInfo(_instruction).name,
+		evmasm::instructionInfo(_instruction, m_evmVersion).name,
 		SemanticInformation::memory(_instruction) == SemanticInformation::Effect::Write,
 		_arguments,
 		_data
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
index c60e4b4e7e..9f0f473f14 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -26,6 +26,8 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Numeric.h>
 
+#include <liblangutil/EVMVersion.h>
+
 #include <vector>
 
 namespace solidity::evmasm
@@ -74,7 +76,8 @@ struct InterpreterState;
 class EVMInstructionInterpreter
 {
 public:
-	explicit EVMInstructionInterpreter(InterpreterState& _state, bool _disableMemWriteTrace):
+	explicit EVMInstructionInterpreter(langutil::EVMVersion _evmVersion, InterpreterState& _state, bool _disableMemWriteTrace):
+		m_evmVersion(_evmVersion),
 		m_state(_state),
 		m_disableMemoryWriteInstructions(_disableMemWriteTrace)
 	{}
@@ -128,6 +131,7 @@ class EVMInstructionInterpreter
 		return m_disableMemoryWriteInstructions;
 	}
 
+	langutil::EVMVersion m_evmVersion;
 	InterpreterState& m_state;
 	/// Flag to disable trace of instructions that write to memory.
 	bool m_disableMemoryWriteInstructions;
diff --git a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
index 36f51b11c8..fdba09aa46 100644
--- a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
+++ b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
@@ -597,7 +597,7 @@ u256 EwasmBuiltinInterpreter::readU256(uint64_t _offset, size_t _croppedTo)
 
 void EwasmBuiltinInterpreter::logTrace(evmasm::Instruction _instruction, std::vector<u256> const& _arguments, bytes const& _data)
 {
-	logTrace(evmasm::instructionInfo(_instruction).name, _arguments, _data);
+	logTrace(evmasm::instructionInfo(_instruction, langutil::EVMVersion()).name, _arguments, _data);
 }
 
 void EwasmBuiltinInterpreter::logTrace(std::string const& _pseudoInstruction, std::vector<u256> const& _arguments, bytes const& _data)
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index e10f6a9e57..b66967e26f 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -314,7 +314,7 @@ void ExpressionEvaluator::operator()(FunctionCall const& _funCall)
 	{
 		if (BuiltinFunctionForEVM const* fun = dialect->builtin(_funCall.functionName.name))
 		{
-			EVMInstructionInterpreter interpreter(m_state, m_disableMemoryTrace);
+			EVMInstructionInterpreter interpreter(dialect->evmVersion(), m_state, m_disableMemoryTrace);
 
 			u256 const value = interpreter.evalBuiltin(*fun, _funCall.arguments, values());
 
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index 949d0ce4ec..26a8b27012 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -94,6 +94,7 @@ struct InterpreterState
 	u256 timestamp = 0x88888888;
 	u256 blockNumber = 1024;
 	u256 difficulty = 0x9999999;
+	u256 prevrandao = (u256(1) << 64) + 1;
 	u256 gaslimit = 4000000;
 	u256 chainid = 0x01;
 	/// The minimum value of basefee: 7 wei.

From e7543d487d8dd813ca37765d5d8b1c011641a6eb Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 19 Jan 2023 09:34:14 +0100
Subject: [PATCH 1126/1748] Issue warning when using deprecated SELFDESTRUCT

---
 Changelog.md                                              | 1 +
 docs/contracts/function-modifiers.rst                     | 1 +
 docs/contracts/inheritance.rst                            | 4 +++-
 docs/examples/micropayment.rst                            | 2 ++
 libsolidity/analysis/TypeChecker.cpp                      | 8 ++++++++
 libyul/AsmAnalysis.cpp                                    | 8 ++++++++
 .../nameAndTypeResolution/430_bare_selfdestruct.sol       | 1 +
 .../types/address/address_nonpayable_selfdestruct.sol     | 1 +
 .../types/address/address_payable_selfdestruct.sol        | 1 +
 .../syntaxTests/viewPureChecker/builtin_functions.sol     | 1 +
 .../viewPureChecker/builtin_functions_view_fail.sol       | 1 +
 .../inline_assembly_instructions_allowed.sol              | 1 +
 .../inline_assembly_instructions_disallowed_pure.sol      | 1 +
 .../inline_assembly_instructions_disallowed_view.sol      | 1 +
 test/libyul/yulSyntaxTests/selfdestruct.yul               | 1 +
 15 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 251144b378..362be6d1fc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -21,6 +21,7 @@ Compiler Features:
  * SMTChecker: Make ``z3`` the default solver for the BMC and CHC engines instead of all solvers.
  * Parser: More detailed error messages about invalid version pragmas.
  * Removed support for the ``solidity-upgrade`` tool.
+ * TypeChecker: Warn when using deprecated builtin ``selfdestruct``.
 
 
 Bugfixes:
diff --git a/docs/contracts/function-modifiers.rst b/docs/contracts/function-modifiers.rst
index f231195448..bbdec1e488 100644
--- a/docs/contracts/function-modifiers.rst
+++ b/docs/contracts/function-modifiers.rst
@@ -19,6 +19,7 @@ if they are marked ``virtual``. For details, please see
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.1 <0.9.0;
+    // This will report a warning due to deprecated selfdestruct
 
     contract owned {
         constructor() { owner = payable(msg.sender); }
diff --git a/docs/contracts/inheritance.rst b/docs/contracts/inheritance.rst
index a33a36d27b..4f310bd406 100644
--- a/docs/contracts/inheritance.rst
+++ b/docs/contracts/inheritance.rst
@@ -40,7 +40,7 @@ Details are given in the following example.
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
-
+    // This will report a warning due to deprecated selfdestruct
 
     contract Owned {
         constructor() { owner = payable(msg.sender); }
@@ -130,6 +130,7 @@ seen in the following example:
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
+    // This will report a warning due to deprecated selfdestruct
 
     contract owned {
         constructor() { owner = payable(msg.sender); }
@@ -162,6 +163,7 @@ explicitly in the final override, but this function will bypass
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
+    // This will report a warning due to deprecated selfdestruct
 
     contract owned {
         constructor() { owner = payable(msg.sender); }
diff --git a/docs/examples/micropayment.rst b/docs/examples/micropayment.rst
index 7ade926572..f5037e6f76 100644
--- a/docs/examples/micropayment.rst
+++ b/docs/examples/micropayment.rst
@@ -144,6 +144,7 @@ The full contract
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
+    // This will report a warning due to deprecated selfdestruct
     contract ReceiverPays {
         address owner = msg.sender;
 
@@ -341,6 +342,7 @@ The full contract
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.7.0 <0.9.0;
+    // This will report a warning due to deprecated selfdestruct
     contract SimplePaymentChannel {
         address payable public sender;      // The account sending payments.
         address payable public recipient;   // The account receiving the payments.
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index ac00ab7fe5..4e390931fc 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3657,6 +3657,14 @@ bool TypeChecker::visit(Identifier const& _identifier)
 				_identifier.location(),
 				"\"suicide\" has been deprecated in favour of \"selfdestruct\"."
 			);
+		else if (_identifier.name() == "selfdestruct" && fType->kind() == FunctionType::Kind::Selfdestruct)
+			m_errorReporter.warning(
+				5159_error,
+				_identifier.location(),
+				"\"selfdestruct\" has been deprecated. "
+				"The underlying opcode will eventually undergo breaking changes, "
+				"and its use is not recommended."
+			);
 	}
 
 	if (
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 4c9abdaddf..3ca84da714 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -311,6 +311,14 @@ vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 
 	if (BuiltinFunction const* f = m_dialect.builtin(_funCall.functionName.name))
 	{
+		if (_funCall.functionName.name.str() == "selfdestruct")
+			m_errorReporter.warning(
+				1699_error,
+				nativeLocationOf(_funCall.functionName),
+				"\"selfdestruct\" has been deprecated. "
+				"The underlying opcode will eventually undergo breaking changes, "
+				"and its use is not recommended."
+			);
 		parameterTypes = &f->parameters;
 		returnTypes = &f->returns;
 		if (!f->literalArguments.empty())
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol
index b770b60447..6662d7b299 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol
@@ -2,4 +2,5 @@ contract C {
     function f() pure public { selfdestruct; }
 }
 // ----
+// Warning 5159: (44-56): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
 // Warning 6133: (44-56): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol b/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
index 8122587115..9122d2a894 100644
--- a/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
@@ -4,4 +4,5 @@ contract C {
     }
 }
 // ----
+// Warning 5159: (56-68): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
 // TypeError 9553: (69-70): Invalid type for argument in function call. Invalid implicit conversion from address to address payable requested.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol b/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol
index 62eadeca58..bd1aff7952 100644
--- a/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol
@@ -4,3 +4,4 @@ contract C {
     }
 }
 // ----
+// Warning 5159: (64-76): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol
index b381b31300..3ee9406798 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol
@@ -19,3 +19,4 @@ contract C {
     receive() payable external {}
 }
 // ----
+// Warning 5159: (122-134): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
index 76a05d8beb..f458aaad5d 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
@@ -20,6 +20,7 @@ contract C {
     }
 }
 // ----
+// Warning 5159: (201-213): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
 // TypeError 8961: (52-77): Function cannot be declared as view because this expression (potentially) modifies the state.
 // TypeError 8961: (132-153): Function cannot be declared as view because this expression (potentially) modifies the state.
 // TypeError 8961: (201-228): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
index 2b9e5ae5fb..b3753706cf 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
@@ -85,6 +85,7 @@ contract C {
 // ====
 // EVMVersion: >=paris
 // ----
+// Warning 1699: (1754-1766): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
 // Warning 5740: (89-1716): Unreachable code.
 // Warning 5740: (1729-1741): Unreachable code.
 // Warning 5740: (1754-1769): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
index 9b3806f4d6..be84b801f2 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
@@ -35,6 +35,7 @@ contract C {
     }
 }
 // ----
+// Warning 1699: (498-510): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
 // Warning 5740: (526-853): Unreachable code.
 // TypeError 2527: (79-87): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 8961: (101-113): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol
index 5daf917420..cd69bed793 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol
@@ -23,6 +23,7 @@ contract C {
 // ====
 // EVMVersion: >=london
 // ----
+// Warning 1699: (308-320): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
 // Warning 5740: (336-468): Unreachable code.
 // TypeError 8961: (75-87): Function cannot be declared as view because this expression (potentially) modifies the state.
 // TypeError 8961: (104-119): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libyul/yulSyntaxTests/selfdestruct.yul b/test/libyul/yulSyntaxTests/selfdestruct.yul
index 70d76c73b2..745fdc5c5a 100644
--- a/test/libyul/yulSyntaxTests/selfdestruct.yul
+++ b/test/libyul/yulSyntaxTests/selfdestruct.yul
@@ -2,3 +2,4 @@
 	selfdestruct(0x02)
 }
 // ----
+// Warning 1699: (3-15): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.

From 83a937423f2d486a4e92004ad02acf21599239e9 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 24 Jan 2023 11:43:34 +0100
Subject: [PATCH 1127/1748] Update docs to reflect deprecation warning

---
 docs/introduction-to-smart-contracts.rst | 5 +++++
 docs/units-and-global-variables.rst      | 8 +++++---
 docs/yul.rst                             | 6 ++++++
 libyul/AsmAnalysis.cpp                   | 2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 875e5ebc86..4e370a461b 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -562,6 +562,11 @@ is removed from the state. Removing the contract in theory sounds like a good
 idea, but it is potentially dangerous, as if someone sends Ether to removed
 contracts, the Ether is forever lost.
 
+.. warning::
+    From version 0.8.18 and up, the use of ``selfdestruct`` in both Solidity and Yul will trigger a
+    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behaviour
+    as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+
 .. warning::
     Even if a contract is removed by ``selfdestruct``, it is still part of the
     history of the blockchain and probably retained by most Ethereum nodes.
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index 6e49665907..80162a3b4a 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -327,11 +327,13 @@ Contract Related
     - the receiving contract's receive function is not executed.
     - the contract is only really destroyed at the end of the transaction and ``revert`` s might "undo" the destruction.
 
-
-
-
 Furthermore, all functions of the current contract are callable directly including the current function.
 
+.. warning::
+    From version 0.8.18 and up, the use of ``selfdestruct`` in both Solidity and Yul will trigger a
+    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behaviour
+    as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+
 .. note::
     Prior to version 0.5.0, there was a function called ``suicide`` with the same
     semantics as ``selfdestruct``.
diff --git a/docs/yul.rst b/docs/yul.rst
index 206f80cace..bbe72a5320 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -899,6 +899,7 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 | revert(p, s)            | `-` | B | end execution, revert state changes, return data mem[p...(p+s)) |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | selfdestruct(a)         | `-` | F | end execution, destroy current contract and send funds to a     |
+|                         |     |   | (deprecated)                                                    |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | invalid()               | `-` | F | end execution with invalid instruction                          |
 +-------------------------+-----+---+-----------------------------------------------------------------+
@@ -956,6 +957,11 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
   Please note that irrelevant to which EVM version is selected in the compiler, the semantics of
   instructions depend on the final chain of deployment.
 
+.. warning::
+    From version 0.8.18 and up, the use of ``selfdestruct`` in both Solidity and Yul will trigger a
+    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behaviour
+    as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
+
 In some internal dialects, there are additional functions:
 
 datasize, dataoffset, datacopy
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 3ca84da714..b8baec9988 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -311,7 +311,7 @@ vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 
 	if (BuiltinFunction const* f = m_dialect.builtin(_funCall.functionName.name))
 	{
-		if (_funCall.functionName.name.str() == "selfdestruct")
+		if (_funCall.functionName.name == "selfdestruct"_yulstring)
 			m_errorReporter.warning(
 				1699_error,
 				nativeLocationOf(_funCall.functionName),

From 206e7cf5db48b13085b943436764c41f169c6c3b Mon Sep 17 00:00:00 2001
From: r0qs <deepmarolaest@gmail.com>
Date: Thu, 26 Jan 2023 13:40:38 +0000
Subject: [PATCH 1128/1748] Disable stale action debug mode (#13756)

---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index c1a7bd45a6..18046d107c 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -21,7 +21,7 @@ jobs:
     steps:
       - uses: actions/stale@v6
         with:
-          debug-only: true
+          debug-only: false
           days-before-issue-stale: ${{ env.BEFORE_ISSUE_STALE }}
           days-before-issue-close: ${{ env.BEFORE_ISSUE_CLOSE }}
           stale-issue-message: |

From 564cf85725639f47558fcc1dc2d02366aeb6a391 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Mon, 30 Jan 2023 09:19:33 +0100
Subject: [PATCH 1129/1748] Yul proto converter: Output prevrandao for evm
 versions >= paris

---
 test/tools/ossfuzz/protoToYul.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index cd2898e128..991b25e752 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -715,7 +715,10 @@ void ProtoConverter::visit(NullaryOp const& _x)
 		m_output << "number()";
 		break;
 	case NullaryOp::DIFFICULTY:
-		m_output << "difficulty()";
+		if (m_evmVersion >= EVMVersion::paris())
+			m_output << "prevrandao()";
+		else
+			m_output << "difficulty()";
 		break;
 	case NullaryOp::GASLIMIT:
 		m_output << "gaslimit()";

From 21f95c45369fa84f78b374dee8d4b8e98ef22c45 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 30 Jan 2023 13:22:58 +0100
Subject: [PATCH 1130/1748] Suppress libcln from asan tests

---
 .circleci/cln-asan.supp | 1 +
 .circleci/config.yml    | 6 ++++++
 2 files changed, 7 insertions(+)
 create mode 100644 .circleci/cln-asan.supp

diff --git a/.circleci/cln-asan.supp b/.circleci/cln-asan.supp
new file mode 100644
index 0000000000..b16becf29b
--- /dev/null
+++ b/.circleci/cln-asan.supp
@@ -0,0 +1 @@
+leak:*libcln*
diff --git a/.circleci/config.yml b/.circleci/config.yml
index b2c1ab9209..81b757a66e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1094,6 +1094,9 @@ jobs:
     environment:
       TERM: xterm
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
+      # Suppress CLN memory leak.
+      # See: https://github.com/ethereum/solidity/issues/13891 for details.
+      LSAN_OPTIONS: suppressions=.circleci/cln-asan.supp
     <<: *steps_cmdline_tests
 
   t_ubu_asan_soltest:
@@ -1104,6 +1107,9 @@ jobs:
       OPTIMIZE: 0
       SOLTEST_FLAGS: --no-smt
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
+      # Suppress CLN memory leak.
+      # See: https://github.com/ethereum/solidity/issues/13891 for details.
+      LSAN_OPTIONS: suppressions=.circleci/cln-asan.supp
     <<: *steps_soltest
 
   t_ubu_asan_clang_soltest:

From d9d9ab30a231601441c60ceb98d636977e54b26a Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 18 Jan 2023 16:34:48 +0000
Subject: [PATCH 1131/1748] Update default evm version to paris

---
 .circleci/soltest_all.sh              | 2 +-
 Changelog.md                          | 1 +
 docs/using-the-compiler.rst           | 6 +++---
 liblangutil/EVMVersion.h              | 2 +-
 scripts/tests.sh                      | 4 ++--
 test/externalTests/common.sh          | 2 +-
 test/libsolidity/StandardCompiler.cpp | 2 +-
 7 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 5a5449a948..b3544a08c5 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -32,7 +32,7 @@ REPODIR="$(realpath "$(dirname "$0")"/..)"
 source "${REPODIR}/scripts/common.sh"
 
 EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris)
-DEFAULT_EVM=london
+DEFAULT_EVM=paris
 [[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
 OPTIMIZE_VALUES=(0 1)
 
diff --git a/Changelog.md b/Changelog.md
index 362be6d1fc..a1ff633eac 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
  * Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
  * EVM: Deprecate ``block.difficulty`` and disallow ``difficulty()`` in inline assembly for EVM versions >= paris. The change is due to the renaming introduced by [EIP-4399](https://eips.ethereum.org/EIPS/eip-4399).
  * EVM: Introduce ``block.prevrandao`` in Solidity and ``prevrandao()`` in inline assembly for EVM versions >= paris.
+ * EVM: Set the default EVM version to "Paris".
  * EVM: Support for the EVM version "Paris".
  * Natspec: Add event Natspec inheritance for devdoc.
  * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index fca81760c4..c186fa25eb 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -170,10 +170,10 @@ at each version. Backward compatibility is not guaranteed between each version.
    - Gas costs for ``SLOAD``, ``*CALL``, ``BALANCE``, ``EXT*`` and ``SELFDESTRUCT`` increased. The
      compiler assumes cold gas costs for such operations. This is relevant for gas estimation and
      the optimizer.
-- ``london`` (**default**)
+- ``london``
    - The block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_) can be accessed via the global ``block.basefee`` or ``basefee()`` in inline assembly.
-- ``paris``
-   - No changes, however the semantics of the ``difficulty`` value have changed (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
+- ``paris`` (**default**)
+   - Introduces ``prevrandao()`` and ``block.prevrandao``, and changes the semantics of the ``block.difficulty``, disallowing ``difficulty()`` in inline assembly (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index f985b4aff8..aa23ea6eef 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -109,7 +109,7 @@ class EVMVersion:
 
 	EVMVersion(Version _version): m_version(_version) {}
 
-	Version m_version = Version::London;
+	Version m_version = Version::Paris;
 };
 
 }
diff --git a/scripts/tests.sh b/scripts/tests.sh
index c9a7471343..2be31eec03 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -115,9 +115,9 @@ do
     for vm in $EVM_VERSIONS
     do
         FORCE_ABIV1_RUNS="no"
-        if [[ "$vm" == "london" ]]
+        if [[ "$vm" == "paris" ]]
         then
-            FORCE_ABIV1_RUNS="no yes" # run both in london
+            FORCE_ABIV1_RUNS="no yes" # run both in paris
         fi
         for abiv1 in $FORCE_ABIV1_RUNS
         do
diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index 144c68a890..b6a85c1e3b 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -22,7 +22,7 @@ set -e
 
 # Requires $REPO_ROOT to be defined and "${REPO_ROOT}/scripts/common.sh" to be included before.
 
-CURRENT_EVM_VERSION=london
+CURRENT_EVM_VERSION=paris
 
 AVAILABLE_PRESETS=(
     legacy-no-optimize
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 61b28b11e7..d2eeedd910 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -1086,7 +1086,7 @@ BOOST_AUTO_TEST_CASE(evm_version)
 	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"paris\"") != string::npos);
 	// test default
 	result = compile(inputForVersion(""));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"london\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"paris\"") != string::npos);
 	// test invalid
 	result = compile(inputForVersion("\"evmVersion\": \"invalid\","));
 	BOOST_CHECK(result["errors"][0]["message"].asString() == "Invalid EVM version requested.");

From a68501cebda6fa1ac6affe020496d4c7575deda6 Mon Sep 17 00:00:00 2001
From: Mio <mshimmeris@gmail.com>
Date: Tue, 31 Jan 2023 13:23:47 +0800
Subject: [PATCH 1132/1748] fix redundant typo

---
 docs/internals/optimizer.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 11f55e0e3a..99589db992 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -1162,7 +1162,7 @@ will be transformed into the code below after the Unused Store Eliminator step i
 For memory store operations, things are generally simpler, at least in the outermost yul block as all such
 statements will be removed if they are never read from in any code path.
 At function analysis level, however, the approach is similar to ``sstore``, as we do not know whether the memory location will
-be read once we leave the function's scope, so the statement will be removed only if all code code paths lead to a memory overwrite.
+be read once we leave the function's scope, so the statement will be removed only if all code paths lead to a memory overwrite.
 
 Best run in SSA form.
 

From feba4de50994de90531236b9f7734d27c7b6af2d Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 19 Jan 2023 13:06:23 +0000
Subject: [PATCH 1133/1748] Add paris constraints to SMTChecker
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Daniel <daniel@ekpyron.org>
Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
Co-authored-by: Leo <leo@ethereum.org>
---
 docs/using-the-compiler.rst                   |  2 +-
 libsolidity/formal/Predicate.cpp              | 10 ++-
 libsolidity/formal/SMTEncoder.cpp             |  8 ++-
 libsolidity/formal/SymbolicState.cpp          |  9 ++-
 libsolidity/formal/SymbolicState.h            |  5 +-
 .../output.json                               | 64 +++++++++----------
 .../abi/abi_encode_with_selector_vs_sig.sol   |  7 +-
 .../abi/abi_encode_with_sig_array_slice_2.sol |  2 +-
 .../bmc_coverage/range_check.sol              |  8 +++
 .../external_calls/external_safe.sol          |  2 +-
 .../invariants/state_machine_1.sol            |  3 +-
 ...r_loop_array_assignment_memory_storage.sol |  2 +-
 .../operators/index_access_for_bytesNN.sol    |  1 +
 .../smtCheckerTests/out_of_bounds/array_1.sol |  2 +-
 .../special/block_vars_bmc_internal.sol       | 18 ++++--
 .../special/block_vars_chc_internal.sol       |  8 ++-
 .../smtCheckerTests/special/difficulty.sol    | 11 ----
 .../smtCheckerTests/special/many.sol          | 15 +++--
 .../smtCheckerTests/special/many_internal.sol | 15 +++--
 .../smtCheckerTests/special/prevrandao.sol    | 16 +++++
 .../smtCheckerTests/special/range_check.sol   |  8 +++
 .../special/tx_data_immutable.sol             |  7 ++
 .../special/tx_data_immutable_fail.sol        | 57 ++++++++++-------
 .../types/fixed_bytes_access_3.sol            |  2 +-
 .../userTypes/user_type_as_array_elem_1.sol   |  2 +
 .../user_type_as_struct_member_1.sol          |  1 +
 26 files changed, 183 insertions(+), 102 deletions(-)
 delete mode 100644 test/libsolidity/smtCheckerTests/special/difficulty.sol
 create mode 100644 test/libsolidity/smtCheckerTests/special/prevrandao.sol

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index c186fa25eb..6d6264e1aa 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -173,7 +173,7 @@ at each version. Backward compatibility is not guaranteed between each version.
 - ``london``
    - The block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_) can be accessed via the global ``block.basefee`` or ``basefee()`` in inline assembly.
 - ``paris`` (**default**)
-   - Introduces ``prevrandao()`` and ``block.prevrandao``, and changes the semantics of the ``block.difficulty``, disallowing ``difficulty()`` in inline assembly (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
+   - Introduces ``prevrandao()`` and ``block.prevrandao``, and changes the semantics of the now deprecated ``block.difficulty``, disallowing ``difficulty()`` in inline assembly (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
index d4b6994cf5..918728d86d 100644
--- a/libsolidity/formal/Predicate.cpp
+++ b/libsolidity/formal/Predicate.cpp
@@ -255,8 +255,14 @@ string Predicate::formatSummaryCall(
 					if (auto const* identifier = dynamic_cast<Identifier const*>(memberExpr))
 					{
 						ASTString const& name = identifier->name();
+						auto memberName = _memberAccess.memberName();
+
+						// TODO remove this for 0.9.0
+						if (name == "block" && memberName == "difficulty")
+							memberName = "prevrandao";
+
 						if (name == "block" || name == "msg" || name == "tx")
-							txVars.insert(name + "." + _memberAccess.memberName());
+							txVars.insert(name + "." + memberName);
 					}
 
 				return true;
@@ -642,7 +648,7 @@ map<string, optional<string>> Predicate::readTxVars(smtutil::Expression const& _
 		{"block.basefee", TypeProvider::uint256()},
 		{"block.chainid", TypeProvider::uint256()},
 		{"block.coinbase", TypeProvider::address()},
-		{"block.difficulty", TypeProvider::uint256()},
+		{"block.prevrandao", TypeProvider::uint256()},
 		{"block.gaslimit", TypeProvider::uint256()},
 		{"block.number", TypeProvider::uint256()},
 		{"block.timestamp", TypeProvider::uint256()},
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 25789a3b69..810b533512 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -1337,7 +1337,13 @@ bool SMTEncoder::visit(MemberAccess const& _memberAccess)
 		{
 			auto const& name = identifier->name();
 			solAssert(name == "block" || name == "msg" || name == "tx", "");
-			defineExpr(_memberAccess, state().txMember(name + "." + _memberAccess.memberName()));
+			auto memberName = _memberAccess.memberName();
+
+			// TODO remove this for 0.9.0
+			if (name == "block" && memberName == "difficulty")
+				memberName = "prevrandao";
+
+			defineExpr(_memberAccess, state().txMember(name + "." + memberName));
 		}
 		else if (auto magicType = dynamic_cast<MagicType const*>(exprType))
 		{
diff --git a/libsolidity/formal/SymbolicState.cpp b/libsolidity/formal/SymbolicState.cpp
index 0679cee8ab..3afde0dcf5 100644
--- a/libsolidity/formal/SymbolicState.cpp
+++ b/libsolidity/formal/SymbolicState.cpp
@@ -142,13 +142,20 @@ smtutil::Expression SymbolicState::txMember(string const& _member) const
 	return m_tx.member(_member);
 }
 
+smtutil::Expression SymbolicState::evmParisConstraints() const
+{
+	// Ensure prevrandao range as defined by EIP-4399.
+	return txMember("block.prevrandao") > (u256(1) << 64);
+}
+
 smtutil::Expression SymbolicState::txTypeConstraints() const
 {
 	return
+		evmParisConstraints() &&
 		smt::symbolicUnknownConstraints(m_tx.member("block.basefee"), TypeProvider::uint256()) &&
 		smt::symbolicUnknownConstraints(m_tx.member("block.chainid"), TypeProvider::uint256()) &&
 		smt::symbolicUnknownConstraints(m_tx.member("block.coinbase"), TypeProvider::address()) &&
-		smt::symbolicUnknownConstraints(m_tx.member("block.difficulty"), TypeProvider::uint256()) &&
+		smt::symbolicUnknownConstraints(m_tx.member("block.prevrandao"), TypeProvider::uint256()) &&
 		smt::symbolicUnknownConstraints(m_tx.member("block.gaslimit"), TypeProvider::uint256()) &&
 		smt::symbolicUnknownConstraints(m_tx.member("block.number"), TypeProvider::uint256()) &&
 		smt::symbolicUnknownConstraints(m_tx.member("block.timestamp"), TypeProvider::uint256()) &&
diff --git a/libsolidity/formal/SymbolicState.h b/libsolidity/formal/SymbolicState.h
index 309d545b80..45c129c1b1 100644
--- a/libsolidity/formal/SymbolicState.h
+++ b/libsolidity/formal/SymbolicState.h
@@ -68,9 +68,9 @@ class BlockchainVariable
  *   - block basefee
  *   - block chainid
  *   - block coinbase
- *   - block difficulty
  *   - block gaslimit
  *   - block number
+ *   - block prevrandao
  *   - block timestamp
  *   - TODO gasleft
  *   - msg data
@@ -136,6 +136,7 @@ class SymbolicState
 	smtutil::Expression txTypeConstraints() const;
 	smtutil::Expression txNonPayableConstraint() const;
 	smtutil::Expression blockhash(smtutil::Expression _blockNumber) const;
+	smtutil::Expression evmParisConstraints() const;
 	//@}
 
 	/// Crypto functions.
@@ -197,7 +198,7 @@ class SymbolicState
 			{"block.basefee", smtutil::SortProvider::uintSort},
 			{"block.chainid", smtutil::SortProvider::uintSort},
 			{"block.coinbase", smt::smtSort(*TypeProvider::address())},
-			{"block.difficulty", smtutil::SortProvider::uintSort},
+			{"block.prevrandao", smtutil::SortProvider::uintSort},
 			{"block.gaslimit", smtutil::SortProvider::uintSort},
 			{"block.number", smtutil::SortProvider::uintSort},
 			{"block.timestamp", smtutil::SortProvider::uintSort},
diff --git a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
index 41ef018d92..fa8726d55e 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
@@ -3,38 +3,11 @@
     {
         "smtlib2queries":
         {
-            "0x2bcd3328dc8d31e869efd5e0dfdb16a6fa26f0a9c2829ea55670262be485e401": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |x_3_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_4| () Int)
-(declare-fun |x_3_0| () Int)
-(declare-fun |expr_7_0| () Int)
-(declare-fun |expr_8_0| () Int)
-(declare-fun |expr_9_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_9_1 (> expr_7_0 expr_8_0)) (and (=> (and true true) true) (and (= expr_8_0 0) (and (=> (and true true) (and (>= expr_7_0 0) (<= expr_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_7_0 x_3_0) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3017696395)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 179)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 222)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 100)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 139)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))) (not expr_9_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_3_0))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-",
-            "0x4e70784a8a93c7429a716aa8b778f3de5d1f63b30158452534da5d44e5967d2b": "(set-logic HORN)
+            "0x0ebc730de380833af1e52ed063befb32994bc637929c942b7fd089b7cd3ba64e": "(set-logic HORN)
 
 (declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
 (declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.difficulty| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
 (declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
 (declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
@@ -95,7 +68,7 @@
 
 (assert
 (forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (block_9_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (summary_3_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 x_3_1 state_3 x_3_2) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3017696395)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 179)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 222)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 100)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 139)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) (and true (= x_3_1 x_3_0))) true))))))) true) (summary_4_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_3 x_3_2))))
+(=> (and (and (block_9_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (summary_3_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 x_3_1 state_3 x_3_2) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3017696395)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 179)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 222)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 100)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 139)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) (and true (= x_3_1 x_3_0))) true))))))) true) (summary_4_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_3 x_3_2))))
 
 
 (assert
@@ -139,7 +112,7 @@
 
 (assert
 (forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (summary_constructor_2_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.difficulty| tx_0) 0) (<= (|block.difficulty| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_14_0 this_0 abi_0 crypto_0 state_1))))
+(=> (and (and (summary_constructor_2_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_14_0 this_0 abi_0 crypto_0 state_1))))
 
 
 (declare-fun |error_target_3_0| () Bool)
@@ -151,7 +124,34 @@
 (assert
 (forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
 (=> error_target_3_0 false)))
-(check-sat)"
+(check-sat)",
+            "0xcb822e6220a39244d26887a0fa6f62b06718359056555679fb06dd7dff18bb86": "(set-option :produce-models true)
+(set-logic ALL)
+(declare-fun |x_3_3| () Int)
+(declare-fun |error_0| () Int)
+(declare-fun |this_0| () Int)
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |state_0| () |state_type|)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-fun |tx_0| () |tx_type|)
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-fun |crypto_0| () |crypto_type|)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-fun |abi_0| () |abi_type|)
+(declare-fun |x_3_4| () Int)
+(declare-fun |x_3_0| () Int)
+(declare-fun |expr_7_0| () Int)
+(declare-fun |expr_8_0| () Int)
+(declare-fun |expr_9_1| () Bool)
+
+(assert (and (and (and true true) (and (= expr_9_1 (> expr_7_0 expr_8_0)) (and (=> (and true true) true) (and (= expr_8_0 0) (and (=> (and true true) (and (>= expr_7_0 0) (<= expr_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_7_0 x_3_0) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3017696395)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 179)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 222)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 100)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 139)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))) (not expr_9_1)))
+(declare-const |EVALEXPR_0| Int)
+(assert (= |EVALEXPR_0| x_3_0))
+(check-sat)
+(get-value (|EVALEXPR_0| ))
+"
         }
     },
     "errors":
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
index 2e64613668..4b4f7a3ace 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_vs_sig.sol
@@ -3,12 +3,13 @@ contract C {
 		bytes memory b1 = abi.encodeWithSignature(sig, x, a);
 		bytes memory b2 = abi.encodeWithSelector(bytes4(keccak256(bytes(sig))), x, a);
 		// should hold but we do not evaluate keccak256 in an interpreted way
-		assert(b1.length == b2.length);
+		//assert(b1.length == b2.length);
+		assert(b1.length != b2.length); // should fail
 	}
 }
 // ====
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (294-324): CHC: Assertion violation might happen here.
-// Warning 7812: (294-324): BMC: Assertion violation might happen here.
+// Warning 6328: (330-360): CHC: Assertion violation might happen here.
+// Warning 7812: (330-360): BMC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
index e015679581..6451a932b5 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
@@ -26,7 +26,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (335-365): CHC: Assertion violation happens here.\nCounterexample:\n\ndata = [69]\nb2 = [0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43, 0x43]\nb3 = []\nb4 = []\nx = 0\ny = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSlice(sig, [69])
+// Warning 6328: (335-365): CHC: Assertion violation happens here.
 // Warning 6328: (589-619): CHC: Assertion violation happens here.
 // Warning 6328: (1087-1117): CHC: Assertion violation might happen here.
 // Warning 4661: (1087-1117): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol
index ad31bafb5d..cfedc8fd69 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol
@@ -17,6 +17,8 @@ contract C {
 		assert(block.chainid <= 2**256 - 1);
 		assert(block.difficulty >= 0);
 		assert(block.difficulty <= 2**256 - 1);
+		assert(block.prevrandao > 2**64);
+		assert(block.prevrandao <= 2**256 - 1);
 		assert(block.gaslimit >= 0);
 		assert(block.gaslimit <= 2**256 - 1);
 		assert(block.number >= 0);
@@ -44,6 +46,8 @@ contract D {
 			assert(block.chainid <= 2**256 - 1);
 			assert(block.difficulty >= 0);
 			assert(block.difficulty <= 2**256 - 1);
+			assert(block.prevrandao > 2**64);
+			assert(block.prevrandao <= 2**256 - 1);
 			assert(block.gaslimit >= 0);
 			assert(block.gaslimit <= 2**256 - 1);
 			assert(block.number >= 0);
@@ -54,3 +58,7 @@ contract D {
 // ====
 // SMTEngine: bmc
 // ----
+// Warning 8417: (565-581): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (598-614): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (1447-1463): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (1481-1497): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
index 5921189b7a..b50185449b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
@@ -16,5 +16,5 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(x >= 11)\nReentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!(x <= 10) || !(<errorCode> >= 3)) && (!(x <= 10) || !(x' >= 11)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Overflow at ++x\n<errorCode> = 3 -> Assertion failed at assert(x < 11)\n
diff --git a/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol b/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
index a4910e5d36..4e74d4ea68 100644
--- a/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
+++ b/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
@@ -30,7 +30,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTSolvers: z3
 // SMTIgnoreOS: macos
+// SMTSolvers: z3
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(x >= 7)\n
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
index 28f2028c6e..c5fa1f288d 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
@@ -24,6 +24,6 @@ contract LoopFor2 {
 }
 // ====
 // SMTEngine: all
-// SMTSolvers: z3
 // SMTIgnoreOS: macos
+// SMTSolvers: z3
 // ----
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
index 2fee40f40a..e73554c1e9 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
@@ -6,5 +6,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6368: (76-90): CHC: Out of bounds access might happen here.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
index ee57f069d4..0f5a63b07c 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
@@ -22,6 +22,6 @@ contract C {
 // ----
 // Warning 4984: (112-115): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 3944: (181-184): CHC: Underflow (resulting value less than 0) might happen here.
-// Warning 6368: (259-263): CHC: Out of bounds access happens here.\nCounterexample:\na = [0], l = 1\n = 0\n\nTransaction trace:\nC.constructor()\nState: a = [], l = 0\nC.p()\nState: a = [0], l = 1\nC.r()
+// Warning 6368: (259-263): CHC: Out of bounds access happens here.
 // Warning 2661: (112-115): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 4144: (181-184): BMC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol b/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
index 51a330d8ea..273590f65a 100644
--- a/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
@@ -1,12 +1,14 @@
 contract C {
 	address coin;
 	uint dif;
+	uint prevrandao;
 	uint gas;
 	uint number;
 	uint timestamp;
 	function f() public {
 		coin = block.coinbase;
 		dif = block.difficulty;
+		prevrandao = block.prevrandao;
 		gas = block.gaslimit;
 		number = block.number;
 		timestamp = block.timestamp;
@@ -16,12 +18,14 @@ contract C {
 	function g() internal view {
 		assert(uint160(coin) >= 0); // should hold
 		assert(dif >= 0); // should hold
+		assert(prevrandao > 2**64); // should hold
 		assert(gas >= 0); // should hold
 		assert(number >= 0); // should hold
 		assert(timestamp >= 0); // should hold
 
 		assert(coin == block.coinbase); // should fail with BMC
 		assert(dif == block.difficulty); // should fail with BMC
+		assert(prevrandao == block.prevrandao); // should fail with BMC
 		assert(gas == block.gaslimit); // should fail with BMC
 		assert(number == block.number); // should fail with BMC
 		assert(timestamp == block.timestamp); // should fail with BMC
@@ -30,8 +34,12 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
-// Warning 4661: (473-503): BMC: Assertion violation happens here.
-// Warning 4661: (531-562): BMC: Assertion violation happens here.
-// Warning 4661: (590-619): BMC: Assertion violation happens here.
-// Warning 4661: (647-677): BMC: Assertion violation happens here.
-// Warning 4661: (705-741): BMC: Assertion violation happens here.
+// Warning 8417: (155-171): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (641-657): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 4661: (409-435): BMC: Assertion violation happens here.
+// Warning 4661: (569-599): BMC: Assertion violation happens here.
+// Warning 4661: (627-658): BMC: Assertion violation happens here.
+// Warning 4661: (686-724): BMC: Assertion violation happens here.
+// Warning 4661: (752-781): BMC: Assertion violation happens here.
+// Warning 4661: (809-839): BMC: Assertion violation happens here.
+// Warning 4661: (867-903): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
index ab355dbd25..3e06779a0f 100644
--- a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
@@ -1,12 +1,14 @@
 contract C {
 	address coin;
 	uint dif;
+	uint prevrandao;
 	uint gas;
 	uint number;
 	uint timestamp;
 	function f() public {
 		coin = block.coinbase;
 		dif = block.difficulty;
+		prevrandao = block.prevrandao;
 		gas = block.gaslimit;
 		number = block.number;
 		timestamp = block.timestamp;
@@ -16,12 +18,14 @@ contract C {
 	function g() internal view {
 		assert(uint160(coin) >= 0); // should hold
 		assert(dif >= 0); // should hold
+		assert(prevrandao > 2**64); // should hold
 		assert(gas >= 0); // should hold
 		assert(number >= 0); // should hold
 		assert(timestamp >= 0); // should hold
 
 		assert(coin == block.coinbase); // should hold with CHC
 		assert(dif == block.difficulty); // should hold with CHC
+		assert(prevrandao == block.prevrandao); // should hold with CHC
 		assert(gas == block.gaslimit); // should hold with CHC
 		assert(number == block.number); // should hold with CHC
 		assert(timestamp == block.timestamp); // should hold with CHC
@@ -33,4 +37,6 @@ contract C {
 // SMTEngine: chc
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (770-799): CHC: Assertion violation happens here.\nCounterexample:\ncoin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\n\nTransaction trace:\nC.constructor()\nState: coin = 0x0, dif = 0, gas = 0, number = 0, timestamp = 0\nC.f(){ block.coinbase: 0x0, block.difficulty: 0, block.gaslimit: 0, block.number: 0, block.timestamp: 0 }\n    C.g() -- internal call
+// Warning 8417: (155-171): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (641-657): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 6328: (932-961): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/difficulty.sol b/test/libsolidity/smtCheckerTests/special/difficulty.sol
deleted file mode 100644
index faf44ddd76..0000000000
--- a/test/libsolidity/smtCheckerTests/special/difficulty.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C
-{
-	function f(uint difficulty) public view {
-		assert(block.difficulty == difficulty);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTIgnoreCex: yes
-// ----
-// Warning 6328: (58-96): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/many.sol b/test/libsolidity/smtCheckerTests/special/many.sol
index e9c100014c..247eec98e2 100644
--- a/test/libsolidity/smtCheckerTests/special/many.sol
+++ b/test/libsolidity/smtCheckerTests/special/many.sol
@@ -3,6 +3,7 @@ contract C
 	function f() public payable {
 		assert(msg.sender == block.coinbase);
 		assert(block.difficulty == block.gaslimit);
+		assert(block.prevrandao == block.gaslimit);
 		assert(block.number == block.timestamp);
 		assert(tx.gasprice == msg.value);
 		assert(tx.origin == msg.sender);
@@ -17,11 +18,13 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
+// Warning 8417: (93-109): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 6328: (46-82): CHC: Assertion violation happens here.
 // Warning 6328: (86-128): CHC: Assertion violation happens here.
-// Warning 6328: (132-171): CHC: Assertion violation happens here.
-// Warning 6328: (175-207): CHC: Assertion violation happens here.
-// Warning 6328: (211-242): CHC: Assertion violation happens here.
-// Warning 6328: (295-319): CHC: Assertion violation happens here.
-// Warning 6328: (323-351): CHC: Assertion violation happens here.
-// Warning 6328: (355-378): CHC: Assertion violation happens here.
+// Warning 6328: (132-174): CHC: Assertion violation happens here.
+// Warning 6328: (178-217): CHC: Assertion violation happens here.
+// Warning 6328: (221-253): CHC: Assertion violation happens here.
+// Warning 6328: (257-288): CHC: Assertion violation happens here.
+// Warning 6328: (341-365): CHC: Assertion violation happens here.
+// Warning 6328: (369-397): CHC: Assertion violation happens here.
+// Warning 6328: (401-424): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/many_internal.sol b/test/libsolidity/smtCheckerTests/special/many_internal.sol
index eb68fd9ac2..cf9c61ae66 100644
--- a/test/libsolidity/smtCheckerTests/special/many_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/many_internal.sol
@@ -6,6 +6,7 @@ contract C
 	function g() internal {
 		assert(msg.sender == block.coinbase);
 		assert(block.difficulty == block.gaslimit);
+		assert(block.prevrandao == block.gaslimit);
 		assert(block.number == block.timestamp);
 		assert(tx.gasprice == msg.value);
 		assert(tx.origin == msg.sender);
@@ -20,11 +21,13 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
+// Warning 8417: (128-144): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 6328: (81-117): CHC: Assertion violation happens here.
 // Warning 6328: (121-163): CHC: Assertion violation happens here.
-// Warning 6328: (167-206): CHC: Assertion violation happens here.
-// Warning 6328: (210-242): CHC: Assertion violation happens here.
-// Warning 6328: (246-277): CHC: Assertion violation happens here.
-// Warning 6328: (330-354): CHC: Assertion violation happens here.
-// Warning 6328: (358-386): CHC: Assertion violation happens here.
-// Warning 6328: (390-413): CHC: Assertion violation happens here.
+// Warning 6328: (167-209): CHC: Assertion violation happens here.
+// Warning 6328: (213-252): CHC: Assertion violation happens here.
+// Warning 6328: (256-288): CHC: Assertion violation happens here.
+// Warning 6328: (292-323): CHC: Assertion violation happens here.
+// Warning 6328: (376-400): CHC: Assertion violation happens here.
+// Warning 6328: (404-432): CHC: Assertion violation happens here.
+// Warning 6328: (436-459): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/prevrandao.sol b/test/libsolidity/smtCheckerTests/special/prevrandao.sol
new file mode 100644
index 0000000000..0237c75505
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/special/prevrandao.sol
@@ -0,0 +1,16 @@
+contract C
+{
+	function f(uint prevrandao) public view {
+		assert(block.prevrandao == prevrandao); // should fail
+		assert(block.difficulty == prevrandao); // should fail
+		assert(block.difficulty == block.prevrandao); // should hold
+	}
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
+// ----
+// Warning 8417: (122-138): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (179-195): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 6328: (58-96): CHC: Assertion violation happens here.
+// Warning 6328: (115-153): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/special/range_check.sol b/test/libsolidity/smtCheckerTests/special/range_check.sol
index 9373adfd5e..62187f46a6 100644
--- a/test/libsolidity/smtCheckerTests/special/range_check.sol
+++ b/test/libsolidity/smtCheckerTests/special/range_check.sol
@@ -17,6 +17,8 @@ contract C {
 		assert(block.chainid <= 2**256 - 1);
 		assert(block.difficulty >= 0);
 		assert(block.difficulty <= 2**256 - 1);
+		assert(block.prevrandao > 2**64);
+		assert(block.prevrandao <= 2**256 - 1);
 		assert(block.gaslimit >= 0);
 		assert(block.gaslimit <= 2**256 - 1);
 		assert(block.number >= 0);
@@ -44,6 +46,8 @@ contract D {
 			assert(block.chainid <= 2**256 - 1);
 			assert(block.difficulty >= 0);
 			assert(block.difficulty <= 2**256 - 1);
+			assert(block.prevrandao > 2**64);
+			assert(block.prevrandao <= 2**256 - 1);
 			assert(block.gaslimit >= 0);
 			assert(block.gaslimit <= 2**256 - 1);
 			assert(block.number >= 0);
@@ -55,3 +59,7 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
+// Warning 8417: (565-581): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (598-614): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (1447-1463): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (1481-1497): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol b/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol
index 25fc02ef88..c15dfb1cfe 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol
@@ -2,6 +2,7 @@ contract C {
 	bytes32 bhash;
 	address coin;
 	uint dif;
+	uint prevrandao;
 	uint glimit;
 	uint number;
 	uint tstamp;
@@ -16,6 +17,7 @@ contract C {
 		bhash = blockhash(12);
 		coin = block.coinbase;
 		dif = block.difficulty;
+		prevrandao = block.prevrandao;
 		glimit = block.gaslimit;
 		number = block.number;
 		tstamp = block.timestamp;
@@ -31,6 +33,7 @@ contract C {
 		assert(bhash == blockhash(12));
 		assert(coin == block.coinbase);
 		assert(dif == block.difficulty);
+		assert(prevrandao == block.prevrandao);
 		assert(glimit == block.gaslimit);
 		assert(number == block.number);
 		assert(tstamp == block.timestamp);
@@ -46,6 +49,7 @@ contract C {
 		assert(bhash == blockhash(12));
 		assert(coin == block.coinbase);
 		assert(dif == block.difficulty);
+		assert(prevrandao == block.prevrandao);
 		assert(glimit == block.gaslimit);
 		assert(number == block.number);
 		assert(tstamp == block.timestamp);
@@ -60,3 +64,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Warning 8417: (293-309): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (645-661): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (1127-1143): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol b/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol
index 82d3529e0e..2b16f2d1aa 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_data_immutable_fail.sol
@@ -2,6 +2,7 @@ contract C {
 	bytes32 bhash;
 	address coin;
 	uint dif;
+	uint prevrandao;
 	uint glimit;
 	uint number;
 	uint tstamp;
@@ -16,6 +17,7 @@ contract C {
 		bhash = blockhash(12);
 		coin = block.coinbase;
 		dif = block.difficulty;
+		prevrandao = block.prevrandao;
 		glimit = block.gaslimit;
 		number = block.number;
 		tstamp = block.timestamp;
@@ -31,6 +33,7 @@ contract C {
 		assert(bhash == blockhash(122));
 		assert(coin != block.coinbase);
 		assert(dif != block.difficulty);
+		assert(prevrandao != block.prevrandao);
 		assert(glimit != block.gaslimit);
 		assert(number != block.number);
 		assert(tstamp != block.timestamp);
@@ -46,6 +49,7 @@ contract C {
 		assert(bhash == blockhash(122));
 		assert(coin != block.coinbase);
 		assert(dif != block.difficulty);
+		assert(prevrandao != block.prevrandao);
 		assert(glimit != block.gaslimit);
 		assert(number != block.number);
 		assert(tstamp != block.timestamp);
@@ -61,27 +65,32 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (512-543): CHC: Assertion violation happens here.
-// Warning 6328: (547-577): CHC: Assertion violation happens here.
-// Warning 6328: (581-612): CHC: Assertion violation happens here.
-// Warning 6328: (616-648): CHC: Assertion violation happens here.
-// Warning 6328: (652-682): CHC: Assertion violation happens here.
-// Warning 6328: (686-719): CHC: Assertion violation happens here.
-// Warning 6328: (723-762): CHC: Assertion violation happens here.
-// Warning 6328: (766-794): CHC: Assertion violation happens here.
-// Warning 6328: (798-820): CHC: Assertion violation happens here.
-// Warning 6328: (824-850): CHC: Assertion violation happens here.
-// Warning 6328: (854-883): CHC: Assertion violation happens here.
-// Warning 6328: (887-914): CHC: Assertion violation happens here.
-// Warning 6328: (953-984): CHC: Assertion violation happens here.
-// Warning 6328: (988-1018): CHC: Assertion violation happens here.
-// Warning 6328: (1022-1053): CHC: Assertion violation happens here.
-// Warning 6328: (1057-1089): CHC: Assertion violation happens here.
-// Warning 6328: (1093-1123): CHC: Assertion violation happens here.
-// Warning 6328: (1127-1160): CHC: Assertion violation happens here.
-// Warning 6328: (1164-1203): CHC: Assertion violation happens here.
-// Warning 6328: (1207-1235): CHC: Assertion violation happens here.
-// Warning 6328: (1239-1261): CHC: Assertion violation happens here.
-// Warning 6328: (1265-1291): CHC: Assertion violation happens here.
-// Warning 6328: (1295-1324): CHC: Assertion violation happens here.
-// Warning 6328: (1328-1355): CHC: Assertion violation happens here.
+// Warning 8417: (293-309): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (646-662): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 8417: (1129-1145): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Warning 6328: (563-594): CHC: Assertion violation happens here.
+// Warning 6328: (598-628): CHC: Assertion violation happens here.
+// Warning 6328: (632-663): CHC: Assertion violation happens here.
+// Warning 6328: (667-705): CHC: Assertion violation happens here.
+// Warning 6328: (709-741): CHC: Assertion violation happens here.
+// Warning 6328: (745-775): CHC: Assertion violation happens here.
+// Warning 6328: (779-812): CHC: Assertion violation happens here.
+// Warning 6328: (816-855): CHC: Assertion violation happens here.
+// Warning 6328: (859-887): CHC: Assertion violation happens here.
+// Warning 6328: (891-913): CHC: Assertion violation happens here.
+// Warning 6328: (917-943): CHC: Assertion violation happens here.
+// Warning 6328: (947-976): CHC: Assertion violation happens here.
+// Warning 6328: (980-1007): CHC: Assertion violation happens here.
+// Warning 6328: (1046-1077): CHC: Assertion violation happens here.
+// Warning 6328: (1081-1111): CHC: Assertion violation happens here.
+// Warning 6328: (1115-1146): CHC: Assertion violation happens here.
+// Warning 6328: (1150-1188): CHC: Assertion violation happens here.
+// Warning 6328: (1192-1224): CHC: Assertion violation happens here.
+// Warning 6328: (1228-1258): CHC: Assertion violation happens here.
+// Warning 6328: (1262-1295): CHC: Assertion violation happens here.
+// Warning 6328: (1299-1338): CHC: Assertion violation happens here.
+// Warning 6328: (1342-1370): CHC: Assertion violation happens here.
+// Warning 6328: (1374-1396): CHC: Assertion violation happens here.
+// Warning 6328: (1400-1426): CHC: Assertion violation happens here.
+// Warning 6328: (1430-1459): CHC: Assertion violation happens here.
+// Warning 6328: (1463-1490): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
index 320d7dd10e..305c00a62f 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
@@ -32,5 +32,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
+// Warning 6368: (374-381): CHC: Out of bounds access might happen here.
 // Warning 6368: (456-462): CHC: Out of bounds access happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 4)\n!(a[2].length <= 2)\n
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
index 55a88fd7e2..8856ebd43a 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
@@ -11,6 +11,8 @@ contract C {
         assert(T.unwrap(arr[i]) == address(42)); // should hold
     }
 }
+// ====
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (204-243): CHC: Assertion violation might happen here.
 // Warning 4661: (204-243): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
index 1a72cad3da..5cb307385b 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
@@ -23,3 +23,4 @@ contract C {
         );
     }
 }
+// ----

From 4f84112650cab6701bcfa7e6c86e43069615819c Mon Sep 17 00:00:00 2001
From: Lokesh Kumar <lokeshkumar636@yahoo.com>
Date: Wed, 1 Feb 2023 03:12:03 +0530
Subject: [PATCH 1134/1748] updated abi-spec.rst

---
 docs/abi-spec.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 7906d75ffe..35123a30a2 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -311,7 +311,7 @@ Use of Dynamic Types
 A call to a function with the signature ``f(uint256,uint32[],bytes10,bytes)`` with values
 ``(0x123, [0x456, 0x789], "1234567890", "Hello, world!")`` is encoded in the following way:
 
-We take the first four bytes of ``sha3("f(uint256,uint32[],bytes10,bytes)")``, i.e. ``0x8be65246``.
+We take the first four bytes of ``keccak("f(uint256,uint32[],bytes10,bytes)")``, i.e. ``0x8be65246``.
 Then we encode the head parts of all four arguments. For the static types ``uint256`` and ``bytes10``,
 these are directly the values we want to pass, whereas for the dynamic types ``uint32[]`` and ``bytes``,
 we use the offset in bytes to the start of their data area, measured from the start of the value

From 6cad055d97c5e9abaccd971598a40e8a0ea91d34 Mon Sep 17 00:00:00 2001
From: franzihei <41991517+franzihei@users.noreply.github.com>
Date: Wed, 1 Feb 2023 11:47:08 +0100
Subject: [PATCH 1135/1748] [DOCS] Update copyright year and description
 (#13894)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Nuno Santos <nuno.santos@ethereum.org>
Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 61df2b53ec..daa5e99132 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -63,7 +63,7 @@ def setup(sphinx):
 
 # General information about the project.
 project = 'Solidity'
-project_copyright = '2016-2021, Ethereum'
+project_copyright = '2016-2023, The Solidity Authors'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

From 986bc361b15f0f89bc4cad97807e69a36378fc36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 1 Feb 2023 12:26:44 +0100
Subject: [PATCH 1136/1748] docs: Replace some links with redirects found by
 linkcheck

---
 docs/contracts/creating-contracts.rst    | 2 +-
 docs/contracts/events.rst                | 2 +-
 docs/contributing.rst                    | 4 ++--
 docs/examples/micropayment.rst           | 2 +-
 docs/introduction-to-smart-contracts.rst | 2 +-
 docs/layout-of-source-files.rst          | 2 +-
 docs/natspec-format.rst                  | 2 +-
 docs/resources.rst                       | 6 +++---
 docs/style-guide.rst                     | 4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/contracts/creating-contracts.rst b/docs/contracts/creating-contracts.rst
index f574a5a6aa..8eb4e5f56c 100644
--- a/docs/contracts/creating-contracts.rst
+++ b/docs/contracts/creating-contracts.rst
@@ -8,7 +8,7 @@ Contracts can be created "from outside" via Ethereum transactions or from within
 
 IDEs, such as `Remix <https://remix.ethereum.org/>`_, make the creation process seamless using UI elements.
 
-One way to create contracts programmatically on Ethereum is via the JavaScript API `web3.js <https://github.com/ethereum/web3.js>`_.
+One way to create contracts programmatically on Ethereum is via the JavaScript API `web3.js <https://github.com/web3/web3.js>`_.
 It has a function called `web3.eth.Contract <https://web3js.readthedocs.io/en/1.0/web3-eth-contract.html#new-contract>`_
 to facilitate contract creation.
 
diff --git a/docs/contracts/events.rst b/docs/contracts/events.rst
index 8618e7524b..a7c7bc13f6 100644
--- a/docs/contracts/events.rst
+++ b/docs/contracts/events.rst
@@ -151,6 +151,6 @@ The output of the above looks like the following (trimmed):
 Additional Resources for Understanding Events
 =============================================
 
-- `Javascript documentation <https://github.com/ethereum/web3.js/blob/1.x/docs/web3-eth-contract.rst#events>`_
+- `Javascript documentation <https://github.com/web3/web3.js/blob/1.x/docs/web3-eth-contract.rst#events>`_
 - `Example usage of events <https://github.com/ethchange/smart-exchange/blob/master/lib/contracts/SmartExchange.sol>`_
 - `How to access them in js <https://github.com/ethchange/smart-exchange/blob/master/lib/exchange_transactions.js>`_
diff --git a/docs/contributing.rst b/docs/contributing.rst
index da949c1369..c174e3f606 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -102,9 +102,9 @@ This can be easiest accomplished using Homebrew: ``brew install coreutils``.
 On Windows systems, make sure that you have a privilege to create symlinks,
 otherwise several tests may fail.
 Administrators should have that privilege, but you may also
-`grant it to other users <https://docs.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/create-symbolic-links#policy-management>`_
+`grant it to other users <https://learn.microsoft.com/en-us/windows/security/threat-protection/security-policy-settings/create-symbolic-links#policy-management>`_
 or
-`enable Developer Mode <https://docs.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development>`_.
+`enable Developer Mode <https://learn.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development>`_.
 
 Running the Tests
 -----------------
diff --git a/docs/examples/micropayment.rst b/docs/examples/micropayment.rst
index f5037e6f76..6ce049457b 100644
--- a/docs/examples/micropayment.rst
+++ b/docs/examples/micropayment.rst
@@ -36,7 +36,7 @@ Creating the signature
 Alice does not need to interact with the Ethereum network
 to sign the transaction, the process is completely offline.
 In this tutorial, we will sign messages in the browser
-using `web3.js <https://github.com/ethereum/web3.js>`_ and
+using `web3.js <https://github.com/web3/web3.js>`_ and
 `MetaMask <https://metamask.io>`_, using the method described in `EIP-712 <https://github.com/ethereum/EIPs/pull/712>`_,
 as it provides a number of other security benefits.
 
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 4e370a461b..5a278ecfb1 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -185,7 +185,7 @@ arguments ``from``, ``to`` and ``amount``, which makes it possible to track
 transactions.
 
 To listen for this event, you could use the following
-JavaScript code, which uses `web3.js <https://github.com/ethereum/web3.js/>`_ to create the ``Coin`` contract object,
+JavaScript code, which uses `web3.js <https://github.com/web3/web3.js/>`_ to create the ``Coin`` contract object,
 and any user interface calls the automatically generated ``balances`` function from above:
 
 .. code-block:: javascript
diff --git a/docs/layout-of-source-files.rst b/docs/layout-of-source-files.rst
index 9a58478586..a5c7164bcc 100644
--- a/docs/layout-of-source-files.rst
+++ b/docs/layout-of-source-files.rst
@@ -182,7 +182,7 @@ Syntax and Semantics
 Solidity supports import statements to help modularise your code that
 are similar to those available in JavaScript
 (from ES6 on). However, Solidity does not support the concept of
-a `default export <https://developer.mozilla.org/en-US/docs/web/javascript/reference/statements/export#Description>`_.
+a `default export <https://developer.mozilla.org/en-US/docs/web/javascript/reference/statements/export#description>`_.
 
 At a global level, you can use import statements of the following form:
 
diff --git a/docs/natspec-format.rst b/docs/natspec-format.rst
index 01726fe860..b23a46090d 100644
--- a/docs/natspec-format.rst
+++ b/docs/natspec-format.rst
@@ -46,7 +46,7 @@ for the purposes of NatSpec.
 
 -  For Vyper, use ``"""`` indented to the inner contents with bare
    comments. See the `Vyper
-   documentation <https://vyper.readthedocs.io/en/latest/natspec.html>`__.
+   documentation <https://docs.vyperlang.org/en/latest/natspec.html>`__.
 
 The following example shows a contract and a function using all available tags.
 
diff --git a/docs/resources.rst b/docs/resources.rst
index 9084037d9d..df0e450197 100644
--- a/docs/resources.rst
+++ b/docs/resources.rst
@@ -28,7 +28,7 @@ Integrated (Ethereum) Development Environments
     * `Embark <https://framework.embarklabs.io/>`_
         Developer platform for building and deploying decentralized applications.
 
-    * `Foundry <https://github.com/gakonst/foundry>`_
+    * `Foundry <https://github.com/foundry-rs/foundry>`_
         Fast, portable and modular toolkit for Ethereum application development written in Rust.
 
     * `Hardhat <https://hardhat.org/>`_
@@ -37,7 +37,7 @@ Integrated (Ethereum) Development Environments
     * `Remix <https://remix.ethereum.org/>`_
         Browser-based IDE with integrated compiler and Solidity runtime environment without server-side components.
 
-    * `Truffle <https://www.trufflesuite.com/truffle>`_
+    * `Truffle <https://trufflesuite.com/truffle/>`_
         Ethereum development framework.
 
 Editor Integrations
@@ -50,7 +50,7 @@ Editor Integrations
 
 * IntelliJ
 
-    * `IntelliJ IDEA plugin <https://plugins.jetbrains.com/plugin/9475-intellij-solidity>`_
+    * `IntelliJ IDEA plugin <https://plugins.jetbrains.com/plugin/9475-solidity/>`_
         Solidity plugin for IntelliJ IDEA (and all other JetBrains IDEs).
 
 * Sublime Text
diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 08050c7511..35e7324c99 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -17,11 +17,11 @@ conflicts, project specific style guides take precedence.
 
 The structure and many of the recommendations within this style guide were
 taken from python's
-`pep8 style guide <https://www.python.org/dev/peps/pep-0008/>`_.
+`pep8 style guide <https://peps.python.org/pep-0008/>`_.
 
 The goal of this guide is *not* to be the right way or the best way to write
 Solidity code.  The goal of this guide is *consistency*.  A quote from python's
-`pep8 <https://www.python.org/dev/peps/pep-0008/#a-foolish-consistency-is-the-hobgoblin-of-little-minds>`_
+`pep8 <https://peps.python.org/pep-0008/#a-foolish-consistency-is-the-hobgoblin-of-little-minds>`_
 captures this concept well.
 
 .. note::

From 57b01db57b3c7bb6110ec3c39e4336d85528c86a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 1 Feb 2023 12:27:23 +0100
Subject: [PATCH 1137/1748] docs: Replace broken link to Oxford Dictionary
 British spelling page with an archive.org copy

---
 docs/contributing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index c174e3f606..e6925a4896 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -408,7 +408,7 @@ local slang and references, making your language as clear to all readers as poss
 
 * `Simplified technical English <https://en.wikipedia.org/wiki/Simplified_Technical_English>`_
 * `International English <https://en.wikipedia.org/wiki/International_English>`_
-* `British English spelling <https://en.oxforddictionaries.com/spelling/british-and-spelling>`_
+* `British English spelling <https://web.archive.org/web/20220324094038/https://www.lexico.com/grammar/british-and-spelling>`_
 
 
 .. note::

From 8447baec4db9537dfe2d22bddb726a0938a0aa3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 1 Feb 2023 12:27:56 +0100
Subject: [PATCH 1138/1748] docs; Link to published versions of translated docs
 for languages that already have them

---
 docs/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 3cb27eaeda..ba216ec3a9 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -95,7 +95,7 @@ version stands as a reference.
 You can switch between languages by clicking on the flyout menu in the bottom-left corner
 and selecting the preferred language.
 
-* `Chinese <https://github.com/solidity-docs/zh-cn-chinese/>`_
+* `Chinese <https://docs.soliditylang.org/zh/latest/>`_
 * `French <https://docs.soliditylang.org/fr/latest/>`_
 * `Indonesian <https://github.com/solidity-docs/id-indonesian>`_
 * `Japanese <https://github.com/solidity-docs/ja-japanese>`_
@@ -103,7 +103,7 @@ and selecting the preferred language.
 * `Persian <https://github.com/solidity-docs/fa-persian>`_
 * `Russian <https://github.com/solidity-docs/ru-russian>`_
 * `Spanish <https://github.com/solidity-docs/es-spanish>`_
-* `Turkish <https://github.com/solidity-docs/tr-turkish>`_
+* `Turkish <https://docs.soliditylang.org/tr/latest/>`_
 
 .. note::
 

From 828f95ad9ecce5dacf7d3b37340803e1c17708fd Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 1 Feb 2023 13:22:08 +0100
Subject: [PATCH 1139/1748] Fix pylint 2.16 warnings

---
 scripts/bytecodecompare/prepare_report.py | 2 +-
 scripts/gas_diff_stats.py                 | 2 +-
 scripts/pylintrc                          | 1 +
 test/lsp.py                               | 8 ++++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
index dd317735fe..90901e8b79 100755
--- a/scripts/bytecodecompare/prepare_report.py
+++ b/scripts/bytecodecompare/prepare_report.py
@@ -251,7 +251,7 @@ def detect_metadata_cli_option_support(compiler_path: Path):
             f"Compiler output:\n{process.stderr}\n",
             file=sys.stderr
         )
-        raise Exception("Failed to determine if the compiler supports the --metadata option.")
+        raise RuntimeError("Failed to determine if the compiler supports the --metadata option.")
 
     return process.returncode == 0
 
diff --git a/scripts/gas_diff_stats.py b/scripts/gas_diff_stats.py
index 56cd0cd430..234d42df0c 100755
--- a/scripts/gas_diff_stats.py
+++ b/scripts/gas_diff_stats.py
@@ -75,7 +75,7 @@ def collect_statistics(lines) -> (int, int, int, int, int, int):
 
     """
     if not lines:
-        raise Exception("Empty list")
+        raise RuntimeError("Empty list")
 
     def try_parse(line):
         try:
diff --git a/scripts/pylintrc b/scripts/pylintrc
index 3a2b852930..735810ad52 100644
--- a/scripts/pylintrc
+++ b/scripts/pylintrc
@@ -23,6 +23,7 @@ disable=
     no-else-return,
     pointless-string-statement,
     redefined-outer-name,
+    superfluous-parens,
     too-few-public-methods,
     too-many-arguments,
     too-many-branches,
diff --git a/test/lsp.py b/test/lsp.py
index 2e097dab0a..669951ca4c 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -591,7 +591,7 @@ def test_diagnostics(self):
 
             for diagnostics in published_diagnostics:
                 if not diagnostics["uri"].startswith(self.suite.project_root_uri + "/"):
-                    raise Exception(
+                    raise RuntimeError(
                         f"'{self.test_name}.sol' imported file outside of test directory: '{diagnostics['uri']}'"
                     )
                 self.open_tests.append(self.suite.normalizeUri(diagnostics["uri"]))
@@ -804,9 +804,9 @@ def findMarker(desired_tag):
                     if tag == desired_tag:
                         return tagRange
                     elif tag.lower() == desired_tag.lower():
-                        raise Exception(f"Detected lower/upper case mismatch: Requested {desired_tag} but only found {tag}")
+                        raise RuntimeError(f"Detected lower/upper case mismatch: Requested {desired_tag} but only found {tag}")
 
-                raise Exception(f"Marker {desired_tag} not found in file")
+                raise RuntimeError(f"Marker {desired_tag} not found in file")
 
 
             # Check if we need markers from a specific file
@@ -1032,7 +1032,7 @@ def fetch_and_format_diagnostics(self, solc: JsonRpcProcess, test, sub_dir=None)
                 tag = self.find_tag_with_range(testname, local_sub_dir, diagnostic['range'])
 
                 if tag is None:
-                    raise Exception(f"No tag found for diagnostic range {diagnostic['range']}")
+                    raise RuntimeError(f"No tag found for diagnostic range {diagnostic['range']}")
 
                 expectations += f" {tag} {diagnostic['code']}"
             expectations += "\n"

From a186e607827ce7ce5578d671d3d1b580626a6525 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 1 Feb 2023 12:56:23 +0100
Subject: [PATCH 1140/1748] Sort changelog for 0.8.18 alphabetically

---
 Changelog.md | 31 +++++++++++++++----------------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index a1ff633eac..9b0661a90d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,43 +1,42 @@
 ### 0.8.18 (unreleased)
 
 Language Features:
-* Allow named parameters in mapping types.
+ * Allow named parameters in mapping types.
 
 
 Compiler Features:
+ * Commandline Interface: Add ``--no-cbor-metadata`` that skips CBOR metadata from getting appended at the end of the bytecode.
  * Commandline Interface: Return exit code ``2`` on uncaught exceptions.
- * Commandline Interface: Add `--no-cbor-metadata` that skips CBOR metadata from getting appended at the end of the bytecode.
  * EVM: Deprecate ``block.difficulty`` and disallow ``difficulty()`` in inline assembly for EVM versions >= paris. The change is due to the renaming introduced by [EIP-4399](https://eips.ethereum.org/EIPS/eip-4399).
  * EVM: Introduce ``block.prevrandao`` in Solidity and ``prevrandao()`` in inline assembly for EVM versions >= paris.
  * EVM: Set the default EVM version to "Paris".
  * EVM: Support for the EVM version "Paris".
- * Natspec: Add event Natspec inheritance for devdoc.
- * Standard JSON: Add a boolean field `settings.metadata.appendCBOR` that skips CBOR metadata from getting appended at the end of the bytecode.
- * Yul EVM Code Transform: Generate more optimal code for user-defined functions that always terminate a transaction. No return labels will be pushed for calls to functions that always terminate.
- * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
- * Yul Optimizer: Eliminate ``keccak256`` calls if the value was already calculated by a previous call and can be reused.
  * Language Server: Add basic document hover support.
+ * Natspec: Add event Natspec inheritance for devdoc.
  * Optimizer: Added optimization rule ``and(shl(X, Y), shl(X, Z)) => shl(X, and(Y, Z))``.
- * SMTChecker: Support Eldarica as a Horn solver for the CHC engine when using the CLI option ``--model-checker-solvers eld``. The binary `eld` must be available in the system.
- * SMTChecker: Make ``z3`` the default solver for the BMC and CHC engines instead of all solvers.
  * Parser: More detailed error messages about invalid version pragmas.
- * Removed support for the ``solidity-upgrade`` tool.
+ * SMTChecker: Make ``z3`` the default solver for the BMC and CHC engines instead of all solvers.
+ * SMTChecker: Support Eldarica as a Horn solver for the CHC engine when using the CLI option ``--model-checker-solvers eld``. The binary ``eld`` must be available in the system.
+ * Solidity Upgrade Tool: Remove ``solidity-upgrade`` tool.
+ * Standard JSON: Add a boolean field ``settings.metadata.appendCBOR`` that skips CBOR metadata from getting appended at the end of the bytecode.
  * TypeChecker: Warn when using deprecated builtin ``selfdestruct``.
+ * Yul EVM Code Transform: Generate more optimal code for user-defined functions that always terminate a transaction. No return labels will be pushed for calls to functions that always terminate.
+ * Yul Optimizer: Allow replacing the previously hard-coded cleanup sequence by specifying custom steps after a colon delimiter (``:``) in the sequence string.
+ * Yul Optimizer: Eliminate ``keccak256`` calls if the value was already calculated by a previous call and can be reused.
 
 
 Bugfixes:
  * Parser: Disallow several ``indexed`` attributes for the same event parameter.
  * Parser: Disallow usage of the ``indexed`` attribute for modifier parameters.
- * Yul Optimizer: Hash hex and decimal literals according to their value instead of their representation, improving the detection of equivalent functions.
- * Solidity Upgrade Tool ``solidity-upgrade``: Fix the tool returning success code on uncaught exceptions.
  * SMTChecker: Fix display error for negative integers that are one more than powers of two.
- * SMTChecker: Improved readability for large integers that are powers of two or almost powers of two in error messages.
- * SMTChecker: Fix internal error when a public library function is called internally.
- * SMTChecker: Fix internal error on multiple wrong SMTChecker natspec entries.
  * SMTChecker: Fix internal error on chain assignments using static fully specified state variables.
- * SMTChecker: Fix internal error when using user defined types as mapping indices or struct members.
+ * SMTChecker: Fix internal error on multiple wrong SMTChecker natspec entries.
+ * SMTChecker: Fix internal error when a public library function is called internally.
  * SMTChecker: Fix internal error when deleting struct member of function type.
+ * SMTChecker: Fix internal error when using user-defined types as mapping indices or struct members.
+ * SMTChecker: Improved readability for large integers that are powers of two or almost powers of two in error messages.
  * TypeChecker: Fix bug where private library functions could be attached with ``using for`` outside of their declaration scope.
+ * Yul Optimizer: Hash hex and decimal literals according to their value instead of their representation, improving the detection of equivalent functions.
 
 
 ### 0.8.17 (2022-09-08)

From 66007f500195bdca41dea0ab80dddf86a14a0df8 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 1 Feb 2023 14:08:57 +0100
Subject: [PATCH 1141/1748] Add release date and bugs by version entry for
 0.8.18

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 9b0661a90d..6b804fbd6c 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.18 (unreleased)
+### 0.8.18 (2023-02-01)
 
 Language Features:
  * Allow named parameters in mapping types.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 4e7bca56b3..1541a4655d 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1772,6 +1772,10 @@
         "bugs": [],
         "released": "2022-09-08"
     },
+    "0.8.18": {
+        "bugs": [],
+        "released": "2023-02-01"
+    },
     "0.8.2": {
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",

From e89efe89a68cd27a2b75258c54405d74ae16ac45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Acosta?= <nicacosta@frba.utn.edu.ar>
Date: Wed, 1 Feb 2023 15:49:34 -0300
Subject: [PATCH 1142/1748] style(mapping-types): fix mapping style

---
 docs/types/mapping-types.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/types/mapping-types.rst b/docs/types/mapping-types.rst
index 68f963753e..454caaf05d 100644
--- a/docs/types/mapping-types.rst
+++ b/docs/types/mapping-types.rst
@@ -95,8 +95,8 @@ The example below uses ``_allowances`` to record the amount someone else is allo
 
     contract MappingExample {
 
-        mapping (address => uint256) private _balances;
-        mapping (address => mapping (address => uint256)) private _allowances;
+        mapping(address => uint256) private _balances;
+        mapping(address => mapping(address => uint256)) private _allowances;
 
         event Transfer(address indexed from, address indexed to, uint256 value);
         event Approval(address indexed owner, address indexed spender, uint256 value);

From 4ff310cc625c4406884d63999b691da0e554e9e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Acosta?= <nicacosta@frba.utn.edu.ar>
Date: Wed, 1 Feb 2023 15:50:48 -0300
Subject: [PATCH 1143/1748] style(common-patterns): fix mapping style

---
 docs/common-patterns.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/common-patterns.rst b/docs/common-patterns.rst
index 1793ebd2f2..766f8f35ed 100644
--- a/docs/common-patterns.rst
+++ b/docs/common-patterns.rst
@@ -34,7 +34,7 @@ you receive the funds of the person who is now the richest.
         address public richest;
         uint public mostSent;
 
-        mapping (address => uint) pendingWithdrawals;
+        mapping(address => uint) pendingWithdrawals;
 
         /// The amount of Ether sent was not higher than
         /// the currently highest amount.

From 7b8478a81b86f2f8ccae4219d5542d529227fd5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Acosta?= <nicacosta@frba.utn.edu.ar>
Date: Wed, 1 Feb 2023 15:51:26 -0300
Subject: [PATCH 1144/1748] style(intro-sc): fix mapping style

---
 docs/introduction-to-smart-contracts.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 5a278ecfb1..146f2224be 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -91,7 +91,7 @@ registering with a username and password, all you need is an Ethereum keypair.
         // The keyword "public" makes variables
         // accessible from other contracts
         address public minter;
-        mapping (address => uint) public balances;
+        mapping(address => uint) public balances;
 
         // Events allow clients to react to specific
         // contract changes you declare
@@ -151,7 +151,7 @@ You do not need to do this, the compiler figures it out for you.
 
 .. index:: mapping
 
-The next line, ``mapping (address => uint) public balances;`` also
+The next line, ``mapping(address => uint) public balances;`` also
 creates a public state variable, but it is a more complex datatype.
 The :ref:`mapping <mapping-types>` type maps addresses to :ref:`unsigned integers <integers>`.
 

From 1edfd73b377040bfd0aef0292624652e6f0c8862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Acosta?= <nicacosta@frba.utn.edu.ar>
Date: Wed, 1 Feb 2023 15:51:56 -0300
Subject: [PATCH 1145/1748] style(security-considerations): fix mapping style

---
 docs/security-considerations.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/security-considerations.rst b/docs/security-considerations.rst
index 0375484316..0a86a8d598 100644
--- a/docs/security-considerations.rst
+++ b/docs/security-considerations.rst
@@ -336,7 +336,7 @@ field of a ``struct`` that is the base type of a dynamic storage array.  The
     pragma solidity >=0.6.0 <0.9.0;
 
     contract Map {
-        mapping (uint => uint)[] array;
+        mapping(uint => uint)[] array;
 
         function allocate(uint newMaps) public {
             for (uint i = 0; i < newMaps; i++)

From 72a17ceb71a8eed590578b6f788a8cbe67136bc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Acosta?= <nicacosta@frba.utn.edu.ar>
Date: Wed, 1 Feb 2023 15:52:34 -0300
Subject: [PATCH 1146/1748] style(function-modifiers): fix mapping style

---
 docs/contracts/function-modifiers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contracts/function-modifiers.rst b/docs/contracts/function-modifiers.rst
index bbdec1e488..b6b83bf3cc 100644
--- a/docs/contracts/function-modifiers.rst
+++ b/docs/contracts/function-modifiers.rst
@@ -61,7 +61,7 @@ if they are marked ``virtual``. For details, please see
     }
 
     contract Register is priced, destructible {
-        mapping (address => bool) registeredAddresses;
+        mapping(address => bool) registeredAddresses;
         uint price;
 
         constructor(uint initialPrice) { price = initialPrice; }

From 5b149adfcd9bfba59f2adcf6f1160558b4694005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Acosta?= <nicacosta@frba.utn.edu.ar>
Date: Wed, 1 Feb 2023 15:53:04 -0300
Subject: [PATCH 1147/1748] style(visibility-and-getters): fix mapping style

---
 docs/contracts/visibility-and-getters.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contracts/visibility-and-getters.rst b/docs/contracts/visibility-and-getters.rst
index 8932c5079b..5bf46dea55 100644
--- a/docs/contracts/visibility-and-getters.rst
+++ b/docs/contracts/visibility-and-getters.rst
@@ -200,12 +200,12 @@ The next example is more complex:
         struct Data {
             uint a;
             bytes3 b;
-            mapping (uint => uint) map;
+            mapping(uint => uint) map;
             uint[3] c;
             uint[] d;
             bytes e;
         }
-        mapping (uint => mapping(bool => Data[])) public data;
+        mapping(uint => mapping(bool => Data[])) public data;
     }
 
 It generates a function of the following form. The mapping and arrays (with the

From 9b0556caa4d5476d92262eae5ae01df4f8afcff8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Acosta?= <nicacosta@frba.utn.edu.ar>
Date: Wed, 1 Feb 2023 15:53:33 -0300
Subject: [PATCH 1148/1748] style(modular): fix mapping style

---
 docs/examples/modular.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/examples/modular.rst b/docs/examples/modular.rst
index 697699ae6e..f96b296df7 100644
--- a/docs/examples/modular.rst
+++ b/docs/examples/modular.rst
@@ -34,7 +34,7 @@ and the sum of all balances is an invariant across the lifetime of the contract.
     contract Token {
         mapping(address => uint256) balances;
         using Balances for *;
-        mapping(address => mapping (address => uint256)) allowed;
+        mapping(address => mapping(address => uint256)) allowed;
 
         event Transfer(address from, address to, uint amount);
         event Approval(address owner, address spender, uint amount);

From b403085fa15c5d35ed94b33d44c2b5abeabfb575 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Acosta?= <nicacosta@frba.utn.edu.ar>
Date: Wed, 1 Feb 2023 15:54:08 -0300
Subject: [PATCH 1149/1748] style(layout_in_storage): fix mapping style

---
 docs/internals/layout_in_storage.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/internals/layout_in_storage.rst b/docs/internals/layout_in_storage.rst
index 53670eeb85..a492dea14c 100644
--- a/docs/internals/layout_in_storage.rst
+++ b/docs/internals/layout_in_storage.rst
@@ -232,7 +232,7 @@ value and reference types, types that are encoded packed, and nested types.
         uint y;
         S s;
         address addr;
-        mapping (uint => mapping (address => bool)) map;
+        mapping(uint => mapping(address => bool)) map;
         uint[] array;
         string s1;
         bytes b1;

From da7dfeb0c52e706859fdbe520c5d2a2506ca9cff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicol=C3=A1s=20Acosta?= <nicacosta@frba.utn.edu.ar>
Date: Wed, 1 Feb 2023 15:54:32 -0300
Subject: [PATCH 1150/1748] style(reference-types): fix mapping style

---
 docs/types/reference-types.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index 6a7667b6b9..771fdecee8 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -686,11 +686,11 @@ shown in the following example:
             uint fundingGoal;
             uint numFunders;
             uint amount;
-            mapping (uint => Funder) funders;
+            mapping(uint => Funder) funders;
         }
 
         uint numCampaigns;
-        mapping (uint => Campaign) campaigns;
+        mapping(uint => Campaign) campaigns;
 
         function newCampaign(address payable beneficiary, uint goal) public returns (uint campaignID) {
             campaignID = numCampaigns++; // campaignID is return variable

From e735ff1a95497160840afa772dab2a32181db8bc Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 1 Feb 2023 20:24:50 +0100
Subject: [PATCH 1151/1748] Set version to 0.8.19

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d04d708ae2..cefaeeb656 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.18")
+set(PROJECT_VERSION "0.8.19")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 6b804fbd6c..8a3bfae6a8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.19 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.18 (2023-02-01)
 
 Language Features:

From f8880cad820f741a5288ed42a6719ab6aef6424b Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Wed, 30 Mar 2022 11:15:04 +0200
Subject: [PATCH 1152/1748] Yul grammar generator: Bound memory accesses.

---
 .../libyul/yulInterpreterTests/and_create.yul |   2 -
 .../yulInterpreterTests/and_create2.yul       |   2 -
 .../external_call_to_self.yul                 |   1 -
 .../infinite_recursion_tracelimit.yul         |  34 +----
 .../yulInterpreterTests/pop_byte_shr_call.yul |   1 -
 .../libyul/yulInterpreterTests/zero_range.yul |   1 -
 test/tools/ossfuzz/protoToYul.cpp             |  99 +++++++++---
 test/tools/ossfuzz/protoToYul.h               |   5 +
 .../EVMInstructionInterpreter.cpp             | 142 +++++++++++++++---
 .../EVMInstructionInterpreter.h               |  13 ++
 10 files changed, 215 insertions(+), 85 deletions(-)

diff --git a/test/libyul/yulInterpreterTests/and_create.yul b/test/libyul/yulInterpreterTests/and_create.yul
index 8907081506..cbc68ca623 100644
--- a/test/libyul/yulInterpreterTests/and_create.yul
+++ b/test/libyul/yulInterpreterTests/and_create.yul
@@ -6,8 +6,6 @@
 }
 // ----
 // Trace:
-//   CREATE(0, 0xffffffffffffffffffffffffffffffffffffffff, 0)
-//   CREATE(0, 0xffffffffffffffffffffffffffffffffffffffff, 0)
 // Memory dump:
 //      0: 0000000000000000000000000000000000000000000000000000000000000001
 // Storage dump:
diff --git a/test/libyul/yulInterpreterTests/and_create2.yul b/test/libyul/yulInterpreterTests/and_create2.yul
index 46df2a9cae..0c0135500d 100644
--- a/test/libyul/yulInterpreterTests/and_create2.yul
+++ b/test/libyul/yulInterpreterTests/and_create2.yul
@@ -8,8 +8,6 @@
 // EVMVersion: >=constantinople
 // ----
 // Trace:
-//   CREATE2(0, 0xffffffffffffffffffffffffffffffffffffffff, 0, 0)
-//   CREATE2(0, 0xffffffffffffffffffffffffffffffffffffffff, 0, 0)
 // Memory dump:
 //      0: 0000000000000000000000000000000000000000000000000000000000000001
 // Storage dump:
diff --git a/test/libyul/yulInterpreterTests/external_call_to_self.yul b/test/libyul/yulInterpreterTests/external_call_to_self.yul
index ad2d2bb77f..711159a9fc 100644
--- a/test/libyul/yulInterpreterTests/external_call_to_self.yul
+++ b/test/libyul/yulInterpreterTests/external_call_to_self.yul
@@ -14,7 +14,6 @@
 // ----
 // Trace:
 //   CALL(153, 0x11111111, 0, 64, 32, 256, 32)
-//   RETURN(0, 0)
 // Memory dump:
 //     40: 0000000000000000000000000000000000000000000000000000000000000042
 //    100: 0000000000000000000000000000000000000000000000000000000000000042
diff --git a/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul b/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
index 45d3cc781c..65c28ed5e7 100644
--- a/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
+++ b/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
@@ -7,38 +7,6 @@
 }
 // ----
 // Trace:
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   LOG0(0, 0)
-//   Trace size limit reached.
+//   Interpreter execution step limit reached.
 // Memory dump:
 // Storage dump:
diff --git a/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul b/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
index 4e431a6b18..51e0602a3b 100644
--- a/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
+++ b/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
@@ -5,6 +5,5 @@
 // EVMVersion: >=constantinople
 // ----
 // Trace:
-//   CALL(0, 0, 0, 0, 0, 0, 0)
 // Memory dump:
 // Storage dump:
diff --git a/test/libyul/yulInterpreterTests/zero_range.yul b/test/libyul/yulInterpreterTests/zero_range.yul
index b39a10feb3..5e1042dfbc 100644
--- a/test/libyul/yulInterpreterTests/zero_range.yul
+++ b/test/libyul/yulInterpreterTests/zero_range.yul
@@ -5,6 +5,5 @@
 }
 // ----
 // Trace:
-//   CALLDATACOPY(32, 0, 0)
 // Memory dump:
 // Storage dump:
diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 991b25e752..25b5a977df 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -351,9 +351,22 @@ void ProtoConverter::visit(BinaryOp const& _x)
 		break;
 	}
 	m_output << "(";
-	visit(_x.left());
-	m_output << ",";
-	visit(_x.right());
+	if (op == BinaryOp::KECCAK)
+	{
+		m_output << "mod(";
+		visit(_x.left());
+		m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+		m_output << ",";
+		m_output << "mod(";
+		visit(_x.right());
+		m_output << ", " << to_string(s_maxSize) << ")";
+	}
+	else
+	{
+		visit(_x.left());
+		m_output << ",";
+		visit(_x.right());
+	}
 	m_output << ")";
 }
 
@@ -623,7 +636,14 @@ void ProtoConverter::visit(UnaryOp const& _x)
 		break;
 	}
 	m_output << "(";
-	visit(_x.operand());
+	if (op == UnaryOp::MLOAD)
+	{
+		m_output << "mod(";
+		visit(_x.operand());
+		m_output << ", " << to_string(s_maxMemory) << ")";
+	}
+	else
+		visit(_x.operand());
 	m_output << ")";
 }
 
@@ -778,11 +798,15 @@ void ProtoConverter::visit(CopyFunc const& _x)
 		break;
 	}
 	m_output << "(";
+	m_output << "mod(";
 	visit(_x.target());
+	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
 	visit(_x.source());
 	m_output << ", ";
+	m_output << "mod(";
 	visit(_x.size());
+	m_output << ", " << to_string(s_maxSize) << ")";
 	m_output << ")\n";
 }
 
@@ -792,32 +816,42 @@ void ProtoConverter::visit(ExtCodeCopy const& _x)
 	m_output << "(";
 	visit(_x.addr());
 	m_output << ", ";
+	m_output << "mod(";
 	visit(_x.target());
+	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
 	visit(_x.source());
 	m_output << ", ";
+	m_output << "mod(";
 	visit(_x.size());
+	m_output << ", " << to_string(s_maxSize) << ")";
 	m_output << ")\n";
 }
 
 void ProtoConverter::visit(LogFunc const& _x)
 {
+	auto visitPosAndSize = [&](LogFunc const& _y) {
+		m_output << "mod(";
+		visit(_y.pos());
+		m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+		m_output << ", ";
+		m_output << "mod(";
+		visit(_y.size());
+		m_output << ", " << to_string(s_maxSize) << ")";
+	};
+
 	switch (_x.num_topics())
 	{
 	case LogFunc::ZERO:
 		m_output << "log0";
 		m_output << "(";
-		visit(_x.pos());
-		m_output << ", ";
-		visit(_x.size());
+		visitPosAndSize(_x);
 		m_output << ")\n";
 		break;
 	case LogFunc::ONE:
 		m_output << "log1";
 		m_output << "(";
-		visit(_x.pos());
-		m_output << ", ";
-		visit(_x.size());
+		visitPosAndSize(_x);
 		m_output << ", ";
 		visit(_x.t1());
 		m_output << ")\n";
@@ -825,9 +859,7 @@ void ProtoConverter::visit(LogFunc const& _x)
 	case LogFunc::TWO:
 		m_output << "log2";
 		m_output << "(";
-		visit(_x.pos());
-		m_output << ", ";
-		visit(_x.size());
+		visitPosAndSize(_x);
 		m_output << ", ";
 		visit(_x.t1());
 		m_output << ", ";
@@ -837,9 +869,7 @@ void ProtoConverter::visit(LogFunc const& _x)
 	case LogFunc::THREE:
 		m_output << "log3";
 		m_output << "(";
-		visit(_x.pos());
-		m_output << ", ";
-		visit(_x.size());
+		visitPosAndSize(_x);
 		m_output << ", ";
 		visit(_x.t1());
 		m_output << ", ";
@@ -851,9 +881,7 @@ void ProtoConverter::visit(LogFunc const& _x)
 	case LogFunc::FOUR:
 		m_output << "log4";
 		m_output << "(";
-		visit(_x.pos());
-		m_output << ", ";
-		visit(_x.size());
+		visitPosAndSize(_x);
 		m_output << ", ";
 		visit(_x.t1());
 		m_output << ", ";
@@ -1015,13 +1043,21 @@ void ProtoConverter::visit(LowLevelCall const& _x)
 		visit(_x.wei());
 		m_output << ", ";
 	}
+	m_output << "mod(";
 	visit(_x.in());
+	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
+	m_output << "mod(";
 	visit(_x.insize());
+	m_output << ", " << to_string(s_maxSize) << ")";
 	m_output << ", ";
+	m_output << "mod(";
 	visit(_x.out());
+	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
+	m_output << "mod(";
 	visit(_x.outsize());
+	m_output << ", " << to_string(s_maxSize) << ")";
 	m_output << ")";
 }
 
@@ -1048,9 +1084,13 @@ void ProtoConverter::visit(Create const& _x)
 	}
 	visit(_x.wei());
 	m_output << ", ";
+	m_output << "mod(";
 	visit(_x.position());
+	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
+	m_output << "mod(";
 	visit(_x.size());
+	m_output << ", " << to_string(s_maxSize) << ")";
 	if (type == Create::CREATE2)
 	{
 		m_output << ", ";
@@ -1069,7 +1109,8 @@ void ProtoConverter::visit(IfStmt const& _x)
 
 void ProtoConverter::visit(StoreFunc const& _x)
 {
-	switch (_x.st())
+	auto storeType = _x.st();
+	switch (storeType)
 	{
 	case StoreFunc::MSTORE:
 		m_output << "mstore(";
@@ -1081,7 +1122,15 @@ void ProtoConverter::visit(StoreFunc const& _x)
 		m_output << "mstore8(";
 		break;
 	}
-	visit(_x.loc());
+	// Write to memory within bounds, storage is unbounded
+	if (storeType == StoreFunc::SSTORE)
+		visit(_x.loc());
+	else
+	{
+		m_output << "mod(";
+		visit(_x.loc());
+		m_output << ", " << to_string(s_maxMemory) << ")";
+	}
 	m_output << ", ";
 	visit(_x.val());
 	m_output << ")\n";
@@ -1262,9 +1311,13 @@ void ProtoConverter::visit(RetRevStmt const& _x)
 		break;
 	}
 	m_output << "(";
+	m_output << "mod(";
 	visit(_x.pos());
+	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
+	m_output << "mod(";
 	visit(_x.size());
+	m_output << ", " << to_string(s_maxSize) << ")";
 	m_output << ")\n";
 }
 
@@ -1651,8 +1704,12 @@ void ProtoConverter::fillFunctionCallInput(unsigned _numInParams)
 			m_output << "calldataload(" << slot << ")";
 			break;
 		case 1:
+		{
+			// Access memory within stipulated bounds
+			slot = "mod(" + dictionaryToken() + ", " + to_string(s_maxMemory) + ")";
 			m_output << "mload(" << slot << ")";
 			break;
+		}
 		case 2:
 			m_output << "sload(" << slot << ")";
 			break;
diff --git a/test/tools/ossfuzz/protoToYul.h b/test/tools/ossfuzz/protoToYul.h
index 9100b490ce..00559fa93a 100644
--- a/test/tools/ossfuzz/protoToYul.h
+++ b/test/tools/ossfuzz/protoToYul.h
@@ -344,6 +344,11 @@ class ProtoConverter
 	static unsigned constexpr s_modOutputParams = 5;
 	/// Hard-coded identifier for a Yul object's data block
 	static auto constexpr s_dataIdentifier = "datablock";
+	/// Upper bound on memory writes = 2**32 - 1
+	/// See: https://eips.ethereum.org/EIPS/eip-1985#memory-size
+	static unsigned constexpr s_maxMemory = 4294967295;
+	/// Upper bound on size for range copy functions
+	static unsigned constexpr s_maxSize = 65536;
 	/// Predicate to keep track of for body scope. If false, break/continue
 	/// statements can not be created.
 	bool m_inForBodyScope;
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index db0e648286..ed73a43813 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -211,22 +211,24 @@ u256 EVMInstructionInterpreter::eval(
 	case Instruction::CALLDATASIZE:
 		return m_state.calldata.size();
 	case Instruction::CALLDATACOPY:
-		logTrace(_instruction, arg);
 		if (accessMemory(arg[0], arg[2]))
 			copyZeroExtended(
 				m_state.memory, m_state.calldata,
 				size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
 			);
+		if (arg[2] != 0)
+			logTrace(_instruction, arg);
 		return 0;
 	case Instruction::CODESIZE:
 		return m_state.code.size();
 	case Instruction::CODECOPY:
-		logTrace(_instruction, arg);
 		if (accessMemory(arg[0], arg[2]))
 			copyZeroExtended(
 				m_state.memory, m_state.code,
 				size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
 			);
+		if (arg[2] != 0)
+			logTrace(_instruction, arg);
 		return 0;
 	case Instruction::GASPRICE:
 		return m_state.gasprice;
@@ -239,23 +241,25 @@ u256 EVMInstructionInterpreter::eval(
 	case Instruction::EXTCODEHASH:
 		return u256(keccak256(h256(arg[0] + 1)));
 	case Instruction::EXTCODECOPY:
-		logTrace(_instruction, arg);
 		if (accessMemory(arg[1], arg[3]))
 			// TODO this way extcodecopy and codecopy do the same thing.
 			copyZeroExtended(
 				m_state.memory, m_state.code,
 				size_t(arg[1]), size_t(arg[2]), size_t(arg[3])
 			);
+		if (arg[3] != 0)
+			logTrace(_instruction, arg);
 		return 0;
 	case Instruction::RETURNDATASIZE:
 		return m_state.returndata.size();
 	case Instruction::RETURNDATACOPY:
-		logTrace(_instruction, arg);
 		if (accessMemory(arg[0], arg[2]))
 			copyZeroExtended(
 				m_state.memory, m_state.returndata,
 				size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
 			);
+		if (arg[2] != 0)
+			logTrace(_instruction, arg);
 		return 0;
 	case Instruction::BLOCKHASH:
 		if (arg[0] >= m_state.blockNumber || arg[0] + 256 < m_state.blockNumber)
@@ -297,38 +301,54 @@ u256 EVMInstructionInterpreter::eval(
 		return 0x99;
 	case Instruction::LOG0:
 		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
+		if (arg[1] != 0)
+			logTrace(_instruction, arg);
 		return 0;
 	case Instruction::LOG1:
 		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
+		if (arg[1] != 0)
+			logTrace(_instruction, arg);
 		return 0;
 	case Instruction::LOG2:
 		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
+		if (arg[1] != 0)
+			logTrace(_instruction, arg);
 		return 0;
 	case Instruction::LOG3:
 		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
+		if (arg[1] != 0)
+			logTrace(_instruction, arg);
 		return 0;
 	case Instruction::LOG4:
 		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
+		if (arg[1] != 0)
+			logTrace(_instruction, arg);
 		return 0;
 	// --------------- calls ---------------
 	case Instruction::CREATE:
 		accessMemory(arg[1], arg[2]);
-		logTrace(_instruction, arg);
-		return (0xcccccc + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
+		if (arg[2] != 0)
+		{
+			logTrace(_instruction, arg);
+			return (0xcccccc + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
+		}
+		return 0xcccccc;
 	case Instruction::CREATE2:
 		accessMemory(arg[1], arg[2]);
-		logTrace(_instruction, arg);
-		return (0xdddddd + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
+		if (arg[2] != 0)
+		{
+			logTrace(_instruction, arg);
+			return (0xdddddd + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
+		}
+		return 0xdddddd;
 	case Instruction::CALL:
 	case Instruction::CALLCODE:
-		accessMemory(arg[3], arg[4]);
-		accessMemory(arg[5], arg[6]);
-		logTrace(_instruction, arg);
+		if (arg[4] != 0)
+			accessMemory(arg[3], arg[4]);
+		if (arg[6] != 0)
+			accessMemory(arg[5], arg[6]);
+		if (arg[4] != 0 && arg[6] != 0)
+			logTrace(_instruction, arg);
 		// Randomly fail based on the called address if it isn't a call to self.
 		// Used for fuzzing.
 		return (
@@ -337,10 +357,12 @@ u256 EVMInstructionInterpreter::eval(
 		) ? 1 : 0;
 	case Instruction::DELEGATECALL:
 	case Instruction::STATICCALL:
-		accessMemory(arg[2], arg[3]);
-		accessMemory(arg[4], arg[5]);
-		logTrace(_instruction, arg);
-
+		if (arg[3] != 0)
+			accessMemory(arg[2], arg[3]);
+		if (arg[5] != 0)
+			accessMemory(arg[4], arg[5]);
+		if (arg[3] != 0 && arg[5] != 0)
+			logTrace(_instruction, arg);
 		// Randomly fail based on the called address if it isn't a call to self.
 		// Used for fuzzing.
 		return (
@@ -352,12 +374,14 @@ u256 EVMInstructionInterpreter::eval(
 		m_state.returndata = {};
 		if (accessMemory(arg[0], arg[1]))
 			m_state.returndata = m_state.readMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg, m_state.returndata);
+		if (arg[1] != 0)
+			logTrace(_instruction, arg, m_state.returndata);
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminatedWithReturn());
 	}
 	case Instruction::REVERT:
 		accessMemory(arg[0], arg[1]);
-		logTrace(_instruction, arg);
+		if (arg[1] != 0)
+			logTrace(_instruction, arg);
 		m_state.storage.clear();
 		m_state.trace.clear();
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
@@ -479,7 +503,10 @@ u256 EVMInstructionInterpreter::evalBuiltin(
 	else if (fun == "datacopy")
 	{
 		// This is identical to codecopy.
-		if (accessMemory(_evaluatedArguments.at(0), _evaluatedArguments.at(2)))
+		if (
+				_evaluatedArguments.at(2) != 0 &&
+				accessMemory(_evaluatedArguments.at(0), _evaluatedArguments.at(2))
+		)
 			copyZeroExtended(
 				m_state.memory,
 				m_state.code,
@@ -560,8 +587,13 @@ void EVMInstructionInterpreter::logTrace(
 	if (!(_writesToMemory && memWriteTracingDisabled()))
 	{
 		string message = _pseudoInstruction + "(";
+		std::pair<bool, size_t> inputMemoryPtrModified = isInputMemoryPtrModified(_pseudoInstruction, _arguments);
 		for (size_t i = 0; i < _arguments.size(); ++i)
-			message += (i > 0 ? ", " : "") + formatNumber(_arguments[i]);
+		{
+			bool printZero = inputMemoryPtrModified.first && inputMemoryPtrModified.second == i;
+			u256 arg = printZero ? 0 : _arguments[i];
+			message += (i > 0 ? ", " : "") + formatNumber(arg);
+		}
 		message += ")";
 		if (!_data.empty())
 			message += " [" + util::toHex(_data) + "]";
@@ -573,3 +605,65 @@ void EVMInstructionInterpreter::logTrace(
 		}
 	}
 }
+
+std::pair<bool, size_t> EVMInstructionInterpreter::isInputMemoryPtrModified(
+	std::string const& _pseudoInstruction,
+	std::vector<u256> const& _arguments
+)
+{
+	if (_pseudoInstruction == "return" || _pseudoInstruction == "revert")
+	{
+		if (_arguments[1] == 0)
+			return {true, 0};
+		else
+			return {false, 0};
+	}
+	else if (
+		_pseudoInstruction == "returndatacopy" || _pseudoInstruction == "calldatacopy"
+		|| _pseudoInstruction == "codecopy")
+	{
+		if (_arguments[2] == 0)
+			return {true, 0};
+		else
+			return {false, 0};
+	}
+	else if (_pseudoInstruction == "extcodedatacopy")
+	{
+		if (_arguments[3] == 0)
+			return {true, 1};
+		else
+			return {false, 0};
+	}
+	else if (
+		_pseudoInstruction == "log0" || _pseudoInstruction == "log1" || _pseudoInstruction == "log2"
+		|| _pseudoInstruction == "log3" || _pseudoInstruction == "log4")
+	{
+		if (_arguments[1] == 0)
+			return {true, 0};
+		else
+			return {false, 0};
+	}
+	if (_pseudoInstruction == "create" || _pseudoInstruction == "create2")
+	{
+		if (_arguments[2] == 0)
+			return {true, 1};
+		else
+			return {false, 0};
+	}
+	if (_pseudoInstruction == "call" || _pseudoInstruction == "callcode")
+	{
+		if (_arguments[4] == 0)
+			return {true, 3};
+		else
+			return {false, 0};
+	}
+	else if (_pseudoInstruction == "delegatecall" || _pseudoInstruction == "staticcall")
+	{
+		if (_arguments[3] == 0)
+			return {true, 2};
+		else
+			return {false, 0};
+	}
+	else
+		return {false, 0};
+}
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
index 9f0f473f14..d37cae542f 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -125,6 +125,19 @@ class EVMInstructionInterpreter
 		std::vector<u256> const& _arguments = {},
 		bytes const& _data = {}
 	);
+
+	/// @returns a pair of boolean and size_t whose first value is true if @param _pseudoInstruction
+	/// is a Yul instruction that the Yul optimizer's loadResolver step rewrites the input
+	/// memory pointer value to zero if that instruction's read length (contained within @param
+	// _arguments) is zero, and whose second value is the positional index of the input memory
+	// pointer argument.
+	/// If the Yul instruction is unaffected or affected but read length is non-zero, the first
+	/// value is false.
+	std::pair<bool, size_t> isInputMemoryPtrModified(
+		std::string const& _pseudoInstruction,
+		std::vector<u256> const& _arguments
+	);
+
 	/// @returns disable trace flag.
 	bool memWriteTracingDisabled()
 	{

From bc00063b2ecdfb37afadc6231f511e4836fcfa0d Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 1 Feb 2023 10:25:39 +0100
Subject: [PATCH 1153/1748] Do not print suppressions statistics for cli tests

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 81b757a66e..0f5d0da8f8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1096,7 +1096,7 @@ jobs:
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
       # Suppress CLN memory leak.
       # See: https://github.com/ethereum/solidity/issues/13891 for details.
-      LSAN_OPTIONS: suppressions=.circleci/cln-asan.supp
+      LSAN_OPTIONS: suppressions=.circleci/cln-asan.supp:print_suppressions=0
     <<: *steps_cmdline_tests
 
   t_ubu_asan_soltest:

From 7ddb5e0c6621eaf61ceaef593471753db808e1be Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 2 Feb 2023 09:48:43 +0100
Subject: [PATCH 1154/1748] Change relative to absolute path for LSAN_OPTIONS

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0f5d0da8f8..8a2361492c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1096,7 +1096,7 @@ jobs:
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
       # Suppress CLN memory leak.
       # See: https://github.com/ethereum/solidity/issues/13891 for details.
-      LSAN_OPTIONS: suppressions=.circleci/cln-asan.supp:print_suppressions=0
+      LSAN_OPTIONS: suppressions=/root/project/.circleci/cln-asan.supp:print_suppressions=0
     <<: *steps_cmdline_tests
 
   t_ubu_asan_soltest:
@@ -1109,7 +1109,7 @@ jobs:
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
       # Suppress CLN memory leak.
       # See: https://github.com/ethereum/solidity/issues/13891 for details.
-      LSAN_OPTIONS: suppressions=.circleci/cln-asan.supp
+      LSAN_OPTIONS: suppressions=/root/project/.circleci/cln-asan.supp
     <<: *steps_soltest
 
   t_ubu_asan_clang_soltest:

From 5c6e12b2c020d1b8b2981a8a81ae670a990d14b8 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Wed, 1 Feb 2023 08:28:05 +0100
Subject: [PATCH 1155/1748] Update existing and add new test cases.

---
 .../libyul/yulInterpreterTests/and_create.yul |  2 +
 .../yulInterpreterTests/and_create2.yul       |  2 +
 .../external_call_to_self.yul                 |  1 +
 .../infinite_recursion_tracelimit.yul         | 34 +++++++-
 .../yulInterpreterTests/pop_byte_shr_call.yul |  1 +
 .../yulInterpreterTests/zero_length_reads.yul | 40 +++++++++
 .../zero_length_reads_and_revert.yul          | 40 +++++++++
 .../libyul/yulInterpreterTests/zero_range.yul |  1 +
 .../loadResolver/zero_length_reads.yul        | 45 ++++++++++
 .../EVMInstructionInterpreter.cpp             | 84 +++++++------------
 10 files changed, 197 insertions(+), 53 deletions(-)
 create mode 100644 test/libyul/yulInterpreterTests/zero_length_reads.yul
 create mode 100644 test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul
 create mode 100644 test/libyul/yulOptimizerTests/loadResolver/zero_length_reads.yul

diff --git a/test/libyul/yulInterpreterTests/and_create.yul b/test/libyul/yulInterpreterTests/and_create.yul
index cbc68ca623..cf32c4658e 100644
--- a/test/libyul/yulInterpreterTests/and_create.yul
+++ b/test/libyul/yulInterpreterTests/and_create.yul
@@ -6,6 +6,8 @@
 }
 // ----
 // Trace:
+//   CREATE(0, 0, 0)
+//   CREATE(0, 0, 0)
 // Memory dump:
 //      0: 0000000000000000000000000000000000000000000000000000000000000001
 // Storage dump:
diff --git a/test/libyul/yulInterpreterTests/and_create2.yul b/test/libyul/yulInterpreterTests/and_create2.yul
index 0c0135500d..5201b0188a 100644
--- a/test/libyul/yulInterpreterTests/and_create2.yul
+++ b/test/libyul/yulInterpreterTests/and_create2.yul
@@ -8,6 +8,8 @@
 // EVMVersion: >=constantinople
 // ----
 // Trace:
+//   CREATE2(0, 0, 0, 0)
+//   CREATE2(0, 0, 0, 0)
 // Memory dump:
 //      0: 0000000000000000000000000000000000000000000000000000000000000001
 // Storage dump:
diff --git a/test/libyul/yulInterpreterTests/external_call_to_self.yul b/test/libyul/yulInterpreterTests/external_call_to_self.yul
index 711159a9fc..ad2d2bb77f 100644
--- a/test/libyul/yulInterpreterTests/external_call_to_self.yul
+++ b/test/libyul/yulInterpreterTests/external_call_to_self.yul
@@ -14,6 +14,7 @@
 // ----
 // Trace:
 //   CALL(153, 0x11111111, 0, 64, 32, 256, 32)
+//   RETURN(0, 0)
 // Memory dump:
 //     40: 0000000000000000000000000000000000000000000000000000000000000042
 //    100: 0000000000000000000000000000000000000000000000000000000000000042
diff --git a/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul b/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
index 65c28ed5e7..45d3cc781c 100644
--- a/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
+++ b/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
@@ -7,6 +7,38 @@
 }
 // ----
 // Trace:
-//   Interpreter execution step limit reached.
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   LOG0(0, 0)
+//   Trace size limit reached.
 // Memory dump:
 // Storage dump:
diff --git a/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul b/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
index 51e0602a3b..4e431a6b18 100644
--- a/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
+++ b/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
@@ -5,5 +5,6 @@
 // EVMVersion: >=constantinople
 // ----
 // Trace:
+//   CALL(0, 0, 0, 0, 0, 0, 0)
 // Memory dump:
 // Storage dump:
diff --git a/test/libyul/yulInterpreterTests/zero_length_reads.yul b/test/libyul/yulInterpreterTests/zero_length_reads.yul
new file mode 100644
index 0000000000..6c1f38d1e9
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/zero_length_reads.yul
@@ -0,0 +1,40 @@
+{
+  returndatacopy(1, 1, 0)
+  calldatacopy(1, 1, 0)
+  extcodecopy(1, 1, 1, 0)
+  codecopy(1, 1, 0)
+  log0(1, 0)
+  log1(1, 0, 1)
+  log2(1, 0, 1, 1)
+  log3(1, 0, 1, 1, 1)
+  log4(1, 0, 1, 1, 1, 1)
+  pop(create(1, 1, 0))
+  pop(create2(1, 1, 0, 1))
+  pop(call(1, 1, 1, 1, 0, 1, 0))
+  pop(callcode(1, 1, 1, 1, 0, 1, 0))
+  pop(delegatecall(1, 1, 1, 0, 1, 0))
+  pop(staticcall(1, 1, 1, 0, 1, 0))
+  return(1, 0)
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Trace:
+//   RETURNDATACOPY(0, 1, 0)
+//   CALLDATACOPY(0, 1, 0)
+//   EXTCODECOPY(1, 0, 1, 0)
+//   CODECOPY(0, 1, 0)
+//   LOG0(0, 0)
+//   LOG1(0, 0, 1)
+//   LOG2(0, 0, 1, 1)
+//   LOG3(0, 0, 1, 1, 1)
+//   LOG4(0, 0, 1, 1, 1, 1)
+//   CREATE(1, 0, 0)
+//   CREATE2(1, 0, 0, 1)
+//   CALL(1, 1, 1, 0, 0, 1, 0)
+//   CALLCODE(1, 1, 1, 0, 0, 1, 0)
+//   DELEGATECALL(1, 1, 0, 0, 1, 0)
+//   STATICCALL(1, 1, 0, 0, 1, 0)
+//   RETURN(0, 0)
+// Memory dump:
+// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul b/test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul
new file mode 100644
index 0000000000..4be49eeb09
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul
@@ -0,0 +1,40 @@
+{
+  returndatacopy(1, 1, 0)
+  calldatacopy(1, 1, 0)
+  extcodecopy(1, 1, 1, 0)
+  codecopy(1, 1, 0)
+  log0(1, 0)
+  log1(1, 0, 1)
+  log2(1, 0, 1, 1)
+  log3(1, 0, 1, 1, 1)
+  log4(1, 0, 1, 1, 1, 1)
+  pop(create(1, 1, 0))
+  pop(create2(1, 1, 0, 1))
+  pop(call(1, 1, 1, 1, 0, 1, 0))
+  pop(callcode(1, 1, 1, 1, 0, 1, 0))
+  pop(delegatecall(1, 1, 1, 0, 1, 0))
+  pop(staticcall(1, 1, 1, 0, 1, 0))
+  revert(1, 0)
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Trace:
+//   RETURNDATACOPY(0, 1, 0)
+//   CALLDATACOPY(0, 1, 0)
+//   EXTCODECOPY(1, 0, 1, 0)
+//   CODECOPY(0, 1, 0)
+//   LOG0(0, 0)
+//   LOG1(0, 0, 1)
+//   LOG2(0, 0, 1, 1)
+//   LOG3(0, 0, 1, 1, 1)
+//   LOG4(0, 0, 1, 1, 1, 1)
+//   CREATE(1, 0, 0)
+//   CREATE2(1, 0, 0, 1)
+//   CALL(1, 1, 1, 0, 0, 1, 0)
+//   CALLCODE(1, 1, 1, 0, 0, 1, 0)
+//   DELEGATECALL(1, 1, 0, 0, 1, 0)
+//   STATICCALL(1, 1, 0, 0, 1, 0)
+//   REVERT(0, 0)
+// Memory dump:
+// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/zero_range.yul b/test/libyul/yulInterpreterTests/zero_range.yul
index 5e1042dfbc..1ad25ed37b 100644
--- a/test/libyul/yulInterpreterTests/zero_range.yul
+++ b/test/libyul/yulInterpreterTests/zero_range.yul
@@ -5,5 +5,6 @@
 }
 // ----
 // Trace:
+//   CALLDATACOPY(0, 0, 0)
 // Memory dump:
 // Storage dump:
diff --git a/test/libyul/yulOptimizerTests/loadResolver/zero_length_reads.yul b/test/libyul/yulOptimizerTests/loadResolver/zero_length_reads.yul
new file mode 100644
index 0000000000..418221a938
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/loadResolver/zero_length_reads.yul
@@ -0,0 +1,45 @@
+{
+  returndatacopy(1, 1, 0)
+  calldatacopy(1, 1, 0)
+  extcodecopy(1, 1, 1, 0)
+  codecopy(1, 1, 0)
+  log0(1, 0)
+  log1(1, 0, 1)
+  log2(1, 0, 1, 1)
+  log3(1, 0, 1, 1, 1)
+  log4(1, 0, 1, 1, 1, 1)
+  pop(create(1, 1, 0))
+  pop(create2(1, 1, 0, 1))
+  pop(call(1, 1, 1, 1, 0, 1, 0))
+  pop(callcode(1, 1, 1, 1, 0, 1, 0))
+  pop(delegatecall(1, 1, 1, 0, 1, 0))
+  pop(staticcall(1, 1, 1, 0, 1, 0))
+  return(1, 0)
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// step: loadResolver
+//
+// {
+//     {
+//         let _1 := 0
+//         let _2 := 1
+//         returndatacopy(0, _2, _1)
+//         calldatacopy(0, _2, _1)
+//         extcodecopy(_2, 0, _2, _1)
+//         codecopy(0, _2, _1)
+//         log0(0, _1)
+//         log1(0, _1, _2)
+//         log2(0, _1, _2, _2)
+//         log3(0, _1, _2, _2, _2)
+//         log4(0, _1, _2, _2, _2, _2)
+//         pop(create(_2, 0, _1))
+//         pop(create2(_2, 0, _1, _2))
+//         pop(call(_2, _2, _2, 0, _1, _2, _1))
+//         pop(callcode(_2, _2, _2, 0, _1, _2, _1))
+//         pop(delegatecall(_2, _2, 0, _1, _2, _1))
+//         pop(staticcall(_2, _2, 0, _1, _2, _1))
+//         return(0, _1)
+//     }
+// }
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index ed73a43813..b049ee6c4f 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -216,8 +216,7 @@ u256 EVMInstructionInterpreter::eval(
 				m_state.memory, m_state.calldata,
 				size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
 			);
-		if (arg[2] != 0)
-			logTrace(_instruction, arg);
+		logTrace(_instruction, arg);
 		return 0;
 	case Instruction::CODESIZE:
 		return m_state.code.size();
@@ -227,8 +226,7 @@ u256 EVMInstructionInterpreter::eval(
 				m_state.memory, m_state.code,
 				size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
 			);
-		if (arg[2] != 0)
-			logTrace(_instruction, arg);
+		logTrace(_instruction, arg);
 		return 0;
 	case Instruction::GASPRICE:
 		return m_state.gasprice;
@@ -247,8 +245,7 @@ u256 EVMInstructionInterpreter::eval(
 				m_state.memory, m_state.code,
 				size_t(arg[1]), size_t(arg[2]), size_t(arg[3])
 			);
-		if (arg[3] != 0)
-			logTrace(_instruction, arg);
+		logTrace(_instruction, arg);
 		return 0;
 	case Instruction::RETURNDATASIZE:
 		return m_state.returndata.size();
@@ -258,8 +255,7 @@ u256 EVMInstructionInterpreter::eval(
 				m_state.memory, m_state.returndata,
 				size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
 			);
-		if (arg[2] != 0)
-			logTrace(_instruction, arg);
+		logTrace(_instruction, arg);
 		return 0;
 	case Instruction::BLOCKHASH:
 		if (arg[0] >= m_state.blockNumber || arg[0] + 256 < m_state.blockNumber)
@@ -301,54 +297,44 @@ u256 EVMInstructionInterpreter::eval(
 		return 0x99;
 	case Instruction::LOG0:
 		accessMemory(arg[0], arg[1]);
-		if (arg[1] != 0)
-			logTrace(_instruction, arg);
+		logTrace(_instruction, arg);
 		return 0;
 	case Instruction::LOG1:
 		accessMemory(arg[0], arg[1]);
-		if (arg[1] != 0)
-			logTrace(_instruction, arg);
+		logTrace(_instruction, arg);
 		return 0;
 	case Instruction::LOG2:
 		accessMemory(arg[0], arg[1]);
-		if (arg[1] != 0)
-			logTrace(_instruction, arg);
+		logTrace(_instruction, arg);
 		return 0;
 	case Instruction::LOG3:
 		accessMemory(arg[0], arg[1]);
-		if (arg[1] != 0)
-			logTrace(_instruction, arg);
+		logTrace(_instruction, arg);
 		return 0;
 	case Instruction::LOG4:
 		accessMemory(arg[0], arg[1]);
-		if (arg[1] != 0)
-			logTrace(_instruction, arg);
+		logTrace(_instruction, arg);
 		return 0;
 	// --------------- calls ---------------
 	case Instruction::CREATE:
 		accessMemory(arg[1], arg[2]);
+		logTrace(_instruction, arg);
 		if (arg[2] != 0)
-		{
-			logTrace(_instruction, arg);
 			return (0xcccccc + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
-		}
-		return 0xcccccc;
+		else
+			return 0xcccccc;
 	case Instruction::CREATE2:
 		accessMemory(arg[1], arg[2]);
+		logTrace(_instruction, arg);
 		if (arg[2] != 0)
-		{
-			logTrace(_instruction, arg);
 			return (0xdddddd + arg[1]) & u256("0xffffffffffffffffffffffffffffffffffffffff");
-		}
-		return 0xdddddd;
+		else
+			return 0xdddddd;
 	case Instruction::CALL:
 	case Instruction::CALLCODE:
-		if (arg[4] != 0)
-			accessMemory(arg[3], arg[4]);
-		if (arg[6] != 0)
-			accessMemory(arg[5], arg[6]);
-		if (arg[4] != 0 && arg[6] != 0)
-			logTrace(_instruction, arg);
+		accessMemory(arg[3], arg[4]);
+		accessMemory(arg[5], arg[6]);
+		logTrace(_instruction, arg);
 		// Randomly fail based on the called address if it isn't a call to self.
 		// Used for fuzzing.
 		return (
@@ -357,12 +343,9 @@ u256 EVMInstructionInterpreter::eval(
 		) ? 1 : 0;
 	case Instruction::DELEGATECALL:
 	case Instruction::STATICCALL:
-		if (arg[3] != 0)
-			accessMemory(arg[2], arg[3]);
-		if (arg[5] != 0)
-			accessMemory(arg[4], arg[5]);
-		if (arg[3] != 0 && arg[5] != 0)
-			logTrace(_instruction, arg);
+		accessMemory(arg[2], arg[3]);
+		accessMemory(arg[4], arg[5]);
+		logTrace(_instruction, arg);
 		// Randomly fail based on the called address if it isn't a call to self.
 		// Used for fuzzing.
 		return (
@@ -374,16 +357,13 @@ u256 EVMInstructionInterpreter::eval(
 		m_state.returndata = {};
 		if (accessMemory(arg[0], arg[1]))
 			m_state.returndata = m_state.readMemory(arg[0], arg[1]);
-		if (arg[1] != 0)
-			logTrace(_instruction, arg, m_state.returndata);
+		logTrace(_instruction, arg, m_state.returndata);
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminatedWithReturn());
 	}
 	case Instruction::REVERT:
 		accessMemory(arg[0], arg[1]);
-		if (arg[1] != 0)
-			logTrace(_instruction, arg);
+		logTrace(_instruction, arg);
 		m_state.storage.clear();
-		m_state.trace.clear();
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
 	case Instruction::INVALID:
 		logTrace(_instruction);
@@ -611,7 +591,7 @@ std::pair<bool, size_t> EVMInstructionInterpreter::isInputMemoryPtrModified(
 	std::vector<u256> const& _arguments
 )
 {
-	if (_pseudoInstruction == "return" || _pseudoInstruction == "revert")
+	if (_pseudoInstruction == "RETURN" || _pseudoInstruction == "REVERT")
 	{
 		if (_arguments[1] == 0)
 			return {true, 0};
@@ -619,15 +599,15 @@ std::pair<bool, size_t> EVMInstructionInterpreter::isInputMemoryPtrModified(
 			return {false, 0};
 	}
 	else if (
-		_pseudoInstruction == "returndatacopy" || _pseudoInstruction == "calldatacopy"
-		|| _pseudoInstruction == "codecopy")
+		_pseudoInstruction == "RETURNDATACOPY" || _pseudoInstruction == "CALLDATACOPY"
+		|| _pseudoInstruction == "CODECOPY")
 	{
 		if (_arguments[2] == 0)
 			return {true, 0};
 		else
 			return {false, 0};
 	}
-	else if (_pseudoInstruction == "extcodedatacopy")
+	else if (_pseudoInstruction == "EXTCODECOPY")
 	{
 		if (_arguments[3] == 0)
 			return {true, 1};
@@ -635,29 +615,29 @@ std::pair<bool, size_t> EVMInstructionInterpreter::isInputMemoryPtrModified(
 			return {false, 0};
 	}
 	else if (
-		_pseudoInstruction == "log0" || _pseudoInstruction == "log1" || _pseudoInstruction == "log2"
-		|| _pseudoInstruction == "log3" || _pseudoInstruction == "log4")
+		_pseudoInstruction == "LOG0" || _pseudoInstruction == "LOG1" || _pseudoInstruction == "LOG2"
+		|| _pseudoInstruction == "LOG3" || _pseudoInstruction == "LOG4")
 	{
 		if (_arguments[1] == 0)
 			return {true, 0};
 		else
 			return {false, 0};
 	}
-	if (_pseudoInstruction == "create" || _pseudoInstruction == "create2")
+	if (_pseudoInstruction == "CREATE" || _pseudoInstruction == "CREATE2")
 	{
 		if (_arguments[2] == 0)
 			return {true, 1};
 		else
 			return {false, 0};
 	}
-	if (_pseudoInstruction == "call" || _pseudoInstruction == "callcode")
+	if (_pseudoInstruction == "CALL" || _pseudoInstruction == "CALLCODE")
 	{
 		if (_arguments[4] == 0)
 			return {true, 3};
 		else
 			return {false, 0};
 	}
-	else if (_pseudoInstruction == "delegatecall" || _pseudoInstruction == "staticcall")
+	else if (_pseudoInstruction == "DELEGATECALL" || _pseudoInstruction == "STATICCALL")
 	{
 		if (_arguments[3] == 0)
 			return {true, 2};

From 2b70b08d5f637f2252e84c26d2fbda96385aaf7e Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Sun, 8 Jan 2023 23:14:17 -0300
Subject: [PATCH 1156/1748] Allow library external functions to be bound with
 using for

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/NameAndTypeResolver.cpp  | 15 ++++++---
 libsolidity/analysis/NameAndTypeResolver.h    |  2 +-
 libsolidity/analysis/ReferencesResolver.cpp   | 33 +++++++++++++++++++
 libsolidity/analysis/ReferencesResolver.h     |  1 +
 libsolidity/analysis/TypeChecker.cpp          | 20 ++++++++---
 .../library_functions_inside_contract.sol     | 31 +++++++++++++++++
 ...external_library_function_inside_scope.sol |  9 +++++
 .../external_function_qualified_with_this.sol |  7 ++++
 .../using/free_functions_non_unique_err.sol   |  2 +-
 .../syntaxTests/using/free_overloads.sol      |  2 +-
 .../using/free_overloads_array.sol            |  2 +-
 ...rom_base_contract_qualified_with_super.sol |  9 +++++
 ..._name_without_braces_at_file_level_err.sol | 11 +++++++
 ...ame_without_braces_inside_contract_err.sol | 10 ++++++
 .../interface_function_at_file_level.sol      |  7 ++++
 .../interface_function_inside_contract.sol    |  9 +++++
 .../using/library_at_file_level.sol           | 17 ++++++++++
 .../using/library_functions_at_file_level.sol | 19 +++++++++++
 ...ched_at_file_level_used_inside_library.sol | 17 ++++++++++
 ...ched_in_single_directive_at_file_level.sol | 17 ++++++++++
 ...ed_in_single_directive_inside_contract.sol | 17 ++++++++++
 .../library_functions_inside_contract.sol     | 19 +++++++++++
 .../using/library_inside_contract.sol         | 17 ++++++++++
 ...library_non_free_external_function_err.sol |  2 +-
 .../using/module_identifier_not_found.sol     |  2 +-
 .../using/public_state_variable_getter.sol    | 11 +++++++
 .../syntaxTests/using/undeclared_library.sol  |  3 ++
 ...hed_in_single_directive_inside_library.sol | 19 +++++++++++
 29 files changed, 316 insertions(+), 15 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/using/library_functions_inside_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/scoping/external_library_function_inside_scope.sol
 create mode 100644 test/libsolidity/syntaxTests/using/external_function_qualified_with_this.sol
 create mode 100644 test/libsolidity/syntaxTests/using/function_from_base_contract_qualified_with_super.sol
 create mode 100644 test/libsolidity/syntaxTests/using/function_name_without_braces_at_file_level_err.sol
 create mode 100644 test/libsolidity/syntaxTests/using/function_name_without_braces_inside_contract_err.sol
 create mode 100644 test/libsolidity/syntaxTests/using/interface_function_at_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/using/interface_function_inside_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/using/library_at_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/using/library_functions_at_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/using/library_functions_attached_at_file_level_used_inside_library.sol
 create mode 100644 test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_at_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_inside_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/using/library_functions_inside_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/using/library_inside_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/using/public_state_variable_getter.sol
 create mode 100644 test/libsolidity/syntaxTests/using/undeclared_library.sol
 create mode 100644 test/libsolidity/syntaxTests/using/unqualified_library_functions_attached_in_single_directive_inside_library.sol

diff --git a/Changelog.md b/Changelog.md
index 8a3bfae6a8..7619fbd40d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * TypeChecker: Also allow external library functions in ``using for``.
 
 
 ### 0.8.18 (2023-02-01)
diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index 1b58d3c9ab..641f022804 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -195,16 +195,23 @@ Declaration const* NameAndTypeResolver::pathFromCurrentScope(vector<ASTString> c
 	return nullptr;
 }
 
-std::vector<Declaration const*> NameAndTypeResolver::pathFromCurrentScopeWithAllDeclarations(std::vector<ASTString> const& _path) const
+std::vector<Declaration const*> NameAndTypeResolver::pathFromCurrentScopeWithAllDeclarations(
+	std::vector<ASTString> const& _path,
+	bool _includeInvisibles
+) const
 {
 	solAssert(!_path.empty(), "");
 	vector<Declaration const*> pathDeclarations;
 
 	ResolvingSettings settings;
 	settings.recursive = true;
-	settings.alsoInvisible = false;
+	settings.alsoInvisible = _includeInvisibles;
 	settings.onlyVisibleAsUnqualifiedNames = true;
-	vector<Declaration const*> candidates = m_currentScope->resolveName(_path.front(), std::move(settings));
+	vector<Declaration const*> candidates = m_currentScope->resolveName(_path.front(), settings);
+
+	// inside the loop, use default settings, except for alsoInvisible
+	settings.recursive = false;
+	settings.onlyVisibleAsUnqualifiedNames = false;
 
 	for (size_t i = 1; i < _path.size() && candidates.size() == 1; i++)
 	{
@@ -213,7 +220,7 @@ std::vector<Declaration const*> NameAndTypeResolver::pathFromCurrentScopeWithAll
 
 		pathDeclarations.push_back(candidates.front());
 
-		candidates = m_scopes.at(candidates.front())->resolveName(_path[i]);
+		candidates = m_scopes.at(candidates.front())->resolveName(_path[i], settings);
 	}
 	if (candidates.size() == 1)
 	{
diff --git a/libsolidity/analysis/NameAndTypeResolver.h b/libsolidity/analysis/NameAndTypeResolver.h
index 2bf238a00e..6ba591e8ad 100644
--- a/libsolidity/analysis/NameAndTypeResolver.h
+++ b/libsolidity/analysis/NameAndTypeResolver.h
@@ -96,7 +96,7 @@ class NameAndTypeResolver
 	/// Resolves a path starting from the "current" scope, but also searches parent scopes.
 	/// Should only be called during the initial resolving phase.
 	/// @note Returns an empty vector if any component in the path was non-unique or not found. Otherwise, all declarations along the path are returned.
-	std::vector<Declaration const*> pathFromCurrentScopeWithAllDeclarations(std::vector<ASTString> const& _path) const;
+	std::vector<Declaration const*> pathFromCurrentScopeWithAllDeclarations(std::vector<ASTString> const& _path, bool _includeInvisibles = false) const;
 
 	/// Generate and store warnings about declarations with the same name.
 	void warnHomonymDeclarations() const;
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index 50b1656ef8..399c15b56e 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -173,6 +173,7 @@ void ReferencesResolver::endVisit(ModifierDefinition const&)
 
 void ReferencesResolver::endVisit(IdentifierPath const& _path)
 {
+	// Note that library/functions names in "using {} for" directive are resolved separately in visit(UsingForDirective)
 	std::vector<Declaration const*> declarations = m_resolver.pathFromCurrentScopeWithAllDeclarations(_path.path());
 	if (declarations.empty())
 	{
@@ -184,6 +185,38 @@ void ReferencesResolver::endVisit(IdentifierPath const& _path)
 	_path.annotation().pathDeclarations = std::move(declarations);
 }
 
+bool ReferencesResolver::visit(UsingForDirective const& _usingFor)
+{
+	for (ASTPointer<IdentifierPath> const& path: _usingFor.functionsOrLibrary())
+	{
+		// _includeInvisibles is enabled here because external library functions are marked invisible.
+		// As unintended side-effects other invisible names (eg.: super, this) may be returned as well.
+		// DeclarationTypeChecker should detect and report such situations.
+		vector<Declaration const*> declarations = m_resolver.pathFromCurrentScopeWithAllDeclarations(path->path(), true /* _includeInvisibles */);
+		if (declarations.empty())
+		{
+			string libraryOrFunctionNameErrorMessage =
+				_usingFor.usesBraces() ?
+				"Identifier is not a function name or not unique." :
+				"Identifier is not a library name.";
+			m_errorReporter.fatalDeclarationError(
+				9589_error,
+				path->location(),
+				libraryOrFunctionNameErrorMessage
+			);
+			break;
+		}
+
+		path->annotation().referencedDeclaration = declarations.back();
+		path->annotation().pathDeclarations = std::move(declarations);
+	}
+
+	if (_usingFor.typeName())
+		_usingFor.typeName()->accept(*this);
+
+	return false;
+}
+
 bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly)
 {
 	m_yulAnnotation = &_inlineAssembly.annotation();
diff --git a/libsolidity/analysis/ReferencesResolver.h b/libsolidity/analysis/ReferencesResolver.h
index 530100a245..512a681b45 100644
--- a/libsolidity/analysis/ReferencesResolver.h
+++ b/libsolidity/analysis/ReferencesResolver.h
@@ -84,6 +84,7 @@ class ReferencesResolver: private ASTConstVisitor, private yul::ASTWalker
 	void endVisit(IdentifierPath const& _path) override;
 	bool visit(InlineAssembly const& _inlineAssembly) override;
 	bool visit(Return const& _return) override;
+	bool visit(UsingForDirective const& _usingFor) override;
 
 	void operator()(yul::FunctionDefinition const& _function) override;
 	void operator()(yul::Identifier const& _identifier) override;
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 4e390931fc..074b644b77 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3826,7 +3826,13 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 		FunctionDefinition const& functionDefinition =
 			dynamic_cast<FunctionDefinition const&>(*path->annotation().referencedDeclaration);
 
-		solAssert(functionDefinition.type());
+		FunctionType const* functionType = dynamic_cast<FunctionType const*>(
+			functionDefinition.libraryFunction() ?
+				functionDefinition.typeViaContractName() :
+				functionDefinition.type()
+			);
+
+		solAssert(functionType);
 
 		if (functionDefinition.parameters().empty())
 			m_errorReporter.fatalTypeError(
@@ -3864,21 +3870,25 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 			);
 		}
 
-		FunctionType const* functionType = dynamic_cast<FunctionType const&>(*functionDefinition.type()).withBoundFirstArgument();
-		solAssert(functionType && functionType->selfType(), "");
+		FunctionType const* functionTypeWithBoundFirstArgument = functionType->withBoundFirstArgument();
+		solAssert(functionTypeWithBoundFirstArgument && functionTypeWithBoundFirstArgument->selfType(), "");
 		BoolResult result = normalizedType->isImplicitlyConvertibleTo(
-			*TypeProvider::withLocationIfReference(DataLocation::Storage, functionType->selfType())
+			*TypeProvider::withLocationIfReference(DataLocation::Storage, functionTypeWithBoundFirstArgument->selfType())
 		);
 		if (!result)
 			m_errorReporter.typeError(
 				3100_error,
 				path->location(),
+				SecondarySourceLocation().append(
+						"Function defined here:",
+						functionDefinition.location()
+				),
 				fmt::format(
 					"The function \"{}\" cannot be attached to the type \"{}\" because the type cannot "
 					"be implicitly converted to the first argument of the function (\"{}\"){}",
 					joinHumanReadable(path->path(), "."),
 					usingForType->toString(true /* withoutDataLocation */),
-					functionType->selfType()->humanReadableName(),
+					functionTypeWithBoundFirstArgument->selfType()->humanReadableName(),
 					result.message().empty() ? "." : ": " +  result.message()
 				)
 			);
diff --git a/test/libsolidity/semanticTests/using/library_functions_inside_contract.sol b/test/libsolidity/semanticTests/using/library_functions_inside_contract.sol
new file mode 100644
index 0000000000..170bc78536
--- /dev/null
+++ b/test/libsolidity/semanticTests/using/library_functions_inside_contract.sol
@@ -0,0 +1,31 @@
+library L {
+    function externalFunction(uint a) external pure returns (uint) { return a * 1; }
+    function publicFunction(uint b) public pure returns (uint) { return b * 2; }
+    function internalFunction(uint c) internal pure returns (uint) { return c * 3; }
+}
+
+contract C {
+    using {L.externalFunction} for uint;
+    using {L.publicFunction} for uint;
+    using {L.internalFunction} for uint;
+
+    function f() public pure returns (uint) {
+        uint x = 1;
+        return x.externalFunction();
+    }
+
+    function g() public pure returns (uint) {
+        uint x = 1;
+        return x.publicFunction();
+    }
+
+    function h() public pure returns (uint) {
+        uint x = 1;
+        return x.internalFunction();
+    }
+}
+// ----
+// library: L
+// f() -> 1
+// g() -> 2
+// h() -> 3
diff --git a/test/libsolidity/syntaxTests/scoping/external_library_function_inside_scope.sol b/test/libsolidity/syntaxTests/scoping/external_library_function_inside_scope.sol
new file mode 100644
index 0000000000..647e5b416e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/scoping/external_library_function_inside_scope.sol
@@ -0,0 +1,9 @@
+library L {
+    function externalFunction(uint) external pure {}
+    function f() public pure {
+        uint x;
+        externalFunction(x);
+    }
+}
+// ----
+// DeclarationError 7576: (120-136): Undeclared identifier. "externalFunction" is not (or not yet) visible at this point.
diff --git a/test/libsolidity/syntaxTests/using/external_function_qualified_with_this.sol b/test/libsolidity/syntaxTests/using/external_function_qualified_with_this.sol
new file mode 100644
index 0000000000..2f4007605b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/external_function_qualified_with_this.sol
@@ -0,0 +1,7 @@
+contract C {
+    using {this.contractFunction} for uint;
+
+    function contractFunction(uint) external view {}
+}
+// ----
+// DeclarationError 9589: (24-45): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol b/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
index 7536dff07f..7404b0d9be 100644
--- a/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
+++ b/test/libsolidity/syntaxTests/using/free_functions_non_unique_err.sol
@@ -9,4 +9,4 @@ contract C {
     using {id} for uint256;
 }
 // ----
-// DeclarationError 7920: (145-147): Identifier not found or not unique.
+// DeclarationError 9589: (145-147): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_overloads.sol b/test/libsolidity/syntaxTests/using/free_overloads.sol
index 28a8e69ed1..e05580d5fb 100644
--- a/test/libsolidity/syntaxTests/using/free_overloads.sol
+++ b/test/libsolidity/syntaxTests/using/free_overloads.sol
@@ -7,4 +7,4 @@ function f(int8 storage x) pure returns (int) {
 using {f} for uint8;
 using {f} for int;
 // ----
-// DeclarationError 7920: (132-133): Identifier not found or not unique.
+// DeclarationError 9589: (132-133): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/free_overloads_array.sol b/test/libsolidity/syntaxTests/using/free_overloads_array.sol
index 91b8073971..cab3eccf24 100644
--- a/test/libsolidity/syntaxTests/using/free_overloads_array.sol
+++ b/test/libsolidity/syntaxTests/using/free_overloads_array.sol
@@ -6,4 +6,4 @@ function f(uint x, uint y) pure returns (int) {
 }
 using {f} for uint;
 // ----
-// DeclarationError 7920: (138-139): Identifier not found or not unique.
+// DeclarationError 9589: (138-139): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/function_from_base_contract_qualified_with_super.sol b/test/libsolidity/syntaxTests/using/function_from_base_contract_qualified_with_super.sol
new file mode 100644
index 0000000000..a162912cad
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/function_from_base_contract_qualified_with_super.sol
@@ -0,0 +1,9 @@
+contract C {
+    function baseFunction(uint) public pure {}
+}
+
+contract D is C {
+    using {super.baseFunction} for uint;
+}
+// ----
+// DeclarationError 9589: (92-110): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/function_name_without_braces_at_file_level_err.sol b/test/libsolidity/syntaxTests/using/function_name_without_braces_at_file_level_err.sol
new file mode 100644
index 0000000000..85d591fd47
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/function_name_without_braces_at_file_level_err.sol
@@ -0,0 +1,11 @@
+function f(uint x) pure { }
+
+using f for uint;
+
+contract C {
+    function g(uint x) public pure {
+        x.f();
+    }
+}
+// ----
+// TypeError 4357: (35-36): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/function_name_without_braces_inside_contract_err.sol b/test/libsolidity/syntaxTests/using/function_name_without_braces_inside_contract_err.sol
new file mode 100644
index 0000000000..0031373817
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/function_name_without_braces_inside_contract_err.sol
@@ -0,0 +1,10 @@
+function f(uint x) pure { }
+
+contract C {
+    using f for uint;
+    function g(uint x) public pure {
+        x.f();
+    }
+}
+// ----
+// TypeError 4357: (52-53): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/interface_function_at_file_level.sol b/test/libsolidity/syntaxTests/using/interface_function_at_file_level.sol
new file mode 100644
index 0000000000..9a9ee26f61
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/interface_function_at_file_level.sol
@@ -0,0 +1,7 @@
+interface I {
+    function g() external pure;
+}
+
+using {I.g} for uint;
+// ----
+// TypeError 4167: (56-59): Only file-level functions and library functions can be attached to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/using/interface_function_inside_contract.sol b/test/libsolidity/syntaxTests/using/interface_function_inside_contract.sol
new file mode 100644
index 0000000000..f01788ff51
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/interface_function_inside_contract.sol
@@ -0,0 +1,9 @@
+interface I {
+    function g() external pure;
+}
+
+contract C {
+    using {I.g} for uint;
+}
+// ----
+// TypeError 4167: (73-76): Only file-level functions and library functions can be attached to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/using/library_at_file_level.sol b/test/libsolidity/syntaxTests/using/library_at_file_level.sol
new file mode 100644
index 0000000000..9cb1965a08
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/library_at_file_level.sol
@@ -0,0 +1,17 @@
+library L {
+    function externalFunction(uint) external pure {}
+    function publicFunction(uint) public pure {}
+    function internalFunction(uint) internal pure {}
+}
+
+using L for uint;
+
+contract C {
+    function f() public pure {
+        uint x;
+        x.externalFunction();
+        x.publicFunction();
+        x.internalFunction();
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/using/library_functions_at_file_level.sol b/test/libsolidity/syntaxTests/using/library_functions_at_file_level.sol
new file mode 100644
index 0000000000..2876f591a0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/library_functions_at_file_level.sol
@@ -0,0 +1,19 @@
+library L {
+    function externalFunction(uint) external pure {}
+    function publicFunction(uint) public pure {}
+    function internalFunction(uint) internal pure {}
+}
+
+using {L.externalFunction} for uint;
+using {L.publicFunction} for uint;
+using {L.internalFunction} for uint;
+
+contract C {
+    function f() public pure {
+        uint x;
+        x.externalFunction();
+        x.publicFunction();
+        x.internalFunction();
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/using/library_functions_attached_at_file_level_used_inside_library.sol b/test/libsolidity/syntaxTests/using/library_functions_attached_at_file_level_used_inside_library.sol
new file mode 100644
index 0000000000..21d30f5572
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/library_functions_attached_at_file_level_used_inside_library.sol
@@ -0,0 +1,17 @@
+using {L.externalFunction, L.publicFunction, L.internalFunction} for uint;
+
+library L {
+    function externalFunction(uint) external pure {}
+    function publicFunction(uint) public pure {}
+    function internalFunction(uint) internal pure {}
+
+    function f() public pure {
+        uint x;
+        x.externalFunction();
+        x.publicFunction();
+        x.internalFunction();
+    }
+}
+// ----
+// TypeError 6700: (299-319): Libraries cannot call their own functions externally.
+// TypeError 6700: (329-347): Libraries cannot call their own functions externally.
diff --git a/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_at_file_level.sol b/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_at_file_level.sol
new file mode 100644
index 0000000000..bb191faa64
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_at_file_level.sol
@@ -0,0 +1,17 @@
+library L {
+    function externalFunction(uint) external pure {}
+    function publicFunction(uint) public pure {}
+    function internalFunction(uint) internal pure {}
+}
+
+using {L.externalFunction, L.publicFunction, L.internalFunction} for uint;
+
+contract C {
+    function f() public pure {
+        uint x;
+        x.externalFunction();
+        x.publicFunction();
+        x.internalFunction();
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_inside_contract.sol b/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_inside_contract.sol
new file mode 100644
index 0000000000..300a3480d3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/library_functions_attached_in_single_directive_inside_contract.sol
@@ -0,0 +1,17 @@
+library L {
+    function externalFunction(uint) external pure {}
+    function publicFunction(uint) public pure {}
+    function internalFunction(uint) internal pure {}
+}
+
+contract C {
+    using {L.externalFunction, L.publicFunction, L.internalFunction} for uint;
+
+    function f() public pure {
+        uint x;
+        x.externalFunction();
+        x.publicFunction();
+        x.internalFunction();
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/using/library_functions_inside_contract.sol b/test/libsolidity/syntaxTests/using/library_functions_inside_contract.sol
new file mode 100644
index 0000000000..46d4c571d6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/library_functions_inside_contract.sol
@@ -0,0 +1,19 @@
+library L {
+    function externalFunction(uint) external pure {}
+    function publicFunction(uint) public pure {}
+    function internalFunction(uint) internal pure {}
+}
+
+contract C {
+    using {L.externalFunction} for uint;
+    using {L.publicFunction} for uint;
+    using {L.internalFunction} for uint;
+
+    function f() public pure {
+        uint x;
+        x.externalFunction();
+        x.publicFunction();
+        x.internalFunction();
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/using/library_inside_contract.sol b/test/libsolidity/syntaxTests/using/library_inside_contract.sol
new file mode 100644
index 0000000000..cd7f8fd193
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/library_inside_contract.sol
@@ -0,0 +1,17 @@
+library L {
+    function externalFunction(uint) external pure {}
+    function publicFunction(uint) public pure {}
+    function internalFunction(uint) internal pure {}
+}
+
+contract C {
+    using L for uint;
+
+    function f() public pure {
+        uint x;
+        x.externalFunction();
+        x.publicFunction();
+        x.internalFunction();
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol b/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
index 76d53cf90c..0a51043db2 100644
--- a/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
+++ b/test/libsolidity/syntaxTests/using/library_non_free_external_function_err.sol
@@ -11,4 +11,4 @@ contract C {
     }
 }
 // ----
-// DeclarationError 7920: (115-123): Identifier not found or not unique.
+// TypeError 4357: (115-123): Library name expected. If you want to attach a function, use '{...}'.
diff --git a/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol b/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
index ef1688b229..2526d216f2 100644
--- a/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
+++ b/test/libsolidity/syntaxTests/using/module_identifier_not_found.sol
@@ -10,4 +10,4 @@ contract C {
     using { id } for uint;
 }
 // ----
-// DeclarationError 7920: (B:43-45): Identifier not found or not unique.
+// DeclarationError 9589: (B:43-45): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/public_state_variable_getter.sol b/test/libsolidity/syntaxTests/using/public_state_variable_getter.sol
new file mode 100644
index 0000000000..9223a92a5d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/public_state_variable_getter.sol
@@ -0,0 +1,11 @@
+contract A {
+    uint public data;
+}
+
+contract C {
+    A a = new A();
+
+    using {a.data} for uint;
+}
+// ----
+// DeclarationError 9589: (82-88): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/using/undeclared_library.sol b/test/libsolidity/syntaxTests/using/undeclared_library.sol
new file mode 100644
index 0000000000..c2174cc6c1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/undeclared_library.sol
@@ -0,0 +1,3 @@
+using L for uint;
+// ----
+// DeclarationError 9589: (6-7): Identifier is not a library name.
diff --git a/test/libsolidity/syntaxTests/using/unqualified_library_functions_attached_in_single_directive_inside_library.sol b/test/libsolidity/syntaxTests/using/unqualified_library_functions_attached_in_single_directive_inside_library.sol
new file mode 100644
index 0000000000..7403dcf282
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/unqualified_library_functions_attached_in_single_directive_inside_library.sol
@@ -0,0 +1,19 @@
+library L {
+    function externalFunction(uint) external pure {}
+    function publicFunction(uint) public pure {}
+    function internalFunction(uint) internal pure {}
+    function privateFunction(uint) private pure {}
+
+    using {externalFunction, publicFunction, internalFunction, privateFunction} for uint;
+
+    function f() public pure {
+        uint x;
+        x.externalFunction();
+        x.publicFunction();
+        x.internalFunction();
+        x.privateFunction();
+    }
+}
+// ----
+// TypeError 6700: (365-385): Libraries cannot call their own functions externally.
+// TypeError 6700: (395-413): Libraries cannot call their own functions externally.

From 6f285ad19758b0f8bfb20183c1b8d6b48fdd4a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Janiszewski?=
 <janisozaur@users.noreply.github.com>
Date: Sun, 4 Dec 2022 23:20:48 +0100
Subject: [PATCH 1157/1748] Update debian/compat to version 13

Compat version 13 is currently the recommended one.

An important change introduced in 10 was change of default to target parallel builds

https://github.com/Debian/debhelper/blob/5d1bb29841043d8e47ebbdd043e6cd086cad508e/debhelper.pod#compatibility-levels
---
 scripts/deps-ppa/static_z3.sh | 6 +++---
 scripts/release_ppa.sh        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index fa237ba08f..35fff526f9 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -73,16 +73,16 @@ cp "/tmp/${packagename}_${debversion}.orig.tar.gz" ../
 # Create debian package information
 
 mkdir debian
-echo 9 > debian/compat
+echo 13 > debian/compat
 # TODO: the Z3 packages have different build dependencies
 cat <<EOF > debian/control
 Source: z3-static
 Section: science
 Priority: extra
 Maintainer: Daniel Kirchner <daniel@ekpyron.org>
-Build-Depends: debhelper (>= 9.0.0),
+Build-Depends: debhelper (>= 13.0.0),
                cmake,
-               g++ (>= 5.0),
+               g++ (>= 9.0),
                git,
                libgmp-dev,
                dh-python,
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 2acd62cd36..cf3e4b3356 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -156,15 +156,15 @@ cp "/tmp/${packagename}_${debversion}.orig.tar.gz" ../
 # Create debian package information
 
 mkdir debian
-echo 9 > debian/compat
+echo 13 > debian/compat
 cat <<EOF > debian/control
 Source: solc
 Section: science
 Priority: extra
 Maintainer: Christian (Buildserver key) <builds@ethereum.org>
-Build-Depends: ${SMTDEPENDENCY}debhelper (>= 9.0.0),
+Build-Depends: ${SMTDEPENDENCY}debhelper (>= 13.0.0),
                cmake,
-               g++ (>= 5.0),
+               g++ (>= 9.0),
                git,
                libgmp-dev,
                libboost-all-dev,

From 43431eb427c6086701353aeda94b8ae9b401b1e9 Mon Sep 17 00:00:00 2001
From: Jacob Heider <jacob@tea.xyz>
Date: Fri, 3 Feb 2023 21:37:50 -0500
Subject: [PATCH 1158/1748] Fixes compilation errors with some clangs

resolves https://github.com/ethereum/solidity/issues/13854
---
 libsolidity/lsp/DocumentHoverHandler.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/lsp/DocumentHoverHandler.cpp b/libsolidity/lsp/DocumentHoverHandler.cpp
index 628b62fa1f..7700022289 100644
--- a/libsolidity/lsp/DocumentHoverHandler.cpp
+++ b/libsolidity/lsp/DocumentHoverHandler.cpp
@@ -63,7 +63,7 @@ void DocumentHoverHandler::operator()(MessageID _id, Json::Value const& _args)
 	auto const [sourceUnitName, lineColumn] = HandlerBase(*this).extractSourceUnitNameAndLineColumn(_args);
 	auto const [sourceNode, sourceOffset] = m_server.astNodeAndOffsetAtSourceLocation(sourceUnitName, lineColumn);
 
-	MarkdownBuilder markdown{};
+	MarkdownBuilder markdown;
 	auto rangeToHighlight = toRange(sourceNode->location());
 
 	// Try getting the type definition of the underlying AST node, if available.

From 8f1668ffb8ca21fa8bc95674bc366a6069a586d8 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Wed, 1 Feb 2023 20:00:20 +0100
Subject: [PATCH 1159/1748] libsolutil: Add missing include

This helps suppressing the following message during compilation:

```
/builddir/build/BUILD/solidity-0.8.18/libsolutil/Common.h:55:27: error: 'uint8_t' was not declared in this scope
   55 | using bytes = std::vector<uint8_t>;
      |                           ^~~~~~~
/builddir/build/BUILD/solidity-0.8.18/libsolutil/Common.h:49:1: note: 'uint8_t' is defined in header '<cstdint>'; did you forget to '#include <cstdint>'?
   48 | #include <functional>
  +++ |+#include <cstdint>
   49 | #include <string>
```

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
 libsolutil/Common.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/libsolutil/Common.h b/libsolutil/Common.h
index eea9dacd54..c908c13ae2 100644
--- a/libsolutil/Common.h
+++ b/libsolutil/Common.h
@@ -42,11 +42,12 @@
 
 #include <boost/version.hpp>
 
+#include <cstdint>
+#include <functional>
 #include <map>
+#include <string>
 #include <utility>
 #include <vector>
-#include <functional>
-#include <string>
 
 namespace solidity
 {

From 6a6bf303b5ef7a000e56d4b0e87d882e7287e1ea Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Wed, 1 Feb 2023 20:00:20 +0100
Subject: [PATCH 1160/1748] libsolutil: Add missing include

This one is more obscure. It helps suppressing the following error while
compiling:

```
/builddir/build/BUILD/solidity-0.8.18/liblangutil/EVMVersion.h:33:6: error: elaborated-type-specifier for a scoped enum must not use the 'class' keyword [-Werror]
   33 | enum class Instruction: uint8_t;
      | ~~~~ ^~~~~
      |      -----
/builddir/build/BUILD/solidity-0.8.18/liblangutil/EVMVersion.h:33:23: error: found ':' in nested-name-specifier, expected '::'
   33 | enum class Instruction: uint8_t;
      |                       ^
      |                       ::
/builddir/build/BUILD/solidity-0.8.18/liblangutil/EVMVersion.h:33:12: error: 'Instruction' has not been declared
   33 | enum class Instruction: uint8_t;
      |            ^~~~~~~~~~~
/builddir/build/BUILD/solidity-0.8.18/liblangutil/EVMVersion.h:101:24: error: 'solidity::evmasm::Instruction' has not been declared
  101 |         bool hasOpcode(evmasm::Instruction _opcode) const;
      |                        ^~~~~~
/builddir/build/BUILD/solidity-0.8.18/liblangutil/EVMVersion.cpp:29:6: error: no declaration matches 'bool solidity::langutil::EVMVersion::hasOpcode(solidity::evmasm::Instruction) const'
   29 | bool EVMVersion::hasOpcode(Instruction _opcode) const
      |      ^~~~~~~~~~
/builddir/build/BUILD/solidity-0.8.18/liblangutil/EVMVersion.h:101:14: note: candidate is: 'bool solidity::langutil::EVMVersion::hasOpcode(int) const'
  101 |         bool hasOpcode(evmasm::Instruction _opcode) const;
      |              ^~~~~~~~~
/builddir/build/BUILD/solidity-0.8.18/liblangutil/EVMVersion.h:43:7: note: 'class solidity::langutil::EVMVersion' defined here
   43 | class EVMVersion:
      |       ^~~~~~~~~~
cc1plus: all warnings being treated as errors
```

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
 liblangutil/EVMVersion.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index aa23ea6eef..22f85c8af6 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -21,6 +21,7 @@
 
 #pragma once
 
+#include <cstdint>
 #include <optional>
 #include <string>
 

From b3f35f703aa5d2f55cff36b9a6f16c0ac7d44849 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sat, 4 Feb 2023 16:16:54 +0100
Subject: [PATCH 1161/1748] libsolidity: Redundant std::move

This patch suppresses warnings like this one:

```
/builddir/build/BUILD/solidity-0.8.18/libsolidity/ast/AST.h: In constructor 'solidity::frontend::FunctionDefinition::FunctionDefinition(int64_t, const solidity::frontend::ASTNode::SourceLocation&, solidity::frontend::ASTPointer<std::__cxx11::basic_string<char> >&, const solidity::frontend::ASTNode::SourceLocation&, solidity::frontend::Visibility, solidity::frontend::StateMutability, bool, solidity::langutil::Token, bool, solidity::frontend::ASTPointer<solidity::frontend::OverrideSpecifier>&, solidity::frontend::ASTPointer<solidity::frontend::StructuredDocumentation>&, solidity::frontend::ASTPointer<solidity::frontend::ParameterList>&, std::vector<std::shared_ptr<solidity::frontend::ModifierInvocation> >, solidity::frontend::ASTPointer<solidity::frontend::ParameterList>&, solidity::frontend::ASTPointer<solidity::frontend::Block>&)':
/builddir/build/BUILD/solidity-0.8.18/libsolidity/ast/AST.h:926:69: error: redundant move in initialization [-Werror=redundant-move]
  926 |                 CallableDeclaration(_id, _location, _name, std::move(_nameLocation), _visibility, _parameters, _isVirtual, _overrides, _returnParameters),
      |                                                            ~~~~~~~~~^~~~~~~~~~~~~~~
/builddir/build/BUILD/solidity-0.8.18/libsolidity/ast/AST.h:926:69: note: remove 'std::move' call
```

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
 libsolidity/ast/AST.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 06575beece..f0f43945bf 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -923,7 +923,7 @@ class FunctionDefinition: public CallableDeclaration, public StructurallyDocumen
 		ASTPointer<ParameterList> const& _returnParameters,
 		ASTPointer<Block> const& _body
 	):
-		CallableDeclaration(_id, _location, _name, std::move(_nameLocation), _visibility, _parameters, _isVirtual, _overrides, _returnParameters),
+		CallableDeclaration(_id, _location, _name, _nameLocation, _visibility, _parameters, _isVirtual, _overrides, _returnParameters),
 		StructurallyDocumented(_documentation),
 		ImplementationOptional(_body != nullptr),
 		m_stateMutability(_stateMutability),

From 821da895ea81167ded6d7f879b8793f9a3ba251e Mon Sep 17 00:00:00 2001
From: Evan Saulpaugh <evan.saulpaugh@gmail.com>
Date: Sun, 5 Feb 2023 16:13:23 -0600
Subject: [PATCH 1162/1748] specify "receive" as having no "name"

---
 docs/abi-spec.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 35123a30a2..44988c8dc1 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -563,7 +563,7 @@ A function description is a JSON object with the fields:
   blockchain state <pure-functions>`), ``view`` (:ref:`specified to not modify the blockchain
   state <view-functions>`), ``nonpayable`` (function does not accept Ether - the default) and ``payable`` (function accepts Ether).
 
-Constructor and fallback function never have ``name`` or ``outputs``. Fallback function doesn't have ``inputs`` either.
+Constructor, receive, and fallback never have ``name`` or ``outputs``. Receive and fallback don't have ``inputs`` either.
 
 .. note::
     Sending non-zero Ether to non-payable function will revert the transaction.

From 8d91ccf0284b4baa00f4438ad099f9f44a5ff8f1 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 12 Oct 2021 11:12:18 +0200
Subject: [PATCH 1163/1748] [SMTChecker] Add a new trusted mode which assumes
 that code that is available at compile time is trusted.

---
 Changelog.md                                  |   1 +
 docs/smtchecker.rst                           | 182 +++++++
 docs/using-the-compiler.rst                   |   4 +
 libsolidity/formal/BMC.cpp                    |   6 +-
 libsolidity/formal/CHC.cpp                    | 486 ++++++++++++++----
 libsolidity/formal/CHC.h                      |  23 +
 libsolidity/formal/ModelCheckerSettings.cpp   |   9 +
 libsolidity/formal/ModelCheckerSettings.h     |  17 +
 libsolidity/formal/Predicate.cpp              |  10 +
 libsolidity/formal/Predicate.h                |   4 +
 libsolidity/formal/PredicateInstance.cpp      |  11 +-
 libsolidity/formal/PredicateInstance.h        |  12 +-
 libsolidity/formal/SMTEncoder.cpp             |  47 +-
 libsolidity/formal/SMTEncoder.h               |  15 +-
 libsolidity/formal/SymbolicState.cpp          | 200 ++++++-
 libsolidity/formal/SymbolicState.h            |  57 +-
 libsolidity/formal/SymbolicTypes.cpp          |  22 +
 libsolidity/formal/SymbolicTypes.h            |   4 +
 libsolidity/interface/StandardCompiler.cpp    |  12 +-
 solc/CommandLineParser.cpp                    |  17 +
 .../err                                       |  26 +
 .../model_checker_contracts_only_one/err      |   2 +-
 .../model_checker_ext_calls_empty_arg/args    |   1 +
 .../model_checker_ext_calls_empty_arg/err     |   1 +
 .../model_checker_ext_calls_empty_arg/exit    |   1 +
 .../input.sol                                 |  15 +
 .../model_checker_ext_calls_trusted_chc/args  |   1 +
 .../model_checker_ext_calls_trusted_chc/err   |   5 +
 .../input.sol                                 |  15 +
 .../args                                      |   1 +
 .../model_checker_ext_calls_untrusted_chc/err |  14 +
 .../input.sol                                 |  13 +
 .../model_checker_ext_calls_wrong_arg/args    |   1 +
 .../model_checker_ext_calls_wrong_arg/err     |   1 +
 .../model_checker_ext_calls_wrong_arg/exit    |   1 +
 .../input.sol                                 |  15 +
 .../output.json                               |  68 +++
 .../output.json                               |   4 +-
 .../output.json                               |   4 +-
 .../input.json                                |  30 ++
 .../output.json                               |  12 +
 .../input.json                                |  30 ++
 .../output.json                               |  32 ++
 .../input.json                                |  28 +
 .../output.json                               |  50 ++
 .../input.json                                |  30 ++
 .../output.json                               |  12 +
 .../input.json                                |  30 ++
 .../output.json                               |  12 +
 .../output.json                               |  62 +--
 test/libsolidity/SMTCheckerTest.cpp           |  15 +-
 .../length_1d_struct_array_2d_1.sol           |   2 +-
 .../length_same_after_assignment_3_fail.sol   |   2 +-
 .../array_members/push_as_lhs_1d.sol          |   1 +
 .../array_members/push_as_lhs_2d.sol          |   1 +
 .../complex/slither/external_function.sol     |   4 +-
 .../deployment/deploy_bmc_trusted.sol         |  18 +
 .../deployment/deploy_bmc_untrusted.sol       |  17 +
 .../deployment/deploy_trusted.sol             |  16 +
 .../deployment/deploy_trusted_addresses.sol   |  19 +
 .../deployment/deploy_trusted_flow.sol        |  32 ++
 ...eploy_trusted_keep_storage_constraints.sol |  17 +
 .../deployment/deploy_trusted_state_flow.sol  |  24 +
 .../deploy_trusted_state_flow_2.sol           |  20 +
 .../deploy_trusted_state_flow_3.sol           |  21 +
 .../deploy_trusted_state_flow_4.sol           |  20 +
 .../deployment/deploy_untrusted.sol           |  17 +
 .../deployment/deploy_untrusted_addresses.sol |  22 +
 ...oy_untrusted_erase_storage_constraints.sol |  17 +
 .../deployment_trusted_with_value_1.sol       |  20 +
 .../call_abstract_constructor_trusted_1.sol   |  28 +
 .../call_abstract_constructor_trusted_2.sol   |  25 +
 .../call_abstract_trusted_1.sol               |  28 +
 .../call_abstract_trusted_2.sol               |  25 +
 .../call_abstract_trusted_3.sol               |  29 ++
 .../external_calls/call_reentrancy_view.sol   |   2 +-
 ...ternal_call_from_constructor_1_trusted.sol |  21 +
 ...ternal_call_from_constructor_2_trusted.sol |  17 +
 ...ternal_call_from_constructor_3_trusted.sol |  25 +
 .../external_call_indirect_1.sol              |  41 ++
 .../external_call_indirect_2.sol              |  52 ++
 .../external_call_indirect_3.sol              |  45 ++
 .../external_call_indirect_4.sol              |  48 ++
 .../external_call_indirect_5.sol              |  50 ++
 .../external_call_semantic_this_1.sol         |  17 +
 .../external_call_semantic_this_2.sol         |  16 +
 .../external_call_semantic_this_3.sol         |  17 +
 ..._address_inside_array_struct_trusted_1.sol |  23 +
 ..._address_inside_array_struct_trusted_2.sol |  24 +
 ...ate_var_address_inside_array_trusted_1.sol |  21 +
 ...ate_var_address_inside_array_trusted_2.sol |  20 +
 ...te_var_address_inside_struct_trusted_1.sol |  24 +
 ...te_var_address_inside_struct_trusted_2.sol |  23 +
 ...te_var_address_inside_struct_trusted_3.sol |  26 +
 ...te_var_address_inside_struct_trusted_4.sol |  27 +
 ...contract_inside_array_struct_trusted_1.sol |  23 +
 ...contract_inside_array_struct_trusted_2.sol |  24 +
 ...te_var_contract_inside_array_trusted_1.sol |  21 +
 ...te_var_contract_inside_array_trusted_2.sol |  21 +
 ...e_var_contract_inside_struct_trusted_1.sol |  24 +
 ...e_var_contract_inside_struct_trusted_2.sol |  24 +
 ...e_var_contract_inside_struct_trusted_3.sol |  27 +
 ...e_var_contract_inside_struct_trusted_4.sol |  27 +
 .../external_call_this_with_value_1.sol       |   2 +-
 .../external_call_this_with_value_2.sol       |   6 +-
 .../external_hash_known_code_pure_trusted.sol |  33 ++
 ..._known_code_state_reentrancy_2_trusted.sol |  47 ++
 ...code_state_reentrancy_indirect_trusted.sol |  56 ++
 ...sh_known_code_state_reentrancy_trusted.sol |  38 ++
 ...n_code_state_reentrancy_unsafe_trusted.sol |  44 ++
 ...external_hash_known_code_state_trusted.sol |  36 ++
 ...l_hash_known_code_state_unsafe_trusted.sol |  40 ++
 .../external_calls/external_reentrancy_2.sol  |   2 +-
 .../external_calls/external_safe.sol          |   2 +
 .../token_trusted_transfer_correct.sol        |  64 +++
 .../token_trusted_transfer_wrong.sol          |  68 +++
 .../file_level/new_operator.sol               |   2 +-
 .../functions/functions_external_2.sol        |   2 +-
 .../functions/getters/external_getter_1.sol   |  22 +
 .../functions/getters/external_getter_2.sol   |  33 ++
 .../getters/external_getter_this_1.sol        |  18 +
 .../getters/external_getter_this_2.sol        |  19 +
 ...virtual_function_called_by_constructor.sol |   2 +-
 .../smtCheckerTests/imports/ExtCall.sol       |   2 +-
 .../imports/import_as_module_2.sol            |   1 +
 .../operators/compound_mul_mapping.sol        |   3 +-
 .../operators/conditional_assignment_6.sol    |   2 +-
 .../special/tx_vars_reentrancy_1.sol          |   1 +
 .../smtCheckerTests/try_catch/try_new.sol     |   4 +-
 .../typecast/bytes_to_fixed_bytes_1.sol       |   3 +
 .../typecast/string_to_bytes_push_1.sol       |   2 +-
 .../smtCheckerTests/types/bool_simple_2.sol   |   1 +
 .../user_type_as_struct_member_1.sol          |   1 -
 test/solc/CommandLineParser.cpp               |   2 +
 test/tools/fuzzer_common.cpp                  |   1 +
 135 files changed, 3153 insertions(+), 232 deletions(-)
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_empty_arg/args
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_empty_arg/err
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_empty_arg/exit
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_empty_arg/input.sol
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_trusted_chc/args
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_trusted_chc/err
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_trusted_chc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_untrusted_chc/args
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_untrusted_chc/err
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_untrusted_chc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_wrong_arg/args
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_wrong_arg/err
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_wrong_arg/exit
 create mode 100644 test/cmdlineTests/model_checker_ext_calls_wrong_arg/input.sol
 create mode 100644 test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/output.json
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_bmc_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_bmc_untrusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_untrusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_addresses.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_erase_storage_constraints.sol
 create mode 100644 test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe_trusted.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol
 create mode 100644 test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol

diff --git a/Changelog.md b/Changelog.md
index 7619fbd40d..5ce4057a48 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * SMTChecker: New trusted mode that assumes that any compile-time available code is the actual used code even in external calls. This can be used via the CLI option ``--model-checker-ext-calls trusted`` or the JSON field ``settings.modelChecker.extCalls: "trusted"``.
 
 
 Bugfixes:
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index c16a3e5d71..276f9c33a0 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -518,6 +518,188 @@ which has the following form:
         "source2.sol": ["contract2", "contract3"]
     }
 
+Trusted External Calls
+======================
+
+By default, the SMTChecker does not assume that compile-time available code
+is the same as the runtime code for external calls. Take the following contracts
+as an example:
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity >=0.8.0;
+
+    contract Ext {
+        uint public x;
+        function setX(uint _x) public { x = _x; }
+    }
+    contract MyContract {
+        function callExt(Ext _e) public {
+            _e.setX(42);
+            assert(_e.x() == 42);
+        }
+    }
+
+When ``MyContract.callExt`` is called, an address is given as the argument.
+At deployment time, we cannot know for sure that address ``_e`` actually
+contains a deployment of contract ``Ext``.
+Therefore, the SMTChecker will warn that the assertion above can be violated,
+which is true, if ``_e`` contains another contract than ``Ext``.
+
+However, it can be useful to treat these external calls as trusted, for example,
+to test that different implementations of an interface conform to the same property.
+This means assuming that address ``_e`` indeed was deployed as contract ``Ext``.
+This mode can be enabled via the CLI option ``--model-checker-ext-calls=trusted``
+or the JSON field ``settings.modelChecker.extCalls: "trusted"``.
+
+Please be aware that enabling this mode can make the SMTChecker analysis much more
+computationally costly.
+
+An important part of this mode is that it is applied to contract types and high
+level external calls to contracts, and not low level calls such as ``call`` and
+``delegatecall``. The storage of an address is stored per contract type, and
+the SMTChecker assumes that an externally called contract has the type of the
+caller expression.  Therefore, casting an ``address`` or a contract to
+different contract types will yield different storage values and can give
+unsound results if the assumptions are inconsistent, such as the example below:
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity >=0.8.0;
+
+    contract D {
+        constructor(uint _x) { x = _x; }
+        uint public x;
+        function setX(uint _x) public { x = _x; }
+    }
+
+    contract E {
+        constructor() { x = 2; }
+        uint public x;
+        function setX(uint _x) public { x = _x; }
+    }
+
+    contract C {
+        function f() public {
+            address d = address(new D(42));
+
+            // `d` was deployed as `D`, so its `x` should be 42 now.
+            assert(D(d).x() == 42); // should hold
+            assert(D(d).x() == 43); // should fail
+
+            // E and D have the same interface, so the following
+            // call would also work at runtime.
+            // However, the change to `E(d)` is not reflected in `D(d)`.
+            E(d).setX(1024);
+
+            // Reading from `D(d)` now will show old values.
+            // The assertion below should fail at runtime,
+            // but succeeds in this mode's analysis (unsound).
+            assert(D(d).x() == 42);
+            // The assertion below should succeed at runtime,
+            // but fails in this mode's analysis (false positive).
+            assert(D(d).x() == 1024);
+        }
+    }
+
+Due to the above, make sure that the trusted external calls to a certain
+variable of ``address`` or ``contract`` type always have the same caller
+expression type.
+
+It is also helpful to cast the called contract's variable as the type of the
+most derived type in case of inheritance.
+
+   .. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity >=0.8.0;
+
+    interface Token {
+        function balanceOf(address _a) external view returns (uint);
+        function transfer(address _to, uint _amt) external;
+    }
+
+    contract TokenCorrect is Token {
+        mapping (address => uint) balance;
+        constructor(address _a, uint _b) {
+            balance[_a] = _b;
+        }
+        function balanceOf(address _a) public view override returns (uint) {
+            return balance[_a];
+        }
+        function transfer(address _to, uint _amt) public override {
+            require(balance[msg.sender] >= _amt);
+            balance[msg.sender] -= _amt;
+            balance[_to] += _amt;
+        }
+    }
+
+    contract Test {
+        function property_transfer(address _token, address _to, uint _amt) public {
+            require(_to != address(this));
+
+            TokenCorrect t = TokenCorrect(_token);
+
+            uint xPre = t.balanceOf(address(this));
+            require(xPre >= _amt);
+            uint yPre = t.balanceOf(_to);
+
+            t.transfer(_to, _amt);
+            uint xPost = t.balanceOf(address(this));
+            uint yPost = t.balanceOf(_to);
+
+            assert(xPost == xPre - _amt);
+            assert(yPost == yPre + _amt);
+        }
+    }
+
+Note that in function ``property_transfer``, the external calls are
+performed on variable ``t``
+
+Another caveat of this mode are calls to state variables of contract type
+outside the analyzed contract. In the code below, even though ``B`` deploys
+``A``, it is also possible for the address stored in ``B.a`` to be called by
+anyone outside of ``B`` in between transactions to ``B`` itself. To reflect the
+possible changes to ``B.a``, the encoding allows an unbounded number of calls
+to be made to ``B.a`` externally. The encoding will keep track of ``B.a``'s
+storage, therefore assertion (2) should hold. However, currently the encoding
+allows such calls to be made from ``B`` conceptually, therefore assertion (3)
+fails.  Making the encoding stronger logically is an extension of the trusted
+mode and is under development. Note that the encoding does not keep track of
+storage for ``address`` variables, therefore if ``B.a`` had type ``address``
+the encoding would assume that its storage does not change in between
+transactions to ``B``.
+
+   .. code-block:: solidity
+
+    pragma solidity >=0.8.0;
+
+    contract A {
+        uint public x;
+        address immutable public owner;
+        constructor() {
+            owner = msg.sender;
+        }
+        function setX(uint _x) public {
+            require(msg.sender == owner);
+            x = _x;
+        }
+    }
+
+    contract B {
+        A a;
+        constructor() {
+            a = new A();
+            assert(a.x() == 0); // (1) should hold
+        }
+        function g() public view {
+            assert(a.owner() == address(this)); // (2) should hold
+            assert(a.x() == 0); // (3) should hold, but fails due to a false positive
+        }
+    }
+
 Reported Inferred Inductive Invariants
 ======================================
 
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 6d6264e1aa..251a2c0536 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -433,6 +433,10 @@ Input Description
           "divModNoSlacks": false,
           // Choose which model checker engine to use: all (default), bmc, chc, none.
           "engine": "chc",
+          // Choose whether external calls should be considered trusted in case the
+          // code of the called function is available at compile-time.
+          // For details see the SMTChecker section.
+          "extCalls": "trusted",
           // Choose which types of invariants should be reported to the user: contract, reentrancy.
           "invariants": ["contract", "reentrancy"],
           // Choose whether to output all unproved targets. The default is `false`.
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index 0b4f347816..d17b5c93a9 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -82,7 +82,7 @@ void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<Verificatio
 	m_context.setAssertionAccumulation(true);
 	m_variableUsage.setFunctionInlining(shouldInlineFunctionCall);
 	createFreeConstants(sourceDependencies(_source));
-	state().prepareForSourceUnit(_source);
+	state().prepareForSourceUnit(_source, false);
 	m_unprovedAmt = 0;
 
 	_source.accept(*this);
@@ -130,7 +130,7 @@ bool BMC::shouldInlineFunctionCall(
 
 	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
 	if (funType.kind() == FunctionType::Kind::External)
-		return isTrustedExternalCall(&_funCall.expression());
+		return isExternalCallToThis(&_funCall.expression());
 	else if (funType.kind() != FunctionType::Kind::Internal)
 		return false;
 
@@ -567,7 +567,7 @@ void BMC::internalOrExternalFunctionCall(FunctionCall const& _funCall)
 	auto const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
 	if (shouldInlineFunctionCall(_funCall, currentScopeContract(), m_currentContract))
 		inlineFunctionCall(_funCall);
-	else if (isPublicGetter(_funCall.expression()))
+	else if (publicGetter(_funCall.expression()))
 	{
 		// Do nothing here.
 		// The processing happens in SMT Encoder, but we need to prevent the resetting of the state variables.
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 83602ace34..db67426259 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -104,7 +104,7 @@ void CHC::analyze(SourceUnit const& _source)
 	auto sources = sourceDependencies(_source);
 	collectFreeFunctions(sources);
 	createFreeConstants(sources);
-	state().prepareForSourceUnit(_source);
+	state().prepareForSourceUnit(_source, encodeExternalCallsAsTrusted());
 
 	for (auto const* source: sources)
 		defineInterfacesAndSummaries(*source);
@@ -175,15 +175,30 @@ void CHC::endVisit(ContractDefinition const& _contract)
 	smtutil::Expression zeroes(true);
 	for (auto var: stateVariablesIncludingInheritedAndPrivate(_contract))
 		zeroes = zeroes && currentValue(*var) == smt::zeroValue(var->type());
+
+	smtutil::Expression newAddress = encodeExternalCallsAsTrusted() ?
+		!state().addressActive(state().thisAddress()) :
+		smtutil::Expression(true);
+
 	// The contract's address might already have funds before deployment,
 	// so the balance must be at least `msg.value`, but not equals.
 	auto initialBalanceConstraint = state().balance(state().thisAddress()) >= state().txMember("msg.value");
 	addRule(smtutil::Expression::implies(
-		initialConstraints(_contract) && zeroes && initialBalanceConstraint,
+		initialConstraints(_contract) && zeroes && newAddress && initialBalanceConstraint,
 		predicate(entry)
 	), entry.functor().name);
+
 	setCurrentBlock(entry);
 
+	if (encodeExternalCallsAsTrusted())
+	{
+		auto const& entryAfterAddress = *createConstructorBlock(_contract, "implicit_constructor_entry_after_address");
+		state().setAddressActive(state().thisAddress(), true);
+
+		connectBlocks(m_currentBlock, predicate(entryAfterAddress));
+		setCurrentBlock(entryAfterAddress);
+	}
+
 	solAssert(!m_errorDest, "");
 	m_errorDest = m_constructorSummaries.at(&_contract);
 	// We need to evaluate the base constructor calls (arguments) from derived -> base
@@ -220,6 +235,9 @@ void CHC::endVisit(ContractDefinition const& _contract)
 		m_context.addAssertion(errorFlag().currentValue() == 0);
 	}
 
+	if (encodeExternalCallsAsTrusted())
+		state().writeStateVars(_contract, state().thisAddress());
+
 	connectBlocks(m_currentBlock, summary(_contract));
 
 	setCurrentBlock(*m_constructorSummaries.at(&_contract));
@@ -550,10 +568,12 @@ void CHC::endVisit(FunctionCall const& _funCall)
 		externalFunctionCall(_funCall);
 		SMTEncoder::endVisit(_funCall);
 		break;
+	case FunctionType::Kind::Creation:
+		visitDeployment(_funCall);
+		break;
 	case FunctionType::Kind::DelegateCall:
 	case FunctionType::Kind::BareCallCode:
 	case FunctionType::Kind::BareDelegateCall:
-	case FunctionType::Kind::Creation:
 		SMTEncoder::endVisit(_funCall);
 		unknownFunctionCall(_funCall);
 		break;
@@ -717,6 +737,19 @@ void CHC::visitAssert(FunctionCall const& _funCall)
 	verificationTargetEncountered(&_funCall, VerificationTargetType::Assert, errorCondition);
 }
 
+void CHC::visitPublicGetter(FunctionCall const& _funCall)
+{
+	createExpr(_funCall);
+	if (encodeExternalCallsAsTrusted())
+	{
+		auto const& access = dynamic_cast<MemberAccess const&>(_funCall.expression());
+		auto const& contractType = dynamic_cast<ContractType const&>(*access.expression().annotation().type);
+		state().writeStateVars(*m_currentContract, state().thisAddress());
+		state().readStateVars(contractType.contractDefinition(), expr(access.expression()));
+	}
+	SMTEncoder::visitPublicGetter(_funCall);
+}
+
 void CHC::visitAddMulMod(FunctionCall const& _funCall)
 {
 	solAssert(_funCall.arguments().at(2), "");
@@ -726,6 +759,66 @@ void CHC::visitAddMulMod(FunctionCall const& _funCall)
 	SMTEncoder::visitAddMulMod(_funCall);
 }
 
+void CHC::visitDeployment(FunctionCall const& _funCall)
+{
+	if (!encodeExternalCallsAsTrusted())
+	{
+		SMTEncoder::endVisit(_funCall);
+		unknownFunctionCall(_funCall);
+		return;
+	}
+
+	auto [callExpr, callOptions] = functionCallExpression(_funCall);
+	auto funType = dynamic_cast<FunctionType const*>(callExpr->annotation().type);
+	ContractDefinition const* contract =
+		&dynamic_cast<ContractType const&>(*funType->returnParameterTypes().front()).contractDefinition();
+
+	// copy state variables from m_currentContract to state.storage.
+	state().writeStateVars(*m_currentContract, state().thisAddress());
+	errorFlag().increaseIndex();
+
+	Expression const* value = valueOption(callOptions);
+	if (value)
+		decreaseBalanceFromOptionsValue(*value);
+
+	auto originalTx = state().tx();
+	newTxConstraints(value);
+
+	auto prevThisAddr = state().thisAddress();
+	auto newAddr = state().newThisAddress();
+
+	if (auto constructor = contract->constructor())
+	{
+		auto const& args = _funCall.sortedArguments();
+		auto const& params = constructor->parameters();
+		solAssert(args.size() == params.size(), "");
+		for (auto [arg, param]: ranges::zip_view(args, params))
+			m_context.addAssertion(expr(*arg) == m_context.variable(*param)->currentValue());
+	}
+	for (auto var: stateVariablesIncludingInheritedAndPrivate(*contract))
+		m_context.variable(*var)->increaseIndex();
+	Predicate const& constructorSummary = *m_constructorSummaries.at(contract);
+	m_context.addAssertion(smt::constructorCall(constructorSummary, m_context, false));
+
+	solAssert(m_errorDest, "");
+	connectBlocks(
+		m_currentBlock,
+		predicate(*m_errorDest),
+		errorFlag().currentValue() > 0
+	);
+	m_context.addAssertion(errorFlag().currentValue() == 0);
+
+	m_context.addAssertion(state().newThisAddress() == prevThisAddr);
+
+	// copy state variables from state.storage to m_currentContract.
+	state().readStateVars(*m_currentContract, state().thisAddress());
+
+	state().newTx();
+	m_context.addAssertion(originalTx == state().tx());
+
+	defineExpr(_funCall, newAddr);
+}
+
 void CHC::internalFunctionCall(FunctionCall const& _funCall)
 {
 	solAssert(m_currentContract, "");
@@ -750,6 +843,53 @@ void CHC::internalFunctionCall(FunctionCall const& _funCall)
 	m_context.addAssertion(errorFlag().currentValue() == 0);
 }
 
+void CHC::addNondetCalls(ContractDefinition const& _contract)
+{
+	for (auto var: _contract.stateVariables())
+		if (auto contractType = dynamic_cast<ContractType const*>(var->type()))
+		{
+			auto const& symbVar = m_context.variable(*var);
+			m_context.addAssertion(symbVar->currentValue() == symbVar->valueAtIndex(0));
+			nondetCall(contractType->contractDefinition(), *var);
+		}
+}
+
+void CHC::nondetCall(ContractDefinition const& _contract, VariableDeclaration const& _var)
+{
+	auto address = m_context.variable(_var)->currentValue();
+	// Load the called contract's state variables from the global state.
+	state().readStateVars(_contract, address);
+
+	m_context.addAssertion(state().state() == state().state(0));
+	auto preCallState = vector<smtutil::Expression>{state().state()} + currentStateVariables(_contract);
+
+	state().newState();
+	for (auto const* var: _contract.stateVariables())
+		m_context.variable(*var)->increaseIndex();
+
+	auto error = errorFlag().increaseIndex();
+
+	Predicate const& callPredicate = *createSymbolicBlock(
+		nondetInterfaceSort(_contract, state()),
+		"nondet_call_" + uniquePrefix(),
+		PredicateType::FunctionSummary,
+		&_var,
+		m_currentContract
+	);
+	auto postCallState = vector<smtutil::Expression>{state().state()} + currentStateVariables(_contract);
+	vector<smtutil::Expression> stateExprs{error, address, state().abi(), state().crypto()};
+
+	auto nondet = (*m_nondetInterfaces.at(&_contract))(stateExprs + preCallState + postCallState);
+	auto nondetCall = callPredicate(stateExprs + preCallState + postCallState);
+
+	addRule(smtutil::Expression::implies(nondet, nondetCall), nondetCall.name);
+
+	m_context.addAssertion(nondetCall);
+
+	// Load the called contract's state variables into the global state.
+	state().writeStateVars(_contract, address);
+}
+
 void CHC::externalFunctionCall(FunctionCall const& _funCall)
 {
 	/// In external function calls we do not add a "predicate call"
@@ -757,15 +897,10 @@ void CHC::externalFunctionCall(FunctionCall const& _funCall)
 	/// so we just add the nondet_interface predicate.
 
 	solAssert(m_currentContract, "");
-	auto [callExpr, callOptions] = functionCallExpression(_funCall);
-
-	if (isTrustedExternalCall(callExpr))
-	{
-		externalFunctionCallToTrustedCode(_funCall);
-		return;
-	}
 
+	auto [callExpr, callOptions] = functionCallExpression(_funCall);
 	FunctionType const& funType = dynamic_cast<FunctionType const&>(*callExpr->annotation().type);
+
 	auto kind = funType.kind();
 	solAssert(
 		kind == FunctionType::Kind::External ||
@@ -774,37 +909,42 @@ void CHC::externalFunctionCall(FunctionCall const& _funCall)
 		""
 	);
 
-	bool usesStaticCall = kind == FunctionType::Kind::BareStaticCall;
 
-	solAssert(m_currentContract, "");
+	// Only consider high level external calls in trusted mode.
+	if (
+		kind == FunctionType::Kind::External &&
+		(encodeExternalCallsAsTrusted() || isExternalCallToThis(callExpr))
+	)
+	{
+		externalFunctionCallToTrustedCode(_funCall);
+		return;
+	}
+
+	// Low level calls are still encoded nondeterministically.
+
 	auto function = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
 	if (function)
-	{
-		usesStaticCall |= function->stateMutability() == StateMutability::Pure ||
-			function->stateMutability() == StateMutability::View;
 		for (auto var: function->returnParameters())
 			m_context.variable(*var)->increaseIndex();
-	}
 
+	// If we see a low level call in trusted mode,
+	// we need to havoc the global state.
+	if (
+		kind == FunctionType::Kind::BareCall &&
+		encodeExternalCallsAsTrusted()
+	)
+		state().newStorage();
+
+	// No reentrancy from constructor calls.
 	if (!m_currentFunction || m_currentFunction->isConstructor())
 		return;
 
-	if (callOptions)
-	{
-		optional<unsigned> valueIndex;
-		for (auto&& [i, name]: callOptions->names() | ranges::views::enumerate)
-			if (name && *name == "value")
-			{
-				valueIndex = i;
-				break;
-			}
-		if (valueIndex)
-			state().addBalance(state().thisAddress(), 0 - expr(*callOptions->options().at(*valueIndex)));
-	}
+	if (Expression const* value = valueOption(callOptions))
+		decreaseBalanceFromOptionsValue(*value);
 
 	auto preCallState = vector<smtutil::Expression>{state().state()} + currentStateVariables();
 
-	if (!usesStaticCall)
+	if (!usesStaticCall(_funCall))
 	{
 		state().newState();
 		for (auto const* var: m_stateVariables)
@@ -843,8 +983,14 @@ void CHC::externalFunctionCall(FunctionCall const& _funCall)
 
 void CHC::externalFunctionCallToTrustedCode(FunctionCall const& _funCall)
 {
+	if (publicGetter(_funCall.expression()))
+		visitPublicGetter(_funCall);
+
 	solAssert(m_currentContract, "");
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
+
+	auto [callExpr, callOptions] = functionCallExpression(_funCall);
+	FunctionType const& funType = dynamic_cast<FunctionType const&>(*callExpr->annotation().type);
+
 	auto kind = funType.kind();
 	solAssert(kind == FunctionType::Kind::External || kind == FunctionType::Kind::BareStaticCall, "");
 
@@ -854,14 +1000,25 @@ void CHC::externalFunctionCallToTrustedCode(FunctionCall const& _funCall)
 
 	// External call creates a new transaction.
 	auto originalTx = state().tx();
-	auto txOrigin = state().txMember("tx.origin");
-	state().newTx();
-	// set the transaction sender as this contract
-	m_context.addAssertion(state().txMember("msg.sender") == state().thisAddress());
-	// set the transaction value as 0
-	m_context.addAssertion(state().txMember("msg.value") == 0);
-	// set the origin to be the current transaction origin
-	m_context.addAssertion(state().txMember("tx.origin") == txOrigin);
+	Expression const* value = valueOption(callOptions);
+	newTxConstraints(value);
+
+	auto calledAddress = contractAddressValue(_funCall);
+	if (value)
+	{
+		decreaseBalanceFromOptionsValue(*value);
+		state().addBalance(calledAddress, expr(*value));
+	}
+
+	if (encodeExternalCallsAsTrusted())
+	{
+		// The order here is important!! Write should go first.
+
+		// Load the caller contract's state variables into the global state.
+		state().writeStateVars(*m_currentContract, state().thisAddress());
+		// Load the called contract's state variables from the global state.
+		state().readStateVars(*function->annotation().contract, contractAddressValue(_funCall));
+	}
 
 	smtutil::Expression pred = predicate(_funCall);
 
@@ -878,6 +1035,17 @@ void CHC::externalFunctionCallToTrustedCode(FunctionCall const& _funCall)
 		(errorFlag().currentValue() > 0)
 	);
 	m_context.addAssertion(errorFlag().currentValue() == 0);
+
+	if (!usesStaticCall(_funCall))
+		if (encodeExternalCallsAsTrusted())
+		{
+			// The order here is important!! Write should go first.
+
+			// Load the called contract's state variables into the global state.
+			state().writeStateVars(*function->annotation().contract, contractAddressValue(_funCall));
+			// Load the caller contract's state variables from the global state.
+			state().readStateVars(*m_currentContract, state().thisAddress());
+		}
 }
 
 void CHC::unknownFunctionCall(FunctionCall const&)
@@ -1088,6 +1256,14 @@ set<unsigned> CHC::transactionVerificationTargetsIds(ASTNode const* _txRoot)
 	return verificationTargetsIds;
 }
 
+bool CHC::usesStaticCall(FunctionCall const& _funCall)
+{
+	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
+	auto kind = funType.kind();
+	auto function = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
+	return (function && (function->stateMutability() == StateMutability::Pure || function->stateMutability() == StateMutability::View)) || kind == FunctionType::Kind::BareStaticCall;
+}
+
 optional<CHC::CHCNatspecOption> CHC::natspecOptionFromString(string const& _option)
 {
 	static map<string, CHCNatspecOption> options{
@@ -1128,6 +1304,11 @@ SortPointer CHC::sort(FunctionDefinition const& _function)
 	return functionBodySort(_function, m_currentContract, state());
 }
 
+bool CHC::encodeExternalCallsAsTrusted()
+{
+	return m_settings.externalCalls.isTrusted();
+}
+
 SortPointer CHC::sort(ASTNode const* _node)
 {
 	if (auto funDef = dynamic_cast<FunctionDefinition const*>(_node))
@@ -1232,6 +1413,62 @@ void CHC::defineExternalFunctionInterface(FunctionDefinition const& _function, C
 	m_context.addAssertion(smt::symbolicUnknownConstraints(state().balance(state().thisAddress()) + k.currentValue(), TypeProvider::uint256()));
 	state().addBalance(state().thisAddress(), k.currentValue());
 
+	if (encodeExternalCallsAsTrusted())
+	{
+		// If the contract has state variables that are addresses to other contracts,
+		// we need to encode the fact that those contracts may have been called in between
+		// transactions to _contract.
+		//
+		// We do that by adding nondet_interface constraints for those contracts,
+		// in the last line of this if block.
+		//
+		// If there are state variables of container types like structs or arrays
+		// that indirectly contain contract types, we havoc the state for simplicity,
+		// in the first part of this block.
+		// TODO: This could actually be supported.
+		// For structs: simply collect the SMT expressions of all the indirect contract type members.
+		// For arrays: more involved, needs to traverse the array symbolically and do the same for each contract.
+		// For mappings: way more complicated if the element type is a contract.
+		auto hasContractOrAddressSubType = [&](VariableDeclaration const* _var) -> bool {
+			bool foundContract = false;
+			solidity::util::BreadthFirstSearch<Type const*> bfs{{_var->type()}};
+			bfs.run([&](auto _type, auto&& _addChild) {
+				if (
+					_type->category() == Type::Category::Address ||
+					_type->category() == Type::Category::Contract
+				)
+				{
+					foundContract = true;
+					bfs.abort();
+				}
+				if (auto const* mapType = dynamic_cast<MappingType const*>(_type))
+					_addChild(mapType->valueType());
+				else if (auto const* arrayType = dynamic_cast<ArrayType const*>(_type))
+					_addChild(arrayType->baseType());
+				else if (auto const* structType = dynamic_cast<StructType const*>(_type))
+					for (auto const& member: structType->nativeMembers(nullptr))
+						_addChild(member.type);
+			});
+			return foundContract;
+		};
+		bool found = false;
+		for (auto var: m_currentContract->stateVariables())
+			if (
+				var->type()->category() != Type::Category::Address &&
+				var->type()->category() != Type::Category::Contract &&
+				hasContractOrAddressSubType(var)
+			)
+			{
+				found = true;
+				break;
+			}
+
+		if (found)
+			state().newStorage();
+		else
+			addNondetCalls(*m_currentContract);
+	}
+
 	errorFlag().increaseIndex();
 	m_context.addAssertion(summaryCall(_function));
 
@@ -1308,26 +1545,26 @@ smtutil::Expression CHC::summary(FunctionDefinition const& _function, ContractDe
 	return smt::function(*m_summaries.at(&_contract).at(&_function), &_contract, m_context);
 }
 
-smtutil::Expression CHC::summaryCall(FunctionDefinition const& _function, ContractDefinition const& _contract)
+smtutil::Expression CHC::summary(FunctionDefinition const& _function)
 {
-	return smt::functionCall(*m_summaries.at(&_contract).at(&_function), &_contract, m_context);
+	solAssert(m_currentContract, "");
+	return summary(_function, *m_currentContract);
 }
 
-smtutil::Expression CHC::externalSummary(FunctionDefinition const& _function, ContractDefinition const& _contract)
+smtutil::Expression CHC::summaryCall(FunctionDefinition const& _function, ContractDefinition const& _contract)
 {
-	return smt::function(*m_externalSummaries.at(&_contract).at(&_function), &_contract, m_context);
+	return smt::functionCall(*m_summaries.at(&_contract).at(&_function), &_contract, m_context);
 }
 
-smtutil::Expression CHC::summary(FunctionDefinition const& _function)
+smtutil::Expression CHC::summaryCall(FunctionDefinition const& _function)
 {
 	solAssert(m_currentContract, "");
-	return summary(_function, *m_currentContract);
+	return summaryCall(_function, *m_currentContract);
 }
 
-smtutil::Expression CHC::summaryCall(FunctionDefinition const& _function)
+smtutil::Expression CHC::externalSummary(FunctionDefinition const& _function, ContractDefinition const& _contract)
 {
-	solAssert(m_currentContract, "");
-	return summaryCall(_function, *m_currentContract);
+	return smt::function(*m_externalSummaries.at(&_contract).at(&_function), &_contract, m_context);
 }
 
 smtutil::Expression CHC::externalSummary(FunctionDefinition const& _function)
@@ -1516,18 +1753,19 @@ smtutil::Expression CHC::predicate(FunctionCall const& _funCall)
 	auto const& hierarchy = m_currentContract->annotation().linearizedBaseContracts;
 	solAssert(kind != FunctionType::Kind::Internal || function->isFree() || (contract && contract->isLibrary()) || util::contains(hierarchy, contract), "");
 
-	bool usesStaticCall = function->stateMutability() == StateMutability::Pure || function->stateMutability() == StateMutability::View;
+	if (kind == FunctionType::Kind::Internal)
+		contract = m_currentContract;
 
-	args += currentStateVariables(*m_currentContract);
-	args += symbolicArguments(_funCall, m_currentContract);
-	if (!m_currentContract->isLibrary() && !usesStaticCall)
+	args += currentStateVariables(*contract);
+	args += symbolicArguments(_funCall, contract);
+	if (!usesStaticCall(_funCall))
 	{
 		state().newState();
-		for (auto const& var: m_stateVariables)
+		for (auto const& var: stateVariablesIncludingInheritedAndPrivate(*contract))
 			m_context.variable(*var)->increaseIndex();
 	}
 	args += vector<smtutil::Expression>{state().state()};
-	args += currentStateVariables(*m_currentContract);
+	args += currentStateVariables(*contract);
 
 	for (auto var: function->parameters() + function->returnParameters())
 	{
@@ -1538,14 +1776,14 @@ smtutil::Expression CHC::predicate(FunctionCall const& _funCall)
 		args.push_back(currentValue(*var));
 	}
 
-	Predicate const& summary = *m_summaries.at(m_currentContract).at(function);
-	auto from = smt::function(summary, m_currentContract, m_context);
+	Predicate const& summary = *m_summaries.at(contract).at(function);
+	auto from = smt::function(summary, contract, m_context);
 	Predicate const& callPredicate = *createSummaryBlock(
 		*function,
-		*m_currentContract,
+		*contract,
 		kind == FunctionType::Kind::Internal ? PredicateType::InternalCall : PredicateType::ExternalCallTrusted
 	);
-	auto to = smt::function(callPredicate, m_currentContract, m_context);
+	auto to = smt::function(callPredicate, contract, m_context);
 	addRule(smtutil::Expression::implies(from, to), to.name);
 
 	return callPredicate(args);
@@ -1910,60 +2148,63 @@ optional<string> CHC::generateCounterexample(CHCSolverInterface::CexGraph const&
 		Predicate const* summaryPredicate = Predicate::predicate(summaryNode.name);
 		auto const& summaryArgs = summaryNode.arguments;
 
-		auto stateVars = summaryPredicate->stateVariables();
-		solAssert(stateVars.has_value(), "");
-		auto stateValues = summaryPredicate->summaryStateValues(summaryArgs);
-		solAssert(stateValues.size() == stateVars->size(), "");
-
-		if (first)
+		if (!summaryPredicate->programVariable())
 		{
-			first = false;
-			/// Generate counterexample message local to the failed target.
-			localState = formatVariableModel(*stateVars, stateValues, ", ") + "\n";
+			auto stateVars = summaryPredicate->stateVariables();
+			solAssert(stateVars.has_value(), "");
+			auto stateValues = summaryPredicate->summaryStateValues(summaryArgs);
+			solAssert(stateValues.size() == stateVars->size(), "");
 
-			if (auto calledFun = summaryPredicate->programFunction())
+			if (first)
 			{
-				auto inValues = summaryPredicate->summaryPostInputValues(summaryArgs);
-				auto const& inParams = calledFun->parameters();
-				if (auto inStr = formatVariableModel(inParams, inValues, "\n"); !inStr.empty())
-					localState += inStr + "\n";
-				auto outValues = summaryPredicate->summaryPostOutputValues(summaryArgs);
-				auto const& outParams = calledFun->returnParameters();
-				if (auto outStr = formatVariableModel(outParams, outValues, "\n"); !outStr.empty())
-					localState += outStr + "\n";
-
-				optional<unsigned> localErrorId;
-				solidity::util::BreadthFirstSearch<unsigned> bfs{{summaryId}};
-				bfs.run([&](auto _nodeId, auto&& _addChild) {
-					auto const& children = _graph.edges.at(_nodeId);
-					if (
-						children.size() == 1 &&
-						nodePred(children.front())->isFunctionErrorBlock()
-					)
-					{
-						localErrorId = children.front();
-						bfs.abort();
-					}
-					ranges::for_each(children, _addChild);
-				});
+				first = false;
+				/// Generate counterexample message local to the failed target.
+				localState = formatVariableModel(*stateVars, stateValues, ", ") + "\n";
 
-				if (localErrorId.has_value())
+				if (auto calledFun = summaryPredicate->programFunction())
 				{
-					auto const* localError = nodePred(*localErrorId);
-					solAssert(localError && localError->isFunctionErrorBlock(), "");
-					auto const [localValues, localVars] = localError->localVariableValues(nodeArgs(*localErrorId));
-					if (auto localStr = formatVariableModel(localVars, localValues, "\n"); !localStr.empty())
-						localState += localStr + "\n";
+					auto inValues = summaryPredicate->summaryPostInputValues(summaryArgs);
+					auto const& inParams = calledFun->parameters();
+					if (auto inStr = formatVariableModel(inParams, inValues, "\n"); !inStr.empty())
+						localState += inStr + "\n";
+					auto outValues = summaryPredicate->summaryPostOutputValues(summaryArgs);
+					auto const& outParams = calledFun->returnParameters();
+					if (auto outStr = formatVariableModel(outParams, outValues, "\n"); !outStr.empty())
+						localState += outStr + "\n";
+
+					optional<unsigned> localErrorId;
+					solidity::util::BreadthFirstSearch<unsigned> bfs{{summaryId}};
+					bfs.run([&](auto _nodeId, auto&& _addChild) {
+						auto const& children = _graph.edges.at(_nodeId);
+						if (
+							children.size() == 1 &&
+							nodePred(children.front())->isFunctionErrorBlock()
+						)
+						{
+							localErrorId = children.front();
+							bfs.abort();
+						}
+						ranges::for_each(children, _addChild);
+					});
+
+					if (localErrorId.has_value())
+					{
+						auto const* localError = nodePred(*localErrorId);
+						solAssert(localError && localError->isFunctionErrorBlock(), "");
+						auto const [localValues, localVars] = localError->localVariableValues(nodeArgs(*localErrorId));
+						if (auto localStr = formatVariableModel(localVars, localValues, "\n"); !localStr.empty())
+							localState += localStr + "\n";
+					}
 				}
 			}
-		}
-		else
-		{
-			auto modelMsg = formatVariableModel(*stateVars, stateValues, ", ");
-			/// We report the state after every tx in the trace except for the last, which is reported
-			/// first in the code above.
-			if (!modelMsg.empty())
-				path.emplace_back("State: " + modelMsg);
+			else
+			{
+				auto modelMsg = formatVariableModel(*stateVars, stateValues, ", ");
+				/// We report the state after every tx in the trace except for the last, which is reported
+				/// first in the code above.
+				if (!modelMsg.empty())
+					path.emplace_back("State: " + modelMsg);
+			}
 		}
 
 		string txCex = summaryPredicate->formatSummaryCall(summaryArgs, m_charStreamProvider);
@@ -1992,6 +2233,12 @@ optional<string> CHC::generateCounterexample(CHCSolverInterface::CexGraph const&
 				if (calls.size() > callTraceSize + 1)
 					calls.front() += ", synthesized as:";
 			}
+			else if (pred->programVariable())
+			{
+				calls.front() += "-- action on external contract in state variable \"" + pred->programVariable()->name() + "\"";
+				if (calls.size() > callTraceSize + 1)
+					calls.front() += ", synthesized as:";
+			}
 			else if (pred->isFunctionSummary() && parentPred->isExternalCallUntrusted())
 				calls.front() += " -- reentrant call";
 		};
@@ -2047,7 +2294,8 @@ map<unsigned, vector<unsigned>> CHC::summaryCalls(CHCSolverInterface::CexGraph c
 			nodePred->isInternalCall() ||
 			nodePred->isExternalCallTrusted() ||
 			nodePred->isExternalCallUntrusted() ||
-			rootPred->isExternalCallUntrusted()
+			rootPred->isExternalCallUntrusted() ||
+			rootPred->programVariable()
 		))
 		{
 			calls[root].push_back(node);
@@ -2105,3 +2353,31 @@ SymbolicIntVariable& CHC::errorFlag()
 {
 	return state().errorFlag();
 }
+
+void CHC::newTxConstraints(Expression const* _value)
+{
+	auto txOrigin = state().txMember("tx.origin");
+	state().newTx();
+	// set the transaction sender as this contract
+	m_context.addAssertion(state().txMember("msg.sender") == state().thisAddress());
+	// set the origin to be the current transaction origin
+	m_context.addAssertion(state().txMember("tx.origin") == txOrigin);
+
+	if (_value)
+		// set the msg value
+		m_context.addAssertion(state().txMember("msg.value") == expr(*_value));
+}
+
+frontend::Expression const* CHC::valueOption(FunctionCallOptions const* _options)
+{
+	if (_options)
+		for (auto&& [i, name]: _options->names() | ranges::views::enumerate)
+			if (name && *name == "value")
+				return _options->options().at(i).get();
+	return nullptr;
+}
+
+void CHC::decreaseBalanceFromOptionsValue(Expression const& _value)
+{
+	state().addBalance(state().thisAddress(), 0 - expr(_value));
+}
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index 8b81ffb59a..c113f85831 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -110,10 +110,14 @@ class CHC: public SMTEncoder
 	void popInlineFrame(CallableDeclaration const& _callable) override;
 
 	void visitAssert(FunctionCall const& _funCall);
+	void visitPublicGetter(FunctionCall const& _funCall) override;
 	void visitAddMulMod(FunctionCall const& _funCall) override;
+	void visitDeployment(FunctionCall const& _funCall);
 	void internalFunctionCall(FunctionCall const& _funCall);
 	void externalFunctionCall(FunctionCall const& _funCall);
 	void externalFunctionCallToTrustedCode(FunctionCall const& _funCall);
+	void addNondetCalls(ContractDefinition const& _contract);
+	void nondetCall(ContractDefinition const& _contract, VariableDeclaration const& _var);
 	void unknownFunctionCall(FunctionCall const& _funCall);
 	void makeArrayPopVerificationTarget(FunctionCall const& _arrayPop) override;
 	void makeOutOfBoundsVerificationTarget(IndexAccess const& _access) override;
@@ -135,6 +139,7 @@ class CHC: public SMTEncoder
 	void clearIndices(ContractDefinition const* _contract, FunctionDefinition const* _function = nullptr) override;
 	void setCurrentBlock(Predicate const& _block);
 	std::set<unsigned> transactionVerificationTargetsIds(ASTNode const* _txRoot);
+	bool usesStaticCall(FunctionCall const& _funCall);
 	//@}
 
 	/// SMT Natspec and abstraction helpers.
@@ -148,6 +153,10 @@ class CHC: public SMTEncoder
 	/// @returns true if _function is Natspec annotated to be abstracted by
 	/// nondeterministic values.
 	bool abstractAsNondet(FunctionDefinition const& _function);
+
+	/// @returns true if external calls should be considered trusted.
+	/// If that's the case, their code is used if available at compile time.
+	bool encodeExternalCallsAsTrusted();
 	//@}
 
 	/// Sort helpers.
@@ -310,6 +319,20 @@ class CHC: public SMTEncoder
 	unsigned newErrorId();
 
 	smt::SymbolicIntVariable& errorFlag();
+
+	/// Adds to the solver constraints that
+	/// - propagate tx.origin
+	/// - set the current contract as msg.sender
+	/// - set the msg.value as _value, if not nullptr
+	void newTxConstraints(Expression const* _value);
+
+	/// @returns the expression representing the value sent in
+	/// an external call if present,
+	/// and nullptr otherwise.
+	frontend::Expression const* valueOption(FunctionCallOptions const* _options);
+
+	/// Adds constraints that decrease the balance of the caller by _value.
+	void decreaseBalanceFromOptionsValue(Expression const& _value);
 	//@}
 
 	/// Predicates.
diff --git a/libsolidity/formal/ModelCheckerSettings.cpp b/libsolidity/formal/ModelCheckerSettings.cpp
index 274571a154..d1e383d63f 100644
--- a/libsolidity/formal/ModelCheckerSettings.cpp
+++ b/libsolidity/formal/ModelCheckerSettings.cpp
@@ -130,3 +130,12 @@ std::optional<ModelCheckerContracts> ModelCheckerContracts::fromString(string co
 
 	return ModelCheckerContracts{chosen};
 }
+
+std::optional<ModelCheckerExtCalls> ModelCheckerExtCalls::fromString(string const& _mode)
+{
+	if (_mode == "untrusted")
+		return ModelCheckerExtCalls{Mode::UNTRUSTED};
+	if (_mode == "trusted")
+		return ModelCheckerExtCalls{Mode::TRUSTED};
+	return {};
+}
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index 2c86993b9d..3c1f623a07 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -140,6 +140,21 @@ struct ModelCheckerTargets
 	std::set<VerificationTargetType> targets;
 };
 
+struct ModelCheckerExtCalls
+{
+	enum class Mode
+	{
+		UNTRUSTED,
+		TRUSTED
+	};
+
+	Mode mode = Mode::UNTRUSTED;
+
+	static std::optional<ModelCheckerExtCalls> fromString(std::string const& _mode);
+
+	bool isTrusted() const { return mode == Mode::TRUSTED; }
+};
+
 struct ModelCheckerSettings
 {
 	ModelCheckerContracts contracts = ModelCheckerContracts::Default();
@@ -151,6 +166,7 @@ struct ModelCheckerSettings
 	/// might prefer the precise encoding.
 	bool divModNoSlacks = false;
 	ModelCheckerEngine engine = ModelCheckerEngine::None();
+	ModelCheckerExtCalls externalCalls = {};
 	ModelCheckerInvariants invariants = ModelCheckerInvariants::Default();
 	bool showUnproved = false;
 	smtutil::SMTSolverChoice solvers = smtutil::SMTSolverChoice::Z3();
@@ -164,6 +180,7 @@ struct ModelCheckerSettings
 			contracts == _other.contracts &&
 			divModNoSlacks == _other.divModNoSlacks &&
 			engine == _other.engine &&
+			externalCalls.mode == _other.externalCalls.mode &&
 			invariants == _other.invariants &&
 			showUnproved == _other.showUnproved &&
 			solvers == _other.solvers &&
diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
index 918728d86d..7119a59e8b 100644
--- a/libsolidity/formal/Predicate.cpp
+++ b/libsolidity/formal/Predicate.cpp
@@ -144,6 +144,11 @@ FunctionCall const* Predicate::programFunctionCall() const
 	return dynamic_cast<FunctionCall const*>(m_node);
 }
 
+VariableDeclaration  const* Predicate::programVariable() const
+{
+	return dynamic_cast<VariableDeclaration const*>(m_node);
+}
+
 optional<vector<VariableDeclaration const*>> Predicate::stateVariables() const
 {
 	if (m_contractContext)
@@ -214,6 +219,9 @@ string Predicate::formatSummaryCall(
 {
 	solAssert(isSummary(), "");
 
+	if (programVariable())
+		return {};
+
 	if (auto funCall = programFunctionCall())
 	{
 		if (funCall->location().hasText())
@@ -348,6 +356,8 @@ vector<optional<string>> Predicate::summaryStateValues(vector<smtutil::Expressio
 		stateFirst = _args.begin() + 7 + static_cast<int>(stateVars->size());
 		stateLast = stateFirst + static_cast<int>(stateVars->size());
 	}
+	else if (programVariable())
+		return {};
 	else
 		solAssert(false, "");
 
diff --git a/libsolidity/formal/Predicate.h b/libsolidity/formal/Predicate.h
index 16af42f45f..d7ac0da352 100644
--- a/libsolidity/formal/Predicate.h
+++ b/libsolidity/formal/Predicate.h
@@ -115,6 +115,10 @@ class Predicate
 	/// or nullptr otherwise.
 	FunctionCall const* programFunctionCall() const;
 
+	/// @returns the VariableDeclaration that this predicate represents
+	/// or nullptr otherwise.
+	VariableDeclaration const* programVariable() const;
+
 	/// @returns the program state variables in the scope of this predicate.
 	std::optional<std::vector<VariableDeclaration const*>> stateVariables() const;
 
diff --git a/libsolidity/formal/PredicateInstance.cpp b/libsolidity/formal/PredicateInstance.cpp
index aff6aa19b4..5e057efe37 100644
--- a/libsolidity/formal/PredicateInstance.cpp
+++ b/libsolidity/formal/PredicateInstance.cpp
@@ -70,14 +70,14 @@ smtutil::Expression constructor(Predicate const& _pred, EncodingContext& _contex
 	return _pred(stateExprs + initialStateVariables(contract, _context) + currentStateVariables(contract, _context));
 }
 
-smtutil::Expression constructorCall(Predicate const& _pred, EncodingContext& _context)
+smtutil::Expression constructorCall(Predicate const& _pred, EncodingContext& _context, bool _internal)
 {
 	auto const& contract = dynamic_cast<ContractDefinition const&>(*_pred.programNode());
 	if (auto const* constructor = contract.constructor())
-		return _pred(currentFunctionVariablesForCall(*constructor, &contract, _context));
+		return _pred(currentFunctionVariablesForCall(*constructor, &contract, _context, _internal));
 
 	auto& state = _context.state();
-	vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), state.thisAddress(0), state.abi(0), state.crypto(0), state.tx(0), state.state()};
+	vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), _internal ? state.thisAddress(0) : state.thisAddress(), state.abi(0), state.crypto(0), _internal ? state.tx(0) : state.tx(), state.state()};
 	state.newState();
 	stateExprs += vector<smtutil::Expression>{state.state()};
 	stateExprs += currentStateVariables(contract, _context);
@@ -166,11 +166,12 @@ vector<smtutil::Expression> currentFunctionVariablesForDefinition(
 vector<smtutil::Expression> currentFunctionVariablesForCall(
 	FunctionDefinition const& _function,
 	ContractDefinition const* _contract,
-	EncodingContext& _context
+	EncodingContext& _context,
+	bool _internal
 )
 {
 	auto& state = _context.state();
-	vector<smtutil::Expression> exprs{state.errorFlag().currentValue(), state.thisAddress(0), state.abi(0), state.crypto(0), state.tx(0), state.state()};
+	vector<smtutil::Expression> exprs{state.errorFlag().currentValue(), _internal ? state.thisAddress(0) : state.thisAddress(), state.abi(0), state.crypto(0), _internal ? state.tx(0) : state.tx(), state.state()};
 	exprs += _contract ? currentStateVariables(*_contract, _context) : vector<smtutil::Expression>{};
 	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->currentValue(); });
 
diff --git a/libsolidity/formal/PredicateInstance.h b/libsolidity/formal/PredicateInstance.h
index 2f6c773813..42a9e2040b 100644
--- a/libsolidity/formal/PredicateInstance.h
+++ b/libsolidity/formal/PredicateInstance.h
@@ -37,7 +37,14 @@ smtutil::Expression interface(Predicate const& _pred, ContractDefinition const&
 smtutil::Expression nondetInterface(Predicate const& _pred, ContractDefinition const& _contract, EncodingContext& _context, unsigned _preIdx, unsigned _postIdx);
 
 smtutil::Expression constructor(Predicate const& _pred, EncodingContext& _context);
-smtutil::Expression constructorCall(Predicate const& _pred, EncodingContext& _context);
+/// The encoding of the deployment procedure includes adding constraints
+/// for base constructors if inheritance is used.
+/// From the predicate point of view this is not different,
+/// but some of the arguments are different.
+/// @param _internal = true means that this constructor call is used in the
+/// deployment procedure, whereas false means it is used in the deployment
+/// of a contract.
+smtutil::Expression constructorCall(Predicate const& _pred, EncodingContext& _context, bool _internal = true);
 
 smtutil::Expression function(
 	Predicate const& _pred,
@@ -77,7 +84,8 @@ std::vector<smtutil::Expression> currentFunctionVariablesForDefinition(
 std::vector<smtutil::Expression> currentFunctionVariablesForCall(
 	FunctionDefinition const& _function,
 	ContractDefinition const* _contract,
-	EncodingContext& _context
+	EncodingContext& _context,
+	bool _internal = true
 );
 
 std::vector<smtutil::Expression> currentBlockVariables(
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 810b533512..c3286fa041 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -637,7 +637,7 @@ void SMTEncoder::endVisit(FunctionCall const& _funCall)
 		visitGasLeft(_funCall);
 		break;
 	case FunctionType::Kind::External:
-		if (isPublicGetter(_funCall.expression()))
+		if (publicGetter(_funCall.expression()))
 			visitPublicGetter(_funCall);
 		break;
 	case FunctionType::Kind::ABIDecode:
@@ -696,10 +696,18 @@ void SMTEncoder::endVisit(FunctionCall const& _funCall)
 	case FunctionType::Kind::ObjectCreation:
 		visitObjectCreation(_funCall);
 		return;
+	case FunctionType::Kind::Creation:
+		if (!m_settings.engine.chc || !m_settings.externalCalls.isTrusted())
+			m_errorReporter.warning(
+				8729_error,
+				_funCall.location(),
+				"Contract deployment is only supported in the trusted mode for external calls"
+				" with the CHC engine."
+			);
+		break;
 	case FunctionType::Kind::DelegateCall:
 	case FunctionType::Kind::BareCallCode:
 	case FunctionType::Kind::BareDelegateCall:
-	case FunctionType::Kind::Creation:
 	default:
 		m_errorReporter.warning(
 			4588_error,
@@ -978,9 +986,8 @@ vector<string> structGetterReturnedMembers(StructType const& _structType)
 
 void SMTEncoder::visitPublicGetter(FunctionCall const& _funCall)
 {
-	MemberAccess const& access = dynamic_cast<MemberAccess const&>(_funCall.expression());
-	auto var = dynamic_cast<VariableDeclaration const*>(access.annotation().referencedDeclaration);
-	solAssert(var, "");
+	auto var = publicGetter(_funCall.expression());
+	solAssert(var && var->isStateVariable(), "");
 	solAssert(m_context.knownExpression(_funCall), "");
 	auto paramExpectedTypes = replaceUserTypes(FunctionType(*var).parameterTypes());
 	auto actualArguments = _funCall.arguments();
@@ -1054,7 +1061,7 @@ bool SMTEncoder::shouldAnalyze(ContractDefinition const& _contract) const
 		return false;
 
 	return m_settings.contracts.isDefault() ||
-		m_settings.contracts.has(_contract.sourceUnitName(), _contract.name());
+		m_settings.contracts.has(_contract.sourceUnitName());
 }
 
 void SMTEncoder::visitTypeConversion(FunctionCall const& _funCall)
@@ -2789,16 +2796,24 @@ MemberAccess const* SMTEncoder::isEmptyPush(Expression const& _expr) const
 	return nullptr;
 }
 
-bool SMTEncoder::isPublicGetter(Expression const& _expr) {
-	if (!isTrustedExternalCall(&_expr))
-		return false;
-	auto varDecl = dynamic_cast<VariableDeclaration const*>(
-		dynamic_cast<MemberAccess const&>(_expr).annotation().referencedDeclaration
-	);
-	return varDecl != nullptr;
+smtutil::Expression SMTEncoder::contractAddressValue(FunctionCall const& _f)
+{
+	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_f.expression().annotation().type);
+	if (funType.kind() == FunctionType::Kind::Internal)
+		return state().thisAddress();
+	auto [funExpr, funOptions] = functionCallExpression(_f);
+	if (MemberAccess const* callBase = dynamic_cast<MemberAccess const*>(funExpr))
+		return expr(callBase->expression());
+	solAssert(false, "Unreachable!");
+}
+
+VariableDeclaration const* SMTEncoder::publicGetter(Expression const& _expr) const {
+	if (auto memberAccess = dynamic_cast<MemberAccess const*>(&_expr))
+		return dynamic_cast<VariableDeclaration const*>(memberAccess->annotation().referencedDeclaration);
+	return nullptr;
 }
 
-bool SMTEncoder::isTrustedExternalCall(Expression const* _expr) {
+bool SMTEncoder::isExternalCallToThis(Expression const* _expr) {
 	auto memberAccess = dynamic_cast<MemberAccess const*>(_expr);
 	if (!memberAccess)
 		return false;
@@ -3060,7 +3075,7 @@ RationalNumberType const* SMTEncoder::isConstant(Expression const& _expr)
 	return nullptr;
 }
 
-set<FunctionCall const*> SMTEncoder::collectABICalls(ASTNode const* _node)
+set<FunctionCall const*, ASTCompareByID<FunctionCall>> SMTEncoder::collectABICalls(ASTNode const* _node)
 {
 	struct ABIFunctions: public ASTConstVisitor
 	{
@@ -3082,7 +3097,7 @@ set<FunctionCall const*> SMTEncoder::collectABICalls(ASTNode const* _node)
 				}
 		}
 
-		set<FunctionCall const*> abiCalls;
+		set<FunctionCall const*, ASTCompareByID<FunctionCall>> abiCalls;
 	};
 
 	return ABIFunctions(_node).abiCalls;
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 2ba491a0b0..06b03a7eb8 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -123,7 +123,7 @@ class SMTEncoder: public ASTConstVisitor
 	/// RationalNumberType or can be const evaluated, and nullptr otherwise.
 	static RationalNumberType const* isConstant(Expression const& _expr);
 
-	static std::set<FunctionCall const*> collectABICalls(ASTNode const* _node);
+	static std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> collectABICalls(ASTNode const* _node);
 
 	/// @returns all the sources that @param _source depends on,
 	/// including itself.
@@ -219,7 +219,7 @@ class SMTEncoder: public ASTConstVisitor
 	void visitTypeConversion(FunctionCall const& _funCall);
 	void visitStructConstructorCall(FunctionCall const& _funCall);
 	void visitFunctionIdentifier(Identifier const& _identifier);
-	void visitPublicGetter(FunctionCall const& _funCall);
+	virtual void visitPublicGetter(FunctionCall const& _funCall);
 
 	/// @returns true if @param _contract is set for analysis in the settings
 	/// and it is not abstract.
@@ -227,7 +227,12 @@ class SMTEncoder: public ASTConstVisitor
 	/// @returns true if @param _source is set for analysis in the settings.
 	bool shouldAnalyze(SourceUnit const& _source) const;
 
-	bool isPublicGetter(Expression const& _expr);
+	/// @returns the state variable returned by a public getter if
+	/// @a _expr is a call to a public getter,
+	/// otherwise nullptr.
+	VariableDeclaration const* publicGetter(Expression const& _expr) const;
+
+	smtutil::Expression contractAddressValue(FunctionCall const& _f);
 
 	/// Encodes a modifier or function body according to the modifier
 	/// visit depth.
@@ -392,9 +397,9 @@ class SMTEncoder: public ASTConstVisitor
 	/// otherwise nullptr.
 	MemberAccess const* isEmptyPush(Expression const& _expr) const;
 
-	/// @returns true if the given identifier is a contract which is known and trusted.
+	/// @returns true if the given expression is `this`.
 	/// This means we don't have to abstract away effects of external function calls to this contract.
-	static bool isTrustedExternalCall(Expression const* _expr);
+	static bool isExternalCallToThis(Expression const* _expr);
 
 	/// Creates symbolic expressions for the returned values
 	/// and set them as the components of the symbolic tuple.
diff --git a/libsolidity/formal/SymbolicState.cpp b/libsolidity/formal/SymbolicState.cpp
index 3afde0dcf5..68bd9b6462 100644
--- a/libsolidity/formal/SymbolicState.cpp
+++ b/libsolidity/formal/SymbolicState.cpp
@@ -22,8 +22,13 @@
 #include <libsolidity/formal/EncodingContext.h>
 #include <libsolidity/formal/SMTEncoder.h>
 
+#include <libsmtutil/Sorts.h>
+
+#include <range/v3/view.hpp>
+
 using namespace std;
 using namespace solidity;
+using namespace solidity::util;
 using namespace solidity::smtutil;
 using namespace solidity::frontend::smt;
 
@@ -58,16 +63,8 @@ smtutil::Expression BlockchainVariable::member(string const& _member) const
 
 smtutil::Expression BlockchainVariable::assignMember(string const& _member, smtutil::Expression const& _value)
 {
-	vector<smtutil::Expression> args;
-	for (auto const& m: m_members)
-		if (m.first == _member)
-			args.emplace_back(_value);
-		else
-			args.emplace_back(member(m.first));
-	m_tuple->increaseIndex();
-	auto tuple = m_tuple->currentValue();
-	auto sortExpr = smtutil::Expression(make_shared<smtutil::SortSort>(tuple.sort), tuple.name);
-	m_context.addAssertion(tuple == smtutil::Expression::tuple_constructor(sortExpr, args));
+	smtutil::Expression newTuple = smt::assignMember(m_tuple->currentValue(), {{_member, _value}});
+	m_context.addAssertion(m_tuple->increaseIndex() == newTuple);
 	return m_tuple->currentValue();
 }
 
@@ -75,16 +72,19 @@ void SymbolicState::reset()
 {
 	m_error.resetIndex();
 	m_thisAddress.resetIndex();
-	m_state.reset();
 	m_tx.reset();
 	m_crypto.reset();
 	if (m_abi)
 		m_abi->reset();
+	/// We don't reset nor clear these pointers on purpose,
+	/// since it only helps to keep the already generated types.
+	if (m_state)
+		m_state->reset();
 }
 
 smtutil::Expression SymbolicState::balances() const
 {
-	return m_state.member("balances");
+	return m_state->member("balances");
 }
 
 smtutil::Expression SymbolicState::balance() const
@@ -107,24 +107,94 @@ void SymbolicState::newBalances()
 	auto tupleSort = dynamic_pointer_cast<TupleSort>(stateSort());
 	auto balanceSort = tupleSort->components.at(tupleSort->memberToIndex.at("balances"));
 	SymbolicVariable newBalances(balanceSort, "fresh_balances_" + to_string(m_context.newUniqueId()), m_context);
-	m_state.assignMember("balances", newBalances.currentValue());
+	m_state->assignMember("balances", newBalances.currentValue());
 }
 
 void SymbolicState::transfer(smtutil::Expression _from, smtutil::Expression _to, smtutil::Expression _value)
 {
-	unsigned indexBefore = m_state.index();
+	unsigned indexBefore = m_state->index();
 	addBalance(_from, 0 - _value);
 	addBalance(_to, std::move(_value));
-	unsigned indexAfter = m_state.index();
+	unsigned indexAfter = m_state->index();
 	solAssert(indexAfter > indexBefore, "");
-	m_state.newVar();
+	m_state->newVar();
 	/// Do not apply the transfer operation if _from == _to.
 	auto newState = smtutil::Expression::ite(
 		std::move(_from) == std::move(_to),
-		m_state.value(indexBefore),
-		m_state.value(indexAfter)
+		m_state->value(indexBefore),
+		m_state->value(indexAfter)
+	);
+	m_context.addAssertion(m_state->value() == newState);
+}
+
+smtutil::Expression SymbolicState::storage(ContractDefinition const& _contract) const
+{
+	return smt::member(m_state->member("storage"), contractStorageKey(_contract));
+}
+
+smtutil::Expression SymbolicState::storage(ContractDefinition const& _contract, smtutil::Expression _address) const
+{
+	return smtutil::Expression::select(storage(_contract), std::move(_address));
+}
+
+smtutil::Expression SymbolicState::addressActive(smtutil::Expression _address) const
+{
+	return smtutil::Expression::select(m_state->member("isActive"), std::move(_address));
+}
+
+void SymbolicState::setAddressActive(
+	smtutil::Expression _address,
+	bool _active
+)
+{
+	m_state->assignMember("isActive", smtutil::Expression::store(
+		m_state->member("isActive"),
+		std::move(_address),
+		smtutil::Expression(_active))
+	);
+}
+
+void SymbolicState::newStorage()
+{
+	auto newStorageVar = SymbolicTupleVariable(
+		m_state->member("storage").sort,
+		"havoc_storage_" + to_string(m_context.newUniqueId()),
+		m_context
 	);
-	m_context.addAssertion(m_state.value() == newState);
+	m_state->assignMember("storage", newStorageVar.currentValue());
+}
+
+void SymbolicState::writeStateVars(ContractDefinition const& _contract, smtutil::Expression _address)
+{
+	auto stateVars = SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract);
+	if (stateVars.empty())
+		return;
+
+	map<string, smtutil::Expression> values;
+	for (auto var: stateVars)
+		values.emplace(stateVarStorageKey(*var, _contract), m_context.variable(*var)->currentValue());
+
+	smtutil::Expression thisStorage = storage(_contract, _address);
+	smtutil::Expression newStorage = smt::assignMember(thisStorage, values);
+	auto newContractStorage = smtutil::Expression::store(
+		storage(_contract), std::move(_address), newStorage
+	);
+	smtutil::Expression newAllStorage = smt::assignMember(m_state->member("storage"), {{contractStorageKey(_contract), newContractStorage}});
+	m_state->assignMember("storage", newAllStorage);
+}
+
+void SymbolicState::readStateVars(ContractDefinition const& _contract, smtutil::Expression _address)
+{
+	auto stateVars = SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract);
+	if (stateVars.empty())
+		return;
+
+	auto contractStorage = storage(_contract, std::move(_address));
+	for (auto var: stateVars)
+		m_context.addAssertion(
+			m_context.variable(*var)->increaseIndex() ==
+			smt::member(contractStorage, stateVarStorageKey(*var, _contract))
+		);
 }
 
 void SymbolicState::addBalance(smtutil::Expression _address, smtutil::Expression _value)
@@ -134,7 +204,7 @@ void SymbolicState::addBalance(smtutil::Expression _address, smtutil::Expression
 		_address,
 		balance(_address) + std::move(_value)
 	);
-	m_state.assignMember("balances", newBalances);
+	m_state->assignMember("balances", newBalances);
 }
 
 smtutil::Expression SymbolicState::txMember(string const& _member) const
@@ -194,17 +264,99 @@ smtutil::Expression SymbolicState::txFunctionConstraints(FunctionDefinition cons
 	return conj;
 }
 
-void SymbolicState::prepareForSourceUnit(SourceUnit const& _source)
+void SymbolicState::prepareForSourceUnit(SourceUnit const& _source, bool _storage)
 {
-	set<FunctionCall const*> abiCalls = SMTEncoder::collectABICalls(&_source);
-	for (auto const& source: _source.referencedSourceUnits(true))
+	auto allSources = _source.referencedSourceUnits(true);
+	allSources.insert(&_source);
+	set<FunctionCall const*, ASTCompareByID<FunctionCall>> abiCalls;
+	set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> contracts;
+	for (auto const& source: allSources)
+	{
 		abiCalls += SMTEncoder::collectABICalls(source);
+		for (auto node: source->nodes())
+			if (auto contract = dynamic_cast<ContractDefinition const*>(node.get()))
+				contracts.insert(contract);
+	}
+	buildState(contracts, _storage);
 	buildABIFunctions(abiCalls);
 }
 
 /// Private helpers.
 
-void SymbolicState::buildABIFunctions(set<FunctionCall const*> const& _abiFunctions)
+string SymbolicState::contractSuffix(ContractDefinition const& _contract) const
+{
+	return "_" + _contract.name() + "_" + to_string(_contract.id());
+}
+
+string SymbolicState::contractStorageKey(ContractDefinition const& _contract) const
+{
+	return "storage" + contractSuffix(_contract);
+}
+
+string SymbolicState::stateVarStorageKey(VariableDeclaration const& _var, ContractDefinition const& _contract) const
+{
+	return _var.name() + "_" + to_string(_var.id()) + contractSuffix(_contract);
+}
+
+void SymbolicState::buildState(set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> const& _contracts, bool _allStorages)
+{
+	map<string, SortPointer> stateMembers{
+		{"balances", make_shared<smtutil::ArraySort>(smtutil::SortProvider::uintSort, smtutil::SortProvider::uintSort)}
+	};
+
+	if (_allStorages)
+	{
+		vector<string> memberNames;
+		vector<SortPointer> memberSorts;
+		for (auto contract: _contracts)
+		{
+			string suffix = contractSuffix(*contract);
+
+			// z3 doesn't like empty tuples, so if the contract has 0
+			// state vars we can't put it there.
+			auto stateVars = SMTEncoder::stateVariablesIncludingInheritedAndPrivate(*contract);
+			if (stateVars.empty())
+				continue;
+
+			auto names = applyMap(stateVars, [&](auto var) {
+				return var->name() + "_" + to_string(var->id()) + suffix;
+			});
+			auto sorts = applyMap(stateVars, [](auto var) { return smtSortAbstractFunction(*var->type()); });
+
+			string name = "storage" + suffix;
+			auto storageTuple = make_shared<smtutil::TupleSort>(
+				name + "_type", names, sorts
+			);
+
+			auto storageSort = make_shared<smtutil::ArraySort>(
+				smtSort(*TypeProvider::address()),
+				storageTuple
+			);
+
+			memberNames.emplace_back(name);
+			memberSorts.emplace_back(storageSort);
+		}
+
+		stateMembers.emplace(
+			"isActive",
+			make_shared<smtutil::ArraySort>(smtSort(*TypeProvider::address()), smtutil::SortProvider::boolSort)
+		);
+		stateMembers.emplace(
+			"storage",
+			make_shared<smtutil::TupleSort>(
+				"storage_type", memberNames, memberSorts
+			)
+		);
+	}
+
+	m_state = make_unique<BlockchainVariable>(
+		"state",
+		std::move(stateMembers),
+		m_context
+	);
+}
+
+void SymbolicState::buildABIFunctions(set<FunctionCall const*, ASTCompareByID<FunctionCall>> const& _abiFunctions)
 {
 	map<string, SortPointer> functions;
 
diff --git a/libsolidity/formal/SymbolicState.h b/libsolidity/formal/SymbolicState.h
index 45c129c1b1..7fe5b028d6 100644
--- a/libsolidity/formal/SymbolicState.h
+++ b/libsolidity/formal/SymbolicState.h
@@ -62,7 +62,8 @@ class BlockchainVariable
  * - this (the address of the currently executing contract)
  * - state, represented as a tuple of:
  *   - balances
- *   - TODO: potentially storage of contracts
+ *   - array of address => bool representing whether an address is used by a contract
+ *   - storage of contracts
  * - block and transaction properties, represented as a tuple of:
  *   - blockhash
  *   - block basefee
@@ -99,29 +100,41 @@ class SymbolicState
 	/// @returns the symbolic value of the currently executing contract's address.
 	smtutil::Expression thisAddress() const { return m_thisAddress.currentValue(); }
 	smtutil::Expression thisAddress(unsigned _idx) const { return m_thisAddress.valueAtIndex(_idx); }
+	smtutil::Expression newThisAddress() { return m_thisAddress.increaseIndex(); }
 	smtutil::SortPointer const& thisAddressSort() const { return m_thisAddress.sort(); }
 	//@}
 
 	/// Blockchain state.
 	//@{
-	smtutil::Expression state() const { return m_state.value(); }
-	smtutil::Expression state(unsigned _idx) const { return m_state.value(_idx); }
-	smtutil::SortPointer const& stateSort() const { return m_state.sort(); }
-	void newState() { m_state.newVar(); }
+	smtutil::Expression state() const { solAssert(m_state, ""); return m_state->value(); }
+	smtutil::Expression state(unsigned _idx) const { solAssert(m_state, ""); return m_state->value(_idx); }
+	smtutil::SortPointer const& stateSort() const { solAssert(m_state, ""); return m_state->sort(); }
+	void newState() { solAssert(m_state, ""); m_state->newVar(); }
 
 	void newBalances();
+
+	/// Balance.
 	/// @returns the symbolic balances.
 	smtutil::Expression balances() const;
 	/// @returns the symbolic balance of address `this`.
 	smtutil::Expression balance() const;
 	/// @returns the symbolic balance of an address.
 	smtutil::Expression balance(smtutil::Expression _address) const;
-
 	/// Transfer _value from _from to _to.
 	void transfer(smtutil::Expression _from, smtutil::Expression _to, smtutil::Expression _value);
 
 	/// Adds _value to _account's balance.
 	void addBalance(smtutil::Expression _account, smtutil::Expression _value);
+
+	/// Storage.
+	smtutil::Expression storage(ContractDefinition const& _contract) const;
+	smtutil::Expression storage(ContractDefinition const& _contract, smtutil::Expression _address) const;
+	smtutil::Expression addressActive(smtutil::Expression _address) const;
+	void setAddressActive(smtutil::Expression _address, bool _active);
+
+	void newStorage();
+	void writeStateVars(ContractDefinition const& _contract, smtutil::Expression _address);
+	void readStateVars(ContractDefinition const& _contract, smtutil::Expression _address);
 	//@}
 
 	/// Transaction data.
@@ -149,11 +162,15 @@ class SymbolicState
 	smtutil::Expression cryptoFunction(std::string const& _member) const { return m_crypto.member(_member); }
 	//@}
 
+	/// Calls the internal methods that build
+	/// - the symbolic ABI functions based on the abi.* calls
+	///   in _source and referenced sources.
+	/// - the symbolic storages for all contracts in _source and
+	///   referenced sources.
+	void prepareForSourceUnit(SourceUnit const& _source, bool _storage);
+
 	/// ABI functions.
 	//@{
-	/// Calls the internal methods that build the symbolic ABI functions
-	/// based on the abi.* calls in _source and referenced sources.
-	void prepareForSourceUnit(SourceUnit const& _source);
 	smtutil::Expression abiFunction(FunctionCall const* _funCall);
 	using SymbolicABIFunction = std::tuple<
 		std::string,
@@ -169,8 +186,15 @@ class SymbolicState
 	//@}
 
 private:
+	std::string contractSuffix(ContractDefinition const& _contract) const;
+	std::string contractStorageKey(ContractDefinition const& _contract) const;
+	std::string stateVarStorageKey(VariableDeclaration const& _var, ContractDefinition const& _contract) const;
+
+	/// Builds state.storage based on _contracts.
+	void buildState(std::set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> const& _contracts, bool _allStorages);
+
 	/// Builds m_abi based on the abi.* calls _abiFunctions.
-	void buildABIFunctions(std::set<FunctionCall const*> const& _abiFunctions);
+	void buildABIFunctions(std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> const& _abiFunctions);
 
 	EncodingContext& m_context;
 
@@ -186,11 +210,14 @@ class SymbolicState
 		m_context
 	};
 
-	BlockchainVariable m_state{
-		"state",
-		{{"balances", std::make_shared<smtutil::ArraySort>(smtutil::SortProvider::uintSort, smtutil::SortProvider::uintSort)}},
-		m_context
-	};
+	/// m_state is a tuple of
+	/// - balances: array of address to balance of address.
+	/// - isActive: array of address to Boolean, where element is true iff address is used.
+	/// - storage: tuple containing the storage of every contract, where
+	/// each element of the tuple represents a contract,
+	/// and is defined by an array where the index is the contract's address
+	/// and the element is a tuple containing the state variables of that contract.
+	std::unique_ptr<BlockchainVariable> m_state;
 
 	BlockchainVariable m_tx{
 		"tx",
diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
index d40b51cea4..ccabebcc3b 100644
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ b/libsolidity/formal/SymbolicTypes.cpp
@@ -618,4 +618,26 @@ optional<smtutil::Expression> symbolicTypeConversion(frontend::Type const* _from
 	return std::nullopt;
 }
 
+smtutil::Expression member(smtutil::Expression const& _tuple, string const& _member)
+{
+	TupleSort const& _sort = dynamic_cast<TupleSort const&>(*_tuple.sort);
+	return smtutil::Expression::tuple_get(
+		_tuple,
+		_sort.memberToIndex.at(_member)
+	);
+}
+
+smtutil::Expression assignMember(smtutil::Expression const _tuple, map<string, smtutil::Expression> const& _values)
+{
+	TupleSort const& _sort = dynamic_cast<TupleSort const&>(*_tuple.sort);
+	vector<smtutil::Expression> args;
+	for (auto const& m: _sort.members)
+		if (auto* value = util::valueOrNullptr(_values, m))
+			args.emplace_back(*value);
+		else
+			args.emplace_back(member(_tuple, m));
+	auto sortExpr = smtutil::Expression(make_shared<smtutil::SortSort>(_tuple.sort), _tuple.name);
+	return smtutil::Expression::tuple_constructor(sortExpr, args);
+}
+
 }
diff --git a/libsolidity/formal/SymbolicTypes.h b/libsolidity/formal/SymbolicTypes.h
index 312e8581a9..747e27b7e3 100644
--- a/libsolidity/formal/SymbolicTypes.h
+++ b/libsolidity/formal/SymbolicTypes.h
@@ -82,4 +82,8 @@ void setSymbolicUnknownValue(smtutil::Expression _expr, frontend::Type const* _t
 smtutil::Expression symbolicUnknownConstraints(smtutil::Expression _expr, frontend::Type const* _type);
 
 std::optional<smtutil::Expression> symbolicTypeConversion(frontend::Type const* _from, frontend::Type const* _to);
+
+smtutil::Expression member(smtutil::Expression const& _tuple, std::string const& _member);
+smtutil::Expression assignMember(smtutil::Expression const _tuple, std::map<std::string, smtutil::Expression> const& _values);
+
 }
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 27fa1c9896..b08e8fbf6f 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -445,7 +445,7 @@ std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
 
 std::optional<Json::Value> checkModelCheckerSettingsKeys(Json::Value const& _input)
 {
-	static set<string> keys{"contracts", "divModNoSlacks", "engine", "invariants", "showUnproved", "solvers", "targets", "timeout"};
+	static set<string> keys{"contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "showUnproved", "solvers", "targets", "timeout"};
 	return checkKeys(_input, keys, "modelChecker");
 }
 
@@ -1016,6 +1016,16 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.modelCheckerSettings.engine = *engine;
 	}
 
+	if (modelCheckerSettings.isMember("extCalls"))
+	{
+		if (!modelCheckerSettings["extCalls"].isString())
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.extCalls must be a string.");
+		std::optional<ModelCheckerExtCalls> extCalls = ModelCheckerExtCalls::fromString(modelCheckerSettings["extCalls"].asString());
+		if (!extCalls)
+			return formatFatalError(Error::Type::JSONError, "Invalid model checker extCalls requested.");
+		ret.modelCheckerSettings.externalCalls = *extCalls;
+	}
+
 	if (modelCheckerSettings.isMember("invariants"))
 	{
 		auto const& invariantsArray = modelCheckerSettings["invariants"];
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 37ceca1d40..eb03831beb 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -69,6 +69,7 @@ static string const g_strMetadataLiteral = "metadata-literal";
 static string const g_strModelCheckerContracts = "model-checker-contracts";
 static string const g_strModelCheckerDivModNoSlacks = "model-checker-div-mod-no-slacks";
 static string const g_strModelCheckerEngine = "model-checker-engine";
+static string const g_strModelCheckerExtCalls = "model-checker-ext-calls";
 static string const g_strModelCheckerInvariants = "model-checker-invariants";
 static string const g_strModelCheckerShowUnproved = "model-checker-show-unproved";
 static string const g_strModelCheckerSolvers = "model-checker-solvers";
@@ -831,6 +832,12 @@ General Information)").c_str(),
 			po::value<string>()->value_name("all,bmc,chc,none")->default_value("none"),
 			"Select model checker engine."
 		)
+		(
+			g_strModelCheckerExtCalls.c_str(),
+			po::value<string>()->value_name("untrusted,trusted")->default_value("untrusted"),
+			"Select whether to assume (trusted) that external calls always invoke"
+			" the code given by the type of the contract, if that code is available."
+		)
 		(
 			g_strModelCheckerInvariants.c_str(),
 			po::value<string>()->value_name("default,all,contract,reentrancy")->default_value("default"),
@@ -1289,6 +1296,15 @@ void CommandLineParser::processArgs()
 		m_options.modelChecker.settings.engine = *engine;
 	}
 
+	if (m_args.count(g_strModelCheckerExtCalls))
+	{
+		string mode = m_args[g_strModelCheckerExtCalls].as<string>();
+		optional<ModelCheckerExtCalls> extCallsMode = ModelCheckerExtCalls::fromString(mode);
+		if (!extCallsMode)
+			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerExtCalls + ": " + mode);
+		m_options.modelChecker.settings.externalCalls = *extCallsMode;
+	}
+
 	if (m_args.count(g_strModelCheckerInvariants))
 	{
 		string invsStr = m_args[g_strModelCheckerInvariants].as<string>();
@@ -1327,6 +1343,7 @@ void CommandLineParser::processArgs()
 		m_args.count(g_strModelCheckerContracts) ||
 		m_args.count(g_strModelCheckerDivModNoSlacks) ||
 		m_args.count(g_strModelCheckerEngine) ||
+		m_args.count(g_strModelCheckerExtCalls) ||
 		m_args.count(g_strModelCheckerInvariants) ||
 		m_args.count(g_strModelCheckerShowUnproved) ||
 		m_args.count(g_strModelCheckerSolvers) ||
diff --git a/test/cmdlineTests/model_checker_contracts_inexistent_contract/err b/test/cmdlineTests/model_checker_contracts_inexistent_contract/err
index 6326537e92..00b97763f3 100644
--- a/test/cmdlineTests/model_checker_contracts_inexistent_contract/err
+++ b/test/cmdlineTests/model_checker_contracts_inexistent_contract/err
@@ -1 +1,27 @@
 Warning: Requested contract "C" does not exist in source "model_checker_contracts_inexistent_contract/input.sol".
+
+Warning: CHC: Assertion violation happens here.
+Counterexample:
+
+x = 0
+
+Transaction trace:
+B.constructor()
+B.f(0)
+ --> model_checker_contracts_inexistent_contract/input.sol:5:3:
+  |
+5 | 		assert(x > 0);
+  | 		^^^^^^^^^^^^^
+
+Warning: CHC: Assertion violation happens here.
+Counterexample:
+
+y = 0
+
+Transaction trace:
+A.constructor()
+A.g(0)
+  --> model_checker_contracts_inexistent_contract/input.sol:10:3:
+   |
+10 | 		assert(y > 0);
+   | 		^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_contracts_only_one/err b/test/cmdlineTests/model_checker_contracts_only_one/err
index 9c8ade6931..2088e19c7a 100644
--- a/test/cmdlineTests/model_checker_contracts_only_one/err
+++ b/test/cmdlineTests/model_checker_contracts_only_one/err
@@ -4,7 +4,7 @@ Counterexample:
 x = 0
 
 Transaction trace:
-A.constructor()
+B.constructor()
 B.f(0)
  --> model_checker_contracts_only_one/input.sol:5:3:
   |
diff --git a/test/cmdlineTests/model_checker_ext_calls_empty_arg/args b/test/cmdlineTests/model_checker_ext_calls_empty_arg/args
new file mode 100644
index 0000000000..b0c065ef7b
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_empty_arg/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-ext-calls
diff --git a/test/cmdlineTests/model_checker_ext_calls_empty_arg/err b/test/cmdlineTests/model_checker_ext_calls_empty_arg/err
new file mode 100644
index 0000000000..7d7481c80e
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_empty_arg/err
@@ -0,0 +1 @@
+No input files given. If you wish to use the standard input please specify "-" explicitly.
diff --git a/test/cmdlineTests/model_checker_ext_calls_empty_arg/exit b/test/cmdlineTests/model_checker_ext_calls_empty_arg/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_empty_arg/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/model_checker_ext_calls_empty_arg/input.sol b/test/cmdlineTests/model_checker_ext_calls_empty_arg/input.sol
new file mode 100644
index 0000000000..bd341cea60
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_empty_arg/input.sol
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract Ext {
+	function f() public view returns (uint) {
+		return 42;
+	}
+}
+
+contract test {
+	function g(Ext e) public view {
+		uint x = e.f();
+		assert(x == 42);
+	}
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/args b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/args
new file mode 100644
index 0000000000..a6240ee19f
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-ext-calls trusted
diff --git a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/err b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/err
new file mode 100644
index 0000000000..a07e1575d1
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/err
@@ -0,0 +1,5 @@
+Warning: Function state mutability can be restricted to pure
+ --> model_checker_ext_calls_trusted_chc/input.sol:5:2:
+  |
+5 | 	function f() public view returns (uint) {
+  | 	^ (Relevant source part starts here and spans across multiple lines).
diff --git a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/input.sol b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/input.sol
new file mode 100644
index 0000000000..bd341cea60
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/input.sol
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract Ext {
+	function f() public view returns (uint) {
+		return 42;
+	}
+}
+
+contract test {
+	function g(Ext e) public view {
+		uint x = e.f();
+		assert(x == 42);
+	}
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/args b/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/args
new file mode 100644
index 0000000000..e249f02503
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-ext-calls untrusted
diff --git a/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/err b/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/err
new file mode 100644
index 0000000000..b06333e43b
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/err
@@ -0,0 +1,14 @@
+Warning: CHC: Assertion violation happens here.
+Counterexample:
+
+e = 0
+x = 1
+
+Transaction trace:
+test.constructor()
+test.g(0)
+    e.f() -- untrusted external call
+  --> model_checker_ext_calls_untrusted_chc/input.sol:11:3:
+   |
+11 | 		assert(x == 0);
+   | 		^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/input.sol b/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/input.sol
new file mode 100644
index 0000000000..0d28d1c18b
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_untrusted_chc/input.sol
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+abstract contract Ext {
+	function f() virtual public view returns (uint);
+}
+
+contract test {
+	function g(Ext e) public view {
+		uint x = e.f();
+		assert(x == 0);
+	}
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/args b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/args
new file mode 100644
index 0000000000..478aa5e1d3
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-ext-calls what
diff --git a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/err b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/err
new file mode 100644
index 0000000000..746a0b5252
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/err
@@ -0,0 +1 @@
+Invalid option for --model-checker-ext-calls: what
diff --git a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/exit b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/input.sol b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/input.sol
new file mode 100644
index 0000000000..bd341cea60
--- /dev/null
+++ b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/input.sol
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract Ext {
+	function f() public view returns (uint) {
+		return 42;
+	}
+}
+
+contract test {
+	function g(Ext e) public view {
+		uint x = e.f();
+		assert(x == 42);
+	}
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json b/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json
index e3714e8e68..7ff30950c1 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_inexistent_contract/output.json
@@ -10,6 +10,74 @@
             "message": "Requested contract \"C\" does not exist in source \"Source\".",
             "severity": "warning",
             "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
+Counterexample:
+
+y = 0
+
+Transaction trace:
+B.constructor()
+B.g(0)
+ --> Source:5:7:
+  |
+5 | \t\t\t\t\t\tassert(y > 0);
+  | \t\t\t\t\t\t^^^^^^^^^^^^^
+
+",
+            "message": "CHC: Assertion violation happens here.
+Counterexample:
+
+y = 0
+
+Transaction trace:
+B.constructor()
+B.g(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 137,
+                "file": "Source",
+                "start": 124
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
+Counterexample:
+
+x = 0
+
+Transaction trace:
+A.constructor()
+A.f(0)
+  --> Source:10:7:
+   |
+10 | \t\t\t\t\t\tassert(x > 0);
+   | \t\t\t\t\t\t^^^^^^^^^^^^^
+
+",
+            "message": "CHC: Assertion violation happens here.
+Counterexample:
+
+x = 0
+
+Transaction trace:
+A.constructor()
+A.f(0)",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 231,
+                "file": "Source",
+                "start": 218
+            },
+            "type": "Warning"
         }
     ],
     "sources":
diff --git a/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json b/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json
index a875665817..cb18875e1b 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_multi_source/output.json
@@ -10,7 +10,7 @@ Counterexample:
 y = 0
 
 Transaction trace:
-A.constructor()
+B.constructor()
 B.g(0)
  --> Source:5:7:
   |
@@ -24,7 +24,7 @@ Counterexample:
 y = 0
 
 Transaction trace:
-A.constructor()
+B.constructor()
 B.g(0)",
             "severity": "warning",
             "sourceLocation":
diff --git a/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json b/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json
index 57c4f10fac..b4bfd66b84 100644
--- a/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json
+++ b/test/cmdlineTests/standard_model_checker_contracts_only_one/output.json
@@ -10,7 +10,7 @@ Counterexample:
 y = 0
 
 Transaction trace:
-A.constructor()
+B.constructor()
 B.g(0)
  --> Source:5:7:
   |
@@ -24,7 +24,7 @@ Counterexample:
 y = 0
 
 Transaction trace:
-A.constructor()
+B.constructor()
 B.g(0)",
             "severity": "warning",
             "sourceLocation":
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/input.json b/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/input.json
new file mode 100644
index 0000000000..073516ddbd
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/input.json
@@ -0,0 +1,30 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;
+					contract Ext {
+						function f() public view returns (uint) {
+							return 42;
+						}
+					}
+
+					contract test {
+						function g(Ext e) public view {
+							uint x = e.f();
+							assert(x == 42);
+						}
+					}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"extCalls": ""
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/output.json
new file mode 100644
index 0000000000..4e214a37b2
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_empty_arg/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid model checker extCalls requested.",
+            "message": "Invalid model checker extCalls requested.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/input.json b/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/input.json
new file mode 100644
index 0000000000..a03b77f2bb
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/input.json
@@ -0,0 +1,30 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;
+					contract Ext {
+						function f() public view returns (uint) {
+							return 42;
+						}
+					}
+
+					contract test {
+						function g(Ext e) public view {
+							uint x = e.f();
+							assert(x == 42);
+						}
+					}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"extCalls": "trusted"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json
new file mode 100644
index 0000000000..93d73d1c46
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json
@@ -0,0 +1,32 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2018",
+            "formattedMessage": "Warning: Function state mutability can be restricted to pure
+ --> A:4:7:
+  |
+4 | \t\t\t\t\t\tfunction f() public view returns (uint) {
+  | \t\t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
+
+",
+            "message": "Function state mutability can be restricted to pure",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 152,
+                "file": "A",
+                "start": 85
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/input.json b/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/input.json
new file mode 100644
index 0000000000..9fadd08fab
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/input.json
@@ -0,0 +1,28 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;
+					abstract contract Ext {
+						function f() virtual public view returns (uint);
+					}
+
+					contract test {
+						function g(Ext e) public view {
+							uint x = e.f();
+							assert(x == 0);
+						}
+					}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"extCalls": "untrusted"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/output.json
new file mode 100644
index 0000000000..c6b072a858
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_untrusted_chc/output.json
@@ -0,0 +1,50 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6328",
+            "formattedMessage": "Warning: CHC: Assertion violation happens here.
+Counterexample:
+
+e = 0
+x = 1
+
+Transaction trace:
+test.constructor()
+test.g(0)
+    e.f() -- untrusted external call
+  --> A:10:8:
+   |
+10 | \t\t\t\t\t\t\tassert(x == 0);
+   | \t\t\t\t\t\t\t^^^^^^^^^^^^^^
+
+",
+            "message": "CHC: Assertion violation happens here.
+Counterexample:
+
+e = 0
+x = 1
+
+Transaction trace:
+test.constructor()
+test.g(0)
+    e.f() -- untrusted external call",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 254,
+                "file": "A",
+                "start": 240
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/input.json b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/input.json
new file mode 100644
index 0000000000..15113c5ad8
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/input.json
@@ -0,0 +1,30 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;
+					contract Ext {
+						function f() public view returns (uint) {
+							return 42;
+						}
+					}
+
+					contract test {
+						function g(Ext e) public view {
+							uint x = e.f();
+							assert(x == 42);
+						}
+					}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"extCalls": "what"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/output.json
new file mode 100644
index 0000000000..4e214a37b2
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_1/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid model checker extCalls requested.",
+            "message": "Invalid model checker extCalls requested.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/input.json b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/input.json
new file mode 100644
index 0000000000..cda245e7ff
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/input.json
@@ -0,0 +1,30 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;
+					contract Ext {
+						function f() public view returns (uint) {
+							return 42;
+						}
+					}
+
+					contract test {
+						function g(Ext e) public view {
+							uint x = e.f();
+							assert(x == 42);
+						}
+					}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"extCalls": 2
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/output.json
new file mode 100644
index 0000000000..e869637ed1
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_wrong_arg_2/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.extCalls must be a string.",
+            "message": "settings.modelChecker.extCalls must be a string.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
index fa8726d55e..85a221d4cd 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
@@ -3,14 +3,41 @@
     {
         "smtlib2queries":
         {
-            "0x0ebc730de380833af1e52ed063befb32994bc637929c942b7fd089b7cd3ba64e": "(set-logic HORN)
-
+            "0x75b95497d56c30e254a59358d72ddd4e78f9e90db621cfe677e85d05b2252411": "(set-option :produce-models true)
+(set-logic ALL)
+(declare-fun |x_3_3| () Int)
+(declare-fun |error_0| () Int)
+(declare-fun |this_0| () Int)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-fun |tx_0| () |tx_type|)
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-fun |crypto_0| () |crypto_type|)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-fun |abi_0| () |abi_type|)
 (declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |state_0| () |state_type|)
+(declare-fun |x_3_4| () Int)
+(declare-fun |x_3_0| () Int)
+(declare-fun |expr_7_0| () Int)
+(declare-fun |expr_8_0| () Int)
+(declare-fun |expr_9_1| () Bool)
+
+(assert (and (and (and true true) (and (= expr_9_1 (> expr_7_0 expr_8_0)) (and (=> (and true true) true) (and (= expr_8_0 0) (and (=> (and true true) (and (>= expr_7_0 0) (<= expr_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_7_0 x_3_0) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3017696395)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 179)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 222)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 100)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 139)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))) (not expr_9_1)))
+(declare-const |EVALEXPR_0| Int)
+(assert (= |EVALEXPR_0| x_3_0))
+(check-sat)
+(get-value (|EVALEXPR_0| ))
+",
+            "0xfb06d3f02a20bd362abded9ab80638bdc9dd43ccbf644517f3006206c0c47f67": "(set-logic HORN)
+
 (declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
 (declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
 (declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
 (declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
 (declare-fun |interface_0_C_14_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
 (declare-fun |nondet_interface_1_C_14_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
 (declare-fun |summary_constructor_2_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
@@ -97,7 +124,7 @@
 (declare-fun |implicit_constructor_entry_13_C_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
 (assert
 (forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
-(=> (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
 
 
 (assert
@@ -124,34 +151,7 @@
 (assert
 (forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
 (=> error_target_3_0 false)))
-(check-sat)",
-            "0xcb822e6220a39244d26887a0fa6f62b06718359056555679fb06dd7dff18bb86": "(set-option :produce-models true)
-(set-logic ALL)
-(declare-fun |x_3_3| () Int)
-(declare-fun |error_0| () Int)
-(declare-fun |this_0| () Int)
-(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
-(declare-fun |state_0| () |state_type|)
-(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
-(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
-(declare-fun |tx_0| () |tx_type|)
-(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
-(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
-(declare-fun |crypto_0| () |crypto_type|)
-(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
-(declare-fun |abi_0| () |abi_type|)
-(declare-fun |x_3_4| () Int)
-(declare-fun |x_3_0| () Int)
-(declare-fun |expr_7_0| () Int)
-(declare-fun |expr_8_0| () Int)
-(declare-fun |expr_9_1| () Bool)
-
-(assert (and (and (and true true) (and (= expr_9_1 (> expr_7_0 expr_8_0)) (and (=> (and true true) true) (and (= expr_8_0 0) (and (=> (and true true) (and (>= expr_7_0 0) (<= expr_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_7_0 x_3_0) (and (and (>= x_3_0 0) (<= x_3_0 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 3017696395)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 179)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 222)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 100)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 139)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true)))))))) (not expr_9_1)))
-(declare-const |EVALEXPR_0| Int)
-(assert (= |EVALEXPR_0| x_3_0))
-(check-sat)
-(get-value (|EVALEXPR_0| ))
-"
+(check-sat)"
         }
     },
     "errors":
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index e3e52491dd..93590994a0 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -33,6 +33,12 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	if (!contract.empty())
 		m_modelCheckerSettings.contracts.contracts[""] = {contract};
 
+	auto extCallsMode = ModelCheckerExtCalls::fromString(m_reader.stringSetting("SMTExtCalls", "untrusted"));
+	if (extCallsMode)
+		m_modelCheckerSettings.externalCalls = *extCallsMode;
+	else
+		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT external calls mode."));
+
 	auto const& showUnproved = m_reader.stringSetting("SMTShowUnproved", "yes");
 	if (showUnproved == "no")
 		m_modelCheckerSettings.showUnproved = false;
@@ -51,8 +57,13 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	m_modelCheckerSettings.solvers &= ModelChecker::availableSolvers();
 
 	/// Underflow and Overflow are not enabled by default for Solidity >=0.8.7,
-	/// so we explicitly enable all targets for the tests.
-	m_modelCheckerSettings.targets = ModelCheckerTargets::All();
+	/// so we explicitly enable all targets for the tests,
+	/// if the targets were not explicitly set by the test.
+	auto targets = ModelCheckerTargets::fromString(m_reader.stringSetting("SMTTargets", "all"));
+	if (targets)
+		m_modelCheckerSettings.targets = *targets;
+	else
+		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT targets."));
 
 	auto engine = ModelCheckerEngine::fromString(m_reader.stringSetting("SMTEngine", "all"));
 	if (engine)
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
index ddda215df8..7950c86125 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
@@ -22,4 +22,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(s1.arr.length <= 0)\n!(s2.arr.length <= 0)\n(((s2.arr[0].length + ((- 1) * s1.arr[0].length)) <= 0) && ((s1.arr[0].length + ((- 1) * s2.arr[0].length)) <= 0))\n
+// Info 1180: Contract invariant(s) for :C:\n!(s1.arr.length <= 0)\n!(s2.arr.length <= 0)\n(((s1.arr[0].length + ((- 1) * s2.arr[0].length)) <= 0) && ((s2.arr[0].length + ((- 1) * s1.arr[0].length)) <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
index 7a7db383b2..7af3af40d9 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
@@ -31,4 +31,4 @@ contract C {
 // Warning 6328: (349-375): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
 // Warning 6328: (379-402): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
 // Warning 6328: (406-432): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 7)\n!(arr.length <= 8)\n
+// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 5)\n!(arr.length <= 7)\n!(arr.length <= 8)\n
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
index 0d16306b72..aea10a3769 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
@@ -18,5 +18,6 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreOS: macos
+// SMTIgnoreCex: yes
 // ----
 // Warning 6328: (199-229): CHC: Assertion violation happens here.\nCounterexample:\nb = [1]\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol
index bbd5589a48..34b439e3a6 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol
@@ -20,5 +20,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
 // Warning 6328: (362-420): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol b/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol
index 3f5096a3b5..936ad17037 100644
--- a/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol
+++ b/test/libsolidity/smtCheckerTests/complex/slither/external_function.sol
@@ -83,6 +83,6 @@ contract InternalCall {
 // Warning 2018: (1111-1173): Function state mutability can be restricted to pure
 // Warning 2018: (1179-1241): Function state mutability can be restricted to pure
 // Warning 2018: (1247-1309): Function state mutability can be restricted to pure
-// Warning 4588: (681-716): Assertion checker does not yet implement this type of function call.
-// Warning 4588: (854-886): Assertion checker does not yet implement this type of function call.
+// Warning 8729: (681-716): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
+// Warning 8729: (854-886): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
 // Warning 5729: (1370-1375): BMC does not yet implement this type of function call.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_trusted.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_trusted.sol
new file mode 100644
index 0000000000..81ddc515e1
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_trusted.sol
@@ -0,0 +1,18 @@
+contract D {
+	uint x;
+	function f() public view returns (uint) { return x; }
+}
+
+contract C {
+	function g() public {
+		D d = new D();
+		uint y = d.f();
+		assert(y == 0); // should fail in BMC
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTExtCalls: trusted
+// ----
+// Warning 8729: (124-131): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
+// Warning 4661: (153-167): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_untrusted.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_untrusted.sol
new file mode 100644
index 0000000000..f69a8d6c72
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_bmc_untrusted.sol
@@ -0,0 +1,17 @@
+contract D {
+	uint x;
+	function f() public view returns (uint) { return x; }
+}
+
+contract C {
+	function g() public {
+		D d = new D();
+		uint y = d.f();
+		assert(y == 0); // should fail in ext calls untrusted mode
+	}
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Warning 8729: (124-131): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
+// Warning 4661: (153-167): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol
new file mode 100644
index 0000000000..388b0b0db8
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol
@@ -0,0 +1,16 @@
+contract D {
+	uint x;
+	function f() public view returns (uint) { return x; }
+}
+
+contract C {
+	function g() public {
+		D d = new D();
+		uint y = d.f();
+		assert(y == 0); // should hold in ext calls trusted mode
+	}
+}
+// ====
+// SMTEngine: all
+// SMTExtCalls: trusted
+// ----
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol
new file mode 100644
index 0000000000..cf43dbda20
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol
@@ -0,0 +1,19 @@
+contract D {
+	uint x;
+}
+
+contract C {
+	function f() public {
+		D d1 = new D();
+		D d2 = new D();
+
+		assert(d1 != d2); // should hold in ext calls trusted mode
+		assert(address(this) != address(d1)); // should hold in ext calls trusted mode
+		assert(address(this) != address(d2)); // should hold in ext calls trusted mode
+	}
+}
+// ====
+// SMTEngine: all
+// SMTExtCalls: trusted
+// ----
+// Info 1180: Contract invariant(s) for :C:\n(:var 0).isActive[address(this)]\n
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
new file mode 100644
index 0000000000..ddd4b41e68
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
@@ -0,0 +1,32 @@
+contract D {
+	uint x;
+	function inc() public { ++x; }
+	function f() public view returns (uint) { return x; }
+}
+
+contract C {
+	function f() public {
+		D d = new D();
+		assert(d.f() == 0); // should hold
+		d.inc();
+		assert(d.f() == 1); // should hold
+		d = new D();
+		assert(d.f() == 0); // should hold
+		assert(d.f() == 1); // should fail
+	}
+}
+// ====
+// SMTEngine: all
+// SMTExtCalls: trusted
+// SMTIgnoreOS: macos
+// ----
+// Warning 4984: (47-50): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 6328: (167-185): CHC: Assertion violation might happen here.
+// Warning 6328: (215-233): CHC: Assertion violation might happen here.
+// Warning 6328: (267-285): CHC: Assertion violation might happen here.
+// Warning 6328: (304-322): CHC: Assertion violation might happen here.
+// Warning 2661: (47-50): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4661: (167-185): BMC: Assertion violation happens here.
+// Warning 4661: (215-233): BMC: Assertion violation happens here.
+// Warning 4661: (267-285): BMC: Assertion violation happens here.
+// Warning 4661: (304-322): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol
new file mode 100644
index 0000000000..b2aa7ac984
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol
@@ -0,0 +1,17 @@
+contract D {
+	uint x;
+}
+
+contract C {
+	uint y;
+	function g() public {
+		D d = new D();
+		assert(y == 0); // should hold
+	}
+}
+// ====
+// SMTEngine: all
+// SMTExtCalls: trusted
+// ----
+// Warning 2072: (72-75): Unused local variable.
+// Info 1180: Contract invariant(s) for :C:\n(y <= 0)\n
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol
new file mode 100644
index 0000000000..4b3367b11c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol
@@ -0,0 +1,24 @@
+contract D {
+	uint x;
+	function inc() public { ++x; }
+	function f() public view returns (uint) { return x; }
+}
+
+contract C {
+	D d;
+	constructor() {
+		d = new D();
+		assert(d.f() == 0); // should hold
+	}
+	function g() public view {
+		assert(d.f() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: all
+// SMTExtCalls: trusted
+// SMTIgnoreOS: macos
+// ----
+// Warning 4984: (47-50): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 6328: (233-251): CHC: Assertion violation happens here.
+// Warning 2661: (47-50): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol
new file mode 100644
index 0000000000..66684df8c1
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol
@@ -0,0 +1,20 @@
+contract D {
+	uint x;
+	function f() public view returns (uint) { return x; }
+}
+
+contract C {
+	D d;
+	constructor() {
+		d = new D();
+		assert(d.f() == 0); // should hold
+	}
+	function g() public view {
+		assert(d.f() == 0); // should hold
+	}
+}
+// ====
+// SMTEngine: all
+// SMTExtCalls: trusted
+// ----
+// Info 1180: Contract invariant(s) for :C:\n((:var 1).storage.storage_D_12[d].x_3_D_12 <= 0)\nReentrancy property(ies) for :D:\n((x' <= 0) || !(x <= 0))\n
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_3.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_3.sol
new file mode 100644
index 0000000000..260909b87a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_3.sol
@@ -0,0 +1,21 @@
+contract D {
+	uint x;
+	function s(uint _x) public { x = _x; }
+	function f() public view returns (uint) { return x; }
+}
+
+contract C {
+	D d;
+	constructor() {
+		d = new D();
+	}
+	function g() public view {
+		assert(d.f() == 0); // should fail
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: all
+// SMTExtCalls: trusted
+// ----
+// Warning 6328: (204-222): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_4.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_4.sol
new file mode 100644
index 0000000000..5bd27c3b82
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_4.sol
@@ -0,0 +1,20 @@
+contract D {
+	bool b;
+	function s() public { b = true; }
+	function f() public view returns (bool) { return b; }
+}
+
+contract C {
+	D d;
+	constructor() {
+		d = new D();
+	}
+	function g() public view {
+		assert(d.f()); // should fail
+	}
+}
+// ====
+// SMTEngine: all
+// SMTExtCalls: trusted
+// ----
+// Warning 6328: (199-212): CHC: Assertion violation happens here.\nCounterexample:\nd = (- 1)\n\nTransaction trace:\nC.constructor()\nState: d = (- 1)\nC.g()\n    D.f() -- trusted external call
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted.sol
new file mode 100644
index 0000000000..a28d462105
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted.sol
@@ -0,0 +1,17 @@
+contract D {
+	uint x;
+	function f() public view returns (uint) { return x; }
+}
+
+contract C {
+	function g() public {
+		D d = new D();
+		uint y = d.f();
+		assert(y == 0); // should fail in ext calls untrusted mode
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 8729: (124-131): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
+// Warning 6328: (153-167): CHC: Assertion violation happens here.\nCounterexample:\n\nd = 0\ny = 1\n\nTransaction trace:\nC.constructor()\nC.g()\n    d.f() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_addresses.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_addresses.sol
new file mode 100644
index 0000000000..c934e152b2
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_addresses.sol
@@ -0,0 +1,22 @@
+contract D {
+	uint x;
+}
+
+contract C {
+	function f() public {
+		D d1 = new D();
+		D d2 = new D();
+
+		assert(d1 != d2); // should fail in ext calls untrusted mode
+		assert(address(this) != address(d1)); // should fail in ext calls untrusted mode
+		assert(address(this) != address(d2)); // should fail in ext calls untrusted mode
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 8729: (70-77): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
+// Warning 8729: (88-95): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
+// Warning 6328: (100-116): CHC: Assertion violation happens here.\nCounterexample:\n\nd1 = 0\nd2 = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (163-199): CHC: Assertion violation happens here.\nCounterexample:\n\nd1 = 21238\nd2 = 21238\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (246-282): CHC: Assertion violation happens here.\nCounterexample:\n\nd1 = 21238\nd2 = 21238\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_erase_storage_constraints.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_erase_storage_constraints.sol
new file mode 100644
index 0000000000..be18b33f63
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_untrusted_erase_storage_constraints.sol
@@ -0,0 +1,17 @@
+contract D {
+	uint x;
+}
+
+contract C {
+	uint y;
+	function g() public {
+		D d = new D();
+		assert(y == 0); // should fail in ext calls untrusted mode
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 2072: (72-75): Unused local variable.
+// Warning 8729: (78-85): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
+// Warning 6328: (89-103): CHC: Assertion violation happens here.\nCounterexample:\ny = 1\nd = 0\n\nTransaction trace:\nC.constructor()\nState: y = 0\nC.g()
diff --git a/test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol b/test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol
new file mode 100644
index 0000000000..92195221e2
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol
@@ -0,0 +1,20 @@
+contract A {
+	constructor() payable {}
+}
+
+contract B {
+	function f() public payable {
+		require(address(this).balance == 100);
+		A a = new A{value: 50}();
+		assert(address(this).balance == 50); // should hold
+		assert(address(this).balance == 60); // should fail
+		assert(address(a).balance >= 50); // should hold
+		assert(address(a).balance == 50); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// ----
+// Warning 6328: (211-246): CHC: Assertion violation happens here.
+// Warning 6328: (316-348): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol
new file mode 100644
index 0000000000..7905d5b4fb
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol
@@ -0,0 +1,28 @@
+contract D {
+	constructor(uint _x) { x = _x; }
+	uint public x;
+}
+
+contract E {
+	constructor() { x = 2; }
+	uint public x;
+}
+
+contract C {
+	constructor() {
+		address d = address(new D(42));
+		assert(D(d).x() == 42); // should hold
+		assert(D(d).x() == 43); // should fail
+		uint y = E(d).x();
+		assert(y == 2); // should fail, it would still call D.x() == 42
+		assert(y == 42); // should hold, but fails due to false positive
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (231-253): CHC: Assertion violation happens here.
+// Warning 6328: (293-307): CHC: Assertion violation happens here.
+// Warning 6328: (359-374): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol
new file mode 100644
index 0000000000..25cccead47
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol
@@ -0,0 +1,25 @@
+contract D {
+	constructor(uint _x) { x = _x; }
+	function setD(uint _x) public { x = _x; }
+	uint public x;
+}
+
+contract C {
+	constructor() {
+		address d = address(new D(42));
+		assert(D(d).x() == 42); // should hold
+		assert(D(d).x() == 21); // should fail
+		d.call(abi.encodeCall(D.setD, (21)));
+		assert(D(d).x() == 21); // should hold, but false positive cus low level calls are not handled precisely
+		assert(D(d).x() == 42); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTIgnoreCex: yes
+// ----
+// Warning 9302: (257-293): Return value of low-level calls not used.
+// Warning 6328: (216-238): CHC: Assertion violation happens here.
+// Warning 6328: (297-319): CHC: Assertion violation happens here.
+// Warning 6328: (404-426): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol
new file mode 100644
index 0000000000..2dc5dd0fb8
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol
@@ -0,0 +1,28 @@
+contract D {
+	constructor(uint _x) { x = _x; }
+	uint public x;
+}
+
+contract E {
+	constructor() { x = 2; }
+	uint public x;
+}
+
+contract C {
+	function f() public {
+		address d = address(new D(42));
+		assert(D(d).x() == 42); // should hold
+		assert(D(d).x() == 43); // should fail
+		uint y = E(d).x();
+		assert(y == 2); // should fail, it would still call D.x() == 42
+		assert(y == 42); // should hold, but fails due to false positive
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (237-259): CHC: Assertion violation happens here.
+// Warning 6328: (299-313): CHC: Assertion violation happens here.
+// Warning 6328: (365-380): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol
new file mode 100644
index 0000000000..9c36bfc74f
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol
@@ -0,0 +1,25 @@
+contract D {
+	constructor(uint _x) { x = _x; }
+	function setD(uint _x) public { x = _x; }
+	uint public x;
+}
+
+contract C {
+	function f() public {
+		address d = address(new D(42));
+		assert(D(d).x() == 42); // should hold
+		assert(D(d).x() == 21); // should fail
+		d.call(abi.encodeCall(D.setD, (21)));
+		assert(D(d).x() == 21); // should hold, but false positive cus low level calls are not handled precisely
+		assert(D(d).x() == 42); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTIgnoreCex: yes
+// ----
+// Warning 9302: (263-299): Return value of low-level calls not used.
+// Warning 6328: (222-244): CHC: Assertion violation happens here.
+// Warning 6328: (303-325): CHC: Assertion violation happens here.
+// Warning 6328: (410-432): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol
new file mode 100644
index 0000000000..317fde003c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol
@@ -0,0 +1,29 @@
+contract D {
+	constructor(uint _x) { x = _x; }
+	function setD(uint _x) public { x = _x; }
+	uint public x;
+}
+
+contract C {
+	uint x;
+
+	function f() public {
+		x = 666;
+		address d = address(new D(42));
+		assert(D(d).x() == 42); // should hold
+		assert(D(d).x() == 21); // should fail
+		d.call(abi.encodeCall(D.setD, (21)));
+		assert(D(d).x() == 21); // should hold, but false positive cus low level calls are not handled precisely
+		assert(D(d).x() == 42); // should fail
+		assert(x == 666); // should hold, C's storage should not have been havoced
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTIgnoreCex: yes
+// ----
+// Warning 9302: (284-320): Return value of low-level calls not used.
+// Warning 6328: (243-265): CHC: Assertion violation happens here.
+// Warning 6328: (324-346): CHC: Assertion violation happens here.
+// Warning 6328: (431-453): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
index 87a9e22614..f0f844fff3 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
@@ -15,4 +15,4 @@ contract C {
 // Warning 2519: (106-112): This declaration shadows an existing declaration.
 // Warning 2072: (106-112): Unused local variable.
 // Warning 2072: (114-131): Unused local variable.
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
+// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && ((<errorCode> <= 0) || !(x <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol
new file mode 100644
index 0000000000..8c7b589d1a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol
@@ -0,0 +1,21 @@
+contract State {
+	function f(uint _x) public pure returns (uint) {
+		assert(_x < 100); // should fail
+		return _x;
+	}
+}
+contract C {
+	State s;
+	uint z = s.f(2);
+
+	function f() public view {
+		assert(z == 2); // should hold in trusted mode
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: all
+// SMTExtCalls: trusted
+// SMTIgnoreInv: yes
+// ----
+// Warning 6328: (69-85): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol
new file mode 100644
index 0000000000..a814227292
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol
@@ -0,0 +1,17 @@
+contract C {
+	uint z = this.g(2);
+
+	function g(uint _x) public pure returns (uint) {
+		assert(_x > 0); // should fail
+		return _x;
+	}
+
+	function f() public view {
+		assert(z == 2); // should hold
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6328: (87-101): CHC: Assertion violation happens here.\nCounterexample:\nz = 2\n_x = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: z = 2\nC.g(0)
+// Info 1180: Contract invariant(s) for :C:\n(!(z >= 3) && !(z <= 1))\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol
new file mode 100644
index 0000000000..8ff241e729
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol
@@ -0,0 +1,25 @@
+contract State {
+	function f(uint _x) public pure returns (uint) {
+		assert(_x < 100); // should fail
+		return _x;
+	}
+}
+contract C {
+	State s;
+	uint z;
+
+	constructor() {
+		z = s.f(2);
+	}
+
+	function f() public view {
+		assert(z == 2); // should hold in trusted mode
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: all
+// SMTExtCalls: trusted
+// ----
+// Warning 6328: (69-85): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
+// Info 1180: Contract invariant(s) for :C:\n(!(z >= 3) && !(z <= 1))\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
new file mode 100644
index 0000000000..b7a161ac93
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
@@ -0,0 +1,41 @@
+contract A {
+	uint x;
+	function setX(uint _x) public {
+		x = _x;
+	}
+	function getX() public view returns (uint) {
+		return x;
+	}
+}
+
+contract B {
+	A a;
+	constructor() {
+		a = new A();
+		assert(a.getX() == 0); // should hold
+	}
+	function g() public view {
+		assert(a.getX() == 0); // should fail because A.setX() can be called without B
+	}
+	function getX() public view returns (uint) {
+		return a.getX();
+	}
+}
+
+contract C {
+	B b;
+	constructor() {
+		b = new B();
+		assert(b.getX() == 0); // should hold
+	}
+	function f() public view {
+		assert(b.getX() == 0); // should fail because A.setX() can be called without A
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTIgnoreOS: macos
+// ----
+// Warning 6328: (256-277): CHC: Assertion violation happens here.
+// Warning 6328: (533-554): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol
new file mode 100644
index 0000000000..e65d1b1e74
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol
@@ -0,0 +1,52 @@
+contract A {
+    uint x;
+    address immutable owner;
+    constructor() {
+        owner = msg.sender;
+    }
+    function setX(uint _x) public {
+        require(msg.sender == owner);
+        x = _x;
+    }
+    function getX() public view returns (uint) {
+        return x;
+    }
+}
+
+contract B {
+    A a;
+    constructor() {
+        a = new A();
+        assert(a.getX() == 0); // should hold
+    }
+    function g() public view {
+        assert(a.getX() == 0); // should hold, but fails because
+        // the nondet_interface constraint added for `A a` in between
+        // txs of `B` does not have the constraint that `msg.sender != address(this)`
+        // so `A.setX` is allowed with `msg.sender = address(this)` inside
+        // the current rules defining nondet_interface.
+        // If we want to support that, we likely need a new type of nondet_interface
+        // `nondet_interface_with_tx` that contains tx data as well as restricts
+        // every further `nondet_interface_with_tx` to not have that `msg.sender`.
+    }
+    function getX() public view returns (uint) {
+        return a.getX();
+    }
+}
+
+contract C {
+    B b;
+    constructor() {
+        b = new B();
+        assert(b.getX() == 0); // should hold
+    }
+    function f() public view {
+        assert(b.getX() == 0); // should hold
+    }
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// ----
+// Warning 6328: (434-455): CHC: Assertion violation happens here.
+// Warning 6328: (1270-1291): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
new file mode 100644
index 0000000000..60bfd1660a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
@@ -0,0 +1,45 @@
+contract A {
+	uint x;
+	address immutable owner;
+	constructor() {
+		owner = msg.sender;
+	}
+	function setX(uint _x) public {
+		require(msg.sender == owner);
+		x = _x;
+	}
+	function getX() public view returns (uint) {
+		return x;
+	}
+}
+
+contract B {
+	A a;
+	constructor() {
+		a = new A();
+		assert(a.getX() == 0); // should hold
+	}
+	function g() public {
+		a.setX(42);
+	}
+	function getX() public view returns (uint) {
+		return a.getX();
+	}
+}
+
+contract C {
+	B b;
+	constructor() {
+		b = new B();
+		assert(b.getX() == 0); // should hold
+	}
+	function f() public view {
+		assert(b.getX() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTIgnoreOS: macos
+// ----
+// Warning 6328: (561-582): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
new file mode 100644
index 0000000000..4e86c7b2b5
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
@@ -0,0 +1,48 @@
+contract A {
+	uint x;
+	address immutable owner;
+	constructor() {
+		owner = msg.sender;
+	}
+	function setX(uint _x) public {
+		require(msg.sender == owner);
+		x = _x;
+	}
+	function getX() public view returns (uint) {
+		return x;
+	}
+}
+
+contract B {
+	A a;
+	address immutable owner;
+	constructor() {
+		owner = msg.sender;
+		a = new A();
+		assert(a.getX() == 0); // should hold
+	}
+	function g() public {
+		require(msg.sender == owner);
+		a.setX(42);
+	}
+	function getX() public view returns (uint) {
+		return a.getX();
+	}
+}
+
+contract C {
+	B b;
+	constructor() {
+		b = new B();
+		assert(b.getX() == 0); // should hold
+	}
+	function f() public view {
+		assert(b.getX() == 0); // should hold
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTIgnoreOS: macos
+// ----
+// Warning 6328: (641-662): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
new file mode 100644
index 0000000000..54566b85f4
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
@@ -0,0 +1,50 @@
+contract A {
+	uint x;
+	address immutable owner;
+	constructor() {
+		owner = msg.sender;
+	}
+	function setX(uint _x) public {
+		require(msg.sender == owner);
+		x = _x;
+	}
+	function getX() public view returns (uint) {
+		return x;
+	}
+}
+
+contract B {
+	A a;
+	address immutable owner;
+	constructor() {
+		owner = msg.sender;
+		a = new A();
+	}
+	function g() public {
+		require(msg.sender == owner);
+		a.setX(42);
+	}
+	function getX() public view returns (uint) {
+		return a.getX();
+	}
+}
+
+contract C {
+	B b;
+	constructor() {
+		b = new B();
+		assert(b.getX() == 0); // should hold
+	}
+	function f() public view {
+		assert(b.getX() == 0); // should fail
+	}
+	function h() public {
+		b.g();
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// ----
+// Warning 6328: (601-622): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol
new file mode 100644
index 0000000000..582d967f3f
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol
@@ -0,0 +1,17 @@
+contract C {
+	uint x;
+	function i() public { ++x; }
+	function f() public {
+		x = 0;
+		this.i();
+		assert(x == 1); // should hold in trusted mode
+		assert(x != 1); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (147-161): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()\n    C.i() -- trusted external call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol
new file mode 100644
index 0000000000..0f05a8b731
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol
@@ -0,0 +1,16 @@
+contract C {
+	uint x;
+	function i() public { ++x; }
+	function f() public {
+		x = 0;
+		((this)).i();
+		assert(x == 1); // should hold in trusted mode
+		assert(x != 1); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (151-165): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()\n    C.i() -- trusted external call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol
new file mode 100644
index 0000000000..1b95859af8
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol
@@ -0,0 +1,17 @@
+contract C {
+	uint x;
+	function i() public { ++x; }
+	function f() public {
+		x = 0;
+		C c = this;
+		c.i();
+		assert(x == 1); // should hold in trusted mode
+		assert(x != 1); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (158-172): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol
new file mode 100644
index 0000000000..c4bab9c759
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol
@@ -0,0 +1,23 @@
+contract D {
+	uint public x;
+}
+
+contract C {
+	struct S {
+		address d;
+	}
+	S[] ss;
+	constructor() {
+		ss.push(S(address(new D())));
+		assert(D(ss[0].d).x() == 0); // should hold
+	}
+	function f() public view {
+		assert(D(ss[0].d).x() == 0); // should hold, but fails because we havoc the state
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (210-237): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol
new file mode 100644
index 0000000000..522c840f5b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol
@@ -0,0 +1,24 @@
+contract D {
+	uint public x;
+	function setD(uint _x) public { x = _x; }
+}
+
+contract C {
+	struct S {
+		address d;
+	}
+	S[] ss;
+	constructor() {
+		ss.push(S(address(new D())));
+		assert(D(ss[0].d).x() == 0); // should hold
+	}
+	function f() public view {
+		assert(D(ss[0].d).x() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (253-280): CHC: Assertion violation happens here.\nCounterexample:\nss = [{d: 0x4706}]\n\nTransaction trace:\nC.constructor()\nState: ss = [{d: 0x4706}]\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol
new file mode 100644
index 0000000000..541999b9f9
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol
@@ -0,0 +1,21 @@
+contract D {
+	uint public x;
+	function setD(uint _x) public { x = _x; }
+}
+
+contract C {
+	address[] ds;
+	constructor() {
+		ds.push(address(new D()));
+		assert(D(ds[0]).x() == 0); // should hold
+	}
+	function f() public view {
+		assert(D(ds[0]).x() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (226-251): CHC: Assertion violation happens here.\nCounterexample:\nds = [0x0]\n\nTransaction trace:\nC.constructor()\nState: ds = [0x0]\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol
new file mode 100644
index 0000000000..f7e31bf74a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol
@@ -0,0 +1,20 @@
+contract D {
+	uint public x;
+}
+
+contract C {
+	address[] ds;
+	constructor() {
+		ds.push(address(new D()));
+		assert(D(ds[0]).x() == 0); // should hold
+	}
+	function f() public view {
+		assert(D(ds[0]).x() == 0); // should hold, but fails because we havoc the state
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (183-208): CHC: Assertion violation happens here.\nCounterexample:\nds = [0x25]\n\nTransaction trace:\nC.constructor()\nState: ds = [0x25]\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol
new file mode 100644
index 0000000000..2ac70b33d3
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol
@@ -0,0 +1,24 @@
+contract D {
+	uint public x;
+	function setD(uint _x) public { x = _x; }
+}
+
+contract C {
+	struct S {
+		address d;
+	}
+	S s;
+	constructor() {
+		s.d = address(new D());
+		assert(D(s.d).x() == 0); // should hold
+	}
+	function f() public view {
+		assert(D(s.d).x() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (240-263): CHC: Assertion violation happens here.\nCounterexample:\ns = {d: 0x5039}\n\nTransaction trace:\nC.constructor()\nState: s = {d: 0x5039}\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol
new file mode 100644
index 0000000000..e527c5bc01
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol
@@ -0,0 +1,23 @@
+contract D {
+	uint public x;
+}
+
+contract C {
+	struct S {
+		address d;
+	}
+	S s;
+	constructor() {
+		s.d = address(new D());
+		assert(D(s.d).x() == 0); // should hold
+	}
+	function f() public view {
+		assert(D(s.d).x() == 0); // should hold, but fails because we havoc the state
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (197-220): CHC: Assertion violation happens here.\nCounterexample:\ns = {d: 0x5039}\n\nTransaction trace:\nC.constructor()\nState: s = {d: 0x5039}\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol
new file mode 100644
index 0000000000..fff8a97184
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol
@@ -0,0 +1,26 @@
+contract D {
+	uint public x;
+}
+
+contract C {
+	struct S {
+		address d;
+	}
+	struct T {
+		S s;
+	}
+	T t;
+	constructor() {
+		t.s.d = address(new D());
+		assert(D(t.s.d).x() == 0); // should hold
+	}
+	function f() public view {
+		assert(D(t.s.d).x() == 0); // should hold, but fails because we havoc the state
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (223-248): CHC: Assertion violation happens here.\nCounterexample:\nt = {s: {d: 0x5039}}\n\nTransaction trace:\nC.constructor()\nState: t = {s: {d: 0x5039}}\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol
new file mode 100644
index 0000000000..63d026e52b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol
@@ -0,0 +1,27 @@
+contract D {
+	uint public x;
+	function setD(uint _x) public { x = _x; }
+}
+
+contract C {
+	struct S {
+		address d;
+	}
+	struct T {
+		S s;
+	}
+	T t;
+	constructor() {
+		t.s.d = address(new D());
+		assert(D(t.s.d).x() == 0); // should hold
+	}
+	function f() public view {
+		assert(D(t.s.d).x() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (266-291): CHC: Assertion violation happens here.\nCounterexample:\nt = {s: {d: 0x5039}}\n\nTransaction trace:\nC.constructor()\nState: t = {s: {d: 0x5039}}\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol
new file mode 100644
index 0000000000..0b8cd8e598
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol
@@ -0,0 +1,23 @@
+contract D {
+	uint public x;
+}
+
+contract C {
+	struct S {
+		D d;
+	}
+	S[] ss;
+	constructor() {
+		ss.push(S(new D()));
+		assert(ss[0].d.x() == 0); // should hold
+	}
+	function f() public view {
+		assert(ss[0].d.x() == 0); // should hold, but fails because we havoc the state
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (192-216): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol
new file mode 100644
index 0000000000..97f61fa045
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol
@@ -0,0 +1,24 @@
+contract D {
+	uint public x;
+	function setD(uint _x) public { x = _x; }
+}
+
+contract C {
+	struct S {
+		D d;
+	}
+	S[] ss;
+	constructor() {
+		ss.push(S(new D()));
+		assert(ss[0].d.x() == 0); // should hold
+	}
+	function f() public view {
+		assert(ss[0].d.x() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (235-259): CHC: Assertion violation happens here.\nCounterexample:\nss = [{d: 20819}]\n\nTransaction trace:\nC.constructor()\nState: ss = [{d: 20819}]\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol
new file mode 100644
index 0000000000..475c391844
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol
@@ -0,0 +1,21 @@
+contract D {
+	uint public x;
+	function setD(uint _x) public { x = _x; }
+}
+
+contract C {
+	D[] ds;
+	constructor() {
+		ds.push(new D());
+		assert(ds[0].x() == 0); // should hold
+	}
+	function f() public view {
+		assert(ds[0].x() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (208-230): CHC: Assertion violation happens here.\nCounterexample:\nds = [39]\n\nTransaction trace:\nC.constructor()\nState: ds = [39]\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol
new file mode 100644
index 0000000000..baeddda088
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol
@@ -0,0 +1,21 @@
+contract D {
+	uint public x;
+}
+
+contract C {
+	D[] ds;
+	constructor() {
+		ds.push(new D());
+		assert(ds[0].x() == 0); // should hold
+	}
+	function f() public view {
+		assert(ds[0].x() == 0); // should hold, but fails because we havoc the state
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (165-187): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol
new file mode 100644
index 0000000000..293c223044
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol
@@ -0,0 +1,24 @@
+contract D {
+	uint public x;
+	function setD(uint _x) public { x = _x; }
+}
+
+contract C {
+	struct S {
+		D d;
+	}
+	S s;
+	constructor() {
+		s.d = new D();
+		assert(s.d.x() == 0); // should hold
+	}
+	function f() public view {
+		assert(s.d.x() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (222-242): CHC: Assertion violation happens here.\nCounterexample:\ns = {d: 20819}\n\nTransaction trace:\nC.constructor()\nState: s = {d: 20819}\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol
new file mode 100644
index 0000000000..59381960c5
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol
@@ -0,0 +1,24 @@
+contract D {
+	uint public x;
+}
+
+contract C {
+	struct S {
+		D d;
+	}
+	S s;
+	constructor() {
+		s.d = new D();
+		assert(s.d.x() == 0); // should hold
+	}
+	function f() public view {
+		assert(s.d.x() == 0); // should hold, but fails because we havoc the state
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (179-199): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol
new file mode 100644
index 0000000000..06cd20cfe3
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol
@@ -0,0 +1,27 @@
+contract D {
+	uint public x;
+}
+
+contract C {
+	struct S {
+		D d;
+	}
+	struct T {
+		S s;
+	}
+	T t;
+	constructor() {
+		t.s.d = new D();
+		assert(t.s.d.x() == 0); // should hold
+	}
+	function f() public view {
+		assert(t.s.d.x() == 0); // should hold, but fails because we havoc the state
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (205-227): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol
new file mode 100644
index 0000000000..6a1fb22744
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol
@@ -0,0 +1,27 @@
+contract D {
+	uint public x;
+	function setD(uint _x) public { x = _x; }
+}
+
+contract C {
+	struct S {
+		D d;
+	}
+	struct T {
+		S s;
+	}
+	T t;
+	constructor() {
+		t.s.d = new D();
+		assert(t.s.d.x() == 0); // should hold
+	}
+	function f() public view {
+		assert(t.s.d.x() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (248-270): CHC: Assertion violation happens here.\nCounterexample:\nt = {s: {d: 20819}}\n\nTransaction trace:\nC.constructor()\nState: t = {s: {d: 20819}}\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
index 06390b12ca..c52e0773fb 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (157-192): CHC: Assertion violation happens here.
+// Warning 6328: (157-192): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h() -- trusted external call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol
index fc2d844d9d..f804078cd1 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol
@@ -1,7 +1,11 @@
 contract C {
 	function g(uint i) public {
 		require(address(this).balance == 100);
+		// if called address is same as this, don't do anything with the value stuff
+		// or fix the receiving end
 		this.h{value: i}();
+		uint x = address(this).balance;
+		assert(x == 100); // should hold
 		assert(address(this).balance == 100); // should hold
 		assert(address(this).balance == 90); // should fail
 	}
@@ -12,4 +16,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (162-197): CHC: Assertion violation happens here.
+// Warning 6328: (340-375): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol
new file mode 100644
index 0000000000..6c634d4efb
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol
@@ -0,0 +1,33 @@
+contract Crypto {
+	function hash(bytes32) external pure returns (bytes32) {
+		return bytes32(0);
+	}
+}
+
+contract C {
+	address owner;
+	bytes32 sig_1;
+	bytes32 sig_2;
+	Crypto d;
+
+	constructor() {
+		owner = msg.sender;
+	}
+
+	function f1(bytes32 _msg) public {
+		address prevOwner = owner;
+		sig_1 = d.hash(_msg);
+		sig_2 = d.hash(_msg);
+		assert(prevOwner == owner);
+	}
+
+	function inv() public view {
+		assert(sig_1 == sig_2);
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: all
+// SMTExtCalls: trusted
+// ----
+// Info 1180: Contract invariant(s) for :C:\n((sig_1 <= 0) && (sig_2 <= 0))\nReentrancy property(ies) for :Crypto:\n(<errorCode> = 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(sig_1 == sig_2)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol
new file mode 100644
index 0000000000..62f53b64c2
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol
@@ -0,0 +1,47 @@
+contract State {
+	C c;
+	constructor(C _c) {
+		c = _c;
+	}
+	function f() public view returns (uint) {
+		return c.g();
+	}
+}
+
+contract C {
+	address owner;
+	uint y;
+	uint z;
+	State s;
+	bool insidef;
+
+	constructor() {
+		owner = msg.sender;
+		s = new State(this);
+	}
+
+	function zz() public {
+		require(insidef);
+		z = 3;
+	}
+
+	function f() public {
+		require(!insidef);
+		address prevOwner = owner;
+		insidef = true;
+		s.f();
+		assert(z == y);
+		assert(prevOwner == owner);
+		insidef = false;
+	}
+
+	function g() public view returns (uint) {
+		return y;
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// ----
+// Info 1180: Contract invariant(s) for :C:\n((y <= 0) && (insidef || (z <= 0)))\nReentrancy property(ies) for :State:\n(<errorCode> = 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 2 -> Assertion failed at assert(z == y)\n<errorCode> = 3 -> Assertion failed at assert(prevOwner == owner)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect_trusted.sol
new file mode 100644
index 0000000000..8000b3267d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_indirect_trusted.sol
@@ -0,0 +1,56 @@
+contract Other {
+	C c;
+	constructor(C _c) {
+		c = _c;
+	}
+	function h() public {
+		c.setOwner(address(0));
+	}
+}
+
+contract State {
+	uint x;
+	Other o;
+	C c;
+	constructor(C _c) {
+		c = _c;
+		o = new Other(_c);
+	}
+	function f() public returns (uint) {
+		o.h();
+		return c.g();
+	}
+}
+
+contract C {
+	address owner;
+	uint y;
+	State s;
+
+	constructor() {
+		owner = msg.sender;
+		s = new State(this);
+	}
+
+	function setOwner(address _owner) public {
+		owner = _owner;
+	}
+
+	function f() public {
+		address prevOwner = owner;
+		uint z = s.f();
+		assert(z == y); // should hold
+		assert(prevOwner == owner); // should not hold because of reentrancy
+	}
+
+	function g() public view returns (uint) {
+		return y;
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// ----
+// Warning 6328: (531-545): CHC: Assertion violation might happen here.
+// Warning 6328: (564-590): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol
new file mode 100644
index 0000000000..ee373e2937
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol
@@ -0,0 +1,38 @@
+contract State {
+	C c;
+	constructor(C _c) {
+		c = _c;
+	}
+	function f() public view returns (uint) {
+		return c.g();
+	}
+}
+
+contract C {
+	address owner;
+	uint y;
+	State s;
+
+	constructor() {
+		owner = msg.sender;
+		s = new State(this);
+	}
+
+	function f() public view {
+		address prevOwner = owner;
+		uint z = s.f();
+		assert(z == y);
+		assert(prevOwner == owner);
+	}
+
+	function g() public view returns (uint) {
+		return y;
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// ----
+// Warning 6328: (314-328): CHC: Assertion violation might happen here.
+// Info 1180: Reentrancy property(ies) for :State:\n(<errorCode> = 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(z == y)\n<errorCode> = 2 -> Assertion failed at assert(prevOwner == owner)\n
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe_trusted.sol
new file mode 100644
index 0000000000..4d179ddf82
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_unsafe_trusted.sol
@@ -0,0 +1,44 @@
+contract State {
+	C c;
+	constructor(C _c) {
+		c = _c;
+	}
+	function f() public returns (uint) {
+		c.setOwner(address(0));
+		return c.g();
+	}
+}
+
+contract C {
+	address owner;
+	uint y;
+	State s;
+
+	constructor() {
+		owner = msg.sender;
+		s = new State(this);
+	}
+
+	function setOwner(address _owner) public {
+		owner = _owner;
+	}
+
+	function f() public {
+		address prevOwner = owner;
+		uint z = s.f();
+		assert(z == y); // should hold
+		assert(prevOwner == owner); // should not hold because of reentrancy
+	}
+
+	function g() public view returns (uint) {
+		return y;
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTIgnoreOS: macos
+// ----
+// Warning 6328: (396-410): CHC: Assertion violation might happen here.
+// Warning 6328: (429-455): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_trusted.sol
new file mode 100644
index 0000000000..1c557f7a6d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_trusted.sol
@@ -0,0 +1,36 @@
+contract State {
+	uint x;
+	function f() public returns (uint) {
+		if (x == 0) x = 1;
+		else if (x == 1) x = 2;
+		else if (x == 2) x = 0;
+		return x;
+	}
+}
+
+contract C {
+	address owner;
+	uint y;
+	uint z;
+	State s;
+
+	constructor() {
+		s = new State();
+		owner = msg.sender;
+	}
+
+	function f() public {
+		address prevOwner = owner;
+		y = s.f();
+		z = s.f();
+		assert(prevOwner == owner);
+		assert(y != z);
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// ----
+// Warning 6328: (355-381): CHC: Assertion violation might happen here.
+// Warning 6328: (385-399): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe_trusted.sol
new file mode 100644
index 0000000000..7d217e145a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_unsafe_trusted.sol
@@ -0,0 +1,40 @@
+contract State {
+	uint x;
+	function f() public returns (uint) {
+		if (x == 0) x = 1;
+		else if (x == 1) x = 2;
+		else if (x == 2) x = 0;
+		return x;
+	}
+}
+
+contract C {
+	address owner;
+	uint y;
+	uint z;
+	State s;
+
+	constructor() {
+		owner = msg.sender;
+		s = new State();
+	}
+
+	function setOwner(address _owner) public {
+		owner = _owner;
+	}
+
+	function f() public {
+		address prevOwner = owner;
+		y = s.f();
+		z = s.f();
+		assert(prevOwner == owner);
+		assert(y != z);
+	}
+}
+// ====
+// SMTContract: C
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// ----
+// Warning 6328: (421-447): CHC: Assertion violation might happen here.
+// Warning 6328: (451-465): CHC: Assertion violation might happen here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
index 19ff2bbad8..268db82b46 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
@@ -13,4 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (117-131): CHC: Assertion violation happens here.\nCounterexample:\nlocked = false\ntarget = 0x0\n\nTransaction trace:\nC.constructor()\nState: locked = true\nC.call(0x0)\n    D(target).e() -- untrusted external call, synthesized as:\n        C.call(0x0) -- reentrant call
+// Warning 6328: (117-131): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
index b50185449b..550e17b619 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
@@ -18,3 +18,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
+// Warning 6328: (167-181): CHC: Assertion violation might happen here.
+// Warning 4661: (167-181): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol b/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol
new file mode 100644
index 0000000000..438feae217
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol
@@ -0,0 +1,64 @@
+interface Token {
+	function balanceOf(address _a) external view returns (uint);
+	function transfer(address _to, uint _amt) external;
+}
+
+contract TokenCorrect is Token {
+	mapping (address => uint) balance;
+	constructor(address _a, uint _b) {
+		balance[_a] = _b;
+	}
+	function balanceOf(address _a) public view override returns (uint) {
+		return balance[_a];
+	}
+	function transfer(address _to, uint _amt) public override {
+		require(balance[msg.sender] >= _amt);
+		balance[msg.sender] -= _amt;
+		balance[_to] += _amt;
+	}
+}
+
+contract Test {
+	function property_transfer(address _token, address _to, uint _amt) public {
+		require(_to != address(this));
+
+		TokenCorrect t = TokenCorrect(_token);
+
+		uint xPre = t.balanceOf(address(this));
+		require(xPre >= _amt);
+		uint yPre = t.balanceOf(_to);
+
+		t.transfer(_to, _amt);
+		uint xPost = t.balanceOf(address(this));
+		uint yPost = t.balanceOf(_to);
+
+		assert(xPost == xPre - _amt);
+		assert(yPost == yPre + _amt);
+	}
+
+	function test_concrete() public {
+		TokenCorrect t = new TokenCorrect(address(this), 1000);
+
+		uint b = t.balanceOf(address(this));
+		assert(b == 1000);
+
+		address other = address(0x333);
+		require(address(this) != other);
+
+		uint c = t.balanceOf(other);
+		assert(c == 0);
+
+		t.transfer(other, 100);
+
+		uint d = t.balanceOf(address(this));
+		assert(d == 900);
+
+		uint e = t.balanceOf(other);
+		assert(e == 100);
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTContract: Test
+// SMTTargets: assert
diff --git a/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol b/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol
new file mode 100644
index 0000000000..6bb6074b20
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol
@@ -0,0 +1,68 @@
+interface Token {
+	function balanceOf(address _a) external view returns (uint);
+	function transfer(address _to, uint _amt) external;
+}
+
+contract TokenWrong is Token {
+	mapping (address => uint) balance;
+	constructor(address _a, uint _b) {
+		balance[_a] = _b;
+	}
+	function balanceOf(address _a) public view override returns (uint) {
+		return balance[_a];
+	}
+	function transfer(address _to, uint _amt) public override {
+		require(balance[msg.sender] >= _amt);
+		// Commented out to make this token implementation wrong.
+		//balance[msg.sender] -= _amt;
+		balance[_to] += _amt;
+	}
+}
+
+contract Test {
+	function property_transfer(address _token, address _to, uint _amt) public {
+		require(_to != address(this));
+
+		TokenWrong t = TokenWrong(_token);
+
+		uint xPre = t.balanceOf(address(this));
+		require(xPre >= _amt);
+		uint yPre = t.balanceOf(_to);
+
+		t.transfer(_to, _amt);
+		uint xPost = t.balanceOf(address(this));
+		uint yPost = t.balanceOf(_to);
+
+		assert(xPost == xPre - _amt); // should fail
+		assert(yPost == yPre + _amt);
+	}
+
+	function test_concrete() public {
+		TokenWrong t = new TokenWrong(address(this), 1000);
+
+		uint b = t.balanceOf(address(this));
+		assert(b == 1000);
+
+		address other = address(0x333);
+		require(address(this) != other);
+
+		uint c = t.balanceOf(other);
+		assert(c == 0);
+
+		t.transfer(other, 100);
+
+		uint d = t.balanceOf(address(this));
+		assert(d == 900); // should fail
+
+		uint e = t.balanceOf(other);
+		assert(e == 100);
+	}
+}
+// ====
+// SMTContract: Test
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (950-978): CHC: Assertion violation happens here.
+// Warning 6328: (1370-1386): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/file_level/new_operator.sol b/test/libsolidity/smtCheckerTests/file_level/new_operator.sol
index 8a0f118ae7..925f53bc9c 100644
--- a/test/libsolidity/smtCheckerTests/file_level/new_operator.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/new_operator.sol
@@ -14,5 +14,5 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4588: (78-85): Assertion checker does not yet implement this type of function call.
+// Warning 8729: (78-85): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
 // Warning 6328: (133-152): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()\n    test() -- internal call\n        (new C()).x() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
index 5efcb2da1b..3a3b295e45 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
@@ -25,4 +25,4 @@ contract C
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (234-253): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!((map[1] + ((- 1) * map[0])) <= 0) || ((map'[1] + ((- 1) * map'[0])) <= 0)) && !(<errorCode> = 2) && (!((map[1] + ((- 1) * map[0])) >= 0) || ((map'[0] + ((- 1) * map'[1])) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
+// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!((map[1] + ((- 1) * map[0])) >= 0) || ((map'[0] + ((- 1) * map'[1])) <= 0)) && !(<errorCode> = 2) && (!((map[1] + ((- 1) * map[0])) <= 0) || ((map'[1] + ((- 1) * map'[0])) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol
new file mode 100644
index 0000000000..00bfb35ca2
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol
@@ -0,0 +1,22 @@
+contract D {
+	uint public d;
+	function g() public {
+		++d;
+	}
+}
+
+contract C {
+	function f() public {
+		D a = new D();
+		assert(a.d() == 0); // should hold
+		a.g();
+		assert(a.d() == 1); // should hold
+		assert(a.d() == 0); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (203-221): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol
new file mode 100644
index 0000000000..5da279fc95
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol
@@ -0,0 +1,33 @@
+contract E {
+	uint public e;
+	function setE(uint _e) public {
+		e = _e;
+	}
+}
+
+contract D {
+	E e;
+	constructor(E _e) {
+		e = _e;
+	}
+	function setE(uint x) public {
+		e.setE(x);
+	}
+}
+
+contract C {
+	function f() public {
+		E e = new E();
+		D d = new D(e);
+		assert(e.e() == 0); // should hold
+		d.setE(42);
+		assert(e.e() == 42); // should hold
+		assert(e.e() == 2); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// ----
+// Warning 6328: (344-362): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol
new file mode 100644
index 0000000000..b7673203e1
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol
@@ -0,0 +1,18 @@
+contract C {
+	uint public x;
+
+	function f() public {
+		x = 2;
+		x = 3;
+		uint y = this.x();
+		assert(y == 3); // should hold
+		assert(y == 2); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (127-141): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol
new file mode 100644
index 0000000000..b3dfe04ade
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol
@@ -0,0 +1,19 @@
+contract C {
+	uint public x;
+
+	function f() public {
+		x = 2;
+		x = 3;
+		C c = this;
+		uint y = c.x();
+		assert(y == 3); // should hold
+		assert(y == 2); // should fail
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTExtCalls: trusted
+// SMTTargets: assert
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (138-152): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
index 0117f9b49d..e30a5e7438 100644
--- a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
@@ -27,4 +27,4 @@ contract C is A {
 // ----
 // Warning 6328: (199-214): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nA.constructor()\nState: x = 2\nA.i()
 // Warning 6328: (387-401): CHC: Assertion violation happens here.\nCounterexample:\nx = 10\n\nTransaction trace:\nC.constructor()\nState: x = 10\nC.i()
-// Info 1180: Contract invariant(s) for :A:\n(!(x <= 1) && !(x >= 3))\nContract invariant(s) for :C:\n(!(x >= 11) && !(x <= 9))\n
+// Info 1180: Contract invariant(s) for :A:\n(!(x <= 1) && !(x >= 3))\nContract invariant(s) for :C:\n(!(x <= 9) && !(x >= 11))\n
diff --git a/test/libsolidity/smtCheckerTests/imports/ExtCall.sol b/test/libsolidity/smtCheckerTests/imports/ExtCall.sol
index 047148a90c..7675bc42ea 100644
--- a/test/libsolidity/smtCheckerTests/imports/ExtCall.sol
+++ b/test/libsolidity/smtCheckerTests/imports/ExtCall.sol
@@ -39,4 +39,4 @@ contract ExtCallTest {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (ExtCall.sol:362-381): CHC: Assertion violation happens here.
-// Warning 4588: (ExtCall.t.sol:110-123): Assertion checker does not yet implement this type of function call.
+// Warning 8729: (ExtCall.t.sol:110-123): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
diff --git a/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol b/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
index 8ddef2da9e..1298f1f097 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_as_module_2.sol
@@ -17,6 +17,7 @@ function f(uint _x) pure {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (A:50-64): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call\n    A:f(10) -- internal call\n    A:f(0) -- internal call
 // Warning 6328: (s1.sol:28-44): CHC: Assertion violation happens here.\nCounterexample:\n\n_y = 0\n\nTransaction trace:\nD.constructor()\nD.g(0)\n    s1.sol:f(200) -- internal call\n    s1.sol:f(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
index 42775cc9b2..b7b06b1fc8 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
@@ -11,5 +11,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
-// Warning 6328: (164-183): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 6328: (164-183): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
index b26fcbd93c..923147d495 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
@@ -25,4 +25,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 2072: (255-261): Unused local variable.
-// Info 1180: Reentrancy property(ies) for :C:\n((!(x' >= 3) || (a' = a)) && (<errorCode> <= 0) && (!(x' <= 0) || !(x >= 2)) && (!(x <= 2) || !(x' >= 3)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
+// Info 1180: Reentrancy property(ies) for :C:\n((!(x <= 2) || !(x' >= 3)) && (<errorCode> <= 0) && (!(x' <= 0) || !(x >= 2)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
index 0f511a05d1..7af8c96c89 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_reentrancy_1.sol
@@ -11,6 +11,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (135-169): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 5892\n\nTransaction trace:\nC.constructor()\nC.g(0){ msg.value: 11 }\n    _i.f() -- untrusted external call, synthesized as:\n        C.g(0){ msg.value: 32278 } -- reentrant call\n            _i.f() -- untrusted external call
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_new.sol b/test/libsolidity/smtCheckerTests/try_catch/try_new.sol
index e7075e0765..5c98c279d2 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_new.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_new.sol
@@ -28,5 +28,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4588: (231-245): Assertion checker does not yet implement this type of function call.
-// Warning 4588: (492-507): Assertion checker does not yet implement this type of function call.
+// Warning 8729: (231-245): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
+// Warning 8729: (492-507): Contract deployment is only supported in the trusted mode for external calls with the CHC engine.
diff --git a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
index 1d00e7fe3b..ffd6304c98 100644
--- a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
@@ -11,4 +11,7 @@ contract C {
 		assert(g == 0x0001020304050607080900010203040506070809000102030405060708090001); // should hold
 	}
 }
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
index 4910c417e8..33546b49c0 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (132-160): CHC: Assertion violation happens here.\nCounterexample:\nx = [0x61, 0x62, 0x63, 0x61]\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.s()
+// Warning 6328: (132-160): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.s()
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
index 44daa89128..7e23d77d65 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_simple_2.sol
@@ -5,5 +5,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: yes
 // ----
 // Warning 6328: (66-80): CHC: Assertion violation happens here.\nCounterexample:\n\nx = true\ny = false\n\nTransaction trace:\nC.constructor()\nC.f(true, false)
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
index 5cb307385b..1a72cad3da 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
@@ -23,4 +23,3 @@ contract C {
         );
     }
 }
-// ----
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index e8206e4833..bd51fe920e 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -145,6 +145,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			"--model-checker-contracts=contract1.yul:A,contract2.yul:B",
 			"--model-checker-div-mod-no-slacks",
 			"--model-checker-engine=bmc",
+			"--model-checker-ext-calls=trusted",
 			"--model-checker-invariants=contract,reentrancy",
 			"--model-checker-show-unproved",
 			"--model-checker-solvers=z3,smtlib2",
@@ -211,6 +212,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			{{{"contract1.yul", {"A"}}, {"contract2.yul", {"B"}}}},
 			true,
 			{true, false},
+			{ModelCheckerExtCalls::Mode::TRUSTED},
 			{{InvariantType::Contract, InvariantType::Reentrancy}},
 			true,
 			{false, false, true, true},
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 895957f4d2..47ab7e49c2 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -108,6 +108,7 @@ void FuzzerUtil::testCompiler(
 			frontend::ModelCheckerContracts::Default(),
 			/*divModWithSlacks*/true,
 			frontend::ModelCheckerEngine::All(),
+			frontend::ModelCheckerExtCalls{},
 			frontend::ModelCheckerInvariants::All(),
 			/*showUnproved=*/false,
 			smtutil::SMTSolverChoice::All(),

From 411841cbb54283d5206b39e411e8a58d4bf404b5 Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Mon, 6 Feb 2023 17:19:48 +0000
Subject: [PATCH 1164/1748] Tweak wording in value type docs (#13935)

* Update value-types.rst

- User-defined were written inconsistently (with/without hyphen)
- Rewording some sentences for user clarity.

* Update docs/types/value-types.rst

Co-authored-by: chriseth <chris@ethereum.org>

---------

Co-authored-by: chriseth <chris@ethereum.org>
---
 docs/types/value-types.rst | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index de2724afa9..ffdec37961 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -4,8 +4,7 @@
 Value Types
 ===========
 
-The following types are also called value types because variables of these
-types will always be passed by value, i.e. they are always copied when they
+The following are called value types because their variables will always be passed by value, i.e. they are always copied when they
 are used as function arguments or in assignments.
 
 .. index:: ! bool, ! true, ! false
@@ -47,7 +46,7 @@ access the minimum and maximum value representable by the type.
 
   Integers in Solidity are restricted to a certain range. For example, with ``uint32``, this is ``0`` up to ``2**32 - 1``.
   There are two modes in which arithmetic is performed on these types: The "wrapping" or "unchecked" mode and the "checked" mode.
-  By default, arithmetic is always "checked", which mean that if the result of an operation falls outside the value range
+  By default, arithmetic is always "checked", meaning that if an operation's result falls outside the value range
   of the type, the call is reverted through a :ref:`failing assertion<assert-and-require>`. You can switch to "unchecked" mode
   using ``unchecked { ... }``. More details can be found in the section about :ref:`unchecked <unchecked>`.
 
@@ -182,7 +181,7 @@ Operators:
 Address
 -------
 
-The address type comes in two flavours, which are largely identical:
+The address type comes in two largely identical flavors:
 
 - ``address``: Holds a 20 byte value (size of an Ethereum address).
 - ``address payable``: Same as ``address``, but with the additional members ``transfer`` and ``send``.
@@ -653,13 +652,13 @@ smallest and respectively largest value of the given enum.
 
 .. _user-defined-value-types:
 
-User Defined Value Types
+User-defined Value Types
 ------------------------
 
-A user defined value type allows creating a zero cost abstraction over an elementary value type.
+A user-defined value type allows creating a zero cost abstraction over an elementary value type.
 This is similar to an alias, but with stricter type requirements.
 
-A user defined value type is defined using ``type C is V``, where ``C`` is the name of the newly
+A user-defined value type is defined using ``type C is V``, where ``C`` is the name of the newly
 introduced type and ``V`` has to be a built-in value type (the "underlying type"). The function
 ``C.wrap`` is used to convert from the underlying type to the custom type. Similarly, the
 function ``C.unwrap`` is used to convert from the custom type to the underlying type.
@@ -680,7 +679,7 @@ type with 18 decimals and a minimal library to do arithmetic operations on the t
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity ^0.8.8;
 
-    // Represent a 18 decimal, 256 bit wide fixed point type using a user defined value type.
+    // Represent a 18 decimal, 256 bit wide fixed point type using a user-defined value type.
     type UFixed256x18 is uint256;
 
     /// A minimal library to do fixed point operations on UFixed256x18.

From 98c011328a1a6f46c4b466f235d1797bd3f57bf5 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 6 Feb 2023 16:53:23 -0300
Subject: [PATCH 1165/1748] Replace quote marks with quotation marks

---
 test/externalTests/gnosis.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index ab1fbf3e17..ed525e7a65 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -72,9 +72,10 @@ function gnosis_safe_test
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
     # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
-    sed -i "s|\(it\)\(('should not allow to call setup on singleton'\)|\1.skip\2|g" test/core/Safe.Setup.spec.ts
-    sed -i "s|\(it\)\(('can be used only via DELEGATECALL opcode'\)|\1.skip\2|g" test/libraries/SignMessageLib.spec.ts
-    sed -i "s|it\(('can only be called from Safe itself'\)|it.skip\1|g" test/libraries/Migration.spec.ts
+    sed -i "s|\(it\)\((\"should not allow to call setup on singleton\"\)|\1.skip\2|g" test/core/Safe.Setup.spec.ts
+    sed -i "s|\(it\)\((\"can be used only via DELEGATECALL opcode\"\)|\1.skip\2|g" test/libraries/SignMessageLib.spec.ts
+    sed -i "s|it\((\"can only be called from Safe itself\"\)|it.skip\1|g" test/libraries/Migration.spec.ts
+    sed -i "s|\(it\)\((\"should revert if called directly\"\)|\1.skip\2|g" test/handlers/CompatibilityFallbackHandler.spec.ts
 
     neutralize_package_lock
     neutralize_package_json_hooks

From a5c5e4602a51976ab59caa7282fa71ff59c3cb25 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 6 Feb 2023 18:04:10 -0300
Subject: [PATCH 1166/1748] Cleanup of duplicated line leftover from previous
 fix

---
 test/externalTests/gnosis.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index ed525e7a65..bafc3f2ca8 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -66,8 +66,8 @@ function gnosis_safe_test
     sed -i 's|"@openzeppelin/contracts": "\^3\.4\.0"|"@openzeppelin/contracts": "^4.0.0"|g' package.json
 
     # Disable two tests failing due to Hardhat's heuristics not yet updated to handle solc 0.8.10.
-    # TODO: Remove this when Hardhat implements them (https://github.com/nomiclabs/hardhat/issues/2051).
-    sed -i "s|\(it\)\(('should revert if called directly', async () => {\)|\1.skip\2|g" test/handlers/CompatibilityFallbackHandler.spec.ts
+    # TODO: Remove this when Hardhat implements them (https://github.com/nomiclabs/hardhat/issues/2451).
+    sed -i "s|\(it\)\((\"should revert if called directly\"\)|\1.skip\2|g" test/handlers/CompatibilityFallbackHandler.spec.ts
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
@@ -75,7 +75,6 @@ function gnosis_safe_test
     sed -i "s|\(it\)\((\"should not allow to call setup on singleton\"\)|\1.skip\2|g" test/core/Safe.Setup.spec.ts
     sed -i "s|\(it\)\((\"can be used only via DELEGATECALL opcode\"\)|\1.skip\2|g" test/libraries/SignMessageLib.spec.ts
     sed -i "s|it\((\"can only be called from Safe itself\"\)|it.skip\1|g" test/libraries/Migration.spec.ts
-    sed -i "s|\(it\)\((\"should revert if called directly\"\)|\1.skip\2|g" test/handlers/CompatibilityFallbackHandler.spec.ts
 
     neutralize_package_lock
     neutralize_package_json_hooks

From db9c11a2a5e44771ca2bcd2f86ee2f6b7ea3abf5 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 8 Feb 2023 16:55:14 +0100
Subject: [PATCH 1167/1748] fix abstract nondet exception

---
 Changelog.md                                    |  1 +
 libsolidity/formal/SMTEncoder.cpp               | 12 +++---------
 libsolidity/formal/SMTEncoder.h                 |  3 ---
 .../natspec/abstract_free_function_1.sol        | 17 +++++++++++++++++
 4 files changed, 21 insertions(+), 12 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/natspec/abstract_free_function_1.sol

diff --git a/Changelog.md b/Changelog.md
index 5ce4057a48..eefabf7d63 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * SMTChecker: Fix internal error when using the custom NatSpec annotation to abstract free functions.
  * TypeChecker: Also allow external library functions in ``using for``.
 
 
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index c3286fa041..5c4fc5ded0 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -2897,7 +2897,9 @@ vector<VariableDeclaration const*> SMTEncoder::stateVariablesIncludingInheritedA
 
 vector<VariableDeclaration const*> SMTEncoder::stateVariablesIncludingInheritedAndPrivate(FunctionDefinition const& _function)
 {
-	return stateVariablesIncludingInheritedAndPrivate(dynamic_cast<ContractDefinition const&>(*_function.scope()));
+	if (auto contract = dynamic_cast<ContractDefinition const*>(_function.scope()))
+		return stateVariablesIncludingInheritedAndPrivate(*contract);
+	return {};
 }
 
 vector<VariableDeclaration const*> SMTEncoder::localVariablesIncludingModifiers(FunctionDefinition const& _function, ContractDefinition const* _contract)
@@ -3020,14 +3022,6 @@ set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contract
 	return m_contractFunctionsWithoutVirtual.at(&_contract);
 }
 
-SourceUnit const* SMTEncoder::sourceUnitContaining(Scopable const& _scopable)
-{
-	for (auto const* s = &_scopable; s; s = dynamic_cast<Scopable const*>(s->scope()))
-		if (auto const* source = dynamic_cast<SourceUnit const*>(s->scope()))
-			return source;
-	solAssert(false, "");
-}
-
 map<ContractDefinition const*, vector<ASTPointer<frontend::Expression>>> SMTEncoder::baseArguments(ContractDefinition const& _contract)
 {
 	map<ContractDefinition const*, vector<ASTPointer<Expression>>> baseArgs;
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 06b03a7eb8..47e51b54de 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -113,9 +113,6 @@ class SMTEncoder: public ASTConstVisitor
 	/// @returns the ModifierDefinition of a ModifierInvocation if possible, or nullptr.
 	static ModifierDefinition const* resolveModifierInvocation(ModifierInvocation const& _invocation, ContractDefinition const* _contract);
 
-	/// @returns the SourceUnit that contains _scopable.
-	static SourceUnit const* sourceUnitContaining(Scopable const& _scopable);
-
 	/// @returns the arguments for each base constructor call in the hierarchy of @a _contract.
 	std::map<ContractDefinition const*, std::vector<ASTPointer<frontend::Expression>>> baseArguments(ContractDefinition const& _contract);
 
diff --git a/test/libsolidity/smtCheckerTests/natspec/abstract_free_function_1.sol b/test/libsolidity/smtCheckerTests/natspec/abstract_free_function_1.sol
new file mode 100644
index 0000000000..d013670594
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/natspec/abstract_free_function_1.sol
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: MIT
+pragma solidity >=0.8.13;
+
+contract C {
+    function f(uint x) external pure {
+        uint t = msb(x);
+        assert(t == 0); // should fail
+    }
+}
+
+/// @custom:smtchecker abstract-function-nondet
+function msb(uint256 x) pure returns (uint256 result) {}
+
+// ====
+// SMTEngine: chc
+// ----
+// Warning 6328: (144-158): CHC: Assertion violation happens here.

From 603f9f7208eacbbd1e07408b7f636d5b2ce0eea6 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Sun, 25 Dec 2022 22:43:26 +0100
Subject: [PATCH 1168/1748] Type recognition workaround for some GCC compilers

Looks like somewhat old GCC compilers, namely 12.2.1, cannot recognize a
string literal sometimes. Let's help it to avoid error logs like this
one:

```
[ 75%] Building CXX object libsolidity/CMakeFiles/solidity.dir/codegen/ir/IRGeneratorForStatements.cpp.o
cd /builddir/build/BUILD/solidity-0.8.18/redhat-linux-build/libsolidity && /usr/bin/g++ -DBOOST_ATOMIC_DYN_LINK -DBOOST_ATOMIC_NO_LIB -DBOOST_FILESYSTEM_DYN_LINK -DBOOST_FILESYSTEM_NO_LIB -DBOOST_SYSTEM_DYN_LINK -DBOOST_SYSTEM_NO_LIB -DFMT_HEADER_ONLY=1 -DHAVE_CVC4 -DHAVE_Z3 -I/builddir/build/BUILD/solidity-0.8.18/redhat-linux-build/include -I/builddir/build/BUILD/solidity-0.8.18 -isystem /usr/include/z3 -O2 -flto=auto -ffat-lto-objects -fexceptions -g -grecord-gcc-switches -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -fstack-protector-strong -specs=/usr/lib/rpm/redhat/redhat-annobin-cc1  -m64  -mtune=generic -fasynchronous-unwind-tables -fstack-clash-protection -fcf-protection -fuse-ld=gold -O3 -DNDEBUG -fstack-protector-strong -Wimplicit-fallthrough -fmacro-prefix-map=/builddir/build/BUILD/solidity-0.8.18=/solidity -Wpessimizing-move -Wredundant-move -Wall -Wextra -Werror -pedantic -Wmissing-declarations -Wno-unknown-pragmas -Wsign-conversion -Wconversion -Wextra-semi -Wduplicated-cond -Wlogical-op -fdiagnostics-color -std=c++17 -MD -MT libsolidity/CMakeFiles/solidity.dir/codegen/ir/IRGeneratorForStatements.cpp.o -MF CMakeFiles/solidity.dir/codegen/ir/IRGeneratorForStatements.cpp.o.d -o CMakeFiles/solidity.dir/codegen/ir/IRGeneratorForStatements.cpp.o -c /builddir/build/BUILD/solidity-0.8.18/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
In file included from /usr/include/c++/12/string:40,
                 from /builddir/build/BUILD/solidity-0.8.18/libsolidity/ast/ASTForward.h:27,
                 from /builddir/build/BUILD/solidity-0.8.18/libsolidity/ast/AST.h:26,
                 from /builddir/build/BUILD/solidity-0.8.18/libsolidity/ast/ASTVisitor.h:26,
                 from /builddir/build/BUILD/solidity-0.8.18/libsolidity/codegen/ir/IRGeneratorForStatements.h:24,
                 from /builddir/build/BUILD/solidity-0.8.18/libsolidity/codegen/ir/IRGeneratorForStatements.cpp:22:
In function 'std::char_traits<char>::copy(char*, char const*, unsigned long)',
    inlined from 'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_S_copy(char*, char const*, unsigned long)' at /usr/include/c++/12/bits/basic_string.h:423:21,
    inlined from 'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::_M_replace(unsigned long, unsigned long, char const*, unsigned long)' at /usr/include/c++/12/bits/basic_string.tcc:532:22,
    inlined from 'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::assign(char const*)' at /usr/include/c++/12/bits/basic_string.h:1647:19,
    inlined from 'std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> >::operator=(char const*)' at /usr/include/c++/12/bits/basic_string.h:815:28,
    inlined from '(anonymous namespace)::CopyTranslate::translateReference(solidity::yul::Identifier const&)' at /builddir/build/BUILD/solidity-0.8.18/libsolidity/codegen/ir/IRGeneratorForStatements.cpp:182:13:
/usr/include/c++/12/bits/char_traits.h:431:56: error: 'memcpy' accessing 9223372036854775810 or more bytes at offsets -4611686018427387902 and [-4611686018427387903, 4611686018427387904] may overlap up to 9223372036854775813 bytes at offset -3 [-Werror=restrict]
  431 |         return static_cast<char_type*>(__builtin_memcpy(__s1, __s2, __n));
      |                                        ~~~~~~~~~~~~~~~~^~~~~~~~~~~~~~~~~
cc1plus: all warnings being treated as errors
gmake[2]: *** [libsolidity/CMakeFiles/solidity.dir/build.make:695: libsolidity/CMakeFiles/solidity.dir/codegen/ir/IRGeneratorForStatements.cpp.o] Error 1
gmake[2]: *** Waiting for unfinished jobs....
gmake[2]: Leaving directory '/builddir/build/BUILD/solidity-0.8.18/redhat-linux-build'
gmake[1]: *** [CMakeFiles/Makefile2:414: libsolidity/CMakeFiles/solidity.dir/all] Error 2
gmake[1]: Leaving directory '/builddir/build/BUILD/solidity-0.8.18/redhat-linux-build'
gmake: *** [Makefile:139: all] Error 2
```

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
 libsolidity/ast/ASTJsonExporter.cpp                 | 3 ++-
 libsolidity/codegen/ir/IRGeneratorForStatements.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index 8b46684bc4..7db502eefb 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -45,6 +45,7 @@
 #include <range/v3/view/map.hpp>
 
 using namespace std;
+using namespace std::string_literals;
 using namespace solidity::langutil;
 
 namespace
@@ -138,7 +139,7 @@ Json::Value ASTJsonExporter::sourceLocationsToJson(vector<SourceLocation> const&
 
 string ASTJsonExporter::namePathToString(std::vector<ASTString> const& _namePath)
 {
-	return boost::algorithm::join(_namePath, ".");
+	return boost::algorithm::join(_namePath, "."s);
 }
 
 Json::Value ASTJsonExporter::typePointerToJson(Type const* _tp, bool _withoutDataLocation)
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 3e3041bc10..fd0199204b 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -179,7 +179,7 @@ struct CopyTranslate: public yul::ASTCopier
 			else
 			{
 				solAssert(!IRVariable{*varDecl}.hasPart("offset"));
-				value = "0";
+				value = "0"s;
 			}
 		}
 		else if (varDecl->type()->dataStoredIn(DataLocation::CallData))

From a38549dc190b06bbc856734788563907c885ebeb Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Fri, 3 Feb 2023 11:29:58 +0100
Subject: [PATCH 1169/1748] Fixes handling bitwise operators for z3 model
 checker

---
 Changelog.md                                         |  1 +
 libsmtutil/Z3Interface.cpp                           |  6 ++++++
 .../bitwise_operators_do_not_throw_exceptions.sol    | 12 ++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol

diff --git a/Changelog.md b/Changelog.md
index 7619fbd40d..bff045843d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 Bugfixes:
  * TypeChecker: Also allow external library functions in ``using for``.
+ * SMTChecker: Fix internal error caused by unhandled ``z3`` expressions that come from the solver when bitwise operators are used.
 
 
 ### 0.8.18 (2023-02-01)
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
index 4abeffa169..21b31d19f8 100644
--- a/libsmtutil/Z3Interface.cpp
+++ b/libsmtutil/Z3Interface.cpp
@@ -344,6 +344,12 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 		return arguments[0] % arguments[1];
 	else if (kind == Z3_OP_XOR)
 		return arguments[0] ^ arguments[1];
+	else if (kind == Z3_OP_BOR)
+		return arguments[0] | arguments[1];
+	else if (kind == Z3_OP_BAND)
+		return arguments[0] & arguments[1];
+	else if (kind == Z3_OP_BXOR)
+		return arguments[0] ^ arguments[1];
 	else if (kind == Z3_OP_BNOT)
 		return !arguments[0];
 	else if (kind == Z3_OP_BSHL)
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol
new file mode 100644
index 0000000000..267705a0eb
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol
@@ -0,0 +1,12 @@
+contract C {
+    // tests that bitwise operators are parsed from z3 answer
+    function test(uint x, uint y) public pure {
+        x | y;
+        x & y;
+        x ^ y;
+        assert(true);
+    }
+}
+// ====
+// SMTEngine: all
+// ----

From 47aa1c65ae7f3acc576372ec327f346d790bccea Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Nov 2022 11:49:40 +0100
Subject: [PATCH 1170/1748] Re-implement KnowledgeBase using groups of
 constantly-spaced variables.

---
 libyul/optimiser/DataFlowAnalyzer.cpp      |   4 +-
 libyul/optimiser/KnowledgeBase.cpp         | 144 +++++++++++++++------
 libyul/optimiser/KnowledgeBase.h           |  57 ++++++--
 libyul/optimiser/UnusedStoreEliminator.cpp |   8 +-
 test/libyul/KnowledgeBaseTest.cpp          |   8 +-
 5 files changed, 165 insertions(+), 56 deletions(-)

diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 59ba7c8f0e..81028e3007 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -50,7 +50,7 @@ DataFlowAnalyzer::DataFlowAnalyzer(
 ):
 	m_dialect(_dialect),
 	m_functionSideEffects(std::move(_functionSideEffects)),
-	m_knowledgeBase(_dialect, [this](YulString _var) { return variableValue(_var); }),
+	m_knowledgeBase([this](YulString _var) { return variableValue(_var); }),
 	m_analyzeStores(_analyzeStores == MemoryAndStorage::Analyze)
 {
 	if (m_analyzeStores)
@@ -76,7 +76,7 @@ void DataFlowAnalyzer::operator()(ExpressionStatement& _statement)
 			cxx20::erase_if(m_state.environment.storage, mapTuple([&](auto&& key, auto&& value) {
 				return
 					!m_knowledgeBase.knownToBeDifferent(vars->first, key) &&
-					!m_knowledgeBase.knownToBeEqual(vars->second, value);
+					vars->second != value;
 			}));
 			m_state.environment.storage[vars->first] = vars->second;
 			return;
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index c706d529b6..2fd5fb0a9b 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -23,7 +23,6 @@
 
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
-#include <libyul/optimiser/SimplificationRules.h>
 #include <libyul/optimiser/DataFlowAnalyzer.h>
 
 #include <libsolutil/CommonData.h>
@@ -36,37 +35,24 @@ using namespace solidity::yul;
 
 bool KnowledgeBase::knownToBeDifferent(YulString _a, YulString _b)
 {
-	// Try to use the simplification rules together with the
-	// current values to turn `sub(_a, _b)` into a nonzero constant.
-	// If that fails, try `eq(_a, _b)`.
-
 	if (optional<u256> difference = differenceIfKnownConstant(_a, _b))
 		return difference != 0;
-
-	Expression expr2 = simplify(FunctionCall{{}, {{}, "eq"_yulstring}, util::make_vector<Expression>(Identifier{{}, _a}, Identifier{{}, _b})});
-	if (holds_alternative<Literal>(expr2))
-		return valueOfLiteral(std::get<Literal>(expr2)) == 0;
-
 	return false;
 }
 
 optional<u256> KnowledgeBase::differenceIfKnownConstant(YulString _a, YulString _b)
 {
-	// Try to use the simplification rules together with the
-	// current values to turn `sub(_a, _b)` into a constant.
-
-	Expression expr1 = simplify(FunctionCall{{}, {{}, "sub"_yulstring}, util::make_vector<Expression>(Identifier{{}, _a}, Identifier{{}, _b})});
-	if (Literal const* value = get_if<Literal>(&expr1))
-		return valueOfLiteral(*value);
-
-	return {};
+	VariableOffset offA = explore(_a);
+	VariableOffset offB = explore(_b);
+	if (offA.reference == offB.reference)
+		return offA.offset - offB.offset;
+	else
+		return {};
 }
 
+
 bool KnowledgeBase::knownToBeDifferentByAtLeast32(YulString _a, YulString _b)
 {
-	// Try to use the simplification rules together with the
-	// current values to turn `sub(_a, _b)` into a constant whose absolute value is at least 32.
-
 	if (optional<u256> difference = differenceIfKnownConstant(_a, _b))
 		return difference >= 32 && difference <= u256(0) - 32;
 
@@ -80,29 +66,113 @@ bool KnowledgeBase::knownToBeZero(YulString _a)
 
 optional<u256> KnowledgeBase::valueIfKnownConstant(YulString _a)
 {
-	if (AssignedValue const* value = m_variableValues(_a))
-		if (Literal const* literal = get_if<Literal>(value->value))
-			return valueOfLiteral(*literal);
-	return {};
+	VariableOffset offset = explore(_a);
+	if (offset.reference == YulString{})
+		return offset.offset;
+	else
+		return nullopt;
+}
+
+optional<u256> KnowledgeBase::valueIfKnownConstant(Expression const& _expression)
+{
+	if (Identifier const* ident = get_if<Identifier>(&_expression))
+		return valueIfKnownConstant(ident->name);
+	else if (Literal const* lit = get_if<Literal>(&_expression))
+		return valueOfLiteral(*lit);
+	else
+		return {};
 }
 
-Expression KnowledgeBase::simplify(Expression _expression)
+KnowledgeBase::VariableOffset KnowledgeBase::explore(YulString _var)
 {
-	m_counter = 0;
-	return simplifyRecursively(std::move(_expression));
+	// We query the value first so that the variable is reset if it has changed
+	// since the last call.
+	Expression const* value = valueOf(_var);
+	if (VariableOffset const* varOff = util::valueOrNullptr(m_offsets, _var))
+		return *varOff;
+
+	if (value)
+		if (optional<VariableOffset> offset = explore(*value))
+			return setOffset(_var, *offset);
+	return setOffset(_var, VariableOffset{_var, 0});
+
 }
 
-Expression KnowledgeBase::simplifyRecursively(Expression _expression)
+optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const& _value)
 {
-	if (m_counter++ > 100)
-		return _expression;
+	if (Literal const* literal = std::get_if<Literal>(&_value))
+		return VariableOffset{YulString{}, valueOfLiteral(*literal)};
+	else if (Identifier const* identifier = std::get_if<Identifier>(&_value))
+		return explore(identifier->name);
+	else if (FunctionCall const* f = get_if<FunctionCall>(&_value))
+		if (f->functionName.name == "add"_yulstring || f->functionName.name == "sub"_yulstring)
+			if (optional<VariableOffset> a = explore(f->arguments[0]))
+				if (optional<VariableOffset> b = explore(f->arguments[1]))
+				{
+					u256 offset =
+						f->functionName.name == "add"_yulstring ?
+						a->offset + b->offset :
+						a->offset - b->offset;
+					if (a->reference == b->reference)
+						// Offsets relative to the same reference variable
+						return VariableOffset{a->reference, offset};
+					else if (a->reference == YulString{})
+						// a is constant
+						return VariableOffset{b->reference, offset};
+					else if (b->reference == YulString{})
+						// b is constant
+						return VariableOffset{a->reference, offset};
+				}
 
-	if (holds_alternative<FunctionCall>(_expression))
-		for (Expression& arg: std::get<FunctionCall>(_expression).arguments)
-			arg = simplifyRecursively(arg);
+	return {};
+}
 
-	if (auto match = SimplificationRules::findFirstMatch(_expression, m_dialect, m_variableValues))
-		return simplifyRecursively(match->action().toExpression(debugDataOf(_expression), langutil::EVMVersion()));
+Expression const* KnowledgeBase::valueOf(YulString _var)
+{
+	Expression const* lastValue = m_lastKnownValue[_var];
+	AssignedValue const* assignedValue = m_variableValues(_var);
+	Expression const* currentValue = assignedValue ? assignedValue->value : nullptr;
+	if (lastValue != currentValue)
+		reset(_var);
+	m_lastKnownValue[_var] = currentValue;
+	return currentValue;
+}
 
-	return _expression;
+void KnowledgeBase::reset(YulString _var)
+{
+	m_lastKnownValue.erase(_var);
+	if (VariableOffset const* offset = util::valueOrNullptr(m_offsets, _var))
+	{
+		// Remove var from its group
+		if (offset->reference != YulString{})
+			m_groupMembers[offset->reference].erase(_var);
+		m_offsets.erase(_var);
+	}
+	if (set<YulString>* group = util::valueOrNullptr(m_groupMembers, _var))
+	{
+		// _var was a representative, we might have to find a new one.
+		if (group->empty())
+			m_groupMembers.erase(_var);
+		else
+		{
+			YulString newRepresentative = *group->begin();
+			u256 newOffset = m_offsets[newRepresentative].offset;
+			for (YulString groupMember: *group)
+			{
+				yulAssert(m_offsets[groupMember].reference == _var);
+				m_offsets[groupMember].reference = newRepresentative;
+				m_offsets[newRepresentative].offset -= newOffset;
+			}
+		}
+	}
+}
+
+KnowledgeBase::VariableOffset KnowledgeBase::setOffset(YulString _variable, VariableOffset _value)
+{
+	m_offsets[_variable] = _value;
+	// Constants are not tracked in m_groupMembers because
+	// the "representative" can never be reset.
+	if (_value.reference != YulString{})
+		m_groupMembers[_value.reference].insert(_variable);
+	return _value;
 }
diff --git a/libyul/optimiser/KnowledgeBase.h b/libyul/optimiser/KnowledgeBase.h
index 999d0e312b..82c82a7e93 100644
--- a/libyul/optimiser/KnowledgeBase.h
+++ b/libyul/optimiser/KnowledgeBase.h
@@ -38,32 +38,69 @@ struct AssignedValue;
 
 /**
  * Class that can answer questions about values of variables and their relations.
+ *
+ * Requires a callback that returns the current value of the variable.
+ * The value can change any time during the lifetime of the KnowledgeBase,
+ * it will update its internal data structure accordingly.
+ *
+ * This means that the code the KnowledgeBase is used on does not need to be in SSA
+ * form.
+ * The only requirement is that the assigned values are movable expressions.
+ *
+ * Internally, tries to find groups of variables that have a mutual constant
+ * difference and stores these differences always relative to a specific
+ * representative variable of the group.
+ *
+ * There is a special group which is the constant values. Those use the
+ * empty YulString as representative "variable".
  */
 class KnowledgeBase
 {
 public:
-	KnowledgeBase(
-		Dialect const& _dialect,
-		std::function<AssignedValue const*(YulString)> _variableValues
-	):
-		m_dialect(_dialect),
+	KnowledgeBase(std::function<AssignedValue const*(YulString)> _variableValues):
 		m_variableValues(std::move(_variableValues))
 	{}
 
 	bool knownToBeDifferent(YulString _a, YulString _b);
 	std::optional<u256> differenceIfKnownConstant(YulString _a, YulString _b);
 	bool knownToBeDifferentByAtLeast32(YulString _a, YulString _b);
-	bool knownToBeEqual(YulString _a, YulString _b) const { return _a == _b; }
 	bool knownToBeZero(YulString _a);
 	std::optional<u256> valueIfKnownConstant(YulString _a);
+	std::optional<u256> valueIfKnownConstant(Expression const& _expression);
 
 private:
-	Expression simplify(Expression _expression);
-	Expression simplifyRecursively(Expression _expression);
+	/**
+	 * Constant offset relative to a reference variable, or absolute constant if the
+	 * reference variable is the empty YulString.
+	 */
+	struct VariableOffset
+	{
+		YulString reference;
+		u256 offset;
+	};
 
-	Dialect const& m_dialect;
+	VariableOffset explore(YulString _var);
+	std::optional<VariableOffset> explore(Expression const& _value);
+
+	/// Retrieves the current value of a variable and potentially resets the variable if it is not up to date.
+	Expression const* valueOf(YulString _var);
+
+	/// Resets all information about the variable and removes it from its group,
+	/// potentially finding a new representative.
+	void reset(YulString _var);
+
+	VariableOffset setOffset(YulString _variable, VariableOffset _value);
+
+	/// Callback to retrieve the current value of a variable.
 	std::function<AssignedValue const*(YulString)> m_variableValues;
-	size_t m_counter = 0;
+
+	/// Offsets for each variable to one representative per group.
+	/// The empty string is the representative of the constant value zero.
+	std::map<YulString, VariableOffset> m_offsets;
+	/// Last known value of each variable we queried.
+	std::map<YulString, Expression const*> m_lastKnownValue;
+	/// For each representative, variables that use it to offset from.
+	std::map<YulString, std::set<YulString>> m_groupMembers;
 };
 
 }
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index 2e96be2e70..d5155ad7e5 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -174,7 +174,7 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 			initialState = State::Used;
 			auto startOffset = identifierNameIfSSA(funCall->arguments.at(1));
 			auto length = identifierNameIfSSA(funCall->arguments.at(2));
-			KnowledgeBase knowledge(m_dialect, [this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
+			KnowledgeBase knowledge([this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
 			if (length && startOffset)
 			{
 				FunctionCall const* lengthCall = get_if<FunctionCall>(m_ssaValues.at(*length).value);
@@ -267,7 +267,7 @@ bool UnusedStoreEliminator::knownUnrelated(
 	UnusedStoreEliminator::Operation const& _op2
 ) const
 {
-	KnowledgeBase knowledge(m_dialect, [this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
+	KnowledgeBase knowledge([this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
 
 	if (_op1.location != _op2.location)
 		return true;
@@ -348,7 +348,7 @@ bool UnusedStoreEliminator::knownCovered(
 		return true;
 	if (_covered.location == Location::Memory)
 	{
-		KnowledgeBase knowledge(m_dialect, [this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
+		KnowledgeBase knowledge([this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
 
 		if (_covered.length && knowledge.knownToBeZero(*_covered.length))
 			return true;
@@ -359,7 +359,7 @@ bool UnusedStoreEliminator::knownCovered(
 			return false;
 		optional<u256> coveredLength = knowledge.valueIfKnownConstant(*_covered.length);
 		optional<u256> coveringLength = knowledge.valueIfKnownConstant(*_covering.length);
-		if (knowledge.knownToBeEqual(*_covered.start, *_covering.start))
+		if (*_covered.start == *_covering.start)
 			if (coveredLength && coveringLength && *coveredLength <= *coveringLength)
 				return true;
 		optional<u256> coveredStart = knowledge.valueIfKnownConstant(*_covered.start);
diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp
index ec2f0313d1..7cb5a8ae3c 100644
--- a/test/libyul/KnowledgeBaseTest.cpp
+++ b/test/libyul/KnowledgeBaseTest.cpp
@@ -58,7 +58,7 @@ class KnowledgeBaseTest
 		for (auto const& [name, expression]: m_ssaValues.values())
 			m_values[name].value = expression;
 
-		return KnowledgeBase(m_dialect, [this](YulString _var) { return util::valueOrNullptr(m_values, _var); });
+		return KnowledgeBase([this](YulString _var) { return util::valueOrNullptr(m_values, _var); });
 	}
 
 	EVMDialect m_dialect{EVMVersion{}, true};
@@ -83,9 +83,11 @@ BOOST_AUTO_TEST_CASE(basic)
 	BOOST_CHECK(!kb.knownToBeDifferent("a"_yulstring, "b"_yulstring));
 	// This only works if the variable names are the same.
 	// It assumes that SSA+CSE+Simplifier actually replaces the variables.
-	BOOST_CHECK(!kb.knownToBeEqual("a"_yulstring, "b"_yulstring));
 	BOOST_CHECK(!kb.valueIfKnownConstant("a"_yulstring));
 	BOOST_CHECK(kb.valueIfKnownConstant("zero"_yulstring) == u256(0));
+	BOOST_CHECK(kb.differenceIfKnownConstant("a"_yulstring, "b"_yulstring) == u256(0));
+	BOOST_CHECK(kb.differenceIfKnownConstant("a"_yulstring, "c"_yulstring) == u256(0));
+	BOOST_CHECK(kb.valueIfKnownConstant("e"_yulstring) == u256(0));
 }
 
 BOOST_AUTO_TEST_CASE(difference)
@@ -94,7 +96,7 @@ BOOST_AUTO_TEST_CASE(difference)
 		let a := calldataload(0)
 		let b := add(a, 200)
 		let c := add(a, 220)
-		let d := add(c, 12)
+		let d := add(12, c)
 		let e := sub(c, 12)
 	})");
 

From 96e2a6d3fe7eb4b7fc197f30910411afbcb869a1 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Nov 2022 14:06:37 +0100
Subject: [PATCH 1171/1748] Keep one instance of KnowledgeBase for
 UnusedStoreEliminator.

---
 libyul/optimiser/UnusedStoreEliminator.cpp | 60 +++++++++++++---------
 libyul/optimiser/UnusedStoreEliminator.h   | 11 ++--
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index d5155ad7e5..2455333952 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -92,6 +92,21 @@ void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
 	remover(_ast);
 }
 
+UnusedStoreEliminator::UnusedStoreEliminator(
+	Dialect const& _dialect,
+	map<YulString, SideEffects> const& _functionSideEffects,
+	map<YulString, ControlFlowSideEffects> _controlFlowSideEffects,
+	map<YulString, AssignedValue> const& _ssaValues,
+	bool _ignoreMemory
+):
+	UnusedStoreBase(_dialect),
+	m_ignoreMemory(_ignoreMemory),
+	m_functionSideEffects(_functionSideEffects),
+	m_controlFlowSideEffects(_controlFlowSideEffects),
+	m_ssaValues(_ssaValues),
+	m_knowledgeBase([this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); })
+{}
+
 void UnusedStoreEliminator::operator()(FunctionCall const& _functionCall)
 {
 	UnusedStoreBase::operator()(_functionCall);
@@ -174,12 +189,11 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 			initialState = State::Used;
 			auto startOffset = identifierNameIfSSA(funCall->arguments.at(1));
 			auto length = identifierNameIfSSA(funCall->arguments.at(2));
-			KnowledgeBase knowledge([this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
 			if (length && startOffset)
 			{
 				FunctionCall const* lengthCall = get_if<FunctionCall>(m_ssaValues.at(*length).value);
 				if (
-					knowledge.knownToBeZero(*startOffset) &&
+					m_knowledgeBase.knownToBeZero(*startOffset) &&
 					lengthCall &&
 					toEVMInstruction(m_dialect, lengthCall->functionName.name) == Instruction::RETURNDATASIZE
 				)
@@ -267,8 +281,6 @@ bool UnusedStoreEliminator::knownUnrelated(
 	UnusedStoreEliminator::Operation const& _op2
 ) const
 {
-	KnowledgeBase knowledge([this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
-
 	if (_op1.location != _op2.location)
 		return true;
 	if (_op1.location == Location::Storage)
@@ -278,26 +290,26 @@ bool UnusedStoreEliminator::knownUnrelated(
 			yulAssert(
 				_op1.length &&
 				_op2.length &&
-				knowledge.valueIfKnownConstant(*_op1.length) == 1 &&
-				knowledge.valueIfKnownConstant(*_op2.length) == 1
+				m_knowledgeBase.valueIfKnownConstant(*_op1.length) == 1 &&
+				m_knowledgeBase.valueIfKnownConstant(*_op2.length) == 1
 			);
-			return knowledge.knownToBeDifferent(*_op1.start, *_op2.start);
+			return m_knowledgeBase.knownToBeDifferent(*_op1.start, *_op2.start);
 		}
 	}
 	else
 	{
 		yulAssert(_op1.location == Location::Memory, "");
 		if (
-			(_op1.length && knowledge.knownToBeZero(*_op1.length)) ||
-			(_op2.length && knowledge.knownToBeZero(*_op2.length))
+			(_op1.length && m_knowledgeBase.knownToBeZero(*_op1.length)) ||
+			(_op2.length && m_knowledgeBase.knownToBeZero(*_op2.length))
 		)
 			return true;
 
 		if (_op1.start && _op1.length && _op2.start)
 		{
-			optional<u256> length1 = knowledge.valueIfKnownConstant(*_op1.length);
-			optional<u256> start1 = knowledge.valueIfKnownConstant(*_op1.start);
-			optional<u256> start2 = knowledge.valueIfKnownConstant(*_op2.start);
+			optional<u256> length1 = m_knowledgeBase.valueIfKnownConstant(*_op1.length);
+			optional<u256> start1 = m_knowledgeBase.valueIfKnownConstant(*_op1.start);
+			optional<u256> start2 = m_knowledgeBase.valueIfKnownConstant(*_op2.start);
 			if (
 				(length1 && start1 && start2) &&
 				*start1 + *length1 >= *start1 && // no overflow
@@ -307,9 +319,9 @@ bool UnusedStoreEliminator::knownUnrelated(
 		}
 		if (_op2.start && _op2.length && _op1.start)
 		{
-			optional<u256> length2 = knowledge.valueIfKnownConstant(*_op2.length);
-			optional<u256> start2 = knowledge.valueIfKnownConstant(*_op2.start);
-			optional<u256> start1 = knowledge.valueIfKnownConstant(*_op1.start);
+			optional<u256> length2 = m_knowledgeBase.valueIfKnownConstant(*_op2.length);
+			optional<u256> start2 = m_knowledgeBase.valueIfKnownConstant(*_op2.start);
+			optional<u256> start1 = m_knowledgeBase.valueIfKnownConstant(*_op1.start);
 			if (
 				(length2 && start2 && start1) &&
 				*start2 + *length2 >= *start2 && // no overflow
@@ -320,12 +332,12 @@ bool UnusedStoreEliminator::knownUnrelated(
 
 		if (_op1.start && _op1.length && _op2.start && _op2.length)
 		{
-			optional<u256> length1 = knowledge.valueIfKnownConstant(*_op1.length);
-			optional<u256> length2 = knowledge.valueIfKnownConstant(*_op2.length);
+			optional<u256> length1 = m_knowledgeBase.valueIfKnownConstant(*_op1.length);
+			optional<u256> length2 = m_knowledgeBase.valueIfKnownConstant(*_op2.length);
 			if (
 				(length1 && *length1 <= 32) &&
 				(length2 && *length2 <= 32) &&
-				knowledge.knownToBeDifferentByAtLeast32(*_op1.start, *_op2.start)
+				m_knowledgeBase.knownToBeDifferentByAtLeast32(*_op1.start, *_op2.start)
 			)
 				return true;
 		}
@@ -348,22 +360,20 @@ bool UnusedStoreEliminator::knownCovered(
 		return true;
 	if (_covered.location == Location::Memory)
 	{
-		KnowledgeBase knowledge([this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); });
-
-		if (_covered.length && knowledge.knownToBeZero(*_covered.length))
+		if (_covered.length && m_knowledgeBase.knownToBeZero(*_covered.length))
 			return true;
 
 		// Condition (i = cover_i_ng, e = cover_e_d):
 		// i.start <= e.start && e.start + e.length <= i.start + i.length
 		if (!_covered.start || !_covering.start || !_covered.length || !_covering.length)
 			return false;
-		optional<u256> coveredLength = knowledge.valueIfKnownConstant(*_covered.length);
-		optional<u256> coveringLength = knowledge.valueIfKnownConstant(*_covering.length);
+		optional<u256> coveredLength = m_knowledgeBase.valueIfKnownConstant(*_covered.length);
+		optional<u256> coveringLength = m_knowledgeBase.valueIfKnownConstant(*_covering.length);
 		if (*_covered.start == *_covering.start)
 			if (coveredLength && coveringLength && *coveredLength <= *coveringLength)
 				return true;
-		optional<u256> coveredStart = knowledge.valueIfKnownConstant(*_covered.start);
-		optional<u256> coveringStart = knowledge.valueIfKnownConstant(*_covering.start);
+		optional<u256> coveredStart = m_knowledgeBase.valueIfKnownConstant(*_covered.start);
+		optional<u256> coveringStart = m_knowledgeBase.valueIfKnownConstant(*_covering.start);
 		if (coveredStart && coveringStart && coveredLength && coveringLength)
 			if (
 				*coveringStart <= *coveredStart &&
diff --git a/libyul/optimiser/UnusedStoreEliminator.h b/libyul/optimiser/UnusedStoreEliminator.h
index 8b5bfd7b14..7fbf9885ff 100644
--- a/libyul/optimiser/UnusedStoreEliminator.h
+++ b/libyul/optimiser/UnusedStoreEliminator.h
@@ -27,6 +27,7 @@
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/UnusedStoreBase.h>
+#include <libyul/optimiser/KnowledgeBase.h>
 
 #include <libevmasm/SemanticInformation.h>
 
@@ -68,13 +69,7 @@ class UnusedStoreEliminator: public UnusedStoreBase
 		std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects,
 		std::map<YulString, AssignedValue> const& _ssaValues,
 		bool _ignoreMemory
-	):
-		UnusedStoreBase(_dialect),
-		m_ignoreMemory(_ignoreMemory),
-		m_functionSideEffects(_functionSideEffects),
-		m_controlFlowSideEffects(_controlFlowSideEffects),
-		m_ssaValues(_ssaValues)
-	{}
+	);
 
 	using UnusedStoreBase::operator();
 	void operator()(FunctionCall const& _functionCall) override;
@@ -121,6 +116,8 @@ class UnusedStoreEliminator: public UnusedStoreBase
 	std::map<YulString, AssignedValue> const& m_ssaValues;
 
 	std::map<Statement const*, Operation> m_storeOperations;
+
+	KnowledgeBase mutable m_knowledgeBase;
 };
 
 }

From 6bbef64034be733f987514a065a1b05b1b3aae65 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Nov 2022 14:22:40 +0100
Subject: [PATCH 1172/1748] Optimize in case this is SSA.

---
 libyul/optimiser/KnowledgeBase.cpp         | 34 ++++++++++++++++++----
 libyul/optimiser/KnowledgeBase.h           |  9 ++++++
 libyul/optimiser/UnusedStoreEliminator.cpp |  2 +-
 3 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index 2fd5fb0a9b..23627653a5 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -33,6 +33,11 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
+KnowledgeBase::KnowledgeBase(map<YulString, AssignedValue> const& _ssaValues):
+	m_valuesAreSSA(true),
+	m_variableValues([_ssaValues](YulString _var) { return util::valueOrNullptr(_ssaValues, _var); })
+{}
+
 bool KnowledgeBase::knownToBeDifferent(YulString _a, YulString _b)
 {
 	if (optional<u256> difference = differenceIfKnownConstant(_a, _b))
@@ -85,11 +90,23 @@ optional<u256> KnowledgeBase::valueIfKnownConstant(Expression const& _expression
 
 KnowledgeBase::VariableOffset KnowledgeBase::explore(YulString _var)
 {
-	// We query the value first so that the variable is reset if it has changed
-	// since the last call.
-	Expression const* value = valueOf(_var);
-	if (VariableOffset const* varOff = util::valueOrNullptr(m_offsets, _var))
-		return *varOff;
+	Expression const* value = nullptr;
+	if (m_valuesAreSSA)
+	{
+		// In SSA, a once determined offset is always valid, so we first see
+		// if we already computed it.
+		if (VariableOffset const* varOff = util::valueOrNullptr(m_offsets, _var))
+			return *varOff;
+		value = valueOf(_var);
+	}
+	else
+	{
+		// For non-SSA, we query the value first so that the variable is reset if it has changed
+		// since the last call.
+		value = valueOf(_var);
+		if (VariableOffset const* varOff = util::valueOrNullptr(m_offsets, _var))
+			return *varOff;
+	}
 
 	if (value)
 		if (optional<VariableOffset> offset = explore(*value))
@@ -129,9 +146,12 @@ optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const&
 
 Expression const* KnowledgeBase::valueOf(YulString _var)
 {
-	Expression const* lastValue = m_lastKnownValue[_var];
 	AssignedValue const* assignedValue = m_variableValues(_var);
 	Expression const* currentValue = assignedValue ? assignedValue->value : nullptr;
+	if (m_valuesAreSSA)
+		return currentValue;
+
+	Expression const* lastValue = m_lastKnownValue[_var];
 	if (lastValue != currentValue)
 		reset(_var);
 	m_lastKnownValue[_var] = currentValue;
@@ -140,6 +160,8 @@ Expression const* KnowledgeBase::valueOf(YulString _var)
 
 void KnowledgeBase::reset(YulString _var)
 {
+	yulAssert(!m_valuesAreSSA);
+
 	m_lastKnownValue.erase(_var);
 	if (VariableOffset const* offset = util::valueOrNullptr(m_offsets, _var))
 	{
diff --git a/libyul/optimiser/KnowledgeBase.h b/libyul/optimiser/KnowledgeBase.h
index 82c82a7e93..934b2e21ad 100644
--- a/libyul/optimiser/KnowledgeBase.h
+++ b/libyul/optimiser/KnowledgeBase.h
@@ -47,6 +47,9 @@ struct AssignedValue;
  * form.
  * The only requirement is that the assigned values are movable expressions.
  *
+ * There is a constructor to provide all SSA values right at the beginning.
+ * If you use this, the KnowledgeBase will be slightly more efficient.
+ *
  * Internally, tries to find groups of variables that have a mutual constant
  * difference and stores these differences always relative to a specific
  * representative variable of the group.
@@ -57,9 +60,13 @@ struct AssignedValue;
 class KnowledgeBase
 {
 public:
+	/// Constructor for arbitrary value callback that allows for variable values
+	/// to change in between calls to functions of this class.
 	KnowledgeBase(std::function<AssignedValue const*(YulString)> _variableValues):
 		m_variableValues(std::move(_variableValues))
 	{}
+	/// Constructor to use if source code is in SSA form and values are constant.
+	KnowledgeBase(std::map<YulString, AssignedValue> const& _ssaValues);
 
 	bool knownToBeDifferent(YulString _a, YulString _b);
 	std::optional<u256> differenceIfKnownConstant(YulString _a, YulString _b);
@@ -91,6 +98,8 @@ class KnowledgeBase
 
 	VariableOffset setOffset(YulString _variable, VariableOffset _value);
 
+	/// If true, we can assume that variable values never change and skip some steps.
+	bool m_valuesAreSSA = false;
 	/// Callback to retrieve the current value of a variable.
 	std::function<AssignedValue const*(YulString)> m_variableValues;
 
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index 2455333952..3df9c63196 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -104,7 +104,7 @@ UnusedStoreEliminator::UnusedStoreEliminator(
 	m_functionSideEffects(_functionSideEffects),
 	m_controlFlowSideEffects(_controlFlowSideEffects),
 	m_ssaValues(_ssaValues),
-	m_knowledgeBase([this](YulString _var) { return util::valueOrNullptr(m_ssaValues, _var); })
+	m_knowledgeBase(_ssaValues)
 {}
 
 void UnusedStoreEliminator::operator()(FunctionCall const& _functionCall)

From eec258c2d29d0b36635ad2e398603d6342176842 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Nov 2022 16:04:19 +0100
Subject: [PATCH 1173/1748] Bugfix.

---
 libyul/optimiser/KnowledgeBase.cpp | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index 23627653a5..558dc89888 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -122,24 +122,33 @@ optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const&
 	else if (Identifier const* identifier = std::get_if<Identifier>(&_value))
 		return explore(identifier->name);
 	else if (FunctionCall const* f = get_if<FunctionCall>(&_value))
-		if (f->functionName.name == "add"_yulstring || f->functionName.name == "sub"_yulstring)
+	{
+		if (f->functionName.name == "add"_yulstring)
+		{
 			if (optional<VariableOffset> a = explore(f->arguments[0]))
 				if (optional<VariableOffset> b = explore(f->arguments[1]))
 				{
-					u256 offset =
-						f->functionName.name == "add"_yulstring ?
-						a->offset + b->offset :
-						a->offset - b->offset;
-					if (a->reference == b->reference)
-						// Offsets relative to the same reference variable
-						return VariableOffset{a->reference, offset};
-					else if (a->reference == YulString{})
+					u256 offset = a->offset + b->offset;
+					if (a->reference.empty())
 						// a is constant
 						return VariableOffset{b->reference, offset};
-					else if (b->reference == YulString{})
+					else if (b->reference.empty())
 						// b is constant
 						return VariableOffset{a->reference, offset};
 				}
+		}
+		else if (f->functionName.name == "sub"_yulstring)
+			if (optional<VariableOffset> a = explore(f->arguments[0]))
+				if (optional<VariableOffset> b = explore(f->arguments[1]))
+				{
+					u256 offset = a->offset - b->offset;
+					if (a->reference == b->reference)
+						return VariableOffset{YulString{}, offset};
+					else if (b->reference.empty())
+						// b is constant
+						return VariableOffset{a->reference, offset};
+				}
+	}
 
 	return {};
 }

From 695b250557e1588147d7658455617327a900b95b Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Nov 2022 17:14:01 +0100
Subject: [PATCH 1174/1748] Update gas costs.

---
 .../array/copying/function_type_array_to_storage.sol            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
index 1e8760250a..409bb2983c 100644
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
@@ -46,7 +46,7 @@ contract C {
 }
 // ----
 // test() -> 0x20, 0x14, "[a called][b called]"
-// gas irOptimized: 116673
+// gas irOptimized: 116660
 // gas legacy: 119030
 // gas legacyOptimized: 117021
 // test2() -> 0x20, 0x14, "[b called][a called]"

From 3ac6edec5b88fc5f11f56f141242b1703e0aa935 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 10 Nov 2022 18:02:56 +0100
Subject: [PATCH 1175/1748] Apply suggestions from code review

---
 libyul/optimiser/KnowledgeBase.cpp | 33 ++++++++++++++++++------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index 558dc89888..96b352e402 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -52,7 +52,7 @@ optional<u256> KnowledgeBase::differenceIfKnownConstant(YulString _a, YulString
 	if (offA.reference == offB.reference)
 		return offA.offset - offB.offset;
 	else
-		return {};
+		return nullopt;
 }
 
 
@@ -66,13 +66,13 @@ bool KnowledgeBase::knownToBeDifferentByAtLeast32(YulString _a, YulString _b)
 
 bool KnowledgeBase::knownToBeZero(YulString _a)
 {
-	return valueIfKnownConstant(_a) == u256{};
+	return valueIfKnownConstant(_a) == 0;
 }
 
 optional<u256> KnowledgeBase::valueIfKnownConstant(YulString _a)
 {
 	VariableOffset offset = explore(_a);
-	if (offset.reference == YulString{})
+	if (offset.reference.empty())
 		return offset.offset;
 	else
 		return nullopt;
@@ -85,7 +85,7 @@ optional<u256> KnowledgeBase::valueIfKnownConstant(Expression const& _expression
 	else if (Literal const* lit = get_if<Literal>(&_expression))
 		return valueOfLiteral(*lit);
 	else
-		return {};
+		return nullopt;
 }
 
 KnowledgeBase::VariableOffset KnowledgeBase::explore(YulString _var)
@@ -117,9 +117,9 @@ KnowledgeBase::VariableOffset KnowledgeBase::explore(YulString _var)
 
 optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const& _value)
 {
-	if (Literal const* literal = std::get_if<Literal>(&_value))
+	if (Literal const* literal = get_if<Literal>(&_value))
 		return VariableOffset{YulString{}, valueOfLiteral(*literal)};
-	else if (Identifier const* identifier = std::get_if<Identifier>(&_value))
+	else if (Identifier const* identifier = get_if<Identifier>(&_value))
 		return explore(identifier->name);
 	else if (FunctionCall const* f = get_if<FunctionCall>(&_value))
 	{
@@ -150,7 +150,7 @@ optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const&
 				}
 	}
 
-	return {};
+	return nullopt;
 }
 
 Expression const* KnowledgeBase::valueOf(YulString _var)
@@ -175,26 +175,33 @@ void KnowledgeBase::reset(YulString _var)
 	if (VariableOffset const* offset = util::valueOrNullptr(m_offsets, _var))
 	{
 		// Remove var from its group
-		if (offset->reference != YulString{})
+		if (!offset->reference.empty())
 			m_groupMembers[offset->reference].erase(_var);
 		m_offsets.erase(_var);
 	}
 	if (set<YulString>* group = util::valueOrNullptr(m_groupMembers, _var))
 	{
 		// _var was a representative, we might have to find a new one.
-		if (group->empty())
-			m_groupMembers.erase(_var);
-		else
+		if (!group->empty())
 		{
 			YulString newRepresentative = *group->begin();
+			yulAssert(newRepresentative != _var);
 			u256 newOffset = m_offsets[newRepresentative].offset;
+			// newOffset = newRepresentative - _var
 			for (YulString groupMember: *group)
 			{
 				yulAssert(m_offsets[groupMember].reference == _var);
 				m_offsets[groupMember].reference = newRepresentative;
-				m_offsets[newRepresentative].offset -= newOffset;
+				// groupMember = _var + m_offsets[groupMember].offset (old)
+				//             = newRepresentative - newOffset + m_offsets[groupMember].offset (old)
+				// so subtracting newOffset from .offset yields the original relation again,
+				// just with _var replaced by newRepresentative
+				m_offsets[groupMember].offset -= newOffset;
 			}
+			m_groupMembers[newRepresentative] = std::move(*group);
+
 		}
+		m_groupMembers.erase(_var);
 	}
 }
 
@@ -203,7 +210,7 @@ KnowledgeBase::VariableOffset KnowledgeBase::setOffset(YulString _variable, Vari
 	m_offsets[_variable] = _value;
 	// Constants are not tracked in m_groupMembers because
 	// the "representative" can never be reset.
-	if (_value.reference != YulString{})
+	if (!_value.reference.empty())
 		m_groupMembers[_value.reference].insert(_variable);
 	return _value;
 }

From 29e4becd73c47d16724263e63b27fc7ab139a278 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Thu, 9 Feb 2023 11:21:37 +0100
Subject: [PATCH 1176/1748] Introduce helpers for VariableOffset.

---
 libyul/optimiser/KnowledgeBase.cpp | 14 +++++---------
 libyul/optimiser/KnowledgeBase.h   | 13 +++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index 96b352e402..e01090146d 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -71,11 +71,7 @@ bool KnowledgeBase::knownToBeZero(YulString _a)
 
 optional<u256> KnowledgeBase::valueIfKnownConstant(YulString _a)
 {
-	VariableOffset offset = explore(_a);
-	if (offset.reference.empty())
-		return offset.offset;
-	else
-		return nullopt;
+	return explore(_a).absoluteValue();
 }
 
 optional<u256> KnowledgeBase::valueIfKnownConstant(Expression const& _expression)
@@ -129,10 +125,10 @@ optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const&
 				if (optional<VariableOffset> b = explore(f->arguments[1]))
 				{
 					u256 offset = a->offset + b->offset;
-					if (a->reference.empty())
+					if (a->isAbsolute())
 						// a is constant
 						return VariableOffset{b->reference, offset};
-					else if (b->reference.empty())
+					else if (b->isAbsolute())
 						// b is constant
 						return VariableOffset{a->reference, offset};
 				}
@@ -144,7 +140,7 @@ optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const&
 					u256 offset = a->offset - b->offset;
 					if (a->reference == b->reference)
 						return VariableOffset{YulString{}, offset};
-					else if (b->reference.empty())
+					else if (b->isAbsolute())
 						// b is constant
 						return VariableOffset{a->reference, offset};
 				}
@@ -175,7 +171,7 @@ void KnowledgeBase::reset(YulString _var)
 	if (VariableOffset const* offset = util::valueOrNullptr(m_offsets, _var))
 	{
 		// Remove var from its group
-		if (!offset->reference.empty())
+		if (!offset->isAbsolute())
 			m_groupMembers[offset->reference].erase(_var);
 		m_offsets.erase(_var);
 	}
diff --git a/libyul/optimiser/KnowledgeBase.h b/libyul/optimiser/KnowledgeBase.h
index 934b2e21ad..258f85f5cd 100644
--- a/libyul/optimiser/KnowledgeBase.h
+++ b/libyul/optimiser/KnowledgeBase.h
@@ -84,6 +84,19 @@ class KnowledgeBase
 	{
 		YulString reference;
 		u256 offset;
+
+		bool isAbsolute() const
+		{
+			return reference.empty();
+		}
+
+		std::optional<u256> absoluteValue() const
+		{
+			if (isAbsolute())
+				return offset;
+			else
+				return std::nullopt;
+		}
 	};
 
 	VariableOffset explore(YulString _var);

From 627bbe2ea3eed9374975b34d4f4cb438a8fd4a46 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Tue, 7 Feb 2023 23:53:38 +0100
Subject: [PATCH 1177/1748] Update stale issues policies

---
 .github/workflows/stale.yml | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 18046d107c..4761c62ac2 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -10,8 +10,8 @@ permissions:
   pull-requests: write
 
 env:
-  BEFORE_ISSUE_STALE: 334
-  BEFORE_ISSUE_CLOSE: 0 #FIXME: change to 14 days
+  BEFORE_ISSUE_STALE: 90
+  BEFORE_ISSUE_CLOSE: 7
   BEFORE_PR_STALE: 14
   BEFORE_PR_CLOSE: 7
 
@@ -28,14 +28,13 @@ jobs:
             This issue has been marked as stale due to inactivity for the last ${{ env.BEFORE_ISSUE_STALE }} days.
             It will be automatically closed in ${{ env.BEFORE_ISSUE_CLOSE }} days.
           close-issue-message: |
-            Hi everyone! This issue has been closed due to inactivity.
+            Hi everyone! This issue has been automatically closed due to inactivity.
             If you think this issue is still relevant in the latest Solidity version and you have something to [contribute](https://docs.soliditylang.org/en/latest/contributing.html), feel free to reopen.
             However, unless the issue is a concrete proposal that can be implemented, we recommend starting a language discussion on the [forum](https://forum.soliditylang.org) instead.
-          any-of-issue-labels: stale # TODO: remove this when we're done with closing ancient issues
-          ascending: true # TODO: remove this when we're done with closing ancient issues
+          ascending: true
           stale-issue-label: stale
           close-issue-label: closed-due-inactivity
-          exempt-issue-labels: 'bug :bug:,roadmap,selected-for-development,must have'
+          exempt-issue-labels: 'bug :bug:,epic,roadmap,selected-for-development,must have,must have eventually,SMT'
           stale-pr-message: |
             This pull request is stale because it has been open for ${{ env.BEFORE_PR_STALE }} days with no activity.
             It will be closed in ${{ env.BEFORE_PR_CLOSE }} days unless the `stale` label is removed.
@@ -48,6 +47,5 @@ jobs:
           exempt-pr-labels: 'external contribution :star:,roadmap,epic'
           exempt-draft-pr: false
           exempt-all-milestones: true
-          # remove-stale-when-updated: true # TODO: uncomment and remove the line below when we're done with closing ancient issues
-          remove-issue-stale-when-updated: false
+          remove-stale-when-updated: true
           operations-per-run: 128

From a5166f0a19971fc778172ffb0fcd790afaf1592b Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Sat, 11 Feb 2023 17:16:03 +0100
Subject: [PATCH 1178/1748] gp2 external test workaround

---
 test/externalTests/common.sh | 3 +--
 test/externalTests/gp2.sh    | 3 +++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/common.sh b/test/externalTests/common.sh
index b6a85c1e3b..97d0a337ee 100644
--- a/test/externalTests/common.sh
+++ b/test/externalTests/common.sh
@@ -235,8 +235,7 @@ function force_truffle_compiler_settings
 function name_hardhat_default_export
 {
     local config_file="$1"
-
-    local import="import {HardhatUserConfig} from 'hardhat/types';"
+    local import="import {HardhatUserConfig} from 'hardhat/types/config';"
     local config="const config: HardhatUserConfig = {"
     sed -i "s|^\s*export\s*default\s*{|${import}\n${config}|g" "$config_file"
     echo "export default config;" >> "$config_file"
diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index 9e9ee72af2..120379478a 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -76,6 +76,9 @@ function gp2_test
     # See https://github.com/cowprotocol/contracts/issues/32
     yarn add @tenderly/hardhat-tenderly@1.1.6
 
+    # Add missing sinon type definitions
+    yarn add @types/sinon
+
     # Some dependencies come with pre-built artifacts. We want to build from scratch.
     rm -r node_modules/@gnosis.pm/safe-contracts/build/
 

From 7585cd95076b532e080a78f3242bb19853b7e909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 2 Feb 2023 14:47:03 +0100
Subject: [PATCH 1179/1748] ReleaseChecklist: List packages needed to update
 the PPA as prerequisites

---
 ReleaseChecklist.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 0e46522ba3..589f5ad4fa 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -7,6 +7,7 @@
  - [ ] DockerHub account with push rights to the [``solc`` image](https://hub.docker.com/r/ethereum/solc).
  - [ ] Lauchpad (Ubuntu One) account with a membership in the ["Ethereum" team](https://launchpad.net/~ethereum) and
        a gnupg key for your email in the ``ethereum.org`` domain (has to be version 1, gpg2 won't work).
+ - [ ] Ubuntu/Debian dependencies of the PPA scripts: ``devscripts``, ``debhelper``, ``dput``, ``git``, ``wget``, ``ca-certificates``.
  - [ ] [npm Registry](https://www.npmjs.com) account added as a collaborator for the [``solc`` package](https://www.npmjs.com/package/solc).
  - [ ] Access to the [solidity_lang Twitter account](https://twitter.com/solidity_lang).
  - [ ] [Reddit](https://www.reddit.com) account that is at least 10 days old with a minimum of 20 comment karma (``/r/ethereum`` requirements).

From 8b7879c7dad9d3850546ea2a8b34742033b04f0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 2 Feb 2023 14:47:31 +0100
Subject: [PATCH 1180/1748] ReleaseChecklist: `static-z3.sh` is actually called
 `static_z3.sh`

---
 ReleaseChecklist.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 589f5ad4fa..8c38bd8e47 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -58,9 +58,9 @@
 
 ### PPA
  - [ ] Create ``.release_ppa_auth`` at the root of your local Solidity checkout and set ``LAUNCHPAD_EMAIL`` and ``LAUNCHPAD_KEYID`` to your key's email and key id.
- - [ ] Double-check that the ``DISTRIBUTIONS`` list in ``scripts/release_ppa.sh`` and ``scripts/deps-ppa/static-z3.sh`` contains the most recent versions of Ubuntu.
+ - [ ] Double-check that the ``DISTRIBUTIONS`` list in ``scripts/release_ppa.sh`` and ``scripts/deps-ppa/static_z3.sh`` contains the most recent versions of Ubuntu.
  - [ ] Make sure the [``~ethereum/cpp-build-deps`` PPA repository](https://launchpad.net/~ethereum/+archive/ubuntu/cpp-build-deps) contains ``libz3-static-dev builds`` for all current versions of Ubuntu.
-       If not, run ``scripts/deps-ppa/static-z3.sh`` and wait for the builds to succeed before continuing.
+       If not, run ``scripts/deps-ppa/static_z3.sh`` and wait for the builds to succeed before continuing.
  - [ ] Run ``scripts/release_ppa.sh v$VERSION`` to create the PPA release.
  - [ ] Wait for the [``~ethereum/ethereum-static`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum-static) build to be finished and published for *all platforms*.
        **SERIOUSLY: DO NOT PROCEED EARLIER!!!**

From 89c4ee69420612b18e6637e5b20213595d45c069 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 3 Feb 2023 19:01:22 +0100
Subject: [PATCH 1181/1748] Add a script for generating a list of contributors
 to paste in release notes

---
 ReleaseChecklist.md          |  4 ++-
 scripts/list_contributors.sh | 51 ++++++++++++++++++++++++++++++++++++
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100755 scripts/list_contributors.sh

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 8c38bd8e47..f5b5e3ada0 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -33,7 +33,9 @@
        Set the target to the ``develop`` branch and the tag to the new version, e.g. ``v0.8.5``.
        Include the following warning: ``**The release is still in progress and the binaries may not yet be available from all sources.**``.
        Don't publish it yet - click the ``Save draft`` button instead.
- - [ ] Thank voluntary contributors in the GitHub release notes (use ``git shortlog --summary --email v0.5.3..origin/develop``).
+ - [ ] Thank voluntary contributors in the GitHub release notes.
+       Use ``scripts/list_contributors.sh v<previous version>`` to get initial list of names.
+       Remove different variants of the same name manually before using the output.
  - [ ] Check that all tests on the latest commit in ``develop`` are green.
  - [ ] Click the ``Publish release`` button on the release page, creating the tag.
  - [ ] Wait for the CI runs on the tag itself.
diff --git a/scripts/list_contributors.sh b/scripts/list_contributors.sh
new file mode 100755
index 0000000000..4b8f06d765
--- /dev/null
+++ b/scripts/list_contributors.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+# ------------------------------------------------------------------------------
+# Creates a list containing names of people who contributed to the project, for use
+# in release notes. The names come from the author field on the commits between
+# the current revision and the one specified as argument.
+#
+# Note that the output often requires extra manual processing to remove entries
+# that refer to the same person (diacritics vs no diacritics, name vs nickname, etc.).
+#
+# Usage:
+#    <script name>.sh <revision>
+#
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2023 solidity contributors.
+#------------------------------------------------------------------------------
+
+set -euo pipefail
+
+script_dir=$(dirname "$0")
+# shellcheck source=scripts/common.sh
+source "${script_dir}/common.sh"
+
+(( $# == 1)) || fail "Wrong number of arguments. Usage: $0 <revision>."
+
+revision="$1"
+
+# NOTE: Commas are removed from any names containing them. It would look confusing otherwise, given
+# that the list is delimited by commas. Hopefully no contributor uses a comma as their nickname.
+git shortlog --summary "${revision}..origin/develop" |
+    cut --field 2 |
+    tr --delete , |
+    sort |
+    uniq |
+    paste --serial --delimiter=, |
+    sed -e 's/,/, /g'

From 0384506e555b06782ad24e620075adf9ba5cf746 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 3 Feb 2023 19:38:13 +0100
Subject: [PATCH 1182/1748] ReleaseChecklist: Pre-flight checks and drafts to
 be prepared before the release

---
 ReleaseChecklist.md | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index f5b5e3ada0..d029d51b28 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -12,15 +12,34 @@
  - [ ] Access to the [solidity_lang Twitter account](https://twitter.com/solidity_lang).
  - [ ] [Reddit](https://www.reddit.com) account that is at least 10 days old with a minimum of 20 comment karma (``/r/ethereum`` requirements).
 
+### Pre-flight checks
+At least a day before the release:
+ - [ ] Run ``make linkcheck`` from within ``docs/`` and fix any broken links it finds.
+       Ignore false positives caused by ``href`` anchors and dummy links not meant to work.
+ - [ ] Make sure that all merged PRs that should have changelog entries do have them.
+ - [ ] Rerun CI on the top commits of main branches in all repositories that do not have daily activity by creating a test branch or PR:
+      - [ ] ``solc-js``
+      - [ ] ``solc-bin`` (make sure the bytecode comparison check did run)
+      - [ ] ``homebrew-ethereum``
+ - [ ] (Optional) Create a prerelease in our Ubuntu PPA by following the steps in the PPA section below on ``develop`` rather than on a tag.
+       This is recommended especially when dealing with PPA for the first time, when we add a new Ubuntu version or when the PPA scripts were modified in this release cycle.
+ - [ ] Verify that the release tarball of ``solc-js`` works.
+       Bump version locally, add ``soljson.js`` from CI, build it, compare the file structure with the previous version, install it locally and try to use it.
+
+### Drafts
+At least a day before the release:
+ - [ ] Create a draft PR to sort the changelog.
+ - [ ] Create draft PRs to bump version in ``solidity`` and ``solc-js``.
+ - [ ] Create a draft of the release on github.
+ - [ ] Create a draft PR to update soliditylang.org.
+ - [ ] Create drafts of blog posts.
+ - [ ] Prepare drafts of Twitter, Reddit and Solidity Forum announcements.
+
 ### Blog Post
  - [ ] Create a post on [solidity-blog](https://github.com/ethereum/solidity-blog) in the ``Releases`` category and explain some of the new features or concepts.
  - [ ] Create a post on [solidity-blog](https://github.com/ethereum/solidity-blog) in the ``Security Alerts`` category in case of important bug(s).
 
-### Documentation check
- - [ ] Run ``make linkcheck`` from within ``docs/`` and fix any broken links it finds. Ignore false positives caused by ``href`` anchors and dummy links not meant to work.
-
 ### Changelog
- - [ ] Make sure that all merged PRs that should have changelog entries do have them.
  - [ ] Sort the changelog entries alphabetically and correct any errors you notice. Commit it.
  - [ ] Update the changelog to include a release date.
  - [ ] Run ``scripts/update_bugs_by_version.py`` to regenerate ``bugs_by_version.json`` from the changelog and ``bugs.json``.

From 0aefd15576f834f5448344de23044705d27a973b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 3 Feb 2023 19:55:27 +0100
Subject: [PATCH 1183/1748] ReleaseChecklist: Add more detail to the PPA steps

---
 ReleaseChecklist.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index d029d51b28..25cdfe0463 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -81,11 +81,15 @@ At least a day before the release:
  - [ ] Create ``.release_ppa_auth`` at the root of your local Solidity checkout and set ``LAUNCHPAD_EMAIL`` and ``LAUNCHPAD_KEYID`` to your key's email and key id.
  - [ ] Double-check that the ``DISTRIBUTIONS`` list in ``scripts/release_ppa.sh`` and ``scripts/deps-ppa/static_z3.sh`` contains the most recent versions of Ubuntu.
  - [ ] Make sure the [``~ethereum/cpp-build-deps`` PPA repository](https://launchpad.net/~ethereum/+archive/ubuntu/cpp-build-deps) contains ``libz3-static-dev builds`` for all current versions of Ubuntu.
-       If not, run ``scripts/deps-ppa/static_z3.sh`` and wait for the builds to succeed before continuing.
+       Note that it may be included in the ``z3-static`` multipackage (follow the ``View package details`` link to check).
+       If not present, run ``scripts/deps-ppa/static_z3.sh`` and wait for the builds to succeed before continuing.
  - [ ] Run ``scripts/release_ppa.sh v$VERSION`` to create the PPA release.
- - [ ] Wait for the [``~ethereum/ethereum-static`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum-static) build to be finished and published for *all platforms*.
+       This will create a single package containing static binary for older Ubuntu versions in the [``~ethereum/ethereum-static`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum-static)
+       and separate packages with dynamically-linked binaries for recent versions (those listed in ``DISTRIBUTIONS``) in the [``~ethereum/ethereum`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum).
+ - [ ] Wait for the build to be finished and published for *all architectures* (currently we only build for ``amd64``, but we may add ``arm`` in the future).
        **SERIOUSLY: DO NOT PROCEED EARLIER!!!**
-       *After* the static builds are *published*, copy the static package to the [``~ethereum/ethereum`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum)
+ - [ ] *After* the package with the static build is *published*, use it to create packages for older Ubuntu versions.
+       Copy the static package to the [``~ethereum/ethereum`` PPA](https://launchpad.net/~ethereum/+archive/ubuntu/ethereum)
        for the destination series ``Trusty``, ``Xenial`` and ``Bionic`` while selecting ``Copy existing binaries``.
 
 ### Release solc-js

From 16bc4c6b5f5d4c714fbeffd6c2f4fe58c76c8ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 13 Feb 2023 20:13:37 +0100
Subject: [PATCH 1184/1748] Fix test for replacing base constructor

---
 .../062_base_constructor_arguments_override.sol                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
index 0e123ae23a..181364fed9 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
@@ -1,4 +1,4 @@
 contract A { constructor(uint a) { } }
-contract B is A { }
+contract B is A { constructor(bytes4 a, bytes28 b) { } }
 // ----
 // TypeError 3656: (39-58): Contract "B" should be marked as abstract.

From bc3cbfa18dc72c560a5ed3a059ddabb646c593ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 13 Feb 2023 20:14:49 +0100
Subject: [PATCH 1185/1748] Add more tests tests for calls to base constructor
 with missing or wrong arguments

---
 .../base_constructor_missing_arguments.sol    | 30 +++++++++++++++++++
 ...abstract_inheritance_list_empty_parens.sol | 16 ++++++++++
 ...ssing_arguments_abstract_lists_omitted.sol |  6 ++++
 ...ssing_arguments_abstract_modifier_init.sol |  8 +++++
 ...ents_abstract_modifier_init_empty_list.sol |  7 +++++
 ...g_count_inheritance_and_modifier_lists.sol | 13 ++++++++
 ...uctor_wrong_arg_count_inheritance_list.sol |  9 ++++++
 ...ng_arg_count_inheritance_list_abstract.sol |  9 ++++++
 ...ce_list_empty_parens_and_modifier_list.sol | 11 +++++++
 ...eritance_list_with_derived_constructor.sol |  9 ++++++
 ...structor_wrong_arg_count_modifier_list.sol |  9 ++++++
 11 files changed, 127 insertions(+)
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_inheritance_list_empty_parens.sol
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_lists_omitted.sol
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init.sol
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init_empty_list.sol
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_empty_parens_and_modifier_list.sol
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol
 create mode 100644 test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_modifier_list.sol

diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol
new file mode 100644
index 0000000000..2432d7e73c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol
@@ -0,0 +1,30 @@
+contract C {
+    constructor(uint, bool) {}
+}
+
+contract D is C() {}
+contract E is C() { constructor() {} }
+contract F is C() { constructor() C {} }
+contract G is C() { constructor() C() {} }
+
+contract H is C {}
+contract I is C { constructor() {} }
+contract J is C { constructor() C {} }
+contract K is C { constructor() C() {} }
+// ----
+// TypeError 3656: (47-67): Contract "D" should be marked as abstract.
+// TypeError 3656: (68-106): Contract "E" should be marked as abstract.
+// DeclarationError 1563: (141-142): Modifier-style base constructor call without arguments.
+// TypeError 3656: (107-147): Contract "F" should be marked as abstract.
+// TypeError 3656: (192-210): Contract "H" should be marked as abstract.
+// TypeError 3656: (211-247): Contract "I" should be marked as abstract.
+// DeclarationError 1563: (280-281): Modifier-style base constructor call without arguments.
+// TypeError 3656: (248-286): Contract "J" should be marked as abstract.
+// TypeError 7927: (61-64): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (82-85): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (121-124): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 2973: (141-142): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
+// TypeError 7927: (162-165): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 2973: (182-185): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
+// TypeError 2973: (280-281): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
+// TypeError 2973: (319-322): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_inheritance_list_empty_parens.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_inheritance_list_empty_parens.sol
new file mode 100644
index 0000000000..42ba9886f3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_inheritance_list_empty_parens.sol
@@ -0,0 +1,16 @@
+abstract contract C {
+    constructor(uint, bool) {}
+}
+
+abstract contract D is C() {}
+abstract contract E is C() { constructor() {} }
+abstract contract F is C() { constructor() C {} }
+abstract contract G is C() { constructor() C() {} }
+// ----
+// DeclarationError 1563: (177-178): Modifier-style base constructor call without arguments.
+// TypeError 7927: (79-82): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (109-112): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (157-160): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 2973: (177-178): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
+// TypeError 7927: (207-210): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 2973: (227-230): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_lists_omitted.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_lists_omitted.sol
new file mode 100644
index 0000000000..ad934d7e7b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_lists_omitted.sol
@@ -0,0 +1,6 @@
+abstract contract C {
+    constructor(uint, bool) {}
+}
+
+abstract contract D is C {}
+abstract contract E is C { constructor() {} }
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init.sol
new file mode 100644
index 0000000000..7cf33c0ecd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init.sol
@@ -0,0 +1,8 @@
+abstract contract C {
+    constructor(uint, bool) {}
+}
+
+abstract contract D is C { constructor() C {} }
+// ----
+// DeclarationError 1563: (97-98): Modifier-style base constructor call without arguments.
+// TypeError 2973: (97-98): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init_empty_list.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init_empty_list.sol
new file mode 100644
index 0000000000..43c68a7eee
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments_abstract_modifier_init_empty_list.sol
@@ -0,0 +1,7 @@
+abstract contract C {
+    constructor(uint, bool) {}
+}
+
+abstract contract D is C { constructor() C() {} }
+// ----
+// TypeError 2973: (97-100): Wrong argument count for modifier invocation: 0 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol
new file mode 100644
index 0000000000..290afd91b6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol
@@ -0,0 +1,13 @@
+contract C {
+    constructor(uint, bool) {}
+}
+
+contract D is C(1, true, "a") { constructor() C(1, true, "a") {} }
+contract E is C(1) { constructor() C(1) {} }
+// ----
+// DeclarationError 3364: (93-108): Base constructor arguments given twice.
+// DeclarationError 3364: (149-153): Base constructor arguments given twice.
+// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 2973: (93-108): Wrong argument count for modifier invocation: 3 arguments given but expected 2.
+// TypeError 7927: (128-132): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 2973: (149-153): Wrong argument count for modifier invocation: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol
new file mode 100644
index 0000000000..2a933e3f0d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol
@@ -0,0 +1,9 @@
+contract C {
+    constructor(uint, bool) {}
+}
+
+contract D is C(1, true, "a") {}
+contract E is C(1) {}
+// ----
+// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (94-98): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol
new file mode 100644
index 0000000000..4974cdbc1c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol
@@ -0,0 +1,9 @@
+abstract contract C {
+    constructor(uint, bool) {}
+}
+
+abstract contract D is C(1, true, "a") {}
+abstract contract E is C(1) {}
+// ----
+// TypeError 7927: (79-94): Wrong argument count for constructor call: 3 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (121-125): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_empty_parens_and_modifier_list.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_empty_parens_and_modifier_list.sol
new file mode 100644
index 0000000000..5bf9d12394
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_empty_parens_and_modifier_list.sol
@@ -0,0 +1,11 @@
+contract C {
+    constructor(uint, bool) {}
+}
+
+contract D is C() { constructor() C(1, true, "a") {} }
+contract E is C() { constructor() C(1) {} }
+// ----
+// TypeError 7927: (61-64): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 2973: (81-96): Wrong argument count for modifier invocation: 3 arguments given but expected 2.
+// TypeError 7927: (116-119): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 2973: (136-140): Wrong argument count for modifier invocation: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol
new file mode 100644
index 0000000000..02113c04b5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol
@@ -0,0 +1,9 @@
+contract C {
+    constructor(uint, bool) {}
+}
+
+contract D is C(1, true, "a") { constructor() {} }
+contract E is C(1) { constructor() {} }
+// ----
+// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (112-116): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_modifier_list.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_modifier_list.sol
new file mode 100644
index 0000000000..8fe486e16c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_modifier_list.sol
@@ -0,0 +1,9 @@
+contract C {
+    constructor(uint, bool) {}
+}
+
+contract D is C { constructor() C(1, true, "a") {} }
+contract E is C { constructor() C(1) {} }
+// ----
+// TypeError 2973: (79-94): Wrong argument count for modifier invocation: 3 arguments given but expected 2.
+// TypeError 2973: (132-136): Wrong argument count for modifier invocation: 1 arguments given but expected 2.

From 73183d3df9fe8b21e504d37ef04dc9b7bb9c250d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 13 Feb 2023 20:18:08 +0100
Subject: [PATCH 1186/1748] Fix missing base constructor arguments being
 treated as an unimplemented function

---
 Changelog.md                                  |  1 +
 libsolidity/analysis/ContractLevelChecker.cpp | 31 ++++++++++++++-----
 .../abstract_creation_forward_reference.sol   |  2 +-
 .../base_constructor_missing_arguments.sol    | 12 +++----
 .../constructor/constructor_visibility.sol    |  2 +-
 ...061_missing_base_constructor_arguments.sol |  2 +-
 ...62_base_constructor_arguments_override.sol |  2 +-
 7 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2a849b4553..95095b1024 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * ContractLevelChecker: Properly distinguish the case of missing base constructor arguments from having an unimplemented base function.
  * SMTChecker: Fix internal error when using the custom NatSpec annotation to abstract free functions.
  * TypeChecker: Also allow external library functions in ``using for``.
  * SMTChecker: Fix internal error caused by unhandled ``z3`` expressions that come from the solver when bitwise operators are used.
diff --git a/libsolidity/analysis/ContractLevelChecker.cpp b/libsolidity/analysis/ContractLevelChecker.cpp
index 9ecf76f130..e7e7041a0f 100644
--- a/libsolidity/analysis/ContractLevelChecker.cpp
+++ b/libsolidity/analysis/ContractLevelChecker.cpp
@@ -28,6 +28,8 @@
 #include <libsolutil/FunctionSelector.h>
 #include <liblangutil/ErrorReporter.h>
 
+#include <fmt/format.h>
+
 #include <range/v3/view/reverse.hpp>
 
 using namespace std;
@@ -284,9 +286,6 @@ void ContractLevelChecker::checkAbstractDefinitions(ContractDefinition const& _c
 	}
 
 	// Set to not fully implemented if at least one flag is false.
-	// Note that `_contract.annotation().unimplementedDeclarations` has already been
-	// pre-filled by `checkBaseConstructorArguments`.
-	//
 	for (auto const& proxy: proxies)
 		if (proxy.unimplemented())
 			_contract.annotation().unimplementedDeclarations->push_back(proxy.declaration());
@@ -362,11 +361,27 @@ void ContractLevelChecker::checkBaseConstructorArguments(ContractDefinition cons
 
 	// check that we get arguments for all base constructors that need it.
 	// If not mark the contract as abstract (not fully implemented)
-	for (ContractDefinition const* contract: bases)
-		if (FunctionDefinition const* constructor = contract->constructor())
-			if (contract != &_contract && !constructor->parameters().empty())
-				if (!_contract.annotation().baseConstructorArguments.count(constructor))
-					_contract.annotation().unimplementedDeclarations->push_back(constructor);
+	if (_contract.contractKind() == ContractKind::Contract && !_contract.abstract())
+		for (ContractDefinition const* baseContract: bases)
+			if (FunctionDefinition const* baseConstructor = baseContract->constructor())
+				if (
+					baseContract != &_contract &&
+					!baseConstructor->parameters().empty() &&
+					_contract.annotation().baseConstructorArguments.count(baseConstructor) == 0
+				)
+					m_errorReporter.typeError(
+						3415_error,
+						_contract.location(),
+						SecondarySourceLocation{}.append(
+							"Base constructor parameters:",
+							baseConstructor->parameterList().location()
+						),
+						fmt::format(
+							"No arguments passed to the base constructor. "
+							"Specify the arguments or mark \"{}\" as abstract.",
+							*_contract.annotation().canonicalName
+						)
+					);
 }
 
 void ContractLevelChecker::annotateBaseConstructorArguments(
diff --git a/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol b/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol
index 491c688cc8..144b3141a1 100644
--- a/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol
+++ b/test/libsolidity/syntaxTests/constructor/abstract_creation_forward_reference.sol
@@ -12,4 +12,4 @@ contract Parent {
 contract Child is Parent {
 }
 // ----
-// TypeError 3656: (226-254): Contract "Child" should be marked as abstract.
+// TypeError 3415: (226-254): No arguments passed to the base constructor. Specify the arguments or mark "Child" as abstract.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol
index 2432d7e73c..5a005c1601 100644
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_missing_arguments.sol
@@ -12,14 +12,14 @@ contract I is C { constructor() {} }
 contract J is C { constructor() C {} }
 contract K is C { constructor() C() {} }
 // ----
-// TypeError 3656: (47-67): Contract "D" should be marked as abstract.
-// TypeError 3656: (68-106): Contract "E" should be marked as abstract.
+// TypeError 3415: (47-67): No arguments passed to the base constructor. Specify the arguments or mark "D" as abstract.
+// TypeError 3415: (68-106): No arguments passed to the base constructor. Specify the arguments or mark "E" as abstract.
 // DeclarationError 1563: (141-142): Modifier-style base constructor call without arguments.
-// TypeError 3656: (107-147): Contract "F" should be marked as abstract.
-// TypeError 3656: (192-210): Contract "H" should be marked as abstract.
-// TypeError 3656: (211-247): Contract "I" should be marked as abstract.
+// TypeError 3415: (107-147): No arguments passed to the base constructor. Specify the arguments or mark "F" as abstract.
+// TypeError 3415: (192-210): No arguments passed to the base constructor. Specify the arguments or mark "H" as abstract.
+// TypeError 3415: (211-247): No arguments passed to the base constructor. Specify the arguments or mark "I" as abstract.
 // DeclarationError 1563: (280-281): Modifier-style base constructor call without arguments.
-// TypeError 3656: (248-286): Contract "J" should be marked as abstract.
+// TypeError 3415: (248-286): No arguments passed to the base constructor. Specify the arguments or mark "J" as abstract.
 // TypeError 7927: (61-64): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
 // TypeError 7927: (82-85): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
 // TypeError 7927: (121-124): Wrong argument count for constructor call: 0 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
diff --git a/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol b/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol
index 0175e22f7e..5992dfa4c9 100644
--- a/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol
+++ b/test/libsolidity/syntaxTests/constructor/constructor_visibility.sol
@@ -9,5 +9,5 @@ contract B is A {
   }
 }
 // ----
-// TypeError 3656: (124-303): Contract "B" should be marked as abstract.
+// TypeError 3415: (124-303): No arguments passed to the base constructor. Specify the arguments or mark "B" as abstract.
 // TypeError 9640: (252-256): Explicit type conversion not allowed from "string memory" to "contract A".
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol
index 0e123ae23a..83119653bb 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/061_missing_base_constructor_arguments.sol
@@ -1,4 +1,4 @@
 contract A { constructor(uint a) { } }
 contract B is A { }
 // ----
-// TypeError 3656: (39-58): Contract "B" should be marked as abstract.
+// TypeError 3415: (39-58): No arguments passed to the base constructor. Specify the arguments or mark "B" as abstract.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
index 181364fed9..bdca8fdd37 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/062_base_constructor_arguments_override.sol
@@ -1,4 +1,4 @@
 contract A { constructor(uint a) { } }
 contract B is A { constructor(bytes4 a, bytes28 b) { } }
 // ----
-// TypeError 3656: (39-58): Contract "B" should be marked as abstract.
+// TypeError 3415: (39-95): No arguments passed to the base constructor. Specify the arguments or mark "B" as abstract.

From 1a981af5481ae8c012fc2cd2c5671afc913b0e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 13 Feb 2023 20:25:19 +0100
Subject: [PATCH 1187/1748] Only suggest removing parentheses from a
 construction call if they're empty

---
 libsolidity/analysis/TypeChecker.cpp                          | 2 +-
 ...tructor_wrong_arg_count_inheritance_and_modifier_lists.sol | 4 ++--
 .../base_constructor_wrong_arg_count_inheritance_list.sol     | 4 ++--
 ..._constructor_wrong_arg_count_inheritance_list_abstract.sol | 4 ++--
 ...ng_arg_count_inheritance_list_with_derived_constructor.sol | 4 ++--
 .../syntaxTests/inheritance/too_few_base_arguments.sol        | 2 +-
 .../525_reject_interface_constructors.sol                     | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 074b644b77..ff8cc87cdd 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -365,7 +365,7 @@ void TypeChecker::endVisit(InheritanceSpecifier const& _inheritance)
 				toString(arguments->size()) +
 				" arguments given but expected " +
 				toString(parameterTypes.size()) +
-				". Remove parentheses if you do not want to provide arguments here."
+				(arguments->size() == 0 ? ". Remove parentheses if you do not want to provide arguments here." : "")
 			);
 		}
 		for (size_t i = 0; i < std::min(arguments->size(), parameterTypes.size()); ++i)
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol
index 290afd91b6..08193b6dae 100644
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_and_modifier_lists.sol
@@ -7,7 +7,7 @@ contract E is C(1) { constructor() C(1) {} }
 // ----
 // DeclarationError 3364: (93-108): Base constructor arguments given twice.
 // DeclarationError 3364: (149-153): Base constructor arguments given twice.
-// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2
 // TypeError 2973: (93-108): Wrong argument count for modifier invocation: 3 arguments given but expected 2.
-// TypeError 7927: (128-132): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (128-132): Wrong argument count for constructor call: 1 arguments given but expected 2
 // TypeError 2973: (149-153): Wrong argument count for modifier invocation: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol
index 2a933e3f0d..f20462484b 100644
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list.sol
@@ -5,5 +5,5 @@ contract C {
 contract D is C(1, true, "a") {}
 contract E is C(1) {}
 // ----
-// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 7927: (94-98): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2
+// TypeError 7927: (94-98): Wrong argument count for constructor call: 1 arguments given but expected 2
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol
index 4974cdbc1c..b7b619d843 100644
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_abstract.sol
@@ -5,5 +5,5 @@ abstract contract C {
 abstract contract D is C(1, true, "a") {}
 abstract contract E is C(1) {}
 // ----
-// TypeError 7927: (79-94): Wrong argument count for constructor call: 3 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 7927: (121-125): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (79-94): Wrong argument count for constructor call: 3 arguments given but expected 2
+// TypeError 7927: (121-125): Wrong argument count for constructor call: 1 arguments given but expected 2
diff --git a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol
index 02113c04b5..ff8a0f93b7 100644
--- a/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol
+++ b/test/libsolidity/syntaxTests/constructor/base_constructor_wrong_arg_count_inheritance_list_with_derived_constructor.sol
@@ -5,5 +5,5 @@ contract C {
 contract D is C(1, true, "a") { constructor() {} }
 contract E is C(1) { constructor() {} }
 // ----
-// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
-// TypeError 7927: (112-116): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (61-76): Wrong argument count for constructor call: 3 arguments given but expected 2
+// TypeError 7927: (112-116): Wrong argument count for constructor call: 1 arguments given but expected 2
diff --git a/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol b/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol
index d3f33f6d69..4042e0089a 100644
--- a/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol
+++ b/test/libsolidity/syntaxTests/inheritance/too_few_base_arguments.sol
@@ -6,5 +6,5 @@ contract Derived2 is Base {
   constructor() Base(2) { }
 }
 // ----
-// TypeError 7927: (67-74): Wrong argument count for constructor call: 1 arguments given but expected 2. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (67-74): Wrong argument count for constructor call: 1 arguments given but expected 2
 // TypeError 2973: (123-130): Wrong argument count for modifier invocation: 1 arguments given but expected 2.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol
index f1ffa651f3..88396f8c6e 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/525_reject_interface_constructors.sol
@@ -1,4 +1,4 @@
 interface I {}
 contract C is I(2) {}
 // ----
-// TypeError 7927: (29-33): Wrong argument count for constructor call: 1 arguments given but expected 0. Remove parentheses if you do not want to provide arguments here.
+// TypeError 7927: (29-33): Wrong argument count for constructor call: 1 arguments given but expected 0

From ceaa7b53da607c83d3976c8e23e72ef95bb3a25c Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 15 Feb 2023 18:54:15 +0100
Subject: [PATCH 1188/1748] Skipping flaky openzeppelin tests

---
 test/externalTests/zeppelin.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 11e148c182..3042fdd2ce 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -138,6 +138,10 @@ function zeppelin_test
     sed -i "s|describe(\('reverting initialization'\)|describe.skip(\1|g" test/proxy/Proxy.behaviour.js
     sed -i "s|it(\('does not allow remote callback'\)|it.skip(\1|g" test/security/ReentrancyGuard.test.js
 
+    # TODO: Remove this when https://github.com/OpenZeppelin/openzeppelin-contracts/issues/4049 gets fixed
+    sed -i "s|it(\('Succeeded'\)|it.skip(\1|g" test/governance/Governor.test.js
+    sed -i "s|it(\('Delay is extended to prevent last minute take-over'\)|it.skip(\1|g" test/governance/extensions/GovernorPreventLateQuorum.test.js
+
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"

From 07750ea23af0b867189161188399bfd57b2d4e32 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 13 Feb 2023 13:04:37 +0100
Subject: [PATCH 1189/1748] More aggressive runtime code exclusion.

---
 Changelog.md                                  |  1 +
 libsolidity/codegen/ExpressionCompiler.cpp    | 66 +++++++++----------
 .../deployedCodeExclusion/bound_function.sol  | 40 +++++++++++
 .../library_function.sol                      | 34 ++++++++++
 .../library_function_deployed.sol             | 31 +++++++++
 .../deployedCodeExclusion/module_function.sol | 36 ++++++++++
 .../module_function_deployed.sol              | 32 +++++++++
 .../static_base_function.sol                  | 35 ++++++++++
 .../static_base_function_deployed.sol         | 31 +++++++++
 .../deployedCodeExclusion/super_function.sol  | 35 ++++++++++
 .../super_function_deployed.sol               | 31 +++++++++
 .../virtual_function.sol                      | 39 +++++++++++
 .../virtual_function_deployed.sol             | 35 ++++++++++
 13 files changed, 411 insertions(+), 35 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/bound_function.sol
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/library_function.sol
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/library_function_deployed.sol
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/module_function.sol
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/module_function_deployed.sol
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function.sol
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function_deployed.sol
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/super_function.sol
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/super_function_deployed.sol
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function.sol
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function_deployed.sol

diff --git a/Changelog.md b/Changelog.md
index 95095b1024..0259cb0753 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Code Generator: Avoid including references to the deployed label of referenced functions if they are called right away.
  * ContractLevelChecker: Properly distinguish the case of missing base constructor arguments from having an unimplemented base function.
  * SMTChecker: Fix internal error when using the custom NatSpec annotation to abstract free functions.
  * TypeChecker: Also allow external library functions in ``using for``.
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 2aa2315f91..c034024b4c 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -632,29 +632,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 			evmasm::AssemblyItem returnLabel = m_context.pushNewTag();
 			for (unsigned i = 0; i < arguments.size(); ++i)
 				acceptAndConvert(*arguments[i], *function.parameterTypes()[i]);
-
-			{
-				bool shortcutTaken = false;
-				if (auto identifier = dynamic_cast<Identifier const*>(&_functionCall.expression()))
-				{
-					solAssert(!function.hasBoundFirstArgument(), "");
-					if (auto functionDef = dynamic_cast<FunctionDefinition const*>(identifier->annotation().referencedDeclaration))
-					{
-						// Do not directly visit the identifier, because this way, we can avoid
-						// the runtime entry label to be created at the creation time context.
-						CompilerContext::LocationSetter locationSetter2(m_context, *identifier);
-						solAssert(*identifier->annotation().requiredLookup == VirtualLookup::Virtual, "");
-						utils().pushCombinedFunctionEntryLabel(
-							functionDef->resolveVirtual(m_context.mostDerivedContract()),
-							false
-						);
-						shortcutTaken = true;
-					}
-				}
-
-				if (!shortcutTaken)
-					_functionCall.expression().accept(*this);
-			}
+			_functionCall.expression().accept(*this);
 
 			unsigned parameterSize = CompilerUtils::sizeOnStack(function.parameterTypes());
 			if (function.hasBoundFirstArgument())
@@ -1486,7 +1464,11 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 			{
 				FunctionDefinition const& funDef = dynamic_cast<decltype(funDef)>(funType->declaration());
 				solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static, "");
-				utils().pushCombinedFunctionEntryLabel(funDef);
+				utils().pushCombinedFunctionEntryLabel(
+					funDef,
+					// If we call directly, do not include the second label.
+					!_memberAccess.annotation().calledDirectly
+				);
 				utils().moveIntoStack(funType->selfType()->sizeOnStack(), 1);
 			}
 			else if (
@@ -1519,10 +1501,14 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 				_memberAccess.expression().accept(*this);
 				solAssert(_memberAccess.annotation().referencedDeclaration, "Referenced declaration not resolved.");
 				solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Super, "");
-				utils().pushCombinedFunctionEntryLabel(m_context.superFunction(
-					dynamic_cast<FunctionDefinition const&>(*_memberAccess.annotation().referencedDeclaration),
-					contractType->contractDefinition()
-				));
+				utils().pushCombinedFunctionEntryLabel(
+					m_context.superFunction(
+						dynamic_cast<FunctionDefinition const&>(*_memberAccess.annotation().referencedDeclaration),
+						contractType->contractDefinition()
+					),
+					// If we call directly, do not include the second label.
+					!_memberAccess.annotation().calledDirectly
+				);
 			}
 			else
 			{
@@ -1541,7 +1527,11 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 						if (auto const* function = dynamic_cast<FunctionDefinition const*>(_memberAccess.annotation().referencedDeclaration))
 						{
 							solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static, "");
-							utils().pushCombinedFunctionEntryLabel(*function);
+							utils().pushCombinedFunctionEntryLabel(
+								*function,
+								// If we call directly, do not include the second label.
+								!_memberAccess.annotation().calledDirectly
+							);
 						}
 						else
 							solAssert(false, "Function not found in member access");
@@ -2025,7 +2015,11 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 			solAssert(function && function->isFree(), "");
 			solAssert(funType->kind() == FunctionType::Kind::Internal, "");
 			solAssert(*_memberAccess.annotation().requiredLookup == VirtualLookup::Static, "");
-			utils().pushCombinedFunctionEntryLabel(*function);
+			utils().pushCombinedFunctionEntryLabel(
+				*function,
+				// If we call directly, do not include the second label.
+				!_memberAccess.annotation().calledDirectly
+			);
 		}
 		else if (auto const* contract = dynamic_cast<ContractDefinition const*>(_memberAccess.annotation().referencedDeclaration))
 		{
@@ -2223,12 +2217,14 @@ void ExpressionCompiler::endVisit(Identifier const& _identifier)
 	}
 	else if (FunctionDefinition const* functionDef = dynamic_cast<FunctionDefinition const*>(declaration))
 	{
-		// If the identifier is called right away, this code is executed in visit(FunctionCall...), because
-		// we want to avoid having a reference to the runtime function entry point in the
-		// constructor context, since this would force the compiler to include unreferenced
-		// internal functions in the runtime context.
 		solAssert(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual, "");
-		utils().pushCombinedFunctionEntryLabel(functionDef->resolveVirtual(m_context.mostDerivedContract()));
+		utils().pushCombinedFunctionEntryLabel(
+			functionDef->resolveVirtual(m_context.mostDerivedContract()),
+			// If we call directly, do not include the second (potential runtime) label.
+			// Including the label might lead to the runtime code being included in the creation
+			// code even though it is never executed.
+			!_identifier.annotation().calledDirectly
+		);
 	}
 	else if (auto variable = dynamic_cast<VariableDeclaration const*>(declaration))
 		appendVariable(*variable, static_cast<Expression const&>(_identifier));
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/bound_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/bound_function.sol
new file mode 100644
index 0000000000..64b80422c3
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/bound_function.sol
@@ -0,0 +1,40 @@
+function longdata(S memory) pure returns (bytes memory) {
+    return
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+        "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+}
+
+struct S {
+    uint x;
+}
+
+using { longdata } for S;
+
+contract C {
+    bytes data;
+    constructor() {
+        S memory x;
+        data = x.longdata();
+    }
+    function test() public view returns (bool) {
+        // Tests that the function longdata is not
+        // included in the runtime code.
+        uint x;
+        assembly {
+            x := codesize()
+        }
+        return x < data.length;
+    }
+}
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/library_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/library_function.sol
new file mode 100644
index 0000000000..9311091996
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/library_function.sol
@@ -0,0 +1,34 @@
+library L {
+    function longdata() pure internal returns (bytes memory) {
+        return
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+    }
+}
+contract C {
+    bytes data;
+    constructor() {
+        data = L.longdata();
+    }
+    function test() public view returns (bool) {
+        // Tests that the function L.longdata is not
+        // included in the runtime code.
+        uint x;
+        assembly {
+            x := codesize()
+        }
+        return x < data.length;
+    }
+}
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/library_function_deployed.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/library_function_deployed.sol
new file mode 100644
index 0000000000..30f403af7f
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/library_function_deployed.sol
@@ -0,0 +1,31 @@
+library L {
+    function longdata() pure internal returns (bytes memory) {
+        return
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+    }
+}
+
+contract C {
+    bytes data;
+    function () pure returns (bytes memory) f;
+    constructor() {
+        data = L.longdata();
+        f = L.longdata;
+    }
+    function test() public view returns (bool) {
+        return keccak256(data) == keccak256(f());
+    }
+}
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/module_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/module_function.sol
new file mode 100644
index 0000000000..018d410557
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/module_function.sol
@@ -0,0 +1,36 @@
+==== Source: mod.sol ====
+function longdata() pure returns (bytes memory) {
+    return
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+        "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+}
+==== Source: main.sol ====
+import "mod.sol" as M;
+
+contract C {
+    bytes data;
+    constructor() {
+        data = M.longdata();
+    }
+    function test() public view returns (bool) {
+        // Tests that the function longdata is not
+        // included in the runtime code.
+        uint x;
+        assembly {
+            x := codesize()
+        }
+        return x < data.length;
+    }
+}
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/module_function_deployed.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/module_function_deployed.sol
new file mode 100644
index 0000000000..f29355e074
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/module_function_deployed.sol
@@ -0,0 +1,32 @@
+==== Source: mod.sol ====
+function longdata() pure returns (bytes memory) {
+    return
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+        "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+}
+==== Source: main.sol ====
+import "mod.sol" as M;
+
+contract C {
+    bytes data;
+    function () pure returns (bytes memory) f;
+    constructor() {
+        data = M.longdata();
+        f = M.longdata;
+    }
+    function test() public view returns (bool) {
+        return keccak256(data) == keccak256(f());
+    }
+}
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function.sol
new file mode 100644
index 0000000000..0f9b023b08
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function.sol
@@ -0,0 +1,35 @@
+abstract contract S {
+    function longdata() internal pure returns (bytes memory) {
+        return
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+    }
+}
+
+contract C is S {
+    bytes data;
+    constructor() {
+        data = S.longdata();
+    }
+    function test() public view returns (bool) {
+        // Tests that the function longdata is not
+        // included in the runtime code.
+        uint x;
+        assembly {
+            x := codesize()
+        }
+        return x < data.length;
+    }
+}
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function_deployed.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function_deployed.sol
new file mode 100644
index 0000000000..a7c8d6cfeb
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/static_base_function_deployed.sol
@@ -0,0 +1,31 @@
+abstract contract S {
+    function longdata() internal pure returns (bytes memory) {
+        return
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+    }
+}
+
+contract C is S {
+    bytes data;
+    function () pure returns (bytes memory) f;
+    constructor() {
+        data = S.longdata();
+        f = S.longdata;
+    }
+    function test() public view returns (bool) {
+        return keccak256(data) == keccak256(f());
+    }
+}
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/super_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/super_function.sol
new file mode 100644
index 0000000000..9accc54a2b
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/super_function.sol
@@ -0,0 +1,35 @@
+abstract contract S {
+    function longdata() internal pure returns (bytes memory) {
+        return
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+    }
+}
+
+contract C is S {
+    bytes data;
+    constructor() {
+        data = super.longdata();
+    }
+    function test() public view returns (bool) {
+        // Tests that the function longdata is not
+        // included in the runtime code.
+        uint x;
+        assembly {
+            x := codesize()
+        }
+        return x < data.length;
+    }
+}
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/super_function_deployed.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/super_function_deployed.sol
new file mode 100644
index 0000000000..9588007b36
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/super_function_deployed.sol
@@ -0,0 +1,31 @@
+abstract contract S {
+    function longdata() internal pure returns (bytes memory) {
+        return
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+    }
+}
+
+contract C is S {
+    bytes data;
+    function () pure returns (bytes memory) f;
+    constructor() {
+        data = super.longdata();
+        f = super.longdata;
+    }
+    function test() public view returns (bool) {
+        return keccak256(data) == keccak256(f());
+    }
+}
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function.sol
new file mode 100644
index 0000000000..866fe9dfc4
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function.sol
@@ -0,0 +1,39 @@
+abstract contract S {
+    function longdata() internal virtual pure returns (bytes memory);
+}
+
+abstract contract X is S {
+    function longdata() internal override pure returns (bytes memory) {
+        return
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+        }
+}
+
+contract C is X {
+    bytes data;
+    constructor() {
+        data = longdata();
+    }
+    function test() public view returns (bool) {
+        // Tests that the function longdata is not
+        // included in the runtime code.
+        uint x;
+        assembly {
+            x := codesize()
+        }
+        return x < data.length;
+    }
+}
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function_deployed.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function_deployed.sol
new file mode 100644
index 0000000000..bcc95b9f41
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/virtual_function_deployed.sol
@@ -0,0 +1,35 @@
+abstract contract S {
+    function longdata() internal virtual pure returns (bytes memory);
+}
+
+abstract contract X is S {
+    function longdata() internal override pure returns (bytes memory) {
+        return
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+            "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+            "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+            "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+            "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+            "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+        }
+}
+
+contract C is X {
+    bytes data;
+    function () pure returns (bytes memory) f;
+    constructor() {
+        data = super.longdata();
+        f = super.longdata;
+    }
+    function test() public view returns (bool) {
+        return keccak256(data) == keccak256(f());
+    }
+}
+// ----
+// test() -> true

From 01b10e251585f1ac7eef3fac31472b4bd2e11a19 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Mon, 13 Feb 2023 13:27:02 +0100
Subject: [PATCH 1190/1748] Gas updates.

---
 test/libsolidity/semanticTests/userDefinedValueType/erc20.sol | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index 167521bffa..64724983a1 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -114,8 +114,8 @@ contract ERC20 {
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
 // gas irOptimized: 362054
-// gas legacy: 852973
-// gas legacyOptimized: 419237
+// gas legacy: 852825
+// gas legacyOptimized: 418837
 // totalSupply() -> 20
 // gas irOptimized: 23415
 // gas legacy: 23653

From 228c3554249b566515cecbfd1247c9e045038ecb Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 16 Feb 2023 13:10:21 +0100
Subject: [PATCH 1191/1748] Remove openzeppelin workaround

---
 test/externalTests/zeppelin.sh | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 3042fdd2ce..11e148c182 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -138,10 +138,6 @@ function zeppelin_test
     sed -i "s|describe(\('reverting initialization'\)|describe.skip(\1|g" test/proxy/Proxy.behaviour.js
     sed -i "s|it(\('does not allow remote callback'\)|it.skip(\1|g" test/security/ReentrancyGuard.test.js
 
-    # TODO: Remove this when https://github.com/OpenZeppelin/openzeppelin-contracts/issues/4049 gets fixed
-    sed -i "s|it(\('Succeeded'\)|it.skip(\1|g" test/governance/Governor.test.js
-    sed -i "s|it(\('Delay is extended to prevent last minute take-over'\)|it.skip(\1|g" test/governance/extensions/GovernorPreventLateQuorum.test.js
-
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"

From 45a3d8228d9b0d8d796d02f268de69f66b587dff Mon Sep 17 00:00:00 2001
From: Zachinquarantine <Zachinquarantine@protonmail.com>
Date: Wed, 25 Jan 2023 14:54:42 -0500
Subject: [PATCH 1192/1748] Removed folder scripts/endToEndExtraction/

---
 scripts/endToEndExtraction/create_traces.sh   |  25 --
 .../endToEndExtraction/remove-testcases.py    | 183 ---------------
 .../endToEndExtraction/verify-testcases.py    | 214 ------------------
 3 files changed, 422 deletions(-)
 delete mode 100755 scripts/endToEndExtraction/create_traces.sh
 delete mode 100755 scripts/endToEndExtraction/remove-testcases.py
 delete mode 100755 scripts/endToEndExtraction/verify-testcases.py

diff --git a/scripts/endToEndExtraction/create_traces.sh b/scripts/endToEndExtraction/create_traces.sh
deleted file mode 100755
index 3e1de4677c..0000000000
--- a/scripts/endToEndExtraction/create_traces.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -eu
-
-BASE_PATH="$( cd "$(dirname "$0")" >/dev/null 2>&1 && pwd -P )"
-
-mkdir -p build
-cd build
-cmake ../../../
-make soltest
-cd test/
-echo "running soltest on 'semanticTests/extracted'..."
-./soltest --color_output=false --log_level=test_suite -t semanticTests/extracted/ -- --testpath "${BASE_PATH}/../../test" --no-smt --evmonepath /Users/alex/evmone/lib/libevmone.dylib --show-messages --show-metadata > "${BASE_PATH}/extracted-tests.trace"
-echo "running soltest on 'semanticTests/extracted'... done"
-
-cd "$BASE_PATH"
-git clone git@github.com:ethereum/solidity.git solidity-develop
-cd solidity-develop
-mkdir -p build
-cd build
-cmake ..
-make soltest
-cd test/
-echo "running soltest on 'SolidityEndToEndTest'..."
-./soltest --color_output=false --log_level=test_suite -t SolidityEndToEndTest/ -- --testpath "${BASE_PATH}/solidity-develop/test" --no-smt --evmonepath /Users/alex/evmone/lib/libevmone.dylib --show-messages --show-metadata > "${BASE_PATH}/endToEndExtraction-tests.trace"
-echo "running soltest on 'SolidityEndToEndTest'... done"
diff --git a/scripts/endToEndExtraction/remove-testcases.py b/scripts/endToEndExtraction/remove-testcases.py
deleted file mode 100755
index ca9a635994..0000000000
--- a/scripts/endToEndExtraction/remove-testcases.py
+++ /dev/null
@@ -1,183 +0,0 @@
-#!/usr/bin/env python3
-# pylint: disable=consider-using-enumerate, import-error
-
-import re
-import os
-import sys
-import getopt
-import tempfile
-from getkey import getkey
-
-
-def parse_call(call):
-    function = ''
-    arguments = ""
-    results = ""
-    search = re.search(r'// (.*):(.*)\s->\s(.*)', call, re.MULTILINE | re.DOTALL)
-    if search:
-        function = search.group(1)
-        arguments = search.group(2)
-        results = search.group(3)
-        if results.find("#") != -1:
-            results = results[:results.find("#")]
-    else:
-        search = re.search(r'// (.*)(.*)\s->\s(.*)', call, re.MULTILINE | re.DOTALL)
-        if search:
-            function = search.group(1)
-            arguments = search.group(2)
-            results = search.group(3)
-            if results.find("#") != -1:
-                results = results[:results.find("#")]
-    if function.find("wei") >= 0:
-        function = function[:function.find(",")]
-    return function.strip(), arguments.strip(), results.strip()
-
-
-def colorize(left, right, index):
-    red = "\x1b[31m"
-    yellow = "\x1b[33m"
-    reset = "\x1b[0m"
-    colors = [red, yellow]
-    color = colors[index % len(colors)]
-    function, _arguments, _results = parse_call(right)
-    left = left.replace("compileAndRun", color + "compileAndRun" + reset)
-    right = right.replace("constructor", color + "constructor" + reset)
-    if function:
-        left = left.replace(function, color + function + reset)
-        right = right.replace(function, color + function + reset)
-    if left.find(function):
-        bottom = " " * (left.find(function) - 4) + right
-    else:
-        bottom = " " + right
-    return "    " + left + "\n" + bottom  # " {:<90} {:<90}\n{}".format(left, right, bottom)
-
-
-def get_checks(content, sol_file_path):
-    constructors = []
-    checks = []
-    for line in content.split("\n"):
-        line = line.strip()
-        if line.startswith("compileAndRun"):
-            constructors.append(line)
-        if line.startswith("ABI_CHECK") or line.startswith("BOOST_REQUIRE"):
-            checks.append(line)
-    with open(sol_file_path, "r", encoding='utf8') as sol_file:
-        sol_constructors = []
-        sol_checks = []
-        inside_expectations = False
-        for line in sol_file.readlines():
-            if line.startswith("// constructor()"):
-                sol_constructors.append(line)
-            elif inside_expectations and line.startswith("// "):
-                sol_checks.append(line)
-            if line.startswith("// ----"):
-                inside_expectations = True
-        sol_file.close()
-        if len(constructors) == len(sol_constructors) == 1:
-            checks.insert(0, constructors[0])
-            sol_checks.insert(0, sol_constructors[0])
-        return checks, sol_checks
-
-
-def show_test(name, content, sol_file_path, current_test, test_count):
-    with tempfile.NamedTemporaryFile(delete=False) as cpp_file:
-        cpp_file.write(content.encode())
-        cpp_file.close()
-
-        os.system("clear")
-        print(str(current_test) + " / " + str(test_count) + " - " + name + "\n")
-        diff_env = os.getenv('DIFF', "/usr/local/bin/colordiff -a -d -w -y -W 200 ")
-        os.system(diff_env + " " + cpp_file.name + " " + sol_file_path)
-        os.unlink(cpp_file.name)
-        print("\n")
-
-        checks, sol_checks = get_checks(content, sol_file_path)
-
-        if len(checks) == len(sol_checks):
-            for i in range(0, len(checks)):
-                print(colorize(checks[i].strip(), sol_checks[i].strip(), i))
-        else:
-            print("warning: check count not matching. this should not happen!")
-
-        what = ""
-        print("\nContinue? (ENTER) Abort? (ANY OTHER KEY)")
-        while what != '\n':
-            what = getkey()
-            if what != '\n':
-                sys.exit(0)
-        print()
-
-
-def get_tests(e2e_path):
-    tests = []
-    for f in os.listdir(e2e_path):
-        if f.endswith(".sol"):
-            tests.append(f.replace(".sol", ""))
-    return tests
-
-
-def process_input_file(e2e_path, input_file, interactive):
-    tests = get_tests(e2e_path)
-    with open(input_file, "r", encoding='utf8') as cpp_file:
-        inside_test = False
-        test_name = ""
-        inside_extracted_test = False
-        new_lines = 0
-        count = 0
-        test_content = ""
-        for line in cpp_file.readlines():
-            test = re.search(r'BOOST_AUTO_TEST_CASE\((.*)\)', line, re.M | re.I)
-            if test:
-                test_name = test.group(1)
-                inside_test = True
-                inside_extracted_test = inside_test & (test_name in tests)
-                if inside_extracted_test:
-                    count = count + 1
-
-            if interactive and inside_extracted_test:
-                test_content = test_content + line
-
-            if not inside_extracted_test:
-                if line == "\n":
-                    new_lines = new_lines + 1
-                else:
-                    new_lines = 0
-                if not interactive and new_lines <= 1:
-                    sys.stdout.write(line)
-
-            if line == "}\n":
-                if interactive and inside_extracted_test:
-                    show_test(test_name, test_content.strip(), e2e_path + "/" + test_name + ".sol", count, len(tests))
-                    test_content = ""
-                inside_test = False
-        cpp_file.close()
-        sys.stdout.flush()
-
-
-def main(argv):
-    interactive = False
-    input_file = None
-    try:
-        opts, _args = getopt.getopt(argv, "if:")
-    except getopt.GetoptError:
-        print("./remove-testcases.py [-i] [-f <full path to SolidityEndToEndTest.cpp>]")
-        sys.exit(1)
-
-    for opt, arg in opts:
-        if opt == '-i':
-            interactive = True
-        elif opt in '-f':
-            input_file = arg
-
-    base_path = os.path.dirname(__file__)
-
-    if not input_file:
-        input_file = base_path + "/../../test/libsolidity/SolidityEndToEndTest.cpp"
-
-    e2e_path = base_path + "/../../test/libsolidity/semanticTests/extracted"
-
-    process_input_file(e2e_path, input_file, interactive)
-
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
diff --git a/scripts/endToEndExtraction/verify-testcases.py b/scripts/endToEndExtraction/verify-testcases.py
deleted file mode 100755
index b011870424..0000000000
--- a/scripts/endToEndExtraction/verify-testcases.py
+++ /dev/null
@@ -1,214 +0,0 @@
-#!/usr/bin/env python3
-#
-# - SolidityEndToEndTest.trace was created with soltest with the following command on
-#     ./soltest --color_output=false --log_level=test_suite -t SolidityEndToEndTest/ -- --no-smt
-#         --evmonepath /Users/alex/evmone/lib/libevmone.dylib --show-messages > SolidityEndToEndTest.trace
-# - a trace of the semantic tests can be created by using
-#     ./soltest --color_output=false --log_level=test_suite -t semanticTests/extracted/ -- --no-smt
-#         --evmonepath /Users/alex/evmone/lib/libevmone.dylib --show-messages > semanticTests.trace
-#
-# verify-testcases.py will compare both traces. If these traces are identical, the extracted tests were
-# identical with the tests specified in SolidityEndToEndTest.cpp.
-
-import re
-import os
-import sys
-import getopt
-import json
-
-
-class Trace:
-    def __init__(self, kind, parameter):
-        self.kind = kind
-        self.parameter = parameter
-        self._input = ""
-        self._output = ""
-        self.value = ""
-        self.result = ""
-        self.gas = ""
-
-    def get_input(self):
-        return self._input
-
-    def set_input(self, bytecode):
-        if self.kind == "create":
-            # remove cbor encoded metadata from bytecode
-            length = int(bytecode[-4:], 16) * 2
-            self._input = bytecode[:len(bytecode) - length - 4]
-
-    def get_output(self):
-        return self._output
-
-    def set_output(self, output):
-        if self.kind == "create":
-            # remove cbor encoded metadata from bytecode
-            length = int(output[-4:], 16) * 2
-            self._output = output[:len(output) - length - 4]
-
-    def __str__(self):
-        # we ignore the used gas
-        result = str(
-            "kind='" + self.kind + "' parameter='" + self.parameter + "' input='" + self._input +
-            "' output='" + self._output + "' value='" + self.value + "' result='" + self.result + "'"
-        )
-        return result
-
-
-class TestCase:
-    def __init__(self, name):
-        self.name = name
-        self.metadata = None
-        self.traces = []
-
-    def add_trace(self, kind, parameter):
-        trace = Trace(kind, parameter)
-        self.traces.append(trace)
-        return trace
-
-
-class TraceAnalyser:
-    def __init__(self, file):
-        self.file = file
-        self.tests = {}
-        self.ready = False
-
-    def analyse(self):
-        with open(self.file, "r", encoding='utf8') as trace_file:
-            trace = None
-            test_case = None
-            for line in trace_file.readlines():
-                test = re.search(r'Entering test case "(.*)"', line, re.M | re.I)
-                if test:
-                    test_name = test.group(1)
-                    test_case = TestCase(test_name)
-                    self.tests[test_name] = test_case
-
-                metadata = re.search(r'\s*metadata:\s*(.*)$', line, re.M | re.I)
-                if metadata:
-                    test_case.metadata = json.loads(metadata.group(1))
-                    del test_case.metadata["sources"]
-                    del test_case.metadata["compiler"]["version"]
-
-                create = re.search(r'CREATE\s*([a-fA-F0-9]*):', line, re.M | re.I)
-                if create:
-                    trace = test_case.add_trace("create", create.group(1))
-
-                call = re.search(r'CALL\s*([a-fA-F0-9]*)\s*->\s*([a-fA-F0-9]*):', line, re.M | re.I)
-                if call:
-                    trace = test_case.add_trace("call", call.group(1))  # + "->" + call.group(2))
-
-                if not create and not call:
-                    self.parse_parameters(line, trace)
-
-            trace_file.close()
-
-            print(self.file + ":", len(self.tests), "test-cases.")
-
-            self.ready = True
-
-    @staticmethod
-    def parse_parameters(line, trace):
-        input_match = re.search(r'\s*in:\s*([a-fA-F0-9]*)', line, re.M | re.I)
-        if input_match:
-            trace.input = input_match.group(1)
-        output_match = re.search(r'\s*out:\s*([a-fA-F0-9]*)', line, re.M | re.I)
-        if output_match:
-            trace.output = output_match.group(1)
-        result_match = re.search(r'\s*result:\s*([a-fA-F0-9]*)', line, re.M | re.I)
-        if result_match:
-            trace.result = result_match.group(1)
-        gas_used_match = re.search(r'\s*gas\sused:\s*([a-fA-F0-9]*)', line, re.M | re.I)
-        if gas_used_match:
-            trace.gas = gas_used_match.group(1)
-        value_match = re.search(r'\s*value:\s*([a-fA-F0-9]*)', line, re.M | re.I)
-        if value_match:
-            trace.value = value_match.group(1)
-
-    def diff(self, analyser):
-        if not self.ready:
-            self.analyse()
-        if not analyser.ready:
-            analyser.analyse()
-
-        intersection = set(self.tests.keys()) & set(analyser.tests.keys())
-        mismatches = set()
-
-        for test_name in intersection:
-            left = self.tests[test_name]
-            right = analyser.tests[test_name]
-            if json.dumps(left.metadata) != json.dumps(right.metadata):
-                mismatches.add(
-                    (test_name, "metadata where different: " + json.dumps(left.metadata) + " != " + json.dumps(
-                        right.metadata)))
-            if len(left.traces) != len(right.traces):
-                mismatches.add((test_name, "trace count are different: " + str(len(left.traces)) +
-                                " != " + str(len(right.traces))))
-            else:
-                self.check_traces(test_name, left, right, mismatches)
-
-        for mismatch in mismatches:
-            print(mismatch[0])
-            print(mismatch[1])
-
-        print(len(intersection), "test-cases - ", len(mismatches), " mismatche(s)")
-
-    @classmethod
-    def check_traces(cls, test_name, left, right, mismatches):
-        for trace_id, trace in enumerate(left.traces):
-            left_trace = trace
-            right_trace = right.traces[trace_id]
-            assert left_trace.kind == right_trace.kind
-            if str(left_trace) != str(right_trace):
-                mismatch_info = "    " + str(left_trace) + "\n"
-                mismatch_info += "    " + str(right_trace) + "\n"
-                mismatch_info += "    "
-                for ch in range(0, len(str(left_trace))):
-                    if ch < len(str(left_trace)) and ch < len(str(right_trace)):
-                        if str(left_trace)[ch] != str(right_trace)[ch]:
-                            mismatch_info += "|"
-                        else:
-                            mismatch_info += " "
-                    else:
-                        mismatch_info += "|"
-                mismatch_info += "\n"
-                mismatches.add((test_name, mismatch_info))
-
-
-def main(argv):
-    extracted_tests_trace_file = None
-    end_to_end_trace_file = None
-    try:
-        opts, _args = getopt.getopt(argv, "s:e:")
-    except getopt.GetoptError:
-        print("verify-testcases.py [-s <path to semantic-trace>] [-e <path to endToEndExtraction-trace>]")
-        sys.exit(2)
-
-    for opt, arg in opts:
-        if opt in '-s':
-            extracted_tests_trace_file = arg
-        elif opt in '-e':
-            end_to_end_trace_file = arg
-
-    base_path = os.path.dirname(__file__)
-    if not extracted_tests_trace_file:
-        extracted_tests_trace_file = base_path + "/extracted-tests.trace"
-    if not end_to_end_trace_file:
-        end_to_end_trace_file = base_path + "/endToEndExtraction-tests.trace"
-
-    for f in [extracted_tests_trace_file, end_to_end_trace_file]:
-        if not os.path.isfile(f):
-            print("trace file '" + f + "' not found. aborting.")
-            sys.exit(1)
-
-    if not os.path.isfile(extracted_tests_trace_file):
-        print("semantic trace file '" + extracted_tests_trace_file + "' not found. aborting.")
-        sys.exit(1)
-
-    semantic_trace = TraceAnalyser(extracted_tests_trace_file)
-    end_to_end_trace = TraceAnalyser(end_to_end_trace_file)
-
-    semantic_trace.diff(end_to_end_trace)
-
-
-if __name__ == "__main__":
-    main(sys.argv[1:])

From 930c8c075344640dfe16e3f1131b6462c32c9990 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Tue, 14 Feb 2023 14:31:11 +0100
Subject: [PATCH 1193/1748] Restore static ubuntu 20.04 release builds

---
 .circleci/config.yml                          | 135 ++++++++++++------
 .../buildpack-deps/Dockerfile.ubuntu2004      |  75 ++++++++++
 2 files changed, 169 insertions(+), 41 deletions(-)
 create mode 100644 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8a2361492c..c628461453 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -7,6 +7,10 @@
 #     - ems: Emscripten
 version: 2.1
 parameters:
+  ubuntu-2004-docker-image:
+    type: string
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-16
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ee1def5806f40c35d583234e172ec5769bb9a08b6f5bbc713c1a2658846dbced"
   ubuntu-2204-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-1
@@ -97,11 +101,13 @@ commands:
     parameters:
       label:
         type: string
+      binary_path:
+        type: string
     steps:
       - run: mkdir test-cases/
-      - run: cd test-cases && ../scripts/isolate_tests.py ../test/
-      - run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface standard-json --report-file "../bytecode-report-<< parameters.label >>-json.txt"
-      - run: cd test-cases && ../scripts/bytecodecompare/prepare_report.py ../build/solc/solc --interface cli --report-file "../bytecode-report-<< parameters.label >>-cli.txt"
+      - run: cd test-cases && python3 ../scripts/isolate_tests.py ../test/
+      - run: cd test-cases && python3 ../scripts/bytecodecompare/prepare_report.py << parameters.binary_path >> --interface standard-json --report-file "../bytecode-report-<< parameters.label >>-json.txt"
+      - run: cd test-cases && python3 ../scripts/bytecodecompare/prepare_report.py << parameters.binary_path >> --interface cli --report-file "../bytecode-report-<< parameters.label >>-cli.txt"
       - store_artifacts:
           path: bytecode-report-<< parameters.label >>-json.txt
       - store_artifacts:
@@ -313,6 +319,27 @@ defaults:
         CXX: clang++
         MAKEFLAGS: -j 5
 
+  - base_ubuntu2004: &base_ubuntu2004
+      docker:
+        - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 3
+
+  - base_ubuntu2004_small: &base_ubuntu2004_small
+      <<: *base_ubuntu2004
+      resource_class: small
+      environment:
+          TERM: xterm
+          MAKEFLAGS: -j 2
+
+  - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
+      <<: *base_ubuntu2004
+      resource_class: xlarge
+      environment:
+          TERM: xterm
+          MAKEFLAGS: -j 10
+
   - base_ubuntu2204: &base_ubuntu2204
       docker:
         - image: << pipeline.parameters.ubuntu-2204-docker-image >>
@@ -454,7 +481,7 @@ defaults:
       requires:
         - b_ubu_force_release
 
-  - workflow_ubuntu2204_static: &workflow_ubuntu2204_static
+  - workflow_ubuntu2004_static: &workflow_ubuntu2004_static
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu_static
@@ -518,91 +545,91 @@ defaults:
       python2: true
 
   - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_gnosis
       project: gnosis
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_zeppelin
       project: zeppelin
       binary_type: native
       resource_class: large
   - job_native_test_ext_ens: &job_native_test_ext_ens
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_ens
       project: ens
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_trident: &job_native_test_ext_trident
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_trident
       project: trident
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_euler: &job_native_test_ext_euler
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_euler
       project: euler
       binary_type: native
       resource_class: medium
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_yield_liquidator
       project: yield-liquidator
       binary_type: native
   - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_bleeps
       project: bleeps
       binary_type: native
       resource_class: medium
   - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_pool_together
       project: pool-together
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_perpetual_pools
       project: perpetual-pools
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_uniswap
       project: uniswap
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_elementfi
       project: elementfi
       binary_type: native
       resource_class: medium
   - job_native_test_ext_brink: &job_native_test_ext_brink
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_brink
       project: brink
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_chainlink
       project: chainlink
       binary_type: native
       nodejs_version: '16.18'
       resource_class: large # Tests run out of memory on a smaller machine
   - job_native_test_ext_gp2: &job_native_test_ext_gp2
-      <<: *workflow_ubuntu2204_static
+      <<: *workflow_ubuntu2004_static
       name: t_native_test_ext_gp2
       project: gp2
       binary_type: native
@@ -826,8 +853,11 @@ jobs:
       MAKEFLAGS: -j 10
 
   b_ubu_static:
+    # We temporarily keep building static release binaries on ubuntu 20.04
+    # to avoid glibc incompatibilities.
+    # See: https://github.com/ethereum/solidity/issues/13954
     # On large runs 2x faster than on medium. 3x on xlarge.
-    <<: *base_ubuntu2204_xlarge
+    <<: *base_ubuntu2004_xlarge
     environment:
       TERM: xterm
       MAKEFLAGS: -j 10
@@ -838,8 +868,14 @@ jobs:
       - run:
           name: strip binary
           command: strip build/solc/solc
-      - store_artifacts: *artifacts_solc
-      - persist_to_workspace: *artifacts_executables
+      - store_artifacts:
+          path: build/solc/solc
+          destination: solc-static-linux
+      - run: mv build/solc/solc build/solc/solc-static-linux
+      - persist_to_workspace:
+          root: build
+          paths:
+            - solc/solc-static-linux
       - gitter_notify_failure_unless_pr
 
   b_ubu_codecov:
@@ -1248,7 +1284,7 @@ jobs:
             - run:
                 name: External <<parameters.project>> tests (native)
                 command: |
-                  test/externalTests/<<parameters.project>>.sh native /tmp/workspace/solc/solc
+                  test/externalTests/<<parameters.project>>.sh native /tmp/workspace/solc/solc-static-linux
       - store_artifacts:
           path: reports/externalTests/
       # persist_to_workspace fails if the directory does not exist and the test script will create
@@ -1389,6 +1425,23 @@ jobs:
       - store_artifacts: *artifacts_test_results
       - gitter_notify_failure_unless_pr
 
+  # Note: b_bytecode_ubu_static is required because b_ubu_static and b_ubu
+  # are currently built on different Ubuntu base images.
+  # It can be safely removed once we move both to the same Ubuntu version.
+  b_bytecode_ubu_static:
+    <<: *base_ubuntu2004_small
+    environment:
+      TERM: xterm
+      MAKEFLAGS: -j 2
+      LC_ALL: C
+    steps:
+      - checkout
+      - attach_workspace:
+          at: build
+      - prepare_bytecode_report:
+          label: "ubuntu2004-static"
+          binary_path: "../build/solc/solc-static-linux"
+
   b_bytecode_ubu:
     <<: *base_ubuntu2204_small
     environment:
@@ -1401,6 +1454,7 @@ jobs:
           at: build
       - prepare_bytecode_report:
           label: "ubuntu"
+          binary_path: "../build/solc/solc"
 
   b_bytecode_osx:
     <<: *base_osx
@@ -1414,6 +1468,7 @@ jobs:
           at: .
       - prepare_bytecode_report:
           label: "osx"
+          binary_path: "../build/solc/solc"
 
   b_bytecode_win:
     <<: *base_win_bash
@@ -1424,22 +1479,13 @@ jobs:
       # platforms so line ending conversions must absolutely be disabled.
       - run: git config --global core.autocrlf false
       - checkout
+      # Ensure windows has python3 alias required by prepare_bytecode_report
+      - run: ln -s /c/tools/miniconda3/python /c/tools/miniconda3/python3
       - attach_workspace:
           at: build
-      - run: mkdir test-cases/
-      - run: cd test-cases/ && python ../scripts/isolate_tests.py ../test/
-      - run: cd test-cases/ && python ../scripts/bytecodecompare/prepare_report.py ../build/solc/Release/solc.exe --interface standard-json --report-file ../bytecode-report-windows-json.txt
-      - run: cd test-cases/ && python ../scripts/bytecodecompare/prepare_report.py ../build/solc/Release/solc.exe --interface cli --report-file ../bytecode-report-windows-cli.txt
-      - store_artifacts:
-          path: bytecode-report-windows-json.txt
-      - store_artifacts:
-          path: bytecode-report-windows-cli.txt
-      - persist_to_workspace:
-          root: .
-          paths:
-            - bytecode-report-windows-json.txt
-            - bytecode-report-windows-cli.txt
-      - gitter_notify_failure_unless_pr
+      - prepare_bytecode_report:
+          label: "windows"
+          binary_path: "../build/solc/Release/solc.exe"
 
   b_bytecode_ems:
     <<: *base_node_small
@@ -1464,6 +1510,8 @@ jobs:
     environment:
       REPORT_FILES: |
         bytecode-report-emscripten.txt
+        bytecode-report-ubuntu2004-static-json.txt
+        bytecode-report-ubuntu2004-static-cli.txt
         bytecode-report-ubuntu-json.txt
         bytecode-report-ubuntu-cli.txt
         bytecode-report-osx-json.txt
@@ -1506,10 +1554,10 @@ jobs:
           name: Gather and rename binaries from dependent jobs
           command: |
             mkdir github/
-            cp workspace/solc/solc             github/solc-static-linux
-            cp workspace/build/solc/solc       github/solc-macos
-            cp workspace/solc/Release/solc.exe github/solc-windows.exe
-            cp workspace/soljson.js            github/soljson.js
+            cp workspace/solc/solc-static-linux github/solc-static-linux
+            cp workspace/build/solc/solc        github/solc-macos
+            cp workspace/solc/Release/solc.exe  github/solc-windows.exe
+            cp workspace/soljson.js             github/soljson.js
 
             cd github/
             tar --create --file ../github-binaries.tar *
@@ -1635,6 +1683,10 @@ workflows:
       - t_win_soltest: *workflow_win
 
       # Bytecode comparison:
+      - b_bytecode_ubu_static:
+          <<: *workflow_trigger_on_tags
+          requires:
+            - b_ubu_static
       - b_bytecode_ubu:
           <<: *workflow_trigger_on_tags
           requires:
@@ -1654,6 +1706,7 @@ workflows:
       - t_bytecode_compare:
           <<: *workflow_trigger_on_tags
           requires:
+            - b_bytecode_ubu_static
             - b_bytecode_ubu
             - b_bytecode_win
             - b_bytecode_osx
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
new file mode 100644
index 0000000000..242f859e7c
--- /dev/null
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -0,0 +1,75 @@
+# vim:syntax=dockerfile
+#------------------------------------------------------------------------------
+# Dockerfile for building and testing Solidity Compiler on CI
+# Target: Ubuntu 19.04 (Disco Dingo)
+# URL: https://hub.docker.com/r/ethereum/solidity-buildpack-deps
+#
+# 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/>
+#
+# (c) 2016-2019 solidity contributors.
+#------------------------------------------------------------------------------
+FROM buildpack-deps:focal AS base
+LABEL version="16"
+
+ARG DEBIAN_FRONTEND=noninteractive
+
+RUN set -ex; \
+        dist=$(grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2); \
+        echo "deb http://ppa.launchpad.net/ethereum/cpp-build-deps/ubuntu $dist main" >> /etc/apt/sources.list ; \
+        apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
+	apt-get update; \
+	apt-get install -qqy --no-install-recommends \
+		build-essential \
+		software-properties-common \
+		cmake ninja-build \
+		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
+		libboost-program-options-dev \
+		libcvc4-dev libz3-static-dev z3-static jq \
+		; \
+	apt-get install -qy python3-pip python3-sphinx; \
+	pip3 install codecov; \
+	rm -rf /var/lib/apt/lists/*
+
+FROM base AS libraries
+
+# EVMONE
+RUN set -ex; \
+	cd /usr/src; \
+	git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	cd evmone; \
+	mkdir build; \
+	cd build; \
+	cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
+	ninja; \
+	ninja install/strip; \
+	rm -rf /usr/src/evmone
+
+# HERA
+RUN set -ex; \
+	cd /usr/src; \
+	git clone --branch="v0.6.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
+	cd hera; \
+	mkdir build; \
+	cd build; \
+	cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
+	ninja; \
+	ninja install/strip; \
+	rm -rf /usr/src/hera
+
+FROM base
+COPY --from=libraries /usr/lib /usr/lib
+COPY --from=libraries /usr/bin /usr/bin
+COPY --from=libraries /usr/include /usr/include

From 411431444e179d6593a4f8bc540301e34c5f58c6 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 21 Feb 2023 05:37:10 +0900
Subject: [PATCH 1194/1748] fix: remove unnecessary text in yul.rst

---
 docs/yul.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index bbe72a5320..99533b53ee 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -85,7 +85,6 @@ It can be compiled using ``solc --strict-assembly``. The builtin functions
 
 It is also possible to implement the same function using a for-loop
 instead of with recursion. Here, ``lt(a, b)`` computes whether ``a`` is less than ``b``.
-less-than comparison.
 
 .. code-block:: yul
 

From 4064116df43ee7a6384497a6516db3d9087acd11 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 14 Dec 2022 15:52:05 +0100
Subject: [PATCH 1195/1748] Do not duplicate subassemblies.

Add LinkerObject check and more tests
---
 Changelog.md                                  |  1 +
 libevmasm/Assembly.cpp                        | 18 +++++--
 libevmasm/LinkerObject.cpp                    |  6 +++
 libevmasm/LinkerObject.h                      |  2 +
 .../subassembly_deduplication.sol             | 42 ++++++++++++++++
 .../functionCall/failed_create.sol            |  2 +-
 .../libraries/library_references_preserve.sol | 48 +++++++++++++++++++
 .../libyul/objectCompiler/subObjectAccess.yul |  4 +-
 8 files changed, 117 insertions(+), 6 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol
 create mode 100644 test/libsolidity/semanticTests/libraries/library_references_preserve.sol

diff --git a/Changelog.md b/Changelog.md
index 0259cb0753..c1e1a001c4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
 
 Bugfixes:
  * Code Generator: Avoid including references to the deployed label of referenced functions if they are called right away.
+ * Assembler: Avoid duplicating subassembly bytecode where possible.
  * ContractLevelChecker: Properly distinguish the case of missing base constructor arguments from having an unimplemented base function.
  * SMTChecker: Fix internal error when using the custom NatSpec annotation to abstract free functions.
  * TypeChecker: Also allow external library functions in ``using for``.
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index f596f63038..3475bdafe8 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -679,13 +679,25 @@ LinkerObject const& Assembly::assemble() const
 		// Append an INVALID here to help tests find miscompilation.
 		ret.bytecode.push_back(static_cast<uint8_t>(Instruction::INVALID));
 
+	map<LinkerObject, size_t> subAssemblyOffsets;
 	for (auto const& [subIdPath, bytecodeOffset]: subRef)
 	{
+		LinkerObject subObject = subAssemblyById(subIdPath)->assemble();
 		bytesRef r(ret.bytecode.data() + bytecodeOffset, bytesPerDataRef);
-		toBigEndian(ret.bytecode.size(), r);
-		ret.append(subAssemblyById(subIdPath)->assemble());
-	}
 
+		// In order for de-duplication to kick in, not only must the bytecode be identical, but
+		// link and immutables references as well.
+		if (size_t* subAssemblyOffset = util::valueOrNullptr(subAssemblyOffsets, subObject))
+			toBigEndian(*subAssemblyOffset, r);
+		else
+		{
+			toBigEndian(ret.bytecode.size(), r);
+			subAssemblyOffsets[subObject] = ret.bytecode.size();
+			ret.bytecode += subObject.bytecode;
+		}
+		for (auto const& ref: subObject.linkReferences)
+			ret.linkReferences[ref.first + subAssemblyOffsets[subObject]] = ref.second;
+	}
 	for (auto const& i: tagRef)
 	{
 		size_t subId;
diff --git a/libevmasm/LinkerObject.cpp b/libevmasm/LinkerObject.cpp
index 07e34acab7..5a0631e329 100644
--- a/libevmasm/LinkerObject.cpp
+++ b/libevmasm/LinkerObject.cpp
@@ -77,3 +77,9 @@ LinkerObject::matchLibrary(
 		return &it->second;
 	return nullptr;
 }
+
+bool LinkerObject::operator<(LinkerObject const& _other) const
+{
+	return tie(this->bytecode, this->linkReferences, this->immutableReferences) <
+			tie(_other.bytecode, _other.linkReferences, _other.immutableReferences);
+}
diff --git a/libevmasm/LinkerObject.h b/libevmasm/LinkerObject.h
index c234268824..90b519e3af 100644
--- a/libevmasm/LinkerObject.h
+++ b/libevmasm/LinkerObject.h
@@ -72,6 +72,8 @@ struct LinkerObject
 	/// of the first 18 bytes of the keccak-256 hash of @a _libraryName.
 	static std::string libraryPlaceholder(std::string const& _libraryName);
 
+	bool operator<(LinkerObject const& _other) const;
+
 private:
 	static util::h160 const* matchLibrary(
 		std::string const& _linkRefName,
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol
new file mode 100644
index 0000000000..2b2d694bd1
--- /dev/null
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol
@@ -0,0 +1,42 @@
+contract A {
+    function longdata() pure external returns (bytes memory) {
+        return
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        " .RPOKIDAS,.CKUMT.,ORKAD ,NOKIDHA .CGKIAD OVHAMS CUAOGT DAKN OIT"
+        "xasopca.pngaibngidak.jbtnudak.cAP.BRRSMCPJAGPD KIAJDOMHUKR,SCPID"
+        "M,SEYBDXCNTKIMNJGO;DUIAQBQUEHAKMPGIDSAJCOUKANJBCUEBKNA.GIAKMV.TI"
+        "AJMO<KXBANJCPGUD ABKCJIDHA NKIMAJU,EKAMHSO;PYCAKUM,L.UCA MR;KITA"
+        "apibakrpidbacnidkacjadtnpdkylca.,jda,r.kuadc,jdlkjd',c'dj, ncg d"
+        "anosumantkudkc,djntudkantuadnc,ui,c.ud,.nujdncud,j.rsch'pkl.'pih";
+    }
+}
+
+contract C {
+    constructor() {
+    }
+
+    function a() external returns (bytes memory) {
+        return type(A).creationCode;
+    }
+
+    function b() external returns (A) {
+        return new A();
+    }
+
+    function test() public view returns (bool) {
+        uint x;
+        assembly {
+            x := codesize()
+        }
+        return type(A).creationCode.length < x &&
+            x < 2 * type(A).creationCode.length;
+    }
+}
+
+// ----
+// test() -> true
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index cf865ff19d..aacaa0e0aa 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -17,7 +17,7 @@ contract C {
 // EVMVersion: >=byzantium
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 184005
+// gas irOptimized: 179697
 // gas legacy: 294335
 // gas legacyOptimized: 173427
 // f(uint256): 20 -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
diff --git a/test/libsolidity/semanticTests/libraries/library_references_preserve.sol b/test/libsolidity/semanticTests/libraries/library_references_preserve.sol
new file mode 100644
index 0000000000..ce41e54e98
--- /dev/null
+++ b/test/libsolidity/semanticTests/libraries/library_references_preserve.sol
@@ -0,0 +1,48 @@
+library L1 {
+    function add(uint256 a, uint256 b) external pure returns (uint256) {
+        return a + b + 1;
+    }
+}
+
+library L2 {
+    function add(uint256 a, uint256 b) external pure returns (uint256) {
+        return a + b + 2;
+    }
+}
+
+contract A {
+    uint256 sum;
+    constructor() {
+        sum = L1.add(1, 2);
+    }
+    function getSum() external view returns(uint256) {
+        return sum;
+    }
+}
+
+contract B {
+    uint256 sum;
+    constructor() {
+        sum = L2.add(1, 2);
+    }
+    function getSum() external view returns(uint256) {
+        return sum;
+    }
+}
+
+contract C {
+    A a = new A();
+    B b = new B();
+    function aSum() external view returns(uint256) {
+        return a.getSum();
+    }
+    function bSum() external view returns(uint256) {
+        return b.getSum();
+    }
+}
+
+// ----
+// library: L1
+// library: L2
+// aSum() -> 4
+// bSum() -> 5
diff --git a/test/libyul/objectCompiler/subObjectAccess.yul b/test/libyul/objectCompiler/subObjectAccess.yul
index 1e28ed5d54..1899551fd1 100644
--- a/test/libyul/objectCompiler/subObjectAccess.yul
+++ b/test/libyul/objectCompiler/subObjectAccess.yul
@@ -249,6 +249,6 @@ object "A" {
 //           invalid
 //     }
 // }
-// Bytecode: 600060996045603f60866013608560016084600189600055886020558760405586606055856080558460a0558360c0558260e055816101005580610120556101406000f3fe602a6013603d6001603e600185600055846020558360405582606055816080558060a05560c06000f3fe60126001816000558060205560406000f3fefefefefefe60126001816000558060205560406000f3fefe
-// Opcodes: PUSH1 0x0 PUSH1 0x99 PUSH1 0x45 PUSH1 0x3F PUSH1 0x86 PUSH1 0x13 PUSH1 0x85 PUSH1 0x1 PUSH1 0x84 PUSH1 0x1 DUP10 PUSH1 0x0 SSTORE DUP9 PUSH1 0x20 SSTORE DUP8 PUSH1 0x40 SSTORE DUP7 PUSH1 0x60 SSTORE DUP6 PUSH1 0x80 SSTORE DUP5 PUSH1 0xA0 SSTORE DUP4 PUSH1 0xC0 SSTORE DUP3 PUSH1 0xE0 SSTORE DUP2 PUSH2 0x100 SSTORE DUP1 PUSH2 0x120 SSTORE PUSH2 0x140 PUSH1 0x0 RETURN INVALID PUSH1 0x2A PUSH1 0x13 PUSH1 0x3D PUSH1 0x1 PUSH1 0x3E PUSH1 0x1 DUP6 PUSH1 0x0 SSTORE DUP5 PUSH1 0x20 SSTORE DUP4 PUSH1 0x40 SSTORE DUP3 PUSH1 0x60 SSTORE DUP2 PUSH1 0x80 SSTORE DUP1 PUSH1 0xA0 SSTORE PUSH1 0xC0 PUSH1 0x0 RETURN INVALID PUSH1 0x12 PUSH1 0x1 DUP2 PUSH1 0x0 SSTORE DUP1 PUSH1 0x20 SSTORE PUSH1 0x40 PUSH1 0x0 RETURN INVALID INVALID INVALID INVALID INVALID INVALID PUSH1 0x12 PUSH1 0x1 DUP2 PUSH1 0x0 SSTORE DUP1 PUSH1 0x20 SSTORE PUSH1 0x40 PUSH1 0x0 RETURN INVALID INVALID
+// Bytecode: 600060976045603e60846013608360016083600189600055886020558760405586606055856080558460a0558360c0558260e055816101005580610120556101406000f3fe602a6013603d6001603d600185600055846020558360405582606055816080558060a05560c06000f3fe60126001816000558060205560406000f3fefefefe60126001816000558060205560406000f3fefe
+// Opcodes: PUSH1 0x0 PUSH1 0x97 PUSH1 0x45 PUSH1 0x3E PUSH1 0x84 PUSH1 0x13 PUSH1 0x83 PUSH1 0x1 PUSH1 0x83 PUSH1 0x1 DUP10 PUSH1 0x0 SSTORE DUP9 PUSH1 0x20 SSTORE DUP8 PUSH1 0x40 SSTORE DUP7 PUSH1 0x60 SSTORE DUP6 PUSH1 0x80 SSTORE DUP5 PUSH1 0xA0 SSTORE DUP4 PUSH1 0xC0 SSTORE DUP3 PUSH1 0xE0 SSTORE DUP2 PUSH2 0x100 SSTORE DUP1 PUSH2 0x120 SSTORE PUSH2 0x140 PUSH1 0x0 RETURN INVALID PUSH1 0x2A PUSH1 0x13 PUSH1 0x3D PUSH1 0x1 PUSH1 0x3D PUSH1 0x1 DUP6 PUSH1 0x0 SSTORE DUP5 PUSH1 0x20 SSTORE DUP4 PUSH1 0x40 SSTORE DUP3 PUSH1 0x60 SSTORE DUP2 PUSH1 0x80 SSTORE DUP1 PUSH1 0xA0 SSTORE PUSH1 0xC0 PUSH1 0x0 RETURN INVALID PUSH1 0x12 PUSH1 0x1 DUP2 PUSH1 0x0 SSTORE DUP1 PUSH1 0x20 SSTORE PUSH1 0x40 PUSH1 0x0 RETURN INVALID INVALID INVALID INVALID PUSH1 0x12 PUSH1 0x1 DUP2 PUSH1 0x0 SSTORE DUP1 PUSH1 0x20 SSTORE PUSH1 0x40 PUSH1 0x0 RETURN INVALID INVALID
 // SourceMappings: 37:15:0:-:0;68:13;97:15;128:13;158:17;192:15;224:17;258:15;291:19;328:17;361:3;358:1;351:14;381:3;377:2;370:15;401:3;397:2;390:15;421:3;417:2;410:15;442:4;437:3;430:17;464:4;459:3;452:17;486:4;481:3;474:17;508:4;503:3;496:17;530:5;525:3;518:18;553:5;548:3;541:18;574:3;571:1;564:14

From 37e507972c16015a2a6f6efe5e2303c521badb7b Mon Sep 17 00:00:00 2001
From: drblessing <52829488+Drblessing@users.noreply.github.com>
Date: Fri, 17 Feb 2023 05:58:18 +0000
Subject: [PATCH 1196/1748] Update block time documentation

---
 docs/introduction-to-smart-contracts.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 146f2224be..2edf22d475 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -300,9 +300,9 @@ and then they will be executed and distributed among all participating nodes.
 If two transactions contradict each other, the one that ends up being second will
 be rejected and not become part of the block.
 
-These blocks form a linear sequence in time and that is where the word "blockchain"
-derives from. Blocks are added to the chain in rather regular intervals - for
-Ethereum this is roughly every 17 seconds.
+These blocks form a linear sequence in time, and that is where the word "blockchain" derives from.
+Blocks are added to the chain at regular intervals, although these intervals may be subject to change in the future.
+For the most up-to-date information, it is recommended to monitor the network, for example, on `Etherscan <https://etherscan.io/chart/blocktime>`_.
 
 As part of the "order selection mechanism" (which is called "mining") it may happen that
 blocks are reverted from time to time, but only at the "tip" of the chain. The more

From 2c306ed32c48362c34ca9e951dae496d8fa03877 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 21 Feb 2023 14:46:41 +0100
Subject: [PATCH 1197/1748] Fix broken links for 0.8.19

---
 docs/installing-solidity.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 8c2830451c..c1caaec058 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -429,7 +429,7 @@ in Visual Studio 2019 Build Tools or Visual Studio 2019:
 * C++/CLI support
 
 .. _Visual Studio 2019: https://www.visualstudio.com/vs/
-.. _Visual Studio 2019 Build Tools: https://www.visualstudio.com/downloads/#build-tools-for-visual-studio-2019
+.. _Visual Studio 2019 Build Tools: https://visualstudio.microsoft.com/vs/older-downloads/#visual-studio-2019-and-other-products
 
 We have a helper script which you can use to install all required external dependencies:
 

From 38b5ae578b95b6aabeb028beb16cdc77e9cbaa37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 1 Dec 2022 01:35:04 +0100
Subject: [PATCH 1198/1748] Fix typo in test name: singed -> signed

---
 .../shifts/{shift_singed_rvalue.sol => shift_signed_rvalue.sol}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename test/libsolidity/syntaxTests/shifts/{shift_singed_rvalue.sol => shift_signed_rvalue.sol} (100%)

diff --git a/test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol b/test/libsolidity/syntaxTests/shifts/shift_signed_rvalue.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/shifts/shift_singed_rvalue.sol
rename to test/libsolidity/syntaxTests/shifts/shift_signed_rvalue.sol

From 9efc422b480f71fd01ecae5205da4df06f363011 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Tue, 21 Feb 2023 22:04:41 +0100
Subject: [PATCH 1199/1748] Run triage action on all new issues

---
 .github/workflows/triage.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
index 0737efc336..aacc0d9921 100644
--- a/.github/workflows/triage.yml
+++ b/.github/workflows/triage.yml
@@ -15,7 +15,6 @@ env:
 jobs:
   triage_issues:
     runs-on: ubuntu-latest
-    if: join(github.event.issue.labels) == ''
     steps:
       - name: Retrieve the content of all columns on the board
         run: |

From fa0d3a44a7868aee4277faafab7b028f9679f132 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 7 Feb 2023 17:37:17 +0100
Subject: [PATCH 1200/1748] Tests for using enums and fixed-point types as
 user-defined types

---
 .../syntaxTests/userDefinedValueType/all_value_types.sol     | 3 ++-
 .../userDefinedValueType/non_value_type_enum_err.sol         | 5 +++++
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_enum_err.sol

diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/all_value_types.sol b/test/libsolidity/syntaxTests/userDefinedValueType/all_value_types.sol
index 3388c19760..e1d453007a 100644
--- a/test/libsolidity/syntaxTests/userDefinedValueType/all_value_types.sol
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/all_value_types.sol
@@ -4,7 +4,8 @@ type MyInt is int;
 type MyUInt is uint;
 type MyInt128 is int128;
 type MyUInt128 is uint128;
-// TODO add fixed point type, when it's implemented
+type MyFixed is fixed;
+type MyUfixed is ufixed;
 type MyFixedBytes32 is bytes32;
 type MyFixedBytes1 is bytes1;
 type MyBool is bool;
diff --git a/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_enum_err.sol b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_enum_err.sol
new file mode 100644
index 0000000000..f143bc5093
--- /dev/null
+++ b/test/libsolidity/syntaxTests/userDefinedValueType/non_value_type_enum_err.sol
@@ -0,0 +1,5 @@
+enum E {A, B, C}
+
+type MyType is E;
+// ----
+// TypeError 8657: (33-34): The underlying type for a user defined value type has to be an elementary value type.

From 9a36438441ef4d7eab4f1c10a8c1dbcfb7d3157b Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 6 Jul 2022 09:17:59 +0200
Subject: [PATCH 1201/1748] User-defined operators: AST

---
 libsolidity/CMakeLists.txt               |  1 +
 libsolidity/ast/AST.cpp                  | 38 ++++++++++++++++++++++++
 libsolidity/ast/AST.h                    | 15 ++++++++++
 libsolidity/ast/ASTAnnotations.h         |  7 ++++-
 libsolidity/ast/ASTJsonExporter.cpp      | 24 +++++++++++++--
 libsolidity/ast/ASTJsonImporter.cpp      | 30 ++++++++++++++++++-
 libsolidity/ast/UserDefinableOperators.h | 31 +++++++++++++++++++
 7 files changed, 141 insertions(+), 5 deletions(-)
 create mode 100644 libsolidity/ast/UserDefinableOperators.h

diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index c331f1a4b6..32869ba130 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -63,6 +63,7 @@ set(sources
 	ast/CallGraph.cpp
 	ast/CallGraph.h
 	ast/ExperimentalFeatures.h
+	ast/UserDefinableOperators.h
 	ast/Types.cpp
 	ast/Types.h
 	ast/TypeProvider.cpp
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index 8619ee6ae7..fab1a20f80 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -30,7 +30,9 @@
 #include <libsolutil/FunctionSelector.h>
 #include <libsolutil/Keccak256.h>
 
+#include <range/v3/range/conversion.hpp>
 #include <range/v3/view/tail.hpp>
+#include <range/v3/view/zip.hpp>
 
 #include <boost/algorithm/string.hpp>
 
@@ -367,6 +369,11 @@ TypeDeclarationAnnotation& UserDefinedValueTypeDefinition::annotation() const
 	return initAnnotation<TypeDeclarationAnnotation>();
 }
 
+std::vector<std::pair<ASTPointer<IdentifierPath>, std::optional<Token>>> UsingForDirective::functionsAndOperators() const
+{
+	return ranges::zip_view(m_functionsOrLibrary, m_operators) | ranges::to<vector>;
+}
+
 Type const* StructDefinition::type() const
 {
 	solAssert(annotation().recursive.has_value(), "Requested struct type before DeclarationTypeChecker.");
@@ -895,6 +902,37 @@ MemberAccessAnnotation& MemberAccess::annotation() const
 	return initAnnotation<MemberAccessAnnotation>();
 }
 
+OperationAnnotation& UnaryOperation::annotation() const
+{
+	return initAnnotation<OperationAnnotation>();
+}
+
+FunctionType const* UnaryOperation::userDefinedFunctionType() const
+{
+	if (*annotation().userDefinedFunction == nullptr)
+		return nullptr;
+
+	FunctionDefinition const* userDefinedFunction = *annotation().userDefinedFunction;
+	return dynamic_cast<FunctionType const*>(
+		userDefinedFunction->libraryFunction() ?
+		userDefinedFunction->typeViaContractName() :
+		userDefinedFunction->type()
+	);
+}
+
+FunctionType const* BinaryOperation::userDefinedFunctionType() const
+{
+	if (*annotation().userDefinedFunction == nullptr)
+		return nullptr;
+
+	FunctionDefinition const* userDefinedFunction = *annotation().userDefinedFunction;
+	return dynamic_cast<FunctionType const*>(
+		userDefinedFunction->libraryFunction() ?
+		userDefinedFunction->typeViaContractName() :
+		userDefinedFunction->type()
+	);
+}
+
 BinaryOperationAnnotation& BinaryOperation::annotation() const
 {
 	return initAnnotation<BinaryOperationAnnotation>();
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index f0f43945bf..6e61ae3bc7 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -663,16 +663,19 @@ class UsingForDirective: public ASTNode
 		int64_t _id,
 		SourceLocation const& _location,
 		std::vector<ASTPointer<IdentifierPath>> _functionsOrLibrary,
+		std::vector<std::optional<Token>> _operators,
 		bool _usesBraces,
 		ASTPointer<TypeName> _typeName,
 		bool _global
 	):
 		ASTNode(_id, _location),
 		m_functionsOrLibrary(std::move(_functionsOrLibrary)),
+		m_operators(std::move(_operators)),
 		m_usesBraces(_usesBraces),
 		m_typeName(std::move(_typeName)),
 		m_global{_global}
 	{
+		solAssert(m_functionsOrLibrary.size() == m_operators.size());
 	}
 
 	void accept(ASTVisitor& _visitor) override;
@@ -683,12 +686,18 @@ class UsingForDirective: public ASTNode
 
 	/// @returns a list of functions or the single library.
 	std::vector<ASTPointer<IdentifierPath>> const& functionsOrLibrary() const { return m_functionsOrLibrary; }
+	std::vector<std::pair<ASTPointer<IdentifierPath>, std::optional<Token>>> functionsAndOperators() const;
 	bool usesBraces() const { return m_usesBraces; }
 	bool global() const { return m_global; }
 
 private:
 	/// Either the single library or a list of functions.
 	std::vector<ASTPointer<IdentifierPath>> m_functionsOrLibrary;
+	/// Operators, the functions from @a m_functionsOrLibrary implement.
+	/// A token if the corresponding element in m_functionsOrLibrary
+	/// defines an operator, nullptr otherwise.
+	/// Note that this vector size must be equal to m_functionsOrLibrary size.
+	std::vector<std::optional<Token>> m_operators;
 	bool m_usesBraces;
 	ASTPointer<TypeName> m_typeName;
 	bool m_global = false;
@@ -2073,6 +2082,10 @@ class UnaryOperation: public Expression
 	bool isPrefixOperation() const { return m_isPrefix; }
 	Expression const& subExpression() const { return *m_subExpression; }
 
+	FunctionType const* userDefinedFunctionType() const;
+
+	OperationAnnotation& annotation() const override;
+
 private:
 	Token m_operator;
 	ASTPointer<Expression> m_subExpression;
@@ -2104,6 +2117,8 @@ class BinaryOperation: public Expression
 	Expression const& rightExpression() const { return *m_right; }
 	Token getOperator() const { return m_operator; }
 
+	FunctionType const* userDefinedFunctionType() const;
+
 	BinaryOperationAnnotation& annotation() const override;
 
 private:
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index 2615e6af78..b85eb3ad0a 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -312,7 +312,12 @@ struct MemberAccessAnnotation: ExpressionAnnotation
 	util::SetOnce<VirtualLookup> requiredLookup;
 };
 
-struct BinaryOperationAnnotation: ExpressionAnnotation
+struct OperationAnnotation: ExpressionAnnotation
+{
+	util::SetOnce<FunctionDefinition const*> userDefinedFunction;
+};
+
+struct BinaryOperationAnnotation: OperationAnnotation
 {
 	/// The common type that is used for the operation, not necessarily the result type (which
 	/// e.g. for comparisons is bool).
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index 7db502eefb..e35d108216 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -330,19 +330,31 @@ bool ASTJsonExporter::visit(UsingForDirective const& _node)
 	vector<pair<string, Json::Value>> attributes = {
 		make_pair("typeName", _node.typeName() ? toJson(*_node.typeName()) : Json::nullValue)
 	};
+
 	if (_node.usesBraces())
 	{
 		Json::Value functionList;
-		for (auto const& function: _node.functionsOrLibrary())
+		for (auto&& [function, op]: _node.functionsAndOperators())
 		{
 			Json::Value functionNode;
-			functionNode["function"] = toJson(*function);
+			if (!op.has_value())
+				functionNode["function"] = toJson(*function);
+			else
+			{
+				functionNode["definition"] = toJson(*function);
+				functionNode["operator"] = string(TokenTraits::toString(*op));
+			}
 			functionList.append(std::move(functionNode));
 		}
 		attributes.emplace_back("functionList", std::move(functionList));
 	}
 	else
-		attributes.emplace_back("libraryName", toJson(*_node.functionsOrLibrary().front()));
+	{
+		auto const& functionAndOperators = _node.functionsAndOperators();
+		solAssert(_node.functionsAndOperators().size() == 1);
+		solAssert(!functionAndOperators.front().second.has_value());
+		attributes.emplace_back("libraryName", toJson(*(functionAndOperators.front().first)));
+	}
 	attributes.emplace_back("global", _node.global());
 
 	setJsonNode(_node, "UsingForDirective", std::move(attributes));
@@ -830,6 +842,9 @@ bool ASTJsonExporter::visit(UnaryOperation const& _node)
 		make_pair("operator", TokenTraits::toString(_node.getOperator())),
 		make_pair("subExpression", toJson(_node.subExpression()))
 	};
+	// NOTE: This annotation is guaranteed to be set but only if we didn't stop at the parsing stage.
+	if (_node.annotation().userDefinedFunction.set() && *_node.annotation().userDefinedFunction != nullptr)
+		attributes.emplace_back("function", nodeId(**_node.annotation().userDefinedFunction));
 	appendExpressionAttributes(attributes, _node.annotation());
 	setJsonNode(_node, "UnaryOperation", std::move(attributes));
 	return false;
@@ -843,6 +858,9 @@ bool ASTJsonExporter::visit(BinaryOperation const& _node)
 		make_pair("rightExpression", toJson(_node.rightExpression())),
 		make_pair("commonType", typePointerToJson(_node.annotation().commonType)),
 	};
+	// NOTE: This annotation is guaranteed to be set but only if we didn't stop at the parsing stage.
+	if (_node.annotation().userDefinedFunction.set() && *_node.annotation().userDefinedFunction != nullptr)
+		attributes.emplace_back("function", nodeId(**_node.annotation().userDefinedFunction));
 	appendExpressionAttributes(attributes, _node.annotation());
 	setJsonNode(_node, "BinaryOperation", std::move(attributes));
 	return false;
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 0797049468..4f4b9c17ba 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -22,6 +22,7 @@
  */
 
 #include <libsolidity/ast/ASTJsonImporter.h>
+#include <libsolidity/ast/UserDefinableOperators.h>
 
 #include <libyul/AsmJsonImporter.h>
 #include <libyul/AST.h>
@@ -397,15 +398,42 @@ ASTPointer<InheritanceSpecifier> ASTJsonImporter::createInheritanceSpecifier(Jso
 ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json::Value const& _node)
 {
 	vector<ASTPointer<IdentifierPath>> functions;
+	vector<optional<Token>> operators;
 	if (_node.isMember("libraryName"))
+	{
+		astAssert(!_node["libraryName"].isArray());
+		astAssert(!_node["libraryName"]["operator"]);
 		functions.emplace_back(createIdentifierPath(_node["libraryName"]));
+		operators.emplace_back(nullopt);
+	}
 	else if (_node.isMember("functionList"))
 		for (Json::Value const& function: _node["functionList"])
-			functions.emplace_back(createIdentifierPath(function["function"]));
+		{
+			if (function.isMember("function"))
+			{
+				astAssert(!function.isMember("operator"));
+				astAssert(!function.isMember("definition"));
+
+				functions.emplace_back(createIdentifierPath(function["function"]));
+				operators.emplace_back(nullopt);
+			}
+			else
+			{
+				astAssert(function.isMember("operator"));
+				astAssert(function.isMember("definition"));
+
+				Token const operatorName = scanSingleToken(function["operator"]);
+				astAssert(util::contains(frontend::userDefinableOperators, operatorName));
+
+				functions.emplace_back(createIdentifierPath(function["definition"]));
+				operators.emplace_back(operatorName);
+			}
+		}
 
 	return createASTNode<UsingForDirective>(
 		_node,
 		std::move(functions),
+		std::move(operators),
 		!_node.isMember("libraryName"),
 		_node["typeName"].isNull() ? nullptr  : convertJsonToASTNode<TypeName>(_node["typeName"]),
 		memberAsBool(_node, "global")
diff --git a/libsolidity/ast/UserDefinableOperators.h b/libsolidity/ast/UserDefinableOperators.h
new file mode 100644
index 0000000000..5b98524f50
--- /dev/null
+++ b/libsolidity/ast/UserDefinableOperators.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <liblangutil/Token.h>
+
+#include <vector>
+
+namespace solidity::frontend
+{
+
+std::vector<langutil::Token> const userDefinableOperators = {
+	// Bitwise
+	langutil::Token::BitOr,
+	langutil::Token::BitAnd,
+	langutil::Token::BitXor,
+	langutil::Token::BitNot,
+	// Arithmetic
+	langutil::Token::Add,
+	langutil::Token::Sub,
+	langutil::Token::Mul,
+	langutil::Token::Div,
+	langutil::Token::Mod,
+	// Comparison
+	langutil::Token::Equal,
+	langutil::Token::NotEqual,
+	langutil::Token::LessThan,
+	langutil::Token::GreaterThan,
+	langutil::Token::LessThanOrEqual,
+	langutil::Token::GreaterThanOrEqual,
+};
+
+}

From 9445483d60397ac6d41c9639eb03903b0e6d8d64 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 6 Jul 2022 09:17:59 +0200
Subject: [PATCH 1202/1748] User-defined operators: Parsing and grammar

---
 docs/grammar/SolidityParser.g4 | 22 +++++++++++++++++++++-
 libsolidity/parsing/Parser.cpp | 27 ++++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index aa90b30bcd..673f1c071f 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -311,11 +311,31 @@ errorDefinition:
 	LParen (parameters+=errorParameter (Comma parameters+=errorParameter)*)? RParen
 	Semicolon;
 
+/**
+ * Operators that users are allowed to implement for some types with `using for`.
+ */
+userDefinableOperator:
+	BitAnd
+	| BitNot
+	| BitOr
+	| BitXor
+	| Add
+	| Div
+	| Mod
+	| Mul
+	| Sub
+	| Equal
+	| GreaterThan
+	| GreaterThanOrEqual
+	| LessThan
+	| LessThanOrEqual
+	| NotEqual;
+
 /**
  * Using directive to attach library functions and free functions to types.
  * Can occur within contracts and libraries and at the file level.
  */
-usingDirective: Using (identifierPath | (LBrace identifierPath (Comma identifierPath)* RBrace)) For (Mul | typeName) Global? Semicolon;
+usingDirective: Using (identifierPath | (LBrace identifierPath (As userDefinableOperator)? (Comma identifierPath (As userDefinableOperator)?)* RBrace)) For (Mul | typeName) Global? Semicolon;
 /**
  * A type name can be an elementary type, a function type, a mapping type, a user-defined type
  * (e.g. a contract or struct) or an array type.
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index a9065b176b..d3bdf549f4 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -23,6 +23,7 @@
 
 #include <libsolidity/parsing/Parser.h>
 
+#include <libsolidity/ast/UserDefinableOperators.h>
 #include <libsolidity/interface/Version.h>
 #include <libyul/AST.h>
 #include <libyul/AsmParser.h>
@@ -976,6 +977,7 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 	expectToken(Token::Using);
 
 	vector<ASTPointer<IdentifierPath>> functions;
+	vector<optional<Token>> operators;
 	bool const usesBraces = m_scanner->currentToken() == Token::LBrace;
 	if (usesBraces)
 	{
@@ -983,12 +985,35 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 		{
 			advance();
 			functions.emplace_back(parseIdentifierPath());
+			if (m_scanner->currentToken() == Token::As)
+			{
+				advance();
+				Token operator_ = m_scanner->currentToken();
+				if (!util::contains(userDefinableOperators, operator_))
+				{
+					parserError(
+						4403_error,
+						fmt::format(
+							"Not a user-definable operator: {}. Only the following operators can be user-defined: {}",
+							(!m_scanner->currentLiteral().empty() ? m_scanner->currentLiteral() : string(TokenTraits::toString(operator_))),
+							util::joinHumanReadable(userDefinableOperators | ranges::views::transform([](Token _t) { return string{TokenTraits::toString(_t)}; }))
+						)
+					);
+				}
+				operators.emplace_back(operator_);
+				advance();
+			}
+			else
+				operators.emplace_back(nullopt);
 		}
 		while (m_scanner->currentToken() == Token::Comma);
 		expectToken(Token::RBrace);
 	}
 	else
+	{
 		functions.emplace_back(parseIdentifierPath());
+		operators.emplace_back(nullopt);
+	}
 
 	ASTPointer<TypeName> typeName;
 	expectToken(Token::For);
@@ -1004,7 +1029,7 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 	}
 	nodeFactory.markEndPosition();
 	expectToken(Token::Semicolon);
-	return nodeFactory.createNode<UsingForDirective>(std::move(functions), usesBraces, typeName, global);
+	return nodeFactory.createNode<UsingForDirective>(std::move(functions), std::move(operators), usesBraces, typeName, global);
 }
 
 ASTPointer<ModifierInvocation> Parser::parseModifierInvocation()

From 5b03c13f90cc4187907e295486faa60d28d45683 Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 6 Jul 2022 09:17:59 +0200
Subject: [PATCH 1203/1748] User-defined operators: Analysis

---
 libsolidity/analysis/ControlFlowBuilder.cpp |  40 ++-
 libsolidity/analysis/ControlFlowBuilder.h   |   1 +
 libsolidity/analysis/FunctionCallGraph.cpp  |  14 +
 libsolidity/analysis/FunctionCallGraph.h    |   2 +
 libsolidity/analysis/SyntaxChecker.cpp      |   6 +
 libsolidity/analysis/TypeChecker.cpp        | 325 +++++++++++++++++---
 libsolidity/analysis/ViewPureChecker.cpp    |  12 +
 libsolidity/analysis/ViewPureChecker.h      |   2 +
 libsolidity/ast/Types.cpp                   |  39 ++-
 libsolidity/ast/Types.h                     |  15 +
 10 files changed, 410 insertions(+), 46 deletions(-)

diff --git a/libsolidity/analysis/ControlFlowBuilder.cpp b/libsolidity/analysis/ControlFlowBuilder.cpp
index 3794dcf6f2..1f2cfcac9d 100644
--- a/libsolidity/analysis/ControlFlowBuilder.cpp
+++ b/libsolidity/analysis/ControlFlowBuilder.cpp
@@ -64,17 +64,53 @@ bool ControlFlowBuilder::visit(BinaryOperation const& _operation)
 		case Token::And:
 		{
 			visitNode(_operation);
+			solAssert(*_operation.annotation().userDefinedFunction == nullptr);
 			appendControlFlow(_operation.leftExpression());
 
 			auto nodes = splitFlow<2>();
 			nodes[0] = createFlow(nodes[0], _operation.rightExpression());
 			mergeFlow(nodes, nodes[1]);
-
 			return false;
 		}
 		default:
-			return ASTConstVisitor::visit(_operation);
+		{
+			if (*_operation.annotation().userDefinedFunction != nullptr)
+			{
+				visitNode(_operation);
+				_operation.leftExpression().accept(*this);
+				_operation.rightExpression().accept(*this);
+
+				m_currentNode->functionDefinition = *_operation.annotation().userDefinedFunction;
+
+				auto nextNode = newLabel();
+
+				connect(m_currentNode, nextNode);
+				m_currentNode = nextNode;
+				return false;
+			}
+		}
 	}
+	return ASTConstVisitor::visit(_operation);
+}
+
+bool ControlFlowBuilder::visit(UnaryOperation const& _operation)
+{
+	solAssert(!!m_currentNode);
+
+	if (*_operation.annotation().userDefinedFunction != nullptr)
+	{
+		visitNode(_operation);
+		_operation.subExpression().accept(*this);
+		m_currentNode->functionDefinition = *_operation.annotation().userDefinedFunction;
+
+		auto nextNode = newLabel();
+
+		connect(m_currentNode, nextNode);
+		m_currentNode = nextNode;
+		return false;
+	}
+
+	return ASTConstVisitor::visit(_operation);
 }
 
 bool ControlFlowBuilder::visit(Conditional const& _conditional)
diff --git a/libsolidity/analysis/ControlFlowBuilder.h b/libsolidity/analysis/ControlFlowBuilder.h
index 91ca0eefa1..93bc52bd69 100644
--- a/libsolidity/analysis/ControlFlowBuilder.h
+++ b/libsolidity/analysis/ControlFlowBuilder.h
@@ -50,6 +50,7 @@ class ControlFlowBuilder: private ASTConstVisitor, private yul::ASTWalker
 
 	// Visits for constructing the control flow.
 	bool visit(BinaryOperation const& _operation) override;
+	bool visit(UnaryOperation const& _operation) override;
 	bool visit(Conditional const& _conditional) override;
 	bool visit(TryStatement const& _tryStatement) override;
 	bool visit(IfStatement const& _ifStatement) override;
diff --git a/libsolidity/analysis/FunctionCallGraph.cpp b/libsolidity/analysis/FunctionCallGraph.cpp
index e941c99c55..ce5c539346 100644
--- a/libsolidity/analysis/FunctionCallGraph.cpp
+++ b/libsolidity/analysis/FunctionCallGraph.cpp
@@ -204,6 +204,20 @@ bool FunctionCallGraphBuilder::visit(MemberAccess const& _memberAccess)
 	return true;
 }
 
+bool FunctionCallGraphBuilder::visit(BinaryOperation const& _binaryOperation)
+{
+	if (*_binaryOperation.annotation().userDefinedFunction != nullptr)
+		functionReferenced(**_binaryOperation.annotation().userDefinedFunction, true /* called directly */);
+	return true;
+}
+
+bool FunctionCallGraphBuilder::visit(UnaryOperation const& _unaryOperation)
+{
+	if (*_unaryOperation.annotation().userDefinedFunction != nullptr)
+		functionReferenced(**_unaryOperation.annotation().userDefinedFunction, true /* called directly */);
+	return true;
+}
+
 bool FunctionCallGraphBuilder::visit(ModifierInvocation const& _modifierInvocation)
 {
 	if (auto const* modifier = dynamic_cast<ModifierDefinition const*>(_modifierInvocation.name().annotation().referencedDeclaration))
diff --git a/libsolidity/analysis/FunctionCallGraph.h b/libsolidity/analysis/FunctionCallGraph.h
index 3ea1f5b9e2..a4e5787a25 100644
--- a/libsolidity/analysis/FunctionCallGraph.h
+++ b/libsolidity/analysis/FunctionCallGraph.h
@@ -72,6 +72,8 @@ class FunctionCallGraphBuilder: private ASTConstVisitor
 	bool visit(EmitStatement const& _emitStatement) override;
 	bool visit(Identifier const& _identifier) override;
 	bool visit(MemberAccess const& _memberAccess) override;
+	bool visit(BinaryOperation const& _binaryOperation) override;
+	bool visit(UnaryOperation const& _unaryOperation) override;
 	bool visit(ModifierInvocation const& _modifierInvocation) override;
 	bool visit(NewExpression const& _newExpression) override;
 
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index 8b6cd37eb5..c26ed6767a 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -411,6 +411,12 @@ void SyntaxChecker::endVisit(ContractDefinition const&)
 
 bool SyntaxChecker::visit(UsingForDirective const& _usingFor)
 {
+	if (!_usingFor.usesBraces())
+		solAssert(
+			_usingFor.functionsAndOperators().size() == 1 &&
+			!get<1>(_usingFor.functionsAndOperators().front())
+		);
+
 	if (!m_currentContractKind && !_usingFor.typeName())
 		m_errorReporter.syntaxError(
 			8118_error,
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index ff8cc87cdd..a0ca580a36 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -24,6 +24,7 @@
 #include <libsolidity/analysis/TypeChecker.h>
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/ast/ASTUtils.h>
+#include <libsolidity/ast/UserDefinableOperators.h>
 #include <libsolidity/ast/TypeProvider.h>
 
 #include <libyul/AsmAnalysis.h>
@@ -1606,7 +1607,7 @@ bool TypeChecker::visit(Assignment const& _assignment)
 				7366_error,
 				_assignment.location(),
 				"Operator " +
-				string(TokenTraits::toString(_assignment.assignmentOperator())) +
+				string(TokenTraits::friendlyName(_assignment.assignmentOperator())) +
 				" not compatible with types " +
 				t->humanReadableName() +
 				" and " +
@@ -1729,16 +1730,45 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 		requireLValue(_operation.subExpression(), false);
 	else
 		_operation.subExpression().accept(*this);
-	Type const* subExprType = type(_operation.subExpression());
-	TypeResult result = type(_operation.subExpression())->unaryOperatorResult(op);
-	if (!result)
+	Type const* operandType = type(_operation.subExpression());
+
+	// Check if the operator is built-in or user-defined.
+	TypeResult builtinResult = operandType->unaryOperatorResult(op);
+	set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = operandType->operatorDefinitions(
+		op,
+		*currentDefinitionScope(),
+		true // _unary
+	);
+
+	// Operator can't be both user-defined and built-in at the same time.
+	solAssert(!builtinResult || matchingDefinitions.empty());
+
+	// By default use the type we'd expect from correct code. This way we can continue analysis
+	// of other expressions in a sensible way in case of a non-fatal error.
+	Type const* resultType = operandType;
+
+	FunctionDefinition const* operatorDefinition = nullptr;
+	if (builtinResult)
+		resultType = builtinResult;
+	else if (!matchingDefinitions.empty())
+	{
+		// This is checked along with `using for` directive but the error is not fatal.
+		if (matchingDefinitions.size() != 1)
+			solAssert(m_errorReporter.hasErrors());
+
+		operatorDefinition = *matchingDefinitions.begin();
+	}
+	else
 	{
 		string description = fmt::format(
-			"Built-in unary operator {} cannot be applied to type {}.{}",
-			TokenTraits::toString(op),
-			subExprType->humanReadableName(),
-			!result.message().empty() ? " " + result.message() : ""
+			"Built-in unary operator {} cannot be applied to type {}.",
+			TokenTraits::friendlyName(op),
+			operandType->humanReadableName()
 		);
+		if (!builtinResult.message().empty())
+			description += " " + builtinResult.message();
+		if (operandType->typeDefinition() && util::contains(userDefinableOperators, op))
+			description += " No matching user-defined operator found.";
 
 		if (modifying)
 			// Cannot just report the error, ignore the unary operator, and continue,
@@ -1746,14 +1776,21 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 			m_errorReporter.fatalTypeError(9767_error, _operation.location(), description);
 		else
 			m_errorReporter.typeError(4907_error, _operation.location(), description);
-		_operation.annotation().type = subExprType;
 	}
-	else
-		_operation.annotation().type = result.get();
+
+	_operation.annotation().userDefinedFunction = operatorDefinition;
+
+	TypePointers const& returnParameterTypes = _operation.userDefinedFunctionType()->returnParameterTypes();
+	if (operatorDefinition && !returnParameterTypes.empty())
+		// Use the actual result type from operator definition. Ignore all values but the
+		// first one - in valid code there will be only one anyway.
+		resultType = returnParameterTypes[0];
+	_operation.annotation().type = resultType;
 	_operation.annotation().isConstant = false;
 	_operation.annotation().isPure =
 		!modifying &&
-		*_operation.subExpression().annotation().isPure;
+		*_operation.subExpression().annotation().isPure &&
+		(!_operation.userDefinedFunctionType() || _operation.userDefinedFunctionType()->isPure());
 	_operation.annotation().isLValue = false;
 
 	return false;
@@ -1763,31 +1800,95 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 {
 	Type const* leftType = type(_operation.leftExpression());
 	Type const* rightType = type(_operation.rightExpression());
-	TypeResult result = leftType->binaryOperatorResult(_operation.getOperator(), rightType);
-	Type const* commonType = result.get();
-	if (!commonType)
+
+	// Check if the operator is built-in or user-defined.
+	TypeResult builtinResult = leftType->binaryOperatorResult(_operation.getOperator(), rightType);
+	set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = leftType->operatorDefinitions(
+		_operation.getOperator(),
+		*currentDefinitionScope(),
+		false // _unary
+	);
+
+	// Operator can't be both user-defined and built-in at the same time.
+	solAssert(!builtinResult || matchingDefinitions.empty());
+
+	Type const* commonType = nullptr;
+	FunctionDefinition const* operatorDefinition = nullptr;
+	if (builtinResult)
+		commonType = builtinResult.get();
+	else if (!matchingDefinitions.empty())
 	{
-		m_errorReporter.typeError(
-			2271_error,
-			_operation.location(),
-			"Built-in binary operator " +
-			string(TokenTraits::toString(_operation.getOperator())) +
-			" cannot be applied to types " +
-			leftType->humanReadableName() +
-			" and " +
-			rightType->humanReadableName() + "." +
-			(!result.message().empty() ? " " + result.message() : "")
+		// This is checked along with `using for` directive but the error is not fatal.
+		if (matchingDefinitions.size() != 1)
+			solAssert(m_errorReporter.hasErrors());
+
+		operatorDefinition = *matchingDefinitions.begin();
+
+		// Set common type to the type used in the `using for` directive.
+		commonType = leftType;
+	}
+	else
+	{
+		string description = fmt::format(
+			"Built-in binary operator {} cannot be applied to types {} and {}.",
+			TokenTraits::friendlyName(_operation.getOperator()),
+			leftType->humanReadableName(),
+			rightType->humanReadableName()
 		);
+		if (!builtinResult.message().empty())
+			description += " " + builtinResult.message();
+		if (leftType->typeDefinition() && util::contains(userDefinableOperators, _operation.getOperator()))
+			description += " No matching user-defined operator found.";
+
+		m_errorReporter.typeError(2271_error, _operation.location(), description);
+
+		// Set common type to something we'd expect from correct code just so that we can continue analysis.
 		commonType = leftType;
 	}
+
 	_operation.annotation().commonType = commonType;
-	_operation.annotation().type =
+	_operation.annotation().userDefinedFunction = operatorDefinition;
+	FunctionType const* userDefinedFunctionType = _operation.userDefinedFunctionType();
+
+	// By default use the type we'd expect from correct code. This way we can continue analysis
+	// of other expressions in a sensible way in case of a non-fatal error.
+	Type const* resultType =
 		TokenTraits::isCompareOp(_operation.getOperator()) ?
 		TypeProvider::boolean() :
 		commonType;
+
+	if (operatorDefinition)
+	{
+		TypePointers const& parameterTypes = userDefinedFunctionType->parameterTypes();
+		TypePointers const& returnParameterTypes = userDefinedFunctionType->returnParameterTypes();
+
+		// operatorDefinitions() filters out definitions with non-matching first argument.
+		solAssert(parameterTypes.size() == 2);
+		solAssert(parameterTypes[0] && *leftType == *parameterTypes[0]);
+
+		if (*rightType != *parameterTypes[0])
+			m_errorReporter.typeError(
+				5653_error,
+				_operation.location(),
+				fmt::format(
+					"The type of the second operand of this user-defined binary operator {} "
+					"does not match the type of the first operand, which is {}.",
+					TokenTraits::friendlyName(_operation.getOperator()),
+					parameterTypes[0]->humanReadableName()
+				)
+			);
+
+		if (!returnParameterTypes.empty())
+			// Use the actual result type from operator definition. Ignore all values but the
+			// first one - in valid code there will be only one anyway.
+			resultType = returnParameterTypes[0];
+	}
+
+	_operation.annotation().type = resultType;
 	_operation.annotation().isPure =
 		*_operation.leftExpression().annotation().isPure &&
-		*_operation.rightExpression().annotation().isPure;
+		*_operation.rightExpression().annotation().isPure &&
+		(!userDefinedFunctionType || userDefinedFunctionType->isPure());
 	_operation.annotation().isLValue = false;
 	_operation.annotation().isConstant = false;
 
@@ -1814,14 +1915,14 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 			m_errorReporter.warning(
 				3149_error,
 				_operation.location(),
-				"The result type of the " +
-				operation +
-				" operation is equal to the type of the first operand (" +
-				commonType->humanReadableName() +
-				") ignoring the (larger) type of the second operand (" +
-				rightType->humanReadableName() +
-				") which might be unexpected. Silence this warning by either converting "
-				"the first or the second operand to the type of the other."
+				fmt::format(
+					"The result type of the {} operation is equal to the type of the first operand ({}) "
+					"ignoring the (larger) type of the second operand ({}) which might be unexpected. "
+					"Silence this warning by either converting the first or the second operand to the type of the other.",
+					operation,
+					commonType->humanReadableName(),
+					rightType->humanReadableName()
+				)
 			);
 	}
 }
@@ -3820,7 +3921,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 	);
 	solAssert(normalizedType);
 
-	for (ASTPointer<IdentifierPath> const& path: _usingFor.functionsOrLibrary())
+	for (auto const& [path, operator_]: _usingFor.functionsAndOperators())
 	{
 		solAssert(path->annotation().referencedDeclaration);
 		FunctionDefinition const& functionDefinition =
@@ -3839,8 +3940,8 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 				4731_error,
 				path->location(),
 				SecondarySourceLocation().append(
-						"Function defined here:",
-						functionDefinition.location()
+					"Function defined here:",
+					functionDefinition.location()
 				),
 				fmt::format(
 					"The function \"{}\" does not have any parameters, and therefore cannot be attached to the type \"{}\".",
@@ -3859,8 +3960,8 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 				6772_error,
 				path->location(),
 				SecondarySourceLocation().append(
-						"Function defined here:",
-						functionDefinition.location()
+					"Function defined here:",
+					functionDefinition.location()
 				),
 				fmt::format(
 					"Function \"{}\" is private and therefore cannot be attached"
@@ -3875,13 +3976,13 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 		BoolResult result = normalizedType->isImplicitlyConvertibleTo(
 			*TypeProvider::withLocationIfReference(DataLocation::Storage, functionTypeWithBoundFirstArgument->selfType())
 		);
-		if (!result)
+		if (!result && !operator_)
 			m_errorReporter.typeError(
 				3100_error,
 				path->location(),
 				SecondarySourceLocation().append(
-						"Function defined here:",
-						functionDefinition.location()
+					"Function defined here:",
+					functionDefinition.location()
 				),
 				fmt::format(
 					"The function \"{}\" cannot be attached to the type \"{}\" because the type cannot "
@@ -3892,6 +3993,144 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 					result.message().empty() ? "." : ": " +  result.message()
 				)
 			);
+		else if (operator_.has_value())
+		{
+			if (!_usingFor.global())
+				m_errorReporter.typeError(
+					3320_error,
+					path->location(),
+					"Operators can only be defined in a global 'using for' directive."
+				);
+
+			if (
+				functionType->stateMutability() != StateMutability::Pure ||
+				!functionDefinition.isFree()
+			)
+				m_errorReporter.typeError(
+					7775_error,
+					path->location(),
+					SecondarySourceLocation().append(
+						"Function defined as non-pure here:",
+						functionDefinition.location()
+					),
+					"Only pure free functions can be used to define operators."
+				);
+
+			solAssert(!functionType->hasBoundFirstArgument());
+			TypePointers const& parameterTypes = functionType->parameterTypes();
+			size_t const parameterCount = parameterTypes.size();
+			if (usingForType->category() != Type::Category::UserDefinedValueType)
+			{
+				m_errorReporter.typeError(
+					5332_error,
+					path->location(),
+					"Operators can only be implemented for user-defined value types."
+				);
+				continue;
+			}
+			solAssert(usingForType->typeDefinition());
+
+			bool identicalFirstTwoParameters = (parameterCount < 2 || *parameterTypes.at(0) == *parameterTypes.at(1));
+			bool isUnaryOnlyOperator = (!TokenTraits::isBinaryOp(operator_.value()) && TokenTraits::isUnaryOp(operator_.value()));
+			bool isBinaryOnlyOperator =
+				(TokenTraits::isBinaryOp(operator_.value()) && !TokenTraits::isUnaryOp(operator_.value())) ||
+				operator_.value() == Token::Add;
+			bool firstParameterMatchesUsingFor = parameterCount == 0 || *usingForType == *parameterTypes.front();
+
+			optional<string> wrongParametersMessage;
+			if (isBinaryOnlyOperator && (parameterCount != 2 || !identicalFirstTwoParameters))
+				wrongParametersMessage = fmt::format("two parameters of type {} and the same data location", usingForType->canonicalName());
+			else if (isUnaryOnlyOperator && (parameterCount != 1 || !firstParameterMatchesUsingFor))
+				wrongParametersMessage = fmt::format("exactly one parameter of type {}", usingForType->canonicalName());
+			else if (parameterCount >= 3 || !firstParameterMatchesUsingFor || !identicalFirstTwoParameters)
+				wrongParametersMessage = fmt::format("one or two parameters of type {} and the same data location", usingForType->canonicalName());
+
+			if (wrongParametersMessage.has_value())
+				m_errorReporter.typeError(
+					1884_error,
+					functionDefinition.parameterList().location(),
+					SecondarySourceLocation().append(
+						"Function was used to implement an operator here:",
+						path->location()
+					),
+					fmt::format(
+						"Wrong parameters in operator definition. "
+						"The function \"{}\" needs to have {} to be used for the operator {}.",
+						joinHumanReadable(path->path(), "."),
+						wrongParametersMessage.value(),
+						TokenTraits::friendlyName(operator_.value())
+					)
+				);
+
+			// This case is separately validated for all attached functions and is a fatal error
+			solAssert(parameterCount != 0);
+
+			TypePointers const& returnParameterTypes = functionType->returnParameterTypes();
+			size_t const returnParameterCount = returnParameterTypes.size();
+
+			optional<string> wrongReturnParametersMessage;
+			if (!TokenTraits::isCompareOp(operator_.value()) && operator_.value() != Token::Not)
+			{
+				if (returnParameterCount != 1 || *usingForType != *returnParameterTypes.front())
+					wrongReturnParametersMessage = "exactly one value of type " + usingForType->canonicalName();
+				else if (*returnParameterTypes.front() != *parameterTypes.front())
+					wrongReturnParametersMessage = "a value of the same type and data location as its parameters";
+			}
+			else if (returnParameterCount != 1 || *returnParameterTypes.front() != *TypeProvider::boolean())
+				wrongReturnParametersMessage = "exactly one value of type bool";
+
+			solAssert(functionDefinition.returnParameterList());
+			if (wrongReturnParametersMessage.has_value())
+				m_errorReporter.typeError(
+					7743_error,
+					functionDefinition.returnParameterList()->location(),
+					SecondarySourceLocation().append(
+						"Function was used to implement an operator here:",
+						path->location()
+					),
+					fmt::format(
+						"Wrong return parameters in operator definition. "
+						"The function \"{}\" needs to return {} to be used for the operator {}.",
+						joinHumanReadable(path->path(), "."),
+						wrongReturnParametersMessage.value(),
+						TokenTraits::friendlyName(operator_.value())
+					)
+				);
+
+			if (parameterCount != 1 && parameterCount != 2)
+				solAssert(m_errorReporter.hasErrors());
+			else
+			{
+				// TODO: This is pretty inefficient. For every operator binding we find, we're
+				// traversing all bindings in all `using for` directives in the current scope.
+				set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = usingForType->operatorDefinitions(
+					operator_.value(),
+					*currentDefinitionScope(),
+					parameterCount == 1 // _unary
+				);
+
+				if (matchingDefinitions.size() >= 2)
+				{
+					// TODO: We should point at other places that bind the operator rather than at
+					// the definitions they bind.
+					SecondarySourceLocation secondaryLocation;
+					for (FunctionDefinition const* definition: matchingDefinitions)
+						if (functionDefinition != *definition)
+						secondaryLocation.append("Conflicting definition:", definition->location());
+
+					m_errorReporter.typeError(
+						4705_error,
+						path->location(),
+						secondaryLocation,
+						fmt::format(
+							"User-defined {} operator {} has more than one definition matching the operand type visible in the current scope.",
+							parameterCount == 1 ? "unary" : "binary",
+							TokenTraits::friendlyName(operator_.value())
+						)
+					);
+				}
+			}
+		}
 	}
 }
 
diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp
index 076430e133..c370f8f9f1 100644
--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ b/libsolidity/analysis/ViewPureChecker.cpp
@@ -331,6 +331,18 @@ void ViewPureChecker::reportFunctionCallMutability(StateMutability _mutability,
 	reportMutability(_mutability, _location);
 }
 
+void ViewPureChecker::endVisit(BinaryOperation const& _binaryOperation)
+{
+	if (*_binaryOperation.annotation().userDefinedFunction != nullptr)
+		reportFunctionCallMutability((*_binaryOperation.annotation().userDefinedFunction)->stateMutability(), _binaryOperation.location());
+}
+
+void ViewPureChecker::endVisit(UnaryOperation const& _unaryOperation)
+{
+	if (*_unaryOperation.annotation().userDefinedFunction != nullptr)
+		reportFunctionCallMutability((*_unaryOperation.annotation().userDefinedFunction)->stateMutability(), _unaryOperation.location());
+}
+
 void ViewPureChecker::endVisit(FunctionCall const& _functionCall)
 {
 	if (*_functionCall.annotation().kind != FunctionCallKind::FunctionCall)
diff --git a/libsolidity/analysis/ViewPureChecker.h b/libsolidity/analysis/ViewPureChecker.h
index 6ba1384cec..0dcfb16d97 100644
--- a/libsolidity/analysis/ViewPureChecker.h
+++ b/libsolidity/analysis/ViewPureChecker.h
@@ -54,6 +54,8 @@ class ViewPureChecker: private ASTConstVisitor
 
 	bool visit(FunctionDefinition const& _funDef) override;
 	void endVisit(FunctionDefinition const& _funDef) override;
+	void endVisit(BinaryOperation const& _binaryOperation) override;
+	void endVisit(UnaryOperation const& _unaryOperation) override;
 	bool visit(ModifierDefinition const& _modifierDef) override;
 	void endVisit(ModifierDefinition const& _modifierDef) override;
 	void endVisit(Identifier const& _identifier) override;
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 0a148f2fb2..8fa330da4e 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -383,6 +383,38 @@ vector<UsingForDirective const*> usingForDirectivesForType(Type const& _type, AS
 
 }
 
+set<FunctionDefinition const*, ASTNode::CompareByID> Type::operatorDefinitions(
+	Token _token,
+	ASTNode const& _scope,
+	bool _unary
+) const
+{
+	if (!typeDefinition())
+		return {};
+
+	set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions;
+	for (UsingForDirective const* directive: usingForDirectivesForType(*this, _scope))
+		for (auto const& [identifierPath, operator_]: directive->functionsAndOperators())
+		{
+			if (operator_ != _token)
+				continue;
+
+			auto const& functionDefinition = dynamic_cast<FunctionDefinition const&>(
+				*identifierPath->annotation().referencedDeclaration
+			);
+			auto const* functionType = dynamic_cast<FunctionType const*>(
+				functionDefinition.libraryFunction() ? functionDefinition.typeViaContractName() : functionDefinition.type()
+			);
+			solAssert(functionType && !functionType->parameterTypes().empty());
+
+			size_t parameterCount = functionDefinition.parameterList().parameters().size();
+			if (*this == *functionType->parameterTypes().front() && (_unary ? parameterCount == 1 : parameterCount == 2))
+				matchingDefinitions.insert(&functionDefinition);
+		}
+
+	return matchingDefinitions;
+}
+
 MemberList::MemberMap Type::attachedFunctions(Type const& _type, ASTNode const& _scope)
 {
 	MemberList::MemberMap members;
@@ -405,8 +437,13 @@ MemberList::MemberMap Type::attachedFunctions(Type const& _type, ASTNode const&
 	};
 
 	for (UsingForDirective const* ufd: usingForDirectivesForType(_type, _scope))
-		for (auto const& identifierPath: ufd->functionsOrLibrary())
+		for (auto const& [identifierPath, operator_]: ufd->functionsAndOperators())
 		{
+			if (operator_.has_value())
+				// Functions used to define operators are not automatically attached to the type.
+				// I.e. `using {f, f as +} for T` allows `T x; x.f()` but `using {f as +} for T` does not.
+				continue;
+
 			solAssert(identifierPath);
 			Declaration const* declaration = identifierPath->annotation().referencedDeclaration;
 			solAssert(declaration);
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index cdb54ec07a..d7312aa1dd 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -377,6 +377,21 @@ class Type
 	/// Clears all internally cached values (if any).
 	virtual void clearCache() const;
 
+	/// Scans all "using for" directives in the @a _scope for functions implementing
+	/// the operator represented by @a _token. Returns the set of all definitions where the type
+	/// of the first argument matches this type object.
+	///
+	/// @note: If the AST has passed analysis without errors,
+	/// the function will find at most one definition for an operator.
+	///
+	/// @param _unary If true, only definitions that accept exactly one argument are included.
+	/// Otherwise only definitions that accept exactly two arguments.
+	std::set<FunctionDefinition const*, ASTCompareByID<ASTNode>> operatorDefinitions(
+		Token _token,
+		ASTNode const& _scope,
+		bool _unary
+	) const;
+
 private:
 	/// @returns a member list containing all members added to this type by `using for` directives.
 	static MemberList::MemberMap attachedFunctions(Type const& _type, ASTNode const& _scope);

From 1a83fa7ebcb4e2953432439aeab97f33f335eded Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 6 Jul 2022 09:17:59 +0200
Subject: [PATCH 1204/1748] User-defined operators: Code generation

---
 libsolidity/codegen/ExpressionCompiler.cpp    | 69 ++++++++++++++++++-
 .../codegen/ir/IRGeneratorForStatements.cpp   | 49 +++++++++++++
 2 files changed, 117 insertions(+), 1 deletion(-)

diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index c034024b4c..1c02b281cc 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -410,6 +410,38 @@ bool ExpressionCompiler::visit(TupleExpression const& _tuple)
 bool ExpressionCompiler::visit(UnaryOperation const& _unaryOperation)
 {
 	CompilerContext::LocationSetter locationSetter(m_context, _unaryOperation);
+
+	FunctionDefinition const* function = *_unaryOperation.annotation().userDefinedFunction;
+	if (function)
+	{
+		solAssert(function->isFree());
+
+		FunctionType const* functionType = _unaryOperation.userDefinedFunctionType();
+		solAssert(functionType);
+		solAssert(functionType->parameterTypes().size() == 1);
+		solAssert(functionType->returnParameterTypes().size() == 1);
+		solAssert(functionType->kind() == FunctionType::Kind::Internal);
+
+		evmasm::AssemblyItem returnLabel = m_context.pushNewTag();
+		acceptAndConvert(
+			_unaryOperation.subExpression(),
+			*functionType->parameterTypes()[0],
+			false // _cleanupNeeded
+		);
+
+		m_context << m_context.functionEntryLabel(*function).pushTag();
+		m_context.appendJump(evmasm::AssemblyItem::JumpType::IntoFunction);
+		m_context << returnLabel;
+
+		unsigned parameterSize = CompilerUtils::sizeOnStack(functionType->parameterTypes());
+		unsigned returnParametersSize = CompilerUtils::sizeOnStack(functionType->returnParameterTypes());
+
+		// callee adds return parameters, but removes arguments and return label
+		m_context.adjustStackOffset(static_cast<int>(returnParametersSize - parameterSize) - 1);
+
+		return false;
+	}
+
 	Type const& type = *_unaryOperation.annotation().type;
 	if (type.category() == Type::Category::RationalNumber)
 	{
@@ -502,7 +534,42 @@ bool ExpressionCompiler::visit(BinaryOperation const& _binaryOperation)
 	CompilerContext::LocationSetter locationSetter(m_context, _binaryOperation);
 	Expression const& leftExpression = _binaryOperation.leftExpression();
 	Expression const& rightExpression = _binaryOperation.rightExpression();
-	solAssert(!!_binaryOperation.annotation().commonType, "");
+	FunctionDefinition const* function = *_binaryOperation.annotation().userDefinedFunction;
+	if (function)
+	{
+		solAssert(function->isFree());
+
+		FunctionType const* functionType = _binaryOperation.userDefinedFunctionType();
+		solAssert(functionType);
+		solAssert(functionType->parameterTypes().size() == 2);
+		solAssert(functionType->returnParameterTypes().size() == 1);
+		solAssert(functionType->kind() == FunctionType::Kind::Internal);
+
+		evmasm::AssemblyItem returnLabel = m_context.pushNewTag();
+		acceptAndConvert(
+			leftExpression,
+			*functionType->parameterTypes()[0],
+			false // _cleanupNeeded
+		);
+		acceptAndConvert(
+			rightExpression,
+			*functionType->parameterTypes()[1],
+			false // _cleanupNeeded
+		);
+
+		m_context << m_context.functionEntryLabel(*function).pushTag();
+		m_context.appendJump(evmasm::AssemblyItem::JumpType::IntoFunction);
+		m_context << returnLabel;
+
+		unsigned parameterSize = CompilerUtils::sizeOnStack(functionType->parameterTypes());
+		unsigned returnParametersSize = CompilerUtils::sizeOnStack(functionType->returnParameterTypes());
+
+		// callee adds return parameters, but removes arguments and return label
+		m_context.adjustStackOffset(static_cast<int>(returnParametersSize - parameterSize) - 1);
+		return false;
+	}
+
+	solAssert(!!_binaryOperation.annotation().commonType);
 	Type const* commonType = _binaryOperation.annotation().commonType;
 	Token const c_op = _binaryOperation.getOperator();
 
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index fd0199204b..a9eb0bf152 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -672,6 +672,30 @@ void IRGeneratorForStatements::endVisit(Return const& _return)
 bool IRGeneratorForStatements::visit(UnaryOperation const& _unaryOperation)
 {
 	setLocation(_unaryOperation);
+
+	FunctionDefinition const* function = *_unaryOperation.annotation().userDefinedFunction;
+	if (function)
+	{
+		_unaryOperation.subExpression().accept(*this);
+		setLocation(_unaryOperation);
+
+		solAssert(function->isImplemented());
+		solAssert(function->isFree());
+		solAssert(function->parameters().size() == 1);
+		solAssert(function->returnParameters().size() == 1);
+		solAssert(*function->returnParameters()[0]->type() == *_unaryOperation.annotation().type);
+
+		string argument = expressionAsType(_unaryOperation.subExpression(), *function->parameters()[0]->type());
+		solAssert(!argument.empty());
+
+		solAssert(_unaryOperation.userDefinedFunctionType()->kind() == FunctionType::Kind::Internal);
+		define(_unaryOperation) <<
+			m_context.enqueueFunctionForCodeGeneration(*function) <<
+			("(" + argument + ")\n");
+
+		return false;
+	}
+
 	Type const& resultType = type(_unaryOperation);
 	Token const op = _unaryOperation.getOperator();
 
@@ -775,6 +799,31 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 {
 	setLocation(_binOp);
 
+	FunctionDefinition const* function = *_binOp.annotation().userDefinedFunction;
+	if (function)
+	{
+		_binOp.leftExpression().accept(*this);
+		_binOp.rightExpression().accept(*this);
+		setLocation(_binOp);
+
+		solAssert(function->isImplemented());
+		solAssert(function->isFree());
+		solAssert(function->parameters().size() == 2);
+		solAssert(function->returnParameters().size() == 1);
+		solAssert(*function->returnParameters()[0]->type() == *_binOp.annotation().type);
+
+		string left = expressionAsType(_binOp.leftExpression(), *function->parameters()[0]->type());
+		string right = expressionAsType(_binOp.rightExpression(), *function->parameters()[1]->type());
+		solAssert(!left.empty() && !right.empty());
+
+		solAssert(_binOp.userDefinedFunctionType()->kind() == FunctionType::Kind::Internal);
+		define(_binOp) <<
+			m_context.enqueueFunctionForCodeGeneration(*function) <<
+			("(" + left + ", " + right + ")\n");
+
+		return false;
+	}
+
 	solAssert(!!_binOp.annotation().commonType);
 	Type const* commonType = _binOp.annotation().commonType;
 	langutil::Token op = _binOp.getOperator();

From 2e8d50eca2bc4a3c76f262b5480d8222d626f41f Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Wed, 10 Aug 2022 10:42:02 +0200
Subject: [PATCH 1205/1748] User-defined operators: Documentation

---
 Changelog.md                 |   5 ++
 docs/contracts/using-for.rst | 108 +++++++++++++++++++++++++++++++----
 libsolidity/ast/AST.h        |   6 ++
 3 files changed, 107 insertions(+), 12 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c1e1a001c4..447f9f9279 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.19 (unreleased)
 
 Language Features:
+* Allow defining custom operators for user-defined value types via ``using {f as +} for T global`` syntax.
 
 
 Compiler Features:
@@ -16,6 +17,10 @@ Bugfixes:
  * SMTChecker: Fix internal error caused by unhandled ``z3`` expressions that come from the solver when bitwise operators are used.
 
 
+AST Changes:
+ * AST: Add ``function`` field to ``UnaryOperation`` and ``BinaryOperation`` AST nodes. ``functionList`` in ``UsingForDirective`` AST nodes will now contain ``operator`` and ``definition`` members instead of ``function`` when the list entry defines an operator.
+
+
 ### 0.8.18 (2023-02-01)
 
 Language Features:
diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index 20299e1a4b..2321e5c2db 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -1,4 +1,4 @@
-.. index:: ! using for, library
+.. index:: ! using for, library, ! operator; user-defined
 
 .. _using-for:
 
@@ -6,37 +6,87 @@
 Using For
 *********
 
-The directive ``using A for B;`` can be used to attach
-functions (``A``) as member functions to any type (``B``).
-These functions will receive the object they are called on
+The directive ``using A for B`` can be used to attach
+functions (``A``) as operators to user-defined value types
+or as member functions to any type (``B``).
+The member functions receive the object they are called on
 as their first parameter (like the ``self`` variable in Python).
+The operator functions receive operands as parameters.
 
 It is valid either at file level or inside a contract,
 at contract level.
 
 The first part, ``A``, can be one of:
 
-- A list of file-level or library functions (e.g. ``using {f, g, h, L.t} for uint;``) -
-  only those functions will be attached to the type as member functions.
-  Note that private library functions can only be specified when ``using for`` is inside the library.
-- The name of a library (e.g. ``using L for uint;``) -
-  all non-private functions of the library are attached to the type.
+- A list of functions, optionally with an operator name assigned (e.g.
+  ``using {f, g as +, h, L.t} for uint``).
+  If no operator is specified, the function can be either a library function or a free function and
+  is attached to the type as a member function.
+  Otherwise it must be a free function and it becomes the definition of that operator on the type.
+- The name of a library (e.g. ``using L for uint``) -
+  all non-private functions of the library are attached to the type
+  as member functions
 
 At file level, the second part, ``B``, has to be an explicit type (without data location specifier).
 Inside contracts, you can also use ``*`` in place of the type (e.g. ``using L for *;``),
 which has the effect that all functions of the library ``L``
 are attached to *all* types.
 
-If you specify a library, *all* functions in the library get attached,
+If you specify a library, *all* non-private functions in the library get attached,
 even those where the type of the first parameter does not
 match the type of the object. The type is checked at the
 point the function is called and function overload
 resolution is performed.
 
-If you use a list of functions (e.g. ``using {f, g, h, L.t} for uint;``),
+If you use a list of functions (e.g. ``using {f, g, h, L.t} for uint``),
 then the type (``uint``) has to be implicitly convertible to the
 first parameter of each of these functions. This check is
 performed even if none of these functions are called.
+Note that private library functions can only be specified when ``using for`` is inside a library.
+
+If you define an operator (e.g. ``using {f as +} for T``), then the type (``T``) must be a
+:ref:`user-defined value type <user-defined-value-types>` and the definition must be a ``pure`` function.
+Operator definitions must be global.
+The following operators can be defined this way:
+
++------------+----------+---------------------------------------------+
+| Category   | Operator | Possible signatures                         |
++============+==========+=============================================+
+| Bitwise    | ``&``    | ``function (T, T) pure returns (T)``        |
+|            +----------+---------------------------------------------+
+|            | ``|``    | ``function (T, T) pure returns (T)``        |
+|            +----------+---------------------------------------------+
+|            | ``^``    | ``function (T, T) pure returns (T)``        |
+|            +----------+---------------------------------------------+
+|            | ``~``    | ``function (T) pure returns (T)``           |
++------------+----------+---------------------------------------------+
+| Arithmetic | ``+``    | ``function (T, T) pure returns (T)``        |
+|            +----------+---------------------------------------------+
+|            | ``-``    | ``function (T, T) pure returns (T)``        |
+|            +          +---------------------------------------------+
+|            |          | ``function (T) pure returns (T)``           |
+|            +----------+---------------------------------------------+
+|            | ``*``    | ``function (T, T) pure returns (T)``        |
+|            +----------+---------------------------------------------+
+|            | ``/``    | ``function (T, T) pure returns (T)``        |
+|            +----------+---------------------------------------------+
+|            | ``%``    | ``function (T, T) pure returns (T)``        |
++------------+----------+---------------------------------------------+
+| Comparison | ``==``   | ``function (T, T) pure returns (bool)``     |
+|            +----------+---------------------------------------------+
+|            | ``!=``   | ``function (T, T) pure returns (bool)``     |
+|            +----------+---------------------------------------------+
+|            | ``<``    | ``function (T, T) pure returns (bool)``     |
+|            +----------+---------------------------------------------+
+|            | ``<=``   | ``function (T, T) pure returns (bool)``     |
+|            +----------+---------------------------------------------+
+|            | ``>``    | ``function (T, T) pure returns (bool)``     |
+|            +----------+---------------------------------------------+
+|            | ``>=``   | ``function (T, T) pure returns (bool)``     |
++------------+----------+---------------------------------------------+
+
+Note that unary and binary ``-`` need separate definitions.
+The compiler will choose the right definition based on how the operator is invoked.
 
 The ``using A for B;`` directive is active only within the current
 scope (either the contract or the current module/source unit),
@@ -46,7 +96,7 @@ outside of the contract or module in which it is used.
 When the directive is used at file level and applied to a
 user-defined type which was defined at file level in the same file,
 the word ``global`` can be added at the end. This will have the
-effect that the functions are attached to the type everywhere
+effect that the functions and operators are attached to the type everywhere
 the type is available (including other files), not only in the
 scope of the using statement.
 
@@ -150,3 +200,37 @@ if you pass memory or value types, a copy will be performed, even in case of the
 ``self`` variable. The only situation where no copy will be performed
 is when storage reference variables are used or when internal library
 functions are called.
+
+Another example shows how to define a custom operator for a user-defined type:
+
+.. code-block:: solidity
+
+    // SPDX-License-Identifier: GPL-3.0
+    pragma solidity ^0.8.19;
+
+    type UFixed16x2 is uint16;
+
+    using {
+        add as +,
+        div as /
+    } for UFixed16x2 global;
+
+    uint32 constant SCALE = 100;
+
+    function add(UFixed16x2 a, UFixed16x2 b) pure returns (UFixed16x2) {
+        return UFixed16x2.wrap(UFixed16x2.unwrap(a) + UFixed16x2.unwrap(b));
+    }
+
+    function div(UFixed16x2 a, UFixed16x2 b) pure returns (UFixed16x2) {
+        uint32 a32 = UFixed16x2.unwrap(a);
+        uint32 b32 = UFixed16x2.unwrap(b);
+        uint32 result32 = a32 * SCALE / b32;
+        require(result32 <= type(uint16).max, "Divide overflow");
+        return UFixed16x2.wrap(uint16(a32 * SCALE / b32));
+    }
+
+    contract Math {
+        function avg(UFixed16x2 a, UFixed16x2 b) public pure returns (UFixed16x2) {
+            return (a + b) / UFixed16x2.wrap(200);
+        }
+    }
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 6e61ae3bc7..93a264622b 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -647,11 +647,17 @@ class InheritanceSpecifier: public ASTNode
  * 1. `using LibraryName for T` attaches all functions from the library `LibraryName` to the type `T`.
  * 2. `using LibraryName for *` attaches to all types.
  * 3. `using {f1, f2, ..., fn} for T` attaches the functions `f1`, `f2`, ..., `fn`, respectively to `T`.
+ * 4. `using {f1 as op1, f2 as op2, ..., fn as opn} for T` implements operator `opn` for type `T` with function `fn`.
  *
  * For version 3, T has to be implicitly convertible to the first parameter type of
  * all functions, and this is checked at the point of the using statement. For versions 1 and
  * 2, this check is only done when a function is called.
  *
+ * For version 4, T has to be user-defined value type and the function must be pure.
+ * All parameters and return value of all the functions have to be of type T.
+ * This version can be combined with version 3 - a single directive may attach functions to the
+ * type and define operators on it at the same time.
+ *
  * Finally, `using {f1, f2, ..., fn} for T global` is also valid at file level, as long as T is
  * a user-defined type defined in the same file at file level. In this case, the methods are
  * attached to all objects of that type regardless of scope.

From 5b5e853ea0a1ddbe9be93e29a6477d12039535dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sat, 28 Jan 2023 03:20:43 +0100
Subject: [PATCH 1206/1748] Warn about missing user-defined operator support in
 SMTChecker

---
 libsolidity/formal/SMTEncoder.cpp | 34 ++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 5c4fc5ded0..e8598392fb 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -449,11 +449,25 @@ void SMTEncoder::endVisit(UnaryOperation const& _op)
 	if (_op.annotation().type->category() == Type::Category::RationalNumber)
 		return;
 
-	if (TokenTraits::isBitOp(_op.getOperator()))
+	if (TokenTraits::isBitOp(_op.getOperator()) && !*_op.annotation().userDefinedFunction)
 		return bitwiseNotOperation(_op);
 
 	createExpr(_op);
 
+	// User-defined operators are essentially function calls.
+	if (*_op.annotation().userDefinedFunction)
+	{
+		// TODO: Implement user-defined operators properly.
+		m_errorReporter.warning(
+			6156_error,
+			_op.location(),
+			"User-defined operators are not yet supported by SMTChecker. "s +
+			"This invocation of operator " + TokenTraits::friendlyName(_op.getOperator()) +
+			" has been ignored, which may lead to incorrect results."
+		);
+		return;
+	}
+
 	auto const* subExpr = innermostTuple(_op.subExpression());
 	auto type = _op.annotation().type;
 	switch (_op.getOperator())
@@ -524,7 +538,7 @@ bool SMTEncoder::visit(BinaryOperation const& _op)
 {
 	if (shortcutRationalNumber(_op))
 		return false;
-	if (TokenTraits::isBooleanOp(_op.getOperator()))
+	if (TokenTraits::isBooleanOp(_op.getOperator()) && !*_op.annotation().userDefinedFunction)
 	{
 		booleanOperation(_op);
 		return false;
@@ -537,11 +551,25 @@ void SMTEncoder::endVisit(BinaryOperation const& _op)
 	/// If _op is const evaluated the RationalNumber shortcut was taken.
 	if (isConstant(_op))
 		return;
-	if (TokenTraits::isBooleanOp(_op.getOperator()))
+	if (TokenTraits::isBooleanOp(_op.getOperator()) && !*_op.annotation().userDefinedFunction)
 		return;
 
 	createExpr(_op);
 
+	// User-defined operators are essentially function calls.
+	if (*_op.annotation().userDefinedFunction)
+	{
+		// TODO: Implement user-defined operators properly.
+		m_errorReporter.warning(
+			6756_error,
+			_op.location(),
+			"User-defined operators are not yet supported by SMTChecker. "s +
+			"This invocation of operator " + TokenTraits::friendlyName(_op.getOperator()) +
+			" has been ignored, which may lead to incorrect results."
+		);
+		return;
+	}
+
 	if (TokenTraits::isArithmeticOp(_op.getOperator()))
 		arithmeticOperation(_op);
 	else if (TokenTraits::isCompareOp(_op.getOperator()))

From aba5ac5e2a90477b4d69cb7e7eb4eb24407257ae Mon Sep 17 00:00:00 2001
From: wechman <damian.wechman.it@gmail.com>
Date: Thu, 28 Jul 2022 08:39:10 +0200
Subject: [PATCH 1207/1748] User-defined operators: Tests

---
 .../ASTJSON/user_defined_operator.json        | 663 +++++++++++++++++
 .../ASTJSON/user_defined_operator.sol         |  11 +
 .../analysis/FunctionCallGraph.cpp            |  66 ++
 .../userDefined/all_possible_operators.sol    |  92 +++
 ...ser_defined_value_types_with_operators.sol | 670 ++++++++++++++++++
 ...d_defining_operator_with_same_function.sol |  20 +
 .../userDefined/checked_operators.sol         |  22 +
 .../consecutive_operator_invocations.sol      |  18 +
 .../fixed_point_udvt_with_operators.sol       |  22 +
 ...ifferent_functions_separate_directives.sol |  26 +
 ...same_type_same_function_same_directive.sol |  20 +
 ...definition_shadowing_builtin_keccak256.sol |  15 +
 .../userDefined/operator_evaluation_order.sol |  83 +++
 .../operator_making_pure_external_call.sol    |  61 ++
 .../operator_making_view_external_call.sol    |  67 ++
 .../operator_parameter_cleanup.sol            |  40 ++
 .../userDefined/operator_precendence.sol      |  71 ++
 .../operator_return_parameter_cleanup.sol     |  58 ++
 .../userDefined/recursive_operator.sol        |  41 ++
 .../userDefined/unchecked_operators.sol       |  25 +
 .../user_defined_division_same_as_builtin.sol |  16 +
 ...ed_division_with_safe_division_by_zero.sol |  19 +
 .../user_defined_operations_on_constants.sol  | 104 +++
 ...r_defined_operations_on_constants_fail.sol | 104 +++
 ...rator_matches_equivalent_function_call.sol | 105 +++
 .../userDefined/user_defined_overflow.sol     |  23 +
 .../constant_cyclic_via_user_operators.sol    |  10 +
 .../binary_operator_udvt.sol                  |  17 +
 .../unary_operator_udvt.sol                   |  17 +
 ...203_struct_reference_compare_operators.sol |   2 +-
 ...ator_binary_user_defined_not_available.sol |  11 +
 ...rator_unary_user_defined_not_available.sol |  11 +
 .../userDefined/calling_operator.sol          |  11 +
 ...as_attached_function_via_function_name.sol |  12 +
 ...as_attached_function_via_operator_name.sol |  12 +
 ..._operator_defined_separately_from_type.sol |  23 +
 ...fined_separately_from_type_and_binding.sol |  30 +
 .../userDefined/calling_operator_imported.sol |  17 +
 .../calling_operator_imported_non_global.sol  |  22 +
 ...calling_operator_imported_transitively.sol |  35 +
 ...rator_imported_transitively_non_global.sol |  35 +
 ...ng_operator_in_constant_initialization.sol |  24 +
 .../calling_operator_non_global.sol           |  14 +
 ...calling_operator_that_deploys_contract.sol |  24 +
 ...ling_operator_that_makes_external_call.sol |  20 +
 ...operator_that_makes_pure_external_call.sol |  17 +
 ...operator_that_makes_view_external_call.sol |  20 +
 ...ling_operator_with_implicit_conversion.sol |  32 +
 .../defining_operator_for_builtin_types.sol   |  18 +
 .../defining_operator_for_contract.sol        |  13 +
 .../defining_operator_for_enum.sol            |  10 +
 .../defining_operator_for_error.sol           |  10 +
 .../defining_operator_for_event.sol           |  10 +
 .../defining_operator_for_interface.sol       |   8 +
 .../defining_operator_for_library.sol         |   6 +
 .../defining_operator_for_struct.sol          |   9 +
 ...or_for_wildcard_type_at_contract_level.sol |  16 +
 ...erator_for_wildcard_type_at_file_level.sol |   6 +
 ...g_operator_with_attached_free_function.sol |   9 +
 ...nting_operator_with_builtin_abi_encode.sol |   8 +
 ...enting_operator_with_builtin_keccak256.sol |   5 +
 ...lementing_operator_with_builtin_revert.sol |   5 +
 ...th_contract_function_at_contract_level.sol |   9 +
 ...r_with_contract_function_at_file_level.sol |  11 +
 .../implementing_operator_with_error.sol      |   7 +
 .../implementing_operator_with_event.sol      |   9 +
 ...menting_operator_with_function_pointer.sol |   8 +
 ...h_function_shadowing_builtin_keccak256.sol |   9 +
 .../implementing_operator_with_library.sol    |   7 +
 ...ith_library_function_at_contract_level.sol | 113 +++
 ...or_with_library_function_at_file_level.sol |  39 +
 ...ry_function_private_outside_of_library.sol |  36 +
 ...enting_operator_with_non_pure_function.sol |  12 +
 ...e_function_on_built_in_type_non_global.sol |   8 +
 ...ting_operator_with_overloaded_function.sol |  10 +
 ...tor_with_privately_overloaded_function.sol |  12 +
 ...alified_library_function_at_file_level.sol |   9 +
 ...nqualified_library_function_in_library.sol |  22 +
 ..._global_and_non_global_different_files.sol |  20 +
 ..._different_functions_global_non_global.sol |  26 +
 ..._non_global_and_global_different_files.sol |  20 +
 ...ons_different_functions_same_directive.sol |  13 +
 ...tions_same_directive_operator_not_used.sol |  15 +
 ...definitions_on_file_and_contract_level.sol |  23 +
 ...unction_different_levels_free_function.sol |  19 +
 ...tion_different_levels_library_function.sol |  38 +
 ...finitions_same_function_same_directive.sol |   9 +
 ...ions_same_function_separate_directives.sol |  10 +
 .../userDefined/operator_overloading.sol      |  14 +
 ...operator_parsing_function_name_missing.sol |   3 +
 .../userDefined/operator_parsing_no_brace.sol |   3 +
 .../operator_parsing_non_user_definable.sol   |  45 ++
 .../operator_parsing_not_an_operator.sol      |  14 +
 ...operator_parsing_operator_name_missing.sol |   4 +
 .../operator_parsing_operator_named_as.sol    |   3 +
 .../operator_returning_wrong_types.sol        |  33 +
 ...returning_types_not_matching_using_for.sol |  26 +
 .../operator_taking_no_parameters_binary.sol  |  11 +
 .../operator_taking_no_parameters_unary.sol   |  11 +
 ...or_taking_or_returning_different_types.sol |  20 +
 .../operator_taking_two_parameters_unary.sol  |  14 +
 ..._and_defining_operators_same_directive.sol |  10 +
 ...contract_level_for_contract_level_type.sol |  19 +
 ...with_operator_at_contract_level_global.sol |  13 +
 ...t_contract_level_global_different_file.sol |  13 +
 ...tor_at_contract_level_in_base_contract.sol |  30 +
 ...perator_at_contract_level_in_interface.sol |  10 +
 ..._at_file_level_for_contract_level_type.sol |  27 +
 ...vel_for_contract_level_type_non_global.sol |  30 +
 ...or_at_file_level_global_and_non_global.sol |  23 +
 ...or_at_file_level_global_different_file.sol |  11 +
 ..._unary_and_non_global_binary_same_file.sol |  20 +
 .../syntaxTests/using/using_for_enum.sol      |   5 +
 ...r_with_pure_modifier_can_be_restricted.sol |  20 +
 114 files changed, 3956 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/ASTJSON/user_defined_operator.json
 create mode 100644 test/libsolidity/ASTJSON/user_defined_operator.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/all_possible_operators.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/all_possible_user_defined_value_types_with_operators.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/attaching_and_defining_operator_with_same_function.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/checked_operators.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/consecutive_operator_invocations.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/fixed_point_udvt_with_operators.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_different_types_different_functions_separate_directives.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_same_type_same_function_same_directive.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/operator_definition_shadowing_builtin_keccak256.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/operator_evaluation_order.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/operator_parameter_cleanup.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/operator_precendence.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/operator_return_parameter_cleanup.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/recursive_operator.sol
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
 create mode 100644 test/libsolidity/syntaxTests/constants/constant_cyclic_via_user_operators.sol
 create mode 100644 test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/binary_operator_udvt.sol
 create mode 100644 test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/unary_operator_udvt.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/calling_operator_binary_user_defined_not_available.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/calling_operator_unary_user_defined_not_available.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_function_name.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_operator_name.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type_and_binding.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_non_global.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively_non_global.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_in_constant_initialization.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_non_global.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_deploys_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_external_call.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_pure_external_call.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_view_external_call.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/calling_operator_with_implicit_conversion.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_builtin_types.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_enum.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_error.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_event.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_interface.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_library.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_struct.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_contract_level.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_attached_free_function.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_abi_encode.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_keccak256.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_revert.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_contract_level.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_error.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_event.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_pointer.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_shadowing_builtin_keccak256.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_contract_level.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_private_outside_of_library.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function_on_built_in_type_non_global.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_overloaded_function.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_privately_overloaded_function.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_at_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_in_library.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_and_non_global_different_files.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_non_global.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_non_global_and_global_different_files.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive_operator_not_used.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_on_file_and_contract_level.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_free_function.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_library_function.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_same_directive.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_separate_directives.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_overloading.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_function_name_missing.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_no_brace.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_non_user_definable.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_not_an_operator.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_missing.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_named_as.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_returning_wrong_types.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_taking_and_returning_types_not_matching_using_for.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_binary.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_unary.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_taking_or_returning_different_types.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_taking_two_parameters_unary.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_attaching_functions_and_defining_operators_same_directive.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_for_contract_level_type.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global_different_file.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_base_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_interface.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type_non_global.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_and_non_global.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_different_file.sol
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_unary_and_non_global_binary_same_file.sol
 create mode 100644 test/libsolidity/syntaxTests/using/using_for_enum.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/user_operator_with_pure_modifier_can_be_restricted.sol

diff --git a/test/libsolidity/ASTJSON/user_defined_operator.json b/test/libsolidity/ASTJSON/user_defined_operator.json
new file mode 100644
index 0000000000..dd1c0d941f
--- /dev/null
+++ b/test/libsolidity/ASTJSON/user_defined_operator.json
@@ -0,0 +1,663 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "C":
+    [
+      49
+    ],
+    "I8":
+    [
+      2
+    ],
+    "sub":
+    [
+      20
+    ],
+    "unsub":
+    [
+      30
+    ]
+  },
+  "id": 50,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "canonicalName": "I8",
+      "id": 2,
+      "name": "I8",
+      "nameLocation": "5:2:1",
+      "nodeType": "UserDefinedValueTypeDefinition",
+      "src": "0:16:1",
+      "underlyingType":
+      {
+        "id": 1,
+        "name": "int8",
+        "nodeType": "ElementaryTypeName",
+        "src": "11:4:1",
+        "typeDescriptions":
+        {
+          "typeIdentifier": "t_int8",
+          "typeString": "int8"
+        }
+      }
+    },
+    {
+      "functionList":
+      [
+        {
+          "definition":
+          {
+            "id": 3,
+            "name": "sub",
+            "nameLocations":
+            [
+              "24:3:1"
+            ],
+            "nodeType": "IdentifierPath",
+            "referencedDeclaration": 20,
+            "src": "24:3:1"
+          },
+          "operator": "-"
+        },
+        {
+          "definition":
+          {
+            "id": 4,
+            "name": "unsub",
+            "nameLocations":
+            [
+              "34:5:1"
+            ],
+            "nodeType": "IdentifierPath",
+            "referencedDeclaration": 30,
+            "src": "34:5:1"
+          },
+          "operator": "-"
+        }
+      ],
+      "global": true,
+      "id": 7,
+      "nodeType": "UsingForDirective",
+      "src": "17:43:1",
+      "typeName":
+      {
+        "id": 6,
+        "nodeType": "UserDefinedTypeName",
+        "pathNode":
+        {
+          "id": 5,
+          "name": "I8",
+          "nameLocations":
+          [
+            "50:2:1"
+          ],
+          "nodeType": "IdentifierPath",
+          "referencedDeclaration": 2,
+          "src": "50:2:1"
+        },
+        "referencedDeclaration": 2,
+        "src": "50:2:1",
+        "typeDescriptions":
+        {
+          "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+          "typeString": "I8"
+        }
+      }
+    },
+    {
+      "body":
+      {
+        "id": 19,
+        "nodeType": "Block",
+        "src": "100:2:1",
+        "statements": []
+      },
+      "id": 20,
+      "implemented": true,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "sub",
+      "nameLocation": "70:3:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 14,
+        "nodeType": "ParameterList",
+        "parameters":
+        [
+          {
+            "constant": false,
+            "id": 10,
+            "mutability": "mutable",
+            "name": "",
+            "nameLocation": "-1:-1:-1",
+            "nodeType": "VariableDeclaration",
+            "scope": 20,
+            "src": "74:2:1",
+            "stateVariable": false,
+            "storageLocation": "default",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+              "typeString": "I8"
+            },
+            "typeName":
+            {
+              "id": 9,
+              "nodeType": "UserDefinedTypeName",
+              "pathNode":
+              {
+                "id": 8,
+                "name": "I8",
+                "nameLocations":
+                [
+                  "74:2:1"
+                ],
+                "nodeType": "IdentifierPath",
+                "referencedDeclaration": 2,
+                "src": "74:2:1"
+              },
+              "referencedDeclaration": 2,
+              "src": "74:2:1",
+              "typeDescriptions":
+              {
+                "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                "typeString": "I8"
+              }
+            },
+            "visibility": "internal"
+          },
+          {
+            "constant": false,
+            "id": 13,
+            "mutability": "mutable",
+            "name": "",
+            "nameLocation": "-1:-1:-1",
+            "nodeType": "VariableDeclaration",
+            "scope": 20,
+            "src": "78:2:1",
+            "stateVariable": false,
+            "storageLocation": "default",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+              "typeString": "I8"
+            },
+            "typeName":
+            {
+              "id": 12,
+              "nodeType": "UserDefinedTypeName",
+              "pathNode":
+              {
+                "id": 11,
+                "name": "I8",
+                "nameLocations":
+                [
+                  "78:2:1"
+                ],
+                "nodeType": "IdentifierPath",
+                "referencedDeclaration": 2,
+                "src": "78:2:1"
+              },
+              "referencedDeclaration": 2,
+              "src": "78:2:1",
+              "typeDescriptions":
+              {
+                "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                "typeString": "I8"
+              }
+            },
+            "visibility": "internal"
+          }
+        ],
+        "src": "73:8:1"
+      },
+      "returnParameters":
+      {
+        "id": 18,
+        "nodeType": "ParameterList",
+        "parameters":
+        [
+          {
+            "constant": false,
+            "id": 17,
+            "mutability": "mutable",
+            "name": "",
+            "nameLocation": "-1:-1:-1",
+            "nodeType": "VariableDeclaration",
+            "scope": 20,
+            "src": "96:2:1",
+            "stateVariable": false,
+            "storageLocation": "default",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+              "typeString": "I8"
+            },
+            "typeName":
+            {
+              "id": 16,
+              "nodeType": "UserDefinedTypeName",
+              "pathNode":
+              {
+                "id": 15,
+                "name": "I8",
+                "nameLocations":
+                [
+                  "96:2:1"
+                ],
+                "nodeType": "IdentifierPath",
+                "referencedDeclaration": 2,
+                "src": "96:2:1"
+              },
+              "referencedDeclaration": 2,
+              "src": "96:2:1",
+              "typeDescriptions":
+              {
+                "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                "typeString": "I8"
+              }
+            },
+            "visibility": "internal"
+          }
+        ],
+        "src": "95:4:1"
+      },
+      "scope": 50,
+      "src": "61:41:1",
+      "stateMutability": "pure",
+      "virtual": false,
+      "visibility": "internal"
+    },
+    {
+      "body":
+      {
+        "id": 29,
+        "nodeType": "Block",
+        "src": "140:2:1",
+        "statements": []
+      },
+      "id": 30,
+      "implemented": true,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "unsub",
+      "nameLocation": "112:5:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 24,
+        "nodeType": "ParameterList",
+        "parameters":
+        [
+          {
+            "constant": false,
+            "id": 23,
+            "mutability": "mutable",
+            "name": "",
+            "nameLocation": "-1:-1:-1",
+            "nodeType": "VariableDeclaration",
+            "scope": 30,
+            "src": "118:2:1",
+            "stateVariable": false,
+            "storageLocation": "default",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+              "typeString": "I8"
+            },
+            "typeName":
+            {
+              "id": 22,
+              "nodeType": "UserDefinedTypeName",
+              "pathNode":
+              {
+                "id": 21,
+                "name": "I8",
+                "nameLocations":
+                [
+                  "118:2:1"
+                ],
+                "nodeType": "IdentifierPath",
+                "referencedDeclaration": 2,
+                "src": "118:2:1"
+              },
+              "referencedDeclaration": 2,
+              "src": "118:2:1",
+              "typeDescriptions":
+              {
+                "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                "typeString": "I8"
+              }
+            },
+            "visibility": "internal"
+          }
+        ],
+        "src": "117:4:1"
+      },
+      "returnParameters":
+      {
+        "id": 28,
+        "nodeType": "ParameterList",
+        "parameters":
+        [
+          {
+            "constant": false,
+            "id": 27,
+            "mutability": "mutable",
+            "name": "",
+            "nameLocation": "-1:-1:-1",
+            "nodeType": "VariableDeclaration",
+            "scope": 30,
+            "src": "136:2:1",
+            "stateVariable": false,
+            "storageLocation": "default",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+              "typeString": "I8"
+            },
+            "typeName":
+            {
+              "id": 26,
+              "nodeType": "UserDefinedTypeName",
+              "pathNode":
+              {
+                "id": 25,
+                "name": "I8",
+                "nameLocations":
+                [
+                  "136:2:1"
+                ],
+                "nodeType": "IdentifierPath",
+                "referencedDeclaration": 2,
+                "src": "136:2:1"
+              },
+              "referencedDeclaration": 2,
+              "src": "136:2:1",
+              "typeDescriptions":
+              {
+                "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                "typeString": "I8"
+              }
+            },
+            "visibility": "internal"
+          }
+        ],
+        "src": "135:4:1"
+      },
+      "scope": 50,
+      "src": "103:39:1",
+      "stateMutability": "pure",
+      "virtual": false,
+      "visibility": "internal"
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "C",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 49,
+      "linearizedBaseContracts":
+      [
+        49
+      ],
+      "name": "C",
+      "nameLocation": "152:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 47,
+            "nodeType": "Block",
+            "src": "208:30:1",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "commonType":
+                  {
+                    "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                    "typeString": "I8"
+                  },
+                  "function": 20,
+                  "id": 45,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "lValueRequested": false,
+                  "leftExpression":
+                  {
+                    "function": 30,
+                    "id": 43,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "UnaryOperation",
+                    "operator": "-",
+                    "prefix": true,
+                    "src": "225:2:1",
+                    "subExpression":
+                    {
+                      "id": 42,
+                      "name": "a",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 33,
+                      "src": "226:1:1",
+                      "typeDescriptions":
+                      {
+                        "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                        "typeString": "I8"
+                      }
+                    },
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                      "typeString": "I8"
+                    }
+                  },
+                  "nodeType": "BinaryOperation",
+                  "operator": "-",
+                  "rightExpression":
+                  {
+                    "id": 44,
+                    "name": "b",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 36,
+                    "src": "230:1:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                      "typeString": "I8"
+                    }
+                  },
+                  "src": "225:6:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                    "typeString": "I8"
+                  }
+                },
+                "functionReturnParameters": 41,
+                "id": 46,
+                "nodeType": "Return",
+                "src": "218:13:1"
+              }
+            ]
+          },
+          "functionSelector": "ac9fe858",
+          "id": 48,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "169:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 37,
+            "nodeType": "ParameterList",
+            "parameters":
+            [
+              {
+                "constant": false,
+                "id": 33,
+                "mutability": "mutable",
+                "name": "a",
+                "nameLocation": "174:1:1",
+                "nodeType": "VariableDeclaration",
+                "scope": 48,
+                "src": "171:4:1",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions":
+                {
+                  "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                  "typeString": "I8"
+                },
+                "typeName":
+                {
+                  "id": 32,
+                  "nodeType": "UserDefinedTypeName",
+                  "pathNode":
+                  {
+                    "id": 31,
+                    "name": "I8",
+                    "nameLocations":
+                    [
+                      "171:2:1"
+                    ],
+                    "nodeType": "IdentifierPath",
+                    "referencedDeclaration": 2,
+                    "src": "171:2:1"
+                  },
+                  "referencedDeclaration": 2,
+                  "src": "171:2:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                    "typeString": "I8"
+                  }
+                },
+                "visibility": "internal"
+              },
+              {
+                "constant": false,
+                "id": 36,
+                "mutability": "mutable",
+                "name": "b",
+                "nameLocation": "180:1:1",
+                "nodeType": "VariableDeclaration",
+                "scope": 48,
+                "src": "177:4:1",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions":
+                {
+                  "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                  "typeString": "I8"
+                },
+                "typeName":
+                {
+                  "id": 35,
+                  "nodeType": "UserDefinedTypeName",
+                  "pathNode":
+                  {
+                    "id": 34,
+                    "name": "I8",
+                    "nameLocations":
+                    [
+                      "177:2:1"
+                    ],
+                    "nodeType": "IdentifierPath",
+                    "referencedDeclaration": 2,
+                    "src": "177:2:1"
+                  },
+                  "referencedDeclaration": 2,
+                  "src": "177:2:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                    "typeString": "I8"
+                  }
+                },
+                "visibility": "internal"
+              }
+            ],
+            "src": "170:12:1"
+          },
+          "returnParameters":
+          {
+            "id": 41,
+            "nodeType": "ParameterList",
+            "parameters":
+            [
+              {
+                "constant": false,
+                "id": 40,
+                "mutability": "mutable",
+                "name": "",
+                "nameLocation": "-1:-1:-1",
+                "nodeType": "VariableDeclaration",
+                "scope": 48,
+                "src": "204:2:1",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions":
+                {
+                  "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                  "typeString": "I8"
+                },
+                "typeName":
+                {
+                  "id": 39,
+                  "nodeType": "UserDefinedTypeName",
+                  "pathNode":
+                  {
+                    "id": 38,
+                    "name": "I8",
+                    "nameLocations":
+                    [
+                      "204:2:1"
+                    ],
+                    "nodeType": "IdentifierPath",
+                    "referencedDeclaration": 2,
+                    "src": "204:2:1"
+                  },
+                  "referencedDeclaration": 2,
+                  "src": "204:2:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_userDefinedValueType$_I8_$2",
+                    "typeString": "I8"
+                  }
+                },
+                "visibility": "internal"
+              }
+            ],
+            "src": "203:4:1"
+          },
+          "scope": 49,
+          "src": "160:78:1",
+          "stateMutability": "pure",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 50,
+      "src": "143:97:1",
+      "usedErrors": []
+    }
+  ],
+  "src": "0:241:1"
+}
diff --git a/test/libsolidity/ASTJSON/user_defined_operator.sol b/test/libsolidity/ASTJSON/user_defined_operator.sol
new file mode 100644
index 0000000000..df5d0ed326
--- /dev/null
+++ b/test/libsolidity/ASTJSON/user_defined_operator.sol
@@ -0,0 +1,11 @@
+type I8 is int8;
+using {sub as -, unsub as -} for I8 global;
+function sub(I8, I8) pure returns (I8) {}
+function unsub(I8) pure returns (I8) {}
+contract C {
+    function f(I8 a, I8 b) public pure returns (I8) {
+        return -a - b;
+    }
+}
+
+// ----
diff --git a/test/libsolidity/analysis/FunctionCallGraph.cpp b/test/libsolidity/analysis/FunctionCallGraph.cpp
index fcc8d14239..da17fc4332 100644
--- a/test/libsolidity/analysis/FunctionCallGraph.cpp
+++ b/test/libsolidity/analysis/FunctionCallGraph.cpp
@@ -1702,6 +1702,72 @@ BOOST_AUTO_TEST_CASE(using_for)
 	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
 }
 
+BOOST_AUTO_TEST_CASE(user_defined_binary_operator)
+{
+	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+		type Int is int128;
+		using {add as +} for Int global;
+
+		function add(Int, Int) pure returns (Int) {
+			return Int.wrap(0);
+		}
+
+		contract C {
+			function pub() public {
+				Int.wrap(0) + Int.wrap(1);
+			}
+		}
+	)"s);
+	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+
+	map<string, EdgeNames> expectedCreationEdges = {
+		{"C", {}},
+	};
+
+	map<string, EdgeNames> expectedDeployedEdges = {
+		{"C", {
+			{"Entry", "function C.pub()"},
+			{"function C.pub()", "function add(Int,Int)"},
+		}},
+	};
+
+	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+}
+
+BOOST_AUTO_TEST_CASE(user_defined_unary_operator)
+{
+	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+		type Int is int128;
+		using {sub as -} for Int global;
+
+		function sub(Int) pure returns (Int) {
+			return Int.wrap(0);
+		}
+
+		contract C {
+			function pub() public {
+				-Int.wrap(1);
+			}
+		}
+	)"s);
+	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+
+	map<string, EdgeNames> expectedCreationEdges = {
+		{"C", {}},
+	};
+
+	map<string, EdgeNames> expectedDeployedEdges = {
+		{"C", {
+			{"Entry", "function C.pub()"},
+			{"function C.pub()", "function sub(Int)"},
+		}},
+	};
+
+	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+}
+
 BOOST_AUTO_TEST_CASE(getters)
 {
 	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
diff --git a/test/libsolidity/semanticTests/operators/userDefined/all_possible_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/all_possible_operators.sol
new file mode 100644
index 0000000000..315356b6c3
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/all_possible_operators.sol
@@ -0,0 +1,92 @@
+type Int is int8;
+using {
+    bitor as |, bitand as &, bitxor as ^, bitnot as ~,
+    add as +, sub as -, unsub as -, mul as *, div as /, mod as %,
+    eq as ==, noteq as !=, lt as <, gt as >, leq as <=, geq as >=
+} for Int global;
+
+function bitor(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) | Int.unwrap(y)); }
+function bitand(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) & Int.unwrap(y)); }
+function bitxor(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) ^ Int.unwrap(y)); }
+function bitnot(Int x) pure returns (Int) { return Int.wrap(~Int.unwrap(x)); }
+
+function add(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) + Int.unwrap(y)); }
+function sub(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) - Int.unwrap(y)); }
+function unsub(Int x) pure returns (Int) { return Int.wrap(-Int.unwrap(x)); }
+function mul(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) * Int.unwrap(y)); }
+function div(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) / Int.unwrap(y)); }
+function mod(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) % Int.unwrap(y)); }
+
+function eq(Int x, Int y) pure returns (bool) { return Int.unwrap(x) == Int.unwrap(y); }
+function noteq(Int x, Int y) pure returns (bool) { return Int.unwrap(x) != Int.unwrap(y); }
+function lt(Int x, Int y) pure returns (bool) { return Int.unwrap(x) < Int.unwrap(y); }
+function gt(Int x, Int y) pure returns (bool) { return Int.unwrap(x) > Int.unwrap(y); }
+function leq(Int x, Int y) pure returns (bool) { return Int.unwrap(x) <= Int.unwrap(y); }
+function geq(Int x, Int y) pure returns (bool) { return Int.unwrap(x) >= Int.unwrap(y); }
+
+contract C {
+    Int constant ZERO = Int.wrap(0);
+    Int constant ONE = Int.wrap(1);
+    Int constant TWO = Int.wrap(2);
+    Int constant THREE = Int.wrap(3);
+    Int constant SIX = Int.wrap(6);
+
+    function testBitwise() public pure {
+        assert(Int.unwrap(ONE | TWO) == 3);
+        assert(Int.unwrap(ONE | ZERO) == 1);
+
+        assert(Int.unwrap(ONE & THREE) == 1);
+        assert(Int.unwrap(ONE & ONE) == 1);
+
+        assert(Int.unwrap(TWO ^ TWO) == 0);
+        assert(Int.unwrap(TWO ^ ONE) == 3);
+
+        assert(Int.unwrap(~ZERO) == -1);
+        assert(Int.unwrap(~ONE) == -2);
+        assert(Int.unwrap(~TWO) == -3);
+    }
+
+    function testArithmetic() public pure {
+        assert(Int.unwrap(ONE + TWO) == 3);
+        assert(Int.unwrap(ONE + ZERO) == 1);
+
+        assert(Int.unwrap(TWO - ONE) == 1);
+        assert(Int.unwrap(THREE - THREE) == 0);
+
+        assert(Int.unwrap(-TWO) == -2);
+        assert(Int.unwrap(-ZERO) == 0);
+
+        assert(Int.unwrap(ONE * ONE) == 1);
+        assert(Int.unwrap(THREE * TWO) == 6);
+
+        assert(Int.unwrap(SIX / TWO) == 3);
+        assert(Int.unwrap(THREE / TWO) == 1);
+
+        assert(Int.unwrap(SIX % TWO) == 0);
+        assert(Int.unwrap(THREE % TWO) == 1);
+    }
+
+    function testComparison() public pure {
+        assert((ONE == ONE) == true);
+        assert((ONE == TWO) == false);
+
+        assert((ONE != ONE) == false);
+        assert((ONE != TWO) == true);
+
+        assert((ONE < TWO) == true);
+        assert((TWO < ONE) == false);
+
+        assert((ONE <= TWO) == true);
+        assert((TWO <= ONE) == false);
+
+        assert((ONE > TWO) == false);
+        assert((TWO > ONE) == true);
+
+        assert((ONE >= TWO) == false);
+        assert((TWO >= ONE) == true);
+    }
+}
+// ----
+// testBitwise() ->
+// testArithmetic() ->
+// testComparison() ->
diff --git a/test/libsolidity/semanticTests/operators/userDefined/all_possible_user_defined_value_types_with_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/all_possible_user_defined_value_types_with_operators.sol
new file mode 100644
index 0000000000..868a539676
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/all_possible_user_defined_value_types_with_operators.sol
@@ -0,0 +1,670 @@
+type Int8 is int8;
+type Int16 is int16;
+type Int24 is int24;
+type Int32 is int32;
+type Int40 is int40;
+type Int48 is int48;
+type Int56 is int56;
+type Int64 is int64;
+type Int72 is int72;
+type Int80 is int80;
+type Int88 is int88;
+type Int96 is int96;
+type Int104 is int104;
+type Int112 is int112;
+type Int120 is int120;
+type Int128 is int128;
+type Int136 is int136;
+type Int144 is int144;
+type Int152 is int152;
+type Int160 is int160;
+type Int168 is int168;
+type Int176 is int176;
+type Int184 is int184;
+type Int192 is int192;
+type Int200 is int200;
+type Int208 is int208;
+type Int216 is int216;
+type Int224 is int224;
+type Int232 is int232;
+type Int240 is int240;
+type Int248 is int248;
+type Int256 is int256;
+type Int is int;
+
+type Uint8 is uint8;
+type Uint16 is uint16;
+type Uint24 is uint24;
+type Uint32 is uint32;
+type Uint40 is uint40;
+type Uint48 is uint48;
+type Uint56 is uint56;
+type Uint64 is uint64;
+type Uint72 is uint72;
+type Uint80 is uint80;
+type Uint88 is uint88;
+type Uint96 is uint96;
+type Uint104 is uint104;
+type Uint112 is uint112;
+type Uint120 is uint120;
+type Uint128 is uint128;
+type Uint136 is uint136;
+type Uint144 is uint144;
+type Uint152 is uint152;
+type Uint160 is uint160;
+type Uint168 is uint168;
+type Uint176 is uint176;
+type Uint184 is uint184;
+type Uint192 is uint192;
+type Uint200 is uint200;
+type Uint208 is uint208;
+type Uint216 is uint216;
+type Uint224 is uint224;
+type Uint232 is uint232;
+type Uint240 is uint240;
+type Uint248 is uint248;
+type Uint256 is uint256;
+type Uint is uint;
+
+type Bytes1 is bytes1;
+type Bytes2 is bytes2;
+type Bytes3 is bytes3;
+type Bytes4 is bytes4;
+type Bytes5 is bytes5;
+type Bytes6 is bytes6;
+type Bytes7 is bytes7;
+type Bytes8 is bytes8;
+type Bytes9 is bytes9;
+type Bytes10 is bytes10;
+type Bytes11 is bytes11;
+type Bytes12 is bytes12;
+type Bytes13 is bytes13;
+type Bytes14 is bytes14;
+type Bytes15 is bytes15;
+type Bytes16 is bytes16;
+type Bytes17 is bytes17;
+type Bytes18 is bytes18;
+type Bytes19 is bytes19;
+type Bytes20 is bytes20;
+type Bytes21 is bytes21;
+type Bytes22 is bytes22;
+type Bytes23 is bytes23;
+type Bytes24 is bytes24;
+type Bytes25 is bytes25;
+type Bytes26 is bytes26;
+type Bytes27 is bytes27;
+type Bytes28 is bytes28;
+type Bytes29 is bytes29;
+type Bytes30 is bytes30;
+type Bytes31 is bytes31;
+type Bytes32 is bytes32;
+
+type Address is address;
+type AddressPayable is address payable;
+
+type Bool is bool;
+
+using {bitorInt8 as |, unsubInt8 as -} for Int8 global;
+using {bitorInt16 as |, unsubInt16 as -} for Int16 global;
+using {bitorInt24 as |, unsubInt24 as -} for Int24 global;
+using {bitorInt32 as |, unsubInt32 as -} for Int32 global;
+using {bitorInt40 as |, unsubInt40 as -} for Int40 global;
+using {bitorInt48 as |, unsubInt48 as -} for Int48 global;
+using {bitorInt56 as |, unsubInt56 as -} for Int56 global;
+using {bitorInt64 as |, unsubInt64 as -} for Int64 global;
+using {bitorInt72 as |, unsubInt72 as -} for Int72 global;
+using {bitorInt80 as |, unsubInt80 as -} for Int80 global;
+using {bitorInt88 as |, unsubInt88 as -} for Int88 global;
+using {bitorInt96 as |, unsubInt96 as -} for Int96 global;
+using {bitorInt104 as |, unsubInt104 as -} for Int104 global;
+using {bitorInt112 as |, unsubInt112 as -} for Int112 global;
+using {bitorInt120 as |, unsubInt120 as -} for Int120 global;
+using {bitorInt128 as |, unsubInt128 as -} for Int128 global;
+using {bitorInt136 as |, unsubInt136 as -} for Int136 global;
+using {bitorInt144 as |, unsubInt144 as -} for Int144 global;
+using {bitorInt152 as |, unsubInt152 as -} for Int152 global;
+using {bitorInt160 as |, unsubInt160 as -} for Int160 global;
+using {bitorInt168 as |, unsubInt168 as -} for Int168 global;
+using {bitorInt176 as |, unsubInt176 as -} for Int176 global;
+using {bitorInt184 as |, unsubInt184 as -} for Int184 global;
+using {bitorInt192 as |, unsubInt192 as -} for Int192 global;
+using {bitorInt200 as |, unsubInt200 as -} for Int200 global;
+using {bitorInt208 as |, unsubInt208 as -} for Int208 global;
+using {bitorInt216 as |, unsubInt216 as -} for Int216 global;
+using {bitorInt224 as |, unsubInt224 as -} for Int224 global;
+using {bitorInt232 as |, unsubInt232 as -} for Int232 global;
+using {bitorInt240 as |, unsubInt240 as -} for Int240 global;
+using {bitorInt248 as |, unsubInt248 as -} for Int248 global;
+using {bitorInt256 as |, unsubInt256 as -} for Int256 global;
+using {bitorInt as |, unsubInt as -} for Int global;
+
+using {bitorUint8 as |, bitnotUint8 as ~} for Uint8 global;
+using {bitorUint16 as |, bitnotUint16 as ~} for Uint16 global;
+using {bitorUint24 as |, bitnotUint24 as ~} for Uint24 global;
+using {bitorUint32 as |, bitnotUint32 as ~} for Uint32 global;
+using {bitorUint40 as |, bitnotUint40 as ~} for Uint40 global;
+using {bitorUint48 as |, bitnotUint48 as ~} for Uint48 global;
+using {bitorUint56 as |, bitnotUint56 as ~} for Uint56 global;
+using {bitorUint64 as |, bitnotUint64 as ~} for Uint64 global;
+using {bitorUint72 as |, bitnotUint72 as ~} for Uint72 global;
+using {bitorUint80 as |, bitnotUint80 as ~} for Uint80 global;
+using {bitorUint88 as |, bitnotUint88 as ~} for Uint88 global;
+using {bitorUint96 as |, bitnotUint96 as ~} for Uint96 global;
+using {bitorUint104 as |, bitnotUint104 as ~} for Uint104 global;
+using {bitorUint112 as |, bitnotUint112 as ~} for Uint112 global;
+using {bitorUint120 as |, bitnotUint120 as ~} for Uint120 global;
+using {bitorUint128 as |, bitnotUint128 as ~} for Uint128 global;
+using {bitorUint136 as |, bitnotUint136 as ~} for Uint136 global;
+using {bitorUint144 as |, bitnotUint144 as ~} for Uint144 global;
+using {bitorUint152 as |, bitnotUint152 as ~} for Uint152 global;
+using {bitorUint160 as |, bitnotUint160 as ~} for Uint160 global;
+using {bitorUint168 as |, bitnotUint168 as ~} for Uint168 global;
+using {bitorUint176 as |, bitnotUint176 as ~} for Uint176 global;
+using {bitorUint184 as |, bitnotUint184 as ~} for Uint184 global;
+using {bitorUint192 as |, bitnotUint192 as ~} for Uint192 global;
+using {bitorUint200 as |, bitnotUint200 as ~} for Uint200 global;
+using {bitorUint208 as |, bitnotUint208 as ~} for Uint208 global;
+using {bitorUint216 as |, bitnotUint216 as ~} for Uint216 global;
+using {bitorUint224 as |, bitnotUint224 as ~} for Uint224 global;
+using {bitorUint232 as |, bitnotUint232 as ~} for Uint232 global;
+using {bitorUint240 as |, bitnotUint240 as ~} for Uint240 global;
+using {bitorUint248 as |, bitnotUint248 as ~} for Uint248 global;
+using {bitorUint256 as |, bitnotUint256 as ~} for Uint256 global;
+using {bitorUint as |, bitnotUint as ~} for Uint global;
+
+using {bitorBytes1 as |, bitnotBytes1 as ~} for Bytes1 global;
+using {bitorBytes2 as |, bitnotBytes2 as ~} for Bytes2 global;
+using {bitorBytes3 as |, bitnotBytes3 as ~} for Bytes3 global;
+using {bitorBytes4 as |, bitnotBytes4 as ~} for Bytes4 global;
+using {bitorBytes5 as |, bitnotBytes5 as ~} for Bytes5 global;
+using {bitorBytes6 as |, bitnotBytes6 as ~} for Bytes6 global;
+using {bitorBytes7 as |, bitnotBytes7 as ~} for Bytes7 global;
+using {bitorBytes8 as |, bitnotBytes8 as ~} for Bytes8 global;
+using {bitorBytes9 as |, bitnotBytes9 as ~} for Bytes9 global;
+using {bitorBytes10 as |, bitnotBytes10 as ~} for Bytes10 global;
+using {bitorBytes11 as |, bitnotBytes11 as ~} for Bytes11 global;
+using {bitorBytes12 as |, bitnotBytes12 as ~} for Bytes12 global;
+using {bitorBytes13 as |, bitnotBytes13 as ~} for Bytes13 global;
+using {bitorBytes14 as |, bitnotBytes14 as ~} for Bytes14 global;
+using {bitorBytes15 as |, bitnotBytes15 as ~} for Bytes15 global;
+using {bitorBytes16 as |, bitnotBytes16 as ~} for Bytes16 global;
+using {bitorBytes17 as |, bitnotBytes17 as ~} for Bytes17 global;
+using {bitorBytes18 as |, bitnotBytes18 as ~} for Bytes18 global;
+using {bitorBytes19 as |, bitnotBytes19 as ~} for Bytes19 global;
+using {bitorBytes20 as |, bitnotBytes20 as ~} for Bytes20 global;
+using {bitorBytes21 as |, bitnotBytes21 as ~} for Bytes21 global;
+using {bitorBytes22 as |, bitnotBytes22 as ~} for Bytes22 global;
+using {bitorBytes23 as |, bitnotBytes23 as ~} for Bytes23 global;
+using {bitorBytes24 as |, bitnotBytes24 as ~} for Bytes24 global;
+using {bitorBytes25 as |, bitnotBytes25 as ~} for Bytes25 global;
+using {bitorBytes26 as |, bitnotBytes26 as ~} for Bytes26 global;
+using {bitorBytes27 as |, bitnotBytes27 as ~} for Bytes27 global;
+using {bitorBytes28 as |, bitnotBytes28 as ~} for Bytes28 global;
+using {bitorBytes29 as |, bitnotBytes29 as ~} for Bytes29 global;
+using {bitorBytes30 as |, bitnotBytes30 as ~} for Bytes30 global;
+using {bitorBytes31 as |, bitnotBytes31 as ~} for Bytes31 global;
+using {bitorBytes32 as |, bitnotBytes32 as ~} for Bytes32 global;
+
+function bitorInt8(Int8 x, Int8 y) pure returns (Int8) { return Int8.wrap(Int8.unwrap(x) | Int8.unwrap(y)); }
+function bitorInt16(Int16 x, Int16 y) pure returns (Int16) { return Int16.wrap(Int16.unwrap(x) | Int16.unwrap(y)); }
+function bitorInt24(Int24 x, Int24 y) pure returns (Int24) { return Int24.wrap(Int24.unwrap(x) | Int24.unwrap(y)); }
+function bitorInt32(Int32 x, Int32 y) pure returns (Int32) { return Int32.wrap(Int32.unwrap(x) | Int32.unwrap(y)); }
+function bitorInt40(Int40 x, Int40 y) pure returns (Int40) { return Int40.wrap(Int40.unwrap(x) | Int40.unwrap(y)); }
+function bitorInt48(Int48 x, Int48 y) pure returns (Int48) { return Int48.wrap(Int48.unwrap(x) | Int48.unwrap(y)); }
+function bitorInt56(Int56 x, Int56 y) pure returns (Int56) { return Int56.wrap(Int56.unwrap(x) | Int56.unwrap(y)); }
+function bitorInt64(Int64 x, Int64 y) pure returns (Int64) { return Int64.wrap(Int64.unwrap(x) | Int64.unwrap(y)); }
+function bitorInt72(Int72 x, Int72 y) pure returns (Int72) { return Int72.wrap(Int72.unwrap(x) | Int72.unwrap(y)); }
+function bitorInt80(Int80 x, Int80 y) pure returns (Int80) { return Int80.wrap(Int80.unwrap(x) | Int80.unwrap(y)); }
+function bitorInt88(Int88 x, Int88 y) pure returns (Int88) { return Int88.wrap(Int88.unwrap(x) | Int88.unwrap(y)); }
+function bitorInt96(Int96 x, Int96 y) pure returns (Int96) { return Int96.wrap(Int96.unwrap(x) | Int96.unwrap(y)); }
+function bitorInt104(Int104 x, Int104 y) pure returns (Int104) { return Int104.wrap(Int104.unwrap(x) | Int104.unwrap(y)); }
+function bitorInt112(Int112 x, Int112 y) pure returns (Int112) { return Int112.wrap(Int112.unwrap(x) | Int112.unwrap(y)); }
+function bitorInt120(Int120 x, Int120 y) pure returns (Int120) { return Int120.wrap(Int120.unwrap(x) | Int120.unwrap(y)); }
+function bitorInt128(Int128 x, Int128 y) pure returns (Int128) { return Int128.wrap(Int128.unwrap(x) | Int128.unwrap(y)); }
+function bitorInt136(Int136 x, Int136 y) pure returns (Int136) { return Int136.wrap(Int136.unwrap(x) | Int136.unwrap(y)); }
+function bitorInt144(Int144 x, Int144 y) pure returns (Int144) { return Int144.wrap(Int144.unwrap(x) | Int144.unwrap(y)); }
+function bitorInt152(Int152 x, Int152 y) pure returns (Int152) { return Int152.wrap(Int152.unwrap(x) | Int152.unwrap(y)); }
+function bitorInt160(Int160 x, Int160 y) pure returns (Int160) { return Int160.wrap(Int160.unwrap(x) | Int160.unwrap(y)); }
+function bitorInt168(Int168 x, Int168 y) pure returns (Int168) { return Int168.wrap(Int168.unwrap(x) | Int168.unwrap(y)); }
+function bitorInt176(Int176 x, Int176 y) pure returns (Int176) { return Int176.wrap(Int176.unwrap(x) | Int176.unwrap(y)); }
+function bitorInt184(Int184 x, Int184 y) pure returns (Int184) { return Int184.wrap(Int184.unwrap(x) | Int184.unwrap(y)); }
+function bitorInt192(Int192 x, Int192 y) pure returns (Int192) { return Int192.wrap(Int192.unwrap(x) | Int192.unwrap(y)); }
+function bitorInt200(Int200 x, Int200 y) pure returns (Int200) { return Int200.wrap(Int200.unwrap(x) | Int200.unwrap(y)); }
+function bitorInt208(Int208 x, Int208 y) pure returns (Int208) { return Int208.wrap(Int208.unwrap(x) | Int208.unwrap(y)); }
+function bitorInt216(Int216 x, Int216 y) pure returns (Int216) { return Int216.wrap(Int216.unwrap(x) | Int216.unwrap(y)); }
+function bitorInt224(Int224 x, Int224 y) pure returns (Int224) { return Int224.wrap(Int224.unwrap(x) | Int224.unwrap(y)); }
+function bitorInt232(Int232 x, Int232 y) pure returns (Int232) { return Int232.wrap(Int232.unwrap(x) | Int232.unwrap(y)); }
+function bitorInt240(Int240 x, Int240 y) pure returns (Int240) { return Int240.wrap(Int240.unwrap(x) | Int240.unwrap(y)); }
+function bitorInt248(Int248 x, Int248 y) pure returns (Int248) { return Int248.wrap(Int248.unwrap(x) | Int248.unwrap(y)); }
+function bitorInt256(Int256 x, Int256 y) pure returns (Int256) { return Int256.wrap(Int256.unwrap(x) | Int256.unwrap(y)); }
+function bitorInt(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) | Int.unwrap(y)); }
+
+function unsubInt8(Int8 x) pure returns (Int8) { return Int8.wrap(-Int8.unwrap(x)); }
+function unsubInt16(Int16 x) pure returns (Int16) { return Int16.wrap(-Int16.unwrap(x)); }
+function unsubInt24(Int24 x) pure returns (Int24) { return Int24.wrap(-Int24.unwrap(x)); }
+function unsubInt32(Int32 x) pure returns (Int32) { return Int32.wrap(-Int32.unwrap(x)); }
+function unsubInt40(Int40 x) pure returns (Int40) { return Int40.wrap(-Int40.unwrap(x)); }
+function unsubInt48(Int48 x) pure returns (Int48) { return Int48.wrap(-Int48.unwrap(x)); }
+function unsubInt56(Int56 x) pure returns (Int56) { return Int56.wrap(-Int56.unwrap(x)); }
+function unsubInt64(Int64 x) pure returns (Int64) { return Int64.wrap(-Int64.unwrap(x)); }
+function unsubInt72(Int72 x) pure returns (Int72) { return Int72.wrap(-Int72.unwrap(x)); }
+function unsubInt80(Int80 x) pure returns (Int80) { return Int80.wrap(-Int80.unwrap(x)); }
+function unsubInt88(Int88 x) pure returns (Int88) { return Int88.wrap(-Int88.unwrap(x)); }
+function unsubInt96(Int96 x) pure returns (Int96) { return Int96.wrap(-Int96.unwrap(x)); }
+function unsubInt104(Int104 x) pure returns (Int104) { return Int104.wrap(-Int104.unwrap(x)); }
+function unsubInt112(Int112 x) pure returns (Int112) { return Int112.wrap(-Int112.unwrap(x)); }
+function unsubInt120(Int120 x) pure returns (Int120) { return Int120.wrap(-Int120.unwrap(x)); }
+function unsubInt128(Int128 x) pure returns (Int128) { return Int128.wrap(-Int128.unwrap(x)); }
+function unsubInt136(Int136 x) pure returns (Int136) { return Int136.wrap(-Int136.unwrap(x)); }
+function unsubInt144(Int144 x) pure returns (Int144) { return Int144.wrap(-Int144.unwrap(x)); }
+function unsubInt152(Int152 x) pure returns (Int152) { return Int152.wrap(-Int152.unwrap(x)); }
+function unsubInt160(Int160 x) pure returns (Int160) { return Int160.wrap(-Int160.unwrap(x)); }
+function unsubInt168(Int168 x) pure returns (Int168) { return Int168.wrap(-Int168.unwrap(x)); }
+function unsubInt176(Int176 x) pure returns (Int176) { return Int176.wrap(-Int176.unwrap(x)); }
+function unsubInt184(Int184 x) pure returns (Int184) { return Int184.wrap(-Int184.unwrap(x)); }
+function unsubInt192(Int192 x) pure returns (Int192) { return Int192.wrap(-Int192.unwrap(x)); }
+function unsubInt200(Int200 x) pure returns (Int200) { return Int200.wrap(-Int200.unwrap(x)); }
+function unsubInt208(Int208 x) pure returns (Int208) { return Int208.wrap(-Int208.unwrap(x)); }
+function unsubInt216(Int216 x) pure returns (Int216) { return Int216.wrap(-Int216.unwrap(x)); }
+function unsubInt224(Int224 x) pure returns (Int224) { return Int224.wrap(-Int224.unwrap(x)); }
+function unsubInt232(Int232 x) pure returns (Int232) { return Int232.wrap(-Int232.unwrap(x)); }
+function unsubInt240(Int240 x) pure returns (Int240) { return Int240.wrap(-Int240.unwrap(x)); }
+function unsubInt248(Int248 x) pure returns (Int248) { return Int248.wrap(-Int248.unwrap(x)); }
+function unsubInt256(Int256 x) pure returns (Int256) { return Int256.wrap(-Int256.unwrap(x)); }
+function unsubInt(Int x) pure returns (Int) { return Int.wrap(-Int.unwrap(x)); }
+
+function bitorUint8(Uint8 x, Uint8 y) pure returns (Uint8) { return Uint8.wrap(Uint8.unwrap(x) | Uint8.unwrap(y)); }
+function bitorUint16(Uint16 x, Uint16 y) pure returns (Uint16) { return Uint16.wrap(Uint16.unwrap(x) | Uint16.unwrap(y)); }
+function bitorUint24(Uint24 x, Uint24 y) pure returns (Uint24) { return Uint24.wrap(Uint24.unwrap(x) | Uint24.unwrap(y)); }
+function bitorUint32(Uint32 x, Uint32 y) pure returns (Uint32) { return Uint32.wrap(Uint32.unwrap(x) | Uint32.unwrap(y)); }
+function bitorUint40(Uint40 x, Uint40 y) pure returns (Uint40) { return Uint40.wrap(Uint40.unwrap(x) | Uint40.unwrap(y)); }
+function bitorUint48(Uint48 x, Uint48 y) pure returns (Uint48) { return Uint48.wrap(Uint48.unwrap(x) | Uint48.unwrap(y)); }
+function bitorUint56(Uint56 x, Uint56 y) pure returns (Uint56) { return Uint56.wrap(Uint56.unwrap(x) | Uint56.unwrap(y)); }
+function bitorUint64(Uint64 x, Uint64 y) pure returns (Uint64) { return Uint64.wrap(Uint64.unwrap(x) | Uint64.unwrap(y)); }
+function bitorUint72(Uint72 x, Uint72 y) pure returns (Uint72) { return Uint72.wrap(Uint72.unwrap(x) | Uint72.unwrap(y)); }
+function bitorUint80(Uint80 x, Uint80 y) pure returns (Uint80) { return Uint80.wrap(Uint80.unwrap(x) | Uint80.unwrap(y)); }
+function bitorUint88(Uint88 x, Uint88 y) pure returns (Uint88) { return Uint88.wrap(Uint88.unwrap(x) | Uint88.unwrap(y)); }
+function bitorUint96(Uint96 x, Uint96 y) pure returns (Uint96) { return Uint96.wrap(Uint96.unwrap(x) | Uint96.unwrap(y)); }
+function bitorUint104(Uint104 x, Uint104 y) pure returns (Uint104) { return Uint104.wrap(Uint104.unwrap(x) | Uint104.unwrap(y)); }
+function bitorUint112(Uint112 x, Uint112 y) pure returns (Uint112) { return Uint112.wrap(Uint112.unwrap(x) | Uint112.unwrap(y)); }
+function bitorUint120(Uint120 x, Uint120 y) pure returns (Uint120) { return Uint120.wrap(Uint120.unwrap(x) | Uint120.unwrap(y)); }
+function bitorUint128(Uint128 x, Uint128 y) pure returns (Uint128) { return Uint128.wrap(Uint128.unwrap(x) | Uint128.unwrap(y)); }
+function bitorUint136(Uint136 x, Uint136 y) pure returns (Uint136) { return Uint136.wrap(Uint136.unwrap(x) | Uint136.unwrap(y)); }
+function bitorUint144(Uint144 x, Uint144 y) pure returns (Uint144) { return Uint144.wrap(Uint144.unwrap(x) | Uint144.unwrap(y)); }
+function bitorUint152(Uint152 x, Uint152 y) pure returns (Uint152) { return Uint152.wrap(Uint152.unwrap(x) | Uint152.unwrap(y)); }
+function bitorUint160(Uint160 x, Uint160 y) pure returns (Uint160) { return Uint160.wrap(Uint160.unwrap(x) | Uint160.unwrap(y)); }
+function bitorUint168(Uint168 x, Uint168 y) pure returns (Uint168) { return Uint168.wrap(Uint168.unwrap(x) | Uint168.unwrap(y)); }
+function bitorUint176(Uint176 x, Uint176 y) pure returns (Uint176) { return Uint176.wrap(Uint176.unwrap(x) | Uint176.unwrap(y)); }
+function bitorUint184(Uint184 x, Uint184 y) pure returns (Uint184) { return Uint184.wrap(Uint184.unwrap(x) | Uint184.unwrap(y)); }
+function bitorUint192(Uint192 x, Uint192 y) pure returns (Uint192) { return Uint192.wrap(Uint192.unwrap(x) | Uint192.unwrap(y)); }
+function bitorUint200(Uint200 x, Uint200 y) pure returns (Uint200) { return Uint200.wrap(Uint200.unwrap(x) | Uint200.unwrap(y)); }
+function bitorUint208(Uint208 x, Uint208 y) pure returns (Uint208) { return Uint208.wrap(Uint208.unwrap(x) | Uint208.unwrap(y)); }
+function bitorUint216(Uint216 x, Uint216 y) pure returns (Uint216) { return Uint216.wrap(Uint216.unwrap(x) | Uint216.unwrap(y)); }
+function bitorUint224(Uint224 x, Uint224 y) pure returns (Uint224) { return Uint224.wrap(Uint224.unwrap(x) | Uint224.unwrap(y)); }
+function bitorUint232(Uint232 x, Uint232 y) pure returns (Uint232) { return Uint232.wrap(Uint232.unwrap(x) | Uint232.unwrap(y)); }
+function bitorUint240(Uint240 x, Uint240 y) pure returns (Uint240) { return Uint240.wrap(Uint240.unwrap(x) | Uint240.unwrap(y)); }
+function bitorUint248(Uint248 x, Uint248 y) pure returns (Uint248) { return Uint248.wrap(Uint248.unwrap(x) | Uint248.unwrap(y)); }
+function bitorUint256(Uint256 x, Uint256 y) pure returns (Uint256) { return Uint256.wrap(Uint256.unwrap(x) | Uint256.unwrap(y)); }
+function bitorUint(Uint x, Uint y) pure returns (Uint) { return Uint.wrap(Uint.unwrap(x) | Uint.unwrap(y)); }
+
+function bitnotUint8(Uint8 x) pure returns (Uint8) { return Uint8.wrap(~Uint8.unwrap(x)); }
+function bitnotUint16(Uint16 x) pure returns (Uint16) { return Uint16.wrap(~Uint16.unwrap(x)); }
+function bitnotUint24(Uint24 x) pure returns (Uint24) { return Uint24.wrap(~Uint24.unwrap(x)); }
+function bitnotUint32(Uint32 x) pure returns (Uint32) { return Uint32.wrap(~Uint32.unwrap(x)); }
+function bitnotUint40(Uint40 x) pure returns (Uint40) { return Uint40.wrap(~Uint40.unwrap(x)); }
+function bitnotUint48(Uint48 x) pure returns (Uint48) { return Uint48.wrap(~Uint48.unwrap(x)); }
+function bitnotUint56(Uint56 x) pure returns (Uint56) { return Uint56.wrap(~Uint56.unwrap(x)); }
+function bitnotUint64(Uint64 x) pure returns (Uint64) { return Uint64.wrap(~Uint64.unwrap(x)); }
+function bitnotUint72(Uint72 x) pure returns (Uint72) { return Uint72.wrap(~Uint72.unwrap(x)); }
+function bitnotUint80(Uint80 x) pure returns (Uint80) { return Uint80.wrap(~Uint80.unwrap(x)); }
+function bitnotUint88(Uint88 x) pure returns (Uint88) { return Uint88.wrap(~Uint88.unwrap(x)); }
+function bitnotUint96(Uint96 x) pure returns (Uint96) { return Uint96.wrap(~Uint96.unwrap(x)); }
+function bitnotUint104(Uint104 x) pure returns (Uint104) { return Uint104.wrap(~Uint104.unwrap(x)); }
+function bitnotUint112(Uint112 x) pure returns (Uint112) { return Uint112.wrap(~Uint112.unwrap(x)); }
+function bitnotUint120(Uint120 x) pure returns (Uint120) { return Uint120.wrap(~Uint120.unwrap(x)); }
+function bitnotUint128(Uint128 x) pure returns (Uint128) { return Uint128.wrap(~Uint128.unwrap(x)); }
+function bitnotUint136(Uint136 x) pure returns (Uint136) { return Uint136.wrap(~Uint136.unwrap(x)); }
+function bitnotUint144(Uint144 x) pure returns (Uint144) { return Uint144.wrap(~Uint144.unwrap(x)); }
+function bitnotUint152(Uint152 x) pure returns (Uint152) { return Uint152.wrap(~Uint152.unwrap(x)); }
+function bitnotUint160(Uint160 x) pure returns (Uint160) { return Uint160.wrap(~Uint160.unwrap(x)); }
+function bitnotUint168(Uint168 x) pure returns (Uint168) { return Uint168.wrap(~Uint168.unwrap(x)); }
+function bitnotUint176(Uint176 x) pure returns (Uint176) { return Uint176.wrap(~Uint176.unwrap(x)); }
+function bitnotUint184(Uint184 x) pure returns (Uint184) { return Uint184.wrap(~Uint184.unwrap(x)); }
+function bitnotUint192(Uint192 x) pure returns (Uint192) { return Uint192.wrap(~Uint192.unwrap(x)); }
+function bitnotUint200(Uint200 x) pure returns (Uint200) { return Uint200.wrap(~Uint200.unwrap(x)); }
+function bitnotUint208(Uint208 x) pure returns (Uint208) { return Uint208.wrap(~Uint208.unwrap(x)); }
+function bitnotUint216(Uint216 x) pure returns (Uint216) { return Uint216.wrap(~Uint216.unwrap(x)); }
+function bitnotUint224(Uint224 x) pure returns (Uint224) { return Uint224.wrap(~Uint224.unwrap(x)); }
+function bitnotUint232(Uint232 x) pure returns (Uint232) { return Uint232.wrap(~Uint232.unwrap(x)); }
+function bitnotUint240(Uint240 x) pure returns (Uint240) { return Uint240.wrap(~Uint240.unwrap(x)); }
+function bitnotUint248(Uint248 x) pure returns (Uint248) { return Uint248.wrap(~Uint248.unwrap(x)); }
+function bitnotUint256(Uint256 x) pure returns (Uint256) { return Uint256.wrap(~Uint256.unwrap(x)); }
+function bitnotUint(Uint x) pure returns (Uint) { return Uint.wrap(~Uint.unwrap(x)); }
+
+function bitorBytes1(Bytes1 x, Bytes1 y) pure returns (Bytes1) { return Bytes1.wrap(Bytes1.unwrap(x) | Bytes1.unwrap(y)); }
+function bitorBytes2(Bytes2 x, Bytes2 y) pure returns (Bytes2) { return Bytes2.wrap(Bytes2.unwrap(x) | Bytes2.unwrap(y)); }
+function bitorBytes3(Bytes3 x, Bytes3 y) pure returns (Bytes3) { return Bytes3.wrap(Bytes3.unwrap(x) | Bytes3.unwrap(y)); }
+function bitorBytes4(Bytes4 x, Bytes4 y) pure returns (Bytes4) { return Bytes4.wrap(Bytes4.unwrap(x) | Bytes4.unwrap(y)); }
+function bitorBytes5(Bytes5 x, Bytes5 y) pure returns (Bytes5) { return Bytes5.wrap(Bytes5.unwrap(x) | Bytes5.unwrap(y)); }
+function bitorBytes6(Bytes6 x, Bytes6 y) pure returns (Bytes6) { return Bytes6.wrap(Bytes6.unwrap(x) | Bytes6.unwrap(y)); }
+function bitorBytes7(Bytes7 x, Bytes7 y) pure returns (Bytes7) { return Bytes7.wrap(Bytes7.unwrap(x) | Bytes7.unwrap(y)); }
+function bitorBytes8(Bytes8 x, Bytes8 y) pure returns (Bytes8) { return Bytes8.wrap(Bytes8.unwrap(x) | Bytes8.unwrap(y)); }
+function bitorBytes9(Bytes9 x, Bytes9 y) pure returns (Bytes9) { return Bytes9.wrap(Bytes9.unwrap(x) | Bytes9.unwrap(y)); }
+function bitorBytes10(Bytes10 x, Bytes10 y) pure returns (Bytes10) { return Bytes10.wrap(Bytes10.unwrap(x) | Bytes10.unwrap(y)); }
+function bitorBytes11(Bytes11 x, Bytes11 y) pure returns (Bytes11) { return Bytes11.wrap(Bytes11.unwrap(x) | Bytes11.unwrap(y)); }
+function bitorBytes12(Bytes12 x, Bytes12 y) pure returns (Bytes12) { return Bytes12.wrap(Bytes12.unwrap(x) | Bytes12.unwrap(y)); }
+function bitorBytes13(Bytes13 x, Bytes13 y) pure returns (Bytes13) { return Bytes13.wrap(Bytes13.unwrap(x) | Bytes13.unwrap(y)); }
+function bitorBytes14(Bytes14 x, Bytes14 y) pure returns (Bytes14) { return Bytes14.wrap(Bytes14.unwrap(x) | Bytes14.unwrap(y)); }
+function bitorBytes15(Bytes15 x, Bytes15 y) pure returns (Bytes15) { return Bytes15.wrap(Bytes15.unwrap(x) | Bytes15.unwrap(y)); }
+function bitorBytes16(Bytes16 x, Bytes16 y) pure returns (Bytes16) { return Bytes16.wrap(Bytes16.unwrap(x) | Bytes16.unwrap(y)); }
+function bitorBytes17(Bytes17 x, Bytes17 y) pure returns (Bytes17) { return Bytes17.wrap(Bytes17.unwrap(x) | Bytes17.unwrap(y)); }
+function bitorBytes18(Bytes18 x, Bytes18 y) pure returns (Bytes18) { return Bytes18.wrap(Bytes18.unwrap(x) | Bytes18.unwrap(y)); }
+function bitorBytes19(Bytes19 x, Bytes19 y) pure returns (Bytes19) { return Bytes19.wrap(Bytes19.unwrap(x) | Bytes19.unwrap(y)); }
+function bitorBytes20(Bytes20 x, Bytes20 y) pure returns (Bytes20) { return Bytes20.wrap(Bytes20.unwrap(x) | Bytes20.unwrap(y)); }
+function bitorBytes21(Bytes21 x, Bytes21 y) pure returns (Bytes21) { return Bytes21.wrap(Bytes21.unwrap(x) | Bytes21.unwrap(y)); }
+function bitorBytes22(Bytes22 x, Bytes22 y) pure returns (Bytes22) { return Bytes22.wrap(Bytes22.unwrap(x) | Bytes22.unwrap(y)); }
+function bitorBytes23(Bytes23 x, Bytes23 y) pure returns (Bytes23) { return Bytes23.wrap(Bytes23.unwrap(x) | Bytes23.unwrap(y)); }
+function bitorBytes24(Bytes24 x, Bytes24 y) pure returns (Bytes24) { return Bytes24.wrap(Bytes24.unwrap(x) | Bytes24.unwrap(y)); }
+function bitorBytes25(Bytes25 x, Bytes25 y) pure returns (Bytes25) { return Bytes25.wrap(Bytes25.unwrap(x) | Bytes25.unwrap(y)); }
+function bitorBytes26(Bytes26 x, Bytes26 y) pure returns (Bytes26) { return Bytes26.wrap(Bytes26.unwrap(x) | Bytes26.unwrap(y)); }
+function bitorBytes27(Bytes27 x, Bytes27 y) pure returns (Bytes27) { return Bytes27.wrap(Bytes27.unwrap(x) | Bytes27.unwrap(y)); }
+function bitorBytes28(Bytes28 x, Bytes28 y) pure returns (Bytes28) { return Bytes28.wrap(Bytes28.unwrap(x) | Bytes28.unwrap(y)); }
+function bitorBytes29(Bytes29 x, Bytes29 y) pure returns (Bytes29) { return Bytes29.wrap(Bytes29.unwrap(x) | Bytes29.unwrap(y)); }
+function bitorBytes30(Bytes30 x, Bytes30 y) pure returns (Bytes30) { return Bytes30.wrap(Bytes30.unwrap(x) | Bytes30.unwrap(y)); }
+function bitorBytes31(Bytes31 x, Bytes31 y) pure returns (Bytes31) { return Bytes31.wrap(Bytes31.unwrap(x) | Bytes31.unwrap(y)); }
+function bitorBytes32(Bytes32 x, Bytes32 y) pure returns (Bytes32) { return Bytes32.wrap(Bytes32.unwrap(x) | Bytes32.unwrap(y)); }
+
+function bitnotBytes1(Bytes1 x) pure returns (Bytes1) { return Bytes1.wrap(~Bytes1.unwrap(x)); }
+function bitnotBytes2(Bytes2 x) pure returns (Bytes2) { return Bytes2.wrap(~Bytes2.unwrap(x)); }
+function bitnotBytes3(Bytes3 x) pure returns (Bytes3) { return Bytes3.wrap(~Bytes3.unwrap(x)); }
+function bitnotBytes4(Bytes4 x) pure returns (Bytes4) { return Bytes4.wrap(~Bytes4.unwrap(x)); }
+function bitnotBytes5(Bytes5 x) pure returns (Bytes5) { return Bytes5.wrap(~Bytes5.unwrap(x)); }
+function bitnotBytes6(Bytes6 x) pure returns (Bytes6) { return Bytes6.wrap(~Bytes6.unwrap(x)); }
+function bitnotBytes7(Bytes7 x) pure returns (Bytes7) { return Bytes7.wrap(~Bytes7.unwrap(x)); }
+function bitnotBytes8(Bytes8 x) pure returns (Bytes8) { return Bytes8.wrap(~Bytes8.unwrap(x)); }
+function bitnotBytes9(Bytes9 x) pure returns (Bytes9) { return Bytes9.wrap(~Bytes9.unwrap(x)); }
+function bitnotBytes10(Bytes10 x) pure returns (Bytes10) { return Bytes10.wrap(~Bytes10.unwrap(x)); }
+function bitnotBytes11(Bytes11 x) pure returns (Bytes11) { return Bytes11.wrap(~Bytes11.unwrap(x)); }
+function bitnotBytes12(Bytes12 x) pure returns (Bytes12) { return Bytes12.wrap(~Bytes12.unwrap(x)); }
+function bitnotBytes13(Bytes13 x) pure returns (Bytes13) { return Bytes13.wrap(~Bytes13.unwrap(x)); }
+function bitnotBytes14(Bytes14 x) pure returns (Bytes14) { return Bytes14.wrap(~Bytes14.unwrap(x)); }
+function bitnotBytes15(Bytes15 x) pure returns (Bytes15) { return Bytes15.wrap(~Bytes15.unwrap(x)); }
+function bitnotBytes16(Bytes16 x) pure returns (Bytes16) { return Bytes16.wrap(~Bytes16.unwrap(x)); }
+function bitnotBytes17(Bytes17 x) pure returns (Bytes17) { return Bytes17.wrap(~Bytes17.unwrap(x)); }
+function bitnotBytes18(Bytes18 x) pure returns (Bytes18) { return Bytes18.wrap(~Bytes18.unwrap(x)); }
+function bitnotBytes19(Bytes19 x) pure returns (Bytes19) { return Bytes19.wrap(~Bytes19.unwrap(x)); }
+function bitnotBytes20(Bytes20 x) pure returns (Bytes20) { return Bytes20.wrap(~Bytes20.unwrap(x)); }
+function bitnotBytes21(Bytes21 x) pure returns (Bytes21) { return Bytes21.wrap(~Bytes21.unwrap(x)); }
+function bitnotBytes22(Bytes22 x) pure returns (Bytes22) { return Bytes22.wrap(~Bytes22.unwrap(x)); }
+function bitnotBytes23(Bytes23 x) pure returns (Bytes23) { return Bytes23.wrap(~Bytes23.unwrap(x)); }
+function bitnotBytes24(Bytes24 x) pure returns (Bytes24) { return Bytes24.wrap(~Bytes24.unwrap(x)); }
+function bitnotBytes25(Bytes25 x) pure returns (Bytes25) { return Bytes25.wrap(~Bytes25.unwrap(x)); }
+function bitnotBytes26(Bytes26 x) pure returns (Bytes26) { return Bytes26.wrap(~Bytes26.unwrap(x)); }
+function bitnotBytes27(Bytes27 x) pure returns (Bytes27) { return Bytes27.wrap(~Bytes27.unwrap(x)); }
+function bitnotBytes28(Bytes28 x) pure returns (Bytes28) { return Bytes28.wrap(~Bytes28.unwrap(x)); }
+function bitnotBytes29(Bytes29 x) pure returns (Bytes29) { return Bytes29.wrap(~Bytes29.unwrap(x)); }
+function bitnotBytes30(Bytes30 x) pure returns (Bytes30) { return Bytes30.wrap(~Bytes30.unwrap(x)); }
+function bitnotBytes31(Bytes31 x) pure returns (Bytes31) { return Bytes31.wrap(~Bytes31.unwrap(x)); }
+function bitnotBytes32(Bytes32 x) pure returns (Bytes32) { return Bytes32.wrap(~Bytes32.unwrap(x)); }
+
+using {bitorAddress as |, bitnotAddress as ~} for Address global;
+using {bitorAddressPayable as |, bitnotAddressPayable as ~} for AddressPayable global;
+using {bitorBool as |, bitnotBool as ~} for Bool global;
+
+function bitorAddress(Address x, Address y) pure returns (Address) {
+    return Address.wrap(address(bytes20(Address.unwrap(x)) | bytes20(Address.unwrap(y))));
+}
+function bitnotAddress(Address x) pure returns (Address) {
+    return Address.wrap(address(~bytes20(Address.unwrap(x))));
+}
+
+function bitorAddressPayable(AddressPayable x, AddressPayable y) pure returns (AddressPayable) {
+    return AddressPayable.wrap(payable(address(bytes20(address(AddressPayable.unwrap(x))) | bytes20(address(AddressPayable.unwrap(y))))));
+}
+function bitnotAddressPayable(AddressPayable x) pure returns (AddressPayable) {
+    return AddressPayable.wrap(payable(address(~bytes20(address(AddressPayable.unwrap(x))))));
+}
+
+function bitorBool(Bool x, Bool y) pure returns (Bool) {
+    return Bool.wrap(Bool.unwrap(x) || Bool.unwrap(y));
+}
+function bitnotBool(Bool x) pure returns (Bool) {
+    return Bool.wrap(!Bool.unwrap(x));
+}
+
+contract C {
+    function testIntBinary() public pure {
+        assert(Int8.unwrap(Int8.wrap(1) | Int8.wrap(2)) == 3);
+        assert(Int16.unwrap(Int16.wrap(1) | Int16.wrap(2)) == 3);
+        assert(Int24.unwrap(Int24.wrap(1) | Int24.wrap(2)) == 3);
+        assert(Int32.unwrap(Int32.wrap(1) | Int32.wrap(2)) == 3);
+        assert(Int40.unwrap(Int40.wrap(1) | Int40.wrap(2)) == 3);
+        assert(Int48.unwrap(Int48.wrap(1) | Int48.wrap(2)) == 3);
+        assert(Int56.unwrap(Int56.wrap(1) | Int56.wrap(2)) == 3);
+        assert(Int64.unwrap(Int64.wrap(1) | Int64.wrap(2)) == 3);
+        assert(Int72.unwrap(Int72.wrap(1) | Int72.wrap(2)) == 3);
+        assert(Int80.unwrap(Int80.wrap(1) | Int80.wrap(2)) == 3);
+        assert(Int88.unwrap(Int88.wrap(1) | Int88.wrap(2)) == 3);
+        assert(Int96.unwrap(Int96.wrap(1) | Int96.wrap(2)) == 3);
+        assert(Int104.unwrap(Int104.wrap(1) | Int104.wrap(2)) == 3);
+        assert(Int112.unwrap(Int112.wrap(1) | Int112.wrap(2)) == 3);
+        assert(Int120.unwrap(Int120.wrap(1) | Int120.wrap(2)) == 3);
+        assert(Int128.unwrap(Int128.wrap(1) | Int128.wrap(2)) == 3);
+        assert(Int136.unwrap(Int136.wrap(1) | Int136.wrap(2)) == 3);
+        assert(Int144.unwrap(Int144.wrap(1) | Int144.wrap(2)) == 3);
+        assert(Int152.unwrap(Int152.wrap(1) | Int152.wrap(2)) == 3);
+        assert(Int160.unwrap(Int160.wrap(1) | Int160.wrap(2)) == 3);
+        assert(Int168.unwrap(Int168.wrap(1) | Int168.wrap(2)) == 3);
+        assert(Int176.unwrap(Int176.wrap(1) | Int176.wrap(2)) == 3);
+        assert(Int184.unwrap(Int184.wrap(1) | Int184.wrap(2)) == 3);
+        assert(Int192.unwrap(Int192.wrap(1) | Int192.wrap(2)) == 3);
+        assert(Int200.unwrap(Int200.wrap(1) | Int200.wrap(2)) == 3);
+        assert(Int208.unwrap(Int208.wrap(1) | Int208.wrap(2)) == 3);
+        assert(Int216.unwrap(Int216.wrap(1) | Int216.wrap(2)) == 3);
+        assert(Int224.unwrap(Int224.wrap(1) | Int224.wrap(2)) == 3);
+        assert(Int232.unwrap(Int232.wrap(1) | Int232.wrap(2)) == 3);
+        assert(Int240.unwrap(Int240.wrap(1) | Int240.wrap(2)) == 3);
+        assert(Int248.unwrap(Int248.wrap(1) | Int248.wrap(2)) == 3);
+        assert(Int256.unwrap(Int256.wrap(1) | Int256.wrap(2)) == 3);
+        assert(Int.unwrap(Int.wrap(1) | Int.wrap(2)) == 3);
+    }
+
+    function testIntUnary() public pure {
+        assert(Int8.unwrap(-Int8.wrap(1)) == -1);
+        assert(Int16.unwrap(-Int16.wrap(1)) == -1);
+        assert(Int24.unwrap(-Int24.wrap(1)) == -1);
+        assert(Int32.unwrap(-Int32.wrap(1)) == -1);
+        assert(Int40.unwrap(-Int40.wrap(1)) == -1);
+        assert(Int48.unwrap(-Int48.wrap(1)) == -1);
+        assert(Int56.unwrap(-Int56.wrap(1)) == -1);
+        assert(Int64.unwrap(-Int64.wrap(1)) == -1);
+        assert(Int72.unwrap(-Int72.wrap(1)) == -1);
+        assert(Int80.unwrap(-Int80.wrap(1)) == -1);
+        assert(Int88.unwrap(-Int88.wrap(1)) == -1);
+        assert(Int96.unwrap(-Int96.wrap(1)) == -1);
+        assert(Int104.unwrap(-Int104.wrap(1)) == -1);
+        assert(Int112.unwrap(-Int112.wrap(1)) == -1);
+        assert(Int120.unwrap(-Int120.wrap(1)) == -1);
+        assert(Int128.unwrap(-Int128.wrap(1)) == -1);
+        assert(Int136.unwrap(-Int136.wrap(1)) == -1);
+        assert(Int144.unwrap(-Int144.wrap(1)) == -1);
+        assert(Int152.unwrap(-Int152.wrap(1)) == -1);
+        assert(Int160.unwrap(-Int160.wrap(1)) == -1);
+        assert(Int168.unwrap(-Int168.wrap(1)) == -1);
+        assert(Int176.unwrap(-Int176.wrap(1)) == -1);
+        assert(Int184.unwrap(-Int184.wrap(1)) == -1);
+        assert(Int192.unwrap(-Int192.wrap(1)) == -1);
+        assert(Int200.unwrap(-Int200.wrap(1)) == -1);
+        assert(Int208.unwrap(-Int208.wrap(1)) == -1);
+        assert(Int216.unwrap(-Int216.wrap(1)) == -1);
+        assert(Int224.unwrap(-Int224.wrap(1)) == -1);
+        assert(Int232.unwrap(-Int232.wrap(1)) == -1);
+        assert(Int240.unwrap(-Int240.wrap(1)) == -1);
+        assert(Int248.unwrap(-Int248.wrap(1)) == -1);
+        assert(Int256.unwrap(-Int256.wrap(1)) == -1);
+        assert(Int.unwrap(-Int.wrap(1)) == -1);
+    }
+
+    function testUintBinary() public pure {
+        assert(Uint8.unwrap(Uint8.wrap(1) | Uint8.wrap(2)) == 3);
+        assert(Uint16.unwrap(Uint16.wrap(1) | Uint16.wrap(2)) == 3);
+        assert(Uint24.unwrap(Uint24.wrap(1) | Uint24.wrap(2)) == 3);
+        assert(Uint32.unwrap(Uint32.wrap(1) | Uint32.wrap(2)) == 3);
+        assert(Uint40.unwrap(Uint40.wrap(1) | Uint40.wrap(2)) == 3);
+        assert(Uint48.unwrap(Uint48.wrap(1) | Uint48.wrap(2)) == 3);
+        assert(Uint56.unwrap(Uint56.wrap(1) | Uint56.wrap(2)) == 3);
+        assert(Uint64.unwrap(Uint64.wrap(1) | Uint64.wrap(2)) == 3);
+        assert(Uint72.unwrap(Uint72.wrap(1) | Uint72.wrap(2)) == 3);
+        assert(Uint80.unwrap(Uint80.wrap(1) | Uint80.wrap(2)) == 3);
+        assert(Uint88.unwrap(Uint88.wrap(1) | Uint88.wrap(2)) == 3);
+        assert(Uint96.unwrap(Uint96.wrap(1) | Uint96.wrap(2)) == 3);
+        assert(Uint104.unwrap(Uint104.wrap(1) | Uint104.wrap(2)) == 3);
+        assert(Uint112.unwrap(Uint112.wrap(1) | Uint112.wrap(2)) == 3);
+        assert(Uint120.unwrap(Uint120.wrap(1) | Uint120.wrap(2)) == 3);
+        assert(Uint128.unwrap(Uint128.wrap(1) | Uint128.wrap(2)) == 3);
+        assert(Uint136.unwrap(Uint136.wrap(1) | Uint136.wrap(2)) == 3);
+        assert(Uint144.unwrap(Uint144.wrap(1) | Uint144.wrap(2)) == 3);
+        assert(Uint152.unwrap(Uint152.wrap(1) | Uint152.wrap(2)) == 3);
+        assert(Uint160.unwrap(Uint160.wrap(1) | Uint160.wrap(2)) == 3);
+        assert(Uint168.unwrap(Uint168.wrap(1) | Uint168.wrap(2)) == 3);
+        assert(Uint176.unwrap(Uint176.wrap(1) | Uint176.wrap(2)) == 3);
+        assert(Uint184.unwrap(Uint184.wrap(1) | Uint184.wrap(2)) == 3);
+        assert(Uint192.unwrap(Uint192.wrap(1) | Uint192.wrap(2)) == 3);
+        assert(Uint200.unwrap(Uint200.wrap(1) | Uint200.wrap(2)) == 3);
+        assert(Uint208.unwrap(Uint208.wrap(1) | Uint208.wrap(2)) == 3);
+        assert(Uint216.unwrap(Uint216.wrap(1) | Uint216.wrap(2)) == 3);
+        assert(Uint224.unwrap(Uint224.wrap(1) | Uint224.wrap(2)) == 3);
+        assert(Uint232.unwrap(Uint232.wrap(1) | Uint232.wrap(2)) == 3);
+        assert(Uint240.unwrap(Uint240.wrap(1) | Uint240.wrap(2)) == 3);
+        assert(Uint248.unwrap(Uint248.wrap(1) | Uint248.wrap(2)) == 3);
+        assert(Uint256.unwrap(Uint256.wrap(1) | Uint256.wrap(2)) == 3);
+        assert(Uint.unwrap(Uint.wrap(1) | Uint.wrap(2)) == 3);
+    }
+
+    function testUintUnary() public pure {
+        assert(Uint8.unwrap(~Uint8.wrap(1)) == ~uint8(1));
+        assert(Uint16.unwrap(~Uint16.wrap(1)) == ~uint16(1));
+        assert(Uint24.unwrap(~Uint24.wrap(1)) == ~uint24(1));
+        assert(Uint32.unwrap(~Uint32.wrap(1)) == ~uint32(1));
+        assert(Uint40.unwrap(~Uint40.wrap(1)) == ~uint40(1));
+        assert(Uint48.unwrap(~Uint48.wrap(1)) == ~uint48(1));
+        assert(Uint56.unwrap(~Uint56.wrap(1)) == ~uint56(1));
+        assert(Uint64.unwrap(~Uint64.wrap(1)) == ~uint64(1));
+        assert(Uint72.unwrap(~Uint72.wrap(1)) == ~uint72(1));
+        assert(Uint80.unwrap(~Uint80.wrap(1)) == ~uint80(1));
+        assert(Uint88.unwrap(~Uint88.wrap(1)) == ~uint88(1));
+        assert(Uint96.unwrap(~Uint96.wrap(1)) == ~uint96(1));
+        assert(Uint104.unwrap(~Uint104.wrap(1)) == ~uint104(1));
+        assert(Uint112.unwrap(~Uint112.wrap(1)) == ~uint112(1));
+        assert(Uint120.unwrap(~Uint120.wrap(1)) == ~uint120(1));
+        assert(Uint128.unwrap(~Uint128.wrap(1)) == ~uint128(1));
+        assert(Uint136.unwrap(~Uint136.wrap(1)) == ~uint136(1));
+        assert(Uint144.unwrap(~Uint144.wrap(1)) == ~uint144(1));
+        assert(Uint152.unwrap(~Uint152.wrap(1)) == ~uint152(1));
+        assert(Uint160.unwrap(~Uint160.wrap(1)) == ~uint160(1));
+        assert(Uint168.unwrap(~Uint168.wrap(1)) == ~uint168(1));
+        assert(Uint176.unwrap(~Uint176.wrap(1)) == ~uint176(1));
+        assert(Uint184.unwrap(~Uint184.wrap(1)) == ~uint184(1));
+        assert(Uint192.unwrap(~Uint192.wrap(1)) == ~uint192(1));
+        assert(Uint200.unwrap(~Uint200.wrap(1)) == ~uint200(1));
+        assert(Uint208.unwrap(~Uint208.wrap(1)) == ~uint208(1));
+        assert(Uint216.unwrap(~Uint216.wrap(1)) == ~uint216(1));
+        assert(Uint224.unwrap(~Uint224.wrap(1)) == ~uint224(1));
+        assert(Uint232.unwrap(~Uint232.wrap(1)) == ~uint232(1));
+        assert(Uint240.unwrap(~Uint240.wrap(1)) == ~uint240(1));
+        assert(Uint248.unwrap(~Uint248.wrap(1)) == ~uint248(1));
+        assert(Uint256.unwrap(~Uint256.wrap(1)) == ~uint256(1));
+        assert(Uint.unwrap(~Uint.wrap(1)) == ~uint(1));
+    }
+
+    function testBytesBinary() public pure {
+        assert(Bytes1.unwrap(Bytes1.wrap(0x01) | Bytes1.wrap(0x02)) == bytes1(0x03));
+        assert(Bytes2.unwrap(Bytes2.wrap(bytes2(bytes1(0x01))) | Bytes2.wrap(bytes2(bytes1(0x02)))) == bytes2(bytes1(0x03)));
+        assert(Bytes3.unwrap(Bytes3.wrap(bytes3(bytes1(0x01))) | Bytes3.wrap(bytes3(bytes1(0x02)))) == bytes3(bytes1(0x03)));
+        assert(Bytes4.unwrap(Bytes4.wrap(bytes4(bytes1(0x01))) | Bytes4.wrap(bytes4(bytes1(0x02)))) == bytes4(bytes1(0x03)));
+        assert(Bytes5.unwrap(Bytes5.wrap(bytes5(bytes1(0x01))) | Bytes5.wrap(bytes5(bytes1(0x02)))) == bytes5(bytes1(0x03)));
+        assert(Bytes6.unwrap(Bytes6.wrap(bytes6(bytes1(0x01))) | Bytes6.wrap(bytes6(bytes1(0x02)))) == bytes6(bytes1(0x03)));
+        assert(Bytes7.unwrap(Bytes7.wrap(bytes7(bytes1(0x01))) | Bytes7.wrap(bytes7(bytes1(0x02)))) == bytes7(bytes1(0x03)));
+        assert(Bytes8.unwrap(Bytes8.wrap(bytes8(bytes1(0x01))) | Bytes8.wrap(bytes8(bytes1(0x02)))) == bytes8(bytes1(0x03)));
+        assert(Bytes9.unwrap(Bytes9.wrap(bytes9(bytes1(0x01))) | Bytes9.wrap(bytes9(bytes1(0x02)))) == bytes9(bytes1(0x03)));
+        assert(Bytes10.unwrap(Bytes10.wrap(bytes10(bytes1(0x01))) | Bytes10.wrap(bytes10(bytes1(0x02)))) == bytes10(bytes1(0x03)));
+        assert(Bytes11.unwrap(Bytes11.wrap(bytes11(bytes1(0x01))) | Bytes11.wrap(bytes11(bytes1(0x02)))) == bytes11(bytes1(0x03)));
+        assert(Bytes12.unwrap(Bytes12.wrap(bytes12(bytes1(0x01))) | Bytes12.wrap(bytes12(bytes1(0x02)))) == bytes12(bytes1(0x03)));
+        assert(Bytes13.unwrap(Bytes13.wrap(bytes13(bytes1(0x01))) | Bytes13.wrap(bytes13(bytes1(0x02)))) == bytes13(bytes1(0x03)));
+        assert(Bytes14.unwrap(Bytes14.wrap(bytes14(bytes1(0x01))) | Bytes14.wrap(bytes14(bytes1(0x02)))) == bytes14(bytes1(0x03)));
+        assert(Bytes15.unwrap(Bytes15.wrap(bytes15(bytes1(0x01))) | Bytes15.wrap(bytes15(bytes1(0x02)))) == bytes15(bytes1(0x03)));
+        assert(Bytes16.unwrap(Bytes16.wrap(bytes16(bytes1(0x01))) | Bytes16.wrap(bytes16(bytes1(0x02)))) == bytes16(bytes1(0x03)));
+        assert(Bytes17.unwrap(Bytes17.wrap(bytes17(bytes1(0x01))) | Bytes17.wrap(bytes17(bytes1(0x02)))) == bytes17(bytes1(0x03)));
+        assert(Bytes18.unwrap(Bytes18.wrap(bytes18(bytes1(0x01))) | Bytes18.wrap(bytes18(bytes1(0x02)))) == bytes18(bytes1(0x03)));
+        assert(Bytes19.unwrap(Bytes19.wrap(bytes19(bytes1(0x01))) | Bytes19.wrap(bytes19(bytes1(0x02)))) == bytes19(bytes1(0x03)));
+        assert(Bytes20.unwrap(Bytes20.wrap(bytes20(bytes1(0x01))) | Bytes20.wrap(bytes20(bytes1(0x02)))) == bytes20(bytes1(0x03)));
+        assert(Bytes21.unwrap(Bytes21.wrap(bytes21(bytes1(0x01))) | Bytes21.wrap(bytes21(bytes1(0x02)))) == bytes21(bytes1(0x03)));
+        assert(Bytes22.unwrap(Bytes22.wrap(bytes22(bytes1(0x01))) | Bytes22.wrap(bytes22(bytes1(0x02)))) == bytes22(bytes1(0x03)));
+        assert(Bytes23.unwrap(Bytes23.wrap(bytes23(bytes1(0x01))) | Bytes23.wrap(bytes23(bytes1(0x02)))) == bytes23(bytes1(0x03)));
+        assert(Bytes24.unwrap(Bytes24.wrap(bytes24(bytes1(0x01))) | Bytes24.wrap(bytes24(bytes1(0x02)))) == bytes24(bytes1(0x03)));
+        assert(Bytes25.unwrap(Bytes25.wrap(bytes25(bytes1(0x01))) | Bytes25.wrap(bytes25(bytes1(0x02)))) == bytes25(bytes1(0x03)));
+        assert(Bytes26.unwrap(Bytes26.wrap(bytes26(bytes1(0x01))) | Bytes26.wrap(bytes26(bytes1(0x02)))) == bytes26(bytes1(0x03)));
+        assert(Bytes27.unwrap(Bytes27.wrap(bytes27(bytes1(0x01))) | Bytes27.wrap(bytes27(bytes1(0x02)))) == bytes27(bytes1(0x03)));
+        assert(Bytes28.unwrap(Bytes28.wrap(bytes28(bytes1(0x01))) | Bytes28.wrap(bytes28(bytes1(0x02)))) == bytes28(bytes1(0x03)));
+        assert(Bytes29.unwrap(Bytes29.wrap(bytes29(bytes1(0x01))) | Bytes29.wrap(bytes29(bytes1(0x02)))) == bytes29(bytes1(0x03)));
+        assert(Bytes30.unwrap(Bytes30.wrap(bytes30(bytes1(0x01))) | Bytes30.wrap(bytes30(bytes1(0x02)))) == bytes30(bytes1(0x03)));
+        assert(Bytes31.unwrap(Bytes31.wrap(bytes31(bytes1(0x01))) | Bytes31.wrap(bytes31(bytes1(0x02)))) == bytes31(bytes1(0x03)));
+        assert(Bytes32.unwrap(Bytes32.wrap(bytes32(bytes1(0x01))) | Bytes32.wrap(bytes32(bytes1(0x02)))) == bytes32(bytes1(0x03)));
+    }
+
+    function testBytesUnary() public pure {
+        assert(Bytes1.unwrap(~Bytes1.wrap(bytes1(0x01))) == ~bytes1(0x01));
+        assert(Bytes2.unwrap(~Bytes2.wrap(bytes2(bytes1(0x01)))) == ~bytes2(bytes1(0x01)));
+        assert(Bytes3.unwrap(~Bytes3.wrap(bytes3(bytes1(0x01)))) == ~bytes3(bytes1(0x01)));
+        assert(Bytes4.unwrap(~Bytes4.wrap(bytes4(bytes1(0x01)))) == ~bytes4(bytes1(0x01)));
+        assert(Bytes5.unwrap(~Bytes5.wrap(bytes5(bytes1(0x01)))) == ~bytes5(bytes1(0x01)));
+        assert(Bytes6.unwrap(~Bytes6.wrap(bytes6(bytes1(0x01)))) == ~bytes6(bytes1(0x01)));
+        assert(Bytes7.unwrap(~Bytes7.wrap(bytes7(bytes1(0x01)))) == ~bytes7(bytes1(0x01)));
+        assert(Bytes8.unwrap(~Bytes8.wrap(bytes8(bytes1(0x01)))) == ~bytes8(bytes1(0x01)));
+        assert(Bytes9.unwrap(~Bytes9.wrap(bytes9(bytes1(0x01)))) == ~bytes9(bytes1(0x01)));
+        assert(Bytes10.unwrap(~Bytes10.wrap(bytes10(bytes1(0x01)))) == ~bytes10(bytes1(0x01)));
+        assert(Bytes11.unwrap(~Bytes11.wrap(bytes11(bytes1(0x01)))) == ~bytes11(bytes1(0x01)));
+        assert(Bytes12.unwrap(~Bytes12.wrap(bytes12(bytes1(0x01)))) == ~bytes12(bytes1(0x01)));
+        assert(Bytes13.unwrap(~Bytes13.wrap(bytes13(bytes1(0x01)))) == ~bytes13(bytes1(0x01)));
+        assert(Bytes14.unwrap(~Bytes14.wrap(bytes14(bytes1(0x01)))) == ~bytes14(bytes1(0x01)));
+        assert(Bytes15.unwrap(~Bytes15.wrap(bytes15(bytes1(0x01)))) == ~bytes15(bytes1(0x01)));
+        assert(Bytes16.unwrap(~Bytes16.wrap(bytes16(bytes1(0x01)))) == ~bytes16(bytes1(0x01)));
+        assert(Bytes17.unwrap(~Bytes17.wrap(bytes17(bytes1(0x01)))) == ~bytes17(bytes1(0x01)));
+        assert(Bytes18.unwrap(~Bytes18.wrap(bytes18(bytes1(0x01)))) == ~bytes18(bytes1(0x01)));
+        assert(Bytes19.unwrap(~Bytes19.wrap(bytes19(bytes1(0x01)))) == ~bytes19(bytes1(0x01)));
+        assert(Bytes20.unwrap(~Bytes20.wrap(bytes20(bytes1(0x01)))) == ~bytes20(bytes1(0x01)));
+        assert(Bytes21.unwrap(~Bytes21.wrap(bytes21(bytes1(0x01)))) == ~bytes21(bytes1(0x01)));
+        assert(Bytes22.unwrap(~Bytes22.wrap(bytes22(bytes1(0x01)))) == ~bytes22(bytes1(0x01)));
+        assert(Bytes23.unwrap(~Bytes23.wrap(bytes23(bytes1(0x01)))) == ~bytes23(bytes1(0x01)));
+        assert(Bytes24.unwrap(~Bytes24.wrap(bytes24(bytes1(0x01)))) == ~bytes24(bytes1(0x01)));
+        assert(Bytes25.unwrap(~Bytes25.wrap(bytes25(bytes1(0x01)))) == ~bytes25(bytes1(0x01)));
+        assert(Bytes26.unwrap(~Bytes26.wrap(bytes26(bytes1(0x01)))) == ~bytes26(bytes1(0x01)));
+        assert(Bytes27.unwrap(~Bytes27.wrap(bytes27(bytes1(0x01)))) == ~bytes27(bytes1(0x01)));
+        assert(Bytes28.unwrap(~Bytes28.wrap(bytes28(bytes1(0x01)))) == ~bytes28(bytes1(0x01)));
+        assert(Bytes29.unwrap(~Bytes29.wrap(bytes29(bytes1(0x01)))) == ~bytes29(bytes1(0x01)));
+        assert(Bytes30.unwrap(~Bytes30.wrap(bytes30(bytes1(0x01)))) == ~bytes30(bytes1(0x01)));
+        assert(Bytes31.unwrap(~Bytes31.wrap(bytes31(bytes1(0x01)))) == ~bytes31(bytes1(0x01)));
+        assert(Bytes32.unwrap(~Bytes32.wrap(bytes32(bytes1(0x01)))) == ~bytes32(bytes1(0x01)));
+    }
+
+    function testOtherBinary() public pure {
+        assert(Address.unwrap(Address.wrap(address(0x01)) | Address.wrap(address(0x02))) == address(0x03));
+        assert(AddressPayable.unwrap(AddressPayable.wrap(payable(address(0x01))) | AddressPayable.wrap(payable(address(0x02)))) == payable(address(0x03)));
+        assert(Bool.unwrap(~Bool.wrap(true)) == false);
+    }
+
+    function testOtherUnary() public pure {
+        assert(Address.unwrap(~Address.wrap(address(0))) == address(~bytes20(0)));
+        assert(AddressPayable.unwrap(~AddressPayable.wrap(payable(address(0)))) == payable(address(~bytes20(0))));
+        assert(Bool.unwrap(~Bool.wrap(true)) == false);
+    }
+}
+// ----
+// testIntBinary() ->
+// testIntUnary() ->
+// testUintBinary() ->
+// testUintUnary() ->
+// testBytesBinary() ->
+// testBytesUnary() ->
+// testOtherBinary() ->
+// testOtherUnary() ->
diff --git a/test/libsolidity/semanticTests/operators/userDefined/attaching_and_defining_operator_with_same_function.sol b/test/libsolidity/semanticTests/operators/userDefined/attaching_and_defining_operator_with_same_function.sol
new file mode 100644
index 0000000000..6f03238690
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/attaching_and_defining_operator_with_same_function.sol
@@ -0,0 +1,20 @@
+type Int is int16;
+
+using {add as +, add} for Int global;
+
+function add(Int _a, Int _b) pure returns (Int) {
+    return Int.wrap(Int.unwrap(_a) + Int.unwrap(_b));
+}
+
+contract C {
+    function f() pure public returns (Int) {
+        return Int.wrap(5) + Int.wrap(5);
+    }
+
+    function g() pure public returns (Int) {
+        return Int.wrap(7).add(Int.wrap(6));
+    }
+}
+// ----
+// f() -> 10
+// g() -> 13
diff --git a/test/libsolidity/semanticTests/operators/userDefined/checked_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/checked_operators.sol
new file mode 100644
index 0000000000..599e894b2e
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/checked_operators.sol
@@ -0,0 +1,22 @@
+type U8 is uint8;
+
+function checkedAdd(U8 x, U8 y) pure returns (U8) {
+    return U8.wrap(U8.unwrap(x) + U8.unwrap(y));
+}
+
+using {checkedAdd as +} for U8 global;
+
+contract C {
+    function testCheckedOperator() public pure returns (U8) {
+        return U8.wrap(250) + U8.wrap(10);
+    }
+
+    function testCheckedOperatorInUncheckedBlock() public pure returns (U8) {
+        unchecked {
+            return U8.wrap(250) + U8.wrap(10);
+        }
+    }
+}
+// ----
+// testCheckedOperator() -> FAILURE, hex"4e487b71", 0x11
+// testCheckedOperatorInUncheckedBlock() -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/operators/userDefined/consecutive_operator_invocations.sol b/test/libsolidity/semanticTests/operators/userDefined/consecutive_operator_invocations.sol
new file mode 100644
index 0000000000..ef36294a6a
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/consecutive_operator_invocations.sol
@@ -0,0 +1,18 @@
+type A is address;
+
+using {add as +} for A global;
+
+function add(A a, A b) pure returns (A) {
+    return A.wrap(address(uint160(A.unwrap(a)) + uint160(A.unwrap(b))));
+}
+
+contract C {
+    function g() public pure returns (A) {
+        A a = A.wrap(0x3333333333333333333333333333333333333333);
+        A b = A.wrap(0x1111111111111111111111111111111111111111);
+        A c = A.wrap(0x5555555555555555555555555555555555555555);
+        return a + b + c;
+    }
+}
+// ----
+// g() -> 0x9999999999999999999999999999999999999999
diff --git a/test/libsolidity/semanticTests/operators/userDefined/fixed_point_udvt_with_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/fixed_point_udvt_with_operators.sol
new file mode 100644
index 0000000000..6f17b16eb3
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/fixed_point_udvt_with_operators.sol
@@ -0,0 +1,22 @@
+type Fixed is int128;
+using {add as +, mul as *} for Fixed global;
+
+int constant MULTIPLIER = 10**18;
+
+function add(Fixed a, Fixed b) pure returns (Fixed) {
+    return Fixed.wrap(Fixed.unwrap(a) + Fixed.unwrap(b));
+}
+
+function mul(Fixed a, Fixed b) pure returns (Fixed) {
+    int intermediate = (int(Fixed.unwrap(a)) * int(Fixed.unwrap(b))) / MULTIPLIER;
+    if (int128(intermediate) != intermediate) { revert("Overflow"); }
+    return Fixed.wrap(int128(intermediate));
+}
+
+contract C {
+    function applyInterest(Fixed value, Fixed percentage) public pure returns (Fixed result) {
+        return value + value * percentage;
+    }
+}
+// ----
+// applyInterest(int128,int128): 500000000000000000000, 100000000000000000 -> 550000000000000000000
diff --git a/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_different_types_different_functions_separate_directives.sol b/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_different_types_different_functions_separate_directives.sol
new file mode 100644
index 0000000000..0b2d740a6d
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_different_types_different_functions_separate_directives.sol
@@ -0,0 +1,26 @@
+type SmallInt is int;
+type BigInt is int;
+
+using {addSmall as +} for SmallInt global;
+using {addBig as +} for BigInt global;
+
+function addSmall(SmallInt a, SmallInt b) pure returns (SmallInt) {
+    return SmallInt.wrap(SmallInt.unwrap(a) + SmallInt.unwrap(b));
+}
+
+function addBig(BigInt a, BigInt b) pure returns (BigInt) {
+    return BigInt.wrap(10 * (BigInt.unwrap(a) + BigInt.unwrap(b)));
+}
+
+contract C {
+    function small() public pure returns (SmallInt) {
+        return SmallInt.wrap(1) + SmallInt.wrap(2);
+    }
+
+    function big() public pure returns (BigInt) {
+        return BigInt.wrap(3) + BigInt.wrap(4);
+    }
+}
+// ----
+// small() -> 3
+// big() -> 70
diff --git a/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_same_type_same_function_same_directive.sol b/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_same_type_same_function_same_directive.sol
new file mode 100644
index 0000000000..3085d8e893
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/multiple_operator_definitions_same_type_same_function_same_directive.sol
@@ -0,0 +1,20 @@
+type Int is int32;
+
+using {foo as +, foo as -} for Int global;
+
+function foo(Int a, Int b) pure returns(Int) {
+    return Int.wrap(Int.unwrap(a) + Int.unwrap(b));
+}
+
+contract C {
+    function f() pure public returns (Int) {
+        return Int.wrap(2) + Int.wrap(3);
+    }
+
+    function g() pure public returns (Int) {
+        return Int.wrap(6) - Int.wrap(1);
+    }
+}
+// ----
+// f() -> 5
+// g() -> 7
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_definition_shadowing_builtin_keccak256.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_definition_shadowing_builtin_keccak256.sol
new file mode 100644
index 0000000000..a26a750cde
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_definition_shadowing_builtin_keccak256.sol
@@ -0,0 +1,15 @@
+type Int is int16;
+
+using {keccak256 as +} for Int global;
+
+function keccak256(Int a, Int b) pure returns (Int) {
+    return Int.wrap(Int.unwrap(a) + Int.unwrap(b));
+}
+
+contract C {
+    function test() public returns (Int) {
+        return Int.wrap(3) + Int.wrap(4);
+    }
+}
+// ----
+// test() -> 7
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_evaluation_order.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_evaluation_order.sol
new file mode 100644
index 0000000000..781f21d167
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_evaluation_order.sol
@@ -0,0 +1,83 @@
+type Bool is bool;
+using {add as +, mul as *, unsub as -} for Bool global;
+
+function add(Bool x, Bool y) pure returns (Bool) {
+    return Bool.wrap(Bool.unwrap(x) || Bool.unwrap(y));
+}
+
+function mul(Bool x, Bool y) pure returns (Bool) {
+    return Bool.wrap(Bool.unwrap(x) && Bool.unwrap(y));
+}
+
+function unsub(Bool x) pure returns (Bool) {
+    return Bool.wrap(!Bool.unwrap(x));
+}
+
+contract C {
+    event Wrapped(uint);
+    event Probe(Bool);
+
+    function toBool(uint x) public returns (Bool) {
+        emit Wrapped(x);
+        return Bool.wrap(x > 0);
+    }
+
+    function probe(Bool x) public returns (Bool) {
+        emit Probe(x);
+        return x;
+    }
+
+    function testSingleOperator() public {
+        toBool(0) +
+        (toBool(1) + toBool(2)) +
+        toBool(3);
+    }
+
+    function testTwoBinaryOperators() public {
+        toBool(0) * toBool(1) +
+        (toBool(2) * toBool(3)) +
+        toBool(4) * toBool(5);
+    }
+
+    function testBinaryAndUnaryOperators() public {
+        -toBool(0) * -toBool(1) +
+        (-toBool(2) * -toBool(3)) +
+        -toBool(4) * -toBool(5);
+    }
+
+    function testOperatorsNestedInCalls() public {
+        -probe(toBool(0) * -toBool(1)) +
+        (-probe(toBool(2) * -toBool(3))) +
+        -probe(toBool(4) * -toBool(5));
+    }
+}
+// ----
+// testSingleOperator() ->
+// ~ emit Wrapped(uint256): 0x00
+// ~ emit Wrapped(uint256): 0x01
+// ~ emit Wrapped(uint256): 0x02
+// ~ emit Wrapped(uint256): 0x03
+// testTwoBinaryOperators() ->
+// ~ emit Wrapped(uint256): 0x00
+// ~ emit Wrapped(uint256): 0x01
+// ~ emit Wrapped(uint256): 0x02
+// ~ emit Wrapped(uint256): 0x03
+// ~ emit Wrapped(uint256): 0x04
+// ~ emit Wrapped(uint256): 0x05
+// testBinaryAndUnaryOperators() ->
+// ~ emit Wrapped(uint256): 0x00
+// ~ emit Wrapped(uint256): 0x01
+// ~ emit Wrapped(uint256): 0x02
+// ~ emit Wrapped(uint256): 0x03
+// ~ emit Wrapped(uint256): 0x04
+// ~ emit Wrapped(uint256): 0x05
+// testOperatorsNestedInCalls() ->
+// ~ emit Wrapped(uint256): 0x00
+// ~ emit Wrapped(uint256): 0x01
+// ~ emit Probe(bool): 0x00
+// ~ emit Wrapped(uint256): 0x02
+// ~ emit Wrapped(uint256): 0x03
+// ~ emit Probe(bool): 0x00
+// ~ emit Wrapped(uint256): 0x04
+// ~ emit Wrapped(uint256): 0x05
+// ~ emit Probe(bool): 0x00
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
new file mode 100644
index 0000000000..0f95d2cda7
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
@@ -0,0 +1,61 @@
+type Int32 is int32;
+using {add as +, unsub as -} for Int32 global;
+
+function add(Int32 x, Int32 y) pure returns (Int32) {
+    return loadAdder().mul(x, y);
+}
+
+function unsub(Int32 x) pure returns (Int32) {
+    return loadAdder().inc(x);
+}
+
+interface IAdder {
+    function mul(Int32, Int32) external pure returns (Int32);
+    function inc(Int32) external pure returns (Int32);
+}
+
+contract Adder is IAdder {
+    function mul(Int32 x, Int32 y) external pure override returns (Int32) {
+        return Int32.wrap(Int32.unwrap(x) * Int32.unwrap(y));
+    }
+
+    function inc(Int32 x) external pure override returns (Int32) {
+        return Int32.wrap(Int32.unwrap(x) + 1);
+    }
+}
+
+function storeAdder(IAdder adder) pure {
+    assembly {
+        // This test would also work without assembly if we could hard-code an address here.
+        mstore(0, adder)
+    }
+}
+
+function loadAdder() pure returns (IAdder adder) {
+    assembly {
+        adder := mload(0)
+    }
+}
+
+contract C {
+    function testMul(Int32 x, Int32 y) public returns (Int32) {
+        storeAdder(new Adder());
+
+        return x + y;
+    }
+
+    function testInc(Int32 x) public returns (Int32) {
+        storeAdder(new Adder());
+
+        return -x;
+    }
+}
+// ----
+// testMul(int32,int32): 42, 10 -> 420
+// gas irOptimized: 103347
+// gas legacy: 188203
+// gas legacyOptimized: 126164
+// testInc(int32): 42 -> 43
+// gas irOptimized: 103173
+// gas legacy: 187452
+// gas legacyOptimized: 125851
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
new file mode 100644
index 0000000000..1d51576e81
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
@@ -0,0 +1,67 @@
+type Int32 is int32;
+using {add as +, unsub as -} for Int32 global;
+
+function add(Int32 x, Int32 y) pure returns (Int32) {
+    return loadAdder().mul(x, y);
+}
+
+function unsub(Int32 x) pure returns (Int32) {
+    return loadAdder().inc(x);
+}
+
+interface IAdderPure {
+    function mul(Int32, Int32) external pure returns (Int32);
+    function inc(Int32) external pure returns (Int32);
+}
+
+interface IAdderView {
+    function mul(Int32, Int32) external view returns (Int32);
+    function inc(Int32) external view returns (Int32);
+}
+
+contract Adder is IAdderView {
+    function mul(Int32 x, Int32 y) external view override returns (Int32) {
+        return Int32.wrap(Int32.unwrap(x) * Int32.unwrap(y));
+    }
+
+    function inc(Int32 x) external view override returns (Int32) {
+        return Int32.wrap(Int32.unwrap(x) + 1);
+    }
+}
+
+function storeAdder(IAdderView adder) pure {
+    assembly {
+        // This test would also work without assembly if we could hard-code an address here.
+        mstore(0, adder)
+    }
+}
+
+function loadAdder() pure returns (IAdderPure adder) {
+    assembly {
+        // The adder we stored is view but we cheat by using a modified version with pure functions
+        adder := mload(0)
+    }
+}
+
+contract C {
+    function testMul(Int32 x, Int32 y) public returns (Int32) {
+        storeAdder(new Adder());
+
+        return x + y;
+    }
+
+    function testInc(Int32 x) public returns (Int32) {
+        storeAdder(new Adder());
+
+        return -x;
+    }
+}
+// ----
+// testMul(int32,int32): 42, 10 -> 420
+// gas irOptimized: 103347
+// gas legacy: 188203
+// gas legacyOptimized: 126164
+// testInc(int32): 42 -> 43
+// gas irOptimized: 103173
+// gas legacy: 187452
+// gas legacyOptimized: 125851
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_cleanup.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_cleanup.sol
new file mode 100644
index 0000000000..fe37a0e12c
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_cleanup.sol
@@ -0,0 +1,40 @@
+type U8 is uint8;
+using {f as ~, add as +} for U8 global;
+
+function f(U8 x) pure returns (U8 z) {
+    assembly {
+        // NOTE: Not using shr so that the test works pre-constantinople too
+        z := div(x, 256)
+    }
+}
+
+function add(U8 x, U8 y) pure returns (U8 z) {
+    assembly {
+        z := add(div(x, 256), div(x, 256))
+    }
+}
+
+contract C {
+    function testUnary() external pure returns (U8, U8) {
+        U8 a;
+        assembly {
+            a := 0x4200
+        }
+        // If the result is not 0, no cleanup was performed.
+        return (~a, f(a));
+    }
+
+    function testBinary() external pure returns (U8, U8) {
+        U8 a;
+        U8 b;
+        assembly {
+            a := 0x4200
+            b := 0x4200
+        }
+        // If the result is not 0, no cleanup was performed.
+        return (a + b, add(a, b));
+    }
+}
+// ----
+// testUnary() -> 0x42, 0x42
+// testBinary() -> 0x84, 0x84
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_precendence.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_precendence.sol
new file mode 100644
index 0000000000..961e031695
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_precendence.sol
@@ -0,0 +1,71 @@
+type Int is int64;
+using {
+    bitor as |, bitand as &, bitxor as ^, bitnot as ~,
+    add as +, sub as -, unsub as -, mul as *, div as /, mod as %
+} for Int global;
+
+function bitor(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) | Int.unwrap(y)); }
+function bitand(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) & Int.unwrap(y)); }
+function bitxor(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) ^ Int.unwrap(y)); }
+function bitnot(Int x) pure returns (Int) { return Int.wrap(~Int.unwrap(x)); }
+
+function add(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) + Int.unwrap(y)); }
+function sub(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) - Int.unwrap(y)); }
+function unsub(Int x) pure returns (Int) { return Int.wrap(-Int.unwrap(x)); }
+function mul(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) * Int.unwrap(y)); }
+function div(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) / Int.unwrap(y)); }
+function mod(Int x, Int y) pure returns (Int) { return Int.wrap(Int.unwrap(x) % Int.unwrap(y)); }
+
+contract C {
+    Int constant I0 = Int.wrap(0);
+    Int constant I1 = Int.wrap(1);
+    Int constant I2 = Int.wrap(2);
+    Int constant I3 = Int.wrap(3);
+    Int constant I4 = Int.wrap(4);
+    Int constant I5 = Int.wrap(5);
+    Int constant I6 = Int.wrap(6);
+    Int constant I7 = Int.wrap(7);
+    Int constant I8 = Int.wrap(8);
+    Int constant I10 = Int.wrap(10);
+    Int constant I13 = Int.wrap(13);
+    Int constant I15 = Int.wrap(15);
+    Int constant I20 = Int.wrap(20);
+    Int constant I128 = Int.wrap(128);
+
+    function testBitwise() public pure {
+        assert(Int.unwrap(I0 & I0 | I1) == (0 & 0 | 1));
+        assert(Int.unwrap(I0 & I0 | I1) == ((0 & 0) | 1));
+    }
+
+    function testBitwise_arithmetic() public pure {
+        assert(Int.unwrap(I2 + I2 & ~I1 | I6 * I6 - I4 & ~I3) == (2 + 2 & ~1 | 6 * 6 - 4 & ~3));
+        assert(Int.unwrap(I2 + I2 & ~I1 | I6 * I6 - I4 & ~I3) == (((2 + 2) & (~1)) | (((6 * 6) - 4) & (~3))));
+    }
+
+    function testArithmetic() public pure {
+        assert(Int.unwrap(I1 + I8 / I4 - I5 % I6 * I7) == (1 + 8 / 4 - 5 % 6 * 7));
+        assert(Int.unwrap(I1 + I8 / I4 - I5 % I6 * I7) == ((1 + (8 / 4)) - ((5 % 6) * 7)));
+    }
+
+    function testAll() public pure {
+        assert(
+            Int.unwrap(I128 + I1 - I10 + I4 & ~I1 ^ ~I1 * I2 | -I15 % -I10 * I20 / I2 + I13 & ~I3) ==
+            (128 + 1 - 10 + 4 & ~1 ^ ~1 * 2 | -15 % -10 * 20 / 2 + 13 & ~3)
+        );
+        assert(
+            Int.unwrap(I128 + I1 - I10 + I4 & ~I1 ^ ~I1 * I2 | -I15 % -I10 * I20 / I2 + I13 & ~I3) ==
+            (
+                (
+                    ((((128 + 1) - 10) + 4) & (~1)) ^
+                    ((~1) * 2)
+                ) |
+                ((((((-15) % (-10)) * 20) / 2) + 13) & (~3))
+            )
+        );
+    }
+}
+// ----
+// testBitwise() ->
+// testBitwise_arithmetic() ->
+// testArithmetic() ->
+// testAll() ->
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_return_parameter_cleanup.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_return_parameter_cleanup.sol
new file mode 100644
index 0000000000..3798a00362
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_return_parameter_cleanup.sol
@@ -0,0 +1,58 @@
+type U8 is uint8;
+using {f as ~, g as +} for U8 global;
+
+function f(U8) pure returns (U8 z) {
+    assembly {
+        // Return a value with dirty bytes outside of uint8
+        z := 0xffff
+    }
+}
+
+function g(U8, U8) pure returns (U8 z) {
+    assembly {
+        // Return a value with dirty bytes outside of uint8
+        z := 0xffff
+    }
+}
+
+contract C {
+    function testUnary() external pure returns (uint, uint) {
+        U8 a; // Value does not matter
+
+        U8 opResult = ~a;
+        U8 fResult = f(a);
+
+        // Get the slot, including bytes outside of uint8
+        uint opResultFull;
+        uint fResultFull;
+        assembly {
+            opResultFull := opResult
+            fResultFull := fResult
+        }
+
+        // If the result is not 0xff, no cleanup was performed.
+        return (opResultFull, fResultFull);
+    }
+
+    function testBinary() external pure returns (uint, uint) {
+        U8 a; // Value does not matter
+        U8 b; // Value does not matter
+
+        U8 opResult = a + b;
+        U8 fResult = g(a, b);
+
+        // Get the slot, including bytes outside of uint8
+        uint opResultFull;
+        uint fResultFull;
+        assembly {
+            opResultFull := opResult
+            fResultFull := fResult
+        }
+
+        // If the result is not 0xff, no cleanup was performed.
+        return (opResultFull, fResultFull);
+    }
+}
+// ----
+// testUnary() -> 0xffff, 0xffff
+// testBinary() -> 0xffff, 0xffff
diff --git a/test/libsolidity/semanticTests/operators/userDefined/recursive_operator.sol b/test/libsolidity/semanticTests/operators/userDefined/recursive_operator.sol
new file mode 100644
index 0000000000..3ce080c34d
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/recursive_operator.sol
@@ -0,0 +1,41 @@
+type Uint is uint;
+using {unaryCountdown as ~, binaryCountdown as ^, eq as ==} for Uint global;
+
+function unaryCountdown(Uint x) pure returns (Uint) {
+    if (x == Uint.wrap(0))
+        return Uint.wrap(0);
+
+    return ~Uint.wrap(Uint.unwrap(x) - 1);
+}
+
+function binaryCountdown(Uint x, Uint y) pure returns (Uint) {
+    if (x == Uint.wrap(0) && y == Uint.wrap(0))
+        return Uint.wrap(0);
+    if (x == Uint.wrap(0))
+        return y ^ x;
+
+    return Uint.wrap(Uint.unwrap(x) - 1) ^ y;
+}
+
+function eq(Uint x, Uint y) pure returns (bool) {
+    return Uint.unwrap(x) == Uint.unwrap(y);
+}
+
+contract C {
+    function testUnary(Uint x) public pure returns (Uint) {
+        return ~x;
+    }
+
+    function testBinary(Uint x, Uint y) public pure returns (Uint) {
+        return x ^ y;
+    }
+}
+// ----
+// testUnary(uint256): 0 -> 0
+// testUnary(uint256): 1 -> 0
+// testUnary(uint256): 99999999999 -> FAILURE
+// testBinary(uint256,uint256): 0, 0 -> 0
+// testBinary(uint256,uint256): 1, 0 -> 0
+// testBinary(uint256,uint256): 0, 1 -> 0
+// testBinary(uint256,uint256): 1, 1 -> 0
+// testBinary(uint256,uint256): 99999999999, 99999999999 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol
new file mode 100644
index 0000000000..684ea1b433
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol
@@ -0,0 +1,25 @@
+type U8 is uint8;
+
+function uncheckedAdd(U8 x, U8 y) pure returns (U8) {
+    unchecked {
+        return U8.wrap(U8.unwrap(x) + U8.unwrap(y));
+    }
+}
+
+using {uncheckedAdd as +} for U8 global;
+
+contract D {
+    function testUncheckedOperator() public pure returns (U8) {
+        return U8.wrap(250) + U8.wrap(10);
+    }
+
+    function testUncheckedOperatorInUncheckedBlock() public pure returns (U8) {
+        unchecked {
+            return U8.wrap(250) + U8.wrap(10);
+        }
+    }
+}
+
+// ----
+// testUncheckedOperator() -> 4
+// testUncheckedOperatorInUncheckedBlock() -> 4
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol
new file mode 100644
index 0000000000..20889af057
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol
@@ -0,0 +1,16 @@
+type U is uint;
+using {div as /} for U global;
+
+function div(U x, U y) pure returns (U) {
+    return U.wrap(U.unwrap(x) / U.unwrap(y));
+}
+
+contract C {
+    function f(U x, U y) public pure returns (U) {
+        return x / y; // FIXME: should detect div by zero
+    }
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6756: (218-223): User-defined operators are not yet supported by SMTChecker. This invocation of operator / has been ignored, which may lead to incorrect results.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol
new file mode 100644
index 0000000000..edc4d2a979
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol
@@ -0,0 +1,19 @@
+type U is uint;
+using {div as /} for U global;
+
+function div(U x, U y) pure returns (U) {
+    if (U.unwrap(y) == 0)
+        return U.wrap(0);
+
+    return U.wrap(U.unwrap(x) / U.unwrap(y));
+}
+
+contract C {
+    function f(U x, U y) public pure returns (U) {
+        return x / y; // no div by zero possible here
+    }
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6756: (271-276): User-defined operators are not yet supported by SMTChecker. This invocation of operator / has been ignored, which may lead to incorrect results.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
new file mode 100644
index 0000000000..10ec6a1993
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
@@ -0,0 +1,104 @@
+type I16 is int16;
+using {
+    bitor as |, bitand as &, bitxor as ^, bitnot as ~,
+    add as +, sub as -, unsub as -, mul as *, div as /, mod as %,
+    eq as ==, noteq as !=, lt as <, gt as >, leq as <=, geq as >=
+} for I16 global;
+
+function bitor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) | I16.unwrap(y)); }
+function bitand(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) & I16.unwrap(y)); }
+function bitxor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) ^ I16.unwrap(y)); }
+function bitnot(I16 x) pure returns (I16) { return I16.wrap(~I16.unwrap(x)); }
+
+function add(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) + I16.unwrap(y)); }
+function sub(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) - I16.unwrap(y)); }
+function unsub(I16 x) pure returns (I16) { return I16.wrap(-I16.unwrap(x)); }
+function mul(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) * I16.unwrap(y)); }
+function div(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) / I16.unwrap(y)); }
+function mod(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) % I16.unwrap(y)); }
+
+function eq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) == I16.unwrap(y); }
+function noteq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) != I16.unwrap(y); }
+function lt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) < I16.unwrap(y); }
+function gt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) > I16.unwrap(y); }
+function leq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) <= I16.unwrap(y); }
+function geq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) >= I16.unwrap(y); }
+
+contract C {
+    I16 constant MINUS_TWO = I16.wrap(-2);
+    I16 constant ZERO = I16.wrap(0);
+    I16 constant ONE = I16.wrap(1);
+    I16 constant TWO = I16.wrap(2);
+    I16 constant THREE = I16.wrap(3);
+    I16 constant FOUR = I16.wrap(4);
+
+    function testBitwise() public pure {
+        assert(ONE | TWO == THREE); // FIXME: should hold
+        assert(ONE & THREE == ZERO); // FIXME: should hold
+        assert(TWO ^ TWO == ZERO); // FIXME: should hold
+        assert(~ONE == MINUS_TWO); // FIXME: should hold
+    }
+
+    function testArithmetic() public pure {
+        assert(TWO + TWO == FOUR); // FIXME: should hold
+        assert(TWO - TWO == ZERO); // FIXME: should hold
+        assert(-TWO == MINUS_TWO); // FIXME: should hold
+        assert(TWO * TWO == FOUR); // FIXME: should hold
+        assert(TWO / TWO == ONE); // FIXME: should hold
+        assert(TWO % TWO == ZERO); // FIXME: should hold
+    }
+
+    function testComparison() public pure {
+        assert(TWO == TWO); // FIXME: should hold
+        assert(!(TWO != TWO)); // FIXME: should hold
+        assert(!(TWO < TWO)); // FIXME: should hold
+        assert(!(TWO > TWO)); // FIXME: should hold
+        assert(TWO <= TWO); // FIXME: should hold
+        assert(TWO >= TWO); // FIXME: should hold
+    }
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6756: (2019-2028): User-defined operators are not yet supported by SMTChecker. This invocation of operator | has been ignored, which may lead to incorrect results.
+// Warning 6756: (2019-2037): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2077-2088): User-defined operators are not yet supported by SMTChecker. This invocation of operator & has been ignored, which may lead to incorrect results.
+// Warning 6756: (2077-2096): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2136-2145): User-defined operators are not yet supported by SMTChecker. This invocation of operator ^ has been ignored, which may lead to incorrect results.
+// Warning 6756: (2136-2153): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6156: (2193-2197): User-defined operators are not yet supported by SMTChecker. This invocation of operator ~ has been ignored, which may lead to incorrect results.
+// Warning 6756: (2193-2210): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2301-2310): User-defined operators are not yet supported by SMTChecker. This invocation of operator + has been ignored, which may lead to incorrect results.
+// Warning 6756: (2301-2318): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2358-2367): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
+// Warning 6756: (2358-2375): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6156: (2415-2419): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
+// Warning 6756: (2415-2432): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2472-2481): User-defined operators are not yet supported by SMTChecker. This invocation of operator * has been ignored, which may lead to incorrect results.
+// Warning 6756: (2472-2489): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2529-2538): User-defined operators are not yet supported by SMTChecker. This invocation of operator / has been ignored, which may lead to incorrect results.
+// Warning 6756: (2529-2545): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2585-2594): User-defined operators are not yet supported by SMTChecker. This invocation of operator % has been ignored, which may lead to incorrect results.
+// Warning 6756: (2585-2602): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2693-2703): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2745-2755): User-defined operators are not yet supported by SMTChecker. This invocation of operator != has been ignored, which may lead to incorrect results.
+// Warning 6756: (2798-2807): User-defined operators are not yet supported by SMTChecker. This invocation of operator < has been ignored, which may lead to incorrect results.
+// Warning 6756: (2850-2859): User-defined operators are not yet supported by SMTChecker. This invocation of operator > has been ignored, which may lead to incorrect results.
+// Warning 6756: (2900-2910): User-defined operators are not yet supported by SMTChecker. This invocation of operator <= has been ignored, which may lead to incorrect results.
+// Warning 6756: (2950-2960): User-defined operators are not yet supported by SMTChecker. This invocation of operator >= has been ignored, which may lead to incorrect results.
+// Warning 6328: (2012-2038): CHC: Assertion violation happens here.
+// Warning 6328: (2070-2097): CHC: Assertion violation happens here.
+// Warning 6328: (2129-2154): CHC: Assertion violation happens here.
+// Warning 6328: (2186-2211): CHC: Assertion violation happens here.
+// Warning 6328: (2294-2319): CHC: Assertion violation happens here.
+// Warning 6328: (2351-2376): CHC: Assertion violation happens here.
+// Warning 6328: (2408-2433): CHC: Assertion violation happens here.
+// Warning 6328: (2465-2490): CHC: Assertion violation happens here.
+// Warning 6328: (2522-2546): CHC: Assertion violation happens here.
+// Warning 6328: (2578-2603): CHC: Assertion violation happens here.
+// Warning 6328: (2686-2704): CHC: Assertion violation happens here.
+// Warning 6328: (2736-2757): CHC: Assertion violation happens here.
+// Warning 6328: (2789-2809): CHC: Assertion violation happens here.
+// Warning 6328: (2841-2861): CHC: Assertion violation happens here.
+// Warning 6328: (2893-2911): CHC: Assertion violation happens here.
+// Warning 6328: (2943-2961): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol
new file mode 100644
index 0000000000..c30bb21c1d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol
@@ -0,0 +1,104 @@
+type I16 is int16;
+using {
+    bitor as |, bitand as &, bitxor as ^, bitnot as ~,
+    add as +, sub as -, unsub as -, mul as *, div as /, mod as %,
+    eq as ==, noteq as !=, lt as <, gt as >, leq as <=, geq as >=
+} for I16 global;
+
+function bitor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) | I16.unwrap(y)); }
+function bitand(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) & I16.unwrap(y)); }
+function bitxor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) ^ I16.unwrap(y)); }
+function bitnot(I16 x) pure returns (I16) { return I16.wrap(~I16.unwrap(x)); }
+
+function add(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) + I16.unwrap(y)); }
+function sub(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) - I16.unwrap(y)); }
+function unsub(I16 x) pure returns (I16) { return I16.wrap(-I16.unwrap(x)); }
+function mul(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) * I16.unwrap(y)); }
+function div(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) / I16.unwrap(y)); }
+function mod(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) % I16.unwrap(y)); }
+
+function eq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) == I16.unwrap(y); }
+function noteq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) != I16.unwrap(y); }
+function lt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) < I16.unwrap(y); }
+function gt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) > I16.unwrap(y); }
+function leq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) <= I16.unwrap(y); }
+function geq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) >= I16.unwrap(y); }
+
+contract C {
+    I16 constant MINUS_TWO = I16.wrap(-2);
+    I16 constant ZERO = I16.wrap(0);
+    I16 constant ONE = I16.wrap(1);
+    I16 constant TWO = I16.wrap(2);
+    I16 constant THREE = I16.wrap(3);
+    I16 constant FOUR = I16.wrap(4);
+
+    function testBitwise() public pure {
+        assert(ONE | TWO == FOUR); // should fail
+        assert(ONE & THREE == FOUR); // should fail
+        assert(TWO ^ TWO == FOUR); // should fail
+        assert(~ONE == FOUR); // should fail
+    }
+
+    function testArithmetic() public pure {
+        assert(TWO + THREE == FOUR); // should fail
+        assert(TWO - TWO == FOUR); // should fail
+        assert(-TWO == FOUR); // should fail
+        assert(TWO * THREE == FOUR); // should fail
+        assert(TWO / TWO == FOUR); // should fail
+        assert(TWO % TWO == FOUR); // should fail
+    }
+
+    function testComparison() public pure {
+        assert(!(TWO == TWO)); // should fail
+        assert(TWO != TWO); // should fail
+        assert(TWO < TWO); // should fail
+        assert(TWO > TWO); // should fail
+        assert(!(TWO <= TWO)); // should fail
+        assert(!(TWO >= TWO)); // should fail
+    }
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6756: (2019-2028): User-defined operators are not yet supported by SMTChecker. This invocation of operator | has been ignored, which may lead to incorrect results.
+// Warning 6756: (2019-2036): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2069-2080): User-defined operators are not yet supported by SMTChecker. This invocation of operator & has been ignored, which may lead to incorrect results.
+// Warning 6756: (2069-2088): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2121-2130): User-defined operators are not yet supported by SMTChecker. This invocation of operator ^ has been ignored, which may lead to incorrect results.
+// Warning 6756: (2121-2138): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6156: (2171-2175): User-defined operators are not yet supported by SMTChecker. This invocation of operator ~ has been ignored, which may lead to incorrect results.
+// Warning 6756: (2171-2183): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2267-2278): User-defined operators are not yet supported by SMTChecker. This invocation of operator + has been ignored, which may lead to incorrect results.
+// Warning 6756: (2267-2286): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2319-2328): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
+// Warning 6756: (2319-2336): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6156: (2369-2373): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
+// Warning 6756: (2369-2381): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2414-2425): User-defined operators are not yet supported by SMTChecker. This invocation of operator * has been ignored, which may lead to incorrect results.
+// Warning 6756: (2414-2433): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2466-2475): User-defined operators are not yet supported by SMTChecker. This invocation of operator / has been ignored, which may lead to incorrect results.
+// Warning 6756: (2466-2483): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2516-2525): User-defined operators are not yet supported by SMTChecker. This invocation of operator % has been ignored, which may lead to incorrect results.
+// Warning 6756: (2516-2533): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2619-2629): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2663-2673): User-defined operators are not yet supported by SMTChecker. This invocation of operator != has been ignored, which may lead to incorrect results.
+// Warning 6756: (2706-2715): User-defined operators are not yet supported by SMTChecker. This invocation of operator < has been ignored, which may lead to incorrect results.
+// Warning 6756: (2748-2757): User-defined operators are not yet supported by SMTChecker. This invocation of operator > has been ignored, which may lead to incorrect results.
+// Warning 6756: (2792-2802): User-defined operators are not yet supported by SMTChecker. This invocation of operator <= has been ignored, which may lead to incorrect results.
+// Warning 6756: (2838-2848): User-defined operators are not yet supported by SMTChecker. This invocation of operator >= has been ignored, which may lead to incorrect results.
+// Warning 6328: (2012-2037): CHC: Assertion violation happens here.
+// Warning 6328: (2062-2089): CHC: Assertion violation happens here.
+// Warning 6328: (2114-2139): CHC: Assertion violation happens here.
+// Warning 6328: (2164-2184): CHC: Assertion violation happens here.
+// Warning 6328: (2260-2287): CHC: Assertion violation happens here.
+// Warning 6328: (2312-2337): CHC: Assertion violation happens here.
+// Warning 6328: (2362-2382): CHC: Assertion violation happens here.
+// Warning 6328: (2407-2434): CHC: Assertion violation happens here.
+// Warning 6328: (2459-2484): CHC: Assertion violation happens here.
+// Warning 6328: (2509-2534): CHC: Assertion violation happens here.
+// Warning 6328: (2610-2631): CHC: Assertion violation happens here.
+// Warning 6328: (2656-2674): CHC: Assertion violation happens here.
+// Warning 6328: (2699-2716): CHC: Assertion violation happens here.
+// Warning 6328: (2741-2758): CHC: Assertion violation happens here.
+// Warning 6328: (2783-2804): CHC: Assertion violation happens here.
+// Warning 6328: (2829-2850): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
new file mode 100644
index 0000000000..f97b82f813
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
@@ -0,0 +1,105 @@
+type I16 is int16;
+using {
+    bitor as |, bitand as &, bitxor as ^, bitnot as ~,
+    add as +, sub as -, unsub as -, mul as *, div as /, mod as %,
+    eq as ==, noteq as !=, lt as <, gt as >, leq as <=, geq as >=
+} for I16 global;
+
+function bitor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) | I16.unwrap(y)); }
+function bitand(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) & I16.unwrap(y)); }
+function bitxor(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) ^ I16.unwrap(y)); }
+function bitnot(I16 x) pure returns (I16) { return I16.wrap(~I16.unwrap(x)); }
+
+function add(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) + I16.unwrap(y)); }
+function sub(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) - I16.unwrap(y)); }
+function unsub(I16 x) pure returns (I16) { return I16.wrap(-I16.unwrap(x)); }
+function mul(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) * I16.unwrap(y)); }
+function div(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) / I16.unwrap(y)); }
+function mod(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) % I16.unwrap(y)); }
+
+function eq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) == I16.unwrap(y); }
+function noteq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) != I16.unwrap(y); }
+function lt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) < I16.unwrap(y); }
+function gt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) > I16.unwrap(y); }
+function leq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) <= I16.unwrap(y); }
+function geq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) >= I16.unwrap(y); }
+
+contract C {
+    function testBitwise(I16 x, I16 y) public pure {
+        assert(x | y == bitor(x, y)); // FIXME: should hold
+        assert(x & y == bitand(x, y)); // FIXME: should hold
+        assert(x ^ y == bitxor(x, y)); // FIXME: should hold
+        assert(~x == bitnot(x)); // FIXME: should hold
+    }
+
+    function testArithmetic(I16 x, I16 y) public pure {
+        assert(x + y == add(x, y)); // FIXME: should hold
+        assert(x - y == sub(x, y)); // FIXME: should hold
+        assert(-x == unsub(x)); // FIXME: should hold
+        assert(x * y == mul(x, y)); // FIXME: should hold
+        assert(x / y == div(x, y)); // FIXME: should hold
+        assert(x % y == mod(x, y)); // FIXME: should hold
+    }
+
+    function testComparison(I16 x, I16 y) public pure {
+        assert((x == y) == eq(x, y)); // FIXME: should hold
+        assert((x != y) == noteq(x, y)); // FIXME: should hold
+        assert((x < y) == lt(x, y)); // FIXME: should hold
+        assert((x > y) == gt(x, y)); // FIXME: should hold
+        assert((x <= y) == leq(x, y)); // FIXME: should hold
+        assert((x >= y) == geq(x, y)); // FIXME: should hold
+    }
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6756: (1803-1808): User-defined operators are not yet supported by SMTChecker. This invocation of operator | has been ignored, which may lead to incorrect results.
+// Warning 6756: (1803-1823): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (1863-1868): User-defined operators are not yet supported by SMTChecker. This invocation of operator & has been ignored, which may lead to incorrect results.
+// Warning 6756: (1863-1884): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (1924-1929): User-defined operators are not yet supported by SMTChecker. This invocation of operator ^ has been ignored, which may lead to incorrect results.
+// Warning 6756: (1924-1945): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6156: (1985-1987): User-defined operators are not yet supported by SMTChecker. This invocation of operator ~ has been ignored, which may lead to incorrect results.
+// Warning 6756: (1985-2000): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2103-2108): User-defined operators are not yet supported by SMTChecker. This invocation of operator + has been ignored, which may lead to incorrect results.
+// Warning 6756: (2103-2121): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2161-2166): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
+// Warning 6756: (2161-2179): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6156: (2219-2221): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
+// Warning 6756: (2219-2233): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2273-2278): User-defined operators are not yet supported by SMTChecker. This invocation of operator * has been ignored, which may lead to incorrect results.
+// Warning 6756: (2273-2291): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2331-2336): User-defined operators are not yet supported by SMTChecker. This invocation of operator / has been ignored, which may lead to incorrect results.
+// Warning 6756: (2331-2349): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2389-2394): User-defined operators are not yet supported by SMTChecker. This invocation of operator % has been ignored, which may lead to incorrect results.
+// Warning 6756: (2389-2407): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2511-2517): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
+// Warning 6756: (2571-2577): User-defined operators are not yet supported by SMTChecker. This invocation of operator != has been ignored, which may lead to incorrect results.
+// Warning 6756: (2634-2639): User-defined operators are not yet supported by SMTChecker. This invocation of operator < has been ignored, which may lead to incorrect results.
+// Warning 6756: (2693-2698): User-defined operators are not yet supported by SMTChecker. This invocation of operator > has been ignored, which may lead to incorrect results.
+// Warning 6756: (2752-2758): User-defined operators are not yet supported by SMTChecker. This invocation of operator <= has been ignored, which may lead to incorrect results.
+// Warning 6756: (2813-2819): User-defined operators are not yet supported by SMTChecker. This invocation of operator >= has been ignored, which may lead to incorrect results.
+// Warning 3944: (679-708): CHC: Underflow (resulting value less than -32768) happens here.
+// Warning 4984: (679-708): CHC: Overflow (resulting value larger than 32767) happens here.
+// Warning 3944: (777-806): CHC: Underflow (resulting value less than -32768) happens here.
+// Warning 4984: (777-806): CHC: Overflow (resulting value larger than 32767) happens here.
+// Warning 3944: (953-982): CHC: Underflow (resulting value less than -32768) happens here.
+// Warning 4984: (953-982): CHC: Overflow (resulting value larger than 32767) happens here.
+// Warning 4281: (1051-1080): CHC: Division by zero happens here.
+// Warning 4281: (1149-1178): CHC: Division by zero happens here.
+// Warning 6328: (1796-1824): CHC: Assertion violation happens here.
+// Warning 6328: (1856-1885): CHC: Assertion violation happens here.
+// Warning 6328: (1917-1946): CHC: Assertion violation happens here.
+// Warning 6328: (1978-2001): CHC: Assertion violation happens here.
+// Warning 6328: (2096-2122): CHC: Assertion violation happens here.
+// Warning 6328: (2154-2180): CHC: Assertion violation happens here.
+// Warning 6328: (2212-2234): CHC: Assertion violation happens here.
+// Warning 6328: (2266-2292): CHC: Assertion violation happens here.
+// Warning 6328: (2324-2350): CHC: Assertion violation happens here.
+// Warning 6328: (2382-2408): CHC: Assertion violation happens here.
+// Warning 6328: (2503-2531): CHC: Assertion violation happens here.
+// Warning 6328: (2563-2594): CHC: Assertion violation happens here.
+// Warning 6328: (2626-2653): CHC: Assertion violation happens here.
+// Warning 6328: (2685-2712): CHC: Assertion violation happens here.
+// Warning 6328: (2744-2773): CHC: Assertion violation happens here.
+// Warning 6328: (2805-2834): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
new file mode 100644
index 0000000000..e785be5e5b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
@@ -0,0 +1,23 @@
+type U8 is uint8;
+using {add as +} for U8 global;
+
+function add(U8 x, U8 y) pure returns (U8) {
+    return U8.wrap(U8.unwrap(x) + U8.unwrap(y)); // FIXME: should detect possible overflow here
+}
+
+contract C {
+    U8 x = U8.wrap(254);
+
+    function inc() public {
+        x = x + U8.wrap(1); // FIXME: should detect possible overflow here
+    }
+
+    function check() view public {
+        U8 y = x;
+        assert(U8.unwrap(y) < 256);
+    }
+}
+// ====
+// SMTEngine: all
+// ----
+// Warning 6756: (274-288): User-defined operators are not yet supported by SMTChecker. This invocation of operator + has been ignored, which may lead to incorrect results.
diff --git a/test/libsolidity/syntaxTests/constants/constant_cyclic_via_user_operators.sol b/test/libsolidity/syntaxTests/constants/constant_cyclic_via_user_operators.sol
new file mode 100644
index 0000000000..e0af337c73
--- /dev/null
+++ b/test/libsolidity/syntaxTests/constants/constant_cyclic_via_user_operators.sol
@@ -0,0 +1,10 @@
+type Type is uint;
+using {f as +} for Type global;
+function f(Type, Type) pure returns (Type) {}
+
+Type constant t = Type.wrap(1);
+Type constant u = v + t;
+Type constant v = u + t;
+// ----
+// TypeError 8349: (148-153): Initial value for constant variable has to be compile-time constant.
+// TypeError 8349: (173-178): Initial value for constant variable has to be compile-time constant.
diff --git a/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/binary_operator_udvt.sol b/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/binary_operator_udvt.sol
new file mode 100644
index 0000000000..d0a0b6ea65
--- /dev/null
+++ b/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/binary_operator_udvt.sol
@@ -0,0 +1,17 @@
+type X is uint24;
+type Y is uint16;
+
+using {addX as +} for X global;
+using {addY as +} for Y global;
+
+function addX(X, X) pure returns (X) {}
+function addY(Y, Y) pure returns (Y) { revert(); }
+
+contract C {
+    function f() public pure {
+        X.wrap(1) + X.wrap(Y.unwrap(Y.wrap(2) + Y.wrap(3)));
+        X.wrap(4) + X.wrap(5); // Unreachable
+    }
+}
+// ----
+// Warning 5740: (307-328): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/unary_operator_udvt.sol b/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/unary_operator_udvt.sol
new file mode 100644
index 0000000000..12b0f03b93
--- /dev/null
+++ b/test/libsolidity/syntaxTests/controlFlow/userDefinedOperators/unary_operator_udvt.sol
@@ -0,0 +1,17 @@
+type X is uint24;
+type Y is uint16;
+
+using {unsubX as -} for X global;
+using {unsubY as -} for Y global;
+
+function unsubX(X) pure returns (X) {}
+function unsubY(Y) pure returns (Y) { revert(); }
+
+contract C {
+    function f() public pure {
+        -X.wrap(Y.unwrap(-Y.wrap(1)));
+        -X.wrap(Y.unwrap(Y.wrap(2))); // Unreachable
+    }
+}
+// ----
+// Warning 5740: (287-315): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
index 930e79a3b7..1cf46ac837 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/203_struct_reference_compare_operators.sol
@@ -7,4 +7,4 @@ contract test {
   }
 }
 // ----
-// TypeError 2271: (79-85): Built-in binary operator == cannot be applied to types struct test.s storage ref and struct test.s storage ref.
+// TypeError 2271: (79-85): Built-in binary operator == cannot be applied to types struct test.s storage ref and struct test.s storage ref. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/calling_operator_binary_user_defined_not_available.sol b/test/libsolidity/syntaxTests/operators/calling_operator_binary_user_defined_not_available.sol
new file mode 100644
index 0000000000..ea0c8f9d8a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/calling_operator_binary_user_defined_not_available.sol
@@ -0,0 +1,11 @@
+type Int is int256;
+
+function f() pure {
+    Int a = Int.wrap(0);
+    a + a;
+    a >>> a;
+}
+
+// ----
+// TypeError 2271: (70-75): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
+// TypeError 2271: (81-88): Built-in binary operator >>> cannot be applied to types Int and Int.
diff --git a/test/libsolidity/syntaxTests/operators/calling_operator_unary_user_defined_not_available.sol b/test/libsolidity/syntaxTests/operators/calling_operator_unary_user_defined_not_available.sol
new file mode 100644
index 0000000000..29273852e6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/calling_operator_unary_user_defined_not_available.sol
@@ -0,0 +1,11 @@
+type Int is int256;
+
+function f() pure {
+    Int a = Int.wrap(0);
+    -a;
+    a++;
+}
+
+// ----
+// TypeError 4907: (70-72): Built-in unary operator - cannot be applied to type Int. No matching user-defined operator found.
+// TypeError 9767: (78-81): Built-in unary operator ++ cannot be applied to type Int.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator.sol
new file mode 100644
index 0000000000..a00eb2ce52
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator.sol
@@ -0,0 +1,11 @@
+type Int is int;
+using {add as +} for Int global;
+using {unsub as -} for Int global;
+
+function add(Int, Int) pure returns (Int) {}
+function unsub(Int) pure returns (Int) {}
+
+function f() pure {
+    Int.wrap(0) + Int.wrap(0);
+    -Int.wrap(0);
+}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_function_name.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_function_name.sol
new file mode 100644
index 0000000000..6c1baa4b1a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_function_name.sol
@@ -0,0 +1,12 @@
+type Int is int16;
+
+using {add as +} for Int global;
+
+function add(Int, Int) pure returns (Int) {}
+
+function f() {
+    Int a;
+    a.add(a);
+}
+// ----
+// TypeError 9582: (130-135): Member "add" not found or not visible after argument-dependent lookup in Int.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_operator_name.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_operator_name.sol
new file mode 100644
index 0000000000..62c53cb8e1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_as_attached_function_via_operator_name.sol
@@ -0,0 +1,12 @@
+type Int is int16;
+
+using {add as +} for Int global;
+
+function add(Int, Int) pure returns (Int) {}
+
+function f() {
+    Int a;
+    a.+(a);
+}
+// ----
+// ParserError 2314: (132-133): Expected identifier but got '+'
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type.sol
new file mode 100644
index 0000000000..827853938f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type.sol
@@ -0,0 +1,23 @@
+==== Source: definition.sol ====
+import "type-and-binding.sol";
+
+function add(Int, Int) pure returns (Int) {}
+function unsub(Int) pure returns (Int) {}
+
+==== Source: type-and-binding.sol ====
+import "definition.sol";
+
+type Int is int;
+
+using {add as +} for Int global;
+using {unsub as -} for Int global;
+
+==== Source: use.sol ====
+import "type-and-binding.sol";
+
+contract C {
+    function f() pure public {
+        Int.wrap(0) + Int.wrap(0);
+        -Int.wrap(0);
+    }
+}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type_and_binding.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type_and_binding.sol
new file mode 100644
index 0000000000..d7a9ed0577
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_defined_separately_from_type_and_binding.sol
@@ -0,0 +1,30 @@
+==== Source: binding.sol ====
+import "definition.sol";
+import "type.sol";
+
+using {add as +} for Int global;
+using {unsub as -} for Int global;
+
+==== Source: definition.sol ====
+import "type.sol";
+
+function add(Int, Int) pure returns (Int) {}
+function unsub(Int) pure returns (Int) {}
+
+==== Source: type.sol ====
+type Int is int;
+
+==== Source: use.sol ====
+import "type.sol";
+
+contract C {
+    function f() pure public {
+        Int.wrap(0) + Int.wrap(0);
+        -Int.wrap(0);
+    }
+}
+// ----
+// TypeError 4117: (binding.sol:45-77): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 4117: (binding.sol:78-112): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 2271: (use.sol:72-97): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
+// TypeError 4907: (use.sol:107-119): Built-in unary operator - cannot be applied to type Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported.sol
new file mode 100644
index 0000000000..7c56bd6d68
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported.sol
@@ -0,0 +1,17 @@
+==== Source: s1.sol ====
+type Int is int;
+using {add as +} for Int global;
+using {unsub as -} for Int global;
+
+function add(Int, Int) pure returns (Int) {}
+function unsub(Int) pure returns (Int) {}
+
+==== Source: s2.sol ====
+import "s1.sol";
+
+contract C {
+    function f() pure public {
+        Int.wrap(0) + Int.wrap(0);
+        -Int.wrap(0);
+    }
+}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_non_global.sol
new file mode 100644
index 0000000000..ab2a83797b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_non_global.sol
@@ -0,0 +1,22 @@
+==== Source: s1.sol ====
+type Int is int;
+using {add as +} for Int;
+using {unsub as -} for Int;
+
+function add(Int, Int) pure returns (Int) {}
+function unsub(Int) pure returns (Int) {}
+
+==== Source: s2.sol ====
+import "s1.sol";
+
+contract C {
+    function f() pure public {
+        Int.wrap(0) + Int.wrap(0);
+        -Int.wrap(0);
+    }
+}
+// ----
+// TypeError 3320: (s1.sol:24-27): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (s1.sol:50-55): Operators can only be defined in a global 'using for' directive.
+// TypeError 2271: (s2.sol:70-95): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
+// TypeError 4907: (s2.sol:105-117): Built-in unary operator - cannot be applied to type Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively.sol
new file mode 100644
index 0000000000..86e4c2f43f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively.sol
@@ -0,0 +1,35 @@
+==== Source: s0.sol ====
+type Int is int;
+
+==== Source: s1.sol ====
+import "s0.sol";
+using {add1 as +} for Int global;
+using {unsub1 as -} for Int global;
+
+function add1(Int, Int) pure returns (Int) {}
+function unsub1(Int) pure returns (Int) {}
+
+==== Source: s2.sol ====
+import "s0.sol";
+using {add2 as +} for Int global;
+using {unsub2 as -} for Int global;
+
+function add2(Int, Int) pure returns (Int) {}
+function unsub2(Int) pure returns (Int) {}
+
+==== Source: s3.sol ====
+import "s1.sol";
+import "s2.sol";
+contract C {
+    function f() public {
+        Int.wrap(0) + Int.wrap(0);
+        -Int.wrap(0);
+    }
+}
+// ----
+// TypeError 4117: (s1.sol:17-50): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 4117: (s1.sol:51-86): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 4117: (s2.sol:17-50): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 4117: (s2.sol:51-86): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 2271: (s3.sol:81-106): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
+// TypeError 4907: (s3.sol:116-128): Built-in unary operator - cannot be applied to type Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively_non_global.sol
new file mode 100644
index 0000000000..7bd3fa146b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_imported_transitively_non_global.sol
@@ -0,0 +1,35 @@
+==== Source: s0.sol ====
+type Int is int;
+
+==== Source: s1.sol ====
+import "s0.sol";
+using {add1 as +} for Int;
+using {unsub1 as -} for Int;
+
+function add1(Int, Int) pure returns (Int) {}
+function unsub1(Int) pure returns (Int) {}
+
+==== Source: s2.sol ====
+import "s0.sol";
+using {add2 as +} for Int;
+using {unsub2 as -} for Int;
+
+function add2(Int, Int) pure returns (Int) {}
+function unsub2(Int) pure returns (Int) {}
+
+==== Source: s3.sol ====
+import "s1.sol";
+import "s2.sol";
+contract C {
+    function f() public {
+        Int.wrap(0) + Int.wrap(0);
+        -Int.wrap(0);
+    }
+}
+// ----
+// TypeError 3320: (s1.sol:24-28): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (s1.sol:51-57): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (s2.sol:24-28): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (s2.sol:51-57): Operators can only be defined in a global 'using for' directive.
+// TypeError 2271: (s3.sol:81-106): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
+// TypeError 4907: (s3.sol:116-128): Built-in unary operator - cannot be applied to type Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_in_constant_initialization.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_in_constant_initialization.sol
new file mode 100644
index 0000000000..f05655b652
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_in_constant_initialization.sol
@@ -0,0 +1,24 @@
+type B4 is bytes4;
+using {bitor as |, bitnot as ~} for B4 global;
+
+function bitor(B4, B4) pure returns (B4) {}
+function bitnot(B4) pure returns (B4) {}
+
+B4 constant X = B4.wrap(0x12345678) | B4.wrap(0xaabbccdd);
+
+contract C {
+    B4 constant Y = B4.wrap(0x12345678) | B4.wrap(0xaabbccdd);
+}
+
+library L {
+    B4 constant Z = ~B4.wrap(0x12345678);
+}
+
+interface I {
+    B4 constant W = ~B4.wrap(0x12345678);
+}
+// ----
+// TypeError 8349: (169-210): Initial value for constant variable has to be compile-time constant.
+// TypeError 8349: (246-287): Initial value for constant variable has to be compile-time constant.
+// TypeError 8349: (324-344): Initial value for constant variable has to be compile-time constant.
+// TypeError 8349: (383-403): Initial value for constant variable has to be compile-time constant.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_non_global.sol
new file mode 100644
index 0000000000..5af79ad475
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_non_global.sol
@@ -0,0 +1,14 @@
+type Int is int;
+using {add as +} for Int;
+using {unsub as -} for Int;
+
+function add(Int, Int) pure returns (Int) {}
+function unsub(Int) pure returns (Int) {}
+
+function f() pure {
+    Int.wrap(0) + Int.wrap(0);
+    -Int.wrap(0);
+}
+// ----
+// TypeError 3320: (24-27): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (50-55): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_deploys_contract.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_deploys_contract.sol
new file mode 100644
index 0000000000..08e9e68d9c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_deploys_contract.sol
@@ -0,0 +1,24 @@
+type Int is int16;
+
+using {add as +} for Int global;
+
+function add(Int, Int) returns (Int) {
+    B b = new B();
+    return b.f();
+}
+
+contract B {
+    Int s;
+    function f() external returns (Int) {
+        s = Int.wrap(3);
+        return s;
+    }
+}
+
+contract C {
+    function test() public returns (Int) {
+        return Int.wrap(0) + Int.wrap(0);
+    }
+}
+// ----
+// TypeError 7775: (27-30): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_external_call.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_external_call.sol
new file mode 100644
index 0000000000..02c5d655f2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_external_call.sol
@@ -0,0 +1,20 @@
+type Int is int16;
+using {add as +, unsub as -} for Int global;
+
+IAdder constant ADDER = IAdder(address(0));
+
+function add(Int x, Int y) pure returns (Int) {
+    return ADDER.mul(x, y);
+}
+
+function unsub(Int x) pure returns (Int) {
+    return ADDER.inc(x);
+}
+
+interface IAdder {
+    function mul(Int, Int) external returns (Int);
+    function inc(Int) external returns (Int);
+}
+// ----
+// TypeError 8961: (169-184): Function cannot be declared as pure because this expression (potentially) modifies the state.
+// TypeError 8961: (243-255): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_pure_external_call.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_pure_external_call.sol
new file mode 100644
index 0000000000..37a8add56c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_pure_external_call.sol
@@ -0,0 +1,17 @@
+type Int is int16;
+using {add as +, unsub as -} for Int global;
+
+IAdder constant ADDER = IAdder(address(0));
+
+function add(Int x, Int y) pure returns (Int) {
+    return ADDER.mul(x, y);
+}
+
+function unsub(Int x) pure returns (Int) {
+    return ADDER.inc(x);
+}
+
+interface IAdder {
+    function mul(Int, Int) external pure returns (Int);
+    function inc(Int) external pure returns (Int);
+}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_view_external_call.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_view_external_call.sol
new file mode 100644
index 0000000000..f45f7a30f0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_that_makes_view_external_call.sol
@@ -0,0 +1,20 @@
+type Int is int16;
+using {add as +, unsub as -} for Int global;
+
+IAdder constant ADDER = IAdder(address(0));
+
+function add(Int x, Int y) pure returns (Int) {
+    return ADDER.mul(x, y);
+}
+
+function unsub(Int x) pure returns (Int) {
+    return ADDER.inc(x);
+}
+
+interface IAdder {
+    function mul(Int, Int) external view returns (Int);
+    function inc(Int) external view returns (Int);
+}
+// ----
+// TypeError 2527: (169-184): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (243-255): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_with_implicit_conversion.sol b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_with_implicit_conversion.sol
new file mode 100644
index 0000000000..afe4e46e80
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/calling_operator_with_implicit_conversion.sol
@@ -0,0 +1,32 @@
+using {add as +, unsub as -} for U global;
+
+type U is uint;
+
+function add(U, U) pure returns (U) {}
+function unsub(U) pure returns (U) {}
+
+contract C {
+    function fromBool() public {
+        U u;
+
+        u + true;
+        true + u;
+        -true;
+    }
+
+    function fromUint() public {
+        U u;
+        uint32 u32;
+
+        u + u32;
+        u32 + u;
+        -u32;
+    }
+}
+// ----
+// TypeError 5653: (207-215): The type of the second operand of this user-defined binary operator + does not match the type of the first operand, which is U.
+// TypeError 2271: (225-233): Built-in binary operator + cannot be applied to types bool and U.
+// TypeError 4907: (243-248): Built-in unary operator - cannot be applied to type bool.
+// TypeError 5653: (332-339): The type of the second operand of this user-defined binary operator + does not match the type of the first operand, which is U.
+// TypeError 2271: (349-356): Built-in binary operator + cannot be applied to types uint32 and U.
+// TypeError 4907: (366-370): Built-in unary operator - cannot be applied to type uint32. Unary negation is only allowed for signed integers.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_builtin_types.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_builtin_types.sol
new file mode 100644
index 0000000000..8bdcd510aa
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_builtin_types.sol
@@ -0,0 +1,18 @@
+using {f as +} for uint global;
+using {f as +} for uint[2] global;
+using {f as +} for mapping(uint => uint) global;
+using {f as +} for function (uint) pure returns (uint) global;
+using {f as +} for string global;
+
+function f(uint, uint) pure returns (uint) {}
+// ----
+// TypeError 8841: (0-31): Can only use "global" with user-defined types.
+// TypeError 5332: (7-8): Operators can only be implemented for user-defined value types.
+// TypeError 8841: (32-66): Can only use "global" with user-defined types.
+// TypeError 5332: (39-40): Operators can only be implemented for user-defined value types.
+// TypeError 8841: (67-115): Can only use "global" with user-defined types.
+// TypeError 5332: (74-75): Operators can only be implemented for user-defined value types.
+// TypeError 8841: (116-178): Can only use "global" with user-defined types.
+// TypeError 5332: (123-124): Operators can only be implemented for user-defined value types.
+// TypeError 8841: (179-212): Can only use "global" with user-defined types.
+// TypeError 5332: (186-187): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_contract.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_contract.sol
new file mode 100644
index 0000000000..55418f579e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_contract.sol
@@ -0,0 +1,13 @@
+using {fc as +} for C global;
+using {fa as +} for A global;
+
+function fc(C, C) pure returns (C) {}
+function fa(A, A) pure returns (A) {}
+
+contract C {}
+abstract contract A {}
+// ----
+// TypeError 8841: (0-29): Can only use "global" with user-defined types.
+// TypeError 5332: (7-9): Operators can only be implemented for user-defined value types.
+// TypeError 8841: (30-59): Can only use "global" with user-defined types.
+// TypeError 5332: (37-39): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_enum.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_enum.sol
new file mode 100644
index 0000000000..dce1009948
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_enum.sol
@@ -0,0 +1,10 @@
+using {add as +} for E global;
+
+enum E {
+    E1,
+    E2
+}
+
+function add(E, E) pure returns (E) {}
+// ----
+// TypeError 5332: (7-10): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_error.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_error.sol
new file mode 100644
index 0000000000..0dcab966d5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_error.sol
@@ -0,0 +1,10 @@
+using {add as +} for E global;
+
+error E();
+
+function add(E, E) pure returns (E) {
+    return E.E1;
+}
+
+// ----
+// TypeError 5172: (21-22): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_event.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_event.sol
new file mode 100644
index 0000000000..5dd5fbce92
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_event.sol
@@ -0,0 +1,10 @@
+using {add as +} for C.Event global;
+
+contract C {
+    event Event();
+}
+
+function add(C.Event, C.Event) pure returns (C.Event) {}
+
+// ----
+// TypeError 5172: (21-28): Name has to refer to a user-defined type.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_interface.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_interface.sol
new file mode 100644
index 0000000000..9db33819c2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_interface.sol
@@ -0,0 +1,8 @@
+using {f as +} for I global;
+
+function f(I, I) pure returns (I) {}
+
+interface I {}
+// ----
+// TypeError 8841: (0-28): Can only use "global" with user-defined types.
+// TypeError 5332: (7-8): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_library.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_library.sol
new file mode 100644
index 0000000000..210cb30096
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_library.sol
@@ -0,0 +1,6 @@
+using {f as +} for L global;
+
+function f() pure {}
+library L {}
+// ----
+// TypeError 1130: (19-20): Invalid use of a library name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_struct.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_struct.sol
new file mode 100644
index 0000000000..0244f731c9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_struct.sol
@@ -0,0 +1,9 @@
+using {add as +} for S global;
+
+struct S {
+    uint x;
+}
+
+function add(S memory, S memory) pure returns (S memory) {}
+// ----
+// TypeError 5332: (7-10): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_contract_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_contract_level.sol
new file mode 100644
index 0000000000..1e3c9e7756
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_contract_level.sol
@@ -0,0 +1,16 @@
+type Int is int;
+
+function add(Int, Int) pure returns (Int) {}
+
+contract C {
+    using {add as +} for *;
+}
+
+contract D {
+    using {add as +} for * global;
+}
+// ----
+// SyntaxError 3349: (81-104): The type has to be specified explicitly when attaching specific functions.
+// SyntaxError 3349: (125-155): The type has to be specified explicitly when attaching specific functions.
+// SyntaxError 2854: (125-155): Can only globally attach functions to specific types.
+// SyntaxError 3367: (125-155): "global" can only be used at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_file_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_file_level.sol
new file mode 100644
index 0000000000..25325f7562
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/defining_operator_for_wildcard_type_at_file_level.sol
@@ -0,0 +1,6 @@
+using {add as +} for * global;
+
+function add(int, int) returns (int) {}
+// ----
+// SyntaxError 8118: (0-30): The type has to be specified explicitly at file level (cannot use '*').
+// SyntaxError 2854: (0-30): Can only globally attach functions to specific types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_attached_free_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_attached_free_function.sol
new file mode 100644
index 0000000000..a04e81c31d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_attached_free_function.sol
@@ -0,0 +1,9 @@
+type Int is uint;
+using {f} for Int;
+
+Int constant v;
+using {v.f as +} for Int global;
+
+function f(Int) pure returns (Int) {}
+// ----
+// DeclarationError 9589: (61-64): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_abi_encode.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_abi_encode.sol
new file mode 100644
index 0000000000..00889bc093
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_abi_encode.sol
@@ -0,0 +1,8 @@
+type Int is int16;
+
+using {abi.encode as +} for Int global;
+
+function f(Int, Int) pure returns (Int) {}
+
+// ----
+// DeclarationError 9589: (27-37): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_keccak256.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_keccak256.sol
new file mode 100644
index 0000000000..ee088624cd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_keccak256.sol
@@ -0,0 +1,5 @@
+type Int is int16;
+
+using {keccak256 as +} for Int global;
+// ----
+// TypeError 8187: (27-36): Expected function name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_revert.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_revert.sol
new file mode 100644
index 0000000000..daf4cab6ba
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_builtin_revert.sol
@@ -0,0 +1,5 @@
+type Int is int16;
+
+using {revert as +} for Int global;
+// ----
+// DeclarationError 9589: (27-33): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_contract_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_contract_level.sol
new file mode 100644
index 0000000000..309ea95584
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_contract_level.sol
@@ -0,0 +1,9 @@
+type Int is int;
+
+contract C {
+    using {add as +} for Int;
+
+    function add(Int, Int) public pure returns (Int) {}
+}
+// ----
+// TypeError 4167: (42-45): Only file-level functions and library functions can be attached to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_file_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_file_level.sol
new file mode 100644
index 0000000000..969dd8094c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_contract_function_at_file_level.sol
@@ -0,0 +1,11 @@
+type Int is int;
+
+using {C.add as +} for Int global;
+
+contract C {
+    function add(Int, Int) public pure returns (Int) {
+        return 0;
+    }
+}
+// ----
+// TypeError 4167: (25-30): Only file-level functions and library functions can be attached to a type in a "using" statement
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_error.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_error.sol
new file mode 100644
index 0000000000..1bec8b44df
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_error.sol
@@ -0,0 +1,7 @@
+type Int is int16;
+
+using {IntError as +} for Int global;
+
+error IntError(Int a, Int b);
+// ----
+// TypeError 8187: (27-35): Expected function name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_event.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_event.sol
new file mode 100644
index 0000000000..3a7b6423a5
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_event.sol
@@ -0,0 +1,9 @@
+type Int is int16;
+
+using {C.IntEvent as +} for Int global;
+
+contract C {
+    event IntEvent(Int a, Int b);
+}
+// ----
+// TypeError 8187: (27-37): Expected function name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_pointer.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_pointer.sol
new file mode 100644
index 0000000000..834fe2d7d1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_pointer.sol
@@ -0,0 +1,8 @@
+type Int is int8;
+
+contract C {
+    function(Int, Int) external pure returns (Int) ptr;
+    using {ptr as +} for Int;
+}
+// ----
+// TypeError 8187: (99-102): Expected function name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_shadowing_builtin_keccak256.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_shadowing_builtin_keccak256.sol
new file mode 100644
index 0000000000..52f4e362da
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_function_shadowing_builtin_keccak256.sol
@@ -0,0 +1,9 @@
+type Int is int16;
+
+using {keccak256 as +} for Int global;
+
+function keccak256(Int, Int) pure returns (Int) {
+    return Int.wrap(0);
+}
+// ----
+// Warning 2319: (60-135): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library.sol
new file mode 100644
index 0000000000..a6460da133
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library.sol
@@ -0,0 +1,7 @@
+type Int is int16;
+
+using {L as +} for Int global;
+
+library L {}
+// ----
+// TypeError 8187: (27-28): Expected function name.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_contract_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_contract_level.sol
new file mode 100644
index 0000000000..889fc0eb27
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_contract_level.sol
@@ -0,0 +1,113 @@
+==== Source: external.sol ====
+type Int is int128;
+
+library L {
+    function binaryOperator(Int, Int) external pure returns (Int) {}
+    function unaryOperator(Int) external pure returns (Int) {}
+
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+
+contract C {
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+
+library X {
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+
+==== Source: internal.sol ====
+type Int is int128;
+
+library L {
+    function binaryOperator(Int, Int) internal pure returns (Int) {}
+    function unaryOperator(Int) internal pure returns (Int) {}
+
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+
+contract C {
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+
+library X {
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+
+==== Source: private.sol ====
+type Int is int128;
+
+library L {
+    function binaryOperator(Int, Int) private pure returns (Int) {}
+    function unaryOperator(Int) private pure returns (Int) {}
+
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+==== Source: public.sol ====
+type Int is int128;
+
+library L {
+    function binaryOperator(Int, Int) public pure returns (Int) {}
+    function unaryOperator(Int) public pure returns (Int) {}
+
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+
+contract C {
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+
+library X {
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+// ----
+// TypeError 3320: (external.sol:177-193): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (external.sol:177-193): Only pure free functions can be used to define operators.
+// TypeError 3320: (external.sol:220-235): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (external.sol:220-235): Only pure free functions can be used to define operators.
+// TypeError 3320: (external.sol:278-294): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (external.sol:278-294): Only pure free functions can be used to define operators.
+// TypeError 3320: (external.sol:321-336): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (external.sol:321-336): Only pure free functions can be used to define operators.
+// TypeError 3320: (external.sol:378-394): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (external.sol:378-394): Only pure free functions can be used to define operators.
+// TypeError 3320: (external.sol:421-436): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (external.sol:421-436): Only pure free functions can be used to define operators.
+// TypeError 3320: (internal.sol:177-193): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (internal.sol:177-193): Only pure free functions can be used to define operators.
+// TypeError 3320: (internal.sol:220-235): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (internal.sol:220-235): Only pure free functions can be used to define operators.
+// TypeError 3320: (internal.sol:278-294): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (internal.sol:278-294): Only pure free functions can be used to define operators.
+// TypeError 3320: (internal.sol:321-336): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (internal.sol:321-336): Only pure free functions can be used to define operators.
+// TypeError 3320: (internal.sol:378-394): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (internal.sol:378-394): Only pure free functions can be used to define operators.
+// TypeError 3320: (internal.sol:421-436): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (internal.sol:421-436): Only pure free functions can be used to define operators.
+// TypeError 3320: (private.sol:175-191): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (private.sol:175-191): Only pure free functions can be used to define operators.
+// TypeError 3320: (private.sol:218-233): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (private.sol:218-233): Only pure free functions can be used to define operators.
+// TypeError 3320: (public.sol:173-189): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (public.sol:173-189): Only pure free functions can be used to define operators.
+// TypeError 3320: (public.sol:216-231): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (public.sol:216-231): Only pure free functions can be used to define operators.
+// TypeError 3320: (public.sol:274-290): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (public.sol:274-290): Only pure free functions can be used to define operators.
+// TypeError 3320: (public.sol:317-332): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (public.sol:317-332): Only pure free functions can be used to define operators.
+// TypeError 3320: (public.sol:374-390): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (public.sol:374-390): Only pure free functions can be used to define operators.
+// TypeError 3320: (public.sol:417-432): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (public.sol:417-432): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_file_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_file_level.sol
new file mode 100644
index 0000000000..1e3c13aec2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_at_file_level.sol
@@ -0,0 +1,39 @@
+==== Source: external.sol ====
+type Int is int128;
+
+library L {
+    function binaryOperator(Int, Int) external pure returns (Int) {}
+    function unaryOperator(Int) external pure returns (Int) {}
+}
+
+using {L.binaryOperator as +} for Int global;
+using {L.unaryOperator as -} for Int global;
+
+==== Source: internal.sol ====
+type Int is int128;
+
+library L {
+    function binaryOperator(Int, Int) internal pure returns (Int) {}
+    function unaryOperator(Int) internal pure returns (Int) {}
+}
+
+using {L.binaryOperator as +} for Int global;
+using {L.unaryOperator as -} for Int global;
+
+==== Source: public.sol ====
+type Int is int128;
+
+library L {
+    function binaryOperator(Int, Int) public pure returns (Int) {}
+    function unaryOperator(Int) public pure returns (Int) {}
+}
+
+using {L.binaryOperator as +} for Int global;
+using {L.unaryOperator as -} for Int global;
+// ----
+// TypeError 7775: (external.sol:175-191): Only pure free functions can be used to define operators.
+// TypeError 7775: (external.sol:221-236): Only pure free functions can be used to define operators.
+// TypeError 7775: (internal.sol:175-191): Only pure free functions can be used to define operators.
+// TypeError 7775: (internal.sol:221-236): Only pure free functions can be used to define operators.
+// TypeError 7775: (public.sol:171-187): Only pure free functions can be used to define operators.
+// TypeError 7775: (public.sol:217-232): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_private_outside_of_library.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_private_outside_of_library.sol
new file mode 100644
index 0000000000..077330baf6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_library_function_private_outside_of_library.sol
@@ -0,0 +1,36 @@
+type Int is int128;
+
+library L {
+    function binaryOperator(Int, Int) private pure returns (Int) {}
+    function unaryOperator(Int) private pure returns (Int) {}
+}
+
+using {L.binaryOperator as +} for Int global;
+using {L.unaryOperator as -} for Int global;
+
+contract C {
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+
+library X {
+    using {L.binaryOperator as *} for Int;
+    using {L.unaryOperator as ~} for Int;
+}
+// ----
+// TypeError 6772: (173-189): Function "L.binaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
+// TypeError 7775: (173-189): Only pure free functions can be used to define operators.
+// TypeError 6772: (219-234): Function "L.unaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
+// TypeError 7775: (219-234): Only pure free functions can be used to define operators.
+// TypeError 6772: (282-298): Function "L.binaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
+// TypeError 3320: (282-298): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (282-298): Only pure free functions can be used to define operators.
+// TypeError 6772: (325-340): Function "L.unaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
+// TypeError 3320: (325-340): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (325-340): Only pure free functions can be used to define operators.
+// TypeError 6772: (382-398): Function "L.binaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
+// TypeError 3320: (382-398): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (382-398): Only pure free functions can be used to define operators.
+// TypeError 6772: (425-440): Function "L.unaryOperator" is private and therefore cannot be attached to a type outside of the library where it is defined.
+// TypeError 3320: (425-440): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (425-440): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function.sol
new file mode 100644
index 0000000000..e009fa03d9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function.sol
@@ -0,0 +1,12 @@
+using {add as +, sub as -, mul as *} for A global;
+
+function add(A, A) view returns (A) {}
+function sub(A, A) returns (A) {}
+function mul(A, A) payable returns (A) {}
+
+type A is address payable;
+// ----
+// TypeError 7775: (7-10): Only pure free functions can be used to define operators.
+// TypeError 7775: (17-20): Only pure free functions can be used to define operators.
+// TypeError 7775: (27-30): Only pure free functions can be used to define operators.
+// TypeError 9559: (125-166): Free functions cannot be payable.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function_on_built_in_type_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function_on_built_in_type_non_global.sol
new file mode 100644
index 0000000000..15581a1c19
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_non_pure_function_on_built_in_type_non_global.sol
@@ -0,0 +1,8 @@
+// This should point out all 3 errors, rather than give up after the first one.
+using {add as +} for address;
+
+function add(address, address) view returns (address) {}
+// ----
+// TypeError 3320: (87-90): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (87-90): Only pure free functions can be used to define operators.
+// TypeError 5332: (87-90): Operators can only be implemented for user-defined value types.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_overloaded_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_overloaded_function.sol
new file mode 100644
index 0000000000..ccddd3fa7c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_overloaded_function.sol
@@ -0,0 +1,10 @@
+using {add as +} for A global;
+using {add as +} for AP global;
+
+function add(A, A) pure returns (A) {}
+function add(AP, AP) pure returns (AP) {}
+
+type A is address;
+type AP is address payable;
+// ----
+// DeclarationError 9589: (7-10): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_privately_overloaded_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_privately_overloaded_function.sol
new file mode 100644
index 0000000000..d41db77db6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_privately_overloaded_function.sol
@@ -0,0 +1,12 @@
+using {L.add as +} for A global;
+using {L.add as +} for AP global;
+
+library L {
+    function add(A, A) private pure returns (A) {}
+    function add(AP, AP) internal pure returns (AP) {}
+}
+
+type A is address;
+type AP is address payable;
+// ----
+// DeclarationError 9589: (7-12): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_at_file_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_at_file_level.sol
new file mode 100644
index 0000000000..80793f68dc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_at_file_level.sol
@@ -0,0 +1,9 @@
+type B32 is bytes32;
+
+library L {
+    function publicOperator(B32, B32) public pure returns (B32) {}
+}
+
+using {publicOperator as +} for B32 global;
+// ----
+// DeclarationError 9589: (111-125): Identifier is not a function name or not unique.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_in_library.sol b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_in_library.sol
new file mode 100644
index 0000000000..565aa6dc9a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/implementing_operator_with_unqualified_library_function_in_library.sol
@@ -0,0 +1,22 @@
+type B32 is bytes32;
+
+library L {
+    using {externalOperator as +} for B32;
+    using {publicOperator as -} for B32;
+    using {internalOperator as *} for B32;
+    using {privateOperator as /} for B32;
+
+    function externalOperator(B32, B32) external pure returns (B32) {}
+    function publicOperator(B32, B32) public pure returns (B32) {}
+    function internalOperator(B32, B32) internal pure returns (B32) {}
+    function privateOperator(B32, B32) private pure returns (B32) {}
+}
+// ----
+// TypeError 3320: (45-61): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (45-61): Only pure free functions can be used to define operators.
+// TypeError 3320: (88-102): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (88-102): Only pure free functions can be used to define operators.
+// TypeError 3320: (129-145): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (129-145): Only pure free functions can be used to define operators.
+// TypeError 3320: (172-187): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (172-187): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_and_non_global_different_files.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_and_non_global_different_files.sol
new file mode 100644
index 0000000000..94769ee17f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_and_non_global_different_files.sol
@@ -0,0 +1,20 @@
+==== Source: Int.sol ====
+type Int is int;
+
+using {add as +} for Int global;
+
+function add(Int, Int) pure returns (Int) {}
+
+==== Source: test.sol ====
+import "Int.sol";
+
+using {anotherAdd as +} for Int;
+
+function anotherAdd(Int, Int) pure returns (Int) {}
+
+function test() pure returns (Int) {
+    return Int.wrap(0) + Int.wrap(0);
+}
+// ----
+// TypeError 3320: (test.sol:26-36): Operators can only be defined in a global 'using for' directive.
+// TypeError 4705: (test.sol:26-36): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_non_global.sol
new file mode 100644
index 0000000000..0b30e06ba8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_global_non_global.sol
@@ -0,0 +1,26 @@
+type Int is int;
+
+using {add as +} for Int global;
+using {add2 as +} for Int;
+using {unsub as -} for Int global;
+using {unsub2 as -} for Int;
+
+function add(Int, Int) pure returns (Int) {}
+function add2(Int, Int) pure returns (Int) {}
+function unsub(Int) pure returns (Int) {}
+function unsub2(Int) pure returns (Int) {}
+
+function testBinary() pure returns (Int) {
+    return Int.wrap(1) + Int.wrap(2);
+}
+
+function testUnary() pure returns (Int) {
+    return -Int.wrap(2);
+}
+// ----
+// TypeError 4705: (25-28): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
+// TypeError 3320: (58-62): Operators can only be defined in a global 'using for' directive.
+// TypeError 4705: (58-62): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
+// TypeError 4705: (85-90): User-defined unary operator - has more than one definition matching the operand type visible in the current scope.
+// TypeError 3320: (120-126): Operators can only be defined in a global 'using for' directive.
+// TypeError 4705: (120-126): User-defined unary operator - has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_non_global_and_global_different_files.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_non_global_and_global_different_files.sol
new file mode 100644
index 0000000000..2d6e47a8fb
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_non_global_and_global_different_files.sol
@@ -0,0 +1,20 @@
+==== Source: Int.sol ====
+type Int is int;
+
+using {add as +} for Int;
+
+function add(Int, Int) pure returns (Int) {}
+
+==== Source: test.sol ====
+import "Int.sol";
+
+using {anotherAdd as +} for Int global;
+
+function anotherAdd(Int, Int) pure returns (Int) {}
+
+function test() pure returns (Int) {
+    return Int.wrap(0) + Int.wrap(0);
+}
+// ----
+// TypeError 3320: (Int.sol:25-28): Operators can only be defined in a global 'using for' directive.
+// TypeError 4117: (test.sol:19-58): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive.sol
new file mode 100644
index 0000000000..4972deef1f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive.sol
@@ -0,0 +1,13 @@
+type Int is uint128;
+
+using {add as +, sub as +} for Int global;
+
+function add(Int, Int) pure returns (Int) {}
+function sub(Int, Int) pure returns (Int) {}
+
+function test() {
+    Int.wrap(0) + Int.wrap(1);
+}
+// ----
+// TypeError 4705: (29-32): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
+// TypeError 4705: (39-42): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive_operator_not_used.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive_operator_not_used.sol
new file mode 100644
index 0000000000..ec4274c7b8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_different_functions_same_directive_operator_not_used.sol
@@ -0,0 +1,15 @@
+type Int is uint128;
+
+// Still an error, even if the operator is not actually used
+using {add1 as +, add2 as +} for Int global;
+using {unsub1 as -, unsub2 as -} for Int global;
+
+function add1(Int, Int) pure returns (Int) {}
+function add2(Int, Int) pure returns (Int) {}
+function unsub1(Int) pure returns (Int) {}
+function unsub2(Int) pure returns (Int) {}
+// ----
+// TypeError 4705: (90-94): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
+// TypeError 4705: (101-105): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
+// TypeError 4705: (135-141): User-defined unary operator - has more than one definition matching the operand type visible in the current scope.
+// TypeError 4705: (148-154): User-defined unary operator - has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_on_file_and_contract_level.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_on_file_and_contract_level.sol
new file mode 100644
index 0000000000..bb517ca7bf
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_on_file_and_contract_level.sol
@@ -0,0 +1,23 @@
+type Int is int;
+
+using {add as +} for Int global;
+
+function add(Int, Int) pure returns (Int) {}
+function another_add(Int, Int) pure returns (Int) {}
+
+contract B {
+    using {another_add as +} for Int;
+
+    function f() public {
+        Int.wrap(0) + Int.wrap(0);
+    }
+}
+
+contract C is B {
+    function g() public {
+        Int.wrap(0) + Int.wrap(0);
+    }
+}
+// ----
+// TypeError 3320: (175-186): Operators can only be defined in a global 'using for' directive.
+// TypeError 4705: (175-186): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_free_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_free_function.sol
new file mode 100644
index 0000000000..4cd956ba30
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_free_function.sol
@@ -0,0 +1,19 @@
+type Int is int;
+
+function add(Int, Int) pure returns (Int) {}
+function unsub(Int) pure returns (Int) {}
+
+using {add as +, unsub as -} for Int global;
+
+contract C {
+    using {add as +, unsub as -} for Int;
+}
+
+library X {
+    using {add as +, unsub as -} for Int;
+}
+// ----
+// TypeError 3320: (176-179): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (186-191): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (233-236): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (243-248): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_library_function.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_library_function.sol
new file mode 100644
index 0000000000..9fd4c73312
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_different_levels_library_function.sol
@@ -0,0 +1,38 @@
+type Int is int;
+
+library L {
+    using {add as +, unsub as -} for Int;
+    using {L.add as +, L.unsub as -} for Int;
+
+    function add(Int, Int) internal pure returns (Int) {}
+    function unsub(Int) internal pure returns (Int) {}
+}
+
+using {L.add as +, L.unsub as -} for Int global;
+
+contract C {
+    using {L.add as +, L.unsub as -} for Int;
+}
+
+library X {
+    using {L.add as +, L.unsub as -} for Int;
+}
+// ----
+// TypeError 3320: (41-44): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (41-44): Only pure free functions can be used to define operators.
+// TypeError 3320: (51-56): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (51-56): Only pure free functions can be used to define operators.
+// TypeError 3320: (83-88): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (83-88): Only pure free functions can be used to define operators.
+// TypeError 3320: (95-102): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (95-102): Only pure free functions can be used to define operators.
+// TypeError 7775: (242-247): Only pure free functions can be used to define operators.
+// TypeError 7775: (254-261): Only pure free functions can be used to define operators.
+// TypeError 3320: (309-314): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (309-314): Only pure free functions can be used to define operators.
+// TypeError 3320: (321-328): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (321-328): Only pure free functions can be used to define operators.
+// TypeError 3320: (370-375): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (370-375): Only pure free functions can be used to define operators.
+// TypeError 3320: (382-389): Operators can only be defined in a global 'using for' directive.
+// TypeError 7775: (382-389): Only pure free functions can be used to define operators.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_same_directive.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_same_directive.sol
new file mode 100644
index 0000000000..9bb4d62362
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_same_directive.sol
@@ -0,0 +1,9 @@
+type Int is int32;
+
+using {add as +, add as +} for Int global;
+
+function add(Int, Int) pure returns(Int) {}
+
+function f(int32 a, int32 b) pure {
+    Int.wrap(a) + Int.wrap(b);
+}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_separate_directives.sol b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_separate_directives.sol
new file mode 100644
index 0000000000..d2a648e78d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/multiple_operator_definitions_same_function_separate_directives.sol
@@ -0,0 +1,10 @@
+type Int is int32;
+
+using {add as +} for Int global;
+using {add as +} for Int global;
+
+function add(Int, Int) pure returns(Int) {}
+
+function f(int32 a, int32 b) pure {
+    Int.wrap(a) + Int.wrap(b);
+}
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_overloading.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_overloading.sol
new file mode 100644
index 0000000000..e7b0a76428
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_overloading.sol
@@ -0,0 +1,14 @@
+type Int is uint128;
+
+using {add as +, add128 as +} for Int global;
+
+function add(Int, Int) pure returns (Int) {}
+function add128(Int, int128) pure returns (Int) {}
+
+function test() {
+    Int.wrap(0) + Int.wrap(1);
+}
+// ----
+// TypeError 4705: (29-32): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
+// TypeError 1884: (129-142): Wrong parameters in operator definition. The function "add128" needs to have two parameters of type Int and the same data location to be used for the operator +.
+// TypeError 4705: (39-45): User-defined binary operator + has more than one definition matching the operand type visible in the current scope.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_function_name_missing.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_function_name_missing.sol
new file mode 100644
index 0000000000..5911fc6535
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_function_name_missing.sol
@@ -0,0 +1,3 @@
+using {as -} for uint global;
+// ----
+// ParserError 2314: (7-9): Expected identifier but got 'as'
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_no_brace.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_no_brace.sol
new file mode 100644
index 0000000000..1a1be262a0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_no_brace.sol
@@ -0,0 +1,3 @@
+using f as - for uint global;
+// ----
+// ParserError 2314: (8-10): Expected 'for' but got 'as'
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_non_user_definable.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_non_user_definable.sol
new file mode 100644
index 0000000000..ed4fb13a48
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_non_user_definable.sol
@@ -0,0 +1,45 @@
+using {
+    f as new,
+    f as delete,
+    f as **,
+    f as <<,
+    f as >>,
+    f as &&,
+    f as ||,
+    f as !,
+    f as =,
+    f as |=,
+    f as ^=,
+    f as &=,
+    f as <<=,
+    f as >>=,
+    f as +=,
+    f as -=,
+    f as *=,
+    f as /=,
+    f as %=,
+    f as ++,
+    f as --
+} for int256 global;
+// ----
+// ParserError 4403: (17-20): Not a user-definable operator: new. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (31-37): Not a user-definable operator: delete. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (48-50): Not a user-definable operator: **. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (61-63): Not a user-definable operator: <<. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (74-76): Not a user-definable operator: >>. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (87-89): Not a user-definable operator: &&. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (100-102): Not a user-definable operator: ||. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (113-114): Not a user-definable operator: !. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (125-126): Not a user-definable operator: =. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (137-139): Not a user-definable operator: |=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (150-152): Not a user-definable operator: ^=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (163-165): Not a user-definable operator: &=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (176-179): Not a user-definable operator: <<=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (190-193): Not a user-definable operator: >>=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (204-206): Not a user-definable operator: +=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (217-219): Not a user-definable operator: -=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (230-232): Not a user-definable operator: *=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (243-245): Not a user-definable operator: /=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (256-258): Not a user-definable operator: %=. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (269-271): Not a user-definable operator: ++. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (282-284): Not a user-definable operator: --. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_not_an_operator.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_not_an_operator.sol
new file mode 100644
index 0000000000..7fa8c5eeb1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_not_an_operator.sol
@@ -0,0 +1,14 @@
+using {
+    f as x,
+    f as operator,
+    f as as,
+    f as 123,
+    f as ()
+} for int256 global;
+// ----
+// ParserError 4403: (17-18): Not a user-definable operator: x. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (29-37): Not a user-definable operator: operator. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (48-50): Not a user-definable operator: as. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (61-64): Not a user-definable operator: 123. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (75-76): Not a user-definable operator: (. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 2314: (76-77): Expected '}' but got ')'
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_missing.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_missing.sol
new file mode 100644
index 0000000000..a6970a9b82
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_missing.sol
@@ -0,0 +1,4 @@
+using {f as} for uint global;
+// ----
+// ParserError 4403: (11-12): Not a user-definable operator: }. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 2314: (13-16): Expected '}' but got 'for'
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_named_as.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_named_as.sol
new file mode 100644
index 0000000000..5266931894
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_named_as.sol
@@ -0,0 +1,3 @@
+using {f as as} for uint global;
+// ----
+// ParserError 4403: (12-14): Not a user-definable operator: as. Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_returning_wrong_types.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_returning_wrong_types.sol
new file mode 100644
index 0000000000..676f2c475b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_returning_wrong_types.sol
@@ -0,0 +1,33 @@
+type Int is int256;
+
+using {
+    add as +,
+    div as /,
+    unsub as -,
+    bitnot as ~,
+    gt as >,
+    lt as <
+} for Int global;
+
+function add(Int x, Int y) pure returns (int256) {}
+function div(Int x, Int y) pure {}
+function unsub(Int) pure returns (Int, Int) {}
+function bitnot(Int) pure returns (int256) {}
+function gt(Int, Int) pure returns (Int) {}
+function lt(Int, Int) pure returns (bool, Int) {}
+
+function f() pure {
+    Int.wrap(0) + Int.wrap(1);
+    Int.wrap(0) / Int.wrap(0);
+    -Int.wrap(0);
+    ~Int.wrap(0);
+    Int.wrap(0) < Int.wrap(0);
+    Int.wrap(0) > Int.wrap(0);
+}
+// ----
+// TypeError 7743: (174-182): Wrong return parameters in operator definition. The function "add" needs to return exactly one value of type Int to be used for the operator +.
+// TypeError 7743: (218-218): Wrong return parameters in operator definition. The function "div" needs to return exactly one value of type Int to be used for the operator /.
+// TypeError 7743: (254-264): Wrong return parameters in operator definition. The function "unsub" needs to return exactly one value of type Int to be used for the operator -.
+// TypeError 7743: (302-310): Wrong return parameters in operator definition. The function "bitnot" needs to return exactly one value of type Int to be used for the operator ~.
+// TypeError 7743: (349-354): Wrong return parameters in operator definition. The function "gt" needs to return exactly one value of type bool to be used for the operator >.
+// TypeError 7743: (393-404): Wrong return parameters in operator definition. The function "lt" needs to return exactly one value of type bool to be used for the operator <.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_and_returning_types_not_matching_using_for.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_and_returning_types_not_matching_using_for.sol
new file mode 100644
index 0000000000..1d034c8ec3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_and_returning_types_not_matching_using_for.sol
@@ -0,0 +1,26 @@
+type Int is int256;
+
+using {
+    add as +,
+    sub as -,
+    div as /
+} for Int global;
+
+function add(Int) pure returns (Int) {}
+function sub(Int, Int, Int) pure returns (Int) {}
+function div(int256, int256) pure returns (Int) {}
+
+function f() pure {
+    Int.wrap(0) + Int.wrap(1);
+    Int.wrap(0) - Int.wrap(0);
+    Int.wrap(0) / Int.wrap(0);
+}
+
+// ----
+// TypeError 1884: (101-106): Wrong parameters in operator definition. The function "add" needs to have two parameters of type Int and the same data location to be used for the operator +.
+// TypeError 1884: (141-156): Wrong parameters in operator definition. The function "sub" needs to have one or two parameters of type Int and the same data location to be used for the operator -.
+// TypeError 1884: (191-207): Wrong parameters in operator definition. The function "div" needs to have one or two parameters of type Int and the same data location to be used for the operator /.
+// TypeError 7743: (221-226): Wrong return parameters in operator definition. The function "div" needs to return a value of the same type and data location as its parameters to be used for the operator /.
+// TypeError 2271: (255-280): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
+// TypeError 2271: (286-311): Built-in binary operator - cannot be applied to types Int and Int. No matching user-defined operator found.
+// TypeError 2271: (317-342): Built-in binary operator / cannot be applied to types Int and Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_binary.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_binary.sol
new file mode 100644
index 0000000000..ffd35cc1da
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_binary.sol
@@ -0,0 +1,11 @@
+type Int is int;
+
+using {
+    f as +
+} for Int global;
+
+function f() returns (Int) {
+    return Int.wrap(0);
+}
+// ----
+// TypeError 4731: (30-31): The function "f" does not have any parameters, and therefore cannot be attached to the type "Int".
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_unary.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_unary.sol
new file mode 100644
index 0000000000..323b564494
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_no_parameters_unary.sol
@@ -0,0 +1,11 @@
+type Int is int;
+
+using {
+    f as ~
+} for Int global;
+
+function f() returns (Int) {
+    return Int.wrap(0);
+}
+// ----
+// TypeError 4731: (30-31): The function "f" does not have any parameters, and therefore cannot be attached to the type "Int".
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_or_returning_different_types.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_or_returning_different_types.sol
new file mode 100644
index 0000000000..c254ad04a1
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_or_returning_different_types.sol
@@ -0,0 +1,20 @@
+type Int is int128;
+
+using {
+    add as +,
+    sub as -,
+    mul as *,
+    div as /
+} for Int global;
+
+function add(Int, int128) pure returns (Int) {}
+function sub(int128, Int) pure returns (int128) {}
+function mul(int128, int256) pure returns (Int) {}
+function div(Int, Int) pure returns (int256) {}
+// ----
+// TypeError 1884: (115-128): Wrong parameters in operator definition. The function "add" needs to have two parameters of type Int and the same data location to be used for the operator +.
+// TypeError 1884: (163-176): Wrong parameters in operator definition. The function "sub" needs to have one or two parameters of type Int and the same data location to be used for the operator -.
+// TypeError 7743: (190-198): Wrong return parameters in operator definition. The function "sub" needs to return exactly one value of type Int to be used for the operator -.
+// TypeError 1884: (214-230): Wrong parameters in operator definition. The function "mul" needs to have two parameters of type Int and the same data location to be used for the operator *.
+// TypeError 7743: (244-249): Wrong return parameters in operator definition. The function "mul" needs to return a value of the same type and data location as its parameters to be used for the operator *.
+// TypeError 7743: (289-297): Wrong return parameters in operator definition. The function "div" needs to return exactly one value of type Int to be used for the operator /.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_two_parameters_unary.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_two_parameters_unary.sol
new file mode 100644
index 0000000000..81d4546239
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_taking_two_parameters_unary.sol
@@ -0,0 +1,14 @@
+type Int is int128;
+
+using {bitnot as ~} for Int global;
+
+function bitnot(Int, Int) pure returns (Int) {}
+
+contract C {
+    function test() public pure {
+        ~Int.wrap(1);
+    }
+}
+// ----
+// TypeError 1884: (73-83): Wrong parameters in operator definition. The function "bitnot" needs to have exactly one parameter of type Int to be used for the operator ~.
+// TypeError 4907: (162-174): Built-in unary operator ~ cannot be applied to type Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_attaching_functions_and_defining_operators_same_directive.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_attaching_functions_and_defining_operators_same_directive.sol
new file mode 100644
index 0000000000..612c377e9d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_attaching_functions_and_defining_operators_same_directive.sol
@@ -0,0 +1,10 @@
+type AP is address payable;
+
+function sub(AP, AP) pure returns (AP) {}
+function unsub(AP) pure returns (AP) {}
+
+function attachedPure(AP, uint, address) pure {}
+function attachedView(AP) view {}
+function attached(AP, function(AP)) {}
+
+using {sub as -, attachedPure, attachedView, unsub as -, attached} for AP global;
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_for_contract_level_type.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_for_contract_level_type.sol
new file mode 100644
index 0000000000..9b7f80054f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_for_contract_level_type.sol
@@ -0,0 +1,19 @@
+library L {
+    type FixedBytes is bytes10;
+}
+
+function add(L.FixedBytes, L.FixedBytes) pure returns (L.FixedBytes) {}
+function unsub(L.FixedBytes, L.FixedBytes) pure returns (L.FixedBytes) {}
+
+library LX {
+    using {add as +, unsub as -} for L.FixedBytes;
+}
+
+contract CX {
+    using {add as +, unsub as -} for L.FixedBytes;
+}
+// ----
+// TypeError 3320: (218-221): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (228-233): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (286-289): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (296-301): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global.sol
new file mode 100644
index 0000000000..c99fd0e684
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global.sol
@@ -0,0 +1,13 @@
+type Int is int16;
+
+function add(Int, Int) pure returns (Int) {}
+
+contract C {
+    using {add as +} for Int global;
+
+    function test() pure public {
+        Int.wrap(0) + Int.wrap(0);
+    }
+}
+// ----
+// SyntaxError 3367: (83-115): "global" can only be used at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global_different_file.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global_different_file.sol
new file mode 100644
index 0000000000..d4f9d9ac10
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_global_different_file.sol
@@ -0,0 +1,13 @@
+==== Source: s1.sol ====
+type Int is int;
+
+==== Source: s2.sol ====
+import "s1.sol";
+
+function bitnot(Int) pure returns (Int) {}
+
+contract C {
+    using {bitnot as ~} for Int global;
+}
+// ----
+// SyntaxError 3367: (s2.sol:79-114): "global" can only be used at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_base_contract.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_base_contract.sol
new file mode 100644
index 0000000000..17351599f9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_base_contract.sol
@@ -0,0 +1,30 @@
+type Int is int128;
+
+function add(Int, Int) pure returns (Int) {}
+function another_add(Int, Int) pure returns (Int) {}
+
+contract B {
+    using {add as +} for Int;
+
+    function f() pure public returns (Int) {
+        return Int.wrap(0) + Int.wrap(0);
+    }
+}
+
+contract C is B {
+    using {another_add as +} for Int;
+
+    function g() pure public returns (Int) {
+        return Int.wrap(0) + Int.wrap(0);
+    }
+}
+
+contract D is B {
+    function h() pure public returns (Int) {
+        return Int.wrap(0) + Int.wrap(0);
+    }
+}
+// ----
+// TypeError 3320: (144-147): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (289-300): Operators can only be defined in a global 'using for' directive.
+// TypeError 2271: (491-516): Built-in binary operator + cannot be applied to types Int and Int. No matching user-defined operator found.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_interface.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_interface.sol
new file mode 100644
index 0000000000..46dbee9708
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_contract_level_in_interface.sol
@@ -0,0 +1,10 @@
+type Int is int;
+
+function add(Int, Int) pure returns (Int) {}
+
+interface I {
+    using {add as +} for Int;
+}
+// ----
+// SyntaxError 9088: (82-107): The "using for" directive is not allowed inside interfaces.
+// TypeError 3320: (89-92): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type.sol
new file mode 100644
index 0000000000..6efae72fe8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type.sol
@@ -0,0 +1,27 @@
+library L {
+    type FixedBytes is bytes1;
+}
+
+contract C {
+    type FixedBytes is bytes2;
+}
+
+interface I {
+    type FixedBytes is bytes3;
+}
+
+function addL(L.FixedBytes, L.FixedBytes) pure returns (L.FixedBytes) {}
+function addC(C.FixedBytes, C.FixedBytes) pure returns (C.FixedBytes) {}
+function addI(I.FixedBytes, I.FixedBytes) pure returns (I.FixedBytes) {}
+
+function unsubL(L.FixedBytes) pure returns (L.FixedBytes) {}
+function unsubC(C.FixedBytes) pure returns (C.FixedBytes) {}
+function unsubI(I.FixedBytes) pure returns (I.FixedBytes) {}
+
+using {addL as +, unsubL as -} for L.FixedBytes global;
+using {addC as +, unsubC as -} for C.FixedBytes global;
+using {addI as +, unsubI as -} for I.FixedBytes global;
+// ----
+// TypeError 4117: (545-600): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 4117: (601-656): Can only use "global" with types defined in the same source unit at file level.
+// TypeError 4117: (657-712): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type_non_global.sol
new file mode 100644
index 0000000000..fa0e467eba
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_for_contract_level_type_non_global.sol
@@ -0,0 +1,30 @@
+library L {
+    type FixedBytes is bytes1;
+}
+
+contract C {
+    type FixedBytes is bytes2;
+}
+
+interface I {
+    type FixedBytes is bytes3;
+}
+
+function addL(L.FixedBytes, L.FixedBytes) pure returns (L.FixedBytes) {}
+function addC(C.FixedBytes, C.FixedBytes) pure returns (C.FixedBytes) {}
+function addI(I.FixedBytes, I.FixedBytes) pure returns (I.FixedBytes) {}
+
+function unsubL(L.FixedBytes) pure returns (L.FixedBytes) {}
+function unsubC(C.FixedBytes) pure returns (C.FixedBytes) {}
+function unsubI(I.FixedBytes) pure returns (I.FixedBytes) {}
+
+using {addL as +, unsubL as -} for L.FixedBytes;
+using {addC as +, unsubC as -} for C.FixedBytes;
+using {addI as +, unsubI as -} for I.FixedBytes;
+// ----
+// TypeError 3320: (552-556): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (563-569): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (601-605): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (612-618): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (650-654): Operators can only be defined in a global 'using for' directive.
+// TypeError 3320: (661-667): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_and_non_global.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_and_non_global.sol
new file mode 100644
index 0000000000..b04934d96c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_and_non_global.sol
@@ -0,0 +1,23 @@
+==== Source: s1.sol ====
+type Int is int;
+
+using {add as +} for Int global;
+using {add as +} for Int;
+
+function add(Int a, Int b) pure returns (Int) {}
+function test_add() pure returns (Int) {}
+
+==== Source: s2.sol ====
+import "s1.sol";
+
+contract C2 {
+    function test1() pure public returns (Int) {
+        return test_add();
+    }
+
+    function test2() pure public returns (Int) {
+        return Int.wrap(3) + Int.wrap(4);
+    }
+}
+// ----
+// TypeError 3320: (s1.sol:58-61): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_different_file.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_different_file.sol
new file mode 100644
index 0000000000..7eda376e36
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_different_file.sol
@@ -0,0 +1,11 @@
+==== Source: s1.sol ====
+type Int is int;
+
+==== Source: s2.sol ====
+import "s1.sol";
+
+function bitnot(Int) pure returns (Int) {}
+
+using {bitnot as ~} for Int global;
+// ----
+// TypeError 4117: (s2.sol:62-97): Can only use "global" with types defined in the same source unit at file level.
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_unary_and_non_global_binary_same_file.sol b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_unary_and_non_global_binary_same_file.sol
new file mode 100644
index 0000000000..68f6198867
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/using_for_with_operator_at_file_level_global_unary_and_non_global_binary_same_file.sol
@@ -0,0 +1,20 @@
+type Int is int16;
+
+using {unsub as -} for Int global;
+using {sub as -} for Int;
+
+function sub(Int a, Int b) pure returns (Int) {}
+
+function unsub(Int a) pure returns (Int) {}
+
+contract C {
+    function test_sub() public pure returns (Int) {
+        return Int.wrap(7) - Int.wrap(2);
+    }
+
+    function test_unsub() public pure returns (Int) {
+        return -Int.wrap(4);
+    }
+}
+// ----
+// TypeError 3320: (62-65): Operators can only be defined in a global 'using for' directive.
diff --git a/test/libsolidity/syntaxTests/using/using_for_enum.sol b/test/libsolidity/syntaxTests/using/using_for_enum.sol
new file mode 100644
index 0000000000..e7c6b5c820
--- /dev/null
+++ b/test/libsolidity/syntaxTests/using/using_for_enum.sol
@@ -0,0 +1,5 @@
+enum E {A, B, C}
+
+function f(E) {}
+
+using {f} for E;
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/user_operator_with_pure_modifier_can_be_restricted.sol b/test/libsolidity/syntaxTests/viewPureChecker/user_operator_with_pure_modifier_can_be_restricted.sol
new file mode 100644
index 0000000000..eb7ce354dc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/user_operator_with_pure_modifier_can_be_restricted.sol
@@ -0,0 +1,20 @@
+type Int is uint8;
+
+using {add as +} for Int global;
+
+function add(Int, Int) pure returns (Int) {}
+
+function f() pure {
+    Int.wrap(0) + Int.wrap(1);
+}
+
+function g() view {
+    Int.wrap(0) + Int.wrap(1);
+}
+
+function h() {
+    Int.wrap(0) + Int.wrap(1);
+}
+// ----
+// Warning 2018: (154-206): Function state mutability can be restricted to pure
+// Warning 2018: (208-255): Function state mutability can be restricted to pure

From 6216842458dde5137196ea14e94197b8b1931e36 Mon Sep 17 00:00:00 2001
From: William Entriken <github.com@phor.net>
Date: Sat, 11 Feb 2023 20:00:13 -0500
Subject: [PATCH 1208/1748] Add recommendation for leading underscore, see
 #11764
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Update docs/style-guide.rst

Co-authored-by: Nuno Santos <nunofilipesantos@gmail.com>

Update docs/style-guide.rst

Update docs/style-guide.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

Update docs/style-guide.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

Update docs/style-guide.rst

Update docs/style-guide.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

Update docs/style-guide.rst

Update docs/style-guide.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

Update docs/style-guide.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

Update docs/style-guide.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

Update docs/style-guide.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

Update docs/style-guide.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

Update docs/style-guide.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
---
 docs/style-guide.rst | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 35e7324c99..fab46f139a 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -1284,6 +1284,21 @@ Avoiding Naming Collisions
 This convention is suggested when the desired name collides with that of
 an existing state variable, function, built-in or otherwise reserved name.
 
+Underscore Prefix for Non-external Functions and Variables
+==========================================================
+
+* ``_singleLeadingUnderscore``
+
+This convention is suggested for non-external functions and state variables (``private`` or ``internal``). State variables without a specified visibility are ``internal`` by default.
+
+When designing a smart contract, the public-facing API (functions that can be called by any account)
+is an important consideration.
+Leading underscores allow you to immediately recognize the intent of such functions,
+but more importantly, if you change a function from non-external to external (including ``public``)
+and rename it accordingly, this forces you to review every call site while renaming.
+This can be an important manual check against unintended external functions
+and a common source of security vulnerabilities (avoid find-replace-all tooling for this change).
+
 .. _style_guide_natspec:
 
 *******

From 94ab0e3c53f0e28a10291a3ad29272cda91e014c Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 22 Feb 2023 08:43:41 +0100
Subject: [PATCH 1209/1748] Sort Changelog for 0.8.19

---
 Changelog.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 447f9f9279..1c5edccaa1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,12 +9,12 @@ Compiler Features:
 
 
 Bugfixes:
- * Code Generator: Avoid including references to the deployed label of referenced functions if they are called right away.
  * Assembler: Avoid duplicating subassembly bytecode where possible.
+ * Code Generator: Avoid including references to the deployed label of referenced functions if they are called right away.
  * ContractLevelChecker: Properly distinguish the case of missing base constructor arguments from having an unimplemented base function.
+ * SMTChecker: Fix internal error caused by unhandled ``z3`` expressions that come from the solver when bitwise operators are used.
  * SMTChecker: Fix internal error when using the custom NatSpec annotation to abstract free functions.
  * TypeChecker: Also allow external library functions in ``using for``.
- * SMTChecker: Fix internal error caused by unhandled ``z3`` expressions that come from the solver when bitwise operators are used.
 
 
 AST Changes:

From 486be8f10dc344614c01eda04ff730d6a86a1324 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 22 Feb 2023 08:43:41 +0100
Subject: [PATCH 1210/1748] Sort Changelog for 0.8.19

---
 Changelog.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 447f9f9279..1c5edccaa1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,12 +9,12 @@ Compiler Features:
 
 
 Bugfixes:
- * Code Generator: Avoid including references to the deployed label of referenced functions if they are called right away.
  * Assembler: Avoid duplicating subassembly bytecode where possible.
+ * Code Generator: Avoid including references to the deployed label of referenced functions if they are called right away.
  * ContractLevelChecker: Properly distinguish the case of missing base constructor arguments from having an unimplemented base function.
+ * SMTChecker: Fix internal error caused by unhandled ``z3`` expressions that come from the solver when bitwise operators are used.
  * SMTChecker: Fix internal error when using the custom NatSpec annotation to abstract free functions.
  * TypeChecker: Also allow external library functions in ``using for``.
- * SMTChecker: Fix internal error caused by unhandled ``z3`` expressions that come from the solver when bitwise operators are used.
 
 
 AST Changes:

From 02b02f507ddfe6b0ebc3ea199ac750e31b781be0 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 22 Feb 2023 12:17:21 +0100
Subject: [PATCH 1211/1748] Set version to 0.8.20

---
 CMakeLists.txt            |  2 +-
 Changelog.md              | 13 ++++++++++++-
 docs/bugs_by_version.json |  4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cefaeeb656..0e8460885b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.19")
+set(PROJECT_VERSION "0.8.20")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 1c5edccaa1..123bddeb52 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,15 @@
-### 0.8.19 (unreleased)
+### 0.8.20 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
+### 0.8.19 (2023-02-22)
 
 Language Features:
 * Allow defining custom operators for user-defined value types via ``using {f as +} for T global`` syntax.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 1541a4655d..4bbf5584b1 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1776,6 +1776,10 @@
         "bugs": [],
         "released": "2023-02-01"
     },
+    "0.8.19": {
+        "bugs": [],
+        "released": "2023-02-22"
+    },
     "0.8.2": {
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",

From 5f0f91974af8bf85dd2798ea3c5dff32879efed6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikola=20Mati=C4=87?= <nikola.matic@ethereum.org>
Date: Wed, 22 Feb 2023 13:27:50 +0100
Subject: [PATCH 1212/1748] Revert "Set version to 0.8.20"

---
 CMakeLists.txt            |  2 +-
 Changelog.md              | 13 +------------
 docs/bugs_by_version.json |  4 ----
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e8460885b..cefaeeb656 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.20")
+set(PROJECT_VERSION "0.8.19")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 123bddeb52..1c5edccaa1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,15 +1,4 @@
-### 0.8.20 (unreleased)
-
-Language Features:
-
-
-Compiler Features:
-
-
-Bugfixes:
-
-
-### 0.8.19 (2023-02-22)
+### 0.8.19 (unreleased)
 
 Language Features:
 * Allow defining custom operators for user-defined value types via ``using {f as +} for T global`` syntax.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 4bbf5584b1..1541a4655d 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1776,10 +1776,6 @@
         "bugs": [],
         "released": "2023-02-01"
     },
-    "0.8.19": {
-        "bugs": [],
-        "released": "2023-02-22"
-    },
     "0.8.2": {
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",

From 21823613bcc491d33b2a878eea22b2d973cd8a1e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 22 Feb 2023 13:33:25 +0100
Subject: [PATCH 1213/1748] Set release date for 0.8.19

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 1c5edccaa1..7877a11d5a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.19 (unreleased)
+### 0.8.19 (2023-02-22)
 
 Language Features:
 * Allow defining custom operators for user-defined value types via ``using {f as +} for T global`` syntax.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 1541a4655d..4bbf5584b1 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1776,6 +1776,10 @@
         "bugs": [],
         "released": "2023-02-01"
     },
+    "0.8.19": {
+        "bugs": [],
+        "released": "2023-02-22"
+    },
     "0.8.2": {
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",

From b6df64e4fd34242d8455e2043e490d59c7d3a608 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 22 Feb 2023 19:41:03 +0100
Subject: [PATCH 1214/1748] Set version to 0.8.20

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cefaeeb656..0e8460885b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.19")
+set(PROJECT_VERSION "0.8.20")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 7877a11d5a..3efe2bb2a5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+## 0.8.20 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.19 (2023-02-22)
 
 Language Features:

From 17bb4d8b032f63f2e7ed47f4f61f07ce83c293ea Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 22 Feb 2023 20:46:22 +0100
Subject: [PATCH 1215/1748] Revert debian compatibility for ubuntu focal
 support.

---
 scripts/deps-ppa/static_z3.sh | 6 +++---
 scripts/release_ppa.sh        | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index 35fff526f9..fa237ba08f 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -73,16 +73,16 @@ cp "/tmp/${packagename}_${debversion}.orig.tar.gz" ../
 # Create debian package information
 
 mkdir debian
-echo 13 > debian/compat
+echo 9 > debian/compat
 # TODO: the Z3 packages have different build dependencies
 cat <<EOF > debian/control
 Source: z3-static
 Section: science
 Priority: extra
 Maintainer: Daniel Kirchner <daniel@ekpyron.org>
-Build-Depends: debhelper (>= 13.0.0),
+Build-Depends: debhelper (>= 9.0.0),
                cmake,
-               g++ (>= 9.0),
+               g++ (>= 5.0),
                git,
                libgmp-dev,
                dh-python,
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index cf3e4b3356..2acd62cd36 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -156,15 +156,15 @@ cp "/tmp/${packagename}_${debversion}.orig.tar.gz" ../
 # Create debian package information
 
 mkdir debian
-echo 13 > debian/compat
+echo 9 > debian/compat
 cat <<EOF > debian/control
 Source: solc
 Section: science
 Priority: extra
 Maintainer: Christian (Buildserver key) <builds@ethereum.org>
-Build-Depends: ${SMTDEPENDENCY}debhelper (>= 13.0.0),
+Build-Depends: ${SMTDEPENDENCY}debhelper (>= 9.0.0),
                cmake,
-               g++ (>= 9.0),
+               g++ (>= 5.0),
                git,
                libgmp-dev,
                libboost-all-dev,

From b8e74ffc57370a90f2f2c48316b85cd66a096b2b Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Thu, 23 Feb 2023 12:09:12 +0000
Subject: [PATCH 1216/1748] Update smtchecker.rst

Fixes #13988
---
 docs/smtchecker.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index 276f9c33a0..05d50cdce2 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -706,7 +706,7 @@ Reported Inferred Inductive Invariants
 For properties that were proved safe with the CHC engine,
 the SMTChecker can retrieve inductive invariants that were inferred by the Horn
 solver as part of the proof.
-Currently two types of invariants can be reported to the user:
+Currently only two types of invariants can be reported to the user:
 
 - Contract Invariants: these are properties over the contract's state variables
   that are true before and after every possible transaction that the contract may ever run. For example, ``x >= y``, where ``x`` and ``y`` are a contract's state variables.

From 0904bb3a3ceacceb105e9d1ebe4fe417ed36055f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 23 Feb 2023 16:51:56 +0100
Subject: [PATCH 1217/1748] Update github actions to match renamed labels
 (lower case, no dashes)

---
 .github/workflows/stale.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 4761c62ac2..0824290c73 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -33,8 +33,8 @@ jobs:
             However, unless the issue is a concrete proposal that can be implemented, we recommend starting a language discussion on the [forum](https://forum.soliditylang.org) instead.
           ascending: true
           stale-issue-label: stale
-          close-issue-label: closed-due-inactivity
-          exempt-issue-labels: 'bug :bug:,epic,roadmap,selected-for-development,must have,must have eventually,SMT'
+          close-issue-label: 'closed due inactivity'
+          exempt-issue-labels: 'bug :bug:,epic,roadmap,selected for development,must have,must have eventually,smt'
           stale-pr-message: |
             This pull request is stale because it has been open for ${{ env.BEFORE_PR_STALE }} days with no activity.
             It will be closed in ${{ env.BEFORE_PR_CLOSE }} days unless the `stale` label is removed.

From 93c8120a249a7359f861618593d83310ae2d268b Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov@gmail.com>
Date: Fri, 1 Jul 2022 12:09:08 +0200
Subject: [PATCH 1218/1748] Initialize vars before use

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
---
 liblangutil/Scanner.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/liblangutil/Scanner.cpp b/liblangutil/Scanner.cpp
index d769a93631..1b9b2afac2 100644
--- a/liblangutil/Scanner.cpp
+++ b/liblangutil/Scanner.cpp
@@ -540,8 +540,8 @@ void Scanner::scanToken()
 
 	Token token;
 	// M and N are for the purposes of grabbing different type sizes
-	unsigned m;
-	unsigned n;
+	unsigned m = 0;
+	unsigned n = 0;
 	do
 	{
 		// Remember the position of the next token

From 1ac3abfbb76962479cf028493b987e0440e302b7 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Wed, 7 Dec 2022 10:57:01 +0100
Subject: [PATCH 1219/1748] Strict assembly fuzzer: Change optimization setting
 from full to minimal.

---
 test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp b/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
index b9473f613a..c7ffd3d417 100644
--- a/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
+++ b/test/tools/ossfuzz/strictasm_assembly_ossfuzz.cpp
@@ -41,7 +41,7 @@ extern "C" int LLVMFuzzerTestOneInput(uint8_t const* _data, size_t _size)
 		langutil::EVMVersion(),
 		nullopt,
 		YulStack::Language::StrictAssembly,
-		solidity::frontend::OptimiserSettings::full(),
+		solidity::frontend::OptimiserSettings::minimal(),
 		langutil::DebugInfoSelection::All()
 	);
 

From 817a57b365ff16603f3b50e598ef27dbfd9b3380 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 6 Mar 2023 18:20:49 +0100
Subject: [PATCH 1220/1748] Use std:: prefix with std::forward() as well to
 satisfy Clang

---
 CODING_STYLE.md                     | 2 +-
 ReviewChecklist.md                  | 2 +-
 libsolidity/ast/ASTJsonImporter.cpp | 2 +-
 scripts/check_style.sh              | 3 ++-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CODING_STYLE.md b/CODING_STYLE.md
index 2b1e36fc66..87b6166d1b 100644
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -55,7 +55,7 @@ To set indentation and tab width settings uniformly, the repository contains an
 3. All symbols should be declared in a namespace except for final applications.
 4. Use anonymous namespaces for helpers whose scope is a cpp file only.
 5. Preprocessor symbols should be prefixed with the namespace in all-caps and an underscore.
-6. Do not use `std::` qualifier in cpp files (see 2.), except for `std::move`, which will otherwise cause the `check_style` step to fail.
+6. Do not use `std::` qualifier in cpp files (see 2.), except for `std::move` and `std::forward`, which will otherwise cause the `check_style` step to fail.
 
 Only in the header:
 ```cpp
diff --git a/ReviewChecklist.md b/ReviewChecklist.md
index c85a505460..3f0af6f981 100644
--- a/ReviewChecklist.md
+++ b/ReviewChecklist.md
@@ -102,7 +102,7 @@ The following points are all covered by the coding style but come up so often th
     already used elsewhere in the same expression.
 - [ ] **Indent braces and parentheses in a way that makes nesting clear.**
 - [ ] **Use `using namespace` only in `.cpp` files.** Use it for `std` and our own modules.
-    Avoid unnecessary `std::` prefix in `.cpp` files (except for `std::move`).
+    Avoid unnecessary `std::` prefix in `.cpp` files (except for `std::move` and `std::forward`).
 - [ ] **Use range-based loops and destructuring.**
 - [ ] **Include any headers you use directly,** even if they are implicitly included through other headers.
 
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 4f4b9c17ba..a1201983fe 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -84,7 +84,7 @@ ASTPointer<T> ASTJsonImporter::createASTNode(Json::Value const& _node, Args&&...
 	auto n = make_shared<T>(
 		id,
 		createSourceLocation(_node),
-		forward<Args>(_args)...
+		std::forward<Args>(_args)...
 	);
 	return n;
 }
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index e3dbe6cb6a..0953106d3b 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -55,8 +55,9 @@ FORMATERROR=$(
     preparedGrep "[a-zA-Z0-9_]\s*[&][a-zA-Z_]" | grep -E -v "return [&]" # right-aligned reference ampersand (needs to exclude return)
     # right-aligned reference pointer star (needs to exclude return and comments)
     preparedGrep "[a-zA-Z0-9_]\s*[*][a-zA-Z_]" | grep -E -v -e "return [*]" -e "^* [*]" -e "^*//.*"
-    # unqualified move check, i.e. make sure that std::move() is used instead of move()
+    # unqualified move()/forward() checks, i.e. make sure that std::move() and std::forward() are used instead of move() and forward()
     preparedGrep "move\(.+\)" | grep -v "std::move" | grep -E "[^a-z]move"
+    preparedGrep "forward\(.+\)" | grep -v "std::forward" | grep -E "[^a-z]forward"
 ) | grep -E -v -e "^[a-zA-Z\./]*:[0-9]*:\s*\/(\/|\*)" -e "^test/" || true
 )
 

From ca55115ca576274e4ef2727bd24fda271088e7c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 6 Mar 2023 19:00:56 +0100
Subject: [PATCH 1221/1748] fix b_ubu_ubsan_clang running the address sanitizer
 instead of the undefined behavior sanitizer

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c628461453..6994ad91ab 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -650,7 +650,7 @@ defaults:
   - job_b_ubu_ubsan_clang: &job_b_ubu_ubsan_clang
       <<: *workflow_trigger_on_tags
       name: b_ubu_ubsan_clang
-      cmake_options: -DSANITIZE=address
+      cmake_options: -DSANITIZE=undefined
 
 # -----------------------------------------------------------------------------------------------
 jobs:

From c95108169db90be1ed28539b88ae395ddae56dd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 6 Mar 2023 19:20:06 +0100
Subject: [PATCH 1222/1748] Fix `member call on null pointer` when
 type-checking built-in unary operators

---
 libsolidity/analysis/TypeChecker.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index a0ca580a36..717fa043b1 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1780,11 +1780,10 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 
 	_operation.annotation().userDefinedFunction = operatorDefinition;
 
-	TypePointers const& returnParameterTypes = _operation.userDefinedFunctionType()->returnParameterTypes();
-	if (operatorDefinition && !returnParameterTypes.empty())
+	if (operatorDefinition && !_operation.userDefinedFunctionType()->returnParameterTypes().empty())
 		// Use the actual result type from operator definition. Ignore all values but the
 		// first one - in valid code there will be only one anyway.
-		resultType = returnParameterTypes[0];
+		resultType = _operation.userDefinedFunctionType()->returnParameterTypes()[0];
 	_operation.annotation().type = resultType;
 	_operation.annotation().isConstant = false;
 	_operation.annotation().isPure =

From f974dbc205f0bb8e2362af71deaf2f2802ba60d1 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 6 Mar 2023 18:59:46 +0100
Subject: [PATCH 1223/1748] Update openzeppelin skipped tests that depends on
 hardhat via-ir full support

---
 test/externalTests/zeppelin.sh | 50 +++++-----------------------------
 1 file changed, 7 insertions(+), 43 deletions(-)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 11e148c182..495aafa8bd 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -65,36 +65,21 @@ function zeppelin_test
 
     # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
-    pushd test/utils/
-    sed -i "s|it(\('reverts \)|it.skip(\1|g" math/SafeMath.test.js
-    sed -i "s|it(\('reverts \)|it.skip(\1|g" math/SignedSafeMath.test.js
-    sed -i "s|it(\('reverts \)|it.skip(\1|g" structs/EnumerableSet.behavior.js
-    popd
-    pushd test/proxy/
-    sed -i "s|it(\('proxy admin cannot call delegated functions',\)|it.skip(\1|g" transparent/TransparentUpgradeableProxy.behaviour.js
-    popd
-
-
+    # TODO: Remove the lines below when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3750).
+    sed -i "s|it(\('proxy admin cannot call delegated functions',\)|it.skip(\1|g" test/proxy/transparent/TransparentUpgradeableProxy.behaviour.js
     # In some cases Hardhat does not detect revert reasons properly via IR.
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
     sed -i "s|it(\('reverts if the current value is 0'\)|it.skip(\1|g" test/utils/Counters.test.js
     sed -i "s|it(\('prevent unauthorized maintenance'\)|it.skip(\1|g" test/governance/TimelockController.test.js
     sed -i "s|it(\('cannot cancel invalid operation'\)|it.skip(\1|g" test/governance/TimelockController.test.js
-    sed -i "s|it(\('reverts if block number >= current block'\)|it.skip(\1|g" test/governance/utils/Votes.test.js
-    sed -i "s|it(\('reverts if block number >= current block'\)|it.skip(\1|g" test/governance/utils/Votes.behavior.js
     sed -i "s|it(\('cannot call onlyInitializable function outside the scope of an initializable function'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
     sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC20/presets/ERC20PresetMinterPauser.test.js
     sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC1155/presets/ERC1155PresetMinterPauser.test.js
     sed -i "s|it(\('other accounts cannot pause'\)|it.skip(\1|g" test/token/ERC20/presets/ERC20PresetMinterPauser.test.js
     sed -i "s|it(\('other accounts cannot pause'\)|it.skip(\1|g" test/token/ERC1155/presets/ERC1155PresetMinterPauser.test.js
-    sed -i "s|it(\('reverts when decreasing the allowance'\)|it.skip(\1|g" test/token/ERC20/utils/SafeERC20.test.js
-    sed -i "s|it(\('reverts when decreasing the allowance to a negative value'\)|it.skip(\1|g" test/token/ERC20/utils/SafeERC20.test.js
     sed -i "s|it(\('cannot be released before time limit'\)|it.skip(\1|g" test/token/ERC20/utils/TokenTimelock.test.js
     sed -i "s|it(\('cannot be released just before time limit'\)|it.skip(\1|g" test/token/ERC20/utils/TokenTimelock.test.js
     sed -i "s|it(\('reverts when sending non-zero amounts'\)|it.skip(\1|g" test/utils/Address.test.js
     sed -i "s|it(\('reverts when sending more than the balance'\)|it.skip(\1|g" test/utils/Address.test.js
-    sed -i "s|it(\('reverts if block number >= current block'\)|it.skip(\1|g" test/utils/Checkpoints.test.js
     sed -i "s|it(\('fails deploying a contract if the bytecode length is zero'\)|it.skip(\1|g" test/utils/Create2.test.js
     sed -i "s|it(\('fails deploying a contract if factory contract does not have sufficient balance'\)|it.skip(\1|g" test/utils/Create2.test.js
     sed -i "s|it(\('reverts on withdrawals'\)|it.skip(\1|g" test/utils/escrow/ConditionalEscrow.test.js
@@ -102,42 +87,21 @@ function zeppelin_test
     sed -i "s|it(\('rejects deposits'\)|it.skip(\1|g" test/utils/escrow/RefundEscrow.test.js
     sed -i "s|it(\('does not allow 0xffffffff'\)|it.skip(\1|g" test/utils/introspection/ERC165Storage.test.js
     sed -i "s|it(\('reverts when casting -1'\)|it.skip(\1|g" test/utils/math/SafeCast.test.js
-    sed -i 's|it(\(`reverts when downcasting 2^\${bits} (\${maxValue.addn(1)})`\)|it.skip(\1|g' test/utils/math/SafeCast.test.js
-    sed -i 's|it(\(`reverts when downcasting 2^\${bits} + 1 (\${maxValue.addn(2)})`\)|it.skip(\1|g' test/utils/math/SafeCast.test.js
     sed -i 's|it(\(`reverts when casting [^`]\+`\)|it.skip(\1|g' test/utils/math/SafeCast.test.js
-    sed -i "s|it(\('missing value'\)|it.skip(\1|g" test/utils/structs/EnumerableMap.behavior.js
-    sed -i "s|it(\('reverts when queried for non existent token id'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
     sed -i "s|it(\('reverts if index is greater than supply'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
     sed -i "s|it(\('burns all tokens'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
     sed -i "s|it(\('other accounts cannot pause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js
     sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js
-    sed -i "s|it(\('prevents initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
-    sed -i "s|it(\('divide by 0'\)|it.skip(\1|g" test/utils/math/Math.test.js
-    sed -i "s|it(\('pending owner resets after renouncing ownership'\)|it.skip(\1|g" test/access/Ownable2Step.test.js
     sed -i "s|it(\('guards transfer against invalid user'\)|it.skip(\1|g" test/access/Ownable2Step.test.js
-    # CAUTION:: The following two sed commands depend on the order of occurrence of the relevant patterns in the mentioned files.
-    # Could result in an error in the future.
-    sed -zi "s|it(\('deposit'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC4626.test.js
-    sed -zi "s|it(\('withdraw'\)|it.skip(\1|3" test/token/ERC20/extensions/ERC4626.test.js
-
-    # Here only the testToInt(248) and testToInt(256) cases fail so change the loop range to skip them
-    sed -i "s|range(8, 256, 8)\(.forEach(bits => testToInt(bits));\)|range(8, 240, 8)\1|" test/utils/math/SafeCast.test.js
-
-
-
-    # TODO: Remove this when https://github.com/NomicFoundation/hardhat/issues/3365 gets fixed.
-    sed -i "s|describe\(('Polygon-Child'\)|describe.skip\1|g" test/crosschain/CrossChainEnabled.test.js
-    sed -i "s|it(\('revert with invalid multi proof #2'\)|it.skip(\1|g" test/utils/cryptography/MerkleProof.test.js
-    sed -i "s|describe(\('to a receiver contract that panics'\)|describe.skip(\1|g" test/token/ERC721/ERC721.behavior.js
-    sed -i "s|context(\('to a receiver contract that panics'\)|context.skip(\1|g" test/token/ERC721/ERC721.behavior.js
-    sed -i "s|describe(\('to a contract that does not implement the required function'\)|describe.skip(\1|g" test/token/ERC721/ERC721.behavior.js
-    sed -i "s|context(\('to a contract that does not implement the required function'\)|context.skip(\1|g" test/token/ERC721/ERC721.behavior.js
-    sed -i "s|it(\('reverts when the called function throws'\)|it.skip(\1|g" test/utils/Address.test.js
-    sed -i "s|it(\('reverts when function does not exist'\)|it.skip(\1|g" test/utils/Address.test.js
     sed -i "s|it(\('reverting initialization'\)|it.skip(\1|g" test/proxy/beacon/BeaconProxy.test.js
     sed -i "s|describe(\('reverting initialization'\)|describe.skip(\1|g" test/proxy/Proxy.behaviour.js
     sed -i "s|it(\('does not allow remote callback'\)|it.skip(\1|g" test/security/ReentrancyGuard.test.js
+    sed -i "s|shouldBehaveLikeAccessControlDefaultAdminRules|\/\/&|" test/access/AccessControlDefaultAdminRules.test.js
+
+    # Here only the testToInt(248) and testToInt(256) cases fail so change the loop range to skip them
+    sed -i "s|range(8, 256, 8)\(.forEach(bits => testToInt(bits));\)|range(8, 240, 8)\1|" test/utils/math/SafeCast.test.js
 
+    neutralize_package_lock
     neutralize_package_json_hooks
     force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"

From 529ffffbe1b676ded50c2d489a4ac3afce3ccb33 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 27 Feb 2023 12:35:53 +0100
Subject: [PATCH 1224/1748] Migrate from gitter to matrix api

---
 .circleci/config.yml | 106 +++++++++++++++++++++----------------------
 1 file changed, 53 insertions(+), 53 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6994ad91ab..a965733f76 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,8 +35,8 @@ orbs:
   win: circleci/windows@2.2.0
 
 commands:
-  gitter_notify_unless_pr:
-    description: "Posts a notification to the main room on Gitter (if not running on a PR)."
+  matrix_notify_unless_pr:
+    description: "Posts a notification to the solidity-dev room on Matrix (if not running on a PR)."
     parameters:
       event:
         type: enum
@@ -45,7 +45,7 @@ commands:
         type: string
     steps:
       - run:
-          name: "Gitter notification"
+          name: "Matrix notification"
           when: << parameters.condition >>
           command: |
             # FIXME: Checking $CIRCLE_PULL_REQUEST would be better than hard-coding branch names
@@ -67,32 +67,32 @@ commands:
             # The release notification only makes sense on tagged commits. If the commit is untagged, just bail out.
             [[ "<< parameters.event >>" == "release" ]] && { [[ $CIRCLE_TAG != "" ]] || { echo "Not a tagged commit - notification skipped."; exit 0; } }
 
-            curl "https://api.gitter.im/v1/rooms/${GITTER_NOTIFY_ROOM_ID}/chatMessages" \
+            curl "https://${MATRIX_SERVER}/_matrix/client/v3/rooms/${MATRIX_NOTIFY_ROOM_ID}/send/m.room.message" \
               --request POST \
               --include \
               --header "Content-Type: application/json" \
               --header "Accept: application/json" \
-              --header "Authorization: Bearer ${GITTER_API_TOKEN}" \
-              --data "{\"text\":\"${message}\"}"
+              --header "Authorization: Bearer ${MATRIX_ACCESS_TOKEN}" \
+              --data "{\"msgtype\":\"m.text\", \"body\":\"${message}\"}"
 
-  gitter_notify_failure_unless_pr:
-    description: "Posts a failure notification to the main room on Gitter (if not running on a PR)."
+  matrix_notify_failure_unless_pr:
+    description: "Posts a failure notification to the main room on Matrix (if not running on a PR)."
     steps:
-      - gitter_notify_unless_pr:
+      - matrix_notify_unless_pr:
           event: failure
           condition: on_fail
 
-  gitter_notify_success_unless_pr:
-    description: "Posts a success notification to the main room on Gitter (if not running on a PR)."
+  matrix_notify_success_unless_pr:
+    description: "Posts a success notification to the main room on Matrix (if not running on a PR)."
     steps:
-      - gitter_notify_unless_pr:
+      - matrix_notify_unless_pr:
           event: success
           condition: on_success
 
-  gitter_notify_release_unless_pr:
-    description: "Posts a release notification to the main room on Gitter (if not running on a PR)."
+  matrix_notify_release_unless_pr:
+    description: "Posts a release notification to the main room on Matrix (if not running on a PR)."
     steps:
-      - gitter_notify_unless_pr:
+      - matrix_notify_unless_pr:
           event: release
           condition: on_success
 
@@ -117,7 +117,7 @@ commands:
           paths:
             - bytecode-report-<< parameters.label >>-json.txt
             - bytecode-report-<< parameters.label >>-cli.txt
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
 defaults:
 
@@ -232,7 +232,7 @@ defaults:
         - run: *run_soltest
         - store_test_results: *store_test_results
         - store_artifacts: *artifacts_test_results
-        - gitter_notify_failure_unless_pr
+        - matrix_notify_failure_unless_pr
 
   - steps_test_lsp: &steps_test_lsp
       steps:
@@ -245,7 +245,7 @@ defaults:
         - run:
             name: Executing solc LSP test suite
             command: ./test/lsp.py ./build/solc/solc --non-interactive
-        - gitter_notify_failure_unless_pr
+        - matrix_notify_failure_unless_pr
 
   - steps_build: &steps_build
       steps:
@@ -254,7 +254,7 @@ defaults:
         - store_artifacts: *artifacts_solc
         - store_artifacts: *artifact_yul_phaser
         - persist_to_workspace: *artifacts_executables
-        - gitter_notify_failure_unless_pr
+        - matrix_notify_failure_unless_pr
 
   - steps_soltest_all: &steps_soltest_all
       steps:
@@ -264,7 +264,7 @@ defaults:
         - run: *run_soltest_all
         - store_test_results: *store_test_results
         - store_artifacts: *artifacts_test_results
-        - gitter_notify_failure_unless_pr
+        - matrix_notify_failure_unless_pr
 
   - steps_cmdline_tests: &steps_cmdline_tests
       steps:
@@ -274,7 +274,7 @@ defaults:
         - run: *run_cmdline_tests
         - store_test_results: *store_test_results
         - store_artifacts: *artifacts_test_results
-        - gitter_notify_failure_unless_pr
+        - matrix_notify_failure_unless_pr
 
   - steps_install_dependencies_osx: &steps_install_dependencies_osx
       steps:
@@ -668,7 +668,7 @@ jobs:
       - run:
           name: Check spelling
           command: ~/.local/bin/codespell --skip "*.enc,.git,Dockerfile*,LICENSE,codespell_whitelist.txt,codespell_ignored_lines.txt" --ignore-words ./scripts/codespell_whitelist.txt --exclude-file ./scripts/codespell_ignored_lines.txt
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   chk_docs_examples:
     <<: *base_node_small
@@ -682,7 +682,7 @@ jobs:
       - run:
           name: Test Docs examples
           command: ./test/docsCodeStyle.sh
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   chk_coding_style:
     <<: *base_cimg_small
@@ -702,7 +702,7 @@ jobs:
       - run:
           name: Check for broken symlinks
           command: ./scripts/check_symlinks.sh
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   chk_errorcodes:
     <<: *base_python_small
@@ -711,7 +711,7 @@ jobs:
       - run:
           name: Check for error codes
           command: ./scripts/error_codes.py --check
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   chk_pylint:
     <<: *base_cimg_small
@@ -737,7 +737,7 @@ jobs:
       - run:
           name: Linting Python Scripts
           command: ./scripts/pylint_all.py
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   chk_antlr_grammar:
     <<: *base_cimg_small
@@ -751,7 +751,7 @@ jobs:
       - run:
           name: Run tests
           command: ./scripts/test_antlr_grammar.sh
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   chk_buglist:
     <<: *base_node_small
@@ -766,7 +766,7 @@ jobs:
       - run:
           name: Test buglist
           command: ./test/buglistTests.js
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   chk_proofs:
     <<: *base_cimg_small
@@ -779,14 +779,14 @@ jobs:
             sudo apt-get -qy install python3-pip
             pip3 install --user z3-solver
       - run: *run_proofs
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   chk_docs_pragma_min_version:
     <<: *base_ubuntu2204_small
     steps:
       - checkout
       - run: *run_docs_pragma_min_version
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_ubu_pyscripts:
     <<: *base_ubuntu2204_small
@@ -795,7 +795,7 @@ jobs:
       - run:
           name: Python unit tests
           command: python3 test/pyscriptTests.py
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_win_pyscripts:
     <<: *base_win_powershell
@@ -805,7 +805,7 @@ jobs:
       - run:
           name: Python unit tests
           command: python.exe test/pyscriptTests.py
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   b_ubu: &b_ubu
     # this runs 2x faster on xlarge but takes 4x more resources (compared to medium).
@@ -876,7 +876,7 @@ jobs:
           root: build
           paths:
             - solc/solc-static-linux
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   b_ubu_codecov:
     # Runs ~30% faster on large but we only run it nightly so efficiency matters more.
@@ -889,7 +889,7 @@ jobs:
       - checkout
       - run: *run_build
       - persist_to_workspace: *artifacts_executables
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_ubu_codecov:
     <<: *base_ubuntu2204_large
@@ -911,7 +911,7 @@ jobs:
           name: "Coverage: All"
           command: codecov --flags all --gcov-root build
       - store_artifacts: *artifacts_test_results
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   # Builds in C++20 mode and uses debug build in order to speed up.
   # Do *NOT* store any artifacts or workspace as we don't run tests on this build.
@@ -924,7 +924,7 @@ jobs:
     steps:
       - checkout
       - run: *run_build
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   b_ubu_ossfuzz: &b_ubu_ossfuzz
     <<: *base_ubuntu1604_clang
@@ -933,7 +933,7 @@ jobs:
       - run: *setup_prerelease_commit_hash
       - run: *run_build_ossfuzz
       - persist_to_workspace: *artifacts_executables_ossfuzz
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_ubu_ossfuzz: &t_ubu_ossfuzz
     <<: *base_ubuntu1604_clang_small
@@ -967,7 +967,7 @@ jobs:
       - run: *run_build
       - store_artifacts: *artifacts_solc
       - persist_to_workspace: *artifacts_executables
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   b_osx:
     <<: *base_osx_large
@@ -989,7 +989,7 @@ jobs:
             - build/solc/solc
             - build/test/soltest
             - build/test/tools/solfuzzer
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_osx_soltest: &t_osx_soltest
     <<: *base_osx
@@ -1007,7 +1007,7 @@ jobs:
       - run: *run_soltest
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_osx_cli:
     <<: *base_osx
@@ -1020,7 +1020,7 @@ jobs:
           at: .
       - run: *run_cmdline_tests
       - store_artifacts: *artifacts_test_results
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   b_ems:
     <<: *base_ems_large
@@ -1044,7 +1044,7 @@ jobs:
           paths:
             - soljson.js
             - version.txt
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   b_docs:
     <<: *base_ubuntu2204_small
@@ -1057,7 +1057,7 @@ jobs:
       - store_artifacts:
           path: docs/_build/html/
           destination: docs-html
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_ubu_soltest_all: &t_ubu_soltest_all
     <<: *base_ubuntu2204_large
@@ -1122,7 +1122,7 @@ jobs:
             apt update --assume-yes
             apt install locales-all --assume-yes --no-install-recommends
       - run: test/localeTest.sh build/solc/solc
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_ubu_asan_cli:
     # Runs slightly faster on medium but we only run it nightly so efficiency matters more.
@@ -1189,7 +1189,7 @@ jobs:
             node --version
             npm --version
             test/externalTests/solc-js/solc-js.sh /tmp/workspace/soljson.js $(cat /tmp/workspace/version.txt)
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_ems_ext_hardhat:
     <<: *base_node_small
@@ -1217,7 +1217,7 @@ jobs:
             # NOTE: This is expected to work without running `yarn build` first.
             cd hardhat/packages/hardhat-core
             yarn test
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_ems_ext:
     parameters:
@@ -1294,7 +1294,7 @@ jobs:
           root: .
           paths:
             - reports/externalTests/
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   c_ext_benchmarks:
     <<: *base_node_small
@@ -1396,7 +1396,7 @@ jobs:
           paths:
             - .\solc\*\solc.exe
             - .\test\*\soltest.exe
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_win_soltest: &t_win_soltest
     <<: *base_win_powershell
@@ -1423,7 +1423,7 @@ jobs:
           command: python ./test/lsp.py .\build\solc\Release\solc.exe --non-interactive
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   # Note: b_bytecode_ubu_static is required because b_ubu_static and b_ubu
   # are currently built on different Ubuntu base images.
@@ -1503,7 +1503,7 @@ jobs:
           root: .
           paths:
             - bytecode-report-emscripten.txt
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   t_bytecode_compare:
     <<: *base_ubuntu2204_small
@@ -1542,7 +1542,7 @@ jobs:
           # NOTE: store_artifacts does not support the 'when' attribute.
           # Fortunately when the artifact does not exist it just says "No artifact files found" and ignores it.
           path: all-bytecode-reports.zip
-      - gitter_notify_failure_unless_pr
+      - matrix_notify_failure_unless_pr
 
   c_release_binaries:
     <<: *base_ubuntu2204
@@ -1582,8 +1582,8 @@ jobs:
             tar --create --file ../solc-bin-binaries.tar *
       - store_artifacts:
           path: solc-bin-binaries.tar
-      - gitter_notify_failure_unless_pr
-      - gitter_notify_release_unless_pr
+      - matrix_notify_failure_unless_pr
+      - matrix_notify_release_unless_pr
 
 workflows:
   version: 2

From 21c0f7865055c0e276c94332bbb5e1e46d639f84 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Thu, 9 Feb 2023 17:07:13 +0100
Subject: [PATCH 1225/1748] Report safe properties in BMC and CHC

---
 Changelog.md                                  |   1 +
 docs/smtchecker.rst                           |   8 ++
 docs/using-the-compiler.rst                   |   2 +
 libsolidity/formal/BMC.cpp                    |  65 ++++++++--
 libsolidity/formal/BMC.h                      |  14 ++-
 libsolidity/formal/CHC.cpp                    | 116 ++++++++++--------
 libsolidity/formal/CHC.h                      |  26 ++--
 libsolidity/formal/ModelChecker.cpp           |   7 +-
 libsolidity/formal/ModelCheckerSettings.h     |   2 +
 libsolidity/interface/StandardCompiler.cpp    |  10 +-
 scripts/error_codes.py                        |   5 +-
 solc/CommandLineParser.cpp                    |  10 ++
 .../err                                       |   1 +
 .../err                                       |   1 +
 .../err                                       |   1 +
 .../model_checker_divModSlacks_false_all/err  |   2 +
 .../model_checker_divModSlacks_false_bmc/err  |   1 +
 .../model_checker_ext_calls_trusted_chc/err   |   2 +
 .../model_checker_invariants_all/err          |   2 +
 .../model_checker_invariants_contract/err     |   2 +
 .../err                                       |   2 +
 .../model_checker_invariants_reentrancy/err   |   2 +
 .../args                                      |   1 +
 .../err                                       |   7 ++
 .../input.sol                                 |   8 ++
 .../args                                      |   1 +
 .../err                                       |   7 ++
 .../input.sol                                 |   8 ++
 .../args                                      |   1 +
 .../err                                       |   7 ++
 .../input.sol                                 |   8 ++
 .../args                                      |   1 +
 .../err                                       |  17 +++
 .../input.sol                                 |   8 ++
 .../args                                      |   1 +
 .../err                                       |  17 +++
 .../input.sol                                 |   8 ++
 .../args                                      |   1 +
 .../err                                       |  17 +++
 .../input.sol                                 |   8 ++
 .../model_checker_timeout_all/err             |   2 +
 .../model_checker_timeout_bmc/err             |   2 +
 .../model_checker_timeout_chc/err             |   2 +
 .../output.json                               |  13 ++
 .../output.json                               |  13 ++
 .../output.json                               |  13 ++
 .../output.json                               |  10 ++
 .../output.json                               |  13 ++
 .../output.json                               |  10 ++
 .../output.json                               |  10 ++
 .../output.json                               |  10 ++
 .../input.json                                |  22 ++++
 .../output.json                               |  42 +++++++
 .../input.json                                |  22 ++++
 .../output.json                               |  42 +++++++
 .../input.json                                |  22 ++++
 .../output.json                               |  42 +++++++
 .../input.json                                |  23 ++++
 .../output.json                               |  42 +++++++
 .../input.json                                |  23 ++++
 .../output.json                               |  42 +++++++
 .../input.json                                |  23 ++++
 .../output.json                               |  42 +++++++
 .../input.json                                |  23 ++++
 .../output.json                               |  72 +++++++++++
 .../input.json                                |  23 ++++
 .../output.json                               |  72 +++++++++++
 .../input.json                                |  23 ++++
 .../output.json                               |  72 +++++++++++
 .../input.json                                |  23 ++++
 .../output.json                               |  12 ++
 .../output.json                               |  10 ++
 .../output.json                               |  10 ++
 .../output.json                               |  10 ++
 .../smtCheckerTests/abi/abi_decode_array.sol  |   1 +
 .../smtCheckerTests/abi/abi_decode_simple.sol |   1 +
 .../abi/abi_encode_call_simple_1.sol          |   1 +
 .../abi/abi_encode_call_simple_2.sol          |   1 +
 .../abi/abi_encode_call_simple_3.sol          |   1 +
 .../abi/abi_encode_call_simple_4.sol          |   1 +
 .../abi/abi_encode_call_simple_5.sol          |   1 +
 .../smtCheckerTests/abi/abi_encode_hash.sol   |   1 +
 .../abi/abi_encode_no_arguments.sol           |   1 +
 .../abi/abi_encode_packed_hash.sol            |   3 +-
 .../abi/abi_encode_packed_simple.sol          |   9 +-
 .../smtCheckerTests/abi/abi_encode_simple.sol |   7 +-
 .../abi_encode_with_selector_array_slice.sol  |   1 +
 ...abi_encode_with_selector_array_slice_2.sol |   1 +
 ..._encode_with_selector_string_literal_2.sol |   1 +
 .../abi/abi_encode_with_sig_array_slice.sol   |   1 +
 .../abi/abi_encode_with_sig_array_slice_2.sol |   1 +
 .../abi/abi_encode_with_sig_hash.sol          |   5 +-
 .../abi/abi_encode_with_sig_simple.sol        |   7 +-
 .../array_members/array_pop_length_7.sol      |   1 +
 .../array_members/array_pop_length_8.sol      |   3 +-
 .../array_push_string_literal.sol             |   5 +-
 ...ngth_1d_assignment_2d_memory_to_memory.sol |   1 +
 ...th_1d_assignment_2d_storage_to_storage.sol |   2 +-
 .../length_1d_copy_2d_memory_to_storage.sol   |   1 +
 .../length_1d_copy_2d_storage_to_memory.sol   |   2 +-
 .../length_1d_mapping_array_1.sol             |   2 +-
 .../length_1d_mapping_array_2.sol             |   1 +
 .../length_1d_mapping_array_2d_1.sol          |   1 +
 .../length_1d_struct_array_1.sol              |   2 +-
 .../length_1d_struct_array_2d_1.sol           |   2 +-
 .../length_assignment_2d_memory_to_memory.sol |   1 +
 .../length_assignment_memory_to_memory.sol    |   1 +
 .../length_assignment_storage_to_storage.sol  |   1 +
 .../array_members/length_basic.sol            |   3 +-
 .../length_copy_memory_to_storage.sol         |   1 +
 .../length_copy_storage_to_memory.sol         |   1 +
 .../array_members/length_function_call.sol    |   2 +-
 .../length_same_after_assignment.sol          |   2 +-
 .../length_same_after_assignment_2.sol        |   2 +-
 .../length_same_after_assignment_2_fail.sol   |   2 +-
 .../length_same_after_assignment_3.sol        |   2 +-
 .../length_same_after_assignment_3_fail.sol   |  10 +-
 .../array_members/pop_1_safe.sol              |   1 +
 .../array_members/pop_2d_safe.sol             |   1 +
 .../array_members/pop_2d_unsafe.sol           |   3 +-
 .../array_members/pop_constructor_safe.sol    |   1 +
 .../array_members/pop_loop_safe.sol           |   1 +
 .../array_members/pop_loop_unsafe.sol         |   3 +-
 .../array_members/push_2d_arg_1_safe.sol      |   1 +
 .../array_members/push_2d_arg_1_unsafe.sol    |   1 +
 .../array_members/push_arg_1.sol              |   1 +
 .../array_members/push_as_lhs_1d.sol          |   5 +-
 .../array_members/push_as_lhs_2d.sol          |   1 +
 .../array_members/push_as_lhs_2d_2.sol        |   1 +
 .../array_members/push_as_lhs_3d.sol          |   1 +
 .../array_members/push_as_lhs_and_rhs_1d.sol  |   1 +
 .../push_as_lhs_and_rhs_2d_1.sol              |   3 +-
 .../push_as_lhs_and_rhs_2d_2.sol              |   1 +
 .../push_as_lhs_and_rhs_bytes.sol             |   1 +
 .../array_members/push_as_lhs_bytes.sol       |   1 +
 .../array_members/push_as_lhs_bytes_2d.sol    |   1 +
 .../push_as_lhs_compound_assignment.sol       |   3 +-
 .../array_members/push_as_lhs_struct.sol      |   1 +
 .../array_members/push_overflow_1_safe.sol    |   1 +
 ...overflow_1_safe_no_overflow_assumption.sol |   2 +-
 .../array_members/push_overflow_2_safe.sol    |   1 +
 ...overflow_2_safe_no_overflow_assumption.sol |   1 +
 .../array_members/push_push_no_args_1.sol     |   1 +
 .../push_push_no_args_1_fail.sol              |   5 +-
 .../array_members/push_push_no_args_2.sol     |   1 +
 .../push_push_no_args_2_fail.sol              |   7 +-
 .../push_storage_ref_safe_aliasing.sol        |   1 +
 .../push_storage_ref_unsafe_aliasing.sol      |   3 +-
 .../push_storage_ref_unsafe_length.sol        |   1 +
 .../array_members/push_struct_member_2.sol    |   1 +
 .../array_members/push_zero_2d_safe.sol       |   1 +
 .../array_members/push_zero_2d_unsafe.sol     |   3 +-
 .../array_members/push_zero_safe.sol          |   1 +
 .../array_members/push_zero_unsafe.sol        |   3 +-
 .../array_members/storage_pointer_push_1.sol  |   1 +
 .../storage_pointer_push_1_safe.sol           |   1 +
 .../blockchain_state/balance_non_zero_2.sol   |   4 +-
 .../blockchain_state/balance_receive.sol      |   2 +-
 .../blockchain_state/balance_receive_2.sol    |   2 +-
 .../blockchain_state/balance_receive_4.sol    |   1 +
 .../blockchain_state/balance_receive_5.sol    |   4 +-
 .../balance_receive_calls.sol                 |   8 +-
 .../balance_receive_ext_calls.sol             |   3 +-
 .../balance_receive_ext_calls_2.sol           |   1 +
 .../balance_receive_ext_calls_mutex.sol       |   2 +-
 .../blockchain_state/balance_spend.sol        |   2 +-
 .../blockchain_state/decreasing_balance.sol   |   1 +
 .../blockchain_state/free_function_1.sol      |   2 +-
 .../blockchain_state/free_function_2.sol      |   2 +-
 .../blockchain_state/library_internal_1.sol   |   2 +-
 .../blockchain_state/library_internal_2.sol   |   2 +-
 .../blockchain_state/this_does_not_change.sol |   2 +-
 .../this_does_not_change_external_call.sol    |   4 +-
 .../this_does_not_change_internal_call.sol    |   2 +-
 .../blockchain_state/transfer.sol             |   2 +
 .../bmc_coverage/assert_in_constructor.sol    |   1 +
 .../branches_in_modifiers.sol                 |   1 +
 .../branches_in_modifiers_2.sol               |   1 +
 .../constructor_state_variable_init.sol       |   1 +
 ...or_state_variable_init_chain_alternate.sol |   1 +
 ...onstructor_state_variable_init_diamond.sol |   1 +
 .../branches_with_return/constructors.sol     |   1 +
 .../branches_with_return/nested_if.sol        |   1 +
 .../return_in_both_branches.sol               |   1 +
 .../branches_with_return/simple_if.sol        |   1 +
 .../branches_with_return/simple_if_array.sol  |   1 +
 .../simple_if_state_var.sol                   |   1 +
 .../branches_with_return/simple_if_struct.sol |   1 +
 .../simple_if_struct_2.sol                    |   1 +
 .../branches_with_return/simple_if_tuple.sol  |   1 +
 .../branches_with_return/triple_nested_if.sol |   1 +
 ...plicit_constructor_with_function_calls.sol |   1 +
 .../bmc_coverage/msg_value_4.sol              |   1 +
 .../bmc_coverage/range_check.sol              |   1 +
 .../bmc_coverage/staticcall_balance.sol       |   1 +
 .../bmc_coverage/staticcall_state_var.sol     |   1 +
 .../bmc_coverage/timestamp.sol                |   1 +
 .../try_multiple_catch_clauses_2.sol          |   1 +
 ...ry_multiple_returned_values_with_tuple.sol |   1 +
 .../assignment_in_declaration.sol             |   1 +
 .../branches_assert_condition_1.sol           |   1 +
 .../branches_assert_condition_2.sol           |   1 +
 .../branches_inside_modifiers_1.sol           |   4 +-
 .../branches_inside_modifiers_2.sol           |   1 +
 .../branches_inside_modifiers_3.sol           |   4 +-
 .../branches_inside_modifiers_4.sol           |   2 +-
 .../branches_merge_variables_1.sol            |   1 +
 .../branches_merge_variables_2.sol            |   1 +
 .../branches_merge_variables_3.sol            |   1 +
 .../branches_merge_variables_4.sol            |   1 +
 .../branches_merge_variables_5.sol            |   1 +
 .../branches_merge_variables_6.sol            |   1 +
 .../branches_in_modifiers.sol                 |   4 +-
 .../branches_in_modifiers_2.sol               |   7 +-
 .../constructor_state_variable_init.sol       |   9 +-
 ...or_state_variable_init_chain_alternate.sol |   1 +
 ...onstructor_state_variable_init_diamond.sol |  17 +--
 .../branches_with_return/constructors.sol     |   7 +-
 .../branches_with_return/nested_if.sol        |   3 +-
 .../return_in_both_branches.sol               |   1 +
 .../branches_with_return/simple_if.sol        |   1 +
 .../branches_with_return/simple_if_array.sol  |   3 +-
 .../simple_if_state_var.sol                   |   3 +-
 .../branches_with_return/simple_if_struct.sol |   3 +-
 .../simple_if_struct_2.sol                    |   3 +-
 .../branches_with_return/simple_if_tuple.sol  |   5 +-
 .../branches_with_return/triple_nested_if.sol |   2 +-
 .../function_call_inside_branch.sol           |   1 +
 .../function_call_inside_branch_2.sol         |   1 +
 .../function_call_inside_branch_3.sol         |   1 +
 .../function_call_inside_branch_4.sol         |   1 +
 .../function_call_inside_else_branch.sol      |   1 +
 .../function_call_inside_modifier_branch.sol  |   1 +
 ...ide_placeholder_inside_modifier_branch.sol |   1 +
 .../smtCheckerTests/control_flow/require.sol  |   3 +-
 .../smtCheckerTests/control_flow/return_1.sol |   1 +
 .../control_flow/return_1_fail.sol            |   1 +
 .../smtCheckerTests/control_flow/return_2.sol |   1 +
 .../control_flow/return_2_fail.sol            |   1 +
 .../smtCheckerTests/control_flow/revert.sol   |   3 +-
 .../control_flow/revert_complex_flow.sol      |   3 +-
 .../control_flow/short_circuit_and.sol        |   1 +
 .../control_flow/short_circuit_and_fail.sol   |   3 +-
 .../short_circuit_and_inside_branch.sol       |   5 +-
 .../short_circuit_and_need_both.sol           |   1 +
 .../short_circuit_and_need_both_fail.sol      |   3 +-
 .../control_flow/short_circuit_or.sol         |   1 +
 .../control_flow/short_circuit_or_fail.sol    |   3 +-
 .../short_circuit_or_inside_branch.sol        |   3 +-
 .../short_circuit_or_need_both.sol            |   1 +
 .../short_circuit_or_need_both_fail.sol       |   3 +-
 .../ways_to_merge_variables_1.sol             |   3 +-
 .../ways_to_merge_variables_2.sol             |   3 +-
 .../crypto/crypto_functions_over_blocks.sol   |   1 +
 ...ions_same_input_over_state_same_output.sol |   1 +
 ...rypto_functions_same_input_same_output.sol |   1 +
 .../deployment/deploy_trusted.sol             |   1 +
 .../deployment/deploy_trusted_addresses.sol   |   2 +-
 ...eploy_trusted_keep_storage_constraints.sol |   2 +-
 .../deployment/deploy_trusted_state_flow.sol  |   1 +
 .../deploy_trusted_state_flow_2.sol           |   2 +-
 .../deployment_trusted_with_value_1.sol       |   1 +
 .../call_abstract_constructor_trusted_1.sol   |   1 +
 .../call_abstract_constructor_trusted_2.sol   |   1 +
 .../call_abstract_trusted_1.sol               |   1 +
 .../call_abstract_trusted_2.sol               |   1 +
 .../call_abstract_trusted_3.sol               |   1 +
 .../external_calls/call_constructor_1.sol     |   1 +
 .../external_calls/call_constructor_2.sol     |   1 +
 .../external_calls/call_mutex.sol             |   2 +-
 .../external_calls/call_reentrancy_view.sol   |   2 +-
 .../external_calls/call_safe.sol              |   1 +
 .../external_calls/external.sol               |   2 +-
 ...ternal_call_from_constructor_1_trusted.sol |   3 +-
 .../external_call_from_constructor_2.sol      |   4 +-
 ...ternal_call_from_constructor_2_trusted.sol |   4 +-
 ...ternal_call_from_constructor_3_trusted.sol |   4 +-
 ...nal_call_from_constructor_reentrancy_1.sol |   1 +
 .../external_call_indirect_1.sol              |   1 +
 .../external_call_indirect_2.sol              |   1 +
 .../external_call_indirect_3.sol              |   1 +
 .../external_call_indirect_4.sol              |   1 +
 .../external_call_indirect_5.sol              |   1 +
 .../external_call_semantic_this_1.sol         |   5 +-
 .../external_call_semantic_this_2.sol         |   3 +-
 .../external_call_semantic_this_3.sol         |   1 +
 ..._address_inside_array_struct_trusted_1.sol |   1 +
 ..._address_inside_array_struct_trusted_2.sol |   3 +-
 ...ate_var_address_inside_array_trusted_1.sol |   3 +-
 ...ate_var_address_inside_array_trusted_2.sol |   3 +-
 ...te_var_address_inside_struct_trusted_1.sol |   3 +-
 ...te_var_address_inside_struct_trusted_2.sol |   3 +-
 ...te_var_address_inside_struct_trusted_3.sol |   3 +-
 ...te_var_address_inside_struct_trusted_4.sol |   3 +-
 ...contract_inside_array_struct_trusted_1.sol |   1 +
 ...contract_inside_array_struct_trusted_2.sol |   3 +-
 ...te_var_contract_inside_array_trusted_1.sol |   3 +-
 ...te_var_contract_inside_array_trusted_2.sol |   3 +-
 ...e_var_contract_inside_struct_trusted_1.sol |   3 +-
 ...e_var_contract_inside_struct_trusted_2.sol |   3 +-
 ...e_var_contract_inside_struct_trusted_3.sol |   3 +-
 ...e_var_contract_inside_struct_trusted_4.sol |   3 +-
 .../external_call_this_with_value_1.sol       |   3 +-
 .../external_call_this_with_value_2.sol       |   1 +
 .../external_calls/external_hash.sol          |   2 +-
 .../external_hash_known_code_pure.sol         |   2 +-
 .../external_hash_known_code_pure_trusted.sol |   2 +-
 .../external_hash_known_code_state.sol        |   2 +-
 ...nal_hash_known_code_state_reentrancy_2.sol |   1 +
 ..._known_code_state_reentrancy_2_trusted.sol |   2 +-
 ...nal_hash_known_code_state_reentrancy_3.sol |   2 +
 ...sh_known_code_state_reentrancy_trusted.sol |   2 +-
 .../external_calls/external_inc1_inc2.sol     |   1 +
 .../external_calls/external_reentrancy_3.sol  |   1 +
 .../external_reentrancy_crypto.sol            |   3 +-
 .../external_calls/external_safe.sol          |   1 +
 .../smtCheckerTests/external_calls/mutex.sol  |   1 +
 .../external_calls/staticcall_mutex.sol       |   2 +-
 .../external_calls/staticcall_mutex_2.sol     |   2 +-
 .../staticcall_reentrancy_view.sol            |   2 +-
 .../token_trusted_transfer_correct.sol        |   4 +-
 .../token_trusted_transfer_wrong.sol          |   1 +
 .../constant_string_at_file_level.sol         |   3 +-
 .../constants_at_file_level_referencing.sol   |   1 +
 .../smtCheckerTests/file_level/easy.sol       |   3 +-
 .../smtCheckerTests/file_level/enum.sol       |   3 +-
 .../file_level/file_level_call_via_module.sol |   5 +-
 .../free_namesake_contract_function.sol       |   3 +-
 .../smtCheckerTests/file_level/import.sol     |   1 +
 .../file_level/module_constants_1.sol         |   5 +-
 .../module_constants_functions_1.sol          |   9 +-
 .../smtCheckerTests/file_level/overloads.sol  |   3 +-
 .../same_constants_different_files.sol        |   1 +
 .../smtCheckerTests/file_level/struct.sol     |   5 +-
 .../function_selector/function_types_sig.sol  |   5 +-
 .../function_selector/homer.sol               |   3 +-
 .../function_selector/selector.sol            |   1 +
 .../function_selector/selector_3.sol          |   3 +-
 .../functions/constructor_hierarchy.sol       |   3 +-
 .../functions/constructor_hierarchy_2.sol     |   3 +-
 .../functions/constructor_hierarchy_3.sol     |   1 +
 .../functions/constructor_hierarchy_4.sol     |   5 +-
 .../constructor_hierarchy_diamond.sol         |   1 +
 .../constructor_hierarchy_diamond_2.sol       |   1 +
 .../constructor_hierarchy_diamond_3.sol       |   1 +
 ...tructor_hierarchy_diamond_empty_middle.sol |   3 +-
 ...rarchy_diamond_empty_middle_empty_base.sol |   1 +
 .../constructor_hierarchy_empty_chain.sol     |   3 +-
 .../constructor_hierarchy_empty_middle.sol    |   3 +-
 .../constructor_hierarchy_mixed_chain.sol     |   3 +-
 ...uctor_hierarchy_mixed_chain_empty_base.sol |   1 +
 ...uctor_hierarchy_mixed_chain_local_vars.sol |   3 +-
 ...ctor_hierarchy_mixed_chain_with_params.sol |   1 +
 ...or_hierarchy_mixed_chain_with_params_2.sol |   3 +-
 .../functions/constructor_simple.sol          |   1 +
 .../functions/constructor_state_value.sol     |   1 +
 .../constructor_state_value_inherited.sol     |   1 +
 .../constructor_state_value_parameter.sol     |   1 +
 ...unction_call_does_not_clear_local_vars.sol |   1 +
 .../functions/function_inline_chain.sol       |   1 +
 ...unction_inside_branch_modify_state_var.sol |   3 +-
 ...ction_inside_branch_modify_state_var_2.sol |   1 +
 ...ction_inside_branch_modify_state_var_3.sol |   5 +-
 .../functions/functions_attached_1.sol        |   1 +
 .../functions/functions_attached_1_fail.sol   |   3 +-
 .../functions/functions_external_1.sol        |   4 +-
 .../functions/functions_external_2.sol        |   2 +-
 .../functions/functions_external_3.sol        |   2 +-
 .../functions_identifier_nested_tuple_1.sol   |   2 +-
 .../functions_identifier_nested_tuple_2.sol   |   1 +
 .../functions/functions_identity_1.sol        |   1 +
 .../functions/functions_identity_2.sol        |   1 +
 .../functions/functions_identity_as_tuple.sol |   1 +
 .../functions/functions_library_1.sol         |   1 +
 .../functions/functions_library_1_fail.sol    |   3 +-
 .../functions/functions_recursive.sol         |   1 +
 .../functions_recursive_indirect.sol          |   2 +-
 .../functions/functions_storage_var_1.sol     |   1 +
 .../functions/functions_storage_var_2.sol     |   1 +
 .../functions/getters/address.sol             |   5 +-
 .../functions/getters/array_1.sol             |   2 +-
 .../functions/getters/array_2.sol             |   2 +-
 .../functions/getters/array_of_structs_1.sol  |   2 +-
 .../functions/getters/array_of_structs_2.sol  |   3 +-
 .../functions/getters/array_of_structs_3.sol  |   3 +-
 .../functions/getters/bytes.sol               |   3 +-
 .../functions/getters/contract.sol            |   3 +-
 .../functions/getters/double_access.sol       |   3 +-
 .../functions/getters/enum.sol                |   3 +-
 .../functions/getters/external_getter_1.sol   |   1 +
 .../functions/getters/external_getter_2.sol   |   1 +
 .../getters/external_getter_this_1.sol        |   3 +-
 .../getters/external_getter_this_2.sol        |   3 +-
 .../functions/getters/fixed_bytes.sol         |   5 +-
 .../functions/getters/mapping_1.sol           |   3 +-
 .../functions/getters/mapping_2.sol           |   3 +-
 .../functions/getters/mapping_with_cast.sol   |   3 +-
 .../getters/nested_arrays_mappings_1.sol      |   4 +-
 .../getters/nested_arrays_mappings_10.sol     |   2 +-
 .../getters/nested_arrays_mappings_2.sol      |   2 +-
 .../getters/nested_arrays_mappings_3.sol      |   2 +-
 .../getters/nested_arrays_mappings_4.sol      |   2 +-
 .../getters/nested_arrays_mappings_5.sol      |   2 +-
 .../getters/nested_arrays_mappings_6.sol      |   2 +-
 .../getters/nested_arrays_mappings_7.sol      |   4 +-
 .../getters/nested_arrays_mappings_8.sol      |   4 +-
 .../getters/nested_arrays_mappings_9.sol      |   4 +-
 .../functions/getters/static_array.sol        |   4 +-
 .../functions/getters/string.sol              |   3 +-
 .../functions/getters/struct_1.sol            |   3 +-
 .../functions/getters/struct_2.sol            |   3 +-
 .../functions/getters/struct_3.sol            |   1 +
 .../functions/getters/struct_4.sol            |   1 +
 .../getters/struct_with_reassignment.sol      |   5 +-
 .../functions/getters/uint.sol                |   3 +-
 .../internal_call_state_var_init_2.sol        |   1 +
 .../internal_call_with_assertion_1.sol        |   2 +-
 .../internal_call_with_assertion_1_fail.sol   |  12 +-
 ...rnal_call_with_assertion_inheritance_1.sol |   1 +
 ...call_with_assertion_inheritance_1_fail.sol |   7 +-
 ...ternal_multiple_calls_with_assertion_1.sol |   2 +-
 ...l_multiple_calls_with_assertion_1_fail.sol |   8 +-
 .../functions/library_after_contract.sol      |   1 +
 .../functions/library_constant.sol            |   5 +-
 .../functions/library_constant_2.sol          |   1 +
 .../smtCheckerTests/functions/payable_2.sol   |   3 +-
 .../functions/super_function_assert.sol       |   6 +-
 .../functions/this_external_call.sol          |   1 +
 .../functions/this_external_call_2.sol        |   3 +-
 .../functions/this_external_call_return.sol   |   1 +
 .../functions/this_external_call_sender.sol   |   1 +
 .../this_external_call_tx_origin.sol          |   1 +
 .../smtCheckerTests/functions/this_state.sol  |   2 +-
 .../functions/virtual_function_assert.sol     |   4 +-
 ...virtual_function_called_by_constructor.sol |   6 +-
 .../imports/import_as_module_1.sol            |   3 +-
 .../smtCheckerTests/imports/import_base.sol   |   3 +-
 .../imports/import_library_2.sol              |   1 +
 .../base_contract_assertion_fail_1.sol        |   4 +-
 .../base_contract_assertion_fail_2.sol        |   3 +-
 .../base_contract_assertion_fail_3.sol        |   3 +-
 .../base_contract_assertion_fail_4.sol        |   3 +-
 .../base_contract_assertion_fail_5.sol        |   3 +-
 .../base_contract_assertion_fail_6.sol        |   3 +-
 .../base_contract_assertion_fail_7.sol        |   3 +-
 .../base_contract_assertion_fail_9.sol        |   6 +-
 ...chy_base_calls_inheritance_specifier_1.sol |   5 +-
 ...chy_base_calls_inheritance_specifier_2.sol |   1 +
 ...erarchy_base_calls_with_side_effects_1.sol |   1 +
 ...erarchy_base_calls_with_side_effects_2.sol |   3 +-
 ...erarchy_base_calls_with_side_effects_3.sol |   1 +
 ...erarchy_base_calls_with_side_effects_4.sol |   1 +
 ...erarchy_base_calls_with_side_effects_5.sol |   1 +
 ...erarchy_base_calls_with_side_effects_6.sol |   3 +-
 ...erarchy_base_calls_with_side_effects_7.sol |   3 +-
 ...erarchy_base_calls_with_side_effects_8.sol |   5 +-
 ...erarchy_base_calls_with_side_effects_9.sol |   7 +-
 ...ctor_hierarchy_mixed_chain_with_params.sol |   1 +
 .../constructor_state_variable_init.sol       |   3 +-
 ...onstructor_state_variable_init_asserts.sol |   9 +-
 .../constructor_state_variable_init_base.sol  |   3 +-
 .../constructor_state_variable_init_chain.sol |   3 +-
 ...or_state_variable_init_chain_alternate.sol |   3 +-
 ...ctor_state_variable_init_chain_run_all.sol |   1 +
 ...or_state_variable_init_chain_run_all_2.sol |   1 +
 ...tructor_state_variable_init_chain_tree.sol |   5 +-
 ...onstructor_state_variable_init_diamond.sol |   3 +-
 ...tor_state_variable_init_diamond_middle.sol |   5 +-
 ...ctor_state_variable_init_function_call.sol |   1 +
 .../constructor_uses_function_base.sol        |   2 +-
 .../inheritance/diamond_super_1.sol           |   3 +-
 .../inheritance/diamond_super_2.sol           |   5 +-
 .../inheritance/diamond_super_3.sol           |   4 +-
 .../implicit_constructor_hierarchy.sol        |   4 +-
 .../implicit_only_constructor_hierarchy.sol   |   2 +-
 .../overriden_function_static_call_parent.sol |   1 +
 .../inheritance/state_variables.sol           |   1 +
 .../inheritance/state_variables_2.sol         |   1 +
 .../inheritance/state_variables_3.sol         |   1 +
 .../inline_assembly/assembly_2.sol            |   3 +-
 .../inline_assembly/assembly_3.sol            |   3 +-
 .../inline_assembly/assembly_4.sol            |   1 +
 .../inline_assembly/assembly_5.sol            |   1 +
 .../inline_assembly/assembly_6.sol            |   1 +
 ...y_local_storage_access_inside_function.sol |   1 +
 .../assembly_local_storage_pointer.sol        |   1 +
 .../inline_assembly/assembly_memory_write.sol |   1 +
 .../smtCheckerTests/invariants/loop_basic.sol |   1 +
 .../invariants/loop_basic_for.sol             |   1 +
 .../invariants/loop_nested.sol                |   1 +
 .../invariants/loop_nested_for.sol            |   1 +
 .../invariants/state_machine_1.sol            |   1 +
 .../smtCheckerTests/loops/do_while_1_fail.sol |   3 +-
 .../loops/do_while_1_false_positives.sol      |   1 +
 .../smtCheckerTests/loops/do_while_break.sol  |   1 +
 .../loops/do_while_break_2.sol                |   1 +
 .../loops/do_while_continue.sol               |   1 +
 .../smtCheckerTests/loops/for_1_break.sol     |   1 +
 .../loops/for_1_break_fail.sol                |   3 +-
 .../smtCheckerTests/loops/for_1_continue.sol  |   1 +
 .../loops/for_1_continue_fail.sol             |   3 +-
 .../smtCheckerTests/loops/for_1_fail.sol      |   3 +-
 .../loops/for_1_false_positive.sol            |   1 +
 .../loops/for_break_direct.sol                |   1 +
 .../smtCheckerTests/loops/for_loop_1.sol      |   1 +
 .../smtCheckerTests/loops/for_loop_2.sol      |   1 +
 .../smtCheckerTests/loops/for_loop_3.sol      |   1 +
 .../smtCheckerTests/loops/for_loop_6.sol      |   1 +
 ...or_loop_array_assignment_memory_memory.sol |   1 +
 ...r_loop_array_assignment_memory_storage.sol |   1 +
 ...r_loop_array_assignment_storage_memory.sol |   1 +
 .../loops/for_loop_trivial_condition_1.sol    |   1 +
 .../loops/for_loop_trivial_condition_2.sol    |   1 +
 .../loops/for_loop_trivial_condition_3.sol    |   1 +
 .../loops/for_loop_unreachable_1.sol          |   1 +
 .../smtCheckerTests/loops/while_1.sol         |   1 +
 .../smtCheckerTests/loops/while_1_break.sol   |   1 +
 .../loops/while_1_break_fail.sol              |   3 +-
 .../loops/while_1_continue.sol                |   1 +
 .../smtCheckerTests/loops/while_1_fail.sol    |   3 +-
 .../loops/while_1_infinite.sol                |   1 +
 .../smtCheckerTests/loops/while_2.sol         |   1 +
 .../smtCheckerTests/loops/while_2_break.sol   |   1 +
 .../loops/while_2_break_fail.sol              |   1 +
 .../smtCheckerTests/loops/while_2_fail.sol    |   1 +
 .../loops/while_break_direct.sol              |   1 +
 ...le_loop_array_assignment_memory_memory.sol |   1 +
 ...e_loop_array_assignment_memory_storage.sol |   1 +
 ..._loop_array_assignment_storage_storage.sol |   7 +-
 .../loops/while_loop_simple_2.sol             |   1 +
 .../loops/while_loop_simple_4.sol             |   1 +
 .../loops/while_loop_simple_5.sol             |   3 +-
 .../loops/while_nested_break.sol              |   1 +
 .../loops/while_nested_break_fail.sol         |   5 +-
 .../loops/while_nested_continue.sol           |   1 +
 .../smtCheckerTests/math/addmod_1.sol         |   7 +-
 .../smtCheckerTests/math/addmod_mulmod.sol    |   1 +
 .../math/addmod_mulmod_zero.sol               |   9 +-
 .../smtCheckerTests/math/addmulmod.sol        |   1 +
 .../smtCheckerTests/math/mulmod_1.sol         |   7 +-
 .../modifier_code_after_placeholder.sol       |   3 +-
 .../modifiers/modifier_control_flow.sol       |   3 +-
 ...difier_inside_branch_assignment_branch.sol |   1 +
 ...nside_branch_assignment_multi_branches.sol |   4 +-
 .../modifiers/modifier_multi.sol              |   3 +-
 .../modifiers/modifier_multi_functions.sol    |   3 +-
 .../modifier_multi_functions_recursive.sol    |   1 +
 .../modifiers/modifier_multi_parameters.sol   |   3 +-
 .../modifiers/modifier_overflow.sol           |   2 +-
 .../modifiers/modifier_overriding_1.sol       |   3 +-
 .../modifiers/modifier_overriding_3.sol       |   3 +-
 .../modifiers/modifier_overriding_4.sol       |   8 +-
 .../modifiers/modifier_parameters.sol         |   1 +
 .../modifiers/modifier_return.sol             |   1 +
 .../modifiers/modifier_simple.sol             |   1 +
 .../modifiers/modifier_two_invocations.sol    |   1 +
 .../modifiers/modifier_two_invocations_2.sol  |   4 +-
 .../modifiers/modifier_two_placeholders.sol   |   3 +-
 .../modifier_virtual_static_call_2.sol        |   4 +-
 ...act_function_nondet_pow_no_abstraction.sol |   2 +
 ...t_function_nondet_pow_with_abstraction.sol |   2 +
 .../safe_assert_false_positive_pure.sol       |   2 +-
 .../assignment_chain_tuple_contract_2.sol     |   3 +-
 .../assignment_chain_tuple_contract_3.sol     |   5 +-
 .../assignment_contract_member_variable.sol   |   1 +
 ...ignment_contract_member_variable_array.sol |   4 +-
 ...nment_contract_member_variable_array_2.sol |   1 +
 ...nment_contract_member_variable_array_3.sol |  10 +-
 ...gnment_module_contract_member_variable.sol |   6 +-
 .../operators/bitwise_and_fixed_bytes.sol     |   3 +-
 .../operators/bitwise_and_int.sol             |   3 +-
 .../operators/bitwise_and_rational.sol        |   3 +-
 .../operators/bitwise_and_uint.sol            |   7 +-
 .../operators/bitwise_combo.sol               |   1 +
 .../operators/bitwise_not_fixed_bytes.sol     |   3 +-
 .../operators/bitwise_not_int.sol             |   9 +-
 .../operators/bitwise_not_uint.sol            |   5 +-
 ...wise_operators_do_not_throw_exceptions.sol |   1 +
 .../operators/bitwise_or_fixed_bytes.sol      |   3 +-
 .../operators/bitwise_or_int.sol              |   5 +-
 .../operators/bitwise_or_uint.sol             |   5 +-
 .../operators/bitwise_rational_1.sol          |   1 +
 .../operators/bitwise_rational_2.sol          |   3 +-
 .../operators/bitwise_xor_fixed_bytes.sol     |   1 +
 .../operators/bitwise_xor_int.sol             |   5 +-
 .../operators/bitwise_xor_uint.sol            |   5 +-
 .../smtCheckerTests/operators/bytes_new.sol   |   5 +-
 .../operators/compound_add.sol                |   3 +-
 .../operators/compound_add_array_index.sol    |   3 +-
 .../operators/compound_add_chain.sol          |   1 +
 .../operators/compound_add_mapping.sol        |   3 +-
 .../compound_assignment_division_1.sol        |   3 +-
 .../compound_assignment_division_2.sol        |   3 +-
 .../compound_assignment_division_3.sol        |   3 +-
 .../compound_assignment_right_shift.sol       |   1 +
 .../compound_bitwise_and_fixed_bytes.sol      |   3 +-
 .../operators/compound_bitwise_and_int.sol    |   3 +-
 .../operators/compound_bitwise_and_uint.sol   |   7 +-
 .../compound_bitwise_or_fixed_bytes.sol       |   3 +-
 .../operators/compound_bitwise_or_int.sol     |   3 +-
 .../operators/compound_bitwise_or_int_1.sol   |   1 +
 .../operators/compound_bitwise_or_uint.sol    |   7 +-
 .../operators/compound_bitwise_or_uint_1.sol  |   1 +
 .../compound_bitwise_string_literal.sol       |   1 +
 .../compound_bitwise_string_literal_2.sol     |   3 +-
 .../compound_bitwise_string_literal_3.sol     |   5 +-
 .../compound_bitwise_xor_fixed_bytes.sol      |   3 +-
 .../operators/compound_bitwise_xor_int.sol    |   3 +-
 .../operators/compound_bitwise_xor_uint.sol   |   7 +-
 .../operators/compound_mul.sol                |   3 +-
 .../operators/compound_mul_array_index.sol    |   3 +-
 .../operators/compound_mul_mapping.sol        |   1 +
 .../operators/compound_shl_1.sol              |   1 +
 .../operators/compound_sub.sol                |   3 +-
 .../operators/compound_sub_array_index.sol    |   1 +
 .../operators/compound_sub_mapping.sol        |   1 +
 .../operators/conditional_assignment_2.sol    |   1 +
 .../operators/conditional_assignment_3.sol    |   1 +
 .../operators/conditional_assignment_4.sol    |   1 +
 .../operators/conditional_assignment_6.sol    |   2 +-
 .../conditional_assignment_function_2.sol     |   1 +
 ...ditional_assignment_nested_always_true.sol |   1 +
 .../conditional_assignment_statevar_1.sol     |   1 +
 .../smtCheckerTests/operators/const_exp_1.sol |   3 +-
 .../operators/constant_propagation_1.sol      |   3 +-
 .../operators/constant_propagation_2.sol      |   1 +
 .../operators/delete_array.sol                |   1 +
 .../operators/delete_array_2d.sol             |   2 +-
 .../operators/delete_array_index.sol          |   2 +-
 .../operators/delete_array_index_2d.sol       |   2 +-
 .../operators/delete_array_push.sol           |   1 +
 .../operators/delete_function.sol             |   2 +-
 .../operators/delete_function_type_3.sol      |   1 +
 .../operators/delete_multid_array.sol         |   1 +
 .../operators/delete_struct.sol               |   1 +
 .../operators/delete_tuple.sol                |   1 +
 .../smtCheckerTests/operators/division_2.sol  |   1 +
 .../smtCheckerTests/operators/division_3.sol  |   3 +-
 .../smtCheckerTests/operators/division_4.sol  |   1 +
 .../smtCheckerTests/operators/division_6.sol  |   3 +-
 .../division_truncates_correctly_1.sol        |   1 +
 .../division_truncates_correctly_2.sol        |   1 +
 .../division_truncates_correctly_3.sol        |   1 +
 .../division_truncates_correctly_4.sol        |   1 +
 .../division_truncates_correctly_5.sol        |   1 +
 .../function_call_named_arguments.sol         |   3 +-
 .../operators/index_access_for_bytes.sol      |   3 +-
 .../operators/index_access_for_bytesNN.sol    |   1 +
 .../operators/index_access_for_string.sol     |   1 +
 .../operators/index_access_side_effect.sol    |   2 +-
 .../smtCheckerTests/operators/integer_new.sol |   5 +-
 .../smtCheckerTests/operators/mod.sol         |   1 +
 .../smtCheckerTests/operators/mod_even.sol    |   1 +
 .../smtCheckerTests/operators/mod_n.sol       |   1 +
 .../operators/mod_n_uint16.sol                |   1 +
 .../smtCheckerTests/operators/mod_signed.sol  |   2 +
 .../operators/shifts/compound_shift_left.sol  |   1 +
 .../operators/shifts/compound_shift_right.sol |   1 +
 .../operators/shifts/shift_cleanup.sol        |   1 +
 .../operators/shifts/shift_left.sol           |   1 +
 .../shifts/shift_left_larger_type.sol         |   3 +-
 .../operators/shifts/shift_left_uint32.sol    |   1 +
 .../operators/shifts/shift_left_uint8.sol     |   1 +
 .../operators/shifts/shift_overflow.sol       |   1 +
 .../operators/shifts/shift_right.sol          |   1 +
 .../shifts/shift_right_negative_literal.sol   |   1 +
 .../shifts/shift_right_negative_lvalue.sol    |   1 +
 .../shift_right_negative_lvalue_int16.sol     |   1 +
 .../shift_right_negative_lvalue_int32.sol     |   1 +
 .../shift_right_negative_lvalue_int8.sol      |   1 +
 .../operators/shifts/shift_right_uint32.sol   |   1 +
 .../operators/shifts/shift_right_uint8.sol    |   1 +
 .../shift_underflow_negative_rvalue.sol       |   1 +
 .../operators/shifts/shr_unused.sol           |   1 +
 .../smtCheckerTests/operators/slice.sol       |   1 +
 .../smtCheckerTests/operators/slice_bytes.sol |   1 +
 .../operators/slice_default_end.sol           |   1 +
 .../operators/slice_default_start.sol         |   1 +
 .../smtCheckerTests/operators/slices_3.sol    |   1 +
 .../operators/tuple_rationals_conditional.sol |   1 +
 .../smtCheckerTests/operators/unary_add.sol   |   3 +-
 .../operators/unary_add_array.sol             |   1 +
 .../operators/unary_add_array_push_1.sol      |   3 +-
 .../operators/unary_add_array_push_2.sol      |   2 +-
 .../operators/unary_add_mapping.sol           |   1 +
 .../unary_add_overflows_correctly.sol         |   3 +-
 .../unary_add_overflows_correctly_struct.sol  |   3 +-
 .../operators/unary_operators_tuple_1.sol     |   1 +
 .../operators/unary_operators_tuple_2.sol     |   1 +
 .../operators/unary_operators_tuple_3.sol     |   3 +-
 .../smtCheckerTests/operators/unary_sub.sol   |   3 +-
 .../operators/unary_sub_array.sol             |   1 +
 .../operators/unary_sub_mapping.sol           |   1 +
 ...rator_matches_equivalent_function_call.sol |   1 +
 .../userDefined/user_defined_overflow.sol     |   1 +
 .../smtCheckerTests/out_of_bounds/array_1.sol |   1 +
 .../smtCheckerTests/out_of_bounds/array_2.sol |   2 +-
 .../out_of_bounds/array_2d_1.sol              |   1 +
 .../out_of_bounds/array_2d_2.sol              |   3 +-
 .../out_of_bounds/array_2d_3.sol              |   1 +
 .../out_of_bounds/array_2d_4.sol              |   6 +-
 .../smtCheckerTests/out_of_bounds/array_4.sol |   1 +
 .../out_of_bounds/fixed_bytes_1.sol           |   1 +
 .../out_of_bounds/fixed_bytes_3.sol           |   1 +
 .../out_of_bounds/fixed_bytes_4.sol           |   1 +
 .../overflow/overflow_constant_bound.sol      |   1 +
 .../smtCheckerTests/overflow/overflow_mul.sol |   3 +-
 .../overflow/overflow_mul_cex_with_array.sol  |   1 +
 .../overflow/overflow_mul_signed.sol          |   3 +-
 .../smtCheckerTests/overflow/overflow_sum.sol |   3 +-
 .../overflow/overflow_sum_signed.sol          |   1 +
 .../overflow/signed_guard_sub_overflow.sol    |   3 +-
 .../overflow/signed_guard_sum_overflow.sol    |   1 +
 .../overflow/underflow_sub.sol                |   1 +
 .../overflow/underflow_sub_signed.sol         |   1 +
 .../overflow/unsigned_guard_sub_overflow.sol  |   1 +
 .../abi_decode_memory_v2_value_types.sol      |   1 +
 .../special/abi_decode_simple.sol             |   3 +-
 .../special/block_vars_bmc_internal.sol       |   1 +
 .../special/block_vars_chc_internal.sol       |   1 +
 .../smtCheckerTests/special/blockhash.sol     |   1 +
 .../smtCheckerTests/special/chainid.sol       |   1 +
 .../smtCheckerTests/special/ether_units.sol   |   7 +-
 .../smtCheckerTests/special/event.sol         |   3 +-
 .../smtCheckerTests/special/gasleft.sol       |   5 +-
 .../smtCheckerTests/special/msg_data.sol      |   1 +
 .../smtCheckerTests/special/msg_sender_1.sol  |   1 +
 .../smtCheckerTests/special/msg_sender_2.sol  |   1 +
 .../smtCheckerTests/special/msg_sender_3.sol  |   1 +
 .../special/msg_sender_fail_1.sol             |   1 +
 .../special/msg_sender_range.sol              |   1 +
 .../smtCheckerTests/special/msg_sig.sol       |   7 +-
 .../smtCheckerTests/special/msg_value_1.sol   |   5 +-
 .../smtCheckerTests/special/msg_value_3.sol   |   2 +-
 .../smtCheckerTests/special/msg_value_4.sol   |   3 +-
 .../special/msg_value_inheritance_1.sol       |   3 +-
 .../special/msg_value_inheritance_2.sol       |   5 +-
 .../special/msg_value_inheritance_3.sol       |   3 +-
 .../special/msg_vars_bmc_internal.sol         |   1 +
 .../special/msg_vars_chc_internal.sol         |   3 +-
 .../smtCheckerTests/special/prevrandao.sol    |   1 +
 .../smtCheckerTests/special/range_check.sol   |   1 +
 .../smtCheckerTests/special/shadowing_1.sol   |   1 +
 .../smtCheckerTests/special/this_state.sol    |   1 +
 .../smtCheckerTests/special/time_units.sol    |  11 +-
 .../smtCheckerTests/special/timestamp.sol     |   1 +
 .../smtCheckerTests/special/timestamp_2.sol   |   3 +-
 .../special/tx_data_gasleft_changes.sol       |   1 +
 .../special/tx_data_immutable.sol             |   1 +
 .../special/tx_vars_bmc_internal.sol          |   1 +
 .../special/tx_vars_chc_internal.sol          |   3 +-
 .../smtCheckerTests/try_catch/try_1.sol       |   3 +-
 .../smtCheckerTests/try_catch/try_2.sol       |   1 +
 .../smtCheckerTests/try_catch/try_3.sol       |   3 +-
 .../smtCheckerTests/try_catch/try_4.sol       |   2 +-
 .../smtCheckerTests/try_catch/try_5.sol       |   4 +-
 .../try_catch/try_multiple_catch_clauses.sol  |   3 +-
 .../try_multiple_catch_clauses_2.sol          |   1 +
 .../try_multiple_returned_values.sol          |   8 +-
 ...ry_multiple_returned_values_with_tuple.sol |   3 +-
 .../try_catch/try_nested_1.sol                |   1 +
 .../try_catch/try_nested_2.sol                |   1 +
 .../try_catch/try_nested_3.sol                |   3 +-
 .../try_catch/try_public_var.sol              |   3 +-
 .../try_catch/try_public_var_mapping.sol      |   3 +-
 .../try_string_literal_to_bytes_array.sol     |   1 +
 .../try_string_literal_to_fixed_bytes.sol     |   1 +
 .../typecast/address_literal.sol              |   4 +-
 .../typecast/bytes_to_fixed_bytes_1.sol       |   1 +
 .../typecast/cast_address_1.sol               |   1 +
 .../typecast/cast_different_size_1.sol        |   1 +
 .../typecast/cast_larger_1.sol                |   1 +
 .../typecast/cast_larger_2.sol                |   1 +
 .../typecast/cast_larger_3.sol                |   3 +-
 .../typecast/cast_smaller_1.sol               |   1 +
 .../typecast/cast_smaller_2.sol               |   1 +
 .../typecast/cast_smaller_3.sol               |   1 +
 .../smtCheckerTests/typecast/downcast.sol     |   1 +
 .../typecast/enum_from_uint.sol               |   1 +
 .../typecast/enum_to_uint_max_value.sol       |   1 +
 .../implicit_cast_string_literal_byte.sol     |   3 +-
 .../typecast/number_literal.sol               |   1 +
 .../smtCheckerTests/typecast/same_size.sol    |   1 +
 .../string_literal_to_dynamic_bytes.sol       |   3 +-
 ..._fixed_bytes_constant_initialization_2.sol |   1 +
 ...string_literal_to_fixed_bytes_modifier.sol |   3 +-
 .../string_literal_to_fixed_bytes_return.sol  |   3 +-
 ...ng_literal_to_fixed_bytes_return_multi.sol |   3 +-
 .../string_literal_to_fixed_bytes_upcast.sol  |   3 +-
 .../typecast/string_to_bytes_push_1.sol       |   3 +-
 .../typecast/string_to_bytes_push_2.sol       |   1 +
 .../smtCheckerTests/typecast/upcast.sol       |   1 +
 .../smtCheckerTests/types/address_call.sol    |   1 +
 .../types/address_staticcall.sol              |   2 +-
 .../types/address_transfer_3.sol              |   2 +
 .../types/array_aliasing_memory_1.sol         |   1 +
 .../types/array_aliasing_memory_2.sol         |   1 +
 .../types/array_aliasing_memory_3.sol         |   2 +-
 .../types/array_aliasing_storage_1.sol        |   1 +
 .../types/array_aliasing_storage_2.sol        |   1 +
 .../types/array_aliasing_storage_3.sol        |   1 +
 .../smtCheckerTests/types/array_branch_1d.sol |   1 +
 .../smtCheckerTests/types/array_branch_3d.sol |   4 +-
 .../types/array_branches_1d.sol               |   1 +
 .../types/array_branches_2d.sol               |   1 +
 .../types/array_branches_3d.sol               |   2 +-
 .../types/array_branches_3d_show_unproved.sol |   2 +-
 .../smtCheckerTests/types/array_dynamic_1.sol |   1 +
 .../types/array_dynamic_1_fail.sol            |   3 +-
 .../smtCheckerTests/types/array_dynamic_2.sol |   5 +-
 .../types/array_dynamic_2_fail.sol            |   1 +
 .../smtCheckerTests/types/array_dynamic_3.sol |   1 +
 .../types/array_dynamic_3_fail.sol            |   1 +
 .../types/array_dynamic_parameter_1.sol       |   1 +
 .../types/array_dynamic_parameter_1_fail.sol  |   1 +
 .../smtCheckerTests/types/array_literal_1.sol |   1 +
 .../smtCheckerTests/types/array_literal_2.sol |   3 +-
 .../smtCheckerTests/types/array_literal_3.sol |   1 +
 .../smtCheckerTests/types/array_literal_4.sol |   1 +
 .../smtCheckerTests/types/array_literal_5.sol |   3 +-
 .../smtCheckerTests/types/array_literal_6.sol |   5 +-
 .../smtCheckerTests/types/array_literal_7.sol |   1 +
 .../types/array_mapping_aliasing_1.sol        |   1 +
 .../types/array_mapping_aliasing_2.sol        |   1 +
 .../smtCheckerTests/types/array_static_1.sol  |   1 +
 .../types/array_static_1_fail.sol             |   3 +-
 .../smtCheckerTests/types/array_static_2.sol  |   1 +
 .../types/array_static_2_fail.sol             |   3 +-
 .../smtCheckerTests/types/array_static_3.sol  |   1 +
 .../types/array_static_3_fail.sol             |   3 +-
 .../types/array_static_aliasing_memory_5.sol  |   3 +-
 .../types/array_static_aliasing_storage_5.sol |   1 +
 .../types/array_static_mapping_aliasing_1.sol |   2 +-
 .../types/array_static_mapping_aliasing_2.sol |   1 +
 .../types/bool_int_mixed_1.sol                |   1 +
 .../types/bool_int_mixed_2.sol                |   1 +
 .../types/bool_int_mixed_3.sol                |   1 +
 .../smtCheckerTests/types/bool_simple_3.sol   |   1 +
 .../smtCheckerTests/types/bool_simple_4.sol   |   1 +
 .../smtCheckerTests/types/bool_simple_5.sol   |   1 +
 .../smtCheckerTests/types/bool_simple_6.sol   |   1 +
 .../smtCheckerTests/types/bytes_2.sol         |   1 +
 .../smtCheckerTests/types/bytes_2_fail.sol    |   1 +
 .../smtCheckerTests/types/bytes_length.sol    |   1 +
 .../smtCheckerTests/types/contract_3.sol      |   1 +
 .../types/contract_address_conversion_2.sol   |   1 +
 .../types/enum_explicit_values.sol            |   2 +-
 .../smtCheckerTests/types/enum_in_library.sol |   1 +
 .../smtCheckerTests/types/enum_in_struct.sol  |   1 +
 .../smtCheckerTests/types/enum_range.sol      |   1 +
 .../types/enum_transitivity.sol               |   1 +
 .../smtCheckerTests/types/fixed_bytes_2.sol   |   3 +-
 .../types/fixed_bytes_access_1.sol            |   2 +-
 .../types/fixed_bytes_access_2.sol            |   1 +
 .../types/fixed_bytes_access_3.sol            |   1 +
 .../types/fixed_bytes_access_4.sol            |   3 +-
 .../types/fixed_bytes_access_5.sol            |   7 +-
 .../types/fixed_bytes_access_6.sol            |   1 +
 .../types/fixed_bytes_range.sol               |   1 +
 .../types/function_type_arrays.sol            |   1 +
 .../smtCheckerTests/types/mapping_1.sol       |   1 +
 .../smtCheckerTests/types/mapping_2d_1.sol    |   1 +
 .../smtCheckerTests/types/mapping_3.sol       |   1 +
 .../smtCheckerTests/types/mapping_3d_1.sol    |   1 +
 .../smtCheckerTests/types/mapping_4.sol       |   2 +-
 .../types/mapping_aliasing_1.sol              |   1 +
 .../types/mapping_aliasing_2.sol              |   1 +
 .../types/mapping_equal_keys_1.sol            |   1 +
 .../types/mapping_equal_keys_2.sol            |   1 +
 .../types/mapping_unsupported_key_type_1.sol  |   1 +
 .../types/rational_large_1.sol                |   3 +-
 .../types/static_array_implicit_push_2.sol    |   1 +
 .../types/static_array_length_1.sol           |   1 +
 .../types/static_array_length_2.sol           |   5 +-
 .../types/static_array_length_3.sol           |   5 +-
 .../types/static_array_length_4.sol           |   9 +-
 .../types/static_array_length_5.sol           |   6 +-
 .../types/storage_value_vars_3.sol            |   1 +
 .../smtCheckerTests/types/string_length.sol   |   1 +
 .../types/string_literal_assignment_1.sol     |   3 +-
 .../types/string_literal_assignment_2.sol     |   3 +-
 .../types/string_literal_assignment_3.sol     |   3 +-
 .../types/string_literal_assignment_4.sol     |   3 +-
 .../types/string_literal_assignment_5.sol     |   3 +-
 .../types/string_literal_comparison_1.sol     |   3 +-
 .../array_struct_array_struct_memory_safe.sol |   1 +
 ...rray_struct_array_struct_memory_unsafe.sol |   1 +
 ...array_struct_array_struct_storage_safe.sol |   1 +
 .../types/struct/struct_aliasing_memory.sol   |   1 +
 .../struct_aliasing_parameter_storage_1.sol   |   3 +-
 .../struct_aliasing_parameter_storage_3.sol   |   1 +
 .../struct_aliasing_parameter_storage_4.sol   |   1 +
 .../types/struct/struct_aliasing_storage.sol  |   1 +
 .../struct_array_struct_array_memory_safe.sol |   1 +
 ...uct_array_struct_array_memory_unsafe_1.sol |  11 +-
 ...uct_array_struct_array_memory_unsafe_2.sol |   1 +
 ...struct_array_struct_array_storage_safe.sol |   1 +
 ...ct_array_struct_array_storage_unsafe_1.sol |   1 +
 ..._constructor_fixed_bytes_from_string_1.sol |   3 +-
 .../struct/struct_constructor_named_args.sol  |   3 +-
 .../struct_constructor_named_args_2.sol       |   3 +-
 .../types/struct/struct_delete_memory.sol     |   1 +
 .../types/struct/struct_delete_storage.sol    |   1 +
 .../struct/struct_nested_constructor.sol      |   3 +-
 .../struct_nested_constructor_named_args.sol  |   1 +
 .../types/struct/struct_nested_temporary.sol  |   1 +
 .../types/struct/struct_recursive_5.sol       |   3 +-
 .../types/struct/struct_return.sol            |   3 +-
 .../types/struct/struct_state_constructor.sol |   2 +-
 .../types/struct/struct_state_var.sol         |   1 +
 .../struct/struct_state_var_array_pop_1.sol   |   1 +
 .../struct/struct_state_var_array_pop_2.sol   |   1 +
 .../types/struct/struct_temporary.sol         |   1 +
 .../types/struct/struct_unary_add.sol         |   1 +
 .../types/struct/struct_unary_sub.sol         |   1 +
 .../smtCheckerTests/types/struct_1.sol        |   1 +
 .../types/struct_array_branches_1d.sol        |   1 +
 .../types/struct_array_branches_2d.sol        |   1 +
 .../types/struct_array_branches_3d.sol        |   1 +
 .../smtCheckerTests/types/tuple_1_chain_1.sol |   1 +
 .../smtCheckerTests/types/tuple_1_chain_2.sol |   1 +
 .../smtCheckerTests/types/tuple_1_chain_n.sol |   1 +
 .../types/tuple_assignment.sol                |   1 +
 .../types/tuple_assignment_array.sol          |   1 +
 .../types/tuple_assignment_array_empty.sol    |   1 +
 .../types/tuple_assignment_compound.sol       |   3 +-
 .../types/tuple_assignment_empty.sol          |   3 +-
 .../types/tuple_assignment_multiple_calls.sol |   1 +
 .../types/tuple_declarations.sol              |   1 +
 .../types/tuple_declarations_empty.sol        |   1 +
 .../types/tuple_declarations_function.sol     |   1 +
 .../types/tuple_declarations_function_2.sol   |   1 +
 .../tuple_different_count_assignment_1.sol    |   3 +-
 .../tuple_different_count_assignment_2.sol    |   3 +-
 .../types/tuple_extra_parens_7.sol            |   2 +-
 .../types/tuple_function_2.sol                |   3 +-
 .../types/tuple_function_3.sol                |   5 +-
 .../types/tuple_return_branch.sol             |   1 +
 .../types/type_interfaceid.sol                |   5 +-
 .../smtCheckerTests/types/type_minmax.sol     |   3 +-
 .../smtCheckerTests/types/unused_mapping.sol  |   1 +
 .../unchecked/block_inside_unchecked.sol      |   1 +
 .../unchecked/flipping_sign_tests.sol         |   3 +-
 .../smtCheckerTests/unchecked/inc_dec.sol     |   1 +
 .../smtCheckerTests/unchecked/signed_mod.sol  |   5 +-
 .../smtCheckerTests/userTypes/constant.sol    |   3 +-
 .../userTypes/conversion_1.sol                |   2 +-
 .../userTypes/conversion_2.sol                |   6 +-
 .../userTypes/conversion_3.sol                |   6 +-
 .../userTypes/conversion_4.sol                |   2 +-
 .../smtCheckerTests/userTypes/fixedpoint.sol  |   1 +
 .../userTypes/in_parenthesis.sol              |   5 +-
 .../userTypes/in_parenthesis_2.sol            |   1 +
 .../smtCheckerTests/userTypes/mapping_1.sol   |   3 +-
 .../smtCheckerTests/userTypes/modifier_1.sol  |   3 +-
 .../smtCheckerTests/userTypes/multisource.sol |   5 +-
 .../userTypes/multisource_module.sol          |   3 +-
 .../smtCheckerTests/userTypes/simple.sol      |   5 +-
 .../smtCheckerTests/userTypes/user_abi_1.sol  |   3 +-
 .../smtCheckerTests/userTypes/user_abi_2.sol  |   3 +-
 .../userTypes/user_type_as_array_elem_1.sol   |   1 +
 .../userTypes/user_type_as_array_elem_2.sol   |   3 +-
 .../user_type_as_library_constant_1.sol       |   2 +
 .../user_type_as_mapping_index_1.sol          |   3 +-
 .../user_type_as_mapping_index_2.sol          |   3 +-
 .../user_type_as_struct_member_1.sol          |   2 +
 .../wrap_unwrap_via_contract_name.sol         |   1 +
 .../simple_assert_with_require.sol            |   1 +
 .../simple_assert_with_require_message.sol    |   1 +
 test/solc/CommandLineParser.cpp               |   3 +
 test/tools/fuzzer_common.cpp                  |   1 +
 971 files changed, 2550 insertions(+), 664 deletions(-)
 create mode 100644 test/cmdlineTests/model_checker_divModSlacks_default_all/err
 create mode 100644 test/cmdlineTests/model_checker_divModSlacks_default_bmc/err
 create mode 100644 test/cmdlineTests/model_checker_divModSlacks_default_chc/err
 create mode 100644 test/cmdlineTests/model_checker_divModSlacks_false_bmc/err
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/args
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/err
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/input.sol
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_default_bmc/args
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_default_bmc/err
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_default_bmc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_default_chc/args
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_default_chc/err
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_default_chc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/args
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/err
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/input.sol
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_true_bmc/args
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_true_bmc/err
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_true_bmc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_true_chc/args
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_true_chc/err
 create mode 100644 test/cmdlineTests/model_checker_show_proved_safe_true_chc/input.sol
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/output.json

diff --git a/Changelog.md b/Changelog.md
index 3efe2bb2a5..a2c4856919 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
 
 
 Bugfixes:
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index 05d50cdce2..27d2cfaa15 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -483,6 +483,14 @@ All targets are checked by default, except underflow and overflow for Solidity >
 There is no precise heuristic on how and when to split verification targets,
 but it can be useful especially when dealing with large contracts.
 
+Proved Targets
+==============
+
+If there are any proved targets, the SMTChecker issues one warning per engine stating
+how many targets were proved. If the user wishes to see all the specific
+proved targets, the CLI option ``--model-checker-show-proved`` and
+the JSON option ``settings.modelChecker.showProved = true`` can be used.
+
 Unproved Targets
 ================
 
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 251a2c0536..4dc385627a 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -439,6 +439,8 @@ Input Description
           "extCalls": "trusted",
           // Choose which types of invariants should be reported to the user: contract, reentrancy.
           "invariants": ["contract", "reentrancy"],
+          // Choose whether to output all proved targets. The default is `false`.
+          "showProved": true,
           // Choose whether to output all unproved targets. The default is `false`.
           "showUnproved": true,
           // Choose which solvers should be used, if available.
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index d17b5c93a9..caca4f6be5 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -99,6 +99,26 @@ void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<Verificatio
 			" Consider increasing the timeout per query."
 		);
 
+	if (!m_settings.showProvedSafe && !m_safeTargets.empty())
+		m_errorReporter.info(
+			6002_error,
+			"BMC: " +
+			to_string(m_safeTargets.size()) +
+			" verification condition(s) proved safe!" +
+			" Enable the model checker option \"show proved safe\" to see all of them."
+		);
+	else if (m_settings.showProvedSafe)
+		for (auto const& [node, targets]: m_safeTargets)
+			for (auto const& target: targets)
+				m_errorReporter.info(
+					2961_error,
+					node->location(),
+					"BMC: " +
+					targetDescription(target) +
+					" check is safe!"
+				);
+
+
 	// If this check is true, Z3 and CVC4 are not available
 	// and the query answers were not provided, since SMTPortfolio
 	// guarantees that SmtLib2Interface is the first solver, if enabled.
@@ -694,6 +714,30 @@ pair<vector<smtutil::Expression>, vector<string>> BMC::modelExpressions()
 
 /// Verification targets.
 
+string BMC::targetDescription(BMCVerificationTarget const& _target)
+{
+	if (
+		_target.type == VerificationTargetType::Underflow ||
+		_target.type == VerificationTargetType::Overflow
+	)
+	{
+		auto const* intType = dynamic_cast<IntegerType const*>(_target.expression->annotation().type);
+		if (!intType)
+			intType = TypeProvider::uint256();
+
+		if (_target.type == VerificationTargetType::Underflow)
+			return "Underflow (resulting value less than " + formatNumberReadable(intType->minValue()) + ")";
+		return "Overflow (resulting value larger than " + formatNumberReadable(intType->maxValue()) + ")";
+	}
+	else if (_target.type == VerificationTargetType::DivByZero)
+		return "Division by zero";
+	else if (_target.type == VerificationTargetType::Assert)
+		return "Assertion violation";
+	else if (_target.type == VerificationTargetType::Balance)
+		return "Insufficient funds";
+	solAssert(false);
+}
+
 void BMC::checkVerificationTargets()
 {
 	for (auto& target: m_verificationTargets)
@@ -762,13 +806,13 @@ void BMC::checkUnderflow(BMCVerificationTarget& _target)
 		intType = TypeProvider::uint256();
 
 	checkCondition(
+		_target,
 		_target.constraints && _target.value < smt::minValue(*intType),
 		_target.callStack,
 		_target.modelExpressions,
 		_target.expression->location(),
 		4144_error,
 		8312_error,
-		"Underflow (resulting value less than " + formatNumberReadable(intType->minValue()) + ")",
 		"<result>",
 		&_target.value
 	);
@@ -795,13 +839,13 @@ void BMC::checkOverflow(BMCVerificationTarget& _target)
 		intType = TypeProvider::uint256();
 
 	checkCondition(
+		_target,
 		_target.constraints && _target.value > smt::maxValue(*intType),
 		_target.callStack,
 		_target.modelExpressions,
 		_target.expression->location(),
 		2661_error,
 		8065_error,
-		"Overflow (resulting value larger than " + formatNumberReadable(intType->maxValue()) + ")",
 		"<result>",
 		&_target.value
 	);
@@ -818,13 +862,13 @@ void BMC::checkDivByZero(BMCVerificationTarget& _target)
 		return;
 
 	checkCondition(
+		_target,
 		_target.constraints && (_target.value == 0),
 		_target.callStack,
 		_target.modelExpressions,
 		_target.expression->location(),
 		3046_error,
 		5272_error,
-		"Division by zero",
 		"<result>",
 		&_target.value
 	);
@@ -834,13 +878,13 @@ void BMC::checkBalance(BMCVerificationTarget& _target)
 {
 	solAssert(_target.type == VerificationTargetType::Balance, "");
 	checkCondition(
+		_target,
 		_target.constraints && _target.value,
 		_target.callStack,
 		_target.modelExpressions,
 		_target.expression->location(),
 		1236_error,
 		4010_error,
-		"Insufficient funds",
 		"address(this).balance"
 	);
 }
@@ -856,13 +900,13 @@ void BMC::checkAssert(BMCVerificationTarget& _target)
 		return;
 
 	checkCondition(
+		_target,
 		_target.constraints && !_target.value,
 		_target.callStack,
 		_target.modelExpressions,
 		_target.expression->location(),
 		4661_error,
-		7812_error,
-		"Assertion violation"
+		7812_error
 	);
 }
 
@@ -894,13 +938,13 @@ void BMC::addVerificationTarget(
 /// Solving.
 
 void BMC::checkCondition(
+	BMCVerificationTarget const& _target,
 	smtutil::Expression _condition,
 	vector<SMTEncoder::CallStackEntry> const& _callStack,
 	pair<vector<smtutil::Expression>, vector<string>> const& _modelExpressions,
 	SourceLocation const& _location,
 	ErrorId _errorHappens,
 	ErrorId _errorMightHappen,
-	string const& _description,
 	string const& _additionalValueName,
 	smtutil::Expression const* _additionalValue
 )
@@ -942,7 +986,7 @@ void BMC::checkCondition(
 	{
 		solAssert(!_callStack.empty(), "");
 		std::ostringstream message;
-		message << "BMC: " << _description << " happens here.";
+		message << "BMC: " << targetDescription(_target) << " happens here.";
 
 		std::ostringstream modelMessage;
 		// Sometimes models have complex smtlib2 expressions that SMTLib2Interface fails to parse.
@@ -969,12 +1013,15 @@ void BMC::checkCondition(
 		break;
 	}
 	case smtutil::CheckResult::UNSATISFIABLE:
+	{
+		m_safeTargets[_target.expression].insert(_target);
 		break;
+	}
 	case smtutil::CheckResult::UNKNOWN:
 	{
 		++m_unprovedAmt;
 		if (m_settings.showUnproved)
-			m_errorReporter.warning(_errorMightHappen, _location, "BMC: " + _description + " might happen here.", secondaryLocation);
+			m_errorReporter.warning(_errorMightHappen, _location, "BMC: " + targetDescription(_target) + " might happen here.", secondaryLocation);
 		break;
 	}
 	case smtutil::CheckResult::CONFLICTING:
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index daf8d834a9..9c106689e4 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -135,8 +135,15 @@ class BMC: public SMTEncoder
 		Expression const* expression;
 		std::vector<CallStackEntry> callStack;
 		std::pair<std::vector<smtutil::Expression>, std::vector<std::string>> modelExpressions;
+
+		friend bool operator<(BMCVerificationTarget const& _a, BMCVerificationTarget const& _b)
+		{
+			return _a.expression->id() < _b.expression->id();
+		}
 	};
 
+	std::string targetDescription(BMCVerificationTarget const& _target);
+
 	void checkVerificationTargets();
 	void checkVerificationTarget(BMCVerificationTarget& _target);
 	void checkConstantCondition(BMCVerificationTarget& _target);
@@ -156,13 +163,13 @@ class BMC: public SMTEncoder
 	//@{
 	/// Check that a condition can be satisfied.
 	void checkCondition(
+		BMCVerificationTarget const& _target,
 		smtutil::Expression _condition,
 		std::vector<CallStackEntry> const& _callStack,
 		std::pair<std::vector<smtutil::Expression>, std::vector<std::string>> const& _modelExpressions,
 		langutil::SourceLocation const& _location,
 		langutil::ErrorId _errorHappens,
 		langutil::ErrorId _errorMightHappen,
-		std::string const& _description,
 		std::string const& _additionalValueName = "",
 		smtutil::Expression const* _additionalValue = nullptr
 	);
@@ -188,7 +195,10 @@ class BMC: public SMTEncoder
 
 	std::vector<BMCVerificationTarget> m_verificationTargets;
 
-	/// Targets that were already proven.
+	/// Targets proved safe by this engine.
+	std::map<ASTNode const*, std::set<BMCVerificationTarget>, smt::EncodingContext::IdCompare> m_safeTargets;
+
+	/// Targets that were already proven before this engine started.
 	std::map<ASTNode const*, std::set<VerificationTargetType>, smt::EncodingContext::IdCompare> m_solvedTargets;
 
 	/// Number of verification conditions that could not be proved.
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index db67426259..0281a4cbd7 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1882,6 +1882,48 @@ void CHC::verificationTargetEncountered(
 	m_context.addAssertion(errorFlag().currentValue() == previousError);
 }
 
+pair<string, ErrorId> CHC::targetDescription(CHCVerificationTarget const& _target)
+{
+	if (_target.type == VerificationTargetType::PopEmptyArray)
+	{
+		solAssert(dynamic_cast<FunctionCall const*>(_target.errorNode), "");
+		return {"Empty array \"pop\"", 2529_error};
+	}
+	else if (_target.type == VerificationTargetType::OutOfBounds)
+	{
+		solAssert(dynamic_cast<IndexAccess const*>(_target.errorNode), "");
+		return {"Out of bounds access", 6368_error};
+	}
+	else if (
+		_target.type == VerificationTargetType::Underflow ||
+		_target.type == VerificationTargetType::Overflow
+	)
+	{
+		auto const* expr = dynamic_cast<Expression const*>(_target.errorNode);
+		solAssert(expr, "");
+		auto const* intType = dynamic_cast<IntegerType const*>(expr->annotation().type);
+		if (!intType)
+			intType = TypeProvider::uint256();
+
+		if (_target.type == VerificationTargetType::Underflow)
+			return {
+				"Underflow (resulting value less than " + formatNumberReadable(intType->minValue()) + ")",
+				3944_error
+			};
+
+		return {
+			"Overflow (resulting value larger than " + formatNumberReadable(intType->maxValue()) + ")",
+			4984_error
+		};
+	}
+	else if (_target.type == VerificationTargetType::DivByZero)
+		return {"Division by zero", 4281_error};
+	else if (_target.type == VerificationTargetType::Assert)
+		return {"Assertion violation", 6328_error};
+	else
+		solAssert(false);
+}
+
 void CHC::checkVerificationTargets()
 {
 	// The verification conditions have been collected per function where they have been encountered (m_verificationTargets).
@@ -1900,57 +1942,8 @@ void CHC::checkVerificationTargets()
 	set<unsigned> checkedErrorIds;
 	for (auto const& [targetId, placeholders]: targetEntryPoints)
 	{
-		string errorType;
-		ErrorId errorReporterId;
-
 		auto const& target = m_verificationTargets.at(targetId);
-
-		if (target.type == VerificationTargetType::PopEmptyArray)
-		{
-			solAssert(dynamic_cast<FunctionCall const*>(target.errorNode), "");
-			errorType = "Empty array \"pop\"";
-			errorReporterId = 2529_error;
-		}
-		else if (target.type == VerificationTargetType::OutOfBounds)
-		{
-			solAssert(dynamic_cast<IndexAccess const*>(target.errorNode), "");
-			errorType = "Out of bounds access";
-			errorReporterId = 6368_error;
-		}
-		else if (
-			target.type == VerificationTargetType::Underflow ||
-			target.type == VerificationTargetType::Overflow
-		)
-		{
-			auto const* expr = dynamic_cast<Expression const*>(target.errorNode);
-			solAssert(expr, "");
-			auto const* intType = dynamic_cast<IntegerType const*>(expr->annotation().type);
-			if (!intType)
-				intType = TypeProvider::uint256();
-
-			if (target.type == VerificationTargetType::Underflow)
-			{
-				errorType = "Underflow (resulting value less than " + formatNumberReadable(intType->minValue()) + ")";
-				errorReporterId = 3944_error;
-			}
-			else if (target.type == VerificationTargetType::Overflow)
-			{
-				errorType = "Overflow (resulting value larger than " + formatNumberReadable(intType->maxValue()) + ")";
-				errorReporterId = 4984_error;
-			}
-		}
-		else if (target.type == VerificationTargetType::DivByZero)
-		{
-			errorType = "Division by zero";
-			errorReporterId = 4281_error;
-		}
-		else if (target.type == VerificationTargetType::Assert)
-		{
-			errorType = "Assertion violation";
-			errorReporterId = 6328_error;
-		}
-		else
-			solAssert(false, "");
+		auto [errorType, errorReporterId] = targetDescription(target);
 
 		checkAndReportTarget(target, placeholders, errorReporterId, errorType + " happens here.", errorType + " might happen here.");
 		checkedErrorIds.insert(target.errorId);
@@ -1982,6 +1975,25 @@ void CHC::checkVerificationTargets()
 			" Consider increasing the timeout per query."
 		);
 
+	if (!m_settings.showProvedSafe && !m_safeTargets.empty())
+		m_errorReporter.info(
+			1391_error,
+			"CHC: " +
+			to_string(m_safeTargets.size()) +
+			" verification condition(s) proved safe!" +
+			" Enable the model checker option \"show proved safe\" to see all of them."
+		);
+	else if (m_settings.showProvedSafe)
+		for (auto const& [node, targets]: m_safeTargets)
+			for (auto const& target: targets)
+				m_errorReporter.info(
+					9576_error,
+					node->location(),
+					"CHC: " +
+					targetDescription(target).first +
+					" check is safe!"
+				);
+
 	if (!m_settings.invariants.invariants.empty())
 	{
 		string msg;
@@ -2040,7 +2052,7 @@ void CHC::checkVerificationTargets()
 		inserter(unreachableErrorIds, unreachableErrorIds.begin())
 	);
 	for (auto id: unreachableErrorIds)
-		m_safeTargets[m_verificationTargets.at(id).errorNode].insert(m_verificationTargets.at(id).type);
+		m_safeTargets[m_verificationTargets.at(id).errorNode].insert(m_verificationTargets.at(id));
 }
 
 void CHC::checkAndReportTarget(
@@ -2065,7 +2077,7 @@ void CHC::checkAndReportTarget(
 	auto [result, invariant, model] = query(error(), location);
 	if (result == CheckResult::UNSATISFIABLE)
 	{
-		m_safeTargets[_target.errorNode].insert(_target.type);
+		m_safeTargets[_target.errorNode].insert(_target);
 		set<Predicate const*> predicates;
 		for (auto const* pred: m_interfaces | ranges::views::values)
 			predicates.insert(pred);
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index c113f85831..5f6b71b397 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -65,13 +65,25 @@ class CHC: public SMTEncoder
 
 	void analyze(SourceUnit const& _sources);
 
+	struct CHCVerificationTarget: VerificationTarget
+	{
+		unsigned const errorId;
+		ASTNode const* const errorNode;
+
+		friend bool operator<(CHCVerificationTarget const& _a, CHCVerificationTarget const& _b)
+		{
+			return _a.errorId < _b.errorId;
+		}
+	};
+
 	struct ReportTargetInfo
 	{
 		langutil::ErrorId error;
 		langutil::SourceLocation location;
 		std::string message;
 	};
-	std::map<ASTNode const*, std::set<VerificationTargetType>, smt::EncodingContext::IdCompare> const& safeTargets() const { return m_safeTargets; }
+
+	std::map<ASTNode const*, std::set<CHCVerificationTarget>, smt::EncodingContext::IdCompare> const& safeTargets() const { return m_safeTargets; }
 	std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> const& unsafeTargets() const { return m_unsafeTargets; }
 
 	/// This is used if the Horn solver is not directly linked into this binary.
@@ -261,8 +273,6 @@ class CHC: public SMTEncoder
 	void verificationTargetEncountered(ASTNode const* const _errorNode, VerificationTargetType _type, smtutil::Expression const& _errorCondition);
 
 	void checkVerificationTargets();
-	// Forward declarations. Definitions are below.
-	struct CHCVerificationTarget;
 	struct CHCQueryPlaceholder;
 	void checkAssertTarget(ASTNode const* _scope, CHCVerificationTarget const& _target);
 	void checkAndReportTarget(
@@ -273,6 +283,8 @@ class CHC: public SMTEncoder
 		std::string _unknownMsg = ""
 	);
 
+	std::pair<std::string, langutil::ErrorId> targetDescription(CHCVerificationTarget const& _target);
+
 	std::optional<std::string> generateCounterexample(smtutil::CHCSolverInterface::CexGraph const& _graph, std::string const& _root);
 
 	/// @returns a call graph for function summaries in the counterexample graph.
@@ -370,12 +382,6 @@ class CHC: public SMTEncoder
 
 	/// Verification targets.
 	//@{
-	struct CHCVerificationTarget: VerificationTarget
-	{
-		unsigned const errorId;
-		ASTNode const* const errorNode;
-	};
-
 	/// Query placeholder stores information necessary to create the final query edge in the CHC system.
 	/// It is combined with the unique error id (and error type) to create a complete Verification Target.
 	struct CHCQueryPlaceholder
@@ -398,7 +404,7 @@ class CHC: public SMTEncoder
 	std::map<unsigned, CHCVerificationTarget> m_verificationTargets;
 
 	/// Targets proved safe.
-	std::map<ASTNode const*, std::set<VerificationTargetType>, smt::EncodingContext::IdCompare> m_safeTargets;
+	std::map<ASTNode const*, std::set<CHCVerificationTarget>, smt::EncodingContext::IdCompare> m_safeTargets;
 	/// Targets proved unsafe.
 	std::map<ASTNode const*, std::map<VerificationTargetType, ReportTargetInfo>, smt::EncodingContext::IdCompare> m_unsafeTargets;
 	/// Targets not proved.
diff --git a/libsolidity/formal/ModelChecker.cpp b/libsolidity/formal/ModelChecker.cpp
index 959bcbc75b..5ec06d107e 100644
--- a/libsolidity/formal/ModelChecker.cpp
+++ b/libsolidity/formal/ModelChecker.cpp
@@ -125,7 +125,12 @@ void ModelChecker::analyze(SourceUnit const& _source)
 	if (m_settings.engine.chc)
 		m_chc.analyze(_source);
 
-	auto solvedTargets = m_chc.safeTargets();
+	map<ASTNode const*, set<VerificationTargetType>, smt::EncodingContext::IdCompare> solvedTargets;
+
+	for (auto const& [node, targets]: m_chc.safeTargets())
+		for (auto const& target: targets)
+			solvedTargets[node].insert(target.type);
+
 	for (auto const& [node, targets]: m_chc.unsafeTargets())
 		solvedTargets[node] += targets | ranges::views::keys;
 
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index 3c1f623a07..023d7800f3 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -168,6 +168,7 @@ struct ModelCheckerSettings
 	ModelCheckerEngine engine = ModelCheckerEngine::None();
 	ModelCheckerExtCalls externalCalls = {};
 	ModelCheckerInvariants invariants = ModelCheckerInvariants::Default();
+	bool showProvedSafe = false;
 	bool showUnproved = false;
 	smtutil::SMTSolverChoice solvers = smtutil::SMTSolverChoice::Z3();
 	ModelCheckerTargets targets = ModelCheckerTargets::Default();
@@ -182,6 +183,7 @@ struct ModelCheckerSettings
 			engine == _other.engine &&
 			externalCalls.mode == _other.externalCalls.mode &&
 			invariants == _other.invariants &&
+			showProvedSafe == _other.showProvedSafe &&
 			showUnproved == _other.showUnproved &&
 			solvers == _other.solvers &&
 			targets == _other.targets &&
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index b08e8fbf6f..3a16551eb8 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -445,7 +445,7 @@ std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
 
 std::optional<Json::Value> checkModelCheckerSettingsKeys(Json::Value const& _input)
 {
-	static set<string> keys{"contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "showUnproved", "solvers", "targets", "timeout"};
+	static set<string> keys{"contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "showProvedSafe", "showUnproved", "solvers", "targets", "timeout"};
 	return checkKeys(_input, keys, "modelChecker");
 }
 
@@ -1047,6 +1047,14 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.modelCheckerSettings.invariants = invariants;
 	}
 
+	if (modelCheckerSettings.isMember("showProvedSafe"))
+	{
+		auto const& showProvedSafe = modelCheckerSettings["showProvedSafe"];
+		if (!showProvedSafe.isBool())
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.showProvedSafe must be a Boolean value.");
+		ret.modelCheckerSettings.showProvedSafe = showProvedSafe.asBool();
+	}
+
 	if (modelCheckerSettings.isMember("showUnproved"))
 	{
 		auto const& showUnproved = modelCheckerSettings["showUnproved"];
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 464884344d..890d90ecb3 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -202,7 +202,10 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "4591", # "There are more than 256 warnings. Ignoring the rest."
                 # Due to 3805, the warning lists look different for different compiler builds.
         "1834", # Unimplemented feature error, as we do not test it anymore via cmdLineTests
-        "5430"  # basefee being used in inline assembly for EVMVersion < london
+        "5430", # basefee being used in inline assembly for EVMVersion < london
+        "1180", # SMTChecker, covered by CL tests
+        "2961", # SMTChecker, covered by CL tests
+        "9576", # SMTChecker, covered by CL tests
     }
     assert len(test_ids & white_ids) == 0, "The sets are not supposed to intersect"
     test_ids |= white_ids
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index eb03831beb..8fd2454022 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -71,6 +71,7 @@ static string const g_strModelCheckerDivModNoSlacks = "model-checker-div-mod-no-
 static string const g_strModelCheckerEngine = "model-checker-engine";
 static string const g_strModelCheckerExtCalls = "model-checker-ext-calls";
 static string const g_strModelCheckerInvariants = "model-checker-invariants";
+static string const g_strModelCheckerShowProvedSafe = "model-checker-show-proved-safe";
 static string const g_strModelCheckerShowUnproved = "model-checker-show-unproved";
 static string const g_strModelCheckerSolvers = "model-checker-solvers";
 static string const g_strModelCheckerTargets = "model-checker-targets";
@@ -845,6 +846,10 @@ General Information)").c_str(),
 			" Multiple types of invariants can be selected at the same time, separated by a comma and no spaces."
 			" By default no invariants are reported."
 		)
+		(
+			g_strModelCheckerShowProvedSafe.c_str(),
+			"Show all targets that were proved safe separately."
+		)
 		(
 			g_strModelCheckerShowUnproved.c_str(),
 			"Show all unproved targets separately."
@@ -953,6 +958,7 @@ void CommandLineParser::processArgs()
 		{g_strMetadataLiteral, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strNoCBORMetadata, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strMetadataHash, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerShowProvedSafe, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerShowUnproved, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerDivModNoSlacks, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerEngine, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
@@ -1314,6 +1320,9 @@ void CommandLineParser::processArgs()
 		m_options.modelChecker.settings.invariants = *invs;
 	}
 
+	if (m_args.count(g_strModelCheckerShowProvedSafe))
+		m_options.modelChecker.settings.showProvedSafe = true;
+
 	if (m_args.count(g_strModelCheckerShowUnproved))
 		m_options.modelChecker.settings.showUnproved = true;
 
@@ -1345,6 +1354,7 @@ void CommandLineParser::processArgs()
 		m_args.count(g_strModelCheckerEngine) ||
 		m_args.count(g_strModelCheckerExtCalls) ||
 		m_args.count(g_strModelCheckerInvariants) ||
+		m_args.count(g_strModelCheckerShowProvedSafe) ||
 		m_args.count(g_strModelCheckerShowUnproved) ||
 		m_args.count(g_strModelCheckerSolvers) ||
 		m_args.count(g_strModelCheckerTargets) ||
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_all/err b/test/cmdlineTests/model_checker_divModSlacks_default_all/err
new file mode 100644
index 0000000000..4ad4ce3847
--- /dev/null
+++ b/test/cmdlineTests/model_checker_divModSlacks_default_all/err
@@ -0,0 +1 @@
+Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_bmc/err b/test/cmdlineTests/model_checker_divModSlacks_default_bmc/err
new file mode 100644
index 0000000000..d849d45f9c
--- /dev/null
+++ b/test/cmdlineTests/model_checker_divModSlacks_default_bmc/err
@@ -0,0 +1 @@
+Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_divModSlacks_default_chc/err b/test/cmdlineTests/model_checker_divModSlacks_default_chc/err
new file mode 100644
index 0000000000..4ad4ce3847
--- /dev/null
+++ b/test/cmdlineTests/model_checker_divModSlacks_default_chc/err
@@ -0,0 +1 @@
+Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_all/err b/test/cmdlineTests/model_checker_divModSlacks_false_all/err
index 3e4759a941..8de36b1ee4 100644
--- a/test/cmdlineTests/model_checker_divModSlacks_false_all/err
+++ b/test/cmdlineTests/model_checker_divModSlacks_false_all/err
@@ -11,3 +11,5 @@ Warning: CHC: Error trying to invoke SMT solver.
   | 		               ^^^^^
 
 Warning: CHC: 2 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_divModSlacks_false_bmc/err b/test/cmdlineTests/model_checker_divModSlacks_false_bmc/err
new file mode 100644
index 0000000000..d849d45f9c
--- /dev/null
+++ b/test/cmdlineTests/model_checker_divModSlacks_false_bmc/err
@@ -0,0 +1 @@
+Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/err b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/err
index a07e1575d1..e9c2d70a97 100644
--- a/test/cmdlineTests/model_checker_ext_calls_trusted_chc/err
+++ b/test/cmdlineTests/model_checker_ext_calls_trusted_chc/err
@@ -3,3 +3,5 @@ Warning: Function state mutability can be restricted to pure
   |
 5 | 	function f() public view returns (uint) {
   | 	^ (Relevant source part starts here and spans across multiple lines).
+
+Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_invariants_all/err b/test/cmdlineTests/model_checker_invariants_all/err
index 2f80a8a2ab..347f40325d 100644
--- a/test/cmdlineTests/model_checker_invariants_all/err
+++ b/test/cmdlineTests/model_checker_invariants_all/err
@@ -4,6 +4,8 @@ Warning: Return value of low-level calls not used.
 6 | 		_a.call("");
   | 		^^^^^^^^^^^
 
+Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+
 Info: Contract invariant(s) for model_checker_invariants_all/input.sol:test:
 (!(x >= 1) || true)
 Reentrancy property(ies) for model_checker_invariants_all/input.sol:test:
diff --git a/test/cmdlineTests/model_checker_invariants_contract/err b/test/cmdlineTests/model_checker_invariants_contract/err
index 6c700a4053..f6b01e9b2c 100644
--- a/test/cmdlineTests/model_checker_invariants_contract/err
+++ b/test/cmdlineTests/model_checker_invariants_contract/err
@@ -1,2 +1,4 @@
+Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+
 Info: Contract invariant(s) for model_checker_invariants_contract/input.sol:test:
 (!(x >= 1) || true)
diff --git a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
index 8bf527172c..c6d149f15a 100644
--- a/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
+++ b/test/cmdlineTests/model_checker_invariants_contract_reentrancy/err
@@ -4,6 +4,8 @@ Warning: Return value of low-level calls not used.
 6 | 		_a.call("");
   | 		^^^^^^^^^^^
 
+Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+
 Info: Contract invariant(s) for model_checker_invariants_contract_reentrancy/input.sol:test:
 (!(x >= 1) || true)
 Reentrancy property(ies) for model_checker_invariants_contract_reentrancy/input.sol:test:
diff --git a/test/cmdlineTests/model_checker_invariants_reentrancy/err b/test/cmdlineTests/model_checker_invariants_reentrancy/err
index 003d5d3895..bdd19fa18f 100644
--- a/test/cmdlineTests/model_checker_invariants_reentrancy/err
+++ b/test/cmdlineTests/model_checker_invariants_reentrancy/err
@@ -4,6 +4,8 @@ Warning: Return value of low-level calls not used.
 6 | 		_a.call("");
   | 		^^^^^^^^^^^
 
+Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+
 Info: Reentrancy property(ies) for model_checker_invariants_reentrancy/input.sol:test:
 (((!(x <= 0) || !(x' >= 1)) && (!(x <= 0) || !(<errorCode> >= 1))) || true)
 <errorCode> = 0 -> no errors
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/args b/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/args
new file mode 100644
index 0000000000..5aeb1490ed
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/args
@@ -0,0 +1 @@
+--model-checker-engine all
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/err b/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/err
new file mode 100644
index 0000000000..b896b21bc7
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/err
@@ -0,0 +1,7 @@
+Warning: Function state mutability can be restricted to pure
+ --> model_checker_show_proved_safe_default_all_engines/input.sol:4:5:
+  |
+4 |     function f(uint8 x) public {
+  |     ^ (Relevant source part starts here and spans across multiple lines).
+
+Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/input.sol
new file mode 100644
index 0000000000..ea73970277
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_default_all_engines/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f(uint8 x) public {
+        assert(x >= 0);
+        assert(x < 1000);
+    }
+}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/args b/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/args
new file mode 100644
index 0000000000..549f202363
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/args
@@ -0,0 +1 @@
+--model-checker-engine bmc
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/err b/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/err
new file mode 100644
index 0000000000..f4a2d33e05
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/err
@@ -0,0 +1,7 @@
+Warning: Function state mutability can be restricted to pure
+ --> model_checker_show_proved_safe_default_bmc/input.sol:4:5:
+  |
+4 |     function f(uint8 x) public {
+  |     ^ (Relevant source part starts here and spans across multiple lines).
+
+Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/input.sol
new file mode 100644
index 0000000000..ea73970277
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_default_bmc/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f(uint8 x) public {
+        assert(x >= 0);
+        assert(x < 1000);
+    }
+}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_chc/args b/test/cmdlineTests/model_checker_show_proved_safe_default_chc/args
new file mode 100644
index 0000000000..7458a47d35
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_default_chc/args
@@ -0,0 +1 @@
+--model-checker-engine chc
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_chc/err b/test/cmdlineTests/model_checker_show_proved_safe_default_chc/err
new file mode 100644
index 0000000000..ab73c6bf56
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_default_chc/err
@@ -0,0 +1,7 @@
+Warning: Function state mutability can be restricted to pure
+ --> model_checker_show_proved_safe_default_chc/input.sol:4:5:
+  |
+4 |     function f(uint8 x) public {
+  |     ^ (Relevant source part starts here and spans across multiple lines).
+
+Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_default_chc/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_default_chc/input.sol
new file mode 100644
index 0000000000..ea73970277
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_default_chc/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f(uint8 x) public {
+        assert(x >= 0);
+        assert(x < 1000);
+    }
+}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/args b/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/args
new file mode 100644
index 0000000000..ea8cde3e6f
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/args
@@ -0,0 +1 @@
+--model-checker-engine all --model-checker-show-proved-safe
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/err b/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/err
new file mode 100644
index 0000000000..297eb497a3
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/err
@@ -0,0 +1,17 @@
+Warning: Function state mutability can be restricted to pure
+ --> model_checker_show_proved_safe_true_all_engines/input.sol:4:5:
+  |
+4 |     function f(uint8 x) public {
+  |     ^ (Relevant source part starts here and spans across multiple lines).
+
+Info: CHC: Assertion violation check is safe!
+ --> model_checker_show_proved_safe_true_all_engines/input.sol:5:9:
+  |
+5 |         assert(x >= 0);
+  |         ^^^^^^^^^^^^^^
+
+Info: CHC: Assertion violation check is safe!
+ --> model_checker_show_proved_safe_true_all_engines/input.sol:6:9:
+  |
+6 |         assert(x < 1000);
+  |         ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/input.sol
new file mode 100644
index 0000000000..ea73970277
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_true_all_engines/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f(uint8 x) public {
+        assert(x >= 0);
+        assert(x < 1000);
+    }
+}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/args b/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/args
new file mode 100644
index 0000000000..83385f6ba8
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/args
@@ -0,0 +1 @@
+--model-checker-engine bmc --model-checker-show-proved-safe
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/err b/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/err
new file mode 100644
index 0000000000..bcec557f61
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/err
@@ -0,0 +1,17 @@
+Warning: Function state mutability can be restricted to pure
+ --> model_checker_show_proved_safe_true_bmc/input.sol:4:5:
+  |
+4 |     function f(uint8 x) public {
+  |     ^ (Relevant source part starts here and spans across multiple lines).
+
+Info: BMC: Assertion violation check is safe!
+ --> model_checker_show_proved_safe_true_bmc/input.sol:5:9:
+  |
+5 |         assert(x >= 0);
+  |         ^^^^^^^^^^^^^^
+
+Info: BMC: Assertion violation check is safe!
+ --> model_checker_show_proved_safe_true_bmc/input.sol:6:9:
+  |
+6 |         assert(x < 1000);
+  |         ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/input.sol
new file mode 100644
index 0000000000..ea73970277
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_true_bmc/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f(uint8 x) public {
+        assert(x >= 0);
+        assert(x < 1000);
+    }
+}
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_chc/args b/test/cmdlineTests/model_checker_show_proved_safe_true_chc/args
new file mode 100644
index 0000000000..b49ef31bc5
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_true_chc/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-show-proved-safe
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_chc/err b/test/cmdlineTests/model_checker_show_proved_safe_true_chc/err
new file mode 100644
index 0000000000..fc14f49467
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_true_chc/err
@@ -0,0 +1,17 @@
+Warning: Function state mutability can be restricted to pure
+ --> model_checker_show_proved_safe_true_chc/input.sol:4:5:
+  |
+4 |     function f(uint8 x) public {
+  |     ^ (Relevant source part starts here and spans across multiple lines).
+
+Info: CHC: Assertion violation check is safe!
+ --> model_checker_show_proved_safe_true_chc/input.sol:5:9:
+  |
+5 |         assert(x >= 0);
+  |         ^^^^^^^^^^^^^^
+
+Info: CHC: Assertion violation check is safe!
+ --> model_checker_show_proved_safe_true_chc/input.sol:6:9:
+  |
+6 |         assert(x < 1000);
+  |         ^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_proved_safe_true_chc/input.sol b/test/cmdlineTests/model_checker_show_proved_safe_true_chc/input.sol
new file mode 100644
index 0000000000..ea73970277
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_proved_safe_true_chc/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f(uint8 x) public {
+        assert(x >= 0);
+        assert(x < 1000);
+    }
+}
diff --git a/test/cmdlineTests/model_checker_timeout_all/err b/test/cmdlineTests/model_checker_timeout_all/err
index 45c38ef359..651dc83b88 100644
--- a/test/cmdlineTests/model_checker_timeout_all/err
+++ b/test/cmdlineTests/model_checker_timeout_all/err
@@ -1,3 +1,5 @@
 Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
 
+Info: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+
 Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
diff --git a/test/cmdlineTests/model_checker_timeout_bmc/err b/test/cmdlineTests/model_checker_timeout_bmc/err
index f8d0af2f4f..eb20e7eff5 100644
--- a/test/cmdlineTests/model_checker_timeout_bmc/err
+++ b/test/cmdlineTests/model_checker_timeout_bmc/err
@@ -1 +1,3 @@
 Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+Info: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/model_checker_timeout_chc/err b/test/cmdlineTests/model_checker_timeout_chc/err
index 77083185f9..f6ca5c2af9 100644
--- a/test/cmdlineTests/model_checker_timeout_chc/err
+++ b/test/cmdlineTests/model_checker_timeout_chc/err
@@ -1 +1,3 @@
 Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+Info: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
index acf3b74ef1..b8637143b0 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_all/output.json
@@ -1,4 +1,17 @@
 {
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
     "sources":
     {
         "A":
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
index acf3b74ef1..a6ce9b3c96 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_bmc/output.json
@@ -1,4 +1,17 @@
 {
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6002",
+            "formattedMessage": "Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
     "sources":
     {
         "A":
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json
index acf3b74ef1..b8637143b0 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_default_chc/output.json
@@ -1,4 +1,17 @@
 {
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
     "sources":
     {
         "A":
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
index fccd15838f..f7ecf690d8 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_false_all/output.json
@@ -50,6 +50,16 @@
             "message": "CHC: 2 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
             "severity": "warning",
             "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6002",
+            "formattedMessage": "Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
         }
     ],
     "sources":
diff --git a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
index acf3b74ef1..a6ce9b3c96 100644
--- a/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_divModSlacks_false_bmc/output.json
@@ -1,4 +1,17 @@
 {
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6002",
+            "formattedMessage": "Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
     "sources":
     {
         "A":
diff --git a/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json b/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json
index 93d73d1c46..7f39934101 100644
--- a/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_ext_calls_trusted_chc/output.json
@@ -20,6 +20,16 @@
                 "start": 85
             },
             "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
         }
     ],
     "sources":
diff --git a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
index 4023977fbc..314b66aae4 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_contract/output.json
@@ -1,6 +1,16 @@
 {
     "errors":
     [
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        },
         {
             "component": "general",
             "errorCode": "1180",
diff --git a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
index 003fb099e9..feb586a3e3 100644
--- a/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
+++ b/test/cmdlineTests/standard_model_checker_invariants_reentrancy/output.json
@@ -21,6 +21,16 @@
             },
             "type": "Warning"
         },
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        },
         {
             "component": "general",
             "errorCode": "1180",
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/input.json
new file mode 100644
index 0000000000..0d6db09642
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f(uint8 x) public {
+						assert(x >= 0);
+						assert(x < 1000);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/output.json
new file mode 100644
index 0000000000..b8118ba16a
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_all_engines/output.json
@@ -0,0 +1,42 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2018",
+            "formattedMessage": "Warning: Function state mutability can be restricted to pure
+ --> A:5:6:
+  |
+5 | \t\t\t\t\tfunction f(uint8 x) public {
+  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
+
+",
+            "message": "Function state mutability can be restricted to pure",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 162,
+                "file": "A",
+                "start": 81
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/input.json
new file mode 100644
index 0000000000..e60b023121
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f(uint8 x) public {
+						assert(x >= 0);
+						assert(x < 1000);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "bmc"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/output.json
new file mode 100644
index 0000000000..eb6ed6e277
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_bmc/output.json
@@ -0,0 +1,42 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2018",
+            "formattedMessage": "Warning: Function state mutability can be restricted to pure
+ --> A:5:6:
+  |
+5 | \t\t\t\t\tfunction f(uint8 x) public {
+  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
+
+",
+            "message": "Function state mutability can be restricted to pure",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 162,
+                "file": "A",
+                "start": 81
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6002",
+            "formattedMessage": "Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/input.json
new file mode 100644
index 0000000000..9f3abdf553
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f(uint8 x) public {
+						assert(x >= 0);
+						assert(x < 1000);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/output.json
new file mode 100644
index 0000000000..b8118ba16a
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_default_chc/output.json
@@ -0,0 +1,42 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2018",
+            "formattedMessage": "Warning: Function state mutability can be restricted to pure
+ --> A:5:6:
+  |
+5 | \t\t\t\t\tfunction f(uint8 x) public {
+  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
+
+",
+            "message": "Function state mutability can be restricted to pure",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 162,
+                "file": "A",
+                "start": 81
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/input.json
new file mode 100644
index 0000000000..37f4ce655a
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f(uint8 x) public {
+						assert(x >= 0);
+						assert(x < 1000);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+			"showProvedSafe": false
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/output.json
new file mode 100644
index 0000000000..b8118ba16a
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_all_engines/output.json
@@ -0,0 +1,42 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2018",
+            "formattedMessage": "Warning: Function state mutability can be restricted to pure
+ --> A:5:6:
+  |
+5 | \t\t\t\t\tfunction f(uint8 x) public {
+  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
+
+",
+            "message": "Function state mutability can be restricted to pure",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 162,
+                "file": "A",
+                "start": 81
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/input.json
new file mode 100644
index 0000000000..cc48fefdfc
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f(uint8 x) public {
+						assert(x >= 0);
+						assert(x < 1000);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "bmc",
+			"showProvedSafe": false
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/output.json
new file mode 100644
index 0000000000..eb6ed6e277
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_bmc/output.json
@@ -0,0 +1,42 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2018",
+            "formattedMessage": "Warning: Function state mutability can be restricted to pure
+ --> A:5:6:
+  |
+5 | \t\t\t\t\tfunction f(uint8 x) public {
+  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
+
+",
+            "message": "Function state mutability can be restricted to pure",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 162,
+                "file": "A",
+                "start": 81
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6002",
+            "formattedMessage": "Info: BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "BMC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/input.json
new file mode 100644
index 0000000000..e8a47469cd
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f(uint8 x) public {
+						assert(x >= 0);
+						assert(x < 1000);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"showProvedSafe": false
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/output.json
new file mode 100644
index 0000000000..b8118ba16a
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_false_chc/output.json
@@ -0,0 +1,42 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2018",
+            "formattedMessage": "Warning: Function state mutability can be restricted to pure
+ --> A:5:6:
+  |
+5 | \t\t\t\t\tfunction f(uint8 x) public {
+  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
+
+",
+            "message": "Function state mutability can be restricted to pure",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 162,
+                "file": "A",
+                "start": 81
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 2 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/input.json
new file mode 100644
index 0000000000..baf5f6195a
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f(uint8 x) public {
+						assert(x >= 0);
+						assert(x < 1000);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+			"showProvedSafe": true
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/output.json
new file mode 100644
index 0000000000..8482298559
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_all_engines/output.json
@@ -0,0 +1,72 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2018",
+            "formattedMessage": "Warning: Function state mutability can be restricted to pure
+ --> A:5:6:
+  |
+5 | \t\t\t\t\tfunction f(uint8 x) public {
+  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
+
+",
+            "message": "Function state mutability can be restricted to pure",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 162,
+                "file": "A",
+                "start": 81
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "9576",
+            "formattedMessage": "Info: CHC: Assertion violation check is safe!
+ --> A:6:7:
+  |
+6 | \t\t\t\t\t\tassert(x >= 0);
+  | \t\t\t\t\t\t^^^^^^^^^^^^^^
+
+",
+            "message": "CHC: Assertion violation check is safe!",
+            "severity": "info",
+            "sourceLocation":
+            {
+                "end": 130,
+                "file": "A",
+                "start": 116
+            },
+            "type": "Info"
+        },
+        {
+            "component": "general",
+            "errorCode": "9576",
+            "formattedMessage": "Info: CHC: Assertion violation check is safe!
+ --> A:7:7:
+  |
+7 | \t\t\t\t\t\tassert(x < 1000);
+  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^
+
+",
+            "message": "CHC: Assertion violation check is safe!",
+            "severity": "info",
+            "sourceLocation":
+            {
+                "end": 154,
+                "file": "A",
+                "start": 138
+            },
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/input.json
new file mode 100644
index 0000000000..20948ed9db
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f(uint8 x) public {
+						assert(x >= 0);
+						assert(x < 1000);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "bmc",
+			"showProvedSafe": true
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/output.json
new file mode 100644
index 0000000000..20ddce1fd5
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_bmc/output.json
@@ -0,0 +1,72 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2018",
+            "formattedMessage": "Warning: Function state mutability can be restricted to pure
+ --> A:5:6:
+  |
+5 | \t\t\t\t\tfunction f(uint8 x) public {
+  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
+
+",
+            "message": "Function state mutability can be restricted to pure",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 162,
+                "file": "A",
+                "start": 81
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "2961",
+            "formattedMessage": "Info: BMC: Assertion violation check is safe!
+ --> A:6:7:
+  |
+6 | \t\t\t\t\t\tassert(x >= 0);
+  | \t\t\t\t\t\t^^^^^^^^^^^^^^
+
+",
+            "message": "BMC: Assertion violation check is safe!",
+            "severity": "info",
+            "sourceLocation":
+            {
+                "end": 130,
+                "file": "A",
+                "start": 116
+            },
+            "type": "Info"
+        },
+        {
+            "component": "general",
+            "errorCode": "2961",
+            "formattedMessage": "Info: BMC: Assertion violation check is safe!
+ --> A:7:7:
+  |
+7 | \t\t\t\t\t\tassert(x < 1000);
+  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^
+
+",
+            "message": "BMC: Assertion violation check is safe!",
+            "severity": "info",
+            "sourceLocation":
+            {
+                "end": 154,
+                "file": "A",
+                "start": 138
+            },
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/input.json
new file mode 100644
index 0000000000..5fb18aac9e
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f(uint8 x) public {
+						assert(x >= 0);
+						assert(x < 1000);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"showProvedSafe": true
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/output.json
new file mode 100644
index 0000000000..8482298559
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_true_chc/output.json
@@ -0,0 +1,72 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2018",
+            "formattedMessage": "Warning: Function state mutability can be restricted to pure
+ --> A:5:6:
+  |
+5 | \t\t\t\t\tfunction f(uint8 x) public {
+  | \t\t\t\t\t^ (Relevant source part starts here and spans across multiple lines).
+
+",
+            "message": "Function state mutability can be restricted to pure",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 162,
+                "file": "A",
+                "start": 81
+            },
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "9576",
+            "formattedMessage": "Info: CHC: Assertion violation check is safe!
+ --> A:6:7:
+  |
+6 | \t\t\t\t\t\tassert(x >= 0);
+  | \t\t\t\t\t\t^^^^^^^^^^^^^^
+
+",
+            "message": "CHC: Assertion violation check is safe!",
+            "severity": "info",
+            "sourceLocation":
+            {
+                "end": 130,
+                "file": "A",
+                "start": 116
+            },
+            "type": "Info"
+        },
+        {
+            "component": "general",
+            "errorCode": "9576",
+            "formattedMessage": "Info: CHC: Assertion violation check is safe!
+ --> A:7:7:
+  |
+7 | \t\t\t\t\t\tassert(x < 1000);
+  | \t\t\t\t\t\t^^^^^^^^^^^^^^^^
+
+",
+            "message": "CHC: Assertion violation check is safe!",
+            "severity": "info",
+            "sourceLocation":
+            {
+                "end": 154,
+                "file": "A",
+                "start": 138
+            },
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/input.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/input.json
new file mode 100644
index 0000000000..eea83e140e
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/input.json
@@ -0,0 +1,23 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f(uint8 x) public {
+						assert(x >= 0);
+						assert(x < 1000);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+			"showProvedSafe": "aaa"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/output.json b/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/output.json
new file mode 100644
index 0000000000..7c8ccff6e2
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_proved_safe_wrong/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.showProvedSafe must be a Boolean value.",
+            "message": "settings.modelChecker.showProvedSafe must be a Boolean value.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_timeout_all/output.json b/test/cmdlineTests/standard_model_checker_timeout_all/output.json
index fb599d21d2..73b1171454 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_all/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_all/output.json
@@ -11,6 +11,16 @@
             "severity": "warning",
             "type": "Warning"
         },
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        },
         {
             "component": "general",
             "errorCode": "2788",
diff --git a/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json b/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
index 4554ec69e9..a709ec062c 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_bmc/output.json
@@ -10,6 +10,16 @@
             "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
             "severity": "warning",
             "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6002",
+            "formattedMessage": "Info: BMC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "BMC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
         }
     ],
     "sources":
diff --git a/test/cmdlineTests/standard_model_checker_timeout_chc/output.json b/test/cmdlineTests/standard_model_checker_timeout_chc/output.json
index 7f0e676cb8..553a1b93b6 100644
--- a/test/cmdlineTests/standard_model_checker_timeout_chc/output.json
+++ b/test/cmdlineTests/standard_model_checker_timeout_chc/output.json
@@ -10,6 +10,16 @@
             "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
             "severity": "warning",
             "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "1391",
+            "formattedMessage": "Info: CHC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "CHC: 4 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
         }
     ],
     "sources":
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol b/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
index e2c0894934..da30d302fe 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_decode_array.sol
@@ -42,3 +42,4 @@ contract C {
 // Warning 6328: (1009-1037): CHC: Assertion violation happens here.
 // Warning 6328: (1056-1084): CHC: Assertion violation happens here.
 // Warning 6328: (1103-1131): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
index 2020ce7aee..76c2ec2e9f 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_decode_simple.sol
@@ -28,3 +28,4 @@ contract C {
 // Warning 6328: (425-434): CHC: Assertion violation happens here.
 // Warning 6328: (505-519): CHC: Assertion violation happens here.
 // Warning 6328: (538-552): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol
index be0bc4769f..db29d51113 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_1.sol
@@ -20,3 +20,4 @@ contract C {
 // Warning 6368: (354-359): CHC: Out of bounds access happens here.
 // Warning 6368: (363-368): CHC: Out of bounds access happens here.
 // Warning 6328: (451-481): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol
index c6044a8cdc..2ce3d625ad 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_2.sol
@@ -19,3 +19,4 @@ contract C {
 // Warning 6368: (329-334): CHC: Out of bounds access happens here.
 // Warning 6368: (338-343): CHC: Out of bounds access happens here.
 // Warning 6328: (426-456): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol
index a3b20f7f75..691493b565 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_3.sol
@@ -19,3 +19,4 @@ contract C {
 // Warning 6368: (323-328): CHC: Out of bounds access happens here.
 // Warning 6368: (332-337): CHC: Out of bounds access happens here.
 // Warning 6328: (417-447): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol
index 6f0128f8ab..358f4955c6 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_4.sol
@@ -23,3 +23,4 @@ contract C {
 // Warning 6368: (377-382): CHC: Out of bounds access happens here.
 // Warning 6368: (386-391): CHC: Out of bounds access happens here.
 // Warning 6328: (462-492): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol
index 98e42ad9f6..21173a707d 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_call_simple_5.sol
@@ -23,3 +23,4 @@ contract C {
 // Warning 6368: (382-387): CHC: Out of bounds access happens here.
 // Warning 6368: (391-396): CHC: Out of bounds access happens here.
 // Warning 6328: (467-497): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_hash.sol
index 2f099fba12..6260ebde9c 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_hash.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_hash.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol
index 336696d397..2d4c811990 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_no_arguments.sol
@@ -20,3 +20,4 @@ contract C {
 // Warning 6328: (231-253): CHC: Assertion violation happens here.
 // Warning 6328: (307-330): CHC: Assertion violation happens here.
 // Warning 6328: (423-446): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol
index 1cde510697..dc886246b8 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_hash.sol
@@ -13,4 +13,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (281-319): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 0\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedHash(0, 0)
+// Warning 6328: (281-319): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
index cc8723ff25..50d474a873 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_packed_simple.sol
@@ -23,7 +23,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (322-352): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedSimple(false, 0, 0, 0, a, b)
-// Warning 6328: (419-449): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedSimple(false, 0, 0, 0, a, b)
-// Warning 6328: (528-558): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedSimple(false, 0, 0, 0, a, b)
-// Warning 6328: (577-607): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.abiencodePackedSimple(false, 0, 0, 0, a, b)
+// Warning 6328: (322-352): CHC: Assertion violation happens here.
+// Warning 6328: (419-449): CHC: Assertion violation happens here.
+// Warning 6328: (528-558): CHC: Assertion violation happens here.
+// Warning 6328: (577-607): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
index 2b79850d78..bf3bd61bec 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_simple.sol
@@ -21,6 +21,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (298-328): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb4 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(false, 0, 0, 0, a, b)
-// Warning 6328: (389-419): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(false, 0, 0, 0, a, b)
-// Warning 6328: (492-522): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb1 = []\nb2 = []\nb5 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(false, 0, 0, 0, a, b)
+// Warning 6328: (298-328): CHC: Assertion violation happens here.
+// Warning 6328: (389-419): CHC: Assertion violation happens here.
+// Warning 6328: (492-522): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
index c6f523b37d..67c8b92e62 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice.sol
@@ -29,4 +29,5 @@ contract C {
 // Warning 6328: (325-355): CHC: Assertion violation happens here.
 // Warning 6328: (578-608): CHC: Assertion violation happens here.
 // Warning 6328: (1079-1109): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 4661: (1079-1109): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
index 2c2b975611..69a3482b19 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_array_slice_2.sol
@@ -29,4 +29,5 @@ contract C {
 // Warning 6328: (326-356): CHC: Assertion violation happens here.
 // Warning 6328: (579-609): CHC: Assertion violation happens here.
 // Warning 6328: (1080-1110): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 4661: (1080-1110): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal_2.sol
index 6fd25fee5c..6737700b5b 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_selector_string_literal_2.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
index bbb5a58bdd..fad7437448 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice.sol
@@ -29,4 +29,5 @@ contract C {
 // Warning 6328: (334-364): CHC: Assertion violation happens here.
 // Warning 6328: (588-618): CHC: Assertion violation happens here.
 // Warning 6328: (1086-1116): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 4661: (1086-1116): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
index 6451a932b5..41e71ee5bf 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_array_slice_2.sol
@@ -29,4 +29,5 @@ contract C {
 // Warning 6328: (335-365): CHC: Assertion violation happens here.
 // Warning 6328: (589-619): CHC: Assertion violation happens here.
 // Warning 6328: (1087-1117): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 4661: (1087-1117): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
index 73575690d1..fbcaa1607c 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_hash.sol
@@ -14,5 +14,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (337-375): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 0\nb1 = [0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d]\nb2 = [0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d, 0x1d]\n\nTransaction trace:\nC.constructor()\nC.abiEncodeHash(sig, 0, 0)
-// Warning 6328: (394-432): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 0\n\nTransaction trace:\nC.constructor()\nC.abiEncodeHash(sig, 0, 0)
+// Warning 6328: (337-375): CHC: Assertion violation happens here.
+// Warning 6328: (394-432): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
index b88a969730..bd0f8a331a 100644
--- a/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
+++ b/test/libsolidity/smtCheckerTests/abi/abi_encode_with_sig_simple.sol
@@ -25,7 +25,8 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 5667: (107-122): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (543-573): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb5 = []\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(sig, false, 0, 0, 0, a, b)
-// Warning 6328: (664-694): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(sig, false, 0, 0, 0, a, b)
-// Warning 6328: (713-743): CHC: Assertion violation happens here.\nCounterexample:\n\nt = false\nx = 0\ny = 0\nz = 0\nb6 = []\n\nTransaction trace:\nC.constructor()\nC.abiEncodeSimple(sig, false, 0, 0, 0, a, b)
+// Warning 6328: (543-573): CHC: Assertion violation happens here.
+// Warning 6328: (664-694): CHC: Assertion violation happens here.
+// Warning 6328: (713-743): CHC: Assertion violation happens here.
 // Warning 6328: (824-854): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_7.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_7.sol
index a655a5debe..5ba845e749 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_7.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_7.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol
index 6de94c8ecf..f3546acf1b 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_pop_length_8.sol
@@ -13,4 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (49-56): CHC: Empty array "pop" happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol b/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol
index 5ed512278b..cbded7cad7 100644
--- a/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/array_push_string_literal.sol
@@ -15,5 +15,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (139-161): CHC: Assertion violation happens here.\nCounterexample:\ndata = [0x62]\n\nTransaction trace:\nC.constructor()\nState: data = []\nC.g()
-// Warning 6328: (263-290): CHC: Assertion violation happens here.\nCounterexample:\ndata = [0x01]\n\nTransaction trace:\nC.constructor()\nState: data = []\nC.g()
+// Warning 6328: (139-161): CHC: Assertion violation happens here.
+// Warning 6328: (263-290): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_memory_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_memory_to_memory.sol
index 5eab212587..3d68cef67e 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_memory_to_memory.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_memory_to_memory.sol
@@ -11,3 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol
index 2940383991..a20d20e0e5 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_assignment_2d_storage_to_storage.sol
@@ -18,4 +18,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 0)\n!(arr2.length <= 0)\n(((arr.length + ((- 1) * arr2.length)) <= 0) && ((arr2.length + ((- 1) * arr.length)) <= 0))\n(((arr2[0].length + ((- 1) * arr[0].length)) >= 0) && ((arr2[0].length + ((- 1) * arr[0].length)) <= 0))\n
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_memory_to_storage.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_memory_to_storage.sol
index 7d4656e8f9..cc5845733b 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_memory_to_storage.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_memory_to_storage.sol
@@ -12,3 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol
index 468f34257a..8c952aa75b 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_copy_2d_storage_to_memory.sol
@@ -17,4 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 1)\n
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol
index 48e0f73bf2..233c95560f 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_1.sol
@@ -7,4 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(true && (map[1].length <= 0))\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2.sol
index b62a905d09..245d4b8d4e 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2d_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2d_1.sol
index 7d253ac306..d6efabebfd 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2d_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_mapping_array_2d_1.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol
index 833caa24f8..f12f2bd92d 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_1.sol
@@ -11,4 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(((s1.arr.length + ((- 1) * s2.arr.length)) >= 0) && ((s1.arr.length + ((- 1) * s2.arr.length)) <= 0))\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
index 7950c86125..ab3bf9a7c5 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_1d_struct_array_2d_1.sol
@@ -22,4 +22,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(s1.arr.length <= 0)\n!(s2.arr.length <= 0)\n(((s1.arr[0].length + ((- 1) * s2.arr[0].length)) <= 0) && ((s2.arr[0].length + ((- 1) * s1.arr[0].length)) <= 0))\n
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_assignment_2d_memory_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_assignment_2d_memory_to_memory.sol
index 7a81d6f15c..9a6a00b8fd 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_assignment_2d_memory_to_memory.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_assignment_2d_memory_to_memory.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_assignment_memory_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_assignment_memory_to_memory.sol
index 6bbab32b7b..72aca44e0b 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_assignment_memory_to_memory.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_assignment_memory_to_memory.sol
@@ -7,3 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_assignment_storage_to_storage.sol b/test/libsolidity/smtCheckerTests/array_members/length_assignment_storage_to_storage.sol
index 58a48bd7fd..f198c96264 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_assignment_storage_to_storage.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_assignment_storage_to_storage.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_basic.sol b/test/libsolidity/smtCheckerTests/array_members/length_basic.sol
index 205c7746d5..981311a8b7 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_basic.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_basic.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (120-143): CHC: Assertion violation happens here.\nCounterexample:\narr = []\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: arr = []\nC.f()
+// Warning 6328: (120-143): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_copy_memory_to_storage.sol b/test/libsolidity/smtCheckerTests/array_members/length_copy_memory_to_storage.sol
index 4e4295a0b5..07b0bbb467 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_copy_memory_to_storage.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_copy_memory_to_storage.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_copy_storage_to_memory.sol b/test/libsolidity/smtCheckerTests/array_members/length_copy_storage_to_memory.sol
index 580465f4df..a750ba59ad 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_copy_storage_to_memory.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_copy_storage_to_memory.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol b/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol
index c96d53047c..4b30e2a6a8 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_function_call.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(arr.length <= 0)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol
index 4f1cf701b4..aa1a06132f 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment.sol
@@ -15,4 +15,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 2)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol
index 66dad84128..783ad207ec 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2.sol
@@ -23,4 +23,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 2)\n!(arr.length <= 3)\n!(arr[2].length <= 3)\n
+// Info 1391: CHC: 13 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
index 0023906fef..40effc4cb9 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_2_fail.sol
@@ -27,4 +27,4 @@ contract C {
 // Warning 6328: (291-317): CHC: Assertion violation happens here.
 // Warning 6328: (321-347): CHC: Assertion violation happens here.
 // Warning 6328: (351-374): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 2)\n!(arr.length <= 3)\n!(arr[2].length <= 3)\n
+// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol
index caafcbd397..8ba2cd75de 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3.sol
@@ -28,4 +28,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 7)\n!(arr.length <= 8)\n((arr[5].length <= 0) && (arr[8].length <= 0))\n
+// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
index 7af3af40d9..d346692db7 100644
--- a/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/length_same_after_assignment_3_fail.sol
@@ -27,8 +27,8 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (319-345): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
-// Warning 6328: (349-375): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
-// Warning 6328: (379-402): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
-// Warning 6328: (406-432): CHC: Assertion violation happens here.\nCounterexample:\narr = [[], [], [], [], [], [], [], [], []]\nx = 0\ny = 0\nz = 9\nt = 0\n\nTransaction trace:\nC.constructor()\nState: arr = [[], [], [], [], [], [], [], [], []]\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n!(arr.length <= 5)\n!(arr.length <= 7)\n!(arr.length <= 8)\n
+// Warning 6328: (319-345): CHC: Assertion violation happens here.
+// Warning 6328: (349-375): CHC: Assertion violation happens here.
+// Warning 6328: (379-402): CHC: Assertion violation happens here.
+// Warning 6328: (406-432): CHC: Assertion violation happens here.
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_1_safe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_1_safe.sol
index a655a5debe..5ba845e749 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_1_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_1_safe.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_2d_safe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_2d_safe.sol
index f95eae7f3f..e915d4df4f 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_2d_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_2d_safe.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol
index f74381ce9c..ea9f6a251b 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_2d_unsafe.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (90-100): CHC: Empty array "pop" happens here.\nCounterexample:\na = [[0], []]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 2529: (90-100): CHC: Empty array "pop" happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_constructor_safe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_constructor_safe.sol
index 4ee5e0b972..06be68f9bc 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_constructor_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_constructor_safe.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_loop_safe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_loop_safe.sol
index 2bf382e5d9..5bd322cd59 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_loop_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_loop_safe.sol
@@ -10,3 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol
index 0b0ba37e3c..0bb7b4f16e 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_loop_unsafe.sol
@@ -11,4 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2529: (117-124): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\nl = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f(0)
+// Warning 2529: (117-124): CHC: Empty array "pop" happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_safe.sol
index 403a759982..665fb13c8f 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_safe.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol
index 235c585bd4..c60e983c2e 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_2d_arg_1_unsafe.sol
@@ -13,3 +13,4 @@ contract C {
 // ----
 // Warning 3944: (129-144): CHC: Underflow (resulting value less than 0) happens here.
 // Warning 6328: (117-151): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_arg_1.sol b/test/libsolidity/smtCheckerTests/array_members/push_arg_1.sol
index d1a61b04fb..002d9246fc 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_arg_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_arg_1.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
index aea10a3769..42dd2e4947 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_1d.sol
@@ -17,7 +17,8 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreOS: macos
 // SMTIgnoreCex: yes
+// SMTIgnoreOS: macos
 // ----
-// Warning 6328: (199-229): CHC: Assertion violation happens here.\nCounterexample:\nb = [1]\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.g()
+// Warning 6328: (199-229): CHC: Assertion violation happens here.
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol
index 34b439e3a6..71997ecdd3 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (362-420): CHC: Assertion violation happens here.
+// Info 1391: CHC: 23 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d_2.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d_2.sol
index 4afa7df1d1..180e70cbe7 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d_2.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_2d_2.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_3d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_3d.sol
index dcb8c3aac4..380dd892d3 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_3d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_3d.sol
@@ -28,3 +28,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (537-592): CHC: Assertion violation happens here.
+// Info 1391: CHC: 32 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
index 66776ed49f..d52b657d52 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_1d.sol
@@ -15,3 +15,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (204-230): CHC: Assertion violation happens here.
+// Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol
index b79bc3e3b8..efc775ed79 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_1.sol
@@ -16,4 +16,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (284-310): CHC: Assertion violation happens here.\nCounterexample:\nb = [[0], [0]]\n\nTransaction trace:\nC.constructor()\nState: b = []\nC.f()
+// Warning 6328: (284-310): CHC: Assertion violation happens here.
+// Info 1391: CHC: 20 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_2.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_2.sol
index ae1251aac1..ccfc544015 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_2.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_2d_2.sol
@@ -14,3 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
index 56bc859eb1..b29bdde3f4 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_and_rhs_bytes.sol
@@ -15,3 +15,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (203-244): CHC: Assertion violation happens here.
+// Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
index 31eca9e925..ce8fa06572 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes.sol
@@ -21,3 +21,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (265-310): CHC: Assertion violation happens here.
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol
index fcceeebfd5..4dc7a7c3d1 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_bytes_2d.sol
@@ -25,3 +25,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (435-508): CHC: Assertion violation happens here.
+// Info 1391: CHC: 23 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol
index f13c4f452a..4d20c8ae9b 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_compound_assignment.sol
@@ -12,4 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (128-145): CHC: Assertion violation happens here.\nCounterexample:\nu = [(- 1)]\n\nTransaction trace:\nC.constructor()\nState: u = []\nC.t()
+// Warning 6328: (128-145): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_struct.sol b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_struct.sol
index 3ea2380145..a92b69f7b1 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_struct.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_as_lhs_struct.sol
@@ -15,3 +15,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol
index 930736ce8d..0d92364200 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe.sol
@@ -10,3 +10,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreInv: yes
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol
index 9cc3f2e375..66cd21111a 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_overflow_1_safe_no_overflow_assumption.sol
@@ -9,4 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(!((x[x.length] := 23)[0] >= 43) && !((x[x.length] := 23)[0] <= 41))\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol
index c15d5da159..5c0466ace4 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
index 046cf59a13..cbd65e0417 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe_no_overflow_assumption.sol
@@ -13,3 +13,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1.sol
index 02cdbe68a4..5d3f01fe30 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol
index 9e998a1f00..2d54d3ae1d 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_1_fail.sol
@@ -9,5 +9,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (81-107): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[0]]\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
-// Warning 6328: (111-157): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[0]]\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
+// Warning 6328: (81-107): CHC: Assertion violation happens here.
+// Warning 6328: (111-157): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2.sol
index 37c416b220..f78f917e48 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2.sol
@@ -11,3 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
index 42313dee93..5ff371cd70 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_push_no_args_2_fail.sol
@@ -12,6 +12,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (90-116): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[[0]]]\nlast = 0\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
-// Warning 6328: (170-186): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[[0]]]\nlast = 1\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
-// Warning 6328: (190-246): CHC: Assertion violation happens here.\nCounterexample:\narray2d = [[[0]]]\nlast = 1\n\nTransaction trace:\nC.constructor()\nState: array2d = []\nC.l()
+// Warning 6328: (90-116): CHC: Assertion violation happens here.
+// Warning 6328: (170-186): CHC: Assertion violation happens here.
+// Warning 6328: (190-246): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol
index 7a120f4284..e43d83c61f 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_safe_aliasing.sol
@@ -17,3 +17,4 @@ contract C {
 // Warning 6368: (184-188): CHC: Out of bounds access happens here.
 // Warning 3944: (184-199): CHC: Underflow (resulting value less than 0) happens here.
 // Warning 6328: (172-206): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
index a8669fb601..502274fb2a 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_aliasing.sol
@@ -12,9 +12,10 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreOS: macos
 // SMTIgnoreCex: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 6368: (188-192): CHC: Out of bounds access happens here.
 // Warning 6368: (188-195): CHC: Out of bounds access happens here.
 // Warning 6328: (181-202): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
index 4ddb195a1e..3a57c40cbe 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
@@ -37,3 +37,4 @@ contract C {
 // Warning 6368: (513-520): CHC: Out of bounds access happens here.
 // Warning 6368: (513-523): CHC: Out of bounds access happens here.
 // Warning 6328: (506-530): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol b/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol
index f763dd55c7..091ec74af6 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol
@@ -17,3 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_safe.sol
index 0f3aca5a0e..73fb538654 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_safe.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_unsafe.sol
index ec33dc0419..dde8a83705 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_zero_2d_unsafe.sol
@@ -9,4 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (89-122): CHC: Assertion violation happens here.\nCounterexample:\na = [[0]]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 6328: (89-122): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_zero_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_zero_safe.sol
index f2a8605729..3c33fbda67 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_zero_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_zero_safe.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
index 6647e8d41d..aab7b5b78c 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
@@ -8,4 +8,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (61-91): CHC: Assertion violation happens here.\nCounterexample:\na = [0]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
+// Warning 6328: (61-91): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol b/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol
index bbbc3a68fb..cbe2d6593d 100644
--- a/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1.sol
@@ -19,3 +19,4 @@ contract C {
 // ----
 // Warning 6368: (159-169): CHC: Out of bounds access happens here.
 // Warning 6328: (152-181): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1_safe.sol b/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1_safe.sol
index 01868e7e5d..74906c3d95 100644
--- a/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/storage_pointer_push_1_safe.sol
@@ -15,3 +15,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol
index f88eab0bf4..e5c913c6a8 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_non_zero_2.sol
@@ -10,5 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (153-188): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor(){ msg.value: 101 }\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n!((:var 0).balances[address(this)] <= 100)\n
+// Warning 6328: (153-188): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol
index fc4719cefd..7961447332 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive.sol
@@ -16,4 +16,4 @@ contract C {
 // ----
 // Warning 6328: (132-188): CHC: Assertion violation happens here.
 // Warning 6328: (269-324): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n((prevBalance + ((- 1) * (:var 1).balances[address(this)])) <= 0)\n
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
index b611bc95f1..f1c423bc87 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_2.sol
@@ -18,4 +18,4 @@ contract C {
 // ----
 // Warning 4984: (266-272): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (235-273): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\nonce\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
index cd6e1ef9ba..dfa571c338 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_4.sol
@@ -18,6 +18,7 @@ contract C {
 // Warning 4984: (154-160): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (212-218): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 6328: (180-219): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (82-85): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (154-160): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (212-218): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol
index 1885a60c81..26009b3b8f 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_5.sol
@@ -11,5 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (122-158): CHC: Assertion violation happens here.\nCounterexample:\nsum = 0\n\nTransaction trace:\nC.constructor()\nState: sum = 0\nC.inv()
-// Info 1180: Contract invariant(s) for :C:\n((sum + ((- 1) * (:var 1).balances[address(this)])) <= 0)\n
+// Warning 6328: (122-158): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol
index 263a90b08d..7379b19999 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_calls.sol
@@ -22,7 +22,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (173-208): CHC: Assertion violation happens here.\nCounterexample:\nonce = true\n\nTransaction trace:\nC.constructor()\nState: once = false\nC.f(){ msg.value: 10 }
-// Warning 6328: (321-356): CHC: Assertion violation happens here.\nCounterexample:\nonce = true\n\nTransaction trace:\nC.constructor()\nState: once = false\nC.f(){ msg.value: 10 }\n    C.g() -- internal call
-// Warning 6328: (469-504): CHC: Assertion violation happens here.\nCounterexample:\nonce = true\n\nTransaction trace:\nC.constructor()\nState: once = false\nC.f(){ msg.value: 10 }\n    C.g() -- internal call\n        C.h() -- internal call
-// Info 1180: Contract invariant(s) for :C:\n((:var 1).balances[address(this)] >= 0)\nonce\n
+// Warning 6328: (173-208): CHC: Assertion violation happens here.
+// Warning 6328: (321-356): CHC: Assertion violation happens here.
+// Warning 6328: (469-504): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
index 43b620ffc0..7f22d1d0ef 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls.sol
@@ -14,4 +14,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (131-165): CHC: Assertion violation happens here.\nCounterexample:\n\n_i = 0\nx = 282\n\nTransaction trace:\nC.constructor()\nC.f(0)\n    _i.ext() -- untrusted external call, synthesized as:\n        C.f(0) -- reentrant call\n            _i.ext() -- untrusted external call
+// Warning 6328: (131-165): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
index a1eb278bc7..0a3066888f 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_2.sol
@@ -13,3 +13,4 @@ contract C {
 // ----
 // Warning 9302: (82-93): Return value of low-level calls not used.
 // Warning 6328: (97-131): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
index 76443dfd05..b74f34c3be 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_receive_ext_calls_mutex.sol
@@ -22,4 +22,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (277-310): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n((lock' || !lock) && !(<errorCode> = 1) && (!lock || (((:var 3).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) >= 0)) && (!lock || (((:var 3).balances[address(this)] + ((- 1) * (:var 1).balances[address(this)])) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(address(this).balance == x)\n<errorCode> = 2 -> Assertion failed at assert(address(this).balance < x)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
index bd30b77d1f..387e45bb9f 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/balance_spend.sol
@@ -19,5 +19,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (280-314): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n((!(c <= 1) || !((:var 1).balances[address(this)] <= 90)) && !((:var 1).balances[address(this)] <= 81) && (!(c <= 0) || !((:var 1).balances[address(this)] <= 100)))\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 1236: (175-190): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol b/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol
index 7bbbf9ddbc..76455060d8 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/decreasing_balance.sol
@@ -18,3 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol
index 260d3c942b..e7e7d92420 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_1.sol
@@ -14,4 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
index 50081bc5aa..e2e187038c 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/free_function_2.sol
@@ -20,5 +20,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (258-274): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 1236: (33-46): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol
index 9df3aa27a0..4314db11b0 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_1.sol
@@ -17,4 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
index f32652da97..f16a57acf6 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/library_internal_2.sol
@@ -23,5 +23,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (315-331): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 1236: (87-100): BMC: Insufficient funds happens here.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol
index 0b66b27919..a51f73ddd7 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change.sol
@@ -11,4 +11,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(((address(this) + ((- 1) * t)) <= 0) && ((address(this) + ((- 1) * t)) >= 0))\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
index 49d2eb33b4..2c9e58e7b3 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_external_call.sol
@@ -16,5 +16,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreOS: macos
 // SMTIgnoreInv: yes
+// SMTIgnoreOS: macos
+// ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol
index 0ffe434693..1b1adc9d75 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/this_does_not_change_internal_call.sol
@@ -14,4 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(((t + ((- 1) * address(this))) >= 0) && ((t + ((- 1) * address(this))) <= 0))\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/blockchain_state/transfer.sol b/test/libsolidity/smtCheckerTests/blockchain_state/transfer.sol
index 4192d8aba9..c099ffb2e5 100644
--- a/test/libsolidity/smtCheckerTests/blockchain_state/transfer.sol
+++ b/test/libsolidity/smtCheckerTests/blockchain_state/transfer.sol
@@ -12,3 +12,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (166-201): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/assert_in_constructor.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/assert_in_constructor.sol
index f6f2f3a5b2..65f079649e 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/assert_in_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/assert_in_constructor.sol
@@ -17,3 +17,4 @@ contract D is C {
 // ====
 // SMTEngine: bmc
 // ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol
index 297d732ee5..422f57c09e 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers.sol
@@ -24,3 +24,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (70-84): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol
index f37f056842..2b845fbc38 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/branches_in_modifiers_2.sol
@@ -41,3 +41,4 @@ contract C {
 // Warning 4661: (351-365): BMC: Assertion violation happens here.
 // Warning 4661: (602-619): BMC: Assertion violation happens here.
 // Warning 4661: (748-762): BMC: Assertion violation happens here.
+// Info 6002: BMC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol
index eb2f581054..c262e2481b 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init.sol
@@ -39,3 +39,4 @@ contract C is B {
 // Warning 4661: (389-412): BMC: Assertion violation happens here.
 // Warning 4661: (489-513): BMC: Assertion violation happens here.
 // Warning 4661: (533-546): BMC: Assertion violation happens here.
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol
index 6364eb1670..63e49db4ce 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_chain_alternate.sol
@@ -26,3 +26,4 @@ contract D is C {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (286-300): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol
index b72555b693..4a7794ac9b 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructor_state_variable_init_diamond.sol
@@ -68,3 +68,4 @@ contract D4 is B, C {
 // Warning 4661: (736-751): BMC: Assertion violation happens here.
 // Warning 4661: (827-841): BMC: Assertion violation happens here.
 // Warning 4661: (860-874): BMC: Assertion violation happens here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol
index afc48b4fee..3d06983fec 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/constructors.sol
@@ -29,3 +29,4 @@ contract C is B {
 // Warning 4661: (277-291): BMC: Assertion violation happens here.
 // Warning 4661: (310-324): BMC: Assertion violation happens here.
 // Warning 4661: (343-357): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol
index 378c9dc92d..f496f39898 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/nested_if.sol
@@ -24,3 +24,4 @@ contract C {
 // ----
 // Warning 4661: (114-141): BMC: Assertion violation happens here.
 // Warning 6838: (299-315): BMC: Condition is always false.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol
index 992d0ee1de..60abfb09cd 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/return_in_both_branches.sol
@@ -19,3 +19,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 5740: (232-240): Unreachable code.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if.sol
index aed7b0bb3f..3c9ff6097a 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol
index 76e4169059..a5f9f3a5c2 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_array.sol
@@ -26,3 +26,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (172-189): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol
index 20dd68eaa2..db4abe9c74 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_state_var.sol
@@ -20,3 +20,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (99-113): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol
index 3976333cdf..9f987ceaea 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (123-139): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol
index aad44b7ea8..d001ed3d5b 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_struct_2.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (123-139): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol
index 5c5bb12973..589931f68d 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/simple_if_tuple.sol
@@ -25,3 +25,4 @@ contract C {
 // ----
 // Warning 4661: (127-141): BMC: Assertion violation happens here.
 // Warning 4661: (161-175): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/triple_nested_if.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/triple_nested_if.sol
index d3d7cb50c6..7c25f5b82a 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/triple_nested_if.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/branches_with_return/triple_nested_if.sol
@@ -18,3 +18,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol
index 56c7eca756..a3e974489d 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/implicit_constructor_with_function_calls.sol
@@ -15,3 +15,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (172-187): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol
index 8ac34fad57..bb89407a4c 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/msg_value_4.sol
@@ -14,3 +14,4 @@ contract B {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (154-176): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol
index cfedc8fd69..a113733225 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/range_check.sol
@@ -62,3 +62,4 @@ contract D {
 // Warning 8417: (598-614): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 8417: (1447-1463): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 8417: (1481-1497): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Info 6002: BMC: 44 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol
index 167cea38c0..cfbdebfdd8 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_balance.sol
@@ -10,3 +10,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 9302: (88-105): Return value of low-level calls not used.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol
index 50f9599976..ad50613c27 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/staticcall_state_var.sol
@@ -10,3 +10,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 9302: (66-83): Return value of low-level calls not used.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/timestamp.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/timestamp.sol
index 6b24cc593a..93064ff621 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/timestamp.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/timestamp.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: bmc
 // ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol
index ce81f2666a..279d22b4c7 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_catch_clauses_2.sol
@@ -21,3 +21,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (306-320): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol b/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol
index f79d82c124..75458fada2 100644
--- a/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/bmc_coverage/try_multiple_returned_values_with_tuple.sol
@@ -25,3 +25,4 @@ contract C {
 // SMTEngine: bmc
 // ----
 // Warning 4661: (336-351): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/assignment_in_declaration.sol b/test/libsolidity/smtCheckerTests/control_flow/assignment_in_declaration.sol
index ab36162f61..3f9e379a52 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/assignment_in_declaration.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/assignment_in_declaration.sol
@@ -4,3 +4,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_1.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_1.sol
index 724e7e3d44..229a93ddc2 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_1.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_1.sol
@@ -12,3 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_2.sol
index 4ccfedf0d7..299da87e87 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_assert_condition_2.sol
@@ -16,3 +16,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
index 21f1f5c7f2..b70b2024a0 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_1.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (327-341): CHC: Assertion violation happens here.\nCounterexample:\nx = 7\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
-// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 7))\n
+// Warning 6328: (327-341): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
index aa79a71faf..974c32506b 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_2.sol
@@ -24,3 +24,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (333-347): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
index ace158bb9f..6889f36d6d 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_3.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (326-340): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call
-// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 3))\n
+// Warning 6328: (326-340): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
index 44910fa62c..135f18b290 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_inside_modifiers_4.sol
@@ -24,4 +24,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (333-347): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 7))\n
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_1.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_1.sol
index 78ecc2cd11..a76f411044 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_1.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_1.sol
@@ -10,3 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_2.sol
index 8a24bd978e..36618ec5c2 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_2.sol
@@ -11,3 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_3.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_3.sol
index 94abb286dd..deda2c8514 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_3.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_3.sol
@@ -12,3 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_4.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_4.sol
index fb1323f173..95589bfeba 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_4.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_4.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_5.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_5.sol
index 41b511cc33..82665aec92 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_5.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_5.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_6.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_6.sol
index 337d0789c5..c388054ca7 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_6.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_merge_variables_6.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
index 32d647762d..42315c89f5 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers.sol
@@ -23,5 +23,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (70-84): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.test()
-// Info 1180: Contract invariant(s) for :C:\n(x = 0)\n
+// Warning 6328: (70-84): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
index f08a26bf70..d297959c86 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/branches_in_modifiers_2.sol
@@ -44,6 +44,7 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (255-269): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.test()\n    C.reset_if_overflow() -- internal call
-// Warning 6328: (502-519): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\noldx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(1)\nState: x = 1\nC.test()\n    C.reset_if_overflow() -- internal call
-// Warning 6328: (615-629): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.set(10)\nState: x = 10\nC.test()\n    C.reset_if_overflow() -- internal call
+// Warning 6328: (255-269): CHC: Assertion violation happens here.
+// Warning 6328: (502-519): CHC: Assertion violation happens here.
+// Warning 6328: (615-629): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol
index 3f660be66a..d33f9571b0 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init.sol
@@ -35,7 +35,8 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (297-311): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (389-412): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (489-513): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
-// Warning 6328: (533-546): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (297-311): CHC: Assertion violation happens here.
+// Warning 6328: (389-412): CHC: Assertion violation happens here.
+// Warning 6328: (489-513): CHC: Assertion violation happens here.
+// Warning 6328: (533-546): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
index 805a75bbb0..22148e0b32 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_chain_alternate.sol
@@ -27,3 +27,4 @@ contract D is C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (286-300): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol
index 7eb23a120e..6890370334 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructor_state_variable_init_diamond.sol
@@ -60,11 +60,12 @@ contract D4 is B, C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (337-351): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 1, x = 0\n\nTransaction trace:\nD1.constructor()
-// Warning 6328: (370-385): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 1, x = 0\n\nTransaction trace:\nD1.constructor()
-// Warning 6328: (460-474): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 1, x = (- 1)\n\nTransaction trace:\nD2.constructor()
-// Warning 6328: (493-507): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 1, x = (- 1)\n\nTransaction trace:\nD2.constructor()
-// Warning 6328: (670-684): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 2, x = 1\n\nTransaction trace:\nD3.constructor()
-// Warning 6328: (736-751): CHC: Assertion violation happens here.\nCounterexample:\nz = 1, y = 2, x = 1\n\nTransaction trace:\nD3.constructor()
-// Warning 6328: (827-841): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 2, x = (- 1)\n\nTransaction trace:\nD4.constructor()
-// Warning 6328: (860-874): CHC: Assertion violation happens here.\nCounterexample:\nz = 2, y = 2, x = (- 1)\n\nTransaction trace:\nD4.constructor()
+// Warning 6328: (337-351): CHC: Assertion violation happens here.
+// Warning 6328: (370-385): CHC: Assertion violation happens here.
+// Warning 6328: (460-474): CHC: Assertion violation happens here.
+// Warning 6328: (493-507): CHC: Assertion violation happens here.
+// Warning 6328: (670-684): CHC: Assertion violation happens here.
+// Warning 6328: (736-751): CHC: Assertion violation happens here.
+// Warning 6328: (827-841): CHC: Assertion violation happens here.
+// Warning 6328: (860-874): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol
index d17a3f4212..def9bea42f 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/constructors.sol
@@ -26,6 +26,7 @@ contract C is B {
 // SMTEngine: all
 // ----
 // Warning 5740: (119-124): Unreachable code.
-// Warning 6328: (277-291): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (310-324): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (343-357): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\na = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (277-291): CHC: Assertion violation happens here.
+// Warning 6328: (310-324): CHC: Assertion violation happens here.
+// Warning 6328: (343-357): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol
index 43a4aea30d..ecccf8885a 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/nested_if.sol
@@ -22,5 +22,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (114-141): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\nb = 2\n\nTransaction trace:\nC.constructor()\nC.test(0, 2)\n    C.nested_if(0, 2) -- internal call\n    C.nested_if(0, 2) -- internal call
+// Warning 6328: (114-141): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (299-315): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol
index 803b018576..f5294a6b67 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/return_in_both_branches.sol
@@ -19,3 +19,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 5740: (232-240): Unreachable code.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if.sol
index f9153471be..627ffa27f9 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol
index bf48eb32e0..2b41f3abe2 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_array.sol
@@ -25,4 +25,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (172-189): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.check()\n    C.conditional_store() -- internal call
+// Warning 6328: (172-189): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol
index d3e74c01ab..4df0b8ce31 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_state_var.sol
@@ -19,4 +19,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (99-113): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.check()\n    C.conditional_increment() -- internal call
+// Warning 6328: (99-113): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol
index e04cd91d76..02d1689373 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct.sol
@@ -22,4 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (123-139): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0}\nC.check()\n    C.conditional_increment() -- internal call
+// Warning 6328: (123-139): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol
index d9fcb93bde..87fbcc18a4 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_struct_2.sol
@@ -22,4 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (123-139): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0}\nC.check()\n    C.conditional_increment() -- internal call
+// Warning 6328: (123-139): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol
index a9008ae259..f3fce1f0d4 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/simple_if_tuple.sol
@@ -23,5 +23,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, y = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.check()\n    C.conditional_increment() -- internal call
-// Warning 6328: (161-175): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, y = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.check()\n    C.conditional_increment() -- internal call
+// Warning 6328: (127-141): CHC: Assertion violation happens here.
+// Warning 6328: (161-175): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
index 472ef8785e..c6d6450f39 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/branches_with_return/triple_nested_if.sol
@@ -19,4 +19,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Info 1180: Contract invariant(s) for :C:\n((c <= 0) && (a <= 0) && (b <= 0))\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch.sol
index e71daa8a5d..fd76ceab4f 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_2.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_2.sol
index da82394926..8d8cdae53c 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_2.sol
@@ -20,3 +20,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_3.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_3.sol
index f526c958e1..462ff871c2 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_3.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_3.sol
@@ -20,3 +20,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_4.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_4.sol
index db3550a52e..dbe7fc079c 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_4.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_branch_4.sol
@@ -25,3 +25,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_else_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_else_branch.sol
index b13e976a20..b99811b8e7 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_else_branch.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_else_branch.sol
@@ -16,3 +16,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_modifier_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_modifier_branch.sol
index 0eff935e0c..52f110108c 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_modifier_branch.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_modifier_branch.sol
@@ -19,3 +19,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_placeholder_inside_modifier_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_placeholder_inside_modifier_branch.sol
index d1a67b475e..ce53546295 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_placeholder_inside_modifier_branch.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/function_call_inside_placeholder_inside_modifier_branch.sol
@@ -20,3 +20,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/require.sol b/test/libsolidity/smtCheckerTests/control_flow/require.sol
index c59777d7ce..31b243a3af 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/require.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/require.sol
@@ -31,4 +31,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6321: (396-409): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (415-432): CHC: Assertion violation happens here.\nCounterexample:\nx = true\n\nTransaction trace:\nC.constructor()\nState: x = false\nC.i()\n    C.m() -- internal call
+// Warning 6328: (415-432): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/return_1.sol b/test/libsolidity/smtCheckerTests/control_flow/return_1.sol
index 95f9b2e561..2d532f7755 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/return_1.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/return_1.sol
@@ -19,3 +19,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol
index 59de4bc0ff..375e726091 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/return_1_fail.sol
@@ -24,3 +24,4 @@ contract C {
 // Warning 6328: (241-267): CHC: Assertion violation happens here.
 // Warning 6328: (271-297): CHC: Assertion violation happens here.
 // Warning 6328: (301-329): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/return_2.sol b/test/libsolidity/smtCheckerTests/control_flow/return_2.sol
index 54f265eeec..92f030e825 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/return_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/return_2.sol
@@ -28,3 +28,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol
index 7fcce53a19..0596647de1 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/return_2_fail.sol
@@ -37,3 +37,4 @@ contract C {
 // Warning 6328: (404-425): CHC: Assertion violation happens here.
 // Warning 6328: (429-457): CHC: Assertion violation happens here.
 // Warning 6328: (461-484): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/revert.sol b/test/libsolidity/smtCheckerTests/control_flow/revert.sol
index 14f6e988db..a19e745aa7 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/revert.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/revert.sol
@@ -33,4 +33,5 @@ contract C {
 // Warning 5740: (83-96): Unreachable code.
 // Warning 5740: (188-201): Unreachable code.
 // Warning 6321: (375-388): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (394-411): CHC: Assertion violation happens here.\nCounterexample:\nx = true\n\nTransaction trace:\nC.constructor()\nState: x = false\nC.i()\n    C.m() -- internal call
+// Warning 6328: (394-411): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol b/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol
index 5af670bda8..848f1edbf4 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/revert_complex_flow.sol
@@ -14,5 +14,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (150-164): CHC: Assertion violation happens here.\nCounterexample:\n\nb = false\na = 0\nc = 2\n\nTransaction trace:\nC.constructor()\nC.f(false, 0)
+// Warning 6328: (150-164): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (122-123): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and.sol
index 6c4cfdc42b..118e66ce76 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and.sol
@@ -15,3 +15,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
index 198d4dc3ee..0935d29c64 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
@@ -15,4 +15,5 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (194-203): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n = false\nb = false\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
+// Warning 6328: (194-203): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol
index 25ab73a194..0f4736f3ab 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_inside_branch.sol
@@ -17,5 +17,6 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (169-185): CHC: Assertion violation happens here.\nCounterexample:\nx = 101\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call
-// Warning 6328: (209-219): CHC: Assertion violation happens here.\nCounterexample:\nx = 101\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call
+// Warning 6328: (169-185): CHC: Assertion violation happens here.
+// Warning 6328: (209-219): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both.sol
index 74f1ebb4e8..0b79769d5c 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both.sol
@@ -15,3 +15,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
index 29bb061473..d21d8e0412 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
@@ -15,4 +15,5 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
+// Warning 6328: (192-202): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or.sol
index c8926fbaa4..437a7890dd 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or.sol
@@ -15,3 +15,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
index 8b0766e0ac..8ac219ae54 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
@@ -15,4 +15,5 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
+// Warning 6328: (192-202): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol
index 9bec38227c..8d23f1e4e0 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_inside_branch.sol
@@ -24,4 +24,5 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (327-337): CHC: Assertion violation happens here.\nCounterexample:\nx = 102\na = false\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g(false)\n    c.f() -- internal call\n    c.f() -- internal call
+// Warning 6328: (327-337): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both.sol
index 4581a29fac..237a900045 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both.sol
@@ -15,3 +15,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
index 8b623c9aab..ea71f34b05 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
@@ -15,4 +15,5 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
+// Warning 6328: (192-202): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol
index 5166afabb8..ce0ce630b1 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_1.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 11\na = 4\n\nTransaction trace:\nC.constructor()\nC.f(11)
+// Warning 6328: (127-141): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol
index 92be3c3ee9..4ceff5f3fc 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/ways_to_merge_variables_2.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (127-141): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 11\na = 4\n\nTransaction trace:\nC.constructor()\nC.f(11)
+// Warning 6328: (127-141): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_over_blocks.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_over_blocks.sol
index 126d9c627f..99d6f7c781 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_over_blocks.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_over_blocks.sol
@@ -11,3 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
index aae296695a..a39cfc88f0 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_over_state_same_output.sol
@@ -37,3 +37,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_same_output.sol b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_same_output.sol
index 2db313e3b8..a6abfdec92 100644
--- a/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_same_output.sol
+++ b/test/libsolidity/smtCheckerTests/crypto/crypto_functions_same_input_same_output.sol
@@ -27,3 +27,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol
index 388b0b0db8..00d0f5d6a1 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted.sol
@@ -14,3 +14,4 @@ contract C {
 // SMTEngine: all
 // SMTExtCalls: trusted
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol
index cf43dbda20..01c68790c8 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_addresses.sol
@@ -16,4 +16,4 @@ contract C {
 // SMTEngine: all
 // SMTExtCalls: trusted
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(:var 0).isActive[address(this)]\n
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol
index b2aa7ac984..f31f9a3e14 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_keep_storage_constraints.sol
@@ -14,4 +14,4 @@ contract C {
 // SMTExtCalls: trusted
 // ----
 // Warning 2072: (72-75): Unused local variable.
-// Info 1180: Contract invariant(s) for :C:\n(y <= 0)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol
index 4b3367b11c..b2712306c9 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow.sol
@@ -21,4 +21,5 @@ contract C {
 // ----
 // Warning 4984: (47-50): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 6328: (233-251): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (47-50): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol
index 66684df8c1..0f90445431 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_state_flow_2.sol
@@ -17,4 +17,4 @@ contract C {
 // SMTEngine: all
 // SMTExtCalls: trusted
 // ----
-// Info 1180: Contract invariant(s) for :C:\n((:var 1).storage.storage_D_12[d].x_3_D_12 <= 0)\nReentrancy property(ies) for :D:\n((x' <= 0) || !(x <= 0))\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol b/test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol
index 92195221e2..37f5ca80a3 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deployment_trusted_with_value_1.sol
@@ -18,3 +18,4 @@ contract B {
 // ----
 // Warning 6328: (211-246): CHC: Assertion violation happens here.
 // Warning 6328: (316-348): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol
index 7905d5b4fb..985ee26d16 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_1.sol
@@ -26,3 +26,4 @@ contract C {
 // Warning 6328: (231-253): CHC: Assertion violation happens here.
 // Warning 6328: (293-307): CHC: Assertion violation happens here.
 // Warning 6328: (359-374): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol
index 25cccead47..b078a32eff 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_constructor_trusted_2.sol
@@ -23,3 +23,4 @@ contract C {
 // Warning 6328: (216-238): CHC: Assertion violation happens here.
 // Warning 6328: (297-319): CHC: Assertion violation happens here.
 // Warning 6328: (404-426): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol
index 2dc5dd0fb8..904a596749 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_1.sol
@@ -26,3 +26,4 @@ contract C {
 // Warning 6328: (237-259): CHC: Assertion violation happens here.
 // Warning 6328: (299-313): CHC: Assertion violation happens here.
 // Warning 6328: (365-380): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol
index 9c36bfc74f..41d771b5ed 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_2.sol
@@ -23,3 +23,4 @@ contract C {
 // Warning 6328: (222-244): CHC: Assertion violation happens here.
 // Warning 6328: (303-325): CHC: Assertion violation happens here.
 // Warning 6328: (410-432): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol
index 317fde003c..b224dae2fd 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_abstract_trusted_3.sol
@@ -27,3 +27,4 @@ contract C {
 // Warning 6328: (243-265): CHC: Assertion violation happens here.
 // Warning 6328: (324-346): CHC: Assertion violation happens here.
 // Warning 6328: (431-453): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol b/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol
index a4dd5f5317..9c29f329ea 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_constructor_1.sol
@@ -9,3 +9,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 9302: (51-66): Return value of low-level calls not used.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol b/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol
index 2d2f32acf2..b7e735b4d1 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_constructor_2.sol
@@ -12,3 +12,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 9302: (94-109): Return value of low-level calls not used.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
index e85eb00aab..f238fd636f 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_mutex.sol
@@ -23,4 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 9302: (218-234): Return value of low-level calls not used.
-// Info 1180: Reentrancy property(ies) for :C:\n((lock' || !lock) && (<errorCode> <= 0) && (!lock || ((x' + ((- 1) * x)) = 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
index f0f844fff3..89ed906fbd 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_reentrancy_view.sol
@@ -15,4 +15,4 @@ contract C {
 // Warning 2519: (106-112): This declaration shadows an existing declaration.
 // Warning 2072: (106-112): Unused local variable.
 // Warning 2072: (114-131): Unused local variable.
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && ((<errorCode> <= 0) || !(x <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
index e4e3abc24f..0f6548d926 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_safe.sol
@@ -11,3 +11,4 @@ contract C {
 // ----
 // Warning 2072: (57-63): Unused local variable.
 // Warning 2072: (65-82): Unused local variable.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external.sol b/test/libsolidity/smtCheckerTests/external_calls/external.sol
index 659329e0b8..5ddb61a222 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external.sol
@@ -18,4 +18,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (167-181): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Overflow at ++x\n<errorCode> = 3 -> Assertion failed at assert(x < 10)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol
index 8c7b589d1a..6f2b717b5e 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_1_trusted.sol
@@ -18,4 +18,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTIgnoreInv: yes
 // ----
-// Warning 6328: (69-85): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
+// Warning 6328: (69-85): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
index 3fbdd8511b..48bcf93a38 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2.sol
@@ -13,5 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (87-101): CHC: Assertion violation happens here.\nCounterexample:\nz = 2\n_x = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: z = 2\nC.g(0)
-// Info 1180: Contract invariant(s) for :C:\n(!(z >= 3) && !(z <= 1))\n
+// Warning 6328: (87-101): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol
index a814227292..c2b8f83938 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_2_trusted.sol
@@ -13,5 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (87-101): CHC: Assertion violation happens here.\nCounterexample:\nz = 2\n_x = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: z = 2\nC.g(0)
-// Info 1180: Contract invariant(s) for :C:\n(!(z >= 3) && !(z <= 1))\n
+// Warning 6328: (87-101): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol
index 8ff241e729..590664055d 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_3_trusted.sol
@@ -21,5 +21,5 @@ contract C {
 // SMTEngine: all
 // SMTExtCalls: trusted
 // ----
-// Warning 6328: (69-85): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 100\n = 0\n\nTransaction trace:\nState.constructor()\nState.f(100)
-// Info 1180: Contract invariant(s) for :C:\n(!(z >= 3) && !(z <= 1))\n
+// Warning 6328: (69-85): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol
index 5dbdaae27d..75fb4a7c84 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_from_constructor_reentrancy_1.sol
@@ -15,3 +15,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (253-267): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
index b7a161ac93..c6b46b2f87 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_1.sol
@@ -39,3 +39,4 @@ contract C {
 // ----
 // Warning 6328: (256-277): CHC: Assertion violation happens here.
 // Warning 6328: (533-554): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol
index e65d1b1e74..c1d567cfec 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_2.sol
@@ -50,3 +50,4 @@ contract C {
 // ----
 // Warning 6328: (434-455): CHC: Assertion violation happens here.
 // Warning 6328: (1270-1291): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
index 60bfd1660a..ff17649dd9 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_3.sol
@@ -43,3 +43,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (561-582): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
index 4e86c7b2b5..766f6e1334 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_4.sol
@@ -46,3 +46,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (641-662): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
index 54566b85f4..9313858ce2 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_indirect_5.sol
@@ -48,3 +48,4 @@ contract C {
 // SMTExtCalls: trusted
 // ----
 // Warning 6328: (601-622): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol
index 582d967f3f..6b44932312 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_1.sol
@@ -11,7 +11,8 @@ contract C {
 // ====
 // SMTEngine: chc
 // SMTExtCalls: trusted
-// SMTTargets: assert
 // SMTIgnoreCex: yes
+// SMTTargets: assert
 // ----
-// Warning 6328: (147-161): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()\n    C.i() -- trusted external call
+// Warning 6328: (147-161): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol
index 0f05a8b731..55e8848800 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_2.sol
@@ -13,4 +13,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (151-165): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()\n    C.i() -- trusted external call
+// Warning 6328: (151-165): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol
index 1b95859af8..5435e5dcd4 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_semantic_this_3.sol
@@ -15,3 +15,4 @@ contract C {
 // SMTTargets: assert
 // ----
 // Warning 6328: (158-172): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol
index c4bab9c759..6075548dbd 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_1.sol
@@ -21,3 +21,4 @@ contract C {
 // SMTTargets: assert
 // ----
 // Warning 6328: (210-237): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol
index 522c840f5b..c8834ab85e 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_struct_trusted_2.sol
@@ -21,4 +21,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (253-280): CHC: Assertion violation happens here.\nCounterexample:\nss = [{d: 0x4706}]\n\nTransaction trace:\nC.constructor()\nState: ss = [{d: 0x4706}]\nC.f()
+// Warning 6328: (253-280): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol
index 541999b9f9..4a7da79323 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_1.sol
@@ -18,4 +18,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (226-251): CHC: Assertion violation happens here.\nCounterexample:\nds = [0x0]\n\nTransaction trace:\nC.constructor()\nState: ds = [0x0]\nC.f()
+// Warning 6328: (226-251): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol
index f7e31bf74a..846087997d 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_array_trusted_2.sol
@@ -17,4 +17,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (183-208): CHC: Assertion violation happens here.\nCounterexample:\nds = [0x25]\n\nTransaction trace:\nC.constructor()\nState: ds = [0x25]\nC.f()
+// Warning 6328: (183-208): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol
index 2ac70b33d3..3f1c7acbec 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_1.sol
@@ -21,4 +21,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (240-263): CHC: Assertion violation happens here.\nCounterexample:\ns = {d: 0x5039}\n\nTransaction trace:\nC.constructor()\nState: s = {d: 0x5039}\nC.f()
+// Warning 6328: (240-263): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol
index e527c5bc01..146141fbab 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_2.sol
@@ -20,4 +20,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (197-220): CHC: Assertion violation happens here.\nCounterexample:\ns = {d: 0x5039}\n\nTransaction trace:\nC.constructor()\nState: s = {d: 0x5039}\nC.f()
+// Warning 6328: (197-220): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol
index fff8a97184..b2711cb51c 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_3.sol
@@ -23,4 +23,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (223-248): CHC: Assertion violation happens here.\nCounterexample:\nt = {s: {d: 0x5039}}\n\nTransaction trace:\nC.constructor()\nState: t = {s: {d: 0x5039}}\nC.f()
+// Warning 6328: (223-248): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol
index 63d026e52b..e8387b74c3 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_address_inside_struct_trusted_4.sol
@@ -24,4 +24,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (266-291): CHC: Assertion violation happens here.\nCounterexample:\nt = {s: {d: 0x5039}}\n\nTransaction trace:\nC.constructor()\nState: t = {s: {d: 0x5039}}\nC.f()
+// Warning 6328: (266-291): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol
index 0b8cd8e598..aefad8a75a 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_1.sol
@@ -21,3 +21,4 @@ contract C {
 // SMTTargets: assert
 // ----
 // Warning 6328: (192-216): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol
index 97f61fa045..3f03cd713b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_struct_trusted_2.sol
@@ -21,4 +21,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (235-259): CHC: Assertion violation happens here.\nCounterexample:\nss = [{d: 20819}]\n\nTransaction trace:\nC.constructor()\nState: ss = [{d: 20819}]\nC.f()
+// Warning 6328: (235-259): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol
index 475c391844..017e760e70 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_1.sol
@@ -18,4 +18,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (208-230): CHC: Assertion violation happens here.\nCounterexample:\nds = [39]\n\nTransaction trace:\nC.constructor()\nState: ds = [39]\nC.f()
+// Warning 6328: (208-230): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol
index baeddda088..0ac805b2f6 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_array_trusted_2.sol
@@ -15,7 +15,8 @@ contract C {
 // ====
 // SMTEngine: chc
 // SMTExtCalls: trusted
-// SMTTargets: assert
 // SMTIgnoreCex: yes
+// SMTTargets: assert
 // ----
 // Warning 6328: (165-187): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol
index 293c223044..f7c705c10d 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_1.sol
@@ -21,4 +21,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (222-242): CHC: Assertion violation happens here.\nCounterexample:\ns = {d: 20819}\n\nTransaction trace:\nC.constructor()\nState: s = {d: 20819}\nC.f()
+// Warning 6328: (222-242): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol
index 59381960c5..50bab6173b 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_2.sol
@@ -18,7 +18,8 @@ contract C {
 // ====
 // SMTEngine: chc
 // SMTExtCalls: trusted
-// SMTTargets: assert
 // SMTIgnoreCex: yes
+// SMTTargets: assert
 // ----
 // Warning 6328: (179-199): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol
index 06cd20cfe3..7a5791c6dd 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_3.sol
@@ -21,7 +21,8 @@ contract C {
 // ====
 // SMTEngine: chc
 // SMTExtCalls: trusted
-// SMTTargets: assert
 // SMTIgnoreCex: yes
+// SMTTargets: assert
 // ----
 // Warning 6328: (205-227): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol
index 6a1fb22744..3bc9abafa8 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_state_var_contract_inside_struct_trusted_4.sol
@@ -24,4 +24,5 @@ contract C {
 // SMTExtCalls: trusted
 // SMTTargets: assert
 // ----
-// Warning 6328: (248-270): CHC: Assertion violation happens here.\nCounterexample:\nt = {s: {d: 20819}}\n\nTransaction trace:\nC.constructor()\nState: t = {s: {d: 20819}}\nC.f()
+// Warning 6328: (248-270): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
index c52e0773fb..fbf4140b25 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_1.sol
@@ -11,4 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (157-192): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h() -- trusted external call
+// Warning 6328: (157-192): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol
index f804078cd1..0cdf7ec8b5 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_call_this_with_value_2.sol
@@ -17,3 +17,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (340-375): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
index 8f5b162a0d..6b8d41adea 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash.sol
@@ -28,4 +28,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (390-412): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(sig_1 == sig_2)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
index 2e837478d8..514e6a5ced 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure.sol
@@ -30,4 +30,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (398-420): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(sig_1 == sig_2)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol
index 6c634d4efb..aa5cb40374 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_pure_trusted.sol
@@ -30,4 +30,4 @@ contract C {
 // SMTEngine: all
 // SMTExtCalls: trusted
 // ----
-// Info 1180: Contract invariant(s) for :C:\n((sig_1 <= 0) && (sig_2 <= 0))\nReentrancy property(ies) for :Crypto:\n(<errorCode> = 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(sig_1 == sig_2)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
index 317400e1d1..90b91e9b26 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state.sol
@@ -36,4 +36,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (495-532): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n(((owner + ((- 1) * owner')) >= 0) && !(<errorCode> = 1) && ((owner + ((- 1) * owner')) <= 0))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(prevOwner == owner)\n<errorCode> = 3 -> Assertion failed at assert(owner == address(0) || y != z)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
index be9f698e15..2fc1f03027 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2.sol
@@ -43,3 +43,4 @@ contract C {
 // ----
 // Warning 2018: (33-88): Function state mutability can be restricted to view
 // Warning 6328: (367-381): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol
index 62f53b64c2..720b202332 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_2_trusted.sol
@@ -44,4 +44,4 @@ contract C {
 // SMTEngine: chc
 // SMTExtCalls: trusted
 // ----
-// Info 1180: Contract invariant(s) for :C:\n((y <= 0) && (insidef || (z <= 0)))\nReentrancy property(ies) for :State:\n(<errorCode> = 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 2 -> Assertion failed at assert(z == y)\n<errorCode> = 3 -> Assertion failed at assert(prevOwner == owner)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
index 8372285ee7..80e27e7e2a 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_3.sol
@@ -41,3 +41,5 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreInv: yes
+// ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol
index ee373e2937..34df5c0e0f 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_hash_known_code_state_reentrancy_trusted.sol
@@ -35,4 +35,4 @@ contract C {
 // SMTExtCalls: trusted
 // ----
 // Warning 6328: (314-328): CHC: Assertion violation might happen here.
-// Info 1180: Reentrancy property(ies) for :State:\n(<errorCode> = 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(z == y)\n<errorCode> = 2 -> Assertion failed at assert(prevOwner == owner)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_inc1_inc2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_inc1_inc2.sol
index 25a93b233a..0a874a7824 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_inc1_inc2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_inc1_inc2.sol
@@ -27,3 +27,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 2018: (203-322): Function state mutability can be restricted to view
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
index 590133a784..cfe12434c3 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_3.sol
@@ -32,3 +32,4 @@ contract C is A {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (154-168): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
index ba9d4ce043..2cac5443b2 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_crypto.sol
@@ -25,7 +25,8 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreInv: yes
 // SMTIgnoreCex: yes
+// SMTIgnoreInv: yes
 // ----
 // Warning 6328: (302-333): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
index 550e17b619..fd45ef2d7f 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
@@ -19,4 +19,5 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (167-181): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 4661: (167-181): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/mutex.sol
index 79b5ac1538..ffe23ae8dd 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/mutex.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/mutex.sol
@@ -28,3 +28,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreInv: yes
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
index b7fa571972..54b0d36fb2 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex.sol
@@ -23,4 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 9302: (218-240): Return value of low-level calls not used.
-// Info 1180: Reentrancy property(ies) for :C:\n((!lock || (<errorCode> <= 0)) && (lock' || !lock))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
index f87cf5f743..19b5e54618 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/staticcall_mutex_2.sol
@@ -24,4 +24,4 @@ contract C {
 // ----
 // Warning 9302: (212-234): Return value of low-level calls not used.
 // Warning 2018: (164-271): Function state mutability can be restricted to view
-// Info 1180: Reentrancy property(ies) for :C:\n(<errorCode> <= 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(y == x)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol b/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
index ee9e571890..70a817315d 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/staticcall_reentrancy_view.sol
@@ -15,4 +15,4 @@ contract C {
 // Warning 2072: (106-112): Unused local variable.
 // Warning 2072: (114-131): Unused local variable.
 // Warning 2018: (72-188): Function state mutability can be restricted to view
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\nReentrancy property(ies) for :C:\n((!(x <= 0) || (x' <= 0)) && (!(x <= 0) || (<errorCode> <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol b/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol
index 438feae217..f9f65bb7bd 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_correct.sol
@@ -58,7 +58,9 @@ contract Test {
 	}
 }
 // ====
+// SMTContract: Test
 // SMTEngine: chc
 // SMTExtCalls: trusted
-// SMTContract: Test
 // SMTTargets: assert
+// ----
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol b/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol
index 6bb6074b20..2aee3c8d32 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/token_trusted_transfer_wrong.sol
@@ -66,3 +66,4 @@ contract Test {
 // ----
 // Warning 6328: (950-978): CHC: Assertion violation happens here.
 // Warning 6328: (1370-1386): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol b/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol
index fe2ebfdde3..55120bcb4a 100644
--- a/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/constant_string_at_file_level.sol
@@ -38,4 +38,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (968-983): CHC: Assertion violation happens here.\nCounterexample:\n\nw = 56\nz = 1\nt = 0x61626300ff5f5f00000000000000000000000000000000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n    C.g() -- internal call\n    C.h() -- internal call\n    C.i() -- internal call
+// Warning 6328: (968-983): CHC: Assertion violation happens here.
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol b/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol
index ad86ff26d1..c7be224866 100644
--- a/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/constants_at_file_level_referencing.sol
@@ -63,3 +63,4 @@ contract C {
 // Warning 6328: (s2.sol:704-725): CHC: Assertion violation happens here.
 // Warning 6328: (s2.sol:890-911): CHC: Assertion violation happens here.
 // Warning 6328: (s2.sol:980-994): CHC: Assertion violation happens here.
+// Info 1391: CHC: 24 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/easy.sol b/test/libsolidity/smtCheckerTests/file_level/easy.sol
index 43ddb076cc..07ad9f0793 100644
--- a/test/libsolidity/smtCheckerTests/file_level/easy.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/easy.sol
@@ -14,4 +14,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (222-239): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f(7) -- internal call\n        add(7, 2) -- internal call\n    C.f(8) -- internal call\n        add(8, 2) -- internal call
+// Warning 6328: (222-239): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/enum.sol b/test/libsolidity/smtCheckerTests/file_level/enum.sol
index 81525b029e..0cefa021a7 100644
--- a/test/libsolidity/smtCheckerTests/file_level/enum.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/enum.sol
@@ -20,4 +20,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (247-267): CHC: Assertion violation happens here.\nCounterexample:\n\ne1 = 0\ne2 = 1\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(true) -- internal call\n    allocate(false) -- internal call
+// Warning 6328: (247-267): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol b/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol
index 0297428c6d..95468f129d 100644
--- a/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/file_level_call_via_module.sol
@@ -18,5 +18,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (b.sol:208-222): CHC: Assertion violation happens here.\nCounterexample:\n\na = 7\nb = 3\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        a.sol:f(2) -- internal call\n        a.sol:f([0x61, 0x62, 0x63]) -- internal call
-// Warning 6328: (b.sol:274-288): CHC: Assertion violation happens here.\nCounterexample:\n\na = 7\nb = 3\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        a.sol:f(2) -- internal call\n        a.sol:f([0x61, 0x62, 0x63]) -- internal call
+// Warning 6328: (b.sol:208-222): CHC: Assertion violation happens here.
+// Warning 6328: (b.sol:274-288): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol b/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol
index 32b7e17169..3119fd1c84 100644
--- a/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/free_namesake_contract_function.sol
@@ -11,4 +11,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 2519: (170-226): This declaration shadows an existing declaration.
-// Warning 6328: (130-149): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call\n    C.f() -- internal call
+// Warning 6328: (130-149): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/import.sol b/test/libsolidity/smtCheckerTests/file_level/import.sol
index 7bc2a54451..445953637f 100644
--- a/test/libsolidity/smtCheckerTests/file_level/import.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/import.sol
@@ -25,3 +25,4 @@ contract C {
 // ----
 // Warning 6328: (B:238-252): CHC: Assertion violation happens here.
 // Warning 6328: (B:308-322): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol b/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol
index 5993f5e94e..45109a6fef 100644
--- a/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/module_constants_1.sol
@@ -22,5 +22,6 @@ contract C {
 // ====
 // SMTEngine: chc
 // ----
-// Warning 6328: (s3.sol:223-238): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 89\ny = 88\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call
-// Warning 6328: (s3.sol:291-306): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 89\ny = 88\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call
+// Warning 6328: (s3.sol:223-238): CHC: Assertion violation happens here.
+// Warning 6328: (s3.sol:291-306): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol b/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol
index d3b0e4c6bd..27527ab8e1 100644
--- a/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/module_constants_functions_1.sol
@@ -40,7 +40,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (s3.sol:327-342): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
-// Warning 6328: (s3.sol:396-411): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
-// Warning 6328: (s3.sol:465-480): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
-// Warning 6328: (s3.sol:534-549): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 13\ny = 89\nz = 42\nt = 89\n\nTransaction trace:\nC.constructor()\nC.p()\n    C.f() -- internal call\n        s1.sol:fre() -- internal call\n        s2.sol:foo() -- internal call
+// Warning 6328: (s3.sol:327-342): CHC: Assertion violation happens here.
+// Warning 6328: (s3.sol:396-411): CHC: Assertion violation happens here.
+// Warning 6328: (s3.sol:465-480): CHC: Assertion violation happens here.
+// Warning 6328: (s3.sol:534-549): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/overloads.sol b/test/libsolidity/smtCheckerTests/file_level/overloads.sol
index 7224464b4f..b645705595 100644
--- a/test/libsolidity/smtCheckerTests/file_level/overloads.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/overloads.sol
@@ -15,4 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (229-243): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    f(2) -- internal call\n    f([0x61, 0x62, 0x63]) -- internal call
+// Warning 6328: (229-243): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/same_constants_different_files.sol b/test/libsolidity/smtCheckerTests/file_level/same_constants_different_files.sol
index 948baf1985..7a8bcc0aab 100644
--- a/test/libsolidity/smtCheckerTests/file_level/same_constants_different_files.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/same_constants_different_files.sol
@@ -29,3 +29,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/struct.sol b/test/libsolidity/smtCheckerTests/file_level/struct.sol
index b9b811e683..664e1ac5fe 100644
--- a/test/libsolidity/smtCheckerTests/file_level/struct.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/struct.sol
@@ -23,5 +23,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (317-333): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 2, a: [1]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(2, 1) -- internal call
-// Warning 6328: (352-371): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 2, a: [1]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(2, 1) -- internal call
+// Warning 6328: (317-333): CHC: Assertion violation happens here.
+// Warning 6328: (352-371): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol b/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol
index 54199e89c8..45910c6662 100644
--- a/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol
+++ b/test/libsolidity/smtCheckerTests/function_selector/function_types_sig.sol
@@ -25,5 +25,6 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 7650: (251-263): Assertion checker does not yet support this expression.
-// Warning 6328: (437-462): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.check()\n    C.f() -- internal call\n    C.g() -- internal call
-// Warning 6328: (507-532): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.check()\n    C.f() -- internal call\n    C.g() -- internal call\n    C.i() -- internal call\n    C.i() -- internal call
+// Warning 6328: (437-462): CHC: Assertion violation happens here.
+// Warning 6328: (507-532): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/function_selector/homer.sol b/test/libsolidity/smtCheckerTests/function_selector/homer.sol
index 552a4d895c..f4536e5bf0 100644
--- a/test/libsolidity/smtCheckerTests/function_selector/homer.sol
+++ b/test/libsolidity/smtCheckerTests/function_selector/homer.sol
@@ -43,4 +43,5 @@ contract Homer is ERC165, Simpson {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (1340-1395): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nHomer.constructor()\nHomer.check()\n    Homer.supportsInterface(0x73b6b492) -- internal call\n    Homer.supportsInterface(0x01ffc9a7) -- internal call\n    Homer.supportsInterface(0x8b9eb9ca) -- internal call
+// Warning 6328: (1340-1395): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/function_selector/selector.sol b/test/libsolidity/smtCheckerTests/function_selector/selector.sol
index fdcd3f85e8..486f48c45a 100644
--- a/test/libsolidity/smtCheckerTests/function_selector/selector.sol
+++ b/test/libsolidity/smtCheckerTests/function_selector/selector.sol
@@ -6,3 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/function_selector/selector_3.sol b/test/libsolidity/smtCheckerTests/function_selector/selector_3.sol
index 7d2da3c572..c4dd67e179 100644
--- a/test/libsolidity/smtCheckerTests/function_selector/selector_3.sol
+++ b/test/libsolidity/smtCheckerTests/function_selector/selector_3.sol
@@ -11,4 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (142-184): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, y = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, y = 0\nC.f()
+// Warning 6328: (142-184): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol
index 5e19177613..d95dbdce93 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy.sol
@@ -14,4 +14,5 @@ contract A is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (120-134): CHC: Assertion violation happens here.\nCounterexample:\na = 2\n\nTransaction trace:\nA.constructor()
+// Warning 6328: (120-134): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol
index c10ec05bff..62d9c83ec5 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_2.sol
@@ -5,4 +5,5 @@ contract J is C { constructor() C(3) { assert(a == 4); } }
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (211-225): CHC: Assertion violation happens here.\nCounterexample:\na = 3\n\nTransaction trace:\nJ.constructor()
+// Warning 6328: (211-225): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol
index 84fdaf87d4..9e79ebfbb6 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_3.sol
@@ -23,3 +23,4 @@ contract A is B {
 // ----
 // Warning 4984: (171-176): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (200-218): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol
index b7cacc0f62..3cefaa78af 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_4.sol
@@ -19,5 +19,6 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (166-171): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\na = 0\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639934\n\nTransaction trace:\nA.constructor(115792089237316195423570985008687907853269984665640564039457584007913129639934)
-// Warning 4984: (175-180): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\na = 0\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nA.constructor(115792089237316195423570985008687907853269984665640564039457584007913129639935)
+// Warning 4984: (166-171): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (175-180): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol
index 55b17509e9..44ccc2b74e 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond.sol
@@ -29,3 +29,4 @@ contract A is B2, B1 {
 // ----
 // Warning 4984: (168-173): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (270-288): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol
index 878612d041..d826bc3879 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_2.sol
@@ -29,3 +29,4 @@ contract A is B2, B1 {
 // ----
 // Warning 4984: (168-173): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (270-288): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol
index 6a2b079199..593a2ae7d1 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_3.sol
@@ -32,3 +32,4 @@ contract A is B2, B1 {
 // Warning 4984: (193-198): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 4984: (209-214): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (302-318): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol
index ef24859eec..bf1c0ee604 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle.sol
@@ -21,4 +21,5 @@ contract A is B, B2 {
 // SMTEngine: all
 // ----
 // Warning 5667: (132-138): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (162-176): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
+// Warning 6328: (162-176): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle_empty_base.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle_empty_base.sol
index 9aeb14a770..57a0f40d7b 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle_empty_base.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_diamond_empty_middle_empty_base.sol
@@ -19,3 +19,4 @@ contract A is B, B2 {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol
index cd5308ded7..113e80dab2 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_chain.sol
@@ -20,4 +20,5 @@ contract A is B {
 // SMTEngine: all
 // ----
 // Warning 5667: (162-168): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (192-206): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
+// Warning 6328: (192-206): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol
index 00a74d5057..8c6ca28e37 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_empty_middle.sol
@@ -18,4 +18,5 @@ contract A is B {
 // SMTEngine: all
 // ----
 // Warning 5667: (106-112): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (140-154): CHC: Assertion violation happens here.\nCounterexample:\na = 2\nx = 0\n\nTransaction trace:\nA.constructor(0)
+// Warning 6328: (140-154): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol
index c2b6c1a271..75d5efb42c 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain.sol
@@ -28,4 +28,5 @@ contract A is B {
 // SMTEngine: all
 // ----
 // Warning 5667: (222-228): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (252-266): CHC: Assertion violation happens here.\nCounterexample:\na = 4\nx = 0\n\nTransaction trace:\nA.constructor(0)
+// Warning 6328: (252-266): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_empty_base.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_empty_base.sol
index 531266d72b..4eac4fe979 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_empty_base.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_empty_base.sol
@@ -24,3 +24,4 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol
index 50a91a7e0e..ea1f31aad5 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_local_vars.sol
@@ -33,4 +33,5 @@ contract A is B {
 // SMTEngine: all
 // ----
 // Warning 5667: (264-270): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (325-340): CHC: Assertion violation happens here.\nCounterexample:\na = 4\nx = 0\na1 = 4\na2 = 5\n\nTransaction trace:\nA.constructor(0)
+// Warning 6328: (325-340): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol
index 15cc66a0d6..2d49cd1e38 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params.sol
@@ -29,3 +29,4 @@ contract A is B {
 // ----
 // Warning 4984: (215-220): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (296-310): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol
index 933762ac80..383392c632 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_hierarchy_mixed_chain_with_params_2.sol
@@ -24,4 +24,5 @@ contract A is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (234-248): CHC: Assertion violation happens here.\nCounterexample:\na = 3\n\nTransaction trace:\nB.constructor()
+// Warning 6328: (234-248): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol b/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol
index 2db9622ea4..ef0a546782 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_simple.sol
@@ -15,3 +15,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (108-122): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol b/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol
index 48819f839f..1726c89fe8 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_state_value.sol
@@ -15,3 +15,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (112-126): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol b/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol
index 165dc6ae6e..1fc6e011f0 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_state_value_inherited.sol
@@ -17,3 +17,4 @@ contract C is B {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (132-146): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol b/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol
index 8fd9bf9a21..008338ba81 100644
--- a/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol
+++ b/test/libsolidity/smtCheckerTests/functions/constructor_state_value_parameter.sol
@@ -16,3 +16,4 @@ contract C {
 // ----
 // Warning 4984: (82-87): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (129-143): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol b/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol
index 7fd4fcff1e..32b51d53f9 100644
--- a/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol
+++ b/test/libsolidity/smtCheckerTests/functions/function_call_does_not_clear_local_vars.sol
@@ -11,3 +11,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 5740: (122-136): Unreachable code.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_inline_chain.sol b/test/libsolidity/smtCheckerTests/functions/function_inline_chain.sol
index 252ac146ea..47ace2a9d3 100644
--- a/test/libsolidity/smtCheckerTests/functions/function_inline_chain.sol
+++ b/test/libsolidity/smtCheckerTests/functions/function_inline_chain.sol
@@ -21,3 +21,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol
index 55d9084676..bd74fe1b52 100644
--- a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var.sol
@@ -16,4 +16,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (176-190): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nb = true\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(true)\n    C.f() -- internal call
+// Warning 6328: (176-190): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_2.sol b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_2.sol
index 15b46a9ab8..3f45d8b58c 100644
--- a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_2.sol
@@ -17,3 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol
index 7b7118b93a..0795c832e7 100644
--- a/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/function_inside_branch_modify_state_var_3.sol
@@ -24,5 +24,6 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (176-190): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nb = true\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(true)\n    C.f() -- internal call
-// Warning 6328: (288-302): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nb = false\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.h(false)\n    C.f() -- internal call
+// Warning 6328: (176-190): CHC: Assertion violation happens here.
+// Warning 6328: (288-302): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol
index 6e094b13e4..0a646d0e59 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_attached_1.sol
@@ -18,3 +18,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol
index 8b6bb58f01..e739aa57c3 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_attached_1_fail.sol
@@ -18,4 +18,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (228-244): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 1000\n\nTransaction trace:\nC.constructor()\nC.f(1)\n    L.add(1, 999) -- internal call
+// Warning 6328: (228-244): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
index 3a87f34c9d..56090df24c 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_1.sol
@@ -16,5 +16,7 @@ contract C
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreOS: macos
 // SMTIgnoreInv: yes
+// SMTIgnoreOS: macos
+// ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
index 3a3b295e45..d3373b62d6 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_2.sol
@@ -25,4 +25,4 @@ contract C
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (234-253): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n((!((map[1] + ((- 1) * map[0])) >= 0) || ((map'[0] + ((- 1) * map'[1])) <= 0)) && !(<errorCode> = 2) && (!((map[1] + ((- 1) * map[0])) <= 0) || ((map'[1] + ((- 1) * map'[0])) <= 0)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol b/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol
index d83970977b..6f80e1e0af 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_external_3.sol
@@ -18,4 +18,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> >= 2)\n(<errorCode> <= 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(map[0] == map[1])\n<errorCode> = 2 -> Assertion failed at assert(map[0] == map[1])\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol
index fb3228aca9..bddefceb91 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_1.sol
@@ -14,4 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 1))\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_2.sol
index 898dceceee..8e491d8dbf 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identifier_nested_tuple_2.sol
@@ -19,3 +19,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol
index be3cf4f041..5bf37f0815 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol
@@ -13,3 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol
index 604f3b275c..1ecdd5c8b8 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol
@@ -17,3 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol
index c139a2a66c..4c9885ff6e 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol
@@ -13,3 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_library_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_library_1.sol
index b35ec1d715..a6c1539f56 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_library_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_library_1.sol
@@ -17,3 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol
index f69d47baf5..843679a52b 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_library_1_fail.sol
@@ -17,4 +17,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (212-228): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 1000\n\nTransaction trace:\nC.constructor()\nC.f(1)\n    L.add(1, 999) -- internal call
+// Warning 6328: (212-228): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol b/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol
index e6cb394b50..4f664fb041 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol b/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol
index 530b469009..903afbbcd1 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_recursive_indirect.sol
@@ -23,4 +23,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(a <= 0)\n
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol
index 084df11c92..b7148bc730 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol
@@ -14,3 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol
index 6060615649..5bfb5dcc8e 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/address.sol b/test/libsolidity/smtCheckerTests/functions/getters/address.sol
index 92bb2761d5..cf8c915830 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/address.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/address.sol
@@ -14,5 +14,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (171-197): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
-// Warning 6328: (249-275): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
+// Warning 6328: (171-197): CHC: Assertion violation happens here.
+// Warning 6328: (249-275): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
index d44d15f284..658e0b859c 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_1.sol
@@ -17,4 +17,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (187-201): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
index ebc7877f0a..3c9fc7eb80 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
@@ -20,4 +20,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (242-256): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n!(a[2].length <= 3)\n
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol
index 5038294ed5..209b00f5f3 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_1.sol
@@ -15,4 +15,4 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :D:\n(items[1][2][3].y <= 0)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
index 6c7b0a1b37..36ea9da2fe 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
@@ -19,4 +19,5 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (267-281): CHC: Assertion violation happens here.\nCounterexample:\nitems = [{x: 42, y: 43}]\na = 42\nb = 43\n\nTransaction trace:\nD.constructor()\nState: items = []\nD.test()
+// Warning 6328: (267-281): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol
index d089d2edae..abe50e8a54 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_3.sol
@@ -21,4 +21,5 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (322-336): CHC: Assertion violation happens here.\nCounterexample:\nitems = [{x: 42, y: 43, arr: [0]}]\ntmp = [0]\na = 42\nb = 43\n\nTransaction trace:\nD.constructor()\nState: items = []\nD.test()
+// Warning 6328: (322-336): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol b/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol
index ec0531a4fb..63522d6106 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/bytes.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (162-201): CHC: Assertion violation happens here.\nCounterexample:\nstr2 = [0x63]\na2 = [0x63]\n\nTransaction trace:\nC.constructor()\nState: str2 = [0x63]\nC.f()
+// Warning 6328: (162-201): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/contract.sol b/test/libsolidity/smtCheckerTests/functions/getters/contract.sol
index a9d6982ef2..7da893bd36 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/contract.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/contract.sol
@@ -12,4 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (123-158): CHC: Assertion violation happens here.\nCounterexample:\nd = 0\ne = 0\n\nTransaction trace:\nC.constructor()\nState: d = 0\nC.f()
+// Warning 6328: (123-158): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol b/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol
index e90cc2cfde..844773ba53 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/double_access.sol
@@ -16,4 +16,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (193-207): CHC: Assertion violation happens here.\nCounterexample:\ns = {u: 0}\nu = 0\nv = 0\n\nTransaction trace:\nC.constructor()\nState: s = {u: 0}\nC.f()
+// Warning 6328: (193-207): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/enum.sol b/test/libsolidity/smtCheckerTests/functions/getters/enum.sol
index 66df044747..fabe444506 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/enum.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/enum.sol
@@ -12,4 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (210-245): CHC: Assertion violation happens here.\nCounterexample:\nchoice = 0\ne = 0\n\nTransaction trace:\nC.constructor()\nState: choice = 0\nC.f()
+// Warning 6328: (210-245): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol
index 00bfb35ca2..31397eedf3 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_1.sol
@@ -20,3 +20,4 @@ contract C {
 // SMTTargets: assert
 // ----
 // Warning 6328: (203-221): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol
index 5da279fc95..ad8ddcd022 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_2.sol
@@ -31,3 +31,4 @@ contract C {
 // SMTTargets: assert
 // ----
 // Warning 6328: (344-362): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol
index b7673203e1..f23af4f326 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_1.sol
@@ -12,7 +12,8 @@ contract C {
 // ====
 // SMTEngine: chc
 // SMTExtCalls: trusted
-// SMTTargets: assert
 // SMTIgnoreCex: yes
+// SMTTargets: assert
 // ----
 // Warning 6328: (127-141): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol
index b3dfe04ade..0673b14ab0 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/external_getter_this_2.sol
@@ -13,7 +13,8 @@ contract C {
 // ====
 // SMTEngine: chc
 // SMTExtCalls: trusted
-// SMTTargets: assert
 // SMTIgnoreCex: yes
+// SMTTargets: assert
 // ----
 // Warning 6328: (138-152): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol b/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol
index ac47ded035..6edf2a88c4 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/fixed_bytes.sol
@@ -14,5 +14,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (159-175): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
-// Warning 6328: (227-245): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0, y = 0x0\na = 0x0\nb = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0, y = 0x0\nC.f()
+// Warning 6328: (159-175): CHC: Assertion violation happens here.
+// Warning 6328: (227-245): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
index 6e133fedad..1077c2ee23 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (142-156): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (142-156): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
index 814a0a2ad2..c97084164f 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (166-180): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (166-180): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol
index a64a52c346..b78f44d5c7 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/mapping_with_cast.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (147-161): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (147-161): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
index 30907bd673..6e221e6547 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_1.sol
@@ -16,5 +16,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (210-224): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n
+// Warning 6328: (210-224): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
index 56032d9d5f..ce840d7d90 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_10.sol
@@ -20,4 +20,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (256-270): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n!(m[0][1].length <= 2)\n
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
index c3a3d660de..934eb85429 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_2.sol
@@ -21,4 +21,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (274-288): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n!(m[0][1].length <= 2)\n
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol
index 0083f92d89..8471d6f26e 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_3.sol
@@ -24,4 +24,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(m[0].length <= 1)\n!(m[0][1].length <= 2)\n!(m[0][1][2].length <= 3)\n
+// Info 1391: CHC: 18 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
index 43047758ef..3e0f0b63fa 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_4.sol
@@ -19,4 +19,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (260-274): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(m[0][1].length <= 2)\n
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
index 2e8abe5dcd..17c280e040 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_5.sol
@@ -23,4 +23,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (354-368): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(m[0][1].length <= 2)\n!(m[0][1][2].length <= 3)\n
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol
index d7964552d6..08af1f5558 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_6.sol
@@ -19,4 +19,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(m[0][1][2].length <= 3)\n
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
index fc4c9efcf9..d22fe68d4a 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_7.sol
@@ -15,5 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-206): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n
+// Warning 6328: (192-206): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
index 0b2b6fadf7..d57591c739 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_8.sol
@@ -17,5 +17,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (232-246): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n!(m[0].length <= 1)\n
+// Warning 6328: (232-246): CHC: Assertion violation happens here.
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
index be6bc23834..8bb9f9fb72 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/nested_arrays_mappings_9.sol
@@ -15,5 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (218-232): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 42\n\nTransaction trace:\nC.constructor()\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n!(m.length <= 0)\n
+// Warning 6328: (218-232): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol b/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
index d66545e437..a7b057beec 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/static_array.sol
@@ -12,5 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (162-184): CHC: Assertion violation happens here.\nCounterexample:\nx = [42, 1]\n\nTransaction trace:\nC.constructor()\nState: x = [42, 1]\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n!(x.length <= 1)\n
+// Warning 6328: (162-184): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/string.sol b/test/libsolidity/smtCheckerTests/functions/getters/string.sol
index 7369fd0fb1..9649372f72 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/string.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/string.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (178-224): CHC: Assertion violation happens here.\nCounterexample:\nstr1 = [0x62]\na1 = [0x62]\n\nTransaction trace:\nC.constructor()\nState: str1 = [0x62]\nC.f()
+// Warning 6328: (178-224): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
index 73e6f33168..521f108e0c 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
@@ -27,4 +27,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (338-355): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0, t: {t: 0}, b: false, a: []}\ny = 0\nc = false\nt = {t: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0, t: {t: 0}, b: false, a: []}\nC.f()
+// Warning 6328: (338-355): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
index 4fa8b0e3f6..eec69480a5 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
@@ -17,4 +17,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (175-189): CHC: Assertion violation happens here.\nCounterexample:\ns = {a: [0, 0], u: 0}\nu = 0\n\nTransaction trace:\nC.constructor()\nState: s = {a: [0, 0], u: 0}\nC.f()
+// Warning 6328: (175-189): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
index ddeaa655b2..ea68e0485d 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_3.sol
@@ -22,3 +22,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (307-326): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol
index 3e300edbb6..345959354f 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_4.sol
@@ -21,3 +21,4 @@ contract C {
 // Warning 2072: (146-183): Unused local variable.
 // Warning 8364: (187-193): Assertion checker does not yet implement type function () view external returns (contract D,function () external returns (uint256))
 // Warning 6328: (234-269): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
index c2d0d44262..4f4f8e13c0 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
@@ -28,5 +28,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (255-272): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 1, b: false}\nx = 1\nb = false\ny = 0\nc = false\n\nTransaction trace:\nC.constructor()\nState: s = {x: 1, b: false}\nC.f()
-// Warning 6328: (377-391): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 42, b: false}\nx = 1\nb = false\ny = 42\nc = false\n\nTransaction trace:\nC.constructor()\nState: s = {x: 1, b: false}\nC.f()
+// Warning 6328: (255-272): CHC: Assertion violation happens here.
+// Warning 6328: (377-391): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/uint.sol b/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
index b85d47284a..35a781dd76 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (114-128): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (114-128): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol
index 8094870be6..4a8ed0d718 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_state_var_init_2.sol
@@ -9,3 +9,4 @@ contract c {
 // SMTEngine: all
 // ----
 // Warning 6321: (54-58): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol
index c3c231ede5..f42bdb7dc3 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1.sol
@@ -22,4 +22,4 @@ contract C{
 // SMTIgnoreOS: macos
 // ----
 // Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Info 1180: Contract invariant(s) for :C:\n!(x >= 2)\n(!(x <= 0) && !(x >= 2))\n(!(x >= 2) && !(x <= 0))\n
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
index d067795ac8..1aaa973f3a 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_1_fail.sol
@@ -21,9 +21,9 @@ contract C{
 // SMTEngine: all
 // ----
 // Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (49-63): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor(0)
-// Warning 6328: (105-119): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
-// Warning 6328: (187-201): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
-// Warning 6328: (212-226): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call
-// Info 1180: Contract invariant(s) for :C:\n!(x >= 2)\n
+// Warning 6328: (49-63): CHC: Assertion violation happens here.
+// Warning 6328: (105-119): CHC: Assertion violation happens here.
+// Warning 6328: (137-151): CHC: Assertion violation happens here.
+// Warning 6328: (187-201): CHC: Assertion violation happens here.
+// Warning 6328: (212-226): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1.sol
index 7bceab1ad7..3ad9aa4880 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1.sol
@@ -17,3 +17,4 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol
index 6b997ada35..9f2fca60ce 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_call_with_assertion_inheritance_1_fail.sol
@@ -17,6 +17,7 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (49-63): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (115-129): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (147-161): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (49-63): CHC: Assertion violation happens here.
+// Warning 6328: (115-129): CHC: Assertion violation happens here.
+// Warning 6328: (147-161): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
index 4bca2544e1..e7e6ec61ce 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1.sol
@@ -21,4 +21,4 @@ contract C{
 // SMTEngine: all
 // ----
 // Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Info 1180: Contract invariant(s) for :C:\n!(x <= 0)\n!(x >= 2)\n(!(x <= 0) && !(x >= 2))\n
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
index c0f524e106..34d793d067 100644
--- a/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/internal_multiple_calls_with_assertion_1_fail.sol
@@ -21,7 +21,7 @@ contract C{
 // SMTEngine: all
 // ----
 // Warning 5667: (37-43): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (49-63): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor(0)
-// Warning 6328: (105-119): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()
-// Warning 6328: (151-165): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(0)\nState: x = 1\nC.f()\n    C.g() -- internal call\n    C.g() -- internal call
-// Info 1180: Contract invariant(s) for :C:\n!(x <= 0)\n!(x >= 2)\n
+// Warning 6328: (49-63): CHC: Assertion violation happens here.
+// Warning 6328: (105-119): CHC: Assertion violation happens here.
+// Warning 6328: (151-165): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol b/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol
index 3801cf24a7..e98556f994 100644
--- a/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol
+++ b/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol
@@ -15,3 +15,4 @@ library L {
 // SMTEngine: all
 // ----
 // Warning 2018: (98-157): Function state mutability can be restricted to pure
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/library_constant.sol b/test/libsolidity/smtCheckerTests/functions/library_constant.sol
index ddb9008519..53349f0b6c 100644
--- a/test/libsolidity/smtCheckerTests/functions/library_constant.sol
+++ b/test/libsolidity/smtCheckerTests/functions/library_constant.sol
@@ -19,5 +19,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (103-122): CHC: Assertion violation happens here.\nCounterexample:\nTON = 1000\n\nTransaction trace:\nl1.constructor()\nState: TON = 1000\nl1.f1()
-// Warning 4984: (196-201): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nC.constructor()\nC.f(115792089237316195423570985008687907853269984665640564039457584007913129639935)\n    l1.f2(115792089237316195423570985008687907853269984665640564039457584007913129639935, 1) -- internal call
+// Warning 6328: (103-122): CHC: Assertion violation happens here.
+// Warning 4984: (196-201): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/library_constant_2.sol b/test/libsolidity/smtCheckerTests/functions/library_constant_2.sol
index ac352b43d8..bfa260301d 100644
--- a/test/libsolidity/smtCheckerTests/functions/library_constant_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/library_constant_2.sol
@@ -8,3 +8,4 @@ library l1 {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/payable_2.sol b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
index 3035080eac..2a381fd4f9 100644
--- a/test/libsolidity/smtCheckerTests/functions/payable_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/payable_2.sol
@@ -25,4 +25,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (261-283): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g2(){ msg.value: 3529 }\n    C.i() -- internal call
+// Warning 6328: (261-283): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol b/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
index 85e97661ce..3bec690e64 100644
--- a/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
+++ b/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
@@ -29,6 +29,6 @@ contract D is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (205-219): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.proxy()\n    C.f() -- internal call\n        A.f() -- internal call
-// Warning 6328: (328-342): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()\nState: x = 0\nA.proxy()\n    D.f() -- internal call\n        C.f() -- internal call\n            A.f() -- internal call
-// Info 1180: Contract invariant(s) for :A:\n((x = 0) || (x = 2))\nContract invariant(s) for :D:\n((x = 0) || (x = 2))\n
+// Warning 6328: (205-219): CHC: Assertion violation happens here.
+// Warning 6328: (328-342): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call.sol
index 10ace89992..c079ba49ed 100644
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call.sol
+++ b/test/libsolidity/smtCheckerTests/functions/this_external_call.sol
@@ -13,3 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol
index ed7110d539..7d7064c97f 100644
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/this_external_call_2.sol
@@ -13,4 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (108-123): CHC: Assertion violation happens here.\nCounterexample:\na = 42\nx = 42\n\nTransaction trace:\nC.constructor()\nState: a = 0\nC.f(42)\n    C.g(42) -- trusted external call
+// Warning 6328: (108-123): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call_return.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call_return.sol
index 9e2d5d8c1d..06ba5dd455 100644
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call_return.sol
+++ b/test/libsolidity/smtCheckerTests/functions/this_external_call_return.sol
@@ -14,3 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol
index 5a425ca781..4907a7402b 100644
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol
+++ b/test/libsolidity/smtCheckerTests/functions/this_external_call_sender.sol
@@ -27,3 +27,4 @@ contract C {
 // ----
 // Warning 6328: (314-346): CHC: Assertion violation happens here.
 // Warning 6328: (356-388): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_external_call_tx_origin.sol b/test/libsolidity/smtCheckerTests/functions/this_external_call_tx_origin.sol
index 9b26994216..6b07cf2d3c 100644
--- a/test/libsolidity/smtCheckerTests/functions/this_external_call_tx_origin.sol
+++ b/test/libsolidity/smtCheckerTests/functions/this_external_call_tx_origin.sol
@@ -12,3 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/this_state.sol b/test/libsolidity/smtCheckerTests/functions/this_state.sol
index 126add6406..dec101060d 100644
--- a/test/libsolidity/smtCheckerTests/functions/this_state.sol
+++ b/test/libsolidity/smtCheckerTests/functions/this_state.sol
@@ -13,4 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 2))\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol b/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
index 4c5e381310..d39aaad5f9 100644
--- a/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
+++ b/test/libsolidity/smtCheckerTests/functions/virtual_function_assert.sol
@@ -19,5 +19,5 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (227-241): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.proxy()\n    C.f() -- internal call
-// Info 1180: Contract invariant(s) for :A:\n((x >= 0) && (x <= 0))\n
+// Warning 6328: (227-241): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
index e30a5e7438..b4deddc7ce 100644
--- a/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/functions/virtual_function_called_by_constructor.sol
@@ -25,6 +25,6 @@ contract C is A {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (199-214): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nA.constructor()\nState: x = 2\nA.i()
-// Warning 6328: (387-401): CHC: Assertion violation happens here.\nCounterexample:\nx = 10\n\nTransaction trace:\nC.constructor()\nState: x = 10\nC.i()
-// Info 1180: Contract invariant(s) for :A:\n(!(x <= 1) && !(x >= 3))\nContract invariant(s) for :C:\n(!(x <= 9) && !(x >= 11))\n
+// Warning 6328: (199-214): CHC: Assertion violation happens here.
+// Warning 6328: (387-401): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol b/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol
index 7796d3a9af..cd9a647619 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_as_module_1.sol
@@ -17,4 +17,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (A:117-132): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n_y = 0\n\nTransaction trace:\nD.constructor()\nState: x = 0\nD.f(0)\n    C.g(0) -- internal call
+// Warning 6328: (A:117-132): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/imports/import_base.sol b/test/libsolidity/smtCheckerTests/imports/import_base.sol
index 4ad6533576..3e8aeefe48 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_base.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_base.sol
@@ -20,4 +20,5 @@ contract Der is Base {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (der:173-186): CHC: Assertion violation happens here.\nCounterexample:\nx = 3, a = 0x0\ny = 0\n\nTransaction trace:\nDer.constructor()\nState: x = 0, a = 0x0\nDer.g(0)\n    Base.f() -- internal call
+// Warning 6328: (der:173-186): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/imports/import_library_2.sol b/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
index acf2acda43..a1c3160ea2 100644
--- a/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
+++ b/test/libsolidity/smtCheckerTests/imports/import_library_2.sol
@@ -26,3 +26,4 @@ contract ERC20 {
 // SMTEngine: all
 // ----
 // Warning 3944: (ERC20.sol:157-162): CHC: Underflow (resulting value less than 0) happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
index 0fd5086025..587a23bb02 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
@@ -15,5 +15,5 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (52-66): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, x = 0\nC.g()\n    B.f() -- internal call
-// Info 1180: Contract invariant(s) for :B:\n(x <= 0)\n
+// Warning 6328: (52-66): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
index 039388704f..97c79428b7 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
@@ -22,4 +22,5 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (54-68): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, z = 0, w = 0, a = 0, b = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, z = 0, w = 0, a = 0, b = 0, x = 0\nC.g()\n    A.f() -- internal call
+// Warning 6328: (54-68): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
index 4d9067e074..c92b0c5014 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
@@ -28,4 +28,5 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    B.f() -- internal call\n        A.f() -- internal call\n            C.v() -- internal call
+// Warning 6328: (64-78): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
index 4bf6520fb5..593a6ba3aa 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
@@ -35,4 +35,5 @@ contract C is B, A1 {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call\n        A1.f() -- internal call\n            B.f() -- internal call\n                A.f() -- internal call\n                    C.v() -- internal call
+// Warning 6328: (64-78): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
index 507b10824a..818906cd3a 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
@@ -29,4 +29,5 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (97-111): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    B.f() -- internal call\n        A.f() -- internal call\n            C.v() -- internal call\n                A.v() -- internal call
+// Warning 6328: (97-111): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
index 21d8a3dcc1..04033a00f0 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
@@ -31,4 +31,5 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (183-197): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()\n    A.v() -- internal call
+// Warning 6328: (183-197): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
index db63f27c76..e33e6a3bc0 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
@@ -22,4 +22,5 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (56-70): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    A.f() -- internal call\n        C.v() -- internal call
+// Warning 6328: (56-70): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
index a87a8eeb68..2ec47f7d94 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
@@ -28,6 +28,6 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (62-76): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nB.f()\n    A.f() -- internal call\n        C.v() -- internal call
-// Warning 6328: (131-145): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()\n    A.v() -- internal call
-// Info 1180: Contract invariant(s) for :A:\n(x = 0)\n
+// Warning 6328: (62-76): CHC: Assertion violation happens here.
+// Warning 6328: (131-145): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol
index a67223b5a3..edc345c428 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_1.sol
@@ -32,5 +32,6 @@ contract C is Z(5) {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (292-299): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\nx = 1\nz = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nZ.constructor(115792089237316195423570985008687907853269984665640564039457584007913129639935)
-// Warning 6328: (367-380): CHC: Assertion violation happens here.\nCounterexample:\nx = 6\n\nTransaction trace:\nC.constructor()
+// Warning 4984: (292-299): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 6328: (367-380): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol
index 497fa6076f..f97b0b7ece 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_inheritance_specifier_2.sol
@@ -37,3 +37,4 @@ contract C is Z(5) {
 // Warning 4984: (110-116): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 4984: (300-307): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (376-390): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol
index 6ca597ed15..16b6db133c 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_1.sol
@@ -33,3 +33,4 @@ contract C is Z, B {
 // ----
 // Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (351-365): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol
index 130da425e0..55ee0e77b2 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_2.sol
@@ -30,4 +30,5 @@ contract C is Z, B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (349-363): CHC: Assertion violation happens here.\nCounterexample:\nk = 2, x = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (349-363): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol
index a1a9b9b6e6..ebaffc7148 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_3.sol
@@ -33,3 +33,4 @@ contract C is Z, B {
 // ----
 // Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (361-375): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol
index c670aff15d..35cb038ae4 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_4.sol
@@ -33,3 +33,4 @@ contract C is Z, B {
 // ----
 // Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (361-375): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol
index e97b990ee3..a8d87ce26b 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_5.sol
@@ -38,3 +38,4 @@ contract C is Z, B {
 // ----
 // Warning 4984: (105-112): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (423-437): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol
index 3d92a3626f..76ba20735e 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_6.sol
@@ -35,4 +35,5 @@ contract C is Z, B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (416-430): CHC: Assertion violation happens here.\nCounterexample:\nk = 42, x = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (416-430): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol
index b63c3c79d8..d861ac2edb 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_7.sol
@@ -32,4 +32,5 @@ contract C is Z {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (354-367): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (354-367): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol
index 0164cf437f..5815f9ed61 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_8.sol
@@ -18,5 +18,6 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (185-199): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (218-234): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (185-199): CHC: Assertion violation happens here.
+// Warning 6328: (218-234): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol
index fed5ebf34a..bfb7abb98c 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_base_calls_with_side_effects_9.sol
@@ -19,6 +19,7 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (191-205): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (224-238): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (257-273): CHC: Assertion violation happens here.\nCounterexample:\nx = 42\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (191-205): CHC: Assertion violation happens here.
+// Warning 6328: (224-238): CHC: Assertion violation happens here.
+// Warning 6328: (257-273): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol
index 15cc66a0d6..2d49cd1e38 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_hierarchy_mixed_chain_with_params.sol
@@ -29,3 +29,4 @@ contract A is B {
 // ----
 // Warning 4984: (215-220): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (296-310): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol
index be95458372..db94b516f2 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init.sol
@@ -8,4 +8,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (64-78): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
index e9bf3f65cf..03b634ba94 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_asserts.sol
@@ -33,7 +33,8 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (247-261): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (339-362): CHC: Assertion violation happens here.\nCounterexample:\ny = 2, x = (- 1)\na = 1\n\nTransaction trace:\nC.constructor(1)
-// Warning 6328: (439-463): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
-// Warning 6328: (483-496): CHC: Assertion violation happens here.\nCounterexample:\ny = 4, x = 0\na = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (247-261): CHC: Assertion violation happens here.
+// Warning 6328: (339-362): CHC: Assertion violation happens here.
+// Warning 6328: (439-463): CHC: Assertion violation happens here.
+// Warning 6328: (483-496): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol
index 7435a54f59..0ebbed1dbd 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_base.sol
@@ -11,4 +11,5 @@ contract D is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (84-98): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (84-98): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol
index bba7b3e138..f9382fb64e 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain.sol
@@ -19,4 +19,5 @@ contract D is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (178-192): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (178-192): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol
index c9a9f970fd..e3be37f2b1 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_alternate.sol
@@ -18,4 +18,5 @@ contract D is C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (152-166): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (152-166): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol
index f02e416a48..09833f14de 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all.sol
@@ -26,3 +26,4 @@ contract A is B {
 // Warning 4984: (125-130): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 4984: (184-189): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (243-261): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol
index e223ad5f7f..035a901b0e 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_run_all_2.sol
@@ -26,3 +26,4 @@ contract A is B {
 // Warning 4984: (125-131): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 4984: (185-190): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6328: (241-259): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol
index 71e9071f12..e98ddcb63c 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_chain_tree.sol
@@ -39,5 +39,6 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (403-417): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, x = 1\nc = (- 1)\n\nTransaction trace:\nC.constructor((- 1))
-// Warning 6328: (450-463): CHC: Assertion violation happens here.\nCounterexample:\nz = 0, x = 0\nc = 0\n\nTransaction trace:\nC.constructor(0)
+// Warning 6328: (403-417): CHC: Assertion violation happens here.
+// Warning 6328: (450-463): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol
index a31d5894c5..ed61c1c2b1 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond.sol
@@ -17,4 +17,5 @@ contract D is B, C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (129-143): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (129-143): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol
index c7c63f00fe..8590b0bcfa 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_diamond_middle.sol
@@ -25,5 +25,6 @@ contract D is B, C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (134-148): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()
-// Warning 6328: (223-237): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nD.constructor()
+// Warning 6328: (134-148): CHC: Assertion violation happens here.
+// Warning 6328: (223-237): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_function_call.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_function_call.sol
index ca2f0b770a..031f5a1c0e 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_function_call.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_state_variable_init_function_call.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol b/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol
index 0a4599a3d1..1c0defa916 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/constructor_uses_function_base.sol
@@ -18,4 +18,4 @@ contract C is B {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(!(y <= 41) && !(y >= 43))\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
index 580597f4f4..7af69f2e4a 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
@@ -29,4 +29,5 @@ contract D is B, C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (437-452): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 15\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
+// Warning 6328: (437-452): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
index c8d3c9c0e9..c5f8383973 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
@@ -30,5 +30,6 @@ contract D is B, C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (443-458): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 22\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
-// Warning 6328: (477-492): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 22\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
+// Warning 6328: (443-458): CHC: Assertion violation happens here.
+// Warning 6328: (477-492): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
index b8487e3212..af22069eb6 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
@@ -32,5 +32,5 @@ contract E is C,D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (379-394): CHC: Assertion violation happens here.\nCounterexample:\nx = 111\n\nTransaction trace:\nE.constructor()\nState: x = 0\nE.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
-// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 111))\nContract invariant(s) for :D:\n((x = 0) || (x = 101))\nContract invariant(s) for :E:\n((x = 0) || (x = 111))\nContract invariant(s) for :B:\n((x = 0) || (x = 101))\n
+// Warning 6328: (379-394): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol b/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
index c8b2f96c58..f43195d621 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/implicit_constructor_hierarchy.sol
@@ -14,5 +14,7 @@ contract C is B {
 }
 // ====
 // SMTEngine: all
-// SMTSolvers: z3
 // SMTIgnoreInv: yes
+// SMTSolvers: z3
+// ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol b/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol
index 653bb23b70..799bba43b8 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/implicit_only_constructor_hierarchy.sol
@@ -20,4 +20,4 @@ contract C is B {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Info 1180: Contract invariant(s) for :A:\n(x <= 0)\nContract invariant(s) for :C:\n(x <= 0)\nContract invariant(s) for :B:\n(x <= 0)\n
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol b/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol
index 89a48f17c6..b339e5a14a 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/overriden_function_static_call_parent.sol
@@ -21,3 +21,4 @@ contract Child is Base {
 // ----
 // Warning 5667: (52-58): Unused function parameter. Remove or comment out the variable name to silence this warning.
 // Warning 6328: (282-296): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/state_variables.sol b/test/libsolidity/smtCheckerTests/inheritance/state_variables.sol
index 6809263555..0b92796708 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/state_variables.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/state_variables.sol
@@ -15,3 +15,4 @@ contract C is Base {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/state_variables_2.sol b/test/libsolidity/smtCheckerTests/inheritance/state_variables_2.sol
index 2264e460cf..fd1fbccac6 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/state_variables_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/state_variables_2.sol
@@ -17,3 +17,4 @@ contract C is Base2 {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/state_variables_3.sol b/test/libsolidity/smtCheckerTests/inheritance/state_variables_3.sol
index 636bd03679..03a1e79772 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/state_variables_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/state_variables_3.sol
@@ -16,3 +16,4 @@ contract C is Base {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol
index 68ac2ee390..ad18cb325e 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_2.sol
@@ -12,4 +12,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 7737: (82-101): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (138-147): CHC: Assertion violation happens here.\nCounterexample:\n\n = false\nb = false\nx = 42\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (138-147): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol
index 838b69e5d5..73cdcd4d8d 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_3.sol
@@ -12,4 +12,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 7737: (106-125): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
-// Warning 6328: (203-212): CHC: Assertion violation happens here.\nCounterexample:\n\n = false\nb = false\nc = true\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (203-212): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol
index 1915ca821a..59db8c8c4d 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_4.sol
@@ -13,3 +13,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 7737: (82-101): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol
index dc91a68228..b81ae7663a 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_5.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 7737: (156-187): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_6.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_6.sol
index e7f4e37c62..21a32c0f4c 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_6.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_6.sol
@@ -22,3 +22,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 7737: (157-193): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol
index 9d44025814..b8df9f3e9e 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_access_inside_function.sol
@@ -22,3 +22,4 @@ contract C {
 // Warning 7737: (83-149): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
 // Warning 6328: (152-167): CHC: Assertion violation happens here.
 // Warning 6328: (186-200): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol
index 13232a650d..390ce10ad2 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_local_storage_pointer.sol
@@ -21,3 +21,4 @@ contract C {
 // Warning 7737: (170-205): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
 // Warning 6328: (208-229): CHC: Assertion violation happens here.
 // Warning 6328: (248-269): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol
index e8c8896ab2..7eb441392f 100644
--- a/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol
+++ b/test/libsolidity/smtCheckerTests/inline_assembly/assembly_memory_write.sol
@@ -26,3 +26,4 @@ contract C {
 // Warning 7737: (156-187): Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
 // Warning 6328: (190-208): CHC: Assertion violation happens here.
 // Warning 6328: (227-244): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/invariants/loop_basic.sol b/test/libsolidity/smtCheckerTests/invariants/loop_basic.sol
index 6bac672eba..f43b61f8db 100644
--- a/test/libsolidity/smtCheckerTests/invariants/loop_basic.sol
+++ b/test/libsolidity/smtCheckerTests/invariants/loop_basic.sol
@@ -11,3 +11,4 @@ contract Simple {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/invariants/loop_basic_for.sol b/test/libsolidity/smtCheckerTests/invariants/loop_basic_for.sol
index 10ff0d5933..dcc731bf8e 100644
--- a/test/libsolidity/smtCheckerTests/invariants/loop_basic_for.sol
+++ b/test/libsolidity/smtCheckerTests/invariants/loop_basic_for.sol
@@ -9,3 +9,4 @@ contract Simple {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/invariants/loop_nested.sol b/test/libsolidity/smtCheckerTests/invariants/loop_nested.sol
index aea9c95ab9..d14c2a2a3e 100644
--- a/test/libsolidity/smtCheckerTests/invariants/loop_nested.sol
+++ b/test/libsolidity/smtCheckerTests/invariants/loop_nested.sol
@@ -17,3 +17,4 @@ contract Simple {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/invariants/loop_nested_for.sol b/test/libsolidity/smtCheckerTests/invariants/loop_nested_for.sol
index 3513c15d33..55f5b617de 100644
--- a/test/libsolidity/smtCheckerTests/invariants/loop_nested_for.sol
+++ b/test/libsolidity/smtCheckerTests/invariants/loop_nested_for.sol
@@ -14,3 +14,4 @@ contract Simple {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol b/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
index 4e74d4ea68..fd0610eafb 100644
--- a/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
+++ b/test/libsolidity/smtCheckerTests/invariants/state_machine_1.sol
@@ -33,3 +33,4 @@ contract C {
 // SMTIgnoreOS: macos
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol b/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol
index 96fbf7557f..6ebaa26738 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_1_fail.sol
@@ -12,4 +12,5 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (110-124): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 14\n\nTransaction trace:\nC.constructor()\nC.f(13)
+// Warning 6328: (110-124): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_1_false_positives.sol b/test/libsolidity/smtCheckerTests/loops/do_while_1_false_positives.sol
index 776ff1bf32..f49fb588eb 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_1_false_positives.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_1_false_positives.sol
@@ -12,3 +12,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_break.sol b/test/libsolidity/smtCheckerTests/loops/do_while_break.sol
index 6e1b7eafe0..7d779c4734 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_break.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_break.sol
@@ -14,3 +14,4 @@ contract C {
 // ----
 // Warning 5740: (71-76): Unreachable code.
 // Warning 5740: (89-95): Unreachable code.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol
index 3f1d6af002..c7710320a0 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_break_2.sol
@@ -18,3 +18,4 @@ contract C {
 // ----
 // Warning 5740: (95-100): Unreachable code.
 // Warning 5740: (114-118): Unreachable code.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol b/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol
index ce989722ef..5564b6a591 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_continue.sol
@@ -13,3 +13,4 @@ contract C {
 // SMTSolvers: z3
 // ----
 // Warning 5740: (74-79): Unreachable code.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_break.sol b/test/libsolidity/smtCheckerTests/loops/for_1_break.sol
index d1d2a50bd8..31b92ef0a3 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_break.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_break.sol
@@ -17,3 +17,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol
index fa7a489e4f..271d220f04 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_break_fail.sol
@@ -16,4 +16,5 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (168-183): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(0, false)
+// Warning 6328: (168-183): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_continue.sol b/test/libsolidity/smtCheckerTests/loops/for_1_continue.sol
index b9b90923c1..66193a31f7 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_continue.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_continue.sol
@@ -15,3 +15,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol b/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol
index 2e4d5a0f73..d35e727cc3 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_continue_fail.sol
@@ -13,4 +13,5 @@ contract C
 // SMTSolvers: z3
 // ----
 // Warning 5667: (33-39): Unused function parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (109-123): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 10\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(9, false)
+// Warning 6328: (109-123): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol b/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol
index 84d36aa669..7d179aa101 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol
@@ -14,5 +14,6 @@ contract C
 // SMTSolvers: z3
 // ----
 // Warning 4984: (143-148): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (156-170): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 14\n\nTransaction trace:\nC.constructor()\nC.f(4)
+// Warning 6328: (156-170): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (143-148): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol b/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
index 3b6842b419..46694d785a 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
@@ -13,4 +13,5 @@ contract C
 // SMTEngine: all
 // ----
 // Warning 4984: (106-111): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (106-111): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol b/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol
index baedb4a97e..a25f0fcc1b 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_break_direct.sol
@@ -11,3 +11,4 @@ contract C
 // SMTSolvers: z3
 // ----
 // Warning 5740: (69-72): Unreachable code.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_1.sol
index dbf9bd82b5..155aa45bfd 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_1.sol
@@ -9,3 +9,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_2.sol
index 0c9327c626..212feb8245 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_2.sol
@@ -9,3 +9,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_3.sol
index befdb44919..ae6392bdfc 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_3.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_3.sol
@@ -9,3 +9,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_6.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_6.sol
index 2056510be1..976d2540a7 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_6.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_6.sol
@@ -12,3 +12,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol
index c51e7ca0c6..953a6d507c 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_memory.sol
@@ -24,3 +24,4 @@ contract LoopFor2 {
 // SMTIgnoreCex: yes
 // ----
 // Warning 2072: (202-217): Unused local variable.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
index c5fa1f288d..53a6142a6e 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_memory_storage.sol
@@ -27,3 +27,4 @@ contract LoopFor2 {
 // SMTIgnoreOS: macos
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol
index dbcf88a806..d52cc2c990 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_array_assignment_storage_memory.sol
@@ -23,3 +23,4 @@ contract LoopFor2 {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
index 781463d5a1..d667a55c85 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
@@ -9,4 +9,5 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (90-96): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
index ede2e43356..65caca9826 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
@@ -12,4 +12,5 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (106-112): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol
index 0beae52d7a..e5219bad58 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_3.sol
@@ -17,3 +17,4 @@ contract C {
 // SMTSolvers: z3
 // ----
 // Warning 2072: (83-89): Unused local variable.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol
index c040ecb984..4fdaa6bcf0 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol
@@ -9,4 +9,5 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (90-95): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1.sol b/test/libsolidity/smtCheckerTests/loops/while_1.sol
index 4ce223d128..ffb407fee1 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_1.sol
@@ -15,3 +15,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_break.sol b/test/libsolidity/smtCheckerTests/loops/while_1_break.sol
index 8b78b1fa8f..136509f63e 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_1_break.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_1_break.sol
@@ -17,3 +17,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol
index ac4071e7f6..84ec71f4c8 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_1_break_fail.sol
@@ -17,4 +17,5 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (185-200): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.f(0, false)
+// Warning 6328: (185-200): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_continue.sol b/test/libsolidity/smtCheckerTests/loops/while_1_continue.sol
index 46d291c89a..b2e63a3bc2 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_1_continue.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_1_continue.sol
@@ -16,3 +16,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol
index f679e3e59a..941bd54156 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_1_fail.sol
@@ -12,4 +12,5 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (106-120): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 14\n\nTransaction trace:\nC.constructor()\nC.f(14)
+// Warning 6328: (106-120): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_1_infinite.sol b/test/libsolidity/smtCheckerTests/loops/while_1_infinite.sol
index 8281d238d4..bbd7bfe4ed 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_1_infinite.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_1_infinite.sol
@@ -20,3 +20,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_2.sol b/test/libsolidity/smtCheckerTests/loops/while_2.sol
index 53323c2755..b4d0edacd4 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_2.sol
@@ -14,3 +14,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_2_break.sol b/test/libsolidity/smtCheckerTests/loops/while_2_break.sol
index d844ba676b..5e2bbd4483 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_2_break.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_2_break.sol
@@ -15,3 +15,4 @@ contract C
 // SMTSolvers: z3
 // ----
 // Warning 5740: (95-98): Unreachable code.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol
index 49b82c0e9d..95e5b4c344 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_2_break_fail.sol
@@ -16,3 +16,4 @@ contract C
 // ----
 // Warning 5740: (87-90): Unreachable code.
 // Warning 6328: (98-112): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_2_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_2_fail.sol
index 9a1cbe695a..95324dd656 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_2_fail.sol
@@ -14,3 +14,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol b/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
index 47515ecad1..783a2f2689 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
@@ -11,4 +11,5 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (65-71): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol
index 6ee19dfa4d..be350ef5e2 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_memory.sol
@@ -30,3 +30,4 @@ contract LoopFor2 {
 // ----
 // Warning 2072: (202-217): Unused local variable.
 // Warning 2072: (225-231): Unused local variable.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol
index 788c36e378..1e5e2fbe9b 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_memory_storage.sol
@@ -34,3 +34,4 @@ contract LoopFor2 {
 // SMTSolvers: z3
 // ----
 // Warning 2072: (280-286): Unused local variable.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol
index f6f1f32107..ed7ebdfba5 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_array_assignment_storage_storage.sol
@@ -26,6 +26,7 @@ contract LoopFor2 {
 // SMTEngine: all
 // ----
 // Warning 6368: (288-292): CHC: Out of bounds access might happen here.
-// Warning 6368: (459-463): CHC: Out of bounds access happens here.\nCounterexample:\nb = [1, 0], c = [0, 0]\nn = 1\na = []\ni = 1\n\nTransaction trace:\nLoopFor2.constructor()\nState: b = [], c = []\nLoopFor2.p()\nState: b = [0], c = [0]\nLoopFor2.p()\nState: b = [0, 0], c = [0, 0]\nLoopFor2.testUnboundedForLoop(1)
-// Warning 6328: (452-471): CHC: Assertion violation happens here.\nCounterexample:\nb = [1, 0], c = [0, 0]\nn = 1\ni = 1\n\nTransaction trace:\nLoopFor2.constructor()\nState: b = [], c = []\nLoopFor2.p()\nState: b = [0], c = [0]\nLoopFor2.p()\nState: b = [0, 0], c = [0, 0]\nLoopFor2.testUnboundedForLoop(1)
-// Warning 6328: (475-494): CHC: Assertion violation happens here.\nCounterexample:\nb = [1, 0], c = [0, 0]\nn = 1\ni = 1\n\nTransaction trace:\nLoopFor2.constructor()\nState: b = [], c = []\nLoopFor2.p()\nState: b = [0], c = [0]\nLoopFor2.p()\nState: b = [0, 0], c = [0, 0]\nLoopFor2.testUnboundedForLoop(1)
+// Warning 6368: (459-463): CHC: Out of bounds access happens here.
+// Warning 6328: (452-471): CHC: Assertion violation happens here.
+// Warning 6328: (475-494): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_2.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_2.sol
index b8c04fa924..e71e73ee94 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_2.sol
@@ -10,3 +10,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_4.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_4.sol
index 6cc75f2dc9..f5ee2dfaff 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_4.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_4.sol
@@ -10,3 +10,4 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol
index bbcd6cd31f..5a085fdb02 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_5.sol
@@ -12,4 +12,5 @@ contract C {
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Warning 6328: (192-206): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 6328: (192-206): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_nested_break.sol b/test/libsolidity/smtCheckerTests/loops/while_nested_break.sol
index 696cdf3dd0..8f80745b8b 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_nested_break.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_nested_break.sol
@@ -30,3 +30,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol b/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol
index 5a1bc93953..60ce3be9ba 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_nested_break_fail.sol
@@ -29,5 +29,6 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (296-311): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 10\nb = false\nc = true\n\nTransaction trace:\nC.constructor()\nC.f(0, 9, false, true)
-// Warning 6328: (347-362): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 15\ny = 0\nb = true\nc = false\n\nTransaction trace:\nC.constructor()\nC.f(9, 0, true, false)
+// Warning 6328: (296-311): CHC: Assertion violation happens here.
+// Warning 6328: (347-362): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_nested_continue.sol b/test/libsolidity/smtCheckerTests/loops/while_nested_continue.sol
index c175d233c6..eee4d91df6 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_nested_continue.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_nested_continue.sol
@@ -28,3 +28,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/math/addmod_1.sol b/test/libsolidity/smtCheckerTests/math/addmod_1.sol
index 62272c5957..3ec75c8c7c 100644
--- a/test/libsolidity/smtCheckerTests/math/addmod_1.sol
+++ b/test/libsolidity/smtCheckerTests/math/addmod_1.sol
@@ -12,6 +12,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (108-133): CHC: Division by zero happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 4281: (230-245): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\nk = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.g(0, 0, 0)
+// Warning 4281: (108-133): CHC: Division by zero happens here.
+// Warning 6328: (137-151): CHC: Assertion violation happens here.
+// Warning 4281: (230-245): CHC: Division by zero happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/math/addmod_mulmod.sol b/test/libsolidity/smtCheckerTests/math/addmod_mulmod.sol
index 39d1c81106..b957a9b412 100644
--- a/test/libsolidity/smtCheckerTests/math/addmod_mulmod.sol
+++ b/test/libsolidity/smtCheckerTests/math/addmod_mulmod.sol
@@ -9,5 +9,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (60-110): BMC: Condition is always false.
 // Warning 6838: (125-175): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol b/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol
index 4d36da6b57..90a4f8b9d0 100644
--- a/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol
+++ b/test/libsolidity/smtCheckerTests/math/addmod_mulmod_zero.sol
@@ -22,7 +22,8 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6321: (220-227): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 4281: (61-76): CHC: Division by zero happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
-// Warning 6328: (80-93): CHC: Assertion violation happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
-// Warning 4281: (147-162): CHC: Division by zero happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)
-// Warning 6328: (166-179): CHC: Assertion violation happens here.\nCounterexample:\n\nd = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g(0)
+// Warning 4281: (61-76): CHC: Division by zero happens here.
+// Warning 6328: (80-93): CHC: Assertion violation happens here.
+// Warning 4281: (147-162): CHC: Division by zero happens here.
+// Warning 6328: (166-179): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/math/addmulmod.sol b/test/libsolidity/smtCheckerTests/math/addmulmod.sol
index 1979e4e56a..478121284a 100644
--- a/test/libsolidity/smtCheckerTests/math/addmulmod.sol
+++ b/test/libsolidity/smtCheckerTests/math/addmulmod.sol
@@ -17,3 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/math/mulmod_1.sol b/test/libsolidity/smtCheckerTests/math/mulmod_1.sol
index 2a3648f3f3..de15f362a3 100644
--- a/test/libsolidity/smtCheckerTests/math/mulmod_1.sol
+++ b/test/libsolidity/smtCheckerTests/math/mulmod_1.sol
@@ -12,6 +12,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (108-133): CHC: Division by zero happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (137-151): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\nx = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 4281: (230-245): CHC: Division by zero happens here.\nCounterexample:\n\nx = 0\ny = 0\nk = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.g(0, 0, 0)
+// Warning 4281: (108-133): CHC: Division by zero happens here.
+// Warning 6328: (137-151): CHC: Assertion violation happens here.
+// Warning 4281: (230-245): CHC: Division by zero happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol
index 3634cecb6a..5f08811b5c 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_code_after_placeholder.sol
@@ -21,4 +21,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (103-116): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(115792089237316195423570985008687907853269984665640564039457584007913129639935)\nState: x = 115792089237316195423570985008687907853269984665640564039457584007913129639935\nC.f()
+// Warning 6328: (103-116): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol
index 1d466b5373..f348bf24d0 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_control_flow.sol
@@ -15,4 +15,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (111-124): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (111-124): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol
index 08a0c9f4c3..187305a6eb 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_branch.sol
@@ -24,4 +24,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (233-238): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
index d3467d0b89..db597db2a3 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_inside_branch_assignment_multi_branches.sol
@@ -34,5 +34,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (540-554): CHC: Assertion violation happens here.\nCounterexample:\nx = 1, owner = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, owner = 0x0\nC.g(1){ msg.sender: 0x0 }
-// Info 1180: Contract invariant(s) for :C:\n(owner <= 0)\n
+// Warning 6328: (540-554): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol
index d3a4bd92f9..292c44ae1c 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi.sol
@@ -26,4 +26,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (137-150): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(1)\nState: x = 1\nC.f()
+// Warning 6328: (137-150): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol
index f1804abe85..fb503bb7b2 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions.sol
@@ -22,4 +22,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (278-291): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\na = 1\nb = 0\n\nTransaction trace:\nC.constructor()\nC.f(1)\n    C.g(1, 0) -- internal call
+// Warning 6328: (278-291): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol
index 4281dcdd57..1e55dab19b 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_functions_recursive.sol
@@ -19,3 +19,4 @@ contract C
 // ----
 // Warning 5740: (137-157): Unreachable code.
 // Warning 5740: (199-237): Unreachable code.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol
index 2f6a820a53..31578a3114 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_multi_parameters.sol
@@ -13,4 +13,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (131-144): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\na = 1\nb = 0\n\nTransaction trace:\nC.constructor()\nC.f(1)
+// Warning 6328: (131-144): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol
index 25141b8bf3..b3c5b8ed0f 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_overflow.sol
@@ -15,4 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol
index bed6b448e2..9165ed1331 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_1.sol
@@ -20,4 +20,5 @@ contract B is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (209-223): CHC: Assertion violation happens here.\nCounterexample:\ns = 42\nx = 42\n\nTransaction trace:\nB.constructor()\nState: s = 0\nB.set(42)\nState: s = 42\nA.f()
+// Warning 6328: (209-223): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol
index 4e408059c8..f85e1b3bae 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_3.sol
@@ -18,4 +18,5 @@ contract B is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (94-104): CHC: Assertion violation happens here.\nCounterexample:\ns = true\nx = true\n\nTransaction trace:\nB.constructor()\nState: s = false\nA.f()
+// Warning 6328: (94-104): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
index 39be35cb6d..652dd811f3 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_overriding_4.sol
@@ -36,7 +36,7 @@ contract D is B,C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (160-174): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nB.constructor()\nState: x = 0\nA.f()
-// Warning 6328: (193-207): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.f()
-// Warning 6328: (226-240): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nD.constructor()\nState: x = 0\nA.f()
-// Info 1180: Contract invariant(s) for :C:\n((x = 0) || (x = 2))\nContract invariant(s) for :D:\n((x = 0) || (x = 3))\nContract invariant(s) for :B:\n((x = 0) || (x = 1))\n
+// Warning 6328: (160-174): CHC: Assertion violation happens here.
+// Warning 6328: (193-207): CHC: Assertion violation happens here.
+// Warning 6328: (226-240): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_parameters.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_parameters.sol
index 7c360c454f..761dd8a3bc 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_parameters.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_parameters.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_return.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_return.sol
index 2b9c95a3f8..baa295d851 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_return.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_return.sol
@@ -18,3 +18,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_simple.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_simple.sol
index ef3da25adb..7875bb80f9 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_simple.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_simple.sol
@@ -14,3 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations.sol
index 82014aa6b9..26197459b0 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations.sol
@@ -17,3 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
index 5641e2812b..d6bc51ffd5 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_invocations_2.sol
@@ -16,5 +16,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (76-90): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n(x = 3)\n
+// Warning 6328: (76-90): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol
index 940445d63a..00b6fab519 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_two_placeholders.sol
@@ -23,4 +23,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (123-137): CHC: Assertion violation happens here.\nCounterexample:\nx = 3\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g(1)\nState: x = 1\nC.f()
+// Warning 6328: (123-137): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol b/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
index 43d41f755b..b270fb2bb5 100644
--- a/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
+++ b/test/libsolidity/smtCheckerTests/modifiers/modifier_virtual_static_call_2.sol
@@ -20,5 +20,5 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (83-98): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n((x >= 0) && (x <= 0))\n
+// Warning 6328: (83-98): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_no_abstraction.sol b/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_no_abstraction.sol
index 2a2f16c477..b9bca0357a 100644
--- a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_no_abstraction.sol
+++ b/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_no_abstraction.sol
@@ -35,3 +35,5 @@ contract C {
 }
 // ====
 // SMTEngine: chc
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_with_abstraction.sol b/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_with_abstraction.sol
index a80708d304..e0647000a2 100644
--- a/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_with_abstraction.sol
+++ b/test/libsolidity/smtCheckerTests/natspec/abstract_function_nondet_pow_with_abstraction.sol
@@ -33,3 +33,5 @@ contract C {
 }
 // ====
 // SMTEngine: chc
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol b/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
index ed160d95c2..552c8d4f60 100644
--- a/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
+++ b/test/libsolidity/smtCheckerTests/natspec/safe_assert_false_positive_pure.sol
@@ -28,4 +28,4 @@ contract C {
 // Warning 2018: (33-335): Function state mutability can be restricted to view
 // Warning 2018: (457-524): Function state mutability can be restricted to pure
 // Warning 6328: (135-150): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n(y <= 0)\n
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
index 4c97f8a698..461761bafa 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
@@ -10,4 +10,5 @@ contract C {
     }
 }
 // ----
-// Warning 6328: (174-188): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 2\nC.g()
+// Warning 6328: (174-188): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol
index 08b87282e0..6496ec525b 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol
@@ -18,5 +18,6 @@ contract D is C {
     }
 }
 // ----
-// Warning 6328: (95-109): CHC: Assertion violation happens here.\nCounterexample:\ny = 3, x = 3\n\nTransaction trace:\nD.constructor()\nState: y = 3, x = 3\nC.f()
-// Warning 6328: (180-194): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 2\nC.g()
+// Warning 6328: (95-109): CHC: Assertion violation happens here.
+// Warning 6328: (180-194): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
index efa29edc11..40eb48672e 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable.sol
@@ -30,3 +30,4 @@ contract A {
 // SMTIgnoreInv: yes
 // ----
 // Warning 6328: (392-408): CHC: Assertion violation happens here.
+// Info 1391: CHC: 17 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
index 292eab85d2..3a93659f43 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array.sol
@@ -12,5 +12,5 @@ contract A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (124-146): CHC: Assertion violation happens here.\nCounterexample:\na = []\n\nTransaction trace:\nA.constructor()\nState: a = []\nA.f()
-// Info 1180: Contract invariant(s) for :A:\n(a.length <= 0)\n
+// Warning 6328: (124-146): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol
index 2554356c58..694d110e19 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol
@@ -9,3 +9,4 @@ contract A {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
index 7a925d1341..0fe3e68bea 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_3.sol
@@ -26,8 +26,8 @@ contract A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (318-322): CHC: Out of bounds access happens here.\nCounterexample:\na = [0, 0]\nu = []\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
-// Warning 6328: (311-328): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
-// Warning 6368: (422-426): CHC: Out of bounds access happens here.\nCounterexample:\na = [0, 0]\nu = []\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
-// Warning 6328: (415-432): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\nb = [0, 0]\n\nTransaction trace:\nA.constructor()\nState: a = [1]\nA.f()
-// Info 1180: Contract invariant(s) for :A:\n!(a.length <= 0)\n
+// Warning 6368: (318-322): CHC: Out of bounds access happens here.
+// Warning 6328: (311-328): CHC: Assertion violation happens here.
+// Warning 6368: (422-426): CHC: Out of bounds access happens here.
+// Warning 6328: (415-432): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
index 781476de25..baa1c75a47 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_module_contract_member_variable.sol
@@ -29,6 +29,6 @@ contract A {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (AASource:159-178): CHC: Assertion violation happens here.\nCounterexample:\nx = (- 1), y = (- 2)\n\nTransaction trace:\nA.constructor()\nState: x = 0, y = 0\nA.a()\nState: x = (- 2), y = (- 2)\nA.a()
-// Warning 6328: (AASource:370-386): CHC: Assertion violation happens here.\nCounterexample:\nx = 8, y = (- 2)\n\nTransaction trace:\nA.constructor()\nState: x = 0, y = 0\nA.a()
-// Info 1180: Contract invariant(s) for AASource:A:\n(((x = 0) && (y = 0)) || ((x = (- 2)) && (y = (- 2))))\n
+// Warning 6328: (AASource:159-178): CHC: Assertion violation happens here.
+// Warning 6328: (AASource:370-386): CHC: Assertion violation happens here.
+// Info 1391: CHC: 16 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_fixed_bytes.sol
index 64d31bff06..175702d683 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_and_fixed_bytes.sol
@@ -9,4 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (237-285): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (237-285): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
index 611fd95986..4bae4f67b8 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
@@ -15,4 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (71-89): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (71-89): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol
index 1f4c6c3d1a..ec649ce7b0 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_and_rational.sol
@@ -9,4 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (43-61): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (43-61): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol
index 47f0dcba28..fcf2bdfca8 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_and_uint.sol
@@ -13,6 +13,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (74-92): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (147-170): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (174-197): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (74-92): CHC: Assertion violation happens here.
+// Warning 6328: (147-170): CHC: Assertion violation happens here.
+// Warning 6328: (174-197): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_combo.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_combo.sol
index 19fdaf9472..0a0822dd9b 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_combo.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_combo.sol
@@ -10,3 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol
index 6a9d4e90ac..c028baf9f5 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_not_fixed_bytes.sol
@@ -9,4 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (100-123): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0xffff\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (100-123): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol
index e254d5b40c..cf6d090006 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_not_int.sol
@@ -15,7 +15,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (58-73): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (89-104): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (120-138): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 15\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (152-167): CHC: Assertion violation happens here.\nCounterexample:\n\nx = (- 1)\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (58-73): CHC: Assertion violation happens here.
+// Warning 6328: (89-104): CHC: Assertion violation happens here.
+// Warning 6328: (120-138): CHC: Assertion violation happens here.
+// Warning 6328: (152-167): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol
index 8cf205e9c0..19b33bd6e6 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_not_uint.sol
@@ -11,5 +11,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (126-146): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (150-170): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (126-146): CHC: Assertion violation happens here.
+// Warning 6328: (150-170): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol
index 267705a0eb..f1e8994090 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_operators_do_not_throw_exceptions.sol
@@ -10,3 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol
index acbe3fa6da..9ae3b79e6e 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_or_fixed_bytes.sol
@@ -9,4 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (150-175): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\nb = 0xff\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (150-175): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol
index cc96e9b1ee..9f1ff33277 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_or_int.sol
@@ -17,5 +17,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (111-129): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (234-253): CHC: Assertion violation happens here.\nCounterexample:\n\nx = (- 1)\ny = 200\nz = 255\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (111-129): CHC: Assertion violation happens here.
+// Warning 6328: (234-253): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol
index d6ebdf4983..e66c5e8c5e 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_or_uint.sol
@@ -13,5 +13,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (122-143): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (174-197): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (122-143): CHC: Assertion violation happens here.
+// Warning 6328: (174-197): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_rational_1.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_rational_1.sol
index 14794f6e78..1783a4e355 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_rational_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_rational_1.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol
index 3d3f373a0c..5dc2744179 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_rational_2.sol
@@ -12,4 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (148-161): CHC: Assertion violation happens here.\nCounterexample:\n\nx = (- 2)\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (148-161): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol
index 62cf620d66..927097552d 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_fixed_bytes.sol
@@ -11,3 +11,4 @@ contract Simp {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (140-171): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol
index 1075480cb4..67b2246eac 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_int.sol
@@ -15,5 +15,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (156-173): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\nz = (- 1)\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (214-231): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 7\ny = 3\nz = (- 1)\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (156-173): CHC: Assertion violation happens here.
+// Warning 6328: (214-231): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol
index 6d28cdbcf0..6dcbcc8bef 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_xor_uint.sol
@@ -13,5 +13,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (122-143): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (174-197): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (122-143): CHC: Assertion violation happens here.
+// Warning 6328: (174-197): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bytes_new.sol b/test/libsolidity/smtCheckerTests/operators/bytes_new.sol
index b961c53d52..2c9d5e39c6 100644
--- a/test/libsolidity/smtCheckerTests/operators/bytes_new.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bytes_new.sol
@@ -34,5 +34,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (468-472): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [0x12, 0x34, 0x0]\n\nTransaction trace:\nC.constructor()\nC.h()
-// Warning 6368: (490-494): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [0x12, 0x34, 0x0]\n\nTransaction trace:\nC.constructor()\nC.h()
+// Warning 6368: (468-472): CHC: Out of bounds access happens here.
+// Warning 6368: (490-494): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 23 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add.sol b/test/libsolidity/smtCheckerTests/operators/compound_add.sol
index 804f7c3cbe..7a18b1c7ee 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_add.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_add.sol
@@ -11,4 +11,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (118-133): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 200\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (118-133): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
index 4186f39fec..5d8b4aaa18 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_add_array_index.sol
@@ -20,4 +20,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (262-284): CHC: Assertion violation happens here.\nCounterexample:\narray = [200, 0]\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0]\nC.f(0, 0)
+// Warning 6328: (262-284): CHC: Assertion violation happens here.
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add_chain.sol b/test/libsolidity/smtCheckerTests/operators/compound_add_chain.sol
index 2e706f9464..07a41244c1 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_add_chain.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_add_chain.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol b/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol
index ab133cefc9..e002523072 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_add_mapping.sol
@@ -13,4 +13,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (165-185): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 6328: (165-185): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol
index 6e6a106e2c..5922c59df5 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_1.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (115-129): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 2\n\nTransaction trace:\nC.constructor()\nC.f(2)
+// Warning 6328: (115-129): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol
index bd81c17a45..9290d364ef 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_2.sol
@@ -18,4 +18,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (259-280): CHC: Assertion violation happens here.\nCounterexample:\narray = [2, 0]\nx = 2\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0]\nC.f(2, 0)
+// Warning 6328: (259-280): CHC: Assertion violation happens here.
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
index aa90aa2529..6611531157 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_assignment_division_3.sol
@@ -12,4 +12,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (162-181): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\np = 0\n\nTransaction trace:\nC.constructor()\nC.f(2, 0)
+// Warning 6328: (162-181): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_assignment_right_shift.sol b/test/libsolidity/smtCheckerTests/operators/compound_assignment_right_shift.sol
index ca035131b2..01f89d97a9 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_assignment_right_shift.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_assignment_right_shift.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol
index b634e84689..d596ddb895 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_fixed_bytes.sol
@@ -13,4 +13,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (177-191): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\na = 0x0\nb = 0xf0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (177-191): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol
index d634a1922b..0797321f6d 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_int.sol
@@ -18,4 +18,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (81-95): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol
index 2e86c4b3a4..3fe528cef5 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_and_uint.sol
@@ -28,6 +28,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (144-158): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 3\nc = 0\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (347-366): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 3\nc = 0\nx = 255\ny = 255\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (473-490): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 3\nc = 0\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (144-158): CHC: Assertion violation happens here.
+// Warning 6328: (347-366): CHC: Assertion violation happens here.
+// Warning 6328: (473-490): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol
index edcf3230b9..f8206376d8 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_fixed_bytes.sol
@@ -13,4 +13,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (177-191): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\na = 0xff\nb = 0xff\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (177-191): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol
index 5d92940b7b..3309b5d8f5 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int.sol
@@ -18,4 +18,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (81-95): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol
index fdd8c55cce..d3fbc32225 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_int_1.sol
@@ -20,3 +20,4 @@ contract C {
 // Warning 6368: (166-171): CHC: Out of bounds access might happen here.
 // Warning 6368: (166-174): CHC: Out of bounds access might happen here.
 // Warning 6328: (142-180): CHC: Assertion violation might happen here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol
index e36d166a5e..d022f87e6c 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint.sol
@@ -24,6 +24,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 7\nc = 0\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (265-282): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 7\nc = 7\nx = 255\ny = 65535\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (391-410): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 7\nc = 7\nx = 65280\ny = 61951\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (88-102): CHC: Assertion violation happens here.
+// Warning 6328: (265-282): CHC: Assertion violation happens here.
+// Warning 6328: (391-410): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol
index 802dd27ffa..f0916cf7e8 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_or_uint_1.sol
@@ -14,3 +14,4 @@ contract C {
 // Warning 6368: (115-119): CHC: Out of bounds access might happen here.
 // Warning 6368: (141-145): CHC: Out of bounds access might happen here.
 // Warning 6328: (134-151): CHC: Assertion violation might happen here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol
index a682f4692e..57d47eb1cd 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal.sol
@@ -17,3 +17,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (123-142): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol
index 59bd6c7b95..70f9095f84 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_2.sol
@@ -14,4 +14,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (147-165): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x646567\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (147-165): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
index 396088e3c5..81b9296585 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_string_literal_3.sol
@@ -18,5 +18,6 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (229-276): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x6062606464666060606260646466606060626064646660606062606464666060\nz = 0x6062606464666060606260646466606060626064646660606062606464666060\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (394-437): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0x63666566676e616263666566676e616263666566676e616263666566676e6162\nz = 0x63666566676e616263666566676e616263666566676e616263666566676e6162\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (229-276): CHC: Assertion violation happens here.
+// Warning 6328: (394-437): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol
index 6856f72e09..58902c22de 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_fixed_bytes.sol
@@ -13,4 +13,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6321: (51-57): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (178-195): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0x0\na = 0xff\nb = 0xf0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (178-195): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol
index 30ee762779..58cb7c5be3 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_int.sol
@@ -15,4 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (81-95): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (81-95): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol
index 1e88cc52ee..6d2daabb55 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_bitwise_xor_uint.sol
@@ -24,6 +24,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (88-102): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 4\nc = 0\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (265-282): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 4\nc = 4\nx = 255\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (389-408): CHC: Assertion violation happens here.\nCounterexample:\n\nv = 4\nc = 4\nx = 65280\ny = 65280\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (88-102): CHC: Assertion violation happens here.
+// Warning 6328: (265-282): CHC: Assertion violation happens here.
+// Warning 6328: (389-408): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul.sol
index 4262cdd7ce..c04affe2d9 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_mul.sol
@@ -11,4 +11,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (117-131): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 100\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (117-131): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
index 37a00b0638..18b2792d1c 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_mul_array_index.sol
@@ -15,4 +15,5 @@ contract C
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (226-247): CHC: Assertion violation happens here.\nCounterexample:\narray = [100]\nx = 0\np = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.q()\nState: array = [0]\nC.f(0, 0)
+// Warning 6328: (226-247): CHC: Assertion violation happens here.
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol b/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
index b7b06b1fc8..df7c9d0399 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_mul_mapping.sol
@@ -14,3 +14,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (164-183): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_shl_1.sol b/test/libsolidity/smtCheckerTests/operators/compound_shl_1.sol
index 281543e1c8..b2b1af4a87 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_shl_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_shl_1.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_sub.sol b/test/libsolidity/smtCheckerTests/operators/compound_sub.sol
index 0c4394bb7b..bcfb3f785c 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_sub.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_sub.sol
@@ -11,4 +11,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (117-131): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 90\ny = 90\n\nTransaction trace:\nC.constructor()\nC.f(90)
+// Warning 6328: (117-131): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol b/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol
index 5c9b1181fe..9d44f41567 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_sub_array_index.sol
@@ -16,3 +16,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (226-247): CHC: Assertion violation happens here.
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol b/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol
index 9c8b27359a..b10763319d 100644
--- a/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/compound_sub_mapping.sol
@@ -14,3 +14,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (164-183): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol
index c33c12c294..38dee0b227 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_2.sol
@@ -10,3 +10,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (99-113): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol
index 4dd9e8eff8..34763bd239 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_3.sol
@@ -12,3 +12,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (128-141): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol
index 7ddf077061..1e9b402117 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_4.sol
@@ -23,3 +23,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 2072: (240-246): Unused local variable.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
index 923147d495..87ca405b99 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_6.sol
@@ -25,4 +25,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 2072: (255-261): Unused local variable.
-// Info 1180: Reentrancy property(ies) for :C:\n((!(x <= 2) || !(x' >= 3)) && (<errorCode> <= 0) && (!(x' <= 0) || !(x >= 2)))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2 || x == 1)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol
index a448bf1cbc..ebd04d0438 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_function_2.sol
@@ -18,3 +18,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (345-359): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol
index 484d175b02..3aa38daca2 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_nested_always_true.sol
@@ -8,4 +8,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (114-116): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
index a7664cc78e..1a87e1ced0 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
@@ -16,5 +16,6 @@ contract C {
 // ----
 // Warning 4984: (134-140): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (143-146): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (134-140): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (143-146): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol b/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol
index d33defde95..54d37f8ba1 100644
--- a/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/const_exp_1.sol
@@ -12,4 +12,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 2018: (65-173): Function state mutability can be restricted to pure
-// Warning 6328: (139-154): CHC: Assertion violation happens here.\nCounterexample:\nx = 2, y = 1024\n\nTransaction trace:\nC.constructor()\nState: x = 2, y = 1024\nC.f()
+// Warning 6328: (139-154): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol b/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol
index 74502ed2a6..a7dc70472e 100644
--- a/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/constant_propagation_1.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (251-281): CHC: Assertion violation happens here.\nCounterexample:\nDEPOSIT_CONTRACT_TREE_DEPTH = 32, MAX_DEPOSIT_COUNT = 4294967295\n\nTransaction trace:\nC.constructor()\nState: DEPOSIT_CONTRACT_TREE_DEPTH = 32, MAX_DEPOSIT_COUNT = 4294967295\nC.f()
+// Warning 6328: (251-281): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/constant_propagation_2.sol b/test/libsolidity/smtCheckerTests/operators/constant_propagation_2.sol
index 5b8206e292..a38fd31d47 100644
--- a/test/libsolidity/smtCheckerTests/operators/constant_propagation_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/constant_propagation_2.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array.sol b/test/libsolidity/smtCheckerTests/operators/delete_array.sol
index fb71fc03bb..0fae644460 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array.sol
@@ -17,4 +17,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (121-122): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol
index 32f2526cc6..d13e1e36bd 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array_2d.sol
@@ -17,4 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(true && !(a.length <= 2))\n(true && !(a[2].length <= 3))\n
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
index 4f90011158..a56bfed559 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array_index.sol
@@ -20,5 +20,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (154-155): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
index 80a692429d..71d260907e 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array_index_2d.sol
@@ -27,5 +27,5 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (315-335): CHC: Assertion violation might happen here.
-// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 1)\n
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 4661: (315-335): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_array_push.sol b/test/libsolidity/smtCheckerTests/operators/delete_array_push.sol
index 86a3ab5cce..d65a2fdc25 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_array_push.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_array_push.sol
@@ -19,3 +19,4 @@ contract C {
 // ----
 // Warning 6328: (143-190): CHC: Assertion violation happens here.
 // Warning 6328: (363-408): CHC: Assertion violation happens here.
+// Info 1391: CHC: 16 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function.sol b/test/libsolidity/smtCheckerTests/operators/delete_function.sol
index 63dad1ab0b..510254e8ea 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_function.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_function.sol
@@ -28,5 +28,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (262-263): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol b/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol
index b334b982ec..33a31d6c48 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol
@@ -17,3 +17,4 @@ contract C {
 // Warning 6368: (149-155): CHC: Out of bounds access happens here.
 // Warning 6368: (172-178): CHC: Out of bounds access happens here.
 // Warning 6328: (165-184): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol b/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol
index 7849a78583..53a1a253e0 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_multid_array.sol
@@ -57,3 +57,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
+// Info 1391: CHC: 27 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_struct.sol b/test/libsolidity/smtCheckerTests/operators/delete_struct.sol
index cb68e6d4bd..76338a0a7c 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_struct.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_struct.sol
@@ -17,3 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_tuple.sol b/test/libsolidity/smtCheckerTests/operators/delete_tuple.sol
index ab8a1bb208..1925197829 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_tuple.sol
@@ -6,3 +6,4 @@ contract A{
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_2.sol b/test/libsolidity/smtCheckerTests/operators/division_2.sol
index cf27cd6c1f..8704c66547 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_2.sol
@@ -7,3 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_3.sol b/test/libsolidity/smtCheckerTests/operators/division_3.sol
index 99b5df2a4d..af4ed582e5 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_3.sol
@@ -7,4 +7,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (95-100): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.\nCounterexample:\n\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\ny = (- 1)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f((- 57896044618658097711785492504343953926634992332820282019728792003956564819968), (- 1))
+// Warning 4984: (95-100): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_4.sol b/test/libsolidity/smtCheckerTests/operators/division_4.sol
index 57ca07d846..54403b1ec1 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_4.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_4.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_6.sol b/test/libsolidity/smtCheckerTests/operators/division_6.sol
index 741bfa0b51..69d4ee580a 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_6.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_6.sol
@@ -11,5 +11,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (120-125): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\n\na = 128\nb = 2\n = 0\nc = 0\n\nTransaction trace:\nC.constructor()\nC.mul(128, 2)
+// Warning 4984: (120-125): CHC: Overflow (resulting value larger than 255) happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (137-147): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_1.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_1.sol
index 93765e175f..5d3725f3d2 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_1.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_2.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_2.sol
index 7c0218e355..29af565a22 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_2.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_3.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_3.sol
index 715930c5e3..573f6d2468 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_3.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_4.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_4.sol
index d0d9d20d7d..6610bc5244 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_4.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_4.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_5.sol b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_5.sol
index 87a8098793..97faba60fb 100644
--- a/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_5.sol
+++ b/test/libsolidity/smtCheckerTests/operators/division_truncates_correctly_5.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol b/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol
index 33011472b2..d925ca4491 100644
--- a/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol
+++ b/test/libsolidity/smtCheckerTests/operators/function_call_named_arguments.sol
@@ -30,4 +30,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (475-489): CHC: Assertion violation happens here.\nCounterexample:\n\na = 2\nb = 2\n\nTransaction trace:\nC.constructor()\nC.call()\n    L.l(2, 3) -- internal call\n    L.l(3, 3) -- internal call\n    C.f(1, 2, true) -- internal call\n    C.f(1, 2, false) -- internal call
+// Warning 6328: (475-489): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol
index 4cb34c49eb..71dac3e08a 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytes.sol
@@ -9,4 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (152-173): CHC: Assertion violation happens here.\nCounterexample:\n\nx = [0x0, 0x11, 0x22, 0x33]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (152-173): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
index e73554c1e9..c516675d6e 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_for_bytesNN.sol
@@ -9,3 +9,4 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6368: (76-90): CHC: Out of bounds access might happen here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_for_string.sol b/test/libsolidity/smtCheckerTests/operators/index_access_for_string.sol
index b1c8e38373..535335de0d 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_for_string.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_for_string.sol
@@ -10,3 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
index ae526775f9..d3b6f5895b 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
@@ -23,5 +23,5 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (335-354): CHC: Assertion violation might happen here.
-// Info 1180: Contract invariant(s) for :C:\n!(a.length <= 2)\n!(a.length <= 3)\n
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 4661: (335-354): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/integer_new.sol b/test/libsolidity/smtCheckerTests/operators/integer_new.sol
index bd52a4eb40..d85fb4073c 100644
--- a/test/libsolidity/smtCheckerTests/operators/integer_new.sol
+++ b/test/libsolidity/smtCheckerTests/operators/integer_new.sol
@@ -34,5 +34,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (474-478): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [18, 52, 0]\n\nTransaction trace:\nC.constructor()\nC.h()
-// Warning 6368: (496-500): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = [18, 52, 0]\n\nTransaction trace:\nC.constructor()\nC.h()
+// Warning 6368: (474-478): CHC: Out of bounds access happens here.
+// Warning 6368: (496-500): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 23 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod.sol b/test/libsolidity/smtCheckerTests/operators/mod.sol
index 5c867b629c..a600ef03f1 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod.sol
@@ -10,3 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod_even.sol b/test/libsolidity/smtCheckerTests/operators/mod_even.sol
index 804b8fb798..b6195bac9b 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod_even.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod_even.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod_n.sol b/test/libsolidity/smtCheckerTests/operators/mod_n.sol
index c1bd2d40af..a9b0b464a6 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod_n.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod_n.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod_n_uint16.sol b/test/libsolidity/smtCheckerTests/operators/mod_n_uint16.sol
index 27c296812b..a45fd3ef25 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod_n_uint16.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod_n_uint16.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/mod_signed.sol b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
index 8dc9355ce6..2e640f53fd 100644
--- a/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
+++ b/test/libsolidity/smtCheckerTests/operators/mod_signed.sol
@@ -12,3 +12,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6328: (131-148): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_left.sol b/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_left.sol
index 334464c0c9..f5313726a2 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_left.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_left.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_right.sol b/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_right.sol
index 3722a99764..d566bf24ed 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_right.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/compound_shift_right.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol
index 86f4be1bd6..14ae9f72f0 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_cleanup.sol
@@ -16,3 +16,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (182-197): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol
index 2dd96ac75b..ac8a961f84 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left.sol
@@ -27,3 +27,4 @@ contract C {
 // Warning 6328: (330-364): CHC: Assertion violation happens here.
 // Warning 6328: (504-597): CHC: Assertion violation happens here.
 // Warning 6328: (674-704): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol
index 3b0557c421..0867aa4cb4 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_larger_type.sol
@@ -11,4 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (138-158): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\nx = 254\ny = 1\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (138-158): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol
index c900c66ed5..7e0128dca9 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint32.sol
@@ -27,3 +27,4 @@ contract C {
 // Warning 6328: (327-365): CHC: Assertion violation happens here.
 // Warning 6328: (449-485): CHC: Assertion violation happens here.
 // Warning 6328: (560-588): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol
index 9210c12e61..bbbea4ef71 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_left_uint8.sol
@@ -17,3 +17,4 @@ contract C {
 // ----
 // Warning 6328: (209-238): CHC: Assertion violation happens here.
 // Warning 6328: (310-335): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol
index fcf699f225..efe69945cc 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_overflow.sol
@@ -37,3 +37,4 @@ contract C {
 // Warning 6328: (511-537): CHC: Assertion violation happens here.
 // Warning 6328: (611-637): CHC: Assertion violation happens here.
 // Warning 6328: (709-735): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol
index f14f1c9277..6d893efcc1 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right.sol
@@ -27,3 +27,4 @@ contract C {
 // Warning 6328: (321-352): CHC: Assertion violation happens here.
 // Warning 6328: (427-455): CHC: Assertion violation happens here.
 // Warning 6328: (673-769): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol
index 5cc26ee781..61de9aa43f 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_literal.sol
@@ -38,3 +38,4 @@ contract C {
 // Warning 6328: (501-524): CHC: Assertion violation happens here.
 // Warning 6328: (595-619): CHC: Assertion violation happens here.
 // Warning 6328: (690-714): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol
index 2e0411f7b3..773a77bc0d 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue.sol
@@ -38,3 +38,4 @@ contract C {
 // Warning 6328: (516-541): CHC: Assertion violation happens here.
 // Warning 6328: (614-639): CHC: Assertion violation happens here.
 // Warning 6328: (712-737): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol
index 3c145a1ad1..043a640aaf 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int16.sol
@@ -37,3 +37,4 @@ contract C {
 // Warning 6328: (514-539): CHC: Assertion violation happens here.
 // Warning 6328: (612-637): CHC: Assertion violation happens here.
 // Warning 6328: (710-735): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol
index a64734d7d1..94b212a631 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int32.sol
@@ -37,3 +37,4 @@ contract C {
 // Warning 6328: (514-539): CHC: Assertion violation happens here.
 // Warning 6328: (612-637): CHC: Assertion violation happens here.
 // Warning 6328: (710-735): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol
index eaab703db5..400f26cf34 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_negative_lvalue_int8.sol
@@ -37,3 +37,4 @@ contract C {
 // Warning 6328: (483-506): CHC: Assertion violation happens here.
 // Warning 6328: (577-600): CHC: Assertion violation happens here.
 // Warning 6328: (671-694): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol
index cfe4cc8d03..9e68e22ef8 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint32.sol
@@ -27,3 +27,4 @@ contract C {
 // Warning 6328: (317-346): CHC: Assertion violation happens here.
 // Warning 6328: (421-451): CHC: Assertion violation happens here.
 // Warning 6328: (526-556): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol
index 7738e30fed..864a760e91 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_right_uint8.sol
@@ -17,3 +17,4 @@ contract C {
 // ----
 // Warning 6328: (207-232): CHC: Assertion violation happens here.
 // Warning 6328: (302-325): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol
index 9d8c3e7963..d02e144023 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_underflow_negative_rvalue.sol
@@ -22,3 +22,4 @@ contract C {
 // ----
 // Warning 6328: (312-341): CHC: Assertion violation happens here.
 // Warning 6328: (417-446): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol
index c39cdc7d1c..8f34b530b9 100644
--- a/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shr_unused.sol
@@ -8,3 +8,4 @@ contract C {
 // SMTEngine: all
 // ----
 // UnimplementedFeatureError: Not yet implemented - FixedPointType.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/slice.sol b/test/libsolidity/smtCheckerTests/operators/slice.sol
index 068122a660..29f89295f0 100644
--- a/test/libsolidity/smtCheckerTests/operators/slice.sol
+++ b/test/libsolidity/smtCheckerTests/operators/slice.sol
@@ -12,3 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/slice_bytes.sol b/test/libsolidity/smtCheckerTests/operators/slice_bytes.sol
index 037403a1b1..8c8c95361f 100644
--- a/test/libsolidity/smtCheckerTests/operators/slice_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/operators/slice_bytes.sol
@@ -7,3 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol b/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
index c6f421a0cb..b017b7ff0b 100644
--- a/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
+++ b/test/libsolidity/smtCheckerTests/operators/slice_default_end.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol b/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
index 2dcb635193..ef422245d3 100644
--- a/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
+++ b/test/libsolidity/smtCheckerTests/operators/slice_default_start.sol
@@ -12,5 +12,6 @@ contract C {
 // ----
 // Warning 6328: (150-182): CHC: Assertion violation might happen here.
 // Warning 6328: (186-218): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 4661: (150-182): BMC: Assertion violation happens here.
 // Warning 4661: (186-218): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/slices_3.sol b/test/libsolidity/smtCheckerTests/operators/slices_3.sol
index d23c081406..530b870cef 100644
--- a/test/libsolidity/smtCheckerTests/operators/slices_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/slices_3.sol
@@ -14,3 +14,4 @@ function f(int[] calldata b, uint256 start, uint256 end) public returns (int) {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/tuple_rationals_conditional.sol b/test/libsolidity/smtCheckerTests/operators/tuple_rationals_conditional.sol
index 805c923d5d..c5732293af 100644
--- a/test/libsolidity/smtCheckerTests/operators/tuple_rationals_conditional.sol
+++ b/test/libsolidity/smtCheckerTests/operators/tuple_rationals_conditional.sol
@@ -10,3 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add.sol b/test/libsolidity/smtCheckerTests/operators/unary_add.sol
index 1b304dd4b6..9716624b2a 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add.sol
@@ -14,4 +14,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (161-174): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 4\na = 3\nb = 3\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (161-174): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol
index 8c3296e09f..a45a5b9804 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_array.sol
@@ -21,3 +21,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (278-291): CHC: Assertion violation happens here.
+// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol
index 03dedaae99..4617fa91c7 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_1.sol
@@ -11,4 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (150-168): CHC: Assertion violation happens here.\nCounterexample:\nx = [1]\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.f()
+// Warning 6328: (150-168): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol
index b1cef5e40b..a6cacac08a 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_array_push_2.sol
@@ -18,4 +18,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(data.length <= 1)\n!(data[1].d.length <= 3)\n
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol
index e52f3f3e35..5b208787ec 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_mapping.sol
@@ -17,3 +17,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (211-224): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol
index 459d5adb7b..f1d57fa967 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly.sol
@@ -13,4 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (61-64): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\nx = 255\n\nTransaction trace:\nC.constructor()\nState: x = 254\nC.inc_pre()\nState: x = 255\nC.inc_pre()
+// Warning 4984: (61-64): CHC: Overflow (resulting value larger than 255) happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol b/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol
index ebc23359ff..12687d9e18 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add_overflows_correctly_struct.sol
@@ -21,4 +21,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (112-117): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\ns = {x: 255}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 254}\nC.inc_pre()\nState: s = {x: 255}\nC.inc_pre()
+// Warning 4984: (112-117): CHC: Overflow (resulting value larger than 255) happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_1.sol b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_1.sol
index a1cecae869..72b292306e 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_1.sol
@@ -11,3 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_2.sol b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_2.sol
index 42402a2766..e61109c36f 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_2.sol
@@ -11,3 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol
index 90b8a02bdb..bef3d12803 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_operators_tuple_3.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (108-118): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f(true)
+// Warning 6328: (108-118): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_sub.sol b/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
index ada46b98f4..adf70fe42c 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
@@ -14,4 +14,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (161-174): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\na = 4\nb = 4\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (161-174): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol b/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol
index 657cece75f..f0cfe36cf5 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_sub_array.sol
@@ -19,3 +19,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (275-288): CHC: Assertion violation happens here.
+// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol b/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol
index 49ece25924..20f2c83809 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_sub_mapping.sol
@@ -17,3 +17,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (211-224): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
index f97b82f813..9d09e2f296 100644
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
@@ -103,3 +103,4 @@ contract C {
 // Warning 6328: (2685-2712): CHC: Assertion violation happens here.
 // Warning 6328: (2744-2773): CHC: Assertion violation happens here.
 // Warning 6328: (2805-2834): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
index e785be5e5b..21ed55c1c2 100644
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
@@ -21,3 +21,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6756: (274-288): User-defined operators are not yet supported by SMTChecker. This invocation of operator + has been ignored, which may lead to incorrect results.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
index 0f5a63b07c..bc37a31301 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_1.sol
@@ -23,5 +23,6 @@ contract C {
 // Warning 4984: (112-115): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 3944: (181-184): CHC: Underflow (resulting value less than 0) might happen here.
 // Warning 6368: (259-263): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (112-115): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 4144: (181-184): BMC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol
index d331abef7b..77f4548fd2 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2.sol
@@ -21,4 +21,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n((l + ((- 1) * a.length)) <= 0)\n
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_1.sol
index 81c788e2b6..a52707c58a 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_1.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_1.sol
@@ -14,3 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol
index 0eb84c2741..63fa1cf7c7 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_2.sol
@@ -13,4 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (224-231): CHC: Out of bounds access happens here.\nCounterexample:\na = [[]]\ni = 0\nj = 0\n = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.p()\nState: a = [[]]\nC.r(0, 0)
+// Warning 6368: (224-231): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_3.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_3.sol
index 328616e7cf..8fad49b806 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_3.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_3.sol
@@ -14,3 +14,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
index 1976543363..2a9f39d1a2 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
@@ -16,10 +16,12 @@ contract C {
 // ----
 // Warning 4984: (184-197): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (199-202): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6368: (228-232): CHC: Out of bounds access happens here.\nCounterexample:\na = []\ni = 0\nj = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.r()
+// Warning 6368: (228-232): CHC: Out of bounds access happens here.
 // Warning 4984: (228-244): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (246-249): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6368: (255-259): CHC: Out of bounds access happens here.\nCounterexample:\na = []\ni = 0\nj = 0\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.r()
+// Warning 6368: (255-259): CHC: Out of bounds access happens here.
 // Warning 6368: (255-262): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (184-197): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (228-244): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_4.sol
index 372292916d..ab895696fb 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_4.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_4.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_1.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_1.sol
index a8a4c577c5..464188441d 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_1.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_1.sol
@@ -6,3 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_3.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_3.sol
index 8c2ec749a2..5d0dd95f82 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_3.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_3.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol
index 83e68b4801..fd94acfee5 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_4.sol
@@ -9,3 +9,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 5667: (36-42): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol
index 816f96810a..c5e7ecf389 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_constant_bound.sol
@@ -14,4 +14,5 @@ contract DepositContract {
 // SMTEngine: all
 // ----
 // Warning 4984: (256-277): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (256-277): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol
index efb0135e97..c43aba43c5 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_mul.sol
@@ -13,4 +13,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (87-92): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\n\nx = 100\n = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 4984: (87-92): CHC: Overflow (resulting value larger than 255) happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol
index c90c32bee0..3dd28c7ad6 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_mul_cex_with_array.sol
@@ -11,3 +11,4 @@ contract C {
 // ----
 // Warning 4984: (111-114): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 6368: (106-115): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol
index d0cadffacd..16e7d0a209 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_mul_signed.sol
@@ -13,4 +13,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (136-143): CHC: Overflow (resulting value larger than 127) happens here.\nCounterexample:\n\nx = 100\n = 0\ny = (- 56)\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 4984: (136-143): CHC: Overflow (resulting value larger than 127) happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol
index 6d4275dbf6..100c4bfc07 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_sum.sol
@@ -15,4 +15,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (185-192): CHC: Overflow (resulting value larger than 255) happens here.\nCounterexample:\n\nx = 255\n = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 4984: (185-192): CHC: Overflow (resulting value larger than 255) happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/overflow_sum_signed.sol b/test/libsolidity/smtCheckerTests/overflow/overflow_sum_signed.sol
index 97ee103b4e..b26189f508 100644
--- a/test/libsolidity/smtCheckerTests/overflow/overflow_sum_signed.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/overflow_sum_signed.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
index a26795e538..65bf721dcb 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sub_overflow.sol
@@ -8,4 +8,5 @@ contract C  {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.\nCounterexample:\n\nx = 0\ny = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, (- 57896044618658097711785492504343953926634992332820282019728792003956564819968))
+// Warning 4984: (96-101): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
index 9c89abbe90..7704e2d7e0 100644
--- a/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/signed_guard_sum_overflow.sol
@@ -10,3 +10,4 @@ contract C  {
 // ----
 // Warning 3944: (78-83): CHC: Underflow (resulting value less than -2**255) happens here.
 // Warning 4984: (78-83): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/underflow_sub.sol b/test/libsolidity/smtCheckerTests/overflow/underflow_sub.sol
index 29dd159753..aadeff5331 100644
--- a/test/libsolidity/smtCheckerTests/overflow/underflow_sub.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/underflow_sub.sol
@@ -13,3 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/underflow_sub_signed.sol b/test/libsolidity/smtCheckerTests/overflow/underflow_sub_signed.sol
index 295e328498..c62198109e 100644
--- a/test/libsolidity/smtCheckerTests/overflow/underflow_sub_signed.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/underflow_sub_signed.sol
@@ -17,3 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sub_overflow.sol b/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sub_overflow.sol
index 6a96ab6b26..afc0c26827 100644
--- a/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sub_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/overflow/unsigned_guard_sub_overflow.sol
@@ -7,3 +7,4 @@ contract C  {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol b/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol
index 46ff93166e..25bd93f5b3 100644
--- a/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol
+++ b/test/libsolidity/smtCheckerTests/special/abi_decode_memory_v2_value_types.sol
@@ -12,3 +12,4 @@ contract C {
 // ----
 // Warning 2072: (91-98): Unused local variable.
 // Warning 2072: (146-153): Unused local variable.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol b/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
index eea3366093..5767283652 100644
--- a/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
+++ b/test/libsolidity/smtCheckerTests/special/abi_decode_simple.sol
@@ -13,4 +13,5 @@ contract C {
 // Warning 2072: (82-86): Unused local variable.
 // Warning 2072: (140-150): Unused local variable.
 // Warning 2072: (152-156): Unused local variable.
-// Warning 6328: (220-236): CHC: Assertion violation happens here.\nCounterexample:\n\na1 = 2437\nb1 = 0x0b\nc1 = 10\na2 = 2437\nb2 = 0x0b\nc2 = 10\n\nTransaction trace:\nC.constructor()\nC.f(data)
+// Warning 6328: (220-236): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol b/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
index 273590f65a..6d367b5c6d 100644
--- a/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/block_vars_bmc_internal.sol
@@ -43,3 +43,4 @@ contract C {
 // Warning 4661: (752-781): BMC: Assertion violation happens here.
 // Warning 4661: (809-839): BMC: Assertion violation happens here.
 // Warning 4661: (867-903): BMC: Assertion violation happens here.
+// Info 6002: BMC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
index 3e06779a0f..71e21aa4be 100644
--- a/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/block_vars_chc_internal.sol
@@ -40,3 +40,4 @@ contract C {
 // Warning 8417: (155-171): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 8417: (641-657): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 6328: (932-961): CHC: Assertion violation happens here.
+// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/blockhash.sol b/test/libsolidity/smtCheckerTests/special/blockhash.sol
index 2a7cc39faa..6543237011 100644
--- a/test/libsolidity/smtCheckerTests/special/blockhash.sol
+++ b/test/libsolidity/smtCheckerTests/special/blockhash.sol
@@ -13,3 +13,4 @@ contract C
 // ----
 // Warning 6328: (52-76): CHC: Assertion violation happens here.
 // Warning 6328: (80-104): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/chainid.sol b/test/libsolidity/smtCheckerTests/special/chainid.sol
index d2fd59f10c..3cb4003dfc 100644
--- a/test/libsolidity/smtCheckerTests/special/chainid.sol
+++ b/test/libsolidity/smtCheckerTests/special/chainid.sol
@@ -6,3 +6,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/ether_units.sol b/test/libsolidity/smtCheckerTests/special/ether_units.sol
index 40242e50da..9c0e8ea71f 100644
--- a/test/libsolidity/smtCheckerTests/special/ether_units.sol
+++ b/test/libsolidity/smtCheckerTests/special/ether_units.sol
@@ -11,6 +11,7 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (89-130): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (170-201): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (243-276): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
+// Warning 6328: (89-130): CHC: Assertion violation happens here.
+// Warning 6328: (170-201): CHC: Assertion violation happens here.
+// Warning 6328: (243-276): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/event.sol b/test/libsolidity/smtCheckerTests/special/event.sol
index 2788eeecdc..a5ddafc58d 100644
--- a/test/libsolidity/smtCheckerTests/special/event.sol
+++ b/test/libsolidity/smtCheckerTests/special/event.sol
@@ -27,4 +27,5 @@ contract C {
 // ----
 // Warning 6321: (247-251): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
 // Warning 6321: (397-401): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (407-416): CHC: Assertion violation happens here.\nCounterexample:\nx = false\n\nTransaction trace:\nC.constructor()\nState: x = true\nC.h()\n    C.h_data() -- internal call\n    C.h_data() -- internal call
+// Warning 6328: (407-416): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/gasleft.sol b/test/libsolidity/smtCheckerTests/special/gasleft.sol
index 416c2668e0..29b8e0dc07 100644
--- a/test/libsolidity/smtCheckerTests/special/gasleft.sol
+++ b/test/libsolidity/smtCheckerTests/special/gasleft.sol
@@ -10,5 +10,6 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (43-64): CHC: Assertion violation happens here.\nCounterexample:\n\ng = 0\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (90-111): CHC: Assertion violation happens here.\nCounterexample:\n\ng = 0\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (43-64): CHC: Assertion violation happens here.
+// Warning 6328: (90-111): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_data.sol b/test/libsolidity/smtCheckerTests/special/msg_data.sol
index 90022508f2..37552a2b91 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_data.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_data.sol
@@ -25,3 +25,4 @@ contract C
 // ----
 // Warning 6328: (120-147): CHC: Assertion violation happens here.
 // Warning 6328: (467-494): CHC: Assertion violation happens here.
+// Info 1391: CHC: 16 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_1.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_1.sol
index 743f663e63..af6d79021e 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_sender_1.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_2.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_2.sol
index 96075e68a8..71cb0e1235 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_2.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_sender_2.sol
@@ -10,3 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_3.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_3.sol
index d531ee6ef2..4ca48fb4c7 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_3.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_sender_3.sol
@@ -20,3 +20,4 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol
index ecfc53e981..e285f97d91 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_sender_fail_1.sol
@@ -12,3 +12,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (122-145): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sender_range.sol b/test/libsolidity/smtCheckerTests/special/msg_sender_range.sol
index e33843e640..f78200cd3b 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_sender_range.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_sender_range.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_sig.sol b/test/libsolidity/smtCheckerTests/special/msg_sig.sol
index cf701f6d0a..45fa054364 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_sig.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_sig.sol
@@ -25,6 +25,7 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (43-72): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.sig: 0x26121ff0 }
-// Warning 6328: (370-399): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.sig: 0x26121ff0 }\n    C.fi() -- internal call\n    C.gi() -- internal call
-// Warning 6328: (510-539): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h(){ msg.sig: 0xb8c9d365 }
+// Warning 6328: (43-72): CHC: Assertion violation happens here.
+// Warning 6328: (370-399): CHC: Assertion violation happens here.
+// Warning 6328: (510-539): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_1.sol b/test/libsolidity/smtCheckerTests/special/msg_value_1.sol
index 51e696f56a..3f8b50ba0f 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_1.sol
@@ -6,5 +6,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (55-68): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.value: 115792089237316195423570985008687907853269984665640564039457584007913129639931 }
-// Warning 4984: (55-80): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(){ msg.value: 57896044618658097711785492504343953926634992332820282019728792003956564819966 }
+// Warning 4984: (55-68): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4984: (55-80): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_3.sol b/test/libsolidity/smtCheckerTests/special/msg_value_3.sol
index 79302b1429..4035dffaa8 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_3.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_3.sol
@@ -13,4 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\nlock\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_4.sol b/test/libsolidity/smtCheckerTests/special/msg_value_4.sol
index 82edb4a393..cab8c0aa58 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_4.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_4.sol
@@ -13,4 +13,5 @@ contract B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (154-176): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nB.constructor(){ msg.value: 39 }
+// Warning 6328: (154-176): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol
index 8b69352c2e..07a2bb35bf 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_1.sol
@@ -14,4 +14,5 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (68-82): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nA.constructor(){ msg.value: 1 }
+// Warning 6328: (68-82): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol
index 10b8ef0c2a..942607bd8a 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_2.sol
@@ -14,5 +14,6 @@ contract C is A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (60-74): CHC: Assertion violation happens here.\nCounterexample:\nv = 0, x = 1\n\nTransaction trace:\nC.constructor(){ msg.value: 1 }
-// Warning 6328: (240-254): CHC: Assertion violation happens here.\nCounterexample:\nv = 1, x = 1\n\nTransaction trace:\nC.constructor(){ msg.value: 1 }
+// Warning 6328: (60-74): CHC: Assertion violation happens here.
+// Warning 6328: (240-254): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
index 4e1d2a99f5..b2f083e025 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
@@ -19,4 +19,5 @@ contract C is A, B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (60-74): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n\nTransaction trace:\nC.constructor(){ msg.value: 1 }
+// Warning 6328: (60-74): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol b/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol
index 100284dd7c..f96f588019 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_vars_bmc_internal.sol
@@ -30,3 +30,4 @@ contract C {
 // Warning 4661: (460-488): BMC: Assertion violation happens here.
 // Warning 4661: (516-538): BMC: Assertion violation happens here.
 // Warning 4661: (566-592): BMC: Assertion violation happens here.
+// Info 6002: BMC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
index 475cc2291e..2a39b5de45 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_vars_chc_internal.sol
@@ -29,4 +29,5 @@ contract C {
 // ====
 // SMTEngine: chc
 // ----
-// Warning 6328: (645-668): CHC: Assertion violation happens here.\nCounterexample:\ndata = [0x26, 0x12, 0x1f, 0xf0], sender = 0x0, sig = 0x26121ff0, value = 42\n\nTransaction trace:\nC.constructor()\nState: data = [], sender = 0x0, sig = 0x0, value = 0\nC.f(){ msg.data: [0x26, 0x12, 0x1f, 0xf0], msg.sender: 0x0, msg.sig: 0x26121ff0, msg.value: 42 }\n    C.g() -- internal call
+// Warning 6328: (645-668): CHC: Assertion violation happens here.
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/prevrandao.sol b/test/libsolidity/smtCheckerTests/special/prevrandao.sol
index 0237c75505..4bc818ba16 100644
--- a/test/libsolidity/smtCheckerTests/special/prevrandao.sol
+++ b/test/libsolidity/smtCheckerTests/special/prevrandao.sol
@@ -14,3 +14,4 @@ contract C
 // Warning 8417: (179-195): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 6328: (58-96): CHC: Assertion violation happens here.
 // Warning 6328: (115-153): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/range_check.sol b/test/libsolidity/smtCheckerTests/special/range_check.sol
index 62187f46a6..210aed4dae 100644
--- a/test/libsolidity/smtCheckerTests/special/range_check.sol
+++ b/test/libsolidity/smtCheckerTests/special/range_check.sol
@@ -63,3 +63,4 @@ contract D {
 // Warning 8417: (598-614): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 8417: (1447-1463): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 8417: (1481-1497): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Info 1391: CHC: 44 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/shadowing_1.sol b/test/libsolidity/smtCheckerTests/special/shadowing_1.sol
index d545483141..27fb60bad3 100644
--- a/test/libsolidity/smtCheckerTests/special/shadowing_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/shadowing_1.sol
@@ -22,3 +22,4 @@ contract C {
 // Warning 2319: (149-160): This declaration shadows a builtin symbol.
 // Warning 2319: (189-203): This declaration shadows a builtin symbol.
 // Warning 6328: (274-297): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/this_state.sol b/test/libsolidity/smtCheckerTests/special/this_state.sol
index 1218746065..703488db7f 100644
--- a/test/libsolidity/smtCheckerTests/special/this_state.sol
+++ b/test/libsolidity/smtCheckerTests/special/this_state.sol
@@ -10,3 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/time_units.sol b/test/libsolidity/smtCheckerTests/special/time_units.sol
index 2462f93127..922fb40207 100644
--- a/test/libsolidity/smtCheckerTests/special/time_units.sol
+++ b/test/libsolidity/smtCheckerTests/special/time_units.sol
@@ -15,8 +15,9 @@ contract D {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (69-91): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (131-163): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (201-231): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (265-291): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
-// Warning 6328: (325-352): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nD.constructor()\nD.f()
+// Warning 6328: (69-91): CHC: Assertion violation happens here.
+// Warning 6328: (131-163): CHC: Assertion violation happens here.
+// Warning 6328: (201-231): CHC: Assertion violation happens here.
+// Warning 6328: (265-291): CHC: Assertion violation happens here.
+// Warning 6328: (325-352): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/timestamp.sol b/test/libsolidity/smtCheckerTests/special/timestamp.sol
index 09c04fb435..31bd09694c 100644
--- a/test/libsolidity/smtCheckerTests/special/timestamp.sol
+++ b/test/libsolidity/smtCheckerTests/special/timestamp.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/timestamp_2.sol b/test/libsolidity/smtCheckerTests/special/timestamp_2.sol
index 7173185da8..c9520840b8 100644
--- a/test/libsolidity/smtCheckerTests/special/timestamp_2.sol
+++ b/test/libsolidity/smtCheckerTests/special/timestamp_2.sol
@@ -9,4 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (107-126): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.\nCounterexample:\nx = 115792089237316195423570985008687907853269984665640564039457584007913129639935\n\nTransaction trace:\nC.constructor(){ block.timestamp: 115792089237316195423570985008687907853269984665640564039457584007913129639935 }
+// Warning 4984: (107-126): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol b/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol
index 3f8c4c1622..a30f25b7f7 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_data_gasleft_changes.sol
@@ -20,3 +20,4 @@ contract C {
 // ----
 // Warning 6328: (91-117): CHC: Assertion violation happens here.
 // Warning 6328: (186-212): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol b/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol
index c15dfb1cfe..c66ce56539 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_data_immutable.sol
@@ -67,3 +67,4 @@ contract C {
 // Warning 8417: (293-309): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 8417: (645-661): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
 // Warning 8417: (1127-1143): Since the VM version paris, "difficulty" was replaced by "prevrandao", which now returns a random number based on the beacon chain.
+// Info 1391: CHC: 26 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol
index 137864a337..03db677c08 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_bmc_internal.sol
@@ -20,3 +20,4 @@ contract C {
 // ----
 // Warning 4661: (233-259): BMC: Assertion violation happens here.
 // Warning 4661: (287-314): BMC: Assertion violation happens here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol b/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
index 6e876daf30..6aa6640305 100644
--- a/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
+++ b/test/libsolidity/smtCheckerTests/special/tx_vars_chc_internal.sol
@@ -21,4 +21,5 @@ contract C {
 // SMTEngine: chc
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (343-377): CHC: Assertion violation happens here.\nCounterexample:\ngas = 0, origin = 0x0\n\nTransaction trace:\nC.constructor()\nState: gas = 0, origin = 0x0\nC.f(){ tx.gasprice: 0, tx.origin: 0x0 }\n    C.g() -- internal call
+// Warning 6328: (343-377): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_1.sol b/test/libsolidity/smtCheckerTests/try_catch/try_1.sol
index 02a1273e43..b1500256c4 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_1.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_1.sol
@@ -20,4 +20,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 5667: (163-177): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (221-236): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\nsuccess = false\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (221-236): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_2.sol
index f2ea2e5554..724d7b74ec 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_2.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_2.sol
@@ -18,3 +18,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 5667: (155-169): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_3.sol b/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
index 4244f50967..77e53f8608 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
@@ -23,4 +23,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 5667: (259-273): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (280-294): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\ns = []\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()\n    C.postinc() -- internal call
+// Warning 6328: (280-294): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_4.sol b/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
index 289f3943d7..9090e71f2c 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_4.sol
@@ -26,4 +26,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (320-334): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 1)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n<errorCode> = 2 -> Assertion failed at assert(x == 1)\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_5.sol b/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
index 236a26f1bd..163a879d88 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_5.sol
@@ -25,5 +25,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (315-329): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 2)\n((!(x' >= 100) || ((x' + ((- 1) * x)) = 0)) && !(<errorCode> = 1))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x < 100)\n<errorCode> = 2 -> Assertion failed at assert(x == 0)\n<errorCode> = 3 -> Assertion failed at assert(x == 1)\n
+// Warning 6328: (315-329): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol
index 769a618732..4605aee863 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses.sol
@@ -23,4 +23,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (415-430): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\nsuccess = false\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (415-430): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol
index d11d3a8a68..b7b5de6417 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_catch_clauses_2.sol
@@ -22,3 +22,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (306-320): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
index abef4c76a4..a53f0c13fe 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values.sol
@@ -22,7 +22,7 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 2519: (164-170): This declaration shadows an existing declaration.
-// Warning 6328: (185-199): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\nx = 1\nc = false\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()\n    d.d() -- untrusted external call
-// Warning 6328: (273-283): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\nx = 1\nc = true\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()\n    d.d() -- untrusted external call
-// Warning 6328: (393-407): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, d = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0, d = 0\nC.f()
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> = 3)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 0)\n<errorCode> = 2 -> Assertion failed at assert(!c)\n<errorCode> = 3 -> Assertion failed at assert(x == 0)\n<errorCode> = 4 -> Assertion failed at assert(x == 1)\n
+// Warning 6328: (185-199): CHC: Assertion violation happens here.
+// Warning 6328: (273-283): CHC: Assertion violation happens here.
+// Warning 6328: (393-407): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol
index d6b62ea995..ccbd444232 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_multiple_returned_values_with_tuple.sol
@@ -24,4 +24,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (321-336): CHC: Assertion violation happens here.\nCounterexample:\n\nsuccess = false\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (321-336): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol b/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol
index dfbfb978a4..2407d893fb 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_nested_1.sol
@@ -21,3 +21,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (280-295): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol b/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
index 5c15fb54fa..e1935cf97e 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_nested_2.sol
@@ -22,3 +22,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (342-362): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol b/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol
index bbb65a2365..7ce761a802 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_nested_3.sol
@@ -20,4 +20,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (323-343): CHC: Assertion violation happens here.\nCounterexample:\n\nchoice = 1\n\nTransaction trace:\nC.constructor()\nC.f()\n    C.g() -- trusted external call
+// Warning 6328: (323-343): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol b/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol
index 281a748393..23c2a7b6c2 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_public_var.sol
@@ -12,4 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (139-152): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
+// Warning 6328: (139-152): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
index 43f4b5f03f..ae38765c4c 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_public_var_mapping.sol
@@ -21,4 +21,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (280-300): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (280-300): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_bytes_array.sol b/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_bytes_array.sol
index c557b08a0e..93f1a347dd 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_bytes_array.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_bytes_array.sol
@@ -16,3 +16,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_fixed_bytes.sol b/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_fixed_bytes.sol
index b56aa85624..e84b0f6a43 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_fixed_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_string_literal_to_fixed_bytes.sol
@@ -17,3 +17,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (218-262): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/address_literal.sol b/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
index 40540bb511..5189b45e9f 100644
--- a/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/address_literal.sol
@@ -22,5 +22,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (454-468): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0\na = 0x0\nb = 0x01\nc = 0x0\nd = 0x0\ne = 0x12345678\n\nTransaction trace:\nC.constructor()\nState: x = 0x0\nC.g()
-// Info 1180: Contract invariant(s) for :C:\n(x <= 0)\n
+// Warning 6328: (454-468): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
index ffd6304c98..bc3d92b418 100644
--- a/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/bytes_to_fixed_bytes_1.sol
@@ -15,3 +15,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_address_1.sol b/test/libsolidity/smtCheckerTests/typecast/cast_address_1.sol
index c29df89899..c106dfc1f2 100644
--- a/test/libsolidity/smtCheckerTests/typecast/cast_address_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/cast_address_1.sol
@@ -8,3 +8,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_different_size_1.sol b/test/libsolidity/smtCheckerTests/typecast/cast_different_size_1.sol
index 618704dd49..2e0d633264 100644
--- a/test/libsolidity/smtCheckerTests/typecast/cast_different_size_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/cast_different_size_1.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_larger_1.sol b/test/libsolidity/smtCheckerTests/typecast/cast_larger_1.sol
index c73372f3af..05383eb3c1 100644
--- a/test/libsolidity/smtCheckerTests/typecast/cast_larger_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/cast_larger_1.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_larger_2.sol b/test/libsolidity/smtCheckerTests/typecast/cast_larger_2.sol
index 5c2fb759ac..a608372d27 100644
--- a/test/libsolidity/smtCheckerTests/typecast/cast_larger_2.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/cast_larger_2.sol
@@ -10,3 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol b/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol
index 3a14cbb24b..fca18d824a 100644
--- a/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/cast_larger_3.sol
@@ -12,4 +12,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (240-254): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x1234\nb = 0x12340000\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (240-254): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_1.sol b/test/libsolidity/smtCheckerTests/typecast/cast_smaller_1.sol
index c1c955417f..05c8756d48 100644
--- a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/cast_smaller_1.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_2.sol b/test/libsolidity/smtCheckerTests/typecast/cast_smaller_2.sol
index 81f42f9e21..66782a49da 100644
--- a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_2.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/cast_smaller_2.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_3.sol b/test/libsolidity/smtCheckerTests/typecast/cast_smaller_3.sol
index 48eab01021..c524f21bfc 100644
--- a/test/libsolidity/smtCheckerTests/typecast/cast_smaller_3.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/cast_smaller_3.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/downcast.sol b/test/libsolidity/smtCheckerTests/typecast/downcast.sol
index a2fe8b6c8c..bba3585f26 100644
--- a/test/libsolidity/smtCheckerTests/typecast/downcast.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/downcast.sol
@@ -46,3 +46,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 20 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/enum_from_uint.sol b/test/libsolidity/smtCheckerTests/typecast/enum_from_uint.sol
index 8d2fd6310a..c051db0176 100644
--- a/test/libsolidity/smtCheckerTests/typecast/enum_from_uint.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/enum_from_uint.sol
@@ -10,3 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/enum_to_uint_max_value.sol b/test/libsolidity/smtCheckerTests/typecast/enum_to_uint_max_value.sol
index a382a786d0..e65cf683ff 100644
--- a/test/libsolidity/smtCheckerTests/typecast/enum_to_uint_max_value.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/enum_to_uint_max_value.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol b/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol
index 093a20d7fb..b98c518a64 100644
--- a/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/implicit_cast_string_literal_byte.sol
@@ -13,4 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (153-174): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\nb = 0x0\n\nTransaction trace:\nC.constructor()\nC.f()\n    C.g(0x0) -- internal call
+// Warning 6328: (153-174): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/number_literal.sol b/test/libsolidity/smtCheckerTests/typecast/number_literal.sol
index 7a0d9d4678..af7da87d2c 100644
--- a/test/libsolidity/smtCheckerTests/typecast/number_literal.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/number_literal.sol
@@ -30,3 +30,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/same_size.sol b/test/libsolidity/smtCheckerTests/typecast/same_size.sol
index 03fff063d2..b55e26064a 100644
--- a/test/libsolidity/smtCheckerTests/typecast/same_size.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/same_size.sol
@@ -71,3 +71,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 27 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_dynamic_bytes.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_dynamic_bytes.sol
index db54c9035d..d4e7615ee9 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_dynamic_bytes.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_dynamic_bytes.sol
@@ -9,4 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (173-207): CHC: Assertion violation happens here.\nCounterexample:\n\nb = [0xff, 0xff]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (173-207): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_constant_initialization_2.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_constant_initialization_2.sol
index 189e4626b3..013f815542 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_constant_initialization_2.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_constant_initialization_2.sol
@@ -8,3 +8,4 @@ contract MockContract {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol
index c3fda61b84..fb98c5061f 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_modifier.sol
@@ -9,4 +9,5 @@ contract B {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (120-142): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x30313233343536\n\nTransaction trace:\nB.constructor()\nB.f()
+// Warning 6328: (120-142): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol
index 56ef16374e..ecdc253e33 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (206-227): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.a()\n    C.f1() -- internal call\n        C.g() -- internal call\n    C.f1() -- internal call\n        C.g() -- internal call
+// Warning 6328: (206-227): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol
index e443beb43d..4ba6ba2ed5 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_return_multi.sol
@@ -13,4 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (410-429): CHC: Assertion violation happens here.\nCounterexample:\n\nv1 = 0x6162630000000000000000000000000000000000000000000000000000000000\nv2 = 0x646566\n\nTransaction trace:\nC.constructor()\nC.a()\n    C.f2() -- internal call\n        C.h() -- internal call
+// Warning 6328: (410-429): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_upcast.sol b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_upcast.sol
index 340e835a49..be1af11c9b 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_upcast.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_literal_to_fixed_bytes_upcast.sol
@@ -7,4 +7,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (43-93): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (43-93): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
index 33546b49c0..01027e2b8d 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_1.sol
@@ -11,4 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (132-160): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nState: x = []\nC.s()
+// Warning 6328: (132-160): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol
index b3092f04c4..827c6e11a6 100644
--- a/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/string_to_bytes_push_2.sol
@@ -13,3 +13,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (140-168): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/upcast.sol b/test/libsolidity/smtCheckerTests/typecast/upcast.sol
index 45c0221533..db9e90dfd7 100644
--- a/test/libsolidity/smtCheckerTests/typecast/upcast.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/upcast.sol
@@ -67,3 +67,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 23 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/address_call.sol b/test/libsolidity/smtCheckerTests/types/address_call.sol
index 8ea3894827..063909f873 100644
--- a/test/libsolidity/smtCheckerTests/types/address_call.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_call.sol
@@ -25,3 +25,4 @@ contract C
 // Warning 2072: (127-166): Unused local variable.
 // Warning 2072: (191-207): Unused local variable.
 // Warning 6328: (227-242): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/address_staticcall.sol b/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
index 9d00904ad7..3479a38bb3 100644
--- a/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_staticcall.sol
@@ -22,4 +22,4 @@ contract C
 // Warning 2072: (127-166): Unused local variable.
 // Warning 2072: (191-207): Unused local variable.
 // Warning 6328: (233-248): CHC: Assertion violation happens here.
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> >= 2)\n!(<errorCode> >= 3)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(success)\n<errorCode> = 2 -> Assertion failed at assert(x == 0)\n<errorCode> = 3 -> Assertion failed at assert(map[0] == 0)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol b/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol
index 928ac1e8e3..02d20c4f5b 100644
--- a/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/address_transfer_3.sol
@@ -13,3 +13,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol
index 4e315f6efc..07f0c9c1f5 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_1.sol
@@ -51,3 +51,4 @@ contract C
 // Warning 6368: (730-742): CHC: Out of bounds access happens here.
 // Warning 6328: (692-749): CHC: Assertion violation happens here.
 // Warning 6368: (850-854): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol
index 7eccaf68f9..e90d4fbf8c 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_2.sol
@@ -31,3 +31,4 @@ contract C
 // Warning 6368: (584-588): CHC: Out of bounds access happens here.
 // Warning 6328: (577-594): CHC: Assertion violation happens here.
 // Warning 6368: (605-609): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol
index 7e89f1c9d0..c230745663 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_memory_3.sol
@@ -28,4 +28,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!(array.length <= 0)\n
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_1.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_1.sol
index 3f1b6cdd43..199ccbc160 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_1.sol
@@ -53,3 +53,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 2018: (957-1329): Function state mutability can be restricted to view
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol
index 48d1f81301..b9e726d97e 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_2.sol
@@ -35,3 +35,4 @@ contract C
 // Warning 6368: (659-663): CHC: Out of bounds access happens here.
 // Warning 6328: (652-669): CHC: Assertion violation happens here.
 // Warning 6368: (741-745): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
index f74fad8af1..3d8dbc0565 100644
--- a/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_aliasing_storage_3.sol
@@ -39,3 +39,4 @@ contract C
 // Warning 6368: (955-959): CHC: Out of bounds access happens here.
 // Warning 6328: (948-965): CHC: Assertion violation happens here.
 // Warning 6368: (976-980): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
index b04c632e91..43b6cc0d41 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branch_1d.sol
@@ -13,3 +13,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (143-159): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
index fad9d2bbac..8ba3f01370 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branch_3d.sol
@@ -22,5 +22,5 @@ contract C
 // Warning 6368: (152-162): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-184): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-187): CHC: Out of bounds access might happen here.
-// Warning 6328: (170-192): CHC: Assertion violation happens here.\nCounterexample:\nc = [[[0]]]\nb = false\n\nTransaction trace:\nC.constructor()\nState: c = [[[0]]]\nC.f(false)
-// Info 1180: Contract invariant(s) for :C:\n!(c.length <= 0)\n
+// Warning 6328: (170-192): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_1d.sol b/test/libsolidity/smtCheckerTests/types/array_branches_1d.sol
index 748409ba2f..61abb418d6 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_1d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_1d.sol
@@ -13,3 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_2d.sol b/test/libsolidity/smtCheckerTests/types/array_branches_2d.sol
index 95a6904a53..f4743dcc56 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_2d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_2d.sol
@@ -18,3 +18,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
index b2fd913278..ecd419eea6 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_3d.sol
@@ -22,4 +22,4 @@ contract C
 // Warning 6368: (152-162): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-184): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-187): CHC: Out of bounds access might happen here.
-// Info 1180: Contract invariant(s) for :C:\n!(c.length <= 0)\n
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol b/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
index 689fc045d9..acd5744726 100644
--- a/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_branches_3d_show_unproved.sol
@@ -23,4 +23,4 @@ contract C
 // Warning 6368: (152-162): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-184): CHC: Out of bounds access might happen here.
 // Warning 6368: (177-187): CHC: Out of bounds access might happen here.
-// Info 1180: Contract invariant(s) for :C:\n!(c.length <= 0)\n
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_1.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_1.sol
index 7f3667ec46..2aba2bbeb0 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_1.sol
@@ -17,3 +17,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol
index 8c243d4ae6..bc512b5574 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_1_fail.sol
@@ -12,4 +12,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (172-194): CHC: Assertion violation happens here.\nCounterexample:\narray = [200]\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.p()\nState: array = [0]\nC.f(0, 0)
+// Warning 6328: (172-194): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol
index de8cc2066f..5e421cf499 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_2.sol
@@ -10,5 +10,6 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6368: (98-106): CHC: Out of bounds access happens here.\nCounterexample:\narray = []\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.f(0, 0, 0, 0)
-// Warning 6368: (98-109): CHC: Out of bounds access happens here.\nCounterexample:\narray = []\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = []\nC.f(0, 0, 0, 0)
+// Warning 6368: (98-106): CHC: Out of bounds access happens here.
+// Warning 6368: (98-109): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
index fc53eb69b2..fa55bd7f77 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_2_fail.sol
@@ -16,3 +16,4 @@ contract C
 // SMTEngine: all
 // ----
 // Warning 6328: (245-270): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_3.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_3.sol
index f03c98f0f0..ae90faa4eb 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_3.sol
@@ -13,3 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
index a98511ed18..76732c1413 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_3_fail.sol
@@ -17,3 +17,4 @@ contract C
 // SMTEngine: all
 // ----
 // Warning 6328: (318-346): CHC: Assertion violation happens here.
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1.sol
index 4873f840d2..7387e8125d 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1.sol
@@ -10,3 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol b/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol
index 6ca6fc67aa..004bab44d8 100644
--- a/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_dynamic_parameter_1_fail.sol
@@ -12,3 +12,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (144-166): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_1.sol b/test/libsolidity/smtCheckerTests/types/array_literal_1.sol
index 49f65c06d4..79a1d08ab3 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_1.sol
@@ -10,3 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_2.sol b/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
index 0062594d8a..1136a9d1f3 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
@@ -11,4 +11,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (167-187): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (167-187): CHC: Assertion violation happens here.
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_3.sol b/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
index 3152f0e1e9..52baec977d 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
@@ -11,3 +11,4 @@ contract C
 // SMTEngine: all
 // ----
 // Warning 6328: (168-188): CHC: Assertion violation happens here.
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_4.sol b/test/libsolidity/smtCheckerTests/types/array_literal_4.sol
index bf2f66ccdf..1c95ea98ea 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_4.sol
@@ -11,3 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_5.sol b/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
index f152e2cb17..7c4c9d3d9a 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
@@ -13,4 +13,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (176-196): CHC: Assertion violation happens here.\nCounterexample:\ns = [1, 2, 3]\na = [1, 2, 3]\n\nTransaction trace:\nC.constructor()\nState: s = []\nC.f()
+// Warning 6328: (176-196): CHC: Assertion violation happens here.
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_6.sol b/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
index 0ce378e424..e612b08a28 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
@@ -14,5 +14,6 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (146-174): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4, 3]\nc = [1, 2, 4, 3]\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (235-255): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4, 3]\nc = [1, 2, 4, 3]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (146-174): CHC: Assertion violation happens here.
+// Warning 6328: (235-255): CHC: Assertion violation happens here.
+// Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_7.sol b/test/libsolidity/smtCheckerTests/types/array_literal_7.sol
index 6a0c13e92a..21e345023d 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_7.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_7.sol
@@ -22,3 +22,4 @@ contract C
 // ----
 // Warning 6328: (226-254): CHC: Assertion violation happens here.
 // Warning 6328: (315-335): CHC: Assertion violation happens here.
+// Info 1391: CHC: 13 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol
index 65f629cb2b..3f9c89734f 100644
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_1.sol
@@ -38,3 +38,4 @@ contract C
 // ----
 // Warning 6368: (706-720): CHC: Out of bounds access happens here.
 // Warning 6328: (699-730): CHC: Assertion violation happens here.
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
index cd1d77d8df..a2fc893b5d 100644
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
@@ -45,3 +45,4 @@ contract C
 // Warning 6368: (850-869): CHC: Out of bounds access happens here.
 // Warning 6328: (936-956): CHC: Assertion violation happens here.
 // Warning 6368: (1029-1043): CHC: Out of bounds access might happen here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_1.sol b/test/libsolidity/smtCheckerTests/types/array_static_1.sol
index ce84a1e72a..3d33caa490 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_1.sol
@@ -11,3 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol b/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol
index 616c19c21c..0ab524c758 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_1_fail.sol
@@ -11,4 +11,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (135-157): CHC: Assertion violation happens here.\nCounterexample:\narray = [200, 0, 0, 0, 0, 0, 0, 0, 0, 0]\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: array = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]\nC.f(0, 0)
+// Warning 6328: (135-157): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_2.sol b/test/libsolidity/smtCheckerTests/types/array_static_2.sol
index 7aaca71fdb..c90d4a299a 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_2.sol
@@ -12,3 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol b/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol
index c48f45e119..e0146c85f8 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_2_fail.sol
@@ -12,4 +12,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (214-239): CHC: Assertion violation happens here.\nCounterexample:\narray = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]\nx = 0\ny = 0\nz = 0\nt = 0\n\nTransaction trace:\nC.constructor()\nState: array = [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]\nC.f(0, 0, 0, 0)
+// Warning 6328: (214-239): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_3.sol b/test/libsolidity/smtCheckerTests/types/array_static_3.sol
index 54f13b1f8e..a1ca13a801 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_3.sol
@@ -13,3 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol b/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol
index c7773a9b49..b299de21c6 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_3_fail.sol
@@ -13,4 +13,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (268-296): CHC: Assertion violation happens here.\nCounterexample:\narray = [[[200, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]]\nx = 0\ny = 0\nz = 0\nt = 0\nw = 0\nv = 0\n\nTransaction trace:\nC.constructor()\nState: array = [[[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]], [[0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [0, 0, 0, 0, 0, 0, 0, 0, 0, 0]]]\nC.f(0, 0, 0, 0, 0, 0)
+// Warning 6328: (268-296): CHC: Assertion violation happens here.
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol b/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
index 16bb147c99..8e6d23ab6c 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_aliasing_memory_5.sol
@@ -16,4 +16,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (385-402): CHC: Assertion violation happens here.\nCounterexample:\n\na = [2440, 11]\nb = [1, 8]\nc = [15, 15]\n\nTransaction trace:\nC.constructor()\nC.f([2, 13], [0, 8], [42, 12])
+// Warning 6328: (385-402): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_storage_5.sol b/test/libsolidity/smtCheckerTests/types/array_static_aliasing_storage_5.sol
index 4592e9526d..7386307883 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_aliasing_storage_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_aliasing_storage_5.sol
@@ -24,3 +24,4 @@ contract C
 // SMTEngine: all
 // SMTIgnoreCex: yes
 // ----
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
index f415cfd955..7ee1acf47b 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_1.sol
@@ -28,4 +28,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (456-487): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n!(severalMaps3d.length <= 1)\n!(severalMaps8.length <= 1)\n
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
index ca1a580182..0b85a71b41 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
@@ -35,3 +35,4 @@ contract C
 // Warning 6328: (860-880): CHC: Assertion violation happens here.
 // Warning 6368: (936-952): CHC: Out of bounds access might happen here.
 // Warning 6368: (936-955): CHC: Out of bounds access might happen here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_1.sol b/test/libsolidity/smtCheckerTests/types/bool_int_mixed_1.sol
index cd9ba74722..2e75ad33de 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_int_mixed_1.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_2.sol b/test/libsolidity/smtCheckerTests/types/bool_int_mixed_2.sol
index 23f57dfe9a..ac6dd87eb0 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_int_mixed_2.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_3.sol b/test/libsolidity/smtCheckerTests/types/bool_int_mixed_3.sol
index 1e5f9b848b..7039ae1bf3 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_int_mixed_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_int_mixed_3.sol
@@ -21,3 +21,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_3.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_3.sol
index e9dbf9d95a..fdc08d441b 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_simple_3.sol
@@ -7,3 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_4.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_4.sol
index 58688c361a..cafb34c227 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_simple_4.sol
@@ -10,3 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_5.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_5.sol
index 791298852b..c19a5fa16b 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_simple_5.sol
@@ -7,3 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_6.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_6.sol
index 55da224c7c..eab6282f02 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_6.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_simple_6.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bytes_2.sol b/test/libsolidity/smtCheckerTests/types/bytes_2.sol
index a0ab43bbf8..5b27d56bfc 100644
--- a/test/libsolidity/smtCheckerTests/types/bytes_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/bytes_2.sol
@@ -13,3 +13,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (237-259): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol b/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol
index 6acec4beff..66fa8ae3e6 100644
--- a/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/bytes_2_fail.sol
@@ -11,3 +11,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (129-151): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bytes_length.sol b/test/libsolidity/smtCheckerTests/types/bytes_length.sol
index e965e9f31a..ea69bc3a44 100644
--- a/test/libsolidity/smtCheckerTests/types/bytes_length.sol
+++ b/test/libsolidity/smtCheckerTests/types/bytes_length.sol
@@ -11,3 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/contract_3.sol b/test/libsolidity/smtCheckerTests/types/contract_3.sol
index 8c3f93f510..657999c0b7 100644
--- a/test/libsolidity/smtCheckerTests/types/contract_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/contract_3.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/contract_address_conversion_2.sol b/test/libsolidity/smtCheckerTests/types/contract_address_conversion_2.sol
index c9b31c17de..0b395c1877 100644
--- a/test/libsolidity/smtCheckerTests/types/contract_address_conversion_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/contract_address_conversion_2.sol
@@ -10,3 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol b/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol
index edc35f8029..0d297354b1 100644
--- a/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol
+++ b/test/libsolidity/smtCheckerTests/types/enum_explicit_values.sol
@@ -11,4 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n((d = 0) || (d = 1))\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/enum_in_library.sol b/test/libsolidity/smtCheckerTests/types/enum_in_library.sol
index 5b927c8f92..57e6d7b435 100644
--- a/test/libsolidity/smtCheckerTests/types/enum_in_library.sol
+++ b/test/libsolidity/smtCheckerTests/types/enum_in_library.sol
@@ -14,3 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/enum_in_struct.sol b/test/libsolidity/smtCheckerTests/types/enum_in_struct.sol
index e7b2da7124..d46c120df2 100644
--- a/test/libsolidity/smtCheckerTests/types/enum_in_struct.sol
+++ b/test/libsolidity/smtCheckerTests/types/enum_in_struct.sol
@@ -12,3 +12,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/enum_range.sol b/test/libsolidity/smtCheckerTests/types/enum_range.sol
index acb93f873c..403743e08d 100644
--- a/test/libsolidity/smtCheckerTests/types/enum_range.sol
+++ b/test/libsolidity/smtCheckerTests/types/enum_range.sol
@@ -8,3 +8,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/enum_transitivity.sol b/test/libsolidity/smtCheckerTests/types/enum_transitivity.sol
index 35b31ff7ed..1f1811ea61 100644
--- a/test/libsolidity/smtCheckerTests/types/enum_transitivity.sol
+++ b/test/libsolidity/smtCheckerTests/types/enum_transitivity.sol
@@ -11,3 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol
index 187689b88f..c9ce9f14ff 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_2.sol
@@ -12,4 +12,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (83-97): CHC: Assertion violation happens here.\nCounterexample:\nx = 0x0\ny = 0x0\n\nTransaction trace:\nC.constructor()\nState: x = 0x0\nC.f(0x0)\n    C.g() -- internal call
+// Warning 6328: (83-97): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol
index 6a24c1e9c9..30d61718a5 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_1.sol
@@ -7,4 +7,4 @@ contract c {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :c:\n!(data2.length <= 5)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol
index 689db06c74..33ce3ca258 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_2.sol
@@ -11,3 +11,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 5667: (43-49): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
index 305c00a62f..d89f020aed 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
@@ -34,3 +34,4 @@ contract C {
 // ----
 // Warning 6368: (374-381): CHC: Out of bounds access might happen here.
 // Warning 6368: (456-462): CHC: Out of bounds access happens here.
+// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol
index ae3bbf9cec..b67017112d 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_4.sol
@@ -12,4 +12,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (231-252): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff\nz = 0x0\no = 0xff\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (231-252): CHC: Assertion violation happens here.
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol
index cb3cd1e0f6..122979feda 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_5.sol
@@ -11,6 +11,7 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (87-104): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0x01020304\nb = 0x02\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (138-155): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0x01020304\nb = 0x02\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (168-185): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0x01020304\nb = 0x02\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (87-104): CHC: Assertion violation happens here.
+// Warning 6328: (138-155): CHC: Assertion violation happens here.
+// Warning 6328: (168-185): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_6.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_6.sol
index ea4618af35..e506b9450b 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_6.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_6.sol
@@ -10,3 +10,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 18 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_range.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_range.sol
index 607d78dffd..b4168dc98e 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_range.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_range.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/function_type_arrays.sol b/test/libsolidity/smtCheckerTests/types/function_type_arrays.sol
index baa8a1de9d..1cc490d25f 100644
--- a/test/libsolidity/smtCheckerTests/types/function_type_arrays.sol
+++ b/test/libsolidity/smtCheckerTests/types/function_type_arrays.sol
@@ -13,3 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_1.sol
index ccbb465a34..c8d6c4ca71 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_1.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_2d_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_2d_1.sol
index 1ea1168a08..9bab80f2ce 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_2d_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_2d_1.sol
@@ -10,3 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_3.sol b/test/libsolidity/smtCheckerTests/types/mapping_3.sol
index 4467cf6378..654f0622b2 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_3.sol
@@ -11,3 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_3d_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_3d_1.sol
index baa4b00fde..824e47213d 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_3d_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_3d_1.sol
@@ -10,3 +10,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_4.sol b/test/libsolidity/smtCheckerTests/types/mapping_4.sol
index ba6688cd5f..cdaf3fece2 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_4.sol
@@ -10,4 +10,4 @@ contract C
 // SMTEngine: all
 // SMTSolvers: z3
 // ----
-// Info 1180: Contract invariant(s) for :C:\n!map[true]\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol
index 36c6f843e7..be126d16e0 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_aliasing_1.sol
@@ -18,3 +18,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (233-253): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol
index 79c03a7d55..54b69b38ce 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_aliasing_2.sol
@@ -34,3 +34,4 @@ contract C
 // ----
 // Warning 6328: (364-384): CHC: Assertion violation happens here.
 // Warning 6328: (430-448): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_1.sol
index 10d582f6d1..746b677888 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_1.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
index 3b8a8846e5..a246974e5e 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_equal_keys_2.sol
@@ -11,3 +11,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (86-100): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_unsupported_key_type_1.sol b/test/libsolidity/smtCheckerTests/types/mapping_unsupported_key_type_1.sol
index 3b3a468af0..17f67b8a1e 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_unsupported_key_type_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_unsupported_key_type_1.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/rational_large_1.sol b/test/libsolidity/smtCheckerTests/types/rational_large_1.sol
index a7d969185e..0a011b44e7 100644
--- a/test/libsolidity/smtCheckerTests/types/rational_large_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/rational_large_1.sol
@@ -9,4 +9,5 @@ contract c {
 // SMTEngine: all
 // ----
 // Warning 6321: (48-52): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (96-110): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\nx = 8\n\nTransaction trace:\nc.constructor()\nc.f()
+// Warning 6328: (96-110): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_2.sol b/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_2.sol
index d2499a5feb..1040f7cae6 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_2.sol
@@ -8,3 +8,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
index 61d18c4178..f8f27898fb 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_1.sol
@@ -11,3 +11,4 @@ contract C {
 // ----
 // Warning 6328: (102-122): CHC: Assertion violation happens here.
 // Warning 6328: (141-161): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol
index f1128583b3..bf643100d6 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_2.sol
@@ -8,5 +8,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (113-133): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (152-172): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (113-133): CHC: Assertion violation happens here.
+// Warning 6328: (152-172): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol
index 691c25843b..c2d26b45f3 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_3.sol
@@ -9,5 +9,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (106-126): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (145-165): CHC: Assertion violation happens here.\nCounterexample:\n\na = [0x0, 0x0]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (106-126): CHC: Assertion violation happens here.
+// Warning 6328: (145-165): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol
index 13efd8bb9b..287007762e 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_4.sol
@@ -17,7 +17,8 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (132-152): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 2\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (171-191): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 2\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (298-318): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 0\n\nTransaction trace:\nC.constructor()
-// Warning 6328: (337-357): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0], x = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (132-152): CHC: Assertion violation happens here.
+// Warning 6328: (171-191): CHC: Assertion violation happens here.
+// Warning 6328: (298-318): CHC: Assertion violation happens here.
+// Warning 6328: (337-357): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol b/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
index e3ab2189c9..1319ca10df 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_length_5.sol
@@ -9,6 +9,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (95-115): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.f()
-// Warning 6328: (134-154): CHC: Assertion violation happens here.\nCounterexample:\na = [0, 0]\n\nTransaction trace:\nC.constructor()\nState: a = [0, 0]\nC.f()
-// Info 1180: Contract invariant(s) for :C:\n(!(a.length <= 1) && !(a.length >= 3))\n
+// Warning 6328: (95-115): CHC: Assertion violation happens here.
+// Warning 6328: (134-154): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/storage_value_vars_3.sol b/test/libsolidity/smtCheckerTests/types/storage_value_vars_3.sol
index 6762b7e7b1..4fa609633b 100644
--- a/test/libsolidity/smtCheckerTests/types/storage_value_vars_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/storage_value_vars_3.sol
@@ -25,3 +25,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_length.sol b/test/libsolidity/smtCheckerTests/types/string_length.sol
index 86390c32bc..c6a1e8047d 100644
--- a/test/libsolidity/smtCheckerTests/types/string_length.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_length.sol
@@ -16,3 +16,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol
index c568b2267b..0289de4bfd 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_1.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (142-157): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
+// Warning 6328: (142-157): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol
index fc68b79584..65dc7cb20b 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_2.sol
@@ -9,4 +9,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (143-158): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
+// Warning 6328: (143-158): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol
index 7219e15bd0..1c25ccb6a4 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_3.sol
@@ -11,4 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (153-168): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
+// Warning 6328: (153-168): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol
index 954aee7f45..647c3ae248 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_4.sol
@@ -15,4 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (228-243): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)\n    C.g() -- internal call
+// Warning 6328: (228-243): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol
index 71e331122e..70ad2f57c5 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_assignment_5.sol
@@ -13,4 +13,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (218-233): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x746573747a0000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)\n    C.g() -- internal call
+// Warning 6328: (218-233): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol b/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol
index 3c5742e65f..daec90a4d8 100644
--- a/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_literal_comparison_1.sol
@@ -10,4 +10,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (137-157): CHC: Assertion violation happens here.\nCounterexample:\n\n_x = 0x7465737400000000000000000000000000000000000000000000000000000000\ny = 0x7465737400000000000000000000000000000000000000000000000000000000\nz = 0x7465737400000000000000000000000000000000000000000000000000000000\n\nTransaction trace:\nC.constructor()\nC.f(0x7465737400000000000000000000000000000000000000000000000000000000)
+// Warning 6328: (137-157): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_safe.sol
index c6e77753f3..bc5ddf49ed 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_safe.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_safe.sol
@@ -33,3 +33,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 29 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol
index a6ec06ba10..504d3ea54f 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_memory_unsafe.sol
@@ -35,3 +35,4 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 5667: (151-162): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
index 109fee7dc6..b2f7b9825c 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/array_struct_array_struct_storage_safe.sol
@@ -53,3 +53,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 51 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol
index c596fcdf01..007c451d58 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_memory.sol
@@ -23,3 +23,4 @@ contract C {
 // Warning 6328: (176-196): CHC: Assertion violation happens here.
 // Warning 6328: (200-220): CHC: Assertion violation happens here.
 // Warning 6328: (370-406): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
index 3fd0c0d873..df99f8a84b 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_1.sol
@@ -21,4 +21,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (270-288): CHC: Assertion violation happens here.\nCounterexample:\ns = {innerM, sum: 21239}\n\nTransaction trace:\nC.constructor(0){ msg.sender: 0x6dc4 }\nState: s = {innerM, sum: 21239}\nC.g()
+// Warning 6328: (270-288): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
index f9ae95e7c9..416bd6109d 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_3.sol
@@ -28,3 +28,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (307-327): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
index 618b1172d9..480753e28e 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_parameter_storage_4.sol
@@ -28,3 +28,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (305-325): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol
index e5d9d60abe..3a8699bda7 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_aliasing_storage.sol
@@ -28,3 +28,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (369-405): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_safe.sol
index 7bb20ace10..3bcd573e37 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_safe.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_safe.sol
@@ -31,3 +31,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 14 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol
index 6721630a5f..d4acec19bb 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_1.sol
@@ -31,8 +31,9 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (196-213): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 0, a: []}, a: [], ts: []}\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (231-250): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [], ts: []}\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (293-313): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [0, 0, 4], ts: []}\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (357-380): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [0, 0, 4], ts: [{y: 0, a: []}, {y: 0, a: []}, {y: 0, a: []}, {y: 5, a: []}, {y: 0, a: []}, {y: 0, a: []}]}\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (435-461): CHC: Assertion violation happens here.\nCounterexample:\n\ns1 = {x: 2, t: {y: 3, a: []}, a: [0, 0, 4], ts: [{y: 0, a: []}, {y: 0, a: []}, {y: 0, a: []}, {y: 5, a: []}, {y: 0, a: [0, 0, 0, 0, 0, 6]}, {y: 0, a: []}]}\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (196-213): CHC: Assertion violation happens here.
+// Warning 6328: (231-250): CHC: Assertion violation happens here.
+// Warning 6328: (293-313): CHC: Assertion violation happens here.
+// Warning 6328: (357-380): CHC: Assertion violation happens here.
+// Warning 6328: (435-461): CHC: Assertion violation happens here.
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_2.sol
index a1a40d64b8..50c3f1d7f8 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_memory_unsafe_2.sol
@@ -39,3 +39,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (804-842): CHC: Assertion violation happens here.
+// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_safe.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_safe.sol
index 309fbe63d2..86db5aee22 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_safe.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_safe.sol
@@ -40,3 +40,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 19 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol
index 662b4f1d24..cafc62759f 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_array_struct_array_storage_unsafe_1.sol
@@ -47,3 +47,4 @@ contract C {
 // Warning 6328: (266-286): CHC: Assertion violation happens here.
 // Warning 6328: (404-427): CHC: Assertion violation happens here.
 // Warning 6328: (578-604): CHC: Assertion violation happens here.
+// Info 1391: CHC: 14 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol
index ec895cdd96..30d6da4a46 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_fixed_bytes_from_string_1.sol
@@ -11,4 +11,5 @@ contract C {
 }
 // ----
 // Warning 5523: (0-31): The SMTChecker pragma has been deprecated and will be removed in the future. Please use the "model checker engine" compiler setting to activate the SMTChecker instead. If the pragma is enabled, all engines will be used.
-// Warning 6328: (178-207): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (178-207): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
index 91bd56fc95..b12882ef7c 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
@@ -20,4 +20,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (232-255): CHC: Assertion violation happens here.\nCounterexample:\n\ninner = {x: 43}\nouter = {s: {x: 43}, y: 512}\n\nTransaction trace:\nC.constructor()\nC.test()
+// Warning 6328: (232-255): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args_2.sol
index 6a1dd2995d..8383ef6d69 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args_2.sol
@@ -17,4 +17,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (191-231): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 3, y: 2, z: 1}\n\nTransaction trace:\nC.constructor()\nC.test()
+// Warning 6328: (191-231): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol
index b197217258..3653fa850a 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_delete_memory.sol
@@ -18,3 +18,4 @@ contract C {
 // ----
 // Warning 6328: (152-172): CHC: Assertion violation happens here.
 // Warning 6328: (176-210): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol
index 5c00b306c0..12e38a4101 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_delete_storage.sol
@@ -23,3 +23,4 @@ contract C {
 // ----
 // Warning 6328: (208-228): CHC: Assertion violation happens here.
 // Warning 6328: (232-266): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol
index c3bb774000..0b04379fe5 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor.sol
@@ -20,4 +20,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (219-242): CHC: Assertion violation happens here.\nCounterexample:\n\ninner = {x: 43}\nouter = {s: {x: 43}, y: 512}\n\nTransaction trace:\nC.constructor()\nC.test()
+// Warning 6328: (219-242): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor_named_args.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor_named_args.sol
index b2c876e759..03bc66617b 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor_named_args.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_constructor_named_args.sol
@@ -9,3 +9,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_temporary.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_temporary.sol
index 5d5b6b0a04..848b990457 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_nested_temporary.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_nested_temporary.sol
@@ -16,3 +16,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol
index 2d438e6d09..ca7aee8f21 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_recursive_5.sol
@@ -26,4 +26,5 @@ contract C {
 // Warning 8364: (166-175): Assertion checker does not yet implement type struct C.S storage ref
 // Warning 7650: (188-195): Assertion checker does not yet support this expression.
 // Warning 8364: (188-193): Assertion checker does not yet implement type struct C.S storage ref
-// Warning 6328: (159-203): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (159-203): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol
index a96f0323f4..200289f2d5 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_return.sol
@@ -18,4 +18,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (256-277): CHC: Assertion violation happens here.\nCounterexample:\n\ns2 = {x: 42, a: [0, 0, 43, 0, 0]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    C.s() -- internal call
+// Warning 6328: (256-277): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol
index 986781b771..7569a41165 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_state_constructor.sol
@@ -13,4 +13,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Contract invariant(s) for :C:\n(!(s.x <= 41) && !(s.x >= 43))\n
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol
index ed3aa001da..a0dcde7c72 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var.sol
@@ -17,3 +17,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (180-204): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol
index e3dcb01847..73e8e4e54b 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_1.sol
@@ -24,3 +24,4 @@ contract C {
 // ----
 // Warning 2529: (88-97): CHC: Empty array "pop" happens here.
 // Warning 6328: (197-221): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol
index 748159516c..1478e45241 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_state_var_array_pop_2.sol
@@ -21,3 +21,4 @@ contract C {
 // ----
 // Warning 2529: (100-109): CHC: Empty array "pop" happens here.
 // Warning 6328: (156-180): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_temporary.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_temporary.sol
index a4f3a4d42d..342efc4b10 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_temporary.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_temporary.sol
@@ -11,3 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol
index 8bd6de794a..99314c39ac 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_unary_add.sol
@@ -18,3 +18,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (193-213): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol
index 7ce618a0e3..f589252019 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_unary_sub.sol
@@ -19,3 +19,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (208-228): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_1.sol b/test/libsolidity/smtCheckerTests/types/struct_1.sol
index 1a24decc3d..84ad5004d3 100644
--- a/test/libsolidity/smtCheckerTests/types/struct_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct_1.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_1d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_1d.sol
index 39cae7f230..979a72db25 100644
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_1d.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct_array_branches_1d.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
index 2d2492a2e8..0d45aee142 100644
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct_array_branches_2d.sol
@@ -18,3 +18,4 @@ contract C
 // SMTIgnoreOS: macos
 // ----
 // Warning 6368: (216-225): CHC: Out of bounds access might happen here.
+// Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol b/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol
index dbd498327d..2d46a846d3 100644
--- a/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct_array_branches_3d.sol
@@ -24,3 +24,4 @@ contract C
 // SMTEngine: all
 // ----
 // Warning 5667: (53-59): Unused function parameter. Remove or comment out the variable name to silence this warning.
+// Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol
index 72fd765f41..bc1b014101 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_1.sol
@@ -8,4 +8,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (64-68): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol
index 084c637b93..0f3c453459 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_2.sol
@@ -8,4 +8,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (64-68): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol
index 1f8151920c..103eccc973 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_1_chain_n.sol
@@ -8,4 +8,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 6838: (64-68): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment.sol
index cd1949d2e1..9c8f8a4ee2 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_assignment.sol
@@ -11,3 +11,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_array.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_array.sol
index 1ae6051c72..69ef8ee7c8 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_array.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_assignment_array.sol
@@ -14,3 +14,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol
index e5f062b572..79be48b3ae 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_assignment_array_empty.sol
@@ -18,3 +18,4 @@ contract C
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (198-215): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol
index 03a5a22db2..214c20d24d 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_assignment_compound.sol
@@ -10,4 +10,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (89-103): CHC: Assertion violation happens here.\nCounterexample:\n\na = 4\nb = 3\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (89-103): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol
index 7e7795ea19..e9dd360c49 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_assignment_empty.sol
@@ -11,4 +11,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (99-113): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 0\n\nTransaction trace:\nC.constructor()\nC.g()
+// Warning 6328: (99-113): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_assignment_multiple_calls.sol b/test/libsolidity/smtCheckerTests/types/tuple_assignment_multiple_calls.sol
index c544072214..574eb9e878 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_assignment_multiple_calls.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_assignment_multiple_calls.sol
@@ -13,3 +13,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_declarations.sol b/test/libsolidity/smtCheckerTests/types/tuple_declarations.sol
index f0956bfd41..e3bb85849f 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_declarations.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_declarations.sol
@@ -9,3 +9,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_declarations_empty.sol b/test/libsolidity/smtCheckerTests/types/tuple_declarations_empty.sol
index 10960c983a..206b201d3f 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_declarations_empty.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_declarations_empty.sol
@@ -8,3 +8,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function.sol b/test/libsolidity/smtCheckerTests/types/tuple_declarations_function.sol
index bb71bfdcdc..a28269eb29 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_declarations_function.sol
@@ -16,3 +16,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_2.sol
index 15ca65c864..459fd6e219 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_declarations_function_2.sol
@@ -15,3 +15,4 @@ contract C
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol b/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol
index f3f5121a29..f6541bc750 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_1.sol
@@ -10,4 +10,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6321: (47-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (125-139): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\na = 2\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (125-139): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol
index 51b40dda10..7806cb60b2 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_different_count_assignment_2.sol
@@ -10,4 +10,5 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6321: (47-50): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6328: (127-141): CHC: Assertion violation happens here.\nCounterexample:\n\n = 0\na = 2\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (127-141): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol
index 60b3054022..7defe2cdf2 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_extra_parens_7.sol
@@ -12,4 +12,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Info 1180: Reentrancy property(ies) for :C:\n!(<errorCode> >= 2)\n(<errorCode> <= 0)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(x == 2)\n<errorCode> = 2 -> Assertion failed at assert(y == 3)\n
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
index bbd92a90a3..362755ac96 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
@@ -14,4 +14,5 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (166-180): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (166-180): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol b/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
index 92181fe360..f33f9bfc84 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
@@ -16,5 +16,6 @@ contract C
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (172-186): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
-// Warning 6328: (190-204): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (172-186): CHC: Assertion violation happens here.
+// Warning 6328: (190-204): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_return_branch.sol b/test/libsolidity/smtCheckerTests/types/tuple_return_branch.sol
index aea54fb1ec..3336975637 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_return_branch.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_return_branch.sol
@@ -16,3 +16,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/type_interfaceid.sol b/test/libsolidity/smtCheckerTests/types/type_interfaceid.sol
index 7b5bae6bc9..cd0d56506e 100644
--- a/test/libsolidity/smtCheckerTests/types/type_interfaceid.sol
+++ b/test/libsolidity/smtCheckerTests/types/type_interfaceid.sol
@@ -28,5 +28,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (416-468): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()
-// Warning 6328: (503-555): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()
+// Warning 6328: (416-468): CHC: Assertion violation happens here.
+// Warning 6328: (503-555): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/type_minmax.sol b/test/libsolidity/smtCheckerTests/types/type_minmax.sol
index cc9e3c3190..da9bb1b6d1 100644
--- a/test/libsolidity/smtCheckerTests/types/type_minmax.sol
+++ b/test/libsolidity/smtCheckerTests/types/type_minmax.sol
@@ -81,4 +81,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (178-207): CHC: Assertion violation happens here.\nCounterexample:\n\na = 4294967296\n\nTransaction trace:\nC.constructor()\nC.f(4294967296)
+// Warning 6328: (178-207): CHC: Assertion violation happens here.
+// Info 1391: CHC: 24 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/unused_mapping.sol b/test/libsolidity/smtCheckerTests/types/unused_mapping.sol
index d8308dada9..889cf78a56 100644
--- a/test/libsolidity/smtCheckerTests/types/unused_mapping.sol
+++ b/test/libsolidity/smtCheckerTests/types/unused_mapping.sol
@@ -17,3 +17,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/block_inside_unchecked.sol b/test/libsolidity/smtCheckerTests/unchecked/block_inside_unchecked.sol
index 1d41493fb8..e9321b4607 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/block_inside_unchecked.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/block_inside_unchecked.sol
@@ -11,3 +11,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
index 8a7405c545..96b4150105 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/flipping_sign_tests.sol
@@ -9,4 +9,5 @@ contract test {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (110-125): CHC: Assertion violation happens here.\nCounterexample:\n\n = false\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n\nTransaction trace:\ntest.constructor()\ntest.f()
+// Warning 6328: (110-125): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/inc_dec.sol b/test/libsolidity/smtCheckerTests/unchecked/inc_dec.sol
index 47a3a99591..5af2a6d7ad 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/inc_dec.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/inc_dec.sol
@@ -26,3 +26,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol b/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
index 4cc7a57f66..9d04f9ed6a 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/signed_mod.sol
@@ -14,5 +14,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4281: (85-90): CHC: Division by zero happens here.\nCounterexample:\n\na = 0\nb = 0\n = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
-// Warning 4984: (242-248): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.\nCounterexample:\n\n_check = true\n = 0\nx = (- 57896044618658097711785492504343953926634992332820282019728792003956564819968)\n\nTransaction trace:\nC.constructor()\nC.g(true)
+// Warning 4281: (85-90): CHC: Division by zero happens here.
+// Warning 4984: (242-248): CHC: Overflow (resulting value larger than 2**255 - 1) happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/constant.sol b/test/libsolidity/smtCheckerTests/userTypes/constant.sol
index 9730d4b1c1..0d49dec4bc 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/constant.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/constant.sol
@@ -15,4 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (531-555): CHC: Assertion violation happens here.\nCounterexample:\nu = 165521356710917456517261742455526507355687727119203895813322792776\n\nTransaction trace:\nC.constructor()\nState: u = 165521356710917456517261742455526507355687727119203895813322792776\nC.f()
+// Warning 6328: (531-555): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol
index fa56e11aba..8aa3d9aed3 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/conversion_1.sol
@@ -32,4 +32,4 @@ contract C {
 // ----
 // Warning 6328: (428-465): CHC: Assertion violation happens here.
 // Warning 6328: (665-700): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n(true || true || true || true || true)\nReentrancy property(ies) for :C:\n(true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true || true || true)\n(true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true || true)\n(true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true)\n(true || true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true)\n(true || true || true || true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(MyUInt8.unwrap(f(1)) == 1)\n<errorCode> = 2 -> Assertion failed at assert(MyUInt8.unwrap(f(2)) == 2)\n<errorCode> = 3 -> Assertion failed at assert(MyUInt8.unwrap(f(257)) == 1)\n<errorCode> = 4 -> Assertion failed at assert(MyUInt8.unwrap(f(257)) == 257)\n<errorCode> = 6 -> Assertion failed at assert(MyInt8.unwrap(g(1)) == 1)\n<errorCode> = 7 -> Assertion failed at assert(MyInt8.unwrap(g(2)) == 2)\n<errorCode> = 8 -> Assertion failed at assert(MyInt8.unwrap(g(255)) == -1)\n<errorCode> = 9 -> Assertion failed at assert(MyInt8.unwrap(g(257)) == 1)\n<errorCode> = 10 -> Assertion failed at assert(MyInt8.unwrap(g(257)) == -1)\n
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol
index 9b4f72d336..cfc68b5993 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/conversion_2.sol
@@ -27,6 +27,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (497-545): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.r()\n    C.h(1) -- internal call\n    C.h(2) -- internal call\n    C.h(255) -- internal call\n    C.h(255) -- internal call
-// Warning 6328: (652-702): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.s()\n    C.i(250) -- internal call\n    C.i(250) -- internal call
-// Info 1180: Contract invariant(s) for :C:\n(true || true || true || true || true)\nReentrancy property(ies) for :C:\n(((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true || true || true || true)\n(true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true || true || true)\n(true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true)\n(true || true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(MyInt8.unwrap(h(MyUInt8.wrap(1))) == 1)\n<errorCode> = 2 -> Assertion failed at assert(MyInt8.unwrap(h(MyUInt8.wrap(2))) == 2)\n<errorCode> = 3 -> Assertion failed at assert(MyInt8.unwrap(h(MyUInt8.wrap(255))) == -1)\n<errorCode> = 4 -> Assertion failed at assert(MyInt8.unwrap(h(MyUInt8.wrap(255))) == 1)\n<errorCode> = 6 -> Assertion failed at assert(MyUInt16.unwrap(i(MyUInt8.wrap(250))) == 250)\n<errorCode> = 7 -> Assertion failed at assert(MyUInt16.unwrap(i(MyUInt8.wrap(250))) == 0)\n
+// Warning 6328: (497-545): CHC: Assertion violation happens here.
+// Warning 6328: (652-702): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol
index ea8e9804bc..ac70c80669 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/conversion_3.sol
@@ -29,6 +29,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (434-467): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.t()\n    C.j(1) -- internal call\n    C.j(2) -- internal call\n    C.j(255) -- internal call\n    C.j(255) -- internal call
-// Warning 6328: (679-729): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.v()\n    C.k(1) -- internal call\n    C.k(2) -- internal call\n    C.k(255) -- internal call\n    C.k(255) -- internal call
-// Info 1180: Contract invariant(s) for :C:\n(true || true || true || true || true)\nReentrancy property(ies) for :C:\n(((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true || true || true || true)\n(true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true || true)\n(true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true)\n(true || true || true || true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true)\n(true || true || true || true || true || true || true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))))\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(j(MyUInt8.wrap(1)) == 1)\n<errorCode> = 2 -> Assertion failed at assert(j(MyUInt8.wrap(2)) == 2)\n<errorCode> = 3 -> Assertion failed at assert(j(MyUInt8.wrap(255)) == 0xff)\n<errorCode> = 4 -> Assertion failed at assert(j(MyUInt8.wrap(255)) == 1)\n<errorCode> = 6 -> Assertion failed at assert(MyUInt16.unwrap(k(MyUInt8.wrap(1))) == 1)\n<errorCode> = 7 -> Assertion failed at assert(MyUInt16.unwrap(k(MyUInt8.wrap(2))) == 2)\n<errorCode> = 8 -> Assertion failed at assert(MyUInt16.unwrap(k(MyUInt8.wrap(255))) == 0xff)\n<errorCode> = 9 -> Assertion failed at assert(MyUInt16.unwrap(k(MyUInt8.wrap(255))) == 1)\n
+// Warning 6328: (434-467): CHC: Assertion violation happens here.
+// Warning 6328: (679-729): CHC: Assertion violation happens here.
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol b/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol
index 699d220973..891148c681 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/conversion_4.sol
@@ -21,4 +21,4 @@ contract C {
 // SMTIgnoreCex: yes
 // ----
 // Warning 6328: (407-457): CHC: Assertion violation happens here.
-// Info 1180: Contract invariant(s) for :C:\n(true || true || true)\nReentrancy property(ies) for :C:\n(((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true || true || true)\n(true || true || ((<errorCode> = 0) && ((:var 0) = (:var 1))) || true || true)\n<errorCode> = 0 -> no errors\n<errorCode> = 1 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(1))) == 1)\n<errorCode> = 2 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(2))) == 2)\n<errorCode> = 3 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 0xff)\n<errorCode> = 4 -> Assertion failed at assert(MyUInt8.unwrap(m(MyUInt16.wrap(255))) == 1)\n
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol b/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
index 4bff3a4984..763a119628 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/fixedpoint.sol
@@ -73,3 +73,4 @@ contract TestFixedMath {
 // Warning 6328: (2165-2266): CHC: Assertion violation happens here.
 // Warning 6328: (2675-2791): CHC: Assertion violation happens here.
 // Warning 6328: (3161-3212): CHC: Assertion violation happens here.
+// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol b/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol
index 478b87dfe8..ad4063182a 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis.sol
@@ -15,5 +15,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (133-161): CHC: Assertion violation happens here.\nCounterexample:\n\na = 5\n\nTransaction trace:\nC.constructor()\nC.f()
-// Warning 6328: (261-289): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (133-161): CHC: Assertion violation happens here.
+// Warning 6328: (261-289): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol b/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol
index e8da1dd564..713eb8ddbc 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/in_parenthesis_2.sol
@@ -24,3 +24,4 @@ contract C {
 // Warning 6133: (126-140): Statement has no effect.
 // Warning 6328: (274-302): CHC: Assertion violation happens here.
 // Warning 6328: (340-355): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol b/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
index 120348a046..100448cb06 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/mapping_1.sol
@@ -10,4 +10,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreInv: yes
 // ----
-// Warning 6328: (134-151): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0\n\nTransaction trace:\nC.constructor()\nC.f(0)
+// Warning 6328: (134-151): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol b/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol
index 3dbcc3126e..8ff82e5149 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/modifier_1.sol
@@ -15,4 +15,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (212-226): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f(0, 0)
+// Warning 6328: (212-226): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/multisource.sol b/test/libsolidity/smtCheckerTests/userTypes/multisource.sol
index 23fbef98ae..3e7ff133d1 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/multisource.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/multisource.sol
@@ -17,5 +17,6 @@ contract A {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (B:296-332): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nA.constructor()\nA.g()\n    A.f(5) -- internal call\n    A.f(5) -- internal call
-// Warning 6328: (B:409-463): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nA.constructor()\nA.g()\n    A.f(5) -- internal call\n    A.f(5) -- internal call\n    A.f(0x05) -- internal call\n    A.f(0x05) -- internal call
+// Warning 6328: (B:296-332): CHC: Assertion violation happens here.
+// Warning 6328: (B:409-463): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol b/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
index 846f3ab755..f4300d252a 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/multisource_module.sol
@@ -15,8 +15,9 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreOS: macos
 // SMTIgnoreCex: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (s2.sol:259-292): CHC: Assertion violation happens here.
 // Warning 6328: (s2.sol:346-377): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/simple.sol b/test/libsolidity/smtCheckerTests/userTypes/simple.sol
index edfde6594b..1b0f6e1fe4 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/simple.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/simple.sol
@@ -19,5 +19,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (255-285): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()\n    C.f() -- internal call\n    C.f() -- internal call
-// Warning 6328: (364-392): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.h()\n    C.f() -- internal call\n    C.f() -- internal call\n    C.g() -- internal call
+// Warning 6328: (255-285): CHC: Assertion violation happens here.
+// Warning 6328: (364-392): CHC: Assertion violation happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
index 1d31cbe3d2..3958436041 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_abi_1.sol
@@ -11,4 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (188-212): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 2437\n\nTransaction trace:\nC.constructor()\nC.f(data)
+// Warning 6328: (188-212): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
index a4c4a3a29e..e41c76539a 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_abi_2.sol
@@ -11,4 +11,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6328: (192-226): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(data)
+// Warning 6328: (192-226): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
index 8856ebd43a..5336f752ef 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_1.sol
@@ -15,4 +15,5 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6328: (204-243): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 4661: (204-243): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol
index 8ac6493661..84202b69c5 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_array_elem_2.sol
@@ -13,4 +13,5 @@ contract C {
     }
 }
 // ----
-// Warning 6328: (200-238): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.p()\nC.inv2()
+// Warning 6328: (200-238): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol
index 3088a894b6..64a89d1f01 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_library_constant_1.sol
@@ -23,3 +23,5 @@ contract C {
         assert(T.unwrap(C.b)); // should hold
     }
 }
+// ----
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol
index f1b6a79861..6761ca6f3e 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_1.sol
@@ -17,4 +17,5 @@ contract C {
     }
 }
 // ----
-// Warning 6328: (325-342): CHC: Assertion violation happens here.\nCounterexample:\n\nb = true\n\nTransaction trace:\nC.constructor()\nC.g(true)
+// Warning 6328: (325-342): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol
index 1e53a35473..11e0212ce5 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_mapping_index_2.sol
@@ -17,4 +17,5 @@ contract C {
     }
 }
 // ----
-// Warning 6328: (352-370): CHC: Assertion violation happens here.\nCounterexample:\n\na = 0x0\n\nTransaction trace:\nC.constructor()\nC.g(0x0)
+// Warning 6328: (352-370): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
index 1a72cad3da..8d2b990dff 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/user_type_as_struct_member_1.sol
@@ -23,3 +23,5 @@ contract C {
         );
     }
 }
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol b/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol
index 065dae17ab..1747c3529c 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/wrap_unwrap_via_contract_name.sol
@@ -34,3 +34,4 @@ contract D {
 // Warning 6328: (494-529): CHC: Assertion violation happens here.
 // Warning 6328: (575-598): CHC: Assertion violation happens here.
 // Warning 6328: (666-711): CHC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require.sol b/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require.sol
index 2bc0143470..980cab8eb4 100644
--- a/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require.sol
+++ b/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require.sol
@@ -4,3 +4,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require_message.sol b/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require_message.sol
index 2c0d0c6a78..b63801cfa8 100644
--- a/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require_message.sol
+++ b/test/libsolidity/smtCheckerTests/verification_target/simple_assert_with_require_message.sol
@@ -7,3 +7,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index bd51fe920e..1dc180ab4a 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -147,6 +147,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			"--model-checker-engine=bmc",
 			"--model-checker-ext-calls=trusted",
 			"--model-checker-invariants=contract,reentrancy",
+			"--model-checker-show-proved-safe",
 			"--model-checker-show-unproved",
 			"--model-checker-solvers=z3,smtlib2",
 			"--model-checker-targets=underflow,divByZero",
@@ -215,6 +216,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			{ModelCheckerExtCalls::Mode::TRUSTED},
 			{{InvariantType::Contract, InvariantType::Reentrancy}},
 			true,
+			true,
 			{false, false, true, true},
 			{{VerificationTargetType::Underflow, VerificationTargetType::DivByZero}},
 			5,
@@ -410,6 +412,7 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 		{"--via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--metadata-literal", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--metadata-hash=swarm", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-show-proved-safe", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--model-checker-show-unproved", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--model-checker-div-mod-no-slacks", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--model-checker-engine=bmc", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 47ab7e49c2..185f547c4b 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -110,6 +110,7 @@ void FuzzerUtil::testCompiler(
 			frontend::ModelCheckerEngine::All(),
 			frontend::ModelCheckerExtCalls{},
 			frontend::ModelCheckerInvariants::All(),
+			/*showProvedSafe=*/false,
 			/*showUnproved=*/false,
 			smtutil::SMTSolverChoice::All(),
 			frontend::ModelCheckerTargets::Default(),

From 8b07e23975bc0eeafff5116d1c96996d645ea789 Mon Sep 17 00:00:00 2001
From: uji <ujiprog@gmail.com>
Date: Sat, 11 Mar 2023 17:29:45 +0900
Subject: [PATCH 1226/1748] docs/grammer: Fix the writing of
 unicodeStringLiteral rules.

UnicodeStringLiteral rules can be written with a common prefix.
(like HexString https://github.com/ethereum/solidity/blob/ef6ff2f05550e4386f2fec7753a44fe39a124488/docs/grammar/SolidityLexer.g4#L213)
---
 docs/grammar/SolidityLexer.g4 | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index b0dfca0c47..e1d0da6a90 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -198,9 +198,7 @@ fragment EscapeSequence:
 /**
  * A single quoted string literal allowing arbitrary unicode characters.
  */
-UnicodeStringLiteral:
-	'unicode"' DoubleQuotedUnicodeStringCharacter* '"'
-	| 'unicode\'' SingleQuotedUnicodeStringCharacter* '\'';
+UnicodeStringLiteral: 'unicode' (('"' DoubleQuotedUnicodeStringCharacter* '"') | ('\'' SingleQuotedUnicodeStringCharacter* '\''));
 //@doc:inline
 fragment DoubleQuotedUnicodeStringCharacter: ~["\r\n\\] | EscapeSequence;
 //@doc:inline

From 8c53b656e9d1a39fd3ed061ba0fd2e27a144a997 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 15 Mar 2023 15:36:04 +0100
Subject: [PATCH 1227/1748] Double number of operations per run for stale
 action bot

---
 .github/workflows/stale.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 4761c62ac2..bac1927d86 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -48,4 +48,4 @@ jobs:
           exempt-draft-pr: false
           exempt-all-milestones: true
           remove-stale-when-updated: true
-          operations-per-run: 128
+          operations-per-run: 256

From aacbe72079f595a02d6375b53d60a9390fba2300 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Mon, 6 Mar 2023 14:19:58 +0100
Subject: [PATCH 1228/1748] group unsupported warnings

---
 Changelog.md                                  |  1 +
 docs/smtchecker.rst                           | 17 +++++++++++
 docs/using-the-compiler.rst                   |  2 ++
 liblangutil/UniqueErrorReporter.h             |  5 ++++
 libsolidity/formal/BMC.cpp                    |  5 ++--
 libsolidity/formal/BMC.h                      |  1 +
 libsolidity/formal/CHC.cpp                    |  3 +-
 libsolidity/formal/CHC.h                      |  1 +
 libsolidity/formal/ModelChecker.cpp           | 19 ++++++++++--
 libsolidity/formal/ModelChecker.h             |  6 ++++
 libsolidity/formal/ModelCheckerSettings.h     |  2 ++
 libsolidity/formal/SMTEncoder.cpp             | 30 ++++++++++---------
 libsolidity/formal/SMTEncoder.h               |  2 ++
 libsolidity/interface/StandardCompiler.cpp    | 10 ++++++-
 solc/CommandLineParser.cpp                    | 10 +++++++
 test/libsolidity/SMTCheckerTest.cpp           |  8 +++++
 ...unction_type_to_function_type_internal.sol |  4 +--
 .../unsupported/assembly_1.sol                | 18 +++++++++++
 test/solc/CommandLineParser.cpp               |  3 ++
 test/tools/fuzzer_common.cpp                  |  1 +
 20 files changed, 126 insertions(+), 22 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/unsupported/assembly_1.sol

diff --git a/Changelog.md b/Changelog.md
index a2c4856919..5cb2b70959 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ Language Features:
 
 Compiler Features:
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
+ * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
 
 
 Bugfixes:
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index 27d2cfaa15..3ad700a308 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -499,6 +499,23 @@ how many unproved targets there are. If the user wishes to see all the specific
 unproved targets, the CLI option ``--model-checker-show-unproved`` and
 the JSON option ``settings.modelChecker.showUnproved = true`` can be used.
 
+Unsupported Language Features
+=============================
+
+Certain Solidity language features are not completely supported by the SMT
+encoding that the SMTChecker applies, for example assembly blocks.
+The unsupported construct is abstracted via overapproximation to preserve
+soundness, meaning any properties reported safe are safe even though this
+feature is unsupported.
+However such abstraction may cause false positives when the target properties
+depend on the precise behavior of the unsupported feature.
+If the encoder encounters such cases it will by default report a generic warning
+stating how many unsupported features it has seen.
+If the user wishes to see all the specific unsupported features, the CLI option
+``--model-checker-show-unsupported`` and the JSON option
+``settings.modelChecker.showUnsupported = true`` can be used, where their default
+value is ``false``.
+
 Verified Contracts
 ==================
 
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 4dc385627a..2eac2d1578 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -443,6 +443,8 @@ Input Description
           "showProved": true,
           // Choose whether to output all unproved targets. The default is `false`.
           "showUnproved": true,
+          // Choose whether to output all unsupported language features. The default is `false`.
+          "showUnsupported": true,
           // Choose which solvers should be used, if available.
           // See the Formal Verification section for the solvers description.
           "solvers": ["cvc4", "smtlib2", "z3"],
diff --git a/liblangutil/UniqueErrorReporter.h b/liblangutil/UniqueErrorReporter.h
index ebcb8d9762..902068b8ff 100644
--- a/liblangutil/UniqueErrorReporter.h
+++ b/liblangutil/UniqueErrorReporter.h
@@ -33,6 +33,11 @@ class UniqueErrorReporter
 public:
 	UniqueErrorReporter(): m_errorReporter(m_uniqueErrors) {}
 
+	void append(UniqueErrorReporter const& _other)
+	{
+		m_errorReporter.append(_other.m_errorReporter.errors());
+	}
+
 	void warning(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 	{
 		if (!seen(_error, _location, _description))
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index caca4f6be5..e0a5f312b4 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -39,12 +39,13 @@ using namespace solidity::frontend;
 BMC::BMC(
 	smt::EncodingContext& _context,
 	UniqueErrorReporter& _errorReporter,
+	UniqueErrorReporter& _unsupportedErrorReporter,
 	map<h256, string> const& _smtlib2Responses,
 	ReadCallback::Callback const& _smtCallback,
 	ModelCheckerSettings _settings,
 	CharStreamProvider const& _charStreamProvider
 ):
-	SMTEncoder(_context, _settings, _errorReporter, _charStreamProvider),
+	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider),
 	m_interface(make_unique<smtutil::SMTPortfolio>(_smtlib2Responses, _smtCallback, _settings.solvers, _settings.timeout))
 {
 #if defined (HAVE_Z3) || defined (HAVE_CVC4)
@@ -593,7 +594,7 @@ void BMC::internalOrExternalFunctionCall(FunctionCall const& _funCall)
 		// The processing happens in SMT Encoder, but we need to prevent the resetting of the state variables.
 	}
 	else if (funType.kind() == FunctionType::Kind::Internal)
-		m_errorReporter.warning(
+		m_unsupportedErrors.warning(
 			5729_error,
 			_funCall.location(),
 			"BMC does not yet implement this type of function call."
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index 9c106689e4..9a8242047e 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -60,6 +60,7 @@ class BMC: public SMTEncoder
 	BMC(
 		smt::EncodingContext& _context,
 		langutil::UniqueErrorReporter& _errorReporter,
+		langutil::UniqueErrorReporter& _unsupportedErrorReporter,
 		std::map<h256, std::string> const& _smtlib2Responses,
 		ReadCallback::Callback const& _smtCallback,
 		ModelCheckerSettings _settings,
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 0281a4cbd7..3d93bf599e 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -62,12 +62,13 @@ using namespace solidity::frontend::smt;
 CHC::CHC(
 	EncodingContext& _context,
 	UniqueErrorReporter& _errorReporter,
+	UniqueErrorReporter& _unsupportedErrorReporter,
 	map<util::h256, string> const& _smtlib2Responses,
 	ReadCallback::Callback const& _smtCallback,
 	ModelCheckerSettings _settings,
 	CharStreamProvider const& _charStreamProvider
 ):
-	SMTEncoder(_context, _settings, _errorReporter, _charStreamProvider),
+	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider),
 	m_smtlib2Responses(_smtlib2Responses),
 	m_smtCallback(_smtCallback)
 {
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index 5f6b71b397..27bdaebf22 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -57,6 +57,7 @@ class CHC: public SMTEncoder
 	CHC(
 		smt::EncodingContext& _context,
 		langutil::UniqueErrorReporter& _errorReporter,
+		langutil::UniqueErrorReporter& _unsupportedErrorReporter,
 		std::map<util::h256, std::string> const& _smtlib2Responses,
 		ReadCallback::Callback const& _smtCallback,
 		ModelCheckerSettings _settings,
diff --git a/libsolidity/formal/ModelChecker.cpp b/libsolidity/formal/ModelChecker.cpp
index 5ec06d107e..bc97c55349 100644
--- a/libsolidity/formal/ModelChecker.cpp
+++ b/libsolidity/formal/ModelChecker.cpp
@@ -48,8 +48,8 @@ ModelChecker::ModelChecker(
 	m_errorReporter(_errorReporter),
 	m_settings(std::move(_settings)),
 	m_context(),
-	m_bmc(m_context, m_uniqueErrorReporter, _smtlib2Responses, _smtCallback, m_settings, _charStreamProvider),
-	m_chc(m_context, m_uniqueErrorReporter, _smtlib2Responses, _smtCallback, m_settings, _charStreamProvider)
+	m_bmc(m_context, m_uniqueErrorReporter, m_unsupportedErrorReporter, _smtlib2Responses, _smtCallback, m_settings, _charStreamProvider),
+	m_chc(m_context, m_uniqueErrorReporter, m_unsupportedErrorReporter, _smtlib2Responses, _smtCallback, m_settings, _charStreamProvider)
 {
 }
 
@@ -137,6 +137,21 @@ void ModelChecker::analyze(SourceUnit const& _source)
 	if (m_settings.engine.bmc)
 		m_bmc.analyze(_source, solvedTargets);
 
+	if (m_settings.showUnsupported)
+	{
+		m_errorReporter.append(m_unsupportedErrorReporter.errors());
+		m_unsupportedErrorReporter.clear();
+	}
+	else if (!m_unsupportedErrorReporter.errors().empty())
+		m_errorReporter.warning(
+			5724_error,
+			{},
+			"SMTChecker: " +
+			to_string(m_unsupportedErrorReporter.errors().size()) +
+			" unsupported language feature(s)."
+			" Enable the model checker option \"show unsupported\" to see all of them."
+		);
+
 	m_errorReporter.append(m_uniqueErrorReporter.errors());
 	m_uniqueErrorReporter.clear();
 }
diff --git a/libsolidity/formal/ModelChecker.h b/libsolidity/formal/ModelChecker.h
index 2625bd1e06..4c795fa707 100644
--- a/libsolidity/formal/ModelChecker.h
+++ b/libsolidity/formal/ModelChecker.h
@@ -89,6 +89,12 @@ class ModelChecker
 	/// to m_errorReporter at the end of the analysis.
 	langutil::UniqueErrorReporter m_uniqueErrorReporter;
 
+	/// Used by SMTEncoder, BMC and CHC to accumulate unsupported
+	/// warnings and avoid duplicates.
+	/// This is local to ModelChecker, so needs to be appended
+	/// to m_errorReporter at the end of the analysis.
+	langutil::UniqueErrorReporter m_unsupportedErrorReporter;
+
 	ModelCheckerSettings m_settings;
 
 	/// Stores the context of the encoding.
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index 023d7800f3..fafb2cdace 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -170,6 +170,7 @@ struct ModelCheckerSettings
 	ModelCheckerInvariants invariants = ModelCheckerInvariants::Default();
 	bool showProvedSafe = false;
 	bool showUnproved = false;
+	bool showUnsupported = false;
 	smtutil::SMTSolverChoice solvers = smtutil::SMTSolverChoice::Z3();
 	ModelCheckerTargets targets = ModelCheckerTargets::Default();
 	std::optional<unsigned> timeout;
@@ -185,6 +186,7 @@ struct ModelCheckerSettings
 			invariants == _other.invariants &&
 			showProvedSafe == _other.showProvedSafe &&
 			showUnproved == _other.showUnproved &&
+			showUnsupported == _other.showUnsupported &&
 			solvers == _other.solvers &&
 			targets == _other.targets &&
 			timeout == _other.timeout;
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index e8598392fb..8f22ab8249 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -49,9 +49,11 @@ SMTEncoder::SMTEncoder(
 	smt::EncodingContext& _context,
 	ModelCheckerSettings _settings,
 	UniqueErrorReporter& _errorReporter,
+	UniqueErrorReporter& _unsupportedErrorReporter,
 	langutil::CharStreamProvider const& _charStreamProvider
 ):
 	m_errorReporter(_errorReporter),
+	m_unsupportedErrors(_unsupportedErrorReporter),
 	m_context(_context),
 	m_settings(std::move(_settings)),
 	m_charStreamProvider(_charStreamProvider)
@@ -339,7 +341,7 @@ bool SMTEncoder::visit(InlineAssembly const& _inlineAsm)
 		m_context.resetVariable(*var);
 	}
 
-	m_errorReporter.warning(
+	m_unsupportedErrors.warning(
 		7737_error,
 		_inlineAsm.location(),
 		"Inline assembly may cause SMTChecker to produce spurious warnings (false positives)."
@@ -458,7 +460,7 @@ void SMTEncoder::endVisit(UnaryOperation const& _op)
 	if (*_op.annotation().userDefinedFunction)
 	{
 		// TODO: Implement user-defined operators properly.
-		m_errorReporter.warning(
+		m_unsupportedErrors.warning(
 			6156_error,
 			_op.location(),
 			"User-defined operators are not yet supported by SMTChecker. "s +
@@ -560,7 +562,7 @@ void SMTEncoder::endVisit(BinaryOperation const& _op)
 	if (*_op.annotation().userDefinedFunction)
 	{
 		// TODO: Implement user-defined operators properly.
-		m_errorReporter.warning(
+		m_unsupportedErrors.warning(
 			6756_error,
 			_op.location(),
 			"User-defined operators are not yet supported by SMTChecker. "s +
@@ -726,7 +728,7 @@ void SMTEncoder::endVisit(FunctionCall const& _funCall)
 		return;
 	case FunctionType::Kind::Creation:
 		if (!m_settings.engine.chc || !m_settings.externalCalls.isTrusted())
-			m_errorReporter.warning(
+			m_unsupportedErrors.warning(
 				8729_error,
 				_funCall.location(),
 				"Contract deployment is only supported in the trusted mode for external calls"
@@ -737,7 +739,7 @@ void SMTEncoder::endVisit(FunctionCall const& _funCall)
 	case FunctionType::Kind::BareCallCode:
 	case FunctionType::Kind::BareDelegateCall:
 	default:
-		m_errorReporter.warning(
+		m_unsupportedErrors.warning(
 			4588_error,
 			_funCall.location(),
 			"Assertion checker does not yet implement this type of function call."
@@ -1406,7 +1408,7 @@ bool SMTEncoder::visit(MemberAccess const& _memberAccess)
 				else
 					// NOTE: supporting name, creationCode, runtimeCode would be easy enough, but the bytes/string they return are not
 					//       at all usable in the SMT checker currently
-					m_errorReporter.warning(
+					m_unsupportedErrors.warning(
 						7507_error,
 						_memberAccess.location(),
 						"Assertion checker does not yet support this expression."
@@ -1497,7 +1499,7 @@ bool SMTEncoder::visit(MemberAccess const& _memberAccess)
 		}
 	}
 
-	m_errorReporter.warning(
+	m_unsupportedErrors.warning(
 		7650_error,
 		_memberAccess.location(),
 		"Assertion checker does not yet support this expression."
@@ -1628,7 +1630,7 @@ void SMTEncoder::indexOrMemberAssignment(Expression const& _expr, smtutil::Expre
 				structType && structType->recursive()
 			)
 			{
-				m_errorReporter.warning(
+				m_unsupportedErrors.warning(
 					4375_error,
 					memberAccess->location(),
 					"Assertion checker does not support recursive structs."
@@ -1742,7 +1744,7 @@ void SMTEncoder::defineGlobalVariable(string const& _name, Expression const& _ex
 	{
 		bool abstract = m_context.createGlobalSymbol(_name, _expr);
 		if (abstract)
-			m_errorReporter.warning(
+			m_unsupportedErrors.warning(
 				1695_error,
 				_expr.location(),
 				"Assertion checker does not yet support this global variable."
@@ -1793,7 +1795,7 @@ void SMTEncoder::arithmeticOperation(BinaryOperation const& _op)
 		break;
 	}
 	default:
-		m_errorReporter.warning(
+		m_unsupportedErrors.warning(
 			5188_error,
 			_op.location(),
 			"Assertion checker does not yet implement this operator."
@@ -1980,7 +1982,7 @@ void SMTEncoder::compareOperation(BinaryOperation const& _op)
 		defineExpr(_op, *value);
 	}
 	else
-		m_errorReporter.warning(
+		m_unsupportedErrors.warning(
 			7229_error,
 			_op.location(),
 			"Assertion checker does not yet implement the type " + _op.annotation().commonType->toString() + " for comparisons"
@@ -2507,7 +2509,7 @@ bool SMTEncoder::createVariable(VariableDeclaration const& _varDecl)
 	bool abstract = m_context.createVariable(_varDecl);
 	if (abstract)
 	{
-		m_errorReporter.warning(
+		m_unsupportedErrors.warning(
 			8115_error,
 			_varDecl.location(),
 			"Assertion checker does not yet support the type of this variable."
@@ -2521,7 +2523,7 @@ smtutil::Expression SMTEncoder::expr(Expression const& _e, Type const* _targetTy
 {
 	if (!m_context.knownExpression(_e))
 	{
-		m_errorReporter.warning(6031_error, _e.location(), "Internal error: Expression undefined for SMT solver." );
+		m_unsupportedErrors.warning(6031_error, _e.location(), "Internal error: Expression undefined for SMT solver." );
 		createExpr(_e);
 	}
 
@@ -2532,7 +2534,7 @@ void SMTEncoder::createExpr(Expression const& _e)
 {
 	bool abstract = m_context.createExpression(_e);
 	if (abstract)
-		m_errorReporter.warning(
+		m_unsupportedErrors.warning(
 			8364_error,
 			_e.location(),
 			"Assertion checker does not yet implement type " + _e.annotation().type->toString()
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 47e51b54de..c16569686a 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -56,6 +56,7 @@ class SMTEncoder: public ASTConstVisitor
 		smt::EncodingContext& _context,
 		ModelCheckerSettings _settings,
 		langutil::UniqueErrorReporter& _errorReporter,
+		langutil::UniqueErrorReporter& _unsupportedErrorReporter,
 		langutil::CharStreamProvider const& _charStreamProvider
 	);
 
@@ -440,6 +441,7 @@ class SMTEncoder: public ASTConstVisitor
 	bool m_checked = true;
 
 	langutil::UniqueErrorReporter& m_errorReporter;
+	langutil::UniqueErrorReporter& m_unsupportedErrors;
 
 	/// Stores the current function/modifier call/invocation path.
 	std::vector<CallStackEntry> m_callStack;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 3a16551eb8..1511b2179b 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -445,7 +445,7 @@ std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
 
 std::optional<Json::Value> checkModelCheckerSettingsKeys(Json::Value const& _input)
 {
-	static set<string> keys{"contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "showProvedSafe", "showUnproved", "solvers", "targets", "timeout"};
+	static set<string> keys{"contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "showProvedSafe", "showUnproved", "showUnsupported", "solvers", "targets", "timeout"};
 	return checkKeys(_input, keys, "modelChecker");
 }
 
@@ -1063,6 +1063,14 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.modelCheckerSettings.showUnproved = showUnproved.asBool();
 	}
 
+	if (modelCheckerSettings.isMember("showUnsupported"))
+	{
+		auto const& showUnsupported = modelCheckerSettings["showUnsupported"];
+		if (!showUnsupported.isBool())
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.showUnsupported must be a Boolean value.");
+		ret.modelCheckerSettings.showUnsupported = showUnsupported.asBool();
+	}
+
 	if (modelCheckerSettings.isMember("solvers"))
 	{
 		auto const& solversArray = modelCheckerSettings["solvers"];
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 8fd2454022..f7c99fd381 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -73,6 +73,7 @@ static string const g_strModelCheckerExtCalls = "model-checker-ext-calls";
 static string const g_strModelCheckerInvariants = "model-checker-invariants";
 static string const g_strModelCheckerShowProvedSafe = "model-checker-show-proved-safe";
 static string const g_strModelCheckerShowUnproved = "model-checker-show-unproved";
+static string const g_strModelCheckerShowUnsupported = "model-checker-show-unsupported";
 static string const g_strModelCheckerSolvers = "model-checker-solvers";
 static string const g_strModelCheckerTargets = "model-checker-targets";
 static string const g_strModelCheckerTimeout = "model-checker-timeout";
@@ -854,6 +855,10 @@ General Information)").c_str(),
 			g_strModelCheckerShowUnproved.c_str(),
 			"Show all unproved targets separately."
 		)
+		(
+			g_strModelCheckerShowUnsupported.c_str(),
+			"Show all unsupported language features separately."
+		)
 		(
 			g_strModelCheckerSolvers.c_str(),
 			po::value<string>()->value_name("cvc4,eld,z3,smtlib2")->default_value("z3"),
@@ -960,6 +965,7 @@ void CommandLineParser::processArgs()
 		{g_strMetadataHash, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerShowProvedSafe, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerShowUnproved, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerShowUnsupported, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerDivModNoSlacks, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerEngine, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerInvariants, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
@@ -1326,6 +1332,9 @@ void CommandLineParser::processArgs()
 	if (m_args.count(g_strModelCheckerShowUnproved))
 		m_options.modelChecker.settings.showUnproved = true;
 
+	if (m_args.count(g_strModelCheckerShowUnsupported))
+		m_options.modelChecker.settings.showUnsupported = true;
+
 	if (m_args.count(g_strModelCheckerSolvers))
 	{
 		string solversStr = m_args[g_strModelCheckerSolvers].as<string>();
@@ -1356,6 +1365,7 @@ void CommandLineParser::processArgs()
 		m_args.count(g_strModelCheckerInvariants) ||
 		m_args.count(g_strModelCheckerShowProvedSafe) ||
 		m_args.count(g_strModelCheckerShowUnproved) ||
+		m_args.count(g_strModelCheckerShowUnsupported) ||
 		m_args.count(g_strModelCheckerSolvers) ||
 		m_args.count(g_strModelCheckerTargets) ||
 		m_args.count(g_strModelCheckerTimeout);
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 93590994a0..9495895278 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -47,6 +47,14 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	else
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT \"show unproved\" choice."));
 
+	auto const& showUnsupported = m_reader.stringSetting("SMTShowUnsupported", "yes");
+	if (showUnsupported == "no")
+		m_modelCheckerSettings.showUnsupported = false;
+	else if (showUnsupported == "yes")
+		m_modelCheckerSettings.showUnsupported = true;
+	else
+		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT \"show unsupported\" choice."));
+
 	m_modelCheckerSettings.solvers = smtutil::SMTSolverChoice::None();
 	auto const& choice = m_reader.stringSetting("SMTSolvers", "z3");
 	if (choice == "none")
diff --git a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
index 6596c6f59d..2d3448ee7b 100644
--- a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
@@ -16,7 +16,7 @@ contract C {
 // Warning 6031: (182-186): Internal error: Expression undefined for SMT solver.
 // Warning 6031: (190-194): Internal error: Expression undefined for SMT solver.
 // Warning 7229: (206-212): Assertion checker does not yet implement the type function (uint256) returns (uint256) for comparisons
-// Warning 6328: (175-195): CHC: Assertion violation happens here.\nCounterexample:\na = 0, b = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0, b = 0\nC.g()\n    C.f(0, 0) -- internal call
-// Warning 6328: (199-213): CHC: Assertion violation happens here.\nCounterexample:\na = 0, b = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0, b = 0\nC.g()\n    C.f(0, 0) -- internal call
 // Warning 5729: (182-186): BMC does not yet implement this type of function call.
 // Warning 5729: (190-194): BMC does not yet implement this type of function call.
+// Warning 6328: (175-195): CHC: Assertion violation happens here.
+// Warning 6328: (199-213): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/unsupported/assembly_1.sol b/test/libsolidity/smtCheckerTests/unsupported/assembly_1.sol
new file mode 100644
index 0000000000..4c7ded3198
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/unsupported/assembly_1.sol
@@ -0,0 +1,18 @@
+contract C {
+    function f(uint x, uint y) public pure {
+        assembly {}
+        assert(x < y);
+    }
+
+    function g(uint x, uint y) public pure {
+        assembly {}
+        assert(x < y);
+    }
+}
+// ====
+// SMTEngine: all
+// SMTShowUnsupported: no
+// ----
+// Warning 5724: SMTChecker: 2 unsupported language feature(s). Enable the model checker option "show unsupported" to see all of them.
+// Warning 6328: (86-99): CHC: Assertion violation happens here.
+// Warning 6328: (181-194): CHC: Assertion violation happens here.
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 1dc180ab4a..6fdecd7fae 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -149,6 +149,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			"--model-checker-invariants=contract,reentrancy",
 			"--model-checker-show-proved-safe",
 			"--model-checker-show-unproved",
+			"--model-checker-show-unsupported",
 			"--model-checker-solvers=z3,smtlib2",
 			"--model-checker-targets=underflow,divByZero",
 			"--model-checker-timeout=5",
@@ -217,6 +218,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			{{InvariantType::Contract, InvariantType::Reentrancy}},
 			true,
 			true,
+			true,
 			{false, false, true, true},
 			{{VerificationTargetType::Underflow, VerificationTargetType::DivByZero}},
 			5,
@@ -414,6 +416,7 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 		{"--metadata-hash=swarm", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--model-checker-show-proved-safe", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--model-checker-show-unproved", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
+		{"--model-checker-show-unsupported", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--model-checker-div-mod-no-slacks", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--model-checker-engine=bmc", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--model-checker-invariants=contract,reentrancy", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 185f547c4b..51b8a0e688 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -112,6 +112,7 @@ void FuzzerUtil::testCompiler(
 			frontend::ModelCheckerInvariants::All(),
 			/*showProvedSafe=*/false,
 			/*showUnproved=*/false,
+			/*showUnsupported=*/false,
 			smtutil::SMTSolverChoice::All(),
 			frontend::ModelCheckerTargets::Default(),
 			/*timeout=*/1

From 6c58f31b4ac0484715ed1105ac4a78b38d7473f3 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 15 Mar 2023 17:52:58 +0100
Subject: [PATCH 1229/1748] add cli tests

---
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../input.sol                                 |  7 ++++
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../input.sol                                 |  7 ++++
 .../args                                      |  1 +
 .../err                                       |  1 +
 .../input.sol                                 |  7 ++++
 .../args                                      |  1 +
 .../err                                       |  5 +++
 .../input.sol                                 |  7 ++++
 .../args                                      |  1 +
 .../err                                       |  5 +++
 .../input.sol                                 |  7 ++++
 .../args                                      |  1 +
 .../err                                       |  5 +++
 .../input.sol                                 |  7 ++++
 .../input.json                                | 21 ++++++++++++
 .../output.json                               | 22 +++++++++++++
 .../input.json                                | 21 ++++++++++++
 .../output.json                               | 22 +++++++++++++
 .../input.json                                | 21 ++++++++++++
 .../output.json                               | 22 +++++++++++++
 .../input.json                                | 22 +++++++++++++
 .../output.json                               | 22 +++++++++++++
 .../input.json                                | 27 ++++++++++++++++
 .../output.json                               | 32 +++++++++++++++++++
 .../input.json                                | 22 +++++++++++++
 .../output.json                               | 22 +++++++++++++
 .../input.json                                | 22 +++++++++++++
 .../output.json                               | 22 +++++++++++++
 .../input.json                                | 22 +++++++++++++
 .../output.json                               | 32 +++++++++++++++++++
 .../input.json                                | 22 +++++++++++++
 .../output.json                               | 32 +++++++++++++++++++
 .../input.json                                | 22 +++++++++++++
 .../output.json                               | 32 +++++++++++++++++++
 .../input.json                                | 22 +++++++++++++
 .../output.json                               | 12 +++++++
 40 files changed, 582 insertions(+)
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_default_all_engines/args
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_default_all_engines/err
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_default_all_engines/input.sol
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_default_bmc/args
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_default_bmc/err
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_default_bmc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_default_chc/args
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_default_chc/err
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_default_chc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_true_all_engines/args
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_true_all_engines/err
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_true_all_engines/input.sol
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_true_bmc/args
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_true_bmc/err
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_true_bmc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_true_chc/args
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_true_chc/err
 create mode 100644 test/cmdlineTests/model_checker_show_unsupported_true_chc/input.sol
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_wrong/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json

diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/args b/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/args
new file mode 100644
index 0000000000..5aeb1490ed
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/args
@@ -0,0 +1 @@
+--model-checker-engine all
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/err b/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/err
new file mode 100644
index 0000000000..578846b362
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/err
@@ -0,0 +1 @@
+Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option "show unsupported" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/input.sol b/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/input.sol
new file mode 100644
index 0000000000..72a8049c17
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_default_all_engines/input.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f() external pure {
+        assembly {}
+    }
+}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_bmc/args b/test/cmdlineTests/model_checker_show_unsupported_default_bmc/args
new file mode 100644
index 0000000000..549f202363
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_default_bmc/args
@@ -0,0 +1 @@
+--model-checker-engine bmc
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_bmc/err b/test/cmdlineTests/model_checker_show_unsupported_default_bmc/err
new file mode 100644
index 0000000000..578846b362
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_default_bmc/err
@@ -0,0 +1 @@
+Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option "show unsupported" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_bmc/input.sol b/test/cmdlineTests/model_checker_show_unsupported_default_bmc/input.sol
new file mode 100644
index 0000000000..72a8049c17
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_default_bmc/input.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f() external pure {
+        assembly {}
+    }
+}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_chc/args b/test/cmdlineTests/model_checker_show_unsupported_default_chc/args
new file mode 100644
index 0000000000..7458a47d35
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_default_chc/args
@@ -0,0 +1 @@
+--model-checker-engine chc
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_chc/err b/test/cmdlineTests/model_checker_show_unsupported_default_chc/err
new file mode 100644
index 0000000000..578846b362
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_default_chc/err
@@ -0,0 +1 @@
+Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option "show unsupported" to see all of them.
diff --git a/test/cmdlineTests/model_checker_show_unsupported_default_chc/input.sol b/test/cmdlineTests/model_checker_show_unsupported_default_chc/input.sol
new file mode 100644
index 0000000000..72a8049c17
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_default_chc/input.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f() external pure {
+        assembly {}
+    }
+}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/args b/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/args
new file mode 100644
index 0000000000..c0e876742b
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/args
@@ -0,0 +1 @@
+--model-checker-engine all --model-checker-show-unsupported
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/err b/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/err
new file mode 100644
index 0000000000..53c664ffc7
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/err
@@ -0,0 +1,5 @@
+Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+ --> model_checker_show_unsupported_true_all_engines/input.sol:5:9:
+  |
+5 |         assembly {}
+  |         ^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/input.sol b/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/input.sol
new file mode 100644
index 0000000000..72a8049c17
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_true_all_engines/input.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f() external pure {
+        assembly {}
+    }
+}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_bmc/args b/test/cmdlineTests/model_checker_show_unsupported_true_bmc/args
new file mode 100644
index 0000000000..ab152ae208
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_true_bmc/args
@@ -0,0 +1 @@
+--model-checker-engine bmc --model-checker-show-unsupported
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_bmc/err b/test/cmdlineTests/model_checker_show_unsupported_true_bmc/err
new file mode 100644
index 0000000000..013a7b0f11
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_true_bmc/err
@@ -0,0 +1,5 @@
+Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+ --> model_checker_show_unsupported_true_bmc/input.sol:5:9:
+  |
+5 |         assembly {}
+  |         ^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_bmc/input.sol b/test/cmdlineTests/model_checker_show_unsupported_true_bmc/input.sol
new file mode 100644
index 0000000000..72a8049c17
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_true_bmc/input.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f() external pure {
+        assembly {}
+    }
+}
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_chc/args b/test/cmdlineTests/model_checker_show_unsupported_true_chc/args
new file mode 100644
index 0000000000..16821838d7
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_true_chc/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-show-unsupported
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_chc/err b/test/cmdlineTests/model_checker_show_unsupported_true_chc/err
new file mode 100644
index 0000000000..8dad0cc65b
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_true_chc/err
@@ -0,0 +1,5 @@
+Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+ --> model_checker_show_unsupported_true_chc/input.sol:5:9:
+  |
+5 |         assembly {}
+  |         ^^^^^^^^^^^
diff --git a/test/cmdlineTests/model_checker_show_unsupported_true_chc/input.sol b/test/cmdlineTests/model_checker_show_unsupported_true_chc/input.sol
new file mode 100644
index 0000000000..72a8049c17
--- /dev/null
+++ b/test/cmdlineTests/model_checker_show_unsupported_true_chc/input.sol
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C {
+    function f() external pure {
+        assembly {}
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/input.json
new file mode 100644
index 0000000000..c307217c6b
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/input.json
@@ -0,0 +1,21 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f() external pure {
+						assembly {}
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/output.json
new file mode 100644
index 0000000000..23cf80defb
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_default_all_engines/output.json
@@ -0,0 +1,22 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5724",
+            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
+
+",
+            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/input.json
new file mode 100644
index 0000000000..668a60e007
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/input.json
@@ -0,0 +1,21 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f() external pure {
+						assembly {}
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "bmc"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/output.json
new file mode 100644
index 0000000000..23cf80defb
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_default_bmc/output.json
@@ -0,0 +1,22 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5724",
+            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
+
+",
+            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/input.json
new file mode 100644
index 0000000000..360235eb4d
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/input.json
@@ -0,0 +1,21 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f() external pure {
+						assembly {}
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/output.json
new file mode 100644
index 0000000000..23cf80defb
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_default_chc/output.json
@@ -0,0 +1,22 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5724",
+            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
+
+",
+            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/input.json
new file mode 100644
index 0000000000..10092aa6f2
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f() external pure {
+						assembly {}
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+			"showUnsupported": false
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/output.json
new file mode 100644
index 0000000000..23cf80defb
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/output.json
@@ -0,0 +1,22 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5724",
+            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
+
+",
+            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/input.json
new file mode 100644
index 0000000000..e3a42c295f
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/input.json
@@ -0,0 +1,27 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					struct S {
+						uint x;
+					}
+					S s;
+					function f(bool b) public {
+						s.x |= b ? 1 : 2;
+						assert(s.x > 0);
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+			"showUnsupported": false
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/output.json
new file mode 100644
index 0000000000..fb599d21d2
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_false_all_engines/standard_model_checker_show_unsupported_false_all_enginesstandard_model_checker_show_unsupported_false_bmc/output.json
@@ -0,0 +1,32 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+",
+            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "2788",
+            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+",
+            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/input.json
new file mode 100644
index 0000000000..7d15e6d7f9
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f() external pure {
+						assembly {}
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "bmc",
+			"showUnsupported": false
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/output.json
new file mode 100644
index 0000000000..23cf80defb
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_false_bmc/output.json
@@ -0,0 +1,22 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5724",
+            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
+
+",
+            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/input.json
new file mode 100644
index 0000000000..4d5a79c6db
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f() external pure {
+						assembly {}
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"showUnsupported": false
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/output.json
new file mode 100644
index 0000000000..23cf80defb
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_false_chc/output.json
@@ -0,0 +1,22 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "5724",
+            "formattedMessage": "Warning: SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.
+
+",
+            "message": "SMTChecker: 1 unsupported language feature(s). Enable the model checker option \"show unsupported\" to see all of them.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/input.json
new file mode 100644
index 0000000000..c1fbeab1b9
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f() external pure {
+						assembly {}
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+			"showUnsupported": true
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/output.json
new file mode 100644
index 0000000000..13d327d405
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_true_all_engines/output.json
@@ -0,0 +1,32 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "7737",
+            "formattedMessage": "Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+ --> A:6:7:
+  |
+6 | \t\t\t\t\t\tassembly {}
+  | \t\t\t\t\t\t^^^^^^^^^^^
+
+",
+            "message": "Inline assembly may cause SMTChecker to produce spurious warnings (false positives).",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 127,
+                "file": "A",
+                "start": 116
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/input.json
new file mode 100644
index 0000000000..38e5cb7a71
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f() external pure {
+						assembly {}
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "bmc",
+			"showUnsupported": true
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/output.json
new file mode 100644
index 0000000000..13d327d405
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_true_bmc/output.json
@@ -0,0 +1,32 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "7737",
+            "formattedMessage": "Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+ --> A:6:7:
+  |
+6 | \t\t\t\t\t\tassembly {}
+  | \t\t\t\t\t\t^^^^^^^^^^^
+
+",
+            "message": "Inline assembly may cause SMTChecker to produce spurious warnings (false positives).",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 127,
+                "file": "A",
+                "start": 116
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/input.json
new file mode 100644
index 0000000000..f84ca46106
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f() external pure {
+						assembly {}
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+			"showUnsupported": true
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/output.json
new file mode 100644
index 0000000000..13d327d405
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_true_chc/output.json
@@ -0,0 +1,32 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "7737",
+            "formattedMessage": "Warning: Inline assembly may cause SMTChecker to produce spurious warnings (false positives).
+ --> A:6:7:
+  |
+6 | \t\t\t\t\t\tassembly {}
+  | \t\t\t\t\t\t^^^^^^^^^^^
+
+",
+            "message": "Inline assembly may cause SMTChecker to produce spurious warnings (false positives).",
+            "severity": "warning",
+            "sourceLocation":
+            {
+                "end": 127,
+                "file": "A",
+                "start": 116
+            },
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/input.json b/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/input.json
new file mode 100644
index 0000000000..9fa8f5a593
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/input.json
@@ -0,0 +1,22 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n\ncontract test {
+					function f() external pure {
+						assembly {}
+					}
+				}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+			"showUnsupported": "aaa"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json b/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json
new file mode 100644
index 0000000000..997b005ef7
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_show_unsupported_wrong/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.showUnsupported must be a Boolean value.",
+            "message": "settings.modelChecker.showUnsupported must be a Boolean value.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}

From 6b73afae447c1efa30a1f9e41622c1d7a682cc98 Mon Sep 17 00:00:00 2001
From: Vaibhaw <kvaibhaw99@gmail.com>
Date: Wed, 1 Mar 2023 18:50:09 +0530
Subject: [PATCH 1230/1748] Removing unencrypted git protocol

---
 scripts/deps-ppa/static_z3.sh | 2 +-
 scripts/release_ppa.sh        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index fa237ba08f..ca15437837 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -89,7 +89,7 @@ Build-Depends: debhelper (>= 9.0.0),
                python3
 Standards-Version: 3.9.6
 Homepage: https://github.com/Z3Prover/z3
-Vcs-Git: git://github.com/Z3Prover/z3.git
+Vcs-Git: https://github.com/Z3Prover/z3.git
 Vcs-Browser: https://github.com/Z3Prover/z3
 
 Package: z3-static
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index 2acd62cd36..aff2e7c254 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -173,7 +173,7 @@ Build-Depends: ${SMTDEPENDENCY}debhelper (>= 9.0.0),
                scons
 Standards-Version: 3.9.5
 Homepage: https://ethereum.org
-Vcs-Git: git://github.com/ethereum/solidity.git
+Vcs-Git: https://github.com/ethereum/solidity.git
 Vcs-Browser: https://github.com/ethereum/solidity
 
 Package: solc

From acaa019785333ed4f62616cef0b3a44013288a6d Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <fare@tunes.org>
Date: Sun, 19 Mar 2023 16:09:42 -0400
Subject: [PATCH 1231/1748] Keep test/lsp.py working when not on a tty

---
 test/lsp.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/lsp.py b/test/lsp.py
index 669951ca4c..11007ae822 100755
--- a/test/lsp.py
+++ b/test/lsp.py
@@ -28,7 +28,8 @@
     import tty
     # Turn off user input buffering so we get the input immediately,
     # not only after a line break
-    tty.setcbreak(sys.stdin.fileno())
+    if os.isatty(sys.stdin.fileno()):
+        tty.setcbreak(sys.stdin.fileno())
 
 
 # Type for the pure test name without .sol suffix or sub directory

From fac5666dc926cb693973f5b3076505686563df0a Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Wed, 23 Nov 2022 15:28:11 +0100
Subject: [PATCH 1232/1748] Re-implement unused assign / unused store
 eliminator.

---
 Changelog.md                                  |   1 +
 libyul/optimiser/UnusedAssignEliminator.cpp   | 124 +++++++++---------
 libyul/optimiser/UnusedAssignEliminator.h     |  73 ++++++-----
 libyul/optimiser/UnusedStoreBase.cpp          |  55 ++++----
 libyul/optimiser/UnusedStoreBase.h            |  45 +++----
 libyul/optimiser/UnusedStoreEliminator.cpp    | 113 +++++++++-------
 libyul/optimiser/UnusedStoreEliminator.h      |  19 ++-
 .../externalContracts/deposit_contract.sol    |   2 +-
 ...nally_assign_before_conditional_revert.yul |  33 +++++
 .../conditionally_assign_before_leave.yul     |  22 ++++
 .../conditionally_assign_before_revert.yul    |  17 +++
 .../for_deep_noremove.yul                     |   5 +-
 .../revert_after_assign_return.yul            |  35 +++++
 13 files changed, 341 insertions(+), 203 deletions(-)
 create mode 100644 test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_conditional_revert.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_leave.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_revert.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedAssignEliminator/revert_after_assign_return.yul

diff --git a/Changelog.md b/Changelog.md
index 5cb2b70959..f51aaffb26 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 Compiler Features:
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
  * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
+ * Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
 
 
 Bugfixes:
diff --git a/libyul/optimiser/UnusedAssignEliminator.cpp b/libyul/optimiser/UnusedAssignEliminator.cpp
index 273aa6b791..60021d4a9d 100644
--- a/libyul/optimiser/UnusedAssignEliminator.cpp
+++ b/libyul/optimiser/UnusedAssignEliminator.cpp
@@ -24,48 +24,49 @@
 
 #include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/OptimizerUtilities.h>
+#include <libyul/ControlFlowSideEffectsCollector.h>
 #include <libyul/AST.h>
+#include <libyul/AsmPrinter.h>
 
 #include <libsolutil/CommonData.h>
 
 #include <range/v3/action/remove_if.hpp>
 
+#include <iostream>
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
 void UnusedAssignEliminator::run(OptimiserStepContext& _context, Block& _ast)
 {
-	UnusedAssignEliminator rae{_context.dialect};
-	rae(_ast);
+	UnusedAssignEliminator uae{
+		_context.dialect,
+		ControlFlowSideEffectsCollector{_context.dialect, _ast}.functionSideEffectsNamed()
+	};
+	uae(_ast);
+
+	uae.m_storesToRemove += uae.m_allStores - uae.m_usedStores;
 
-	StatementRemover remover{rae.m_pendingRemovals};
+	set<Statement const*> toRemove{uae.m_storesToRemove.begin(), uae.m_storesToRemove.end()};
+	StatementRemover remover{toRemove};
 	remover(_ast);
 }
 
 void UnusedAssignEliminator::operator()(Identifier const& _identifier)
 {
-	changeUndecidedTo(_identifier.name, State::Used);
-}
-
-void UnusedAssignEliminator::operator()(VariableDeclaration const& _variableDeclaration)
-{
-	UnusedStoreBase::operator()(_variableDeclaration);
-
-	for (auto const& var: _variableDeclaration.variables)
-		m_declaredVariables.emplace(var.name);
+	markUsed(_identifier.name);
 }
 
 void UnusedAssignEliminator::operator()(Assignment const& _assignment)
 {
 	visit(*_assignment.value);
-	for (auto const& var: _assignment.variableNames)
-		changeUndecidedTo(var.name, State::Unused);
+	// Do not visit the variables because they are Identifiers
 }
 
+
 void UnusedAssignEliminator::operator()(FunctionDefinition const& _functionDefinition)
 {
-	ScopedSaveAndRestore outerDeclaredVariables(m_declaredVariables, {});
 	ScopedSaveAndRestore outerReturnVariables(m_returnVariables, {});
 
 	for (auto const& retParam: _functionDefinition.returnVariables)
@@ -74,20 +75,37 @@ void UnusedAssignEliminator::operator()(FunctionDefinition const& _functionDefin
 	UnusedStoreBase::operator()(_functionDefinition);
 }
 
+void UnusedAssignEliminator::operator()(FunctionCall const& _functionCall)
+{
+	UnusedStoreBase::operator()(_functionCall);
+
+	ControlFlowSideEffects sideEffects;
+	if (auto builtin = m_dialect.builtin(_functionCall.functionName.name))
+		sideEffects = builtin->controlFlowSideEffects;
+	else
+		sideEffects = m_controlFlowSideEffects.at(_functionCall.functionName.name);
+
+	if (!sideEffects.canContinue)
+		// We do not return from the current function, so it is OK to also
+		// clear the return variables.
+		m_activeStores.clear();
+}
+
 void UnusedAssignEliminator::operator()(Leave const&)
 {
 	for (YulString name: m_returnVariables)
-		changeUndecidedTo(name, State::Used);
+		markUsed(name);
+	m_activeStores.clear();
 }
 
 void UnusedAssignEliminator::operator()(Block const& _block)
 {
-	ScopedSaveAndRestore outerDeclaredVariables(m_declaredVariables, {});
-
 	UnusedStoreBase::operator()(_block);
 
-	for (auto const& var: m_declaredVariables)
-		finalize(var, State::Unused);
+	for (auto const& statement: _block.statements)
+		if (auto const* varDecl = get_if<VariableDeclaration>(&statement))
+			for (auto const& var: varDecl->variables)
+				m_activeStores.erase(var.name);
 }
 
 void UnusedAssignEliminator::visit(Statement const& _statement)
@@ -95,63 +113,49 @@ void UnusedAssignEliminator::visit(Statement const& _statement)
 	UnusedStoreBase::visit(_statement);
 
 	if (auto const* assignment = get_if<Assignment>(&_statement))
-		if (assignment->variableNames.size() == 1)
-			// Default-construct it in "Undecided" state if it does not yet exist.
-			m_stores[assignment->variableNames.front().name][&_statement];
+	{
+		// We do not remove assignments whose values might have side-effects,
+		// but clear the active stores to the assigned variables in any case.
+		if (SideEffectsCollector{m_dialect, *assignment->value}.movable())
+		{
+			m_allStores.insert(&_statement);
+			for (auto const& var: assignment->variableNames)
+				m_activeStores[var.name] = {&_statement};
+		}
+		else
+			for (auto const& var: assignment->variableNames)
+				m_activeStores[var.name].clear();
+	}
 }
 
-void UnusedAssignEliminator::shortcutNestedLoop(TrackedStores const& _zeroRuns)
+void UnusedAssignEliminator::shortcutNestedLoop(ActiveStores const& _zeroRuns)
 {
 	// Shortcut to avoid horrible runtime:
 	// Change all assignments that were newly introduced in the for loop to "used".
 	// We do not have to do that with the "break" or "continue" paths, because
 	// they will be joined later anyway.
-	// TODO parallel traversal might be more efficient here.
-	for (auto& [variable, stores]: m_stores)
+
+	for (auto& [variable, stores]: m_activeStores)
+	{
+		auto zeroIt = _zeroRuns.find(variable);
 		for (auto& assignment: stores)
 		{
-			auto zeroIt = _zeroRuns.find(variable);
-			if (zeroIt != _zeroRuns.end() && zeroIt->second.count(assignment.first))
+			if (zeroIt != _zeroRuns.end() && zeroIt->second.count(assignment))
 				continue;
-			assignment.second = State::Value::Used;
+			m_usedStores.insert(assignment);
 		}
+	}
 }
 
 void UnusedAssignEliminator::finalizeFunctionDefinition(FunctionDefinition const& _functionDefinition)
 {
-	for (auto const& param: _functionDefinition.parameters)
-		finalize(param.name, State::Unused);
 	for (auto const& retParam: _functionDefinition.returnVariables)
-		finalize(retParam.name, State::Used);
-}
-
-void UnusedAssignEliminator::changeUndecidedTo(YulString _variable, UnusedAssignEliminator::State _newState)
-{
-	for (auto& assignment: m_stores[_variable])
-		if (assignment.second == State::Undecided)
-			assignment.second = _newState;
+		markUsed(retParam.name);
 }
 
-void UnusedAssignEliminator::finalize(YulString _variable, UnusedAssignEliminator::State _finalState)
+void UnusedAssignEliminator::markUsed(YulString _variable)
 {
-	std::map<Statement const*, State> stores = std::move(m_stores[_variable]);
-	m_stores.erase(_variable);
-
-	for (auto& breakAssignments: m_forLoopInfo.pendingBreakStmts)
-	{
-		util::joinMap(stores, std::move(breakAssignments[_variable]), State::join);
-		breakAssignments.erase(_variable);
-	}
-	for (auto& continueAssignments: m_forLoopInfo.pendingContinueStmts)
-	{
-		util::joinMap(stores, std::move(continueAssignments[_variable]), State::join);
-		continueAssignments.erase(_variable);
-	}
-
-	for (auto&& [statement, state]: stores)
-		if (
-			(state == State::Unused || (state == State::Undecided && _finalState == State::Unused)) &&
-			SideEffectsCollector{m_dialect, *std::get<Assignment>(*statement).value}.movable()
-		)
-			m_pendingRemovals.insert(statement);
+	for (auto& assignment: m_activeStores[_variable])
+		m_usedStores.insert(assignment);
+	m_activeStores.erase(_variable);
 }
diff --git a/libyul/optimiser/UnusedAssignEliminator.h b/libyul/optimiser/UnusedAssignEliminator.h
index b5a2998a17..800d626eb8 100644
--- a/libyul/optimiser/UnusedAssignEliminator.h
+++ b/libyul/optimiser/UnusedAssignEliminator.h
@@ -26,6 +26,7 @@
 #include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/OptimiserStep.h>
 #include <libyul/optimiser/UnusedStoreBase.h>
+#include <libyul/optimiser/Semantics.h>
 
 #include <map>
 #include <vector>
@@ -62,28 +63,34 @@ struct Dialect;
  * Detailed rules:
  *
  * The AST is traversed twice: in an information gathering step and in the
- * actual removal step. During information gathering, we maintain a
- * mapping from assignment statements to the three states
- * "unused", "undecided" and "used".
- * When an assignment is visited, it is added to the mapping in the "undecided" state
- * (see remark about for loops below) and every other assignment to the same variable
- * that is still in the "undecided" state is changed to "unused".
- * When a variable is referenced, the state of any assignment to that variable still
- * in the "undecided" state is changed to "used".
- * At points where control flow splits, a copy
- * of the mapping is handed over to each branch. At points where control flow
- * joins, the two mappings coming from the two branches are combined in the following way:
- * Statements that are only in one mapping or have the same state are used unchanged.
- * Conflicting values are resolved in the following way:
- * "unused", "undecided" -> "undecided"
- * "unused", "used" -> "used"
- * "undecided, "used" -> "used".
+ * actual removal step. During information gathering, assignment statements
+ * can be marked as "potentially unused" or as "used".
+ *
+ * When an assignment is visited, it is stored in the "set of all stores" and
+ * added to the branch-dependent "active" sets for the assigned variables. This active
+ * set for a variable contains all statements where that variable was last assigned to, i.e.
+ * where a read from that variable could read from.
+ * Furthermore, all other active sets for the assigned variables are cleared.
+ *
+ * When a reference to a variable is visited, the active assignments to that variable
+ * in the current branch are marked as "used". This mark is permanent.
+ * Also, the active set for this variable in the current branch is cleared.
+ *
+ * At points where control-flow splits, we maintain a copy of the active set
+ * (all other data structures are shared across branches).
+ *
+ * At control-flow joins, we combine the sets of active stores for each variable.
+ *
+ * In the example above, the active set right after the assignment "b := mload(a)" (but before
+ * the control-flow join) is "b := mload(a)"; the assignment "b := 2" was removed.
+ * After the control-flow join it will contain both "b := mload(a)" and "b := 2", coming from
+ * the two branches.
  *
  * For for-loops, the condition, body and post-part are visited twice, taking
  * the joining control-flow at the condition into account.
  * In other words, we create three control flow paths: Zero runs of the loop,
  * one run and two runs and then combine them at the end.
- * Running at most twice is enough because there are only three different states.
+ * Running at most twice is enough because this takes into account all possible control-flow connections.
  *
  * Since this algorithm has exponential runtime in the nesting depth of for loops,
  * a shortcut is taken at a certain nesting level: We only use the zero- and
@@ -93,14 +100,13 @@ struct Dialect;
  * For switch statements that have a "default"-case, there is no control-flow
  * part that skips the switch.
  *
- * At ``leave`` statements, all return variables are set to "used".
- *
- * When a variable goes out of scope, all statements still in the "undecided"
- * state are changed to "unused", unless the variable is the return
- * parameter of a function - there, the state changes to "used".
+ * At ``leave`` statements, all return variables are set to "used" and the set of active statements
+ * is cleared.
  *
- * In the second traversal, all assignments that are in the "unused" state are removed.
+ * If a function or builtin is called that does not continue, the set of active statements is
+ * cleared for all variables.
  *
+ * In the second traversal, all assignments that are not marked as "used" are removed.
  *
  * This step is usually run right after the SSA transform to complete
  * the generation of the pseudo-SSA.
@@ -113,12 +119,18 @@ class UnusedAssignEliminator: public UnusedStoreBase
 	static constexpr char const* name{"UnusedAssignEliminator"};
 	static void run(OptimiserStepContext&, Block& _ast);
 
-	explicit UnusedAssignEliminator(Dialect const& _dialect): UnusedStoreBase(_dialect) {}
+	explicit UnusedAssignEliminator(
+		Dialect const& _dialect,
+		std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects
+	):
+		UnusedStoreBase(_dialect),
+		m_controlFlowSideEffects(_controlFlowSideEffects)
+	{}
 
 	void operator()(Identifier const& _identifier) override;
-	void operator()(VariableDeclaration const& _variableDeclaration) override;
 	void operator()(Assignment const& _assignment) override;
 	void operator()(FunctionDefinition const&) override;
+	void operator()(FunctionCall const& _functionCall) override;
 	void operator()(Leave const&) override;
 	void operator()(Block const& _block) override;
 
@@ -126,18 +138,13 @@ class UnusedAssignEliminator: public UnusedStoreBase
 	void visit(Statement const& _statement) override;
 
 private:
-	void shortcutNestedLoop(TrackedStores const& _beforeLoop) override;
+	void shortcutNestedLoop(ActiveStores const& _beforeLoop) override;
 	void finalizeFunctionDefinition(FunctionDefinition const& _functionDefinition) override;
 
-	void changeUndecidedTo(YulString _variable, State _newState);
-	/// Called when a variable goes out of scope. Sets the state of all still undecided
-	/// assignments to the final state. In this case, this also applies to pending
-	/// break and continue TrackedStores.
-	void finalize(YulString _variable, State _finalState);
-
+	void markUsed(YulString _variable);
 
-	std::set<YulString> m_declaredVariables;
 	std::set<YulString> m_returnVariables;
+	std::map<YulString, ControlFlowSideEffects> m_controlFlowSideEffects;
 };
 
 }
diff --git a/libyul/optimiser/UnusedStoreBase.cpp b/libyul/optimiser/UnusedStoreBase.cpp
index 49f5508427..c31fda89c6 100644
--- a/libyul/optimiser/UnusedStoreBase.cpp
+++ b/libyul/optimiser/UnusedStoreBase.cpp
@@ -37,47 +37,50 @@ void UnusedStoreBase::operator()(If const& _if)
 {
 	visit(*_if.condition);
 
-	TrackedStores skipBranch{m_stores};
+	ActiveStores skipBranch{m_activeStores};
 	(*this)(_if.body);
 
-	merge(m_stores, std::move(skipBranch));
+	merge(m_activeStores, std::move(skipBranch));
 }
 
 void UnusedStoreBase::operator()(Switch const& _switch)
 {
 	visit(*_switch.expression);
 
-	TrackedStores const preState{m_stores};
+	ActiveStores const preState{m_activeStores};
 
 	bool hasDefault = false;
-	vector<TrackedStores> branches;
+	vector<ActiveStores> branches;
 	for (auto const& c: _switch.cases)
 	{
 		if (!c.value)
 			hasDefault = true;
 		(*this)(c.body);
-		branches.emplace_back(std::move(m_stores));
-		m_stores = preState;
+		branches.emplace_back(std::move(m_activeStores));
+		m_activeStores = preState;
 	}
 
 	if (hasDefault)
 	{
-		m_stores = std::move(branches.back());
+		m_activeStores = std::move(branches.back());
 		branches.pop_back();
 	}
 	for (auto& branch: branches)
-		merge(m_stores, std::move(branch));
+		merge(m_activeStores, std::move(branch));
 }
 
 void UnusedStoreBase::operator()(FunctionDefinition const& _functionDefinition)
 {
-	ScopedSaveAndRestore outerAssignments(m_stores, {});
+	ScopedSaveAndRestore allStores(m_allStores, {});
+	ScopedSaveAndRestore usedStores(m_usedStores, {});
+	ScopedSaveAndRestore outerAssignments(m_activeStores, {});
 	ScopedSaveAndRestore forLoopInfo(m_forLoopInfo, {});
 	ScopedSaveAndRestore forLoopNestingDepth(m_forLoopNestingDepth, 0);
 
 	(*this)(_functionDefinition.body);
 
 	finalizeFunctionDefinition(_functionDefinition);
+	m_storesToRemove += m_allStores - m_usedStores;
 }
 
 void UnusedStoreBase::operator()(ForLoop const& _forLoop)
@@ -94,10 +97,10 @@ void UnusedStoreBase::operator()(ForLoop const& _forLoop)
 
 	visit(*_forLoop.condition);
 
-	TrackedStores zeroRuns{m_stores};
+	ActiveStores zeroRuns{m_activeStores};
 
 	(*this)(_forLoop.body);
-	merge(m_stores, std::move(m_forLoopInfo.pendingContinueStmts));
+	merge(m_activeStores, std::move(m_forLoopInfo.pendingContinueStmts));
 	m_forLoopInfo.pendingContinueStmts = {};
 	(*this)(_forLoop.post);
 
@@ -106,54 +109,54 @@ void UnusedStoreBase::operator()(ForLoop const& _forLoop)
 	if (m_forLoopNestingDepth < 6)
 	{
 		// Do the second run only for small nesting depths to avoid horrible runtime.
-		TrackedStores oneRun{m_stores};
+		ActiveStores oneRun{m_activeStores};
 
 		(*this)(_forLoop.body);
 
-		merge(m_stores, std::move(m_forLoopInfo.pendingContinueStmts));
+		merge(m_activeStores, std::move(m_forLoopInfo.pendingContinueStmts));
 		m_forLoopInfo.pendingContinueStmts.clear();
 		(*this)(_forLoop.post);
 
 		visit(*_forLoop.condition);
 		// Order of merging does not matter because "max" is commutative and associative.
-		merge(m_stores, std::move(oneRun));
+		merge(m_activeStores, std::move(oneRun));
 	}
 	else
 		// Shortcut to avoid horrible runtime.
 		shortcutNestedLoop(zeroRuns);
 
 	// Order of merging does not matter because "max" is commutative and associative.
-	merge(m_stores, std::move(zeroRuns));
-	merge(m_stores, std::move(m_forLoopInfo.pendingBreakStmts));
+	merge(m_activeStores, std::move(zeroRuns));
+	merge(m_activeStores, std::move(m_forLoopInfo.pendingBreakStmts));
 	m_forLoopInfo.pendingBreakStmts.clear();
 }
 
 void UnusedStoreBase::operator()(Break const&)
 {
-	m_forLoopInfo.pendingBreakStmts.emplace_back(std::move(m_stores));
-	m_stores.clear();
+	m_forLoopInfo.pendingBreakStmts.emplace_back(std::move(m_activeStores));
+	m_activeStores.clear();
 }
 
 void UnusedStoreBase::operator()(Continue const&)
 {
-	m_forLoopInfo.pendingContinueStmts.emplace_back(std::move(m_stores));
-	m_stores.clear();
+	m_forLoopInfo.pendingContinueStmts.emplace_back(std::move(m_activeStores));
+	m_activeStores.clear();
 }
 
-void UnusedStoreBase::merge(TrackedStores& _target, TrackedStores&& _other)
+void UnusedStoreBase::merge(ActiveStores& _target, ActiveStores&& _other)
 {
 	util::joinMap(_target, std::move(_other), [](
-		map<Statement const*, State>& _assignmentHere,
-		map<Statement const*, State>&& _assignmentThere
+		set<Statement const*>& _storesHere,
+		set<Statement const*>&& _storesThere
 	)
 	{
-		return util::joinMap(_assignmentHere, std::move(_assignmentThere), State::join);
+		_storesHere += _storesThere;
 	});
 }
 
-void UnusedStoreBase::merge(TrackedStores& _target, vector<TrackedStores>&& _source)
+void UnusedStoreBase::merge(ActiveStores& _target, vector<ActiveStores>&& _source)
 {
-	for (TrackedStores& ts: _source)
+	for (ActiveStores& ts: _source)
 		merge(_target, std::move(ts));
 	_source.clear();
 }
diff --git a/libyul/optimiser/UnusedStoreBase.h b/libyul/optimiser/UnusedStoreBase.h
index 15dccb04a2..0d618d8d25 100644
--- a/libyul/optimiser/UnusedStoreBase.h
+++ b/libyul/optimiser/UnusedStoreBase.h
@@ -38,8 +38,11 @@ struct Dialect;
  *
  * The class tracks the state of abstract "stores" (assignments or mstore/sstore
  * statements) across the control-flow. It is the job of the derived class to create
- * the stores and track references, but the base class adjusts their "used state" at
- * control-flow splits and joins.
+ * the stores and track references, but the base class manages control-flow splits and joins.
+ *
+ * In general, active stores are those where it has not yet been determined if they are used
+ * or not. Those are split and joined at control-flow forks. Once a store has been deemed
+ * used, it is removed from the active set and marked as used and this will never change.
  *
  * Prerequisite: Disambiguator, ForLoopInitRewriter.
  */
@@ -57,28 +60,12 @@ class UnusedStoreBase: public ASTWalker
 	void operator()(Continue const&) override;
 
 protected:
-	class State
-	{
-	public:
-		enum Value { Unused, Undecided, Used };
-		State(Value _value = Undecided): m_value(_value) {}
-		inline bool operator==(State _other) const { return m_value == _other.m_value; }
-		inline bool operator!=(State _other) const { return !operator==(_other); }
-		static inline void join(State& _a, State const& _b)
-		{
-			// Using "max" works here because of the order of the values in the enum.
-			_a.m_value =  Value(std::max(int(_a.m_value), int(_b.m_value)));
-		}
-	private:
-		Value m_value = Undecided;
-	};
-
-	using TrackedStores = std::map<YulString, std::map<Statement const*, State>>;
+	using ActiveStores = std::map<YulString, std::set<Statement const*>>;
 
 	/// This function is called for a loop that is nested too deep to avoid
 	/// horrible runtime and should just resolve the situation in a pragmatic
 	/// and correct manner.
-	virtual void shortcutNestedLoop(TrackedStores const& _beforeLoop) = 0;
+	virtual void shortcutNestedLoop(ActiveStores const& _beforeLoop) = 0;
 
 	/// This function is called right before the scoped restore of the function definition.
 	virtual void finalizeFunctionDefinition(FunctionDefinition const& /*_functionDefinition*/) {}
@@ -86,20 +73,26 @@ class UnusedStoreBase: public ASTWalker
 	/// Joins the assignment mapping of @a _source into @a _target according to the rules laid out
 	/// above.
 	/// Will destroy @a _source.
-	static void merge(TrackedStores& _target, TrackedStores&& _source);
-	static void merge(TrackedStores& _target, std::vector<TrackedStores>&& _source);
+	static void merge(ActiveStores& _target, ActiveStores&& _source);
+	static void merge(ActiveStores& _target, std::vector<ActiveStores>&& _source);
 
 	Dialect const& m_dialect;
-	std::set<Statement const*> m_pendingRemovals;
-	TrackedStores m_stores;
+	/// Set of all stores encountered during the traversal (in the current function).
+	std::set<Statement const*> m_allStores;
+	/// Set of stores that are marked as being used (in the current function).
+	std::set<Statement const*> m_usedStores;
+	/// List of stores that can be removed (globally).
+	std::vector<Statement const*> m_storesToRemove;
+	/// Active (undecided) stores in the current branch.
+	ActiveStores m_activeStores;
 
 	/// Working data for traversing for-loops.
 	struct ForLoopInfo
 	{
 		/// Tracked assignment states for each break statement.
-		std::vector<TrackedStores> pendingBreakStmts;
+		std::vector<ActiveStores> pendingBreakStmts;
 		/// Tracked assignment states for each continue statement.
-		std::vector<TrackedStores> pendingContinueStmts;
+		std::vector<ActiveStores> pendingContinueStmts;
 	};
 	ForLoopInfo m_forLoopInfo;
 	size_t m_forLoopNestingDepth = 0;
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index 3df9c63196..2c3d03e4ed 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -78,17 +78,17 @@ void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
 		ignoreMemory
 	};
 	rse(_ast);
-	if (
-		auto evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
-		evmDialect && evmDialect->providesObjectAccess()
-	)
-		rse.changeUndecidedTo(State::Unused, Location::Memory);
+
+	auto evmDialect = dynamic_cast<EVMDialect const*>(&_context.dialect);
+	if (evmDialect && evmDialect->providesObjectAccess())
+		rse.clearActive(Location::Memory);
 	else
-		rse.changeUndecidedTo(State::Used, Location::Memory);
-	rse.changeUndecidedTo(State::Used, Location::Storage);
-	rse.scheduleUnusedForDeletion();
+		rse.markActiveAsUsed(Location::Memory);
+	rse.markActiveAsUsed(Location::Storage);
+	rse.m_storesToRemove += rse.m_allStores - rse.m_usedStores;
 
-	StatementRemover remover(rse.m_pendingRemovals);
+	set<Statement const*> toRemove{rse.m_storesToRemove.begin(), rse.m_storesToRemove.end()};
+	StatementRemover remover{toRemove};
 	remover(_ast);
 }
 
@@ -121,12 +121,12 @@ void UnusedStoreEliminator::operator()(FunctionCall const& _functionCall)
 		sideEffects = m_controlFlowSideEffects.at(_functionCall.functionName.name);
 
 	if (sideEffects.canTerminate)
-		changeUndecidedTo(State::Used, Location::Storage);
+		markActiveAsUsed(Location::Storage);
 	if (!sideEffects.canContinue)
 	{
-		changeUndecidedTo(State::Unused, Location::Memory);
+		clearActive(Location::Memory);
 		if (!sideEffects.canTerminate)
-			changeUndecidedTo(State::Unused, Location::Storage);
+			clearActive(Location::Storage);
 	}
 }
 
@@ -139,7 +139,7 @@ void UnusedStoreEliminator::operator()(FunctionDefinition const& _functionDefini
 
 void UnusedStoreEliminator::operator()(Leave const&)
 {
-	changeUndecidedTo(State::Used);
+	markActiveAsUsed();
 }
 
 void UnusedStoreEliminator::visit(Statement const& _statement)
@@ -183,10 +183,14 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 	yulAssert(isCandidateForRemoval == (isStorageWrite || (!m_ignoreMemory && isMemoryWrite)));
 	if (isCandidateForRemoval)
 	{
-		State initialState = State::Undecided;
 		if (*instruction == Instruction::RETURNDATACOPY)
 		{
-			initialState = State::Used;
+			// Out-of-bounds access to the returndata buffer results in a revert,
+			// so we are careful not to remove a potentially reverting call to a builtin.
+			// The only way the Solidity compiler uses `returndatacopy` is
+			// `returndatacopy(X, 0, returndatasize())`, so we only allow to remove this pattern
+			// (which is guaranteed to never cause an out-of-bounds revert).
+			bool allowReturndatacopyToBeRemoved = false;
 			auto startOffset = identifierNameIfSSA(funCall->arguments.at(1));
 			auto length = identifierNameIfSSA(funCall->arguments.at(2));
 			if (length && startOffset)
@@ -197,22 +201,22 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 					lengthCall &&
 					toEVMInstruction(m_dialect, lengthCall->functionName.name) == Instruction::RETURNDATASIZE
 				)
-					initialState = State::Undecided;
+					allowReturndatacopyToBeRemoved = true;
 			}
+			if (!allowReturndatacopyToBeRemoved)
+				return;
 		}
-		m_stores[YulString{}].insert({&_statement, initialState});
+		m_allStores.insert(&_statement);
 		vector<Operation> operations = operationsFromFunctionCall(*funCall);
 		yulAssert(operations.size() == 1, "");
+		if (operations.front().location == Location::Storage)
+			activeStorageStores().insert(&_statement);
+		else
+			activeMemoryStores().insert(&_statement);
 		m_storeOperations[&_statement] = std::move(operations.front());
 	}
 }
 
-void UnusedStoreEliminator::finalizeFunctionDefinition(FunctionDefinition const&)
-{
-	changeUndecidedTo(State::Used);
-	scheduleUnusedForDeletion();
-}
-
 vector<UnusedStoreEliminator::Operation> UnusedStoreEliminator::operationsFromFunctionCall(
 	FunctionCall const& _functionCall
 ) const
@@ -265,15 +269,28 @@ vector<UnusedStoreEliminator::Operation> UnusedStoreEliminator::operationsFromFu
 
 void UnusedStoreEliminator::applyOperation(UnusedStoreEliminator::Operation const& _operation)
 {
-	for (auto& [statement, state]: m_stores[YulString{}])
-		if (state == State::Undecided)
+	set<Statement const*>& active =
+		_operation.location == Location::Storage ?
+		activeStorageStores() :
+		activeMemoryStores();
+
+
+	for (auto it = active.begin(); it != active.end();)
+	{
+		Statement const* statement = *it;
+		Operation const& storeOperation = m_storeOperations.at(statement);
+		if (_operation.effect == Effect::Read && !knownUnrelated(storeOperation, _operation))
 		{
-			Operation const& storeOperation = m_storeOperations.at(statement);
-			if (_operation.effect == Effect::Read && !knownUnrelated(storeOperation, _operation))
-				state = State::Used;
-			else if (_operation.effect == Effect::Write && knownCovered(storeOperation, _operation))
-				state = State::Unused;
+			// This store is read from, mark it as used and remove it from the active set.
+			m_usedStores.insert(statement);
+			it = active.erase(it);
 		}
+		else if (_operation.effect == Effect::Write && knownCovered(storeOperation, _operation))
+			// This store is overwritten before being read, remove it from the active set.
+			it = active.erase(it);
+		else
+			++it;
+	}
 }
 
 bool UnusedStoreEliminator::knownUnrelated(
@@ -390,16 +407,27 @@ bool UnusedStoreEliminator::knownCovered(
 	return false;
 }
 
-void UnusedStoreEliminator::changeUndecidedTo(
-	State _newState,
-	optional<UnusedStoreEliminator::Location> _onlyLocation)
+void UnusedStoreEliminator::markActiveAsUsed(
+	optional<UnusedStoreEliminator::Location> _onlyLocation
+)
 {
-	for (auto& [statement, state]: m_stores[YulString{}])
-		if (
-			state == State::Undecided &&
-			(_onlyLocation == nullopt || *_onlyLocation == m_storeOperations.at(statement).location)
-		)
-			state = _newState;
+	if (_onlyLocation == nullopt || _onlyLocation == Location::Memory)
+		for (Statement const* statement: activeMemoryStores())
+			m_usedStores.insert(statement);
+	if (_onlyLocation == nullopt || _onlyLocation == Location::Storage)
+		for (Statement const* statement: activeStorageStores())
+			m_usedStores.insert(statement);
+	clearActive(_onlyLocation);
+}
+
+void UnusedStoreEliminator::clearActive(
+	optional<UnusedStoreEliminator::Location> _onlyLocation
+)
+{
+	if (_onlyLocation == nullopt || _onlyLocation == Location::Memory)
+		activeMemoryStores() = {};
+	if (_onlyLocation == nullopt || _onlyLocation == Location::Storage)
+		activeStorageStores() = {};
 }
 
 optional<YulString> UnusedStoreEliminator::identifierNameIfSSA(Expression const& _expression) const
@@ -409,10 +437,3 @@ optional<YulString> UnusedStoreEliminator::identifierNameIfSSA(Expression const&
 			return {identifier->name};
 	return nullopt;
 }
-
-void UnusedStoreEliminator::scheduleUnusedForDeletion()
-{
-	for (auto const& [statement, state]: m_stores[YulString{}])
-		if (state == State::Unused)
-			m_pendingRemovals.insert(statement);
-}
diff --git a/libyul/optimiser/UnusedStoreEliminator.h b/libyul/optimiser/UnusedStoreEliminator.h
index 7fbf9885ff..89dbabd78d 100644
--- a/libyul/optimiser/UnusedStoreEliminator.h
+++ b/libyul/optimiser/UnusedStoreEliminator.h
@@ -50,8 +50,7 @@ struct AssignedValue;
  * to sstore, as we don't know whether the memory location will be read once we leave the function's scope,
  * so the statement will be removed only if all code code paths lead to a memory overwrite.
  *
- * The m_store member of UnusedStoreBase is only used with the empty yul string
- * as key in the first dimension.
+ * The m_store member of UnusedStoreBase uses the key "m" for memory and "s" for storage stores.
  *
  * Best run in SSA form.
  *
@@ -93,20 +92,26 @@ class UnusedStoreEliminator: public UnusedStoreBase
 	};
 
 private:
-	void shortcutNestedLoop(TrackedStores const&) override
+	std::set<Statement const*>& activeMemoryStores() { return m_activeStores["m"_yulstring]; }
+	std::set<Statement const*>& activeStorageStores() { return m_activeStores["s"_yulstring]; }
+
+	void shortcutNestedLoop(ActiveStores const&) override
 	{
 		// We might only need to do this for newly introduced stores in the loop.
-		changeUndecidedTo(State::Used);
+		markActiveAsUsed();
+	}
+	void finalizeFunctionDefinition(FunctionDefinition const&) override
+	{
+		markActiveAsUsed();
 	}
-	void finalizeFunctionDefinition(FunctionDefinition const&) override;
 
 	std::vector<Operation> operationsFromFunctionCall(FunctionCall const& _functionCall) const;
 	void applyOperation(Operation const& _operation);
 	bool knownUnrelated(Operation const& _op1, Operation const& _op2) const;
 	bool knownCovered(Operation const& _covered, Operation const& _covering) const;
 
-	void changeUndecidedTo(State _newState, std::optional<Location> _onlyLocation = std::nullopt);
-	void scheduleUnusedForDeletion();
+	void markActiveAsUsed(std::optional<Location> _onlyLocation = std::nullopt);
+	void clearActive(std::optional<Location> _onlyLocation = std::nullopt);
 
 	std::optional<YulString> identifierNameIfSSA(Expression const& _expression) const;
 
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 389661fd7a..48f7247a66 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,7 +176,7 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 1430741
+// gas irOptimized: 1419712
 // gas legacy: 2427905
 // gas legacyOptimized: 1773081
 // supportsInterface(bytes4): 0x0 -> 0
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_conditional_revert.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_conditional_revert.yul
new file mode 100644
index 0000000000..3eeea6f4dd
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_conditional_revert.yul
@@ -0,0 +1,33 @@
+{
+    function g() {
+        if calldataload(10) { revert(0, 0) }
+    }
+    function f() {
+        let a := calldataload(0)
+        if calldataload(1) {
+            // this can NOT be removed
+            a := 2
+            g()
+        }
+        sstore(0, a)
+    }
+}
+// ----
+// step: unusedAssignEliminator
+//
+// {
+//     function g()
+//     {
+//         if calldataload(10) { revert(0, 0) }
+//     }
+//     function f()
+//     {
+//         let a := calldataload(0)
+//         if calldataload(1)
+//         {
+//             a := 2
+//             g()
+//         }
+//         sstore(0, a)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_leave.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_leave.yul
new file mode 100644
index 0000000000..4564f5d075
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_leave.yul
@@ -0,0 +1,22 @@
+{
+    function f() {
+        let a := calldataload(0)
+        if calldataload(1) {
+            // this can be removed
+            a := 2
+            leave
+        }
+        sstore(0, a)
+    }
+}
+// ----
+// step: unusedAssignEliminator
+//
+// {
+//     function f()
+//     {
+//         let a := calldataload(0)
+//         if calldataload(1) { leave }
+//         sstore(0, a)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_revert.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_revert.yul
new file mode 100644
index 0000000000..469da01fc4
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/conditionally_assign_before_revert.yul
@@ -0,0 +1,17 @@
+{
+    let a := calldataload(0)
+    if calldataload(1) {
+        // this can be removed
+        a := 2
+        revert(0, 0)
+    }
+    sstore(0, a)
+}
+// ----
+// step: unusedAssignEliminator
+//
+// {
+//     let a := calldataload(0)
+//     if calldataload(1) { revert(0, 0) }
+//     sstore(0, a)
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
index 02a735f9e5..c0a84c2450 100644
--- a/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/for_deep_noremove.yul
@@ -46,10 +46,7 @@
 //                         for { } 1 { }
 //                         {
 //                             for { } 1 { a := 10 }
-//                             {
-//                                 b := 12
-//                                 b := 11
-//                             }
+//                             { b := 11 }
 //                         }
 //                     }
 //                 }
diff --git a/test/libyul/yulOptimizerTests/unusedAssignEliminator/revert_after_assign_return.yul b/test/libyul/yulOptimizerTests/unusedAssignEliminator/revert_after_assign_return.yul
new file mode 100644
index 0000000000..0a8a3582ff
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedAssignEliminator/revert_after_assign_return.yul
@@ -0,0 +1,35 @@
+{
+    function g() -> x {
+        x := 7
+        if calldataload(0) {
+            x := 3
+            reverting()
+        }
+        if calldataload(1) {
+            x := 3
+            leave
+        }
+        x := 2
+        reverting()
+    }
+    function reverting() { revert(0, 0) }
+    sstore(0, g())
+}
+// ----
+// step: unusedAssignEliminator
+//
+// {
+//     function g() -> x
+//     {
+//         if calldataload(0) { reverting() }
+//         if calldataload(1)
+//         {
+//             x := 3
+//             leave
+//         }
+//         reverting()
+//     }
+//     function reverting()
+//     { revert(0, 0) }
+//     sstore(0, g())
+// }

From 0dd40d2ad2a295671b22dcedc4dfa10dce96255c Mon Sep 17 00:00:00 2001
From: mmqxyz <127844428+mmqxyz@users.noreply.github.com>
Date: Mon, 20 Mar 2023 20:12:56 +0100
Subject: [PATCH 1233/1748] Fix small typos in abi-spec.rst

---
 docs/abi-spec.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 44988c8dc1..dd798c0a3e 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -581,7 +581,7 @@ An event description is a JSON object with fairly similar fields:
   * ``name``: the name of the parameter.
   * ``type``: the canonical type of the parameter (more below).
   * ``components``: used for tuple types (more below).
-  * ``indexed``: ``true`` if the field is part of the log's topics, ``false`` if it one of the log's data segment.
+  * ``indexed``: ``true`` if the field is part of the log's topics, ``false`` if it is one of the log's data segments.
 
 - ``anonymous``: ``true`` if the event was declared as ``anonymous``.
 

From a0e62bbd3d45da338a5d68cbbe9a053f3fa082b2 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 15 Mar 2023 14:38:03 +0100
Subject: [PATCH 1234/1748] Annotate function ID of functions that may be
 called via the internal dispatch.

Co-authored-by: Daniel <daniel@ekpyron.org>
---
 Changelog.md                                  |    4 +
 libsolidity/ast/ASTAnnotations.h              |    1 +
 libsolidity/ast/ASTJsonExporter.cpp           |    4 +
 .../codegen/ir/IRGenerationContext.cpp        |   14 -
 libsolidity/codegen/ir/IRGenerationContext.h  |   10 -
 libsolidity/codegen/ir/IRGenerator.cpp        |    3 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   |    2 +-
 libsolidity/interface/CompilerStack.cpp       |   29 +
 libsolidity/interface/CompilerStack.h         |    3 +
 .../ast_internal_function_id_export.json      | 1540 +++++++++++++++++
 .../ast_internal_function_id_export.sol       |   48 +
 11 files changed, 1631 insertions(+), 27 deletions(-)
 create mode 100644 test/libsolidity/ASTJSON/ast_internal_function_id_export.json
 create mode 100644 test/libsolidity/ASTJSON/ast_internal_function_id_export.sol

diff --git a/Changelog.md b/Changelog.md
index f51aaffb26..ac0ff9b371 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,10 @@ Compiler Features:
 Bugfixes:
 
 
+AST Changes:
+ * AST: add the ``internalFunctionID`` field to the AST nodes of functions that may be called via the internal dispatch. These IDs are always generated, but they are only used in via-IR code generation.
+
+
 ### 0.8.19 (2023-02-22)
 
 Language Features:
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index b85eb3ad0a..d5087c429e 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -178,6 +178,7 @@ struct CallableDeclarationAnnotation: DeclarationAnnotation
 
 struct FunctionDefinitionAnnotation: CallableDeclarationAnnotation, StructurallyDocumentedAnnotation
 {
+	util::SetOnce<uint64_t> internalFunctionID;
 };
 
 struct EventDefinitionAnnotation: CallableDeclarationAnnotation, StructurallyDocumentedAnnotation
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index e35d108216..4dc2f86c5e 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -468,6 +468,10 @@ bool ASTJsonExporter::visit(FunctionDefinition const& _node)
 		attributes.emplace_back("functionSelector", _node.externalIdentifierHex());
 	if (!_node.annotation().baseFunctions.empty())
 		attributes.emplace_back(make_pair("baseFunctions", getContainerIds(_node.annotation().baseFunctions, true)));
+
+	if (_node.annotation().internalFunctionID.set())
+		attributes.emplace_back("internalFunctionID", *_node.annotation().internalFunctionID);
+
 	setJsonNode(_node, "FunctionDefinition", std::move(attributes));
 	return false;
 }
diff --git a/libsolidity/codegen/ir/IRGenerationContext.cpp b/libsolidity/codegen/ir/IRGenerationContext.cpp
index cb1c371dc9..9ff3a6afea 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.cpp
+++ b/libsolidity/codegen/ir/IRGenerationContext.cpp
@@ -177,17 +177,3 @@ ABIFunctions IRGenerationContext::abiFunctions()
 {
 	return ABIFunctions(m_evmVersion, m_revertStrings, m_functions);
 }
-
-uint64_t IRGenerationContext::internalFunctionID(FunctionDefinition const& _function, bool _requirePresent)
-{
-	auto [iterator, inserted] = m_functionIDs.try_emplace(_function.id(), m_functionIDs.size() + 1);
-	if (_requirePresent)
-			solAssert(!inserted, "");
-	return iterator->second;
-}
-
-void IRGenerationContext::copyFunctionIDsFrom(IRGenerationContext const& _other)
-{
-	solAssert(m_functionIDs.empty(), "");
-	m_functionIDs = _other.m_functionIDs;
-}
diff --git a/libsolidity/codegen/ir/IRGenerationContext.h b/libsolidity/codegen/ir/IRGenerationContext.h
index ea960bb70b..14a70a8a6c 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.h
+++ b/libsolidity/codegen/ir/IRGenerationContext.h
@@ -163,14 +163,6 @@ class IRGenerationContext
 	bool memoryUnsafeInlineAssemblySeen() const { return m_memoryUnsafeInlineAssemblySeen; }
 	void setMemoryUnsafeInlineAssemblySeen() { m_memoryUnsafeInlineAssemblySeen = true; }
 
-	/// @returns the runtime ID to be used for the function in the dispatch routine
-	/// and for internal function pointers.
-	/// @param _requirePresent if false, generates a new ID if not yet done.
-	uint64_t internalFunctionID(FunctionDefinition const& _function, bool _requirePresent);
-	/// Copies the internal function IDs from the @a _other. For use in transferring
-	/// function IDs from constructor code to deployed code.
-	void copyFunctionIDsFrom(IRGenerationContext const& _other);
-
 	std::map<std::string, unsigned> const& sourceIndices() const { return m_sourceIndices; }
 	void markSourceUsed(std::string const& _name) { m_usedSourceNames.insert(_name); }
 	std::set<std::string> const& usedSourceNames() const { return m_usedSourceNames; }
@@ -219,8 +211,6 @@ class IRGenerationContext
 	/// the code contains a call via a pointer even though a specific function is never assigned to it.
 	/// It will fail at runtime but the code must still compile.
 	InternalDispatchMap m_internalDispatchMap;
-	/// Map used by @a internalFunctionID.
-	std::map<int64_t, uint64_t> m_functionIDs;
 
 	std::set<ContractDefinition const*, ASTNode::CompareByID> m_subObjects;
 
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 3713018041..cf11a8a02b 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -313,7 +313,7 @@ InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefin
 				solAssert(m_context.functionCollector().contains(IRNames::function(*function)), "");
 
 				cases.emplace_back(map<string, string>{
-					{"funID", to_string(m_context.internalFunctionID(*function, true))},
+					{"funID", to_string(*function->annotation().internalFunctionID)},
 					{"name", IRNames::function(*function)}
 				});
 			}
@@ -1117,7 +1117,6 @@ void IRGenerator::resetContext(ContractDefinition const& _contract, ExecutionCon
 		m_context.debugInfoSelection(),
 		m_context.soliditySourceProvider()
 	);
-	newContext.copyFunctionIDsFrom(m_context);
 	m_context = std::move(newContext);
 
 	m_context.setMostDerivedContract(_contract);
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index a9eb0bf152..2263e11496 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2807,7 +2807,7 @@ void IRGeneratorForStatements::assignInternalFunctionIDIfNotCalledDirectly(
 		return;
 
 	define(IRVariable(_expression).part("functionIdentifier")) <<
-		to_string(m_context.internalFunctionID(_referencedFunction, false)) <<
+		to_string(*_referencedFunction.annotation().internalFunctionID) <<
 		"\n";
 	m_context.addToInternalDispatch(_referencedFunction);
 }
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 14fa3c5289..13eaae08a6 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -526,6 +526,7 @@ bool CompilerStack::analyze()
 		if (noErrors)
 		{
 			createAndAssignCallGraphs();
+			annotateInternalFunctionIDs();
 			findAndReportCyclicContractDependencies();
 		}
 
@@ -1245,6 +1246,34 @@ void CompilerStack::storeContractDefinitions()
 			}
 }
 
+void CompilerStack::annotateInternalFunctionIDs()
+{
+	uint64_t internalFunctionID = 1;
+	for (Source const* source: m_sourceOrder)
+	{
+		if (!source->ast)
+			continue;
+
+		for (ContractDefinition const* contract: ASTNode::filteredNodes<ContractDefinition>(source->ast->nodes()))
+		{
+			ContractDefinitionAnnotation& annotation = contract->annotation();
+
+			if (auto const* deployTimeInternalDispatch = util::valueOrNullptr((*annotation.deployedCallGraph)->edges, CallGraph::SpecialNode::InternalDispatch))
+				for (auto const& node: *deployTimeInternalDispatch)
+					if (auto const* callable = get_if<CallableDeclaration const*>(&node))
+						if (auto const* function = dynamic_cast<FunctionDefinition const*>(*callable))
+							if (!function->annotation().internalFunctionID.set())
+								function->annotation().internalFunctionID = internalFunctionID++;
+			if (auto const* creationTimeInternalDispatch = util::valueOrNullptr((*annotation.creationCallGraph)->edges, CallGraph::SpecialNode::InternalDispatch))
+				for (auto const& node: *creationTimeInternalDispatch)
+					if (auto const* callable = get_if<CallableDeclaration const*>(&node))
+						if (auto const* function = dynamic_cast<FunctionDefinition const*>(*callable))
+							// Make sure the function already got an ID since it also occurs in the deploy-time internal dispatch.
+							solAssert(function->annotation().internalFunctionID.set());
+		}
+	}
+}
+
 namespace
 {
 bool onlySafeExperimentalFeaturesActivated(set<ExperimentalFeature> const& features)
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 099c1f0030..cd74214058 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -415,6 +415,9 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// Store the contract definitions in m_contracts.
 	void storeContractDefinitions();
 
+	/// Annotate internal dispatch function Ids
+	void annotateInternalFunctionIDs();
+
 	/// @returns true if the source is requested to be compiled.
 	bool isRequestedSource(std::string const& _sourceName) const;
 
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
new file mode 100644
index 0000000000..02da00d6dd
--- /dev/null
+++ b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
@@ -0,0 +1,1540 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "C":
+    [
+      128
+    ],
+    "D":
+    [
+      141
+    ],
+    "L":
+    [
+      53
+    ],
+    "free1":
+    [
+      4
+    ],
+    "free2":
+    [
+      8
+    ],
+    "free3":
+    [
+      12
+    ]
+  },
+  "id": 142,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "body":
+      {
+        "id": 3,
+        "nodeType": "Block",
+        "src": "17:2:1",
+        "statements": []
+      },
+      "id": 4,
+      "implemented": true,
+      "internalFunctionID": 1,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "free1",
+      "nameLocation": "9:5:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 1,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "14:2:1"
+      },
+      "returnParameters":
+      {
+        "id": 2,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "17:0:1"
+      },
+      "scope": 142,
+      "src": "0:19:1",
+      "stateMutability": "nonpayable",
+      "virtual": false,
+      "visibility": "internal"
+    },
+    {
+      "body":
+      {
+        "id": 7,
+        "nodeType": "Block",
+        "src": "37:2:1",
+        "statements": []
+      },
+      "id": 8,
+      "implemented": true,
+      "internalFunctionID": 2,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "free2",
+      "nameLocation": "29:5:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 5,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "34:2:1"
+      },
+      "returnParameters":
+      {
+        "id": 6,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "37:0:1"
+      },
+      "scope": 142,
+      "src": "20:19:1",
+      "stateMutability": "nonpayable",
+      "virtual": false,
+      "visibility": "internal"
+    },
+    {
+      "body":
+      {
+        "id": 11,
+        "nodeType": "Block",
+        "src": "57:2:1",
+        "statements": []
+      },
+      "id": 12,
+      "implemented": true,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "free3",
+      "nameLocation": "49:5:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 9,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "54:2:1"
+      },
+      "returnParameters":
+      {
+        "id": 10,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "57:0:1"
+      },
+      "scope": 142,
+      "src": "40:19:1",
+      "stateMutability": "nonpayable",
+      "virtual": false,
+      "visibility": "internal"
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "L",
+      "contractDependencies": [],
+      "contractKind": "library",
+      "fullyImplemented": true,
+      "id": 53,
+      "linearizedBaseContracts":
+      [
+        53
+      ],
+      "name": "L",
+      "nameLocation": "68:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 15,
+            "nodeType": "Block",
+            "src": "100:2:1",
+            "statements": []
+          },
+          "functionSelector": "cf9f23b5",
+          "id": 16,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "ext",
+          "nameLocation": "85:3:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 13,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "88:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 14,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "100:0:1"
+          },
+          "scope": 53,
+          "src": "76:26:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "external"
+        },
+        {
+          "body":
+          {
+            "id": 19,
+            "nodeType": "Block",
+            "src": "132:2:1",
+            "statements": []
+          },
+          "id": 20,
+          "implemented": true,
+          "internalFunctionID": 3,
+          "kind": "function",
+          "modifiers": [],
+          "name": "inr1",
+          "nameLocation": "116:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 17,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "120:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 18,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "132:0:1"
+          },
+          "scope": 53,
+          "src": "107:27:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "internal"
+        },
+        {
+          "body":
+          {
+            "id": 23,
+            "nodeType": "Block",
+            "src": "164:2:1",
+            "statements": []
+          },
+          "id": 24,
+          "implemented": true,
+          "internalFunctionID": 4,
+          "kind": "function",
+          "modifiers": [],
+          "name": "inr2",
+          "nameLocation": "148:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 21,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "152:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 22,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "164:0:1"
+          },
+          "scope": 53,
+          "src": "139:27:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "internal"
+        },
+        {
+          "body":
+          {
+            "id": 27,
+            "nodeType": "Block",
+            "src": "196:2:1",
+            "statements": []
+          },
+          "id": 28,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "inr3",
+          "nameLocation": "180:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 25,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "184:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 26,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "196:0:1"
+          },
+          "scope": 53,
+          "src": "171:27:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "internal"
+        },
+        {
+          "body":
+          {
+            "id": 39,
+            "nodeType": "Block",
+            "src": "228:51:1",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "id": 31,
+                  "name": "free1",
+                  "nodeType": "Identifier",
+                  "overloadedDeclarations": [],
+                  "referencedDeclaration": 4,
+                  "src": "238:5:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                    "typeString": "function ()"
+                  }
+                },
+                "id": 32,
+                "nodeType": "ExpressionStatement",
+                "src": "238:5:1"
+              },
+              {
+                "expression":
+                {
+                  "id": 33,
+                  "name": "inr1",
+                  "nodeType": "Identifier",
+                  "overloadedDeclarations": [],
+                  "referencedDeclaration": 20,
+                  "src": "253:4:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                    "typeString": "function ()"
+                  }
+                },
+                "id": 34,
+                "nodeType": "ExpressionStatement",
+                "src": "253:4:1"
+              },
+              {
+                "expression":
+                {
+                  "expression":
+                  {
+                    "id": 35,
+                    "name": "L",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 53,
+                    "src": "267:1:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_type$_t_contract$_L_$53_$",
+                      "typeString": "type(library L)"
+                    }
+                  },
+                  "id": 37,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "lValueRequested": false,
+                  "memberLocation": "269:3:1",
+                  "memberName": "ext",
+                  "nodeType": "MemberAccess",
+                  "referencedDeclaration": 16,
+                  "src": "267:5:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
+                    "typeString": "function ()"
+                  }
+                },
+                "id": 38,
+                "nodeType": "ExpressionStatement",
+                "src": "267:5:1"
+              }
+            ]
+          },
+          "functionSelector": "71907f17",
+          "id": 40,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "access",
+          "nameLocation": "212:6:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 29,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "218:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 30,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "228:0:1"
+          },
+          "scope": 53,
+          "src": "203:76:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        },
+        {
+          "body":
+          {
+            "id": 51,
+            "nodeType": "Block",
+            "src": "313:44:1",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "id": 43,
+                        "name": "free2",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 8,
+                        "src": "324:5:1",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 44,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "323:7:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 45,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "323:9:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 46,
+                "nodeType": "ExpressionStatement",
+                "src": "323:9:1"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "id": 47,
+                        "name": "inr2",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 24,
+                        "src": "343:4:1",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 48,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "342:6:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 49,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "342:8:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 50,
+                "nodeType": "ExpressionStatement",
+                "src": "342:8:1"
+              }
+            ]
+          },
+          "functionSelector": "4228dae0",
+          "id": 52,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "expression",
+          "nameLocation": "293:10:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 41,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "303:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 42,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "313:0:1"
+          },
+          "scope": 53,
+          "src": "284:73:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 142,
+      "src": "60:299:1",
+      "usedErrors": []
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "C",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 128,
+      "linearizedBaseContracts":
+      [
+        128
+      ],
+      "name": "C",
+      "nameLocation": "369:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 56,
+            "nodeType": "Block",
+            "src": "402:2:1",
+            "statements": []
+          },
+          "functionSelector": "05b07a6b",
+          "id": 57,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "ext1",
+          "nameLocation": "386:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 54,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "390:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 55,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "402:0:1"
+          },
+          "scope": 128,
+          "src": "377:27:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "external"
+        },
+        {
+          "body":
+          {
+            "id": 60,
+            "nodeType": "Block",
+            "src": "434:2:1",
+            "statements": []
+          },
+          "functionSelector": "5aa6e183",
+          "id": 61,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "ext2",
+          "nameLocation": "418:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 58,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "422:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 59,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "434:0:1"
+          },
+          "scope": 128,
+          "src": "409:27:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "external"
+        },
+        {
+          "body":
+          {
+            "id": 64,
+            "nodeType": "Block",
+            "src": "466:2:1",
+            "statements": []
+          },
+          "functionSelector": "0a77b8ef",
+          "id": 65,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "ext3",
+          "nameLocation": "450:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 62,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "454:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 63,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "466:0:1"
+          },
+          "scope": 128,
+          "src": "441:27:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "external"
+        },
+        {
+          "body":
+          {
+            "id": 68,
+            "nodeType": "Block",
+            "src": "498:2:1",
+            "statements": []
+          },
+          "id": 69,
+          "implemented": true,
+          "internalFunctionID": 5,
+          "kind": "function",
+          "modifiers": [],
+          "name": "inr1",
+          "nameLocation": "482:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 66,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "486:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 67,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "498:0:1"
+          },
+          "scope": 128,
+          "src": "473:27:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "internal"
+        },
+        {
+          "body":
+          {
+            "id": 72,
+            "nodeType": "Block",
+            "src": "530:2:1",
+            "statements": []
+          },
+          "id": 73,
+          "implemented": true,
+          "internalFunctionID": 6,
+          "kind": "function",
+          "modifiers": [],
+          "name": "inr2",
+          "nameLocation": "514:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 70,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "518:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 71,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "530:0:1"
+          },
+          "scope": 128,
+          "src": "505:27:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "internal"
+        },
+        {
+          "body":
+          {
+            "id": 76,
+            "nodeType": "Block",
+            "src": "562:2:1",
+            "statements": []
+          },
+          "id": 77,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "inr3",
+          "nameLocation": "546:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 74,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "550:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 75,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "562:0:1"
+          },
+          "scope": 128,
+          "src": "537:27:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "internal"
+        },
+        {
+          "body":
+          {
+            "id": 96,
+            "nodeType": "Block",
+            "src": "594:86:1",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "expression":
+                  {
+                    "id": 80,
+                    "name": "this",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": -28,
+                    "src": "604:4:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_contract$_C_$128",
+                      "typeString": "contract C"
+                    }
+                  },
+                  "id": 82,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "lValueRequested": false,
+                  "memberLocation": "609:4:1",
+                  "memberName": "ext1",
+                  "nodeType": "MemberAccess",
+                  "referencedDeclaration": 57,
+                  "src": "604:9:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
+                    "typeString": "function () external"
+                  }
+                },
+                "id": 83,
+                "nodeType": "ExpressionStatement",
+                "src": "604:9:1"
+              },
+              {
+                "expression":
+                {
+                  "id": 84,
+                  "name": "inr1",
+                  "nodeType": "Identifier",
+                  "overloadedDeclarations": [],
+                  "referencedDeclaration": 69,
+                  "src": "623:4:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                    "typeString": "function ()"
+                  }
+                },
+                "id": 85,
+                "nodeType": "ExpressionStatement",
+                "src": "623:4:1"
+              },
+              {
+                "expression":
+                {
+                  "id": 86,
+                  "name": "free1",
+                  "nodeType": "Identifier",
+                  "overloadedDeclarations": [],
+                  "referencedDeclaration": 4,
+                  "src": "637:5:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                    "typeString": "function ()"
+                  }
+                },
+                "id": 87,
+                "nodeType": "ExpressionStatement",
+                "src": "637:5:1"
+              },
+              {
+                "expression":
+                {
+                  "expression":
+                  {
+                    "id": 88,
+                    "name": "L",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 53,
+                    "src": "652:1:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_type$_t_contract$_L_$53_$",
+                      "typeString": "type(library L)"
+                    }
+                  },
+                  "id": 90,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "lValueRequested": false,
+                  "memberLocation": "654:4:1",
+                  "memberName": "inr1",
+                  "nodeType": "MemberAccess",
+                  "referencedDeclaration": 20,
+                  "src": "652:6:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                    "typeString": "function ()"
+                  }
+                },
+                "id": 91,
+                "nodeType": "ExpressionStatement",
+                "src": "652:6:1"
+              },
+              {
+                "expression":
+                {
+                  "expression":
+                  {
+                    "id": 92,
+                    "name": "L",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 53,
+                    "src": "668:1:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_type$_t_contract$_L_$53_$",
+                      "typeString": "type(library L)"
+                    }
+                  },
+                  "id": 94,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "lValueRequested": false,
+                  "memberLocation": "670:3:1",
+                  "memberName": "ext",
+                  "nodeType": "MemberAccess",
+                  "referencedDeclaration": 16,
+                  "src": "668:5:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
+                    "typeString": "function ()"
+                  }
+                },
+                "id": 95,
+                "nodeType": "ExpressionStatement",
+                "src": "668:5:1"
+              }
+            ]
+          },
+          "functionSelector": "71907f17",
+          "id": 97,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "access",
+          "nameLocation": "578:6:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 78,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "584:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 79,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "594:0:1"
+          },
+          "scope": 128,
+          "src": "569:111:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        },
+        {
+          "body":
+          {
+            "id": 126,
+            "nodeType": "Block",
+            "src": "714:106:1",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "expression":
+                        {
+                          "id": 100,
+                          "name": "this",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": -28,
+                          "src": "725:4:1",
+                          "typeDescriptions":
+                          {
+                            "typeIdentifier": "t_contract$_C_$128",
+                            "typeString": "contract C"
+                          }
+                        },
+                        "id": 102,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberLocation": "730:4:1",
+                        "memberName": "ext2",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 61,
+                        "src": "725:9:1",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
+                          "typeString": "function () external"
+                        }
+                      }
+                    ],
+                    "id": 103,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "724:11:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
+                      "typeString": "function () external"
+                    }
+                  },
+                  "id": 104,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "724:13:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 105,
+                "nodeType": "ExpressionStatement",
+                "src": "724:13:1"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "id": 106,
+                        "name": "inr2",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 73,
+                        "src": "748:4:1",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 107,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "747:6:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 108,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "747:8:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 109,
+                "nodeType": "ExpressionStatement",
+                "src": "747:8:1"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "id": 110,
+                        "name": "free2",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 8,
+                        "src": "766:5:1",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 111,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "765:7:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 112,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "765:9:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 113,
+                "nodeType": "ExpressionStatement",
+                "src": "765:9:1"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "expression":
+                        {
+                          "id": 114,
+                          "name": "L",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 53,
+                          "src": "785:1:1",
+                          "typeDescriptions":
+                          {
+                            "typeIdentifier": "t_type$_t_contract$_L_$53_$",
+                            "typeString": "type(library L)"
+                          }
+                        },
+                        "id": 116,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberLocation": "787:4:1",
+                        "memberName": "inr2",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 24,
+                        "src": "785:6:1",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 117,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "784:8:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 118,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "784:10:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 119,
+                "nodeType": "ExpressionStatement",
+                "src": "784:10:1"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "expression":
+                        {
+                          "id": 120,
+                          "name": "L",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 53,
+                          "src": "805:1:1",
+                          "typeDescriptions":
+                          {
+                            "typeIdentifier": "t_type$_t_contract$_L_$53_$",
+                            "typeString": "type(library L)"
+                          }
+                        },
+                        "id": 122,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberLocation": "807:3:1",
+                        "memberName": "ext",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 16,
+                        "src": "805:5:1",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 123,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "804:7:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_delegatecall_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 124,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "804:9:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 125,
+                "nodeType": "ExpressionStatement",
+                "src": "804:9:1"
+              }
+            ]
+          },
+          "functionSelector": "4228dae0",
+          "id": 127,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "expression",
+          "nameLocation": "694:10:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 98,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "704:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 99,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "714:0:1"
+          },
+          "scope": 128,
+          "src": "685:135:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 142,
+      "src": "360:462:1",
+      "usedErrors": []
+    },
+    {
+      "abstract": false,
+      "baseContracts":
+      [
+        {
+          "baseName":
+          {
+            "id": 129,
+            "name": "C",
+            "nameLocations":
+            [
+              "837:1:1"
+            ],
+            "nodeType": "IdentifierPath",
+            "referencedDeclaration": 128,
+            "src": "837:1:1"
+          },
+          "id": 130,
+          "nodeType": "InheritanceSpecifier",
+          "src": "837:1:1"
+        }
+      ],
+      "canonicalName": "D",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 141,
+      "linearizedBaseContracts":
+      [
+        141,
+        128
+      ],
+      "name": "D",
+      "nameLocation": "832:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 139,
+            "nodeType": "Block",
+            "src": "859:47:1",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "id": 133,
+                    "name": "access",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 97,
+                    "src": "869:6:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 134,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "869:8:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 135,
+                "nodeType": "ExpressionStatement",
+                "src": "869:8:1"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "id": 136,
+                    "name": "expression",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 127,
+                    "src": "887:10:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 137,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "887:12:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 138,
+                "nodeType": "ExpressionStatement",
+                "src": "887:12:1"
+              }
+            ]
+          },
+          "id": 140,
+          "implemented": true,
+          "kind": "constructor",
+          "modifiers": [],
+          "name": "",
+          "nameLocation": "-1:-1:-1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 131,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "856:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 132,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "859:0:1"
+          },
+          "scope": 141,
+          "src": "845:61:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 142,
+      "src": "823:85:1",
+      "usedErrors": []
+    }
+  ],
+  "src": "0:909:1"
+}
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_id_export.sol b/test/libsolidity/ASTJSON/ast_internal_function_id_export.sol
new file mode 100644
index 0000000000..100897b71f
--- /dev/null
+++ b/test/libsolidity/ASTJSON/ast_internal_function_id_export.sol
@@ -0,0 +1,48 @@
+function free1() {}
+function free2() {}
+function free3() {}
+library L {
+    function ext() external {}
+    function inr1() internal {}
+    function inr2() internal {}
+    function inr3() internal {}
+    function access() public {
+        free1;
+        inr1;
+        L.ext;
+    }
+    function expression() public {
+        (free2)();
+        (inr2)();
+    }
+}
+contract C {
+    function ext1() external {}
+    function ext2() external {}
+    function ext3() external {}
+    function inr1() internal {}
+    function inr2() internal {}
+    function inr3() internal {}
+    function access() public {
+        this.ext1;
+        inr1;
+        free1;
+        L.inr1;
+        L.ext;
+    }
+    function expression() public {
+        (this.ext2)();
+        (inr2)();
+        (free2)();
+        (L.inr2)();
+        (L.ext)();
+    }
+}
+contract D is C {
+    constructor() {
+        access();
+        expression();
+    }
+}
+
+// ----

From 3fb1628358243658086459d432545c686e9602e1 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 21 Mar 2023 13:56:50 -0500
Subject: [PATCH 1235/1748] [scripts/splitSources.py] Add newline to files.

---
 scripts/splitSources.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/splitSources.py b/scripts/splitSources.py
index d31202fb79..7dc91acceb 100755
--- a/scripts/splitSources.py
+++ b/scripts/splitSources.py
@@ -47,7 +47,7 @@ def writeSourceToFile(lines):
         for idx, line in enumerate(lines[1:]):
             # write to file
             if line[:12] != "==== Source:":
-                f.write(line)
+                f.write(line + '\n')
 
             # recursive call if there is another source
             else:

From 0158de60bebda81e8f2ca87e9393e38e335e8a84 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 20 Mar 2023 16:49:39 -0300
Subject: [PATCH 1236/1748] Refactored NumberUnit and FunctionDefinition. Added
 OctalNumber. Fixed number followed by identifier with no whitespace.

---
 Changelog.md                                  |  3 +++
 docs/grammar/SolidityLexer.g4                 | 16 +++++++++++-
 docs/grammar/SolidityParser.g4                | 26 +++++++++++++++----
 .../invalid_denomination_no_whitespace.sol    |  5 ++++
 .../two_denominations_same_literal.sol        |  5 ++++
 .../freeFunctions/named_fallback_warning.sol  |  3 +++
 .../freeFunctions/named_receive_warning.sol   |  3 +++
 .../literals/invalid_hex_number.sol           |  5 ++++
 ...valid_octal_denomination_no_whitespace.sol |  5 ++++
 .../literals/invalid_octal_digits.sol         |  5 ++++
 .../literals/invalid_octal_number.sol         |  5 ++++
 11 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/denominations/invalid_denomination_no_whitespace.sol
 create mode 100644 test/libsolidity/syntaxTests/denominations/two_denominations_same_literal.sol
 create mode 100644 test/libsolidity/syntaxTests/freeFunctions/named_fallback_warning.sol
 create mode 100644 test/libsolidity/syntaxTests/freeFunctions/named_receive_warning.sol
 create mode 100644 test/libsolidity/syntaxTests/literals/invalid_hex_number.sol
 create mode 100644 test/libsolidity/syntaxTests/literals/invalid_octal_denomination_no_whitespace.sol
 create mode 100644 test/libsolidity/syntaxTests/literals/invalid_octal_digits.sol
 create mode 100644 test/libsolidity/syntaxTests/literals/invalid_octal_number.sol

diff --git a/Changelog.md b/Changelog.md
index f51aaffb26..6c17c147b7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,9 @@ Compiler Features:
 
 
 Bugfixes:
+ * Antlr Grammar: Fix discrepancy with the parser, which allowed octal numbers.
+ * Antlr Grammar: Fix of a discrepancy with the parser, which allowed numbers followed by an identifier with no whitespace.
+ * Antlr Grammar: Stricter rules for function definitions. The grammar will no longer accept as valid free functions having specifiers which are exclusive to contract functions.
 
 
 ### 0.8.19 (2023-02-22)
diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index e1d0da6a90..306afd92ff 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -62,7 +62,7 @@ New: 'new';
 /**
  * Unit denomination for numbers.
  */
-NumberUnit: 'wei' | 'gwei' | 'ether' | 'seconds' | 'minutes' | 'hours' | 'days' | 'weeks' | 'years';
+SubDenomination: 'wei' | 'gwei' | 'ether' | 'seconds' | 'minutes' | 'hours' | 'days' | 'weeks' | 'years';
 Override: 'override';
 Payable: 'payable';
 Pragma: 'pragma' -> pushMode(PragmaMode);
@@ -220,6 +220,14 @@ fragment EvenHexDigits: HexCharacter HexCharacter ('_'? HexCharacter HexCharacte
 //@doc:inline
 fragment HexCharacter: [0-9A-Fa-f];
 
+/**
+ * Scanned but not used by any rule, i.e, disallowed.
+ * solc parser considers number starting with '0', not immediately followed by '.' or 'x' as
+ * octal, even if non octal digits '8' and '9' are present.
+ */
+OctalNumber: '0' DecimalDigits ('.' DecimalDigits)?;
+
+
 /**
  * A decimal number literal consists of decimal digits that may be delimited by underscores and
  * an optional positive or negative exponent.
@@ -230,6 +238,12 @@ DecimalNumber: (DecimalDigits | (DecimalDigits? '.' DecimalDigits)) ([eE] '-'? D
 fragment DecimalDigits: [0-9] ('_'? [0-9])* ;
 
 
+/**
+ * This is needed to avoid successfully parsing a number followed by a string with no whitespace between.
+ */
+DecimalNumberFollowedByIdentifier: DecimalNumber Identifier;
+
+
 /**
  * An identifier in solidity has to start with a letter, a dollar-sign or an underscore and
  * may additionally contain numbers after the first symbol.
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index 673f1c071f..d2ef74cff5 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -16,7 +16,7 @@ sourceUnit: (
 	| contractDefinition
 	| interfaceDefinition
 	| libraryDefinition
-	| functionDefinition
+	| freeFunctionDefinition
 	| constantVariableDeclaration
 	| structDefinition
 	| enumDefinition
@@ -85,7 +85,7 @@ inheritanceSpecifier: name=identifierPath arguments=callArgumentList?;
  */
 contractBodyElement:
 	constructorDefinition
-	| functionDefinition
+	| contractFunctionDefinition
 	| modifierDefinition
 	| fallbackFunctionDefinition
 	| receiveFunctionDefinition
@@ -156,12 +156,12 @@ overrideSpecifier: Override (LParen overrides+=identifierPath (Comma overrides+=
  * Depending on the context in which the function is defined, further restrictions may apply,
  * e.g. functions in interfaces have to be unimplemented, i.e. may not contain a body block.
  */
-functionDefinition
+contractFunctionDefinition
 locals[
 	boolean visibilitySet = false,
 	boolean mutabilitySet = false,
 	boolean virtualSet = false,
-	boolean overrideSpecifierSet = false
+	boolean overrideSpecifierSet = false,
 ]
 :
 	Function (identifier | Fallback | Receive)
@@ -175,6 +175,17 @@ locals[
 	 )*
 	(Returns LParen returnParameters=parameterList RParen)?
 	(Semicolon | body=block);
+
+/**
+ * The definition of a free function.
+ */
+ freeFunctionDefinition:
+ 	Function (identifier | Fallback | Receive)
+ 	LParen (arguments=parameterList)? RParen
+ 	stateMutability?
+ 	(Returns LParen returnParameters=parameterList RParen)?
+ 	(Semicolon | body=block);
+
 /**
  * The definition of a modifier.
  * Note that within the body block of a modifier, the underscore cannot be used as identifier,
@@ -394,6 +405,7 @@ expression:
  	| (
 		identifier
 		| literal
+		| literalWithSubDenomination
 		| elementaryTypeName[false]
 	  ) # PrimaryExpression
 ;
@@ -412,6 +424,9 @@ inlineArrayExpression: LBrack (expression ( Comma expression)* ) RBrack;
 identifier: Identifier | From | Error | Revert | Global;
 
 literal: stringLiteral | numberLiteral | booleanLiteral | hexStringLiteral | unicodeStringLiteral;
+
+literalWithSubDenomination: numberLiteral SubDenomination;
+
 booleanLiteral: True | False;
 /**
  * A full string literal consists of either one or several consecutive quoted strings.
@@ -429,7 +444,8 @@ unicodeStringLiteral: UnicodeStringLiteral+;
 /**
  * Number literals can be decimal or hexadecimal numbers with an optional unit.
  */
-numberLiteral: (DecimalNumber | HexNumber) NumberUnit?;
+numberLiteral: DecimalNumber | HexNumber;
+
 /**
  * A curly-braced block of statements. Opens its own scope.
  */
diff --git a/test/libsolidity/syntaxTests/denominations/invalid_denomination_no_whitespace.sol b/test/libsolidity/syntaxTests/denominations/invalid_denomination_no_whitespace.sol
new file mode 100644
index 0000000000..f67fde89d7
--- /dev/null
+++ b/test/libsolidity/syntaxTests/denominations/invalid_denomination_no_whitespace.sol
@@ -0,0 +1,5 @@
+contract C {
+	uint constant y = 1wei;
+}
+// ----
+// ParserError 8936: (32-33): Identifier-start is not allowed at end of a number.
diff --git a/test/libsolidity/syntaxTests/denominations/two_denominations_same_literal.sol b/test/libsolidity/syntaxTests/denominations/two_denominations_same_literal.sol
new file mode 100644
index 0000000000..8583e1d427
--- /dev/null
+++ b/test/libsolidity/syntaxTests/denominations/two_denominations_same_literal.sol
@@ -0,0 +1,5 @@
+contract C {
+	uint constant y = 8 gwei ether;
+}
+// ----
+// ParserError 2314: (39-44): Expected ';' but got 'ether'
diff --git a/test/libsolidity/syntaxTests/freeFunctions/named_fallback_warning.sol b/test/libsolidity/syntaxTests/freeFunctions/named_fallback_warning.sol
new file mode 100644
index 0000000000..8f0c0ea3fc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/freeFunctions/named_fallback_warning.sol
@@ -0,0 +1,3 @@
+function fallback() {}
+// ----
+// Warning 3445: (9-17): This function is named "fallback" but is not the fallback function of the contract. If you intend this to be a fallback function, use "fallback(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/named_receive_warning.sol b/test/libsolidity/syntaxTests/freeFunctions/named_receive_warning.sol
new file mode 100644
index 0000000000..25c8602416
--- /dev/null
+++ b/test/libsolidity/syntaxTests/freeFunctions/named_receive_warning.sol
@@ -0,0 +1,3 @@
+function receive() {}
+// ----
+// Warning 3445: (9-16): This function is named "receive" but is not the receive function of the contract. If you intend this to be a receive function, use "receive(...) { ... }" without the "function" keyword to define it.
diff --git a/test/libsolidity/syntaxTests/literals/invalid_hex_number.sol b/test/libsolidity/syntaxTests/literals/invalid_hex_number.sol
new file mode 100644
index 0000000000..1cc7e0eccb
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literals/invalid_hex_number.sol
@@ -0,0 +1,5 @@
+contract C {
+    uint x = 0x1000abcdefgh;
+}
+// ----
+// ParserError 8936: (26-38): Identifier-start is not allowed at end of a number.
diff --git a/test/libsolidity/syntaxTests/literals/invalid_octal_denomination_no_whitespace.sol b/test/libsolidity/syntaxTests/literals/invalid_octal_denomination_no_whitespace.sol
new file mode 100644
index 0000000000..a4ec101c30
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literals/invalid_octal_denomination_no_whitespace.sol
@@ -0,0 +1,5 @@
+contract C {
+    uint y = 01gwei;
+}
+// ----
+// ParserError 8936: (26-27): Octal numbers not allowed.
diff --git a/test/libsolidity/syntaxTests/literals/invalid_octal_digits.sol b/test/libsolidity/syntaxTests/literals/invalid_octal_digits.sol
new file mode 100644
index 0000000000..8565377a09
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literals/invalid_octal_digits.sol
@@ -0,0 +1,5 @@
+contract C {
+    uint y = 098;
+}
+// ----
+// ParserError 8936: (26-27): Octal numbers not allowed.
diff --git a/test/libsolidity/syntaxTests/literals/invalid_octal_number.sol b/test/libsolidity/syntaxTests/literals/invalid_octal_number.sol
new file mode 100644
index 0000000000..668913be61
--- /dev/null
+++ b/test/libsolidity/syntaxTests/literals/invalid_octal_number.sol
@@ -0,0 +1,5 @@
+contract C {
+    uint x = 0100;
+}
+// ----
+// ParserError 8936: (26-27): Octal numbers not allowed.

From 6f0941a5107d0217cc74327f12353f49bf7f2ba5 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Sat, 25 Mar 2023 15:13:51 +0900
Subject: [PATCH 1237/1748] Correct small errors in yul.rst

---
 docs/yul.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index 99533b53ee..38f6c68008 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -152,7 +152,7 @@ where an object is expected.
 Inside a code block, the following elements can be used
 (see the later sections for more details):
 
-- literals, i.e. ``0x123``, ``42`` or ``"abc"`` (strings up to 32 characters)
+- literals, e.g. ``0x123``, ``42`` or ``"abc"`` (strings up to 32 characters)
 - calls to builtin functions, e.g. ``add(1, mload(0))``
 - variable declarations, e.g. ``let x := 7``, ``let x := add(y, 3)`` or ``let x`` (initial value of 0 is assigned)
 - identifiers (variables), e.g. ``add(3, x)``
@@ -238,7 +238,7 @@ they have to be assigned to local variables.
 For built-in functions of the EVM, functional expressions
 can be directly translated to a stream of opcodes:
 You just read the expression from right to left to obtain the
-opcodes. In the case of the first line in the example, this
+opcodes. In the case of the second line in the example, this
 is ``PUSH1 3 PUSH1 0x80 MLOAD ADD PUSH1 0x80 MSTORE``.
 
 For calls to user-defined functions, the arguments are also
@@ -902,15 +902,15 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | invalid()               | `-` | F | end execution with invalid instruction                          |
 +-------------------------+-----+---+-----------------------------------------------------------------+
-| log0(p, s)              | `-` | F | log without topics and data mem[p...(p+s))                      |
+| log0(p, s)              | `-` | F | log data mem[p...(p+s)) without topics                          |
 +-------------------------+-----+---+-----------------------------------------------------------------+
-| log1(p, s, t1)          | `-` | F | log with topic t1 and data mem[p...(p+s))                       |
+| log1(p, s, t1)          | `-` | F | log data mem[p...(p+s)) with topic t1                           |
 +-------------------------+-----+---+-----------------------------------------------------------------+
-| log2(p, s, t1, t2)      | `-` | F | log with topics t1, t2 and data mem[p...(p+s))                  |
+| log2(p, s, t1, t2)      | `-` | F | log data mem[p...(p+s)) with topics t1, t2                      |
 +-------------------------+-----+---+-----------------------------------------------------------------+
-| log3(p, s, t1, t2, t3)  | `-` | F | log with topics t1, t2, t3 and data mem[p...(p+s))              |
+| log3(p, s, t1, t2, t3)  | `-` | F | log data mem[p...(p+s)) with topics t1, t2, t3                  |
 +-------------------------+-----+---+-----------------------------------------------------------------+
-| log4(p, s, t1, t2, t3,  | `-` | F | log with topics t1, t2, t3, t4 and data mem[p...(p+s))          |
+| log4(p, s, t1, t2, t3,  | `-` | F | log data mem[p...(p+s)) with topics t1, t2, t3, t4              |
 | t4)                     |     |   |                                                                 |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | chainid()               |     | I | ID of the executing chain (EIP-1344)                            |

From 7375fc24c05265dd6dad2a20b871b36bc627024a Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Mon, 27 Mar 2023 18:26:15 +0900
Subject: [PATCH 1238/1748] Omit the mention of topics

---
 docs/yul.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index 38f6c68008..065dcefb7f 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -902,7 +902,7 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | invalid()               | `-` | F | end execution with invalid instruction                          |
 +-------------------------+-----+---+-----------------------------------------------------------------+
-| log0(p, s)              | `-` | F | log data mem[p...(p+s)) without topics                          |
+| log0(p, s)              | `-` | F | log data mem[p...(p+s))                                         |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | log1(p, s, t1)          | `-` | F | log data mem[p...(p+s)) with topic t1                           |
 +-------------------------+-----+---+-----------------------------------------------------------------+

From 7974a3cf7c6ed9f8e40fa4b5d73c6539d74fe32b Mon Sep 17 00:00:00 2001
From: Nuno Santos <nunofilipesantos@gmail.com>
Date: Tue, 28 Mar 2023 12:28:31 +0100
Subject: [PATCH 1239/1748] Consolidated term to reentrancy

---
 docs/common-patterns.rst         |  2 +-
 docs/security-considerations.rst | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/docs/common-patterns.rst b/docs/common-patterns.rst
index 766f8f35ed..a76f61c18a 100644
--- a/docs/common-patterns.rst
+++ b/docs/common-patterns.rst
@@ -55,7 +55,7 @@ you receive the funds of the person who is now the richest.
         function withdraw() public {
             uint amount = pendingWithdrawals[msg.sender];
             // Remember to zero the pending refund before
-            // sending to prevent re-entrancy attacks
+            // sending to prevent reentrancy attacks
             pendingWithdrawals[msg.sender] = 0;
             payable(msg.sender).transfer(amount);
         }
diff --git a/docs/security-considerations.rst b/docs/security-considerations.rst
index 0a86a8d598..4b524cbbde 100644
--- a/docs/security-considerations.rst
+++ b/docs/security-considerations.rst
@@ -47,7 +47,7 @@ local variables and state variables marked ``private``.
 Using random numbers in smart contracts is quite tricky if you do not want
 block builders to be able to cheat.
 
-Re-Entrancy
+Reentrancy
 ===========
 
 Any interaction from a contract (A) with another contract (B) and any transfer
@@ -97,7 +97,7 @@ as it uses ``call`` which forwards all remaining gas by default:
         }
     }
 
-To avoid re-entrancy, you can use the Checks-Effects-Interactions pattern as
+To avoid reentrancy, you can use the Checks-Effects-Interactions pattern as
 demonstrated below:
 
 .. code-block:: solidity
@@ -119,11 +119,11 @@ demonstrated below:
 The Checks-Effects-Interactions pattern ensures that all code paths through a contract complete all required checks
 of the supplied parameters before modifying the contract's state (Checks); only then it makes any changes to the state (Effects);
 it may make calls to functions in other contracts *after* all planned state changes have been written to
-storage (Interactions). This is a common foolproof way to prevent *re-entrancy attacks*, where an externally called
+storage (Interactions). This is a common foolproof way to prevent *reentrancy attacks*, where an externally called
 malicious contract is able to double-spend an allowance, double-withdraw a balance, among other things, by using logic that calls back into the
 original contract before it has finalized its transaction.
 
-Note that re-entrancy is not only an effect of Ether transfer but of any
+Note that reentrancy is not only an effect of Ether transfer but of any
 function call on another contract. Furthermore, you also have to take
 multi-contract situations into account. A called contract could modify the
 state of another contract you depend on.
@@ -429,7 +429,7 @@ should be the very last step in any function.
 
 Early contracts delayed some effects and waited for external function
 calls to return in a non-error state. This is often a serious mistake
-because of the re-entrancy problem explained above.
+because of the reentrancy problem explained above.
 
 Note that, also, calls to known contracts might in turn cause calls to
 unknown contracts, so it is probably better to just always apply this pattern.

From 3e1e43f5691f2bb05ef2c64c99792ff6b181f769 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 28 Mar 2023 14:36:47 +0200
Subject: [PATCH 1240/1748] use new z3

---
 .circleci/config.yml                  | 20 ++++++++++----------
 .circleci/osx_install_dependencies.sh |  4 ++--
 CMakeLists.txt                        |  2 +-
 scripts/build_emscripten.sh           |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a965733f76..18f0ec2d0d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,24 +9,24 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-16
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:ee1def5806f40c35d583234e172ec5769bb9a08b6f5bbc713c1a2658846dbced"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-17
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:87c63f4c0e9be15b60417809cd3245892db281af0f80ed7378a1978f6f170029"
   ubuntu-2204-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-1
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:07419ed58537cbca9d4c30701fb84f6bb517ce2fce7f3b5dccb3db8bf1c30183"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-2
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7f0b62da2aa0920660e67cd17fb3a7f6c57d7da72454003056f3bd27bbda2075"
   ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-1
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e515710752bfb38ee0e9b2f92ca71612c03ed85290c36c3b3c0a3d9f90187aef"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-2
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0d4fa1da806f9b3daabd2d1dc0842899af794a838e475c14045c3fb289cc8103"
   ubuntu-1604-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-22
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:baf46ad78b131eb6b0bf98d50e9330437a338c6893b53af3853b36f6f4ab18ae"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-23
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7a84f67829ec2fdcfc8a61ebf22f9dc27b04a9edeb1531565ab3e0ebb1cbc4a0"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-14
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d7d4ec28cdc3e61fc6a048b88ebdff1c5e67f3353cf1739cbaea07ec2481eb16"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-15
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:f86cb1fb4631b1fbb927149f60caea7b095be5b85d379456eee09cb105e7f225"
   evm-version:
     type: string
     default: london
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index f742d131b2..e523746f04 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -61,11 +61,11 @@ then
   ./scripts/install_obsolete_jsoncpp_1_7_4.sh
 
   # z3
-  z3_version="4.11.2"
+  z3_version="4.12.1"
   z3_dir="z3-${z3_version}-x64-osx-10.16"
   z3_package="${z3_dir}.zip"
   wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
-  validate_checksum "$z3_package" a56b6c40d9251a963aabe1f15731dd88ad1cb801d0e7b16e45f8b232175e165c
+  validate_checksum "$z3_package" 7601f844de6d906235140d0f76cca58be7ac716f3e2c29c35845aa24b24f73b9
   unzip "$z3_package"
   rm "$z3_package"
   cp "${z3_dir}/bin/libz3.a" /usr/local/lib
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e8460885b..4345fac942 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,7 +75,7 @@ configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/licens
 
 include(EthOptions)
 configure_project(TESTS)
-set(LATEST_Z3_VERSION "4.11.2")
+set(LATEST_Z3_VERSION "4.12.1")
 set(MINIMUM_Z3_VERSION "4.8.16")
 find_package(Z3)
 if (${Z3_FOUND})
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index ca99e74a30..4e60571576 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -33,9 +33,9 @@ if (( $# != 0 )); then
     params="$(printf "%q " "${@}")"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-14
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-15
 # NOTE: Without `safe.directory` git would assume it's not safe to operate on /root/project since it's owned by a different user.
 # See https://github.blog/2022-04-12-git-security-vulnerability-announced/
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:d7d4ec28cdc3e61fc6a048b88ebdff1c5e67f3353cf1739cbaea07ec2481eb16 \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:f86cb1fb4631b1fbb927149f60caea7b095be5b85d379456eee09cb105e7f225 \
     /bin/bash -c "git config --global --add safe.directory /root/project && ./scripts/ci/build_emscripten.sh ${params}"

From 1468f5ac41547845e5c663bc035db735eff01fec Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 28 Mar 2023 22:50:35 +0900
Subject: [PATCH 1241/1748] Fix the missing backquote

---
 docs/using-the-compiler.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 2eac2d1578..fd305dce49 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -160,7 +160,7 @@ at each version. Backward compatibility is not guaranteed between each version.
    - It is possible to access dynamic data returned from function calls.
    - ``revert`` opcode introduced, which means that ``revert()`` will not waste gas.
 - ``constantinople``
-   - Opcodes ``create2`, ``extcodehash``, ``shl``, ``shr`` and ``sar`` are available in assembly.
+   - Opcodes ``create2``, ``extcodehash``, ``shl``, ``shr`` and ``sar`` are available in assembly.
    - Shifting operators use shifting opcodes and thus need less gas.
 - ``petersburg``
    - The compiler behaves the same way as with constantinople.

From 58f3aa8c280e0a3619f5475a27a999dc098b2386 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 28 Mar 2023 22:52:09 +0900
Subject: [PATCH 1242/1748] Fix the code block not rendered

---
 docs/contributing.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index e6925a4896..a5bbf6f693 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -175,6 +175,7 @@ See especially:
 
 If you want to debug using GDB, make sure you build differently than the "usual".
 For example, you could run the following command in your ``build`` folder:
+
 .. code-block:: bash
 
    cmake -DCMAKE_BUILD_TYPE=Debug ..

From c5ae22db86bf28f92bcb38f041c3d4673d28070b Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 28 Mar 2023 22:53:57 +0900
Subject: [PATCH 1243/1748] Wrap numbers in backquotes

---
 docs/ir-breaking-changes.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index 2d972baa79..f8a6cceb3b 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -174,8 +174,8 @@ hiding new and different behavior in existing code.
 
   The function ``preincr_u8(1)`` returns the following values:
 
-  - Old code generator: 3 (``1 + 2``) but the return value is unspecified in general
-  - New code generator: 4 (``2 + 2``) but the return value is not guaranteed
+  - Old code generator: ``3`` (``1 + 2``) but the return value is unspecified in general
+  - New code generator: ``4`` (``2 + 2``) but the return value is not guaranteed
 
   .. index:: ! evaluation order; function arguments
 

From f12e368d6767e79fa6ec98b79b73f26634f06f33 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 28 Mar 2023 22:55:09 +0900
Subject: [PATCH 1244/1748] Fix the missing dot

---
 docs/smtchecker.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index 3ad700a308..b06e20c687 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -681,7 +681,7 @@ most derived type in case of inheritance.
     }
 
 Note that in function ``property_transfer``, the external calls are
-performed on variable ``t``
+performed on variable ``t``.
 
 Another caveat of this mode are calls to state variables of contract type
 outside the analyzed contract. In the code below, even though ``B`` deploys

From dce1e7b378d934cf31e28d191009bc8ee649dd9b Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 28 Mar 2023 22:56:24 +0900
Subject: [PATCH 1245/1748] Fix "Yul Code"

---
 docs/using-the-compiler.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index fd305dce49..8ce3290ae1 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -636,6 +636,6 @@ Error Types
 10. ``Exception``: Unknown failure during compilation - this should be reported as an issue.
 11. ``CompilerError``: Invalid use of the compiler stack - this should be reported as an issue.
 12. ``FatalError``: Fatal error not processed correctly - this should be reported as an issue.
-13. ``YulException``: Error during Yul Code generation - this should be reported as an issue.
+13. ``YulException``: Error during Yul code generation - this should be reported as an issue.
 14. ``Warning``: A warning, which didn't stop the compilation, but should be addressed if possible.
 15. ``Info``: Information that the compiler thinks the user might find useful, but is not dangerous and does not necessarily need to be addressed.
\ No newline at end of file

From ccb64e9fa42e8c3b5350bc13ce391c496637f73b Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 28 Mar 2023 22:57:39 +0900
Subject: [PATCH 1246/1748] Fix the style of bullet points

---
 docs/path-resolution.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/path-resolution.rst b/docs/path-resolution.rst
index c61abce0a2..f63f5e79d0 100644
--- a/docs/path-resolution.rst
+++ b/docs/path-resolution.rst
@@ -253,6 +253,7 @@ The compiler resolves the import into a source unit name based on the import pat
 #. We start with the source unit name of the importing source unit.
 #. The last path segment with preceding slashes is removed from the resolved name.
 #. Then, for every segment in the import path, starting from the leftmost one:
+
     - If the segment is ``.``, it is skipped.
     - If the segment is ``..``, the last path segment with preceding slashes is removed from the resolved name.
     - Otherwise, the segment (preceded by a single slash if the resolved name is not empty), is appended to the resolved name.

From cd8636105da9c203b0a26d4c8e07dfb75b6e0c9e Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 28 Mar 2023 22:59:05 +0900
Subject: [PATCH 1247/1748] Replace python with Python

---
 docs/style-guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index fab46f139a..6173aecc6e 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -16,11 +16,11 @@ Many projects will implement their own style guides.  In the event of
 conflicts, project specific style guides take precedence.
 
 The structure and many of the recommendations within this style guide were
-taken from python's
+taken from Python's
 `pep8 style guide <https://peps.python.org/pep-0008/>`_.
 
 The goal of this guide is *not* to be the right way or the best way to write
-Solidity code.  The goal of this guide is *consistency*.  A quote from python's
+Solidity code.  The goal of this guide is *consistency*.  A quote from Python's
 `pep8 <https://peps.python.org/pep-0008/#a-foolish-consistency-is-the-hobgoblin-of-little-minds>`_
 captures this concept well.
 

From 25a41e3ac62f859f78cd65247176f6705025ac5e Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 28 Mar 2023 22:59:48 +0900
Subject: [PATCH 1248/1748] Replace Javascript with JavaScript

---
 docs/bugs.rst             | 2 +-
 docs/contracts/events.rst | 2 +-
 docs/smtchecker.rst       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/bugs.rst b/docs/bugs.rst
index 75a23e4999..350b1e7a48 100644
--- a/docs/bugs.rst
+++ b/docs/bugs.rst
@@ -68,7 +68,7 @@ conditions
     If no conditions are given, assume that the bug is present.
 check
     This field contains different checks that report whether the smart contract
-    contains the bug or not. The first type of check are Javascript regular
+    contains the bug or not. The first type of check are JavaScript regular
     expressions that are to be matched against the source code ("source-regex")
     if the bug is present.  If there is no match, then the bug is very likely
     not present. If there is a match, the bug might be present.  For improved
diff --git a/docs/contracts/events.rst b/docs/contracts/events.rst
index a7c7bc13f6..ca992e6ca2 100644
--- a/docs/contracts/events.rst
+++ b/docs/contracts/events.rst
@@ -151,6 +151,6 @@ The output of the above looks like the following (trimmed):
 Additional Resources for Understanding Events
 =============================================
 
-- `Javascript documentation <https://github.com/web3/web3.js/blob/1.x/docs/web3-eth-contract.rst#events>`_
+- `JavaScript documentation <https://github.com/web3/web3.js/blob/1.x/docs/web3-eth-contract.rst#events>`_
 - `Example usage of events <https://github.com/ethchange/smart-exchange/blob/master/lib/contracts/SmartExchange.sol>`_
 - `How to access them in js <https://github.com/ethchange/smart-exchange/blob/master/lib/exchange_transactions.js>`_
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index b06e20c687..45d8d410da 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -834,7 +834,7 @@ option ``--model-checker-solvers {all,cvc4,eld,smtlib2,z3}`` or the JSON option
 
   - if ``solc`` is compiled with it;
   - if a dynamic ``z3`` library of version >=4.8.x is installed in a Linux system (from Solidity 0.7.6);
-  - statically in ``soljson.js`` (from Solidity 0.6.9), that is, the Javascript binary of the compiler.
+  - statically in ``soljson.js`` (from Solidity 0.6.9), that is, the JavaScript binary of the compiler.
 
 .. note::
   z3 version 4.8.16 broke ABI compatibility with previous versions and cannot

From c2a2fce8e7db70d3b80f6e62dcd10334dc33eae3 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 28 Mar 2023 23:01:06 +0900
Subject: [PATCH 1249/1748] Replace Send with ``send``

---
 docs/types/value-types.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index ffdec37961..a370cf70ee 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -257,7 +257,7 @@ reverts on failure.
 
 * ``send``
 
-Send is the low-level counterpart of ``transfer``. If the execution fails, the current contract will not stop with an exception, but ``send`` will return ``false``.
+``send`` is the low-level counterpart of ``transfer``. If the execution fails, the current contract will not stop with an exception, but ``send`` will return ``false``.
 
 .. warning::
     There are some dangers in using ``send``: The transfer fails if the call stack depth is at 1024

From c0f92da86006557e9b42b0cec0c3329cbc848754 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Tue, 28 Mar 2023 23:02:29 +0900
Subject: [PATCH 1250/1748] Replace solidity with Solidity

---
 docs/using-the-compiler.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 8ce3290ae1..d004bdeaae 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -15,7 +15,7 @@ Using the Commandline Compiler
 Basic Usage
 -----------
 
-One of the build targets of the Solidity repository is ``solc``, the solidity commandline compiler.
+One of the build targets of the Solidity repository is ``solc``, the Solidity commandline compiler.
 Using ``solc --help`` provides you with an explanation of all options. The compiler can produce various outputs, ranging from simple binaries and assembly over an abstract syntax tree (parse tree) to estimations of gas usage.
 If you only want to compile a single file, you run it as ``solc --bin sourceFile.sol`` and it will print the binary. If you want to get some of the more advanced output variants of ``solc``, it is probably better to tell it to output everything to separate files using ``solc -o outputDirectory --bin --ast-compact-json --asm sourceFile.sol``.
 

From ce9a7ee954ce6f43d7278091e7287aa581d7016c Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 28 Mar 2023 14:36:56 +0200
Subject: [PATCH 1251/1748] update smtchecker tests

---
 .circleci/config.yml                                          | 2 +-
 .../array_members/push_storage_ref_unsafe_length.sol          | 4 ++--
 .../smtCheckerTests/deployment/deploy_trusted_flow.sol        | 3 +--
 .../smtCheckerTests/external_calls/external_safe.sol          | 4 +---
 .../smtCheckerTests/operators/index_access_side_effect.sol    | 1 +
 .../smtCheckerTests/types/array_mapping_aliasing_2.sol        | 1 +
 .../smtCheckerTests/types/array_static_mapping_aliasing_2.sol | 3 +--
 .../smtCheckerTests/types/fixed_bytes_access_3.sol            | 3 +--
 8 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 18f0ec2d0d..e189ea07b0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -26,7 +26,7 @@ parameters:
   emscripten-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:emscripten-15
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:f86cb1fb4631b1fbb927149f60caea7b095be5b85d379456eee09cb105e7f225"
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e2729bd6c0734bb49d04e2688fec3dcf880394f351f69358dd2bd92c0f6fd309"
   evm-version:
     type: string
     default: london
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
index 3a57c40cbe..ebabc9706f 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_storage_ref_unsafe_length.sol
@@ -28,8 +28,8 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 6368: (238-242): CHC: Out of bounds access happens here.
-// Warning 6368: (238-245): CHC: Out of bounds access might happen here.
-// Warning 6368: (238-248): CHC: Out of bounds access might happen here.
+// Warning 6368: (238-245): CHC: Out of bounds access happens here.
+// Warning 6368: (238-248): CHC: Out of bounds access happens here.
 // Warning 6368: (311-315): CHC: Out of bounds access happens here.
 // Warning 6368: (343-347): CHC: Out of bounds access happens here.
 // Warning 6328: (336-360): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
index ddd4b41e68..dcc81be643 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
@@ -24,9 +24,8 @@ contract C {
 // Warning 6328: (167-185): CHC: Assertion violation might happen here.
 // Warning 6328: (215-233): CHC: Assertion violation might happen here.
 // Warning 6328: (267-285): CHC: Assertion violation might happen here.
-// Warning 6328: (304-322): CHC: Assertion violation might happen here.
+// Warning 6328: (304-322): CHC: Assertion violation happens here.
 // Warning 2661: (47-50): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 4661: (167-185): BMC: Assertion violation happens here.
 // Warning 4661: (215-233): BMC: Assertion violation happens here.
 // Warning 4661: (267-285): BMC: Assertion violation happens here.
-// Warning 4661: (304-322): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
index fd45ef2d7f..593aba289c 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_safe.sol
@@ -18,6 +18,4 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (167-181): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 4661: (167-181): BMC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
index d3b6f5895b..d18f605f7c 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
@@ -21,6 +21,7 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 6328: (335-354): CHC: Assertion violation might happen here.
 // Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
index a2fc893b5d..fce5869877 100644
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
@@ -34,6 +34,7 @@ contract C
 // ====
 // SMTEngine: all
 // SMTIgnoreCex: yes
+// SMTIgnoreOS: macos
 // ----
 // Warning 6368: (439-453): CHC: Out of bounds access happens here.
 // Warning 6368: (465-480): CHC: Out of bounds access might happen here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
index 0b85a71b41..1f167b8586 100644
--- a/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_static_mapping_aliasing_2.sol
@@ -34,5 +34,4 @@ contract C
 // Warning 6368: (612-627): CHC: Out of bounds access might happen here.
 // Warning 6328: (860-880): CHC: Assertion violation happens here.
 // Warning 6368: (936-952): CHC: Out of bounds access might happen here.
-// Warning 6368: (936-955): CHC: Out of bounds access might happen here.
-// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
index d89f020aed..bb4ef03428 100644
--- a/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/fixed_bytes_access_3.sol
@@ -32,6 +32,5 @@ contract C {
 // SMTEngine: all
 // SMTIgnoreOS: macos
 // ----
-// Warning 6368: (374-381): CHC: Out of bounds access might happen here.
 // Warning 6368: (456-462): CHC: Out of bounds access happens here.
-// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 1391: CHC: 13 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 4aa310034cca09d1901d9606d6c33d92cce6f072 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Sat, 25 Mar 2023 17:04:02 -0300
Subject: [PATCH 1252/1748] Added missing keyword unicode to Lexer

---
 docs/grammar/SolidityLexer.g4                               | 1 +
 .../freeFunctions/invalid_function_named_unicode.sol        | 4 ++++
 .../syntaxTests/parsing/invalid_variable_named_unicode.sol  | 6 ++++++
 3 files changed, 11 insertions(+)
 create mode 100644 test/libsolidity/syntaxTests/freeFunctions/invalid_function_named_unicode.sol
 create mode 100644 test/libsolidity/syntaxTests/parsing/invalid_variable_named_unicode.sol

diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index 306afd92ff..0452f9fa0b 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -90,6 +90,7 @@ Try: 'try';
 Type: 'type';
 Ufixed: 'ufixed' | ('ufixed' [1-9][0-9]+ 'x' [1-9][0-9]+);
 Unchecked: 'unchecked';
+Unicode: 'unicode';
 /**
  * Sized unsigned integer types.
  * uint is an alias of uint256.
diff --git a/test/libsolidity/syntaxTests/freeFunctions/invalid_function_named_unicode.sol b/test/libsolidity/syntaxTests/freeFunctions/invalid_function_named_unicode.sol
new file mode 100644
index 0000000000..889d7df212
--- /dev/null
+++ b/test/libsolidity/syntaxTests/freeFunctions/invalid_function_named_unicode.sol
@@ -0,0 +1,4 @@
+function unicode() returns {}
+
+// ----
+// ParserError 2314: (9-16): Expected identifier but got 'ILLEGAL'
diff --git a/test/libsolidity/syntaxTests/parsing/invalid_variable_named_unicode.sol b/test/libsolidity/syntaxTests/parsing/invalid_variable_named_unicode.sol
new file mode 100644
index 0000000000..0180ebf73e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/parsing/invalid_variable_named_unicode.sol
@@ -0,0 +1,6 @@
+contract C
+{
+    string unicode = "abc";
+}
+// ----
+// ParserError 2314: (24-31): Expected identifier but got 'ILLEGAL'

From 1a23b7a60afcbf9f1cc97abc83ed6f912fb34a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20Uzdo=C4=9Fan?= <kaanuzdogan@hotmail.com>
Date: Fri, 31 Mar 2023 15:27:57 +0300
Subject: [PATCH 1253/1748] Update metadata docs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Squashed into single commit

Squashed commits:
Sort metadata JSON, add errors to devdoc & userdoc

Sorts the example metadata in the alphabetical order,
as this is the way output by the compiler.

Add playground.sourcify.dev link

Update metadata documentation content

Fix trailing whitespaces

Add new line after code-block

Fix unexpected indentation

Fix unexpected unindent

Fix unexpected unindent - 2

Suggestions from code review: wording, punctuation

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
Fix missing trailing commas

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
Order yul settings, fix trailing commas

Explicitly state appended to the runtime bytecode

Break down metadata content into two points

Remove trailing whitespace
---
 docs/metadata.rst | 321 ++++++++++++++++++++++++----------------------
 1 file changed, 169 insertions(+), 152 deletions(-)

diff --git a/docs/metadata.rst b/docs/metadata.rst
index 23871ba09e..18f2b579ca 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -6,18 +6,19 @@ Contract Metadata
 
 .. index:: metadata, contract verification
 
-The Solidity compiler automatically generates a JSON file, the contract
-metadata, that contains information about the compiled contract. You can use
-this file to query the compiler version, the sources used, the ABI and NatSpec
-documentation to more safely interact with the contract and verify its source
-code.
+The Solidity compiler automatically generates a JSON file.
+The file contains two kinds of information about the compiled contract:
+
+- How to interact with the contract: ABI, and NatSpec documentation.
+- How to reproduce the compilation and verify a deployed contract:
+  compiler version, compiler settings, and source files used.
 
 The compiler appends by default the IPFS hash of the metadata file to the end
-of the bytecode (for details, see below) of each contract, so that you can
-retrieve the file in an authenticated way without having to resort to a
-centralized data provider. The other available options are the Swarm hash and
-not appending the metadata hash to the bytecode.  These can be configured via
-the :ref:`Standard JSON Interface<compiler-api>`.
+of the runtime bytecode (not necessarily the creation bytecode) of each contract,
+so that, if published, you can retrieve the file in an authenticated way without
+having to resort to a centralized data provider. The other available options are
+the Swarm hash and not appending the metadata hash to the bytecode. These can be
+configured via the :ref:`Standard JSON Interface<compiler-api>`.
 
 You have to publish the metadata file to IPFS, Swarm, or another service so
 that others can access it. You create the file by using the ``solc --metadata``
@@ -30,108 +31,50 @@ shall match with the one contained in the bytecode.
 
 The metadata file has the following format. The example below is presented in a
 human-readable way. Properly formatted metadata should use quotes correctly,
-reduce whitespace to a minimum and sort the keys of all objects to arrive at a
-unique formatting. Comments are not permitted and used here only for
+reduce whitespace to a minimum, and sort the keys of all objects in alphabetical order
+to arrive at a canonical formatting. Comments are not permitted and are used here only for
 explanatory purposes.
 
 .. code-block:: javascript
 
     {
-      // Required: The version of the metadata format
-      "version": "1",
-      // Required: Source code language, basically selects a "sub-version"
-      // of the specification
-      "language": "Solidity",
       // Required: Details about the compiler, contents are specific
       // to the language.
       "compiler": {
-        // Required for Solidity: Version of the compiler
-        "version": "0.8.2+commit.661d1103",
         // Optional: Hash of the compiler binary which produced this output
-        "keccak256": "0x123..."
-      },
-      // Required: Compilation source files/source units, keys are file paths
-      "sources":
-      {
-        "myDirectory/myFile.sol": {
-          // Required: keccak256 hash of the source file
-          "keccak256": "0x123...",
-          // Required (unless "content" is used, see below): Sorted URL(s)
-          // to the source file, protocol is more or less arbitrary, but an
-          // IPFS URL is recommended
-          "urls": [ "bzz-raw://7d7a...", "dweb:/ipfs/QmN..." ],
-          // Optional: SPDX license identifier as given in the source file
-          "license": "MIT"
-        },
-        "destructible": {
-          // Required: keccak256 hash of the source file
-          "keccak256": "0x234...",
-          // Required (unless "url" is used): literal contents of the source file
-          "content": "contract destructible is owned { function destroy() { if (msg.sender == owner) selfdestruct(owner); } }"
-        }
-      },
-      // Required: Compiler settings
-      "settings":
-      {
-        // Required for Solidity: Sorted list of import remappings
-        "remappings": [ ":g=/dir" ],
-        // Optional: Optimizer settings. The fields "enabled" and "runs" are deprecated
-        // and are only given for backwards-compatibility.
-        "optimizer": {
-          "enabled": true,
-          "runs": 500,
-          "details": {
-            // peephole defaults to "true"
-            "peephole": true,
-            // inliner defaults to "true"
-            "inliner": true,
-            // jumpdestRemover defaults to "true"
-            "jumpdestRemover": true,
-            "orderLiterals": false,
-            "deduplicate": false,
-            "cse": false,
-            "constantOptimizer": false,
-            "yul": true,
-            // Optional: Only present if "yul" is "true"
-            "yulDetails": {
-              "stackAllocation": false,
-              "optimizerSteps": "dhfoDgvulfnTUtnIf..."
-            }
-          }
-        },
-        "metadata": {
-          // Reflects the setting used in the input json, defaults to "true"
-          "appendCBOR": true,
-          // Reflects the setting used in the input json, defaults to "false"
-          "useLiteralContent": true,
-          // Reflects the setting used in the input json, defaults to "ipfs"
-          "bytecodeHash": "ipfs"
-        },
-        // Required for Solidity: File path and the name of the contract or library this
-        // metadata is created for.
-        "compilationTarget": {
-          "myDirectory/myFile.sol": "MyContract"
-        },
-        // Required for Solidity: Addresses for libraries used
-        "libraries": {
-          "MyLib": "0x123123..."
-        }
+        "keccak256": "0x123...",
+        // Required for Solidity: Version of the compiler
+        "version": "0.8.2+commit.661d1103"
       },
+      // Required: Source code language, basically selects a "sub-version"
+      // of the specification
+      "language": "Solidity",
       // Required: Generated information about the contract.
-      "output":
-      {
+      "output": {
         // Required: ABI definition of the contract. See "Contract ABI Specification"
         "abi": [/* ... */],
-        // Required: NatSpec developer documentation of the contract.
+        // Required: NatSpec developer documentation of the contract. See https://docs.soliditylang.org/en/latest/natspec-format.html for details.
         "devdoc": {
-          "version": 1 // NatSpec version
-          "kind": "dev",
           // Contents of the @author NatSpec field of the contract
           "author": "John Doe",
-          // Contents of the @title NatSpec field of the contract
-          "title": "MyERC20: an example ERC20"
           // Contents of the @dev NatSpec field of the contract
           "details": "Interface of the ERC20 standard as defined in the EIP. See https://eips.ethereum.org/EIPS/eip-20 for details",
+          "errors": {
+            "MintToZeroAddress()" : {
+              "details": "Cannot mint to zero address"
+            }
+          },
+          "events": {
+            "Transfer(address,address,uint256)": {
+              "details": "Emitted when `value` tokens are moved from one account (`from`) toanother (`to`).",
+              "params": {
+                "from": "The sender address",
+                "to": "The receiver address",
+                "value": "The token amount"
+              }
+            }
+          },
+          "kind": "dev",
           "methods": {
             "transfer(address,uint256)": {
               // Contents of the @dev NatSpec field of the method
@@ -140,7 +83,7 @@ explanatory purposes.
               "params": {
                 "_value": "The amount tokens to be transferred",
                 "_to": "The receiver address"
-              }
+              },
               // Contents of the @return NatSpec field.
               "returns": {
                 // Return var name (here "success") if exists. "_0" as key if return var is unnamed
@@ -153,34 +96,104 @@ explanatory purposes.
               // Contents of the @dev NatSpec field of the state variable
               "details": "Must be set during contract creation. Can then only be changed by the owner"
             }
-          }
-          "events": {
-             "Transfer(address,address,uint256)": {
-               "details": "Emitted when `value` tokens are moved from one account (`from`) toanother (`to`)."
-               "params": {
-                 "from": "The sender address"
-                 "to": "The receiver address"
-                 "value": "The token amount"
-               }
-             }
-          }
+          },
+          // Contents of the @title NatSpec field of the contract
+          "title": "MyERC20: an example ERC20",
+          "version": 1 // NatSpec version
         },
-        // Required: NatSpec user documentation of the contract
+        // Required: NatSpec user documentation of the contract. See "NatSpec Format"
         "userdoc": {
-          "version": 1 // NatSpec version
+          "errors": {
+            "ApprovalCallerNotOwnerNorApproved()": [
+              {
+                "notice": "The caller must own the token or be an approved operator."
+              }
+            ]
+          },
+          "events": {
+            "Transfer(address,address,uint256)": {
+              "notice": "`_value` tokens have been moved from `from` to `to`"
+            }
+          },
           "kind": "user",
           "methods": {
             "transfer(address,uint256)": {
               "notice": "Transfers `_value` tokens to address `_to`"
             }
           },
-          "events": {
-            "Transfer(address,address,uint256)": {
-              "notice": "`_value` tokens have been moved from `from` to `to`"
+          "version": 1 // NatSpec version
+        }
+      },
+      // Required: Compiler settings. Reflects the settings in the JSON input during compilation.
+      // Check the documentation of standard JSON input's "settings" field
+      "settings": {
+        // Required for Solidity: File path and the name of the contract or library this
+        // metadata is created for.
+        "compilationTarget": {
+          "myDirectory/myFile.sol": "MyContract"
+        },
+        // Required for Solidity.
+        "evmVersion": "london",
+        // Required for Solidity: Addresses for libraries used.
+        "libraries": {
+          "MyLib": "0x123123..."
+        },
+        "metadata": {
+          // Reflects the setting used in the input json, defaults to "true"
+          "appendCBOR": true,
+          // Reflects the setting used in the input json, defaults to "ipfs"
+          "bytecodeHash": "ipfs",
+          // Reflects the setting used in the input json, defaults to "false"
+          "useLiteralContent": true
+        },
+        // Optional: Optimizer settings. The fields "enabled" and "runs" are deprecated
+        // and are only given for backwards-compatibility.
+        "optimizer": {
+          "details": {
+            "constantOptimizer": false,
+            "cse": false,
+            "deduplicate": false,
+            // inliner defaults to "true"
+            "inliner": true,
+            // jumpdestRemover defaults to "true"
+            "jumpdestRemover": true,
+            "orderLiterals": false,
+            // peephole defaults to "true"
+            "peephole": true,
+            "yul": true,
+            // Optional: Only present if "yul" is "true"
+            "yulDetails": {
+              "optimizerSteps": "dhfoDgvulfnTUtnIf...",
+              "stackAllocation": false
             }
-          }
+          },
+          "enabled": true,
+          "runs": 500
+        },
+        // Required for Solidity: Sorted list of import remappings.
+        "remappings": [ ":g=/dir" ]
+      },
+      // Required: Compilation source files/source units, keys are file paths
+      "sources": {
+        "destructible": {
+          // Required (unless "url" is used): literal contents of the source file
+          "content": "contract destructible is owned { function destroy() { if (msg.sender == owner) selfdestruct(owner); } }",
+          // Required: keccak256 hash of the source file
+          "keccak256": "0x234..."
+        },
+        "myDirectory/myFile.sol": {
+          // Required: keccak256 hash of the source file
+          "keccak256": "0x123...",
+          // Optional: SPDX license identifier as given in the source file
+          "license": "MIT",
+          // Required (unless "content" is used, see above): Sorted URL(s)
+          // to the source file, protocol is more or less arbitrary, but an
+          // IPFS URL is recommended
+          "urls": [ "bzz-raw://7d7a...", "dweb:/ipfs/QmN..." ]
         }
-      }
+      },
+      // Required: The version of the metadata format
+      "version": "1"
     }
 
 .. warning::
@@ -200,23 +213,32 @@ explanatory purposes.
 Encoding of the Metadata Hash in the Bytecode
 =============================================
 
-Because we might support other ways to retrieve the metadata file in the future,
-the mapping ``{"ipfs": <IPFS hash>, "solc": <compiler version>}`` is stored
-`CBOR <https://tools.ietf.org/html/rfc7049>`_-encoded. Since the mapping might
-contain more keys (see below) and the beginning of that
-encoding is not easy to find, its length is added in a two-byte big-endian
-encoding. The current version of the Solidity compiler usually adds the following
-to the end of the deployed bytecode
+The compiler currently by default appends the
+`IPFS hash (in CID v0) <https://docs.ipfs.tech/concepts/content-addressing/#version-0-v0>`_
+of the canonical metadata file and the compiler version to the end of the bytecode.
+Optionally, a Swarm hash instead of the IPFS, or an experimental flag is used.
+Below are all the possible fields:
 
-.. code-block:: text
+.. code-block:: javascript
 
-    0xa2
-    0x64 'i' 'p' 'f' 's' 0x58 0x22 <34 bytes IPFS hash>
-    0x64 's' 'o' 'l' 'c' 0x43 <3 byte version encoding>
-    0x00 0x33
+    {
+      "ipfs": "<metadata hash>",
+      // If "bytecodeHash" was "bzzr1" in compiler settings not "ipfs" but "bzzr1"
+      "bzzr1": "<metadata hash>",
+      // Previous versions were using "bzzr0" instead of "bzzr1"
+      "bzzr0": "<metadata hash>",
+      // If any experimental features that affect code generation are used
+      "experimental": true,
+      "solc": "<compiler version>"
+    }
 
-So in order to retrieve the data, the end of the deployed bytecode can be checked
-to match that pattern and the IPFS hash can be used to retrieve the file (if pinned/published).
+Because we might support other ways to retrieve the
+metadata file in the future, this information is stored
+`CBOR <https://tools.ietf.org/html/rfc7049>`_-encoded. The last two bytes in the bytecode
+indicate the length of the CBOR encoded information. By looking at this length, the
+relevant part of the bytecode can be decoded with a CBOR decoder.
+
+Check the `Metadata Playground <https://playground.sourcify.dev/>`_ to see it in action.
 
 Whereas release builds of solc use a 3 byte encoding of the version as shown
 above (one byte each for major, minor and patch version number), prerelease builds
@@ -228,17 +250,9 @@ boolean field ``settings.metadata.appendCBOR`` in Standard JSON input can be set
 
 .. note::
   The CBOR mapping can also contain other keys, so it is better to fully
-  decode the data instead of relying on it starting with ``0xa264``.
-  For example, if any experimental features that affect code generation
-  are used, the mapping will also contain ``"experimental": true``.
-
-.. note::
-  The compiler currently uses the IPFS hash of the metadata by default, but
-  it may also use the bzzr1 hash or some other hash in the future, so do
-  not rely on this sequence to start with ``0xa2 0x64 'i' 'p' 'f' 's'``.  We
-  might also add additional data to this CBOR structure, so the best option
-  is to use a proper CBOR parser.
-
+  decode the data by looking at the end of the bytecode for the CBOR length,
+  and to use a proper CBOR parser. Do not rely on it starting with ``0xa264``
+  or ``0xa2 0x64 'i' 'p' 'f' 's'``.
 
 Usage for Automatic Interface Generation and NatSpec
 ====================================================
@@ -252,24 +266,27 @@ is JSON-decoded into a structure like above.
 The component can then use the ABI to automatically generate a rudimentary
 user interface for the contract.
 
-Furthermore, the wallet can use the NatSpec user documentation to display a human-readable confirmation message to the user
-whenever they interact with the contract, together with requesting
-authorization for the transaction signature.
+Furthermore, the wallet can use the NatSpec user documentation to display a
+human-readable confirmation message to the user whenever they interact with
+the contract, together with requesting authorization for the transaction signature.
 
 For additional information, read :doc:`Ethereum Natural Language Specification (NatSpec) format <natspec-format>`.
 
 Usage for Source Code Verification
 ==================================
 
-In order to verify the compilation, sources can be retrieved from IPFS/Swarm
-via the link in the metadata file.
-The compiler of the correct version (which is checked to be part of the "official" compilers)
-is invoked on that input with the specified settings. The resulting
-bytecode is compared to the data of the creation transaction or ``CREATE`` opcode data.
-This automatically verifies the metadata since its hash is part of the bytecode.
-Excess data corresponds to the constructor input data, which should be decoded
-according to the interface and presented to the user.
+If pinned/published, it is possible to retrieve the metadata of the contract from IPFS/Swarm.
+The metadata file also contains the URLs or the IPFS hashes of the source files, as well as
+the compilation settings, i.e. everything needed to reproduce a compilation.
+
+With this information it is then possible to verify the source code of a contract by
+reproducing the compilation, and comparing the bytecode from the compilation with
+the bytecode of the deployed contract.
+
+This automatically verifies the metadata since its hash is part of the bytecode, as well
+as the source codes, because their hashes are part of the metadata. Any change in the files
+or settings would result in a different metadata hash. The metadata here serves
+as a fingerprint of the whole compilation.
 
-In the repository `sourcify <https://github.com/ethereum/sourcify>`_
-(`npm package <https://www.npmjs.com/package/source-verify>`_) you can see
-example code that shows how to use this feature.
+`Sourcify <https://sourcify.dev>`_ makes use of this feature for "full/perfect verification",
+as well as pinning the files publicly on IPFS to be accessed with the metadata hash.
\ No newline at end of file

From 0037693c8d3edf1acb4aa39497bdf8a0fe837745 Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Mon, 3 Apr 2023 17:55:17 +0100
Subject: [PATCH 1254/1748] Update ReleaseChecklist.md post release steps
 (#14007)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update ReleaseChecklist.md

* Update ReleaseChecklist.md

* Update ReleaseChecklist.md

* Update ReleaseChecklist.md

* Update ReleaseChecklist.md

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>

* Update ReleaseChecklist.md

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>

* Update ReleaseChecklist.md

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>

* Update ReleaseChecklist.md

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>

---------

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 ReleaseChecklist.md | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 25cdfe0463..a7d6a4dc78 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -102,12 +102,15 @@ At least a day before the release:
 ### Post-release
  - [ ] Make sure the documentation for the new release has been published successfully.
        Go to the [documentation status page at ReadTheDocs](https://readthedocs.org/projects/solidity/) and verify that the new version is listed, works and is marked as default.
- - [ ] Remove "still in progress" warning from the release notes.
- - [ ] Publish the blog posts.
+ - [ ] Remove "still in progress" warning from the [release notes](https://github.com/ethereum/solidity/releases).
+ - [ ] Merge the [blog posts](https://github.com/ethereum/solidity-blog/pulls) related to the release.
  - [ ] Create a commit to increase the version number on ``develop`` in ``CMakeLists.txt`` and add a new skeleton changelog entry.
- - [ ] Announce on Twitter, including links to the release and the blog post.
-       Use ``#xp`` at the end of the tweet to automatically cross post the announcement to Fosstodon.
+ - [ ] Update the release information section [in the source of soliditylang.org](https://github.com/ethereum/solidity-portal/blob/master/index.html).
+ - [ ] Announce on [Twitter](https://twitter.com/solidity_lang), including links to the release and the blog post.
+ - [ ] Announce on [Fosstodon](https://fosstodon.org/@solidity/), including links to the release and the blog post.
  - [ ] Share the announcement on Reddit in [``/r/ethdev``](https://reddit.com/r/ethdev/), cross-posted to [``/r/ethereum``](https://reddit.com/r/ethereum/).
- - [ ] Share the announcement the [Solidity forum](https://forum.soliditylang.org) in the ``Announcements`` category.
- - [ ] Update the release information section on [soliditylang.org](https://github.com/ethereum/solidity-portal).
+ - [ ] Share the announcement on the [Solidity forum](https://forum.soliditylang.org) in the ``Announcements`` category.
+ - [ ] Share the announcement on [Project Updates](https://discord.com/channels/420394352083337236/798974456704925696)
+ - [ ] Share the announcement on [`#solidity` channel on Matrix](https://matrix.to/#/#ethereum_solidity:gitter.im)
+ - [ ] Share the announcement on [`#solc-tooling`](https://matrix.to/#/#solc-tooling:matrix.org)
  - [ ] Lean back, wait for bug reports and repeat from step 1 :).

From d9965a3d148fcb912bf49731270b71f4345c343a Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Tue, 4 Apr 2023 13:03:10 +0100
Subject: [PATCH 1255/1748] Update issue templates (#13970)

* Update issue templates

Added labels to all the templates as well as descriptions.

Next step:
- Mandatory fields.

* Update .github/ISSUE_TEMPLATE/bug_report.md

Co-authored-by: matheusaaguiar <95899911+matheusaaguiar@users.noreply.github.com>

* Update .github/ISSUE_TEMPLATE/documentation_issue.md

Co-authored-by: matheusaaguiar <95899911+matheusaaguiar@users.noreply.github.com>

---------

Co-authored-by: matheusaaguiar <95899911+matheusaaguiar@users.noreply.github.com>
---
 .github/ISSUE_TEMPLATE/bug_report.md          | 5 +++++
 .github/ISSUE_TEMPLATE/documentation_issue.md | 5 +++++
 .github/ISSUE_TEMPLATE/feature_request.md     | 6 ++++++
 3 files changed, 16 insertions(+)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 36e25b1f09..49acab231f 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,5 +1,10 @@
 ---
 name: Bug Report
+about: Problems, deficiencies, inaccuracies or crashes discovered on Solidity.
+title: ''
+labels: 'bug :bug:'
+assignees: ''
+
 ---
 
 <!--## Prerequisites
diff --git a/.github/ISSUE_TEMPLATE/documentation_issue.md b/.github/ISSUE_TEMPLATE/documentation_issue.md
index 7509ec395f..91082a9aaf 100644
--- a/.github/ISSUE_TEMPLATE/documentation_issue.md
+++ b/.github/ISSUE_TEMPLATE/documentation_issue.md
@@ -1,5 +1,10 @@
 ---
 name: Documentation Issue
+about: Corrections, improvements or requests for new content on Solidity's documentation.
+title: ''
+labels: 'documentation :book:'
+assignees: ''
+
 ---
 
 ## Page
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index e5cc0f79c1..7ec729b1c7 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,5 +1,11 @@
 ---
 name: Feature Request
+about: Ideas, comments or messages asking for a particular functionality to be added
+  to Solidity.
+title: ''
+labels: feature
+assignees: ''
+
 ---
 
 <!--## Prerequisites

From 293690e5a444df780a2306b68a503b480f33e342 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 4 Apr 2023 15:19:37 +0200
Subject: [PATCH 1256/1748] Add util::capitalized() and Type::categoryName()

---
 libsolidity/ast/Types.cpp | 29 +++++++++++++++++++++++++++++
 libsolidity/ast/Types.h   | 25 ++++++++++++++++++++++---
 libsolutil/StringUtils.h  |  9 +++++++++
 3 files changed, 60 insertions(+), 3 deletions(-)

diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 8fa330da4e..c2356ad810 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -294,6 +294,35 @@ Type const* Type::commonType(Type const* _a, Type const* _b)
 		return nullptr;
 }
 
+char const* Type::categoryName(Type::Category _category)
+{
+	switch (_category)
+	{
+	case Category::Address: return "address";
+	case Category::Integer: return "integer";
+	case Category::RationalNumber: return "rational number literal";
+	case Category::StringLiteral: return "string literal";
+	case Category::Bool: return "boolean";
+	case Category::FixedPoint: return "fixed-point number";
+	case Category::Array: return "array";
+	case Category::ArraySlice: return "array slice";
+	case Category::FixedBytes: return "fixed-size byte array";
+	case Category::Contract: return "contract";
+	case Category::Struct: return "struct";
+	case Category::Function: return "function";
+	case Category::Enum: return "enum";
+	case Category::UserDefinedValueType: return "user-defined value type";
+	case Category::Tuple: return "tuple";
+	case Category::Mapping: return "mapping";
+	case Category::TypeType: return "type of a type";
+	case Category::Modifier: return "modifier";
+	case Category::Magic: return "magic variable";
+	case Category::Module: return "module";
+	case Category::InaccessibleDynamic: return "inaccessible dynamic value";
+	}
+	util::unreachable();
+}
+
 MemberList const& Type::members(ASTNode const* _currentScope) const
 {
 	if (!m_members[_currentScope])
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index d7312aa1dd..9c6389a29a 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -174,9 +174,26 @@ class Type
 
 	enum class Category
 	{
-		Address, Integer, RationalNumber, StringLiteral, Bool, FixedPoint, Array, ArraySlice,
-		FixedBytes, Contract, Struct, Function, Enum, UserDefinedValueType, Tuple,
-		Mapping, TypeType, Modifier, Magic, Module,
+		Address,
+		Integer,
+		RationalNumber,
+		StringLiteral,
+		Bool,
+		FixedPoint,
+		Array,
+		ArraySlice,
+		FixedBytes,
+		Contract,
+		Struct,
+		Function,
+		Enum,
+		UserDefinedValueType,
+		Tuple,
+		Mapping,
+		TypeType,
+		Modifier,
+		Magic,
+		Module,
 		InaccessibleDynamic
 	};
 
@@ -184,6 +201,8 @@ class Type
 	static Type const* commonType(Type const* _a, Type const* _b);
 
 	virtual Category category() const = 0;
+	static char const* categoryName(Type::Category _category);
+
 	/// @returns a valid solidity identifier such that two types should compare equal if and
 	/// only if they have the same identifier.
 	/// The identifier should start with "t_".
diff --git a/libsolutil/StringUtils.h b/libsolutil/StringUtils.h
index 0d5bc7839b..b01dba63b3 100644
--- a/libsolutil/StringUtils.h
+++ b/libsolutil/StringUtils.h
@@ -160,6 +160,15 @@ inline std::string toLower(std::string _s)
 	return _s;
 }
 
+/// Returns a copy of the string with the first character converted to its uppercase equivalent.
+/// Uses the classic "C" locale semantics.
+inline std::string capitalized(std::string _s)
+{
+	if (_s.size() > 0)
+		_s[0] = toUpper(_s[0]);
+	return _s;
+}
+
 /// Checks whether _c is a decimal digit character. It uses the classic "C" locale semantics.
 /// @param _c character to be checked
 /// @return true if _c is a decimal digit character, false otherwise

From a019f400d080aeab3fd02fd4e7b699e965a893f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 3 Apr 2023 16:30:42 +0200
Subject: [PATCH 1257/1748] Better error message when trying to call things
 that are not functions

---
 libsolidity/analysis/TypeChecker.cpp                     | 6 +++++-
 .../functionCalls/enum_value_not_callable.sol            | 7 +++++++
 .../syntaxTests/functionCalls/int_not_callable.sol       | 2 +-
 .../syntaxTests/functionCalls/magic_not_callable.sol     | 5 +++++
 .../syntaxTests/functionCalls/mapping_not_callable.sol   | 6 ++++++
 .../syntaxTests/functionCalls/modifier_not_callable.sol  | 7 +++++++
 .../syntaxTests/functionCalls/module_not_callable.sol    | 9 +++++++++
 .../syntaxTests/functionCalls/this_not_callable.sol      | 2 +-
 .../nameAndTypeResolution/462_callable_crash.sol         | 2 +-
 .../492_do_not_crash_on_not_lvalue.sol                   | 2 +-
 .../state_variable_function_conflict_former_crash.sol    | 2 +-
 .../tupleAssignments/double_storage_crash.sol            | 2 +-
 .../libsolidity/syntaxTests/types/function_call_fail.sol | 2 +-
 13 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol
 create mode 100644 test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol
 create mode 100644 test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol
 create mode 100644 test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol
 create mode 100644 test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 717fa043b1..efbbc57419 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -2847,7 +2847,11 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
 	}
 
 	default:
-		m_errorReporter.fatalTypeError(5704_error, _functionCall.location(), "Type is not callable");
+		m_errorReporter.fatalTypeError(
+			5704_error,
+			_functionCall.location(),
+			capitalized(Type::categoryName(expressionType->category())) + " is not callable."
+		);
 		// Unreachable, because fatalTypeError throws. We don't set kind, but that's okay because the switch below
 		// is never reached. And, even if it was, SetOnce would trigger an assertion violation and not UB.
 		funcCallAnno.isPure = argumentsArePure;
diff --git a/test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol
new file mode 100644
index 0000000000..0735f446f2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol
@@ -0,0 +1,7 @@
+enum E { A, B, C }
+
+contract C {
+    uint a = E.B(1000);
+}
+// ----
+// TypeError 5704: (46-55): Enum is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
index 5c7260f36f..5481ff1a35 100644
--- a/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
@@ -5,4 +5,4 @@ contract C
     }
 }
 // ----
-// TypeError 5704: (53-60): Type is not callable
+// TypeError 5704: (53-60): Rational number literal is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol
new file mode 100644
index 0000000000..b74685d4bd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol
@@ -0,0 +1,5 @@
+contract C {
+    uint a = msg(1000);
+}
+// ----
+// TypeError 5704: (26-35): Magic variable is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol
new file mode 100644
index 0000000000..d067129990
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol
@@ -0,0 +1,6 @@
+contract C {
+    mapping (uint => uint) m;
+    uint a = m(1000);
+}
+// ----
+// TypeError 5704: (56-63): Mapping is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol
new file mode 100644
index 0000000000..31ef66fe17
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol
@@ -0,0 +1,7 @@
+contract C {
+    uint a = m(1000);
+
+    modifier m(uint) { _; }
+}
+// ----
+// TypeError 5704: (26-33): Modifier is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol
new file mode 100644
index 0000000000..63debdab7a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol
@@ -0,0 +1,9 @@
+==== Source: A.sol ====
+==== Source: B.sol ====
+import "A.sol" as A;
+
+contract C {
+    uint a = A(1000);
+}
+// ----
+// TypeError 5704: (B.sol:48-55): Module is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
index 52e6986bb0..35c04d4735 100644
--- a/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (72-78): Type is not callable
+// TypeError 5704: (72-78): Contract is not callable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
index 05239fa1b7..6c5539e3b7 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (90-108): Type is not callable
+// TypeError 5704: (90-108): Rational number literal is not callable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
index 392d02e9f1..595785e93d 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (153-157): Type is not callable
+// TypeError 5704: (153-157): Mapping is not callable.
diff --git a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol b/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
index 049fca2741..eeef3e7ea4 100644
--- a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
+++ b/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
@@ -11,4 +11,4 @@ contract SomeContract {
 }
 // ----
 // DeclarationError 2333: (106-145): Identifier already declared.
-// TypeError 5704: (185-195): Type is not callable
+// TypeError 5704: (185-195): Integer is not callable.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol b/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
index a251b3a9b3..701af022b1 100644
--- a/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
+++ b/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
@@ -7,4 +7,4 @@ contract CrashContract {
        }
 }
 // ----
-// TypeError 5704: (170-177): Type is not callable
+// TypeError 5704: (170-177): Rational number literal is not callable.
diff --git a/test/libsolidity/syntaxTests/types/function_call_fail.sol b/test/libsolidity/syntaxTests/types/function_call_fail.sol
index 7e2d0b2302..042b78f017 100644
--- a/test/libsolidity/syntaxTests/types/function_call_fail.sol
+++ b/test/libsolidity/syntaxTests/types/function_call_fail.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (59-63): Type is not callable
+// TypeError 5704: (59-63): Rational number literal is not callable.

From f72e61ccbe4249b42be95746dea9b0853e6ceb32 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 28 Mar 2023 11:02:18 +0200
Subject: [PATCH 1258/1748] update z3 in docker files

---
 scripts/docker/buildpack-deps/Dockerfile.emscripten           | 4 ++--
 .../docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004           | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204           | 2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index 551cab4958..c170aa3da6 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -33,7 +33,7 @@
 # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
 # dependencies automatically.
 FROM emscripten/emsdk:3.1.19 AS base
-LABEL version="14"
+LABEL version="15"
 
 ADD emscripten.jam /usr/src
 RUN set -ex && \
@@ -42,7 +42,7 @@ RUN set -ex && \
 	apt-get install lz4 --no-install-recommends && \
 	\
 	cd /usr/src && \
-	git clone https://github.com/Z3Prover/z3.git -b z3-4.11.2 --depth 1 && \
+	git clone https://github.com/Z3Prover/z3.git -b z3-4.12.1 --depth 1 && \
 	cd z3 && \
 	mkdir build && \
 	cd build && \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
index 469424ab8b..672bd18aa1 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="22"
+LABEL version="23"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -61,7 +61,7 @@ RUN set -ex; \
 
 # Z3
 RUN set -ex; \
-    git clone --depth 1 -b z3-4.11.2 https://github.com/Z3Prover/z3.git \
+    git clone --depth 1 -b z3-4.12.1 https://github.com/Z3Prover/z3.git \
     /usr/src/z3; \
     cd /usr/src/z3; \
     mkdir build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 242f859e7c..de356f144b 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="16"
+LABEL version="17"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 85cd85ecf2..51ab30ac06 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="1"
+LABEL version="2"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index d7f1c95f1e..d0357879ef 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="1"
+LABEL version="2"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

From e6f099db927fb6a23a4323b71bd4a5139d715260 Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Tue, 28 Mar 2023 13:19:13 +0200
Subject: [PATCH 1259/1748] bring ubuntu2004 back

---
 .github/workflows/buildpack-deps.yml         | 3 ++-
 scripts/ci/buildpack-deps_test_ubuntu2004.sh | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 120000 scripts/ci/buildpack-deps_test_ubuntu2004.sh

diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml
index afdf03c8f3..4d3918d941 100644
--- a/.github/workflows/buildpack-deps.yml
+++ b/.github/workflows/buildpack-deps.yml
@@ -6,6 +6,7 @@ on:
     paths:
       - 'scripts/docker/buildpack-deps/Dockerfile.emscripten'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz'
+      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204'
 
@@ -22,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2204.clang, ubuntu2204]
+        image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/scripts/ci/buildpack-deps_test_ubuntu2004.sh b/scripts/ci/buildpack-deps_test_ubuntu2004.sh
new file mode 120000
index 0000000000..feb6a5927f
--- /dev/null
+++ b/scripts/ci/buildpack-deps_test_ubuntu2004.sh
@@ -0,0 +1 @@
+./build.sh
\ No newline at end of file

From 8e5f8c8595d59ac9ca0e42855dd0c2c65e8a53ee Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Wed, 5 Apr 2023 14:55:57 +0200
Subject: [PATCH 1260/1748] reenable arch smt tests

---
 .circleci/config.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e189ea07b0..67d52e0713 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -955,9 +955,8 @@ jobs:
     environment:
       TERM: xterm
       MAKEFLAGS: -j 5
-      # Build without Z3. We won't be running SMT tests on Arch because that requires a specific
-      # version of Z3 and the one with the official repos is often not the one we need.
-      USE_Z3: OFF
+      # This can be switched off if we run out of sync with Arch.
+      USE_Z3: ON
     steps:
       - run:
           name: Install build dependencies

From be8752b5d3df914925a67478487237e98e45dea5 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Wed, 12 Oct 2022 15:09:12 +0200
Subject: [PATCH 1261/1748] Adds natspec to AST for enum definition.

---
 Changelog.md                                  |  1 +
 libsolidity/ast/AST.h                         | 11 +++--
 libsolidity/ast/ASTJsonExporter.cpp           |  1 +
 libsolidity/ast/ASTJsonImporter.cpp           |  3 +-
 libsolidity/parsing/Parser.cpp                |  3 +-
 test/libsolidity/ASTJSON/enum_natspec.json    | 48 +++++++++++++++++++
 test/libsolidity/ASTJSON/enum_natspec.sol     | 10 ++++
 .../ASTJSON/enum_natspec_parseOnly.json       | 40 ++++++++++++++++
 test/libsolidity/SolidityNatspecJSON.cpp      | 34 +++++++++++++
 test/libsolidity/SolidityTypes.cpp            |  2 +-
 test/libsolidity/lsp/hover/hover.sol          | 26 ++++++++--
 .../syntaxTests/natspec/docstring_enum.sol    | 11 +++++
 12 files changed, 180 insertions(+), 10 deletions(-)
 create mode 100644 test/libsolidity/ASTJSON/enum_natspec.json
 create mode 100644 test/libsolidity/ASTJSON/enum_natspec.sol
 create mode 100644 test/libsolidity/ASTJSON/enum_natspec_parseOnly.json
 create mode 100644 test/libsolidity/syntaxTests/natspec/docstring_enum.sol

diff --git a/Changelog.md b/Changelog.md
index 6c17c147b7..85d2c86ee0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * NatSpec: Add support for NatSpec documentation in ``enum`` definitions.
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
  * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
  * Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 93a264622b..631e93c452 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -737,7 +737,7 @@ class StructDefinition: public Declaration, public ScopeOpener
 	std::vector<ASTPointer<VariableDeclaration>> m_members;
 };
 
-class EnumDefinition: public Declaration, public ScopeOpener
+class EnumDefinition: public Declaration, public StructurallyDocumented, public ScopeOpener
 {
 public:
 	EnumDefinition(
@@ -745,9 +745,14 @@ class EnumDefinition: public Declaration, public ScopeOpener
 		SourceLocation const& _location,
 		ASTPointer<ASTString> const& _name,
 		SourceLocation _nameLocation,
-		std::vector<ASTPointer<EnumValue>> _members
+		std::vector<ASTPointer<EnumValue>> _members,
+		ASTPointer<StructuredDocumentation> _documentation
 	):
-		Declaration(_id, _location, _name, std::move(_nameLocation)), m_members(std::move(_members)) {}
+		Declaration(_id, _location, _name, std::move(_nameLocation)),
+		StructurallyDocumented(std::move(_documentation)),
+		m_members(std::move(_members))
+	{}
+
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
 
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index e35d108216..6106bce141 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -384,6 +384,7 @@ bool ASTJsonExporter::visit(EnumDefinition const& _node)
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("name", _node.name()),
 		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
 		make_pair("members", toJson(_node.members()))
 	};
 
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index a1201983fe..f63545face 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -462,7 +462,8 @@ ASTPointer<EnumDefinition> ASTJsonImporter::createEnumDefinition(Json::Value con
 		_node,
 		memberAsASTString(_node, "name"),
 		createNameSourceLocation(_node),
-		members
+		members,
+		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation"))
 	);
 }
 
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index d3bdf549f4..f1850fe1ce 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -706,6 +706,7 @@ ASTPointer<EnumDefinition> Parser::parseEnumDefinition()
 {
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
+	ASTPointer<StructuredDocumentation> documentation = parseStructuredDocumentation();
 	expectToken(Token::Enum);
 	auto [name, nameLocation] = expectIdentifierWithLocation();
 	vector<ASTPointer<EnumValue>> members;
@@ -725,7 +726,7 @@ ASTPointer<EnumDefinition> Parser::parseEnumDefinition()
 
 	nodeFactory.markEndPosition();
 	expectToken(Token::RBrace);
-	return nodeFactory.createNode<EnumDefinition>(name, nameLocation, members);
+	return nodeFactory.createNode<EnumDefinition>(name, nameLocation, members, documentation);
 }
 
 ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration(
diff --git a/test/libsolidity/ASTJSON/enum_natspec.json b/test/libsolidity/ASTJSON/enum_natspec.json
new file mode 100644
index 0000000000..f3cc7b8df8
--- /dev/null
+++ b/test/libsolidity/ASTJSON/enum_natspec.json
@@ -0,0 +1,48 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "Color":
+    [
+      4
+    ]
+  },
+  "id": 5,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "canonicalName": "Color",
+      "documentation":
+      {
+        "id": 1,
+        "nodeType": "StructuredDocumentation",
+        "src": "0:112:1",
+        "text": "@title example of title\n @author example of author\n @notice example of notice\n @dev example of dev"
+      },
+      "id": 4,
+      "members":
+      [
+        {
+          "id": 2,
+          "name": "Red",
+          "nameLocation": "129:3:1",
+          "nodeType": "EnumValue",
+          "src": "129:3:1"
+        },
+        {
+          "id": 3,
+          "name": "Green",
+          "nameLocation": "138:5:1",
+          "nodeType": "EnumValue",
+          "src": "138:5:1"
+        }
+      ],
+      "name": "Color",
+      "nameLocation": "117:5:1",
+      "nodeType": "EnumDefinition",
+      "src": "112:33:1"
+    }
+  ],
+  "src": "112:34:1"
+}
diff --git a/test/libsolidity/ASTJSON/enum_natspec.sol b/test/libsolidity/ASTJSON/enum_natspec.sol
new file mode 100644
index 0000000000..b9663fa9e6
--- /dev/null
+++ b/test/libsolidity/ASTJSON/enum_natspec.sol
@@ -0,0 +1,10 @@
+/// @title example of title
+/// @author example of author
+/// @notice example of notice
+/// @dev example of dev
+enum Color {
+    Red,
+    Green
+}
+
+// ----
diff --git a/test/libsolidity/ASTJSON/enum_natspec_parseOnly.json b/test/libsolidity/ASTJSON/enum_natspec_parseOnly.json
new file mode 100644
index 0000000000..b5a38af6c4
--- /dev/null
+++ b/test/libsolidity/ASTJSON/enum_natspec_parseOnly.json
@@ -0,0 +1,40 @@
+{
+  "absolutePath": "a",
+  "id": 5,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "documentation":
+      {
+        "id": 1,
+        "nodeType": "StructuredDocumentation",
+        "src": "0:112:1",
+        "text": "@title example of title\n @author example of author\n @notice example of notice\n @dev example of dev"
+      },
+      "id": 4,
+      "members":
+      [
+        {
+          "id": 2,
+          "name": "Red",
+          "nameLocation": "129:3:1",
+          "nodeType": "EnumValue",
+          "src": "129:3:1"
+        },
+        {
+          "id": 3,
+          "name": "Green",
+          "nameLocation": "138:5:1",
+          "nodeType": "EnumValue",
+          "src": "138:5:1"
+        }
+      ],
+      "name": "Color",
+      "nameLocation": "117:5:1",
+      "nodeType": "EnumDefinition",
+      "src": "112:33:1"
+    }
+  ],
+  "src": "112:34:1"
+}
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index 1a2c3af1ff..decc489d53 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -1076,6 +1076,40 @@ BOOST_AUTO_TEST_CASE(dev_author_at_function)
 	expectNatspecError(sourceCode);
 }
 
+BOOST_AUTO_TEST_CASE(enum_no_docs)
+{
+	char const* sourceCode = R"(
+		contract C {
+			/// @title example of title
+			/// @author example of author
+			/// @notice example of notice
+			/// @dev example of dev
+			enum Color {
+				Red,
+				Green
+			}
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+		"kind": "dev",
+		"methods": {},
+		"version": 1
+	})ABCDEF";
+
+	checkNatspec(sourceCode, "C", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+	  "kind": "user",
+	  "methods": {},
+	  "version": 1
+	})ABCDEF";
+
+	checkNatspec(sourceCode, "C", userDoc, true);
+}
+
 BOOST_AUTO_TEST_CASE(natspec_notice_without_tag)
 {
 	char const* sourceCode = R"(
diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp
index 63b943e979..139e73e312 100644
--- a/test/libsolidity/SolidityTypes.cpp
+++ b/test/libsolidity/SolidityTypes.cpp
@@ -191,7 +191,7 @@ BOOST_AUTO_TEST_CASE(type_identifiers)
 	s.annotation().recursive = false;
 	BOOST_CHECK_EQUAL(s.type()->identifier(), "t_type$_t_struct$_Struct_$3_storage_ptr_$");
 
-	EnumDefinition e(++id, {}, make_shared<string>("Enum"), {}, {});
+	EnumDefinition e(++id, {}, make_shared<string>("Enum"), {}, {}, {});
 	BOOST_CHECK_EQUAL(e.type()->identifier(), "t_type$_t_enum$_Enum_$4_$");
 
 	TupleType t({e.type(), s.type(), stringArray, nullptr});
diff --git a/test/libsolidity/lsp/hover/hover.sol b/test/libsolidity/lsp/hover/hover.sol
index 9a1ee034cf..154d2326e1 100644
--- a/test/libsolidity/lsp/hover/hover.sol
+++ b/test/libsolidity/lsp/hover/hover.sol
@@ -48,9 +48,18 @@ contract User
 // <- {
 //     "contents": {
 //         "kind": "markdown",
-//         "value": "```solidity\ntype(enum User.SomeEnum)\n```\n\n"
+//         "value": "```solidity\ntype(enum User.SomeEnum)\n```\n\nSome enum value.\n\n"
 //     },
-//     "range": @Cursor1Range
+//     "range": {
+//         "end": {
+//             "character": 12,
+//             "line": 17
+//         },
+//         "start": {
+//             "character": 4,
+//             "line": 17
+//         }
+//     }
 // }
 // -> textDocument/hover {
 //     "position": @Cursor2
@@ -58,9 +67,18 @@ contract User
 // <- {
 //     "contents": {
 //         "kind": "markdown",
-//         "value": "```solidity\ntype(enum User.SomeEnum)\n```\n\n"
+//         "value": "```solidity\ntype(enum User.SomeEnum)\n```\n\nSome enum value.\n\n"
 //     },
-//     "range": @Cursor2Range
+//     "range": {
+//         "end": {
+//             "character": 32,
+//             "line": 22
+//         },
+//         "start": {
+//             "character": 24,
+//             "line": 22
+//         }
+//     }
 // }
 // -> textDocument/hover {
 //     "position": @Cursor3
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_enum.sol b/test/libsolidity/syntaxTests/natspec/docstring_enum.sol
new file mode 100644
index 0000000000..d80484446b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/natspec/docstring_enum.sol
@@ -0,0 +1,11 @@
+contract C {
+    /// @title example of title
+    /// @author example of author
+    /// @notice example of notice
+    /// @dev example of dev
+    enum Color {
+        Red,
+        Green
+    }
+}
+// ----

From 3d5bb3e87b8121262e18245f1d0bda4dada37021 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 5 Apr 2023 17:42:06 +0200
Subject: [PATCH 1262/1748] Sort changelog

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 85d2c86ee0..1e77df1a26 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,9 +5,9 @@ Language Features:
 
 Compiler Features:
  * NatSpec: Add support for NatSpec documentation in ``enum`` definitions.
+ * Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
  * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
- * Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
 
 
 Bugfixes:

From 26c769fe8ec5d851c03226c73c9e3e2ae96383ec Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Thu, 6 Apr 2023 01:35:09 +0900
Subject: [PATCH 1263/1748] fix: not displaying svg image

---
 docs/conf.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/conf.py b/docs/conf.py
index daa5e99132..7cd047a060 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -45,6 +45,7 @@ def setup(sphinx):
     'sphinx_a4doc',
     'html_extra_template_renderer',
     'remix_code_links',
+    'sphinx.ext.imgconverter',
 ]
 
 a4_base_path = os.path.dirname(__file__) + '/grammar'

From 33b07c5dc67a5cd8045f45594f1b3c6f10da0c8a Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 30 Mar 2023 16:04:25 +0200
Subject: [PATCH 1264/1748] Skip via-ir with yul optimizer for Gnosis external
 tests

---
 test/externalTests/gnosis.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index bafc3f2ca8..00ea2597e8 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -47,7 +47,8 @@ function gnosis_safe_test
         "${compile_only_presets[@]}"
         #ir-no-optimize            # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
         #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
-        ir-optimize-evm+yul
+        # TODO: Uncomment the preset below when the issue: https://github.com/safe-global/safe-contracts/issues/544 is solved.
+        #ir-optimize-evm+yul       # Compilation fails with "YulException: Cannot swap Variable var_operation with Variable _1: too deep in the stack by 4 slots."
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul

From f404eb0349809082b3930a21d9ccdcb48b3abfbb Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 6 Apr 2023 13:23:36 +0200
Subject: [PATCH 1265/1748] More openzeppelin workarounds

---
 test/externalTests/zeppelin.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 495aafa8bd..2a95fc8ddf 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -67,6 +67,8 @@ function zeppelin_test
     # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
     # TODO: Remove the lines below when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3750).
     sed -i "s|it(\('proxy admin cannot call delegated functions',\)|it.skip(\1|g" test/proxy/transparent/TransparentUpgradeableProxy.behaviour.js
+    sed -i "s|describe(\('when the given implementation is the zero address'\)|describe.skip(\1|g" test/proxy/transparent/TransparentUpgradeableProxy.behaviour.js
+    sed -i "s|describe(\('when the new proposed admin is the zero address'\)|describe.skip(\1|g" test/proxy/transparent/TransparentUpgradeableProxy.behaviour.js
     # In some cases Hardhat does not detect revert reasons properly via IR.
     sed -i "s|it(\('reverts if the current value is 0'\)|it.skip(\1|g" test/utils/Counters.test.js
     sed -i "s|it(\('prevent unauthorized maintenance'\)|it.skip(\1|g" test/governance/TimelockController.test.js

From 16d758b7f9a032ebf629cb0cb13526ede09f06f2 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Fri, 7 Apr 2023 13:16:21 +0900
Subject: [PATCH 1266/1748] Fix dark mode in grammar

---
 docs/_static/css/dark.css | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/docs/_static/css/dark.css b/docs/_static/css/dark.css
index a87ff09ebe..a31ba86512 100644
--- a/docs/_static/css/dark.css
+++ b/docs/_static/css/dark.css
@@ -633,3 +633,22 @@ code.docutils.literal.notranslate {
 a.remix-link {
     filter: invert(1); /* The icon is black. In dark mode we want it white. */
 }
+
+
+/* Grammar */
+
+.railroad-diagram {
+    fill: white;
+}
+
+.railroad-diagram path {
+    stroke: white;
+}
+
+.railroad-diagram rect {
+    stroke: white;
+}
+
+.a4 .sig-name {
+    background-color: transparent !important;
+}

From 8dd6f7769282e01b92eae32e1293e55487d3e31a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 23 Mar 2023 11:37:46 +0100
Subject: [PATCH 1267/1748] Extra test for operator cleanup

---
 ...meter_and_return_cleanup_between_calls.sol | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/operators/userDefined/operator_parameter_and_return_cleanup_between_calls.sol

diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_and_return_cleanup_between_calls.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_and_return_cleanup_between_calls.sol
new file mode 100644
index 0000000000..b51ad8dad5
--- /dev/null
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_parameter_and_return_cleanup_between_calls.sol
@@ -0,0 +1,22 @@
+type U8 is uint8;
+using {yoloAdd as +, yoloDiv as /} for U8 global;
+
+function yoloAdd(U8 x, U8 y) pure returns (U8 z) {
+    assembly {
+        z := add(x, y) // Wrong! No cleanup.
+    }
+}
+
+function yoloDiv(U8 x, U8 y) pure returns (U8 z) {
+    assembly {
+        z := div(x, y) // Wrong! No cleanup.
+    }
+}
+
+contract C {
+    function divAddNoOverflow(U8 a, U8 b, U8 c) external pure returns (U8) {
+        return a / (b + c);
+    }
+}
+// ----
+// divAddNoOverflow(uint8,uint8,uint8): 4, 0xff, 3 -> 0

From 5687f6e93454e896835033f2126cdec2206006db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 7 Apr 2023 14:48:13 +0200
Subject: [PATCH 1268/1748] Tests for literal denominations with non-integer
 literals

---
 .../literals/fractional_denominations.sol         | 15 +++++++++++++++
 .../invalid_denomination_address.sol              |  5 +++++
 .../invalid_denomination_on_bool.sol              |  5 +++++
 .../invalid_denomination_on_string.sol            |  5 +++++
 4 files changed, 30 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/literals/fractional_denominations.sol
 create mode 100644 test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol
 create mode 100644 test/libsolidity/syntaxTests/denominations/invalid_denomination_on_bool.sol
 create mode 100644 test/libsolidity/syntaxTests/denominations/invalid_denomination_on_string.sol

diff --git a/test/libsolidity/semanticTests/literals/fractional_denominations.sol b/test/libsolidity/semanticTests/literals/fractional_denominations.sol
new file mode 100644
index 0000000000..6bc448f090
--- /dev/null
+++ b/test/libsolidity/semanticTests/literals/fractional_denominations.sol
@@ -0,0 +1,15 @@
+contract C {
+    uint public g = 1.5 gwei;
+    uint public e = 1.5 ether;
+    uint public m = 1.5 minutes;
+    uint public h = 1.5 hours;
+    uint public d = 1.5 days;
+    uint public w = 1.5 weeks;
+}
+// ----
+// g() -> 1500000000
+// e() -> 1500000000000000000
+// m() -> 90
+// h() -> 5400
+// d() -> 129600
+// w() -> 907200
diff --git a/test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol b/test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol
new file mode 100644
index 0000000000..8eec22dee3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/denominations/invalid_denomination_address.sol
@@ -0,0 +1,5 @@
+contract C {
+	address a = 0x11111122222333334444455555666667777788888 wei;
+}
+// ----
+// TypeError 5145: (26-73): Hexadecimal numbers cannot be used with unit denominations. You can use an expression of the form "0x1234 * 1 day" instead.
diff --git a/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_bool.sol b/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_bool.sol
new file mode 100644
index 0000000000..58d7d205e6
--- /dev/null
+++ b/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_bool.sol
@@ -0,0 +1,5 @@
+contract C {
+	bool constant x = true ether;
+}
+// ----
+// ParserError 2314: (37-42): Expected ';' but got 'ether'
diff --git a/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_string.sol b/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_string.sol
new file mode 100644
index 0000000000..9d27c5d3de
--- /dev/null
+++ b/test/libsolidity/syntaxTests/denominations/invalid_denomination_on_string.sol
@@ -0,0 +1,5 @@
+contract C {
+	string s = "abc" ether;
+}
+// ----
+// ParserError 2314: (31-36): Expected ';' but got 'ether'

From fc7cd5484960cf2227ff2a728b5018715651e155 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 6 Apr 2023 12:53:30 +0200
Subject: [PATCH 1269/1748] Tests for changing virtual function mutability when
 overriding

---
 ..._override_changing_mutability_internal.sol | 23 +++++++++++++++++++
 ...al_override_changing_mutability_public.sol | 23 +++++++++++++++++++
 2 files changed, 46 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_internal.sol
 create mode 100644 test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_public.sol

diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_internal.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_internal.sol
new file mode 100644
index 0000000000..cee1bcdde5
--- /dev/null
+++ b/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_internal.sol
@@ -0,0 +1,23 @@
+contract A {
+    function f() internal virtual {
+        mutableWithViewOverride();
+        mutableWithPureOverride();
+        viewWithPureOverride();
+    }
+
+    function mutableWithViewOverride() internal virtual {}
+    function mutableWithPureOverride() internal virtual {}
+    function viewWithPureOverride() internal view virtual {}
+}
+
+contract C is A {
+    function run() public {
+        f();
+    }
+
+    function mutableWithViewOverride() internal view override {}
+    function mutableWithPureOverride() internal pure override {}
+    function viewWithPureOverride() internal pure override {}
+}
+// ----
+// run() ->
diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_public.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_public.sol
new file mode 100644
index 0000000000..c3d9e60a05
--- /dev/null
+++ b/test/libsolidity/semanticTests/virtualFunctions/virtual_override_changing_mutability_public.sol
@@ -0,0 +1,23 @@
+contract A {
+    function f() internal virtual {
+        mutableWithViewOverride();
+        mutableWithPureOverride();
+        viewWithPureOverride();
+    }
+
+    function mutableWithViewOverride() public virtual {}
+    function mutableWithPureOverride() public virtual {}
+    function viewWithPureOverride() public view virtual {}
+}
+
+contract C is A {
+    function run() public {
+        f();
+    }
+
+    function mutableWithViewOverride() public view override {}
+    function mutableWithPureOverride() public pure override {}
+    function viewWithPureOverride() public pure override {}
+}
+// ----
+// run() ->

From 66fcd542bc61b3999bdd8051659579ffcf597d6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 24 Feb 2023 19:54:50 +0100
Subject: [PATCH 1270/1748] Tests for denominations in array sizes

---
 .../literals/denominations_in_array_sizes.sol | 25 +++++++++++++++++++
 .../denominations_in_array_sizes.sol          | 12 +++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/literals/denominations_in_array_sizes.sol
 create mode 100644 test/libsolidity/syntaxTests/denominations/denominations_in_array_sizes.sol

diff --git a/test/libsolidity/semanticTests/literals/denominations_in_array_sizes.sol b/test/libsolidity/semanticTests/literals/denominations_in_array_sizes.sol
new file mode 100644
index 0000000000..43a09af050
--- /dev/null
+++ b/test/libsolidity/semanticTests/literals/denominations_in_array_sizes.sol
@@ -0,0 +1,25 @@
+contract C {
+    uint[2 wei] a;
+    uint[2 gwei] b;
+    uint[2 ether] c;
+    uint[2 seconds] d;
+    uint[2 minutes] e;
+    uint[2 hours] f;
+    uint[2 days] g;
+    uint[2 weeks] h;
+
+    function lengths() public returns (uint, uint, uint, uint, uint, uint, uint, uint) {
+        return (
+            a.length,
+            b.length,
+            c.length,
+            d.length,
+            e.length,
+            f.length,
+            g.length,
+            h.length
+        );
+    }
+}
+// ----
+// lengths() -> 2, 2000000000, 2000000000000000000, 2, 120, 7200, 172800, 1209600
diff --git a/test/libsolidity/syntaxTests/denominations/denominations_in_array_sizes.sol b/test/libsolidity/syntaxTests/denominations/denominations_in_array_sizes.sol
new file mode 100644
index 0000000000..46c7a0d87d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/denominations/denominations_in_array_sizes.sol
@@ -0,0 +1,12 @@
+contract C {
+    uint[42 wei] a;
+    uint[42 gwei] b;
+    uint[42 ether] c;
+    uint[42 seconds] d;
+    uint[42 minutes] e;
+    uint[42 hours] f;
+    uint[42 days] g;
+    uint[42 weeks] h;
+}
+// ----
+// Warning 7325: (58-72): Type uint256[42000000000000000000] covers a large part of storage and thus makes collisions likely. Either use mappings or dynamic arrays and allow their size to be increased only in small quantities per transaction.

From 8757e0aa115e4e5fe484f8e89589cb81d71e0518 Mon Sep 17 00:00:00 2001
From: hrkrshnn <git@hrkrshnn.com>
Date: Sun, 9 Apr 2023 15:42:53 +0200
Subject: [PATCH 1271/1748] feat: add support for `push0` in libevmasm

See https://eips.ethereum.org/EIPS/eip-3855

Note: `push0` costs 2 gas, i.e., `Tier::Base` unlike other pushes.
---
 libevmasm/Instruction.cpp | 2 ++
 libevmasm/Instruction.h   | 9 +++++----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index 418a6e1856..2c313fd752 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -94,6 +94,7 @@ std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
 	{ "MSIZE", Instruction::MSIZE },
 	{ "GAS", Instruction::GAS },
 	{ "JUMPDEST", Instruction::JUMPDEST },
+	{ "PUSH0", Instruction::PUSH0 },
 	{ "PUSH1", Instruction::PUSH1 },
 	{ "PUSH2", Instruction::PUSH2 },
 	{ "PUSH3", Instruction::PUSH3 },
@@ -242,6 +243,7 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::MSIZE,		{ "MSIZE",			0, 0, 1, false, Tier::Base } },
 	{ Instruction::GAS,			{ "GAS",			0, 0, 1, false, Tier::Base } },
 	{ Instruction::JUMPDEST,	{ "JUMPDEST",		0, 0, 0, true, Tier::Special } },
+	{ Instruction::PUSH0,		{ "PUSH0",			0, 0, 1, false, Tier::Base } },
 	{ Instruction::PUSH1,		{ "PUSH1",			1, 0, 1, false, Tier::VeryLow } },
 	{ Instruction::PUSH2,		{ "PUSH2",			2, 0, 1, false, Tier::VeryLow } },
 	{ Instruction::PUSH3,		{ "PUSH3",			3, 0, 1, false, Tier::VeryLow } },
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index 48ee37b5c7..2fddb11d80 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -103,6 +103,7 @@ enum class Instruction: uint8_t
 	GAS,				///< get the amount of available gas
 	JUMPDEST,			///< set a potential jump destination
 
+	PUSH0 = 0x5f,       ///< place the value 0 on stack
 	PUSH1 = 0x60,		///< place 1 byte item on stack
 	PUSH2,				///< place 2 byte item on stack
 	PUSH3,				///< place 3 byte item on stack
@@ -207,7 +208,7 @@ constexpr bool isCallInstruction(Instruction _inst) noexcept
 /// @returns true if the instruction is a PUSH
 inline bool isPushInstruction(Instruction _inst)
 {
-	return Instruction::PUSH1 <= _inst && _inst <= Instruction::PUSH32;
+	return Instruction::PUSH0 <= _inst && _inst <= Instruction::PUSH32;
 }
 
 /// @returns true if the instruction is a DUP
@@ -231,7 +232,7 @@ inline bool isLogInstruction(Instruction _inst)
 /// @returns the number of PUSH Instruction _inst
 inline unsigned getPushNumber(Instruction _inst)
 {
-	return static_cast<uint8_t>(_inst) - unsigned(Instruction::PUSH1) + 1;
+	return static_cast<uint8_t>(_inst) - unsigned(Instruction::PUSH0);
 }
 
 /// @returns the number of DUP Instruction _inst
@@ -255,8 +256,8 @@ inline unsigned getLogNumber(Instruction _inst)
 /// @returns the PUSH<_number> instruction
 inline Instruction pushInstruction(unsigned _number)
 {
-	assertThrow(1 <= _number && _number <= 32, InvalidOpcode, std::string("Invalid PUSH instruction requested (") + std::to_string(_number) + ").");
-	return Instruction(unsigned(Instruction::PUSH1) + _number - 1);
+	assertThrow(_number <= 32, InvalidOpcode, std::string("Invalid PUSH instruction requested (") + std::to_string(_number) + ").");
+	return Instruction(unsigned(Instruction::PUSH0) + _number);
 }
 
 /// @returns the DUP<_number> instruction

From 0bfcdaf794d1192e180378a6e15f24e7b3c9e411 Mon Sep 17 00:00:00 2001
From: hrkrshnn <git@hrkrshnn.com>
Date: Sun, 9 Apr 2023 16:00:26 +0200
Subject: [PATCH 1272/1748] feat: change generation of bytecode for pushes with
 zero-value

---
 libevmasm/Assembly.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index 3475bdafe8..e861034168 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -560,11 +560,18 @@ LinkerObject const& Assembly::assemble() const
 			break;
 		case Push:
 		{
-			unsigned b = max<unsigned>(1, numberEncodingSize(i.data()));
+			unsigned b = numberEncodingSize(i.data());
+			if (b == 0 && !m_evmVersion.hasPush0())
+			{
+				b = 1;
+			}
 			ret.bytecode.push_back(static_cast<uint8_t>(pushInstruction(b)));
-			ret.bytecode.resize(ret.bytecode.size() + b);
-			bytesRef byr(&ret.bytecode.back() + 1 - b, b);
-			toBigEndian(i.data(), byr);
+			if (b > 0)
+			{
+				ret.bytecode.resize(ret.bytecode.size() + b);
+				bytesRef byr(&ret.bytecode.back() + 1 - b, b);
+				toBigEndian(i.data(), byr);
+			}
 			break;
 		}
 		case PushTag:

From 802f895062501ce3955db8b147103511b5627c6f Mon Sep 17 00:00:00 2001
From: hrkrshnn <git@hrkrshnn.com>
Date: Sun, 9 Apr 2023 16:19:55 +0200
Subject: [PATCH 1273/1748] feat: introduce EVM Version Shanghai

Note: Paris is still the default
---
 liblangutil/EVMVersion.h   | 7 +++++--
 solc/CommandLineParser.cpp | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index 22f85c8af6..7932ecdadc 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -58,10 +58,11 @@ class EVMVersion:
 	static EVMVersion berlin() { return {Version::Berlin}; }
 	static EVMVersion london() { return {Version::London}; }
 	static EVMVersion paris() { return {Version::Paris}; }
+	static EVMVersion shanghai() { return {Version::Shanghai}; }
 
 	static std::optional<EVMVersion> fromString(std::string const& _version)
 	{
-		for (auto const& v: {homestead(), tangerineWhistle(), spuriousDragon(), byzantium(), constantinople(), petersburg(), istanbul(), berlin(), london(), paris()})
+		for (auto const& v: {homestead(), tangerineWhistle(), spuriousDragon(), byzantium(), constantinople(), petersburg(), istanbul(), berlin(), london(), paris(), shanghai()})
 			if (_version == v.name())
 				return v;
 		return std::nullopt;
@@ -84,6 +85,7 @@ class EVMVersion:
 		case Version::Berlin: return "berlin";
 		case Version::London: return "london";
 		case Version::Paris: return "paris";
+		case Version::Shanghai: return "shanghai";
 		}
 		return "INVALID";
 	}
@@ -98,6 +100,7 @@ class EVMVersion:
 	bool hasSelfBalance() const { return *this >= istanbul(); }
 	bool hasBaseFee() const { return *this >= london(); }
 	bool hasPrevRandao() const { return *this >= paris(); }
+	bool hasPush0() const { return *this >= shanghai(); }
 
 	bool hasOpcode(evmasm::Instruction _opcode) const;
 
@@ -106,7 +109,7 @@ class EVMVersion:
 	bool canOverchargeGasForCall() const { return *this >= tangerineWhistle(); }
 
 private:
-	enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London, Paris };
+	enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London, Paris, Shanghai };
 
 	EVMVersion(Version _version): m_version(_version) {}
 
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index f7c99fd381..6140df2e78 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -593,7 +593,7 @@ General Information)").c_str(),
 			g_strEVMVersion.c_str(),
 			po::value<string>()->value_name("version")->default_value(EVMVersion{}.name()),
 			"Select desired EVM version. Either homestead, tangerineWhistle, spuriousDragon, "
-			"byzantium, constantinople, petersburg, istanbul, berlin, london or paris."
+			"byzantium, constantinople, petersburg, istanbul, berlin, london, paris or shanghai."
 		)
 	;
 	if (!_forHelp) // Note: We intentionally keep this undocumented for now.

From 41ce3feb0ad518d4fe94735cff0ad44e0d0aafd2 Mon Sep 17 00:00:00 2001
From: hrkrshnn <git@hrkrshnn.com>
Date: Sun, 9 Apr 2023 16:40:09 +0200
Subject: [PATCH 1274/1748] test: some tests for `push0`

1. `push0_disallowed.yul`: checks if `push0()` is a valid builtin in strict Yul
2. `push0_disallowed.sol`: checks if `push0()` is a valid builtin in inline assembly
3. `push0.sol`: simple semantic test that returns 0
4. `evmone_support.sol`: tests if push0 works properly in evmone
5. Updated some bytecode too large tests to use `shanghai` as version
6. Updated various tests where `push1 0` was hardcoded in different forms / expectations on bytecode
size (`Assembler.cpp`, `GasCosts.cpp`, `SolidityCompiler.cpp`, `SolidityExpressionCompiler.cpp`)
---
 .circleci/soltest_all.sh                      |  2 +-
 scripts/tests.sh                              |  2 +-
 test/EVMHost.cpp                              |  2 +
 test/libevmasm/Assembler.cpp                  | 16 +++++---
 test/libsolidity/GasCosts.cpp                 | 16 ++++++--
 test/libsolidity/SolidityCompiler.cpp         |  4 +-
 .../SolidityExpressionCompiler.cpp            | 39 +++++++++++++------
 .../semanticTests/shanghai/evmone_support.sol | 31 +++++++++++++++
 .../semanticTests/shanghai/push0.sol          | 11 ++++++
 .../syntaxTests/bytecode_too_large.sol        |  4 +-
 .../bytecode_too_large_abiencoder_v1.sol      |  4 +-
 .../inlineAssembly/push0_disallowed.sol       | 19 +++++++++
 .../invalid/push0_disallowed.yul              |  6 +++
 .../EVMInstructionInterpreter.cpp             |  1 +
 14 files changed, 130 insertions(+), 27 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/shanghai/evmone_support.sol
 create mode 100644 test/libsolidity/semanticTests/shanghai/push0.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/push0_disallowed.sol
 create mode 100644 test/libyul/yulSyntaxTests/invalid/push0_disallowed.yul

diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index b3544a08c5..2e45f9892d 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -31,7 +31,7 @@ REPODIR="$(realpath "$(dirname "$0")"/..)"
 # shellcheck source=scripts/common.sh
 source "${REPODIR}/scripts/common.sh"
 
-EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris)
+EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris shanghai)
 DEFAULT_EVM=paris
 [[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
 OPTIMIZE_VALUES=(0 1)
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 2be31eec03..100bae912e 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -105,7 +105,7 @@ EVM_VERSIONS="homestead byzantium"
 
 if [ -z "$CI" ]
 then
-    EVM_VERSIONS+=" constantinople petersburg istanbul berlin london paris"
+    EVM_VERSIONS+=" constantinople petersburg istanbul berlin london paris shanghai"
 fi
 
 # And then run the Solidity unit-tests in the matrix combination of optimizer / no optimizer
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 222b4e4436..d6cc311a01 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -124,6 +124,8 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 		m_evmRevision = EVMC_LONDON;
 	else if (_evmVersion == langutil::EVMVersion::paris())
 		m_evmRevision = EVMC_PARIS;
+	else if (_evmVersion == langutil::EVMVersion::shanghai())
+		m_evmRevision = EVMC_SHANGHAI;
 	else
 		assertThrow(false, Exception, "Unsupported EVM version");
 
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index 12c3be67d6..febe4a59b7 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -330,12 +330,16 @@ BOOST_AUTO_TEST_CASE(immutable)
 
 	checkCompilation(_assembly);
 
+	string genericPush0 = evmVersion.hasPush0() ? "5f" : "6000";
+	// PUSH1 0x1b v/s PUSH1 0x19
+	string dataOffset = evmVersion.hasPush0() ? "6019" : "601b" ;
+
 	BOOST_CHECK_EQUAL(
 		_assembly.assemble().toHex(),
 		// root.asm
 		// assign "someImmutable"
-		"602a" // PUSH1 42 - value for someImmutable
-		"6000" // PUSH1 0 - offset of code into which to insert the immutable
+		"602a" + // PUSH1 42 - value for someImmutable
+		genericPush0 + // PUSH1 0 - offset of code into which to insert the immutable
 		"8181" // DUP2 DUP2
 		"6001" // PUSH1 1 - offset of first someImmutable in sub_0
 		"01" // ADD - add offset of immutable to offset of code
@@ -344,13 +348,13 @@ BOOST_AUTO_TEST_CASE(immutable)
 		"01" // ADD - add offset of immutable to offset of code
 		"52" // MSTORE
 		// assign "someOtherImmutable"
-		"6017" // PUSH1 23 - value for someOtherImmutable
-		"6000" // PUSH1 0 - offset of code into which to insert the immutable
+		"6017" + // PUSH1 23 - value for someOtherImmutable
+		genericPush0 + // PUSH1 0 - offset of code into which to insert the immutable
 		"6022" // PUSH1 34 - offset of someOtherImmutable in sub_0
 		"01" // ADD - add offset of immutable to offset of code
 		"52" // MSTORE
-		"6063" // PUSH1 0x63 - dataSize(sub_0)
-		"601b" // PUSH1 0x23 - dataOffset(sub_0)
+		"6063" + // PUSH1 0x63 - dataSize(sub_0)
+		dataOffset +  // PUSH1 0x23 - dataOffset(sub_0)
 		"fe" // INVALID
 		// end of root.asm
 		// sub.asm
diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp
index 1d67281ccc..e819395a4b 100644
--- a/test/libsolidity/GasCosts.cpp
+++ b/test/libsolidity/GasCosts.cpp
@@ -112,15 +112,21 @@ BOOST_AUTO_TEST_CASE(string_storage)
 			// Costs with 0 are cases which cannot be triggered in tests.
 			if (evmVersion < EVMVersion::istanbul())
 				CHECK_DEPLOY_GAS(0, 109241, evmVersion);
-			else
+			else if (evmVersion < EVMVersion::shanghai())
 				CHECK_DEPLOY_GAS(0, 97697, evmVersion);
+			// Shanghai is cheaper due to `push0`
+			else
+				CHECK_DEPLOY_GAS(0, 97071, evmVersion);
 		}
 		else
 		{
 			if (evmVersion < EVMVersion::istanbul())
 				CHECK_DEPLOY_GAS(139013, 123969, evmVersion);
-			else
+			else if (evmVersion < EVMVersion::shanghai())
 				CHECK_DEPLOY_GAS(123361, 110969, evmVersion);
+			// Shanghai is cheaper due to `push0`
+			else
+				CHECK_DEPLOY_GAS(121493, 110969, evmVersion);
 		}
 	}
 	else if (evmVersion < EVMVersion::istanbul())
@@ -198,7 +204,11 @@ BOOST_AUTO_TEST_CASE(single_callvaluecheck)
 	size_t bytecodeSizeNonpayable = m_compiler.object("Nonpayable").bytecode.size();
 	size_t bytecodeSizePayable = m_compiler.object("Payable").bytecode.size();
 
-	BOOST_CHECK_EQUAL(bytecodeSizePayable - bytecodeSizeNonpayable, 26);
+	auto evmVersion = solidity::test::CommonOptions::get().evmVersion();
+	if (evmVersion < EVMVersion::shanghai())
+		BOOST_CHECK_EQUAL(bytecodeSizePayable - bytecodeSizeNonpayable, 26);
+	else
+		BOOST_CHECK_EQUAL(bytecodeSizePayable - bytecodeSizeNonpayable, 24);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/libsolidity/SolidityCompiler.cpp b/test/libsolidity/SolidityCompiler.cpp
index 045ac167a9..cd99cbf53f 100644
--- a/test/libsolidity/SolidityCompiler.cpp
+++ b/test/libsolidity/SolidityCompiler.cpp
@@ -47,7 +47,9 @@ BOOST_AUTO_TEST_CASE(does_not_include_creation_time_only_internal_functions)
 	bytes const& runtimeBytecode = solidity::test::bytecodeSansMetadata(compiler().runtimeObject("C").bytecode);
 	BOOST_CHECK(creationBytecode.size() >= 90);
 	BOOST_CHECK(creationBytecode.size() <= 120);
-	BOOST_CHECK(runtimeBytecode.size() >= 10);
+	auto evmVersion = solidity::test::CommonOptions::get().evmVersion();
+	unsigned threshold = evmVersion.hasPush0() ? 9 : 10;
+	BOOST_CHECK(runtimeBytecode.size() >= threshold);
 	BOOST_CHECK(runtimeBytecode.size() <= 30);
 }
 
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
index 2741290fc3..1d9e03c9b9 100644
--- a/test/libsolidity/SolidityExpressionCompiler.cpp
+++ b/test/libsolidity/SolidityExpressionCompiler.cpp
@@ -210,7 +210,10 @@ BOOST_AUTO_TEST_CASE(literal_false)
 	)";
 	bytes code = compileFirstExpression(sourceCode);
 
-	bytes expectation({uint8_t(Instruction::PUSH1), 0x0});
+	bytes expectation = solidity::test::CommonOptions::get().evmVersion().hasPush0() ?
+		bytes{uint8_t(Instruction::PUSH0)} :
+		bytes{uint8_t(Instruction::PUSH1), 0x0};
+
 	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
 }
 
@@ -344,21 +347,27 @@ BOOST_AUTO_TEST_CASE(arithmetic)
 		}
 	)";
 	bytes code = compileFirstExpression(sourceCode, {}, {{"test", "f", "y"}});
-
+	bool hasPush0 = solidity::test::CommonOptions::get().evmVersion().hasPush0();
+	bytes push0Bytes = hasPush0 ?
+		bytes{uint8_t(Instruction::PUSH0)} :
+		bytes{uint8_t(Instruction::PUSH1), 0x0};
+	uint8_t size = hasPush0 ? 0x65: 0x67;
 	bytes panic =
 		bytes{
 			uint8_t(Instruction::JUMPDEST),
 			uint8_t(Instruction::PUSH32)
 		} +
 		util::fromHex("4E487B7100000000000000000000000000000000000000000000000000000000") +
+		  push0Bytes +
 		bytes{
-			uint8_t(Instruction::PUSH1), 0x0,
 			uint8_t(Instruction::MSTORE),
 			uint8_t(Instruction::PUSH1), 0x12,
 			uint8_t(Instruction::PUSH1), 0x4,
 			uint8_t(Instruction::MSTORE),
-			uint8_t(Instruction::PUSH1), 0x24,
-			uint8_t(Instruction::PUSH1), 0x0,
+			uint8_t(Instruction::PUSH1), 0x24
+		} +
+		push0Bytes +
+		bytes{
 			uint8_t(Instruction::REVERT),
 			uint8_t(Instruction::JUMPDEST),
 			uint8_t(Instruction::JUMP),
@@ -405,7 +414,7 @@ BOOST_AUTO_TEST_CASE(arithmetic)
 			uint8_t(Instruction::DIV),
 			uint8_t(Instruction::PUSH1), 0x1,
 			uint8_t(Instruction::MUL),
-			uint8_t(Instruction::PUSH1), 0x67,
+			uint8_t(Instruction::PUSH1), size,
 			uint8_t(Instruction::JUMP)
 		} + panic;
 	else
@@ -447,7 +456,7 @@ BOOST_AUTO_TEST_CASE(arithmetic)
 			uint8_t(Instruction::JUMPDEST),
 			uint8_t(Instruction::DIV),
 			uint8_t(Instruction::MUL),
-			uint8_t(Instruction::PUSH1), 0x67,
+			uint8_t(Instruction::PUSH1), size,
 			uint8_t(Instruction::JUMP)
 		} + panic;
 
@@ -463,11 +472,17 @@ BOOST_AUTO_TEST_CASE(unary_operators)
 	)";
 	bytes code = compileFirstExpression(sourceCode, {}, {{"test", "f", "y"}});
 
+	bytes push0Bytes = solidity::test::CommonOptions::get().evmVersion().hasPush0() ?
+		bytes{uint8_t(Instruction::PUSH0)} :
+		bytes{uint8_t(Instruction::PUSH1), 0x0};
+
 	bytes expectation;
 	if (solidity::test::CommonOptions::get().optimize)
-		expectation = {
+		expectation = bytes{
 			uint8_t(Instruction::DUP1),
-			uint8_t(Instruction::PUSH1), 0x0,
+		} +
+		push0Bytes +
+		bytes{
 			uint8_t(Instruction::SUB),
 			uint8_t(Instruction::NOT),
 			uint8_t(Instruction::PUSH1), 0x2,
@@ -475,10 +490,12 @@ BOOST_AUTO_TEST_CASE(unary_operators)
 			uint8_t(Instruction::ISZERO)
 		};
 	else
-		expectation = {
+		expectation = bytes{
 			uint8_t(Instruction::PUSH1), 0x2,
 			uint8_t(Instruction::DUP2),
-			uint8_t(Instruction::PUSH1), 0x0,
+		} +
+		push0Bytes +
+		bytes{
 			uint8_t(Instruction::SUB),
 			uint8_t(Instruction::NOT),
 			uint8_t(Instruction::EQ),
diff --git a/test/libsolidity/semanticTests/shanghai/evmone_support.sol b/test/libsolidity/semanticTests/shanghai/evmone_support.sol
new file mode 100644
index 0000000000..359dc516ff
--- /dev/null
+++ b/test/libsolidity/semanticTests/shanghai/evmone_support.sol
@@ -0,0 +1,31 @@
+contract ShortReturn {
+    constructor() {
+        assembly {
+            // return(0, 32)
+            // PUSH1 0x20 PUSH0 RETURN
+            mstore(0, hex"60205ff3")
+            return(0, 4)
+        }
+    }
+}
+
+interface DoesItReturnZero {
+    function foo() external pure returns (uint256);
+}
+
+contract Test {
+    ShortReturn immutable shortReturn = new ShortReturn();
+    function bytecode() external view returns(bytes memory) {
+        return address(shortReturn).code;
+    }
+    function isPush0Supported() external view returns (bool) {
+        assert(DoesItReturnZero(address(shortReturn)).foo() == 0);
+        return true;
+    }
+}
+// ====
+// compileViaYul: also
+// EVMVersion: >=shanghai
+// ----
+// bytecode() -> 0x20, 4, 0x60205ff300000000000000000000000000000000000000000000000000000000
+// isPush0Supported() -> true
diff --git a/test/libsolidity/semanticTests/shanghai/push0.sol b/test/libsolidity/semanticTests/shanghai/push0.sol
new file mode 100644
index 0000000000..e1acaaae6a
--- /dev/null
+++ b/test/libsolidity/semanticTests/shanghai/push0.sol
@@ -0,0 +1,11 @@
+contract C {
+    function zero() external returns (uint) {
+        return 0;
+    }
+
+}
+// ====
+// compileViaYul: also
+// EVMVersion: >=shanghai
+// ----
+// zero() -> 0
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large.sol b/test/libsolidity/syntaxTests/bytecode_too_large.sol
index 1b4d02ecb9..36aa0c0760 100644
--- a/test/libsolidity/syntaxTests/bytecode_too_large.sol
+++ b/test/libsolidity/syntaxTests/bytecode_too_large.sol
@@ -7,6 +7,6 @@ contract test {
     }
 }
 // ====
-// EVMVersion: >byzantium
+// EVMVersion: >=shanghai
 // ----
-// Warning 5574: (21-27154): Contract code size is 27192 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (21-27154): Contract code size is 27186 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol b/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol
index df74ef7651..a0c7267d0d 100644
--- a/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol
+++ b/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol
@@ -7,6 +7,6 @@ contract test {
     }
 }
 // ====
-// EVMVersion: >byzantium
+// EVMVersion: >=shanghai
 // ----
-// Warning 5574: (21-27154): Contract code size is 27209 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (21-27154): Contract code size is 27205 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/push0_disallowed.sol b/test/libsolidity/syntaxTests/inlineAssembly/push0_disallowed.sol
new file mode 100644
index 0000000000..b1471ac55b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/push0_disallowed.sol
@@ -0,0 +1,19 @@
+// Ok
+contract push0 {}
+
+contract A {
+    // Ok, warning about shadowing
+    function push0() external {}
+}
+
+contract C {
+    function f() external {
+        assembly {
+            // Not okay
+            push0()
+        }
+    }
+}
+// ----
+// Warning 2519: (77-105): This declaration shadows an existing declaration.
+// DeclarationError 4619: (205-210): Function "push0" not found.
diff --git a/test/libyul/yulSyntaxTests/invalid/push0_disallowed.yul b/test/libyul/yulSyntaxTests/invalid/push0_disallowed.yul
new file mode 100644
index 0000000000..00fe3c1223
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/invalid/push0_disallowed.yul
@@ -0,0 +1,6 @@
+// Based on ./push_disallowed.yul (which already includes push0).
+{
+    push0()
+}
+// ----
+// DeclarationError 4619: (72-77): Function "push0" not found.
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index b049ee6c4f..132066f4ad 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -381,6 +381,7 @@ u256 EVMInstructionInterpreter::eval(
 	case Instruction::JUMP:
 	case Instruction::JUMPI:
 	case Instruction::JUMPDEST:
+	case Instruction::PUSH0:
 	case Instruction::PUSH1:
 	case Instruction::PUSH2:
 	case Instruction::PUSH3:

From b30f89bcceb431e42f67d297be1641d299f9c7bb Mon Sep 17 00:00:00 2001
From: hrkrshnn <git@hrkrshnn.com>
Date: Sun, 9 Apr 2023 18:15:31 +0200
Subject: [PATCH 1275/1748] docs: On supporting `shanghai` EVM version and
 changelog

---
 Changelog.md                | 2 ++
 docs/using-the-compiler.rst | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 1e77df1a26..e43d0a8350 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,8 @@ Language Features:
 
 
 Compiler Features:
+ * Assembler: Use ``push0`` for placing ``0`` in the stack for EVM versions starting from "Shanghai". This decreases the deployment costs.
+ * EVM: Support for the EVM Version "Shanghai".
  * NatSpec: Add support for NatSpec documentation in ``enum`` definitions.
  * Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index d004bdeaae..2ff0883ed0 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -174,6 +174,8 @@ at each version. Backward compatibility is not guaranteed between each version.
    - The block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_) can be accessed via the global ``block.basefee`` or ``basefee()`` in inline assembly.
 - ``paris`` (**default**)
    - Introduces ``prevrandao()`` and ``block.prevrandao``, and changes the semantics of the now deprecated ``block.difficulty``, disallowing ``difficulty()`` in inline assembly (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
+- ``shanghai``
+  - Cheaper deployment cost due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:

From c1fffa892d528d232fb5f7323217991700e20a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 24 Feb 2023 19:49:42 +0100
Subject: [PATCH 1276/1748] Parser: Extract literal parsing into a separate
 function

---
 libsolidity/parsing/Parser.cpp                | 82 +++++++++++--------
 libsolidity/parsing/Parser.h                  |  1 +
 .../denominations/finney_invalid.sol          |  8 +-
 .../denominations/szabo_invalid.sol           |  8 +-
 4 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index f1850fe1ce..257b8bea94 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -36,10 +36,12 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/predicate.hpp>
+
 #include <cctype>
-#include <vector>
+#include <memory>
 #include <regex>
 #include <tuple>
+#include <vector>
 
 using namespace std;
 using namespace solidity::langutil;
@@ -1989,61 +1991,73 @@ ASTPointer<Expression> Parser::parseLeftHandSideExpression(
 	}
 }
 
-ASTPointer<Expression> Parser::parsePrimaryExpression()
+ASTPointer<Expression> Parser::parseLiteral()
 {
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
-	Token token = m_scanner->currentToken();
-	ASTPointer<Expression> expression;
+	Token initialToken = m_scanner->currentToken();
+	ASTPointer<ASTString> value = make_shared<string>(m_scanner->currentLiteral());
 
-	switch (token)
+	switch (initialToken)
 	{
 	case Token::TrueLiteral:
 	case Token::FalseLiteral:
-		nodeFactory.markEndPosition();
-		expression = nodeFactory.createNode<Literal>(token, getLiteralAndAdvance());
-		break;
 	case Token::Number:
-		if (TokenTraits::isEtherSubdenomination(m_scanner->peekNextToken()))
-		{
-			ASTPointer<ASTString> literal = getLiteralAndAdvance();
-			nodeFactory.markEndPosition();
-			Literal::SubDenomination subdenomination = static_cast<Literal::SubDenomination>(m_scanner->currentToken());
-			advance();
-			expression = nodeFactory.createNode<Literal>(token, literal, subdenomination);
-		}
-		else if (TokenTraits::isTimeSubdenomination(m_scanner->peekNextToken()))
-		{
-			ASTPointer<ASTString> literal = getLiteralAndAdvance();
-			nodeFactory.markEndPosition();
-			Literal::SubDenomination subdenomination = static_cast<Literal::SubDenomination>(m_scanner->currentToken());
-			advance();
-			expression = nodeFactory.createNode<Literal>(token, literal, subdenomination);
-		}
-		else
-		{
-			nodeFactory.markEndPosition();
-			expression = nodeFactory.createNode<Literal>(token, getLiteralAndAdvance());
-		}
+	{
+		nodeFactory.markEndPosition();
+		advance();
 		break;
+	}
 	case Token::StringLiteral:
 	case Token::UnicodeStringLiteral:
 	case Token::HexStringLiteral:
 	{
-		string literal = m_scanner->currentLiteral();
-		Token firstToken = m_scanner->currentToken();
-		while (m_scanner->peekNextToken() == firstToken)
+		while (m_scanner->peekNextToken() == initialToken)
 		{
 			advance();
-			literal += m_scanner->currentLiteral();
+			*value += m_scanner->currentLiteral();
 		}
 		nodeFactory.markEndPosition();
 		advance();
 		if (m_scanner->currentToken() == Token::Illegal)
 			fatalParserError(5428_error, to_string(m_scanner->currentError()));
-		expression = nodeFactory.createNode<Literal>(token, make_shared<ASTString>(literal));
 		break;
 	}
+	default:
+		solAssert(false);
+	}
+
+	if (initialToken == Token::Number && (
+		TokenTraits::isEtherSubdenomination(m_scanner->currentToken()) ||
+		TokenTraits::isTimeSubdenomination(m_scanner->currentToken())
+	))
+	{
+		nodeFactory.markEndPosition();
+		Literal::SubDenomination subDenomination = static_cast<Literal::SubDenomination>(m_scanner->currentToken());
+		advance();
+		return nodeFactory.createNode<Literal>(initialToken, std::move(value), subDenomination);
+	}
+
+	return nodeFactory.createNode<Literal>(initialToken, std::move(value), Literal::SubDenomination::None);
+}
+
+ASTPointer<Expression> Parser::parsePrimaryExpression()
+{
+	RecursionGuard recursionGuard(*this);
+	ASTNodeFactory nodeFactory(*this);
+	Token token = m_scanner->currentToken();
+	ASTPointer<Expression> expression;
+
+	switch (token)
+	{
+	case Token::TrueLiteral:
+	case Token::FalseLiteral:
+	case Token::Number:
+	case Token::StringLiteral:
+	case Token::UnicodeStringLiteral:
+	case Token::HexStringLiteral:
+		expression = parseLiteral();
+		break;
 	case Token::Identifier:
 		nodeFactory.markEndPosition();
 		expression = nodeFactory.createNode<Identifier>(getLiteralAndAdvance());
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index 7a9b41318b..c7d6146be3 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -159,6 +159,7 @@ class Parser: public langutil::ParserBase
 	ASTPointer<Expression> parseLeftHandSideExpression(
 		ASTPointer<Expression> const& _partiallyParsedExpression = ASTPointer<Expression>()
 	);
+	ASTPointer<Expression> parseLiteral();
 	ASTPointer<Expression> parsePrimaryExpression();
 	std::vector<ASTPointer<Expression>> parseFunctionCallListArguments();
 
diff --git a/test/libsolidity/syntaxTests/denominations/finney_invalid.sol b/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
index b7bae7fa70..0974cde13e 100644
--- a/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
+++ b/test/libsolidity/syntaxTests/denominations/finney_invalid.sol
@@ -1,7 +1,7 @@
 contract C {
-  function f() {
-    uint x = 1 finney;
-  }
+    function f() public {
+        uint x = 1 finney;
+    }
 }
 // ----
-// ParserError 2314: (45-51): Expected ';' but got identifier
+// ParserError 2314: (58-64): Expected ';' but got identifier
diff --git a/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol b/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
index d206830d5e..d0e3eb3ff7 100644
--- a/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
+++ b/test/libsolidity/syntaxTests/denominations/szabo_invalid.sol
@@ -1,7 +1,7 @@
 contract C {
-  function f() {
-    uint x = 1 szabo;
-  }
+    function f() public {
+        uint x = 1 szabo;
+    }
 }
 // ----
-// ParserError 2314: (45-50): Expected ';' but got identifier
+// ParserError 2314: (58-63): Expected ';' but got identifier

From d08de34bd38607e22add7ba5b641679f19e5aada Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 12 Apr 2023 11:31:21 -0500
Subject: [PATCH 1277/1748] [.clang-format ] Update prohibited property
 'AlignEscapedNewlinesLeft'.

- 'AlignEscapedNewlines' set to 'Left' is now the correct property.
---
 .clang-format | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.clang-format b/.clang-format
index edd5de4d26..95b0feba1e 100644
--- a/.clang-format
+++ b/.clang-format
@@ -12,7 +12,7 @@ Language: Cpp
 BasedOnStyle: LLVM
 AccessModifierOffset: -4
 AlignAfterOpenBracket: AlwaysBreak
-AlignEscapedNewlinesLeft: true
+AlignEscapedNewlines: Left
 AlwaysBreakAfterReturnType: None
 AlwaysBreakTemplateDeclarations: Yes
 BinPackArguments: false

From f0c0df2d8ce57896002950b0c043fdd29a22d67e Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Wed, 12 Apr 2023 18:01:08 +0100
Subject: [PATCH 1278/1748] Team meetings change (#14113)

Team decision to have only public Wednesday meetings.
---
 docs/contributing.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index a5bbf6f693..e120225e33 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -28,11 +28,11 @@ Team Calls
 ==========
 
 If you have issues or pull requests to discuss, or are interested in hearing what
-the team and contributors are working on, you can join our public team calls:
+the team and contributors are working on, you can join our public team call:
 
-- Mondays and Wednesdays at 3PM CET/CEST.
+- Wednesdays at 3PM CET/CEST.
 
-Both calls take place on `Jitsi <https://meet.soliditylang.org/>`_.
+The call takes place on `Jitsi <https://meet.soliditylang.org/>`_.
 
 How to Report Issues
 ====================

From 5d42bb5e3826e3b736823664199a33056c77c1ff Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Thu, 13 Apr 2023 18:51:04 +0100
Subject: [PATCH 1279/1748] Removed Issues duplications from GitHub (#14120)

---
 .github/ISSUE_TEMPLATE/config.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index c34dedb740..0730fa23ab 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,14 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Bug Report
-    url: https://github.com/ethereum/solidity/issues/new?template=bug_report.md&projects=ethereum/solidity/43
-    about: Bug reports for the Solidity Compiler.
-  - name: Documentation Issue
-    url: https://github.com/ethereum/solidity/issues/new?template=documentation_issue.md&projects=ethereum/solidity/43
-    about: Solidity documentation.
-  - name: Feature Request
-    url: https://github.com/ethereum/solidity/issues/new?template=feature_request.md&projects=ethereum/solidity/43
-    about: Solidity language or infrastructure feature requests.
   - name: Report a security vulnerability
     url: https://github.com/ethereum/solidity/security/policy
     about: Please review our security policy for more details.

From e1a9446f8767c74696a137d955c7a6afea2537a1 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Fri, 14 Apr 2023 20:24:50 +0900
Subject: [PATCH 1280/1748] fix(docs): fix missing backticks, remove
 latexpdfja, fix the missing help message of latexpdf, and remove unnecessary
 whitespace (#14101)

* Fix missing backticks

* Remove whitespace in the header of the optimizer step

* Remove whitespace in directives

* Remove `make latexpdfja`

* Add the help message of latexpdf in make.bat

* Fix missing backticks

* Update docs/internals/optimizer.rst

---------

Co-authored-by: Nuno Santos <nunofilipesantos@gmail.com>
---
 docs/080-breaking-changes.rst        |  2 +-
 docs/Makefile                        |  7 -------
 docs/contracts/inheritance.rst       |  4 ++--
 docs/contributing.rst                |  4 ++--
 docs/control-structures.rst          |  2 +-
 docs/installing-solidity.rst         |  2 +-
 docs/internals/layout_in_storage.rst |  2 +-
 docs/internals/optimizer.rst         |  6 +++---
 docs/internals/source_mappings.rst   |  2 +-
 docs/ir-breaking-changes.rst         |  2 +-
 docs/make.bat                        | 11 +----------
 docs/yul.rst                         |  2 +-
 12 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/docs/080-breaking-changes.rst b/docs/080-breaking-changes.rst
index b322d2a489..bb558359e6 100644
--- a/docs/080-breaking-changes.rst
+++ b/docs/080-breaking-changes.rst
@@ -173,4 +173,4 @@ How to update your code
 - Change ``msg.sender.transfer(x)`` to ``payable(msg.sender).transfer(x)`` or use a stored variable of ``address payable`` type.
 - Change ``x**y**z`` to ``(x**y)**z``.
 - Use inline assembly as a replacement for ``log0``, ..., ``log4``.
-- Negate unsigned integers by subtracting them from the maximum value of the type and adding 1 (e.g. ``type(uint256).max - x + 1``, while ensuring that `x` is not zero)
+- Negate unsigned integers by subtracting them from the maximum value of the type and adding 1 (e.g. ``type(uint256).max - x + 1``, while ensuring that ``x`` is not zero)
diff --git a/docs/Makefile b/docs/Makefile
index 3cc98f6990..01660bd388 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -34,7 +34,6 @@ help:
 	@echo "  epub       to make an epub"
 	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
 	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
 	@echo "  text       to make text files"
 	@echo "  man        to make manual pages"
 	@echo "  texinfo    to make Texinfo files"
@@ -116,12 +115,6 @@ latexpdf:
 	$(MAKE) -C $(BUILDDIR)/latex all-pdf
 	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
 
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
 text:
 	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
 	@echo
diff --git a/docs/contracts/inheritance.rst b/docs/contracts/inheritance.rst
index 4f310bd406..11a2079293 100644
--- a/docs/contracts/inheritance.rst
+++ b/docs/contracts/inheritance.rst
@@ -436,11 +436,11 @@ You can use internal parameters in a constructor (for example storage pointers).
 the contract has to be marked :ref:`abstract <abstract-contract>`, because these parameters
 cannot be assigned valid values from outside but only through the constructors of derived contracts.
 
-.. warning ::
+.. warning::
     Prior to version 0.4.22, constructors were defined as functions with the same name as the contract.
     This syntax was deprecated and is not allowed anymore in version 0.5.0.
 
-.. warning ::
+.. warning::
     Prior to version 0.7.0, you had to specify the visibility of constructors as either
     ``internal`` or ``public``.
 
diff --git a/docs/contributing.rst b/docs/contributing.rst
index e120225e33..f19dc99fd4 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -146,7 +146,7 @@ SMT tests by exporting ``SMT_FLAGS=--no-smt`` before running ``./scripts/tests.s
 running ``./scripts/soltest.sh --no-smt``.
 These tests are ``libsolidity/smtCheckerTests`` and ``libsolidity/smtCheckerTestsJSON``.
 
-.. note ::
+.. note::
 
     To get a list of all unit tests run by Soltest, run ``./build/test/soltest --list_content=HRF``.
 
@@ -167,7 +167,7 @@ See especially:
 - `run_test (-t) <https://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/run_test.html>`_ to run specific tests cases, and
 - `report-level (-r) <https://www.boost.org/doc/libs/release/libs/test/doc/html/boost_test/utf_reference/rt_param_reference/report_level.html>`_ give a more detailed report.
 
-.. note ::
+.. note::
 
     Those working in a Windows environment wanting to run the above basic sets
     without libz3. Using Git Bash, you use: ``./build/test/Release/soltest.exe -- --no-smt``.
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 18a522217f..510948b55a 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -651,7 +651,7 @@ in the following situations:
 
 For the following cases, the error data from the external call
 (if provided) is forwarded. This means that it can either cause
-an `Error` or a `Panic` (or whatever else was given):
+an ``Error`` or a ``Panic`` (or whatever else was given):
 
 #. If a ``.transfer()`` fails.
 #. If you call a function via a message call but it does not finish
diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index c1caaec058..4aae53de43 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -527,7 +527,7 @@ If you are interested what CMake options are available run ``cmake .. -LH``.
 SMT Solvers
 -----------
 Solidity can be built against SMT solvers and will do so by default if
-they are found in the system. Each solver can be disabled by a `cmake` option.
+they are found in the system. Each solver can be disabled by a ``cmake`` option.
 
 *Note: In some cases, this can also be a potential workaround for build failures.*
 
diff --git a/docs/internals/layout_in_storage.rst b/docs/internals/layout_in_storage.rst
index a492dea14c..7afcfc2ac5 100644
--- a/docs/internals/layout_in_storage.rst
+++ b/docs/internals/layout_in_storage.rst
@@ -208,7 +208,7 @@ of types), arrays have its ``base`` type, and structs list their ``members`` in
 the same format as the top-level ``storage`` (see :ref:`above
 <storage-layout-top-level>`).
 
-.. note ::
+.. note::
   The JSON output format of a contract's storage layout is still considered experimental
   and is subject to change in non-breaking releases of Solidity.
 
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 99589db992..9ede5ef2ac 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -826,10 +826,10 @@ if the common subexpression eliminator was run right before it.
 
 .. _expression-simplifier:
 
-Expression Simplifier
-^^^^^^^^^^^^^^^^^^^^^
+ExpressionSimplifier
+^^^^^^^^^^^^^^^^^^^^
 
-The Expression Simplifier uses the Dataflow Analyzer and makes use
+The ExpressionSimplifier uses the Dataflow Analyzer and makes use
 of a list of equivalence transforms on expressions like ``X + 0 -> X``
 to simplify the code.
 
diff --git a/docs/internals/source_mappings.rst b/docs/internals/source_mappings.rst
index 11027b8aca..68c29d955e 100644
--- a/docs/internals/source_mappings.rst
+++ b/docs/internals/source_mappings.rst
@@ -26,7 +26,7 @@ that are not part of the original input but are referenced from the source
 mappings. These source files together with their identifiers can be
 obtained via ``output['contracts'][sourceName][contractName]['evm']['bytecode']['generatedSources']``.
 
-.. note ::
+.. note::
     In the case of instructions that are not associated with any particular source file,
     the source mapping assigns an integer identifier of ``-1``. This may happen for
     bytecode sections stemming from compiler-generated inline assembly statements.
diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index f8a6cceb3b..9cee467932 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -247,7 +247,7 @@ hiding new and different behavior in existing code.
           }
       }
 
-  The function `f()` behaves as follows:
+  The function ``f()`` behaves as follows:
 
   - Old code generator: runs out of gas while zeroing the array contents after the large memory allocation
   - New code generator: reverts due to free memory pointer overflow (does not run out of gas)
diff --git a/docs/make.bat b/docs/make.bat
index bc06e706e0..d11deb3ffc 100644
--- a/docs/make.bat
+++ b/docs/make.bat
@@ -28,6 +28,7 @@ if "%1" == "help" (
 	echo.  devhelp    to make HTML files and a Devhelp project
 	echo.  epub       to make an epub
 	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
+	echo.  latexpdf   to make LaTeX files and run them through pdflatex
 	echo.  text       to make text files
 	echo.  man        to make manual pages
 	echo.  texinfo    to make Texinfo files
@@ -155,16 +156,6 @@ if "%1" == "latexpdf" (
 	goto end
 )
 
-if "%1" == "latexpdfja" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	cd %BUILDDIR%/latex
-	make all-pdf-ja
-	cd %BUILDDIR%/..
-	echo.
-	echo.Build finished; the PDF files are in %BUILDDIR%/latex.
-	goto end
-)
-
 if "%1" == "text" (
 	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
 	if errorlevel 1 exit /b 1
diff --git a/docs/yul.rst b/docs/yul.rst
index 065dcefb7f..502ee6f522 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -947,7 +947,7 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
   The remaining bytes will retain their values as of before the call.
 
 .. note::
-  The `difficulty()` instruction is disallowed in EVM version >= Paris.
+  The ``difficulty()`` instruction is disallowed in EVM version >= Paris.
   With the Paris network upgrade the semantics of the instruction that was previously called
   ``difficulty`` have been changed and the instruction was renamed to ``prevrandao``.
   It can now return arbitrary values in the full 256-bit range, whereas the highest recorded

From 8f63bb646c412535eb547a5fdb244ebafb9a27e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 13 Apr 2023 17:01:36 +0200
Subject: [PATCH 1281/1748] docs: Hexadecimal string literals behave like
 string literals only in some aspects

---
 docs/types/value-types.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index a370cf70ee..652f1686b7 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -588,7 +588,8 @@ of the hexadecimal sequence.
 Multiple hexadecimal literals separated by whitespace are concatenated into a single literal:
 ``hex"00112233" hex"44556677"`` is equivalent to ``hex"0011223344556677"``
 
-Hexadecimal literals behave like :ref:`string literals <string_literals>` and have the same convertibility restrictions.
+Hexadecimal literals in some ways behave like :ref:`string literals <string_literals>` but are not
+implicitly convertible to the ``string`` type.
 
 .. index:: enum
 

From bc18af91bbfdcf729400faae406c9ec3707b9f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 14 Apr 2023 16:21:43 +0200
Subject: [PATCH 1282/1748] docs: Fix index entry for receive

---
 docs/contracts/functions.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index 902ad1ce5a..4794ccdd90 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -277,7 +277,7 @@ This behaviour is also in line with the ``STATICCALL`` opcode.
 Special Functions
 =================
 
-.. index:: ! receive ether function, function;receive ! receive
+.. index:: ! receive ether function, function;receive, ! receive
 
 .. _receive-ether-function:
 

From cab88290c2e36b0f83cb2c5edd401b9ce2da76d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 13 Apr 2023 17:12:35 +0200
Subject: [PATCH 1283/1748] docs: Consistent index entries for literals,
 denominations, free functions

---
 docs/contracts/functions.rst        |  2 +-
 docs/contracts/using-for.rst        |  2 +-
 docs/control-structures.rst         |  1 -
 docs/types/conversion.rst           |  5 +++++
 docs/types/reference-types.rst      |  2 +-
 docs/types/value-types.rst          | 10 ++++++----
 docs/units-and-global-variables.rst |  8 +++++---
 docs/yul.rst                        |  2 ++
 8 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index 4794ccdd90..ba903dce14 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -1,4 +1,4 @@
-.. index:: ! functions
+.. index:: ! functions, ! function;free
 
 .. _functions:
 
diff --git a/docs/contracts/using-for.rst b/docs/contracts/using-for.rst
index 2321e5c2db..a05cb277c6 100644
--- a/docs/contracts/using-for.rst
+++ b/docs/contracts/using-for.rst
@@ -1,4 +1,4 @@
-.. index:: ! using for, library, ! operator; user-defined
+.. index:: ! using for, library, ! operator;user-defined, function;free
 
 .. _using-for:
 
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 510948b55a..88fb53a56a 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -173,7 +173,6 @@ parameters from the function declaration, but can be in arbitrary order.
         function set(uint key, uint value) public {
             data[key] = value;
         }
-
     }
 
 Omitted Names in Function Definitions
diff --git a/docs/types/conversion.rst b/docs/types/conversion.rst
index e6c68df412..02b1f2cb92 100644
--- a/docs/types/conversion.rst
+++ b/docs/types/conversion.rst
@@ -130,6 +130,7 @@ If the array is shorter than the target type, it will be padded with zeros at th
         }
     }
 
+.. index:: ! literal;conversion, literal;rational, literal;hexadecimal number
 .. _types-conversion-literals:
 
 Conversions between Literals and Elementary Types
@@ -152,6 +153,8 @@ that is large enough to represent it without truncation:
     converted to an integer type. From 0.8.0, such explicit conversions are as strict as implicit
     conversions, i.e., they are only allowed if the literal fits in the resulting range.
 
+.. index:: literal;string, literal;hexadecimal
+
 Fixed-Size Byte Arrays
 ----------------------
 
@@ -182,6 +185,8 @@ if their number of characters matches the size of the bytes type:
     bytes2 e = "x"; // not allowed
     bytes2 f = "xyz"; // not allowed
 
+.. index:: literal;address
+
 Addresses
 ---------
 
diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index 771fdecee8..4ba2a65b1c 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -235,7 +235,7 @@ with the :ref:`default value<default-value>`.
         }
     }
 
-.. index:: ! array;literals, ! inline;arrays
+.. index:: ! literal;array, ! inline;arrays
 
 Array Literals
 ^^^^^^^^^^^^^^
diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 652f1686b7..60a11d6c30 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -423,7 +423,7 @@ Dynamically-sized byte array
 ``string``:
     Dynamically-sized UTF-8-encoded string, see :ref:`arrays`. Not a value-type!
 
-.. index:: address, literal;address
+.. index:: address, ! literal;address
 
 .. _address_literals:
 
@@ -439,7 +439,7 @@ an error. You can prepend (for integer types) or append (for bytesNN types) zero
 .. note::
     The mixed-case address checksum format is defined in `EIP-55 <https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md>`_.
 
-.. index:: literal, literal;rational
+.. index:: integer, rational number, ! literal;rational
 
 .. _rational_literals:
 
@@ -517,7 +517,7 @@ regardless of the type of the right (exponent) operand.
     uint128 a = 1;
     uint128 b = 2.5 + a + 0.5;
 
-.. index:: literal, literal;string, string
+.. index:: ! literal;string, string
 .. _string_literals:
 
 String Literals and Types
@@ -564,6 +564,8 @@ character sequence ``abcdef``.
 Any Unicode line terminator which is not a newline (i.e. LF, VF, FF, CR, NEL, LS, PS) is considered to
 terminate the string literal. Newline only terminates the string literal if it is not preceded by a ``\``.
 
+.. index:: ! literal;unicode
+
 Unicode Literals
 ----------------
 
@@ -574,7 +576,7 @@ They also support the very same escape sequences as regular string literals.
 
     string memory a = unicode"Hello 😃";
 
-.. index:: literal, bytes
+.. index:: ! literal;hexadecimal, bytes
 
 Hexadecimal Literals
 --------------------
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index 80162a3b4a..0da80822a9 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -1,8 +1,10 @@
+.. index:: ! denomination
+
 **************************************
 Units and Globally Available Variables
 **************************************
 
-.. index:: wei, finney, szabo, gwei, ether
+.. index:: ! wei, ! finney, ! szabo, ! gwei, ! ether, ! denomination;ether
 
 Ether Units
 ===========
@@ -21,7 +23,7 @@ The only effect of the subdenomination suffix is a multiplication by a power of
 .. note::
     The denominations ``finney`` and ``szabo`` have been removed in version 0.7.0.
 
-.. index:: time, seconds, minutes, hours, days, weeks, years
+.. index:: ! seconds, ! minutes, ! hours, ! days, ! weeks, ! years, ! denomination;time
 
 Time Units
 ==========
@@ -52,7 +54,7 @@ interpret a function parameter in days, you can in the following way:
 
     function f(uint start, uint daysAfter) public {
         if (block.timestamp >= start + daysAfter * 1 days) {
-          // ...
+            // ...
         }
     }
 
diff --git a/docs/yul.rst b/docs/yul.rst
index 502ee6f522..2cea0260b9 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -166,6 +166,8 @@ Inside a code block, the following elements can be used
 Multiple syntactical elements can follow each other simply separated by
 whitespace, i.e. there is no terminating ``;`` or newline required.
 
+.. index:: ! literal;in Yul
+
 Literals
 --------
 

From d478c7d81a11bac497e257e796fa1a0ee73aec0c Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Sat, 15 Apr 2023 13:17:02 +0200
Subject: [PATCH 1284/1748] EVMHost: Add "support" for Blake2f

---
 test/EVMHost.cpp | 8 ++++++++
 test/EVMHost.h   | 1 +
 2 files changed, 9 insertions(+)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index d6cc311a01..99fcdf2665 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -253,6 +253,8 @@ evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 		else
 			return precompileALTBN128PairingProduct<EVMC_LONDON>(_message);
 	}
+	else if (_message.recipient == 0x0000000000000000000000000000000000000009_address && m_evmVersion >= langutil::EVMVersion::istanbul())
+		return precompileBlake2f(_message);
 
 	auto const stateBackup = accounts;
 
@@ -1117,6 +1119,12 @@ evmc::Result EVMHost::precompileALTBN128PairingProduct(evmc_message const& _mess
 	return precompileGeneric(_message, inputOutput);
 }
 
+evmc::Result EVMHost::precompileBlake2f(evmc_message const&) noexcept
+{
+	// TODO implement
+	return resultWithFailure();
+}
+
 evmc::Result EVMHost::precompileGeneric(
 	evmc_message const& _message,
 	map<bytes, EVMPrecompileOutput> const& _inOut) noexcept
diff --git a/test/EVMHost.h b/test/EVMHost.h
index 19bfe2a878..61b4c3c71c 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -120,6 +120,7 @@ class EVMHost: public evmc::MockedHost
 	static evmc::Result precompileALTBN128G1Mul(evmc_message const& _message) noexcept;
 	template <evmc_revision Revision>
 	static evmc::Result precompileALTBN128PairingProduct(evmc_message const& _message) noexcept;
+	static evmc::Result precompileBlake2f(evmc_message const& _message) noexcept;
 	static evmc::Result precompileGeneric(evmc_message const& _message, std::map<bytes, EVMPrecompileOutput> const& _inOut) noexcept;
 	/// @returns a result object with gas usage and result data taken from @a _data.
 	/// The outcome will be a failure if the limit < required.

From 4264b5ae0712a16c00315b564bd4202b67972c89 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Sat, 15 Apr 2023 13:17:33 +0200
Subject: [PATCH 1285/1748] EVMHost: Support warm coinbase

---
 test/EVMHost.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index d6cc311a01..d1fc2087f0 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -351,14 +351,19 @@ evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 		transfer(sender, destination, value);
 	}
 
-	// Populate the access access list.
+	// Populate the access access list (enabled since Berlin).
 	// Note, this will also properly touch the created address.
 	// TODO: support a user supplied access list too
 	if (m_evmRevision >= EVMC_BERLIN)
 	{
 		access_account(message.sender);
 		access_account(message.recipient);
+
+		// EIP-3651 rule
+		if (m_evmRevision >= EVMC_SHANGHAI)
+			access_account(tx_context.block_coinbase);
 	}
+
 	evmc::Result result = m_vm.execute(*this, m_evmRevision, message, code.data(), code.size());
 
 	if (message.kind == EVMC_CREATE || message.kind == EVMC_CREATE2)

From 3edcfce478fbc642c3db90ce5edb1cbff2c0bec8 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Sat, 15 Apr 2023 13:43:05 +0200
Subject: [PATCH 1286/1748] Add warning for EIP-3860 enforced initcode limits

---
 libsolidity/interface/CompilerStack.cpp | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 13eaae08a6..7f2b152619 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1322,7 +1322,7 @@ void CompilerStack::assemble(
 	}
 
 	// Throw a warning if EIP-170 limits are exceeded:
-	//   If contract creation returns data with length greater than 0x6000 (214 + 213) bytes,
+	//   If contract creation returns data with length greater than 0x6000 (2^14 + 2^13) bytes,
 	//   contract creation fails with an out of gas error.
 	if (
 		m_evmVersion >= langutil::EVMVersion::spuriousDragon() &&
@@ -1338,6 +1338,24 @@ void CompilerStack::assemble(
 			"Consider enabling the optimizer (with a low \"runs\" value!), "
 			"turning off revert strings, or using libraries."
 		);
+
+	// Throw a warning if EIP-3860 limits are exceeded:
+	//   If initcode is larger than 0xC000 bytes (twice the runtime code limit),
+	//   then contract creation fails with an out of gas error.
+	if (
+		m_evmVersion >= langutil::EVMVersion::shanghai() &&
+		compiledContract.object.bytecode.size() > 0xC000
+	)
+		m_errorReporter.warning(
+			3860_error,
+			_contract.location(),
+			"Contract initcode size is "s +
+			to_string(compiledContract.object.bytecode.size()) +
+			" bytes and exceeds 49152 bytes (a limit introduced in Shanghai). "
+			"This contract may not be deployable on Mainnet. "
+			"Consider enabling the optimizer (with a low \"runs\" value!), "
+			"turning off revert strings, or using libraries."
+		);
 }
 
 void CompilerStack::compileContract(

From 71bea997aaeff0271ce52ee3716b624751e4682c Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Sat, 15 Apr 2023 13:43:25 +0200
Subject: [PATCH 1287/1748] Add and update tests

---
 .../{ => sizeLimits}/bytecode_too_large.sol   |  0
 .../bytecode_too_large_abiencoder_v1.sol      |  0
 .../bytecode_too_large_byzantium.sol          |  0
 .../bytecode_too_large_homestead.sol          |  0
 .../sizeLimits/combined_too_large_paris.sol   | 31 ++++++++++++++++++
 .../combined_too_large_shanghai.sol           | 32 +++++++++++++++++++
 .../sizeLimits/initcode_too_large_paris.sol   | 29 +++++++++++++++++
 .../initcode_too_large_shanghai.sol           | 30 +++++++++++++++++
 8 files changed, 122 insertions(+)
 rename test/libsolidity/syntaxTests/{ => sizeLimits}/bytecode_too_large.sol (100%)
 rename test/libsolidity/syntaxTests/{ => sizeLimits}/bytecode_too_large_abiencoder_v1.sol (100%)
 rename test/libsolidity/syntaxTests/{ => sizeLimits}/bytecode_too_large_byzantium.sol (100%)
 rename test/libsolidity/syntaxTests/{ => sizeLimits}/bytecode_too_large_homestead.sol (100%)
 create mode 100644 test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
 create mode 100644 test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_paris.sol
 create mode 100644 test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol

diff --git a/test/libsolidity/syntaxTests/bytecode_too_large.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bytecode_too_large.sol
rename to test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_abiencoder_v1.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bytecode_too_large_abiencoder_v1.sol
rename to test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_abiencoder_v1.sol
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bytecode_too_large_byzantium.sol
rename to test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol
diff --git a/test/libsolidity/syntaxTests/bytecode_too_large_homestead.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_homestead.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/bytecode_too_large_homestead.sol
rename to test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_homestead.sol
diff --git a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol
new file mode 100644
index 0000000000..82a3415d0c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol
@@ -0,0 +1,31 @@
+contract A {
+    function f() public pure returns (string memory ret) {
+        // 27000 bytes long data
+        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
+    }
+}
+
+contract B is A {
+    function g() public pure returns (bool) {
+        return true;
+    }
+}
+
+contract C is A {
+    function g() public pure returns (bool) {
+        return false;
+    }
+}
+
+contract test {
+    constructor() {
+        new B();
+        new C();
+    }
+}
+// ====
+// EVMVersion: =paris
+// ----
+// Warning 5574: (0-27130): Contract code size is 27192 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (27132-27224): Contract code size is 27218 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (27226-27319): Contract code size is 27218 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
new file mode 100644
index 0000000000..4854b0a64a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
@@ -0,0 +1,32 @@
+contract A {
+    function f() public pure returns (string memory ret) {
+        // 27000 bytes long data
+        ret = "........................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
+    }
+}
+
+contract B is A {
+    function g() public pure returns (bool) {
+        return true;
+    }
+}
+
+contract C is A {
+    function g() public pure returns (bool) {
+        return false;
+    }
+}
+
+contract test {
+    constructor() {
+        new B();
+        new C();
+    }
+}
+// ====
+// EVMVersion: =shanghai
+// ----
+// Warning 5574: (0-27130): Contract code size is 27186 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (27132-27224): Contract code size is 27212 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (27226-27319): Contract code size is 27211 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 3860: (27321-27398): Contract initcode size is 54626 bytes and exceeds 49152 bytes (a limit introduced in Shanghai). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_paris.sol b/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_paris.sol
new file mode 100644
index 0000000000..cbfa944666
--- /dev/null
+++ b/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_paris.sol
@@ -0,0 +1,29 @@
+contract A {
+    function f() public pure returns (string memory ret) {
+        // 20000 bytes long data
+        ret = "................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
+    }
+}
+
+contract B is A {
+    function g() public pure returns (bool) {
+        return true;
+    }
+}
+
+contract C is A {
+    function g() public pure returns (bool) {
+        return false;
+    }
+}
+
+contract test {
+    constructor() {
+        new A();
+        new B();
+        new C();
+    }
+}
+// ====
+// EVMVersion: =paris
+// ----
diff --git a/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol b/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol
new file mode 100644
index 0000000000..1f648c630e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol
@@ -0,0 +1,30 @@
+contract A {
+    function f() public pure returns (string memory ret) {
+        // 20000 bytes long data
+        ret = "................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................";
+    }
+}
+
+contract B is A {
+    function g() public pure returns (bool) {
+        return true;
+    }
+}
+
+contract C is A {
+    function g() public pure returns (bool) {
+        return false;
+    }
+}
+
+contract test {
+    constructor() {
+        new A();
+        new B();
+        new C();
+    }
+}
+// ====
+// EVMVersion: =shanghai
+// ----
+// Warning 3860: (20321-20415): Contract initcode size is 60893 bytes and exceeds 49152 bytes (a limit introduced in Shanghai). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.

From 07ac3874b602fa31d6c1196c6a9748eaff29bad1 Mon Sep 17 00:00:00 2001
From: Michael de Hoog <michael.dehoog@coinbase.com>
Date: Sun, 16 Apr 2023 13:51:05 -0500
Subject: [PATCH 1288/1748] Fix incompatibilities with Golang parser generation

---
 docs/grammar/SolidityParser.g4 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index d2ef74cff5..ed8651ae7a 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -378,7 +378,7 @@ dataLocation: Memory | Storage | Calldata;
  */
 expression:
 	expression LBrack index=expression? RBrack # IndexAccess
-	| expression LBrack start=expression? Colon end=expression? RBrack # IndexRangeAccess
+	| expression LBrack startIndex=expression? Colon endIndex=expression? RBrack # IndexRangeAccess
 	| expression Period (identifier | Address) # MemberAccess
 	| expression LBrace (namedArgument (Comma namedArgument)*)? RBrace # FunctionCallOptions
 	| expression callArgumentList # FunctionCall
@@ -399,7 +399,7 @@ expression:
 	| expression Or expression # OrOperation
 	|<assoc=right> expression Conditional expression Colon expression # Conditional
 	|<assoc=right> expression assignOp expression # Assignment
-	| New typeName # NewExpression
+	| New typeName # NewExpr
 	| tupleExpression # Tuple
 	| inlineArrayExpression # InlineArray
  	| (

From 345d0bcf13329c4226b57c7b3a32acacc0df6ede Mon Sep 17 00:00:00 2001
From: Ojas Aklecha <90605717+ojasaklechayt@users.noreply.github.com>
Date: Sat, 1 Apr 2023 12:21:14 +0530
Subject: [PATCH 1289/1748] Cheatsheet segregated based on type

---
 docs/cheatsheet.rst                 | 69 ++++++++++++++++++++++++-----
 docs/units-and-global-variables.rst |  9 ++--
 2 files changed, 63 insertions(+), 15 deletions(-)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index 5d8e6ede76..08494ecc67 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -2,16 +2,17 @@
 Cheatsheet
 **********
 
-.. index:: operator; precedence
+.. index:: operator;precedence
 
 Order of Precedence of Operators
 ================================
+
 .. include:: types/operator-precedence-table.rst
 
-.. index:: assert, block, coinbase, difficulty, prevrandao, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, gas price, origin, revert, require, keccak256, ripemd160, sha256, ecrecover, addmod, mulmod, cryptography, this, super, selfdestruct, balance, codehash, send
+.. index:: abi;decode, abi;encode, abi;encodePacked, abi;encodeWithSelector, abi;encodeCall, abi;encodeWithSignature
 
-Global Variables
-================
+ABI Encoding and Decoding Functions
+===================================
 
 - ``abi.decode(bytes memory encodedData, (...)) returns (...)``: :ref:`ABI <ABI>`-decodes
   the provided data. The types are given in parentheses as second argument.
@@ -25,10 +26,37 @@ Global Variables
   tuple. Performs a full type-check, ensuring the types match the function signature. Result equals ``abi.encodeWithSelector(functionPointer.selector, (...))``
 - ``abi.encodeWithSignature(string memory signature, ...) returns (bytes memory)``: Equivalent
   to ``abi.encodeWithSelector(bytes4(keccak256(bytes(signature))), ...)``
+
+.. index:: bytes;concat, string;concat
+
+Members of ``bytes`` and  ``string``
+====================================
+
 - ``bytes.concat(...) returns (bytes memory)``: :ref:`Concatenates variable number of
   arguments to one byte array<bytes-concat>`
+
 - ``string.concat(...) returns (string memory)``: :ref:`Concatenates variable number of
   arguments to one string array<string-concat>`
+
+.. index:: address;balance, address;codehash, address;send, address;code, address;transfer
+
+Members of ``address``
+======================
+
+- ``<address>.balance`` (``uint256``): balance of the :ref:`address` in Wei
+- ``<address>.code`` (``bytes memory``): code at the :ref:`address` (can be empty)
+- ``<address>.codehash`` (``bytes32``): the codehash of the :ref:`address`
+- ``<address payable>.send(uint256 amount) returns (bool)``: send given amount of Wei to :ref:`address`,
+  returns ``false`` on failure
+- ``<address payable>.transfer(uint256 amount)``: send given amount of Wei to :ref:`address`, throws on failure
+
+.. index:: blockhash, block, block;basefree, block;chainid, block;coinbase, block;difficulty, block;gaslimit, block;number, block;prevrandao, block;timestamp
+.. index:: gasleft, msg;data, msg;sender, msg;sig, msg;value, tx;gasprice, tx;origin
+
+Block and Transaction Properties
+================================
+
+- ``blockhash(uint blockNumber) returns (bytes32)``: hash of the given block - only works for 256 most recent blocks
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)
 - ``block.chainid`` (``uint``): current chain id
 - ``block.coinbase`` (``address payable``): current block miner's address
@@ -44,6 +72,12 @@ Global Variables
 - ``msg.value`` (``uint``): number of wei sent with the message
 - ``tx.gasprice`` (``uint``): gas price of the transaction
 - ``tx.origin`` (``address``): sender of the transaction (full call chain)
+
+.. index:: assert, require, revert
+
+Validations and Assertions
+==========================
+
 - ``assert(bool condition)``: abort execution and revert state changes if condition is ``false`` (use for internal error)
 - ``require(bool condition)``: abort execution and revert state changes if condition is ``false`` (use
   for malformed input or error in external component)
@@ -51,7 +85,12 @@ Global Variables
   condition is ``false`` (use for malformed input or error in external component). Also provide error message.
 - ``revert()``: abort execution and revert state changes
 - ``revert(string memory message)``: abort execution and revert state changes providing an explanatory string
-- ``blockhash(uint blockNumber) returns (bytes32)``: hash of the given block - only works for 256 most recent blocks
+
+.. index:: cryptography, keccak256, sha256, ripemd160, ecrecover, addmod, mulmod
+
+Mathematical and Cryptographic Functions
+========================================
+
 - ``keccak256(bytes memory) returns (bytes32)``: compute the Keccak-256 hash of the input
 - ``sha256(bytes memory) returns (bytes32)``: compute the SHA-256 hash of the input
 - ``ripemd160(bytes memory) returns (bytes20)``: compute the RIPEMD-160 hash of the input
@@ -61,15 +100,21 @@ Global Variables
   arbitrary precision and does not wrap around at ``2**256``. Assert that ``k != 0`` starting from version 0.5.0.
 - ``mulmod(uint x, uint y, uint k) returns (uint)``: compute ``(x * y) % k`` where the multiplication is performed
   with arbitrary precision and does not wrap around at ``2**256``. Assert that ``k != 0`` starting from version 0.5.0.
+
+.. index:: this, super, selfdestruct
+
+Contract-related
+================
+
 - ``this`` (current contract's type): the current contract, explicitly convertible to ``address`` or ``address payable``
-- ``super``: the contract one level higher in the inheritance hierarchy
+- ``super``: a contract one level higher in the inheritance hierarchy
 - ``selfdestruct(address payable recipient)``: destroy the current contract, sending its funds to the given address
-- ``<address>.balance`` (``uint256``): balance of the :ref:`address` in Wei
-- ``<address>.code`` (``bytes memory``): code at the :ref:`address` (can be empty)
-- ``<address>.codehash`` (``bytes32``): the codehash of the :ref:`address`
-- ``<address payable>.send(uint256 amount) returns (bool)``: send given amount of Wei to :ref:`address`,
-  returns ``false`` on failure
-- ``<address payable>.transfer(uint256 amount)``: send given amount of Wei to :ref:`address`, throws on failure
+
+.. index:: type;name, type;creationCode, type;runtimeCode, type;interfaceId, type;min, type;max
+
+Type Information
+================
+
 - ``type(C).name`` (``string``): the name of the contract
 - ``type(C).creationCode`` (``bytes memory``): creation bytecode of the given contract, see :ref:`Type Information<meta-type>`.
 - ``type(C).runtimeCode`` (``bytes memory``): runtime bytecode of the given contract, see :ref:`Type Information<meta-type>`.
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index 80162a3b4a..f4b29713a7 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -311,13 +311,16 @@ For more information, see the section on :ref:`address`.
     semantics than ``delegatecall``.
 
 
-.. index:: this, selfdestruct
+.. index:: this, selfdestruct, super
 
-Contract Related
+Contract-related
 ----------------
 
 ``this`` (current contract's type)
-    the current contract, explicitly convertible to :ref:`address`
+    The current contract, explicitly convertible to :ref:`address`
+
+``super``
+    A contract one level higher in the inheritance hierarchy
 
 ``selfdestruct(address payable recipient)``
     Destroy the current contract, sending its funds to the given :ref:`address`

From 719cce02b4152d9dc0ba42e0ab2467d57e78180c Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Mon, 17 Apr 2023 14:06:51 +0100
Subject: [PATCH 1290/1748] Removed duplicated link (#14131)

Submitting the Security advisory will only show for repo admins, normal users will still have the option to check our security policy.
---
 .github/ISSUE_TEMPLATE/config.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 0730fa23ab..69f42abb0f 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,8 +1,5 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Report a security vulnerability
-    url: https://github.com/ethereum/solidity/security/policy
-    about: Please review our security policy for more details.
   - name: Initiate a language design or feedback discussion
     url: https://forum.soliditylang.org
     about: Open a thread on the Solidity forum.

From 5a776c722f904e967e9bbfd137b65677620e0b92 Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Mon, 17 Apr 2023 14:27:06 +0100
Subject: [PATCH 1291/1748] Update Side Menu (#14081)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update index.rst

### Plan

#### Bundle 1

Security cons.
List of known bugs
Solidity Breaking Changes (should be 1 link only)

#### Bundle 2

Natspec
SMTC
YUL
Import path

#### Bundle 3

Style Guide
Common Patterns
Resources
Contributing
Languages influences
Keyword Index

* Line breaks fix

* Whitespaces

* Update docs/index.rst

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

* Update docs/index.rst

* Update docs/index.rst

---------

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
---
 docs/index.rst | 94 ++++++++++++++++++++++++++------------------------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index ba216ec3a9..2f754473f8 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,38 +1,35 @@
 Solidity
 ========
 
-Solidity is an object-oriented, high-level language for implementing smart
-contracts. Smart contracts are programs which govern the behaviour of accounts
-within the Ethereum state.
+Solidity is an object-oriented, high-level language for implementing smart contracts.
+Smart contracts are programs which govern the behaviour of accounts within the Ethereum state.
 
 Solidity is a `curly-bracket language <https://en.wikipedia.org/wiki/List_of_programming_languages_by_type#Curly-bracket_languages>`_ designed to target the Ethereum Virtual Machine (EVM).
-It is influenced by C++, Python and JavaScript. You can find more details about which languages Solidity has been inspired by in the :doc:`language influences <language-influences>` section.
+It is influenced by C++, Python and JavaScript.
+You can find more details about which languages Solidity has been inspired by in the :doc:`language influences <language-influences>` section.
 
-Solidity is statically typed, supports inheritance, libraries and complex
-user-defined types among other features.
+Solidity is statically typed, supports inheritance, libraries and complex user-defined types among other features.
 
-With Solidity you can create contracts for uses such as voting, crowdfunding, blind auctions,
-and multi-signature wallets.
+With Solidity you can create contracts for uses such as voting, crowdfunding, blind auctions, and multi-signature wallets.
 
-When deploying contracts, you should use the latest released
-version of Solidity. Apart from exceptional cases, only the latest version receives
+When deploying contracts, you should use the latest released version of Solidity.
+Apart from exceptional cases, only the latest version receives
 `security fixes <https://github.com/ethereum/solidity/security/policy#supported-versions>`_.
-Furthermore, breaking changes as well as
-new features are introduced regularly. We currently use
-a 0.y.z version number `to indicate this fast pace of change <https://semver.org/#spec-item-4>`_.
+Furthermore, breaking changes as well as new features are introduced regularly.
+We currently use a 0.y.z version number `to indicate this fast pace of change <https://semver.org/#spec-item-4>`_.
 
 .. warning::
 
-  Solidity recently released the 0.8.x version that introduced a lot of breaking
-  changes. Make sure you read :doc:`the full list <080-breaking-changes>`.
+  Solidity recently released the 0.8.x version that introduced a lot of breaking changes.
+  Make sure you read :doc:`the full list <080-breaking-changes>`.
 
 Ideas for improving Solidity or this documentation are always welcome,
 read our :doc:`contributors guide <contributing>` for more details.
 
 .. Hint::
 
-  You can download this documentation as PDF, HTML or Epub by clicking on the versions
-  flyout menu in the bottom-left corner and selecting the preferred download format.
+  You can download this documentation as PDF, HTML or Epub
+  by clicking on the versions flyout menu in the bottom-left corner and selecting the preferred download format.
 
 
 Getting Started
@@ -40,8 +37,7 @@ Getting Started
 
 **1. Understand the Smart Contract Basics**
 
-If you are new to the concept of smart contracts we recommend you to get started by digging
-into the "Introduction to Smart Contracts" section, which covers:
+If you are new to the concept of smart contracts we recommend you to get started by digging into the "Introduction to Smart Contracts" section, which covers:
 
 * :ref:`A simple example smart contract <simple-smart-contract>` written in Solidity.
 * :ref:`Blockchain Basics <blockchain-basics>`.
@@ -59,29 +55,27 @@ simply choose your preferred option and follow the steps outlined on the :ref:`i
 
 .. hint::
   You can try out code examples directly in your browser with the
-  `Remix IDE <https://remix.ethereum.org>`_. Remix is a web browser based IDE
-  that allows you to write, deploy and administer Solidity smart contracts, without
-  the need to install Solidity locally.
+  `Remix IDE <https://remix.ethereum.org>`_.
+  Remix is a web browser based IDE that allows you to write, deploy and administer Solidity smart contracts,
+  without the need to install Solidity locally.
 
 .. warning::
-    As humans write software, it can have bugs. You should follow established
-    software development best-practices when writing your smart contracts. This
-    includes code review, testing, audits, and correctness proofs. Smart contract
-    users are sometimes more confident with code than their authors, and
-    blockchains and smart contracts have their own unique issues to
-    watch out for, so before working on production code, make sure you read the
-    :ref:`security_considerations` section.
+    As humans write software, it can have bugs.
+    You should follow established software development best-practices when writing your smart contracts.
+    This includes code review, testing, audits, and correctness proofs.
+    Smart contract users are sometimes more confident with code than their authors,
+    and blockchains and smart contracts have their own unique issues to watch out for,
+    so before working on production code, make sure you read the :ref:`security_considerations` section.
 
 **4. Learn More**
 
-If you want to learn more about building decentralized applications on Ethereum, the
-`Ethereum Developer Resources <https://ethereum.org/en/developers/>`_
-can help you with further general documentation around Ethereum, and a wide selection of tutorials,
-tools and development frameworks.
+If you want to learn more about building decentralized applications on Ethereum,
+the `Ethereum Developer Resources <https://ethereum.org/en/developers/>`_ can help you with further general documentation around Ethereum,
+and a wide selection of tutorials, tools and development frameworks.
 
 If you have any questions, you can try searching for answers or asking on the
-`Ethereum StackExchange <https://ethereum.stackexchange.com/>`_, or
-our `Gitter channel <https://gitter.im/ethereum/solidity/>`_.
+`Ethereum StackExchange <https://ethereum.stackexchange.com/>`_,
+or our `Gitter channel <https://gitter.im/ethereum/solidity/>`_.
 
 .. _translations:
 
@@ -89,8 +83,8 @@ Translations
 ------------
 
 Community contributors help translate this documentation into several languages.
-Note that they have varying degrees of completeness and up-to-dateness. The English
-version stands as a reference.
+Note that they have varying degrees of completeness and up-to-dateness.
+The English version stands as a reference.
 
 You can switch between languages by clicking on the flyout menu in the bottom-left corner
 and selecting the preferred language.
@@ -107,8 +101,8 @@ and selecting the preferred language.
 
 .. note::
 
-   We set up a GitHub organization and translation workflow to help streamline the
-   community efforts. Please refer to the translation guide in the `solidity-docs org <https://github.com/solidity-docs>`_
+   We set up a GitHub organization and translation workflow to help streamline the community efforts.
+   Please refer to the translation guide in the `solidity-docs org <https://github.com/solidity-docs>`_
    for information on how to start a new language or contribute to the community translations.
 
 Contents
@@ -161,21 +155,31 @@ Contents
 
 .. toctree::
    :maxdepth: 2
-   :caption: Additional Material
+   :caption: Advisory content
 
+   security-considerations.rst
+   bugs.rst
    050-breaking-changes.rst
    060-breaking-changes.rst
    070-breaking-changes.rst
    080-breaking-changes.rst
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Additional Material
+
    natspec-format.rst
-   security-considerations.rst
    smtchecker.rst
-   resources.rst
-   path-resolution.rst
    yul.rst
+   path-resolution.rst
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Resources
+
    style-guide.rst
    common-patterns.rst
-   bugs.rst
+   resources.rst
    contributing.rst
-   brand-guide.rst
    language-influences.rst
+   brand-guide.rst

From 3458da9df34297749f8b33ad67ee9d45f3771696 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 12 Apr 2023 14:51:03 +0200
Subject: [PATCH 1292/1748] Emit PUSH0 as junk in evm code transform, if
 available.

---
 Changelog.md                                      | 1 +
 libyul/backends/evm/AbstractAssembly.h            | 3 +++
 libyul/backends/evm/EthAssemblyAdapter.cpp        | 5 +++++
 libyul/backends/evm/EthAssemblyAdapter.h          | 3 +++
 libyul/backends/evm/NoOutputAssembly.h            | 2 ++
 libyul/backends/evm/OptimizedEVMCodeTransform.cpp | 5 ++++-
 6 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 9828220bfa..6205e72b10 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ Compiler Features:
  * Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
  * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
+ * Yul EVM Code Transform: If available, use ``push0`` instead of ``codesize`` to produce an arbitrary value on stack in order to create equal stack heights between branches.
 
 
 Bugfixes:
diff --git a/libyul/backends/evm/AbstractAssembly.h b/libyul/backends/evm/AbstractAssembly.h
index c64669abea..fe45008962 100644
--- a/libyul/backends/evm/AbstractAssembly.h
+++ b/libyul/backends/evm/AbstractAssembly.h
@@ -117,6 +117,9 @@ class AbstractAssembly
 
 	/// Mark this assembly as invalid. Any attempt to request bytecode from it should throw.
 	virtual void markAsInvalid() = 0;
+
+	/// @returns the EVM version the assembly targets.
+	virtual langutil::EVMVersion evmVersion() const = 0;
 };
 
 enum class IdentifierContext { LValue, RValue, VariableDeclaration, NonExternal };
diff --git a/libyul/backends/evm/EthAssemblyAdapter.cpp b/libyul/backends/evm/EthAssemblyAdapter.cpp
index 28a4e4ae29..9cbd6e00d9 100644
--- a/libyul/backends/evm/EthAssemblyAdapter.cpp
+++ b/libyul/backends/evm/EthAssemblyAdapter.cpp
@@ -181,6 +181,11 @@ void EthAssemblyAdapter::markAsInvalid()
 	m_assembly.markAsInvalid();
 }
 
+langutil::EVMVersion EthAssemblyAdapter::evmVersion() const
+{
+	return m_assembly.evmVersion();
+}
+
 EthAssemblyAdapter::LabelID EthAssemblyAdapter::assemblyTagToIdentifier(evmasm::AssemblyItem const& _tag)
 {
 	u256 id = _tag.data();
diff --git a/libyul/backends/evm/EthAssemblyAdapter.h b/libyul/backends/evm/EthAssemblyAdapter.h
index 87047ccbf4..011081deda 100644
--- a/libyul/backends/evm/EthAssemblyAdapter.h
+++ b/libyul/backends/evm/EthAssemblyAdapter.h
@@ -67,6 +67,9 @@ class EthAssemblyAdapter: public AbstractAssembly
 
 	void markAsInvalid() override;
 
+	langutil::EVMVersion evmVersion() const override;
+
+
 private:
 	static LabelID assemblyTagToIdentifier(evmasm::AssemblyItem const& _tag);
 	void appendJumpInstruction(evmasm::Instruction _instruction, JumpType _jumpType);
diff --git a/libyul/backends/evm/NoOutputAssembly.h b/libyul/backends/evm/NoOutputAssembly.h
index eeb00039c5..8d7dda0bb5 100644
--- a/libyul/backends/evm/NoOutputAssembly.h
+++ b/libyul/backends/evm/NoOutputAssembly.h
@@ -77,6 +77,8 @@ class NoOutputAssembly: public AbstractAssembly
 
 	void markAsInvalid() override {}
 
+	langutil::EVMVersion evmVersion() const override { return m_evmVersion; }
+
 private:
 	int m_stackHeight = 0;
 	langutil::EVMVersion m_evmVersion;
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index fd3a572e0a..8e126a49a8 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -351,7 +351,10 @@ void OptimizedEVMCodeTransform::createStackLayout(std::shared_ptr<DebugData cons
 				[&](JunkSlot const&)
 				{
 					// Note: this will always be popped, so we can push anything.
-					m_assembly.appendInstruction(evmasm::Instruction::CODESIZE);
+					if (m_assembly.evmVersion().hasPush0())
+						m_assembly.appendConstant(0);
+					else
+						m_assembly.appendInstruction(evmasm::Instruction::CODESIZE);
 				}
 			}, _slot);
 		},

From 421738b50df7221b2871754ab461b0659cb2a167 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 18 Apr 2023 12:39:24 +0200
Subject: [PATCH 1293/1748] Fix calldata handling during creation in EVMHost.

---
 test/EVMHost.cpp                                   |  5 +++++
 .../semanticTests/various/create_calldata.sol      | 14 ++++++++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/various/create_calldata.sol

diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 9f6d28ff8d..132ce2beba 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -366,6 +366,11 @@ evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 			access_account(tx_context.block_coinbase);
 	}
 
+	if (message.kind == EVMC_CREATE || message.kind == EVMC_CREATE2)
+	{
+		message.input_data = nullptr;
+		message.input_size = 0;
+	}
 	evmc::Result result = m_vm.execute(*this, m_evmRevision, message, code.data(), code.size());
 
 	if (message.kind == EVMC_CREATE || message.kind == EVMC_CREATE2)
diff --git a/test/libsolidity/semanticTests/various/create_calldata.sol b/test/libsolidity/semanticTests/various/create_calldata.sol
new file mode 100644
index 0000000000..c67e8434a3
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/create_calldata.sol
@@ -0,0 +1,14 @@
+contract C {
+	bytes public s;
+	constructor(uint256 x) {
+		// Due to a bug in EVMHost, msg.data used to contain initcode and constructor arguments.
+		s = msg.data;
+		assert(msg.data.length == 0);
+	}
+}
+// ----
+// constructor(): 42 ->
+// gas irOptimized: 147541
+// gas legacy: 177488
+// gas legacyOptimized: 140089
+// s() -> 0x20, 0

From 07def48f4597559f8941a03b46b1c80925b08b9c Mon Sep 17 00:00:00 2001
From: Marko Veniger <marko.veniger@gmail.com>
Date: Tue, 18 Apr 2023 13:10:21 +0200
Subject: [PATCH 1294/1748] Adds NatSpec to AST for struct definitions.

---
 Changelog.md                                  |   1 +
 libsolidity/ast/AST.h                         |  10 +-
 libsolidity/ast/ASTJsonExporter.cpp           |   1 +
 libsolidity/ast/ASTJsonImporter.cpp           |   3 +-
 libsolidity/parsing/Parser.cpp                |   3 +-
 test/libsolidity/ASTJSON/struct_natspec.json  | 126 ++++++++++++++++++
 test/libsolidity/ASTJSON/struct_natspec.sol   |  11 ++
 .../ASTJSON/struct_natspec_parseOnly.json     |  90 +++++++++++++
 test/libsolidity/SolidityNatspecJSON.cpp      |  35 +++++
 test/libsolidity/SolidityTypes.cpp            |   2 +-
 .../syntaxTests/natspec/docstring_struct.sol  |  12 ++
 11 files changed, 288 insertions(+), 6 deletions(-)
 create mode 100644 test/libsolidity/ASTJSON/struct_natspec.json
 create mode 100644 test/libsolidity/ASTJSON/struct_natspec.sol
 create mode 100644 test/libsolidity/ASTJSON/struct_natspec_parseOnly.json
 create mode 100644 test/libsolidity/syntaxTests/natspec/docstring_struct.sol

diff --git a/Changelog.md b/Changelog.md
index 9828220bfa..858782da61 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
  * Assembler: Use ``push0`` for placing ``0`` in the stack for EVM versions starting from "Shanghai". This decreases the deployment costs.
  * EVM: Support for the EVM Version "Shanghai".
  * NatSpec: Add support for NatSpec documentation in ``enum`` definitions.
+ * NatSpec: Add support for NatSpec documentation in ``struct`` definitions.
  * Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
  * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 631e93c452..d8f6ecd6a0 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -709,7 +709,7 @@ class UsingForDirective: public ASTNode
 	bool m_global = false;
 };
 
-class StructDefinition: public Declaration, public ScopeOpener
+class StructDefinition: public Declaration, public StructurallyDocumented, public ScopeOpener
 {
 public:
 	StructDefinition(
@@ -717,9 +717,13 @@ class StructDefinition: public Declaration, public ScopeOpener
 		SourceLocation const& _location,
 		ASTPointer<ASTString> const& _name,
 		SourceLocation _nameLocation,
-		std::vector<ASTPointer<VariableDeclaration>> _members
+		std::vector<ASTPointer<VariableDeclaration>> _members,
+		ASTPointer<StructuredDocumentation> _documentation
 	):
-		Declaration(_id, _location, _name, std::move(_nameLocation)), m_members(std::move(_members)) {}
+		Declaration(_id, _location, _name, std::move(_nameLocation)),
+		StructurallyDocumented(std::move(_documentation)),
+		m_members(std::move(_members))
+	{}
 
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index 01d8b87aae..84394c76f3 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -367,6 +367,7 @@ bool ASTJsonExporter::visit(StructDefinition const& _node)
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("name", _node.name()),
 		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
 		make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
 		make_pair("members", toJson(_node.members())),
 		make_pair("scope", idOrNull(_node.scope()))
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index f63545face..251219ea0a 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -449,7 +449,8 @@ ASTPointer<ASTNode> ASTJsonImporter::createStructDefinition(Json::Value const& _
 		_node,
 		memberAsASTString(_node, "name"),
 		createNameSourceLocation(_node),
-		members
+		members,
+		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation"))
 	);
 }
 
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 257b8bea94..b146790e06 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -682,6 +682,7 @@ ASTPointer<StructDefinition> Parser::parseStructDefinition()
 {
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
+	ASTPointer<StructuredDocumentation> documentation = parseStructuredDocumentation();
 	expectToken(Token::Struct);
 	auto [name, nameLocation] = expectIdentifierWithLocation();
 	vector<ASTPointer<VariableDeclaration>> members;
@@ -693,7 +694,7 @@ ASTPointer<StructDefinition> Parser::parseStructDefinition()
 	}
 	nodeFactory.markEndPosition();
 	expectToken(Token::RBrace);
-	return nodeFactory.createNode<StructDefinition>(std::move(name), std::move(nameLocation), std::move(members));
+	return nodeFactory.createNode<StructDefinition>(std::move(name), std::move(nameLocation), std::move(members), std::move(documentation));
 }
 
 ASTPointer<EnumValue> Parser::parseEnumValue()
diff --git a/test/libsolidity/ASTJSON/struct_natspec.json b/test/libsolidity/ASTJSON/struct_natspec.json
new file mode 100644
index 0000000000..d8b38a8033
--- /dev/null
+++ b/test/libsolidity/ASTJSON/struct_natspec.json
@@ -0,0 +1,126 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "Example":
+    [
+      8
+    ]
+  },
+  "id": 9,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "canonicalName": "Example",
+      "documentation":
+      {
+        "id": 1,
+        "nodeType": "StructuredDocumentation",
+        "src": "0:112:1",
+        "text": "@title example of title\n @author example of author\n @notice example of notice\n @dev example of dev"
+      },
+      "id": 8,
+      "members":
+      [
+        {
+          "constant": false,
+          "id": 3,
+          "mutability": "mutable",
+          "name": "text",
+          "nameLocation": "140:4:1",
+          "nodeType": "VariableDeclaration",
+          "scope": 8,
+          "src": "133:11:1",
+          "stateVariable": false,
+          "storageLocation": "default",
+          "typeDescriptions":
+          {
+            "typeIdentifier": "t_string_storage_ptr",
+            "typeString": "string"
+          },
+          "typeName":
+          {
+            "id": 2,
+            "name": "string",
+            "nodeType": "ElementaryTypeName",
+            "src": "133:6:1",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_string_storage_ptr",
+              "typeString": "string"
+            }
+          },
+          "visibility": "internal"
+        },
+        {
+          "constant": false,
+          "id": 5,
+          "mutability": "mutable",
+          "name": "valid",
+          "nameLocation": "155:5:1",
+          "nodeType": "VariableDeclaration",
+          "scope": 8,
+          "src": "150:10:1",
+          "stateVariable": false,
+          "storageLocation": "default",
+          "typeDescriptions":
+          {
+            "typeIdentifier": "t_bool",
+            "typeString": "bool"
+          },
+          "typeName":
+          {
+            "id": 4,
+            "name": "bool",
+            "nodeType": "ElementaryTypeName",
+            "src": "150:4:1",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_bool",
+              "typeString": "bool"
+            }
+          },
+          "visibility": "internal"
+        },
+        {
+          "constant": false,
+          "id": 7,
+          "mutability": "mutable",
+          "name": "value",
+          "nameLocation": "174:5:1",
+          "nodeType": "VariableDeclaration",
+          "scope": 8,
+          "src": "166:13:1",
+          "stateVariable": false,
+          "storageLocation": "default",
+          "typeDescriptions":
+          {
+            "typeIdentifier": "t_uint256",
+            "typeString": "uint256"
+          },
+          "typeName":
+          {
+            "id": 6,
+            "name": "uint256",
+            "nodeType": "ElementaryTypeName",
+            "src": "166:7:1",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_uint256",
+              "typeString": "uint256"
+            }
+          },
+          "visibility": "internal"
+        }
+      ],
+      "name": "Example",
+      "nameLocation": "119:7:1",
+      "nodeType": "StructDefinition",
+      "scope": 9,
+      "src": "112:70:1",
+      "visibility": "public"
+    }
+  ],
+  "src": "112:71:1"
+}
diff --git a/test/libsolidity/ASTJSON/struct_natspec.sol b/test/libsolidity/ASTJSON/struct_natspec.sol
new file mode 100644
index 0000000000..c9e279f6b8
--- /dev/null
+++ b/test/libsolidity/ASTJSON/struct_natspec.sol
@@ -0,0 +1,11 @@
+/// @title example of title
+/// @author example of author
+/// @notice example of notice
+/// @dev example of dev
+struct Example {
+    string text;
+    bool valid;
+    uint256 value;
+}
+
+// ----
diff --git a/test/libsolidity/ASTJSON/struct_natspec_parseOnly.json b/test/libsolidity/ASTJSON/struct_natspec_parseOnly.json
new file mode 100644
index 0000000000..b80aaf377c
--- /dev/null
+++ b/test/libsolidity/ASTJSON/struct_natspec_parseOnly.json
@@ -0,0 +1,90 @@
+{
+  "absolutePath": "a",
+  "id": 9,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "documentation":
+      {
+        "id": 1,
+        "nodeType": "StructuredDocumentation",
+        "src": "0:112:1",
+        "text": "@title example of title\n @author example of author\n @notice example of notice\n @dev example of dev"
+      },
+      "id": 8,
+      "members":
+      [
+        {
+          "constant": false,
+          "id": 3,
+          "mutability": "mutable",
+          "name": "text",
+          "nameLocation": "140:4:1",
+          "nodeType": "VariableDeclaration",
+          "src": "133:11:1",
+          "stateVariable": false,
+          "storageLocation": "default",
+          "typeDescriptions": {},
+          "typeName":
+          {
+            "id": 2,
+            "name": "string",
+            "nodeType": "ElementaryTypeName",
+            "src": "133:6:1",
+            "typeDescriptions": {}
+          },
+          "visibility": "internal"
+        },
+        {
+          "constant": false,
+          "id": 5,
+          "mutability": "mutable",
+          "name": "valid",
+          "nameLocation": "155:5:1",
+          "nodeType": "VariableDeclaration",
+          "src": "150:10:1",
+          "stateVariable": false,
+          "storageLocation": "default",
+          "typeDescriptions": {},
+          "typeName":
+          {
+            "id": 4,
+            "name": "bool",
+            "nodeType": "ElementaryTypeName",
+            "src": "150:4:1",
+            "typeDescriptions": {}
+          },
+          "visibility": "internal"
+        },
+        {
+          "constant": false,
+          "id": 7,
+          "mutability": "mutable",
+          "name": "value",
+          "nameLocation": "174:5:1",
+          "nodeType": "VariableDeclaration",
+          "src": "166:13:1",
+          "stateVariable": false,
+          "storageLocation": "default",
+          "typeDescriptions": {},
+          "typeName":
+          {
+            "id": 6,
+            "name": "uint256",
+            "nodeType": "ElementaryTypeName",
+            "src": "166:7:1",
+            "typeDescriptions": {}
+          },
+          "visibility": "internal"
+        }
+      ],
+      "name": "Example",
+      "nameLocation": "119:7:1",
+      "nodeType": "StructDefinition",
+      "src": "112:70:1",
+      "visibility": "public"
+    }
+  ],
+  "src": "112:71:1"
+}
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index decc489d53..3f83816c1f 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -1076,6 +1076,41 @@ BOOST_AUTO_TEST_CASE(dev_author_at_function)
 	expectNatspecError(sourceCode);
 }
 
+BOOST_AUTO_TEST_CASE(struct_no_docs)
+{
+	char const* sourceCode = R"(
+		contract C {
+			/// @title example of title
+			/// @author example of author
+			/// @notice example of notice
+			/// @dev example of dev
+			struct Example {
+				string text;
+				bool valid;
+				uint256 value;
+			}
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+		"kind": "dev",
+		"methods": {},
+		"version": 1
+	})ABCDEF";
+
+	checkNatspec(sourceCode, "C", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	})ABCDEF";
+
+	checkNatspec(sourceCode, "C", userDoc, true);
+}
+
 BOOST_AUTO_TEST_CASE(enum_no_docs)
 {
 	char const* sourceCode = R"(
diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp
index 139e73e312..48a0441b44 100644
--- a/test/libsolidity/SolidityTypes.cpp
+++ b/test/libsolidity/SolidityTypes.cpp
@@ -187,7 +187,7 @@ BOOST_AUTO_TEST_CASE(type_identifiers)
 	BOOST_CHECK_EQUAL(c.type()->identifier(), "t_type$_t_contract$_MyContract$$$_$2_$");
 	BOOST_CHECK_EQUAL(ContractType(c, true).identifier(), "t_super$_MyContract$$$_$2");
 
-	StructDefinition s(++id, {}, make_shared<string>("Struct"), {}, {});
+	StructDefinition s(++id, {}, make_shared<string>("Struct"), {}, {}, {});
 	s.annotation().recursive = false;
 	BOOST_CHECK_EQUAL(s.type()->identifier(), "t_type$_t_struct$_Struct_$3_storage_ptr_$");
 
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_struct.sol b/test/libsolidity/syntaxTests/natspec/docstring_struct.sol
new file mode 100644
index 0000000000..621a88a539
--- /dev/null
+++ b/test/libsolidity/syntaxTests/natspec/docstring_struct.sol
@@ -0,0 +1,12 @@
+contract C {
+    /// @title example of title
+    /// @author example of author
+    /// @notice example of notice
+    /// @dev example of dev
+    struct Example {
+        string text;
+        bool valid;
+        uint256 value;
+    }
+}
+// ----

From 8a14680851e37e031d98a0d3af52a8b530f2a451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 14 Apr 2023 21:06:59 +0200
Subject: [PATCH 1295/1748] Disallow unary plus at the parsing stage

---
 Changelog.md                                       |  1 +
 libsolidity/analysis/SyntaxChecker.cpp             |  4 +---
 libsolidity/ast/Types.cpp                          |  5 +++--
 libsolidity/codegen/ExpressionCompiler.cpp         |  4 ++--
 libsolidity/parsing/Parser.cpp                     |  4 ++++
 .../declaration_unary_plus_tuple.sol               |  9 +++++++++
 .../declaration_unary_tuple.sol                    | 14 +++++---------
 .../308_rational_unary_plus_operation.sol          |  3 +--
 .../syntaxTests/parsing/unary_plus_expression.sol  |  3 +--
 9 files changed, 27 insertions(+), 20 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple.sol

diff --git a/Changelog.md b/Changelog.md
index 23b2e48e51..7e35275bc6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
  * NatSpec: Add support for NatSpec documentation in ``enum`` definitions.
  * NatSpec: Add support for NatSpec documentation in ``struct`` definitions.
  * Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
+ * Parser: Unary plus is no longer recognized as a unary operator in the AST and triggers an error at the parsing stage (rather than later during the analysis).
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
  * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
  * Yul EVM Code Transform: If available, use ``push0`` instead of ``codesize`` to produce an arbitrary value on stack in order to create equal stack heights between branches.
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index c26ed6767a..4f99f67ac6 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -332,9 +332,7 @@ bool SyntaxChecker::visit(Literal const& _literal)
 
 bool SyntaxChecker::visit(UnaryOperation const& _operation)
 {
-	if (_operation.getOperator() == Token::Add)
-		m_errorReporter.syntaxError(9636_error, _operation.location(), "Use of unary + is disallowed.");
-
+	solAssert(_operation.getOperator() != Token::Add);
 	return true;
 }
 
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index c2356ad810..a8134fa3bb 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -819,16 +819,17 @@ BoolResult FixedPointType::isExplicitlyConvertibleTo(Type const& _convertTo) con
 
 TypeResult FixedPointType::unaryOperatorResult(Token _operator) const
 {
+	solAssert(_operator != Token::Add);
+
 	switch (_operator)
 	{
 	case Token::Delete:
 		// "delete" is ok for all fixed types
 		return TypeResult{TypeProvider::emptyTuple()};
-	case Token::Add:
 	case Token::Sub:
 	case Token::Inc:
 	case Token::Dec:
-		// for fixed, we allow +, -, ++ and --
+		// for fixed, we allow -, ++ and --
 		return this;
 	default:
 		return nullptr;
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 1c02b281cc..25bd15d5a5 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -511,8 +511,8 @@ bool ExpressionCompiler::visit(UnaryOperation const& _unaryOperation)
 		m_currentLValue.reset();
 		break;
 	case Token::Add: // +
-		// unary add, so basically no-op
-		break;
+		// According to SyntaxChecker...
+		solAssert(false, "Use of unary + is disallowed.");
 	case Token::Sub: // -
 		solUnimplementedAssert(
 			type.category() != Type::Category::FixedPoint,
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index b146790e06..c6611511a7 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -1863,6 +1863,10 @@ ASTPointer<Expression> Parser::parseUnaryExpression(
 	ASTNodeFactory nodeFactory = _partiallyParsedExpression ?
 		ASTNodeFactory(*this, _partiallyParsedExpression) : ASTNodeFactory(*this);
 	Token token = m_scanner->currentToken();
+
+	if (token == Token::Add)
+		fatalParserError(9636_error, "Use of unary + is disallowed.");
+
 	if (!_partiallyParsedExpression && (TokenTraits::isUnaryOp(token) || TokenTraits::isCountOp(token)))
 	{
 		// prefix expression
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple.sol
new file mode 100644
index 0000000000..a0621ebf04
--- /dev/null
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_plus_tuple.sol
@@ -0,0 +1,9 @@
+contract C
+{
+    function f() public
+    {
+        int x = +(0, 0);
+    }
+}
+// ----
+// ParserError 9636: (59-60): Use of unary + is disallowed.
diff --git a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
index b6b2ec2e2f..a0ed75c9a4 100644
--- a/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
+++ b/test/libsolidity/syntaxTests/iceRegressionTests/declarationUnaryTuple/declaration_unary_tuple.sol
@@ -2,19 +2,15 @@ contract C
 {
     function f() public
     {
-        int x = +(0, 0);
         int y = -(0, 0);
         (int z) = ~(0, 0);
         (int t) = !(0, 0);
     }
 }
 // ----
-// SyntaxError 9636: (59-66): Use of unary + is disallowed.
-// TypeError 4907: (59-66): Built-in unary operator + cannot be applied to type tuple(int_const 0,int_const 0).
+// TypeError 4907: (59-66): Built-in unary operator - cannot be applied to type tuple(int_const 0,int_const 0).
 // TypeError 7364: (51-66): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (84-91): Built-in unary operator - cannot be applied to type tuple(int_const 0,int_const 0).
-// TypeError 7364: (76-91): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (111-118): Built-in unary operator ~ cannot be applied to type tuple(int_const 0,int_const 0).
-// TypeError 7364: (101-118): Different number of components on the left hand side (1) than on the right hand side (2).
-// TypeError 4907: (138-145): Built-in unary operator ! cannot be applied to type tuple(int_const 0,int_const 0).
-// TypeError 7364: (128-145): Different number of components on the left hand side (1) than on the right hand side (2).
+// TypeError 4907: (86-93): Built-in unary operator ~ cannot be applied to type tuple(int_const 0,int_const 0).
+// TypeError 7364: (76-93): Different number of components on the left hand side (1) than on the right hand side (2).
+// TypeError 4907: (113-120): Built-in unary operator ! cannot be applied to type tuple(int_const 0,int_const 0).
+// TypeError 7364: (103-120): Different number of components on the left hand side (1) than on the right hand side (2).
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
index 0c579062bf..29d29b46bd 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/308_rational_unary_plus_operation.sol
@@ -6,5 +6,4 @@ contract test {
     }
 }
 // ----
-// SyntaxError 9636: (70-75): Use of unary + is disallowed.
-// TypeError 4907: (70-75): Built-in unary operator + cannot be applied to type rational_const 13 / 4.
+// ParserError 9636: (70-71): Use of unary + is disallowed.
diff --git a/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol b/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
index 41384d98f6..527c9450b1 100644
--- a/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
+++ b/test/libsolidity/syntaxTests/parsing/unary_plus_expression.sol
@@ -5,5 +5,4 @@ contract test {
     }
 }
 // ----
-// SyntaxError 9636: (70-72): Use of unary + is disallowed.
-// TypeError 4907: (70-72): Built-in unary operator + cannot be applied to type uint256.
+// ParserError 9636: (70-71): Use of unary + is disallowed.

From b85a95f52d1b2676fcce5dcf32925973220e0bba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 14 Apr 2023 21:07:23 +0200
Subject: [PATCH 1296/1748] Refactor TokenTraits::isUnaryOp() not to treat + as
 a unary operator

---
 liblangutil/Token.h                  | 2 +-
 libsolidity/analysis/TypeChecker.cpp | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/liblangutil/Token.h b/liblangutil/Token.h
index c4907aeace..ef0c7f6af0 100644
--- a/liblangutil/Token.h
+++ b/liblangutil/Token.h
@@ -300,7 +300,7 @@ namespace TokenTraits
 
 	constexpr bool isBitOp(Token op) { return (Token::BitOr <= op && op <= Token::BitAnd) || op == Token::BitNot; }
 	constexpr bool isBooleanOp(Token op) { return (Token::Or <= op && op <= Token::And) || op == Token::Not; }
-	constexpr bool isUnaryOp(Token op) { return (Token::Not <= op && op <= Token::Delete) || op == Token::Add || op == Token::Sub; }
+	constexpr bool isUnaryOp(Token op) { return (Token::Not <= op && op <= Token::Delete) || op == Token::Sub; }
 	constexpr bool isCountOp(Token op) { return op == Token::Inc || op == Token::Dec; }
 	constexpr bool isShiftOp(Token op) { return (Token::SHL <= op) && (op <= Token::SHR); }
 	constexpr bool isVariableVisibilitySpecifier(Token op) { return op == Token::Public || op == Token::Private || op == Token::Internal; }
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index efbbc57419..f0d4ecda3d 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -4035,9 +4035,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 
 			bool identicalFirstTwoParameters = (parameterCount < 2 || *parameterTypes.at(0) == *parameterTypes.at(1));
 			bool isUnaryOnlyOperator = (!TokenTraits::isBinaryOp(operator_.value()) && TokenTraits::isUnaryOp(operator_.value()));
-			bool isBinaryOnlyOperator =
-				(TokenTraits::isBinaryOp(operator_.value()) && !TokenTraits::isUnaryOp(operator_.value())) ||
-				operator_.value() == Token::Add;
+			bool isBinaryOnlyOperator = (TokenTraits::isBinaryOp(operator_.value()) && !TokenTraits::isUnaryOp(operator_.value()));
 			bool firstParameterMatchesUsingFor = parameterCount == 0 || *usingForType == *parameterTypes.front();
 
 			optional<string> wrongParametersMessage;

From 64f57ac3c7a46d8f442bfc89ed352c256bef25cf Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 17 Apr 2023 16:10:06 -0300
Subject: [PATCH 1297/1748] Fix null dereference in using for directive when
 operator name is empty

---
 libsolidity/parsing/Parser.cpp                            | 8 +++++++-
 .../operator_parsing_operator_name_empty_string.sol       | 7 +++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_empty_string.sol

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index b146790e06..8b0f00e7b4 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -995,11 +995,17 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 				Token operator_ = m_scanner->currentToken();
 				if (!util::contains(userDefinableOperators, operator_))
 				{
+					string operatorName;
+					if (!m_scanner->currentLiteral().empty())
+						operatorName = m_scanner->currentLiteral();
+					else if (char const* tokenString = TokenTraits::toString(operator_))
+						operatorName = string(tokenString);
+
 					parserError(
 						4403_error,
 						fmt::format(
 							"Not a user-definable operator: {}. Only the following operators can be user-defined: {}",
-							(!m_scanner->currentLiteral().empty() ? m_scanner->currentLiteral() : string(TokenTraits::toString(operator_))),
+							operatorName,
 							util::joinHumanReadable(userDefinableOperators | ranges::views::transform([](Token _t) { return string{TokenTraits::toString(_t)}; }))
 						)
 					);
diff --git a/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_empty_string.sol b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_empty_string.sol
new file mode 100644
index 0000000000..8435de6d93
--- /dev/null
+++ b/test/libsolidity/syntaxTests/operators/userDefined/operator_parsing_operator_name_empty_string.sol
@@ -0,0 +1,7 @@
+using {f as ''} for uint;
+using {f as ""} for int;
+using {f as hex""} for address;
+// ----
+// ParserError 4403: (12-14): Not a user-definable operator: . Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (38-40): Not a user-definable operator: . Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=
+// ParserError 4403: (63-68): Not a user-definable operator: . Only the following operators can be user-defined: |, &, ^, ~, +, -, *, /, %, ==, !=, <, >, <=, >=

From 281011989184117f91172d23f1f686c2420e2a84 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 16 Feb 2023 13:35:08 +0100
Subject: [PATCH 1298/1748] Remove unused workflow_ubuntu1604_clang

---
 .circleci/config.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 67d52e0713..b1b4f1c4e5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -466,11 +466,6 @@ defaults:
       requires:
         - b_ubu
 
-  - workflow_ubuntu1604_clang: &workflow_ubuntu1604_clang
-      <<: *workflow_trigger_on_tags
-      requires:
-        - b_ubu_ossfuzz
-
   - workflow_ubuntu2204_clang: &workflow_ubuntu2204_clang
       <<: *workflow_trigger_on_tags
       requires:

From 1fbc17ba05738392f5d6d4c7e10ba1c51a4707dc Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 16 Feb 2023 14:30:08 +0100
Subject: [PATCH 1299/1748] Remove unused artifacts step

---
 .circleci/config.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b1b4f1c4e5..872b548f2e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -164,12 +164,6 @@ defaults:
   # --------------------------------------------------------------------------
   # Artifacts Templates
 
-  # the whole build directory
-  - artifacts_build_dir: &artifacts_build_dir
-      root: build
-      paths:
-        - "*"
-
   # compiled solc executable target
   - artifacts_solc: &artifacts_solc
       path: build/solc/solc

From f4ab85da3ea9767b56bc8268272f4369bf3bac92 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 10:22:11 +0100
Subject: [PATCH 1300/1748] Remove HERA from base image

---
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index de356f144b..7ef5cde7e9 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -57,18 +57,6 @@ RUN set -ex; \
 	ninja install/strip; \
 	rm -rf /usr/src/evmone
 
-# HERA
-RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.6.0" --depth 1 --recurse-submodules https://github.com/ewasm/hera.git; \
-	cd hera; \
-	mkdir build; \
-	cd build; \
-	cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
-	ninja; \
-	ninja install/strip; \
-	rm -rf /usr/src/hera
-
 FROM base
 COPY --from=libraries /usr/lib /usr/lib
 COPY --from=libraries /usr/bin /usr/bin

From 927946c4f57577ae598841c29e2e3a52dc6be791 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 10:38:52 +0100
Subject: [PATCH 1301/1748] Move ubuntu 22.04 dependencies to docker image

---
 .circleci/config.yml                                | 11 -----------
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 872b548f2e..ad5427f40d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1104,11 +1104,6 @@ jobs:
       - checkout
       - attach_workspace:
           at: build
-      - run:
-          name: Install all locales
-          command: |
-            apt update --assume-yes
-            apt install locales-all --assume-yes --no-install-recommends
       - run: test/localeTest.sh build/solc/solc
       - matrix_notify_failure_unless_pr
 
@@ -1516,12 +1511,6 @@ jobs:
           name: Print diff
           when: on_fail
           command: diff --unified=0 --report-identical-files --from-file $REPORT_FILES | head --lines 50
-      - run:
-          name: Install zip
-          when: on_fail
-          command: |
-            apt update --quiet
-            apt install zip --assume-yes
       - run:
           name: Bundle reports into a single package
           when: on_fail
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 51ab30ac06..e45342c58f 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -38,7 +38,7 @@ RUN set -ex; \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
 		libboost-program-options-dev \
 		libcvc4-dev libz3-static-dev z3-static jq \
-		libcln-dev; \
+		libcln-dev zip locales-all; \
 	apt-get install -qy python3-pip python3-sphinx; \
 	pip3 install codecov; \
 	rm -rf /var/lib/apt/lists/*

From 1e00672fbcf60693d62996df5169bd961637c9bd Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 11:12:50 +0100
Subject: [PATCH 1302/1748] Rename ubuntu ossfuzz dockerfile

---
 ...erfile.ubuntu1604.clang.ossfuzz => Dockerfile.clang.ossfuzz} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename scripts/docker/buildpack-deps/{Dockerfile.ubuntu1604.clang.ossfuzz => Dockerfile.clang.ossfuzz} (98%)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.clang.ossfuzz
similarity index 98%
rename from scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
rename to scripts/docker/buildpack-deps/Dockerfile.clang.ossfuzz
index 672bd18aa1..b64d73bc0d 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.clang.ossfuzz
@@ -1,7 +1,7 @@
 # vim:syntax=dockerfile
 #------------------------------------------------------------------------------
 # Dockerfile for building and testing Solidity Compiler on CI
-# Target: Ubuntu 16.04 (Xenial Xerus) ossfuzz Clang variant
+# Target: Ubuntu ossfuzz Clang variant
 # URL: https://hub.docker.com/r/ethereum/solidity-buildpack-deps
 #
 # This file is part of solidity.

From f78591c356c391d81574a0939497f75a64282974 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 16 Feb 2023 18:08:59 +0100
Subject: [PATCH 1303/1748] Reorganize base images alphabetically and add small
 and xlarge image for ubuntu2004

---
 .circleci/config.yml | 164 +++++++++++++++++++++----------------------
 1 file changed, 82 insertions(+), 82 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ad5427f40d..c2efe62ede 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -281,45 +281,89 @@ defaults:
   # --------------------------------------------------------------------------
   # Base Image Templates
 
-  - base_ubuntu1604_clang: &base_ubuntu1604_clang
+  - base_archlinux: &base_archlinux
       docker:
-        - image: << pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image >>
+        - image: archlinux:base
       environment:
         TERM: xterm
         MAKEFLAGS: -j 3
 
-  - base_ubuntu1604_clang_small: &base_ubuntu1604_clang_small
-      <<: *base_ubuntu1604_clang
+  - base_archlinux_large: &base_archlinux_large
+      docker:
+        - image: archlinux:base
+      resource_class: large
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 5
+
+  - base_cimg_small: &base_cimg_small
+      docker:
+        - image: cimg/base:current
       resource_class: small
       environment:
         TERM: xterm
         MAKEFLAGS: -j 2
 
-  - base_ubuntu2204_clang: &base_ubuntu2204_clang
+  - base_ems_large: &base_ems_large
       docker:
-        - image: << pipeline.parameters.ubuntu-2204-clang-docker-image >>
+        - image: << pipeline.parameters.emscripten-docker-image >>
+      resource_class: large
       environment:
         TERM: xterm
-        CC: clang
-        CXX: clang++
-        MAKEFLAGS: -j 3
+        MAKEFLAGS: -j 5
 
-  - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
-      <<: *base_ubuntu2204_clang
+  - base_node_small: &base_node_small
+      docker:
+        - image: cimg/node:current
+      resource_class: small
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 2
+
+  - base_osx: &base_osx
+      macos:
+        xcode: "13.2.0"
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j5
+
+  - base_osx_large: &base_osx_large
+      macos:
+        xcode: "13.2.0"
       resource_class: large
       environment:
         TERM: xterm
-        CC: clang
-        CXX: clang++
-        MAKEFLAGS: -j 5
+        MAKEFLAGS: -j10
 
-  - base_ubuntu2004: &base_ubuntu2004
+  - base_python_small: &base_python_small
+      docker:
+        - image: cimg/python:3.6
+      resource_class: small
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 2
+
+  - base_ubuntu1604_clang: &base_ubuntu1604_clang
       docker:
-        - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+        - image: << pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image >>
       environment:
         TERM: xterm
         MAKEFLAGS: -j 3
 
+  - base_ubuntu1604_clang_small: &base_ubuntu1604_clang_small
+      <<: *base_ubuntu1604_clang
+      resource_class: small
+      environment:
+        TERM: xterm
+        MAKEFLAGS: -j 2
+
+  - base_ubuntu2004: &base_ubuntu2004
+      docker:
+          - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+      environment:
+          TERM: xterm
+          MAKEFLAGS: -j 3
+
   - base_ubuntu2004_small: &base_ubuntu2004_small
       <<: *base_ubuntu2004
       resource_class: small
@@ -341,6 +385,24 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j 3
 
+  - base_ubuntu2204_clang: &base_ubuntu2204_clang
+      docker:
+        - image: << pipeline.parameters.ubuntu-2204-clang-docker-image >>
+      environment:
+        TERM: xterm
+        CC: clang
+        CXX: clang++
+        MAKEFLAGS: -j 3
+
+  - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
+      <<: *base_ubuntu2204_clang
+      resource_class: large
+      environment:
+        TERM: xterm
+        CC: clang
+        CXX: clang++
+        MAKEFLAGS: -j 5
+
   - base_ubuntu2204_small: &base_ubuntu2204_small
       <<: *base_ubuntu2204
       resource_class: small
@@ -362,28 +424,10 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j 10
 
-  - base_cimg_small: &base_cimg_small
-      docker:
-        - image: cimg/base:current
-      resource_class: small
-      environment:
-        TERM: xterm
-        MAKEFLAGS: -j 2
-
-  - base_archlinux: &base_archlinux
-      docker:
-        - image: archlinux:base
-      environment:
-        TERM: xterm
-        MAKEFLAGS: -j 3
-
-  - base_archlinux_large: &base_archlinux_large
-      docker:
-        - image: archlinux:base
-      resource_class: large
-      environment:
-        TERM: xterm
-        MAKEFLAGS: -j 5
+  - base_win_bash: &base_win_bash
+      executor:
+        name: win/default
+        shell: bash.exe
 
   - base_win_powershell: &base_win_powershell
       executor:
@@ -396,50 +440,6 @@ defaults:
         shell: powershell.exe
         size: large
 
-  - base_win_bash: &base_win_bash
-      executor:
-        name: win/default
-        shell: bash.exe
-
-  - base_osx: &base_osx
-      macos:
-        xcode: "13.2.0"
-      environment:
-        TERM: xterm
-        MAKEFLAGS: -j5
-
-  - base_osx_large: &base_osx_large
-      macos:
-        xcode: "13.2.0"
-      resource_class: large
-      environment:
-        TERM: xterm
-        MAKEFLAGS: -j10
-
-  - base_ems_large: &base_ems_large
-      docker:
-        - image: << pipeline.parameters.emscripten-docker-image >>
-      resource_class: large
-      environment:
-        TERM: xterm
-        MAKEFLAGS: -j 5
-
-  - base_python_small: &base_python_small
-      docker:
-        - image: cimg/python:3.6
-      resource_class: small
-      environment:
-        TERM: xterm
-        MAKEFLAGS: -j 2
-
-  - base_node_small: &base_node_small
-      docker:
-        - image: cimg/node:current
-      resource_class: small
-      environment:
-        TERM: xterm
-        MAKEFLAGS: -j 2
-
   # --------------------------------------------------------------------------
   # Workflow Templates
 

From 524db30f12727d95eb42bebb0323457fa81635f0 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 11:16:50 +0100
Subject: [PATCH 1304/1748] Update ubuntu ossfuzz references

---
 .circleci/config.yml                          | 24 +++++++++----------
 .github/workflows/buildpack-deps.yml          |  4 ++--
 ...ildpack-deps_test_ubuntu.clang.ossfuzz.sh} |  0
 scripts/docker/buildpack-deps/README.md       |  2 +-
 test/tools/ossfuzz/README.md                  |  4 ++--
 5 files changed, 17 insertions(+), 17 deletions(-)
 rename scripts/ci/{buildpack-deps_test_ubuntu1604.clang.ossfuzz.sh => buildpack-deps_test_ubuntu.clang.ossfuzz.sh} (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c2efe62ede..174c4e78f3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -17,11 +17,11 @@ parameters:
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7f0b62da2aa0920660e67cd17fb3a7f6c57d7da72454003056f3bd27bbda2075"
   ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-2
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0d4fa1da806f9b3daabd2d1dc0842899af794a838e475c14045c3fb289cc8103"
-  ubuntu-1604-clang-ossfuzz-docker-image:
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-1
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e515710752bfb38ee0e9b2f92ca71612c03ed85290c36c3b3c0a3d9f90187aef"
+  ubuntu-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu1604.clang.ossfuzz-23
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-23
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7a84f67829ec2fdcfc8a61ebf22f9dc27b04a9edeb1531565ab3e0ebb1cbc4a0"
   emscripten-docker-image:
     type: string
@@ -343,15 +343,15 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j 2
 
-  - base_ubuntu1604_clang: &base_ubuntu1604_clang
+  - base_ubuntu_clang: &base_ubuntu_clang
       docker:
-        - image: << pipeline.parameters.ubuntu-1604-clang-ossfuzz-docker-image >>
+        - image: << pipeline.parameters.ubuntu-clang-ossfuzz-docker-image >>
       environment:
         TERM: xterm
         MAKEFLAGS: -j 3
 
-  - base_ubuntu1604_clang_small: &base_ubuntu1604_clang_small
-      <<: *base_ubuntu1604_clang
+  - base_ubuntu_clang_small: &base_ubuntu_clang_small
+      <<: *base_ubuntu_clang
       resource_class: small
       environment:
         TERM: xterm
@@ -510,7 +510,7 @@ defaults:
       requires:
         - b_ems
 
-  - workflow_ubuntu1604_ossfuzz: &workflow_ubuntu1604_ossfuzz
+  - workflow_ubuntu_ossfuzz: &workflow_ubuntu_ossfuzz
       <<: *workflow_trigger_on_tags
       requires:
         - b_ubu_ossfuzz
@@ -916,7 +916,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   b_ubu_ossfuzz: &b_ubu_ossfuzz
-    <<: *base_ubuntu1604_clang
+    <<: *base_ubuntu_clang
     steps:
       - checkout
       - run: *setup_prerelease_commit_hash
@@ -925,7 +925,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   t_ubu_ossfuzz: &t_ubu_ossfuzz
-    <<: *base_ubuntu1604_clang_small
+    <<: *base_ubuntu_clang_small
     steps:
       - checkout
       - attach_workspace:
@@ -1711,7 +1711,7 @@ workflows:
     jobs:
       # OSSFUZZ builds and (regression) tests
       - b_ubu_ossfuzz: *workflow_trigger_on_tags
-      - t_ubu_ossfuzz: *workflow_ubuntu1604_ossfuzz
+      - t_ubu_ossfuzz: *workflow_ubuntu_ossfuzz
 
       # Code Coverage enabled build and tests
       - b_ubu_codecov: *workflow_trigger_on_tags
diff --git a/.github/workflows/buildpack-deps.yml b/.github/workflows/buildpack-deps.yml
index 4d3918d941..6a261bd2eb 100644
--- a/.github/workflows/buildpack-deps.yml
+++ b/.github/workflows/buildpack-deps.yml
@@ -5,7 +5,7 @@ on:
     branches: [ develop ]
     paths:
       - 'scripts/docker/buildpack-deps/Dockerfile.emscripten'
-      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu1604.clang.ossfuzz'
+      - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2004'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang'
       - 'scripts/docker/buildpack-deps/Dockerfile.ubuntu2204'
@@ -23,7 +23,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image_variant: [emscripten, ubuntu1604.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204]
+        image_variant: [emscripten, ubuntu.clang.ossfuzz, ubuntu2004, ubuntu2204.clang, ubuntu2204]
 
     steps:
       - uses: actions/checkout@v2
diff --git a/scripts/ci/buildpack-deps_test_ubuntu1604.clang.ossfuzz.sh b/scripts/ci/buildpack-deps_test_ubuntu.clang.ossfuzz.sh
similarity index 100%
rename from scripts/ci/buildpack-deps_test_ubuntu1604.clang.ossfuzz.sh
rename to scripts/ci/buildpack-deps_test_ubuntu.clang.ossfuzz.sh
diff --git a/scripts/docker/buildpack-deps/README.md b/scripts/docker/buildpack-deps/README.md
index 7f6352581c..15cb71f5be 100644
--- a/scripts/docker/buildpack-deps/README.md
+++ b/scripts/docker/buildpack-deps/README.md
@@ -27,7 +27,7 @@ If the version check was successful, the docker image will be built using the Do
 
 The resulting docker image will be tested by executing the corresponding `scripts/ci/buildpack-deps_test_*` scripts.
 Some of these scripts are symlinked to `scripts/ci/build.sh`, except the following two:
- * `buildpack-deps-ubuntu1604.clang.ossfuzz` => `scripts/ci/build_ossfuzz.sh`
+ * `buildpack-deps-ubuntu.clang.ossfuzz` => `scripts/ci/build_ossfuzz.sh`
  * `buildpack-deps_test_emscripten.sh` => `scripts/ci/build_emscripten.sh`
 
 These scripts `scripts/ci/build.sh` and `scripts/ci/build_ossfuzz.sh` are also used by CircleCI, see `.circleci/config.yml`.
diff --git a/test/tools/ossfuzz/README.md b/test/tools/ossfuzz/README.md
index 944595a3f7..9343602d44 100644
--- a/test/tools/ossfuzz/README.md
+++ b/test/tools/ossfuzz/README.md
@@ -6,11 +6,11 @@
 
 We have multiple fuzzers, some based on string input and others on protobuf input. To build them, please do the following:
 
-- Create a local docker image from `Dockerfile.ubuntu1604.clang.ossfuzz` in the `.circleci/docker` sub-directory. Please note that this step is likely to take at least an hour to complete. Therefore, it is recommended to do it when you are away from the computer (and the computer is plugged to power since we do not want a battery drain).
+- Create a local docker image from `Dockerfile.ubuntu.clang.ossfuzz` in the `.circleci/docker` sub-directory. Please note that this step is likely to take at least an hour to complete. Therefore, it is recommended to do it when you are away from the computer (and the computer is plugged to power since we do not want a battery drain).
 
 ```
 $ cd .circleci/docker
-$ docker build -t solidity-ossfuzz-local -f Dockerfile.ubuntu1604.clang.ossfuzz .
+$ docker build -t solidity-ossfuzz-local -f Dockerfile.ubuntu.clang.ossfuzz .
 ```
 
 - Login to the docker container sourced from the image built in the previous step from the solidity parent directory

From 9b7eb4683b654f5f7b42c967f0275c89b09efccb Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 11:38:44 +0100
Subject: [PATCH 1305/1748] Rename workflow_trigger_on_tags ->
 on_all_tags_and_branches

---
 .circleci/config.yml | 98 ++++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 174c4e78f3..8efa8e733a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -443,7 +443,7 @@ defaults:
   # --------------------------------------------------------------------------
   # Workflow Templates
 
-  - workflow_trigger_on_tags: &workflow_trigger_on_tags
+  - on_all_tags_and_branches: &on_all_tags_and_branches
       filters:
         tags:
           only: /.*/
@@ -456,67 +456,67 @@ defaults:
           ignore: /.*/
 
   - workflow_ubuntu2204: &workflow_ubuntu2204
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_ubu
 
   - workflow_ubuntu2204_clang: &workflow_ubuntu2204_clang
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_ubu_clang
 
   - workflow_ubuntu2204_force_release: &workflow_ubuntu2204_force_release
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_ubu_force_release
 
   - workflow_ubuntu2004_static: &workflow_ubuntu2004_static
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_ubu_static
 
   - workflow_archlinux: &workflow_archlinux
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_archlinux
 
   - workflow_ubuntu2204_codecov: &workflow_ubuntu2204_codecov
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_ubu_codecov
 
   - workflow_osx: &workflow_osx
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_osx
 
   - workflow_ubuntu2204_asan: &workflow_ubuntu2204_asan
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_ubu_asan
 
   - workflow_ubuntu2204_asan_clang: &workflow_ubuntu2204_asan_clang
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_ubu_asan_clang
 
   - workflow_ubuntu2204_ubsan_clang: &workflow_ubuntu2204_ubsan_clang
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_ubu_ubsan_clang
 
   - workflow_emscripten: &workflow_emscripten
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_ems
 
   - workflow_ubuntu_ossfuzz: &workflow_ubuntu_ossfuzz
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_ubu_ossfuzz
 
   - workflow_win: &workflow_win
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       requires:
         - b_win
 
@@ -633,11 +633,11 @@ defaults:
       python2: true
 
   - job_b_ubu_asan_clang: &job_b_ubu_asan_clang
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       name: b_ubu_asan_clang
       cmake_options: -DSANITIZE=address
   - job_b_ubu_ubsan_clang: &job_b_ubu_ubsan_clang
-      <<: *workflow_trigger_on_tags
+      <<: *on_all_tags_and_branches
       name: b_ubu_ubsan_clang
       cmake_options: -DSANITIZE=undefined
 
@@ -1568,52 +1568,52 @@ workflows:
   main:
     jobs:
       # basic checks
-      - chk_spelling: *workflow_trigger_on_tags
-      - chk_coding_style: *workflow_trigger_on_tags
-      # DISABLED FOR 0.6.0 - chk_docs_examples: *workflow_trigger_on_tags
-      - chk_buglist: *workflow_trigger_on_tags
-      - chk_proofs: *workflow_trigger_on_tags
-      - chk_pylint: *workflow_trigger_on_tags
-      - chk_errorcodes: *workflow_trigger_on_tags
-      - chk_antlr_grammar: *workflow_trigger_on_tags
-      - chk_docs_pragma_min_version: *workflow_trigger_on_tags
-      - t_ubu_pyscripts: *workflow_trigger_on_tags
-      - t_win_pyscripts: *workflow_trigger_on_tags
+      - chk_spelling: *on_all_tags_and_branches
+      - chk_coding_style: *on_all_tags_and_branches
+      # DISABLED FOR 0.6.0 - chk_docs_examples: *on_all_tags_and_branches
+      - chk_buglist: *on_all_tags_and_branches
+      - chk_proofs: *on_all_tags_and_branches
+      - chk_pylint: *on_all_tags_and_branches
+      - chk_errorcodes: *on_all_tags_and_branches
+      - chk_antlr_grammar: *on_all_tags_and_branches
+      - chk_docs_pragma_min_version: *on_all_tags_and_branches
+      - t_ubu_pyscripts: *on_all_tags_and_branches
+      - t_win_pyscripts: *on_all_tags_and_branches
 
       # build-only
-      - b_docs: *workflow_trigger_on_tags
-      # DISABLED FOR 0.8.18 - b_ubu_cxx20: *workflow_trigger_on_tags
+      - b_docs: *on_all_tags_and_branches
+      # DISABLED FOR 0.8.18 - b_ubu_cxx20: *on_all_tags_and_branches
       # Issue: https://github.com/ethereum/solidity/issues/13868
-      - b_ubu_ossfuzz: *workflow_trigger_on_tags
+      - b_ubu_ossfuzz: *on_all_tags_and_branches
 
       # OS/X build and tests
-      - b_osx: *workflow_trigger_on_tags
+      - b_osx: *on_all_tags_and_branches
       - t_osx_cli: *workflow_osx
       - t_osx_soltest: *workflow_osx
 
       # ArchLinux build and tests
-      - b_archlinux: *workflow_trigger_on_tags
+      - b_archlinux: *on_all_tags_and_branches
       - t_archlinux_soltest: *workflow_archlinux
 
       # Static build
-      - b_ubu_static: *workflow_trigger_on_tags
+      - b_ubu_static: *on_all_tags_and_branches
 
       # Ubuntu build and tests
-      - b_ubu: *workflow_trigger_on_tags
+      - b_ubu: *on_all_tags_and_branches
       - t_ubu_cli: *workflow_ubuntu2204
       - t_ubu_locale: *workflow_ubuntu2204
       - t_ubu_soltest_all: *workflow_ubuntu2204
-      - b_ubu_clang: *workflow_trigger_on_tags
+      - b_ubu_clang: *on_all_tags_and_branches
       - t_ubu_clang_soltest: *workflow_ubuntu2204_clang
       - t_ubu_lsp: *workflow_ubuntu2204
 
       # Ubuntu fake release build and tests
-      - b_ubu_force_release: *workflow_trigger_on_tags
+      - b_ubu_force_release: *on_all_tags_and_branches
       - t_ubu_force_release_cli: *workflow_ubuntu2204_force_release
       - t_ubu_force_release_soltest_all: *workflow_ubuntu2204_force_release
 
       # Emscripten build and tests that take 15 minutes or less
-      - b_ems: *workflow_trigger_on_tags
+      - b_ems: *on_all_tags_and_branches
       - t_ems_solcjs: *workflow_emscripten
       - t_ems_ext_hardhat: *workflow_emscripten
 
@@ -1636,7 +1636,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_gp2
 
       - c_ext_benchmarks:
-          <<: *workflow_trigger_on_tags
+          <<: *on_all_tags_and_branches
           requires:
             - t_ems_compile_ext_colony
             - t_native_test_ext_gnosis
@@ -1656,32 +1656,32 @@ workflows:
             - t_native_test_ext_gp2
 
       # Windows build and tests
-      - b_win: *workflow_trigger_on_tags
+      - b_win: *on_all_tags_and_branches
       - t_win_soltest: *workflow_win
 
       # Bytecode comparison:
       - b_bytecode_ubu_static:
-          <<: *workflow_trigger_on_tags
+          <<: *on_all_tags_and_branches
           requires:
             - b_ubu_static
       - b_bytecode_ubu:
-          <<: *workflow_trigger_on_tags
+          <<: *on_all_tags_and_branches
           requires:
             - b_ubu
       - b_bytecode_win:
-          <<: *workflow_trigger_on_tags
+          <<: *on_all_tags_and_branches
           requires:
             - b_win
       - b_bytecode_osx:
-          <<: *workflow_trigger_on_tags
+          <<: *on_all_tags_and_branches
           requires:
             - b_osx
       - b_bytecode_ems:
-          <<: *workflow_trigger_on_tags
+          <<: *on_all_tags_and_branches
           requires:
             - b_ems
       - t_bytecode_compare:
-          <<: *workflow_trigger_on_tags
+          <<: *on_all_tags_and_branches
           requires:
             - b_bytecode_ubu_static
             - b_bytecode_ubu
@@ -1710,15 +1710,15 @@ workflows:
 
     jobs:
       # OSSFUZZ builds and (regression) tests
-      - b_ubu_ossfuzz: *workflow_trigger_on_tags
+      - b_ubu_ossfuzz: *on_all_tags_and_branches
       - t_ubu_ossfuzz: *workflow_ubuntu_ossfuzz
 
       # Code Coverage enabled build and tests
-      - b_ubu_codecov: *workflow_trigger_on_tags
+      - b_ubu_codecov: *on_all_tags_and_branches
       - t_ubu_codecov: *workflow_ubuntu2204_codecov
 
       # ASan build and tests
-      - b_ubu_asan: *workflow_trigger_on_tags
+      - b_ubu_asan: *on_all_tags_and_branches
       - b_ubu_san_clang: *job_b_ubu_asan_clang
       - t_ubu_asan_soltest: *workflow_ubuntu2204_asan
       - t_ubu_asan_clang_soltest: *workflow_ubuntu2204_asan_clang
@@ -1730,5 +1730,5 @@ workflows:
       - t_ubu_ubsan_clang_cli: *workflow_ubuntu2204_ubsan_clang
 
       # Emscripten build and tests that take more than 15 minutes to execute
-      - b_ems: *workflow_trigger_on_tags
+      - b_ems: *on_all_tags_and_branches
       - t_ems_ext: *job_ems_test_ext_colony

From b99684d3f2886486341b8eefdd92f4d5407c39f8 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 11:41:52 +0100
Subject: [PATCH 1306/1748] Rename workflow_trigger_on_releases ->
 on_version_tags

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8efa8e733a..4369e57f83 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -448,7 +448,7 @@ defaults:
         tags:
           only: /.*/
 
-  - workflow_trigger_on_releases: &workflow_trigger_on_releases
+  - on_version_tags: &on_version_tags
       filters:
         tags:
           only: /^v.*/
@@ -1691,7 +1691,7 @@ workflows:
 
       # Final artifacts
       - c_release_binaries:
-          <<: *workflow_trigger_on_releases
+          <<: *on_version_tags
           requires:
             - b_ubu_static
             - b_osx

From d8937d8a762260605075e5a9bf3f7d3967d52755 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 11:49:23 +0100
Subject: [PATCH 1307/1748] Rename workflow_ubuntu2004_static ->
 requires_b_ubu_static

---
 .circleci/config.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4369e57f83..b1b2a82c8c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -470,7 +470,7 @@ defaults:
       requires:
         - b_ubu_force_release
 
-  - workflow_ubuntu2004_static: &workflow_ubuntu2004_static
+  - requires_b_ubu_static: &requires_b_ubu_static
       <<: *on_all_tags_and_branches
       requires:
         - b_ubu_static
@@ -534,91 +534,91 @@ defaults:
       python2: true
 
   - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_gnosis
       project: gnosis
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_zeppelin
       project: zeppelin
       binary_type: native
       resource_class: large
   - job_native_test_ext_ens: &job_native_test_ext_ens
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_ens
       project: ens
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_trident: &job_native_test_ext_trident
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_trident
       project: trident
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_euler: &job_native_test_ext_euler
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_euler
       project: euler
       binary_type: native
       resource_class: medium
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_yield_liquidator
       project: yield-liquidator
       binary_type: native
   - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_bleeps
       project: bleeps
       binary_type: native
       resource_class: medium
   - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_pool_together
       project: pool-together
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_perpetual_pools
       project: perpetual-pools
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_uniswap
       project: uniswap
       binary_type: native
       nodejs_version: '16.18'
   - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_elementfi
       project: elementfi
       binary_type: native
       resource_class: medium
   - job_native_test_ext_brink: &job_native_test_ext_brink
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_brink
       project: brink
       binary_type: native
       nodejs_version: '18.11'
   - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_chainlink
       project: chainlink
       binary_type: native
       nodejs_version: '16.18'
       resource_class: large # Tests run out of memory on a smaller machine
   - job_native_test_ext_gp2: &job_native_test_ext_gp2
-      <<: *workflow_ubuntu2004_static
+      <<: *requires_b_ubu_static
       name: t_native_test_ext_gp2
       project: gp2
       binary_type: native

From a13c3f0d075d0d234025f771be1e0e5a9dc37ae7 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 20:07:25 +0100
Subject: [PATCH 1308/1748] Rename workflow_ubuntu2204 -> requires_b_ubu

---
 .circleci/config.yml | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b1b2a82c8c..3df29de057 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -455,17 +455,17 @@ defaults:
         branches:
           ignore: /.*/
 
-  - workflow_ubuntu2204: &workflow_ubuntu2204
+  - requires_b_ubu: &requires_b_ubu
       <<: *on_all_tags_and_branches
       requires:
         - b_ubu
 
-  - workflow_ubuntu2204_clang: &workflow_ubuntu2204_clang
+  - requires_b_ubu_clang: &requires_b_ubu_clang
       <<: *on_all_tags_and_branches
       requires:
         - b_ubu_clang
 
-  - workflow_ubuntu2204_force_release: &workflow_ubuntu2204_force_release
+  - requires_b_ubu_force_release: &requires_b_ubu_force_release
       <<: *on_all_tags_and_branches
       requires:
         - b_ubu_force_release
@@ -480,7 +480,7 @@ defaults:
       requires:
         - b_archlinux
 
-  - workflow_ubuntu2204_codecov: &workflow_ubuntu2204_codecov
+  - requires_b_ubu_codecov: &requires_b_ubu_codecov
       <<: *on_all_tags_and_branches
       requires:
         - b_ubu_codecov
@@ -490,17 +490,17 @@ defaults:
       requires:
         - b_osx
 
-  - workflow_ubuntu2204_asan: &workflow_ubuntu2204_asan
+  - requires_b_ubu_asan: &requires_b_ubu_asan
       <<: *on_all_tags_and_branches
       requires:
         - b_ubu_asan
 
-  - workflow_ubuntu2204_asan_clang: &workflow_ubuntu2204_asan_clang
+  - requires_b_ubu_asan_clang: &requires_b_ubu_asan_clang
       <<: *on_all_tags_and_branches
       requires:
         - b_ubu_asan_clang
 
-  - workflow_ubuntu2204_ubsan_clang: &workflow_ubuntu2204_ubsan_clang
+  - requires_b_ubu_ubsan_clang: &requires_b_ubu_ubsan_clang
       <<: *on_all_tags_and_branches
       requires:
         - b_ubu_ubsan_clang
@@ -1600,17 +1600,17 @@ workflows:
 
       # Ubuntu build and tests
       - b_ubu: *on_all_tags_and_branches
-      - t_ubu_cli: *workflow_ubuntu2204
-      - t_ubu_locale: *workflow_ubuntu2204
-      - t_ubu_soltest_all: *workflow_ubuntu2204
+      - t_ubu_cli: *requires_b_ubu
+      - t_ubu_locale: *requires_b_ubu
+      - t_ubu_soltest_all: *requires_b_ubu
       - b_ubu_clang: *on_all_tags_and_branches
-      - t_ubu_clang_soltest: *workflow_ubuntu2204_clang
-      - t_ubu_lsp: *workflow_ubuntu2204
+      - t_ubu_clang_soltest: *requires_b_ubu_clang
+      - t_ubu_lsp: *requires_b_ubu
 
       # Ubuntu fake release build and tests
       - b_ubu_force_release: *on_all_tags_and_branches
-      - t_ubu_force_release_cli: *workflow_ubuntu2204_force_release
-      - t_ubu_force_release_soltest_all: *workflow_ubuntu2204_force_release
+      - t_ubu_force_release_cli: *requires_b_ubu_force_release
+      - t_ubu_force_release_soltest_all: *requires_b_ubu_force_release
 
       # Emscripten build and tests that take 15 minutes or less
       - b_ems: *on_all_tags_and_branches
@@ -1715,19 +1715,19 @@ workflows:
 
       # Code Coverage enabled build and tests
       - b_ubu_codecov: *on_all_tags_and_branches
-      - t_ubu_codecov: *workflow_ubuntu2204_codecov
+      - t_ubu_codecov: *requires_b_ubu_codecov
 
       # ASan build and tests
       - b_ubu_asan: *on_all_tags_and_branches
       - b_ubu_san_clang: *job_b_ubu_asan_clang
-      - t_ubu_asan_soltest: *workflow_ubuntu2204_asan
-      - t_ubu_asan_clang_soltest: *workflow_ubuntu2204_asan_clang
-      - t_ubu_asan_cli: *workflow_ubuntu2204_asan
+      - t_ubu_asan_soltest: *requires_b_ubu_asan
+      - t_ubu_asan_clang_soltest: *requires_b_ubu_asan_clang
+      - t_ubu_asan_cli: *requires_b_ubu_asan
 
       # UBSan build and tests
       - b_ubu_san_clang: *job_b_ubu_ubsan_clang
-      - t_ubu_ubsan_clang_soltest: *workflow_ubuntu2204_ubsan_clang
-      - t_ubu_ubsan_clang_cli: *workflow_ubuntu2204_ubsan_clang
+      - t_ubu_ubsan_clang_soltest: *requires_b_ubu_ubsan_clang
+      - t_ubu_ubsan_clang_cli: *requires_b_ubu_ubsan_clang
 
       # Emscripten build and tests that take more than 15 minutes to execute
       - b_ems: *on_all_tags_and_branches

From 4cf3661c3e3a699ea75480562b18be44bdbb5c55 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 20:08:57 +0100
Subject: [PATCH 1309/1748] Rename workflow_emscripten -> requires_emscripten

---
 .circleci/config.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3df29de057..10dbeb1cfc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -505,7 +505,7 @@ defaults:
       requires:
         - b_ubu_ubsan_clang
 
-  - workflow_emscripten: &workflow_emscripten
+  - requires_emscripten: &requires_emscripten
       <<: *on_all_tags_and_branches
       requires:
         - b_ems
@@ -525,7 +525,7 @@ defaults:
 
   # Separate compile-only runs of those external tests where a full run takes much longer.
   - job_ems_compile_ext_colony: &job_ems_compile_ext_colony
-      <<: *workflow_emscripten
+      <<: *requires_emscripten
       name: t_ems_compile_ext_colony
       project: colony
       binary_type: solcjs
@@ -624,7 +624,7 @@ defaults:
       binary_type: native
       nodejs_version: '18.11'
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
-      <<: *workflow_emscripten
+      <<: *requires_emscripten
       name: t_ems_test_ext_colony
       project: colony
       binary_type: solcjs
@@ -1614,8 +1614,8 @@ workflows:
 
       # Emscripten build and tests that take 15 minutes or less
       - b_ems: *on_all_tags_and_branches
-      - t_ems_solcjs: *workflow_emscripten
-      - t_ems_ext_hardhat: *workflow_emscripten
+      - t_ems_solcjs: *requires_emscripten
+      - t_ems_ext_hardhat: *requires_emscripten
 
       - t_ems_ext: *job_ems_compile_ext_colony
 

From 8ea890de53d9466f7155df2d3e457cbc0734e7ff Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 20:11:09 +0100
Subject: [PATCH 1310/1748] Minor fix

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 10dbeb1cfc..33e45dabf1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -510,7 +510,7 @@ defaults:
       requires:
         - b_ems
 
-  - workflow_ubuntu_ossfuzz: &workflow_ubuntu_ossfuzz
+  - requires_b_ubu_ossfuzz: &requires_b_ubu_ossfuzz
       <<: *on_all_tags_and_branches
       requires:
         - b_ubu_ossfuzz
@@ -1711,7 +1711,7 @@ workflows:
     jobs:
       # OSSFUZZ builds and (regression) tests
       - b_ubu_ossfuzz: *on_all_tags_and_branches
-      - t_ubu_ossfuzz: *workflow_ubuntu_ossfuzz
+      - t_ubu_ossfuzz: *requires_b_ubu_ossfuzz
 
       # Code Coverage enabled build and tests
       - b_ubu_codecov: *on_all_tags_and_branches

From e464a49b0b1379582533ce5a39cc4da72072f182 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 20:13:22 +0100
Subject: [PATCH 1311/1748] Rename workflow_archlinux -> requires_b_archlinux

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 33e45dabf1..2f84098b05 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -475,7 +475,7 @@ defaults:
       requires:
         - b_ubu_static
 
-  - workflow_archlinux: &workflow_archlinux
+  - requires_b_archlinux: &requires_b_archlinux
       <<: *on_all_tags_and_branches
       requires:
         - b_archlinux
@@ -1593,7 +1593,7 @@ workflows:
 
       # ArchLinux build and tests
       - b_archlinux: *on_all_tags_and_branches
-      - t_archlinux_soltest: *workflow_archlinux
+      - t_archlinux_soltest: *requires_b_archlinux
 
       # Static build
       - b_ubu_static: *on_all_tags_and_branches

From 6cde589a03994b1efc106fc90a5c674a8b27eb39 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 20:14:18 +0100
Subject: [PATCH 1312/1748] Rename workflow_win -> requires_win

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2f84098b05..02ed242e71 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -515,7 +515,7 @@ defaults:
       requires:
         - b_ubu_ossfuzz
 
-  - workflow_win: &workflow_win
+  - requires_b_win: &requires_b_win
       <<: *on_all_tags_and_branches
       requires:
         - b_win
@@ -1657,7 +1657,7 @@ workflows:
 
       # Windows build and tests
       - b_win: *on_all_tags_and_branches
-      - t_win_soltest: *workflow_win
+      - t_win_soltest: *requires_b_win
 
       # Bytecode comparison:
       - b_bytecode_ubu_static:

From a9949f1cd13d81849051f5ed863071953460645e Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 17 Feb 2023 20:15:18 +0100
Subject: [PATCH 1313/1748] Rename workflow_osx -> requires_osx

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 02ed242e71..047af9ac2e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -485,7 +485,7 @@ defaults:
       requires:
         - b_ubu_codecov
 
-  - workflow_osx: &workflow_osx
+  - requires_b_osx: &requires_b_osx
       <<: *on_all_tags_and_branches
       requires:
         - b_osx
@@ -1588,8 +1588,8 @@ workflows:
 
       # OS/X build and tests
       - b_osx: *on_all_tags_and_branches
-      - t_osx_cli: *workflow_osx
-      - t_osx_soltest: *workflow_osx
+      - t_osx_cli: *requires_b_osx
+      - t_osx_soltest: *requires_b_osx
 
       # ArchLinux build and tests
       - b_archlinux: *on_all_tags_and_branches

From 67078afe4bd37dd221c84c20ab2c315567aeb425 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Sat, 18 Feb 2023 12:14:41 +0100
Subject: [PATCH 1314/1748] Add on_develop filter

---
 .circleci/config.yml | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 047af9ac2e..1f4b19648b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -455,6 +455,12 @@ defaults:
         branches:
           ignore: /.*/
 
+  - on_develop: &on_develop
+      filters:
+        branches:
+          only:
+            - develop
+
   - requires_b_ubu: &requires_b_ubu
       <<: *on_all_tags_and_branches
       requires:
@@ -1703,10 +1709,7 @@ workflows:
     triggers:
       - schedule:
           cron: "0 0 * * *"
-          filters:
-            branches:
-              only:
-                - develop
+          <<: *on_develop
 
     jobs:
       # OSSFUZZ builds and (regression) tests

From ce27eecb934111fee88c49013f2611f2fac0d79e Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 20 Feb 2023 11:48:29 +0100
Subject: [PATCH 1315/1748] Add requires_nothing

---
 .circleci/config.yml | 79 +++++++++++++++++++++++---------------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1f4b19648b..9ee36b7498 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -461,6 +461,9 @@ defaults:
           only:
             - develop
 
+  - requires_nothing: &requires_nothing
+      <<: *on_all_tags_and_branches
+
   - requires_b_ubu: &requires_b_ubu
       <<: *on_all_tags_and_branches
       requires:
@@ -511,7 +514,7 @@ defaults:
       requires:
         - b_ubu_ubsan_clang
 
-  - requires_emscripten: &requires_emscripten
+  - requires_b_ems: &requires_b_ems
       <<: *on_all_tags_and_branches
       requires:
         - b_ems
@@ -531,7 +534,7 @@ defaults:
 
   # Separate compile-only runs of those external tests where a full run takes much longer.
   - job_ems_compile_ext_colony: &job_ems_compile_ext_colony
-      <<: *requires_emscripten
+      <<: *requires_b_ems
       name: t_ems_compile_ext_colony
       project: colony
       binary_type: solcjs
@@ -630,7 +633,7 @@ defaults:
       binary_type: native
       nodejs_version: '18.11'
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
-      <<: *requires_emscripten
+      <<: *requires_b_ems
       name: t_ems_test_ext_colony
       project: colony
       binary_type: solcjs
@@ -1574,54 +1577,54 @@ workflows:
   main:
     jobs:
       # basic checks
-      - chk_spelling: *on_all_tags_and_branches
-      - chk_coding_style: *on_all_tags_and_branches
-      # DISABLED FOR 0.6.0 - chk_docs_examples: *on_all_tags_and_branches
-      - chk_buglist: *on_all_tags_and_branches
-      - chk_proofs: *on_all_tags_and_branches
-      - chk_pylint: *on_all_tags_and_branches
-      - chk_errorcodes: *on_all_tags_and_branches
-      - chk_antlr_grammar: *on_all_tags_and_branches
-      - chk_docs_pragma_min_version: *on_all_tags_and_branches
-      - t_ubu_pyscripts: *on_all_tags_and_branches
-      - t_win_pyscripts: *on_all_tags_and_branches
+      - chk_spelling: *requires_nothing
+      - chk_coding_style: *requires_nothing
+      # DISABLED FOR 0.6.0 - chk_docs_examples: *requires_nothing
+      - chk_buglist: *requires_nothing
+      - chk_proofs: *requires_nothing
+      - chk_pylint: *requires_nothing
+      - chk_errorcodes: *requires_nothing
+      - chk_antlr_grammar: *requires_nothing
+      - chk_docs_pragma_min_version: *requires_nothing
+      - t_ubu_pyscripts: *requires_nothing
+      - t_win_pyscripts: *requires_nothing
 
       # build-only
-      - b_docs: *on_all_tags_and_branches
-      # DISABLED FOR 0.8.18 - b_ubu_cxx20: *on_all_tags_and_branches
+      - b_docs: *requires_nothing
+      # DISABLED FOR 0.8.18 - b_ubu_cxx20: *requires_nothing
       # Issue: https://github.com/ethereum/solidity/issues/13868
-      - b_ubu_ossfuzz: *on_all_tags_and_branches
+      - b_ubu_ossfuzz: *requires_nothing
 
       # OS/X build and tests
-      - b_osx: *on_all_tags_and_branches
+      - b_osx: *requires_nothing
       - t_osx_cli: *requires_b_osx
       - t_osx_soltest: *requires_b_osx
 
       # ArchLinux build and tests
-      - b_archlinux: *on_all_tags_and_branches
+      - b_archlinux: *requires_nothing
       - t_archlinux_soltest: *requires_b_archlinux
 
       # Static build
-      - b_ubu_static: *on_all_tags_and_branches
+      - b_ubu_static: *requires_nothing
 
       # Ubuntu build and tests
-      - b_ubu: *on_all_tags_and_branches
+      - b_ubu: *requires_nothing
       - t_ubu_cli: *requires_b_ubu
       - t_ubu_locale: *requires_b_ubu
       - t_ubu_soltest_all: *requires_b_ubu
-      - b_ubu_clang: *on_all_tags_and_branches
+      - b_ubu_clang: *requires_nothing
       - t_ubu_clang_soltest: *requires_b_ubu_clang
       - t_ubu_lsp: *requires_b_ubu
 
       # Ubuntu fake release build and tests
-      - b_ubu_force_release: *on_all_tags_and_branches
+      - b_ubu_force_release: *requires_nothing
       - t_ubu_force_release_cli: *requires_b_ubu_force_release
       - t_ubu_force_release_soltest_all: *requires_b_ubu_force_release
 
       # Emscripten build and tests that take 15 minutes or less
-      - b_ems: *on_all_tags_and_branches
-      - t_ems_solcjs: *requires_emscripten
-      - t_ems_ext_hardhat: *requires_emscripten
+      - b_ems: *requires_nothing
+      - t_ems_solcjs: *requires_b_ems
+      - t_ems_ext_hardhat: *requires_b_ems
 
       - t_ems_ext: *job_ems_compile_ext_colony
 
@@ -1642,7 +1645,7 @@ workflows:
       - t_ems_ext: *job_native_test_ext_gp2
 
       - c_ext_benchmarks:
-          <<: *on_all_tags_and_branches
+          <<: *requires_nothing
           requires:
             - t_ems_compile_ext_colony
             - t_native_test_ext_gnosis
@@ -1662,32 +1665,32 @@ workflows:
             - t_native_test_ext_gp2
 
       # Windows build and tests
-      - b_win: *on_all_tags_and_branches
+      - b_win: *requires_nothing
       - t_win_soltest: *requires_b_win
 
       # Bytecode comparison:
       - b_bytecode_ubu_static:
-          <<: *on_all_tags_and_branches
+          <<: *requires_nothing
           requires:
             - b_ubu_static
       - b_bytecode_ubu:
-          <<: *on_all_tags_and_branches
+          <<: *requires_nothing
           requires:
             - b_ubu
       - b_bytecode_win:
-          <<: *on_all_tags_and_branches
+          <<: *requires_nothing
           requires:
             - b_win
       - b_bytecode_osx:
-          <<: *on_all_tags_and_branches
+          <<: *requires_nothing
           requires:
             - b_osx
       - b_bytecode_ems:
-          <<: *on_all_tags_and_branches
+          <<: *requires_nothing
           requires:
             - b_ems
       - t_bytecode_compare:
-          <<: *on_all_tags_and_branches
+          <<: *requires_nothing
           requires:
             - b_bytecode_ubu_static
             - b_bytecode_ubu
@@ -1713,15 +1716,15 @@ workflows:
 
     jobs:
       # OSSFUZZ builds and (regression) tests
-      - b_ubu_ossfuzz: *on_all_tags_and_branches
+      - b_ubu_ossfuzz: *requires_nothing
       - t_ubu_ossfuzz: *requires_b_ubu_ossfuzz
 
       # Code Coverage enabled build and tests
-      - b_ubu_codecov: *on_all_tags_and_branches
+      - b_ubu_codecov: *requires_nothing
       - t_ubu_codecov: *requires_b_ubu_codecov
 
       # ASan build and tests
-      - b_ubu_asan: *on_all_tags_and_branches
+      - b_ubu_asan: *requires_nothing
       - b_ubu_san_clang: *job_b_ubu_asan_clang
       - t_ubu_asan_soltest: *requires_b_ubu_asan
       - t_ubu_asan_clang_soltest: *requires_b_ubu_asan_clang
@@ -1733,5 +1736,5 @@ workflows:
       - t_ubu_ubsan_clang_cli: *requires_b_ubu_ubsan_clang
 
       # Emscripten build and tests that take more than 15 minutes to execute
-      - b_ems: *on_all_tags_and_branches
+      - b_ems: *requires_nothing
       - t_ems_ext: *job_ems_test_ext_colony

From 3b2bb4ba50e8326ff66a85cb4ff02b36a845768d Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 20 Feb 2023 12:00:29 +0100
Subject: [PATCH 1316/1748] Rename t_ems_ext to t_ext since the job also
 supports native builds

---
 .circleci/config.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9ee36b7498..b29501ecfd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1211,7 +1211,7 @@ jobs:
             yarn test
       - matrix_notify_failure_unless_pr
 
-  t_ems_ext:
+  t_ext:
     parameters:
       project:
         type: string
@@ -1626,23 +1626,23 @@ workflows:
       - t_ems_solcjs: *requires_b_ems
       - t_ems_ext_hardhat: *requires_b_ems
 
-      - t_ems_ext: *job_ems_compile_ext_colony
-
-      - t_ems_ext: *job_native_test_ext_gnosis
-      - t_ems_ext: *job_native_test_ext_zeppelin
-      - t_ems_ext: *job_native_test_ext_ens
-      - t_ems_ext: *job_native_test_ext_trident
-      - t_ems_ext: *job_native_test_ext_euler
-      - t_ems_ext: *job_native_test_ext_yield_liquidator
-      - t_ems_ext: *job_native_test_ext_bleeps
-      - t_ems_ext: *job_native_test_ext_pool_together
-      - t_ems_ext: *job_native_test_ext_perpetual_pools
-      - t_ems_ext: *job_native_test_ext_uniswap
-      - t_ems_ext: *job_native_test_ext_prb_math
-      - t_ems_ext: *job_native_test_ext_elementfi
-      - t_ems_ext: *job_native_test_ext_brink
-      - t_ems_ext: *job_native_test_ext_chainlink
-      - t_ems_ext: *job_native_test_ext_gp2
+      - t_ext: *job_ems_compile_ext_colony
+
+      - t_ext: *job_native_test_ext_gnosis
+      - t_ext: *job_native_test_ext_zeppelin
+      - t_ext: *job_native_test_ext_ens
+      - t_ext: *job_native_test_ext_trident
+      - t_ext: *job_native_test_ext_euler
+      - t_ext: *job_native_test_ext_yield_liquidator
+      - t_ext: *job_native_test_ext_bleeps
+      - t_ext: *job_native_test_ext_pool_together
+      - t_ext: *job_native_test_ext_perpetual_pools
+      - t_ext: *job_native_test_ext_uniswap
+      - t_ext: *job_native_test_ext_prb_math
+      - t_ext: *job_native_test_ext_elementfi
+      - t_ext: *job_native_test_ext_brink
+      - t_ext: *job_native_test_ext_chainlink
+      - t_ext: *job_native_test_ext_gp2
 
       - c_ext_benchmarks:
           <<: *requires_nothing
@@ -1737,4 +1737,4 @@ workflows:
 
       # Emscripten build and tests that take more than 15 minutes to execute
       - b_ems: *requires_nothing
-      - t_ems_ext: *job_ems_test_ext_colony
+      - t_ext: *job_ems_test_ext_colony

From e95cfa84bc66e5d12611ddd0391d28b7f7293475 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 20 Feb 2023 12:37:53 +0100
Subject: [PATCH 1317/1748] Add space between jobs definitions

---
 .circleci/config.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b29501ecfd..43b413c3b4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -548,77 +548,90 @@ defaults:
       project: gnosis
       binary_type: native
       nodejs_version: '16.18'
+
   - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
       <<: *requires_b_ubu_static
       name: t_native_test_ext_zeppelin
       project: zeppelin
       binary_type: native
       resource_class: large
+
   - job_native_test_ext_ens: &job_native_test_ext_ens
       <<: *requires_b_ubu_static
       name: t_native_test_ext_ens
       project: ens
       binary_type: native
       nodejs_version: '18.11'
+
   - job_native_test_ext_trident: &job_native_test_ext_trident
       <<: *requires_b_ubu_static
       name: t_native_test_ext_trident
       project: trident
       binary_type: native
       nodejs_version: '16.18'
+
   - job_native_test_ext_euler: &job_native_test_ext_euler
       <<: *requires_b_ubu_static
       name: t_native_test_ext_euler
       project: euler
       binary_type: native
       resource_class: medium
+
   - job_native_test_ext_yield_liquidator: &job_native_test_ext_yield_liquidator
       <<: *requires_b_ubu_static
       name: t_native_test_ext_yield_liquidator
       project: yield-liquidator
       binary_type: native
+
   - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
       <<: *requires_b_ubu_static
       name: t_native_test_ext_bleeps
       project: bleeps
       binary_type: native
       resource_class: medium
+
   - job_native_test_ext_pool_together: &job_native_test_ext_pool_together
       <<: *requires_b_ubu_static
       name: t_native_test_ext_pool_together
       project: pool-together
       binary_type: native
       nodejs_version: '16.18'
+
   - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
       <<: *requires_b_ubu_static
       name: t_native_test_ext_perpetual_pools
       project: perpetual-pools
       binary_type: native
       nodejs_version: '18.11'
+
   - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
       <<: *requires_b_ubu_static
       name: t_native_test_ext_uniswap
       project: uniswap
       binary_type: native
       nodejs_version: '16.18'
+
   - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
       <<: *requires_b_ubu_static
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
       nodejs_version: '18.11'
+
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
       <<: *requires_b_ubu_static
       name: t_native_test_ext_elementfi
       project: elementfi
       binary_type: native
       resource_class: medium
+
   - job_native_test_ext_brink: &job_native_test_ext_brink
       <<: *requires_b_ubu_static
       name: t_native_test_ext_brink
       project: brink
       binary_type: native
       nodejs_version: '18.11'
+
   - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
       <<: *requires_b_ubu_static
       name: t_native_test_ext_chainlink
@@ -626,12 +639,14 @@ defaults:
       binary_type: native
       nodejs_version: '16.18'
       resource_class: large # Tests run out of memory on a smaller machine
+
   - job_native_test_ext_gp2: &job_native_test_ext_gp2
       <<: *requires_b_ubu_static
       name: t_native_test_ext_gp2
       project: gp2
       binary_type: native
       nodejs_version: '18.11'
+
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *requires_b_ems
       name: t_ems_test_ext_colony
@@ -645,6 +660,7 @@ defaults:
       <<: *on_all_tags_and_branches
       name: b_ubu_asan_clang
       cmake_options: -DSANITIZE=address
+
   - job_b_ubu_ubsan_clang: &job_b_ubu_ubsan_clang
       <<: *on_all_tags_and_branches
       name: b_ubu_ubsan_clang

From 589688b23681a48697c871a2bb4b367ce6210300 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Mon, 27 Mar 2023 17:48:26 +0200
Subject: [PATCH 1318/1748] Add image parameter to external tests

---
 .circleci/config.yml | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 43b413c3b4..1fb2cc92f5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -539,7 +539,7 @@ defaults:
       project: colony
       binary_type: solcjs
       compile_only: 1
-      nodejs_version: '14.20'
+      image: cimg/node:14.20
       python2: true
 
   - job_native_test_ext_gnosis: &job_native_test_ext_gnosis
@@ -547,7 +547,7 @@ defaults:
       name: t_native_test_ext_gnosis
       project: gnosis
       binary_type: native
-      nodejs_version: '16.18'
+      image: cimg/node:16.18
 
   - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
       <<: *requires_b_ubu_static
@@ -561,14 +561,14 @@ defaults:
       name: t_native_test_ext_ens
       project: ens
       binary_type: native
-      nodejs_version: '18.11'
+      image: cimg/node:18.11
 
   - job_native_test_ext_trident: &job_native_test_ext_trident
       <<: *requires_b_ubu_static
       name: t_native_test_ext_trident
       project: trident
       binary_type: native
-      nodejs_version: '16.18'
+      image: cimg/node:16.18
 
   - job_native_test_ext_euler: &job_native_test_ext_euler
       <<: *requires_b_ubu_static
@@ -595,28 +595,28 @@ defaults:
       name: t_native_test_ext_pool_together
       project: pool-together
       binary_type: native
-      nodejs_version: '16.18'
+      image: cimg/node:16.18
 
   - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
       <<: *requires_b_ubu_static
       name: t_native_test_ext_perpetual_pools
       project: perpetual-pools
       binary_type: native
-      nodejs_version: '18.11'
+      image: cimg/node:18.11
 
   - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
       <<: *requires_b_ubu_static
       name: t_native_test_ext_uniswap
       project: uniswap
       binary_type: native
-      nodejs_version: '16.18'
+      image: cimg/node:16.18
 
   - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
       <<: *requires_b_ubu_static
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
-      nodejs_version: '18.11'
+      image: cimg/node:18.11
 
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
       <<: *requires_b_ubu_static
@@ -630,14 +630,14 @@ defaults:
       name: t_native_test_ext_brink
       project: brink
       binary_type: native
-      nodejs_version: '18.11'
+      image: cimg/node:18.11
 
   - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
       <<: *requires_b_ubu_static
       name: t_native_test_ext_chainlink
       project: chainlink
       binary_type: native
-      nodejs_version: '16.18'
+      image: cimg/node:16.18
       resource_class: large # Tests run out of memory on a smaller machine
 
   - job_native_test_ext_gp2: &job_native_test_ext_gp2
@@ -645,14 +645,14 @@ defaults:
       name: t_native_test_ext_gp2
       project: gp2
       binary_type: native
-      nodejs_version: '18.11'
+      image: cimg/node:18.11
 
   - job_ems_test_ext_colony: &job_ems_test_ext_colony
       <<: *requires_b_ems
       name: t_ems_test_ext_colony
       project: colony
       binary_type: solcjs
-      nodejs_version: '14.20'
+      image: cimg/node:14.20
       resource_class: medium
       python2: true
 
@@ -1239,7 +1239,7 @@ jobs:
       compile_only:
         type: integer
         default: 0
-      nodejs_version:
+      image:
         type: string
         default: current
       resource_class:
@@ -1249,7 +1249,7 @@ jobs:
         type: boolean
         default: false
     docker:
-      - image: cimg/node:<<parameters.nodejs_version>>
+      - image: <<parameters.image>>
     resource_class: <<parameters.resource_class>>
     # NOTE: Each external test runs up to 6 independent settings presets. If parallelism is higher than
     # actual preset count, some runs will exit immediately. If it's lower, some runs will get more than one preset.

From a968f1a18c07717aa30a60bf29aa0884cbcb6895 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 19 Apr 2023 00:53:28 +0200
Subject: [PATCH 1319/1748] Fix default image

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1fb2cc92f5..90c69e9ffb 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1241,7 +1241,7 @@ jobs:
         default: 0
       image:
         type: string
-        default: current
+        default: cimg/node:current
       resource_class:
         type: string
         default: small

From f53c0375de6b7c8fe94916e09f63b81ce8094988 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 19 Apr 2023 00:57:00 +0200
Subject: [PATCH 1320/1748] Fix ci parameters style

---
 .circleci/config.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 90c69e9ffb..cfeff3f95a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1249,14 +1249,14 @@ jobs:
         type: boolean
         default: false
     docker:
-      - image: <<parameters.image>>
-    resource_class: <<parameters.resource_class>>
+      - image: << parameters.image >>
+    resource_class: << parameters.resource_class >>
     # NOTE: Each external test runs up to 6 independent settings presets. If parallelism is higher than
     # actual preset count, some runs will exit immediately. If it's lower, some runs will get more than one preset.
     parallelism: 6
     environment:
       TERM: xterm
-      COMPILE_ONLY: <<parameters.compile_only>>
+      COMPILE_ONLY: << parameters.compile_only >>
     steps:
       - checkout
       - attach_workspace:
@@ -1282,17 +1282,17 @@ jobs:
             equal: [<< parameters.binary_type >>, "solcjs"]
           steps:
             - run:
-                name: External <<parameters.project>> tests (solcjs)
+                name: External << parameters.project >> tests (solcjs)
                 command: |
-                  test/externalTests/<<parameters.project>>.sh solcjs /tmp/workspace/soljson.js
+                  test/externalTests/<< parameters.project >>.sh solcjs /tmp/workspace/soljson.js
       - when:
           condition:
             equal: [<< parameters.binary_type >>, "native"]
           steps:
             - run:
-                name: External <<parameters.project>> tests (native)
+                name: External << parameters.project >> tests (native)
                 command: |
-                  test/externalTests/<<parameters.project>>.sh native /tmp/workspace/solc/solc-static-linux
+                  test/externalTests/<< parameters.project >>.sh native /tmp/workspace/solc/solc-static-linux
       - store_artifacts:
           path: reports/externalTests/
       # persist_to_workspace fails if the directory does not exist and the test script will create

From 58555db42322608592496603e76f478c6334db69 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Tue, 4 Apr 2023 09:34:39 +0200
Subject: [PATCH 1321/1748] Fix text formatting of CI matrix notifications
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 .circleci/config.yml                          | 28 +------
 .../ci/notification/matrix_notification.sh    | 82 +++++++++++++++++++
 .../ci/notification/templates/build_fail.json |  6 ++
 .../notification/templates/build_release.json |  6 ++
 .../notification/templates/build_success.json |  6 ++
 5 files changed, 101 insertions(+), 27 deletions(-)
 create mode 100755 scripts/ci/notification/matrix_notification.sh
 create mode 100644 scripts/ci/notification/templates/build_fail.json
 create mode 100644 scripts/ci/notification/templates/build_release.json
 create mode 100644 scripts/ci/notification/templates/build_success.json

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e189ea07b0..6d972ca19d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,33 +47,7 @@ commands:
       - run:
           name: "Matrix notification"
           when: << parameters.condition >>
-          command: |
-            # FIXME: Checking $CIRCLE_PULL_REQUEST would be better than hard-coding branch names
-            # but it's broken. CircleCI associates runs on develop/breaking with random old PRs.
-            [[ $CIRCLE_BRANCH == develop || $CIRCLE_BRANCH == breaking ]] || { echo "Running on a PR or a feature branch - notification skipped."; exit 0; }
-
-            # Workflow name is not exposed as an env variable. Has to be queried from the API.
-            # The name is not critical so if anything fails, use the raw workflow ID as a fallback.
-            workflow_info=$(curl --silent "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}") || true
-            workflow_name=$(echo "$workflow_info" | grep -E '"\s*name"\s*:\s*".*"' | cut -d \" -f 4 || echo "$CIRCLE_WORKFLOW_ID")
-
-            [[ $CIRCLE_NODE_TOTAL == 1 ]] && job="**${CIRCLE_JOB}**"
-            [[ $CIRCLE_NODE_TOTAL != 1 ]] && job="**${CIRCLE_JOB}** (run $((CIRCLE_NODE_INDEX + 1))/${CIRCLE_NODE_TOTAL})"
-
-            [[ "<< parameters.event >>" == "failure" ]] && message=" ❌ [${workflow_name}] Job ${job} failed on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
-            [[ "<< parameters.event >>" == "success" ]] && message=" ✅ [${workflow_name}] Job ${job} succeeded on **${CIRCLE_BRANCH}**. Please see [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}) for details."
-            [[ "<< parameters.event >>" == "release" ]] && message=" 📦 Release binaries for version **${CIRCLE_TAG}** are ready and attached as artifacts to [build ${CIRCLE_BUILD_NUM}](${CIRCLE_BUILD_URL}). **Please make sure the whole workflow succeeded before using them.**"
-
-            # The release notification only makes sense on tagged commits. If the commit is untagged, just bail out.
-            [[ "<< parameters.event >>" == "release" ]] && { [[ $CIRCLE_TAG != "" ]] || { echo "Not a tagged commit - notification skipped."; exit 0; } }
-
-            curl "https://${MATRIX_SERVER}/_matrix/client/v3/rooms/${MATRIX_NOTIFY_ROOM_ID}/send/m.room.message" \
-              --request POST \
-              --include \
-              --header "Content-Type: application/json" \
-              --header "Accept: application/json" \
-              --header "Authorization: Bearer ${MATRIX_ACCESS_TOKEN}" \
-              --data "{\"msgtype\":\"m.text\", \"body\":\"${message}\"}"
+          command: scripts/ci/notification/matrix_notification.sh << parameters.event >>
 
   matrix_notify_failure_unless_pr:
     description: "Posts a failure notification to the main room on Matrix (if not running on a PR)."
diff --git a/scripts/ci/notification/matrix_notification.sh b/scripts/ci/notification/matrix_notification.sh
new file mode 100755
index 0000000000..ecf14d3e5d
--- /dev/null
+++ b/scripts/ci/notification/matrix_notification.sh
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+set -euo pipefail
+shopt -s inherit_errexit
+
+SCRIPT_DIR="$(dirname "$0")"
+
+function fail() {
+    printf '%s\n' "$1" >&2
+    exit 1
+}
+
+function notify() {
+    [[ -z "$1" ]] && fail "Event type not provided."
+    [[ "$1" != "failure" && "$1" != "success" && "$1" != "release" ]] && fail "Wrong event type."
+    local event="$1"
+    local formatted_message
+
+    # FIXME: Checking $CIRCLE_PULL_REQUEST would be better than hard-coding branch names
+    # but it's broken. CircleCI associates runs on develop/breaking with random old PRs.
+    [[ "$BRANCH" == "develop" || "$BRANCH" == "breaking" ]] || { echo "Running on a PR or a feature branch - notification skipped."; exit 0; }
+
+    # The release notification only makes sense on tagged commits. If the commit is untagged, just bail out.
+    [[ "$event" == "release" ]] && { [[ $TAG != "" ]] || { echo "Not a tagged commit - notification skipped."; exit 0; } }
+
+    formatted_message="$(format_predefined_message "$event")"
+
+    curl "https://${MATRIX_SERVER}/_matrix/client/v3/rooms/${MATRIX_NOTIFY_ROOM_ID}/send/m.room.message" \
+        --request POST \
+        --include \
+        --header "Content-Type: application/json" \
+        --header "Accept: application/json" \
+        --header "Authorization: Bearer ${MATRIX_ACCESS_TOKEN}" \
+        --data "$formatted_message"
+}
+
+function circleci_workflow_name() {
+    # Workflow name is not exposed as an env variable. Has to be queried from the API.
+    # The name is not critical so if anything fails, use the raw workflow ID as a fallback.
+    local workflow_info
+    workflow_info=$(curl --silent "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}") || true
+    echo "$workflow_info" | grep -E '"\s*name"\s*:\s*".*"' | cut -d \" -f 4 || echo "$CIRCLE_WORKFLOW_ID"
+}
+
+function circleci_job_name() {
+    (( CIRCLE_NODE_TOTAL == 1 )) && echo "${CIRCLE_JOB}" && return
+    (( CIRCLE_NODE_TOTAL != 1 )) && echo "${CIRCLE_JOB} (run $((CIRCLE_NODE_INDEX + 1))/${CIRCLE_NODE_TOTAL})"
+}
+
+# Currently matrix only supports html formatted body,
+# see: https://spec.matrix.org/v1.6/client-server-api/#mtext
+#
+# Eventually, the matrix api will have support for better format options and `formatted_body` may not be necessary anymore:
+# https://github.com/matrix-org/matrix-spec-proposals/pull/1767
+function format_predefined_message() {
+    [[ -z "$1" ]] && fail "Event type not provided."
+    local event="$1"
+    local template
+
+    [[ "$event" == "failure" ]] && template="${SCRIPT_DIR}/templates/build_fail.json"
+    [[ "$event" == "success" ]] && template="${SCRIPT_DIR}/templates/build_success.json"
+    [[ "$event" == "release" ]] && template="${SCRIPT_DIR}/templates/build_release.json"
+
+    [[ -z "$template" ]] && fail "Message template for event [$event] not defined."
+
+    # Export variables that must be substituted
+    export WORKFLOW_NAME JOB BRANCH TAG BUILD_URL BUILD_NUM
+    envsubst < "$template"
+    unset WORKFLOW_NAME JOB BRANCH TAG BUILD_URL BUILD_NUM
+}
+
+# Set message environment variables based on CI backend
+if [[ "$CIRCLECI" = true ]] ; then
+    BRANCH="$CIRCLE_BRANCH"
+    TAG="$CIRCLE_TAG"
+    BUILD_URL="$CIRCLE_BUILD_URL"
+    BUILD_NUM="$CIRCLE_BUILD_NUM"
+    WORKFLOW_NAME="$(circleci_workflow_name)"
+    JOB="$(circleci_job_name)"
+fi
+
+notify "$@"
diff --git a/scripts/ci/notification/templates/build_fail.json b/scripts/ci/notification/templates/build_fail.json
new file mode 100644
index 0000000000..baf69aa4a0
--- /dev/null
+++ b/scripts/ci/notification/templates/build_fail.json
@@ -0,0 +1,6 @@
+{
+    "msgtype": "m.text",
+    "body": " ❌ [${WORKFLOW_NAME}] Job ${JOB} failed on ${BRANCH}. Please see ${BUILD_URL} for details.",
+    "format": "org.matrix.custom.html",
+    "formatted_body": " ❌ [${WORKFLOW_NAME}] Job <strong>${JOB}</strong> failed on <strong>${BRANCH}</strong>. Please see <a href=\"${BUILD_URL}\">build ${BUILD_NUM}</a> for details."
+}
diff --git a/scripts/ci/notification/templates/build_release.json b/scripts/ci/notification/templates/build_release.json
new file mode 100644
index 0000000000..b7c538f8ce
--- /dev/null
+++ b/scripts/ci/notification/templates/build_release.json
@@ -0,0 +1,6 @@
+{
+    "msgtype": "m.text",
+    "body": " 📦 Release binaries for version ${TAG} are ready and attached as artifacts to ${BUILD_URL}. Please make sure the whole workflow succeeded before using them.",
+    "format": "org.matrix.custom.html",
+    "formatted_body": " 📦 Release binaries for version <strong>${TAG}</strong> are ready and attached as artifacts to <a href=\"${BUILD_URL}\">build ${BUILD_NUM}</a>. <strong>Please make sure the whole workflow succeeded before using them.</strong>"
+}
diff --git a/scripts/ci/notification/templates/build_success.json b/scripts/ci/notification/templates/build_success.json
new file mode 100644
index 0000000000..170360fbb8
--- /dev/null
+++ b/scripts/ci/notification/templates/build_success.json
@@ -0,0 +1,6 @@
+{
+    "msgtype": "m.text",
+    "body": " ✅ [${WORKFLOW_NAME}] Job ${JOB} succeeded on ${BRANCH}. Please see ${BUILD_URL} for details.",
+    "format": "org.matrix.custom.html",
+    "formatted_body":" ✅ [${WORKFLOW_NAME}] Job <strong>${JOB}</strong> succeeded on <strong>${BRANCH}</strong>. Please see <a href=\"${BUILD_URL}\">build ${BUILD_NUM}</a> for details."
+}

From 61beb321b653543771fb192c027f316f58fc1172 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 19 Apr 2023 14:14:56 +0200
Subject: [PATCH 1322/1748] Bump ubuntu 2004 and 2204 images

---
 .circleci/config.yml                                | 12 ++++++------
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 |  2 +-
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cfeff3f95a..9ee3ccb235 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,16 +9,16 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-17
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:87c63f4c0e9be15b60417809cd3245892db281af0f80ed7378a1978f6f170029"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-18
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:db35d88a16f19adfac6dfd88bda4b32a85a82430f28830aad97bcd10fa4f846c"
   ubuntu-2204-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-2
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7f0b62da2aa0920660e67cd17fb3a7f6c57d7da72454003056f3bd27bbda2075"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-3
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:73e4e80128a0596c3ddb36e36e8039514a9f33ca8799bec82060a49b0cdae461"
   ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-1
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e515710752bfb38ee0e9b2f92ca71612c03ed85290c36c3b3c0a3d9f90187aef"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-2
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0d4fa1da806f9b3daabd2d1dc0842899af794a838e475c14045c3fb289cc8103"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-23
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 7ef5cde7e9..682beea20f 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="17"
+LABEL version="18"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index e45342c58f..73ef9f4376 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="2"
+LABEL version="3"
 
 ARG DEBIAN_FRONTEND=noninteractive
 

From 34da6c88111a0245e5ffb9bfbd192310488980d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 20 Apr 2023 13:39:08 +0200
Subject: [PATCH 1323/1748] Remove the inaccurate Type::categoryName() and
 change the error message for invalid calls to one independent of the category

---
 libsolidity/analysis/TypeChecker.cpp          |  6 +---
 libsolidity/ast/Types.cpp                     | 29 -------------------
 libsolidity/ast/Types.h                       |  2 --
 libsolutil/StringUtils.h                      |  9 ------
 .../functionCalls/enum_value_not_callable.sol |  2 +-
 .../functionCalls/int_not_callable.sol        |  2 +-
 .../functionCalls/magic_not_callable.sol      |  2 +-
 .../functionCalls/mapping_not_callable.sol    |  2 +-
 .../functionCalls/modifier_not_callable.sol   |  2 +-
 .../functionCalls/module_not_callable.sol     |  2 +-
 .../functionCalls/this_not_callable.sol       |  2 +-
 .../462_callable_crash.sol                    |  2 +-
 .../492_do_not_crash_on_not_lvalue.sol        |  2 +-
 ...ariable_function_conflict_former_crash.sol |  2 +-
 .../tupleAssignments/double_storage_crash.sol |  2 +-
 .../syntaxTests/types/function_call_fail.sol  |  2 +-
 16 files changed, 13 insertions(+), 57 deletions(-)

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index f0d4ecda3d..e7721fd9e5 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -2847,11 +2847,7 @@ bool TypeChecker::visit(FunctionCall const& _functionCall)
 	}
 
 	default:
-		m_errorReporter.fatalTypeError(
-			5704_error,
-			_functionCall.location(),
-			capitalized(Type::categoryName(expressionType->category())) + " is not callable."
-		);
+		m_errorReporter.fatalTypeError(5704_error, _functionCall.location(), "This expression is not callable.");
 		// Unreachable, because fatalTypeError throws. We don't set kind, but that's okay because the switch below
 		// is never reached. And, even if it was, SetOnce would trigger an assertion violation and not UB.
 		funcCallAnno.isPure = argumentsArePure;
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index a8134fa3bb..1218baee3a 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -294,35 +294,6 @@ Type const* Type::commonType(Type const* _a, Type const* _b)
 		return nullptr;
 }
 
-char const* Type::categoryName(Type::Category _category)
-{
-	switch (_category)
-	{
-	case Category::Address: return "address";
-	case Category::Integer: return "integer";
-	case Category::RationalNumber: return "rational number literal";
-	case Category::StringLiteral: return "string literal";
-	case Category::Bool: return "boolean";
-	case Category::FixedPoint: return "fixed-point number";
-	case Category::Array: return "array";
-	case Category::ArraySlice: return "array slice";
-	case Category::FixedBytes: return "fixed-size byte array";
-	case Category::Contract: return "contract";
-	case Category::Struct: return "struct";
-	case Category::Function: return "function";
-	case Category::Enum: return "enum";
-	case Category::UserDefinedValueType: return "user-defined value type";
-	case Category::Tuple: return "tuple";
-	case Category::Mapping: return "mapping";
-	case Category::TypeType: return "type of a type";
-	case Category::Modifier: return "modifier";
-	case Category::Magic: return "magic variable";
-	case Category::Module: return "module";
-	case Category::InaccessibleDynamic: return "inaccessible dynamic value";
-	}
-	util::unreachable();
-}
-
 MemberList const& Type::members(ASTNode const* _currentScope) const
 {
 	if (!m_members[_currentScope])
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 9c6389a29a..fa1a299a97 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -201,8 +201,6 @@ class Type
 	static Type const* commonType(Type const* _a, Type const* _b);
 
 	virtual Category category() const = 0;
-	static char const* categoryName(Type::Category _category);
-
 	/// @returns a valid solidity identifier such that two types should compare equal if and
 	/// only if they have the same identifier.
 	/// The identifier should start with "t_".
diff --git a/libsolutil/StringUtils.h b/libsolutil/StringUtils.h
index b01dba63b3..0d5bc7839b 100644
--- a/libsolutil/StringUtils.h
+++ b/libsolutil/StringUtils.h
@@ -160,15 +160,6 @@ inline std::string toLower(std::string _s)
 	return _s;
 }
 
-/// Returns a copy of the string with the first character converted to its uppercase equivalent.
-/// Uses the classic "C" locale semantics.
-inline std::string capitalized(std::string _s)
-{
-	if (_s.size() > 0)
-		_s[0] = toUpper(_s[0]);
-	return _s;
-}
-
 /// Checks whether _c is a decimal digit character. It uses the classic "C" locale semantics.
 /// @param _c character to be checked
 /// @return true if _c is a decimal digit character, false otherwise
diff --git a/test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol
index 0735f446f2..f2d7cd1b2b 100644
--- a/test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/enum_value_not_callable.sol
@@ -4,4 +4,4 @@ contract C {
     uint a = E.B(1000);
 }
 // ----
-// TypeError 5704: (46-55): Enum is not callable.
+// TypeError 5704: (46-55): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
index 5481ff1a35..e1ddbc7db7 100644
--- a/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/int_not_callable.sol
@@ -5,4 +5,4 @@ contract C
     }
 }
 // ----
-// TypeError 5704: (53-60): Rational number literal is not callable.
+// TypeError 5704: (53-60): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol
index b74685d4bd..c93f0bb88b 100644
--- a/test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/magic_not_callable.sol
@@ -2,4 +2,4 @@ contract C {
     uint a = msg(1000);
 }
 // ----
-// TypeError 5704: (26-35): Magic variable is not callable.
+// TypeError 5704: (26-35): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol
index d067129990..e5258b62be 100644
--- a/test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/mapping_not_callable.sol
@@ -3,4 +3,4 @@ contract C {
     uint a = m(1000);
 }
 // ----
-// TypeError 5704: (56-63): Mapping is not callable.
+// TypeError 5704: (56-63): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol
index 31ef66fe17..0f41072ec6 100644
--- a/test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/modifier_not_callable.sol
@@ -4,4 +4,4 @@ contract C {
     modifier m(uint) { _; }
 }
 // ----
-// TypeError 5704: (26-33): Modifier is not callable.
+// TypeError 5704: (26-33): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol
index 63debdab7a..1415810ae2 100644
--- a/test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/module_not_callable.sol
@@ -6,4 +6,4 @@ contract C {
     uint a = A(1000);
 }
 // ----
-// TypeError 5704: (B.sol:48-55): Module is not callable.
+// TypeError 5704: (B.sol:48-55): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol b/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
index 35c04d4735..8de5683bc8 100644
--- a/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
+++ b/test/libsolidity/syntaxTests/functionCalls/this_not_callable.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (72-78): Contract is not callable.
+// TypeError 5704: (72-78): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
index 6c5539e3b7..1f9e7a1a05 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/462_callable_crash.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (90-108): Rational number literal is not callable.
+// TypeError 5704: (90-108): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
index 595785e93d..d46920d1db 100644
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
+++ b/test/libsolidity/syntaxTests/nameAndTypeResolution/492_do_not_crash_on_not_lvalue.sol
@@ -6,4 +6,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (153-157): Mapping is not callable.
+// TypeError 5704: (153-157): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol b/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
index eeef3e7ea4..f44ca63fd1 100644
--- a/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
+++ b/test/libsolidity/syntaxTests/scoping/state_variable_function_conflict_former_crash.sol
@@ -11,4 +11,4 @@ contract SomeContract {
 }
 // ----
 // DeclarationError 2333: (106-145): Identifier already declared.
-// TypeError 5704: (185-195): Integer is not callable.
+// TypeError 5704: (185-195): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol b/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
index 701af022b1..b4bbb73675 100644
--- a/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
+++ b/test/libsolidity/syntaxTests/tupleAssignments/double_storage_crash.sol
@@ -7,4 +7,4 @@ contract CrashContract {
        }
 }
 // ----
-// TypeError 5704: (170-177): Rational number literal is not callable.
+// TypeError 5704: (170-177): This expression is not callable.
diff --git a/test/libsolidity/syntaxTests/types/function_call_fail.sol b/test/libsolidity/syntaxTests/types/function_call_fail.sol
index 042b78f017..67631bc2bf 100644
--- a/test/libsolidity/syntaxTests/types/function_call_fail.sol
+++ b/test/libsolidity/syntaxTests/types/function_call_fail.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 5704: (59-63): Rational number literal is not callable.
+// TypeError 5704: (59-63): This expression is not callable.

From 2f78e9549af0ce9c31a241785d7fc68a44f4e1f7 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 1 Nov 2022 23:58:45 -0500
Subject: [PATCH 1324/1748] Misc small refactors: Superfluous std::, trailing
 commas in lists, whitespace, missing breaks, import order

---
 libevmasm/Assembly.cpp                  |  6 +++---
 libevmasm/AssemblyItem.cpp              |  8 ++++----
 libsolidity/interface/CompilerStack.cpp | 16 +++++++---------
 scripts/ASTImportTest.sh                |  1 +
 solc/CommandLineInterface.cpp           | 15 ++++++++-------
 solc/CommandLineInterface.h             |  2 +-
 solc/CommandLineParser.cpp              |  6 +++---
 solc/CommandLineParser.h                |  4 ++--
 8 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index e861034168..b9b946aa59 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -244,7 +244,7 @@ Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices,
 		jsonItem["end"] = item.location().end;
 		if (item.m_modifierDepth != 0)
 			jsonItem["modifierDepth"] = static_cast<int>(item.m_modifierDepth);
-		std::string jumpType = item.getJumpTypeAsString();
+		string jumpType = item.getJumpTypeAsString();
 		if (!jumpType.empty())
 			jsonItem["jumpType"] = jumpType;
 		if (name == "PUSHLIB")
@@ -286,7 +286,7 @@ Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices,
 
 		for (size_t i = 0; i < m_subs.size(); ++i)
 		{
-			std::stringstream hexStr;
+			stringstream hexStr;
 			hexStr << hex << i;
 			data[hexStr.str()] = m_subs[i]->assemblyJSON(_sourceIndices, /*_includeSourceList = */false);
 		}
@@ -341,7 +341,7 @@ Assembly& Assembly::optimise(OptimiserSettings const& _settings)
 
 map<u256, u256> const& Assembly::optimiseInternal(
 	OptimiserSettings const& _settings,
-	std::set<size_t> _tagsReferencedFromOutside
+	set<size_t> _tagsReferencedFromOutside
 )
 {
 	if (m_tagReplacements)
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
index ce60c25161..5661fb9402 100644
--- a/libevmasm/AssemblyItem.cpp
+++ b/libevmasm/AssemblyItem.cpp
@@ -42,8 +42,8 @@ namespace
 
 string toStringInHex(u256 _value)
 {
-	std::stringstream hexStr;
-	hexStr << std::uppercase << hex << _value;
+	stringstream hexStr;
+	hexStr << uppercase << hex << _value;
 	return hexStr.str();
 }
 
@@ -158,7 +158,7 @@ size_t AssemblyItem::bytesRequired(size_t _addressLength, Precision _precision)
 			return 2;
 	}
 	case VerbatimBytecode:
-		return std::get<2>(*m_verbatimBytecode).size();
+		return get<2>(*m_verbatimBytecode).size();
 	default:
 		break;
 	}
@@ -411,7 +411,7 @@ size_t AssemblyItem::opcodeCount() const noexcept
 	}
 }
 
-std::string AssemblyItem::computeSourceMapping(
+string AssemblyItem::computeSourceMapping(
 	AssemblyItems const& _items,
 	map<string, unsigned> const& _sourceIndicesMap
 )
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 7f2b152619..e02d6afeeb 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -94,7 +94,6 @@ using namespace solidity::langutil;
 using namespace solidity::frontend;
 
 using solidity::util::errinfo_comment;
-using solidity::util::toHex;
 
 static int g_compilerStackCounts = 0;
 
@@ -241,7 +240,7 @@ void CompilerStack::setModelCheckerSettings(ModelCheckerSettings _settings)
 	m_modelCheckerSettings = _settings;
 }
 
-void CompilerStack::setLibraries(std::map<std::string, util::h160> const& _libraries)
+void CompilerStack::setLibraries(map<string, util::h160> const& _libraries)
 {
 	if (m_stackState >= ParsedAndImported)
 		solThrow(CompilerError, "Must set libraries before parsing.");
@@ -814,7 +813,6 @@ Json::Value CompilerStack::generatedSources(string const& _contractName, bool _r
 				sources[0]["id"] = sourceIndex;
 				sources[0]["language"] = "Yul";
 				sources[0]["contents"] = std::move(source);
-
 			}
 		}
 		return sources;
@@ -851,7 +849,7 @@ string const* CompilerStack::runtimeSourceMapping(string const& _contractName) c
 	return c.runtimeSourceMapping ? &*c.runtimeSourceMapping : nullptr;
 }
 
-std::string const CompilerStack::filesystemFriendlyName(string const& _contractName) const
+string const CompilerStack::filesystemFriendlyName(string const& _contractName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "No compiled contracts found.");
@@ -865,7 +863,7 @@ std::string const CompilerStack::filesystemFriendlyName(string const& _contractN
 				contract.second.contract != matchContract.contract)
 		{
 			// If it does, then return its fully-qualified name, made fs-friendly
-			std::string friendlyName = boost::algorithm::replace_all_copy(_contractName, "/", "_");
+			string friendlyName = boost::algorithm::replace_all_copy(_contractName, "/", "_");
 			boost::algorithm::replace_all(friendlyName, ":", "_");
 			boost::algorithm::replace_all(friendlyName, ".", "_");
 			return friendlyName;
@@ -1117,7 +1115,7 @@ ContractDefinition const& CompilerStack::contractDefinition(string const& _contr
 }
 
 size_t CompilerStack::functionEntryPoint(
-	std::string const& _contractName,
+	string const& _contractName,
 	FunctionDefinition const& _function
 ) const
 {
@@ -1287,8 +1285,8 @@ bool onlySafeExperimentalFeaturesActivated(set<ExperimentalFeature> const& featu
 
 void CompilerStack::assemble(
 	ContractDefinition const& _contract,
-	std::shared_ptr<evmasm::Assembly> _assembly,
-	std::shared_ptr<evmasm::Assembly> _runtimeAssembly
+	shared_ptr<evmasm::Assembly> _assembly,
+	shared_ptr<evmasm::Assembly> _runtimeAssembly
 )
 {
 	solAssert(m_stackState >= AnalysisPerformed, "");
@@ -1599,7 +1597,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 	}
 
 	static_assert(sizeof(m_optimiserSettings.expectedExecutionsPerDeployment) <= sizeof(Json::LargestUInt), "Invalid word size.");
-	solAssert(static_cast<Json::LargestUInt>(m_optimiserSettings.expectedExecutionsPerDeployment) < std::numeric_limits<Json::LargestUInt>::max(), "");
+	solAssert(static_cast<Json::LargestUInt>(m_optimiserSettings.expectedExecutionsPerDeployment) < numeric_limits<Json::LargestUInt>::max(), "");
 	meta["settings"]["optimizer"]["runs"] = Json::Value(Json::LargestUInt(m_optimiserSettings.expectedExecutionsPerDeployment));
 
 	/// Backwards compatibility: If set to one of the default settings, do not provide details.
diff --git a/scripts/ASTImportTest.sh b/scripts/ASTImportTest.sh
index 31faaf9d96..4d6bc56d5f 100755
--- a/scripts/ASTImportTest.sh
+++ b/scripts/ASTImportTest.sh
@@ -19,6 +19,7 @@
 # (c) solidity contributors.
 # ------------------------------------------------------------------------------
 # Bash script to test the import/exports.
+#
 # ast import/export tests:
 #   - first exporting a .sol file to JSON, then loading it into the compiler
 #     and exporting it again. The second JSON should be identical to the first.
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index e9688cda3f..f972fec29f 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -92,7 +92,7 @@ namespace
 
 set<frontend::InputMode> const CompilerInputModes{
 	frontend::InputMode::Compiler,
-	frontend::InputMode::CompilerWithASTImport
+	frontend::InputMode::CompilerWithASTImport,
 };
 
 } // anonymous namespace
@@ -202,7 +202,7 @@ void CommandLineInterface::handleOpcode(string const& _contract)
 	else
 	{
 		sout() << "Opcodes:" << endl;
-		sout() << std::uppercase << evmasm::disassemble(m_compiler->object(_contract).bytecode, m_options.output.evmVersion);
+		sout() << uppercase << evmasm::disassemble(m_compiler->object(_contract).bytecode, m_options.output.evmVersion);
 		sout() << endl;
 	}
 }
@@ -351,8 +351,8 @@ void CommandLineInterface::handleNatspec(bool _natspecDev, string const& _contra
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	bool enabled = false;
-	std::string suffix;
-	std::string title;
+	string suffix;
+	string title;
 
 	if (_natspecDev)
 	{
@@ -369,7 +369,7 @@ void CommandLineInterface::handleNatspec(bool _natspecDev, string const& _contra
 
 	if (enabled)
 	{
-		std::string output = jsonPrint(
+		string output = jsonPrint(
 			removeNullMembers(
 				_natspecDev ?
 				m_compiler->natspecDev(_contract) :
@@ -461,7 +461,7 @@ void CommandLineInterface::readInputFiles()
 	for (boost::filesystem::path const& allowedDirectory: m_options.input.allowedDirectories)
 		m_fileReader.allowDirectory(allowedDirectory);
 
-	map<std::string, set<boost::filesystem::path>> collisions =
+	map<string, set<boost::filesystem::path>> collisions =
 		m_fileReader.detectSourceUnitNameCollisions(m_options.input.paths);
 	if (!collisions.empty())
 	{
@@ -551,7 +551,7 @@ map<string, Json::Value> CommandLineInterface::parseAstFromInput()
 
 		for (auto& src: ast["sources"].getMemberNames())
 		{
-			std::string astKey = ast["sources"][src].isMember("ast") ? "ast" : "AST";
+			string astKey = ast["sources"][src].isMember("ast") ? "ast" : "AST";
 
 			astAssert(ast["sources"][src].isMember(astKey), "astkey is not member");
 			astAssert(ast["sources"][src][astKey]["nodeType"].asString() == "SourceUnit",  "Top-level node should be a 'SourceUnit'");
@@ -671,6 +671,7 @@ void CommandLineInterface::processInput()
 	case InputMode::CompilerWithASTImport:
 		compile();
 		outputCompilationResults();
+		break;
 	}
 }
 
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 0eb69027ad..3a62f9bf8d 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -27,8 +27,8 @@
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/DebugSettings.h>
 #include <libsolidity/interface/FileReader.h>
-#include <libsolidity/interface/UniversalCallback.h>
 #include <libsolidity/interface/SMTSolverCommand.h>
+#include <libsolidity/interface/UniversalCallback.h>
 #include <libyul/YulStack.h>
 
 #include <iostream>
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 6140df2e78..a3e7829660 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -926,7 +926,7 @@ void CommandLineParser::processArgs()
 		g_strStrictAssembly,
 		g_strYul,
 		g_strImportAst,
-		g_strLSP
+		g_strLSP,
 	});
 
 	if (m_args.count(g_strHelp) > 0)
@@ -1048,7 +1048,7 @@ void CommandLineParser::processArgs()
 	if (m_args.count(g_strRevertStrings))
 	{
 		string revertStringsString = m_args[g_strRevertStrings].as<string>();
-		std::optional<RevertStrings> revertStrings = revertStringsFromString(revertStringsString);
+		optional<RevertStrings> revertStrings = revertStringsFromString(revertStringsString);
 		if (!revertStrings)
 			solThrow(
 				CommandLineValidationError,
@@ -1142,7 +1142,7 @@ void CommandLineParser::processArgs()
 	if (m_args.count(g_strEVMVersion))
 	{
 		string versionOptionStr = m_args[g_strEVMVersion].as<string>();
-		std::optional<langutil::EVMVersion> versionOption = langutil::EVMVersion::fromString(versionOptionStr);
+		optional<langutil::EVMVersion> versionOption = langutil::EVMVersion::fromString(versionOptionStr);
 		if (!versionOption)
 			solThrow(CommandLineValidationError, "Invalid option for --" + g_strEVMVersion + ": " + versionOptionStr);
 		m_options.output.evmVersion = *versionOption;
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 7bcc8a0f0b..51efc9e408 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -56,7 +56,7 @@ enum class InputMode
 	StandardJson,
 	Linker,
 	Assembler,
-	LanguageServer
+	LanguageServer,
 };
 
 struct CompilerOutputs
@@ -295,4 +295,4 @@ class CommandLineParser
 	boost::program_options::variables_map m_args;
 };
 
-}
+} // namespace solidity::frontend

From ded9ef17e8508127c5ee732b78c27b5b6862b573 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 20 Apr 2023 19:47:26 +0200
Subject: [PATCH 1325/1748] Misc small refactors: Use ranges::views::keys and
 fmt::format()

---
 libsolidity/interface/CompilerStack.cpp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index e02d6afeeb..ce57cedb7e 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -82,6 +82,9 @@
 #include <boost/algorithm/string/replace.hpp>
 
 #include <range/v3/view/concat.hpp>
+#include <range/v3/view/map.hpp>
+
+#include <fmt/format.h>
 
 #include <utility>
 #include <map>
@@ -710,10 +713,11 @@ bool CompilerStack::compile(State _stopAfter)
 								1834_error,
 								Error::Type::CodeGenerationError,
 								*sourceLocation,
-								"Unimplemented feature error" +
-								((comment && !comment->empty()) ? ": " + *comment : string{}) +
-								" in " +
-								_unimplementedError.lineInfo()
+								fmt::format(
+									"Unimplemented feature error {} in {}",
+									(comment && !comment->empty()) ? ": " + *comment : "",
+									_unimplementedError.lineInfo()
+								)
 							);
 							return false;
 						}
@@ -949,10 +953,7 @@ Json::Value CompilerStack::assemblyJSON(string const& _contractName) const
 
 vector<string> CompilerStack::sourceNames() const
 {
-	vector<string> names;
-	for (auto const& s: m_sources)
-		names.push_back(s.first);
-	return names;
+	return ranges::to<vector>(m_sources | ranges::views::keys);
 }
 
 map<string, unsigned> CompilerStack::sourceIndices() const

From 611e02c038325fd042b500857e60b17858064c6d Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 1 Nov 2022 23:58:45 -0500
Subject: [PATCH 1326/1748] Rename assemble() to assembleYul() in CompilerStack
 and CommandLineInterface

---
 libsolidity/interface/CompilerStack.cpp | 6 +++---
 libsolidity/interface/CompilerStack.h   | 2 +-
 solc/CommandLineInterface.cpp           | 4 ++--
 solc/CommandLineInterface.h             | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index ce57cedb7e..02aa38c046 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1284,7 +1284,7 @@ bool onlySafeExperimentalFeaturesActivated(set<ExperimentalFeature> const& featu
 }
 }
 
-void CompilerStack::assemble(
+void CompilerStack::assembleYul(
 	ContractDefinition const& _contract,
 	shared_ptr<evmasm::Assembly> _assembly,
 	shared_ptr<evmasm::Assembly> _runtimeAssembly
@@ -1397,7 +1397,7 @@ void CompilerStack::compileContract(
 
 	_otherCompilers[compiledContract.contract] = compiler;
 
-	assemble(_contract, compiler->assemblyPtr(), compiler->runtimeAssemblyPtr());
+	assembleYul(_contract, compiler->assemblyPtr(), compiler->runtimeAssemblyPtr());
 }
 
 void CompilerStack::generateIR(ContractDefinition const& _contract)
@@ -1475,7 +1475,7 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 	string deployedName = IRNames::deployedObject(_contract);
 	solAssert(!deployedName.empty(), "");
 	tie(compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly) = stack.assembleEVMWithDeployed(deployedName);
-	assemble(_contract, compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly);
+	assembleYul(_contract, compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly);
 }
 
 void CompilerStack::generateEwasm(ContractDefinition const& _contract)
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index cd74214058..650d8e46f8 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -426,7 +426,7 @@ class CompilerStack: public langutil::CharStreamProvider
 
 	/// Assembles the contract.
 	/// This function should only be internally called by compileContract and generateEVMFromIR.
-	void assemble(
+	void assembleYul(
 		ContractDefinition const& _contract,
 		std::shared_ptr<evmasm::Assembly> _assembly,
 		std::shared_ptr<evmasm::Assembly> _runtimeAssembly
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index f972fec29f..5037552c33 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -661,7 +661,7 @@ void CommandLineInterface::processInput()
 		serveLSP();
 		break;
 	case InputMode::Assembler:
-		assemble(m_options.assembly.inputLanguage, m_options.assembly.targetMachine);
+		assembleYul(m_options.assembly.inputLanguage, m_options.assembly.targetMachine);
 		break;
 	case InputMode::Linker:
 		link();
@@ -1030,7 +1030,7 @@ string CommandLineInterface::objectWithLinkRefsHex(evmasm::LinkerObject const& _
 	return out;
 }
 
-void CommandLineInterface::assemble(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine)
+void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine)
 {
 	solAssert(m_options.input.mode == InputMode::Assembler);
 
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 3a62f9bf8d..80b4bee6fb 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -92,7 +92,7 @@ class CommandLineInterface
 	/// @returns the full object with library placeholder hints in hex.
 	static std::string objectWithLinkRefsHex(evmasm::LinkerObject const& _obj);
 
-	void assemble(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine);
+	void assembleYul(yul::YulStack::Language _language, yul::YulStack::Machine _targetMachine);
 
 	void outputCompilationResults();
 

From f5b2044ed11d5d513b4595287228d5c1fc603dcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 20 Apr 2023 19:47:46 +0200
Subject: [PATCH 1327/1748] Remove unused CompilerStack::m_sourceJsons

---
 libsolidity/interface/CompilerStack.cpp | 5 ++---
 libsolidity/interface/CompilerStack.h   | 2 --
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 02aa38c046..ad2618bc0a 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -407,15 +407,14 @@ void CompilerStack::importASTs(map<string, Json::Value> const& _sources)
 {
 	if (m_stackState != Empty)
 		solThrow(CompilerError, "Must call importASTs only before the SourcesSet state.");
-	m_sourceJsons = _sources;
-	map<string, ASTPointer<SourceUnit>> reconstructedSources = ASTJsonImporter(m_evmVersion).jsonToSourceUnit(m_sourceJsons);
+	map<string, ASTPointer<SourceUnit>> reconstructedSources = ASTJsonImporter(m_evmVersion).jsonToSourceUnit(_sources);
 	for (auto& src: reconstructedSources)
 	{
 		string const& path = src.first;
 		Source source;
 		source.ast = src.second;
 		source.charStream = make_shared<CharStream>(
-			util::jsonCompactPrint(m_sourceJsons[src.first]),
+			util::jsonCompactPrint(_sources.at(src.first)),
 			src.first,
 			true // imported from AST
 		);
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 650d8e46f8..36e462330b 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -514,8 +514,6 @@ class CompilerStack: public langutil::CharStreamProvider
 	std::map<std::string, util::h160> m_libraries;
 	ImportRemapper m_importRemapper;
 	std::map<std::string const, Source> m_sources;
-	// if imported, store AST-JSONS for each filename
-	std::map<std::string, Json::Value> m_sourceJsons;
 	std::vector<std::string> m_unhandledSMTLib2Queries;
 	std::map<util::h256, std::string> m_smtlib2Responses;
 	std::shared_ptr<GlobalContext> m_globalContext;

From 35a78f77bc9b55265c4521418d6dbd01ff6cdc32 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 1 Nov 2022 23:58:45 -0500
Subject: [PATCH 1328/1748] Add solRequire()

---
 libsolutil/Exceptions.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/libsolutil/Exceptions.h b/libsolutil/Exceptions.h
index 8ac7a5fae2..9d73a0012e 100644
--- a/libsolutil/Exceptions.h
+++ b/libsolutil/Exceptions.h
@@ -54,6 +54,15 @@ struct Exception: virtual std::exception, virtual boost::exception
 		::boost::throw_line(__LINE__) \
 	)
 
+/// Throws an exception if condition is not met with a given description and extra information about the location the
+/// exception was thrown from.
+/// @param _condition if condition is not met, specified exception will be thrown.
+/// @param _exceptionType The type of the exception to throw (not an instance).
+/// @param _description The message that describes the error.
+#define solRequire(_condition, _exceptionType, _description) \
+	if (!(_condition)) \
+		solThrow(_exceptionType, (_description))
+
 /// Defines an exception type that's meant to signal a specific condition and be caught rather than
 /// unwind the stack all the way to the top-level exception handler and interrupt the program.
 /// As such it does not carry a message - the code catching it is expected to handle it without

From 12bca24774afb1793f0fdcc6996eaedaef529e88 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@usi.ch>
Date: Sat, 11 Feb 2023 21:56:13 +0100
Subject: [PATCH 1329/1748] [SMTChecker] Use path condition when creating CHC
 targets

Without path condition, verification targets created inside ternary
operator ignore the condition of the operator inside the branches.
This led to false positives.

Further updates:

- Function calls should consider the conditions under which they are
called, otherwise the analysis may report false positives.
The fix proposed here is to add the current path condition to the edge
that propagates error from a function call.

- Increment error index after function call

This is necessary for the analysis of the ternary operator to work
correctly. No information should leak from a function call inside a
ternary operator in the first branch to the second branch, including
whether or not an error would have occured in the first branch.

However, for the execution that continues after the function call,
we still need to ensure that under the current path condition
the error has not occurred in that function call.

It would be better to isolate the analysis of the branches to separate
clauses, but I do not see an easy way for that now. In this way, even
though the function call in first branch is included in the clause of
the second branch, no information leaks.

- Additonal test for ternary operator

This tests the behaviour of SMTChecker on ternary operator with function
calls inside both branches. Specifically, it tests that SMTChecker
successfully detects a violation of a verification target in the second
branch when the same target is present also in the first branch, but
there it cannot be triggered because of the operator's condition.
---
 Changelog.md                                  |  1 +
 libsolidity/formal/CHC.cpp                    | 10 +++---
 .../output.json                               |  4 +--
 .../conditional_assignment_statevar_1.sol     |  4 +--
 .../operators/ternary_operator_1.sol          |  9 ++++++
 .../operators/ternary_operator_2.sol          | 14 ++++++++
 .../operators/ternary_operator_3.sol          | 31 ++++++++++++++++++
 .../ternary_operator_double_function_call.sol |  4 +++
 .../ternary_operator_external_code_1.sol      | 32 +++++++++++++++++++
 .../operators/ternary_operator_nested_1.sol   | 15 +++++++++
 .../operators/ternary_operator_nested_2.sol   | 27 ++++++++++++++++
 .../operators/ternary_operator_nested_3.sol   | 19 +++++++++++
 .../operators/ternary_operator_nested_4.sol   | 24 ++++++++++++++
 .../types/array_mapping_aliasing_2.sol        |  3 +-
 14 files changed, 186 insertions(+), 11 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_double_function_call.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_external_code_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_4.sol

diff --git a/Changelog.md b/Changelog.md
index 7e35275bc6..531ded9a50 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,7 @@ Bugfixes:
  * Antlr Grammar: Fix discrepancy with the parser, which allowed octal numbers.
  * Antlr Grammar: Fix of a discrepancy with the parser, which allowed numbers followed by an identifier with no whitespace.
  * Antlr Grammar: Stricter rules for function definitions. The grammar will no longer accept as valid free functions having specifiers which are exclusive to contract functions.
+ * SMTChecker: Fix false positives in ternary operators that contain verification targets in its branches, directly or indirectly.
 
 
 AST Changes:
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 3d93bf599e..c6e737dbe6 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -839,9 +839,10 @@ void CHC::internalFunctionCall(FunctionCall const& _funCall)
 	connectBlocks(
 		m_currentBlock,
 		predicate(*m_errorDest),
-		errorFlag().currentValue() > 0
+		errorFlag().currentValue() > 0 && currentPathConditions()
 	);
-	m_context.addAssertion(errorFlag().currentValue() == 0);
+	m_context.addAssertion(smtutil::Expression::implies(currentPathConditions(), errorFlag().currentValue() == 0));
+	m_context.addAssertion(errorFlag().increaseIndex() == 0);
 }
 
 void CHC::addNondetCalls(ContractDefinition const& _contract)
@@ -970,7 +971,7 @@ void CHC::externalFunctionCall(FunctionCall const& _funCall)
 
 	m_context.addAssertion(nondetCall);
 	solAssert(m_errorDest, "");
-	connectBlocks(m_currentBlock, predicate(*m_errorDest), errorFlag().currentValue() > 0);
+	connectBlocks(m_currentBlock, predicate(*m_errorDest), errorFlag().currentValue() > 0 && currentPathConditions());
 
 	// To capture the possibility of a reentrant call, we record in the call graph that the  current function
 	// can call any of the external methods of the current contract.
@@ -1866,6 +1867,7 @@ void CHC::verificationTargetEncountered(
 		m_functionTargetIds[m_currentContract].push_back(errorId);
 	auto previousError = errorFlag().currentValue();
 	errorFlag().increaseIndex();
+	auto extendedErrorCondition = currentPathConditions() && _errorCondition;
 
 	Predicate const* localBlock = m_currentFunction ?
 		createBlock(m_currentFunction, PredicateType::FunctionErrorBlock) :
@@ -1875,7 +1877,7 @@ void CHC::verificationTargetEncountered(
 	connectBlocks(
 		m_currentBlock,
 		pred,
-		_errorCondition && errorFlag().currentValue() == errorId
+		extendedErrorCondition && errorFlag().currentValue() == errorId
 	);
 	solAssert(m_errorDest, "");
 	addRule(smtutil::Expression::implies(pred, predicate(*m_errorDest)), pred.name);
diff --git a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
index 85a221d4cd..bf59a0d9da 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
@@ -30,7 +30,7 @@
 (check-sat)
 (get-value (|EVALEXPR_0| ))
 ",
-            "0xfb06d3f02a20bd362abded9ab80638bdc9dd43ccbf644517f3006206c0c47f67": "(set-logic HORN)
+            "0xa991e3c158410479bc0a0540fb60ce7010aec315a5b0010d254f12f3d1f0a4e5": "(set-logic HORN)
 
 (declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
 (declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
@@ -69,7 +69,7 @@
 (declare-fun |block_8_function_f__13_14_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| Int |state_type| Int ) Bool)
 (assert
 (forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int))
-(=> (and (and (block_6_f_12_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (= expr_9_1 (> expr_7_0 expr_8_0)) (and (=> true true) (and (= expr_8_0 0) (and (=> true (and (>= expr_7_0 0) (<= expr_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_7_0 x_3_1) (and (and (>= x_3_1 0) (<= x_3_1 115792089237316195423570985008687907853269984665640564039457584007913129639935)) true))))))) (and (not expr_9_1) (= error_1 1))) (block_8_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
+(=> (and (and (block_6_f_12_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (and (= expr_9_1 (> expr_7_0 expr_8_0)) (and (=> true true) (and (= expr_8_0 0) (and (=> true (and (>= expr_7_0 0) (<= expr_7_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_7_0 x_3_1) (and (and (>= x_3_1 0) (<= x_3_1 115792089237316195423570985008687907853269984665640564039457584007913129639935)) true))))))) (and (and true (not expr_9_1)) (= error_1 1))) (block_8_function_f__13_14_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1))))
 
 
 (assert
diff --git a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
index 1a87e1ced0..32d5435d38 100644
--- a/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/conditional_assignment_statevar_1.sol
@@ -14,8 +14,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 4984: (134-140): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Warning 4984: (143-146): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (134-140): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (143-146): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_1.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_1.sol
new file mode 100644
index 0000000000..ce475d91be
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_1.sol
@@ -0,0 +1,9 @@
+contract C {
+	function f(uint x) public pure returns (uint) {
+		return x > 0 ? x - 1 : 0; // Underflow cannot happen
+	}
+}
+// ====
+// SMTEngine: chc
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_2.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_2.sol
new file mode 100644
index 0000000000..3f2e42efd7
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_2.sol
@@ -0,0 +1,14 @@
+contract C {
+
+	function decrement(uint x) private pure returns (uint) {
+		return x - 1; // No underflow, the method can be called only with positive value
+	}
+
+	function f(uint x) public pure returns (uint) {
+		return x > 0 ? decrement(x) : 0;
+	}
+}
+// ====
+// SMTEngine: chc
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_3.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_3.sol
new file mode 100644
index 0000000000..dac62d380d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_3.sol
@@ -0,0 +1,31 @@
+abstract contract D {
+	function d() external virtual returns (uint);
+}
+
+contract C {
+
+	D d;
+	uint v;
+	bool guard = true;
+
+	function inc() public {
+		++v;
+	}
+
+	function dec() public {
+		if (guard) return;
+		--v;
+	}
+
+	function f() public returns (uint) {
+		guard = false;
+		uint ret = v > 0 ? d.d() : 0;
+		guard = true;
+		return ret;
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTTargets: underflow
+// ----
+// Warning 3944: (206-209): CHC: Underflow (resulting value less than 0) happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_double_function_call.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_double_function_call.sol
new file mode 100644
index 0000000000..96d00ff60b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_double_function_call.sol
@@ -0,0 +1,4 @@
+contract C { function decrement(uint x) private pure returns (uint) { return x - 1; } function decrement2(uint x) private pure returns (uint) { return x - 1; } function f(uint x) public pure returns (uint) { return x > 0 ? decrement(x) : decrement2(x); } }
+// ----
+// Warning 3944: (151-156): CHC: Underflow (resulting value less than 0) happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_external_code_1.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_external_code_1.sol
new file mode 100644
index 0000000000..7da04b4648
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_external_code_1.sol
@@ -0,0 +1,32 @@
+abstract contract D {
+	function d() external virtual returns (uint);
+}
+
+contract C {
+
+	D d;
+	uint v;
+	bool guard = true;
+
+	function inc() public {
+		++v;
+	}
+
+	function dec() public {
+		if (guard) return;
+		--v;
+		guard = true;
+	}
+
+	function f() public returns (uint) {
+		guard = false;
+		uint ret = v > 0 ? d.d() : 0;
+		guard = true;
+		return ret;
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTTargets: underflow
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_1.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_1.sol
new file mode 100644
index 0000000000..d2722fc049
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_1.sol
@@ -0,0 +1,15 @@
+contract C {
+
+	function unreachable() private pure returns (uint) {
+		assert(false);
+		return 0;
+	}
+
+	function f(uint x) public pure returns (uint) {
+		return x <= 1 ? 0 : x < 2 ? unreachable() : 0;
+	}
+}
+// ====
+// SMTEngine: chc
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_2.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_2.sol
new file mode 100644
index 0000000000..71e294fb49
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_2.sol
@@ -0,0 +1,27 @@
+contract C {
+
+	function decrement(uint x) private pure returns (uint) {
+		return x - 1;
+	}
+
+	function decrement2(uint x) private pure returns (uint) {
+		return x - 1;
+	}
+
+	function increment(uint x) private pure returns (uint) {
+		return x + 1;
+	}
+
+	function increment2(uint x) private pure returns (uint) {
+		return x + 1;
+	}
+
+	function f(uint x) public pure returns (uint) {
+		return x < 10 ? (x > 0 ? decrement(x) : increment(x)) : (x > 100 ? increment2(x) : decrement2(x));
+	}
+}
+// ====
+// SMTEngine: chc
+// ----
+// Warning 4984: (317-322): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_3.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_3.sol
new file mode 100644
index 0000000000..0638e4838e
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_3.sol
@@ -0,0 +1,19 @@
+contract C {
+
+	function increment(uint x) private pure returns (uint) {
+		return x + 1;
+	}
+
+	function increment2(uint x) private pure returns (uint) {
+		return x + 1;
+	}
+
+	function f(uint x) public pure returns (uint) {
+		return x < 10 ? (x > 0 ? 0 : increment(x)) : (x > 100 ? increment2(x) : 0);
+	}
+}
+// ====
+// SMTEngine: chc
+// ----
+// Warning 4984: (160-165): CHC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_4.sol b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_4.sol
new file mode 100644
index 0000000000..295590228d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/ternary_operator_nested_4.sol
@@ -0,0 +1,24 @@
+contract C {
+
+	uint s = 1;
+
+	function decrement() private returns (uint) {
+		return --s;
+	}
+
+	function increment() private returns (uint) {
+		return ++s;
+	}
+
+	function f(uint x) public returns (uint) {
+		require(s > 0 && s < 10);
+		uint olds = s;
+		uint ret = x < 1 ? increment() : decrement();
+		assert(s != olds);
+		return ret;
+	}
+}
+// ====
+// SMTEngine: chc
+// ----
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
index fce5869877..5ac20c96f8 100644
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
@@ -45,5 +45,4 @@ contract C
 // Warning 6368: (850-866): CHC: Out of bounds access happens here.
 // Warning 6368: (850-869): CHC: Out of bounds access happens here.
 // Warning 6328: (936-956): CHC: Assertion violation happens here.
-// Warning 6368: (1029-1043): CHC: Out of bounds access might happen here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 1fb9a414c9d6507c887d4c13295efa78d5ccf2bd Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Sun, 23 Apr 2023 13:36:28 +0200
Subject: [PATCH 1330/1748] Add default value for CIRCLE_TAG

---
 scripts/ci/notification/matrix_notification.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/ci/notification/matrix_notification.sh b/scripts/ci/notification/matrix_notification.sh
index ecf14d3e5d..cbe290af46 100755
--- a/scripts/ci/notification/matrix_notification.sh
+++ b/scripts/ci/notification/matrix_notification.sh
@@ -72,7 +72,7 @@ function format_predefined_message() {
 # Set message environment variables based on CI backend
 if [[ "$CIRCLECI" = true ]] ; then
     BRANCH="$CIRCLE_BRANCH"
-    TAG="$CIRCLE_TAG"
+    TAG="${CIRCLE_TAG:-}"
     BUILD_URL="$CIRCLE_BUILD_URL"
     BUILD_NUM="$CIRCLE_BUILD_NUM"
     WORKFLOW_NAME="$(circleci_workflow_name)"

From ee92491aaead42f1066e4b50072a7f1a1eafa0f8 Mon Sep 17 00:00:00 2001
From: Alex Beregszaszi <alex@rtfs.hu>
Date: Sun, 23 Apr 2023 15:50:16 +0200
Subject: [PATCH 1331/1748] Upgrade to evmc 10.1.0

---
 test/evmc/README.md       |  4 ++--
 test/evmc/evmc.h          | 37 +++++++++++++++++++++++--------------
 test/evmc/evmc.hpp        |  6 ++++++
 test/evmc/helpers.h       |  6 ++++++
 test/evmc/mocked_host.hpp |  2 +-
 5 files changed, 38 insertions(+), 17 deletions(-)

diff --git a/test/evmc/README.md b/test/evmc/README.md
index 6b7f76f61c..cdddb34440 100644
--- a/test/evmc/README.md
+++ b/test/evmc/README.md
@@ -1,5 +1,5 @@
 # EVMC
 
-This is an import of [EVMC](https://github.com/ethereum/evmc) version [10.0.0](https://github.com/ethereum/evmc/releases/tag/v10.0.0).
+This is an import of [EVMC](https://github.com/ethereum/evmc) version [10.1.0](https://github.com/ethereum/evmc/releases/tag/v10.1.0).
 
-Important: The `MockedAccount.storage` is changed to a map from unordered_map as ordering is important for fuzzing.
+Important: The `MockedAccount.storage` is changed to a `map` from `unordered_map` as ordering is important for fuzzing.
diff --git a/test/evmc/evmc.h b/test/evmc/evmc.h
index 16d5686607..60c3aeecc9 100644
--- a/test/evmc/evmc.h
+++ b/test/evmc/evmc.h
@@ -412,20 +412,21 @@ struct evmc_result
     /**
      * The reference to output data.
      *
-     *  The output contains data coming from RETURN opcode (iff evmc_result::code
-     *  field is ::EVMC_SUCCESS) or from REVERT opcode.
+     * The output contains data coming from RETURN opcode (iff evmc_result::code
+     * field is ::EVMC_SUCCESS) or from REVERT opcode.
      *
-     *  The memory containing the output data is owned by EVM and has to be
-     *  freed with evmc_result::release().
+     * The memory containing the output data is owned by EVM and has to be
+     * freed with evmc_result::release().
      *
-     *  This MAY be NULL.
+     * This pointer MAY be NULL.
+     * If evmc_result::output_size is 0 this pointer MUST NOT be dereferenced.
      */
     const uint8_t* output_data;
 
     /**
      * The size of the output data.
      *
-     *  If output_data is NULL this MUST be 0.
+     * If evmc_result::output_data is NULL this MUST be 0.
      */
     size_t output_size;
 
@@ -463,13 +464,13 @@ struct evmc_result
     /**
      * Reserved data that MAY be used by a evmc_result object creator.
      *
-     *  This reserved 4 bytes together with 20 bytes from create_address form
-     *  24 bytes of memory called "optional data" within evmc_result struct
-     *  to be optionally used by the evmc_result object creator.
+     * This reserved 4 bytes together with 20 bytes from create_address form
+     * 24 bytes of memory called "optional data" within evmc_result struct
+     * to be optionally used by the evmc_result object creator.
      *
-     *  @see evmc_result_optional_data, evmc_get_optional_data().
+     * @see evmc_result_optional_data, evmc_get_optional_data().
      *
-     *  Also extends the size of the evmc_result to 64 bytes (full cache line).
+     * Also extends the size of the evmc_result to 64 bytes (full cache line).
      */
     uint8_t padding[4];
 };
@@ -963,18 +964,26 @@ enum evmc_revision
      * The Cancun revision.
      *
      * The future next revision after Shanghai.
+     * https://github.com/ethereum/execution-specs/blob/master/network-upgrades/mainnet-upgrades/cancun.md
      */
     EVMC_CANCUN = 12,
 
+    /**
+     * The Prague revision.
+     *
+     * The future next revision after Cancun.
+     */
+    EVMC_PRAGUE = 13,
+
     /** The maximum EVM revision supported. */
-    EVMC_MAX_REVISION = EVMC_CANCUN,
+    EVMC_MAX_REVISION = EVMC_PRAGUE,
 
     /**
      * The latest known EVM revision with finalized specification.
      *
      * This is handy for EVM tools to always use the latest revision available.
      */
-    EVMC_LATEST_STABLE_REVISION = EVMC_LONDON
+    EVMC_LATEST_STABLE_REVISION = EVMC_SHANGHAI
 };
 
 
@@ -1111,7 +1120,7 @@ struct evmc_vm
     /**
      * Optional pointer to function modifying VM's options.
      *
-     *  If the VM does not support this feature the pointer can be NULL.
+     * If the VM does not support this feature the pointer can be NULL.
      */
     evmc_set_option_fn set_option;
 };
diff --git a/test/evmc/evmc.hpp b/test/evmc/evmc.hpp
index 3d336894f9..a29f802d27 100644
--- a/test/evmc/evmc.hpp
+++ b/test/evmc/evmc.hpp
@@ -414,6 +414,12 @@ class Result : private evmc_result
         return *this;
     }
 
+    /// Access the result object as a referenced to ::evmc_result.
+    evmc_result& raw() noexcept { return *this; }
+
+    /// Access the result object as a const referenced to ::evmc_result.
+    const evmc_result& raw() const noexcept { return *this; }
+
     /// Releases the ownership and returns the raw copy of evmc_result.
     ///
     /// This method drops the ownership of the result
diff --git a/test/evmc/helpers.h b/test/evmc/helpers.h
index 17db3d1941..683567ef13 100644
--- a/test/evmc/helpers.h
+++ b/test/evmc/helpers.h
@@ -20,9 +20,11 @@
 
 #ifdef __cplusplus
 extern "C" {
+#ifdef __GNUC__
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
 #endif
+#endif
 
 /**
  * Returns true if the VM has a compatible ABI version.
@@ -297,6 +299,8 @@ static inline const char* evmc_revision_to_string(enum evmc_revision rev)
         return "Shanghai";
     case EVMC_CANCUN:
         return "Cancun";
+    case EVMC_PRAGUE:
+        return "Prague";
     }
     return "<unknown>";
 }
@@ -304,6 +308,8 @@ static inline const char* evmc_revision_to_string(enum evmc_revision rev)
 /** @} */
 
 #ifdef __cplusplus
+#ifdef __GNUC__
 #pragma GCC diagnostic pop
+#endif
 }  // extern "C"
 #endif
diff --git a/test/evmc/mocked_host.hpp b/test/evmc/mocked_host.hpp
index 0e4ee824f6..173b793ac7 100644
--- a/test/evmc/mocked_host.hpp
+++ b/test/evmc/mocked_host.hpp
@@ -6,8 +6,8 @@
 #include <evmc/evmc.hpp>
 #include <algorithm>
 #include <cassert>
-#include <string>
 #include <map>
+#include <string>
 #include <unordered_map>
 #include <vector>
 

From ba722b66cb3d3cf52d2dc3d1098643b5b10b65d4 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Tue, 18 Apr 2023 10:51:11 +0200
Subject: [PATCH 1332/1748] Make bash the default shell on windows

---
 .circleci/config.yml | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5c7d4b0c4e..92366f7648 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -398,21 +398,16 @@ defaults:
         TERM: xterm
         MAKEFLAGS: -j 10
 
-  - base_win_bash: &base_win_bash
+  - base_win: &base_win
       executor:
         name: win/default
         shell: bash.exe
 
-  - base_win_powershell: &base_win_powershell
+  - base_win_large: &base_win_large
       executor:
         name: win/default
-        shell: powershell.exe
-
-  - base_win_powershell_large: &base_win_powershell_large
-      executor:
-        name: win/default
-        shell: powershell.exe
         size: large
+        shell: bash.exe
 
   # --------------------------------------------------------------------------
   # Workflow Templates
@@ -786,7 +781,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   t_win_pyscripts:
-    <<: *base_win_powershell
+    <<: *base_win
     steps:
       - run: git config --global core.autocrlf false
       - checkout
@@ -1350,7 +1345,7 @@ jobs:
           path: reports/externalTests/base-branch/
 
   b_win: &b_win
-    <<: *base_win_powershell_large
+    <<: *base_win_large
     steps:
       # NOTE: Not disabling git's core.autocrlf here because we want to build using the typical Windows config.
       - checkout
@@ -1362,6 +1357,7 @@ jobs:
       - run:
           name: "Installing dependencies"
           command: .\scripts\install_deps.ps1
+          shell: powershell.exe
       - save_cache:
           key: dependencies-win-{{ arch }}-{{ checksum "scripts/install_deps.ps1" }}
           paths:
@@ -1369,9 +1365,11 @@ jobs:
       - run:
           name: "Building solidity"
           command: .circleci/build_win.ps1
+          shell: powershell.exe
       - run:
           name: "Run solc.exe to make sure build was successful."
           command: .\build\solc\Release\solc.exe --version
+          shell: powershell.exe
       - store_artifacts: *artifact_solc_windows
       - persist_to_workspace:
           root: build
@@ -1381,7 +1379,7 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   t_win_soltest: &t_win_soltest
-    <<: *base_win_powershell
+    <<: *base_win
     steps:
       # NOTE: Git's default core.autocrlf is fine for running soltest. We get additional coverage
       # for files using CRLF that way.
@@ -1391,18 +1389,18 @@ jobs:
       - run:
           name: "Install evmone"
           command: scripts/install_evmone.ps1
+          shell: powershell.exe
       - run:
           name: "Run soltest"
           command: .circleci/soltest.ps1
+          shell: powershell.exe
       - run:
           name: Install LSP test dependencies
           command: python -m pip install --user deepdiff colorama
-      - run:
-          name: Inspect lsp.py
-          command: Get-Content ./test/lsp.py
       - run:
           name: Executing solc LSP test suite
           command: python ./test/lsp.py .\build\solc\Release\solc.exe --non-interactive
+          shell: powershell.exe
       - store_test_results: *store_test_results
       - store_artifacts: *artifacts_test_results
       - matrix_notify_failure_unless_pr
@@ -1453,7 +1451,7 @@ jobs:
           binary_path: "../build/solc/solc"
 
   b_bytecode_win:
-    <<: *base_win_bash
+    <<: *base_win
     environment:
       LC_ALL: C
     steps:

From 28c7fdae09482410c2d1de69bb0a3ed714b9c965 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Tue, 25 Apr 2023 12:07:44 +0200
Subject: [PATCH 1333/1748] Migrate yulStackShuffling tests to isoltest

---
 test/CMakeLists.txt                           |   1 +
 test/InteractiveTests.h                       |   2 +
 test/TestCase.cpp                             |   2 +-
 test/libyul/StackShufflingTest.cpp            | 177 +++++++++++++++---
 test/libyul/StackShufflingTest.h              |  47 +++++
 .../libyul/yulStackShuffling/swap_cycle.stack |  22 +++
 test/tools/CMakeLists.txt                     |   1 +
 test/tools/isoltest.cpp                       |   2 +-
 8 files changed, 226 insertions(+), 28 deletions(-)
 create mode 100644 test/libyul/StackShufflingTest.h
 create mode 100644 test/libyul/yulStackShuffling/swap_cycle.stack

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1b5187f33e..9a2c78fd8c 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -149,6 +149,7 @@ set(libyul_sources
     libyul/StackLayoutGeneratorTest.cpp
     libyul/StackLayoutGeneratorTest.h
     libyul/StackShufflingTest.cpp
+    libyul/StackShufflingTest.h
     libyul/SyntaxTest.h
     libyul/SyntaxTest.cpp
     libyul/YulInterpreterTest.cpp
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
index d359a815ad..e58beabbf8 100644
--- a/test/InteractiveTests.h
+++ b/test/InteractiveTests.h
@@ -35,6 +35,7 @@
 #include <test/libyul/ControlFlowSideEffectsTest.h>
 #include <test/libyul/FunctionSideEffects.h>
 #include <test/libyul/StackLayoutGeneratorTest.h>
+#include <test/libyul/StackShufflingTest.h>
 #include <test/libyul/SyntaxTest.h>
 
 #include <boost/filesystem.hpp>
@@ -64,6 +65,7 @@ Testsuite const g_interactiveTestsuites[] = {
 	{"Yul Object Compiler",    "libyul",      "objectCompiler",        false, false, &yul::test::ObjectCompilerTest::create},
 	{"Yul Control Flow Graph", "libyul",      "yulControlFlowGraph",   false, false, &yul::test::ControlFlowGraphTest::create},
 	{"Yul Stack Layout",       "libyul",      "yulStackLayout",        false, false, &yul::test::StackLayoutGeneratorTest::create},
+	{"Yul Stack Shuffling",    "libyul",      "yulStackShuffling",     false, false, &yul::test::StackShufflingTest::create},
 	{"Control Flow Side Effects","libyul",    "controlFlowSideEffects",false, false, &yul::test::ControlFlowSideEffectsTest::create},
 	{"Function Side Effects",  "libyul",      "functionSideEffects",   false, false, &yul::test::FunctionSideEffects::create},
 	{"Yul Syntax",             "libyul",      "yulSyntaxTests",        false, false, &yul::test::SyntaxTest::create},
diff --git a/test/TestCase.cpp b/test/TestCase.cpp
index 32de682961..059d2ab70c 100644
--- a/test/TestCase.cpp
+++ b/test/TestCase.cpp
@@ -51,7 +51,7 @@ void TestCase::printUpdatedSettings(std::ostream& _stream, std::string const& _l
 bool TestCase::isTestFilename(boost::filesystem::path const& _filename)
 {
 	string extension = _filename.extension().string();
-	return (extension == ".sol" || extension == ".yul") &&
+	return (extension == ".sol" || extension == ".yul" || extension == ".stack") &&
 		   !boost::starts_with(_filename.string(), "~") &&
 			!boost::starts_with(_filename.string(), ".");
 }
diff --git a/test/libyul/StackShufflingTest.cpp b/test/libyul/StackShufflingTest.cpp
index 2a2c217490..35130c11b1 100644
--- a/test/libyul/StackShufflingTest.cpp
+++ b/test/libyul/StackShufflingTest.cpp
@@ -14,41 +14,166 @@
     You should have received a copy of the GNU General Public License
     along with solidity.  If not, see <http://www.gnu.org/licenses/>.
 */
-/**
- * Unit tests for stack shuffling.
- */
+
+#include <test/libyul/StackShufflingTest.h>
+
+#include <liblangutil/Scanner.h>
+#include <libsolutil/AnsiColorized.h>
 #include <libyul/backends/evm/StackHelpers.h>
-#include <boost/test/unit_test.hpp>
 
-using namespace std;
+using namespace solidity::util;
 using namespace solidity::langutil;
+using namespace solidity::yul;
+using namespace solidity::yul::test;
+using namespace std;
 
-namespace solidity::yul::test
+bool StackShufflingTest::parse(string const& _source)
 {
+	CharStream stream(_source, "");
+	Scanner scanner(stream);
 
-BOOST_AUTO_TEST_SUITE(YulStackShuffling)
+	auto expectToken = [&](Token _token)
+	{
+		soltestAssert(
+			scanner.next() == _token,
+			"Invalid token. Expected: \"" + TokenTraits::friendlyName(_token) + "\"."
+        );
+	};
 
-BOOST_AUTO_TEST_CASE(swap_cycle)
-{
-	std::vector<Scope::Variable> scopeVariables;
-	Scope::Function function;
-	std::vector<VariableSlot> v;
-	for (size_t i = 0; i < 17; ++i)
-		scopeVariables.emplace_back(Scope::Variable{""_yulstring, YulString{"v" + to_string(i)}});
-	for (size_t i = 0; i < 17; ++i)
-		v.emplace_back(VariableSlot{scopeVariables[i]});
-
-	Stack sourceStack{
-		v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[9], v[10], v[11], v[12], v[13], v[14], v[15], v[16],
-		FunctionReturnLabelSlot{function}, FunctionReturnLabelSlot{function}, v[5]};
-	Stack targetStack{
-		v[1], v[0], v[2], v[3], v[4], v[5], v[6], v[7], v[9], v[10], v[11], v[12], v[13], v[14], v[15], v[16],
-		FunctionReturnLabelSlot{function}, JunkSlot{}, JunkSlot{}
+	auto parseStack = [&](Stack& stack) -> bool
+	{
+		if (scanner.currentToken() != Token::LBrack)
+			return false;
+		scanner.next();
+		while (scanner.currentToken() != Token::RBrack &&
+			   scanner.currentToken() != Token::EOS)
+		{
+			string literal = scanner.currentLiteral();
+			if (literal == "RET")
+			{
+				scanner.next();
+				if (scanner.currentToken() == Token::LBrack)
+				{
+					scanner.next();
+					string functionName = scanner.currentLiteral();
+					auto call = yul::FunctionCall{
+						{},	yul::Identifier{{}, YulString(functionName)}, {}
+					};
+					stack.emplace_back(FunctionCallReturnLabelSlot{
+							m_functions.insert(
+								make_pair(functionName, call)
+							).first->second
+					});
+					expectToken(Token::RBrack);
+				}
+				else
+				{
+					static Scope::Function function;
+					stack.emplace_back(FunctionReturnLabelSlot{function});
+					continue;
+				}
+			}
+			else if (literal == "TMP")
+			{
+				expectToken(Token::LBrack);
+				scanner.next();
+				string functionName = scanner.currentLiteral();
+				auto call = yul::FunctionCall{
+				    {},	yul::Identifier{{}, YulString(functionName)}, {}
+			    };
+				expectToken(Token::Comma);
+				scanner.next();
+				size_t index = size_t(atoi(scanner.currentLiteral().c_str()));
+				stack.emplace_back(TemporarySlot{
+						m_functions.insert(make_pair(functionName, call)).first->second,
+						index
+				});
+				expectToken(Token::RBrack);
+			}
+			else if (literal.find("0x") != string::npos || scanner.currentToken() == Token::Number)
+			{
+				stack.emplace_back(LiteralSlot{u256(literal)});
+			}
+			else if (literal == "JUNK")
+			{
+				stack.emplace_back(JunkSlot());
+			}
+			else if (literal == "GHOST")
+			{
+				expectToken(Token::LBrack);
+				scanner.next(); // read number of ghost variables as ghostVariableId
+				string ghostVariableId = scanner.currentLiteral();
+				Scope::Variable ghostVar = Scope::Variable{""_yulstring, YulString(literal + "[" + ghostVariableId + "]")};
+				stack.emplace_back(VariableSlot{
+						m_variables.insert(make_pair(ghostVar.name, ghostVar)).first->second
+				});
+				expectToken(Token::RBrack);
+			}
+			else
+			{
+				Scope::Variable var = Scope::Variable{""_yulstring, YulString(literal)};
+				stack.emplace_back(VariableSlot{
+						m_variables.insert(
+							make_pair(literal, var)
+						).first->second
+				});
+			}
+			scanner.next();
+		}
+		return scanner.currentToken() == Token::RBrack;
 	};
-	// Used to hit a swapping cycle.
-	createStackLayout(sourceStack, targetStack, [](auto){}, [](auto){}, [](){});
+
+	if (!parseStack(m_sourceStack))
+		return false;
+	scanner.next();
+	return parseStack(m_targetStack);
 }
 
-BOOST_AUTO_TEST_SUITE_END()
+StackShufflingTest::StackShufflingTest(string const& _filename):
+	TestCase(_filename)
+{
+	m_source = m_reader.source();
+	m_expectation = m_reader.simpleExpectations();
+}
+
+TestCase::TestResult StackShufflingTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+{
+	if (!parse(m_source))
+	{
+		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
+		return TestResult::FatalError;
+	}
+
+	ostringstream output;
+	createStackLayout(
+		m_sourceStack,
+		m_targetStack,
+		[&](unsigned _swapDepth) // swap
+		{
+			output << stackToString(m_sourceStack) << endl;
+			output << "SWAP" << _swapDepth << endl;
+		},
+		[&](StackSlot const& _slot) // dupOrPush
+		{
+			output << stackToString(m_sourceStack) << endl;
+			if (canBeFreelyGenerated(_slot))
+				output << "PUSH " << stackSlotToString(_slot) << endl;
+			else
+			{
+				if (auto depth = util::findOffset(m_sourceStack | ranges::views::reverse, _slot))
+					output << "DUP" << *depth + 1 << endl;
+				else
+					BOOST_THROW_EXCEPTION(runtime_error("Invalid DUP operation."));
+			}
+		},
+		[&](){ // pop
+			output << stackToString(m_sourceStack) << endl;
+			output << "POP" << endl;
+		}
+    );
+
+	output << stackToString(m_sourceStack) << endl;
+	m_obtainedResult = output.str();
 
+	return checkResult(_stream, _linePrefix, _formatted);
 }
diff --git a/test/libyul/StackShufflingTest.h b/test/libyul/StackShufflingTest.h
new file mode 100644
index 0000000000..75715d25b9
--- /dev/null
+++ b/test/libyul/StackShufflingTest.h
@@ -0,0 +1,47 @@
+/*
+	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
+
+#pragma once
+
+#include <test/TestCase.h>
+
+#include <libyul/backends/evm/ControlFlowGraph.h>
+
+using namespace solidity::frontend::test;
+
+namespace solidity::yul::test
+{
+
+class StackShufflingTest: public TestCase
+{
+public:
+	static std::unique_ptr<TestCase> create(Config const& _config)
+	{
+		return std::make_unique<StackShufflingTest>(_config.filename);
+	}
+	explicit StackShufflingTest(std::string const& _filename);
+	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
+private:
+	bool parse(std::string const& _source);
+
+	Stack m_sourceStack;
+	Stack m_targetStack;
+	std::map<YulString, yul::FunctionCall> m_functions;
+	std::map<YulString, Scope::Variable> m_variables;
+};
+}
diff --git a/test/libyul/yulStackShuffling/swap_cycle.stack b/test/libyul/yulStackShuffling/swap_cycle.stack
new file mode 100644
index 0000000000..fbda89ebfd
--- /dev/null
+++ b/test/libyul/yulStackShuffling/swap_cycle.stack
@@ -0,0 +1,22 @@
+[ v0 v1 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET RET v5 ]
+[ v1 v0 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET JUNK JUNK ]
+// ----
+// [ v0 v1 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET RET v5 ]
+// POP
+// [ v0 v1 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET RET ]
+// SWAP16
+// [ v0 RET v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET v1 ]
+// SWAP16
+// [ v0 v1 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET RET ]
+// POP
+// [ v0 v1 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET ]
+// SWAP15
+// [ v0 RET v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 v1 ]
+// SWAP16
+// [ v1 RET v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 v0 ]
+// SWAP15
+// [ v1 v0 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET ]
+// PUSH JUNK
+// [ v1 v0 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET JUNK ]
+// PUSH JUNK
+// [ v1 v0 v2 v3 v4 v5 v6 v7 v9 v10 v11 v12 v13 v14 v15 v16 RET JUNK JUNK ]
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index 5971341ec9..0bb8896cd8 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -40,6 +40,7 @@ add_executable(isoltest
 	../libyul/FunctionSideEffects.cpp
 	../libyul/ObjectCompilerTest.cpp
 	../libyul/SyntaxTest.cpp
+	../libyul/StackShufflingTest.cpp
 	../libyul/StackLayoutGeneratorTest.cpp
 	../libyul/YulOptimizerTest.cpp
 	../libyul/YulOptimizerTestCommon.cpp
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index c2035ab185..4739a54e9c 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -76,7 +76,7 @@ class TestFilter
 		boost::replace_all(filter, "/", "\\/");
 		boost::replace_all(filter, "*", ".*");
 
-		m_filterExpression = regex{"(" + filter + "(\\.sol|\\.yul))"};
+		m_filterExpression = regex{"(" + filter + "(\\.sol|\\.yul|\\.stack))"};
 	}
 
 	bool matches(fs::path const& _path, string const& _name) const

From a6c809fd198d195dabcabf14f8c72c14261adcb3 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Sat, 11 Feb 2023 21:04:53 +0100
Subject: [PATCH 1334/1748] Update triage automation to use new project board
 and github projectV2 API

---
 .github/workflows/triage.yml | 119 +++++++++++++++++++++++++++--------
 1 file changed, 93 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
index aacc0d9921..fd7d231d90 100644
--- a/.github/workflows/triage.yml
+++ b/.github/workflows/triage.yml
@@ -6,55 +6,122 @@ on:
       - opened
 
 env:
-  GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  GH_TOKEN: ${{ secrets.PROJECT_BOARD_AUTOMATION }}
   ORGANIZATION: ethereum
-  REPOSITORY: solidity
-  PROJECT_NUMBER: 43
-  DRY_RUN: false
+  PROJECT_NUMBER: 27 # Solidity Bug Triaging Board
+  # See: https://github.com/orgs/ethereum/projects/27/settings/fields/Status
+  COLUMN_FIELD_NAME: "Status"
+  TRIAGE_COLUMN_NAME: "To Triage"
+  DRY_RUN: true
 
 jobs:
   triage_issues:
     runs-on: ubuntu-latest
     steps:
-      - name: Retrieve the content of all columns on the board
+      - name: Retrieve the content of selected field on the project board
         run: |
           gh api graphql \
-            --raw-field owner="$ORGANIZATION" \
+            --raw-field organization="$ORGANIZATION" \
             --field project_number="$PROJECT_NUMBER" \
-            --raw-field repository_name="$REPOSITORY" \
             --raw-field query='
-              query($owner: String!, $repository_name: String!, $project_number: Int!) {
-                repository(owner: $owner, name: $repository_name) {
-                  project(number: $project_number) {
-                    columns(first: 10) {
+              query($organization: String!, $project_number: Int!) {
+                organization(login: $organization) {
+                  projectV2(number: $project_number) {
+                    id
+                    fields(first: 20) {
                       nodes {
-                        id,
-                        name
+                        ... on ProjectV2Field {
+                          id
+                          name
+                        }
+                        ... on ProjectV2SingleSelectField {
+                          id
+                          name
+                          options {
+                            id
+                            name
+                          }
+                        }
                       }
                     }
                   }
                 }
-              }' > project_columns.json
-          echo 'COLUMN_ID='$(jq '.data.repository.project.columns.nodes[] | select(.name == "Triage") | .id' project_columns.json) >> $GITHUB_ENV
-          echo 'COLUMN_NAME='$(jq '.data.repository.project.columns.nodes[] | select(.name == "Triage") | .name' project_columns.json) >> $GITHUB_ENV
+              }' > single_select_fields.json
+          echo 'PROJECT_ID='$(
+            jq \
+              '.data.organization.projectV2.id' \
+              single_select_fields.json
+          ) >> $GITHUB_ENV
+          echo 'COLUMN_FIELD_ID='$(
+            jq \
+              --arg column_field_name "$COLUMN_FIELD_NAME" \
+              '.data.organization.projectV2.fields.nodes[]
+              | select(.name == $column_field_name)
+              | .id' \
+              single_select_fields.json
+          ) >> $GITHUB_ENV
+          echo 'TRIAGE_COLUMN_ID='$(
+            jq --raw-output \
+              --arg column_field_name "$COLUMN_FIELD_NAME" \
+              --arg triage_column_name "$TRIAGE_COLUMN_NAME" \
+              '.data.organization.projectV2.fields.nodes[]
+              | select(.name == $column_field_name)
+              | .options[]
+              | select(.name == $triage_column_name)
+              | .id' \
+              single_select_fields.json
+          ) >> $GITHUB_ENV
 
-      - name: Add issue#${{ github.event.issue.number }} to Triage column
+      - name: Add issue#${{ github.event.issue.number }} to project
         env:
           ISSUE_ID: ${{ github.event.issue.node_id }}
         run: |
-          echo "Adding issue: ${{ github.event.issue.number }} to column $COLUMN_NAME in project $PROJECT_NUMBER"
-          if [[ $DRY_RUN == "false" ]]; then
+          echo "Adding issue: ${{ github.event.issue.number }} to project ${{ env.PROJECT_NUMBER }}"
+          if [[ $DRY_RUN == 'false' ]]; then
+            echo 'ITEM_ID='$(
+              gh api graphql \
+                --jq '.data.addProjectV2ItemById.item.id' \
+                --raw-field project_id="$PROJECT_ID" \
+                --raw-field issue_id="$ISSUE_ID" \
+                --raw-field query='
+                mutation($project_id: ID!, $issue_id: ID!) {
+                  addProjectV2ItemById(input: {projectId: $project_id, contentId: $issue_id}) {
+                    item {
+                      id
+                    }
+                  }
+                }'
+            ) >> $GITHUB_ENV
+          fi
+
+      - name: Move issue#${{ github.event.issue.number }} to Triage column
+        run: |
+          echo "Moving issue: ${{ github.event.issue.number }} to Triage column in project ${{ env.PROJECT_NUMBER }}"
+          if [[ $DRY_RUN == 'false' ]]; then
             gh api graphql \
               --silent \
-              --raw-field column=$COLUMN_ID \
-              --raw-field issue=$ISSUE_ID \
+              --raw-field project_id="$PROJECT_ID" \
+              --raw-field item_id="$ITEM_ID" \
+              --raw-field column_field_id="$COLUMN_FIELD_ID" \
+              --raw-field column_value_id="$TRIAGE_COLUMN_ID" \
               --raw-field query='
-                mutation($column: ID!, $issue: ID!) {
-                  addProjectCard(input: {
-                    projectColumnId: $column,
-                    contentId: $issue
+                mutation (
+                  $project_id: ID!
+                  $item_id: ID!
+                  $column_field_id: ID!
+                  $column_value_id: String!
+                ) {
+                  updateProjectV2ItemFieldValue(input: {
+                    projectId: $project_id
+                    itemId: $item_id
+                    fieldId: $column_field_id
+                    value: {
+                      singleSelectOptionId: $column_value_id
+                    }
                   }) {
-                    clientMutationId
+                    projectV2Item {
+                      id
+                    }
                   }
                 }'
           fi

From 3bcdc7bd9aaefe6edda51d475d209b951eb054df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20Uzdo=C4=9Fan?= <kaanuzdogan@hotmail.com>
Date: Wed, 26 Apr 2023 10:37:37 +0200
Subject: [PATCH 1335/1748] Fix Remix links by adding `#` before URL params

---
 docs/ext/remix_code_links.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/ext/remix_code_links.py b/docs/ext/remix_code_links.py
index 2fc15ddda0..47c5a32a97 100644
--- a/docs/ext/remix_code_links.py
+++ b/docs/ext/remix_code_links.py
@@ -22,7 +22,7 @@ def remix_code_url(source_code, language, solidity_version):
     # NOTE: base64 encoded data may contain +, = and / characters. Remix seems to handle them just
     # fine without any escaping.
     base64_encoded_source = base64.b64encode(source_code.encode('utf-8')).decode('ascii')
-    return f"https://remix.ethereum.org/?language={language}&version={solidity_version}&code={base64_encoded_source}"
+    return f"https://remix.ethereum.org/?#language={language}&version={solidity_version}&code={base64_encoded_source}"
 
 
 def build_remix_link_node(url):

From 816f6ec1757d39079ac7f197469474cd12566378 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20Uzdo=C4=9Fan?= <kaanuzdogan@hotmail.com>
Date: Wed, 26 Apr 2023 17:38:13 +0200
Subject: [PATCH 1336/1748] Fix metadata JSON "version" field being a string

Should be a number
---
 docs/metadata.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/metadata.rst b/docs/metadata.rst
index 18f2b579ca..d71235653f 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -193,7 +193,7 @@ explanatory purposes.
         }
       },
       // Required: The version of the metadata format
-      "version": "1"
+      "version": 1
     }
 
 .. warning::
@@ -289,4 +289,4 @@ or settings would result in a different metadata hash. The metadata here serves
 as a fingerprint of the whole compilation.
 
 `Sourcify <https://sourcify.dev>`_ makes use of this feature for "full/perfect verification",
-as well as pinning the files publicly on IPFS to be accessed with the metadata hash.
\ No newline at end of file
+as well as pinning the files publicly on IPFS to be accessed with the metadata hash.

From da7754c6db1dcaa54422d4bd24bf816561438e64 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 26 Apr 2023 18:17:58 +0200
Subject: [PATCH 1337/1748] Enable triage issues action

---
 .github/workflows/triage.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
index fd7d231d90..a20ea57145 100644
--- a/.github/workflows/triage.yml
+++ b/.github/workflows/triage.yml
@@ -12,7 +12,7 @@ env:
   # See: https://github.com/orgs/ethereum/projects/27/settings/fields/Status
   COLUMN_FIELD_NAME: "Status"
   TRIAGE_COLUMN_NAME: "To Triage"
-  DRY_RUN: true
+  DRY_RUN: false
 
 jobs:
   triage_issues:

From 7c870c95c5414268a50c622a2fe21a392d985069 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Thu, 27 Apr 2023 19:02:04 +0900
Subject: [PATCH 1338/1748] docs: change the remix button from icon to text
 (#14122)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* docs: change remix button to text button

* docs(fix): trim trailing whitespaces

* fix: remove unnecessary spaces

Co-authored-by: Kamil Śliwak <cameel2@gmail.com>

* fix: remove unnecessary !important in link

* refactor: remove !important in custom.css

* fix: `.. code-block:: Solidity` -> `.. code-block:: solidity`

* fix: broken layout of remix button in list items

* refactor: make selectors more strict

---------

Co-authored-by: Kamil Śliwak <cameel2@gmail.com>
---
 docs/_static/css/custom.css           | 59 +++++++++++----------------
 docs/_static/css/dark.css             | 10 ++---
 docs/analysing-compilation-output.rst |  2 +-
 docs/ext/remix_code_links.py          | 45 +++++++++-----------
 docs/natspec-format.rst               |  2 +-
 docs/smtchecker.rst                   | 16 ++++----
 6 files changed, 58 insertions(+), 76 deletions(-)

diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
index 4ff53f3a7b..4189fcd06c 100644
--- a/docs/_static/css/custom.css
+++ b/docs/_static/css/custom.css
@@ -6,9 +6,11 @@ pre {
     word-wrap: break-word;
 }
 
-.wy-table-responsive table td, .wy-table-responsive table th {
+.wy-table-responsive table td,
+.wy-table-responsive table th {
     white-space: normal;
 }
+
 .rst-content table.docutils td {
     vertical-align: top;
 }
@@ -27,8 +29,8 @@ pre {
     background: #fafafa;
 }
 
-.wy-side-nav-search img.logo {
-    width: 100px !important;
+.wy-side-nav-search > a img.logo {
+    width: 100px;
     padding: 0;
 }
 
@@ -38,49 +40,36 @@ pre {
 }
 
 /* project version (displayed under project logo) */
-.wy-side-nav-search .version {
-    color: #272525 !important;
+.wy-side-nav-search > div.version {
+    color: #272525;
 }
 
 /* menu section headers */
-.wy-menu .caption {
-    color: #65afff !important;
+.wy-menu p.caption {
+    color: #65afff;
 }
 
 /* Link to Remix IDE shown next to code snippets */
-p.remix-link-container {
-    position: relative;
-    right: -100%;        /* Positioned next to the the top-right corner of the code block following it. */
-}
-
-a.remix-link {
-    position: absolute;  /* Remove it from normal flow not to affect the original position of the snippet. */
-    top: 0.5em;
-    width: 3.236em;      /* Size of the margin (= right-side padding in .wy-nav-content in the current theme). */
-}
-
-a.remix-link .link-icon {
-    background: url("../img/solid-share-arrow.svg") no-repeat;
+.rst-content p.remix-link-container {
     display: block;
-    width: 1.5em;
-    height: 1.5em;
-    margin: auto;
+    text-align: right;
+    margin: 0;
+    line-height: 1em;
 }
 
-a.remix-link .link-text {
-    display: none;       /* Visible only on hover. */
-    width: 3.3em;        /* Narrow enough to get two lines of text. */
-    margin: auto;
-    text-align: center;
-    font-size: 0.8em;
-    line-height: normal;
-    color: black;
+.rst-content .remix-link-container a.remix-link {
+    display: inline-block;
+    font-size: 0.7em;
+    padding: 0.1em 0.4em;
+    background: #e1e4e5;
+    color: #707070;
 }
 
-a.remix-link:hover {
-    opacity: 0.5;
+.rst-content .remix-link-container a.remix-link:hover {
+    background: #c8cbcc;
 }
 
-a.remix-link:hover .link-text {
-    display: block;
+.rst-content div.highlight-solidity,
+.rst-content div.highlight-yul {
+    margin-top: 0;
 }
diff --git a/docs/_static/css/dark.css b/docs/_static/css/dark.css
index a31ba86512..cba22066bf 100644
--- a/docs/_static/css/dark.css
+++ b/docs/_static/css/dark.css
@@ -1,7 +1,7 @@
 /* links */
 
 .rst-content a:not(:visited) {
-    color: #aaddff !important;
+    color: #aaddff;
 }
 
 /* code directives */
@@ -626,12 +626,10 @@ code.docutils.literal.notranslate {
 }
 
 
-/* Literal.Number.Integer.Long */
-
-
 /* Link to Remix IDE shown over code snippets */
-a.remix-link {
-    filter: invert(1); /* The icon is black. In dark mode we want it white. */
+
+.rst-content .remix-link-container a.remix-link {
+    color: black;
 }
 
 
diff --git a/docs/analysing-compilation-output.rst b/docs/analysing-compilation-output.rst
index 892b18b957..183f773223 100644
--- a/docs/analysing-compilation-output.rst
+++ b/docs/analysing-compilation-output.rst
@@ -11,7 +11,7 @@ visual diff of the assembly before and after a change is often very enlightening
 
 Consider the following contract (named, say ``contract.sol``):
 
-.. code-block:: Solidity
+.. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.5.0 <0.9.0;
diff --git a/docs/ext/remix_code_links.py b/docs/ext/remix_code_links.py
index 47c5a32a97..31a5667689 100644
--- a/docs/ext/remix_code_links.py
+++ b/docs/ext/remix_code_links.py
@@ -26,19 +26,12 @@ def remix_code_url(source_code, language, solidity_version):
 
 
 def build_remix_link_node(url):
-    link_icon_node = docutils.nodes.inline()
-    link_icon_node.set_class('link-icon')
-
-    link_text_node = docutils.nodes.inline(text="open in Remix")
-    link_text_node.set_class('link-text')
-
-    reference_node = docutils.nodes.reference('', '', internal=False, refuri=url)
+    reference_node = docutils.nodes.reference('', 'open in Remix', internal=False, refuri=url, target='_blank')
     reference_node.set_class('remix-link')
-    reference_node += [link_icon_node, link_text_node]
 
     paragraph_node = docutils.nodes.paragraph()
     paragraph_node.set_class('remix-link-container')
-    paragraph_node += reference_node
+    paragraph_node.append(reference_node)
     return paragraph_node
 
 
@@ -49,22 +42,24 @@ def insert_remix_link(app, doctree, solidity_version):
     for literal_block_node in doctree.traverse(docutils.nodes.literal_block):
         assert 'language' in literal_block_node.attributes
         language = literal_block_node.attributes['language'].lower()
-        if language in ['solidity', 'yul']:
-            text_nodes = list(literal_block_node.traverse(docutils.nodes.Text))
-            assert len(text_nodes) == 1
-
-            remix_url = remix_code_url(text_nodes[0], language, solidity_version)
-            url_length = len(remix_url.encode('utf-8'))
-            if url_length > MAX_SAFE_URL_LENGTH:
-                logger.warning(
-                    "Remix URL generated from the code snippet exceeds the maximum safe URL length "
-                    " (%d > %d bytes).",
-                    url_length,
-                    MAX_SAFE_URL_LENGTH,
-                    location=(literal_block_node.source, literal_block_node.line),
-                )
-
-            insert_node_before(literal_block_node, build_remix_link_node(remix_url))
+        if language not in ['solidity', 'yul']:
+            continue
+
+        text_nodes = list(literal_block_node.traverse(docutils.nodes.Text))
+        assert len(text_nodes) == 1
+
+        remix_url = remix_code_url(text_nodes[0], language, solidity_version)
+        url_length = len(remix_url.encode('utf-8'))
+        if url_length > MAX_SAFE_URL_LENGTH:
+            logger.warning(
+                "Remix URL generated from the code snippet exceeds the maximum safe URL length "
+                " (%d > %d bytes).",
+                url_length,
+                MAX_SAFE_URL_LENGTH,
+                location=(literal_block_node.source, literal_block_node.line),
+            )
+
+        insert_node_before(literal_block_node, build_remix_link_node(remix_url))
 
 
 def setup(app):
diff --git a/docs/natspec-format.rst b/docs/natspec-format.rst
index b23a46090d..0265fef3e6 100644
--- a/docs/natspec-format.rst
+++ b/docs/natspec-format.rst
@@ -58,7 +58,7 @@ The following example shows a contract and a function using all available tags.
 
   This may change in the future.
 
-.. code-block:: Solidity
+.. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.2 < 0.9.0;
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index 45d8d410da..9c862e5309 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -73,7 +73,7 @@ Tutorial
 Overflow
 ========
 
-.. code-block:: Solidity
+.. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0;
@@ -122,7 +122,7 @@ Here, it reports the following:
 If we add ``require`` statements that filter out overflow cases,
 the SMTChecker proves that no overflow is reachable (by not reporting warnings):
 
-.. code-block:: Solidity
+.. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0;
@@ -160,7 +160,7 @@ Since ``f`` is indeed monotonically increasing, the SMTChecker proves that our
 property is correct. You are encouraged to play with the property and the function
 definition to see what results come out!
 
-.. code-block:: Solidity
+.. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0;
@@ -182,7 +182,7 @@ The following code searches for the maximum element of an unrestricted array of
 numbers, and asserts the property that the found element must be greater or
 equal every element in the array.
 
-.. code-block:: Solidity
+.. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0;
@@ -216,7 +216,7 @@ All the properties are correctly proven safe. Feel free to change the
 properties and/or add restrictions on the array to see different results.
 For example, changing the code to
 
-.. code-block:: Solidity
+.. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0;
@@ -268,7 +268,7 @@ Let us place a robot at position (0, 0). The robot can only move diagonally, one
 and cannot move outside the grid. The robot's state machine can be represented by the smart contract
 below.
 
-.. code-block:: Solidity
+.. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0;
@@ -319,7 +319,7 @@ We can also trick the SMTChecker into giving us a path to a certain position we
 think might be reachable.  We can add the property that (2, 4) is *not*
 reachable, by adding the following function.
 
-.. code-block:: Solidity
+.. code-block:: solidity
 
     function reach_2_4() public view {
         assert(!(x == 2 && y == 4));
@@ -368,7 +368,7 @@ In some cases, it is possible to automatically infer properties over state
 variables that are still true even if the externally called code can do
 anything, including reenter the caller contract.
 
-.. code-block:: Solidity
+.. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0;

From 778d6f4b26f53fd5907440175c8921d76e82066e Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 22 Mar 2023 13:21:04 +0100
Subject: [PATCH 1339/1748] Migrate externalTests.sh to python
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 scripts/common/shell_command.py |  34 +++++++
 test/externalTests.sh           |  55 -----------
 test/external_tests.py          | 158 ++++++++++++++++++++++++++++++++
 3 files changed, 192 insertions(+), 55 deletions(-)
 create mode 100644 scripts/common/shell_command.py
 delete mode 100755 test/externalTests.sh
 create mode 100755 test/external_tests.py

diff --git a/scripts/common/shell_command.py b/scripts/common/shell_command.py
new file mode 100644
index 0000000000..e31389bb82
--- /dev/null
+++ b/scripts/common/shell_command.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+import os
+import subprocess
+
+def run_cmd(command: str, env: dict = None, logfile: str = None) -> int:
+    """
+    Args:
+        command: command to run
+        logfile: log file name
+        env:     dictionary holding key-value pairs for bash environment variables
+    Returns:
+        int: The exit status of the command. Exit status codes are:
+            0     -> Success
+            1-255 -> Failure
+    """
+    if logfile is None:
+        logfile = os.devnull
+    if env is None:
+        env = os.environ.copy()
+    with open(
+        file=logfile,
+        mode='w',
+        encoding='utf8'
+    ) as log:
+        ret = subprocess.run(
+            command,
+            shell=True,
+            check=True,
+            executable='/bin/bash',
+            env=env,
+            stdout=log if not logfile else None,
+            stderr=None
+        )
+        return ret.returncode
diff --git a/test/externalTests.sh b/test/externalTests.sh
deleted file mode 100755
index 4746e2a587..0000000000
--- a/test/externalTests.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Bash script to run external Solidity tests.
-#
-# Argument: Path to soljson.js to test.
-#
-# Requires npm, networking access and git to download the tests.
-#
-# ------------------------------------------------------------------------------
-# 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/>
-#
-# (c) 2016 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source test/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/..")
-
-verify_input "$@"
-
-printTask "Running external tests..."
-
-"${REPO_ROOT}/test/externalTests/zeppelin.sh" "$@"
-"${REPO_ROOT}/test/externalTests/gnosis.sh" "$@"
-"${REPO_ROOT}/test/externalTests/colony.sh" "$@"
-"${REPO_ROOT}/test/externalTests/ens.sh" "$@"
-"${REPO_ROOT}/test/externalTests/trident.sh" "$@"
-"${REPO_ROOT}/test/externalTests/euler.sh" "$@"
-"${REPO_ROOT}/test/externalTests/yield-liquidator.sh" "$@"
-"${REPO_ROOT}/test/externalTests/bleeps.sh" "$@"
-"${REPO_ROOT}/test/externalTests/pool-together.sh" "$@"
-"${REPO_ROOT}/test/externalTests/perpetual-pools.sh" "$@"
-"${REPO_ROOT}/test/externalTests/uniswap.sh" "$@"
-"${REPO_ROOT}/test/externalTests/prb-math.sh" "$@"
-"${REPO_ROOT}/test/externalTests/elementfi.sh" "$@"
-"${REPO_ROOT}/test/externalTests/brink.sh" "$@"
-"${REPO_ROOT}/test/externalTests/chainlink.sh" "$@"
-"${REPO_ROOT}/test/externalTests/gp2.sh" "$@"
diff --git a/test/external_tests.py b/test/external_tests.py
new file mode 100755
index 0000000000..c230533a09
--- /dev/null
+++ b/test/external_tests.py
@@ -0,0 +1,158 @@
+#!/usr/bin/env python3
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2023 solidity contributors.
+# ------------------------------------------------------------------------------
+
+from argparse import ArgumentParser, Namespace
+import os
+from pathlib import Path
+import sys
+
+# Our scripts/ is not a proper Python package so we need to modify PYTHONPATH to import from it
+# pragma pylint: disable=import-error,wrong-import-position
+SCRIPTS_DIR = Path(__file__).parents[1] / "scripts"
+sys.path.insert(0, str(SCRIPTS_DIR))
+
+from common.shell_command import run_cmd
+
+EXTERNAL_TESTS_DIR = Path(__file__).parent / "externalTests"
+
+
+class ExternalTestNotFound(Exception):
+    pass
+
+
+def detect_external_tests() -> dict:
+    # TODO: Remove `file_path.stem != "common"` when we complete the migration
+    # of the external tests to python, since there will be no more
+    # common.sh script in the externalTests folder.
+    return {
+        file_path.stem: file_path
+        for file_path in Path(EXTERNAL_TESTS_DIR).iterdir()
+        if file_path.is_file() and file_path.suffix == ".sh" and file_path.stem != "common"
+    }
+
+
+def display_available_external_tests(_):
+    print("Available external tests:")
+    print(*detect_external_tests().keys())
+
+
+def run_test_scripts(solc_binary_type: str, solc_binary_path: Path, tests: dict):
+    for test_name, test_script_path in tests.items():
+        print(f"Running {test_name} external test...")
+        subprocess.run(
+            [test_script_path, solc_binary_type, solc_binary_path],
+            check=True
+        )
+
+
+def run_external_tests(args: dict):
+    solc_binary_type = args["solc_binary_type"]
+    solc_binary_path = args["solc_binary_path"]
+
+    all_test_scripts = detect_external_tests()
+    if args["run_all"]:
+        run_test_scripts(solc_binary_type, solc_binary_path, all_test_scripts)
+    else:
+        selected_tests = args["selected_tests"]
+        if selected_tests:
+            unrecognized_tests = set(selected_tests) - set(all_test_scripts.keys())
+            if unrecognized_tests != set():
+                raise ExternalTestNotFound(
+                    f"External test(s) not found: {', '.join(unrecognized_tests)}"
+                )
+            run_test_scripts(
+                solc_binary_type,
+                solc_binary_path,
+                {k: all_test_scripts[k] for k in selected_tests},
+            )
+    raise ExternalTestNotFound(
+        "External test was not selected. Please use --run or --run-all option"
+    )
+
+
+def parse_commandline() -> Namespace:
+    script_description = "Script to run external Solidity tests."
+
+    parser = ArgumentParser(description=script_description)
+    subparser = parser.add_subparsers()
+    list_command = subparser.add_parser(
+        "list",
+        help="List all available external tests.",
+    )
+    list_command.set_defaults(cmd=display_available_external_tests)
+
+    run_command = subparser.add_parser(
+        "test",
+        help="Run external tests.",
+    )
+    run_command.set_defaults(cmd=run_external_tests)
+
+    run_command.add_argument(
+        "--solc-binary-type",
+        dest="solc_binary_type",
+        type=str,
+        required=True,
+        choices=["native", "solcjs"],
+        help="Type of the solidity compiler binary to be used.",
+    )
+    run_command.add_argument(
+        "--solc-binary-path",
+        dest="solc_binary_path",
+        type=Path,
+        required=True,
+        help="Path to the solidity compiler binary.",
+    )
+
+    running_mode = run_command.add_mutually_exclusive_group()
+    running_mode.add_argument(
+        "--run",
+        metavar="TEST_NAME",
+        dest="selected_tests",
+        nargs="+",
+        default=[],
+        help="List of one or more external tests to run (separated by sapce).",
+    )
+    running_mode.add_argument(
+        "--run-all",
+        dest="run_all",
+        default=False,
+        action="store_true",
+        help="Run all available external tests.",
+    )
+
+    return parser.parse_args()
+
+
+def main():
+    try:
+        args = parse_commandline()
+        args.cmd(vars(args))
+        return os.EX_OK
+    except ExternalTestNotFound as exception:
+        print(f"Error: {exception}", file=sys.stderr)
+        return os.EX_NOINPUT
+    except RuntimeError as exception:
+        print(f"Error: {exception}", file=sys.stderr)
+        return 1
+
+
+if __name__ == "__main__":
+    sys.exit(main())

From 28a959295bf034010b8a5f9f108c6f7be5ad9949 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Wed, 26 Apr 2023 14:14:36 +0200
Subject: [PATCH 1340/1748] Move common.sh from test/externalTests to
 scripts/externalTests

---
 scripts/common/shell_command.py           | 34 -----------------------
 {test => scripts}/externalTests/common.sh |  0
 test/externalTests/bleeps.sh              |  2 +-
 test/externalTests/brink.sh               |  2 +-
 test/externalTests/chainlink.sh           |  2 +-
 test/externalTests/colony.sh              |  2 +-
 test/externalTests/elementfi.sh           |  2 +-
 test/externalTests/ens.sh                 |  2 +-
 test/externalTests/euler.sh               |  2 +-
 test/externalTests/gnosis.sh              |  2 +-
 test/externalTests/gp2.sh                 |  2 +-
 test/externalTests/perpetual-pools.sh     |  2 +-
 test/externalTests/pool-together.sh       |  2 +-
 test/externalTests/prb-math.sh            |  2 +-
 test/externalTests/solc-js/solc-js.sh     |  2 +-
 test/externalTests/trident.sh             |  2 +-
 test/externalTests/uniswap.sh             |  2 +-
 test/externalTests/yield-liquidator.sh    |  2 +-
 test/externalTests/zeppelin.sh            |  2 +-
 test/external_tests.py                    | 13 ++-------
 20 files changed, 19 insertions(+), 62 deletions(-)
 delete mode 100644 scripts/common/shell_command.py
 rename {test => scripts}/externalTests/common.sh (100%)

diff --git a/scripts/common/shell_command.py b/scripts/common/shell_command.py
deleted file mode 100644
index e31389bb82..0000000000
--- a/scripts/common/shell_command.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python3
-import os
-import subprocess
-
-def run_cmd(command: str, env: dict = None, logfile: str = None) -> int:
-    """
-    Args:
-        command: command to run
-        logfile: log file name
-        env:     dictionary holding key-value pairs for bash environment variables
-    Returns:
-        int: The exit status of the command. Exit status codes are:
-            0     -> Success
-            1-255 -> Failure
-    """
-    if logfile is None:
-        logfile = os.devnull
-    if env is None:
-        env = os.environ.copy()
-    with open(
-        file=logfile,
-        mode='w',
-        encoding='utf8'
-    ) as log:
-        ret = subprocess.run(
-            command,
-            shell=True,
-            check=True,
-            executable='/bin/bash',
-            env=env,
-            stdout=log if not logfile else None,
-            stderr=None
-        )
-        return ret.returncode
diff --git a/test/externalTests/common.sh b/scripts/externalTests/common.sh
similarity index 100%
rename from test/externalTests/common.sh
rename to scripts/externalTests/common.sh
diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index 22e54ac9ce..9395521004 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
index 901a0cfc0d..77dd62f940 100755
--- a/test/externalTests/brink.sh
+++ b/test/externalTests/brink.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/chainlink.sh b/test/externalTests/chainlink.sh
index 249a1254cd..a11266c3b8 100755
--- a/test/externalTests/chainlink.sh
+++ b/test/externalTests/chainlink.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/colony.sh b/test/externalTests/colony.sh
index 8582411b99..402865107a 100755
--- a/test/externalTests/colony.sh
+++ b/test/externalTests/colony.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index b667a4bbc0..b3348e339c 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 77395160d3..7f713f4abd 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 78e89d147b..586526124f 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index 00ea2597e8..de0624c06c 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index 120379478a..a73f1453b3 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index 18fb308af4..70a14c4993 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index 86cd3ee684..77b3ad1499 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
index 78a39519e4..99c7c2716c 100755
--- a/test/externalTests/prb-math.sh
+++ b/test/externalTests/prb-math.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/solc-js/solc-js.sh b/test/externalTests/solc-js/solc-js.sh
index bf7ca87628..af325326c2 100755
--- a/test/externalTests/solc-js/solc-js.sh
+++ b/test/externalTests/solc-js/solc-js.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 SOLJSON="$1"
 VERSION="$2"
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index b5d48b500a..f02123217a 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index 8b07aee84e..d9a25138f8 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
index a224433117..8b256d797a 100755
--- a/test/externalTests/yield-liquidator.sh
+++ b/test/externalTests/yield-liquidator.sh
@@ -22,7 +22,7 @@
 set -e
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 2a95fc8ddf..46b3f2d898 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -27,7 +27,7 @@ set -e
 export NODE_OPTIONS="--max-old-space-size=4096"
 
 source scripts/common.sh
-source test/externalTests/common.sh
+source scripts/externalTests/common.sh
 
 REPO_ROOT=$(realpath "$(dirname "$0")/../..")
 
diff --git a/test/external_tests.py b/test/external_tests.py
index c230533a09..e25311793e 100755
--- a/test/external_tests.py
+++ b/test/external_tests.py
@@ -23,13 +23,7 @@
 import os
 from pathlib import Path
 import sys
-
-# Our scripts/ is not a proper Python package so we need to modify PYTHONPATH to import from it
-# pragma pylint: disable=import-error,wrong-import-position
-SCRIPTS_DIR = Path(__file__).parents[1] / "scripts"
-sys.path.insert(0, str(SCRIPTS_DIR))
-
-from common.shell_command import run_cmd
+import subprocess
 
 EXTERNAL_TESTS_DIR = Path(__file__).parent / "externalTests"
 
@@ -39,13 +33,10 @@ class ExternalTestNotFound(Exception):
 
 
 def detect_external_tests() -> dict:
-    # TODO: Remove `file_path.stem != "common"` when we complete the migration
-    # of the external tests to python, since there will be no more
-    # common.sh script in the externalTests folder.
     return {
         file_path.stem: file_path
         for file_path in Path(EXTERNAL_TESTS_DIR).iterdir()
-        if file_path.is_file() and file_path.suffix == ".sh" and file_path.stem != "common"
+        if file_path.is_file() and file_path.suffix == ".sh"
     }
 
 

From 75960e6db82cff7ca5fd2bc8ef71e2510aad9003 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 28 Apr 2023 17:49:00 +0200
Subject: [PATCH 1341/1748] Fix throw of ExternalTestNotFound in
 external_tests.py

---
 test/external_tests.py | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/test/external_tests.py b/test/external_tests.py
index e25311793e..59b22af7e5 100755
--- a/test/external_tests.py
+++ b/test/external_tests.py
@@ -59,23 +59,26 @@ def run_external_tests(args: dict):
     solc_binary_path = args["solc_binary_path"]
 
     all_test_scripts = detect_external_tests()
+    selected_tests = args["selected_tests"]
     if args["run_all"]:
+        assert len(selected_tests) == 0
         run_test_scripts(solc_binary_type, solc_binary_path, all_test_scripts)
-    else:
-        selected_tests = args["selected_tests"]
-        if selected_tests:
-            unrecognized_tests = set(selected_tests) - set(all_test_scripts.keys())
-            if unrecognized_tests != set():
-                raise ExternalTestNotFound(
-                    f"External test(s) not found: {', '.join(unrecognized_tests)}"
-                )
-            run_test_scripts(
-                solc_binary_type,
-                solc_binary_path,
-                {k: all_test_scripts[k] for k in selected_tests},
-            )
-    raise ExternalTestNotFound(
-        "External test was not selected. Please use --run or --run-all option"
+        return
+
+    if len(selected_tests) == 0:
+        raise ExternalTestNotFound(
+            "External test was not selected. Please use --run or --run-all option"
+        )
+
+    unrecognized_tests = set(selected_tests) - set(all_test_scripts.keys())
+    if unrecognized_tests != set():
+        raise ExternalTestNotFound(
+            f"External test(s) not found: {', '.join(unrecognized_tests)}"
+        )
+    run_test_scripts(
+        solc_binary_type,
+        solc_binary_path,
+        {k: all_test_scripts[k] for k in selected_tests},
     )
 
 

From 49cf49184a9fef5bf26c3508d2b451b8e692e899 Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Tue, 2 May 2023 17:05:23 +0100
Subject: [PATCH 1342/1748] Update security-considerations.rst (#14079)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update security-considerations.rst

Spell checking mostly

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* fixup! Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update docs/security-considerations.rst

* Update security-considerations.rst

* Update security-considerations.rst

* Update docs/security-considerations.rst

Co-authored-by: r0qs <deepmarolaest@gmail.com>

---------

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
Co-authored-by: r0qs <deepmarolaest@gmail.com>
---
 docs/security-considerations.rst | 304 +++++++++++++++----------------
 1 file changed, 151 insertions(+), 153 deletions(-)

diff --git a/docs/security-considerations.rst b/docs/security-considerations.rst
index 4b524cbbde..95c0edb99b 100644
--- a/docs/security-considerations.rst
+++ b/docs/security-considerations.rst
@@ -7,28 +7,28 @@ Security Considerations
 While it is usually quite easy to build software that works as expected,
 it is much harder to check that nobody can use it in a way that was **not** anticipated.
 
-In Solidity, this is even more important because you can use smart contracts
-to handle tokens or, possibly, even more valuable things. Furthermore, every
-execution of a smart contract happens in public and, in addition to that,
-the source code is often available.
-
-Of course you always have to consider how much is at stake:
-You can compare a smart contract with a web service that is open to the
-public (and thus, also to malicious actors) and perhaps even open source.
-If you only store your grocery list on that web service, you might not have
-to take too much care, but if you manage your bank account using that web service,
-you should be more careful.
-
-This section will list some pitfalls and general security recommendations but
-can, of course, never be complete.  Also, keep in mind that even if your smart
-contract code is bug-free, the compiler or the platform itself might have a
-bug. A list of some publicly known security-relevant bugs of the compiler can
-be found in the :ref:`list of known bugs<known_bugs>`, which is also
-machine-readable. Note that there is a bug bounty program that covers the code
-generator of the Solidity compiler.
-
-As always, with open source documentation, please help us extend this section
-(especially, some examples would not hurt)!
+In Solidity, this is even more important because you can use smart contracts to handle tokens or,
+possibly, even more valuable things.
+Furthermore, every execution of a smart contract happens in public and,
+in addition to that, the source code is often available.
+
+Of course, you always have to consider how much is at stake:
+You can compare a smart contract with a web service that is open to the public
+(and thus, also to malicious actors) and perhaps even open-source.
+If you only store your grocery list on that web service, you might not have to take too much care,
+but if you manage your bank account using that web service, you should be more careful.
+
+This section will list some pitfalls and general security recommendations
+but can, of course, never be complete.
+Also, keep in mind that even if your smart contract code is bug-free,
+the compiler or the platform itself might have a bug.
+A list of some publicly known security-relevant bugs of the compiler can be found
+in the :ref:`list of known bugs<known_bugs>`, which is also machine-readable.
+Note that there is a `Bug Bounty Program <https://ethereum.org/en/bug-bounty/>`_
+that covers the code generator of the Solidity compiler.
+
+As always, with open-source documentation,
+please help us extend this section (especially, some examples would not hurt)!
 
 NOTE: In addition to the list below, you can find more security recommendations and best practices
 `in Guy Lando's knowledge list <https://github.com/guylando/KnowledgeLists/blob/master/EthereumSmartContracts.md>`_ and
@@ -41,20 +41,18 @@ Pitfalls
 Private Information and Randomness
 ==================================
 
-Everything you use in a smart contract is publicly visible, even
-local variables and state variables marked ``private``.
+Everything you use in a smart contract is publicly visible,
+even local variables and state variables marked ``private``.
 
-Using random numbers in smart contracts is quite tricky if you do not want
-block builders to be able to cheat.
+Using random numbers in smart contracts is quite tricky if you do not want block builders to be able to cheat.
 
 Reentrancy
-===========
+==========
 
-Any interaction from a contract (A) with another contract (B) and any transfer
-of Ether hands over control to that contract (B). This makes it possible for B
-to call back into A before this interaction is completed. To give an example,
-the following code contains a bug (it is just a snippet and not a
-complete contract):
+Any interaction from a contract (A) with another contract (B)
+and any transfer of Ether hands over control to that contract (B).
+This makes it possible for B to call back into A before this interaction is completed.
+To give an example, the following code contains a bug (it is just a snippet and not a complete contract):
 
 .. code-block:: solidity
 
@@ -72,12 +70,12 @@ complete contract):
         }
     }
 
-The problem is not too serious here because of the limited gas as part
-of ``send``, but it still exposes a weakness: Ether transfer can always
-include code execution, so the recipient could be a contract that calls
-back into ``withdraw``. This would let it get multiple refunds and
-basically retrieve all the Ether in the contract. In particular, the
-following contract will allow an attacker to refund multiple times
+The problem is not too serious here because of the limited gas as part of ``send``,
+but it still exposes a weakness:
+Ether transfer can always include code execution,
+so the recipient could be a contract that calls back into ``withdraw``.
+This would let it get multiple refunds and, basically, retrieve all the Ether in the contract.
+In particular, the following contract will allow an attacker to refund multiple times
 as it uses ``call`` which forwards all remaining gas by default:
 
 .. code-block:: solidity
@@ -97,8 +95,7 @@ as it uses ``call`` which forwards all remaining gas by default:
         }
     }
 
-To avoid reentrancy, you can use the Checks-Effects-Interactions pattern as
-demonstrated below:
+To avoid reentrancy, you can use the Checks-Effects-Interactions pattern as demonstrated below:
 
 .. code-block:: solidity
 
@@ -116,58 +113,58 @@ demonstrated below:
         }
     }
 
-The Checks-Effects-Interactions pattern ensures that all code paths through a contract complete all required checks
-of the supplied parameters before modifying the contract's state (Checks); only then it makes any changes to the state (Effects);
-it may make calls to functions in other contracts *after* all planned state changes have been written to
-storage (Interactions). This is a common foolproof way to prevent *reentrancy attacks*, where an externally called
-malicious contract is able to double-spend an allowance, double-withdraw a balance, among other things, by using logic that calls back into the
-original contract before it has finalized its transaction.
-
-Note that reentrancy is not only an effect of Ether transfer but of any
-function call on another contract. Furthermore, you also have to take
-multi-contract situations into account. A called contract could modify the
-state of another contract you depend on.
+The Checks-Effects-Interactions pattern ensures that all code paths through a contract
+complete all required checks of the supplied parameters before modifying the contract's state (Checks);
+only then it makes any changes to the state (Effects);
+it may make calls to functions in other contracts
+*after* all planned state changes have been written to storage (Interactions).
+This is a common foolproof way to prevent *reentrancy attacks*,
+where an externally called malicious contract can double-spend an allowance,
+double-withdraw a balance, among other things,
+by using logic that calls back into the original contract before it has finalized its transaction.
+
+Note that reentrancy is not only an effect of Ether transfer
+but of any function call on another contract.
+Furthermore, you also have to take multi-contract situations into account.
+A called contract could modify the state of another contract you depend on.
 
 Gas Limit and Loops
 ===================
 
-Loops that do not have a fixed number of iterations, for example, loops that depend on storage values, have to be used carefully:
-Due to the block gas limit, transactions can only consume a certain amount of gas. Either explicitly or just due to
-normal operation, the number of iterations in a loop can grow beyond the block gas limit which can cause the complete
-contract to be stalled at a certain point. This may not apply to ``view`` functions that are only executed
-to read data from the blockchain. Still, such functions may be called by other contracts as part of on-chain operations
-and stall those. Please be explicit about such cases in the documentation of your contracts.
+Loops that do not have a fixed number of iterations, for example,
+loops that depend on storage values, have to be used carefully:
+Due to the block gas limit, transactions can only consume a certain amount of gas.
+Either explicitly or just due to normal operation,
+the number of iterations in a loop can grow beyond the block gas limit
+which can cause the complete contract to be stalled at a certain point.
+This may not apply to ``view`` functions that are only executed to read data from the blockchain.
+Still, such functions may be called by other contracts as part of on-chain operations and stall those.
+Please be explicit about such cases in the documentation of your contracts.
 
 Sending and Receiving Ether
 ===========================
 
-- Neither contracts nor "external accounts" are currently able to prevent that someone sends them Ether.
-  Contracts can react on and reject a regular transfer, but there are ways
-  to move Ether without creating a message call. One way is to simply "mine to"
-  the contract address and the second way is using ``selfdestruct(x)``.
+- Neither contracts nor "external accounts" are currently able to prevent someone from sending them Ether.
+  Contracts can react on and reject a regular transfer, but there are ways to move Ether without creating a message call.
+  One way is to simply "mine to" the contract address and the second way is using ``selfdestruct(x)``.
 
-- If a contract receives Ether (without a function being called),
-  either the :ref:`receive Ether <receive-ether-function>`
+- If a contract receives Ether (without a function being called), either the :ref:`receive Ether <receive-ether-function>`
   or the :ref:`fallback <fallback-function>` function is executed.
-  If it does not have a receive nor a fallback function, the Ether will be
-  rejected (by throwing an exception). During the execution of one of these
-  functions, the contract can only rely on the "gas stipend" it is passed (2300
-  gas) being available to it at that time. This stipend is not enough to modify
-  storage (do not take this for granted though, the stipend might change with
-  future hard forks). To be sure that your contract can receive Ether in that
-  way, check the gas requirements of the receive and fallback functions
+  If it does not have a ``receive`` nor a ``fallback`` function, the Ether will be rejected (by throwing an exception).
+  During the execution of one of these functions, the contract can only rely on the "gas stipend" it is passed (2300 gas)
+  being available to it at that time.
+  This stipend is not enough to modify storage (do not take this for granted though, the stipend might change with future hard forks).
+  To be sure that your contract can receive Ether in that way, check the gas requirements of the receive and fallback functions
   (for example in the "details" section in Remix).
 
-- There is a way to forward more gas to the receiving contract using
-  ``addr.call{value: x}("")``. This is essentially the same as ``addr.transfer(x)``,
-  only that it forwards all remaining gas and opens up the ability for the
-  recipient to perform more expensive actions (and it returns a failure code
-  instead of automatically propagating the error). This might include calling back
-  into the sending contract or other state changes you might not have thought of.
+- There is a way to forward more gas to the receiving contract using ``addr.call{value: x}("")``.
+  This is essentially the same as ``addr.transfer(x)``, only that it forwards all remaining gas
+  and opens up the ability for the recipient to perform more expensive actions
+  (and it returns a failure code instead of automatically propagating the error).
+  This might include calling back into the sending contract or other state changes you might not have thought of.
   So it allows for great flexibility for honest users but also for malicious actors.
 
-- Use the most precise units to represent the wei amount as possible, as you lose
-  any that is rounded due to a lack of precision.
+- Use the most precise units to represent the Wei amount as possible, as you lose any that is rounded due to a lack of precision.
 
 - If you want to send Ether using ``address.transfer``, there are certain details to be aware of:
 
@@ -191,24 +188,28 @@ Sending and Receiving Ether
 Call Stack Depth
 ================
 
-External function calls can fail any time because they exceed the maximum
-call stack size limit of 1024. In such situations, Solidity throws an exception.
+External function calls can fail at any time
+because they exceed the maximum call stack size limit of 1024.
+In such situations, Solidity throws an exception.
 Malicious actors might be able to force the call stack to a high value
-before they interact with your contract. Note that, since `Tangerine Whistle <https://eips.ethereum.org/EIPS/eip-608>`_ hardfork, the `63/64 rule <https://eips.ethereum.org/EIPS/eip-150>`_ makes call stack depth attack impractical. Also note that the call stack and the expression stack are unrelated, even though both have a size limit of 1024 stack slots.
+before they interact with your contract.
+Note that, since `Tangerine Whistle <https://eips.ethereum.org/EIPS/eip-608>`_ hardfork,
+the `63/64 rule <https://eips.ethereum.org/EIPS/eip-150>`_ makes call stack depth attack impractical.
+Also note that the call stack and the expression stack are unrelated,
+even though both have a size limit of 1024 stack slots.
 
-Note that ``.send()`` does **not** throw an exception if the call stack is
-depleted but rather returns ``false`` in that case. The low-level functions
-``.call()``, ``.delegatecall()`` and ``.staticcall()`` behave in the same way.
+Note that ``.send()`` does **not** throw an exception if the call stack is depleted
+but rather returns ``false`` in that case.
+The low-level functions ``.call()``, ``.delegatecall()`` and ``.staticcall()`` behave in the same way.
 
 Authorized Proxies
 ==================
 
-If your contract can act as a proxy, i.e. if it can call arbitrary contracts
-with user-supplied data, then the user can essentially assume the identity
-of the proxy contract. Even if you have other protective measures in place,
-it is best to build your contract system such that the proxy does not have
-any permissions (not even for itself). If needed, you can accomplish that
-using a second proxy:
+If your contract can act as a proxy, i.e. if it can call arbitrary contracts with user-supplied data,
+then the user can essentially assume the identity of the proxy contract.
+Even if you have other protective measures in place, it is best to build your contract system such
+that the proxy does not have any permissions (not even for itself).
+If needed, you can accomplish that using a second proxy:
 
 .. code-block:: solidity
 
@@ -236,7 +237,8 @@ using a second proxy:
 tx.origin
 =========
 
-Never use tx.origin for authorization. Let's say you have a wallet contract like this:
+Never use ``tx.origin`` for authorization.
+Let's say you have a wallet contract like this:
 
 .. code-block:: solidity
 
@@ -279,7 +281,11 @@ Now someone tricks you into sending Ether to the address of this attack wallet:
         }
     }
 
-If your wallet had checked ``msg.sender`` for authorization, it would get the address of the attack wallet, instead of the owner address. But by checking ``tx.origin``, it gets the original address that kicked off the transaction, which is still the owner address. The attack wallet instantly drains all your funds.
+If your wallet had checked ``msg.sender`` for authorization, it would get the address of the attack wallet,
+instead of the owner's address.
+But by checking ``tx.origin``, it gets the original address that kicked off the transaction,
+which is still the owner's address.
+The attack wallet instantly drains all your funds.
 
 .. _underflow-overflow:
 
@@ -319,16 +325,14 @@ Try to use ``require`` to limit the size of inputs to a reasonable range and use
 Clearing Mappings
 =================
 
-The Solidity type ``mapping`` (see :ref:`mapping-types`) is a storage-only
-key-value data structure that does not keep track of the keys that were
-assigned a non-zero value.  Because of that, cleaning a mapping without extra
-information about the written keys is not possible.
-If a ``mapping`` is used as the base type of a dynamic storage array, deleting
-or popping the array will have no effect over the ``mapping`` elements.  The
-same happens, for example, if a ``mapping`` is used as the type of a member
-field of a ``struct`` that is the base type of a dynamic storage array.  The
-``mapping`` is also ignored in assignments of structs or arrays containing a
-``mapping``.
+The Solidity type ``mapping`` (see :ref:`mapping-types`) is a storage-only key-value data structure
+that does not keep track of the keys that were assigned a non-zero value.
+Because of that, cleaning a mapping without extra information about the written keys is not possible.
+If a ``mapping`` is used as the base type of a dynamic storage array,
+deleting or popping the array will have no effect over the ``mapping`` elements.
+The same happens, for example, if a ``mapping`` is used as the type of a member field of a ``struct``
+that is the base type of a dynamic storage array.
+The ``mapping`` is also ignored in assignments of structs or arrays containing a ``mapping``.
 
 .. code-block:: solidity
 
@@ -356,15 +360,12 @@ field of a ``struct`` that is the base type of a dynamic storage array.  The
         }
     }
 
-Consider the example above and the following sequence of calls: ``allocate(10)``,
-``writeMap(4, 128, 256)``.
+Consider the example above and the following sequence of calls: ``allocate(10)``, ``writeMap(4, 128, 256)``.
 At this point, calling ``readMap(4, 128)`` returns 256.
-If we call ``eraseMaps``, the length of state variable ``array`` is zeroed, but
-since its ``mapping`` elements cannot be zeroed, their information stays alive
-in the contract's storage.
-After deleting ``array``, calling ``allocate(5)`` allows us to access
-``array[4]`` again, and calling ``readMap(4, 128)`` returns 256 even without
-another call to ``writeMap``.
+If we call ``eraseMaps``, the length of the state variable ``array`` is zeroed,
+but since its ``mapping`` elements cannot be zeroed, their information stays alive in the contract's storage.
+After deleting ``array``, calling ``allocate(5)`` allows us to access ``array[4]`` again,
+and calling ``readMap(4, 128)`` returns 256 even without another call to ``writeMap``.
 
 If your ``mapping`` information must be deleted, consider using a library similar to
 `iterable mapping <https://github.com/ethereum/dapp-bin/blob/master/library/iterable_mapping.sol>`_,
@@ -375,10 +376,11 @@ Minor Details
 
 - Types that do not occupy the full 32 bytes might contain "dirty higher order bits".
   This is especially important if you access ``msg.data`` - it poses a malleability risk:
-  You can craft transactions that call a function ``f(uint8 x)`` with a raw byte argument
-  of ``0xff000001`` and with ``0x00000001``. Both are fed to the contract and both will
-  look like the number ``1`` as far as ``x`` is concerned, but ``msg.data`` will
-  be different, so if you use ``keccak256(msg.data)`` for anything, you will get different results.
+  You can craft transactions that call a function ``f(uint8 x)``
+  with a raw byte argument of ``0xff000001`` and with ``0x00000001``.
+  Both are fed to the contract and both will look like the number ``1`` as far as ``x`` is concerned,
+  but ``msg.data`` will be different, so if you use ``keccak256(msg.data)`` for anything,
+  you will get different results.
 
 ***************
 Recommendations
@@ -388,48 +390,45 @@ Take Warnings Seriously
 =======================
 
 If the compiler warns you about something, you should change it.
-Even if you do not think that this particular warning has security
-implications, there might be another issue buried beneath it.
-Any compiler warning we issue can be silenced by slight changes to the
-code.
+Even if you do not think that this particular warning has security implications,
+there might be another issue buried beneath it.
+Any compiler warning we issue can be silenced by slight changes to the code.
 
-Always use the latest version of the compiler to be notified about all recently
-introduced warnings.
+Always use the latest version of the compiler to be notified about all recently introduced warnings.
 
-Messages of type ``info`` issued by the compiler are not dangerous, and simply
-represent extra suggestions and optional information that the compiler thinks
-might be useful to the user.
+Messages of type ``info``, issued by the compiler, are not dangerous
+and simply represent extra suggestions and optional information
+that the compiler thinks might be useful to the user.
 
 Restrict the Amount of Ether
 ============================
 
-Restrict the amount of Ether (or other tokens) that can be stored in a smart
-contract. If your source code, the compiler or the platform has a bug, these
-funds may be lost. If you want to limit your loss, limit the amount of Ether.
+Restrict the amount of Ether (or other tokens) that can be stored in a smart contract.
+If your source code, the compiler or the platform has a bug, these funds may be lost.
+If you want to limit your loss, limit the amount of Ether.
 
 Keep it Small and Modular
 =========================
 
-Keep your contracts small and easily understandable. Single out unrelated
-functionality in other contracts or into libraries. General recommendations
-about source code quality of course apply: Limit the amount of local variables,
-the length of functions and so on. Document your functions so that others
-can see what your intention was and whether it is different than what the code does.
+Keep your contracts small and easily understandable.
+Single out unrelated functionality in other contracts or into libraries.
+General recommendations about the source code quality of course apply:
+Limit the amount of local variables, the length of functions and so on.
+Document your functions so that others can see what your intention was
+and whether it is different than what the code does.
 
 Use the Checks-Effects-Interactions Pattern
 ===========================================
 
-Most functions will first perform some checks (who called the function,
-are the arguments in range, did they send enough Ether, does the person
-have tokens, etc.). These checks should be done first.
+Most functions will first perform some checks and they should be done first
+(who called the function, are the arguments in range, did they send enough Ether,
+does the person have tokens, etc.).
 
-As the second step, if all checks passed, effects to the state variables
-of the current contract should be made. Interaction with other contracts
-should be the very last step in any function.
+As the second step, if all checks passed, effects to the state variables of the current contract should be made.
+Interaction with other contracts should be the very last step in any function.
 
-Early contracts delayed some effects and waited for external function
-calls to return in a non-error state. This is often a serious mistake
-because of the reentrancy problem explained above.
+Early contracts delayed some effects and waited for external function calls to return in a non-error state.
+This is often a serious mistake because of the reentrancy problem explained above.
 
 Note that, also, calls to known contracts might in turn cause calls to
 unknown contracts, so it is probably better to just always apply this pattern.
@@ -437,24 +436,23 @@ unknown contracts, so it is probably better to just always apply this pattern.
 Include a Fail-Safe Mode
 ========================
 
-While making your system fully decentralised will remove any intermediary,
-it might be a good idea, especially for new code, to include some kind
-of fail-safe mechanism:
+While making your system fully decentralized will remove any intermediary,
+it might be a good idea, especially for new code, to include some kind of fail-safe mechanism:
 
-You can add a function in your smart contract that performs some
-self-checks like "Has any Ether leaked?",
+You can add a function in your smart contract that performs some self-checks like "Has any Ether leaked?",
 "Is the sum of the tokens equal to the balance of the contract?" or similar things.
-Keep in mind that you cannot use too much gas for that, so help through off-chain
-computations might be needed there.
+Keep in mind that you cannot use too much gas for that,
+so help through off-chain computations might be needed there.
 
-If the self-check fails, the contract automatically switches into some kind
-of "failsafe" mode, which, for example, disables most of the features, hands over
-control to a fixed and trusted third party or just converts the contract into
-a simple "give me back my money" contract.
+If the self-check fails, the contract automatically switches into some kind of "failsafe" mode,
+which, for example, disables most of the features,
+hands over control to a fixed and trusted third party
+or just converts the contract into a simple "give me back my money" contract.
 
 Ask for Peer Review
 ===================
 
 The more people examine a piece of code, the more issues are found.
-Asking people to review your code also helps as a cross-check to find out whether your code
-is easy to understand - a very important criterion for good smart contracts.
+Asking people to review your code also helps as a cross-check to find out
+whether your code is easy to understand -
+a very important criterion for good smart contracts.

From 1e63615206f3b28e185e05bc9c006b510066fa03 Mon Sep 17 00:00:00 2001
From: chriseth <chris@ethereum.org>
Date: Tue, 23 Feb 2021 14:13:52 +0100
Subject: [PATCH 1343/1748] Export all events.

Update tests.

Additional tests

Revert changes to the Natspec
---
 Changelog.md                                  |   7 +-
 libsolidity/ast/AST.cpp                       |  21 +-
 libsolidity/ast/AST.h                         |   4 +
 libsolidity/ast/ASTJsonExporter.cpp           |   2 +
 libsolidity/interface/ABI.cpp                 |   2 +-
 libsolidity/interface/Natspec.cpp             |  53 ++-
 libsolidity/interface/Natspec.h               |   7 +
 .../ast_compact_json_no_pretty_json/output    |   2 +-
 .../ast_compact_json_with_base_path/output    |   3 +-
 .../combined_json_with_base_path/output       |   3 +-
 test/cmdlineTests/events_in_abi/args          |   1 +
 test/cmdlineTests/events_in_abi/input.sol     |  16 +
 test/cmdlineTests/events_in_abi/output        |  59 +++
 .../recovery_ast_constructor/output           |   3 +-
 .../recovery_standard_json/output.json        |   3 +-
 .../standard_only_ast_requested/output.json   |   3 +-
 .../ABIJson/event_emited_in_base_contract.sol |  71 +++
 ...t_from_aggregated_contract_not_emmited.sol |  42 ++
 .../libsolidity/ABIJson/event_inheritance.sol |  62 +++
 test/libsolidity/ABIJson/events_indirect.sol  |  88 ++++
 .../ABIJson/events_repetitions.sol            |  45 ++
 .../ABIJson/same_event_defined_twice.sol      |  61 +++
 .../ASTJSON/abstract_contract.json            |   3 +-
 .../ASTJSON/abstract_contract_parseOnly.json  |   3 +-
 test/libsolidity/ASTJSON/address_payable.json |   3 +-
 .../ASTJSON/address_payable_parseOnly.json    |   3 +-
 test/libsolidity/ASTJSON/array_type_name.json |   3 +-
 .../ASTJSON/array_type_name_parseOnly.json    |   3 +-
 test/libsolidity/ASTJSON/assembly/call.json   |   3 +-
 .../ASTJSON/assembly/call_parseOnly.json      |   3 +-
 .../ASTJSON/assembly/empty_block.json         |   3 +-
 .../assembly/empty_block_parseOnly.json       |   3 +-
 .../ASTJSON/assembly/function.json            |   3 +-
 .../ASTJSON/assembly/function_parseOnly.json  |   3 +-
 test/libsolidity/ASTJSON/assembly/leave.json  |   3 +-
 .../ASTJSON/assembly/leave_parseOnly.json     |   3 +-
 test/libsolidity/ASTJSON/assembly/loop.json   |   3 +-
 .../ASTJSON/assembly/loop_parseOnly.json      |   3 +-
 .../ASTJSON/assembly/nested_functions.json    |   3 +-
 .../assembly/nested_functions_parseOnly.json  |   3 +-
 .../ASTJSON/assembly/slot_offset.json         |   3 +-
 .../assembly/slot_offset_parseOnly.json       |   3 +-
 .../ASTJSON/assembly/stringlit.json           |   3 +-
 .../ASTJSON/assembly/stringlit_parseOnly.json |   3 +-
 test/libsolidity/ASTJSON/assembly/switch.json |   3 +-
 .../ASTJSON/assembly/switch_default.json      |   3 +-
 .../assembly/switch_default_parseOnly.json    |   3 +-
 .../ASTJSON/assembly/switch_parseOnly.json    |   3 +-
 .../ASTJSON/assembly/var_access.json          |   3 +-
 .../assembly/var_access_parseOnly.json        |   3 +-
 .../ast_internal_function_id_export.json      |   9 +-
 .../ASTJSON/base_constructor_call.json        |   6 +-
 .../base_constructor_call_parseOnly.json      |   6 +-
 test/libsolidity/ASTJSON/constructor.json     |   3 +-
 .../ASTJSON/constructor_parseOnly.json        |   3 +-
 .../ASTJSON/contract_dep_order.json           |  15 +-
 .../ASTJSON/contract_dep_order_parseOnly.json |  15 +-
 test/libsolidity/ASTJSON/documentation.json   |  12 +-
 .../ASTJSON/documentation_local_variable.json |   3 +-
 ...ocumentation_local_variable_parseOnly.json |   3 +-
 .../ASTJSON/documentation_on_statements.json  |   3 +-
 ...documentation_on_statements_parseOnly.json |   3 +-
 .../ASTJSON/documentation_parseOnly.json      |   9 +-
 .../ASTJSON/documentation_triple.json         |   3 +-
 .../documentation_triple_parseOnly.json       |   3 +-
 test/libsolidity/ASTJSON/enum_value.json      |   3 +-
 .../ASTJSON/enum_value_parseOnly.json         |   3 +-
 .../ASTJSON/event_aggregated_contract.json    | 398 +++++++++++++++++
 .../ASTJSON/event_aggregated_contract.sol     |  15 +
 .../libsolidity/ASTJSON/event_definition.json |   6 +-
 .../ASTJSON/event_definition_parseOnly.json   |   3 +-
 .../event_emited_in_base_contract.json        | 289 +++++++++++++
 .../ASTJSON/event_emited_in_base_contract.sol |   9 +
 .../ASTJSON/event_inheritance.json            | 194 +++++++++
 .../libsolidity/ASTJSON/event_inheritance.sol |  11 +
 ...variables_of_internal_types_parseOnly.json |   3 +-
 .../ASTJSON/fail_after_parsing_parseOnly.json |   3 +-
 test/libsolidity/ASTJSON/fallback.json        |   3 +-
 ...r.json => fallback_and_receive_ether.json} |   3 +-
 ...her.sol => fallback_and_receive_ether.sol} |   0
 ...fallback_and_receive_ether_parseOnly.json} |   3 +-
 .../ASTJSON/fallback_parseOnly.json           |   3 +-
 .../libsolidity/ASTJSON/fallback_payable.json |   3 +-
 .../ASTJSON/fallback_payable_parseOnly.json   |   3 +-
 test/libsolidity/ASTJSON/function_type.json   |   3 +-
 .../ASTJSON/function_type_parseOnly.json      |   3 +-
 test/libsolidity/ASTJSON/indirect_event.json  | 319 ++++++++++++++
 test/libsolidity/ASTJSON/indirect_event.sol   |  11 +
 .../ASTJSON/indirect_event_parseOnly.json     | 228 ++++++++++
 .../ASTJSON/inheritance_specifier.json        |   6 +-
 .../inheritance_specifier_parseOnly.json      |   6 +-
 test/libsolidity/ASTJSON/license.json         |   3 +-
 .../ASTJSON/license_parseOnly.json            |   3 +-
 .../long_type_name_binary_operation.json      |   3 +-
 ..._type_name_binary_operation_parseOnly.json |   3 +-
 .../ASTJSON/long_type_name_identifier.json    |   3 +-
 .../long_type_name_identifier_parseOnly.json  |   3 +-
 test/libsolidity/ASTJSON/mappings.json        |   3 +-
 .../ASTJSON/mappings_parseOnly.json           |   3 +-
 .../ASTJSON/modifier_definition.json          |   3 +-
 .../modifier_definition_parseOnly.json        |   3 +-
 .../ASTJSON/modifier_invocation.json          |   3 +-
 .../modifier_invocation_parseOnly.json        |   3 +-
 test/libsolidity/ASTJSON/mutability.json      |   3 +-
 .../ASTJSON/mutability_parseOnly.json         |   3 +-
 test/libsolidity/ASTJSON/non_utf8.json        |   3 +-
 .../ASTJSON/non_utf8_parseOnly.json           |   3 +-
 .../not_existing_import_parseOnly.json        |   3 +-
 test/libsolidity/ASTJSON/override.json        |   9 +-
 .../ASTJSON/override_parseOnly.json           |   9 +-
 .../ASTJSON/placeholder_statement.json        |   3 +-
 .../placeholder_statement_parseOnly.json      |   3 +-
 test/libsolidity/ASTJSON/receive_ether.json   |   3 +-
 .../ASTJSON/receive_ether_parseOnly.json      |   3 +-
 test/libsolidity/ASTJSON/short_type_name.json |   3 +-
 .../ASTJSON/short_type_name_parseOnly.json    |   3 +-
 .../ASTJSON/short_type_name_ref.json          |   3 +-
 .../short_type_name_ref_parseOnly.json        |   3 +-
 test/libsolidity/ASTJSON/smoke.json           |   3 +-
 test/libsolidity/ASTJSON/smoke_parseOnly.json |   3 +-
 test/libsolidity/ASTJSON/source_location.json |   3 +-
 .../ASTJSON/source_location_parseOnly.json    |   3 +-
 test/libsolidity/ASTJSON/string.json          |   3 +-
 .../libsolidity/ASTJSON/string_parseOnly.json |   3 +-
 .../ASTJSON/two_base_functions.json           |   9 +-
 .../ASTJSON/two_base_functions_parseOnly.json |   9 +-
 test/libsolidity/ASTJSON/unicode.json         |   3 +-
 .../ASTJSON/unicode_parseOnly.json            |   3 +-
 test/libsolidity/ASTJSON/used_errors.json     |   3 +-
 .../ASTJSON/used_errors_parseOnly.json        |   3 +-
 .../ASTJSON/userDefinedValueType.json         |   3 +-
 .../userDefinedValueType_parseOnly.json       |   3 +-
 .../ASTJSON/user_defined_operator.json        |   3 +-
 .../ASTJSON/using_for_directive.json          |   6 +-
 .../using_for_directive_parseOnly.json        |   6 +-
 test/libsolidity/ASTJSON/yul_hex_literal.json |   3 +-
 .../ASTJSON/yul_hex_literal_parseOnly.json    |   3 +-
 test/libsolidity/SolidityNatspecJSON.cpp      | 407 +++++++++++++++++-
 test/libsolidity/StandardCompiler.cpp         |   5 +-
 139 files changed, 2697 insertions(+), 152 deletions(-)
 create mode 100644 test/cmdlineTests/events_in_abi/args
 create mode 100644 test/cmdlineTests/events_in_abi/input.sol
 create mode 100644 test/cmdlineTests/events_in_abi/output
 create mode 100644 test/libsolidity/ABIJson/event_emited_in_base_contract.sol
 create mode 100644 test/libsolidity/ABIJson/event_from_aggregated_contract_not_emmited.sol
 create mode 100644 test/libsolidity/ABIJson/event_inheritance.sol
 create mode 100644 test/libsolidity/ABIJson/events_indirect.sol
 create mode 100644 test/libsolidity/ABIJson/events_repetitions.sol
 create mode 100644 test/libsolidity/ABIJson/same_event_defined_twice.sol
 create mode 100644 test/libsolidity/ASTJSON/event_aggregated_contract.json
 create mode 100644 test/libsolidity/ASTJSON/event_aggregated_contract.sol
 create mode 100644 test/libsolidity/ASTJSON/event_emited_in_base_contract.json
 create mode 100644 test/libsolidity/ASTJSON/event_emited_in_base_contract.sol
 create mode 100644 test/libsolidity/ASTJSON/event_inheritance.json
 create mode 100644 test/libsolidity/ASTJSON/event_inheritance.sol
 rename test/libsolidity/ASTJSON/{fallback_and_reveice_ether.json => fallback_and_receive_ether.json} (98%)
 rename test/libsolidity/ASTJSON/{fallback_and_reveice_ether.sol => fallback_and_receive_ether.sol} (100%)
 rename test/libsolidity/ASTJSON/{fallback_and_reveice_ether_parseOnly.json => fallback_and_receive_ether_parseOnly.json} (97%)
 create mode 100644 test/libsolidity/ASTJSON/indirect_event.json
 create mode 100644 test/libsolidity/ASTJSON/indirect_event.sol
 create mode 100644 test/libsolidity/ASTJSON/indirect_event_parseOnly.json

diff --git a/Changelog.md b/Changelog.md
index 531ded9a50..80da2b2278 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
  * EVM: Support for the EVM Version "Shanghai".
  * NatSpec: Add support for NatSpec documentation in ``enum`` definitions.
  * NatSpec: Add support for NatSpec documentation in ``struct`` definitions.
+ * NatSpec: Include NatSpec from events that are emitted by a contract but defined outside of it in userdoc and devdoc output.
  * Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
  * Parser: Unary plus is no longer recognized as a unary operator in the AST and triggers an error at the parsing stage (rather than later during the analysis).
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
@@ -16,6 +17,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * ABI: Include events in the ABI that are emitted by a contract but defined outside of it.
  * Antlr Grammar: Fix discrepancy with the parser, which allowed octal numbers.
  * Antlr Grammar: Fix of a discrepancy with the parser, which allowed numbers followed by an identifier with no whitespace.
  * Antlr Grammar: Stricter rules for function definitions. The grammar will no longer accept as valid free functions having specifiers which are exclusive to contract functions.
@@ -23,13 +25,14 @@ Bugfixes:
 
 
 AST Changes:
- * AST: add the ``internalFunctionID`` field to the AST nodes of functions that may be called via the internal dispatch. These IDs are always generated, but they are only used in via-IR code generation.
+ * AST: Add the ``internalFunctionID`` field to the AST nodes of functions that may be called via the internal dispatch. These IDs are always generated, but they are only used in via-IR code generation.
+ * AST: Add the ``usedEvents`` field to ``ContractDefinition`` which contains the AST IDs of all events emitted by the contract as well as all events defined and inherited by the contract.
 
 
 ### 0.8.19 (2023-02-22)
 
 Language Features:
-* Allow defining custom operators for user-defined value types via ``using {f as +} for T global`` syntax.
+ * Allow defining custom operators for user-defined value types via ``using {f as +} for T global`` syntax.
 
 
 Compiler Features:
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index fab1a20f80..833ba739e1 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -220,9 +220,9 @@ vector<EventDefinition const*> const& ContractDefinition::definedInterfaceEvents
 				/// NOTE: this requires the "internal" version of an Event,
 				///       though here internal strictly refers to visibility,
 				///       and not to function encoding (jump vs. call)
-				auto const& function = e->functionType(true);
-				solAssert(function, "");
-				string eventSignature = function->externalSignature();
+				FunctionType const* functionType = e->functionType(true);
+				solAssert(functionType, "");
+				string eventSignature = functionType->externalSignature();
 				if (eventsSeen.count(eventSignature) == 0)
 				{
 					eventsSeen.insert(eventSignature);
@@ -243,6 +243,21 @@ vector<EventDefinition const*> const ContractDefinition::usedInterfaceEvents() c
 	);
 }
 
+vector<EventDefinition const*> ContractDefinition::interfaceEvents(bool _requireCallGraph) const
+{
+	set<EventDefinition const*, CompareByID> result;
+	for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
+		result += contract->events();
+	solAssert(annotation().creationCallGraph.set() == annotation().deployedCallGraph.set());
+	if (_requireCallGraph)
+		solAssert(annotation().creationCallGraph.set());
+	if (annotation().creationCallGraph.set())
+		result += usedInterfaceEvents();
+	// We could filter out all events that do not have an external interface
+	// if _requireCallGraph is false.
+	return util::convertContainer<vector<EventDefinition const*>>(std::move(result));
+}
+
 vector<ErrorDefinition const*> ContractDefinition::interfaceErrors(bool _requireCallGraph) const
 {
 	set<ErrorDefinition const*, CompareByID> result;
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index d8f6ecd6a0..317e95d436 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -522,6 +522,10 @@ class ContractDefinition: public Declaration, public StructurallyDocumented, pub
 	std::vector<EventDefinition const*> events() const { return filteredNodes<EventDefinition>(m_subNodes); }
 	std::vector<EventDefinition const*> const& definedInterfaceEvents() const;
 	std::vector<EventDefinition const*> const usedInterfaceEvents() const;
+	/// @return all events defined in this contract and its base contracts and all events
+	/// that are emitted during the execution of the contract.
+	/// @param _requireCallGraph if false, do not fail if the call graph has not been computed yet.
+	std::vector<EventDefinition const*> interfaceEvents(bool _requireCallGraph = true) const;
 	/// @returns all errors defined in this contract or any base contract
 	/// and all errors referenced during execution.
 	/// @param _requireCallGraph if false, do not fail if the call graph has not been computed yet.
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index 84394c76f3..ad5a4f9c3f 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -286,6 +286,8 @@ bool ASTJsonExporter::visit(ContractDefinition const& _node)
 		make_pair("abstract", _node.abstract()),
 		make_pair("baseContracts", toJson(_node.baseContracts())),
 		make_pair("contractDependencies", getContainerIds(_node.annotation().contractDependencies | ranges::views::keys)),
+		// Do not require call graph because the AST is also created for incorrect sources.
+		make_pair("usedEvents", getContainerIds(_node.interfaceEvents(false))),
 		make_pair("usedErrors", getContainerIds(_node.interfaceErrors(false))),
 		make_pair("nodes", toJson(_node.subNodes())),
 		make_pair("scope", idOrNull(_node.scope()))
diff --git a/libsolidity/interface/ABI.cpp b/libsolidity/interface/ABI.cpp
index cbfa361227..bfc9c07a52 100644
--- a/libsolidity/interface/ABI.cpp
+++ b/libsolidity/interface/ABI.cpp
@@ -101,7 +101,7 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
 			method["stateMutability"] = stateMutabilityToString(externalFunctionType->stateMutability());
 			abi.emplace(std::move(method));
 		}
-	for (auto const& it: _contractDef.definedInterfaceEvents())
+	for (auto const& it: _contractDef.interfaceEvents())
 	{
 		Json::Value event{Json::objectValue};
 		event["type"] = "event";
diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp
index 27efd1c245..b192dfda1b 100644
--- a/libsolidity/interface/Natspec.cpp
+++ b/libsolidity/interface/Natspec.cpp
@@ -78,8 +78,16 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
 				doc["methods"][it.second->externalSignature()]["notice"] = value;
 		}
 
-	for (auto const& event: _contractDef.definedInterfaceEvents())
+	for (auto const& event: uniqueInterfaceEvents(_contractDef))
 	{
+		ContractDefinition const* eventOrigin = event->annotation().contract;
+		solAssert(eventOrigin);
+		solAssert(
+			*eventOrigin == _contractDef ||
+			(!eventOrigin->isLibrary() && _contractDef.derivesFrom(*eventOrigin)) ||
+			(eventOrigin->isLibrary() && !_contractDef.derivesFrom(*eventOrigin))
+		);
+
 		string value = extractDoc(event->annotation().docTags, "notice");
 		if (!value.empty())
 			doc["events"][event->functionType(true)->externalSignature()]["notice"] = value;
@@ -168,10 +176,18 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
 			));
 	}
 
-	for (auto const& event: _contractDef.definedInterfaceEvents())
+	for (auto const& event: uniqueInterfaceEvents(_contractDef))
 		if (auto devDoc = devDocumentation(event->annotation().docTags); !devDoc.empty())
+		{
+			ContractDefinition const* eventOrigin = event->annotation().contract;
+			solAssert(eventOrigin);
+			solAssert(
+				*eventOrigin == _contractDef ||
+				(!eventOrigin->isLibrary() && _contractDef.derivesFrom(*eventOrigin)) ||
+				(eventOrigin->isLibrary() && !_contractDef.derivesFrom(*eventOrigin))
+			);
 			doc["events"][event->functionType(true)->externalSignature()] = devDoc;
-
+		}
 	for (auto const& error: _contractDef.interfaceErrors())
 		if (auto devDoc = devDocumentation(error->annotation().docTags); !devDoc.empty())
 			doc["errors"][error->functionType(true)->externalSignature()].append(devDoc);
@@ -255,3 +271,34 @@ Json::Value Natspec::devDocumentation(std::multimap<std::string, DocTag> const&
 
 	return json;
 }
+
+vector<EventDefinition const*>  Natspec::uniqueInterfaceEvents(ContractDefinition const& _contract)
+{
+	auto eventSignature = [](EventDefinition const* _event) -> string {
+		FunctionType const* functionType = _event->functionType(true);
+		solAssert(functionType, "");
+		return functionType->externalSignature();
+	};
+	auto compareBySignature =
+		[&](EventDefinition const* _lhs, EventDefinition const* _rhs) -> bool {
+			return eventSignature(_lhs) < eventSignature(_rhs);
+		};
+
+	set<EventDefinition const*, decltype(compareBySignature)> uniqueEvents{compareBySignature};
+	// Insert events defined in the contract first so that in case of a conflict
+	// they're the ones that get selected.
+	uniqueEvents += _contract.definedInterfaceEvents();
+
+	set<EventDefinition const*, decltype(compareBySignature)> filteredUsedEvents{compareBySignature};
+	set<string> usedSignatures;
+	for (EventDefinition const* event: _contract.usedInterfaceEvents())
+	{
+		auto&& [eventIt, eventInserted] = filteredUsedEvents.insert(event);
+		auto&& [signatureIt, signatureInserted] = usedSignatures.insert(eventSignature(event));
+		if (!signatureInserted)
+			filteredUsedEvents.erase(eventIt);
+	}
+
+	uniqueEvents += filteredUsedEvents;
+	return util::convertContainer<vector<EventDefinition const*>>(std::move(uniqueEvents));
+}
diff --git a/libsolidity/interface/Natspec.h b/libsolidity/interface/Natspec.h
index bbf624384c..e75485097d 100644
--- a/libsolidity/interface/Natspec.h
+++ b/libsolidity/interface/Natspec.h
@@ -72,6 +72,13 @@ class Natspec
 	/// @return      A JSON representation
 	///              of a method's return notice documentation
 	static Json::Value extractReturnParameterDocs(std::multimap<std::string, DocTag> const& _tags, std::vector<std::string> const& _returnParameterNames);
+
+	/// Temporary function until https://github.com/ethereum/solidity/issues/11114 is implemented.
+	/// @return all events defined in the contract and its base contracts and all events
+	/// that are emitted during the execution of the contract, but allowing only unique signatures.
+	/// In case of conflict between a library event and a contract one, selects the latter
+	/// In case of conflict between two library events, none is selected
+	static std::vector<EventDefinition const*> uniqueInterfaceEvents(ContractDefinition const& _contract);
 };
 
 }
diff --git a/test/cmdlineTests/ast_compact_json_no_pretty_json/output b/test/cmdlineTests/ast_compact_json_no_pretty_json/output
index abdc17125d..fb79fd524e 100644
--- a/test/cmdlineTests/ast_compact_json_no_pretty_json/output
+++ b/test/cmdlineTests/ast_compact_json_no_pretty_json/output
@@ -2,4 +2,4 @@ JSON AST (compact format):
 
 
 ======= ast_compact_json_no_pretty_json/input.sol =======
-{"absolutePath":"ast_compact_json_no_pretty_json/input.sol","exportedSymbols":{"C":[2]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":2,"linearizedBaseContracts":[2],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":3,"src":"60:13:0","usedErrors":[]}],"src":"36:38:0"}
+{"absolutePath":"ast_compact_json_no_pretty_json/input.sol","exportedSymbols":{"C":[2]},"id":3,"license":"GPL-3.0","nodeType":"SourceUnit","nodes":[{"id":1,"literals":["solidity",">=","0.0"],"nodeType":"PragmaDirective","src":"36:22:0"},{"abstract":false,"baseContracts":[],"canonicalName":"C","contractDependencies":[],"contractKind":"contract","fullyImplemented":true,"id":2,"linearizedBaseContracts":[2],"name":"C","nameLocation":"69:1:0","nodeType":"ContractDefinition","nodes":[],"scope":3,"src":"60:13:0","usedErrors":[],"usedEvents":[]}],"src":"36:38:0"}
diff --git a/test/cmdlineTests/ast_compact_json_with_base_path/output b/test/cmdlineTests/ast_compact_json_with_base_path/output
index 6404ef3bdc..5c5c6ffd51 100644
--- a/test/cmdlineTests/ast_compact_json_with_base_path/output
+++ b/test/cmdlineTests/ast_compact_json_with_base_path/output
@@ -45,7 +45,8 @@ JSON AST (compact format):
       "nodes": [],
       "scope": 6,
       "src": "60:13:0",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "36:38:0"
diff --git a/test/cmdlineTests/combined_json_with_base_path/output b/test/cmdlineTests/combined_json_with_base_path/output
index 9acdea5531..1277733201 100644
--- a/test/cmdlineTests/combined_json_with_base_path/output
+++ b/test/cmdlineTests/combined_json_with_base_path/output
@@ -56,7 +56,8 @@
             "nodes": [],
             "scope": 6,
             "src": "60:13:0",
-            "usedErrors": []
+            "usedErrors": [],
+            "usedEvents": []
           }
         ],
         "src": "36:38:0"
diff --git a/test/cmdlineTests/events_in_abi/args b/test/cmdlineTests/events_in_abi/args
new file mode 100644
index 0000000000..d27d3ef127
--- /dev/null
+++ b/test/cmdlineTests/events_in_abi/args
@@ -0,0 +1 @@
+--abi --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/events_in_abi/input.sol b/test/cmdlineTests/events_in_abi/input.sol
new file mode 100644
index 0000000000..a0d91d2e2e
--- /dev/null
+++ b/test/cmdlineTests/events_in_abi/input.sol
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+library L {
+    event e1(uint b);
+}
+
+function f() {
+    emit L.e1(5);
+}
+
+contract C {
+    event e1(uint indexed a);
+    function g() public {
+        f();
+    }
+}
diff --git a/test/cmdlineTests/events_in_abi/output b/test/cmdlineTests/events_in_abi/output
new file mode 100644
index 0000000000..6c18a17521
--- /dev/null
+++ b/test/cmdlineTests/events_in_abi/output
@@ -0,0 +1,59 @@
+
+======= events_in_abi/input.sol:C =======
+Contract JSON ABI
+[
+    {
+        "anonymous": false,
+        "inputs":
+        [
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "b",
+                "type": "uint256"
+            }
+        ],
+        "name": "e1",
+        "type": "event"
+    },
+    {
+        "anonymous": false,
+        "inputs":
+        [
+            {
+                "indexed": true,
+                "internalType": "uint256",
+                "name": "a",
+                "type": "uint256"
+            }
+        ],
+        "name": "e1",
+        "type": "event"
+    },
+    {
+        "inputs": [],
+        "name": "g",
+        "outputs": [],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
+]
+
+======= events_in_abi/input.sol:L =======
+Contract JSON ABI
+[
+    {
+        "anonymous": false,
+        "inputs":
+        [
+            {
+                "indexed": false,
+                "internalType": "uint256",
+                "name": "b",
+                "type": "uint256"
+            }
+        ],
+        "name": "e1",
+        "type": "event"
+    }
+]
diff --git a/test/cmdlineTests/recovery_ast_constructor/output b/test/cmdlineTests/recovery_ast_constructor/output
index 33c07b4c1e..fd92fb7fa6 100644
--- a/test/cmdlineTests/recovery_ast_constructor/output
+++ b/test/cmdlineTests/recovery_ast_constructor/output
@@ -180,7 +180,8 @@ JSON AST (compact format):
       ],
       "scope": 19,
       "src": "62:399:0",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "36:426:0"
diff --git a/test/cmdlineTests/recovery_standard_json/output.json b/test/cmdlineTests/recovery_standard_json/output.json
index 68415ac0cb..110b706169 100644
--- a/test/cmdlineTests/recovery_standard_json/output.json
+++ b/test/cmdlineTests/recovery_standard_json/output.json
@@ -90,7 +90,8 @@
                         "nodes": [],
                         "scope": 4,
                         "src": "59:35:0",
-                        "usedErrors": []
+                        "usedErrors": [],
+                        "usedEvents": []
                     }
                 ],
                 "src": "36:84:0"
diff --git a/test/cmdlineTests/standard_only_ast_requested/output.json b/test/cmdlineTests/standard_only_ast_requested/output.json
index 4caa8a7643..6ecac5ca36 100644
--- a/test/cmdlineTests/standard_only_ast_requested/output.json
+++ b/test/cmdlineTests/standard_only_ast_requested/output.json
@@ -85,7 +85,8 @@
                         ],
                         "scope": 7,
                         "src": "59:42:0",
-                        "usedErrors": []
+                        "usedErrors": [],
+                        "usedEvents": []
                     }
                 ],
                 "src": "36:65:0"
diff --git a/test/libsolidity/ABIJson/event_emited_in_base_contract.sol b/test/libsolidity/ABIJson/event_emited_in_base_contract.sol
new file mode 100644
index 0000000000..f9c3d2019c
--- /dev/null
+++ b/test/libsolidity/ABIJson/event_emited_in_base_contract.sol
@@ -0,0 +1,71 @@
+library   L { event E(uint8); }
+
+contract B {
+    constructor() {
+        emit L.E(0);
+    }
+}
+
+contract C is B {}
+
+// ----
+//     :B
+// [
+//   {
+//     "inputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "constructor"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "uint8",
+//         "name": "",
+//         "type": "uint8"
+//       }
+//     ],
+//     "name": "E",
+//     "type": "event"
+//   }
+// ]
+//
+//
+//     :C
+// [
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "uint8",
+//         "name": "",
+//         "type": "uint8"
+//       }
+//     ],
+//     "name": "E",
+//     "type": "event"
+//   }
+// ]
+//
+//
+//     :L
+// [
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "uint8",
+//         "name": "",
+//         "type": "uint8"
+//       }
+//     ],
+//     "name": "E",
+//     "type": "event"
+//   }
+// ]
diff --git a/test/libsolidity/ABIJson/event_from_aggregated_contract_not_emmited.sol b/test/libsolidity/ABIJson/event_from_aggregated_contract_not_emmited.sol
new file mode 100644
index 0000000000..6a930589d5
--- /dev/null
+++ b/test/libsolidity/ABIJson/event_from_aggregated_contract_not_emmited.sol
@@ -0,0 +1,42 @@
+contract C {
+    event e();
+    function f() public {
+        emit e();
+    }
+}
+
+contract D {
+    C c;
+    constructor() {
+        c = new C();
+        c.f();
+    }
+}
+
+// ----
+//     :C
+// [
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "e",
+//     "type": "event"
+//   },
+//   {
+//     "inputs": [],
+//     "name": "f",
+//     "outputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "function"
+//   }
+// ]
+//
+//
+//     :D
+// [
+//   {
+//     "inputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "constructor"
+//   }
+// ]
diff --git a/test/libsolidity/ABIJson/event_inheritance.sol b/test/libsolidity/ABIJson/event_inheritance.sol
new file mode 100644
index 0000000000..e4a8aeea4e
--- /dev/null
+++ b/test/libsolidity/ABIJson/event_inheritance.sol
@@ -0,0 +1,62 @@
+interface B {
+    event EB();
+}
+
+contract C is B {
+    event EC();
+}
+
+contract D is C {
+    event ED();
+}
+
+// ----
+//     :B
+// [
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "EB",
+//     "type": "event"
+//   }
+// ]
+//
+//
+//     :C
+// [
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "EB",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "EC",
+//     "type": "event"
+//   }
+// ]
+//
+//
+//     :D
+// [
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "EB",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "EC",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "ED",
+//     "type": "event"
+//   }
+// ]
diff --git a/test/libsolidity/ABIJson/events_indirect.sol b/test/libsolidity/ABIJson/events_indirect.sol
new file mode 100644
index 0000000000..86368028cc
--- /dev/null
+++ b/test/libsolidity/ABIJson/events_indirect.sol
@@ -0,0 +1,88 @@
+library L {
+    event e1(uint b);
+    event e2();
+    event e2(uint a);
+    event e3() anonymous;
+}
+contract test {
+    function f() public {
+        emit L.e1(1);
+        emit L.e3();
+    }
+}
+// ----
+//     :L
+// [
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "uint256",
+//         "name": "b",
+//         "type": "uint256"
+//       }
+//     ],
+//     "name": "e1",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "e2",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "uint256",
+//         "name": "a",
+//         "type": "uint256"
+//       }
+//     ],
+//     "name": "e2",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": true,
+//     "inputs": [],
+//     "name": "e3",
+//     "type": "event"
+//   }
+// ]
+//
+//
+//     :test
+// [
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "uint256",
+//         "name": "b",
+//         "type": "uint256"
+//       }
+//     ],
+//     "name": "e1",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": true,
+//     "inputs": [],
+//     "name": "e3",
+//     "type": "event"
+//   },
+//   {
+//     "inputs": [],
+//     "name": "f",
+//     "outputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "function"
+//   }
+// ]
diff --git a/test/libsolidity/ABIJson/events_repetitions.sol b/test/libsolidity/ABIJson/events_repetitions.sol
new file mode 100644
index 0000000000..8dd980a6a1
--- /dev/null
+++ b/test/libsolidity/ABIJson/events_repetitions.sol
@@ -0,0 +1,45 @@
+library L {
+	event e();
+}
+contract C {
+	constructor() {
+		emit L.e();
+	}
+	function f() public {
+		emit L.e();
+	}
+}
+
+// ----
+//     :C
+// [
+//   {
+//     "inputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "constructor"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "e",
+//     "type": "event"
+//   },
+//   {
+//     "inputs": [],
+//     "name": "f",
+//     "outputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "function"
+//   }
+// ]
+//
+//
+//     :L
+// [
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "e",
+//     "type": "event"
+//   }
+// ]
diff --git a/test/libsolidity/ABIJson/same_event_defined_twice.sol b/test/libsolidity/ABIJson/same_event_defined_twice.sol
new file mode 100644
index 0000000000..9a65e61d69
--- /dev/null
+++ b/test/libsolidity/ABIJson/same_event_defined_twice.sol
@@ -0,0 +1,61 @@
+library L1 { event e(); }
+library L2 { event e(); }
+contract C {
+	constructor() {
+		emit L1.e();
+	}
+	function f() public {
+		emit L2.e();
+	}
+}
+
+// ----
+//     :C
+// [
+//   {
+//     "inputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "constructor"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "e",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "e",
+//     "type": "event"
+//   },
+//   {
+//     "inputs": [],
+//     "name": "f",
+//     "outputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "function"
+//   }
+// ]
+//
+//
+//     :L1
+// [
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "e",
+//     "type": "event"
+//   }
+// ]
+//
+//
+//     :L2
+// [
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "e",
+//     "type": "event"
+//   }
+// ]
diff --git a/test/libsolidity/ASTJSON/abstract_contract.json b/test/libsolidity/ASTJSON/abstract_contract.json
index 168433eb96..48c20b4358 100644
--- a/test/libsolidity/ASTJSON/abstract_contract.json
+++ b/test/libsolidity/ASTJSON/abstract_contract.json
@@ -66,7 +66,8 @@
       ],
       "scope": 6,
       "src": "0:43:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:44:1"
diff --git a/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json b/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json
index 51dd803a36..d9ba04e6cf 100644
--- a/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json
+++ b/test/libsolidity/ASTJSON/abstract_contract_parseOnly.json
@@ -50,7 +50,8 @@
         }
       ],
       "src": "0:43:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:44:1"
diff --git a/test/libsolidity/ASTJSON/address_payable.json b/test/libsolidity/ASTJSON/address_payable.json
index 83ba2c6d7c..adf79823ec 100644
--- a/test/libsolidity/ASTJSON/address_payable.json
+++ b/test/libsolidity/ASTJSON/address_payable.json
@@ -571,7 +571,8 @@
       ],
       "scope": 40,
       "src": "0:258:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:259:1"
diff --git a/test/libsolidity/ASTJSON/address_payable_parseOnly.json b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
index 9d095dc686..02b809cc96 100644
--- a/test/libsolidity/ASTJSON/address_payable_parseOnly.json
+++ b/test/libsolidity/ASTJSON/address_payable_parseOnly.json
@@ -378,7 +378,8 @@
         }
       ],
       "src": "0:258:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:259:1"
diff --git a/test/libsolidity/ASTJSON/array_type_name.json b/test/libsolidity/ASTJSON/array_type_name.json
index c1bcaa985b..1cd97e1765 100644
--- a/test/libsolidity/ASTJSON/array_type_name.json
+++ b/test/libsolidity/ASTJSON/array_type_name.json
@@ -72,7 +72,8 @@
       ],
       "scope": 5,
       "src": "0:24:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:25:1"
diff --git a/test/libsolidity/ASTJSON/array_type_name_parseOnly.json b/test/libsolidity/ASTJSON/array_type_name_parseOnly.json
index 4248a3f987..1e0b72ca07 100644
--- a/test/libsolidity/ASTJSON/array_type_name_parseOnly.json
+++ b/test/libsolidity/ASTJSON/array_type_name_parseOnly.json
@@ -45,7 +45,8 @@
         }
       ],
       "src": "0:24:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:25:1"
diff --git a/test/libsolidity/ASTJSON/assembly/call.json b/test/libsolidity/ASTJSON/assembly/call.json
index c6e0561ed4..7081d2f983 100644
--- a/test/libsolidity/ASTJSON/assembly/call.json
+++ b/test/libsolidity/ASTJSON/assembly/call.json
@@ -164,7 +164,8 @@
       ],
       "scope": 7,
       "src": "0:98:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:99:1"
diff --git a/test/libsolidity/ASTJSON/assembly/call_parseOnly.json b/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
index 27d6ac07d0..1a9dc74a28 100644
--- a/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
@@ -148,7 +148,8 @@
         }
       ],
       "src": "0:98:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:99:1"
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block.json b/test/libsolidity/ASTJSON/assembly/empty_block.json
index 19779b076b..05dc8c0c05 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_block.json
+++ b/test/libsolidity/ASTJSON/assembly/empty_block.json
@@ -89,7 +89,8 @@
       ],
       "scope": 7,
       "src": "0:75:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:76:1"
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json b/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
index 8b07db8937..4a1d1f6147 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
@@ -73,7 +73,8 @@
         }
       ],
       "src": "0:75:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:76:1"
diff --git a/test/libsolidity/ASTJSON/assembly/function.json b/test/libsolidity/ASTJSON/assembly/function.json
index e528baa4c9..d8822183c2 100644
--- a/test/libsolidity/ASTJSON/assembly/function.json
+++ b/test/libsolidity/ASTJSON/assembly/function.json
@@ -151,7 +151,8 @@
       ],
       "scope": 7,
       "src": "0:112:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:113:1"
diff --git a/test/libsolidity/ASTJSON/assembly/function_parseOnly.json b/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
index f89a2fa6d1..8115fc0aec 100644
--- a/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
@@ -135,7 +135,8 @@
         }
       ],
       "src": "0:112:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:113:1"
diff --git a/test/libsolidity/ASTJSON/assembly/leave.json b/test/libsolidity/ASTJSON/assembly/leave.json
index eefc5105f6..23ac98ccb3 100644
--- a/test/libsolidity/ASTJSON/assembly/leave.json
+++ b/test/libsolidity/ASTJSON/assembly/leave.json
@@ -101,7 +101,8 @@
       ],
       "scope": 7,
       "src": "0:90:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:91:1"
diff --git a/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json b/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
index ba8b54507a..215266456d 100644
--- a/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
@@ -85,7 +85,8 @@
         }
       ],
       "src": "0:90:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:91:1"
diff --git a/test/libsolidity/ASTJSON/assembly/loop.json b/test/libsolidity/ASTJSON/assembly/loop.json
index 8a887a80f7..7e684b4a34 100644
--- a/test/libsolidity/ASTJSON/assembly/loop.json
+++ b/test/libsolidity/ASTJSON/assembly/loop.json
@@ -164,7 +164,8 @@
       ],
       "scope": 7,
       "src": "0:118:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:119:1"
diff --git a/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json b/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
index 8ee9367478..934afdf42e 100644
--- a/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
@@ -148,7 +148,8 @@
         }
       ],
       "src": "0:118:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:119:1"
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions.json b/test/libsolidity/ASTJSON/assembly/nested_functions.json
index 41a18a1d0e..881e7456f1 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions.json
@@ -169,7 +169,8 @@
       ],
       "scope": 9,
       "src": "0:154:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:155:1"
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
index f5f5546080..a9ac0965aa 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
@@ -135,7 +135,8 @@
         }
       ],
       "src": "0:154:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:155:1"
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset.json b/test/libsolidity/ASTJSON/assembly/slot_offset.json
index 1e6fe1447a..e61125cbdb 100644
--- a/test/libsolidity/ASTJSON/assembly/slot_offset.json
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset.json
@@ -245,7 +245,8 @@
       ],
       "scope": 13,
       "src": "0:148:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:149:1"
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json b/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
index 4135bb3437..ccf9c53fe1 100644
--- a/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
@@ -189,7 +189,8 @@
         }
       ],
       "src": "0:148:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:149:1"
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit.json b/test/libsolidity/ASTJSON/assembly/stringlit.json
index 64777e9479..33211190e5 100644
--- a/test/libsolidity/ASTJSON/assembly/stringlit.json
+++ b/test/libsolidity/ASTJSON/assembly/stringlit.json
@@ -106,7 +106,8 @@
       ],
       "scope": 7,
       "src": "0:82:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:83:1"
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json b/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
index e82999a780..dd4e1d0610 100644
--- a/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
@@ -90,7 +90,8 @@
         }
       ],
       "src": "0:82:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:83:1"
diff --git a/test/libsolidity/ASTJSON/assembly/switch.json b/test/libsolidity/ASTJSON/assembly/switch.json
index f78699ef64..26874da0e9 100644
--- a/test/libsolidity/ASTJSON/assembly/switch.json
+++ b/test/libsolidity/ASTJSON/assembly/switch.json
@@ -197,7 +197,8 @@
       ],
       "scope": 7,
       "src": "0:198:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:199:1"
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default.json b/test/libsolidity/ASTJSON/assembly/switch_default.json
index 16e1f1bf4f..d472ea0183 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_default.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_default.json
@@ -128,7 +128,8 @@
       ],
       "scope": 7,
       "src": "0:102:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:103:1"
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json b/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
index 4539f85963..e4a3e1b40c 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
@@ -112,7 +112,8 @@
         }
       ],
       "src": "0:102:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:103:1"
diff --git a/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json b/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
index 54d38b6383..d7392a8c8c 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
@@ -181,7 +181,8 @@
         }
       ],
       "src": "0:198:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:199:1"
diff --git a/test/libsolidity/ASTJSON/assembly/var_access.json b/test/libsolidity/ASTJSON/assembly/var_access.json
index 9cddf44606..c93667df2a 100644
--- a/test/libsolidity/ASTJSON/assembly/var_access.json
+++ b/test/libsolidity/ASTJSON/assembly/var_access.json
@@ -155,7 +155,8 @@
       ],
       "scope": 10,
       "src": "0:95:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:96:1"
diff --git a/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json b/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
index 1444a3da11..b56324944f 100644
--- a/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
@@ -121,7 +121,8 @@
         }
       ],
       "src": "0:95:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:96:1"
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
index 02da00d6dd..3e6e67bdde 100644
--- a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
+++ b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
@@ -568,7 +568,8 @@
       ],
       "scope": 142,
       "src": "60:299:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -1374,7 +1375,8 @@
       ],
       "scope": 142,
       "src": "360:462:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -1533,7 +1535,8 @@
       ],
       "scope": 142,
       "src": "823:85:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:909:1"
diff --git a/test/libsolidity/ASTJSON/base_constructor_call.json b/test/libsolidity/ASTJSON/base_constructor_call.json
index 774981fa94..2c3c68c40d 100644
--- a/test/libsolidity/ASTJSON/base_constructor_call.json
+++ b/test/libsolidity/ASTJSON/base_constructor_call.json
@@ -102,7 +102,8 @@
       ],
       "scope": 18,
       "src": "0:35:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -219,7 +220,8 @@
       ],
       "scope": 18,
       "src": "36:41:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:78:1"
diff --git a/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json b/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
index 8af0c0b2ca..730a05178c 100644
--- a/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
+++ b/test/libsolidity/ASTJSON/base_constructor_call_parseOnly.json
@@ -73,7 +73,8 @@
         }
       ],
       "src": "0:35:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -169,7 +170,8 @@
         }
       ],
       "src": "36:41:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:78:1"
diff --git a/test/libsolidity/ASTJSON/constructor.json b/test/libsolidity/ASTJSON/constructor.json
index 9ac4ac9c88..53e622b5dd 100644
--- a/test/libsolidity/ASTJSON/constructor.json
+++ b/test/libsolidity/ASTJSON/constructor.json
@@ -66,7 +66,8 @@
       ],
       "scope": 6,
       "src": "0:34:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:35:1"
diff --git a/test/libsolidity/ASTJSON/constructor_parseOnly.json b/test/libsolidity/ASTJSON/constructor_parseOnly.json
index 19d647058a..9b1d4cfc44 100644
--- a/test/libsolidity/ASTJSON/constructor_parseOnly.json
+++ b/test/libsolidity/ASTJSON/constructor_parseOnly.json
@@ -50,7 +50,8 @@
         }
       ],
       "src": "0:34:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:35:1"
diff --git a/test/libsolidity/ASTJSON/contract_dep_order.json b/test/libsolidity/ASTJSON/contract_dep_order.json
index 83865d7d4c..67eff600b6 100644
--- a/test/libsolidity/ASTJSON/contract_dep_order.json
+++ b/test/libsolidity/ASTJSON/contract_dep_order.json
@@ -45,7 +45,8 @@
       "nodes": [],
       "scope": 14,
       "src": "0:14:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -85,7 +86,8 @@
       "nodes": [],
       "scope": 14,
       "src": "15:19:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -126,7 +128,8 @@
       "nodes": [],
       "scope": 14,
       "src": "35:19:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -168,7 +171,8 @@
       "nodes": [],
       "scope": 14,
       "src": "55:19:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -211,7 +215,8 @@
       "nodes": [],
       "scope": 14,
       "src": "75:19:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:95:1"
diff --git a/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json b/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
index 2c8bdc7456..ba8c377cf7 100644
--- a/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
+++ b/test/libsolidity/ASTJSON/contract_dep_order_parseOnly.json
@@ -15,7 +15,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "0:14:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -46,7 +47,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "15:19:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -77,7 +79,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "35:19:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -108,7 +111,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "55:19:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -139,7 +143,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "75:19:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:95:1"
diff --git a/test/libsolidity/ASTJSON/documentation.json b/test/libsolidity/ASTJSON/documentation.json
index f31382d3ad..43224bc64d 100644
--- a/test/libsolidity/ASTJSON/documentation.json
+++ b/test/libsolidity/ASTJSON/documentation.json
@@ -37,7 +37,8 @@
       "nodes": [],
       "scope": 3,
       "src": "28:13:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "28:14:1"
@@ -80,7 +81,8 @@
       "nodes": [],
       "scope": 6,
       "src": "62:13:2",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "62:14:2"
@@ -259,7 +261,11 @@
       ],
       "scope": 24,
       "src": "0:213:3",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents":
+      [
+        12
+      ]
     }
   ],
   "src": "0:214:3"
diff --git a/test/libsolidity/ASTJSON/documentation_local_variable.json b/test/libsolidity/ASTJSON/documentation_local_variable.json
index 24e38eb1a9..edaa89c18a 100644
--- a/test/libsolidity/ASTJSON/documentation_local_variable.json
+++ b/test/libsolidity/ASTJSON/documentation_local_variable.json
@@ -484,7 +484,8 @@
       ],
       "scope": 42,
       "src": "0:666:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:667:1"
diff --git a/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json b/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json
index 93fd1c9bd1..8725838394 100644
--- a/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json
+++ b/test/libsolidity/ASTJSON/documentation_local_variable_parseOnly.json
@@ -350,7 +350,8 @@
         }
       ],
       "src": "0:666:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:667:1"
diff --git a/test/libsolidity/ASTJSON/documentation_on_statements.json b/test/libsolidity/ASTJSON/documentation_on_statements.json
index bb3ee28d13..f7b424ea60 100644
--- a/test/libsolidity/ASTJSON/documentation_on_statements.json
+++ b/test/libsolidity/ASTJSON/documentation_on_statements.json
@@ -369,7 +369,8 @@
       ],
       "scope": 28,
       "src": "0:330:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:331:1"
diff --git a/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json b/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json
index bb265a4cc4..3872027cbb 100644
--- a/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json
+++ b/test/libsolidity/ASTJSON/documentation_on_statements_parseOnly.json
@@ -253,7 +253,8 @@
         }
       ],
       "src": "0:330:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:331:1"
diff --git a/test/libsolidity/ASTJSON/documentation_parseOnly.json b/test/libsolidity/ASTJSON/documentation_parseOnly.json
index b3cda7e19a..7f446279b6 100644
--- a/test/libsolidity/ASTJSON/documentation_parseOnly.json
+++ b/test/libsolidity/ASTJSON/documentation_parseOnly.json
@@ -23,7 +23,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "28:13:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "28:14:1"
@@ -52,7 +53,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "62:13:2",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "62:14:2"
@@ -197,7 +199,8 @@
         }
       ],
       "src": "0:213:3",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:214:3"
diff --git a/test/libsolidity/ASTJSON/documentation_triple.json b/test/libsolidity/ASTJSON/documentation_triple.json
index 9124e68b12..bd6f483b5a 100644
--- a/test/libsolidity/ASTJSON/documentation_triple.json
+++ b/test/libsolidity/ASTJSON/documentation_triple.json
@@ -379,7 +379,8 @@
       ],
       "scope": 29,
       "src": "0:267:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:268:1"
diff --git a/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json b/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json
index bd6612acc8..5ccc2631ca 100644
--- a/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json
+++ b/test/libsolidity/ASTJSON/documentation_triple_parseOnly.json
@@ -256,7 +256,8 @@
         }
       ],
       "src": "0:267:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:268:1"
diff --git a/test/libsolidity/ASTJSON/enum_value.json b/test/libsolidity/ASTJSON/enum_value.json
index 2cca00902a..31615f657b 100644
--- a/test/libsolidity/ASTJSON/enum_value.json
+++ b/test/libsolidity/ASTJSON/enum_value.json
@@ -56,7 +56,8 @@
       ],
       "scope": 5,
       "src": "0:30:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:31:1"
diff --git a/test/libsolidity/ASTJSON/enum_value_parseOnly.json b/test/libsolidity/ASTJSON/enum_value_parseOnly.json
index 93b3cffcde..006e2db360 100644
--- a/test/libsolidity/ASTJSON/enum_value_parseOnly.json
+++ b/test/libsolidity/ASTJSON/enum_value_parseOnly.json
@@ -41,7 +41,8 @@
         }
       ],
       "src": "0:30:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:31:1"
diff --git a/test/libsolidity/ASTJSON/event_aggregated_contract.json b/test/libsolidity/ASTJSON/event_aggregated_contract.json
new file mode 100644
index 0000000000..e312320c12
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_aggregated_contract.json
@@ -0,0 +1,398 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "C":
+    [
+      10
+    ],
+    "D":
+    [
+      30
+    ]
+  },
+  "id": 31,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "C",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 10,
+      "linearizedBaseContracts":
+      [
+        10
+      ],
+      "name": "C",
+      "nameLocation": "9:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "eventSelector": "ffae15ba29768297c9b951e2e14bc33dc84599d1572acc234266fc70392babc8",
+          "id": 2,
+          "name": "e",
+          "nameLocation": "23:1:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 1,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "24:2:1"
+          },
+          "src": "17:10:1"
+        },
+        {
+          "body":
+          {
+            "id": 8,
+            "nodeType": "Block",
+            "src": "52:25:1",
+            "statements":
+            [
+              {
+                "eventCall":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "id": 5,
+                    "name": "e",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 2,
+                    "src": "67:1:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 6,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "67:3:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 7,
+                "nodeType": "EmitStatement",
+                "src": "62:8:1"
+              }
+            ]
+          },
+          "functionSelector": "26121ff0",
+          "id": 9,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "41:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 3,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "42:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 4,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "52:0:1"
+          },
+          "scope": 10,
+          "src": "32:45:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 31,
+      "src": "0:79:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        2
+      ]
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "D",
+      "contractDependencies":
+      [
+        10
+      ],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 30,
+      "linearizedBaseContracts":
+      [
+        30
+      ],
+      "name": "D",
+      "nameLocation": "89:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "constant": false,
+          "id": 13,
+          "mutability": "mutable",
+          "name": "c",
+          "nameLocation": "99:1:1",
+          "nodeType": "VariableDeclaration",
+          "scope": 30,
+          "src": "97:3:1",
+          "stateVariable": true,
+          "storageLocation": "default",
+          "typeDescriptions":
+          {
+            "typeIdentifier": "t_contract$_C_$10",
+            "typeString": "contract C"
+          },
+          "typeName":
+          {
+            "id": 12,
+            "nodeType": "UserDefinedTypeName",
+            "pathNode":
+            {
+              "id": 11,
+              "name": "C",
+              "nameLocations":
+              [
+                "97:1:1"
+              ],
+              "nodeType": "IdentifierPath",
+              "referencedDeclaration": 10,
+              "src": "97:1:1"
+            },
+            "referencedDeclaration": 10,
+            "src": "97:1:1",
+            "typeDescriptions":
+            {
+              "typeIdentifier": "t_contract$_C_$10",
+              "typeString": "contract C"
+            }
+          },
+          "visibility": "internal"
+        },
+        {
+          "body":
+          {
+            "id": 28,
+            "nodeType": "Block",
+            "src": "120:43:1",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "id": 21,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "lValueRequested": false,
+                  "leftHandSide":
+                  {
+                    "id": 16,
+                    "name": "c",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 13,
+                    "src": "130:1:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_contract$_C_$10",
+                      "typeString": "contract C"
+                    }
+                  },
+                  "nodeType": "Assignment",
+                  "operator": "=",
+                  "rightHandSide":
+                  {
+                    "arguments": [],
+                    "expression":
+                    {
+                      "argumentTypes": [],
+                      "id": 19,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "nodeType": "NewExpression",
+                      "src": "134:5:1",
+                      "typeDescriptions":
+                      {
+                        "typeIdentifier": "t_function_creation_nonpayable$__$returns$_t_contract$_C_$10_$",
+                        "typeString": "function () returns (contract C)"
+                      },
+                      "typeName":
+                      {
+                        "id": 18,
+                        "nodeType": "UserDefinedTypeName",
+                        "pathNode":
+                        {
+                          "id": 17,
+                          "name": "C",
+                          "nameLocations":
+                          [
+                            "138:1:1"
+                          ],
+                          "nodeType": "IdentifierPath",
+                          "referencedDeclaration": 10,
+                          "src": "138:1:1"
+                        },
+                        "referencedDeclaration": 10,
+                        "src": "138:1:1",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_contract$_C_$10",
+                          "typeString": "contract C"
+                        }
+                      }
+                    },
+                    "id": 20,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "kind": "functionCall",
+                    "lValueRequested": false,
+                    "nameLocations": [],
+                    "names": [],
+                    "nodeType": "FunctionCall",
+                    "src": "134:7:1",
+                    "tryCall": false,
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_contract$_C_$10",
+                      "typeString": "contract C"
+                    }
+                  },
+                  "src": "130:11:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_contract$_C_$10",
+                    "typeString": "contract C"
+                  }
+                },
+                "id": 22,
+                "nodeType": "ExpressionStatement",
+                "src": "130:11:1"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "expression":
+                    {
+                      "id": 23,
+                      "name": "c",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 13,
+                      "src": "151:1:1",
+                      "typeDescriptions":
+                      {
+                        "typeIdentifier": "t_contract$_C_$10",
+                        "typeString": "contract C"
+                      }
+                    },
+                    "id": 25,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "memberLocation": "153:1:1",
+                    "memberName": "f",
+                    "nodeType": "MemberAccess",
+                    "referencedDeclaration": 9,
+                    "src": "151:3:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_external_nonpayable$__$returns$__$",
+                      "typeString": "function () external"
+                    }
+                  },
+                  "id": 26,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "151:5:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 27,
+                "nodeType": "ExpressionStatement",
+                "src": "151:5:1"
+              }
+            ]
+          },
+          "id": 29,
+          "implemented": true,
+          "kind": "constructor",
+          "modifiers": [],
+          "name": "",
+          "nameLocation": "-1:-1:-1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 14,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "117:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 15,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "120:0:1"
+          },
+          "scope": 30,
+          "src": "106:57:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 31,
+      "src": "80:85:1",
+      "usedErrors": [],
+      "usedEvents": []
+    }
+  ],
+  "src": "0:166:1"
+}
diff --git a/test/libsolidity/ASTJSON/event_aggregated_contract.sol b/test/libsolidity/ASTJSON/event_aggregated_contract.sol
new file mode 100644
index 0000000000..b8fe2b2761
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_aggregated_contract.sol
@@ -0,0 +1,15 @@
+contract C {
+    event e();
+    function f() public {
+        emit e();
+    }
+}
+contract D {
+    C c;
+    constructor() {
+        c = new C();
+        c.f();
+    }
+}
+
+// ----
diff --git a/test/libsolidity/ASTJSON/event_definition.json b/test/libsolidity/ASTJSON/event_definition.json
index 0bb614c221..b59164fcb0 100644
--- a/test/libsolidity/ASTJSON/event_definition.json
+++ b/test/libsolidity/ASTJSON/event_definition.json
@@ -47,7 +47,11 @@
       ],
       "scope": 4,
       "src": "0:25:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents":
+      [
+        2
+      ]
     }
   ],
   "src": "0:26:1"
diff --git a/test/libsolidity/ASTJSON/event_definition_parseOnly.json b/test/libsolidity/ASTJSON/event_definition_parseOnly.json
index ee5773a3b1..9116b3d2da 100644
--- a/test/libsolidity/ASTJSON/event_definition_parseOnly.json
+++ b/test/libsolidity/ASTJSON/event_definition_parseOnly.json
@@ -32,7 +32,8 @@
         }
       ],
       "src": "0:25:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:26:1"
diff --git a/test/libsolidity/ASTJSON/event_emited_in_base_contract.json b/test/libsolidity/ASTJSON/event_emited_in_base_contract.json
new file mode 100644
index 0000000000..6b183b4931
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_emited_in_base_contract.json
@@ -0,0 +1,289 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "B":
+    [
+      16
+    ],
+    "C":
+    [
+      19
+    ],
+    "L":
+    [
+      5
+    ]
+  },
+  "id": 20,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "L",
+      "contractDependencies": [],
+      "contractKind": "library",
+      "fullyImplemented": true,
+      "id": 5,
+      "linearizedBaseContracts":
+      [
+        5
+      ],
+      "name": "L",
+      "nameLocation": "10:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "eventSelector": "870e3024466c178150e2490c7cfb455e33c0db877113af040f89189d07946664",
+          "id": 4,
+          "name": "E",
+          "nameLocation": "20:1:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 3,
+            "nodeType": "ParameterList",
+            "parameters":
+            [
+              {
+                "constant": false,
+                "id": 2,
+                "indexed": false,
+                "mutability": "mutable",
+                "name": "",
+                "nameLocation": "-1:-1:-1",
+                "nodeType": "VariableDeclaration",
+                "scope": 4,
+                "src": "22:5:1",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions":
+                {
+                  "typeIdentifier": "t_uint8",
+                  "typeString": "uint8"
+                },
+                "typeName":
+                {
+                  "id": 1,
+                  "name": "uint8",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "22:5:1",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_uint8",
+                    "typeString": "uint8"
+                  }
+                },
+                "visibility": "internal"
+              }
+            ],
+            "src": "21:7:1"
+          },
+          "src": "14:15:1"
+        }
+      ],
+      "scope": 20,
+      "src": "0:31:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        4
+      ]
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "B",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 16,
+      "linearizedBaseContracts":
+      [
+        16
+      ],
+      "name": "B",
+      "nameLocation": "41:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 14,
+            "nodeType": "Block",
+            "src": "63:28:1",
+            "statements":
+            [
+              {
+                "eventCall":
+                {
+                  "arguments":
+                  [
+                    {
+                      "hexValue": "30",
+                      "id": 11,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": true,
+                      "kind": "number",
+                      "lValueRequested": false,
+                      "nodeType": "Literal",
+                      "src": "82:1:1",
+                      "typeDescriptions":
+                      {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      },
+                      "value": "0"
+                    }
+                  ],
+                  "expression":
+                  {
+                    "argumentTypes":
+                    [
+                      {
+                        "typeIdentifier": "t_rational_0_by_1",
+                        "typeString": "int_const 0"
+                      }
+                    ],
+                    "expression":
+                    {
+                      "id": 8,
+                      "name": "L",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 5,
+                      "src": "78:1:1",
+                      "typeDescriptions":
+                      {
+                        "typeIdentifier": "t_type$_t_contract$_L_$5_$",
+                        "typeString": "type(library L)"
+                      }
+                    },
+                    "id": 10,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "memberLocation": "80:1:1",
+                    "memberName": "E",
+                    "nodeType": "MemberAccess",
+                    "referencedDeclaration": 4,
+                    "src": "78:3:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_event_nonpayable$_t_uint8_$returns$__$",
+                      "typeString": "function (uint8)"
+                    }
+                  },
+                  "id": 12,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "78:6:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 13,
+                "nodeType": "EmitStatement",
+                "src": "73:11:1"
+              }
+            ]
+          },
+          "id": 15,
+          "implemented": true,
+          "kind": "constructor",
+          "modifiers": [],
+          "name": "",
+          "nameLocation": "-1:-1:-1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 6,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "60:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 7,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "63:0:1"
+          },
+          "scope": 16,
+          "src": "49:42:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 20,
+      "src": "32:61:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        4
+      ]
+    },
+    {
+      "abstract": false,
+      "baseContracts":
+      [
+        {
+          "baseName":
+          {
+            "id": 17,
+            "name": "B",
+            "nameLocations":
+            [
+              "108:1:1"
+            ],
+            "nodeType": "IdentifierPath",
+            "referencedDeclaration": 16,
+            "src": "108:1:1"
+          },
+          "id": 18,
+          "nodeType": "InheritanceSpecifier",
+          "src": "108:1:1"
+        }
+      ],
+      "canonicalName": "C",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 19,
+      "linearizedBaseContracts":
+      [
+        19,
+        16
+      ],
+      "name": "C",
+      "nameLocation": "103:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes": [],
+      "scope": 20,
+      "src": "94:18:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        4
+      ]
+    }
+  ],
+  "src": "0:113:1"
+}
diff --git a/test/libsolidity/ASTJSON/event_emited_in_base_contract.sol b/test/libsolidity/ASTJSON/event_emited_in_base_contract.sol
new file mode 100644
index 0000000000..3038032332
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_emited_in_base_contract.sol
@@ -0,0 +1,9 @@
+library   L { event E(uint8); }
+contract B {
+    constructor() {
+        emit L.E(0);
+    }
+}
+contract C is B {}
+
+// ----
diff --git a/test/libsolidity/ASTJSON/event_inheritance.json b/test/libsolidity/ASTJSON/event_inheritance.json
new file mode 100644
index 0000000000..afa79e916c
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_inheritance.json
@@ -0,0 +1,194 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "B":
+    [
+      3
+    ],
+    "C":
+    [
+      8
+    ],
+    "D":
+    [
+      13
+    ]
+  },
+  "id": 14,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "B",
+      "contractDependencies": [],
+      "contractKind": "interface",
+      "fullyImplemented": true,
+      "id": 3,
+      "linearizedBaseContracts":
+      [
+        3
+      ],
+      "name": "B",
+      "nameLocation": "10:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "eventSelector": "dbec0351ad6bb0c1f07ea56e236e3e692fde2259f0165fd422f241da339b7e4f",
+          "id": 2,
+          "name": "EB",
+          "nameLocation": "24:2:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 1,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "26:2:1"
+          },
+          "src": "18:11:1"
+        }
+      ],
+      "scope": 14,
+      "src": "0:31:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        2
+      ]
+    },
+    {
+      "abstract": false,
+      "baseContracts":
+      [
+        {
+          "baseName":
+          {
+            "id": 4,
+            "name": "B",
+            "nameLocations":
+            [
+              "46:1:1"
+            ],
+            "nodeType": "IdentifierPath",
+            "referencedDeclaration": 3,
+            "src": "46:1:1"
+          },
+          "id": 5,
+          "nodeType": "InheritanceSpecifier",
+          "src": "46:1:1"
+        }
+      ],
+      "canonicalName": "C",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 8,
+      "linearizedBaseContracts":
+      [
+        8,
+        3
+      ],
+      "name": "C",
+      "nameLocation": "41:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "eventSelector": "a08b3367d3fa83ea27f8951ffb5d9d160cbfadbd80816b47f677e7699d76f5a0",
+          "id": 7,
+          "name": "EC",
+          "nameLocation": "60:2:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 6,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "62:2:1"
+          },
+          "src": "54:11:1"
+        }
+      ],
+      "scope": 14,
+      "src": "32:35:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        2,
+        7
+      ]
+    },
+    {
+      "abstract": false,
+      "baseContracts":
+      [
+        {
+          "baseName":
+          {
+            "id": 9,
+            "name": "C",
+            "nameLocations":
+            [
+              "82:1:1"
+            ],
+            "nodeType": "IdentifierPath",
+            "referencedDeclaration": 8,
+            "src": "82:1:1"
+          },
+          "id": 10,
+          "nodeType": "InheritanceSpecifier",
+          "src": "82:1:1"
+        }
+      ],
+      "canonicalName": "D",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 13,
+      "linearizedBaseContracts":
+      [
+        13,
+        8,
+        3
+      ],
+      "name": "D",
+      "nameLocation": "77:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "eventSelector": "caa54b91a2314ab89b39714b1cd283762e53a2f59cfb997d6770e2824c39db0d",
+          "id": 12,
+          "name": "ED",
+          "nameLocation": "96:2:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 11,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "98:2:1"
+          },
+          "src": "90:11:1"
+        }
+      ],
+      "scope": 14,
+      "src": "68:35:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        2,
+        7,
+        12
+      ]
+    }
+  ],
+  "src": "0:104:1"
+}
diff --git a/test/libsolidity/ASTJSON/event_inheritance.sol b/test/libsolidity/ASTJSON/event_inheritance.sol
new file mode 100644
index 0000000000..7268737533
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_inheritance.sol
@@ -0,0 +1,11 @@
+interface B {
+    event EB();
+}
+contract C is B {
+    event EC();
+}
+contract D is C {
+    event ED();
+}
+
+// ----
diff --git a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json
index 0c90ee840f..3ff426cb22 100644
--- a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json
+++ b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types_parseOnly.json
@@ -71,7 +71,8 @@
         }
       ],
       "src": "0:48:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:49:1"
diff --git a/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json b/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
index 5368d58624..f1d9586174 100644
--- a/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
+++ b/test/libsolidity/ASTJSON/fail_after_parsing_parseOnly.json
@@ -289,7 +289,8 @@
         }
       ],
       "src": "21:154:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:176:1"
diff --git a/test/libsolidity/ASTJSON/fallback.json b/test/libsolidity/ASTJSON/fallback.json
index 25a9b8588e..f68c72ce66 100644
--- a/test/libsolidity/ASTJSON/fallback.json
+++ b/test/libsolidity/ASTJSON/fallback.json
@@ -66,7 +66,8 @@
       ],
       "scope": 6,
       "src": "0:50:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:51:1"
diff --git a/test/libsolidity/ASTJSON/fallback_and_reveice_ether.json b/test/libsolidity/ASTJSON/fallback_and_receive_ether.json
similarity index 98%
rename from test/libsolidity/ASTJSON/fallback_and_reveice_ether.json
rename to test/libsolidity/ASTJSON/fallback_and_receive_ether.json
index 26b4ada77f..f41559d2a6 100644
--- a/test/libsolidity/ASTJSON/fallback_and_reveice_ether.json
+++ b/test/libsolidity/ASTJSON/fallback_and_receive_ether.json
@@ -101,7 +101,8 @@
       ],
       "scope": 10,
       "src": "0:85:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:86:1"
diff --git a/test/libsolidity/ASTJSON/fallback_and_reveice_ether.sol b/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
similarity index 100%
rename from test/libsolidity/ASTJSON/fallback_and_reveice_ether.sol
rename to test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
diff --git a/test/libsolidity/ASTJSON/fallback_and_reveice_ether_parseOnly.json b/test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json
similarity index 97%
rename from test/libsolidity/ASTJSON/fallback_and_reveice_ether_parseOnly.json
rename to test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json
index 55804a9f59..215bf3a83b 100644
--- a/test/libsolidity/ASTJSON/fallback_and_reveice_ether_parseOnly.json
+++ b/test/libsolidity/ASTJSON/fallback_and_receive_ether_parseOnly.json
@@ -85,7 +85,8 @@
         }
       ],
       "src": "0:85:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:86:1"
diff --git a/test/libsolidity/ASTJSON/fallback_parseOnly.json b/test/libsolidity/ASTJSON/fallback_parseOnly.json
index 4d626dcbab..eb81fafbe9 100644
--- a/test/libsolidity/ASTJSON/fallback_parseOnly.json
+++ b/test/libsolidity/ASTJSON/fallback_parseOnly.json
@@ -51,7 +51,8 @@
         }
       ],
       "src": "0:50:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:51:1"
diff --git a/test/libsolidity/ASTJSON/fallback_payable.json b/test/libsolidity/ASTJSON/fallback_payable.json
index 4331b5edf3..7903517645 100644
--- a/test/libsolidity/ASTJSON/fallback_payable.json
+++ b/test/libsolidity/ASTJSON/fallback_payable.json
@@ -66,7 +66,8 @@
       ],
       "scope": 6,
       "src": "0:38:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:39:1"
diff --git a/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json b/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json
index 2d029e56a3..e1810828a3 100644
--- a/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json
+++ b/test/libsolidity/ASTJSON/fallback_payable_parseOnly.json
@@ -51,7 +51,8 @@
         }
       ],
       "src": "0:38:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:39:1"
diff --git a/test/libsolidity/ASTJSON/function_type.json b/test/libsolidity/ASTJSON/function_type.json
index 924f9cdb9a..e1a5156cf7 100644
--- a/test/libsolidity/ASTJSON/function_type.json
+++ b/test/libsolidity/ASTJSON/function_type.json
@@ -225,7 +225,8 @@
       ],
       "scope": 18,
       "src": "0:131:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:132:1"
diff --git a/test/libsolidity/ASTJSON/function_type_parseOnly.json b/test/libsolidity/ASTJSON/function_type_parseOnly.json
index fd1d7637b0..64b09d5d9d 100644
--- a/test/libsolidity/ASTJSON/function_type_parseOnly.json
+++ b/test/libsolidity/ASTJSON/function_type_parseOnly.json
@@ -173,7 +173,8 @@
         }
       ],
       "src": "0:131:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:132:1"
diff --git a/test/libsolidity/ASTJSON/indirect_event.json b/test/libsolidity/ASTJSON/indirect_event.json
new file mode 100644
index 0000000000..fcbe817562
--- /dev/null
+++ b/test/libsolidity/ASTJSON/indirect_event.json
@@ -0,0 +1,319 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "C":
+    [
+      25
+    ],
+    "L":
+    [
+      10
+    ]
+  },
+  "id": 26,
+  "license": "GPL-3.0",
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "L",
+      "contractDependencies": [],
+      "contractKind": "library",
+      "fullyImplemented": true,
+      "id": 10,
+      "linearizedBaseContracts":
+      [
+        10
+      ],
+      "name": "L",
+      "nameLocation": "44:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "eventSelector": "92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028",
+          "id": 2,
+          "name": "E",
+          "nameLocation": "58:1:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 1,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "59:2:1"
+          },
+          "src": "52:10:1"
+        },
+        {
+          "body":
+          {
+            "id": 8,
+            "nodeType": "Block",
+            "src": "89:13:1",
+            "statements":
+            [
+              {
+                "eventCall":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "id": 5,
+                    "name": "E",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 2,
+                    "src": "96:1:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 6,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "96:3:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 7,
+                "nodeType": "EmitStatement",
+                "src": "91:8:1"
+              }
+            ]
+          },
+          "id": 9,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "76:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 3,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "77:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 4,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "89:0:1"
+          },
+          "scope": 10,
+          "src": "67:35:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "internal"
+        }
+      ],
+      "scope": 26,
+      "src": "36:68:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        2
+      ]
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "C",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 25,
+      "linearizedBaseContracts":
+      [
+        25
+      ],
+      "name": "C",
+      "nameLocation": "114:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "eventSelector": "70a5d861ef9816388422765f41d618eb3abdf490acb37354b539729e37b09f0e",
+          "id": 12,
+          "name": "H",
+          "nameLocation": "128:1:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 11,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "129:2:1"
+          },
+          "src": "122:10:1"
+        },
+        {
+          "body":
+          {
+            "id": 23,
+            "nodeType": "Block",
+            "src": "157:20:1",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "expression":
+                    {
+                      "id": 15,
+                      "name": "L",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 10,
+                      "src": "159:1:1",
+                      "typeDescriptions":
+                      {
+                        "typeIdentifier": "t_type$_t_contract$_L_$10_$",
+                        "typeString": "type(library L)"
+                      }
+                    },
+                    "id": 17,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "memberLocation": "161:1:1",
+                    "memberName": "f",
+                    "nodeType": "MemberAccess",
+                    "referencedDeclaration": 9,
+                    "src": "159:3:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 18,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "159:5:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 19,
+                "nodeType": "ExpressionStatement",
+                "src": "159:5:1"
+              },
+              {
+                "eventCall":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "id": 20,
+                    "name": "H",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "referencedDeclaration": 12,
+                    "src": "171:1:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_event_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 21,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "171:3:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 22,
+                "nodeType": "EmitStatement",
+                "src": "166:8:1"
+              }
+            ]
+          },
+          "functionSelector": "e2179b8e",
+          "id": 24,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "g",
+          "nameLocation": "146:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 13,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "147:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 14,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "157:0:1"
+          },
+          "scope": 25,
+          "src": "137:40:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 26,
+      "src": "105:74:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        2,
+        12
+      ]
+    }
+  ],
+  "src": "36:144:1"
+}
diff --git a/test/libsolidity/ASTJSON/indirect_event.sol b/test/libsolidity/ASTJSON/indirect_event.sol
new file mode 100644
index 0000000000..c4bba01c20
--- /dev/null
+++ b/test/libsolidity/ASTJSON/indirect_event.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-3.0
+library L {
+    event E();
+    function f() internal { emit E(); }
+}
+contract C {
+    event H();
+    function g() public { L.f(); emit H(); }
+}
+
+// ----
diff --git a/test/libsolidity/ASTJSON/indirect_event_parseOnly.json b/test/libsolidity/ASTJSON/indirect_event_parseOnly.json
new file mode 100644
index 0000000000..17ca036d32
--- /dev/null
+++ b/test/libsolidity/ASTJSON/indirect_event_parseOnly.json
@@ -0,0 +1,228 @@
+{
+  "absolutePath": "a",
+  "id": 26,
+  "license": "GPL-3.0",
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "contractDependencies": [],
+      "contractKind": "library",
+      "id": 10,
+      "name": "L",
+      "nameLocation": "44:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "id": 2,
+          "name": "E",
+          "nameLocation": "58:1:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 1,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "59:2:1"
+          },
+          "src": "52:10:1"
+        },
+        {
+          "body":
+          {
+            "id": 8,
+            "nodeType": "Block",
+            "src": "89:13:1",
+            "statements":
+            [
+              {
+                "eventCall":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "id": 5,
+                    "name": "E",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "src": "96:1:1",
+                    "typeDescriptions": {}
+                  },
+                  "id": 6,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "96:3:1",
+                  "tryCall": false,
+                  "typeDescriptions": {}
+                },
+                "id": 7,
+                "nodeType": "EmitStatement",
+                "src": "91:8:1"
+              }
+            ]
+          },
+          "id": 9,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "76:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 3,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "77:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 4,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "89:0:1"
+          },
+          "src": "67:35:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "internal"
+        }
+      ],
+      "src": "36:68:1",
+      "usedErrors": [],
+      "usedEvents": []
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "id": 25,
+      "name": "C",
+      "nameLocation": "114:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "id": 12,
+          "name": "H",
+          "nameLocation": "128:1:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 11,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "129:2:1"
+          },
+          "src": "122:10:1"
+        },
+        {
+          "body":
+          {
+            "id": 23,
+            "nodeType": "Block",
+            "src": "157:20:1",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "expression":
+                    {
+                      "id": 15,
+                      "name": "L",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "src": "159:1:1",
+                      "typeDescriptions": {}
+                    },
+                    "id": 17,
+                    "memberLocation": "161:1:1",
+                    "memberName": "f",
+                    "nodeType": "MemberAccess",
+                    "src": "159:3:1",
+                    "typeDescriptions": {}
+                  },
+                  "id": 18,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "159:5:1",
+                  "tryCall": false,
+                  "typeDescriptions": {}
+                },
+                "id": 19,
+                "nodeType": "ExpressionStatement",
+                "src": "159:5:1"
+              },
+              {
+                "eventCall":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "id": 20,
+                    "name": "H",
+                    "nodeType": "Identifier",
+                    "overloadedDeclarations": [],
+                    "src": "171:1:1",
+                    "typeDescriptions": {}
+                  },
+                  "id": 21,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "171:3:1",
+                  "tryCall": false,
+                  "typeDescriptions": {}
+                },
+                "id": 22,
+                "nodeType": "EmitStatement",
+                "src": "166:8:1"
+              }
+            ]
+          },
+          "id": 24,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "g",
+          "nameLocation": "146:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 13,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "147:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 14,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "157:0:1"
+          },
+          "src": "137:40:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "src": "105:74:1",
+      "usedErrors": [],
+      "usedEvents": []
+    }
+  ],
+  "src": "36:144:1"
+}
diff --git a/test/libsolidity/ASTJSON/inheritance_specifier.json b/test/libsolidity/ASTJSON/inheritance_specifier.json
index 8959d5b5d4..ae210c9496 100644
--- a/test/libsolidity/ASTJSON/inheritance_specifier.json
+++ b/test/libsolidity/ASTJSON/inheritance_specifier.json
@@ -33,7 +33,8 @@
       "nodes": [],
       "scope": 5,
       "src": "0:14:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -73,7 +74,8 @@
       "nodes": [],
       "scope": 5,
       "src": "15:20:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:36:1"
diff --git a/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json b/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
index 72da9ad2cc..171391b36d 100644
--- a/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
+++ b/test/libsolidity/ASTJSON/inheritance_specifier_parseOnly.json
@@ -15,7 +15,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "0:14:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -46,7 +47,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "15:20:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:36:1"
diff --git a/test/libsolidity/ASTJSON/license.json b/test/libsolidity/ASTJSON/license.json
index 9f996e0517..4c0882637f 100644
--- a/test/libsolidity/ASTJSON/license.json
+++ b/test/libsolidity/ASTJSON/license.json
@@ -30,7 +30,8 @@
       "nodes": [],
       "scope": 2,
       "src": "36:13:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "36:14:1"
diff --git a/test/libsolidity/ASTJSON/license_parseOnly.json b/test/libsolidity/ASTJSON/license_parseOnly.json
index 748b2548ac..f2958f15ff 100644
--- a/test/libsolidity/ASTJSON/license_parseOnly.json
+++ b/test/libsolidity/ASTJSON/license_parseOnly.json
@@ -16,7 +16,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "36:13:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "36:14:1"
diff --git a/test/libsolidity/ASTJSON/long_type_name_binary_operation.json b/test/libsolidity/ASTJSON/long_type_name_binary_operation.json
index 8340eaf404..9bcd5e8fd9 100644
--- a/test/libsolidity/ASTJSON/long_type_name_binary_operation.json
+++ b/test/libsolidity/ASTJSON/long_type_name_binary_operation.json
@@ -168,7 +168,8 @@
       ],
       "scope": 12,
       "src": "0:54:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:55:1"
diff --git a/test/libsolidity/ASTJSON/long_type_name_binary_operation_parseOnly.json b/test/libsolidity/ASTJSON/long_type_name_binary_operation_parseOnly.json
index df2db39266..2cb372dd26 100644
--- a/test/libsolidity/ASTJSON/long_type_name_binary_operation_parseOnly.json
+++ b/test/libsolidity/ASTJSON/long_type_name_binary_operation_parseOnly.json
@@ -115,7 +115,8 @@
         }
       ],
       "src": "0:54:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:55:1"
diff --git a/test/libsolidity/ASTJSON/long_type_name_identifier.json b/test/libsolidity/ASTJSON/long_type_name_identifier.json
index c810283d29..c22aeb40c2 100644
--- a/test/libsolidity/ASTJSON/long_type_name_identifier.json
+++ b/test/libsolidity/ASTJSON/long_type_name_identifier.json
@@ -177,7 +177,8 @@
       ],
       "scope": 16,
       "src": "0:70:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:71:1"
diff --git a/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json b/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json
index ef76f30aa5..1bf50bed60 100644
--- a/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json
+++ b/test/libsolidity/ASTJSON/long_type_name_identifier_parseOnly.json
@@ -130,7 +130,8 @@
         }
       ],
       "src": "0:70:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:71:1"
diff --git a/test/libsolidity/ASTJSON/mappings.json b/test/libsolidity/ASTJSON/mappings.json
index 0bf816eb49..81bf19db1a 100644
--- a/test/libsolidity/ASTJSON/mappings.json
+++ b/test/libsolidity/ASTJSON/mappings.json
@@ -315,7 +315,8 @@
       ],
       "scope": 24,
       "src": "0:173:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:174:1"
diff --git a/test/libsolidity/ASTJSON/mappings_parseOnly.json b/test/libsolidity/ASTJSON/mappings_parseOnly.json
index 9690f7c9ef..84cfb4004a 100644
--- a/test/libsolidity/ASTJSON/mappings_parseOnly.json
+++ b/test/libsolidity/ASTJSON/mappings_parseOnly.json
@@ -228,7 +228,8 @@
         }
       ],
       "src": "0:173:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:174:1"
diff --git a/test/libsolidity/ASTJSON/modifier_definition.json b/test/libsolidity/ASTJSON/modifier_definition.json
index aa448568c1..30ebcb7c20 100644
--- a/test/libsolidity/ASTJSON/modifier_definition.json
+++ b/test/libsolidity/ASTJSON/modifier_definition.json
@@ -169,7 +169,8 @@
       ],
       "scope": 15,
       "src": "0:68:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:69:1"
diff --git a/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json b/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
index 9344e419a1..f8067952a2 100644
--- a/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
+++ b/test/libsolidity/ASTJSON/modifier_definition_parseOnly.json
@@ -134,7 +134,8 @@
         }
       ],
       "src": "0:68:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:69:1"
diff --git a/test/libsolidity/ASTJSON/modifier_invocation.json b/test/libsolidity/ASTJSON/modifier_invocation.json
index aa448568c1..30ebcb7c20 100644
--- a/test/libsolidity/ASTJSON/modifier_invocation.json
+++ b/test/libsolidity/ASTJSON/modifier_invocation.json
@@ -169,7 +169,8 @@
       ],
       "scope": 15,
       "src": "0:68:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:69:1"
diff --git a/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json b/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
index 9344e419a1..f8067952a2 100644
--- a/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
+++ b/test/libsolidity/ASTJSON/modifier_invocation_parseOnly.json
@@ -134,7 +134,8 @@
         }
       ],
       "src": "0:68:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:69:1"
diff --git a/test/libsolidity/ASTJSON/mutability.json b/test/libsolidity/ASTJSON/mutability.json
index 90bbf05d58..b6318d84e5 100644
--- a/test/libsolidity/ASTJSON/mutability.json
+++ b/test/libsolidity/ASTJSON/mutability.json
@@ -178,7 +178,8 @@
       ],
       "scope": 11,
       "src": "0:102:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:103:1"
diff --git a/test/libsolidity/ASTJSON/mutability_parseOnly.json b/test/libsolidity/ASTJSON/mutability_parseOnly.json
index 88d3968f28..637f8e1141 100644
--- a/test/libsolidity/ASTJSON/mutability_parseOnly.json
+++ b/test/libsolidity/ASTJSON/mutability_parseOnly.json
@@ -110,7 +110,8 @@
         }
       ],
       "src": "0:102:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:103:1"
diff --git a/test/libsolidity/ASTJSON/non_utf8.json b/test/libsolidity/ASTJSON/non_utf8.json
index 926f858b5e..0058e56eb3 100644
--- a/test/libsolidity/ASTJSON/non_utf8.json
+++ b/test/libsolidity/ASTJSON/non_utf8.json
@@ -230,7 +230,8 @@
       ],
       "scope": 16,
       "src": "0:80:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:81:1"
diff --git a/test/libsolidity/ASTJSON/non_utf8_parseOnly.json b/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
index ef265cbe4f..bbc350f96d 100644
--- a/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
+++ b/test/libsolidity/ASTJSON/non_utf8_parseOnly.json
@@ -149,7 +149,8 @@
         }
       ],
       "src": "0:80:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:81:1"
diff --git a/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json b/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
index de14043f34..ea08150fd3 100644
--- a/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
+++ b/test/libsolidity/ASTJSON/not_existing_import_parseOnly.json
@@ -111,7 +111,8 @@
         }
       ],
       "src": "41:90:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:132:1"
diff --git a/test/libsolidity/ASTJSON/override.json b/test/libsolidity/ASTJSON/override.json
index a7c43767f5..35d36eac4e 100644
--- a/test/libsolidity/ASTJSON/override.json
+++ b/test/libsolidity/ASTJSON/override.json
@@ -75,7 +75,8 @@
       ],
       "scope": 30,
       "src": "0:48:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": true,
@@ -193,7 +194,8 @@
       ],
       "scope": 30,
       "src": "49:103:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -330,7 +332,8 @@
       ],
       "scope": 30,
       "src": "153:91:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:245:1"
diff --git a/test/libsolidity/ASTJSON/override_parseOnly.json b/test/libsolidity/ASTJSON/override_parseOnly.json
index fe9d8a7c63..3a927f5f2f 100644
--- a/test/libsolidity/ASTJSON/override_parseOnly.json
+++ b/test/libsolidity/ASTJSON/override_parseOnly.json
@@ -51,7 +51,8 @@
         }
       ],
       "src": "0:48:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": true,
@@ -152,7 +153,8 @@
         }
       ],
       "src": "49:103:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -267,7 +269,8 @@
         }
       ],
       "src": "153:91:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:245:1"
diff --git a/test/libsolidity/ASTJSON/placeholder_statement.json b/test/libsolidity/ASTJSON/placeholder_statement.json
index 5a6d51b218..96a46c1484 100644
--- a/test/libsolidity/ASTJSON/placeholder_statement.json
+++ b/test/libsolidity/ASTJSON/placeholder_statement.json
@@ -61,7 +61,8 @@
       ],
       "scope": 6,
       "src": "0:32:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:33:1"
diff --git a/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json b/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json
index 8f73cde602..8af1704024 100644
--- a/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json
+++ b/test/libsolidity/ASTJSON/placeholder_statement_parseOnly.json
@@ -47,7 +47,8 @@
         }
       ],
       "src": "0:32:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:33:1"
diff --git a/test/libsolidity/ASTJSON/receive_ether.json b/test/libsolidity/ASTJSON/receive_ether.json
index bfcb33f6cb..2790493993 100644
--- a/test/libsolidity/ASTJSON/receive_ether.json
+++ b/test/libsolidity/ASTJSON/receive_ether.json
@@ -66,7 +66,8 @@
       ],
       "scope": 6,
       "src": "0:49:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:50:1"
diff --git a/test/libsolidity/ASTJSON/receive_ether_parseOnly.json b/test/libsolidity/ASTJSON/receive_ether_parseOnly.json
index 413c10564a..f9aede155e 100644
--- a/test/libsolidity/ASTJSON/receive_ether_parseOnly.json
+++ b/test/libsolidity/ASTJSON/receive_ether_parseOnly.json
@@ -51,7 +51,8 @@
         }
       ],
       "src": "0:49:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:50:1"
diff --git a/test/libsolidity/ASTJSON/short_type_name.json b/test/libsolidity/ASTJSON/short_type_name.json
index b7409fbbcb..1c1138cbaf 100644
--- a/test/libsolidity/ASTJSON/short_type_name.json
+++ b/test/libsolidity/ASTJSON/short_type_name.json
@@ -122,7 +122,8 @@
       ],
       "scope": 12,
       "src": "0:55:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:56:1"
diff --git a/test/libsolidity/ASTJSON/short_type_name_parseOnly.json b/test/libsolidity/ASTJSON/short_type_name_parseOnly.json
index 02590363a9..3c4acfa775 100644
--- a/test/libsolidity/ASTJSON/short_type_name_parseOnly.json
+++ b/test/libsolidity/ASTJSON/short_type_name_parseOnly.json
@@ -93,7 +93,8 @@
         }
       ],
       "src": "0:55:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:56:1"
diff --git a/test/libsolidity/ASTJSON/short_type_name_ref.json b/test/libsolidity/ASTJSON/short_type_name_ref.json
index 6a0f249f82..447b1e5b77 100644
--- a/test/libsolidity/ASTJSON/short_type_name_ref.json
+++ b/test/libsolidity/ASTJSON/short_type_name_ref.json
@@ -133,7 +133,8 @@
       ],
       "scope": 13,
       "src": "0:60:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:61:1"
diff --git a/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json b/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json
index 00799a2124..07c782d47b 100644
--- a/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json
+++ b/test/libsolidity/ASTJSON/short_type_name_ref_parseOnly.json
@@ -100,7 +100,8 @@
         }
       ],
       "src": "0:60:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:61:1"
diff --git a/test/libsolidity/ASTJSON/smoke.json b/test/libsolidity/ASTJSON/smoke.json
index 4d4a02e241..d3b114bbcb 100644
--- a/test/libsolidity/ASTJSON/smoke.json
+++ b/test/libsolidity/ASTJSON/smoke.json
@@ -29,7 +29,8 @@
       "nodes": [],
       "scope": 2,
       "src": "0:13:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:14:1"
diff --git a/test/libsolidity/ASTJSON/smoke_parseOnly.json b/test/libsolidity/ASTJSON/smoke_parseOnly.json
index d03e986542..1160fea91e 100644
--- a/test/libsolidity/ASTJSON/smoke_parseOnly.json
+++ b/test/libsolidity/ASTJSON/smoke_parseOnly.json
@@ -15,7 +15,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "0:13:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:14:1"
diff --git a/test/libsolidity/ASTJSON/source_location.json b/test/libsolidity/ASTJSON/source_location.json
index df51e49c6f..caeaf027ab 100644
--- a/test/libsolidity/ASTJSON/source_location.json
+++ b/test/libsolidity/ASTJSON/source_location.json
@@ -165,7 +165,8 @@
       ],
       "scope": 13,
       "src": "0:55:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:56:1"
diff --git a/test/libsolidity/ASTJSON/source_location_parseOnly.json b/test/libsolidity/ASTJSON/source_location_parseOnly.json
index 88835788b8..ec25111bd3 100644
--- a/test/libsolidity/ASTJSON/source_location_parseOnly.json
+++ b/test/libsolidity/ASTJSON/source_location_parseOnly.json
@@ -119,7 +119,8 @@
         }
       ],
       "src": "0:55:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:56:1"
diff --git a/test/libsolidity/ASTJSON/string.json b/test/libsolidity/ASTJSON/string.json
index 438f760c4f..c7706e3bfc 100644
--- a/test/libsolidity/ASTJSON/string.json
+++ b/test/libsolidity/ASTJSON/string.json
@@ -129,7 +129,8 @@
       ],
       "scope": 10,
       "src": "0:71:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:72:1"
diff --git a/test/libsolidity/ASTJSON/string_parseOnly.json b/test/libsolidity/ASTJSON/string_parseOnly.json
index 444a1f7b2b..5f97eb1f91 100644
--- a/test/libsolidity/ASTJSON/string_parseOnly.json
+++ b/test/libsolidity/ASTJSON/string_parseOnly.json
@@ -96,7 +96,8 @@
         }
       ],
       "src": "0:71:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:72:1"
diff --git a/test/libsolidity/ASTJSON/two_base_functions.json b/test/libsolidity/ASTJSON/two_base_functions.json
index 23bdf6efe0..0ed997a32f 100644
--- a/test/libsolidity/ASTJSON/two_base_functions.json
+++ b/test/libsolidity/ASTJSON/two_base_functions.json
@@ -75,7 +75,8 @@
       ],
       "scope": 23,
       "src": "0:49:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -133,7 +134,8 @@
       ],
       "scope": 23,
       "src": "50:49:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -265,7 +267,8 @@
       ],
       "scope": 23,
       "src": "100:64:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:165:1"
diff --git a/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json b/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
index 078dc5daab..e448be836b 100644
--- a/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
+++ b/test/libsolidity/ASTJSON/two_base_functions_parseOnly.json
@@ -51,7 +51,8 @@
         }
       ],
       "src": "0:49:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -100,7 +101,8 @@
         }
       ],
       "src": "50:49:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "abstract": false,
@@ -212,7 +214,8 @@
         }
       ],
       "src": "100:64:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:165:1"
diff --git a/test/libsolidity/ASTJSON/unicode.json b/test/libsolidity/ASTJSON/unicode.json
index dcb267b3fb..0ff1426f17 100644
--- a/test/libsolidity/ASTJSON/unicode.json
+++ b/test/libsolidity/ASTJSON/unicode.json
@@ -129,7 +129,8 @@
       ],
       "scope": 10,
       "src": "0:77:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:78:1"
diff --git a/test/libsolidity/ASTJSON/unicode_parseOnly.json b/test/libsolidity/ASTJSON/unicode_parseOnly.json
index a6f52aa4ae..c8fb780c40 100644
--- a/test/libsolidity/ASTJSON/unicode_parseOnly.json
+++ b/test/libsolidity/ASTJSON/unicode_parseOnly.json
@@ -96,7 +96,8 @@
         }
       ],
       "src": "0:77:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:78:1"
diff --git a/test/libsolidity/ASTJSON/used_errors.json b/test/libsolidity/ASTJSON/used_errors.json
index c59b4f5309..12a59f9cbf 100644
--- a/test/libsolidity/ASTJSON/used_errors.json
+++ b/test/libsolidity/ASTJSON/used_errors.json
@@ -228,7 +228,8 @@
       [
         2,
         11
-      ]
+      ],
+      "usedEvents": []
     }
   ],
   "src": "0:108:1"
diff --git a/test/libsolidity/ASTJSON/used_errors_parseOnly.json b/test/libsolidity/ASTJSON/used_errors_parseOnly.json
index 7a4b24b3c6..115ea2aee5 100644
--- a/test/libsolidity/ASTJSON/used_errors_parseOnly.json
+++ b/test/libsolidity/ASTJSON/used_errors_parseOnly.json
@@ -167,7 +167,8 @@
         }
       ],
       "src": "45:62:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:108:1"
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType.json b/test/libsolidity/ASTJSON/userDefinedValueType.json
index eb44509466..adf1172f05 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType.json
@@ -352,7 +352,8 @@
       ],
       "scope": 28,
       "src": "96:113:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:210:1"
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
index 0dc95e13f9..90e48a9827 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
+++ b/test/libsolidity/ASTJSON/userDefinedValueType_parseOnly.json
@@ -261,7 +261,8 @@
         }
       ],
       "src": "96:113:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:210:1"
diff --git a/test/libsolidity/ASTJSON/user_defined_operator.json b/test/libsolidity/ASTJSON/user_defined_operator.json
index dd1c0d941f..ed72de49dd 100644
--- a/test/libsolidity/ASTJSON/user_defined_operator.json
+++ b/test/libsolidity/ASTJSON/user_defined_operator.json
@@ -656,7 +656,8 @@
       ],
       "scope": 50,
       "src": "143:97:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:241:1"
diff --git a/test/libsolidity/ASTJSON/using_for_directive.json b/test/libsolidity/ASTJSON/using_for_directive.json
index 57658134dd..f3094980ff 100644
--- a/test/libsolidity/ASTJSON/using_for_directive.json
+++ b/test/libsolidity/ASTJSON/using_for_directive.json
@@ -72,7 +72,8 @@
       "nodes": [],
       "scope": 14,
       "src": "20:12:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "body":
@@ -179,7 +180,8 @@
       ],
       "scope": 14,
       "src": "53:29:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:83:1"
diff --git a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
index 84de310c00..9360227d43 100644
--- a/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
+++ b/test/libsolidity/ASTJSON/using_for_directive_parseOnly.json
@@ -45,7 +45,8 @@
       "nodeType": "ContractDefinition",
       "nodes": [],
       "src": "20:12:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     },
     {
       "body":
@@ -134,7 +135,8 @@
         }
       ],
       "src": "53:29:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:83:1"
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal.json b/test/libsolidity/ASTJSON/yul_hex_literal.json
index fc1cc39db3..0b3fa41741 100644
--- a/test/libsolidity/ASTJSON/yul_hex_literal.json
+++ b/test/libsolidity/ASTJSON/yul_hex_literal.json
@@ -148,7 +148,8 @@
       ],
       "scope": 7,
       "src": "0:216:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:217:1"
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json b/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
index a6da7e7784..3551ac2d99 100644
--- a/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
+++ b/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
@@ -132,7 +132,8 @@
         }
       ],
       "src": "0:216:1",
-      "usedErrors": []
+      "usedErrors": [],
+      "usedEvents": []
     }
   ],
   "src": "0:217:1"
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index 3f83816c1f..a54460eb62 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -485,6 +485,411 @@ BOOST_AUTO_TEST_CASE(event)
 	checkNatspec(sourceCode, "ERC20", userDoc, true);
 }
 
+BOOST_AUTO_TEST_CASE(emit_same_signature_event_library_contract)
+{
+	char const* sourceCode = R"(
+		library L {
+		    /// @notice This event is defined in Library L
+		    /// @dev This should not appear in Contract C dev doc
+		    event SameSignatureEvent(uint16);
+		    /// @notice This event is defined in Library L
+		    /// @dev This should appear in Contract C dev doc
+		    event LibraryEvent(uint32);
+		}
+		contract C {
+		    /// @notice This event is defined in Contract C
+			/// @dev This should appear in Contract C dev doc
+		    event SameSignatureEvent(uint16);
+		    /// @notice This event is defined in Contract C
+			/// @dev This should appear in contract C dev doc
+		    event ContractEvent(uint32);
+		    function f() public {
+		        emit L.SameSignatureEvent(0);
+		        emit SameSignatureEvent(1);
+		        emit L.LibraryEvent(2);
+		        emit ContractEvent(3);
+		    }
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+	    "events":
+	    {
+	        "ContractEvent(uint32)":
+	        {
+	            "details": "This should appear in contract C dev doc"
+	        },
+			"LibraryEvent(uint32)":
+			{
+				"details": "This should appear in Contract C dev doc"
+			},
+	        "SameSignatureEvent(uint16)":
+	        {
+	            "details": "This should appear in Contract C dev doc"
+	        }
+	    },
+	    "kind": "dev",
+	    "methods": {},
+	    "version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"ContractEvent(uint32)":
+			{
+				"notice": "This event is defined in Contract C"
+			},
+			"LibraryEvent(uint32)":
+			{
+				"notice": "This event is defined in Library L"
+			},
+			"SameSignatureEvent(uint16)":
+			{
+				"notice": "This event is defined in Contract C"
+			}
+		},
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", userDoc, true);
+}
+
+BOOST_AUTO_TEST_CASE(emit_same_signature_event_different_libraries)
+{
+	char const* sourceCode = R"(
+		library L1 {
+		    /// @notice This event is defined in Library L1
+		    /// @dev This should not appear in Contract C dev doc
+		    event SameSignatureEvent(uint16);
+		}
+		library L2 {
+		    /// @notice This event is defined in Library L2
+		    /// @dev This should not appear in Contract C dev doc
+		    event SameSignatureEvent(uint16);
+		}
+		library L3 {
+		    /// @notice This event is defined in Library L3
+		    /// @dev This should not appear in Contract C dev doc
+		    event SameSignatureEvent(uint16);
+		}
+		contract C {
+		    function f() public {
+		        emit L1.SameSignatureEvent(0);
+		        emit L2.SameSignatureEvent(1);
+		        emit L3.SameSignatureEvent(2);
+		    }
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+		"kind": "dev",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", userDoc, true);
+
+	char const* libraryDevDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"SameSignatureEvent(uint16)":
+			{
+				"details": "This should not appear in Contract C dev doc"
+			}
+		},
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "L1", libraryDevDoc, false);
+
+	char const* libraryUserDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"SameSignatureEvent(uint16)":
+			{
+				"notice": "This event is defined in Library L1"
+			}
+		},
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "L1", libraryUserDoc, true);
+}
+
+BOOST_AUTO_TEST_CASE(emit_same_signature_event_library_inherited)
+{
+	char const* sourceCode = R"(
+		contract D {
+			/// @notice This event is defined in contract D
+			/// @dev This should appear in Contract C dev doc
+			event SameSignatureEvent(uint16);
+		}
+		library L {
+		    /// @notice This event is defined in Library L
+		    /// @dev This should not appear in Contract C
+		    event SameSignatureEvent(uint16);
+		}
+		contract C is D {
+		    function f() public {
+		        emit L.SameSignatureEvent(0);
+		        emit D.SameSignatureEvent(1);
+		    }
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"SameSignatureEvent(uint16)":
+			{
+				"details": "This should appear in Contract C dev doc"
+			}
+		},
+		"kind": "dev",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"SameSignatureEvent(uint16)":
+			{
+				"notice": "This event is defined in contract D"
+			}
+		},
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", userDoc, true);
+}
+
+BOOST_AUTO_TEST_CASE(emit_same_signature_event_library_contract_missing_natspec)
+{
+	char const* sourceCode = R"(
+		library L {
+		    /// @notice This event is defined in library L
+		    /// @dev This should not appear in contract C devdoc
+		    event SameSignatureEvent(uint16);
+		    /// @notice This event is defined in library L
+			/// @dev This should appear in contract C devdoc
+		    event LibraryEvent(uint32);
+		}
+		contract C {
+			event SameSignatureEvent(uint16);
+		    /// @notice This event is defined in contract C
+		    event ContractEvent(uint32);
+		    function f() public {
+		        emit L.SameSignatureEvent(0);
+		        emit SameSignatureEvent(1);
+		        emit L.LibraryEvent(2);
+		        emit ContractEvent(3);
+		    }
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+	    "events":
+	    {
+	        "LibraryEvent(uint32)":
+	        {
+	            "details": "This should appear in contract C devdoc"
+	        }
+	    },
+	    "kind": "dev",
+	    "methods": {},
+	    "version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"ContractEvent(uint32)":
+			{
+				"notice": "This event is defined in contract C"
+			},
+			"LibraryEvent(uint32)":
+			{
+				"notice": "This event is defined in library L"
+			}
+		},
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", userDoc, true);
+}
+
+BOOST_AUTO_TEST_CASE(emit_same_signature_event_different_libraries_missing_natspec)
+{
+	char const* sourceCode = R"(
+		library L1 {
+		    event SameSignatureEvent(uint16);
+		}
+		library L2 {
+		    /// @notice This event is defined in library L2
+		    /// @dev This should not appear in Contract C devdoc
+		    event SameSignatureEvent(uint16);
+		}
+		library L3 {
+		    event SameSignatureEvent(uint16);
+		}
+		contract C {
+		    function f() public {
+		        emit L1.SameSignatureEvent(0);
+		        emit L2.SameSignatureEvent(1);
+		        emit L3.SameSignatureEvent(2);
+		    }
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+		"kind": "dev",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+	    "kind": "user",
+	    "methods": {},
+	    "version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", userDoc, true);
+}
+
+BOOST_AUTO_TEST_CASE(emit_same_signature_event_library_inherited_missing_natspec)
+{
+	char const* sourceCode = R"(
+		contract D {
+			event SameSignatureEvent(uint16);
+		}
+		library L {
+		    /// @notice This event is defined in library L
+		    /// @dev This should not appear in contract C devdoc
+		    event SameSignatureEvent(uint16);
+		}
+		contract C is D {
+		    function f() public {
+		        emit L.SameSignatureEvent(0);
+		        emit D.SameSignatureEvent(1);
+		    }
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+		"kind": "dev",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+   {
+     "kind": "user",
+     "methods": {},
+     "version": 1
+   }
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", userDoc, true);
+}
+
+BOOST_AUTO_TEST_CASE(event_inheritance_interface)
+{
+	char const* sourceCode = R"(
+		interface ERC20 {
+			/// @notice This event is emitted when a transfer occurs.
+			/// @param from The source account.
+			/// @param to The destination account.
+			/// @param amount The amount.
+			/// @dev A test case!
+			event Transfer(address indexed from, address indexed to, uint amount);
+		}
+		contract A is ERC20 {
+		}
+		contract B is A {
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"Transfer(address,address,uint256)":
+			{
+				"details": "A test case!",
+				"params":
+				{
+					"amount": "The amount.",
+					"from": "The source account.",
+					"to": "The destination account."
+				}
+			}
+		},
+		"methods": {}
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "ERC20", devDoc, false);
+	checkNatspec(sourceCode, "A", devDoc, false);
+	checkNatspec(sourceCode, "B", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"Transfer(address,address,uint256)":
+			{
+				"notice": "This event is emitted when a transfer occurs."
+			}
+		},
+		"methods": {}
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "ERC20", userDoc, true);
+	checkNatspec(sourceCode, "A", userDoc, true);
+	checkNatspec(sourceCode, "B", userDoc, true);
+}
+
 BOOST_AUTO_TEST_CASE(event_inheritance)
 {
 	char const* sourceCode = R"(
@@ -496,10 +901,8 @@ BOOST_AUTO_TEST_CASE(event_inheritance)
 			/// @dev A test case!
 			event Transfer(address indexed from, address indexed to, uint amount);
 		}
-
 		contract A is ERC20 {
 		}
-
 		contract B is A {
 		}
 	)";
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index d2eeedd910..086cde8efa 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -485,9 +485,10 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
 	BOOST_CHECK_EQUAL(
 		util::jsonCompactPrint(result["sources"]["fileA"]["ast"]),
 		"{\"absolutePath\":\"fileA\",\"exportedSymbols\":{\"A\":[1]},\"id\":2,\"nodeType\":\"SourceUnit\",\"nodes\":[{\"abstract\":false,"
-		"\"baseContracts\":[],\"canonicalName\":\"A\",\"contractDependencies\":[],\"contractKind\":\"contract\",\"fullyImplemented\":true,\"id\":1,"
+		"\"baseContracts\":[],\"canonicalName\":\"A\",\"contractDependencies\":[],"
+		"\"contractKind\":\"contract\",\"fullyImplemented\":true,\"id\":1,"
 		"\"linearizedBaseContracts\":[1],\"name\":\"A\",\"nameLocation\":\"9:1:0\",\"nodeType\":\"ContractDefinition\",\"nodes\":[],\"scope\":2,"
-		"\"src\":\"0:14:0\",\"usedErrors\":[]}],\"src\":\"0:14:0\"}"
+		"\"src\":\"0:14:0\",\"usedErrors\":[],\"usedEvents\":[]}],\"src\":\"0:14:0\"}"
 	);
 }
 

From f2ddc997f0f9f711fb9e9e05f80d1d0fa9b43d1a Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 4 May 2023 16:09:05 +0200
Subject: [PATCH 1344/1748] Temporary workaround for GCC 13 compiler warnings.

---
 cmake/EthCompilerSettings.cmake | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 01eee4b984..54a782c6e3 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -65,6 +65,19 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 		if(WEXTRA_SEMI)
 			add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>)
 		endif()
+		# TODO: This is a temporary workaround. The underlying warning should be addressed and this workaround removed ASAP.
+		check_cxx_compiler_flag(-Wno-error=overloaded-virtual=1 WNO_ERROR_OVERLOADED_VIRTUAL)
+		if (WNO_ERROR_OVERLOADED_VIRTUAL)
+			add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-error=overloaded-virtual=1>)
+		endif()
+		# TODO: This is a temporary workaround. The underlying warning should be addressed and this workaround removed ASAP.
+		# Once https://github.com/fmtlib/fmt/issues/3415 is addressed, this can be fixed by bumping the fmtlib version.
+		check_cxx_compiler_flag(-Wno-error=dangling-reference WNO_ERROR_DANGLING_REFERENCE)
+		if (WNO_ERROR_DANGLING_REFERENCE)
+            add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-error=dangling-reference>)
+		endif()
+
+
 		eth_add_cxx_compiler_flag_if_supported(-Wfinal-dtor-non-final-class)
 		eth_add_cxx_compiler_flag_if_supported(-Wnewline-eof)
 		eth_add_cxx_compiler_flag_if_supported(-Wsuggest-destructor-override)

From 0f40bcc06d353e1d4078c8762a5c1f3a5a98c2ff Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Thu, 4 May 2023 18:35:02 +0100
Subject: [PATCH 1345/1748] Changed order of menu and spelling (#14185)

- Changed menu order to obey what we had written on the page.
- Fixed some spelling.
---
 docs/index.rst | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index 2f754473f8..b5f42aa635 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -2,20 +2,20 @@ Solidity
 ========
 
 Solidity is an object-oriented, high-level language for implementing smart contracts.
-Smart contracts are programs which govern the behaviour of accounts within the Ethereum state.
+Smart contracts are programs that govern the behavior of accounts within the Ethereum state.
 
 Solidity is a `curly-bracket language <https://en.wikipedia.org/wiki/List_of_programming_languages_by_type#Curly-bracket_languages>`_ designed to target the Ethereum Virtual Machine (EVM).
-It is influenced by C++, Python and JavaScript.
+It is influenced by C++, Python, and JavaScript.
 You can find more details about which languages Solidity has been inspired by in the :doc:`language influences <language-influences>` section.
 
-Solidity is statically typed, supports inheritance, libraries and complex user-defined types among other features.
+Solidity is statically typed, supports inheritance, libraries, and complex user-defined types, among other features.
 
-With Solidity you can create contracts for uses such as voting, crowdfunding, blind auctions, and multi-signature wallets.
+With Solidity, you can create contracts for uses such as voting, crowdfunding, blind auctions, and multi-signature wallets.
 
 When deploying contracts, you should use the latest released version of Solidity.
 Apart from exceptional cases, only the latest version receives
 `security fixes <https://github.com/ethereum/solidity/security/policy#supported-versions>`_.
-Furthermore, breaking changes as well as new features are introduced regularly.
+Furthermore, breaking changes, as well as new features, are introduced regularly.
 We currently use a 0.y.z version number `to indicate this fast pace of change <https://semver.org/#spec-item-4>`_.
 
 .. warning::
@@ -37,7 +37,7 @@ Getting Started
 
 **1. Understand the Smart Contract Basics**
 
-If you are new to the concept of smart contracts we recommend you to get started by digging into the "Introduction to Smart Contracts" section, which covers:
+If you are new to the concept of smart contracts, we recommend you to get started by digging into the "Introduction to Smart Contracts" section, which covers the following:
 
 * :ref:`A simple example smart contract <simple-smart-contract>` written in Solidity.
 * :ref:`Blockchain Basics <blockchain-basics>`.
@@ -56,12 +56,12 @@ simply choose your preferred option and follow the steps outlined on the :ref:`i
 .. hint::
   You can try out code examples directly in your browser with the
   `Remix IDE <https://remix.ethereum.org>`_.
-  Remix is a web browser based IDE that allows you to write, deploy and administer Solidity smart contracts,
+  Remix is a web browser-based IDE that allows you to write, deploy and administer Solidity smart contracts,
   without the need to install Solidity locally.
 
 .. warning::
     As humans write software, it can have bugs.
-    You should follow established software development best-practices when writing your smart contracts.
+    Therefore, you should follow established software development best practices when writing your smart contracts.
     This includes code review, testing, audits, and correctness proofs.
     Smart contract users are sometimes more confident with code than their authors,
     and blockchains and smart contracts have their own unique issues to watch out for,
@@ -71,7 +71,7 @@ simply choose your preferred option and follow the steps outlined on the :ref:`i
 
 If you want to learn more about building decentralized applications on Ethereum,
 the `Ethereum Developer Resources <https://ethereum.org/en/developers/>`_ can help you with further general documentation around Ethereum,
-and a wide selection of tutorials, tools and development frameworks.
+and a wide selection of tutorials, tools, and development frameworks.
 
 If you have any questions, you can try searching for answers or asking on the
 `Ethereum StackExchange <https://ethereum.stackexchange.com/>`_,
@@ -115,8 +115,8 @@ Contents
    :caption: Basics
 
    introduction-to-smart-contracts.rst
-   installing-solidity.rst
    solidity-by-example.rst
+   installing-solidity.rst
 
 .. toctree::
    :maxdepth: 2

From 889f0721a20a60394d5d87e1152606d2568df8f4 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Fri, 5 May 2023 11:39:56 +0200
Subject: [PATCH 1346/1748] Make use of IR codegen pipeline and selectively
 report stack too deep errors for the new pipeline.

---
 test/tools/fuzzer_common.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 51b8a0e688..60b871cf79 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -121,7 +121,7 @@ void FuzzerUtil::testCompiler(
 	compiler.setSources(_input);
 	compiler.setEVMVersion(evmVersion);
 	compiler.setOptimiserSettings(optimiserSettings);
-	compiler.enableIRGeneration(_compileViaYul);
+	compiler.setViaIR(_compileViaYul);
 	try
 	{
 		compiler.compile();
@@ -137,6 +137,8 @@ void FuzzerUtil::testCompiler(
 	}
 	catch (StackTooDeepError const&)
 	{
+		if (_optimize && _compileViaYul)
+			throw;
 	}
 }
 

From a00a2117c5aceb9c77e4e970196f3208ed1ea25c Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Fri, 5 May 2023 12:02:17 +0100
Subject: [PATCH 1347/1748] Removed English (UK) and changed to International
 English. (#14189)

Removed English (UK) and changed to International English like previously discussed.
---
 docs/contributing.rst | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index f19dc99fd4..d74612417b 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -404,13 +404,12 @@ contributions to Solidity.
 English Language
 ----------------
 
-Use English, with British English spelling preferred, unless using project or brand names. Try to reduce the usage of
-local slang and references, making your language as clear to all readers as possible. Below are some references to help:
+Use International English, unless using project or brand names. Try to reduce the usage of
+local slang and references, making your language as clear to all readers as possible.
+Below are some references to help:
 
 * `Simplified technical English <https://en.wikipedia.org/wiki/Simplified_Technical_English>`_
 * `International English <https://en.wikipedia.org/wiki/International_English>`_
-* `British English spelling <https://web.archive.org/web/20220324094038/https://www.lexico.com/grammar/british-and-spelling>`_
-
 
 .. note::
 

From 766db7daa4adc8a5ad3f04d4fb95a070c6a6a5ad Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Fri, 5 May 2023 17:09:58 +0200
Subject: [PATCH 1348/1748] Update gp2 external test script

---
 test/externalTests/gp2.sh | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index a73f1453b3..4dae6f0c3b 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -69,16 +69,6 @@ function gp2_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     yarn
 
-    # New hardhat release breaks GP2 tests, and since GP2 repository has been archived, we are pinning hardhat
-    # to the previous stable version. See https://github.com/ethereum/solidity/pull/13485
-    yarn add hardhat@2.10.2
-    # hardhat-tenderly@1.2.0 and upwards break the build, hence we are pinning the version to the last stable one.
-    # See https://github.com/cowprotocol/contracts/issues/32
-    yarn add @tenderly/hardhat-tenderly@1.1.6
-
-    # Add missing sinon type definitions
-    yarn add @types/sinon
-
     # Some dependencies come with pre-built artifacts. We want to build from scratch.
     rm -r node_modules/@gnosis.pm/safe-contracts/build/
 

From d80fd1b5720f8d018cdf241f318e9ed7fd441669 Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Sat, 6 May 2023 13:42:25 +0200
Subject: [PATCH 1349/1748] Migrate to new external tests script

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 92366f7648..7bb4c51f44 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1251,17 +1251,17 @@ jobs:
             equal: [<< parameters.binary_type >>, "solcjs"]
           steps:
             - run:
-                name: External << parameters.project >> tests (solcjs)
+                name: External << parameters.project >> tests (<< parameters.binary_type >>)
                 command: |
-                  test/externalTests/<< parameters.project >>.sh solcjs /tmp/workspace/soljson.js
+                  test/external_tests.py test --solc-binary-type "<< parameters.binary_type >>" --solc-binary-path /tmp/workspace/soljson.js --run "<< parameters.project >>"
       - when:
           condition:
             equal: [<< parameters.binary_type >>, "native"]
           steps:
             - run:
-                name: External << parameters.project >> tests (native)
+                name: External << parameters.project >> tests (<< parameters.binary_type >>)
                 command: |
-                  test/externalTests/<< parameters.project >>.sh native /tmp/workspace/solc/solc-static-linux
+                  test/external_tests.py test --solc-binary-type "<< parameters.binary_type >>" --solc-binary-path /tmp/workspace/solc/solc-static-linux --run "<< parameters.project >>"
       - store_artifacts:
           path: reports/externalTests/
       # persist_to_workspace fails if the directory does not exist and the test script will create

From a29f77369a1d6a073e1a93dd398c04c1ebf1f80e Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Tue, 2 May 2023 15:30:59 +0200
Subject: [PATCH 1350/1748] Move AST annotation of internal function dispatch
 IDs to ContractDefinition
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Daniel <daniel@ekpyron.org>
Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>
---
 Changelog.md                                  |    2 +-
 libsolidity/ast/ASTAnnotations.h              |    4 +-
 libsolidity/ast/ASTJsonExporter.cpp           |   11 +-
 libsolidity/codegen/ir/IRGenerator.cpp        |    2 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   |    2 +-
 libsolidity/interface/CompilerStack.cpp       |   10 +-
 ...nternal_function_different_ids_export.json | 1027 +++++++++++++++++
 ...internal_function_different_ids_export.sol |   38 +
 .../ast_internal_function_id_export.json      |   31 +-
 9 files changed, 1110 insertions(+), 17 deletions(-)
 create mode 100644 test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json
 create mode 100644 test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol

diff --git a/Changelog.md b/Changelog.md
index 80da2b2278..0165de0f64 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -25,7 +25,7 @@ Bugfixes:
 
 
 AST Changes:
- * AST: Add the ``internalFunctionID`` field to the AST nodes of functions that may be called via the internal dispatch. These IDs are always generated, but they are only used in via-IR code generation.
+ * AST: Add the ``internalFunctionIDs`` field to the AST nodes of contracts containing IDs of functions that may be called via the internal dispatch. The field is a map from function AST IDs to internal dispatch function IDs. These IDs are always generated, but they are only used in via-IR code generation.
  * AST: Add the ``usedEvents`` field to ``ContractDefinition`` which contains the AST IDs of all events emitted by the contract as well as all events defined and inherited by the contract.
 
 
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index d5087c429e..2573015c27 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -168,6 +168,9 @@ struct ContractDefinitionAnnotation: TypeDeclarationAnnotation, StructurallyDocu
 	/// List of contracts whose bytecode is referenced by this contract, e.g. through "new".
 	/// The Value represents the ast node that referenced the contract.
 	std::map<ContractDefinition const*, ASTNode const*, ASTCompareByID<ContractDefinition>> contractDependencies;
+
+	// Per-contract map from function AST IDs to internal dispatch function IDs.
+	std::map<FunctionDefinition const*, uint64_t> internalFunctionIDs;
 };
 
 struct CallableDeclarationAnnotation: DeclarationAnnotation
@@ -178,7 +181,6 @@ struct CallableDeclarationAnnotation: DeclarationAnnotation
 
 struct FunctionDefinitionAnnotation: CallableDeclarationAnnotation, StructurallyDocumentedAnnotation
 {
-	util::SetOnce<uint64_t> internalFunctionID;
 };
 
 struct EventDefinitionAnnotation: CallableDeclarationAnnotation, StructurallyDocumentedAnnotation
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index ad5a4f9c3f..e13cead11a 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -299,6 +299,14 @@ bool ASTJsonExporter::visit(ContractDefinition const& _node)
 	if (!_node.annotation().linearizedBaseContracts.empty())
 		attributes.emplace_back("linearizedBaseContracts", getContainerIds(_node.annotation().linearizedBaseContracts));
 
+	if (!_node.annotation().internalFunctionIDs.empty())
+	{
+		Json::Value internalFunctionIDs(Json::objectValue);
+		for (auto const& [functionDefinition, internalFunctionID]: _node.annotation().internalFunctionIDs)
+			internalFunctionIDs[to_string(functionDefinition->id())] = internalFunctionID;
+		attributes.emplace_back("internalFunctionIDs", std::move(internalFunctionIDs));
+	}
+
 	setJsonNode(_node, "ContractDefinition", std::move(attributes));
 	return false;
 }
@@ -473,9 +481,6 @@ bool ASTJsonExporter::visit(FunctionDefinition const& _node)
 	if (!_node.annotation().baseFunctions.empty())
 		attributes.emplace_back(make_pair("baseFunctions", getContainerIds(_node.annotation().baseFunctions, true)));
 
-	if (_node.annotation().internalFunctionID.set())
-		attributes.emplace_back("internalFunctionID", *_node.annotation().internalFunctionID);
-
 	setJsonNode(_node, "FunctionDefinition", std::move(attributes));
 	return false;
 }
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index cf11a8a02b..bc2f85b4ae 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -313,7 +313,7 @@ InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefin
 				solAssert(m_context.functionCollector().contains(IRNames::function(*function)), "");
 
 				cases.emplace_back(map<string, string>{
-					{"funID", to_string(*function->annotation().internalFunctionID)},
+					{"funID", to_string(m_context.mostDerivedContract().annotation().internalFunctionIDs.at(function))},
 					{"name", IRNames::function(*function)}
 				});
 			}
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 2263e11496..509cc28c7a 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2807,7 +2807,7 @@ void IRGeneratorForStatements::assignInternalFunctionIDIfNotCalledDirectly(
 		return;
 
 	define(IRVariable(_expression).part("functionIdentifier")) <<
-		to_string(*_referencedFunction.annotation().internalFunctionID) <<
+		to_string(m_context.mostDerivedContract().annotation().internalFunctionIDs.at(&_referencedFunction)) <<
 		"\n";
 	m_context.addToInternalDispatch(_referencedFunction);
 }
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index ad2618bc0a..fa1e8ab3ea 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1246,7 +1246,6 @@ void CompilerStack::storeContractDefinitions()
 
 void CompilerStack::annotateInternalFunctionIDs()
 {
-	uint64_t internalFunctionID = 1;
 	for (Source const* source: m_sourceOrder)
 	{
 		if (!source->ast)
@@ -1254,20 +1253,23 @@ void CompilerStack::annotateInternalFunctionIDs()
 
 		for (ContractDefinition const* contract: ASTNode::filteredNodes<ContractDefinition>(source->ast->nodes()))
 		{
+			uint64_t internalFunctionID = 1;
 			ContractDefinitionAnnotation& annotation = contract->annotation();
 
 			if (auto const* deployTimeInternalDispatch = util::valueOrNullptr((*annotation.deployedCallGraph)->edges, CallGraph::SpecialNode::InternalDispatch))
 				for (auto const& node: *deployTimeInternalDispatch)
 					if (auto const* callable = get_if<CallableDeclaration const*>(&node))
 						if (auto const* function = dynamic_cast<FunctionDefinition const*>(*callable))
-							if (!function->annotation().internalFunctionID.set())
-								function->annotation().internalFunctionID = internalFunctionID++;
+						{
+							solAssert(contract->annotation().internalFunctionIDs.count(function) == 0);
+							contract->annotation().internalFunctionIDs[function] = internalFunctionID++;
+						}
 			if (auto const* creationTimeInternalDispatch = util::valueOrNullptr((*annotation.creationCallGraph)->edges, CallGraph::SpecialNode::InternalDispatch))
 				for (auto const& node: *creationTimeInternalDispatch)
 					if (auto const* callable = get_if<CallableDeclaration const*>(&node))
 						if (auto const* function = dynamic_cast<FunctionDefinition const*>(*callable))
 							// Make sure the function already got an ID since it also occurs in the deploy-time internal dispatch.
-							solAssert(function->annotation().internalFunctionID.set());
+							solAssert(contract->annotation().internalFunctionIDs.count(function) != 0);
 		}
 	}
 }
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json
new file mode 100644
index 0000000000..07886a1663
--- /dev/null
+++ b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.json
@@ -0,0 +1,1027 @@
+[
+{
+  "absolutePath": "L",
+  "exportedSymbols":
+  {
+    "L":
+    [
+      78
+    ],
+    "free1":
+    [
+      65
+    ],
+    "free2":
+    [
+      69
+    ]
+  },
+  "id": 79,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "body":
+      {
+        "id": 64,
+        "nodeType": "Block",
+        "src": "17:2:1",
+        "statements": []
+      },
+      "id": 65,
+      "implemented": true,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "free1",
+      "nameLocation": "9:5:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 62,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "14:2:1"
+      },
+      "returnParameters":
+      {
+        "id": 63,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "17:0:1"
+      },
+      "scope": 79,
+      "src": "0:19:1",
+      "stateMutability": "nonpayable",
+      "virtual": false,
+      "visibility": "internal"
+    },
+    {
+      "body":
+      {
+        "id": 68,
+        "nodeType": "Block",
+        "src": "37:2:1",
+        "statements": []
+      },
+      "id": 69,
+      "implemented": true,
+      "kind": "freeFunction",
+      "modifiers": [],
+      "name": "free2",
+      "nameLocation": "29:5:1",
+      "nodeType": "FunctionDefinition",
+      "parameters":
+      {
+        "id": 66,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "34:2:1"
+      },
+      "returnParameters":
+      {
+        "id": 67,
+        "nodeType": "ParameterList",
+        "parameters": [],
+        "src": "37:0:1"
+      },
+      "scope": 79,
+      "src": "20:19:1",
+      "stateMutability": "nonpayable",
+      "virtual": false,
+      "visibility": "internal"
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "L",
+      "contractDependencies": [],
+      "contractKind": "library",
+      "fullyImplemented": true,
+      "id": 78,
+      "linearizedBaseContracts":
+      [
+        78
+      ],
+      "name": "L",
+      "nameLocation": "48:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 72,
+            "nodeType": "Block",
+            "src": "78:2:1",
+            "statements": []
+          },
+          "id": 73,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "g",
+          "nameLocation": "65:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 70,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "66:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 71,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "78:0:1"
+          },
+          "scope": 78,
+          "src": "56:24:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "internal"
+        },
+        {
+          "body":
+          {
+            "id": 76,
+            "nodeType": "Block",
+            "src": "107:2:1",
+            "statements": []
+          },
+          "id": 77,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "h",
+          "nameLocation": "94:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 74,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "95:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 75,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "107:0:1"
+          },
+          "scope": 78,
+          "src": "85:24:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "internal"
+        }
+      ],
+      "scope": 79,
+      "src": "40:71:1",
+      "usedErrors": [],
+      "usedEvents": []
+    }
+  ],
+  "src": "0:112:1"
+},
+{
+  "absolutePath": "A",
+  "exportedSymbols":
+  {
+    "A":
+    [
+      22
+    ],
+    "B":
+    [
+      37
+    ],
+    "L":
+    [
+      78
+    ],
+    "free1":
+    [
+      65
+    ],
+    "free2":
+    [
+      69
+    ]
+  },
+  "id": 38,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "absolutePath": "L",
+      "file": "L",
+      "id": 1,
+      "nameLocation": "-1:-1:-1",
+      "nodeType": "ImportDirective",
+      "scope": 38,
+      "sourceUnit": 79,
+      "src": "0:11:2",
+      "symbolAliases": [],
+      "unitAlias": ""
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "A",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 22,
+      "internalFunctionIDs":
+      {
+        "69": 1,
+        "73": 2,
+        "77": 3
+      },
+      "linearizedBaseContracts":
+      [
+        22
+      ],
+      "name": "A",
+      "nameLocation": "21:1:2",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 20,
+            "nodeType": "Block",
+            "src": "49:60:2",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "expression":
+                        {
+                          "id": 4,
+                          "name": "L",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 78,
+                          "src": "60:1:2",
+                          "typeDescriptions":
+                          {
+                            "typeIdentifier": "t_type$_t_contract$_L_$78_$",
+                            "typeString": "type(library L)"
+                          }
+                        },
+                        "id": 6,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberLocation": "62:1:2",
+                        "memberName": "g",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 73,
+                        "src": "60:3:2",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 7,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "59:5:2",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 8,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "59:7:2",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 9,
+                "nodeType": "ExpressionStatement",
+                "src": "59:7:2"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "id": 10,
+                        "name": "free2",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 69,
+                        "src": "77:5:2",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 11,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "76:7:2",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 12,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "76:9:2",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 13,
+                "nodeType": "ExpressionStatement",
+                "src": "76:9:2"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "expression":
+                        {
+                          "id": 14,
+                          "name": "L",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 78,
+                          "src": "96:1:2",
+                          "typeDescriptions":
+                          {
+                            "typeIdentifier": "t_type$_t_contract$_L_$78_$",
+                            "typeString": "type(library L)"
+                          }
+                        },
+                        "id": 16,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberLocation": "98:1:2",
+                        "memberName": "h",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 77,
+                        "src": "96:3:2",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 17,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "95:5:2",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 18,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "95:7:2",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 19,
+                "nodeType": "ExpressionStatement",
+                "src": "95:7:2"
+              }
+            ]
+          },
+          "functionSelector": "26121ff0",
+          "id": 21,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "38:1:2",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 2,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "39:2:2"
+          },
+          "returnParameters":
+          {
+            "id": 3,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "49:0:2"
+          },
+          "scope": 22,
+          "src": "29:80:2",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 38,
+      "src": "12:99:2",
+      "usedErrors": [],
+      "usedEvents": []
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "B",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 37,
+      "internalFunctionIDs":
+      {
+        "69": 1,
+        "77": 2
+      },
+      "linearizedBaseContracts":
+      [
+        37
+      ],
+      "name": "B",
+      "nameLocation": "121:1:2",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 35,
+            "nodeType": "Block",
+            "src": "149:43:2",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "expression":
+                        {
+                          "id": 25,
+                          "name": "L",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 78,
+                          "src": "160:1:2",
+                          "typeDescriptions":
+                          {
+                            "typeIdentifier": "t_type$_t_contract$_L_$78_$",
+                            "typeString": "type(library L)"
+                          }
+                        },
+                        "id": 27,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberLocation": "162:1:2",
+                        "memberName": "h",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 77,
+                        "src": "160:3:2",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 28,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "159:5:2",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 29,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "159:7:2",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 30,
+                "nodeType": "ExpressionStatement",
+                "src": "159:7:2"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "id": 31,
+                        "name": "free2",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 69,
+                        "src": "177:5:2",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 32,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "176:7:2",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 33,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "176:9:2",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 34,
+                "nodeType": "ExpressionStatement",
+                "src": "176:9:2"
+              }
+            ]
+          },
+          "functionSelector": "26121ff0",
+          "id": 36,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "138:1:2",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 23,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "139:2:2"
+          },
+          "returnParameters":
+          {
+            "id": 24,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "149:0:2"
+          },
+          "scope": 37,
+          "src": "129:63:2",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 38,
+      "src": "112:82:2",
+      "usedErrors": [],
+      "usedEvents": []
+    }
+  ],
+  "src": "0:195:2"
+},
+{
+  "absolutePath": "C",
+  "exportedSymbols":
+  {
+    "C":
+    [
+      60
+    ],
+    "L":
+    [
+      78
+    ],
+    "free1":
+    [
+      65
+    ],
+    "free2":
+    [
+      69
+    ]
+  },
+  "id": 61,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "absolutePath": "L",
+      "file": "L",
+      "id": 39,
+      "nameLocation": "-1:-1:-1",
+      "nodeType": "ImportDirective",
+      "scope": 61,
+      "sourceUnit": 79,
+      "src": "0:11:3",
+      "symbolAliases": [],
+      "unitAlias": ""
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "C",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 60,
+      "internalFunctionIDs":
+      {
+        "69": 1,
+        "73": 2,
+        "77": 3
+      },
+      "linearizedBaseContracts":
+      [
+        60
+      ],
+      "name": "C",
+      "nameLocation": "21:1:3",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 58,
+            "nodeType": "Block",
+            "src": "49:60:3",
+            "statements":
+            [
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "expression":
+                        {
+                          "id": 42,
+                          "name": "L",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 78,
+                          "src": "60:1:3",
+                          "typeDescriptions":
+                          {
+                            "typeIdentifier": "t_type$_t_contract$_L_$78_$",
+                            "typeString": "type(library L)"
+                          }
+                        },
+                        "id": 44,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberLocation": "62:1:3",
+                        "memberName": "g",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 73,
+                        "src": "60:3:3",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 45,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "59:5:3",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 46,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "59:7:3",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 47,
+                "nodeType": "ExpressionStatement",
+                "src": "59:7:3"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "id": 48,
+                        "name": "free2",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": 69,
+                        "src": "77:5:3",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 49,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "76:7:3",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 50,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "76:9:3",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 51,
+                "nodeType": "ExpressionStatement",
+                "src": "76:9:3"
+              },
+              {
+                "expression":
+                {
+                  "arguments": [],
+                  "expression":
+                  {
+                    "argumentTypes": [],
+                    "components":
+                    [
+                      {
+                        "expression":
+                        {
+                          "id": 52,
+                          "name": "L",
+                          "nodeType": "Identifier",
+                          "overloadedDeclarations": [],
+                          "referencedDeclaration": 78,
+                          "src": "96:1:3",
+                          "typeDescriptions":
+                          {
+                            "typeIdentifier": "t_type$_t_contract$_L_$78_$",
+                            "typeString": "type(library L)"
+                          }
+                        },
+                        "id": 54,
+                        "isConstant": false,
+                        "isLValue": false,
+                        "isPure": false,
+                        "lValueRequested": false,
+                        "memberLocation": "98:1:3",
+                        "memberName": "h",
+                        "nodeType": "MemberAccess",
+                        "referencedDeclaration": 77,
+                        "src": "96:3:3",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                          "typeString": "function ()"
+                        }
+                      }
+                    ],
+                    "id": 55,
+                    "isConstant": false,
+                    "isInlineArray": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "nodeType": "TupleExpression",
+                    "src": "95:5:3",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_internal_nonpayable$__$returns$__$",
+                      "typeString": "function ()"
+                    }
+                  },
+                  "id": 56,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "95:7:3",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 57,
+                "nodeType": "ExpressionStatement",
+                "src": "95:7:3"
+              }
+            ]
+          },
+          "functionSelector": "26121ff0",
+          "id": 59,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "38:1:3",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 40,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "39:2:3"
+          },
+          "returnParameters":
+          {
+            "id": 41,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "49:0:3"
+          },
+          "scope": 60,
+          "src": "29:80:3",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 61,
+      "src": "12:99:3",
+      "usedErrors": [],
+      "usedEvents": []
+    }
+  ],
+  "src": "0:112:3"
+}
+]
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol
new file mode 100644
index 0000000000..6e0b28c82a
--- /dev/null
+++ b/test/libsolidity/ASTJSON/ast_internal_function_different_ids_export.sol
@@ -0,0 +1,38 @@
+==== Source: L ====
+
+function free1() {}
+function free2() {}
+library L {
+    function g() internal {}
+    function h() internal {}
+}
+
+==== Source: A ====
+
+import "L";
+contract A {
+    function f() public {
+        (L.g)();
+        (free2)();
+        (L.h)();
+    }
+}
+contract B {
+    function f() public {
+        (L.h)();
+        (free2)();
+    }
+}
+
+==== Source: C ====
+
+import "L";
+contract C {
+    function f() public {
+        (L.g)();
+        (free2)();
+        (L.h)();
+    }
+}
+
+// ----
diff --git a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
index 3e6e67bdde..d452f2d99f 100644
--- a/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
+++ b/test/libsolidity/ASTJSON/ast_internal_function_id_export.json
@@ -41,7 +41,6 @@
       },
       "id": 4,
       "implemented": true,
-      "internalFunctionID": 1,
       "kind": "freeFunction",
       "modifiers": [],
       "name": "free1",
@@ -77,7 +76,6 @@
       },
       "id": 8,
       "implemented": true,
-      "internalFunctionID": 2,
       "kind": "freeFunction",
       "modifiers": [],
       "name": "free2",
@@ -146,6 +144,13 @@
       "contractKind": "library",
       "fullyImplemented": true,
       "id": 53,
+      "internalFunctionIDs":
+      {
+        "20": 3,
+        "24": 4,
+        "4": 1,
+        "8": 2
+      },
       "linearizedBaseContracts":
       [
         53
@@ -201,7 +206,6 @@
           },
           "id": 20,
           "implemented": true,
-          "internalFunctionID": 3,
           "kind": "function",
           "modifiers": [],
           "name": "inr1",
@@ -237,7 +241,6 @@
           },
           "id": 24,
           "implemented": true,
-          "internalFunctionID": 4,
           "kind": "function",
           "modifiers": [],
           "name": "inr2",
@@ -579,6 +582,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 128,
+      "internalFunctionIDs":
+      {
+        "20": 3,
+        "24": 4,
+        "4": 1,
+        "69": 5,
+        "73": 6,
+        "8": 2
+      },
       "linearizedBaseContracts":
       [
         128
@@ -706,7 +718,6 @@
           },
           "id": 69,
           "implemented": true,
-          "internalFunctionID": 5,
           "kind": "function",
           "modifiers": [],
           "name": "inr1",
@@ -742,7 +753,6 @@
           },
           "id": 73,
           "implemented": true,
-          "internalFunctionID": 6,
           "kind": "function",
           "modifiers": [],
           "name": "inr2",
@@ -1405,6 +1415,15 @@
       "contractKind": "contract",
       "fullyImplemented": true,
       "id": 141,
+      "internalFunctionIDs":
+      {
+        "20": 3,
+        "24": 4,
+        "4": 1,
+        "69": 5,
+        "73": 6,
+        "8": 2
+      },
       "linearizedBaseContracts":
       [
         141,

From 050927b026ae799aad1ad16667be278ef781355e Mon Sep 17 00:00:00 2001
From: Vectorized <webby1111@hotmail.com>
Date: Tue, 25 Apr 2023 02:11:19 +0000
Subject: [PATCH 1351/1748] Optimize multiplicity map

---
 libyul/backends/evm/StackHelpers.h           | 46 +++++++++++++++++++-
 libyul/backends/evm/StackLayoutGenerator.cpp |  2 +-
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/libyul/backends/evm/StackHelpers.h b/libyul/backends/evm/StackHelpers.h
index ff8887b24a..dae4352a02 100644
--- a/libyul/backends/evm/StackHelpers.h
+++ b/libyul/backends/evm/StackHelpers.h
@@ -377,6 +377,50 @@ class Shuffler
 	}
 };
 
+/// A simple optimized map for mapping StackSlots to ints.
+class Multiplicity
+{
+public:
+	int& operator[](StackSlot const& _slot)
+	{
+		if (auto* p = std::get_if<FunctionCallReturnLabelSlot>(&_slot))
+			return m_functionCallReturnLabelSlotMultiplicity[*p];
+		if (std::holds_alternative<FunctionReturnLabelSlot>(_slot))
+			return m_functionReturnLabelSlotMultiplicity;
+		if (auto* p = std::get_if<VariableSlot>(&_slot))
+			return m_variableSlotMultiplicity[*p];
+		if (auto* p = std::get_if<LiteralSlot>(&_slot))
+			return m_literalSlotMultiplicity[*p];
+		if (auto* p = std::get_if<TemporarySlot>(&_slot))
+			return m_temporarySlotMultiplicity[*p];
+		yulAssert(std::holds_alternative<JunkSlot>(_slot));
+		return m_junkSlotMultiplicity;
+	}
+
+	int at(StackSlot const& _slot) const
+	{
+		if (auto* p = std::get_if<FunctionCallReturnLabelSlot>(&_slot))
+			return m_functionCallReturnLabelSlotMultiplicity.at(*p);
+		if (std::holds_alternative<FunctionReturnLabelSlot>(_slot))
+			return m_functionReturnLabelSlotMultiplicity;
+		if (auto* p = std::get_if<VariableSlot>(&_slot))
+			return m_variableSlotMultiplicity.at(*p);
+		if (auto* p = std::get_if<LiteralSlot>(&_slot))
+			return m_literalSlotMultiplicity.at(*p);
+		if (auto* p = std::get_if<TemporarySlot>(&_slot))
+			return m_temporarySlotMultiplicity.at(*p);
+		yulAssert(std::holds_alternative<JunkSlot>(_slot));
+		return m_junkSlotMultiplicity;
+	}
+
+private:
+	std::map<FunctionCallReturnLabelSlot, int> m_functionCallReturnLabelSlotMultiplicity;
+	int m_functionReturnLabelSlotMultiplicity = 0;
+	std::map<VariableSlot, int> m_variableSlotMultiplicity;
+	std::map<LiteralSlot, int> m_literalSlotMultiplicity;
+	std::map<TemporarySlot, int> m_temporarySlotMultiplicity;
+	int m_junkSlotMultiplicity = 0;
+};
 
 /// Transforms @a _currentStack to @a _targetStack, invoking the provided shuffling operations.
 /// Modifies @a _currentStack itself after each invocation of the shuffling operations.
@@ -395,7 +439,7 @@ void createStackLayout(Stack& _currentStack, Stack const& _targetStack, Swap _sw
 		Swap swapCallback;
 		PushOrDup pushOrDupCallback;
 		Pop popCallback;
-		std::map<StackSlot, int> multiplicity;
+		Multiplicity multiplicity;
 		ShuffleOperations(
 			Stack& _currentStack,
 			Stack const& _targetStack,
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index ddb1b63793..2d5cdde87f 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -172,7 +172,7 @@ Stack createIdealLayout(Stack const& _operationOutput, Stack const& _post, Calla
 		vector<variant<PreviousSlot, StackSlot>>& layout;
 		Stack const& post;
 		std::set<StackSlot> outputs;
-		std::map<StackSlot, int> multiplicity;
+		Multiplicity multiplicity;
 		Callable generateSlotOnTheFly;
 		ShuffleOperations(
 			vector<variant<PreviousSlot, StackSlot>>& _layout,

From 41adba0eff9d47f7a358108718083623ea3013cd Mon Sep 17 00:00:00 2001
From: BraxWong <ghostenjob@gmail.com>
Date: Thu, 27 Apr 2023 12:21:28 +0100
Subject: [PATCH 1352/1748] Switch to Gen2 macOS resources on CircleCI

---
 .circleci/config.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7bb4c51f44..c3f6131a9b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -296,14 +296,15 @@ defaults:
 
   - base_osx: &base_osx
       macos:
-        xcode: "13.2.0"
+        xcode: "14.2.0"
+      resource_class: macos.x86.medium.gen2
       environment:
         TERM: xterm
         MAKEFLAGS: -j5
 
   - base_osx_large: &base_osx_large
       macos:
-        xcode: "13.2.0"
+        xcode: "14.2.0"
       resource_class: large
       environment:
         TERM: xterm

From 759732d3108f12ee6f94547bb336aea6de59d7be Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Thu, 4 May 2023 16:18:46 +0200
Subject: [PATCH 1353/1748] Remove python unlink

---
 .circleci/osx_install_dependencies.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index e523746f04..45a54838a9 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -52,7 +52,6 @@ function validate_checksum {
 
 if [ ! -f /usr/local/lib/libz3.a ] # if this file does not exists (cache was not restored), rebuild dependencies
 then
-  brew unlink python
   brew install boost
   brew install cmake
   brew install wget

From 44da8507b1fc32083a62662dfbc130f22fc06306 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 26 Apr 2023 13:03:17 +0200
Subject: [PATCH 1354/1748] Change default EVM version to Shanghai.

Co-authored-by: Rodrigo Q. Saramago <rodrigoqsaramago@gmail.com>
---
 .circleci/config.yml                          | 24 +++++----
 .circleci/soltest_all.sh                      |  2 +-
 Changelog.md                                  |  1 +
 docs/using-the-compiler.rst                   |  6 +--
 libevmasm/GasMeter.cpp                        |  6 +++
 liblangutil/EVMVersion.h                      |  2 +-
 scripts/externalTests/common.sh               |  2 +-
 scripts/tests.sh                              |  2 +-
 test/cmdlineTests/function_debug_info/output  | 10 ++--
 .../output                                    | 54 +++++++++----------
 .../output.json                               |  4 +-
 .../linking_strict_assembly/output            |  2 +-
 .../output                                    |  2 +-
 .../output                                    |  2 +-
 .../output                                    |  2 +-
 .../output                                    |  2 +-
 .../output                                    |  2 +-
 .../output                                    |  2 +-
 .../output                                    |  2 +-
 test/cmdlineTests/no_cbor_metadata/output     |  2 +-
 test/cmdlineTests/object_compiler/output      |  2 +-
 .../standard_function_debug_info/output.json  | 44 +++++++--------
 .../strict_asm_optimizer_steps/output         |  2 +-
 .../output                                    |  2 +-
 .../yul_function_name_clashes/output          |  2 +-
 .../output                                    |  2 +-
 test/cmdlineTests/yul_optimize_runs/output    |  2 +-
 test/cmdlineTests/yul_verbatim_msize/output   |  2 +-
 test/externalTests/uniswap.sh                 |  2 -
 test/externalTests/yield-liquidator.sh        |  7 +--
 test/libsolidity/GasCosts.cpp                 |  4 +-
 test/libsolidity/StandardCompiler.cpp         | 10 ++--
 test/libsolidity/gasTests/abiv2.sol           |  8 +--
 test/libsolidity/gasTests/abiv2_optimised.sol | 12 ++---
 test/libsolidity/gasTests/data_storage.sol    |  8 +--
 test/libsolidity/gasTests/dispatch_large.sol  |  8 +--
 .../gasTests/dispatch_large_optimised.sol     | 50 ++++++++---------
 test/libsolidity/gasTests/dispatch_medium.sol |  8 +--
 .../gasTests/dispatch_medium_optimised.sol    | 24 ++++-----
 test/libsolidity/gasTests/dispatch_small.sol  | 10 ++--
 .../gasTests/dispatch_small_optimised.sol     | 14 ++---
 test/libsolidity/gasTests/exp.sol             |  8 +--
 test/libsolidity/gasTests/exp_optimized.sol   | 14 ++---
 test/libsolidity/gasTests/storage_costs.sol   | 12 ++---
 .../abiEncoderV1/abi_decode_v2_storage.sol    |  6 +--
 .../abi_encode_calldata_slice.sol             | 12 ++---
 .../struct/struct_storage_ptr.sol             |  6 +--
 .../abi_encode_calldata_slice.sol             | 12 ++---
 .../abiEncoderV2/abi_encode_v2.sol            |  6 +--
 ...2_in_function_inherited_in_v1_contract.sol |  6 +--
 ...ode_v2_in_modifier_used_in_v1_contract.sol |  2 +-
 .../abiEncoderV2/calldata_array.sol           |  6 +--
 .../calldata_overlapped_dynamic_arrays.sol    |  6 +--
 .../abiEncoderV2/storage_array_encoding.sol   | 12 ++---
 .../abi_decode_simple_storage.sol             |  6 +--
 .../arithmetics/check_var_init.sol            |  2 +-
 .../array/array_memory_index_access.sol       |  6 +--
 .../array/array_storage_index_access.sol      | 54 +++++++++----------
 .../array_storage_index_boundary_test.sol     | 12 ++---
 .../array/array_storage_index_zeroed_test.sol | 24 ++++-----
 .../array/array_storage_length_access.sol     | 10 ++--
 .../array/array_storage_push_empty.sol        | 12 ++---
 ...rray_storage_push_empty_length_address.sol | 12 ++---
 .../array/array_storage_push_pop.sol          | 12 ++---
 .../arrays_complex_from_and_to_storage.sol    |  6 +--
 .../array/byte_array_storage_layout.sol       |  4 +-
 .../array/byte_array_transitional_2.sol       |  6 +--
 .../array/bytes_length_member.sol             |  6 +--
 .../array/constant_var_as_array_length.sol    |  6 +--
 .../copying/array_copy_calldata_storage.sol   |  6 +--
 .../copying/array_copy_cleanup_uint40.sol     |  6 +--
 .../copying/array_copy_clear_storage.sol      |  6 +--
 .../copying/array_copy_different_packing.sol  |  6 +--
 .../copying/array_copy_including_array.sol    | 12 ++---
 .../array/copying/array_copy_nested_array.sol |  6 +--
 ...ay_copy_storage_storage_different_base.sol |  6 +--
 ..._storage_storage_different_base_nested.sol |  6 +--
 .../array_copy_storage_storage_dyn_dyn.sol    |  6 +--
 ...y_copy_storage_storage_dynamic_dynamic.sol |  6 +--
 ...ay_copy_storage_storage_static_dynamic.sol |  6 +--
 ...ray_copy_storage_storage_static_static.sol |  6 +--
 .../array_copy_storage_storage_struct.sol     |  6 +--
 .../array_copy_storage_to_memory_nested.sol   |  6 +--
 .../copying/array_copy_target_leftover.sol    |  6 +--
 .../copying/array_copy_target_simple.sol      |  6 +--
 .../copying/array_copy_target_simple_2.sol    |  6 +--
 .../copying/array_elements_to_mapping.sol     |  6 +--
 .../array_nested_calldata_to_storage.sol      |  8 +--
 .../array_nested_memory_to_storage.sol        | 12 ++---
 ...on_external_storage_to_storage_dynamic.sol |  6 +--
 ...o_storage_dynamic_different_mutability.sol |  6 +--
 .../array_of_struct_calldata_to_storage.sol   |  2 +-
 .../array_of_struct_memory_to_storage.sol     |  2 +-
 ..._containing_arrays_calldata_to_storage.sol |  2 +-
 ...ts_containing_arrays_memory_to_storage.sol |  2 +-
 .../array_storage_multi_items_per_slot.sol    |  6 +--
 .../array/copying/array_to_mapping.sol        |  6 +--
 .../copying/arrays_from_and_to_storage.sol    |  4 +-
 .../array/copying/bytes_inside_mappings.sol   | 12 ++---
 .../copying/bytes_storage_to_storage.sol      | 30 +++++------
 .../calldata_array_dynamic_to_storage.sol     |  6 +--
 .../copying/calldata_array_to_mapping.sol     |  2 +-
 ...nup_during_multi_element_per_slot_copy.sol |  6 +--
 .../copy_byte_array_in_struct_to_storage.sol  | 12 ++---
 .../copying/copy_byte_array_to_storage.sol    |  6 +--
 .../copy_function_internal_storage_array.sol  |  6 +--
 ...opy_internal_function_array_to_storage.sol |  4 +-
 .../array/copying/copy_removes_bytes_data.sol |  6 +--
 .../copying/copying_bytes_multiassign.sol     |  6 +--
 ...d_array_of_structs_calldata_to_storage.sol |  6 +--
 ...ted_array_of_structs_memory_to_storage.sol |  6 +--
 .../function_type_array_to_storage.sol        | 12 ++---
 .../memory_dyn_2d_bytes_to_storage.sol        |  6 +--
 ...ested_array_element_storage_to_storage.sol | 18 +++----
 ...d_array_of_structs_calldata_to_storage.sol |  6 +--
 ...ted_array_of_structs_memory_to_storage.sol |  6 +--
 ...ed_array_of_structs_storage_to_storage.sol |  4 +-
 ...amic_array_element_calldata_to_storage.sol |  4 +-
 .../array/copying/storage_memory_nested.sol   |  6 +--
 .../copying/storage_memory_nested_bytes.sol   |  6 +--
 .../storage_memory_nested_from_pointer.sol    |  6 +--
 .../copying/storage_memory_nested_struct.sol  |  6 +--
 .../copying/storage_memory_packed_dyn.sol     |  6 +--
 .../array/create_memory_array.sol             |  6 +--
 .../array/delete/bytes_delete_element.sol     |  6 +--
 .../array/dynamic_array_cleanup.sol           |  6 +--
 .../array/dynamic_arrays_in_storage.sol       |  6 +--
 .../array/dynamic_multi_array_cleanup.sol     |  6 +--
 .../array/fixed_array_cleanup.sol             |  6 +--
 .../array/fixed_arrays_as_return_type.sol     |  6 +--
 .../array/fixed_arrays_in_constructors.sol    |  6 +--
 .../array/function_array_cross_calls.sol      |  6 +--
 ...nvalid_encoding_for_storage_byte_array.sol |  6 +--
 .../array/pop/array_pop_array_transition.sol  |  6 +--
 .../array/pop/array_pop_uint16_transition.sol |  6 +--
 .../array/pop/array_pop_uint24_transition.sol |  6 +--
 .../array/pop/byte_array_pop_copy_long.sol    |  2 +-
 .../pop/byte_array_pop_long_storage_empty.sol |  6 +--
 ...ray_pop_long_storage_empty_garbage_ref.sol |  6 +--
 .../array/pop/byte_array_pop_masking_long.sol |  6 +--
 .../semanticTests/array/push/array_push.sol   |  6 +--
 .../push/array_push_nested_from_calldata.sol  |  6 +--
 .../array/push/array_push_struct.sol          |  6 +--
 .../push/array_push_struct_from_calldata.sol  |  6 +--
 .../array/push/byte_array_push_transition.sol |  6 +--
 .../array/push/nested_bytes_push.sol          |  6 +--
 .../array/push/push_no_args_2d.sol            | 10 ++--
 .../array/push/push_no_args_bytes.sol         |  6 +--
 .../semanticTests/array/reusing_memory.sol    |  6 +--
 .../byte_array_to_storage_cleanup.sol         |  6 +--
 .../copy_from_calldata_removes_bytes_data.sol |  6 +--
 .../constructor/arrays_in_constructors.sol    |  6 +--
 .../bytes_in_constructors_packer.sol          |  6 +--
 .../bytes_in_constructors_unpacker.sol        |  6 +--
 .../constructor_arguments_external.sol        |  6 +--
 .../constructor_function_complex.sol          |  2 +-
 .../constructor_static_array_argument.sol     |  6 +--
 .../constructor/no_callvalue_check.sol        |  6 +--
 .../constructor_inheritance_init_order.sol    |  2 +-
 .../constructor_inheritance_init_order_2.sol  |  6 +--
 .../semanticTests/constructor_with_params.sol |  4 +-
 ...ructor_with_params_diamond_inheritance.sol |  6 +--
 .../constructor_with_params_inheritance.sol   |  6 +--
 .../events/event_dynamic_array_storage.sol    |  6 +--
 .../events/event_dynamic_array_storage_v2.sol |  6 +--
 .../event_dynamic_nested_array_storage_v2.sol |  6 +--
 .../events/event_emit_from_other_contract.sol |  6 +--
 .../events/event_indexed_string.sol           |  6 +--
 .../externalContracts/FixedFeeRegistrar.sol   |  6 +--
 .../externalContracts/base64.sol              | 18 +++----
 .../externalContracts/deposit_contract.sol    | 30 +++++------
 .../externalContracts/prbmath_signed.sol      |  6 +--
 .../externalContracts/prbmath_unsigned.sol    |  6 +--
 .../externalContracts/ramanujan_pi.sol        |  8 +--
 .../semanticTests/externalContracts/snark.sol | 12 ++---
 .../externalContracts/strings.sol             | 12 ++---
 .../freeFunctions/new_operator.sol            |  2 +-
 .../creation_function_call_no_args.sol        |  2 +-
 .../creation_function_call_with_args.sol      |  6 +--
 .../creation_function_call_with_salt.sol      |  6 +--
 .../external_call_to_nonexisting.sol          |  6 +--
 ...ernal_call_to_nonexisting_debugstrings.sol |  6 +--
 .../functionCall/failed_create.sol            | 12 ++---
 .../functionCall/gas_and_value_basic.sol      |  6 +--
 .../gas_and_value_brace_syntax.sol            |  6 +--
 .../mapping_array_internal_argument.sol       |  6 +--
 .../functionCall/send_zero_ether.sol          |  2 +-
 .../functionTypes/store_function.sol          |  4 +-
 .../immutable/multi_creation.sol              |  6 +--
 .../semanticTests/immutable/use_scratch.sol   |  6 +--
 .../address_overload_resolution.sol           |  4 +-
 ...d_function_calldata_calldata_interface.sol |  2 +-
 ...ted_function_calldata_memory_interface.sol |  6 +--
 .../inheritance/member_notation_ctor.sol      |  4 +-
 .../inheritance/value_for_constructor.sol     |  6 +--
 .../balance_other_contract.sol                |  6 +--
 .../libraries/internal_types_in_library.sol   |  6 +--
 .../using_library_mappings_public.sol         |  6 +--
 .../using_library_mappings_return.sol         |  6 +--
 .../libraries/using_library_structs.sol       |  2 +-
 .../operator_making_pure_external_call.sol    | 12 ++---
 .../operator_making_view_external_call.sol    | 12 ++---
 .../salted_create/prediction_example.sol      |  2 +-
 .../salted_create/salted_create.sol           |  6 +--
 .../salted_create_with_value.sol              |  6 +--
 .../semanticTests/smoke/alignment.sol         |  2 +-
 .../semanticTests/smoke/constructor.sol       |  6 +--
 .../semanticTests/state/blockhash_basic.sol   |  6 +--
 .../storage/empty_nonempty_empty.sol          |  6 +--
 .../storage/packed_storage_structs_bytes.sol  |  6 +--
 ...ta_struct_with_nested_array_to_storage.sol |  6 +--
 .../conversion/recursive_storage_memory.sol   |  6 +--
 .../structs/copy_from_mapping.sol             |  6 +--
 .../copy_struct_array_from_storage.sol        |  6 +--
 .../copy_substructures_from_mapping.sol       |  6 +--
 .../structs/copy_substructures_to_mapping.sol | 18 +++----
 .../semanticTests/structs/copy_to_mapping.sol | 24 ++++-----
 .../structs/memory_structs_nested_load.sol    |  6 +--
 ...truct_containing_bytes_copy_and_delete.sol | 12 ++---
 .../semanticTests/structs/struct_copy.sol     | 12 ++---
 .../structs/struct_copy_via_local.sol         |  6 +--
 .../struct_delete_storage_with_array.sol      | 12 ++---
 .../struct_memory_to_storage_function_ptr.sol |  6 +--
 .../semanticTests/structs/structs.sol         |  6 +--
 .../mapping/copy_from_mapping_to_mapping.sol  |  6 +--
 .../userDefinedValueType/calldata.sol         | 12 ++---
 .../userDefinedValueType/erc20.sol            |  6 +--
 .../using/using_global_invisible.sol          |  2 +-
 .../semanticTests/various/address_code.sol    |  6 +--
 .../various/code_access_content.sol           |  4 +-
 .../various/code_access_create.sol            |  2 +-
 .../various/code_access_runtime.sol           |  2 +-
 .../semanticTests/various/code_length.sol     |  2 +-
 .../semanticTests/various/create_calldata.sol |  6 +--
 .../various/destructuring_assignment.sol      |  6 +--
 .../semanticTests/various/erc20.sol           |  6 +--
 .../various/external_types_in_calls.sol       |  2 +-
 .../various/negative_stack_height.sol         |  4 +-
 .../semanticTests/various/selfdestruct.sol    |  6 +--
 .../semanticTests/various/senders_balance.sol |  6 +--
 .../skip_dynamic_types_for_structs.sol        |  6 +--
 .../various/staticcall_for_view_and_pure.sol  | 14 ++---
 .../various/swap_in_storage_overwrite.sol     |  6 +--
 .../semanticTests/various/value_complex.sol   |  6 +--
 .../semanticTests/various/value_insane.sol    |  6 +--
 .../viaYul/copy_struct_invalid_ir_bug.sol     |  6 +--
 test/libyul/EVMCodeTransformTest.cpp          |  2 +-
 test/libyul/EVMCodeTransformTest.h            |  2 +-
 ...ction_argument_reuse_without_retparams.yul |  3 +-
 test/libyul/objectCompiler/datacopy.yul       |  4 +-
 .../libyul/objectCompiler/dataoffset_code.yul |  4 +-
 .../libyul/objectCompiler/dataoffset_data.yul |  4 +-
 .../libyul/objectCompiler/dataoffset_self.yul |  4 +-
 test/libyul/objectCompiler/datasize_code.yul  |  4 +-
 test/libyul/objectCompiler/datasize_data.yul  |  4 +-
 test/libyul/objectCompiler/datasize_self.yul  |  4 +-
 .../libyul/objectCompiler/function_series.yul |  4 +-
 ..._long_name_does_not_end_up_in_bytecode.yul |  4 +-
 test/libyul/objectCompiler/linkersymbol.yul   |  4 +-
 .../objectCompiler/long_object_name.yul       |  4 +-
 test/libyul/objectCompiler/metadata.yul       |  4 +-
 .../libyul/objectCompiler/namedObjectCode.yul |  4 +-
 .../objectCompiler/nested_optimizer.yul       |  4 +-
 test/libyul/objectCompiler/simple.yul         |  4 +-
 .../objectCompiler/simple_optimizer.yul       |  4 +-
 .../libyul/objectCompiler/sourceLocations.yul |  4 +-
 .../libyul/objectCompiler/subObjectAccess.yul |  4 +-
 267 files changed, 949 insertions(+), 934 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7bb4c51f44..d893a3b66f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1619,18 +1619,20 @@ workflows:
       - t_ext: *job_native_test_ext_gnosis
       - t_ext: *job_native_test_ext_zeppelin
       - t_ext: *job_native_test_ext_ens
-      - t_ext: *job_native_test_ext_trident
-      - t_ext: *job_native_test_ext_euler
       - t_ext: *job_native_test_ext_yield_liquidator
-      - t_ext: *job_native_test_ext_bleeps
-      - t_ext: *job_native_test_ext_pool_together
       - t_ext: *job_native_test_ext_perpetual_pools
       - t_ext: *job_native_test_ext_uniswap
       - t_ext: *job_native_test_ext_prb_math
       - t_ext: *job_native_test_ext_elementfi
       - t_ext: *job_native_test_ext_brink
-      - t_ext: *job_native_test_ext_chainlink
       - t_ext: *job_native_test_ext_gp2
+      # NOTE: The external tests below were commented because they
+      # depend on a specific version of hardhat which does not support shanghai EVM.
+      #- t_ext: *job_native_test_ext_trident
+      #- t_ext: *job_native_test_ext_euler
+      #- t_ext: *job_native_test_ext_bleeps
+      #- t_ext: *job_native_test_ext_pool_together
+      #- t_ext: *job_native_test_ext_chainlink
 
       - c_ext_benchmarks:
           <<: *requires_nothing
@@ -1639,18 +1641,20 @@ workflows:
             - t_native_test_ext_gnosis
             - t_native_test_ext_zeppelin
             - t_native_test_ext_ens
-            - t_native_test_ext_trident
-            - t_native_test_ext_euler
             - t_native_test_ext_yield_liquidator
-            - t_native_test_ext_bleeps
-            - t_native_test_ext_pool_together
             - t_native_test_ext_perpetual_pools
             - t_native_test_ext_uniswap
             - t_native_test_ext_prb_math
             - t_native_test_ext_elementfi
             - t_native_test_ext_brink
-            - t_native_test_ext_chainlink
             - t_native_test_ext_gp2
+            # NOTE: The external tests below were commented because they
+            # depend on a specific version of hardhat which does not support shanghai EVM.
+            #- t_native_test_ext_trident
+            #- t_native_test_ext_euler
+            #- t_native_test_ext_bleeps
+            #- t_native_test_ext_pool_together
+            #- t_native_test_ext_chainlink
 
       # Windows build and tests
       - b_win: *requires_nothing
diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 2e45f9892d..4be427f192 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -32,7 +32,7 @@ REPODIR="$(realpath "$(dirname "$0")"/..)"
 source "${REPODIR}/scripts/common.sh"
 
 EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris shanghai)
-DEFAULT_EVM=paris
+DEFAULT_EVM=shanghai
 [[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
 OPTIMIZE_VALUES=(0 1)
 
diff --git a/Changelog.md b/Changelog.md
index 0165de0f64..25244e13c2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ Language Features:
 
 Compiler Features:
  * Assembler: Use ``push0`` for placing ``0`` in the stack for EVM versions starting from "Shanghai". This decreases the deployment costs.
+ * EVM: Set default EVM version to "Shanghai".
  * EVM: Support for the EVM Version "Shanghai".
  * NatSpec: Add support for NatSpec documentation in ``enum`` definitions.
  * NatSpec: Add support for NatSpec documentation in ``struct`` definitions.
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 2ff0883ed0..3931728da3 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -172,10 +172,10 @@ at each version. Backward compatibility is not guaranteed between each version.
      the optimizer.
 - ``london``
    - The block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_) can be accessed via the global ``block.basefee`` or ``basefee()`` in inline assembly.
-- ``paris`` (**default**)
+- ``paris``
    - Introduces ``prevrandao()`` and ``block.prevrandao``, and changes the semantics of the now deprecated ``block.difficulty``, disallowing ``difficulty()`` in inline assembly (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
-- ``shanghai``
-  - Cheaper deployment cost due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
+- ``shanghai`` (**default**)
+  - Smaller code size and gas savings due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
index 258f68b31f..6a0c597db0 100644
--- a/libevmasm/GasMeter.cpp
+++ b/libevmasm/GasMeter.cpp
@@ -45,6 +45,12 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _
 	switch (_item.type())
 	{
 	case Push:
+		if (m_evmVersion.hasPush0() && _item.data() == 0)
+		{
+			gas = runGas(Instruction::PUSH0, m_evmVersion);
+			break;
+		}
+		[[fallthrough]];
 	case PushTag:
 	case PushData:
 	case PushSub:
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index 7932ecdadc..9f0239624d 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -113,7 +113,7 @@ class EVMVersion:
 
 	EVMVersion(Version _version): m_version(_version) {}
 
-	Version m_version = Version::Paris;
+	Version m_version = Version::Shanghai;
 };
 
 }
diff --git a/scripts/externalTests/common.sh b/scripts/externalTests/common.sh
index 97d0a337ee..3bca968a5a 100644
--- a/scripts/externalTests/common.sh
+++ b/scripts/externalTests/common.sh
@@ -22,7 +22,7 @@ set -e
 
 # Requires $REPO_ROOT to be defined and "${REPO_ROOT}/scripts/common.sh" to be included before.
 
-CURRENT_EVM_VERSION=paris
+CURRENT_EVM_VERSION=shanghai
 
 AVAILABLE_PRESETS=(
     legacy-no-optimize
diff --git a/scripts/tests.sh b/scripts/tests.sh
index 100bae912e..cb1766d9a1 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -115,7 +115,7 @@ do
     for vm in $EVM_VERSIONS
     do
         FORCE_ABIV1_RUNS="no"
-        if [[ "$vm" == "paris" ]]
+        if [[ "$vm" == "shanghai" ]]
         then
             FORCE_ABIV1_RUNS="no yes" # run both in paris
         fi
diff --git a/test/cmdlineTests/function_debug_info/output b/test/cmdlineTests/function_debug_info/output
index 071e0076e6..b9ca3f3c40 100644
--- a/test/cmdlineTests/function_debug_info/output
+++ b/test/cmdlineTests/function_debug_info/output
@@ -13,7 +13,7 @@
         },
         "abi_decode_tuple_t_uint256_fromMemory":
         {
-          "entryPoint": 94,
+          "entryPoint": 92,
           "parameterSlots": 2,
           "returnSlots": 1
         }
@@ -22,7 +22,7 @@
       {
         "@f_14":
         {
-          "entryPoint": 128,
+          "entryPoint": 124,
           "id": 14,
           "parameterSlots": 2,
           "returnSlots": 1
@@ -35,13 +35,13 @@
         },
         "abi_decode_tuple_t_array$_t_uint256_$dyn_calldata_ptr":
         {
-          "entryPoint": 164,
+          "entryPoint": 158,
           "parameterSlots": 2,
           "returnSlots": 2
         },
         "abi_decode_tuple_t_uint256":
         {
-          "entryPoint": 281,
+          "entryPoint": 269,
           "parameterSlots": 2,
           "returnSlots": 1
         },
@@ -52,7 +52,7 @@
         },
         "panic_error_0x32":
         {
-          "entryPoint": 306,
+          "entryPoint": 292,
           "parameterSlots": 0,
           "returnSlots": 0
         }
diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/output b/test/cmdlineTests/inline_assembly_function_name_clash/output
index ef16b19902..889514d96a 100644
--- a/test/cmdlineTests/inline_assembly_function_name_clash/output
+++ b/test/cmdlineTests/inline_assembly_function_name_clash/output
@@ -7,169 +7,169 @@
             {
                 "abi_decode_tuple_":
                 {
-                    "entryPoint": 122,
+                    "entryPoint": 117,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
                 "abi_encode_t_uint256_to_t_uint256_fromStack":
                 {
-                    "entryPoint": 156,
+                    "entryPoint": 149,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
                 "abi_encode_tuple_t_uint256__to_t_uint256__fromStack":
                 {
-                    "entryPoint": 171,
+                    "entryPoint": 164,
                     "parameterSlots": 2,
                     "returnSlots": 1
                 },
                 "allocate_unbounded":
                 {
-                    "entryPoint": 102,
+                    "entryPoint": 100,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
                 "cleanup_t_uint256":
                 {
-                    "entryPoint": 146,
+                    "entryPoint": 140,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "convert_t_uint256_to_t_uint256":
                 {
-                    "entryPoint": 413,
+                    "entryPoint": 398,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "external_fun_f_25":
                 {
-                    "entryPoint": 198,
+                    "entryPoint": 189,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
                 "external_fun_g_36":
                 {
-                    "entryPoint": 256,
+                    "entryPoint": 247,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
                 "fun_f_25":
                 {
-                    "entryPoint": 680,
+                    "entryPoint": 653,
                     "id": 25,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
                 "fun_f_25_inner":
                 {
-                    "entryPoint": 646,
+                    "entryPoint": 621,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "fun_g_36":
                 {
-                    "entryPoint": 896,
+                    "entryPoint": 858,
                     "id": 36,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
                 "fun_g_36_inner":
                 {
-                    "entryPoint": 862,
+                    "entryPoint": 826,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "identity":
                 {
-                    "entryPoint": 403,
+                    "entryPoint": 389,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "modifier_m_17":
                 {
-                    "entryPoint": 492,
+                    "entryPoint": 475,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "modifier_m_19":
                 {
-                    "entryPoint": 569,
+                    "entryPoint": 548,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "modifier_m_28":
                 {
-                    "entryPoint": 708,
+                    "entryPoint": 680,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "modifier_m_30":
                 {
-                    "entryPoint": 785,
+                    "entryPoint": 753,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "prepare_store_t_uint256":
                 {
-                    "entryPoint": 447,
+                    "entryPoint": 431,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74":
                 {
-                    "entryPoint": 314,
+                    "entryPoint": 305,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
                 "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb":
                 {
-                    "entryPoint": 112,
+                    "entryPoint": 109,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
                 "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
                 {
-                    "entryPoint": 117,
+                    "entryPoint": 113,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
                 "shift_left_0":
                 {
-                    "entryPoint": 324,
+                    "entryPoint": 313,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "shift_right_224_unsigned":
                 {
-                    "entryPoint": 89,
+                    "entryPoint": 88,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "update_byte_slice_32_shift_0":
                 {
-                    "entryPoint": 337,
+                    "entryPoint": 324,
                     "parameterSlots": 2,
                     "returnSlots": 1
                 },
                 "update_storage_value_offset_0t_uint256_to_t_uint256":
                 {
-                    "entryPoint": 457,
+                    "entryPoint": 440,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
                 "usr$f":
                 {
-                    "entryPoint": 515,
+                    "entryPoint": 496,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
                 "zero_value_for_split_t_uint256":
                 {
-                    "entryPoint": 319,
+                    "entryPoint": 309,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 }
diff --git a/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json b/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json
index d9684242a5..169e99961e 100644
--- a/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json
+++ b/test/cmdlineTests/linking_standard_solidity_unresolved_references/output.json
@@ -17,11 +17,11 @@
                                 [
                                     {
                                         "length": 20,
-                                        "start": 184
+                                        "start": 174
                                     },
                                     {
                                         "length": 20,
-                                        "start": 368
+                                        "start": 350
                                     }
                                 ]
                             }
diff --git a/test/cmdlineTests/linking_strict_assembly/output b/test/cmdlineTests/linking_strict_assembly/output
index cb5e7bf964..520b3cf7bb 100644
--- a/test/cmdlineTests/linking_strict_assembly/output
+++ b/test/cmdlineTests/linking_strict_assembly/output
@@ -11,7 +11,7 @@ object "a" {
 
 
 Binary representation:
-7312345678901234567890123456789012345678908060005550
+731234567890123456789012345678901234567890805f5550
 
 Text representation:
     /* "linking_strict_assembly/input.yul":44:79   */
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output b/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output
index 261856e96a..a919ba72ec 100644
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output
+++ b/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output
@@ -11,7 +11,7 @@ object "a" {
 
 
 Binary representation:
-7312345678901234567890123456789012345678908060005550
+731234567890123456789012345678901234567890805f5550
 
 Text representation:
   linkerSymbol("20a18a9bf97d889dcf77111b674da319a4e9e3e05d3f4df9e0bf5c588dd4f0f8")
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output b/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output
index 84204264dd..660876888a 100644
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output
+++ b/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output
@@ -11,7 +11,7 @@ object "a" {
 
 
 Binary representation:
-73__$8aa64f937099b65a4febc243a5ae0f2d64$__8060005550
+73__$8aa64f937099b65a4febc243a5ae0f2d64$__805f5550
 
 Text representation:
   linkerSymbol("8aa64f937099b65a4febc243a5ae0f2d6416bb9e473c30dd29c1ee498fb7c5a8")
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output
index 521d26bfdd..5babd2279d 100644
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output
+++ b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output
@@ -13,7 +13,7 @@ object "a" {
 
 
 Binary representation:
-73111111111111111111111111111111111111111173222222222222222222222222222222222222222281600055806001555050
+731111111111111111111111111111111111111111732222222222222222222222222222222222222222815f55806001555050
 
 Text representation:
     /* "linking_strict_assembly_same_library_name_different_files/input.yul":45:75   */
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output
index b161a93f80..0eba8cf848 100644
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output
+++ b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output
@@ -13,7 +13,7 @@ object "a" {
 
 
 Binary representation:
-73123456789012345678901234567890123456789073__$c3523432985587641d17c68161d2f700c5$__81600055806001555050
+73123456789012345678901234567890123456789073__$c3523432985587641d17c68161d2f700c5$__815f55806001555050
 
 Text representation:
     /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":45:75   */
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output b/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output
index e7dc145428..71d19f7aeb 100644
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output
+++ b/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output
@@ -11,7 +11,7 @@ object "a" {
 
 
 Binary representation:
-73__$20a18a9bf97d889dcf77111b674da319a4$__8060005550
+73__$20a18a9bf97d889dcf77111b674da319a4$__805f5550
 
 Text representation:
   linkerSymbol("20a18a9bf97d889dcf77111b674da319a4e9e3e05d3f4df9e0bf5c588dd4f0f8")
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output b/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output
index 103b67e2ef..6f3ee5eb75 100644
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output
+++ b/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output
@@ -11,7 +11,7 @@ object "a" {
 
 
 Binary representation:
-7312345678901234567890123456789012345678908060005550
+731234567890123456789012345678901234567890805f5550
 
 Text representation:
   linkerSymbol("8aa64f937099b65a4febc243a5ae0f2d6416bb9e473c30dd29c1ee498fb7c5a8")
diff --git a/test/cmdlineTests/linking_strict_assembly_unresolved_references/output b/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
index 59acd6ae25..bc2e167b33 100644
--- a/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
+++ b/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
@@ -13,7 +13,7 @@ object "a" {
 
 
 Binary representation:
-73123456789012345678901234567890123456789073__$fb58009a6b1ecea3b9d99bedd645df4ec3$__81600055806001555050
+73123456789012345678901234567890123456789073__$fb58009a6b1ecea3b9d99bedd645df4ec3$__815f55806001555050
 
 Text representation:
     /* "linking_strict_assembly_unresolved_references/input.yul":45:81   */
diff --git a/test/cmdlineTests/no_cbor_metadata/output b/test/cmdlineTests/no_cbor_metadata/output
index 16025d0614..0328ece3f2 100644
--- a/test/cmdlineTests/no_cbor_metadata/output
+++ b/test/cmdlineTests/no_cbor_metadata/output
@@ -1,4 +1,4 @@
 
 ======= no_cbor_metadata/input.sol:C =======
 Binary:
-608080604052346013576004908160198239f35b600080fdfe600080fd
+608080604052346013576003908160188239f35b5f80fdfe5f80fd
diff --git a/test/cmdlineTests/object_compiler/output b/test/cmdlineTests/object_compiler/output
index 93d7b77955..5dd572272a 100644
--- a/test/cmdlineTests/object_compiler/output
+++ b/test/cmdlineTests/object_compiler/output
@@ -23,7 +23,7 @@ object "MyContract" {
 
 
 Binary representation:
-33600055600b8060106000396000f3fe60005460005260206000f3
+335f55600880600d5f395ff3fe5f545f5260205ff3
 
 Text representation:
     /* "object_compiler/input.yul":128:136   */
diff --git a/test/cmdlineTests/standard_function_debug_info/output.json b/test/cmdlineTests/standard_function_debug_info/output.json
index d4f6651863..bbbb6b96fa 100644
--- a/test/cmdlineTests/standard_function_debug_info/output.json
+++ b/test/cmdlineTests/standard_function_debug_info/output.json
@@ -17,154 +17,154 @@
                         {
                             "@f_19":
                             {
-                                "entryPoint": 96,
+                                "entryPoint": 93,
                                 "id": 19,
                                 "parameterSlots": 1,
                                 "returnSlots": 1
                             },
                             "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr":
                             {
-                                "entryPoint": 439,
+                                "entryPoint": 421,
                                 "id": null,
                                 "parameterSlots": 3,
                                 "returnSlots": 1
                             },
                             "abi_decode_t_array$_t_uint256_$dyn_memory_ptr":
                             {
-                                "entryPoint": 544,
+                                "entryPoint": 525,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 1
                             },
                             "abi_decode_t_uint256":
                             {
-                                "entryPoint": 418,
+                                "entryPoint": 401,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 1
                             },
                             "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr":
                             {
-                                "entryPoint": 590,
+                                "entryPoint": 570,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 1
                             },
                             "abi_encode_t_uint256_to_t_uint256_fromStack":
                             {
-                                "entryPoint": 663,
+                                "entryPoint": 641,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 0
                             },
                             "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed":
                             {
-                                "entryPoint": 678,
+                                "entryPoint": 656,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 1
                             },
                             "allocate_memory":
                             {
-                                "entryPoint": 309,
+                                "entryPoint": 297,
                                 "id": null,
                                 "parameterSlots": 1,
                                 "returnSlots": 1
                             },
                             "allocate_unbounded":
                             {
-                                "entryPoint": 171,
+                                "entryPoint": 166,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 1
                             },
                             "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr":
                             {
-                                "entryPoint": 336,
+                                "entryPoint": 323,
                                 "id": null,
                                 "parameterSlots": 1,
                                 "returnSlots": 1
                             },
                             "checked_add_t_uint256":
                             {
-                                "entryPoint": 799,
+                                "entryPoint": 771,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 1
                             },
                             "cleanup_t_uint256":
                             {
-                                "entryPoint": 385,
+                                "entryPoint": 370,
                                 "id": null,
                                 "parameterSlots": 1,
                                 "returnSlots": 1
                             },
                             "finalize_allocation":
                             {
-                                "entryPoint": 260,
+                                "entryPoint": 248,
                                 "id": null,
                                 "parameterSlots": 2,
                                 "returnSlots": 0
                             },
                             "panic_error_0x11":
                             {
-                                "entryPoint": 752,
+                                "entryPoint": 726,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
                             "panic_error_0x32":
                             {
-                                "entryPoint": 705,
+                                "entryPoint": 681,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
                             "panic_error_0x41":
                             {
-                                "entryPoint": 213,
+                                "entryPoint": 203,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
                             "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d":
                             {
-                                "entryPoint": 191,
+                                "entryPoint": 183,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
                             "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef":
                             {
-                                "entryPoint": 380,
+                                "entryPoint": 366,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
                             "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db":
                             {
-                                "entryPoint": 186,
+                                "entryPoint": 179,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
                             "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
                             {
-                                "entryPoint": 181,
+                                "entryPoint": 175,
                                 "id": null,
                                 "parameterSlots": 0,
                                 "returnSlots": 0
                             },
                             "round_up_to_mul_of_32":
                             {
-                                "entryPoint": 196,
+                                "entryPoint": 187,
                                 "id": null,
                                 "parameterSlots": 1,
                                 "returnSlots": 1
                             },
                             "validator_revert_t_uint256":
                             {
-                                "entryPoint": 395,
+                                "entryPoint": 379,
                                 "id": null,
                                 "parameterSlots": 1,
                                 "returnSlots": 0
diff --git a/test/cmdlineTests/strict_asm_optimizer_steps/output b/test/cmdlineTests/strict_asm_optimizer_steps/output
index 0f7a59b977..8fb291b868 100644
--- a/test/cmdlineTests/strict_asm_optimizer_steps/output
+++ b/test/cmdlineTests/strict_asm_optimizer_steps/output
@@ -25,7 +25,7 @@ object "C_6" {
 
 
 Binary representation:
-608060405234601557600e601b600039600e6000f35b600080fdfe60806040523615600055600080fd
+608060405234601357600c60185f39600c5ff35b5f80fdfe608060405236155f555f80fd
 
 Text representation:
     /* "strict_asm_optimizer_steps/input.yul":45:48   */
diff --git a/test/cmdlineTests/strict_asm_output_selection_bin_only/output b/test/cmdlineTests/strict_asm_output_selection_bin_only/output
index 3ffa826b87..86d2495768 100644
--- a/test/cmdlineTests/strict_asm_output_selection_bin_only/output
+++ b/test/cmdlineTests/strict_asm_output_selection_bin_only/output
@@ -2,4 +2,4 @@
 ======= strict_asm_output_selection_bin_only/input.yul (EVM) =======
 
 Binary representation:
-602a60005500
+602a5f5500
diff --git a/test/cmdlineTests/yul_function_name_clashes/output b/test/cmdlineTests/yul_function_name_clashes/output
index 8a7bec7909..cfbb96bfa8 100644
--- a/test/cmdlineTests/yul_function_name_clashes/output
+++ b/test/cmdlineTests/yul_function_name_clashes/output
@@ -22,7 +22,7 @@ object "object" {
 
 
 Binary representation:
-600080600f565b60008035905090565b60156006565b91506025565b6000602035905090565b602b601b565b90508082555050
+5f80600d565b5f8035905090565b60136005565b91506022565b5f602035905090565b60286019565b90508082555050
 
 Text representation:
   0x00
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/output b/test/cmdlineTests/yul_function_name_clashes_different_params/output
index f3dc843405..cd0dce30c4 100644
--- a/test/cmdlineTests/yul_function_name_clashes_different_params/output
+++ b/test/cmdlineTests/yul_function_name_clashes_different_params/output
@@ -22,7 +22,7 @@ object "object" {
 
 
 Binary representation:
-600080600f565b60008035905090565b60156006565b91506026565b600081359050919050565b602e6070601b565b90508082555050
+5f80600d565b5f8035905090565b60136005565b91506023565b5f81359050919050565b602b60706019565b90508082555050
 
 Text representation:
     /* "yul_function_name_clashes_different_params/input.yul":37:42   */
diff --git a/test/cmdlineTests/yul_optimize_runs/output b/test/cmdlineTests/yul_optimize_runs/output
index 6f4ba83907..b7fcabaaca 100644
--- a/test/cmdlineTests/yul_optimize_runs/output
+++ b/test/cmdlineTests/yul_optimize_runs/output
@@ -21,7 +21,7 @@ object "RunsTest1" {
 
 
 Binary representation:
-602580600c6000396000f3fe7fabc123450000000000000000000000000000000000000000000000000000000060005500
+602480600a5f395ff3fe7fabc12345000000000000000000000000000000000000000000000000000000005f5500
 
 Text representation:
     /* "yul_optimize_runs/input.yul":115:143   */
diff --git a/test/cmdlineTests/yul_verbatim_msize/output b/test/cmdlineTests/yul_verbatim_msize/output
index 991fcbdb0c..22259fff71 100644
--- a/test/cmdlineTests/yul_verbatim_msize/output
+++ b/test/cmdlineTests/yul_verbatim_msize/output
@@ -14,7 +14,7 @@ object "object" {
 
 
 Binary representation:
-61200051506161600260005500
+6120005150616160025f5500
 
 Text representation:
     /* "yul_verbatim_msize/input.yul":125:131   */
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index d9a25138f8..37fed86443 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -83,8 +83,6 @@ function uniswap_test
     #   "revert SPL" is expected but the message is "reverted with reason string 'SPL'" in 2.5.0.
     # - Newer versions of ethereumjs/tx have an issue with 'gteHardfork()' method.
     neutralize_package_lock
-    yarn add hardhat@2.4.3
-    yarn add @ethereumjs/tx@3.1.3
 
     yarn install
     yarn add hardhat-gas-reporter
diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
index 8b256d797a..3c7137f737 100755
--- a/test/externalTests/yield-liquidator.sh
+++ b/test/externalTests/yield-liquidator.sh
@@ -66,9 +66,10 @@ function yield_liquidator_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     npm install
 
-    # 2.11.0 Hardhat release breaks contract compilation.
-    # TODO: remove when https://github.com/yieldprotocol/yield-liquidator-v2/issues/34 is addressed.
-    npm install hardhat@2.10.2
+    # The contract below is not used in any test and it depends on ISwapRouter which does not exists
+    # in the main repository.
+    # See: https://github.com/yieldprotocol/yield-liquidator-v2/blob/9a49d9a0e9398f6a6c07bad531e77d1001a1166f/src/swap_router.rs#L94
+    rm --force contracts/.YvBasicFlashLiquidator.sol
 
     replace_version_pragmas
     neutralize_packaged_contracts
diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp
index e819395a4b..0f280c9a09 100644
--- a/test/libsolidity/GasCosts.cpp
+++ b/test/libsolidity/GasCosts.cpp
@@ -131,8 +131,10 @@ BOOST_AUTO_TEST_CASE(string_storage)
 	}
 	else if (evmVersion < EVMVersion::istanbul())
 		CHECK_DEPLOY_GAS(125829, 118559, evmVersion);
-	else
+	else if (evmVersion < EVMVersion::shanghai())
 		CHECK_DEPLOY_GAS(114077, 96461, evmVersion);
+	else
+		CHECK_DEPLOY_GAS(114077, 95835, evmVersion);
 
 	if (evmVersion >= EVMVersion::byzantium())
 	{
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 086cde8efa..8bc0be7a26 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -420,9 +420,9 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
 	BOOST_CHECK(contract["evm"]["bytecode"]["object"].isString());
 	BOOST_CHECK_EQUAL(
 		solidity::test::bytecodeSansMetadata(contract["evm"]["bytecode"]["object"].asString()),
-		string("6080604052348015600f57600080fd5b5060") +
-		(VersionIsRelease ? "3f" : util::toHex(bytes{uint8_t(61 + VersionStringStrict.size())})) +
-		"80601d6000396000f3fe6080604052600080fdfe"
+		string("6080604052348015600e575f80fd5b5060") +
+		(VersionIsRelease ? "3e" : util::toHex(bytes{uint8_t(60 + VersionStringStrict.size())})) +
+		"80601a5f395ff3fe60806040525f80fdfe"
 	);
 	BOOST_CHECK(contract["evm"]["assembly"].isString());
 	BOOST_CHECK(contract["evm"]["assembly"].asString().find(
@@ -1085,9 +1085,11 @@ BOOST_AUTO_TEST_CASE(evm_version)
 	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"london\"") != string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"paris\","));
 	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"paris\"") != string::npos);
+	result = compile(inputForVersion("\"evmVersion\": \"shanghai\","));
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"shanghai\"") != string::npos);
 	// test default
 	result = compile(inputForVersion(""));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"paris\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"shanghai\"") != string::npos);
 	// test invalid
 	result = compile(inputForVersion("\"evmVersion\": \"invalid\","));
 	BOOST_CHECK(result["errors"][0]["message"].asString() == "Invalid EVM version requested.");
diff --git a/test/libsolidity/gasTests/abiv2.sol b/test/libsolidity/gasTests/abiv2.sol
index da433a9e52..aacb333bfe 100644
--- a/test/libsolidity/gasTests/abiv2.sol
+++ b/test/libsolidity/gasTests/abiv2.sol
@@ -14,11 +14,11 @@ contract C {
 }
 // ----
 // creation:
-//   codeDepositCost: 1241200
-//   executionCost: 1288
-//   totalCost: 1242488
+//   codeDepositCost: 1213200
+//   executionCost: 1259
+//   totalCost: 1214459
 // external:
-//   a(): 2430
+//   a(): 2425
 //   b(uint256): infinite
 //   f1(uint256): infinite
 //   f2(uint256[],string[],uint16,address): infinite
diff --git a/test/libsolidity/gasTests/abiv2_optimised.sol b/test/libsolidity/gasTests/abiv2_optimised.sol
index 26e2104f25..2d4100df48 100644
--- a/test/libsolidity/gasTests/abiv2_optimised.sol
+++ b/test/libsolidity/gasTests/abiv2_optimised.sol
@@ -17,13 +17,13 @@ contract C {
 // optimize-yul: true
 // ----
 // creation:
-//   codeDepositCost: 659000
-//   executionCost: 689
-//   totalCost: 659689
+//   codeDepositCost: 640600
+//   executionCost: 674
+//   totalCost: 641274
 // external:
-//   a(): 2285
-//   b(uint256): 4652
-//   f1(uint256): 307
+//   a(): 2283
+//   b(uint256): 4649
+//   f1(uint256): 304
 //   f2(uint256[],string[],uint16,address): infinite
 //   f3(uint16[],string[],uint16,address): infinite
 //   f4(uint32[],string[12],bytes[2][],address): infinite
diff --git a/test/libsolidity/gasTests/data_storage.sol b/test/libsolidity/gasTests/data_storage.sol
index fa0db135d5..0d24ef5052 100644
--- a/test/libsolidity/gasTests/data_storage.sol
+++ b/test/libsolidity/gasTests/data_storage.sol
@@ -13,8 +13,8 @@ contract C {
 }
 // ----
 // creation:
-//   codeDepositCost: 387600
-//   executionCost: 424
-//   totalCost: 388024
+//   codeDepositCost: 377800
+//   executionCost: 416
+//   totalCost: 378216
 // external:
-//   f(): 428
+//   f(): 421
diff --git a/test/libsolidity/gasTests/dispatch_large.sol b/test/libsolidity/gasTests/dispatch_large.sol
index 21369e6f71..e1cce4acd7 100644
--- a/test/libsolidity/gasTests/dispatch_large.sol
+++ b/test/libsolidity/gasTests/dispatch_large.sol
@@ -24,11 +24,11 @@ contract Large {
 }
 // ----
 // creation:
-//   codeDepositCost: 640200
-//   executionCost: 676
-//   totalCost: 640876
+//   codeDepositCost: 618400
+//   executionCost: 649
+//   totalCost: 619049
 // external:
-//   a(): 2475
+//   a(): 2470
 //   b(uint256): infinite
 //   f0(uint256): infinite
 //   f1(uint256): infinite
diff --git a/test/libsolidity/gasTests/dispatch_large_optimised.sol b/test/libsolidity/gasTests/dispatch_large_optimised.sol
index ae38258f09..83e55c1a9c 100644
--- a/test/libsolidity/gasTests/dispatch_large_optimised.sol
+++ b/test/libsolidity/gasTests/dispatch_large_optimised.sol
@@ -27,29 +27,29 @@ contract Large {
 // optimize-runs: 2
 // ----
 // creation:
-//   codeDepositCost: 232800
-//   executionCost: 275
-//   totalCost: 233075
+//   codeDepositCost: 224600
+//   executionCost: 267
+//   totalCost: 224867
 // external:
-//   a(): 2283
-//   b(uint256): 4937
-//   f0(uint256): 366
-//   f1(uint256): 47006
-//   f2(uint256): 24972
-//   f3(uint256): 25060
-//   f4(uint256): 25038
-//   f5(uint256): 25016
-//   f6(uint256): 24928
-//   f7(uint256): 24708
-//   f8(uint256): 24840
-//   f9(uint256): 24862
-//   g0(uint256): 606
-//   g1(uint256): 46718
-//   g2(uint256): 24706
-//   g3(uint256): 24794
-//   g4(uint256): 24772
-//   g5(uint256): 24860
-//   g6(uint256): 24640
-//   g7(uint256): 24750
-//   g8(uint256): 24728
-//   g9(uint256): 24574
+//   a(): 2281
+//   b(uint256): 4934
+//   f0(uint256): 363
+//   f1(uint256): 47002
+//   f2(uint256): 24967
+//   f3(uint256): 25055
+//   f4(uint256): 25033
+//   f5(uint256): 25011
+//   f6(uint256): 24923
+//   f7(uint256): 24703
+//   f8(uint256): 24835
+//   f9(uint256): 24857
+//   g0(uint256): 603
+//   g1(uint256): 46714
+//   g2(uint256): 24701
+//   g3(uint256): 24789
+//   g4(uint256): 24767
+//   g5(uint256): 24855
+//   g6(uint256): 24635
+//   g7(uint256): 24745
+//   g8(uint256): 24723
+//   g9(uint256): 24569
diff --git a/test/libsolidity/gasTests/dispatch_medium.sol b/test/libsolidity/gasTests/dispatch_medium.sol
index c76fc852e5..6bf8f89394 100644
--- a/test/libsolidity/gasTests/dispatch_medium.sol
+++ b/test/libsolidity/gasTests/dispatch_medium.sol
@@ -11,11 +11,11 @@ contract Medium {
 }
 // ----
 // creation:
-//   codeDepositCost: 269600
-//   executionCost: 312
-//   totalCost: 269912
+//   codeDepositCost: 259600
+//   executionCost: 298
+//   totalCost: 259898
 // external:
-//   a(): 2452
+//   a(): 2447
 //   b(uint256): infinite
 //   f1(uint256): infinite
 //   f2(uint256): infinite
diff --git a/test/libsolidity/gasTests/dispatch_medium_optimised.sol b/test/libsolidity/gasTests/dispatch_medium_optimised.sol
index fca8d26957..e921fcf125 100644
--- a/test/libsolidity/gasTests/dispatch_medium_optimised.sol
+++ b/test/libsolidity/gasTests/dispatch_medium_optimised.sol
@@ -14,16 +14,16 @@ contract Medium {
 // optimize-runs: 2
 // ----
 // creation:
-//   codeDepositCost: 131600
-//   executionCost: 177
-//   totalCost: 131777
+//   codeDepositCost: 126000
+//   executionCost: 169
+//   totalCost: 126169
 // external:
-//   a(): 2283
-//   b(uint256): 4695
-//   f1(uint256): 46786
-//   f2(uint256): 24730
-//   f3(uint256): 24774
-//   g0(uint256): 364
-//   g7(uint256): 24640
-//   g8(uint256): 24618
-//   g9(uint256): 24574
+//   a(): 2281
+//   b(uint256): 4692
+//   f1(uint256): 46782
+//   f2(uint256): 24725
+//   f3(uint256): 24769
+//   g0(uint256): 361
+//   g7(uint256): 24635
+//   g8(uint256): 24613
+//   g9(uint256): 24569
diff --git a/test/libsolidity/gasTests/dispatch_small.sol b/test/libsolidity/gasTests/dispatch_small.sol
index bf66fe1826..d2c391582e 100644
--- a/test/libsolidity/gasTests/dispatch_small.sol
+++ b/test/libsolidity/gasTests/dispatch_small.sol
@@ -6,11 +6,11 @@ contract Small {
 }
 // ----
 // creation:
-//   codeDepositCost: 108800
-//   executionCost: 153
-//   totalCost: 108953
+//   codeDepositCost: 103800
+//   executionCost: 151
+//   totalCost: 103951
 // external:
-//   fallback: 129
-//   a(): 2407
+//   fallback: 128
+//   a(): 2402
 //   b(uint256): infinite
 //   f1(uint256): infinite
diff --git a/test/libsolidity/gasTests/dispatch_small_optimised.sol b/test/libsolidity/gasTests/dispatch_small_optimised.sol
index 28ddf2af06..e20e1d9824 100644
--- a/test/libsolidity/gasTests/dispatch_small_optimised.sol
+++ b/test/libsolidity/gasTests/dispatch_small_optimised.sol
@@ -9,11 +9,11 @@ contract Small {
 // optimize-runs: 2
 // ----
 // creation:
-//   codeDepositCost: 60800
-//   executionCost: 111
-//   totalCost: 60911
+//   codeDepositCost: 58200
+//   executionCost: 109
+//   totalCost: 58309
 // external:
-//   fallback: 118
-//   a(): 2261
-//   b(uint256): 4585
-//   f1(uint256): 46720
+//   fallback: 117
+//   a(): 2259
+//   b(uint256): 4582
+//   f1(uint256): 46716
diff --git a/test/libsolidity/gasTests/exp.sol b/test/libsolidity/gasTests/exp.sol
index 8dc59b0944..6ad4dd3bee 100644
--- a/test/libsolidity/gasTests/exp.sol
+++ b/test/libsolidity/gasTests/exp.sol
@@ -19,11 +19,11 @@ contract C {
 // optimize-yul: false
 // ----
 // creation:
-//   codeDepositCost: 110800
-//   executionCost: 159
-//   totalCost: 110959
+//   codeDepositCost: 107000
+//   executionCost: 151
+//   totalCost: 107151
 // external:
-//   exp_neg_one(uint256): 2259
+//   exp_neg_one(uint256): 2250
 //   exp_one(uint256): infinite
 //   exp_two(uint256): infinite
 //   exp_zero(uint256): infinite
diff --git a/test/libsolidity/gasTests/exp_optimized.sol b/test/libsolidity/gasTests/exp_optimized.sol
index c934c710e2..982fcd28fe 100644
--- a/test/libsolidity/gasTests/exp_optimized.sol
+++ b/test/libsolidity/gasTests/exp_optimized.sol
@@ -19,11 +19,11 @@ contract C {
 // optimize-yul: true
 // ----
 // creation:
-//   codeDepositCost: 37200
-//   executionCost: 87
-//   totalCost: 37287
+//   codeDepositCost: 35800
+//   executionCost: 85
+//   totalCost: 35885
 // external:
-//   exp_neg_one(uint256): 1917
-//   exp_one(uint256): 1870
-//   exp_two(uint256): 1848
-//   exp_zero(uint256): 1892
+//   exp_neg_one(uint256): 1914
+//   exp_one(uint256): 1868
+//   exp_two(uint256): 1846
+//   exp_zero(uint256): 1889
diff --git a/test/libsolidity/gasTests/storage_costs.sol b/test/libsolidity/gasTests/storage_costs.sol
index 1e4995833f..afb442ed7f 100644
--- a/test/libsolidity/gasTests/storage_costs.sol
+++ b/test/libsolidity/gasTests/storage_costs.sol
@@ -15,10 +15,10 @@ contract C {
 // optimize-yul: true
 // ----
 // creation:
-//   codeDepositCost: 27200
-//   executionCost: 81
-//   totalCost: 27281
+//   codeDepositCost: 25600
+//   executionCost: 73
+//   totalCost: 25673
 // external:
-//   readX(): 2290
-//   resetX(): 5116
-//   setX(uint256): 22312
+//   readX(): 2288
+//   resetX(): 5114
+//   setX(uint256): 22309
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index fd7bc20838..61360868be 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
@@ -22,6 +22,6 @@ contract C {
 
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
-// gas irOptimized: 203172
-// gas legacy: 206343
-// gas legacyOptimized: 203162
+// gas irOptimized: 203166
+// gas legacy: 206263
+// gas legacyOptimized: 203151
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 328de20a5e..e043853e09 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -59,10 +59,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 362400
-// gas legacy: 414569
-// gas legacyOptimized: 319271
+// gas irOptimized: 361321
+// gas legacy: 411269
+// gas legacyOptimized: 317754
 // test_uint256() ->
-// gas irOptimized: 511451
-// gas legacy: 581876
-// gas legacyOptimized: 442757
+// gas irOptimized: 509988
+// gas legacy: 577469
+// gas legacyOptimized: 440931
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index fa62b4f777..575b759074 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -24,6 +24,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 166513
-// gas legacy: 169347
-// gas legacyOptimized: 167269
+// gas irOptimized: 166506
+// gas legacy: 169283
+// gas legacyOptimized: 167248
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 2eef62d177..8d98179d91 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 362400
-// gas legacy: 414569
-// gas legacyOptimized: 319271
+// gas irOptimized: 361321
+// gas legacy: 411269
+// gas legacyOptimized: 317754
 // test_uint256() ->
-// gas irOptimized: 511451
-// gas legacy: 581876
-// gas legacyOptimized: 442757
+// gas irOptimized: 509988
+// gas legacy: 577469
+// gas legacyOptimized: 440931
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index 58b38a9c38..a0b732caed 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -51,6 +51,6 @@ contract C {
 // f2() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f4() -> 0x20, 0x160, 0x1, 0x80, 0xc0, 0x2, 0x3, "abc", 0x7, 0x40, 0x2, 0x2, 0x3
-// gas irOptimized: 112646
-// gas legacy: 114866
-// gas legacyOptimized: 112586
+// gas irOptimized: 112641
+// gas legacy: 114794
+// gas legacyOptimized: 112572
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index e0ab2c97f6..e3075052c9 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -30,6 +30,6 @@ contract C is B {
 }
 // ----
 // test() -> 77
-// gas irOptimized: 120170
-// gas legacy: 155093
-// gas legacyOptimized: 111550
+// gas irOptimized: 119155
+// gas legacy: 151834
+// gas legacyOptimized: 110339
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
index a45d8d5997..d6c38e3a04 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
@@ -39,4 +39,4 @@ contract C is B {
 // ----
 // test() -> 5, 10
 // gas irOptimized: 87337
-// gas legacy: 104481
+// gas legacy: 102637
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 689bb98101..915514754a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -20,6 +20,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 127347
-// gas legacy: 140553
-// gas legacyOptimized: 119450
+// gas irOptimized: 127012
+// gas legacy: 139800
+// gas legacyOptimized: 119092
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
index 1ec1ca4c56..1b1f360f48 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -34,8 +34,8 @@ contract C {
 // f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1, 5, 6 -> 0x20, 0x40, 5, 2
 // f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1 -> FAILURE
 // f_storage(uint256[],uint256[2]): 0x20, 1, 2 -> 0x20, 0x60, 0x20, 1, 2
-// gas irOptimized: 111653
-// gas legacy: 112979
-// gas legacyOptimized: 112104
+// gas irOptimized: 111650
+// gas legacy: 112944
+// gas legacyOptimized: 112092
 // f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x20, 0x80, 0x20, 2, 5, 6
 // f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index 16f365bd43..c72ac00750 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -18,10 +18,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 180829
-// gas legacy: 184921
-// gas legacyOptimized: 181506
+// gas irOptimized: 180823
+// gas legacy: 184830
+// gas legacyOptimized: 181493
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112464
-// gas legacy: 115460
-// gas legacyOptimized: 112990
+// gas irOptimized: 112459
+// gas legacy: 115398
+// gas legacyOptimized: 112982
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index 15ba6f7de3..93fe74c991 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -9,6 +9,6 @@ contract C {
 
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
-// gas irOptimized: 135699
-// gas legacy: 137325
-// gas legacyOptimized: 136059
+// gas irOptimized: 135693
+// gas legacy: 137278
+// gas legacyOptimized: 136043
diff --git a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
index 29fa81ffed..c4d7548433 100644
--- a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
+++ b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
@@ -16,4 +16,4 @@ contract D {
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x11
 // g(), 100 wei -> 1
-// gas legacy: 101790
+// gas legacy: 100370
diff --git a/test/libsolidity/semanticTests/array/array_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
index d8cad3e8da..116582415f 100644
--- a/test/libsolidity/semanticTests/array/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
@@ -26,9 +26,9 @@ contract C {
 // index(uint256): 10 -> true
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
-// gas irOptimized: 135584
-// gas legacy: 244264
-// gas legacyOptimized: 152128
+// gas irOptimized: 135073
+// gas legacy: 241703
+// gas legacyOptimized: 151613
 // accessIndex(uint256,int256): 10, 1 -> 2
 // accessIndex(uint256,int256): 10, 0 -> 1
 // accessIndex(uint256,int256): 10, 11 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_access.sol b/test/libsolidity/semanticTests/array/array_storage_index_access.sol
index 676e3759e3..1b6e461a36 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_access.sol
@@ -16,38 +16,38 @@ contract C {
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
-// gas irOptimized: 3020710
-// gas legacy: 3071683
-// gas legacyOptimized: 3014415
+// gas irOptimized: 3019936
+// gas legacy: 3069098
+// gas legacyOptimized: 3013250
 // test_indices(uint256): 5 ->
-// gas irOptimized: 578008
-// gas legacy: 575321
-// gas legacyOptimized: 572912
+// gas irOptimized: 577789
+// gas legacy: 574754
+// gas legacyOptimized: 572383
 // test_indices(uint256): 10 ->
-// gas irOptimized: 158347
-// gas legacy: 162657
-// gas legacyOptimized: 158422
+// gas irOptimized: 158291
+// gas legacy: 162468
+// gas legacyOptimized: 158336
 // test_indices(uint256): 15 ->
-// gas irOptimized: 173377
-// gas legacy: 179782
-// gas legacyOptimized: 173727
+// gas irOptimized: 173296
+// gas legacy: 179513
+// gas legacyOptimized: 173606
 // test_indices(uint256): 0xFF ->
-// gas irOptimized: 5680122
-// gas legacy: 5780977
-// gas legacyOptimized: 5668997
+// gas irOptimized: 5678606
+// gas legacy: 5775928
+// gas legacyOptimized: 5666726
 // test_indices(uint256): 1000 ->
-// gas irOptimized: 18202919
-// gas legacy: 18602799
-// gas legacyOptimized: 18179744
+// gas irOptimized: 18197173
+// gas legacy: 18583810
+// gas legacyOptimized: 18171248
 // test_indices(uint256): 129 ->
-// gas irOptimized: 4158223
-// gas legacy: 4169611
-// gas legacyOptimized: 4126312
+// gas irOptimized: 4156312
+// gas legacy: 4164468
+// gas legacyOptimized: 4122100
 // test_indices(uint256): 128 ->
-// gas irOptimized: 411932
-// gas legacy: 465768
-// gas legacyOptimized: 418968
+// gas irOptimized: 411289
+// gas legacy: 463706
+// gas legacyOptimized: 418061
 // test_indices(uint256): 1 ->
-// gas irOptimized: 581570
-// gas legacy: 577432
-// gas legacyOptimized: 576168
+// gas irOptimized: 581362
+// gas legacy: 576904
+// gas legacyOptimized: 575649
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
index daa78f0b40..ffe98ee430 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
@@ -16,12 +16,12 @@ contract C {
 // test_boundary_check(uint256,uint256): 1, 1 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
-// gas irOptimized: 140631
-// gas legacy: 134630
-// gas legacyOptimized: 114854
+// gas irOptimized: 140383
+// gas legacy: 133633
+// gas legacyOptimized: 114354
 // test_boundary_check(uint256,uint256): 256, 255 -> 0
-// gas irOptimized: 142763
-// gas legacy: 136949
-// gas legacyOptimized: 117033
+// gas irOptimized: 142515
+// gas legacy: 135949
+// gas legacyOptimized: 116533
 // test_boundary_check(uint256,uint256): 256, 0xFFFF -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 256, 2 -> 0
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
index 1d9d427aee..6b3f4643cb 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131998
-// gas legacy: 132961
-// gas legacyOptimized: 130752
+// gas irOptimized: 131925
+// gas legacy: 132804
+// gas legacyOptimized: 130649
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 226012
-// gas legacy: 228071
-// gas legacyOptimized: 224010
+// gas irOptimized: 225874
+// gas legacy: 227786
+// gas legacyOptimized: 223830
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 324140
-// gas legacy: 327311
-// gas legacyOptimized: 321462
+// gas irOptimized: 323938
+// gas legacy: 326902
+// gas legacyOptimized: 321206
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 5120200
-// gas legacy: 5172987
-// gas legacyOptimized: 5066462
+// gas irOptimized: 5116738
+// gas legacy: 5165874
+// gas legacyOptimized: 5062182
diff --git a/test/libsolidity/semanticTests/array/array_storage_length_access.sol b/test/libsolidity/semanticTests/array/array_storage_length_access.sol
index c8083b6c3f..6a611cc171 100644
--- a/test/libsolidity/semanticTests/array/array_storage_length_access.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_length_access.sol
@@ -13,10 +13,10 @@ contract C {
 // set_get_length(uint256): 20 -> 20
 // set_get_length(uint256): 0xFF -> 0xFF
 // gas irOptimized: 96690
-// gas legacy: 129522
-// gas legacyOptimized: 110618
+// gas legacy: 128571
+// gas legacyOptimized: 110143
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1220648
-// gas legacy: 1704919
-// gas legacyOptimized: 1401220
+// gas irOptimized: 1220647
+// gas legacy: 1689548
+// gas legacyOptimized: 1393535
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_empty.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
index 6772deab0b..b59afd0391 100644
--- a/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
@@ -12,13 +12,13 @@ contract C {
 // EVMVersion: >=petersburg
 // ----
 // pushEmpty(uint256): 128
-// gas irOptimized: 406798
-// gas legacy: 416903
-// gas legacyOptimized: 398280
+// gas irOptimized: 406413
+// gas legacy: 415744
+// gas legacyOptimized: 397380
 // pushEmpty(uint256): 256
-// gas irOptimized: 693826
-// gas legacy: 717115
-// gas legacyOptimized: 690172
+// gas irOptimized: 693185
+// gas legacy: 715316
+// gas legacyOptimized: 688632
 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
 // gas irOptimized: 100000000
 // gas legacy: 100000000
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
index e1de31f42c..9c3a426fe9 100644
--- a/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
@@ -21,13 +21,13 @@ contract C {
 // gas legacy: 77730
 // gas legacyOptimized: 77162
 // set_get_length(uint256): 0xFF -> 0xFF
-// gas irOptimized: 161696
-// gas legacy: 698137
-// gas legacyOptimized: 135004
+// gas irOptimized: 161440
+// gas legacy: 696850
+// gas legacyOptimized: 134488
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1804463
-// gas legacy: 9876574
-// gas legacyOptimized: 1401346
+// gas irOptimized: 1800622
+// gas legacy: 9857362
+// gas legacyOptimized: 1393660
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
 // gas irOptimized: 100000000
 // gas legacyOptimized: 100000000
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_pop.sol b/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
index 97f7a1269b..91948540f9 100644
--- a/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
@@ -17,11 +17,11 @@ contract C {
 // gas legacy: 105722
 // gas legacyOptimized: 103508
 // set_get_length(uint256): 0xFF -> 0
-// gas irOptimized: 821872
-// gas legacy: 810327
-// gas legacyOptimized: 786258
+// gas irOptimized: 821106
+// gas legacy: 808020
+// gas legacyOptimized: 784467
 // set_get_length(uint256): 0xFFF -> 0
-// gas irOptimized: 12841084
-// gas legacy: 12649059
-// gas legacyOptimized: 12267870
+// gas irOptimized: 12828798
+// gas legacy: 12612192
+// gas legacyOptimized: 12239199
 // set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index ed54d0279f..05a663c0be 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -12,9 +12,9 @@ contract Test {
 }
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 186550
-// gas legacy: 211149
-// gas legacyOptimized: 206054
+// gas irOptimized: 186537
+// gas legacy: 211054
+// gas legacyOptimized: 206042
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
 // data(uint256,uint256): 0x05, 0x01 -> 0x11
 // data(uint256,uint256): 0x06, 0x00 -> FAILURE
diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
index bb1e904f0f..e5fd0a2d70 100644
--- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
@@ -46,8 +46,8 @@ contract c {
 // storageEmpty -> 0
 // test_long() -> 67
 // gas irOptimized: 89148
-// gas legacy: 105839
-// gas legacyOptimized: 103293
+// gas legacy: 105693
+// gas legacyOptimized: 103216
 // storageEmpty -> 0
 // test_pop() -> 1780731860627700044960722568376592200742329637303199754547598369979433020
 // gas legacy: 61930
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index 2165483ec4..554f4361a1 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 125751
-// gas legacy: 150861
-// gas legacyOptimized: 146667
+// gas irOptimized: 125584
+// gas legacy: 150372
+// gas legacyOptimized: 146391
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index 387ef09302..04dcf2d340 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -13,7 +13,7 @@ contract c {
 // ----
 // getLength() -> 0
 // set(): 1, 2 -> true
-// gas irOptimized: 110402
-// gas legacy: 110968
-// gas legacyOptimized: 110585
+// gas irOptimized: 110400
+// gas legacy: 110952
+// gas legacyOptimized: 110580
 // getLength() -> 68
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
index fc51f4e303..ffd4b54033 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -9,9 +9,9 @@ contract C {
 
 // ----
 // constructor(): 1, 2, 3 ->
-// gas irOptimized: 141581
-// gas legacy: 183490
-// gas legacyOptimized: 151938
+// gas irOptimized: 140952
+// gas legacy: 180517
+// gas legacyOptimized: 150462
 // a(uint256): 0 -> 1
 // a(uint256): 1 -> 2
 // a(uint256): 2 -> 3
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
index 6afd8f88f4..3be5ba29f4 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -20,7 +20,7 @@ contract c {
 }
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
-// gas irOptimized: 648324
-// gas legacy: 694515
-// gas legacyOptimized: 694013
+// gas irOptimized: 648323
+// gas legacy: 694356
+// gas legacyOptimized: 693864
 // retrieve() -> 9, 28, 9, 28, 4, 3, 32
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
index 88506585e7..d88aaebcda 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> true
-// gas irOptimized: 117405
-// gas legacy: 124769
-// gas legacyOptimized: 122871
+// gas irOptimized: 117369
+// gas legacy: 124660
+// gas legacyOptimized: 122801
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
index 27f6873607..ebc6dadbe7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 0
-// gas irOptimized: 107492
-// gas legacy: 108251
-// gas legacyOptimized: 107639
+// gas irOptimized: 107488
+// gas legacy: 108218
+// gas legacyOptimized: 107625
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 86da315c3f..55e20f9172 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -19,6 +19,6 @@ contract c {
 
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 208149
-// gas legacy: 221856
-// gas legacyOptimized: 220680
+// gas irOptimized: 208122
+// gas legacy: 221769
+// gas legacyOptimized: 220611
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index 1599f0d352..80364f0257 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -35,12 +35,12 @@ contract c {
 }
 // ----
 // test() -> 0x02000202
-// gas irOptimized: 4550335
-// gas legacy: 4478946
-// gas legacyOptimized: 4448809
+// gas irOptimized: 4548245
+// gas legacy: 4476222
+// gas legacyOptimized: 4448113
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4477223
-// gas legacy: 4410748
-// gas legacyOptimized: 4382489
+// gas irOptimized: 4475224
+// gas legacy: 4408014
+// gas legacyOptimized: 4381784
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index a85765cd98..03f58e1190 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -13,6 +13,6 @@ contract c {
 
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
-// gas irOptimized: 689759
-// gas legacy: 686268
-// gas legacyOptimized: 685688
+// gas irOptimized: 689714
+// gas legacy: 686178
+// gas legacyOptimized: 685628
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
index ed8e2746eb..d17e45a2f3 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4
-// gas irOptimized: 205073
-// gas legacy: 213901
-// gas legacyOptimized: 212916
+// gas irOptimized: 205062
+// gas legacy: 213863
+// gas legacyOptimized: 212902
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
index 960343916d..113269ea2b 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -23,6 +23,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 3, 4
-// gas irOptimized: 169616
-// gas legacy: 175453
-// gas legacyOptimized: 172541
+// gas irOptimized: 169602
+// gas legacy: 175424
+// gas legacyOptimized: 172535
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
index 5e12fa657d..29c845f130 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
@@ -15,9 +15,9 @@ contract c {
 // ----
 // setData1(uint256,uint256,uint256): 10, 5, 4 ->
 // copyStorageStorage() ->
-// gas irOptimized: 111368
-// gas legacy: 109278
-// gas legacyOptimized: 109268
+// gas irOptimized: 111366
+// gas legacy: 109272
+// gas legacyOptimized: 109262
 // getData2(uint256): 5 -> 10, 4
 // setData1(uint256,uint256,uint256): 0, 0, 0 ->
 // copyStorageStorage() ->
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
index 749b70417a..1582b71183 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
@@ -18,6 +18,6 @@ contract c {
 
 // ----
 // test() -> 5, 4
-// gas irOptimized: 252993
-// gas legacy: 250934
-// gas legacyOptimized: 250060
+// gas irOptimized: 252986
+// gas legacy: 250892
+// gas legacyOptimized: 250046
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
index 99e6b06f0d..8b750efa7a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
@@ -12,6 +12,6 @@ contract c {
 
 // ----
 // test() -> 9, 4
-// gas irOptimized: 123143
-// gas legacy: 123579
-// gas legacyOptimized: 123208
+// gas irOptimized: 123142
+// gas legacy: 123567
+// gas legacyOptimized: 123202
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
index 3f74616c25..f7f0560653 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
@@ -17,6 +17,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 8, 0
-// gas irOptimized: 196279
-// gas legacy: 194895
-// gas legacyOptimized: 194303
+// gas irOptimized: 196278
+// gas legacy: 194843
+// gas legacyOptimized: 194281
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
index c42b679988..4339c89b55 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
@@ -17,7 +17,7 @@ contract c {
 }
 // ----
 // test() -> 4, 5
-// gas irOptimized: 190899
-// gas legacy: 190989
-// gas legacyOptimized: 189728
+// gas irOptimized: 190870
+// gas legacy: 190852
+// gas legacyOptimized: 189658
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
index 27f1a6aa07..c9c6e32284 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
@@ -15,6 +15,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
-// gas irOptimized: 161735
-// gas legacy: 162278
-// gas legacyOptimized: 159955
+// gas irOptimized: 161715
+// gas legacy: 162203
+// gas legacyOptimized: 159941
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index fa73987bf9..a3f800b083 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -19,6 +19,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 104740
-// gas legacy: 167514
-// gas legacyOptimized: 145759
+// gas irOptimized: 104665
+// gas legacy: 166874
+// gas legacyOptimized: 145474
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index fb0e49b478..160697c6b1 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -21,6 +21,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
-// gas irOptimized: 273586
-// gas legacy: 283726
-// gas legacyOptimized: 282045
+// gas irOptimized: 273576
+// gas legacy: 283666
+// gas legacyOptimized: 282023
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index c4ffe543f8..c2ab09c643 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -21,6 +21,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
-// gas irOptimized: 233293
-// gas legacy: 236560
-// gas legacyOptimized: 235611
+// gas irOptimized: 233285
+// gas legacy: 236523
+// gas legacyOptimized: 235592
diff --git a/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
index 4ee91191c6..e139e200ff 100644
--- a/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
@@ -53,9 +53,9 @@ contract C {
 
 // ----
 // from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 150098
-// gas legacy: 150830
-// gas legacyOptimized: 148728
+// gas irOptimized: 150061
+// gas legacy: 150745
+// gas legacyOptimized: 148685
 // from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
 // from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
 // from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
index 02872f8dde..8cc849ecdc 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
@@ -38,10 +38,10 @@ contract c {
 // compileViaYul: true
 // ----
 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 180769
+// gas irOptimized: 180759
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 157567
+// gas irOptimized: 157562
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 134644
+// gas irOptimized: 134637
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
-// gas irOptimized: 111271
+// gas irOptimized: 111270
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index d86eb748d9..08e427eea5 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -38,12 +38,12 @@ contract Test {
 }
 // ----
 // test() -> 24
-// gas irOptimized: 226700
-// gas legacy: 227121
-// gas legacyOptimized: 226557
+// gas irOptimized: 226687
+// gas legacy: 227084
+// gas legacyOptimized: 226529
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 141260
-// gas legacy: 142283
-// gas legacyOptimized: 141393
+// gas irOptimized: 141244
+// gas legacy: 142238
+// gas legacyOptimized: 141365
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
index 3b150f4f78..9a2ab14cbb 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
@@ -45,7 +45,7 @@ contract C {
 }
 // ----
 // copyExternalStorageArrayOfFunctionType() -> true
-// gas irOptimized: 104615
-// gas legacy: 108722
-// gas legacyOptimized: 102438
+// gas irOptimized: 104606
+// gas legacy: 108554
+// gas legacyOptimized: 102413
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
index 6576149eb9..dc30e44b6f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -48,8 +48,8 @@ contract C {
 }
 // ----
 // copyExternalStorageArraysOfFunctionType() -> true
-// gas irOptimized: 104288
-// gas legacy: 108459
-// gas legacyOptimized: 102171
+// gas irOptimized: 104279
+// gas legacy: 108295
+// gas legacyOptimized: 102146
 // copyInternalArrayOfFunctionType() -> true
 // gas legacy: 104178
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
index a7487a64fe..ec193d693a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
@@ -17,4 +17,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
-// gas irOptimized: 119737
+// gas irOptimized: 119736
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
index 09653d5369..3024f44adc 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
@@ -19,4 +19,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 10, 11, 12
-// gas irOptimized: 118394
+// gas irOptimized: 118393
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
index 49d307fe2d..b60a7c3c2a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
@@ -23,4 +23,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
-// gas irOptimized: 327798
+// gas irOptimized: 327759
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
index 0314610563..e175dd87c7 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 3, 3, 3, 1
-// gas irOptimized: 181997
+// gas irOptimized: 181950
diff --git a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
index fbb7244c52..cbb87a2788 100644
--- a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
@@ -14,6 +14,6 @@ contract C {
 // compileToEwasm: also
 // ----
 // f() -> 1, 2, 3
-// gas irOptimized: 131933
-// gas legacy: 134619
-// gas legacyOptimized: 131940
+// gas irOptimized: 131932
+// gas legacy: 134606
+// gas legacyOptimized: 131938
diff --git a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
index bd94446380..5c36ed3f3a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
@@ -38,8 +38,8 @@ contract C {
 
 // ----
 // from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 147913
-// gas legacy: 148965
-// gas legacyOptimized: 146935
+// gas irOptimized: 147892
+// gas legacy: 148896
+// gas legacyOptimized: 146908
 // from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
 // from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
index d13381d804..0deb396d3d 100644
--- a/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/arrays_from_and_to_storage.sol
@@ -11,8 +11,8 @@ contract Test {
 // ----
 // set(uint24[]): 0x20, 18, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18 -> 18
 // gas irOptimized: 99616
-// gas legacy: 103563
-// gas legacyOptimized: 101397
+// gas legacy: 103509
+// gas legacyOptimized: 101390
 // data(uint256): 7 -> 8
 // data(uint256): 15 -> 16
 // data(uint256): 18 -> FAILURE
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
index 99ee19d7a3..523a0ebebb 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -5,13 +5,13 @@ contract c {
 }
 // ----
 // set(uint256): 1, 2 -> true
-// gas irOptimized: 110576
-// gas legacy: 111333
-// gas legacyOptimized: 110750
+// gas irOptimized: 110574
+// gas legacy: 111312
+// gas legacyOptimized: 110744
 // set(uint256): 2, 2, 3, 4, 5 -> true
-// gas irOptimized: 177527
-// gas legacy: 178335
-// gas legacyOptimized: 177725
+// gas irOptimized: 177525
+// gas legacy: 178314
+// gas legacyOptimized: 177719
 // storageEmpty -> 0
 // copy(uint256,uint256): 1, 2 -> true
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index f0f0b3fbdf..9448970b78 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -17,25 +17,25 @@ contract c {
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 109413
-// gas legacy: 124296
-// gas legacyOptimized: 119119
+// gas irOptimized: 109255
+// gas legacy: 123948
+// gas legacyOptimized: 118948
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 124165
-// gas legacy: 140851
-// gas legacyOptimized: 135691
+// gas irOptimized: 123936
+// gas legacy: 140362
+// gas legacyOptimized: 135386
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 130784
-// gas legacy: 148435
-// gas legacyOptimized: 142608
+// gas irOptimized: 130543
+// gas legacy: 147916
+// gas legacyOptimized: 142290
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 139784
-// gas legacy: 172075
-// gas legacyOptimized: 162138
+// gas irOptimized: 139333
+// gas legacy: 171136
+// gas legacyOptimized: 161550
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 442899
-// gas legacy: 506874
-// gas legacyOptimized: 488177
+// gas irOptimized: 441985
+// gas legacy: 505021
+// gas legacyOptimized: 486997
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
index 0905266d82..3f629686f7 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
@@ -9,6 +9,6 @@ contract C {
 }
 // ----
 // f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
-// gas irOptimized: 110971
-// gas legacy: 111565
-// gas legacyOptimized: 111347
+// gas irOptimized: 110970
+// gas legacy: 111551
+// gas legacyOptimized: 111339
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
index 0573760eb4..90b5b85d6a 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
@@ -15,4 +15,4 @@ contract C {
 // compileViaYul: true
 // ----
 // from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 139927
+// gas irOptimized: 139905
diff --git a/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
index c2dda730d6..9a111e2bcd 100644
--- a/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
+++ b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
@@ -16,7 +16,7 @@ contract C {
 }
 // ----
 // constructor()
-// gas irOptimized: 236265
-// gas legacy: 221315
-// gas legacyOptimized: 185247
+// gas irOptimized: 234419
+// gas legacy: 215757
+// gas legacyOptimized: 181760
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index ef7ff3232c..edb657ad97 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -35,12 +35,12 @@ contract C {
 }
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179766
-// gas legacy: 181047
-// gas legacyOptimized: 180029
+// gas irOptimized: 179752
+// gas legacy: 181001
+// gas legacyOptimized: 180014
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 106697
-// gas legacy: 109801
-// gas legacyOptimized: 106953
+// gas irOptimized: 106682
+// gas legacy: 109720
+// gas legacyOptimized: 106937
 // h() -> 0x40, 0x60, 0x00, 0x00
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index a4c5566221..61d5ccf869 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> 0xff
-// gas irOptimized: 143428
-// gas legacy: 153580
-// gas legacyOptimized: 146765
+// gas irOptimized: 143426
+// gas legacy: 153395
+// gas legacyOptimized: 146722
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index e938b03d61..d4d5359501 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -16,6 +16,6 @@ contract C {
 
 // ----
 // test() -> 7
-// gas irOptimized: 122483
-// gas legacy: 205196
-// gas legacyOptimized: 204987
+// gas irOptimized: 122477
+// gas legacy: 205176
+// gas legacyOptimized: 204971
diff --git a/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
index b13d15e175..20b894082c 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
@@ -21,6 +21,6 @@ contract C {
 // compileToEwasm: also
 // ----
 // one() -> 3
-// gas legacy: 140260
-// gas legacyOptimized: 140097
+// gas legacy: 140253
+// gas legacyOptimized: 140093
 // two() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
index 1c72666111..58fc1c13da 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -7,9 +7,9 @@ contract c {
 }
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
-// gas irOptimized: 177386
-// gas legacy: 177970
-// gas legacyOptimized: 177559
+// gas irOptimized: 177383
+// gas legacy: 177954
+// gas legacyOptimized: 177554
 // storageEmpty -> 0
 // reset() -> true
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index cc61509d44..ca6362b5c0 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -20,9 +20,9 @@ contract sender {
 // compileToEwasm: false
 // ----
 // (): 7 ->
-// gas irOptimized: 110826
-// gas legacy: 111408
-// gas legacyOptimized: 111078
+// gas irOptimized: 110820
+// gas legacy: 111388
+// gas legacyOptimized: 111071
 // val() -> 0
 // forward(bool): true -> true
 // val() -> 0x80
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
index fe87b79ee2..f435d91363 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
@@ -33,8 +33,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 327878
+// gas irOptimized: 327821
 // test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 140894
+// gas irOptimized: 140867
 // test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 188509
+// gas irOptimized: 188473
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
index 8bd1eb18a0..3a52e0a584 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
@@ -33,8 +33,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 332586
+// gas irOptimized: 332527
 // test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 145182
+// gas irOptimized: 145155
 // test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 192512
+// gas irOptimized: 192476
diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
index 409bb2983c..68db475194 100644
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
@@ -46,11 +46,11 @@ contract C {
 }
 // ----
 // test() -> 0x20, 0x14, "[a called][b called]"
-// gas irOptimized: 116660
-// gas legacy: 119030
-// gas legacyOptimized: 117021
+// gas irOptimized: 116638
+// gas legacy: 118936
+// gas legacyOptimized: 116975
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 103256
-// gas legacy: 102814
-// gas legacyOptimized: 101706
+// gas irOptimized: 103241
+// gas legacy: 102745
+// gas legacyOptimized: 101669
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index 16d10a36d2..074ca934ff 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 3
-// gas irOptimized: 128172
-// gas legacy: 130757
-// gas legacyOptimized: 129144
+// gas irOptimized: 128116
+// gas legacy: 130584
+// gas legacyOptimized: 129031
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
index 0da09064cd..c402c14b20 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
@@ -71,15 +71,15 @@ contract C {
 
 // ----
 // test1() ->
-// gas irOptimized: 150570
-// gas legacy: 151017
-// gas legacyOptimized: 150970
+// gas irOptimized: 150508
+// gas legacy: 150949
+// gas legacyOptimized: 150906
 // test2() -> FAILURE
-// gas irOptimized: 150408
-// gas legacy: 150700
-// gas legacyOptimized: 150601
+// gas irOptimized: 150385
+// gas legacy: 150673
+// gas legacyOptimized: 150576
 // test3() ->
-// gas irOptimized: 123810
-// gas legacy: 125381
-// gas legacyOptimized: 125160
+// gas irOptimized: 123776
+// gas legacy: 125333
+// gas legacyOptimized: 125127
 // test4() -> FAILURE
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
index 1f9011abde..60d65cb59b 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
@@ -31,8 +31,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 304768
+// gas irOptimized: 304714
 // test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 116476
+// gas irOptimized: 116454
 // test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 187998
+// gas irOptimized: 187962
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
index 218e8f1c7c..13b3502621 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
@@ -31,8 +31,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 309123
+// gas irOptimized: 309068
 // test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 118188
+// gas irOptimized: 118167
 // test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 190997
+// gas irOptimized: 190961
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
index b4ab1cc61e..64c7f06a57 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
@@ -64,7 +64,7 @@ contract C {
 // compileViaYul: true
 // ----
 // test1()
-// gas irOptimized: 123279
+// gas irOptimized: 123237
 // test2()
-// gas irOptimized: 123073
+// gas irOptimized: 123043
 // test3()
diff --git a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
index c519d11ce9..5b72055530 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
@@ -31,7 +31,7 @@ contract C {
 // compileViaYul: true
 // ----
 // test(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// gas irOptimized: 138083
+// gas irOptimized: 138054
 // test2(uint8[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// gas irOptimized: 164290
+// gas irOptimized: 164232
 // gas legacyOptimized: 120228
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
index ddcae981f2..f7a863b469 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -17,6 +17,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 205985
-// gas legacy: 212313
-// gas legacyOptimized: 211462
+// gas irOptimized: 205974
+// gas legacy: 212237
+// gas legacyOptimized: 211425
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index 550e74a6fa..2a78630158 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -11,6 +11,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
-// gas irOptimized: 202808
-// gas legacy: 204860
-// gas legacyOptimized: 203385
+// gas irOptimized: 202805
+// gas legacy: 204798
+// gas legacyOptimized: 203368
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
index eabcb1666c..0f3f7783d4 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 205985
-// gas legacy: 212318
-// gas legacyOptimized: 211467
+// gas irOptimized: 205974
+// gas legacy: 212242
+// gas legacyOptimized: 211430
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
index 46eae913df..b40bfacedc 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
@@ -24,6 +24,6 @@ contract C {
 }
 // ----
 // f() -> 11, 0x0c, 1, 0x15, 22, 4
-// gas irOptimized: 291168
-// gas legacy: 293516
-// gas legacyOptimized: 290263
+// gas irOptimized: 291155
+// gas legacy: 293407
+// gas legacyOptimized: 290218
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index 8fed11241a..341a4c9d90 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 2, 3, 4
-// gas irOptimized: 109838
-// gas legacy: 126350
-// gas legacyOptimized: 120704
+// gas irOptimized: 109804
+// gas legacy: 126129
+// gas legacyOptimized: 120622
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
index fbef4ccfaa..0d099815bf 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> "A", 8, 4, "B"
-// gas irOptimized: 125828
-// gas legacy: 121398
-// gas legacyOptimized: 115494
+// gas irOptimized: 125827
+// gas legacy: 121382
+// gas legacyOptimized: 115488
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index 9aadf0db04..a653db837f 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test1() -> true
-// gas irOptimized: 206428
-// gas legacy: 254905
-// gas legacyOptimized: 247415
+// gas irOptimized: 206322
+// gas legacy: 254056
+// gas legacyOptimized: 246887
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index 9d1b02b22d..13d510f80b 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -14,9 +14,9 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 519361
-// gas legacy: 521584
-// gas legacyOptimized: 517027
+// gas irOptimized: 519276
+// gas legacy: 521414
+// gas legacyOptimized: 516983
 // storageEmpty -> 0
 // halfClear() ->
 // gas irOptimized: 113961
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index 8ff67048c3..d6e7160be9 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -42,9 +42,9 @@ contract c {
 // ----
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
-// gas irOptimized: 111448
-// gas legacy: 108571
-// gas legacyOptimized: 100417
+// gas irOptimized: 111301
+// gas legacy: 108273
+// gas legacyOptimized: 100269
 // getLengths() -> 48, 49
 // setIDStatic(uint256): 11 ->
 // getID(uint256): 2 -> 11
diff --git a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
index 90957b0ddc..4c5f646951 100644
--- a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
@@ -16,9 +16,9 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() -> 8
-// gas irOptimized: 123012
-// gas legacy: 121756
-// gas legacyOptimized: 120687
+// gas irOptimized: 122916
+// gas legacy: 121602
+// gas legacyOptimized: 120589
 // storageEmpty -> 0
 // clear() ->
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index cb4a14c051..51f93db7a2 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -12,9 +12,9 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 465345
-// gas legacy: 471280
-// gas legacyOptimized: 467500
+// gas irOptimized: 465324
+// gas legacy: 471178
+// gas legacyOptimized: 467478
 // storageEmpty -> 0
 // clear() ->
 // gas irOptimized: 122148
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 4416635b62..08a89e00bb 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -19,6 +19,6 @@ contract B {
 
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 116813
-// gas legacy: 234719
-// gas legacyOptimized: 132639
+// gas irOptimized: 115808
+// gas legacy: 229947
+// gas legacyOptimized: 130613
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index 2749f01025..71fec7bda0 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -9,8 +9,8 @@ contract Creator {
 }
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 128288
-// gas legacy: 176789
-// gas legacyOptimized: 129585
+// gas irOptimized: 127659
+// gas legacy: 174186
+// gas legacyOptimized: 128709
 // r() -> 4
 // ch() -> 3
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 71bd36b900..316bb39da8 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -43,6 +43,6 @@ contract C {
 
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 262057
-// gas legacy: 452136
-// gas legacyOptimized: 284945
+// gas irOptimized: 260837
+// gas legacy: 441446
+// gas legacyOptimized: 279259
diff --git a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
index 0ff2ea5f89..815c1768c2 100644
--- a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
+++ b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
@@ -40,9 +40,9 @@ contract C {
 // copyFromStorageShort()
 // x() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
 // copyFromStorageLong()
-// gas irOptimized: 121130
-// gas legacy: 121930
-// gas legacyOptimized: 121408
+// gas irOptimized: 121123
+// gas legacy: 121904
+// gas legacyOptimized: 121400
 // x() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
 // copyToStorage()
 // x() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index 5292182b95..7f80f1bd07 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -23,7 +23,7 @@ contract c {
 }
 // ----
 // test() -> 1, 2, 3
-// gas irOptimized: 1828598
-// gas legacy: 1823228
-// gas legacyOptimized: 1813956
+// gas irOptimized: 1828169
+// gas legacy: 1822466
+// gas legacyOptimized: 1813404
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index 2ef781a703..6a657032bb 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 38, 28, 18
-// gas irOptimized: 148520
-// gas legacy: 151594
-// gas legacyOptimized: 142655
+// gas irOptimized: 148168
+// gas legacy: 151184
+// gas legacyOptimized: 142418
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index a56aef2cd6..1a74ea9722 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 20, 10
-// gas irOptimized: 126056
-// gas legacy: 127424
-// gas legacyOptimized: 122350
+// gas irOptimized: 125933
+// gas legacy: 127216
+// gas legacyOptimized: 122224
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index cb917cef09..3528e4c818 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -11,5 +11,5 @@ contract c {
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
 // gas irOptimized: 109310
-// gas legacy: 101362
+// gas legacy: 101220
 // gas legacyOptimized: 123422
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index 0c03436544..95a2b012c7 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -16,7 +16,7 @@ contract c {
 }
 // ----
 // test() -> true
-// gas irOptimized: 140496
-// gas legacy: 179275
-// gas legacyOptimized: 164122
+// gas irOptimized: 140325
+// gas legacy: 178397
+// gas legacyOptimized: 163832
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index 7ce41ffffd..f6eb8e1270 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -15,7 +15,7 @@ contract c {
 }
 // ----
 // test() ->
-// gas irOptimized: 113892
-// gas legacy: 131544
-// gas legacyOptimized: 126811
+// gas irOptimized: 113826
+// gas legacy: 131245
+// gas legacyOptimized: 126668
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index 095109a186..6416afb2da 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -10,6 +10,6 @@ contract c {
 
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 108097
-// gas legacy: 125584
-// gas legacyOptimized: 122560
+// gas irOptimized: 108053
+// gas legacy: 125420
+// gas legacyOptimized: 122472
diff --git a/test/libsolidity/semanticTests/array/push/array_push.sol b/test/libsolidity/semanticTests/array/push/array_push.sol
index 18f20c021a..0dbd7c11bf 100644
--- a/test/libsolidity/semanticTests/array/push/array_push.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4, 3, 3
-// gas irOptimized: 111406
-// gas legacy: 111838
-// gas legacyOptimized: 111128
+// gas irOptimized: 111401
+// gas legacy: 111807
+// gas legacyOptimized: 111122
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
index 63f974498a..87616f1f5f 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -12,6 +12,6 @@ contract C {
 }
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
-// gas irOptimized: 112832
-// gas legacy: 113686
-// gas legacyOptimized: 113499
+// gas irOptimized: 112825
+// gas legacy: 113659
+// gas legacyOptimized: 113482
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
index 04f94b3dbb..f7918bbb48 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
@@ -20,6 +20,6 @@ contract c {
 }
 // ----
 // test() -> 2, 3, 4, 5
-// gas irOptimized: 135204
-// gas legacy: 147484
-// gas legacyOptimized: 146456
+// gas irOptimized: 135199
+// gas legacy: 147443
+// gas legacyOptimized: 146434
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index 9718f303c3..91a6a0b372 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
-// gas irOptimized: 137092
-// gas legacy: 142537
-// gas legacyOptimized: 138023
+// gas irOptimized: 137087
+// gas legacy: 142423
+// gas legacyOptimized: 137993
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 119e4ca289..08cfe58a3f 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -15,6 +15,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 173456
-// gas legacy: 216790
-// gas legacyOptimized: 204003
+// gas irOptimized: 173252
+// gas legacy: 215891
+// gas legacyOptimized: 203615
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index 71a21820d2..b2fbbc977b 100644
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 179170
-// gas legacy: 181066
-// gas legacyOptimized: 180435
+// gas irOptimized: 179165
+// gas legacy: 181014
+// gas legacyOptimized: 180413
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index 4938e6e455..4b5a2b89d7 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -27,15 +27,15 @@ contract C {
 // ----
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
-// gas irOptimized: 112470
-// gas legacy: 108105
-// gas legacyOptimized: 101987
+// gas irOptimized: 112290
+// gas legacy: 107920
+// gas legacyOptimized: 101897
 // l() -> 1
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
-// gas irOptimized: 119058
-// gas legacy: 110325
+// gas irOptimized: 118710
+// gas legacy: 109972
 // gas legacyOptimized: 96331
 // l() -> 2
 // ll(uint256): 1 -> 85
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index dae522e579..8ba57af020 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -21,9 +21,9 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 182534
-// gas legacy: 183811
-// gas legacyOptimized: 179218
+// gas irOptimized: 182362
+// gas legacy: 183445
+// gas legacyOptimized: 178995
 // l() -> 70
 // a(uint256): 69 -> left(69)
 // f() ->
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index d4dafdb73b..8ade9f2ec9 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -24,6 +24,6 @@ contract Main {
 }
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 112757
-// gas legacy: 126596
-// gas legacyOptimized: 113823
+// gas irOptimized: 112147
+// gas legacy: 125140
+// gas legacyOptimized: 113000
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index e2d0ba7ac8..d76260c9ab 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,9 +28,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 449704
-// gas legacy: 729908
-// gas legacyOptimized: 493347
+// gas irOptimized: 442746
+// gas legacy: 711299
+// gas legacyOptimized: 481080
 // h() -> 0x20, 0x40, 0x00, 0
 // ~ emit ev(uint256[],uint256): 0x40, 0x21, 0x02, 0x00, 0x00
 // g() -> 0x20, 0x40, 0, 0x00
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
index 9fc432e8c3..8df2741584 100644
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -10,9 +10,9 @@ contract c {
 // compileToEwasm: false
 // ----
 // (): 1, 2, 3, 4, 5 ->
-// gas irOptimized: 155158
-// gas legacy: 155483
-// gas legacyOptimized: 155303
+// gas irOptimized: 155155
+// gas legacy: 155473
+// gas legacyOptimized: 155299
 // checkIfDataIsEmpty() -> false
 // sendMessage() -> true, 0x40, 0
 // checkIfDataIsEmpty() -> true
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 1d311be806..22287f40e3 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 429680
-// gas legacy: 590683
-// gas legacyOptimized: 448326
+// gas irOptimized: 429076
+// gas legacy: 581281
+// gas legacyOptimized: 444496
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 4e3f92c81c..1c210290ad 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 279069
-// gas legacy: 427192
-// gas legacyOptimized: 296504
+// gas irOptimized: 278448
+// gas legacy: 418282
+// gas legacyOptimized: 291665
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 905114aba7..99260d2efd 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -8,8 +8,8 @@ contract Test {
 }
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 270118
-// gas legacy: 315616
-// gas legacyOptimized: 260686
+// gas irOptimized: 269441
+// gas legacy: 311324
+// gas legacyOptimized: 258351
 // m_x() -> 7
 // m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
index 3f12c4e27b..4f8ebefeaa 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -17,8 +17,8 @@ contract Main {
 }
 // ----
 // constructor(): "abc", true
-// gas irOptimized: 106546
-// gas legacy: 145838
-// gas legacyOptimized: 104017
+// gas irOptimized: 105906
+// gas legacy: 143300
+// gas legacyOptimized: 102961
 // getFlag() -> true
 // getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
index 220db16d56..f9c4a45099 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
@@ -17,4 +17,4 @@ contract C {
 }
 // ----
 // f() -> 16
-// gas legacy: 103488
+// gas legacy: 102040
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index 7daf503d4c..b6242379e7 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -10,9 +10,9 @@ contract C {
 
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 172948
-// gas legacy: 221377
-// gas legacyOptimized: 177671
+// gas irOptimized: 172314
+// gas legacy: 218378
+// gas legacyOptimized: 176195
 // a() -> 1
 // b(uint256): 0 -> 2
 // b(uint256): 1 -> 3
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index bad8902267..c38404df5c 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -17,6 +17,6 @@ contract C {
 }
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 120052
-// gas legacy: 123226
-// gas legacyOptimized: 123092
+// gas irOptimized: 119451
+// gas legacy: 122615
+// gas legacyOptimized: 122484
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
index 4f9984503b..6b1b6704af 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
@@ -15,5 +15,5 @@ contract B is A {
 // compileViaYul: true
 // ----
 // constructor() ->
-// gas irOptimized: 121557
+// gas irOptimized: 120936
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
index 1f10b62778..b60564665d 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
@@ -11,7 +11,7 @@ contract B is A {
 // compileToEwasm: also
 // ----
 // constructor() ->
-// gas irOptimized: 121557
-// gas legacy: 135046
-// gas legacyOptimized: 116176
+// gas irOptimized: 120936
+// gas legacy: 133594
+// gas legacyOptimized: 115341
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index 5304a9b1bd..13bdb625bf 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -9,7 +9,7 @@ contract C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 103531
-// gas legacy: 117158
+// gas irOptimized: 102902
+// gas legacy: 115678
 // i() -> 2
 // k() -> 0
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index 8580d21506..fc2dd8f715 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -21,9 +21,9 @@ contract D is B, C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 154331
-// gas legacy: 170115
-// gas legacyOptimized: 145429
+// gas irOptimized: 153694
+// gas legacy: 168623
+// gas legacyOptimized: 144577
 // i() -> 2
 // j() -> 2
 // k() -> 1
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index d34fb896c6..a0b4c772d6 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -12,8 +12,8 @@ contract D is C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 123966
-// gas legacy: 138700
-// gas legacyOptimized: 119400
+// gas irOptimized: 123317
+// gas legacy: 137193
+// gas legacyOptimized: 118548
 // i() -> 2
 // k() -> 1
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index f9f06134fe..057496c6dd 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
@@ -13,6 +13,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 113511
-// gas legacy: 116381
-// gas legacyOptimized: 114425
+// gas irOptimized: 113510
+// gas legacy: 116314
+// gas legacyOptimized: 114407
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
index a2862d6897..5c5138742a 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
@@ -14,6 +14,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 113511
-// gas legacy: 116381
-// gas legacyOptimized: 114425
+// gas irOptimized: 113510
+// gas legacy: 116314
+// gas legacyOptimized: 114407
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
index 442a5299ad..7b9a9400be 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
@@ -15,6 +15,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
-// gas irOptimized: 185118
-// gas legacy: 187603
-// gas legacyOptimized: 184566
+// gas irOptimized: 185095
+// gas legacy: 187495
+// gas legacyOptimized: 184534
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index aa5074fa2a..8659129a8c 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -15,8 +15,8 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 166854
-// gas legacy: 250376
-// gas legacyOptimized: 174522
+// gas irOptimized: 165390
+// gas legacy: 244780
+// gas legacyOptimized: 171605
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Deposit(address,bytes32,uint256) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: #0xc06afe3a8444fc0004668591e8306bfb9968e79e, #0x1234, 0x00
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index aeaf20c75b..a6283f274e 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -17,6 +17,6 @@ contract C {
 // ----
 // deposit() ->
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
-// gas irOptimized: 332396
-// gas legacy: 388679
-// gas legacyOptimized: 374441
+// gas irOptimized: 332157
+// gas legacy: 387608
+// gas legacyOptimized: 373772
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index d281d6f273..f2ee4894f1 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -74,9 +74,9 @@ contract FixedFeeRegistrar is Registrar {
 }
 // ----
 // constructor()
-// gas irOptimized: 415761
-// gas legacy: 933867
-// gas legacyOptimized: 487352
+// gas irOptimized: 413501
+// gas legacy: 913421
+// gas legacyOptimized: 476928
 // reserve(string), 69 ether: 0x20, 3, "abc" ->
 // ~ emit Changed(string): #0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
 // gas irOptimized: 45967
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index 37be5e14d0..328b55ec99 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,9 +33,9 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 414909
-// gas legacy: 750723
-// gas legacyOptimized: 536620
+// gas irOptimized: 409367
+// gas legacy: 737652
+// gas legacyOptimized: 526820
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
 // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
 // encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
@@ -51,10 +51,10 @@ contract test {
 // encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
 // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
 // encode_inline_asm_large()
-// gas irOptimized: 1374039
-// gas legacy: 1688033
-// gas legacyOptimized: 1205033
+// gas irOptimized: 1373038
+// gas legacy: 1672031
+// gas legacyOptimized: 1199031
 // encode_no_asm_large()
-// gas irOptimized: 3291100
-// gas legacy: 4765077
-// gas legacyOptimized: 2908077
+// gas irOptimized: 3276098
+// gas legacy: 4705075
+// gas legacyOptimized: 2890075
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 48f7247a66..38bb477593 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,35 +176,35 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 1419712
-// gas legacy: 2427905
-// gas legacyOptimized: 1773081
+// gas irOptimized: 1415659
+// gas legacy: 2391952
+// gas legacyOptimized: 1752320
 // supportsInterface(bytes4): 0x0 -> 0
 // supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 117398
-// gas legacy: 152660
-// gas legacyOptimized: 124659
+// gas irOptimized: 117264
+// gas legacy: 151981
+// gas legacyOptimized: 124447
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 117398
-// gas legacy: 152660
-// gas legacyOptimized: 124659
+// gas irOptimized: 117264
+// gas legacy: 151981
+// gas legacyOptimized: 124447
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 117383
-// gas legacy: 152670
-// gas legacyOptimized: 124672
+// gas irOptimized: 117249
+// gas legacy: 151990
+// gas legacyOptimized: 124459
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 117383
-// gas legacy: 152670
-// gas legacyOptimized: 124672
+// gas irOptimized: 117249
+// gas legacy: 151990
+// gas legacyOptimized: 124459
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index bf257815af..7860560f62 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -48,9 +48,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1876171
-// gas legacy: 2471603
-// gas legacyOptimized: 1876669
+// gas irOptimized: 1870040
+// gas legacy: 2430726
+// gas legacyOptimized: 1854979
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
 // gas irOptimized: 22137
 // gas legacy: 22767
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 5cea75abec..6cda4f1e98 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,9 +48,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1735588
-// gas legacy: 2241243
-// gas legacyOptimized: 1748028
+// gas irOptimized: 1731900
+// gas legacy: 2210160
+// gas legacyOptimized: 1734152
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
 // gas irOptimized: 22004
 // gas legacy: 22497
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index b4b7054a4f..b3ba449644 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -33,10 +33,10 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 430305
-// gas legacy: 649335
-// gas legacyOptimized: 473132
+// gas irOptimized: 424583
+// gas legacy: 631753
+// gas legacyOptimized: 459425
 // prb_pi() -> 3141592656369545286
 // gas irOptimized: 57478
-// gas legacy: 103112
+// gas legacy: 101655
 // gas legacyOptimized: 75735
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index bb76542111..254befe014 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -294,11 +294,11 @@ contract Test {
 // f() -> true
 // g() -> true
 // pair() -> true
-// gas irOptimized: 269938
-// gas legacy: 275952
-// gas legacyOptimized: 267239
+// gas irOptimized: 269918
+// gas legacy: 275678
+// gas legacyOptimized: 267193
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 783501
-// gas legacy: 805423
-// gas legacyOptimized: 772571
+// gas irOptimized: 783371
+// gas legacy: 804346
+// gas legacyOptimized: 772349
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index a134fe86ab..c2ad61557d 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,9 +49,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 642624
-// gas legacy: 1096108
-// gas legacyOptimized: 741962
+// gas irOptimized: 636074
+// gas legacy: 1065857
+// gas legacyOptimized: 725207
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
 // gas irOptimized: 22660
 // gas legacy: 23190
@@ -69,6 +69,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 1989966
-// gas legacy: 4294552
-// gas legacyOptimized: 2327981
+// gas irOptimized: 1981693
+// gas legacy: 4235651
+// gas legacyOptimized: 2319622
diff --git a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
index 6daaa5407e..c98c4e312d 100644
--- a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
@@ -13,4 +13,4 @@ contract D {
 }
 // ----
 // f() -> 2
-// gas legacy: 101626
+// gas legacy: 100201
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
index b6c33fd07d..6ae5af9ff0 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
@@ -11,4 +11,4 @@ contract D {
 }
 // ----
 // f() -> 2
-// gas legacy: 101599
+// gas legacy: 100175
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index c6a556a19f..9c9d52fd29 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -15,7 +15,7 @@ contract D {
 }
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 195258
-// gas legacy: 245842
-// gas legacyOptimized: 195676
+// gas irOptimized: 193985
+// gas legacy: 241212
+// gas legacyOptimized: 192949
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index 0c81a0bae8..0255dd9bf9 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -17,7 +17,7 @@ contract D {
 // EVMVersion: >=constantinople
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 195421
-// gas legacy: 246202
-// gas legacyOptimized: 195914
+// gas irOptimized: 194148
+// gas legacy: 241584
+// gas legacyOptimized: 193181
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index d0c3c4d805..e8efe09fad 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -23,9 +23,9 @@ contract C {
 
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 266135
-// gas legacy: 454729
-// gas legacyOptimized: 301679
+// gas irOptimized: 265110
+// gas legacy: 441442
+// gas legacyOptimized: 292862
 // f(uint256): 0 -> FAILURE
 // f(uint256): 1 -> FAILURE
 // f(uint256): 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index f004d94723..8fe807e638 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -26,9 +26,9 @@ contract C {
 // revertStrings: debug
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 391081
-// gas legacy: 823681
-// gas legacyOptimized: 505900
+// gas irOptimized: 390464
+// gas legacy: 809985
+// gas legacyOptimized: 498331
 // f(uint256): 0 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
 // f(uint256): 1 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
 // f(uint256): 2 -> FAILURE, hex"08c379a0", 0x20, 37, "Target contract does not contain", " code"
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index aacaa0e0aa..ffe7a7f377 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -17,17 +17,17 @@ contract C {
 // EVMVersion: >=byzantium
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 179697
-// gas legacy: 294335
-// gas legacyOptimized: 173427
+// gas irOptimized: 177446
+// gas legacy: 285547
+// gas legacyOptimized: 168515
 // f(uint256): 20 -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
 // x() -> 1
 // f(uint256): 20 -> FAILURE
 // x() -> 1
 // stack(uint256): 1023 -> FAILURE
-// gas irOptimized: 260987
-// gas legacy: 483942
-// gas legacyOptimized: 302349
+// gas irOptimized: 259624
+// gas legacy: 477722
+// gas legacyOptimized: 299567
 // x() -> 1
 // stack(uint256): 10 -> 0x87948bd7ebbe13a00bfd930c93e4828ab18e3908
 // x() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 977f1a56a4..646536de67 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -39,9 +39,9 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 261698
-// gas legacy: 402654
-// gas legacyOptimized: 274470
+// gas irOptimized: 260040
+// gas legacy: 391566
+// gas legacyOptimized: 268079
 // sendAmount(uint256): 5 -> 5
 // outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway #
 // checkState() -> false, 15
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 48365a61ac..c4ff3c58cb 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -38,9 +38,9 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 261698
-// gas legacy: 402654
-// gas legacyOptimized: 274470
+// gas irOptimized: 260040
+// gas legacy: 391566
+// gas legacyOptimized: 268079
 // sendAmount(uint256): 5 -> 5
 // outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway #
 // checkState() -> false, 15
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index 99ca5e3f7e..bb2221f2c3 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -18,9 +18,9 @@ contract test {
 }
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
-// gas irOptimized: 111669
-// gas legacy: 113806
-// gas legacyOptimized: 111781
+// gas irOptimized: 111668
+// gas legacy: 113748
+// gas legacyOptimized: 111772
 // get(uint8): 1 -> 21, 22, 42, 43
 // set(uint8,uint8,uint8,uint8,uint8): 1, 10, 30, 11, 31 -> 21, 22, 42, 43
 // get(uint8): 1 -> 10, 30, 11, 31
diff --git a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
index 1a120bebad..b78951c41a 100644
--- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
+++ b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
@@ -19,6 +19,6 @@ contract Main {
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 100264
-// gas legacy: 116691
+// gas legacy: 113411
 // gas legacyOptimized: 100361
 // s() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index ba8b65bbc7..43b49c4222 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -27,5 +27,5 @@ contract C {
 // ----
 // t() -> 9
 // gas irOptimized: 99064
-// gas legacy: 152137
-// gas legacyOptimized: 107793
+// gas legacy: 149071
+// gas legacyOptimized: 106176
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index 88f3ed5eb7..89dcd75050 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -27,8 +27,8 @@ contract C {
 }
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 126044
-// gas legacy: 151334
-// gas legacyOptimized: 125166
+// gas irOptimized: 124829
+// gas legacy: 148500
+// gas legacyOptimized: 123951
 // x() -> 7
 // y() -> 5
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index 364ac525e3..ff10c13aa2 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -15,8 +15,8 @@ contract C {
 }
 // ----
 // constructor(): 3 ->
-// gas irOptimized: 125477
-// gas legacy: 202011
-// gas legacyOptimized: 139552
+// gas irOptimized: 124838
+// gas legacy: 197645
+// gas legacyOptimized: 137678
 // f() -> 84, 23
 // m(uint256): 3 -> 7
diff --git a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
index fac3a61ad2..157b7e10f6 100644
--- a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
+++ b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
@@ -22,7 +22,7 @@ contract D {
 // ----
 // f() -> 1
 // gas irOptimized: 77051
-// gas legacy: 114884
+// gas legacy: 112260
 // g() -> 5
 // gas irOptimized: 77106
-// gas legacy: 115430
+// gas legacy: 112796
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
index cfa124c257..fbe519849c 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
@@ -24,4 +24,4 @@ contract B {
 // ----
 // g() -> 42
 // gas irOptimized: 80813
-// gas legacy: 125481
+// gas legacy: 122447
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index 388a4de42e..426cf7b196 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -23,6 +23,6 @@ contract B {
 
 // ----
 // g() -> 42
-// gas irOptimized: 100874
-// gas legacy: 185053
-// gas legacyOptimized: 114598
+// gas irOptimized: 100266
+// gas legacy: 180398
+// gas legacyOptimized: 112576
diff --git a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
index 44cbb1e141..c057164d0d 100644
--- a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
+++ b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
@@ -20,6 +20,6 @@ contract A {
 
 // ----
 // g(int256): -1 -> -1
-// gas legacy: 103494
+// gas legacy: 102064
 // g(int256): 10 -> 10
-// gas legacy: 103122
+// gas legacy: 101692
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index 8917ad68e0..f905856c50 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -40,9 +40,9 @@ contract Main {
 
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 268544
-// gas legacy: 402045
-// gas legacyOptimized: 266772
+// gas irOptimized: 266864
+// gas legacy: 392744
+// gas legacyOptimized: 261611
 // getFlag() -> true
 // getName() -> "abc"
 // getBalances() -> 12, 10
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 5013ef4ced..1746fd0db6 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -16,9 +16,9 @@ contract ClientReceipt {
 }
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 173106
-// gas legacy: 235195
-// gas legacyOptimized: 176766
+// gas irOptimized: 171859
+// gas legacy: 230026
+// gas legacyOptimized: 173877
 // balance -> 1500
 // gas irOptimized: 191881
 // gas legacy: 235167
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index 9caaa89b98..7b4e05b72e 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -24,6 +24,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 4, 0x11
-// gas irOptimized: 112281
-// gas legacy: 135820
-// gas legacyOptimized: 119448
+// gas irOptimized: 112209
+// gas legacy: 135413
+// gas legacyOptimized: 119325
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index f4f9405b6c..41c700976c 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -21,6 +21,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 119659
-// gas legacy: 124793
-// gas legacyOptimized: 119694
+// gas irOptimized: 119654
+// gas legacy: 124674
+// gas legacyOptimized: 119669
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
index 80e831a4cb..3ac843eeda 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
@@ -19,6 +19,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 120270
-// gas legacy: 125245
-// gas legacyOptimized: 120153
+// gas irOptimized: 120265
+// gas legacy: 125109
+// gas legacyOptimized: 120128
diff --git a/test/libsolidity/semanticTests/libraries/using_library_structs.sol b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
index 888c9c0486..465dcebb17 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_structs.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
@@ -23,4 +23,4 @@ contract Test {
 // library: Lib
 // f() -> 7, 8
 // gas irOptimized: 101818
-// gas legacy: 101504
+// gas legacy: 101429
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
index 0f95d2cda7..85de20f70e 100644
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
@@ -52,10 +52,10 @@ contract C {
 }
 // ----
 // testMul(int32,int32): 42, 10 -> 420
-// gas irOptimized: 103347
-// gas legacy: 188203
-// gas legacyOptimized: 126164
+// gas irOptimized: 102545
+// gas legacy: 183939
+// gas legacyOptimized: 123539
 // testInc(int32): 42 -> 43
-// gas irOptimized: 103173
-// gas legacy: 187452
-// gas legacyOptimized: 125851
+// gas irOptimized: 102368
+// gas legacy: 183197
+// gas legacyOptimized: 123227
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
index 1d51576e81..904a1cdf8e 100644
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
@@ -58,10 +58,10 @@ contract C {
 }
 // ----
 // testMul(int32,int32): 42, 10 -> 420
-// gas irOptimized: 103347
-// gas legacy: 188203
-// gas legacyOptimized: 126164
+// gas irOptimized: 102545
+// gas legacy: 183939
+// gas legacyOptimized: 123539
 // testInc(int32): 42 -> 43
-// gas irOptimized: 103173
-// gas legacy: 187452
-// gas legacyOptimized: 125851
+// gas irOptimized: 102368
+// gas legacy: 183197
+// gas legacyOptimized: 123227
diff --git a/test/libsolidity/semanticTests/salted_create/prediction_example.sol b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
index 1b138bdbb3..7116407b64 100644
--- a/test/libsolidity/semanticTests/salted_create/prediction_example.sol
+++ b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: also
 // ----
 // createDSalted(bytes32,uint256): 42, 64 ->
-// gas legacy: 104365
+// gas legacy: 102921
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create.sol b/test/libsolidity/semanticTests/salted_create/salted_create.sol
index 80869b5aac..f241cc2da8 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create.sol
@@ -21,6 +21,6 @@ contract A {
 // ----
 // different_salt() -> true
 // same_salt() -> true
-// gas irOptimized: 98438900
-// gas legacy: 98439116
-// gas legacyOptimized: 98438970
+// gas irOptimized: 98438897
+// gas legacy: 98439109
+// gas legacyOptimized: 98438966
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index d51b99b59a..514b424f6c 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -21,6 +21,6 @@ contract A {
 // EVMVersion: >=constantinople
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 255997
-// gas legacy: 387712
-// gas legacyOptimized: 283266
+// gas irOptimized: 254190
+// gas legacy: 380967
+// gas legacyOptimized: 279640
diff --git a/test/libsolidity/semanticTests/smoke/alignment.sol b/test/libsolidity/semanticTests/smoke/alignment.sol
index bdf2ed446f..0b603d97e6 100644
--- a/test/libsolidity/semanticTests/smoke/alignment.sol
+++ b/test/libsolidity/semanticTests/smoke/alignment.sol
@@ -25,5 +25,5 @@ contract D {
 // stateDecimal() -> right(42)
 // stateBytes() -> left(0x4200ef)
 // internalStateDecimal() -> 0x20
-// gas legacy: 101679
+// gas legacy: 100255
 // update(bool,uint256,bytes32): false, -23, left(0x2300ef) -> false, -23, left(0x2300ef)
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index b834f8018a..eb1d73a448 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -12,9 +12,9 @@ contract C {
 }
 // ----
 // constructor(), 2 wei: 3 ->
-// gas irOptimized: 107003
-// gas legacy: 151416
-// gas legacyOptimized: 108388
+// gas irOptimized: 106374
+// gas legacy: 148308
+// gas legacyOptimized: 106727
 // state() -> 3
 // balance() -> 2
 // balance -> 2
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
index f6830a202f..62138a9b28 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -12,9 +12,9 @@ contract C {
 }
 // ----
 // constructor()
-// gas irOptimized: 110504
-// gas legacy: 155081
-// gas legacyOptimized: 107997
+// gas irOptimized: 109878
+// gas legacy: 152179
+// gas legacyOptimized: 106750
 // genesisHash() -> 0x3737373737373737373737373737373737373737373737373737373737373737
 // currentHash() -> 0
 // f(uint256): 0 -> 0x3737373737373737373737373737373737373737373737373737373737373737
diff --git a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
index 7341b85c6b..20755a0694 100644
--- a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
+++ b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
@@ -22,9 +22,9 @@ contract Test {
 // set(bytes): 0x20, 0
 // storageEmpty -> 1
 // set(bytes): 0x20, 66, "12345678901234567890123456789012", "12345678901234567890123456789012", "12"
-// gas irOptimized: 111897
-// gas legacy: 112756
-// gas legacyOptimized: 112116
+// gas irOptimized: 111895
+// gas legacy: 112734
+// gas legacyOptimized: 112110
 // storageEmpty -> 0
 // set(bytes): 0x20, 3, "abc"
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
index a2f7ba1d8d..a3131d564f 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
@@ -45,6 +45,6 @@ contract C {
 // compileToEwasm: also
 // ----
 // test() -> true
-// gas irOptimized: 132506
-// gas legacy: 136036
-// gas legacyOptimized: 133480
+// gas irOptimized: 132505
+// gas legacy: 136009
+// gas legacyOptimized: 133478
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
index 1f69871992..0bcc74b6ba 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
@@ -16,6 +16,6 @@ contract C {
 }
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
-// gas irOptimized: 202838
-// gas legacy: 207487
-// gas legacyOptimized: 203611
+// gas irOptimized: 202829
+// gas legacy: 207384
+// gas legacyOptimized: 203584
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
index 3d062fc95a..52ad00649b 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
@@ -23,6 +23,6 @@ contract CopyTest {
 }
 // ----
 // run() -> 2, 23, 42
-// gas irOptimized: 193756
-// gas legacy: 186016
-// gas legacyOptimized: 184668
+// gas irOptimized: 193687
+// gas legacy: 185731
+// gas legacyOptimized: 184458
diff --git a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
index 5057b0efab..9aa41a3425 100644
--- a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
@@ -37,8 +37,8 @@ contract C {
 
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121513
-// gas legacy: 123120
-// gas legacyOptimized: 121776
+// gas irOptimized: 121497
+// gas legacy: 123069
+// gas legacyOptimized: 121758
 // to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
index ba890a4ae0..aed54f98b6 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
@@ -87,9 +87,9 @@ contract Test {
 // EVMVersion: >homestead
 // ----
 // test1() -> true
-// gas irOptimized: 152963
-// gas legacy: 153066
-// gas legacyOptimized: 152675
+// gas irOptimized: 152954
+// gas legacy: 153012
+// gas legacyOptimized: 152637
 // test2() -> true
 // test3() -> true
 // test4() -> true
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
index e91fa839e7..29618bb044 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
@@ -45,8 +45,8 @@ contract C {
 
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121616
-// gas legacy: 123263
-// gas legacyOptimized: 121785
+// gas irOptimized: 121598
+// gas legacy: 123208
+// gas legacyOptimized: 121765
 // to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
index aecde10dce..ec989b508e 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
@@ -53,14 +53,14 @@ contract C {
 
 // ----
 // from_memory() -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 123041
-// gas legacy: 130289
-// gas legacyOptimized: 128785
+// gas irOptimized: 123029
+// gas legacy: 130227
+// gas legacyOptimized: 128762
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121737
-// gas legacy: 123341
-// gas legacyOptimized: 121892
+// gas irOptimized: 121721
+// gas legacy: 123282
+// gas legacyOptimized: 121870
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115127
-// gas legacy: 122579
-// gas legacyOptimized: 120829
+// gas irOptimized: 115116
+// gas legacy: 122516
+// gas legacyOptimized: 120806
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
index e575fb8f13..e5c02001fe 100644
--- a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
@@ -46,18 +46,18 @@ contract C {
 
 // ----
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121709
-// gas legacy: 123198
-// gas legacyOptimized: 121830
+// gas irOptimized: 121693
+// gas legacy: 123144
+// gas legacyOptimized: 121811
 // from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121753
-// gas legacy: 123247
-// gas legacyOptimized: 121882
+// gas irOptimized: 121737
+// gas legacy: 123193
+// gas legacyOptimized: 121863
 // from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 122954
-// gas legacy: 130146
-// gas legacyOptimized: 128779
+// gas irOptimized: 122942
+// gas legacy: 130088
+// gas legacyOptimized: 128757
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 21, 3, 0x666f6f0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115067
-// gas legacy: 118383
-// gas legacyOptimized: 115458
+// gas irOptimized: 115056
+// gas legacy: 118301
+// gas legacyOptimized: 115435
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
index 9d157d70eb..12b514a23c 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
@@ -68,7 +68,7 @@ contract Test {
 // compileToEwasm: also
 // ----
 // load() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
-// gas irOptimized: 110327
-// gas legacy: 112999
-// gas legacyOptimized: 110881
+// gas irOptimized: 110326
+// gas legacy: 112964
+// gas legacyOptimized: 110876
 // store() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index 48a4f08e01..4a64f08136 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -23,17 +23,17 @@ contract c {
 // ----
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133599
-// gas legacy: 134654
-// gas legacyOptimized: 133882
+// gas irOptimized: 133596
+// gas legacy: 134628
+// gas legacyOptimized: 133875
 // test(uint256): 32 -> "3"
 // storageEmpty -> 0
 // copy() -> true
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133599
-// gas legacy: 134654
-// gas legacyOptimized: 133882
+// gas irOptimized: 133596
+// gas legacy: 134628
+// gas legacyOptimized: 133875
 // storageEmpty -> 0
 // del() -> true
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index e5960ce1ed..956416a967 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -36,14 +36,14 @@ contract c {
 
 // ----
 // set(uint256): 7 -> true
-// gas irOptimized: 109897
-// gas legacy: 110616
-// gas legacyOptimized: 110006
+// gas irOptimized: 109896
+// gas legacy: 110597
+// gas legacyOptimized: 110003
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // copy(uint256,uint256): 7, 8 -> true
-// gas irOptimized: 118594
-// gas legacy: 119166
-// gas legacyOptimized: 118622
+// gas irOptimized: 118593
+// gas legacy: 119147
+// gas legacyOptimized: 118619
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // retrieve(uint256): 8 -> 1, 3, 4, 2
 // copy(uint256,uint256): 0, 7 -> true
diff --git a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
index d33b8fd02f..53d1ca93a9 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
@@ -20,6 +20,6 @@ contract c {
 // compileToEwasm: also
 // ----
 // test() -> true
-// gas irOptimized: 109714
-// gas legacy: 110627
-// gas legacyOptimized: 109706
+// gas irOptimized: 109713
+// gas legacy: 110615
+// gas legacyOptimized: 109705
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index d2300d4937..7ec85c929d 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -42,10 +42,10 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 113246
-// gas legacy: 113626
-// gas legacyOptimized: 113120
+// gas irOptimized: 113232
+// gas legacy: 113591
+// gas legacyOptimized: 113103
 // g() ->
-// gas irOptimized: 118618
-// gas legacy: 118806
-// gas legacyOptimized: 118192
+// gas irOptimized: 118604
+// gas legacy: 118764
+// gas legacyOptimized: 118172
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
index e2821a5a6b..46094d3766 100644
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
+++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
@@ -31,6 +31,6 @@ contract C {
 // compileToEwasm: also
 // ----
 // f() -> 42, 23, 34, 42, 42
-// gas irOptimized: 110389
-// gas legacy: 112021
-// gas legacyOptimized: 110548
+// gas irOptimized: 110388
+// gas legacy: 111993
+// gas legacyOptimized: 110546
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index ada5534ca5..61456cd7e3 100644
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ b/test/libsolidity/semanticTests/structs/structs.sol
@@ -30,7 +30,7 @@ contract test {
 // ----
 // check() -> false
 // set() ->
-// gas irOptimized: 134436
-// gas legacy: 135277
-// gas legacyOptimized: 134064
+// gas irOptimized: 134435
+// gas legacy: 135246
+// gas legacyOptimized: 134062
 // check() -> true
diff --git a/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol b/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
index 4315095ac8..daf5d000c8 100644
--- a/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
+++ b/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
@@ -30,6 +30,6 @@ contract C {
 
 // ----
 // f() -> 0x20, 7, 8, 9, 0xa0, 13, 2, 0x40, 0xa0, 2, 3, 4, 2, 3, 4
-// gas irOptimized: 197113
-// gas legacy: 199986
-// gas legacyOptimized: 196847
+// gas irOptimized: 197082
+// gas legacy: 199891
+// gas legacyOptimized: 196817
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index b2acbb01f6..1e58c9b037 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -49,13 +49,13 @@ contract C {
 }
 // ----
 // test_f() -> true
-// gas irOptimized: 122510
-// gas legacy: 126150
-// gas legacyOptimized: 123163
+// gas irOptimized: 122489
+// gas legacy: 126030
+// gas legacyOptimized: 123120
 // test_g() -> true
-// gas irOptimized: 106903
-// gas legacy: 112481
-// gas legacyOptimized: 107706
+// gas irOptimized: 106871
+// gas legacy: 112300
+// gas legacyOptimized: 107649
 // addresses(uint256): 0 -> 0x18
 // addresses(uint256): 1 -> 0x19
 // addresses(uint256): 3 -> 0x1b
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index 64724983a1..31e754a9b7 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -113,9 +113,9 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 362054
-// gas legacy: 852825
-// gas legacyOptimized: 418837
+// gas irOptimized: 360201
+// gas legacy: 834932
+// gas legacyOptimized: 412648
 // totalSupply() -> 20
 // gas irOptimized: 23415
 // gas legacy: 23653
diff --git a/test/libsolidity/semanticTests/using/using_global_invisible.sol b/test/libsolidity/semanticTests/using/using_global_invisible.sol
index 8db7a9a05d..296370a7f4 100644
--- a/test/libsolidity/semanticTests/using/using_global_invisible.sol
+++ b/test/libsolidity/semanticTests/using/using_global_invisible.sol
@@ -40,4 +40,4 @@ contract D {
 // ----
 // library: "A":L
 // test() -> 3
-// gas legacy: 123521
+// gas legacy: 120859
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 8dcdd13e7c..b944100b96 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -16,9 +16,9 @@ contract C {
 // compileToEwasm: also
 // ----
 // constructor() ->
-// gas irOptimized: 175791
-// gas legacy: 247263
-// gas legacyOptimized: 155977
+// gas irOptimized: 175145
+// gas legacy: 241796
+// gas legacyOptimized: 153411
 // initCode() -> 0x20, 0
 // f() -> true
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/various/code_access_content.sol b/test/libsolidity/semanticTests/various/code_access_content.sol
index 5ed7db5a37..9ce796ad00 100644
--- a/test/libsolidity/semanticTests/various/code_access_content.sol
+++ b/test/libsolidity/semanticTests/various/code_access_content.sol
@@ -38,6 +38,6 @@ contract C {
 }
 // ----
 // testRuntime() -> true
-// gas legacy: 101579
+// gas legacy: 100165
 // testCreation() -> true
-// gas legacy: 102009
+// gas legacy: 100588
diff --git a/test/libsolidity/semanticTests/various/code_access_create.sol b/test/libsolidity/semanticTests/various/code_access_create.sol
index ae38256519..d6c4f9802b 100644
--- a/test/libsolidity/semanticTests/various/code_access_create.sol
+++ b/test/libsolidity/semanticTests/various/code_access_create.sol
@@ -24,4 +24,4 @@ contract C {
 
 // ----
 // test() -> 7
-// gas legacy: 102264
+// gas legacy: 100839
diff --git a/test/libsolidity/semanticTests/various/code_access_runtime.sol b/test/libsolidity/semanticTests/various/code_access_runtime.sol
index 588ed3ac52..701218ae6e 100644
--- a/test/libsolidity/semanticTests/various/code_access_runtime.sol
+++ b/test/libsolidity/semanticTests/various/code_access_runtime.sol
@@ -24,4 +24,4 @@ contract C {
 // EVMVersion: >=constantinople
 // ----
 // test() -> 42
-// gas legacy: 101638
+// gas legacy: 100225
diff --git a/test/libsolidity/semanticTests/various/code_length.sol b/test/libsolidity/semanticTests/various/code_length.sol
index 0e17ae2a29..84fd393bd7 100644
--- a/test/libsolidity/semanticTests/various/code_length.sol
+++ b/test/libsolidity/semanticTests/various/code_length.sol
@@ -61,5 +61,5 @@ contract C {
 // compileToEwasm: also
 // ----
 // constructor()
-// gas legacy: 126455
+// gas legacy: 124168
 // f(): true, true -> true, true
diff --git a/test/libsolidity/semanticTests/various/create_calldata.sol b/test/libsolidity/semanticTests/various/create_calldata.sol
index c67e8434a3..fc4e885ff1 100644
--- a/test/libsolidity/semanticTests/various/create_calldata.sol
+++ b/test/libsolidity/semanticTests/various/create_calldata.sol
@@ -8,7 +8,7 @@ contract C {
 }
 // ----
 // constructor(): 42 ->
-// gas irOptimized: 147541
-// gas legacy: 177488
-// gas legacyOptimized: 140089
+// gas irOptimized: 146699
+// gas legacy: 173845
+// gas legacyOptimized: 137736
 // s() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 59b468fce2..e2c8c52638 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -34,6 +34,6 @@ contract C {
 
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 241872
-// gas legacy: 243341
-// gas legacyOptimized: 242454
+// gas irOptimized: 241853
+// gas legacy: 243284
+// gas legacyOptimized: 242421
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index 236ebbce56..47f4005e38 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -96,9 +96,9 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 357746
-// gas legacy: 824737
-// gas legacyOptimized: 414462
+// gas irOptimized: 355485
+// gas legacy: 807683
+// gas legacyOptimized: 408718
 // totalSupply() -> 20
 // gas irOptimized: 23415
 // gas legacy: 23524
diff --git a/test/libsolidity/semanticTests/various/external_types_in_calls.sol b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
index 55c201513c..8b88d03bc1 100644
--- a/test/libsolidity/semanticTests/various/external_types_in_calls.sol
+++ b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
@@ -25,5 +25,5 @@ contract C {
 
 // ----
 // test() -> 9, 7
-// gas legacy: 129760
+// gas legacy: 127478
 // t2() -> 9
diff --git a/test/libsolidity/semanticTests/various/negative_stack_height.sol b/test/libsolidity/semanticTests/various/negative_stack_height.sol
index 52fce16f51..92b6b5650c 100644
--- a/test/libsolidity/semanticTests/various/negative_stack_height.sol
+++ b/test/libsolidity/semanticTests/various/negative_stack_height.sol
@@ -65,5 +65,5 @@ contract C {
 // compileViaYul: false
 // ----
 // constructor() ->
-// gas legacy: 588138
-// gas legacyOptimized: 349636
+// gas legacy: 575272
+// gas legacyOptimized: 346970
diff --git a/test/libsolidity/semanticTests/various/selfdestruct.sol b/test/libsolidity/semanticTests/various/selfdestruct.sol
index b823bd14db..081f3ef335 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct.sol
@@ -30,9 +30,9 @@ contract D {
 }
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 188203
-// gas legacy: 261114
-// gas legacyOptimized: 181602
+// gas irOptimized: 186962
+// gas legacy: 255963
+// gas legacyOptimized: 178911
 // c() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
 // balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 1000000000000000000
 // balance -> 0
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 8241ec554d..892149b3b3 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -17,7 +17,7 @@ contract D {
 
 // ----
 // constructor(), 27 wei ->
-// gas irOptimized: 170627
-// gas legacy: 222977
-// gas legacyOptimized: 169779
+// gas irOptimized: 169371
+// gas legacy: 218447
+// gas legacyOptimized: 167286
 // f() -> 27
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index cd34a419dd..ec94f73a1f 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -20,6 +20,6 @@ contract C {
 
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178549
-// gas legacy: 180893
-// gas legacyOptimized: 179394
+// gas irOptimized: 178542
+// gas legacy: 180839
+// gas legacyOptimized: 179375
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index 413e129ef7..e84dac23f1 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -35,12 +35,12 @@ contract D {
 // EVMVersion: >=byzantium
 // ----
 // f() -> 0x1 # This should work, next should throw #
-// gas legacy: 103716
+// gas legacy: 102085
 // fview() -> FAILURE
-// gas irOptimized: 98438605
-// gas legacy: 98438801
-// gas legacyOptimized: 98438594
+// gas irOptimized: 98438596
+// gas legacy: 98438774
+// gas legacyOptimized: 98438580
 // fpure() -> FAILURE
-// gas irOptimized: 98438605
-// gas legacy: 98438801
-// gas legacyOptimized: 98438595
+// gas irOptimized: 98438596
+// gas legacy: 98438774
+// gas legacyOptimized: 98438580
diff --git a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
index 129a78931f..a21065bf72 100644
--- a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
@@ -29,9 +29,9 @@ contract c {
 // x() -> 0, 0
 // y() -> 0, 0
 // set() ->
-// gas irOptimized: 109691
-// gas legacy: 109732
-// gas legacyOptimized: 109682
+// gas irOptimized: 109690
+// gas legacy: 109728
+// gas legacyOptimized: 109680
 // x() -> 1, 2
 // y() -> 3, 4
 // swap() ->
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 6f57e9e322..cd7243a13c 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -20,7 +20,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 176003
-// gas legacy: 257656
-// gas legacyOptimized: 183070
+// gas irOptimized: 174345
+// gas legacy: 252286
+// gas legacyOptimized: 180346
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 8aba90d964..7fb6d50210 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -19,7 +19,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 176867
-// gas legacy: 259378
-// gas legacyOptimized: 183682
+// gas irOptimized: 175209
+// gas legacy: 253810
+// gas legacyOptimized: 180778
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index 502e4bde17..4b8f599a8f 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -21,6 +21,6 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 113019
-// gas legacy: 112931
-// gas legacyOptimized: 112602
+// gas irOptimized: 113010
+// gas legacy: 112890
+// gas legacyOptimized: 112580
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
index 73042b18b6..257893ad5f 100644
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ b/test/libyul/EVMCodeTransformTest.cpp
@@ -41,7 +41,7 @@ using namespace solidity::frontend::test;
 using namespace std;
 
 EVMCodeTransformTest::EVMCodeTransformTest(string const& _filename):
-	TestCase(_filename)
+	EVMVersionRestrictedTestCase(_filename)
 {
 	m_source = m_reader.source();
 	m_stackOpt = m_reader.boolSetting("stackOptimization", false);
diff --git a/test/libyul/EVMCodeTransformTest.h b/test/libyul/EVMCodeTransformTest.h
index f1ae73f742..9926d43a90 100644
--- a/test/libyul/EVMCodeTransformTest.h
+++ b/test/libyul/EVMCodeTransformTest.h
@@ -23,7 +23,7 @@
 namespace solidity::yul::test
 {
 
-class EVMCodeTransformTest: public solidity::frontend::test::TestCase
+class EVMCodeTransformTest: public solidity::frontend::test::EVMVersionRestrictedTestCase
 {
 public:
 	static std::unique_ptr<TestCase> create(Config const& _config)
diff --git a/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul b/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul
index 385c253df5..b5cc611879 100644
--- a/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul
+++ b/test/libyul/evmCodeTransform/stackReuse/function_argument_reuse_without_retparams.yul
@@ -6,6 +6,7 @@
 }
 // ====
 // stackOptimization: true
+// EVMVersion: >=shanghai
 // ----
 //     /* "":0:88   */
 //   stop
@@ -33,5 +34,5 @@
 //   dup1
 //   sstore
 //     /* "":66:82   */
-//   codesize
+//   0x00
 //   jump(tag_3)
diff --git a/test/libyul/objectCompiler/datacopy.yul b/test/libyul/objectCompiler/datacopy.yul
index b6ec642f06..a5fbfb7b0b 100644
--- a/test/libyul/objectCompiler/datacopy.yul
+++ b/test/libyul/objectCompiler/datacopy.yul
@@ -45,6 +45,6 @@ object "a" {
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
-// Bytecode: 600a600d600039600a6000f3fe60008055600d600052fe
-// Opcodes: PUSH1 0xA PUSH1 0xD PUSH1 0x0 CODECOPY PUSH1 0xA PUSH1 0x0 RETURN INVALID PUSH1 0x0 DUP1 SSTORE PUSH1 0xD PUSH1 0x0 MSTORE INVALID
+// Bytecode: 6008600b5f3960085ff3fe5f8055600d5f52fe
+// Opcodes: PUSH1 0x8 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x8 PUSH0 RETURN INVALID PUSH0 DUP1 SSTORE PUSH1 0xD PUSH0 MSTORE INVALID
 // SourceMappings: 57:15:0:-:0;38:17;35:1;26:47;88:15;85:1;78:26
diff --git a/test/libyul/objectCompiler/dataoffset_code.yul b/test/libyul/objectCompiler/dataoffset_code.yul
index 00184feab8..e363ec7c61 100644
--- a/test/libyul/objectCompiler/dataoffset_code.yul
+++ b/test/libyul/objectCompiler/dataoffset_code.yul
@@ -25,6 +25,6 @@ object "a" {
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
-// Bytecode: 6006600055fe6008600055fe
-// Opcodes: PUSH1 0x6 PUSH1 0x0 SSTORE INVALID PUSH1 0x8 PUSH1 0x0 SSTORE INVALID
+// Bytecode: 60055f55fe60085f55fe
+// Opcodes: PUSH1 0x5 PUSH0 SSTORE INVALID PUSH1 0x8 PUSH0 SSTORE INVALID
 // SourceMappings: 32:17:0:-:0;29:1;22:28
diff --git a/test/libyul/objectCompiler/dataoffset_data.yul b/test/libyul/objectCompiler/dataoffset_data.yul
index bc066c802c..2bb68e8a8a 100644
--- a/test/libyul/objectCompiler/dataoffset_data.yul
+++ b/test/libyul/objectCompiler/dataoffset_data.yul
@@ -12,6 +12,6 @@ object "a" {
 //   sstore
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 6006600055fe48656c6c6f2c20576f726c6421
-// Opcodes: PUSH1 0x6 PUSH1 0x0 SSTORE INVALID BASEFEE PUSH6 0x6C6C6F2C2057 PUSH16 0x726C6421000000000000000000000000
+// Bytecode: 60055f55fe48656c6c6f2c20576f726c6421
+// Opcodes: PUSH1 0x5 PUSH0 SSTORE INVALID BASEFEE PUSH6 0x6C6C6F2C2057 PUSH16 0x726C6421000000000000000000000000
 // SourceMappings: 32:19:0:-:0;29:1;22:30
diff --git a/test/libyul/objectCompiler/dataoffset_self.yul b/test/libyul/objectCompiler/dataoffset_self.yul
index 163cd75742..e56097ab57 100644
--- a/test/libyul/objectCompiler/dataoffset_self.yul
+++ b/test/libyul/objectCompiler/dataoffset_self.yul
@@ -12,6 +12,6 @@ object "a" {
 //   sstore
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 60008055fe
-// Opcodes: PUSH1 0x0 DUP1 SSTORE INVALID
+// Bytecode: 5f8055fe
+// Opcodes: PUSH0 DUP1 SSTORE INVALID
 // SourceMappings: 32:15:0:-:0;29:1;22:26
diff --git a/test/libyul/objectCompiler/datasize_code.yul b/test/libyul/objectCompiler/datasize_code.yul
index fc26e4eb99..0a379cb33a 100644
--- a/test/libyul/objectCompiler/datasize_code.yul
+++ b/test/libyul/objectCompiler/datasize_code.yul
@@ -25,6 +25,6 @@ object "a" {
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
-// Bytecode: 6006600055fe
-// Opcodes: PUSH1 0x6 PUSH1 0x0 SSTORE INVALID
+// Bytecode: 60055f55fe
+// Opcodes: PUSH1 0x5 PUSH0 SSTORE INVALID
 // SourceMappings: 32:15:0:-:0;29:1;22:26
diff --git a/test/libyul/objectCompiler/datasize_data.yul b/test/libyul/objectCompiler/datasize_data.yul
index a9ba7b0271..815e78fe4f 100644
--- a/test/libyul/objectCompiler/datasize_data.yul
+++ b/test/libyul/objectCompiler/datasize_data.yul
@@ -12,6 +12,6 @@ object "a" {
 //   sstore
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 600d600055fe
-// Opcodes: PUSH1 0xD PUSH1 0x0 SSTORE INVALID
+// Bytecode: 600d5f55fe
+// Opcodes: PUSH1 0xD PUSH0 SSTORE INVALID
 // SourceMappings: 32:17:0:-:0;29:1;22:28
diff --git a/test/libyul/objectCompiler/datasize_self.yul b/test/libyul/objectCompiler/datasize_self.yul
index d4a3c8d061..178e3a9482 100644
--- a/test/libyul/objectCompiler/datasize_self.yul
+++ b/test/libyul/objectCompiler/datasize_self.yul
@@ -12,6 +12,6 @@ object "a" {
 //   sstore
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 6006600055fe
-// Opcodes: PUSH1 0x6 PUSH1 0x0 SSTORE INVALID
+// Bytecode: 60055f55fe
+// Opcodes: PUSH1 0x5 PUSH0 SSTORE INVALID
 // SourceMappings: 32:13:0:-:0;29:1;22:24
diff --git a/test/libyul/objectCompiler/function_series.yul b/test/libyul/objectCompiler/function_series.yul
index f905c04b58..10a018160a 100644
--- a/test/libyul/objectCompiler/function_series.yul
+++ b/test/libyul/objectCompiler/function_series.yul
@@ -26,6 +26,6 @@ object "Contract" {
 //   0x00
 //     /* "source":73:85   */
 //   sstore
-// Bytecode: 6009565b5b565b5b565b6001600055
-// Opcodes: PUSH1 0x9 JUMP JUMPDEST JUMPDEST JUMP JUMPDEST JUMPDEST JUMP JUMPDEST PUSH1 0x1 PUSH1 0x0 SSTORE
+// Bytecode: 6009565b5b565b5b565b60015f55
+// Opcodes: PUSH1 0x9 JUMP JUMPDEST JUMPDEST JUMP JUMPDEST JUMPDEST JUMP JUMPDEST PUSH1 0x1 PUSH0 SSTORE
 // SourceMappings: 33:15:0:-:0;;;;:::o;53:::-;;:::o;:::-;83:1;80;73:12
diff --git a/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul b/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul
index dcc41e7a0c..e991dc6b7b 100644
--- a/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul
+++ b/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul
@@ -15,6 +15,6 @@ object "a" {
 //   0x00
 //     /* "source":32:219   */
 //   assignImmutable("0x85a5b1db611c82c46f5fa18e39ae218397536256c451e5de155a86de843a9ad6")
-// Bytecode: 73123456789012345678901234567890123456789060005050
-// Opcodes: PUSH20 0x1234567890123456789012345678901234567890 PUSH1 0x0 POP POP
+// Bytecode: 7312345678901234567890123456789012345678905f5050
+// Opcodes: PUSH20 0x1234567890123456789012345678901234567890 PUSH0 POP POP
 // SourceMappings: 167:42:0:-:0;58:1;32:187;
diff --git a/test/libyul/objectCompiler/linkersymbol.yul b/test/libyul/objectCompiler/linkersymbol.yul
index 9dac374487..a28ee23e23 100644
--- a/test/libyul/objectCompiler/linkersymbol.yul
+++ b/test/libyul/objectCompiler/linkersymbol.yul
@@ -38,6 +38,6 @@ object "a" {
 //     /* "source":22:187   */
 //   pop
 //   pop
-// Bytecode: 7300000000000000000000000000000000000000006318530aaf60e31b60805260006080600460806000855af15050
-// Opcodes: PUSH20 0x0 PUSH4 0x18530AAF PUSH1 0xE3 SHL PUSH1 0x80 MSTORE PUSH1 0x0 PUSH1 0x80 PUSH1 0x4 PUSH1 0x80 PUSH1 0x0 DUP6 GAS CALL POP POP
+// Bytecode: 7300000000000000000000000000000000000000006318530aaf60e31b6080525f6080600460805f855af15050
+// Opcodes: PUSH20 0x0 PUSH4 0x18530AAF PUSH1 0xE3 SHL PUSH1 0x80 MSTORE PUSH0 PUSH1 0x80 PUSH1 0x4 PUSH1 0x80 PUSH0 DUP6 GAS CALL POP POP
 // SourceMappings: 44:35:0:-:0;109:10;104:3;100:20;95:3;88:33;179:1;174:3;171:1;166:3;163:1;157:4;150:5;145:36;22:165;
diff --git a/test/libyul/objectCompiler/long_object_name.yul b/test/libyul/objectCompiler/long_object_name.yul
index 67ef5e4072..aa2dd1ac2e 100644
--- a/test/libyul/objectCompiler/long_object_name.yul
+++ b/test/libyul/objectCompiler/long_object_name.yul
@@ -24,6 +24,6 @@ object "t" {
 //         /* "source":272:274   */
 //       stop
 // }
-// Bytecode: 600160005500fe
-// Opcodes: PUSH1 0x1 PUSH1 0x0 SSTORE STOP INVALID
+// Bytecode: 60015f5500fe
+// Opcodes: PUSH1 0x1 PUSH0 SSTORE STOP INVALID
 // SourceMappings: 33:113:0:-:0;30:1;23:124;19:131
diff --git a/test/libyul/objectCompiler/metadata.yul b/test/libyul/objectCompiler/metadata.yul
index ac66e4bdaa..5a75507ba1 100644
--- a/test/libyul/objectCompiler/metadata.yul
+++ b/test/libyul/objectCompiler/metadata.yul
@@ -62,6 +62,6 @@ object "A" {
 // }
 //
 // auxdata: 0x4d32
-// Bytecode: 600e600381600055806020555050fe4d32
-// Opcodes: PUSH1 0xE PUSH1 0x3 DUP2 PUSH1 0x0 SSTORE DUP1 PUSH1 0x20 SSTORE POP POP INVALID 0x4D ORIGIN
+// Bytecode: 600e6003815f55806020555050fe4d32
+// Opcodes: PUSH1 0xE PUSH1 0x3 DUP2 PUSH0 SSTORE DUP1 PUSH1 0x20 SSTORE POP POP INVALID 0x4D ORIGIN
 // SourceMappings: 35:13:0:-:0;62;90:1;87;80:12;108:1;104:2;97:13;20:94;
diff --git a/test/libyul/objectCompiler/namedObjectCode.yul b/test/libyul/objectCompiler/namedObjectCode.yul
index b13bdae5e0..f9e97bec4a 100644
--- a/test/libyul/objectCompiler/namedObjectCode.yul
+++ b/test/libyul/objectCompiler/namedObjectCode.yul
@@ -9,6 +9,6 @@ object "a" {
 //   0x00
 //     /* "source":22:34   */
 //   sstore
-// Bytecode: 6001600055
-// Opcodes: PUSH1 0x1 PUSH1 0x0 SSTORE
+// Bytecode: 60015f55
+// Opcodes: PUSH1 0x1 PUSH0 SSTORE
 // SourceMappings: 32:1:0:-:0;29;22:12
diff --git a/test/libyul/objectCompiler/nested_optimizer.yul b/test/libyul/objectCompiler/nested_optimizer.yul
index 7b972286f4..cde1210ff8 100644
--- a/test/libyul/objectCompiler/nested_optimizer.yul
+++ b/test/libyul/objectCompiler/nested_optimizer.yul
@@ -40,6 +40,6 @@ object "a" {
 //         /* "source":158:279   */
 //       stop
 // }
-// Bytecode: 600080355500fe
-// Opcodes: PUSH1 0x0 DUP1 CALLDATALOAD SSTORE STOP INVALID
+// Bytecode: 5f80355500fe
+// Opcodes: PUSH0 DUP1 CALLDATALOAD SSTORE STOP INVALID
 // SourceMappings: 48:1:0:-:0;35:15;;107:20;20:111
diff --git a/test/libyul/objectCompiler/simple.yul b/test/libyul/objectCompiler/simple.yul
index 3e7d1859f3..d94b53de90 100644
--- a/test/libyul/objectCompiler/simple.yul
+++ b/test/libyul/objectCompiler/simple.yul
@@ -9,6 +9,6 @@
 //   0x00
 //     /* "source":4:16   */
 //   sstore
-// Bytecode: 6001600055
-// Opcodes: PUSH1 0x1 PUSH1 0x0 SSTORE
+// Bytecode: 60015f55
+// Opcodes: PUSH1 0x1 PUSH0 SSTORE
 // SourceMappings: 14:1:0:-:0;11;4:12
diff --git a/test/libyul/objectCompiler/simple_optimizer.yul b/test/libyul/objectCompiler/simple_optimizer.yul
index 47fa6553ab..3ce4b7a4bb 100644
--- a/test/libyul/objectCompiler/simple_optimizer.yul
+++ b/test/libyul/objectCompiler/simple_optimizer.yul
@@ -17,6 +17,6 @@
 //   sstore
 //     /* "source":0:101   */
 //   stop
-// Bytecode: 600080355500
-// Opcodes: PUSH1 0x0 DUP1 CALLDATALOAD SSTORE STOP
+// Bytecode: 5f80355500
+// Opcodes: PUSH0 DUP1 CALLDATALOAD SSTORE STOP
 // SourceMappings: 26:1:0:-:0;13:15;;79:20;0:101
diff --git a/test/libyul/objectCompiler/sourceLocations.yul b/test/libyul/objectCompiler/sourceLocations.yul
index 4e75d05e7d..849d275fec 100644
--- a/test/libyul/objectCompiler/sourceLocations.yul
+++ b/test/libyul/objectCompiler/sourceLocations.yul
@@ -49,6 +49,6 @@ object "a" {
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
-// Bytecode: 600a600d600039600a6000f3fe60008055600d600052fe
-// Opcodes: PUSH1 0xA PUSH1 0xD PUSH1 0x0 CODECOPY PUSH1 0xA PUSH1 0x0 RETURN INVALID PUSH1 0x0 DUP1 SSTORE PUSH1 0xD PUSH1 0x0 MSTORE INVALID
+// Bytecode: 6008600b5f3960085ff3fe5f8055600d5f52fe
+// Opcodes: PUSH1 0x8 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x8 PUSH0 RETURN INVALID PUSH0 DUP1 SSTORE PUSH1 0xD PUSH0 MSTORE INVALID
 // SourceMappings: 0:2::-:0;;;;5:1;0:2;
diff --git a/test/libyul/objectCompiler/subObjectAccess.yul b/test/libyul/objectCompiler/subObjectAccess.yul
index 1899551fd1..e8bf0bcafc 100644
--- a/test/libyul/objectCompiler/subObjectAccess.yul
+++ b/test/libyul/objectCompiler/subObjectAccess.yul
@@ -249,6 +249,6 @@ object "A" {
 //           invalid
 //     }
 // }
-// Bytecode: 600060976045603e60846013608360016083600189600055886020558760405586606055856080558460a0558360c0558260e055816101005580610120556101406000f3fe602a6013603d6001603d600185600055846020558360405582606055816080558060a05560c06000f3fe60126001816000558060205560406000f3fefefefe60126001816000558060205560406000f3fefe
-// Opcodes: PUSH1 0x0 PUSH1 0x97 PUSH1 0x45 PUSH1 0x3E PUSH1 0x84 PUSH1 0x13 PUSH1 0x83 PUSH1 0x1 PUSH1 0x83 PUSH1 0x1 DUP10 PUSH1 0x0 SSTORE DUP9 PUSH1 0x20 SSTORE DUP8 PUSH1 0x40 SSTORE DUP7 PUSH1 0x60 SSTORE DUP6 PUSH1 0x80 SSTORE DUP5 PUSH1 0xA0 SSTORE DUP4 PUSH1 0xC0 SSTORE DUP3 PUSH1 0xE0 SSTORE DUP2 PUSH2 0x100 SSTORE DUP1 PUSH2 0x120 SSTORE PUSH2 0x140 PUSH1 0x0 RETURN INVALID PUSH1 0x2A PUSH1 0x13 PUSH1 0x3D PUSH1 0x1 PUSH1 0x3D PUSH1 0x1 DUP6 PUSH1 0x0 SSTORE DUP5 PUSH1 0x20 SSTORE DUP4 PUSH1 0x40 SSTORE DUP3 PUSH1 0x60 SSTORE DUP2 PUSH1 0x80 SSTORE DUP1 PUSH1 0xA0 SSTORE PUSH1 0xC0 PUSH1 0x0 RETURN INVALID PUSH1 0x12 PUSH1 0x1 DUP2 PUSH1 0x0 SSTORE DUP1 PUSH1 0x20 SSTORE PUSH1 0x40 PUSH1 0x0 RETURN INVALID INVALID INVALID INVALID PUSH1 0x12 PUSH1 0x1 DUP2 PUSH1 0x0 SSTORE DUP1 PUSH1 0x20 SSTORE PUSH1 0x40 PUSH1 0x0 RETURN INVALID INVALID
+// Bytecode: 5f608e6042603a607d6011607c6001607c6001895f55886020558760405586606055856080558460a0558360c0558260e055816101005580610120556101405ff3fe602860116039600160396001855f55846020558360405582606055816080558060a05560c05ff3fe60106001815f558060205560405ff3fefefefe60106001815f558060205560405ff3fefe
+// Opcodes: PUSH0 PUSH1 0x8E PUSH1 0x42 PUSH1 0x3A PUSH1 0x7D PUSH1 0x11 PUSH1 0x7C PUSH1 0x1 PUSH1 0x7C PUSH1 0x1 DUP10 PUSH0 SSTORE DUP9 PUSH1 0x20 SSTORE DUP8 PUSH1 0x40 SSTORE DUP7 PUSH1 0x60 SSTORE DUP6 PUSH1 0x80 SSTORE DUP5 PUSH1 0xA0 SSTORE DUP4 PUSH1 0xC0 SSTORE DUP3 PUSH1 0xE0 SSTORE DUP2 PUSH2 0x100 SSTORE DUP1 PUSH2 0x120 SSTORE PUSH2 0x140 PUSH0 RETURN INVALID PUSH1 0x28 PUSH1 0x11 PUSH1 0x39 PUSH1 0x1 PUSH1 0x39 PUSH1 0x1 DUP6 PUSH0 SSTORE DUP5 PUSH1 0x20 SSTORE DUP4 PUSH1 0x40 SSTORE DUP3 PUSH1 0x60 SSTORE DUP2 PUSH1 0x80 SSTORE DUP1 PUSH1 0xA0 SSTORE PUSH1 0xC0 PUSH0 RETURN INVALID PUSH1 0x10 PUSH1 0x1 DUP2 PUSH0 SSTORE DUP1 PUSH1 0x20 SSTORE PUSH1 0x40 PUSH0 RETURN INVALID INVALID INVALID INVALID PUSH1 0x10 PUSH1 0x1 DUP2 PUSH0 SSTORE DUP1 PUSH1 0x20 SSTORE PUSH1 0x40 PUSH0 RETURN INVALID INVALID
 // SourceMappings: 37:15:0:-:0;68:13;97:15;128:13;158:17;192:15;224:17;258:15;291:19;328:17;361:3;358:1;351:14;381:3;377:2;370:15;401:3;397:2;390:15;421:3;417:2;410:15;442:4;437:3;430:17;464:4;459:3;452:17;486:4;481:3;474:17;508:4;503:3;496:17;530:5;525:3;518:18;553:5;548:3;541:18;574:3;571:1;564:14

From ccc2b8e2db7c67565aa29cc01ccbccd568e2b54d Mon Sep 17 00:00:00 2001
From: "Rodrigo Q. Saramago" <rodrigoqsaramago@gmail.com>
Date: Sat, 6 May 2023 13:40:31 +0200
Subject: [PATCH 1355/1748] Make python and foundry installation steps a
 command

---
 .circleci/config.yml | 96 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 76 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7bb4c51f44..58d67e7f4b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -93,6 +93,73 @@ commands:
             - bytecode-report-<< parameters.label >>-cli.txt
       - matrix_notify_failure_unless_pr
 
+  install_python3:
+    description: "Install python3 and given packages."
+    parameters:
+      packages:
+        description: "List of extra Python packages to be installed (separated by space)."
+        type: string
+        default: ""
+    steps:
+      - run:
+          name: Install python and dependencies
+          command: |
+            sudo apt update
+            sudo apt install python3 python3-pip --assume-yes --no-install-recommends
+            if [[ "<< parameters.packages >>" != "" ]]
+            then
+              echo "Installing additional packages..."
+              python3 -m pip install --user << parameters.packages >>
+            fi
+
+  install_foundry:
+    description: "Install Foundry."
+    parameters:
+      version:
+        type: string
+        default: "nightly"
+      install_path:
+        type: string
+        default: /home/circleci/bin
+    steps:
+      - run:
+          name: Setup Foundry environment variables
+          command: |
+            FOUNDRY_REPO="foundry-rs/foundry"
+            FOUNDRY_VERSION="<< parameters.version >>"
+            FOUNDRY_RELEASE_SHA=$(curl \
+              --silent \
+              --fail \
+              --show-error \
+              "https://api.github.com/repos/${FOUNDRY_REPO}/git/refs/tags/${FOUNDRY_VERSION}" \
+              | jq --raw-output .object.sha \
+            )
+            echo "export FOUNDRY_REPO=$FOUNDRY_REPO" >> "$BASH_ENV"
+            echo "export FOUNDRY_VERSION=$FOUNDRY_VERSION" >> "$BASH_ENV"
+            echo "export FOUNDRY_RELEASE_TAG='nightly-${FOUNDRY_RELEASE_SHA}'" >> "$BASH_ENV"
+            # Save commit sha for caching
+            echo "$FOUNDRY_RELEASE_SHA" > /tmp/workspace/foundry-release-sha
+      - restore_cache:
+          keys:
+            - foundry-<< parameters.version >>-{{ arch }}-{{ checksum "/tmp/workspace/foundry-release-sha" }}
+      # WARNING! If you edit anything between here and save_cache, remember to invalidate the cache manually.
+      - run:
+          name: Install foundry
+          command: |
+            ! forge --version 2> /dev/null
+            curl \
+              --fail \
+              --location \
+              --output /tmp/foundry.tar.gz \
+              "https://github.com/${FOUNDRY_REPO}/releases/download/${FOUNDRY_RELEASE_TAG}/foundry_${FOUNDRY_VERSION}_linux_amd64.tar.gz"
+            cd "<< parameters.install_path >>"
+            tar --extract --gzip --file /tmp/foundry.tar.gz --one-top-level
+            ln --symbolic --force foundry/{forge,anvil,cast,chisel} .
+      - save_cache:
+          key: foundry-<< parameters.version >>-{{ arch }}-{{ checksum "/tmp/workspace/foundry-release-sha" }}
+          paths:
+            - << parameters.install_path >>
+
 defaults:
 
   # --------------------------------------------------------------------------
@@ -700,14 +767,8 @@ jobs:
     <<: *base_cimg_small
     steps:
       - checkout
-      - run:
-          name: Install pip
-          command: |
-            sudo apt -q update
-            sudo apt install -y python3-pip
-      - run:
-          name: Install pylint and dependencies of the scripts that will be linted
-          command: python3 -m pip install
+      - install_python3:
+          packages: >
             pylint
             z3-solver
             pygments-lexer-solidity
@@ -755,12 +816,8 @@ jobs:
     <<: *base_cimg_small
     steps:
       - checkout
-      - run:
-          name: Z3 python deps
-          command: |
-            sudo apt-get -qq update
-            sudo apt-get -qy install python3-pip
-            pip3 install --user z3-solver
+      - install_python3:
+          packages: z3-solver
       - run: *run_proofs
       - matrix_notify_failure_unless_pr
 
@@ -1230,6 +1287,9 @@ jobs:
       - checkout
       - attach_workspace:
           at: /tmp/workspace
+      - install_foundry
+      - install_python3:
+          packages: requests
       - run:
           name: Install lsof
           command: |
@@ -1276,15 +1336,11 @@ jobs:
   c_ext_benchmarks:
     <<: *base_node_small
     steps:
+      - install_python3:
+          packages: requests
       - checkout
       - attach_workspace:
           at: .
-      - run:
-          name: Install dependencies of helper scripts
-          command: |
-            sudo apt update
-            sudo apt install python3-pip --assume-yes --no-install-recommends
-            python3 -m pip install requests --user
       - run:
           name: Combine benchmark reports
           command: cat reports/externalTests/benchmark-*.json | scripts/externalTests/merge_benchmarks.sh > reports/externalTests/all-benchmarks.json

From cbd6495fb1ea13ecae1b24882411df596dd90eec Mon Sep 17 00:00:00 2001
From: hrkrshnn <git@hrkrshnn.com>
Date: Mon, 8 May 2023 18:53:10 +0200
Subject: [PATCH 1356/1748] docs: mention that `push0` also decreases the
 runtime costs

Fixes https://github.com/ethereum/solidity/pull/14107#discussion_r1163830306
---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 25244e13c2..4921973412 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,7 +4,7 @@ Language Features:
 
 
 Compiler Features:
- * Assembler: Use ``push0`` for placing ``0`` in the stack for EVM versions starting from "Shanghai". This decreases the deployment costs.
+ * Assembler: Use ``push0`` for placing ``0`` in the stack for EVM versions starting from "Shanghai". This decreases the deployment and runtime costs.
  * EVM: Set default EVM version to "Shanghai".
  * EVM: Support for the EVM Version "Shanghai".
  * NatSpec: Add support for NatSpec documentation in ``enum`` definitions.

From 9a87b587d52cf59ecb5d6f947023e951a7a8627a Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 9 May 2023 12:12:12 +0200
Subject: [PATCH 1357/1748] Disallow immutable initialization in try catch
 statements

Trigger github
---
 Changelog.md                                  |  1 +
 libsolidity/analysis/ImmutableValidator.cpp   | 19 +++++++++
 libsolidity/analysis/ImmutableValidator.h     |  2 +
 .../immutable/try_catch_initialized.sol       | 42 +++++++++++++++++++
 4 files changed, 64 insertions(+)
 create mode 100644 test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol

diff --git a/Changelog.md b/Changelog.md
index 4921973412..f00234d8ba 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -22,6 +22,7 @@ Bugfixes:
  * Antlr Grammar: Fix discrepancy with the parser, which allowed octal numbers.
  * Antlr Grammar: Fix of a discrepancy with the parser, which allowed numbers followed by an identifier with no whitespace.
  * Antlr Grammar: Stricter rules for function definitions. The grammar will no longer accept as valid free functions having specifiers which are exclusive to contract functions.
+ * Immutables: Disallow initialization of immutables in try/catch statements.
  * SMTChecker: Fix false positives in ternary operators that contain verification targets in its branches, directly or indirectly.
 
 
diff --git a/libsolidity/analysis/ImmutableValidator.cpp b/libsolidity/analysis/ImmutableValidator.cpp
index 485aa3fa24..8e89c49ab9 100644
--- a/libsolidity/analysis/ImmutableValidator.cpp
+++ b/libsolidity/analysis/ImmutableValidator.cpp
@@ -132,6 +132,19 @@ bool ImmutableValidator::visit(WhileStatement const& _whileStatement)
 	return false;
 }
 
+bool ImmutableValidator::visit(TryStatement const& _tryStatement)
+{
+	ScopedSaveAndRestore constructorGuard{m_inTryStatement, true};
+
+	_tryStatement.externalCall().accept(*this);
+
+	for (auto&& clause: _tryStatement.clauses())
+		if (clause)
+			clause->accept(*this);
+
+	return false;
+}
+
 void ImmutableValidator::endVisit(IdentifierPath const& _identifierPath)
 {
 	if (auto const callableDef = dynamic_cast<CallableDeclaration const*>(_identifierPath.annotation().referencedDeclaration))
@@ -217,6 +230,12 @@ void ImmutableValidator::analyseVariableReference(VariableDeclaration const& _va
 				_expression.location(),
 				"Cannot write to immutable here: Immutable variables cannot be initialized inside an if statement."
 			);
+		else if (m_inTryStatement)
+			m_errorReporter.typeError(
+					4130_error,
+					_expression.location(),
+					"Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement."
+			);
 		else if (m_initializedStateVariables.count(&_variableReference))
 		{
 			if (!read)
diff --git a/libsolidity/analysis/ImmutableValidator.h b/libsolidity/analysis/ImmutableValidator.h
index 452e91d7c8..43a4b5dbf4 100644
--- a/libsolidity/analysis/ImmutableValidator.h
+++ b/libsolidity/analysis/ImmutableValidator.h
@@ -55,6 +55,7 @@ class ImmutableValidator: private ASTConstVisitor
 	bool visit(MemberAccess const& _memberAccess);
 	bool visit(IfStatement const& _ifStatement);
 	bool visit(WhileStatement const& _whileStatement);
+	bool visit(TryStatement const& _tryStatement);
 	void endVisit(IdentifierPath const& _identifierPath);
 	void endVisit(Identifier const& _identifier);
 	void endVisit(Return const& _return);
@@ -78,6 +79,7 @@ class ImmutableValidator: private ASTConstVisitor
 	bool m_inLoop = false;
 	bool m_inBranch = false;
 	bool m_inCreationContext = true;
+	bool m_inTryStatement = false;
 };
 
 }
diff --git a/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol b/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol
new file mode 100644
index 0000000000..2d901a0200
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol
@@ -0,0 +1,42 @@
+contract A
+{
+    uint256 public immutable variable;
+
+    constructor()
+    {
+        B b;
+        try b.foo(variable = 1)
+        {
+            variable = 2;
+        }
+        catch Panic(uint)
+        {
+            variable = 3;
+        }
+        catch Error(string memory)
+        {
+            variable = 4;
+        }
+        catch
+        {
+            variable = 5;
+        }
+    }
+}
+
+contract B
+{
+    function foo(uint256) external pure
+    {
+        revert();
+    }
+}
+
+// ====
+// EVMVersion: >=byzantium
+// ----
+// TypeError 4130: (108-116): Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement.
+// TypeError 4130: (144-152): Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement.
+// TypeError 4130: (216-224): Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement.
+// TypeError 4130: (297-305): Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement.
+// TypeError 4130: (357-365): Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement.

From 77af0b41df4654c8f11885885474ac8db05e388f Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 9 May 2023 13:06:55 +0200
Subject: [PATCH 1358/1748] Bump evmone version in docker images to 0.10.0.

---
 ...g.ossfuzz => Dockerfile.ubuntu.clang.ossfuzz} |  6 +++---
 .../docker/buildpack-deps/Dockerfile.ubuntu2004  | 16 ++++++----------
 .../docker/buildpack-deps/Dockerfile.ubuntu2204  |  4 ++--
 .../buildpack-deps/Dockerfile.ubuntu2204.clang   |  4 ++--
 4 files changed, 13 insertions(+), 17 deletions(-)
 rename scripts/docker/buildpack-deps/{Dockerfile.clang.ossfuzz => Dockerfile.ubuntu.clang.ossfuzz} (96%)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
similarity index 96%
rename from scripts/docker/buildpack-deps/Dockerfile.clang.ossfuzz
rename to scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index b64d73bc0d..705eacce48 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="23"
+LABEL version="1"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -93,11 +93,11 @@ RUN set -ex; \
 # EVMONE
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
 	cd evmone; \
 	mkdir build; \
 	cd build; \
-	cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \
+	CXX=clang++ cmake -G Ninja -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX="/usr" ..; \
 	ninja; \
 	ninja install/strip; \
 	rm -rf /usr/src/evmone
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 682beea20f..193475f733 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="18"
+LABEL version="19"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -47,15 +47,11 @@ FROM base AS libraries
 
 # EVMONE
 RUN set -ex; \
-	cd /usr/src; \
-	git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
-	cd evmone; \
-	mkdir build; \
-	cd build; \
-	cmake -G Ninja -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX="/usr" ..; \
-	ninja; \
-	ninja install/strip; \
-	rm -rf /usr/src/evmone
+	wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-linux-x86_64.tar.gz; \
+	test "$(sha256sum /usr/src/evmone.tar.gz)" = "6052b6a4eba6e81bb1bccfa9fec2caf220a25f5ff5c32c544984883ed95e6552  /usr/src/evmone.tar.gz"; \
+	cd /usr; \
+	tar -xf /usr/src/evmone.tar.gz; \
+	rm -rf /usr/src/evmone.tar.gz
 
 FROM base
 COPY --from=libraries /usr/lib /usr/lib
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 73ef9f4376..5b94d71124 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="3"
+LABEL version="4"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -48,7 +48,7 @@ FROM base AS libraries
 # EVMONE
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
 	cd evmone; \
 	mkdir build; \
 	cd build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index d0357879ef..64328ce79e 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="2"
+LABEL version="3"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -50,7 +50,7 @@ ENV CXX clang++
 # EVMONE
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.9.1" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
 	cd evmone; \
 	mkdir build; \
 	cd build; \

From 53626fc092a0358d0e28f889e1ebc862593e5f1a Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 9 May 2023 17:59:00 +0200
Subject: [PATCH 1359/1748] Bump docker images and evmone version.

---
 .circleci/config.yml                  | 16 ++++++++--------
 .circleci/osx_install_dependencies.sh |  4 ++--
 scripts/install_evmone.ps1            |  2 +-
 test/Common.h                         |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7875cbee75..8c81fd561e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,20 +9,20 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-18
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:db35d88a16f19adfac6dfd88bda4b32a85a82430f28830aad97bcd10fa4f846c"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-19
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:9c7d3be930936a70f0340d5e9fa9a0b8bf69e11192e7e2d37807afe1b7f55534"
   ubuntu-2204-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-3
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:73e4e80128a0596c3ddb36e36e8039514a9f33ca8799bec82060a49b0cdae461"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-4
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7555c26c82fd0dcbc02cbd422b74468f8de1b7f2972b84fadcfa90f7371d6de5"
   ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-2
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:0d4fa1da806f9b3daabd2d1dc0842899af794a838e475c14045c3fb289cc8103"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-3
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:3d5efffd1e4c381041d1dff6331add86976373bde1c9dfca97ebd3d735e09dab"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-23
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7a84f67829ec2fdcfc8a61ebf22f9dc27b04a9edeb1531565ab3e0ebb1cbc4a0"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-1
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d1bba750ab3f9ad9d28d45e332c2ec2126d248c1d619af369a3ef0c29f5936c3"
   emscripten-docker-image:
     type: string
     # solbuildpackpusher/solidity-buildpack-deps:emscripten-15
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 45a54838a9..5e779700c9 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -73,10 +73,10 @@ then
   rm -r "$z3_dir"
 
   # evmone
-  evmone_version="0.9.1"
+  evmone_version="0.10.0"
   evmone_package="evmone-${evmone_version}-darwin-x86_64.tar.gz"
   wget "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/${evmone_package}"
-  validate_checksum "$evmone_package" 70420a893a9b1036fcb63526b806d97658db8c373bcab1c3e8382594dc8593e4
+  validate_checksum "$evmone_package" 1b7773779287d7908baca6b8d556a98800cbd7d6e5c910b55fa507642bc0a15c
   tar xzpf "$evmone_package" -C /usr/local
   rm "$evmone_package"
 
diff --git a/scripts/install_evmone.ps1 b/scripts/install_evmone.ps1
index 70c38e815b..0bf2fa1de3 100644
--- a/scripts/install_evmone.ps1
+++ b/scripts/install_evmone.ps1
@@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop"
 # Needed for Invoke-WebRequest to work via CI.
 $progressPreference = "silentlyContinue"
 
-Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-windows-amd64.zip" -OutFile "evmone.zip"
+Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-windows-amd64.zip" -OutFile "evmone.zip"
 tar -xf evmone.zip "bin/evmone.dll"
 mkdir deps
 mv bin/evmone.dll deps
diff --git a/test/Common.h b/test/Common.h
index 91858d4b44..468e5af645 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -33,17 +33,17 @@ namespace solidity::test
 
 #ifdef _WIN32
 static constexpr auto evmoneFilename = "evmone.dll";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-windows-amd64.zip";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-windows-amd64.zip";
 static constexpr auto heraFilename = "hera.dll";
 static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/archive/v0.6.0.tar.gz";
 #elif defined(__APPLE__)
 static constexpr auto evmoneFilename = "libevmone.dylib";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-darwin-x86_64.tar.gz";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-darwin-x86_64.tar.gz";
 static constexpr auto heraFilename = "libhera.dylib";
 static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.6.0/hera-0.6.0-darwin-x86_64.tar.gz";
 #else
 static constexpr auto evmoneFilename = "libevmone.so";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.9.1/evmone-0.9.1-linux-x86_64.tar.gz";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-linux-x86_64.tar.gz";
 static constexpr auto heraFilename = "libhera.so";
 static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.6.0/hera-0.6.0-linux-x86_64.tar.gz";
 #endif

From c1720e62aa1adbd840abc5a2fcc4bbe6806e2a0d Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Wed, 3 May 2023 21:55:49 -0300
Subject: [PATCH 1360/1748] Implement missing overrides and relax smtAsserts

---
 libsmtutil/SolverInterface.h | 22 +++++++++++++++++-----
 libsmtutil/Sorts.h           | 18 ++++++++++++++----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/libsmtutil/SolverInterface.h b/libsmtutil/SolverInterface.h
index c9cf8f7004..4a21f18410 100644
--- a/libsmtutil/SolverInterface.h
+++ b/libsmtutil/SolverInterface.h
@@ -123,7 +123,7 @@ class Expression
 	explicit Expression(std::shared_ptr<SortSort> _sort, std::string _name = ""): Expression(std::move(_name), {}, _sort) {}
 	explicit Expression(std::string _name, std::vector<Expression> _arguments, SortPointer _sort):
 		name(std::move(_name)), arguments(std::move(_arguments)), sort(std::move(_sort)) {}
-	Expression(size_t _number): Expression(std::to_string(_number), {}, SortProvider::sintSort) {}
+	Expression(size_t _number): Expression(std::to_string(_number), {}, SortProvider::uintSort) {}
 	Expression(u256 const& _number): Expression(_number.str(), {}, SortProvider::sintSort) {}
 	Expression(s256 const& _number): Expression(
 		_number >= 0 ? _number.str() : "-",
@@ -189,7 +189,10 @@ class Expression
 
 	static Expression ite(Expression _condition, Expression _trueValue, Expression _falseValue)
 	{
-		smtAssert(*_trueValue.sort == *_falseValue.sort, "");
+		if (_trueValue.sort->kind == Kind::Int)
+			smtAssert(_trueValue.sort->kind == _falseValue.sort->kind, "");
+		else
+			smtAssert(*_trueValue.sort == *_falseValue.sort, "");
 		SortPointer sort = _trueValue.sort;
 		return Expression("ite", std::vector<Expression>{
 			std::move(_condition), std::move(_trueValue), std::move(_falseValue)
@@ -213,7 +216,10 @@ class Expression
 		std::shared_ptr<ArraySort> arraySort = std::dynamic_pointer_cast<ArraySort>(_array.sort);
 		smtAssert(arraySort, "");
 		smtAssert(_index.sort, "");
-		smtAssert(*arraySort->domain == *_index.sort, "");
+		if (arraySort->domain->kind == Kind::Int)
+			smtAssert(arraySort->domain->kind == _index.sort->kind, "");
+		else
+			smtAssert(*arraySort->domain == *_index.sort, "");
 		return Expression(
 			"select",
 			std::vector<Expression>{std::move(_array), std::move(_index)},
@@ -230,7 +236,10 @@ class Expression
 		smtAssert(_index.sort, "");
 		smtAssert(_element.sort, "");
 		smtAssert(*arraySort->domain == *_index.sort, "");
-		smtAssert(*arraySort->range == *_element.sort, "");
+		if (arraySort->domain->kind == Kind::Int)
+			smtAssert(arraySort->range->kind == _element.sort->kind, "");
+		else
+			smtAssert(*arraySort->range == *_element.sort, "");
 		return Expression(
 			"store",
 			std::vector<Expression>{std::move(_array), std::move(_index), std::move(_element)},
@@ -245,7 +254,10 @@ class Expression
 		auto arraySort = std::dynamic_pointer_cast<ArraySort>(sortSort->inner);
 		smtAssert(sortSort && arraySort, "");
 		smtAssert(_value.sort, "");
-		smtAssert(*arraySort->range == *_value.sort, "");
+		if (arraySort->domain->kind == Kind::Int)
+			smtAssert(arraySort->range->kind == _value.sort->kind, "");
+		else
+			smtAssert(*arraySort->range == *_value.sort, "");
 		return Expression(
 			"const_array",
 			std::vector<Expression>{std::move(_sort), std::move(_value)},
diff --git a/libsmtutil/Sorts.h b/libsmtutil/Sorts.h
index 107dc1f2c1..419ee9dc5a 100644
--- a/libsmtutil/Sorts.h
+++ b/libsmtutil/Sorts.h
@@ -57,9 +57,14 @@ struct IntSort: public Sort
 		isSigned(_signed)
 	{}
 
-	bool operator==(IntSort const& _other) const
+	bool operator==(Sort const& _other) const override
 	{
-		return Sort::operator==(_other) && isSigned == _other.isSigned;
+		if (!Sort::operator==(_other))
+			return false;
+
+		auto otherIntSort = dynamic_cast<IntSort const*>(&_other);
+		smtAssert(otherIntSort);
+		return isSigned == otherIntSort->isSigned;
 	}
 
 	bool isSigned;
@@ -72,9 +77,14 @@ struct BitVectorSort: public Sort
 		size(_size)
 	{}
 
-	bool operator==(BitVectorSort const& _other) const
+	bool operator==(Sort const& _other) const override
 	{
-		return Sort::operator==(_other) && size == _other.size;
+		if (!Sort::operator==(_other))
+			return false;
+
+		auto otherBitVectorSort = dynamic_cast<BitVectorSort const*>(&_other);
+		smtAssert(otherBitVectorSort);
+		return size == otherBitVectorSort->size;
 	}
 
 	unsigned size;

From 75a0c486a8cfbd4ae48266dd3781652114e24256 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 9 May 2023 18:22:44 +0200
Subject: [PATCH 1361/1748] Adjust gas expectations due to new creation costs.

---
 ...ncode_v2_in_function_inherited_in_v1_contract.sol |  6 +++---
 ...abi_encode_v2_in_modifier_used_in_v1_contract.sol |  2 +-
 .../semanticTests/arithmetics/check_var_init.sol     |  2 +-
 .../array/fixed_arrays_as_return_type.sol            |  6 +++---
 .../array/function_array_cross_calls.sol             |  6 +++---
 .../semanticTests/array/reusing_memory.sol           |  6 +++---
 .../constructor/arrays_in_constructors.sol           |  6 +++---
 .../constructor/bytes_in_constructors_packer.sol     |  6 +++---
 .../constructor/constructor_function_complex.sol     |  2 +-
 .../semanticTests/constructor/no_callvalue_check.sol |  6 +++---
 .../events/event_emit_from_other_contract.sol        |  6 +++---
 .../semanticTests/freeFunctions/new_operator.sol     |  2 +-
 .../functionCall/creation_function_call_no_args.sol  |  2 +-
 .../creation_function_call_with_args.sol             |  6 +++---
 .../creation_function_call_with_salt.sol             |  6 +++---
 .../functionCall/gas_and_value_basic.sol             |  6 +++---
 .../functionCall/gas_and_value_brace_syntax.sol      |  6 +++---
 .../semanticTests/functionTypes/store_function.sol   |  4 ++--
 .../semanticTests/immutable/multi_creation.sol       |  6 +++---
 .../inheritance/address_overload_resolution.sol      |  4 ++--
 ...nherited_function_calldata_calldata_interface.sol |  2 +-
 .../inherited_function_calldata_memory_interface.sol |  6 +++---
 .../inheritance/member_notation_ctor.sol             |  4 ++--
 .../inheritance/value_for_constructor.sol            |  6 +++---
 .../isoltestTesting/balance_other_contract.sol       |  6 +++---
 .../operator_making_pure_external_call.sol           | 12 ++++++------
 .../operator_making_view_external_call.sol           | 12 ++++++------
 .../salted_create/prediction_example.sol             |  2 +-
 .../semanticTests/salted_create/salted_create.sol    |  2 +-
 .../salted_create/salted_create_with_value.sol       |  6 +++---
 test/libsolidity/semanticTests/smoke/alignment.sol   |  2 +-
 .../semanticTests/using/using_global_invisible.sol   |  2 +-
 .../semanticTests/various/code_access_content.sol    |  4 ++--
 .../semanticTests/various/code_access_create.sol     |  2 +-
 .../semanticTests/various/code_access_runtime.sol    |  2 +-
 .../various/external_types_in_calls.sol              |  2 +-
 .../semanticTests/various/selfdestruct.sol           |  6 +++---
 .../semanticTests/various/senders_balance.sol        |  6 +++---
 .../various/staticcall_for_view_and_pure.sol         |  2 +-
 .../semanticTests/various/value_complex.sol          |  6 +++---
 .../semanticTests/various/value_insane.sol           |  6 +++---
 41 files changed, 97 insertions(+), 97 deletions(-)

diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index e3075052c9..add5458967 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -30,6 +30,6 @@ contract C is B {
 }
 // ----
 // test() -> 77
-// gas irOptimized: 119155
-// gas legacy: 151834
-// gas legacyOptimized: 110339
+// gas irOptimized: 119177
+// gas legacy: 151866
+// gas legacyOptimized: 110359
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
index d6c38e3a04..7de2630120 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_modifier_used_in_v1_contract.sol
@@ -39,4 +39,4 @@ contract C is B {
 // ----
 // test() -> 5, 10
 // gas irOptimized: 87337
-// gas legacy: 102637
+// gas legacy: 102651
diff --git a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
index c4d7548433..6cc02bd975 100644
--- a/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
+++ b/test/libsolidity/semanticTests/arithmetics/check_var_init.sol
@@ -16,4 +16,4 @@ contract D {
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x11
 // g(), 100 wei -> 1
-// gas legacy: 100370
+// gas legacy: 100388
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 08a89e00bb..519a11131c 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -19,6 +19,6 @@ contract B {
 
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 115808
-// gas legacy: 229947
-// gas legacyOptimized: 130613
+// gas irOptimized: 115828
+// gas legacy: 230001
+// gas legacyOptimized: 130637
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 316bb39da8..8bb4545b2b 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -43,6 +43,6 @@ contract C {
 
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 260837
-// gas legacy: 441446
-// gas legacyOptimized: 279259
+// gas irOptimized: 260895
+// gas legacy: 441556
+// gas legacyOptimized: 279321
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index 8ade9f2ec9..b690fad1de 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -24,6 +24,6 @@ contract Main {
 }
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 112147
-// gas legacy: 125140
-// gas legacyOptimized: 113000
+// gas irOptimized: 112161
+// gas legacy: 125162
+// gas legacyOptimized: 113012
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 22287f40e3..24c33facb6 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 429076
-// gas legacy: 581281
-// gas legacyOptimized: 444496
+// gas irOptimized: 429160
+// gas legacy: 581443
+// gas legacyOptimized: 444588
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 1c210290ad..3df201222e 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 278448
-// gas legacy: 418282
-// gas legacyOptimized: 291665
+// gas irOptimized: 278528
+// gas legacy: 418462
+// gas legacyOptimized: 291755
diff --git a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
index f9c4a45099..4117b84b64 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_function_complex.sol
@@ -17,4 +17,4 @@ contract C {
 }
 // ----
 // f() -> 16
-// gas legacy: 102040
+// gas legacy: 102082
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index c38404df5c..9319d592a5 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -17,6 +17,6 @@ contract C {
 }
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 119451
-// gas legacy: 122615
-// gas legacyOptimized: 122484
+// gas irOptimized: 119457
+// gas legacy: 122621
+// gas legacyOptimized: 122490
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 8659129a8c..5b8827ce7e 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -15,8 +15,8 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 165390
-// gas legacy: 244780
-// gas legacyOptimized: 171605
+// gas irOptimized: 165398
+// gas legacy: 244800
+// gas legacyOptimized: 171615
 // deposit(bytes32), 18 wei: 0x1234 ->
 // ~ emit Deposit(address,bytes32,uint256) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: #0xc06afe3a8444fc0004668591e8306bfb9968e79e, #0x1234, 0x00
diff --git a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
index c98c4e312d..dd44a1b595 100644
--- a/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/new_operator.sol
@@ -13,4 +13,4 @@ contract D {
 }
 // ----
 // f() -> 2
-// gas legacy: 100201
+// gas legacy: 100211
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
index 6ae5af9ff0..b6a33fb7e8 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_no_args.sol
@@ -11,4 +11,4 @@ contract D {
 }
 // ----
 // f() -> 2
-// gas legacy: 100175
+// gas legacy: 100185
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index 9c9d52fd29..0fd2efeb9f 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -15,7 +15,7 @@ contract D {
 }
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 193985
-// gas legacy: 241212
-// gas legacyOptimized: 192949
+// gas irOptimized: 193999
+// gas legacy: 241234
+// gas legacyOptimized: 192961
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index 0255dd9bf9..5952a88e06 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -17,7 +17,7 @@ contract D {
 // EVMVersion: >=constantinople
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 194148
-// gas legacy: 241584
-// gas legacyOptimized: 193181
+// gas irOptimized: 194162
+// gas legacy: 241606
+// gas legacyOptimized: 193193
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 646536de67..abff2c9e7e 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -39,9 +39,9 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 260040
-// gas legacy: 391566
-// gas legacyOptimized: 268079
+// gas irOptimized: 260052
+// gas legacy: 391588
+// gas legacyOptimized: 268089
 // sendAmount(uint256): 5 -> 5
 // outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway #
 // checkState() -> false, 15
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index c4ff3c58cb..dd7487cdfd 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -38,9 +38,9 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 260040
-// gas legacy: 391566
-// gas legacyOptimized: 268079
+// gas irOptimized: 260052
+// gas legacy: 391588
+// gas legacyOptimized: 268089
 // sendAmount(uint256): 5 -> 5
 // outOfGas() -> FAILURE # call to helper should not succeed but amount should be transferred anyway #
 // checkState() -> false, 15
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index 43b49c4222..b1d0fc0c3b 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -27,5 +27,5 @@ contract C {
 // ----
 // t() -> 9
 // gas irOptimized: 99064
-// gas legacy: 149071
-// gas legacyOptimized: 106176
+// gas legacy: 149095
+// gas legacyOptimized: 106188
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index 89dcd75050..8aaf961aa2 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -27,8 +27,8 @@ contract C {
 }
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 124829
-// gas legacy: 148500
-// gas legacyOptimized: 123951
+// gas irOptimized: 124849
+// gas legacy: 148528
+// gas legacyOptimized: 123971
 // x() -> 7
 // y() -> 5
diff --git a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
index 157b7e10f6..aa9dc4b992 100644
--- a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
+++ b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
@@ -22,7 +22,7 @@ contract D {
 // ----
 // f() -> 1
 // gas irOptimized: 77051
-// gas legacy: 112260
+// gas legacy: 112280
 // g() -> 5
 // gas irOptimized: 77106
-// gas legacy: 112796
+// gas legacy: 112816
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
index fbe519849c..0663ddf4cc 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
@@ -24,4 +24,4 @@ contract B {
 // ----
 // g() -> 42
 // gas irOptimized: 80813
-// gas legacy: 122447
+// gas legacy: 122471
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index 426cf7b196..e9339e6641 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -23,6 +23,6 @@ contract B {
 
 // ----
 // g() -> 42
-// gas irOptimized: 100266
-// gas legacy: 180398
-// gas legacyOptimized: 112576
+// gas irOptimized: 100282
+// gas legacy: 180440
+// gas legacyOptimized: 112596
diff --git a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
index c057164d0d..c0eef13c4b 100644
--- a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
+++ b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
@@ -20,6 +20,6 @@ contract A {
 
 // ----
 // g(int256): -1 -> -1
-// gas legacy: 102064
+// gas legacy: 102086
 // g(int256): 10 -> 10
-// gas legacy: 101692
+// gas legacy: 101714
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index f905856c50..dce48fa28c 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -40,9 +40,9 @@ contract Main {
 
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 266864
-// gas legacy: 392744
-// gas legacyOptimized: 261611
+// gas irOptimized: 266886
+// gas legacy: 392786
+// gas legacyOptimized: 261633
 // getFlag() -> true
 // getName() -> "abc"
 // getBalances() -> 12, 10
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 1746fd0db6..39f3c2d0fa 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -16,9 +16,9 @@ contract ClientReceipt {
 }
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 171859
-// gas legacy: 230026
-// gas legacyOptimized: 173877
+// gas irOptimized: 171865
+// gas legacy: 230038
+// gas legacyOptimized: 173883
 // balance -> 1500
 // gas irOptimized: 191881
 // gas legacy: 235167
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
index 85de20f70e..ce6a0f48db 100644
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_making_pure_external_call.sol
@@ -52,10 +52,10 @@ contract C {
 }
 // ----
 // testMul(int32,int32): 42, 10 -> 420
-// gas irOptimized: 102545
-// gas legacy: 183939
-// gas legacyOptimized: 123539
+// gas irOptimized: 102563
+// gas legacy: 183981
+// gas legacyOptimized: 123563
 // testInc(int32): 42 -> 43
-// gas irOptimized: 102368
-// gas legacy: 183197
-// gas legacyOptimized: 123227
+// gas irOptimized: 102386
+// gas legacy: 183239
+// gas legacyOptimized: 123251
diff --git a/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol b/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
index 904a1cdf8e..f3f8ebdc63 100644
--- a/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
+++ b/test/libsolidity/semanticTests/operators/userDefined/operator_making_view_external_call.sol
@@ -58,10 +58,10 @@ contract C {
 }
 // ----
 // testMul(int32,int32): 42, 10 -> 420
-// gas irOptimized: 102545
-// gas legacy: 183939
-// gas legacyOptimized: 123539
+// gas irOptimized: 102563
+// gas legacy: 183981
+// gas legacyOptimized: 123563
 // testInc(int32): 42 -> 43
-// gas irOptimized: 102368
-// gas legacy: 183197
-// gas legacyOptimized: 123227
+// gas irOptimized: 102386
+// gas legacy: 183239
+// gas legacyOptimized: 123251
diff --git a/test/libsolidity/semanticTests/salted_create/prediction_example.sol b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
index 7116407b64..1c5ce63ad4 100644
--- a/test/libsolidity/semanticTests/salted_create/prediction_example.sol
+++ b/test/libsolidity/semanticTests/salted_create/prediction_example.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: also
 // ----
 // createDSalted(bytes32,uint256): 42, 64 ->
-// gas legacy: 102921
+// gas legacy: 102943
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create.sol b/test/libsolidity/semanticTests/salted_create/salted_create.sol
index f241cc2da8..11b74168d9 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create.sol
@@ -23,4 +23,4 @@ contract A {
 // same_salt() -> true
 // gas irOptimized: 98438897
 // gas legacy: 98439109
-// gas legacyOptimized: 98438966
+// gas legacyOptimized: 98438967
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 514b424f6c..025c8259db 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -21,6 +21,6 @@ contract A {
 // EVMVersion: >=constantinople
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 254190
-// gas legacy: 380967
-// gas legacyOptimized: 279640
+// gas irOptimized: 254238
+// gas legacy: 381063
+// gas legacyOptimized: 279694
diff --git a/test/libsolidity/semanticTests/smoke/alignment.sol b/test/libsolidity/semanticTests/smoke/alignment.sol
index 0b603d97e6..3e8016f988 100644
--- a/test/libsolidity/semanticTests/smoke/alignment.sol
+++ b/test/libsolidity/semanticTests/smoke/alignment.sol
@@ -25,5 +25,5 @@ contract D {
 // stateDecimal() -> right(42)
 // stateBytes() -> left(0x4200ef)
 // internalStateDecimal() -> 0x20
-// gas legacy: 100255
+// gas legacy: 100265
 // update(bool,uint256,bytes32): false, -23, left(0x2300ef) -> false, -23, left(0x2300ef)
diff --git a/test/libsolidity/semanticTests/using/using_global_invisible.sol b/test/libsolidity/semanticTests/using/using_global_invisible.sol
index 296370a7f4..3e767a185d 100644
--- a/test/libsolidity/semanticTests/using/using_global_invisible.sol
+++ b/test/libsolidity/semanticTests/using/using_global_invisible.sol
@@ -40,4 +40,4 @@ contract D {
 // ----
 // library: "A":L
 // test() -> 3
-// gas legacy: 120859
+// gas legacy: 120881
diff --git a/test/libsolidity/semanticTests/various/code_access_content.sol b/test/libsolidity/semanticTests/various/code_access_content.sol
index 9ce796ad00..92d31d6214 100644
--- a/test/libsolidity/semanticTests/various/code_access_content.sol
+++ b/test/libsolidity/semanticTests/various/code_access_content.sol
@@ -38,6 +38,6 @@ contract C {
 }
 // ----
 // testRuntime() -> true
-// gas legacy: 100165
+// gas legacy: 100177
 // testCreation() -> true
-// gas legacy: 100588
+// gas legacy: 100600
diff --git a/test/libsolidity/semanticTests/various/code_access_create.sol b/test/libsolidity/semanticTests/various/code_access_create.sol
index d6c4f9802b..839608aaf5 100644
--- a/test/libsolidity/semanticTests/various/code_access_create.sol
+++ b/test/libsolidity/semanticTests/various/code_access_create.sol
@@ -24,4 +24,4 @@ contract C {
 
 // ----
 // test() -> 7
-// gas legacy: 100839
+// gas legacy: 100849
diff --git a/test/libsolidity/semanticTests/various/code_access_runtime.sol b/test/libsolidity/semanticTests/various/code_access_runtime.sol
index 701218ae6e..d22d3e43cb 100644
--- a/test/libsolidity/semanticTests/various/code_access_runtime.sol
+++ b/test/libsolidity/semanticTests/various/code_access_runtime.sol
@@ -24,4 +24,4 @@ contract C {
 // EVMVersion: >=constantinople
 // ----
 // test() -> 42
-// gas legacy: 100225
+// gas legacy: 100235
diff --git a/test/libsolidity/semanticTests/various/external_types_in_calls.sol b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
index 8b88d03bc1..6b28f542c7 100644
--- a/test/libsolidity/semanticTests/various/external_types_in_calls.sol
+++ b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
@@ -25,5 +25,5 @@ contract C {
 
 // ----
 // test() -> 9, 7
-// gas legacy: 127478
+// gas legacy: 127514
 // t2() -> 9
diff --git a/test/libsolidity/semanticTests/various/selfdestruct.sol b/test/libsolidity/semanticTests/various/selfdestruct.sol
index 081f3ef335..366bac41de 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct.sol
@@ -30,9 +30,9 @@ contract D {
 }
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 186962
-// gas legacy: 255963
-// gas legacyOptimized: 178911
+// gas irOptimized: 186970
+// gas legacy: 255973
+// gas legacyOptimized: 178919
 // c() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
 // balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 1000000000000000000
 // balance -> 0
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 892149b3b3..9f391e2a17 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -17,7 +17,7 @@ contract D {
 
 // ----
 // constructor(), 27 wei ->
-// gas irOptimized: 169371
-// gas legacy: 218447
-// gas legacyOptimized: 167286
+// gas irOptimized: 169377
+// gas legacy: 218459
+// gas legacyOptimized: 167292
 // f() -> 27
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index e84dac23f1..d95a2cd7ca 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -35,7 +35,7 @@ contract D {
 // EVMVersion: >=byzantium
 // ----
 // f() -> 0x1 # This should work, next should throw #
-// gas legacy: 102085
+// gas legacy: 102095
 // fview() -> FAILURE
 // gas irOptimized: 98438596
 // gas legacy: 98438774
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index cd7243a13c..a799b7d9bf 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -20,7 +20,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 174345
-// gas legacy: 252286
-// gas legacyOptimized: 180346
+// gas irOptimized: 174351
+// gas legacy: 252296
+// gas legacyOptimized: 180352
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 7fb6d50210..8718bd4224 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -19,7 +19,7 @@ contract test {
 
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 175209
-// gas legacy: 253810
-// gas legacyOptimized: 180778
+// gas irOptimized: 175215
+// gas legacy: 253820
+// gas legacyOptimized: 180784
 // sendAmount(uint256): 5 -> 8

From 3bab14747ece3e0d13c5489ae11f59833208b706 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 9 May 2023 19:33:02 +0200
Subject: [PATCH 1362/1748] Fix hidden-overload in Types and remove CMake hack

---
 cmake/EthCompilerSettings.cmake          | 5 -----
 libsolidity/ast/Types.cpp                | 4 ++--
 libsolidity/ast/Types.h                  | 2 +-
 libsolidity/codegen/YulUtilFunctions.cpp | 8 ++++----
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 54a782c6e3..107108c9ee 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -66,11 +66,6 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 			add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>)
 		endif()
 		# TODO: This is a temporary workaround. The underlying warning should be addressed and this workaround removed ASAP.
-		check_cxx_compiler_flag(-Wno-error=overloaded-virtual=1 WNO_ERROR_OVERLOADED_VIRTUAL)
-		if (WNO_ERROR_OVERLOADED_VIRTUAL)
-			add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-error=overloaded-virtual=1>)
-		endif()
-		# TODO: This is a temporary workaround. The underlying warning should be addressed and this workaround removed ASAP.
 		# Once https://github.com/fmtlib/fmt/issues/3415 is addressed, this can be fixed by bumping the fmtlib version.
 		check_cxx_compiler_flag(-Wno-error=dangling-reference WNO_ERROR_DANGLING_REFERENCE)
 		if (WNO_ERROR_DANGLING_REFERENCE)
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 1218baee3a..6308dbe3d1 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -1694,7 +1694,7 @@ bool ArrayType::operator==(Type const& _other) const
 		return false;
 	ArrayType const& other = dynamic_cast<ArrayType const&>(_other);
 	if (
-		!ReferenceType::operator==(other) ||
+		!equals(other) ||
 		other.isByteArray() != isByteArray() ||
 		other.isString() != isString() ||
 		other.isDynamicallySized() != isDynamicallySized()
@@ -2204,7 +2204,7 @@ bool StructType::operator==(Type const& _other) const
 	if (_other.category() != category())
 		return false;
 	StructType const& other = dynamic_cast<StructType const&>(_other);
-	return ReferenceType::operator==(other) && other.m_struct == m_struct;
+	return equals(other) && other.m_struct == m_struct;
 }
 
 
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index fa1a299a97..1fc0a7e17f 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -803,7 +803,7 @@ class ReferenceType: public CompositeType
 	/// if the type has an interfaceType.
 	virtual BoolResult validForLocation(DataLocation _loc) const = 0;
 
-	bool operator==(ReferenceType const& _other) const
+	bool equals(ReferenceType const& _other) const
 	{
 		return location() == _other.location() && isPointer() == _other.isPointer();
 	}
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index fa55738107..db020fc67d 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -1833,7 +1833,7 @@ string YulUtilFunctions::clearStorageStructFunction(StructType const& _type)
 string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
 {
 	solAssert(
-		*_fromType.copyForLocation(_toType.location(), _toType.isPointer()) == dynamic_cast<ReferenceType const&>(_toType),
+		(*_fromType.copyForLocation(_toType.location(), _toType.isPointer())).equals(dynamic_cast<ReferenceType const&>(_toType)),
 		""
 	);
 	if (!_toType.isDynamicallySized())
@@ -1930,7 +1930,7 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 string YulUtilFunctions::copyByteArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
 {
 	solAssert(
-		*_fromType.copyForLocation(_toType.location(), _toType.isPointer()) == dynamic_cast<ReferenceType const&>(_toType),
+		(*_fromType.copyForLocation(_toType.location(), _toType.isPointer())).equals(dynamic_cast<ReferenceType const&>(_toType)),
 		""
 	);
 	solAssert(_fromType.isByteArrayOrString(), "");
@@ -2840,10 +2840,10 @@ string YulUtilFunctions::updateStorageValueFunction(
 			.render();
 		}
 
-		solAssert(*toReferenceType->copyForLocation(
+		solAssert((*toReferenceType->copyForLocation(
 			fromReferenceType->location(),
 			fromReferenceType->isPointer()
-		).get() == *fromReferenceType, "");
+		).get()).equals(*fromReferenceType), "");
 
 		if (fromReferenceType->category() == Type::Category::ArraySlice)
 			solAssert(toReferenceType->category() == Type::Category::Array, "");

From 3bec4c09befd87159a74a628580338f5772e44c6 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 9 May 2023 19:54:00 +0200
Subject: [PATCH 1363/1748] Disable dangling-reference warning

---
 cmake/EthCompilerSettings.cmake | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 107108c9ee..4dd5934584 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -65,11 +65,10 @@ if (("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR ("${CMAKE_CXX_COMPILER_ID}" MA
 		if(WEXTRA_SEMI)
 			add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wextra-semi>)
 		endif()
-		# TODO: This is a temporary workaround. The underlying warning should be addressed and this workaround removed ASAP.
-		# Once https://github.com/fmtlib/fmt/issues/3415 is addressed, this can be fixed by bumping the fmtlib version.
-		check_cxx_compiler_flag(-Wno-error=dangling-reference WNO_ERROR_DANGLING_REFERENCE)
-		if (WNO_ERROR_DANGLING_REFERENCE)
-            add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-error=dangling-reference>)
+		# See https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=6b927b1297e66e26e62e722bf15c921dcbbd25b9
+		check_cxx_compiler_flag(-Wno-dangling-reference WNO_DANGLING_REFERENCE)
+		if (WNO_DANGLING_REFERENCE)
+            add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-dangling-reference>)
 		endif()
 
 

From 4837d4236110660871f0a5d8ac1a93ad9e7b6a96 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Fri, 28 Apr 2023 11:29:59 -0500
Subject: [PATCH 1364/1748] Add experimental support to import AST via Standard
 JSON.

---
 Changelog.md                                  |   1 +
 docs/using-the-compiler.rst                   |  10 +-
 libsolidity/interface/StandardCompiler.cpp    | 186 +++++++++++-------
 libsolidity/interface/StandardCompiler.h      |   1 +
 scripts/ASTImportTest.sh                      |  23 ++-
 solc/CommandLineInterface.cpp                 |   7 +-
 .../combined_json_with_base_path/output       |   6 +-
 .../no_contract_combined_json/output          |   3 +-
 .../standard_import_ast/input.json            |  94 +++++++++
 .../standard_import_ast/output.json           |  97 +++++++++
 .../input.json                                |  50 +++++
 .../output.json                               |  30 +++
 test/libsolidity/StandardCompiler.cpp         |   2 +-
 13 files changed, 432 insertions(+), 78 deletions(-)
 create mode 100644 test/cmdlineTests/standard_import_ast/input.json
 create mode 100644 test/cmdlineTests/standard_import_ast/output.json
 create mode 100644 test/cmdlineTests/standard_import_ast_select_bytecode/input.json
 create mode 100644 test/cmdlineTests/standard_import_ast_select_bytecode/output.json

diff --git a/Changelog.md b/Changelog.md
index f00234d8ba..aed64a0c0a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -14,6 +14,7 @@ Compiler Features:
  * Parser: Unary plus is no longer recognized as a unary operator in the AST and triggers an error at the parsing stage (rather than later during the analysis).
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
  * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
+ * Standard JSON Interface: Add experimental support for importing ASTs via Standard JSON.
  * Yul EVM Code Transform: If available, use ``push0`` instead of ``codesize`` to produce an arbitrary value on stack in order to create equal stack heights between branches.
 
 
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 3931728da3..fa1a4ec322 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -203,7 +203,7 @@ Input Description
 .. code-block:: javascript
 
     {
-      // Required: Source code language. Currently supported are "Solidity" and "Yul".
+      // Required: Source code language. Currently supported are "Solidity", "Yul" and "SolidityAST" (experimental).
       "language": "Solidity",
       // Required
       "sources":
@@ -230,6 +230,14 @@ Input Description
             // If files are used, their directories should be added to the command line via
             // `--allow-paths <path>`.
           ]
+          // If language is set to "SolidityAST", an AST needs to be supplied under the "ast" key.
+          // Note that importing ASTs is experimental and in particular that:
+          // - importing invalid ASTs can produce undefined results and
+          // - no proper error reporting is available on invalid ASTs.
+          // Furthermore, note that the AST import only consumes the fields of the AST as
+          // produced by the compiler in "stopAfter": "parsing" mode and then re-performs
+          // analysis, so any analysis-based annotations of the AST are ignored upon import.
+          "ast": { ... } // formatted as the json ast requested with the ``ast`` output selection.
         },
         "destructible":
         {
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 1511b2179b..dbcbe798aa 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -657,72 +657,84 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 
 	ret.errors = Json::arrayValue;
 
-	for (auto const& sourceName: sources.getMemberNames())
+	if (ret.language == "Solidity" || ret.language == "Yul")
 	{
-		string hash;
+		for (auto const& sourceName: sources.getMemberNames())
+		{
+			string hash;
 
-		if (auto result = checkSourceKeys(sources[sourceName], sourceName))
-			return *result;
+			if (auto result = checkSourceKeys(sources[sourceName], sourceName))
+				return *result;
 
-		if (sources[sourceName]["keccak256"].isString())
-			hash = sources[sourceName]["keccak256"].asString();
+			if (sources[sourceName]["keccak256"].isString())
+				hash = sources[sourceName]["keccak256"].asString();
 
-		if (sources[sourceName]["content"].isString())
-		{
-			string content = sources[sourceName]["content"].asString();
-			if (!hash.empty() && !hashMatchesContent(hash, content))
-				ret.errors.append(formatError(
-					Error::Type::IOError,
-					"general",
-					"Mismatch between content and supplied hash for \"" + sourceName + "\""
-				));
-			else
-				ret.sources[sourceName] = content;
-		}
-		else if (sources[sourceName]["urls"].isArray())
-		{
-			if (!m_readFile)
-				return formatFatalError(Error::Type::JSONError, "No import callback supplied, but URL is requested.");
+			if (sources[sourceName]["content"].isString())
+			{
+				string content = sources[sourceName]["content"].asString();
+				if (!hash.empty() && !hashMatchesContent(hash, content))
+					ret.errors.append(formatError(
+						Error::Type::IOError,
+						"general",
+						"Mismatch between content and supplied hash for \"" + sourceName + "\""
+					));
+				else
+					ret.sources[sourceName] = content;
+			}
+			else if (sources[sourceName]["urls"].isArray())
+			{
+				if (!m_readFile)
+					return formatFatalError(
+						Error::Type::JSONError, "No import callback supplied, but URL is requested."
+					);
 
-			vector<string> failures;
-			bool found = false;
+				vector<string> failures;
+				bool found = false;
 
-			for (auto const& url: sources[sourceName]["urls"])
-			{
-				if (!url.isString())
-					return formatFatalError(Error::Type::JSONError, "URL must be a string.");
-				ReadCallback::Result result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), url.asString());
-				if (result.success)
+				for (auto const& url: sources[sourceName]["urls"])
 				{
-					if (!hash.empty() && !hashMatchesContent(hash, result.responseOrErrorMessage))
-						ret.errors.append(formatError(
-							Error::Type::IOError,
-							"general",
-							"Mismatch between content and supplied hash for \"" + sourceName + "\" at \"" + url.asString() + "\""
-						));
-					else
+					if (!url.isString())
+						return formatFatalError(Error::Type::JSONError, "URL must be a string.");
+					ReadCallback::Result result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), url.asString());
+					if (result.success)
 					{
-						ret.sources[sourceName] = result.responseOrErrorMessage;
-						found = true;
-						break;
+						if (!hash.empty() && !hashMatchesContent(hash, result.responseOrErrorMessage))
+							ret.errors.append(formatError(
+								Error::Type::IOError,
+								"general",
+								"Mismatch between content and supplied hash for \"" + sourceName + "\" at \"" + url.asString() + "\""
+							));
+						else
+						{
+							ret.sources[sourceName] = result.responseOrErrorMessage;
+							found = true;
+							break;
+						}
 					}
+					else
+						failures.push_back(
+							"Cannot import url (\"" + url.asString() + "\"): " + result.responseOrErrorMessage
+						);
 				}
-				else
-					failures.push_back("Cannot import url (\"" + url.asString() + "\"): " + result.responseOrErrorMessage);
-			}
 
-			for (auto const& failure: failures)
-			{
-				/// If the import succeeded, let mark all the others as warnings, otherwise all of them are errors.
-				ret.errors.append(formatError(
-					found ? Error::Type::Warning : Error::Type::IOError,
-					"general",
-					failure
-				));
+				for (auto const& failure: failures)
+				{
+					/// If the import succeeded, let mark all the others as warnings, otherwise all of them are errors.
+					ret.errors.append(formatError(
+						found ? Error::Type::Warning : Error::Type::IOError,
+						"general",
+						failure
+					));
+				}
 			}
+			else
+				return formatFatalError(Error::Type::JSONError, "Invalid input source specified.");
 		}
-		else
-			return formatFatalError(Error::Type::JSONError, "Invalid input source specified.");
+	}
+	else if (ret.language == "SolidityAST")
+	{
+		for (auto const& sourceName: sources.getMemberNames())
+			ret.sources[sourceName] = util::jsonCompactPrint(sources[sourceName]);
 	}
 
 	Json::Value const& auxInputs = _input["auxiliaryInput"];
@@ -1117,7 +1129,24 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.modelCheckerSettings.timeout = modelCheckerSettings["timeout"].asUInt();
 	}
 
-	return { std::move(ret) };
+	return {std::move(ret)};
+}
+
+map<string, Json::Value> StandardCompiler::parseAstFromInput(StringMap const& _sources)
+{
+	map<string, Json::Value> sourceJsons;
+	for (auto const& [sourceName, sourceCode]: _sources)
+	{
+		Json::Value ast;
+		astAssert(util::jsonParseStrict(sourceCode, ast), "Input file could not be parsed to JSON");
+		string astKey = ast.isMember("ast") ? "ast" : "AST";
+
+		astAssert(ast.isMember(astKey), "astkey is not member");
+		astAssert(ast[astKey]["nodeType"].asString() == "SourceUnit", "Top-level node should be a 'SourceUnit'");
+		astAssert(sourceJsons.count(sourceName) == 0, "All sources must have unique names");
+		sourceJsons.emplace(sourceName, std::move(ast[astKey]));
+	}
+	return sourceJsons;
 }
 
 Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inputsAndSettings)
@@ -1125,7 +1154,8 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	CompilerStack compilerStack(m_readFile);
 
 	StringMap sourceList = std::move(_inputsAndSettings.sources);
-	compilerStack.setSources(sourceList);
+	if (_inputsAndSettings.language == "Solidity")
+		compilerStack.setSources(sourceList);
 	for (auto const& smtLib2Response: _inputsAndSettings.smtLib2Responses)
 		compilerStack.addSMTLib2Response(smtLib2Response.first, smtLib2Response.second);
 	compilerStack.setViaIR(_inputsAndSettings.viaIR);
@@ -1153,23 +1183,37 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 
 	try
 	{
-		if (binariesRequested)
-			compilerStack.compile();
+		if (_inputsAndSettings.language == "SolidityAST")
+		{
+			try
+			{
+				compilerStack.importASTs(parseAstFromInput(sourceList));
+				if (!compilerStack.analyze())
+					errors.append(formatError(Error::Type::FatalError, "general", "Analysis of the AST failed."));
+				if (binariesRequested)
+					compilerStack.compile();
+			}
+			catch (util::Exception const& _exc)
+			{
+				solThrow(util::Exception, "Failed to import AST: "s + _exc.what());
+			}
+		}
 		else
-			compilerStack.parseAndAnalyze(_inputsAndSettings.stopAfter);
-
-		for (auto const& error: compilerStack.errors())
 		{
-			Error const& err = dynamic_cast<Error const&>(*error);
+			if (binariesRequested)
+				compilerStack.compile();
+			else
+				compilerStack.parseAndAnalyze(_inputsAndSettings.stopAfter);
 
-			errors.append(formatErrorWithException(
-				compilerStack,
-				*error,
-				err.type(),
-				"general",
-				"",
-				err.errorId()
-			));
+			for (auto const& error: compilerStack.errors())
+				errors.append(formatErrorWithException(
+					compilerStack,
+					*error,
+					error->type(),
+					"general",
+					"",
+					error->errorId()
+				));
 		}
 	}
 	/// This is only thrown in a very few locations.
@@ -1558,8 +1602,10 @@ Json::Value StandardCompiler::compile(Json::Value const& _input) noexcept
 			return compileSolidity(std::move(settings));
 		else if (settings.language == "Yul")
 			return compileYul(std::move(settings));
+		else if (settings.language == "SolidityAST")
+			return compileSolidity(std::move(settings));
 		else
-			return formatFatalError(Error::Type::JSONError, "Only \"Solidity\" or \"Yul\" is supported as a language.");
+			return formatFatalError(Error::Type::JSONError, "Only \"Solidity\", \"Yul\" or \"SolidityAST\" is supported as a language.");
 	}
 	catch (Json::LogicError const& _exception)
 	{
diff --git a/libsolidity/interface/StandardCompiler.h b/libsolidity/interface/StandardCompiler.h
index f06dd0c5ab..588813d76d 100644
--- a/libsolidity/interface/StandardCompiler.h
+++ b/libsolidity/interface/StandardCompiler.h
@@ -95,6 +95,7 @@ class StandardCompiler
 	/// it in condensed form or an error as a json object.
 	std::variant<InputsAndSettings, Json::Value> parseInput(Json::Value const& _input);
 
+	std::map<std::string, Json::Value> parseAstFromInput(StringMap const& _sources);
 	Json::Value compileSolidity(InputsAndSettings _inputsAndSettings);
 	Json::Value compileYul(InputsAndSettings _inputsAndSettings);
 
diff --git a/scripts/ASTImportTest.sh b/scripts/ASTImportTest.sh
index 4d6bc56d5f..faf98c1926 100755
--- a/scripts/ASTImportTest.sh
+++ b/scripts/ASTImportTest.sh
@@ -101,6 +101,7 @@ function test_ast_import_export_equivalence
 
     local export_command=("$SOLC" --combined-json ast --pretty-json --json-indent 4 "${input_files[@]}")
     local import_command=("$SOLC" --import-ast --combined-json ast --pretty-json --json-indent 4 expected.json)
+    local import_via_standard_json_command=("$SOLC" --combined-json ast --pretty-json --json-indent 4 --standard-json standard_json_input.json)
 
     # export ast - save ast json as expected result (silently)
     if ! "${export_command[@]}" > expected.json 2> stderr_export.txt
@@ -118,8 +119,28 @@ function test_ast_import_export_equivalence
         return 1
     fi
 
+    echo ". += {\"sources\":" > _ast_json.json
+    jq .sources expected.json >> _ast_json.json
+    echo "}" >> _ast_json.json
+    echo "{\"language\": \"SolidityAST\", \"settings\": {\"outputSelection\": {\"*\": {\"\": [\"ast\"]}}}}" > standard_json.json
+    jq --from-file _ast_json.json standard_json.json > standard_json_input.json
+
+    # (re)import ast via standard json - and export it again as obtained result (silently)
+    if ! "${import_via_standard_json_command[@]}" > obtained_standard_json.json 2> stderr_import.txt
+    then
+        print_stderr_stdout "ERROR: AST reimport failed (import) for input file ${sol_file}." ./stderr_import.txt ./obtained_standard_json.json
+        print_used_commands "$(pwd)" "${export_command[*]} > expected.json" "${import_command[*]}"
+        return 1
+    fi
+
+    jq .sources expected.json > expected_standard_json.json
+    jq .sources obtained_standard_json.json >  obtained_standard_json_.json
+    jq 'walk(if type == "object" and has("ast") then .AST = .ast | del(.ast) else . end)' < obtained_standard_json_.json > obtained_standard_json.json
+    jq --sort-keys . < obtained_standard_json.json > obtained_standard_json_.json
+    mv obtained_standard_json_.json obtained_standard_json.json
+
     # compare expected and obtained ASTs
-    if ! diff_files expected.json obtained.json
+    if ! diff_files expected.json obtained.json || ! diff_files expected_standard_json.json obtained_standard_json.json
     then
         printError "ERROR: AST reimport failed for ${sol_file}"
         if (( EXIT_ON_ERROR == 1 ))
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 5037552c33..7da0d3bf1b 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -879,9 +879,12 @@ void CommandLineInterface::handleCombinedJSON()
 		output[g_strSources] = Json::Value(Json::objectValue);
 		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
-			ASTJsonExporter converter(m_compiler->state(), m_compiler->sourceIndices());
 			output[g_strSources][sourceCode.first] = Json::Value(Json::objectValue);
-			output[g_strSources][sourceCode.first]["AST"] = converter.toJson(m_compiler->ast(sourceCode.first));
+			output[g_strSources][sourceCode.first]["AST"] = ASTJsonExporter(
+																m_compiler->state(),
+																m_compiler->sourceIndices()
+															).toJson(m_compiler->ast(sourceCode.first));
+			output[g_strSources][sourceCode.first]["id"] = m_compiler->sourceIndices().at(sourceCode.first);
 		}
 	}
 
diff --git a/test/cmdlineTests/combined_json_with_base_path/output b/test/cmdlineTests/combined_json_with_base_path/output
index 1277733201..ec9bbcbcb2 100644
--- a/test/cmdlineTests/combined_json_with_base_path/output
+++ b/test/cmdlineTests/combined_json_with_base_path/output
@@ -61,7 +61,8 @@
           }
         ],
         "src": "36:38:0"
-      }
+      },
+      "id": 0
     },
     "combined_json_with_base_path/input.sol":
     {
@@ -105,7 +106,8 @@
           }
         ],
         "src": "36:42:1"
-      }
+      },
+      "id": 1
     }
   },
   "version": "<VERSION REMOVED>"
diff --git a/test/cmdlineTests/no_contract_combined_json/output b/test/cmdlineTests/no_contract_combined_json/output
index af73008960..e0caa6fa1a 100644
--- a/test/cmdlineTests/no_contract_combined_json/output
+++ b/test/cmdlineTests/no_contract_combined_json/output
@@ -29,7 +29,8 @@
                     }
                 ],
                 "src": "36:22:0"
-            }
+            },
+            "id": 0
         }
     },
     "version": "<VERSION REMOVED>"
diff --git a/test/cmdlineTests/standard_import_ast/input.json b/test/cmdlineTests/standard_import_ast/input.json
new file mode 100644
index 0000000000..5ae7a5297d
--- /dev/null
+++ b/test/cmdlineTests/standard_import_ast/input.json
@@ -0,0 +1,94 @@
+{
+	"language": "SolidityAST",
+	"sources": {
+		"A": {
+			"ast": {
+				"absolutePath": "A",
+				"exportedSymbols": {
+					"C": [
+						6
+					]
+				},
+				"id": 7,
+				"license": "GPL-3.0",
+				"nodeType": "SourceUnit",
+				"nodes": [
+					{
+						"id": 1,
+						"literals": [
+							"solidity",
+							">=",
+							"0.0"
+						],
+						"nodeType": "PragmaDirective",
+						"src": "36:22:0"
+					},
+					{
+						"abstract": false,
+						"baseContracts": [],
+						"canonicalName": "C",
+						"contractDependencies": [],
+						"contractKind": "contract",
+						"fullyImplemented": true,
+						"id": 6,
+						"linearizedBaseContracts": [
+							6
+						],
+						"name": "C",
+						"nameLocation": "68:1:0",
+						"nodeType": "ContractDefinition",
+						"nodes": [
+							{
+								"body": {
+									"id": 4,
+									"nodeType": "Block",
+									"src": "97:2:0",
+									"statements": []
+								},
+								"functionSelector": "26121ff0",
+								"id": 5,
+								"implemented": true,
+								"kind": "function",
+								"modifiers": [],
+								"name": "f",
+								"nameLocation": "81:1:0",
+								"nodeType": "FunctionDefinition",
+								"parameters": {
+									"id": 2,
+									"nodeType": "ParameterList",
+									"parameters": [],
+									"src": "82:2:0"
+								},
+								"returnParameters": {
+									"id": 3,
+									"nodeType": "ParameterList",
+									"parameters": [],
+									"src": "97:0:0"
+								},
+								"scope": 6,
+								"src": "72:27:0",
+								"stateMutability": "pure",
+								"virtual": false,
+								"visibility": "public"
+							}
+						],
+						"scope": 7,
+						"src": "59:42:0",
+						"usedErrors": []
+					}
+				],
+				"src": "36:65:0"
+			},
+			"id": 0
+		}
+	},
+	"settings": {
+		"outputSelection": {
+			"*": {
+				"": [
+					"ast"
+				]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_import_ast/output.json b/test/cmdlineTests/standard_import_ast/output.json
new file mode 100644
index 0000000000..6ecac5ca36
--- /dev/null
+++ b/test/cmdlineTests/standard_import_ast/output.json
@@ -0,0 +1,97 @@
+{
+    "sources":
+    {
+        "A":
+        {
+            "ast":
+            {
+                "absolutePath": "A",
+                "exportedSymbols":
+                {
+                    "C":
+                    [
+                        6
+                    ]
+                },
+                "id": 7,
+                "license": "GPL-3.0",
+                "nodeType": "SourceUnit",
+                "nodes":
+                [
+                    {
+                        "id": 1,
+                        "literals":
+                        [
+                            "solidity",
+                            ">=",
+                            "0.0"
+                        ],
+                        "nodeType": "PragmaDirective",
+                        "src": "36:22:0"
+                    },
+                    {
+                        "abstract": false,
+                        "baseContracts": [],
+                        "canonicalName": "C",
+                        "contractDependencies": [],
+                        "contractKind": "contract",
+                        "fullyImplemented": true,
+                        "id": 6,
+                        "linearizedBaseContracts":
+                        [
+                            6
+                        ],
+                        "name": "C",
+                        "nameLocation": "68:1:0",
+                        "nodeType": "ContractDefinition",
+                        "nodes":
+                        [
+                            {
+                                "body":
+                                {
+                                    "id": 4,
+                                    "nodeType": "Block",
+                                    "src": "97:2:0",
+                                    "statements": []
+                                },
+                                "functionSelector": "26121ff0",
+                                "id": 5,
+                                "implemented": true,
+                                "kind": "function",
+                                "modifiers": [],
+                                "name": "f",
+                                "nameLocation": "81:1:0",
+                                "nodeType": "FunctionDefinition",
+                                "parameters":
+                                {
+                                    "id": 2,
+                                    "nodeType": "ParameterList",
+                                    "parameters": [],
+                                    "src": "82:2:0"
+                                },
+                                "returnParameters":
+                                {
+                                    "id": 3,
+                                    "nodeType": "ParameterList",
+                                    "parameters": [],
+                                    "src": "97:0:0"
+                                },
+                                "scope": 6,
+                                "src": "72:27:0",
+                                "stateMutability": "pure",
+                                "virtual": false,
+                                "visibility": "public"
+                            }
+                        ],
+                        "scope": 7,
+                        "src": "59:42:0",
+                        "usedErrors": [],
+                        "usedEvents": []
+                    }
+                ],
+                "src": "36:65:0"
+            },
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_ast_select_bytecode/input.json b/test/cmdlineTests/standard_import_ast_select_bytecode/input.json
new file mode 100644
index 0000000000..6458cb7e15
--- /dev/null
+++ b/test/cmdlineTests/standard_import_ast_select_bytecode/input.json
@@ -0,0 +1,50 @@
+{
+  "language": "SolidityAST",
+  "sources": {
+    "A": {
+      "ast": {
+        "absolutePath": "empty_contract.sol",
+        "exportedSymbols": {
+          "test": [
+            1
+          ]
+        },
+        "id": 2,
+        "nodeType": "SourceUnit",
+        "nodes": [
+          {
+            "abstract": false,
+            "baseContracts": [],
+            "canonicalName": "test",
+            "contractDependencies": [],
+            "contractKind": "contract",
+            "fullyImplemented": true,
+            "id": 1,
+            "linearizedBaseContracts": [
+              1
+            ],
+            "name": "test",
+            "nameLocation": "9:4:0",
+            "nodeType": "ContractDefinition",
+            "nodes": [],
+            "scope": 2,
+            "src": "0:17:0",
+            "usedErrors": []
+          }
+        ],
+        "src": "0:124:0"
+      },
+      "id": 0
+    }
+  },
+  "settings": {
+    "outputSelection": {
+      "*": {
+        "*": [
+          "evm.bytecode",
+          "evm.bytecode.sourceMap"
+        ]
+      }
+    }
+  }
+}
diff --git a/test/cmdlineTests/standard_import_ast_select_bytecode/output.json b/test/cmdlineTests/standard_import_ast_select_bytecode/output.json
new file mode 100644
index 0000000000..0fca3f2715
--- /dev/null
+++ b/test/cmdlineTests/standard_import_ast_select_bytecode/output.json
@@ -0,0 +1,30 @@
+{
+    "contracts":
+    {
+        "A":
+        {
+            "test":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "generatedSources": [],
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    }
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 8bc0be7a26..785f142842 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -187,7 +187,7 @@ BOOST_AUTO_TEST_CASE(invalid_language)
 	}
 	)";
 	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "Only \"Solidity\" or \"Yul\" is supported as a language."));
+	BOOST_CHECK(containsError(result, "JSONError", "Only \"Solidity\", \"Yul\" or \"SolidityAST\" is supported as a language."));
 }
 
 BOOST_AUTO_TEST_CASE(valid_language)

From d5c3d34bf487d5a0f0ee9d4f4ed1d7f86e60e5e7 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 10 May 2023 11:38:24 +0200
Subject: [PATCH 1365/1748] Fix gitter link.

---
 docs/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/index.rst b/docs/index.rst
index b5f42aa635..600173d654 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -75,7 +75,7 @@ and a wide selection of tutorials, tools, and development frameworks.
 
 If you have any questions, you can try searching for answers or asking on the
 `Ethereum StackExchange <https://ethereum.stackexchange.com/>`_,
-or our `Gitter channel <https://gitter.im/ethereum/solidity/>`_.
+or our `Gitter channel <https://gitter.im/ethereum/solidity>`_.
 
 .. _translations:
 

From 606fbd8fcc9a42d48b7f3e61048507619de77d2a Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 10 May 2023 11:59:20 +0200
Subject: [PATCH 1366/1748] Fix antlr grammar.

---
 Changelog.md                   |  3 ---
 docs/grammar/SolidityParser.g4 | 18 ++++--------------
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index aed64a0c0a..39e1713242 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -20,9 +20,6 @@ Compiler Features:
 
 Bugfixes:
  * ABI: Include events in the ABI that are emitted by a contract but defined outside of it.
- * Antlr Grammar: Fix discrepancy with the parser, which allowed octal numbers.
- * Antlr Grammar: Fix of a discrepancy with the parser, which allowed numbers followed by an identifier with no whitespace.
- * Antlr Grammar: Stricter rules for function definitions. The grammar will no longer accept as valid free functions having specifiers which are exclusive to contract functions.
  * Immutables: Disallow initialization of immutables in try/catch statements.
  * SMTChecker: Fix false positives in ternary operators that contain verification targets in its branches, directly or indirectly.
 
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index ed8651ae7a..b8744673d6 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -16,7 +16,7 @@ sourceUnit: (
 	| contractDefinition
 	| interfaceDefinition
 	| libraryDefinition
-	| freeFunctionDefinition
+	| functionDefinition
 	| constantVariableDeclaration
 	| structDefinition
 	| enumDefinition
@@ -85,7 +85,7 @@ inheritanceSpecifier: name=identifierPath arguments=callArgumentList?;
  */
 contractBodyElement:
 	constructorDefinition
-	| contractFunctionDefinition
+	| functionDefinition
 	| modifierDefinition
 	| fallbackFunctionDefinition
 	| receiveFunctionDefinition
@@ -152,11 +152,11 @@ stateMutability: Pure | View | Payable;
  */
 overrideSpecifier: Override (LParen overrides+=identifierPath (Comma overrides+=identifierPath)* RParen)?;
 /**
- * The definition of contract, library and interface functions.
+ * The definition of contract, library, interface or free functions.
  * Depending on the context in which the function is defined, further restrictions may apply,
  * e.g. functions in interfaces have to be unimplemented, i.e. may not contain a body block.
  */
-contractFunctionDefinition
+functionDefinition
 locals[
 	boolean visibilitySet = false,
 	boolean mutabilitySet = false,
@@ -176,16 +176,6 @@ locals[
 	(Returns LParen returnParameters=parameterList RParen)?
 	(Semicolon | body=block);
 
-/**
- * The definition of a free function.
- */
- freeFunctionDefinition:
- 	Function (identifier | Fallback | Receive)
- 	LParen (arguments=parameterList)? RParen
- 	stateMutability?
- 	(Returns LParen returnParameters=parameterList RParen)?
- 	(Semicolon | body=block);
-
 /**
  * The definition of a modifier.
  * Note that within the body block of a modifier, the underscore cannot be used as identifier,

From b730bde54d412eaefe6ad21a8143448fe86c0420 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 10 May 2023 11:49:07 +0200
Subject: [PATCH 1367/1748] Sort and adjust changelog for 0.8.20.

---
 Changelog.md | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 39e1713242..3d7752af64 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,19 +1,16 @@
 ## 0.8.20 (unreleased)
 
-Language Features:
-
-
 Compiler Features:
- * Assembler: Use ``push0`` for placing ``0`` in the stack for EVM versions starting from "Shanghai". This decreases the deployment and runtime costs.
+ * Assembler: Use ``push0`` for placing ``0`` on the stack for EVM versions starting from "Shanghai". This decreases the deployment and runtime costs.
  * EVM: Set default EVM version to "Shanghai".
  * EVM: Support for the EVM Version "Shanghai".
  * NatSpec: Add support for NatSpec documentation in ``enum`` definitions.
  * NatSpec: Add support for NatSpec documentation in ``struct`` definitions.
  * NatSpec: Include NatSpec from events that are emitted by a contract but defined outside of it in userdoc and devdoc output.
- * Optimizer: Re-implement simplified version of UnusedAssignEliminator and UnusedStoreEliminator. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
+ * Optimizer: Re-implement simplified version of ``UnusedAssignEliminator`` and ``UnusedStoreEliminator``. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
  * Parser: Unary plus is no longer recognized as a unary operator in the AST and triggers an error at the parsing stage (rather than later during the analysis).
- * SMTChecker: Properties that are proved safe are now reported explicitly at the end of the analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
  * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
+ * SMTChecker: Properties that are proved safe are now reported explicitly at the end of analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
  * Standard JSON Interface: Add experimental support for importing ASTs via Standard JSON.
  * Yul EVM Code Transform: If available, use ``push0`` instead of ``codesize`` to produce an arbitrary value on stack in order to create equal stack heights between branches.
 

From 3c77d33db86934e0958864f46fc186be65760a27 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 10 May 2023 12:20:00 +0200
Subject: [PATCH 1368/1748] Set release date for 0.8.20.

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 3d7752af64..87239a84d4 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-## 0.8.20 (unreleased)
+### 0.8.20 (2023-05-10)
 
 Compiler Features:
  * Assembler: Use ``push0`` for placing ``0`` on the stack for EVM versions starting from "Shanghai". This decreases the deployment and runtime costs.

From a1b79de64235f13e6b06e088fe6365c5a12d13d3 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 10 May 2023 12:21:29 +0200
Subject: [PATCH 1369/1748] Update bugs by version entry for 0.8.20.

---
 docs/bugs_by_version.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 4bbf5584b1..ce621f1954 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1792,6 +1792,10 @@
         ],
         "released": "2021-03-02"
     },
+    "0.8.20": {
+        "bugs": [],
+        "released": "2023-05-10"
+    },
     "0.8.3": {
         "bugs": [
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",

From 4b67dea8e262c603bb8bad0e76a9d5b0bf3f4181 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 10 May 2023 17:53:58 +0200
Subject: [PATCH 1370/1748] Set version to 0.8.21.

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4345fac942..c9a7a18761 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.20")
+set(PROJECT_VERSION "0.8.21")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 87239a84d4..164d998c29 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.21 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.20 (2023-05-10)
 
 Compiler Features:

From edc5512b757acfeb23ef4c22cc8cbf3b9228cb14 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 10 May 2023 17:15:30 +0200
Subject: [PATCH 1371/1748] Add readthedocs configuration

---
 .readthedocs.yml | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 .readthedocs.yml

diff --git a/.readthedocs.yml b/.readthedocs.yml
new file mode 100644
index 0000000000..c0c139b7e8
--- /dev/null
+++ b/.readthedocs.yml
@@ -0,0 +1,18 @@
+version: 2
+
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
+sphinx:
+  builder: html
+  configuration: docs/conf.py
+
+formats:
+  - pdf
+  - epub
+
+python:
+  install:
+    - requirements: docs/requirements.txt

From c3a8b9cebb97e62753e351a441e10de5b48df289 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 11 May 2023 11:26:56 +0200
Subject: [PATCH 1372/1748] Minor post-release adjustments.

---
 ReleaseChecklist.md           | 1 +
 scripts/deps-ppa/static_z3.sh | 2 +-
 scripts/release_ppa.sh        | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index a7d6a4dc78..179a20d4fb 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -16,6 +16,7 @@
 At least a day before the release:
  - [ ] Run ``make linkcheck`` from within ``docs/`` and fix any broken links it finds.
        Ignore false positives caused by ``href`` anchors and dummy links not meant to work.
+ - [ ] Double-check that [the most recent docs builds at readthedocs](https://readthedocs.org/projects/solidity/builds/) succeeded.
  - [ ] Make sure that all merged PRs that should have changelog entries do have them.
  - [ ] Rerun CI on the top commits of main branches in all repositories that do not have daily activity by creating a test branch or PR:
       - [ ] ``solc-js``
diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index ca15437837..5ee6623a69 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -41,7 +41,7 @@ sourcePPAConfig
 # Sanity check
 checkDputEntries "\[cpp-build-deps\]"
 
-DISTRIBUTIONS="focal jammy kinetic"
+DISTRIBUTIONS="focal jammy kinetic lunar"
 
 for distribution in $DISTRIBUTIONS
 do
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index aff2e7c254..bd98865d6e 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -68,7 +68,7 @@ packagename=solc
 # This needs to be a still active release
 static_build_distribution=focal
 
-DISTRIBUTIONS="focal jammy kinetic"
+DISTRIBUTIONS="focal jammy kinetic lunar"
 
 if is_release
 then

From 33bb833949c9e05d7ef1e2fdb91f1e77b3b36a95 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Thu, 11 May 2023 09:14:16 -0500
Subject: [PATCH 1373/1748] Add *.orig to .gitignore.

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 773f09be6e..8ca5f86e7e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,9 @@ __pycache__
 *.a
 *.lib
 
+# ignore git mergetool backup files
+*.orig
+
 # Executables
 *.exe
 *.out

From 678461e828842bcadd9e6cbca76409faba84b20f Mon Sep 17 00:00:00 2001
From: Leo Alt <leo@ethereum.org>
Date: Thu, 11 May 2023 16:43:12 +0200
Subject: [PATCH 1374/1748] Fix encoding of side-effects inside if and
 conditional statements in the BMC engine

---
 Changelog.md                                  |  1 +
 libsolidity/formal/BMC.cpp                    |  4 +++
 .../control_flow/side_effects_inside_if_1.sol | 15 +++++++++
 .../control_flow/side_effects_inside_if_2.sol | 26 ++++++++++++++++
 .../control_flow/side_effects_inside_if_3.sol | 30 ++++++++++++++++++
 .../control_flow/side_effects_inside_if_4.sol | 15 +++++++++
 .../side_effects_inside_ternary_1.sol         | 16 ++++++++++
 .../side_effects_inside_ternary_2.sol         | 27 ++++++++++++++++
 .../side_effects_inside_ternary_3.sol         | 31 +++++++++++++++++++
 .../side_effects_inside_ternary_4.sol         | 16 ++++++++++
 10 files changed, 181 insertions(+)
 create mode 100644 test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_4.sol

diff --git a/Changelog.md b/Changelog.md
index 164d998c29..36bf4dcfa7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
 
 
 ### 0.8.20 (2023-05-10)
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index e0a5f312b4..b72e8451a3 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -237,6 +237,7 @@ void BMC::endVisit(FunctionDefinition const& _function)
 
 bool BMC::visit(IfStatement const& _node)
 {
+	auto indicesBeforePush = copyVariableIndices();
 	// This check needs to be done in its own context otherwise
 	// constraints from the If body might influence it.
 	m_context.pushSolver();
@@ -251,6 +252,7 @@ bool BMC::visit(IfStatement const& _node)
 			&_node.condition()
 		);
 	m_context.popSolver();
+	resetVariableIndices(std::move(indicesBeforePush));
 
 	_node.condition().accept(*this);
 	auto conditionExpr = expr(_node.condition());
@@ -274,6 +276,7 @@ bool BMC::visit(IfStatement const& _node)
 
 bool BMC::visit(Conditional const& _op)
 {
+	auto indicesBeforePush = copyVariableIndices();
 	m_context.pushSolver();
 	_op.condition().accept(*this);
 
@@ -284,6 +287,7 @@ bool BMC::visit(Conditional const& _op)
 			&_op.condition()
 		);
 	m_context.popSolver();
+	resetVariableIndices(std::move(indicesBeforePush));
 
 	SMTEncoder::visit(_op);
 
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_1.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_1.sol
new file mode 100644
index 0000000000..9bea0383ad
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_1.sol
@@ -0,0 +1,15 @@
+contract C {
+    function f() public pure {
+        uint x;
+        if (++x < 3) {}
+
+        assert(x == 1); // should hold
+        assert(x != 1); // should fail
+    }
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Warning 6838: (72-79): BMC: Condition is always true.
+// Warning 4661: (132-146): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_2.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_2.sol
new file mode 100644
index 0000000000..1780a7e20b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_2.sol
@@ -0,0 +1,26 @@
+contract C {
+    uint x;
+
+    function inc() internal returns (uint) {
+        // BMC inlines function calls and also looks at functions in isolation,
+        // therefore it says once that this is safe, when called by `f`,
+        // but also that it is unsafe just looking at this function (false positive).
+        ++x;
+        return x;
+    }
+
+    function f() public {
+        require(x < 1000);
+        uint y = x;
+        if (inc() < 3) {}
+
+        assert(x == y + 1); // should hold
+        assert(x != y + 1); // should fail
+    }
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Warning 2661: (318-321): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4661: (499-517): BMC: Assertion violation happens here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_3.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_3.sol
new file mode 100644
index 0000000000..2e415a7b08
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_3.sol
@@ -0,0 +1,30 @@
+contract C {
+    uint x;
+
+    function inc() internal returns (uint) {
+        // BMC inlines function calls and also looks at functions in isolation,
+        // therefore it says once that this is safe, when called by `f`,
+        // but also that it is unsafe just looking at this function (false positive).
+        ++x;
+        return x;
+    }
+
+    function inc2() internal returns (uint) {
+        return inc();
+    }
+
+    function f() public {
+        require(x < 1000);
+        uint y = x;
+        if (inc2() < 3) {}
+
+        assert(x == y + 1); // should hold
+        assert(x != y + 1); // should fail
+    }
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Warning 2661: (318-321): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4661: (575-593): BMC: Assertion violation happens here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_4.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_4.sol
new file mode 100644
index 0000000000..6e624184e1
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_if_4.sol
@@ -0,0 +1,15 @@
+contract C {
+    function f() public pure {
+        uint x = 2;
+        if (--x < 3) {}
+
+        assert(x == 1); // should hold
+        assert(x != 1); // should fail
+    }
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Warning 6838: (76-83): BMC: Condition is always true.
+// Warning 4661: (136-150): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_1.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_1.sol
new file mode 100644
index 0000000000..9801b99b56
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_1.sol
@@ -0,0 +1,16 @@
+contract C {
+    function f() public pure {
+        uint x;
+        uint y = (++x < 3) ? ++x : --x;
+
+        assert(y == x); // should hold;
+        assert(x == 2); // should hold
+        assert(x != 2); // should fail
+    }
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Warning 6838: (77-86): BMC: Condition is always true.
+// Warning 4661: (188-202): BMC: Assertion violation happens here.
+// Info 6002: BMC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_2.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_2.sol
new file mode 100644
index 0000000000..54d72960b9
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_2.sol
@@ -0,0 +1,27 @@
+contract C {
+    uint x;
+
+    function inc() internal returns (uint) {
+        // BMC inlines function calls and also looks at functions in isolation,
+        // therefore it says once that this is safe, when called by `f`,
+        // but also that it is unsafe just looking at this function (false positive).
+        ++x;
+        return x;
+    }
+
+    function f() public {
+        require(x < 1000);
+        uint z = x;
+        uint y = (inc() < 3) ? inc() : inc();
+
+        assert(y == x);
+        assert(x == z + 2); // should hold
+        assert(x != z + 2); // should fail
+    }
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Warning 2661: (318-321): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4661: (543-561): BMC: Assertion violation happens here.
+// Info 6002: BMC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_3.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_3.sol
new file mode 100644
index 0000000000..18e36c8fd2
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_3.sol
@@ -0,0 +1,31 @@
+contract C {
+    uint x;
+
+    function inc() internal returns (uint) {
+        // BMC inlines function calls and also looks at functions in isolation,
+        // therefore it says once that this is safe, when called by `f`,
+        // but also that it is unsafe just looking at this function (false positive).
+        ++x;
+        return x;
+    }
+
+    function inc2() internal returns (uint) {
+        return inc();
+    }
+
+    function f() public {
+        require(x < 1000);
+        uint z = x;
+        uint y = (inc2() < 3) ? inc2() : inc2();
+
+        assert(y == x); // should hold
+        assert(x == z + 2); // should hold
+        assert(x != z + 2); // should fail
+    }
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Warning 2661: (318-321): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4661: (636-654): BMC: Assertion violation happens here.
+// Info 6002: BMC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_4.sol b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_4.sol
new file mode 100644
index 0000000000..e24cdf297d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/control_flow/side_effects_inside_ternary_4.sol
@@ -0,0 +1,16 @@
+contract C {
+    function f() public pure {
+        uint x = 2;
+        uint y = (--x < 3) ? --x : 0;
+
+        assert(y == x); // should hold
+        assert(x == 0); // should hold
+        assert(x != 0); // should fail
+    }
+}
+// ====
+// SMTEngine: bmc
+// ----
+// Warning 6838: (81-90): BMC: Condition is always true.
+// Warning 4661: (189-203): BMC: Assertion violation happens here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From c5673278a772b8fb0e087d69edf700f5316f4562 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 22 Feb 2023 10:32:29 -0500
Subject: [PATCH 1375/1748] Remove EWASM backend.

---
 Changelog.md                                  |   1 +
 cmake/templates/ewasm_polyfill.in             |  13 -
 docs/contributing.rst                         |  11 +-
 docs/using-the-compiler.rst                   |  13 +-
 docs/yul.rst                                  |   3 +-
 libsolidity/interface/CompilerStack.cpp       |  57 +-
 libsolidity/interface/CompilerStack.h         |  16 -
 libsolidity/interface/StandardCompiler.cpp    |  31 +-
 libyul/CMakeLists.txt                         |  30 -
 libyul/YulStack.cpp                           |  38 +-
 libyul/YulStack.h                             |  13 +-
 libyul/backends/wasm/BinaryTransform.cpp      | 722 ------------------
 libyul/backends/wasm/BinaryTransform.h        | 124 ---
 libyul/backends/wasm/EVMToEwasmTranslator.cpp | 159 ----
 libyul/backends/wasm/EVMToEwasmTranslator.h   |  55 --
 libyul/backends/wasm/TextTransform.cpp        | 246 ------
 libyul/backends/wasm/TextTransform.h          |  71 --
 libyul/backends/wasm/WasmAST.h                | 117 ---
 libyul/backends/wasm/WasmCodeTransform.cpp    | 449 -----------
 libyul/backends/wasm/WasmCodeTransform.h      | 115 ---
 libyul/backends/wasm/WasmDialect.cpp          | 284 -------
 libyul/backends/wasm/WasmDialect.h            |  71 --
 libyul/backends/wasm/WasmObjectCompiler.cpp   |  60 --
 libyul/backends/wasm/WasmObjectCompiler.h     |  53 --
 libyul/backends/wasm/WordSizeTransform.cpp    | 433 -----------
 libyul/backends/wasm/WordSizeTransform.h      | 108 ---
 libyul/backends/wasm/polyfill/Arithmetic.yul  | 396 ----------
 libyul/backends/wasm/polyfill/Bitwise.yul     | 222 ------
 libyul/backends/wasm/polyfill/Comparison.yul  | 168 ----
 libyul/backends/wasm/polyfill/Conversion.yul  |  79 --
 libyul/backends/wasm/polyfill/Interface.yul   | 413 ----------
 libyul/backends/wasm/polyfill/Keccak.yul      |  24 -
 libyul/backends/wasm/polyfill/Logical.yul     |  31 -
 libyul/backends/wasm/polyfill/Memory.yul      | 109 ---
 libyul/optimiser/Suite.cpp                    |   8 -
 solc/CommandLineInterface.cpp                 |  50 +-
 solc/CommandLineInterface.h                   |   1 -
 solc/CommandLineParser.cpp                    |  41 +-
 solc/CommandLineParser.h                      |   4 -
 test/CMakeLists.txt                           |   2 -
 test/Common.cpp                               |  24 +-
 test/Common.h                                 |   8 -
 test/EVMHost.cpp                              |  16 +-
 test/EVMHost.h                                |   9 +-
 test/ExecutionFramework.cpp                   |   5 -
 test/ExecutionFramework.h                     |   1 -
 test/InteractiveTests.h                       |   2 -
 test/TestCase.h                               |   1 -
 test/cmdlineTests.sh                          |   2 -
 test/cmdlineTests/evm_to_wasm/args            |   1 -
 test/cmdlineTests/evm_to_wasm/input.yul       |   3 -
 test/cmdlineTests/evm_to_wasm/output          |  96 ---
 test/cmdlineTests/evm_to_wasm_break/args      |   1 -
 test/cmdlineTests/evm_to_wasm_break/input.yul |   8 -
 test/cmdlineTests/evm_to_wasm_break/output    | 583 --------------
 .../args                                      |   1 -
 .../input.yul                                 |   4 -
 .../output                                    |   2 -
 .../args                                      |   1 -
 .../input.yul                                 |   4 -
 .../output                                    |  34 -
 .../args                                      |   1 -
 .../input.yul                                 |   4 -
 .../output                                    |  54 --
 .../evm_to_wasm_unsupported_translation/args  |   1 -
 .../evm_to_wasm_unsupported_translation/err   |   1 -
 .../evm_to_wasm_unsupported_translation/exit  |   1 -
 .../input.yul                                 |   3 -
 .../output                                    |   1 -
 .../linker_mode_output_selection_invalid/args |   2 +-
 .../linker_mode_output_selection_invalid/err  |   2 +-
 .../output_selection_ewasm_ir_only/args       |   1 -
 .../output_selection_ewasm_ir_only/err        |   1 -
 .../output_selection_ewasm_ir_only/exit       |   1 -
 .../output_selection_ewasm_ir_only/input.sol  |   4 -
 .../args                                      |   2 +-
 .../standard_cli_output_selection_invalid/err |   2 +-
 .../standard_ewasm_requested/input.json       |  22 -
 .../standard_ewasm_requested/output.json      | 176 -----
 .../input.json                                |  22 -
 .../output.json                               |  23 -
 .../strict_asm_options_in_non_asm_mode/args   |   2 +-
 .../args                                      |   1 -
 .../input.yul                                 |   4 -
 .../output                                    |   2 -
 .../args                                      |   1 -
 .../input.yul                                 |   4 -
 .../output                                    |   2 -
 .../strict_asm_output_selection_invalid/args  |   2 +-
 .../args                                      |   1 -
 .../input.yul                                 |  17 -
 .../output                                    |  73 --
 .../args                                      |   1 -
 .../input.yul                                 |   8 -
 .../output                                    |  27 -
 .../yul_to_wasm_source_location_crash/args    |   1 -
 .../input.yul                                 |   4 -
 .../yul_to_wasm_source_location_crash/output  |  34 -
 .../libsolidity/ASTJSON/abstract_contract.sol |   1 -
 test/libsolidity/ASTJSON/address_payable.sol  |   1 -
 test/libsolidity/ASTJSON/assembly/call.sol    |   1 -
 .../ASTJSON/assembly/empty_block.sol          |   1 -
 .../libsolidity/ASTJSON/assembly/function.sol |   1 -
 test/libsolidity/ASTJSON/assembly/leave.sol   |   1 -
 test/libsolidity/ASTJSON/assembly/loop.sol    |   1 -
 .../ASTJSON/assembly/nested_functions.sol     |   1 -
 .../ASTJSON/assembly/slot_offset.sol          |   1 -
 .../ASTJSON/assembly/stringlit.sol            |   1 -
 test/libsolidity/ASTJSON/assembly/switch.sol  |   1 -
 .../ASTJSON/assembly/switch_default.sol       |   1 -
 .../ASTJSON/assembly/var_access.sol           |   1 -
 test/libsolidity/ASTJSON/constructor.sol      |   1 -
 test/libsolidity/ASTJSON/documentation.sol    |   1 -
 .../ASTJSON/documentation_local_variable.sol  |   1 -
 .../ASTJSON/documentation_on_statements.sol   |   1 -
 .../ASTJSON/documentation_triple.sol          |   1 -
 ...event_with_variables_of_internal_types.sol |   1 -
 .../ASTJSON/fail_after_parsing.sol            |   1 -
 test/libsolidity/ASTJSON/fallback.sol         |   1 -
 .../ASTJSON/fallback_and_receive_ether.sol    |   1 -
 test/libsolidity/ASTJSON/fallback_payable.sol |   1 -
 test/libsolidity/ASTJSON/mappings.sol         |   1 -
 test/libsolidity/ASTJSON/mutability.sol       |   1 -
 .../ASTJSON/not_existing_import.sol           |   1 -
 test/libsolidity/ASTJSON/override.sol         |   1 -
 test/libsolidity/ASTJSON/receive_ether.sol    |   1 -
 .../ASTJSON/two_base_functions.sol            |   1 -
 test/libsolidity/ASTJSON/used_errors.sol      |   1 -
 .../ASTJSON/userDefinedValueType.sol          |   1 -
 .../ASTJSON/user_defined_operator.sol         |   1 -
 test/libsolidity/ASTJSON/yul_hex_literal.sol  |   1 -
 test/libsolidity/SemanticTest.cpp             |  95 +--
 test/libsolidity/SemanticTest.h               |   7 +-
 test/libsolidity/SolidityEndToEndTest.cpp     |  81 --
 .../SolidityExecutionFramework.cpp            |  68 +-
 test/libsolidity/SolidityExecutionFramework.h |   1 -
 .../errorRecoveryTests/contract_recovery.sol  |   1 -
 .../errorRecoveryTests/error_to_eos.sol       |   1 -
 test/libsolidity/lsp/rename/function.sol      |   1 -
 .../lsp/rename/import_directive.sol           |   1 -
 test/libsolidity/lsp/rename/variable.sol      |   1 -
 test/libsolidity/lsp/semanticTokens/enums.sol |   1 -
 .../lsp/semanticTokens/functions.sol          |   1 -
 .../abiEncoderV1/abi_decode_dynamic_array.sol |   1 -
 .../abiEncoderV1/abi_decode_static_array.sol  |   1 -
 .../abi_decode_static_array_v2.sol            |   1 -
 .../abiEncoderV1/abi_decode_trivial.sol       |   1 -
 .../abiEncoderV1/abi_decode_v2.sol            |   1 -
 .../abiEncoderV1/abi_decode_v2_calldata.sol   |   1 -
 .../abiEncoderV1/abi_decode_v2_storage.sol    |   1 -
 .../semanticTests/abiEncoderV1/abi_encode.sol |   3 -
 .../abiEncoderV1/abi_encode_call.sol          |   1 -
 .../abiEncoderV1/abi_encode_decode_simple.sol |   3 -
 .../abiEncoderV1/abi_encode_empty_string.sol  |   1 -
 .../abiEncoderV1/abi_encode_rational.sol      |   3 -
 .../calldata_arrays_too_large.sol             |   2 -
 .../abiEncoderV1/decode_slice.sol             |   3 -
 .../abiEncoderV1/dynamic_memory_copy.sol      |   1 -
 ...emory_dynamic_array_and_calldata_bytes.sol |   1 -
 .../abi_encode_empty_string_v2.sol            |   3 -
 .../abiEncoderV2/abi_encode_rational_v2.sol   |   3 -
 .../abiEncoderV2/abi_encode_v2.sol            |   1 -
 .../abiEncoderV2/bool_out_of_bounds.sol       |   2 -
 ...data_array_dynamic_static_short_decode.sol |   2 -
 .../calldata_dynamic_array_to_memory.sol      |   1 -
 .../calldata_overlapped_dynamic_arrays.sol    |   1 -
 ...ldata_overlapped_nested_dynamic_arrays.sol |   1 -
 .../calldata_struct_array_reencode.sol        |   1 -
 ...dimensional_dynamic_array_index_access.sol |   1 -
 .../abiEncoderV2/calldata_with_garbage.sol    |   1 -
 .../abiEncoderV2/cleanup/cleanup.sol          |   2 -
 .../semanticTests/abiEncoderV2/enums.sol      |   2 -
 ...emory_dynamic_array_and_calldata_bytes.sol |   1 -
 ...ynamic_array_and_calldata_static_array.sol |   1 -
 .../abiEncoderV2/struct/struct_short.sol      |   2 -
 .../abiEncoderV2/struct/struct_simple.sol     |   2 -
 .../abiEncoderV2/struct/struct_validation.sol |   2 -
 ...validation_function_type_inside_struct.sol |   2 -
 .../abiencodedecode/abi_decode_calldata.sol   |   1 -
 .../abiencodedecode/abi_decode_simple.sol     |   1 -
 .../abi_decode_simple_storage.sol             |   1 -
 .../abiencodedecode/abi_encode_call.sol       |   1 -
 .../abi_encode_call_declaration.sol           |   1 -
 .../abi_encode_call_memory.sol                |   1 -
 .../abi_encode_with_selector.sol              |   2 -
 .../abi_encode_with_selectorv2.sol            |   2 -
 .../offset_overflow_in_array_decoding.sol     |   2 -
 .../offset_overflow_in_array_decoding_2.sol   |   2 -
 .../offset_overflow_in_array_decoding_3.sol   |   2 -
 .../accessor_for_const_state_variable.sol     |   2 -
 .../accessor/accessor_for_state_variable.sol  |   3 -
 .../arithmetics/addmod_mulmod.sol             |   3 -
 .../arithmetics/addmod_mulmod_zero.sol        |   3 -
 .../arithmetics/block_inside_unchecked.sol    |   2 -
 .../checked_called_by_unchecked.sol           |   2 -
 .../checked_modifier_called_by_unchecked.sol  |   2 -
 .../arithmetics/divisiod_by_zero.sol          |   2 -
 .../arithmetics/exp_associativity.sol         |   1 -
 .../semanticTests/arithmetics/signed_mod.sol  |   3 -
 .../unchecked_called_by_checked.sol           |   2 -
 .../arithmetics/unchecked_div_by_zero.sol     |   2 -
 .../semanticTests/array/calldata_array.sol    |   2 -
 ...ta_array_as_argument_internal_function.sol |   2 -
 .../array/calldata_array_dynamic_invalid.sol  |   2 -
 .../array/calldata_array_of_struct.sol        |   3 -
 .../array/calldata_slice_access.sol           |   2 -
 .../bytes_concat_empty_argument_list.sol      |   2 -
 .../concat/bytes_concat_empty_strings.sol     |   2 -
 .../array/constant_var_as_array_length.sol    |   1 -
 .../copying/array_copy_different_packing.sol  |   1 -
 .../array/copying/array_copy_nested_array.sol |   1 -
 .../copying/array_copy_storage_abi_signed.sol |   1 -
 ..._storage_storage_different_base_nested.sol |   2 -
 ...y_copy_storage_storage_dynamic_dynamic.sol |   1 -
 ...ay_copy_storage_storage_static_dynamic.sol |   1 -
 ...ray_copy_storage_storage_static_simple.sol |   2 -
 ...ray_copy_storage_storage_static_static.sol |   3 -
 .../copying/array_copy_target_leftover.sol    |   2 -
 .../copying/array_copy_target_leftover2.sol   |   2 -
 .../copying/array_copy_target_simple.sol      |   3 -
 .../copying/array_copy_target_simple_2.sol    |   3 -
 .../copying/array_elements_to_mapping.sol     |   1 -
 .../array_nested_storage_to_memory.sol        |   1 -
 .../array_storage_multi_items_per_slot.sol    |   2 -
 .../array/copying/array_to_mapping.sol        |   1 -
 .../array/copying/bytes_memory_to_storage.sol |   2 -
 .../array/copying/bytes_storage_to_memory.sol |   2 -
 .../calldata_array_of_struct_to_memory.sol    |   1 -
 .../calldata_array_static_to_memory.sol       |   2 -
 .../copying/calldata_array_to_mapping.sol     |   1 -
 .../copying/calldata_bytes_to_storage.sol     |   2 -
 .../calldata_dynamic_array_to_memory.sol      |   1 -
 .../copy_function_internal_storage_array.sol  |   1 -
 ...opy_internal_function_array_to_storage.sol |   3 -
 .../copying/copying_bytes_multiassign.sol     |   2 -
 .../dirty_memory_bytes_to_storage_copy_ir.sol |   1 -
 ...d_array_of_structs_calldata_to_storage.sol |   2 -
 ...ted_array_of_structs_memory_to_storage.sol |   2 -
 ...ested_array_element_calldata_to_memory.sol |   1 -
 ...sted_array_element_calldata_to_storage.sol |   1 -
 .../nested_array_element_memory_to_memory.sol |   1 -
 ...nested_array_element_memory_to_storage.sol |   1 -
 ...nested_array_element_storage_to_memory.sol |   1 -
 ...ested_array_element_storage_to_storage.sol |   1 -
 ...ed_array_of_structs_calldata_to_memory.sol |   1 -
 ...d_array_of_structs_calldata_to_storage.sol |   2 -
 ...sted_array_of_structs_memory_to_memory.sol |   1 -
 ...ted_array_of_structs_memory_to_storage.sol |   2 -
 ...ed_array_of_structs_storage_to_storage.sol |   1 -
 ...th_nested_array_from_storage_to_memory.sol |   1 -
 ...amic_array_element_calldata_to_storage.sol |   1 -
 .../array/copying/storage_memory_packed.sol   |   2 -
 .../create_dynamic_array_with_zero_length.sol |   2 -
 .../array/create_memory_array_too_large.sol   |   2 -
 .../array/create_multiple_dynamic_arrays.sol  |   2 -
 .../array/delete/delete_bytes_array.sol       |   1 -
 .../array/delete/delete_memory_array.sol      |   1 -
 .../delete/delete_on_array_of_structs.sol     |   1 -
 .../array/delete/delete_storage_array.sol     |   1 -
 .../array/dynamic_arrays_in_storage.sol       |   1 -
 .../dynamic_out_of_bounds_array_access.sol    |   1 -
 .../array/external_array_args.sol             |   2 -
 .../array/fixed_array_cleanup.sol             |   2 -
 .../array/fixed_arrays_as_return_type.sol     |   1 -
 .../array/fixed_arrays_in_storage.sol         |   2 -
 .../array/fixed_bytes_length_access.sol       |   2 -
 .../fixed_out_of_bounds_array_access.sol      |   3 -
 .../array/function_array_cross_calls.sol      |   1 -
 .../array/function_memory_array.sol           |   2 -
 .../array/indexAccess/index_access.sol        |   2 -
 .../inline_array_index_access_ints.sol        |   3 -
 .../inline_array_index_access_strings.sol     |   3 -
 .../memory_arrays_index_access_write.sol      |   2 -
 .../array/inline_array_return.sol             |   3 -
 .../array/inline_array_singleton.sol          |   2 -
 ...rray_storage_to_memory_conversion_ints.sol |   3 -
 ...y_storage_to_memory_conversion_strings.sol |   3 -
 .../inline_array_strings_from_document.sol    |   3 -
 .../semanticTests/array/memory.sol            |   1 -
 .../array/pop/array_pop_empty_exception.sol   |   2 -
 .../array/pop/array_pop_isolated.sol          |   2 -
 .../array/pop/byte_array_pop.sol              |   2 -
 .../array/pop/byte_array_pop_copy_long.sol    |   1 -
 .../pop/byte_array_pop_empty_exception.sol    |   2 -
 .../array/pop/byte_array_pop_isolated.sol     |   2 -
 .../array/pop/byte_array_pop_masking_long.sol |   1 -
 .../pop/byte_array_pop_storage_empty.sol      |   2 -
 .../array/push/array_push_packed_array.sol    |   1 -
 .../array/push/byte_array_push.sol            |   2 -
 .../array/short_fixed_array_cleanup.sol       |   2 -
 .../slices/array_calldata_assignment.sol      |   2 -
 .../semanticTests/array/storage_array_ref.sol |   1 -
 .../array/string_allocation_bug.sol           |   2 -
 .../semanticTests/array/strings_in_struct.sol |   2 -
 .../asmForLoop/for_loop_break.sol             |   2 -
 .../asmForLoop/for_loop_continue.sol          |   2 -
 .../asmForLoop/for_loop_nested.sol            |   2 -
 ...signment_to_const_var_involving_keccak.sol |   2 -
 .../builtinFunctions/blockhash.sol            |   2 -
 .../blockhash_shadow_resolution.sol           |   2 -
 .../builtinFunctions/function_types_sig.sol   |   2 -
 .../builtinFunctions/keccak256_empty.sol      |   3 -
 .../builtinFunctions/keccak256_with_bytes.sol |   1 -
 .../builtinFunctions/msg_sig.sol              |   2 -
 .../msg_sig_after_internal_call_is_same.sol   |   2 -
 .../builtinFunctions/ripemd160_empty.sol      |   1 -
 .../semanticTests/c99_scoping_activation.sol  |   2 -
 .../calldata_array_index_range_access.sol     |   2 -
 .../calldata_array_three_dimensional.sol      |   2 -
 .../calldata/calldata_attached_to_bytes.sol   |   1 -
 ...ata_attached_to_dynamic_array_or_slice.sol |   1 -
 .../calldata_attached_to_static_array.sol     |   1 -
 .../calldata/calldata_struct_cleaning.sol     |   2 -
 .../copy_from_calldata_removes_bytes_data.sol |   1 -
 .../cleanup/bool_conversion_v2.sol            |   2 -
 .../cleanup_address_types_shortening.sol      |   3 -
 .../cleanup/cleanup_address_types_v2.sol      |   2 -
 ...anup_bytes_types_shortening_newCodeGen.sol |   1 -
 .../cleanup/cleanup_bytes_types_v2.sol        |   2 -
 .../cleanup/cleanup_in_compound_assign.sol    |   2 -
 .../semanticTests/cleanup/exp_cleanup.sol     |   3 -
 .../cleanup/exp_cleanup_direct.sol            |   3 -
 .../cleanup/exp_cleanup_nonzero_base.sol      |   3 -
 .../cleanup/exp_cleanup_smaller_base.sol      |   2 -
 .../negative_fractional_mod.sol               |   2 -
 .../constantEvaluator/rounding.sol            |   2 -
 .../asm_address_constant_regression.sol       |   3 -
 .../constants/asm_constant_file_level.sol     |   2 -
 .../constants/constant_string.sol             |   3 -
 .../constant_string_at_file_level.sol         |   3 -
 .../constants/constant_variables.sol          |   3 -
 .../constants_at_file_level_referencing.sol   |   3 -
 .../constants/consteval_array_length.sol      |   1 -
 .../constants/function_unreferenced.sol       |   2 -
 .../same_constants_different_files.sol        |   3 -
 .../simple_constant_variables_test.sol        |   3 -
 .../base_constructor_arguments.sol            |   1 -
 .../constructor_arguments_internal.sol        |   1 -
 .../constructor_static_array_argument.sol     |   1 -
 ...vm_exceptions_in_constructor_call_fail.sol |   1 -
 ...unction_usage_in_constructor_arguments.sol |   1 -
 .../functions_called_by_constructor.sol       |   3 -
 ...called_by_constructor_through_dispatch.sol |   3 -
 ...r_init_inheritence_without_constructor.sol |   2 -
 .../constructor/payable_constructor.sol       |   3 -
 .../store_function_in_constructor.sol         |   3 -
 .../store_function_in_constructor_packed.sol  |   3 -
 ...nternal_unused_function_in_constructor.sol |   3 -
 ...unused_library_function_in_constructor.sol |   1 -
 .../constructor_inheritance_init_order.sol    |   1 -
 .../constructor_inheritance_init_order_2.sol  |   2 -
 .../subassembly_deduplication.sol             |   1 -
 .../semanticTests/dirty_calldata_bytes.sol    |   2 -
 .../semanticTests/empty_contract.sol          |   1 -
 .../semanticTests/empty_for_loop.sol          |   2 -
 .../enums/constructing_enums_from_ints.sol    |   3 -
 .../enums/enum_explicit_overflow.sol          |   2 -
 .../enum_explicit_overflow_homestead.sol      |   1 -
 .../semanticTests/enums/enum_referencing.sol  |   2 -
 .../semanticTests/enums/minmax.sol            |   1 -
 ...ract_enums_with_explicit_contract_name.sol |   3 -
 .../semanticTests/enums/using_enums.sol       |   3 -
 .../enums/using_inherited_enum.sol            |   2 -
 .../using_inherited_enum_excplicitly.sol      |   2 -
 .../semanticTests/errors/named_error_args.sol |   2 -
 .../named_parameters_shadowing_types.sol      |   2 -
 .../semanticTests/errors/panic_via_import.sol |   2 -
 .../semanticTests/errors/simple.sol           |   2 -
 .../semanticTests/errors/using_structs.sol    |   2 -
 .../errors/via_contract_type.sol              |   2 -
 .../semanticTests/errors/via_import.sol       |   2 -
 .../semanticTests/errors/weird_name.sol       |   2 -
 .../exponentiation/literal_base.sol           |   2 -
 .../exponentiation/signed_base.sol            |   2 -
 .../exponentiation/small_exp.sol              |   2 -
 .../expressions/bit_operators.sol             |   2 -
 .../expressions/bytes_comparison.sol          |   2 -
 ...conditional_expression_different_types.sol |   2 -
 .../conditional_expression_false_literal.sol  |   2 -
 .../conditional_expression_functions.sol      |   2 -
 .../conditional_expression_multiple.sol       |   2 -
 ...onditional_expression_storage_memory_1.sol |   2 -
 .../conditional_expression_true_literal.sol   |   2 -
 .../conditional_expression_tuples.sol         |   2 -
 ...ditional_expression_with_return_values.sol |   2 -
 .../expressions/exp_operator_const.sol        |   2 -
 .../expressions/exp_operator_const_signed.sol |   2 -
 .../expressions/exp_zero_literal.sol          |   2 -
 .../expressions/inc_dec_operators.sol         |   2 -
 .../uncalled_address_transfer_send.sol        |   2 -
 .../fallback/call_forward_bytes.sol           |   1 -
 .../semanticTests/fallback/falback_return.sol |   2 -
 .../fallback/fallback_or_receive.sol          |   2 -
 .../semanticTests/fallback/inherited.sol      |   2 -
 .../fallback/short_data_calls_fallback.sol    |   2 -
 .../semanticTests/freeFunctions/easy.sol      |   2 -
 .../free_namesake_contract_function.sol       |   2 -
 .../semanticTests/freeFunctions/import.sol    |   2 -
 .../semanticTests/freeFunctions/overloads.sol |   2 -
 .../semanticTests/freeFunctions/recursion.sol |   2 -
 .../array_multiple_local_vars.sol             |   2 -
 ..._attached_library_function_on_function.sol |   2 -
 ...d_library_function_on_storage_variable.sol |   2 -
 ...ll_attached_library_function_on_string.sol |   2 -
 .../call_function_returning_function.sol      |   3 -
 ...function_returning_nothing_via_pointer.sol |   3 -
 .../call_internal_function_via_expression.sol |   2 -
 .../calling_nonexisting_contract_throws.sol   |   3 -
 .../functionCall/calling_other_functions.sol  |   2 -
 .../calling_uninitialized_function.sol        |   2 -
 ...lling_uninitialized_function_in_detail.sol |   3 -
 ...g_uninitialized_function_through_array.sol |   2 -
 .../conditional_with_arguments.sol            |   2 -
 .../functionCall/disordered_named_args.sol    |   2 -
 .../functionCall/external_call.sol            |   1 -
 .../external_call_at_construction_time.sol    |   1 -
 .../external_call_dynamic_returndata.sol      |   1 -
 .../external_call_to_nonexisting.sol          |   1 -
 ...ernal_call_to_nonexisting_debugstrings.sol |   1 -
 .../functionCall/external_call_value.sol      |   1 -
 .../functionCall/external_function.sol        |   3 -
 .../functionCall/external_public_override.sol |   3 -
 .../file_level_call_via_module.sol            |   2 -
 .../functionCall/gas_and_value_basic.sol      |   1 -
 .../gas_and_value_brace_syntax.sol            |   1 -
 .../inheritance/base_base_overload.sol        |   2 -
 .../inheritance/base_overload.sol             |   2 -
 .../functionCall/inheritance/call_base.sol    |   2 -
 .../inheritance/call_base_base.sol            |   2 -
 .../inheritance/call_base_base_explicit.sol   |   2 -
 .../inheritance/call_base_explicit.sol        |   2 -
 .../inheritance/call_unimplemented_base.sol   |   2 -
 ...kip_unimplemented_in_abstract_contract.sol |   2 -
 .../super_skip_unimplemented_in_interface.sol |   2 -
 .../functionCall/member_accessors.sol         |   1 -
 .../functionCall/multiple_functions.sol       |   1 -
 .../functionCall/multiple_return_values.sol   |   2 -
 .../semanticTests/functionCall/named_args.sol |   2 -
 .../functionCall/named_args_overload.sol      |   2 -
 .../functionCall/send_zero_ether.sol          |   3 -
 .../functionCall/transaction_status.sol       |   2 -
 .../semanticTests/functionCall/value_test.sol |   2 -
 .../function_selector_via_contract_name.sol   |   2 -
 .../functionTypes/address_member.sol          |   2 -
 .../functionTypes/function_delete_stack.sol   |   3 -
 .../functionTypes/function_delete_storage.sol |   3 -
 .../function_type_library_internal.sol        |   1 -
 .../functionTypes/mapping_of_functions.sol    |   1 -
 .../pass_function_types_externally.sol        |   1 -
 .../pass_function_types_internally.sol        |   2 -
 ...e_function_in_construction_and_runtime.sol |   2 -
 ...onstruction_and_runtime_equality_check.sol |   3 -
 .../functionTypes/selector_1.sol              |   1 -
 .../functionTypes/selector_2.sol              |   1 -
 .../functionTypes/store_function.sol          |   1 -
 .../struct_with_external_function.sol         |   1 -
 .../functionTypes/struct_with_functions.sol   |   3 -
 ...ialized_internal_storage_function_call.sol |   3 -
 .../semanticTests/getters/bytes.sol           |   2 -
 .../getters/string_and_bytes.sol              |   2 -
 .../semanticTests/getters/value_types.sol     |   2 -
 .../inheritance/access_base_storage.sol       |   3 -
 .../address_overload_resolution.sol           |   1 -
 ...base_access_to_function_type_variables.sol |   3 -
 .../derived_overload_base_function_direct.sol |   3 -
 ...erived_overload_base_function_indirect.sol |   3 -
 .../inheritance/explicit_base_class.sol       |   2 -
 .../inherited_constant_state_var.sol          |   3 -
 .../inheritance/inherited_function.sol        |   2 -
 ...d_function_calldata_calldata_interface.sol |   1 -
 ...ted_function_calldata_memory_interface.sol |   1 -
 .../inherited_function_from_a_library.sol     |   1 -
 .../inherited_function_through_dispatch.sol   |   2 -
 .../inheritance/member_notation_ctor.sol      |   1 -
 ...rloaded_function_call_resolve_to_first.sol |   3 -
 ...loaded_function_call_resolve_to_second.sol |   3 -
 .../overloaded_function_call_with_if_else.sol |   3 -
 .../inheritance/super_in_constructor.sol      |   2 -
 .../super_in_constructor_assignment.sol       |   2 -
 .../inheritance/super_overload.sol            |   3 -
 .../inheritance/value_for_constructor.sol     |   1 -
 .../inlineAssembly/calldata_array_read.sol    |   2 -
 .../inlineAssembly/calldata_length_read.sol   |   2 -
 .../inlineAssembly/calldata_offset_read.sol   |   2 -
 .../calldata_offset_read_write.sol            |   3 -
 .../inlineAssembly/constant_access.sol        |   2 -
 .../constant_access_referencing.sol           |   2 -
 .../inlineAssembly/difficulty.sol             |   1 -
 ...inline_assembly_embedded_function_call.sol |   3 -
 .../inlineAssembly/inline_assembly_for.sol    |   3 -
 .../inlineAssembly/inline_assembly_for2.sol   |   3 -
 .../inline_assembly_function_call.sol         |   3 -
 .../inline_assembly_function_call2.sol        |   3 -
 ...line_assembly_function_call_assignment.sol |   3 -
 .../inlineAssembly/inline_assembly_if.sol     |   3 -
 .../inline_assembly_in_modifiers.sol          |   3 -
 .../inline_assembly_memory_access.sol         |   3 -
 .../inline_assembly_read_and_write_stack.sol  |   3 -
 .../inline_assembly_recursion.sol             |   3 -
 .../inline_assembly_storage_access.sol        |   2 -
 ...ssembly_storage_access_inside_function.sol |   2 -
 ...line_assembly_storage_access_local_var.sol |   2 -
 ...ne_assembly_storage_access_via_pointer.sol |   3 -
 .../inlineAssembly/inline_assembly_switch.sol |   3 -
 .../inline_assembly_write_to_stack.sol        |   3 -
 .../inlineAssembly/inlineasm_empty_let.sol    |   3 -
 .../inlineAssembly/keccak256_assembly.sol     |   1 -
 .../semanticTests/inlineAssembly/leave.sol    |   2 -
 .../inlineAssembly/prevrandao.sol             |   1 -
 .../shadowing_local_function_opcode.sol       |   2 -
 .../slot_access_via_mapping_pointer.sol       |   1 -
 .../inlineAssembly/truefalse.sol              |   2 -
 .../semanticTests/integer/basic.sol           |   2 -
 .../libsolidity/semanticTests/integer/int.sol |   2 -
 .../integer/many_local_variables.sol          |   2 -
 .../integer/small_signed_types.sol            |   2 -
 .../semanticTests/integer/uint.sol            |   2 -
 .../semanticTests/interfaceID/homer.sol       |   3 -
 .../interfaceID/homer_interfaceId.sol         |   3 -
 .../interfaceID/interfaceId_events.sol        |   3 -
 .../semanticTests/interfaceID/interfaces.sol  |   3 -
 .../semanticTests/interfaceID/lisa.sol        |   1 -
 .../interfaceID/lisa_interfaceId.sol          |   1 -
 .../interface_inheritance_conversions.sol     |   1 -
 .../semanticTests/isoltestFormatting.sol      |   2 -
 ...nternal_call_attached_with_parentheses.sol |   1 -
 ...ernal_call_unattached_with_parentheses.sol |   1 -
 .../libraries/internal_library_function.sol   |   1 -
 ..._library_function_attached_to_contract.sol |   1 -
 ...ion_attached_to_external_function_type.sol |   1 -
 ...library_function_attached_to_interface.sol |   1 -
 ...ion_attached_to_internal_function_type.sol |   1 -
 ..._internal_function_type_named_selector.sol |   1 -
 ...al_library_function_attached_to_struct.sol |   1 -
 ...ernal_library_function_calling_private.sol |   1 -
 ...ernal_library_function_return_var_size.sol |   1 -
 .../libraries/internal_types_in_library.sol   |   2 -
 .../libraries/library_call_in_homestead.sol   |   1 -
 .../library_enum_as_an_expression.sol         |   1 -
 .../libraries/library_references_preserve.sol |   1 -
 .../libraries/library_stray_values.sol        |   2 -
 .../library_struct_as_an_expression.sol       |   1 -
 .../mapping_arguments_in_library.sol          |   2 -
 .../libraries/mapping_returns_in_library.sol  |   2 -
 .../mapping_returns_in_library_named.sol      |   2 -
 .../payable_function_calls_library.sol        |   2 -
 .../libraries/using_for_by_name.sol           |   2 -
 .../libraries/using_for_overload.sol          |   2 -
 .../using_library_mappings_public.sol         |   2 -
 .../using_library_mappings_return.sol         |   2 -
 .../libraries/using_library_structs.sol       |   2 -
 .../semanticTests/literals/denominations.sol  |   2 -
 .../semanticTests/literals/escape.sol         |   2 -
 .../semanticTests/literals/ether.sol          |   2 -
 .../semanticTests/literals/gwei.sol           |   2 -
 ...x_string_with_non_printable_characters.sol |   2 -
 .../literals/hex_string_with_underscore.sol   |   2 -
 .../literals/scientific_notation.sol          |   3 -
 .../semanticTests/literals/wei.sol            |   2 -
 .../memoryManagement/assembly_access.sol      |   2 -
 .../memoryManagement/struct_allocation.sol    |   2 -
 .../metaTypes/name_other_contract.sol         |   2 -
 .../access_through_contract_name.sol          |   2 -
 .../modifiers/access_through_module_name.sol  |   2 -
 .../modifiers/break_in_modifier.sol           |   2 -
 .../modifiers/continue_in_modifier.sol        |   3 -
 .../modifiers/function_modifier.sol           |   3 -
 ..._calling_functions_in_creation_context.sol |   3 -
 .../modifiers/function_modifier_empty.sol     |   3 -
 .../function_modifier_for_constructor.sol     |   2 -
 .../modifiers/function_modifier_library.sol   |   1 -
 .../function_modifier_library_inheritance.sol |   1 -
 .../function_modifier_local_variables.sol     |   3 -
 .../function_modifier_loop_viair.sol          |   1 -
 ...nction_modifier_multi_invocation_viair.sol |   1 -
 .../function_modifier_multiple_times.sol      |   3 -
 ...ion_modifier_multiple_times_local_vars.sol |   3 -
 .../function_modifier_overriding.sol          |   3 -
 .../modifiers/function_return_parameter.sol   |   2 -
 .../function_return_parameter_complex.sol     |   2 -
 .../modifiers/modifer_recursive.sol           |   3 -
 .../modifiers/modifier_in_constructor_ice.sol |   2 -
 .../modifiers/modifier_init_return.sol        |   3 -
 .../modifiers_in_construction_context.sol     |   2 -
 .../return_does_not_skip_modifier.sol         |   3 -
 .../modifiers/return_in_modifier.sol          |   3 -
 .../stacked_return_with_modifiers.sol         |   2 -
 .../multiSource/circular_import.sol           |   2 -
 .../multiSource/circular_import_2.sol         |   2 -
 .../multiSource/circular_reimport.sol         |   2 -
 .../multiSource/circular_reimport_2.sol       |   2 -
 .../free_different_interger_types.sol         |   2 -
 ...free_function_resolution_base_contract.sol |   2 -
 ...e_function_resolution_override_virtual.sol |   2 -
 ...tion_resolution_override_virtual_super.sol |   2 -
 ...resolution_override_virtual_transitive.sol |   2 -
 .../free_function_transitive_import.sol       |   3 -
 .../semanticTests/multiSource/import.sol      |   2 -
 .../imported_free_function_via_alias.sol      |   2 -
 ...ed_free_function_via_alias_direct_call.sol |   2 -
 .../reimport_imported_function.sol            |   2 -
 .../operators/compound_assign.sol             |   2 -
 .../shifts/shift_bytes_cleanup_viaYul.sol     |   1 -
 .../operators/shifts/shift_cleanup.sol        |   3 -
 .../shifts/shift_cleanup_garbled.sol          |   3 -
 .../operators/shifts/shift_constant_left.sol  |   2 -
 .../shifts/shift_constant_left_assignment.sol |   3 -
 .../operators/shifts/shift_constant_right.sol |   2 -
 .../shift_constant_right_assignment.sol       |   3 -
 .../operators/shifts/shift_left.sol           |   3 -
 .../shifts/shift_left_assignment.sol          |   3 -
 .../shift_left_assignment_different_type.sol  |   3 -
 .../shifts/shift_left_larger_type.sol         |   2 -
 .../operators/shifts/shift_left_uint32.sol    |   3 -
 .../operators/shifts/shift_left_uint8.sol     |   3 -
 .../shifts/shift_negative_constant_left.sol   |   2 -
 .../shifts/shift_negative_constant_right.sol  |   2 -
 .../operators/shifts/shift_overflow.sol       |   3 -
 .../operators/shifts/shift_right.sol          |   3 -
 .../shifts/shift_right_assignment.sol         |   3 -
 .../shifts/shift_right_garbled_signed_v2.sol  |   2 -
 .../shifts/shift_right_garbled_v2.sol         |   2 -
 .../shifts/shift_right_negative_literal.sol   |   3 -
 .../shifts/shift_right_negative_lvalue.sol    |   3 -
 ...shift_right_negative_lvalue_assignment.sol |   3 -
 .../shift_right_negative_lvalue_int16.sol     |   3 -
 .../shift_right_negative_lvalue_int32.sol     |   3 -
 .../shift_right_negative_lvalue_int8.sol      |   3 -
 ...ht_negative_lvalue_signextend_int16_v2.sol |   2 -
 ...ht_negative_lvalue_signextend_int32_v2.sol |   2 -
 ...ght_negative_lvalue_signextend_int8_v2.sol |   2 -
 .../operators/shifts/shift_right_uint32.sol   |   3 -
 .../operators/shifts/shift_right_uint8.sol    |   3 -
 .../shift_underflow_negative_rvalue.sol       |   3 -
 .../userDefined/unchecked_operators.sol       |   1 -
 .../semanticTests/optimizer/shift_bytes.sol   |   2 -
 ...o_nonpayable_circumvention_by_modifier.sol |   2 -
 .../receive/empty_calldata_calls_receive.sol  |   2 -
 .../semanticTests/receive/ether_and_data.sol  |   2 -
 .../semanticTests/receive/inherited.sol       |   2 -
 .../semanticTests/reverts/assert_require.sol  |   3 -
 .../semanticTests/reverts/error_struct.sol    |   2 -
 .../reverts/invalid_enum_as_external_arg.sol  |   1 -
 .../reverts/invalid_enum_as_external_ret.sol  |   2 -
 .../reverts/invalid_enum_compared.sol         |   1 -
 .../reverts/invalid_enum_stored.sol           |   1 -
 .../reverts/invalid_instruction.sol           |   3 -
 .../semanticTests/reverts/revert.sol          |   3 -
 .../reverts/revert_return_area.sol            |   1 -
 .../semanticTests/reverts/simple_throw.sol    |   3 -
 .../libsolidity/semanticTests/smoke/basic.sol |   2 -
 .../semanticTests/smoke/failure.sol           |   1 -
 .../semanticTests/smoke/fallback.sol          |   2 -
 .../semanticTests/smoke/multiline.sol         |   1 -
 .../smoke/multiline_comments.sol              |   2 -
 .../semanticTests/smoke/structs.sol           |   2 -
 .../abi_encode_with_signature_from_string.sol |   2 -
 .../abi_functions_member_access.sol           |   2 -
 .../semanticTests/state/block_coinbase.sol    |   2 -
 .../semanticTests/state/block_difficulty.sol  |   1 -
 .../state/block_difficulty_post_paris.sol     |   1 -
 .../semanticTests/state/block_gaslimit.sol    |   2 -
 .../semanticTests/state/block_number.sol      |   2 -
 .../semanticTests/state/block_prevrandao.sol  |   1 -
 .../state/block_prevrandao_pre_paris.sol      |   1 -
 .../semanticTests/state/block_timestamp.sol   |   2 -
 .../semanticTests/state/gasleft.sol           |   2 -
 .../semanticTests/state/msg_sender.sol        |   2 -
 .../semanticTests/state/msg_sig.sol           |   2 -
 .../semanticTests/state/msg_value.sol         |   2 -
 .../semanticTests/state/tx_gasprice.sol       |   2 -
 .../semanticTests/state/tx_origin.sol         |   2 -
 .../state/uncalled_blockhash.sol              |   2 -
 .../state_var_initialization.sol              |   2 -
 .../state_variables_init_order.sol            |   2 -
 .../state_variables_init_order_2.sol          |   2 -
 .../statements/do_while_loop_continue.sol     |   2 -
 .../storage/packed_functions.sol              |   1 -
 .../storage/packed_storage_overflow.sol       |   2 -
 .../storage/packed_storage_signed.sol         |   3 -
 .../storage/packed_storage_structs_bytes.sol  |   3 -
 .../storage/packed_storage_structs_enum.sol   |   3 -
 .../storage/packed_storage_structs_uint.sol   |   3 -
 .../semanticTests/storage/simple_accessor.sol |   2 -
 .../storage/state_smoke_test.sol              |   2 -
 .../string_concat_empty_argument_list.sol     |   2 -
 .../concat/string_concat_empty_strings.sol    |   2 -
 .../semanticTests/strings/empty_string.sol    |   2 -
 .../semanticTests/strings/return_string.sol   |   2 -
 .../semanticTests/strings/string_escapes.sol  |   2 -
 .../semanticTests/strings/unicode_escapes.sol |   2 -
 .../semanticTests/strings/unicode_string.sol  |   2 -
 .../structs/array_of_recursive_struct.sol     |   2 -
 .../structs/calldata/calldata_struct.sol      |   3 -
 .../calldata/calldata_struct_and_ints.sol     |   1 -
 .../calldata_struct_array_member_dynamic.sol  |   2 -
 .../calldata/calldata_struct_to_memory.sol    |   3 -
 .../calldata/calldata_struct_to_storage.sol   |   3 -
 .../calldata_struct_with_array_to_memory.sol  |   1 -
 .../calldata_struct_with_bytes_to_memory.sol  |   1 -
 .../structs/calldata/calldata_structs.sol     |   3 -
 .../structs/calldata/dynamic_nested.sol       |   2 -
 .../structs/calldata/dynamically_encoded.sol  |   2 -
 .../structs/copy_from_mapping.sol             |   1 -
 ...h_nested_array_from_calldata_to_memory.sol |   1 -
 ..._nested_array_from_calldata_to_storage.sol |   1 -
 ...ith_nested_array_from_memory_to_memory.sol |   1 -
 ...h_nested_array_from_storage_to_storage.sol |   1 -
 .../copy_substructures_from_mapping.sol       |   1 -
 .../structs/copy_substructures_to_mapping.sol |   1 -
 .../semanticTests/structs/copy_to_mapping.sol |   1 -
 .../semanticTests/structs/global.sol          |   2 -
 .../structs/lone_struct_array_type.sol        |   3 -
 .../memory_struct_named_constructor.sol       |   3 -
 .../memory_structs_as_function_args.sol       |   3 -
 .../structs/memory_structs_nested.sol         |   3 -
 .../structs/memory_structs_nested_load.sol    |   2 -
 .../structs/memory_structs_read_write.sol     |   3 -
 .../structs/multislot_struct_allocation.sol   |   3 -
 .../structs/nested_struct_allocation.sol      |   2 -
 .../structs/recursive_structs.sol             |   3 -
 .../structs/simple_struct_allocation.sol      |   2 -
 .../struct_assign_reference_to_struct.sol     |   3 -
 .../semanticTests/structs/struct_copy.sol     |   1 -
 .../structs/struct_copy_via_local.sol         |   3 -
 .../structs/struct_delete_member.sol          |   3 -
 .../structs/struct_delete_storage.sol         |   2 -
 .../structs/struct_delete_storage_small.sol   |   1 -
 .../struct_delete_struct_in_mapping.sol       |   1 -
 .../structs/struct_memory_to_storage.sol      |   3 -
 .../struct_memory_to_storage_function_ptr.sol |   3 -
 .../structs/struct_named_constructor.sol      |   3 -
 .../structs/struct_referencing.sol            |   2 -
 .../structs/struct_storage_to_memory.sol      |   3 -
 .../struct_storage_to_memory_function_ptr.sol |   3 -
 .../structs/using_for_function_on_struct.sol  |   2 -
 .../types/assign_calldata_value_type.sol      |   2 -
 ...ixed_bytes_to_fixed_bytes_greater_size.sol |   2 -
 ...t_fixed_bytes_to_fixed_bytes_same_size.sol |   2 -
 ...ixed_bytes_to_fixed_bytes_smaller_size.sol |   2 -
 ...nvert_fixed_bytes_to_uint_greater_size.sol |   2 -
 ...vert_fixed_bytes_to_uint_same_min_size.sol |   2 -
 .../convert_fixed_bytes_to_uint_same_type.sol |   2 -
 ...nvert_fixed_bytes_to_uint_smaller_size.sol |   2 -
 ...nvert_uint_to_fixed_bytes_greater_size.sol |   2 -
 ...vert_uint_to_fixed_bytes_same_min_size.sol |   2 -
 .../convert_uint_to_fixed_bytes_same_size.sol |   2 -
 ...nvert_uint_to_fixed_bytes_smaller_size.sol |   2 -
 .../types/external_function_to_address.sol    |   2 -
 .../mapping/copy_from_mapping_to_mapping.sol  |   1 -
 ...copy_struct_to_array_stored_in_mapping.sol |   1 -
 .../user_defined_types_mapping_storage.sol    |   1 -
 .../semanticTests/types/nested_tuples.sol     |   2 -
 .../types/packing_signed_types.sol            |   2 -
 .../types/packing_unpacking_types.sol         |   2 -
 .../semanticTests/types/strings.sol           |   3 -
 .../types/tuple_assign_multi_slot_grow.sol    |   2 -
 .../types/type_conversion_cleanup.sol         |   2 -
 .../semanticTests/underscore/as_function.sol  |   2 -
 .../invalidInConstructor.sol                  |   2 -
 .../invalidStoredInConstructor.sol            |   2 -
 .../uninitializedFunctionPointer/store2.sol   |   2 -
 .../storeInConstructor.sol                    |   2 -
 ...ized_internal_storage_function_via_yul.sol |   1 -
 .../userDefinedValueType/cleanup.sol          |   1 -
 .../cleanup_abicoderv1.sol                    |   1 -
 .../userDefinedValueType/conversion.sol       |   1 -
 .../conversion_abicoderv1.sol                 |   1 -
 .../storage_layout_struct.sol                 |   1 -
 ...cost_abstraction_comparison_elementary.sol |   1 -
 ...ost_abstraction_comparison_userdefined.sol |   1 -
 .../using/free_function_multi.sol             |   1 -
 .../using/free_functions_individual.sol       |   2 -
 .../using/using_global_for_global.sol         |   1 -
 .../semanticTests/variables/delete_local.sol  |   2 -
 .../semanticTests/variables/delete_locals.sol |   2 -
 .../variables/public_state_overridding.sol    |   2 -
 ...ublic_state_overridding_dynamic_struct.sol |   4 -
 ..._overridding_mapping_to_dynamic_struct.sol |   2 -
 .../semanticTests/various/address_code.sol    |   2 -
 ...ment_to_const_var_involving_expression.sol |   3 -
 .../semanticTests/various/balance.sol         |   3 -
 .../various/byte_optimization_bug.sol         |   3 -
 .../various/code_access_create.sol            |   1 -
 .../various/code_access_runtime.sol           |   1 -
 .../semanticTests/various/code_length.sol     |   2 -
 .../various/code_length_contract_member.sol   |   2 -
 .../various/codebalance_assembly.sol          |   1 -
 .../semanticTests/various/codehash.sol        |   1 -
 .../various/codehash_assembly.sol             |   1 -
 .../various/contract_binary_dependencies.sol  |   3 -
 .../crazy_elementary_typenames_on_stack.sol   |   3 -
 .../various/cross_contract_types.sol          |   3 -
 .../semanticTests/various/decayed_tuple.sol   |   2 -
 .../various/destructuring_assignment.sol      |   1 -
 .../various/empty_name_return_parameter.sol   |   3 -
 .../various/external_types_in_calls.sol       |   1 -
 .../various/flipping_sign_tests.sol           |   3 -
 .../various/gasleft_decrease.sol              |   3 -
 .../various/gasleft_shadow_resolution.sol     |   3 -
 .../various/inline_member_init.sol            |   2 -
 .../inline_member_init_inheritence.sol        |   2 -
 .../inline_tuple_with_rational_numbers.sol    |   3 -
 .../various/iszero_bnot_correct.sol           |   3 -
 .../various/literal_empty_string.sol          |   1 -
 .../various/memory_overwrite.sol              |   3 -
 .../semanticTests/various/multi_modifiers.sol |   2 -
 .../various/multi_variable_declaration.sol    |   2 -
 .../various/nested_calldata_struct.sol        |   3 -
 .../nested_calldata_struct_to_memory.sol      |   1 -
 .../various/positive_integers_to_signed.sol   |   2 -
 .../semanticTests/various/senders_balance.sol |   1 -
 .../single_copy_with_multiple_inheritance.sol |   3 -
 .../skip_dynamic_types_for_structs.sol        |   1 -
 .../state_variable_local_variable_mixture.sol |   2 -
 .../state_variable_under_contract_name.sol    |   2 -
 .../semanticTests/various/string_tuples.sol   |   2 -
 .../semanticTests/various/super.sol           |   3 -
 .../semanticTests/various/super_alone.sol     |   3 -
 .../various/super_parentheses.sol             |   3 -
 .../various/swap_in_storage_overwrite.sol     |   3 -
 .../various/test_underscore_in_hex.sol        |   2 -
 .../typed_multi_variable_declaration.sol      |   3 -
 .../semanticTests/various/value_complex.sol   |   1 -
 .../semanticTests/various/value_insane.sol    |   1 -
 .../various/write_storage_external.sol        |   1 -
 .../semanticTests/viaYul/assert.sol           |   2 -
 .../viaYul/assert_and_require.sol             |   2 -
 .../assign_tuple_from_function_call.sol       |   2 -
 .../viaYul/cleanup/checked_arithmetic.sol     |   1 -
 .../viaYul/cleanup/comparison.sol             |   2 -
 .../semanticTests/viaYul/comparison.sol       |   2 -
 .../viaYul/comparison_functions.sol           |   2 -
 .../conditional/conditional_multiple.sol      |   2 -
 .../conditional_true_false_literal.sol        |   2 -
 .../viaYul/conditional/conditional_tuple.sol  |   2 -
 .../conditional_with_assignment.sol           |   2 -
 .../conditional_with_variables.sol            |   2 -
 .../conversion/explicit_cast_assignment.sol   |   2 -
 .../explicit_cast_function_call.sol           |   2 -
 .../explicit_cast_local_assignment.sol        |   2 -
 .../conversion/implicit_cast_assignment.sol   |   2 -
 .../implicit_cast_function_call.sol           |   2 -
 .../implicit_cast_local_assignment.sol        |   2 -
 .../define_tuple_from_function_call.sol       |   2 -
 .../semanticTests/viaYul/delete.sol           |   2 -
 .../viaYul/detect_add_overflow.sol            |   2 -
 .../viaYul/detect_add_overflow_signed.sol     |   2 -
 .../viaYul/detect_div_overflow.sol            |   2 -
 .../semanticTests/viaYul/detect_mod_zero.sol  |   2 -
 .../viaYul/detect_mod_zero_signed.sol         |   2 -
 .../viaYul/detect_mul_overflow.sol            |   2 -
 .../viaYul/detect_mul_overflow_signed.sol     |   2 -
 .../viaYul/detect_sub_overflow.sol            |   2 -
 .../viaYul/detect_sub_overflow_signed.sol     |   2 -
 .../viaYul/dirty_memory_dynamic_array.sol     |   1 -
 .../viaYul/dirty_memory_int32.sol             |   1 -
 .../viaYul/dirty_memory_static_array.sol      |   1 -
 .../viaYul/dirty_memory_struct.sol            |   1 -
 .../viaYul/dirty_memory_uint32.sol            |   1 -
 test/libsolidity/semanticTests/viaYul/exp.sol |   2 -
 .../semanticTests/viaYul/exp_literals.sol     |   1 -
 .../viaYul/exp_literals_success.sol           |   2 -
 .../semanticTests/viaYul/exp_neg.sol          |   2 -
 .../semanticTests/viaYul/exp_neg_overflow.sol |   2 -
 .../semanticTests/viaYul/exp_overflow.sol     |   2 -
 .../semanticTests/viaYul/exp_various.sol      |   2 -
 .../semanticTests/viaYul/function_address.sol |   2 -
 .../viaYul/function_entry_checks.sol          |   2 -
 .../viaYul/function_pointers.sol              |   2 -
 .../viaYul/function_selector.sol              |   2 -
 test/libsolidity/semanticTests/viaYul/if.sol  |   2 -
 .../viaYul/local_address_assignment.sol       |   2 -
 .../semanticTests/viaYul/local_assignment.sol |   2 -
 .../viaYul/local_bool_assignment.sol          |   2 -
 .../viaYul/local_tuple_assignment.sol         |   2 -
 .../viaYul/local_variable_without_init.sol    |   2 -
 .../semanticTests/viaYul/loops/break.sol      |   2 -
 .../semanticTests/viaYul/loops/continue.sol   |   2 -
 .../semanticTests/viaYul/loops/return.sol     |   2 -
 .../semanticTests/viaYul/loops/simple.sol     |   2 -
 .../viaYul/memory_struct_allow.sol            |   2 -
 .../semanticTests/viaYul/msg_sender.sol       |   2 -
 .../semanticTests/viaYul/require.sol          |   1 -
 .../semanticTests/viaYul/return.sol           |   2 -
 .../viaYul/return_and_convert.sol             |   2 -
 .../viaYul/return_storage_pointers.sol        |   2 -
 .../semanticTests/viaYul/short_circuit.sol    |   2 -
 .../viaYul/simple_assignment.sol              |   2 -
 .../viaYul/simple_inline_asm.sol              |   2 -
 .../semanticTests/viaYul/smoke_test.sol       |   1 -
 .../viaYul/storage/dirty_storage_bytes.sol    |   2 -
 .../storage/dirty_storage_static_array.sol    |   2 -
 .../viaYul/storage/packed_storage.sol         |   2 -
 .../viaYul/storage/simple_storage.sol         |   2 -
 .../semanticTests/viaYul/string_format.sol    |   2 -
 .../semanticTests/viaYul/string_literals.sol  |   2 -
 .../viaYul/tuple_evaluation_order.sol         |   2 -
 .../semanticTests/viaYul/unary_fixedbytes.sol |   2 -
 .../semanticTests/viaYul/unary_operations.sol |   1 -
 .../viaYul/various_inline_asm.sol             |   2 -
 .../viaYul/virtual_functions.sol              |   2 -
 .../internal_virtual_function_calls.sol       |   3 -
 ...irtual_function_calls_through_dispatch.sol |   3 -
 .../virtual_function_calls.sol                |   3 -
 ...unction_usage_in_constructor_arguments.sol |   1 -
 .../array_members/push_overflow_2_safe.sol    |   1 -
 .../array_members/push_struct_member_1.sol    |   1 -
 .../array_members/push_struct_member_2.sol    |   1 -
 .../smtCheckerTests/complex/MerkleProof.sol   |   1 -
 .../function_selector/homer.sol               |   2 -
 .../functions/functions_identity_1.sol        |   1 -
 .../functions/functions_identity_1_fail.sol   |   1 -
 .../functions/functions_identity_2.sol        |   1 -
 .../functions/functions_identity_2_fail.sol   |   1 -
 .../functions/functions_identity_as_tuple.sol |   1 -
 .../functions_identity_as_tuple_fail.sol      |   1 -
 .../functions/functions_recursive.sol         |   1 -
 .../functions/functions_storage_var_1.sol     |   1 -
 .../functions_storage_var_1_fail.sol          |   1 -
 .../functions/functions_storage_var_2.sol     |   1 -
 .../functions_storage_var_2_fail.sol          |   1 -
 .../functions/library_after_contract.sol      |   1 -
 ...nment_contract_member_variable_array_2.sol |   1 -
 .../special/msg_value_inheritance_3.sol       |   1 -
 .../smtCheckerTests/special/range_check.sol   |   1 -
 .../try_catch/try_inside_if.sol               |   1 -
 .../types/static_array_implicit_push_3.sol    |   1 -
 .../types/static_array_implicit_push_4.sol    |   1 -
 .../unchecked_double_with_modifier.sol        |   2 -
 test/libyul/Common.cpp                        |   6 -
 test/libyul/EwasmTranslationTest.cpp          | 127 ---
 test/libyul/EwasmTranslationTest.h            |  54 --
 test/libyul/ObjectCompilerTest.cpp            |  42 +-
 test/libyul/ObjectCompilerTest.h              |   1 -
 test/libyul/YulOptimizerTestCommon.cpp        |   7 -
 test/libyul/ewasmTranslationTests/address.yul |   9 -
 .../ewasmTranslationTests/arithmetic_add.yul  |  35 -
 .../arithmetic_addmod.yul                     |  25 -
 .../ewasmTranslationTests/arithmetic_div.yul  |  34 -
 .../ewasmTranslationTests/arithmetic_exp.yul  |  40 -
 .../ewasmTranslationTests/arithmetic_mod.yul  |  29 -
 .../ewasmTranslationTests/arithmetic_mul.yul  |  36 -
 .../arithmetic_mulmod.yul                     |  27 -
 .../ewasmTranslationTests/arithmetic_sdiv.yul |  33 -
 .../ewasmTranslationTests/arithmetic_smod.yul |  33 -
 .../ewasmTranslationTests/arithmetic_sub.yul  |  36 -
 test/libyul/ewasmTranslationTests/balance.yul |  12 -
 .../ewasmTranslationTests/bitwise_and.yul     |  24 -
 .../ewasmTranslationTests/bitwise_not.yul     |  25 -
 .../ewasmTranslationTests/bitwise_or.yul      |  26 -
 .../ewasmTranslationTests/bitwise_xor.yul     |  27 -
 .../ewasmTranslationTests/blockhash.yul       |   9 -
 .../ewasmTranslationTests/calldatacopy.yul    |   8 -
 .../ewasmTranslationTests/calldataload.yul    |   7 -
 .../ewasmTranslationTests/calldatasize.yul    |   7 -
 test/libyul/ewasmTranslationTests/caller.yul  |   9 -
 .../ewasmTranslationTests/callvalue.yul       |   9 -
 test/libyul/ewasmTranslationTests/chainid.yul |  10 -
 .../libyul/ewasmTranslationTests/codecopy.yul |  11 -
 .../libyul/ewasmTranslationTests/codesize.yul |   9 -
 .../libyul/ewasmTranslationTests/coinbase.yul |   9 -
 .../ewasmTranslationTests/comparison_eq.yul   |  28 -
 .../ewasmTranslationTests/comparison_gt.yul   |  36 -
 .../ewasmTranslationTests/comparison_lt.yul   |  36 -
 .../ewasmTranslationTests/comparison_sgt.yul  |  54 --
 .../ewasmTranslationTests/comparison_slt.yul  |  55 --
 .../libyul/ewasmTranslationTests/datacopy.yul |  20 -
 .../ewasmTranslationTests/dataoffset.yul      |  16 -
 .../libyul/ewasmTranslationTests/datasize.yul |  16 -
 .../ewasmTranslationTests/difficulty.yul      |  11 -
 .../ewasmTranslationTests/extcodecopy.yul     |  11 -
 .../ewasmTranslationTests/extcodehash.yul     |  11 -
 .../ewasmTranslationTests/extcodesize.yul     |   9 -
 test/libyul/ewasmTranslationTests/gas.yul     |   9 -
 .../libyul/ewasmTranslationTests/gaslimit.yul |   9 -
 .../libyul/ewasmTranslationTests/gasprice.yul |   9 -
 test/libyul/ewasmTranslationTests/invalid.yul |  14 -
 test/libyul/ewasmTranslationTests/iszero.yul  |  14 -
 .../ewasmTranslationTests/keccak256.yul       |   9 -
 test/libyul/ewasmTranslationTests/log0.yul    |   8 -
 test/libyul/ewasmTranslationTests/log1.yul    |   8 -
 test/libyul/ewasmTranslationTests/log2.yul    |   8 -
 test/libyul/ewasmTranslationTests/log3.yul    |   8 -
 test/libyul/ewasmTranslationTests/log4.yul    |   8 -
 .../ewasmTranslationTests/loop_break.yul      |  13 -
 .../ewasmTranslationTests/loop_continue.yul   |  22 -
 .../ewasmTranslationTests/memoryguard.yul     |  12 -
 test/libyul/ewasmTranslationTests/msize.yul   |  12 -
 test/libyul/ewasmTranslationTests/mstore8.yul |  15 -
 .../ewasmTranslationTests/mstore_mload.yul    |  14 -
 test/libyul/ewasmTranslationTests/number.yul  |   9 -
 test/libyul/ewasmTranslationTests/origin.yul  |   9 -
 test/libyul/ewasmTranslationTests/return.yul  |  11 -
 .../ewasmTranslationTests/returndatacopy.yul  |  10 -
 .../ewasmTranslationTests/returndatasize.yul  |   9 -
 test/libyul/ewasmTranslationTests/revert.yul  |  13 -
 .../ewasmTranslationTests/selfbalance.yul     |  10 -
 .../ewasmTranslationTests/selfdestruct.yul    |  10 -
 test/libyul/ewasmTranslationTests/shifts.yul  |  23 -
 .../ewasmTranslationTests/signextend.yul      |  16 -
 .../ewasmTranslationTests/simple_mstore.yul   |   8 -
 .../ewasmTranslationTests/simple_sload.yul    |  16 -
 .../ewasmTranslationTests/simple_sstore.yul   |  12 -
 test/libyul/ewasmTranslationTests/smoke.yul   |   5 -
 .../ewasmTranslationTests/smoke_call.yul      |  10 -
 .../ewasmTranslationTests/smoke_callcode.yul  |  10 -
 .../ewasmTranslationTests/smoke_create.yul    |  11 -
 .../ewasmTranslationTests/smoke_create2.yul   |  13 -
 .../smoke_delegatecall.yul                    |  10 -
 .../smoke_staticcall.yul                      |  12 -
 .../ewasmTranslationTests/timestamp.yul       |   9 -
 .../objectCompiler/wasm/no_main_function.yul  |  22 -
 test/libyul/objectCompiler/wasm/simple.yul    |  23 -
 test/libyul/objectCompiler/wasm/subObject.yul |  22 -
 .../objectCompiler/wasm/subObjectAccess.yul   |  79 --
 .../add_correct_type_wasm.yul                 |  19 -
 .../expressionSplitter/typed.yul              |  43 --
 .../wordSizeTransform/constant_assignment.yul |  18 -
 .../wordSizeTransform/function_call.yul       |  43 --
 .../functional_instruction.yul                |  17 -
 .../wordSizeTransform/if.yul                  |  49 --
 .../wordSizeTransform/or_bool_renamed.yul     |  25 -
 .../wordSizeTransform/switch_1.yul            |  71 --
 .../wordSizeTransform/switch_2.yul            |  77 --
 .../wordSizeTransform/switch_3.yul            |  89 ---
 .../wordSizeTransform/switch_4.yul            |  97 ---
 .../wordSizeTransform/switch_5.yul            |  29 -
 .../for_loop_condition_fail_ewasm.yul         |   8 -
 .../yulSyntaxTests/linkersymbol_ewasm.yul     |   7 -
 .../yulSyntaxTests/type_check_cases.yul       |   8 -
 .../yulSyntaxTests/type_check_cases_fail.yul  |  10 -
 .../type_check_if_condition.yul               |   7 -
 .../type_check_if_condition_fail.yul          |   8 -
 test/solc/CommandLineParser.cpp               |  21 +-
 test/soltest.cpp                              |   4 -
 test/tools/CMakeLists.txt                     |   1 -
 test/tools/isoltest.cpp                       |   1 -
 test/tools/yulInterpreter/CMakeLists.txt      |   2 -
 .../EwasmBuiltinInterpreter.cpp               | 617 ---------------
 .../yulInterpreter/EwasmBuiltinInterpreter.h  | 138 ----
 test/tools/yulInterpreter/Interpreter.cpp     |   9 -
 1042 files changed, 97 insertions(+), 10946 deletions(-)
 delete mode 100644 cmake/templates/ewasm_polyfill.in
 delete mode 100644 libyul/backends/wasm/BinaryTransform.cpp
 delete mode 100644 libyul/backends/wasm/BinaryTransform.h
 delete mode 100644 libyul/backends/wasm/EVMToEwasmTranslator.cpp
 delete mode 100644 libyul/backends/wasm/EVMToEwasmTranslator.h
 delete mode 100644 libyul/backends/wasm/TextTransform.cpp
 delete mode 100644 libyul/backends/wasm/TextTransform.h
 delete mode 100644 libyul/backends/wasm/WasmAST.h
 delete mode 100644 libyul/backends/wasm/WasmCodeTransform.cpp
 delete mode 100644 libyul/backends/wasm/WasmCodeTransform.h
 delete mode 100644 libyul/backends/wasm/WasmDialect.cpp
 delete mode 100644 libyul/backends/wasm/WasmDialect.h
 delete mode 100644 libyul/backends/wasm/WasmObjectCompiler.cpp
 delete mode 100644 libyul/backends/wasm/WasmObjectCompiler.h
 delete mode 100644 libyul/backends/wasm/WordSizeTransform.cpp
 delete mode 100644 libyul/backends/wasm/WordSizeTransform.h
 delete mode 100644 libyul/backends/wasm/polyfill/Arithmetic.yul
 delete mode 100644 libyul/backends/wasm/polyfill/Bitwise.yul
 delete mode 100644 libyul/backends/wasm/polyfill/Comparison.yul
 delete mode 100644 libyul/backends/wasm/polyfill/Conversion.yul
 delete mode 100644 libyul/backends/wasm/polyfill/Interface.yul
 delete mode 100644 libyul/backends/wasm/polyfill/Keccak.yul
 delete mode 100644 libyul/backends/wasm/polyfill/Logical.yul
 delete mode 100644 libyul/backends/wasm/polyfill/Memory.yul
 delete mode 100644 test/cmdlineTests/evm_to_wasm/args
 delete mode 100644 test/cmdlineTests/evm_to_wasm/input.yul
 delete mode 100644 test/cmdlineTests/evm_to_wasm/output
 delete mode 100644 test/cmdlineTests/evm_to_wasm_break/args
 delete mode 100644 test/cmdlineTests/evm_to_wasm_break/input.yul
 delete mode 100644 test/cmdlineTests/evm_to_wasm_break/output
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/args
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/input.yul
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/output
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul
 delete mode 100644 test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
 delete mode 100644 test/cmdlineTests/evm_to_wasm_unsupported_translation/args
 delete mode 100644 test/cmdlineTests/evm_to_wasm_unsupported_translation/err
 delete mode 100644 test/cmdlineTests/evm_to_wasm_unsupported_translation/exit
 delete mode 100644 test/cmdlineTests/evm_to_wasm_unsupported_translation/input.yul
 delete mode 100644 test/cmdlineTests/evm_to_wasm_unsupported_translation/output
 delete mode 100644 test/cmdlineTests/output_selection_ewasm_ir_only/args
 delete mode 100644 test/cmdlineTests/output_selection_ewasm_ir_only/err
 delete mode 100644 test/cmdlineTests/output_selection_ewasm_ir_only/exit
 delete mode 100644 test/cmdlineTests/output_selection_ewasm_ir_only/input.sol
 delete mode 100644 test/cmdlineTests/standard_ewasm_requested/input.json
 delete mode 100644 test/cmdlineTests/standard_ewasm_requested/output.json
 delete mode 100644 test/cmdlineTests/standard_ewasm_requested_abstract/input.json
 delete mode 100644 test/cmdlineTests/standard_ewasm_requested_abstract/output.json
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/args
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/input.yul
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/output
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_only/args
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul
 delete mode 100644 test/cmdlineTests/strict_asm_output_selection_ewasm_only/output
 delete mode 100644 test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/args
 delete mode 100644 test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/input.yul
 delete mode 100644 test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/output
 delete mode 100644 test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/args
 delete mode 100644 test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/input.yul
 delete mode 100644 test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/output
 delete mode 100644 test/cmdlineTests/yul_to_wasm_source_location_crash/args
 delete mode 100644 test/cmdlineTests/yul_to_wasm_source_location_crash/input.yul
 delete mode 100644 test/cmdlineTests/yul_to_wasm_source_location_crash/output
 delete mode 100644 test/libyul/EwasmTranslationTest.cpp
 delete mode 100644 test/libyul/EwasmTranslationTest.h
 delete mode 100644 test/libyul/ewasmTranslationTests/address.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/arithmetic_add.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/arithmetic_addmod.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/arithmetic_div.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/arithmetic_exp.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/arithmetic_mod.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/arithmetic_mul.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/arithmetic_mulmod.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/arithmetic_sdiv.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/arithmetic_smod.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/arithmetic_sub.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/balance.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/bitwise_and.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/bitwise_not.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/bitwise_or.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/bitwise_xor.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/blockhash.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/calldatacopy.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/calldataload.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/calldatasize.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/caller.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/callvalue.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/chainid.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/codecopy.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/codesize.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/coinbase.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/comparison_eq.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/comparison_gt.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/comparison_lt.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/comparison_sgt.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/comparison_slt.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/datacopy.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/dataoffset.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/datasize.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/difficulty.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/extcodecopy.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/extcodehash.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/extcodesize.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/gas.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/gaslimit.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/gasprice.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/invalid.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/iszero.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/keccak256.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/log0.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/log1.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/log2.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/log3.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/log4.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/loop_break.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/loop_continue.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/memoryguard.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/msize.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/mstore8.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/mstore_mload.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/number.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/origin.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/return.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/returndatacopy.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/returndatasize.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/revert.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/selfbalance.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/selfdestruct.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/shifts.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/signextend.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/simple_mstore.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/simple_sload.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/simple_sstore.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/smoke.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/smoke_call.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/smoke_callcode.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/smoke_create.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/smoke_create2.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/smoke_delegatecall.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/smoke_staticcall.yul
 delete mode 100644 test/libyul/ewasmTranslationTests/timestamp.yul
 delete mode 100644 test/libyul/objectCompiler/wasm/no_main_function.yul
 delete mode 100644 test/libyul/objectCompiler/wasm/simple.yul
 delete mode 100644 test/libyul/objectCompiler/wasm/subObject.yul
 delete mode 100644 test/libyul/objectCompiler/wasm/subObjectAccess.yul
 delete mode 100644 test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type_wasm.yul
 delete mode 100644 test/libyul/yulOptimizerTests/expressionSplitter/typed.yul
 delete mode 100644 test/libyul/yulOptimizerTests/wordSizeTransform/constant_assignment.yul
 delete mode 100644 test/libyul/yulOptimizerTests/wordSizeTransform/function_call.yul
 delete mode 100644 test/libyul/yulOptimizerTests/wordSizeTransform/functional_instruction.yul
 delete mode 100644 test/libyul/yulOptimizerTests/wordSizeTransform/if.yul
 delete mode 100644 test/libyul/yulOptimizerTests/wordSizeTransform/or_bool_renamed.yul
 delete mode 100644 test/libyul/yulOptimizerTests/wordSizeTransform/switch_1.yul
 delete mode 100644 test/libyul/yulOptimizerTests/wordSizeTransform/switch_2.yul
 delete mode 100644 test/libyul/yulOptimizerTests/wordSizeTransform/switch_3.yul
 delete mode 100644 test/libyul/yulOptimizerTests/wordSizeTransform/switch_4.yul
 delete mode 100644 test/libyul/yulOptimizerTests/wordSizeTransform/switch_5.yul
 delete mode 100644 test/libyul/yulSyntaxTests/for_loop_condition_fail_ewasm.yul
 delete mode 100644 test/libyul/yulSyntaxTests/linkersymbol_ewasm.yul
 delete mode 100644 test/libyul/yulSyntaxTests/type_check_cases.yul
 delete mode 100644 test/libyul/yulSyntaxTests/type_check_cases_fail.yul
 delete mode 100644 test/libyul/yulSyntaxTests/type_check_if_condition.yul
 delete mode 100644 test/libyul/yulSyntaxTests/type_check_if_condition_fail.yul
 delete mode 100644 test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
 delete mode 100644 test/tools/yulInterpreter/EwasmBuiltinInterpreter.h

diff --git a/Changelog.md b/Changelog.md
index 164d998c29..c0f773908f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * EWasm: Remove EWasm backend.
 
 
 Bugfixes:
diff --git a/cmake/templates/ewasm_polyfill.in b/cmake/templates/ewasm_polyfill.in
deleted file mode 100644
index 8ac364280d..0000000000
--- a/cmake/templates/ewasm_polyfill.in
+++ /dev/null
@@ -1,13 +0,0 @@
-// The generation of this file is defined in libyul/CMakeLists.txt.
-// This file was generated by using the content of libyul/backends/wasm/polyfill/@EWASM_POLYFILL_NAME@.yul.
-
-#pragma once
-
-namespace solidity::yul::wasm::polyfill
-{
-
-static char const @EWASM_POLYFILL_NAME@[] = {
-	@EWASM_POLYFILL_CONTENT@, 0
-};
-
-} // namespace solidity::yul::wasm::polyfill
diff --git a/docs/contributing.rst b/docs/contributing.rst
index d74612417b..52a99ec4f5 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -93,8 +93,7 @@ Prerequisites
 
 For running all compiler tests you may want to optionally install a few
 dependencies (`evmone <https://github.com/ethereum/evmone/releases>`_,
-`libz3 <https://github.com/Z3Prover/z3>`_, and
-`libhera <https://github.com/ewasm/hera>`_).
+`libz3 <https://github.com/Z3Prover/z3>`_).
 
 On macOS systems, some of the testing scripts expect GNU coreutils to be installed.
 This can be easiest accomplished using Homebrew: ``brew install coreutils``.
@@ -129,13 +128,7 @@ for the ``evmone`` shared object can be specified via the ``ETH_EVMONE`` environ
 If you do not have it installed, you can skip these tests by passing the ``--no-semantic-tests``
 flag to ``scripts/soltest.sh``.
 
-Running Ewasm tests is disabled by default and can be explicitly enabled
-via ``./scripts/soltest.sh --ewasm`` and requires `hera <https://github.com/ewasm/hera>`_
-to be found by ``soltest``.
-The mechanism for locating the ``hera`` library is the same as for ``evmone``, except that the
-variable for specifying an explicit location is called ``ETH_HERA``.
-
-The ``evmone`` and ``hera`` libraries should both end with the file name
+The ``evmone`` library should both end with the file name
 extension ``.so`` on Linux, ``.dll`` on Windows systems and ``.dylib`` on macOS.
 
 For running SMT tests, the ``libz3`` library must be installed and locatable
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index fa1a4ec322..57f0fab6cf 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -404,10 +404,8 @@ Input Description
         //   evm.deployedBytecode.immutableReferences - Map from AST ids to bytecode ranges that reference immutables
         //   evm.methodIdentifiers - The list of function hashes
         //   evm.gasEstimates - Function gas estimates
-        //   ewasm.wast - Ewasm in WebAssembly S-expressions format
-        //   ewasm.wasm - Ewasm in WebAssembly binary format
         //
-        // Note that using a using `evm`, `evm.bytecode`, `ewasm`, etc. will select every
+        // Note that using a using `evm`, `evm.bytecode`, etc. will select every
         // target part of that output. Additionally, `*` can be used as a wildcard to request everything.
         //
         "outputSelection": {
@@ -501,7 +499,7 @@ Output Description
           // Mandatory: Error type, such as "TypeError", "InternalCompilerError", "Exception", etc.
           // See below for complete list of types.
           "type": "TypeError",
-          // Mandatory: Component where the error originated, such as "general", "ewasm", etc.
+          // Mandatory: Component where the error originated, such as "general" etc.
           "component": "general",
           // Mandatory ("error", "warning" or "info", but please note that this may be extended in the future)
           "severity": "error",
@@ -617,13 +615,6 @@ Output Description
                   "heavyLifting()": "infinite"
                 }
               }
-            },
-            // Ewasm related outputs
-            "ewasm": {
-              // S-expressions format
-              "wast": "",
-              // Binary format (hex string)
-              "wasm": ""
             }
           }
         }
diff --git a/docs/yul.rst b/docs/yul.rst
index 2cea0260b9..8a500c6145 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -1194,8 +1194,7 @@ An example Yul Object is shown below:
             // executing code is the constructor code)
             size := datasize("Contract1_deployed")
             offset := allocate(size)
-            // This will turn into a memory->memory copy for Ewasm and
-            // a codecopy for EVM
+            // This will turn into a codecopy for EVM
             datacopy(offset, dataoffset("Contract1_deployed"), size)
             return(offset, size)
         }
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index fa1e8ab3ea..b18834a971 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -315,7 +315,6 @@ void CompilerStack::reset(bool _keepSettings)
 		m_evmVersion = langutil::EVMVersion();
 		m_modelCheckerSettings = ModelCheckerSettings{};
 		m_generateIR = false;
-		m_generateEwasm = false;
 		m_revertStrings = RevertStrings::Default;
 		m_optimiserSettings = OptimiserSettings::minimal();
 		m_metadataLiteralSources = false;
@@ -681,7 +680,7 @@ bool CompilerStack::compile(State _stopAfter)
 				{
 					try
 					{
-						if (m_viaIR || m_generateIR || m_generateEwasm)
+						if (m_viaIR || m_generateIR)
 							generateIR(*contract);
 						if (m_generateEvmBytecode)
 						{
@@ -690,8 +689,6 @@ bool CompilerStack::compile(State _stopAfter)
 							else
 								compileContract(*contract, otherCompilers);
 						}
-						if (m_generateEwasm)
-							generateEwasm(*contract);
 					}
 					catch (Error const& _error)
 					{
@@ -892,22 +889,6 @@ string const& CompilerStack::yulIROptimized(string const& _contractName) const
 	return contract(_contractName).yulIROptimized;
 }
 
-string const& CompilerStack::ewasm(string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	return contract(_contractName).ewasm;
-}
-
-evmasm::LinkerObject const& CompilerStack::ewasmObject(string const& _contractName) const
-{
-	if (m_stackState != CompilationSuccessful)
-		solThrow(CompilerError, "Compilation was not successful.");
-
-	return contract(_contractName).ewasmObject;
-}
-
 evmasm::LinkerObject const& CompilerStack::object(string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
@@ -1479,42 +1460,6 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 	assembleYul(_contract, compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly);
 }
 
-void CompilerStack::generateEwasm(ContractDefinition const& _contract)
-{
-	solAssert(m_stackState >= AnalysisPerformed, "");
-	if (m_hasError)
-		solThrow(CompilerError, "Called generateEwasm with errors.");
-
-	if (!_contract.canBeDeployed())
-		return;
-
-	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
-	solAssert(!compiledContract.yulIROptimized.empty(), "");
-	if (!compiledContract.ewasm.empty())
-		return;
-
-	// Re-parse the Yul IR in EVM dialect
-	yul::YulStack stack(
-		m_evmVersion,
-		m_eofVersion,
-		yul::YulStack::Language::StrictAssembly,
-		m_optimiserSettings,
-		m_debugInfoSelection
-	);
-	stack.parseAndAnalyze("", compiledContract.yulIROptimized);
-
-	stack.optimize();
-	stack.translate(yul::YulStack::Language::Ewasm);
-	stack.optimize();
-
-	//cout << yul::AsmPrinter{}(*stack.parserResult()->code) << endl;
-
-	// Turn into Ewasm text representation.
-	auto result = stack.assemble(yul::YulStack::Machine::Ewasm);
-	compiledContract.ewasm = std::move(result.assembly);
-	compiledContract.ewasmObject = std::move(*result.bytecode);
-}
-
 CompilerStack::Contract const& CompilerStack::contract(string const& _contractName) const
 {
 	solAssert(m_stackState >= AnalysisPerformed, "");
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 36e462330b..ae11e233bd 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -203,9 +203,6 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// Enable generation of Yul IR code.
 	void enableIRGeneration(bool _enable = true) { m_generateIR = _enable; }
 
-	/// Enable experimental generation of Ewasm code. If enabled, IR is also generated.
-	void enableEwasmGeneration(bool _enable = true) { m_generateEwasm = _enable; }
-
 	/// @arg _metadataLiteralSources When true, store sources as literals in the contract metadata.
 	/// Must be set before parsing.
 	void useMetadataLiteralSources(bool _metadataLiteralSources);
@@ -282,12 +279,6 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// @returns the optimized IR representation of a contract.
 	std::string const& yulIROptimized(std::string const& _contractName) const;
 
-	/// @returns the Ewasm text representation of a contract.
-	std::string const& ewasm(std::string const& _contractName) const;
-
-	/// @returns the Ewasm representation of a contract.
-	evmasm::LinkerObject const& ewasmObject(std::string const& _contractName) const;
-
 	/// @returns the assembled object for a contract.
 	evmasm::LinkerObject const& object(std::string const& _contractName) const;
 
@@ -389,8 +380,6 @@ class CompilerStack: public langutil::CharStreamProvider
 		evmasm::LinkerObject runtimeObject; ///< Runtime object.
 		std::string yulIR; ///< Yul IR code.
 		std::string yulIROptimized; ///< Optimized Yul IR code.
-		std::string ewasm; ///< Experimental Ewasm text representation
-		evmasm::LinkerObject ewasmObject; ///< Experimental Ewasm code
 		util::LazyInit<std::string const> metadata; ///< The metadata json that will be hashed into the chain.
 		util::LazyInit<Json::Value const> abi;
 		util::LazyInit<Json::Value const> storageLayout;
@@ -448,10 +437,6 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// Depends on output generated by generateIR.
 	void generateEVMFromIR(ContractDefinition const& _contract);
 
-	/// Generate Ewasm representation for a single contract.
-	/// Depends on output generated by generateIR.
-	void generateEwasm(ContractDefinition const& _contract);
-
 	/// Links all the known library addresses in the available objects. Any unknown
 	/// library will still be kept as an unlinked placeholder in the objects.
 	void link();
@@ -510,7 +495,6 @@ class CompilerStack: public langutil::CharStreamProvider
 	std::map<std::string, std::set<std::string>> m_requestedContractNames;
 	bool m_generateEvmBytecode = true;
 	bool m_generateIR = false;
-	bool m_generateEwasm = false;
 	std::map<std::string, util::h160> m_libraries;
 	ImportRemapper m_importRemapper;
 	std::map<std::string const, Source> m_sources;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index dbcbe798aa..28a564a4c9 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -179,7 +179,7 @@ bool hashMatchesContent(string const& _hash, string const& _content)
 
 bool isArtifactRequested(Json::Value const& _outputSelection, string const& _artifact, bool _wildcardMatchesExperimental)
 {
-	static set<string> experimental{"ir", "irOptimized", "wast", "ewasm", "ewasm.wast"};
+	static set<string> experimental{"ir", "irOptimized"};
 	for (auto const& selectedArtifactJson: _outputSelection)
 	{
 		string const& selectedArtifact = selectedArtifactJson.asString();
@@ -190,7 +190,7 @@ bool isArtifactRequested(Json::Value const& _outputSelection, string const& _art
 			return true;
 		else if (selectedArtifact == "*")
 		{
-			// "ir", "irOptimized", "wast" and "ewasm.wast" can only be matched by "*" if activated.
+			// "ir", "irOptimized" can only be matched by "*" if activated.
 			if (experimental.count(_artifact) == 0 || _wildcardMatchesExperimental)
 				return true;
 		}
@@ -264,7 +264,6 @@ bool isBinaryRequested(Json::Value const& _outputSelection)
 	static vector<string> const outputsThatRequireBinaries = vector<string>{
 		"*",
 		"ir", "irOptimized",
-		"wast", "wasm", "ewasm.wast", "ewasm.wasm",
 		"evm.gasEstimates", "evm.legacyAssembly", "evm.assembly"
 	} + evmObjectComponents("bytecode") + evmObjectComponents("deployedBytecode");
 
@@ -295,29 +294,10 @@ bool isEvmBytecodeRequested(Json::Value const& _outputSelection)
 	return false;
 }
 
-/// @returns true if any Ewasm code was requested. Note that as an exception, '*' does not
-/// yet match "ewasm.wast" or "ewasm"
-bool isEwasmRequested(Json::Value const& _outputSelection)
-{
-	if (!_outputSelection.isObject())
-		return false;
-
-	for (auto const& fileRequests: _outputSelection)
-		for (auto const& requests: fileRequests)
-			for (auto const& request: requests)
-				if (request == "ewasm" || request == "ewasm.wast")
-					return true;
-
-	return false;
-}
-
 /// @returns true if any Yul IR was requested. Note that as an exception, '*' does not
 /// yet match "ir" or "irOptimized"
 bool isIRRequested(Json::Value const& _outputSelection)
 {
-	if (isEwasmRequested(_outputSelection))
-		return true;
-
 	if (!_outputSelection.isObject())
 		return false;
 
@@ -1175,7 +1155,6 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 
 	compilerStack.enableEvmBytecodeGeneration(isEvmBytecodeRequested(_inputsAndSettings.outputSelection));
 	compilerStack.enableIRGeneration(isIRRequested(_inputsAndSettings.outputSelection));
-	compilerStack.enableEwasmGeneration(isEwasmRequested(_inputsAndSettings.outputSelection));
 
 	Json::Value errors = std::move(_inputsAndSettings.errors);
 
@@ -1374,12 +1353,6 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "irOptimized", wildcardMatchesExperimental))
 			contractData["irOptimized"] = compilerStack.yulIROptimized(contractName);
 
-		// Ewasm
-		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "ewasm.wast", wildcardMatchesExperimental))
-			contractData["ewasm"]["wast"] = compilerStack.ewasm(contractName);
-		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "ewasm.wasm", wildcardMatchesExperimental))
-			contractData["ewasm"]["wasm"] = compilerStack.ewasmObject(contractName).toHex();
-
 		// EVM
 		Json::Value evmData(Json::objectValue);
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "evm.assembly", wildcardMatchesExperimental))
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index cc7033a0b8..2cf02f8383 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -1,19 +1,3 @@
-# This will re-generate the polyfill headers, if any file within libyul/backends/wasm/polyfill/ was modified.
-set_directory_properties(PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/libyul/backends/wasm/polyfill/)
-
-set(POLYFILLS Arithmetic Bitwise Comparison Conversion Interface Keccak Logical Memory)
-set(GENERATED_POLYFILL_HEADERS)
-foreach(polyfill IN LISTS POLYFILLS)
-	set(POLYFILL_FILE ${CMAKE_SOURCE_DIR}/libyul/backends/wasm/polyfill/${polyfill}.yul)
-	file(READ ${POLYFILL_FILE} EWASM_POLYFILL_CONTENT HEX)
-	string(REGEX MATCHALL ".." EWASM_POLYFILL_CONTENT "${EWASM_POLYFILL_CONTENT}")
-	string(REGEX REPLACE ";" ",\n\t0x" EWASM_POLYFILL_CONTENT "${EWASM_POLYFILL_CONTENT}")
-	set(EWASM_POLYFILL_CONTENT "0x${EWASM_POLYFILL_CONTENT}")
-	set(EWASM_POLYFILL_NAME ${polyfill})
-	configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/ewasm_polyfill.in" ${CMAKE_BINARY_DIR}/include/ewasmPolyfills/${polyfill}.h @ONLY)
-	list(APPEND GENERATED_POLYFILL_HEADERS ${CMAKE_BINARY_DIR}/include/ewasmPolyfills/${polyfill}.h)
-endforeach()
-
 add_library(yul
 	${GENERATED_POLYFILL_HEADERS}
 
@@ -80,20 +64,6 @@ add_library(yul
 	backends/evm/StackLayoutGenerator.h
 	backends/evm/VariableReferenceCounter.h
 	backends/evm/VariableReferenceCounter.cpp
-	backends/wasm/EVMToEwasmTranslator.cpp
-	backends/wasm/EVMToEwasmTranslator.h
-	backends/wasm/BinaryTransform.cpp
-	backends/wasm/BinaryTransform.h
-	backends/wasm/TextTransform.cpp
-	backends/wasm/TextTransform.h
-	backends/wasm/WasmCodeTransform.cpp
-	backends/wasm/WasmCodeTransform.h
-	backends/wasm/WasmDialect.cpp
-	backends/wasm/WasmDialect.h
-	backends/wasm/WasmObjectCompiler.cpp
-	backends/wasm/WasmObjectCompiler.h
-	backends/wasm/WordSizeTransform.cpp
-	backends/wasm/WordSizeTransform.h
 	optimiser/ASTCopier.cpp
 	optimiser/ASTCopier.h
 	optimiser/ASTWalker.cpp
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index f258de6a84..9ac90c3959 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -16,8 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 /**
- * Full assembly stack that can support EVM-assembly and Yul as input and EVM, EVM1.5 and
- * Ewasm as output.
+ * Full assembly stack that can support EVM-assembly and Yul as input and EVM, EVM1.5
  */
 
 
@@ -30,9 +29,6 @@
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/backends/evm/EVMObjectCompiler.h>
 #include <libyul/backends/evm/EVMMetrics.h>
-#include <libyul/backends/wasm/WasmDialect.h>
-#include <libyul/backends/wasm/WasmObjectCompiler.h>
-#include <libyul/backends/wasm/EVMToEwasmTranslator.h>
 #include <libyul/ObjectParser.h>
 #include <libyul/optimiser/Suite.h>
 
@@ -57,8 +53,6 @@ Dialect const& languageToDialect(YulStack::Language _language, EVMVersion _versi
 		return EVMDialect::strictAssemblyForEVMObjects(_version);
 	case YulStack::Language::Yul:
 		return EVMDialectTyped::instance(_version);
-	case YulStack::Language::Ewasm:
-		return WasmDialect::instance();
 	}
 	yulAssert(false, "");
 	return Dialect::yulDeprecated();
@@ -102,24 +96,6 @@ void YulStack::optimize()
 	yulAssert(analyzeParsed(), "Invalid source code after optimization.");
 }
 
-void YulStack::translate(YulStack::Language _targetLanguage)
-{
-	if (m_language == _targetLanguage)
-		return;
-
-	yulAssert(
-		m_language == Language::StrictAssembly && _targetLanguage == Language::Ewasm,
-		"Invalid language combination"
-	);
-
-	*m_parserResult = EVMToEwasmTranslator(
-		languageToDialect(m_language, m_evmVersion),
-		*this
-	).run(*parserResult());
-
-	m_language = _targetLanguage;
-}
-
 bool YulStack::analyzeParsed()
 {
 	yulAssert(m_parserResult, "");
@@ -205,18 +181,6 @@ MachineAssemblyObject YulStack::assemble(Machine _machine) const
 	{
 	case Machine::EVM:
 		return assembleWithDeployed().first;
-	case Machine::Ewasm:
-	{
-		yulAssert(m_language == Language::Ewasm, "");
-		Dialect const& dialect = languageToDialect(m_language, EVMVersion{});
-
-		MachineAssemblyObject object;
-		auto result = WasmObjectCompiler::compile(*m_parserResult, dialect);
-		object.assembly = std::move(result.first);
-		object.bytecode = make_shared<evmasm::LinkerObject>();
-		object.bytecode->bytecode = std::move(result.second);
-		return object;
-	}
 	}
 	// unreachable
 	return MachineAssemblyObject();
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index 5c57b56fa5..bd38cd6024 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -16,8 +16,7 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 /**
- * Full assembly stack that can support EVM-assembly and Yul as input and EVM, EVM1.5 and
- * Ewasm as output.
+ * Full assembly stack that can support EVM-assembly and Yul as input and EVM.
  */
 
 #pragma once
@@ -60,14 +59,13 @@ struct MachineAssemblyObject
 };
 
 /*
- * Full assembly stack that can support EVM-assembly and Yul as input and EVM, EVM1.5 and
- * Ewasm as output.
+ * Full assembly stack that can support EVM-assembly and Yul as input and EVM as output.
  */
 class YulStack: public langutil::CharStreamProvider
 {
 public:
-	enum class Language { Yul, Assembly, StrictAssembly, Ewasm };
-	enum class Machine { EVM, Ewasm };
+	enum class Language { Yul, Assembly, StrictAssembly };
+	enum class Machine { EVM };
 
 	YulStack():
 		YulStack(
@@ -105,9 +103,6 @@ class YulStack: public langutil::CharStreamProvider
 	/// If the settings (see constructor) disabled the optimizer, nothing is done here.
 	void optimize();
 
-	/// Translate the source to a different language / dialect.
-	void translate(Language _targetLanguage);
-
 	/// Run the assembly step (should only be called after parseAndAnalyze).
 	MachineAssemblyObject assemble(Machine _machine) const;
 
diff --git a/libyul/backends/wasm/BinaryTransform.cpp b/libyul/backends/wasm/BinaryTransform.cpp
deleted file mode 100644
index 03f385d805..0000000000
--- a/libyul/backends/wasm/BinaryTransform.cpp
+++ /dev/null
@@ -1,722 +0,0 @@
-/*
-	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
-/**
- * Component that transforms internal Wasm representation to binary.
- */
-
-#include <libyul/backends/wasm/BinaryTransform.h>
-
-#include <libyul/Exceptions.h>
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Visitor.h>
-#include <libsolutil/LEB128.h>
-
-#include <range/v3/view/map.hpp>
-#include <range/v3/view/reverse.hpp>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::yul::wasm;
-using namespace solidity::util;
-
-namespace
-{
-
-bytes toBytes(uint8_t _b)
-{
-	return bytes(1, _b);
-}
-
-enum class LimitsKind: uint8_t
-{
-	Min = 0x00,
-	MinMax = 0x01,
-};
-
-enum class Mutability: uint8_t
-{
-	Const = 0x00,
-	Var = 0x01,
-};
-
-enum class Section: uint8_t
-{
-	CUSTOM = 0x00,
-	TYPE = 0x01,
-	IMPORT = 0x02,
-	FUNCTION = 0x03,
-	MEMORY = 0x05,
-	GLOBAL = 0x06,
-	EXPORT = 0x07,
-	CODE = 0x0a
-};
-
-bytes toBytes(Section _s)
-{
-	return toBytes(uint8_t(_s));
-}
-
-enum class ValueType: uint8_t
-{
-	Void = 0x40,
-	Function = 0x60,
-	I64 = 0x7e,
-	I32 = 0x7f
-};
-
-bytes toBytes(ValueType _vt)
-{
-	return toBytes(uint8_t(_vt));
-}
-
-ValueType toValueType(wasm::Type _type)
-{
-	if (_type == wasm::Type::i32)
-		return ValueType::I32;
-	else if (_type == wasm::Type::i64)
-		return ValueType::I64;
-	else
-		yulAssert(false, "Invalid wasm variable type");
-}
-
-enum class Export: uint8_t
-{
-	Function = 0x0,
-	Memory = 0x2
-};
-
-bytes toBytes(Export _export)
-{
-	return toBytes(uint8_t(_export));
-}
-
-// NOTE: This is a subset of WebAssembly opcodes.
-//       Those available as a builtin are listed further down.
-enum class Opcode: uint8_t
-{
-	Block = 0x02,
-	Loop = 0x03,
-	If = 0x04,
-	Else = 0x05,
-	End = 0x0b,
-	Br = 0x0c,
-	BrIf = 0x0d,
-	BrTable = 0x0e, // Not used yet.
-	Return = 0x0f,
-	Call = 0x10,
-	CallIndirect = 0x11, // Not used yet.
-	LocalGet = 0x20,
-	LocalSet = 0x21,
-	LocalTee = 0x22, // Not used yet.
-	GlobalGet = 0x23,
-	GlobalSet = 0x24,
-	I32Const = 0x41,
-	I64Const = 0x42,
-};
-
-bytes toBytes(Opcode _o)
-{
-	return toBytes(uint8_t(_o));
-}
-
-Opcode constOpcodeFor(ValueType _type)
-{
-	if (_type == ValueType::I32)
-		return Opcode::I32Const;
-	else if (_type == ValueType::I64)
-		return Opcode::I64Const;
-	else
-		yulAssert(false, "Values of this type cannot be used with const opcode");
-}
-
-static map<string, uint8_t> const builtins = {
-	{"unreachable", 0x00},
-	{"nop", 0x01},
-	{"i32.drop", 0x1a},
-	{"i64.drop", 0x1a},
-	{"i32.select", 0x1b},
-	{"i64.select", 0x1b},
-	{"i32.load", 0x28},
-	{"i64.load", 0x29},
-	{"i32.load8_s", 0x2c},
-	{"i32.load8_u", 0x2d},
-	{"i32.load16_s", 0x2e},
-	{"i32.load16_u", 0x2f},
-	{"i64.load8_s", 0x30},
-	{"i64.load8_u", 0x31},
-	{"i64.load16_s", 0x32},
-	{"i64.load16_u", 0x33},
-	{"i64.load32_s", 0x34},
-	{"i64.load32_u", 0x35},
-	{"i32.store", 0x36},
-	{"i64.store", 0x37},
-	{"i32.store8", 0x3a},
-	{"i32.store16", 0x3b},
-	{"i64.store8", 0x3c},
-	{"i64.store16", 0x3d},
-	{"i64.store32", 0x3e},
-	{"memory.size", 0x3f},
-	{"memory.grow", 0x40},
-	{"i32.eqz", 0x45},
-	{"i32.eq", 0x46},
-	{"i32.ne", 0x47},
-	{"i32.lt_s", 0x48},
-	{"i32.lt_u", 0x49},
-	{"i32.gt_s", 0x4a},
-	{"i32.gt_u", 0x4b},
-	{"i32.le_s", 0x4c},
-	{"i32.le_u", 0x4d},
-	{"i32.ge_s", 0x4e},
-	{"i32.ge_u", 0x4f},
-	{"i64.eqz", 0x50},
-	{"i64.eq", 0x51},
-	{"i64.ne", 0x52},
-	{"i64.lt_s", 0x53},
-	{"i64.lt_u", 0x54},
-	{"i64.gt_s", 0x55},
-	{"i64.gt_u", 0x56},
-	{"i64.le_s", 0x57},
-	{"i64.le_u", 0x58},
-	{"i64.ge_s", 0x59},
-	{"i64.ge_u", 0x5a},
-	{"i32.clz", 0x67},
-	{"i32.ctz", 0x68},
-	{"i32.popcnt", 0x69},
-	{"i32.add", 0x6a},
-	{"i32.sub", 0x6b},
-	{"i32.mul", 0x6c},
-	{"i32.div_s", 0x6d},
-	{"i32.div_u", 0x6e},
-	{"i32.rem_s", 0x6f},
-	{"i32.rem_u", 0x70},
-	{"i32.and", 0x71},
-	{"i32.or", 0x72},
-	{"i32.xor", 0x73},
-	{"i32.shl", 0x74},
-	{"i32.shr_s", 0x75},
-	{"i32.shr_u", 0x76},
-	{"i32.rotl", 0x77},
-	{"i32.rotr", 0x78},
-	{"i64.clz", 0x79},
-	{"i64.ctz", 0x7a},
-	{"i64.popcnt", 0x7b},
-	{"i64.add", 0x7c},
-	{"i64.sub", 0x7d},
-	{"i64.mul", 0x7e},
-	{"i64.div_s", 0x7f},
-	{"i64.div_u", 0x80},
-	{"i64.rem_s", 0x81},
-	{"i64.rem_u", 0x82},
-	{"i64.and", 0x83},
-	{"i64.or", 0x84},
-	{"i64.xor", 0x85},
-	{"i64.shl", 0x86},
-	{"i64.shr_s", 0x87},
-	{"i64.shr_u", 0x88},
-	{"i64.rotl", 0x89},
-	{"i64.rotr", 0x8a},
-	{"i32.wrap_i64", 0xa7},
-	{"i64.extend_i32_s", 0xac},
-	{"i64.extend_i32_u", 0xad},
-};
-
-bytes prefixSize(bytes _data)
-{
-	size_t size = _data.size();
-	return lebEncode(size) + std::move(_data);
-}
-
-bytes makeSection(Section _section, bytes _data)
-{
-	return toBytes(_section) + prefixSize(std::move(_data));
-}
-
-/// This is a kind of run-length-encoding of local types.
-vector<pair<size_t, ValueType>> groupLocalVariables(vector<VariableDeclaration> _localVariables)
-{
-	vector<pair<size_t, ValueType>> localEntries;
-
-	size_t entrySize = 0;
-	ValueType entryType = ValueType::I32; // Any type would work here
-	for (VariableDeclaration const& localVariable: _localVariables)
-	{
-		ValueType variableType = toValueType(localVariable.type);
-
-		if (variableType != entryType)
-		{
-			if (entrySize > 0)
-				localEntries.emplace_back(entrySize, entryType);
-
-			entryType = variableType;
-			entrySize = 0;
-		}
-
-		++entrySize;
-	}
-	if (entrySize > 0)
-		localEntries.emplace_back(entrySize, entryType);
-
-	return localEntries;
-}
-
-}
-
-bytes BinaryTransform::run(Module const& _module)
-{
-	map<Type, vector<string>> const types = typeToFunctionMap(_module.imports, _module.functions);
-
-	map<string, size_t> const globalIDs = enumerateGlobals(_module);
-	map<string, size_t> const functionIDs = enumerateFunctions(_module);
-	map<string, size_t> const functionTypes = enumerateFunctionTypes(types);
-
-	yulAssert(globalIDs.size() == _module.globals.size(), "");
-	yulAssert(functionIDs.size() == _module.imports.size() + _module.functions.size(), "");
-	yulAssert(functionTypes.size() == functionIDs.size(), "");
-	yulAssert(functionTypes.size() >= types.size(), "");
-
-	bytes ret{0, 'a', 's', 'm'};
-	// version
-	ret += bytes{1, 0, 0, 0};
-	ret += typeSection(types);
-	ret += importSection(_module.imports, functionTypes);
-	ret += functionSection(_module.functions, functionTypes);
-	ret += memorySection();
-	ret += globalSection(_module.globals);
-	ret += exportSection(functionIDs);
-
-	map<string, pair<size_t, size_t>> subModulePosAndSize;
-	for (auto const& [name, module]: _module.subModules)
-	{
-		// TODO should we prefix and / or shorten the name?
-		bytes data = BinaryTransform::run(module);
-		size_t const length = data.size();
-		ret += customSection(name, std::move(data));
-		// Skip all the previous sections and the size field of this current custom section.
-		size_t const offset = ret.size() - length;
-		subModulePosAndSize[name] = {offset, length};
-	}
-	for (auto const& [name, data]: _module.customSections)
-	{
-		size_t const length = data.size();
-		ret += customSection(name, data);
-		// Skip all the previous sections and the size field of this current custom section.
-		size_t const offset = ret.size() - length;
-		subModulePosAndSize[name] = {offset, length};
-	}
-
-	BinaryTransform bt(
-		std::move(globalIDs),
-		std::move(functionIDs),
-		std::move(functionTypes),
-		std::move(subModulePosAndSize)
-	);
-
-	ret += bt.codeSection(_module.functions);
-	return ret;
-}
-
-bytes BinaryTransform::operator()(Literal const& _literal)
-{
-	return std::visit(GenericVisitor{
-		[&](uint32_t _value) -> bytes { return toBytes(Opcode::I32Const) + lebEncodeSigned(static_cast<int32_t>(_value)); },
-		[&](uint64_t _value) -> bytes { return toBytes(Opcode::I64Const) + lebEncodeSigned(static_cast<int64_t>(_value)); },
-	}, _literal.value);
-}
-
-bytes BinaryTransform::operator()(StringLiteral const&)
-{
-	// StringLiteral is a special AST element used for certain builtins.
-	// It is not mapped to actual WebAssembly, and should be processed in visit(BuiltinCall).
-	yulAssert(false, "");
-}
-
-bytes BinaryTransform::operator()(LocalVariable const& _variable)
-{
-	return toBytes(Opcode::LocalGet) + lebEncode(m_locals.at(_variable.name));
-}
-
-bytes BinaryTransform::operator()(GlobalVariable const& _variable)
-{
-	return toBytes(Opcode::GlobalGet) + lebEncode(m_globalIDs.at(_variable.name));
-}
-
-bytes BinaryTransform::operator()(BuiltinCall const& _call)
-{
-	// We need to avoid visiting the arguments of `dataoffset` and `datasize` because
-	// they are references to object names that should not end up in the code.
-	if (_call.functionName == "dataoffset")
-	{
-		string name = get<StringLiteral>(_call.arguments.at(0)).value;
-		// TODO: support the case where name refers to the current object
-		yulAssert(m_subModulePosAndSize.count(name), "");
-		return toBytes(Opcode::I64Const) + lebEncodeSigned(static_cast<int64_t>(m_subModulePosAndSize.at(name).first));
-	}
-	else if (_call.functionName == "datasize")
-	{
-		string name = get<StringLiteral>(_call.arguments.at(0)).value;
-		// TODO: support the case where name refers to the current object
-		yulAssert(m_subModulePosAndSize.count(name), "");
-		return toBytes(Opcode::I64Const) + lebEncodeSigned(static_cast<int64_t>(m_subModulePosAndSize.at(name).second));
-	}
-
-	yulAssert(builtins.count(_call.functionName), "Builtin " + _call.functionName + " not found");
-	// NOTE: the dialect ensures we have the right amount of arguments
-	bytes args = visit(_call.arguments);
-	bytes ret = std::move(args) + toBytes(builtins.at(_call.functionName));
-	if (
-		_call.functionName.find(".load") != string::npos ||
-		_call.functionName.find(".store") != string::npos
-	)
-		// Alignment hint and offset. Interpreters ignore the alignment. JITs/AOTs can take it
-		// into account to generate more efficient code but if the hint is invalid it could
-		// actually be more expensive. It's best to hint at 1-byte alignment if we don't plan
-		// to control the memory layout accordingly.
-		ret += bytes{{0, 0}}; // 2^0 == 1-byte alignment
-
-	return ret;
-}
-
-bytes BinaryTransform::operator()(FunctionCall const& _call)
-{
-	return visit(_call.arguments) + toBytes(Opcode::Call) + lebEncode(m_functionIDs.at(_call.functionName));
-}
-
-bytes BinaryTransform::operator()(LocalAssignment const& _assignment)
-{
-	return
-		std::visit(*this, *_assignment.value) +
-		toBytes(Opcode::LocalSet) +
-		lebEncode(m_locals.at(_assignment.variableName));
-}
-
-bytes BinaryTransform::operator()(GlobalAssignment const& _assignment)
-{
-	return
-		std::visit(*this, *_assignment.value) +
-		toBytes(Opcode::GlobalSet) +
-		lebEncode(m_globalIDs.at(_assignment.variableName));
-}
-
-bytes BinaryTransform::operator()(If const& _if)
-{
-	bytes result =
-		std::visit(*this, *_if.condition) +
-		toBytes(Opcode::If) +
-		toBytes(ValueType::Void);
-
-	m_labels.emplace_back();
-
-	result += visit(_if.statements);
-	if (_if.elseStatements)
-		result += toBytes(Opcode::Else) + visit(*_if.elseStatements);
-
-	m_labels.pop_back();
-
-	result += toBytes(Opcode::End);
-	return result;
-}
-
-bytes BinaryTransform::operator()(Loop const& _loop)
-{
-	bytes result = toBytes(Opcode::Loop) + toBytes(ValueType::Void);
-
-	m_labels.emplace_back(_loop.labelName);
-	result += visit(_loop.statements);
-	m_labels.pop_back();
-
-	result += toBytes(Opcode::End);
-	return result;
-}
-
-bytes BinaryTransform::operator()(Branch const& _branch)
-{
-	return toBytes(Opcode::Br) + encodeLabelIdx(_branch.label.name);
-}
-
-bytes BinaryTransform::operator()(BranchIf const& _branchIf)
-{
-	bytes result = std::visit(*this, *_branchIf.condition);
-	result += toBytes(Opcode::BrIf) + encodeLabelIdx(_branchIf.label.name);
-	return result;
-}
-
-bytes BinaryTransform::operator()(Return const&)
-{
-	// Note that this does not work if the function returns a value.
-	return toBytes(Opcode::Return);
-}
-
-bytes BinaryTransform::operator()(Block const& _block)
-{
-	m_labels.emplace_back(_block.labelName);
-	bytes result =
-		toBytes(Opcode::Block) +
-		toBytes(ValueType::Void) +
-		visit(_block.statements) +
-		toBytes(Opcode::End);
-	m_labels.pop_back();
-	return result;
-}
-
-bytes BinaryTransform::operator()(FunctionDefinition const& _function)
-{
-	bytes ret;
-
-	vector<pair<size_t, ValueType>> localEntries = groupLocalVariables(_function.locals);
-	ret += lebEncode(localEntries.size());
-	for (pair<size_t, ValueType> const& entry: localEntries)
-	{
-		ret += lebEncode(entry.first);
-		ret += toBytes(entry.second);
-	}
-
-	m_locals.clear();
-	size_t varIdx = 0;
-	for (size_t i = 0; i < _function.parameters.size(); ++i)
-		m_locals[_function.parameters[i].name] = varIdx++;
-	for (size_t i = 0; i < _function.locals.size(); ++i)
-		m_locals[_function.locals[i].variableName] = varIdx++;
-
-	yulAssert(m_labels.empty(), "Stray labels.");
-
-	ret += visit(_function.body);
-	ret += toBytes(Opcode::End);
-
-	yulAssert(m_labels.empty(), "Stray labels.");
-
-	return prefixSize(std::move(ret));
-}
-
-BinaryTransform::Type BinaryTransform::typeOf(FunctionImport const& _import)
-{
-	return {
-		encodeTypes(_import.paramTypes),
-		encodeTypes(_import.returnType ? vector<wasm::Type>(1, *_import.returnType) : vector<wasm::Type>())
-	};
-}
-
-BinaryTransform::Type BinaryTransform::typeOf(FunctionDefinition const& _funDef)
-{
-	return {
-		encodeTypes(_funDef.parameters),
-		encodeTypes(_funDef.returnType ? vector<wasm::Type>(1, *_funDef.returnType) : vector<wasm::Type>())
-	};
-}
-
-uint8_t BinaryTransform::encodeType(wasm::Type _type)
-{
-	return uint8_t(toValueType(_type));
-}
-
-vector<uint8_t> BinaryTransform::encodeTypes(vector<wasm::Type> const& _types)
-{
-	vector<uint8_t> result;
-	for (wasm::Type t: _types)
-		result.emplace_back(encodeType(t));
-	return result;
-}
-
-vector<uint8_t> BinaryTransform::encodeTypes(wasm::TypedNameList const& _typedNameList)
-{
-	vector<uint8_t> result;
-	for (TypedName const& typedName: _typedNameList)
-		result.emplace_back(encodeType(typedName.type));
-	return result;
-}
-
-map<BinaryTransform::Type, vector<string>> BinaryTransform::typeToFunctionMap(
-	vector<wasm::FunctionImport> const& _imports,
-	vector<wasm::FunctionDefinition> const& _functions
-)
-{
-	map<Type, vector<string>> types;
-	for (auto const& import: _imports)
-		types[typeOf(import)].emplace_back(import.internalName);
-	for (auto const& fun: _functions)
-		types[typeOf(fun)].emplace_back(fun.name);
-
-	return types;
-}
-
-map<string, size_t> BinaryTransform::enumerateGlobals(Module const& _module)
-{
-	map<string, size_t> globals;
-	for (size_t i = 0; i < _module.globals.size(); ++i)
-		globals[_module.globals[i].variableName] = i;
-
-	return globals;
-}
-
-map<string, size_t> BinaryTransform::enumerateFunctions(Module const& _module)
-{
-	map<string, size_t> functions;
-	size_t funID = 0;
-	for (FunctionImport const& fun: _module.imports)
-		functions[fun.internalName] = funID++;
-	for (FunctionDefinition const& fun: _module.functions)
-		functions[fun.name] = funID++;
-
-	return functions;
-}
-
-map<string, size_t> BinaryTransform::enumerateFunctionTypes(map<Type, vector<string>> const& _typeToFunctionMap)
-{
-	map<string, size_t> functionTypes;
-	size_t typeID = 0;
-	for (vector<string> const& funNames: _typeToFunctionMap | ranges::views::values)
-	{
-		for (string const& name: funNames)
-			functionTypes[name] = typeID;
-		++typeID;
-	}
-
-	return functionTypes;
-}
-
-bytes BinaryTransform::typeSection(map<BinaryTransform::Type, vector<string>> const& _typeToFunctionMap)
-{
-	bytes result;
-	size_t index = 0;
-	for (Type const& type: _typeToFunctionMap | ranges::views::keys)
-	{
-		result += toBytes(ValueType::Function);
-		result += lebEncode(type.first.size()) + type.first;
-		result += lebEncode(type.second.size()) + type.second;
-
-		index++;
-	}
-
-	return makeSection(Section::TYPE, lebEncode(index) + std::move(result));
-}
-
-bytes BinaryTransform::importSection(
-	vector<FunctionImport> const& _imports,
-	map<string, size_t> const& _functionTypes
-)
-{
-	bytes result = lebEncode(_imports.size());
-	for (FunctionImport const& import: _imports)
-	{
-		uint8_t importKind = 0; // function
-		result +=
-			encodeName(import.module) +
-			encodeName(import.externalName) +
-			toBytes(importKind) +
-			lebEncode(_functionTypes.at(import.internalName));
-	}
-	return makeSection(Section::IMPORT, std::move(result));
-}
-
-bytes BinaryTransform::functionSection(
-	vector<FunctionDefinition> const& _functions,
-	map<string, size_t> const& _functionTypes
-)
-{
-	bytes result = lebEncode(_functions.size());
-	for (auto const& fun: _functions)
-		result += lebEncode(_functionTypes.at(fun.name));
-	return makeSection(Section::FUNCTION, std::move(result));
-}
-
-bytes BinaryTransform::memorySection()
-{
-	bytes result = lebEncode(1);
-	result.push_back(static_cast<uint8_t>(LimitsKind::Min));
-	result.push_back(1); // initial length
-	return makeSection(Section::MEMORY, std::move(result));
-}
-
-bytes BinaryTransform::globalSection(vector<wasm::GlobalVariableDeclaration> const& _globals)
-{
-	bytes result = lebEncode(_globals.size());
-	for (wasm::GlobalVariableDeclaration const& global: _globals)
-	{
-		ValueType globalType = toValueType(global.type);
-		result +=
-			toBytes(globalType) +
-			lebEncode(static_cast<uint8_t>(Mutability::Var)) +
-			toBytes(constOpcodeFor(globalType)) +
-			lebEncodeSigned(0) +
-			toBytes(Opcode::End);
-	}
-
-	return makeSection(Section::GLOBAL, std::move(result));
-}
-
-bytes BinaryTransform::exportSection(map<string, size_t> const& _functionIDs)
-{
-	bool hasMain = _functionIDs.count("main");
-	bytes result = lebEncode(hasMain ? 2 : 1);
-	result += encodeName("memory") + toBytes(Export::Memory) + lebEncode(0);
-	if (hasMain)
-		result += encodeName("main") + toBytes(Export::Function) + lebEncode(_functionIDs.at("main"));
-	return makeSection(Section::EXPORT, std::move(result));
-}
-
-bytes BinaryTransform::customSection(string const& _name, bytes _data)
-{
-	bytes result = encodeName(_name) + std::move(_data);
-	return makeSection(Section::CUSTOM, std::move(result));
-}
-
-bytes BinaryTransform::codeSection(vector<wasm::FunctionDefinition> const& _functions)
-{
-	bytes result = lebEncode(_functions.size());
-	for (FunctionDefinition const& fun: _functions)
-		result += (*this)(fun);
-	return makeSection(Section::CODE, std::move(result));
-}
-
-bytes BinaryTransform::visit(vector<Expression> const& _expressions)
-{
-	bytes result;
-	for (auto const& expr: _expressions)
-		result += std::visit(*this, expr);
-	return result;
-}
-
-bytes BinaryTransform::visitReversed(vector<Expression> const& _expressions)
-{
-	bytes result;
-	for (auto const& expr: _expressions | ranges::views::reverse)
-		result += std::visit(*this, expr);
-	return result;
-}
-
-bytes BinaryTransform::encodeLabelIdx(string const& _label) const
-{
-	yulAssert(!_label.empty(), "Empty label.");
-	size_t depth = 0;
-	for (string const& label: m_labels | ranges::views::reverse)
-		if (label == _label)
-			return lebEncode(depth);
-		else
-			++depth;
-	yulAssert(false, "Label not found.");
-}
-
-bytes BinaryTransform::encodeName(string const& _name)
-{
-	// UTF-8 is allowed here by the Wasm spec, but since all names here should stem from
-	// Solidity or Yul identifiers or similar, non-ascii characters ending up here
-	// is a very bad sign.
-	for (char c: _name)
-		yulAssert(uint8_t(c) <= 0x7f, "Non-ascii character found.");
-	return lebEncode(_name.size()) + asBytes(_name);
-}
diff --git a/libyul/backends/wasm/BinaryTransform.h b/libyul/backends/wasm/BinaryTransform.h
deleted file mode 100644
index d164c11bf6..0000000000
--- a/libyul/backends/wasm/BinaryTransform.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
-	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
-/**
- * Component that transforms internal Wasm representation to binary.
- */
-
-#pragma once
-
-#include <libyul/backends/wasm/WasmAST.h>
-
-#include <libsolutil/Common.h>
-
-#include <vector>
-#include <stack>
-
-namespace solidity::yul::wasm
-{
-
-/**
- * Web assembly to binary transform.
- */
-class BinaryTransform
-{
-public:
-	static bytes run(Module const& _module);
-
-	bytes operator()(wasm::Literal const& _literal);
-	bytes operator()(wasm::StringLiteral const& _literal);
-	bytes operator()(wasm::LocalVariable const& _identifier);
-	bytes operator()(wasm::GlobalVariable const& _identifier);
-	bytes operator()(wasm::BuiltinCall const& _builinCall);
-	bytes operator()(wasm::FunctionCall const& _functionCall);
-	bytes operator()(wasm::LocalAssignment const& _assignment);
-	bytes operator()(wasm::GlobalAssignment const& _assignment);
-	bytes operator()(wasm::If const& _if);
-	bytes operator()(wasm::Loop const& _loop);
-	bytes operator()(wasm::Branch const& _branch);
-	bytes operator()(wasm::BranchIf const& _branchIf);
-	bytes operator()(wasm::Return const& _return);
-	bytes operator()(wasm::Block const& _block);
-	bytes operator()(wasm::FunctionDefinition const& _function);
-
-private:
-	BinaryTransform(
-		std::map<std::string, size_t> _globalIDs,
-		std::map<std::string, size_t> _functionIDs,
-		std::map<std::string, size_t> _functionTypes,
-		std::map<std::string, std::pair<size_t, size_t>> _subModulePosAndSize
-	):
-		m_globalIDs(std::move(_globalIDs)),
-		m_functionIDs(std::move(_functionIDs)),
-		m_functionTypes(std::move(_functionTypes)),
-		m_subModulePosAndSize(std::move(_subModulePosAndSize))
-	{}
-
-	using Type = std::pair<std::vector<std::uint8_t>, std::vector<std::uint8_t>>;
-	static Type typeOf(wasm::FunctionImport const& _import);
-	static Type typeOf(wasm::FunctionDefinition const& _funDef);
-
-	static uint8_t encodeType(wasm::Type _type);
-	static std::vector<uint8_t> encodeTypes(std::vector<wasm::Type> const& _types);
-	static std::vector<uint8_t> encodeTypes(wasm::TypedNameList const& _typedNameList);
-
-	static std::map<Type, std::vector<std::string>> typeToFunctionMap(
-		std::vector<wasm::FunctionImport> const& _imports,
-		std::vector<wasm::FunctionDefinition> const& _functions
-	);
-
-	static std::map<std::string, size_t> enumerateGlobals(Module const& _module);
-	static std::map<std::string, size_t> enumerateFunctions(Module const& _module);
-	static std::map<std::string, size_t> enumerateFunctionTypes(
-		std::map<Type, std::vector<std::string>> const& _typeToFunctionMap
-	);
-
-	static bytes typeSection(std::map<Type, std::vector<std::string>> const& _typeToFunctionMap);
-	static bytes importSection(
-		std::vector<wasm::FunctionImport> const& _imports,
-		std::map<std::string, size_t> const& _functionTypes
-	);
-	static bytes functionSection(
-		std::vector<wasm::FunctionDefinition> const& _functions,
-		std::map<std::string, size_t> const& _functionTypes
-	);
-	static bytes memorySection();
-	static bytes globalSection(std::vector<wasm::GlobalVariableDeclaration> const& _globals);
-	static bytes exportSection(std::map<std::string, size_t> const& _functionIDs);
-	static bytes customSection(std::string const& _name, bytes _data);
-	bytes codeSection(std::vector<wasm::FunctionDefinition> const& _functions);
-
-	bytes visit(std::vector<wasm::Expression> const& _expressions);
-	bytes visitReversed(std::vector<wasm::Expression> const& _expressions);
-
-	bytes encodeLabelIdx(std::string const& _label) const;
-
-	static bytes encodeName(std::string const& _name);
-
-	std::map<std::string, size_t> const m_globalIDs;
-	std::map<std::string, size_t> const m_functionIDs;
-	std::map<std::string, size_t> const m_functionTypes;
-	/// The map of submodules, where the pair refers to the [offset, length]. The offset is
-	/// an absolute offset within the resulting assembled bytecode.
-	std::map<std::string, std::pair<size_t, size_t>> const m_subModulePosAndSize;
-
-	std::map<std::string, size_t> m_locals;
-	std::vector<std::string> m_labels;
-};
-
-}
-
diff --git a/libyul/backends/wasm/EVMToEwasmTranslator.cpp b/libyul/backends/wasm/EVMToEwasmTranslator.cpp
deleted file mode 100644
index d36b1cda39..0000000000
--- a/libyul/backends/wasm/EVMToEwasmTranslator.cpp
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-	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
-/**
- * Translates Yul code from EVM dialect to Ewasm dialect.
- */
-
-#include <libyul/backends/wasm/EVMToEwasmTranslator.h>
-
-#include <libyul/backends/wasm/WordSizeTransform.h>
-#include <libyul/backends/wasm/WasmDialect.h>
-#include <libyul/optimiser/ExpressionSplitter.h>
-#include <libyul/optimiser/FunctionGrouper.h>
-#include <libyul/optimiser/MainFunction.h>
-#include <libyul/optimiser/FunctionHoister.h>
-#include <libyul/optimiser/Disambiguator.h>
-#include <libyul/optimiser/NameDisplacer.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/ForLoopConditionIntoBody.h>
-
-#include <libyul/AST.h>
-#include <libyul/AsmParser.h>
-#include <libyul/AsmAnalysis.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/Object.h>
-
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/Scanner.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-#include <liblangutil/CharStreamProvider.h>
-
-#include <libsolidity/interface/OptimiserSettings.h>
-
-// The following headers are generated from the
-// yul files placed in libyul/backends/wasm/polyfill.
-
-#include <ewasmPolyfills/Arithmetic.h>
-#include <ewasmPolyfills/Bitwise.h>
-#include <ewasmPolyfills/Comparison.h>
-#include <ewasmPolyfills/Conversion.h>
-#include <ewasmPolyfills/Interface.h>
-#include <ewasmPolyfills/Keccak.h>
-#include <ewasmPolyfills/Logical.h>
-#include <ewasmPolyfills/Memory.h>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::langutil;
-
-Object EVMToEwasmTranslator::run(Object const& _object)
-{
-	if (!m_polyfill)
-		parsePolyfill();
-
-	Block ast = std::get<Block>(Disambiguator(m_dialect, *_object.analysisInfo)(*_object.code));
-	set<YulString> reservedIdentifiers;
-	NameDispenser nameDispenser{m_dialect, ast, reservedIdentifiers};
-	// expectedExecutionsPerDeployment is currently unused.
-	OptimiserStepContext context{
-		m_dialect,
-		nameDispenser,
-		reservedIdentifiers,
-		frontend::OptimiserSettings::standard().expectedExecutionsPerDeployment
-	};
-
-	FunctionHoister::run(context, ast);
-	FunctionGrouper::run(context, ast);
-	MainFunction::run(context, ast);
-	ForLoopConditionIntoBody::run(context, ast);
-	ExpressionSplitter::run(context, ast);
-	WordSizeTransform::run(m_dialect, WasmDialect::instance(), ast, nameDispenser);
-
-	NameDisplacer{nameDispenser, m_polyfillFunctions}(ast);
-	for (auto const& st: m_polyfill->statements)
-		ast.statements.emplace_back(ASTCopier{}.translate(st));
-
-	Object ret;
-	ret.name = _object.name;
-	ret.code = make_shared<Block>(std::move(ast));
-	ret.debugData = _object.debugData;
-	ret.analysisInfo = make_shared<AsmAnalysisInfo>();
-
-	ErrorList errors;
-	ErrorReporter errorReporter(errors);
-	AsmAnalyzer analyzer(*ret.analysisInfo, errorReporter, WasmDialect::instance(), {}, _object.qualifiedDataNames());
-	if (!analyzer.analyze(*ret.code))
-	{
-		string message = "Invalid code generated after EVM to wasm translation.\n";
-		message += "Note that the source locations in the errors below will reference the original, not the translated code.\n";
-		message += "Translated code:\n";
-		message += "----------------------------------\n";
-		message += ret.toString(&WasmDialect::instance());
-		message += "----------------------------------\n";
-		for (auto const& err: errors)
-			message += langutil::SourceReferenceFormatter::formatErrorInformation(*err, m_charStreamProvider);
-		yulAssert(false, message);
-	}
-
-	for (auto const& subObjectNode: _object.subObjects)
-		if (Object const* subObject = dynamic_cast<Object const*>(subObjectNode.get()))
-			ret.subObjects.push_back(make_shared<Object>(run(*subObject)));
-		else
-			ret.subObjects.push_back(make_shared<Data>(dynamic_cast<Data const&>(*subObjectNode)));
-	ret.subIndexByName = _object.subIndexByName;
-
-	return ret;
-}
-
-void EVMToEwasmTranslator::parsePolyfill()
-{
-	ErrorList errors;
-	ErrorReporter errorReporter(errors);
-	CharStream charStream(
-		"{" +
-			string(solidity::yul::wasm::polyfill::Arithmetic) +
-			string(solidity::yul::wasm::polyfill::Bitwise) +
-			string(solidity::yul::wasm::polyfill::Comparison) +
-			string(solidity::yul::wasm::polyfill::Conversion) +
-			string(solidity::yul::wasm::polyfill::Interface) +
-			string(solidity::yul::wasm::polyfill::Keccak) +
-			string(solidity::yul::wasm::polyfill::Logical) +
-			string(solidity::yul::wasm::polyfill::Memory) +
-		"}", "");
-
-	// Passing an empty SourceLocation() here is a workaround to prevent a crash
-	// when compiling from yul->ewasm. We're stripping nativeLocation and
-	// originLocation from the AST (but we only really need to strip nativeLocation)
-	m_polyfill = Parser(errorReporter, WasmDialect::instance(), langutil::SourceLocation()).parse(charStream);
-	if (!errors.empty())
-	{
-		string message;
-		for (auto const& err: errors)
-			message += langutil::SourceReferenceFormatter::formatErrorInformation(
-				*err,
-				SingletonCharStreamProvider(charStream)
-			);
-		yulAssert(false, message);
-	}
-
-	m_polyfillFunctions.clear();
-	for (auto const& statement: m_polyfill->statements)
-		m_polyfillFunctions.insert(std::get<FunctionDefinition>(statement).name);
-}
diff --git a/libyul/backends/wasm/EVMToEwasmTranslator.h b/libyul/backends/wasm/EVMToEwasmTranslator.h
deleted file mode 100644
index 7f95f8d138..0000000000
--- a/libyul/backends/wasm/EVMToEwasmTranslator.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-	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
-/**
- * Translates Yul code from EVM dialect to Ewasm dialect.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/Dialect.h>
-
-namespace solidity::langutil
-{
-class CharStreamProvider;
-}
-namespace solidity::yul
-{
-struct Object;
-
-class EVMToEwasmTranslator: public ASTModifier
-{
-public:
-	EVMToEwasmTranslator(Dialect const& _evmDialect, langutil::CharStreamProvider const& _charStreamProvider):
-		m_dialect(_evmDialect),
-		m_charStreamProvider(_charStreamProvider)
-	{}
-	Object run(Object const& _object);
-
-private:
-	void parsePolyfill();
-
-	Dialect const& m_dialect;
-	langutil::CharStreamProvider const& m_charStreamProvider;
-
-	std::shared_ptr<Block> m_polyfill;
-	std::set<YulString> m_polyfillFunctions;
-};
-
-}
diff --git a/libyul/backends/wasm/TextTransform.cpp b/libyul/backends/wasm/TextTransform.cpp
deleted file mode 100644
index 62596ba6e8..0000000000
--- a/libyul/backends/wasm/TextTransform.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-	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
-/**
- * Component that transforms internal Wasm representation to text.
- */
-
-#include <libyul/backends/wasm/BinaryTransform.h>
-#include <libyul/backends/wasm/TextTransform.h>
-
-#include <libyul/Exceptions.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/Numeric.h>
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/StringUtils.h>
-#include <libsolutil/Visitor.h>
-
-#include <boost/algorithm/string/join.hpp>
-#include <boost/algorithm/string/replace.hpp>
-
-#include <range/v3/view/transform.hpp>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::yul::wasm;
-using namespace solidity::util;
-
-string TextTransform::run(wasm::Module const& _module)
-{
-	string ret = "(module\n";
-	for (auto const& [name, module]: _module.subModules)
-		ret +=
-			"    ;; custom section for sub-module\n"
-			"    ;; The Keccak-256 hash of the text representation of \"" +
-			name +
-			"\": " +
-			toHex(keccak256(run(module))) +
-			"\n"
-			"    ;; (@custom \"" +
-			name +
-			"\" \"" +
-			util::toHex(BinaryTransform::run(module)) +
-			"\")\n";
-	for (auto const& [name, data]: _module.customSections)
-		ret +=
-			"    ;; custom section for data\n"
-			"    ;; (@custom \"" +
-			name +
-			"\" \"" +
-			util::toHex(data) +
-			"\")\n";
-	for (wasm::FunctionImport const& imp: _module.imports)
-	{
-		ret += "    (import \"" + imp.module + "\" \"" + imp.externalName + "\" (func $" + imp.internalName;
-		if (!imp.paramTypes.empty())
-			ret += " (param" + joinHumanReadablePrefixed(imp.paramTypes | ranges::views::transform(encodeType), " ", " ") + ")";
-		if (imp.returnType)
-			ret += " (result " + encodeType(*imp.returnType) + ")";
-		ret += "))\n";
-	}
-
-	// allocate one 64k page of memory and make it available to the Ethereum client
-	ret += "    (memory $memory (export \"memory\") 1)\n";
-	for (auto const& f: _module.functions)
-		if (f.name == "main")
-		{
-			// export the main function
-			ret += "    (export \"main\" (func $main))\n";
-			break;
-		}
-
-	for (auto const& g: _module.globals)
-		ret += "    (global $" + g.variableName + " (mut " + encodeType(g.type) + ") (" + encodeType(g.type) + ".const 0))\n";
-	ret += "\n";
-	for (auto const& f: _module.functions)
-		ret += transform(f) + "\n";
-	return std::move(ret) + ")\n";
-}
-
-string TextTransform::operator()(wasm::Literal const& _literal)
-{
-	return std::visit(GenericVisitor{
-		[&](uint32_t _value) -> string { return "(i32.const " + to_string(_value) + ")"; },
-		[&](uint64_t _value) -> string { return "(i64.const " + to_string(_value) + ")"; },
-	}, _literal.value);
-}
-
-string TextTransform::operator()(wasm::StringLiteral const& _literal)
-{
-	// StringLiteral is a special AST element used for certain builtins.
-	// The output of this will not be valid WebAssembly.
-	string quoted = boost::replace_all_copy(_literal.value, "\\", "\\\\");
-	boost::replace_all(quoted, "\"", "\\\"");
-	return "\"" + quoted + "\"";
-}
-
-string TextTransform::operator()(wasm::LocalVariable const& _identifier)
-{
-	return "(local.get $" + _identifier.name + ")";
-}
-
-string TextTransform::operator()(wasm::GlobalVariable const& _identifier)
-{
-	return "(global.get $" + _identifier.name + ")";
-}
-
-string TextTransform::operator()(wasm::BuiltinCall const& _builtinCall)
-{
-	string args = joinTransformed(_builtinCall.arguments);
-	string funcName = _builtinCall.functionName;
-	// These are prefixed in the dialect, but are actually overloaded instructions in WebAssembly.
-	if (funcName == "i32.drop" || funcName == "i64.drop")
-		funcName = "drop";
-	else if (funcName == "i32.select" || funcName == "i64.select")
-		funcName = "select";
-	return "(" + funcName + (args.empty() ? "" : " " + args) + ")";
-}
-
-string TextTransform::operator()(wasm::FunctionCall const& _functionCall)
-{
-	string args = joinTransformed(_functionCall.arguments);
-	return "(call $" + _functionCall.functionName + (args.empty() ? "" : " " + args) + ")";
-}
-
-string TextTransform::operator()(wasm::LocalAssignment const& _assignment)
-{
-	return "(local.set $" + _assignment.variableName + " " + visit(*_assignment.value) + ")\n";
-}
-
-string TextTransform::operator()(wasm::GlobalAssignment const& _assignment)
-{
-	return "(global.set $" + _assignment.variableName + " " + visit(*_assignment.value) + ")\n";
-}
-
-string TextTransform::operator()(wasm::If const& _if)
-{
-	string text = "(if " + visit(*_if.condition) + " (then\n" + indented(joinTransformed(_if.statements, '\n')) + ")";
-	if (_if.elseStatements)
-		text += "(else\n" + indented(joinTransformed(*_if.elseStatements, '\n')) + ")";
-	return std::move(text) + ")\n";
-}
-
-string TextTransform::operator()(wasm::Loop const& _loop)
-{
-	string label = _loop.labelName.empty() ? "" : " $" + _loop.labelName;
-	return "(loop" + std::move(label) + "\n" + indented(joinTransformed(_loop.statements, '\n')) + ")\n";
-}
-
-string TextTransform::operator()(wasm::Branch const& _branch)
-{
-	return "(br $" + _branch.label.name + ")\n";
-}
-
-string TextTransform::operator()(wasm::BranchIf const& _branchIf)
-{
-	return "(br_if $" + _branchIf.label.name + " " + visit(*_branchIf.condition) + ")\n";
-}
-
-string TextTransform::operator()(wasm::Return const&)
-{
-	return "(return)\n";
-}
-
-string TextTransform::operator()(wasm::Block const& _block)
-{
-	string label = _block.labelName.empty() ? "" : " $" + _block.labelName;
-	return "(block" + std::move(label) + "\n" + indented(joinTransformed(_block.statements, '\n')) + "\n)\n";
-}
-
-string TextTransform::indented(string const& _in)
-{
-	string replacement;
-
-	if (!_in.empty())
-	{
-		replacement.reserve(_in.size() + 4);
-		replacement += "    ";
-		for (auto it = _in.begin(); it != _in.end(); ++it)
-			if (*it == '\n' && it + 1 != _in.end() && *(it + 1) != '\n')
-				replacement += "\n    ";
-			else
-				replacement += *it;
-	}
-	return replacement;
-}
-
-string TextTransform::transform(wasm::FunctionDefinition const& _function)
-{
-	string ret = "(func $" + _function.name + "\n";
-	for (auto const& param: _function.parameters)
-		ret += "    (param $" + param.name + " " + encodeType(param.type) + ")\n";
-	if (_function.returnType.has_value())
-		ret += "    (result " + encodeType(_function.returnType.value()) + ")\n";
-	for (auto const& local: _function.locals)
-		ret += "    (local $" + local.variableName + " " + encodeType(local.type) + ")\n";
-	ret += indented(joinTransformed(_function.body, '\n'));
-	if (ret.back() != '\n')
-		ret += '\n';
-	ret += ")\n";
-	return ret;
-}
-
-
-string TextTransform::visit(wasm::Expression const& _expression)
-{
-	return std::visit(*this, _expression);
-}
-
-string TextTransform::joinTransformed(vector<wasm::Expression> const& _expressions, char _separator)
-{
-	string ret;
-	for (auto const& e: _expressions)
-	{
-		string t = visit(e);
-		if (!t.empty() && !ret.empty() && ret.back() != '\n')
-			ret += _separator;
-		ret += std::move(t);
-	}
-	return ret;
-}
-
-string TextTransform::encodeType(wasm::Type _type)
-{
-	if (_type == wasm::Type::i32)
-		return "i32";
-	else if (_type == wasm::Type::i64)
-		return "i64";
-	else
-		yulAssert(false, "Invalid wasm type");
-}
diff --git a/libyul/backends/wasm/TextTransform.h b/libyul/backends/wasm/TextTransform.h
deleted file mode 100644
index eb14da65d9..0000000000
--- a/libyul/backends/wasm/TextTransform.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-	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
-/**
- * Component that transforms internal Wasm representation to text.
- */
-
-#pragma once
-
-#include <libyul/backends/wasm/WasmAST.h>
-
-#include <vector>
-
-namespace solidity::yul
-{
-struct AsmAnalysisInfo;
-}
-
-namespace solidity::yul::wasm
-{
-
-class TextTransform
-{
-public:
-	std::string run(wasm::Module const& _module);
-
-public:
-	std::string operator()(wasm::Literal const& _literal);
-	std::string operator()(wasm::StringLiteral const& _literal);
-	std::string operator()(wasm::LocalVariable const& _identifier);
-	std::string operator()(wasm::GlobalVariable const& _identifier);
-	std::string operator()(wasm::BuiltinCall const& _builinCall);
-	std::string operator()(wasm::FunctionCall const& _functionCall);
-	std::string operator()(wasm::LocalAssignment const& _assignment);
-	std::string operator()(wasm::GlobalAssignment const& _assignment);
-	std::string operator()(wasm::If const& _if);
-	std::string operator()(wasm::Loop const& _loop);
-	std::string operator()(wasm::Branch const& _branch);
-	std::string operator()(wasm::BranchIf const& _branchIf);
-	std::string operator()(wasm::Return const& _return);
-	std::string operator()(wasm::Block const& _block);
-
-private:
-	std::string indented(std::string const& _in);
-
-	std::string transform(wasm::FunctionDefinition const& _function);
-
-	std::string visit(wasm::Expression const& _expression);
-	std::string joinTransformed(
-		std::vector<wasm::Expression> const& _expressions,
-		char _separator = ' '
-	);
-
-	static std::string encodeType(wasm::Type _type);
-};
-
-}
diff --git a/libyul/backends/wasm/WasmAST.h b/libyul/backends/wasm/WasmAST.h
deleted file mode 100644
index 67b642ec9b..0000000000
--- a/libyul/backends/wasm/WasmAST.h
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-	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
-/**
- * Simplified in-memory representation of a Wasm AST.
- */
-
-#pragma once
-
-#include <libsolutil/Common.h>
-
-#include <variant>
-#include <string>
-#include <vector>
-#include <map>
-#include <memory>
-#include <optional>
-
-namespace solidity::yul::wasm
-{
-
-enum class Type
-{
-	i32,
-	i64,
-};
-
-struct TypedName { std::string name; Type type; };
-using TypedNameList = std::vector<TypedName>;
-
-struct Literal;
-struct StringLiteral;
-struct LocalVariable;
-struct GlobalVariable;
-struct FunctionCall;
-struct BuiltinCall;
-struct LocalAssignment;
-struct GlobalAssignment;
-struct Block;
-struct If;
-struct Loop;
-struct Branch;
-struct BranchIf;
-struct Return;
-using Expression = std::variant<
-	Literal, StringLiteral, LocalVariable, GlobalVariable,
-	FunctionCall, BuiltinCall, LocalAssignment, GlobalAssignment,
-	Block, If, Loop, Branch, BranchIf, Return
->;
-
-struct Literal { std::variant<uint32_t, uint64_t> value; };
-// This is a special AST element used for certain builtins. It is not mapped to actual WebAssembly.
-struct StringLiteral { std::string value; };
-struct LocalVariable { std::string name; };
-struct GlobalVariable { std::string name; };
-struct Label { std::string name; };
-struct FunctionCall { std::string functionName; std::vector<Expression> arguments; };
-struct BuiltinCall { std::string functionName; std::vector<Expression> arguments; };
-struct LocalAssignment { std::string variableName; std::unique_ptr<Expression> value; };
-struct GlobalAssignment { std::string variableName; std::unique_ptr<Expression> value; };
-struct Block { std::string labelName; std::vector<Expression> statements; };
-struct If {
-	std::unique_ptr<Expression> condition;
-	std::vector<Expression> statements;
-	std::unique_ptr<std::vector<Expression>> elseStatements;
-};
-struct Loop { std::string labelName; std::vector<Expression> statements; };
-struct Branch { Label label; };
-struct Return {};
-struct BranchIf { Label label; std::unique_ptr<Expression> condition; };
-
-struct VariableDeclaration { std::string variableName; Type type; };
-struct GlobalVariableDeclaration { std::string variableName; Type type; };
-struct FunctionImport {
-	std::string module;
-	std::string externalName;
-	std::string internalName;
-	std::vector<Type> paramTypes;
-	std::optional<Type> returnType;
-};
-
-struct FunctionDefinition
-{
-	std::string name;
-	std::vector<TypedName> parameters;
-	std::optional<Type> returnType;
-	std::vector<VariableDeclaration> locals;
-	std::vector<Expression> body;
-};
-
-/**
- * Abstract representation of a wasm module.
- */
-struct Module
-{
-	std::vector<GlobalVariableDeclaration> globals;
-	std::vector<FunctionImport> imports;
-	std::vector<FunctionDefinition> functions;
-	std::map<std::string, Module> subModules;
-	std::map<std::string, bytes> customSections;
-};
-
-}
diff --git a/libyul/backends/wasm/WasmCodeTransform.cpp b/libyul/backends/wasm/WasmCodeTransform.cpp
deleted file mode 100644
index 2d895d3fe0..0000000000
--- a/libyul/backends/wasm/WasmCodeTransform.cpp
+++ /dev/null
@@ -1,449 +0,0 @@
-/*
-	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
-/**
-* Common code generator for translating Yul / inline assembly to Wasm.
-*/
-
-#include <libyul/backends/wasm/WasmCodeTransform.h>
-
-#include <libyul/backends/wasm/WasmDialect.h>
-
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/Utilities.h>
-#include <libyul/Exceptions.h>
-
-#include <liblangutil/Exceptions.h>
-
-#include <optional>
-#include <limits>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-wasm::Module WasmCodeTransform::run(Dialect const& _dialect, yul::Block const& _ast)
-{
-	wasm::Module module;
-
-	TypeInfo typeInfo(_dialect, _ast);
-	WasmCodeTransform transform(_dialect, _ast, typeInfo);
-
-	for (auto const& statement: _ast.statements)
-	{
-		yulAssert(
-			holds_alternative<yul::FunctionDefinition>(statement),
-			"Expected only function definitions at the highest level."
-		);
-		if (holds_alternative<yul::FunctionDefinition>(statement))
-			module.functions.emplace_back(transform.translateFunction(std::get<yul::FunctionDefinition>(statement)));
-	}
-
-	for (auto& imp: transform.m_functionsToImport)
-		module.imports.emplace_back(std::move(imp.second));
-	module.globals = transform.m_globalVariables;
-
-	return module;
-}
-
-wasm::Expression WasmCodeTransform::generateMultiAssignment(
-	vector<string> _variableNames,
-	unique_ptr<wasm::Expression> _firstValue
-)
-{
-	yulAssert(!_variableNames.empty(), "");
-	wasm::LocalAssignment assignment{std::move(_variableNames.front()), std::move(_firstValue)};
-
-	if (_variableNames.size() == 1)
-		return { std::move(assignment) };
-
-	vector<wasm::Type> typesForGlobals;
-	for (size_t i = 1; i < _variableNames.size(); ++i)
-		typesForGlobals.push_back(translatedType(m_typeInfo.typeOfVariable(YulString(_variableNames[i]))));
-	vector<size_t> allocatedIndices = allocateGlobals(typesForGlobals);
-	yulAssert(allocatedIndices.size() == _variableNames.size() - 1, "");
-
-	wasm::Block block;
-	block.statements.emplace_back(std::move(assignment));
-	for (size_t i = 1; i < _variableNames.size(); ++i)
-		block.statements.emplace_back(wasm::LocalAssignment{
-			std::move(_variableNames.at(i)),
-			make_unique<wasm::Expression>(wasm::GlobalVariable{m_globalVariables.at(allocatedIndices[i - 1]).variableName})
-		});
-	return { std::move(block) };
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::VariableDeclaration const& _varDecl)
-{
-	vector<string> variableNames;
-	for (auto const& var: _varDecl.variables)
-	{
-		variableNames.emplace_back(var.name.str());
-		m_localVariables.emplace_back(wasm::VariableDeclaration{variableNames.back(), translatedType(var.type)});
-	}
-
-	if (_varDecl.value)
-		return generateMultiAssignment(std::move(variableNames), visit(*_varDecl.value));
-	else
-		return wasm::BuiltinCall{"nop", {}};
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::Assignment const& _assignment)
-{
-	vector<string> variableNames;
-	for (auto const& var: _assignment.variableNames)
-		variableNames.emplace_back(var.name.str());
-	return generateMultiAssignment(std::move(variableNames), visit(*_assignment.value));
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::ExpressionStatement const& _statement)
-{
-	return visitReturnByValue(_statement.expression);
-}
-
-void WasmCodeTransform::importBuiltinFunction(BuiltinFunction const* _builtin, string const& _module, string const& _externalName, string const& _internalName)
-{
-	yulAssert(_builtin, "");
-	yulAssert(_builtin->returns.size() <= 1, "");
-	// Imported function, use regular call, but mark for import.
-	YulString internalName(_internalName);
-	if (!m_functionsToImport.count(internalName))
-	{
-		wasm::FunctionImport imp{
-			_module,
-			_externalName,
-			_internalName,
-			{},
-			_builtin->returns.empty() ? nullopt : make_optional<wasm::Type>(translatedType(_builtin->returns.front()))
-		};
-		for (auto const& param: _builtin->parameters)
-			imp.paramTypes.emplace_back(translatedType(param));
-		m_functionsToImport[internalName] = std::move(imp);
-	}
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::FunctionCall const& _call)
-{
-	if (BuiltinFunction const* builtin = m_dialect.builtin(_call.functionName.name))
-	{
-		if (_call.functionName.name.str().substr(0, 6) == "debug.")
-			importBuiltinFunction(builtin, "debug", builtin->name.str().substr(6), builtin->name.str());
-		else if (_call.functionName.name.str().substr(0, 4) == "eth.")
-			importBuiltinFunction(builtin, "ethereum", builtin->name.str().substr(4), builtin->name.str());
-		else
-		{
-			vector<wasm::Expression> arguments;
-			for (size_t i = 0; i < _call.arguments.size(); i++)
-				if (builtin->literalArgument(i))
-				{
-					yulAssert(builtin->literalArgument(i) == LiteralKind::String, "");
-					arguments.emplace_back(wasm::StringLiteral{std::get<Literal>(_call.arguments[i]).value.str()});
-				}
-				else
-					arguments.emplace_back(visitReturnByValue(_call.arguments[i]));
-
-			return wasm::BuiltinCall{_call.functionName.name.str(), std::move(arguments)};
-		}
-	}
-
-	// If this function returns multiple values, then the first one will
-	// be returned in the expression itself and the others in global variables.
-	// The values have to be used right away in an assignment or variable declaration,
-	// so it is handled there.
-
-	return wasm::FunctionCall{_call.functionName.name.str(), visit(_call.arguments)};
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::Identifier const& _identifier)
-{
-	return wasm::LocalVariable{_identifier.name.str()};
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::Literal const& _literal)
-{
-	return makeLiteral(translatedType(_literal.type), valueOfLiteral(_literal));
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::If const& _if)
-{
-	yul::Type conditionType = m_typeInfo.typeOf(*_if.condition);
-
-	wasm::Expression condition;
-	if (conditionType == "i32"_yulstring)
-		condition = visitReturnByValue(*_if.condition);
-	else if (conditionType == "i64"_yulstring)
-	{
-		vector<wasm::Expression> args;
-		args.emplace_back(visitReturnByValue(*_if.condition));
-		args.emplace_back(makeLiteral(translatedType("i64"_yulstring), 0));
-
-		// NOTE: `if` in wasm requires an i32 argument
-		condition = wasm::BuiltinCall{"i64.ne", std::move(args)};
-	}
-	else
-		yulAssert(false, "Invalid condition type");
-
-	return wasm::If{make_unique<wasm::Expression>(std::move(condition)), visit(_if.body.statements), {}};
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::Switch const& _switch)
-{
-	yul::Type expressionType = m_typeInfo.typeOf(*_switch.expression);
-	YulString eq_instruction = YulString(expressionType.str() + ".eq");
-	yulAssert(WasmDialect::instance().builtin(eq_instruction), "");
-
-	wasm::Block block;
-	string condition = m_nameDispenser.newName("condition"_yulstring).str();
-	m_localVariables.emplace_back(wasm::VariableDeclaration{condition, translatedType(expressionType)});
-	block.statements.emplace_back(wasm::LocalAssignment{condition, visit(*_switch.expression)});
-
-	vector<wasm::Expression>* currentBlock = &block.statements;
-	for (size_t i = 0; i < _switch.cases.size(); ++i)
-	{
-		Case const& c = _switch.cases.at(i);
-		if (c.value)
-		{
-			wasm::BuiltinCall comparison{eq_instruction.str(), make_vector<wasm::Expression>(
-				wasm::LocalVariable{condition},
-				visitReturnByValue(*c.value)
-			)};
-			wasm::If ifStmnt{
-				make_unique<wasm::Expression>(std::move(comparison)),
-				visit(c.body.statements),
-				{}
-			};
-			vector<wasm::Expression>* nextBlock = nullptr;
-			if (i != _switch.cases.size() - 1)
-			{
-				ifStmnt.elseStatements = make_unique<vector<wasm::Expression>>();
-				nextBlock = ifStmnt.elseStatements.get();
-			}
-			currentBlock->emplace_back(std::move(ifStmnt));
-			currentBlock = nextBlock;
-		}
-		else
-		{
-			yulAssert(i == _switch.cases.size() - 1, "Default case must be last.");
-			*currentBlock += visit(c.body.statements);
-		}
-	}
-	return { std::move(block) };
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::FunctionDefinition const&)
-{
-	yulAssert(false, "Should not have visited here.");
-	return {};
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::ForLoop const& _for)
-{
-	string breakLabel = newLabel();
-	string continueLabel = newLabel();
-	m_breakContinueLabelNames.push({breakLabel, continueLabel});
-
-	yul::Type conditionType = m_typeInfo.typeOf(*_for.condition);
-	YulString eqz_instruction = YulString(conditionType.str() + ".eqz");
-	yulAssert(WasmDialect::instance().builtin(eqz_instruction), "");
-
-	std::vector<wasm::Expression> statements = visit(_for.pre.statements);
-
-	wasm::Loop loop;
-	loop.labelName = newLabel();
-	loop.statements.emplace_back(wasm::BranchIf{wasm::Label{breakLabel}, make_unique<wasm::Expression>(
-		wasm::BuiltinCall{eqz_instruction.str(), make_vector<wasm::Expression>(
-			visitReturnByValue(*_for.condition)
-		)}
-	)});
-	loop.statements.emplace_back(wasm::Block{continueLabel, visit(_for.body.statements)});
-	loop.statements += visit(_for.post.statements);
-	loop.statements.emplace_back(wasm::Branch{wasm::Label{loop.labelName}});
-
-	statements += make_vector<wasm::Expression>(std::move(loop));
-	return wasm::Block{breakLabel, std::move(statements)};
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::Break const&)
-{
-	yulAssert(m_breakContinueLabelNames.size() > 0, "");
-	return wasm::Branch{wasm::Label{m_breakContinueLabelNames.top().first}};
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::Continue const&)
-{
-	yulAssert(m_breakContinueLabelNames.size() > 0, "");
-	return wasm::Branch{wasm::Label{m_breakContinueLabelNames.top().second}};
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::Leave const&)
-{
-	yulAssert(!m_functionBodyLabel.empty(), "");
-	return wasm::Branch{wasm::Label{m_functionBodyLabel}};
-}
-
-wasm::Expression WasmCodeTransform::operator()(yul::Block const& _block)
-{
-	return wasm::Block{{}, visit(_block.statements)};
-}
-
-unique_ptr<wasm::Expression> WasmCodeTransform::visit(yul::Expression const& _expression)
-{
-	return make_unique<wasm::Expression>(std::visit(*this, _expression));
-}
-
-wasm::Expression WasmCodeTransform::visitReturnByValue(yul::Expression const& _expression)
-{
-	return std::visit(*this, _expression);
-}
-
-vector<wasm::Expression> WasmCodeTransform::visit(vector<yul::Expression> const& _expressions)
-{
-	vector<wasm::Expression> ret;
-	for (auto const& e: _expressions)
-		ret.emplace_back(visitReturnByValue(e));
-	return ret;
-}
-
-wasm::Expression WasmCodeTransform::visit(yul::Statement const& _statement)
-{
-	return std::visit(*this, _statement);
-}
-
-vector<wasm::Expression> WasmCodeTransform::visit(vector<yul::Statement> const& _statements)
-{
-	vector<wasm::Expression> ret;
-	for (auto const& s: _statements)
-		ret.emplace_back(visit(s));
-	return ret;
-}
-
-wasm::FunctionDefinition WasmCodeTransform::translateFunction(yul::FunctionDefinition const& _fun)
-{
-	wasm::FunctionDefinition fun;
-	fun.name = _fun.name.str();
-	for (auto const& param: _fun.parameters)
-		fun.parameters.push_back({param.name.str(), translatedType(param.type)});
-	for (auto const& retParam: _fun.returnVariables)
-		fun.locals.emplace_back(wasm::VariableDeclaration{retParam.name.str(), translatedType(retParam.type)});
-	if (!_fun.returnVariables.empty())
-		fun.returnType = translatedType(_fun.returnVariables[0].type);
-
-	yulAssert(m_localVariables.empty(), "");
-	yulAssert(m_functionBodyLabel.empty(), "");
-	m_functionBodyLabel = newLabel();
-	fun.body.emplace_back(wasm::Expression(wasm::Block{
-		m_functionBodyLabel,
-		visit(_fun.body.statements)
-	}));
-	fun.locals += m_localVariables;
-
-	m_localVariables.clear();
-	m_functionBodyLabel = {};
-
-	if (!_fun.returnVariables.empty())
-	{
-		// First return variable is returned directly, the others are stored
-		// in globals.
-		vector<wasm::Type> typesForGlobals;
-		for (size_t i = 1; i < _fun.returnVariables.size(); ++i)
-			typesForGlobals.push_back(translatedType(_fun.returnVariables[i].type));
-		vector<size_t> allocatedIndices = allocateGlobals(typesForGlobals);
-		yulAssert(allocatedIndices.size() == _fun.returnVariables.size() - 1, "");
-
-		for (size_t i = 1; i < _fun.returnVariables.size(); ++i)
-			fun.body.emplace_back(wasm::GlobalAssignment{
-				m_globalVariables.at(allocatedIndices[i - 1]).variableName,
-				make_unique<wasm::Expression>(wasm::LocalVariable{_fun.returnVariables.at(i).name.str()})
-			});
-		fun.body.emplace_back(wasm::LocalVariable{_fun.returnVariables.front().name.str()});
-	}
-	return fun;
-}
-
-string WasmCodeTransform::newLabel()
-{
-	return m_nameDispenser.newName("label_"_yulstring).str();
-}
-
-vector<size_t> WasmCodeTransform::allocateGlobals(vector<wasm::Type> const& _typesForGlobals)
-{
-	map<wasm::Type, size_t> availableGlobals;
-	for (wasm::GlobalVariableDeclaration const& global: m_globalVariables)
-		++availableGlobals[global.type];
-
-	map<wasm::Type, size_t> neededGlobals;
-	for (wasm::Type const& type: _typesForGlobals)
-		++neededGlobals[type];
-
-	for (auto [type, neededGlobalCount]: neededGlobals)
-		while (availableGlobals[type] < neededGlobalCount)
-		{
-			m_globalVariables.emplace_back(wasm::GlobalVariableDeclaration{
-				m_nameDispenser.newName("global_"_yulstring).str(),
-				type,
-			});
-
-			++availableGlobals[type];
-		}
-
-	vector<size_t> allocatedIndices;
-	map<wasm::Type, size_t> nextGlobal;
-	for (wasm::Type const& type: _typesForGlobals)
-	{
-		while (m_globalVariables[nextGlobal[type]].type != type)
-			++nextGlobal[type];
-
-		allocatedIndices.push_back(nextGlobal[type]++);
-	}
-
-	yulAssert(all_of(
-		allocatedIndices.begin(),
-		allocatedIndices.end(),
-		[this](size_t index){ return index < m_globalVariables.size(); }
-	), "");
-	yulAssert(allocatedIndices.size() == set<size_t>(allocatedIndices.begin(), allocatedIndices.end()).size(), "Indices not unique");
-	yulAssert(allocatedIndices.size() == _typesForGlobals.size(), "");
-	return allocatedIndices;
-}
-
-wasm::Type WasmCodeTransform::translatedType(yul::Type _yulType)
-{
-	if (_yulType == "i32"_yulstring)
-		return wasm::Type::i32;
-	else if (_yulType == "i64"_yulstring)
-		return wasm::Type::i64;
-	else
-		yulAssert(false, "This Yul type does not have a corresponding type in Wasm.");
-}
-
-wasm::Literal WasmCodeTransform::makeLiteral(wasm::Type _type, u256 _value)
-{
-	if (_type == wasm::Type::i32)
-	{
-		yulAssert(_value <= numeric_limits<uint32_t>::max(), "Literal too large: " + _value.str());
-		return wasm::Literal{static_cast<uint32_t>(_value)};
-	}
-	else if (_type == wasm::Type::i64)
-	{
-		yulAssert(_value <= numeric_limits<uint64_t>::max(), "Literal too large: " + _value.str());
-		return wasm::Literal{static_cast<uint64_t>(_value)};
-	}
-	else
-		yulAssert(false, "Invalid Wasm literal type");
-}
diff --git a/libyul/backends/wasm/WasmCodeTransform.h b/libyul/backends/wasm/WasmCodeTransform.h
deleted file mode 100644
index 1026f17c60..0000000000
--- a/libyul/backends/wasm/WasmCodeTransform.h
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-	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
-/**
- * Common code generator for translating Yul / inline assembly to Wasm.
- */
-
-#pragma once
-
-#include <libyul/backends/wasm/WasmAST.h>
-#include <libyul/ASTForward.h>
-#include <libyul/Dialect.h>
-#include <libyul/optimiser/NameDispenser.h>
-#include <libyul/optimiser/TypeInfo.h>
-
-#include <libsolutil/Common.h>
-#include <libsolutil/Numeric.h>
-
-#include <stack>
-#include <map>
-
-namespace solidity::yul
-{
-struct AsmAnalysisInfo;
-
-class WasmCodeTransform
-{
-public:
-	static wasm::Module run(Dialect const& _dialect, yul::Block const& _ast);
-
-public:
-	wasm::Expression operator()(yul::Literal const& _literal);
-	wasm::Expression operator()(yul::Identifier const& _identifier);
-	wasm::Expression operator()(yul::FunctionCall const&);
-	wasm::Expression operator()(yul::ExpressionStatement const& _statement);
-	wasm::Expression operator()(yul::Assignment const& _assignment);
-	wasm::Expression operator()(yul::VariableDeclaration const& _varDecl);
-	wasm::Expression operator()(yul::If const& _if);
-	wasm::Expression operator()(yul::Switch const& _switch);
-	wasm::Expression operator()(yul::FunctionDefinition const&);
-	wasm::Expression operator()(yul::ForLoop const&);
-	wasm::Expression operator()(yul::Break const&);
-	wasm::Expression operator()(yul::Continue const&);
-	wasm::Expression operator()(yul::Leave const&);
-	wasm::Expression operator()(yul::Block const& _block);
-
-private:
-	WasmCodeTransform(
-		Dialect const& _dialect,
-		Block const& _ast,
-		TypeInfo& _typeInfo
-	):
-		m_dialect(_dialect),
-		m_nameDispenser(_dialect, _ast),
-		m_typeInfo(_typeInfo)
-	{}
-
-	std::unique_ptr<wasm::Expression> visit(yul::Expression const& _expression);
-	wasm::Expression visitReturnByValue(yul::Expression const& _expression);
-	std::vector<wasm::Expression> visit(std::vector<yul::Expression> const& _expressions);
-	wasm::Expression visit(yul::Statement const& _statement);
-	std::vector<wasm::Expression> visit(std::vector<yul::Statement> const& _statements);
-
-	/// Returns an assignment or a block containing multiple assignments.
-	/// @param _variableNames the names of the variables to assign to
-	/// @param _firstValue the value to be assigned to the first variable. If there
-	///        is more than one variable, the values are taken from m_globalVariables.
-	wasm::Expression generateMultiAssignment(
-		std::vector<std::string> _variableNames,
-		std::unique_ptr<wasm::Expression> _firstValue
-	);
-
-	wasm::FunctionDefinition translateFunction(yul::FunctionDefinition const& _funDef);
-
-	/// Imports an external function into the current module.
-	/// @param _builtin _builtin the builtin that will be imported into the current module.
-	/// @param _module _module the module name under which the external function can be found.
-	/// @param _externalName the name of the external function within the module _module.
-	/// @param _internalName the name of the internal function under that the external function is accessible.
-	void importBuiltinFunction(BuiltinFunction const* _builtin, std::string const& _module, std::string const& _externalName, std::string const& _internalName);
-
-	std::string newLabel();
-	/// Selects a subset of global variables matching specified sequence of variable types.
-	/// Defines more global variables of a given type if there's not enough.
-	std::vector<size_t> allocateGlobals(std::vector<wasm::Type> const& _typesForGlobals);
-
-	static wasm::Type translatedType(yul::Type _yulType);
-	static wasm::Literal makeLiteral(wasm::Type _type, u256 _value);
-
-	Dialect const& m_dialect;
-	NameDispenser m_nameDispenser;
-
-	std::vector<wasm::VariableDeclaration> m_localVariables;
-	std::vector<wasm::GlobalVariableDeclaration> m_globalVariables;
-	std::map<YulString, wasm::FunctionImport> m_functionsToImport;
-	std::string m_functionBodyLabel;
-	std::stack<std::pair<std::string, std::string>> m_breakContinueLabelNames;
-	TypeInfo& m_typeInfo;
-};
-
-}
diff --git a/libyul/backends/wasm/WasmDialect.cpp b/libyul/backends/wasm/WasmDialect.cpp
deleted file mode 100644
index b724ba69e6..0000000000
--- a/libyul/backends/wasm/WasmDialect.cpp
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
-	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
-/**
- * Dialects for Wasm.
- */
-
-#include <libyul/backends/wasm/WasmDialect.h>
-
-#include <libyul/AST.h>
-#include <libyul/Exceptions.h>
-
-using namespace std;
-using namespace solidity::yul;
-
-WasmDialect::WasmDialect()
-{
-	YulString i64 = "i64"_yulstring;
-	YulString i32 = "i32"_yulstring;
-	defaultType = i64;
-	boolType = i32;
-	types = {i64, i32};
-
-	for (auto t: types)
-		for (auto const& name: {
-			"add",
-			"sub",
-			"mul",
-			// TODO: div_s
-			"div_u",
-			// TODO: rem_s
-			"rem_u",
-			"and",
-			"or",
-			"xor",
-			"shl",
-			// TODO: shr_s
-			"shr_u",
-			// TODO: rotl
-			// TODO: rotr
-		})
-			addFunction(t.str() + "." + name, {t, t}, {t});
-
-	for (auto t: types)
-		for (auto const& name: {
-			"eq",
-			"ne",
-			// TODO: lt_s
-			"lt_u",
-			// TODO: gt_s
-			"gt_u",
-			// TODO: le_s
-			"le_u",
-			// TODO: ge_s
-			"ge_u"
-		})
-			addFunction(t.str() + "." + name, {t, t}, {i32});
-
-	addFunction("i32.eqz", {i32}, {i32});
-	addFunction("i64.eqz", {i64}, {i32});
-
-	for (auto t: types)
-		for (auto const& name: {
-			"clz",
-			"ctz",
-			"popcnt",
-		})
-			addFunction(t.str() + "." + name, {t}, {t});
-
-	addFunction("i32.wrap_i64", {i64}, {i32});
-
-	addFunction("i64.extend_i32_u", {i32}, {i64});
-
-	addFunction("i32.store", {i32, i32}, {}, false);
-	m_functions["i32.store"_yulstring].sideEffects.storage = SideEffects::None;
-	m_functions["i32.store"_yulstring].sideEffects.otherState = SideEffects::None;
-	addFunction("i64.store", {i32, i64}, {}, false);
-	// TODO: add i32.store16, i64.store8, i64.store16, i64.store32
-	m_functions["i64.store"_yulstring].sideEffects.storage = SideEffects::None;
-	m_functions["i64.store"_yulstring].sideEffects.otherState = SideEffects::None;
-
-	addFunction("i32.store8", {i32, i32}, {}, false);
-	m_functions["i32.store8"_yulstring].sideEffects.storage = SideEffects::None;
-	m_functions["i32.store8"_yulstring].sideEffects.otherState = SideEffects::None;
-
-	addFunction("i64.store8", {i32, i64}, {}, false);
-	m_functions["i64.store8"_yulstring].sideEffects.storage = SideEffects::None;
-	m_functions["i64.store8"_yulstring].sideEffects.otherState = SideEffects::None;
-
-	addFunction("i32.load", {i32}, {i32}, false);
-	m_functions["i32.load"_yulstring].sideEffects.canBeRemoved = true;
-	m_functions["i32.load"_yulstring].sideEffects.canBeRemovedIfNoMSize = true;
-	m_functions["i32.load"_yulstring].sideEffects.storage = SideEffects::None;
-	m_functions["i32.load"_yulstring].sideEffects.memory = SideEffects::Read;
-	m_functions["i32.load"_yulstring].sideEffects.otherState = SideEffects::None;
-	addFunction("i64.load", {i32}, {i64}, false);
-	// TODO: add i32.load8, i32.load16, i64.load8, i64.load16, i64.load32
-	m_functions["i64.load"_yulstring].sideEffects.canBeRemoved = true;
-	m_functions["i64.load"_yulstring].sideEffects.canBeRemovedIfNoMSize = true;
-	m_functions["i64.load"_yulstring].sideEffects.storage = SideEffects::None;
-	m_functions["i64.load"_yulstring].sideEffects.memory = SideEffects::Read;
-	m_functions["i64.load"_yulstring].sideEffects.otherState = SideEffects::None;
-
-	// Drop is actually overloaded for all types, but Yul does not support that.
-	// Because of that, we introduce "i32.drop" and "i64.drop".
-	addFunction("i32.drop", {i32}, {});
-	addFunction("i64.drop", {i64}, {});
-
-	// Select is also overloaded.
-	addFunction("i32.select", {i32, i32, i32}, {i32});
-	addFunction("i64.select", {i64, i64, i32}, {i64});
-
-	addFunction("nop", {}, {});
-	addFunction("unreachable", {}, {}, false);
-	m_functions["unreachable"_yulstring].sideEffects.storage = SideEffects::None;
-	m_functions["unreachable"_yulstring].sideEffects.memory = SideEffects::None;
-	m_functions["unreachable"_yulstring].sideEffects.otherState = SideEffects::None;
-	m_functions["unreachable"_yulstring].controlFlowSideEffects.canTerminate = false;
-	m_functions["unreachable"_yulstring].controlFlowSideEffects.canRevert = true;
-	m_functions["unreachable"_yulstring].controlFlowSideEffects.canContinue = false;
-
-	addFunction("datasize", {i64}, {i64}, true, {LiteralKind::String});
-	addFunction("dataoffset", {i64}, {i64}, true, {LiteralKind::String});
-
-	addExternals();
-}
-
-BuiltinFunction const* WasmDialect::builtin(YulString _name) const
-{
-	auto it = m_functions.find(_name);
-	if (it != m_functions.end())
-		return &it->second;
-	else
-		return nullptr;
-}
-
-BuiltinFunction const* WasmDialect::discardFunction(YulString _type) const
-{
-	if (_type == "i32"_yulstring)
-		return builtin("i32.drop"_yulstring);
-	yulAssert(_type == "i64"_yulstring, "");
-	return builtin("i64.drop"_yulstring);
-}
-
-BuiltinFunction const* WasmDialect::equalityFunction(YulString _type) const
-{
-	if (_type == "i32"_yulstring)
-		return builtin("i32.eq"_yulstring);
-	yulAssert(_type == "i64"_yulstring, "");
-	return builtin("i64.eq"_yulstring);
-}
-
-WasmDialect const& WasmDialect::instance()
-{
-	static std::unique_ptr<WasmDialect> dialect;
-	static YulStringRepository::ResetCallback callback{[&] { dialect.reset(); }};
-	if (!dialect)
-		dialect = make_unique<WasmDialect>();
-	return *dialect;
-}
-
-void WasmDialect::addExternals()
-{
-	// These are not YulStrings because that would be too complicated with regards
-	// to the YulStringRepository reset.
-	static string const i64{"i64"};
-	static string const i32{"i32"};
-	static string const i32ptr{"i32"}; // Uses "i32" on purpose.
-	struct External
-	{
-		string module;
-		string name;
-		vector<string> parameters;
-		vector<string> returns;
-		ControlFlowSideEffects controlFlowSideEffects = ControlFlowSideEffects{};
-	};
-	static vector<External> externals{
-		{"eth", "getAddress", {i32ptr}, {}},
-		{"eth", "getExternalBalance", {i32ptr, i32ptr}, {}},
-		{"eth", "getBlockBaseFee", {i32ptr}, {}},
-		{"eth", "getBlockHash", {i64, i32ptr}, {i32}},
-		{"eth", "call", {i64, i32ptr, i32ptr, i32ptr, i32}, {i32}},
-		{"eth", "callDataCopy", {i32ptr, i32, i32}, {}},
-		{"eth", "getCallDataSize", {}, {i32}},
-		{"eth", "callCode", {i64, i32ptr, i32ptr, i32ptr, i32}, {i32}},
-		{"eth", "callDelegate", {i64, i32ptr, i32ptr, i32}, {i32}},
-		{"eth", "callStatic", {i64, i32ptr, i32ptr, i32}, {i32}},
-		{"eth", "storageStore", {i32ptr, i32ptr}, {}},
-		{"eth", "storageLoad", {i32ptr, i32ptr}, {}},
-		{"eth", "getCaller", {i32ptr}, {}},
-		{"eth", "getCallValue", {i32ptr}, {}},
-		{"eth", "codeCopy", {i32ptr, i32, i32}, {}},
-		{"eth", "getCodeSize", {}, {i32}},
-		{"eth", "getBlockCoinbase", {i32ptr}, {}},
-		{"eth", "create", {i32ptr, i32ptr, i32, i32ptr}, {i32}},
-		{"eth", "getBlockDifficulty", {i32ptr}, {}},
-		{"eth", "externalCodeCopy", {i32ptr, i32ptr, i32, i32}, {}},
-		{"eth", "getExternalCodeSize", {i32ptr}, {i32}},
-		{"eth", "getGasLeft", {}, {i64}},
-		{"eth", "getBlockGasLimit", {}, {i64}},
-		{"eth", "getTxGasPrice", {i32ptr}, {}},
-		{"eth", "log", {i32ptr, i32, i32, i32ptr, i32ptr, i32ptr, i32ptr}, {}},
-		{"eth", "getBlockNumber", {}, {i64}},
-		{"eth", "getTxOrigin", {i32ptr}, {}},
-		{"eth", "finish", {i32ptr, i32}, {}, ControlFlowSideEffects{true, false, false}},
-		{"eth", "revert", {i32ptr, i32}, {}, ControlFlowSideEffects{false, true, false}},
-		{"eth", "getReturnDataSize", {}, {i32}},
-		{"eth", "returnDataCopy", {i32ptr, i32, i32}, {}},
-		{"eth", "selfDestruct", {i32ptr}, {}, ControlFlowSideEffects{false, true, false}},
-		{"eth", "getBlockTimestamp", {}, {i64}},
-		{"debug", "print32", {i32}, {}},
-		{"debug", "print64", {i64}, {}},
-		{"debug", "printMem", {i32, i32}, {}},
-		{"debug", "printMemHex", {i32, i32}, {}},
-		{"debug", "printStorage", {i32}, {}},
-		{"debug", "printStorageHex", {i32}, {}},
-	};
-	for (External const& ext: externals)
-	{
-		YulString name{ext.module + "." + ext.name};
-		BuiltinFunction& f = m_functions[name];
-		f.name = name;
-		for (string const& p: ext.parameters)
-			f.parameters.emplace_back(YulString(p));
-		for (string const& p: ext.returns)
-			f.returns.emplace_back(YulString(p));
-		// TODO some of them are side effect free.
-		f.sideEffects = SideEffects::worst();
-		f.sideEffects.cannotLoop = true;
-		f.sideEffects.movableApartFromEffects = !ext.controlFlowSideEffects.terminatesOrReverts();
-		f.controlFlowSideEffects = ext.controlFlowSideEffects;
-		f.isMSize = false;
-		f.literalArguments.clear();
-
-		static set<string> const writesToStorage{
-			"storageStore",
-			"call",
-			"callcode",
-			"callDelegate",
-			"create"
-		};
-		static set<string> const readsStorage{"storageLoad", "callStatic"};
-		if (readsStorage.count(ext.name))
-			f.sideEffects.storage = SideEffects::Read;
-		else if (!writesToStorage.count(ext.name))
-			f.sideEffects.storage = SideEffects::None;
-	}
-}
-
-void WasmDialect::addFunction(
-	string _name,
-	vector<YulString> _params,
-	vector<YulString> _returns,
-	bool _movable,
-	vector<optional<LiteralKind>> _literalArguments
-)
-{
-	YulString name{std::move(_name)};
-	BuiltinFunction& f = m_functions[name];
-	f.name = name;
-	f.parameters = std::move(_params);
-	yulAssert(_returns.size() <= 1, "The Wasm 1.0 specification only allows up to 1 return value.");
-	f.returns = std::move(_returns);
-	f.sideEffects = _movable ? SideEffects{} : SideEffects::worst();
-	f.sideEffects.cannotLoop = true;
-	// TODO This should be improved when LoopInvariantCodeMotion gets specialized for WASM
-	f.sideEffects.movableApartFromEffects = _movable;
-	f.isMSize = false;
-	f.literalArguments = std::move(_literalArguments);
-}
diff --git a/libyul/backends/wasm/WasmDialect.h b/libyul/backends/wasm/WasmDialect.h
deleted file mode 100644
index 2776c14e79..0000000000
--- a/libyul/backends/wasm/WasmDialect.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-	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
-/**
- * Dialects for Wasm.
- */
-
-#pragma once
-
-#include <libyul/Dialect.h>
-
-#include <map>
-
-namespace solidity::yul
-{
-
-class YulString;
-using Type = YulString;
-struct FunctionCall;
-struct Object;
-
-/**
- * Yul dialect for Wasm as a backend.
- *
- * Builtin functions are a subset of the wasm instructions.
- *
- * There is a builtin function `i32.drop` that takes an i32, while `i64.drop` takes i64.
- *
- */
-struct WasmDialect: public Dialect
-{
-	WasmDialect();
-
-	BuiltinFunction const* builtin(YulString _name) const override;
-	BuiltinFunction const* discardFunction(YulString _type) const override;
-	BuiltinFunction const* equalityFunction(YulString _type) const override;
-	BuiltinFunction const* booleanNegationFunction() const override { return builtin("i32.eqz"_yulstring); }
-
-	std::set<YulString> fixedFunctionNames() const override { return {"main"_yulstring}; }
-
-	static WasmDialect const& instance();
-
-private:
-	void addExternals();
-
-	void addFunction(
-		std::string _name,
-		std::vector<YulString> _params,
-		std::vector<YulString> _returns,
-		bool _movable = true,
-		std::vector<std::optional<LiteralKind>> _literalArguments = std::vector<std::optional<LiteralKind>>{}
-	);
-
-	std::map<YulString, BuiltinFunction> m_functions;
-};
-
-}
diff --git a/libyul/backends/wasm/WasmObjectCompiler.cpp b/libyul/backends/wasm/WasmObjectCompiler.cpp
deleted file mode 100644
index bdd109d31c..0000000000
--- a/libyul/backends/wasm/WasmObjectCompiler.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-	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
-/**
- * Compiler that transforms Yul Objects to Wasm text and binary representation (Ewasm flavoured).
- */
-
-#include <libyul/backends/wasm/WasmObjectCompiler.h>
-
-#include <libyul/backends/wasm/WasmCodeTransform.h>
-#include <libyul/backends/wasm/BinaryTransform.h>
-#include <libyul/backends/wasm/TextTransform.h>
-
-#include <libyul/Object.h>
-#include <libyul/Exceptions.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace solidity;
-using namespace solidity::yul;
-using namespace std;
-
-pair<string, bytes> WasmObjectCompiler::compile(Object& _object, Dialect const& _dialect)
-{
-	WasmObjectCompiler compiler(_dialect);
-	wasm::Module module = compiler.run(_object);
-	return {wasm::TextTransform().run(module), wasm::BinaryTransform::run(module)};
-}
-
-wasm::Module WasmObjectCompiler::run(Object& _object)
-{
-	yulAssert(_object.analysisInfo, "No analysis info.");
-	yulAssert(_object.code, "No code.");
-
-	wasm::Module module = WasmCodeTransform::run(m_dialect, *_object.code);
-
-	for (auto& subNode: _object.subObjects)
-		if (Object* subObject = dynamic_cast<Object*>(subNode.get()))
-			module.subModules[subObject->name.str()] = run(*subObject);
-		else if (Data* subObject = dynamic_cast<Data*>(subNode.get()))
-			module.customSections[subObject->name.str()] = subObject->data;
-		else
-			yulAssert(false, "");
-
-	return module;
-}
diff --git a/libyul/backends/wasm/WasmObjectCompiler.h b/libyul/backends/wasm/WasmObjectCompiler.h
deleted file mode 100644
index 52e48a9d5e..0000000000
--- a/libyul/backends/wasm/WasmObjectCompiler.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-	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
-/**
- * Compiler that transforms Yul Objects to Wasm text and binary representation (Ewasm flavoured).
- */
-
-#pragma once
-
-#include <string>
-#include <vector>
-#include <tuple>
-#include <libsolutil/Common.h>     // solidity::bytes
-
-namespace solidity::yul
-{
-struct Object;
-struct Dialect;
-namespace wasm
-{
-struct Module;
-}
-
-class WasmObjectCompiler
-{
-public:
-	/// Compiles the given object and returns the Wasm text and binary representation.
-	static std::pair<std::string, bytes> compile(Object& _object, Dialect const& _dialect);
-private:
-	WasmObjectCompiler(Dialect const& _dialect):
-		m_dialect(_dialect)
-	{}
-
-	wasm::Module run(Object& _object);
-
-	Dialect const& m_dialect;
-};
-
-}
diff --git a/libyul/backends/wasm/WordSizeTransform.cpp b/libyul/backends/wasm/WordSizeTransform.cpp
deleted file mode 100644
index ad723717b6..0000000000
--- a/libyul/backends/wasm/WordSizeTransform.cpp
+++ /dev/null
@@ -1,433 +0,0 @@
-/*
-	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 <libyul/AST.h>
-#include <libyul/backends/wasm/WordSizeTransform.h>
-#include <libyul/Utilities.h>
-#include <libyul/Dialect.h>
-#include <libyul/optimiser/NameDisplacer.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <array>
-#include <map>
-#include <variant>
-#include <limits>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::util;
-
-void WordSizeTransform::operator()(FunctionDefinition& _fd)
-{
-	rewriteVarDeclList(_fd.parameters);
-	rewriteVarDeclList(_fd.returnVariables);
-	(*this)(_fd.body);
-}
-
-void WordSizeTransform::operator()(FunctionCall& _fc)
-{
-	vector<optional<LiteralKind>> const* literalArguments = nullptr;
-
-	if (BuiltinFunction const* fun = m_inputDialect.builtin(_fc.functionName.name))
-		if (!fun->literalArguments.empty())
-			literalArguments = &fun->literalArguments;
-
-	vector<Expression> newArgs;
-
-	for (size_t i = 0; i < _fc.arguments.size(); i++)
-		if (!literalArguments || !(*literalArguments)[i].has_value())
-			newArgs += expandValueToVector(_fc.arguments[i]);
-		else
-		{
-			get<Literal>(_fc.arguments[i]).type = m_targetDialect.defaultType;
-			newArgs.emplace_back(std::move(_fc.arguments[i]));
-		}
-
-	_fc.arguments = std::move(newArgs);
-}
-
-void WordSizeTransform::operator()(If& _if)
-{
-	_if.condition = make_unique<Expression>(FunctionCall{
-		debugDataOf(*_if.condition),
-		Identifier{debugDataOf(*_if.condition), "or_bool"_yulstring},
-		expandValueToVector(*_if.condition)
-	});
-	(*this)(_if.body);
-}
-
-void WordSizeTransform::operator()(Switch&)
-{
-	yulAssert(false, "Switch statement has to be handled inside the containing block.");
-}
-
-void WordSizeTransform::operator()(ForLoop& _for)
-{
-	(*this)(_for.pre);
-	_for.condition = make_unique<Expression>(FunctionCall{
-		debugDataOf(*_for.condition),
-		Identifier{debugDataOf(*_for.condition), "or_bool"_yulstring},
-		expandValueToVector(*_for.condition)
-	});
-	(*this)(_for.post);
-	(*this)(_for.body);
-}
-
-void WordSizeTransform::operator()(Block& _block)
-{
-	iterateReplacing(
-		_block.statements,
-		[&](Statement& _s) -> std::optional<vector<Statement>>
-		{
-			if (holds_alternative<VariableDeclaration>(_s))
-			{
-				VariableDeclaration& varDecl = std::get<VariableDeclaration>(_s);
-
-				if (!varDecl.value)
-					rewriteVarDeclList(varDecl.variables);
-				else if (holds_alternative<FunctionCall>(*varDecl.value))
-				{
-					visit(*varDecl.value);
-
-					// Special handling for datasize and dataoffset - they will only need one variable.
-					if (BuiltinFunction const* f = m_inputDialect.builtin(std::get<FunctionCall>(*varDecl.value).functionName.name))
-						if (f->name == "datasize"_yulstring || f->name == "dataoffset"_yulstring)
-						{
-							yulAssert(f->literalArguments.size() == 1, "");
-							yulAssert(f->literalArguments.at(0) == LiteralKind::String, "");
-							yulAssert(varDecl.variables.size() == 1, "");
-							auto newLhs = generateU64IdentifierNames(varDecl.variables[0].name);
-							vector<Statement> ret;
-							for (size_t i = 0; i < 3; i++)
-								ret.emplace_back(VariableDeclaration{
-									varDecl.debugData,
-									{TypedName{varDecl.debugData, newLhs[i], m_targetDialect.defaultType}},
-									make_unique<Expression>(Literal{
-										debugDataOf(*varDecl.value),
-										LiteralKind::Number,
-										"0"_yulstring,
-										m_targetDialect.defaultType
-									})
-								});
-							ret.emplace_back(VariableDeclaration{
-								varDecl.debugData,
-								{TypedName{varDecl.debugData, newLhs[3], m_targetDialect.defaultType}},
-								std::move(varDecl.value)
-							});
-							return {std::move(ret)};
-						}
-
-					rewriteVarDeclList(varDecl.variables);
-					return std::nullopt;
-				}
-				else if (
-					holds_alternative<Identifier>(*varDecl.value) ||
-					holds_alternative<Literal>(*varDecl.value)
-				)
-				{
-					yulAssert(varDecl.variables.size() == 1, "");
-					auto newRhs = expandValue(*varDecl.value);
-					auto newLhs = generateU64IdentifierNames(varDecl.variables[0].name);
-					vector<Statement> ret;
-					for (size_t i = 0; i < 4; i++)
-						ret.emplace_back(VariableDeclaration{
-								varDecl.debugData,
-								{TypedName{varDecl.debugData, newLhs[i], m_targetDialect.defaultType}},
-								std::move(newRhs[i])
-							}
-						);
-					return {std::move(ret)};
-				}
-				else
-					yulAssert(false, "");
-			}
-			else if (holds_alternative<Assignment>(_s))
-			{
-				Assignment& assignment = std::get<Assignment>(_s);
-				yulAssert(assignment.value, "");
-
-				if (holds_alternative<FunctionCall>(*assignment.value))
-				{
-					visit(*assignment.value);
-
-					// Special handling for datasize and dataoffset - they will only need one variable.
-					if (BuiltinFunction const* f = m_inputDialect.builtin(std::get<FunctionCall>(*assignment.value).functionName.name))
-						if (f->name == "datasize"_yulstring || f->name == "dataoffset"_yulstring)
-						{
-							yulAssert(f->literalArguments.size() == 1, "");
-							yulAssert(f->literalArguments[0] == LiteralKind::String, "");
-							yulAssert(assignment.variableNames.size() == 1, "");
-							auto newLhs = generateU64IdentifierNames(assignment.variableNames[0].name);
-							vector<Statement> ret;
-							for (size_t i = 0; i < 3; i++)
-								ret.emplace_back(Assignment{
-									assignment.debugData,
-									{Identifier{assignment.debugData, newLhs[i]}},
-									make_unique<Expression>(Literal{
-										debugDataOf(*assignment.value),
-										LiteralKind::Number,
-										"0"_yulstring,
-										m_targetDialect.defaultType
-									})
-								});
-							ret.emplace_back(Assignment{
-								assignment.debugData,
-								{Identifier{assignment.debugData, newLhs[3]}},
-								std::move(assignment.value)
-							});
-							return {std::move(ret)};
-						}
-
-					rewriteIdentifierList(assignment.variableNames);
-					return std::nullopt;
-				}
-				else if (
-					holds_alternative<Identifier>(*assignment.value) ||
-					holds_alternative<Literal>(*assignment.value)
-				)
-				{
-					yulAssert(assignment.variableNames.size() == 1, "");
-					auto newRhs = expandValue(*assignment.value);
-					YulString lhsName = assignment.variableNames[0].name;
-					vector<Statement> ret;
-					for (size_t i = 0; i < 4; i++)
-						ret.emplace_back(Assignment{
-								assignment.debugData,
-								{Identifier{assignment.debugData, m_variableMapping.at(lhsName)[i]}},
-								std::move(newRhs[i])
-							}
-						);
-					return {std::move(ret)};
-				}
-				else
-					yulAssert(false, "");
-			}
-			else if (holds_alternative<Switch>(_s))
-				return handleSwitch(std::get<Switch>(_s));
-			else
-				visit(_s);
-			return std::nullopt;
-		}
-	);
-}
-
-void WordSizeTransform::run(
-	Dialect const& _inputDialect,
-	Dialect const& _targetDialect,
-	Block& _ast,
-	NameDispenser& _nameDispenser
-)
-{
-	// Free the name `or_bool`.
-	NameDisplacer{_nameDispenser, {"or_bool"_yulstring}}(_ast);
-	WordSizeTransform{_inputDialect, _targetDialect, _nameDispenser}(_ast);
-}
-
-WordSizeTransform::WordSizeTransform(
-	Dialect const& _inputDialect,
-	Dialect const& _targetDialect,
-	NameDispenser& _nameDispenser
-):
-	m_inputDialect(_inputDialect),
-	m_targetDialect(_targetDialect),
-	m_nameDispenser(_nameDispenser)
-{
-}
-
-void WordSizeTransform::rewriteVarDeclList(TypedNameList& _nameList)
-{
-	iterateReplacing(
-		_nameList,
-		[&](TypedName const& _n) -> std::optional<TypedNameList>
-		{
-			TypedNameList ret;
-			for (auto newName: generateU64IdentifierNames(_n.name))
-				ret.emplace_back(TypedName{_n.debugData, newName, m_targetDialect.defaultType});
-			return ret;
-		}
-	);
-}
-
-void WordSizeTransform::rewriteIdentifierList(vector<Identifier>& _ids)
-{
-	iterateReplacing(
-		_ids,
-		[&](Identifier const& _id) -> std::optional<vector<Identifier>>
-		{
-			vector<Identifier> ret;
-			for (auto newId: m_variableMapping.at(_id.name))
-				ret.push_back(Identifier{_id.debugData, newId});
-			return ret;
-		}
-	);
-}
-
-vector<Statement> WordSizeTransform::handleSwitchInternal(
-	shared_ptr<DebugData const> const& _debugData,
-	vector<YulString> const& _splitExpressions,
-	vector<Case> _cases,
-	YulString _runDefaultFlag,
-	size_t _depth
-)
-{
-	if (_depth == 4)
-	{
-		yulAssert(_cases.size() == 1, "");
-		return std::move(_cases.front().body.statements);
-	}
-
-	// Extract current 64 bit segment and group by it.
-	map<u256, vector<Case>> cases;
-	for (Case& c: _cases)
-	{
-		yulAssert(c.value, "Default case still present.");
-		cases[
-			(valueOfLiteral(*c.value) >> (256 - 64 * (_depth + 1)))	&
-			std::numeric_limits<uint64_t>::max()
-		].emplace_back(std::move(c));
-	}
-
-	Switch ret{
-		_debugData,
-		make_unique<Expression>(Identifier{_debugData, _splitExpressions.at(_depth)}),
-		{}
-	};
-
-	for (auto& c: cases)
-	{
-		Literal label{_debugData, LiteralKind::Number, YulString(c.first.str()), m_targetDialect.defaultType};
-		ret.cases.emplace_back(Case{
-			c.second.front().debugData,
-			make_unique<Literal>(std::move(label)),
-			Block{_debugData, handleSwitchInternal(
-				_debugData,
-				_splitExpressions,
-				std::move(c.second),
-				_runDefaultFlag,
-				_depth + 1
-			)}
-		});
-	}
-	if (!_runDefaultFlag.empty())
-		ret.cases.emplace_back(Case{
-			_debugData,
-			nullptr,
-			Block{_debugData, make_vector<Statement>(
-				Assignment{
-					_debugData,
-					{{_debugData, _runDefaultFlag}},
-					make_unique<Expression>(Literal{_debugData, LiteralKind::Boolean, "true"_yulstring, m_targetDialect.boolType})
-				}
-			)}
-		});
-	return make_vector<Statement>(std::move(ret));
-}
-
-std::vector<Statement> WordSizeTransform::handleSwitch(Switch& _switch)
-{
-	for (auto& c: _switch.cases)
-		(*this)(c.body);
-
-	// Turns the switch into a quadruply-nested switch plus
-	// a flag that tells to execute the default case after all the switches.
-	vector<Statement> ret;
-
-	YulString runDefaultFlag;
-	Case defaultCase;
-	if (!_switch.cases.back().value)
-	{
-		runDefaultFlag = m_nameDispenser.newName("run_default"_yulstring);
-		defaultCase = std::move(_switch.cases.back());
-		_switch.cases.pop_back();
-		ret.emplace_back(VariableDeclaration{
-			_switch.debugData,
-			{TypedName{_switch.debugData, runDefaultFlag, m_targetDialect.boolType}},
-			{}
-		});
-	}
-	vector<YulString> splitExpressions;
-	for (auto const& expr: expandValue(*_switch.expression))
-		splitExpressions.emplace_back(std::get<Identifier>(*expr).name);
-
-	ret += handleSwitchInternal(
-		_switch.debugData,
-		splitExpressions,
-		std::move(_switch.cases),
-		runDefaultFlag,
-		0
-	);
-	if (!runDefaultFlag.empty())
-		ret.emplace_back(If{
-			_switch.debugData,
-			make_unique<Expression>(Identifier{_switch.debugData, runDefaultFlag}),
-			std::move(defaultCase.body)
-		});
-	return ret;
-}
-
-
-array<YulString, 4> WordSizeTransform::generateU64IdentifierNames(YulString const& _s)
-{
-	yulAssert(m_variableMapping.find(_s) == m_variableMapping.end(), "");
-	for (size_t i = 0; i < 4; i++)
-		m_variableMapping[_s][i] = m_nameDispenser.newName(YulString{_s.str() + "_" + to_string(i)});
-	return m_variableMapping[_s];
-}
-
-array<unique_ptr<Expression>, 4> WordSizeTransform::expandValue(Expression const& _e)
-{
-	array<unique_ptr<Expression>, 4> ret;
-	if (holds_alternative<Identifier>(_e))
-	{
-		auto const& id = std::get<Identifier>(_e);
-		for (size_t i = 0; i < 4; i++)
-			ret[i] = make_unique<Expression>(Identifier{id.debugData, m_variableMapping.at(id.name)[i]});
-	}
-	else if (holds_alternative<Literal>(_e))
-	{
-		auto const& lit = std::get<Literal>(_e);
-		u256 val = valueOfLiteral(lit);
-		for (size_t exprIndex = 0; exprIndex < 4; ++exprIndex)
-		{
-			size_t exprIndexReverse = 3 - exprIndex;
-			u256 currentVal = val & std::numeric_limits<uint64_t>::max();
-			val >>= 64;
-			ret[exprIndexReverse] = make_unique<Expression>(
-				Literal{
-					lit.debugData,
-					LiteralKind::Number,
-					YulString(currentVal.str()),
-					m_targetDialect.defaultType
-				}
-			);
-		}
-	}
-	else
-		yulAssert(false, "Invalid expression to split.");
-	return ret;
-}
-
-vector<Expression> WordSizeTransform::expandValueToVector(Expression const& _e)
-{
-	vector<Expression> ret;
-	for (unique_ptr<Expression>& val: expandValue(_e))
-		ret.emplace_back(std::move(*val));
-	return ret;
-}
diff --git a/libyul/backends/wasm/WordSizeTransform.h b/libyul/backends/wasm/WordSizeTransform.h
deleted file mode 100644
index faa7806a56..0000000000
--- a/libyul/backends/wasm/WordSizeTransform.h
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-	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
-/**
- * Replace every u256 variable with four u64 variables.
- */
-
-#pragma once
-
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/NameDispenser.h>
-
-#include <liblangutil/SourceLocation.h>
-
-#include <array>
-#include <vector>
-
-namespace solidity::yul
-{
-
-/**
- * A stage that replace every u256 variable with four u64 variables.
- * This transformation stage is required because values in EVM are 256 bits,
- * but wasm only supports values up to 64 bits, so we use four u64 values to simulate
- * one u256 value.
- *
- * For FunctionCall that accepts or returns u256 values, they accepts or returns
- * four times the number of values after this transformation, with the order of significance,
- * from the most significant to the least significant.
- *
- * For example, the FunctionCall MUL supplied by code generator
- * should take 8 arguments and return 4 values (instead of 2 and 1) after this transformation.
- *
- * mul(a1, a2, a3, a4, b1, b2, b3, b4) -> c1, c2, c3, c4
- *
- * the value of c4 should be
- *	((a1*(2^192) + a2*(2^128) + a3(2^64) + a4) * (b1*(2^192) + b2*(2^128) + b3(2^64) + b4)) & ((1<<64)-1)
- *
- * The resulting code still uses the EVM builtin functions but assumes that they
- * take four times the parameters and each of type u64.
- * In addition, it uses a single other builtin function called `or_bool` that
- * takes four u64 parameters and is supposed to return the logical disjunction
- * of them as a i32 value. If this name is already used somewhere, it is renamed.
- *
- * Prerequisite: Disambiguator, ForLoopConditionIntoBody, ExpressionSplitter
- */
-class WordSizeTransform: public ASTModifier
-{
-public:
-	void operator()(FunctionDefinition&) override;
-	void operator()(FunctionCall&) override;
-	void operator()(If&) override;
-	void operator()(Switch&) override;
-	void operator()(ForLoop&) override;
-	void operator()(Block& _block) override;
-
-	static void run(
-		Dialect const& _inputDialect,
-		Dialect const& _targetDialect,
-		Block& _ast,
-		NameDispenser& _nameDispenser
-	);
-
-private:
-	explicit WordSizeTransform(
-		Dialect const& _inputDialect,
-		Dialect const& _targetDialect,
-		NameDispenser& _nameDispenser
-	);
-
-	void rewriteVarDeclList(std::vector<TypedName>&);
-	void rewriteIdentifierList(std::vector<Identifier>&);
-
-	std::vector<Statement> handleSwitch(Switch& _switch);
-	std::vector<Statement> handleSwitchInternal(
-		std::shared_ptr<DebugData const> const& _debugData,
-		std::vector<YulString> const& _splitExpressions,
-		std::vector<Case> _cases,
-		YulString _runDefaultFlag,
-		size_t _depth
-	);
-
-	std::array<YulString, 4> generateU64IdentifierNames(YulString const& _s);
-	std::array<std::unique_ptr<Expression>, 4> expandValue(Expression const& _e);
-	std::vector<Expression> expandValueToVector(Expression const& _e);
-
-	Dialect const& m_inputDialect;
-	Dialect const& m_targetDialect;
-	NameDispenser& m_nameDispenser;
-	/// maps original u256 variable's name to corresponding u64 variables' names
-	std::map<YulString, std::array<YulString, 4>> m_variableMapping;
-};
-
-}
diff --git a/libyul/backends/wasm/polyfill/Arithmetic.yul b/libyul/backends/wasm/polyfill/Arithmetic.yul
deleted file mode 100644
index 7a4a80f5f1..0000000000
--- a/libyul/backends/wasm/polyfill/Arithmetic.yul
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
-	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
-
-// NOTE: This file is used to generate `ewasmPolyfills/Arithmetic.h`.
-
-// returns a + y + c plus carry value on 64 bit values.
-// c should be at most 1
-function add_carry(x, y, c) -> r, r_c {
-	let t := i64.add(x, y)
-	r := i64.add(t, c)
-	r_c := i64.extend_i32_u(i32.or(
-		i64.lt_u(t, x),
-		i64.lt_u(r, t)
-	))
-}
-
-function add(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	let carry
-	r4, carry := add_carry(x4, y4, 0)
-	r3, carry := add_carry(x3, y3, carry)
-	r2, carry := add_carry(x2, y2, carry)
-	r1, carry := add_carry(x1, y1, carry)
-}
-
-function sub(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	// x - y = x + (~y + 1)
-	let carry
-	r4, carry := add_carry(x4, bit_negate(y4), 1)
-	r3, carry := add_carry(x3, bit_negate(y3), carry)
-	r2, carry := add_carry(x2, bit_negate(y2), carry)
-	r1, carry := add_carry(x1, bit_negate(y1), carry)
-}
-
-function sub320(x1, x2, x3, x4, x5, y1, y2, y3, y4, y5) -> r1, r2, r3, r4, r5 {
-	// x - y = x + (~y + 1)
-	let carry
-	r5, carry := add_carry(x5, bit_negate(y5), 1)
-	r4, carry := add_carry(x4, bit_negate(y4), carry)
-	r3, carry := add_carry(x3, bit_negate(y3), carry)
-	r2, carry := add_carry(x2, bit_negate(y2), carry)
-	r1, carry := add_carry(x1, bit_negate(y1), carry)
-}
-
-function sub512(x1, x2, x3, x4, x5, x6, x7, x8, y1, y2, y3, y4, y5, y6, y7, y8) -> r1, r2, r3, r4, r5, r6, r7, r8 {
-	// x - y = x + (~y + 1)
-	let carry
-	r8, carry := add_carry(x8, bit_negate(y8), 1)
-	r7, carry := add_carry(x7, bit_negate(y7), carry)
-	r6, carry := add_carry(x6, bit_negate(y6), carry)
-	r5, carry := add_carry(x5, bit_negate(y5), carry)
-	r4, carry := add_carry(x4, bit_negate(y4), carry)
-	r3, carry := add_carry(x3, bit_negate(y3), carry)
-	r2, carry := add_carry(x2, bit_negate(y2), carry)
-	r1, carry := add_carry(x1, bit_negate(y1), carry)
-}
-
-// Multiplies two 64 bit values resulting in a 128 bit
-// value split into two 64 bit values.
-function mul_64x64_128(x, y) -> hi, lo {
-	let xh, xl := split(x)
-	let yh, yl := split(y)
-	let t0 := i64.mul(xl, yl)
-	let t1 := i64.mul(xh, yl)
-	let t2 := i64.mul(xl, yh)
-	let t3 := i64.mul(xh, yh)
-	let t0h, t0l := split(t0)
-	let u1 := i64.add(t1, t0h)
-	let u1h, u1l := split(u1)
-	let u2 := i64.add(t2, u1l)
-	lo := i64.or(i64.shl(u2, 32), t0l)
-	hi := i64.add(t3, i64.add(i64.shr_u(u2, 32), u1h))
-}
-
-// Multiplies two 128 bit values resulting in a 256 bit
-// value split into four 64 bit values.
-function mul_128x128_256(x1, x2, y1, y2) -> r1, r2, r3, r4 {
-	let ah, al := mul_64x64_128(x1, y1)
-	let bh, bl := mul_64x64_128(x1, y2)
-	let ch, cl := mul_64x64_128(x2, y1)
-	let dh, dl := mul_64x64_128(x2, y2)
-	r4 := dl
-	let carry1, carry2
-	let t1, t2
-	r3, carry1 := add_carry(bl, cl, 0)
-	r3, carry2 := add_carry(r3, dh, 0)
-	t1, carry1 := add_carry(bh, ch, carry1)
-	r2, carry2 := add_carry(t1, al, carry2)
-	r1 := i64.add(i64.add(ah, carry1), carry2)
-}
-
-// Multiplies two 256 bit values resulting in a 512 bit
-// value split into eight 64 bit values.
-function mul_256x256_512(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4, r5, r6, r7, r8 {
-	let a1, a2, a3, a4 := mul_128x128_256(x1, x2, y1, y2)
-	let b1, b2, b3, b4 := mul_128x128_256(x1, x2, y3, y4)
-	let c1, c2, c3, c4 := mul_128x128_256(x3, x4, y1, y2)
-	let d1, d2, d3, d4 := mul_128x128_256(x3, x4, y3, y4)
-	r8 := d4
-	r7 := d3
-	let carry1, carry2
-	let t1, t2
-	r6, carry1 := add_carry(b4, c4, 0)
-	r6, carry2 := add_carry(r6, d2, 0)
-	r5, carry1 := add_carry(b3, c3, carry1)
-	r5, carry2 := add_carry(r5, d1, carry2)
-	r4, carry1 := add_carry(a4, b2, carry1)
-	r4, carry2 := add_carry(r4, c2, carry2)
-	r3, carry1 := add_carry(a3, b1, carry1)
-	r3, carry2 := add_carry(r3, c1, carry2)
-	r2, carry1 := add_carry(a2, carry1, carry2)
-	r1 := i64.add(a1, carry1)
-}
-
-function mul(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	// TODO it would actually suffice to have mul_128x128_128 for the first two.
-	let b1, b2, b3, b4 := mul_128x128_256(x3, x4, y1, y2)
-	let c1, c2, c3, c4 := mul_128x128_256(x1, x2, y3, y4)
-	let d1, d2, d3, d4 := mul_128x128_256(x3, x4, y3, y4)
-	r4 := d4
-	r3 := d3
-	let t1, t2
-	t1, t2, r1, r2 := add(0, 0, b3, b4, 0, 0, c3, c4)
-	t1, t2, r1, r2 := add(0, 0, r1, r2, 0, 0, d1, d2)
-}
-
-function div(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	// Based on https://github.com/ewasm/evm2wasm/blob/master/wasm/DIV.wast
-	if iszero256(y1, y2, y3, y4) {
-		leave
-	}
-
-	let m1 := 0
-	let m2 := 0
-	let m3 := 0
-	let m4 := 1
-
-	for {} true {} {
-		if i32.or(i64.eqz(i64.clz(y1)), gte_256x256_64(y1, y2, y3, y4, x1, x2, x3, x4)) {
-			break
-		}
-		y1, y2, y3, y4 := shl_internal(1, y1, y2, y3, y4)
-		m1, m2, m3, m4 := shl_internal(1, m1, m2, m3, m4)
-	}
-
-	for {} or_bool(m1, m2, m3, m4) {} {
-		if gte_256x256_64(x1, x2, x3, x4, y1, y2, y3, y4) {
-			x1, x2, x3, x4 := sub(x1, x2, x3, x4, y1, y2, y3, y4)
-			r1, r2, r3, r4 := add(r1, r2, r3, r4, m1, m2, m3, m4)
-		}
-		y1, y2, y3, y4 := shr_internal(1, y1, y2, y3, y4)
-		m1, m2, m3, m4 := shr_internal(1, m1, m2, m3, m4)
-	}
-}
-
-function sdiv(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	// Based on https://github.com/ewasm/evm2wasm/blob/master/wasm/SDIV.wast
-
-	let sign:i32 := i32.wrap_i64(i64.shr_u(i64.xor(x1, y1), 63))
-
-	if i64.eqz(i64.clz(x1)) {
-		x1, x2, x3, x4 := xor(
-			x1, x2, x3, x4,
-			0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff
-		)
-		x1, x2, x3, x4 := add(x1, x2, x3, x4, 0, 0, 0, 1)
-	}
-
-	if i64.eqz(i64.clz(y1)) {
-		y1, y2, y3, y4 := xor(
-			y1, y2, y3, y4,
-			0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff
-		)
-		y1, y2, y3, y4 := add(y1, y2, y3, y4, 0, 0, 0, 1)
-	}
-
-	r1, r2, r3, r4 := div(x1, x2, x3, x4, y1, y2, y3, y4)
-
-	if sign {
-		r1, r2, r3, r4 := xor(
-			r1, r2, r3, r4,
-			0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff
-		)
-		r1, r2, r3, r4 := add(r1, r2, r3, r4, 0, 0, 0, 1)
-	}
-}
-
-function mod(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
- 	// Based on https://github.com/ewasm/evm2wasm/blob/master/wasm/MOD.wast
-	if iszero256(y1, y2, y3, y4) {
-		leave
-	}
-
-	r1 := x1
-	r2 := x2
-	r3 := x3
-	r4 := x4
-
-	let m1 := 0
-	let m2 := 0
-	let m3 := 0
-	let m4 := 1
-
-	for {} true {} {
-		if i32.or(i64.eqz(i64.clz(y1)), gte_256x256_64(y1, y2, y3, y4, r1, r2, r3, r4)) {
-			break
-		}
-
-		y1, y2, y3, y4 := shl_internal(1, y1, y2, y3, y4)
-		m1, m2, m3, m4 := shl_internal(1, m1, m2, m3, m4)
-	}
-
-	for {} or_bool(m1, m2, m3, m4) {} {
-		if gte_256x256_64(r1, r2, r3, r4, y1, y2, y3, y4) {
-			r1, r2, r3, r4 := sub(r1, r2, r3, r4, y1, y2, y3, y4)
-		}
-
-		y1, y2, y3, y4 := shr_internal(1, y1, y2, y3, y4)
-		m1, m2, m3, m4 := shr_internal(1, m1, m2, m3, m4)
-	}
-}
-
-function mod320(x1, x2, x3, x4, x5, y1, y2, y3, y4, y5) -> r1, r2, r3, r4, r5 {
-	// Based on https://github.com/ewasm/evm2wasm/blob/master/wasm/mod_320.wast
-	if iszero320(y1, y2, y3, y4, y5) {
-		leave
-	}
-
-	let m1 := 0
-	let m2 := 0
-	let m3 := 0
-	let m4 := 0
-	let m5 := 1
-
-	r1 := x1
-	r2 := x2
-	r3 := x3
-	r4 := x4
-	r5 := x5
-
-	for {} true {} {
-		if i32.or(i64.eqz(i64.clz(y1)), gte_320x320_64(y1, y2, y3, y4, y5, r1, r2, r3, r4, r5)) {
-			break
-		}
-		y1, y2, y3, y4, y5 := shl320_internal(1, y1, y2, y3, y4, y5)
-		m1, m2, m3, m4, m5 := shl320_internal(1, m1, m2, m3, m4, m5)
-	}
-
-	for {} or_bool_320(m1, m2, m3, m4, m5) {} {
-		if gte_320x320_64(r1, r2, r3, r4, r5, y1, y2, y3, y4, y5) {
-			r1, r2, r3, r4, r5 := sub320(r1, r2, r3, r4, r5, y1, y2, y3, y4, y5)
-		}
-
-		y1, y2, y3, y4, y5 := shr320_internal(1, y1, y2, y3, y4, y5)
-		m1, m2, m3, m4, m5 := shr320_internal(1, m1, m2, m3, m4, m5)
-	}
-}
-
-function mod512(x1, x2, x3, x4, x5, x6, x7, x8, y1, y2, y3, y4, y5, y6, y7, y8) -> r1, r2, r3, r4, r5, r6, r7, r8 {
-	// Based on https://github.com/ewasm/evm2wasm/blob/master/wasm/mod_512.wast
-	if iszero512(y1, y2, y3, y4, y5, y6, y7, y8) {
-		leave
-	}
-
-	let m1 := 0
-	let m2 := 0
-	let m3 := 0
-	let m4 := 0
-	let m5 := 0
-	let m6 := 0
-	let m7 := 0
-	let m8 := 1
-
-	r1 := x1
-	r2 := x2
-	r3 := x3
-	r4 := x4
-	r5 := x5
-	r6 := x6
-	r7 := x7
-	r8 := x8
-
-	for {} true {} {
-		if i32.or(
-				i64.eqz(i64.clz(y1)),
-				gte_512x512_64(y1, y2, y3, y4, y5, y6, y7, y8, r1, r2, r3, r4, r5, r6, r7, r8)
-			)
-		{
-			break
-		}
-		y1, y2, y3, y4, y5, y6, y7, y8 := shl512_internal(1, y1, y2, y3, y4, y5, y6, y7, y8)
-		m1, m2, m3, m4, m5, m6, m7, m8 := shl512_internal(1, m1, m2, m3, m4, m5, m6, m7, m8)
-	}
-
-	for {} or_bool_512(m1, m2, m3, m4, m5, m6, m7, m8) {} {
-		if gte_512x512_64(r1, r2, r3, r4, r5, r6, r7, r8, y1, y2, y3, y4, y5, y6, y7, y8) {
-			r1, r2, r3, r4, r5, r6, r7, r8 := sub512(r1, r2, r3, r4, r5, r6, r7, r8, y1, y2, y3, y4, y5, y6, y7, y8)
-		}
-
-		y1, y2, y3, y4, y5, y6, y7, y8 := shr512_internal(1, y1, y2, y3, y4, y5, y6, y7, y8)
-		m1, m2, m3, m4, m5, m6, m7, m8 := shr512_internal(1, m1, m2, m3, m4, m5, m6, m7, m8)
-	}
-}
-
-function smod(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	// Based on https://github.com/ewasm/evm2wasm/blob/master/wasm/SMOD.wast
-	let m1 := 0
-	let m2 := 0
-	let m3 := 0
-	let m4 := 1
-
-	let sign:i32 := i32.wrap_i64(i64.shr_u(x1, 63))
-
-	if i64.eqz(i64.clz(x1)) {
-		x1, x2, x3, x4 := xor(
-			x1, x2, x3, x4,
-			0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff
-		)
-		x1, x2, x3, x4 := add(x1, x2, x3, x4, 0, 0, 0, 1)
-	}
-
-	if i64.eqz(i64.clz(y1)) {
-		y1, y2, y3, y4 := xor(
-			y1, y2, y3, y4,
-			0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff
-		)
-		y1, y2, y3, y4 := add(y1, y2, y3, y4, 0, 0, 0, 1)
-	}
-
-	r1, r2, r3, r4 := mod(x1, x2, x3, x4, y1, y2, y3, y4)
-
-	if sign {
-		r1, r2, r3, r4 := xor(
-			r1, r2, r3, r4,
-			0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff
-		)
-		r1, r2, r3, r4 := add(r1, r2, r3, r4, 0, 0, 0, 1)
-	}
-}
-
-function exp(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	r4 := 1
-	for {} or_bool(y1, y2, y3, y4) {} {
-		if i32.wrap_i64(i64.and(y4, 1)) {
-			r1, r2, r3, r4 := mul(r1, r2, r3, r4, x1, x2, x3, x4)
-		}
-		x1, x2, x3, x4 := mul(x1, x2, x3, x4, x1, x2, x3, x4)
-		y1, y2, y3, y4 := shr_internal(1, y1, y2, y3, y4)
-	}
-}
-
-function addmod(x1, x2, x3, x4, y1, y2, y3, y4, m1, m2, m3, m4) -> z1, z2, z3, z4 {
-	let carry
-	z4, carry := add_carry(x4, y4, 0)
-	z3, carry := add_carry(x3, y3, carry)
-	z2, carry := add_carry(x2, y2, carry)
-	z1, carry := add_carry(x1, y1, carry)
-
-	let z0
-	z0, z1, z2, z3, z4 := mod320(carry, z1, z2, z3, z4, 0, m1, m2, m3, m4)
-}
-
-function mulmod(x1, x2, x3, x4, y1, y2, y3, y4, m1, m2, m3, m4) -> z1, z2, z3, z4 {
-	let r1, r2, r3, r4, r5, r6, r7, r8 := mul_256x256_512(x1, x2, x3, x4, y1, y2, y3, y4)
-	let t1
-	let t2
-	let t3
-	let t4
-	t1, t2, t3, t4, z1, z2, z3, z4 := mod512(r1, r2, r3, r4, r5, r6, r7, r8, 0, 0, 0, 0, m1, m2, m3, m4)
-}
-
-function signextend(x1, x2, x3, x4, y1, y2, y3, y4) -> z1, z2, z3, z4 {
-	z1 := y1
-	z2 := y2
-	z3 := y3
-	z4 := y4
-	if lt_256x256_64(x1, x2, x3, x4, 0, 0, 0, 32) {
-		let d := i64.mul(i64.sub(31, x4), 8)
-		z1, z2, z3, z4 := shl(0, 0, 0, d, z1, z2, z3, z4)
-		z1, z2, z3, z4 := sar(0, 0, 0, d, z1, z2, z3, z4)
-	}
-}
diff --git a/libyul/backends/wasm/polyfill/Bitwise.yul b/libyul/backends/wasm/polyfill/Bitwise.yul
deleted file mode 100644
index 3efa07bf50..0000000000
--- a/libyul/backends/wasm/polyfill/Bitwise.yul
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-	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
-
-// NOTE: This file is used to generate `ewasmPolyfills/Bitwise.h`.
-
-function bit_negate(x) -> y {
-	y := i64.xor(x, 0xffffffffffffffff)
-}
-
-function split(x) -> hi, lo {
-	hi := i64.shr_u(x, 32)
-	lo := i64.and(x, 0xffffffff)
-}
-
-function shl_internal(amount, x1, x2, x3, x4) -> r1, r2, r3, r4 {
-	// amount < 64
-	r1 := i64.add(i64.shl(x1, amount), i64.shr_u(x2, i64.sub(64, amount)))
-	r2 := i64.add(i64.shl(x2, amount), i64.shr_u(x3, i64.sub(64, amount)))
-	r3 := i64.add(i64.shl(x3, amount), i64.shr_u(x4, i64.sub(64, amount)))
-	r4 := i64.shl(x4, amount)
-}
-
-function shr_internal(amount, x1, x2, x3, x4) -> r1, r2, r3, r4 {
-	// amount < 64
-	r4 := i64.add(i64.shr_u(x4, amount), i64.shl(x3, i64.sub(64, amount)))
-	r3 := i64.add(i64.shr_u(x3, amount), i64.shl(x2, i64.sub(64, amount)))
-	r2 := i64.add(i64.shr_u(x2, amount), i64.shl(x1, i64.sub(64, amount)))
-	r1 := i64.shr_u(x1, amount)
-}
-
-function shl320_internal(amount, x1, x2, x3, x4, x5) -> r1, r2, r3, r4, r5 {
-	// amount < 64
-	r1 := i64.add(i64.shl(x1, amount), i64.shr_u(x2, i64.sub(64, amount)))
-	r2 := i64.add(i64.shl(x2, amount), i64.shr_u(x3, i64.sub(64, amount)))
-	r3 := i64.add(i64.shl(x3, amount), i64.shr_u(x4, i64.sub(64, amount)))
-	r4 := i64.add(i64.shl(x4, amount), i64.shr_u(x5, i64.sub(64, amount)))
-	r5 := i64.shl(x5, 1)
-}
-
-function shr320_internal(amount, x1, x2, x3, x4, x5) -> r1, r2, r3, r4, r5 {
-	// amount < 64
-	r5 := i64.add(i64.shr_u(x5, amount), i64.shl(x4, i64.sub(64, amount)))
-	r4 := i64.add(i64.shr_u(x4, amount), i64.shl(x3, i64.sub(64, amount)))
-	r3 := i64.add(i64.shr_u(x3, amount), i64.shl(x2, i64.sub(64, amount)))
-	r2 := i64.add(i64.shr_u(x2, amount), i64.shl(x1, i64.sub(64, amount)))
-	r1 := i64.shr_u(x1, 1)
-}
-
-function shl512_internal(amount, x1, x2, x3, x4, x5, x6, x7, x8) -> r1, r2, r3, r4, r5, r6, r7, r8 {
-	// amount < 64
-	r1 := i64.add(i64.shl(x1, amount), i64.shr_u(x2, i64.sub(64, amount)))
-	r2 := i64.add(i64.shl(x2, amount), i64.shr_u(x3, i64.sub(64, amount)))
-	r3 := i64.add(i64.shl(x3, amount), i64.shr_u(x4, i64.sub(64, amount)))
-	r4 := i64.add(i64.shl(x4, amount), i64.shr_u(x5, i64.sub(64, amount)))
-	r5 := i64.add(i64.shl(x5, amount), i64.shr_u(x6, i64.sub(64, amount)))
-	r6 := i64.add(i64.shl(x6, amount), i64.shr_u(x7, i64.sub(64, amount)))
-	r7 := i64.add(i64.shl(x7, amount), i64.shr_u(x8, i64.sub(64, amount)))
-	r8 := i64.shl(x8, amount)
-}
-
-function shr512_internal(amount, x1, x2, x3, x4, x5, x6, x7, x8) -> r1, r2, r3, r4, r5, r6, r7, r8 {
-	// amount < 64
-	r8 := i64.add(i64.shr_u(x8, amount), i64.shl(x7, i64.sub(64, amount)))
-	r7 := i64.add(i64.shr_u(x7, amount), i64.shl(x6, i64.sub(64, amount)))
-	r6 := i64.add(i64.shr_u(x6, amount), i64.shl(x5, i64.sub(64, amount)))
-	r5 := i64.add(i64.shr_u(x5, amount), i64.shl(x4, i64.sub(64, amount)))
-	r4 := i64.add(i64.shr_u(x4, amount), i64.shl(x3, i64.sub(64, amount)))
-	r3 := i64.add(i64.shr_u(x3, amount), i64.shl(x2, i64.sub(64, amount)))
-	r2 := i64.add(i64.shr_u(x2, amount), i64.shl(x1, i64.sub(64, amount)))
-	r1 := i64.shr_u(x1, amount)
-}
-
-function byte(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	if i64.eqz(i64.or(i64.or(x1, x2), x3)) {
-		let component
-		switch i64.div_u(x4, 8)
-		case 0 { component := y1 }
-		case 1 { component := y2 }
-		case 2 { component := y3 }
-		case 3 { component := y4 }
-		x4 := i64.mul(i64.rem_u(x4, 8), 8)
-		r4 := i64.shr_u(component, i64.sub(56, x4))
-		r4 := i64.and(0xff, r4)
-	}
-}
-
-function xor(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	r1 := i64.xor(x1, y1)
-	r2 := i64.xor(x2, y2)
-	r3 := i64.xor(x3, y3)
-	r4 := i64.xor(x4, y4)
-}
-
-function or(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	r1 := i64.or(x1, y1)
-	r2 := i64.or(x2, y2)
-	r3 := i64.or(x3, y3)
-	r4 := i64.or(x4, y4)
-}
-
-function and(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	r1 := i64.and(x1, y1)
-	r2 := i64.and(x2, y2)
-	r3 := i64.and(x3, y3)
-	r4 := i64.and(x4, y4)
-}
-
-function not(x1, x2, x3, x4) -> r1, r2, r3, r4 {
-	let mask := 0xffffffffffffffff
-	r1, r2, r3, r4 := xor(x1, x2, x3, x4, mask, mask, mask, mask)
-}
-
-function shl_single(a, amount) -> x, y {
-	// amount < 64
-	x := i64.shr_u(a, i64.sub(64, amount))
-	y := i64.shl(a, amount)
-}
-
-function shl(x1, x2, x3, x4, y1, y2, y3, y4) -> z1, z2, z3, z4 {
-	if i32.and(i64.eqz(x1), i64.eqz(x2)) {
-		if i64.eqz(x3) {
-			if i64.lt_u(x4, 256) {
-				if i64.ge_u(x4, 128) {
-					y1 := y3
-					y2 := y4
-					y3 := 0
-					y4 := 0
-					x4 := i64.sub(x4, 128)
-				}
-				if i64.ge_u(x4, 64) {
-					y1 := y2
-					y2 := y3
-					y3 := y4
-					y4 := 0
-					x4 := i64.sub(x4, 64)
-				}
-				let t, r
-				t, z4 := shl_single(y4, x4)
-				r, z3 := shl_single(y3, x4)
-				z3 := i64.or(z3, t)
-				t, z2 := shl_single(y2, x4)
-				z2 := i64.or(z2, r)
-				r, z1 := shl_single(y1, x4)
-				z1 := i64.or(z1, t)
-			}
-		}
-	}
-}
-
-function shr_single(a, amount) -> x, y {
-	// amount < 64
-	y := i64.shl(a, i64.sub(64, amount))
-	x := i64.shr_u(a, amount)
-}
-
-function shr(x1, x2, x3, x4, y1, y2, y3, y4) -> z1, z2, z3, z4 {
-	if i32.and(i64.eqz(x1), i64.eqz(x2)) {
-		if i64.eqz(x3) {
-			if i64.lt_u(x4, 256) {
-				if i64.ge_u(x4, 128) {
-					y4 := y2
-					y3 := y1
-					y2 := 0
-					y1 := 0
-					x4 := i64.sub(x4, 128)
-				}
-				if i64.ge_u(x4, 64) {
-					y4 := y3
-					y3 := y2
-					y2 := y1
-					y1 := 0
-					x4 := i64.sub(x4, 64)
-				}
-				let t
-				z4, t := shr_single(y4, x4)
-				z3, t := shr_single(y3, x4)
-				z4 := i64.or(z4, t)
-				z2, t := shr_single(y2, x4)
-				z3 := i64.or(z3, t)
-				z1, t := shr_single(y1, x4)
-				z2 := i64.or(z2, t)
-			}
-		}
-	}
-}
-
-function sar(x1, x2, x3, x4, y1, y2, y3, y4) -> z1, z2, z3, z4 {
-	if i64.gt_u(i64.clz(y1), 0) {
-		z1, z2, z3, z4 := shr(x1, x2, x3, x4, y1, y2, y3, y4)
-		leave
-	}
-
-	if gte_256x256_64(x1, x2, x3, x4, 0, 0, 0, 256) {
-		z1 := 0xffffffffffffffff
-		z2 := 0xffffffffffffffff
-		z3 := 0xffffffffffffffff
-		z4 := 0xffffffffffffffff
-	}
-	if lt_256x256_64(x1, x2, x3, x4, 0, 0, 0, 256) {
-		y1, y2, y3, y4 := shr(0, 0, 0, x4, y1, y2, y3, y4)
-		z1, z2, z3, z4 := shl(
-			0, 0, 0, i64.sub(256, x4),
-			0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff, 0xffffffffffffffff
-		)
-		z1, z2, z3, z4 := or(y1, y2, y3, y4, z1, z2, z3, z4)
-	}
-}
diff --git a/libyul/backends/wasm/polyfill/Comparison.yul b/libyul/backends/wasm/polyfill/Comparison.yul
deleted file mode 100644
index dc052a1459..0000000000
--- a/libyul/backends/wasm/polyfill/Comparison.yul
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-	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
-
-// NOTE: This file is used to generate `ewasmPolyfills/Comparison.h`.
-
-function iszero(x1, x2, x3, x4) -> r1, r2, r3, r4 {
-	r4 := i64.extend_i32_u(iszero256(x1, x2, x3, x4))
-}
-
-function iszero256(x1, x2, x3, x4) -> r:i32 {
-	r := i64.eqz(i64.or(i64.or(x1, x2), i64.or(x3, x4)))
-}
-
-function iszero320(x1, x2, x3, x4, x5) -> r:i32 {
-	r := i64.eqz(i64.or(i64.or(i64.or(x1, x2), i64.or(x3, x4)), x5))
-}
-
-function iszero512(x1, x2, x3, x4, x5, x6, x7, x8) -> r:i32 {
-	r := i32.and(iszero256(x1, x2, x3, x4), iszero256(x5, x6, x7, x8))
-}
-
-function eq(x1, x2, x3, x4, y1, y2, y3, y4) -> r1, r2, r3, r4 {
-	r4 := i64.extend_i32_u(
-		i32.and(
-			i64.eq(x1, y1),
-			i32.and(
-				i64.eq(x2, y2),
-				i32.and(
-					i64.eq(x3, y3),
-					i64.eq(x4, y4)
-				)
-			)
-		)
-	)
-}
-
-// returns 0 if a == b, -1 if a < b and 1 if a > b
-function cmp(a, b) -> r:i32 {
-	r := i32.select(0xffffffff:i32, i64.ne(a, b), i64.lt_u(a, b))
-}
-
-function lt_320x320_64(x1, x2, x3, x4, x5, y1, y2, y3, y4, y5) -> z:i32 {
-	switch cmp(x1, y1)
-	case 0:i32 {
-		switch cmp(x2, y2)
-		case 0:i32 {
-			switch cmp(x3, y3)
-			case 0:i32 {
-				switch cmp(x4, y4)
-				case 0:i32 {
-					z := i64.lt_u(x5, y5)
-				}
-				case 1:i32 { z := 0:i32 }
-				default { z := 1:i32 }
-			}
-			case 1:i32 { z := 0:i32 }
-			default { z := 1:i32 }
-		}
-		case 1:i32 { z := 0:i32 }
-		default { z := 1:i32 }
-	}
-	case 1:i32 { z := 0:i32 }
-	default { z := 1:i32 }
-}
-
-function lt_512x512_64(x1, x2, x3, x4, x5, x6, x7, x8, y1, y2, y3, y4, y5, y6, y7, y8) -> z:i32 {
-	switch cmp(x1, y1)
-	case 0:i32 {
-		switch cmp(x2, y2)
-		case 0:i32 {
-			switch cmp(x3, y3)
-			case 0:i32 {
-				switch cmp(x4, y4)
-				case 0:i32 {
-					switch cmp(x5, y5)
-					case 0:i32 {
-						switch cmp(x6, y6)
-						case 0:i32 {
-							switch cmp(x7, y7)
-							case 0:i32 {
-								z := i64.lt_u(x8, y8)
-							}
-							case 1:i32 { z := 0:i32 }
-							default { z := 1:i32 }
-						}
-						case 1:i32 { z := 0:i32 }
-						default { z := 1:i32 }
-					}
-					case 1:i32 { z := 0:i32 }
-					default { z := 1:i32 }
-				}
-				case 1:i32 { z := 0:i32 }
-				default { z := 1:i32 }
-			}
-			case 1:i32 { z := 0:i32 }
-			default { z := 1:i32 }
-		}
-		case 1:i32 { z := 0:i32 }
-		default { z := 1:i32 }
-	}
-	case 1:i32 { z := 0:i32 }
-	default { z := 1:i32 }
-}
-
-function lt_256x256_64(x1, x2, x3, x4, y1, y2, y3, y4) -> z:i32 {
-	switch cmp(x1, y1)
-	case 0:i32 {
-		switch cmp(x2, y2)
-		case 0:i32 {
-			switch cmp(x3, y3)
-			case 0:i32 {
-				z := i64.lt_u(x4, y4)
-			}
-			case 1:i32 { z := 0:i32 }
-			default { z := 1:i32 }
-		}
-		case 1:i32 { z := 0:i32 }
-		default { z := 1:i32 }
-	}
-	case 1:i32 { z := 0:i32 }
-	default { z := 1:i32 }
-}
-
-function lt(x1, x2, x3, x4, y1, y2, y3, y4) -> z1, z2, z3, z4 {
-	z4 := i64.extend_i32_u(lt_256x256_64(x1, x2, x3, x4, y1, y2, y3, y4))
-}
-
-function gte_256x256_64(x1, x2, x3, x4, y1, y2, y3, y4) -> z:i32 {
-	z := i32.eqz(lt_256x256_64(x1, x2, x3, x4, y1, y2, y3, y4))
-}
-
-function gte_320x320_64(x1, x2, x3, x4, x5, y1, y2, y3, y4, y5) -> z:i32 {
-	z := i32.eqz(lt_320x320_64(x1, x2, x3, x4, x5, y1, y2, y3, y4, y5))
-}
-
-function gte_512x512_64(x1, x2, x3, x4, x5, x6, x7, x8, y1, y2, y3, y4, y5, y6, y7, y8) -> z:i32 {
-	z := i32.eqz(lt_512x512_64(x1, x2, x3, x4, x5, x6, x7, x8, y1, y2, y3, y4, y5, y6, y7, y8))
-}
-
-function gt(x1, x2, x3, x4, y1, y2, y3, y4) -> z1, z2, z3, z4 {
-	z1, z2, z3, z4 := lt(y1, y2, y3, y4, x1, x2, x3, x4)
-}
-
-function slt(x1, x2, x3, x4, y1, y2, y3, y4) -> z1, z2, z3, z4 {
-	// TODO correct?
-	x1 := i64.add(x1, 0x8000000000000000)
-	y1 := i64.add(y1, 0x8000000000000000)
-	z1, z2, z3, z4 := lt(x1, x2, x3, x4, y1, y2, y3, y4)
-}
-
-function sgt(x1, x2, x3, x4, y1, y2, y3, y4) -> z1, z2, z3, z4 {
-	z1, z2, z3, z4 := slt(y1, y2, y3, y4, x1, x2, x3, x4)
-}
diff --git a/libyul/backends/wasm/polyfill/Conversion.yul b/libyul/backends/wasm/polyfill/Conversion.yul
deleted file mode 100644
index 17d205ddd5..0000000000
--- a/libyul/backends/wasm/polyfill/Conversion.yul
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-	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
-
-// NOTE: This file is used to generate `ewasmPolyfills/Conversion.h`.
-
-function u256_to_u128(x1, x2, x3, x4) -> v1, v2 {
-	if i64.ne(0, i64.or(x1, x2)) { invalid() }
-	v2 := x4
-	v1 := x3
-}
-
-function u256_to_i64(x1, x2, x3, x4) -> v {
-	if i64.ne(0, i64.or(i64.or(x1, x2), x3)) { invalid() }
-	v := x4
-}
-
-function u256_to_i32(x1, x2, x3, x4) -> v:i32 {
-	if i64.ne(0, i64.or(i64.or(x1, x2), x3)) { invalid() }
-	if i64.ne(0, i64.shr_u(x4, 32)) { invalid() }
-	v := i32.wrap_i64(x4)
-}
-
-function u256_to_byte(x1, x2, x3, x4) -> v {
-	if i64.ne(0, i64.or(i64.or(x1, x2), x3)) { invalid() }
-	if i64.gt_u(x4, 255) { invalid() }
-	v := x4
-}
-
-function u256_to_i32ptr(x1, x2, x3, x4) -> v:i32 {
-	v := u256_to_i32(x1, x2, x3, x4)
-}
-
-function to_internal_i32ptr(x1, x2, x3, x4) -> r:i32 {
-	let p:i32 := u256_to_i32ptr(x1, x2, x3, x4)
-	r := i32.add(p, 64:i32)
-	if i32.lt_u(r, p) { invalid() }
-}
-
-function u256_to_address(x1, x2, x3, x4) -> r1, r2, r3 {
-	if i64.ne(0, x1) { invalid() }
-	if i64.ne(0, i64.shr_u(x2, 32)) { invalid() }
-	r1 := x2
-	r2 := x3
-	r3 := x4
-}
-
-function bswap16(x:i32) -> y:i32 {
-	let hi:i32 := i32.and(i32.shl(x, 8:i32), 0xff00:i32)
-	let lo:i32 := i32.and(i32.shr_u(x, 8:i32), 0xff:i32)
-	y := i32.or(hi, lo)
-}
-
-function bswap32(x:i32) -> y:i32 {
-	let hi:i32 := i32.shl(bswap16(x), 16:i32)
-	let lo:i32 := bswap16(i32.shr_u(x, 16:i32))
-	y := i32.or(hi, lo)
-}
-
-
-function bswap64(x) -> y {
-	let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(x))), 32)
-	let lo := i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(x, 32))))
-	y := i64.or(hi, lo)
-}
diff --git a/libyul/backends/wasm/polyfill/Interface.yul b/libyul/backends/wasm/polyfill/Interface.yul
deleted file mode 100644
index a840e3bb01..0000000000
--- a/libyul/backends/wasm/polyfill/Interface.yul
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
-	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
-
-// NOTE: This file is used to generate `ewasmPolyfills/Interface.h`.
-
-function address() -> z1, z2, z3, z4 {
-	eth.getAddress(12:i32)
-	z1, z2, z3, z4 := mload_address(0:i32)
-}
-
-function balance(x1, x2, x3, x4) -> z1, z2, z3, z4 {
-	mstore_address(0:i32, x1, x2, x3, x4)
-	eth.getExternalBalance(12:i32, 32:i32)
-	z3 := i64.load(40:i32)
-	z4 := i64.load(32:i32)
-}
-
-function selfbalance() -> z1, z2, z3, z4 {
-	// TODO: not part of current Ewasm spec
-	unreachable()
-}
-
-function chainid() -> z1, z2, z3, z4 {
-	// TODO: not part of current Ewasm spec
-	unreachable()
-}
-
-function origin() -> z1, z2, z3, z4 {
-	eth.getTxOrigin(12:i32)
-	z1, z2, z3, z4 := mload_address(0:i32)
-}
-
-function caller() -> z1, z2, z3, z4 {
-	eth.getCaller(12:i32)
-	z1, z2, z3, z4 := mload_address(0:i32)
-}
-
-function callvalue() -> z1, z2, z3, z4 {
-	eth.getCallValue(0:i32)
-	z3 := i64.load(8:i32)
-	z4 := i64.load(0:i32)
-}
-
-function calldataload(x1, x2, x3, x4) -> z1, z2, z3, z4 {
-	calldatacopy(0, 0, 0, 0, x1, x2, x3, x4, 0, 0, 0, 32)
-	z1, z2, z3, z4 := mload_internal(0:i32)
-}
-
-function calldatasize() -> z1, z2, z3, z4 {
-	z4 := i64.extend_i32_u(eth.getCallDataSize())
-}
-
-function calldatacopy(x1, x2, x3, x4, y1, y2, y3, y4, z1, z2, z3, z4) {
-	let cds:i32 := eth.getCallDataSize()
-	let destination:i32 := u256_to_i32(x1, x2, x3, x4)
-	let offset:i32 := u256_to_i32(y1, y2, y3, y4)
-	let requested_size:i32 := u256_to_i32(z1, z2, z3, z4)
-	// overflow?
-	if i32.gt_u(offset, i32.sub(0xffffffff:i32, requested_size)) {
-		eth.revert(0:i32, 0:i32)
-	}
-
-	let available_size:i32 := i32.sub(cds, offset)
-	if i32.gt_u(offset, cds) {
-		available_size := 0:i32
-	}
-
-	if i32.gt_u(available_size, 0:i32) {
-		eth.callDataCopy(
-			destination,
-			offset,
-			available_size
-		)
-	}
-
-	if i32.gt_u(requested_size, available_size) {
-		memset(i32.add(destination, available_size), 0:i32, i32.sub(requested_size, available_size))
-	}
-}
-
-// Needed?
-function codesize() -> z1, z2, z3, z4 {
-	z4 := i64.extend_i32_u(eth.getCodeSize())
-}
-
-function codecopy(x1, x2, x3, x4, y1, y2, y3, y4, z1, z2, z3, z4) {
-	eth.codeCopy(
-		to_internal_i32ptr(x1, x2, x3, x4),
-		u256_to_i32(y1, y2, y3, y4),
-		u256_to_i32(z1, z2, z3, z4)
-	)
-}
-
-function datacopy(x1, x2, x3, x4, y1, y2, y3, y4, z1, z2, z3, z4) {
-	// TODO correct?
-	codecopy(x1, x2, x3, x4, y1, y2, y3, y4, z1, z2, z3, z4)
-}
-
-function gasprice() -> z1, z2, z3, z4 {
-	eth.getTxGasPrice(0:i32)
-	z3 := i64.load(8:i32)
-	z4 := i64.load(0:i32)
-}
-
-function extcodesize_internal(x1, x2, x3, x4) -> r:i32 {
-	mstore_address(0:i32, x1, x2, x3, x4)
-	r := eth.getExternalCodeSize(12:i32)
-}
-
-function extcodesize(x1, x2, x3, x4) -> z1, z2, z3, z4 {
-	z4 := i64.extend_i32_u(extcodesize_internal(x1, x2, x3, x4))
-}
-
-function extcodehash(x1, x2, x3, x4) -> z1, z2, z3, z4 {
-	// TODO: not part of current Ewasm spec
-	unreachable()
-}
-
-function extcodecopy(a1, a2, a3, a4, p1, p2, p3, p4, o1, o2, o3, o4, l1, l2, l3, l4) {
-	mstore_address(0:i32, a1, a2, a3, a4)
-	let codeOffset:i32 := u256_to_i32(o1, o2, o3, o4)
-	let codeLength:i32 := u256_to_i32(l1, l2, l3, l4)
-	eth.externalCodeCopy(12:i32, to_internal_i32ptr(p1, p2, p3, p4), codeOffset, codeLength)
-}
-
-function returndatasize() -> z1, z2, z3, z4 {
-	z4 := i64.extend_i32_u(eth.getReturnDataSize())
-}
-
-function returndatacopy(x1, x2, x3, x4, y1, y2, y3, y4, z1, z2, z3, z4) {
-	eth.returnDataCopy(
-		to_internal_i32ptr(x1, x2, x3, x4),
-		u256_to_i32(y1, y2, y3, y4),
-		u256_to_i32(z1, z2, z3, z4)
-	)
-}
-
-function blockhash(x1, x2, x3, x4) -> z1, z2, z3, z4 {
-	let r:i32 := eth.getBlockHash(u256_to_i64(x1, x2, x3, x4), 0:i32)
-	if i32.eqz(r) {
-		z1, z2, z3, z4 := mload_internal(0:i32)
-	}
-}
-
-function coinbase() -> z1, z2, z3, z4 {
-	eth.getBlockCoinbase(12:i32)
-	z1, z2, z3, z4 := mload_address(0:i32)
-}
-
-function timestamp() -> z1, z2, z3, z4 {
-	z4 := eth.getBlockTimestamp()
-}
-
-function number() -> z1, z2, z3, z4 {
-	z4 := eth.getBlockNumber()
-}
-
-function difficulty() -> z1, z2, z3, z4 {
-	eth.getBlockDifficulty(0:i32)
-	z1 := i64.load(24:i32)
-	z2 := i64.load(16:i32)
-	z3 := i64.load(8:i32)
-	z4 := i64.load(0:i32)
-}
-
-function gaslimit() -> z1, z2, z3, z4 {
-	z4 := eth.getBlockGasLimit()
-}
-
-function mload(x1, x2, x3, x4) -> z1, z2, z3, z4 {
-	z1, z2, z3, z4 := mload_internal(to_internal_i32ptr(x1, x2, x3, x4))
-}
-
-function mstore(x1, x2, x3, x4, y1, y2, y3, y4) {
-	mstore_internal(to_internal_i32ptr(x1, x2, x3, x4), y1, y2, y3, y4)
-}
-
-// Needed?
-function msize() -> z1, z2, z3, z4 {
-	// TODO implement
-	unreachable()
-}
-
-function sload(x1, x2, x3, x4) -> z1, z2, z3, z4 {
-	mstore_internal(0:i32, x1, x2, x3, x4)
-	eth.storageLoad(0:i32, 32:i32)
-	z1, z2, z3, z4 := mload_internal(32:i32)
-}
-
-function sstore(x1, x2, x3, x4, y1, y2, y3, y4) {
-	mstore_internal(0:i32, x1, x2, x3, x4)
-	mstore_internal(32:i32, y1, y2, y3, y4)
-	eth.storageStore(0:i32, 32:i32)
-}
-
-function gas() -> z1, z2, z3, z4 {
-	z4 := eth.getGasLeft()
-}
-
-function log0(p1, p2, p3, p4, s1, s2, s3, s4) {
-	eth.log(
-		to_internal_i32ptr(p1, p2, p3, p4),
-		u256_to_i32(s1, s2, s3, s4),
-		0:i32, 0:i32, 0:i32, 0:i32, 0:i32
-	)
-}
-
-function log1(
-	p1, p2, p3, p4, s1, s2, s3, s4,
-	t1_1, t1_2, t1_3, t1_4
-) {
-	eth.log(
-		to_internal_i32ptr(p1, p2, p3, p4),
-		u256_to_i32(s1, s2, s3, s4),
-		1:i32,
-		to_internal_i32ptr(t1_1, t1_2, t1_3, t1_4),
-		0:i32, 0:i32, 0:i32
-	)
-}
-
-function log2(
-	p1, p2, p3, p4, s1, s2, s3, s4,
-	t1_1, t1_2, t1_3, t1_4,
-	t2_1, t2_2, t2_3, t2_4
-) {
-	eth.log(
-		to_internal_i32ptr(p1, p2, p3, p4),
-		u256_to_i32(s1, s2, s3, s4),
-		2:i32,
-		to_internal_i32ptr(t1_1, t1_2, t1_3, t1_4),
-		to_internal_i32ptr(t2_1, t2_2, t2_3, t2_4),
-		0:i32, 0:i32
-	)
-}
-
-function log3(
-	p1, p2, p3, p4, s1, s2, s3, s4,
-	t1_1, t1_2, t1_3, t1_4,
-	t2_1, t2_2, t2_3, t2_4,
-	t3_1, t3_2, t3_3, t3_4
-) {
-	eth.log(
-		to_internal_i32ptr(p1, p2, p3, p4),
-		u256_to_i32(s1, s2, s3, s4),
-		3:i32,
-		to_internal_i32ptr(t1_1, t1_2, t1_3, t1_4),
-		to_internal_i32ptr(t2_1, t2_2, t2_3, t2_4),
-		to_internal_i32ptr(t3_1, t3_2, t3_3, t3_4),
-		0:i32
-	)
-}
-
-function log4(
-	p1, p2, p3, p4, s1, s2, s3, s4,
-	t1_1, t1_2, t1_3, t1_4,
-	t2_1, t2_2, t2_3, t2_4,
-	t3_1, t3_2, t3_3, t3_4,
-	t4_1, t4_2, t4_3, t4_4,
-) {
-	eth.log(
-		to_internal_i32ptr(p1, p2, p3, p4),
-		u256_to_i32(s1, s2, s3, s4),
-		4:i32,
-		to_internal_i32ptr(t1_1, t1_2, t1_3, t1_4),
-		to_internal_i32ptr(t2_1, t2_2, t2_3, t2_4),
-		to_internal_i32ptr(t3_1, t3_2, t3_3, t3_4),
-		to_internal_i32ptr(t4_1, t4_2, t4_3, t4_4)
-	)
-}
-
-function create(
-	x1, x2, x3, x4,
-	y1, y2, y3, y4,
-	z1, z2, z3, z4
-) -> a1, a2, a3, a4 {
-	let v1, v2 := u256_to_u128(x1, x2, x3, x4)
-	mstore_internal(0:i32, 0, 0, v1, v2)
-
-	let r:i32 := eth.create(0:i32, to_internal_i32ptr(y1, y2, y3, y4), u256_to_i32(z1, z2, z3, z4), 32:i32)
-	if i32.eqz(r) {
-		a1, a2, a3, a4 := mload_internal(32:i32)
-	}
-}
-
-function call(
-	a1, a2, a3, a4,
-	b1, b2, b3, b4,
-	c1, c2, c3, c4,
-	d1, d2, d3, d4,
-	e1, e2, e3, e4,
-	f1, f2, f3, f4,
-	g1, g2, g3, g4
-) -> x1, x2, x3, x4 {
-	let g := u256_to_i64(a1, a2, a3, a4)
-	mstore_address(0:i32, b1, b2, b3, b4)
-
-	let v1, v2 := u256_to_u128(c1, c2, c3, c4)
-	mstore_internal(32:i32, 0, 0, v1, v2)
-
-	x4 := i64.extend_i32_u(eth.call(g, 12:i32, 32:i32, to_internal_i32ptr(d1, d2, d3, d4), u256_to_i32(e1, e2, e3, e4)))
-}
-
-function callcode(
-	a1, a2, a3, a4,
-	b1, b2, b3, b4,
-	c1, c2, c3, c4,
-	d1, d2, d3, d4,
-	e1, e2, e3, e4,
-	f1, f2, f3, f4,
-	g1, g2, g3, g4
-) -> x1, x2, x3, x4 {
-	mstore_address(0:i32, b1, b2, b3, b4)
-
-	let v1, v2 := u256_to_u128(c1, c2, c3, c4)
-	mstore_internal(32:i32, 0, 0, v1, v2)
-
-	x4 := i64.extend_i32_u(eth.callCode(
-		u256_to_i64(a1, a2, a3, a4),
-		12:i32,
-		32:i32,
-		to_internal_i32ptr(d1, d2, d3, d4),
-		u256_to_i32(e1, e2, e3, e4)
-	))
-}
-
-function delegatecall(
-	a1, a2, a3, a4,
-	b1, b2, b3, b4,
-	c1, c2, c3, c4,
-	d1, d2, d3, d4,
-	e1, e2, e3, e4,
-	f1, f2, f3, f4
-) -> x1, x2, x3, x4 {
-	mstore_address(0:i32, b1, b2, b3, b4)
-
-	x4 := i64.extend_i32_u(eth.callDelegate(
-		u256_to_i64(a1, a2, a3, a4),
-		12:i32,
-		to_internal_i32ptr(c1, c2, c3, c4),
-		u256_to_i32(d1, d2, d3, d4)
-	))
-}
-
-function staticcall(
-	a1, a2, a3, a4,
-	b1, b2, b3, b4,
-	c1, c2, c3, c4,
-	d1, d2, d3, d4,
-	e1, e2, e3, e4,
-	f1, f2, f3, f4
-) -> x1, x2, x3, x4 {
-	mstore_address(0:i32, b1, b2, b3, b4)
-
-	x4 := i64.extend_i32_u(eth.callStatic(
-		u256_to_i64(a1, a2, a3, a4),
-		12:i32,
-		to_internal_i32ptr(c1, c2, c3, c4),
-		u256_to_i32(d1, d2, d3, d4)
-	))
-}
-
-function create2(
-	a1, a2, a3, a4,
-	b1, b2, b3, b4,
-	c1, c2, c3, c4,
-	d1, d2, d3, d4
-) -> x1, x2, x3, x4 {
-	// TODO: not part of current Ewasm spec
-	unreachable()
-}
-
-function selfdestruct(a1, a2, a3, a4) {
-	mstore_address(0:i32, a1, a2, a3, a4)
-	// In EVM, addresses are padded to 32 bytes, so discard the first 12.
-	eth.selfDestruct(12:i32)
-}
-
-function return(x1, x2, x3, x4, y1, y2, y3, y4) {
-	eth.finish(
-		to_internal_i32ptr(x1, x2, x3, x4),
-		u256_to_i32(y1, y2, y3, y4)
-	)
-}
-
-function revert(x1, x2, x3, x4, y1, y2, y3, y4) {
-	eth.revert(
-		to_internal_i32ptr(x1, x2, x3, x4),
-		u256_to_i32(y1, y2, y3, y4)
-	)
-}
-
-function invalid() {
-	unreachable()
-}
-
-function stop() {
-	eth.finish(0:i32, 0:i32)
-}
diff --git a/libyul/backends/wasm/polyfill/Keccak.yul b/libyul/backends/wasm/polyfill/Keccak.yul
deleted file mode 100644
index 2dae233941..0000000000
--- a/libyul/backends/wasm/polyfill/Keccak.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
-	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
-
-// NOTE: This file is used to generate `ewasmPolyfills/Keccak.h`.
-
-function keccak256(x1, x2, x3, x4, y1, y2, y3, y4) -> z1, z2, z3, z4 {
-	// TODO implement
-	unreachable()
-}
diff --git a/libyul/backends/wasm/polyfill/Logical.yul b/libyul/backends/wasm/polyfill/Logical.yul
deleted file mode 100644
index 8d297d3545..0000000000
--- a/libyul/backends/wasm/polyfill/Logical.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-	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
-
-// NOTE: This file is used to generate `ewasmPolyfills/Logical.h`.
-
-function or_bool(a, b, c, d) -> r:i32 {
-	r := i32.eqz(i64.eqz(i64.or(i64.or(a, b), i64.or(c, d))))
-}
-
-function or_bool_320(a, b, c, d, e) -> r:i32 {
-	r := i32.or(or_bool(a, b, c, 0), or_bool(d, e, 0, 0))
-}
-
-function or_bool_512(a, b, c, d, e, f, g, h) -> r:i32 {
-	r := i32.or(or_bool(a, b, c, d), or_bool(e, f, g, h))
-}
diff --git a/libyul/backends/wasm/polyfill/Memory.yul b/libyul/backends/wasm/polyfill/Memory.yul
deleted file mode 100644
index 410c42d8fa..0000000000
--- a/libyul/backends/wasm/polyfill/Memory.yul
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-	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
-
-// NOTE: This file is used to generate `ewasmPolyfills/Memory.h`.
-
-function save_temp_mem_32() -> t1, t2, t3, t4 {
-	t1 := i64.load(0:i32)
-	t2 := i64.load(8:i32)
-	t3 := i64.load(16:i32)
-	t4 := i64.load(24:i32)
-}
-
-function restore_temp_mem_32(t1, t2, t3, t4) {
-	i64.store(0:i32, t1)
-	i64.store(8:i32, t2)
-	i64.store(16:i32, t3)
-	i64.store(24:i32, t4)
-}
-
-function save_temp_mem_64() -> t1, t2, t3, t4, t5, t6, t7, t8 {
-	t1 := i64.load(0:i32)
-	t2 := i64.load(8:i32)
-	t3 := i64.load(16:i32)
-	t4 := i64.load(24:i32)
-	t5 := i64.load(32:i32)
-	t6 := i64.load(40:i32)
-	t7 := i64.load(48:i32)
-	t8 := i64.load(54:i32)
-}
-
-function restore_temp_mem_64(t1, t2, t3, t4, t5, t6, t7, t8) {
-	i64.store(0:i32, t1)
-	i64.store(8:i32, t2)
-	i64.store(16:i32, t3)
-	i64.store(24:i32, t4)
-	i64.store(32:i32, t5)
-	i64.store(40:i32, t6)
-	i64.store(48:i32, t7)
-	i64.store(54:i32, t8)
-}
-
-function pop(x1, x2, x3, x4) {
-}
-
-function memoryguard(x:i64) -> y1, y2, y3, y4 {
-	y4 := x
-}
-
-// Fill `length` bytes starting from `ptr` with `value`.
-function memset(ptr:i32, value:i32, length:i32) {
-	for { let i:i32 := 0:i32 } i32.lt_u(i, length) { i := i32.add(i, 1:i32) }
-	{
-		i32.store8(i32.add(ptr, i), value)
-	}
-}
-
-// Writes 256-bits from `pos`, but only set the bottom 160-bits.
-function mstore_address(pos:i32, a1, a2, a3, a4) {
-	a1, a2, a3 := u256_to_address(a1, a2, a3, a4)
-	i64.store(pos, 0:i64)
-	i32.store(i32.add(pos, 8:i32), 0:i32)
-	i32.store(i32.add(pos, 12:i32), bswap32(i32.wrap_i64(a1)))
-	i64.store(i32.add(pos, 16:i32), bswap64(a2))
-	i64.store(i32.add(pos, 24:i32), bswap64(a3))
-}
-
-// Reads 256-bits from `pos`, but only returns the bottom 160-bits.
-function mload_address(pos:i32) -> z1, z2, z3, z4 {
-	z2 := i64.extend_i32_u(bswap32(i32.load(i32.add(pos, 12:i32))))
-	z3 := bswap64(i64.load(i32.add(pos, 16:i32)))
-	z4 := bswap64(i64.load(i32.add(pos, 24:i32)))
-}
-
-// Writes 256-bits from `pos`.
-function mstore_internal(pos:i32, y1, y2, y3, y4) {
-	i64.store(pos, bswap64(y1))
-	i64.store(i32.add(pos, 8:i32), bswap64(y2))
-	i64.store(i32.add(pos, 16:i32), bswap64(y3))
-	i64.store(i32.add(pos, 24:i32), bswap64(y4))
-}
-
-// Reads 256-bits from `pos`.
-function mload_internal(pos:i32) -> z1, z2, z3, z4 {
-	z1 := bswap64(i64.load(pos))
-	z2 := bswap64(i64.load(i32.add(pos, 8:i32)))
-	z3 := bswap64(i64.load(i32.add(pos, 16:i32)))
-	z4 := bswap64(i64.load(i32.add(pos, 24:i32)))
-}
-
-// Stores one byte at position `x` of value `y`.
-function mstore8(x1, x2, x3, x4, y1, y2, y3, y4) {
-	let v := u256_to_byte(y1, y2, y3, y4)
-	i64.store8(to_internal_i32ptr(x1, x2, x3, x4), v)
-}
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 0641328f14..e29112b01d 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -70,7 +70,6 @@
 #include <libyul/AST.h>
 #include <libyul/Object.h>
 
-#include <libyul/backends/wasm/WasmDialect.h>
 #include <libyul/backends/evm/NoOutputAssembly.h>
 
 #include <libsolutil/CommonData.h>
@@ -212,13 +211,6 @@ void OptimiserSuite::run(
 		else if (evmDialect->providesObjectAccess() && _optimizeStackAllocation)
 			StackLimitEvader::run(suite.m_context, _object);
 	}
-	else if (dynamic_cast<WasmDialect const*>(&_dialect))
-	{
-		// If the first statement is an empty block, remove it.
-		// We should only have function definitions after that.
-		if (ast.statements.size() > 1 && std::get<Block>(ast.statements.front()).statements.empty())
-			ast.statements.erase(ast.statements.begin());
-	}
 
 	dispenser.reset(ast);
 	NameSimplifier::run(suite.m_context, ast);
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 7da0d3bf1b..0f45f51963 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -239,29 +239,6 @@ void CommandLineInterface::handleIROptimized(string const& _contractName)
 	}
 }
 
-void CommandLineInterface::handleEwasm(string const& _contractName)
-{
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
-
-	if (!m_options.compiler.outputs.ewasm)
-		return;
-
-	if (!m_options.output.dir.empty())
-	{
-		createFile(m_compiler->filesystemFriendlyName(_contractName) + ".wast", m_compiler->ewasm(_contractName));
-		createFile(
-			m_compiler->filesystemFriendlyName(_contractName) + ".wasm",
-			asString(m_compiler->ewasmObject(_contractName).bytecode)
-		);
-	}
-	else
-	{
-		sout() << "Ewasm text:" << endl;
-		sout() << m_compiler->ewasm(_contractName) << endl;
-		sout() << "Ewasm binary (hex): " << m_compiler->ewasmObject(_contractName).toHex() << endl;
-	}
-}
-
 void CommandLineInterface::handleBytecode(string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
@@ -715,7 +692,6 @@ void CommandLineInterface::compile()
 		// TODO: Perhaps we should not compile unless requested
 
 		m_compiler->enableIRGeneration(m_options.compiler.outputs.ir || m_options.compiler.outputs.irOptimized);
-		m_compiler->enableEwasmGeneration(m_options.compiler.outputs.ewasm);
 		m_compiler->enableEvmBytecodeGeneration(
 			m_options.compiler.estimateGas ||
 			m_options.compiler.outputs.asm_ ||
@@ -1082,9 +1058,8 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 
 	for (auto const& src: m_fileReader.sourceUnits())
 	{
-		string machine =
-			_targetMachine == yul::YulStack::Machine::EVM ? "EVM" :
-			"Ewasm";
+		solAssert(_targetMachine == yul::YulStack::Machine::EVM);
+		string machine = "EVM";
 		sout() << endl << "======= " << src.first << " (" << machine << ") =======" << endl;
 
 		yul::YulStack& stack = yulStacks[src.first];
@@ -1097,19 +1072,6 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 			sout() << stack.print() << endl;
 		}
 
-		if (_language != yul::YulStack::Language::Ewasm && _targetMachine == yul::YulStack::Machine::Ewasm)
-		{
-			stack.translate(yul::YulStack::Language::Ewasm);
-			stack.optimize();
-
-			if (m_options.compiler.outputs.ewasmIR)
-			{
-				sout() << endl << "==========================" << endl;
-				sout() << endl << "Translated source:" << endl;
-				sout() << stack.print() << endl;
-			}
-		}
-
 		yul::MachineAssemblyObject object;
 		object = stack.assemble(_targetMachine);
 		object.bytecode->link(m_options.linker.libraries);
@@ -1123,11 +1085,8 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 				serr() << "No binary representation found." << endl;
 		}
 
-		solAssert(_targetMachine == yul::YulStack::Machine::Ewasm || _targetMachine == yul::YulStack::Machine::EVM, "");
-		if (
-			(_targetMachine == yul::YulStack::Machine::EVM && m_options.compiler.outputs.asm_) ||
-			(_targetMachine == yul::YulStack::Machine::Ewasm && m_options.compiler.outputs.ewasm)
-		)
+		solAssert(_targetMachine == yul::YulStack::Machine::EVM, "");
+		if (m_options.compiler.outputs.asm_)
 		{
 			sout() << endl << "Text representation:" << endl;
 			if (!object.assembly.empty())
@@ -1183,7 +1142,6 @@ void CommandLineInterface::outputCompilationResults()
 		handleBytecode(contract);
 		handleIR(contract);
 		handleIROptimized(contract);
-		handleEwasm(contract);
 		handleSignatureHashes(contract);
 		handleMetadata(contract);
 		handleABI(contract);
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 80b4bee6fb..b6d7f92a8c 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -102,7 +102,6 @@ class CommandLineInterface
 	void handleOpcode(std::string const& _contract);
 	void handleIR(std::string const& _contract);
 	void handleIROptimized(std::string const& _contract);
-	void handleEwasm(std::string const& _contract);
 	void handleBytecode(std::string const& _contract);
 	void handleSignatureHashes(std::string const& _contract);
 	void handleMetadata(std::string const& _contract);
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index a3e7829660..1f11fc57c0 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -46,7 +46,6 @@ static string const g_strCombinedJson = "combined-json";
 static string const g_strErrorRecovery = "error-recovery";
 static string const g_strEVM = "evm";
 static string const g_strEVMVersion = "evm-version";
-static string const g_strEwasm = "ewasm";
 static string const g_strEOFVersion = "experimental-eof-version";
 static string const g_strViaIR = "via-ir";
 static string const g_strExperimentalViaIR = "experimental-via-ir";
@@ -114,15 +113,13 @@ static string const g_strErrorIds = "error-codes";
 /// Possible arguments to for --machine
 static set<string> const g_machineArgs
 {
-	g_strEVM,
-	g_strEwasm
+	g_strEVM
 };
 
 /// Possible arguments to for --yul-dialect
 static set<string> const g_yulDialectArgs
 {
-	g_strEVM,
-	g_strEwasm
+	g_strEVM
 };
 
 /// Possible arguments to for --metadata-hash
@@ -460,13 +457,11 @@ void CommandLineParser::parseOutputSelection()
 			CompilerOutputs::componentMap() |
 			ranges::views::keys |
 			ranges::to<set>()
-		) - set<string>{CompilerOutputs::componentName(&CompilerOutputs::ewasmIR)};
+		);
 		static set<string> const assemblerModeOutputs = {
 			CompilerOutputs::componentName(&CompilerOutputs::asm_),
 			CompilerOutputs::componentName(&CompilerOutputs::binary),
-			CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
-			CompilerOutputs::componentName(&CompilerOutputs::ewasm),
-			CompilerOutputs::componentName(&CompilerOutputs::ewasmIR),
+			CompilerOutputs::componentName(&CompilerOutputs::irOptimized)
 		};
 
 		switch (_mode)
@@ -499,8 +494,6 @@ void CommandLineParser::parseOutputSelection()
 		m_options.compiler.outputs.asm_ = true;
 		m_options.compiler.outputs.binary = true;
 		m_options.compiler.outputs.irOptimized = true;
-		m_options.compiler.outputs.ewasm = true;
-		m_options.compiler.outputs.ewasmIR = true;
 	}
 
 	vector<string> unsupportedOutputs;
@@ -743,8 +736,6 @@ General Information)").c_str(),
 		(CompilerOutputs::componentName(&CompilerOutputs::abi).c_str(), "ABI specification of the contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::ir).c_str(), "Intermediate Representation (IR) of all contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::irOptimized).c_str(), "Optimized intermediate Representation (IR) of all contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::ewasm).c_str(), "Ewasm text representation of all contracts (EXPERIMENTAL).")
-		(CompilerOutputs::componentName(&CompilerOutputs::ewasmIR).c_str(), "Intermediate representation (IR) converted to a form that can be translated directly into Ewasm text representation (EXPERIMENTAL).")
 		(CompilerOutputs::componentName(&CompilerOutputs::signatureHashes).c_str(), "Function signature hashes of the contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::natspecUser).c_str(), "Natspec user documentation of all contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::natspecDev).c_str(), "Natspec developer documentation of all contracts.")
@@ -1001,8 +992,6 @@ void CommandLineParser::processArgs()
 		CompilerOutputs::componentName(&CompilerOutputs::binary),
 		CompilerOutputs::componentName(&CompilerOutputs::ir),
 		CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
-		CompilerOutputs::componentName(&CompilerOutputs::ewasm),
-		CompilerOutputs::componentName(&CompilerOutputs::ewasmIR),
 		g_strGas,
 		CompilerOutputs::componentName(&CompilerOutputs::asm_),
 		CompilerOutputs::componentName(&CompilerOutputs::asmJson),
@@ -1215,42 +1204,22 @@ void CommandLineParser::processArgs()
 			string machine = m_args[g_strMachine].as<string>();
 			if (machine == g_strEVM)
 				m_options.assembly.targetMachine = Machine::EVM;
-			else if (machine == g_strEwasm)
-				m_options.assembly.targetMachine = Machine::Ewasm;
 			else
 				solThrow(CommandLineValidationError, "Invalid option for --" + g_strMachine + ": " + machine);
 		}
-		if (m_options.assembly.targetMachine == Machine::Ewasm && m_options.assembly.inputLanguage == Input::StrictAssembly)
-			m_options.assembly.inputLanguage = Input::Ewasm;
 		if (m_args.count(g_strYulDialect))
 		{
 			string dialect = m_args[g_strYulDialect].as<string>();
 			if (dialect == g_strEVM)
 				m_options.assembly.inputLanguage = Input::StrictAssembly;
-			else if (dialect == g_strEwasm)
-			{
-				m_options.assembly.inputLanguage = Input::Ewasm;
-				if (m_options.assembly.targetMachine != Machine::Ewasm)
-					solThrow(
-						CommandLineValidationError,
-						"If you select Ewasm as --" + g_strYulDialect + ", "
-						"--" + g_strMachine + " has to be Ewasm as well."
-					);
-			}
 			else
 				solThrow(CommandLineValidationError, "Invalid option for --" + g_strYulDialect + ": " + dialect);
 		}
-		if (m_options.optimizer.enabled && (m_options.assembly.inputLanguage != Input::StrictAssembly && m_options.assembly.inputLanguage != Input::Ewasm))
+		if (m_options.optimizer.enabled && (m_options.assembly.inputLanguage != Input::StrictAssembly))
 			solThrow(
 				CommandLineValidationError,
 				"Optimizer can only be used for strict assembly. Use --"  + g_strStrictAssembly + "."
 			);
-		if (m_options.assembly.targetMachine == Machine::Ewasm && m_options.assembly.inputLanguage != Input::StrictAssembly && m_options.assembly.inputLanguage != Input::Ewasm)
-			solThrow(
-				CommandLineValidationError,
-				"The selected input language is not directly supported when targeting the Ewasm machine "
-				"and automatic translation is not available."
-			);
 		return;
 	}
 	else if (countEnabledOptions({g_strYulDialect, g_strMachine}) >= 1)
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 51efc9e408..9bfae03462 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -78,8 +78,6 @@ struct CompilerOutputs
 			{"abi", &CompilerOutputs::abi},
 			{"ir", &CompilerOutputs::ir},
 			{"ir-optimized", &CompilerOutputs::irOptimized},
-			{"ewasm", &CompilerOutputs::ewasm},
-			{"ewasm-ir", &CompilerOutputs::ewasmIR},
 			{"hashes", &CompilerOutputs::signatureHashes},
 			{"userdoc", &CompilerOutputs::natspecUser},
 			{"devdoc", &CompilerOutputs::natspecDev},
@@ -98,8 +96,6 @@ struct CompilerOutputs
 	bool abi = false;
 	bool ir = false;
 	bool irOptimized = false;
-	bool ewasm = false;
-	bool ewasmIR = false;
 	bool signatureHashes = false;
 	bool natspecUser = false;
 	bool natspecDev = false;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9a2c78fd8c..9a3fa84b49 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -135,8 +135,6 @@ set(libyul_sources
     libyul/ControlFlowSideEffectsTest.h
     libyul/EVMCodeTransformTest.cpp
     libyul/EVMCodeTransformTest.h
-    libyul/EwasmTranslationTest.cpp
-    libyul/EwasmTranslationTest.h
     libyul/FunctionSideEffects.cpp
     libyul/FunctionSideEffects.h
     libyul/Inliner.cpp
diff --git a/test/Common.cpp b/test/Common.cpp
index 3af23c7827..72e4d13e8f 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -108,13 +108,11 @@ void CommonOptions::addOptions()
 		("eof-version", po::value<uint64_t>()->implicit_value(1u), "which EOF version to use")
 		("testpath", po::value<fs::path>(&this->testPath)->default_value(solidity::test::testPath()), "path to test files")
 		("vm", po::value<std::vector<fs::path>>(&vmPaths), "path to evmc library, can be supplied multiple times.")
-		("ewasm", po::bool_switch(&ewasm)->default_value(ewasm), "tries to automatically find an ewasm vm and enable ewasm test-execution.")
 		("batches", po::value<size_t>(&this->batches)->default_value(1), "set number of batches to split the tests into")
 		("selected-batch", po::value<size_t>(&this->selectedBatch)->default_value(0), "zero-based number of batch to execute")
 		("no-semantic-tests", po::bool_switch(&disableSemanticTests)->default_value(disableSemanticTests), "disable semantic tests")
 		("no-smt", po::bool_switch(&disableSMT)->default_value(disableSMT), "disable SMT checker")
 		("optimize", po::bool_switch(&optimize)->default_value(optimize), "enables optimization")
-		("enforce-compile-to-ewasm", po::bool_switch(&enforceCompileToEwasm)->default_value(enforceCompileToEwasm), "Enforce compiling all tests to Ewasm to see if additional tests can be activated.")
 		("enforce-gas-cost", po::value<bool>(&enforceGasTest)->default_value(enforceGasTest)->implicit_value(true), "Enforce checking gas cost in semantic tests.")
 		("enforce-gas-cost-min-value", po::value(&enforceGasTestMinValue)->default_value(enforceGasTestMinValue), "Threshold value to enforce adding gas checks to a test.")
 		("abiencoderv1", po::bool_switch(&useABIEncoderV1)->default_value(useABIEncoderV1), "enables abi encoder v1")
@@ -209,14 +207,6 @@ bool CommonOptions::parse(int argc, char const* const* argv)
 			vmPaths.emplace_back(*repoPath);
 		else
 			vmPaths.emplace_back(evmoneFilename);
-		if (ewasm) {
-			if (auto envPath = getenv("ETH_HERA"))
-				vmPaths.emplace_back(envPath);
-			else if (auto repoPath = findInDefaultPath(heraFilename))
-				vmPaths.emplace_back(*repoPath);
-			else
-				vmPaths.emplace_back(heraFilename);
-		}
 	}
 
 	return true;
@@ -234,8 +224,6 @@ string CommonOptions::toString(vector<string> const& _selectedOptions) const
 		{"optimize", boolToString(optimize)},
 		{"useABIEncoderV1", boolToString(useABIEncoderV1)},
 		{"batch", to_string(selectedBatch + 1) + "/" + to_string(batches)},
-		{"ewasm", boolToString(ewasm)},
-		{"enforceCompileToEwasm", boolToString(enforceCompileToEwasm)},
 		{"enforceGasTest", boolToString(enforceGasTest)},
 		{"enforceGasTestMinValue", enforceGasTestMinValue.str()},
 		{"disableSemanticTests", boolToString(disableSemanticTests)},
@@ -303,10 +291,10 @@ bool isValidSemanticTestPath(boost::filesystem::path const& _testPath)
 
 bool loadVMs(CommonOptions const& _options)
 {
-	if (_options.disableSemanticTests && !_options.ewasm)
+	if (_options.disableSemanticTests)
 		return true;
 
-	auto [evmSupported, ewasmSupported] = solidity::test::EVMHost::checkVmPaths(_options.vmPaths);
+	bool evmSupported = solidity::test::EVMHost::checkVmPaths(_options.vmPaths);
 	if (!_options.disableSemanticTests && !evmSupported)
 	{
 		std::cerr << "Unable to find " << solidity::test::evmoneFilename;
@@ -315,14 +303,6 @@ bool loadVMs(CommonOptions const& _options)
 		std::cerr << solidity::test::evmoneDownloadLink << std::endl;
 		return false;
 	}
-	if (_options.ewasm && !ewasmSupported)
-	{
-		std::cerr << "Unable to find " << solidity::test::heraFilename;
-		std::cerr << ". To be able to enable ewasm tests, please provide the path using --vm <path>." << std::endl;
-		std::cerr << "You can download it at" << std::endl;
-		std::cerr << solidity::test::heraDownloadLink << std::endl;
-		return false;
-	}
 	return true;
 }
 
diff --git a/test/Common.h b/test/Common.h
index 468e5af645..d82ff9c6b7 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -34,18 +34,12 @@ namespace solidity::test
 #ifdef _WIN32
 static constexpr auto evmoneFilename = "evmone.dll";
 static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-windows-amd64.zip";
-static constexpr auto heraFilename = "hera.dll";
-static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/archive/v0.6.0.tar.gz";
 #elif defined(__APPLE__)
 static constexpr auto evmoneFilename = "libevmone.dylib";
 static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-darwin-x86_64.tar.gz";
-static constexpr auto heraFilename = "libhera.dylib";
-static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.6.0/hera-0.6.0-darwin-x86_64.tar.gz";
 #else
 static constexpr auto evmoneFilename = "libevmone.so";
 static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-linux-x86_64.tar.gz";
-static constexpr auto heraFilename = "libhera.so";
-static constexpr auto heraDownloadLink = "https://github.com/ewasm/hera/releases/download/v0.6.0/hera-0.6.0-linux-x86_64.tar.gz";
 #endif
 
 struct ConfigException: public util::Exception {};
@@ -58,9 +52,7 @@ struct CommonOptions
 
 	std::vector<boost::filesystem::path> vmPaths;
 	boost::filesystem::path testPath;
-	bool ewasm = false;
 	bool optimize = false;
-	bool enforceCompileToEwasm = false;
 	bool enforceGasTest = false;
 	u256 enforceGasTestMinValue = 100000;
 	bool disableSemanticTests = false;
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 132ce2beba..81005547d2 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -47,10 +47,10 @@ evmc::VM& EVMHost::getVM(string const& _path)
 		auto vm = evmc::VM{evmc_load_and_configure(_path.c_str(), &errorCode)};
 		if (vm && errorCode == EVMC_LOADER_SUCCESS)
 		{
-			if (vm.get_capabilities() & (EVMC_CAPABILITY_EVM1 | EVMC_CAPABILITY_EWASM))
+			if (vm.get_capabilities() & (EVMC_CAPABILITY_EVM1))
 				vms[_path] = make_unique<evmc::VM>(evmc::VM(std::move(vm)));
 			else
-				cerr << "VM loaded neither supports EVM1 nor EWASM" << endl;
+				cerr << "VM loaded does not support EVM1" << endl;
 		}
 		else
 		{
@@ -67,10 +67,9 @@ evmc::VM& EVMHost::getVM(string const& _path)
 	return NullVM;
 }
 
-std::tuple<bool, bool> EVMHost::checkVmPaths(vector<boost::filesystem::path> const& _vmPaths)
+bool EVMHost::checkVmPaths(vector<boost::filesystem::path> const& _vmPaths)
 {
 	bool evmVmFound = false;
-	bool ewasmVmFound = false;
 	for (auto const& path: _vmPaths)
 	{
 		evmc::VM& vm = EVMHost::getVM(path.string());
@@ -83,15 +82,8 @@ std::tuple<bool, bool> EVMHost::checkVmPaths(vector<boost::filesystem::path> con
 				BOOST_THROW_EXCEPTION(runtime_error("Multiple evm1 evmc vms defined. Please only define one evm1 evmc vm."));
 			evmVmFound = true;
 		}
-
-		if (vm.has_capability(EVMC_CAPABILITY_EWASM))
-		{
-			if (ewasmVmFound)
-				BOOST_THROW_EXCEPTION(runtime_error("Multiple ewasm evmc vms where defined. Please only define one ewasm evmc vm."));
-			ewasmVmFound = true;
-		}
 	}
-	return {evmVmFound, ewasmVmFound};
+	return evmVmFound;
 }
 
 EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
diff --git a/test/EVMHost.h b/test/EVMHost.h
index 61b4c3c71c..967adc2486 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -65,16 +65,15 @@ class EVMHost: public evmc::MockedHost
 
 	// Solidity testing specific features.
 
-	/// Tries to dynamically load an evmc vm supporting evm1 or ewasm and caches the loaded VM.
+	/// Tries to dynamically load an evmc vm supporting evm1 and caches the loaded VM.
 	/// @returns vmc::VM(nullptr) on failure.
 	static evmc::VM& getVM(std::string const& _path = {});
 
 	/// Tries to load all defined evmc vm shared libraries.
 	/// @param _vmPaths paths to multiple evmc shared libraries.
-	/// @throw Exception if multiple evm1 or multiple ewasm evmc vms where loaded.
-	/// @returns A pair of booleans, the first element being true, if an evmc vm supporting evm1 was loaded properly,
-	///          the second being true, if an evmc vm supporting ewasm was loaded properly.
-	static std::tuple<bool, bool> checkVmPaths(std::vector<boost::filesystem::path> const& _vmPaths);
+	/// @throw Exception if multiple evm1 vms where loaded.
+	/// @returns true, if an evmc vm supporting evm1 was loaded properly,
+	static bool checkVmPaths(std::vector<boost::filesystem::path> const& _vmPaths);
 
 	explicit EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm);
 
diff --git a/test/ExecutionFramework.cpp b/test/ExecutionFramework.cpp
index 0b7c6ea80c..a18a73de06 100644
--- a/test/ExecutionFramework.cpp
+++ b/test/ExecutionFramework.cpp
@@ -60,11 +60,6 @@ ExecutionFramework::ExecutionFramework(langutil::EVMVersion _evmVersion, vector<
 {
 	if (solidity::test::CommonOptions::get().optimize)
 		m_optimiserSettings = solidity::frontend::OptimiserSettings::standard();
-
-	for (auto const& path: m_vmPaths)
-		if (EVMHost::getVM(path.string()).has_capability(EVMC_CAPABILITY_EWASM))
-			m_supportsEwasm = true;
-
 	selectVM(evmc_capabilities::EVMC_CAPABILITY_EVM1);
 }
 
diff --git a/test/ExecutionFramework.h b/test/ExecutionFramework.h
index b397511428..27ceb4f280 100644
--- a/test/ExecutionFramework.h
+++ b/test/ExecutionFramework.h
@@ -295,7 +295,6 @@ class ExecutionFramework
 	solidity::frontend::RevertStrings m_revertStrings = solidity::frontend::RevertStrings::Default;
 	solidity::frontend::OptimiserSettings m_optimiserSettings = solidity::frontend::OptimiserSettings::minimal();
 	bool m_showMessages = false;
-	bool m_supportsEwasm = false;
 	std::unique_ptr<EVMHost> m_evmcHost;
 
 	std::vector<boost::filesystem::path> m_vmPaths;
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
index e58beabbf8..9e054c109c 100644
--- a/test/InteractiveTests.h
+++ b/test/InteractiveTests.h
@@ -28,7 +28,6 @@
 #include <test/libsolidity/SMTCheckerTest.h>
 #include <test/libyul/ControlFlowGraphTest.h>
 #include <test/libyul/EVMCodeTransformTest.h>
-#include <test/libyul/EwasmTranslationTest.h>
 #include <test/libyul/YulOptimizerTest.h>
 #include <test/libyul/YulInterpreterTest.h>
 #include <test/libyul/ObjectCompilerTest.h>
@@ -78,7 +77,6 @@ Testsuite const g_interactiveTestsuites[] = {
 	{"SMT Checker",            "libsolidity", "smtCheckerTests",       true,  false, &SMTCheckerTest::create},
 	{"Gas Estimates",          "libsolidity", "gasTests",              false, false, &GasTest::create},
 	{"Memory Guard Tests",     "libsolidity", "memoryGuardTests",     false, false, &MemoryGuardTest::create},
-	{"Ewasm Translation",      "libyul",      "ewasmTranslationTests", false, false, &yul::test::EwasmTranslationTest::create}
 };
 
 }
diff --git a/test/TestCase.h b/test/TestCase.h
index 7a5c75c502..f631bea8dc 100644
--- a/test/TestCase.h
+++ b/test/TestCase.h
@@ -41,7 +41,6 @@ class TestCase
 		langutil::EVMVersion evmVersion;
 		std::optional<uint8_t> eofVersion;
 		std::vector<boost::filesystem::path> vmPaths;
-		bool enforceCompileToEwasm = false;
 		bool enforceGasCost = false;
 		u256 enforceGasCostMinValue;
 	};
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index ce9af142fc..c492f52909 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -209,8 +209,6 @@ EOF
         sed -i.bak -E -e 's/([0-9a-f]{34}\$__)[0-9a-f]+(__\$[0-9a-f]{17})/\1<BYTECODE REMOVED>\2/g' "$stdout_path"
         # Remove metadata in assembly output (see below about the magic numbers)
         sed -i.bak -E -e 's/"[0-9a-f]+64697066735822[0-9a-f]+64736f6c63[0-9a-f]+/"<BYTECODE REMOVED>/g' "$stdout_path"
-        # Remove hash of text representation in ewasm
-        sed -i.bak -E -e 's/The Keccak-256 hash of the text representation of .*: [0-9a-f]+/The Keccak-256 hash of the text representation of <REMOVED>/g' "$stdout_path"
 
         # Replace escaped newlines by actual newlines for readability
         # shellcheck disable=SC1003
diff --git a/test/cmdlineTests/evm_to_wasm/args b/test/cmdlineTests/evm_to_wasm/args
deleted file mode 100644
index 099ebdc3a3..0000000000
--- a/test/cmdlineTests/evm_to_wasm/args
+++ /dev/null
@@ -1 +0,0 @@
---assemble --optimize --yul-dialect evm --machine ewasm
diff --git a/test/cmdlineTests/evm_to_wasm/input.yul b/test/cmdlineTests/evm_to_wasm/input.yul
deleted file mode 100644
index f21cd2b7e0..0000000000
--- a/test/cmdlineTests/evm_to_wasm/input.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    sstore(0, 1)
-}
diff --git a/test/cmdlineTests/evm_to_wasm/output b/test/cmdlineTests/evm_to_wasm/output
deleted file mode 100644
index fa454f80f7..0000000000
--- a/test/cmdlineTests/evm_to_wasm/output
+++ /dev/null
@@ -1,96 +0,0 @@
-
-======= evm_to_wasm/input.yul (Ewasm) =======
-
-Pretty printed source:
-object "object" {
-    code { { sstore(0, 1) } }
-}
-
-
-==========================
-
-Translated source:
-object "object" {
-    code {
-        function main()
-        {
-            let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(0))), 32)
-            let y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(0, 32)))))
-            i64.store(0:i32, y)
-            i64.store(i32.add(0:i32, 8:i32), y)
-            i64.store(i32.add(0:i32, 16:i32), y)
-            i64.store(i32.add(0:i32, 24:i32), y)
-            i64.store(32:i32, y)
-            i64.store(i32.add(32:i32, 8:i32), y)
-            i64.store(i32.add(32:i32, 16:i32), y)
-            let hi_1 := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(1))), 32)
-            i64.store(i32.add(32:i32, 24:i32), i64.or(hi_1, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(1, 32))))))
-            eth.storageStore(0:i32, 32:i32)
-        }
-        function bswap16(x:i32) -> y:i32
-        {
-            y := i32.or(i32.and(i32.shl(x, 8:i32), 0xff00:i32), i32.and(i32.shr_u(x, 8:i32), 0xff:i32))
-        }
-        function bswap32(x:i32) -> y:i32
-        {
-            let hi:i32 := i32.shl(bswap16(x), 16:i32)
-            y := i32.or(hi, bswap16(i32.shr_u(x, 16:i32)))
-        }
-    }
-}
-
-
-Binary representation:
-0061736d01000000010e0360000060017f017f60027f7f0002190108657468657265756d0c73746f7261676553746f726500020304030001010503010001060100071102066d656d6f72790200046d61696e00010ac70103850101037e02404200a71003ad422086210020004200422088a71003ad84210141002001370000410041086a2001370000410041106a2001370000410041186a200137000041202001370000412041086a2001370000412041106a20013700004201a71003ad4220862102412041186a20024201422088a71003ad843700004100412010000b0b1f01017f024020004108744180fe0371200041087641ff01717221010b20010b1e01027f02402000100241107421022002200041107610027221010b20010b
-
-Text representation:
-(module
-    (import "ethereum" "storageStore" (func $eth.storageStore (param i32 i32)))
-    (memory $memory (export "memory") 1)
-    (export "main" (func $main))
-
-(func $main
-    (local $hi i64)
-    (local $y i64)
-    (local $hi_1 i64)
-    (block $label_
-        (local.set $hi (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 0)))) (i64.const 32)))
-        (local.set $y (i64.or (local.get $hi) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 0) (i64.const 32)))))))
-        (i64.store (i32.const 0) (local.get $y))
-        (i64.store (i32.add (i32.const 0) (i32.const 8)) (local.get $y))
-        (i64.store (i32.add (i32.const 0) (i32.const 16)) (local.get $y))
-        (i64.store (i32.add (i32.const 0) (i32.const 24)) (local.get $y))
-        (i64.store (i32.const 32) (local.get $y))
-        (i64.store (i32.add (i32.const 32) (i32.const 8)) (local.get $y))
-        (i64.store (i32.add (i32.const 32) (i32.const 16)) (local.get $y))
-        (local.set $hi_1 (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 1)))) (i64.const 32)))
-        (i64.store (i32.add (i32.const 32) (i32.const 24)) (i64.or (local.get $hi_1) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 1) (i64.const 32)))))))
-        (call $eth.storageStore (i32.const 0) (i32.const 32))
-    )
-)
-
-(func $bswap16
-    (param $x i32)
-    (result i32)
-    (local $y i32)
-    (block $label__1
-        (local.set $y (i32.or (i32.and (i32.shl (local.get $x) (i32.const 8)) (i32.const 65280)) (i32.and (i32.shr_u (local.get $x) (i32.const 8)) (i32.const 255))))
-
-    )
-    (local.get $y)
-)
-
-(func $bswap32
-    (param $x i32)
-    (result i32)
-    (local $y i32)
-    (local $hi i32)
-    (block $label__2
-        (local.set $hi (i32.shl (call $bswap16 (local.get $x)) (i32.const 16)))
-        (local.set $y (i32.or (local.get $hi) (call $bswap16 (i32.shr_u (local.get $x) (i32.const 16)))))
-
-    )
-    (local.get $y)
-)
-
-)
diff --git a/test/cmdlineTests/evm_to_wasm_break/args b/test/cmdlineTests/evm_to_wasm_break/args
deleted file mode 100644
index 099ebdc3a3..0000000000
--- a/test/cmdlineTests/evm_to_wasm_break/args
+++ /dev/null
@@ -1 +0,0 @@
---assemble --optimize --yul-dialect evm --machine ewasm
diff --git a/test/cmdlineTests/evm_to_wasm_break/input.yul b/test/cmdlineTests/evm_to_wasm_break/input.yul
deleted file mode 100644
index a625eea088..0000000000
--- a/test/cmdlineTests/evm_to_wasm_break/input.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let x := calldataload(0)
-    for { } lt(x, 10) { x := add(x, 1) } {
-        if eq(x, 2) { break }
-        if eq(x, 4) { continue }
-    }
-    sstore(0, x)
-}
diff --git a/test/cmdlineTests/evm_to_wasm_break/output b/test/cmdlineTests/evm_to_wasm_break/output
deleted file mode 100644
index 01a4cbb411..0000000000
--- a/test/cmdlineTests/evm_to_wasm_break/output
+++ /dev/null
@@ -1,583 +0,0 @@
-
-======= evm_to_wasm_break/input.yul (Ewasm) =======
-
-Pretty printed source:
-object "object" {
-    code {
-        {
-            let x := calldataload(0)
-            for { } lt(x, 10) { x := add(x, 1) }
-            {
-                if eq(x, 2) { break }
-                if eq(x, 4) { continue }
-            }
-            sstore(0, x)
-        }
-    }
-}
-
-
-==========================
-
-Translated source:
-object "object" {
-    code {
-        function main()
-        {
-            let x, x_1, x_2, x_3 := calldataload()
-            let x_4 := x
-            let x_5 := x_1
-            let x_6 := x_2
-            let x_7 := x_3
-            let _1:i32 := i32.eqz(i32.eqz(i64.eqz(i64.or(i64.or(0, 0), i64.or(0, 1)))))
-            for { }
-            i32.eqz(_1)
-            {
-                let x_8, x_9, x_10, x_11 := add(x_4, x_5, x_6, x_7)
-                x_4 := x_8
-                x_5 := x_9
-                x_6 := x_10
-                x_7 := x_11
-            }
-            {
-                let _2, _3, _4, _5 := iszero_1324_2108(lt(x_4, x_5, x_6, x_7))
-                if i32.eqz(i64.eqz(i64.or(i64.or(_2, _3), i64.or(_4, _5)))) { break }
-                let _6, _7, _8, _9 := eq_771_2109(x_4, x_5, x_6, x_7)
-                if i32.eqz(i64.eqz(i64.or(i64.or(_6, _7), i64.or(_8, _9)))) { break }
-                let _10, _11, _12, _13 := eq_772_2110(x_4, x_5, x_6, x_7)
-                if i32.eqz(i64.eqz(i64.or(i64.or(_10, _11), i64.or(_12, _13)))) { continue }
-            }
-            sstore(x_4, x_5, x_6, x_7)
-        }
-        function add(x1, x2, x3, x4) -> r1, r2, r3, r4
-        {
-            let t := i64.add(x4, 1)
-            r4 := i64.add(t, 0)
-            let t_1 := i64.add(x3, 0)
-            r3 := i64.add(t_1, i64.extend_i32_u(i32.or(i64.lt_u(t, x4), i64.lt_u(r4, t))))
-            let t_2 := i64.add(x2, 0)
-            r2 := i64.add(t_2, i64.extend_i32_u(i32.or(i64.lt_u(t_1, x3), i64.lt_u(r3, t_1))))
-            r1 := i64.add(i64.add(x1, 0), i64.extend_i32_u(i32.or(i64.lt_u(t_2, x2), i64.lt_u(r2, t_2))))
-        }
-        function iszero_1324_2108(x4) -> r1, r2, r3, r4
-        {
-            r4 := i64.extend_i32_u(i64.eqz(i64.or(i64.or(0, 0), i64.or(0, x4))))
-        }
-        function eq_771_2109(x1, x2, x3, x4) -> r1, r2, r3, r4
-        {
-            r4 := i64.extend_i32_u(i32.and(i64.eq(x1, 0), i32.and(i64.eq(x2, 0), i32.and(i64.eq(x3, 0), i64.eq(x4, 2)))))
-        }
-        function eq_772_2110(x1, x2, x3, x4) -> r1, r2, r3, r4
-        {
-            r4 := i64.extend_i32_u(i32.and(i64.eq(x1, 0), i32.and(i64.eq(x2, 0), i32.and(i64.eq(x3, 0), i64.eq(x4, 4)))))
-        }
-        function lt(x1, x2, x3, x4) -> z4
-        {
-            let z:i32 := false
-            let _1 := 0
-            let _2:i32 := 0xffffffff:i32
-            switch i32.select(_2, i64.ne(x1, _1), i64.lt_u(x1, _1))
-            case 0:i32 {
-                switch i32.select(_2, i64.ne(x2, _1), i64.lt_u(x2, _1))
-                case 0:i32 {
-                    switch i32.select(_2, i64.ne(x3, _1), i64.lt_u(x3, _1))
-                    case 0:i32 { z := i64.lt_u(x4, 10) }
-                    case 1:i32 { z := 0:i32 }
-                    default { z := 1:i32 }
-                }
-                case 1:i32 { z := 0:i32 }
-                default { z := 1:i32 }
-            }
-            case 1:i32 { z := 0:i32 }
-            default { z := 1:i32 }
-            z4 := i64.extend_i32_u(z)
-        }
-        function u256_to_i32_774() -> v:i32
-        {
-            let _1 := 0
-            if i64.ne(_1, i64.or(i64.or(_1, _1), _1)) { unreachable() }
-            if i64.ne(_1, i64.shr_u(_1, 32)) { unreachable() }
-            v := i32.wrap_i64(_1)
-        }
-        function u256_to_i32() -> v:i32
-        {
-            if i64.ne(0, i64.or(i64.or(0, 0), 0)) { unreachable() }
-            if i64.ne(0, i64.shr_u(32, 32)) { unreachable() }
-            v := i32.wrap_i64(32)
-        }
-        function bswap16(x:i32) -> y:i32
-        {
-            y := i32.or(i32.and(i32.shl(x, 8:i32), 0xff00:i32), i32.and(i32.shr_u(x, 8:i32), 0xff:i32))
-        }
-        function bswap32(x:i32) -> y:i32
-        {
-            let hi:i32 := i32.shl(bswap16(x), 16:i32)
-            y := i32.or(hi, bswap16(i32.shr_u(x, 16:i32)))
-        }
-        function bswap64(x) -> y
-        {
-            let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(x))), 32)
-            y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(x, 32)))))
-        }
-        function calldataload() -> z1, z2, z3, z4
-        {
-            let cds:i32 := eth.getCallDataSize()
-            let destination:i32 := u256_to_i32_774()
-            let offset:i32 := u256_to_i32_774()
-            let requested_size:i32 := u256_to_i32()
-            if i32.gt_u(offset, i32.sub(0xffffffff:i32, requested_size)) { eth.revert(0:i32, 0:i32) }
-            let available_size:i32 := i32.sub(cds, offset)
-            if i32.gt_u(offset, cds) { available_size := 0:i32 }
-            let _1:i32 := 0:i32
-            if i32.gt_u(available_size, _1)
-            {
-                eth.callDataCopy(destination, offset, available_size)
-            }
-            if i32.gt_u(requested_size, available_size)
-            {
-                let _2:i32 := i32.sub(requested_size, available_size)
-                let _3:i32 := i32.add(destination, available_size)
-                let i:i32 := _1
-                for { } i32.lt_u(i, _2) { i := i32.add(i, 1:i32) }
-                {
-                    i32.store8(i32.add(_3, i), _1)
-                }
-            }
-            let z1_1 := bswap64(i64.load(_1))
-            let z2_1 := bswap64(i64.load(i32.add(_1, 8:i32)))
-            let z3_1 := bswap64(i64.load(i32.add(_1, 16:i32)))
-            let z4_1 := bswap64(i64.load(i32.add(_1, 24:i32)))
-            z1 := z1_1
-            z2 := z2_1
-            z3 := z3_1
-            z4 := z4_1
-        }
-        function sstore(y1, y2, y3, y4)
-        {
-            let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(0))), 32)
-            let y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(0, 32)))))
-            i64.store(0:i32, y)
-            i64.store(i32.add(0:i32, 8:i32), y)
-            i64.store(i32.add(0:i32, 16:i32), y)
-            i64.store(i32.add(0:i32, 24:i32), y)
-            i64.store(32:i32, bswap64(y1))
-            i64.store(i32.add(32:i32, 8:i32), bswap64(y2))
-            i64.store(i32.add(32:i32, 16:i32), bswap64(y3))
-            i64.store(i32.add(32:i32, 24:i32), bswap64(y4))
-            eth.storageStore(0:i32, 32:i32)
-        }
-    }
-}
-
-
-Binary representation:
-0061736d010000000130096000006000017e6000017f60017e017e60047e7e7e7e0060047e7e7e7e017e60017f017f60027f7f0060037f7f7f00025e0408657468657265756d0c73746f7261676553746f7265000708657468657265756d06726576657274000708657468657265756d0f67657443616c6c4461746153697a65000208657468657265756d0c63616c6c44617461436f70790008030e0d0005030505050202060603010405030100010615047e0142000b7e0142000b7e0142000b7f0141000b071102066d656d6f72790200046d61696e00040abd090d8d0203087e017f107e02400240100f21002300210123012102230221030b200021042001210520022106200321074200420084420042018484504545210802400340200845450d010240024020042005200620071009100621092303210a2300210b2301210c0b2009200a84200b200c8484504504400c030b024020042005200620071007210d2300210e2301210f230221100b200d200e84200f20108484504504400c030b02402004200520062007100821112300211223012113230221140b2011201284201320148484504504400c010b0b02402004200520062007100521152300211623012117230221180b201521042016210520172106201821070c000b0b200420052006200710100b0b6701077e0240200342017c2108200842007c2107200242007c210920092008200354200720085472ad7c2106200142007c210a200a2009200254200620095472ad7c2105200042007c200a2001542005200a5472ad7c21040b20052400200624012007240220040b2401047e0240420042008442002000848450ad21040b20022400200324012004240220010b2f01047e02402000420051200142005120024200512003420251717171ad21070b20052400200624012007240220040b2f01047e02402000420051200142005120024200512003420451717171ad21070b20052400200624012007240220040bab0104017e017f017e047f02404100210542002106417f210702402007200020065220002006541b21082008410046044002402007200120065220012006541b21092009410046044002402007200220065220022006541b210a200a41004604402003420a54210505200a41014604404100210505410121050b0b0b05200941014604404100210505410121050b0b0b05200841014604404100210505410121050b0b0b2005ad21040b20040b2f02017f017e02404200210120012001200184200184520440000b20012001422088520440000b2001a721000b20000b2901017f024042004200420084420084520440000b42004220422088520440000b4220a721000b20000b1f01017f024020004108744180fe0371200041087641ff01717221010b20010b1e01027f02402000100c411074210220022000411076100c7221010b20010b2201027e02402000a7100dad422086210220022000422088a7100dad8421010b20010bdc0103047e097f047e024010022104100a2105100a2106100b21072006417f20076b4b04404100410010010b200420066b2108200620044b0440410021080b41002109200820094b044020052006200810030b200720084b0440200720086b210a200520086a210b2009210c02400340200c200a49450d010240200b200c6a20093a00000b200c41016a210c0c000b0b0b2009290000100e210d200941086a290000100e210e200941106a290000100e210f200941186a290000100e2110200d2100200e2101200f2102201021030b20012400200224012003240220000b7801027e02404200a7100dad422086210420044200422088a7100dad84210541002005370000410041086a2005370000410041106a2005370000410041186a200537000041202000100e370000412041086a2001100e370000412041106a2002100e370000412041186a2003100e3700004100412010000b0b
-
-Text representation:
-(module
-    (import "ethereum" "storageStore" (func $eth.storageStore (param i32 i32)))
-    (import "ethereum" "revert" (func $eth.revert (param i32 i32)))
-    (import "ethereum" "getCallDataSize" (func $eth.getCallDataSize (result i32)))
-    (import "ethereum" "callDataCopy" (func $eth.callDataCopy (param i32 i32 i32)))
-    (memory $memory (export "memory") 1)
-    (export "main" (func $main))
-    (global $global_ (mut i64) (i64.const 0))
-    (global $global__1 (mut i64) (i64.const 0))
-    (global $global__2 (mut i64) (i64.const 0))
-    (global $global__6 (mut i32) (i32.const 0))
-
-(func $main
-    (local $x i64)
-    (local $x_1 i64)
-    (local $x_2 i64)
-    (local $x_3 i64)
-    (local $x_4 i64)
-    (local $x_5 i64)
-    (local $x_6 i64)
-    (local $x_7 i64)
-    (local $_1 i32)
-    (local $_2 i64)
-    (local $_3 i64)
-    (local $_4 i64)
-    (local $_5 i64)
-    (local $_6 i64)
-    (local $_7 i64)
-    (local $_8 i64)
-    (local $_9 i64)
-    (local $_10 i64)
-    (local $_11 i64)
-    (local $_12 i64)
-    (local $_13 i64)
-    (local $x_8 i64)
-    (local $x_9 i64)
-    (local $x_10 i64)
-    (local $x_11 i64)
-    (block $label_
-        (block
-            (local.set $x (call $calldataload))
-            (local.set $x_1 (global.get $global_))
-            (local.set $x_2 (global.get $global__1))
-            (local.set $x_3 (global.get $global__2))
-
-        )
-        (local.set $x_4 (local.get $x))
-        (local.set $x_5 (local.get $x_1))
-        (local.set $x_6 (local.get $x_2))
-        (local.set $x_7 (local.get $x_3))
-        (local.set $_1 (i32.eqz (i32.eqz (i64.eqz (i64.or (i64.or (i64.const 0) (i64.const 0)) (i64.or (i64.const 0) (i64.const 1)))))))
-        (block $label__3
-            (loop $label__5
-                (br_if $label__3 (i32.eqz (i32.eqz (local.get $_1))))
-                (block $label__4
-                    (block
-                        (local.set $_2 (call $iszero_1324_2108 (call $lt (local.get $x_4) (local.get $x_5) (local.get $x_6) (local.get $x_7))))
-                        (local.set $_3 (global.get $global__6))
-                        (local.set $_4 (global.get $global_))
-                        (local.set $_5 (global.get $global__1))
-
-                    )
-                    (if (i32.eqz (i64.eqz (i64.or (i64.or (local.get $_2) (local.get $_3)) (i64.or (local.get $_4) (local.get $_5))))) (then
-                        (br $label__3)
-                    ))
-                    (block
-                        (local.set $_6 (call $eq_771_2109 (local.get $x_4) (local.get $x_5) (local.get $x_6) (local.get $x_7)))
-                        (local.set $_7 (global.get $global_))
-                        (local.set $_8 (global.get $global__1))
-                        (local.set $_9 (global.get $global__2))
-
-                    )
-                    (if (i32.eqz (i64.eqz (i64.or (i64.or (local.get $_6) (local.get $_7)) (i64.or (local.get $_8) (local.get $_9))))) (then
-                        (br $label__3)
-                    ))
-                    (block
-                        (local.set $_10 (call $eq_772_2110 (local.get $x_4) (local.get $x_5) (local.get $x_6) (local.get $x_7)))
-                        (local.set $_11 (global.get $global_))
-                        (local.set $_12 (global.get $global__1))
-                        (local.set $_13 (global.get $global__2))
-
-                    )
-                    (if (i32.eqz (i64.eqz (i64.or (i64.or (local.get $_10) (local.get $_11)) (i64.or (local.get $_12) (local.get $_13))))) (then
-                        (br $label__4)
-                    ))
-
-                )
-                (block
-                    (local.set $x_8 (call $add (local.get $x_4) (local.get $x_5) (local.get $x_6) (local.get $x_7)))
-                    (local.set $x_9 (global.get $global_))
-                    (local.set $x_10 (global.get $global__1))
-                    (local.set $x_11 (global.get $global__2))
-
-                )
-                (local.set $x_4 (local.get $x_8))
-                (local.set $x_5 (local.get $x_9))
-                (local.set $x_6 (local.get $x_10))
-                (local.set $x_7 (local.get $x_11))
-                (br $label__5)
-            )
-
-        )
-        (call $sstore (local.get $x_4) (local.get $x_5) (local.get $x_6) (local.get $x_7))
-    )
-)
-
-(func $add
-    (param $x1 i64)
-    (param $x2 i64)
-    (param $x3 i64)
-    (param $x4 i64)
-    (result i64)
-    (local $r1 i64)
-    (local $r2 i64)
-    (local $r3 i64)
-    (local $r4 i64)
-    (local $t i64)
-    (local $t_1 i64)
-    (local $t_2 i64)
-    (block $label__7
-        (local.set $t (i64.add (local.get $x4) (i64.const 1)))
-        (local.set $r4 (i64.add (local.get $t) (i64.const 0)))
-        (local.set $t_1 (i64.add (local.get $x3) (i64.const 0)))
-        (local.set $r3 (i64.add (local.get $t_1) (i64.extend_i32_u (i32.or (i64.lt_u (local.get $t) (local.get $x4)) (i64.lt_u (local.get $r4) (local.get $t))))))
-        (local.set $t_2 (i64.add (local.get $x2) (i64.const 0)))
-        (local.set $r2 (i64.add (local.get $t_2) (i64.extend_i32_u (i32.or (i64.lt_u (local.get $t_1) (local.get $x3)) (i64.lt_u (local.get $r3) (local.get $t_1))))))
-        (local.set $r1 (i64.add (i64.add (local.get $x1) (i64.const 0)) (i64.extend_i32_u (i32.or (i64.lt_u (local.get $t_2) (local.get $x2)) (i64.lt_u (local.get $r2) (local.get $t_2))))))
-
-    )
-    (global.set $global_ (local.get $r2))
-    (global.set $global__1 (local.get $r3))
-    (global.set $global__2 (local.get $r4))
-    (local.get $r1)
-)
-
-(func $iszero_1324_2108
-    (param $x4 i64)
-    (result i64)
-    (local $r1 i64)
-    (local $r2 i64)
-    (local $r3 i64)
-    (local $r4 i64)
-    (block $label__8
-        (local.set $r4 (i64.extend_i32_u (i64.eqz (i64.or (i64.or (i64.const 0) (i64.const 0)) (i64.or (i64.const 0) (local.get $x4))))))
-
-    )
-    (global.set $global_ (local.get $r2))
-    (global.set $global__1 (local.get $r3))
-    (global.set $global__2 (local.get $r4))
-    (local.get $r1)
-)
-
-(func $eq_771_2109
-    (param $x1 i64)
-    (param $x2 i64)
-    (param $x3 i64)
-    (param $x4 i64)
-    (result i64)
-    (local $r1 i64)
-    (local $r2 i64)
-    (local $r3 i64)
-    (local $r4 i64)
-    (block $label__9
-        (local.set $r4 (i64.extend_i32_u (i32.and (i64.eq (local.get $x1) (i64.const 0)) (i32.and (i64.eq (local.get $x2) (i64.const 0)) (i32.and (i64.eq (local.get $x3) (i64.const 0)) (i64.eq (local.get $x4) (i64.const 2)))))))
-
-    )
-    (global.set $global_ (local.get $r2))
-    (global.set $global__1 (local.get $r3))
-    (global.set $global__2 (local.get $r4))
-    (local.get $r1)
-)
-
-(func $eq_772_2110
-    (param $x1 i64)
-    (param $x2 i64)
-    (param $x3 i64)
-    (param $x4 i64)
-    (result i64)
-    (local $r1 i64)
-    (local $r2 i64)
-    (local $r3 i64)
-    (local $r4 i64)
-    (block $label__10
-        (local.set $r4 (i64.extend_i32_u (i32.and (i64.eq (local.get $x1) (i64.const 0)) (i32.and (i64.eq (local.get $x2) (i64.const 0)) (i32.and (i64.eq (local.get $x3) (i64.const 0)) (i64.eq (local.get $x4) (i64.const 4)))))))
-
-    )
-    (global.set $global_ (local.get $r2))
-    (global.set $global__1 (local.get $r3))
-    (global.set $global__2 (local.get $r4))
-    (local.get $r1)
-)
-
-(func $lt
-    (param $x1 i64)
-    (param $x2 i64)
-    (param $x3 i64)
-    (param $x4 i64)
-    (result i64)
-    (local $z4 i64)
-    (local $z i32)
-    (local $_1 i64)
-    (local $_2 i32)
-    (local $condition i32)
-    (local $condition_12 i32)
-    (local $condition_13 i32)
-    (block $label__11
-        (local.set $z (i32.const 0))
-        (local.set $_1 (i64.const 0))
-        (local.set $_2 (i32.const 4294967295))
-        (block
-            (local.set $condition (select (local.get $_2) (i64.ne (local.get $x1) (local.get $_1)) (i64.lt_u (local.get $x1) (local.get $_1))))
-            (if (i32.eq (local.get $condition) (i32.const 0)) (then
-                (block
-                    (local.set $condition_12 (select (local.get $_2) (i64.ne (local.get $x2) (local.get $_1)) (i64.lt_u (local.get $x2) (local.get $_1))))
-                    (if (i32.eq (local.get $condition_12) (i32.const 0)) (then
-                        (block
-                            (local.set $condition_13 (select (local.get $_2) (i64.ne (local.get $x3) (local.get $_1)) (i64.lt_u (local.get $x3) (local.get $_1))))
-                            (if (i32.eq (local.get $condition_13) (i32.const 0)) (then
-                                (local.set $z (i64.lt_u (local.get $x4) (i64.const 10)))
-                            )(else
-                                (if (i32.eq (local.get $condition_13) (i32.const 1)) (then
-                                    (local.set $z (i32.const 0))
-                                )(else
-                                    (local.set $z (i32.const 1))
-                                ))
-                            ))
-
-                        )
-                    )(else
-                        (if (i32.eq (local.get $condition_12) (i32.const 1)) (then
-                            (local.set $z (i32.const 0))
-                        )(else
-                            (local.set $z (i32.const 1))
-                        ))
-                    ))
-
-                )
-            )(else
-                (if (i32.eq (local.get $condition) (i32.const 1)) (then
-                    (local.set $z (i32.const 0))
-                )(else
-                    (local.set $z (i32.const 1))
-                ))
-            ))
-
-        )
-        (local.set $z4 (i64.extend_i32_u (local.get $z)))
-
-    )
-    (local.get $z4)
-)
-
-(func $u256_to_i32_774
-    (result i32)
-    (local $v i32)
-    (local $_1 i64)
-    (block $label__14
-        (local.set $_1 (i64.const 0))
-        (if (i64.ne (local.get $_1) (i64.or (i64.or (local.get $_1) (local.get $_1)) (local.get $_1))) (then
-            (unreachable)))
-        (if (i64.ne (local.get $_1) (i64.shr_u (local.get $_1) (i64.const 32))) (then
-            (unreachable)))
-        (local.set $v (i32.wrap_i64 (local.get $_1)))
-
-    )
-    (local.get $v)
-)
-
-(func $u256_to_i32
-    (result i32)
-    (local $v i32)
-    (block $label__15
-        (if (i64.ne (i64.const 0) (i64.or (i64.or (i64.const 0) (i64.const 0)) (i64.const 0))) (then
-            (unreachable)))
-        (if (i64.ne (i64.const 0) (i64.shr_u (i64.const 32) (i64.const 32))) (then
-            (unreachable)))
-        (local.set $v (i32.wrap_i64 (i64.const 32)))
-
-    )
-    (local.get $v)
-)
-
-(func $bswap16
-    (param $x i32)
-    (result i32)
-    (local $y i32)
-    (block $label__16
-        (local.set $y (i32.or (i32.and (i32.shl (local.get $x) (i32.const 8)) (i32.const 65280)) (i32.and (i32.shr_u (local.get $x) (i32.const 8)) (i32.const 255))))
-
-    )
-    (local.get $y)
-)
-
-(func $bswap32
-    (param $x i32)
-    (result i32)
-    (local $y i32)
-    (local $hi i32)
-    (block $label__17
-        (local.set $hi (i32.shl (call $bswap16 (local.get $x)) (i32.const 16)))
-        (local.set $y (i32.or (local.get $hi) (call $bswap16 (i32.shr_u (local.get $x) (i32.const 16)))))
-
-    )
-    (local.get $y)
-)
-
-(func $bswap64
-    (param $x i64)
-    (result i64)
-    (local $y i64)
-    (local $hi i64)
-    (block $label__18
-        (local.set $hi (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (local.get $x)))) (i64.const 32)))
-        (local.set $y (i64.or (local.get $hi) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (local.get $x) (i64.const 32)))))))
-
-    )
-    (local.get $y)
-)
-
-(func $calldataload
-    (result i64)
-    (local $z1 i64)
-    (local $z2 i64)
-    (local $z3 i64)
-    (local $z4 i64)
-    (local $cds i32)
-    (local $destination i32)
-    (local $offset i32)
-    (local $requested_size i32)
-    (local $available_size i32)
-    (local $_1 i32)
-    (local $_2 i32)
-    (local $_3 i32)
-    (local $i i32)
-    (local $z1_1 i64)
-    (local $z2_1 i64)
-    (local $z3_1 i64)
-    (local $z4_1 i64)
-    (block $label__19
-        (local.set $cds (call $eth.getCallDataSize))
-        (local.set $destination (call $u256_to_i32_774))
-        (local.set $offset (call $u256_to_i32_774))
-        (local.set $requested_size (call $u256_to_i32))
-        (if (i32.gt_u (local.get $offset) (i32.sub (i32.const 4294967295) (local.get $requested_size))) (then
-            (call $eth.revert (i32.const 0) (i32.const 0))))
-        (local.set $available_size (i32.sub (local.get $cds) (local.get $offset)))
-        (if (i32.gt_u (local.get $offset) (local.get $cds)) (then
-            (local.set $available_size (i32.const 0))
-        ))
-        (local.set $_1 (i32.const 0))
-        (if (i32.gt_u (local.get $available_size) (local.get $_1)) (then
-            (call $eth.callDataCopy (local.get $destination) (local.get $offset) (local.get $available_size))))
-        (if (i32.gt_u (local.get $requested_size) (local.get $available_size)) (then
-            (local.set $_2 (i32.sub (local.get $requested_size) (local.get $available_size)))
-            (local.set $_3 (i32.add (local.get $destination) (local.get $available_size)))
-            (local.set $i (local.get $_1))
-            (block $label__20
-                (loop $label__22
-                    (br_if $label__20 (i32.eqz (i32.lt_u (local.get $i) (local.get $_2))))
-                    (block $label__21
-                        (i32.store8 (i32.add (local.get $_3) (local.get $i)) (local.get $_1))
-                    )
-                    (local.set $i (i32.add (local.get $i) (i32.const 1)))
-                    (br $label__22)
-                )
-
-            )
-        ))
-        (local.set $z1_1 (call $bswap64 (i64.load (local.get $_1))))
-        (local.set $z2_1 (call $bswap64 (i64.load (i32.add (local.get $_1) (i32.const 8)))))
-        (local.set $z3_1 (call $bswap64 (i64.load (i32.add (local.get $_1) (i32.const 16)))))
-        (local.set $z4_1 (call $bswap64 (i64.load (i32.add (local.get $_1) (i32.const 24)))))
-        (local.set $z1 (local.get $z1_1))
-        (local.set $z2 (local.get $z2_1))
-        (local.set $z3 (local.get $z3_1))
-        (local.set $z4 (local.get $z4_1))
-
-    )
-    (global.set $global_ (local.get $z2))
-    (global.set $global__1 (local.get $z3))
-    (global.set $global__2 (local.get $z4))
-    (local.get $z1)
-)
-
-(func $sstore
-    (param $y1 i64)
-    (param $y2 i64)
-    (param $y3 i64)
-    (param $y4 i64)
-    (local $hi i64)
-    (local $y i64)
-    (block $label__23
-        (local.set $hi (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 0)))) (i64.const 32)))
-        (local.set $y (i64.or (local.get $hi) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 0) (i64.const 32)))))))
-        (i64.store (i32.const 0) (local.get $y))
-        (i64.store (i32.add (i32.const 0) (i32.const 8)) (local.get $y))
-        (i64.store (i32.add (i32.const 0) (i32.const 16)) (local.get $y))
-        (i64.store (i32.add (i32.const 0) (i32.const 24)) (local.get $y))
-        (i64.store (i32.const 32) (call $bswap64 (local.get $y1)))
-        (i64.store (i32.add (i32.const 32) (i32.const 8)) (call $bswap64 (local.get $y2)))
-        (i64.store (i32.add (i32.const 32) (i32.const 16)) (call $bswap64 (local.get $y3)))
-        (i64.store (i32.add (i32.const 32) (i32.const 24)) (call $bswap64 (local.get $y4)))
-        (call $eth.storageStore (i32.const 0) (i32.const 32))
-    )
-)
-
-)
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args
deleted file mode 100644
index f390384981..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/args
+++ /dev/null
@@ -1 +0,0 @@
---assemble --optimize --yul-dialect evm --machine ewasm --asm
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul
deleted file mode 100644
index 4fa5ef66f8..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/input.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := 42
-    sstore(0, x)
-}
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output b/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output
deleted file mode 100644
index d0cb60f39b..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_asm_only/output
+++ /dev/null
@@ -1,2 +0,0 @@
-
-======= evm_to_wasm_output_selection_asm_only/input.yul (Ewasm) =======
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/args b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/args
deleted file mode 100644
index 7c6526b562..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/args
+++ /dev/null
@@ -1 +0,0 @@
---assemble --optimize --yul-dialect evm --machine ewasm --ewasm-ir
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/input.yul b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/input.yul
deleted file mode 100644
index 4fa5ef66f8..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/input.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := 42
-    sstore(0, x)
-}
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/output b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/output
deleted file mode 100644
index 3124db17da..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_ir_only/output
+++ /dev/null
@@ -1,34 +0,0 @@
-
-======= evm_to_wasm_output_selection_ewasm_ir_only/input.yul (Ewasm) =======
-
-==========================
-
-Translated source:
-object "object" {
-    code {
-        function main()
-        {
-            let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(0))), 32)
-            let y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(0, 32)))))
-            i64.store(0:i32, y)
-            i64.store(i32.add(0:i32, 8:i32), y)
-            i64.store(i32.add(0:i32, 16:i32), y)
-            i64.store(i32.add(0:i32, 24:i32), y)
-            i64.store(32:i32, y)
-            i64.store(i32.add(32:i32, 8:i32), y)
-            i64.store(i32.add(32:i32, 16:i32), y)
-            let hi_1 := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(42))), 32)
-            i64.store(i32.add(32:i32, 24:i32), i64.or(hi_1, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(42, 32))))))
-            eth.storageStore(0:i32, 32:i32)
-        }
-        function bswap16(x:i32) -> y:i32
-        {
-            y := i32.or(i32.and(i32.shl(x, 8:i32), 0xff00:i32), i32.and(i32.shr_u(x, 8:i32), 0xff:i32))
-        }
-        function bswap32(x:i32) -> y:i32
-        {
-            let hi:i32 := i32.shl(bswap16(x), 16:i32)
-            y := i32.or(hi, bswap16(i32.shr_u(x, 16:i32)))
-        }
-    }
-}
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args
deleted file mode 100644
index 48a844213a..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/args
+++ /dev/null
@@ -1 +0,0 @@
---assemble --optimize --yul-dialect evm --machine ewasm --ewasm
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul
deleted file mode 100644
index 4fa5ef66f8..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/input.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := 42
-    sstore(0, x)
-}
diff --git a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output b/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
deleted file mode 100644
index e8b3062605..0000000000
--- a/test/cmdlineTests/evm_to_wasm_output_selection_ewasm_only/output
+++ /dev/null
@@ -1,54 +0,0 @@
-
-======= evm_to_wasm_output_selection_ewasm_only/input.yul (Ewasm) =======
-
-Text representation:
-(module
-    (import "ethereum" "storageStore" (func $eth.storageStore (param i32 i32)))
-    (memory $memory (export "memory") 1)
-    (export "main" (func $main))
-
-(func $main
-    (local $hi i64)
-    (local $y i64)
-    (local $hi_1 i64)
-    (block $label_
-        (local.set $hi (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 0)))) (i64.const 32)))
-        (local.set $y (i64.or (local.get $hi) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 0) (i64.const 32)))))))
-        (i64.store (i32.const 0) (local.get $y))
-        (i64.store (i32.add (i32.const 0) (i32.const 8)) (local.get $y))
-        (i64.store (i32.add (i32.const 0) (i32.const 16)) (local.get $y))
-        (i64.store (i32.add (i32.const 0) (i32.const 24)) (local.get $y))
-        (i64.store (i32.const 32) (local.get $y))
-        (i64.store (i32.add (i32.const 32) (i32.const 8)) (local.get $y))
-        (i64.store (i32.add (i32.const 32) (i32.const 16)) (local.get $y))
-        (local.set $hi_1 (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 42)))) (i64.const 32)))
-        (i64.store (i32.add (i32.const 32) (i32.const 24)) (i64.or (local.get $hi_1) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 42) (i64.const 32)))))))
-        (call $eth.storageStore (i32.const 0) (i32.const 32))
-    )
-)
-
-(func $bswap16
-    (param $x i32)
-    (result i32)
-    (local $y i32)
-    (block $label__1
-        (local.set $y (i32.or (i32.and (i32.shl (local.get $x) (i32.const 8)) (i32.const 65280)) (i32.and (i32.shr_u (local.get $x) (i32.const 8)) (i32.const 255))))
-
-    )
-    (local.get $y)
-)
-
-(func $bswap32
-    (param $x i32)
-    (result i32)
-    (local $y i32)
-    (local $hi i32)
-    (block $label__2
-        (local.set $hi (i32.shl (call $bswap16 (local.get $x)) (i32.const 16)))
-        (local.set $y (i32.or (local.get $hi) (call $bswap16 (i32.shr_u (local.get $x) (i32.const 16)))))
-
-    )
-    (local.get $y)
-)
-
-)
diff --git a/test/cmdlineTests/evm_to_wasm_unsupported_translation/args b/test/cmdlineTests/evm_to_wasm_unsupported_translation/args
deleted file mode 100644
index cc6c070831..0000000000
--- a/test/cmdlineTests/evm_to_wasm_unsupported_translation/args
+++ /dev/null
@@ -1 +0,0 @@
---assemble --machine ewasm
diff --git a/test/cmdlineTests/evm_to_wasm_unsupported_translation/err b/test/cmdlineTests/evm_to_wasm_unsupported_translation/err
deleted file mode 100644
index 5ef050f644..0000000000
--- a/test/cmdlineTests/evm_to_wasm_unsupported_translation/err
+++ /dev/null
@@ -1 +0,0 @@
-The selected input language is not directly supported when targeting the Ewasm machine and automatic translation is not available.
diff --git a/test/cmdlineTests/evm_to_wasm_unsupported_translation/exit b/test/cmdlineTests/evm_to_wasm_unsupported_translation/exit
deleted file mode 100644
index d00491fd7e..0000000000
--- a/test/cmdlineTests/evm_to_wasm_unsupported_translation/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/evm_to_wasm_unsupported_translation/input.yul b/test/cmdlineTests/evm_to_wasm_unsupported_translation/input.yul
deleted file mode 100644
index f21cd2b7e0..0000000000
--- a/test/cmdlineTests/evm_to_wasm_unsupported_translation/input.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    sstore(0, 1)
-}
diff --git a/test/cmdlineTests/evm_to_wasm_unsupported_translation/output b/test/cmdlineTests/evm_to_wasm_unsupported_translation/output
deleted file mode 100644
index 8b13789179..0000000000
--- a/test/cmdlineTests/evm_to_wasm_unsupported_translation/output
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/test/cmdlineTests/linker_mode_output_selection_invalid/args b/test/cmdlineTests/linker_mode_output_selection_invalid/args
index ded0d6efc5..6c5b1680bc 100644
--- a/test/cmdlineTests/linker_mode_output_selection_invalid/args
+++ b/test/cmdlineTests/linker_mode_output_selection_invalid/args
@@ -1 +1 @@
---link --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --ewasm --hashes --userdoc --devdoc --metadata --storage-layout
+--link --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --hashes --userdoc --devdoc --metadata --storage-layout
diff --git a/test/cmdlineTests/linker_mode_output_selection_invalid/err b/test/cmdlineTests/linker_mode_output_selection_invalid/err
index c84a12d97e..614ade61f2 100644
--- a/test/cmdlineTests/linker_mode_output_selection_invalid/err
+++ b/test/cmdlineTests/linker_mode_output_selection_invalid/err
@@ -1 +1 @@
-The following outputs are not supported in linker mode: --abi, --asm, --asm-json, --bin, --bin-runtime, --devdoc, --ewasm, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
+The following outputs are not supported in linker mode: --abi, --asm, --asm-json, --bin, --bin-runtime, --devdoc, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/output_selection_ewasm_ir_only/args b/test/cmdlineTests/output_selection_ewasm_ir_only/args
deleted file mode 100644
index bccff6085e..0000000000
--- a/test/cmdlineTests/output_selection_ewasm_ir_only/args
+++ /dev/null
@@ -1 +0,0 @@
---optimize --ewasm-ir
diff --git a/test/cmdlineTests/output_selection_ewasm_ir_only/err b/test/cmdlineTests/output_selection_ewasm_ir_only/err
deleted file mode 100644
index 52dd265b5d..0000000000
--- a/test/cmdlineTests/output_selection_ewasm_ir_only/err
+++ /dev/null
@@ -1 +0,0 @@
-The following outputs are not supported in compiler mode: --ewasm-ir.
diff --git a/test/cmdlineTests/output_selection_ewasm_ir_only/exit b/test/cmdlineTests/output_selection_ewasm_ir_only/exit
deleted file mode 100644
index d00491fd7e..0000000000
--- a/test/cmdlineTests/output_selection_ewasm_ir_only/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/output_selection_ewasm_ir_only/input.sol b/test/cmdlineTests/output_selection_ewasm_ir_only/input.sol
deleted file mode 100644
index 9755e16e71..0000000000
--- a/test/cmdlineTests/output_selection_ewasm_ir_only/input.sol
+++ /dev/null
@@ -1,4 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-pragma solidity *;
-
-contract C {}
diff --git a/test/cmdlineTests/standard_cli_output_selection_invalid/args b/test/cmdlineTests/standard_cli_output_selection_invalid/args
index 538c870972..691b7fa54a 100644
--- a/test/cmdlineTests/standard_cli_output_selection_invalid/args
+++ b/test/cmdlineTests/standard_cli_output_selection_invalid/args
@@ -1 +1 @@
---ast-compact-json --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --ewasm --ewasm-ir --hashes --userdoc --devdoc --metadata --storage-layout
+--ast-compact-json --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --hashes --userdoc --devdoc --metadata --storage-layout
diff --git a/test/cmdlineTests/standard_cli_output_selection_invalid/err b/test/cmdlineTests/standard_cli_output_selection_invalid/err
index e9d24e61d4..ead9822556 100644
--- a/test/cmdlineTests/standard_cli_output_selection_invalid/err
+++ b/test/cmdlineTests/standard_cli_output_selection_invalid/err
@@ -1 +1 @@
-The following outputs are not supported in standard JSON mode: --abi, --asm, --asm-json, --ast-compact-json, --bin, --bin-runtime, --devdoc, --ewasm, --ewasm-ir, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
+The following outputs are not supported in standard JSON mode: --abi, --asm, --asm-json, --ast-compact-json, --bin, --bin-runtime, --devdoc, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/standard_ewasm_requested/input.json b/test/cmdlineTests/standard_ewasm_requested/input.json
deleted file mode 100644
index 53dcc68eef..0000000000
--- a/test/cmdlineTests/standard_ewasm_requested/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; contract C { }"
-		}
-	},
-	"settings":
-	{
-		"optimizer":
-		{
-			"enabled": true,
-			"details": {"yul": true}
-		},
-		"outputSelection":
-		{
-			"*": { "*": ["ewasm.wast", "ewasm.wasm"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_ewasm_requested/output.json b/test/cmdlineTests/standard_ewasm_requested/output.json
deleted file mode 100644
index 1db94af7d1..0000000000
--- a/test/cmdlineTests/standard_ewasm_requested/output.json
+++ /dev/null
@@ -1,176 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "ewasm":
-                {
-                    "wasm": "<BYTECODE REMOVED>",
-                    "wast": "(module
-    ;; custom section for sub-module
-    ;; The Keccak-256 hash of the text representation of <REMOVED>
-    ;; (@custom \"C_3_deployed\" \"<BYTECODE REMOVED>\")
-    (import \"ethereum\" \"codeCopy\" (func $eth.codeCopy (param i32 i32 i32)))
-    (import \"ethereum\" \"revert\" (func $eth.revert (param i32 i32)))
-    (import \"ethereum\" \"getCallValue\" (func $eth.getCallValue (param i32)))
-    (import \"ethereum\" \"finish\" (func $eth.finish (param i32 i32)))
-    (memory $memory (export \"memory\") 1)
-    (export \"main\" (func $main))
-
-(func $main
-    (local $p i32)
-    (local $r i32)
-    (local $hi i64)
-    (local $y i64)
-    (local $z3 i64)
-    (local $_1 i64)
-    (block $label_
-        (local.set $p (call $u256_to_i32_716))
-        (local.set $r (i32.add (local.get $p) (i32.const 64)))
-        (if (i32.lt_u (local.get $r) (local.get $p)) (then
-            (unreachable)))
-        (local.set $hi (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 0)))) (i64.const 32)))
-        (local.set $y (i64.or (local.get $hi) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 0) (i64.const 32)))))))
-        (i64.store (local.get $r) (local.get $y))
-        (i64.store (i32.add (local.get $r) (i32.const 8)) (local.get $y))
-        (i64.store (i32.add (local.get $r) (i32.const 16)) (local.get $y))
-        (i64.store (i32.add (local.get $r) (i32.const 24)) (call $bswap64))
-        (call $eth.getCallValue (i32.const 0))
-        (local.set $z3 (i64.load (i32.const 8)))
-        (if (i32.eqz (i64.eqz (i64.or (i64.or (i64.const 0) (i64.const 0)) (i64.or (local.get $z3) (i64.load (i32.const 0)))))) (then
-            (call $eth.revert (call $to_internal_i32ptr_334) (call $u256_to_i32_333))))
-        (local.set $_1 (datasize \"C_3_deployed\"))
-        (call $eth.codeCopy (call $to_internal_i32ptr) (call $u256_to_i32 (dataoffset \"C_3_deployed\")) (call $u256_to_i32 (local.get $_1)))
-        (call $eth.finish (call $to_internal_i32ptr) (call $u256_to_i32 (local.get $_1)))
-    )
-)
-
-(func $u256_to_i32_333
-    (result i32)
-    (local $v i32)
-    (local $_1 i64)
-    (block $label__1
-        (local.set $_1 (i64.const 0))
-        (if (i64.ne (local.get $_1) (i64.or (i64.or (local.get $_1) (local.get $_1)) (local.get $_1))) (then
-            (unreachable)))
-        (if (i64.ne (local.get $_1) (i64.shr_u (local.get $_1) (i64.const 32))) (then
-            (unreachable)))
-        (local.set $v (i32.wrap_i64 (local.get $_1)))
-
-    )
-    (local.get $v)
-)
-
-(func $u256_to_i32
-    (param $x4 i64)
-    (result i32)
-    (local $v i32)
-    (block $label__2
-        (if (i64.ne (i64.const 0) (i64.or (i64.or (i64.const 0) (i64.const 0)) (i64.const 0))) (then
-            (unreachable)))
-        (if (i64.ne (i64.const 0) (i64.shr_u (local.get $x4) (i64.const 32))) (then
-            (unreachable)))
-        (local.set $v (i32.wrap_i64 (local.get $x4)))
-
-    )
-    (local.get $v)
-)
-
-(func $u256_to_i32_716
-    (result i32)
-    (local $v i32)
-    (block $label__3
-        (if (i64.ne (i64.const 0) (i64.or (i64.or (i64.const 0) (i64.const 0)) (i64.const 0))) (then
-            (unreachable)))
-        (if (i64.ne (i64.const 0) (i64.shr_u (i64.const 64) (i64.const 32))) (then
-            (unreachable)))
-        (local.set $v (i32.wrap_i64 (i64.const 64)))
-
-    )
-    (local.get $v)
-)
-
-(func $to_internal_i32ptr_334
-    (result i32)
-    (local $r i32)
-    (local $p i32)
-    (block $label__4
-        (local.set $p (call $u256_to_i32_333))
-        (local.set $r (i32.add (local.get $p) (i32.const 64)))
-        (if (i32.lt_u (local.get $r) (local.get $p)) (then
-            (unreachable)))
-
-    )
-    (local.get $r)
-)
-
-(func $to_internal_i32ptr
-    (result i32)
-    (local $r i32)
-    (local $v i32)
-    (block $label__5
-        (if (i64.ne (i64.const 0) (i64.or (i64.or (i64.const 0) (i64.const 0)) (i64.const 0))) (then
-            (unreachable)))
-        (if (i64.ne (i64.const 0) (i64.shr_u (i64.const 128) (i64.const 32))) (then
-            (unreachable)))
-        (local.set $v (i32.wrap_i64 (i64.const 128)))
-        (local.set $r (i32.add (local.get $v) (i32.const 64)))
-        (if (i32.lt_u (local.get $r) (local.get $v)) (then
-            (unreachable)))
-
-    )
-    (local.get $r)
-)
-
-(func $bswap16
-    (param $x i32)
-    (result i32)
-    (local $y i32)
-    (block $label__6
-        (local.set $y (i32.or (i32.and (i32.shl (local.get $x) (i32.const 8)) (i32.const 65280)) (i32.and (i32.shr_u (local.get $x) (i32.const 8)) (i32.const 255))))
-
-    )
-    (local.get $y)
-)
-
-(func $bswap32
-    (param $x i32)
-    (result i32)
-    (local $y i32)
-    (local $hi i32)
-    (block $label__7
-        (local.set $hi (i32.shl (call $bswap16 (local.get $x)) (i32.const 16)))
-        (local.set $y (i32.or (local.get $hi) (call $bswap16 (i32.shr_u (local.get $x) (i32.const 16)))))
-
-    )
-    (local.get $y)
-)
-
-(func $bswap64
-    (result i64)
-    (local $y i64)
-    (local $hi i64)
-    (block $label__8
-        (local.set $hi (i64.shl (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.const 128)))) (i64.const 32)))
-        (local.set $y (i64.or (local.get $hi) (i64.extend_i32_u (call $bswap32 (i32.wrap_i64 (i64.shr_u (i64.const 128) (i64.const 32)))))))
-
-    )
-    (local.get $y)
-)
-
-)
-"
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/standard_ewasm_requested_abstract/input.json b/test/cmdlineTests/standard_ewasm_requested_abstract/input.json
deleted file mode 100644
index 2ee666fe2d..0000000000
--- a/test/cmdlineTests/standard_ewasm_requested_abstract/input.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; pragma abicoder v2; abstract contract C { }"
-		}
-	},
-	"settings":
-	{
-		"optimizer":
-		{
-			"enabled": true,
-			"details": {"yul": true}
-		},
-		"outputSelection":
-		{
-			"*": { "*": ["ewasm.wast", "ewasm.wasm"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/standard_ewasm_requested_abstract/output.json b/test/cmdlineTests/standard_ewasm_requested_abstract/output.json
deleted file mode 100644
index 14a4ef2df9..0000000000
--- a/test/cmdlineTests/standard_ewasm_requested_abstract/output.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    "contracts":
-    {
-        "A":
-        {
-            "C":
-            {
-                "ewasm":
-                {
-                    "wasm": "",
-                    "wast": ""
-                }
-            }
-        }
-    },
-    "sources":
-    {
-        "A":
-        {
-            "id": 0
-        }
-    }
-}
diff --git a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/args b/test/cmdlineTests/strict_asm_options_in_non_asm_mode/args
index 6f9a273ab6..9efe91f61f 100644
--- a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/args
+++ b/test/cmdlineTests/strict_asm_options_in_non_asm_mode/args
@@ -1 +1 @@
---yul-dialect evm --machine ewasm
+--yul-dialect evm --machine evm
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/args b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/args
deleted file mode 100644
index 647c63654c..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --optimize --ewasm-ir
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/input.yul
deleted file mode 100644
index 4fa5ef66f8..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/input.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := 42
-    sstore(0, x)
-}
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/output b/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/output
deleted file mode 100644
index 8026a6e83e..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ewasm_ir_only/output
+++ /dev/null
@@ -1,2 +0,0 @@
-
-======= strict_asm_output_selection_ewasm_ir_only/input.yul (EVM) =======
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/args b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/args
deleted file mode 100644
index bb147ae337..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --optimize --ewasm
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul
deleted file mode 100644
index 4fa5ef66f8..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/input.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    let x := 42
-    sstore(0, x)
-}
diff --git a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/output b/test/cmdlineTests/strict_asm_output_selection_ewasm_only/output
deleted file mode 100644
index f90f049aaa..0000000000
--- a/test/cmdlineTests/strict_asm_output_selection_ewasm_only/output
+++ /dev/null
@@ -1,2 +0,0 @@
-
-======= strict_asm_output_selection_ewasm_only/input.yul (EVM) =======
diff --git a/test/cmdlineTests/strict_asm_output_selection_invalid/args b/test/cmdlineTests/strict_asm_output_selection_invalid/args
index 85814eb29b..daeb64aae9 100644
--- a/test/cmdlineTests/strict_asm_output_selection_invalid/args
+++ b/test/cmdlineTests/strict_asm_output_selection_invalid/args
@@ -1 +1 @@
---strict-assembly --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --ewasm --hashes --userdoc --devdoc --metadata --storage-layout
+--strict-assembly --asm --asm-json --opcodes --bin --bin-runtime --abi --ir --ir-optimized --hashes --userdoc --devdoc --metadata --storage-layout
diff --git a/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/args b/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/args
deleted file mode 100644
index 04cd5f05ba..0000000000
--- a/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/args
+++ /dev/null
@@ -1 +0,0 @@
---yul --yul-dialect ewasm --machine ewasm
diff --git a/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/input.yul b/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/input.yul
deleted file mode 100644
index 2b1a6d9606..0000000000
--- a/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/input.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-object "object" {
-    code {
-        function main()
-        {
-            let m:i64, n:i32, p:i32, q:i64 := multireturn(1:i32, 2:i64, 3:i64, 4:i32)
-        }
-
-        function multireturn(a:i32, b:i64, c:i64, d:i32) -> x:i64, y:i32, z:i32, w:i64
-        {
-            x := b
-            w := c
-
-            y := a
-            z := d
-        }
-    }
-}
diff --git a/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/output b/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/output
deleted file mode 100644
index 4a3ef4eba7..0000000000
--- a/test/cmdlineTests/wasm_to_wasm_function_returning_multiple_values/output
+++ /dev/null
@@ -1,73 +0,0 @@
-
-======= wasm_to_wasm_function_returning_multiple_values/input.yul (Ewasm) =======
-
-Pretty printed source:
-object "object" {
-    code {
-        function main()
-        {
-            let m, n:i32, p:i32, q := multireturn(1:i32, 2, 3, 4:i32)
-        }
-        function multireturn(a:i32, b, c, d:i32) -> x, y:i32, z:i32, w
-        {
-            x := b
-            w := c
-            y := a
-            z := d
-        }
-    }
-}
-
-
-Binary representation:
-0061736d01000000010c0260000060047f7e7e7f017e020100030302000105030100010610037f0141000b7f0141000b7e0142000b071102066d656d6f72790200046d61696e00000a52022603017e027f017e024002404101420242034104100121002300210123012102230221030b0b0b2903017e027f017e0240200121042002210720002105200321060b20052400200624012007240220040b
-
-Text representation:
-(module
-    (memory $memory (export "memory") 1)
-    (export "main" (func $main))
-    (global $global_ (mut i32) (i32.const 0))
-    (global $global__1 (mut i32) (i32.const 0))
-    (global $global__2 (mut i64) (i64.const 0))
-
-(func $main
-    (local $m i64)
-    (local $n i32)
-    (local $p i32)
-    (local $q i64)
-    (block $label_
-        (block
-            (local.set $m (call $multireturn (i32.const 1) (i64.const 2) (i64.const 3) (i32.const 4)))
-            (local.set $n (global.get $global_))
-            (local.set $p (global.get $global__1))
-            (local.set $q (global.get $global__2))
-
-        )
-
-    )
-)
-
-(func $multireturn
-    (param $a i32)
-    (param $b i64)
-    (param $c i64)
-    (param $d i32)
-    (result i64)
-    (local $x i64)
-    (local $y i32)
-    (local $z i32)
-    (local $w i64)
-    (block $label__3
-        (local.set $x (local.get $b))
-        (local.set $w (local.get $c))
-        (local.set $y (local.get $a))
-        (local.set $z (local.get $d))
-
-    )
-    (global.set $global_ (local.get $y))
-    (global.set $global__1 (local.get $z))
-    (global.set $global__2 (local.get $w))
-    (local.get $x)
-)
-
-)
diff --git a/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/args b/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/args
deleted file mode 100644
index 04cd5f05ba..0000000000
--- a/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/args
+++ /dev/null
@@ -1 +0,0 @@
---yul --yul-dialect ewasm --machine ewasm
diff --git a/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/input.yul b/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/input.yul
deleted file mode 100644
index 731e6c9bb2..0000000000
--- a/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/input.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-object "object" {
-    code {
-        function main()
-        {
-            i64.store8(0x01:i32, 42:i64)
-        }
-    }
-}
diff --git a/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/output b/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/output
deleted file mode 100644
index e0cc44e577..0000000000
--- a/test/cmdlineTests/wasm_to_wasm_memory_instructions_alignment/output
+++ /dev/null
@@ -1,27 +0,0 @@
-
-======= wasm_to_wasm_memory_instructions_alignment/input.yul (Ewasm) =======
-
-Pretty printed source:
-object "object" {
-    code {
-        function main()
-        { i64.store8(0x01:i32, 42) }
-    }
-}
-
-
-Binary representation:
-0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a0e010c0002404101422a3c00000b0b
-
-Text representation:
-(module
-    (memory $memory (export "memory") 1)
-    (export "main" (func $main))
-
-(func $main
-    (block $label_
-        (i64.store8 (i32.const 1) (i64.const 42))
-    )
-)
-
-)
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/args b/test/cmdlineTests/yul_to_wasm_source_location_crash/args
deleted file mode 100644
index 254a1883c1..0000000000
--- a/test/cmdlineTests/yul_to_wasm_source_location_crash/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --yul-dialect evm --machine ewasm --optimize --ewasm-ir
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/input.yul b/test/cmdlineTests/yul_to_wasm_source_location_crash/input.yul
deleted file mode 100644
index 89e060931b..0000000000
--- a/test/cmdlineTests/yul_to_wasm_source_location_crash/input.yul
+++ /dev/null
@@ -1,4 +0,0 @@
-/// @use-src 0:"test.sol"
-object "C" {
-    code { sstore(0,0) }
-}
diff --git a/test/cmdlineTests/yul_to_wasm_source_location_crash/output b/test/cmdlineTests/yul_to_wasm_source_location_crash/output
deleted file mode 100644
index 29ff631aa5..0000000000
--- a/test/cmdlineTests/yul_to_wasm_source_location_crash/output
+++ /dev/null
@@ -1,34 +0,0 @@
-
-======= yul_to_wasm_source_location_crash/input.yul (Ewasm) =======
-
-==========================
-
-Translated source:
-/// @use-src 0:"test.sol"
-object "C" {
-    code {
-        function main()
-        {
-            let hi := i64.shl(i64.extend_i32_u(bswap32(i32.wrap_i64(0))), 32)
-            let y := i64.or(hi, i64.extend_i32_u(bswap32(i32.wrap_i64(i64.shr_u(0, 32)))))
-            i64.store(0:i32, y)
-            i64.store(i32.add(0:i32, 8:i32), y)
-            i64.store(i32.add(0:i32, 16:i32), y)
-            i64.store(i32.add(0:i32, 24:i32), y)
-            i64.store(32:i32, y)
-            i64.store(i32.add(32:i32, 8:i32), y)
-            i64.store(i32.add(32:i32, 16:i32), y)
-            i64.store(i32.add(32:i32, 24:i32), y)
-            eth.storageStore(0:i32, 32:i32)
-        }
-        function bswap16(x:i32) -> y:i32
-        {
-            y := i32.or(i32.and(i32.shl(x, 8:i32), 0xff00:i32), i32.and(i32.shr_u(x, 8:i32), 0xff:i32))
-        }
-        function bswap32(x:i32) -> y:i32
-        {
-            let hi:i32 := i32.shl(bswap16(x), 16:i32)
-            y := i32.or(hi, bswap16(i32.shr_u(x, 16:i32)))
-        }
-    }
-}
diff --git a/test/libsolidity/ASTJSON/abstract_contract.sol b/test/libsolidity/ASTJSON/abstract_contract.sol
index bddbc17793..3ef96612f5 100644
--- a/test/libsolidity/ASTJSON/abstract_contract.sol
+++ b/test/libsolidity/ASTJSON/abstract_contract.sol
@@ -2,5 +2,4 @@ abstract contract C {
 	constructor() {
 	}
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/address_payable.sol b/test/libsolidity/ASTJSON/address_payable.sol
index 28c9c8a20d..f9ebb124eb 100644
--- a/test/libsolidity/ASTJSON/address_payable.sol
+++ b/test/libsolidity/ASTJSON/address_payable.sol
@@ -7,5 +7,4 @@ contract C {
         m[c] = payable(0);
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/call.sol b/test/libsolidity/ASTJSON/assembly/call.sol
index 09d1ce1843..1735fd7f7e 100644
--- a/test/libsolidity/ASTJSON/assembly/call.sol
+++ b/test/libsolidity/ASTJSON/assembly/call.sol
@@ -3,5 +3,4 @@ contract C {
         assembly { pop(call(0, 1, 2, 3, 4, 5, 6)) }
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block.sol b/test/libsolidity/ASTJSON/assembly/empty_block.sol
index 23c2babbe3..33bb796ea6 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_block.sol
+++ b/test/libsolidity/ASTJSON/assembly/empty_block.sol
@@ -3,5 +3,4 @@ contract C {
         assembly { {} }
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/function.sol b/test/libsolidity/ASTJSON/assembly/function.sol
index 6020f1f513..1edf2f2de2 100644
--- a/test/libsolidity/ASTJSON/assembly/function.sol
+++ b/test/libsolidity/ASTJSON/assembly/function.sol
@@ -3,5 +3,4 @@ contract C {
         assembly { function g() { pop(blockhash(20)) } g() }
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/leave.sol b/test/libsolidity/ASTJSON/assembly/leave.sol
index 5ae4a9e0dd..39f1cafedb 100644
--- a/test/libsolidity/ASTJSON/assembly/leave.sol
+++ b/test/libsolidity/ASTJSON/assembly/leave.sol
@@ -3,5 +3,4 @@ contract C {
         assembly { function f() { leave } }
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/loop.sol b/test/libsolidity/ASTJSON/assembly/loop.sol
index bba8d282f6..baa45e62c4 100644
--- a/test/libsolidity/ASTJSON/assembly/loop.sol
+++ b/test/libsolidity/ASTJSON/assembly/loop.sol
@@ -3,5 +3,4 @@ contract C {
         assembly { for {} 1 { pop(sload(0)) } { break continue } }
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions.sol b/test/libsolidity/ASTJSON/assembly/nested_functions.sol
index 396efa0bf8..42479fa94a 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.sol
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions.sol
@@ -8,5 +8,4 @@ contract C {
     }
   }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset.sol b/test/libsolidity/ASTJSON/assembly/slot_offset.sol
index d3c8f75542..0cc2b07c11 100644
--- a/test/libsolidity/ASTJSON/assembly/slot_offset.sol
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset.sol
@@ -5,5 +5,4 @@ contract C {
         assembly { let x := s.offset let y := mul(s.slot, 2) }
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit.sol b/test/libsolidity/ASTJSON/assembly/stringlit.sol
index e382095ad0..6f5278ac17 100644
--- a/test/libsolidity/ASTJSON/assembly/stringlit.sol
+++ b/test/libsolidity/ASTJSON/assembly/stringlit.sol
@@ -3,5 +3,4 @@ contract C {
         assembly { let x := "abc" }
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/switch.sol b/test/libsolidity/ASTJSON/assembly/switch.sol
index c04d311b09..a7a23d26aa 100644
--- a/test/libsolidity/ASTJSON/assembly/switch.sol
+++ b/test/libsolidity/ASTJSON/assembly/switch.sol
@@ -8,5 +8,4 @@ contract C {
         }
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default.sol b/test/libsolidity/ASTJSON/assembly/switch_default.sol
index 1f61896fe2..0760bb7dfd 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_default.sol
+++ b/test/libsolidity/ASTJSON/assembly/switch_default.sol
@@ -3,5 +3,4 @@ contract C {
         assembly { switch 0 case 0 {} default {} }
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/assembly/var_access.sol b/test/libsolidity/ASTJSON/assembly/var_access.sol
index 768f38c334..e4b7423fde 100644
--- a/test/libsolidity/ASTJSON/assembly/var_access.sol
+++ b/test/libsolidity/ASTJSON/assembly/var_access.sol
@@ -4,5 +4,4 @@ contract C {
         assembly { x := 7 }
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/constructor.sol b/test/libsolidity/ASTJSON/constructor.sol
index b2b1c64604..b48aa1be34 100644
--- a/test/libsolidity/ASTJSON/constructor.sol
+++ b/test/libsolidity/ASTJSON/constructor.sol
@@ -2,5 +2,4 @@ contract C {
 	constructor() {
 	}
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/documentation.sol b/test/libsolidity/ASTJSON/documentation.sol
index 4d354dd26a..6bbf4042af 100644
--- a/test/libsolidity/ASTJSON/documentation.sol
+++ b/test/libsolidity/ASTJSON/documentation.sol
@@ -16,5 +16,4 @@ contract C {
   /** Some comment on mod.*/ modifier mod() { _; }
   /** Some comment on fn.*/ function fn() public {}
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/documentation_local_variable.sol b/test/libsolidity/ASTJSON/documentation_local_variable.sol
index b21602d928..a593e0194a 100644
--- a/test/libsolidity/ASTJSON/documentation_local_variable.sol
+++ b/test/libsolidity/ASTJSON/documentation_local_variable.sol
@@ -21,5 +21,4 @@ contract C {
         uint param3
     ) public {}
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/documentation_on_statements.sol b/test/libsolidity/ASTJSON/documentation_on_statements.sol
index 235fa3d20b..9506bb05c1 100644
--- a/test/libsolidity/ASTJSON/documentation_on_statements.sol
+++ b/test/libsolidity/ASTJSON/documentation_on_statements.sol
@@ -12,5 +12,4 @@ contract C {
         return x;
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/documentation_triple.sol b/test/libsolidity/ASTJSON/documentation_triple.sol
index 578933d9c7..5b14e58f6f 100644
--- a/test/libsolidity/ASTJSON/documentation_triple.sol
+++ b/test/libsolidity/ASTJSON/documentation_triple.sol
@@ -12,5 +12,4 @@ contract C {
         return x;
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol
index a229105700..6fe58c39c1 100644
--- a/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol
+++ b/test/libsolidity/ASTJSON/event_with_variables_of_internal_types.sol
@@ -1,5 +1,4 @@
 contract C {
     event E(function() internal);
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/fail_after_parsing.sol b/test/libsolidity/ASTJSON/fail_after_parsing.sol
index b3b53a7c16..882b4c9502 100644
--- a/test/libsolidity/ASTJSON/fail_after_parsing.sol
+++ b/test/libsolidity/ASTJSON/fail_after_parsing.sol
@@ -11,6 +11,5 @@ interface I {
         uint calldata c = 123.4;
     }
 }
-
 // ----
 // failAfter: Parsed
diff --git a/test/libsolidity/ASTJSON/fallback.sol b/test/libsolidity/ASTJSON/fallback.sol
index 219d85db59..170e77958c 100644
--- a/test/libsolidity/ASTJSON/fallback.sol
+++ b/test/libsolidity/ASTJSON/fallback.sol
@@ -2,5 +2,4 @@ contract C {
   fallback() external payable {
   }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol b/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
index 89acccf5a6..7eb712582d 100644
--- a/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
+++ b/test/libsolidity/ASTJSON/fallback_and_receive_ether.sol
@@ -4,5 +4,4 @@ contract C {
   fallback() external payable {
   }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/fallback_payable.sol b/test/libsolidity/ASTJSON/fallback_payable.sol
index d66d378aff..7eff747af3 100644
--- a/test/libsolidity/ASTJSON/fallback_payable.sol
+++ b/test/libsolidity/ASTJSON/fallback_payable.sol
@@ -1,5 +1,4 @@
 contract C {
 	fallback() external {}
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/mappings.sol b/test/libsolidity/ASTJSON/mappings.sol
index 05912d21f7..5412ca601e 100644
--- a/test/libsolidity/ASTJSON/mappings.sol
+++ b/test/libsolidity/ASTJSON/mappings.sol
@@ -5,5 +5,4 @@ contract C {
     mapping(E => bool) c;
     mapping(address keyAddress => uint256 value) d;
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/mutability.sol b/test/libsolidity/ASTJSON/mutability.sol
index 7688186e77..3f67c29e09 100644
--- a/test/libsolidity/ASTJSON/mutability.sol
+++ b/test/libsolidity/ASTJSON/mutability.sol
@@ -4,5 +4,4 @@ contract C
     uint public constant b = 2;
     uint public c = 3;
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/not_existing_import.sol b/test/libsolidity/ASTJSON/not_existing_import.sol
index 7251a02b84..ad3c100c49 100644
--- a/test/libsolidity/ASTJSON/not_existing_import.sol
+++ b/test/libsolidity/ASTJSON/not_existing_import.sol
@@ -4,6 +4,5 @@ contract C is NotExisting.X
 	NotExisting.SomeStruct public myStruct;
 	constructor() {}
 }
-
 // ----
 // failAfter: Parsed
diff --git a/test/libsolidity/ASTJSON/override.sol b/test/libsolidity/ASTJSON/override.sol
index 1aaa58c600..a032449857 100644
--- a/test/libsolidity/ASTJSON/override.sol
+++ b/test/libsolidity/ASTJSON/override.sol
@@ -9,5 +9,4 @@ contract C is B {
 	function foo() public override { }
 	function faa() public override { }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/receive_ether.sol b/test/libsolidity/ASTJSON/receive_ether.sol
index f75a43b2df..1e59dc1317 100644
--- a/test/libsolidity/ASTJSON/receive_ether.sol
+++ b/test/libsolidity/ASTJSON/receive_ether.sol
@@ -2,5 +2,4 @@ contract C {
   receive() external payable {
   }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/two_base_functions.sol b/test/libsolidity/ASTJSON/two_base_functions.sol
index 89c8e207a5..0a00bcc145 100644
--- a/test/libsolidity/ASTJSON/two_base_functions.sol
+++ b/test/libsolidity/ASTJSON/two_base_functions.sol
@@ -7,5 +7,4 @@ contract B {
 contract C is A, B {
     function f() public override(A, B) {}
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/used_errors.sol b/test/libsolidity/ASTJSON/used_errors.sol
index 24c03982fe..97f7a27f48 100644
--- a/test/libsolidity/ASTJSON/used_errors.sol
+++ b/test/libsolidity/ASTJSON/used_errors.sol
@@ -4,5 +4,4 @@ contract C {
     error T();
     function h() public { f(); }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/userDefinedValueType.sol b/test/libsolidity/ASTJSON/userDefinedValueType.sol
index f1124f8cd6..d5ef2e00b9 100644
--- a/test/libsolidity/ASTJSON/userDefinedValueType.sol
+++ b/test/libsolidity/ASTJSON/userDefinedValueType.sol
@@ -9,5 +9,4 @@ contract C {
     type MyUInt is uint;
     mapping(MyAddress => MyUInt) public m;
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/user_defined_operator.sol b/test/libsolidity/ASTJSON/user_defined_operator.sol
index df5d0ed326..bfbdf7b9bf 100644
--- a/test/libsolidity/ASTJSON/user_defined_operator.sol
+++ b/test/libsolidity/ASTJSON/user_defined_operator.sol
@@ -7,5 +7,4 @@ contract C {
         return -a - b;
     }
 }
-
 // ----
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal.sol b/test/libsolidity/ASTJSON/yul_hex_literal.sol
index f441866c1d..c3b57a8fe8 100644
--- a/test/libsolidity/ASTJSON/yul_hex_literal.sol
+++ b/test/libsolidity/ASTJSON/yul_hex_literal.sol
@@ -7,5 +7,4 @@ contract Sample {
         }
     }
 }
-
 // ----
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 4746999a3e..1d8a9c9c09 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -50,7 +50,6 @@ SemanticTest::SemanticTest(
 	langutil::EVMVersion _evmVersion,
 	optional<uint8_t> _eofVersion,
 	vector<boost::filesystem::path> const& _vmPaths,
-	bool _enforceCompileToEwasm,
 	bool _enforceGasCost,
 	u256 _enforceGasCostMinValue
 ):
@@ -60,7 +59,6 @@ SemanticTest::SemanticTest(
 	m_lineOffset(m_reader.lineNumber()),
 	m_builtins(makeBuiltins()),
 	m_sideEffectHooks(makeSideEffectHooks()),
-	m_enforceCompileToEwasm(_enforceCompileToEwasm),
 	m_enforceGasCost(_enforceGasCost),
 	m_enforceGasCostMinValue(std::move(_enforceGasCostMinValue))
 {
@@ -83,25 +81,6 @@ SemanticTest::SemanticTest(
 	m_testCaseWantsYulRun = util::contains(yulRunTriggers, compileViaYul);
 	m_testCaseWantsLegacyRun = util::contains(legacyRunTriggers, compileViaYul);
 
-	// Do not enforce ewasm, if via yul was explicitly denied.
-	if (compileViaYul == "false")
-		m_enforceCompileToEwasm = false;
-
-	string compileToEwasm = m_reader.stringSetting("compileToEwasm", "false");
-	if (compileToEwasm == "also")
-		m_testCaseWantsEwasmRun = true;
-	else if (compileToEwasm == "false")
-		m_testCaseWantsEwasmRun = false;
-	else
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid compileToEwasm value: " + compileToEwasm + "."));
-
-	if (m_testCaseWantsEwasmRun && !m_testCaseWantsYulRun)
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid compileToEwasm value: " + compileToEwasm + ", compileViaYul need to be enabled."));
-
-	// run ewasm tests only if an ewasm evmc vm was defined
-	if (m_testCaseWantsEwasmRun && !m_supportsEwasm)
-		m_testCaseWantsEwasmRun = false;
-
 	auto revertStrings = revertStringsFromString(m_reader.stringSetting("revertStrings", "default"));
 	soltestAssert(revertStrings, "Invalid revertStrings setting.");
 	m_revertStrings = revertStrings.value();
@@ -298,24 +277,10 @@ TestCase::TestResult SemanticTest::run(ostream& _stream, string const& _linePref
 	TestResult result = TestResult::Success;
 
 	if (m_testCaseWantsLegacyRun && !m_eofVersion.has_value())
-		result = runTest(_stream, _linePrefix, _formatted, false, false);
+		result = runTest(_stream, _linePrefix, _formatted, false);
 
 	if (m_testCaseWantsYulRun && result == TestResult::Success)
-		result = runTest(_stream, _linePrefix, _formatted, true, false);
-
-	if (!m_eofVersion.has_value() && (m_testCaseWantsEwasmRun || m_enforceCompileToEwasm) && result == TestResult::Success)
-	{
-		// TODO: Once we have full Ewasm support, we could remove try/catch here.
-		try
-		{
-			result = runTest(_stream, _linePrefix, _formatted, true, true);
-		}
-		catch (...)
-		{
-			if (!m_enforceCompileToEwasm)
-				throw;
-		}
-	}
+		result = runTest(_stream, _linePrefix, _formatted, true);
 
 	if (result != TestResult::Success)
 		solidity::test::CommonOptions::get().printSelectedOptions(
@@ -331,33 +296,19 @@ TestCase::TestResult SemanticTest::runTest(
 	ostream& _stream,
 	string const& _linePrefix,
 	bool _formatted,
-	bool _isYulRun,
-	bool _isEwasmRun)
+	bool _isYulRun)
 {
 	bool success = true;
 	m_gasCostFailure = false;
 
-	if (_isEwasmRun)
-	{
-		soltestAssert(_isYulRun, "");
-		selectVM(evmc_capabilities::EVMC_CAPABILITY_EWASM);
-	}
-	else
-		selectVM(evmc_capabilities::EVMC_CAPABILITY_EVM1);
+	selectVM(evmc_capabilities::EVMC_CAPABILITY_EVM1);
 
 	reset();
 
 	m_compileViaYul = _isYulRun;
-	if (_isEwasmRun)
-	{
-		soltestAssert(m_compileViaYul, "");
-		m_compileToEwasm = _isEwasmRun;
-	}
-
-	m_canEnableEwasmRun = false;
 
 	if (_isYulRun)
-		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Running via Yul" << (_isEwasmRun ? " (ewasm):" : ":") << endl;
+		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Running via Yul: " << endl;
 
 	for (TestFunctionCall& test: m_tests)
 		test.reset();
@@ -470,31 +421,8 @@ TestCase::TestResult SemanticTest::runTest(
 		success &= test.call().expectedSideEffects == test.call().actualSideEffects;
 	}
 
-	// Right now we have sometimes different test results in Yul vs. Ewasm.
-	// The main reason is that Ewasm just returns a failure in some cases.
-	// TODO: If Ewasm support got fully implemented, we could implement this in the same way as above.
-	if (success && !m_testCaseWantsEwasmRun && _isEwasmRun)
-	{
-		// TODO: There is something missing in Ewasm to support other types of revert strings:
-		//  for now, we just ignore test-cases that do not use RevertStrings::Default.
-		if (m_revertStrings != RevertStrings::Default)
-			return TestResult::Success;
-
-		m_canEnableEwasmRun = true;
-		AnsiColorized(_stream, _formatted, {BOLD, YELLOW}) <<
-			_linePrefix << endl <<
-			_linePrefix << "Test can pass via Yul (Ewasm), but marked with \"compileToEwasm: false.\"" << endl;
-		return TestResult::Failure;
-	}
-
 	if (!success)
 	{
-		// Ignore failing tests that can't yet get compiled to Ewasm:
-		// if the test run was not successful and enforce compiling to ewasm was set,
-		// but the test case did not want to get run with Ewasm, we just ignore this failure.
-		if (m_enforceCompileToEwasm && !m_testCaseWantsEwasmRun)
-			return TestResult::Success;
-
 		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl;
 		for (TestFunctionCall const& test: m_tests)
 		{
@@ -647,21 +575,12 @@ void SemanticTest::printUpdatedExpectations(ostream& _stream, string const&) con
 void SemanticTest::printUpdatedSettings(ostream& _stream, string const& _linePrefix)
 {
 	auto& settings = m_reader.settings();
-	if (settings.empty() && !m_canEnableEwasmRun)
+	if (settings.empty())
 		return;
 
 	_stream << _linePrefix << "// ====" << endl;
-	if (m_canEnableEwasmRun)
-	{
-		soltestAssert(m_testCaseWantsYulRun, "");
-		_stream << _linePrefix << "// compileToEwasm: also\n";
-	}
-
 	for (auto const& [settingName, settingValue]: settings)
-		if (
-			!(settingName == "compileToEwasm" && m_canEnableEwasmRun)
-		)
-			_stream << _linePrefix << "// " << settingName << ": " << settingValue<< endl;
+		_stream << _linePrefix << "// " << settingName << ": " << settingValue<< endl;
 }
 
 void SemanticTest::parseExpectations(istream& _stream)
diff --git a/test/libsolidity/SemanticTest.h b/test/libsolidity/SemanticTest.h
index c5abb93e27..b5b7be83af 100644
--- a/test/libsolidity/SemanticTest.h
+++ b/test/libsolidity/SemanticTest.h
@@ -53,7 +53,6 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 			_options.evmVersion,
 			_options.eofVersion,
 			_options.vmPaths,
-			_options.enforceCompileToEwasm,
 			_options.enforceGasCost,
 			_options.enforceGasCostMinValue
 		);
@@ -64,7 +63,6 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 		langutil::EVMVersion _evmVersion,
 		std::optional<uint8_t> _eofVersion,
 		std::vector<boost::filesystem::path> const& _vmPaths,
-		bool _enforceCompileToEwasm = false,
 		bool _enforceGasCost = false,
 		u256 _enforceGasCostMinValue = 100000
 	);
@@ -85,7 +83,7 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 	bool deploy(std::string const& _contractName, u256 const& _value, bytes const& _arguments, std::map<std::string, solidity::test::Address> const& _libraries = {});
 
 private:
-	TestResult runTest(std::ostream& _stream, std::string const& _linePrefix, bool _formatted, bool _isYulRun, bool _isEwasmRun);
+	TestResult runTest(std::ostream& _stream, std::string const& _linePrefix, bool _formatted, bool _isYulRun);
 	bool checkGasCostExpectation(TestFunctionCall& io_test, bool _compileViaYul) const;
 	std::map<std::string, Builtin> makeBuiltins();
 	std::vector<SideEffectHook> makeSideEffectHooks() const;
@@ -98,12 +96,9 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 	std::map<std::string, Builtin> const m_builtins;
 	std::vector<SideEffectHook> const m_sideEffectHooks;
 	bool m_testCaseWantsYulRun = true;
-	bool m_testCaseWantsEwasmRun = false;
 	bool m_testCaseWantsLegacyRun = true;
-	bool m_enforceCompileToEwasm = false;
 	bool m_runWithABIEncoderV1Only = false;
 	bool m_allowNonExistingFunctions = false;
-	bool m_canEnableEwasmRun = false;
 	bool m_gasCostFailure = false;
 	bool m_enforceGasCost = false;
 	u256 m_enforceGasCostMinValue;
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index 268861fd2a..b174419d21 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -53,33 +53,19 @@ using namespace solidity::langutil;
 
 #define ALSO_VIA_YUL(CODE)                      \
 {                                               \
-	m_doEwasmTestrun = true;                    \
-                                                \
 	m_compileViaYul = false;                    \
-	m_compileToEwasm = false;                   \
 	{ CODE }                                    \
                                                 \
 	m_compileViaYul = true;                     \
 	reset();                                    \
 	{ CODE }                                    \
-                                                \
-	if (m_doEwasmTestrun)                       \
-	{                                           \
-		m_compileToEwasm = true;                \
-		reset();                                \
-		{ CODE }                                \
-	}                                           \
 }
 
-#define DISABLE_EWASM_TESTRUN() \
-	{ m_doEwasmTestrun = false; }
-
 namespace solidity::frontend::test
 {
 
 struct SolidityEndToEndTestExecutionFramework: public SolidityExecutionFramework
 {
-	bool m_doEwasmTestrun = false;
 };
 
 BOOST_FIXTURE_TEST_SUITE(SolidityEndToEndTest, SolidityEndToEndTestExecutionFramework)
@@ -108,7 +94,6 @@ BOOST_AUTO_TEST_CASE(creation_code_optimizer)
 		reset();
 		compileAndRun(codeC + codeD);
 		ABI_CHECK(callContractFunction("f()"), encodeArgs(0x20, bytecodeC.size()) + encode(bytecodeC, false));
-		m_doEwasmTestrun = false;
 	})
 }
 
@@ -166,8 +151,6 @@ BOOST_AUTO_TEST_CASE(recursive_calls)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 		function<u256(u256)> recursive_calls_cpp = [&recursive_calls_cpp](u256 const& n) -> u256
 		{
@@ -193,8 +176,6 @@ BOOST_AUTO_TEST_CASE(while_loop)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		auto while_loop_cpp = [](u256 const& n) -> u256
@@ -223,8 +204,6 @@ BOOST_AUTO_TEST_CASE(do_while_loop)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		auto do_while_loop_cpp = [](u256 const& n) -> u256
@@ -270,8 +249,6 @@ BOOST_AUTO_TEST_CASE(do_while_loop_multiple_local_vars)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		auto do_while = [](u256 n) -> u256
@@ -322,8 +299,6 @@ BOOST_AUTO_TEST_CASE(nested_loops)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		auto nested_loops_cpp = [](u256 n) -> u256
@@ -390,8 +365,6 @@ BOOST_AUTO_TEST_CASE(nested_loops_multiple_local_vars)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		auto nested_loops_cpp = [](u256 n) -> u256
@@ -446,8 +419,6 @@ BOOST_AUTO_TEST_CASE(for_loop_multiple_local_vars)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		auto for_loop = [](u256 n) -> u256
@@ -509,8 +480,6 @@ BOOST_AUTO_TEST_CASE(nested_for_loop_multiple_local_vars)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		auto for_loop = [](u256 n) -> u256
@@ -551,8 +520,6 @@ BOOST_AUTO_TEST_CASE(for_loop)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		auto for_loop_cpp = [](u256 const& n) -> u256
@@ -580,8 +547,6 @@ BOOST_AUTO_TEST_CASE(for_loop_simple_init_expr)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		auto for_loop_simple_init_expr_cpp = [](u256 const& n) -> u256
@@ -621,7 +586,6 @@ BOOST_AUTO_TEST_CASE(for_loop_break_continue)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode);
 
 		auto breakContinue = [](u256 const& n) -> u256
@@ -657,8 +621,6 @@ BOOST_AUTO_TEST_CASE(short_circuiting)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		auto short_circuiting_cpp = [](u256 n) -> u256
@@ -776,8 +738,6 @@ BOOST_AUTO_TEST_CASE(mapping_state_inc_dec)
 		return --table[value++];
 	};
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 		value = 0;
 		table.clear();
@@ -804,8 +764,6 @@ BOOST_AUTO_TEST_CASE(multi_level_mapping)
 		else return table[_x][_y] = _z;
 	};
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 		table.clear();
 
@@ -842,8 +800,6 @@ BOOST_AUTO_TEST_CASE(constructor)
 	};
 
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 		testContractAgainstCpp("get(uint256)", get, u256(6));
 		testContractAgainstCpp("get(uint256)", get, u256(7));
@@ -862,8 +818,6 @@ BOOST_AUTO_TEST_CASE(send_ether)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		u256 amount(250);
 		compileAndRun(sourceCode, amount + 1);
 		h160 address(23);
@@ -896,8 +850,6 @@ BOOST_AUTO_TEST_CASE(transfer_ether)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode, 0, "B");
 		h160 const nonPayableRecipient = m_contractAddress;
 		compileAndRun(sourceCode, 0, "C");
@@ -1237,8 +1189,6 @@ BOOST_AUTO_TEST_CASE(empty_name_input_parameter_with_named_one)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 		BOOST_CHECK(callContractFunction("f(uint256,uint256)", 5, 9) != encodeArgs(5, 8));
 		ABI_CHECK(callContractFunction("f(uint256,uint256)", 5, 9), encodeArgs(9, 8));
@@ -1382,7 +1332,6 @@ BOOST_AUTO_TEST_CASE(library_call_protection)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "Lib");
 		ABI_CHECK(callContractFunction("np(Lib.S storage)", 0), encodeArgs());
 		ABI_CHECK(callContractFunction("v(Lib.S storage)", 0), encodeArgs(m_sender));
@@ -1406,7 +1355,6 @@ BOOST_AUTO_TEST_CASE(bytes_from_calldata_to_memory)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN();
 		compileAndRun(sourceCode);
 		bytes calldata1 = util::selectorFromSignatureH32("f()").asBytes() + bytes(61, 0x22) + bytes(12, 0x12);
 		sendMessage(calldata1, false);
@@ -1446,7 +1394,6 @@ BOOST_AUTO_TEST_CASE(call_forward_bytes_length)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN();
 		compileAndRun(sourceCode, 0, "sender");
 
 		// No additional data, just function selector
@@ -1485,7 +1432,6 @@ BOOST_AUTO_TEST_CASE(copying_bytes_multiassign)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "sender");
 		ABI_CHECK(callContractFunction("recv(uint256)", 7), bytes());
 		ABI_CHECK(callContractFunction("val()"), encodeArgs(0));
@@ -1508,7 +1454,6 @@ BOOST_AUTO_TEST_CASE(copy_from_calldata_removes_bytes_data)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode);
 		ABI_CHECK(callContractFunction("set()", 1, 2, 3, 4, 5), encodeArgs(true));
 		BOOST_CHECK(!storageEmpty(m_contractAddress));
@@ -1569,7 +1514,6 @@ BOOST_AUTO_TEST_CASE(struct_referencing)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "L");
 		ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 3));
 		ABI_CHECK(callContractFunction("g()"), encodeArgs(4));
@@ -1618,7 +1562,6 @@ BOOST_AUTO_TEST_CASE(enum_referencing)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "L");
 		ABI_CHECK(callContractFunction("f()"), encodeArgs(1));
 		ABI_CHECK(callContractFunction("g()"), encodeArgs(3));
@@ -1649,8 +1592,6 @@ BOOST_AUTO_TEST_CASE(bytes_in_arguments)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 
 		string innercalldata1 = asString(util::selectorFromSignatureH32("f(uint256,uint256)").asBytes() + encodeArgs(8, 9));
@@ -1702,8 +1643,6 @@ BOOST_AUTO_TEST_CASE(array_copy_storage_abi)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode);
 		bytes valueSequence;
 		for (size_t i = 0; i < 101; ++i)
@@ -2138,8 +2077,6 @@ BOOST_AUTO_TEST_CASE(string_as_mapping_key)
 	};
 
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode, 0, "Test");
 		for (unsigned i = 0; i < strings.size(); i++)
 			ABI_CHECK(callContractFunction(
@@ -2308,7 +2245,6 @@ BOOST_AUTO_TEST_CASE(library_call)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "Lib");
 		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
 		ABI_CHECK(callContractFunction("f(uint256)", u256(33)), encodeArgs(u256(33) * 9));
@@ -2326,7 +2262,6 @@ BOOST_AUTO_TEST_CASE(library_function_external)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "Lib");
 		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
 		ABI_CHECK(callContractFunction("f(bytes)", u256(0x20), u256(5), "abcde"), encodeArgs("c"));
@@ -2478,7 +2413,6 @@ BOOST_AUTO_TEST_CASE(short_strings)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "A");
 		ABI_CHECK(callContractFunction("data1()"), encodeDyn(string("123")));
 		ABI_CHECK(callContractFunction("lengthChange()"), encodeArgs(u256(0)));
@@ -2522,7 +2456,6 @@ BOOST_AUTO_TEST_CASE(reject_ether_sent_to_library)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "lib");
 		Address libraryAddress = m_contractAddress;
 		compileAndRun(sourceCode, 10, "c");
@@ -2737,7 +2670,6 @@ BOOST_AUTO_TEST_CASE(non_payable_throw)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "C");
 		ABI_CHECK(callContractFunctionWithValue("f()", 27), encodeArgs());
 		BOOST_CHECK_EQUAL(balanceAt(m_contractAddress), 0);
@@ -2784,7 +2716,6 @@ BOOST_AUTO_TEST_CASE(receive_external_function_type)
 	)";
 
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "C");
 		ABI_CHECK(callContractFunction(
 			"f(function)",
@@ -2839,8 +2770,6 @@ BOOST_AUTO_TEST_CASE(contracts_separated_with_comment)
 		contract C2 {}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
-
 		compileAndRun(sourceCode, 0, "C1");
 		compileAndRun(sourceCode, 0, "C2");
 	)
@@ -3308,7 +3237,6 @@ BOOST_AUTO_TEST_CASE(bare_call_return_data)
 				}
 			)DELIMITER";
 			ALSO_VIA_YUL(
-				DISABLE_EWASM_TESTRUN()
 				compileAndRun(sourceCode, 0, "C");
 				ABI_CHECK(callContractFunction("f(string)", encodeDyn(string("return_bool()"))), encodeArgs(true, 0x40, 0x20, true));
 				ABI_CHECK(callContractFunction("f(string)", encodeDyn(string("return_int32()"))), encodeArgs(true, 0x40, 0x20, u256(-32)));
@@ -3369,7 +3297,6 @@ BOOST_AUTO_TEST_CASE(abi_encodePacked)
 	for (auto v2: {false, true})
 	{
 		ALSO_VIA_YUL(
-			DISABLE_EWASM_TESTRUN()
 			string prefix = "pragma abicoder " + string(v2 ? "v2" : "v1") + ";\n";
 			compileAndRun(prefix + sourceCode, 0, "C");
 			ABI_CHECK(callContractFunction("f0()"), encodeArgs(0x20, 0));
@@ -3447,7 +3374,6 @@ BOOST_AUTO_TEST_CASE(abi_encodePacked_from_storage)
 	for (auto v2: {false, true})
 	{
 		ALSO_VIA_YUL(
-			DISABLE_EWASM_TESTRUN()
 			string prefix = "pragma abicoder " + string(v2 ? "v2" : "v1") + ";\n";
 			compileAndRun(prefix + sourceCode, 0, "C");
 			bytes payload = encodeArgs(0xfffff1, 0, 0xfffff2, 0, 0, 0xfffff3, 0, 0, 0xfffff4);
@@ -3521,7 +3447,6 @@ BOOST_AUTO_TEST_CASE(abi_encodePacked_from_memory)
 	for (auto v2: {false, true})
 	{
 		ALSO_VIA_YUL(
-			DISABLE_EWASM_TESTRUN()
 			string prefix = "pragma abicoder " + string(v2 ? "v2" : "v1") + ";\n";
 			compileAndRun(prefix + sourceCode, 0, "C");
 			bytes payload = encodeArgs(0xfffff1, 0, 0xfffff2, 0, 0, 0xfffff3, 0, 0, 0xfffff4);
@@ -3568,7 +3493,6 @@ BOOST_AUTO_TEST_CASE(abi_encodePacked_functionPtr)
 	for (auto v2: {false, true})
 	{
 		ALSO_VIA_YUL(
-			DISABLE_EWASM_TESTRUN()
 			string prefix = "pragma abicoder " + string(v2 ? "v2" : "v1") + ";\n";
 			compileAndRun(prefix + sourceCode, 0, "C");
 			string directEncoding = asString(fromHex("08" "1112131400000000000011121314000000000087" "26121ff0" "02"));
@@ -3611,7 +3535,6 @@ BOOST_AUTO_TEST_CASE(abi_encodePackedV2_structs)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "C");
 		bytes structEnc = encodeArgs(int(0x12), u256(-7), int(2), int(3), u256(-7), u256(-8));
 		ABI_CHECK(callContractFunction("testStorage()"), encodeArgs());
@@ -3647,7 +3570,6 @@ BOOST_AUTO_TEST_CASE(abi_encodePackedV2_nestedArray)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "C");
 		bytes structEnc = encodeArgs(1, 2, 3, 0, 0, 0, 0, 4);
 		ABI_CHECK(callContractFunction("testNestedArrays()"), encodeArgs());
@@ -3678,7 +3600,6 @@ BOOST_AUTO_TEST_CASE(abi_encodePackedV2_arrayOfStrings)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "C");
 		bytes arrayEncoding = encodeArgs("abc", "0123456789012345678901234567890123456789");
 		ABI_CHECK(callContractFunction("testStorage()"), encodeArgs());
@@ -3798,7 +3719,6 @@ BOOST_AUTO_TEST_CASE(event_wrong_abi_name)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		compileAndRun(sourceCode, 0, "ClientReceipt", bytes());
 		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":ClientReceipt", m_contractAddress}});
 
@@ -3874,7 +3794,6 @@ BOOST_AUTO_TEST_CASE(strip_reason_strings)
 		}
 	)";
 	ALSO_VIA_YUL(
-		DISABLE_EWASM_TESTRUN()
 		m_revertStrings = RevertStrings::Default;
 		compileAndRun(sourceCode, 0, "C");
 
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index 3e8372ef78..7d18e1bb4a 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -53,7 +53,6 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 		entry.second = addPreamble(entry.second);
 
 	m_compiler.reset();
-	m_compiler.enableEwasmGeneration(m_compileToEwasm);
 	m_compiler.setSources(sourcesWithPreamble);
 	m_compiler.setLibraries(_libraryAddresses);
 	m_compiler.setRevertStringBehaviour(m_revertStrings);
@@ -83,46 +82,41 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 	evmasm::LinkerObject obj;
 	if (m_compileViaYul)
 	{
-		if (m_compileToEwasm)
-			obj = m_compiler.ewasmObject(contractName);
-		else
+		// Try compiling twice: If the first run fails due to stack errors, forcefully enable
+		// the optimizer.
+		for (bool forceEnableOptimizer: {false, true})
 		{
-			// Try compiling twice: If the first run fails due to stack errors, forcefully enable
-			// the optimizer.
-			for (bool forceEnableOptimizer: {false, true})
+			OptimiserSettings optimiserSettings = m_optimiserSettings;
+			if (!forceEnableOptimizer && !optimiserSettings.runYulOptimiser)
 			{
-				OptimiserSettings optimiserSettings = m_optimiserSettings;
-				if (!forceEnableOptimizer && !optimiserSettings.runYulOptimiser)
-				{
-					// Enable some optimizations on the first run
-					optimiserSettings.runYulOptimiser = true;
-					optimiserSettings.yulOptimiserSteps = "uljmul jmul";
-				}
-				else if (forceEnableOptimizer)
-					optimiserSettings = OptimiserSettings::full();
+				// Enable some optimizations on the first run
+				optimiserSettings.runYulOptimiser = true;
+				optimiserSettings.yulOptimiserSteps = "uljmul jmul";
+			}
+			else if (forceEnableOptimizer)
+				optimiserSettings = OptimiserSettings::full();
 
-				yul::YulStack asmStack(
-					m_evmVersion,
-					m_eofVersion,
-					yul::YulStack::Language::StrictAssembly,
-					optimiserSettings,
-					DebugInfoSelection::All()
-				);
-				bool analysisSuccessful = asmStack.parseAndAnalyze("", m_compiler.yulIROptimized(contractName));
-				solAssert(analysisSuccessful, "Code that passed analysis in CompilerStack can't have errors");
+			yul::YulStack asmStack(
+				m_evmVersion,
+				m_eofVersion,
+				yul::YulStack::Language::StrictAssembly,
+				optimiserSettings,
+				DebugInfoSelection::All()
+			);
+			bool analysisSuccessful = asmStack.parseAndAnalyze("", m_compiler.yulIROptimized(contractName));
+			solAssert(analysisSuccessful, "Code that passed analysis in CompilerStack can't have errors");
 
-				try
-				{
-					asmStack.optimize();
-					obj = std::move(*asmStack.assemble(yul::YulStack::Machine::EVM).bytecode);
-					obj.link(_libraryAddresses);
-					break;
-				}
-				catch (...)
-				{
-					if (forceEnableOptimizer || optimiserSettings == OptimiserSettings::full())
-						throw;
-				}
+			try
+			{
+				asmStack.optimize();
+				obj = std::move(*asmStack.assemble(yul::YulStack::Machine::EVM).bytecode);
+				obj.link(_libraryAddresses);
+				break;
+			}
+			catch (...)
+			{
+				if (forceEnableOptimizer || optimiserSettings == OptimiserSettings::full())
+					throw;
 			}
 		}
 	}
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
index 4865c68a22..c2cea6600a 100644
--- a/test/libsolidity/SolidityExecutionFramework.h
+++ b/test/libsolidity/SolidityExecutionFramework.h
@@ -87,7 +87,6 @@ class SolidityExecutionFramework: public solidity::test::ExecutionFramework
 	std::optional<uint8_t> m_eofVersion;
 	CompilerStack m_compiler;
 	bool m_compileViaYul = false;
-	bool m_compileToEwasm = false;
 	bool m_showMetadata = false;
 	bool m_appendCBORMetadata = true;
 	CompilerStack::MetadataHash m_metadataHash = CompilerStack::MetadataHash::IPFS;
diff --git a/test/libsolidity/errorRecoveryTests/contract_recovery.sol b/test/libsolidity/errorRecoveryTests/contract_recovery.sol
index 980c2beaba..082d91be6c 100644
--- a/test/libsolidity/errorRecoveryTests/contract_recovery.sol
+++ b/test/libsolidity/errorRecoveryTests/contract_recovery.sol
@@ -1,7 +1,6 @@
 contract Errort6 {
   using foo for  ; // missing type name
 }
-
 // ----
 // ParserError 3546: (36-37): Expected type name
 // Warning 3796: (59-60): Recovered in ContractDefinition at '}'.
diff --git a/test/libsolidity/errorRecoveryTests/error_to_eos.sol b/test/libsolidity/errorRecoveryTests/error_to_eos.sol
index 6ecc6d9d63..5d09898601 100644
--- a/test/libsolidity/errorRecoveryTests/error_to_eos.sol
+++ b/test/libsolidity/errorRecoveryTests/error_to_eos.sol
@@ -15,7 +15,6 @@ contract SendCoin {
     return true;
   }
 }
-
 // ----
 // ParserError 6635: (235-236): Expected identifier but got '}'
 // ParserError 6635: (276-284): Expected ';' but got 'contract'
diff --git a/test/libsolidity/lsp/rename/function.sol b/test/libsolidity/lsp/rename/function.sol
index ffd8f6b589..852086c2c7 100644
--- a/test/libsolidity/lsp/rename/function.sol
+++ b/test/libsolidity/lsp/rename/function.sol
@@ -40,7 +40,6 @@ function free() pure
            //      ^^^^^^^^ @FunctionInFreeFunction
         //         ^ @CursorInFreeFunction
 }
-
 // ----
 // -> textDocument/rename {
 //     "newName": "Renamed",
diff --git a/test/libsolidity/lsp/rename/import_directive.sol b/test/libsolidity/lsp/rename/import_directive.sol
index a6b596866a..70d86f5d06 100644
--- a/test/libsolidity/lsp/rename/import_directive.sol
+++ b/test/libsolidity/lsp/rename/import_directive.sol
@@ -26,7 +26,6 @@ contract C
 //  ^^^^ @UserInPublicVariable
 //     ^ @CursorOnUserInPublicVariable
 }
-
 // ----
 // contract:
 // -> textDocument/rename {
diff --git a/test/libsolidity/lsp/rename/variable.sol b/test/libsolidity/lsp/rename/variable.sol
index 39c23bcd72..a3c08f3202 100644
--- a/test/libsolidity/lsp/rename/variable.sol
+++ b/test/libsolidity/lsp/rename/variable.sol
@@ -24,7 +24,6 @@ function freeFunction(C _contract) view returns(int)
     //               ^^^^^^^^ @VariableInFreeFunction
     //                 ^ @CursorOnVariableInFreeFunction
 }
-
 // ----
 // -> textDocument/rename {
 //     "newName": "Renamed",
diff --git a/test/libsolidity/lsp/semanticTokens/enums.sol b/test/libsolidity/lsp/semanticTokens/enums.sol
index ea1655e1ef..848c08e7fe 100644
--- a/test/libsolidity/lsp/semanticTokens/enums.sol
+++ b/test/libsolidity/lsp/semanticTokens/enums.sol
@@ -17,7 +17,6 @@ function getColorEnum() pure returns (Color result)
 {
     result = Color.Red;
 }
-
 // ----
 // -> textDocument/semanticTokens/full {
 // }
diff --git a/test/libsolidity/lsp/semanticTokens/functions.sol b/test/libsolidity/lsp/semanticTokens/functions.sol
index fee9af7887..a7a53495fd 100644
--- a/test/libsolidity/lsp/semanticTokens/functions.sol
+++ b/test/libsolidity/lsp/semanticTokens/functions.sol
@@ -22,7 +22,6 @@ contract Contract
         return true;
     }
 }
-
 // ----
 // functions: @unusedVariable 2072
 // -> textDocument/semanticTokens/full {
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
index 180d89ec18..4d6b920732 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_dynamic_array.sol
@@ -3,6 +3,5 @@ contract C {
         return abi.decode(data, (uint256[]));
     }
 }
-
 // ----
 // f(bytes): 0x20, 0xc0, 0x20, 0x4, 0x3, 0x4, 0x5, 0x6 -> 0x20, 0x4, 0x3, 0x4, 0x5, 0x6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
index 270a5abc06..fd0a59abb8 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array.sol
@@ -7,6 +7,5 @@ contract C {
         return abi.decode(data, (uint256[2][3]));
     }
 }
-
 // ----
 // f(bytes): 0x20, 0xc0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6 -> 1, 2, 3, 4, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
index 5e4d03a7e0..e228099c4e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_static_array_v2.sol
@@ -10,6 +10,5 @@ contract C {
         return abi.decode(data, (uint256[2][3]));
     }
 }
-
 // ----
 // f(bytes): 0x20, 0xc0, 0x1, 0x2, 0x3, 0x4, 0x5, 0x6 -> 1, 2, 3, 4, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
index 7b873951f6..c1b91815ac 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_trivial.sol
@@ -3,6 +3,5 @@ contract C {
         return abi.decode(data, (uint256));
     }
 }
-
 // ----
 // f(bytes): 0x20, 0x20, 0x21 -> 33
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
index eb4bd70fbc..782971c59c 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2.sol
@@ -17,6 +17,5 @@ contract C {
         return abi.decode(abi.encode(s), (S));
     }
 }
-
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
index ddfe343294..8bbb77b9aa 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_calldata.sol
@@ -11,6 +11,5 @@ contract C {
         return abi.decode(data, (S));
     }
 }
-
 // ----
 // f(bytes): 0x20, 0xe0, 0x20, 0x21, 0x40, 0x3, 0xa, 0xb, 0xc -> 0x20, 0x21, 0x40, 0x3, 0xa, 0xb, 0xc
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index 61360868be..c13f004fba 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
@@ -19,7 +19,6 @@ contract C {
         return abi.decode(data, (S));
     }
 }
-
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
 // gas irOptimized: 203166
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol
index 773b7d2c66..1e654d281c 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode.sol
@@ -27,9 +27,6 @@ contract C {
         return abi.encode(bytes2(x));
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f0() -> 0x20, 0x0
 // f1() -> 0x20, 0x40, 0x1, 0x2
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
index d73db5da62..e34d46b74a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_call.sol
@@ -21,6 +21,5 @@ contract C {
         return x;
     }
 }
-
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol
index fb093b41a7..627f0b0c6b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_decode_simple.sol
@@ -4,8 +4,5 @@ contract C {
         return abi.decode(abi.encode(uint256(33), arg), (uint256, bytes));
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_empty_string.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_empty_string.sol
index 7497d3c35a..601fb3cbee 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_empty_string.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_empty_string.sol
@@ -19,7 +19,6 @@ contract C {
         return abi.encodeWithSelector(0x00000001, msg);
     }
 }
-
 // ====
 // ABIEncoderV1Only: true
 // compileViaYul: false
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol
index c5ba49368f..44cf1ab5b9 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_rational.sol
@@ -4,8 +4,5 @@ contract C {
         return abi.encode(1, -2);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 0x40, 0x1, -2
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol b/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol
index b372a4c47a..49bee94ea3 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/calldata_arrays_too_large.sol
@@ -3,7 +3,5 @@ contract C {
         return 7;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256[],uint256): 6, 0x60, 9, 0x8000000000000000000000000000000000000000000000000000000000000002, 1, 2 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol
index 11e79dec03..35cb15077a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/decode_slice.sol
@@ -5,8 +5,5 @@ contract C {
         f = abi.decode(msg.data[4 + 32 : 4 + 32 + 32], (uint256));
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 42, 23 -> 42, 23, 42, 23
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
index 126c6c950b..ef2b07cb52 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/dynamic_memory_copy.sol
@@ -18,7 +18,6 @@ contract C {
         }
     }
 }
-
 // ----
 // test(bytes): 0x20, 0x80, 0x40, 0x60, 0, 0 -> false, false
 // test(bytes): 0x20, 0xC0, 0x40, 0x80, 1, 0x42, 1, 0x42 -> false, false
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol b/test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol
index 3b2b90c6c3..f828ab41e8 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/memory_dynamic_array_and_calldata_bytes.sol
@@ -9,7 +9,6 @@ contract C {
         return f(a, b);
     }
 }
-
 // ====
 // EVMVersion: >homestead
 // ----
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol
index 8db4674c22..849c24a91f 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_empty_string_v2.sol
@@ -8,8 +8,5 @@ contract C {
         return (abi.encode(""), abi.encodePacked(""));
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x40, 0xa0, 0x40, 0x20, 0x0, 0x0
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol
index 106c26ea97..edd319d45a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_rational_v2.sol
@@ -7,8 +7,5 @@ contract C {
         return abi.encode(1, -2);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 0x40, 0x1, -2
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index a0b732caed..cdf2d3087d 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -44,7 +44,6 @@ contract C {
         require(y[0] == "e");
     }
 }
-
 // ----
 // f0() -> 0x20, 0x0
 // f1() -> 0x20, 0x40, 0x1, 0x2
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol b/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol
index 1a6856ff4d..e471257075 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/bool_out_of_bounds.sol
@@ -3,8 +3,6 @@ pragma abicoder               v2;
 contract C {
 	function f(bool b) public pure returns (bool) { return b; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> true
 // f(bool): false -> false
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol
index 9fab29f9f7..2d80957047 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array_dynamic_static_short_decode.sol
@@ -5,8 +5,6 @@ contract C {
         return 23;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256[][2][]): 0x20, 0x01, 0x20, 0x40, 0x60, 0x00, 0x00 -> 23 # this is the common encoding for x.length == 1 && x[0][0].length == 0 && x[0][1].length == 0 #
 // f(uint256[][2][]): 0x20, 0x01, 0x20, 0x00, 0x00 -> 23 # exotic, but still valid encoding #
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
index f044d6f05a..1fca188a68 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_dynamic_array_to_memory.sol
@@ -13,7 +13,6 @@ contract C {
         return a;
     }
 }
-
 // ----
 // f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8 -> 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8
 // f(uint256[][]): 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8, 9 -> 0x20, 2, 0x40, 0xa0, 2, 5, 6, 2, 7, 8
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
index 1b1f360f48..796488a9fe 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -22,7 +22,6 @@ contract C {
         return abi.encode(s);
     }
 }
-
 // ----
 // f_memory(uint256[],uint256[2]): 0x20, 1, 2 -> 0x60, 0x01, 0x02, 1, 2
 // f_memory(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x60, 1, 2, 2, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
index f7ed9daf45..d5a3266f05 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_nested_dynamic_arrays.sol
@@ -16,7 +16,6 @@ contract C {
         return a[which];
     }
 }
-
 // ----
 // f_memory(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 1, 2 -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 2, 1, 2
 // f_memory(uint256[][]): 0x20, 2, 0x40, 0x60, 2, 1, 2 -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 1, 2
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
index d456cdfcc2..347710a30d 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_struct_array_reencode.sol
@@ -33,7 +33,6 @@ contract C {
     }
 
 }
-
 // ----
 // f((uint256[])): 0x20, 0x20, 0 -> 0x20, 0x60, 0x20, 0x20, 0
 // f((uint256[])): 0x20, 0x20, 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
index a97c4f6d8a..745bebe728 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_three_dimensional_dynamic_array_index_access.sol
@@ -23,7 +23,6 @@ contract C {
         return abi.encode(s[i][j].a);
     }
 }
-
 // ====
 // revertStrings: debug
 // ----
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
index b126928546..58f68b8cc2 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_with_garbage.sol
@@ -39,7 +39,6 @@ contract C {
         return (a[which], b[0]);
     }
 }
-
 // ----
 // f_memory(uint256[]): 0x80, 9, 9, 9, 0 -> 0x20, 0
 // f_memory(uint256[]): 0x80, 9, 9, 9, 1, 7 -> 0x20, 1, 7
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol
index b680e9cd23..4286f8f07d 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/cleanup/cleanup.sol
@@ -6,8 +6,6 @@ contract C {
         assembly { v := a  w := b x := c y := d z := e}
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint16,int16,address,bytes3,bool): 1, 2, 3, "a", true -> 1, 2, 3, "a", true
 // f(uint16,int16,address,bytes3,bool): 0xffffff, 0x1ffff, 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, "abcd", 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/enums.sol b/test/libsolidity/semanticTests/abiEncoderV2/enums.sol
index 285bf334f9..1e32347289 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/enums.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/enums.sol
@@ -6,8 +6,6 @@ contract C {
         assembly { x := e }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint8): 0 -> 0
 // f(uint8): 1 -> 1
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol b/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol
index 07d0350800..3fe54eff57 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_bytes.sol
@@ -7,7 +7,6 @@ contract C {
         return f(a, b);
     }
 }
-
 // ----
 // f(uint256[],bytes): 0x40, 0x80, 1, 0xFF, 6, "123456" -> 0x20, 0xc0, 0x40, 0x80, 1, 0xff, 6, "123456"
 // g(uint256[],bytes): 0x40, 0x80, 1, 0xffff, 8, "12345678" -> 0x20, 0xc0, 0x40, 0x80, 1, 0xffff, 8, "12345678"
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol
index a8f4f55541..a734103f10 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/memory_dynamic_array_and_calldata_static_array.sol
@@ -11,7 +11,6 @@ contract C {
         return (a, b);
     }
 }
-
 // ----
 // f(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> 0x20, 0x80, 0x40, 0xff, 1, 0xffff
 // g(uint256[],uint256[1]): 0x40, 0xff, 1, 0xffff -> 0x20, 0x80, 0x40, 0xff, 1, 0xffff
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol
index 73fa9b415f..ce6550d31a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_short.sol
@@ -6,8 +6,6 @@ contract C {
         q = s;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f((int256,uint256,bytes16)): 0xff010, 0xff0002, "abcd" -> 0xff010, 0xff0002, "abcd"
 // f((int256,uint256,bytes16)): 0xff010, 0xff0002, 0x1111222233334444555566667777888800000000000000000000000000000000 -> 0xff010, 0xff0002, left(0x11112222333344445555666677778888)
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol
index 80fe3149b7..cf631b8aec 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_simple.sol
@@ -9,7 +9,5 @@ contract C {
         d = uint16(s.d);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f((uint256,uint8,uint8,bytes2)): 1, 2, 3, "ab" -> 1, 2, 3, 0x6162
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol
index 3e26641024..57e218f7d5 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/struct_validation.sol
@@ -10,8 +10,6 @@ contract C {
 		}
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f((int16,uint8,bytes2)): 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01, 0xff, "ab" -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff01, 0xff, "ab"
 // f((int16,uint8,bytes2)): 0xff010, 0xff, "ab" -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol b/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol
index b1151c2fac..8a22b037f6 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/struct/validation_function_type_inside_struct.sol
@@ -6,8 +6,6 @@ contract C {
     function g(S calldata) external pure returns (uint r) { r = 2; }
     function h(S calldata s) external pure returns (uint r) { s.x; r = 3; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f((function)): "01234567890123456789abcd" -> 1
 // f((function)): "01234567890123456789abcdX" -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
index 3bab26b831..6b6e55e022 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_calldata.sol
@@ -7,6 +7,5 @@ contract C {
         return abi.decode(data, (uint256, bytes));
     }
 }
-
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
index 2703f25e93..9ae6602f31 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple.sol
@@ -3,6 +3,5 @@ contract C {
         return abi.decode(data, (uint256, bytes));
     }
 }
-
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index 93fe74c991..03084f0a35 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -6,7 +6,6 @@ contract C {
         return abi.decode(data, (uint256, bytes));
     }
 }
-
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
 // gas irOptimized: 135693
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
index ab7a94372e..1edede7878 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call.sol
@@ -44,6 +44,5 @@ contract C {
 		return success;
 	}
 }
-
 // ----
 // callExternal() -> true
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
index 8639961410..752298fbb0 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_declaration.sol
@@ -46,7 +46,6 @@ contract C is Base {
     }
 
 }
-
 // ====
 // EVMVersion: >=byzantium
 // ----
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
index 2e2420af35..5f67174cfc 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_call_memory.sol
@@ -21,6 +21,5 @@ contract C {
 		return bytes4(a);
 	}
 }
-
 // ----
 // test() -> 0xa7a0d53700000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol
index 45c71e4d81..f72de4379b 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selector.sol
@@ -15,8 +15,6 @@ contract C {
 		return abi.encodeWithSelector(x, type(uint).max);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f0() -> 0x20, 4, 8234104107246695022420661102507966550300666591269321702959126607540084801536
 // f1() -> 0x20, 0x64, 8234104107246695022420661102507966550300666591269321702959126607540084801536, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol
index a4f24a963e..b23e2dd27e 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_encode_with_selectorv2.sol
@@ -24,8 +24,6 @@ contract C {
 		return abi.encodeWithSelector(x, type(uint).max, s, uint(3));
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f0() -> 0x20, 4, 8234104107246695022420661102507966550300666591269321702959126607540084801536
 // f1() -> 0x20, 0x64, 8234104107246695022420661102507966550300666591269321702959126607540084801536, 862718293348820473429344482784628181556388621521298319395315527974912, 91135606241822717681769169345594720818313984248279388438121731325952, 0
diff --git a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol
index 736794dc4f..02937aced8 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding.sol
@@ -23,7 +23,5 @@ contract Test {
 		return decoded[1][0];
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol
index fe956322f1..0a874914a9 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_2.sol
@@ -24,7 +24,5 @@ contract Test {
 		return decoded[0][0] + decoded[1][0];
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // withinArray() -> FAILURE
diff --git a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol
index 8a7e572cc8..a20e9ae49f 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/offset_overflow_in_array_decoding_3.sol
@@ -17,7 +17,5 @@ contract Test {
 		return decoded[1][0];
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> FAILURE
diff --git a/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol b/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol
index 1d6346259c..b8def58898 100644
--- a/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol
+++ b/test/libsolidity/semanticTests/accessor/accessor_for_const_state_variable.sol
@@ -1,7 +1,5 @@
 contract Lotto {
     uint256 public constant ticketPrice = 555;
 }
-// ====
-// compileToEwasm: also
 // ----
 // ticketPrice() -> 555
diff --git a/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol b/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol
index 16b534585a..51cb8e5e23 100644
--- a/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol
+++ b/test/libsolidity/semanticTests/accessor/accessor_for_state_variable.sol
@@ -1,8 +1,5 @@
 contract Lotto {
     uint256 public ticketPrice = 500;
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // ticketPrice() -> 500
diff --git a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol
index 034abce943..e6f703bd76 100644
--- a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol
+++ b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod.sol
@@ -7,8 +7,5 @@ contract C {
         return 0;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 0
diff --git a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol
index cfcd9463fa..cd32ceffa0 100644
--- a/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol
+++ b/test/libsolidity/semanticTests/arithmetics/addmod_mulmod_zero.sol
@@ -17,9 +17,6 @@ contract C {
         return 2;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0 -> FAILURE, hex"4e487b71", 0x12
 // g(uint256): 0 -> FAILURE, hex"4e487b71", 0x12
diff --git a/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol b/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol
index b626289104..7a8504d531 100644
--- a/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol
+++ b/test/libsolidity/semanticTests/arithmetics/block_inside_unchecked.sol
@@ -7,7 +7,5 @@ contract C {
     }}
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x00
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol b/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol
index 4fc0ff189f..420a52cde4 100644
--- a/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol
+++ b/test/libsolidity/semanticTests/arithmetics/checked_called_by_unchecked.sol
@@ -7,8 +7,6 @@ contract C {
         unchecked { return add(a, b) + c; }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint16,uint16,uint16): 0xe000, 0xe500, 2 -> FAILURE, hex"4e487b71", 0x11
 // f(uint16,uint16,uint16): 0xe000, 0x1000, 0x1000 -> 0x00
diff --git a/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol b/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol
index 267489b419..42658f83a4 100644
--- a/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol
+++ b/test/libsolidity/semanticTests/arithmetics/checked_modifier_called_by_unchecked.sol
@@ -8,8 +8,6 @@ contract C {
         return b + c;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint16,uint16,uint16): 0xe000, 0xe500, 2 -> 58626
 // f(uint16,uint16,uint16): 0x1000, 0xe500, 0xe000 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol b/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol
index d996409ca8..517c4966e9 100644
--- a/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol
+++ b/test/libsolidity/semanticTests/arithmetics/divisiod_by_zero.sol
@@ -7,8 +7,6 @@ contract C {
         return a % b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // div(uint256,uint256): 7, 2 -> 3
 // div(uint256,uint256): 7, 0 -> FAILURE, hex"4e487b71", 0x12 # throws #
diff --git a/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol b/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
index 730209fb58..0ec9f2c790 100644
--- a/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
+++ b/test/libsolidity/semanticTests/arithmetics/exp_associativity.sol
@@ -29,7 +29,6 @@ contract C {
             (b**a**a/b**a**b == (b**(a**a))/(b**(a**b)));
      }
 }
-
 // ----
 // test_hardcode1(uint256,uint256,uint256): 2, 3, 4 -> 2417851639229258349412352
 // test_hardcode2(uint256,uint256,uint256,uint256): 3, 2, 2, 2 -> 43046721
diff --git a/test/libsolidity/semanticTests/arithmetics/signed_mod.sol b/test/libsolidity/semanticTests/arithmetics/signed_mod.sol
index 0239810ab9..3062562069 100644
--- a/test/libsolidity/semanticTests/arithmetics/signed_mod.sol
+++ b/test/libsolidity/semanticTests/arithmetics/signed_mod.sol
@@ -11,9 +11,6 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(int256,int256): 7, 5 -> 2
 // f(int256,int256): 7, -5 -> 2
diff --git a/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol b/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol
index f7859e6c13..140506279d 100644
--- a/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol
+++ b/test/libsolidity/semanticTests/arithmetics/unchecked_called_by_checked.sol
@@ -9,8 +9,6 @@ contract C {
         return add(a, 0x100) + 0x100;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint16): 7 -> 0x0207
 // f(uint16): 0xffff -> 511
diff --git a/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol b/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol
index 6e9cc90aee..ae91ea278f 100644
--- a/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol
+++ b/test/libsolidity/semanticTests/arithmetics/unchecked_div_by_zero.sol
@@ -13,8 +13,6 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // div(uint256,uint256): 7, 2 -> 3
 // div(uint256,uint256): 7, 0 -> FAILURE, hex"4e487b71", 0x12 # throws #
diff --git a/test/libsolidity/semanticTests/array/calldata_array.sol b/test/libsolidity/semanticTests/array/calldata_array.sol
index cdb1c9b6d5..c524d06e00 100644
--- a/test/libsolidity/semanticTests/array/calldata_array.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array.sol
@@ -11,7 +11,5 @@ contract C {
         b = s[1];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256[2]): 42, 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol b/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol
index 99bd31c57f..d21c40caee 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_as_argument_internal_function.sol
@@ -12,8 +12,6 @@ contract Test {
         return f(c[start: end]);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g(uint256[]): 0x20, 4, 1, 2, 3, 4 -> 4, 1
 // h(uint256[],uint256,uint256): 0x60, 1, 3, 4, 1, 2, 3, 4 -> 2, 2
diff --git a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol
index 190d73d79a..dc1d1c31a1 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_dynamic_invalid.sol
@@ -11,8 +11,6 @@ contract C {
         return 42;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256[][]): 0x20, 0x0 -> 42 # valid access stub #
 // f(uint256[][]): 0x20, 0x1 -> FAILURE # invalid on argument decoding #
diff --git a/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol b/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol
index c31ffcb536..006bf2521e 100644
--- a/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol
+++ b/test/libsolidity/semanticTests/array/calldata_array_of_struct.sol
@@ -19,8 +19,5 @@ contract C {
         d = s[1].b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f((uint256,uint256)[]): 0x20, 0x2, 0x1, 0x2, 0x3, 0x4 -> 2, 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/calldata_slice_access.sol b/test/libsolidity/semanticTests/array/calldata_slice_access.sol
index b8eb63829e..76af2214f4 100644
--- a/test/libsolidity/semanticTests/array/calldata_slice_access.sol
+++ b/test/libsolidity/semanticTests/array/calldata_slice_access.sol
@@ -6,8 +6,6 @@ contract C {
         return (x[start:end][index], x[start:][0:end-start][index], x[:end][start:][index]);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256[],uint256,uint256): 0x80, 0, 0, 0, 1, 42 ->
 // f(uint256[],uint256,uint256): 0x80, 0, 1, 0, 1, 42 ->
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol
index 0485012e38..7041ff8513 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_argument_list.sol
@@ -3,7 +3,5 @@ contract C {
         return bytes.concat();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol b/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol
index a83e5462b3..10d31162cb 100644
--- a/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol
+++ b/test/libsolidity/semanticTests/array/concat/bytes_concat_empty_strings.sol
@@ -18,8 +18,6 @@ contract C {
         return bytes.concat(b, "abc", b, "abc", b);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 0
 // g() -> 0x20, 6, "abcabc"
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
index ffd4b54033..fe6f07a40e 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -6,7 +6,6 @@ contract C {
         a = _a;
     }
 }
-
 // ----
 // constructor(): 1, 2, 3 ->
 // gas irOptimized: 140952
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 55e20f9172..6f616f4b53 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -16,7 +16,6 @@ contract c {
         e = data2[5];
     }
 }
-
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
 // gas irOptimized: 208122
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index 03f58e1190..7b5b30b79f 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -10,7 +10,6 @@ contract c {
         return c[1][1] | c[1][2] | c[1][3] | c[1][4];
     }
 }
-
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
 // gas irOptimized: 689714
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
index 0e225f1e59..335afd0ac4 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_abi_signed.sol
@@ -15,6 +15,5 @@ contract c {
         return x;
     }
 }
-
 // ----
 // test() -> 0x20, 0x8, -1, -1, 8, -16, -2, 6, 8, -1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
index 113269ea2b..4ab3d0bd87 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -19,8 +19,6 @@ contract c {
         y = data2[0][4];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 3, 4
 // gas irOptimized: 169602
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
index 1582b71183..fcdcf9c2d2 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
@@ -15,7 +15,6 @@ contract c {
         y = data2[4];
     }
 }
-
 // ----
 // test() -> 5, 4
 // gas irOptimized: 252986
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
index 8b750efa7a..943a5206ee 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
@@ -9,7 +9,6 @@ contract c {
         y = data2[8];
     }
 }
-
 // ----
 // test() -> 9, 4
 // gas irOptimized: 123142
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol
index 00c69b7dee..2fccff774e 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_simple.sol
@@ -9,8 +9,6 @@ contract C {
         return (data2[0], data2[1]);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> left(0x01), left(0x02)
 // gas legacy: 90001
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
index f7f0560653..3b0a229c96 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
@@ -12,9 +12,6 @@ contract c {
         y = data1[30]; // should be cleared
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 8, 0
 // gas irOptimized: 196278
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index a3f800b083..31addad5ec 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -15,8 +15,6 @@ contract c {
             res2 |= uint(uint16(data2[16 + i])) * 0x10000**i;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
 // gas irOptimized: 104665
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
index 0e0a26fc9d..0a2bcffce2 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover2.sol
@@ -17,8 +17,6 @@ contract c {
         r3 = data2[5];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 0x04000000000000000000000000000000000000000000000000, 0x0, 0x0
 // gas irOptimized: 93858
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index 160697c6b1..0a306cade4 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -16,9 +16,6 @@ contract c {
         e = data2[9];
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
 // gas irOptimized: 273576
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index c2ab09c643..de100d0964 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -16,9 +16,6 @@ contract c {
         e = data2[9];
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
 // gas irOptimized: 233285
diff --git a/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
index e139e200ff..53ca44cdc5 100644
--- a/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
@@ -50,7 +50,6 @@ contract C {
         return m[0];
     }
 }
-
 // ----
 // from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
 // gas irOptimized: 150061
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol
index 40990ba812..ebaada7647 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_storage_to_memory.sol
@@ -37,7 +37,6 @@ contract C {
         return a4;
     }
 }
-
 // ----
 // test1() -> 0x20, 2, 0x40, 0xa0, 2, 1, 2, 3, 3, 4, 5
 // test2() -> 0x20, 0x40, 0xc0, 3, 6, 7, 8, 1, 9
diff --git a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
index cbb87a2788..e335d86849 100644
--- a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
@@ -10,8 +10,6 @@ contract C {
         return (a[32], b[1], c[2]);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1, 2, 3
 // gas irOptimized: 131932
diff --git a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
index 5c36ed3f3a..9fcbbffcea 100644
--- a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
@@ -35,7 +35,6 @@ contract C {
         return m[0];
     }
 }
-
 // ----
 // from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
 // gas irOptimized: 147892
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol
index 6cdd48bf1c..d1202e27eb 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_memory_to_storage.sol
@@ -6,7 +6,5 @@ contract C {
     return s[0];
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> "a"
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol
index e996714ce2..84e11c1384 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_memory.sol
@@ -5,7 +5,5 @@ contract C {
     return data[0];
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> "a"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
index 25a2c05f16..fcf4aca21e 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_of_struct_to_memory.sol
@@ -20,6 +20,5 @@ contract C {
         d = m[1].b;
     }
 }
-
 // ----
 // f((uint256,uint256)[]): 0x20, 0x2, 0x1, 0x2, 0x3, 0x4 -> 2, 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol
index fbc1d03d94..ace6550bb8 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_static_to_memory.sol
@@ -4,7 +4,5 @@ contract C {
         return (m1[0], m1[1]);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256[2]): 43, 57 -> 43, 57
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
index 90b5b85d6a..26f3d587f0 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
@@ -10,7 +10,6 @@ contract C {
         return m[0];
     }
 }
-
 // ====
 // compileViaYul: true
 // ----
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol
index 57f6b3a3e7..2409893e36 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_bytes_to_storage.sol
@@ -5,7 +5,5 @@ contract C {
     return s[0];
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bytes): 0x20, 0x08, "abcdefgh" -> "a"
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol b/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
index 28eecc4f2e..db6625c8e7 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_dynamic_array_to_memory.sol
@@ -10,6 +10,5 @@ contract C {
         return (a.length, m);
     }
 }
-
 // ----
 // f(uint256[][]): 0x20, 0x1, 0x20, 0x2, 0x17, 0x2a -> 0x1, 0x40, 0x2, 0x17, 0x2a
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index d4d5359501..18795ff798 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -13,7 +13,6 @@ contract C {
         return 7;
     }
 }
-
 // ----
 // test() -> 7
 // gas irOptimized: 122477
diff --git a/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
index 20b894082c..95ba9d8ed8 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_internal_function_array_to_storage.sol
@@ -16,9 +16,6 @@ contract C {
         return 2;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // one() -> 3
 // gas legacy: 140253
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index ca6362b5c0..8277df30a1 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -16,8 +16,6 @@ contract sender {
     bytes savedData1;
     bytes savedData2;
 }
-// ====
-// compileToEwasm: false
 // ----
 // (): 7 ->
 // gas irOptimized: 110820
diff --git a/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy_ir.sol b/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy_ir.sol
index 2af9270624..3704e36821 100644
--- a/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy_ir.sol
+++ b/test/libsolidity/semanticTests/array/copying/dirty_memory_bytes_to_storage_copy_ir.sol
@@ -14,6 +14,5 @@ contract C {
 }
 // ====
 // compileViaYul: true
-// compileToEwasm: also
 // ----
 // f() -> 0x6465616462656566000000000000000000000000000000000000000000000010
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
index f435d91363..eb0eb108fb 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
@@ -27,8 +27,6 @@ contract C {
         return s3[0];
     }
 }
-
-
 // ====
 // compileViaYul: true
 // ----
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
index 3a52e0a584..9dbc64f734 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
@@ -27,8 +27,6 @@ contract C {
         return s3[0];
     }
 }
-
-
 // ====
 // compileViaYul: true
 // ----
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol
index ee715b5b6c..e3843537fb 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_memory.sol
@@ -31,7 +31,6 @@ contract C {
         return tmp[0];
     }
 }
-
 // ----
 // test1(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
 // test2(uint8[][1][]): 0x20, 2, 0x40, 0xe0, 0x20, 3, 12, 13, 14, 0x20, 3, 15, 16, 17 -> 0x20, 0x20, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol
index 93c458341b..5040a72cad 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_calldata_to_storage.sol
@@ -22,7 +22,6 @@ contract C {
         require(a2[1][1][1] == 0);
     }
 }
-
 // ----
 // test(uint8[2][2][2]): 1, 2, 3, 4, 5, 6, 7, 8
 // test2(uint8[2][2]): 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol
index ab3d472d6f..3058df842a 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_memory.sol
@@ -31,7 +31,6 @@ contract C {
         return tmp[0];
     }
 }
-
 // ----
 // test1(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9 -> 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
 // test2(uint8[][1][]): 0x20, 2, 0x40, 0xe0, 0x20, 3, 12, 13, 14, 0x20, 3, 15, 16, 17 -> 0x20, 0x20, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol
index 2dd2e7aa37..2f4b4ca7c9 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_memory_to_storage.sol
@@ -22,7 +22,6 @@ contract C {
         require(a2[1][1][1] == 0);
     }
 }
-
 // ----
 // test(uint8[2][2][2]): 1, 2, 3, 4, 5, 6, 7, 8
 // test2(uint8[2][2]): 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol
index 2f78042a48..e30ca769bd 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_memory.sol
@@ -60,7 +60,6 @@ contract C {
         return tmp;
     }
 }
-
 // ----
 // test1() -> 0x20, 2, 0x40, 0xa0, 2, 3, 4, 2, 5, 6
 // test2() -> 0x20, 2, 0x40, 0xa0, 2, 6, 7, 2, 8, 9
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
index c402c14b20..c962d815f4 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
@@ -68,7 +68,6 @@ contract C {
         require(dst4[1][1] == src4[0][1][1]);
     }
 }
-
 // ----
 // test1() ->
 // gas irOptimized: 150508
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol
index 159486eda6..3d424a7c59 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_memory.sol
@@ -18,7 +18,6 @@ contract C {
         return a;
     }
 }
-
 // ----
 // test1((uint8,uint8)[1][2]): 1, 2, 3, 4 -> 1, 2, 3, 4
 // test2((uint8,uint8)[1][]): 0x20, 3, 7, 11, 13, 17, 19, 23 -> 0x20, 3, 7, 11, 13, 17, 19, 23
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
index 60d65cb59b..fe60365e4a 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
@@ -25,8 +25,6 @@ contract C {
         return s3;
     }
 }
-
-
 // ====
 // compileViaYul: true
 // ----
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol
index 55a4d6aedb..6c8da98dd6 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_memory.sol
@@ -18,7 +18,6 @@ contract C {
         r = a;
     }
 }
-
 // ----
 // test1((uint8,uint8)[1][2]): 1, 2, 3, 4 -> 1, 2, 3, 4
 // test2((uint8,uint8)[1][]): 0x20, 3, 7, 11, 13, 17, 19, 23 -> 0x20, 3, 7, 11, 13, 17, 19, 23
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
index 13b3502621..ccf2f2a208 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
@@ -25,8 +25,6 @@ contract C {
         return s3;
     }
 }
-
-
 // ====
 // compileViaYul: true
 // ----
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
index 64c7f06a57..fb06b31887 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
@@ -59,7 +59,6 @@ contract C {
         require(dst3[1][0].y == src3[1][0].y);
     }
 }
-
 // ====
 // compileViaYul: true
 // ----
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol
index 58240492ca..3a5e44a5df 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_with_nested_array_from_storage_to_memory.sol
@@ -37,7 +37,6 @@ contract C {
         return s2[0];
     }
 }
-
 // ====
 // compileViaYul: true
 // ----
diff --git a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
index 5b72055530..6e44ed2686 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
@@ -26,7 +26,6 @@ contract C {
 	require(a2[1].length == 0);
     }
 }
-
 // ====
 // compileViaYul: true
 // ----
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol
index b1410f7e27..f49b4923b8 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed.sol
@@ -9,7 +9,5 @@ contract C {
         return (m[0], m[16], m[32]);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2, 3, 4
diff --git a/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol b/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol
index 3856e23dc2..9d2dbd8c28 100644
--- a/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol
+++ b/test/libsolidity/semanticTests/array/create_dynamic_array_with_zero_length.sol
@@ -4,7 +4,5 @@ contract C {
         return 7;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol b/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol
index ed6a374037..1d886a8c0e 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array_too_large.sol
@@ -19,8 +19,6 @@ contract C {
         y[0] = 23;
         return x[2];
     }}
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x41
 // g() -> FAILURE, hex"4e487b71", 0x41
diff --git a/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol b/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol
index ad5c392792..2396e3179b 100644
--- a/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/array/create_multiple_dynamic_arrays.sol
@@ -29,7 +29,5 @@ contract C {
         return 0;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol b/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
index 77096a645c..b735d182d5 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_bytes_array.sol
@@ -29,7 +29,6 @@ contract C {
         assert(size == 0);
     }
 }
-
 // ----
 // f() -> 0
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol b/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
index 54abc495c9..53a66af343 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_memory_array.sol
@@ -10,6 +10,5 @@ contract C {
         }
     }
 }
-
 // ----
 // len() -> 0
diff --git a/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol b/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
index 316b8d9efd..2c1421eee9 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_on_array_of_structs.sol
@@ -15,6 +15,5 @@ contract C {
         return true;
     }
 }
-
 // ----
 // f() -> true # This code interprets x as an array length and thus will go out of gas. neither of the two should throw due to out-of-bounds access #
diff --git a/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol b/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
index 0bb4296747..4136456684 100644
--- a/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/delete/delete_storage_array.sol
@@ -32,7 +32,6 @@ contract C {
         }
     }
 }
-
 // ----
 // len() -> 0
 // val() -> 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index d6e7160be9..bce78baa41 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -38,7 +38,6 @@ contract c {
         while (ids.length < l2) ids.push();
     }
 }
-
 // ----
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
diff --git a/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol b/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
index 844324f325..5cf35ef3ed 100644
--- a/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_out_of_bounds_array_access.sol
@@ -19,7 +19,6 @@ contract c {
         return data.length;
     }
 }
-
 // ----
 // length() -> 0
 // get(uint256): 3 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/external_array_args.sol b/test/libsolidity/semanticTests/array/external_array_args.sol
index 53cc757725..da6664f9e9 100644
--- a/test/libsolidity/semanticTests/array/external_array_args.sol
+++ b/test/libsolidity/semanticTests/array/external_array_args.sol
@@ -6,7 +6,5 @@ contract c {
         cv = c[c_index];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test(uint256[8],uint256[],uint256[5],uint256,uint256,uint256): 1, 2, 3, 4, 5, 6, 7, 8, 0x220, 21, 22, 23, 24, 25, 0, 1, 2, 3, 11, 12, 13 -> 1, 12, 23
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index 51f93db7a2..337946a20c 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -7,8 +7,6 @@ contract c {
     }
     function clear() public { delete data; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // storageEmpty -> 1
 // fill() ->
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 519a11131c..9d8dc0bc7b 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -16,7 +16,6 @@ contract B {
         res2 = a.f(1000);
     }
 }
-
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
 // gas irOptimized: 115828
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol
index eb167ee0c8..b65a3d254d 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_storage.sol
@@ -33,8 +33,6 @@ contract c {
         l2 = ids.length;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // setIDStatic(uint256): 0xb ->
 // getID(uint256): 0x2 -> 0xb
diff --git a/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol b/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol
index e22b56cfc1..d641cd83f1 100644
--- a/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol
+++ b/test/libsolidity/semanticTests/array/fixed_bytes_length_access.sol
@@ -5,7 +5,5 @@ contract C {
         return (x.length, bytes16(uint128(2)).length, a.length + 7);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bytes32): "789" -> 32, 16, 8
diff --git a/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol b/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol
index d82ef152c9..1b3b640808 100644
--- a/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol
+++ b/test/libsolidity/semanticTests/array/fixed_out_of_bounds_array_access.sol
@@ -14,9 +14,6 @@ contract c {
         return data.length;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // length() -> 4
 // set(uint256,uint256): 3, 4 -> true
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 8bb4545b2b..7e29d82a81 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -40,7 +40,6 @@ contract C {
         return this.e;
     }
 }
-
 // ----
 // test() -> 5, 6, 7
 // gas irOptimized: 260895
diff --git a/test/libsolidity/semanticTests/array/function_memory_array.sol b/test/libsolidity/semanticTests/array/function_memory_array.sol
index 322eed73ea..bdd23c6753 100644
--- a/test/libsolidity/semanticTests/array/function_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/function_memory_array.sol
@@ -30,8 +30,6 @@ contract C {
         return arr[i](x);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test(uint256,uint256): 10, 0 -> 11
 // test(uint256,uint256): 10, 1 -> 12
diff --git a/test/libsolidity/semanticTests/array/indexAccess/index_access.sol b/test/libsolidity/semanticTests/array/indexAccess/index_access.sol
index b90bbb12e3..c618ae8e45 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/index_access.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/index_access.sol
@@ -13,8 +13,6 @@ contract C {
         ret[7] = bytesValue[0];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // to_little_endian_64(uint64): 0 -> 0x20, 8, 0x00
 // to_little_endian_64(uint64): 0x0102030405060708 -> 0x20, 8, 0x0807060504030201000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol b/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol
index c1481fc997..0525f6f283 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_ints.sol
@@ -3,8 +3,5 @@ contract C {
         return ([1, 2, 3, 4][2]);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 3
diff --git a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol b/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol
index b826dc13d0..bf6c0b0ee8 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/inline_array_index_access_strings.sol
@@ -9,9 +9,6 @@ contract C {
         tester = f();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() ->
 // tester() -> 0x20, 0x3, "abc"
diff --git a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol b/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol
index ff83a43101..7a8a18670e 100644
--- a/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol
+++ b/test/libsolidity/semanticTests/array/indexAccess/memory_arrays_index_access_write.sol
@@ -10,7 +10,5 @@ contract Test {
         return data;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x07
diff --git a/test/libsolidity/semanticTests/array/inline_array_return.sol b/test/libsolidity/semanticTests/array/inline_array_return.sol
index d6673882f6..25302dcbfd 100644
--- a/test/libsolidity/semanticTests/array/inline_array_return.sol
+++ b/test/libsolidity/semanticTests/array/inline_array_return.sol
@@ -10,8 +10,5 @@ contract C {
         return (tester[0], tester[1], tester[2], tester[3], tester[4]);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/array/inline_array_singleton.sol b/test/libsolidity/semanticTests/array/inline_array_singleton.sol
index 870c853e14..b14ade6e48 100644
--- a/test/libsolidity/semanticTests/array/inline_array_singleton.sol
+++ b/test/libsolidity/semanticTests/array/inline_array_singleton.sol
@@ -4,7 +4,5 @@ contract C {
         return [4][0];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 4
diff --git a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol
index 18626b055d..e145d281c9 100644
--- a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol
+++ b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_ints.sol
@@ -6,8 +6,5 @@ contract C {
         return (z[0], z[1]);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 3, 6
diff --git a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
index 2b456ca9aa..7dfe6e6425 100644
--- a/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
+++ b/test/libsolidity/semanticTests/array/inline_array_storage_to_memory_conversion_strings.sol
@@ -7,8 +7,5 @@ contract C {
         return (x[1], x[2]);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x40, 0x80, 0x3, "ray", 0x2, "mi"
diff --git a/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol b/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol
index 23f2d89c70..9cb16349a1 100644
--- a/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol
+++ b/test/libsolidity/semanticTests/array/inline_array_strings_from_document.sol
@@ -4,9 +4,6 @@ contract C {
         return (x[i]);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0 -> 0x20, 0x4, "This"
 // f(uint256): 1 -> 0x20, 0x2, "is"
diff --git a/test/libsolidity/semanticTests/array/memory.sol b/test/libsolidity/semanticTests/array/memory.sol
index 6bde7c26cd..88c18d4949 100644
--- a/test/libsolidity/semanticTests/array/memory.sol
+++ b/test/libsolidity/semanticTests/array/memory.sol
@@ -9,7 +9,6 @@ contract C {
         return this.h(n) * 2;
     }
 }
-
 // ----
 // h(uint256[4]): 1, 2, 3, 4 -> 10
 // i(uint256[4]): 1, 2, 3, 4 -> 20
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol b/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol
index 1750711e13..6130130da2 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_empty_exception.sol
@@ -6,7 +6,5 @@ contract c {
         return true;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> FAILURE, hex"4e487b71", 0x31
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol b/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol
index ce41673e06..43d7c3a983 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_isolated.sol
@@ -8,7 +8,5 @@ contract c {
         x = 3;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 3
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol
index 81e1eb020d..8f0152180e 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop.sol
@@ -12,7 +12,5 @@ contract c {
         l = data.length;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 2, 1, 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
index 3528e4c818..c64d93c120 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_copy_long.sol
@@ -7,7 +7,6 @@ contract c {
         return data;
     }
 }
-
 // ----
 // test() -> 0x20, 29, 0x0303030303030303030303030303030303030303030303030303030303000000
 // gas irOptimized: 109310
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol
index 5d573a0962..d860275e40 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_empty_exception.sol
@@ -9,7 +9,5 @@ contract c {
         return true;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> FAILURE, hex"4e487b71", 0x31
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol
index 519b0c5abe..f742217125 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_isolated.sol
@@ -8,7 +8,5 @@ contract c {
         x = 3;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 3
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index 6416afb2da..623b58739a 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -7,7 +7,6 @@ contract c {
         return data;
     }
 }
-
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
 // gas irOptimized: 108053
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol
index 4b2e88ffa8..a89f8a2ace 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_storage_empty.sol
@@ -9,8 +9,6 @@ contract c {
         data.pop();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() ->
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol b/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
index 4341681192..e7a3bdbd1f 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_packed_array.sol
@@ -11,7 +11,6 @@ contract c {
         return (x[0], x[1], x[2], x[3]);
     }
 }
-
 // ----
 // test() -> 1, 2, 3, 4
 // gas irOptimized: 93017
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push.sol b/test/libsolidity/semanticTests/array/push/byte_array_push.sol
index 28afd9f89c..2e0288d243 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push.sol
@@ -13,7 +13,5 @@ contract c {
         if (l != 0x03) return true;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> false
diff --git a/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol
index 6fada19c57..8288e1e861 100644
--- a/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/short_fixed_array_cleanup.sol
@@ -7,8 +7,6 @@ contract c {
     }
     function clear() public { delete data; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // storageEmpty -> 1
 // fill() ->
diff --git a/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol b/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol
index 282ccba09b..c9c489a8fc 100644
--- a/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol
+++ b/test/libsolidity/semanticTests/array/slices/array_calldata_assignment.sol
@@ -4,7 +4,5 @@ contract C {
         return x[i];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256[],uint256[],uint256): 0x60, 0xA0, 1, 1, 0, 2, 1, 2 -> 2
diff --git a/test/libsolidity/semanticTests/array/storage_array_ref.sol b/test/libsolidity/semanticTests/array/storage_array_ref.sol
index 0a896fed4b..37292ae874 100644
--- a/test/libsolidity/semanticTests/array/storage_array_ref.sol
+++ b/test/libsolidity/semanticTests/array/storage_array_ref.sol
@@ -38,7 +38,6 @@ contract Store is BinarySearch {
         return find(data, v);
     }
 }
-
 // ----
 // find(uint256): 7 -> -1
 // add(uint256): 7 ->
diff --git a/test/libsolidity/semanticTests/array/string_allocation_bug.sol b/test/libsolidity/semanticTests/array/string_allocation_bug.sol
index bc974a4383..d6dadb78a9 100644
--- a/test/libsolidity/semanticTests/array/string_allocation_bug.sol
+++ b/test/libsolidity/semanticTests/array/string_allocation_bug.sol
@@ -16,7 +16,5 @@ contract Sample {
         p[0] = m;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // p(uint256): 0x0 -> 0xbbbb, 0xcccc, 0x80, 0xc0, 0x05, "hello", 0x05, "world"
diff --git a/test/libsolidity/semanticTests/array/strings_in_struct.sol b/test/libsolidity/semanticTests/array/strings_in_struct.sol
index 1cc6b5a932..bacf8dec7a 100644
--- a/test/libsolidity/semanticTests/array/strings_in_struct.sol
+++ b/test/libsolidity/semanticTests/array/strings_in_struct.sol
@@ -28,8 +28,6 @@ contract buggystruct {
         return bug.last;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // getFirst() -> 0x0a
 // getSecond() -> 0x14
diff --git a/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol b/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol
index c0c5800721..d74db942c6 100644
--- a/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol
+++ b/test/libsolidity/semanticTests/asmForLoop/for_loop_break.sol
@@ -9,7 +9,5 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 6
diff --git a/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol b/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol
index 4be20d6ba5..f25a3c06a0 100644
--- a/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol
+++ b/test/libsolidity/semanticTests/asmForLoop/for_loop_continue.sol
@@ -9,7 +9,5 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 5
diff --git a/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol b/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol
index 620f2c3baa..3a13e9f0e6 100644
--- a/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol
+++ b/test/libsolidity/semanticTests/asmForLoop/for_loop_nested.sol
@@ -13,8 +13,6 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0 -> 2
 // f(uint256): 1 -> 18
diff --git a/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol b/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol
index 2e8a66363e..2fc479d0e1 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/assignment_to_const_var_involving_keccak.sol
@@ -5,7 +5,5 @@ contract C {
         return x;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
diff --git a/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol b/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol
index dc6e26f141..008a0467d4 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/blockhash.sol
@@ -9,8 +9,6 @@ contract C {
         return blockhash(3);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x3737373737373737373737373737373737373737373737373737373737373738
 // g() -> 0x3737373737373737373737373737373737373737373737373737373737373739
diff --git a/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol b/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol
index fa1d01d403..0b532da0ec 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/blockhash_shadow_resolution.sol
@@ -2,7 +2,5 @@ contract C {
     function blockhash(uint256 blockNumber) public returns(bytes32) { bytes32 x; return x; }
     function f() public returns(bytes32) { return blockhash(3); }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol b/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol
index 9a8132950c..2e771032bc 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/function_types_sig.sol
@@ -19,8 +19,6 @@ contract C {
         return this.x.selector;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x26121ff000000000000000000000000000000000000000000000000000000000
 // g() -> 0x26121ff000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol
index 1898f03113..f75c569e77 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_empty.sol
@@ -3,8 +3,5 @@ contract C {
         return keccak256("");
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
diff --git a/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol b/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
index 725d984d86..1904e81402 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/keccak256_with_bytes.sol
@@ -8,6 +8,5 @@ contract c {
         return keccak256(data) == keccak256("foo");
     }
 }
-
 // ----
 // foo() -> true
diff --git a/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol b/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol
index 21c5ed76db..f28658fe7d 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/msg_sig.sol
@@ -3,7 +3,5 @@ contract test {
         return msg.sig;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // foo(uint256): 0x0 -> 0x2fbebd3800000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol b/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol
index a50521610f..7ff53efaa4 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/msg_sig_after_internal_call_is_same.sol
@@ -7,7 +7,5 @@ contract test {
         return boo();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // foo(uint256): 0x0 -> 0x2fbebd3800000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
index c79625d3cc..330fafc4d8 100644
--- a/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
+++ b/test/libsolidity/semanticTests/builtinFunctions/ripemd160_empty.sol
@@ -3,6 +3,5 @@ contract C {
         return ripemd160("");
     }
 }
-
 // ----
 // f() -> 0x9c1185a5c5e9fc54612808977ee8f548b2258d31000000000000000000000000
diff --git a/test/libsolidity/semanticTests/c99_scoping_activation.sol b/test/libsolidity/semanticTests/c99_scoping_activation.sol
index 394b211d62..6edf9db476 100644
--- a/test/libsolidity/semanticTests/c99_scoping_activation.sol
+++ b/test/libsolidity/semanticTests/c99_scoping_activation.sol
@@ -34,8 +34,6 @@ contract test {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 3
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol b/test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol
index 6101359680..634e35693c 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_array_index_range_access.sol
@@ -25,8 +25,6 @@ contract C {
         return x[:e][idx];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256[],uint256,uint256): 0x60, 2, 4, 5, 1, 2, 3, 4, 5 -> 2
 // f(uint256[],uint256,uint256): 0x60, 2, 6, 5, 1, 2, 3, 4, 5 -> FAILURE
diff --git a/test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol b/test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol
index 826c5f723b..42c360be0b 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_array_three_dimensional.sol
@@ -8,8 +8,6 @@ contract C {
 		d = x[i][j][k];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256[][2][],uint256,uint256,uint256): 0x80, 0, 0, 0, 1, 0x20, 0x40, 0x80, 1, 42, 1, 23 -> 1, 2, 1, 42
 // f(uint256[][2][],uint256,uint256,uint256): 0x80, 0, 1, 0, 1, 0x20, 0x40, 0x80, 1, 42, 1, 23 -> 1, 2, 1, 23
diff --git a/test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol
index e41b75c2df..1b6e7379b4 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_attached_to_bytes.sol
@@ -13,6 +13,5 @@ contract C {
         return _b.reverse();
     }
 }
-
 // ----
 // test(uint256,bytes,uint256): 7, 0x60, 4, 2, "ab" -> "b", "a"
diff --git a/test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol
index 3ebb4787ac..5803ef6e84 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_attached_to_dynamic_array_or_slice.sol
@@ -17,7 +17,6 @@ contract C {
         return _a[:].reverse();
     }
 }
-
 // ----
 // testArray(uint256,uint256[],uint256): 7, 0x60, 4, 2, 66, 77 -> 77, 66
 // testSlice(uint256,uint256[],uint256): 7, 0x60, 4, 2, 66, 77 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol b/test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol
index e43b17561c..a5158dad66 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_attached_to_static_array.sol
@@ -13,6 +13,5 @@ contract C {
         return _a.reverse();
     }
 }
-
 // ----
 // test(uint256,uint256[2],uint256): 7, 66, 77, 4 -> 77, 66
diff --git a/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol b/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol
index 493b1ef0b2..45b323b3d1 100644
--- a/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol
+++ b/test/libsolidity/semanticTests/calldata/calldata_struct_cleaning.sol
@@ -16,8 +16,6 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f((uint8,bytes1)): 0x12, hex"3400000000000000000000000000000000000000000000000000000000000000" -> 0x12, hex"3400000000000000000000000000000000000000000000000000000000000000" # double check that the valid case goes through #
 // f((uint8,bytes1)): 0x1234, hex"5678000000000000000000000000000000000000000000000000000000000000" -> FAILURE
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
index 8df2741584..3dd93c12e4 100644
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -7,7 +7,6 @@ contract c {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileToEwasm: false
 // ----
 // (): 1, 2, 3, 4, 5 ->
 // gas irOptimized: 155155
diff --git a/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol b/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol
index 821da2dac6..003cdb0ec7 100644
--- a/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol
+++ b/test/libsolidity/semanticTests/cleanup/bool_conversion_v2.sol
@@ -11,8 +11,6 @@ contract C {
         _out = _in;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): 0x0 -> 0x0
 // f(bool): 0x1 -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol
index 916f2e5aad..8718cb2e6a 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_shortening.sol
@@ -25,9 +25,6 @@ contract C {
         require(z == 0x1122334455667788990011223344556677889900);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x1122334455667788990011223344556677889900
 // g() -> 0x1122334455667788990011223344556677889900
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol
index d6157ab23e..73db35c32c 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_address_types_v2.sol
@@ -13,8 +13,6 @@ contract C {
         return 0;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(address): 0xffff1234567890123456789012345678901234567890 -> FAILURE # We input longer data on purpose.#
 // g(address): 0xffff1234567890123456789012345678901234567890 -> FAILURE
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol
index a99b82a085..b26ba5640c 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_shortening_newCodeGen.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // f() -> 0xffff000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol
index f481ffed6b..8a95f10c09 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_bytes_types_v2.sol
@@ -10,7 +10,5 @@ contract C {
         return 0;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bytes2,uint16): "abc", 0x40102 -> FAILURE # We input longer data on purpose. #
diff --git a/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol b/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol
index 51815f5e96..e0e62971cf 100644
--- a/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol
+++ b/test/libsolidity/semanticTests/cleanup/cleanup_in_compound_assign.sol
@@ -8,7 +8,5 @@ contract C {
         return (x, y);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 0xff, 0xff
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol
index a5145bcebd..746f21ef51 100644
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol
+++ b/test/libsolidity/semanticTests/cleanup/exp_cleanup.sol
@@ -6,8 +6,5 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol
index 663716a126..62f927b5bb 100644
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol
+++ b/test/libsolidity/semanticTests/cleanup/exp_cleanup_direct.sol
@@ -5,8 +5,5 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol
index 12c3afba47..de55afa9c6 100644
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol
+++ b/test/libsolidity/semanticTests/cleanup/exp_cleanup_nonzero_base.sol
@@ -6,8 +6,5 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x1
diff --git a/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol b/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol
index b282948cb0..7b81d0a1c5 100644
--- a/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol
+++ b/test/libsolidity/semanticTests/cleanup/exp_cleanup_smaller_base.sol
@@ -9,7 +9,5 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x00
diff --git a/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol b/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol
index 0385a4c308..4426f0c0c5 100644
--- a/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol
+++ b/test/libsolidity/semanticTests/constantEvaluator/negative_fractional_mod.sol
@@ -5,7 +5,5 @@ contract C {
         return (x, (-(-t % 3)) * 5);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 11, 10
diff --git a/test/libsolidity/semanticTests/constantEvaluator/rounding.sol b/test/libsolidity/semanticTests/constantEvaluator/rounding.sol
index a7c1b4b452..837e87dc87 100644
--- a/test/libsolidity/semanticTests/constantEvaluator/rounding.sol
+++ b/test/libsolidity/semanticTests/constantEvaluator/rounding.sol
@@ -9,7 +9,5 @@ contract C {
         return (x.length, c, y.length, -d);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2, 2, 2, 2
diff --git a/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol b/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol
index 3da3ff646c..ae405d8f36 100644
--- a/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol
+++ b/test/libsolidity/semanticTests/constants/asm_address_constant_regression.sol
@@ -7,8 +7,5 @@ contract C {
     assembly { z := e }
   }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x00
diff --git a/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol b/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol
index 89d2e250d4..4f90764635 100644
--- a/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol
+++ b/test/libsolidity/semanticTests/constants/asm_constant_file_level.sol
@@ -5,7 +5,5 @@ contract C {
     assembly { z := e }
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x1212121212121212121212121000002134593163
diff --git a/test/libsolidity/semanticTests/constants/constant_string.sol b/test/libsolidity/semanticTests/constants/constant_string.sol
index 638b243822..3b53102baa 100644
--- a/test/libsolidity/semanticTests/constants/constant_string.sol
+++ b/test/libsolidity/semanticTests/constants/constant_string.sol
@@ -15,9 +15,6 @@ contract C {
         return bytes(c);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 3, "\x03\x01\x02"
 // g() -> 0x20, 3, "\x03\x01\x02"
diff --git a/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol b/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol
index a8822176da..0ff332c4f5 100644
--- a/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol
+++ b/test/libsolidity/semanticTests/constants/constant_string_at_file_level.sol
@@ -23,9 +23,6 @@ contract C {
         return (x, choices, st);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 3, "\x03\x01\x02"
 // g() -> 0x20, 3, "\x03\x01\x02"
diff --git a/test/libsolidity/semanticTests/constants/constant_variables.sol b/test/libsolidity/semanticTests/constants/constant_variables.sol
index 4ae4edb976..2ecd6e76a6 100644
--- a/test/libsolidity/semanticTests/constants/constant_variables.sol
+++ b/test/libsolidity/semanticTests/constants/constant_variables.sol
@@ -4,8 +4,5 @@ contract Foo {
     ActionChoices constant choices = ActionChoices.GoLeft;
     bytes32 constant st = "abc\x00\xff__";
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // constructor() ->
diff --git a/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol b/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol
index a1ae3911fc..764ffc2450 100644
--- a/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol
+++ b/test/libsolidity/semanticTests/constants/constants_at_file_level_referencing.sol
@@ -31,9 +31,6 @@ contract C {
         return fre();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 3, "\x03\x01\x02"
 // g() -> 0x20, 3, "\x03\x01\x02"
diff --git a/test/libsolidity/semanticTests/constants/consteval_array_length.sol b/test/libsolidity/semanticTests/constants/consteval_array_length.sol
index bdf95a9b9e..91e929834d 100644
--- a/test/libsolidity/semanticTests/constants/consteval_array_length.sol
+++ b/test/libsolidity/semanticTests/constants/consteval_array_length.sol
@@ -8,7 +8,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // constructor() ->
diff --git a/test/libsolidity/semanticTests/constants/function_unreferenced.sol b/test/libsolidity/semanticTests/constants/function_unreferenced.sol
index 2b80c440fc..d7578fecea 100644
--- a/test/libsolidity/semanticTests/constants/function_unreferenced.sol
+++ b/test/libsolidity/semanticTests/constants/function_unreferenced.sol
@@ -5,7 +5,5 @@ contract C is B {
     bytes4 constant s2 = B.g.selector;
     function f() external pure returns (bytes4) { return s2; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/constants/same_constants_different_files.sol b/test/libsolidity/semanticTests/constants/same_constants_different_files.sol
index 5a85c5fd77..3a819befb8 100644
--- a/test/libsolidity/semanticTests/constants/same_constants_different_files.sol
+++ b/test/libsolidity/semanticTests/constants/same_constants_different_files.sol
@@ -19,8 +19,5 @@ contract C {
         return (a, fre(), M.a, b);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x0d, 0x59, 0x59, 0x59
diff --git a/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol b/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol
index ea35262ef4..ed0e919fcd 100644
--- a/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol
+++ b/test/libsolidity/semanticTests/constants/simple_constant_variables_test.sol
@@ -5,8 +5,5 @@ contract Foo {
 
     uint256 constant x = 56;
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // getX() -> 56
diff --git a/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
index d6d76adc5b..55daf6d3d5 100644
--- a/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
+++ b/test/libsolidity/semanticTests/constructor/base_constructor_arguments.sol
@@ -19,6 +19,5 @@ contract Derived is Base {
         return m_a;
     }
 }
-
 // ----
 // getA() -> 49
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
index bb7e7e596a..bf3f0c0c9b 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_internal.sol
@@ -32,7 +32,6 @@ contract Main {
         return h.getName();
     }
 }
-
 // ----
 // getFlag() -> true
 // getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index b6242379e7..dd91c86a20 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -7,7 +7,6 @@ contract C {
         b = _b;
     }
 }
-
 // ----
 // constructor(): 1, 2, 3, 4 ->
 // gas irOptimized: 172314
diff --git a/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol b/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
index 92633cdda9..43d1fdab84 100644
--- a/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
+++ b/test/libsolidity/semanticTests/constructor/evm_exceptions_in_constructor_call_fail.sol
@@ -13,7 +13,6 @@ contract B {
         ++test;
     }
 }
-
 // ----
 // testIt() ->
 // test() -> 2
diff --git a/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
index 0c0b6e3144..c04f039188 100644
--- a/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
+++ b/test/libsolidity/semanticTests/constructor/function_usage_in_constructor_arguments.sol
@@ -19,6 +19,5 @@ contract Derived is Base {
         return m_a;
     }
 }
-
 // ----
 // getA() -> 2
diff --git a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
index 397c314a9f..b968a07a16 100644
--- a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor.sol
@@ -14,8 +14,5 @@ contract Test {
         name = _name;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // getName() -> "abc"
diff --git a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol
index 763393a998..0a1250a8ba 100644
--- a/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol
+++ b/test/libsolidity/semanticTests/constructor/functions_called_by_constructor_through_dispatch.sol
@@ -24,8 +24,5 @@ contract Test {
         name = _shiftOperator(name, _bytes);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // getName() -> "def\x00\x00\x00"
diff --git a/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol b/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
index 6e1f46f864..320349cda9 100644
--- a/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/inline_member_init_inheritence_without_constructor.sol
@@ -14,8 +14,6 @@ contract Derived is Base {
         return m_derived;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // getBMember() -> 5
 // getDMember() -> 6
diff --git a/test/libsolidity/semanticTests/constructor/payable_constructor.sol b/test/libsolidity/semanticTests/constructor/payable_constructor.sol
index 0f19eb7e26..09fe0a1cc3 100644
--- a/test/libsolidity/semanticTests/constructor/payable_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/payable_constructor.sol
@@ -1,8 +1,5 @@
 contract C {
     constructor() payable {}
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // constructor(), 27 wei ->
diff --git a/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
index 7f0514041e..dee3af3541 100644
--- a/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/store_function_in_constructor.sol
@@ -15,9 +15,6 @@ contract C {
         return x(_arg);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // use(uint256): 3 -> 6
 // result_in_constructor() -> 4
diff --git a/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol b/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol
index 7fef18a156..07b12ad96c 100644
--- a/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol
+++ b/test/libsolidity/semanticTests/constructor/store_function_in_constructor_packed.sol
@@ -16,9 +16,6 @@ contract C {
         return x(_arg);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // use(uint16): 3 -> 0xfff9
 // result_in_constructor() -> 0xfffb
diff --git a/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
index 6721329a12..cc9d8ca6a1 100644
--- a/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/store_internal_unused_function_in_constructor.sol
@@ -13,8 +13,5 @@ contract C {
         return x();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // t() -> 7
diff --git a/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol b/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
index 7b166489fb..5845e9b56e 100644
--- a/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
+++ b/test/libsolidity/semanticTests/constructor/store_internal_unused_library_function_in_constructor.sol
@@ -16,6 +16,5 @@ contract C {
         return x();
     }
 }
-
 // ----
 // t() -> 7
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
index 6b1b6704af..00dfef4abc 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
@@ -11,7 +11,6 @@ contract B is A {
     uint public y = f();
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // constructor() ->
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
index b60564665d..9b982d6e99 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
@@ -7,8 +7,6 @@ contract A {
 contract B is A {
     uint public y = f();
 }
-// ====
-// compileToEwasm: also
 // ----
 // constructor() ->
 // gas irOptimized: 120936
diff --git a/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol b/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol
index 2b2d694bd1..b6ae85b838 100644
--- a/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol
+++ b/test/libsolidity/semanticTests/deployedCodeExclusion/subassembly_deduplication.sol
@@ -37,6 +37,5 @@ contract C {
             x < 2 * type(A).creationCode.length;
     }
 }
-
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/dirty_calldata_bytes.sol b/test/libsolidity/semanticTests/dirty_calldata_bytes.sol
index 48dc5ee2f1..5876b1f7c6 100644
--- a/test/libsolidity/semanticTests/dirty_calldata_bytes.sol
+++ b/test/libsolidity/semanticTests/dirty_calldata_bytes.sol
@@ -8,7 +8,5 @@ contract C {
         correct = r == (0x64 << 248);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bytes): 0x20, 0x04, "dead" -> true
diff --git a/test/libsolidity/semanticTests/empty_contract.sol b/test/libsolidity/semanticTests/empty_contract.sol
index 511b724692..7c1ae2846e 100644
--- a/test/libsolidity/semanticTests/empty_contract.sol
+++ b/test/libsolidity/semanticTests/empty_contract.sol
@@ -2,6 +2,5 @@ contract test {
 }
 // ====
 // allowNonExistingFunctions: true
-// compileToEwasm: also
 // ----
 // i_am_not_there() -> FAILURE
diff --git a/test/libsolidity/semanticTests/empty_for_loop.sol b/test/libsolidity/semanticTests/empty_for_loop.sol
index d4ba09f139..450134b639 100644
--- a/test/libsolidity/semanticTests/empty_for_loop.sol
+++ b/test/libsolidity/semanticTests/empty_for_loop.sol
@@ -7,7 +7,5 @@ contract test {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 10
diff --git a/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol b/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol
index ddf1a66fa1..beabc51431 100644
--- a/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol
+++ b/test/libsolidity/semanticTests/enums/constructing_enums_from_ints.sol
@@ -5,8 +5,5 @@ contract c {
         return uint256(Truth(uint8(0x1)));
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 1
diff --git a/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol b/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol
index a538946ad5..b952524b2a 100644
--- a/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol
+++ b/test/libsolidity/semanticTests/enums/enum_explicit_overflow.sol
@@ -20,9 +20,7 @@ contract test {
 
     ActionChoices choice;
 }
-
 // ====
-// compileToEwasm: also
 // EVMVersion: >=byzantium
 // ----
 // getChoiceExp(uint256): 2 -> 2
diff --git a/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol b/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol
index 9b783b4041..60a1d64d3e 100644
--- a/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol
+++ b/test/libsolidity/semanticTests/enums/enum_explicit_overflow_homestead.sol
@@ -20,7 +20,6 @@ contract test {
 
     ActionChoices choice;
 }
-
 // ====
 // EVMVersion: <byzantium
 // ----
diff --git a/test/libsolidity/semanticTests/enums/enum_referencing.sol b/test/libsolidity/semanticTests/enums/enum_referencing.sol
index a475f3748a..c58f6e8390 100644
--- a/test/libsolidity/semanticTests/enums/enum_referencing.sol
+++ b/test/libsolidity/semanticTests/enums/enum_referencing.sol
@@ -27,8 +27,6 @@ contract C is I {
         return L.g();
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: L
 // f() -> 3
diff --git a/test/libsolidity/semanticTests/enums/minmax.sol b/test/libsolidity/semanticTests/enums/minmax.sol
index 4b929c36cf..a447f64338 100644
--- a/test/libsolidity/semanticTests/enums/minmax.sol
+++ b/test/libsolidity/semanticTests/enums/minmax.sol
@@ -4,7 +4,6 @@ contract test {
 	function min() public returns(uint) { return uint(type(MinMax).min); }
 	function max() public returns(uint) { return uint(type(MinMax).max); }
 }
-
 // ----
 // min() -> 0
 // max() -> 3
diff --git a/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol b/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol
index cda5d06ac3..a3bce93acc 100644
--- a/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol
+++ b/test/libsolidity/semanticTests/enums/using_contract_enums_with_explicit_contract_name.sol
@@ -5,8 +5,5 @@ contract test {
         _ret = test.Choice.B;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // answer() -> 1
diff --git a/test/libsolidity/semanticTests/enums/using_enums.sol b/test/libsolidity/semanticTests/enums/using_enums.sol
index ec014160aa..b4d0ce8e36 100644
--- a/test/libsolidity/semanticTests/enums/using_enums.sol
+++ b/test/libsolidity/semanticTests/enums/using_enums.sol
@@ -11,8 +11,5 @@ contract test {
 
     ActionChoices choices;
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // getChoice() -> 2
diff --git a/test/libsolidity/semanticTests/enums/using_inherited_enum.sol b/test/libsolidity/semanticTests/enums/using_inherited_enum.sol
index 8d65aeac8e..9741568baa 100644
--- a/test/libsolidity/semanticTests/enums/using_inherited_enum.sol
+++ b/test/libsolidity/semanticTests/enums/using_inherited_enum.sol
@@ -8,7 +8,5 @@ contract test is base {
         _ret = Choice.B;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // answer() -> 1
diff --git a/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol b/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol
index cac059774c..eb1d63a2fd 100644
--- a/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol
+++ b/test/libsolidity/semanticTests/enums/using_inherited_enum_excplicitly.sol
@@ -8,7 +8,5 @@ contract test is base {
         _ret = base.Choice.B;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // answer() -> 1
diff --git a/test/libsolidity/semanticTests/errors/named_error_args.sol b/test/libsolidity/semanticTests/errors/named_error_args.sol
index 28df2c4ccb..04697f5219 100644
--- a/test/libsolidity/semanticTests/errors/named_error_args.sol
+++ b/test/libsolidity/semanticTests/errors/named_error_args.sol
@@ -4,7 +4,5 @@ contract C {
         revert E({b: 7, a: 2});
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"85208890", hex"0000000000000000000000000000000000000000000000000000000000000002", hex"0000000000000000000000000000000000000000000000000000000000000007"
diff --git a/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol b/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol
index a0d43c274f..2f2b7c676b 100644
--- a/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol
+++ b/test/libsolidity/semanticTests/errors/named_parameters_shadowing_types.sol
@@ -18,8 +18,6 @@ contract C {
         revert E2({EnumType: StructType(42), StructType: EnumType.B});
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"33a54193", hex"000000000000000000000000000000000000000000000000000000000000002a"
 // g() -> FAILURE, hex"374b9387", hex"0000000000000000000000000000000000000000000000000000000000000001", hex"000000000000000000000000000000000000000000000000000000000000002a"
diff --git a/test/libsolidity/semanticTests/errors/panic_via_import.sol b/test/libsolidity/semanticTests/errors/panic_via_import.sol
index b763164c9a..94a6a7aaaf 100644
--- a/test/libsolidity/semanticTests/errors/panic_via_import.sol
+++ b/test/libsolidity/semanticTests/errors/panic_via_import.sol
@@ -11,8 +11,6 @@ contract C {
         revert E(1);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // a() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
 // b() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
diff --git a/test/libsolidity/semanticTests/errors/simple.sol b/test/libsolidity/semanticTests/errors/simple.sol
index b8a8e0d609..809b10c57d 100644
--- a/test/libsolidity/semanticTests/errors/simple.sol
+++ b/test/libsolidity/semanticTests/errors/simple.sol
@@ -4,7 +4,5 @@ contract C {
         revert E(2, 7);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"85208890", 2, 7
diff --git a/test/libsolidity/semanticTests/errors/using_structs.sol b/test/libsolidity/semanticTests/errors/using_structs.sol
index 47979a9552..e04e4b1c7a 100644
--- a/test/libsolidity/semanticTests/errors/using_structs.sol
+++ b/test/libsolidity/semanticTests/errors/using_structs.sol
@@ -13,8 +13,6 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> FAILURE, hex"e96e07f0", hex"0000000000000000000000000000000000000000000000000000000000000002", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000007", hex"0000000000000000000000000000000000000000000000000000000000000009", hex"0000000000000000000000000000000000000000000000000000000000000040", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"6162630000000000000000000000000000000000000000000000000000000000"
 // f(bool): false -> FAILURE, hex"e96e07f0", hex"0000000000000000000000000000000000000000000000000000000000000002", hex"0000000000000000000000000000000000000000000000000000000000000060", hex"0000000000000000000000000000000000000000000000000000000000000007", hex"0000000000000000000000000000000000000000000000000000000000000009", hex"0000000000000000000000000000000000000000000000000000000000000040", hex"0000000000000000000000000000000000000000000000000000000000000003", hex"6162630000000000000000000000000000000000000000000000000000000000"
diff --git a/test/libsolidity/semanticTests/errors/via_contract_type.sol b/test/libsolidity/semanticTests/errors/via_contract_type.sol
index f0ea6ca3c8..09f60e6530 100644
--- a/test/libsolidity/semanticTests/errors/via_contract_type.sol
+++ b/test/libsolidity/semanticTests/errors/via_contract_type.sol
@@ -10,8 +10,6 @@ contract B is A {
   function h() public pure { revert X.E("abc"); }
 
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
 // g() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
diff --git a/test/libsolidity/semanticTests/errors/via_import.sol b/test/libsolidity/semanticTests/errors/via_import.sol
index 6a6d3399ed..eb54e5b4d7 100644
--- a/test/libsolidity/semanticTests/errors/via_import.sol
+++ b/test/libsolidity/semanticTests/errors/via_import.sol
@@ -17,8 +17,6 @@ contract C {
     revert T.S.E(3);
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000001"
 // y() -> FAILURE, hex"002ff067", hex"0000000000000000000000000000000000000000000000000000000000000002"
diff --git a/test/libsolidity/semanticTests/errors/weird_name.sol b/test/libsolidity/semanticTests/errors/weird_name.sol
index d3d7545496..2466d6e203 100644
--- a/test/libsolidity/semanticTests/errors/weird_name.sol
+++ b/test/libsolidity/semanticTests/errors/weird_name.sol
@@ -4,7 +4,5 @@ contract C {
         revert error(2);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"b48fb6cf", hex"0000000000000000000000000000000000000000000000000000000000000002"
diff --git a/test/libsolidity/semanticTests/exponentiation/literal_base.sol b/test/libsolidity/semanticTests/exponentiation/literal_base.sol
index f00999c971..3dcba494ab 100644
--- a/test/libsolidity/semanticTests/exponentiation/literal_base.sol
+++ b/test/libsolidity/semanticTests/exponentiation/literal_base.sol
@@ -7,8 +7,6 @@ contract test {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0 -> 1, 1
 // f(uint256): 1 -> 2, -2
diff --git a/test/libsolidity/semanticTests/exponentiation/signed_base.sol b/test/libsolidity/semanticTests/exponentiation/signed_base.sol
index 105a8ef5f7..f58c081293 100644
--- a/test/libsolidity/semanticTests/exponentiation/signed_base.sol
+++ b/test/libsolidity/semanticTests/exponentiation/signed_base.sol
@@ -10,7 +10,5 @@ contract test {
         return (x**y1, x**y2);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 9, -27
diff --git a/test/libsolidity/semanticTests/exponentiation/small_exp.sol b/test/libsolidity/semanticTests/exponentiation/small_exp.sol
index 945b65c9df..a26675fb7f 100644
--- a/test/libsolidity/semanticTests/exponentiation/small_exp.sol
+++ b/test/libsolidity/semanticTests/exponentiation/small_exp.sol
@@ -10,7 +10,5 @@ contract test {
         return r;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 4
diff --git a/test/libsolidity/semanticTests/expressions/bit_operators.sol b/test/libsolidity/semanticTests/expressions/bit_operators.sol
index 733951e2c0..35887059c9 100644
--- a/test/libsolidity/semanticTests/expressions/bit_operators.sol
+++ b/test/libsolidity/semanticTests/expressions/bit_operators.sol
@@ -13,7 +13,5 @@ contract test {
         z = a ^ b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 3855, 268374015, 268370160
diff --git a/test/libsolidity/semanticTests/expressions/bytes_comparison.sol b/test/libsolidity/semanticTests/expressions/bytes_comparison.sol
index 634486d915..b1220c510c 100644
--- a/test/libsolidity/semanticTests/expressions/bytes_comparison.sol
+++ b/test/libsolidity/semanticTests/expressions/bytes_comparison.sol
@@ -6,7 +6,5 @@ contract test {
         return a < x && x < b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol
index 66eb86d505..df07364b36 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_different_types.sol
@@ -5,8 +5,6 @@ contract test {
         return cond ? x : y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> 0xcd
 // f(bool): false -> 0xabab
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol
index f8c3abf2dd..3915c7b8dc 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_false_literal.sol
@@ -3,7 +3,5 @@ contract test {
         return false ? 5 : 10;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 10
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol
index 5abc4e1e33..bff9122b1e 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_functions.sol
@@ -7,8 +7,6 @@ contract test {
         return z();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol
index c51172b0d8..2a9d6de808 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_multiple.sol
@@ -6,8 +6,6 @@ contract test {
                     x > 50 ? 50 : 10;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 1001 -> 1000
 // f(uint256): 500 -> 100
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol
index 40cfc7a9dd..3434cca016 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_storage_memory_1.sol
@@ -22,8 +22,6 @@ contract test {
         return ret;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> 1
 // f(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol
index 968a4a02a8..06247f0dc5 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_true_literal.sol
@@ -3,7 +3,5 @@ contract test {
         return true ? 5 : 10;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 5
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol
index a28dd1f06d..d27d06bacb 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_tuples.sol
@@ -3,8 +3,6 @@ contract test {
         return cond ? (1, 2) : (3, 4);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> 1, 2
 // f(bool): false -> 3, 4
diff --git a/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol b/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol
index fdf691ae43..bbaf051bde 100644
--- a/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol
+++ b/test/libsolidity/semanticTests/expressions/conditional_expression_with_return_values.sol
@@ -3,8 +3,6 @@ contract test {
         cond ? a = v : b = v;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool,uint256): true, 20 -> 20, 0
 // f(bool,uint256): false, 20 -> 0, 20
diff --git a/test/libsolidity/semanticTests/expressions/exp_operator_const.sol b/test/libsolidity/semanticTests/expressions/exp_operator_const.sol
index ef71a3d2b0..e2a7ccc735 100644
--- a/test/libsolidity/semanticTests/expressions/exp_operator_const.sol
+++ b/test/libsolidity/semanticTests/expressions/exp_operator_const.sol
@@ -1,7 +1,5 @@
 contract test {
     function f() public returns(uint d) { return 2 ** 3; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 8
diff --git a/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol b/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol
index 4901f5c78f..b2dd001b35 100644
--- a/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol
+++ b/test/libsolidity/semanticTests/expressions/exp_operator_const_signed.sol
@@ -1,7 +1,5 @@
 contract test {
     function f() public returns(int d) { return (-2) ** 3; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> -8
diff --git a/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol b/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol
index 716f72aeeb..f7e5c6ab81 100644
--- a/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol
+++ b/test/libsolidity/semanticTests/expressions/exp_zero_literal.sol
@@ -1,7 +1,5 @@
 contract test {
     function f() public returns(uint d) { return 0 ** 0; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol b/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol
index b9eaa64803..c6957ee9f6 100644
--- a/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol
+++ b/test/libsolidity/semanticTests/expressions/inc_dec_operators.sol
@@ -11,7 +11,5 @@ contract test {
         r += (++v) * 0x10000;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x053866
diff --git a/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol b/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol
index 837f9f7410..af408b3f51 100644
--- a/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol
+++ b/test/libsolidity/semanticTests/expressions/uncalled_address_transfer_send.sol
@@ -6,7 +6,5 @@ contract TransferTest {
 
 	function f() pure public {}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol b/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
index 4a35fad1db..7bf3aee3ac 100644
--- a/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
+++ b/test/libsolidity/semanticTests/fallback/call_forward_bytes.sol
@@ -14,7 +14,6 @@ contract sender {
 }
 // ====
 // allowNonExistingFunctions: true
-// compileToEwasm: false
 // ----
 // recv(uint256): 7 ->
 // val() -> 0
diff --git a/test/libsolidity/semanticTests/fallback/falback_return.sol b/test/libsolidity/semanticTests/fallback/falback_return.sol
index 55e65348b1..d59bb9d452 100644
--- a/test/libsolidity/semanticTests/fallback/falback_return.sol
+++ b/test/libsolidity/semanticTests/fallback/falback_return.sol
@@ -5,8 +5,6 @@ contract A {
         x++;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // ()
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol b/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol
index 14366886cb..9b5319ae00 100644
--- a/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol
+++ b/test/libsolidity/semanticTests/fallback/fallback_or_receive.sol
@@ -5,8 +5,6 @@ contract C {
     receive () payable external { ++y; }
     function f() external returns (uint, uint) { return (x, y); }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0, 0
 // () ->
diff --git a/test/libsolidity/semanticTests/fallback/inherited.sol b/test/libsolidity/semanticTests/fallback/inherited.sol
index 75ab307bfc..55c6394450 100644
--- a/test/libsolidity/semanticTests/fallback/inherited.sol
+++ b/test/libsolidity/semanticTests/fallback/inherited.sol
@@ -4,8 +4,6 @@ contract A {
     function getData() public returns (uint r) { return data; }
 }
 contract B is A {}
-// ====
-// compileToEwasm: also
 // ----
 // getData() -> 0
 // (): 42 ->
diff --git a/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol b/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol
index cb62135edf..dd97f4c034 100644
--- a/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol
+++ b/test/libsolidity/semanticTests/fallback/short_data_calls_fallback.sol
@@ -4,8 +4,6 @@ contract A {
     function fow() public { x = 3; }
     fallback () external { x = 2; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // (): hex"d88e0b"
 // x() -> 2
diff --git a/test/libsolidity/semanticTests/freeFunctions/easy.sol b/test/libsolidity/semanticTests/freeFunctions/easy.sol
index dae3b40377..f73f101256 100644
--- a/test/libsolidity/semanticTests/freeFunctions/easy.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/easy.sol
@@ -7,7 +7,5 @@ contract C {
     return add(x, 2);
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 7 -> 9
diff --git a/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol b/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol
index 465b80f7a9..cf4140286d 100644
--- a/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/free_namesake_contract_function.sol
@@ -4,7 +4,5 @@ contract C {
     return f();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE
diff --git a/test/libsolidity/semanticTests/freeFunctions/import.sol b/test/libsolidity/semanticTests/freeFunctions/import.sol
index f4ecd6baca..edd44de493 100644
--- a/test/libsolidity/semanticTests/freeFunctions/import.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/import.sol
@@ -14,7 +14,5 @@ contract C {
     two = data.x;
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 7 -> 7, 8
diff --git a/test/libsolidity/semanticTests/freeFunctions/overloads.sol b/test/libsolidity/semanticTests/freeFunctions/overloads.sol
index 468f75be99..6a2da65361 100644
--- a/test/libsolidity/semanticTests/freeFunctions/overloads.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/overloads.sol
@@ -10,7 +10,5 @@ contract C {
       return (f(2), f("abc"));
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 2, 3
diff --git a/test/libsolidity/semanticTests/freeFunctions/recursion.sol b/test/libsolidity/semanticTests/freeFunctions/recursion.sol
index b6a131b63b..894a60f3f6 100644
--- a/test/libsolidity/semanticTests/freeFunctions/recursion.sol
+++ b/test/libsolidity/semanticTests/freeFunctions/recursion.sol
@@ -12,8 +12,6 @@ contract C {
       return exp(base, exponent);
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g(uint256,uint256): 0, 0 -> 1
 // g(uint256,uint256): 0, 1 -> 0x00
diff --git a/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol b/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol
index 0605888d08..4dbfe91f10 100644
--- a/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol
+++ b/test/libsolidity/semanticTests/functionCall/array_multiple_local_vars.sol
@@ -22,8 +22,6 @@ contract test {
         return sum;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256[]): 32, 3, 1000, 1, 2 -> 3
 // f(uint256[]): 32, 3, 100, 500, 300 -> 600
diff --git a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol
index 97bc083af9..023133a49f 100644
--- a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_function.sol
@@ -8,8 +8,6 @@ contract C {
     }
     function t() public pure returns (uint)  { return 7; }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: L
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol
index d8d55dc9bb..5a599c8a57 100644
--- a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_storage_variable.sol
@@ -7,8 +7,6 @@ contract C {
         return (x.mul)({x: a});
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: D
 // f(uint256): 7 -> 0x2a
diff --git a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol
index d374573dc9..d2d23fb626 100644
--- a/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_attached_library_function_on_string.sol
@@ -11,8 +11,6 @@ contract C {
         return s.length();
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: D
 // f() -> 3
diff --git a/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol b/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol
index 82c38cca5a..a00628eaf1 100644
--- a/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_function_returning_function.sol
@@ -21,8 +21,5 @@ contract test {
         return x()()()();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol b/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol
index ea5edaaef6..b43c453d23 100644
--- a/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_function_returning_nothing_via_pointer.sol
@@ -11,9 +11,6 @@ contract test {
         return flag;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
 // flag() -> true
diff --git a/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol b/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol
index 043ee05a82..0b880bfd1b 100644
--- a/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_internal_function_via_expression.sol
@@ -17,8 +17,6 @@ contract C {
         return (get_ptr(foo))();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // associated() -> 42
 // unassociated() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol b/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol
index 9753015a45..229618384d 100644
--- a/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol
+++ b/test/libsolidity/semanticTests/functionCall/calling_nonexisting_contract_throws.sol
@@ -21,9 +21,6 @@ contract C {
         return 7;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE
 // g() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol b/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol
index 12139fc684..9b008f12f2 100644
--- a/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol
+++ b/test/libsolidity/semanticTests/functionCall/calling_other_functions.sol
@@ -12,8 +12,6 @@ contract collatz {
         return 3 * x + 1;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // run(uint256): 0 -> 0
 // run(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol
index 2f660c24c8..701b1f51a3 100644
--- a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol
+++ b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function.sol
@@ -11,8 +11,6 @@ contract C {
         return 7;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // intern() -> FAILURE, hex"4e487b71", 0x51 # This should throw exceptions #
 // extern() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol
index a7295928aa..aa455afcf8 100644
--- a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol
+++ b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_in_detail.sol
@@ -15,8 +15,5 @@ contract C {
         return 2;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // t() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol
index f7d90c8f2d..d83fab8522 100644
--- a/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol
+++ b/test/libsolidity/semanticTests/functionCall/calling_uninitialized_function_through_array.sol
@@ -15,7 +15,5 @@ contract C {
         return 2;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // t() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol b/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol
index 65dbeaaeec..f5996d32ca 100644
--- a/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol
+++ b/test/libsolidity/semanticTests/functionCall/conditional_with_arguments.sol
@@ -6,7 +6,5 @@ contract C {
         return (false ? g : h)(2, 1);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol b/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol
index 5529b90a01..f15d2201da 100644
--- a/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/disordered_named_args.sol
@@ -2,7 +2,5 @@ contract test {
     function a(uint a, uint b, uint c) public returns (uint r) { r = a * 100 + b * 10 + c * 1; }
     function b() public returns (uint r) { r = a({c: 3, a: 1, b: 2}); }
 }
-// ====
-// compileToEwasm: also
 // ----
 // b() -> 123
diff --git a/test/libsolidity/semanticTests/functionCall/external_call.sol b/test/libsolidity/semanticTests/functionCall/external_call.sol
index 48dddecec8..9189d5cc78 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call.sol
@@ -9,7 +9,6 @@ contract C {
         return this.g(2 * n);
     }
 }
-
 // ----
 // g(uint256): 4 -> 5
 // f(uint256): 2 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol b/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
index 69a2193a30..6f7f020fe6 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_at_construction_time.sol
@@ -16,7 +16,6 @@ contract C {
         return 1 + c;
     }
 }
-
 // ====
 // EVMVersion: >=byzantium
 // ----
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol b/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol
index 56a2876ed4..80ca6cc41e 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_dynamic_returndata.sol
@@ -16,7 +16,6 @@ contract C {
         return sum;
     }
 }
-
 // ====
 // EVMVersion: >=byzantium
 // ----
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index e8efe09fad..86d3dcc8f2 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -20,7 +20,6 @@ contract C {
         return 1 + c;
     }
 }
-
 // ----
 // constructor(), 1 ether ->
 // gas irOptimized: 265110
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
index 8fe807e638..96f097ce7f 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting_debugstrings.sol
@@ -20,7 +20,6 @@ contract C {
         return 1 + c;
     }
 }
-
 // ====
 // EVMVersion: >=byzantium
 // revertStrings: debug
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_value.sol b/test/libsolidity/semanticTests/functionCall/external_call_value.sol
index 5a946533d5..9639c1119a 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_value.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_value.sol
@@ -9,7 +9,6 @@ contract C {
         return this.g{value: 10}(n);
     }
 }
-
 // ----
 // g(uint256), 1 ether: 4 -> 1000000000000000000000, 4
 // f(uint256), 11 ether: 2 -> 10000, 2
diff --git a/test/libsolidity/semanticTests/functionCall/external_function.sol b/test/libsolidity/semanticTests/functionCall/external_function.sol
index d6c13a4ef2..284bad0988 100644
--- a/test/libsolidity/semanticTests/functionCall/external_function.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_function.sol
@@ -11,8 +11,5 @@ contract c {
         r_b = b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test(uint256,uint256): 2, 3 -> 9, 3
diff --git a/test/libsolidity/semanticTests/functionCall/external_public_override.sol b/test/libsolidity/semanticTests/functionCall/external_public_override.sol
index 31f4742056..8e34a5b223 100644
--- a/test/libsolidity/semanticTests/functionCall/external_public_override.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_public_override.sol
@@ -14,9 +14,6 @@ contract B is A {
         return f();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol b/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol
index 7db64dafca..7013a63527 100644
--- a/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol
+++ b/test/libsolidity/semanticTests/functionCall/file_level_call_via_module.sol
@@ -9,7 +9,5 @@ contract C {
 
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 7, 3
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index abff2c9e7e..9c73e208e7 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -36,7 +36,6 @@ contract test {
         myBal = address(this).balance;
     }
 }
-
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 260052
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index dd7487cdfd..801b22d177 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -35,7 +35,6 @@ contract test {
         myBal = address(this).balance;
     }
 }
-
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 260052
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol b/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol
index 749e7c01bd..adf1200eed 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/base_base_overload.sol
@@ -34,8 +34,6 @@ contract Child is Base {
 		BaseBase.init(c, d);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 0
 // y() -> 0
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol b/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol
index fa65755b85..924431ec53 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/base_overload.sol
@@ -18,8 +18,6 @@ contract Child is Base {
 		Base.init(c, d);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 0
 // y() -> 0
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol
index 85302de766..8f0e93ddbe 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/call_base.sol
@@ -9,7 +9,5 @@ contract Child is Base {
 		return f(n);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // g(uint256): 4 -> 8
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol
index 70ec4fd729..8578a6707a 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base.sol
@@ -22,8 +22,6 @@ contract Child is Base {
 		return s(n);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // g(uint256): 4 -> 12
 // h(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol
index 169e1a6ba7..f327b3f28e 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_base_explicit.sol
@@ -25,8 +25,6 @@ contract Child is Base {
 		return BaseBase.s(n);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // g(uint256): 4 -> 8
 // k(uint256): 4 -> 16
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol
index 7ff1eae99a..0a0cf465f0 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/call_base_explicit.sol
@@ -9,7 +9,5 @@ contract Child is Base {
 		return Base.f(n);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // g(uint256): 4 -> 8
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol b/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol
index 61b428303b..21ab22e0bc 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/call_unimplemented_base.sol
@@ -14,7 +14,5 @@ contract C is V
 {
     function a() internal view override returns (uint256) { return 42; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // b() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol b/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol
index 7dc726be2a..20774d6926 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_abstract_contract.sol
@@ -15,7 +15,5 @@ contract B is A, I {
         return super.f();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol b/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol
index 218d1bca8e..f5f0561334 100644
--- a/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol
+++ b/test/libsolidity/semanticTests/functionCall/inheritance/super_skip_unimplemented_in_interface.sol
@@ -15,7 +15,5 @@ contract B is A, I {
         return super.f();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 42
diff --git a/test/libsolidity/semanticTests/functionCall/member_accessors.sol b/test/libsolidity/semanticTests/functionCall/member_accessors.sol
index ad0b8a3e2e..ae5eab6d11 100644
--- a/test/libsolidity/semanticTests/functionCall/member_accessors.sol
+++ b/test/libsolidity/semanticTests/functionCall/member_accessors.sol
@@ -14,7 +14,6 @@ contract test {
 }
 // ====
 // allowNonExistingFunctions: true
-// compileToEwasm: also
 // ----
 // data() -> 8
 // name() -> "Celina"
diff --git a/test/libsolidity/semanticTests/functionCall/multiple_functions.sol b/test/libsolidity/semanticTests/functionCall/multiple_functions.sol
index 63fac55e09..3c60a13f11 100644
--- a/test/libsolidity/semanticTests/functionCall/multiple_functions.sol
+++ b/test/libsolidity/semanticTests/functionCall/multiple_functions.sol
@@ -6,7 +6,6 @@ contract test {
 }
 // ====
 // allowNonExistingFunctions: true
-// compileToEwasm: also
 // ----
 // a() -> 0
 // b() -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol b/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol
index ef746eb032..cb2a8a0c03 100644
--- a/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol
+++ b/test/libsolidity/semanticTests/functionCall/multiple_return_values.sol
@@ -3,7 +3,5 @@ contract test {
         y1 = x2; y2 = x1;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // run(bool,uint256): true, 0xcd -> 0xcd, true, 0
diff --git a/test/libsolidity/semanticTests/functionCall/named_args.sol b/test/libsolidity/semanticTests/functionCall/named_args.sol
index 4966f51860..706f6d94dc 100644
--- a/test/libsolidity/semanticTests/functionCall/named_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/named_args.sol
@@ -3,8 +3,6 @@ contract test {
     function b() public returns (uint r) { r = a({a: 1, b: 2, c: 3}); }
     function c() public returns (uint r) { r = a({b: 2, c: 3, a: 1}); }
 }
-// ====
-// compileToEwasm: also
 // ----
 // b() -> 123
 // c() -> 123
diff --git a/test/libsolidity/semanticTests/functionCall/named_args_overload.sol b/test/libsolidity/semanticTests/functionCall/named_args_overload.sol
index 0c31e47c50..65f34d8ff6 100644
--- a/test/libsolidity/semanticTests/functionCall/named_args_overload.sol
+++ b/test/libsolidity/semanticTests/functionCall/named_args_overload.sol
@@ -26,8 +26,6 @@ contract C {
         return 500;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // call(uint256): 0 -> 0
 // call(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
index b78951c41a..18a1997929 100644
--- a/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
+++ b/test/libsolidity/semanticTests/functionCall/send_zero_ether.sol
@@ -13,9 +13,6 @@ contract Main {
         return payable(r).send(0);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 100264
diff --git a/test/libsolidity/semanticTests/functionCall/transaction_status.sol b/test/libsolidity/semanticTests/functionCall/transaction_status.sol
index 309cb8ef18..caa538deec 100644
--- a/test/libsolidity/semanticTests/functionCall/transaction_status.sol
+++ b/test/libsolidity/semanticTests/functionCall/transaction_status.sol
@@ -3,8 +3,6 @@ contract test {
 	function g() public { revert(); }
 	function h() public { assert(false); }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() ->
 // g() -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/value_test.sol b/test/libsolidity/semanticTests/functionCall/value_test.sol
index c15e6332f1..a6fea6a50b 100644
--- a/test/libsolidity/semanticTests/functionCall/value_test.sol
+++ b/test/libsolidity/semanticTests/functionCall/value_test.sol
@@ -3,8 +3,6 @@ contract C {
 		return msg.value;
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(), 1 ether -> 1000000000000000000
 // f(), 1 wei -> 1
diff --git a/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol b/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol
index 5052ad2b40..0a9e6d3ffd 100644
--- a/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol
+++ b/test/libsolidity/semanticTests/functionSelector/function_selector_via_contract_name.sol
@@ -15,8 +15,6 @@ contract C {
         return (a.f.selector, a.g.selector, b.f.selector, b.g.selector);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test1() -> left(0x26121ff0), left(0xe420264a), left(0x26121ff0), left(0xe420264a)
 // test2() -> left(0x26121ff0), left(0xe420264a), left(0x26121ff0), left(0xe420264a)
diff --git a/test/libsolidity/semanticTests/functionTypes/address_member.sol b/test/libsolidity/semanticTests/functionTypes/address_member.sol
index c407a3ab63..a5f56f3dc6 100644
--- a/test/libsolidity/semanticTests/functionTypes/address_member.sol
+++ b/test/libsolidity/semanticTests/functionTypes/address_member.sol
@@ -6,7 +6,5 @@ contract C {
         a2 = [this.f.address][0];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e, 0xc06afe3a8444fc0004668591e8306bfb9968e79e
diff --git a/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol b/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol
index 409bb809eb..67a4434dfe 100644
--- a/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol
+++ b/test/libsolidity/semanticTests/functionTypes/function_delete_stack.sol
@@ -9,8 +9,5 @@ contract C {
         y();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol b/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol
index 4cf8be2040..a147b4e025 100644
--- a/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol
+++ b/test/libsolidity/semanticTests/functionTypes/function_delete_storage.sol
@@ -19,9 +19,6 @@ contract C {
         return y();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // set() -> 7
 // ca() -> 7
diff --git a/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol b/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
index f096a49794..587daac978 100644
--- a/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
+++ b/test/libsolidity/semanticTests/functionTypes/function_type_library_internal.sol
@@ -21,6 +21,5 @@ contract C {
         return Utils.reduce(x, Utils.sum, 0);
     }
 }
-
 // ----
 // f(uint256[]): 0x20, 0x3, 0x1, 0x7, 0x3 -> 11
diff --git a/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol b/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
index 353844723c..f9cd863baa 100644
--- a/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
+++ b/test/libsolidity/semanticTests/functionTypes/mapping_of_functions.sol
@@ -24,7 +24,6 @@ contract Flow {
         return 7;
     }
 }
-
 // ----
 // success() -> false
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol b/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
index ebef9a2549..3f14eb594a 100644
--- a/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
+++ b/test/libsolidity/semanticTests/functionTypes/pass_function_types_externally.sol
@@ -15,7 +15,6 @@ contract C {
         return x + 1;
     }
 }
-
 // ----
 // f(uint256): 7 -> 8
 // f2(uint256): 7 -> 8
diff --git a/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol b/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol
index a2bab40514..0acbcc5858 100644
--- a/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol
+++ b/test/libsolidity/semanticTests/functionTypes/pass_function_types_internally.sol
@@ -11,7 +11,5 @@ contract C {
         return x + 1;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 7 -> 8
diff --git a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol
index 675c2d08b0..84f6fad1c0 100644
--- a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol
+++ b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime.sol
@@ -13,8 +13,6 @@ contract C {
         return double(_arg);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // runtime(uint256): 3 -> 6
 // initial() -> 4
diff --git a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol
index d32db4d908..b5b24954c9 100644
--- a/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol
+++ b/test/libsolidity/semanticTests/functionTypes/same_function_in_construction_and_runtime_equality_check.sol
@@ -13,8 +13,5 @@ contract C {
         _ret = _arg * 2;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_1.sol b/test/libsolidity/semanticTests/functionTypes/selector_1.sol
index 3d49e5b427..397655dae5 100644
--- a/test/libsolidity/semanticTests/functionTypes/selector_1.sol
+++ b/test/libsolidity/semanticTests/functionTypes/selector_1.sol
@@ -10,6 +10,5 @@ contract C is B {
 }
 // ====
 // compileViaYul: true
-// compileToEwasm: also
 // ----
 // test() -> 0xcf9f23b500000000000000000000000000000000000000000000000000000000, 0x7defb41000000000000000000000000000000000000000000000000000000000, 0xcf9f23b500000000000000000000000000000000000000000000000000000000, 0x7defb41000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_2.sol b/test/libsolidity/semanticTests/functionTypes/selector_2.sol
index 46de760551..248e446736 100644
--- a/test/libsolidity/semanticTests/functionTypes/selector_2.sol
+++ b/test/libsolidity/semanticTests/functionTypes/selector_2.sol
@@ -10,6 +10,5 @@ contract D {
 }
 // ====
 // compileViaYul: true
-// compileToEwasm: also
 // ----
 // test() -> 0xcf9f23b500000000000000000000000000000000000000000000000000000000, 0x7defb41000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/functionTypes/store_function.sol b/test/libsolidity/semanticTests/functionTypes/store_function.sol
index b1d0fc0c3b..132a6c9565 100644
--- a/test/libsolidity/semanticTests/functionTypes/store_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/store_function.sol
@@ -23,7 +23,6 @@ contract C {
         return ev(x);
     }
 }
-
 // ----
 // t() -> 9
 // gas irOptimized: 99064
diff --git a/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol b/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
index 9c7684245e..3de9cfa876 100644
--- a/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
+++ b/test/libsolidity/semanticTests/functionTypes/struct_with_external_function.sol
@@ -27,6 +27,5 @@ contract Flow {
         return (t[0].x(), t[1].x());
     }
 }
-
 // ----
 // f() -> 1, 2
diff --git a/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol b/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol
index 1ecd9eaf51..fae9186295 100644
--- a/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol
+++ b/test/libsolidity/semanticTests/functionTypes/struct_with_functions.sol
@@ -27,8 +27,5 @@ contract Flow {
         return (t[0].x(), t[1].x());
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1, 2
diff --git a/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol b/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol
index fb34698bb8..b55de08758 100644
--- a/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol
+++ b/test/libsolidity/semanticTests/functionTypes/uninitialized_internal_storage_function_call.sol
@@ -6,8 +6,5 @@ contract Test {
         return 2;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/getters/bytes.sol b/test/libsolidity/semanticTests/getters/bytes.sol
index 24f384fa5c..c22403c779 100644
--- a/test/libsolidity/semanticTests/getters/bytes.sol
+++ b/test/libsolidity/semanticTests/getters/bytes.sol
@@ -4,7 +4,5 @@ contract C {
         b = "abc";
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // b() -> 0x20, 0x03, 0x6162630000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/getters/string_and_bytes.sol b/test/libsolidity/semanticTests/getters/string_and_bytes.sol
index 9452ff97cd..f9cf7316f8 100644
--- a/test/libsolidity/semanticTests/getters/string_and_bytes.sol
+++ b/test/libsolidity/semanticTests/getters/string_and_bytes.sol
@@ -9,8 +9,6 @@ contract C {
         c = hex"ff077fff";
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // a() -> 0x20, 11, "hello world"
 // b() -> 0x20, 4, "ABCD"
diff --git a/test/libsolidity/semanticTests/getters/value_types.sol b/test/libsolidity/semanticTests/getters/value_types.sol
index 3d590ded16..a8a8759e3e 100644
--- a/test/libsolidity/semanticTests/getters/value_types.sol
+++ b/test/libsolidity/semanticTests/getters/value_types.sol
@@ -20,8 +20,6 @@ contract C {
         i = address(type(uint160).max / 3);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // a() -> 3
 // b() -> 4
diff --git a/test/libsolidity/semanticTests/inheritance/access_base_storage.sol b/test/libsolidity/semanticTests/inheritance/access_base_storage.sol
index 4b11c3598a..034e7c1d34 100644
--- a/test/libsolidity/semanticTests/inheritance/access_base_storage.sol
+++ b/test/libsolidity/semanticTests/inheritance/access_base_storage.sol
@@ -21,9 +21,6 @@ contract Derived is Base {
         derived = dataDerived;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // setData(uint256,uint256): 1, 2 -> true
 // getViaBase() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
index aa9dc4b992..c65d1abec5 100644
--- a/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
+++ b/test/libsolidity/semanticTests/inheritance/address_overload_resolution.sol
@@ -18,7 +18,6 @@ contract D {
         return (new C()).transfer(5);
     }
 }
-
 // ----
 // f() -> 1
 // gas irOptimized: 77051
diff --git a/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol b/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol
index 7b5e856d34..9cff3c728d 100644
--- a/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol
+++ b/test/libsolidity/semanticTests/inheritance/base_access_to_function_type_variables.sol
@@ -13,9 +13,6 @@ contract C {
         return C.x();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 2
 // h() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol b/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol
index 87571f2d02..02e20c49d6 100644
--- a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol
+++ b/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_direct.sol
@@ -14,8 +14,5 @@ contract C is B {
         return f(1);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol b/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol
index 23f01e4195..5976fee6fe 100644
--- a/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol
+++ b/test/libsolidity/semanticTests/inheritance/derived_overload_base_function_indirect.sol
@@ -21,9 +21,6 @@ contract C is A, B {
         return f(1);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 10
 // h() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol b/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol
index 4c5468f038..78f1f18635 100644
--- a/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol
+++ b/test/libsolidity/semanticTests/inheritance/explicit_base_class.sol
@@ -21,8 +21,6 @@ contract Derived is Base {
         return 3;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 3
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol b/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol
index 256367df45..70674a6c78 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_constant_state_var.sol
@@ -8,8 +8,5 @@ contract B is A {
         return A.x;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function.sol b/test/libsolidity/semanticTests/inheritance/inherited_function.sol
index 471fe7943e..fb3f8ee8f0 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function.sol
@@ -14,7 +14,5 @@ contract B is A {
         return A.f();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
index 0663ddf4cc..3114c80f19 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_calldata_interface.sol
@@ -20,7 +20,6 @@ contract B {
         return i.f(new uint256[](2));
     }
 }
-
 // ----
 // g() -> 42
 // gas irOptimized: 80813
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
index e9339e6641..74bf42ec7e 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_calldata_memory_interface.sol
@@ -20,7 +20,6 @@ contract B {
         return i.f(new uint256[](2));
     }
 }
-
 // ----
 // g() -> 42
 // gas irOptimized: 100282
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
index 42d4f711c9..1b1092cba9 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_from_a_library.sol
@@ -14,6 +14,5 @@ contract B {
         return A.f();
     }
 }
-
 // ----
 // g() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol b/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol
index e304fc2817..39683079a4 100644
--- a/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol
+++ b/test/libsolidity/semanticTests/inheritance/inherited_function_through_dispatch.sol
@@ -15,7 +15,5 @@ contract B is A {
         return ptr();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 1
diff --git a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
index c0eef13c4b..33392e8d48 100644
--- a/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
+++ b/test/libsolidity/semanticTests/inheritance/member_notation_ctor.sol
@@ -17,7 +17,6 @@ contract A {
 		return d.getX();
 	}
 }
-
 // ----
 // g(int256): -1 -> -1
 // gas legacy: 102086
diff --git a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol
index b54f9bc27e..d31dba485a 100644
--- a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol
+++ b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_first.sol
@@ -11,8 +11,5 @@ contract test {
         return f(3);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 3
diff --git a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol
index 5479960ac0..c1f816c1f9 100644
--- a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol
+++ b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_resolve_to_second.sol
@@ -11,8 +11,5 @@ contract test {
         return f(3, 7);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 10
diff --git a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol
index 70be159e88..c0ff8fd580 100644
--- a/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol
+++ b/test/libsolidity/semanticTests/inheritance/overloaded_function_call_with_if_else.sol
@@ -12,9 +12,6 @@ contract test {
         else return f(3, 7);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // g(bool): true -> 3
 // g(bool): false -> 10
diff --git a/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol b/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol
index c4b6774538..7e0aa51d20 100644
--- a/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/super_in_constructor.sol
@@ -30,7 +30,5 @@ contract D is B, C {
         return data;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 15
diff --git a/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol b/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol
index 47978ddbc7..6b06a784bc 100644
--- a/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol
+++ b/test/libsolidity/semanticTests/inheritance/super_in_constructor_assignment.sol
@@ -33,7 +33,5 @@ contract D is B, C {
         return data;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 15
diff --git a/test/libsolidity/semanticTests/inheritance/super_overload.sol b/test/libsolidity/semanticTests/inheritance/super_overload.sol
index 1bb36ca2ab..7b0b1448f0 100644
--- a/test/libsolidity/semanticTests/inheritance/super_overload.sol
+++ b/test/libsolidity/semanticTests/inheritance/super_overload.sol
@@ -21,9 +21,6 @@ contract C is A, B {
         return super.f(1);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 10
 // h() -> 2
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index dce48fa28c..5390f64db0 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -37,7 +37,6 @@ contract Main {
         them = address(h).balance;
     }
 }
-
 // ----
 // constructor(), 22 wei ->
 // gas irOptimized: 266886
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol
index 21b52f84ea..572e9def0c 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_array_read.sol
@@ -6,7 +6,5 @@ contract C {
         assembly { s := t }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256[2][]): 0x20, 2, 1, 2, 3, 4 -> 0x44, 2, 0x84
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol
index 04ec0b614f..d3574806a2 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_length_read.sol
@@ -7,8 +7,6 @@ contract C {
         assembly { l := x.length }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // lenBytesRead(bytes): 0x20, 4, "abcd" -> 4
 // lenBytesRead(bytes): 0x20, 0, "abcd" -> 0x00
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol
index a9b82d11e0..0b10748c50 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read.sol
@@ -10,8 +10,6 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bytes): 0x20, 0, 0 -> 0x44
 // f(bytes): 0x22, 0, 0, 0 -> 0x46
diff --git a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol b/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol
index 6375055fe2..bcba7169b0 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/calldata_offset_read_write.sol
@@ -10,9 +10,6 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,bytes,uint256): 7, 0x60, 8, 2, 0 -> 8, 0x14
 // f(uint256,bytes,uint256): 0, 0, 0 -> 8, 0x14
diff --git a/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol b/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol
index 130ebcd33d..82badaca78 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/constant_access.sol
@@ -14,7 +14,5 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2, left(0xabcd), left(0x616263), true, 0x1212121212121212121212121212121212121212
diff --git a/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol b/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol
index 91644d1ace..d12a979c99 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/constant_access_referencing.sol
@@ -22,7 +22,5 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2, left(0xabcd), left(0x616263), true, 0x1212121212121212121212121212121212121212
diff --git a/test/libsolidity/semanticTests/inlineAssembly/difficulty.sol b/test/libsolidity/semanticTests/inlineAssembly/difficulty.sol
index 7ae286110c..ef531f78af 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/difficulty.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/difficulty.sol
@@ -6,7 +6,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // EVMVersion: <paris
 // ----
 // f() -> 200000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
index 5d917437e8..c925823d0d 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_embedded_function_call.sol
@@ -20,8 +20,5 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x1, 0x4, 0x7, 0x10
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol
index d074e677ff..848e9016c8 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for.sol
@@ -15,9 +15,6 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0 -> 1
 // f(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol
index c4af2ea5fe..2d81795136 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_for2.sol
@@ -20,9 +20,6 @@ contract C {
         c = st;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0 -> 0, 2, 0
 // f(uint256): 1 -> 1, 4, 3
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
index 48cceeb996..de198dff2e 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call.sol
@@ -14,8 +14,5 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1, 2, 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
index caf441dd46..d21084aa71 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call2.sol
@@ -17,8 +17,5 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x1, 0x2, 0x7, 0x10
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
index 675ec3b1d5..e2e07823c8 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_function_call_assignment.sol
@@ -16,8 +16,5 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1, 2, 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol
index 852f10ac83..ebe50f516b 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_if.sol
@@ -7,9 +7,6 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0 -> 0
 // f(uint256): 1 -> 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol
index f74fbbc638..e050d2b522 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_in_modifiers.sol
@@ -27,9 +27,6 @@ contract C {
         return true;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
 // g() -> FAILURE
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol
index 448cc39914..1f6a50d655 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_memory_access.sol
@@ -8,8 +8,5 @@ contract C {
         return x;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 0x20, 0x5, "12345"
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol
index 58c77a81d5..ae4b94ed59 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_read_and_write_stack.sol
@@ -6,8 +6,5 @@ contract C {
             }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 45
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol
index c3c9297bc0..a509513199 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_recursion.sol
@@ -17,9 +17,6 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0 -> 1
 // f(uint256): 1 -> 1
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol
index d81bff29e1..254bc7473d 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access.sol
@@ -16,8 +16,6 @@ contract C {
         return true;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
 // z() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol
index 039f133ecd..80cd7e11ec 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_inside_function.sol
@@ -17,8 +17,6 @@ contract C {
         return true;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
 // z() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol
index 5544d90efb..c7728068e4 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_local_var.sol
@@ -12,7 +12,5 @@ contract C {
         return a.length;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol
index 687b1d914a..6c382ef9e6 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_storage_access_via_pointer.sol
@@ -17,9 +17,6 @@ contract C {
         return true;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
 // a() -> 7
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol
index e4d8419b48..615d69594b 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_switch.sol
@@ -14,9 +14,6 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0 -> 2
 // f(uint256): 1 -> 8
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol
index b181f82599..ed20bfe2de 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inline_assembly_write_to_stack.sol
@@ -6,8 +6,5 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 7, "abcdef"
diff --git a/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol b/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol
index b9aa70aeda..17e14e8ac0 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/inlineasm_empty_let.sol
@@ -8,8 +8,5 @@ contract C {
 		}
 	}
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0, 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol b/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
index 741d03a8b1..253af98902 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/keccak256_assembly.sol
@@ -5,6 +5,5 @@ contract C {
         }
     }
 }
-
 // ----
 // f() -> 0xc5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470
diff --git a/test/libsolidity/semanticTests/inlineAssembly/leave.sol b/test/libsolidity/semanticTests/inlineAssembly/leave.sol
index 8dff599284..40add273e0 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/leave.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/leave.sol
@@ -10,7 +10,5 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol b/test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol
index 5a3b791feb..8a71c8f4e6 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/prevrandao.sol
@@ -6,7 +6,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // EVMVersion: >=paris
 // ----
 // f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
diff --git a/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol b/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol
index ea24ec6c41..d7e585e33e 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/shadowing_local_function_opcode.sol
@@ -7,7 +7,5 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 7, 3
diff --git a/test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol b/test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol
index 66f592bb67..e080985e36 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/slot_access_via_mapping_pointer.sol
@@ -25,7 +25,6 @@ contract C {
         }
     }
 }
-
 // ----
 // f(uint256): 0 -> 0, 0
 // f(uint256): 1 -> 1, 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol b/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol
index eb57b80926..4183642bb0 100644
--- a/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol
+++ b/test/libsolidity/semanticTests/inlineAssembly/truefalse.sol
@@ -6,7 +6,5 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1, 0
diff --git a/test/libsolidity/semanticTests/integer/basic.sol b/test/libsolidity/semanticTests/integer/basic.sol
index b03cb20f24..cea56cd7cb 100644
--- a/test/libsolidity/semanticTests/integer/basic.sol
+++ b/test/libsolidity/semanticTests/integer/basic.sol
@@ -18,7 +18,5 @@ contract C {
 		return true;
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // basic() -> true
diff --git a/test/libsolidity/semanticTests/integer/int.sol b/test/libsolidity/semanticTests/integer/int.sol
index 770fa0be71..d3681a0ee2 100644
--- a/test/libsolidity/semanticTests/integer/int.sol
+++ b/test/libsolidity/semanticTests/integer/int.sol
@@ -232,8 +232,6 @@ contract test {
 		return true;
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // intMinA() -> true
 // intMinB() -> true
diff --git a/test/libsolidity/semanticTests/integer/many_local_variables.sol b/test/libsolidity/semanticTests/integer/many_local_variables.sol
index 0f3f0f642e..c43f926968 100644
--- a/test/libsolidity/semanticTests/integer/many_local_variables.sol
+++ b/test/libsolidity/semanticTests/integer/many_local_variables.sol
@@ -5,7 +5,5 @@ contract test {
         y += b + x2;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // run(uint256,uint256,uint256): 0x1000, 0x10000, 0x100000 -> 0x121121
diff --git a/test/libsolidity/semanticTests/integer/small_signed_types.sol b/test/libsolidity/semanticTests/integer/small_signed_types.sol
index e1173b9555..4c0311e50f 100644
--- a/test/libsolidity/semanticTests/integer/small_signed_types.sol
+++ b/test/libsolidity/semanticTests/integer/small_signed_types.sol
@@ -3,7 +3,5 @@ contract test {
         return -int32(10) * -int64(20);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // run() -> 200
diff --git a/test/libsolidity/semanticTests/integer/uint.sol b/test/libsolidity/semanticTests/integer/uint.sol
index 2fa6028063..ccd32fab41 100644
--- a/test/libsolidity/semanticTests/integer/uint.sol
+++ b/test/libsolidity/semanticTests/integer/uint.sol
@@ -231,8 +231,6 @@ contract test {
 		return true;
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // uintMinA() -> true
 // uintMinB() -> true
diff --git a/test/libsolidity/semanticTests/interfaceID/homer.sol b/test/libsolidity/semanticTests/interfaceID/homer.sol
index 49b60b12f1..fbe6293ddb 100644
--- a/test/libsolidity/semanticTests/interfaceID/homer.sol
+++ b/test/libsolidity/semanticTests/interfaceID/homer.sol
@@ -28,9 +28,6 @@ contract Homer is ERC165, Simpson {
         return "yellow";
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // supportsInterface(bytes4): left(0x01ffc9a0) -> false
 // supportsInterface(bytes4): left(0x01ffc9a7) -> true
diff --git a/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol b/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol
index 9bf0e3c598..c66169cd3e 100644
--- a/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol
+++ b/test/libsolidity/semanticTests/interfaceID/homer_interfaceId.sol
@@ -28,9 +28,6 @@ contract Homer is ERC165, Simpson {
         return "yellow";
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // supportsInterface(bytes4): left(0x01ffc9a0) -> false
 // supportsInterface(bytes4): left(0x01ffc9a7) -> true
diff --git a/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol b/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol
index 51d48f497c..9bbf11bedb 100644
--- a/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol
+++ b/test/libsolidity/semanticTests/interfaceID/interfaceId_events.sol
@@ -13,9 +13,6 @@ contract Test {
     bytes4 public hello_world = type(HelloWorld).interfaceId;
     bytes4 public hello_world_with_event = type(HelloWorldWithEvent).interfaceId;
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // hello_world() -> left(0xc6be8b58)
 // hello_world_with_event() -> left(0xc6be8b58)
diff --git a/test/libsolidity/semanticTests/interfaceID/interfaces.sol b/test/libsolidity/semanticTests/interfaceID/interfaces.sol
index 77cf837072..f66d859ea3 100644
--- a/test/libsolidity/semanticTests/interfaceID/interfaces.sol
+++ b/test/libsolidity/semanticTests/interfaceID/interfaces.sol
@@ -50,9 +50,6 @@ contract Test {
         return type(HelloWorldDerived).interfaceId;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // hello() -> left(0x19ff1d21)
 // world() -> left(0xdf419679)
diff --git a/test/libsolidity/semanticTests/interfaceID/lisa.sol b/test/libsolidity/semanticTests/interfaceID/lisa.sol
index 885cf9b246..722502d86f 100644
--- a/test/libsolidity/semanticTests/interfaceID/lisa.sol
+++ b/test/libsolidity/semanticTests/interfaceID/lisa.sol
@@ -39,7 +39,6 @@ contract Lisa is ERC165MappingImplementation, Simpson {
         return "yellow";
     }
 }
-
 // ----
 // supportsInterface(bytes4): left(0x01ffc9a0) -> false
 // supportsInterface(bytes4): left(0x01ffc9a7) -> true
diff --git a/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol b/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
index c9a7c49050..457ac8856e 100644
--- a/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
+++ b/test/libsolidity/semanticTests/interfaceID/lisa_interfaceId.sol
@@ -39,7 +39,6 @@ contract Lisa is ERC165MappingImplementation, Simpson {
         return "yellow";
     }
 }
-
 // ----
 // supportsInterface(bytes4): left(0x01ffc9a0) -> false
 // supportsInterface(bytes4): left(0x01ffc9a7) -> true
diff --git a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
index 70c7fac402..62e1e4fba6 100644
--- a/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
+++ b/test/libsolidity/semanticTests/interface_inheritance_conversions.sol
@@ -32,7 +32,6 @@ contract C {
         return (sb.parentFun(), sb.subBFun());
     }
 }
-
 // ----
 // convertParent() -> 1
 // gas irOptimized: 85524
diff --git a/test/libsolidity/semanticTests/isoltestFormatting.sol b/test/libsolidity/semanticTests/isoltestFormatting.sol
index 88ec15f572..9380dc0158 100644
--- a/test/libsolidity/semanticTests/isoltestFormatting.sol
+++ b/test/libsolidity/semanticTests/isoltestFormatting.sol
@@ -8,8 +8,6 @@ contract C {
         return a;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 4, 11, 0x0111, 0x333333, 2222222222222222222
 // g() -> 0x10, 0x0100, 0x0101, 0x333333, 2222222222222222222
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol b/test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol
index 43ce7ea664..1fa930acc2 100644
--- a/test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_call_attached_with_parentheses.sol
@@ -20,6 +20,5 @@ contract C {
         return x.data[3];
     }
 }
-
 // ----
 // f() -> 0x0a
diff --git a/test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol b/test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol
index 4de0f4dc96..5a76dabdfa 100644
--- a/test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_call_unattached_with_parentheses.sol
@@ -9,6 +9,5 @@ contract C {
 		return (L.f)();
 	}
 }
-
 // ----
 // foo() -> 3
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function.sol b/test/libsolidity/semanticTests/libraries/internal_library_function.sol
index a3c8a87001..24299b6d14 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function.sol
@@ -16,6 +16,5 @@ contract C {
         return x[3];
     }
 }
-
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol
index afe9b0deb9..a4a25f51eb 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_contract.sol
@@ -14,6 +14,5 @@ contract C {
         return e.foo();
     }
 }
-
 // ----
 // test() -> 42
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol
index 63ca1e0b7a..a2473e7e79 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_external_function_type.sol
@@ -16,6 +16,5 @@ contract C {
         return this.identity.double(value);
     }
 }
-
 // ----
 // test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol
index e00fd46120..13228115a0 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_interface.sol
@@ -15,6 +15,5 @@ contract C {
         return I(e).foo();
     }
 }
-
 // ----
 // test() -> 42
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol
index c566da79cb..4397711c6f 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type.sol
@@ -15,6 +15,5 @@ contract C {
         return identity.double(value);
     }
 }
-
 // ----
 // test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol
index d66bac750f..4305b6d40e 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_internal_function_type_named_selector.sol
@@ -15,6 +15,5 @@ contract C {
         return identity.selector(value);
     }
 }
-
 // ----
 // test(uint256): 5 -> 10
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol
index f59ec9440d..e9f95c0ac1 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_attached_to_struct.sol
@@ -21,6 +21,5 @@ contract C {
         return x.data[3];
     }
 }
-
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
index 2283c30ff5..5ef12f69b4 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_calling_private.sol
@@ -21,6 +21,5 @@ contract C {
         return x[3];
     }
 }
-
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol b/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
index 21417b599b..d6e0e92620 100644
--- a/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_library_function_return_var_size.sol
@@ -21,6 +21,5 @@ contract C {
         return x.f()[3];
     }
 }
-
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index 7b4e05b72e..169f2e295b 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -19,8 +19,6 @@ contract Test {
         b = Lib.find(data["abc"], 3);
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: Lib
 // f() -> 4, 0x11
diff --git a/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol b/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
index a49dc602ad..44526da68a 100644
--- a/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
+++ b/test/libsolidity/semanticTests/libraries/library_call_in_homestead.sol
@@ -6,7 +6,6 @@ contract Test {
     }
 }
 // ====
-// compileToEwasm: false
 // EVMVersion: >=homestead
 // ----
 // library: Lib
diff --git a/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol b/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
index f24d93c2d9..a385fb29a3 100644
--- a/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
+++ b/test/libsolidity/semanticTests/libraries/library_enum_as_an_expression.sol
@@ -9,6 +9,5 @@ contract Tsra {
         return 1;
     }
 }
-
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/library_references_preserve.sol b/test/libsolidity/semanticTests/libraries/library_references_preserve.sol
index ce41e54e98..41c16d2f3a 100644
--- a/test/libsolidity/semanticTests/libraries/library_references_preserve.sol
+++ b/test/libsolidity/semanticTests/libraries/library_references_preserve.sol
@@ -40,7 +40,6 @@ contract C {
         return b.getSum();
     }
 }
-
 // ----
 // library: L1
 // library: L2
diff --git a/test/libsolidity/semanticTests/libraries/library_stray_values.sol b/test/libsolidity/semanticTests/libraries/library_stray_values.sol
index 61f52b86c8..3acc855702 100644
--- a/test/libsolidity/semanticTests/libraries/library_stray_values.sol
+++ b/test/libsolidity/semanticTests/libraries/library_stray_values.sol
@@ -6,8 +6,6 @@ contract Test {
         return x + 9;
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: Lib
 // f(uint256): 33 -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol b/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
index d7df524341..96ee9bcffe 100644
--- a/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
+++ b/test/libsolidity/semanticTests/libraries/library_struct_as_an_expression.sol
@@ -12,6 +12,5 @@ contract Tsra {
         return 1;
     }
 }
-
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol b/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
index 8a82350dc4..cfbf7b0c7d 100644
--- a/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/mapping_arguments_in_library.sol
@@ -20,8 +20,6 @@ contract Test {
         return Lib.get(m, key);
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: Lib
 // set(uint256,uint256): 1, 42 -> 0
diff --git a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
index a8188fcc65..da521f6bad 100644
--- a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library.sol
@@ -24,8 +24,6 @@ contract Test {
         return b[key];
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: Lib
 // set(bool,uint256,uint256): true, 1, 42 -> 0
diff --git a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
index 6ddad7979b..e5963c1b3f 100644
--- a/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
+++ b/test/libsolidity/semanticTests/libraries/mapping_returns_in_library_named.sol
@@ -22,8 +22,6 @@ contract Test {
         return (a[0], a[1], a[2], b[0], b[1], b[2]);
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: Lib
 // f() -> 0, 0x2a, 0, 0, 0x15, 0x54
diff --git a/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol b/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
index 5e78713b7e..178f22b40f 100644
--- a/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
+++ b/test/libsolidity/semanticTests/libraries/payable_function_calls_library.sol
@@ -6,8 +6,6 @@ contract C {
         return L.f();
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: L
 // f(): 27 -> 7
diff --git a/test/libsolidity/semanticTests/libraries/using_for_by_name.sol b/test/libsolidity/semanticTests/libraries/using_for_by_name.sol
index f9add4cb83..d6c7f313e2 100644
--- a/test/libsolidity/semanticTests/libraries/using_for_by_name.sol
+++ b/test/libsolidity/semanticTests/libraries/using_for_by_name.sol
@@ -7,8 +7,6 @@ contract C {
         return x.mul({x: a});
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: D
 // f(uint256): 7 -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/using_for_overload.sol b/test/libsolidity/semanticTests/libraries/using_for_overload.sol
index 5bc0bc948c..5dd67fba06 100644
--- a/test/libsolidity/semanticTests/libraries/using_for_overload.sol
+++ b/test/libsolidity/semanticTests/libraries/using_for_overload.sol
@@ -11,8 +11,6 @@ contract C {
         return x.mul(a);
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: D
 // f(uint256): 7 -> 0x2a
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index 41c700976c..b180d52e4e 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -16,8 +16,6 @@ contract Test {
         return (m1[0], m1[1], m1[2], m2[0], m2[1], m2[2]);
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
index 3ac843eeda..d46ed0a56a 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
@@ -14,8 +14,6 @@ contract Test {
         return (m[0][0], m[0][1], m[0][2], m[1][0], m[1][1], m[1][2]);
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
diff --git a/test/libsolidity/semanticTests/libraries/using_library_structs.sol b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
index 465dcebb17..e709a5b5b9 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_structs.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_structs.sol
@@ -17,8 +17,6 @@ contract Test {
         b = data["abc"].b[19];
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: Lib
 // f() -> 7, 8
diff --git a/test/libsolidity/semanticTests/literals/denominations.sol b/test/libsolidity/semanticTests/literals/denominations.sol
index 9aec493cd1..f423775a61 100644
--- a/test/libsolidity/semanticTests/literals/denominations.sol
+++ b/test/libsolidity/semanticTests/literals/denominations.sol
@@ -3,7 +3,5 @@ contract C {
 
 	function f() public view returns(uint) { return x; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1000000001000000001
diff --git a/test/libsolidity/semanticTests/literals/escape.sol b/test/libsolidity/semanticTests/literals/escape.sol
index c198f21dc4..96fa9b11e6 100644
--- a/test/libsolidity/semanticTests/literals/escape.sol
+++ b/test/libsolidity/semanticTests/literals/escape.sol
@@ -7,7 +7,5 @@ contract C
 		return (encoded.length, encoded[0], encoded[1]);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2, 0x5c00000000000000000000000000000000000000000000000000000000000000, 0x5c00000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/literals/ether.sol b/test/libsolidity/semanticTests/literals/ether.sol
index d2942a0657..16cb753152 100644
--- a/test/libsolidity/semanticTests/literals/ether.sol
+++ b/test/libsolidity/semanticTests/literals/ether.sol
@@ -3,7 +3,5 @@ contract C {
 
 	function f() public view returns(uint) { return x; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1000000000000000000
diff --git a/test/libsolidity/semanticTests/literals/gwei.sol b/test/libsolidity/semanticTests/literals/gwei.sol
index 3058ee720e..bb8cc6ab0a 100644
--- a/test/libsolidity/semanticTests/literals/gwei.sol
+++ b/test/libsolidity/semanticTests/literals/gwei.sol
@@ -3,7 +3,5 @@ contract C {
 
 	function f() public view returns(uint) { return x; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1000000000
diff --git a/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol b/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol
index d10904cfaf..3edd6049c0 100644
--- a/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol
+++ b/test/libsolidity/semanticTests/literals/hex_string_with_non_printable_characters.sol
@@ -5,7 +5,5 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
diff --git a/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol b/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol
index b14297a94a..db7f70f83b 100644
--- a/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol
+++ b/test/libsolidity/semanticTests/literals/hex_string_with_underscore.sol
@@ -3,7 +3,5 @@ contract C {
         return hex"12_34_5678_9A";
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 32, 5, left(0x123456789A)
diff --git a/test/libsolidity/semanticTests/literals/scientific_notation.sol b/test/libsolidity/semanticTests/literals/scientific_notation.sol
index b03adee393..5e0d80148a 100644
--- a/test/libsolidity/semanticTests/literals/scientific_notation.sol
+++ b/test/libsolidity/semanticTests/literals/scientific_notation.sol
@@ -23,9 +23,6 @@ contract C {
         return -2.5e1;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 20000000000
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/literals/wei.sol b/test/libsolidity/semanticTests/literals/wei.sol
index bf115f1dce..08bba771b0 100644
--- a/test/libsolidity/semanticTests/literals/wei.sol
+++ b/test/libsolidity/semanticTests/literals/wei.sol
@@ -3,7 +3,5 @@ contract C {
 
 	function f() public view returns(uint) { return x; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol b/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol
index e69c93e46b..d2ed3575ec 100644
--- a/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol
+++ b/test/libsolidity/semanticTests/memoryManagement/assembly_access.sol
@@ -10,7 +10,5 @@ contract C {
         assert(y != 0);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol b/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol
index f3a3265341..5b471e1a7e 100644
--- a/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol
+++ b/test/libsolidity/semanticTests/memoryManagement/struct_allocation.sol
@@ -17,8 +17,6 @@ contract C {
         return memorySizeAfter - memorySizeBefore;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // withValue() -> 0x00
 // withoutValue() -> 0x60
diff --git a/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol b/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol
index 4f9bfe971e..efdaedf502 100644
--- a/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol
+++ b/test/libsolidity/semanticTests/metaTypes/name_other_contract.sol
@@ -22,8 +22,6 @@ contract Test is C {
         return type(I).name;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // c() -> 0x20, 1, "C"
 // a() -> 0x20, 1, "A"
diff --git a/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol b/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol
index f56d611c24..4d1538d7cf 100644
--- a/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol
+++ b/test/libsolidity/semanticTests/modifiers/access_through_contract_name.sol
@@ -12,8 +12,6 @@ contract C is A {
         return 10;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 7
 // f() -> 9
diff --git a/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol b/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol
index 925797b7eb..58c6001431 100644
--- a/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol
+++ b/test/libsolidity/semanticTests/modifiers/access_through_module_name.sol
@@ -15,8 +15,6 @@ contract C {
         r = 10;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 0x00
 // f() -> 1, 9
diff --git a/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol
index b15a80df14..67fc0e6be6 100644
--- a/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol
+++ b/test/libsolidity/semanticTests/modifiers/break_in_modifier.sol
@@ -14,8 +14,6 @@ contract C {
         x = t;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 0
 // f() ->
diff --git a/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol
index bc4c797393..2879c55eaf 100644
--- a/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol
+++ b/test/libsolidity/semanticTests/modifiers/continue_in_modifier.sol
@@ -13,9 +13,6 @@ contract C {
         x = t;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 0
 // f() ->
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier.sol b/test/libsolidity/semanticTests/modifiers/function_modifier.sol
index cca7e04b1a..e1978ba871 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier.sol
@@ -7,9 +7,6 @@ contract C {
         if (msg.value > 0) _;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // getOne() -> 0
 // getOne(), 1 wei -> 1
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol
index 182baec8c5..bae5032501 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_calling_functions_in_creation_context.sol
@@ -44,8 +44,5 @@ contract C is A {
         data |= 0x4000;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // getData() -> 0x4300
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol
index 222f87f97e..16cbad1a4a 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_empty.sol
@@ -12,8 +12,5 @@ contract C is A {
         if (false) _;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> false
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol
index 71cbc42037..f32a238145 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_for_constructor.sol
@@ -22,7 +22,5 @@ contract C is A {
         _;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // getData() -> 6
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
index f10ebb0e74..c50fb5ddec 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_library.sol
@@ -23,6 +23,5 @@ contract Test {
         return s.v;
     }
 }
-
 // ----
 // f() -> 0x202
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
index 3d5e97de00..e87ac7a413 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_library_inheritance.sol
@@ -29,6 +29,5 @@ contract Test {
         return s.v;
     }
 }
-
 // ----
 // f() -> 0x202
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol
index dc44d66598..c3b10475fc 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_local_variables.sol
@@ -13,9 +13,6 @@ contract C {
         return 3;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> 0
 // f(bool): false -> 3
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_loop_viair.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_loop_viair.sol
index 86da5500ec..81caba7670 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_loop_viair.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_loop_viair.sol
@@ -10,6 +10,5 @@ contract C {
 }
 // ====
 // compileViaYul: true
-// compileToEwasm: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation_viair.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation_viair.sol
index ae8431d3cc..929b006e3f 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation_viair.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_multi_invocation_viair.sol
@@ -10,7 +10,6 @@ contract C {
 }
 // ====
 // compileViaYul: true
-// compileToEwasm: also
 // ----
 // f(bool): false -> 1
 // f(bool): true -> 1
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol
index 83f855d2c7..5cda8b6d20 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times.sol
@@ -9,9 +9,6 @@ contract C {
         return a;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 3 -> 10
 // a() -> 10
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol
index 264d256bda..780b5a360c 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_multiple_times_local_vars.sol
@@ -12,9 +12,6 @@ contract C {
         return a;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 3 -> 10
 // a() -> 0
diff --git a/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol b/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol
index bef92dac2e..16d6b82163 100644
--- a/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_modifier_overriding.sol
@@ -14,8 +14,5 @@ contract C is A {
         if (false) _;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> false
diff --git a/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol b/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol
index e1a0c36d3b..ecc7851b4b 100644
--- a/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_return_parameter.sol
@@ -4,7 +4,5 @@ contract B {
     modifier mod1(uint a, bool b) { if (b) _; }
     modifier mod2(bytes7 a) { while (a == "1234567") _; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint8): 5 -> 0x00
diff --git a/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol b/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol
index ab14d14c28..530fadf636 100644
--- a/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol
+++ b/test/libsolidity/semanticTests/modifiers/function_return_parameter_complex.sol
@@ -26,8 +26,6 @@ contract A {
         r = x;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x10, 0x20, 0x40
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol b/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol
index 006af1c2cc..a69a26f5ce 100644
--- a/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol
+++ b/test/libsolidity/semanticTests/modifiers/modifer_recursive.sol
@@ -8,9 +8,6 @@ contract C {
         return x == 0 ? 2 : f(x - 1)**2;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // called() -> 0x00
 // f(uint256): 5 -> 0x0100000000
diff --git a/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol b/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol
index 88a2fa1071..136743d530 100644
--- a/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol
+++ b/test/libsolidity/semanticTests/modifiers/modifier_in_constructor_ice.sol
@@ -1,7 +1,5 @@
 // The IR of this contract used to throw
 contract A { modifier m1{_;} }
 contract B is A { constructor() A() m1{} }
-// ====
-// compileToEwasm: also
 // ----
 // constructor() ->
diff --git a/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol b/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol
index df4fa914c6..d4c72e1632 100644
--- a/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol
+++ b/test/libsolidity/semanticTests/modifiers/modifier_init_return.sol
@@ -7,9 +7,6 @@ contract C {
         r[2] = 3;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 9 -> 0x00, 0x00, 0x00, 0x00, 0x00
 // f(uint256): 10 -> 0x00, 0x00, 3, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol b/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol
index 3f2b4ebea1..30cce5a79d 100644
--- a/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol
+++ b/test/libsolidity/semanticTests/modifiers/modifiers_in_construction_context.sol
@@ -7,7 +7,5 @@ contract B is A {
   modifier m2 { _; }
   constructor() A() m1 m2 {  }
 }
-// ====
-// compileToEwasm: also
 // ----
 // constructor() ->
diff --git a/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol b/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol
index 1d71e5ac97..0d9bbfe32b 100644
--- a/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol
+++ b/test/libsolidity/semanticTests/modifiers/return_does_not_skip_modifier.sol
@@ -9,9 +9,6 @@ contract C {
         return 2;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 0
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol b/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol
index ffc503ae20..00e2bb3284 100644
--- a/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol
+++ b/test/libsolidity/semanticTests/modifiers/return_in_modifier.sol
@@ -13,9 +13,6 @@ contract C {
         x = t;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 0
 // f() ->
diff --git a/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol b/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol
index a9b6bfa6c1..616a2183c0 100644
--- a/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol
+++ b/test/libsolidity/semanticTests/modifiers/stacked_return_with_modifiers.sol
@@ -15,8 +15,6 @@ contract C {
         }
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 0
 // f() -> 42
diff --git a/test/libsolidity/semanticTests/multiSource/circular_import.sol b/test/libsolidity/semanticTests/multiSource/circular_import.sol
index 15d75fde50..4c4ba4b28a 100644
--- a/test/libsolidity/semanticTests/multiSource/circular_import.sol
+++ b/test/libsolidity/semanticTests/multiSource/circular_import.sol
@@ -9,7 +9,5 @@ contract C {
     return f() - g();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // foo() -> 1
diff --git a/test/libsolidity/semanticTests/multiSource/circular_import_2.sol b/test/libsolidity/semanticTests/multiSource/circular_import_2.sol
index de47c0380f..639629372e 100644
--- a/test/libsolidity/semanticTests/multiSource/circular_import_2.sol
+++ b/test/libsolidity/semanticTests/multiSource/circular_import_2.sol
@@ -10,7 +10,5 @@ contract C {
     return h() - f() - g();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // foo() -> 992
diff --git a/test/libsolidity/semanticTests/multiSource/circular_reimport.sol b/test/libsolidity/semanticTests/multiSource/circular_reimport.sol
index 8b7fc32a59..a866b0f547 100644
--- a/test/libsolidity/semanticTests/multiSource/circular_reimport.sol
+++ b/test/libsolidity/semanticTests/multiSource/circular_reimport.sol
@@ -12,7 +12,5 @@ contract C {
     return f() - g() - h();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // foo() -> 0x60
diff --git a/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol b/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol
index 3ae209daa8..3ff3a1a602 100644
--- a/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol
+++ b/test/libsolidity/semanticTests/multiSource/circular_reimport_2.sol
@@ -12,7 +12,5 @@ contract C {
     return 10000 + f() - g() - h();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // foo() -> 0x2324
diff --git a/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol b/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol
index 5c42863668..a103ef071a 100644
--- a/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_different_interger_types.sol
@@ -8,7 +8,5 @@ contract C {
     return (g(2), g(false));
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // foo() -> 24, true
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol
index 4e91d42fb4..321e16ae32 100644
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_function_resolution_base_contract.sol
@@ -12,7 +12,5 @@ contract D is C {
     return g();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // h() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol
index 6df3631a76..f111273d8f 100644
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual.sol
@@ -12,7 +12,5 @@ contract D is C {
     return f();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol
index 71fed293ba..ae802d7c0a 100644
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_super.sol
@@ -12,7 +12,5 @@ contract D is C {
     return super.g();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol
index e31fdfa3db..71723f0fa5 100644
--- a/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_function_resolution_override_virtual_transitive.sol
@@ -19,7 +19,5 @@ contract E is D {
     return super.g() + 1;
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 1339
diff --git a/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol b/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol
index 585ef8986d..dec4c3f29e 100644
--- a/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol
+++ b/test/libsolidity/semanticTests/multiSource/free_function_transitive_import.sol
@@ -20,8 +20,5 @@ contract E is D {
     return f();
   }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // i() -> 1337
diff --git a/test/libsolidity/semanticTests/multiSource/import.sol b/test/libsolidity/semanticTests/multiSource/import.sol
index bcaf6f2906..2a0f43d539 100644
--- a/test/libsolidity/semanticTests/multiSource/import.sol
+++ b/test/libsolidity/semanticTests/multiSource/import.sol
@@ -7,8 +7,6 @@ import "A";
 contract B is A {
 	function f(uint256 x) public view returns(uint256) { return x; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 1337 -> 1337
 // g(uint256): 1337 -> 1338
diff --git a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol b/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol
index f980805ed9..c576936745 100644
--- a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol
+++ b/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias.sol
@@ -13,7 +13,5 @@ contract D is M.C {
     return super.g() + f() * 10000;
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 61337
diff --git a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol b/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol
index 5188f0e4a3..a5f43f8b1c 100644
--- a/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol
+++ b/test/libsolidity/semanticTests/multiSource/imported_free_function_via_alias_direct_call.sol
@@ -8,7 +8,5 @@ contract D {
     return g() + f() * 10000;
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // h() -> 61337
diff --git a/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol b/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol
index a31b438ff8..02b4821433 100644
--- a/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol
+++ b/test/libsolidity/semanticTests/multiSource/reimport_imported_function.sol
@@ -9,7 +9,5 @@ contract C {
     return h();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // foo() -> 1337
diff --git a/test/libsolidity/semanticTests/operators/compound_assign.sol b/test/libsolidity/semanticTests/operators/compound_assign.sol
index 6ede4522d4..ed91f3b6c5 100644
--- a/test/libsolidity/semanticTests/operators/compound_assign.sol
+++ b/test/libsolidity/semanticTests/operators/compound_assign.sol
@@ -9,8 +9,6 @@ contract test {
 		return value2 += 7;
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 0, 6 -> 7
 // f(uint256,uint256): 1, 3 -> 0x23
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_bytes_cleanup_viaYul.sol b/test/libsolidity/semanticTests/operators/shifts/shift_bytes_cleanup_viaYul.sol
index 68a3704545..36b6e8b593 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_bytes_cleanup_viaYul.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_bytes_cleanup_viaYul.sol
@@ -13,7 +13,6 @@ contract C {
 	}
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // l(uint8): 64 -> 0x3930313233343536373839300000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol b/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol
index 9f13f4bdce..0adc5ae556 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_cleanup.sol
@@ -8,8 +8,5 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol b/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol
index 560def3b4e..452884f263 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_cleanup_garbled.sol
@@ -6,8 +6,5 @@ contract C {
         x >>= 8;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol
index 1af4930060..bc0c9f4844 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_constant_left.sol
@@ -1,7 +1,5 @@
 contract C {
     uint256 public a = 0x42 << 8;
 }
-// ====
-// compileToEwasm: also
 // ----
 // a() -> 0x4200
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol
index aa75ca4878..3d245e9bf3 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_constant_left_assignment.sol
@@ -4,8 +4,5 @@ contract C {
         a <<= 8;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x4200
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol
index c394072155..6440347509 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_constant_right.sol
@@ -1,7 +1,5 @@
 contract C {
     uint256 public a = 0x4200 >> 8;
 }
-// ====
-// compileToEwasm: also
 // ----
 // a() -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol
index 0a959aa11b..ded331a794 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_constant_right_assignment.sol
@@ -4,8 +4,5 @@ contract C {
         a >>= 8;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left.sol
index 058d233e90..47afab5ec1 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left.sol
@@ -3,9 +3,6 @@ contract C {
         return a << b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 0x4266, 0x0 -> 0x4266
 // f(uint256,uint256): 0x4266, 0x8 -> 0x426600
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol
index 55883ddaef..afa82c6f79 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment.sol
@@ -4,9 +4,6 @@ contract C {
         return a;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 0x4266, 0x0 -> 0x4266
 // f(uint256,uint256): 0x4266, 0x8 -> 0x426600
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol
index 2242d2a168..44fd4a924a 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left_assignment_different_type.sol
@@ -4,9 +4,6 @@ contract C {
         return a;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint8): 0x4266, 0x0 -> 0x4266
 // f(uint256,uint8): 0x4266, 0x8 -> 0x426600
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol
index a1c3fc4cfc..3d6d7c7e2b 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left_larger_type.sol
@@ -6,7 +6,5 @@ contract C {
         return y << x;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol
index 6a208e9fc0..d66e2f4cbf 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left_uint32.sol
@@ -3,9 +3,6 @@ contract C {
         return a << b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint32,uint32): 0x4266, 0x0 -> 0x4266
 // f(uint32,uint32): 0x4266, 0x8 -> 0x426600
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol b/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol
index f9517fb618..d6d6d77bb1 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_left_uint8.sol
@@ -3,9 +3,6 @@ contract C {
         return a << b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint8,uint8): 0x66, 0x0 -> 0x66
 // f(uint8,uint8): 0x66, 0x8 -> 0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol b/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol
index e303e73eac..7671ce19de 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_left.sol
@@ -1,7 +1,5 @@
 contract C {
     int256 public a = -0x42 << 8;
 }
-// ====
-// compileToEwasm: also
 // ----
 // a() -> -16896
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol b/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol
index 32ae16edcd..e9a76d2c94 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_negative_constant_right.sol
@@ -1,7 +1,5 @@
 contract C {
     int256 public a = -0x4200 >> 8;
 }
-// ====
-// compileToEwasm: also
 // ----
 // a() -> -66
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol b/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol
index 3e63bc8eba..5b0491b367 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_overflow.sol
@@ -7,9 +7,6 @@ contract C {
         return x << y;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // leftU(uint8,uint8): 255, 8 -> 0
 // leftU(uint8,uint8): 255, 1 -> 254
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right.sol
index 97ca0a5c43..4947b21d45 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right.sol
@@ -3,9 +3,6 @@ contract C {
         return a >> b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 0x4266, 0x0 -> 0x4266
 // f(uint256,uint256): 0x4266, 0x8 -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol
index b427210843..f9206b092f 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_assignment.sol
@@ -4,9 +4,6 @@ contract C {
         return a;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 0x4266, 0x0 -> 0x4266
 // f(uint256,uint256): 0x4266, 0x8 -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol
index c7fa354955..2b1afb52be 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_signed_v2.sol
@@ -18,8 +18,6 @@ contract C {
         return a >> b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(int8,uint8): 0x00, 0x03 -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
 // f(int8,uint8): 0x00, 0x04 -> 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol
index ecb51e902a..8cf89f4b00 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_garbled_v2.sol
@@ -10,8 +10,6 @@ contract C {
         return a >> b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint8,uint8): 0x00, 0x04 -> 0x0f
 // f(uint8,uint8): 0x00, 0x1004 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol
index 630f4905ea..e24118afe1 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_literal.sol
@@ -47,9 +47,6 @@ contract C {
         return (-4267 >> 17) == -1;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f1() -> true
 // f2() -> true
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol
index 6d2f7ae582..5dcde06f2b 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue.sol
@@ -3,9 +3,6 @@ contract C {
         return a >> b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(int256,uint256): -4266, 0 -> -4266
 // f(int256,uint256): -4266, 1 -> -2133
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol
index 74b704f48e..00ac9662e8 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_assignment.sol
@@ -4,9 +4,6 @@ contract C {
         return a;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(int256,uint256): -4266, 0 -> -4266
 // f(int256,uint256): -4266, 1 -> -2133
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol
index 533c93bc92..50612a6f30 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int16.sol
@@ -3,9 +3,6 @@ contract C {
         return a >> b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(int16,uint16): -4266, 0 -> -4266
 // f(int16,uint16): -4266, 1 -> -2133
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol
index 3dc12b2230..024eb32546 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int32.sol
@@ -3,9 +3,6 @@ contract C {
         return a >> b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(int32,uint32): -4266, 0 -> -4266
 // f(int32,uint32): -4266, 1 -> -2133
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol
index f6dda70597..9cff6c3b52 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_int8.sol
@@ -3,9 +3,6 @@ contract C {
         return a >> b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(int8,uint8): -66, 0 -> -66
 // f(int8,uint8): -66, 1 -> -33
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol
index d81e00fd52..f2c0244830 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int16_v2.sol
@@ -6,8 +6,6 @@ contract C {
         return a >> b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(int16,uint16): 0xff99, 0x00 -> FAILURE
 // f(int16,uint16): 0xff99, 0x01 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol
index cac3a53b6c..9c3090a783 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int32_v2.sol
@@ -6,8 +6,6 @@ contract C {
         return a >> b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(int32,uint32): 0xffffff99, 0x00 -> FAILURE
 // f(int32,uint32): 0xffffff99, 0x01 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol
index 0fe10c9379..8d3cec4e31 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_negative_lvalue_signextend_int8_v2.sol
@@ -6,8 +6,6 @@ contract C {
         return a >> b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(int8,uint8): 0x99, 0x00 -> FAILURE
 // f(int8,uint8): 0x99, 0x01 -> FAILURE
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol
index a5d1ed51cf..2619ea334d 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_uint32.sol
@@ -3,9 +3,6 @@ contract C {
         return a >> b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint32,uint32): 0x4266, 0x0 -> 0x4266
 // f(uint32,uint32): 0x4266, 0x8 -> 0x42
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol b/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol
index 7ac59b3fc6..1792d87551 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_right_uint8.sol
@@ -3,9 +3,6 @@ contract C {
         return a >> b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint8,uint8): 0x66, 0x0 -> 0x66
 // f(uint8,uint8): 0x66, 0x8 -> 0x0
diff --git a/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol b/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol
index 111357e9ee..6f4f95e919 100644
--- a/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol
+++ b/test/libsolidity/semanticTests/operators/shifts/shift_underflow_negative_rvalue.sol
@@ -7,9 +7,6 @@ contract C {
         return a >> b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(int256,uint256): 1, -1 -> 0
 // g(int256,uint256): 1, -1 -> 0
diff --git a/test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol b/test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol
index 684ea1b433..9f3fd5d4e4 100644
--- a/test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol
+++ b/test/libsolidity/semanticTests/operators/userDefined/unchecked_operators.sol
@@ -19,7 +19,6 @@ contract D {
         }
     }
 }
-
 // ----
 // testUncheckedOperator() -> 4
 // testUncheckedOperatorInUncheckedBlock() -> 4
diff --git a/test/libsolidity/semanticTests/optimizer/shift_bytes.sol b/test/libsolidity/semanticTests/optimizer/shift_bytes.sol
index 49d693a777..6c7eef895c 100644
--- a/test/libsolidity/semanticTests/optimizer/shift_bytes.sol
+++ b/test/libsolidity/semanticTests/optimizer/shift_bytes.sol
@@ -37,8 +37,6 @@ contract C {
     return (x, y, z);
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f -> 0x1f, 0x1f, 3
 // g(uint256): 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f -> 1, 3, 5
diff --git a/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol b/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol
index 4c6557cd7a..c360959143 100644
--- a/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol
+++ b/test/libsolidity/semanticTests/payable/no_nonpayable_circumvention_by_modifier.sol
@@ -9,8 +9,6 @@ contract C {
         return msg.value;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(), 27 wei -> FAILURE
 // balance -> 0
diff --git a/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol b/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol
index 1be435ff68..ce04cd7374 100644
--- a/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol
+++ b/test/libsolidity/semanticTests/receive/empty_calldata_calls_receive.sol
@@ -2,8 +2,6 @@ contract A {
     uint public x;
     receive () external payable { ++x; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 0
 // ()
diff --git a/test/libsolidity/semanticTests/receive/ether_and_data.sol b/test/libsolidity/semanticTests/receive/ether_and_data.sol
index df3c89884b..4c48df8d47 100644
--- a/test/libsolidity/semanticTests/receive/ether_and_data.sol
+++ b/test/libsolidity/semanticTests/receive/ether_and_data.sol
@@ -1,8 +1,6 @@
 contract C {
     receive () payable external { }
 }
-// ====
-// compileToEwasm: also
 // ----
 // (), 1 ether
 // (), 1 ether: 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/receive/inherited.sol b/test/libsolidity/semanticTests/receive/inherited.sol
index 9ca685399f..36273068ac 100644
--- a/test/libsolidity/semanticTests/receive/inherited.sol
+++ b/test/libsolidity/semanticTests/receive/inherited.sol
@@ -4,8 +4,6 @@ contract A {
     function getData() public returns (uint r) { return data; }
 }
 contract B is A {}
-// ====
-// compileToEwasm: also
 // ----
 // getData() -> 0
 // () ->
diff --git a/test/libsolidity/semanticTests/reverts/assert_require.sol b/test/libsolidity/semanticTests/reverts/assert_require.sol
index ee60fc192c..bc4db3602c 100644
--- a/test/libsolidity/semanticTests/reverts/assert_require.sol
+++ b/test/libsolidity/semanticTests/reverts/assert_require.sol
@@ -13,9 +13,6 @@ contract C {
         return true;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x01
 // g(bool): false -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/reverts/error_struct.sol b/test/libsolidity/semanticTests/reverts/error_struct.sol
index 4ca57bd6ee..d6171a416a 100644
--- a/test/libsolidity/semanticTests/reverts/error_struct.sol
+++ b/test/libsolidity/semanticTests/reverts/error_struct.sol
@@ -10,8 +10,6 @@ contract C {
 		return _struct.error;
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"f8a8fd6d"
 // g(uint256): 7 -> 7
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol
index 1e3e34cb1a..28c4e01f99 100644
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol
+++ b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_arg.sol
@@ -17,6 +17,5 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileToEwasm: also
 // ----
 // test() -> FAILURE, hex"4e487b71", 0x21 # should throw #
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol
index 987931fa7d..7416d295fc 100644
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol
+++ b/test/libsolidity/semanticTests/reverts/invalid_enum_as_external_ret.sol
@@ -23,10 +23,8 @@ contract C {
         _ret = tmp;
     }
 }
-
 // ====
 // EVMVersion: >=byzantium
-// compileToEwasm: also
 // ----
 // test_return() -> FAILURE, hex"4e487b71", 33 # both should throw #
 // test_inline_assignment() -> FAILURE, hex"4e487b71", 33
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol
index afdbd20b67..527a432023 100644
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol
+++ b/test/libsolidity/semanticTests/reverts/invalid_enum_compared.sol
@@ -24,7 +24,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileToEwasm: also
 // ----
 // test_eq_ok() -> 1
 // test_eq() -> FAILURE, hex"4e487b71", 33 # both should throw #
diff --git a/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol b/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol
index fdf5e6bbb1..8049a977e7 100644
--- a/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol
+++ b/test/libsolidity/semanticTests/reverts/invalid_enum_stored.sol
@@ -18,7 +18,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileToEwasm: also
 // ----
 // test_store_ok() -> 1
 // x() -> 0
diff --git a/test/libsolidity/semanticTests/reverts/invalid_instruction.sol b/test/libsolidity/semanticTests/reverts/invalid_instruction.sol
index f4f64a11e5..69d9a0cd36 100644
--- a/test/libsolidity/semanticTests/reverts/invalid_instruction.sol
+++ b/test/libsolidity/semanticTests/reverts/invalid_instruction.sol
@@ -5,8 +5,5 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE
diff --git a/test/libsolidity/semanticTests/reverts/revert.sol b/test/libsolidity/semanticTests/reverts/revert.sol
index cac02076d5..2d733b4e7d 100644
--- a/test/libsolidity/semanticTests/reverts/revert.sol
+++ b/test/libsolidity/semanticTests/reverts/revert.sol
@@ -13,9 +13,6 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE
 // a() -> 42
diff --git a/test/libsolidity/semanticTests/reverts/revert_return_area.sol b/test/libsolidity/semanticTests/reverts/revert_return_area.sol
index fa8156b300..8ab4ca2272 100644
--- a/test/libsolidity/semanticTests/reverts/revert_return_area.sol
+++ b/test/libsolidity/semanticTests/reverts/revert_return_area.sol
@@ -12,7 +12,6 @@ contract C {
         }
     }
 }
-
 // ====
 // EVMVersion: >=byzantium
 // ----
diff --git a/test/libsolidity/semanticTests/reverts/simple_throw.sol b/test/libsolidity/semanticTests/reverts/simple_throw.sol
index 0d43c97e96..1c1bfee0b3 100644
--- a/test/libsolidity/semanticTests/reverts/simple_throw.sol
+++ b/test/libsolidity/semanticTests/reverts/simple_throw.sol
@@ -5,9 +5,6 @@ contract Test {
         return 2;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 11 -> 21
 // f(uint256): 1 -> FAILURE
diff --git a/test/libsolidity/semanticTests/smoke/basic.sol b/test/libsolidity/semanticTests/smoke/basic.sol
index 81e8bd829c..8f05c42625 100644
--- a/test/libsolidity/semanticTests/smoke/basic.sol
+++ b/test/libsolidity/semanticTests/smoke/basic.sol
@@ -28,8 +28,6 @@ contract C {
         return a * 7;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // d() ->
 // e(), 1 wei -> 1
diff --git a/test/libsolidity/semanticTests/smoke/failure.sol b/test/libsolidity/semanticTests/smoke/failure.sol
index eeb82a3ce4..14cf1e6273 100644
--- a/test/libsolidity/semanticTests/smoke/failure.sol
+++ b/test/libsolidity/semanticTests/smoke/failure.sol
@@ -16,7 +16,6 @@ contract C {
 // ====
 // EVMVersion: >homestead
 // allowNonExistingFunctions: true
-// compileToEwasm: also
 // ----
 // _() -> FAILURE
 // e() -> FAILURE, hex"08c379a0", 0x20, 0x13, "Transaction failed."
diff --git a/test/libsolidity/semanticTests/smoke/fallback.sol b/test/libsolidity/semanticTests/smoke/fallback.sol
index 5a4f89d843..b0e515db32 100644
--- a/test/libsolidity/semanticTests/smoke/fallback.sol
+++ b/test/libsolidity/semanticTests/smoke/fallback.sol
@@ -8,8 +8,6 @@ contract A {
         externalData = msg.data;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // data() -> 0
 // ()
diff --git a/test/libsolidity/semanticTests/smoke/multiline.sol b/test/libsolidity/semanticTests/smoke/multiline.sol
index 97fbd5b3be..624b19473d 100644
--- a/test/libsolidity/semanticTests/smoke/multiline.sol
+++ b/test/libsolidity/semanticTests/smoke/multiline.sol
@@ -5,7 +5,6 @@ contract C {
 }
 // ====
 // allowNonExistingFunctions: true
-// compileToEwasm: also
 // ----
 // f(uint256,uint256,uint256,uint256,uint256): 1, 1, 1, 1, 1
 // -> 5
diff --git a/test/libsolidity/semanticTests/smoke/multiline_comments.sol b/test/libsolidity/semanticTests/smoke/multiline_comments.sol
index cdfe43f5ec..17de40fc4d 100644
--- a/test/libsolidity/semanticTests/smoke/multiline_comments.sol
+++ b/test/libsolidity/semanticTests/smoke/multiline_comments.sol
@@ -3,8 +3,6 @@ contract C {
         return a + b + c + d + e;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256,uint256,uint256,uint256): 1, 1, 1, 1, 1
 // # A comment on the function parameters. #
diff --git a/test/libsolidity/semanticTests/smoke/structs.sol b/test/libsolidity/semanticTests/smoke/structs.sol
index 813d6954c0..d6df382c95 100644
--- a/test/libsolidity/semanticTests/smoke/structs.sol
+++ b/test/libsolidity/semanticTests/smoke/structs.sol
@@ -17,8 +17,6 @@ contract C {
         return T(23, 42, "any");
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // s() -> 23, 42
 // t() -> 0x20, 23, 42, 0x60, 3, "any"
diff --git a/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol b/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol
index f38eee4297..80f734a31a 100644
--- a/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol
+++ b/test/libsolidity/semanticTests/specialFunctions/abi_encode_with_signature_from_string.sol
@@ -8,7 +8,5 @@ contract C {
             assert(r1[i] == r2[i]);
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // f() -> 0x40, 0xa0, 0x24, -813742827273327954027712588510533233455028711326166692885570228492575965184, 26959946667150639794667015087019630673637144422540572481103610249216, 0x24, -813742827273327954027712588510533233455028711326166692885570228492575965184, 26959946667150639794667015087019630673637144422540572481103610249216
diff --git a/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol b/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol
index 4c46d1ea00..b255b1880b 100644
--- a/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol
+++ b/test/libsolidity/semanticTests/specialFunctions/abi_functions_member_access.sol
@@ -7,7 +7,5 @@ contract C {
         abi.decode;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/state/block_coinbase.sol b/test/libsolidity/semanticTests/state/block_coinbase.sol
index 5087fe7323..e7aae2fc73 100644
--- a/test/libsolidity/semanticTests/state/block_coinbase.sol
+++ b/test/libsolidity/semanticTests/state/block_coinbase.sol
@@ -3,8 +3,6 @@ contract C {
         return block.coinbase;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x7878787878787878787878787878787878787878
 // f() -> 0x7878787878787878787878787878787878787878
diff --git a/test/libsolidity/semanticTests/state/block_difficulty.sol b/test/libsolidity/semanticTests/state/block_difficulty.sol
index 4f6a6b08ff..921200ddf2 100644
--- a/test/libsolidity/semanticTests/state/block_difficulty.sol
+++ b/test/libsolidity/semanticTests/state/block_difficulty.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // EVMVersion: <paris
 // ----
 // f() -> 200000000
diff --git a/test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol b/test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol
index 9fb467e6f5..226a8bbb8b 100644
--- a/test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol
+++ b/test/libsolidity/semanticTests/state/block_difficulty_post_paris.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // EVMVersion: >=paris
 // ----
 // f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
diff --git a/test/libsolidity/semanticTests/state/block_gaslimit.sol b/test/libsolidity/semanticTests/state/block_gaslimit.sol
index 3ccc37543c..0201068b63 100644
--- a/test/libsolidity/semanticTests/state/block_gaslimit.sol
+++ b/test/libsolidity/semanticTests/state/block_gaslimit.sol
@@ -3,8 +3,6 @@ contract C {
         return block.gaslimit;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 20000000
 // f() -> 20000000
diff --git a/test/libsolidity/semanticTests/state/block_number.sol b/test/libsolidity/semanticTests/state/block_number.sol
index a55c2a3cac..01ec30966a 100644
--- a/test/libsolidity/semanticTests/state/block_number.sol
+++ b/test/libsolidity/semanticTests/state/block_number.sol
@@ -4,8 +4,6 @@ contract C {
         return block.number;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // constructor()
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/state/block_prevrandao.sol b/test/libsolidity/semanticTests/state/block_prevrandao.sol
index 24d5f2af63..590265da9f 100644
--- a/test/libsolidity/semanticTests/state/block_prevrandao.sol
+++ b/test/libsolidity/semanticTests/state/block_prevrandao.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // EVMVersion: >=paris
 // ----
 // f() -> 0xa86c2e601b6c44eb4848f7d23d9df3113fbcac42041c49cbed5000cb4f118777
diff --git a/test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol b/test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol
index efc4d226f5..6824cab5ca 100644
--- a/test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol
+++ b/test/libsolidity/semanticTests/state/block_prevrandao_pre_paris.sol
@@ -4,7 +4,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // EVMVersion: <paris
 // ----
 // f() -> 200000000
diff --git a/test/libsolidity/semanticTests/state/block_timestamp.sol b/test/libsolidity/semanticTests/state/block_timestamp.sol
index 84cfe3b9f4..485ae4be32 100644
--- a/test/libsolidity/semanticTests/state/block_timestamp.sol
+++ b/test/libsolidity/semanticTests/state/block_timestamp.sol
@@ -4,8 +4,6 @@ contract C {
         return block.timestamp;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // constructor() # This is the 1st block #
 // f() -> 0x1e # This is the 2nd block (each block is "15 seconds") #
diff --git a/test/libsolidity/semanticTests/state/gasleft.sol b/test/libsolidity/semanticTests/state/gasleft.sol
index 9f50ef46dc..6ce623ce81 100644
--- a/test/libsolidity/semanticTests/state/gasleft.sol
+++ b/test/libsolidity/semanticTests/state/gasleft.sol
@@ -3,8 +3,6 @@ contract C {
         return gasleft() > 0;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
 // f() -> true
diff --git a/test/libsolidity/semanticTests/state/msg_sender.sol b/test/libsolidity/semanticTests/state/msg_sender.sol
index eda4e5a059..951d1f5292 100644
--- a/test/libsolidity/semanticTests/state/msg_sender.sol
+++ b/test/libsolidity/semanticTests/state/msg_sender.sol
@@ -3,7 +3,5 @@ contract C {
         return msg.sender;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x1212121212121212121212121212120000000012
diff --git a/test/libsolidity/semanticTests/state/msg_sig.sol b/test/libsolidity/semanticTests/state/msg_sig.sol
index 858ee98539..f2f26e2456 100644
--- a/test/libsolidity/semanticTests/state/msg_sig.sol
+++ b/test/libsolidity/semanticTests/state/msg_sig.sol
@@ -6,8 +6,6 @@ contract C {
         return msg.sig;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x26121ff000000000000000000000000000000000000000000000000000000000
 // g() -> 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/state/msg_value.sol b/test/libsolidity/semanticTests/state/msg_value.sol
index 2d14d1d7b8..143183b865 100644
--- a/test/libsolidity/semanticTests/state/msg_value.sol
+++ b/test/libsolidity/semanticTests/state/msg_value.sol
@@ -3,8 +3,6 @@ contract C {
         return msg.value;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0
 // f(), 12 ether -> 12000000000000000000
diff --git a/test/libsolidity/semanticTests/state/tx_gasprice.sol b/test/libsolidity/semanticTests/state/tx_gasprice.sol
index 59ddfbe5cf..0d6dc6ae9c 100644
--- a/test/libsolidity/semanticTests/state/tx_gasprice.sol
+++ b/test/libsolidity/semanticTests/state/tx_gasprice.sol
@@ -3,8 +3,6 @@ contract C {
         return tx.gasprice;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 3000000000
 // f() -> 3000000000
diff --git a/test/libsolidity/semanticTests/state/tx_origin.sol b/test/libsolidity/semanticTests/state/tx_origin.sol
index 8383538243..aa726c3552 100644
--- a/test/libsolidity/semanticTests/state/tx_origin.sol
+++ b/test/libsolidity/semanticTests/state/tx_origin.sol
@@ -3,8 +3,6 @@ contract C {
         return tx.origin;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x9292929292929292929292929292929292929292
 // f() -> 0x9292929292929292929292929292929292929292
diff --git a/test/libsolidity/semanticTests/state/uncalled_blockhash.sol b/test/libsolidity/semanticTests/state/uncalled_blockhash.sol
index 02c55c7d33..4e2526c728 100644
--- a/test/libsolidity/semanticTests/state/uncalled_blockhash.sol
+++ b/test/libsolidity/semanticTests/state/uncalled_blockhash.sol
@@ -3,7 +3,5 @@ contract C {
         return (blockhash)(block.number - 1);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x3737373737373737373737373737373737373737373737373737373737373738
diff --git a/test/libsolidity/semanticTests/state_var_initialization.sol b/test/libsolidity/semanticTests/state_var_initialization.sol
index 93b22bfa91..a8b0f108a8 100644
--- a/test/libsolidity/semanticTests/state_var_initialization.sol
+++ b/test/libsolidity/semanticTests/state_var_initialization.sol
@@ -7,8 +7,6 @@ contract C {
         k = k - i;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // i() -> 2
 // k() -> 0
diff --git a/test/libsolidity/semanticTests/state_variables_init_order.sol b/test/libsolidity/semanticTests/state_variables_init_order.sol
index b6ac20cd0e..6f8a59c14d 100644
--- a/test/libsolidity/semanticTests/state_variables_init_order.sol
+++ b/test/libsolidity/semanticTests/state_variables_init_order.sol
@@ -8,7 +8,5 @@ contract A {
 }
 contract B is A {
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/state_variables_init_order_2.sol b/test/libsolidity/semanticTests/state_variables_init_order_2.sol
index 95c0b42007..9003898e61 100644
--- a/test/libsolidity/semanticTests/state_variables_init_order_2.sol
+++ b/test/libsolidity/semanticTests/state_variables_init_order_2.sol
@@ -12,7 +12,5 @@ contract B is A {
         z = x;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // z() -> 1
diff --git a/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol b/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol
index 761cc76bda..76f2bc4ae6 100644
--- a/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol
+++ b/test/libsolidity/semanticTests/statements/do_while_loop_continue.sol
@@ -10,7 +10,5 @@ contract test {
         return 42;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 42
diff --git a/test/libsolidity/semanticTests/storage/packed_functions.sol b/test/libsolidity/semanticTests/storage/packed_functions.sol
index 4a49a614f3..564a3fabf3 100644
--- a/test/libsolidity/semanticTests/storage/packed_functions.sol
+++ b/test/libsolidity/semanticTests/storage/packed_functions.sol
@@ -38,7 +38,6 @@ contract C {
         return 8;
     }
 }
-
 // ----
 // set() ->
 // t1() -> 7
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol b/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol
index c10931f99d..af2ecc70c9 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_overflow.sol
@@ -11,7 +11,5 @@ contract C {
         return (x, c, b, a);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x1234, 0x0, 0x0, 0xfffe
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_signed.sol b/test/libsolidity/semanticTests/storage/packed_storage_signed.sol
index b457d0731b..92cb82c90c 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_signed.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_signed.sol
@@ -19,8 +19,5 @@ contract C {
         x4 = d;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> -2, 4, -112, 0
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
index a3131d564f..b1686d9074 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
@@ -40,9 +40,6 @@ contract C {
             y == 0x07;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> true
 // gas irOptimized: 132505
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol
index d9e897762d..cda71d33da 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_enum.sol
@@ -28,8 +28,5 @@ contract C {
         return 1;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 1
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol
index d01f072685..ea3c03d644 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_uint.sol
@@ -25,8 +25,5 @@ contract C {
         return 1;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 1
diff --git a/test/libsolidity/semanticTests/storage/simple_accessor.sol b/test/libsolidity/semanticTests/storage/simple_accessor.sol
index 72398d9abb..7aaeb4dbb9 100644
--- a/test/libsolidity/semanticTests/storage/simple_accessor.sol
+++ b/test/libsolidity/semanticTests/storage/simple_accessor.sol
@@ -4,7 +4,5 @@ contract test {
         data = 8;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // data() -> 8
diff --git a/test/libsolidity/semanticTests/storage/state_smoke_test.sol b/test/libsolidity/semanticTests/storage/state_smoke_test.sol
index 0bcdd1ad39..1b464531b5 100644
--- a/test/libsolidity/semanticTests/storage/state_smoke_test.sol
+++ b/test/libsolidity/semanticTests/storage/state_smoke_test.sol
@@ -10,8 +10,6 @@ contract test {
         else value2 = value;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // get(uint8): 0x00 -> 0
 // get(uint8): 0x01 -> 0
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
index b5db79e8f2..0297bd26f1 100644
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_argument_list.sol
@@ -3,7 +3,5 @@ contract C {
         return string.concat();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
index f452c3b352..b90235b3f8 100644
--- a/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
+++ b/test/libsolidity/semanticTests/strings/concat/string_concat_empty_strings.sol
@@ -18,8 +18,6 @@ contract C {
         return string.concat(b, "abc", b, "abc", b);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 0
 // g() -> 0x20, 6, "abcabc"
diff --git a/test/libsolidity/semanticTests/strings/empty_string.sol b/test/libsolidity/semanticTests/strings/empty_string.sol
index d1a6fc5849..f023c72369 100644
--- a/test/libsolidity/semanticTests/strings/empty_string.sol
+++ b/test/libsolidity/semanticTests/strings/empty_string.sol
@@ -3,7 +3,5 @@ contract C {
         return "";
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/strings/return_string.sol b/test/libsolidity/semanticTests/strings/return_string.sol
index 4393d7dcc7..704a7859cd 100644
--- a/test/libsolidity/semanticTests/strings/return_string.sol
+++ b/test/libsolidity/semanticTests/strings/return_string.sol
@@ -10,8 +10,6 @@ contract Main {
         r = s;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // set(string): 0x20, 5, "Julia" ->
 // get1() -> 0x20, 5, "Julia"
diff --git a/test/libsolidity/semanticTests/strings/string_escapes.sol b/test/libsolidity/semanticTests/strings/string_escapes.sol
index 3ccae698f0..ea178d645e 100644
--- a/test/libsolidity/semanticTests/strings/string_escapes.sol
+++ b/test/libsolidity/semanticTests/strings/string_escapes.sol
@@ -4,7 +4,5 @@ contract test {
         return escapeCharacters;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x090a0d27225c0000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/strings/unicode_escapes.sol b/test/libsolidity/semanticTests/strings/unicode_escapes.sol
index 95c322f5b2..401d8b61e4 100644
--- a/test/libsolidity/semanticTests/strings/unicode_escapes.sol
+++ b/test/libsolidity/semanticTests/strings/unicode_escapes.sol
@@ -15,8 +15,6 @@ contract C {
         return "\u0024\u00A2\u20AC";
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // oneByteUTF8() -> 0x20, 7, "aaa$aaa"
 // twoBytesUTF8() -> 0x20, 8, "aaa\xc2\xa2aaa"
diff --git a/test/libsolidity/semanticTests/strings/unicode_string.sol b/test/libsolidity/semanticTests/strings/unicode_string.sol
index 516febe6ed..e06556fb54 100644
--- a/test/libsolidity/semanticTests/strings/unicode_string.sol
+++ b/test/libsolidity/semanticTests/strings/unicode_string.sol
@@ -7,8 +7,6 @@ contract C {
  and 😈";
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 0x14, "\xf0\x9f\x98\x83, \xf0\x9f\x98\xad, and \xf0\x9f\x98\x88"
 // g() -> 0x20, 0x14, "\xf0\x9f\x98\x83, \xf0\x9f\x98\xad, and \xf0\x9f\x98\x88"
diff --git a/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol b/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol
index f62f4c0845..f5f53cc40d 100644
--- a/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol
+++ b/test/libsolidity/semanticTests/structs/array_of_recursive_struct.sol
@@ -8,7 +8,5 @@ contract Test {
         assert(val[0].vals.length == 42);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // func() ->
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol
index ca635aeb43..418f9e93a8 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct.sol
@@ -12,8 +12,5 @@ contract C {
         b = s.b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f((uint256,uint256)): 42, 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
index 144df2d616..5bdd1b42fb 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_and_ints.sol
@@ -15,6 +15,5 @@ contract C {
         return (a, s.a, s.b, b);
     }
 }
-
 // ----
 // f(uint256,(uint256,uint256),uint256): 1, 2, 3, 4 -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol
index e6972e03f3..14f770a350 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_array_member_dynamic.sol
@@ -18,7 +18,5 @@ contract C {
         c = s.c;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f((uint32,uint256[],uint64)): 0x20, 42, 0x60, 23, 2, 1, 2 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol
index 76e6f7c1d8..3aeb0dcbca 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_memory.sol
@@ -12,8 +12,5 @@ contract C {
         return (m.a, m.b, m.c[1]);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f((uint256,uint256,bytes2)): 42, 23, "ab" -> 42, 23, "b"
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol
index 74d30f5052..6b56a73c2c 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_to_storage.sol
@@ -15,8 +15,5 @@ contract C {
         return (s.a, s.b, s.c[1]);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint32,(uint256,uint64,bytes2),uint256): 1, 42, 23, "ab", 1 -> 42, 23, "b"
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
index 7ae085dbb5..b7b3058b42 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_array_to_memory.sol
@@ -16,6 +16,5 @@ contract C {
         return (m.a, m.b[0], m.b[1], m.c);
     }
 }
-
 // ----
 // f((uint256,uint256[2],uint256)): 42, 1, 2, 23 -> 42, 1, 2, 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
index 0adc4c5a7b..3fa7a33fda 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_bytes_to_memory.sol
@@ -16,6 +16,5 @@ contract C {
         return (m.a, m.b[0], m.b[1], m.c);
     }
 }
-
 // ----
 // f((uint256,bytes,uint256)): 0x20, 42, 0x60, 23, 2, "ab" -> 42, "a", "b", 23
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol
index 6092b161d9..b730771312 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_structs.sol
@@ -22,8 +22,5 @@ contract C {
         e = s3.b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f((uint256,uint256),(uint256),(uint256,uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol b/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol
index 2b75441394..633c4c7b32 100644
--- a/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/dynamic_nested.sol
@@ -7,7 +7,5 @@ contract C {
 		return (s.children.length, s.a, s.children[0].b, s.children[1].b);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f((uint256,(uint256)[])): 32, 17, 64, 2, 23, 42 -> 2, 17, 23, 42
diff --git a/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol b/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol
index b4beff9416..0dfa2cea3f 100644
--- a/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/dynamically_encoded.sol
@@ -6,7 +6,5 @@ contract C {
 	    return (s.a.length, s.a[0], s.a[1]);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f((uint256[])): 32, 32, 2, 42, 23 -> 2, 42, 23
diff --git a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
index 9aa41a3425..df118de323 100644
--- a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
@@ -34,7 +34,6 @@ contract C {
     }
 
 }
-
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121497
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol
index 8ccc30936e..6c22c71da8 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_memory.sol
@@ -10,7 +10,6 @@ contract C {
         return s;
     }
 }
-
 // ----
 // test((uint8[1],uint8[])): 0x20, 3, 0x40, 2, 7, 11 -> 0x20, 3, 0x40, 2, 7, 11
 // test((uint8[1],uint8[])): 0x20, 3, 0x40, 3, 17, 19, 23 -> 0x20, 3, 0x40, 3, 17, 19, 23
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol
index fa67deb2c0..dcf2a3a277 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_calldata_to_storage.sol
@@ -17,6 +17,5 @@ contract C {
         require(s.y[1] == 11);
     }
 }
-
 // ----
 // test((uint8[1],uint8[])): 0x20, 3, 0x40, 2, 7, 11
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol
index c340289adf..3d132641f4 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_memory_to_memory.sol
@@ -10,7 +10,6 @@ contract C {
         return r;
     }
 }
-
 // ----
 // test((uint8[1],uint8[])): 0x20, 3, 0x40, 2, 7, 11 -> 0x20, 0, 0x40, 0
 // test((uint8[1],uint8[])): 0x20, 3, 0x40, 3, 17, 19, 23 -> 0x20, 0, 0x40, 0
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol
index 3f29790d83..880b7433dd 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_with_nested_array_from_storage_to_storage.sol
@@ -22,6 +22,5 @@ contract C {
         require(dst.y[1] == 11);
     }
 }
-
 // ----
 // test()
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
index 29618bb044..66954a7f5c 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
@@ -42,7 +42,6 @@ contract C {
     }
 
 }
-
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121598
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
index ec989b508e..065187cdc3 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
@@ -50,7 +50,6 @@ contract C {
         return m[2];
     }
 }
-
 // ----
 // from_memory() -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 123029
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
index e5c02001fe..5b99efc647 100644
--- a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
@@ -43,7 +43,6 @@ contract C {
         return m[3];
     }
 }
-
 // ----
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121693
diff --git a/test/libsolidity/semanticTests/structs/global.sol b/test/libsolidity/semanticTests/structs/global.sol
index d51194ca0a..052122538e 100644
--- a/test/libsolidity/semanticTests/structs/global.sol
+++ b/test/libsolidity/semanticTests/structs/global.sol
@@ -6,7 +6,5 @@ contract C {
         return (s.a, s.b);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f((uint256,uint256)): 42, 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol b/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol
index fe6de19f46..9434e40454 100644
--- a/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol
+++ b/test/libsolidity/semanticTests/structs/lone_struct_array_type.sol
@@ -9,8 +9,5 @@ contract C {
         return 3;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 3
diff --git a/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol b/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol
index 445961e2da..f844c08fac 100644
--- a/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol
+++ b/test/libsolidity/semanticTests/structs/memory_struct_named_constructor.sol
@@ -11,8 +11,5 @@ contract C {
         return S({x: true, a: 8});
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // s() -> 8, true
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol b/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol
index a76518684b..96b9569920 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_as_function_args.sol
@@ -27,8 +27,5 @@ contract Test {
         s.z = z;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 1, 2, 3
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested.sol
index 3fee9b2105..e541fa9757 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested.sol
@@ -37,8 +37,5 @@ contract Test {
         s.s.z = z;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
index 12b514a23c..3089f97b52 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
@@ -64,8 +64,6 @@ contract Test {
         a2 = m_x.a[1];
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // load() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
 // gas irOptimized: 110326
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol b/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol
index 5cafe53232..fe319d19df 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_read_write.sol
@@ -49,9 +49,6 @@ contract Test {
         a = s.a[1];
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // testInit() -> 0, 0, 0, 0, true
 // testCopyRead() -> 1, 2, 3, 4
diff --git a/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol b/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
index 3336b30b1c..648c962cf9 100644
--- a/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
+++ b/test/libsolidity/semanticTests/structs/multislot_struct_allocation.sol
@@ -15,8 +15,5 @@ contract C {
     return s.a.x(1);
   }
 }
-
-
-
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol b/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol
index 64328b2dee..0037d9573e 100644
--- a/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol
+++ b/test/libsolidity/semanticTests/structs/nested_struct_allocation.sol
@@ -12,7 +12,5 @@ contract C {
     return s.a.b;
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/recursive_structs.sol b/test/libsolidity/semanticTests/structs/recursive_structs.sol
index 58f178e5ec..f8944f11f3 100644
--- a/test/libsolidity/semanticTests/structs/recursive_structs.sol
+++ b/test/libsolidity/semanticTests/structs/recursive_structs.sol
@@ -14,8 +14,5 @@ contract C {
         return 1;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol b/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol
index c05d87b37c..e45626d316 100644
--- a/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol
+++ b/test/libsolidity/semanticTests/structs/simple_struct_allocation.sol
@@ -8,7 +8,5 @@ contract C {
     return s.a;
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol b/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol
index 357863abb4..47b9a9ece2 100644
--- a/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol
+++ b/test/libsolidity/semanticTests/structs/struct_assign_reference_to_struct.sol
@@ -31,8 +31,5 @@ contract test {
         ret_global1 = data1.m_value; // = 3. Changed due to the assignment to x.m_value
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // assign() -> 2, 2, 3, 3
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index 956416a967..6da42ebec7 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -33,7 +33,6 @@ contract c {
         c = data[k].c;
     }
 }
-
 // ----
 // set(uint256): 7 -> true
 // gas irOptimized: 109896
diff --git a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
index 53d1ca93a9..22d9dd29de 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
@@ -15,9 +15,6 @@ contract c {
         return data2.a == data1.a && data2.b == data1.b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> true
 // gas irOptimized: 109713
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_member.sol b/test/libsolidity/semanticTests/structs/struct_delete_member.sol
index c881d8a936..7f991f401b 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_member.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_member.sol
@@ -15,8 +15,5 @@ contract test {
         ret_value = data1.m_value;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // deleteMember() -> 0
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage.sol
index 776ceddc6e..31558cfbe2 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage.sol
@@ -17,7 +17,5 @@ contract C {
         assert(a == 17);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_small.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_small.sol
index 21140e45ee..046e4ec6d6 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_small.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_small.sol
@@ -19,7 +19,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol b/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
index b5c8a2cfa6..ae21f6f865 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_struct_in_mapping.sol
@@ -13,6 +13,5 @@ contract test {
         return campaigns[0].m_value;
     }
 }
-
 // ----
 // deleteIt() -> 0
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol
index 66657fc676..290c812ccd 100644
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage.sol
@@ -21,8 +21,5 @@ contract C {
         return (x.s.a, x.s.b, x.s.c);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 42, 23, 34
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
index 46094d3766..c19875062f 100644
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
+++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
@@ -26,9 +26,6 @@ contract C {
         return x.s.a;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 42, 23, 34, 42, 42
 // gas irOptimized: 110388
diff --git a/test/libsolidity/semanticTests/structs/struct_named_constructor.sol b/test/libsolidity/semanticTests/structs/struct_named_constructor.sol
index 2433da8666..f16f61e321 100644
--- a/test/libsolidity/semanticTests/structs/struct_named_constructor.sol
+++ b/test/libsolidity/semanticTests/structs/struct_named_constructor.sol
@@ -9,8 +9,5 @@ contract C {
         s = S({x: true, a: 1});
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // s() -> 1, true
diff --git a/test/libsolidity/semanticTests/structs/struct_referencing.sol b/test/libsolidity/semanticTests/structs/struct_referencing.sol
index cbe8a72bfc..93fad63bef 100644
--- a/test/libsolidity/semanticTests/structs/struct_referencing.sol
+++ b/test/libsolidity/semanticTests/structs/struct_referencing.sol
@@ -45,8 +45,6 @@ contract C is I {
     function a1() public pure returns (uint) { S memory s; return L.a(s); }
     function a2() public pure returns (uint) { L.S memory s; return L.a(s); }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: L
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol b/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol
index 8b9035d188..26862fd008 100644
--- a/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol
+++ b/test/libsolidity/semanticTests/structs/struct_storage_to_memory.sol
@@ -19,8 +19,5 @@ contract C {
         return (m.s.a, m.s.b, m.s.c);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 42, 23, 34
diff --git a/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol
index c3aa23c3be..5ec25fb363 100644
--- a/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol
+++ b/test/libsolidity/semanticTests/structs/struct_storage_to_memory_function_ptr.sol
@@ -25,8 +25,5 @@ contract C {
         return x.s.a;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 42, 23, 34, 42, 42
diff --git a/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol b/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol
index f97935fb67..7b51b59fcf 100644
--- a/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol
+++ b/test/libsolidity/semanticTests/structs/using_for_function_on_struct.sol
@@ -7,8 +7,6 @@ contract C {
         return x.mul(a);
     }
 }
-// ====
-// compileToEwasm: false
 // ----
 // library: D
 // f(uint256): 7 -> 0x15
diff --git a/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol b/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol
index 04724f4c79..8350628e47 100644
--- a/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol
+++ b/test/libsolidity/semanticTests/types/assign_calldata_value_type.sol
@@ -5,7 +5,5 @@ contract C {
         return (x, b);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 23 -> 42, 23
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol
index 09558a697b..fdfafa9e2a 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_greater_size.sol
@@ -3,7 +3,5 @@ contract Test {
         return bytes4(input);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // bytesToBytes(bytes2): "ab" -> "ab"
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol
index 5417800271..5c9a6cdc5a 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_same_size.sol
@@ -3,7 +3,5 @@ contract Test {
         return bytes4(input);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // bytesToBytes(bytes4): "abcd" -> "abcd"
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol
index 5868492940..2052c9da92 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_fixed_bytes_smaller_size.sol
@@ -3,7 +3,5 @@ contract Test {
         return bytes2(input);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // bytesToBytes(bytes4): "abcd" -> "ab"
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol
index 93906e6e0e..b0ab07f549 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_greater_size.sol
@@ -3,7 +3,5 @@ contract Test {
         return uint64(uint32(s));
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // bytesToUint(bytes4): "abcd" -> 0x61626364
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol
index 52a99511d1..ff1dfebfd6 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_min_size.sol
@@ -3,7 +3,5 @@ contract Test {
         return uint8(s);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // bytesToUint(bytes1): "a" -> 0x61
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol
index e13f99cd60..390bf4b01d 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_same_type.sol
@@ -3,7 +3,5 @@ contract Test {
         return uint(s);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // bytesToUint(bytes32): "abc2" -> left(0x61626332)
diff --git a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol
index aae1576e5a..eb450993e4 100644
--- a/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_fixed_bytes_to_uint_smaller_size.sol
@@ -3,7 +3,5 @@ contract Test {
         return uint16(uint32(s));
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // bytesToUint(bytes4): "abcd" -> 0x6364
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol
index cf170a2aaf..9949b477b2 100644
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_greater_size.sol
@@ -3,7 +3,5 @@ contract Test {
         return bytes8(uint64(h));
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // UintToBytes(uint16): 0x6162 -> "\x00\x00\x00\x00\x00\x00ab"
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol
index 18a09dfe54..60b9a4cf01 100644
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_min_size.sol
@@ -3,7 +3,5 @@ contract Test {
         return bytes1(h);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // UintToBytes(uint8): 0x61 -> "a"
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol
index 10c3a351de..5662d909e6 100644
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_same_size.sol
@@ -3,7 +3,5 @@ contract Test {
         return bytes32(h);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // uintToBytes(uint256): left(0x616263) -> left(0x616263)
diff --git a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol
index 8abc70d3d3..963cbc3427 100644
--- a/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol
+++ b/test/libsolidity/semanticTests/types/convert_uint_to_fixed_bytes_smaller_size.sol
@@ -3,7 +3,5 @@ contract Test {
         return bytes2(uint16(h));
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // uintToBytes(uint32): 0x61626364 -> "cd"
diff --git a/test/libsolidity/semanticTests/types/external_function_to_address.sol b/test/libsolidity/semanticTests/types/external_function_to_address.sol
index d2f5523b17..fb938d37aa 100644
--- a/test/libsolidity/semanticTests/types/external_function_to_address.sol
+++ b/test/libsolidity/semanticTests/types/external_function_to_address.sol
@@ -6,8 +6,6 @@ contract C {
         return cb.address;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
 // g(function): hex"00000000000000000000000000000000000004226121ff00000000000000000" -> 0x42
diff --git a/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol b/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
index daf5d000c8..b17ba6d916 100644
--- a/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
+++ b/test/libsolidity/semanticTests/types/mapping/copy_from_mapping_to_mapping.sol
@@ -27,7 +27,6 @@ contract C {
         return dst[0];
     }
 }
-
 // ----
 // f() -> 0x20, 7, 8, 9, 0xa0, 13, 2, 0x40, 0xa0, 2, 3, 4, 2, 3, 4
 // gas irOptimized: 197082
diff --git a/test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol b/test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol
index 26a33682d5..43f2a80fc7 100644
--- a/test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol
+++ b/test/libsolidity/semanticTests/types/mapping/copy_struct_to_array_stored_in_mapping.sol
@@ -47,7 +47,6 @@ contract C {
         return m2[0];
     }
 }
-
 // ----
 // from_storage_to_static_array() -> 0, 7
 // from_storage_to_dynamic_array() -> 0x20, 1, 7
diff --git a/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol b/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
index ef092f3ea6..a8a8fca44c 100644
--- a/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
+++ b/test/libsolidity/semanticTests/types/mapping/user_defined_types_mapping_storage.sol
@@ -19,7 +19,6 @@ contract C {
 		return uintMap[3] == 4;
 	}
 }
-
 // ----
 // library: L
 // testAB() -> true
diff --git a/test/libsolidity/semanticTests/types/nested_tuples.sol b/test/libsolidity/semanticTests/types/nested_tuples.sol
index c3e96240a5..32203a9cbe 100644
--- a/test/libsolidity/semanticTests/types/nested_tuples.sol
+++ b/test/libsolidity/semanticTests/types/nested_tuples.sol
@@ -26,8 +26,6 @@ contract test {
         return a;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f0() -> 2, true
 // f1() -> 1
diff --git a/test/libsolidity/semanticTests/types/packing_signed_types.sol b/test/libsolidity/semanticTests/types/packing_signed_types.sol
index 392a52f2cf..2d2e0e16e6 100644
--- a/test/libsolidity/semanticTests/types/packing_signed_types.sol
+++ b/test/libsolidity/semanticTests/types/packing_signed_types.sol
@@ -4,7 +4,5 @@ contract test {
         return int8(x);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // run() -> 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffa
diff --git a/test/libsolidity/semanticTests/types/packing_unpacking_types.sol b/test/libsolidity/semanticTests/types/packing_unpacking_types.sol
index 7d12c47a44..8b500cca13 100644
--- a/test/libsolidity/semanticTests/types/packing_unpacking_types.sol
+++ b/test/libsolidity/semanticTests/types/packing_unpacking_types.sol
@@ -5,8 +5,6 @@ contract test {
         y = y * 0x10000000000000000 | ~c;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // run(bool,uint32,uint64): true, 0x0f0f0f0f, 0xf0f0f0f0f0f0f0f0
 // -> 0x0000000000000000000000000000000000000001f0f0f0f00f0f0f0f0f0f0f0f
diff --git a/test/libsolidity/semanticTests/types/strings.sol b/test/libsolidity/semanticTests/types/strings.sol
index 9242eca2e0..f76116bba3 100644
--- a/test/libsolidity/semanticTests/types/strings.sol
+++ b/test/libsolidity/semanticTests/types/strings.sol
@@ -10,9 +10,6 @@ contract test {
         large = small;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // fixedBytesHex() -> "\xaa\xbb\x00\xff"
 // fixedBytes() -> "abc\x00\xff__"
diff --git a/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol b/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol
index 5ac35853bf..6574dcb597 100644
--- a/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol
+++ b/test/libsolidity/semanticTests/types/tuple_assign_multi_slot_grow.sol
@@ -7,7 +7,5 @@ contract C {
 	}
 
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x30, 0x31, 0x32
diff --git a/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol b/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol
index 320290c9f3..d3d2b01bbc 100644
--- a/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol
+++ b/test/libsolidity/semanticTests/types/type_conversion_cleanup.sol
@@ -1,7 +1,5 @@
 contract Test {
     function test() public returns (uint ret) { return uint(uint160(address(uint160(uint128(type(uint200).max))))); }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 0xffffffffffffffffffffffffffffffff
diff --git a/test/libsolidity/semanticTests/underscore/as_function.sol b/test/libsolidity/semanticTests/underscore/as_function.sol
index 8f9fe0b597..be60a01bc3 100644
--- a/test/libsolidity/semanticTests/underscore/as_function.sol
+++ b/test/libsolidity/semanticTests/underscore/as_function.sol
@@ -12,8 +12,6 @@ contract C {
         return 33;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // _() -> 88
 // g() -> 88
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol
index e2551a2a8f..e4e6453c5e 100644
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol
+++ b/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidInConstructor.sol
@@ -19,7 +19,5 @@ contract Test {
     new C();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol
index 209ad8bb24..fbaca1a67a 100644
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol
+++ b/test/libsolidity/semanticTests/uninitializedFunctionPointer/invalidStoredInConstructor.sol
@@ -19,7 +19,5 @@ contract Test {
     new C();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
index 0f446f775b..1c1e596abd 100644
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
+++ b/test/libsolidity/semanticTests/uninitializedFunctionPointer/store2.sol
@@ -35,7 +35,5 @@ contract InvalidTest {
       x++;
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // run() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol
index e534e42313..08a96792c2 100644
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol
+++ b/test/libsolidity/semanticTests/uninitializedFunctionPointer/storeInConstructor.sol
@@ -14,8 +14,6 @@ contract InvalidTest {
     storedFn();
   }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x51
 // f() -> FAILURE, hex"4e487b71", 0x51
diff --git a/test/libsolidity/semanticTests/uninitializedFunctionPointer/uninitialized_internal_storage_function_via_yul.sol b/test/libsolidity/semanticTests/uninitializedFunctionPointer/uninitialized_internal_storage_function_via_yul.sol
index 1c69ffef23..bf8eab8ced 100644
--- a/test/libsolidity/semanticTests/uninitializedFunctionPointer/uninitialized_internal_storage_function_via_yul.sol
+++ b/test/libsolidity/semanticTests/uninitializedFunctionPointer/uninitialized_internal_storage_function_via_yul.sol
@@ -13,6 +13,5 @@ contract Test {
 }
 // ====
 // compileViaYul: true
-// compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol b/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
index cc5304ed75..cc165e879e 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/cleanup.sol
@@ -33,7 +33,6 @@ contract C {
         return (a, b, c);
     }
 }
-
 // ----
 // ret() -> 0xff
 // f(uint8): 0x1ff -> FAILURE
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/cleanup_abicoderv1.sol b/test/libsolidity/semanticTests/userDefinedValueType/cleanup_abicoderv1.sol
index f5de5e5010..727c660633 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/cleanup_abicoderv1.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/cleanup_abicoderv1.sol
@@ -33,7 +33,6 @@ contract C {
         return (a, b, c);
     }
 }
-
 // ====
 // compileViaYul: false
 // ----
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol b/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
index bcdc9440e9..24b316f9cf 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/conversion.sol
@@ -27,7 +27,6 @@ contract C {
         return MyUInt8.wrap(uint8(MyUInt16.unwrap(a)));
     }
 }
-
 // ----
 // f(uint256): 1 -> 1
 // f(uint256): 2 -> 2
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/conversion_abicoderv1.sol b/test/libsolidity/semanticTests/userDefinedValueType/conversion_abicoderv1.sol
index af91aab0c4..e8fbfb2460 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/conversion_abicoderv1.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/conversion_abicoderv1.sol
@@ -27,7 +27,6 @@ contract C {
         return MyUInt8.wrap(uint8(MyUInt16.unwrap(a)));
     }
 }
-
 // ====
 // compileViaYul: false
 // ----
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
index ee63c185d3..8c51b2921b 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/storage_layout_struct.sol
@@ -150,7 +150,6 @@ contract C {
        }
    }
 }
-
 // ----
 // storage_a() -> 0, 0
 // set_a(int64,int64): 100, 200 ->
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
index 1c3b66b28d..2c5a15bb93 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_elementary.sol
@@ -15,7 +15,6 @@ contract C {
         return a + b;
     }
 }
-
 // ----
 // getX() -> 0
 // gas irOptimized: 23379
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
index 55e38689fc..2f275c543b 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/zero_cost_abstraction_comparison_userdefined.sol
@@ -16,7 +16,6 @@ contract C {
         return MyInt.wrap(MyInt.unwrap(a) + MyInt.unwrap(b));
     }
 }
-
 // ----
 // getX() -> 0
 // gas irOptimized: 23379
diff --git a/test/libsolidity/semanticTests/using/free_function_multi.sol b/test/libsolidity/semanticTests/using/free_function_multi.sol
index feec1beb39..31ac50bc3a 100644
--- a/test/libsolidity/semanticTests/using/free_function_multi.sol
+++ b/test/libsolidity/semanticTests/using/free_function_multi.sol
@@ -17,7 +17,6 @@ function id(uint x) pure returns (uint) {
 function zero(uint) pure returns (uint) {
     return 0;
 }
-
 // ----
 // f(uint256): 10 -> 10
 // g(uint256): 10 -> 0
diff --git a/test/libsolidity/semanticTests/using/free_functions_individual.sol b/test/libsolidity/semanticTests/using/free_functions_individual.sol
index 170eae4d0f..5a14cd7cb2 100644
--- a/test/libsolidity/semanticTests/using/free_functions_individual.sol
+++ b/test/libsolidity/semanticTests/using/free_functions_individual.sol
@@ -19,8 +19,6 @@ function id(uint x) pure returns (uint) {
 function zero(uint) pure returns (uint) {
     return 0;
 }
-
-
 // ----
 // f(uint256): 10 -> 10
 // g(uint256): 10 -> 0
diff --git a/test/libsolidity/semanticTests/using/using_global_for_global.sol b/test/libsolidity/semanticTests/using/using_global_for_global.sol
index 77bbb896fa..67a31c3415 100644
--- a/test/libsolidity/semanticTests/using/using_global_for_global.sol
+++ b/test/libsolidity/semanticTests/using/using_global_for_global.sol
@@ -13,6 +13,5 @@ contract C {
         return r.f().g();
     }
 }
-
 // ----
 // f(uint256): 100 -> 111
\ No newline at end of file
diff --git a/test/libsolidity/semanticTests/variables/delete_local.sol b/test/libsolidity/semanticTests/variables/delete_local.sol
index 21f4c8edfc..1d00bace1f 100644
--- a/test/libsolidity/semanticTests/variables/delete_local.sol
+++ b/test/libsolidity/semanticTests/variables/delete_local.sol
@@ -5,7 +5,5 @@ contract test {
         res = v;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // delLocal() -> 0
diff --git a/test/libsolidity/semanticTests/variables/delete_locals.sol b/test/libsolidity/semanticTests/variables/delete_locals.sol
index 8c14639d36..e442b8e853 100644
--- a/test/libsolidity/semanticTests/variables/delete_locals.sol
+++ b/test/libsolidity/semanticTests/variables/delete_locals.sol
@@ -8,7 +8,5 @@ contract test {
         res2 = x;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // delLocal() -> 6, 7
diff --git a/test/libsolidity/semanticTests/variables/public_state_overridding.sol b/test/libsolidity/semanticTests/variables/public_state_overridding.sol
index 752c429cac..78e0fb4478 100644
--- a/test/libsolidity/semanticTests/variables/public_state_overridding.sol
+++ b/test/libsolidity/semanticTests/variables/public_state_overridding.sol
@@ -11,8 +11,6 @@ contract X is A
 
 	function set() public { test = 2; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 0
 // set() ->
diff --git a/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol b/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol
index 2195c85e10..15226b5e09 100644
--- a/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol
+++ b/test/libsolidity/semanticTests/variables/public_state_overridding_dynamic_struct.sol
@@ -16,10 +16,6 @@ contract X is A
 
 	function set() public { test.v = 2; test.s = "statevar"; }
 }
-
-
-// ====
-// compileToEwasm: also
 // ----
 // test() -> 0, 64, 0
 // set() ->
diff --git a/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol b/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
index 5a3df6d214..62aa616e89 100644
--- a/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
+++ b/test/libsolidity/semanticTests/variables/public_state_overridding_mapping_to_dynamic_struct.sol
@@ -16,8 +16,6 @@ contract X is A
 
 	function set() public { test[42].v = 2; test[42].s = "statevar"; }
 }
-
-
 // ----
 // test(uint256): 0 -> 0, 64, 0
 // test(uint256): 42 -> 0, 64, 0
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index b944100b96..2712503a45 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -12,8 +12,6 @@ contract C {
     function g() public view returns (uint) { return address(0).code.length; }
     function h() public view returns (uint) { return address(1).code.length; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // constructor() ->
 // gas irOptimized: 175145
diff --git a/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol b/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol
index 0aa7ceb954..110240ce93 100644
--- a/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol
+++ b/test/libsolidity/semanticTests/various/assignment_to_const_var_involving_expression.sol
@@ -5,8 +5,5 @@ contract C {
         return x + 1;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x57a
diff --git a/test/libsolidity/semanticTests/various/balance.sol b/test/libsolidity/semanticTests/various/balance.sol
index 916c7fbff6..8638f409c0 100644
--- a/test/libsolidity/semanticTests/various/balance.sol
+++ b/test/libsolidity/semanticTests/various/balance.sol
@@ -5,9 +5,6 @@ contract test {
         return address(this).balance;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // constructor(), 23 wei ->
 // getBalance() -> 23
diff --git a/test/libsolidity/semanticTests/various/byte_optimization_bug.sol b/test/libsolidity/semanticTests/various/byte_optimization_bug.sol
index f023e971f4..b850ea327e 100644
--- a/test/libsolidity/semanticTests/various/byte_optimization_bug.sol
+++ b/test/libsolidity/semanticTests/various/byte_optimization_bug.sol
@@ -11,9 +11,6 @@ contract C {
         }
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 2 -> 0
 // g(uint256): 2 -> 2
diff --git a/test/libsolidity/semanticTests/various/code_access_create.sol b/test/libsolidity/semanticTests/various/code_access_create.sol
index 839608aaf5..075682129c 100644
--- a/test/libsolidity/semanticTests/various/code_access_create.sol
+++ b/test/libsolidity/semanticTests/various/code_access_create.sol
@@ -21,7 +21,6 @@ contract C {
         return d.f();
     }
 }
-
 // ----
 // test() -> 7
 // gas legacy: 100849
diff --git a/test/libsolidity/semanticTests/various/code_access_runtime.sol b/test/libsolidity/semanticTests/various/code_access_runtime.sol
index d22d3e43cb..9a9e7a80bf 100644
--- a/test/libsolidity/semanticTests/various/code_access_runtime.sol
+++ b/test/libsolidity/semanticTests/various/code_access_runtime.sol
@@ -19,7 +19,6 @@ contract C {
         return 42;
     }
 }
-
 // ====
 // EVMVersion: >=constantinople
 // ----
diff --git a/test/libsolidity/semanticTests/various/code_length.sol b/test/libsolidity/semanticTests/various/code_length.sol
index 84fd393bd7..97a7637976 100644
--- a/test/libsolidity/semanticTests/various/code_length.sol
+++ b/test/libsolidity/semanticTests/various/code_length.sol
@@ -57,8 +57,6 @@ contract C {
 
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // constructor()
 // gas legacy: 124168
diff --git a/test/libsolidity/semanticTests/various/code_length_contract_member.sol b/test/libsolidity/semanticTests/various/code_length_contract_member.sol
index 8486671ed8..ff883139a4 100644
--- a/test/libsolidity/semanticTests/various/code_length_contract_member.sol
+++ b/test/libsolidity/semanticTests/various/code_length_contract_member.sol
@@ -11,7 +11,5 @@ contract C {
         return (s.code.length, s.another.length, address(this).code.length > 50);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 0x20, true
diff --git a/test/libsolidity/semanticTests/various/codebalance_assembly.sol b/test/libsolidity/semanticTests/various/codebalance_assembly.sol
index be2b89f29e..fad0d3e5b4 100644
--- a/test/libsolidity/semanticTests/various/codebalance_assembly.sol
+++ b/test/libsolidity/semanticTests/various/codebalance_assembly.sol
@@ -17,7 +17,6 @@ contract C {
         }
     }
 }
-
 // ====
 // EVMVersion: >=constantinople
 // ----
diff --git a/test/libsolidity/semanticTests/various/codehash.sol b/test/libsolidity/semanticTests/various/codehash.sol
index f787ca5be8..fa7dab9dab 100644
--- a/test/libsolidity/semanticTests/various/codehash.sol
+++ b/test/libsolidity/semanticTests/various/codehash.sol
@@ -11,7 +11,6 @@ contract C {
         return address(this).codehash != 0;
     }
 }
-
 // ====
 // EVMVersion: >=constantinople
 // ----
diff --git a/test/libsolidity/semanticTests/various/codehash_assembly.sol b/test/libsolidity/semanticTests/various/codehash_assembly.sol
index 71e3a20ef5..fe2210fa10 100644
--- a/test/libsolidity/semanticTests/various/codehash_assembly.sol
+++ b/test/libsolidity/semanticTests/various/codehash_assembly.sol
@@ -15,7 +15,6 @@ contract C {
         }
     }
 }
-
 // ====
 // EVMVersion: >=constantinople
 // ----
diff --git a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
index 561e316880..0ebf772fba 100644
--- a/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
+++ b/test/libsolidity/semanticTests/various/contract_binary_dependencies.sol
@@ -15,9 +15,6 @@ contract C {
         new B();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // constructor() ->
 // gas irOptimized: 100415
diff --git a/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol b/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol
index 135543898f..bc16bacbb6 100644
--- a/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol
+++ b/test/libsolidity/semanticTests/various/crazy_elementary_typenames_on_stack.sol
@@ -8,8 +8,5 @@ contract C {
         return uint256(x);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> -7
diff --git a/test/libsolidity/semanticTests/various/cross_contract_types.sol b/test/libsolidity/semanticTests/various/cross_contract_types.sol
index b0cf070a7b..9c7728a02c 100644
--- a/test/libsolidity/semanticTests/various/cross_contract_types.sol
+++ b/test/libsolidity/semanticTests/various/cross_contract_types.sol
@@ -12,8 +12,5 @@ contract Test {
         r = x.b;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 3
diff --git a/test/libsolidity/semanticTests/various/decayed_tuple.sol b/test/libsolidity/semanticTests/various/decayed_tuple.sol
index f143b98471..799da34817 100644
--- a/test/libsolidity/semanticTests/various/decayed_tuple.sol
+++ b/test/libsolidity/semanticTests/various/decayed_tuple.sol
@@ -5,7 +5,5 @@ contract C {
         return x;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index e2c8c52638..1534891dc1 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -31,7 +31,6 @@ contract C {
         if (x != 456 || memBytes.length != s.length || y[2] != 789) return 11;
     }
 }
-
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
 // gas irOptimized: 241853
diff --git a/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol b/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol
index 906df85cc8..71eb0077c9 100644
--- a/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol
+++ b/test/libsolidity/semanticTests/various/empty_name_return_parameter.sol
@@ -3,8 +3,5 @@ contract test {
         return k;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 9 -> 9
diff --git a/test/libsolidity/semanticTests/various/external_types_in_calls.sol b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
index 6b28f542c7..e8742c2346 100644
--- a/test/libsolidity/semanticTests/various/external_types_in_calls.sol
+++ b/test/libsolidity/semanticTests/various/external_types_in_calls.sol
@@ -22,7 +22,6 @@ contract C {
         return C1(address(9));
     }
 }
-
 // ----
 // test() -> 9, 7
 // gas legacy: 127514
diff --git a/test/libsolidity/semanticTests/various/flipping_sign_tests.sol b/test/libsolidity/semanticTests/various/flipping_sign_tests.sol
index f2f63575a1..174fb993f7 100644
--- a/test/libsolidity/semanticTests/various/flipping_sign_tests.sol
+++ b/test/libsolidity/semanticTests/various/flipping_sign_tests.sol
@@ -5,8 +5,5 @@ contract test {
         return true;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/various/gasleft_decrease.sol b/test/libsolidity/semanticTests/various/gasleft_decrease.sol
index 22566bfb18..ab7302743f 100644
--- a/test/libsolidity/semanticTests/various/gasleft_decrease.sol
+++ b/test/libsolidity/semanticTests/various/gasleft_decrease.sol
@@ -14,9 +14,6 @@ contract C {
         return true;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
 // g() -> true
diff --git a/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol b/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol
index 3fe3ba10d3..280bc49609 100644
--- a/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol
+++ b/test/libsolidity/semanticTests/various/gasleft_shadow_resolution.sol
@@ -7,8 +7,5 @@ contract C {
         return gasleft();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/various/inline_member_init.sol b/test/libsolidity/semanticTests/various/inline_member_init.sol
index 7d3b754928..5c48b5d72e 100644
--- a/test/libsolidity/semanticTests/various/inline_member_init.sol
+++ b/test/libsolidity/semanticTests/various/inline_member_init.sol
@@ -14,7 +14,5 @@ contract test {
         c = m_c;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // get() -> 5, 6, 8
diff --git a/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol b/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol
index 825bd6d2f9..b440b35a83 100644
--- a/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol
+++ b/test/libsolidity/semanticTests/various/inline_member_init_inheritence.sol
@@ -18,8 +18,6 @@ contract Derived is Base {
         return m_derived;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // getBMember() -> 5
 // getDMember() -> 6
diff --git a/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol b/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol
index f8c396dd16..e85a38dd6b 100644
--- a/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol
+++ b/test/libsolidity/semanticTests/various/inline_tuple_with_rational_numbers.sol
@@ -4,8 +4,5 @@ contract c {
         return foo3[0];
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1
diff --git a/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol b/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol
index 5744272cee..d797ab9cd4 100644
--- a/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol
+++ b/test/libsolidity/semanticTests/various/iszero_bnot_correct.sol
@@ -14,8 +14,5 @@ contract C {
         return true;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/various/literal_empty_string.sol b/test/libsolidity/semanticTests/various/literal_empty_string.sol
index bf4da54099..44154fa55b 100644
--- a/test/libsolidity/semanticTests/various/literal_empty_string.sol
+++ b/test/libsolidity/semanticTests/various/literal_empty_string.sol
@@ -11,7 +11,6 @@ contract C {
         this.f("", 2);
     }
 }
-
 // ----
 // x() -> 0
 // a() -> 0
diff --git a/test/libsolidity/semanticTests/various/memory_overwrite.sol b/test/libsolidity/semanticTests/various/memory_overwrite.sol
index 930b06f4a0..3ab16a3e88 100644
--- a/test/libsolidity/semanticTests/various/memory_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/memory_overwrite.sol
@@ -5,8 +5,5 @@ contract C {
         x[0] = 0x62;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x20, 5, "b23a5"
diff --git a/test/libsolidity/semanticTests/various/multi_modifiers.sol b/test/libsolidity/semanticTests/various/multi_modifiers.sol
index b6d8dd84c9..07f6c038d3 100644
--- a/test/libsolidity/semanticTests/various/multi_modifiers.sol
+++ b/test/libsolidity/semanticTests/various/multi_modifiers.sol
@@ -16,8 +16,6 @@ contract C {
         x += 3;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f1() ->
 // x() -> 0x08
diff --git a/test/libsolidity/semanticTests/various/multi_variable_declaration.sol b/test/libsolidity/semanticTests/various/multi_variable_declaration.sol
index e054329c91..de4ecdbe46 100644
--- a/test/libsolidity/semanticTests/various/multi_variable_declaration.sol
+++ b/test/libsolidity/semanticTests/various/multi_variable_declaration.sol
@@ -42,7 +42,5 @@ contract C {
         return f1() && f2();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/various/nested_calldata_struct.sol b/test/libsolidity/semanticTests/various/nested_calldata_struct.sol
index 8ba68599e9..b11241322c 100644
--- a/test/libsolidity/semanticTests/various/nested_calldata_struct.sol
+++ b/test/libsolidity/semanticTests/various/nested_calldata_struct.sol
@@ -21,8 +21,5 @@ contract C {
         return (s.a, s.b, s.s.a, s.s.b, s.c);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f((uint256,uint256,(uint256,uint256),uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol b/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
index 595f88f545..25cd645e45 100644
--- a/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
+++ b/test/libsolidity/semanticTests/various/nested_calldata_struct_to_memory.sol
@@ -22,6 +22,5 @@ contract C {
         return (m.a, m.b, m.s.a, m.s.b, m.c);
     }
 }
-
 // ----
 // f((uint256,uint256,(uint256,uint256),uint256)): 1, 2, 3, 4, 5 -> 1, 2, 3, 4, 5
diff --git a/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol b/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol
index 4c23564995..4c0d711458 100644
--- a/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol
+++ b/test/libsolidity/semanticTests/various/positive_integers_to_signed.sol
@@ -3,8 +3,6 @@ contract test {
     int8 public y = 127;
     int16 public q = 250;
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 2
 // y() -> 127
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 9f391e2a17..6a8da27784 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -14,7 +14,6 @@ contract D {
         return c.f();
     }
 }
-
 // ----
 // constructor(), 27 wei ->
 // gas irOptimized: 169377
diff --git a/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol b/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol
index c1dab1895d..69c4c4121d 100644
--- a/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol
+++ b/test/libsolidity/semanticTests/various/single_copy_with_multiple_inheritance.sol
@@ -26,9 +26,6 @@ contract B is Base {
 
 
 contract Derived is Base, B, A {}
-
-// ====
-// compileToEwasm: also
 // ----
 // getViaB() -> 0
 // setViaA(uint256): 23 ->
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index ec94f73a1f..efff7a9507 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -17,7 +17,6 @@ contract C {
         return (x, y);
     }
 }
-
 // ----
 // g() -> 2, 6
 // gas irOptimized: 178542
diff --git a/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol b/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol
index d3203160a6..f7add5fba1 100644
--- a/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol
+++ b/test/libsolidity/semanticTests/various/state_variable_local_variable_mixture.sol
@@ -6,7 +6,5 @@ contract A {
         x = A.y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // a() -> 2
diff --git a/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol b/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol
index e71d802fbf..1167da57e0 100644
--- a/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol
+++ b/test/libsolidity/semanticTests/various/state_variable_under_contract_name.sol
@@ -5,7 +5,5 @@ contract Scope {
         stateVar = Scope.stateVar;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // getStateVar() -> 42
diff --git a/test/libsolidity/semanticTests/various/string_tuples.sol b/test/libsolidity/semanticTests/various/string_tuples.sol
index 935c0b3c20..57028ae39a 100644
--- a/test/libsolidity/semanticTests/various/string_tuples.sol
+++ b/test/libsolidity/semanticTests/various/string_tuples.sol
@@ -11,8 +11,6 @@ contract C {
         return ("abc");
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x40, 0x8, 0x3, "abc"
 // g() -> 0x40, 0x80, 0x3, "abc", 0x3, "def"
diff --git a/test/libsolidity/semanticTests/various/super.sol b/test/libsolidity/semanticTests/various/super.sol
index 9035f0ca2a..cd1b4a71af 100644
--- a/test/libsolidity/semanticTests/various/super.sol
+++ b/test/libsolidity/semanticTests/various/super.sol
@@ -24,8 +24,5 @@ contract D is B, C {
         return super.f() | 8;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 15
diff --git a/test/libsolidity/semanticTests/various/super_alone.sol b/test/libsolidity/semanticTests/various/super_alone.sol
index 069df9a91c..223e31762c 100644
--- a/test/libsolidity/semanticTests/various/super_alone.sol
+++ b/test/libsolidity/semanticTests/various/super_alone.sol
@@ -3,8 +3,5 @@ contract A {
         super;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() ->
diff --git a/test/libsolidity/semanticTests/various/super_parentheses.sol b/test/libsolidity/semanticTests/various/super_parentheses.sol
index 3c687d9c19..fd7944764d 100644
--- a/test/libsolidity/semanticTests/various/super_parentheses.sol
+++ b/test/libsolidity/semanticTests/various/super_parentheses.sol
@@ -24,8 +24,5 @@ contract D is B, C {
         return ((super).f)() | 8;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 15
diff --git a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
index a21065bf72..482847b67f 100644
--- a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
@@ -22,9 +22,6 @@ contract c {
         (x, y) = (y, x);
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 0, 0
 // y() -> 0, 0
diff --git a/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol b/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol
index 76c6828cd2..b9503e44c6 100644
--- a/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol
+++ b/test/libsolidity/semanticTests/various/test_underscore_in_hex.sol
@@ -5,8 +5,6 @@ contract test {
         return cond ? x : y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> 0x1234ab
 // f(bool): false -> 0x1234abcd1234
diff --git a/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol b/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol
index 018ee96698..c9f12fdaef 100644
--- a/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol
+++ b/test/libsolidity/semanticTests/various/typed_multi_variable_declaration.sol
@@ -21,8 +21,5 @@ contract C {
         return true;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index a799b7d9bf..80f8bb55cc 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -17,7 +17,6 @@ contract test {
         return h.getBalance{value: amount + 3, gas: 1000}();
     }
 }
-
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 174351
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 8718bd4224..4a44327584 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -16,7 +16,6 @@ contract test {
         return h.getBalance{value: amount + 3, gas: 1000}();
     }
 }
-
 // ----
 // constructor(), 20 wei ->
 // gas irOptimized: 175215
diff --git a/test/libsolidity/semanticTests/various/write_storage_external.sol b/test/libsolidity/semanticTests/various/write_storage_external.sol
index 0bbe522484..a8959b24ea 100644
--- a/test/libsolidity/semanticTests/various/write_storage_external.sol
+++ b/test/libsolidity/semanticTests/various/write_storage_external.sol
@@ -33,7 +33,6 @@ contract D {
         return c.x();
     }
 }
-
 // ----
 // f() -> 3
 // g() -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/assert.sol b/test/libsolidity/semanticTests/viaYul/assert.sol
index aa8de1c277..bd1cabc48b 100644
--- a/test/libsolidity/semanticTests/viaYul/assert.sol
+++ b/test/libsolidity/semanticTests/viaYul/assert.sol
@@ -13,8 +13,6 @@ contract C {
         assert(true);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> true
 // f(bool): false -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/viaYul/assert_and_require.sol b/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
index 290ef35b31..a403b5d64a 100644
--- a/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
+++ b/test/libsolidity/semanticTests/viaYul/assert_and_require.sol
@@ -10,8 +10,6 @@ contract C {
         require(b);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> true
 // f(bool): false -> FAILURE, hex"4e487b71", 0x01
diff --git a/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol b/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol
index c36cc26dc0..5da58b3164 100644
--- a/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol
+++ b/test/libsolidity/semanticTests/viaYul/assign_tuple_from_function_call.sol
@@ -9,8 +9,6 @@ contract C {
         (,,a) = f();
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 3, 2, 1
 // h() -> 3
diff --git a/test/libsolidity/semanticTests/viaYul/cleanup/checked_arithmetic.sol b/test/libsolidity/semanticTests/viaYul/cleanup/checked_arithmetic.sol
index a81ab4577a..19b7cb8464 100644
--- a/test/libsolidity/semanticTests/viaYul/cleanup/checked_arithmetic.sol
+++ b/test/libsolidity/semanticTests/viaYul/cleanup/checked_arithmetic.sol
@@ -51,7 +51,6 @@ contract C {
 	}
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // add() -> 1, 1
diff --git a/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol b/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol
index ab3d92a18b..035c269061 100644
--- a/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol
+++ b/test/libsolidity/semanticTests/viaYul/cleanup/comparison.sol
@@ -30,8 +30,6 @@ contract C {
 		return (x < y);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // eq() -> true
 // neq() -> false
diff --git a/test/libsolidity/semanticTests/viaYul/comparison.sol b/test/libsolidity/semanticTests/viaYul/comparison.sol
index 0b0763b6ea..1ac2aec175 100644
--- a/test/libsolidity/semanticTests/viaYul/comparison.sol
+++ b/test/libsolidity/semanticTests/viaYul/comparison.sol
@@ -36,8 +36,6 @@ contract C {
         return a != b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(address): 0x1234 -> false
 // f(address): 0x00 -> true
diff --git a/test/libsolidity/semanticTests/viaYul/comparison_functions.sol b/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
index 89d90e577b..a004299b3b 100644
--- a/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
+++ b/test/libsolidity/semanticTests/viaYul/comparison_functions.sol
@@ -24,8 +24,6 @@ contract C {
 		inv  = internal1 != invalid;
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // equal() -> true, false, false
 // unequal() -> false, true, true
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol
index 9e1e8c7787..828398f57b 100644
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol
+++ b/test/libsolidity/semanticTests/viaYul/conditional/conditional_multiple.sol
@@ -4,7 +4,5 @@ contract A {
 		return x;
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol
index 3eda8bfc76..c2bbb08d52 100644
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol
+++ b/test/libsolidity/semanticTests/viaYul/conditional/conditional_true_false_literal.sol
@@ -5,7 +5,5 @@ contract A {
 		return x + y;
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol
index a0b206a128..51030f9a3a 100644
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol
+++ b/test/libsolidity/semanticTests/viaYul/conditional/conditional_tuple.sol
@@ -4,8 +4,6 @@ contract A {
 		return (a, b);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> 1, 2
 // f(bool): false -> 3, 4
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol
index a132e88730..80d4dde60d 100644
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_assignment.sol
@@ -7,7 +7,5 @@ contract A {
 		return (x, y1, y2, z);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 6, 1, 5, 5
diff --git a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol b/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol
index c5bf8e0185..4de296630d 100644
--- a/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol
+++ b/test/libsolidity/semanticTests/viaYul/conditional/conditional_with_variables.sol
@@ -7,7 +7,5 @@ contract A {
 		return (x, y, z, w);
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 3, 1, 3, 1
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
index 5d0d50dadd..cc5a156e20 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_assignment.sol
@@ -4,7 +4,5 @@ contract C {
         x = y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
index 34cc69ffeb..0ab4b34a74 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_function_call.sol
@@ -6,7 +6,5 @@ contract C {
         x = f(bytes4(uint32(0x12345678)));
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 0x1234567800000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
index fe07146e18..425c6eaedd 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/explicit_cast_local_assignment.sol
@@ -4,7 +4,5 @@ contract C {
         x = b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 0x12345678 -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
index 05d265343c..e22466010c 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_assignment.sol
@@ -8,7 +8,5 @@ contract C {
         x = y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
index a2c2d92077..e62d45b357 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_function_call.sol
@@ -11,7 +11,5 @@ contract C {
         x = f(a);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
index e582ff394e..3793b4e0cf 100644
--- a/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/conversion/implicit_cast_local_assignment.sol
@@ -7,7 +7,5 @@ contract C {
         y = z;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0x78
diff --git a/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol b/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol
index 24c72943ff..3e1559bcfa 100644
--- a/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol
+++ b/test/libsolidity/semanticTests/viaYul/define_tuple_from_function_call.sol
@@ -11,8 +11,6 @@ contract C {
         return a;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 3, 2, 1
 // h() -> 3
diff --git a/test/libsolidity/semanticTests/viaYul/delete.sol b/test/libsolidity/semanticTests/viaYul/delete.sol
index 3439bc4df9..6a0f3d5986 100644
--- a/test/libsolidity/semanticTests/viaYul/delete.sol
+++ b/test/libsolidity/semanticTests/viaYul/delete.sol
@@ -18,8 +18,6 @@ contract C {
 		return func() == internal_func();
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // call_deleted_internal_func() -> FAILURE, hex"4e487b71", 0x51
 // call_internal_func() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol
index 6e6f108a62..412998b559 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_add_overflow.sol
@@ -6,8 +6,6 @@ contract C {
         x = a + b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 5, 6 -> 11
 // f(uint256,uint256): -2, 1 -> -1
diff --git a/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol
index 0e7d2db37d..5c721ac2f2 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_add_overflow_signed.sol
@@ -6,8 +6,6 @@ contract C {
         x = a + b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(int256,int256): 5, 6 -> 11
 // f(int256,int256): -2, 1 -> -1
diff --git a/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol
index ab3d97f46d..d4cefe12f6 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_div_overflow.sol
@@ -9,8 +9,6 @@ contract C {
         x = a / b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 10, 3 -> 3
 // f(uint256,uint256): 1, 0 -> FAILURE, hex"4e487b71", 0x12
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol b/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol
index 5307f95898..0d04329874 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_mod_zero.sol
@@ -6,8 +6,6 @@ contract C {
         x = a % b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 10, 3 -> 1
 // f(uint256,uint256): 10, 2 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol
index 102df82f30..e97bc4cc30 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_mod_zero_signed.sol
@@ -6,8 +6,6 @@ contract C {
         x = a % b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(int256,int256): 10, 3 -> 1
 // f(int256,int256): 10, 2 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol
index 8cc64ffa07..935d03752d 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow.sol
@@ -6,8 +6,6 @@ contract C {
         x = a * b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 5, 6 -> 30
 // f(uint256,uint256): -1, 1 -> -1
diff --git a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
index a9581c49f7..213b1a6d3b 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_mul_overflow_signed.sol
@@ -9,8 +9,6 @@ contract C {
         x = a * b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(int256,int256): 5, 6 -> 30
 // f(int256,int256): -1, 1 -> -1
diff --git a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol b/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol
index 1f6a0d7e5a..ee059137a0 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_sub_overflow.sol
@@ -6,8 +6,6 @@ contract C {
         x = a - b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 6, 5 -> 1
 // f(uint256,uint256): 6, 6 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol b/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol
index 3499260790..a247af68bf 100644
--- a/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol
+++ b/test/libsolidity/semanticTests/viaYul/detect_sub_overflow_signed.sol
@@ -6,8 +6,6 @@ contract C {
         x = a - b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(int256,int256): 5, 6 -> -1
 // f(int256,int256): -2, 1 -> -3
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_memory_dynamic_array.sol b/test/libsolidity/semanticTests/viaYul/dirty_memory_dynamic_array.sol
index 8b34fd801f..36a253b024 100644
--- a/test/libsolidity/semanticTests/viaYul/dirty_memory_dynamic_array.sol
+++ b/test/libsolidity/semanticTests/viaYul/dirty_memory_dynamic_array.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_memory_int32.sol b/test/libsolidity/semanticTests/viaYul/dirty_memory_int32.sol
index 636572d500..fc2fe42516 100644
--- a/test/libsolidity/semanticTests/viaYul/dirty_memory_int32.sol
+++ b/test/libsolidity/semanticTests/viaYul/dirty_memory_int32.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_memory_static_array.sol b/test/libsolidity/semanticTests/viaYul/dirty_memory_static_array.sol
index 2e9acb27c3..4742bae2df 100644
--- a/test/libsolidity/semanticTests/viaYul/dirty_memory_static_array.sol
+++ b/test/libsolidity/semanticTests/viaYul/dirty_memory_static_array.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_memory_struct.sol b/test/libsolidity/semanticTests/viaYul/dirty_memory_struct.sol
index 7c14280502..411cbe069e 100644
--- a/test/libsolidity/semanticTests/viaYul/dirty_memory_struct.sol
+++ b/test/libsolidity/semanticTests/viaYul/dirty_memory_struct.sol
@@ -17,7 +17,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/dirty_memory_uint32.sol b/test/libsolidity/semanticTests/viaYul/dirty_memory_uint32.sol
index cfd2c05af9..a23a566c5b 100644
--- a/test/libsolidity/semanticTests/viaYul/dirty_memory_uint32.sol
+++ b/test/libsolidity/semanticTests/viaYul/dirty_memory_uint32.sol
@@ -13,7 +13,6 @@ contract C {
     }
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/exp.sol b/test/libsolidity/semanticTests/viaYul/exp.sol
index 1ca5842ab0..324256b456 100644
--- a/test/libsolidity/semanticTests/viaYul/exp.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp.sol
@@ -3,8 +3,6 @@ contract C {
         return x**y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 0, 0 -> 1
 // f(uint256,uint256): 0, 1 -> 0x00
diff --git a/test/libsolidity/semanticTests/viaYul/exp_literals.sol b/test/libsolidity/semanticTests/viaYul/exp_literals.sol
index 55ed66eb3f..382d75184f 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_literals.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_literals.sol
@@ -29,7 +29,6 @@ contract C {
 
 }
 // ====
-// compileToEwasm: also
 // compileViaYul: true
 // ----
 // exp_2(uint256): 255 -> 57896044618658097711785492504343953926634992332820282019728792003956564819968
diff --git a/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol b/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol
index d28a56eb4f..12ab339242 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_literals_success.sol
@@ -28,8 +28,6 @@ contract C {
     }
 
 }
-// ====
-// compileToEwasm: also
 // ----
 // exp_2(uint256): 255 -> 57896044618658097711785492504343953926634992332820282019728792003956564819968
 // exp_minus_2(uint256): 255 -> -57896044618658097711785492504343953926634992332820282019728792003956564819968
diff --git a/test/libsolidity/semanticTests/viaYul/exp_neg.sol b/test/libsolidity/semanticTests/viaYul/exp_neg.sol
index de58d65926..a6ba617d79 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_neg.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_neg.sol
@@ -3,8 +3,6 @@ contract C {
         return x**y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(int256,uint256): 0, 0 -> 1
 // f(int256,uint256): 0, 1 -> 0x00
diff --git a/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol b/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol
index 9d4b59d528..a966e3ccdb 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_neg_overflow.sol
@@ -6,8 +6,6 @@ contract C {
         return x**y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(int8,uint256): 2, 6 -> 64
 // f(int8,uint256): 2, 7 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/viaYul/exp_overflow.sol b/test/libsolidity/semanticTests/viaYul/exp_overflow.sol
index 8ba9c1d4ad..7a100c2be0 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_overflow.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_overflow.sol
@@ -6,8 +6,6 @@ contract C {
         return x**y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint8,uint8): 2, 7 -> 0x80
 // f(uint8,uint8): 2, 8 -> FAILURE, hex"4e487b71", 0x11
diff --git a/test/libsolidity/semanticTests/viaYul/exp_various.sol b/test/libsolidity/semanticTests/viaYul/exp_various.sol
index a1a69ed031..3e9cf9d40b 100644
--- a/test/libsolidity/semanticTests/viaYul/exp_various.sol
+++ b/test/libsolidity/semanticTests/viaYul/exp_various.sol
@@ -6,8 +6,6 @@ contract C {
         return x**y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint8,uint8): 0, 0 -> 1
 // f(uint8,uint8): 0, 1 -> 0x00
diff --git a/test/libsolidity/semanticTests/viaYul/function_address.sol b/test/libsolidity/semanticTests/viaYul/function_address.sol
index e7d6c49a22..0c1c58dd82 100644
--- a/test/libsolidity/semanticTests/viaYul/function_address.sol
+++ b/test/libsolidity/semanticTests/viaYul/function_address.sol
@@ -9,8 +9,6 @@ contract C {
       return a.address;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0xc06afe3a8444fc0004668591e8306bfb9968e79e
 // g() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol b/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
index 29812e0189..6f5f90824f 100644
--- a/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
+++ b/test/libsolidity/semanticTests/viaYul/function_entry_checks.sol
@@ -16,8 +16,6 @@ contract C {
     function t(uint) public pure {
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0
 // g(uint256,uint256): 1, -2 -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/function_pointers.sol b/test/libsolidity/semanticTests/viaYul/function_pointers.sol
index 8bc69baa87..b34f019817 100644
--- a/test/libsolidity/semanticTests/viaYul/function_pointers.sol
+++ b/test/libsolidity/semanticTests/viaYul/function_pointers.sol
@@ -16,8 +16,6 @@ contract C {
 		k1()();
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> FAILURE, hex"4e487b71", 0x51
 // g() -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/function_selector.sol b/test/libsolidity/semanticTests/viaYul/function_selector.sol
index d21afdcf54..4737a36d9a 100644
--- a/test/libsolidity/semanticTests/viaYul/function_selector.sol
+++ b/test/libsolidity/semanticTests/viaYul/function_selector.sol
@@ -6,8 +6,6 @@ contract C {
         return a.selector;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> left(0x26121ff0)
 // h(function): left(0x1122334400112233445566778899AABBCCDDEEFF42424242) -> left(0x42424242)
diff --git a/test/libsolidity/semanticTests/viaYul/if.sol b/test/libsolidity/semanticTests/viaYul/if.sol
index d2f582bb1b..0fe752d510 100644
--- a/test/libsolidity/semanticTests/viaYul/if.sol
+++ b/test/libsolidity/semanticTests/viaYul/if.sol
@@ -59,8 +59,6 @@ contract C {
         } while(false);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): 0 -> 23
 // f(bool): 1 -> 42
diff --git a/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
index 35a2765ff5..529513eaff 100644
--- a/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_address_assignment.sol
@@ -4,7 +4,5 @@ contract C {
         x = b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(address): 0x1234 -> 0x1234
diff --git a/test/libsolidity/semanticTests/viaYul/local_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_assignment.sol
index 978b905e38..f77d25c663 100644
--- a/test/libsolidity/semanticTests/viaYul/local_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_assignment.sol
@@ -4,7 +4,5 @@ contract C {
         x = b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256): 6 -> 6
diff --git a/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
index c95cbf41ac..d32e281dad 100644
--- a/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_bool_assignment.sol
@@ -4,7 +4,5 @@ contract C {
         x = b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(bool): true -> true
diff --git a/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol b/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol
index a6b14a9e02..ff7f078557 100644
--- a/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_tuple_assignment.sol
@@ -21,8 +21,6 @@ contract C {
         (((d))) = (13);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // x() -> 17
 // f(uint256,uint256): 23, 42 -> 23, 42
diff --git a/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol b/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol
index f11cd661f9..f1b2b1740b 100644
--- a/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol
+++ b/test/libsolidity/semanticTests/viaYul/local_variable_without_init.sol
@@ -4,7 +4,5 @@ contract C {
         return x;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/viaYul/loops/break.sol b/test/libsolidity/semanticTests/viaYul/loops/break.sol
index 939cd0b7f6..77ecface79 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/break.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/break.sol
@@ -23,8 +23,6 @@ contract C {
         } while (x < 3);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2
 // g() -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/loops/continue.sol b/test/libsolidity/semanticTests/viaYul/loops/continue.sol
index 25e57dac19..b9c3f167d3 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/continue.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/continue.sol
@@ -29,8 +29,6 @@ contract C {
         x = x + a;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 11
 // g() -> 11
diff --git a/test/libsolidity/semanticTests/viaYul/loops/return.sol b/test/libsolidity/semanticTests/viaYul/loops/return.sol
index 3f3b709bae..ee7062e700 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/return.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/return.sol
@@ -26,8 +26,6 @@ contract C {
         } while (x < 3);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1
 // g() -> 1
diff --git a/test/libsolidity/semanticTests/viaYul/loops/simple.sol b/test/libsolidity/semanticTests/viaYul/loops/simple.sol
index 3a09098ab2..a4d076325c 100644
--- a/test/libsolidity/semanticTests/viaYul/loops/simple.sol
+++ b/test/libsolidity/semanticTests/viaYul/loops/simple.sol
@@ -29,8 +29,6 @@ contract C {
         for (;;) {break;}
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 1024
 // g() -> 1024
diff --git a/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol b/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol
index 47213b7b48..9f87c7b97d 100644
--- a/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol
+++ b/test/libsolidity/semanticTests/viaYul/memory_struct_allow.sol
@@ -15,7 +15,5 @@ contract C {
         return (s.a, s.b);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 0, 0
diff --git a/test/libsolidity/semanticTests/viaYul/msg_sender.sol b/test/libsolidity/semanticTests/viaYul/msg_sender.sol
index 520c9be4e3..058f142f86 100644
--- a/test/libsolidity/semanticTests/viaYul/msg_sender.sol
+++ b/test/libsolidity/semanticTests/viaYul/msg_sender.sol
@@ -5,7 +5,5 @@ contract C {
         return x == msg.sender;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // test() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/require.sol b/test/libsolidity/semanticTests/viaYul/require.sol
index 7546921f18..39677b4f5d 100644
--- a/test/libsolidity/semanticTests/viaYul/require.sol
+++ b/test/libsolidity/semanticTests/viaYul/require.sol
@@ -30,7 +30,6 @@ contract C {
 }
 // ====
 // EVMVersion: >=byzantium
-// compileToEwasm: also
 // ----
 // f(bool): true -> true
 // f(bool): false -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/return.sol b/test/libsolidity/semanticTests/viaYul/return.sol
index c42353e60f..f58632b964 100644
--- a/test/libsolidity/semanticTests/viaYul/return.sol
+++ b/test/libsolidity/semanticTests/viaYul/return.sol
@@ -4,7 +4,5 @@ contract C {
         x = 3;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 7
diff --git a/test/libsolidity/semanticTests/viaYul/return_and_convert.sol b/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
index 547838371e..78e9e3bea0 100644
--- a/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
+++ b/test/libsolidity/semanticTests/viaYul/return_and_convert.sol
@@ -5,7 +5,5 @@ contract C {
         return b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 255
diff --git a/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol b/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol
index fd886596fd..936058124b 100644
--- a/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol
+++ b/test/libsolidity/semanticTests/viaYul/return_storage_pointers.sol
@@ -10,7 +10,5 @@ contract C {
 	}
 
 }
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 0, 0
diff --git a/test/libsolidity/semanticTests/viaYul/short_circuit.sol b/test/libsolidity/semanticTests/viaYul/short_circuit.sol
index 5823f77340..b160bbd77e 100644
--- a/test/libsolidity/semanticTests/viaYul/short_circuit.sol
+++ b/test/libsolidity/semanticTests/viaYul/short_circuit.sol
@@ -8,8 +8,6 @@ contract C {
         y = x;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // or(uint256): 0 -> true, 0
 // and(uint256): 0 -> true, 8
diff --git a/test/libsolidity/semanticTests/viaYul/simple_assignment.sol b/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
index 016f7438df..ed0ba28784 100644
--- a/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
+++ b/test/libsolidity/semanticTests/viaYul/simple_assignment.sol
@@ -4,7 +4,5 @@ contract C {
         y = b;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint256,uint256): 5, 6 -> 5, 6
diff --git a/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol b/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
index 99e0cbcdfa..8e8cd78e87 100644
--- a/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
+++ b/test/libsolidity/semanticTests/viaYul/simple_inline_asm.sol
@@ -11,7 +11,5 @@ contract C {
         x = a + b + c;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 6
diff --git a/test/libsolidity/semanticTests/viaYul/smoke_test.sol b/test/libsolidity/semanticTests/viaYul/smoke_test.sol
index 6460ad90f3..53a11869fe 100644
--- a/test/libsolidity/semanticTests/viaYul/smoke_test.sol
+++ b/test/libsolidity/semanticTests/viaYul/smoke_test.sol
@@ -2,6 +2,5 @@ contract C {
 }
 // ====
 // allowNonExistingFunctions: true
-// compileToEwasm: also
 // ----
 // f() -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol
index f61808084b..d1ec20db09 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_bytes.sol
@@ -12,7 +12,5 @@ contract C {
         correct = r == (0x64 << 248);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol
index 59b63ddf2f..7c035f0536 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/dirty_storage_static_array.sol
@@ -12,7 +12,5 @@ contract C {
         correct = (s[0] == 0x01) && (r == 0x01);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> true
diff --git a/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol b/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
index a39c0797de..5253a6a1ab 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/packed_storage.sol
@@ -10,7 +10,5 @@ contract C {
         _x = x;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f(uint8): 6 -> 9
diff --git a/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol b/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
index df2575a887..03d7ed9205 100644
--- a/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
+++ b/test/libsolidity/semanticTests/viaYul/storage/simple_storage.sol
@@ -10,8 +10,6 @@ contract C {
         _y = y;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // setX(uint256): 6 -> 6
 // setY(uint256): 2 -> 2
diff --git a/test/libsolidity/semanticTests/viaYul/string_format.sol b/test/libsolidity/semanticTests/viaYul/string_format.sol
index 49746adb46..5869ea2e76 100644
--- a/test/libsolidity/semanticTests/viaYul/string_format.sol
+++ b/test/libsolidity/semanticTests/viaYul/string_format.sol
@@ -4,8 +4,6 @@ contract C {
 	function g() external pure returns (bytes32) { return "abcabc"; }
 	function h() external pure returns (bytes4) { return 0xcafecafe; }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f1() -> 0x20, 6, left(0x616263616263)
 // f2() -> 32, 47, 44048183223289766195424279195050628400112610419087780792899004030957505095210, 18165586057823232067963737336409268114628061002662705707816940456850361417728
diff --git a/test/libsolidity/semanticTests/viaYul/string_literals.sol b/test/libsolidity/semanticTests/viaYul/string_literals.sol
index f1140ffb4d..985d263542 100644
--- a/test/libsolidity/semanticTests/viaYul/string_literals.sol
+++ b/test/libsolidity/semanticTests/viaYul/string_literals.sol
@@ -18,8 +18,6 @@ contract C {
         x = "abc";
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // short_dyn() -> 0x20, 3, "abc"
 // long_dyn() -> 0x20, 80, "12345678901234567890123456789012", "34567890123456789012345678901234", "5678901234567890"
diff --git a/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol b/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol
index edde645880..e1a1689b7f 100644
--- a/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol
+++ b/test/libsolidity/semanticTests/viaYul/tuple_evaluation_order.sol
@@ -8,7 +8,5 @@ contract C {
        return (x, y);
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 3, 1
diff --git a/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol b/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol
index f0e811ac23..d8e640713a 100644
--- a/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol
+++ b/test/libsolidity/semanticTests/viaYul/unary_fixedbytes.sol
@@ -58,8 +58,6 @@ contract C {
 		return r;
 	}
 }
-// ====
-// compileToEwasm: also
 // ----
 // conv(bytes25): left(0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff) -> 0xff00ff00ff00ff00ff00ff00ff00ff00ffffffffffffffffffffffffffffffff
 // upcast(bytes25): left(0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff) -> 0xff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff0000000000000000
diff --git a/test/libsolidity/semanticTests/viaYul/unary_operations.sol b/test/libsolidity/semanticTests/viaYul/unary_operations.sol
index 37a6e90d84..17d8dad034 100644
--- a/test/libsolidity/semanticTests/viaYul/unary_operations.sol
+++ b/test/libsolidity/semanticTests/viaYul/unary_operations.sol
@@ -84,7 +84,6 @@ contract C {
 }
 // ====
 // compileViaYul: true
-// compileToEwasm: also
 // ----
 // preincr_s8(int8): 128 -> FAILURE
 // postincr_s8(int8): 128 -> FAILURE
diff --git a/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol b/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
index dc9057121d..b440d8e136 100644
--- a/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
+++ b/test/libsolidity/semanticTests/viaYul/various_inline_asm.sol
@@ -17,7 +17,5 @@ contract C {
         x = a + b + c;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 70
diff --git a/test/libsolidity/semanticTests/viaYul/virtual_functions.sol b/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
index ea43914b73..798f90ffd4 100644
--- a/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
+++ b/test/libsolidity/semanticTests/viaYul/virtual_functions.sol
@@ -23,8 +23,6 @@ contract C is X {
         x = 3;
     }
 }
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 3
 // f1() -> 3
diff --git a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol b/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol
index 7c5658ae2b..28705ee40e 100644
--- a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol
+++ b/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls.sol
@@ -14,8 +14,5 @@ contract Derived is Base {
         return 2;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol b/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol
index f74a2df7a9..d833430483 100644
--- a/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol
+++ b/test/libsolidity/semanticTests/virtualFunctions/internal_virtual_function_calls_through_dispatch.sol
@@ -19,8 +19,5 @@ contract Derived is Base {
         return f();
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // h() -> 2
diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol
index d277712f0d..ea543a786f 100644
--- a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol
+++ b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_calls.sol
@@ -14,9 +14,6 @@ contract Derived is Base {
         return 2;
     }
 }
-
-// ====
-// compileToEwasm: also
 // ----
 // g() -> 2
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
index d8417e3e26..55a50a5c91 100644
--- a/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
+++ b/test/libsolidity/semanticTests/virtualFunctions/virtual_function_usage_in_constructor_arguments.sol
@@ -27,6 +27,5 @@ contract Derived is Base {
         return 2;
     }
 }
-
 // ----
 // getA() -> 2
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol
index 5c0466ace4..798f8fce7b 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_overflow_2_safe.sol
@@ -9,7 +9,6 @@ contract C {
 		assert(x[0] == 42 || x[0] == 23);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_struct_member_1.sol b/test/libsolidity/smtCheckerTests/array_members/push_struct_member_1.sol
index 15330f39b0..bb69ec9eec 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_struct_member_1.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_struct_member_1.sol
@@ -12,7 +12,6 @@ contract C {
 		t.s.b.push();
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol b/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol
index 091ec74af6..ad7a675b0b 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_struct_member_2.sol
@@ -13,7 +13,6 @@ contract C {
 		t.s[0].b.push();
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/complex/MerkleProof.sol b/test/libsolidity/smtCheckerTests/complex/MerkleProof.sol
index 606625d3fe..ac268409d8 100644
--- a/test/libsolidity/smtCheckerTests/complex/MerkleProof.sol
+++ b/test/libsolidity/smtCheckerTests/complex/MerkleProof.sol
@@ -30,7 +30,6 @@ library MerkleProof {
         return computedHash == root;
     }
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/function_selector/homer.sol b/test/libsolidity/smtCheckerTests/function_selector/homer.sol
index f4536e5bf0..a3bb0c64ba 100644
--- a/test/libsolidity/smtCheckerTests/function_selector/homer.sol
+++ b/test/libsolidity/smtCheckerTests/function_selector/homer.sol
@@ -38,8 +38,6 @@ contract Homer is ERC165, Simpson {
         assert(supportsInterface(type(PeaceMaker).interfaceId));
     }
 }
-
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol
index 5bf37f0815..40a023bb47 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_1.sol
@@ -9,7 +9,6 @@ contract C
 		assert(x > 0);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
index c77359fd42..ceb42881ff 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
@@ -9,7 +9,6 @@ contract C
 		assert(x > 0);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol
index 1ecdd5c8b8..54d0abaf75 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_2.sol
@@ -13,7 +13,6 @@ contract C
 		assert(x > 0);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
index 33f37ffcc9..4d6ff0a647 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
@@ -13,7 +13,6 @@ contract C
 		assert(x > 0);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol
index 4c9885ff6e..e140fdedce 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple.sol
@@ -9,7 +9,6 @@ contract C
 		assert(x > 0);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol
index 9da6fd551e..b511dc63bc 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_as_tuple_fail.sol
@@ -9,7 +9,6 @@ contract C
 		assert(x > 0);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol b/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol
index 4f664fb041..0e3699e6be 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_recursive.sol
@@ -11,7 +11,6 @@ contract C
 			assert(a == 0);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol
index b7148bc730..2b6289b95f 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1.sol
@@ -10,7 +10,6 @@ contract C
 		assert(a > 0);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
index e775c97a9a..3e045cee70 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_1_fail.sol
@@ -10,7 +10,6 @@ contract C
 		assert(a > 0);
 	}
 }
-
 // ====
 // SMTEngine: all
 // SMTIgnoreOS: macos
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol
index 5bfb5dcc8e..001067a28a 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2.sol
@@ -11,7 +11,6 @@ contract C
 		assert(a > 1);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol
index 29fd5aefbc..35906db3b9 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_storage_var_2_fail.sol
@@ -11,7 +11,6 @@ contract C
 		assert(a > 0);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol b/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol
index e98556f994..7fe00f5724 100644
--- a/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol
+++ b/test/libsolidity/smtCheckerTests/functions/library_after_contract.sol
@@ -10,7 +10,6 @@ library L {
 		return x;
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol
index 694d110e19..15bb168a72 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_contract_member_variable_array_2.sol
@@ -5,7 +5,6 @@ contract A {
         A.a[0] = 2;
     }
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
index b2f083e025..fc8d6e08f3 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_value_inheritance_3.sol
@@ -15,7 +15,6 @@ contract C is A, B {
 		assert(msg.value >= 0); // should hold
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/special/range_check.sol b/test/libsolidity/smtCheckerTests/special/range_check.sol
index 210aed4dae..8880a68a7a 100644
--- a/test/libsolidity/smtCheckerTests/special/range_check.sol
+++ b/test/libsolidity/smtCheckerTests/special/range_check.sol
@@ -55,7 +55,6 @@ contract D {
 		}
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol b/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol
index 4c82cebd99..4a65bd9a30 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_inside_if.sol
@@ -8,7 +8,6 @@ contract C {
       }
   }
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_3.sol b/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_3.sol
index 6b5d727caa..37ef3158e1 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_3.sol
@@ -5,7 +5,6 @@ contract D {
 		data.push(inner);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_4.sol b/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_4.sol
index 7173d57ba4..f0049b3f3d 100644
--- a/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_4.sol
+++ b/test/libsolidity/smtCheckerTests/types/static_array_implicit_push_4.sol
@@ -5,7 +5,6 @@ contract D {
 		data.push(inner);
 	}
 }
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libsolidity/smtCheckerTests/unchecked/unchecked_double_with_modifier.sol b/test/libsolidity/smtCheckerTests/unchecked/unchecked_double_with_modifier.sol
index 55931bfa98..5db44309d1 100644
--- a/test/libsolidity/smtCheckerTests/unchecked/unchecked_double_with_modifier.sol
+++ b/test/libsolidity/smtCheckerTests/unchecked/unchecked_double_with_modifier.sol
@@ -11,8 +11,6 @@ contract C {
 		unchecked { t(); }
 	}
 }
-
-
 // ====
 // SMTEngine: all
 // ----
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index 11896d2f91..800684f353 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -29,7 +29,6 @@
 #include <libyul/YulStack.h>
 #include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/backends/wasm/WasmDialect.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/ErrorReporter.h>
@@ -119,11 +118,6 @@ std::map<string const, yul::Dialect const& (*)(langutil::EVMVersion)> const vali
 		"yul",
 		[](langutil::EVMVersion) -> yul::Dialect const&
 		{ return yul::Dialect::yulDeprecated(); }
-	},
-	{
-		"ewasm",
-		[](langutil::EVMVersion) -> yul::Dialect const&
-		{ return yul::WasmDialect::instance(); }
 	}
 };
 
diff --git a/test/libyul/EwasmTranslationTest.cpp b/test/libyul/EwasmTranslationTest.cpp
deleted file mode 100644
index f40bc2e420..0000000000
--- a/test/libyul/EwasmTranslationTest.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/*
-	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/libyul/EwasmTranslationTest.h>
-
-#include <test/tools/yulInterpreter/Interpreter.h>
-
-#include <test/Common.h>
-
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/backends/wasm/WasmDialect.h>
-#include <libyul/backends/wasm/EVMToEwasmTranslator.h>
-#include <libyul/YulStack.h>
-#include <libyul/AsmAnalysisInfo.h>
-#include <libyul/AST.h>
-#include <libyul/Object.h>
-
-#include <liblangutil/DebugInfoSelection.h>
-#include <liblangutil/ErrorReporter.h>
-#include <liblangutil/SourceReferenceFormatter.h>
-
-#include <libsolutil/AnsiColorized.h>
-
-#include <boost/test/unit_test.hpp>
-#include <boost/algorithm/string.hpp>
-
-#include <fstream>
-
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::langutil;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-using namespace solidity::frontend;
-using namespace solidity::frontend::test;
-using namespace std;
-
-
-EwasmTranslationTest::EwasmTranslationTest(string const& _filename):
-	EVMVersionRestrictedTestCase(_filename)
-{
-	m_source = m_reader.source();
-	m_expectation = m_reader.simpleExpectations();
-}
-
-TestCase::TestResult EwasmTranslationTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
-{
-	if (!parse(_stream, _linePrefix, _formatted))
-		return TestResult::FatalError;
-
-	*m_object = EVMToEwasmTranslator(
-		EVMDialect::strictAssemblyForEVMObjects(solidity::test::CommonOptions::get().evmVersion()),
-		m_stack
-	).run(*m_object);
-
-	// Add call to "main()".
-	m_object->code->statements.emplace_back(
-		ExpressionStatement{{}, FunctionCall{{}, Identifier{{}, "main"_yulstring}, {}}}
-	);
-
-	m_obtainedResult = interpret();
-
-	return checkResult(_stream, _linePrefix, _formatted);
-}
-
-bool EwasmTranslationTest::parse(ostream& _stream, string const& _linePrefix, bool const _formatted)
-{
-	m_stack = YulStack(
-		solidity::test::CommonOptions::get().evmVersion(),
-		solidity::test::CommonOptions::get().eofVersion(),
-		YulStack::Language::StrictAssembly,
-		solidity::frontend::OptimiserSettings::none(),
-		DebugInfoSelection::All()
-	);
-	if (m_stack.parseAndAnalyze("", m_source))
-	{
-		m_object = m_stack.parserResult();
-		return true;
-	}
-	else
-	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
-		SourceReferenceFormatter{_stream, m_stack, true, false}
-			.printErrorInformation(m_stack.errors());
-		return false;
-	}
-}
-
-string EwasmTranslationTest::interpret()
-{
-	InterpreterState state;
-	state.maxTraceSize = 10000;
-	state.maxSteps = 1000000;
-	state.maxExprNesting = 64;
-	try
-	{
-		Interpreter::run(
-			state,
-			WasmDialect{},
-			*m_object->code,
-			/*disableExternalCalls=*/true,
-			/*disableMemoryTracing=*/false
-		);
-	}
-	catch (InterpreterTerminatedGeneric const&)
-	{
-	}
-
-	stringstream result;
-	state.dumpTraceAndState(result, false);
-	return result.str();
-}
diff --git a/test/libyul/EwasmTranslationTest.h b/test/libyul/EwasmTranslationTest.h
deleted file mode 100644
index d54b8732a0..0000000000
--- a/test/libyul/EwasmTranslationTest.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-	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
-
-#pragma once
-
-#include <test/TestCase.h>
-
-#include <libyul/YulStack.h>
-
-namespace solidity::yul
-{
-struct Object;
-class YulStack;
-}
-
-namespace solidity::yul::test
-{
-
-class EwasmTranslationTest: public solidity::frontend::test::EVMVersionRestrictedTestCase
-{
-public:
-	static std::unique_ptr<TestCase> create(Config const& _config)
-	{
-		return std::make_unique<EwasmTranslationTest>(_config.filename);
-	}
-
-	explicit EwasmTranslationTest(std::string const& _filename);
-
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
-
-private:
-	bool parse(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted);
-	std::string interpret();
-
-	std::shared_ptr<Object> m_object;
-	YulStack m_stack;
-};
-
-}
diff --git a/test/libyul/ObjectCompilerTest.cpp b/test/libyul/ObjectCompilerTest.cpp
index 3a8d966922..74a680b9b7 100644
--- a/test/libyul/ObjectCompilerTest.cpp
+++ b/test/libyul/ObjectCompilerTest.cpp
@@ -59,7 +59,6 @@ ObjectCompilerTest::ObjectCompilerTest(string const& _filename):
 		},
 		"minimal"
 	);
-	m_wasm = m_reader.boolSetting("wasm", false);
 	m_expectation = m_reader.simpleExpectations();
 }
 
@@ -68,7 +67,7 @@ TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _li
 	YulStack stack(
 		EVMVersion(),
 		nullopt,
-		m_wasm ? YulStack::Language::Ewasm : YulStack::Language::StrictAssembly,
+		YulStack::Language::StrictAssembly,
 		OptimiserSettings::preset(m_optimisationPreset),
 		DebugInfoSelection::All()
 	);
@@ -81,33 +80,22 @@ TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _li
 	}
 	stack.optimize();
 
-	if (m_wasm)
-	{
-		MachineAssemblyObject obj = stack.assemble(YulStack::Machine::Ewasm);
-		solAssert(obj.bytecode, "");
+	MachineAssemblyObject obj = stack.assemble(YulStack::Machine::EVM);
+	solAssert(obj.bytecode, "");
+	solAssert(obj.sourceMappings, "");
 
-		m_obtainedResult = "Text:\n" + obj.assembly + "\n";
-		m_obtainedResult += "Binary:\n" + util::toHex(obj.bytecode->bytecode) + "\n";
-	}
+	m_obtainedResult = "Assembly:\n" + obj.assembly;
+	if (obj.bytecode->bytecode.empty())
+		m_obtainedResult += "-- empty bytecode --\n";
 	else
-	{
-		MachineAssemblyObject obj = stack.assemble(YulStack::Machine::EVM);
-		solAssert(obj.bytecode, "");
-		solAssert(obj.sourceMappings, "");
-
-		m_obtainedResult = "Assembly:\n" + obj.assembly;
-		if (obj.bytecode->bytecode.empty())
-			m_obtainedResult += "-- empty bytecode --\n";
-		else
-			m_obtainedResult +=
-				"Bytecode: " +
-				util::toHex(obj.bytecode->bytecode) +
-				"\nOpcodes: " +
-				boost::trim_copy(evmasm::disassemble(obj.bytecode->bytecode, solidity::test::CommonOptions::get().evmVersion())) +
-				"\nSourceMappings:" +
-				(obj.sourceMappings->empty() ? "" : " " + *obj.sourceMappings) +
-				"\n";
-	}
+		m_obtainedResult +=
+			"Bytecode: " +
+			util::toHex(obj.bytecode->bytecode) +
+			"\nOpcodes: " +
+			boost::trim_copy(evmasm::disassemble(obj.bytecode->bytecode, solidity::test::CommonOptions::get().evmVersion())) +
+			"\nSourceMappings:" +
+			(obj.sourceMappings->empty() ? "" : " " + *obj.sourceMappings) +
+			"\n";
 
 	return checkResult(_stream, _linePrefix, _formatted);
 }
diff --git a/test/libyul/ObjectCompilerTest.h b/test/libyul/ObjectCompilerTest.h
index c7880fe556..fe89987002 100644
--- a/test/libyul/ObjectCompilerTest.h
+++ b/test/libyul/ObjectCompilerTest.h
@@ -55,7 +55,6 @@ class ObjectCompilerTest: public solidity::frontend::test::TestCase
 	void disambiguate();
 
 	frontend::OptimisationPreset m_optimisationPreset;
-	bool m_wasm = false;
 };
 
 }
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 7623efc12c..7e5f324305 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -61,8 +61,6 @@
 #include <libyul/backends/evm/ConstantOptimiser.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/backends/evm/EVMMetrics.h>
-#include <libyul/backends/wasm/WordSizeTransform.h>
-#include <libyul/backends/wasm/WasmDialect.h>
 #include <libyul/AsmAnalysis.h>
 #include <libyul/CompilabilityChecker.h>
 
@@ -326,11 +324,6 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			StackCompressor::run(*m_dialect, *m_object, true, maxIterations);
 			BlockFlattener::run(*m_context, *m_ast);
 		}},
-		{"wordSizeTransform", [&]() {
-			disambiguate();
-			ExpressionSplitter::run(*m_context, *m_ast);
-			WordSizeTransform::run(*m_dialect, *m_dialect, *m_ast, *m_nameDispenser);
-		}},
 		{"fullSuite", [&]() {
 			GasMeter meter(dynamic_cast<EVMDialect const&>(*m_dialect), false, 200);
 			OptimiserSuite::run(
diff --git a/test/libyul/ewasmTranslationTests/address.yul b/test/libyul/ewasmTranslationTests/address.yul
deleted file mode 100644
index 0290bad4d4..0000000000
--- a/test/libyul/ewasmTranslationTests/address.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, address())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000011111111
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000011111111
diff --git a/test/libyul/ewasmTranslationTests/arithmetic_add.yul b/test/libyul/ewasmTranslationTests/arithmetic_add.yul
deleted file mode 100644
index b2203070fc..0000000000
--- a/test/libyul/ewasmTranslationTests/arithmetic_add.yul
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  sstore(0, add(0, 1))
-  sstore(1, add(1, not(0)))
-  sstore(2, add(0, 0))
-  sstore(3, add(1, 2))
-  sstore(4, add(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 1))
-  sstore(5, add(
-    0x8000000000000000000000000000000000000000000000000000000000000000, 1
-  ))
-  sstore(6, add(not(0), 1))
-  sstore(7, add(0xffffffffffffffffffffffffffffffff, 1))
-  sstore(8, add(0xffffffffffffffff, 1))
-  sstore(9, add(0xffffffffffffffffffffffffffffffff0000000000000000, 1))
-  sstore(10, add(0xffffffffffffffffffffffffffffffffffffffffffffffff, 3))
-  sstore(11, add(0xffffffffffffffffffffffffffffffff, 3))
-  sstore(12, add(0xffffffffffffffff, 3))
-  sstore(13, add(0xffffffffffffffffffffffffffffffff0000000000000000, 3))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000000d
-//     20: 0000000000000000ffffffffffffffffffffffffffffffff0000000000000003
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000003: 0000000000000000000000000000000000000000000000000000000000000003
-//   0000000000000000000000000000000000000000000000000000000000000004: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000005: 8000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000007: 0000000000000000000000000000000100000000000000000000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000008: 0000000000000000000000000000000000000000000000010000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000009: 0000000000000000ffffffffffffffffffffffffffffffff0000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000a: 0000000000000001000000000000000000000000000000000000000000000002
-//   000000000000000000000000000000000000000000000000000000000000000b: 0000000000000000000000000000000100000000000000000000000000000002
-//   000000000000000000000000000000000000000000000000000000000000000c: 0000000000000000000000000000000000000000000000010000000000000002
-//   000000000000000000000000000000000000000000000000000000000000000d: 0000000000000000ffffffffffffffffffffffffffffffff0000000000000003
diff --git a/test/libyul/ewasmTranslationTests/arithmetic_addmod.yul b/test/libyul/ewasmTranslationTests/arithmetic_addmod.yul
deleted file mode 100644
index 40b84764ed..0000000000
--- a/test/libyul/ewasmTranslationTests/arithmetic_addmod.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  sstore(0, addmod(0, 1, 1))
-  sstore(1, addmod(0, 1, 2))
-  sstore(2, addmod(3, 1, 2))
-  sstore(3, addmod(1, not(0), 5))
-  sstore(4, addmod(0, 0, 0))
-  sstore(5, addmod(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 1, 1))
-  sstore(6, addmod(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 1, 0))
-  sstore(7, addmod(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd, 1, 5))
-  sstore(8, addmod(
-    0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-    0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe,
-    5
-  ))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000008
-//     20: 0000000000000000000000000000000000000000000000000000000000000004
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000003: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000007: 0000000000000000000000000000000000000000000000000000000000000004
-//   0000000000000000000000000000000000000000000000000000000000000008: 0000000000000000000000000000000000000000000000000000000000000004
diff --git a/test/libyul/ewasmTranslationTests/arithmetic_div.yul b/test/libyul/ewasmTranslationTests/arithmetic_div.yul
deleted file mode 100644
index f32c244a9f..0000000000
--- a/test/libyul/ewasmTranslationTests/arithmetic_div.yul
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  sstore(0, div(0, 1))
-  sstore(1, div(1, not(0)))
-  sstore(2, div(0, 0))
-  sstore(3, div(1, 2))
-  sstore(4, div(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 1))
-  sstore(5, div(
-    0x8000000000000000000000000000000000000000000000000000000000000000, 1
-  ))
-  sstore(6, div(not(0), 1))
-  sstore(7, div(0xffffffffffffffffffffffffffffffff, 1))
-  sstore(8, div(0xffffffffffffffff, 1))
-  sstore(9, div(0xffffffffffffffffffffffffffffffff0000000000000000, 1))
-  sstore(10, div(0xffffffffffffffffffffffffffffffffffffffffffffffff, 3))
-  sstore(11, div(0xffffffffffffffffffffffffffffffff, 3))
-  sstore(12, div(0xffffffffffffffff, 3))
-  sstore(13, div(0xffffffffffffffffffffffffffffffff0000000000000000, 3))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000000d
-//     20: 0000000000000000555555555555555555555555555555550000000000000000
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000004: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-//   0000000000000000000000000000000000000000000000000000000000000005: 8000000000000000000000000000000000000000000000000000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000006: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000007: 00000000000000000000000000000000ffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000008: 000000000000000000000000000000000000000000000000ffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000009: 0000000000000000ffffffffffffffffffffffffffffffff0000000000000000
-//   000000000000000000000000000000000000000000000000000000000000000a: 0000000000000000555555555555555555555555555555555555555555555555
-//   000000000000000000000000000000000000000000000000000000000000000b: 0000000000000000000000000000000055555555555555555555555555555555
-//   000000000000000000000000000000000000000000000000000000000000000c: 0000000000000000000000000000000000000000000000005555555555555555
-//   000000000000000000000000000000000000000000000000000000000000000d: 0000000000000000555555555555555555555555555555550000000000000000
diff --git a/test/libyul/ewasmTranslationTests/arithmetic_exp.yul b/test/libyul/ewasmTranslationTests/arithmetic_exp.yul
deleted file mode 100644
index 6428e73437..0000000000
--- a/test/libyul/ewasmTranslationTests/arithmetic_exp.yul
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  sstore(0, exp(0, 1))
-  sstore(1, exp(1, not(0)))
-  sstore(2, exp(0, 0))
-  sstore(3, exp(1, 2))
-  sstore(4, exp(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 1))
-  sstore(5, exp(
-    0x8000000000000000000000000000000000000000000000000000000000000000, 1
-  ))
-  sstore(6, exp(not(0), 1))
-  sstore(7, exp(0xffffffffffffffffffffffffffffffff, 2))
-  sstore(8, exp(0xffffffffffffffff, 2))
-  sstore(9, exp(0xffffffffffffffffffffffffffffffff0000000000000000, 2))
-  sstore(10, exp(0xffffffffffffffffffffffffffffffffffffffffffffffff, 3))
-  sstore(11, exp(0xffffffffffffffffffffffffffffffff, 3))
-  sstore(12, exp(0xffffffffffffffff, 3))
-  sstore(13, exp(0xffffffffffffffffffffffffffffffff0000000000000000, 3))
-  sstore(14, exp(2, 256))
-  sstore(15, exp(2, 255))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000000f
-//     20: 8000000000000000000000000000000000000000000000000000000000000000
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000002: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000003: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000004: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-//   0000000000000000000000000000000000000000000000000000000000000005: 8000000000000000000000000000000000000000000000000000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000006: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000007: fffffffffffffffffffffffffffffffe00000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000008: 00000000000000000000000000000000fffffffffffffffe0000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000009: 0000000000000000000000000000000100000000000000000000000000000000
-//   000000000000000000000000000000000000000000000000000000000000000a: 0000000000000002ffffffffffffffffffffffffffffffffffffffffffffffff
-//   000000000000000000000000000000000000000000000000000000000000000b: 00000000000000000000000000000002ffffffffffffffffffffffffffffffff
-//   000000000000000000000000000000000000000000000000000000000000000c: 0000000000000000fffffffffffffffd0000000000000002ffffffffffffffff
-//   000000000000000000000000000000000000000000000000000000000000000d: ffffffffffffffff000000000000000000000000000000000000000000000000
-//   000000000000000000000000000000000000000000000000000000000000000f: 8000000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libyul/ewasmTranslationTests/arithmetic_mod.yul b/test/libyul/ewasmTranslationTests/arithmetic_mod.yul
deleted file mode 100644
index 38cc808bf4..0000000000
--- a/test/libyul/ewasmTranslationTests/arithmetic_mod.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  sstore(0, mod(0, 1))
-  sstore(1, mod(1, not(0)))
-  sstore(2, mod(0, 0))
-  sstore(3, mod(1, 2))
-  sstore(4, mod(not(0), 1))
-  sstore(5, mod(
-    0x8000000000000000000000000000000000000000000000000000000000000000, 1
-  ))
-  sstore(6, mod(not(0), 1))
-  sstore(7, mod(0xffffffffffffffffffffffffffffffff, 1))
-  sstore(8, mod(0xffffffffffffffffffffffffffffffffffffffffffffffff, 0xfffffffffffffffffffffffffffffffe))
-  sstore(9, mod(0xffffffffffffffffffffffffffffffffffffffffffffffff, 5))
-  sstore(10, mod(0xffffffffffffffffffffffffffffffffffffffffffffffff, 4))
-  sstore(11, mod(0xffffffffffffffffffffffffffffffff, 3))
-  sstore(12, mod(0xffffffffffffffff, 3))
-  sstore(13, mod(0xffffffffffffffffffffffffffffffff0000000000000000, 0xffffffffffffffff43342553000))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000000d
-//     20: 0000000000000000000000000000000000000aacffffffff8b3c03a314db9000
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000003: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000008: 000000000000000000000000000000000000000000000001ffffffffffffffff
-//   000000000000000000000000000000000000000000000000000000000000000a: 0000000000000000000000000000000000000000000000000000000000000003
-//   000000000000000000000000000000000000000000000000000000000000000d: 0000000000000000000000000000000000000aacffffffff8b3c03a314db9000
diff --git a/test/libyul/ewasmTranslationTests/arithmetic_mul.yul b/test/libyul/ewasmTranslationTests/arithmetic_mul.yul
deleted file mode 100644
index 73e1bf3d86..0000000000
--- a/test/libyul/ewasmTranslationTests/arithmetic_mul.yul
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  sstore(0, mul(0, 1))
-  sstore(1, mul(1, not(0)))
-  sstore(2, mul(0, 0))
-  sstore(3, mul(1, 2))
-  sstore(4, mul(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 1))
-  sstore(5, mul(
-    0x8000000000000000000000000000000000000000000000000000000000000000, 1
-  ))
-  sstore(6, mul(not(0), 1))
-  sstore(7, mul(0xffffffffffffffffffffffffffffffff, 1))
-  sstore(8, mul(0xffffffffffffffff, 1))
-  sstore(9, mul(0xffffffffffffffffffffffffffffffff0000000000000000, 1))
-  sstore(10, mul(0xffffffffffffffffffffffffffffffffffffffffffffffff, 3))
-  sstore(11, mul(0xffffffffffffffffffffffffffffffff, 3))
-  sstore(12, mul(0xffffffffffffffff, 3))
-  sstore(13, mul(0xffffffffffffffffffffffffffffffff0000000000000000, 3))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000000d
-//     20: 0000000000000002fffffffffffffffffffffffffffffffd0000000000000000
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000003: 0000000000000000000000000000000000000000000000000000000000000002
-//   0000000000000000000000000000000000000000000000000000000000000004: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-//   0000000000000000000000000000000000000000000000000000000000000005: 8000000000000000000000000000000000000000000000000000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000006: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000007: 00000000000000000000000000000000ffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000008: 000000000000000000000000000000000000000000000000ffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000009: 0000000000000000ffffffffffffffffffffffffffffffff0000000000000000
-//   000000000000000000000000000000000000000000000000000000000000000a: 0000000000000002fffffffffffffffffffffffffffffffffffffffffffffffd
-//   000000000000000000000000000000000000000000000000000000000000000b: 00000000000000000000000000000002fffffffffffffffffffffffffffffffd
-//   000000000000000000000000000000000000000000000000000000000000000c: 000000000000000000000000000000000000000000000002fffffffffffffffd
-//   000000000000000000000000000000000000000000000000000000000000000d: 0000000000000002fffffffffffffffffffffffffffffffd0000000000000000
diff --git a/test/libyul/ewasmTranslationTests/arithmetic_mulmod.yul b/test/libyul/ewasmTranslationTests/arithmetic_mulmod.yul
deleted file mode 100644
index ef6efafd42..0000000000
--- a/test/libyul/ewasmTranslationTests/arithmetic_mulmod.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  sstore(0, mulmod(0, 1, 2))
-  sstore(1, mulmod(1, not(0), 5))
-  sstore(2, mulmod(0, 0, 5))
-  sstore(3, mulmod(1, 3, 2))
-  sstore(4, mulmod(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe,
-    1,
-    0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
-  sstore(5, mulmod(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 1, 1))
-  sstore(6, mulmod(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe, 1, 0))
-  sstore(7, mulmod(0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd, 1, 5))
-  sstore(8, mulmod(
-    not(0),
-    0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe,
-    25
-  ))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000008
-//     20: 000000000000000000000000000000000000000000000000000000000000000f
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000003: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000004: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-//   0000000000000000000000000000000000000000000000000000000000000007: 0000000000000000000000000000000000000000000000000000000000000003
-//   0000000000000000000000000000000000000000000000000000000000000008: 000000000000000000000000000000000000000000000000000000000000000f
diff --git a/test/libyul/ewasmTranslationTests/arithmetic_sdiv.yul b/test/libyul/ewasmTranslationTests/arithmetic_sdiv.yul
deleted file mode 100644
index 0cefb34058..0000000000
--- a/test/libyul/ewasmTranslationTests/arithmetic_sdiv.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  sstore(0, sdiv(0, 1))
-  sstore(1, sdiv(0, not(0)))
-  sstore(2, sdiv(0, 0))
-  sstore(3, sdiv(1, 2))
-  sstore(4, sdiv(not(0), 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe))
-  sstore(5, sdiv(0x8000000000000000000000000000000000000000000000000000000000000000, not(0)))
-  sstore(6, sdiv(not(0), 0x8000000000000000000000000000000000000000000000000000000000000000))
-  sstore(7, sdiv(0x7000000000000000000000000000000000000000000000000000000000000000, 1))
-  sstore(8, sdiv(1, 0x7000000000000000000000000000000000000000000000000000000000000000))
-  sstore(9, sdiv(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, not(0)))
-  sstore(10, sdiv(not(0), 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
-  sstore(11, sdiv(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 1))
-  sstore(12, sdiv(not(0), not(0)))
-  sstore(13, sdiv(
-    0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe,
-    0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-  ))
-  sstore(14, sdiv(0x8000000000000000000000000000000000000000000000000000000000000001, not(0)))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000000e
-//     20: 7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000005: 8000000000000000000000000000000000000000000000000000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000007: 7000000000000000000000000000000000000000000000000000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000009: 8000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000b: 7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   000000000000000000000000000000000000000000000000000000000000000c: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000d: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000e: 7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libyul/ewasmTranslationTests/arithmetic_smod.yul b/test/libyul/ewasmTranslationTests/arithmetic_smod.yul
deleted file mode 100644
index cffb8f73d3..0000000000
--- a/test/libyul/ewasmTranslationTests/arithmetic_smod.yul
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  sstore(0, smod(0, 1))
-  sstore(1, smod(1, not(0)))
-  sstore(2, smod(0, 0))
-  sstore(3, smod(1, 2))
-  sstore(4, smod(not(0), 1))
-  sstore(5, smod(
-    0x8000000000000000000000000000000000000000000000000000000000000000, 1
-  ))
-  sstore(6, smod(not(0), 1))
-  sstore(7, smod(0xffffffffffffffffffffffffffffffff, 1))
-  sstore(8, smod(0xffffffffffffffffffffffffffffffffffffffffffffffff, 0xfffffffffffffffffffffffffffffffe))
-  sstore(9, smod(0xffffffffffffffffffffffffffffffffffffffffffffffff, 5))
-  sstore(10, smod(0xffffffffffffffffffffffffffffffffffffffffffffffff, 4))
-  sstore(11, smod(0xffffffffffffffffffffffffffffffff, 3))
-  sstore(12, smod(0xffffffffffffffff, 3))
-  sstore(13, smod(0xffffffffffffffffffffffffffffffff0000000000000000, 0xffffffffffffffff43342553000))
-  sstore(14, smod(
-    0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd,
-    0xffffffffffffffff43342553000
-  ))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000000e
-//     20: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000003: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000008: 000000000000000000000000000000000000000000000001ffffffffffffffff
-//   000000000000000000000000000000000000000000000000000000000000000a: 0000000000000000000000000000000000000000000000000000000000000003
-//   000000000000000000000000000000000000000000000000000000000000000d: 0000000000000000000000000000000000000aacffffffff8b3c03a314db9000
-//   000000000000000000000000000000000000000000000000000000000000000e: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd
diff --git a/test/libyul/ewasmTranslationTests/arithmetic_sub.yul b/test/libyul/ewasmTranslationTests/arithmetic_sub.yul
deleted file mode 100644
index fefb5d6824..0000000000
--- a/test/libyul/ewasmTranslationTests/arithmetic_sub.yul
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  sstore(0, sub(0, 1))
-  sstore(1, sub(1, not(0)))
-  sstore(2, sub(0, 0))
-  sstore(3, sub(1, 2))
-  sstore(4, sub(0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 1))
-  sstore(5, sub(
-    0x8000000000000000000000000000000000000000000000000000000000000000, 1
-  ))
-  sstore(6, sub(not(0), 1))
-  sstore(7, sub(not(0), not(0)))
-  sstore(8, sub(0x1000000000000000000000000000000000000000000000000, 1))
-  sstore(9, sub(0x100000000000000000000000000000000, 1))
-  sstore(10, sub(0x10000000000000000, 1))
-  sstore(11, sub(0x1000000000000000000000000000000000000000000000000, 3))
-  sstore(12, sub(0x100000000000000000000000000000000, 3))
-  sstore(13, sub(0x10000000000000000, 3))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000000d
-//     20: 000000000000000000000000000000000000000000000000fffffffffffffffd
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000002
-//   0000000000000000000000000000000000000000000000000000000000000003: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000004: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-//   0000000000000000000000000000000000000000000000000000000000000005: 7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000006: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe
-//   0000000000000000000000000000000000000000000000000000000000000008: 0000000000000000ffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000009: 00000000000000000000000000000000ffffffffffffffffffffffffffffffff
-//   000000000000000000000000000000000000000000000000000000000000000a: 000000000000000000000000000000000000000000000000ffffffffffffffff
-//   000000000000000000000000000000000000000000000000000000000000000b: 0000000000000000fffffffffffffffffffffffffffffffffffffffffffffffd
-//   000000000000000000000000000000000000000000000000000000000000000c: 00000000000000000000000000000000fffffffffffffffffffffffffffffffd
-//   000000000000000000000000000000000000000000000000000000000000000d: 000000000000000000000000000000000000000000000000fffffffffffffffd
diff --git a/test/libyul/ewasmTranslationTests/balance.yul b/test/libyul/ewasmTranslationTests/balance.yul
deleted file mode 100644
index f8bb5017ae..0000000000
--- a/test/libyul/ewasmTranslationTests/balance.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  sstore(0, balance(address()))
-  sstore(1, balance(0))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000001
-//     20: 0000000000000000000000000000000000000000000000000000000022222222
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000022222222
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000022222222
diff --git a/test/libyul/ewasmTranslationTests/bitwise_and.yul b/test/libyul/ewasmTranslationTests/bitwise_and.yul
deleted file mode 100644
index 6d5bfbb237..0000000000
--- a/test/libyul/ewasmTranslationTests/bitwise_and.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  sstore(0, and(not(0), 0))
-  sstore(1, and(not(0), not(0)))
-  sstore(2, and(not(0), 0xffffffffffffffff))
-  sstore(3, and(not(0), 0xffffffffffffffffff00000000000000))
-  sstore(4, and(not(0), 0xffffffffffffffffff00000000000000ffffffffffffffff))
-  sstore(5, and(not(0), 0xffffffffffffffffff00000000000000ffffffffffffffff0000000000000000))
-  sstore(6, and(not(0), 0xaaaaaaaaaaaaaa555555555555555555aa5555555555555aa555555555555555))
-  sstore(7, and(
-    0x5555555555550000aaaaaaaaaaaaaa000000aaaaaaaaa000000aaaaaaaaaaaaa,
-    0xaaaaaaaaaaaaaa555555555555555555aa5555555555555aa555555555555555
-  ))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000007
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000002: 000000000000000000000000000000000000000000000000ffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000003: 00000000000000000000000000000000ffffffffffffffffff00000000000000
-//   0000000000000000000000000000000000000000000000000000000000000004: 0000000000000000ffffffffffffffffff00000000000000ffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000005: ffffffffffffffffff00000000000000ffffffffffffffff0000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000006: aaaaaaaaaaaaaa555555555555555555aa5555555555555aa555555555555555
diff --git a/test/libyul/ewasmTranslationTests/bitwise_not.yul b/test/libyul/ewasmTranslationTests/bitwise_not.yul
deleted file mode 100644
index 706d810b4a..0000000000
--- a/test/libyul/ewasmTranslationTests/bitwise_not.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  sstore(0, not(0))
-  sstore(1, not(not(0)))
-  sstore(2, not(0xffffffffffffffff))
-  sstore(3, not(0xffffffffffffffffff00000000000000))
-  sstore(4, not(0xffffffffffffffffff00000000000000ffffffffffffffff))
-  sstore(5, not(0xffffffffffffffffff00000000000000ffffffffffffffff0000000000000000))
-  sstore(6, not(0xaaaaaaaaaaaaaa555555555555555555aa5555555555555aa555555555555555))
-  sstore(7, not(0x5555555555550000aaaaaaaaaaaaaa000000aaaaaaaaa000000aaaaaaaaaaaaa))
-  sstore(8, not(0xaaaaaaaaaaaaaa555555555555555555aa5555555555555aa555555555555555))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000008
-//     20: 55555555555555aaaaaaaaaaaaaaaaaa55aaaaaaaaaaaaa55aaaaaaaaaaaaaaa
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000002: ffffffffffffffffffffffffffffffffffffffffffffffff0000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000003: ffffffffffffffffffffffffffffffff000000000000000000ffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000004: ffffffffffffffff000000000000000000ffffffffffffff0000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000005: 000000000000000000ffffffffffffff0000000000000000ffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000006: 55555555555555aaaaaaaaaaaaaaaaaa55aaaaaaaaaaaaa55aaaaaaaaaaaaaaa
-//   0000000000000000000000000000000000000000000000000000000000000007: aaaaaaaaaaaaffff55555555555555ffffff555555555ffffff5555555555555
-//   0000000000000000000000000000000000000000000000000000000000000008: 55555555555555aaaaaaaaaaaaaaaaaa55aaaaaaaaaaaaa55aaaaaaaaaaaaaaa
diff --git a/test/libyul/ewasmTranslationTests/bitwise_or.yul b/test/libyul/ewasmTranslationTests/bitwise_or.yul
deleted file mode 100644
index d9d645d86a..0000000000
--- a/test/libyul/ewasmTranslationTests/bitwise_or.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  sstore(0, or(0, 0))
-  sstore(1, or(0, not(0)))
-  sstore(2, or(0, 0xffffffffffffffff))
-  sstore(3, or(0, 0xffffffffffffffffff00000000000000))
-  sstore(4, or(0, 0xffffffffffffffffff00000000000000ffffffffffffffff))
-  sstore(5, or(0, 0xffffffffffffffffff00000000000000ffffffffffffffff0000000000000000))
-  sstore(6, or(0, 0xaaaaaaaaaaaaaa555555555555555555aa5555555555555aa555555555555555))
-  sstore(7, or(
-    0x5555555555550000aaaaaaaaaaaaaa000000aaaaaaaaa000000aaaaaaaaaaaaa,
-    0xaaaaaaaaaaaaaa555555555555555555aa5555555555555aa555555555555555
-  ))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000007
-//     20: ffffffffffffaa55ffffffffffffff55aa55fffffffff55aa55fffffffffffff
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000002: 000000000000000000000000000000000000000000000000ffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000003: 00000000000000000000000000000000ffffffffffffffffff00000000000000
-//   0000000000000000000000000000000000000000000000000000000000000004: 0000000000000000ffffffffffffffffff00000000000000ffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000005: ffffffffffffffffff00000000000000ffffffffffffffff0000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000006: aaaaaaaaaaaaaa555555555555555555aa5555555555555aa555555555555555
-//   0000000000000000000000000000000000000000000000000000000000000007: ffffffffffffaa55ffffffffffffff55aa55fffffffff55aa55fffffffffffff
diff --git a/test/libyul/ewasmTranslationTests/bitwise_xor.yul b/test/libyul/ewasmTranslationTests/bitwise_xor.yul
deleted file mode 100644
index b358bacb5f..0000000000
--- a/test/libyul/ewasmTranslationTests/bitwise_xor.yul
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  sstore(0, xor(0xffff, 0))
-  sstore(1, xor(0xffff, not(0)))
-  sstore(2, xor(0xffff, 0xffffffffffffffff))
-  sstore(3, xor(0xffff, 0xffffffffffffffffff00000000000000))
-  sstore(4, xor(0xffff, 0xffffffffffffffffff00000000000000ffffffffffffffff))
-  sstore(5, xor(0xffff, 0xffffffffffffffffff00000000000000ffffffffffffffff0000000000000000))
-  sstore(6, xor(0xffff, 0xaaaaaaaaaaaaaa555555555555555555aa5555555555555aa555555555555555))
-  sstore(7, xor(
-    0x5555555555550000aaaaaaaaaaaaaa000000aaaaaaaaa000000aaaaaaaaaaaaa,
-    0xaaaaaaaaaaaaaa555555555555555555aa5555555555555aa555555555555555
-  ))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000007
-//     20: ffffffffffffaa55ffffffffffffff55aa55fffffffff55aa55fffffffffffff
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 000000000000000000000000000000000000000000000000000000000000ffff
-//   0000000000000000000000000000000000000000000000000000000000000001: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000
-//   0000000000000000000000000000000000000000000000000000000000000002: 000000000000000000000000000000000000000000000000ffffffffffff0000
-//   0000000000000000000000000000000000000000000000000000000000000003: 00000000000000000000000000000000ffffffffffffffffff0000000000ffff
-//   0000000000000000000000000000000000000000000000000000000000000004: 0000000000000000ffffffffffffffffff00000000000000ffffffffffff0000
-//   0000000000000000000000000000000000000000000000000000000000000005: ffffffffffffffffff00000000000000ffffffffffffffff000000000000ffff
-//   0000000000000000000000000000000000000000000000000000000000000006: aaaaaaaaaaaaaa555555555555555555aa5555555555555aa55555555555aaaa
-//   0000000000000000000000000000000000000000000000000000000000000007: ffffffffffffaa55ffffffffffffff55aa55fffffffff55aa55fffffffffffff
diff --git a/test/libyul/ewasmTranslationTests/blockhash.yul b/test/libyul/ewasmTranslationTests/blockhash.yul
deleted file mode 100644
index 8b906232f2..0000000000
--- a/test/libyul/ewasmTranslationTests/blockhash.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, blockhash(1023))
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 00000000000000000000000000000000000000000000000000000000aaaaa9a9
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 00000000000000000000000000000000000000000000000000000000aaaaa9a9
diff --git a/test/libyul/ewasmTranslationTests/calldatacopy.yul b/test/libyul/ewasmTranslationTests/calldatacopy.yul
deleted file mode 100644
index 0d7d57af0d..0000000000
--- a/test/libyul/ewasmTranslationTests/calldatacopy.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  calldatacopy(0, 0, 32)
-  sstore(0, mload(0))
-}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/calldataload.yul b/test/libyul/ewasmTranslationTests/calldataload.yul
deleted file mode 100644
index f0b4008f6b..0000000000
--- a/test/libyul/ewasmTranslationTests/calldataload.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  sstore(0, calldataload(0))
-}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/calldatasize.yul b/test/libyul/ewasmTranslationTests/calldatasize.yul
deleted file mode 100644
index 229f6b4614..0000000000
--- a/test/libyul/ewasmTranslationTests/calldatasize.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  sstore(0, calldatasize())
-}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/caller.yul b/test/libyul/ewasmTranslationTests/caller.yul
deleted file mode 100644
index 1abb288d50..0000000000
--- a/test/libyul/ewasmTranslationTests/caller.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, caller())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000044444444
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000044444444
diff --git a/test/libyul/ewasmTranslationTests/callvalue.yul b/test/libyul/ewasmTranslationTests/callvalue.yul
deleted file mode 100644
index 5d34b58b67..0000000000
--- a/test/libyul/ewasmTranslationTests/callvalue.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, callvalue())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000055555555
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000055555555
diff --git a/test/libyul/ewasmTranslationTests/chainid.yul b/test/libyul/ewasmTranslationTests/chainid.yul
deleted file mode 100644
index 73a82f4423..0000000000
--- a/test/libyul/ewasmTranslationTests/chainid.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  sstore(0, chainid())
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// Trace:
-//   INVALID()
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/codecopy.yul b/test/libyul/ewasmTranslationTests/codecopy.yul
deleted file mode 100644
index 5b980c6b1c..0000000000
--- a/test/libyul/ewasmTranslationTests/codecopy.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  codecopy(0x100, 0, codesize())
-  sstore(0, mload(0x100))
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 636f6465636f6465636f6465636f6465636f6465000000000000000000000000
-//    140: 636f6465636f6465636f6465636f6465636f6465000000000000000000000000
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 636f6465636f6465636f6465636f6465636f6465000000000000000000000000
diff --git a/test/libyul/ewasmTranslationTests/codesize.yul b/test/libyul/ewasmTranslationTests/codesize.yul
deleted file mode 100644
index ae96335fab..0000000000
--- a/test/libyul/ewasmTranslationTests/codesize.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, codesize())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000000000014
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000014
diff --git a/test/libyul/ewasmTranslationTests/coinbase.yul b/test/libyul/ewasmTranslationTests/coinbase.yul
deleted file mode 100644
index b83e298f54..0000000000
--- a/test/libyul/ewasmTranslationTests/coinbase.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, coinbase())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000077777777
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000077777777
diff --git a/test/libyul/ewasmTranslationTests/comparison_eq.yul b/test/libyul/ewasmTranslationTests/comparison_eq.yul
deleted file mode 100644
index d65d49cf90..0000000000
--- a/test/libyul/ewasmTranslationTests/comparison_eq.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  sstore(0, eq(0, 0))
-  sstore(1, eq(not(0), not(0)))
-  sstore(2, eq(0, not(0)))
-  sstore(3, eq(not(0), 0xffffffffffffffff))
-  sstore(4, eq(0xfffffffffffffff000000000000000, 0xfffffffffffffff000000000000000))
-  sstore(5, eq(0x000000000000000fffffffffffffff, 0xfffffffffffffff000000000000000))
-  sstore(6, eq(0xfffffffffffffff000000000000000fffffffffffffff, 0xfffffffffffffff000000000000000fffffffffffffff))
-  sstore(7, eq(0xfffffffffffffff000000000000000fffffffffffffff, 0x000000000000000ffffffffffffffffffffffffffffff))
-  sstore(8, eq(
-    0xaaaaaaaaaaaaaaaa5555555555555555ffffffffffffffff0000000000000000,
-    0xaaaaaaaaaaaaaaaa5555555555555555ffffffffffffffff0000000000000000
-  ))
-  sstore(9, eq(
-    0xaaaaaaaaaaaaaaaa6666666666666666ffffffffffffffff0000000000000000,
-    0xaaaaaaaaaaaaaaaa5555555555555555ffffffffffffffff0000000000000000
-   ))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000009
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000004: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000006: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000008: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/ewasmTranslationTests/comparison_gt.yul b/test/libyul/ewasmTranslationTests/comparison_gt.yul
deleted file mode 100644
index bda8b94e14..0000000000
--- a/test/libyul/ewasmTranslationTests/comparison_gt.yul
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  sstore(0, gt(1, 0))
-  sstore(1, gt(0, 1))
-  sstore(2, gt(0, 0))
-  sstore(3, gt(not(0), 0xffffffffffffffff))
-  sstore(4, gt(0xffffffffffffffff, not(0)))
-  sstore(5, gt(not(0), not(0)))
-  sstore(6, gt(not(0), 0xffffffffffffffff0000000000000000))
-  sstore(7, gt(0xffffffffffffffff0000000000000000, not(0)))
-  sstore(8, gt(0xffffffffffffffff0000000000000000, 0xffffffffffffffff0000000000000000))
-  sstore(9, gt(not(0), 0xffffffffffffffff0000000000000000ffffffffffffffff))
-  sstore(10, gt(0xffffffffffffffff0000000000000000ffffffffffffffff, not(0)))
-  sstore(11, gt(0xffffffffffffffff0000000000000000ffffffffffffffff, 0xffffffffffffffff0000000000000000ffffffffffffffff))
-  sstore(12, gt(not(0), 0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000000))
-  sstore(13, gt(0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000000, not(0)))
-  sstore(14, gt(
-    0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000000,
-    0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000000)
-  )
-  sstore(15, gt(
-      0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000001,
-      0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000000)
-  )
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000000f
-//     20: 0000000000000000000000000000000000000000000000000000000000000001
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000003: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000006: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000009: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000c: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000f: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/ewasmTranslationTests/comparison_lt.yul b/test/libyul/ewasmTranslationTests/comparison_lt.yul
deleted file mode 100644
index be57da46e3..0000000000
--- a/test/libyul/ewasmTranslationTests/comparison_lt.yul
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  sstore(0, lt(1, 0))
-  sstore(1, lt(0, 1))
-  sstore(2, lt(0, 0))
-  sstore(3, lt(not(0), 0xffffffffffffffff))
-  sstore(4, lt(0xffffffffffffffff, not(0)))
-  sstore(5, lt(not(0), not(0)))
-  sstore(6, lt(not(0), 0xffffffffffffffff0000000000000000))
-  sstore(7, lt(0xffffffffffffffff0000000000000000, not(0)))
-  sstore(8, lt(0xffffffffffffffff0000000000000000, 0xffffffffffffffff0000000000000000))
-  sstore(9, lt(not(0), 0xffffffffffffffff0000000000000000ffffffffffffffff))
-  sstore(10, lt(0xffffffffffffffff0000000000000000ffffffffffffffff, not(0)))
-  sstore(11, lt(0xffffffffffffffff0000000000000000ffffffffffffffff, 0xffffffffffffffff0000000000000000ffffffffffffffff))
-  sstore(12, lt(not(0), 0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000000))
-  sstore(13, lt(0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000000, not(0)))
-  sstore(14, lt(
-    0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000000,
-    0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000000)
-  )
-  sstore(15, lt(
-      0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000000,
-      0xffffffffffffffff0000000000000000ffffffffffffffff0000000000000001)
-  )
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 000000000000000000000000000000000000000000000000000000000000000f
-//     20: 0000000000000000000000000000000000000000000000000000000000000001
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000004: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000007: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000a: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000d: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000f: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/ewasmTranslationTests/comparison_sgt.yul b/test/libyul/ewasmTranslationTests/comparison_sgt.yul
deleted file mode 100644
index 60def7e31e..0000000000
--- a/test/libyul/ewasmTranslationTests/comparison_sgt.yul
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  sstore(0, sgt(0, 1))
-  sstore(1, sgt(0, not(0)))
-  sstore(2, sgt(0, 0))
-  sstore(3, sgt(1, 2))
-  sstore(4, sgt(not(0), 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe))
-  sstore(5, sgt(0x8000000000000000000000000000000000000000000000000000000000000000, not(0)))
-  sstore(6, sgt(not(0), 0x8000000000000000000000000000000000000000000000000000000000000000))
-  sstore(7, sgt(0x7000000000000000000000000000000000000000000000000000000000000000, 1))
-  sstore(8, sgt(1, 0x7000000000000000000000000000000000000000000000000000000000000000))
-  sstore(9, sgt(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, not(0)))
-  sstore(10, sgt(not(0), 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
-  sstore(11, sgt(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 1))
-  sstore(12, sgt(1, 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
-  sstore(13, sgt(
-    0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-    0x8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-  ))
-  sstore(14, sgt(
-    0x8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-    0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-  ))
-  sstore(15, sgt(
-    0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-    not(0)
-  ))
-  sstore(16, sgt(
-    not(0),
-    0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-  ))
-  sstore(17, sgt(
-    not(0),
-    0x8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-  ))
-  sstore(18, sgt(
-    0x8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-    not(0)
-  ))
-
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000012
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000004: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000006: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000007: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000009: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000b: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000d: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000f: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000011: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/ewasmTranslationTests/comparison_slt.yul b/test/libyul/ewasmTranslationTests/comparison_slt.yul
deleted file mode 100644
index 577f6e9f1f..0000000000
--- a/test/libyul/ewasmTranslationTests/comparison_slt.yul
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  sstore(0, slt(0, 1))
-  sstore(1, slt(0, not(0)))
-  sstore(2, slt(0, 0))
-  sstore(3, slt(1, 2))
-  sstore(4, slt(not(0), 0xfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffe))
-  sstore(5, slt(0x8000000000000000000000000000000000000000000000000000000000000000, not(0)))
-  sstore(6, slt(not(0), 0x8000000000000000000000000000000000000000000000000000000000000000))
-  sstore(7, slt(0x7000000000000000000000000000000000000000000000000000000000000000, 1))
-  sstore(8, slt(1, 0x7000000000000000000000000000000000000000000000000000000000000000))
-  sstore(9, slt(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, not(0)))
-  sstore(10, slt(not(0), 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
-  sstore(11, slt(0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff, 1))
-  sstore(12, slt(1, 0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff))
-  sstore(13, slt(
-    0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-    0x8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-  ))
-  sstore(14, slt(
-    0x8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-    0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-  ))
-  sstore(15, slt(
-    0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-    not(0)
-  ))
-  sstore(16, slt(
-    not(0),
-    0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-  ))
-  sstore(17, slt(
-    not(0),
-    0x8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-  ))
-  sstore(18, slt(
-    0x8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff,
-    not(0)
-  ))
-
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000012
-//     20: 0000000000000000000000000000000000000000000000000000000000000001
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000003: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000005: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000008: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000a: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000c: 0000000000000000000000000000000000000000000000000000000000000001
-//   000000000000000000000000000000000000000000000000000000000000000e: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000010: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000012: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/ewasmTranslationTests/datacopy.yul b/test/libyul/ewasmTranslationTests/datacopy.yul
deleted file mode 100644
index 8812e7c9be..0000000000
--- a/test/libyul/ewasmTranslationTests/datacopy.yul
+++ /dev/null
@@ -1,20 +0,0 @@
-object "main"
-{
-    code {
-        datacopy(0, and(dataoffset("main"), 15), and(datasize("main"), 15))
-        datacopy(32, and(dataoffset("sub"), 15), and(datasize("sub"), 15))
-        sstore(0, mload(0))
-        sstore(1, mload(32))
-    }
-    object "sub" { code { sstore(0, 1) } }
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000001
-//     20: 636f6465636f6465000000000000000000000000000000000000000000000000
-//     40: 6465636f00000000000000000000000000000000000000000000000000000000
-//     60: 636f6465636f6465000000000000000000000000000000000000000000000000
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 6465636f00000000000000000000000000000000000000000000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000001: 636f6465636f6465000000000000000000000000000000000000000000000000
diff --git a/test/libyul/ewasmTranslationTests/dataoffset.yul b/test/libyul/ewasmTranslationTests/dataoffset.yul
deleted file mode 100644
index d9dc12c9cd..0000000000
--- a/test/libyul/ewasmTranslationTests/dataoffset.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-object "main"
-{
-    code {
-        sstore(0, dataoffset("main"))
-        sstore(1, dataoffset("sub"))
-    }
-    object "sub" { code { sstore(0, 1) } }
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000001
-//     20: 000000000000000000000000000000000000000000000000000000000000070c
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 000000000000000000000000000000000000000000000000000000000000006e
-//   0000000000000000000000000000000000000000000000000000000000000001: 000000000000000000000000000000000000000000000000000000000000070c
diff --git a/test/libyul/ewasmTranslationTests/datasize.yul b/test/libyul/ewasmTranslationTests/datasize.yul
deleted file mode 100644
index 637c2c36de..0000000000
--- a/test/libyul/ewasmTranslationTests/datasize.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-object "main"
-{
-    code {
-        sstore(0, datasize("main"))
-        sstore(1, datasize("sub"))
-    }
-    object "sub" { code { sstore(0, 1) } }
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000001
-//     20: 0000000000000000000000000000000000000000000000000000000000000109
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000b64
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000109
diff --git a/test/libyul/ewasmTranslationTests/difficulty.yul b/test/libyul/ewasmTranslationTests/difficulty.yul
deleted file mode 100644
index 52e4275b43..0000000000
--- a/test/libyul/ewasmTranslationTests/difficulty.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  sstore(0, difficulty())
-}
-// ====
-// EVMVersion: <paris
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000009999999
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000009999999
diff --git a/test/libyul/ewasmTranslationTests/extcodecopy.yul b/test/libyul/ewasmTranslationTests/extcodecopy.yul
deleted file mode 100644
index 4fd0492812..0000000000
--- a/test/libyul/ewasmTranslationTests/extcodecopy.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  extcodecopy(address(), 0x100, 0, extcodesize(address()))
-  sstore(0, mload(0x100))
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 636f6465636f6465636f6465636f6465636f6465000000000000000000000000
-//    140: 636f6465636f6465636f6465636f6465636f6465000000000000000000000000
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 636f6465636f6465636f6465636f6465636f6465000000000000000000000000
diff --git a/test/libyul/ewasmTranslationTests/extcodehash.yul b/test/libyul/ewasmTranslationTests/extcodehash.yul
deleted file mode 100644
index 26bc4f8b48..0000000000
--- a/test/libyul/ewasmTranslationTests/extcodehash.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  sstore(0, extcodehash(address()))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-//   INVALID()
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000011111111
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/extcodesize.yul b/test/libyul/ewasmTranslationTests/extcodesize.yul
deleted file mode 100644
index fb12db5ea7..0000000000
--- a/test/libyul/ewasmTranslationTests/extcodesize.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, extcodesize(address()))
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 000000000000000000000000000000000000000000000000000000000000077b
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 000000000000000000000000000000000000000000000000000000000000077b
diff --git a/test/libyul/ewasmTranslationTests/gas.yul b/test/libyul/ewasmTranslationTests/gas.yul
deleted file mode 100644
index ef7125b262..0000000000
--- a/test/libyul/ewasmTranslationTests/gas.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, gas())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000000000099
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000099
diff --git a/test/libyul/ewasmTranslationTests/gaslimit.yul b/test/libyul/ewasmTranslationTests/gaslimit.yul
deleted file mode 100644
index d1d0cc2a83..0000000000
--- a/test/libyul/ewasmTranslationTests/gaslimit.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, gaslimit())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 00000000000000000000000000000000000000000000000000000000003d0900
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 00000000000000000000000000000000000000000000000000000000003d0900
diff --git a/test/libyul/ewasmTranslationTests/gasprice.yul b/test/libyul/ewasmTranslationTests/gasprice.yul
deleted file mode 100644
index 2c9d804520..0000000000
--- a/test/libyul/ewasmTranslationTests/gasprice.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, gasprice())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000066666666
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000066666666
diff --git a/test/libyul/ewasmTranslationTests/invalid.yul b/test/libyul/ewasmTranslationTests/invalid.yul
deleted file mode 100644
index c9844978ab..0000000000
--- a/test/libyul/ewasmTranslationTests/invalid.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  sstore(0, 0x1234)
-  mstore(1, 0)
-  invalid()
-  sstore(0, 0x5678)
-  mstore(1, 0xff)
-}
-// ----
-// Trace:
-//   INVALID()
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000000001234
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000001234
diff --git a/test/libyul/ewasmTranslationTests/iszero.yul b/test/libyul/ewasmTranslationTests/iszero.yul
deleted file mode 100644
index 5175e22451..0000000000
--- a/test/libyul/ewasmTranslationTests/iszero.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  let x := 0
-  let y := 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20
-  let z := 0x0000000000000000000111111111111111111111100000000000000000000000
-  sstore(0, iszero(x))
-  sstore(1, iszero(y))
-  sstore(2, iszero(z))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000002
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/ewasmTranslationTests/keccak256.yul b/test/libyul/ewasmTranslationTests/keccak256.yul
deleted file mode 100644
index 81a650345c..0000000000
--- a/test/libyul/ewasmTranslationTests/keccak256.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, keccak256(0, 0))
-  sstore(0, keccak256(0, 0x20))
-}
-// ----
-// Trace:
-//   INVALID()
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/log0.yul b/test/libyul/ewasmTranslationTests/log0.yul
deleted file mode 100644
index 6b02e598ba..0000000000
--- a/test/libyul/ewasmTranslationTests/log0.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  log0(0x20, 0x40)
-}
-// ----
-// Trace:
-//   LOG0()
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/log1.yul b/test/libyul/ewasmTranslationTests/log1.yul
deleted file mode 100644
index 296484bd75..0000000000
--- a/test/libyul/ewasmTranslationTests/log1.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  log1(0x20, 0x40, 0x60)
-}
-// ----
-// Trace:
-//   LOG1()
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/log2.yul b/test/libyul/ewasmTranslationTests/log2.yul
deleted file mode 100644
index 887fef66f7..0000000000
--- a/test/libyul/ewasmTranslationTests/log2.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  log2(0x20, 0x40, 0x60, 0x80)
-}
-// ----
-// Trace:
-//   LOG2()
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/log3.yul b/test/libyul/ewasmTranslationTests/log3.yul
deleted file mode 100644
index 8ff23e2bdb..0000000000
--- a/test/libyul/ewasmTranslationTests/log3.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  log3(0x20, 0x40, 0x60, 0x80, 0xa0)
-}
-// ----
-// Trace:
-//   LOG3()
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/log4.yul b/test/libyul/ewasmTranslationTests/log4.yul
deleted file mode 100644
index 152595e288..0000000000
--- a/test/libyul/ewasmTranslationTests/log4.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  log4(0x20, 0x40, 0x60, 0x80, 0xa0, 0xb0)
-}
-// ----
-// Trace:
-//   LOG4()
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/loop_break.yul b/test/libyul/ewasmTranslationTests/loop_break.yul
deleted file mode 100644
index b473988d5f..0000000000
--- a/test/libyul/ewasmTranslationTests/loop_break.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  let i := 0
-  for { } lt(i, 10) { i := add(i, 1) } {
-    if eq(i, 3) { break }
-  }
-  sstore(0, i)
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000000000003
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000003
diff --git a/test/libyul/ewasmTranslationTests/loop_continue.yul b/test/libyul/ewasmTranslationTests/loop_continue.yul
deleted file mode 100644
index 31200c2fe2..0000000000
--- a/test/libyul/ewasmTranslationTests/loop_continue.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  let i := 0
-  for { } lt(i, 10) { i := add(i, 1) } {
-    if eq(i, 3) { continue }
-    sstore(add(i, 0x10), i)
-  }
-  sstore(0, i)
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 000000000000000000000000000000000000000000000000000000000000000a
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 000000000000000000000000000000000000000000000000000000000000000a
-//   0000000000000000000000000000000000000000000000000000000000000011: 0000000000000000000000000000000000000000000000000000000000000001
-//   0000000000000000000000000000000000000000000000000000000000000012: 0000000000000000000000000000000000000000000000000000000000000002
-//   0000000000000000000000000000000000000000000000000000000000000014: 0000000000000000000000000000000000000000000000000000000000000004
-//   0000000000000000000000000000000000000000000000000000000000000015: 0000000000000000000000000000000000000000000000000000000000000005
-//   0000000000000000000000000000000000000000000000000000000000000016: 0000000000000000000000000000000000000000000000000000000000000006
-//   0000000000000000000000000000000000000000000000000000000000000017: 0000000000000000000000000000000000000000000000000000000000000007
-//   0000000000000000000000000000000000000000000000000000000000000018: 0000000000000000000000000000000000000000000000000000000000000008
-//   0000000000000000000000000000000000000000000000000000000000000019: 0000000000000000000000000000000000000000000000000000000000000009
diff --git a/test/libyul/ewasmTranslationTests/memoryguard.yul b/test/libyul/ewasmTranslationTests/memoryguard.yul
deleted file mode 100644
index 5aafc88d23..0000000000
--- a/test/libyul/ewasmTranslationTests/memoryguard.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  mstore(0x40, memoryguard(0x0102030405060708))
-  sstore(1, mload(0x40))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000001
-//     20: 0000000000000000000000000000000000000000000000000102030405060708
-//     80: 0000000000000000000000000000000000000000000000000102030405060708
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000102030405060708
diff --git a/test/libyul/ewasmTranslationTests/msize.yul b/test/libyul/ewasmTranslationTests/msize.yul
deleted file mode 100644
index b45b2aae07..0000000000
--- a/test/libyul/ewasmTranslationTests/msize.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  sstore(0, msize())
-  mstore(0x20, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20)
-  mstore(0x40, mload(0x20))
-  sstore(1, mload(0x40))
-  sstore(2, msize())
-}
-// ----
-// Trace:
-//   INVALID()
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/mstore8.yul b/test/libyul/ewasmTranslationTests/mstore8.yul
deleted file mode 100644
index 78d1018000..0000000000
--- a/test/libyul/ewasmTranslationTests/mstore8.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  mstore(0x30, not(0))
-  mstore8(0x20, 0xaa)
-  mstore8(0x26, 0xcc)
-  mstore8(0x3b, 0x11)
-  sstore(0, mload(0x20))
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: aa0000000000cc000000000000000000ffffffffffffffffffffff11ffffffff
-//     60: aa0000000000cc000000000000000000ffffffffffffffffffffff11ffffffff
-//     80: ffffffffffffffffffffffffffffffff00000000000000000000000000000000
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: aa0000000000cc000000000000000000ffffffffffffffffffffff11ffffffff
diff --git a/test/libyul/ewasmTranslationTests/mstore_mload.yul b/test/libyul/ewasmTranslationTests/mstore_mload.yul
deleted file mode 100644
index 95646abe25..0000000000
--- a/test/libyul/ewasmTranslationTests/mstore_mload.yul
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  mstore(0x20, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20)
-  mstore(0x40, mload(0x20))
-  sstore(1, mload(0x40))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000001
-//     20: 0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20
-//     60: 0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20
-//     80: 0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: 0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20
diff --git a/test/libyul/ewasmTranslationTests/number.yul b/test/libyul/ewasmTranslationTests/number.yul
deleted file mode 100644
index 83250247aa..0000000000
--- a/test/libyul/ewasmTranslationTests/number.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, number())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000000000400
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000400
diff --git a/test/libyul/ewasmTranslationTests/origin.yul b/test/libyul/ewasmTranslationTests/origin.yul
deleted file mode 100644
index 16fe9181f2..0000000000
--- a/test/libyul/ewasmTranslationTests/origin.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, origin())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000033333333
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000033333333
diff --git a/test/libyul/ewasmTranslationTests/return.yul b/test/libyul/ewasmTranslationTests/return.yul
deleted file mode 100644
index bb8b141708..0000000000
--- a/test/libyul/ewasmTranslationTests/return.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  mstore(0x20, 0x1234556677889900aa)
-  return(0x20, 30)
-  invalid()
-}
-// ----
-// Trace:
-//   RETURN() [000000000000000000000000000000000000000000000012345566778899]
-// Memory dump:
-//     60: 00000000000000000000000000000000000000000000001234556677889900aa
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/returndatacopy.yul b/test/libyul/ewasmTranslationTests/returndatacopy.yul
deleted file mode 100644
index c90b16f13c..0000000000
--- a/test/libyul/ewasmTranslationTests/returndatacopy.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  returndatacopy(0x100, 0, returndatasize())
-  sstore(0, mload(0x100))
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/returndatasize.yul b/test/libyul/ewasmTranslationTests/returndatasize.yul
deleted file mode 100644
index b6aea851d6..0000000000
--- a/test/libyul/ewasmTranslationTests/returndatasize.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, returndatasize())
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/revert.yul b/test/libyul/ewasmTranslationTests/revert.yul
deleted file mode 100644
index fbb5fc2720..0000000000
--- a/test/libyul/ewasmTranslationTests/revert.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  mstore(0x20, 0x1234556677889900aa)
-  revert(0x20, 30)
-  invalid()
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Trace:
-//   REVERT() [000000000000000000000000000000000000000000000012345566778899]
-// Memory dump:
-//     60: 00000000000000000000000000000000000000000000001234556677889900aa
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/selfbalance.yul b/test/libyul/ewasmTranslationTests/selfbalance.yul
deleted file mode 100644
index 32037fb5ac..0000000000
--- a/test/libyul/ewasmTranslationTests/selfbalance.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  sstore(0, selfbalance())
-}
-// ====
-// EVMVersion: >=istanbul
-// ----
-// Trace:
-//   INVALID()
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/selfdestruct.yul b/test/libyul/ewasmTranslationTests/selfdestruct.yul
deleted file mode 100644
index c000393fb7..0000000000
--- a/test/libyul/ewasmTranslationTests/selfdestruct.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  selfdestruct(0xffffffffffffffffffffffffffffffffffffffff)
-  invalid()
-}
-// ----
-// Trace:
-//   SELFDESTRUCT()
-// Memory dump:
-//      0: 000000000000000000000000ffffffffffffffffffffffffffffffffffffffff
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/shifts.yul b/test/libyul/ewasmTranslationTests/shifts.yul
deleted file mode 100644
index cf900dae23..0000000000
--- a/test/libyul/ewasmTranslationTests/shifts.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  let x := 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20
-  let y := shl(120, x)
-  let z := shr(136, y)
-  sstore(0, y)
-  sstore(1, z)
-  sstore(2, sar(136, 0x801112131415161718191a1b1c1d1e1f20000000000000000000000000000000))
-  sstore(3, sar(256, 0x801112131415161718191a1b1c1d1e1f20000000000000000000000000000000))
-  sstore(4, sar(136, 0x701112131415161718191a1b1c1d1e1f20000000000000000000000000000000))
-  sstore(5, sar(256, 0x701112131415161718191a1b1c1d1e1f20000000000000000000000000000000))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000005
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 101112131415161718191a1b1c1d1e1f20000000000000000000000000000000
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000101112131415161718191a1b1c1d1e
-//   0000000000000000000000000000000000000000000000000000000000000002: ffffffffffffffffffffffffffffffffff801112131415161718191a1b1c1d1e
-//   0000000000000000000000000000000000000000000000000000000000000003: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000004: 0000000000000000000000000000000000701112131415161718191a1b1c1d1e
diff --git a/test/libyul/ewasmTranslationTests/signextend.yul b/test/libyul/ewasmTranslationTests/signextend.yul
deleted file mode 100644
index f39d5926b9..0000000000
--- a/test/libyul/ewasmTranslationTests/signextend.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  sstore(0, signextend(0, 0x86))
-  sstore(1, signextend(0, 0x76))
-  sstore(2, signextend(32, not(0)))
-  sstore(3, signextend(5, 0xff8844553322))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000003
-//     20: ffffffffffffffffffffffffffffffffffffffffffffffffffffff8844553322
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff86
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000076
-//   0000000000000000000000000000000000000000000000000000000000000002: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000003: ffffffffffffffffffffffffffffffffffffffffffffffffffffff8844553322
diff --git a/test/libyul/ewasmTranslationTests/simple_mstore.yul b/test/libyul/ewasmTranslationTests/simple_mstore.yul
deleted file mode 100644
index dd9ac1d5ed..0000000000
--- a/test/libyul/ewasmTranslationTests/simple_mstore.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  mstore(0x20, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20)
-}
-// ----
-// Trace:
-// Memory dump:
-//     60: 0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f20
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/simple_sload.yul b/test/libyul/ewasmTranslationTests/simple_sload.yul
deleted file mode 100644
index 6d4131a99e..0000000000
--- a/test/libyul/ewasmTranslationTests/simple_sload.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  sstore(1, 7)
-  sstore(2, sub(0, 1))
-  sstore(3, sload(1))
-  sstore(4, sload(2))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000004
-//     20: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000007
-//   0000000000000000000000000000000000000000000000000000000000000002: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-//   0000000000000000000000000000000000000000000000000000000000000003: 0000000000000000000000000000000000000000000000000000000000000007
-//   0000000000000000000000000000000000000000000000000000000000000004: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libyul/ewasmTranslationTests/simple_sstore.yul b/test/libyul/ewasmTranslationTests/simple_sstore.yul
deleted file mode 100644
index 8fbb4923ae..0000000000
--- a/test/libyul/ewasmTranslationTests/simple_sstore.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  sstore(1, 7)
-  sstore(2, sub(0, 1))
-}
-// ----
-// Trace:
-// Memory dump:
-//      0: 0000000000000000000000000000000000000000000000000000000000000002
-//     20: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000007
-//   0000000000000000000000000000000000000000000000000000000000000002: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/test/libyul/ewasmTranslationTests/smoke.yul b/test/libyul/ewasmTranslationTests/smoke.yul
deleted file mode 100644
index f7f1a1aefb..0000000000
--- a/test/libyul/ewasmTranslationTests/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{}
-// ----
-// Trace:
-// Memory dump:
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/smoke_call.yul b/test/libyul/ewasmTranslationTests/smoke_call.yul
deleted file mode 100644
index 6d93770161..0000000000
--- a/test/libyul/ewasmTranslationTests/smoke_call.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  sstore(0, call(gas(), address(), 42, 0, 0x20, 0x20, 0x20))
-}
-// ----
-// Trace:
-//   CALL()
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000000000001
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/ewasmTranslationTests/smoke_callcode.yul b/test/libyul/ewasmTranslationTests/smoke_callcode.yul
deleted file mode 100644
index dd22ef2611..0000000000
--- a/test/libyul/ewasmTranslationTests/smoke_callcode.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  sstore(0, callcode(gas(), address(), 42, 0, 0x20, 0x20, 0x20))
-}
-// ----
-// Trace:
-//   CALLCODE()
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000000000001
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/ewasmTranslationTests/smoke_create.yul b/test/libyul/ewasmTranslationTests/smoke_create.yul
deleted file mode 100644
index 7650e9e6c1..0000000000
--- a/test/libyul/ewasmTranslationTests/smoke_create.yul
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  let size := codesize()
-  codecopy(0, 0, size)
-  sstore(0, create(42, 0, size))
-}
-// ----
-// Trace:
-//   CREATE()
-// Memory dump:
-//     40: 636f6465636f6465636f6465636f6465636f6465000000000000000000000000
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/smoke_create2.yul b/test/libyul/ewasmTranslationTests/smoke_create2.yul
deleted file mode 100644
index 32d789ea9a..0000000000
--- a/test/libyul/ewasmTranslationTests/smoke_create2.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  let size := codesize()
-  codecopy(0x40, 0, size)
-  sstore(0, create2(42, 0, size, 0x20))
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// Trace:
-//   INVALID()
-// Memory dump:
-//     80: 636f6465636f6465636f6465636f6465636f6465000000000000000000000000
-// Storage dump:
diff --git a/test/libyul/ewasmTranslationTests/smoke_delegatecall.yul b/test/libyul/ewasmTranslationTests/smoke_delegatecall.yul
deleted file mode 100644
index 30ad4b96d2..0000000000
--- a/test/libyul/ewasmTranslationTests/smoke_delegatecall.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  sstore(0, delegatecall(gas(), address(), 0, 0x20, 0x20, 0x20))
-}
-// ----
-// Trace:
-//   DELEGATECALL()
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000000000001
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/ewasmTranslationTests/smoke_staticcall.yul b/test/libyul/ewasmTranslationTests/smoke_staticcall.yul
deleted file mode 100644
index 25faaa9ee9..0000000000
--- a/test/libyul/ewasmTranslationTests/smoke_staticcall.yul
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  sstore(0, staticcall(gas(), address(), 0, 0x20, 0x20, 0x20))
-}
-// ====
-// EVMVersion: >=byzantium
-// ----
-// Trace:
-//   STATICCALL()
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000000000001
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/ewasmTranslationTests/timestamp.yul b/test/libyul/ewasmTranslationTests/timestamp.yul
deleted file mode 100644
index 9982590dfd..0000000000
--- a/test/libyul/ewasmTranslationTests/timestamp.yul
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  sstore(0, timestamp())
-}
-// ----
-// Trace:
-// Memory dump:
-//     20: 0000000000000000000000000000000000000000000000000000000088888888
-// Storage dump:
-//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000088888888
diff --git a/test/libyul/objectCompiler/wasm/no_main_function.yul b/test/libyul/objectCompiler/wasm/no_main_function.yul
deleted file mode 100644
index 2dd91a1662..0000000000
--- a/test/libyul/objectCompiler/wasm/no_main_function.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    function not_main() {
-        i64.drop(i64.add(0, 1))
-    }
-}
-// ====
-// wasm: true
-// ----
-// Text:
-// (module
-//     (memory $memory (export "memory") 1)
-//
-// (func $not_main
-//     (block $label_
-//         (drop (i64.add (i64.const 0) (i64.const 1)))
-//     )
-// )
-//
-// )
-//
-// Binary:
-// 0061736d01000000010401600000020100030201000503010001060100070a01066d656d6f727902000a0d010b000240420042017c1a0b0b
diff --git a/test/libyul/objectCompiler/wasm/simple.yul b/test/libyul/objectCompiler/wasm/simple.yul
deleted file mode 100644
index b158aea52b..0000000000
--- a/test/libyul/objectCompiler/wasm/simple.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-    function main() {
-        i64.drop(i64.add(0, 1))
-    }
-}
-// ====
-// wasm: true
-// ----
-// Text:
-// (module
-//     (memory $memory (export "memory") 1)
-//     (export "main" (func $main))
-//
-// (func $main
-//     (block $label_
-//         (drop (i64.add (i64.const 0) (i64.const 1)))
-//     )
-// )
-//
-// )
-//
-// Binary:
-// 0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a0d010b000240420042017c1a0b0b
diff --git a/test/libyul/objectCompiler/wasm/subObject.yul b/test/libyul/objectCompiler/wasm/subObject.yul
deleted file mode 100644
index 683e64be1e..0000000000
--- a/test/libyul/objectCompiler/wasm/subObject.yul
+++ /dev/null
@@ -1,22 +0,0 @@
-object "a" {
-    code {}
-    // Unreferenced data is not added to the assembled bytecode.
-    data "str" "Hello, World!"
-    object "sub" { code { function main() { i64.drop(11) } } }
-}
-// ====
-// wasm: true
-// ----
-// Text:
-// (module
-//     ;; custom section for sub-module
-//     ;; The Keccak-256 hash of the text representation of "sub": 78ac3419d75c8d6f42f663717b8e964eeb994d77ff175145133084422dbd23d7
-//     ;; (@custom "sub" "0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a0a0108000240420b1a0b0b")
-//     ;; custom section for data
-//     ;; (@custom "str" "48656c6c6f2c20576f726c6421")
-//     (memory $memory (export "memory") 1)
-//
-// )
-//
-// Binary:
-// 0061736d010000000101000201000301000503010001060100070a01066d656d6f727902000040037375620061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a0a0108000240420b1a0b0b00110373747248656c6c6f2c20576f726c64210a0100
diff --git a/test/libyul/objectCompiler/wasm/subObjectAccess.yul b/test/libyul/objectCompiler/wasm/subObjectAccess.yul
deleted file mode 100644
index 8acced97f6..0000000000
--- a/test/libyul/objectCompiler/wasm/subObjectAccess.yul
+++ /dev/null
@@ -1,79 +0,0 @@
-object "A" {
-    code {
-        function main() {
-            // TODO: support this
-            // i64.drop(dataoffset("A"))
-            // i64.drop(datasize("A"))
-            i64.drop(dataoffset("B"))
-            i64.drop(datasize("B"))
-            // TODO: support sub-subobjects
-            // i64.drop(dataoffset("B.C"))
-            // i64.drop(datasize("B.C"))
-            // i64.drop(dataoffset("B.E"))
-            // i64.drop(datasize("B.E"))
-            // i64.drop(dataoffset("B.C.D"))
-            // i64.drop(datasize("B.C.D"))
-        }
-    }
-
-    data "data1" "Hello, World!"
-
-    object "B" {
-        code {
-            function main() {
-                i64.drop(dataoffset("C"))
-                i64.drop(datasize("C"))
-                i64.drop(dataoffset("E"))
-                i64.drop(datasize("E"))
-                // i64.drop(dataoffset("C.D"))
-                // i64.drop(datasize("C.D"))
-            }
-        }
-        object "C" {
-            code {
-                function main() {
-                    i64.drop(dataoffset("D"))
-                    i64.drop(datasize("D"))
-                }
-            }
-            object "D" {
-                code {
-                    function main() {
-                        unreachable()
-                    }
-                }
-            }
-        }
-        object "E" {
-            code {
-                function main() {
-                    unreachable()
-                }
-            }
-        }
-    }
-}
-// ====
-// wasm: true
-// ----
-// Text:
-// (module
-//     ;; custom section for sub-module
-//     ;; 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)
-//     (export "main" (func $main))
-//
-// (func $main
-//     (block $label_
-//         (drop (dataoffset "B"))
-//         (drop (datasize "B"))
-//     )
-// )
-//
-// )
-//
-// Binary:
-// 0061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e000000880201420061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e0000007f01430061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e0000003c01440061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a080106000240000b0b0a0d010b00024042341a423a1a0b0b003c01450061736d01000000010401600000020100030201000503010001060100071102066d656d6f72790200046d61696e00000a080106000240000b0b0a15011300024042341a42fd001a42b5011a423a1a0b0b001305646174613148656c6c6f2c20576f726c64210a0e010c00024042351a4286021a0b0b
diff --git a/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type_wasm.yul b/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type_wasm.yul
deleted file mode 100644
index de92aad7ae..0000000000
--- a/test/libyul/yulOptimizerTests/conditionalSimplifier/add_correct_type_wasm.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    let y:i32 := 0:i32
-    for {} true { } {
-        if y { break }
-    }
-}
-// ====
-// dialect: ewasm
-// ----
-// step: conditionalSimplifier
-//
-// {
-//     let y:i32 := 0:i32
-//     for { } true { }
-//     {
-//         if y { break }
-//         y := false
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/expressionSplitter/typed.yul b/test/libyul/yulOptimizerTests/expressionSplitter/typed.yul
deleted file mode 100644
index 4bae497d63..0000000000
--- a/test/libyul/yulOptimizerTests/expressionSplitter/typed.yul
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    function fun(x: i32, y) -> t: i32, z: i32 {
-        z := i32.add(x, i32.add(z, z))
-
-    }
-    i64.store(i32.load(5:i32), i64.load(8:i32))
-    let i := 0
-    for {} i32.eqz(i32.load(9:i32)) { i := i64.add(i, 1) } {
-        let f: i32, g: i32 := fun(i32.load(1:i32), i64.load(i32.load(0: i32)))
-    }
-}
-// ====
-// dialect: ewasm
-// ----
-// step: expressionSplitter
-//
-// {
-//     function fun(x:i32, y) -> t:i32, z:i32
-//     {
-//         let _1:i32 := i32.add(z, z)
-//         z := i32.add(x, _1)
-//     }
-//     let _2:i32 := 8:i32
-//     let _3 := i64.load(_2)
-//     let _4:i32 := 5:i32
-//     let _5:i32 := i32.load(_4)
-//     i64.store(_5, _3)
-//     let i := 0
-//     for { }
-//     i32.eqz(i32.load(9:i32))
-//     {
-//         let _6 := 1
-//         i := i64.add(i, _6)
-//     }
-//     {
-//         let _7:i32 := 0:i32
-//         let _8:i32 := i32.load(_7)
-//         let _9 := i64.load(_8)
-//         let _10:i32 := 1:i32
-//         let _11:i32 := i32.load(_10)
-//         let f:i32, g:i32 := fun(_11, _9)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/wordSizeTransform/constant_assignment.yul b/test/libyul/yulOptimizerTests/wordSizeTransform/constant_assignment.yul
deleted file mode 100644
index 10f8814a66..0000000000
--- a/test/libyul/yulOptimizerTests/wordSizeTransform/constant_assignment.yul
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  let val := 1234567890123456789012345678901234567890123456789012345678901234567890
-  val := 9876543219876543219876543219876543219876543219876543219876543219876543210
-}
-
-// ----
-// step: wordSizeTransform
-//
-// {
-//     let val_0 := 196678011949
-//     let val_1 := 17592899865401375162
-//     let val_2 := 3392951883154430155
-//     let val_3 := 12452437124710337234
-//     val_0 := 1573424111353538
-//     val_1 := 11180339179422519519
-//     val_2 := 5225342777609112214
-//     val_3 := 12264064093151869674
-// }
diff --git a/test/libyul/yulOptimizerTests/wordSizeTransform/function_call.yul b/test/libyul/yulOptimizerTests/wordSizeTransform/function_call.yul
deleted file mode 100644
index 3aef8c99ce..0000000000
--- a/test/libyul/yulOptimizerTests/wordSizeTransform/function_call.yul
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    function swap(x, y) -> a, b
-    {
-        a := y
-        b := x
-    }
-    function main(v1, v2) -> r1, r2
-    {
-        let tmp := 11111111111111111111111111111111111111111111111111111111111111111111111111111
-        r1, r2 := swap(v1, tmp)
-        r1, r2 := swap(2222222222222222222222222222222222222222222222222222222222222222222, r2)
-    }
-}
-
-// ----
-// step: wordSizeTransform
-//
-// {
-//     function swap(x_0, x_1, x_2, x_3, y_0, y_1, y_2, y_3) -> a_0, a_1, a_2, a_3, b_0, b_1, b_2, b_3
-//     {
-//         a_0 := y_0
-//         a_1 := y_1
-//         a_2 := y_2
-//         a_3 := y_3
-//         b_0 := x_0
-//         b_1 := x_1
-//         b_2 := x_2
-//         b_3 := x_3
-//     }
-//     function main(v1_0, v1_1, v1_2, v1_3, v2_0, v2_1, v2_2, v2_3) -> r1_0, r1_1, r1_2, r1_3, r2_0, r2_1, r2_2, r2_3
-//     {
-//         let tmp_0 := 1770102123480502530
-//         let tmp_1 := 591943673742124792
-//         let tmp_2 := 13663686148824196892
-//         let tmp_3 := 8198552921648689607
-//         r1_0, r1_1, r1_2, r1_3, r2_0, r2_1, r2_2, r2_3 := swap(v1_0, v1_1, v1_2, v1_3, tmp_0, tmp_1, tmp_2, tmp_3)
-//         let _1_0 := 354020424
-//         let _1_1 := 12840787883880108911
-//         let _1_2 := 12527970737989311368
-//         let _1_3 := 16397105843297379214
-//         r1_0, r1_1, r1_2, r1_3, r2_0, r2_1, r2_2, r2_3 := swap(_1_0, _1_1, _1_2, _1_3, r2_0, r2_1, r2_2, r2_3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/wordSizeTransform/functional_instruction.yul b/test/libyul/yulOptimizerTests/wordSizeTransform/functional_instruction.yul
deleted file mode 100644
index 5ac0bfc00a..0000000000
--- a/test/libyul/yulOptimizerTests/wordSizeTransform/functional_instruction.yul
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-    let x := add(999999999999999999999999999999999999999999999999999999999999999, 77777777777777777777777777777777777777777777777777777777777777)
-}
-// ----
-// step: wordSizeTransform
-//
-// {
-//     let _1_0 := 12390
-//     let _1_1 := 13186919961226471680
-//     let _1_2 := 18324050535993369984
-//     let _1_3 := 15884696285694336113
-//     let _2_0 := 159309
-//     let _2_1 := 3525417123811528497
-//     let _2_2 := 6328259118096044006
-//     let _2_3 := 9223372036854775807
-//     let x_0, x_1, x_2, x_3 := add(_2_0, _2_1, _2_2, _2_3, _1_0, _1_1, _1_2, _1_3)
-// }
diff --git a/test/libyul/yulOptimizerTests/wordSizeTransform/if.yul b/test/libyul/yulOptimizerTests/wordSizeTransform/if.yul
deleted file mode 100644
index b799760f83..0000000000
--- a/test/libyul/yulOptimizerTests/wordSizeTransform/if.yul
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    if calldataload(0) { sstore(0, 1) }
-    if add(calldataload(0), calldataload(1)) { sstore(0, 2) }
-}
-// ----
-// step: wordSizeTransform
-//
-// {
-//     let _1_0 := 0
-//     let _1_1 := 0
-//     let _1_2 := 0
-//     let _1_3 := 0
-//     let _2_0, _2_1, _2_2, _2_3 := calldataload(_1_0, _1_1, _1_2, _1_3)
-//     if or_bool(_2_0, _2_1, _2_2, _2_3)
-//     {
-//         let _3_0 := 0
-//         let _3_1 := 0
-//         let _3_2 := 0
-//         let _3_3 := 1
-//         let _4_0 := 0
-//         let _4_1 := 0
-//         let _4_2 := 0
-//         let _4_3 := 0
-//         sstore(_4_0, _4_1, _4_2, _4_3, _3_0, _3_1, _3_2, _3_3)
-//     }
-//     let _5_0 := 0
-//     let _5_1 := 0
-//     let _5_2 := 0
-//     let _5_3 := 1
-//     let _6_0, _6_1, _6_2, _6_3 := calldataload(_5_0, _5_1, _5_2, _5_3)
-//     let _7_0 := 0
-//     let _7_1 := 0
-//     let _7_2 := 0
-//     let _7_3 := 0
-//     let _8_0, _8_1, _8_2, _8_3 := calldataload(_7_0, _7_1, _7_2, _7_3)
-//     let _9_0, _9_1, _9_2, _9_3 := add(_8_0, _8_1, _8_2, _8_3, _6_0, _6_1, _6_2, _6_3)
-//     if or_bool(_9_0, _9_1, _9_2, _9_3)
-//     {
-//         let _10_0 := 0
-//         let _10_1 := 0
-//         let _10_2 := 0
-//         let _10_3 := 2
-//         let _11_0 := 0
-//         let _11_1 := 0
-//         let _11_2 := 0
-//         let _11_3 := 0
-//         sstore(_11_0, _11_1, _11_2, _11_3, _10_0, _10_1, _10_2, _10_3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/wordSizeTransform/or_bool_renamed.yul b/test/libyul/yulOptimizerTests/wordSizeTransform/or_bool_renamed.yul
deleted file mode 100644
index 803b289708..0000000000
--- a/test/libyul/yulOptimizerTests/wordSizeTransform/or_bool_renamed.yul
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    let or_bool := 2
-    if or_bool { sstore(0, 1) }
-}
-// ----
-// step: wordSizeTransform
-//
-// {
-//     let or_bool_3_0 := 0
-//     let or_bool_3_1 := 0
-//     let or_bool_3_2 := 0
-//     let or_bool_3_3 := 2
-//     if or_bool(or_bool_3_0, or_bool_3_1, or_bool_3_2, or_bool_3_3)
-//     {
-//         let _1_0 := 0
-//         let _1_1 := 0
-//         let _1_2 := 0
-//         let _1_3 := 1
-//         let _2_0 := 0
-//         let _2_1 := 0
-//         let _2_2 := 0
-//         let _2_3 := 0
-//         sstore(_2_0, _2_1, _2_2, _2_3, _1_0, _1_1, _1_2, _1_3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/wordSizeTransform/switch_1.yul b/test/libyul/yulOptimizerTests/wordSizeTransform/switch_1.yul
deleted file mode 100644
index d40e2283fc..0000000000
--- a/test/libyul/yulOptimizerTests/wordSizeTransform/switch_1.yul
+++ /dev/null
@@ -1,71 +0,0 @@
-{
-    switch calldataload(0)
-    case 0 { sstore(0, 1) }
-    case 1 { sstore(1, 1) }
-    case 2 { sstore(2, 1) }
-    case 3 { sstore(3, 1) }
-}
-// ----
-// step: wordSizeTransform
-//
-// {
-//     let _1_0 := 0
-//     let _1_1 := 0
-//     let _1_2 := 0
-//     let _1_3 := 0
-//     let _2_0, _2_1, _2_2, _2_3 := calldataload(_1_0, _1_1, _1_2, _1_3)
-//     switch _2_0
-//     case 0 {
-//         switch _2_1
-//         case 0 {
-//             switch _2_2
-//             case 0 {
-//                 switch _2_3
-//                 case 0 {
-//                     let _3_0 := 0
-//                     let _3_1 := 0
-//                     let _3_2 := 0
-//                     let _3_3 := 1
-//                     let _4_0 := 0
-//                     let _4_1 := 0
-//                     let _4_2 := 0
-//                     let _4_3 := 0
-//                     sstore(_4_0, _4_1, _4_2, _4_3, _3_0, _3_1, _3_2, _3_3)
-//                 }
-//                 case 1 {
-//                     let _5_0 := 0
-//                     let _5_1 := 0
-//                     let _5_2 := 0
-//                     let _5_3 := 1
-//                     let _6_0 := 0
-//                     let _6_1 := 0
-//                     let _6_2 := 0
-//                     let _6_3 := 1
-//                     sstore(_6_0, _6_1, _6_2, _6_3, _5_0, _5_1, _5_2, _5_3)
-//                 }
-//                 case 2 {
-//                     let _7_0 := 0
-//                     let _7_1 := 0
-//                     let _7_2 := 0
-//                     let _7_3 := 1
-//                     let _8_0 := 0
-//                     let _8_1 := 0
-//                     let _8_2 := 0
-//                     let _8_3 := 2
-//                     sstore(_8_0, _8_1, _8_2, _8_3, _7_0, _7_1, _7_2, _7_3)
-//                 }
-//                 case 3 {
-//                     let _9_0 := 0
-//                     let _9_1 := 0
-//                     let _9_2 := 0
-//                     let _9_3 := 1
-//                     let _10_0 := 0
-//                     let _10_1 := 0
-//                     let _10_2 := 0
-//                     let _10_3 := 3
-//                     sstore(_10_0, _10_1, _10_2, _10_3, _9_0, _9_1, _9_2, _9_3)
-//                 }
-//             }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/wordSizeTransform/switch_2.yul b/test/libyul/yulOptimizerTests/wordSizeTransform/switch_2.yul
deleted file mode 100644
index a9612a3927..0000000000
--- a/test/libyul/yulOptimizerTests/wordSizeTransform/switch_2.yul
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    switch calldataload(0)
-    case 0x01000000000000000000000000000000000000010 { sstore(0, 1) }
-    case 0x02000000000000000000000000000000000000010 { sstore(1, 1) }
-    case 0x01000000000000000000000000000000000000020 { sstore(2, 1) }
-    case 0x02000000000000000000000000000000000000020 { sstore(3, 1) }
-}
-// ----
-// step: wordSizeTransform
-//
-// {
-//     let _1_0 := 0
-//     let _1_1 := 0
-//     let _1_2 := 0
-//     let _1_3 := 0
-//     let _2_0, _2_1, _2_2, _2_3 := calldataload(_1_0, _1_1, _1_2, _1_3)
-//     switch _2_0
-//     case 0 {
-//         switch _2_1
-//         case 268435456 {
-//             switch _2_2
-//             case 0 {
-//                 switch _2_3
-//                 case 16 {
-//                     let _3_0 := 0
-//                     let _3_1 := 0
-//                     let _3_2 := 0
-//                     let _3_3 := 1
-//                     let _4_0 := 0
-//                     let _4_1 := 0
-//                     let _4_2 := 0
-//                     let _4_3 := 0
-//                     sstore(_4_0, _4_1, _4_2, _4_3, _3_0, _3_1, _3_2, _3_3)
-//                 }
-//                 case 32 {
-//                     let _7_0 := 0
-//                     let _7_1 := 0
-//                     let _7_2 := 0
-//                     let _7_3 := 1
-//                     let _8_0 := 0
-//                     let _8_1 := 0
-//                     let _8_2 := 0
-//                     let _8_3 := 2
-//                     sstore(_8_0, _8_1, _8_2, _8_3, _7_0, _7_1, _7_2, _7_3)
-//                 }
-//             }
-//         }
-//         case 536870912 {
-//             switch _2_2
-//             case 0 {
-//                 switch _2_3
-//                 case 16 {
-//                     let _5_0 := 0
-//                     let _5_1 := 0
-//                     let _5_2 := 0
-//                     let _5_3 := 1
-//                     let _6_0 := 0
-//                     let _6_1 := 0
-//                     let _6_2 := 0
-//                     let _6_3 := 1
-//                     sstore(_6_0, _6_1, _6_2, _6_3, _5_0, _5_1, _5_2, _5_3)
-//                 }
-//                 case 32 {
-//                     let _9_0 := 0
-//                     let _9_1 := 0
-//                     let _9_2 := 0
-//                     let _9_3 := 1
-//                     let _10_0 := 0
-//                     let _10_1 := 0
-//                     let _10_2 := 0
-//                     let _10_3 := 3
-//                     sstore(_10_0, _10_1, _10_2, _10_3, _9_0, _9_1, _9_2, _9_3)
-//                 }
-//             }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/wordSizeTransform/switch_3.yul b/test/libyul/yulOptimizerTests/wordSizeTransform/switch_3.yul
deleted file mode 100644
index 403c579623..0000000000
--- a/test/libyul/yulOptimizerTests/wordSizeTransform/switch_3.yul
+++ /dev/null
@@ -1,89 +0,0 @@
-{
-    switch calldataload(0)
-    case 0 { sstore(0, 1) }
-    case 1 { sstore(1, 1) }
-    case 2 { sstore(2, 1) }
-    case 3 { sstore(3, 1) }
-    default { sstore(8, 9) }
-}
-// ----
-// step: wordSizeTransform
-//
-// {
-//     let _1_0 := 0
-//     let _1_1 := 0
-//     let _1_2 := 0
-//     let _1_3 := 0
-//     let _2_0, _2_1, _2_2, _2_3 := calldataload(_1_0, _1_1, _1_2, _1_3)
-//     let run_default
-//     switch _2_0
-//     case 0 {
-//         switch _2_1
-//         case 0 {
-//             switch _2_2
-//             case 0 {
-//                 switch _2_3
-//                 case 0 {
-//                     let _3_0 := 0
-//                     let _3_1 := 0
-//                     let _3_2 := 0
-//                     let _3_3 := 1
-//                     let _4_0 := 0
-//                     let _4_1 := 0
-//                     let _4_2 := 0
-//                     let _4_3 := 0
-//                     sstore(_4_0, _4_1, _4_2, _4_3, _3_0, _3_1, _3_2, _3_3)
-//                 }
-//                 case 1 {
-//                     let _5_0 := 0
-//                     let _5_1 := 0
-//                     let _5_2 := 0
-//                     let _5_3 := 1
-//                     let _6_0 := 0
-//                     let _6_1 := 0
-//                     let _6_2 := 0
-//                     let _6_3 := 1
-//                     sstore(_6_0, _6_1, _6_2, _6_3, _5_0, _5_1, _5_2, _5_3)
-//                 }
-//                 case 2 {
-//                     let _7_0 := 0
-//                     let _7_1 := 0
-//                     let _7_2 := 0
-//                     let _7_3 := 1
-//                     let _8_0 := 0
-//                     let _8_1 := 0
-//                     let _8_2 := 0
-//                     let _8_3 := 2
-//                     sstore(_8_0, _8_1, _8_2, _8_3, _7_0, _7_1, _7_2, _7_3)
-//                 }
-//                 case 3 {
-//                     let _9_0 := 0
-//                     let _9_1 := 0
-//                     let _9_2 := 0
-//                     let _9_3 := 1
-//                     let _10_0 := 0
-//                     let _10_1 := 0
-//                     let _10_2 := 0
-//                     let _10_3 := 3
-//                     sstore(_10_0, _10_1, _10_2, _10_3, _9_0, _9_1, _9_2, _9_3)
-//                 }
-//                 default { run_default := true }
-//             }
-//             default { run_default := true }
-//         }
-//         default { run_default := true }
-//     }
-//     default { run_default := true }
-//     if run_default
-//     {
-//         let _11_0 := 0
-//         let _11_1 := 0
-//         let _11_2 := 0
-//         let _11_3 := 9
-//         let _12_0 := 0
-//         let _12_1 := 0
-//         let _12_2 := 0
-//         let _12_3 := 8
-//         sstore(_12_0, _12_1, _12_2, _12_3, _11_0, _11_1, _11_2, _11_3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/wordSizeTransform/switch_4.yul b/test/libyul/yulOptimizerTests/wordSizeTransform/switch_4.yul
deleted file mode 100644
index d1f45a6231..0000000000
--- a/test/libyul/yulOptimizerTests/wordSizeTransform/switch_4.yul
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-    switch calldataload(0)
-    case 0x01000000000000000000000000000000000000010 { sstore(0, 1) }
-    case 0x02000000000000000000000000000000000000010 { sstore(1, 1) }
-    case 0x01000000000000000000000000000000000000020 { sstore(2, 1) }
-    case 0x02000000000000000000000000000000000000020 { sstore(3, 1) }
-    default { sstore(8, 9) }
-}
-// ----
-// step: wordSizeTransform
-//
-// {
-//     let _1_0 := 0
-//     let _1_1 := 0
-//     let _1_2 := 0
-//     let _1_3 := 0
-//     let _2_0, _2_1, _2_2, _2_3 := calldataload(_1_0, _1_1, _1_2, _1_3)
-//     let run_default
-//     switch _2_0
-//     case 0 {
-//         switch _2_1
-//         case 268435456 {
-//             switch _2_2
-//             case 0 {
-//                 switch _2_3
-//                 case 16 {
-//                     let _3_0 := 0
-//                     let _3_1 := 0
-//                     let _3_2 := 0
-//                     let _3_3 := 1
-//                     let _4_0 := 0
-//                     let _4_1 := 0
-//                     let _4_2 := 0
-//                     let _4_3 := 0
-//                     sstore(_4_0, _4_1, _4_2, _4_3, _3_0, _3_1, _3_2, _3_3)
-//                 }
-//                 case 32 {
-//                     let _7_0 := 0
-//                     let _7_1 := 0
-//                     let _7_2 := 0
-//                     let _7_3 := 1
-//                     let _8_0 := 0
-//                     let _8_1 := 0
-//                     let _8_2 := 0
-//                     let _8_3 := 2
-//                     sstore(_8_0, _8_1, _8_2, _8_3, _7_0, _7_1, _7_2, _7_3)
-//                 }
-//                 default { run_default := true }
-//             }
-//             default { run_default := true }
-//         }
-//         case 536870912 {
-//             switch _2_2
-//             case 0 {
-//                 switch _2_3
-//                 case 16 {
-//                     let _5_0 := 0
-//                     let _5_1 := 0
-//                     let _5_2 := 0
-//                     let _5_3 := 1
-//                     let _6_0 := 0
-//                     let _6_1 := 0
-//                     let _6_2 := 0
-//                     let _6_3 := 1
-//                     sstore(_6_0, _6_1, _6_2, _6_3, _5_0, _5_1, _5_2, _5_3)
-//                 }
-//                 case 32 {
-//                     let _9_0 := 0
-//                     let _9_1 := 0
-//                     let _9_2 := 0
-//                     let _9_3 := 1
-//                     let _10_0 := 0
-//                     let _10_1 := 0
-//                     let _10_2 := 0
-//                     let _10_3 := 3
-//                     sstore(_10_0, _10_1, _10_2, _10_3, _9_0, _9_1, _9_2, _9_3)
-//                 }
-//                 default { run_default := true }
-//             }
-//             default { run_default := true }
-//         }
-//         default { run_default := true }
-//     }
-//     default { run_default := true }
-//     if run_default
-//     {
-//         let _11_0 := 0
-//         let _11_1 := 0
-//         let _11_2 := 0
-//         let _11_3 := 9
-//         let _12_0 := 0
-//         let _12_1 := 0
-//         let _12_2 := 0
-//         let _12_3 := 8
-//         sstore(_12_0, _12_1, _12_2, _12_3, _11_0, _11_1, _11_2, _11_3)
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/wordSizeTransform/switch_5.yul b/test/libyul/yulOptimizerTests/wordSizeTransform/switch_5.yul
deleted file mode 100644
index a02243a25a..0000000000
--- a/test/libyul/yulOptimizerTests/wordSizeTransform/switch_5.yul
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    switch calldataload(0)
-    default { sstore(8, 9) }
-}
-// ----
-// step: wordSizeTransform
-//
-// {
-//     let _1_0 := 0
-//     let _1_1 := 0
-//     let _1_2 := 0
-//     let _1_3 := 0
-//     let _2_0, _2_1, _2_2, _2_3 := calldataload(_1_0, _1_1, _1_2, _1_3)
-//     let run_default
-//     switch _2_0
-//     default { run_default := true }
-//     if run_default
-//     {
-//         let _3_0 := 0
-//         let _3_1 := 0
-//         let _3_2 := 0
-//         let _3_3 := 9
-//         let _4_0 := 0
-//         let _4_1 := 0
-//         let _4_2 := 0
-//         let _4_3 := 8
-//         sstore(_4_0, _4_1, _4_2, _4_3, _3_0, _3_1, _3_2, _3_3)
-//     }
-// }
diff --git a/test/libyul/yulSyntaxTests/for_loop_condition_fail_ewasm.yul b/test/libyul/yulSyntaxTests/for_loop_condition_fail_ewasm.yul
deleted file mode 100644
index ec7a162dc1..0000000000
--- a/test/libyul/yulSyntaxTests/for_loop_condition_fail_ewasm.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let x
-    for {} x {} {}
-}
-// ====
-// dialect: ewasm
-// ----
-// TypeError 1733: (23-24): Expected a value of boolean type "i32" but got "i64"
diff --git a/test/libyul/yulSyntaxTests/linkersymbol_ewasm.yul b/test/libyul/yulSyntaxTests/linkersymbol_ewasm.yul
deleted file mode 100644
index 051359c075..0000000000
--- a/test/libyul/yulSyntaxTests/linkersymbol_ewasm.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    linkersymbol("contract/library.sol:L")
-}
-// ====
-// dialect: ewasm
-// ----
-// DeclarationError 4619: (6-18): Function "linkersymbol" not found.
diff --git a/test/libyul/yulSyntaxTests/type_check_cases.yul b/test/libyul/yulSyntaxTests/type_check_cases.yul
deleted file mode 100644
index 4e09457c89..0000000000
--- a/test/libyul/yulSyntaxTests/type_check_cases.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    switch 7:i64
-    case 0:i64 {}
-    case 2:i64 {}
-}
-// ====
-// dialect: ewasm
-// ----
diff --git a/test/libyul/yulSyntaxTests/type_check_cases_fail.yul b/test/libyul/yulSyntaxTests/type_check_cases_fail.yul
deleted file mode 100644
index d9b4c0204a..0000000000
--- a/test/libyul/yulSyntaxTests/type_check_cases_fail.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    switch 7:i32
-    case 0:i64 {}
-    case 2:i64 {}
-}
-// ====
-// dialect: ewasm
-// ----
-// TypeError 3781: (28-33): Expected a value of type "i32" but got "i64".
-// TypeError 3781: (46-51): Expected a value of type "i32" but got "i64".
diff --git a/test/libyul/yulSyntaxTests/type_check_if_condition.yul b/test/libyul/yulSyntaxTests/type_check_if_condition.yul
deleted file mode 100644
index eaccf63f64..0000000000
--- a/test/libyul/yulSyntaxTests/type_check_if_condition.yul
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    let x:i32
-    if x {}
-}
-// ====
-// dialect: ewasm
-// ----
diff --git a/test/libyul/yulSyntaxTests/type_check_if_condition_fail.yul b/test/libyul/yulSyntaxTests/type_check_if_condition_fail.yul
deleted file mode 100644
index c8711338ff..0000000000
--- a/test/libyul/yulSyntaxTests/type_check_if_condition_fail.yul
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    let x:i64
-    if x {}
-}
-// ====
-// dialect: ewasm
-// ----
-// TypeError 1733: (23-24): Expected a value of boolean type "i32" but got "i64"
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 6fdecd7fae..2883f5c51f 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -132,7 +132,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 				"dir1/file1.sol:L=0x1234567890123456789012345678901234567890,"
 				"dir2/file2.sol:L=0x1111122222333334444455555666667777788888",
 			"--ast-compact-json", "--asm", "--asm-json", "--opcodes", "--bin", "--bin-runtime", "--abi",
-			"--ir", "--ir-optimized", "--ewasm", "--hashes", "--userdoc", "--devdoc", "--metadata", "--storage-layout",
+			"--ir", "--ir-optimized", "--hashes", "--userdoc", "--devdoc", "--metadata", "--storage-layout",
 			"--gas",
 			"--combined-json="
 				"abi,metadata,bin,bin-runtime,opcodes,asm,storage-layout,generated-sources,generated-sources-runtime,"
@@ -192,10 +192,8 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 		expectedOptions.compiler.outputs = {
 			true, true, true, true, true,
 			true, true, true, true, true,
-			true, true, true, true, true,
-			true,
+			true, true, true, true,
 		};
-		expectedOptions.compiler.outputs.ewasmIR = false;
 		expectedOptions.compiler.estimateGas = true;
 		expectedOptions.compiler.combinedJsonRequests = {
 			true, true, true, true, true,
@@ -249,13 +247,6 @@ BOOST_AUTO_TEST_CASE(via_ir_options)
 BOOST_AUTO_TEST_CASE(assembly_mode_options)
 {
 	static vector<tuple<vector<string>, YulStack::Machine, YulStack::Language>> const allowedCombinations = {
-		{{"--machine=ewasm", "--yul-dialect=ewasm", "--assemble"}, YulStack::Machine::Ewasm, YulStack::Language::Ewasm},
-		{{"--machine=ewasm", "--yul-dialect=ewasm", "--yul"}, YulStack::Machine::Ewasm, YulStack::Language::Ewasm},
-		{{"--machine=ewasm", "--yul-dialect=ewasm", "--strict-assembly"}, YulStack::Machine::Ewasm, YulStack::Language::Ewasm},
-		{{"--machine=ewasm", "--yul-dialect=evm", "--assemble"}, YulStack::Machine::Ewasm, YulStack::Language::StrictAssembly},
-		{{"--machine=ewasm", "--yul-dialect=evm", "--yul"}, YulStack::Machine::Ewasm, YulStack::Language::StrictAssembly},
-		{{"--machine=ewasm", "--yul-dialect=evm", "--strict-assembly"}, YulStack::Machine::Ewasm, YulStack::Language::StrictAssembly},
-		{{"--machine=ewasm", "--strict-assembly"}, YulStack::Machine::Ewasm, YulStack::Language::Ewasm},
 		{{"--machine=evm", "--yul-dialect=evm", "--assemble"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
 		{{"--machine=evm", "--yul-dialect=evm", "--yul"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
 		{{"--machine=evm", "--yul-dialect=evm", "--strict-assembly"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
@@ -299,11 +290,9 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 			"--asm",
 			"--bin",
 			"--ir-optimized",
-			"--ewasm",
-			"--ewasm-ir",
 		};
 		commandLine += assemblyOptions;
-		if (expectedLanguage == YulStack::Language::StrictAssembly || expectedLanguage == YulStack::Language::Ewasm)
+		if (expectedLanguage == YulStack::Language::StrictAssembly)
 			commandLine += vector<string>{
 				"--optimize",
 				"--optimize-runs=1000",
@@ -340,9 +329,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		expectedOptions.compiler.outputs.asm_ = true;
 		expectedOptions.compiler.outputs.binary = true;
 		expectedOptions.compiler.outputs.irOptimized = true;
-		expectedOptions.compiler.outputs.ewasm = true;
-		expectedOptions.compiler.outputs.ewasmIR = true;
-		if (expectedLanguage == YulStack::Language::StrictAssembly || expectedLanguage == YulStack::Language::Ewasm)
+		if (expectedLanguage == YulStack::Language::StrictAssembly)
 		{
 			expectedOptions.optimizer.enabled = true;
 			expectedOptions.optimizer.yulSteps = "agf";
diff --git a/test/soltest.cpp b/test/soltest.cpp
index 2120acc2df..6aa1002488 100644
--- a/test/soltest.cpp
+++ b/test/soltest.cpp
@@ -133,7 +133,6 @@ int registerTests(
 	boost::unit_test::test_suite& _suite,
 	boost::filesystem::path const& _basepath,
 	boost::filesystem::path const& _path,
-	bool _enforceCompileToEwasm,
 	vector<string> const& _labels,
 	TestCase::TestCaseCreator _testCaseCreator,
 	solidity::test::Batcher& _batcher
@@ -146,7 +145,6 @@ int registerTests(
 		solidity::test::CommonOptions::get().evmVersion(),
 		solidity::test::CommonOptions::get().eofVersion(),
 		solidity::test::CommonOptions::get().vmPaths,
-		_enforceCompileToEwasm,
 		solidity::test::CommonOptions::get().enforceGasTest,
 		solidity::test::CommonOptions::get().enforceGasTestMinValue,
 	};
@@ -164,7 +162,6 @@ int registerTests(
 				numTestsAdded += registerTests(
 					*sub_suite,
 					_basepath, _path / entry.path().filename(),
-					_enforceCompileToEwasm,
 					_labels,
 					_testCaseCreator,
 					_batcher
@@ -269,7 +266,6 @@ test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])
 				master,
 				options.testPath / ts.path,
 				ts.subpath,
-				options.enforceCompileToEwasm,
 				ts.labels,
 				ts.testCaseCreator,
 				batcher
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index 0bb8896cd8..5a2ba8da3f 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -36,7 +36,6 @@ add_executable(isoltest
 	../libyul/ControlFlowGraphTest.cpp
 	../libyul/ControlFlowSideEffectsTest.cpp
 	../libyul/EVMCodeTransformTest.cpp
-	../libyul/EwasmTranslationTest.cpp
 	../libyul/FunctionSideEffects.cpp
 	../libyul/ObjectCompilerTest.cpp
 	../libyul/SyntaxTest.cpp
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index 4739a54e9c..2d93bdbc2b 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -161,7 +161,6 @@ TestTool::Result TestTool::process()
 				m_options.evmVersion(),
 				m_options.eofVersion(),
 				m_options.vmPaths,
-				m_options.enforceCompileToEwasm,
 				m_options.enforceGasTest,
 				m_options.enforceGasTestMinValue
 			});
diff --git a/test/tools/yulInterpreter/CMakeLists.txt b/test/tools/yulInterpreter/CMakeLists.txt
index cc1b40f074..235e8fac10 100644
--- a/test/tools/yulInterpreter/CMakeLists.txt
+++ b/test/tools/yulInterpreter/CMakeLists.txt
@@ -1,8 +1,6 @@
 set(sources
 	EVMInstructionInterpreter.h
 	EVMInstructionInterpreter.cpp
-	EwasmBuiltinInterpreter.h
-	EwasmBuiltinInterpreter.cpp
 	Interpreter.h
 	Interpreter.cpp
 	Inspector.h
diff --git a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
deleted file mode 100644
index fdba09aa46..0000000000
--- a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.cpp
+++ /dev/null
@@ -1,617 +0,0 @@
-/*
-	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
-/**
- * Yul interpreter module that evaluates Ewasm builtins.
- */
-
-#include <test/tools/yulInterpreter/EwasmBuiltinInterpreter.h>
-
-#include <test/tools/yulInterpreter/Interpreter.h>
-
-#include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/AST.h>
-
-#include <libevmasm/Instruction.h>
-
-#include <libsolutil/Keccak256.h>
-#include <libsolutil/Numeric.h>
-
-#include <limits>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-using namespace solidity::yul::test;
-
-using solidity::util::h160;
-using solidity::util::h256;
-
-namespace
-{
-
-/// Copy @a _size bytes of @a _source at offset @a _sourceOffset to
-/// @a _target at offset @a _targetOffset. Behaves as if @a _source would
-/// continue with an infinite sequence of zero bytes beyond its end.
-void copyZeroExtended(
-	map<u256, uint8_t>& _target, bytes const& _source,
-	size_t _targetOffset, size_t _sourceOffset, size_t _size
-)
-{
-	for (size_t i = 0; i < _size; ++i)
-		_target[_targetOffset + i] = _sourceOffset + i < _source.size() ? _source[_sourceOffset + i] : 0;
-}
-
-/// Count leading zeros for uint64. Following WebAssembly rules, it returns 64 for @a _v being zero.
-/// NOTE: the clz builtin of the compiler may or may not do this
-uint64_t clz64(uint64_t _v)
-{
-	if (_v == 0)
-		return 64;
-
-	uint64_t r = 0;
-	while (!(_v & 0x8000000000000000))
-	{
-		r += 1;
-		_v = _v << 1;
-	}
-	return r;
-}
-
-/// Count trailing zeros for uint32. Following WebAssembly rules, it returns 32 for @a _v being zero.
-/// NOTE: the ctz builtin of the compiler may or may not do this
-uint32_t ctz32(uint32_t _v)
-{
-	if (_v == 0)
-		return 32;
-
-	uint32_t r = 0;
-	while (!(_v & 1))
-	{
-		r++;
-		_v >>= 1;
-	}
-	return r;
-}
-
-/// Count trailing zeros for uint64. Following WebAssembly rules, it returns 64 for @a _v being zero.
-/// NOTE: the ctz builtin of the compiler may or may not do this
-uint64_t ctz64(uint64_t _v)
-{
-	if (_v == 0)
-		return 64;
-
-	uint64_t r = 0;
-	while (!(_v & 1))
-	{
-		r++;
-		_v >>= 1;
-	}
-	return r;
-}
-
-/// Count number of bits set for uint64
-uint64_t popcnt(uint64_t _v)
-{
-	uint64_t r = 0;
-	while (_v)
-	{
-		r += (_v & 1);
-		_v >>= 1;
-	}
-	return r;
-}
-
-}
-
-u256 EwasmBuiltinInterpreter::evalBuiltin(
-	YulString _functionName,
-	vector<Expression> const& _arguments,
-	vector<u256> const& _evaluatedArguments
-)
-{
-	vector<uint64_t> arg;
-	for (u256 const& a: _evaluatedArguments)
-		arg.emplace_back(uint64_t(a & uint64_t(-1)));
-
-	string const fun = _functionName.str();
-	if (fun == "datasize" || fun == "dataoffset")
-	{
-		string arg = std::get<Literal>(_arguments.at(0)).value.str();
-		if (arg.length() < 32)
-			arg.resize(32, 0);
-		if (fun == "datasize")
-			return u256(util::keccak256(arg)) & 0xfff;
-		else if (fun == "dataoffset")
-		{
-			// Force different value than for datasize
-			arg[31]++;
-			arg[31]++;
-			return u256(util::keccak256(arg)) & 0xfff;
-		}
-	}
-	else if (fun == "datacopy")
-	{
-		// This is identical to codecopy.
-		accessMemory(_evaluatedArguments.at(0), _evaluatedArguments.at(2));
-		copyZeroExtended(
-			m_state.memory,
-			m_state.code,
-			static_cast<size_t>(_evaluatedArguments.at(0)),
-			static_cast<size_t>(_evaluatedArguments.at(1) & numeric_limits<size_t>::max()),
-			static_cast<size_t>(_evaluatedArguments.at(2))
-		);
-		return 0;
-	}
-	else if (fun == "i32.drop" || fun == "i64.drop" || fun == "nop")
-		return {};
-	else if (fun == "i32.select")
-	{
-		if ((arg.at(2) & 0xffffffff) == 0)
-			return arg.at(1);
-		else
-			return arg.at(0);
-	}
-	else if (fun == "i64.select")
-	{
-		if ((arg.at(2) & 0xffffffffffffffff) == 0)
-			return arg.at(1);
-		else
-			return arg.at(0);
-	}
-	else if (fun == "i32.wrap_i64")
-		return arg.at(0) & uint32_t(-1);
-	else if (fun == "i64.extend_i32_u")
-		// Return the same as above because everything is u256 anyway.
-		return arg.at(0) & uint32_t(-1);
-	else if (fun == "unreachable")
-	{
-		logTrace(evmasm::Instruction::INVALID, {});
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-	}
-	else if (fun == "i64.store")
-	{
-		accessMemory(arg[0], 8);
-		writeMemoryWord(arg[0], arg[1]);
-		return 0;
-	}
-	else if (fun == "i64.store8" || fun == "i32.store8")
-	{
-		accessMemory(arg[0], 1);
-		writeMemoryByte(arg[0], static_cast<uint8_t>(arg[1] & 0xff));
-		return 0;
-	}
-	else if (fun == "i64.load")
-	{
-		accessMemory(arg[0], 8);
-		return readMemoryWord(arg[0]);
-	}
-	else if (fun == "i32.store")
-	{
-		accessMemory(arg[0], 4);
-		writeMemoryHalfWord(arg[0], static_cast<uint32_t>(arg[1]));
-		return 0;
-	}
-	else if (fun == "i32.load")
-	{
-		accessMemory(arg[0], 4);
-		return readMemoryHalfWord(arg[0]);
-	}
-	else if (fun == "i32.clz")
-		// NOTE: the clz implementation assumes 64-bit inputs, hence the adjustment
-		return clz64(arg[0] & uint32_t(-1)) - 32;
-	else if (fun == "i64.clz")
-		return clz64(arg[0]);
-	else if (fun == "i32.ctz")
-		return ctz32(uint32_t(arg[0] & uint32_t(-1)));
-	else if (fun == "i64.ctz")
-		return ctz64(arg[0]);
-
-	string prefix = fun;
-	string suffix;
-	auto dot = prefix.find(".");
-	if (dot != string::npos)
-	{
-		suffix = prefix.substr(dot + 1);
-		prefix.resize(dot);
-	}
-
-	if (prefix == "i32")
-	{
-		vector<uint32_t> halfWordArgs;
-		for (uint64_t a: arg)
-			halfWordArgs.push_back(uint32_t(a & uint32_t(-1)));
-		return evalWasmBuiltin(suffix, halfWordArgs);
-	}
-	else if (prefix == "i64")
-		return evalWasmBuiltin(suffix, arg);
-	else if (prefix == "eth")
-		return evalEthBuiltin(suffix, arg);
-
-	yulAssert(false, "Unknown builtin: " + fun + " (or implementation did not return)");
-
-	return 0;
-}
-
-template <typename Word>
-u256 EwasmBuiltinInterpreter::evalWasmBuiltin(string const& _fun, vector<Word> const& _arguments)
-{
-	vector<Word> const& arg = _arguments;
-
-	if (_fun == "add")
-		return arg[0] + arg[1];
-	else if (_fun == "sub")
-		return arg[0] - arg[1];
-	else if (_fun == "mul")
-		return arg[0] * arg[1];
-	else if (_fun == "div_u")
-	{
-		if (arg[1] == 0)
-			BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-		else
-			return arg[0] / arg[1];
-	}
-	else if (_fun == "rem_u")
-	{
-		if (arg[1] == 0)
-			BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-		else
-			return arg[0] % arg[1];
-	}
-	else if (_fun == "and")
-		return arg[0] & arg[1];
-	else if (_fun == "or")
-		return arg[0] | arg[1];
-	else if (_fun == "xor")
-		return arg[0] ^ arg[1];
-	else if (_fun == "shl")
-		return arg[0] << arg[1];
-	else if (_fun == "shr_u")
-		return arg[0] >> arg[1];
-	else if (_fun == "eq")
-		return arg[0] == arg[1] ? 1 : 0;
-	else if (_fun == "ne")
-		return arg[0] != arg[1] ? 1 : 0;
-	else if (_fun == "eqz")
-		return arg[0] == 0 ? 1 : 0;
-	else if (_fun == "popcnt")
-		return popcnt(arg[0]);
-	else if (_fun == "lt_u")
-		return arg[0] < arg[1] ? 1 : 0;
-	else if (_fun == "gt_u")
-		return arg[0] > arg[1] ? 1 : 0;
-	else if (_fun == "le_u")
-		return arg[0] <= arg[1] ? 1 : 0;
-	else if (_fun == "ge_u")
-		return arg[0] >= arg[1] ? 1 : 0;
-
-	yulAssert(false, "Unknown builtin: " + _fun + " (or implementation did not return)");
-
-	return 0;
-}
-
-u256 EwasmBuiltinInterpreter::evalEthBuiltin(string const& _fun, vector<uint64_t> const& _arguments)
-{
-	vector<uint64_t> const& arg = _arguments;
-
-	if (_fun == "getAddress")
-	{
-		writeAddress(arg[0], m_state.address);
-		return 0;
-	}
-	else if (_fun == "getExternalBalance")
-	{
-		readAddress(arg[0]);
-		writeU128(arg[1], m_state.balance);
-		return 0;
-	}
-	else if (_fun == "getBlockHash")
-	{
-		if (arg[0] >= m_state.blockNumber || arg[0] + 256 < m_state.blockNumber)
-			return 1;
-		else
-		{
-			writeBytes32(arg[1], h256(0xaaaaaaaa + u256(arg[0] - m_state.blockNumber - 256)));
-			return 0;
-		}
-	}
-	else if (_fun == "call")
-	{
-		readAddress(arg[1]);
-		readU128(arg[2]);
-		accessMemory(arg[3], arg[4]);
-		logTrace(evmasm::Instruction::CALL, {});
-		return arg[0] & 1;
-	}
-	else if (_fun == "callDataCopy")
-	{
-		if (arg[1] + arg[2] < arg[1] || arg[1] + arg[2] > m_state.calldata.size())
-			BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-		accessMemory(arg[0], arg[2]);
-		copyZeroExtended(
-			m_state.memory, m_state.calldata,
-			size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
-		);
-		return {};
-	}
-	else if (_fun == "getCallDataSize")
-		return m_state.calldata.size();
-	else if (_fun == "callCode")
-	{
-		readAddress(arg[1]);
-		readU128(arg[2]);
-		accessMemory(arg[3], arg[4]);
-		logTrace(evmasm::Instruction::CALLCODE, {});
-		return arg[0] & 1;
-	}
-	else if (_fun == "callDelegate")
-	{
-		readAddress(arg[1]);
-		accessMemory(arg[2], arg[3]);
-		logTrace(evmasm::Instruction::DELEGATECALL, {});
-		return arg[0] & 1;
-	}
-	else if (_fun == "callStatic")
-	{
-		readAddress(arg[1]);
-		accessMemory(arg[2], arg[3]);
-		logTrace(evmasm::Instruction::STATICCALL, {});
-		return arg[0] & 1;
-	}
-	else if (_fun == "storageStore")
-	{
-		m_state.storage[readBytes32(arg[0])] = readBytes32(arg[1]);
-		return 0;
-	}
-	else if (_fun == "storageLoad")
-	{
-		writeBytes32(arg[1], m_state.storage[readBytes32(arg[0])]);
-		return 0;
-	}
-	else if (_fun == "getCaller")
-	{
-		writeAddress(arg[0], m_state.caller);
-		return 0;
-	}
-	else if (_fun == "getCallValue")
-	{
-		writeU128(arg[0], m_state.callvalue);
-		return 0;
-	}
-	else if (_fun == "codeCopy")
-	{
-		accessMemory(arg[0], arg[2]);
-		copyZeroExtended(
-			m_state.memory, m_state.code,
-			size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
-		);
-		return 0;
-	}
-	else if (_fun == "getCodeSize")
-		return m_state.code.size();
-	else if (_fun == "getBlockCoinbase")
-	{
-		writeAddress(arg[0], m_state.coinbase);
-		return 0;
-	}
-	else if (_fun == "create")
-	{
-		readU128(arg[0]);
-		accessMemory(arg[1], arg[2]);
-		logTrace(evmasm::Instruction::CREATE, {});
-		writeAddress(arg[3], h160(0xcccccc + arg[1]));
-		return 1;
-	}
-	else if (_fun == "getBlockBaseFee")
-	{
-		writeU128(arg[0], m_state.basefee);
-		return 0;
-	}
-	else if (_fun == "getBlockDifficulty")
-	{
-		writeU256(arg[0], m_state.difficulty);
-		return 0;
-	}
-	else if (_fun == "externalCodeCopy")
-	{
-		readAddress(arg[0]);
-		accessMemory(arg[1], arg[3]);
-		// TODO this way extcodecopy and codecopy do the same thing.
-		copyZeroExtended(
-			m_state.memory, m_state.code,
-			size_t(arg[1]), size_t(arg[2]), size_t(arg[3])
-		);
-		return 0;
-	}
-	else if (_fun == "getExternalCodeSize")
-		// Generate "random" code length.
-		return uint32_t(u256(keccak256(h256(readAddress(arg[0]), h256::AlignLeft))) & 0xfff);
-	else if (_fun == "getGasLeft")
-		return 0x99;
-	else if (_fun == "getBlockGasLimit")
-		return uint64_t(m_state.gaslimit);
-	else if (_fun == "getTxGasPrice")
-	{
-		writeU128(arg[0], m_state.gasprice);
-		return 0;
-	}
-	else if (_fun == "log")
-	{
-		accessMemory(arg[0], arg[1]);
-		uint64_t numberOfTopics = arg[2];
-		if (numberOfTopics > 4)
-			BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-		if (numberOfTopics > 0)
-			readBytes32(arg[3]);
-		if (numberOfTopics > 1)
-			readBytes32(arg[4]);
-		if (numberOfTopics > 2)
-			readBytes32(arg[5]);
-		if (numberOfTopics > 3)
-			readBytes32(arg[6]);
-		logTrace(evmasm::logInstruction(static_cast<unsigned>(numberOfTopics)), {});
-		return 0;
-	}
-	else if (_fun == "getBlockNumber")
-		return m_state.blockNumber;
-	else if (_fun == "getTxOrigin")
-	{
-		writeAddress(arg[0], m_state.origin);
-		return 0;
-	}
-	else if (_fun == "finish")
-	{
-		bytes data;
-		accessMemory(arg[0], arg[1]);
-		data = readMemory(arg[0], arg[1]);
-		logTrace(evmasm::Instruction::RETURN, {}, data);
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-	}
-	else if (_fun == "revert")
-	{
-		bytes data;
-		accessMemory(arg[0], arg[1]);
-		data = readMemory(arg[0], arg[1]);
-		logTrace(evmasm::Instruction::REVERT, {}, data);
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-	}
-	else if (_fun == "getReturnDataSize")
-		return m_state.returndata.size();
-	else if (_fun == "returnDataCopy")
-	{
-		if (arg[1] + arg[2] < arg[1] || arg[1] + arg[2] > m_state.returndata.size())
-			BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-		accessMemory(arg[0], arg[2]);
-		copyZeroExtended(
-			m_state.memory, m_state.calldata,
-			size_t(arg[0]), size_t(arg[1]), size_t(arg[2])
-		);
-		return {};
-	}
-	else if (_fun == "selfDestruct")
-	{
-		readAddress(arg[0]);
-		logTrace(evmasm::Instruction::SELFDESTRUCT, {});
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-	}
-	else if (_fun == "getBlockTimestamp")
-		return m_state.timestamp;
-
-	yulAssert(false, "Unknown builtin: " + _fun + " (or implementation did not return)");
-
-	return 0;
-}
-
-void EwasmBuiltinInterpreter::accessMemory(u256 const& _offset, u256 const& _size)
-{
-	// Single WebAssembly page.
-	// TODO: Support expansion in this interpreter.
-	m_state.msize = 65536;
-
-	if (((_offset + _size) < _offset) || ((_offset + _size) > m_state.msize))
-		// Ewasm throws out of bounds exception as opposed to the EVM.
-		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
-}
-
-bytes EwasmBuiltinInterpreter::readMemory(uint64_t _offset, uint64_t _size)
-{
-	yulAssert(_size <= 0xffff, "Too large read.");
-	bytes data(size_t(_size), uint8_t(0));
-	for (size_t i = 0; i < data.size(); ++i)
-		data[i] = m_state.memory[_offset + i];
-	return data;
-}
-
-uint64_t EwasmBuiltinInterpreter::readMemoryWord(uint64_t _offset)
-{
-	uint64_t r = 0;
-	for (size_t i = 0; i < 8; i++)
-		r |= uint64_t(m_state.memory[_offset + i]) << (i * 8);
-	return r;
-}
-
-uint32_t EwasmBuiltinInterpreter::readMemoryHalfWord(uint64_t _offset)
-{
-	uint32_t r = 0;
-	for (size_t i = 0; i < 4; i++)
-		r |= uint32_t(m_state.memory[_offset + i]) << (i * 8);
-	return r;
-}
-
-void EwasmBuiltinInterpreter::writeMemory(uint64_t _offset, bytes const& _value)
-{
-	for (size_t i = 0; i < _value.size(); i++)
-		m_state.memory[_offset + i] = _value[i];
-}
-
-void EwasmBuiltinInterpreter::writeMemoryWord(uint64_t _offset, uint64_t _value)
-{
-	for (size_t i = 0; i < 8; i++)
-		m_state.memory[_offset + i] = uint8_t((_value >> (i * 8)) & 0xff);
-}
-
-void EwasmBuiltinInterpreter::writeMemoryHalfWord(uint64_t _offset, uint32_t _value)
-{
-	for (size_t i = 0; i < 4; i++)
-		m_state.memory[_offset + i] = uint8_t((_value >> (i * 8)) & 0xff);
-}
-
-void EwasmBuiltinInterpreter::writeMemoryByte(uint64_t _offset, uint8_t _value)
-{
-	m_state.memory[_offset] = _value;
-}
-
-void EwasmBuiltinInterpreter::writeU256(uint64_t _offset, u256 _value, size_t _croppedTo)
-{
-	accessMemory(_offset, _croppedTo);
-	for (size_t i = 0; i < _croppedTo; i++)
-	{
-		m_state.memory[_offset + i] = uint8_t(_value & 0xff);
-		_value >>= 8;
-	}
-}
-
-u256 EwasmBuiltinInterpreter::readU256(uint64_t _offset, size_t _croppedTo)
-{
-	accessMemory(_offset, _croppedTo);
-	u256 value{0};
-	for (size_t i = 0; i < _croppedTo; i++)
-		value = (value << 8) | m_state.memory[_offset + _croppedTo - 1 - i];
-
-	return value;
-}
-
-void EwasmBuiltinInterpreter::logTrace(evmasm::Instruction _instruction, std::vector<u256> const& _arguments, bytes const& _data)
-{
-	logTrace(evmasm::instructionInfo(_instruction, langutil::EVMVersion()).name, _arguments, _data);
-}
-
-void EwasmBuiltinInterpreter::logTrace(std::string const& _pseudoInstruction, std::vector<u256> const& _arguments, bytes const& _data)
-{
-	string message = _pseudoInstruction + "(";
-	for (size_t i = 0; i < _arguments.size(); ++i)
-		message += (i > 0 ? ", " : "") + formatNumber(_arguments[i]);
-	message += ")";
-	if (!_data.empty())
-		message += " [" + util::toHex(_data) + "]";
-	m_state.trace.emplace_back(std::move(message));
-	if (m_state.maxTraceSize > 0 && m_state.trace.size() >= m_state.maxTraceSize)
-	{
-		m_state.trace.emplace_back("Trace size limit reached.");
-		BOOST_THROW_EXCEPTION(TraceLimitReached());
-	}
-}
diff --git a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h b/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h
deleted file mode 100644
index 1837f7509e..0000000000
--- a/test/tools/yulInterpreter/EwasmBuiltinInterpreter.h
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-	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
-/**
- * Yul interpreter module that evaluates Ewasm builtins.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-#include <libsolutil/CommonData.h>
-#include <libsolutil/FixedHash.h>
-
-#include <vector>
-
-namespace solidity::evmasm
-{
-enum class Instruction: uint8_t;
-}
-
-namespace solidity::yul
-{
-class YulString;
-struct BuiltinFunctionForEVM;
-}
-
-namespace solidity::yul::test
-{
-
-struct InterpreterState;
-
-/**
- * Interprets Ewasm builtins based on the current state and logs instructions with
- * side-effects.
- *
- * Since this is mainly meant to be used for differential fuzz testing, it is focused
- * on a single contract only, does not do any gas counting and differs from the correct
- * implementation in many ways:
- *
- * - If memory access to a "large" memory position is performed, a deterministic
- *   value is returned. Data that is stored in a "large" memory position is not
- *   retained.
- * - The blockhash instruction returns a fixed value if the argument is in range.
- * - Extcodesize returns a deterministic value depending on the address.
- * - Extcodecopy copies a deterministic value depending on the address.
- * - And many other things
- *
- * The main focus is that the generated execution trace is the same for equivalent executions
- * and likely to be different for non-equivalent executions.
- *
- * The type names are following the Ewasm specification (https://github.com/ewasm/design/blob/master/eth_interface.md).
- */
-class EwasmBuiltinInterpreter
-{
-public:
-	explicit EwasmBuiltinInterpreter(InterpreterState& _state):
-		m_state(_state)
-	{}
-	/// Evaluate builtin function
-	u256 evalBuiltin(
-		YulString _functionName,
-		std::vector<Expression> const& _arguments,
-		std::vector<u256> const& _evaluatedArguments
-	);
-
-private:
-	template <typename Word>
-	u256 evalWasmBuiltin(
-		std::string const& _fun,
-		std::vector<Word> const& _arguments
-	);
-	u256 evalEthBuiltin(
-		std::string const& _fun,
-		std::vector<uint64_t> const& _arguments
-	);
-
-	/// Checks if the memory access is not too large for the interpreter and adjusts
-	/// msize accordingly.
-	void accessMemory(u256 const& _offset, u256 const& _size = 32);
-	/// @returns the memory contents at the provided address.
-	/// Does not adjust msize, use @a accessMemory for that
-	bytes readMemory(uint64_t _offset, uint64_t _size = 32);
-	/// @returns the memory contents (8 bytes) at the provided address (little-endian).
-	/// Does not adjust msize, use @a accessMemory for that
-	uint64_t readMemoryWord(uint64_t _offset);
-	/// @returns the memory contents (4 bytes) at the provided address (little-endian).
-	/// Does not adjust msize, use @a accessMemory for that
-	uint32_t readMemoryHalfWord(uint64_t _offset);
-	/// Writes bytes to memory.
-	/// Does not adjust msize, use @a accessMemory for that
-	void writeMemory(uint64_t _offset, bytes const& _value);
-	/// Writes a word to memory (little-endian)
-	/// Does not adjust msize, use @a accessMemory for that
-	void writeMemoryWord(uint64_t _offset, uint64_t _value);
-	/// Writes a 4-byte value to memory (little-endian)
-	/// Does not adjust msize, use @a accessMemory for that
-	void writeMemoryHalfWord(uint64_t _offset, uint32_t _value);
-	/// Writes a byte to memory
-	/// Does not adjust msize, use @a accessMemory for that
-	void writeMemoryByte(uint64_t _offset, uint8_t _value);
-
-	/// Helper for eth.* builtins. Writes to memory (little-endian) and always returns zero.
-	void writeU256(uint64_t _offset, u256 _value, size_t _croppedTo = 32);
-	void writeU128(uint64_t _offset, u256 _value) { writeU256(_offset, std::move(_value), 16); }
-	/// Helper for eth.* builtins. Writes to memory (as a byte string).
-	void writeBytes32(uint64_t _offset, util::h256 _value) { accessMemory(_offset, 32); writeMemory(_offset, _value.asBytes()); }
-	void writeAddress(uint64_t _offset, util::h160 _value) { accessMemory(_offset, 20); writeMemory(_offset, _value.asBytes()); }
-	/// Helper for eth.* builtins. Reads from memory (little-endian) and returns the value.
-	u256 readU256(uint64_t _offset, size_t _croppedTo = 32);
-	u256 readU128(uint64_t _offset) { return readU256(_offset, 16); }
-	/// Helper for eth.* builtins. Reads from memory (as a byte string).
-	util::h256 readBytes32(uint64_t _offset) { accessMemory(_offset, 32); return util::h256(readMemory(_offset, 32)); }
-	util::h160 readAddress(uint64_t _offset) { accessMemory(_offset, 20); return util::h160(readMemory(_offset, 20)); }
-
-	void logTrace(evmasm::Instruction _instruction, std::vector<u256> const& _arguments = {}, bytes const& _data = {});
-	/// Appends a log to the trace representing an instruction or similar operation by string,
-	/// with arguments and auxiliary data (if nonempty).
-	void logTrace(std::string const& _pseudoInstruction, std::vector<u256> const& _arguments = {}, bytes const& _data = {});
-
-	InterpreterState& m_state;
-};
-
-}
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index b66967e26f..aadd22b4db 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -22,13 +22,11 @@
 #include <test/tools/yulInterpreter/Interpreter.h>
 
 #include <test/tools/yulInterpreter/EVMInstructionInterpreter.h>
-#include <test/tools/yulInterpreter/EwasmBuiltinInterpreter.h>
 
 #include <libyul/AST.h>
 #include <libyul/Dialect.h>
 #include <libyul/Utilities.h>
 #include <libyul/backends/evm/EVMDialect.h>
-#include <libyul/backends/wasm/WasmDialect.h>
 
 #include <liblangutil/Exceptions.h>
 
@@ -329,13 +327,6 @@ void ExpressionEvaluator::operator()(FunctionCall const& _funCall)
 			return;
 		}
 	}
-	else if (WasmDialect const* dialect = dynamic_cast<WasmDialect const*>(&m_dialect))
-		if (dialect->builtin(_funCall.functionName.name))
-		{
-			EwasmBuiltinInterpreter interpreter(m_state);
-			setValue(interpreter.evalBuiltin(_funCall.functionName.name, _funCall.arguments, values()));
-			return;
-		}
 
 	Scope* scope = &m_scope;
 	for (; scope; scope = scope->parent)

From a334ab352533ceb7128b9b704165649a1770148b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20Uzdo=C4=9Fan?= <kaanuzdogan@hotmail.com>
Date: Mon, 15 May 2023 16:32:12 +0200
Subject: [PATCH 1376/1748] Add  in immutables docs

---
 docs/contracts/constant-state-variables.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/contracts/constant-state-variables.rst b/docs/contracts/constant-state-variables.rst
index 2e94397b12..d99004e004 100644
--- a/docs/contracts/constant-state-variables.rst
+++ b/docs/contracts/constant-state-variables.rst
@@ -84,7 +84,8 @@ contract's runtime code before it is returned by replacing all references
 to immutables with the values assigned to them. This is important if
 you are comparing the
 runtime code generated by the compiler with the one actually stored in the
-blockchain.
+blockchain. The compiler outputs where these immutables are located in the bytecode
+in the ``immutableReferences`` of the :ref:`compiler output <compiler-api>` 
 
 .. note::
   Immutables that are assigned at their declaration are only considered

From 5fcba5322348a842b029c0e9d64422b8011aad0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20Uzdo=C4=9Fan?= <kaanuzdogan@hotmail.com>
Date: Mon, 15 May 2023 16:39:31 +0200
Subject: [PATCH 1377/1748] Fix trailing whitespace, add punctuation

---
 docs/contracts/constant-state-variables.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contracts/constant-state-variables.rst b/docs/contracts/constant-state-variables.rst
index d99004e004..2760449078 100644
--- a/docs/contracts/constant-state-variables.rst
+++ b/docs/contracts/constant-state-variables.rst
@@ -85,7 +85,7 @@ to immutables with the values assigned to them. This is important if
 you are comparing the
 runtime code generated by the compiler with the one actually stored in the
 blockchain. The compiler outputs where these immutables are located in the bytecode
-in the ``immutableReferences`` of the :ref:`compiler output <compiler-api>` 
+in the ``immutableReferences`` of the :ref:`compiler output <compiler-api>`.
 
 .. note::
   Immutables that are assigned at their declaration are only considered

From c8117ef75e7dc4f607965b3bee0581032cf43624 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kaan=20Uzdo=C4=9Fan?= <kaanuzdogan@hotmail.com>
Date: Mon, 15 May 2023 17:21:03 +0200
Subject: [PATCH 1378/1748] Be more explicit about `immutableReferences`

Co-authored-by: r0qs <rodrigo.saramago@protonmail.com>
---
 docs/contracts/constant-state-variables.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/contracts/constant-state-variables.rst b/docs/contracts/constant-state-variables.rst
index 2760449078..1b57bf3bec 100644
--- a/docs/contracts/constant-state-variables.rst
+++ b/docs/contracts/constant-state-variables.rst
@@ -84,8 +84,8 @@ contract's runtime code before it is returned by replacing all references
 to immutables with the values assigned to them. This is important if
 you are comparing the
 runtime code generated by the compiler with the one actually stored in the
-blockchain. The compiler outputs where these immutables are located in the bytecode
-in the ``immutableReferences`` of the :ref:`compiler output <compiler-api>`.
+blockchain. The compiler outputs where these immutables are located in the deployed bytecode
+in the ``immutableReferences`` field of the :ref:`compiler JSON standard output <compiler-api>`.
 
 .. note::
   Immutables that are assigned at their declaration are only considered

From 8a41f4ac7e05f8b5f9e0d2d43e4c9e70969bdc47 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 27 Apr 2023 19:39:59 +0200
Subject: [PATCH 1379/1748] Introduce solidity-next pragma

Exclude pragma experimental error from ANTLR tests

Test for first pragma after non-pragma declaration

Resolve import pragmas

Change pragma name from next to solidity

Add Changelog entries

Address review comments
---
 Changelog.md                                  |  5 ++++
 libsolidity/ast/AST.h                         | 11 +++++--
 libsolidity/ast/ASTJsonExporter.cpp           |  5 +++-
 libsolidity/ast/ASTJsonImporter.cpp           |  6 +++-
 libsolidity/ast/ExperimentalFeatures.h        |  4 ++-
 libsolidity/interface/CompilerStack.cpp       | 29 +++++++++++++++++--
 libsolidity/interface/CompilerStack.h         |  2 +-
 libsolidity/parsing/Parser.cpp                | 18 ++++++++++--
 libsolidity/parsing/Parser.h                  |  4 ++-
 scripts/test_antlr_grammar.sh                 |  2 +-
 .../ASTJSON/pragma_experimental_solidity.json | 21 ++++++++++++++
 .../ASTJSON/pragma_experimental_solidity.sol  |  3 ++
 ...ragma_experimental_solidity_parseOnly.json | 20 +++++++++++++
 test/libsolidity/SolidityTypes.cpp            |  2 +-
 .../pragma/experimental_solidity.sol          |  3 ++
 ...al_solidity_multisource_not_all_enable.sol | 24 +++++++++++++++
 .../experimental_solidity_out_of_order_1.sol  |  5 ++++
 .../experimental_solidity_out_of_order_2.sol  | 13 +++++++++
 18 files changed, 163 insertions(+), 14 deletions(-)
 create mode 100644 test/libsolidity/ASTJSON/pragma_experimental_solidity.json
 create mode 100644 test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
 create mode 100644 test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
 create mode 100644 test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
 create mode 100644 test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol
 create mode 100644 test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol
 create mode 100644 test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol

diff --git a/Changelog.md b/Changelog.md
index b88348e1b1..71ccea0df1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,12 +5,17 @@ Language Features:
 
 Compiler Features:
  * EWasm: Remove EWasm backend.
+ * Parser: Introduce ``pragma experimental solidity``, which will enable an experimental language mode that in particular has no stability guarantees between non-breaking releases and is not suited for production use.
 
 
 Bugfixes:
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
 
 
+AST Changes:
+ * AST: Add the ``experimentalSolidity`` field to the ``SourceUnit`` nodes, which indicate whether the experimental parsing mode has been enabled via ``pragma experimental solidity``.
+
+
 ### 0.8.20 (2023-05-10)
 
 Compiler Features:
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 317e95d436..494cbeac21 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -167,9 +167,14 @@ class SourceUnit: public ASTNode, public ScopeOpener
 		int64_t _id,
 		SourceLocation const& _location,
 		std::optional<std::string> _licenseString,
-		std::vector<ASTPointer<ASTNode>> _nodes
+		std::vector<ASTPointer<ASTNode>> _nodes,
+		bool _experimentalSolidity
 	):
-		ASTNode(_id, _location), m_licenseString(std::move(_licenseString)), m_nodes(std::move(_nodes)) {}
+		ASTNode(_id, _location),
+		m_licenseString(std::move(_licenseString)),
+		m_nodes(std::move(_nodes)),
+		m_experimentalSolidity(_experimentalSolidity)
+	{}
 
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
@@ -180,10 +185,12 @@ class SourceUnit: public ASTNode, public ScopeOpener
 
 	/// @returns a set of referenced SourceUnits. Recursively if @a _recurse is true.
 	std::set<SourceUnit const*> referencedSourceUnits(bool _recurse = false, std::set<SourceUnit const*> _skipList = std::set<SourceUnit const*>()) const;
+	bool experimentalSolidity() const { return m_experimentalSolidity; }
 
 private:
 	std::optional<std::string> m_licenseString;
 	std::vector<ASTPointer<ASTNode>> m_nodes;
+	bool m_experimentalSolidity = false;
 };
 
 /**
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index e13cead11a..da7f769362 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -214,9 +214,12 @@ bool ASTJsonExporter::visit(SourceUnit const& _node)
 {
 	std::vector<pair<string, Json::Value>> attributes = {
 		make_pair("license", _node.licenseString() ? Json::Value(*_node.licenseString()) : Json::nullValue),
-		make_pair("nodes", toJson(_node.nodes()))
+		make_pair("nodes", toJson(_node.nodes())),
 	};
 
+	if (_node.experimentalSolidity())
+		attributes.emplace_back("experimentalSolidity", Json::Value(_node.experimentalSolidity()));
+
 	if (_node.annotation().exportedSymbols.set())
 	{
 		Json::Value exportedSymbols = Json::objectValue;
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index 251219ea0a..dd7098aabf 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -271,11 +271,15 @@ ASTPointer<SourceUnit> ASTJsonImporter::createSourceUnit(Json::Value const& _nod
 	if (_node.isMember("license") && !_node["license"].isNull())
 		license = _node["license"].asString();
 
+	bool experimentalSolidity = false;
+	if (_node.isMember("experimentalSolidity") && !_node["experimentalSolidity"].isNull())
+		experimentalSolidity = _node["experimentalSolidity"].asBool();
+
 	vector<ASTPointer<ASTNode>> nodes;
 	for (auto& child: member(_node, "nodes"))
 		nodes.emplace_back(convertJsonToASTNode(child));
 
-	ASTPointer<SourceUnit> tmp = createASTNode<SourceUnit>(_node, license, nodes);
+	ASTPointer<SourceUnit> tmp = createASTNode<SourceUnit>(_node, license, nodes, experimentalSolidity);
 	tmp->annotation().path = _srcName;
 	return tmp;
 }
diff --git a/libsolidity/ast/ExperimentalFeatures.h b/libsolidity/ast/ExperimentalFeatures.h
index 772bc4e083..ae2cb14c54 100644
--- a/libsolidity/ast/ExperimentalFeatures.h
+++ b/libsolidity/ast/ExperimentalFeatures.h
@@ -32,7 +32,8 @@ enum class ExperimentalFeature
 	ABIEncoderV2, // new ABI encoder that makes use of Yul
 	SMTChecker,
 	Test,
-	TestOnlyAnalysis
+	TestOnlyAnalysis,
+	Solidity
 };
 
 static std::set<ExperimentalFeature> const ExperimentalFeatureWithoutWarning =
@@ -48,6 +49,7 @@ static std::map<std::string, ExperimentalFeature> const ExperimentalFeatureNames
 	{ "SMTChecker", ExperimentalFeature::SMTChecker },
 	{ "__test", ExperimentalFeature::Test },
 	{ "__testOnlyAnalysis", ExperimentalFeature::TestOnlyAnalysis },
+	{ "solidity", ExperimentalFeature::Solidity }
 };
 
 }
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index b18834a971..dae509ed5a 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -429,7 +429,9 @@ bool CompilerStack::analyze()
 {
 	if (m_stackState != ParsedAndImported || m_stackState >= AnalysisPerformed)
 		solThrow(CompilerError, "Must call analyze only after parsing was performed.");
-	resolveImports();
+
+	if (!resolveImports())
+		return false;
 
 	for (Source const* source: m_sourceOrder)
 		if (source->ast)
@@ -1175,7 +1177,7 @@ string CompilerStack::applyRemapping(string const& _path, string const& _context
 	return m_importRemapper.apply(_path, _context);
 }
 
-void CompilerStack::resolveImports()
+bool CompilerStack::resolveImports()
 {
 	solAssert(m_stackState == ParsedAndImported, "");
 
@@ -1200,11 +1202,34 @@ void CompilerStack::resolveImports()
 		sourceOrder.push_back(_source);
 	};
 
+	vector<PragmaDirective const*> experimentalPragmaDirectives;
 	for (auto const& sourcePair: m_sources)
+	{
 		if (isRequestedSource(sourcePair.first))
 			toposort(&sourcePair.second);
+		if (sourcePair.second.ast && sourcePair.second.ast->experimentalSolidity())
+			for (ASTPointer<ASTNode> const& node: sourcePair.second.ast->nodes())
+				if (PragmaDirective const* pragma = dynamic_cast<PragmaDirective*>(node.get()))
+					if (pragma->literals().size() >=2 && pragma->literals()[0] == "experimental" && pragma->literals()[1] == "solidity")
+					{
+						experimentalPragmaDirectives.push_back(pragma);
+						break;
+					}
+	}
+
+	if (!experimentalPragmaDirectives.empty() && experimentalPragmaDirectives.size() != m_sources.size())
+	{
+		for (auto &&pragma: experimentalPragmaDirectives)
+			m_errorReporter.parserError(
+					2141_error,
+					pragma->location(),
+					"File declares \"pragma experimental solidity\". If you want to enable the experimental mode, all source units must include the pragma."
+			);
+		return false;
+	}
 
 	swap(m_sourceOrder, sourceOrder);
+	return true;
 }
 
 void CompilerStack::storeContractDefinitions()
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index ae11e233bd..a01eaaa0ff 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -399,7 +399,7 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// @returns the newly loaded sources.
 	StringMap loadMissingSources(SourceUnit const& _ast);
 	std::string applyRemapping(std::string const& _path, std::string const& _context);
-	void resolveImports();
+	bool resolveImports();
 
 	/// Store the contract definitions in m_contracts.
 	void storeContractDefinitions();
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index a73a4fbefa..39b2df131a 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -94,14 +94,18 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 		m_recursionDepth = 0;
 		m_scanner = make_shared<Scanner>(_charStream);
 		ASTNodeFactory nodeFactory(*this);
+		m_experimentalSolidityEnabledInCurrentSourceUnit = false;
 
 		vector<ASTPointer<ASTNode>> nodes;
+		while (m_scanner->currentToken() == Token::Pragma)
+			nodes.push_back(parsePragmaDirective(false));
+
 		while (m_scanner->currentToken() != Token::EOS)
 		{
 			switch (m_scanner->currentToken())
 			{
 			case Token::Pragma:
-				nodes.push_back(parsePragmaDirective());
+				nodes.push_back(parsePragmaDirective(true));
 				break;
 			case Token::Import:
 				nodes.push_back(parseImportDirective());
@@ -150,7 +154,7 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 			}
 		}
 		solAssert(m_recursionDepth == 0, "");
-		return nodeFactory.createNode<SourceUnit>(findLicenseString(nodes), nodes);
+		return nodeFactory.createNode<SourceUnit>(findLicenseString(nodes), nodes, m_experimentalSolidityEnabledInCurrentSourceUnit);
 	}
 	catch (FatalError const&)
 	{
@@ -203,7 +207,7 @@ ASTPointer<StructuredDocumentation> Parser::parseStructuredDocumentation()
 	return nullptr;
 }
 
-ASTPointer<PragmaDirective> Parser::parsePragmaDirective()
+ASTPointer<PragmaDirective> Parser::parsePragmaDirective(bool const _finishedParsingTopLevelPragmas)
 {
 	RecursionGuard recursionGuard(*this);
 	// pragma anything* ;
@@ -213,6 +217,7 @@ ASTPointer<PragmaDirective> Parser::parsePragmaDirective()
 	expectToken(Token::Pragma);
 	vector<string> literals;
 	vector<Token> tokens;
+
 	do
 	{
 		Token token = m_scanner->currentToken();
@@ -241,6 +246,13 @@ ASTPointer<PragmaDirective> Parser::parsePragmaDirective()
 		);
 	}
 
+	if (literals.size() >= 2 && literals[0] == "experimental" && literals[1] == "solidity")
+	{
+		if (_finishedParsingTopLevelPragmas)
+			fatalParserError(8185_error, "Experimental pragma \"solidity\" can only be set at the beginning of the source unit.");
+		m_experimentalSolidityEnabledInCurrentSourceUnit = true;
+	}
+
 	return nodeFactory.createNode<PragmaDirective>(tokens, literals);
 }
 
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index c7d6146be3..c83b307b85 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -89,7 +89,7 @@ class Parser: public langutil::ParserBase
 	///@name Parsing functions for the AST nodes
 	void parsePragmaVersion(langutil::SourceLocation const& _location, std::vector<Token> const& _tokens, std::vector<std::string> const& _literals);
 	ASTPointer<StructuredDocumentation> parseStructuredDocumentation();
-	ASTPointer<PragmaDirective> parsePragmaDirective();
+	ASTPointer<PragmaDirective> parsePragmaDirective(bool _finishedParsingTopLevelPragmas);
 	ASTPointer<ImportDirective> parseImportDirective();
 	/// @returns an std::pair<ContractKind, bool>, where
 	/// result.second is set to true, if an abstract contract was parsed, false otherwise.
@@ -227,6 +227,8 @@ class Parser: public langutil::ParserBase
 	langutil::EVMVersion m_evmVersion;
 	/// Counter for the next AST node ID
 	int64_t m_currentNodeID = 0;
+	/// Flag that indicates whether experimental mode is enabled in the current source unit
+	bool m_experimentalSolidityEnabledInCurrentSourceUnit = false;
 };
 
 }
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
index 3394534f8d..6ab28fc5f4 100755
--- a/scripts/test_antlr_grammar.sh
+++ b/scripts/test_antlr_grammar.sh
@@ -110,7 +110,7 @@ do
   SOL_FILES+=("$line")
 done < <(
   grep --include "*.sol" -riL -E \
-    "^\/\/ (Syntax|Type|Declaration)Error|^\/\/ ParserError (1684|2837|3716|3997|5333|6275|6281|6933|7319)|^==== Source:" \
+    "^\/\/ (Syntax|Type|Declaration)Error|^\/\/ ParserError (1684|2837|3716|3997|5333|6275|6281|6933|7319|8185)|^==== Source:" \
     "${ROOT_DIR}/test/libsolidity/syntaxTests" \
     "${ROOT_DIR}/test/libsolidity/semanticTests" |
       # Skipping the unicode tests as I couldn't adapt the lexical grammar to recursively counting RLO/LRO/PDF's.
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity.json b/test/libsolidity/ASTJSON/pragma_experimental_solidity.json
new file mode 100644
index 0000000000..d2f7e56ade
--- /dev/null
+++ b/test/libsolidity/ASTJSON/pragma_experimental_solidity.json
@@ -0,0 +1,21 @@
+{
+  "absolutePath": "a",
+  "experimentalSolidity": true,
+  "exportedSymbols": {},
+  "id": 2,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "id": 1,
+      "literals":
+      [
+        "experimental",
+        "solidity"
+      ],
+      "nodeType": "PragmaDirective",
+      "src": "0:29:1"
+    }
+  ],
+  "src": "0:30:1"
+}
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol b/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
new file mode 100644
index 0000000000..e0c1c81aaa
--- /dev/null
+++ b/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
@@ -0,0 +1,3 @@
+pragma experimental solidity;
+
+// ----
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json b/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
new file mode 100644
index 0000000000..a1a3410ffe
--- /dev/null
+++ b/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
@@ -0,0 +1,20 @@
+{
+  "absolutePath": "a",
+  "experimentalSolidity": true,
+  "id": 2,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "id": 1,
+      "literals":
+      [
+        "experimental",
+        "solidity"
+      ],
+      "nodeType": "PragmaDirective",
+      "src": "0:29:1"
+    }
+  ],
+  "src": "0:30:1"
+}
diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp
index 48a0441b44..db43f49c03 100644
--- a/test/libsolidity/SolidityTypes.cpp
+++ b/test/libsolidity/SolidityTypes.cpp
@@ -213,7 +213,7 @@ BOOST_AUTO_TEST_CASE(type_identifiers)
 	ModifierDefinition mod(++id, SourceLocation{}, make_shared<string>("modif"), SourceLocation{}, {}, emptyParams, {}, {}, {});
 	BOOST_CHECK_EQUAL(ModifierType(mod).identifier(), "t_modifier$__$");
 
-	SourceUnit su(++id, {}, {}, {});
+	SourceUnit su(++id, {}, {}, {}, {});
 	BOOST_CHECK_EQUAL(ModuleType(su).identifier(), "t_module_7");
 	BOOST_CHECK_EQUAL(MagicType(MagicType::Kind::Block).identifier(), "t_magic_block");
 	BOOST_CHECK_EQUAL(MagicType(MagicType::Kind::Message).identifier(), "t_magic_message");
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
new file mode 100644
index 0000000000..9bb74a7ecd
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
@@ -0,0 +1,3 @@
+pragma experimental solidity;
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol
new file mode 100644
index 0000000000..747b8e166d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol
@@ -0,0 +1,24 @@
+==== Source: A.sol ====
+contract A {}
+==== Source: B.sol ====
+pragma experimental solidity;
+import "A.sol";
+contract B {
+    A a;
+}
+==== Source: C.sol ====
+pragma experimental solidity;
+import "A.sol";
+contract C {
+    A a;
+}
+==== Source: D.sol ====
+pragma experimental solidity;
+import "A.sol";
+contract D {
+    A a;
+}
+// ----
+// ParserError 2141: (B.sol:0-29): File declares "pragma experimental solidity". If you want to enable the experimental mode, all source units must include the pragma.
+// ParserError 2141: (C.sol:0-29): File declares "pragma experimental solidity". If you want to enable the experimental mode, all source units must include the pragma.
+// ParserError 2141: (D.sol:0-29): File declares "pragma experimental solidity". If you want to enable the experimental mode, all source units must include the pragma.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol
new file mode 100644
index 0000000000..5fde260f64
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol
@@ -0,0 +1,5 @@
+contract A {}
+
+pragma experimental solidity;
+// ----
+// ParserError 8185: (45-45): Experimental pragma "solidity" can only be set at the beginning of the source unit.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol
new file mode 100644
index 0000000000..3748a5c76d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol
@@ -0,0 +1,13 @@
+function f() pure returns (uint)
+{
+    return 1;
+}
+
+pragma experimental solidity;
+
+struct A
+{
+    uint256 x;
+}
+// ----
+// ParserError 8185: (83-89): Experimental pragma "solidity" can only be set at the beginning of the source unit.

From 56403536039df74012e265a30593e577cc6b6413 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 15 May 2023 19:37:53 +0200
Subject: [PATCH 1380/1748] Add sudo to base images

---
 scripts/docker/buildpack-deps/Dockerfile.emscripten           | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004           | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204           | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.emscripten b/scripts/docker/buildpack-deps/Dockerfile.emscripten
index c170aa3da6..c29fc699ac 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.emscripten
+++ b/scripts/docker/buildpack-deps/Dockerfile.emscripten
@@ -33,13 +33,13 @@
 # Using $(em-config CACHE)/sysroot/usr seems to work, though, and still has cmake find the
 # dependencies automatically.
 FROM emscripten/emsdk:3.1.19 AS base
-LABEL version="15"
+LABEL version="16"
 
 ADD emscripten.jam /usr/src
 RUN set -ex && \
 	\
 	apt-get update && \
-	apt-get install lz4 --no-install-recommends && \
+	apt-get install lz4 sudo --no-install-recommends && \
 	\
 	cd /usr/src && \
 	git clone https://github.com/Z3Prover/z3.git -b z3-4.12.1 --depth 1 && \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index 705eacce48..d5e6599ea7 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
@@ -22,13 +22,13 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="1"
+LABEL version="2"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update; \
 	apt-get -qqy install --no-install-recommends \
-		build-essential \
+		build-essential sudo \
 		software-properties-common \
 		ninja-build git wget \
 		libbz2-dev zlib1g-dev git curl uuid-dev \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index 193475f733..dbd1990023 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="19"
+LABEL version="20"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -32,7 +32,7 @@ RUN set -ex; \
         apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
 	apt-get update; \
 	apt-get install -qqy --no-install-recommends \
-		build-essential \
+		build-essential sudo \
 		software-properties-common \
 		cmake ninja-build \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index 5b94d71124..d5cfae9249 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="4"
+LABEL version="5"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -32,7 +32,7 @@ RUN set -ex; \
         apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
 	apt-get update; \
 	apt-get install -qqy --no-install-recommends \
-		build-essential \
+		build-essential sudo \
 		software-properties-common \
 		cmake ninja-build \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index 64328ce79e..3e23cd055f 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="3"
+LABEL version="4"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -32,7 +32,7 @@ RUN set -ex; \
 	apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1c52189c923f6ca9 ; \
 	apt-get update; \
 	apt-get install -qqy --no-install-recommends \
-		build-essential \
+		build-essential sudo \
 		software-properties-common \
 		cmake ninja-build \
 		libboost-filesystem-dev libboost-test-dev libboost-system-dev \

From af74ab69c9041a52db1b299b955cbabff59115b6 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 16 May 2023 16:13:51 +0200
Subject: [PATCH 1381/1748] Workaround gp2 and prb-math external tests

---
 test/externalTests/gp2.sh      | 8 ++++++++
 test/externalTests/prb-math.sh | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index 4dae6f0c3b..25403a879c 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -69,6 +69,14 @@ function gp2_test
     force_hardhat_unlimited_contract_size "$config_file" "$config_var"
     yarn
 
+    # Workaround for error caused by the last release of hardhat-waffle@2.0.6 that bumps ethereum-waffle
+    # to version 4.0.10 and breaks gp2 build with the following error:
+    #
+    #  Cannot find module 'ethereum-waffle/dist/cjs/src/deployContract'
+    #
+    # See: https://github.com/NomicFoundation/hardhat-waffle/commit/83ee9cb36ee59d0bedacbbd00043f030af104ad0
+    yarn add '@nomiclabs/hardhat-waffle@2.0.5'
+
     # Some dependencies come with pre-built artifacts. We want to build from scratch.
     rm -r node_modules/@gnosis.pm/safe-contracts/build/
 
diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
index 99c7c2716c..614c285f72 100755
--- a/test/externalTests/prb-math.sh
+++ b/test/externalTests/prb-math.sh
@@ -96,6 +96,14 @@ function prb_math_test
     yarn install --no-lock-file
     yarn add hardhat-gas-reporter
 
+    # Workaround for error caused by the last release of hardhat-waffle@2.0.6 that bumps ethereum-waffle
+    # to version 4.0.10 and breaks prb-math build with the following error:
+    #
+    #  Cannot find module 'ethereum-waffle/dist/cjs/src/deployContract'
+    #
+    # See: https://github.com/NomicFoundation/hardhat-waffle/commit/83ee9cb36ee59d0bedacbbd00043f030af104ad0
+    yarn add '@nomiclabs/hardhat-waffle@2.0.5'
+
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do

From d49ed7d66b1021b71850a051fa9d7d9e0bf64409 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 17 May 2023 11:41:15 +0200
Subject: [PATCH 1382/1748] Drop ColonyNetwork external test run on nightly
 builds

---
 .circleci/config.yml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8c81fd561e..c6592c7baf 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -684,15 +684,6 @@ defaults:
       binary_type: native
       image: cimg/node:18.11
 
-  - job_ems_test_ext_colony: &job_ems_test_ext_colony
-      <<: *requires_b_ems
-      name: t_ems_test_ext_colony
-      project: colony
-      binary_type: solcjs
-      image: cimg/node:14.20
-      resource_class: medium
-      python2: true
-
   - job_b_ubu_asan_clang: &job_b_ubu_asan_clang
       <<: *on_all_tags_and_branches
       name: b_ubu_asan_clang
@@ -1783,7 +1774,3 @@ workflows:
       - b_ubu_san_clang: *job_b_ubu_ubsan_clang
       - t_ubu_ubsan_clang_soltest: *requires_b_ubu_ubsan_clang
       - t_ubu_ubsan_clang_cli: *requires_b_ubu_ubsan_clang
-
-      # Emscripten build and tests that take more than 15 minutes to execute
-      - b_ems: *requires_nothing
-      - t_ext: *job_ems_test_ext_colony

From ff2e4736fa5dc5f6618a89ebc5857c28525031db Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 17 May 2023 14:52:47 +0200
Subject: [PATCH 1383/1748] Add Github authorization token to foundry
 installation

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c6592c7baf..eaabc230aa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -131,6 +131,7 @@ commands:
               --silent \
               --fail \
               --show-error \
+              --header "Authorization: Bearer ${GITHUB_ACCESS_TOKEN}" \
               "https://api.github.com/repos/${FOUNDRY_REPO}/git/refs/tags/${FOUNDRY_VERSION}" \
               | jq --raw-output .object.sha \
             )

From 7460c997b73c351411aa553e30af580133c2b300 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 17 May 2023 16:37:47 +0200
Subject: [PATCH 1384/1748] Add comment to colony test

---
 .circleci/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eaabc230aa..c10310c8fc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -571,6 +571,8 @@ defaults:
   # Parameterized Job Templates
 
   # Separate compile-only runs of those external tests where a full run takes much longer.
+  # Also see https://github.com/ethereum/solidity/pull/14234 for why we excluded those
+  # external tests from the nightly jobs.
   - job_ems_compile_ext_colony: &job_ems_compile_ext_colony
       <<: *requires_b_ems
       name: t_ems_compile_ext_colony

From 7a34d34045ffd972c25a27a07b322135d97cc7b5 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 17 May 2023 16:21:37 +0200
Subject: [PATCH 1385/1748] Restrict experimental solidity to constantinople
 and above

---
 libsolidity/parsing/Parser.cpp                            | 2 ++
 scripts/test_antlr_grammar.sh                             | 2 +-
 .../libsolidity/ASTJSON/pragma_experimental_solidity.json | 2 +-
 test/libsolidity/ASTJSON/pragma_experimental_solidity.sol | 3 ++-
 .../ASTJSON/pragma_experimental_solidity_parseOnly.json   | 2 +-
 .../syntaxTests/pragma/experimental_solidity.sol          | 2 ++
 .../experimental_solidity_multisource_not_all_enable.sol  | 2 ++
 .../pragma/experimental_solidity_out_of_order_1.sol       | 2 ++
 .../pragma/experimental_solidity_out_of_order_2.sol       | 2 ++
 .../pragma/experimental_solidity_wrong_evm_version.sol    | 8 ++++++++
 10 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/pragma/experimental_solidity_wrong_evm_version.sol

diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 39b2df131a..34fc9644e8 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -248,6 +248,8 @@ ASTPointer<PragmaDirective> Parser::parsePragmaDirective(bool const _finishedPar
 
 	if (literals.size() >= 2 && literals[0] == "experimental" && literals[1] == "solidity")
 	{
+		if (m_evmVersion < EVMVersion::constantinople())
+			fatalParserError(7637_error, "Experimental solidity requires Constantinople EVM version at the minimum.");
 		if (_finishedParsingTopLevelPragmas)
 			fatalParserError(8185_error, "Experimental pragma \"solidity\" can only be set at the beginning of the source unit.");
 		m_experimentalSolidityEnabledInCurrentSourceUnit = true;
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
index 6ab28fc5f4..e84f9b064a 100755
--- a/scripts/test_antlr_grammar.sh
+++ b/scripts/test_antlr_grammar.sh
@@ -110,7 +110,7 @@ do
   SOL_FILES+=("$line")
 done < <(
   grep --include "*.sol" -riL -E \
-    "^\/\/ (Syntax|Type|Declaration)Error|^\/\/ ParserError (1684|2837|3716|3997|5333|6275|6281|6933|7319|8185)|^==== Source:" \
+    "^\/\/ (Syntax|Type|Declaration)Error|^\/\/ ParserError (1684|2837|3716|3997|5333|6275|6281|6933|7319|8185|7637)|^==== Source:" \
     "${ROOT_DIR}/test/libsolidity/syntaxTests" \
     "${ROOT_DIR}/test/libsolidity/semanticTests" |
       # Skipping the unicode tests as I couldn't adapt the lexical grammar to recursively counting RLO/LRO/PDF's.
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity.json b/test/libsolidity/ASTJSON/pragma_experimental_solidity.json
index d2f7e56ade..66ece94e08 100644
--- a/test/libsolidity/ASTJSON/pragma_experimental_solidity.json
+++ b/test/libsolidity/ASTJSON/pragma_experimental_solidity.json
@@ -17,5 +17,5 @@
       "src": "0:29:1"
     }
   ],
-  "src": "0:30:1"
+  "src": "0:70:1"
 }
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol b/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
index e0c1c81aaa..b902bb061d 100644
--- a/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
+++ b/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
@@ -1,3 +1,4 @@
 pragma experimental solidity;
-
+// ====
+// EVMVersion: >=constantinople
 // ----
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json b/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
index a1a3410ffe..b1ac937a24 100644
--- a/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
+++ b/test/libsolidity/ASTJSON/pragma_experimental_solidity_parseOnly.json
@@ -16,5 +16,5 @@
       "src": "0:29:1"
     }
   ],
-  "src": "0:30:1"
+  "src": "0:70:1"
 }
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
index 9bb74a7ecd..b6f871d87f 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
+++ b/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
@@ -1,3 +1,5 @@
 pragma experimental solidity;
+// ====
+// EVMVersion: >=constantinople
 // ----
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol
index 747b8e166d..fe4125e843 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol
+++ b/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol
@@ -18,6 +18,8 @@ import "A.sol";
 contract D {
     A a;
 }
+// ====
+// EVMVersion: >=constantinople
 // ----
 // ParserError 2141: (B.sol:0-29): File declares "pragma experimental solidity". If you want to enable the experimental mode, all source units must include the pragma.
 // ParserError 2141: (C.sol:0-29): File declares "pragma experimental solidity". If you want to enable the experimental mode, all source units must include the pragma.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol
index 5fde260f64..d6741b0d3a 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol
+++ b/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol
@@ -1,5 +1,7 @@
 contract A {}
 
 pragma experimental solidity;
+// ====
+// EVMVersion: >=constantinople
 // ----
 // ParserError 8185: (45-45): Experimental pragma "solidity" can only be set at the beginning of the source unit.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol
index 3748a5c76d..940bd3fbb3 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol
+++ b/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol
@@ -9,5 +9,7 @@ struct A
 {
     uint256 x;
 }
+// ====
+// EVMVersion: >=constantinople
 // ----
 // ParserError 8185: (83-89): Experimental pragma "solidity" can only be set at the beginning of the source unit.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_wrong_evm_version.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity_wrong_evm_version.sol
new file mode 100644
index 0000000000..3e070535b0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/pragma/experimental_solidity_wrong_evm_version.sol
@@ -0,0 +1,8 @@
+pragma experimental solidity;
+
+contract C {}
+
+// ====
+// EVMVersion: <constantinople
+// ----
+// ParserError 7637: (31-39): Experimental solidity requires Constantinople EVM version at the minimum.

From e7f5303a393e7455a6a719aaa59ecbf52737990c Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 17 May 2023 18:07:58 +0200
Subject: [PATCH 1386/1748] Make ASTJSONTest an EVMVersionRestrictedTestCase

---
 test/libsolidity/ASTJSONTest.cpp | 3 ++-
 test/libsolidity/ASTJSONTest.h   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index 3602e14859..6f264fc131 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -181,7 +181,8 @@ void ASTJSONTest::validateTestConfiguration() const
 	}
 }
 
-ASTJSONTest::ASTJSONTest(string const& _filename)
+ASTJSONTest::ASTJSONTest(string const& _filename):
+	EVMVersionRestrictedTestCase(_filename)
 {
 	if (!boost::algorithm::ends_with(_filename, ".sol"))
 		BOOST_THROW_EXCEPTION(runtime_error("Invalid test contract file name: \"" + _filename + "\"."));
diff --git a/test/libsolidity/ASTJSONTest.h b/test/libsolidity/ASTJSONTest.h
index 648f3bbc32..1e74b62fec 100644
--- a/test/libsolidity/ASTJSONTest.h
+++ b/test/libsolidity/ASTJSONTest.h
@@ -35,7 +35,7 @@ class CompilerStack;
 namespace solidity::frontend::test
 {
 
-class ASTJSONTest: public TestCase
+class ASTJSONTest: public EVMVersionRestrictedTestCase
 {
 public:
 	struct TestVariant

From 9f1f2a2a06f71817396d8e91f293a918bb01cbde Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 15 May 2023 21:12:22 +0200
Subject: [PATCH 1387/1748] Bump docker images

---
 .circleci/config.yml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c6592c7baf..d70bd6b244 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,24 +9,24 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-19
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:9c7d3be930936a70f0340d5e9fa9a0b8bf69e11192e7e2d37807afe1b7f55534"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-20
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7a1e1b01eda0d1e20704279672bcfd53dbbc481898ff960958a225dea76345bd"
   ubuntu-2204-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-4
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7555c26c82fd0dcbc02cbd422b74468f8de1b7f2972b84fadcfa90f7371d6de5"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-5
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:4df420b7ccd96f540a4300a4fae0fcac2f4d3f23ffff9e3777c1f2d7c37ef901"
   ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-3
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:3d5efffd1e4c381041d1dff6331add86976373bde1c9dfca97ebd3d735e09dab"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-4
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:538596bf55961197f8b5670d8a6742d9bcd502b6a1045ae9d372cdf35ce69d93"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-1
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:d1bba750ab3f9ad9d28d45e332c2ec2126d248c1d619af369a3ef0c29f5936c3"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-2
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:a4fc3a41240c3bc58882d3f504e446c6931b547119012f5c45f79b0df91dbdd1"
   emscripten-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:emscripten-15
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e2729bd6c0734bb49d04e2688fec3dcf880394f351f69358dd2bd92c0f6fd309"
+    # solbuildpackpusher/solidity-buildpack-deps:emscripten-16
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:19fcb5ac029bbc27ec36e10f7d14ea224d8010145f9690562ef084fd16146b0c"
   evm-version:
     type: string
     default: london

From 45bd6827d272133ef6b936a64c9dec0d92c206c5 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Thu, 18 May 2023 18:27:17 +0200
Subject: [PATCH 1388/1748] Use sed instead of envsubst

---
 scripts/ci/notification/matrix_notification.sh | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/scripts/ci/notification/matrix_notification.sh b/scripts/ci/notification/matrix_notification.sh
index cbe290af46..f7bd1949b4 100755
--- a/scripts/ci/notification/matrix_notification.sh
+++ b/scripts/ci/notification/matrix_notification.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
 
 set -euo pipefail
-shopt -s inherit_errexit
 
 SCRIPT_DIR="$(dirname "$0")"
 
@@ -28,6 +27,7 @@ function notify() {
     curl "https://${MATRIX_SERVER}/_matrix/client/v3/rooms/${MATRIX_NOTIFY_ROOM_ID}/send/m.room.message" \
         --request POST \
         --include \
+        --fail \
         --header "Content-Type: application/json" \
         --header "Accept: application/json" \
         --header "Authorization: Bearer ${MATRIX_ACCESS_TOKEN}" \
@@ -63,10 +63,14 @@ function format_predefined_message() {
 
     [[ -z "$template" ]] && fail "Message template for event [$event] not defined."
 
-    # Export variables that must be substituted
-    export WORKFLOW_NAME JOB BRANCH TAG BUILD_URL BUILD_NUM
-    envsubst < "$template"
-    unset WORKFLOW_NAME JOB BRANCH TAG BUILD_URL BUILD_NUM
+    # shellcheck disable=SC2016
+    sed -e 's|${WORKFLOW_NAME}|'"${WORKFLOW_NAME}"'|' \
+        -e 's|${JOB}|'"${JOB}"'|' \
+        -e 's|${BRANCH}|'"${BRANCH}"'|' \
+        -e 's|${TAG}|'"${TAG}"'|' \
+        -e 's|${BUILD_URL}|'"${BUILD_URL}"'|' \
+        -e 's|${BUILD_NUM}|'"${BUILD_NUM}"'|' \
+        "$template"
 }
 
 # Set message environment variables based on CI backend

From ab70c9cccb67d68efd532fd4903c06245cbfc48e Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Thu, 18 May 2023 19:41:02 +0200
Subject: [PATCH 1389/1748] Update build_emscripten.sh

---
 .circleci/config.yml        | 1 +
 scripts/build_emscripten.sh | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d70bd6b244..0a86fe0d39 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -25,6 +25,7 @@ parameters:
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:a4fc3a41240c3bc58882d3f504e446c6931b547119012f5c45f79b0df91dbdd1"
   emscripten-docker-image:
     type: string
+    # NOTE: Please remember to update the `build_emscripten.sh` whenever the hash of this image changes.
     # solbuildpackpusher/solidity-buildpack-deps:emscripten-16
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:19fcb5ac029bbc27ec36e10f7d14ea224d8010145f9690562ef084fd16146b0c"
   evm-version:
diff --git a/scripts/build_emscripten.sh b/scripts/build_emscripten.sh
index 4e60571576..1b780a4276 100755
--- a/scripts/build_emscripten.sh
+++ b/scripts/build_emscripten.sh
@@ -33,9 +33,9 @@ if (( $# != 0 )); then
     params="$(printf "%q " "${@}")"
 fi
 
-# solbuildpackpusher/solidity-buildpack-deps:emscripten-15
+# solbuildpackpusher/solidity-buildpack-deps:emscripten-16
 # NOTE: Without `safe.directory` git would assume it's not safe to operate on /root/project since it's owned by a different user.
 # See https://github.blog/2022-04-12-git-security-vulnerability-announced/
 docker run -v "$(pwd):/root/project" -w /root/project \
-    solbuildpackpusher/solidity-buildpack-deps@sha256:f86cb1fb4631b1fbb927149f60caea7b095be5b85d379456eee09cb105e7f225 \
+    solbuildpackpusher/solidity-buildpack-deps@sha256:19fcb5ac029bbc27ec36e10f7d14ea224d8010145f9690562ef084fd16146b0c \
     /bin/bash -c "git config --global --add safe.directory /root/project && ./scripts/ci/build_emscripten.sh ${params}"

From a2a00850ca6242087666bbd1fa23b794661e9edb Mon Sep 17 00:00:00 2001
From: johnnygee19 <132227312+johnnygee19@users.noreply.github.com>
Date: Mon, 22 May 2023 07:31:21 -0400
Subject: [PATCH 1390/1748] Fix small typo on "Units and Globally Available
 Variables" page (#14252)

* Fix typo

* Update docs/units-and-global-variables.rst

---------

Co-authored-by: Nuno Santos <nunofilipesantos@gmail.com>
---
 docs/units-and-global-variables.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index 90decfad53..e890f90421 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -235,7 +235,7 @@ Mathematical and Cryptographic Functions
     the ecrecover function remained unchanged.
 
     This is usually not a problem unless you require signatures to be unique or use them to identify items.
-    OpenZeppelin have a `ECDSA helper library <https://docs.openzeppelin.com/contracts/4.x/api/utils#ECDSA>`_ that you can use as a wrapper for ``ecrecover`` without this issue.
+    OpenZeppelin has an `ECDSA helper library <https://docs.openzeppelin.com/contracts/4.x/api/utils#ECDSA>`_ that you can use as a wrapper for ``ecrecover`` without this issue.
 
 .. note::
 

From 02a07fdf469c1829fa8f2811ff84edae9eb0bf26 Mon Sep 17 00:00:00 2001
From: Nuno Santos <nunofilipesantos@gmail.com>
Date: Mon, 22 May 2023 12:54:43 +0100
Subject: [PATCH 1391/1748] Changed references to money

---
 docs/common-patterns.rst                 |  2 +-
 docs/control-structures.rst              |  2 +-
 docs/examples/blind-auction.rst          | 18 +++++++++---------
 docs/examples/safe-remote.rst            |  6 +++---
 docs/introduction-to-smart-contracts.rst |  2 +-
 docs/security-considerations.rst         |  2 +-
 docs/types/value-types.rst               |  2 +-
 docs/units-and-global-variables.rst      |  4 ++--
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/docs/common-patterns.rst b/docs/common-patterns.rst
index a76f61c18a..cbc219b53b 100644
--- a/docs/common-patterns.rst
+++ b/docs/common-patterns.rst
@@ -18,7 +18,7 @@ introduces a potential security risk. You may read
 more about this on the :ref:`security_considerations` page.
 
 The following is an example of the withdrawal pattern in practice in
-a contract where the goal is to send the most money to the
+a contract where the goal is to send the most of some compensation, e.g. Ether, to the
 contract in order to become the "richest", inspired by
 `King of the Ether <https://www.kingoftheether.com/>`_.
 
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index 88fb53a56a..f7a33db7ef 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -685,7 +685,7 @@ and ``assert`` for internal error checking.
             addr.transfer(msg.value / 2);
             // Since transfer throws an exception on failure and
             // cannot call back here, there should be no way for us to
-            // still have half of the money.
+            // still have half of the Ether.
             assert(address(this).balance == balanceBeforeTransfer - msg.value / 2);
             return address(this).balance;
         }
diff --git a/docs/examples/blind-auction.rst b/docs/examples/blind-auction.rst
index 3c7b3dcc69..47e19033f9 100644
--- a/docs/examples/blind-auction.rst
+++ b/docs/examples/blind-auction.rst
@@ -16,11 +16,11 @@ Simple Open Auction
 ===================
 
 The general idea of the following simple auction contract is that everyone can
-send their bids during a bidding period. The bids already include sending money
-/ Ether in order to bind the bidders to their bid. If the highest bid is
-raised, the previous highest bidder gets their money back.  After the end of
+send their bids during a bidding period. The bids already include sending some compensation,
+e.g. Ether, in order to bind the bidders to their bid. If the highest bid is
+raised, the previous highest bidder gets their Ether back.  After the end of
 the bidding period, the contract has to be called manually for the beneficiary
-to receive their money - contracts cannot activate themselves.
+to receive their Ether - contracts cannot activate themselves.
 
 .. code-block:: solidity
 
@@ -92,19 +92,19 @@ to receive their money - contracts cannot activate themselves.
                 revert AuctionAlreadyEnded();
 
             // If the bid is not higher, send the
-            // money back (the revert statement
+            // Ether back (the revert statement
             // will revert all changes in this
             // function execution including
-            // it having received the money).
+            // it having received the Ether).
             if (msg.value <= highestBid)
                 revert BidNotHighEnough(highestBid);
 
             if (highestBid != 0) {
-                // Sending back the money by simply using
+                // Sending back the Ether by simply using
                 // highestBidder.send(highestBid) is a security risk
                 // because it could execute an untrusted contract.
                 // It is always safer to let the recipients
-                // withdraw their money themselves.
+                // withdraw their Ether themselves.
                 pendingReturns[highestBidder] += highestBid;
             }
             highestBidder = msg.sender;
@@ -182,7 +182,7 @@ the contract checks that the hash value is the same as the one provided during
 the bidding period.
 
 Another challenge is how to make the auction **binding and blind** at the same
-time: The only way to prevent the bidder from just not sending the money after
+time: The only way to prevent the bidder from just not sending the Ether after
 they won the auction is to make them send it together with the bid. Since value
 transfers cannot be blinded in Ethereum, anyone can see the value.
 
diff --git a/docs/examples/safe-remote.rst b/docs/examples/safe-remote.rst
index e42b017fb6..a2651af238 100644
--- a/docs/examples/safe-remote.rst
+++ b/docs/examples/safe-remote.rst
@@ -6,18 +6,18 @@ Safe Remote Purchase
 
 Purchasing goods remotely currently requires multiple parties that need to trust each other.
 The simplest configuration involves a seller and a buyer. The buyer would like to receive
-an item from the seller and the seller would like to get money (or an equivalent)
+an item from the seller and the seller would like to get some compensation, e.g. Ether,
 in return. The problematic part is the shipment here: There is no way to determine for
 sure that the item arrived at the buyer.
 
 There are multiple ways to solve this problem, but all fall short in one or the other way.
 In the following example, both parties have to put twice the value of the item into the
-contract as escrow. As soon as this happened, the money will stay locked inside
+contract as escrow. As soon as this happened, the Ether will stay locked inside
 the contract until the buyer confirms that they received the item. After that,
 the buyer is returned the value (half of their deposit) and the seller gets three
 times the value (their deposit plus the value). The idea behind
 this is that both parties have an incentive to resolve the situation or otherwise
-their money is locked forever.
+their Ether is locked forever.
 
 This contract of course does not solve the problem, but gives an overview of how
 you can use state machine-like constructs inside a contract.
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 2edf22d475..5595a2fed8 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -282,7 +282,7 @@ the source account is also not modified.
 Furthermore, a transaction is always cryptographically signed by the sender (creator).
 This makes it straightforward to guard access to specific modifications of the
 database. In the example of the electronic currency, a simple check ensures that
-only the person holding the keys to the account can transfer money from it.
+only the person holding the keys to the account can transfer some compensation, e.g. Ether, from it.
 
 .. index:: ! block
 
diff --git a/docs/security-considerations.rst b/docs/security-considerations.rst
index 95c0edb99b..92d601043d 100644
--- a/docs/security-considerations.rst
+++ b/docs/security-considerations.rst
@@ -447,7 +447,7 @@ so help through off-chain computations might be needed there.
 If the self-check fails, the contract automatically switches into some kind of "failsafe" mode,
 which, for example, disables most of the features,
 hands over control to a fixed and trusted third party
-or just converts the contract into a simple "give me back my money" contract.
+or just converts the contract into a simple "give me back my Ether" contract.
 
 Ask for Peer Review
 ===================
diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 60a11d6c30..872f54b0ed 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -263,7 +263,7 @@ reverts on failure.
     There are some dangers in using ``send``: The transfer fails if the call stack depth is at 1024
     (this can always be forced by the caller) and it also fails if the recipient runs out of gas. So in order
     to make safe Ether transfers, always check the return value of ``send``, use ``transfer`` or even better:
-    use a pattern where the recipient withdraws the money.
+    use a pattern where the recipient withdraws the Ether.
 
 * ``call``, ``delegatecall`` and ``staticcall``
 
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index e890f90421..a9b29d6ba2 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -107,7 +107,7 @@ Block and Transaction Properties
 
     Both the timestamp and the block hash can be influenced by miners to some degree.
     Bad actors in the mining community can for example run a casino payout function on a chosen hash
-    and just retry a different hash if they did not receive any money.
+    and just retry a different hash if they did not receive any compensation, e.g. Ether.
 
     The current block timestamp must be strictly larger than the timestamp of the last block,
     but the only guarantee is that it will be somewhere between the timestamps of two
@@ -282,7 +282,7 @@ For more information, see the section on :ref:`address`.
     There are some dangers in using ``send``: The transfer fails if the call stack depth is at 1024
     (this can always be forced by the caller) and it also fails if the recipient runs out of gas. So in order
     to make safe Ether transfers, always check the return value of ``send``, use ``transfer`` or even better:
-    Use a pattern where the recipient withdraws the money.
+    Use a pattern where the recipient withdraws the Ether.
 
 .. warning::
     Due to the fact that the EVM considers a call to a non-existing contract to always succeed,

From 0ce5e4c94d4fc2d5373eb2251c191b32a3c1f7a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 23 May 2023 15:10:01 +0200
Subject: [PATCH 1392/1748] test_via_ir_equivalence(): Use assertions for
 precondition checks

---
 test/cmdlineTests.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index c492f52909..110199c09a 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -317,14 +317,9 @@ function test_via_ir_equivalence()
     pushd "$SOLTMPDIR" > /dev/null
 
     (( $# <= 2 )) || fail "This function accepts at most two arguments."
-
-    if [[ $2 != --optimize ]] && [[ $2 != "" ]]
-    then
-        fail "The second argument must be --optimize if present."
-    fi
-
     local solidity_file="$1"
     local optimize_flag="$2"
+    [[ $optimize_flag == --optimize || $optimize_flag == "" ]] || assertFail "The second argument must be --optimize if present."
 
     output_file_prefix=$(basename "$1" .sol)
 

From 17aacfdb6aabda73b08146a475b8dcb07c453636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 23 May 2023 15:25:48 +0200
Subject: [PATCH 1393/1748] test_via_ir_equivalence(): Fix quoting and locals

---
 test/cmdlineTests.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 110199c09a..69ae6e46b0 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -321,6 +321,7 @@ function test_via_ir_equivalence()
     local optimize_flag="$2"
     [[ $optimize_flag == --optimize || $optimize_flag == "" ]] || assertFail "The second argument must be --optimize if present."
 
+    local output_file_prefix
     output_file_prefix=$(basename "$1" .sol)
 
     local optimizer_flags=()
@@ -329,7 +330,7 @@ function test_via_ir_equivalence()
 
     msg_on_error --no-stderr "$SOLC" --ir-optimized --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
         sed '/^Optimized IR:$/d' |
-        split_on_empty_lines_into_numbered_files $output_file_prefix ".yul"
+        split_on_empty_lines_into_numbered_files "$output_file_prefix" ".yul"
 
     for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
         msg_on_error --no-stderr "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" "$yul_file" |

From bcdb41f743256a9bd8630829cc2f56bf733c3446 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 23 May 2023 15:28:18 +0200
Subject: [PATCH 1394/1748] test_via_ir_equivalence(): Remove unnecessary
 filter for `asm_output_two_stage`

- This bit will never actually appear in the output file.
---
 test/cmdlineTests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 69ae6e46b0..8f4be11407 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -339,7 +339,7 @@ function test_via_ir_equivalence()
 
     local asm_output_two_stage asm_output_via_ir
     for asm_file in $(find . -name "${output_file_prefix}*.asm" | sort -V); do
-        asm_output_two_stage+=$(sed '/^asm_output_two_stage:$/d' "$asm_file" | sed '/^=======/d')
+        asm_output_two_stage+=$(sed '/^=======/d')
     done
 
     asm_output_via_ir=$(

From 8c5304368d5b8da36046fd501408629716a71819 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 23 May 2023 15:30:07 +0200
Subject: [PATCH 1395/1748] test_via_ir_equivalence(): Simplify by merging the
 asm loops

- And fix indentation
---
 test/cmdlineTests.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 8f4be11407..416b97b32a 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -332,14 +332,14 @@ function test_via_ir_equivalence()
         sed '/^Optimized IR:$/d' |
         split_on_empty_lines_into_numbered_files "$output_file_prefix" ".yul"
 
-    for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
-        msg_on_error --no-stderr "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" "$yul_file" |
-            sed '/^Text representation:$/d' > "${yul_file/.yul/.asm}"
-    done
-
     local asm_output_two_stage asm_output_via_ir
-    for asm_file in $(find . -name "${output_file_prefix}*.asm" | sort -V); do
-        asm_output_two_stage+=$(sed '/^=======/d')
+
+    for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
+        asm_output_two_stage+=$(
+            msg_on_error --no-stderr "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" "$yul_file" |
+                sed '/^Text representation:$/d' |
+                sed '/^=======/d'
+        )
     done
 
     asm_output_via_ir=$(
@@ -354,7 +354,7 @@ function test_via_ir_equivalence()
 
     for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
         bin_output_two_stage+=$(
-        msg_on_error --no-stderr "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" |
+            msg_on_error --no-stderr "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" |
                 sed '/^Binary representation:$/d' |
                 sed '/^=======/d'
         )
@@ -362,8 +362,8 @@ function test_via_ir_equivalence()
 
     bin_output_via_ir=$(
         msg_on_error --no-stderr "$SOLC" --via-ir --bin "${optimizer_flags[@]}" "$solidity_file" |
-        sed '/^Binary:$/d' |
-        sed '/^=======/d'
+            sed '/^Binary:$/d' |
+            sed '/^=======/d'
     )
 
     diff_values "$bin_output_two_stage" "$bin_output_via_ir" --ignore-space-change --ignore-blank-lines

From b24e4fcbfa1f8bf4f38e45075ac3ee9839506234 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 24 May 2023 14:26:52 +0200
Subject: [PATCH 1396/1748] Command-line tests for --optimize-yul and
 --no-optimize-yul used together

---
 .../args                                                        | 1 +
 .../input.sol                                                   | 2 ++
 .../args                                                        | 1 +
 .../err                                                         | 1 +
 .../exit                                                        | 1 +
 .../input.yul                                                   | 1 +
 6 files changed, 7 insertions(+)
 create mode 100644 test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/args
 create mode 100644 test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/input.sol
 create mode 100644 test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/args
 create mode 100644 test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
 create mode 100644 test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/exit
 create mode 100644 test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/input.yul

diff --git a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/args b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/args
new file mode 100644
index 0000000000..ce566d3e0d
--- /dev/null
+++ b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/args
@@ -0,0 +1 @@
+--optimize-yul --no-optimize-yul
diff --git a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/input.sol b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/input.sol
new file mode 100644
index 0000000000..a32f63f78f
--- /dev/null
+++ b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/input.sol
@@ -0,0 +1,2 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
diff --git a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/args b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/args
new file mode 100644
index 0000000000..cbefff3e9b
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/args
@@ -0,0 +1 @@
+--strict-assembly --optimize-yul --no-optimize-yul
diff --git a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
new file mode 100644
index 0000000000..f020083cd0
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
@@ -0,0 +1 @@
+The following options are invalid in assembly mode: --optimize-yul, --no-optimize-yul. Optimization is disabled by default and can be enabled with --optimize.
diff --git a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/exit b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/input.yul b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/input.yul
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/input.yul
@@ -0,0 +1 @@
+{}

From a11b1c83f047bd495c9f716336bf4186111fd302 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 24 May 2023 15:40:36 +0200
Subject: [PATCH 1397/1748] Disallow using both --optimize-yul and
 --no-optimize-yul at the same time

---
 Changelog.md                                               | 1 +
 solc/CommandLineParser.cpp                                 | 7 +++++++
 .../err                                                    | 1 +
 .../exit                                                   | 1 +
 .../err                                                    | 2 +-
 5 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err
 create mode 100644 test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/exit

diff --git a/Changelog.md b/Changelog.md
index 71ccea0df1..159ec5187a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
 
 
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 1f11fc57c0..8144701264 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -1146,6 +1146,13 @@ void CommandLineParser::processArgs()
 		m_options.output.eofVersion = 1;
 	}
 
+	if (m_args.count(g_strNoOptimizeYul) > 0 && m_args.count(g_strOptimizeYul) > 0)
+		solThrow(
+			CommandLineValidationError,
+			"Options --" + g_strOptimizeYul + " and --" + g_strNoOptimizeYul + " cannot be used together."
+		);
+
+	// We deliberately ignore --optimize-yul
 	m_options.optimizer.enabled = (m_args.count(g_strOptimize) > 0);
 	m_options.optimizer.noOptimizeYul = (m_args.count(g_strNoOptimizeYul) > 0);
 	if (!m_args[g_strOptimizeRuns].defaulted())
diff --git a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err
new file mode 100644
index 0000000000..43c54c2f39
--- /dev/null
+++ b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err
@@ -0,0 +1 @@
+Options --optimize-yul and --no-optimize-yul cannot be used together.
diff --git a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/exit b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
index f020083cd0..43c54c2f39 100644
--- a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
+++ b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
@@ -1 +1 @@
-The following options are invalid in assembly mode: --optimize-yul, --no-optimize-yul. Optimization is disabled by default and can be enabled with --optimize.
+Options --optimize-yul and --no-optimize-yul cannot be used together.

From 1cc656c550e7ac0db5c7ec09fbdfa9e04a19cfdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 24 May 2023 12:33:38 +0200
Subject: [PATCH 1398/1748] docs: Remove a few leftover mentions of Ewasm

---
 docs/internals/optimizer.rst | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 9ede5ef2ac..7d168d2209 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -1279,8 +1279,8 @@ This is a tiny step that helps in reversing the effects of the SSA transform
 if it is combined with the Common Subexpression Eliminator and the
 Unused Pruner.
 
-The SSA form we generate is detrimental to code generation on the EVM and
-WebAssembly alike because it generates many local variables. It would
+The SSA form we generate is detrimental to code generation
+because it produces many local variables. It would
 be better to just re-use existing variables with assignments instead of
 fresh variable declarations.
 
@@ -1398,15 +1398,3 @@ into
     }
 
 The LiteralRematerialiser should be run before this step.
-
-
-WebAssembly specific
---------------------
-
-MainFunction
-^^^^^^^^^^^^
-
-Changes the topmost block to be a function with a specific name ("main") which has no
-inputs nor outputs.
-
-Depends on the Function Grouper.

From f09838a03d4426eee126d8bb139b8399e40d44da Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 24 May 2023 12:20:35 +0200
Subject: [PATCH 1399/1748] Prefer authenticated request to github api when the
 token is available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 .circleci/config.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d56106f69b..6db33891a3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -128,11 +128,15 @@ commands:
           command: |
             FOUNDRY_REPO="foundry-rs/foundry"
             FOUNDRY_VERSION="<< parameters.version >>"
+            # Make authenticated requests when the Github token is available
+            if [[ -n "$GITHUB_ACCESS_TOKEN" ]]; then
+              EXTRA_HEADERS=(--header 'Authorization: Bearer '"${GITHUB_ACCESS_TOKEN}")
+            fi
             FOUNDRY_RELEASE_SHA=$(curl \
               --silent \
               --fail \
               --show-error \
-              --header "Authorization: Bearer ${GITHUB_ACCESS_TOKEN}" \
+              "${EXTRA_HEADERS[@]}" \
               "https://api.github.com/repos/${FOUNDRY_REPO}/git/refs/tags/${FOUNDRY_VERSION}" \
               | jq --raw-output .object.sha \
             )

From 28a1abf89a536a5149e030f79b0ff9c728400299 Mon Sep 17 00:00:00 2001
From: GiokaMarkella <gioka.markella@gmail.com>
Date: Tue, 2 May 2023 16:34:12 +0300
Subject: [PATCH 1400/1748] Yul AST output on the CLI and in Standard JSON

---
 Changelog.md                                  |    4 +
 docs/using-the-compiler.rst                   |   10 +-
 libsolidity/codegen/ir/IRGenerator.cpp        |    8 +-
 libsolidity/codegen/ir/IRGenerator.h          |    4 +-
 libsolidity/interface/CompilerStack.cpp       |   24 +-
 libsolidity/interface/CompilerStack.h         |    8 +
 libsolidity/interface/StandardCompiler.cpp    |   24 +-
 libyul/AsmJsonConverter.cpp                   |   45 +-
 libyul/AsmJsonConverter.h                     |    2 +-
 libyul/Object.cpp                             |   30 +
 libyul/Object.h                               |    7 +-
 libyul/YulStack.cpp                           |   10 +-
 libyul/YulStack.h                             |    4 +-
 solc/CommandLineInterface.cpp                 |   71 +-
 solc/CommandLineInterface.h                   |    2 +
 solc/CommandLineParser.cpp                    |    9 +-
 solc/CommandLineParser.h                      |    4 +
 test/cmdlineTests/ast_ir/args                 |    1 +
 test/cmdlineTests/ast_ir/input.sol            |    4 +
 test/cmdlineTests/ast_ir/output               | 1078 +++++++++++++++++
 .../combined_json_generated_sources/output    |  145 +++
 .../standard_generatedSources/output.json     |  365 ++++++
 .../standard_irOptimized_ast_requested/in.sol |    4 +
 .../input.json                                |    9 +
 .../output.json                               |  729 +++++++++++
 .../standard_ir_ast_requested/in.sol          |    4 +
 .../standard_ir_ast_requested/input.json      |    9 +
 .../standard_ir_ast_requested/output.json     |  729 +++++++++++
 .../output.json                               |  230 ++++
 test/cmdlineTests/standard_yul/output.json    |  123 ++
 .../standard_yul_object/output.json           |  130 ++
 .../standard_yul_object_name/output.json      |  185 +++
 .../standard_yul_optimiserSteps/output.json   |  123 ++
 .../standard_yul_optimized/output.json        |  123 ++
 .../strict_asm_ast_compact_json/args          |    1 +
 .../strict_asm_ast_compact_json/input.yul     |   15 +
 .../strict_asm_ast_compact_json/output        |   91 ++
 test/libsolidity/ASTJSON/assembly/call.json   |   13 +
 .../ASTJSON/assembly/call_parseOnly.json      |   13 +
 .../ASTJSON/assembly/empty_block.json         |    2 +
 .../assembly/empty_block_parseOnly.json       |    2 +
 .../ASTJSON/assembly/function.json            |   12 +
 .../ASTJSON/assembly/function_parseOnly.json  |   12 +
 test/libsolidity/ASTJSON/assembly/leave.json  |    4 +
 .../ASTJSON/assembly/leave_parseOnly.json     |    4 +
 test/libsolidity/ASTJSON/assembly/loop.json   |   14 +
 .../ASTJSON/assembly/loop_parseOnly.json      |   14 +
 .../ASTJSON/assembly/nested_functions.json    |    8 +
 .../assembly/nested_functions_parseOnly.json  |    8 +
 .../ASTJSON/assembly/slot_offset.json         |   10 +
 .../assembly/slot_offset_parseOnly.json       |   10 +
 .../ASTJSON/assembly/stringlit.json           |    4 +
 .../ASTJSON/assembly/stringlit_parseOnly.json |    4 +
 test/libsolidity/ASTJSON/assembly/switch.json |   18 +
 .../ASTJSON/assembly/switch_default.json      |    8 +
 .../assembly/switch_default_parseOnly.json    |    8 +
 .../ASTJSON/assembly/switch_parseOnly.json    |   18 +
 .../ASTJSON/assembly/var_access.json          |    4 +
 .../assembly/var_access_parseOnly.json        |    4 +
 test/libsolidity/ASTJSON/yul_hex_literal.json |   10 +
 .../ASTJSON/yul_hex_literal_parseOnly.json    |   10 +
 test/solc/CommandLineParser.cpp               |    7 +-
 62 files changed, 4542 insertions(+), 43 deletions(-)
 create mode 100644 test/cmdlineTests/ast_ir/args
 create mode 100644 test/cmdlineTests/ast_ir/input.sol
 create mode 100644 test/cmdlineTests/ast_ir/output
 create mode 100644 test/cmdlineTests/standard_irOptimized_ast_requested/in.sol
 create mode 100644 test/cmdlineTests/standard_irOptimized_ast_requested/input.json
 create mode 100644 test/cmdlineTests/standard_irOptimized_ast_requested/output.json
 create mode 100644 test/cmdlineTests/standard_ir_ast_requested/in.sol
 create mode 100644 test/cmdlineTests/standard_ir_ast_requested/input.json
 create mode 100644 test/cmdlineTests/standard_ir_ast_requested/output.json
 create mode 100644 test/cmdlineTests/strict_asm_ast_compact_json/args
 create mode 100644 test/cmdlineTests/strict_asm_ast_compact_json/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_ast_compact_json/output

diff --git a/Changelog.md b/Changelog.md
index 159ec5187a..7276d02d80 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,8 +4,12 @@ Language Features:
 
 
 Compiler Features:
+ * Commandline Interface: Add ``--ast-compact-json`` output in assembler mode.
+ * Commandline Interface: Add ``--ir-ast-json`` and ``--ir-optimized-ast-json`` outputs for Solidity input, providing AST in compact JSON format for IR and optimized IR.
  * EWasm: Remove EWasm backend.
  * Parser: Introduce ``pragma experimental solidity``, which will enable an experimental language mode that in particular has no stability guarantees between non-breaking releases and is not suited for production use.
+ * Standard JSON Interface: Add ``ast`` file-level output for Yul input.
+ * Standard JSON Interface: Add ``irAst`` and ``irOptimizedAst`` contract-level outputs for Solidity input, providing AST in compact JSON format for IR and optimized IR.
 
 
 Bugfixes:
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 57f0fab6cf..4c94923e06 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -390,7 +390,9 @@ Input Description
         //   userdoc - User documentation (natspec)
         //   metadata - Metadata
         //   ir - Yul intermediate representation of the code before optimization
+        //   irAst - AST of Yul intermediate representation of the code before optimization
         //   irOptimized - Intermediate representation after optimization
+        //   irOptimizedAst - AST of intermediate representation after optimization
         //   storageLayout - Slots, offsets and types of the contract's state variables.
         //   evm.assembly - New assembly format
         //   evm.legacyAssembly - Old-style assembly format in JSON
@@ -536,8 +538,14 @@ Output Description
             "userdoc": {},
             // Developer documentation (natspec)
             "devdoc": {},
-            // Intermediate representation (string)
+            // Intermediate representation before optimization (string)
             "ir": "",
+            // AST of intermediate representation before optimization
+            "irAst":  {/* ... */},
+            // Intermediate representation after optimization (string)
+            "irOptimized": "",
+            // AST of intermediate representation after optimization
+            "irOptimizedAst": {/* ... */},
             // See the Storage Layout documentation.
             "storageLayout": {"storage": [/* ... */], "types": {/* ... */} },
             // EVM-related outputs
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index bc2f85b4ae..bbc5ef3ac7 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -40,6 +40,8 @@
 
 #include <liblangutil/SourceReferenceFormatter.h>
 
+#include <json/json.h>
+
 #include <sstream>
 #include <variant>
 
@@ -87,7 +89,7 @@ set<CallableDeclaration const*, ASTNode::CompareByID> collectReachableCallables(
 
 }
 
-pair<string, string> IRGenerator::run(
+tuple<string, Json::Value, string, Json::Value> IRGenerator::run(
 	ContractDefinition const& _contract,
 	bytes const& _cborMetadata,
 	map<ContractDefinition const*, string_view const> const& _otherYulSources
@@ -112,9 +114,11 @@ pair<string, string> IRGenerator::run(
 			);
 		solAssert(false, ir + "\n\nInvalid IR generated:\n" + errorMessage + "\n");
 	}
+	Json::Value irAst = asmStack.astJson();
 	asmStack.optimize();
+	Json::Value irOptAst = asmStack.astJson();
 
-	return {std::move(ir), asmStack.print(m_context.soliditySourceProvider())};
+	return {std::move(ir), std::move(irAst), asmStack.print(m_context.soliditySourceProvider()), std::move(irOptAst)};
 }
 
 string IRGenerator::generate(
diff --git a/libsolidity/codegen/ir/IRGenerator.h b/libsolidity/codegen/ir/IRGenerator.h
index 00387842ed..9001244b2c 100644
--- a/libsolidity/codegen/ir/IRGenerator.h
+++ b/libsolidity/codegen/ir/IRGenerator.h
@@ -32,6 +32,8 @@
 #include <liblangutil/CharStreamProvider.h>
 #include <liblangutil/EVMVersion.h>
 
+#include <json/json.h>
+
 #include <string>
 
 namespace solidity::frontend
@@ -70,7 +72,7 @@ class IRGenerator
 
 	/// Generates and returns the IR code, in unoptimized and optimized form
 	/// (or just pretty-printed, depending on the optimizer settings).
-	std::pair<std::string, std::string> run(
+	std::tuple<std::string, Json::Value, std::string, Json::Value> run(
 		ContractDefinition const& _contract,
 		bytes const& _cborMetadata,
 		std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index dae509ed5a..f8a5fed6ec 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -883,6 +883,14 @@ string const& CompilerStack::yulIR(string const& _contractName) const
 	return contract(_contractName).yulIR;
 }
 
+Json::Value const& CompilerStack::yulIRAst(string const& _contractName) const
+{
+	if (m_stackState != CompilationSuccessful)
+		solThrow(CompilerError, "Compilation was not successful.");
+
+	return contract(_contractName).yulIRAst;
+}
+
 string const& CompilerStack::yulIROptimized(string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
@@ -891,6 +899,14 @@ string const& CompilerStack::yulIROptimized(string const& _contractName) const
 	return contract(_contractName).yulIROptimized;
 }
 
+Json::Value const& CompilerStack::yulIROptimizedAst(string const& _contractName) const
+{
+	if (m_stackState != CompilationSuccessful)
+		solThrow(CompilerError, "Compilation was not successful.");
+
+	return contract(_contractName).yulIROptimizedAst;
+}
+
 evmasm::LinkerObject const& CompilerStack::object(string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
@@ -1445,7 +1461,13 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 		m_debugInfoSelection,
 		this
 	);
-	tie(compiledContract.yulIR, compiledContract.yulIROptimized) = generator.run(
+
+	tie(
+		compiledContract.yulIR,
+		compiledContract.yulIRAst,
+		compiledContract.yulIROptimized,
+		compiledContract.yulIROptimizedAst
+	) = generator.run(
 		_contract,
 		createCBORMetadata(compiledContract, /* _forIR */ true),
 		otherYulSources
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index a01eaaa0ff..8880770b82 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -276,9 +276,15 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// @returns the IR representation of a contract.
 	std::string const& yulIR(std::string const& _contractName) const;
 
+	/// @returns the IR representation of a contract AST in format.
+	Json::Value const& yulIRAst(std::string const& _contractName) const;
+
 	/// @returns the optimized IR representation of a contract.
 	std::string const& yulIROptimized(std::string const& _contractName) const;
 
+	/// @returns the optimized IR representation of a contract AST in JSON format.
+	Json::Value const& yulIROptimizedAst(std::string const& _contractName) const;
+
 	/// @returns the assembled object for a contract.
 	evmasm::LinkerObject const& object(std::string const& _contractName) const;
 
@@ -380,6 +386,8 @@ class CompilerStack: public langutil::CharStreamProvider
 		evmasm::LinkerObject runtimeObject; ///< Runtime object.
 		std::string yulIR; ///< Yul IR code.
 		std::string yulIROptimized; ///< Optimized Yul IR code.
+		Json::Value yulIRAst; ///< JSON AST of Yul IR code.
+		Json::Value yulIROptimizedAst; ///< JSON AST of optimized Yul IR code.
 		util::LazyInit<std::string const> metadata; ///< The metadata json that will be hashed into the chain.
 		util::LazyInit<Json::Value const> abi;
 		util::LazyInit<Json::Value const> storageLayout;
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 28a564a4c9..972c04ba97 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -179,7 +179,7 @@ bool hashMatchesContent(string const& _hash, string const& _content)
 
 bool isArtifactRequested(Json::Value const& _outputSelection, string const& _artifact, bool _wildcardMatchesExperimental)
 {
-	static set<string> experimental{"ir", "irOptimized"};
+	static set<string> experimental{"ir", "irAst", "irOptimized", "irOptimizedAst"};
 	for (auto const& selectedArtifactJson: _outputSelection)
 	{
 		string const& selectedArtifact = selectedArtifactJson.asString();
@@ -263,7 +263,7 @@ bool isBinaryRequested(Json::Value const& _outputSelection)
 	// This does not include "evm.methodIdentifiers" on purpose!
 	static vector<string> const outputsThatRequireBinaries = vector<string>{
 		"*",
-		"ir", "irOptimized",
+		"ir", "irAst", "irOptimized", "irOptimizedAst",
 		"evm.gasEstimates", "evm.legacyAssembly", "evm.assembly"
 	} + evmObjectComponents("bytecode") + evmObjectComponents("deployedBytecode");
 
@@ -295,7 +295,7 @@ bool isEvmBytecodeRequested(Json::Value const& _outputSelection)
 }
 
 /// @returns true if any Yul IR was requested. Note that as an exception, '*' does not
-/// yet match "ir" or "irOptimized"
+/// yet match "ir", "irAst", "irOptimized" or "irOptimizedAst"
 bool isIRRequested(Json::Value const& _outputSelection)
 {
 	if (!_outputSelection.isObject())
@@ -304,7 +304,12 @@ bool isIRRequested(Json::Value const& _outputSelection)
 	for (auto const& fileRequests: _outputSelection)
 		for (auto const& requests: fileRequests)
 			for (auto const& request: requests)
-				if (request == "ir" || request == "irOptimized")
+				if (
+					request == "ir" ||
+					request == "irAst" ||
+					request == "irOptimized" ||
+					request == "irOptimizedAst"
+				)
 					return true;
 
 	return false;
@@ -1350,8 +1355,12 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		// IR
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "ir", wildcardMatchesExperimental))
 			contractData["ir"] = compilerStack.yulIR(contractName);
+		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "irAst", wildcardMatchesExperimental))
+			contractData["irAst"] = compilerStack.yulIRAst(contractName);
 		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "irOptimized", wildcardMatchesExperimental))
 			contractData["irOptimized"] = compilerStack.yulIROptimized(contractName);
+		if (compilationSuccess && isArtifactRequested(_inputsAndSettings.outputSelection, file, name, "irOptimizedAst", wildcardMatchesExperimental))
+			contractData["irOptimizedAst"] = compilerStack.yulIROptimizedAst(contractName);
 
 		// EVM
 		Json::Value evmData(Json::objectValue);
@@ -1513,6 +1522,13 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "ir", wildcardMatchesExperimental))
 		output["contracts"][sourceName][contractName]["ir"] = stack.print();
 
+	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "ast", wildcardMatchesExperimental))
+	{
+		Json::Value sourceResult = Json::objectValue;
+		sourceResult["id"] = 1;
+		sourceResult["ast"] = stack.astJson();
+		output["sources"][sourceName] = sourceResult;
+	}
 	stack.optimize();
 
 	MachineAssemblyObject object;
diff --git a/libyul/AsmJsonConverter.cpp b/libyul/AsmJsonConverter.cpp
index 1807396c50..0a800c2bad 100644
--- a/libyul/AsmJsonConverter.cpp
+++ b/libyul/AsmJsonConverter.cpp
@@ -33,7 +33,7 @@ namespace solidity::yul
 
 Json::Value AsmJsonConverter::operator()(Block const& _node) const
 {
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulBlock");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulBlock");
 	ret["statements"] = vectorOfVariantsToJson(_node.statements);
 	return ret;
 }
@@ -41,7 +41,7 @@ Json::Value AsmJsonConverter::operator()(Block const& _node) const
 Json::Value AsmJsonConverter::operator()(TypedName const& _node) const
 {
 	yulAssert(!_node.name.empty(), "Invalid variable name.");
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulTypedName");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulTypedName");
 	ret["name"] = _node.name.str();
 	ret["type"] = _node.type.str();
 	return ret;
@@ -49,7 +49,7 @@ Json::Value AsmJsonConverter::operator()(TypedName const& _node) const
 
 Json::Value AsmJsonConverter::operator()(Literal const& _node) const
 {
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulLiteral");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulLiteral");
 	switch (_node.kind)
 	{
 	case LiteralKind::Number:
@@ -76,7 +76,7 @@ Json::Value AsmJsonConverter::operator()(Literal const& _node) const
 Json::Value AsmJsonConverter::operator()(Identifier const& _node) const
 {
 	yulAssert(!_node.name.empty(), "Invalid identifier");
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulIdentifier");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulIdentifier");
 	ret["name"] = _node.name.str();
 	return ret;
 }
@@ -84,7 +84,7 @@ Json::Value AsmJsonConverter::operator()(Identifier const& _node) const
 Json::Value AsmJsonConverter::operator()(Assignment const& _node) const
 {
 	yulAssert(_node.variableNames.size() >= 1, "Invalid assignment syntax");
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulAssignment");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulAssignment");
 	for (auto const& var: _node.variableNames)
 		ret["variableNames"].append((*this)(var));
 	ret["value"] = _node.value ? std::visit(*this, *_node.value) : Json::nullValue;
@@ -93,7 +93,7 @@ Json::Value AsmJsonConverter::operator()(Assignment const& _node) const
 
 Json::Value AsmJsonConverter::operator()(FunctionCall const& _node) const
 {
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulFunctionCall");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulFunctionCall");
 	ret["functionName"] = (*this)(_node.functionName);
 	ret["arguments"] = vectorOfVariantsToJson(_node.arguments);
 	return ret;
@@ -101,14 +101,14 @@ Json::Value AsmJsonConverter::operator()(FunctionCall const& _node) const
 
 Json::Value AsmJsonConverter::operator()(ExpressionStatement const& _node) const
 {
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulExpressionStatement");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulExpressionStatement");
 	ret["expression"] = std::visit(*this, _node.expression);
 	return ret;
 }
 
 Json::Value AsmJsonConverter::operator()(VariableDeclaration const& _node) const
 {
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulVariableDeclaration");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulVariableDeclaration");
 	for (auto const& var: _node.variables)
 		ret["variables"].append((*this)(var));
 
@@ -120,7 +120,7 @@ Json::Value AsmJsonConverter::operator()(VariableDeclaration const& _node) const
 Json::Value AsmJsonConverter::operator()(FunctionDefinition const& _node) const
 {
 	yulAssert(!_node.name.empty(), "Invalid function name.");
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulFunctionDefinition");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulFunctionDefinition");
 	ret["name"] = _node.name.str();
 	for (auto const& var: _node.parameters)
 		ret["parameters"].append((*this)(var));
@@ -133,7 +133,7 @@ Json::Value AsmJsonConverter::operator()(FunctionDefinition const& _node) const
 Json::Value AsmJsonConverter::operator()(If const& _node) const
 {
 	yulAssert(_node.condition, "Invalid if condition.");
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulIf");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulIf");
 	ret["condition"] = std::visit(*this, *_node.condition);
 	ret["body"] = (*this)(_node.body);
 	return ret;
@@ -142,7 +142,7 @@ Json::Value AsmJsonConverter::operator()(If const& _node) const
 Json::Value AsmJsonConverter::operator()(Switch const& _node) const
 {
 	yulAssert(_node.expression, "Invalid expression pointer.");
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulSwitch");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulSwitch");
 	ret["expression"] = std::visit(*this, *_node.expression);
 	for (auto const& var: _node.cases)
 		ret["cases"].append((*this)(var));
@@ -151,7 +151,7 @@ Json::Value AsmJsonConverter::operator()(Switch const& _node) const
 
 Json::Value AsmJsonConverter::operator()(Case const& _node) const
 {
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulCase");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulCase");
 	ret["value"] = _node.value ? (*this)(*_node.value) : "default";
 	ret["body"] = (*this)(_node.body);
 	return ret;
@@ -160,7 +160,7 @@ Json::Value AsmJsonConverter::operator()(Case const& _node) const
 Json::Value AsmJsonConverter::operator()(ForLoop const& _node) const
 {
 	yulAssert(_node.condition, "Invalid for loop condition.");
-	Json::Value ret = createAstNode(nativeLocationOf(_node), "YulForLoop");
+	Json::Value ret = createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulForLoop");
 	ret["pre"] = (*this)(_node.pre);
 	ret["condition"] = std::visit(*this, *_node.condition);
 	ret["post"] = (*this)(_node.post);
@@ -170,27 +170,30 @@ Json::Value AsmJsonConverter::operator()(ForLoop const& _node) const
 
 Json::Value AsmJsonConverter::operator()(Break const& _node) const
 {
-	return createAstNode(nativeLocationOf(_node), "YulBreak");
+	return createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulBreak");
 }
 
 Json::Value AsmJsonConverter::operator()(Continue const& _node) const
 {
-	return createAstNode(nativeLocationOf(_node), "YulContinue");
+	return createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulContinue");
 }
 
 Json::Value AsmJsonConverter::operator()(Leave const& _node) const
 {
-	return createAstNode(nativeLocationOf(_node), "YulLeave");
+	return createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulLeave");
 }
 
-Json::Value AsmJsonConverter::createAstNode(langutil::SourceLocation const& _location, string _nodeType) const
+Json::Value AsmJsonConverter::createAstNode(langutil::SourceLocation const& _originLocation, langutil::SourceLocation const& _nativeLocation, string _nodeType) const
 {
 	Json::Value ret{Json::objectValue};
 	ret["nodeType"] = std::move(_nodeType);
-	int length = -1;
-	if (_location.start >= 0 && _location.end >= 0)
-		length = _location.end - _location.start;
-	ret["src"] = to_string(_location.start) + ":" + to_string(length) + ":" + (m_sourceIndex.has_value() ? to_string(m_sourceIndex.value()) : "-1");
+	auto srcLocation = [&](int start, int end) -> string
+	{
+		int length = (start >= 0 && end >= 0 && end >= start) ? end - start : -1;
+		return to_string(start) + ":" + to_string(length) + ":" + (m_sourceIndex.has_value() ? to_string(m_sourceIndex.value()) : "-1");
+	};
+	ret["src"] = srcLocation(_originLocation.start, _originLocation.end);
+	ret["nativeSrc"] = srcLocation(_nativeLocation.start, _nativeLocation.end);
 	return ret;
 }
 
diff --git a/libyul/AsmJsonConverter.h b/libyul/AsmJsonConverter.h
index 52e36d5cdd..236ecbba57 100644
--- a/libyul/AsmJsonConverter.h
+++ b/libyul/AsmJsonConverter.h
@@ -62,7 +62,7 @@ class AsmJsonConverter: public boost::static_visitor<Json::Value>
 	Json::Value operator()(Label const& _node) const;
 
 private:
-	Json::Value createAstNode(langutil::SourceLocation const& _location, std::string _nodeType) const;
+	Json::Value createAstNode(langutil::SourceLocation const& _originLocation, langutil::SourceLocation const& _nativeLocation, std::string _nodeType) const;
 	template <class T>
 	Json::Value vectorOfVariantsToJson(std::vector<T> const& vec) const;
 
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index cf68ff765f..97857aa4ba 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -22,6 +22,8 @@
 #include <libyul/Object.h>
 
 #include <libyul/AsmPrinter.h>
+#include <libyul/AsmJsonConverter.h>
+#include <libyul/AST.h>
 #include <libyul/Exceptions.h>
 
 #include <libsolutil/CommonData.h>
@@ -88,6 +90,34 @@ string Object::toString(
 	return useSrcComment + "object \"" + name.str() + "\" {\n" + indent(inner) + "\n}";
 }
 
+Json::Value Data::toJson() const
+{
+	Json::Value ret{Json::objectValue};
+	ret["nodeType"] = "YulData";
+	ret["value"] = util::toHex(data);
+	return ret;
+}
+
+Json::Value Object::toJson() const
+{
+	yulAssert(code, "No code");
+
+	Json::Value codeJson{Json::objectValue};
+	codeJson["nodeType"] = "YulCode";
+	codeJson["block"] = AsmJsonConverter(0 /* sourceIndex */)(*code);
+
+	Json::Value subObjectsJson{Json::arrayValue};
+	for (shared_ptr<ObjectNode> const& subObject: subObjects)
+		subObjectsJson.append(subObject->toJson());
+
+	Json::Value ret{Json::objectValue};
+	ret["nodeType"] = "YulObject";
+	ret["name"] = name.str();
+	ret["code"] = codeJson;
+	ret["subObjects"] = subObjectsJson;
+	return ret;
+}
+
 set<YulString> Object::qualifiedDataNames() const
 {
 	set<YulString> qualifiedNames =
diff --git a/libyul/Object.h b/libyul/Object.h
index f3c4ee34a5..5f88d3bc7f 100644
--- a/libyul/Object.h
+++ b/libyul/Object.h
@@ -32,13 +32,13 @@
 #include <memory>
 #include <set>
 #include <limits>
+#include <json/json.h>
 
 namespace solidity::yul
 {
 struct Dialect;
 struct AsmAnalysisInfo;
 
-
 using SourceNameMap = std::map<unsigned, std::shared_ptr<std::string const>>;
 
 struct Object;
@@ -58,6 +58,7 @@ struct ObjectNode
 		langutil::DebugInfoSelection const& _debugInfoSelection,
 		langutil::CharStreamProvider const* _soliditySourceProvider
 	) const = 0;
+	virtual Json::Value toJson() const = 0;
 };
 
 /**
@@ -74,6 +75,7 @@ struct Data: public ObjectNode
 		langutil::DebugInfoSelection const& _debugInfoSelection,
 		langutil::CharStreamProvider const* _soliditySourceProvider
 	) const override;
+	Json::Value toJson() const override;
 };
 
 
@@ -95,7 +97,8 @@ struct Object: public ObjectNode
 		langutil::DebugInfoSelection const& _debugInfoSelection = langutil::DebugInfoSelection::Default(),
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
 	) const;
-
+	/// @returns a compact JSON representation of the AST.
+	Json::Value toJson() const;
 	/// @returns the set of names of data objects accessible from within the code of
 	/// this object, including the name of object itself
 	/// Handles all names containing dots as reserved identifiers, not accessible as data.
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 9ac90c3959..a4f9615646 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -31,10 +31,11 @@
 #include <libyul/backends/evm/EVMMetrics.h>
 #include <libyul/ObjectParser.h>
 #include <libyul/optimiser/Suite.h>
-
 #include <libevmasm/Assembly.h>
 #include <liblangutil/Scanner.h>
+
 #include <boost/algorithm/string.hpp>
+
 #include <optional>
 
 using namespace std;
@@ -270,6 +271,13 @@ string YulStack::print(
 	return m_parserResult->toString(&languageToDialect(m_language, m_evmVersion), m_debugInfoSelection, _soliditySourceProvider) + "\n";
 }
 
+Json::Value YulStack::astJson() const
+{
+	yulAssert(m_parserResult, "");
+	yulAssert(m_parserResult->code, "");
+	return  m_parserResult->toJson();
+}
+
 shared_ptr<Object> YulStack::parserResult() const
 {
 	yulAssert(m_analysisSuccessful, "Analysis was not successful.");
diff --git a/libyul/YulStack.h b/libyul/YulStack.h
index bd38cd6024..700fd2b3ba 100644
--- a/libyul/YulStack.h
+++ b/libyul/YulStack.h
@@ -33,6 +33,8 @@
 
 #include <libevmasm/LinkerObject.h>
 
+#include <json/json.h>
+
 #include <memory>
 #include <string>
 
@@ -130,7 +132,7 @@ class YulStack: public langutil::CharStreamProvider
 	std::string print(
 		langutil::CharStreamProvider const* _soliditySourceProvider = nullptr
 	) const;
-
+	Json::Value astJson() const;
 	/// Return the parsed and analyzed object.
 	std::shared_ptr<Object> parserResult() const;
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 0f45f51963..0d0f4c5f9c 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -223,6 +223,31 @@ void CommandLineInterface::handleIR(string const& _contractName)
 	}
 }
 
+void CommandLineInterface::handleIRAst(string const& _contractName)
+{
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
+
+	if (!m_options.compiler.outputs.irAstJson)
+		return;
+
+	if (!m_options.output.dir.empty())
+		createFile(
+			m_compiler->filesystemFriendlyName(_contractName) + "_yul_ast.json",
+			util::jsonPrint(
+				m_compiler->yulIRAst(_contractName),
+				m_options.formatting.json
+			)
+		);
+	else
+	{
+		sout() << "IR AST:" << endl;
+		sout() << util::jsonPrint(
+			m_compiler->yulIRAst(_contractName),
+			m_options.formatting.json
+		) << endl;
+	}
+}
+
 void CommandLineInterface::handleIROptimized(string const& _contractName)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
@@ -231,7 +256,10 @@ void CommandLineInterface::handleIROptimized(string const& _contractName)
 		return;
 
 	if (!m_options.output.dir.empty())
-		createFile(m_compiler->filesystemFriendlyName(_contractName) + "_opt.yul", m_compiler->yulIROptimized(_contractName));
+		createFile(
+			m_compiler->filesystemFriendlyName(_contractName) + "_opt.yul",
+			m_compiler->yulIROptimized(_contractName)
+		);
 	else
 	{
 		sout() << "Optimized IR:" << endl;
@@ -239,6 +267,31 @@ void CommandLineInterface::handleIROptimized(string const& _contractName)
 	}
 }
 
+void CommandLineInterface::handleIROptimizedAst(string const& _contractName)
+{
+	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
+
+	if (!m_options.compiler.outputs.irOptimizedAstJson)
+		return;
+
+	if (!m_options.output.dir.empty())
+		createFile(
+			m_compiler->filesystemFriendlyName(_contractName) + "_opt_yul_ast.json",
+			util::jsonPrint(
+				m_compiler->yulIROptimizedAst(_contractName),
+				m_options.formatting.json
+			)
+		);
+	else
+	{
+		sout() << "Optimized IR AST:" << endl;
+		sout() << util::jsonPrint(
+			m_compiler->yulIROptimizedAst(_contractName),
+			m_options.formatting.json
+		) << endl;
+	}
+}
+
 void CommandLineInterface::handleBytecode(string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
@@ -690,8 +743,12 @@ void CommandLineInterface::compile()
 		if (m_options.output.debugInfoSelection.has_value())
 			m_compiler->selectDebugInfo(m_options.output.debugInfoSelection.value());
 		// TODO: Perhaps we should not compile unless requested
-
-		m_compiler->enableIRGeneration(m_options.compiler.outputs.ir || m_options.compiler.outputs.irOptimized);
+		m_compiler->enableIRGeneration(
+			m_options.compiler.outputs.ir ||
+			m_options.compiler.outputs.irOptimized ||
+			m_options.compiler.outputs.irAstJson ||
+			m_options.compiler.outputs.irOptimizedAstJson
+		);
 		m_compiler->enableEvmBytecodeGeneration(
 			m_options.compiler.estimateGas ||
 			m_options.compiler.outputs.asm_ ||
@@ -1084,7 +1141,11 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 			else
 				serr() << "No binary representation found." << endl;
 		}
-
+		if (m_options.compiler.outputs.astCompactJson)
+		{
+			sout() << "AST:" <<  endl <<  endl;
+			sout() << util::jsonPrint(stack.astJson(), m_options.formatting.json) << endl;
+		}
 		solAssert(_targetMachine == yul::YulStack::Machine::EVM, "");
 		if (m_options.compiler.outputs.asm_)
 		{
@@ -1141,7 +1202,9 @@ void CommandLineInterface::outputCompilationResults()
 
 		handleBytecode(contract);
 		handleIR(contract);
+		handleIRAst(contract);
 		handleIROptimized(contract);
+		handleIROptimizedAst(contract);
 		handleSignatureHashes(contract);
 		handleMetadata(contract);
 		handleABI(contract);
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index b6d7f92a8c..5de69270b7 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -101,7 +101,9 @@ class CommandLineInterface
 	void handleBinary(std::string const& _contract);
 	void handleOpcode(std::string const& _contract);
 	void handleIR(std::string const& _contract);
+	void handleIRAst(std::string const& _contract);
 	void handleIROptimized(std::string const& _contract);
+	void handleIROptimizedAst(std::string const& _contract);
 	void handleBytecode(std::string const& _contract);
 	void handleSignatureHashes(std::string const& _contract);
 	void handleMetadata(std::string const& _contract);
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 8144701264..5140733890 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -461,7 +461,8 @@ void CommandLineParser::parseOutputSelection()
 		static set<string> const assemblerModeOutputs = {
 			CompilerOutputs::componentName(&CompilerOutputs::asm_),
 			CompilerOutputs::componentName(&CompilerOutputs::binary),
-			CompilerOutputs::componentName(&CompilerOutputs::irOptimized)
+			CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
+			CompilerOutputs::componentName(&CompilerOutputs::astCompactJson),
 		};
 
 		switch (_mode)
@@ -735,7 +736,9 @@ General Information)").c_str(),
 		(CompilerOutputs::componentName(&CompilerOutputs::binaryRuntime).c_str(), "Binary of the runtime part of the contracts in hex.")
 		(CompilerOutputs::componentName(&CompilerOutputs::abi).c_str(), "ABI specification of the contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::ir).c_str(), "Intermediate Representation (IR) of all contracts.")
-		(CompilerOutputs::componentName(&CompilerOutputs::irOptimized).c_str(), "Optimized intermediate Representation (IR) of all contracts.")
+		(CompilerOutputs::componentName(&CompilerOutputs::irAstJson).c_str(), "AST of Intermediate Representation (IR) of all contracts in a compact JSON format.")
+		(CompilerOutputs::componentName(&CompilerOutputs::irOptimized).c_str(), "Optimized Intermediate Representation (IR) of all contracts.")
+		(CompilerOutputs::componentName(&CompilerOutputs::irOptimizedAstJson).c_str(), "AST of optimized Intermediate Representation (IR) of all contracts in a compact JSON format.")
 		(CompilerOutputs::componentName(&CompilerOutputs::signatureHashes).c_str(), "Function signature hashes of the contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::natspecUser).c_str(), "Natspec user documentation of all contracts.")
 		(CompilerOutputs::componentName(&CompilerOutputs::natspecDev).c_str(), "Natspec developer documentation of all contracts.")
@@ -991,7 +994,9 @@ void CommandLineParser::processArgs()
 	array<string, 9> const conflictingWithStopAfter{
 		CompilerOutputs::componentName(&CompilerOutputs::binary),
 		CompilerOutputs::componentName(&CompilerOutputs::ir),
+		CompilerOutputs::componentName(&CompilerOutputs::irAstJson),
 		CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
+		CompilerOutputs::componentName(&CompilerOutputs::irOptimizedAstJson),
 		g_strGas,
 		CompilerOutputs::componentName(&CompilerOutputs::asm_),
 		CompilerOutputs::componentName(&CompilerOutputs::asmJson),
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 9bfae03462..a4c5a77194 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -77,7 +77,9 @@ struct CompilerOutputs
 			{"bin-runtime", &CompilerOutputs::binaryRuntime},
 			{"abi", &CompilerOutputs::abi},
 			{"ir", &CompilerOutputs::ir},
+			{"ir-ast-json", &CompilerOutputs::irAstJson},
 			{"ir-optimized", &CompilerOutputs::irOptimized},
+			{"ir-optimized-ast-json", &CompilerOutputs::irOptimizedAstJson},
 			{"hashes", &CompilerOutputs::signatureHashes},
 			{"userdoc", &CompilerOutputs::natspecUser},
 			{"devdoc", &CompilerOutputs::natspecDev},
@@ -95,7 +97,9 @@ struct CompilerOutputs
 	bool binaryRuntime = false;
 	bool abi = false;
 	bool ir = false;
+	bool irAstJson = false;
 	bool irOptimized = false;
+	bool irOptimizedAstJson = false;
 	bool signatureHashes = false;
 	bool natspecUser = false;
 	bool natspecDev = false;
diff --git a/test/cmdlineTests/ast_ir/args b/test/cmdlineTests/ast_ir/args
new file mode 100644
index 0000000000..d254bff83d
--- /dev/null
+++ b/test/cmdlineTests/ast_ir/args
@@ -0,0 +1 @@
+--ir-ast-json --ir-optimized-ast-json --optimize --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/ast_ir/input.sol b/test/cmdlineTests/ast_ir/input.sol
new file mode 100644
index 0000000000..f123f6c8be
--- /dev/null
+++ b/test/cmdlineTests/ast_ir/input.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {}
diff --git a/test/cmdlineTests/ast_ir/output b/test/cmdlineTests/ast_ir/output
new file mode 100644
index 0000000000..cca31349e8
--- /dev/null
+++ b/test/cmdlineTests/ast_ir/output
@@ -0,0 +1,1078 @@
+IR AST:
+{
+    "code":
+    {
+        "block":
+        {
+            "nativeSrc": "59:790:0",
+            "nodeType": "YulBlock",
+            "src": "-1:-1:0",
+            "statements":
+            [
+                {
+                    "expression":
+                    {
+                        "arguments":
+                        [
+                            {
+                                "kind": "number",
+                                "nativeSrc": "118:2:0",
+                                "nodeType": "YulLiteral",
+                                "src": "60:13:0",
+                                "type": "",
+                                "value": "64"
+                            },
+                            {
+                                "arguments":
+                                [
+                                    {
+                                        "kind": "number",
+                                        "nativeSrc": "134:3:0",
+                                        "nodeType": "YulLiteral",
+                                        "src": "60:13:0",
+                                        "type": "",
+                                        "value": "128"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "memoryguard",
+                                    "nativeSrc": "122:11:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "122:16:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            }
+                        ],
+                        "functionName":
+                        {
+                            "name": "mstore",
+                            "nativeSrc": "111:6:0",
+                            "nodeType": "YulIdentifier",
+                            "src": "60:13:0"
+                        },
+                        "nativeSrc": "111:28:0",
+                        "nodeType": "YulFunctionCall",
+                        "src": "60:13:0"
+                    },
+                    "nativeSrc": "111:28:0",
+                    "nodeType": "YulExpressionStatement",
+                    "src": "60:13:0"
+                },
+                {
+                    "body":
+                    {
+                        "nativeSrc": "163:83:0",
+                        "nodeType": "YulBlock",
+                        "src": "60:13:0",
+                        "statements":
+                        [
+                            {
+                                "expression":
+                                {
+                                    "arguments": [],
+                                    "functionName":
+                                    {
+                                        "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
+                                        "nativeSrc": "165:77:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "60:13:0"
+                                    },
+                                    "nativeSrc": "165:79:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "165:79:0",
+                                "nodeType": "YulExpressionStatement",
+                                "src": "60:13:0"
+                            }
+                        ]
+                    },
+                    "condition":
+                    {
+                        "arguments": [],
+                        "functionName":
+                        {
+                            "name": "callvalue",
+                            "nativeSrc": "151:9:0",
+                            "nodeType": "YulIdentifier",
+                            "src": "60:13:0"
+                        },
+                        "nativeSrc": "151:11:0",
+                        "nodeType": "YulFunctionCall",
+                        "src": "60:13:0"
+                    },
+                    "nativeSrc": "148:98:0",
+                    "nodeType": "YulIf",
+                    "src": "60:13:0"
+                },
+                {
+                    "expression":
+                    {
+                        "arguments": [],
+                        "functionName":
+                        {
+                            "name": "constructor_C_2",
+                            "nativeSrc": "256:15:0",
+                            "nodeType": "YulIdentifier",
+                            "src": "60:13:0"
+                        },
+                        "nativeSrc": "256:17:0",
+                        "nodeType": "YulFunctionCall",
+                        "src": "60:13:0"
+                    },
+                    "nativeSrc": "256:17:0",
+                    "nodeType": "YulExpressionStatement",
+                    "src": "60:13:0"
+                },
+                {
+                    "nativeSrc": "283:30:0",
+                    "nodeType": "YulVariableDeclaration",
+                    "src": "60:13:0",
+                    "value":
+                    {
+                        "arguments": [],
+                        "functionName":
+                        {
+                            "name": "allocate_unbounded",
+                            "nativeSrc": "293:18:0",
+                            "nodeType": "YulIdentifier",
+                            "src": "60:13:0"
+                        },
+                        "nativeSrc": "293:20:0",
+                        "nodeType": "YulFunctionCall",
+                        "src": "60:13:0"
+                    },
+                    "variables":
+                    [
+                        {
+                            "name": "_1",
+                            "nativeSrc": "287:2:0",
+                            "nodeType": "YulTypedName",
+                            "src": "60:13:0",
+                            "type": ""
+                        }
+                    ]
+                },
+                {
+                    "expression":
+                    {
+                        "arguments":
+                        [
+                            {
+                                "name": "_1",
+                                "nativeSrc": "331:2:0",
+                                "nodeType": "YulIdentifier",
+                                "src": "60:13:0"
+                            },
+                            {
+                                "arguments":
+                                [
+                                    {
+                                        "hexValue": "435f325f6465706c6f796564",
+                                        "kind": "string",
+                                        "nativeSrc": "346:14:0",
+                                        "nodeType": "YulLiteral",
+                                        "src": "60:13:0",
+                                        "type": "",
+                                        "value": "C_2_deployed"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "dataoffset",
+                                    "nativeSrc": "335:10:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "335:26:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            },
+                            {
+                                "arguments":
+                                [
+                                    {
+                                        "hexValue": "435f325f6465706c6f796564",
+                                        "kind": "string",
+                                        "nativeSrc": "372:14:0",
+                                        "nodeType": "YulLiteral",
+                                        "src": "60:13:0",
+                                        "type": "",
+                                        "value": "C_2_deployed"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "datasize",
+                                    "nativeSrc": "363:8:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "363:24:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            }
+                        ],
+                        "functionName":
+                        {
+                            "name": "codecopy",
+                            "nativeSrc": "322:8:0",
+                            "nodeType": "YulIdentifier",
+                            "src": "60:13:0"
+                        },
+                        "nativeSrc": "322:66:0",
+                        "nodeType": "YulFunctionCall",
+                        "src": "60:13:0"
+                    },
+                    "nativeSrc": "322:66:0",
+                    "nodeType": "YulExpressionStatement",
+                    "src": "60:13:0"
+                },
+                {
+                    "expression":
+                    {
+                        "arguments":
+                        [
+                            {
+                                "name": "_1",
+                                "nativeSrc": "405:2:0",
+                                "nodeType": "YulIdentifier",
+                                "src": "60:13:0"
+                            },
+                            {
+                                "arguments":
+                                [
+                                    {
+                                        "hexValue": "435f325f6465706c6f796564",
+                                        "kind": "string",
+                                        "nativeSrc": "418:14:0",
+                                        "nodeType": "YulLiteral",
+                                        "src": "60:13:0",
+                                        "type": "",
+                                        "value": "C_2_deployed"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "datasize",
+                                    "nativeSrc": "409:8:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "409:24:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            }
+                        ],
+                        "functionName":
+                        {
+                            "name": "return",
+                            "nativeSrc": "398:6:0",
+                            "nodeType": "YulIdentifier",
+                            "src": "60:13:0"
+                        },
+                        "nativeSrc": "398:36:0",
+                        "nodeType": "YulFunctionCall",
+                        "src": "60:13:0"
+                    },
+                    "nativeSrc": "398:36:0",
+                    "nodeType": "YulExpressionStatement",
+                    "src": "60:13:0"
+                },
+                {
+                    "body":
+                    {
+                        "nativeSrc": "484:43:0",
+                        "nodeType": "YulBlock",
+                        "src": "60:13:0",
+                        "statements":
+                        [
+                            {
+                                "nativeSrc": "498:19:0",
+                                "nodeType": "YulAssignment",
+                                "src": "60:13:0",
+                                "value":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "514:2:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "60:13:0",
+                                            "type": "",
+                                            "value": "64"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "mload",
+                                        "nativeSrc": "508:5:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "60:13:0"
+                                    },
+                                    "nativeSrc": "508:9:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "60:13:0"
+                                },
+                                "variableNames":
+                                [
+                                    {
+                                        "name": "memPtr",
+                                        "nativeSrc": "498:6:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "60:13:0"
+                                    }
+                                ]
+                            }
+                        ]
+                    },
+                    "name": "allocate_unbounded",
+                    "nativeSrc": "444:83:0",
+                    "nodeType": "YulFunctionDefinition",
+                    "returnVariables":
+                    [
+                        {
+                            "name": "memPtr",
+                            "nativeSrc": "477:6:0",
+                            "nodeType": "YulTypedName",
+                            "src": "60:13:0",
+                            "type": ""
+                        }
+                    ],
+                    "src": "60:13:0"
+                },
+                {
+                    "body":
+                    {
+                        "nativeSrc": "626:36:0",
+                        "nodeType": "YulBlock",
+                        "src": "60:13:0",
+                        "statements":
+                        [
+                            {
+                                "expression":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "647:1:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "60:13:0",
+                                            "type": "",
+                                            "value": "0"
+                                        },
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "650:1:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "60:13:0",
+                                            "type": "",
+                                            "value": "0"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "revert",
+                                        "nativeSrc": "640:6:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "60:13:0"
+                                    },
+                                    "nativeSrc": "640:12:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "640:12:0",
+                                "nodeType": "YulExpressionStatement",
+                                "src": "60:13:0"
+                            }
+                        ]
+                    },
+                    "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
+                    "nativeSrc": "537:125:0",
+                    "nodeType": "YulFunctionDefinition",
+                    "src": "60:13:0"
+                },
+                {
+                    "body":
+                    {
+                        "nativeSrc": "741:59:0",
+                        "nodeType": "YulBlock",
+                        "src": "60:13:0",
+                        "statements": []
+                    },
+                    "name": "constructor_C_2",
+                    "nativeSrc": "714:86:0",
+                    "nodeType": "YulFunctionDefinition",
+                    "src": "60:13:0"
+                }
+            ]
+        },
+        "nodeType": "YulCode"
+    },
+    "name": "C_2",
+    "nodeType": "YulObject",
+    "subObjects":
+    [
+        {
+            "code":
+            {
+                "block":
+                {
+                    "nativeSrc": "929:588:0",
+                    "nodeType": "YulBlock",
+                    "src": "-1:-1:0",
+                    "statements":
+                    [
+                        {
+                            "expression":
+                            {
+                                "arguments":
+                                [
+                                    {
+                                        "kind": "number",
+                                        "nativeSrc": "996:2:0",
+                                        "nodeType": "YulLiteral",
+                                        "src": "60:13:0",
+                                        "type": "",
+                                        "value": "64"
+                                    },
+                                    {
+                                        "arguments":
+                                        [
+                                            {
+                                                "kind": "number",
+                                                "nativeSrc": "1012:3:0",
+                                                "nodeType": "YulLiteral",
+                                                "src": "60:13:0",
+                                                "type": "",
+                                                "value": "128"
+                                            }
+                                        ],
+                                        "functionName":
+                                        {
+                                            "name": "memoryguard",
+                                            "nativeSrc": "1000:11:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "60:13:0"
+                                        },
+                                        "nativeSrc": "1000:16:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "60:13:0"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "mstore",
+                                    "nativeSrc": "989:6:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "989:28:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            },
+                            "nativeSrc": "989:28:0",
+                            "nodeType": "YulExpressionStatement",
+                            "src": "60:13:0"
+                        },
+                        {
+                            "expression":
+                            {
+                                "arguments": [],
+                                "functionName":
+                                {
+                                    "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
+                                    "nativeSrc": "1031:77:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "1031:79:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            },
+                            "nativeSrc": "1031:79:0",
+                            "nodeType": "YulExpressionStatement",
+                            "src": "60:13:0"
+                        },
+                        {
+                            "body":
+                            {
+                                "nativeSrc": "1177:77:0",
+                                "nodeType": "YulBlock",
+                                "src": "60:13:0",
+                                "statements":
+                                [
+                                    {
+                                        "nativeSrc": "1195:44:0",
+                                        "nodeType": "YulAssignment",
+                                        "src": "60:13:0",
+                                        "value":
+                                        {
+                                            "arguments":
+                                            [
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "1228:3:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "60:13:0",
+                                                    "type": "",
+                                                    "value": "224"
+                                                },
+                                                {
+                                                    "name": "value",
+                                                    "nativeSrc": "1233:5:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "60:13:0"
+                                                }
+                                            ],
+                                            "functionName":
+                                            {
+                                                "name": "shr",
+                                                "nativeSrc": "1224:3:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "60:13:0"
+                                            },
+                                            "nativeSrc": "1224:15:0",
+                                            "nodeType": "YulFunctionCall",
+                                            "src": "60:13:0"
+                                        },
+                                        "variableNames":
+                                        [
+                                            {
+                                                "name": "newValue",
+                                                "nativeSrc": "1195:8:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "60:13:0"
+                                            }
+                                        ]
+                                    }
+                                ]
+                            },
+                            "name": "shift_right_224_unsigned",
+                            "nativeSrc": "1124:130:0",
+                            "nodeType": "YulFunctionDefinition",
+                            "parameters":
+                            [
+                                {
+                                    "name": "value",
+                                    "nativeSrc": "1158:5:0",
+                                    "nodeType": "YulTypedName",
+                                    "src": "60:13:0",
+                                    "type": ""
+                                }
+                            ],
+                            "returnVariables":
+                            [
+                                {
+                                    "name": "newValue",
+                                    "nativeSrc": "1168:8:0",
+                                    "nodeType": "YulTypedName",
+                                    "src": "60:13:0",
+                                    "type": ""
+                                }
+                            ],
+                            "src": "60:13:0"
+                        },
+                        {
+                            "body":
+                            {
+                                "nativeSrc": "1308:51:0",
+                                "nodeType": "YulBlock",
+                                "src": "60:13:0",
+                                "statements":
+                                [
+                                    {
+                                        "nativeSrc": "1326:19:0",
+                                        "nodeType": "YulAssignment",
+                                        "src": "60:13:0",
+                                        "value":
+                                        {
+                                            "arguments":
+                                            [
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "1342:2:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "60:13:0",
+                                                    "type": "",
+                                                    "value": "64"
+                                                }
+                                            ],
+                                            "functionName":
+                                            {
+                                                "name": "mload",
+                                                "nativeSrc": "1336:5:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "60:13:0"
+                                            },
+                                            "nativeSrc": "1336:9:0",
+                                            "nodeType": "YulFunctionCall",
+                                            "src": "60:13:0"
+                                        },
+                                        "variableNames":
+                                        [
+                                            {
+                                                "name": "memPtr",
+                                                "nativeSrc": "1326:6:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "60:13:0"
+                                            }
+                                        ]
+                                    }
+                                ]
+                            },
+                            "name": "allocate_unbounded",
+                            "nativeSrc": "1268:91:0",
+                            "nodeType": "YulFunctionDefinition",
+                            "returnVariables":
+                            [
+                                {
+                                    "name": "memPtr",
+                                    "nativeSrc": "1301:6:0",
+                                    "nodeType": "YulTypedName",
+                                    "src": "60:13:0",
+                                    "type": ""
+                                }
+                            ],
+                            "src": "60:13:0"
+                        },
+                        {
+                            "body":
+                            {
+                                "nativeSrc": "1462:44:0",
+                                "nodeType": "YulBlock",
+                                "src": "60:13:0",
+                                "statements":
+                                [
+                                    {
+                                        "expression":
+                                        {
+                                            "arguments":
+                                            [
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "1487:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "60:13:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                },
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "1490:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "60:13:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                }
+                                            ],
+                                            "functionName":
+                                            {
+                                                "name": "revert",
+                                                "nativeSrc": "1480:6:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "60:13:0"
+                                            },
+                                            "nativeSrc": "1480:12:0",
+                                            "nodeType": "YulFunctionCall",
+                                            "src": "60:13:0"
+                                        },
+                                        "nativeSrc": "1480:12:0",
+                                        "nodeType": "YulExpressionStatement",
+                                        "src": "60:13:0"
+                                    }
+                                ]
+                            },
+                            "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
+                            "nativeSrc": "1373:133:0",
+                            "nodeType": "YulFunctionDefinition",
+                            "src": "60:13:0"
+                        }
+                    ]
+                },
+                "nodeType": "YulCode"
+            },
+            "name": "C_2_deployed",
+            "nodeType": "YulObject",
+            "subObjects":
+            [
+                {
+                    "nodeType": "YulData",
+                    "value": "<BYTECODE REMOVED>"
+                }
+            ]
+        }
+    ]
+}
+Optimized IR AST:
+{
+    "code":
+    {
+        "block":
+        {
+            "nativeSrc": "59:790:0",
+            "nodeType": "YulBlock",
+            "src": "-1:-1:0",
+            "statements":
+            [
+                {
+                    "nativeSrc": "59:790:0",
+                    "nodeType": "YulBlock",
+                    "src": "-1:-1:0",
+                    "statements":
+                    [
+                        {
+                            "nativeSrc": "122:16:0",
+                            "nodeType": "YulVariableDeclaration",
+                            "src": "60:13:0",
+                            "value":
+                            {
+                                "arguments":
+                                [
+                                    {
+                                        "kind": "number",
+                                        "nativeSrc": "134:3:0",
+                                        "nodeType": "YulLiteral",
+                                        "src": "60:13:0",
+                                        "type": "",
+                                        "value": "0x80"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "memoryguard",
+                                    "nativeSrc": "122:11:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "122:16:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            },
+                            "variables":
+                            [
+                                {
+                                    "name": "_1",
+                                    "nativeSrc": "122:16:0",
+                                    "nodeType": "YulTypedName",
+                                    "src": "60:13:0",
+                                    "type": ""
+                                }
+                            ]
+                        },
+                        {
+                            "expression":
+                            {
+                                "arguments":
+                                [
+                                    {
+                                        "kind": "number",
+                                        "nativeSrc": "118:2:0",
+                                        "nodeType": "YulLiteral",
+                                        "src": "60:13:0",
+                                        "type": "",
+                                        "value": "64"
+                                    },
+                                    {
+                                        "name": "_1",
+                                        "nativeSrc": "122:16:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "60:13:0"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "mstore",
+                                    "nativeSrc": "111:6:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "111:28:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            },
+                            "nativeSrc": "111:28:0",
+                            "nodeType": "YulExpressionStatement",
+                            "src": "60:13:0"
+                        },
+                        {
+                            "body":
+                            {
+                                "nativeSrc": "163:83:0",
+                                "nodeType": "YulBlock",
+                                "src": "60:13:0",
+                                "statements":
+                                [
+                                    {
+                                        "expression":
+                                        {
+                                            "arguments":
+                                            [
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "650:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "60:13:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                },
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "650:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "60:13:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                }
+                                            ],
+                                            "functionName":
+                                            {
+                                                "name": "revert",
+                                                "nativeSrc": "640:6:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "60:13:0"
+                                            },
+                                            "nativeSrc": "640:12:0",
+                                            "nodeType": "YulFunctionCall",
+                                            "src": "60:13:0"
+                                        },
+                                        "nativeSrc": "640:12:0",
+                                        "nodeType": "YulExpressionStatement",
+                                        "src": "60:13:0"
+                                    }
+                                ]
+                            },
+                            "condition":
+                            {
+                                "arguments": [],
+                                "functionName":
+                                {
+                                    "name": "callvalue",
+                                    "nativeSrc": "151:9:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "151:11:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            },
+                            "nativeSrc": "148:98:0",
+                            "nodeType": "YulIf",
+                            "src": "60:13:0"
+                        },
+                        {
+                            "nativeSrc": "363:24:0",
+                            "nodeType": "YulVariableDeclaration",
+                            "src": "60:13:0",
+                            "value":
+                            {
+                                "arguments":
+                                [
+                                    {
+                                        "hexValue": "435f325f6465706c6f796564",
+                                        "kind": "string",
+                                        "nativeSrc": "372:14:0",
+                                        "nodeType": "YulLiteral",
+                                        "src": "60:13:0",
+                                        "type": "",
+                                        "value": "C_2_deployed"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "datasize",
+                                    "nativeSrc": "363:8:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "363:24:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            },
+                            "variables":
+                            [
+                                {
+                                    "name": "_2",
+                                    "nativeSrc": "363:24:0",
+                                    "nodeType": "YulTypedName",
+                                    "src": "60:13:0",
+                                    "type": ""
+                                }
+                            ]
+                        },
+                        {
+                            "expression":
+                            {
+                                "arguments":
+                                [
+                                    {
+                                        "name": "_1",
+                                        "nativeSrc": "331:2:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "60:13:0"
+                                    },
+                                    {
+                                        "arguments":
+                                        [
+                                            {
+                                                "hexValue": "435f325f6465706c6f796564",
+                                                "kind": "string",
+                                                "nativeSrc": "346:14:0",
+                                                "nodeType": "YulLiteral",
+                                                "src": "60:13:0",
+                                                "type": "",
+                                                "value": "C_2_deployed"
+                                            }
+                                        ],
+                                        "functionName":
+                                        {
+                                            "name": "dataoffset",
+                                            "nativeSrc": "335:10:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "60:13:0"
+                                        },
+                                        "nativeSrc": "335:26:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "60:13:0"
+                                    },
+                                    {
+                                        "name": "_2",
+                                        "nativeSrc": "363:24:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "60:13:0"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "codecopy",
+                                    "nativeSrc": "322:8:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "322:66:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            },
+                            "nativeSrc": "322:66:0",
+                            "nodeType": "YulExpressionStatement",
+                            "src": "60:13:0"
+                        },
+                        {
+                            "expression":
+                            {
+                                "arguments":
+                                [
+                                    {
+                                        "name": "_1",
+                                        "nativeSrc": "405:2:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "60:13:0"
+                                    },
+                                    {
+                                        "name": "_2",
+                                        "nativeSrc": "409:24:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "60:13:0"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "return",
+                                    "nativeSrc": "398:6:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:13:0"
+                                },
+                                "nativeSrc": "398:36:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:13:0"
+                            },
+                            "nativeSrc": "398:36:0",
+                            "nodeType": "YulExpressionStatement",
+                            "src": "60:13:0"
+                        }
+                    ]
+                }
+            ]
+        },
+        "nodeType": "YulCode"
+    },
+    "name": "C_2",
+    "nodeType": "YulObject",
+    "subObjects":
+    [
+        {
+            "code":
+            {
+                "block":
+                {
+                    "nativeSrc": "929:588:0",
+                    "nodeType": "YulBlock",
+                    "src": "-1:-1:0",
+                    "statements":
+                    [
+                        {
+                            "nativeSrc": "929:588:0",
+                            "nodeType": "YulBlock",
+                            "src": "-1:-1:0",
+                            "statements":
+                            [
+                                {
+                                    "expression":
+                                    {
+                                        "arguments":
+                                        [
+                                            {
+                                                "kind": "number",
+                                                "nativeSrc": "1490:1:0",
+                                                "nodeType": "YulLiteral",
+                                                "src": "60:13:0",
+                                                "type": "",
+                                                "value": "0"
+                                            },
+                                            {
+                                                "kind": "number",
+                                                "nativeSrc": "1490:1:0",
+                                                "nodeType": "YulLiteral",
+                                                "src": "60:13:0",
+                                                "type": "",
+                                                "value": "0"
+                                            }
+                                        ],
+                                        "functionName":
+                                        {
+                                            "name": "revert",
+                                            "nativeSrc": "1480:6:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "60:13:0"
+                                        },
+                                        "nativeSrc": "1480:12:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "60:13:0"
+                                    },
+                                    "nativeSrc": "1480:12:0",
+                                    "nodeType": "YulExpressionStatement",
+                                    "src": "60:13:0"
+                                }
+                            ]
+                        }
+                    ]
+                },
+                "nodeType": "YulCode"
+            },
+            "name": "C_2_deployed",
+            "nodeType": "YulObject",
+            "subObjects":
+            [
+                {
+                    "nodeType": "YulData",
+                    "value": "<BYTECODE REMOVED>"
+                }
+            ]
+        }
+    ]
+}
diff --git a/test/cmdlineTests/combined_json_generated_sources/output b/test/cmdlineTests/combined_json_generated_sources/output
index 0bd9395fea..5ef9078d6e 100644
--- a/test/cmdlineTests/combined_json_generated_sources/output
+++ b/test/cmdlineTests/combined_json_generated_sources/output
@@ -9,6 +9,7 @@
         {
           "ast":
           {
+            "nativeSrc": "0:1856:1",
             "nodeType": "YulBlock",
             "src": "0:1856:1",
             "statements":
@@ -16,11 +17,13 @@
               {
                 "body":
                 {
+                  "nativeSrc": "47:35:1",
                   "nodeType": "YulBlock",
                   "src": "47:35:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "57:19:1",
                       "nodeType": "YulAssignment",
                       "src": "57:19:1",
                       "value":
@@ -29,6 +32,7 @@
                         [
                           {
                             "kind": "number",
+                            "nativeSrc": "73:2:1",
                             "nodeType": "YulLiteral",
                             "src": "73:2:1",
                             "type": "",
@@ -38,9 +42,11 @@
                         "functionName":
                         {
                           "name": "mload",
+                          "nativeSrc": "67:5:1",
                           "nodeType": "YulIdentifier",
                           "src": "67:5:1"
                         },
+                        "nativeSrc": "67:9:1",
                         "nodeType": "YulFunctionCall",
                         "src": "67:9:1"
                       },
@@ -48,6 +54,7 @@
                       [
                         {
                           "name": "memPtr",
+                          "nativeSrc": "57:6:1",
                           "nodeType": "YulIdentifier",
                           "src": "57:6:1"
                         }
@@ -56,11 +63,13 @@
                   ]
                 },
                 "name": "allocate_unbounded",
+                "nativeSrc": "7:75:1",
                 "nodeType": "YulFunctionDefinition",
                 "returnVariables":
                 [
                   {
                     "name": "memPtr",
+                    "nativeSrc": "40:6:1",
                     "nodeType": "YulTypedName",
                     "src": "40:6:1",
                     "type": ""
@@ -71,6 +80,7 @@
               {
                 "body":
                 {
+                  "nativeSrc": "177:28:1",
                   "nodeType": "YulBlock",
                   "src": "177:28:1",
                   "statements":
@@ -82,6 +92,7 @@
                         [
                           {
                             "kind": "number",
+                            "nativeSrc": "194:1:1",
                             "nodeType": "YulLiteral",
                             "src": "194:1:1",
                             "type": "",
@@ -89,6 +100,7 @@
                           },
                           {
                             "kind": "number",
+                            "nativeSrc": "197:1:1",
                             "nodeType": "YulLiteral",
                             "src": "197:1:1",
                             "type": "",
@@ -98,24 +110,29 @@
                         "functionName":
                         {
                           "name": "revert",
+                          "nativeSrc": "187:6:1",
                           "nodeType": "YulIdentifier",
                           "src": "187:6:1"
                         },
+                        "nativeSrc": "187:12:1",
                         "nodeType": "YulFunctionCall",
                         "src": "187:12:1"
                       },
+                      "nativeSrc": "187:12:1",
                       "nodeType": "YulExpressionStatement",
                       "src": "187:12:1"
                     }
                   ]
                 },
                 "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
+                "nativeSrc": "88:117:1",
                 "nodeType": "YulFunctionDefinition",
                 "src": "88:117:1"
               },
               {
                 "body":
                 {
+                  "nativeSrc": "300:28:1",
                   "nodeType": "YulBlock",
                   "src": "300:28:1",
                   "statements":
@@ -127,6 +144,7 @@
                         [
                           {
                             "kind": "number",
+                            "nativeSrc": "317:1:1",
                             "nodeType": "YulLiteral",
                             "src": "317:1:1",
                             "type": "",
@@ -134,6 +152,7 @@
                           },
                           {
                             "kind": "number",
+                            "nativeSrc": "320:1:1",
                             "nodeType": "YulLiteral",
                             "src": "320:1:1",
                             "type": "",
@@ -143,24 +162,29 @@
                         "functionName":
                         {
                           "name": "revert",
+                          "nativeSrc": "310:6:1",
                           "nodeType": "YulIdentifier",
                           "src": "310:6:1"
                         },
+                        "nativeSrc": "310:12:1",
                         "nodeType": "YulFunctionCall",
                         "src": "310:12:1"
                       },
+                      "nativeSrc": "310:12:1",
                       "nodeType": "YulExpressionStatement",
                       "src": "310:12:1"
                     }
                   ]
                 },
                 "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
+                "nativeSrc": "211:117:1",
                 "nodeType": "YulFunctionDefinition",
                 "src": "211:117:1"
               },
               {
                 "body":
                 {
+                  "nativeSrc": "423:28:1",
                   "nodeType": "YulBlock",
                   "src": "423:28:1",
                   "statements":
@@ -172,6 +196,7 @@
                         [
                           {
                             "kind": "number",
+                            "nativeSrc": "440:1:1",
                             "nodeType": "YulLiteral",
                             "src": "440:1:1",
                             "type": "",
@@ -179,6 +204,7 @@
                           },
                           {
                             "kind": "number",
+                            "nativeSrc": "443:1:1",
                             "nodeType": "YulLiteral",
                             "src": "443:1:1",
                             "type": "",
@@ -188,24 +214,29 @@
                         "functionName":
                         {
                           "name": "revert",
+                          "nativeSrc": "433:6:1",
                           "nodeType": "YulIdentifier",
                           "src": "433:6:1"
                         },
+                        "nativeSrc": "433:12:1",
                         "nodeType": "YulFunctionCall",
                         "src": "433:12:1"
                       },
+                      "nativeSrc": "433:12:1",
                       "nodeType": "YulExpressionStatement",
                       "src": "433:12:1"
                     }
                   ]
                 },
                 "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
+                "nativeSrc": "334:117:1",
                 "nodeType": "YulFunctionDefinition",
                 "src": "334:117:1"
               },
               {
                 "body":
                 {
+                  "nativeSrc": "546:28:1",
                   "nodeType": "YulBlock",
                   "src": "546:28:1",
                   "statements":
@@ -217,6 +248,7 @@
                         [
                           {
                             "kind": "number",
+                            "nativeSrc": "563:1:1",
                             "nodeType": "YulLiteral",
                             "src": "563:1:1",
                             "type": "",
@@ -224,6 +256,7 @@
                           },
                           {
                             "kind": "number",
+                            "nativeSrc": "566:1:1",
                             "nodeType": "YulLiteral",
                             "src": "566:1:1",
                             "type": "",
@@ -233,24 +266,29 @@
                         "functionName":
                         {
                           "name": "revert",
+                          "nativeSrc": "556:6:1",
                           "nodeType": "YulIdentifier",
                           "src": "556:6:1"
                         },
+                        "nativeSrc": "556:12:1",
                         "nodeType": "YulFunctionCall",
                         "src": "556:12:1"
                       },
+                      "nativeSrc": "556:12:1",
                       "nodeType": "YulExpressionStatement",
                       "src": "556:12:1"
                     }
                   ]
                 },
                 "name": "revert_error_15abf5612cd996bc235ba1e55a4a30ac60e6bb601ff7ba4ad3f179b6be8d0490",
+                "nativeSrc": "457:117:1",
                 "nodeType": "YulFunctionDefinition",
                 "src": "457:117:1"
               },
               {
                 "body":
                 {
+                  "nativeSrc": "669:28:1",
                   "nodeType": "YulBlock",
                   "src": "669:28:1",
                   "statements":
@@ -262,6 +300,7 @@
                         [
                           {
                             "kind": "number",
+                            "nativeSrc": "686:1:1",
                             "nodeType": "YulLiteral",
                             "src": "686:1:1",
                             "type": "",
@@ -269,6 +308,7 @@
                           },
                           {
                             "kind": "number",
+                            "nativeSrc": "689:1:1",
                             "nodeType": "YulLiteral",
                             "src": "689:1:1",
                             "type": "",
@@ -278,24 +318,29 @@
                         "functionName":
                         {
                           "name": "revert",
+                          "nativeSrc": "679:6:1",
                           "nodeType": "YulIdentifier",
                           "src": "679:6:1"
                         },
+                        "nativeSrc": "679:12:1",
                         "nodeType": "YulFunctionCall",
                         "src": "679:12:1"
                       },
+                      "nativeSrc": "679:12:1",
                       "nodeType": "YulExpressionStatement",
                       "src": "679:12:1"
                     }
                   ]
                 },
                 "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
+                "nativeSrc": "580:117:1",
                 "nodeType": "YulFunctionDefinition",
                 "src": "580:117:1"
               },
               {
                 "body":
                 {
+                  "nativeSrc": "810:478:1",
                   "nodeType": "YulBlock",
                   "src": "810:478:1",
                   "statements":
@@ -303,6 +348,7 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "859:83:1",
                         "nodeType": "YulBlock",
                         "src": "859:83:1",
                         "statements":
@@ -314,12 +360,15 @@
                               "functionName":
                               {
                                 "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
+                                "nativeSrc": "861:77:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "861:77:1"
                               },
+                              "nativeSrc": "861:79:1",
                               "nodeType": "YulFunctionCall",
                               "src": "861:79:1"
                             },
+                            "nativeSrc": "861:79:1",
                             "nodeType": "YulExpressionStatement",
                             "src": "861:79:1"
                           }
@@ -337,11 +386,13 @@
                                 [
                                   {
                                     "name": "offset",
+                                    "nativeSrc": "838:6:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "838:6:1"
                                   },
                                   {
                                     "kind": "number",
+                                    "nativeSrc": "846:4:1",
                                     "nodeType": "YulLiteral",
                                     "src": "846:4:1",
                                     "type": "",
@@ -351,14 +402,17 @@
                                 "functionName":
                                 {
                                   "name": "add",
+                                  "nativeSrc": "834:3:1",
                                   "nodeType": "YulIdentifier",
                                   "src": "834:3:1"
                                 },
+                                "nativeSrc": "834:17:1",
                                 "nodeType": "YulFunctionCall",
                                 "src": "834:17:1"
                               },
                               {
                                 "name": "end",
+                                "nativeSrc": "853:3:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "853:3:1"
                               }
@@ -366,9 +420,11 @@
                             "functionName":
                             {
                               "name": "slt",
+                              "nativeSrc": "830:3:1",
                               "nodeType": "YulIdentifier",
                               "src": "830:3:1"
                             },
+                            "nativeSrc": "830:27:1",
                             "nodeType": "YulFunctionCall",
                             "src": "830:27:1"
                           }
@@ -376,16 +432,20 @@
                         "functionName":
                         {
                           "name": "iszero",
+                          "nativeSrc": "823:6:1",
                           "nodeType": "YulIdentifier",
                           "src": "823:6:1"
                         },
+                        "nativeSrc": "823:35:1",
                         "nodeType": "YulFunctionCall",
                         "src": "823:35:1"
                       },
+                      "nativeSrc": "820:122:1",
                       "nodeType": "YulIf",
                       "src": "820:122:1"
                     },
                     {
+                      "nativeSrc": "951:30:1",
                       "nodeType": "YulAssignment",
                       "src": "951:30:1",
                       "value":
@@ -394,6 +454,7 @@
                         [
                           {
                             "name": "offset",
+                            "nativeSrc": "974:6:1",
                             "nodeType": "YulIdentifier",
                             "src": "974:6:1"
                           }
@@ -401,9 +462,11 @@
                         "functionName":
                         {
                           "name": "calldataload",
+                          "nativeSrc": "961:12:1",
                           "nodeType": "YulIdentifier",
                           "src": "961:12:1"
                         },
+                        "nativeSrc": "961:20:1",
                         "nodeType": "YulFunctionCall",
                         "src": "961:20:1"
                       },
@@ -411,6 +474,7 @@
                       [
                         {
                           "name": "length",
+                          "nativeSrc": "951:6:1",
                           "nodeType": "YulIdentifier",
                           "src": "951:6:1"
                         }
@@ -419,6 +483,7 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "1024:83:1",
                         "nodeType": "YulBlock",
                         "src": "1024:83:1",
                         "statements":
@@ -430,12 +495,15 @@
                               "functionName":
                               {
                                 "name": "revert_error_15abf5612cd996bc235ba1e55a4a30ac60e6bb601ff7ba4ad3f179b6be8d0490",
+                                "nativeSrc": "1026:77:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "1026:77:1"
                               },
+                              "nativeSrc": "1026:79:1",
                               "nodeType": "YulFunctionCall",
                               "src": "1026:79:1"
                             },
+                            "nativeSrc": "1026:79:1",
                             "nodeType": "YulExpressionStatement",
                             "src": "1026:79:1"
                           }
@@ -447,11 +515,13 @@
                         [
                           {
                             "name": "length",
+                            "nativeSrc": "996:6:1",
                             "nodeType": "YulIdentifier",
                             "src": "996:6:1"
                           },
                           {
                             "kind": "number",
+                            "nativeSrc": "1004:18:1",
                             "nodeType": "YulLiteral",
                             "src": "1004:18:1",
                             "type": "",
@@ -461,16 +531,20 @@
                         "functionName":
                         {
                           "name": "gt",
+                          "nativeSrc": "993:2:1",
                           "nodeType": "YulIdentifier",
                           "src": "993:2:1"
                         },
+                        "nativeSrc": "993:30:1",
                         "nodeType": "YulFunctionCall",
                         "src": "993:30:1"
                       },
+                      "nativeSrc": "990:117:1",
                       "nodeType": "YulIf",
                       "src": "990:117:1"
                     },
                     {
+                      "nativeSrc": "1116:29:1",
                       "nodeType": "YulAssignment",
                       "src": "1116:29:1",
                       "value":
@@ -479,11 +553,13 @@
                         [
                           {
                             "name": "offset",
+                            "nativeSrc": "1132:6:1",
                             "nodeType": "YulIdentifier",
                             "src": "1132:6:1"
                           },
                           {
                             "kind": "number",
+                            "nativeSrc": "1140:4:1",
                             "nodeType": "YulLiteral",
                             "src": "1140:4:1",
                             "type": "",
@@ -493,9 +569,11 @@
                         "functionName":
                         {
                           "name": "add",
+                          "nativeSrc": "1128:3:1",
                           "nodeType": "YulIdentifier",
                           "src": "1128:3:1"
                         },
+                        "nativeSrc": "1128:17:1",
                         "nodeType": "YulFunctionCall",
                         "src": "1128:17:1"
                       },
@@ -503,6 +581,7 @@
                       [
                         {
                           "name": "arrayPos",
+                          "nativeSrc": "1116:8:1",
                           "nodeType": "YulIdentifier",
                           "src": "1116:8:1"
                         }
@@ -511,6 +590,7 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "1199:83:1",
                         "nodeType": "YulBlock",
                         "src": "1199:83:1",
                         "statements":
@@ -522,12 +602,15 @@
                               "functionName":
                               {
                                 "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
+                                "nativeSrc": "1201:77:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "1201:77:1"
                               },
+                              "nativeSrc": "1201:79:1",
                               "nodeType": "YulFunctionCall",
                               "src": "1201:79:1"
                             },
+                            "nativeSrc": "1201:79:1",
                             "nodeType": "YulExpressionStatement",
                             "src": "1201:79:1"
                           }
@@ -542,6 +625,7 @@
                             [
                               {
                                 "name": "arrayPos",
+                                "nativeSrc": "1164:8:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "1164:8:1"
                               },
@@ -550,11 +634,13 @@
                                 [
                                   {
                                     "name": "length",
+                                    "nativeSrc": "1178:6:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "1178:6:1"
                                   },
                                   {
                                     "kind": "number",
+                                    "nativeSrc": "1186:4:1",
                                     "nodeType": "YulLiteral",
                                     "src": "1186:4:1",
                                     "type": "",
@@ -564,9 +650,11 @@
                                 "functionName":
                                 {
                                   "name": "mul",
+                                  "nativeSrc": "1174:3:1",
                                   "nodeType": "YulIdentifier",
                                   "src": "1174:3:1"
                                 },
+                                "nativeSrc": "1174:17:1",
                                 "nodeType": "YulFunctionCall",
                                 "src": "1174:17:1"
                               }
@@ -574,14 +662,17 @@
                             "functionName":
                             {
                               "name": "add",
+                              "nativeSrc": "1160:3:1",
                               "nodeType": "YulIdentifier",
                               "src": "1160:3:1"
                             },
+                            "nativeSrc": "1160:32:1",
                             "nodeType": "YulFunctionCall",
                             "src": "1160:32:1"
                           },
                           {
                             "name": "end",
+                            "nativeSrc": "1194:3:1",
                             "nodeType": "YulIdentifier",
                             "src": "1194:3:1"
                           }
@@ -589,29 +680,35 @@
                         "functionName":
                         {
                           "name": "gt",
+                          "nativeSrc": "1157:2:1",
                           "nodeType": "YulIdentifier",
                           "src": "1157:2:1"
                         },
+                        "nativeSrc": "1157:41:1",
                         "nodeType": "YulFunctionCall",
                         "src": "1157:41:1"
                       },
+                      "nativeSrc": "1154:128:1",
                       "nodeType": "YulIf",
                       "src": "1154:128:1"
                     }
                   ]
                 },
                 "name": "abi_decode_t_array$_t_uint256_$dyn_calldata_ptr",
+                "nativeSrc": "720:568:1",
                 "nodeType": "YulFunctionDefinition",
                 "parameters":
                 [
                   {
                     "name": "offset",
+                    "nativeSrc": "777:6:1",
                     "nodeType": "YulTypedName",
                     "src": "777:6:1",
                     "type": ""
                   },
                   {
                     "name": "end",
+                    "nativeSrc": "785:3:1",
                     "nodeType": "YulTypedName",
                     "src": "785:3:1",
                     "type": ""
@@ -621,12 +718,14 @@
                 [
                   {
                     "name": "arrayPos",
+                    "nativeSrc": "793:8:1",
                     "nodeType": "YulTypedName",
                     "src": "793:8:1",
                     "type": ""
                   },
                   {
                     "name": "length",
+                    "nativeSrc": "803:6:1",
                     "nodeType": "YulTypedName",
                     "src": "803:6:1",
                     "type": ""
@@ -637,6 +736,7 @@
               {
                 "body":
                 {
+                  "nativeSrc": "1395:458:1",
                   "nodeType": "YulBlock",
                   "src": "1395:458:1",
                   "statements":
@@ -644,6 +744,7 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "1441:83:1",
                         "nodeType": "YulBlock",
                         "src": "1441:83:1",
                         "statements":
@@ -655,12 +756,15 @@
                               "functionName":
                               {
                                 "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
+                                "nativeSrc": "1443:77:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "1443:77:1"
                               },
+                              "nativeSrc": "1443:79:1",
                               "nodeType": "YulFunctionCall",
                               "src": "1443:79:1"
                             },
+                            "nativeSrc": "1443:79:1",
                             "nodeType": "YulExpressionStatement",
                             "src": "1443:79:1"
                           }
@@ -675,11 +779,13 @@
                             [
                               {
                                 "name": "dataEnd",
+                                "nativeSrc": "1416:7:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "1416:7:1"
                               },
                               {
                                 "name": "headStart",
+                                "nativeSrc": "1425:9:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "1425:9:1"
                               }
@@ -687,14 +793,17 @@
                             "functionName":
                             {
                               "name": "sub",
+                              "nativeSrc": "1412:3:1",
                               "nodeType": "YulIdentifier",
                               "src": "1412:3:1"
                             },
+                            "nativeSrc": "1412:23:1",
                             "nodeType": "YulFunctionCall",
                             "src": "1412:23:1"
                           },
                           {
                             "kind": "number",
+                            "nativeSrc": "1437:2:1",
                             "nodeType": "YulLiteral",
                             "src": "1437:2:1",
                             "type": "",
@@ -704,21 +813,26 @@
                         "functionName":
                         {
                           "name": "slt",
+                          "nativeSrc": "1408:3:1",
                           "nodeType": "YulIdentifier",
                           "src": "1408:3:1"
                         },
+                        "nativeSrc": "1408:32:1",
                         "nodeType": "YulFunctionCall",
                         "src": "1408:32:1"
                       },
+                      "nativeSrc": "1405:119:1",
                       "nodeType": "YulIf",
                       "src": "1405:119:1"
                     },
                     {
+                      "nativeSrc": "1534:312:1",
                       "nodeType": "YulBlock",
                       "src": "1534:312:1",
                       "statements":
                       [
                         {
+                          "nativeSrc": "1549:45:1",
                           "nodeType": "YulVariableDeclaration",
                           "src": "1549:45:1",
                           "value":
@@ -730,11 +844,13 @@
                                 [
                                   {
                                     "name": "headStart",
+                                    "nativeSrc": "1580:9:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "1580:9:1"
                                   },
                                   {
                                     "kind": "number",
+                                    "nativeSrc": "1591:1:1",
                                     "nodeType": "YulLiteral",
                                     "src": "1591:1:1",
                                     "type": "",
@@ -744,9 +860,11 @@
                                 "functionName":
                                 {
                                   "name": "add",
+                                  "nativeSrc": "1576:3:1",
                                   "nodeType": "YulIdentifier",
                                   "src": "1576:3:1"
                                 },
+                                "nativeSrc": "1576:17:1",
                                 "nodeType": "YulFunctionCall",
                                 "src": "1576:17:1"
                               }
@@ -754,9 +872,11 @@
                             "functionName":
                             {
                               "name": "calldataload",
+                              "nativeSrc": "1563:12:1",
                               "nodeType": "YulIdentifier",
                               "src": "1563:12:1"
                             },
+                            "nativeSrc": "1563:31:1",
                             "nodeType": "YulFunctionCall",
                             "src": "1563:31:1"
                           },
@@ -764,6 +884,7 @@
                           [
                             {
                               "name": "offset",
+                              "nativeSrc": "1553:6:1",
                               "nodeType": "YulTypedName",
                               "src": "1553:6:1",
                               "type": ""
@@ -773,6 +894,7 @@
                         {
                           "body":
                           {
+                            "nativeSrc": "1641:83:1",
                             "nodeType": "YulBlock",
                             "src": "1641:83:1",
                             "statements":
@@ -784,12 +906,15 @@
                                   "functionName":
                                   {
                                     "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
+                                    "nativeSrc": "1643:77:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "1643:77:1"
                                   },
+                                  "nativeSrc": "1643:79:1",
                                   "nodeType": "YulFunctionCall",
                                   "src": "1643:79:1"
                                 },
+                                "nativeSrc": "1643:79:1",
                                 "nodeType": "YulExpressionStatement",
                                 "src": "1643:79:1"
                               }
@@ -801,11 +926,13 @@
                             [
                               {
                                 "name": "offset",
+                                "nativeSrc": "1613:6:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "1613:6:1"
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "1621:18:1",
                                 "nodeType": "YulLiteral",
                                 "src": "1621:18:1",
                                 "type": "",
@@ -815,16 +942,20 @@
                             "functionName":
                             {
                               "name": "gt",
+                              "nativeSrc": "1610:2:1",
                               "nodeType": "YulIdentifier",
                               "src": "1610:2:1"
                             },
+                            "nativeSrc": "1610:30:1",
                             "nodeType": "YulFunctionCall",
                             "src": "1610:30:1"
                           },
+                          "nativeSrc": "1607:117:1",
                           "nodeType": "YulIf",
                           "src": "1607:117:1"
                         },
                         {
+                          "nativeSrc": "1738:98:1",
                           "nodeType": "YulAssignment",
                           "src": "1738:98:1",
                           "value":
@@ -836,11 +967,13 @@
                                 [
                                   {
                                     "name": "headStart",
+                                    "nativeSrc": "1808:9:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "1808:9:1"
                                   },
                                   {
                                     "name": "offset",
+                                    "nativeSrc": "1819:6:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "1819:6:1"
                                   }
@@ -848,14 +981,17 @@
                                 "functionName":
                                 {
                                   "name": "add",
+                                  "nativeSrc": "1804:3:1",
                                   "nodeType": "YulIdentifier",
                                   "src": "1804:3:1"
                                 },
+                                "nativeSrc": "1804:22:1",
                                 "nodeType": "YulFunctionCall",
                                 "src": "1804:22:1"
                               },
                               {
                                 "name": "dataEnd",
+                                "nativeSrc": "1828:7:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "1828:7:1"
                               }
@@ -863,9 +999,11 @@
                             "functionName":
                             {
                               "name": "abi_decode_t_array$_t_uint256_$dyn_calldata_ptr",
+                              "nativeSrc": "1756:47:1",
                               "nodeType": "YulIdentifier",
                               "src": "1756:47:1"
                             },
+                            "nativeSrc": "1756:80:1",
                             "nodeType": "YulFunctionCall",
                             "src": "1756:80:1"
                           },
@@ -873,11 +1011,13 @@
                           [
                             {
                               "name": "value0",
+                              "nativeSrc": "1738:6:1",
                               "nodeType": "YulIdentifier",
                               "src": "1738:6:1"
                             },
                             {
                               "name": "value1",
+                              "nativeSrc": "1746:6:1",
                               "nodeType": "YulIdentifier",
                               "src": "1746:6:1"
                             }
@@ -888,17 +1028,20 @@
                   ]
                 },
                 "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_calldata_ptr",
+                "nativeSrc": "1294:559:1",
                 "nodeType": "YulFunctionDefinition",
                 "parameters":
                 [
                   {
                     "name": "headStart",
+                    "nativeSrc": "1357:9:1",
                     "nodeType": "YulTypedName",
                     "src": "1357:9:1",
                     "type": ""
                   },
                   {
                     "name": "dataEnd",
+                    "nativeSrc": "1368:7:1",
                     "nodeType": "YulTypedName",
                     "src": "1368:7:1",
                     "type": ""
@@ -908,12 +1051,14 @@
                 [
                   {
                     "name": "value0",
+                    "nativeSrc": "1380:6:1",
                     "nodeType": "YulTypedName",
                     "src": "1380:6:1",
                     "type": ""
                   },
                   {
                     "name": "value1",
+                    "nativeSrc": "1388:6:1",
                     "nodeType": "YulTypedName",
                     "src": "1388:6:1",
                     "type": ""
diff --git a/test/cmdlineTests/standard_generatedSources/output.json b/test/cmdlineTests/standard_generatedSources/output.json
index e56ddaa80a..350d108991 100644
--- a/test/cmdlineTests/standard_generatedSources/output.json
+++ b/test/cmdlineTests/standard_generatedSources/output.json
@@ -19,6 +19,7 @@
                             {
                                 "ast":
                                 {
+                                    "nativeSrc": "0:3989:1",
                                     "nodeType": "YulBlock",
                                     "src": "0:3989:1",
                                     "statements":
@@ -26,11 +27,13 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "47:35:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "47:35:1",
                                                 "statements":
                                                 [
                                                     {
+                                                        "nativeSrc": "57:19:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "57:19:1",
                                                         "value":
@@ -39,6 +42,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "73:2:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "73:2:1",
                                                                     "type": "",
@@ -48,9 +52,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mload",
+                                                                "nativeSrc": "67:5:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "67:5:1"
                                                             },
+                                                            "nativeSrc": "67:9:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "67:9:1"
                                                         },
@@ -58,6 +64,7 @@
                                                         [
                                                             {
                                                                 "name": "memPtr",
+                                                                "nativeSrc": "57:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "57:6:1"
                                                             }
@@ -66,11 +73,13 @@
                                                 ]
                                             },
                                             "name": "allocate_unbounded",
+                                            "nativeSrc": "7:75:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "returnVariables":
                                             [
                                                 {
                                                     "name": "memPtr",
+                                                    "nativeSrc": "40:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "40:6:1",
                                                     "type": ""
@@ -81,6 +90,7 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "177:28:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "177:28:1",
                                                 "statements":
@@ -92,6 +102,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "194:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "194:1:1",
                                                                     "type": "",
@@ -99,6 +110,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "197:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "197:1:1",
                                                                     "type": "",
@@ -108,24 +120,29 @@
                                                             "functionName":
                                                             {
                                                                 "name": "revert",
+                                                                "nativeSrc": "187:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "187:6:1"
                                                             },
+                                                            "nativeSrc": "187:12:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "187:12:1"
                                                         },
+                                                        "nativeSrc": "187:12:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "187:12:1"
                                                     }
                                                 ]
                                             },
                                             "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
+                                            "nativeSrc": "88:117:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "src": "88:117:1"
                                         },
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "300:28:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "300:28:1",
                                                 "statements":
@@ -137,6 +154,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "317:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "317:1:1",
                                                                     "type": "",
@@ -144,6 +162,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "320:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "320:1:1",
                                                                     "type": "",
@@ -153,24 +172,29 @@
                                                             "functionName":
                                                             {
                                                                 "name": "revert",
+                                                                "nativeSrc": "310:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "310:6:1"
                                                             },
+                                                            "nativeSrc": "310:12:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "310:12:1"
                                                         },
+                                                        "nativeSrc": "310:12:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "310:12:1"
                                                     }
                                                 ]
                                             },
                                             "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
+                                            "nativeSrc": "211:117:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "src": "211:117:1"
                                         },
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "423:28:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "423:28:1",
                                                 "statements":
@@ -182,6 +206,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "440:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "440:1:1",
                                                                     "type": "",
@@ -189,6 +214,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "443:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "443:1:1",
                                                                     "type": "",
@@ -198,29 +224,35 @@
                                                             "functionName":
                                                             {
                                                                 "name": "revert",
+                                                                "nativeSrc": "433:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "433:6:1"
                                                             },
+                                                            "nativeSrc": "433:12:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "433:12:1"
                                                         },
+                                                        "nativeSrc": "433:12:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "433:12:1"
                                                     }
                                                 ]
                                             },
                                             "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
+                                            "nativeSrc": "334:117:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "src": "334:117:1"
                                         },
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "505:54:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "505:54:1",
                                                 "statements":
                                                 [
                                                     {
+                                                        "nativeSrc": "515:38:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "515:38:1",
                                                         "value":
@@ -232,11 +264,13 @@
                                                                     [
                                                                         {
                                                                             "name": "value",
+                                                                            "nativeSrc": "533:5:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "533:5:1"
                                                                         },
                                                                         {
                                                                             "kind": "number",
+                                                                            "nativeSrc": "540:2:1",
                                                                             "nodeType": "YulLiteral",
                                                                             "src": "540:2:1",
                                                                             "type": "",
@@ -246,9 +280,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "add",
+                                                                        "nativeSrc": "529:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "529:3:1"
                                                                     },
+                                                                    "nativeSrc": "529:14:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "529:14:1"
                                                                 },
@@ -257,6 +293,7 @@
                                                                     [
                                                                         {
                                                                             "kind": "number",
+                                                                            "nativeSrc": "549:2:1",
                                                                             "nodeType": "YulLiteral",
                                                                             "src": "549:2:1",
                                                                             "type": "",
@@ -266,9 +303,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "not",
+                                                                        "nativeSrc": "545:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "545:3:1"
                                                                     },
+                                                                    "nativeSrc": "545:7:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "545:7:1"
                                                                 }
@@ -276,9 +315,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "and",
+                                                                "nativeSrc": "525:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "525:3:1"
                                                             },
+                                                            "nativeSrc": "525:28:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "525:28:1"
                                                         },
@@ -286,6 +327,7 @@
                                                         [
                                                             {
                                                                 "name": "result",
+                                                                "nativeSrc": "515:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "515:6:1"
                                                             }
@@ -294,11 +336,13 @@
                                                 ]
                                             },
                                             "name": "round_up_to_mul_of_32",
+                                            "nativeSrc": "457:102:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "value",
+                                                    "nativeSrc": "488:5:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "488:5:1",
                                                     "type": ""
@@ -308,6 +352,7 @@
                                             [
                                                 {
                                                     "name": "result",
+                                                    "nativeSrc": "498:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "498:6:1",
                                                     "type": ""
@@ -318,6 +363,7 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "593:152:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "593:152:1",
                                                 "statements":
@@ -329,6 +375,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "610:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "610:1:1",
                                                                     "type": "",
@@ -336,6 +383,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "613:77:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "613:77:1",
                                                                     "type": "",
@@ -345,12 +393,15 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mstore",
+                                                                "nativeSrc": "603:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "603:6:1"
                                                             },
+                                                            "nativeSrc": "603:88:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "603:88:1"
                                                         },
+                                                        "nativeSrc": "603:88:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "603:88:1"
                                                     },
@@ -361,6 +412,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "707:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "707:1:1",
                                                                     "type": "",
@@ -368,6 +420,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "710:4:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "710:4:1",
                                                                     "type": "",
@@ -377,12 +430,15 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mstore",
+                                                                "nativeSrc": "700:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "700:6:1"
                                                             },
+                                                            "nativeSrc": "700:15:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "700:15:1"
                                                         },
+                                                        "nativeSrc": "700:15:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "700:15:1"
                                                     },
@@ -393,6 +449,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "731:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "731:1:1",
                                                                     "type": "",
@@ -400,6 +457,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "734:4:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "734:4:1",
                                                                     "type": "",
@@ -409,29 +467,35 @@
                                                             "functionName":
                                                             {
                                                                 "name": "revert",
+                                                                "nativeSrc": "724:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "724:6:1"
                                                             },
+                                                            "nativeSrc": "724:15:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "724:15:1"
                                                         },
+                                                        "nativeSrc": "724:15:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "724:15:1"
                                                     }
                                                 ]
                                             },
                                             "name": "panic_error_0x41",
+                                            "nativeSrc": "565:180:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "src": "565:180:1"
                                         },
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "794:238:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "794:238:1",
                                                 "statements":
                                                 [
                                                     {
+                                                        "nativeSrc": "804:58:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "804:58:1",
                                                         "value":
@@ -440,6 +504,7 @@
                                                             [
                                                                 {
                                                                     "name": "memPtr",
+                                                                    "nativeSrc": "826:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "826:6:1"
                                                                 },
@@ -448,6 +513,7 @@
                                                                     [
                                                                         {
                                                                             "name": "size",
+                                                                            "nativeSrc": "856:4:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "856:4:1"
                                                                         }
@@ -455,9 +521,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "round_up_to_mul_of_32",
+                                                                        "nativeSrc": "834:21:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "834:21:1"
                                                                     },
+                                                                    "nativeSrc": "834:27:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "834:27:1"
                                                                 }
@@ -465,9 +533,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "822:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "822:3:1"
                                                             },
+                                                            "nativeSrc": "822:40:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "822:40:1"
                                                         },
@@ -475,6 +545,7 @@
                                                         [
                                                             {
                                                                 "name": "newFreePtr",
+                                                                "nativeSrc": "808:10:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "808:10:1",
                                                                 "type": ""
@@ -484,6 +555,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "973:22:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "973:22:1",
                                                             "statements":
@@ -495,12 +567,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "panic_error_0x41",
+                                                                            "nativeSrc": "975:16:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "975:16:1"
                                                                         },
+                                                                        "nativeSrc": "975:18:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "975:18:1"
                                                                     },
+                                                                    "nativeSrc": "975:18:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "975:18:1"
                                                                 }
@@ -515,11 +590,13 @@
                                                                     [
                                                                         {
                                                                             "name": "newFreePtr",
+                                                                            "nativeSrc": "916:10:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "916:10:1"
                                                                         },
                                                                         {
                                                                             "kind": "number",
+                                                                            "nativeSrc": "928:18:1",
                                                                             "nodeType": "YulLiteral",
                                                                             "src": "928:18:1",
                                                                             "type": "",
@@ -529,9 +606,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "gt",
+                                                                        "nativeSrc": "913:2:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "913:2:1"
                                                                     },
+                                                                    "nativeSrc": "913:34:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "913:34:1"
                                                                 },
@@ -540,11 +619,13 @@
                                                                     [
                                                                         {
                                                                             "name": "newFreePtr",
+                                                                            "nativeSrc": "952:10:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "952:10:1"
                                                                         },
                                                                         {
                                                                             "name": "memPtr",
+                                                                            "nativeSrc": "964:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "964:6:1"
                                                                         }
@@ -552,9 +633,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "lt",
+                                                                        "nativeSrc": "949:2:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "949:2:1"
                                                                     },
+                                                                    "nativeSrc": "949:22:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "949:22:1"
                                                                 }
@@ -562,12 +645,15 @@
                                                             "functionName":
                                                             {
                                                                 "name": "or",
+                                                                "nativeSrc": "910:2:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "910:2:1"
                                                             },
+                                                            "nativeSrc": "910:62:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "910:62:1"
                                                         },
+                                                        "nativeSrc": "907:88:1",
                                                         "nodeType": "YulIf",
                                                         "src": "907:88:1"
                                                     },
@@ -578,6 +664,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "1011:2:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "1011:2:1",
                                                                     "type": "",
@@ -585,6 +672,7 @@
                                                                 },
                                                                 {
                                                                     "name": "newFreePtr",
+                                                                    "nativeSrc": "1015:10:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1015:10:1"
                                                                 }
@@ -592,29 +680,35 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mstore",
+                                                                "nativeSrc": "1004:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1004:6:1"
                                                             },
+                                                            "nativeSrc": "1004:22:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1004:22:1"
                                                         },
+                                                        "nativeSrc": "1004:22:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "1004:22:1"
                                                     }
                                                 ]
                                             },
                                             "name": "finalize_allocation",
+                                            "nativeSrc": "751:281:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "memPtr",
+                                                    "nativeSrc": "780:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "780:6:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "size",
+                                                    "nativeSrc": "788:4:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "788:4:1",
                                                     "type": ""
@@ -625,11 +719,13 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "1079:88:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1079:88:1",
                                                 "statements":
                                                 [
                                                     {
+                                                        "nativeSrc": "1089:30:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1089:30:1",
                                                         "value":
@@ -638,9 +734,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "allocate_unbounded",
+                                                                "nativeSrc": "1099:18:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1099:18:1"
                                                             },
+                                                            "nativeSrc": "1099:20:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1099:20:1"
                                                         },
@@ -648,6 +746,7 @@
                                                         [
                                                             {
                                                                 "name": "memPtr",
+                                                                "nativeSrc": "1089:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1089:6:1"
                                                             }
@@ -660,11 +759,13 @@
                                                             [
                                                                 {
                                                                     "name": "memPtr",
+                                                                    "nativeSrc": "1148:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1148:6:1"
                                                                 },
                                                                 {
                                                                     "name": "size",
+                                                                    "nativeSrc": "1156:4:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1156:4:1"
                                                                 }
@@ -672,23 +773,28 @@
                                                             "functionName":
                                                             {
                                                                 "name": "finalize_allocation",
+                                                                "nativeSrc": "1128:19:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1128:19:1"
                                                             },
+                                                            "nativeSrc": "1128:33:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1128:33:1"
                                                         },
+                                                        "nativeSrc": "1128:33:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "1128:33:1"
                                                     }
                                                 ]
                                             },
                                             "name": "allocate_memory",
+                                            "nativeSrc": "1038:129:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "size",
+                                                    "nativeSrc": "1063:4:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1063:4:1",
                                                     "type": ""
@@ -698,6 +804,7 @@
                                             [
                                                 {
                                                     "name": "memPtr",
+                                                    "nativeSrc": "1072:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1072:6:1",
                                                     "type": ""
@@ -708,6 +815,7 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "1255:229:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1255:229:1",
                                                 "statements":
@@ -715,6 +823,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "1360:22:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1360:22:1",
                                                             "statements":
@@ -726,12 +835,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "panic_error_0x41",
+                                                                            "nativeSrc": "1362:16:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "1362:16:1"
                                                                         },
+                                                                        "nativeSrc": "1362:18:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "1362:18:1"
                                                                     },
+                                                                    "nativeSrc": "1362:18:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "1362:18:1"
                                                                 }
@@ -743,11 +855,13 @@
                                                             [
                                                                 {
                                                                     "name": "length",
+                                                                    "nativeSrc": "1332:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1332:6:1"
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "1340:18:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "1340:18:1",
                                                                     "type": "",
@@ -757,16 +871,20 @@
                                                             "functionName":
                                                             {
                                                                 "name": "gt",
+                                                                "nativeSrc": "1329:2:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1329:2:1"
                                                             },
+                                                            "nativeSrc": "1329:30:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1329:30:1"
                                                         },
+                                                        "nativeSrc": "1326:56:1",
                                                         "nodeType": "YulIf",
                                                         "src": "1326:56:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "1392:25:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1392:25:1",
                                                         "value":
@@ -775,11 +893,13 @@
                                                             [
                                                                 {
                                                                     "name": "length",
+                                                                    "nativeSrc": "1404:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1404:6:1"
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "1412:4:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "1412:4:1",
                                                                     "type": "",
@@ -789,9 +909,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mul",
+                                                                "nativeSrc": "1400:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1400:3:1"
                                                             },
+                                                            "nativeSrc": "1400:17:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1400:17:1"
                                                         },
@@ -799,12 +921,14 @@
                                                         [
                                                             {
                                                                 "name": "size",
+                                                                "nativeSrc": "1392:4:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1392:4:1"
                                                             }
                                                         ]
                                                     },
                                                     {
+                                                        "nativeSrc": "1454:23:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1454:23:1",
                                                         "value":
@@ -813,11 +937,13 @@
                                                             [
                                                                 {
                                                                     "name": "size",
+                                                                    "nativeSrc": "1466:4:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1466:4:1"
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "1472:4:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "1472:4:1",
                                                                     "type": "",
@@ -827,9 +953,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "1462:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1462:3:1"
                                                             },
+                                                            "nativeSrc": "1462:15:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1462:15:1"
                                                         },
@@ -837,6 +965,7 @@
                                                         [
                                                             {
                                                                 "name": "size",
+                                                                "nativeSrc": "1454:4:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1454:4:1"
                                                             }
@@ -845,11 +974,13 @@
                                                 ]
                                             },
                                             "name": "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr",
+                                            "nativeSrc": "1173:311:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "length",
+                                                    "nativeSrc": "1239:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1239:6:1",
                                                     "type": ""
@@ -859,6 +990,7 @@
                                             [
                                                 {
                                                     "name": "size",
+                                                    "nativeSrc": "1250:4:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1250:4:1",
                                                     "type": ""
@@ -869,6 +1001,7 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "1579:28:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1579:28:1",
                                                 "statements":
@@ -880,6 +1013,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "1596:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "1596:1:1",
                                                                     "type": "",
@@ -887,6 +1021,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "1599:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "1599:1:1",
                                                                     "type": "",
@@ -896,34 +1031,41 @@
                                                             "functionName":
                                                             {
                                                                 "name": "revert",
+                                                                "nativeSrc": "1589:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1589:6:1"
                                                             },
+                                                            "nativeSrc": "1589:12:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1589:12:1"
                                                         },
+                                                        "nativeSrc": "1589:12:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "1589:12:1"
                                                     }
                                                 ]
                                             },
                                             "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
+                                            "nativeSrc": "1490:117:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "src": "1490:117:1"
                                         },
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "1658:32:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1658:32:1",
                                                 "statements":
                                                 [
                                                     {
+                                                        "nativeSrc": "1668:16:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1668:16:1",
                                                         "value":
                                                         {
                                                             "name": "value",
+                                                            "nativeSrc": "1679:5:1",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "1679:5:1"
                                                         },
@@ -931,6 +1073,7 @@
                                                         [
                                                             {
                                                                 "name": "cleaned",
+                                                                "nativeSrc": "1668:7:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1668:7:1"
                                                             }
@@ -939,11 +1082,13 @@
                                                 ]
                                             },
                                             "name": "cleanup_t_uint256",
+                                            "nativeSrc": "1613:77:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "value",
+                                                    "nativeSrc": "1640:5:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1640:5:1",
                                                     "type": ""
@@ -953,6 +1098,7 @@
                                             [
                                                 {
                                                     "name": "cleaned",
+                                                    "nativeSrc": "1650:7:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1650:7:1",
                                                     "type": ""
@@ -963,6 +1109,7 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "1739:79:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1739:79:1",
                                                 "statements":
@@ -970,6 +1117,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "1796:16:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1796:16:1",
                                                             "statements":
@@ -981,6 +1129,7 @@
                                                                         [
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "1805:1:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "1805:1:1",
                                                                                 "type": "",
@@ -988,6 +1137,7 @@
                                                                             },
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "1808:1:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "1808:1:1",
                                                                                 "type": "",
@@ -997,12 +1147,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "revert",
+                                                                            "nativeSrc": "1798:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "1798:6:1"
                                                                         },
+                                                                        "nativeSrc": "1798:12:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "1798:12:1"
                                                                     },
+                                                                    "nativeSrc": "1798:12:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "1798:12:1"
                                                                 }
@@ -1017,6 +1170,7 @@
                                                                     [
                                                                         {
                                                                             "name": "value",
+                                                                            "nativeSrc": "1762:5:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "1762:5:1"
                                                                         },
@@ -1025,6 +1179,7 @@
                                                                             [
                                                                                 {
                                                                                     "name": "value",
+                                                                                    "nativeSrc": "1787:5:1",
                                                                                     "nodeType": "YulIdentifier",
                                                                                     "src": "1787:5:1"
                                                                                 }
@@ -1032,9 +1187,11 @@
                                                                             "functionName":
                                                                             {
                                                                                 "name": "cleanup_t_uint256",
+                                                                                "nativeSrc": "1769:17:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "1769:17:1"
                                                                             },
+                                                                            "nativeSrc": "1769:24:1",
                                                                             "nodeType": "YulFunctionCall",
                                                                             "src": "1769:24:1"
                                                                         }
@@ -1042,9 +1199,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "eq",
+                                                                        "nativeSrc": "1759:2:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "1759:2:1"
                                                                     },
+                                                                    "nativeSrc": "1759:35:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "1759:35:1"
                                                                 }
@@ -1052,23 +1211,28 @@
                                                             "functionName":
                                                             {
                                                                 "name": "iszero",
+                                                                "nativeSrc": "1752:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1752:6:1"
                                                             },
+                                                            "nativeSrc": "1752:43:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1752:43:1"
                                                         },
+                                                        "nativeSrc": "1749:63:1",
                                                         "nodeType": "YulIf",
                                                         "src": "1749:63:1"
                                                     }
                                                 ]
                                             },
                                             "name": "validator_revert_t_uint256",
+                                            "nativeSrc": "1696:122:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "value",
+                                                    "nativeSrc": "1732:5:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1732:5:1",
                                                     "type": ""
@@ -1079,11 +1243,13 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "1876:87:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1876:87:1",
                                                 "statements":
                                                 [
                                                     {
+                                                        "nativeSrc": "1886:29:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1886:29:1",
                                                         "value":
@@ -1092,6 +1258,7 @@
                                                             [
                                                                 {
                                                                     "name": "offset",
+                                                                    "nativeSrc": "1908:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1908:6:1"
                                                                 }
@@ -1099,9 +1266,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "calldataload",
+                                                                "nativeSrc": "1895:12:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1895:12:1"
                                                             },
+                                                            "nativeSrc": "1895:20:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1895:20:1"
                                                         },
@@ -1109,6 +1278,7 @@
                                                         [
                                                             {
                                                                 "name": "value",
+                                                                "nativeSrc": "1886:5:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1886:5:1"
                                                             }
@@ -1121,6 +1291,7 @@
                                                             [
                                                                 {
                                                                     "name": "value",
+                                                                    "nativeSrc": "1951:5:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1951:5:1"
                                                                 }
@@ -1128,29 +1299,35 @@
                                                             "functionName":
                                                             {
                                                                 "name": "validator_revert_t_uint256",
+                                                                "nativeSrc": "1924:26:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1924:26:1"
                                                             },
+                                                            "nativeSrc": "1924:33:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1924:33:1"
                                                         },
+                                                        "nativeSrc": "1924:33:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "1924:33:1"
                                                     }
                                                 ]
                                             },
                                             "name": "abi_decode_t_uint256",
+                                            "nativeSrc": "1824:139:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "offset",
+                                                    "nativeSrc": "1854:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1854:6:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "end",
+                                                    "nativeSrc": "1862:3:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1862:3:1",
                                                     "type": ""
@@ -1160,6 +1337,7 @@
                                             [
                                                 {
                                                     "name": "value",
+                                                    "nativeSrc": "1870:5:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1870:5:1",
                                                     "type": ""
@@ -1170,11 +1348,13 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "2088:608:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "2088:608:1",
                                                 "statements":
                                                 [
                                                     {
+                                                        "nativeSrc": "2098:90:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "2098:90:1",
                                                         "value":
@@ -1186,6 +1366,7 @@
                                                                     [
                                                                         {
                                                                             "name": "length",
+                                                                            "nativeSrc": "2180:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "2180:6:1"
                                                                         }
@@ -1193,9 +1374,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "array_allocation_size_t_array$_t_uint256_$dyn_memory_ptr",
+                                                                        "nativeSrc": "2123:56:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "2123:56:1"
                                                                     },
+                                                                    "nativeSrc": "2123:64:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "2123:64:1"
                                                                 }
@@ -1203,9 +1386,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "allocate_memory",
+                                                                "nativeSrc": "2107:15:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2107:15:1"
                                                             },
+                                                            "nativeSrc": "2107:81:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2107:81:1"
                                                         },
@@ -1213,17 +1398,20 @@
                                                         [
                                                             {
                                                                 "name": "array",
+                                                                "nativeSrc": "2098:5:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2098:5:1"
                                                             }
                                                         ]
                                                     },
                                                     {
+                                                        "nativeSrc": "2197:16:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "2197:16:1",
                                                         "value":
                                                         {
                                                             "name": "array",
+                                                            "nativeSrc": "2208:5:1",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "2208:5:1"
                                                         },
@@ -1231,6 +1419,7 @@
                                                         [
                                                             {
                                                                 "name": "dst",
+                                                                "nativeSrc": "2201:3:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "2201:3:1",
                                                                 "type": ""
@@ -1244,11 +1433,13 @@
                                                             [
                                                                 {
                                                                     "name": "array",
+                                                                    "nativeSrc": "2230:5:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "2230:5:1"
                                                                 },
                                                                 {
                                                                     "name": "length",
+                                                                    "nativeSrc": "2237:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "2237:6:1"
                                                                 }
@@ -1256,16 +1447,20 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mstore",
+                                                                "nativeSrc": "2223:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2223:6:1"
                                                             },
+                                                            "nativeSrc": "2223:21:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2223:21:1"
                                                         },
+                                                        "nativeSrc": "2223:21:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "2223:21:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "2253:23:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "2253:23:1",
                                                         "value":
@@ -1274,11 +1469,13 @@
                                                             [
                                                                 {
                                                                     "name": "array",
+                                                                    "nativeSrc": "2264:5:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "2264:5:1"
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "2271:4:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "2271:4:1",
                                                                     "type": "",
@@ -1288,9 +1485,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "2260:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2260:3:1"
                                                             },
+                                                            "nativeSrc": "2260:16:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2260:16:1"
                                                         },
@@ -1298,12 +1497,14 @@
                                                         [
                                                             {
                                                                 "name": "dst",
+                                                                "nativeSrc": "2253:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2253:3:1"
                                                             }
                                                         ]
                                                     },
                                                     {
+                                                        "nativeSrc": "2286:44:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "2286:44:1",
                                                         "value":
@@ -1312,6 +1513,7 @@
                                                             [
                                                                 {
                                                                     "name": "offset",
+                                                                    "nativeSrc": "2304:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "2304:6:1"
                                                                 },
@@ -1320,11 +1522,13 @@
                                                                     [
                                                                         {
                                                                             "name": "length",
+                                                                            "nativeSrc": "2316:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "2316:6:1"
                                                                         },
                                                                         {
                                                                             "kind": "number",
+                                                                            "nativeSrc": "2324:4:1",
                                                                             "nodeType": "YulLiteral",
                                                                             "src": "2324:4:1",
                                                                             "type": "",
@@ -1334,9 +1538,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "mul",
+                                                                        "nativeSrc": "2312:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "2312:3:1"
                                                                     },
+                                                                    "nativeSrc": "2312:17:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "2312:17:1"
                                                                 }
@@ -1344,9 +1550,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "2300:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2300:3:1"
                                                             },
+                                                            "nativeSrc": "2300:30:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2300:30:1"
                                                         },
@@ -1354,6 +1562,7 @@
                                                         [
                                                             {
                                                                 "name": "srcEnd",
+                                                                "nativeSrc": "2290:6:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "2290:6:1",
                                                                 "type": ""
@@ -1363,6 +1572,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "2358:103:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "2358:103:1",
                                                             "statements":
@@ -1374,12 +1584,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "revert_error_81385d8c0b31fffe14be1da910c8bd3a80be4cfa248e04f42ec0faea3132a8ef",
+                                                                            "nativeSrc": "2372:77:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "2372:77:1"
                                                                         },
+                                                                        "nativeSrc": "2372:79:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "2372:79:1"
                                                                     },
+                                                                    "nativeSrc": "2372:79:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "2372:79:1"
                                                                 }
@@ -1391,11 +1604,13 @@
                                                             [
                                                                 {
                                                                     "name": "srcEnd",
+                                                                    "nativeSrc": "2345:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "2345:6:1"
                                                                 },
                                                                 {
                                                                     "name": "end",
+                                                                    "nativeSrc": "2353:3:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "2353:3:1"
                                                                 }
@@ -1403,28 +1618,34 @@
                                                             "functionName":
                                                             {
                                                                 "name": "gt",
+                                                                "nativeSrc": "2342:2:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2342:2:1"
                                                             },
+                                                            "nativeSrc": "2342:15:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2342:15:1"
                                                         },
+                                                        "nativeSrc": "2339:122:1",
                                                         "nodeType": "YulIf",
                                                         "src": "2339:122:1"
                                                     },
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "2546:144:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "2546:144:1",
                                                             "statements":
                                                             [
                                                                 {
+                                                                    "nativeSrc": "2561:21:1",
                                                                     "nodeType": "YulVariableDeclaration",
                                                                     "src": "2561:21:1",
                                                                     "value":
                                                                     {
                                                                         "name": "src",
+                                                                        "nativeSrc": "2579:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "2579:3:1"
                                                                     },
@@ -1432,6 +1653,7 @@
                                                                     [
                                                                         {
                                                                             "name": "elementPos",
+                                                                            "nativeSrc": "2565:10:1",
                                                                             "nodeType": "YulTypedName",
                                                                             "src": "2565:10:1",
                                                                             "type": ""
@@ -1445,6 +1667,7 @@
                                                                         [
                                                                             {
                                                                                 "name": "dst",
+                                                                                "nativeSrc": "2603:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "2603:3:1"
                                                                             },
@@ -1453,11 +1676,13 @@
                                                                                 [
                                                                                     {
                                                                                         "name": "elementPos",
+                                                                                        "nativeSrc": "2629:10:1",
                                                                                         "nodeType": "YulIdentifier",
                                                                                         "src": "2629:10:1"
                                                                                     },
                                                                                     {
                                                                                         "name": "end",
+                                                                                        "nativeSrc": "2641:3:1",
                                                                                         "nodeType": "YulIdentifier",
                                                                                         "src": "2641:3:1"
                                                                                     }
@@ -1465,9 +1690,11 @@
                                                                                 "functionName":
                                                                                 {
                                                                                     "name": "abi_decode_t_uint256",
+                                                                                    "nativeSrc": "2608:20:1",
                                                                                     "nodeType": "YulIdentifier",
                                                                                     "src": "2608:20:1"
                                                                                 },
+                                                                                "nativeSrc": "2608:37:1",
                                                                                 "nodeType": "YulFunctionCall",
                                                                                 "src": "2608:37:1"
                                                                             }
@@ -1475,16 +1702,20 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "mstore",
+                                                                            "nativeSrc": "2596:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "2596:6:1"
                                                                         },
+                                                                        "nativeSrc": "2596:50:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "2596:50:1"
                                                                     },
+                                                                    "nativeSrc": "2596:50:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "2596:50:1"
                                                                 },
                                                                 {
+                                                                    "nativeSrc": "2659:21:1",
                                                                     "nodeType": "YulAssignment",
                                                                     "src": "2659:21:1",
                                                                     "value":
@@ -1493,11 +1724,13 @@
                                                                         [
                                                                             {
                                                                                 "name": "dst",
+                                                                                "nativeSrc": "2670:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "2670:3:1"
                                                                             },
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "2675:4:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "2675:4:1",
                                                                                 "type": "",
@@ -1507,9 +1740,11 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "add",
+                                                                            "nativeSrc": "2666:3:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "2666:3:1"
                                                                         },
+                                                                        "nativeSrc": "2666:14:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "2666:14:1"
                                                                     },
@@ -1517,6 +1752,7 @@
                                                                     [
                                                                         {
                                                                             "name": "dst",
+                                                                            "nativeSrc": "2659:3:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "2659:3:1"
                                                                         }
@@ -1530,11 +1766,13 @@
                                                             [
                                                                 {
                                                                     "name": "src",
+                                                                    "nativeSrc": "2499:3:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "2499:3:1"
                                                                 },
                                                                 {
                                                                     "name": "srcEnd",
+                                                                    "nativeSrc": "2504:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "2504:6:1"
                                                                 }
@@ -1542,20 +1780,25 @@
                                                             "functionName":
                                                             {
                                                                 "name": "lt",
+                                                                "nativeSrc": "2496:2:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2496:2:1"
                                                             },
+                                                            "nativeSrc": "2496:15:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2496:15:1"
                                                         },
+                                                        "nativeSrc": "2470:220:1",
                                                         "nodeType": "YulForLoop",
                                                         "post":
                                                         {
+                                                            "nativeSrc": "2512:25:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "2512:25:1",
                                                             "statements":
                                                             [
                                                                 {
+                                                                    "nativeSrc": "2514:21:1",
                                                                     "nodeType": "YulAssignment",
                                                                     "src": "2514:21:1",
                                                                     "value":
@@ -1564,11 +1807,13 @@
                                                                         [
                                                                             {
                                                                                 "name": "src",
+                                                                                "nativeSrc": "2525:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "2525:3:1"
                                                                             },
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "2530:4:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "2530:4:1",
                                                                                 "type": "",
@@ -1578,9 +1823,11 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "add",
+                                                                            "nativeSrc": "2521:3:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "2521:3:1"
                                                                         },
+                                                                        "nativeSrc": "2521:14:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "2521:14:1"
                                                                     },
@@ -1588,6 +1835,7 @@
                                                                     [
                                                                         {
                                                                             "name": "src",
+                                                                            "nativeSrc": "2514:3:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "2514:3:1"
                                                                         }
@@ -1597,16 +1845,19 @@
                                                         },
                                                         "pre":
                                                         {
+                                                            "nativeSrc": "2474:21:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "2474:21:1",
                                                             "statements":
                                                             [
                                                                 {
+                                                                    "nativeSrc": "2476:17:1",
                                                                     "nodeType": "YulVariableDeclaration",
                                                                     "src": "2476:17:1",
                                                                     "value":
                                                                     {
                                                                         "name": "offset",
+                                                                        "nativeSrc": "2487:6:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "2487:6:1"
                                                                     },
@@ -1614,6 +1865,7 @@
                                                                     [
                                                                         {
                                                                             "name": "src",
+                                                                            "nativeSrc": "2480:3:1",
                                                                             "nodeType": "YulTypedName",
                                                                             "src": "2480:3:1",
                                                                             "type": ""
@@ -1627,23 +1879,27 @@
                                                 ]
                                             },
                                             "name": "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr",
+                                            "nativeSrc": "1986:710:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "offset",
+                                                    "nativeSrc": "2058:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "2058:6:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "length",
+                                                    "nativeSrc": "2066:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "2066:6:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "end",
+                                                    "nativeSrc": "2074:3:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "2074:3:1",
                                                     "type": ""
@@ -1653,6 +1909,7 @@
                                             [
                                                 {
                                                     "name": "array",
+                                                    "nativeSrc": "2082:5:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "2082:5:1",
                                                     "type": ""
@@ -1663,6 +1920,7 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "2796:293:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "2796:293:1",
                                                 "statements":
@@ -1670,6 +1928,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "2845:83:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "2845:83:1",
                                                             "statements":
@@ -1681,12 +1940,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "revert_error_1b9f4a0a5773e33b91aa01db23bf8c55fce1411167c872835e7fa00a4f17d46d",
+                                                                            "nativeSrc": "2847:77:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "2847:77:1"
                                                                         },
+                                                                        "nativeSrc": "2847:79:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "2847:79:1"
                                                                     },
+                                                                    "nativeSrc": "2847:79:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "2847:79:1"
                                                                 }
@@ -1704,11 +1966,13 @@
                                                                             [
                                                                                 {
                                                                                     "name": "offset",
+                                                                                    "nativeSrc": "2824:6:1",
                                                                                     "nodeType": "YulIdentifier",
                                                                                     "src": "2824:6:1"
                                                                                 },
                                                                                 {
                                                                                     "kind": "number",
+                                                                                    "nativeSrc": "2832:4:1",
                                                                                     "nodeType": "YulLiteral",
                                                                                     "src": "2832:4:1",
                                                                                     "type": "",
@@ -1718,14 +1982,17 @@
                                                                             "functionName":
                                                                             {
                                                                                 "name": "add",
+                                                                                "nativeSrc": "2820:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "2820:3:1"
                                                                             },
+                                                                            "nativeSrc": "2820:17:1",
                                                                             "nodeType": "YulFunctionCall",
                                                                             "src": "2820:17:1"
                                                                         },
                                                                         {
                                                                             "name": "end",
+                                                                            "nativeSrc": "2839:3:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "2839:3:1"
                                                                         }
@@ -1733,9 +2000,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "slt",
+                                                                        "nativeSrc": "2816:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "2816:3:1"
                                                                     },
+                                                                    "nativeSrc": "2816:27:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "2816:27:1"
                                                                 }
@@ -1743,16 +2012,20 @@
                                                             "functionName":
                                                             {
                                                                 "name": "iszero",
+                                                                "nativeSrc": "2809:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2809:6:1"
                                                             },
+                                                            "nativeSrc": "2809:35:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2809:35:1"
                                                         },
+                                                        "nativeSrc": "2806:122:1",
                                                         "nodeType": "YulIf",
                                                         "src": "2806:122:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "2937:34:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "2937:34:1",
                                                         "value":
@@ -1761,6 +2034,7 @@
                                                             [
                                                                 {
                                                                     "name": "offset",
+                                                                    "nativeSrc": "2964:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "2964:6:1"
                                                                 }
@@ -1768,9 +2042,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "calldataload",
+                                                                "nativeSrc": "2951:12:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2951:12:1"
                                                             },
+                                                            "nativeSrc": "2951:20:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2951:20:1"
                                                         },
@@ -1778,6 +2054,7 @@
                                                         [
                                                             {
                                                                 "name": "length",
+                                                                "nativeSrc": "2941:6:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "2941:6:1",
                                                                 "type": ""
@@ -1785,6 +2062,7 @@
                                                         ]
                                                     },
                                                     {
+                                                        "nativeSrc": "2980:103:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "2980:103:1",
                                                         "value":
@@ -1796,11 +2074,13 @@
                                                                     [
                                                                         {
                                                                             "name": "offset",
+                                                                            "nativeSrc": "3056:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "3056:6:1"
                                                                         },
                                                                         {
                                                                             "kind": "number",
+                                                                            "nativeSrc": "3064:4:1",
                                                                             "nodeType": "YulLiteral",
                                                                             "src": "3064:4:1",
                                                                             "type": "",
@@ -1810,19 +2090,23 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "add",
+                                                                        "nativeSrc": "3052:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "3052:3:1"
                                                                     },
+                                                                    "nativeSrc": "3052:17:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "3052:17:1"
                                                                 },
                                                                 {
                                                                     "name": "length",
+                                                                    "nativeSrc": "3071:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "3071:6:1"
                                                                 },
                                                                 {
                                                                     "name": "end",
+                                                                    "nativeSrc": "3079:3:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "3079:3:1"
                                                                 }
@@ -1830,9 +2114,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "abi_decode_available_length_t_array$_t_uint256_$dyn_memory_ptr",
+                                                                "nativeSrc": "2989:62:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2989:62:1"
                                                             },
+                                                            "nativeSrc": "2989:94:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "2989:94:1"
                                                         },
@@ -1840,6 +2126,7 @@
                                                         [
                                                             {
                                                                 "name": "array",
+                                                                "nativeSrc": "2980:5:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "2980:5:1"
                                                             }
@@ -1848,17 +2135,20 @@
                                                 ]
                                             },
                                             "name": "abi_decode_t_array$_t_uint256_$dyn_memory_ptr",
+                                            "nativeSrc": "2719:370:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "offset",
+                                                    "nativeSrc": "2774:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "2774:6:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "end",
+                                                    "nativeSrc": "2782:3:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "2782:3:1",
                                                     "type": ""
@@ -1868,6 +2158,7 @@
                                             [
                                                 {
                                                     "name": "array",
+                                                    "nativeSrc": "2790:5:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "2790:5:1",
                                                     "type": ""
@@ -1878,6 +2169,7 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "3186:448:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "3186:448:1",
                                                 "statements":
@@ -1885,6 +2177,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "3232:83:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "3232:83:1",
                                                             "statements":
@@ -1896,12 +2189,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b",
+                                                                            "nativeSrc": "3234:77:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "3234:77:1"
                                                                         },
+                                                                        "nativeSrc": "3234:79:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "3234:79:1"
                                                                     },
+                                                                    "nativeSrc": "3234:79:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "3234:79:1"
                                                                 }
@@ -1916,11 +2212,13 @@
                                                                     [
                                                                         {
                                                                             "name": "dataEnd",
+                                                                            "nativeSrc": "3207:7:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "3207:7:1"
                                                                         },
                                                                         {
                                                                             "name": "headStart",
+                                                                            "nativeSrc": "3216:9:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "3216:9:1"
                                                                         }
@@ -1928,14 +2226,17 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "sub",
+                                                                        "nativeSrc": "3203:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "3203:3:1"
                                                                     },
+                                                                    "nativeSrc": "3203:23:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "3203:23:1"
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "3228:2:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "3228:2:1",
                                                                     "type": "",
@@ -1945,21 +2246,26 @@
                                                             "functionName":
                                                             {
                                                                 "name": "slt",
+                                                                "nativeSrc": "3199:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "3199:3:1"
                                                             },
+                                                            "nativeSrc": "3199:32:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "3199:32:1"
                                                         },
+                                                        "nativeSrc": "3196:119:1",
                                                         "nodeType": "YulIf",
                                                         "src": "3196:119:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "3325:302:1",
                                                         "nodeType": "YulBlock",
                                                         "src": "3325:302:1",
                                                         "statements":
                                                         [
                                                             {
+                                                                "nativeSrc": "3340:45:1",
                                                                 "nodeType": "YulVariableDeclaration",
                                                                 "src": "3340:45:1",
                                                                 "value":
@@ -1971,11 +2277,13 @@
                                                                             [
                                                                                 {
                                                                                     "name": "headStart",
+                                                                                    "nativeSrc": "3371:9:1",
                                                                                     "nodeType": "YulIdentifier",
                                                                                     "src": "3371:9:1"
                                                                                 },
                                                                                 {
                                                                                     "kind": "number",
+                                                                                    "nativeSrc": "3382:1:1",
                                                                                     "nodeType": "YulLiteral",
                                                                                     "src": "3382:1:1",
                                                                                     "type": "",
@@ -1985,9 +2293,11 @@
                                                                             "functionName":
                                                                             {
                                                                                 "name": "add",
+                                                                                "nativeSrc": "3367:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "3367:3:1"
                                                                             },
+                                                                            "nativeSrc": "3367:17:1",
                                                                             "nodeType": "YulFunctionCall",
                                                                             "src": "3367:17:1"
                                                                         }
@@ -1995,9 +2305,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "calldataload",
+                                                                        "nativeSrc": "3354:12:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "3354:12:1"
                                                                     },
+                                                                    "nativeSrc": "3354:31:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "3354:31:1"
                                                                 },
@@ -2005,6 +2317,7 @@
                                                                 [
                                                                     {
                                                                         "name": "offset",
+                                                                        "nativeSrc": "3344:6:1",
                                                                         "nodeType": "YulTypedName",
                                                                         "src": "3344:6:1",
                                                                         "type": ""
@@ -2014,6 +2327,7 @@
                                                             {
                                                                 "body":
                                                                 {
+                                                                    "nativeSrc": "3432:83:1",
                                                                     "nodeType": "YulBlock",
                                                                     "src": "3432:83:1",
                                                                     "statements":
@@ -2025,12 +2339,15 @@
                                                                                 "functionName":
                                                                                 {
                                                                                     "name": "revert_error_c1322bf8034eace5e0b5c7295db60986aa89aae5e0ea0873e4689e076861a5db",
+                                                                                    "nativeSrc": "3434:77:1",
                                                                                     "nodeType": "YulIdentifier",
                                                                                     "src": "3434:77:1"
                                                                                 },
+                                                                                "nativeSrc": "3434:79:1",
                                                                                 "nodeType": "YulFunctionCall",
                                                                                 "src": "3434:79:1"
                                                                             },
+                                                                            "nativeSrc": "3434:79:1",
                                                                             "nodeType": "YulExpressionStatement",
                                                                             "src": "3434:79:1"
                                                                         }
@@ -2042,11 +2359,13 @@
                                                                     [
                                                                         {
                                                                             "name": "offset",
+                                                                            "nativeSrc": "3404:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "3404:6:1"
                                                                         },
                                                                         {
                                                                             "kind": "number",
+                                                                            "nativeSrc": "3412:18:1",
                                                                             "nodeType": "YulLiteral",
                                                                             "src": "3412:18:1",
                                                                             "type": "",
@@ -2056,16 +2375,20 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "gt",
+                                                                        "nativeSrc": "3401:2:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "3401:2:1"
                                                                     },
+                                                                    "nativeSrc": "3401:30:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "3401:30:1"
                                                                 },
+                                                                "nativeSrc": "3398:117:1",
                                                                 "nodeType": "YulIf",
                                                                 "src": "3398:117:1"
                                                             },
                                                             {
+                                                                "nativeSrc": "3529:88:1",
                                                                 "nodeType": "YulAssignment",
                                                                 "src": "3529:88:1",
                                                                 "value":
@@ -2077,11 +2400,13 @@
                                                                             [
                                                                                 {
                                                                                     "name": "headStart",
+                                                                                    "nativeSrc": "3589:9:1",
                                                                                     "nodeType": "YulIdentifier",
                                                                                     "src": "3589:9:1"
                                                                                 },
                                                                                 {
                                                                                     "name": "offset",
+                                                                                    "nativeSrc": "3600:6:1",
                                                                                     "nodeType": "YulIdentifier",
                                                                                     "src": "3600:6:1"
                                                                                 }
@@ -2089,14 +2414,17 @@
                                                                             "functionName":
                                                                             {
                                                                                 "name": "add",
+                                                                                "nativeSrc": "3585:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "3585:3:1"
                                                                             },
+                                                                            "nativeSrc": "3585:22:1",
                                                                             "nodeType": "YulFunctionCall",
                                                                             "src": "3585:22:1"
                                                                         },
                                                                         {
                                                                             "name": "dataEnd",
+                                                                            "nativeSrc": "3609:7:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "3609:7:1"
                                                                         }
@@ -2104,9 +2432,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "abi_decode_t_array$_t_uint256_$dyn_memory_ptr",
+                                                                        "nativeSrc": "3539:45:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "3539:45:1"
                                                                     },
+                                                                    "nativeSrc": "3539:78:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "3539:78:1"
                                                                 },
@@ -2114,6 +2444,7 @@
                                                                 [
                                                                     {
                                                                         "name": "value0",
+                                                                        "nativeSrc": "3529:6:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "3529:6:1"
                                                                     }
@@ -2124,17 +2455,20 @@
                                                 ]
                                             },
                                             "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr",
+                                            "nativeSrc": "3095:539:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "headStart",
+                                                    "nativeSrc": "3156:9:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "3156:9:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "dataEnd",
+                                                    "nativeSrc": "3167:7:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "3167:7:1",
                                                     "type": ""
@@ -2144,6 +2478,7 @@
                                             [
                                                 {
                                                     "name": "value0",
+                                                    "nativeSrc": "3179:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "3179:6:1",
                                                     "type": ""
@@ -2154,6 +2489,7 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "3705:53:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "3705:53:1",
                                                 "statements":
@@ -2165,6 +2501,7 @@
                                                             [
                                                                 {
                                                                     "name": "pos",
+                                                                    "nativeSrc": "3722:3:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "3722:3:1"
                                                                 },
@@ -2173,6 +2510,7 @@
                                                                     [
                                                                         {
                                                                             "name": "value",
+                                                                            "nativeSrc": "3745:5:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "3745:5:1"
                                                                         }
@@ -2180,9 +2518,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "cleanup_t_uint256",
+                                                                        "nativeSrc": "3727:17:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "3727:17:1"
                                                                     },
+                                                                    "nativeSrc": "3727:24:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "3727:24:1"
                                                                 }
@@ -2190,29 +2530,35 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mstore",
+                                                                "nativeSrc": "3715:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "3715:6:1"
                                                             },
+                                                            "nativeSrc": "3715:37:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "3715:37:1"
                                                         },
+                                                        "nativeSrc": "3715:37:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "3715:37:1"
                                                     }
                                                 ]
                                             },
                                             "name": "abi_encode_t_uint256_to_t_uint256_fromStack",
+                                            "nativeSrc": "3640:118:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "value",
+                                                    "nativeSrc": "3693:5:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "3693:5:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "pos",
+                                                    "nativeSrc": "3700:3:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "3700:3:1",
                                                     "type": ""
@@ -2223,11 +2569,13 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "3862:124:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "3862:124:1",
                                                 "statements":
                                                 [
                                                     {
+                                                        "nativeSrc": "3872:26:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "3872:26:1",
                                                         "value":
@@ -2236,11 +2584,13 @@
                                                             [
                                                                 {
                                                                     "name": "headStart",
+                                                                    "nativeSrc": "3884:9:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "3884:9:1"
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "3895:2:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "3895:2:1",
                                                                     "type": "",
@@ -2250,9 +2600,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "3880:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "3880:3:1"
                                                             },
+                                                            "nativeSrc": "3880:18:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "3880:18:1"
                                                         },
@@ -2260,6 +2612,7 @@
                                                         [
                                                             {
                                                                 "name": "tail",
+                                                                "nativeSrc": "3872:4:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "3872:4:1"
                                                             }
@@ -2272,6 +2625,7 @@
                                                             [
                                                                 {
                                                                     "name": "value0",
+                                                                    "nativeSrc": "3952:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "3952:6:1"
                                                                 },
@@ -2280,11 +2634,13 @@
                                                                     [
                                                                         {
                                                                             "name": "headStart",
+                                                                            "nativeSrc": "3965:9:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "3965:9:1"
                                                                         },
                                                                         {
                                                                             "kind": "number",
+                                                                            "nativeSrc": "3976:1:1",
                                                                             "nodeType": "YulLiteral",
                                                                             "src": "3976:1:1",
                                                                             "type": "",
@@ -2294,9 +2650,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "add",
+                                                                        "nativeSrc": "3961:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "3961:3:1"
                                                                     },
+                                                                    "nativeSrc": "3961:17:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "3961:17:1"
                                                                 }
@@ -2304,29 +2662,35 @@
                                                             "functionName":
                                                             {
                                                                 "name": "abi_encode_t_uint256_to_t_uint256_fromStack",
+                                                                "nativeSrc": "3908:43:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "3908:43:1"
                                                             },
+                                                            "nativeSrc": "3908:71:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "3908:71:1"
                                                         },
+                                                        "nativeSrc": "3908:71:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "3908:71:1"
                                                     }
                                                 ]
                                             },
                                             "name": "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed",
+                                            "nativeSrc": "3764:222:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "headStart",
+                                                    "nativeSrc": "3834:9:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "3834:9:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "value0",
+                                                    "nativeSrc": "3846:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "3846:6:1",
                                                     "type": ""
@@ -2336,6 +2700,7 @@
                                             [
                                                 {
                                                     "name": "tail",
+                                                    "nativeSrc": "3857:4:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "3857:4:1",
                                                     "type": ""
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/in.sol b/test/cmdlineTests/standard_irOptimized_ast_requested/in.sol
new file mode 100644
index 0000000000..a3a86cc8d3
--- /dev/null
+++ b/test/cmdlineTests/standard_irOptimized_ast_requested/in.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {}
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/input.json b/test/cmdlineTests/standard_irOptimized_ast_requested/input.json
new file mode 100644
index 0000000000..fd16983068
--- /dev/null
+++ b/test/cmdlineTests/standard_irOptimized_ast_requested/input.json
@@ -0,0 +1,9 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_irOptimized_ast_requested/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {"*": {"*": ["irOptimizedAst"]}}
+	}
+}
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
new file mode 100644
index 0000000000..ed7138c8f4
--- /dev/null
+++ b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
@@ -0,0 +1,729 @@
+{
+    "contracts":
+    {
+        "C":
+        {
+            "C":
+            {
+                "irOptimizedAst":
+                {
+                    "code":
+                    {
+                        "block":
+                        {
+                            "nativeSrc": "44:790:0",
+                            "nodeType": "YulBlock",
+                            "src": "-1:-1:0",
+                            "statements":
+                            [
+                                {
+                                    "expression":
+                                    {
+                                        "arguments":
+                                        [
+                                            {
+                                                "kind": "number",
+                                                "nativeSrc": "103:2:0",
+                                                "nodeType": "YulLiteral",
+                                                "src": "56:13:0",
+                                                "type": "",
+                                                "value": "64"
+                                            },
+                                            {
+                                                "arguments":
+                                                [
+                                                    {
+                                                        "kind": "number",
+                                                        "nativeSrc": "119:3:0",
+                                                        "nodeType": "YulLiteral",
+                                                        "src": "56:13:0",
+                                                        "type": "",
+                                                        "value": "128"
+                                                    }
+                                                ],
+                                                "functionName":
+                                                {
+                                                    "name": "memoryguard",
+                                                    "nativeSrc": "107:11:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "107:16:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            }
+                                        ],
+                                        "functionName":
+                                        {
+                                            "name": "mstore",
+                                            "nativeSrc": "96:6:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "96:28:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "nativeSrc": "96:28:0",
+                                    "nodeType": "YulExpressionStatement",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "body":
+                                    {
+                                        "nativeSrc": "148:83:0",
+                                        "nodeType": "YulBlock",
+                                        "src": "56:13:0",
+                                        "statements":
+                                        [
+                                            {
+                                                "expression":
+                                                {
+                                                    "arguments": [],
+                                                    "functionName":
+                                                    {
+                                                        "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
+                                                        "nativeSrc": "150:77:0",
+                                                        "nodeType": "YulIdentifier",
+                                                        "src": "56:13:0"
+                                                    },
+                                                    "nativeSrc": "150:79:0",
+                                                    "nodeType": "YulFunctionCall",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "150:79:0",
+                                                "nodeType": "YulExpressionStatement",
+                                                "src": "56:13:0"
+                                            }
+                                        ]
+                                    },
+                                    "condition":
+                                    {
+                                        "arguments": [],
+                                        "functionName":
+                                        {
+                                            "name": "callvalue",
+                                            "nativeSrc": "136:9:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "136:11:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "nativeSrc": "133:98:0",
+                                    "nodeType": "YulIf",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "expression":
+                                    {
+                                        "arguments": [],
+                                        "functionName":
+                                        {
+                                            "name": "constructor_C_2",
+                                            "nativeSrc": "241:15:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "241:17:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "nativeSrc": "241:17:0",
+                                    "nodeType": "YulExpressionStatement",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "nativeSrc": "268:30:0",
+                                    "nodeType": "YulVariableDeclaration",
+                                    "src": "56:13:0",
+                                    "value":
+                                    {
+                                        "arguments": [],
+                                        "functionName":
+                                        {
+                                            "name": "allocate_unbounded",
+                                            "nativeSrc": "278:18:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "278:20:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "variables":
+                                    [
+                                        {
+                                            "name": "_1",
+                                            "nativeSrc": "272:2:0",
+                                            "nodeType": "YulTypedName",
+                                            "src": "56:13:0",
+                                            "type": ""
+                                        }
+                                    ]
+                                },
+                                {
+                                    "expression":
+                                    {
+                                        "arguments":
+                                        [
+                                            {
+                                                "name": "_1",
+                                                "nativeSrc": "316:2:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "56:13:0"
+                                            },
+                                            {
+                                                "arguments":
+                                                [
+                                                    {
+                                                        "hexValue": "435f325f6465706c6f796564",
+                                                        "kind": "string",
+                                                        "nativeSrc": "331:14:0",
+                                                        "nodeType": "YulLiteral",
+                                                        "src": "56:13:0",
+                                                        "type": "",
+                                                        "value": "C_2_deployed"
+                                                    }
+                                                ],
+                                                "functionName":
+                                                {
+                                                    "name": "dataoffset",
+                                                    "nativeSrc": "320:10:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "320:26:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            },
+                                            {
+                                                "arguments":
+                                                [
+                                                    {
+                                                        "hexValue": "435f325f6465706c6f796564",
+                                                        "kind": "string",
+                                                        "nativeSrc": "357:14:0",
+                                                        "nodeType": "YulLiteral",
+                                                        "src": "56:13:0",
+                                                        "type": "",
+                                                        "value": "C_2_deployed"
+                                                    }
+                                                ],
+                                                "functionName":
+                                                {
+                                                    "name": "datasize",
+                                                    "nativeSrc": "348:8:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "348:24:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            }
+                                        ],
+                                        "functionName":
+                                        {
+                                            "name": "codecopy",
+                                            "nativeSrc": "307:8:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "307:66:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "nativeSrc": "307:66:0",
+                                    "nodeType": "YulExpressionStatement",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "expression":
+                                    {
+                                        "arguments":
+                                        [
+                                            {
+                                                "name": "_1",
+                                                "nativeSrc": "390:2:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "56:13:0"
+                                            },
+                                            {
+                                                "arguments":
+                                                [
+                                                    {
+                                                        "hexValue": "435f325f6465706c6f796564",
+                                                        "kind": "string",
+                                                        "nativeSrc": "403:14:0",
+                                                        "nodeType": "YulLiteral",
+                                                        "src": "56:13:0",
+                                                        "type": "",
+                                                        "value": "C_2_deployed"
+                                                    }
+                                                ],
+                                                "functionName":
+                                                {
+                                                    "name": "datasize",
+                                                    "nativeSrc": "394:8:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "394:24:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            }
+                                        ],
+                                        "functionName":
+                                        {
+                                            "name": "return",
+                                            "nativeSrc": "383:6:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "383:36:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "nativeSrc": "383:36:0",
+                                    "nodeType": "YulExpressionStatement",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "body":
+                                    {
+                                        "nativeSrc": "469:43:0",
+                                        "nodeType": "YulBlock",
+                                        "src": "56:13:0",
+                                        "statements":
+                                        [
+                                            {
+                                                "nativeSrc": "483:19:0",
+                                                "nodeType": "YulAssignment",
+                                                "src": "56:13:0",
+                                                "value":
+                                                {
+                                                    "arguments":
+                                                    [
+                                                        {
+                                                            "kind": "number",
+                                                            "nativeSrc": "499:2:0",
+                                                            "nodeType": "YulLiteral",
+                                                            "src": "56:13:0",
+                                                            "type": "",
+                                                            "value": "64"
+                                                        }
+                                                    ],
+                                                    "functionName":
+                                                    {
+                                                        "name": "mload",
+                                                        "nativeSrc": "493:5:0",
+                                                        "nodeType": "YulIdentifier",
+                                                        "src": "56:13:0"
+                                                    },
+                                                    "nativeSrc": "493:9:0",
+                                                    "nodeType": "YulFunctionCall",
+                                                    "src": "56:13:0"
+                                                },
+                                                "variableNames":
+                                                [
+                                                    {
+                                                        "name": "memPtr",
+                                                        "nativeSrc": "483:6:0",
+                                                        "nodeType": "YulIdentifier",
+                                                        "src": "56:13:0"
+                                                    }
+                                                ]
+                                            }
+                                        ]
+                                    },
+                                    "name": "allocate_unbounded",
+                                    "nativeSrc": "429:83:0",
+                                    "nodeType": "YulFunctionDefinition",
+                                    "returnVariables":
+                                    [
+                                        {
+                                            "name": "memPtr",
+                                            "nativeSrc": "462:6:0",
+                                            "nodeType": "YulTypedName",
+                                            "src": "56:13:0",
+                                            "type": ""
+                                        }
+                                    ],
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "body":
+                                    {
+                                        "nativeSrc": "611:36:0",
+                                        "nodeType": "YulBlock",
+                                        "src": "56:13:0",
+                                        "statements":
+                                        [
+                                            {
+                                                "expression":
+                                                {
+                                                    "arguments":
+                                                    [
+                                                        {
+                                                            "kind": "number",
+                                                            "nativeSrc": "632:1:0",
+                                                            "nodeType": "YulLiteral",
+                                                            "src": "56:13:0",
+                                                            "type": "",
+                                                            "value": "0"
+                                                        },
+                                                        {
+                                                            "kind": "number",
+                                                            "nativeSrc": "635:1:0",
+                                                            "nodeType": "YulLiteral",
+                                                            "src": "56:13:0",
+                                                            "type": "",
+                                                            "value": "0"
+                                                        }
+                                                    ],
+                                                    "functionName":
+                                                    {
+                                                        "name": "revert",
+                                                        "nativeSrc": "625:6:0",
+                                                        "nodeType": "YulIdentifier",
+                                                        "src": "56:13:0"
+                                                    },
+                                                    "nativeSrc": "625:12:0",
+                                                    "nodeType": "YulFunctionCall",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "625:12:0",
+                                                "nodeType": "YulExpressionStatement",
+                                                "src": "56:13:0"
+                                            }
+                                        ]
+                                    },
+                                    "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
+                                    "nativeSrc": "522:125:0",
+                                    "nodeType": "YulFunctionDefinition",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "body":
+                                    {
+                                        "nativeSrc": "726:59:0",
+                                        "nodeType": "YulBlock",
+                                        "src": "56:13:0",
+                                        "statements": []
+                                    },
+                                    "name": "constructor_C_2",
+                                    "nativeSrc": "699:86:0",
+                                    "nodeType": "YulFunctionDefinition",
+                                    "src": "56:13:0"
+                                }
+                            ]
+                        },
+                        "nodeType": "YulCode"
+                    },
+                    "name": "C_2",
+                    "nodeType": "YulObject",
+                    "subObjects":
+                    [
+                        {
+                            "code":
+                            {
+                                "block":
+                                {
+                                    "nativeSrc": "899:588:0",
+                                    "nodeType": "YulBlock",
+                                    "src": "-1:-1:0",
+                                    "statements":
+                                    [
+                                        {
+                                            "expression":
+                                            {
+                                                "arguments":
+                                                [
+                                                    {
+                                                        "kind": "number",
+                                                        "nativeSrc": "966:2:0",
+                                                        "nodeType": "YulLiteral",
+                                                        "src": "56:13:0",
+                                                        "type": "",
+                                                        "value": "64"
+                                                    },
+                                                    {
+                                                        "arguments":
+                                                        [
+                                                            {
+                                                                "kind": "number",
+                                                                "nativeSrc": "982:3:0",
+                                                                "nodeType": "YulLiteral",
+                                                                "src": "56:13:0",
+                                                                "type": "",
+                                                                "value": "128"
+                                                            }
+                                                        ],
+                                                        "functionName":
+                                                        {
+                                                            "name": "memoryguard",
+                                                            "nativeSrc": "970:11:0",
+                                                            "nodeType": "YulIdentifier",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "nativeSrc": "970:16:0",
+                                                        "nodeType": "YulFunctionCall",
+                                                        "src": "56:13:0"
+                                                    }
+                                                ],
+                                                "functionName":
+                                                {
+                                                    "name": "mstore",
+                                                    "nativeSrc": "959:6:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "959:28:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            },
+                                            "nativeSrc": "959:28:0",
+                                            "nodeType": "YulExpressionStatement",
+                                            "src": "56:13:0"
+                                        },
+                                        {
+                                            "expression":
+                                            {
+                                                "arguments": [],
+                                                "functionName":
+                                                {
+                                                    "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
+                                                    "nativeSrc": "1001:77:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "1001:79:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            },
+                                            "nativeSrc": "1001:79:0",
+                                            "nodeType": "YulExpressionStatement",
+                                            "src": "56:13:0"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nativeSrc": "1147:77:0",
+                                                "nodeType": "YulBlock",
+                                                "src": "56:13:0",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nativeSrc": "1165:44:0",
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "56:13:0",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "1198:3:0",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "56:13:0",
+                                                                    "type": "",
+                                                                    "value": "224"
+                                                                },
+                                                                {
+                                                                    "name": "value",
+                                                                    "nativeSrc": "1203:5:0",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "56:13:0"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "shr",
+                                                                "nativeSrc": "1194:3:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            },
+                                                            "nativeSrc": "1194:15:0",
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "newValue",
+                                                                "nativeSrc": "1165:8:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "shift_right_224_unsigned",
+                                            "nativeSrc": "1094:130:0",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "value",
+                                                    "nativeSrc": "1128:5:0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "56:13:0",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "newValue",
+                                                    "nativeSrc": "1138:8:0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "56:13:0",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "56:13:0"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nativeSrc": "1278:51:0",
+                                                "nodeType": "YulBlock",
+                                                "src": "56:13:0",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nativeSrc": "1296:19:0",
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "56:13:0",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "1312:2:0",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "56:13:0",
+                                                                    "type": "",
+                                                                    "value": "64"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mload",
+                                                                "nativeSrc": "1306:5:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            },
+                                                            "nativeSrc": "1306:9:0",
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "memPtr",
+                                                                "nativeSrc": "1296:6:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "allocate_unbounded",
+                                            "nativeSrc": "1238:91:0",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "memPtr",
+                                                    "nativeSrc": "1271:6:0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "56:13:0",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "56:13:0"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nativeSrc": "1432:44:0",
+                                                "nodeType": "YulBlock",
+                                                "src": "56:13:0",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "1457:1:0",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "56:13:0",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "1460:1:0",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "56:13:0",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "revert",
+                                                                "nativeSrc": "1450:6:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            },
+                                                            "nativeSrc": "1450:12:0",
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "nativeSrc": "1450:12:0",
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "56:13:0"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
+                                            "nativeSrc": "1343:133:0",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "src": "56:13:0"
+                                        }
+                                    ]
+                                },
+                                "nodeType": "YulCode"
+                            },
+                            "name": "C_2_deployed",
+                            "nodeType": "YulObject",
+                            "subObjects":
+                            [
+                                {
+                                    "nodeType": "YulData",
+                                    "value": "<BYTECODE REMOVED>"
+                                }
+                            ]
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "C":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_ir_ast_requested/in.sol b/test/cmdlineTests/standard_ir_ast_requested/in.sol
new file mode 100644
index 0000000000..a3a86cc8d3
--- /dev/null
+++ b/test/cmdlineTests/standard_ir_ast_requested/in.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {}
diff --git a/test/cmdlineTests/standard_ir_ast_requested/input.json b/test/cmdlineTests/standard_ir_ast_requested/input.json
new file mode 100644
index 0000000000..1cb1083a2e
--- /dev/null
+++ b/test/cmdlineTests/standard_ir_ast_requested/input.json
@@ -0,0 +1,9 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_ir_ast_requested/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {"*": {"*": ["irAst"]}}
+	}
+}
diff --git a/test/cmdlineTests/standard_ir_ast_requested/output.json b/test/cmdlineTests/standard_ir_ast_requested/output.json
new file mode 100644
index 0000000000..f949d7b30c
--- /dev/null
+++ b/test/cmdlineTests/standard_ir_ast_requested/output.json
@@ -0,0 +1,729 @@
+{
+    "contracts":
+    {
+        "C":
+        {
+            "C":
+            {
+                "irAst":
+                {
+                    "code":
+                    {
+                        "block":
+                        {
+                            "nativeSrc": "44:790:0",
+                            "nodeType": "YulBlock",
+                            "src": "-1:-1:0",
+                            "statements":
+                            [
+                                {
+                                    "expression":
+                                    {
+                                        "arguments":
+                                        [
+                                            {
+                                                "kind": "number",
+                                                "nativeSrc": "103:2:0",
+                                                "nodeType": "YulLiteral",
+                                                "src": "56:13:0",
+                                                "type": "",
+                                                "value": "64"
+                                            },
+                                            {
+                                                "arguments":
+                                                [
+                                                    {
+                                                        "kind": "number",
+                                                        "nativeSrc": "119:3:0",
+                                                        "nodeType": "YulLiteral",
+                                                        "src": "56:13:0",
+                                                        "type": "",
+                                                        "value": "128"
+                                                    }
+                                                ],
+                                                "functionName":
+                                                {
+                                                    "name": "memoryguard",
+                                                    "nativeSrc": "107:11:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "107:16:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            }
+                                        ],
+                                        "functionName":
+                                        {
+                                            "name": "mstore",
+                                            "nativeSrc": "96:6:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "96:28:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "nativeSrc": "96:28:0",
+                                    "nodeType": "YulExpressionStatement",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "body":
+                                    {
+                                        "nativeSrc": "148:83:0",
+                                        "nodeType": "YulBlock",
+                                        "src": "56:13:0",
+                                        "statements":
+                                        [
+                                            {
+                                                "expression":
+                                                {
+                                                    "arguments": [],
+                                                    "functionName":
+                                                    {
+                                                        "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
+                                                        "nativeSrc": "150:77:0",
+                                                        "nodeType": "YulIdentifier",
+                                                        "src": "56:13:0"
+                                                    },
+                                                    "nativeSrc": "150:79:0",
+                                                    "nodeType": "YulFunctionCall",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "150:79:0",
+                                                "nodeType": "YulExpressionStatement",
+                                                "src": "56:13:0"
+                                            }
+                                        ]
+                                    },
+                                    "condition":
+                                    {
+                                        "arguments": [],
+                                        "functionName":
+                                        {
+                                            "name": "callvalue",
+                                            "nativeSrc": "136:9:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "136:11:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "nativeSrc": "133:98:0",
+                                    "nodeType": "YulIf",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "expression":
+                                    {
+                                        "arguments": [],
+                                        "functionName":
+                                        {
+                                            "name": "constructor_C_2",
+                                            "nativeSrc": "241:15:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "241:17:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "nativeSrc": "241:17:0",
+                                    "nodeType": "YulExpressionStatement",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "nativeSrc": "268:30:0",
+                                    "nodeType": "YulVariableDeclaration",
+                                    "src": "56:13:0",
+                                    "value":
+                                    {
+                                        "arguments": [],
+                                        "functionName":
+                                        {
+                                            "name": "allocate_unbounded",
+                                            "nativeSrc": "278:18:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "278:20:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "variables":
+                                    [
+                                        {
+                                            "name": "_1",
+                                            "nativeSrc": "272:2:0",
+                                            "nodeType": "YulTypedName",
+                                            "src": "56:13:0",
+                                            "type": ""
+                                        }
+                                    ]
+                                },
+                                {
+                                    "expression":
+                                    {
+                                        "arguments":
+                                        [
+                                            {
+                                                "name": "_1",
+                                                "nativeSrc": "316:2:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "56:13:0"
+                                            },
+                                            {
+                                                "arguments":
+                                                [
+                                                    {
+                                                        "hexValue": "435f325f6465706c6f796564",
+                                                        "kind": "string",
+                                                        "nativeSrc": "331:14:0",
+                                                        "nodeType": "YulLiteral",
+                                                        "src": "56:13:0",
+                                                        "type": "",
+                                                        "value": "C_2_deployed"
+                                                    }
+                                                ],
+                                                "functionName":
+                                                {
+                                                    "name": "dataoffset",
+                                                    "nativeSrc": "320:10:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "320:26:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            },
+                                            {
+                                                "arguments":
+                                                [
+                                                    {
+                                                        "hexValue": "435f325f6465706c6f796564",
+                                                        "kind": "string",
+                                                        "nativeSrc": "357:14:0",
+                                                        "nodeType": "YulLiteral",
+                                                        "src": "56:13:0",
+                                                        "type": "",
+                                                        "value": "C_2_deployed"
+                                                    }
+                                                ],
+                                                "functionName":
+                                                {
+                                                    "name": "datasize",
+                                                    "nativeSrc": "348:8:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "348:24:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            }
+                                        ],
+                                        "functionName":
+                                        {
+                                            "name": "codecopy",
+                                            "nativeSrc": "307:8:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "307:66:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "nativeSrc": "307:66:0",
+                                    "nodeType": "YulExpressionStatement",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "expression":
+                                    {
+                                        "arguments":
+                                        [
+                                            {
+                                                "name": "_1",
+                                                "nativeSrc": "390:2:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "56:13:0"
+                                            },
+                                            {
+                                                "arguments":
+                                                [
+                                                    {
+                                                        "hexValue": "435f325f6465706c6f796564",
+                                                        "kind": "string",
+                                                        "nativeSrc": "403:14:0",
+                                                        "nodeType": "YulLiteral",
+                                                        "src": "56:13:0",
+                                                        "type": "",
+                                                        "value": "C_2_deployed"
+                                                    }
+                                                ],
+                                                "functionName":
+                                                {
+                                                    "name": "datasize",
+                                                    "nativeSrc": "394:8:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "394:24:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            }
+                                        ],
+                                        "functionName":
+                                        {
+                                            "name": "return",
+                                            "nativeSrc": "383:6:0",
+                                            "nodeType": "YulIdentifier",
+                                            "src": "56:13:0"
+                                        },
+                                        "nativeSrc": "383:36:0",
+                                        "nodeType": "YulFunctionCall",
+                                        "src": "56:13:0"
+                                    },
+                                    "nativeSrc": "383:36:0",
+                                    "nodeType": "YulExpressionStatement",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "body":
+                                    {
+                                        "nativeSrc": "469:43:0",
+                                        "nodeType": "YulBlock",
+                                        "src": "56:13:0",
+                                        "statements":
+                                        [
+                                            {
+                                                "nativeSrc": "483:19:0",
+                                                "nodeType": "YulAssignment",
+                                                "src": "56:13:0",
+                                                "value":
+                                                {
+                                                    "arguments":
+                                                    [
+                                                        {
+                                                            "kind": "number",
+                                                            "nativeSrc": "499:2:0",
+                                                            "nodeType": "YulLiteral",
+                                                            "src": "56:13:0",
+                                                            "type": "",
+                                                            "value": "64"
+                                                        }
+                                                    ],
+                                                    "functionName":
+                                                    {
+                                                        "name": "mload",
+                                                        "nativeSrc": "493:5:0",
+                                                        "nodeType": "YulIdentifier",
+                                                        "src": "56:13:0"
+                                                    },
+                                                    "nativeSrc": "493:9:0",
+                                                    "nodeType": "YulFunctionCall",
+                                                    "src": "56:13:0"
+                                                },
+                                                "variableNames":
+                                                [
+                                                    {
+                                                        "name": "memPtr",
+                                                        "nativeSrc": "483:6:0",
+                                                        "nodeType": "YulIdentifier",
+                                                        "src": "56:13:0"
+                                                    }
+                                                ]
+                                            }
+                                        ]
+                                    },
+                                    "name": "allocate_unbounded",
+                                    "nativeSrc": "429:83:0",
+                                    "nodeType": "YulFunctionDefinition",
+                                    "returnVariables":
+                                    [
+                                        {
+                                            "name": "memPtr",
+                                            "nativeSrc": "462:6:0",
+                                            "nodeType": "YulTypedName",
+                                            "src": "56:13:0",
+                                            "type": ""
+                                        }
+                                    ],
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "body":
+                                    {
+                                        "nativeSrc": "611:36:0",
+                                        "nodeType": "YulBlock",
+                                        "src": "56:13:0",
+                                        "statements":
+                                        [
+                                            {
+                                                "expression":
+                                                {
+                                                    "arguments":
+                                                    [
+                                                        {
+                                                            "kind": "number",
+                                                            "nativeSrc": "632:1:0",
+                                                            "nodeType": "YulLiteral",
+                                                            "src": "56:13:0",
+                                                            "type": "",
+                                                            "value": "0"
+                                                        },
+                                                        {
+                                                            "kind": "number",
+                                                            "nativeSrc": "635:1:0",
+                                                            "nodeType": "YulLiteral",
+                                                            "src": "56:13:0",
+                                                            "type": "",
+                                                            "value": "0"
+                                                        }
+                                                    ],
+                                                    "functionName":
+                                                    {
+                                                        "name": "revert",
+                                                        "nativeSrc": "625:6:0",
+                                                        "nodeType": "YulIdentifier",
+                                                        "src": "56:13:0"
+                                                    },
+                                                    "nativeSrc": "625:12:0",
+                                                    "nodeType": "YulFunctionCall",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "625:12:0",
+                                                "nodeType": "YulExpressionStatement",
+                                                "src": "56:13:0"
+                                            }
+                                        ]
+                                    },
+                                    "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
+                                    "nativeSrc": "522:125:0",
+                                    "nodeType": "YulFunctionDefinition",
+                                    "src": "56:13:0"
+                                },
+                                {
+                                    "body":
+                                    {
+                                        "nativeSrc": "726:59:0",
+                                        "nodeType": "YulBlock",
+                                        "src": "56:13:0",
+                                        "statements": []
+                                    },
+                                    "name": "constructor_C_2",
+                                    "nativeSrc": "699:86:0",
+                                    "nodeType": "YulFunctionDefinition",
+                                    "src": "56:13:0"
+                                }
+                            ]
+                        },
+                        "nodeType": "YulCode"
+                    },
+                    "name": "C_2",
+                    "nodeType": "YulObject",
+                    "subObjects":
+                    [
+                        {
+                            "code":
+                            {
+                                "block":
+                                {
+                                    "nativeSrc": "899:588:0",
+                                    "nodeType": "YulBlock",
+                                    "src": "-1:-1:0",
+                                    "statements":
+                                    [
+                                        {
+                                            "expression":
+                                            {
+                                                "arguments":
+                                                [
+                                                    {
+                                                        "kind": "number",
+                                                        "nativeSrc": "966:2:0",
+                                                        "nodeType": "YulLiteral",
+                                                        "src": "56:13:0",
+                                                        "type": "",
+                                                        "value": "64"
+                                                    },
+                                                    {
+                                                        "arguments":
+                                                        [
+                                                            {
+                                                                "kind": "number",
+                                                                "nativeSrc": "982:3:0",
+                                                                "nodeType": "YulLiteral",
+                                                                "src": "56:13:0",
+                                                                "type": "",
+                                                                "value": "128"
+                                                            }
+                                                        ],
+                                                        "functionName":
+                                                        {
+                                                            "name": "memoryguard",
+                                                            "nativeSrc": "970:11:0",
+                                                            "nodeType": "YulIdentifier",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "nativeSrc": "970:16:0",
+                                                        "nodeType": "YulFunctionCall",
+                                                        "src": "56:13:0"
+                                                    }
+                                                ],
+                                                "functionName":
+                                                {
+                                                    "name": "mstore",
+                                                    "nativeSrc": "959:6:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "959:28:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            },
+                                            "nativeSrc": "959:28:0",
+                                            "nodeType": "YulExpressionStatement",
+                                            "src": "56:13:0"
+                                        },
+                                        {
+                                            "expression":
+                                            {
+                                                "arguments": [],
+                                                "functionName":
+                                                {
+                                                    "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
+                                                    "nativeSrc": "1001:77:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "56:13:0"
+                                                },
+                                                "nativeSrc": "1001:79:0",
+                                                "nodeType": "YulFunctionCall",
+                                                "src": "56:13:0"
+                                            },
+                                            "nativeSrc": "1001:79:0",
+                                            "nodeType": "YulExpressionStatement",
+                                            "src": "56:13:0"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nativeSrc": "1147:77:0",
+                                                "nodeType": "YulBlock",
+                                                "src": "56:13:0",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nativeSrc": "1165:44:0",
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "56:13:0",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "1198:3:0",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "56:13:0",
+                                                                    "type": "",
+                                                                    "value": "224"
+                                                                },
+                                                                {
+                                                                    "name": "value",
+                                                                    "nativeSrc": "1203:5:0",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "56:13:0"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "shr",
+                                                                "nativeSrc": "1194:3:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            },
+                                                            "nativeSrc": "1194:15:0",
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "newValue",
+                                                                "nativeSrc": "1165:8:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "shift_right_224_unsigned",
+                                            "nativeSrc": "1094:130:0",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "parameters":
+                                            [
+                                                {
+                                                    "name": "value",
+                                                    "nativeSrc": "1128:5:0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "56:13:0",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "newValue",
+                                                    "nativeSrc": "1138:8:0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "56:13:0",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "56:13:0"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nativeSrc": "1278:51:0",
+                                                "nodeType": "YulBlock",
+                                                "src": "56:13:0",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "nativeSrc": "1296:19:0",
+                                                        "nodeType": "YulAssignment",
+                                                        "src": "56:13:0",
+                                                        "value":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "1312:2:0",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "56:13:0",
+                                                                    "type": "",
+                                                                    "value": "64"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "mload",
+                                                                "nativeSrc": "1306:5:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            },
+                                                            "nativeSrc": "1306:9:0",
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "variableNames":
+                                                        [
+                                                            {
+                                                                "name": "memPtr",
+                                                                "nativeSrc": "1296:6:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            }
+                                                        ]
+                                                    }
+                                                ]
+                                            },
+                                            "name": "allocate_unbounded",
+                                            "nativeSrc": "1238:91:0",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "returnVariables":
+                                            [
+                                                {
+                                                    "name": "memPtr",
+                                                    "nativeSrc": "1271:6:0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "56:13:0",
+                                                    "type": ""
+                                                }
+                                            ],
+                                            "src": "56:13:0"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "nativeSrc": "1432:44:0",
+                                                "nodeType": "YulBlock",
+                                                "src": "56:13:0",
+                                                "statements":
+                                                [
+                                                    {
+                                                        "expression":
+                                                        {
+                                                            "arguments":
+                                                            [
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "1457:1:0",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "56:13:0",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                },
+                                                                {
+                                                                    "kind": "number",
+                                                                    "nativeSrc": "1460:1:0",
+                                                                    "nodeType": "YulLiteral",
+                                                                    "src": "56:13:0",
+                                                                    "type": "",
+                                                                    "value": "0"
+                                                                }
+                                                            ],
+                                                            "functionName":
+                                                            {
+                                                                "name": "revert",
+                                                                "nativeSrc": "1450:6:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            },
+                                                            "nativeSrc": "1450:12:0",
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "nativeSrc": "1450:12:0",
+                                                        "nodeType": "YulExpressionStatement",
+                                                        "src": "56:13:0"
+                                                    }
+                                                ]
+                                            },
+                                            "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
+                                            "nativeSrc": "1343:133:0",
+                                            "nodeType": "YulFunctionDefinition",
+                                            "src": "56:13:0"
+                                        }
+                                    ]
+                                },
+                                "nodeType": "YulCode"
+                            },
+                            "name": "C_2_deployed",
+                            "nodeType": "YulObject",
+                            "subObjects":
+                            [
+                                {
+                                    "nodeType": "YulData",
+                                    "value": "<BYTECODE REMOVED>"
+                                }
+                            ]
+                        }
+                    ]
+                }
+            }
+        }
+    },
+    "sources":
+    {
+        "C":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_generatedSources/output.json b/test/cmdlineTests/standard_optimizer_generatedSources/output.json
index 264241d036..da2c31cbee 100644
--- a/test/cmdlineTests/standard_optimizer_generatedSources/output.json
+++ b/test/cmdlineTests/standard_optimizer_generatedSources/output.json
@@ -19,11 +19,13 @@
                             {
                                 "ast":
                                 {
+                                    "nativeSrc": "0:1445:1",
                                     "nodeType": "YulBlock",
                                     "src": "0:1445:1",
                                     "statements":
                                     [
                                         {
+                                            "nativeSrc": "6:3:1",
                                             "nodeType": "YulBlock",
                                             "src": "6:3:1",
                                             "statements": []
@@ -31,6 +33,7 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "46:95:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "46:95:1",
                                                 "statements":
@@ -42,6 +45,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "63:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "63:1:1",
                                                                     "type": "",
@@ -52,6 +56,7 @@
                                                                     [
                                                                         {
                                                                             "kind": "number",
+                                                                            "nativeSrc": "70:3:1",
                                                                             "nodeType": "YulLiteral",
                                                                             "src": "70:3:1",
                                                                             "type": "",
@@ -59,6 +64,7 @@
                                                                         },
                                                                         {
                                                                             "kind": "number",
+                                                                            "nativeSrc": "75:10:1",
                                                                             "nodeType": "YulLiteral",
                                                                             "src": "75:10:1",
                                                                             "type": "",
@@ -68,9 +74,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "shl",
+                                                                        "nativeSrc": "66:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "66:3:1"
                                                                     },
+                                                                    "nativeSrc": "66:20:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "66:20:1"
                                                                 }
@@ -78,12 +86,15 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mstore",
+                                                                "nativeSrc": "56:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "56:6:1"
                                                             },
+                                                            "nativeSrc": "56:31:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "56:31:1"
                                                         },
+                                                        "nativeSrc": "56:31:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "56:31:1"
                                                     },
@@ -94,6 +105,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "103:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "103:1:1",
                                                                     "type": "",
@@ -101,6 +113,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "106:4:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "106:4:1",
                                                                     "type": "",
@@ -110,12 +123,15 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mstore",
+                                                                "nativeSrc": "96:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "96:6:1"
                                                             },
+                                                            "nativeSrc": "96:15:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "96:15:1"
                                                         },
+                                                        "nativeSrc": "96:15:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "96:15:1"
                                                     },
@@ -126,6 +142,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "127:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "127:1:1",
                                                                     "type": "",
@@ -133,6 +150,7 @@
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "130:4:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "130:4:1",
                                                                     "type": "",
@@ -142,34 +160,41 @@
                                                             "functionName":
                                                             {
                                                                 "name": "revert",
+                                                                "nativeSrc": "120:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "120:6:1"
                                                             },
+                                                            "nativeSrc": "120:15:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "120:15:1"
                                                         },
+                                                        "nativeSrc": "120:15:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "120:15:1"
                                                     }
                                                 ]
                                             },
                                             "name": "panic_error_0x41",
+                                            "nativeSrc": "14:127:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "src": "14:127:1"
                                         },
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "241:1020:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "241:1020:1",
                                                 "statements":
                                                 [
                                                     {
+                                                        "nativeSrc": "251:12:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "251:12:1",
                                                         "value":
                                                         {
                                                             "kind": "number",
+                                                            "nativeSrc": "261:2:1",
                                                             "nodeType": "YulLiteral",
                                                             "src": "261:2:1",
                                                             "type": "",
@@ -179,6 +204,7 @@
                                                         [
                                                             {
                                                                 "name": "_1",
+                                                                "nativeSrc": "255:2:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "255:2:1",
                                                                 "type": ""
@@ -188,6 +214,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "308:16:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "308:16:1",
                                                             "statements":
@@ -199,6 +226,7 @@
                                                                         [
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "317:1:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "317:1:1",
                                                                                 "type": "",
@@ -206,6 +234,7 @@
                                                                             },
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "320:1:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "320:1:1",
                                                                                 "type": "",
@@ -215,12 +244,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "revert",
+                                                                            "nativeSrc": "310:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "310:6:1"
                                                                         },
+                                                                        "nativeSrc": "310:12:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "310:12:1"
                                                                     },
+                                                                    "nativeSrc": "310:12:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "310:12:1"
                                                                 }
@@ -235,11 +267,13 @@
                                                                     [
                                                                         {
                                                                             "name": "dataEnd",
+                                                                            "nativeSrc": "283:7:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "283:7:1"
                                                                         },
                                                                         {
                                                                             "name": "headStart",
+                                                                            "nativeSrc": "292:9:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "292:9:1"
                                                                         }
@@ -247,14 +281,17 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "sub",
+                                                                        "nativeSrc": "279:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "279:3:1"
                                                                     },
+                                                                    "nativeSrc": "279:23:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "279:23:1"
                                                                 },
                                                                 {
                                                                     "name": "_1",
+                                                                    "nativeSrc": "304:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "304:2:1"
                                                                 }
@@ -262,16 +299,20 @@
                                                             "functionName":
                                                             {
                                                                 "name": "slt",
+                                                                "nativeSrc": "275:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "275:3:1"
                                                             },
+                                                            "nativeSrc": "275:32:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "275:32:1"
                                                         },
+                                                        "nativeSrc": "272:52:1",
                                                         "nodeType": "YulIf",
                                                         "src": "272:52:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "333:37:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "333:37:1",
                                                         "value":
@@ -280,6 +321,7 @@
                                                             [
                                                                 {
                                                                     "name": "headStart",
+                                                                    "nativeSrc": "360:9:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "360:9:1"
                                                                 }
@@ -287,9 +329,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "calldataload",
+                                                                "nativeSrc": "347:12:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "347:12:1"
                                                             },
+                                                            "nativeSrc": "347:23:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "347:23:1"
                                                         },
@@ -297,6 +341,7 @@
                                                         [
                                                             {
                                                                 "name": "offset",
+                                                                "nativeSrc": "337:6:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "337:6:1",
                                                                 "type": ""
@@ -304,11 +349,13 @@
                                                         ]
                                                     },
                                                     {
+                                                        "nativeSrc": "379:28:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "379:28:1",
                                                         "value":
                                                         {
                                                             "kind": "number",
+                                                            "nativeSrc": "389:18:1",
                                                             "nodeType": "YulLiteral",
                                                             "src": "389:18:1",
                                                             "type": "",
@@ -318,6 +365,7 @@
                                                         [
                                                             {
                                                                 "name": "_2",
+                                                                "nativeSrc": "383:2:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "383:2:1",
                                                                 "type": ""
@@ -327,6 +375,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "434:16:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "434:16:1",
                                                             "statements":
@@ -338,6 +387,7 @@
                                                                         [
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "443:1:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "443:1:1",
                                                                                 "type": "",
@@ -345,6 +395,7 @@
                                                                             },
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "446:1:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "446:1:1",
                                                                                 "type": "",
@@ -354,12 +405,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "revert",
+                                                                            "nativeSrc": "436:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "436:6:1"
                                                                         },
+                                                                        "nativeSrc": "436:12:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "436:12:1"
                                                                     },
+                                                                    "nativeSrc": "436:12:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "436:12:1"
                                                                 }
@@ -371,11 +425,13 @@
                                                             [
                                                                 {
                                                                     "name": "offset",
+                                                                    "nativeSrc": "422:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "422:6:1"
                                                                 },
                                                                 {
                                                                     "name": "_2",
+                                                                    "nativeSrc": "430:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "430:2:1"
                                                                 }
@@ -383,16 +439,20 @@
                                                             "functionName":
                                                             {
                                                                 "name": "gt",
+                                                                "nativeSrc": "419:2:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "419:2:1"
                                                             },
+                                                            "nativeSrc": "419:14:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "419:14:1"
                                                         },
+                                                        "nativeSrc": "416:34:1",
                                                         "nodeType": "YulIf",
                                                         "src": "416:34:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "459:32:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "459:32:1",
                                                         "value":
@@ -401,11 +461,13 @@
                                                             [
                                                                 {
                                                                     "name": "headStart",
+                                                                    "nativeSrc": "473:9:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "473:9:1"
                                                                 },
                                                                 {
                                                                     "name": "offset",
+                                                                    "nativeSrc": "484:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "484:6:1"
                                                                 }
@@ -413,9 +475,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "469:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "469:3:1"
                                                             },
+                                                            "nativeSrc": "469:22:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "469:22:1"
                                                         },
@@ -423,6 +487,7 @@
                                                         [
                                                             {
                                                                 "name": "_3",
+                                                                "nativeSrc": "463:2:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "463:2:1",
                                                                 "type": ""
@@ -432,6 +497,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "539:16:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "539:16:1",
                                                             "statements":
@@ -443,6 +509,7 @@
                                                                         [
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "548:1:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "548:1:1",
                                                                                 "type": "",
@@ -450,6 +517,7 @@
                                                                             },
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "551:1:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "551:1:1",
                                                                                 "type": "",
@@ -459,12 +527,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "revert",
+                                                                            "nativeSrc": "541:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "541:6:1"
                                                                         },
+                                                                        "nativeSrc": "541:12:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "541:12:1"
                                                                     },
+                                                                    "nativeSrc": "541:12:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "541:12:1"
                                                                 }
@@ -482,11 +553,13 @@
                                                                             [
                                                                                 {
                                                                                     "name": "_3",
+                                                                                    "nativeSrc": "518:2:1",
                                                                                     "nodeType": "YulIdentifier",
                                                                                     "src": "518:2:1"
                                                                                 },
                                                                                 {
                                                                                     "kind": "number",
+                                                                                    "nativeSrc": "522:4:1",
                                                                                     "nodeType": "YulLiteral",
                                                                                     "src": "522:4:1",
                                                                                     "type": "",
@@ -496,14 +569,17 @@
                                                                             "functionName":
                                                                             {
                                                                                 "name": "add",
+                                                                                "nativeSrc": "514:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "514:3:1"
                                                                             },
+                                                                            "nativeSrc": "514:13:1",
                                                                             "nodeType": "YulFunctionCall",
                                                                             "src": "514:13:1"
                                                                         },
                                                                         {
                                                                             "name": "dataEnd",
+                                                                            "nativeSrc": "529:7:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "529:7:1"
                                                                         }
@@ -511,9 +587,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "slt",
+                                                                        "nativeSrc": "510:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "510:3:1"
                                                                     },
+                                                                    "nativeSrc": "510:27:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "510:27:1"
                                                                 }
@@ -521,16 +599,20 @@
                                                             "functionName":
                                                             {
                                                                 "name": "iszero",
+                                                                "nativeSrc": "503:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "503:6:1"
                                                             },
+                                                            "nativeSrc": "503:35:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "503:35:1"
                                                         },
+                                                        "nativeSrc": "500:55:1",
                                                         "nodeType": "YulIf",
                                                         "src": "500:55:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "564:26:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "564:26:1",
                                                         "value":
@@ -539,6 +621,7 @@
                                                             [
                                                                 {
                                                                     "name": "_3",
+                                                                    "nativeSrc": "587:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "587:2:1"
                                                                 }
@@ -546,9 +629,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "calldataload",
+                                                                "nativeSrc": "574:12:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "574:12:1"
                                                             },
+                                                            "nativeSrc": "574:16:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "574:16:1"
                                                         },
@@ -556,6 +641,7 @@
                                                         [
                                                             {
                                                                 "name": "_4",
+                                                                "nativeSrc": "568:2:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "568:2:1",
                                                                 "type": ""
@@ -565,6 +651,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "613:22:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "613:22:1",
                                                             "statements":
@@ -576,12 +663,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "panic_error_0x41",
+                                                                            "nativeSrc": "615:16:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "615:16:1"
                                                                         },
+                                                                        "nativeSrc": "615:18:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "615:18:1"
                                                                     },
+                                                                    "nativeSrc": "615:18:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "615:18:1"
                                                                 }
@@ -593,11 +683,13 @@
                                                             [
                                                                 {
                                                                     "name": "_4",
+                                                                    "nativeSrc": "605:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "605:2:1"
                                                                 },
                                                                 {
                                                                     "name": "_2",
+                                                                    "nativeSrc": "609:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "609:2:1"
                                                                 }
@@ -605,16 +697,20 @@
                                                             "functionName":
                                                             {
                                                                 "name": "gt",
+                                                                "nativeSrc": "602:2:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "602:2:1"
                                                             },
+                                                            "nativeSrc": "602:10:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "602:10:1"
                                                         },
+                                                        "nativeSrc": "599:36:1",
                                                         "nodeType": "YulIf",
                                                         "src": "599:36:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "644:20:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "644:20:1",
                                                         "value":
@@ -623,6 +719,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "658:1:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "658:1:1",
                                                                     "type": "",
@@ -630,6 +727,7 @@
                                                                 },
                                                                 {
                                                                     "name": "_4",
+                                                                    "nativeSrc": "661:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "661:2:1"
                                                                 }
@@ -637,9 +735,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "shl",
+                                                                "nativeSrc": "654:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "654:3:1"
                                                             },
+                                                            "nativeSrc": "654:10:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "654:10:1"
                                                         },
@@ -647,6 +747,7 @@
                                                         [
                                                             {
                                                                 "name": "_5",
+                                                                "nativeSrc": "648:2:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "648:2:1",
                                                                 "type": ""
@@ -654,6 +755,7 @@
                                                         ]
                                                     },
                                                     {
+                                                        "nativeSrc": "673:23:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "673:23:1",
                                                         "value":
@@ -662,6 +764,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "693:2:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "693:2:1",
                                                                     "type": "",
@@ -671,9 +774,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mload",
+                                                                "nativeSrc": "687:5:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "687:5:1"
                                                             },
+                                                            "nativeSrc": "687:9:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "687:9:1"
                                                         },
@@ -681,6 +786,7 @@
                                                         [
                                                             {
                                                                 "name": "memPtr",
+                                                                "nativeSrc": "677:6:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "677:6:1",
                                                                 "type": ""
@@ -688,6 +794,7 @@
                                                         ]
                                                     },
                                                     {
+                                                        "nativeSrc": "705:56:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "705:56:1",
                                                         "value":
@@ -696,6 +803,7 @@
                                                             [
                                                                 {
                                                                     "name": "memPtr",
+                                                                    "nativeSrc": "727:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "727:6:1"
                                                                 },
@@ -707,11 +815,13 @@
                                                                             [
                                                                                 {
                                                                                     "name": "_5",
+                                                                                    "nativeSrc": "743:2:1",
                                                                                     "nodeType": "YulIdentifier",
                                                                                     "src": "743:2:1"
                                                                                 },
                                                                                 {
                                                                                     "kind": "number",
+                                                                                    "nativeSrc": "747:2:1",
                                                                                     "nodeType": "YulLiteral",
                                                                                     "src": "747:2:1",
                                                                                     "type": "",
@@ -721,9 +831,11 @@
                                                                             "functionName":
                                                                             {
                                                                                 "name": "add",
+                                                                                "nativeSrc": "739:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "739:3:1"
                                                                             },
+                                                                            "nativeSrc": "739:11:1",
                                                                             "nodeType": "YulFunctionCall",
                                                                             "src": "739:11:1"
                                                                         },
@@ -732,6 +844,7 @@
                                                                             [
                                                                                 {
                                                                                     "kind": "number",
+                                                                                    "nativeSrc": "756:2:1",
                                                                                     "nodeType": "YulLiteral",
                                                                                     "src": "756:2:1",
                                                                                     "type": "",
@@ -741,9 +854,11 @@
                                                                             "functionName":
                                                                             {
                                                                                 "name": "not",
+                                                                                "nativeSrc": "752:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "752:3:1"
                                                                             },
+                                                                            "nativeSrc": "752:7:1",
                                                                             "nodeType": "YulFunctionCall",
                                                                             "src": "752:7:1"
                                                                         }
@@ -751,9 +866,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "and",
+                                                                        "nativeSrc": "735:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "735:3:1"
                                                                     },
+                                                                    "nativeSrc": "735:25:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "735:25:1"
                                                                 }
@@ -761,9 +878,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "723:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "723:3:1"
                                                             },
+                                                            "nativeSrc": "723:38:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "723:38:1"
                                                         },
@@ -771,6 +890,7 @@
                                                         [
                                                             {
                                                                 "name": "newFreePtr",
+                                                                "nativeSrc": "709:10:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "709:10:1",
                                                                 "type": ""
@@ -780,6 +900,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "820:22:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "820:22:1",
                                                             "statements":
@@ -791,12 +912,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "panic_error_0x41",
+                                                                            "nativeSrc": "822:16:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "822:16:1"
                                                                         },
+                                                                        "nativeSrc": "822:18:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "822:18:1"
                                                                     },
+                                                                    "nativeSrc": "822:18:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "822:18:1"
                                                                 }
@@ -811,11 +935,13 @@
                                                                     [
                                                                         {
                                                                             "name": "newFreePtr",
+                                                                            "nativeSrc": "779:10:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "779:10:1"
                                                                         },
                                                                         {
                                                                             "name": "_2",
+                                                                            "nativeSrc": "791:2:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "791:2:1"
                                                                         }
@@ -823,9 +949,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "gt",
+                                                                        "nativeSrc": "776:2:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "776:2:1"
                                                                     },
+                                                                    "nativeSrc": "776:18:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "776:18:1"
                                                                 },
@@ -834,11 +962,13 @@
                                                                     [
                                                                         {
                                                                             "name": "newFreePtr",
+                                                                            "nativeSrc": "799:10:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "799:10:1"
                                                                         },
                                                                         {
                                                                             "name": "memPtr",
+                                                                            "nativeSrc": "811:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "811:6:1"
                                                                         }
@@ -846,9 +976,11 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "lt",
+                                                                        "nativeSrc": "796:2:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "796:2:1"
                                                                     },
+                                                                    "nativeSrc": "796:22:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "796:22:1"
                                                                 }
@@ -856,12 +988,15 @@
                                                             "functionName":
                                                             {
                                                                 "name": "or",
+                                                                "nativeSrc": "773:2:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "773:2:1"
                                                             },
+                                                            "nativeSrc": "773:46:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "773:46:1"
                                                         },
+                                                        "nativeSrc": "770:72:1",
                                                         "nodeType": "YulIf",
                                                         "src": "770:72:1"
                                                     },
@@ -872,6 +1007,7 @@
                                                             [
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "858:2:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "858:2:1",
                                                                     "type": "",
@@ -879,6 +1015,7 @@
                                                                 },
                                                                 {
                                                                     "name": "newFreePtr",
+                                                                    "nativeSrc": "862:10:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "862:10:1"
                                                                 }
@@ -886,21 +1023,26 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mstore",
+                                                                "nativeSrc": "851:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "851:6:1"
                                                             },
+                                                            "nativeSrc": "851:22:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "851:22:1"
                                                         },
+                                                        "nativeSrc": "851:22:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "851:22:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "882:17:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "882:17:1",
                                                         "value":
                                                         {
                                                             "name": "memPtr",
+                                                            "nativeSrc": "893:6:1",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "893:6:1"
                                                         },
@@ -908,6 +1050,7 @@
                                                         [
                                                             {
                                                                 "name": "dst",
+                                                                "nativeSrc": "886:3:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "886:3:1",
                                                                 "type": ""
@@ -921,11 +1064,13 @@
                                                             [
                                                                 {
                                                                     "name": "memPtr",
+                                                                    "nativeSrc": "915:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "915:6:1"
                                                                 },
                                                                 {
                                                                     "name": "_4",
+                                                                    "nativeSrc": "923:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "923:2:1"
                                                                 }
@@ -933,16 +1078,20 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mstore",
+                                                                "nativeSrc": "908:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "908:6:1"
                                                             },
+                                                            "nativeSrc": "908:18:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "908:18:1"
                                                         },
+                                                        "nativeSrc": "908:18:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "908:18:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "935:22:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "935:22:1",
                                                         "value":
@@ -951,11 +1100,13 @@
                                                             [
                                                                 {
                                                                     "name": "memPtr",
+                                                                    "nativeSrc": "946:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "946:6:1"
                                                                 },
                                                                 {
                                                                     "name": "_1",
+                                                                    "nativeSrc": "954:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "954:2:1"
                                                                 }
@@ -963,9 +1114,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "942:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "942:3:1"
                                                             },
+                                                            "nativeSrc": "942:15:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "942:15:1"
                                                         },
@@ -973,12 +1126,14 @@
                                                         [
                                                             {
                                                                 "name": "dst",
+                                                                "nativeSrc": "935:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "935:3:1"
                                                             }
                                                         ]
                                                     },
                                                     {
+                                                        "nativeSrc": "966:34:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "966:34:1",
                                                         "value":
@@ -990,11 +1145,13 @@
                                                                     [
                                                                         {
                                                                             "name": "_3",
+                                                                            "nativeSrc": "988:2:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "988:2:1"
                                                                         },
                                                                         {
                                                                             "name": "_5",
+                                                                            "nativeSrc": "992:2:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "992:2:1"
                                                                         }
@@ -1002,14 +1159,17 @@
                                                                     "functionName":
                                                                     {
                                                                         "name": "add",
+                                                                        "nativeSrc": "984:3:1",
                                                                         "nodeType": "YulIdentifier",
                                                                         "src": "984:3:1"
                                                                     },
+                                                                    "nativeSrc": "984:11:1",
                                                                     "nodeType": "YulFunctionCall",
                                                                     "src": "984:11:1"
                                                                 },
                                                                 {
                                                                     "name": "_1",
+                                                                    "nativeSrc": "997:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "997:2:1"
                                                                 }
@@ -1017,9 +1177,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "980:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "980:3:1"
                                                             },
+                                                            "nativeSrc": "980:20:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "980:20:1"
                                                         },
@@ -1027,6 +1189,7 @@
                                                         [
                                                             {
                                                                 "name": "srcEnd",
+                                                                "nativeSrc": "970:6:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "970:6:1",
                                                                 "type": ""
@@ -1036,6 +1199,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "1032:16:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1032:16:1",
                                                             "statements":
@@ -1047,6 +1211,7 @@
                                                                         [
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "1041:1:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "1041:1:1",
                                                                                 "type": "",
@@ -1054,6 +1219,7 @@
                                                                             },
                                                                             {
                                                                                 "kind": "number",
+                                                                                "nativeSrc": "1044:1:1",
                                                                                 "nodeType": "YulLiteral",
                                                                                 "src": "1044:1:1",
                                                                                 "type": "",
@@ -1063,12 +1229,15 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "revert",
+                                                                            "nativeSrc": "1034:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "1034:6:1"
                                                                         },
+                                                                        "nativeSrc": "1034:12:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "1034:12:1"
                                                                     },
+                                                                    "nativeSrc": "1034:12:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "1034:12:1"
                                                                 }
@@ -1080,11 +1249,13 @@
                                                             [
                                                                 {
                                                                     "name": "srcEnd",
+                                                                    "nativeSrc": "1015:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1015:6:1"
                                                                 },
                                                                 {
                                                                     "name": "dataEnd",
+                                                                    "nativeSrc": "1023:7:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1023:7:1"
                                                                 }
@@ -1092,16 +1263,20 @@
                                                             "functionName":
                                                             {
                                                                 "name": "gt",
+                                                                "nativeSrc": "1012:2:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1012:2:1"
                                                             },
+                                                            "nativeSrc": "1012:19:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1012:19:1"
                                                         },
+                                                        "nativeSrc": "1009:39:1",
                                                         "nodeType": "YulIf",
                                                         "src": "1009:39:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "1057:22:1",
                                                         "nodeType": "YulVariableDeclaration",
                                                         "src": "1057:22:1",
                                                         "value":
@@ -1110,11 +1285,13 @@
                                                             [
                                                                 {
                                                                     "name": "_3",
+                                                                    "nativeSrc": "1072:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1072:2:1"
                                                                 },
                                                                 {
                                                                     "name": "_1",
+                                                                    "nativeSrc": "1076:2:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1076:2:1"
                                                                 }
@@ -1122,9 +1299,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "1068:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1068:3:1"
                                                             },
+                                                            "nativeSrc": "1068:11:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1068:11:1"
                                                         },
@@ -1132,6 +1311,7 @@
                                                         [
                                                             {
                                                                 "name": "src",
+                                                                "nativeSrc": "1061:3:1",
                                                                 "nodeType": "YulTypedName",
                                                                 "src": "1061:3:1",
                                                                 "type": ""
@@ -1141,6 +1321,7 @@
                                                     {
                                                         "body":
                                                         {
+                                                            "nativeSrc": "1144:86:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1144:86:1",
                                                             "statements":
@@ -1152,6 +1333,7 @@
                                                                         [
                                                                             {
                                                                                 "name": "dst",
+                                                                                "nativeSrc": "1165:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "1165:3:1"
                                                                             },
@@ -1160,6 +1342,7 @@
                                                                                 [
                                                                                     {
                                                                                         "name": "src",
+                                                                                        "nativeSrc": "1183:3:1",
                                                                                         "nodeType": "YulIdentifier",
                                                                                         "src": "1183:3:1"
                                                                                     }
@@ -1167,9 +1350,11 @@
                                                                                 "functionName":
                                                                                 {
                                                                                     "name": "calldataload",
+                                                                                    "nativeSrc": "1170:12:1",
                                                                                     "nodeType": "YulIdentifier",
                                                                                     "src": "1170:12:1"
                                                                                 },
+                                                                                "nativeSrc": "1170:17:1",
                                                                                 "nodeType": "YulFunctionCall",
                                                                                 "src": "1170:17:1"
                                                                             }
@@ -1177,16 +1362,20 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "mstore",
+                                                                            "nativeSrc": "1158:6:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "1158:6:1"
                                                                         },
+                                                                        "nativeSrc": "1158:30:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "1158:30:1"
                                                                     },
+                                                                    "nativeSrc": "1158:30:1",
                                                                     "nodeType": "YulExpressionStatement",
                                                                     "src": "1158:30:1"
                                                                 },
                                                                 {
+                                                                    "nativeSrc": "1201:19:1",
                                                                     "nodeType": "YulAssignment",
                                                                     "src": "1201:19:1",
                                                                     "value":
@@ -1195,11 +1384,13 @@
                                                                         [
                                                                             {
                                                                                 "name": "dst",
+                                                                                "nativeSrc": "1212:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "1212:3:1"
                                                                             },
                                                                             {
                                                                                 "name": "_1",
+                                                                                "nativeSrc": "1217:2:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "1217:2:1"
                                                                             }
@@ -1207,9 +1398,11 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "add",
+                                                                            "nativeSrc": "1208:3:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "1208:3:1"
                                                                         },
+                                                                        "nativeSrc": "1208:12:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "1208:12:1"
                                                                     },
@@ -1217,6 +1410,7 @@
                                                                     [
                                                                         {
                                                                             "name": "dst",
+                                                                            "nativeSrc": "1201:3:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "1201:3:1"
                                                                         }
@@ -1230,11 +1424,13 @@
                                                             [
                                                                 {
                                                                     "name": "src",
+                                                                    "nativeSrc": "1099:3:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1099:3:1"
                                                                 },
                                                                 {
                                                                     "name": "srcEnd",
+                                                                    "nativeSrc": "1104:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1104:6:1"
                                                                 }
@@ -1242,20 +1438,25 @@
                                                             "functionName":
                                                             {
                                                                 "name": "lt",
+                                                                "nativeSrc": "1096:2:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1096:2:1"
                                                             },
+                                                            "nativeSrc": "1096:15:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1096:15:1"
                                                         },
+                                                        "nativeSrc": "1088:142:1",
                                                         "nodeType": "YulForLoop",
                                                         "post":
                                                         {
+                                                            "nativeSrc": "1112:23:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1112:23:1",
                                                             "statements":
                                                             [
                                                                 {
+                                                                    "nativeSrc": "1114:19:1",
                                                                     "nodeType": "YulAssignment",
                                                                     "src": "1114:19:1",
                                                                     "value":
@@ -1264,11 +1465,13 @@
                                                                         [
                                                                             {
                                                                                 "name": "src",
+                                                                                "nativeSrc": "1125:3:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "1125:3:1"
                                                                             },
                                                                             {
                                                                                 "name": "_1",
+                                                                                "nativeSrc": "1130:2:1",
                                                                                 "nodeType": "YulIdentifier",
                                                                                 "src": "1130:2:1"
                                                                             }
@@ -1276,9 +1479,11 @@
                                                                         "functionName":
                                                                         {
                                                                             "name": "add",
+                                                                            "nativeSrc": "1121:3:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "1121:3:1"
                                                                         },
+                                                                        "nativeSrc": "1121:12:1",
                                                                         "nodeType": "YulFunctionCall",
                                                                         "src": "1121:12:1"
                                                                     },
@@ -1286,6 +1491,7 @@
                                                                     [
                                                                         {
                                                                             "name": "src",
+                                                                            "nativeSrc": "1114:3:1",
                                                                             "nodeType": "YulIdentifier",
                                                                             "src": "1114:3:1"
                                                                         }
@@ -1295,6 +1501,7 @@
                                                         },
                                                         "pre":
                                                         {
+                                                            "nativeSrc": "1092:3:1",
                                                             "nodeType": "YulBlock",
                                                             "src": "1092:3:1",
                                                             "statements": []
@@ -1302,11 +1509,13 @@
                                                         "src": "1088:142:1"
                                                     },
                                                     {
+                                                        "nativeSrc": "1239:16:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1239:16:1",
                                                         "value":
                                                         {
                                                             "name": "memPtr",
+                                                            "nativeSrc": "1249:6:1",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "1249:6:1"
                                                         },
@@ -1314,6 +1523,7 @@
                                                         [
                                                             {
                                                                 "name": "value0",
+                                                                "nativeSrc": "1239:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1239:6:1"
                                                             }
@@ -1322,17 +1532,20 @@
                                                 ]
                                             },
                                             "name": "abi_decode_tuple_t_array$_t_uint256_$dyn_memory_ptr",
+                                            "nativeSrc": "146:1115:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "headStart",
+                                                    "nativeSrc": "207:9:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "207:9:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "dataEnd",
+                                                    "nativeSrc": "218:7:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "218:7:1",
                                                     "type": ""
@@ -1342,6 +1555,7 @@
                                             [
                                                 {
                                                     "name": "value0",
+                                                    "nativeSrc": "230:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "230:6:1",
                                                     "type": ""
@@ -1352,11 +1566,13 @@
                                         {
                                             "body":
                                             {
+                                                "nativeSrc": "1367:76:1",
                                                 "nodeType": "YulBlock",
                                                 "src": "1367:76:1",
                                                 "statements":
                                                 [
                                                     {
+                                                        "nativeSrc": "1377:26:1",
                                                         "nodeType": "YulAssignment",
                                                         "src": "1377:26:1",
                                                         "value":
@@ -1365,11 +1581,13 @@
                                                             [
                                                                 {
                                                                     "name": "headStart",
+                                                                    "nativeSrc": "1389:9:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1389:9:1"
                                                                 },
                                                                 {
                                                                     "kind": "number",
+                                                                    "nativeSrc": "1400:2:1",
                                                                     "nodeType": "YulLiteral",
                                                                     "src": "1400:2:1",
                                                                     "type": "",
@@ -1379,9 +1597,11 @@
                                                             "functionName":
                                                             {
                                                                 "name": "add",
+                                                                "nativeSrc": "1385:3:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1385:3:1"
                                                             },
+                                                            "nativeSrc": "1385:18:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1385:18:1"
                                                         },
@@ -1389,6 +1609,7 @@
                                                         [
                                                             {
                                                                 "name": "tail",
+                                                                "nativeSrc": "1377:4:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1377:4:1"
                                                             }
@@ -1401,11 +1622,13 @@
                                                             [
                                                                 {
                                                                     "name": "headStart",
+                                                                    "nativeSrc": "1419:9:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1419:9:1"
                                                                 },
                                                                 {
                                                                     "name": "value0",
+                                                                    "nativeSrc": "1430:6:1",
                                                                     "nodeType": "YulIdentifier",
                                                                     "src": "1430:6:1"
                                                                 }
@@ -1413,29 +1636,35 @@
                                                             "functionName":
                                                             {
                                                                 "name": "mstore",
+                                                                "nativeSrc": "1412:6:1",
                                                                 "nodeType": "YulIdentifier",
                                                                 "src": "1412:6:1"
                                                             },
+                                                            "nativeSrc": "1412:25:1",
                                                             "nodeType": "YulFunctionCall",
                                                             "src": "1412:25:1"
                                                         },
+                                                        "nativeSrc": "1412:25:1",
                                                         "nodeType": "YulExpressionStatement",
                                                         "src": "1412:25:1"
                                                     }
                                                 ]
                                             },
                                             "name": "abi_encode_tuple_t_uint256__to_t_uint256__fromStack_reversed",
+                                            "nativeSrc": "1266:177:1",
                                             "nodeType": "YulFunctionDefinition",
                                             "parameters":
                                             [
                                                 {
                                                     "name": "headStart",
+                                                    "nativeSrc": "1336:9:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1336:9:1",
                                                     "type": ""
                                                 },
                                                 {
                                                     "name": "value0",
+                                                    "nativeSrc": "1347:6:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1347:6:1",
                                                     "type": ""
@@ -1445,6 +1674,7 @@
                                             [
                                                 {
                                                     "name": "tail",
+                                                    "nativeSrc": "1358:4:1",
                                                     "nodeType": "YulTypedName",
                                                     "src": "1358:4:1",
                                                     "type": ""
diff --git a/test/cmdlineTests/standard_yul/output.json b/test/cmdlineTests/standard_yul/output.json
index 33d5fc0bd3..d335c3a966 100644
--- a/test/cmdlineTests/standard_yul/output.json
+++ b/test/cmdlineTests/standard_yul/output.json
@@ -50,5 +50,128 @@
 "
             }
         }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "ast":
+            {
+                "code":
+                {
+                    "block":
+                    {
+                        "nativeSrc": "0:42:0",
+                        "nodeType": "YulBlock",
+                        "src": "0:42:0",
+                        "statements":
+                        [
+                            {
+                                "nativeSrc": "2:17:0",
+                                "nodeType": "YulVariableDeclaration",
+                                "src": "2:17:0",
+                                "value":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "17:1:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "17:1:0",
+                                            "type": "",
+                                            "value": "0"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "mload",
+                                        "nativeSrc": "11:5:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "11:5:0"
+                                    },
+                                    "nativeSrc": "11:8:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "11:8:0"
+                                },
+                                "variables":
+                                [
+                                    {
+                                        "name": "x",
+                                        "nativeSrc": "6:1:0",
+                                        "nodeType": "YulTypedName",
+                                        "src": "6:1:0",
+                                        "type": ""
+                                    }
+                                ]
+                            },
+                            {
+                                "expression":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "arguments":
+                                            [
+                                                {
+                                                    "name": "x",
+                                                    "nativeSrc": "31:1:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "31:1:0"
+                                                },
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "34:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "34:1:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                }
+                                            ],
+                                            "functionName":
+                                            {
+                                                "name": "add",
+                                                "nativeSrc": "27:3:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "27:3:0"
+                                            },
+                                            "nativeSrc": "27:9:0",
+                                            "nodeType": "YulFunctionCall",
+                                            "src": "27:9:0"
+                                        },
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "38:1:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "38:1:0",
+                                            "type": "",
+                                            "value": "0"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "sstore",
+                                        "nativeSrc": "20:6:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "20:6:0"
+                                    },
+                                    "nativeSrc": "20:20:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "20:20:0"
+                                },
+                                "nativeSrc": "20:20:0",
+                                "nodeType": "YulExpressionStatement",
+                                "src": "20:20:0"
+                            }
+                        ]
+                    },
+                    "nodeType": "YulCode"
+                },
+                "name": "object",
+                "nodeType": "YulObject",
+                "subObjects": []
+            },
+            "id": 1
+        }
     }
 }
diff --git a/test/cmdlineTests/standard_yul_object/output.json b/test/cmdlineTests/standard_yul_object/output.json
index e5a5dadac5..af55758f4d 100644
--- a/test/cmdlineTests/standard_yul_object/output.json
+++ b/test/cmdlineTests/standard_yul_object/output.json
@@ -52,5 +52,135 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
 "
             }
         }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "ast":
+            {
+                "code":
+                {
+                    "block":
+                    {
+                        "nativeSrc": "28:56:0",
+                        "nodeType": "YulBlock",
+                        "src": "28:56:0",
+                        "statements":
+                        [
+                            {
+                                "nativeSrc": "30:31:0",
+                                "nodeType": "YulVariableDeclaration",
+                                "src": "30:31:0",
+                                "value":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "hexValue": "446174614e616d65",
+                                            "kind": "string",
+                                            "nativeSrc": "50:10:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "50:10:0",
+                                            "type": "",
+                                            "value": "DataName"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "dataoffset",
+                                        "nativeSrc": "39:10:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "39:10:0"
+                                    },
+                                    "nativeSrc": "39:22:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "39:22:0"
+                                },
+                                "variables":
+                                [
+                                    {
+                                        "name": "x",
+                                        "nativeSrc": "34:1:0",
+                                        "nodeType": "YulTypedName",
+                                        "src": "34:1:0",
+                                        "type": ""
+                                    }
+                                ]
+                            },
+                            {
+                                "expression":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "arguments":
+                                            [
+                                                {
+                                                    "name": "x",
+                                                    "nativeSrc": "73:1:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "73:1:0"
+                                                },
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "76:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "76:1:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                }
+                                            ],
+                                            "functionName":
+                                            {
+                                                "name": "add",
+                                                "nativeSrc": "69:3:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "69:3:0"
+                                            },
+                                            "nativeSrc": "69:9:0",
+                                            "nodeType": "YulFunctionCall",
+                                            "src": "69:9:0"
+                                        },
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "80:1:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "80:1:0",
+                                            "type": "",
+                                            "value": "0"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "sstore",
+                                        "nativeSrc": "62:6:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "62:6:0"
+                                    },
+                                    "nativeSrc": "62:20:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "62:20:0"
+                                },
+                                "nativeSrc": "62:20:0",
+                                "nodeType": "YulExpressionStatement",
+                                "src": "62:20:0"
+                            }
+                        ]
+                    },
+                    "nodeType": "YulCode"
+                },
+                "name": "NamedObject",
+                "nodeType": "YulObject",
+                "subObjects":
+                [
+                    {
+                        "nodeType": "YulData",
+                        "value": "616263"
+                    }
+                ]
+            },
+            "id": 1
+        }
     }
 }
diff --git a/test/cmdlineTests/standard_yul_object_name/output.json b/test/cmdlineTests/standard_yul_object_name/output.json
index 57c7ce709d..e94a9bc6ac 100644
--- a/test/cmdlineTests/standard_yul_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_object_name/output.json
@@ -77,5 +77,190 @@ sub_0: assembly {
 "
             }
         }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "ast":
+            {
+                "code":
+                {
+                    "block":
+                    {
+                        "nativeSrc": "28:56:0",
+                        "nodeType": "YulBlock",
+                        "src": "28:56:0",
+                        "statements":
+                        [
+                            {
+                                "nativeSrc": "30:31:0",
+                                "nodeType": "YulVariableDeclaration",
+                                "src": "30:31:0",
+                                "value":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "hexValue": "446174614e616d65",
+                                            "kind": "string",
+                                            "nativeSrc": "50:10:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "50:10:0",
+                                            "type": "",
+                                            "value": "DataName"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "dataoffset",
+                                        "nativeSrc": "39:10:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "39:10:0"
+                                    },
+                                    "nativeSrc": "39:22:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "39:22:0"
+                                },
+                                "variables":
+                                [
+                                    {
+                                        "name": "x",
+                                        "nativeSrc": "34:1:0",
+                                        "nodeType": "YulTypedName",
+                                        "src": "34:1:0",
+                                        "type": ""
+                                    }
+                                ]
+                            },
+                            {
+                                "expression":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "arguments":
+                                            [
+                                                {
+                                                    "name": "x",
+                                                    "nativeSrc": "73:1:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "73:1:0"
+                                                },
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "76:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "76:1:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                }
+                                            ],
+                                            "functionName":
+                                            {
+                                                "name": "add",
+                                                "nativeSrc": "69:3:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "69:3:0"
+                                            },
+                                            "nativeSrc": "69:9:0",
+                                            "nodeType": "YulFunctionCall",
+                                            "src": "69:9:0"
+                                        },
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "80:1:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "80:1:0",
+                                            "type": "",
+                                            "value": "0"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "sstore",
+                                        "nativeSrc": "62:6:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "62:6:0"
+                                    },
+                                    "nativeSrc": "62:20:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "62:20:0"
+                                },
+                                "nativeSrc": "62:20:0",
+                                "nodeType": "YulExpressionStatement",
+                                "src": "62:20:0"
+                            }
+                        ]
+                    },
+                    "nodeType": "YulCode"
+                },
+                "name": "NamedObject",
+                "nodeType": "YulObject",
+                "subObjects":
+                [
+                    {
+                        "nodeType": "YulData",
+                        "value": "616263"
+                    },
+                    {
+                        "code":
+                        {
+                            "block":
+                            {
+                                "nativeSrc": "135:16:0",
+                                "nodeType": "YulBlock",
+                                "src": "135:16:0",
+                                "statements":
+                                [
+                                    {
+                                        "expression":
+                                        {
+                                            "arguments":
+                                            [
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "144:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "144:1:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                },
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "147:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "147:1:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                }
+                                            ],
+                                            "functionName":
+                                            {
+                                                "name": "revert",
+                                                "nativeSrc": "137:6:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "137:6:0"
+                                            },
+                                            "nativeSrc": "137:12:0",
+                                            "nodeType": "YulFunctionCall",
+                                            "src": "137:12:0"
+                                        },
+                                        "nativeSrc": "137:12:0",
+                                        "nodeType": "YulExpressionStatement",
+                                        "src": "137:12:0"
+                                    }
+                                ]
+                            },
+                            "nodeType": "YulCode"
+                        },
+                        "name": "OtherObject",
+                        "nodeType": "YulObject",
+                        "subObjects": []
+                    }
+                ]
+            },
+            "id": 1
+        }
     }
 }
diff --git a/test/cmdlineTests/standard_yul_optimiserSteps/output.json b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
index 7df2f76952..54dd24ac68 100644
--- a/test/cmdlineTests/standard_yul_optimiserSteps/output.json
+++ b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
@@ -45,5 +45,128 @@
 "
             }
         }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "ast":
+            {
+                "code":
+                {
+                    "block":
+                    {
+                        "nativeSrc": "0:42:0",
+                        "nodeType": "YulBlock",
+                        "src": "0:42:0",
+                        "statements":
+                        [
+                            {
+                                "nativeSrc": "2:17:0",
+                                "nodeType": "YulVariableDeclaration",
+                                "src": "2:17:0",
+                                "value":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "17:1:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "17:1:0",
+                                            "type": "",
+                                            "value": "0"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "mload",
+                                        "nativeSrc": "11:5:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "11:5:0"
+                                    },
+                                    "nativeSrc": "11:8:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "11:8:0"
+                                },
+                                "variables":
+                                [
+                                    {
+                                        "name": "x",
+                                        "nativeSrc": "6:1:0",
+                                        "nodeType": "YulTypedName",
+                                        "src": "6:1:0",
+                                        "type": ""
+                                    }
+                                ]
+                            },
+                            {
+                                "expression":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "arguments":
+                                            [
+                                                {
+                                                    "name": "x",
+                                                    "nativeSrc": "31:1:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "31:1:0"
+                                                },
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "34:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "34:1:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                }
+                                            ],
+                                            "functionName":
+                                            {
+                                                "name": "add",
+                                                "nativeSrc": "27:3:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "27:3:0"
+                                            },
+                                            "nativeSrc": "27:9:0",
+                                            "nodeType": "YulFunctionCall",
+                                            "src": "27:9:0"
+                                        },
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "38:1:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "38:1:0",
+                                            "type": "",
+                                            "value": "0"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "sstore",
+                                        "nativeSrc": "20:6:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "20:6:0"
+                                    },
+                                    "nativeSrc": "20:20:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "20:20:0"
+                                },
+                                "nativeSrc": "20:20:0",
+                                "nodeType": "YulExpressionStatement",
+                                "src": "20:20:0"
+                            }
+                        ]
+                    },
+                    "nodeType": "YulCode"
+                },
+                "name": "object",
+                "nodeType": "YulObject",
+                "subObjects": []
+            },
+            "id": 1
+        }
     }
 }
diff --git a/test/cmdlineTests/standard_yul_optimized/output.json b/test/cmdlineTests/standard_yul_optimized/output.json
index f5524c6df7..b260f72edc 100644
--- a/test/cmdlineTests/standard_yul_optimized/output.json
+++ b/test/cmdlineTests/standard_yul_optimized/output.json
@@ -40,5 +40,128 @@
 "
             }
         }
+    },
+    "sources":
+    {
+        "A":
+        {
+            "ast":
+            {
+                "code":
+                {
+                    "block":
+                    {
+                        "nativeSrc": "0:42:0",
+                        "nodeType": "YulBlock",
+                        "src": "0:42:0",
+                        "statements":
+                        [
+                            {
+                                "nativeSrc": "2:17:0",
+                                "nodeType": "YulVariableDeclaration",
+                                "src": "2:17:0",
+                                "value":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "17:1:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "17:1:0",
+                                            "type": "",
+                                            "value": "0"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "mload",
+                                        "nativeSrc": "11:5:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "11:5:0"
+                                    },
+                                    "nativeSrc": "11:8:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "11:8:0"
+                                },
+                                "variables":
+                                [
+                                    {
+                                        "name": "x",
+                                        "nativeSrc": "6:1:0",
+                                        "nodeType": "YulTypedName",
+                                        "src": "6:1:0",
+                                        "type": ""
+                                    }
+                                ]
+                            },
+                            {
+                                "expression":
+                                {
+                                    "arguments":
+                                    [
+                                        {
+                                            "arguments":
+                                            [
+                                                {
+                                                    "name": "x",
+                                                    "nativeSrc": "31:1:0",
+                                                    "nodeType": "YulIdentifier",
+                                                    "src": "31:1:0"
+                                                },
+                                                {
+                                                    "kind": "number",
+                                                    "nativeSrc": "34:1:0",
+                                                    "nodeType": "YulLiteral",
+                                                    "src": "34:1:0",
+                                                    "type": "",
+                                                    "value": "0"
+                                                }
+                                            ],
+                                            "functionName":
+                                            {
+                                                "name": "add",
+                                                "nativeSrc": "27:3:0",
+                                                "nodeType": "YulIdentifier",
+                                                "src": "27:3:0"
+                                            },
+                                            "nativeSrc": "27:9:0",
+                                            "nodeType": "YulFunctionCall",
+                                            "src": "27:9:0"
+                                        },
+                                        {
+                                            "kind": "number",
+                                            "nativeSrc": "38:1:0",
+                                            "nodeType": "YulLiteral",
+                                            "src": "38:1:0",
+                                            "type": "",
+                                            "value": "0"
+                                        }
+                                    ],
+                                    "functionName":
+                                    {
+                                        "name": "sstore",
+                                        "nativeSrc": "20:6:0",
+                                        "nodeType": "YulIdentifier",
+                                        "src": "20:6:0"
+                                    },
+                                    "nativeSrc": "20:20:0",
+                                    "nodeType": "YulFunctionCall",
+                                    "src": "20:20:0"
+                                },
+                                "nativeSrc": "20:20:0",
+                                "nodeType": "YulExpressionStatement",
+                                "src": "20:20:0"
+                            }
+                        ]
+                    },
+                    "nodeType": "YulCode"
+                },
+                "name": "object",
+                "nodeType": "YulObject",
+                "subObjects": []
+            },
+            "id": 1
+        }
     }
 }
diff --git a/test/cmdlineTests/strict_asm_ast_compact_json/args b/test/cmdlineTests/strict_asm_ast_compact_json/args
new file mode 100644
index 0000000000..091ceb769a
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_ast_compact_json/args
@@ -0,0 +1 @@
+--strict-assembly --ast-compact-json --pretty-json --json-indent 4
diff --git a/test/cmdlineTests/strict_asm_ast_compact_json/input.yul b/test/cmdlineTests/strict_asm_ast_compact_json/input.yul
new file mode 100644
index 0000000000..6d1ebe21b9
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_ast_compact_json/input.yul
@@ -0,0 +1,15 @@
+/// @use-src 0:"input.sol"
+object "C_6_deployed" {
+    code {
+        /// @src 0:60:101  "contract C {..."
+        mstore(64, 128)
+
+        // f()
+        fun_f_5()
+
+        /// @src 0:77:99  "function f() public {}"
+        function fun_f_5() {
+        }
+        /// @src 0:60:101  "contract C {..."
+    }
+}
diff --git a/test/cmdlineTests/strict_asm_ast_compact_json/output b/test/cmdlineTests/strict_asm_ast_compact_json/output
new file mode 100644
index 0000000000..ff944e8e47
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_ast_compact_json/output
@@ -0,0 +1,91 @@
+
+======= strict_asm_ast_compact_json/input.yul (EVM) =======
+AST:
+
+{
+    "code":
+    {
+        "block":
+        {
+            "nativeSrc": "60:246:0",
+            "nodeType": "YulBlock",
+            "src": "-1:-1:0",
+            "statements":
+            [
+                {
+                    "expression":
+                    {
+                        "arguments":
+                        [
+                            {
+                                "kind": "number",
+                                "nativeSrc": "122:2:0",
+                                "nodeType": "YulLiteral",
+                                "src": "60:41:0",
+                                "type": "",
+                                "value": "64"
+                            },
+                            {
+                                "kind": "number",
+                                "nativeSrc": "126:3:0",
+                                "nodeType": "YulLiteral",
+                                "src": "60:41:0",
+                                "type": "",
+                                "value": "128"
+                            }
+                        ],
+                        "functionName":
+                        {
+                            "name": "mstore",
+                            "nativeSrc": "115:6:0",
+                            "nodeType": "YulIdentifier",
+                            "src": "60:41:0"
+                        },
+                        "nativeSrc": "115:15:0",
+                        "nodeType": "YulFunctionCall",
+                        "src": "60:41:0"
+                    },
+                    "nativeSrc": "115:15:0",
+                    "nodeType": "YulExpressionStatement",
+                    "src": "60:41:0"
+                },
+                {
+                    "expression":
+                    {
+                        "arguments": [],
+                        "functionName":
+                        {
+                            "name": "fun_f_5",
+                            "nativeSrc": "155:7:0",
+                            "nodeType": "YulIdentifier",
+                            "src": "60:41:0"
+                        },
+                        "nativeSrc": "155:9:0",
+                        "nodeType": "YulFunctionCall",
+                        "src": "60:41:0"
+                    },
+                    "nativeSrc": "155:9:0",
+                    "nodeType": "YulExpressionStatement",
+                    "src": "60:41:0"
+                },
+                {
+                    "body":
+                    {
+                        "nativeSrc": "244:11:0",
+                        "nodeType": "YulBlock",
+                        "src": "77:22:0",
+                        "statements": []
+                    },
+                    "name": "fun_f_5",
+                    "nativeSrc": "225:30:0",
+                    "nodeType": "YulFunctionDefinition",
+                    "src": "77:22:0"
+                }
+            ]
+        },
+        "nodeType": "YulCode"
+    },
+    "name": "C_6_deployed",
+    "nodeType": "YulObject",
+    "subObjects": []
+}
diff --git a/test/libsolidity/ASTJSON/assembly/call.json b/test/libsolidity/ASTJSON/assembly/call.json
index 7081d2f983..d92cf05fe8 100644
--- a/test/libsolidity/ASTJSON/assembly/call.json
+++ b/test/libsolidity/ASTJSON/assembly/call.json
@@ -39,6 +39,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "56:34:1",
                   "nodeType": "YulBlock",
                   "src": "56:34:1",
                   "statements":
@@ -53,6 +54,7 @@
                             [
                               {
                                 "kind": "number",
+                                "nativeSrc": "67:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "67:1:1",
                                 "type": "",
@@ -60,6 +62,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "70:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "70:1:1",
                                 "type": "",
@@ -67,6 +70,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "73:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "73:1:1",
                                 "type": "",
@@ -74,6 +78,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "76:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "76:1:1",
                                 "type": "",
@@ -81,6 +86,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "79:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "79:1:1",
                                 "type": "",
@@ -88,6 +94,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "82:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "82:1:1",
                                 "type": "",
@@ -95,6 +102,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "85:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "85:1:1",
                                 "type": "",
@@ -104,9 +112,11 @@
                             "functionName":
                             {
                               "name": "call",
+                              "nativeSrc": "62:4:1",
                               "nodeType": "YulIdentifier",
                               "src": "62:4:1"
                             },
+                            "nativeSrc": "62:25:1",
                             "nodeType": "YulFunctionCall",
                             "src": "62:25:1"
                           }
@@ -114,12 +124,15 @@
                         "functionName":
                         {
                           "name": "pop",
+                          "nativeSrc": "58:3:1",
                           "nodeType": "YulIdentifier",
                           "src": "58:3:1"
                         },
+                        "nativeSrc": "58:30:1",
                         "nodeType": "YulFunctionCall",
                         "src": "58:30:1"
                       },
+                      "nativeSrc": "58:30:1",
                       "nodeType": "YulExpressionStatement",
                       "src": "58:30:1"
                     }
diff --git a/test/libsolidity/ASTJSON/assembly/call_parseOnly.json b/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
index 1a9dc74a28..803a1e4f5f 100644
--- a/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/call_parseOnly.json
@@ -26,6 +26,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "56:34:1",
                   "nodeType": "YulBlock",
                   "src": "56:34:1",
                   "statements":
@@ -40,6 +41,7 @@
                             [
                               {
                                 "kind": "number",
+                                "nativeSrc": "67:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "67:1:1",
                                 "type": "",
@@ -47,6 +49,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "70:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "70:1:1",
                                 "type": "",
@@ -54,6 +57,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "73:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "73:1:1",
                                 "type": "",
@@ -61,6 +65,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "76:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "76:1:1",
                                 "type": "",
@@ -68,6 +73,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "79:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "79:1:1",
                                 "type": "",
@@ -75,6 +81,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "82:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "82:1:1",
                                 "type": "",
@@ -82,6 +89,7 @@
                               },
                               {
                                 "kind": "number",
+                                "nativeSrc": "85:1:1",
                                 "nodeType": "YulLiteral",
                                 "src": "85:1:1",
                                 "type": "",
@@ -91,9 +99,11 @@
                             "functionName":
                             {
                               "name": "call",
+                              "nativeSrc": "62:4:1",
                               "nodeType": "YulIdentifier",
                               "src": "62:4:1"
                             },
+                            "nativeSrc": "62:25:1",
                             "nodeType": "YulFunctionCall",
                             "src": "62:25:1"
                           }
@@ -101,12 +111,15 @@
                         "functionName":
                         {
                           "name": "pop",
+                          "nativeSrc": "58:3:1",
                           "nodeType": "YulIdentifier",
                           "src": "58:3:1"
                         },
+                        "nativeSrc": "58:30:1",
                         "nodeType": "YulFunctionCall",
                         "src": "58:30:1"
                       },
+                      "nativeSrc": "58:30:1",
                       "nodeType": "YulExpressionStatement",
                       "src": "58:30:1"
                     }
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block.json b/test/libsolidity/ASTJSON/assembly/empty_block.json
index 05dc8c0c05..3ec3c2eec0 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_block.json
+++ b/test/libsolidity/ASTJSON/assembly/empty_block.json
@@ -39,11 +39,13 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "61:6:1",
                   "nodeType": "YulBlock",
                   "src": "61:6:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "63:2:1",
                       "nodeType": "YulBlock",
                       "src": "63:2:1",
                       "statements": []
diff --git a/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json b/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
index 4a1d1f6147..ee8e7b7330 100644
--- a/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/empty_block_parseOnly.json
@@ -26,11 +26,13 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "61:6:1",
                   "nodeType": "YulBlock",
                   "src": "61:6:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "63:2:1",
                       "nodeType": "YulBlock",
                       "src": "63:2:1",
                       "statements": []
diff --git a/test/libsolidity/ASTJSON/assembly/function.json b/test/libsolidity/ASTJSON/assembly/function.json
index d8822183c2..a3b908ac18 100644
--- a/test/libsolidity/ASTJSON/assembly/function.json
+++ b/test/libsolidity/ASTJSON/assembly/function.json
@@ -39,6 +39,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "61:43:1",
                   "nodeType": "YulBlock",
                   "src": "61:43:1",
                   "statements":
@@ -46,6 +47,7 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "76:22:1",
                         "nodeType": "YulBlock",
                         "src": "76:22:1",
                         "statements":
@@ -60,6 +62,7 @@
                                   [
                                     {
                                       "kind": "number",
+                                      "nativeSrc": "92:2:1",
                                       "nodeType": "YulLiteral",
                                       "src": "92:2:1",
                                       "type": "",
@@ -69,9 +72,11 @@
                                   "functionName":
                                   {
                                     "name": "blockhash",
+                                    "nativeSrc": "82:9:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "82:9:1"
                                   },
+                                  "nativeSrc": "82:13:1",
                                   "nodeType": "YulFunctionCall",
                                   "src": "82:13:1"
                                 }
@@ -79,18 +84,22 @@
                               "functionName":
                               {
                                 "name": "pop",
+                                "nativeSrc": "78:3:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "78:3:1"
                               },
+                              "nativeSrc": "78:18:1",
                               "nodeType": "YulFunctionCall",
                               "src": "78:18:1"
                             },
+                            "nativeSrc": "78:18:1",
                             "nodeType": "YulExpressionStatement",
                             "src": "78:18:1"
                           }
                         ]
                       },
                       "name": "g",
+                      "nativeSrc": "63:35:1",
                       "nodeType": "YulFunctionDefinition",
                       "src": "63:35:1"
                     },
@@ -101,12 +110,15 @@
                         "functionName":
                         {
                           "name": "g",
+                          "nativeSrc": "99:1:1",
                           "nodeType": "YulIdentifier",
                           "src": "99:1:1"
                         },
+                        "nativeSrc": "99:3:1",
                         "nodeType": "YulFunctionCall",
                         "src": "99:3:1"
                       },
+                      "nativeSrc": "99:3:1",
                       "nodeType": "YulExpressionStatement",
                       "src": "99:3:1"
                     }
diff --git a/test/libsolidity/ASTJSON/assembly/function_parseOnly.json b/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
index 8115fc0aec..04f5c2721b 100644
--- a/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/function_parseOnly.json
@@ -26,6 +26,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "61:43:1",
                   "nodeType": "YulBlock",
                   "src": "61:43:1",
                   "statements":
@@ -33,6 +34,7 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "76:22:1",
                         "nodeType": "YulBlock",
                         "src": "76:22:1",
                         "statements":
@@ -47,6 +49,7 @@
                                   [
                                     {
                                       "kind": "number",
+                                      "nativeSrc": "92:2:1",
                                       "nodeType": "YulLiteral",
                                       "src": "92:2:1",
                                       "type": "",
@@ -56,9 +59,11 @@
                                   "functionName":
                                   {
                                     "name": "blockhash",
+                                    "nativeSrc": "82:9:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "82:9:1"
                                   },
+                                  "nativeSrc": "82:13:1",
                                   "nodeType": "YulFunctionCall",
                                   "src": "82:13:1"
                                 }
@@ -66,18 +71,22 @@
                               "functionName":
                               {
                                 "name": "pop",
+                                "nativeSrc": "78:3:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "78:3:1"
                               },
+                              "nativeSrc": "78:18:1",
                               "nodeType": "YulFunctionCall",
                               "src": "78:18:1"
                             },
+                            "nativeSrc": "78:18:1",
                             "nodeType": "YulExpressionStatement",
                             "src": "78:18:1"
                           }
                         ]
                       },
                       "name": "g",
+                      "nativeSrc": "63:35:1",
                       "nodeType": "YulFunctionDefinition",
                       "src": "63:35:1"
                     },
@@ -88,12 +97,15 @@
                         "functionName":
                         {
                           "name": "g",
+                          "nativeSrc": "99:1:1",
                           "nodeType": "YulIdentifier",
                           "src": "99:1:1"
                         },
+                        "nativeSrc": "99:3:1",
                         "nodeType": "YulFunctionCall",
                         "src": "99:3:1"
                       },
+                      "nativeSrc": "99:3:1",
                       "nodeType": "YulExpressionStatement",
                       "src": "99:3:1"
                     }
diff --git a/test/libsolidity/ASTJSON/assembly/leave.json b/test/libsolidity/ASTJSON/assembly/leave.json
index 23ac98ccb3..51c94f542c 100644
--- a/test/libsolidity/ASTJSON/assembly/leave.json
+++ b/test/libsolidity/ASTJSON/assembly/leave.json
@@ -39,6 +39,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "56:26:1",
                   "nodeType": "YulBlock",
                   "src": "56:26:1",
                   "statements":
@@ -46,17 +47,20 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "71:9:1",
                         "nodeType": "YulBlock",
                         "src": "71:9:1",
                         "statements":
                         [
                           {
+                            "nativeSrc": "73:5:1",
                             "nodeType": "YulLeave",
                             "src": "73:5:1"
                           }
                         ]
                       },
                       "name": "f",
+                      "nativeSrc": "58:22:1",
                       "nodeType": "YulFunctionDefinition",
                       "src": "58:22:1"
                     }
diff --git a/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json b/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
index 215266456d..ee34743eac 100644
--- a/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/leave_parseOnly.json
@@ -26,6 +26,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "56:26:1",
                   "nodeType": "YulBlock",
                   "src": "56:26:1",
                   "statements":
@@ -33,17 +34,20 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "71:9:1",
                         "nodeType": "YulBlock",
                         "src": "71:9:1",
                         "statements":
                         [
                           {
+                            "nativeSrc": "73:5:1",
                             "nodeType": "YulLeave",
                             "src": "73:5:1"
                           }
                         ]
                       },
                       "name": "f",
+                      "nativeSrc": "58:22:1",
                       "nodeType": "YulFunctionDefinition",
                       "src": "58:22:1"
                     }
diff --git a/test/libsolidity/ASTJSON/assembly/loop.json b/test/libsolidity/ASTJSON/assembly/loop.json
index 7e684b4a34..d3d20992d7 100644
--- a/test/libsolidity/ASTJSON/assembly/loop.json
+++ b/test/libsolidity/ASTJSON/assembly/loop.json
@@ -39,6 +39,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "61:49:1",
                   "nodeType": "YulBlock",
                   "src": "61:49:1",
                   "statements":
@@ -46,15 +47,18 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "90:18:1",
                         "nodeType": "YulBlock",
                         "src": "90:18:1",
                         "statements":
                         [
                           {
+                            "nativeSrc": "92:5:1",
                             "nodeType": "YulBreak",
                             "src": "92:5:1"
                           },
                           {
+                            "nativeSrc": "98:8:1",
                             "nodeType": "YulContinue",
                             "src": "98:8:1"
                           }
@@ -63,14 +67,17 @@
                       "condition":
                       {
                         "kind": "number",
+                        "nativeSrc": "70:1:1",
                         "nodeType": "YulLiteral",
                         "src": "70:1:1",
                         "type": "",
                         "value": "1"
                       },
+                      "nativeSrc": "63:45:1",
                       "nodeType": "YulForLoop",
                       "post":
                       {
+                        "nativeSrc": "72:17:1",
                         "nodeType": "YulBlock",
                         "src": "72:17:1",
                         "statements":
@@ -85,6 +92,7 @@
                                   [
                                     {
                                       "kind": "number",
+                                      "nativeSrc": "84:1:1",
                                       "nodeType": "YulLiteral",
                                       "src": "84:1:1",
                                       "type": "",
@@ -94,9 +102,11 @@
                                   "functionName":
                                   {
                                     "name": "sload",
+                                    "nativeSrc": "78:5:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "78:5:1"
                                   },
+                                  "nativeSrc": "78:8:1",
                                   "nodeType": "YulFunctionCall",
                                   "src": "78:8:1"
                                 }
@@ -104,12 +114,15 @@
                               "functionName":
                               {
                                 "name": "pop",
+                                "nativeSrc": "74:3:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "74:3:1"
                               },
+                              "nativeSrc": "74:13:1",
                               "nodeType": "YulFunctionCall",
                               "src": "74:13:1"
                             },
+                            "nativeSrc": "74:13:1",
                             "nodeType": "YulExpressionStatement",
                             "src": "74:13:1"
                           }
@@ -117,6 +130,7 @@
                       },
                       "pre":
                       {
+                        "nativeSrc": "67:2:1",
                         "nodeType": "YulBlock",
                         "src": "67:2:1",
                         "statements": []
diff --git a/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json b/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
index 934afdf42e..24dbbdc4ea 100644
--- a/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/loop_parseOnly.json
@@ -26,6 +26,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "61:49:1",
                   "nodeType": "YulBlock",
                   "src": "61:49:1",
                   "statements":
@@ -33,15 +34,18 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "90:18:1",
                         "nodeType": "YulBlock",
                         "src": "90:18:1",
                         "statements":
                         [
                           {
+                            "nativeSrc": "92:5:1",
                             "nodeType": "YulBreak",
                             "src": "92:5:1"
                           },
                           {
+                            "nativeSrc": "98:8:1",
                             "nodeType": "YulContinue",
                             "src": "98:8:1"
                           }
@@ -50,14 +54,17 @@
                       "condition":
                       {
                         "kind": "number",
+                        "nativeSrc": "70:1:1",
                         "nodeType": "YulLiteral",
                         "src": "70:1:1",
                         "type": "",
                         "value": "1"
                       },
+                      "nativeSrc": "63:45:1",
                       "nodeType": "YulForLoop",
                       "post":
                       {
+                        "nativeSrc": "72:17:1",
                         "nodeType": "YulBlock",
                         "src": "72:17:1",
                         "statements":
@@ -72,6 +79,7 @@
                                   [
                                     {
                                       "kind": "number",
+                                      "nativeSrc": "84:1:1",
                                       "nodeType": "YulLiteral",
                                       "src": "84:1:1",
                                       "type": "",
@@ -81,9 +89,11 @@
                                   "functionName":
                                   {
                                     "name": "sload",
+                                    "nativeSrc": "78:5:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "78:5:1"
                                   },
+                                  "nativeSrc": "78:8:1",
                                   "nodeType": "YulFunctionCall",
                                   "src": "78:8:1"
                                 }
@@ -91,12 +101,15 @@
                               "functionName":
                               {
                                 "name": "pop",
+                                "nativeSrc": "74:3:1",
                                 "nodeType": "YulIdentifier",
                                 "src": "74:3:1"
                               },
+                              "nativeSrc": "74:13:1",
                               "nodeType": "YulFunctionCall",
                               "src": "74:13:1"
                             },
+                            "nativeSrc": "74:13:1",
                             "nodeType": "YulExpressionStatement",
                             "src": "74:13:1"
                           }
@@ -104,6 +117,7 @@
                       },
                       "pre":
                       {
+                        "nativeSrc": "67:2:1",
                         "nodeType": "YulBlock",
                         "src": "67:2:1",
                         "statements": []
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions.json b/test/libsolidity/ASTJSON/assembly/nested_functions.json
index 881e7456f1..3c9fd53ec0 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions.json
@@ -39,6 +39,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "72:76:1",
                   "nodeType": "YulBlock",
                   "src": "72:76:1",
                   "statements":
@@ -46,6 +47,7 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "94:35:1",
                         "nodeType": "YulBlock",
                         "src": "94:35:1",
                         "statements":
@@ -53,26 +55,31 @@
                           {
                             "body":
                             {
+                              "nativeSrc": "118:3:1",
                               "nodeType": "YulBlock",
                               "src": "118:3:1",
                               "statements": []
                             },
                             "name": "f2",
+                            "nativeSrc": "104:17:1",
                             "nodeType": "YulFunctionDefinition",
                             "src": "104:17:1"
                           }
                         ]
                       },
                       "name": "f1",
+                      "nativeSrc": "80:49:1",
                       "nodeType": "YulFunctionDefinition",
                       "src": "80:49:1"
                     },
                     {
+                      "nativeSrc": "136:6:1",
                       "nodeType": "YulAssignment",
                       "src": "136:6:1",
                       "value":
                       {
                         "kind": "number",
+                        "nativeSrc": "141:1:1",
                         "nodeType": "YulLiteral",
                         "src": "141:1:1",
                         "type": "",
@@ -82,6 +89,7 @@
                       [
                         {
                           "name": "x",
+                          "nativeSrc": "136:1:1",
                           "nodeType": "YulIdentifier",
                           "src": "136:1:1"
                         }
diff --git a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
index a9ac0965aa..b924b42cfd 100644
--- a/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/nested_functions_parseOnly.json
@@ -26,6 +26,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "72:76:1",
                   "nodeType": "YulBlock",
                   "src": "72:76:1",
                   "statements":
@@ -33,6 +34,7 @@
                     {
                       "body":
                       {
+                        "nativeSrc": "94:35:1",
                         "nodeType": "YulBlock",
                         "src": "94:35:1",
                         "statements":
@@ -40,26 +42,31 @@
                           {
                             "body":
                             {
+                              "nativeSrc": "118:3:1",
                               "nodeType": "YulBlock",
                               "src": "118:3:1",
                               "statements": []
                             },
                             "name": "f2",
+                            "nativeSrc": "104:17:1",
                             "nodeType": "YulFunctionDefinition",
                             "src": "104:17:1"
                           }
                         ]
                       },
                       "name": "f1",
+                      "nativeSrc": "80:49:1",
                       "nodeType": "YulFunctionDefinition",
                       "src": "80:49:1"
                     },
                     {
+                      "nativeSrc": "136:6:1",
                       "nodeType": "YulAssignment",
                       "src": "136:6:1",
                       "value":
                       {
                         "kind": "number",
+                        "nativeSrc": "141:1:1",
                         "nodeType": "YulLiteral",
                         "src": "141:1:1",
                         "type": "",
@@ -69,6 +76,7 @@
                       [
                         {
                           "name": "x",
+                          "nativeSrc": "136:1:1",
                           "nodeType": "YulIdentifier",
                           "src": "136:1:1"
                         }
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset.json b/test/libsolidity/ASTJSON/assembly/slot_offset.json
index e61125cbdb..799239b3af 100644
--- a/test/libsolidity/ASTJSON/assembly/slot_offset.json
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset.json
@@ -124,16 +124,19 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "95:45:1",
                   "nodeType": "YulBlock",
                   "src": "95:45:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "97:17:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "97:17:1",
                       "value":
                       {
                         "name": "s.offset",
+                        "nativeSrc": "106:8:1",
                         "nodeType": "YulIdentifier",
                         "src": "106:8:1"
                       },
@@ -141,6 +144,7 @@
                       [
                         {
                           "name": "x",
+                          "nativeSrc": "101:1:1",
                           "nodeType": "YulTypedName",
                           "src": "101:1:1",
                           "type": ""
@@ -148,6 +152,7 @@
                       ]
                     },
                     {
+                      "nativeSrc": "115:23:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "115:23:1",
                       "value":
@@ -156,11 +161,13 @@
                         [
                           {
                             "name": "s.slot",
+                            "nativeSrc": "128:6:1",
                             "nodeType": "YulIdentifier",
                             "src": "128:6:1"
                           },
                           {
                             "kind": "number",
+                            "nativeSrc": "136:1:1",
                             "nodeType": "YulLiteral",
                             "src": "136:1:1",
                             "type": "",
@@ -170,9 +177,11 @@
                         "functionName":
                         {
                           "name": "mul",
+                          "nativeSrc": "124:3:1",
                           "nodeType": "YulIdentifier",
                           "src": "124:3:1"
                         },
+                        "nativeSrc": "124:14:1",
                         "nodeType": "YulFunctionCall",
                         "src": "124:14:1"
                       },
@@ -180,6 +189,7 @@
                       [
                         {
                           "name": "y",
+                          "nativeSrc": "119:1:1",
                           "nodeType": "YulTypedName",
                           "src": "119:1:1",
                           "type": ""
diff --git a/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json b/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
index ccf9c53fe1..ef8dc8b0ad 100644
--- a/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/slot_offset_parseOnly.json
@@ -89,16 +89,19 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "95:45:1",
                   "nodeType": "YulBlock",
                   "src": "95:45:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "97:17:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "97:17:1",
                       "value":
                       {
                         "name": "s.offset",
+                        "nativeSrc": "106:8:1",
                         "nodeType": "YulIdentifier",
                         "src": "106:8:1"
                       },
@@ -106,6 +109,7 @@
                       [
                         {
                           "name": "x",
+                          "nativeSrc": "101:1:1",
                           "nodeType": "YulTypedName",
                           "src": "101:1:1",
                           "type": ""
@@ -113,6 +117,7 @@
                       ]
                     },
                     {
+                      "nativeSrc": "115:23:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "115:23:1",
                       "value":
@@ -121,11 +126,13 @@
                         [
                           {
                             "name": "s.slot",
+                            "nativeSrc": "128:6:1",
                             "nodeType": "YulIdentifier",
                             "src": "128:6:1"
                           },
                           {
                             "kind": "number",
+                            "nativeSrc": "136:1:1",
                             "nodeType": "YulLiteral",
                             "src": "136:1:1",
                             "type": "",
@@ -135,9 +142,11 @@
                         "functionName":
                         {
                           "name": "mul",
+                          "nativeSrc": "124:3:1",
                           "nodeType": "YulIdentifier",
                           "src": "124:3:1"
                         },
+                        "nativeSrc": "124:14:1",
                         "nodeType": "YulFunctionCall",
                         "src": "124:14:1"
                       },
@@ -145,6 +154,7 @@
                       [
                         {
                           "name": "y",
+                          "nativeSrc": "119:1:1",
                           "nodeType": "YulTypedName",
                           "src": "119:1:1",
                           "type": ""
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit.json b/test/libsolidity/ASTJSON/assembly/stringlit.json
index 33211190e5..ab27a3d16f 100644
--- a/test/libsolidity/ASTJSON/assembly/stringlit.json
+++ b/test/libsolidity/ASTJSON/assembly/stringlit.json
@@ -39,17 +39,20 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "56:18:1",
                   "nodeType": "YulBlock",
                   "src": "56:18:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "58:14:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "58:14:1",
                       "value":
                       {
                         "hexValue": "616263",
                         "kind": "string",
+                        "nativeSrc": "67:5:1",
                         "nodeType": "YulLiteral",
                         "src": "67:5:1",
                         "type": "",
@@ -59,6 +62,7 @@
                       [
                         {
                           "name": "x",
+                          "nativeSrc": "62:1:1",
                           "nodeType": "YulTypedName",
                           "src": "62:1:1",
                           "type": ""
diff --git a/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json b/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
index dd4e1d0610..3cb2a90728 100644
--- a/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/stringlit_parseOnly.json
@@ -26,17 +26,20 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "56:18:1",
                   "nodeType": "YulBlock",
                   "src": "56:18:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "58:14:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "58:14:1",
                       "value":
                       {
                         "hexValue": "616263",
                         "kind": "string",
+                        "nativeSrc": "67:5:1",
                         "nodeType": "YulLiteral",
                         "src": "67:5:1",
                         "type": "",
@@ -46,6 +49,7 @@
                       [
                         {
                           "name": "x",
+                          "nativeSrc": "62:1:1",
                           "nodeType": "YulTypedName",
                           "src": "62:1:1",
                           "type": ""
diff --git a/test/libsolidity/ASTJSON/assembly/switch.json b/test/libsolidity/ASTJSON/assembly/switch.json
index 26874da0e9..99c69e048b 100644
--- a/test/libsolidity/ASTJSON/assembly/switch.json
+++ b/test/libsolidity/ASTJSON/assembly/switch.json
@@ -39,16 +39,19 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "61:129:1",
                   "nodeType": "YulBlock",
                   "src": "61:129:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "75:10:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "75:10:1",
                       "value":
                       {
                         "kind": "number",
+                        "nativeSrc": "84:1:1",
                         "nodeType": "YulLiteral",
                         "src": "84:1:1",
                         "type": "",
@@ -58,6 +61,7 @@
                       [
                         {
                           "name": "v",
+                          "nativeSrc": "79:1:1",
                           "nodeType": "YulTypedName",
                           "src": "79:1:1",
                           "type": ""
@@ -70,16 +74,19 @@
                         {
                           "body":
                           {
+                            "nativeSrc": "139:10:1",
                             "nodeType": "YulBlock",
                             "src": "139:10:1",
                             "statements":
                             [
                               {
+                                "nativeSrc": "141:6:1",
                                 "nodeType": "YulAssignment",
                                 "src": "141:6:1",
                                 "value":
                                 {
                                   "kind": "number",
+                                  "nativeSrc": "146:1:1",
                                   "nodeType": "YulLiteral",
                                   "src": "146:1:1",
                                   "type": "",
@@ -89,6 +96,7 @@
                                 [
                                   {
                                     "name": "v",
+                                    "nativeSrc": "141:1:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "141:1:1"
                                   }
@@ -96,11 +104,13 @@
                               }
                             ]
                           },
+                          "nativeSrc": "132:17:1",
                           "nodeType": "YulCase",
                           "src": "132:17:1",
                           "value":
                           {
                             "kind": "number",
+                            "nativeSrc": "137:1:1",
                             "nodeType": "YulLiteral",
                             "src": "137:1:1",
                             "type": "",
@@ -110,16 +120,19 @@
                         {
                           "body":
                           {
+                            "nativeSrc": "170:10:1",
                             "nodeType": "YulBlock",
                             "src": "170:10:1",
                             "statements":
                             [
                               {
+                                "nativeSrc": "172:6:1",
                                 "nodeType": "YulAssignment",
                                 "src": "172:6:1",
                                 "value":
                                 {
                                   "kind": "number",
+                                  "nativeSrc": "177:1:1",
                                   "nodeType": "YulLiteral",
                                   "src": "177:1:1",
                                   "type": "",
@@ -129,6 +142,7 @@
                                 [
                                   {
                                     "name": "v",
+                                    "nativeSrc": "172:1:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "172:1:1"
                                   }
@@ -136,6 +150,7 @@
                               }
                             ]
                           },
+                          "nativeSrc": "162:18:1",
                           "nodeType": "YulCase",
                           "src": "162:18:1",
                           "value": "default"
@@ -147,12 +162,15 @@
                         "functionName":
                         {
                           "name": "calldatasize",
+                          "nativeSrc": "105:12:1",
                           "nodeType": "YulIdentifier",
                           "src": "105:12:1"
                         },
+                        "nativeSrc": "105:14:1",
                         "nodeType": "YulFunctionCall",
                         "src": "105:14:1"
                       },
+                      "nativeSrc": "98:82:1",
                       "nodeType": "YulSwitch",
                       "src": "98:82:1"
                     }
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default.json b/test/libsolidity/ASTJSON/assembly/switch_default.json
index d472ea0183..07f804f3cb 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_default.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_default.json
@@ -39,6 +39,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "61:33:1",
                   "nodeType": "YulBlock",
                   "src": "61:33:1",
                   "statements":
@@ -49,15 +50,18 @@
                         {
                           "body":
                           {
+                            "nativeSrc": "79:2:1",
                             "nodeType": "YulBlock",
                             "src": "79:2:1",
                             "statements": []
                           },
+                          "nativeSrc": "72:9:1",
                           "nodeType": "YulCase",
                           "src": "72:9:1",
                           "value":
                           {
                             "kind": "number",
+                            "nativeSrc": "77:1:1",
                             "nodeType": "YulLiteral",
                             "src": "77:1:1",
                             "type": "",
@@ -67,10 +71,12 @@
                         {
                           "body":
                           {
+                            "nativeSrc": "90:2:1",
                             "nodeType": "YulBlock",
                             "src": "90:2:1",
                             "statements": []
                           },
+                          "nativeSrc": "82:10:1",
                           "nodeType": "YulCase",
                           "src": "82:10:1",
                           "value": "default"
@@ -79,11 +85,13 @@
                       "expression":
                       {
                         "kind": "number",
+                        "nativeSrc": "70:1:1",
                         "nodeType": "YulLiteral",
                         "src": "70:1:1",
                         "type": "",
                         "value": "0"
                       },
+                      "nativeSrc": "63:29:1",
                       "nodeType": "YulSwitch",
                       "src": "63:29:1"
                     }
diff --git a/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json b/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
index e4a3e1b40c..2ec3027708 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_default_parseOnly.json
@@ -26,6 +26,7 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "61:33:1",
                   "nodeType": "YulBlock",
                   "src": "61:33:1",
                   "statements":
@@ -36,15 +37,18 @@
                         {
                           "body":
                           {
+                            "nativeSrc": "79:2:1",
                             "nodeType": "YulBlock",
                             "src": "79:2:1",
                             "statements": []
                           },
+                          "nativeSrc": "72:9:1",
                           "nodeType": "YulCase",
                           "src": "72:9:1",
                           "value":
                           {
                             "kind": "number",
+                            "nativeSrc": "77:1:1",
                             "nodeType": "YulLiteral",
                             "src": "77:1:1",
                             "type": "",
@@ -54,10 +58,12 @@
                         {
                           "body":
                           {
+                            "nativeSrc": "90:2:1",
                             "nodeType": "YulBlock",
                             "src": "90:2:1",
                             "statements": []
                           },
+                          "nativeSrc": "82:10:1",
                           "nodeType": "YulCase",
                           "src": "82:10:1",
                           "value": "default"
@@ -66,11 +72,13 @@
                       "expression":
                       {
                         "kind": "number",
+                        "nativeSrc": "70:1:1",
                         "nodeType": "YulLiteral",
                         "src": "70:1:1",
                         "type": "",
                         "value": "0"
                       },
+                      "nativeSrc": "63:29:1",
                       "nodeType": "YulSwitch",
                       "src": "63:29:1"
                     }
diff --git a/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json b/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
index d7392a8c8c..2412ea48dd 100644
--- a/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/switch_parseOnly.json
@@ -26,16 +26,19 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "61:129:1",
                   "nodeType": "YulBlock",
                   "src": "61:129:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "75:10:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "75:10:1",
                       "value":
                       {
                         "kind": "number",
+                        "nativeSrc": "84:1:1",
                         "nodeType": "YulLiteral",
                         "src": "84:1:1",
                         "type": "",
@@ -45,6 +48,7 @@
                       [
                         {
                           "name": "v",
+                          "nativeSrc": "79:1:1",
                           "nodeType": "YulTypedName",
                           "src": "79:1:1",
                           "type": ""
@@ -57,16 +61,19 @@
                         {
                           "body":
                           {
+                            "nativeSrc": "139:10:1",
                             "nodeType": "YulBlock",
                             "src": "139:10:1",
                             "statements":
                             [
                               {
+                                "nativeSrc": "141:6:1",
                                 "nodeType": "YulAssignment",
                                 "src": "141:6:1",
                                 "value":
                                 {
                                   "kind": "number",
+                                  "nativeSrc": "146:1:1",
                                   "nodeType": "YulLiteral",
                                   "src": "146:1:1",
                                   "type": "",
@@ -76,6 +83,7 @@
                                 [
                                   {
                                     "name": "v",
+                                    "nativeSrc": "141:1:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "141:1:1"
                                   }
@@ -83,11 +91,13 @@
                               }
                             ]
                           },
+                          "nativeSrc": "132:17:1",
                           "nodeType": "YulCase",
                           "src": "132:17:1",
                           "value":
                           {
                             "kind": "number",
+                            "nativeSrc": "137:1:1",
                             "nodeType": "YulLiteral",
                             "src": "137:1:1",
                             "type": "",
@@ -97,16 +107,19 @@
                         {
                           "body":
                           {
+                            "nativeSrc": "170:10:1",
                             "nodeType": "YulBlock",
                             "src": "170:10:1",
                             "statements":
                             [
                               {
+                                "nativeSrc": "172:6:1",
                                 "nodeType": "YulAssignment",
                                 "src": "172:6:1",
                                 "value":
                                 {
                                   "kind": "number",
+                                  "nativeSrc": "177:1:1",
                                   "nodeType": "YulLiteral",
                                   "src": "177:1:1",
                                   "type": "",
@@ -116,6 +129,7 @@
                                 [
                                   {
                                     "name": "v",
+                                    "nativeSrc": "172:1:1",
                                     "nodeType": "YulIdentifier",
                                     "src": "172:1:1"
                                   }
@@ -123,6 +137,7 @@
                               }
                             ]
                           },
+                          "nativeSrc": "162:18:1",
                           "nodeType": "YulCase",
                           "src": "162:18:1",
                           "value": "default"
@@ -134,12 +149,15 @@
                         "functionName":
                         {
                           "name": "calldatasize",
+                          "nativeSrc": "105:12:1",
                           "nodeType": "YulIdentifier",
                           "src": "105:12:1"
                         },
+                        "nativeSrc": "105:14:1",
                         "nodeType": "YulFunctionCall",
                         "src": "105:14:1"
                       },
+                      "nativeSrc": "98:82:1",
                       "nodeType": "YulSwitch",
                       "src": "98:82:1"
                     }
diff --git a/test/libsolidity/ASTJSON/assembly/var_access.json b/test/libsolidity/ASTJSON/assembly/var_access.json
index c93667df2a..ae7845815f 100644
--- a/test/libsolidity/ASTJSON/assembly/var_access.json
+++ b/test/libsolidity/ASTJSON/assembly/var_access.json
@@ -81,16 +81,19 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "77:10:1",
                   "nodeType": "YulBlock",
                   "src": "77:10:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "79:6:1",
                       "nodeType": "YulAssignment",
                       "src": "79:6:1",
                       "value":
                       {
                         "kind": "number",
+                        "nativeSrc": "84:1:1",
                         "nodeType": "YulLiteral",
                         "src": "84:1:1",
                         "type": "",
@@ -100,6 +103,7 @@
                       [
                         {
                           "name": "x",
+                          "nativeSrc": "79:1:1",
                           "nodeType": "YulIdentifier",
                           "src": "79:1:1"
                         }
diff --git a/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json b/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
index b56324944f..ca3fcf92c9 100644
--- a/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
+++ b/test/libsolidity/ASTJSON/assembly/var_access_parseOnly.json
@@ -59,16 +59,19 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "77:10:1",
                   "nodeType": "YulBlock",
                   "src": "77:10:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "79:6:1",
                       "nodeType": "YulAssignment",
                       "src": "79:6:1",
                       "value":
                       {
                         "kind": "number",
+                        "nativeSrc": "84:1:1",
                         "nodeType": "YulLiteral",
                         "src": "84:1:1",
                         "type": "",
@@ -78,6 +81,7 @@
                       [
                         {
                           "name": "x",
+                          "nativeSrc": "79:1:1",
                           "nodeType": "YulIdentifier",
                           "src": "79:1:1"
                         }
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal.json b/test/libsolidity/ASTJSON/yul_hex_literal.json
index 0b3fa41741..0498289c67 100644
--- a/test/libsolidity/ASTJSON/yul_hex_literal.json
+++ b/test/libsolidity/ASTJSON/yul_hex_literal.json
@@ -39,17 +39,20 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "66:142:1",
                   "nodeType": "YulBlock",
                   "src": "66:142:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "80:15:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "80:15:1",
                       "value":
                       {
                         "hexValue": "74657374",
                         "kind": "string",
+                        "nativeSrc": "89:6:1",
                         "nodeType": "YulLiteral",
                         "src": "89:6:1",
                         "type": "",
@@ -59,6 +62,7 @@
                       [
                         {
                           "name": "a",
+                          "nativeSrc": "84:1:1",
                           "nodeType": "YulTypedName",
                           "src": "84:1:1",
                           "type": ""
@@ -66,12 +70,14 @@
                       ]
                     },
                     {
+                      "nativeSrc": "108:54:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "108:54:1",
                       "value":
                       {
                         "hexValue": "112233445566778899aabbccddeeff6677889900",
                         "kind": "string",
+                        "nativeSrc": "117:45:1",
                         "nodeType": "YulLiteral",
                         "src": "117:45:1",
                         "type": ""
@@ -80,6 +86,7 @@
                       [
                         {
                           "name": "b",
+                          "nativeSrc": "112:1:1",
                           "nodeType": "YulTypedName",
                           "src": "112:1:1",
                           "type": ""
@@ -87,12 +94,14 @@
                       ]
                     },
                     {
+                      "nativeSrc": "175:23:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "175:23:1",
                       "value":
                       {
                         "hexValue": "1234abcd",
                         "kind": "string",
+                        "nativeSrc": "184:14:1",
                         "nodeType": "YulLiteral",
                         "src": "184:14:1",
                         "type": ""
@@ -101,6 +110,7 @@
                       [
                         {
                           "name": "c",
+                          "nativeSrc": "179:1:1",
                           "nodeType": "YulTypedName",
                           "src": "179:1:1",
                           "type": ""
diff --git a/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json b/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
index 3551ac2d99..023c13cc74 100644
--- a/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
+++ b/test/libsolidity/ASTJSON/yul_hex_literal_parseOnly.json
@@ -26,17 +26,20 @@
               {
                 "AST":
                 {
+                  "nativeSrc": "66:142:1",
                   "nodeType": "YulBlock",
                   "src": "66:142:1",
                   "statements":
                   [
                     {
+                      "nativeSrc": "80:15:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "80:15:1",
                       "value":
                       {
                         "hexValue": "74657374",
                         "kind": "string",
+                        "nativeSrc": "89:6:1",
                         "nodeType": "YulLiteral",
                         "src": "89:6:1",
                         "type": "",
@@ -46,6 +49,7 @@
                       [
                         {
                           "name": "a",
+                          "nativeSrc": "84:1:1",
                           "nodeType": "YulTypedName",
                           "src": "84:1:1",
                           "type": ""
@@ -53,12 +57,14 @@
                       ]
                     },
                     {
+                      "nativeSrc": "108:54:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "108:54:1",
                       "value":
                       {
                         "hexValue": "112233445566778899aabbccddeeff6677889900",
                         "kind": "string",
+                        "nativeSrc": "117:45:1",
                         "nodeType": "YulLiteral",
                         "src": "117:45:1",
                         "type": ""
@@ -67,6 +73,7 @@
                       [
                         {
                           "name": "b",
+                          "nativeSrc": "112:1:1",
                           "nodeType": "YulTypedName",
                           "src": "112:1:1",
                           "type": ""
@@ -74,12 +81,14 @@
                       ]
                     },
                     {
+                      "nativeSrc": "175:23:1",
                       "nodeType": "YulVariableDeclaration",
                       "src": "175:23:1",
                       "value":
                       {
                         "hexValue": "1234abcd",
                         "kind": "string",
+                        "nativeSrc": "184:14:1",
                         "nodeType": "YulLiteral",
                         "src": "184:14:1",
                         "type": ""
@@ -88,6 +97,7 @@
                       [
                         {
                           "name": "c",
+                          "nativeSrc": "179:1:1",
                           "nodeType": "YulTypedName",
                           "src": "179:1:1",
                           "type": ""
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 2883f5c51f..1b5d8da49d 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -132,7 +132,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 				"dir1/file1.sol:L=0x1234567890123456789012345678901234567890,"
 				"dir2/file2.sol:L=0x1111122222333334444455555666667777788888",
 			"--ast-compact-json", "--asm", "--asm-json", "--opcodes", "--bin", "--bin-runtime", "--abi",
-			"--ir", "--ir-optimized", "--hashes", "--userdoc", "--devdoc", "--metadata", "--storage-layout",
+			"--ir", "--ir-ast-json", "--ir-optimized", "--ir-optimized-ast-json", "--hashes", "--userdoc", "--devdoc", "--metadata", "--storage-layout",
 			"--gas",
 			"--combined-json="
 				"abi,metadata,bin,bin-runtime,opcodes,asm,storage-layout,generated-sources,generated-sources-runtime,"
@@ -192,7 +192,8 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 		expectedOptions.compiler.outputs = {
 			true, true, true, true, true,
 			true, true, true, true, true,
-			true, true, true, true,
+			true, true, true, true, true,
+			true,
 		};
 		expectedOptions.compiler.estimateGas = true;
 		expectedOptions.compiler.combinedJsonRequests = {
@@ -290,6 +291,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 			"--asm",
 			"--bin",
 			"--ir-optimized",
+			"--ast-compact-json",
 		};
 		commandLine += assemblyOptions;
 		if (expectedLanguage == YulStack::Language::StrictAssembly)
@@ -329,6 +331,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		expectedOptions.compiler.outputs.asm_ = true;
 		expectedOptions.compiler.outputs.binary = true;
 		expectedOptions.compiler.outputs.irOptimized = true;
+		expectedOptions.compiler.outputs.astCompactJson = true;
 		if (expectedLanguage == YulStack::Language::StrictAssembly)
 		{
 			expectedOptions.optimizer.enabled = true;

From 5893e099fee735b8602cf8429d2a65164955407a Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 26 May 2023 11:08:34 +0200
Subject: [PATCH 1401/1748] Allow qualified access to events from other
 contracts

---
 Changelog.md                                  |  2 +-
 libsolidity/ast/AST.h                         |  2 +-
 .../semanticTests/events/event_selector.sol   | 29 +++++++++++++++----
 ...event_selector_access_foreign_contract.sol |  1 -
 .../event_selector_access_interface.sol       |  1 -
 .../events/event_selector_syntax.sol          | 15 ++++++++++
 6 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 159ec5187a..79c8a634f9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,7 @@
 ### 0.8.21 (unreleased)
 
 Language Features:
-
+ * Allow qualified access to events from other contracts.
 
 Compiler Features:
  * EWasm: Remove EWasm backend.
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 494cbeac21..9d754202da 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -1261,7 +1261,7 @@ class EventDefinition: public CallableDeclaration, public StructurallyDocumented
 	FunctionTypePointer functionType(bool /*_internal*/) const override;
 
 	bool isVisibleInDerivedContracts() const override { return true; }
-	bool isVisibleViaContractTypeAccess() const override { return false; /* TODO */ }
+	bool isVisibleViaContractTypeAccess() const override { return true; }
 
 	EventDefinitionAnnotation& annotation() const override;
 
diff --git a/test/libsolidity/semanticTests/events/event_selector.sol b/test/libsolidity/semanticTests/events/event_selector.sol
index 116e2329e6..b42ba49083 100644
--- a/test/libsolidity/semanticTests/events/event_selector.sol
+++ b/test/libsolidity/semanticTests/events/event_selector.sol
@@ -1,32 +1,49 @@
 library L {
     event E();
 }
+
 library S {
     event E(uint);
 }
+
 library T {
     event E();
 }
 
+interface I {
+    event E();
+}
+
+contract B {
+    event E();
+}
+
 contract D {
     event F();
 }
 
 contract C is D {
-    function test1() external pure returns (bytes32, bytes32) {
+    function test1() external pure returns (bytes32, bytes32, bytes32, bytes32) {
         assert(L.E.selector == T.E.selector);
+        assert(I.E.selector == L.E.selector);
+        assert(T.E.selector == I.E.selector);
+        assert(B.E.selector == T.E.selector);
 
         assert(L.E.selector != S.E.selector);
         assert(T.E.selector != S.E.selector);
+        assert(I.E.selector != S.E.selector);
+        assert(B.E.selector != S.E.selector);
 
-        return (L.E.selector, S.E.selector);
+        return (L.E.selector, S.E.selector, I.E.selector, B.E.selector);
     }
 
     bytes32 s1 = L.E.selector;
     bytes32 s2 = S.E.selector;
     bytes32 s3 = T.E.selector;
-    function test2() external returns (bytes32, bytes32, bytes32) {
-        return (s1, s2, s3);
+    bytes32 s4 = I.E.selector;
+    bytes32 s5 = B.E.selector;
+    function test2() external returns (bytes32, bytes32, bytes32, bytes32, bytes32) {
+        return (s1, s2, s3, s4, s5);
     }
 
     function test3() external returns (bytes32) {
@@ -36,6 +53,6 @@ contract C is D {
 // ====
 // compileViaYul: also
 // ----
-// test1() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0
-// test2() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
+// test1() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
+// test2() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x2ff0672f372fbe844b353429d4510ea5e43683af134c54f75f789ff57bc0c0, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
 // test3() -> 0x28811f5935c16a099486acb976b3a6b4942950a1425a74e9eb3e9b7f7135e12a
diff --git a/test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol b/test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol
index b878543fc0..ccc2b199cf 100644
--- a/test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol
+++ b/test/libsolidity/syntaxTests/events/event_selector_access_foreign_contract.sol
@@ -8,4 +8,3 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (110-113): Member "E" not found or not visible after argument-dependent lookup in type(contract D).
diff --git a/test/libsolidity/syntaxTests/events/event_selector_access_interface.sol b/test/libsolidity/syntaxTests/events/event_selector_access_interface.sol
index 2877fee565..2b4cd4e929 100644
--- a/test/libsolidity/syntaxTests/events/event_selector_access_interface.sol
+++ b/test/libsolidity/syntaxTests/events/event_selector_access_interface.sol
@@ -8,4 +8,3 @@ contract C {
     }
 }
 // ----
-// TypeError 9582: (111-114): Member "E" not found or not visible after argument-dependent lookup in type(contract I).
diff --git a/test/libsolidity/syntaxTests/events/event_selector_syntax.sol b/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
index ecbfe9bc51..fec21b55f5 100644
--- a/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
+++ b/test/libsolidity/syntaxTests/events/event_selector_syntax.sol
@@ -2,19 +2,34 @@ library L {
     event E(bytes32, bool, bytes indexed);
 }
 
+interface I {
+    event E(bytes32, bool, bytes indexed);
+}
+
+contract A {
+    event E(bytes32, bool, bytes indexed);
+}
+
 contract B {
     event E(bytes32, bool, bytes indexed);
 }
 
 contract C is B {
     bytes32 public librarySelector = L.E.selector;
+    bytes32 public interfaceSelector = I.E.selector;
+    bytes32 public foreignContractSelector = A.E.selector;
     bytes32 inheritedSelector = E.selector;
 
     function f() public {
         assert(librarySelector == L.E.selector);
+        assert(interfaceSelector == I.E.selector);
+        assert(foreignContractSelector == A.E.selector);
         assert(E.selector == B.E.selector);
 
         emit E(E.selector, true, "123");
+        emit I.E((B.E.selector), true, "123");
+        emit A.E((B.E.selector), true, "123");
         emit L.E((B.E.selector), true, "123");
     }
 }
+// ----

From b0419da65480b7fc3b35fac4d6b59826767786d5 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@gmail.com>
Date: Thu, 25 May 2023 11:56:47 +0200
Subject: [PATCH 1402/1748] [SMTChecker] Remember verification targets from
 trusted external calls

Previously, we did not remember trusted external calls for later phase
when we compute possible verification targets for each function.
This led to false negative in cases where verification target can be
violated, but not by calling a public function directly, but only when
it is called as an external function from other function.

The added test cases witnesses this behaviour. The underflow in
`dec` cannot happen in any other way except what the `dec` is called
from `f`.

The same problem did not occur when the functions are called internally,
because for such cases, we have already been remembering these calls in
the callgraph in the CHC engine.
---
 Changelog.md                                  |  2 +-
 libsolidity/formal/CHC.cpp                    |  6 +++++
 .../deployment/deploy_trusted_flow.sol        |  5 +---
 .../underflow_only_in_external_call.sol       | 23 +++++++++++++++++++
 4 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol

diff --git a/Changelog.md b/Changelog.md
index 159ec5187a..6746c24e42 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,7 +11,7 @@ Compiler Features:
 Bugfixes:
  * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
-
+ * SMTChecker: Fix false negative when a verification target can be violated only by trusted external call from another public function.
 
 AST Changes:
  * AST: Add the ``experimentalSolidity`` field to the ``SourceUnit`` nodes, which indicate whether the experimental parsing mode has been enabled via ``pragma experimental solidity``.
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index c6e737dbe6..1f7fc8bade 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1000,6 +1000,12 @@ void CHC::externalFunctionCallToTrustedCode(FunctionCall const& _funCall)
 	if (!function)
 		return;
 
+	// Remember the external call in the call graph to properly detect verification targets for the current function
+	if (m_currentFunction && !m_currentFunction->isConstructor())
+		m_callGraph[m_currentFunction].insert(function);
+	else
+		m_callGraph[m_currentContract].insert(function);
+
 	// External call creates a new transaction.
 	auto originalTx = state().tx();
 	Expression const* value = valueOption(callOptions);
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
index dcc81be643..eb0a0c0498 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
@@ -21,11 +21,8 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 4984: (47-50): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (167-185): CHC: Assertion violation might happen here.
 // Warning 6328: (215-233): CHC: Assertion violation might happen here.
-// Warning 6328: (267-285): CHC: Assertion violation might happen here.
 // Warning 6328: (304-322): CHC: Assertion violation happens here.
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (47-50): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Warning 4661: (167-185): BMC: Assertion violation happens here.
 // Warning 4661: (215-233): BMC: Assertion violation happens here.
-// Warning 4661: (267-285): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol b/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol
new file mode 100644
index 0000000000..a0c3a06b4d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol
@@ -0,0 +1,23 @@
+contract C {
+
+	uint v;
+	bool guard = true;
+
+	function dec() public returns (uint) {
+		if (guard) return 0;
+		--v;
+		return v;
+	}
+
+	function f() public returns (uint) {
+		guard = false;
+		uint ret = this.dec();
+		guard = true;
+		return ret;
+	}
+}
+// ====
+// SMTEngine: chc
+// SMTTargets: underflow
+// ----
+// Warning 3944: (109-112): CHC: Underflow (resulting value less than 0) happens here.

From 8ca453f82ec2a37f808129501fbe0edee30b2431 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@gmail.com>
Date: Fri, 26 May 2023 14:10:33 +0200
Subject: [PATCH 1403/1748] SMTChecker: External function call with struct
 member is not getter

if a struct has a member that is a function pointer with `external`
attribute, and such a member is called, it is currently incorrectly
treated as a public getter in SMTEncoder.

The proposed fix is to make SMTEncoder::publicGetter more strict in
deciding whether an expression is a public getter.
The added condition, that the access happens on a state variable, is
exactly what is checked later with an assertion that is currently
failing.
---
 libsolidity/formal/SMTEncoder.cpp             |  3 +-
 .../struct_external_function_pointer.sol      | 33 +++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/smtCheckerTests/types/struct/struct_external_function_pointer.sol

diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 8f22ab8249..818efac5cb 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -2839,7 +2839,8 @@ smtutil::Expression SMTEncoder::contractAddressValue(FunctionCall const& _f)
 
 VariableDeclaration const* SMTEncoder::publicGetter(Expression const& _expr) const {
 	if (auto memberAccess = dynamic_cast<MemberAccess const*>(&_expr))
-		return dynamic_cast<VariableDeclaration const*>(memberAccess->annotation().referencedDeclaration);
+		if (auto variableDeclaration = dynamic_cast<VariableDeclaration const*>(memberAccess->annotation().referencedDeclaration))
+			return variableDeclaration->isStateVariable() ? variableDeclaration : nullptr;
 	return nullptr;
 }
 
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_external_function_pointer.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_external_function_pointer.sol
new file mode 100644
index 0000000000..494d2dcf2b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_external_function_pointer.sol
@@ -0,0 +1,33 @@
+struct S {
+    function() external returns (uint) x;
+}
+contract C {
+
+    function X() public pure returns (uint) {
+        return 1;
+    }
+
+    uint y;
+    uint z;
+
+    function setZ(uint _z) public {
+        z = _z;
+    }
+
+
+    function f() public returns (uint) {
+        S memory s;
+        s.x = this.X;
+        require(y == 0);
+        require(z == 0);
+        uint ret = s.x();
+        assert(y == 0); // should hold
+        assert(z == 0); // can report violation due to overapproximation after externall call s.x()
+        return ret;
+    }
+}
+
+
+// ----
+// Warning 6328: (431-445): CHC: Assertion violation happens here.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 2260c23ce1895344ac3088a8a8f1bf4f9238961e Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Thu, 25 May 2023 15:22:35 -0300
Subject: [PATCH 1404/1748] Fix mistake about default value for inliner setting

---
 docs/internals/optimizer.rst | 2 +-
 docs/metadata.rst            | 4 ++--
 docs/using-the-compiler.rst  | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 7d168d2209..d3df1b6009 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -27,7 +27,7 @@ optimized Yul IR for a Solidity source. Similarly, one can use ``solc --strict-a
 for a stand-alone Yul mode.
 
 .. note::
-    The `peephole optimizer <https://en.wikipedia.org/wiki/Peephole_optimization>`_ and the inliner are always
+    The `peephole optimizer <https://en.wikipedia.org/wiki/Peephole_optimization>`_ is always
     enabled by default and can only be turned off via the :ref:`Standard JSON <compiler-api>`.
 
 You can find more details on both optimizer modules and their optimization steps below.
diff --git a/docs/metadata.rst b/docs/metadata.rst
index d71235653f..c87722bb26 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -153,8 +153,8 @@ explanatory purposes.
             "constantOptimizer": false,
             "cse": false,
             "deduplicate": false,
-            // inliner defaults to "true"
-            "inliner": true,
+            // inliner defaults to "false"
+            "inliner": false,
             // jumpdestRemover defaults to "true"
             "jumpdestRemover": true,
             "orderLiterals": false,
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 4c94923e06..d43c78e7c0 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -272,9 +272,9 @@ Input Description
             // The peephole optimizer is always on if no details are given,
             // use details to switch it off.
             "peephole": true,
-            // The inliner is always on if no details are given,
-            // use details to switch it off.
-            "inliner": true,
+            // The inliner is always off if no details are given,
+            // use details to switch it on.
+            "inliner": false,
             // The unused jumpdest remover is always on if no details are given,
             // use details to switch it off.
             "jumpdestRemover": true,
@@ -647,4 +647,4 @@ Error Types
 12. ``FatalError``: Fatal error not processed correctly - this should be reported as an issue.
 13. ``YulException``: Error during Yul code generation - this should be reported as an issue.
 14. ``Warning``: A warning, which didn't stop the compilation, but should be addressed if possible.
-15. ``Info``: Information that the compiler thinks the user might find useful, but is not dangerous and does not necessarily need to be addressed.
\ No newline at end of file
+15. ``Info``: Information that the compiler thinks the user might find useful, but is not dangerous and does not necessarily need to be addressed.

From cf106c44fef79631a2f4c6568310c6bae613fc35 Mon Sep 17 00:00:00 2001
From: David Bar-On <david.cdb004@gmail.com>
Date: Wed, 24 May 2023 10:23:53 +0300
Subject: [PATCH 1405/1748] Fix issue 14259 - help text about standard input
 usage

---
 solc/CommandLineParser.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 5140733890..da818411ec 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -522,8 +522,8 @@ are welcome to redistribute it under certain conditions. See 'solc --)" + g_strL
 for details.
 
 Usage: solc [options] [input_file...]
-Compiles the given Solidity input files (or the standard input if none given or
-"-" is used as a file name) and outputs the components specified in the options
+Compiles the given Solidity input files (or the standard input if "-" is
+used as a file name) and outputs the components specified in the options
 at standard output or in files in the output directory, if specified.
 Imports are automatically read from the filesystem, but it is also possible to
 remap paths using the context:prefix=path syntax.

From 3eedc635c44771a643a8e8e11fc77f7137129d1b Mon Sep 17 00:00:00 2001
From: Nuno Santos <nuno.santos@ethereum.org>
Date: Tue, 30 May 2023 20:49:25 +0100
Subject: [PATCH 1406/1748] Misspelling and terms inconsistencies (#14280)

* Installing solidity tweeks

* A few more misspells

* More inconsistencies fixed

* Removed contractions according to our guide.
---
 .github/ISSUE_TEMPLATE/bug_report.md     |  2 +-
 CODING_STYLE.md                          |  2 +-
 ReleaseChecklist.md                      |  2 +-
 docs/050-breaking-changes.rst            | 10 ++---
 docs/060-breaking-changes.rst            | 12 +++---
 docs/080-breaking-changes.rst            | 10 ++---
 docs/abi-spec.rst                        |  2 +-
 docs/assembly.rst                        |  4 +-
 docs/cheatsheet.rst                      |  4 +-
 docs/contracts/function-modifiers.rst    |  2 +-
 docs/contracts/functions.rst             |  2 +-
 docs/contracts/inheritance.rst           |  8 ++--
 docs/contributing.rst                    |  8 ++--
 docs/control-structures.rst              |  8 ++--
 docs/examples/micropayment.rst           |  2 +-
 docs/examples/modular.rst                |  2 +-
 docs/installing-solidity.rst             | 53 ++++++++++++------------
 docs/introduction-to-smart-contracts.rst |  4 +-
 docs/ir-breaking-changes.rst             |  4 +-
 docs/metadata.rst                        |  4 +-
 docs/path-resolution.rst                 | 14 +++----
 docs/resources.rst                       |  2 +-
 docs/smtchecker.rst                      |  6 +--
 docs/style-guide.rst                     |  4 +-
 docs/types/conversion.rst                |  2 +-
 docs/types/reference-types.rst           | 12 +++---
 docs/types/value-types.rst               |  2 +-
 docs/units-and-global-variables.rst      |  2 +-
 docs/using-the-compiler.rst              | 10 ++---
 docs/yul.rst                             |  8 ++--
 tools/yulPhaser/README.md                |  4 +-
 31 files changed, 105 insertions(+), 106 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 49acab231f..30c09039ef 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -36,7 +36,7 @@ assignees: ''
 
 <!--
 Please provide a *minimal* source code example to trigger the bug you have found.
-Please also mention any command line flags that are necessary for triggering the bug.
+Please also mention any command-line flags that are necessary for triggering the bug.
 Provide as much information as necessary to reproduce the bug.
 
 ```solidity
diff --git a/CODING_STYLE.md b/CODING_STYLE.md
index 87b6166d1b..cd46800da6 100644
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -117,7 +117,7 @@ Use `solAssert` and `solUnimplementedAssert` generously to check assumptions tha
 1. {Typename} + {qualifiers} + {name}.
 2. Only one per line.
 3. Associate */& with type, not variable (at ends with parser, but more readable, and safe if in conjunction with (b)).
-4. Favour declarations close to use; don't habitually declare at top of scope ala C.
+4. Favour declarations close to use; do not habitually declare at top of scope ala C.
 5. Pass non-trivial parameters as const reference, unless the data is to be copied into the function, then either pass by const reference or by value and use std::move.
 6. If a function returns multiple values, use std::tuple (std::pair acceptable) or better introduce a struct type. Do not use */& arguments.
 7. Use parameters of pointer type only if ``nullptr`` is a valid argument, use references otherwise. Often, ``std::optional`` is better suited than a raw pointer.
diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 179a20d4fb..8892566820 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -52,7 +52,7 @@ At least a day before the release:
  - [ ] Create a [release on GitHub](https://github.com/ethereum/solidity/releases/new).
        Set the target to the ``develop`` branch and the tag to the new version, e.g. ``v0.8.5``.
        Include the following warning: ``**The release is still in progress and the binaries may not yet be available from all sources.**``.
-       Don't publish it yet - click the ``Save draft`` button instead.
+       Do not publish it yet - click the ``Save draft`` button instead.
  - [ ] Thank voluntary contributors in the GitHub release notes.
        Use ``scripts/list_contributors.sh v<previous version>`` to get initial list of names.
        Remove different variants of the same name manually before using the output.
diff --git a/docs/050-breaking-changes.rst b/docs/050-breaking-changes.rst
index 3f41ac860a..a40bbcf6e9 100644
--- a/docs/050-breaking-changes.rst
+++ b/docs/050-breaking-changes.rst
@@ -137,7 +137,7 @@ For most of the topics the compiler will provide suggestions.
   ``payable`` or create a new internal function for the program logic that
   uses ``msg.value``.
 
-* For clarity reasons, the command line interface now requires ``-`` if the
+* For clarity reasons, the command-line interface now requires ``-`` if the
   standard input is used as source.
 
 Deprecated Elements
@@ -147,18 +147,18 @@ This section lists changes that deprecate prior features or syntax.  Note that
 many of these changes were already enabled in the experimental mode
 ``v0.5.0``.
 
-Command Line and JSON Interfaces
+Command-line and JSON Interfaces
 --------------------------------
 
-* The command line option ``--formal`` (used to generate Why3 output for
+* The command-line option ``--formal`` (used to generate Why3 output for
   further formal verification) was deprecated and is now removed.  A new
   formal verification module, the SMTChecker, is enabled via ``pragma
   experimental SMTChecker;``.
 
-* The command line option ``--julia`` was renamed to ``--yul`` due to the
+* The command-line option ``--julia`` was renamed to ``--yul`` due to the
   renaming of the intermediate language ``Julia`` to ``Yul``.
 
-* The ``--clone-bin`` and ``--combined-json clone-bin`` command line options
+* The ``--clone-bin`` and ``--combined-json clone-bin`` command-line options
   were removed.
 
 * Remappings with empty prefix are disallowed.
diff --git a/docs/060-breaking-changes.rst b/docs/060-breaking-changes.rst
index 4f5571d54a..25bc15b875 100644
--- a/docs/060-breaking-changes.rst
+++ b/docs/060-breaking-changes.rst
@@ -12,7 +12,7 @@ For the full list check
 Changes the Compiler Might not Warn About
 =========================================
 
-This section lists changes where the behaviour of your code might
+This section lists changes where the behavior of your code might
 change without the compiler telling you about it.
 
 * The resulting type of an exponentiation is the type of the base. It used to be the smallest type
@@ -105,13 +105,13 @@ Interface Changes
 =================
 
 This section lists changes that are unrelated to the language itself, but that have an effect on the interfaces of
-the compiler. These may change the way how you use the compiler on the command line, how you use its programmable
+the compiler. These may change the way how you use the compiler on the command-line, how you use its programmable
 interface, or how you analyze the output produced by it.
 
 New Error Reporter
 ~~~~~~~~~~~~~~~~~~
 
-A new error reporter was introduced, which aims at producing more accessible error messages on the command line.
+A new error reporter was introduced, which aims at producing more accessible error messages on the command-line.
 It is enabled by default, but passing ``--old-reporter`` falls back to the the deprecated old error reporter.
 
 Metadata Hash Options
@@ -119,9 +119,9 @@ Metadata Hash Options
 
 The compiler now appends the `IPFS <https://ipfs.io/>`_ hash of the metadata file to the end of the bytecode by default
 (for details, see documentation on :doc:`contract metadata <metadata>`). Before 0.6.0, the compiler appended the
-`Swarm <https://ethersphere.github.io/swarm-home/>`_ hash by default, and in order to still support this behaviour,
-the new command line option ``--metadata-hash`` was introduced. It allows you to select the hash to be produced and
-appended, by passing either ``ipfs`` or ``swarm`` as value to the ``--metadata-hash`` command line option.
+`Swarm <https://ethersphere.github.io/swarm-home/>`_ hash by default, and in order to still support this behavior,
+the new command-line option ``--metadata-hash`` was introduced. It allows you to select the hash to be produced and
+appended, by passing either ``ipfs`` or ``swarm`` as value to the ``--metadata-hash`` command-line option.
 Passing the value ``none`` completely removes the hash.
 
 These changes can also be used via the :ref:`Standard JSON Interface<compiler-api>` and effect the metadata JSON generated by the compiler.
diff --git a/docs/080-breaking-changes.rst b/docs/080-breaking-changes.rst
index bb558359e6..524d12ac3b 100644
--- a/docs/080-breaking-changes.rst
+++ b/docs/080-breaking-changes.rst
@@ -10,18 +10,18 @@ For the full list check
 Silent Changes of the Semantics
 ===============================
 
-This section lists changes where existing code changes its behaviour without
+This section lists changes where existing code changes its behavior without
 the compiler notifying you about it.
 
 * Arithmetic operations revert on underflow and overflow. You can use ``unchecked { ... }`` to use
-  the previous wrapping behaviour.
+  the previous wrapping behavior.
 
   Checks for overflow are very common, so we made them the default to increase readability of code,
   even if it comes at a slight increase of gas costs.
 
 * ABI coder v2 is activated by default.
 
-  You can choose to use the old behaviour using ``pragma abicoder v1;``.
+  You can choose to use the old behavior using ``pragma abicoder v1;``.
   The pragma ``pragma experimental ABIEncoderV2;`` is still valid, but it is deprecated and has no effect.
   If you want to be explicit, please use ``pragma abicoder v2;`` instead.
 
@@ -57,7 +57,7 @@ New Restrictions
 
 This section lists changes that might cause existing contracts to not compile anymore.
 
-* There are new restrictions related to explicit conversions of literals. The previous behaviour in
+* There are new restrictions related to explicit conversions of literals. The previous behavior in
   the following cases was likely ambiguous:
 
   1. Explicit conversions from negative literals and literals larger than ``type(uint160).max`` to
@@ -106,7 +106,7 @@ This section lists changes that might cause existing contracts to not compile an
 
 * The global functions ``log0``, ``log1``, ``log2``, ``log3`` and ``log4`` have been removed.
 
-  These are low-level functions that were largely unused. Their behaviour can be accessed from inline assembly.
+  These are low-level functions that were largely unused. Their behavior can be accessed from inline assembly.
 
 * ``enum`` definitions cannot contain more than 256 members.
 
diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index dd798c0a3e..41967dd46d 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -563,7 +563,7 @@ A function description is a JSON object with the fields:
   blockchain state <pure-functions>`), ``view`` (:ref:`specified to not modify the blockchain
   state <view-functions>`), ``nonpayable`` (function does not accept Ether - the default) and ``payable`` (function accepts Ether).
 
-Constructor, receive, and fallback never have ``name`` or ``outputs``. Receive and fallback don't have ``inputs`` either.
+Constructor, receive, and fallback never have ``name`` or ``outputs``. Receive and fallback do not have ``inputs`` either.
 
 .. note::
     Sending non-zero Ether to non-payable function will revert the transaction.
diff --git a/docs/assembly.rst b/docs/assembly.rst
index b527ffbafd..e08ff9f627 100644
--- a/docs/assembly.rst
+++ b/docs/assembly.rst
@@ -362,7 +362,7 @@ in memory is automatically considered memory-safe and does not need to be annota
 .. warning::
     It is your responsibility to make sure that the assembly actually satisfies the memory model. If you annotate
     an assembly block as memory-safe, but violate one of the memory assumptions, this **will** lead to incorrect and
-    undefined behaviour that cannot easily be discovered by testing.
+    undefined behavior that cannot easily be discovered by testing.
 
 In case you are developing a library that is meant to be compatible across multiple versions
 of Solidity, you can use a special comment to annotate an assembly block as memory-safe:
@@ -375,4 +375,4 @@ of Solidity, you can use a special comment to annotate an assembly block as memo
     }
 
 Note that we will disallow the annotation via comment in a future breaking release; so, if you are not concerned with
-backwards-compatibility with older compiler versions, prefer using the dialect string.
+backward-compatibility with older compiler versions, prefer using the dialect string.
diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index 08494ecc67..34ad46df6a 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -154,7 +154,7 @@ Modifiers
 - ``anonymous`` for events: Does not store event signature as topic.
 - ``indexed`` for event parameters: Stores the parameter as topic.
 - ``virtual`` for functions and modifiers: Allows the function's or modifier's
-  behaviour to be changed in derived contracts.
+  behavior to be changed in derived contracts.
 - ``override``: States that this function, modifier or public state variable changes
-  the behaviour of a function or modifier in a base contract.
+  the behavior of a function or modifier in a base contract.
 
diff --git a/docs/contracts/function-modifiers.rst b/docs/contracts/function-modifiers.rst
index b6b83bf3cc..0d597c0b65 100644
--- a/docs/contracts/function-modifiers.rst
+++ b/docs/contracts/function-modifiers.rst
@@ -6,7 +6,7 @@
 Function Modifiers
 ******************
 
-Modifiers can be used to change the behaviour of functions in a declarative way.
+Modifiers can be used to change the behavior of functions in a declarative way.
 For example,
 you can use a modifier to automatically check a condition prior to executing the function.
 
diff --git a/docs/contracts/functions.rst b/docs/contracts/functions.rst
index ba903dce14..5b82a93bcc 100644
--- a/docs/contracts/functions.rst
+++ b/docs/contracts/functions.rst
@@ -250,7 +250,7 @@ Reverting a state change is not considered a "state modification", as only chang
 state made previously in code that did not have the ``view`` or ``pure`` restriction
 are reverted and that code has the option to catch the ``revert`` and not pass it on.
 
-This behaviour is also in line with the ``STATICCALL`` opcode.
+This behavior is also in line with the ``STATICCALL`` opcode.
 
 .. warning::
   It is not possible to prevent functions from reading the state at the level
diff --git a/docs/contracts/inheritance.rst b/docs/contracts/inheritance.rst
index 11a2079293..7756ce93d2 100644
--- a/docs/contracts/inheritance.rst
+++ b/docs/contracts/inheritance.rst
@@ -54,7 +54,7 @@ Details are given in the following example.
     // accessed externally via `this`, though.
     contract Destructible is Owned {
         // The keyword `virtual` means that the function can change
-        // its behaviour in derived classes ("overriding").
+        // its behavior in derived classes ("overriding").
         function destroy() virtual public {
             if (msg.sender == owner) selfdestruct(owner);
         }
@@ -115,7 +115,7 @@ Details are given in the following example.
 
         // Here, we only specify `override` and not `virtual`.
         // This means that contracts deriving from `PriceFeed`
-        // cannot change the behaviour of `destroy` anymore.
+        // cannot change the behavior of `destroy` anymore.
         function destroy() public override(Destructible, Named) { Named.destroy(); }
         function get() public view returns(uint r) { return info; }
 
@@ -293,7 +293,7 @@ and ends at a contract mentioning a function with that signature
 that does not override.
 
 If you do not mark a function that overrides as ``virtual``, derived
-contracts can no longer change the behaviour of that function.
+contracts can no longer change the behavior of that function.
 
 .. note::
 
@@ -487,7 +487,7 @@ One way is directly in the inheritance list (``is Base(7)``).  The other is in
 the way a modifier is invoked as part of
 the derived constructor (``Base(y * y)``). The first way to
 do it is more convenient if the constructor argument is a
-constant and defines the behaviour of the contract or
+constant and defines the behavior of the contract or
 describes it. The second way has to be used if the
 constructor arguments of the base depend on those of the
 derived contract. Arguments have to be given either in the
diff --git a/docs/contributing.rst b/docs/contributing.rst
index 52a99ec4f5..00e0decb60 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -45,7 +45,7 @@ reporting issues, please mention the following details:
 * Source code (if applicable).
 * Operating system.
 * Steps to reproduce the issue.
-* Actual vs. expected behaviour.
+* Actual vs. expected behavior.
 
 Reducing the source code that caused the issue to a bare minimum is always
 very helpful, and sometimes even clarifies a misunderstanding.
@@ -114,7 +114,7 @@ Running ``build/test/soltest`` or its wrapper ``scripts/soltest.sh`` is sufficie
 
 The ``./scripts/tests.sh`` script executes most Solidity tests automatically,
 including those bundled into the `Boost C++ Test Framework <https://www.boost.org/doc/libs/release/libs/test/doc/html/index.html>`_
-application ``soltest`` (or its wrapper ``scripts/soltest.sh``), as well as command line tests and
+application ``soltest`` (or its wrapper ``scripts/soltest.sh``), as well as command-line tests and
 compilation tests.
 
 The test system automatically tries to discover the location of
@@ -239,7 +239,7 @@ provides a way to edit, update or skip the current contract file, or quit the ap
 
 It offers several options for failing tests:
 
-- ``edit``: ``isoltest`` tries to open the contract in an editor so you can adjust it. It either uses the editor given on the command line (as ``isoltest --editor /path/to/editor``), in the environment variable ``EDITOR`` or just ``/usr/bin/editor`` (in that order).
+- ``edit``: ``isoltest`` tries to open the contract in an editor so you can adjust it. It either uses the editor given on the command-line (as ``isoltest --editor /path/to/editor``), in the environment variable ``EDITOR`` or just ``/usr/bin/editor`` (in that order).
 - ``update``: Updates the expectations for contract under test. This updates the annotations by removing unmet expectations and adding missing expectations. The test is then run again.
 - ``skip``: Skips the execution of this particular test.
 - ``quit``: Quits ``isoltest``.
@@ -350,7 +350,7 @@ The AFL documentation states that the corpus (the initial input files) should no
 too large. The files themselves should not be larger than 1 kB and there should be
 at most one input file per functionality, so better start with a small number of.
 There is also a tool called ``afl-cmin`` that can trim input files
-that result in similar behaviour of the binary.
+that result in similar behavior of the binary.
 
 Now run the fuzzer (the ``-m`` extends the size of memory to 60 MB):
 
diff --git a/docs/control-structures.rst b/docs/control-structures.rst
index f7a33db7ef..ea8a9c569d 100644
--- a/docs/control-structures.rst
+++ b/docs/control-structures.rst
@@ -365,13 +365,13 @@ i.e. the following is not valid: ``(x, uint y) = (1, 2);``
 .. warning::
     Be careful when assigning to multiple variables at the same time when
     reference types are involved, because it could lead to unexpected
-    copying behaviour.
+    copying behavior.
 
 Complications for Arrays and Structs
 ------------------------------------
 
 The semantics of assignments are more complicated for non-value types like arrays and structs,
-including ``bytes`` and ``string``, see :ref:`Data location and assignment behaviour <data-location-assignment>` for details.
+including ``bytes`` and ``string``, see :ref:`Data location and assignment behavior <data-location-assignment>` for details.
 
 In the example below the call to ``g(x)`` has no effect on ``x`` because it creates
 an independent copy of the storage value in memory. However, ``h(x)`` successfully modifies ``x``
@@ -510,7 +510,7 @@ additional checks.
 Since Solidity 0.8.0, all arithmetic operations revert on over- and underflow by default,
 thus making the use of these libraries unnecessary.
 
-To obtain the previous behaviour, an ``unchecked`` block can be used:
+To obtain the previous behavior, an ``unchecked`` block can be used:
 
 .. code-block:: solidity
 
@@ -719,7 +719,7 @@ The ``revert`` statement takes a custom error as direct argument without parenth
 
     revert CustomError(arg1, arg2);
 
-For backwards-compatibility reasons, there is also the ``revert()`` function, which uses parentheses
+For backward-compatibility reasons, there is also the ``revert()`` function, which uses parentheses
 and accepts a string:
 
     revert();
diff --git a/docs/examples/micropayment.rst b/docs/examples/micropayment.rst
index 6ce049457b..50f28005bf 100644
--- a/docs/examples/micropayment.rst
+++ b/docs/examples/micropayment.rst
@@ -86,7 +86,7 @@ Packing arguments
 Now that we have identified what information to include in the signed message,
 we are ready to put the message together, hash it, and sign it. For simplicity,
 we concatenate the data. The `ethereumjs-abi <https://github.com/ethereumjs/ethereumjs-abi>`_
-library provides a function called ``soliditySHA3`` that mimics the behaviour of
+library provides a function called ``soliditySHA3`` that mimics the behavior of
 Solidity's ``keccak256`` function applied to arguments encoded using ``abi.encodePacked``.
 Here is a JavaScript function that creates the proper signature for the ``ReceiverPays`` example:
 
diff --git a/docs/examples/modular.rst b/docs/examples/modular.rst
index f96b296df7..9ae2849cb4 100644
--- a/docs/examples/modular.rst
+++ b/docs/examples/modular.rst
@@ -7,7 +7,7 @@ Modular Contracts
 A modular approach to building your contracts helps you reduce the complexity
 and improve the readability which will help to identify bugs and vulnerabilities
 during development and code review.
-If you specify and control the behaviour of each module in isolation, the
+If you specify and control the behavior of each module in isolation, the
 interactions you have to consider are only those between the module specifications
 and not every other moving part of the contract.
 In the example below, the contract uses the ``move`` method
diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 4aae53de43..bd954ece05 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -10,12 +10,12 @@ Versioning
 ==========
 
 Solidity versions follow `Semantic Versioning <https://semver.org>`_. In
-addition, patch level releases with major release 0 (i.e. 0.x.y) will not
+addition, patch-level releases with major release 0 (i.e. 0.x.y) will not
 contain breaking changes. That means code that compiles with version 0.x.y
 can be expected to compile with 0.x.z where z > y.
 
-In addition to releases, we provide **nightly development builds** with the
-intention of making it easy for developers to try out upcoming features and
+In addition to releases, we provide **nightly development builds** to make
+it easy for developers to try out upcoming features and
 provide early feedback. Note, however, that while the nightly builds are usually
 very stable, they contain bleeding-edge code from the development branch and are
 not guaranteed to be always working. Despite our best efforts, they might
@@ -33,12 +33,12 @@ Remix
 
 `Access Remix online <https://remix.ethereum.org/>`_, you do not need to install anything.
 If you want to use it without connection to the Internet, go to
-https://github.com/ethereum/remix-live/tree/gh-pages and download the ``.zip`` file as
-explained on that page. Remix is also a convenient option for testing nightly builds
+https://github.com/ethereum/remix-live/tree/gh-pages#readme and follow the instructions on that page.
+Remix is also a convenient option for testing nightly builds
 without installing multiple Solidity versions.
 
-Further options on this page detail installing commandline Solidity compiler software
-on your computer. Choose a commandline compiler if you are working on a larger contract
+Further options on this page detail installing command-line Solidity compiler software
+on your computer. Choose a command-line compiler if you are working on a larger contract
 or if you require more compilation options.
 
 .. _solcjs:
@@ -54,7 +54,7 @@ the full-featured compiler, ``solc``. The usage of ``solcjs`` is documented insi
 `repository <https://github.com/ethereum/solc-js>`_.
 
 Note: The solc-js project is derived from the C++
-`solc` by using Emscripten which means that both use the same compiler source code.
+`solc` by using Emscripten, which means that both use the same compiler source code.
 `solc-js` can be used in JavaScript projects directly (such as Remix).
 Please refer to the solc-js repository for instructions.
 
@@ -64,18 +64,18 @@ Please refer to the solc-js repository for instructions.
 
 .. note::
 
-    The commandline executable is named ``solcjs``.
+    The command-line executable is named ``solcjs``.
 
-    The commandline options of ``solcjs`` are not compatible with ``solc`` and tools (such as ``geth``)
-    expecting the behaviour of ``solc`` will not work with ``solcjs``.
+    The command-line options of ``solcjs`` are not compatible with ``solc`` and tools (such as ``geth``)
+    expecting the behavior of ``solc`` will not work with ``solcjs``.
 
 Docker
 ======
 
-Docker images of Solidity builds are available using the ``solc`` image from the ``ethereum`` organisation.
+Docker images of Solidity builds are available using the ``solc`` image from the ``ethereum`` organization.
 Use the ``stable`` tag for the latest released version, and ``nightly`` for potentially unstable changes in the develop branch.
 
-The Docker image runs the compiler executable, so you can pass all compiler arguments to it.
+The Docker image runs the compiler executable so that you can pass all compiler arguments to it.
 For example, the command below pulls the stable version of the ``solc`` image (if you do not have it already),
 and runs it in a new container, passing the ``--help`` argument.
 
@@ -83,13 +83,13 @@ and runs it in a new container, passing the ``--help`` argument.
 
     docker run ethereum/solc:stable --help
 
-You can also specify release build versions in the tag, for example, for the 0.5.4 release.
+For example, You can specify release build versions in the tag for the 0.5.4 release.
 
 .. code-block:: bash
 
     docker run ethereum/solc:0.5.4 --help
 
-To use the Docker image to compile Solidity files on the host machine mount a
+To use the Docker image to compile Solidity files on the host machine, mount a
 local folder for input and output, and specify the contract to compile. For example.
 
 .. code-block:: bash
@@ -97,7 +97,7 @@ local folder for input and output, and specify the contract to compile. For exam
     docker run -v /local/path:/sources ethereum/solc:stable -o /sources/output --abi --bin /sources/Contract.sol
 
 You can also use the standard JSON interface (which is recommended when using the compiler with tooling).
-When using this interface it is not necessary to mount any directories as long as the JSON input is
+When using this interface, it is not necessary to mount any directories as long as the JSON input is
 self-contained (i.e. it does not refer to any external files that would have to be
 :ref:`loaded by the import callback <initial-vfs-content-standard-json-with-import-callback>`).
 
@@ -130,7 +130,7 @@ The nightly version can be installed using these commands:
     sudo apt-get install solc
 
 Furthermore, some Linux distributions provide their own packages. These packages are not directly
-maintained by us, but usually kept up-to-date by the respective package maintainers.
+maintained by us but usually kept up-to-date by the respective package maintainers.
 
 For example, Arch Linux has packages for the latest development version:
 
@@ -212,12 +212,12 @@ out-of-the-box but it is also meant to be friendly to third-party tools:
   HTTPS without any authentication, rate limiting or the need to use git.
 - Content is served with correct `Content-Type` headers and lenient CORS configuration so that it
   can be directly loaded by tools running in the browser.
-- Binaries do not require installation or unpacking (with the exception of older Windows builds
+- Binaries do not require installation or unpacking (exception for older Windows builds
   bundled with necessary DLLs).
-- We strive for a high level of backwards-compatibility. Files, once added, are not removed or moved
+- We strive for a high level of backward-compatibility. Files, once added, are not removed or moved
   without providing a symlink/redirect at the old location. They are also never modified
   in place and should always match the original checksum. The only exception would be broken or
-  unusable files with a potential to cause more harm than good if left as is.
+  unusable files with the potential to cause more harm than good if left as is.
 - Files are served over both HTTP and HTTPS. As long as you obtain the file list in a secure way
   (via git, HTTPS, IPFS or just have it cached locally) and verify hashes of the binaries
   after downloading them, you do not have to use HTTPS for the binaries themselves.
@@ -228,7 +228,7 @@ that we do not rename them if the naming convention changes and we do not add bu
 that were not supported at the time of release. This only happens in ``solc-bin``.
 
 The ``solc-bin`` repository contains several top-level directories, each representing a single platform.
-Each one contains a ``list.json`` file listing the available binaries. For example in
+Each one includes a ``list.json`` file listing the available binaries. For example in
 ``emscripten-wasm32/list.json`` you will find the following information about version 0.7.4:
 
 .. code-block:: json
@@ -259,7 +259,7 @@ This means that:
 - The file might in future be available on Swarm at `16c5f09109c793db99fe35f037c6092b061bd39260ee7a677c8a97f18c955ab1`_.
 - You can verify the integrity of the binary by comparing its keccak256 hash to
   ``0x300330ecd127756b824aa13e843cb1f43c473cb22eaf3750d5fb9c99279af8c3``.  The hash can be computed
-  on the command line using ``keccak256sum`` utility provided by `sha3sum`_ or `keccak256() function
+  on the command-line using ``keccak256sum`` utility provided by `sha3sum`_ or `keccak256() function
   from ethereumjs-util`_ in JavaScript.
 - You can also verify the integrity of the binary by comparing its sha256 hash to
   ``0x2b55ed5fec4d9625b6c7b3ab1abd2b7fb7dd2a9c68543bf0323db2c7e2d55af2``.
@@ -310,7 +310,6 @@ This means that:
 
 Building from Source
 ====================
-
 Prerequisites - All Operating Systems
 -------------------------------------
 
@@ -341,7 +340,7 @@ The following are dependencies for all builds of Solidity:
 .. note::
     Solidity versions prior to 0.5.10 can fail to correctly link against Boost versions 1.70+.
     A possible workaround is to temporarily rename ``<Boost install path>/lib/cmake/Boost-1.70.0``
-    prior to running the cmake command to configure solidity.
+    prior to running the cmake command to configure Solidity.
 
     Starting from 0.5.10 linking against Boost 1.70+ should work without manual intervention.
 
@@ -449,7 +448,7 @@ To clone the source code, execute the following command:
     git clone --recursive https://github.com/ethereum/solidity.git
     cd solidity
 
-If you want to help developing Solidity,
+If you want to help develop Solidity,
 you should fork Solidity and add your personal fork as a second remote:
 
 .. code-block:: bash
@@ -457,7 +456,7 @@ you should fork Solidity and add your personal fork as a second remote:
     git remote add personal git@github.com:[username]/solidity.git
 
 .. note::
-    This method will result in a prerelease build leading to e.g. a flag
+    This method will result in a pre-release build leading to e.g. a flag
     being set in each bytecode produced by such a compiler.
     If you want to re-build a released Solidity compiler, then
     please use the source tarball on the github release page:
@@ -580,4 +579,4 @@ Example:
 4. A breaking change is introduced --> version is bumped to 0.5.0.
 5. The 0.5.0 release is made.
 
-This behaviour works well with the  :ref:`version pragma <version_pragma>`.
+This behavior works well with the  :ref:`version pragma <version_pragma>`.
diff --git a/docs/introduction-to-smart-contracts.rst b/docs/introduction-to-smart-contracts.rst
index 5595a2fed8..c4cc1201b0 100644
--- a/docs/introduction-to-smart-contracts.rst
+++ b/docs/introduction-to-smart-contracts.rst
@@ -564,7 +564,7 @@ contracts, the Ether is forever lost.
 
 .. warning::
     From version 0.8.18 and up, the use of ``selfdestruct`` in both Solidity and Yul will trigger a
-    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behaviour
+    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behavior
     as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
 
 .. warning::
@@ -591,7 +591,7 @@ Precompiled Contracts
 There is a small set of contract addresses that are special:
 The address range between ``1`` and (including) ``8`` contains
 "precompiled contracts" that can be called as any other contract
-but their behaviour (and their gas consumption) is not defined
+but their behavior (and their gas consumption) is not defined
 by EVM code stored at that address (they do not contain code)
 but instead is implemented in the EVM execution environment itself.
 
diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index 9cee467932..38e6b552f3 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -15,13 +15,13 @@ The IR-based code generator was introduced with an aim to not only allow
 code generation to be more transparent and auditable but also
 to enable more powerful optimization passes that span across functions.
 
-You can enable it on the command line using ``--via-ir``
+You can enable it on the command-line using ``--via-ir``
 or with the option ``{"viaIR": true}`` in standard-json and we
 encourage everyone to try it out!
 
 For several reasons, there are tiny semantic differences between the old
 and the IR-based code generator, mostly in areas where we would not
-expect people to rely on this behaviour anyway.
+expect people to rely on this behavior anyway.
 This section highlights the main differences between the old and the IR-based codegen.
 
 Semantic Only Changes
diff --git a/docs/metadata.rst b/docs/metadata.rst
index c87722bb26..ede16a73fd 100644
--- a/docs/metadata.rst
+++ b/docs/metadata.rst
@@ -147,7 +147,7 @@ explanatory purposes.
           "useLiteralContent": true
         },
         // Optional: Optimizer settings. The fields "enabled" and "runs" are deprecated
-        // and are only given for backwards-compatibility.
+        // and are only given for backward-compatibility.
         "optimizer": {
           "details": {
             "constantOptimizer": false,
@@ -241,7 +241,7 @@ relevant part of the bytecode can be decoded with a CBOR decoder.
 Check the `Metadata Playground <https://playground.sourcify.dev/>`_ to see it in action.
 
 Whereas release builds of solc use a 3 byte encoding of the version as shown
-above (one byte each for major, minor and patch version number), prerelease builds
+above (one byte each for major, minor and patch version number), pre-release builds
 will instead use a complete version string including commit hash and build date.
 
 The commandline flag ``--no-cbor-metadata`` can be used to skip metadata
diff --git a/docs/path-resolution.rst b/docs/path-resolution.rst
index f63f5e79d0..00831e609a 100644
--- a/docs/path-resolution.rst
+++ b/docs/path-resolution.rst
@@ -139,7 +139,7 @@ The initial content of the VFS depends on how you invoke the compiler:
 
 #. **Standard input**
 
-   On the command line it is also possible to provide the source by sending it to compiler's
+   On the command-line it is also possible to provide the source by sending it to compiler's
    standard input:
 
    .. code-block:: bash
@@ -345,13 +345,13 @@ of the compiler.
 CLI Path Normalization and Stripping
 ------------------------------------
 
-On the command line the compiler behaves just as you would expect from any other program:
+On the command-line the compiler behaves just as you would expect from any other program:
 it accepts paths in a format native to the platform and relative paths are relative to the current
 working directory.
-The source unit names assigned to files whose paths are specified on the command line, however,
+The source unit names assigned to files whose paths are specified on the command-line, however,
 should not change just because the project is being compiled on a different platform or because the
 compiler happens to have been invoked from a different directory.
-To achieve this, paths to source files coming from the command line must be converted to a canonical
+To achieve this, paths to source files coming from the command-line must be converted to a canonical
 form, and, if possible, made relative to the base path or one of the include paths.
 
 The normalization rules are as follows:
@@ -408,7 +408,7 @@ The resulting file path becomes the source unit name.
     Prior to version 0.8.8, CLI path stripping was not performed and the only normalization applied
     was the conversion of path separators.
     When working with older versions of the compiler it is recommended to invoke the compiler from
-    the base path and to only use relative paths on the command line.
+    the base path and to only use relative paths on the command-line.
 
 .. index:: ! allowed paths, ! --allow-paths, remapping; target
 .. _allowed-paths:
@@ -421,7 +421,7 @@ locations that are considered safe by default:
 
 - Outside of Standard JSON mode:
 
-  - The directories containing input files listed on the command line.
+  - The directories containing input files listed on the command-line.
   - The directories used as :ref:`remapping <import-remapping>` targets.
     If the target is not a directory (i.e does not end with ``/``, ``/.`` or ``/..``) the directory
     containing the target is used instead.
@@ -551,7 +551,7 @@ you checked out to ``/project/dapp-bin_old``, then you can run:
 This means that all imports in ``module2`` point to the old version but imports in ``module1``
 point to the new version.
 
-Here are the detailed rules governing the behaviour of remappings:
+Here are the detailed rules governing the behavior of remappings:
 
 #. **Remappings only affect the translation between import paths and source unit names.**
 
diff --git a/docs/resources.rst b/docs/resources.rst
index df0e450197..f51dba4bd9 100644
--- a/docs/resources.rst
+++ b/docs/resources.rst
@@ -23,7 +23,7 @@ Integrated (Ethereum) Development Environments
         Python-based development and testing framework for smart contracts targeting the Ethereum Virtual Machine.
 
     * `Dapp <https://dapp.tools/>`_
-        Tool for building, testing and deploying smart contracts from the command line.
+        Tool for building, testing and deploying smart contracts from the command-line.
 
     * `Embark <https://framework.embarklabs.io/>`_
         Developer platform for building and deploying decentralized applications.
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index 9c862e5309..b68d58ed33 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -97,7 +97,7 @@ Overflow
 
 The contract above shows an overflow check example.
 The SMTChecker does not check underflow and overflow by default for Solidity >=0.8.7,
-so we need to use the command line option ``--model-checker-targets "underflow,overflow"``
+so we need to use the command-line option ``--model-checker-targets "underflow,overflow"``
 or the JSON option ``settings.modelChecker.targets = ["underflow", "overflow"]``.
 See :ref:`this section for targets configuration<smtchecker_targets>`.
 Here, it reports the following:
@@ -412,7 +412,7 @@ is already "locked", so it would not be possible to change the value of ``x``,
 regardless of what the unknown called code does.
 
 If we "forget" to use the ``mutex`` modifier on function ``set``, the
-SMTChecker is able to synthesize the behaviour of the externally called code so
+SMTChecker is able to synthesize the behavior of the externally called code so
 that the assertion fails:
 
 .. code-block:: text
@@ -750,7 +750,7 @@ and modulo operations inside Horn rules. Because of that, by default the
 Solidity division and modulo operations are encoded using the constraint
 ``a = b * d + m`` where ``d = a / b`` and ``m = a % b``.
 However, other solvers, such as Eldarica, prefer the syntactically precise operations.
-The command line flag ``--model-checker-div-mod-no-slacks`` and the JSON option
+The command-line flag ``--model-checker-div-mod-no-slacks`` and the JSON option
 ``settings.modelChecker.divModNoSlacks`` can be used to toggle the encoding
 depending on the used solver preferences.
 
diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 6173aecc6e..266c1817f4 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -28,7 +28,7 @@ captures this concept well.
 
     A style guide is about consistency. Consistency with this style guide is important. Consistency within a project is more important. Consistency within one module or function is most important.
 
-    But most importantly: **know when to be inconsistent** -- sometimes the style guide just doesn't apply. When in doubt, use your best judgment. Look at other examples and decide what looks best. And don't hesitate to ask!
+    But most importantly: **know when to be inconsistent** -- sometimes the style guide just doesn't apply. When in doubt, use your best judgment. Look at other examples and decide what looks best. And do not hesitate to ask!
 
 
 ***********
@@ -448,7 +448,7 @@ No:
     y            = 2;
     longVariable = 3;
 
-Don't include a whitespace in the receive and fallback functions:
+Do not include a whitespace in the receive and fallback functions:
 
 Yes:
 
diff --git a/docs/types/conversion.rst b/docs/types/conversion.rst
index 02b1f2cb92..dafb336bd0 100644
--- a/docs/types/conversion.rst
+++ b/docs/types/conversion.rst
@@ -44,7 +44,7 @@ Explicit Conversions
 
 If the compiler does not allow implicit conversion but you are confident a conversion will work,
 an explicit type conversion is sometimes possible. This may
-result in unexpected behaviour and allows you to bypass some security
+result in unexpected behavior and allows you to bypass some security
 features of the compiler, so be sure to test that the
 result is what you want and expect!
 
diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index 4ba2a65b1c..a136497e63 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -47,8 +47,8 @@ non-persistent area where function arguments are stored, and behaves mostly like
 
 .. _data-location-assignment:
 
-Data location and assignment behaviour
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Data location and assignment behavior
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Data locations are not only relevant for persistency of data, but also for the semantics of assignments:
 
@@ -582,10 +582,10 @@ and the assignment will effectively garble the length of ``x``.
 To be safe, only enlarge bytes arrays by at most one element during a single
 assignment and do not simultaneously index-access the array in the same statement.
 
-While the above describes the behaviour of dangling storage references in the
+While the above describes the behavior of dangling storage references in the
 current version of the compiler, any code with dangling references should be
-considered to have *undefined behaviour*. In particular, this means that
-any future version of the compiler may change the behaviour of code that
+considered to have *undefined behavior*. In particular, this means that
+any future version of the compiler may change the behavior of code that
 involves dangling references.
 
 Be sure to avoid dangling references in your code!
@@ -641,7 +641,7 @@ Array slices are useful to ABI-decode secondary data passed in function paramete
         /// after doing basic validation on the address argument.
         function forward(bytes calldata payload) external {
             bytes4 sig = bytes4(payload[:4]);
-            // Due to truncating behaviour, bytes4(payload) performs identically.
+            // Due to truncating behavior, bytes4(payload) performs identically.
             // bytes4 sig = bytes4(payload);
             if (sig == bytes4(keccak256("setOwner(address)"))) {
                 address owner = abi.decode(payload[4:], (address));
diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 872f54b0ed..9fcb49b213 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -140,7 +140,7 @@ Exponentiation
 
 Exponentiation is only available for unsigned types in the exponent. The resulting type
 of an exponentiation is always equal to the type of the base. Please take care that it is
-large enough to hold the result and prepare for potential assertion failures or wrapping behaviour.
+large enough to hold the result and prepare for potential assertion failures or wrapping behavior.
 
 .. note::
   In checked mode, exponentiation only uses the comparatively cheap ``exp`` opcode for small bases.
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index a9b29d6ba2..e702996795 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -336,7 +336,7 @@ Furthermore, all functions of the current contract are callable directly includi
 
 .. warning::
     From version 0.8.18 and up, the use of ``selfdestruct`` in both Solidity and Yul will trigger a
-    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behaviour
+    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behavior
     as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
 
 .. note::
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index d43c78e7c0..3ef280a105 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -54,7 +54,7 @@ or ../ <direct-imports>` are treated as relative to the directories specified us
 Furthermore, the part of the path added via these options will not appear in the contract metadata.
 
 For security reasons the compiler has :ref:`restrictions on what directories it can access <allowed-paths>`.
-Directories of source files specified on the command line and target paths of
+Directories of source files specified on the command-line and target paths of
 remappings are automatically allowed to be accessed by the file reader, but everything
 else is rejected by default.
 Additional paths (and their subdirectories) can be allowed via the
@@ -114,15 +114,15 @@ Setting the EVM Version to Target
 *********************************
 
 When you compile your contract code you can specify the Ethereum virtual machine
-version to compile for to avoid particular features or behaviours.
+version to compile for to avoid particular features or behaviors.
 
 .. warning::
 
    Compiling for the wrong EVM version can result in wrong, strange and failing
-   behaviour. Please ensure, especially if running a private chain, that you
+   behavior. Please ensure, especially if running a private chain, that you
    use matching EVM versions.
 
-On the command line, you can select the EVM version as follows:
+On the command-line, you can select the EVM version as follows:
 
 .. code-block:: shell
 
@@ -227,7 +227,7 @@ Input Description
             "bzzr://56ab...",
             "ipfs://Qma...",
             "/tmp/path/to/file.sol"
-            // If files are used, their directories should be added to the command line via
+            // If files are used, their directories should be added to the command-line via
             // `--allow-paths <path>`.
           ]
           // If language is set to "SolidityAST", an AST needs to be supplied under the "ast" key.
diff --git a/docs/yul.rst b/docs/yul.rst
index 8a500c6145..436d0b1462 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -960,7 +960,7 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 
 .. warning::
     From version 0.8.18 and up, the use of ``selfdestruct`` in both Solidity and Yul will trigger a
-    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behaviour
+    deprecation warning, since the ``SELFDESTRUCT`` opcode will eventually undergo breaking changes in behavior
     as stated in `EIP-6049 <https://eips.ethereum.org/EIPS/eip-6049>`_.
 
 In some internal dialects, there are additional functions:
@@ -995,7 +995,7 @@ Its first and only argument must be a string literal and uniquely represents the
 Identifiers can be arbitrary but when the compiler produces Yul code from Solidity sources,
 it uses a library name qualified with the name of the source unit that defines that library.
 To link the code with a particular library address, the same identifier must be provided to the
-``--libraries`` option on the command line.
+``--libraries`` option on the command-line.
 
 For example this code
 
@@ -1076,12 +1076,12 @@ or even opcodes unknown to the Solidity compiler, care has to be taken
 when using ``verbatim`` together with the optimizer. Even when the
 optimizer is switched off, the code generator has to determine
 the stack layout, which means that e.g. using ``verbatim`` to modify
-the stack height can lead to undefined behaviour.
+the stack height can lead to undefined behavior.
 
 The following is a non-exhaustive list of restrictions on
 verbatim bytecode that are not checked by
 the compiler. Violations of these restrictions can result in
-undefined behaviour.
+undefined behavior.
 
 - Control-flow should not jump into or out of verbatim blocks,
   but it can jump within the same verbatim block.
diff --git a/tools/yulPhaser/README.md b/tools/yulPhaser/README.md
index 3bc72b5379..99004d4c93 100644
--- a/tools/yulPhaser/README.md
+++ b/tools/yulPhaser/README.md
@@ -82,7 +82,7 @@ solc/solc <sol file> --optimize --ir-optimized --yul-optimizations <sequence>
 ### How to choose good parameters
 Choosing good parameters for a genetic algorithm is not a trivial task but phaser's defaults are generally enough to find a sequence that gives results comparable or better than one hand-crafted by an experienced developer for a given set of programs.
 The difficult part is providing a fairly representative set of input files.
-If the files you give don't need certain optimisations the tool will find sequences that don't use these optimisations and perform badly for programs that could benefit from them.
+If the files you give do not need certain optimisations the tool will find sequences that do not use these optimisations and perform badly for programs that could benefit from them.
 If all the provided files greatly benefit from a specific optimisation, the sequence may not work well for programs that do not.
 
 We have conducted [a set of rough experiments](https://github.com/ethereum/solidity/issues/7806#issuecomment-598644491) to evaluate some combinations of parameter values.
@@ -91,5 +91,5 @@ The conclusions were used to adjust the defaults but you might still benefit fro
 1. The algorithm that performed the best was `GEWEP`.
 2. Using longer sequences in the initial population yields better results. The algorithm is good at removing superfluous steps.
 3. Preserving the top sequences from previous rounds improves results. Elite should contain at least a few individuals, especially when using the `classic` algorithm.
-4. Don't set mutation/deletion/addition chance too high. It makes results worse because it destroys the good patterns preserved by crossover. Values around 1-5% seem to work best.
+4. Do not set mutation/deletion/addition chance too high. It makes results worse because it destroys the good patterns preserved by crossover. Values around 1-5% seem to work best.
 5. Keep the algorithm running for 1000 rounds or more. It usually finds good sequences faster than that but it can shorten them significantly if you let it run longer. This is especially important when starting with long sequences.

From d657e77f1ef757ada7c581e4101073a8f5db5273 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Wed, 31 May 2023 02:11:33 -0300
Subject: [PATCH 1407/1748] Remove problematic sed commands in openzeppelin
 external test

---
 test/externalTests/zeppelin.sh | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 46b3f2d898..a023af2907 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -74,26 +74,14 @@ function zeppelin_test
     sed -i "s|it(\('prevent unauthorized maintenance'\)|it.skip(\1|g" test/governance/TimelockController.test.js
     sed -i "s|it(\('cannot cancel invalid operation'\)|it.skip(\1|g" test/governance/TimelockController.test.js
     sed -i "s|it(\('cannot call onlyInitializable function outside the scope of an initializable function'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
-    sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC20/presets/ERC20PresetMinterPauser.test.js
-    sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC1155/presets/ERC1155PresetMinterPauser.test.js
-    sed -i "s|it(\('other accounts cannot pause'\)|it.skip(\1|g" test/token/ERC20/presets/ERC20PresetMinterPauser.test.js
-    sed -i "s|it(\('other accounts cannot pause'\)|it.skip(\1|g" test/token/ERC1155/presets/ERC1155PresetMinterPauser.test.js
-    sed -i "s|it(\('cannot be released before time limit'\)|it.skip(\1|g" test/token/ERC20/utils/TokenTimelock.test.js
-    sed -i "s|it(\('cannot be released just before time limit'\)|it.skip(\1|g" test/token/ERC20/utils/TokenTimelock.test.js
     sed -i "s|it(\('reverts when sending non-zero amounts'\)|it.skip(\1|g" test/utils/Address.test.js
     sed -i "s|it(\('reverts when sending more than the balance'\)|it.skip(\1|g" test/utils/Address.test.js
     sed -i "s|it(\('fails deploying a contract if the bytecode length is zero'\)|it.skip(\1|g" test/utils/Create2.test.js
     sed -i "s|it(\('fails deploying a contract if factory contract does not have sufficient balance'\)|it.skip(\1|g" test/utils/Create2.test.js
-    sed -i "s|it(\('reverts on withdrawals'\)|it.skip(\1|g" test/utils/escrow/ConditionalEscrow.test.js
-    sed -i "s|it(\('does not allow beneficiary withdrawal'\)|it.skip(\1|g" test/utils/escrow/RefundEscrow.test.js
-    sed -i "s|it(\('rejects deposits'\)|it.skip(\1|g" test/utils/escrow/RefundEscrow.test.js
-    sed -i "s|it(\('does not allow 0xffffffff'\)|it.skip(\1|g" test/utils/introspection/ERC165Storage.test.js
     sed -i "s|it(\('reverts when casting -1'\)|it.skip(\1|g" test/utils/math/SafeCast.test.js
     sed -i 's|it(\(`reverts when casting [^`]\+`\)|it.skip(\1|g' test/utils/math/SafeCast.test.js
     sed -i "s|it(\('reverts if index is greater than supply'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
     sed -i "s|it(\('burns all tokens'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
-    sed -i "s|it(\('other accounts cannot pause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js
-    sed -i "s|it(\('other accounts cannot unpause'\)|it.skip(\1|g" test/token/ERC721/presets/ERC721PresetMinterPauserAutoId.test.js
     sed -i "s|it(\('guards transfer against invalid user'\)|it.skip(\1|g" test/access/Ownable2Step.test.js
     sed -i "s|it(\('reverting initialization'\)|it.skip(\1|g" test/proxy/beacon/BeaconProxy.test.js
     sed -i "s|describe(\('reverting initialization'\)|describe.skip(\1|g" test/proxy/Proxy.behaviour.js

From 824e59dec2bc9fb128ffdce6e34c4fab648208b2 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 2 Jun 2023 12:09:53 +0200
Subject: [PATCH 1408/1748] Remove unnecessary line from OZ external test
 script

---
 test/externalTests/zeppelin.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index a023af2907..4ac04a66d1 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -70,7 +70,6 @@ function zeppelin_test
     sed -i "s|describe(\('when the given implementation is the zero address'\)|describe.skip(\1|g" test/proxy/transparent/TransparentUpgradeableProxy.behaviour.js
     sed -i "s|describe(\('when the new proposed admin is the zero address'\)|describe.skip(\1|g" test/proxy/transparent/TransparentUpgradeableProxy.behaviour.js
     # In some cases Hardhat does not detect revert reasons properly via IR.
-    sed -i "s|it(\('reverts if the current value is 0'\)|it.skip(\1|g" test/utils/Counters.test.js
     sed -i "s|it(\('prevent unauthorized maintenance'\)|it.skip(\1|g" test/governance/TimelockController.test.js
     sed -i "s|it(\('cannot cancel invalid operation'\)|it.skip(\1|g" test/governance/TimelockController.test.js
     sed -i "s|it(\('cannot call onlyInitializable function outside the scope of an initializable function'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js

From a518310af95dead3fc40cecf279384953f2efea1 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 2 Jun 2023 12:50:28 +0200
Subject: [PATCH 1409/1748] Disable gp2 tests

---
 .circleci/config.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6db33891a3..68092cc98f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1681,7 +1681,8 @@ workflows:
       - t_ext: *job_native_test_ext_prb_math
       - t_ext: *job_native_test_ext_elementfi
       - t_ext: *job_native_test_ext_brink
-      - t_ext: *job_native_test_ext_gp2
+      # NOTE: We are disabling gp2 tests due to constant failures.
+      # - t_ext: *job_native_test_ext_gp2
       # NOTE: The external tests below were commented because they
       # depend on a specific version of hardhat which does not support shanghai EVM.
       #- t_ext: *job_native_test_ext_trident
@@ -1703,7 +1704,8 @@ workflows:
             - t_native_test_ext_prb_math
             - t_native_test_ext_elementfi
             - t_native_test_ext_brink
-            - t_native_test_ext_gp2
+            # NOTE: We are disabling gp2 tests due to constant failures.
+            #- t_native_test_ext_gp2
             # NOTE: The external tests below were commented because they
             # depend on a specific version of hardhat which does not support shanghai EVM.
             #- t_native_test_ext_trident

From 72a384f4fe064f9ea377644d57858d38f5febb66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 19 Nov 2021 14:30:32 +0100
Subject: [PATCH 1410/1748] cmdlineTests: Ensure that leading symbols in names
 affect the sort order

---
 test/cmdlineTests.sh | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 416b97b32a..4c54291c99 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -54,7 +54,7 @@ do
             shift
             ;;
         *)
-            matching_tests=$(find . -mindepth 1 -maxdepth 1 -type d -name "$1" | cut -c 3- | sort)
+            matching_tests=$(find . -mindepth 1 -maxdepth 1 -type d -name "$1" | cut -c 3- | LC_COLLATE=C sort)
 
             if [[ $matching_tests == "" ]]
             then
@@ -72,7 +72,11 @@ done
 
 if (( ${#selected_tests[@]} == 0 && ${#patterns_with_no_matches[@]} == 0 ))
 then
-    selected_tests=(*)
+    # NOTE: We want leading symbols in names to affect the sort order but without
+    # LC_COLLATE=C sort seems to ignore them.
+    all_tests=$(echo * | tr '[:space:]' '\n' | LC_COLLATE=C sort)
+    # shellcheck disable=SC2206 # We do not support test names containing spaces.
+    selected_tests=($all_tests)
 fi
 popd > /dev/null
 

From dd10334754ca5db54e84bbbc6117a1959749f451 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 19 Nov 2021 14:51:28 +0100
Subject: [PATCH 1411/1748] cmdlineTests: Support tests that contain a script
 to run as an alternative to input.* files

---
 test/cmdlineTests.sh | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 4c54291c99..41d6ff40a9 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -32,6 +32,8 @@ set -eo pipefail
 
 REPO_ROOT=$(cd "$(dirname "$0")/.." && pwd)
 SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
+export REPO_ROOT SOLIDITY_BUILD_DIR
+
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 # shellcheck source=scripts/common_cmdline.sh
@@ -92,6 +94,7 @@ case "$OSTYPE" in
         ;;
 esac
 echo "Using solc binary at ${SOLC}"
+export SOLC
 
 INTERACTIVE=true
 if ! tty -s || [ "$CI" ]
@@ -441,13 +444,23 @@ printTask "Running general commandline tests..."
             fi
         fi
 
+        scriptFiles="$(ls -1 "${tdir}/test."* 2> /dev/null || true)"
+        scriptCount="$(echo "${scriptFiles}" | wc -w)"
+
         inputFiles="$(ls -1 "${tdir}/input."* 2> /dev/null || true)"
         inputCount="$(echo "${inputFiles}" | wc -w)"
-        if (( inputCount > 1 ))
+        (( inputCount <= 1 )) || fail "Ambiguous input. Found input files in multiple formats:"$'\n'"${inputFiles}"
+        (( scriptCount <= 1 )) || fail "Ambiguous input. Found script files in multiple formats:"$'\n'"${scriptFiles}"
+        (( inputCount == 0 || scriptCount == 0 )) || fail "Ambiguous input. Found both input and script files:"$'\n'"${inputFiles}"$'\n'"${scriptFiles}"
+
+        if (( scriptCount == 1 ))
         then
-            printError "Ambiguous input. Found input files in multiple formats:"
-            echo -e "${inputFiles}"
-            fail
+            if ! "$scriptFiles"
+            then
+                fail "Test script ${scriptFiles} failed."
+            fi
+
+            continue
         fi
 
         # Use printf to get rid of the trailing newline

From 6b061ba69629ef02c8984530a0ef2bd9e63547b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 19 Nov 2021 14:56:30 +0100
Subject: [PATCH 1412/1748] cmdlineTests: Extract script-based test out of
 cmdlineTests.sh

- Just extraction, with as few changes to the code as possible.
---
 test/cmdlineTests.sh                          | 307 ------------------
 test/cmdlineTests/~assembler_modes/test.sh    |  46 +++
 .../test.sh                                   |   8 +
 test/cmdlineTests/~ast_import_export/test.sh  |  17 +
 test/cmdlineTests/~compilation_tests/test.sh  |  20 ++
 .../~documentation_examples/test.sh           |  51 +++
 test/cmdlineTests/~library_checksum/test.sh   |  12 +
 test/cmdlineTests/~library_long_names/test.sh |   8 +
 test/cmdlineTests/~linking/test.sh            |  22 ++
 test/cmdlineTests/~overwriting_files/test.sh  |  18 +
 test/cmdlineTests/~soljson_via_fuzzer/test.sh |  18 +
 test/cmdlineTests/~standard_input/test.sh     |  31 ++
 test/cmdlineTests/~unknown_options/test.sh    |  20 ++
 .../~update_bugs_by_version/test.sh           |  13 +
 test/cmdlineTests/~via_ir_equivalence/test.sh |  98 ++++++
 15 files changed, 382 insertions(+), 307 deletions(-)
 create mode 100755 test/cmdlineTests/~assembler_modes/test.sh
 create mode 100755 test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh
 create mode 100755 test/cmdlineTests/~ast_import_export/test.sh
 create mode 100755 test/cmdlineTests/~compilation_tests/test.sh
 create mode 100755 test/cmdlineTests/~documentation_examples/test.sh
 create mode 100755 test/cmdlineTests/~library_checksum/test.sh
 create mode 100755 test/cmdlineTests/~library_long_names/test.sh
 create mode 100755 test/cmdlineTests/~linking/test.sh
 create mode 100755 test/cmdlineTests/~overwriting_files/test.sh
 create mode 100755 test/cmdlineTests/~soljson_via_fuzzer/test.sh
 create mode 100755 test/cmdlineTests/~standard_input/test.sh
 create mode 100755 test/cmdlineTests/~unknown_options/test.sh
 create mode 100755 test/cmdlineTests/~update_bugs_by_version/test.sh
 create mode 100755 test/cmdlineTests/~via_ir_equivalence/test.sh

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 41d6ff40a9..fb346f71d1 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -298,113 +298,8 @@ EOF
 }
 
 
-function test_solc_assembly_output
-{
-    local input="${1}"
-    local expected="${2}"
-    IFS=" " read -r -a solc_args <<< "${3}"
-
-    local expected_object="object \"object\" { code ${expected} }"
-
-    output=$(echo "${input}" | msg_on_error --no-stderr "$SOLC" - "${solc_args[@]}")
-    empty=$(echo "$output" | tr '\n' ' ' | tr -s ' ' | sed -ne "/${expected_object}/p")
-    if [ -z "$empty" ]
-    then
-        printError "Incorrect assembly output. Expected: "
-        >&2 echo -e "${expected}"
-        printError "with arguments ${solc_args[*]}, but got:"
-        >&2 echo "${output}"
-        fail
-    fi
-}
-
-function test_via_ir_equivalence()
-{
-    SOLTMPDIR=$(mktemp -d)
-    pushd "$SOLTMPDIR" > /dev/null
-
-    (( $# <= 2 )) || fail "This function accepts at most two arguments."
-    local solidity_file="$1"
-    local optimize_flag="$2"
-    [[ $optimize_flag == --optimize || $optimize_flag == "" ]] || assertFail "The second argument must be --optimize if present."
-
-    local output_file_prefix
-    output_file_prefix=$(basename "$1" .sol)
-
-    local optimizer_flags=()
-    [[ $optimize_flag == "" ]] || optimizer_flags+=("$optimize_flag")
-    [[ $optimize_flag == "" ]] || output_file_prefix+="_optimize"
-
-    msg_on_error --no-stderr "$SOLC" --ir-optimized --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
-        sed '/^Optimized IR:$/d' |
-        split_on_empty_lines_into_numbered_files "$output_file_prefix" ".yul"
-
-    local asm_output_two_stage asm_output_via_ir
-
-    for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
-        asm_output_two_stage+=$(
-            msg_on_error --no-stderr "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" "$yul_file" |
-                sed '/^Text representation:$/d' |
-                sed '/^=======/d'
-        )
-    done
-
-    asm_output_via_ir=$(
-        msg_on_error --no-stderr "$SOLC" --via-ir --asm --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
-            sed '/^EVM assembly:$/d' |
-            sed '/^=======/d'
-    )
-
-    diff_values "$asm_output_two_stage" "$asm_output_via_ir" --ignore-space-change --ignore-blank-lines
-
-    local bin_output_two_stage bin_output_via_ir
-
-    for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
-        bin_output_two_stage+=$(
-            msg_on_error --no-stderr "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" |
-                sed '/^Binary representation:$/d' |
-                sed '/^=======/d'
-        )
-    done
-
-    bin_output_via_ir=$(
-        msg_on_error --no-stderr "$SOLC" --via-ir --bin "${optimizer_flags[@]}" "$solidity_file" |
-            sed '/^Binary:$/d' |
-            sed '/^=======/d'
-    )
-
-    diff_values "$bin_output_two_stage" "$bin_output_via_ir" --ignore-space-change --ignore-blank-lines
-
-    popd > /dev/null
-    rm -r "$SOLTMPDIR"
-}
-
 ## RUN
 
-SOLTMPDIR=$(mktemp -d)
-printTask "Checking that the bug list is up to date..."
-cp "${REPO_ROOT}/docs/bugs_by_version.json" "${SOLTMPDIR}/original_bugs_by_version.json"
-"${REPO_ROOT}/scripts/update_bugs_by_version.py"
-diff --unified "${SOLTMPDIR}/original_bugs_by_version.json" "${REPO_ROOT}/docs/bugs_by_version.json" || \
-    fail "The bug list in bugs_by_version.json was out of date and has been updated. Please investigate and submit a bugfix if necessary."
-rm -r "$SOLTMPDIR"
-
-printTask "Testing unknown options..."
-(
-    set +e
-    output=$("$SOLC" --allow=test 2>&1)
-    failed=$?
-    set -e
-
-    if [ "$output" == "unrecognised option '--allow=test'" ] && [ $failed -ne 0 ]
-    then
-        echo "Passed"
-    else
-        fail "Incorrect response to unknown options: $output"
-    fi
-)
-
-
 printTask "Testing passing files that are not found..."
 test_solc_behaviour "file_not_found.sol" "" "" "" 1 "" "\"file_not_found.sol\" is not found." "" ""
 
@@ -510,206 +405,4 @@ printTask "Running general commandline tests..."
     done
 )
 
-printTask "Compiling various other contracts and libraries..."
-(
-    cd "$REPO_ROOT"/test/compilationTests/
-    for dir in */
-    do
-        echo " - $dir"
-        cd "$dir"
-        # shellcheck disable=SC2046 # These file names are not supposed to contain spaces.
-        compileFull --expect-warnings $(find . -name '*.sol')
-        cd ..
-    done
-)
-
-printTask "Compiling all examples from the documentation..."
-SOLTMPDIR=$(mktemp -d)
-(
-    set -e
-    cd "$SOLTMPDIR"
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
-    developmentVersion=$("$REPO_ROOT/scripts/get_version.sh")
-
-    for f in *.yul *.sol
-    do
-        # The contributors guide uses syntax tests, but we cannot
-        # really handle them here.
-        if grep -E 'DeclarationError:|// ----' "$f" >/dev/null
-        then
-            continue
-        fi
-        echo "$f"
-
-        opts=()
-        # We expect errors if explicitly stated, or if imports
-        # are used (in the style guide)
-        if grep -E "// This will not compile" "$f" >/dev/null ||
-            sed -e 's|//.*||g' "$f" | grep -E "import \"" >/dev/null
-        then
-            opts=(--expect-errors)
-        fi
-        if grep "// This will report a warning" "$f" >/dev/null
-        then
-            opts+=(--expect-warnings)
-        fi
-        if grep "// This may report a warning" "$f" >/dev/null
-        then
-            opts+=(--ignore-warnings)
-        fi
-
-        # Disable the version pragma in code snippets that only work with the current development version.
-        # It's necessary because x.y.z won't match `^x.y.z` or `>=x.y.z` pragmas until it's officially released.
-        sed -i.bak -E -e 's/pragma[[:space:]]+solidity[[:space:]]*(\^|>=)[[:space:]]*'"$developmentVersion"'/pragma solidity >0.0.1/' "$f"
-        compileFull "${opts[@]}" "$SOLTMPDIR/$f"
-    done
-)
-rm -r "$SOLTMPDIR"
-echo "Done."
-
-printTask "Testing library checksum..."
-echo '' | msg_on_error --no-stdout "$SOLC" - --link --libraries a=0x90f20564390eAe531E810af625A22f51385Cd222
-echo '' | "$SOLC" - --link --libraries a=0x80f20564390eAe531E810af625A22f51385Cd222 &>/dev/null && \
-    fail "solc --link did not reject a library address with an invalid checksum."
-
-printTask "Testing long library names..."
-echo '' | msg_on_error --no-stdout "$SOLC" - --link --libraries aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylonglibraryname=0x90f20564390eAe531E810af625A22f51385Cd222
-
-printTask "Testing linking itself..."
-SOLTMPDIR=$(mktemp -d)
-(
-    cd "$SOLTMPDIR"
-    echo 'library L { function f() public pure {} } contract C { function f() public pure { L.f(); } }' > x.sol
-    msg_on_error --no-stderr "$SOLC" --bin -o . x.sol
-    # Explanation and placeholder should be there
-    grep -q '//' C.bin && grep -q '__' C.bin
-    # But not in library file.
-    grep -q -v '[/_]' L.bin
-    # Now link
-    msg_on_error "$SOLC" --link --libraries x.sol:L=0x90f20564390eAe531E810af625A22f51385Cd222 C.bin
-    # Now the placeholder and explanation should be gone.
-    grep -q -v '[/_]' C.bin
-)
-rm -r "$SOLTMPDIR"
-
-printTask "Testing overwriting files..."
-SOLTMPDIR=$(mktemp -d)
-(
-    # First time it works
-    echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
-    # Second time it fails
-    echo 'contract C {}' | "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create" 2>/dev/null && \
-        fail "solc did not refuse to overwrite $SOLTMPDIR/non-existing-stuff-to-create."
-    # Unless we force
-    echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --overwrite --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
-)
-rm -r "$SOLTMPDIR"
-
-printTask "Testing assemble, yul, strict-assembly and optimize..."
-(
-    echo '{}' | msg_on_error --silent "$SOLC" - --assemble
-    echo '{}' | msg_on_error --silent "$SOLC" - --yul
-    echo '{}' | msg_on_error --silent "$SOLC" - --strict-assembly
-
-    # Test options above in conjunction with --optimize.
-    # Using both, --assemble and --optimize should fail.
-    echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null && fail "solc --assemble --optimize did not fail as expected."
-    echo '{}' | "$SOLC" - --yul --optimize &>/dev/null && fail "solc --yul --optimize did not fail as expected."
-
-    # Test yul and strict assembly output
-    # Non-empty code results in non-empty binary representation with optimizations turned off,
-    # while it results in empty binary representation with optimizations turned on.
-    test_solc_assembly_output "{ let x:u256 := 0:u256 }" "{ let x := 0 }" "--yul"
-    test_solc_assembly_output "{ let x:u256 := bitnot(7:u256) }" "{ let x := bitnot(7) }" "--yul"
-    test_solc_assembly_output "{ let t:bool := not(true) }" "{ let t:bool := not(true) }" "--yul"
-    test_solc_assembly_output "{ let x := 0 }" "{ let x := 0 }" "--strict-assembly"
-    test_solc_assembly_output "{ let x := 0 }" "{ { } }" "--strict-assembly --optimize"
-)
-
-printTask "Testing the eqivalence of --via-ir and a two-stage compilation..."
-(
-    externalContracts=(
-        externalTests/solc-js/DAO/TokenCreation.sol
-        libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
-        libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
-        libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol
-        libsolidity/semanticTests/externalContracts/deposit_contract.sol
-        libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
-        libsolidity/semanticTests/externalContracts/snark.sol
-    )
-
-    requiresOptimizer=(
-        externalTests/solc-js/DAO/TokenCreation.sol
-        libsolidity/semanticTests/externalContracts/deposit_contract.sol
-        libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
-        libsolidity/semanticTests/externalContracts/snark.sol
-    )
-
-    for contractFile in "${externalContracts[@]}"
-    do
-        if ! [[ "${requiresOptimizer[*]}" =~ $contractFile ]]
-        then
-            printTask " - ${contractFile}"
-            test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}"
-        fi
-
-        printTask " - ${contractFile} (optimized)"
-        test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}" --optimize
-    done
-)
-
-printTask "Testing standard input..."
-SOLTMPDIR=$(mktemp -d)
-(
-    set +e
-    output=$("$SOLC" --bin 2>&1)
-    result=$?
-    set -e
-
-    # This should fail
-    if [[ ! ("$output" =~ "No input files given") || ($result == 0) ]]
-    then
-        fail "Incorrect response to empty input arg list: $output"
-    fi
-
-    # The contract should be compiled
-    if ! echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin | grep -q "<stdin>:C"
-    then
-        fail "Failed to compile a simple contract from standard input"
-    fi
-
-    # This should not fail
-    echo '' | msg_on_error --silent --msg "Incorrect response to --ast-compact-json option with empty stdin" \
-        "$SOLC" --ast-compact-json -
-)
-rm -r "$SOLTMPDIR"
-
-printTask "Testing AST import/export..."
-SOLTMPDIR=$(mktemp -d)
-(
-    cd "$SOLTMPDIR"
-    if ! "$REPO_ROOT/scripts/ASTImportTest.sh" ast
-    then
-        rm -r "$SOLTMPDIR"
-        fail
-    fi
-)
-rm -r "$SOLTMPDIR"
-
-printTask "Testing AST export with stop-after=parsing..."
-"$REPO_ROOT/test/stopAfterParseTests.sh"
-
-printTask "Testing soljson via the fuzzer..."
-SOLTMPDIR=$(mktemp -d)
-(
-    set -e
-    cd "$SOLTMPDIR"
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
-
-    echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --quiet --input-files
-    echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --without-optimizer --quiet --input-files
-)
-rm -r "$SOLTMPDIR"
-
 echo "Commandline tests successful."
diff --git a/test/cmdlineTests/~assembler_modes/test.sh b/test/cmdlineTests/~assembler_modes/test.sh
new file mode 100755
index 0000000000..099a324440
--- /dev/null
+++ b/test/cmdlineTests/~assembler_modes/test.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+function test_solc_assembly_output
+{
+    local input="${1}"
+    local expected="${2}"
+    IFS=" " read -r -a solc_args <<< "${3}"
+
+    local expected_object="object \"object\" { code ${expected} }"
+
+    output=$(echo "${input}" | msg_on_error --no-stderr "$SOLC" - "${solc_args[@]}")
+    empty=$(echo "$output" | tr '\n' ' ' | tr -s ' ' | sed -ne "/${expected_object}/p")
+    if [ -z "$empty" ]
+    then
+        printError "Incorrect assembly output. Expected: "
+        >&2 echo -e "${expected}"
+        printError "with arguments ${solc_args[*]}, but got:"
+        >&2 echo "${output}"
+        fail
+    fi
+}
+
+printTask "Testing assemble, yul, strict-assembly and optimize..."
+(
+    echo '{}' | msg_on_error --silent "$SOLC" - --assemble
+    echo '{}' | msg_on_error --silent "$SOLC" - --yul
+    echo '{}' | msg_on_error --silent "$SOLC" - --strict-assembly
+
+    # Test options above in conjunction with --optimize.
+    # Using both, --assemble and --optimize should fail.
+    echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null && fail "solc --assemble --optimize did not fail as expected."
+    echo '{}' | "$SOLC" - --yul --optimize &>/dev/null && fail "solc --yul --optimize did not fail as expected."
+
+    # Test yul and strict assembly output
+    # Non-empty code results in non-empty binary representation with optimizations turned off,
+    # while it results in empty binary representation with optimizations turned on.
+    test_solc_assembly_output "{ let x:u256 := 0:u256 }" "{ let x := 0 }" "--yul"
+    test_solc_assembly_output "{ let x:u256 := bitnot(7:u256) }" "{ let x := bitnot(7) }" "--yul"
+    test_solc_assembly_output "{ let t:bool := not(true) }" "{ let t:bool := not(true) }" "--yul"
+    test_solc_assembly_output "{ let x := 0 }" "{ let x := 0 }" "--strict-assembly"
+    test_solc_assembly_output "{ let x := 0 }" "{ { } }" "--strict-assembly --optimize"
+)
diff --git a/test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh b/test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh
new file mode 100755
index 0000000000..d023d13e05
--- /dev/null
+++ b/test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+printTask "Testing AST export with stop-after=parsing..."
+"$REPO_ROOT/test/stopAfterParseTests.sh"
diff --git a/test/cmdlineTests/~ast_import_export/test.sh b/test/cmdlineTests/~ast_import_export/test.sh
new file mode 100755
index 0000000000..d7250ce665
--- /dev/null
+++ b/test/cmdlineTests/~ast_import_export/test.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+printTask "Testing AST import/export..."
+SOLTMPDIR=$(mktemp -d)
+(
+    cd "$SOLTMPDIR"
+    if ! "$REPO_ROOT/scripts/ASTImportTest.sh" ast
+    then
+        rm -r "$SOLTMPDIR"
+        fail
+    fi
+)
+rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~compilation_tests/test.sh b/test/cmdlineTests/~compilation_tests/test.sh
new file mode 100755
index 0000000000..5793b17c1a
--- /dev/null
+++ b/test/cmdlineTests/~compilation_tests/test.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+# shellcheck source=scripts/common_cmdline.sh
+source "${REPO_ROOT}/scripts/common_cmdline.sh"
+
+printTask "Compiling various other contracts and libraries..."
+(
+    cd "$REPO_ROOT"/test/compilationTests/
+    for dir in */
+    do
+        echo " - $dir"
+        cd "$dir"
+        # shellcheck disable=SC2046 # These file names are not supposed to contain spaces.
+        compileFull --expect-warnings $(find . -name '*.sol')
+        cd ..
+    done
+)
diff --git a/test/cmdlineTests/~documentation_examples/test.sh b/test/cmdlineTests/~documentation_examples/test.sh
new file mode 100755
index 0000000000..d3bc8c1b18
--- /dev/null
+++ b/test/cmdlineTests/~documentation_examples/test.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+# shellcheck source=scripts/common_cmdline.sh
+source "${REPO_ROOT}/scripts/common_cmdline.sh"
+
+printTask "Compiling all examples from the documentation..."
+SOLTMPDIR=$(mktemp -d)
+(
+    set -e
+    cd "$SOLTMPDIR"
+    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
+    developmentVersion=$("$REPO_ROOT/scripts/get_version.sh")
+
+    for f in *.yul *.sol
+    do
+        # The contributors guide uses syntax tests, but we cannot
+        # really handle them here.
+        if grep -E 'DeclarationError:|// ----' "$f" >/dev/null
+        then
+            continue
+        fi
+        echo "$f"
+
+        opts=()
+        # We expect errors if explicitly stated, or if imports
+        # are used (in the style guide)
+        if grep -E "// This will not compile" "$f" >/dev/null ||
+            sed -e 's|//.*||g' "$f" | grep -E "import \"" >/dev/null
+        then
+            opts=(--expect-errors)
+        fi
+        if grep "// This will report a warning" "$f" >/dev/null
+        then
+            opts+=(--expect-warnings)
+        fi
+        if grep "// This may report a warning" "$f" >/dev/null
+        then
+            opts+=(--ignore-warnings)
+        fi
+
+        # Disable the version pragma in code snippets that only work with the current development version.
+        # It's necessary because x.y.z won't match `^x.y.z` or `>=x.y.z` pragmas until it's officially released.
+        sed -i.bak -E -e 's/pragma[[:space:]]+solidity[[:space:]]*(\^|>=)[[:space:]]*'"$developmentVersion"'/pragma solidity >0.0.1/' "$f"
+        compileFull "${opts[@]}" "$SOLTMPDIR/$f"
+    done
+)
+rm -r "$SOLTMPDIR"
+echo "Done."
diff --git a/test/cmdlineTests/~library_checksum/test.sh b/test/cmdlineTests/~library_checksum/test.sh
new file mode 100755
index 0000000000..c6d52fa452
--- /dev/null
+++ b/test/cmdlineTests/~library_checksum/test.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+printTask "Testing library checksum..."
+echo '' | msg_on_error --no-stdout "$SOLC" - --link --libraries a=0x90f20564390eAe531E810af625A22f51385Cd222
+echo '' | "$SOLC" - --link --libraries a=0x80f20564390eAe531E810af625A22f51385Cd222 &>/dev/null && \
+    fail "solc --link did not reject a library address with an invalid checksum."
+
+exit 0
diff --git a/test/cmdlineTests/~library_long_names/test.sh b/test/cmdlineTests/~library_long_names/test.sh
new file mode 100755
index 0000000000..59f179232a
--- /dev/null
+++ b/test/cmdlineTests/~library_long_names/test.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+printTask "Testing long library names..."
+echo '' | msg_on_error --no-stdout "$SOLC" - --link --libraries aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylonglibraryname=0x90f20564390eAe531E810af625A22f51385Cd222
diff --git a/test/cmdlineTests/~linking/test.sh b/test/cmdlineTests/~linking/test.sh
new file mode 100755
index 0000000000..d9b0c867bf
--- /dev/null
+++ b/test/cmdlineTests/~linking/test.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+printTask "Testing linking itself..."
+SOLTMPDIR=$(mktemp -d)
+(
+    cd "$SOLTMPDIR"
+    echo 'library L { function f() public pure {} } contract C { function f() public pure { L.f(); } }' > x.sol
+    msg_on_error --no-stderr "$SOLC" --bin -o . x.sol
+    # Explanation and placeholder should be there
+    grep -q '//' C.bin && grep -q '__' C.bin
+    # But not in library file.
+    grep -q -v '[/_]' L.bin
+    # Now link
+    msg_on_error "$SOLC" --link --libraries x.sol:L=0x90f20564390eAe531E810af625A22f51385Cd222 C.bin
+    # Now the placeholder and explanation should be gone.
+    grep -q -v '[/_]' C.bin
+)
+rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~overwriting_files/test.sh b/test/cmdlineTests/~overwriting_files/test.sh
new file mode 100755
index 0000000000..23599c52f0
--- /dev/null
+++ b/test/cmdlineTests/~overwriting_files/test.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+printTask "Testing overwriting files..."
+SOLTMPDIR=$(mktemp -d)
+(
+    # First time it works
+    echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
+    # Second time it fails
+    echo 'contract C {}' | "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create" 2>/dev/null && \
+        fail "solc did not refuse to overwrite $SOLTMPDIR/non-existing-stuff-to-create."
+    # Unless we force
+    echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --overwrite --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
+)
+rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~soljson_via_fuzzer/test.sh b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
new file mode 100755
index 0000000000..69fa6d84d1
--- /dev/null
+++ b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+printTask "Testing soljson via the fuzzer..."
+SOLTMPDIR=$(mktemp -d)
+(
+    set -e
+    cd "$SOLTMPDIR"
+    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
+    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
+
+    echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --quiet --input-files
+    echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --without-optimizer --quiet --input-files
+)
+rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~standard_input/test.sh b/test/cmdlineTests/~standard_input/test.sh
new file mode 100755
index 0000000000..03da677374
--- /dev/null
+++ b/test/cmdlineTests/~standard_input/test.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+printTask "Testing standard input..."
+SOLTMPDIR=$(mktemp -d)
+(
+    set +e
+    output=$("$SOLC" --bin 2>&1)
+    result=$?
+    set -e
+
+    # This should fail
+    if [[ ! ("$output" =~ "No input files given") || ($result == 0) ]]
+    then
+        fail "Incorrect response to empty input arg list: $output"
+    fi
+
+    # The contract should be compiled
+    if ! echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin | grep -q "<stdin>:C"
+    then
+        fail "Failed to compile a simple contract from standard input"
+    fi
+
+    # This should not fail
+    echo '' | msg_on_error --silent --msg "Incorrect response to --ast-compact-json option with empty stdin" \
+        "$SOLC" --ast-compact-json -
+)
+rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~unknown_options/test.sh b/test/cmdlineTests/~unknown_options/test.sh
new file mode 100755
index 0000000000..dde9fc9c14
--- /dev/null
+++ b/test/cmdlineTests/~unknown_options/test.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+printTask "Testing unknown options..."
+(
+    set +e
+    output=$("$SOLC" --allow=test 2>&1)
+    failed=$?
+    set -e
+
+    if [ "$output" == "unrecognised option '--allow=test'" ] && [ $failed -ne 0 ]
+    then
+        echo "Passed"
+    else
+        fail "Incorrect response to unknown options: $output"
+    fi
+)
diff --git a/test/cmdlineTests/~update_bugs_by_version/test.sh b/test/cmdlineTests/~update_bugs_by_version/test.sh
new file mode 100755
index 0000000000..fdeafd5a74
--- /dev/null
+++ b/test/cmdlineTests/~update_bugs_by_version/test.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+SOLTMPDIR=$(mktemp -d)
+printTask "Checking that the bug list is up to date..."
+cp "${REPO_ROOT}/docs/bugs_by_version.json" "${SOLTMPDIR}/original_bugs_by_version.json"
+"${REPO_ROOT}/scripts/update_bugs_by_version.py"
+diff --unified "${SOLTMPDIR}/original_bugs_by_version.json" "${REPO_ROOT}/docs/bugs_by_version.json" || \
+    fail "The bug list in bugs_by_version.json was out of date and has been updated. Please investigate and submit a bugfix if necessary."
+rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~via_ir_equivalence/test.sh b/test/cmdlineTests/~via_ir_equivalence/test.sh
new file mode 100755
index 0000000000..9a3030d1d2
--- /dev/null
+++ b/test/cmdlineTests/~via_ir_equivalence/test.sh
@@ -0,0 +1,98 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+function test_via_ir_equivalence()
+{
+    SOLTMPDIR=$(mktemp -d)
+    pushd "$SOLTMPDIR" > /dev/null
+
+    (( $# <= 2 )) || fail "This function accepts at most two arguments."
+    local solidity_file="$1"
+    local optimize_flag="$2"
+    [[ $optimize_flag == --optimize || $optimize_flag == "" ]] || assertFail "The second argument must be --optimize if present."
+
+    local output_file_prefix
+    output_file_prefix=$(basename "$1" .sol)
+
+    local optimizer_flags=()
+    [[ $optimize_flag == "" ]] || optimizer_flags+=("$optimize_flag")
+    [[ $optimize_flag == "" ]] || output_file_prefix+="_optimize"
+
+    msg_on_error --no-stderr "$SOLC" --ir-optimized --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
+        sed '/^Optimized IR:$/d' |
+        split_on_empty_lines_into_numbered_files "$output_file_prefix" ".yul"
+
+    local asm_output_two_stage asm_output_via_ir
+
+    for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
+        asm_output_two_stage+=$(
+            msg_on_error --no-stderr "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" "$yul_file" |
+                sed '/^Text representation:$/d' |
+                sed '/^=======/d'
+        )
+    done
+
+    asm_output_via_ir=$(
+        msg_on_error --no-stderr "$SOLC" --via-ir --asm --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
+            sed '/^EVM assembly:$/d' |
+            sed '/^=======/d'
+    )
+
+    diff_values "$asm_output_two_stage" "$asm_output_via_ir" --ignore-space-change --ignore-blank-lines
+
+    local bin_output_two_stage bin_output_via_ir
+
+    for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
+        bin_output_two_stage+=$(
+            msg_on_error --no-stderr "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" |
+                sed '/^Binary representation:$/d' |
+                sed '/^=======/d'
+        )
+    done
+
+    bin_output_via_ir=$(
+        msg_on_error --no-stderr "$SOLC" --via-ir --bin "${optimizer_flags[@]}" "$solidity_file" |
+            sed '/^Binary:$/d' |
+            sed '/^=======/d'
+    )
+
+    diff_values "$bin_output_two_stage" "$bin_output_via_ir" --ignore-space-change --ignore-blank-lines
+
+    popd > /dev/null
+    rm -r "$SOLTMPDIR"
+}
+
+printTask "Testing the eqivalence of --via-ir and a two-stage compilation..."
+(
+    externalContracts=(
+        externalTests/solc-js/DAO/TokenCreation.sol
+        libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
+        libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
+        libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol
+        libsolidity/semanticTests/externalContracts/deposit_contract.sol
+        libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+        libsolidity/semanticTests/externalContracts/snark.sol
+    )
+
+    requiresOptimizer=(
+        externalTests/solc-js/DAO/TokenCreation.sol
+        libsolidity/semanticTests/externalContracts/deposit_contract.sol
+        libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+        libsolidity/semanticTests/externalContracts/snark.sol
+    )
+
+    for contractFile in "${externalContracts[@]}"
+    do
+        if ! [[ "${requiresOptimizer[*]}" =~ $contractFile ]]
+        then
+            printTask " - ${contractFile}"
+            test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}"
+        fi
+
+        printTask " - ${contractFile} (optimized)"
+        test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}" --optimize
+    done
+)

From c1df8ed5637b03880459a6b94fa14811f19f34ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 1 Jun 2023 18:44:23 +0200
Subject: [PATCH 1413/1748] cmdlineTests: Remove unnecessary subshells

- Whitespace-only change, separated out to make it easy to diff.
---
 test/cmdlineTests/~assembler_modes/test.sh    | 32 ++++----
 test/cmdlineTests/~ast_import_export/test.sh  | 14 ++--
 test/cmdlineTests/~compilation_tests/test.sh  | 20 +++--
 .../~documentation_examples/test.sh           | 79 ++++++++++---------
 test/cmdlineTests/~linking/test.sh            | 30 ++++---
 test/cmdlineTests/~overwriting_files/test.sh  | 20 ++---
 test/cmdlineTests/~soljson_via_fuzzer/test.sh | 17 ++--
 test/cmdlineTests/~standard_input/test.sh     | 36 ++++-----
 test/cmdlineTests/~unknown_options/test.sh    | 22 +++---
 .../~update_bugs_by_version/test.sh           |  3 +
 test/cmdlineTests/~via_ir_equivalence/test.sh | 54 ++++++-------
 11 files changed, 163 insertions(+), 164 deletions(-)

diff --git a/test/cmdlineTests/~assembler_modes/test.sh b/test/cmdlineTests/~assembler_modes/test.sh
index 099a324440..21947304aa 100755
--- a/test/cmdlineTests/~assembler_modes/test.sh
+++ b/test/cmdlineTests/~assembler_modes/test.sh
@@ -25,22 +25,20 @@ function test_solc_assembly_output
 }
 
 printTask "Testing assemble, yul, strict-assembly and optimize..."
-(
-    echo '{}' | msg_on_error --silent "$SOLC" - --assemble
-    echo '{}' | msg_on_error --silent "$SOLC" - --yul
-    echo '{}' | msg_on_error --silent "$SOLC" - --strict-assembly
+echo '{}' | msg_on_error --silent "$SOLC" - --assemble
+echo '{}' | msg_on_error --silent "$SOLC" - --yul
+echo '{}' | msg_on_error --silent "$SOLC" - --strict-assembly
 
-    # Test options above in conjunction with --optimize.
-    # Using both, --assemble and --optimize should fail.
-    echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null && fail "solc --assemble --optimize did not fail as expected."
-    echo '{}' | "$SOLC" - --yul --optimize &>/dev/null && fail "solc --yul --optimize did not fail as expected."
+# Test options above in conjunction with --optimize.
+# Using both, --assemble and --optimize should fail.
+echo '{}' | "$SOLC" - --assemble --optimize &>/dev/null && fail "solc --assemble --optimize did not fail as expected."
+echo '{}' | "$SOLC" - --yul --optimize &>/dev/null && fail "solc --yul --optimize did not fail as expected."
 
-    # Test yul and strict assembly output
-    # Non-empty code results in non-empty binary representation with optimizations turned off,
-    # while it results in empty binary representation with optimizations turned on.
-    test_solc_assembly_output "{ let x:u256 := 0:u256 }" "{ let x := 0 }" "--yul"
-    test_solc_assembly_output "{ let x:u256 := bitnot(7:u256) }" "{ let x := bitnot(7) }" "--yul"
-    test_solc_assembly_output "{ let t:bool := not(true) }" "{ let t:bool := not(true) }" "--yul"
-    test_solc_assembly_output "{ let x := 0 }" "{ let x := 0 }" "--strict-assembly"
-    test_solc_assembly_output "{ let x := 0 }" "{ { } }" "--strict-assembly --optimize"
-)
+# Test yul and strict assembly output
+# Non-empty code results in non-empty binary representation with optimizations turned off,
+# while it results in empty binary representation with optimizations turned on.
+test_solc_assembly_output "{ let x:u256 := 0:u256 }" "{ let x := 0 }" "--yul"
+test_solc_assembly_output "{ let x:u256 := bitnot(7:u256) }" "{ let x := bitnot(7) }" "--yul"
+test_solc_assembly_output "{ let t:bool := not(true) }" "{ let t:bool := not(true) }" "--yul"
+test_solc_assembly_output "{ let x := 0 }" "{ let x := 0 }" "--strict-assembly"
+test_solc_assembly_output "{ let x := 0 }" "{ { } }" "--strict-assembly --optimize"
diff --git a/test/cmdlineTests/~ast_import_export/test.sh b/test/cmdlineTests/~ast_import_export/test.sh
index d7250ce665..11ef33de89 100755
--- a/test/cmdlineTests/~ast_import_export/test.sh
+++ b/test/cmdlineTests/~ast_import_export/test.sh
@@ -6,12 +6,10 @@ source "${REPO_ROOT}/scripts/common.sh"
 
 printTask "Testing AST import/export..."
 SOLTMPDIR=$(mktemp -d)
-(
-    cd "$SOLTMPDIR"
-    if ! "$REPO_ROOT/scripts/ASTImportTest.sh" ast
-    then
-        rm -r "$SOLTMPDIR"
-        fail
-    fi
-)
+cd "$SOLTMPDIR"
+if ! "$REPO_ROOT/scripts/ASTImportTest.sh" ast
+then
+    rm -r "$SOLTMPDIR"
+    fail
+fi
 rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~compilation_tests/test.sh b/test/cmdlineTests/~compilation_tests/test.sh
index 5793b17c1a..9dc7f9ca8d 100755
--- a/test/cmdlineTests/~compilation_tests/test.sh
+++ b/test/cmdlineTests/~compilation_tests/test.sh
@@ -7,14 +7,12 @@ source "${REPO_ROOT}/scripts/common.sh"
 source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
 printTask "Compiling various other contracts and libraries..."
-(
-    cd "$REPO_ROOT"/test/compilationTests/
-    for dir in */
-    do
-        echo " - $dir"
-        cd "$dir"
-        # shellcheck disable=SC2046 # These file names are not supposed to contain spaces.
-        compileFull --expect-warnings $(find . -name '*.sol')
-        cd ..
-    done
-)
+cd "$REPO_ROOT"/test/compilationTests/
+for dir in */
+do
+    echo " - $dir"
+    cd "$dir"
+    # shellcheck disable=SC2046 # These file names are not supposed to contain spaces.
+    compileFull --expect-warnings $(find . -name '*.sol')
+    cd ..
+done
diff --git a/test/cmdlineTests/~documentation_examples/test.sh b/test/cmdlineTests/~documentation_examples/test.sh
index d3bc8c1b18..8e5984d195 100755
--- a/test/cmdlineTests/~documentation_examples/test.sh
+++ b/test/cmdlineTests/~documentation_examples/test.sh
@@ -8,44 +8,45 @@ source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
 printTask "Compiling all examples from the documentation..."
 SOLTMPDIR=$(mktemp -d)
-(
-    set -e
-    cd "$SOLTMPDIR"
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
-    developmentVersion=$("$REPO_ROOT/scripts/get_version.sh")
-
-    for f in *.yul *.sol
-    do
-        # The contributors guide uses syntax tests, but we cannot
-        # really handle them here.
-        if grep -E 'DeclarationError:|// ----' "$f" >/dev/null
-        then
-            continue
-        fi
-        echo "$f"
-
-        opts=()
-        # We expect errors if explicitly stated, or if imports
-        # are used (in the style guide)
-        if grep -E "// This will not compile" "$f" >/dev/null ||
-            sed -e 's|//.*||g' "$f" | grep -E "import \"" >/dev/null
-        then
-            opts=(--expect-errors)
-        fi
-        if grep "// This will report a warning" "$f" >/dev/null
-        then
-            opts+=(--expect-warnings)
-        fi
-        if grep "// This may report a warning" "$f" >/dev/null
-        then
-            opts+=(--ignore-warnings)
-        fi
-
-        # Disable the version pragma in code snippets that only work with the current development version.
-        # It's necessary because x.y.z won't match `^x.y.z` or `>=x.y.z` pragmas until it's officially released.
-        sed -i.bak -E -e 's/pragma[[:space:]]+solidity[[:space:]]*(\^|>=)[[:space:]]*'"$developmentVersion"'/pragma solidity >0.0.1/' "$f"
-        compileFull "${opts[@]}" "$SOLTMPDIR/$f"
-    done
-)
+
+set -e
+cd "$SOLTMPDIR"
+
+"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
+
+developmentVersion=$("$REPO_ROOT/scripts/get_version.sh")
+
+for f in *.yul *.sol
+do
+    # The contributors guide uses syntax tests, but we cannot
+    # really handle them here.
+    if grep -E 'DeclarationError:|// ----' "$f" >/dev/null
+    then
+        continue
+    fi
+    echo "$f"
+
+    opts=()
+    # We expect errors if explicitly stated, or if imports
+    # are used (in the style guide)
+    if grep -E "// This will not compile" "$f" >/dev/null ||
+        sed -e 's|//.*||g' "$f" | grep -E "import \"" >/dev/null
+    then
+        opts=(--expect-errors)
+    fi
+    if grep "// This will report a warning" "$f" >/dev/null
+    then
+        opts+=(--expect-warnings)
+    fi
+    if grep "// This may report a warning" "$f" >/dev/null
+    then
+        opts+=(--ignore-warnings)
+    fi
+
+    # Disable the version pragma in code snippets that only work with the current development version.
+    # It's necessary because x.y.z won't match `^x.y.z` or `>=x.y.z` pragmas until it's officially released.
+    sed -i.bak -E -e 's/pragma[[:space:]]+solidity[[:space:]]*(\^|>=)[[:space:]]*'"$developmentVersion"'/pragma solidity >0.0.1/' "$f"
+    compileFull "${opts[@]}" "$SOLTMPDIR/$f"
+done
 rm -r "$SOLTMPDIR"
 echo "Done."
diff --git a/test/cmdlineTests/~linking/test.sh b/test/cmdlineTests/~linking/test.sh
index d9b0c867bf..aaa0169efd 100755
--- a/test/cmdlineTests/~linking/test.sh
+++ b/test/cmdlineTests/~linking/test.sh
@@ -6,17 +6,21 @@ source "${REPO_ROOT}/scripts/common.sh"
 
 printTask "Testing linking itself..."
 SOLTMPDIR=$(mktemp -d)
-(
-    cd "$SOLTMPDIR"
-    echo 'library L { function f() public pure {} } contract C { function f() public pure { L.f(); } }' > x.sol
-    msg_on_error --no-stderr "$SOLC" --bin -o . x.sol
-    # Explanation and placeholder should be there
-    grep -q '//' C.bin && grep -q '__' C.bin
-    # But not in library file.
-    grep -q -v '[/_]' L.bin
-    # Now link
-    msg_on_error "$SOLC" --link --libraries x.sol:L=0x90f20564390eAe531E810af625A22f51385Cd222 C.bin
-    # Now the placeholder and explanation should be gone.
-    grep -q -v '[/_]' C.bin
-)
+cd "$SOLTMPDIR"
+
+echo 'library L { function f() public pure {} } contract C { function f() public pure { L.f(); } }' > x.sol
+msg_on_error --no-stderr "$SOLC" --bin -o . x.sol
+
+# Explanation and placeholder should be there
+grep -q '//' C.bin && grep -q '__' C.bin
+
+# But not in library file.
+grep -q -v '[/_]' L.bin
+
+# Now link
+msg_on_error "$SOLC" --link --libraries x.sol:L=0x90f20564390eAe531E810af625A22f51385Cd222 C.bin
+
+# Now the placeholder and explanation should be gone.
+grep -q -v '[/_]' C.bin
+
 rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~overwriting_files/test.sh b/test/cmdlineTests/~overwriting_files/test.sh
index 23599c52f0..afede543cb 100755
--- a/test/cmdlineTests/~overwriting_files/test.sh
+++ b/test/cmdlineTests/~overwriting_files/test.sh
@@ -6,13 +6,15 @@ source "${REPO_ROOT}/scripts/common.sh"
 
 printTask "Testing overwriting files..."
 SOLTMPDIR=$(mktemp -d)
-(
-    # First time it works
-    echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
-    # Second time it fails
-    echo 'contract C {}' | "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create" 2>/dev/null && \
-        fail "solc did not refuse to overwrite $SOLTMPDIR/non-existing-stuff-to-create."
-    # Unless we force
-    echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --overwrite --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
-)
+
+# First time it works
+echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
+
+# Second time it fails
+echo 'contract C {}' | "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create" 2>/dev/null && \
+    fail "solc did not refuse to overwrite $SOLTMPDIR/non-existing-stuff-to-create."
+
+# Unless we force
+echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --overwrite --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
+
 rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~soljson_via_fuzzer/test.sh b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
index 69fa6d84d1..585a540c5d 100755
--- a/test/cmdlineTests/~soljson_via_fuzzer/test.sh
+++ b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
@@ -6,13 +6,14 @@ source "${REPO_ROOT}/scripts/common.sh"
 
 printTask "Testing soljson via the fuzzer..."
 SOLTMPDIR=$(mktemp -d)
-(
-    set -e
-    cd "$SOLTMPDIR"
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
 
-    echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --quiet --input-files
-    echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --without-optimizer --quiet --input-files
-)
+set -e
+cd "$SOLTMPDIR"
+
+"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
+"$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
+
+echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --quiet --input-files
+echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --without-optimizer --quiet --input-files
+
 rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~standard_input/test.sh b/test/cmdlineTests/~standard_input/test.sh
index 03da677374..dde9dfedb1 100755
--- a/test/cmdlineTests/~standard_input/test.sh
+++ b/test/cmdlineTests/~standard_input/test.sh
@@ -6,26 +6,24 @@ source "${REPO_ROOT}/scripts/common.sh"
 
 printTask "Testing standard input..."
 SOLTMPDIR=$(mktemp -d)
-(
-    set +e
-    output=$("$SOLC" --bin 2>&1)
-    result=$?
-    set -e
+set +e
+output=$("$SOLC" --bin 2>&1)
+result=$?
+set -e
 
-    # This should fail
-    if [[ ! ("$output" =~ "No input files given") || ($result == 0) ]]
-    then
-        fail "Incorrect response to empty input arg list: $output"
-    fi
+# This should fail
+if [[ ! ("$output" =~ "No input files given") || ($result == 0) ]]
+then
+    fail "Incorrect response to empty input arg list: $output"
+fi
 
-    # The contract should be compiled
-    if ! echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin | grep -q "<stdin>:C"
-    then
-        fail "Failed to compile a simple contract from standard input"
-    fi
+# The contract should be compiled
+if ! echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin | grep -q "<stdin>:C"
+then
+    fail "Failed to compile a simple contract from standard input"
+fi
 
-    # This should not fail
-    echo '' | msg_on_error --silent --msg "Incorrect response to --ast-compact-json option with empty stdin" \
-        "$SOLC" --ast-compact-json -
-)
+# This should not fail
+echo '' | msg_on_error --silent --msg "Incorrect response to --ast-compact-json option with empty stdin" \
+    "$SOLC" --ast-compact-json -
 rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~unknown_options/test.sh b/test/cmdlineTests/~unknown_options/test.sh
index dde9fc9c14..b0f25b2cfb 100755
--- a/test/cmdlineTests/~unknown_options/test.sh
+++ b/test/cmdlineTests/~unknown_options/test.sh
@@ -5,16 +5,14 @@ set -euo pipefail
 source "${REPO_ROOT}/scripts/common.sh"
 
 printTask "Testing unknown options..."
-(
-    set +e
-    output=$("$SOLC" --allow=test 2>&1)
-    failed=$?
-    set -e
+set +e
+output=$("$SOLC" --allow=test 2>&1)
+failed=$?
+set -e
 
-    if [ "$output" == "unrecognised option '--allow=test'" ] && [ $failed -ne 0 ]
-    then
-        echo "Passed"
-    else
-        fail "Incorrect response to unknown options: $output"
-    fi
-)
+if [ "$output" == "unrecognised option '--allow=test'" ] && [ $failed -ne 0 ]
+then
+    echo "Passed"
+else
+    fail "Incorrect response to unknown options: $output"
+fi
diff --git a/test/cmdlineTests/~update_bugs_by_version/test.sh b/test/cmdlineTests/~update_bugs_by_version/test.sh
index fdeafd5a74..78fa8a80f0 100755
--- a/test/cmdlineTests/~update_bugs_by_version/test.sh
+++ b/test/cmdlineTests/~update_bugs_by_version/test.sh
@@ -6,8 +6,11 @@ source "${REPO_ROOT}/scripts/common.sh"
 
 SOLTMPDIR=$(mktemp -d)
 printTask "Checking that the bug list is up to date..."
+
 cp "${REPO_ROOT}/docs/bugs_by_version.json" "${SOLTMPDIR}/original_bugs_by_version.json"
 "${REPO_ROOT}/scripts/update_bugs_by_version.py"
+
 diff --unified "${SOLTMPDIR}/original_bugs_by_version.json" "${REPO_ROOT}/docs/bugs_by_version.json" || \
     fail "The bug list in bugs_by_version.json was out of date and has been updated. Please investigate and submit a bugfix if necessary."
+
 rm -r "$SOLTMPDIR"
diff --git a/test/cmdlineTests/~via_ir_equivalence/test.sh b/test/cmdlineTests/~via_ir_equivalence/test.sh
index 9a3030d1d2..65cdf7fe2d 100755
--- a/test/cmdlineTests/~via_ir_equivalence/test.sh
+++ b/test/cmdlineTests/~via_ir_equivalence/test.sh
@@ -66,33 +66,31 @@ function test_via_ir_equivalence()
 }
 
 printTask "Testing the eqivalence of --via-ir and a two-stage compilation..."
-(
-    externalContracts=(
-        externalTests/solc-js/DAO/TokenCreation.sol
-        libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
-        libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
-        libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol
-        libsolidity/semanticTests/externalContracts/deposit_contract.sol
-        libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
-        libsolidity/semanticTests/externalContracts/snark.sol
-    )
-
-    requiresOptimizer=(
-        externalTests/solc-js/DAO/TokenCreation.sol
-        libsolidity/semanticTests/externalContracts/deposit_contract.sol
-        libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
-        libsolidity/semanticTests/externalContracts/snark.sol
-    )
-
-    for contractFile in "${externalContracts[@]}"
-    do
-        if ! [[ "${requiresOptimizer[*]}" =~ $contractFile ]]
-        then
-            printTask " - ${contractFile}"
-            test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}"
-        fi
+externalContracts=(
+    externalTests/solc-js/DAO/TokenCreation.sol
+    libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
+    libsolidity/semanticTests/externalContracts/_prbmath/PRBMathUD60x18.sol
+    libsolidity/semanticTests/externalContracts/_stringutils/stringutils.sol
+    libsolidity/semanticTests/externalContracts/deposit_contract.sol
+    libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+    libsolidity/semanticTests/externalContracts/snark.sol
+)
 
-        printTask " - ${contractFile} (optimized)"
-        test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}" --optimize
-    done
+requiresOptimizer=(
+    externalTests/solc-js/DAO/TokenCreation.sol
+    libsolidity/semanticTests/externalContracts/deposit_contract.sol
+    libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+    libsolidity/semanticTests/externalContracts/snark.sol
 )
+
+for contractFile in "${externalContracts[@]}"
+do
+    if ! [[ "${requiresOptimizer[*]}" =~ $contractFile ]]
+    then
+        printTask " - ${contractFile}"
+        test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}"
+    fi
+
+    printTask " - ${contractFile} (optimized)"
+    test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}" --optimize
+done

From 00c2f511d3fd57fa16cccf56789942617ff8fcca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 1 Jun 2023 20:10:42 +0200
Subject: [PATCH 1414/1748] cmdlineTests: Remove superfluous output from
 script-based tests and adjust the rest

---
 test/cmdlineTests/~assembler_modes/test.sh                 | 1 -
 .../~ast_export_with_stop_after_parsing/test.sh            | 1 -
 test/cmdlineTests/~ast_import_export/test.sh               | 1 -
 test/cmdlineTests/~compilation_tests/test.sh               | 3 +--
 test/cmdlineTests/~documentation_examples/test.sh          | 4 +---
 test/cmdlineTests/~library_checksum/test.sh                | 1 -
 test/cmdlineTests/~library_long_names/test.sh              | 1 -
 test/cmdlineTests/~linking/test.sh                         | 2 +-
 test/cmdlineTests/~overwriting_files/test.sh               | 1 -
 test/cmdlineTests/~soljson_via_fuzzer/test.sh              | 1 -
 test/cmdlineTests/~standard_input/test.sh                  | 1 -
 test/cmdlineTests/~unknown_options/test.sh                 | 5 +----
 test/cmdlineTests/~update_bugs_by_version/test.sh          | 1 -
 test/cmdlineTests/~via_ir_equivalence/test.sh              | 7 +++----
 14 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/test/cmdlineTests/~assembler_modes/test.sh b/test/cmdlineTests/~assembler_modes/test.sh
index 21947304aa..34e8993286 100755
--- a/test/cmdlineTests/~assembler_modes/test.sh
+++ b/test/cmdlineTests/~assembler_modes/test.sh
@@ -24,7 +24,6 @@ function test_solc_assembly_output
     fi
 }
 
-printTask "Testing assemble, yul, strict-assembly and optimize..."
 echo '{}' | msg_on_error --silent "$SOLC" - --assemble
 echo '{}' | msg_on_error --silent "$SOLC" - --yul
 echo '{}' | msg_on_error --silent "$SOLC" - --strict-assembly
diff --git a/test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh b/test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh
index d023d13e05..e6a69d28b2 100755
--- a/test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh
+++ b/test/cmdlineTests/~ast_export_with_stop_after_parsing/test.sh
@@ -4,5 +4,4 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-printTask "Testing AST export with stop-after=parsing..."
 "$REPO_ROOT/test/stopAfterParseTests.sh"
diff --git a/test/cmdlineTests/~ast_import_export/test.sh b/test/cmdlineTests/~ast_import_export/test.sh
index 11ef33de89..d85d55b964 100755
--- a/test/cmdlineTests/~ast_import_export/test.sh
+++ b/test/cmdlineTests/~ast_import_export/test.sh
@@ -4,7 +4,6 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-printTask "Testing AST import/export..."
 SOLTMPDIR=$(mktemp -d)
 cd "$SOLTMPDIR"
 if ! "$REPO_ROOT/scripts/ASTImportTest.sh" ast
diff --git a/test/cmdlineTests/~compilation_tests/test.sh b/test/cmdlineTests/~compilation_tests/test.sh
index 9dc7f9ca8d..d411c5ce85 100755
--- a/test/cmdlineTests/~compilation_tests/test.sh
+++ b/test/cmdlineTests/~compilation_tests/test.sh
@@ -6,11 +6,10 @@ source "${REPO_ROOT}/scripts/common.sh"
 # shellcheck source=scripts/common_cmdline.sh
 source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
-printTask "Compiling various other contracts and libraries..."
 cd "$REPO_ROOT"/test/compilationTests/
 for dir in */
 do
-    echo " - $dir"
+    echo "    - $dir"
     cd "$dir"
     # shellcheck disable=SC2046 # These file names are not supposed to contain spaces.
     compileFull --expect-warnings $(find . -name '*.sol')
diff --git a/test/cmdlineTests/~documentation_examples/test.sh b/test/cmdlineTests/~documentation_examples/test.sh
index 8e5984d195..4d90acaf44 100755
--- a/test/cmdlineTests/~documentation_examples/test.sh
+++ b/test/cmdlineTests/~documentation_examples/test.sh
@@ -6,7 +6,6 @@ source "${REPO_ROOT}/scripts/common.sh"
 # shellcheck source=scripts/common_cmdline.sh
 source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
-printTask "Compiling all examples from the documentation..."
 SOLTMPDIR=$(mktemp -d)
 
 set -e
@@ -24,7 +23,7 @@ do
     then
         continue
     fi
-    echo "$f"
+    echo "    - Compiling example $f"
 
     opts=()
     # We expect errors if explicitly stated, or if imports
@@ -49,4 +48,3 @@ do
     compileFull "${opts[@]}" "$SOLTMPDIR/$f"
 done
 rm -r "$SOLTMPDIR"
-echo "Done."
diff --git a/test/cmdlineTests/~library_checksum/test.sh b/test/cmdlineTests/~library_checksum/test.sh
index c6d52fa452..bb5fbf51de 100755
--- a/test/cmdlineTests/~library_checksum/test.sh
+++ b/test/cmdlineTests/~library_checksum/test.sh
@@ -4,7 +4,6 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-printTask "Testing library checksum..."
 echo '' | msg_on_error --no-stdout "$SOLC" - --link --libraries a=0x90f20564390eAe531E810af625A22f51385Cd222
 echo '' | "$SOLC" - --link --libraries a=0x80f20564390eAe531E810af625A22f51385Cd222 &>/dev/null && \
     fail "solc --link did not reject a library address with an invalid checksum."
diff --git a/test/cmdlineTests/~library_long_names/test.sh b/test/cmdlineTests/~library_long_names/test.sh
index 59f179232a..ad3008cdd5 100755
--- a/test/cmdlineTests/~library_long_names/test.sh
+++ b/test/cmdlineTests/~library_long_names/test.sh
@@ -4,5 +4,4 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-printTask "Testing long library names..."
 echo '' | msg_on_error --no-stdout "$SOLC" - --link --libraries aveeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeerylonglibraryname=0x90f20564390eAe531E810af625A22f51385Cd222
diff --git a/test/cmdlineTests/~linking/test.sh b/test/cmdlineTests/~linking/test.sh
index aaa0169efd..a87dccdcca 100755
--- a/test/cmdlineTests/~linking/test.sh
+++ b/test/cmdlineTests/~linking/test.sh
@@ -4,7 +4,6 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-printTask "Testing linking itself..."
 SOLTMPDIR=$(mktemp -d)
 cd "$SOLTMPDIR"
 
@@ -18,6 +17,7 @@ grep -q '//' C.bin && grep -q '__' C.bin
 grep -q -v '[/_]' L.bin
 
 # Now link
+printf "    "
 msg_on_error "$SOLC" --link --libraries x.sol:L=0x90f20564390eAe531E810af625A22f51385Cd222 C.bin
 
 # Now the placeholder and explanation should be gone.
diff --git a/test/cmdlineTests/~overwriting_files/test.sh b/test/cmdlineTests/~overwriting_files/test.sh
index afede543cb..0fba60e06e 100755
--- a/test/cmdlineTests/~overwriting_files/test.sh
+++ b/test/cmdlineTests/~overwriting_files/test.sh
@@ -4,7 +4,6 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-printTask "Testing overwriting files..."
 SOLTMPDIR=$(mktemp -d)
 
 # First time it works
diff --git a/test/cmdlineTests/~soljson_via_fuzzer/test.sh b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
index 585a540c5d..ae52a8bc36 100755
--- a/test/cmdlineTests/~soljson_via_fuzzer/test.sh
+++ b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
@@ -4,7 +4,6 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-printTask "Testing soljson via the fuzzer..."
 SOLTMPDIR=$(mktemp -d)
 
 set -e
diff --git a/test/cmdlineTests/~standard_input/test.sh b/test/cmdlineTests/~standard_input/test.sh
index dde9dfedb1..243e74a710 100755
--- a/test/cmdlineTests/~standard_input/test.sh
+++ b/test/cmdlineTests/~standard_input/test.sh
@@ -4,7 +4,6 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-printTask "Testing standard input..."
 SOLTMPDIR=$(mktemp -d)
 set +e
 output=$("$SOLC" --bin 2>&1)
diff --git a/test/cmdlineTests/~unknown_options/test.sh b/test/cmdlineTests/~unknown_options/test.sh
index b0f25b2cfb..923a36be60 100755
--- a/test/cmdlineTests/~unknown_options/test.sh
+++ b/test/cmdlineTests/~unknown_options/test.sh
@@ -4,15 +4,12 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-printTask "Testing unknown options..."
 set +e
 output=$("$SOLC" --allow=test 2>&1)
 failed=$?
 set -e
 
-if [ "$output" == "unrecognised option '--allow=test'" ] && [ $failed -ne 0 ]
+if [[ $output != "unrecognised option '--allow=test'" ]] || (( failed == 0 ))
 then
-    echo "Passed"
-else
     fail "Incorrect response to unknown options: $output"
 fi
diff --git a/test/cmdlineTests/~update_bugs_by_version/test.sh b/test/cmdlineTests/~update_bugs_by_version/test.sh
index 78fa8a80f0..9d07f4c176 100755
--- a/test/cmdlineTests/~update_bugs_by_version/test.sh
+++ b/test/cmdlineTests/~update_bugs_by_version/test.sh
@@ -5,7 +5,6 @@ set -euo pipefail
 source "${REPO_ROOT}/scripts/common.sh"
 
 SOLTMPDIR=$(mktemp -d)
-printTask "Checking that the bug list is up to date..."
 
 cp "${REPO_ROOT}/docs/bugs_by_version.json" "${SOLTMPDIR}/original_bugs_by_version.json"
 "${REPO_ROOT}/scripts/update_bugs_by_version.py"
diff --git a/test/cmdlineTests/~via_ir_equivalence/test.sh b/test/cmdlineTests/~via_ir_equivalence/test.sh
index 65cdf7fe2d..24c784bb83 100755
--- a/test/cmdlineTests/~via_ir_equivalence/test.sh
+++ b/test/cmdlineTests/~via_ir_equivalence/test.sh
@@ -15,7 +15,7 @@ function test_via_ir_equivalence()
     [[ $optimize_flag == --optimize || $optimize_flag == "" ]] || assertFail "The second argument must be --optimize if present."
 
     local output_file_prefix
-    output_file_prefix=$(basename "$1" .sol)
+    output_file_prefix=$(basename "$solidity_file" .sol)
 
     local optimizer_flags=()
     [[ $optimize_flag == "" ]] || optimizer_flags+=("$optimize_flag")
@@ -65,7 +65,6 @@ function test_via_ir_equivalence()
     rm -r "$SOLTMPDIR"
 }
 
-printTask "Testing the eqivalence of --via-ir and a two-stage compilation..."
 externalContracts=(
     externalTests/solc-js/DAO/TokenCreation.sol
     libsolidity/semanticTests/externalContracts/_prbmath/PRBMathSD59x18.sol
@@ -87,10 +86,10 @@ for contractFile in "${externalContracts[@]}"
 do
     if ! [[ "${requiresOptimizer[*]}" =~ $contractFile ]]
     then
-        printTask " - ${contractFile}"
+        printTask "    - ${contractFile}"
         test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}"
     fi
 
-    printTask " - ${contractFile} (optimized)"
+    printTask "    - ${contractFile} (optimized)"
     test_via_ir_equivalence "${REPO_ROOT}/test/${contractFile}" --optimize
 done

From 5c5f8e8dad9024de15e091bd5639eabb48648c3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 1 Jun 2023 20:13:35 +0200
Subject: [PATCH 1415/1748] cmdlineTests: Remove superfluous set and temporary
 dirs

---
 test/cmdlineTests/~documentation_examples/test.sh | 2 --
 test/cmdlineTests/~soljson_via_fuzzer/test.sh     | 2 --
 test/cmdlineTests/~standard_input/test.sh         | 2 --
 3 files changed, 6 deletions(-)

diff --git a/test/cmdlineTests/~documentation_examples/test.sh b/test/cmdlineTests/~documentation_examples/test.sh
index 4d90acaf44..7d7b7fa7d3 100755
--- a/test/cmdlineTests/~documentation_examples/test.sh
+++ b/test/cmdlineTests/~documentation_examples/test.sh
@@ -7,8 +7,6 @@ source "${REPO_ROOT}/scripts/common.sh"
 source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
 SOLTMPDIR=$(mktemp -d)
-
-set -e
 cd "$SOLTMPDIR"
 
 "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
diff --git a/test/cmdlineTests/~soljson_via_fuzzer/test.sh b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
index ae52a8bc36..42410947f0 100755
--- a/test/cmdlineTests/~soljson_via_fuzzer/test.sh
+++ b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
@@ -5,8 +5,6 @@ set -euo pipefail
 source "${REPO_ROOT}/scripts/common.sh"
 
 SOLTMPDIR=$(mktemp -d)
-
-set -e
 cd "$SOLTMPDIR"
 
 "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
diff --git a/test/cmdlineTests/~standard_input/test.sh b/test/cmdlineTests/~standard_input/test.sh
index 243e74a710..4aab34be1f 100755
--- a/test/cmdlineTests/~standard_input/test.sh
+++ b/test/cmdlineTests/~standard_input/test.sh
@@ -4,7 +4,6 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-SOLTMPDIR=$(mktemp -d)
 set +e
 output=$("$SOLC" --bin 2>&1)
 result=$?
@@ -25,4 +24,3 @@ fi
 # This should not fail
 echo '' | msg_on_error --silent --msg "Incorrect response to --ast-compact-json option with empty stdin" \
     "$SOLC" --ast-compact-json -
-rm -r "$SOLTMPDIR"

From f397b9a083e77306da6369ae10e5991883449c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 1 Jun 2023 18:51:42 +0200
Subject: [PATCH 1416/1748] cmdlineTests: Add prefixes for temporary files/dirs

---
 test/cmdlineTests.sh                              | 4 ++--
 test/cmdlineTests/~ast_import_export/test.sh      | 2 +-
 test/cmdlineTests/~documentation_examples/test.sh | 2 +-
 test/cmdlineTests/~linking/test.sh                | 2 +-
 test/cmdlineTests/~overwriting_files/test.sh      | 2 +-
 test/cmdlineTests/~soljson_via_fuzzer/test.sh     | 2 +-
 test/cmdlineTests/~update_bugs_by_version/test.sh | 2 +-
 test/cmdlineTests/~via_ir_equivalence/test.sh     | 6 +++---
 test/stopAfterParseTests.sh                       | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index fb346f71d1..0731fc5b2c 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -174,8 +174,8 @@ function test_solc_behaviour
     local stderr_expected="${7}"
     local stdout_expectation_file="${8}" # the file to write to when user chooses to update stdout expectation
     local stderr_expectation_file="${9}" # the file to write to when user chooses to update stderr expectation
-    local stdout_path; stdout_path=$(mktemp)
-    local stderr_path; stderr_path=$(mktemp)
+    local stdout_path; stdout_path=$(mktemp -t "cmdline-test-stdout-XXXXXX")
+    local stderr_path; stderr_path=$(mktemp -t "cmdline-test-stderr-XXXXXX")
 
     # shellcheck disable=SC2064
     trap "rm -f $stdout_path $stderr_path" EXIT
diff --git a/test/cmdlineTests/~ast_import_export/test.sh b/test/cmdlineTests/~ast_import_export/test.sh
index d85d55b964..ff3ab88113 100755
--- a/test/cmdlineTests/~ast_import_export/test.sh
+++ b/test/cmdlineTests/~ast_import_export/test.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-SOLTMPDIR=$(mktemp -d)
+SOLTMPDIR=$(mktemp -d -t "cmdline-test-ast-import-export-XXXXXX")
 cd "$SOLTMPDIR"
 if ! "$REPO_ROOT/scripts/ASTImportTest.sh" ast
 then
diff --git a/test/cmdlineTests/~documentation_examples/test.sh b/test/cmdlineTests/~documentation_examples/test.sh
index 7d7b7fa7d3..1acf5e8a7a 100755
--- a/test/cmdlineTests/~documentation_examples/test.sh
+++ b/test/cmdlineTests/~documentation_examples/test.sh
@@ -6,7 +6,7 @@ source "${REPO_ROOT}/scripts/common.sh"
 # shellcheck source=scripts/common_cmdline.sh
 source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
-SOLTMPDIR=$(mktemp -d)
+SOLTMPDIR=$(mktemp -d -t "cmdline-test-docs-examples-XXXXXX")
 cd "$SOLTMPDIR"
 
 "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
diff --git a/test/cmdlineTests/~linking/test.sh b/test/cmdlineTests/~linking/test.sh
index a87dccdcca..ad7d9e1736 100755
--- a/test/cmdlineTests/~linking/test.sh
+++ b/test/cmdlineTests/~linking/test.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-SOLTMPDIR=$(mktemp -d)
+SOLTMPDIR=$(mktemp -d -t "cmdline-test-linking-XXXXXX")
 cd "$SOLTMPDIR"
 
 echo 'library L { function f() public pure {} } contract C { function f() public pure { L.f(); } }' > x.sol
diff --git a/test/cmdlineTests/~overwriting_files/test.sh b/test/cmdlineTests/~overwriting_files/test.sh
index 0fba60e06e..acb8a7aca2 100755
--- a/test/cmdlineTests/~overwriting_files/test.sh
+++ b/test/cmdlineTests/~overwriting_files/test.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-SOLTMPDIR=$(mktemp -d)
+SOLTMPDIR=$(mktemp -d -t "cmdline-test-overwriting-files-XXXXXX")
 
 # First time it works
 echo 'contract C {}' | msg_on_error --no-stderr "$SOLC" - --bin -o "$SOLTMPDIR/non-existing-stuff-to-create"
diff --git a/test/cmdlineTests/~soljson_via_fuzzer/test.sh b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
index 42410947f0..2d2312fd15 100755
--- a/test/cmdlineTests/~soljson_via_fuzzer/test.sh
+++ b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-SOLTMPDIR=$(mktemp -d)
+SOLTMPDIR=$(mktemp -d -t "cmdline-test-soljson-via-fuzzer-XXXXXX")
 cd "$SOLTMPDIR"
 
 "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
diff --git a/test/cmdlineTests/~update_bugs_by_version/test.sh b/test/cmdlineTests/~update_bugs_by_version/test.sh
index 9d07f4c176..6ec1d069bc 100755
--- a/test/cmdlineTests/~update_bugs_by_version/test.sh
+++ b/test/cmdlineTests/~update_bugs_by_version/test.sh
@@ -4,7 +4,7 @@ set -euo pipefail
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
 
-SOLTMPDIR=$(mktemp -d)
+SOLTMPDIR=$(mktemp -d -t "cmdline-test-update-bugs-by-version-XXXXXX")
 
 cp "${REPO_ROOT}/docs/bugs_by_version.json" "${SOLTMPDIR}/original_bugs_by_version.json"
 "${REPO_ROOT}/scripts/update_bugs_by_version.py"
diff --git a/test/cmdlineTests/~via_ir_equivalence/test.sh b/test/cmdlineTests/~via_ir_equivalence/test.sh
index 24c784bb83..4da72d1518 100755
--- a/test/cmdlineTests/~via_ir_equivalence/test.sh
+++ b/test/cmdlineTests/~via_ir_equivalence/test.sh
@@ -6,9 +6,6 @@ source "${REPO_ROOT}/scripts/common.sh"
 
 function test_via_ir_equivalence()
 {
-    SOLTMPDIR=$(mktemp -d)
-    pushd "$SOLTMPDIR" > /dev/null
-
     (( $# <= 2 )) || fail "This function accepts at most two arguments."
     local solidity_file="$1"
     local optimize_flag="$2"
@@ -17,6 +14,9 @@ function test_via_ir_equivalence()
     local output_file_prefix
     output_file_prefix=$(basename "$solidity_file" .sol)
 
+    SOLTMPDIR=$(mktemp -d -t "cmdline-test-via-ir-equivalence-${output_file_prefix}-XXXXXX")
+    pushd "$SOLTMPDIR" > /dev/null
+
     local optimizer_flags=()
     [[ $optimize_flag == "" ]] || optimizer_flags+=("$optimize_flag")
     [[ $optimize_flag == "" ]] || output_file_prefix+="_optimize"
diff --git a/test/stopAfterParseTests.sh b/test/stopAfterParseTests.sh
index 503c435792..7d74704c5e 100755
--- a/test/stopAfterParseTests.sh
+++ b/test/stopAfterParseTests.sh
@@ -11,7 +11,7 @@ SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
 SOLC=${SOLIDITY_BUILD_DIR}/solc/solc
 SPLITSOURCES=${REPO_ROOT}/scripts/splitSources.py
 
-FILETMP=$(mktemp -d)
+FILETMP=$(mktemp -d -t "stop-after-parse-tests-XXXXXX")
 cd "$FILETMP" || exit 1
 
 

From 0e48e1251deaca25e3366bd2ecb24e52f7b9a3e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 2 Jun 2023 16:07:28 +0200
Subject: [PATCH 1417/1748] Document the command-line tests

---
 docs/contributing.rst | 54 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 00e0decb60..02ca00455b 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -269,6 +269,60 @@ and re-run the test. It now passes again:
     Do not put more than one contract into a single file, unless you are testing inheritance or cross-contract calls.
     Each file should test one aspect of your new feature.
 
+Command-line Tests
+------------------
+
+Our suite of end-to-end command-line tests checks the behaviour of the compiler binary as a whole
+in various scenarios.
+These tests are located in `test/cmdlineTests/ <https://github.com/ethereum/solidity/tree/develop/test/cmdlineTests>`_,
+one per subdirectory, and can be executed using the ``cmdlineTests.sh`` script.
+
+By default the script runs all available tests.
+You can also provide one or more `file name patterns <https://www.gnu.org/software/bash/manual/bash.html#Filename-Expansion>`_,
+in which case only the tests matching at least one pattern will be executed.
+
+By default the script assumes that a ``solc`` binary is available inside the ``build/`` subdirectory
+inside the working copy.
+If you build the compiler outside of the source tree, you can use the ``SOLIDITY_BUILD_DIR`` environment
+variable to specify a different location for the build directory.
+
+Example:
+
+.. code-block:: bash
+
+    export SOLIDITY_BUILD_DIR=~/solidity/build/
+    test/cmdlineTests.sh "standard_*" "*_yul_*"
+
+The commands above will run tests from directories starting with ``test/cmdlineTests/standard_`` and
+subdirectories of ``test/cmdlineTests/`` that have ``_yul_`` somewhere in the name.
+It will also assume that the file ``solidity/build/solc/solc`` inside your home directory is the
+compiler binary (unless you are on Windows -- then ``solidity/build/solc/Release/solc.exe``).
+
+There are several kinds of command-line tests:
+
+- *Standard JSON test*: contains at least an ``input.json`` file.
+  In general may contain:
+
+    - ``input.json``: input file to be passed to the ``--standard-json`` option on the command line.
+    - ``output.json``: expected Standard JSON output.
+    - ``args``: extra command-line arguments passed to ``solc``.
+
+- *CLI test*: contains at least an ``input.*`` file (other than ``input.json``).
+  In general may contain:
+
+    - ``input.*``: a single input file, whose name will be supplied to ``solc`` on the command line.
+      Usually ``input.sol`` or ``input.yul``.
+    - ``args``: extra command-line arguments passed to ``solc``.
+    - ``stdin``: content to be passed to ``solc`` via standard input.
+    - ``output``: expected content of the standard output.
+    - ``err``: expected content of the standard error output.
+    - ``exit``: expected exit code. If not provided, zero is expected.
+
+- *Script test*: contains a ``test.*`` file.
+  In general may contain:
+
+    - ``test.*``: a single script to run, usually ``test.sh`` or ``test.py``.
+      The script must be executable.
 
 Running the Fuzzer via AFL
 ==========================

From f15b82643193ce05e41c0e602bb8cfbcb140f857 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Thu, 23 Feb 2023 19:22:46 +0100
Subject: [PATCH 1418/1748] Add optional bounds to unroll loops in BMC model
 checker

---
 Changelog.md                                  |   1 +
 libsolidity/formal/BMC.cpp                    | 253 ++++++++++++------
 libsolidity/formal/BMC.h                      |  22 +-
 libsolidity/formal/ModelCheckerSettings.h     |   2 +
 libsolidity/formal/SMTEncoder.h               |   2 +
 libsolidity/interface/StandardCompiler.cpp    |  12 +-
 solc/CommandLineParser.cpp                    |  21 +-
 .../model_checker_bmc_loop_iterations/args    |   1 +
 .../model_checker_bmc_loop_iterations/err     |  11 +
 .../input.sol                                 |  12 +
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../input.sol                                 |   0
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../input.sol                                 |   0
 .../input.json                                |  29 ++
 .../output.json                               |  22 ++
 .../input.json                                |  29 ++
 .../output.json                               |  12 +
 test/libsolidity/SMTCheckerTest.cpp           |   3 +
 test/libsolidity/SMTCheckerTest.h             |   2 +
 .../functions_trivial_condition_for.sol       |   8 -
 .../functions_trivial_condition_while.sol     |   8 -
 ...e_1_false_positives.sol => do_while_1.sol} |   0
 .../loops/do_while_bmc_iterations_1.sol       |  16 ++
 .../loops/do_while_bmc_iterations_2.sol       |  20 ++
 .../loops/do_while_bmc_iterations_3.sol       |  18 ++
 .../loops/do_while_bmc_iterations_4.sol       |  15 ++
 .../loops/do_while_bmc_iterations_5.sol       |  22 ++
 ...while_bmc_iterations_assertion_fails_1.sol |  17 ++
 ...while_bmc_iterations_assertion_fails_2.sol |  19 ++
 ...while_bmc_iterations_assertion_fails_3.sol |  17 ++
 .../loops/do_while_bmc_iterations_break_1.sol |  17 ++
 .../loops/do_while_bmc_iterations_break_2.sol |  17 ++
 .../loops/do_while_bmc_iterations_break_3.sol |  19 ++
 .../loops/do_while_bmc_iterations_break_4.sol |  19 ++
 .../loops/do_while_bmc_iterations_break_5.sol |  19 ++
 .../loops/do_while_bmc_iterations_break_6.sol |  23 ++
 .../loops/do_while_bmc_iterations_break_7.sol |  23 ++
 .../loops/do_while_bmc_iterations_break_8.sol |  17 ++
 ..._while_bmc_iterations_break_continue_1.sol |  21 ++
 ..._while_bmc_iterations_break_continue_2.sol |  22 ++
 .../do_while_bmc_iterations_continue_1.sol    |  19 ++
 .../do_while_bmc_iterations_continue_2.sol    |  25 ++
 .../do_while_bmc_iterations_continue_3.sol    |  24 ++
 .../do_while_bmc_iterations_continue_4.sol    |  25 ++
 .../loops/do_while_bmc_iterations_nested.sol  |  22 ++
 .../do_while_bmc_iterations_nested_break.sol  |  24 ++
 ...o_while_bmc_iterations_nested_continue.sol |  24 ++
 .../do_while_bmc_iterations_semantics_1.sol   |  20 ++
 .../do_while_bmc_iterations_semantics_2.sol   |  20 ++
 .../do_while_bmc_iterations_semantics_3.sol   |  20 ++
 ...do_while_bmc_iterations_shallow_unroll.sol |  19 ++
 .../smtCheckerTests/loops/for_1_fail.sol      |  19 --
 .../loops/for_1_false_positive.sol            |   2 +-
 .../loops/for_loop_bmc_iterations_1.sol       |  15 ++
 .../loops/for_loop_bmc_iterations_2.sol       |  15 ++
 .../loops/for_loop_bmc_iterations_3.sol       |  16 ++
 .../loops/for_loop_bmc_iterations_4.sol       |  15 ++
 .../loops/for_loop_bmc_iterations_5.sol       |  14 +
 .../loops/for_loop_bmc_iterations_6.sol       |  16 ++
 .../loops/for_loop_bmc_iterations_7.sol       |  23 ++
 .../loops/for_loop_bmc_iterations_8.sol       |  31 +++
 ..._loop_bmc_iterations_assertion_fails_1.sol |  16 ++
 ..._loop_bmc_iterations_assertion_fails_2.sol |  19 ++
 ..._loop_bmc_iterations_assertion_fails_3.sol |  17 ++
 .../loops/for_loop_bmc_iterations_break_1.sol |  19 ++
 .../loops/for_loop_bmc_iterations_break_2.sol |  18 ++
 .../loops/for_loop_bmc_iterations_break_3.sol |  18 ++
 .../loops/for_loop_bmc_iterations_break_4.sol |  18 ++
 .../loops/for_loop_bmc_iterations_break_5.sol |  23 ++
 .../loops/for_loop_bmc_iterations_break_6.sol |  23 ++
 .../loops/for_loop_bmc_iterations_break_7.sol |  17 ++
 .../loops/for_loop_bmc_iterations_break_8.sol |  18 ++
 .../loops/for_loop_bmc_iterations_break_9.sol |  17 ++
 ...r_loop_bmc_iterations_break_continue_1.sol |  22 ++
 ...r_loop_bmc_iterations_break_continue_2.sol |  23 ++
 ...r_loop_bmc_iterations_break_continue_3.sol |  22 ++
 .../for_loop_bmc_iterations_continue_1.sol    |  18 ++
 .../for_loop_bmc_iterations_continue_2.sol    |  23 ++
 .../for_loop_bmc_iterations_continue_3.sol    |  24 ++
 .../for_loop_bmc_iterations_continue_4.sol    |  24 ++
 .../for_loop_bmc_iterations_continue_5.sol    |  17 ++
 ...for_loop_bmc_iterations_false_positive.sol |  16 ++
 .../loops/for_loop_bmc_iterations_nested.sol  |  17 ++
 .../for_loop_bmc_iterations_nested_break.sol  |  22 ++
 ...or_loop_bmc_iterations_nested_continue.sol |  20 ++
 .../for_loop_bmc_iterations_semantics_1.sol   |  19 ++
 .../for_loop_bmc_iterations_semantics_2.sol   |  19 ++
 .../for_loop_bmc_iterations_semantics_3.sol   |  19 ++
 ...for_loop_bmc_iterations_shallow_unroll.sol |  17 ++
 .../loops/for_loop_trivial_condition_1.sol    |   1 -
 .../loops/for_loop_trivial_condition_2.sol    |   1 -
 .../loops/for_loop_unreachable_1.sol          |  13 -
 .../loops/while_bmc_iterations_1.sol          |  18 ++
 .../loops/while_bmc_iterations_2.sol          |  19 ++
 .../loops/while_bmc_iterations_3.sol          |  17 ++
 .../loops/while_bmc_iterations_4.sol          |  15 ++
 .../loops/while_bmc_iterations_5.sol          |  15 ++
 .../loops/while_bmc_iterations_7.sol          |  22 ++
 ...while_bmc_iterations_assertion_fails_1.sol |  17 ++
 ...while_bmc_iterations_assertion_fails_2.sol |  18 ++
 ...while_bmc_iterations_assertion_fails_3.sol |  17 ++
 .../loops/while_bmc_iterations_break_1.sol    |  16 ++
 .../loops/while_bmc_iterations_break_2.sol    |  17 ++
 .../loops/while_bmc_iterations_break_3.sol    |  19 ++
 .../loops/while_bmc_iterations_break_4.sol    |  19 ++
 .../loops/while_bmc_iterations_break_5.sol    |  19 ++
 .../loops/while_bmc_iterations_break_6.sol    |  23 ++
 .../loops/while_bmc_iterations_break_7.sol    |  23 ++
 .../loops/while_bmc_iterations_break_8.sol    |  19 ++
 .../loops/while_bmc_iterations_break_9.sol    |  18 ++
 .../while_bmc_iterations_break_continue_1.sol |  21 ++
 .../while_bmc_iterations_break_continue_2.sol |  22 ++
 .../loops/while_bmc_iterations_continue_1.sol |  19 ++
 .../loops/while_bmc_iterations_continue_2.sol |  24 ++
 .../loops/while_bmc_iterations_nested.sol     |  22 ++
 .../while_bmc_iterations_nested_break.sol     |  23 ++
 .../while_bmc_iterations_nested_continue.sol  |  23 ++
 .../while_bmc_iterations_semantics_1.sol      |  20 ++
 .../while_bmc_iterations_semantics_2.sol      |  21 ++
 .../while_bmc_iterations_semantics_3.sol      |  20 ++
 .../while_bmc_iterations_shallow_unroll.sol   |  17 ++
 .../loops/while_break_direct.sol              |   4 +-
 .../out_of_bounds/array_2d_4.sol              |   2 +-
 .../try_catch/try_inside_while.sol            |   1 -
 test/solc/CommandLineParser.cpp               |   4 +-
 test/tools/fuzzer_common.cpp                  |   1 +
 131 files changed, 2197 insertions(+), 143 deletions(-)
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations/args
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations/err
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations/input.sol
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/args
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/exit
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/input.sol
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/args
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/exit
 create mode 100644 test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/input.sol
 create mode 100644 test/cmdlineTests/standard_model_checker_bmc_loop_iterations/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/output.json
 delete mode 100644 test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for.sol
 delete mode 100644 test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while.sol
 rename test/libsolidity/smtCheckerTests/loops/{do_while_1_false_positives.sol => do_while_1.sol} (100%)
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_5.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_5.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_6.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_7.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_8.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_break.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_continue.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_shallow_unroll.sol
 delete mode 100644 test/libsolidity/smtCheckerTests/loops/for_1_fail.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_5.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_6.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_7.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_8.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_5.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_6.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_7.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_9.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_5.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_false_positive.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_break.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_continue.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_shallow_unroll.sol
 delete mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_5.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_7.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_5.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_8.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_9.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_break.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_continue.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_shallow_unroll.sol

diff --git a/Changelog.md b/Changelog.md
index 7624358eeb..62806a5e1d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -32,6 +32,7 @@ Compiler Features:
  * NatSpec: Include NatSpec from events that are emitted by a contract but defined outside of it in userdoc and devdoc output.
  * Optimizer: Re-implement simplified version of ``UnusedAssignEliminator`` and ``UnusedStoreEliminator``. It can correctly remove some unused assignments in deeply nested loops that were ignored by the old version.
  * Parser: Unary plus is no longer recognized as a unary operator in the AST and triggers an error at the parsing stage (rather than later during the analysis).
+ * SMTChecker: Add CLI option ``--model-checker-bmc-loop-iterations`` and a JSON option ``settings.modelChecker.bmcLoopIterations`` that specify how many loop iterations the BMC engine should unroll. Note that false negatives are possible when unrolling loops. This is due to the possibility that bmc loop iteration setting is less than actual number of iterations needed to complete a loop.
  * SMTChecker: Group all messages about unsupported language features in a single warning. The CLI option ``--model-checker-show-unsupported`` and the JSON option ``settings.modelChecker.showUnsupported`` can be enabled to show the full list.
  * SMTChecker: Properties that are proved safe are now reported explicitly at the end of analysis. By default, only the number of safe properties is shown. The CLI option ``--model-checker-show-proved-safe`` and the JSON option ``settings.modelChecker.showProvedSafe`` can be enabled to show the full list of safe properties.
  * Standard JSON Interface: Add experimental support for importing ASTs via Standard JSON.
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index b72e8451a3..be29000fed 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -18,7 +18,6 @@
 
 #include <libsolidity/formal/BMC.h>
 
-#include <libsolidity/formal/ModelChecker.h>
 #include <libsolidity/formal/SymbolicTypes.h>
 
 #include <libsmtutil/SMTPortfolio.h>
@@ -26,6 +25,8 @@
 #include <liblangutil/CharStream.h>
 #include <liblangutil/CharStreamProvider.h>
 
+#include <utility>
+
 #ifdef HAVE_Z3_DLOPEN
 #include <z3_version.h>
 #endif
@@ -245,7 +246,7 @@ bool BMC::visit(IfStatement const& _node)
 
 	// We ignore called functions here because they have
 	// specific input values.
-	if (isRootFunction())
+	if (isRootFunction() && !isInsideLoop())
 		addVerificationTarget(
 			VerificationTargetType::ConstantCondition,
 			expr(_node.condition()),
@@ -280,7 +281,7 @@ bool BMC::visit(Conditional const& _op)
 	m_context.pushSolver();
 	_op.condition().accept(*this);
 
-	if (isRootFunction())
+	if (isRootFunction() && !isInsideLoop())
 		addVerificationTarget(
 			VerificationTargetType::ConstantCondition,
 			expr(_op.condition()),
@@ -294,109 +295,172 @@ bool BMC::visit(Conditional const& _op)
 	return false;
 }
 
-// Here we consider the execution of two branches:
-// Branch 1 assumes the loop condition to be true and executes the loop once,
-// after resetting touched variables.
-// Branch 2 assumes the loop condition to be false and skips the loop after
-// visiting the condition (it might contain side-effects, they need to be considered)
-// and does not erase knowledge.
-// If the loop is a do-while, condition side-effects are lost since the body,
-// executed once before the condition, might reassign variables.
-// Variables touched by the loop are merged with Branch 2.
+// Unrolls while or do-while loop
 bool BMC::visit(WhileStatement const& _node)
 {
-	auto indicesBeforeLoop = copyVariableIndices();
-	m_context.resetVariables(touchedVariables(_node));
-	decltype(indicesBeforeLoop) indicesAfterLoop;
+	unsigned int bmcLoopIterations = m_settings.bmcLoopIterations.value_or(1);
+	smtutil::Expression broke(false);
+	smtutil::Expression loopCondition(true);
 	if (_node.isDoWhile())
 	{
-		indicesAfterLoop = visitBranch(&_node.body()).first;
-		// TODO the assertions generated in the body should still be active in the condition
-		_node.condition().accept(*this);
-		if (isRootFunction())
-			addVerificationTarget(
-				VerificationTargetType::ConstantCondition,
-				expr(_node.condition()),
-				&_node.condition()
-			);
-	}
-	else
-	{
-		_node.condition().accept(*this);
-		if (isRootFunction())
-			addVerificationTarget(
-				VerificationTargetType::ConstantCondition,
-				expr(_node.condition()),
-				&_node.condition()
+		for (unsigned int i = 0; i < bmcLoopIterations; ++i)
+		{
+			m_loopCheckpoints.emplace();
+
+			auto indicesBefore = copyVariableIndices();
+			_node.body().accept(*this);
+
+			auto [continues, brokeInCurrentIteration] =	mergeVariablesFromLoopCheckpoints();
+
+			auto indicesBreak = copyVariableIndices();
+			_node.condition().accept(*this);
+			mergeVariables(
+				!brokeInCurrentIteration,
+				copyVariableIndices(),
+				indicesBreak
 			);
 
-		indicesAfterLoop = visitBranch(&_node.body(), expr(_node.condition())).first;
+			mergeVariables(
+				broke || !loopCondition,
+				indicesBefore,
+				copyVariableIndices()
+			);
+			loopCondition = expr(_node.condition());
+			broke = broke || brokeInCurrentIteration;
+			m_loopCheckpoints.pop();
+		}
 	}
+	else {
+		smtutil::Expression loopConditionOnPreviousIteration(true);
+		for (unsigned int i = 0; i < bmcLoopIterations; ++i)
+		{
+			m_loopCheckpoints.emplace();
+			auto indicesBefore = copyVariableIndices();
+			_node.condition().accept(*this);
+			loopCondition = expr(_node.condition());
 
-	// We reset the execution to before the loop
-	// and visit the condition in case it's not a do-while.
-	// A do-while's body might have non-precise information
-	// in its first run about variables that are touched.
-	resetVariableIndices(indicesBeforeLoop);
-	if (!_node.isDoWhile())
-		_node.condition().accept(*this);
+			auto indicesAfterCondition = copyVariableIndices();
 
-	mergeVariables(expr(_node.condition()), indicesAfterLoop, copyVariableIndices());
+			pushPathCondition(loopCondition);
+			_node.body().accept(*this);
+			popPathCondition();
 
+			auto [continues, brokeInCurrentIteration] =	mergeVariablesFromLoopCheckpoints();
+
+			// merges indices modified when accepting loop condition that no longer holds
+			mergeVariables(
+				!loopCondition,
+				indicesAfterCondition,
+				copyVariableIndices()
+			);
+
+			// handles breaks in previous iterations
+			// breaks in current iterations are handled when traversing loop checkpoints
+			// handles case when the loop condition no longer holds but bmc loop iterations still unrolls the loop
+			mergeVariables(
+				broke || !loopConditionOnPreviousIteration,
+				indicesBefore,
+				copyVariableIndices()
+			);
+			m_loopCheckpoints.pop();
+			broke = broke || brokeInCurrentIteration;
+			loopConditionOnPreviousIteration = loopCondition;
+		}
+	}
+	if (bmcLoopIterations > 0)
+		m_context.addAssertion(not(loopCondition) || broke);
 	m_loopExecutionHappened = true;
 	return false;
 }
 
-// Here we consider the execution of two branches similar to WhileStatement.
+// Unrolls for loop
 bool BMC::visit(ForStatement const& _node)
 {
 	if (_node.initializationExpression())
 		_node.initializationExpression()->accept(*this);
 
-	auto indicesBeforeLoop = copyVariableIndices();
+	smtutil::Expression broke(false);
+	smtutil::Expression forCondition(true);
+	smtutil::Expression forConditionOnPreviousIteration(true);
+	unsigned int bmcLoopIterations = m_settings.bmcLoopIterations.value_or(1);
+	for (unsigned int i = 0; i < bmcLoopIterations; ++i)
+	{
+		auto indicesBefore = copyVariableIndices();
+		if (_node.condition())
+		{
+			_node.condition()->accept(*this);
+			// values in loop condition might change during loop iteration
+			forCondition = expr(*_node.condition());
+		}
+		m_loopCheckpoints.emplace();
+		auto indicesAfterCondition = copyVariableIndices();
 
-	// Do not reset the init expression part.
-	auto touchedVars = touchedVariables(_node.body());
-	if (_node.condition())
-		touchedVars += touchedVariables(*_node.condition());
-	if (_node.loopExpression())
-		touchedVars += touchedVariables(*_node.loopExpression());
+		pushPathCondition(forCondition);
+		_node.body().accept(*this);
 
-	m_context.resetVariables(touchedVars);
+		auto [continues, brokeInCurrentIteration] =	mergeVariablesFromLoopCheckpoints();
 
-	if (_node.condition())
-	{
-		_node.condition()->accept(*this);
-		if (isRootFunction())
-			addVerificationTarget(
-				VerificationTargetType::ConstantCondition,
-				expr(*_node.condition()),
-				_node.condition()
+		// accept loop expression if there was no break
+		if (_node.loopExpression())
+		{
+			auto indicesBreak = copyVariableIndices();
+			_node.loopExpression()->accept(*this);
+			mergeVariables(
+				!brokeInCurrentIteration,
+				copyVariableIndices(),
+				indicesBreak
 			);
-	}
-
-	m_context.pushSolver();
-	if (_node.condition())
-		m_context.addAssertion(expr(*_node.condition()));
-	_node.body().accept(*this);
-	if (_node.loopExpression())
-		_node.loopExpression()->accept(*this);
-	m_context.popSolver();
-
-	auto indicesAfterLoop = copyVariableIndices();
-	// We reset the execution to before the loop
-	// and visit the condition.
-	resetVariableIndices(indicesBeforeLoop);
-	if (_node.condition())
-		_node.condition()->accept(*this);
+		}
+		popPathCondition();
 
-	auto forCondition = _node.condition() ? expr(*_node.condition()) : smtutil::Expression(true);
-	mergeVariables(forCondition, indicesAfterLoop, copyVariableIndices());
+		// merges indices modified when accepting loop condition that does no longer hold
+		mergeVariables(
+			!forCondition,
+			indicesAfterCondition,
+			copyVariableIndices()
+		);
 
+		// handles breaks in previous iterations
+		// breaks in current iterations are handled when traversing loop checkpoints
+		// handles case when the loop condition no longer holds but bmc loop iterations still unrolls the loop
+		mergeVariables(
+			broke || !forConditionOnPreviousIteration,
+			indicesBefore,
+			copyVariableIndices()
+		);
+		m_loopCheckpoints.pop();
+		broke = broke || brokeInCurrentIteration;
+		forConditionOnPreviousIteration = forCondition;
+	}
+	if (bmcLoopIterations > 0)
+		m_context.addAssertion(not(forCondition) || broke);
 	m_loopExecutionHappened = true;
 	return false;
 }
 
+std::tuple<smtutil::Expression, smtutil::Expression> BMC::mergeVariablesFromLoopCheckpoints()
+{
+	smtutil::Expression continues(false);
+	smtutil::Expression brokeInCurrentIteration(false);
+	for (auto const& loopControl: m_loopCheckpoints.top())
+	{
+		// use SSAs associated with this break statement only if
+		// loop didn't break or continue earlier in the iteration
+		// loop condition is included in break path conditions
+		mergeVariables(
+			!brokeInCurrentIteration && !continues && loopControl.pathConditions,
+			loopControl.variableIndices,
+			copyVariableIndices()
+		);
+		if (loopControl.kind == LoopControlKind::Break)
+			brokeInCurrentIteration =
+				brokeInCurrentIteration || loopControl.pathConditions;
+		else if (loopControl.kind == LoopControlKind::Continue)
+			continues = continues || loopControl.pathConditions;
+	}
+	return std::pair(continues, brokeInCurrentIteration);
+}
+
 bool BMC::visit(TryStatement const& _tryStatement)
 {
 	FunctionCall const* externalCall = dynamic_cast<FunctionCall const*>(&_tryStatement.externalCall());
@@ -428,6 +492,28 @@ bool BMC::visit(TryStatement const& _tryStatement)
 	return false;
 }
 
+bool BMC::visit(Break const&)
+{
+	LoopControl control = {
+		LoopControlKind::Break,
+		currentPathConditions(),
+		copyVariableIndices()
+	};
+	m_loopCheckpoints.top().emplace_back(control);
+	return false;
+}
+
+bool BMC::visit(Continue const&)
+{
+	LoopControl control = {
+		LoopControlKind::Continue,
+		currentPathConditions(),
+		copyVariableIndices()
+	};
+	m_loopCheckpoints.top().emplace_back(control);
+	return false;
+}
+
 void BMC::endVisit(UnaryOperation const& _op)
 {
 	SMTEncoder::endVisit(_op);
@@ -535,7 +621,7 @@ void BMC::visitRequire(FunctionCall const& _funCall)
 	auto const& args = _funCall.arguments();
 	solAssert(args.size() >= 1, "");
 	solAssert(args.front()->annotation().type->category() == Type::Category::Bool, "");
-	if (isRootFunction())
+	if (isRootFunction() && !isInsideLoop())
 		addVerificationTarget(
 			VerificationTargetType::ConstantCondition,
 			expr(*args.front()),
@@ -960,7 +1046,7 @@ void BMC::checkCondition(
 	vector<smtutil::Expression> expressionsToEvaluate;
 	vector<string> expressionNames;
 	tie(expressionsToEvaluate, expressionNames) = _modelExpressions;
-	if (_callStack.size())
+	if (!_callStack.empty())
 		if (_additionalValue)
 		{
 			expressionsToEvaluate.emplace_back(*_additionalValue);
@@ -973,8 +1059,9 @@ void BMC::checkCondition(
 	string extraComment = SMTEncoder::extraComment();
 	if (m_loopExecutionHappened)
 		extraComment +=
-			"\nNote that some information is erased after the execution of loops.\n"
-			"You can re-introduce information using require().";
+			"False negatives are possible when unrolling loops.\n"
+			"This is due to the possibility that the BMC loop iteration setting is"
+			" smaller than the actual number of iterations needed to complete a loop.";
 	if (m_externalFunctionCallHappened)
 		extraComment +=
 			"\nNote that external function calls are not inlined,"
@@ -1145,3 +1232,7 @@ void BMC::assignment(smt::SymbolicVariable& _symVar, smtutil::Expression const&
 	));
 }
 
+bool BMC::isInsideLoop() const
+{
+	return !m_loopCheckpoints.empty();
+}
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index 9a8242047e..3abaac1bd2 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -100,6 +100,8 @@ class BMC: public SMTEncoder
 	void endVisit(FunctionCall const& _node) override;
 	void endVisit(Return const& _node) override;
 	bool visit(TryStatement const& _node) override;
+	bool visit(Break const& _node) override;
+	bool visit(Continue const& _node) override;
 	//@}
 
 	/// Visitor helpers.
@@ -188,6 +190,9 @@ class BMC: public SMTEncoder
 	smtutil::CheckResult checkSatisfiable();
 	//@}
 
+	std::tuple<smtutil::Expression, smtutil::Expression> mergeVariablesFromLoopCheckpoints();
+	bool isInsideLoop() const;
+
 	std::unique_ptr<smtutil::SolverInterface> m_interface;
 
 	/// Flags used for better warning messages.
@@ -204,6 +209,21 @@ class BMC: public SMTEncoder
 
 	/// Number of verification conditions that could not be proved.
 	size_t m_unprovedAmt = 0;
-};
 
+	enum class LoopControlKind
+	{
+		Continue,
+		Break
+	};
+
+	// Current path conditions and SSA indices for break or continue statement
+	struct LoopControl {
+		LoopControlKind kind;
+		smtutil::Expression pathConditions;
+		VariableIndices variableIndices;
+	};
+
+	// Loop control statements for every loop
+	std::stack<std::vector<LoopControl>> m_loopCheckpoints;
+};
 }
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index fafb2cdace..d190116d96 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -157,6 +157,7 @@ struct ModelCheckerExtCalls
 
 struct ModelCheckerSettings
 {
+	std::optional<unsigned> bmcLoopIterations;
 	ModelCheckerContracts contracts = ModelCheckerContracts::Default();
 	/// Currently division and modulo are replaced by multiplication with slack vars, such that
 	/// a / b <=> a = b * k + m
@@ -179,6 +180,7 @@ struct ModelCheckerSettings
 	bool operator==(ModelCheckerSettings const& _other) const noexcept
 	{
 		return
+			bmcLoopIterations == _other.bmcLoopIterations &&
 			contracts == _other.contracts &&
 			divModNoSlacks == _other.divModNoSlacks &&
 			engine == _other.engine &&
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index c16569686a..726f16ef6b 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -168,7 +168,9 @@ class SMTEncoder: public ASTConstVisitor
 	void endVisit(IndexAccess const& _node) override;
 	void endVisit(IndexRangeAccess const& _node) override;
 	bool visit(InlineAssembly const& _node) override;
+	bool visit(Break const&) override { return false; }
 	void endVisit(Break const&) override {}
+	bool visit(Continue const&) override { return false; }
 	void endVisit(Continue const&) override {}
 	bool visit(TryCatchClause const&) override { return true; }
 	void endVisit(TryCatchClause const&) override {}
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 972c04ba97..f18c618e9c 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -430,7 +430,7 @@ std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
 
 std::optional<Json::Value> checkModelCheckerSettingsKeys(Json::Value const& _input)
 {
-	static set<string> keys{"contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "showProvedSafe", "showUnproved", "showUnsupported", "solvers", "targets", "timeout"};
+	static set<string> keys{"bmcLoopIterations", "contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "showProvedSafe", "showUnproved", "showUnsupported", "solvers", "targets", "timeout"};
 	return checkKeys(_input, keys, "modelChecker");
 }
 
@@ -1013,6 +1013,16 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.modelCheckerSettings.engine = *engine;
 	}
 
+	if (modelCheckerSettings.isMember("bmcLoopIterations"))
+	{
+		if (!ret.modelCheckerSettings.engine.bmc)
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.bmcLoopIterations requires the BMC engine to be enabled.");
+		if (modelCheckerSettings["bmcLoopIterations"].isUInt())
+			ret.modelCheckerSettings.bmcLoopIterations = modelCheckerSettings["bmcLoopIterations"].asUInt();
+		else
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.bmcLoopIterations must be an unsigned integer.");
+	}
+
 	if (modelCheckerSettings.isMember("extCalls"))
 	{
 		if (!modelCheckerSettings["extCalls"].isString())
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index da818411ec..aab6b67104 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -76,6 +76,7 @@ static string const g_strModelCheckerShowUnsupported = "model-checker-show-unsup
 static string const g_strModelCheckerSolvers = "model-checker-solvers";
 static string const g_strModelCheckerTargets = "model-checker-targets";
 static string const g_strModelCheckerTimeout = "model-checker-timeout";
+static string const g_strModelCheckerBMCLoopIterations = "model-checker-bmc-loop-iterations";
 static string const g_strNone = "none";
 static string const g_strNoOptimizeYul = "no-optimize-yul";
 static string const g_strOptimize = "optimize";
@@ -861,17 +862,23 @@ General Information)").c_str(),
 		(
 			g_strModelCheckerTargets.c_str(),
 			po::value<string>()->value_name("default,all,constantCondition,underflow,overflow,divByZero,balance,assert,popEmptyArray,outOfBounds")->default_value("default"),
-			"Select model checker verification targets. "
+			"Select model checker verification targets."
 			"Multiple targets can be selected at the same time, separated by a comma and no spaces."
 			" By default all targets except underflow and overflow are selected."
 		)
 		(
 			g_strModelCheckerTimeout.c_str(),
 			po::value<unsigned>()->value_name("ms"),
-			"Set model checker timeout per query in milliseconds. "
-			"The default is a deterministic resource limit. "
+			"Set model checker timeout per query in milliseconds."
+			"The default is a deterministic resource limit."
 			"A timeout of 0 means no resource/time restrictions for any query."
 		)
+		(
+			g_strModelCheckerBMCLoopIterations.c_str(),
+			po::value<unsigned>(),
+			"Set loop unrolling depth for BMC engine."
+			"Default is 1."
+		)
 	;
 	desc.add(smtCheckerOptions);
 
@@ -965,6 +972,7 @@ void CommandLineParser::processArgs()
 		{g_strModelCheckerInvariants, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerSolvers, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerTimeout, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerBMCLoopIterations, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerContracts, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerTargets, {InputMode::Compiler, InputMode::CompilerWithASTImport}}
 	};
@@ -1337,6 +1345,13 @@ void CommandLineParser::processArgs()
 	if (m_args.count(g_strModelCheckerTimeout))
 		m_options.modelChecker.settings.timeout = m_args[g_strModelCheckerTimeout].as<unsigned>();
 
+	if (m_args.count(g_strModelCheckerBMCLoopIterations))
+	{
+		if (!m_options.modelChecker.settings.engine.bmc)
+			solThrow(CommandLineValidationError, "BMC loop unrolling requires the BMC engine to be enabled");
+		m_options.modelChecker.settings.bmcLoopIterations = m_args[g_strModelCheckerBMCLoopIterations].as<unsigned>();
+	}
+
 	m_options.metadata.literalSources = (m_args.count(g_strMetadataLiteral) > 0);
 	m_options.modelChecker.initialize =
 		m_args.count(g_strModelCheckerContracts) ||
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations/args b/test/cmdlineTests/model_checker_bmc_loop_iterations/args
new file mode 100644
index 0000000000..3761421e91
--- /dev/null
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations/args
@@ -0,0 +1 @@
+--model-checker-engine bmc --model-checker-bmc-loop-iterations 3
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations/err b/test/cmdlineTests/model_checker_bmc_loop_iterations/err
new file mode 100644
index 0000000000..cbb2b0f9da
--- /dev/null
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations/err
@@ -0,0 +1,11 @@
+Warning: BMC: Assertion violation happens here.
+  --> model_checker_bmc_loop_iterations/input.sol:10:3:
+   |
+10 | 		assert(x == 3);
+   | 		^^^^^^^^^^^^^^
+Note: Counterexample:
+  x = 2
+
+Note: Callstack:
+Note: False negatives are possible when unrolling loops.
+This is due to the possibility that the BMC loop iteration setting is smaller than the actual number of iterations needed to complete a loop.
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations/input.sol b/test/cmdlineTests/model_checker_bmc_loop_iterations/input.sol
new file mode 100644
index 0000000000..3722e46cfc
--- /dev/null
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations/input.sol
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C
+{
+	function f(uint x) public pure {
+		require(x == 0);
+		do {
+			++x;
+		} while (x < 2);
+		assert(x == 3);
+	}
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/args b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/args
new file mode 100644
index 0000000000..32b6eb05b0
--- /dev/null
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/args
@@ -0,0 +1 @@
+--model-checker-engine bmc --model-checker-bmc-loop-iterations bmc
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err
new file mode 100644
index 0000000000..0f0fbaf8b2
--- /dev/null
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err
@@ -0,0 +1 @@
+the argument ('bmc') for option '--model-checker-bmc-loop-iterations' is invalid
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/exit b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/exit
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/exit
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/input.sol b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/input.sol
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/args b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/args
new file mode 100644
index 0000000000..aad7e026c6
--- /dev/null
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/args
@@ -0,0 +1 @@
+--model-checker-engine bmc --model-checker-bmc-loop-iterations
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err
new file mode 100644
index 0000000000..9b59a4eb87
--- /dev/null
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err
@@ -0,0 +1 @@
+the argument ('model_checker_bmc_loop_iterations_no_argument/input.sol') for option '--model-checker-bmc-loop-iterations' is invalid
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/exit b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/exit
new file mode 100644
index 0000000000..56a6051ca2
--- /dev/null
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/exit
@@ -0,0 +1 @@
+1
\ No newline at end of file
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/input.sol b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/input.sol
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/input.json b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/input.json
new file mode 100644
index 0000000000..e7d2d09bb5
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/input.json
@@ -0,0 +1,29 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"Source":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0
+			pragma solidity >=0.0;
+			contract C
+			{
+				function f(uint x) public pure {
+					require(x == 0);
+					do {
+						++x;
+					} while (x < 2);
+					assert(x == 2);
+				}
+			}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "bmc",
+            "bmcLoopIterations": 3
+		}
+	}
+}
\ No newline at end of file
diff --git a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json
new file mode 100644
index 0000000000..139b0825bc
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations/output.json
@@ -0,0 +1,22 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6002",
+            "formattedMessage": "Info: BMC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.
+
+",
+            "message": "BMC: 1 verification condition(s) proved safe! Enable the model checker option \"show proved safe\" to see all of them.",
+            "severity": "info",
+            "type": "Info"
+        }
+    ],
+    "sources":
+    {
+        "Source":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/input.json b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/input.json
new file mode 100644
index 0000000000..8c5fa65cd9
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/input.json
@@ -0,0 +1,29 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"Source":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0
+			pragma solidity >=0.0;
+			contract C
+			{
+				function f(uint x) public pure {
+					require(x == 0);
+					do {
+						++x;
+					} while (x < 2);
+					assert(x == 2);
+				}
+			}"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "bmc",
+            "bmcLoopIterations": "bmc"
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/output.json b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/output.json
new file mode 100644
index 0000000000..971973d85c
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_bmc_loop_iterations_invalid_arg/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.bmcLoopIterations must be an unsigned integer.",
+            "message": "settings.modelChecker.bmcLoopIterations must be an unsigned integer.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 9495895278..288527e048 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -122,6 +122,9 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 			m_shouldRun = false;
 #endif
 	}
+
+	auto const& bmcLoopIterations = m_reader.sizetSetting("BMCLoopIterations", 1);
+	m_modelCheckerSettings.bmcLoopIterations = std::optional<unsigned>{bmcLoopIterations};
 }
 
 TestCase::TestResult SMTCheckerTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
diff --git a/test/libsolidity/SMTCheckerTest.h b/test/libsolidity/SMTCheckerTest.h
index 54d23c74fb..965705f30c 100644
--- a/test/libsolidity/SMTCheckerTest.h
+++ b/test/libsolidity/SMTCheckerTest.h
@@ -55,6 +55,8 @@ class SMTCheckerTest: public SyntaxTest
 		Set in m_modelCheckerSettings.
 	SMTSolvers: `all`, `cvc4`, `z3`, `none`, where the default is `all`.
 		Set in m_modelCheckerSettings.
+	BMCLoopIterations: number of loop iterations for BMC engine, the default is 1.
+		Set in m_modelCheckerSettings.
 	*/
 
 	ModelCheckerSettings m_modelCheckerSettings;
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for.sol
deleted file mode 100644
index 681d42aefc..0000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_for.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-	function f(bool x) public pure { require(x); for (;x;) {} }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (65-66): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while.sol b/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while.sol
deleted file mode 100644
index 91bfd981c1..0000000000
--- a/test/libsolidity/smtCheckerTests/functions/functions_trivial_condition_while.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C
-{
-	function f(bool x) public pure { require(x); while (x) {} }
-}
-// ====
-// SMTEngine: all
-// ----
-// Warning 6838: (66-67): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_1_false_positives.sol b/test/libsolidity/smtCheckerTests/loops/do_while_1.sol
similarity index 100%
rename from test/libsolidity/smtCheckerTests/loops/do_while_1_false_positives.sol
rename to test/libsolidity/smtCheckerTests/loops/do_while_1.sol
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_1.sol
new file mode 100644
index 0000000000..bff046b063
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_1.sol
@@ -0,0 +1,16 @@
+contract C
+{
+	function f(uint x) public pure {
+		require(x == 0);
+		do {
+			++x;
+		} while (x < 2);
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_2.sol
new file mode 100644
index 0000000000..92cbc1bea1
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_2.sol
@@ -0,0 +1,20 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		do {
+			++x;
+			{
+				++x;
+				++x;
+			}
+		} while (x < 3);
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_3.sol
new file mode 100644
index 0000000000..d4a37786c2
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_3.sol
@@ -0,0 +1,18 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		do {
+			if (x >= 2)
+				++x;
+			++x;
+		} while (x < 3);
+		assert(x == 4);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_4.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_4.sol
new file mode 100644
index 0000000000..cce896b70c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_4.sol
@@ -0,0 +1,15 @@
+contract C {
+	function f() public pure {
+		uint x;
+		do {
+			++x;
+		} while (true);
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 1
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_5.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_5.sol
new file mode 100644
index 0000000000..6f25a4f5c1
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_5.sol
@@ -0,0 +1,22 @@
+contract C {
+    uint x;
+
+    function condition() private returns(bool) {
+		++x;
+		return x < 3;
+	}
+
+	function f() public {
+		require(x == 0);
+		do {
+		} while (condition());
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Warning 2661: (77-80): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_1.sol
new file mode 100644
index 0000000000..54ede91c2d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_1.sol
@@ -0,0 +1,17 @@
+contract C
+{
+	function f(uint x) public pure {
+		require(x == 0);
+		do {
+			++x;
+		} while (x < 2);
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Warning 4661: (102-116): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_2.sol
new file mode 100644
index 0000000000..8c742b749d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_2.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x;
+		do {
+			++x;
+			break;
+		} while (x < 3);
+		assert(x == 0);
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 2
+// ----
+// Warning 5740: (87-92): Unreachable code.
+// Warning 4661: (97-111): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_3.sol
new file mode 100644
index 0000000000..0742c5cdc2
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_assertion_fails_3.sol
@@ -0,0 +1,17 @@
+contract C {
+	function f() public pure {
+		uint x;
+		do {
+			++x;
+			continue;
+		} while (x < 2);
+		assert(x == 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 2
+// ----
+// Warning 4661: (100-114): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_1.sol
new file mode 100644
index 0000000000..e7bb9d145c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_1.sol
@@ -0,0 +1,17 @@
+contract C {
+	function f() public pure {
+		uint x;
+		do {
+			++x;
+			break;
+		} while (x < 3);
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Warning 5740: (87-92): Unreachable code.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_2.sol
new file mode 100644
index 0000000000..9dec60544d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_2.sol
@@ -0,0 +1,17 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		do {
+			if (x > 0)
+				break;
+			++x;
+		} while (x < 3);
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_3.sol
new file mode 100644
index 0000000000..0f1c7d0330
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_3.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		do {
+			if (x >= 0) {
+				++x;
+				break;
+			}
+			++x;
+		} while (x < 3);
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_4.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_4.sol
new file mode 100644
index 0000000000..c2c046809f
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_4.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		do {
+			if (x > 0) {
+				++x;
+				break;
+			}
+			++x;
+		} while (x < 3);
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_5.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_5.sol
new file mode 100644
index 0000000000..4379d4f613
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_5.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		do {
+			++x;
+			if (x > 1) {
+				++x;
+				break;
+			}
+		} while (x < 3);
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_6.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_6.sol
new file mode 100644
index 0000000000..d0a917fa91
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_6.sol
@@ -0,0 +1,23 @@
+contract C {
+	function f() public pure {
+		uint x;
+		do {
+			++x;
+			if (x > 0) {
+ 				x = 2;
+				break;
+			}
+			if (x > 1) {
+				x = 3;
+				break;
+			}
+		} while (x < 3);
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_7.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_7.sol
new file mode 100644
index 0000000000..52c3270ba7
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_7.sol
@@ -0,0 +1,23 @@
+contract C {
+	function f() public pure {
+		uint x;
+		do {
+			++x;
+			if (x > 1) {
+				x = 3;
+				break;
+ 			}
+			if (x > 0) {
+				x = 2;
+				break;
+ 			}
+		} while (x < 3);
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_8.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_8.sol
new file mode 100644
index 0000000000..c25f982126
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_8.sol
@@ -0,0 +1,17 @@
+contract C {
+	function f() public pure {
+		uint x;
+		do {
+			break;
+		} while (++x < 2);
+        // loop condition is not executed after break
+		assert(x == 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Warning 5740: (79-86): Unreachable code.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_1.sol
new file mode 100644
index 0000000000..53ce958fab
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_1.sol
@@ -0,0 +1,21 @@
+contract C {
+	function f() public pure {
+		uint x;
+		do {
+			if (x > 1) {
+				break;
+ 			}
+			if (x >= 0) {
+				x = 10;
+				continue;
+ 			}
+		} while (x < 3);
+		assert(x == 10);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_2.sol
new file mode 100644
index 0000000000..12d6fff6f5
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_break_continue_2.sol
@@ -0,0 +1,22 @@
+contract C {
+	function f() public pure {
+		uint x;
+		do {
+			if (x > 1) {
+				x = 3;
+				break;
+ 			}
+			if (x >= 0) {
+				x = 2;
+				continue;
+ 			}
+		} while (x < 4);
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_1.sol
new file mode 100644
index 0000000000..aa69cb90cc
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_1.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		do {
+			++x;
+			if (x == 3) {
+				continue;
+			}
+			++x;
+		} while (x < 3);
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_2.sol
new file mode 100644
index 0000000000..83826575de
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_2.sol
@@ -0,0 +1,25 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		uint y = 0;
+		do {
+			++x;
+			if (x == 2) {
+				++x;
+				y = 1;
+				continue;
+			}
+			if (x == 3) {
+				y = 2;
+				continue;
+			}
+		} while (x < 3);
+		assert(y == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_3.sol
new file mode 100644
index 0000000000..1afe9034e0
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_3.sol
@@ -0,0 +1,24 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		uint y = 0;
+		do {
+			++x;
+			if (x > 0) {
+				y = 1;
+				continue;
+			}
+			if (x > 0) {
+				y = 2;
+				continue;
+			}
+		} while (x < 3);
+		assert(y == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_4.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_4.sol
new file mode 100644
index 0000000000..69ad6529c6
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_continue_4.sol
@@ -0,0 +1,25 @@
+contract C
+{
+	function f(uint x) public pure {
+		require(x == 0);
+		uint i;
+		do {
+			++i;
+			if (i == 2) {
+				x = 2;
+				continue;
+			}
+			if (i == 1) {
+				x = 1;
+				continue;
+			}
+		} while (i < 3);
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested.sol
new file mode 100644
index 0000000000..62d1b793df
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested.sol
@@ -0,0 +1,22 @@
+contract C
+{
+	function f(uint z) public pure {
+		uint x = 0;
+		require(z == 0);
+		do {
+			uint y = 0;
+			do {
+				++z;
+				++y;
+			} while (y < 2);
+			++x;
+		} while (x < 2);
+		assert(z == 4);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_break.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_break.sol
new file mode 100644
index 0000000000..267e18ec64
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_break.sol
@@ -0,0 +1,24 @@
+contract C
+{
+	function f(uint z) public pure {
+		uint x = 0;
+		require(z == 0);
+		do {
+			uint y = 0;
+			do {
+				if (y > 0)
+					break;
+				++z;
+				++y;
+			} while (y < 2);
+			++x;
+		} while (x < 2);
+		assert(z == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_continue.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_continue.sol
new file mode 100644
index 0000000000..42ef9bccc5
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_nested_continue.sol
@@ -0,0 +1,24 @@
+contract C
+{
+	function f(uint z) public pure {
+		uint x = 0;
+		require(z == 0);
+		do {
+			uint y = 0;
+			do {
+				++y;
+				if (y > 0)
+					continue;
+				++z;
+			} while (y < 2);
+			++x;
+		} while (x < 2);
+		assert(z == 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol
new file mode 100644
index 0000000000..6656817809
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol
@@ -0,0 +1,20 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		int y = 0;
+		do {
+			if (x >= 3)
+				y = 1;
+			++x;
+		} while (x < 3 || y == 1);
+        // BMC loop iteration setting is not enough to leave the loop
+		assert(x == 0); // should hold - no assumptions on value if didn't complete loop
+		assert(y == 0); // should hold - no assumptions on value if didn't complete loop
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 1
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
new file mode 100644
index 0000000000..b98bba18a0
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
@@ -0,0 +1,20 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		int y = 0;
+		do {
+			if (x >= 3)
+				y = 1;
+			++x;
+		} while (x < 3 || y == 1);
+        // BMC loop iteration setting is just enough to leave the loop
+		assert(x == 3); // should hold
+		assert(y == 1); // should hold
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
new file mode 100644
index 0000000000..2a5866e162
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
@@ -0,0 +1,20 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		int y = 0;
+		do {
+			if (x >= 3)
+				y = 1;
+			++x;
+		} while (x < 3 || y == 1);
+        // BMC loop iteration setting is more than enough to leave the loop
+		assert(x == 3); // should hold
+		assert(y == 1); // should hold
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_shallow_unroll.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_shallow_unroll.sol
new file mode 100644
index 0000000000..449d41c67c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_shallow_unroll.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f(uint x) public pure {
+		require(x == 0);
+		uint y;
+		do {
+			++y;
+			if (y == 2)
+			    x = 3;
+		} while (y < 3);
+		// nothing is reported because loop condition is true after unrolling the loop one time
+		assert(x == 4);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 1
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol b/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol
deleted file mode 100644
index 7d179aa101..0000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_1_fail.sol
+++ /dev/null
@@ -1,19 +0,0 @@
-contract C
-{
-	function f(uint x) public pure {
-		require(x < 100);
-		for(uint i = 0; i < 10; ++i) {
-			// Overflows due to resetting x.
-			x = x + 1;
-		}
-		assert(x < 14);
-	}
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Warning 4984: (143-148): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
-// Warning 6328: (156-170): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (143-148): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol b/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
index 46694d785a..0b4ac7e688 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_1_false_positive.sol
@@ -14,4 +14,4 @@ contract C
 // ----
 // Warning 4984: (106-111): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 2661: (106-111): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_1.sol
new file mode 100644
index 0000000000..a352b6e38f
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_1.sol
@@ -0,0 +1,15 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 2; ++i)
+			++x;
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_2.sol
new file mode 100644
index 0000000000..d460ea770c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_2.sol
@@ -0,0 +1,15 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 3; ++i)
+			x = i;
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_3.sol
new file mode 100644
index 0000000000..63b4346689
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_3.sol
@@ -0,0 +1,16 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 3; ++i)
+			if (i > 1)
+				x = 10;
+		assert(x == 10);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+//  Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_4.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_4.sol
new file mode 100644
index 0000000000..e3fea509a5
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_4.sol
@@ -0,0 +1,15 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 0; ++i)
+			++x;
+		assert(x == 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_5.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_5.sol
new file mode 100644
index 0000000000..38437fce24
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_5.sol
@@ -0,0 +1,14 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (; x < 0; ++x) {}
+		assert(x == 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 1
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_6.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_6.sol
new file mode 100644
index 0000000000..cdbc414851
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_6.sol
@@ -0,0 +1,16 @@
+contract C
+{
+	function f() public pure {
+		uint x = 0;
+		for (uint i = 1; i < 3;) {
+			x = i;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_7.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_7.sol
new file mode 100644
index 0000000000..834529b32a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_7.sol
@@ -0,0 +1,23 @@
+contract C
+{
+	uint x;
+
+	function condition() private returns(bool) {
+		++x;
+		return x < 3;
+	}
+
+	function f() public {
+		require(x == 0);
+		for (; condition();) {
+		}
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Warning 2661: (71-74): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_8.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_8.sol
new file mode 100644
index 0000000000..421c965e1c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_8.sol
@@ -0,0 +1,31 @@
+contract C
+{
+	uint x;
+	uint y;
+
+	function condition() private returns(bool) {
+		++x;
+		return x < 3;
+	}
+
+	function expression() private {
+		++y;
+	}
+
+	function f() public {
+		require(x == 0);
+		require(y == 0);
+		for (; condition(); expression()) {
+		}
+		assert(x == 3);
+		assert(y == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Warning 2661: (80-83): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 2661: (140-143): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_1.sol
new file mode 100644
index 0000000000..67290785b0
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_1.sol
@@ -0,0 +1,16 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 2; ++i)
+			++x;
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Warning 4661: (92-106): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_2.sol
new file mode 100644
index 0000000000..cd1ae918f5
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_2.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 2; ++i) {
+			++x;
+			break;
+		}
+		assert(x == 0);
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Warning 5740: (77-80): Unreachable code.
+// Warning 4661: (108-122): BMC: Assertion violation happens here.
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_3.sol
new file mode 100644
index 0000000000..8e1cb97bc8
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_assertion_fails_3.sol
@@ -0,0 +1,17 @@
+contract C {
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 2; ++i) {
+			++x;
+			continue;
+		}
+		assert(x == 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Warning 4661: (111-125): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_1.sol
new file mode 100644
index 0000000000..26958bf1d2
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_1.sol
@@ -0,0 +1,19 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 3; ++i) {
+			break;
+			++x;
+		}
+		assert(x == 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Warning 5740: (77-80): Unreachable code.
+// Warning 5740: (97-100): Unreachable code.
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_2.sol
new file mode 100644
index 0000000000..cada2d8519
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_2.sol
@@ -0,0 +1,18 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 3; ++i) {
+			++x;
+ 			break;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Warning 5740: (77-80): Unreachable code.
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_3.sol
new file mode 100644
index 0000000000..eb947d555f
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_3.sol
@@ -0,0 +1,18 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 3; ++i) {
+			if (i > 0)
+				break;
+			++x;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_4.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_4.sol
new file mode 100644
index 0000000000..3d4855abfa
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_4.sol
@@ -0,0 +1,18 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 3; ++i) {
+			++x;
+			if (i > 0)
+				break;
+		}
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_5.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_5.sol
new file mode 100644
index 0000000000..f21255502a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_5.sol
@@ -0,0 +1,23 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 3; ++i) {
+			if (i > 1) {
+				x = 1;
+				break;
+			}
+			if (i > 1) {
+				x = 2;
+				break;
+			}
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_6.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_6.sol
new file mode 100644
index 0000000000..401491e904
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_6.sol
@@ -0,0 +1,23 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 3; ++i) {
+			if (i > 1) {
+				x = 1;
+				break;
+			}
+			if (i >= 1) {
+				x = 2;
+				break;
+			}
+		}
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_7.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_7.sol
new file mode 100644
index 0000000000..4bb4ffdf04
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_7.sol
@@ -0,0 +1,17 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (;;) {
+			++x;
+			break;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol
new file mode 100644
index 0000000000..a88a031e75
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_8.sol
@@ -0,0 +1,18 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (;;) {
+ 			break;
+			++x;
+		}
+		assert(x == 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Warning 5740: (78-81): Unreachable code.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_9.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_9.sol
new file mode 100644
index 0000000000..4ce3d9268e
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_9.sol
@@ -0,0 +1,17 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (;x < 2;) {
+			++x;
+ 			break;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_1.sol
new file mode 100644
index 0000000000..b999f9cf61
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_1.sol
@@ -0,0 +1,22 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 3; ++i) {
+			if (i > 1) {
+				break;
+ 			}
+			if (i >= 0) {
+				x = 10;
+				continue;
+ 			}
+		}
+		assert(x == 10);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_2.sol
new file mode 100644
index 0000000000..0da0f5d994
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_2.sol
@@ -0,0 +1,23 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 2; ++i) {
+			if (i > 0) {
+				x = 1;
+				break;
+ 			}
+			if (i >= 0) {
+				x = 2;
+				continue;
+			}
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 2
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_3.sol
new file mode 100644
index 0000000000..9f762bb436
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_break_continue_3.sol
@@ -0,0 +1,22 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 3; ++i) {
+			if (i > 0) {
+				x = 1;
+				break;
+ 			} else {
+				x = 2;
+				continue;
+			}
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_1.sol
new file mode 100644
index 0000000000..44983ecddc
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_1.sol
@@ -0,0 +1,18 @@
+contract C
+{
+	function f(uint x) public pure {
+		require(x == 0);
+		for (uint i = 0; i < 3; ++i) {
+			if (i > 1)
+				continue;
+			++x;
+		}
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_2.sol
new file mode 100644
index 0000000000..2c7fc12367
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_2.sol
@@ -0,0 +1,23 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 2; ++i) {
+			if (i == 1) {
+				x = 1;
+				continue;
+			}
+			if (i == 0) {
+				x = 2;
+				continue;
+			}
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_3.sol
new file mode 100644
index 0000000000..b74709e484
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_3.sol
@@ -0,0 +1,24 @@
+contract C
+{
+	function f(uint x) public pure {
+		require(x == 0);
+		for (uint i = 0; i < 3; ++i) {
+			if (x > 1) {
+				x = 10;
+				continue;
+			}
+ 			if (x > 0) {
+				x = 11;
+				continue;
+			}
+			++x;
+		}
+		assert(x == 10);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_4.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_4.sol
new file mode 100644
index 0000000000..246aa74c97
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_4.sol
@@ -0,0 +1,24 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (; x < 2; ++x) {
+			if (x > 1) {
+				x = 10;
+				continue;
+			}
+			if (x > 0) {
+				x = 11;
+				continue;
+			}
+		}
+		// x > 0 branch triggers x = 11 and continue triggers ++x loop expression
+		assert(x == 12);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_5.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_5.sol
new file mode 100644
index 0000000000..270d8d4df8
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_continue_5.sol
@@ -0,0 +1,17 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (; x < 2; ++x) {
+			continue;
+		}
+		// loop expression is executed after continue
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_false_positive.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_false_positive.sol
new file mode 100644
index 0000000000..20071a64aa
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_false_positive.sol
@@ -0,0 +1,16 @@
+contract C
+{
+	function f() public pure {
+		uint x = 0;
+		for (;;) {
+			x = 1;
+		}
+		assert(x == 1000);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested.sol
new file mode 100644
index 0000000000..d63e2ca5c6
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested.sol
@@ -0,0 +1,17 @@
+contract C
+{
+	function f() public pure {
+		uint x;
+		for (uint i = 0; i < 2; ++i) {
+			for (uint j = 0; j < 2; ++j)
+				++x;
+		}
+		assert(x == 4);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_break.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_break.sol
new file mode 100644
index 0000000000..c302decafe
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_break.sol
@@ -0,0 +1,22 @@
+contract C
+{
+	function f(uint x) public pure {
+		require(x == 0);
+		for (uint i = 0; i < 2; ++i) {
+			for (uint j = 0; j < 2; ++j) {
+				x = x + 1;
+				break;
+			}
+			break;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Warning 5740: (92-95): Unreachable code.
+// Warning 5740: (126-129): Unreachable code.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_continue.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_continue.sol
new file mode 100644
index 0000000000..8c07d096a7
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_nested_continue.sol
@@ -0,0 +1,20 @@
+contract C
+{
+	function f() public pure {
+		uint x = 0;
+		for (uint i = 0; i < 2; ++i) {
+			for (uint j = 0; j < 2; ++j) {
+			    if (i > 0)
+					continue;
+				++x;
+			}
+		}
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol
new file mode 100644
index 0000000000..915c0e6908
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		int y = 0;
+		for (; x < 3 || y == 1; ++x) {
+			if (x >= 3)
+				y = 1;
+		}
+        // BMC loop iteration setting is not enough to leave the loop
+		assert(x == 0); // should hold - no assumptions on value if didn't complete loop
+		assert(y == 0); // should hold - no assumptions on value if didn't complete loop
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol
new file mode 100644
index 0000000000..337515c9a0
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		int y = 0;
+		for (; x < 3 || y == 1; ++x) {
+			if (x >= 3)
+				y = 1;
+		}
+        // BMC loop iteration setting is just enough to leave the loop
+		assert(x == 3); // should hold - no assumptions on value if didn't complete loop
+		assert(y == 0); // should hold - no assumptions on value if didn't complete loop
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol
new file mode 100644
index 0000000000..5ff9d17782
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		int y = 0;
+		for (; x < 3 || y == 1; ++x) {
+			if (x >= 3)
+				y = 1;
+		}
+        // BMC loop iteration setting is more than enough to leave the loop
+		assert(x == 3); // should hold - no assumptions on value if didn't complete loop
+		assert(y == 0); // should hold - no assumptions on value if didn't complete loop
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_shallow_unroll.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_shallow_unroll.sol
new file mode 100644
index 0000000000..8bfecdfa59
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_shallow_unroll.sol
@@ -0,0 +1,17 @@
+contract C
+{
+	function f() public pure {
+		uint x = 0;
+		for (uint i = 0; i < 2; ++i) {
+			++x;
+		}
+		// nothing is reported because loop condition is still true after BMCLoopIterations
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 1
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
index d667a55c85..36af4f9b41 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_1.sol
@@ -10,4 +10,3 @@ contract C {
 // SMTSolvers: z3
 // ----
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (90-96): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
index 65caca9826..0847066a05 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_trivial_condition_2.sol
@@ -13,4 +13,3 @@ contract C {
 // SMTSolvers: z3
 // ----
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (106-112): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol
deleted file mode 100644
index 4fdaa6bcf0..0000000000
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_unreachable_1.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-contract C {
-    function f(uint x) public pure {
-        require(x == 2);
-        for (; x > 2;) {}
-        assert(x == 2);
-    }
-}
-// ====
-// SMTEngine: all
-// SMTSolvers: z3
-// ----
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (90-95): BMC: Condition is always false.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_1.sol
new file mode 100644
index 0000000000..11a4e7587b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_1.sol
@@ -0,0 +1,18 @@
+contract C {
+	function f(uint x) public pure {
+		require(x == 0);
+		uint y;
+		while (y < 3) {
+			++y;
+			if (y == 2)
+			    x = 3;
+		}
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 2
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_2.sol
new file mode 100644
index 0000000000..075e342eae
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_2.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			++x;
+			{
+				++x;
+				++x;
+			}
+		}
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_3.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_3.sol
new file mode 100644
index 0000000000..2596af24f7
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_3.sol
@@ -0,0 +1,17 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			if (x >= 2)
+				++x;
+			++x;
+		}
+		assert(x == 4);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_4.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_4.sol
new file mode 100644
index 0000000000..8bfbe32d1a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_4.sol
@@ -0,0 +1,15 @@
+contract C {
+	function f(uint x) public pure {
+		x = 0;
+		while (x < 1) {
+			++x;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_5.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_5.sol
new file mode 100644
index 0000000000..f3166cee86
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_5.sol
@@ -0,0 +1,15 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (true) {
+			++x;
+		}
+		assert(x == 1000);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 1
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_7.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_7.sol
new file mode 100644
index 0000000000..3f6a5b4bfa
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_7.sol
@@ -0,0 +1,22 @@
+contract C {
+    uint x;
+
+    function condition() private returns(bool) {
+		++x;
+		return x < 3;
+	}
+
+	function f() public {
+		require(x == 0);
+		while (condition()) {
+		}
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Warning 2661: (77-80): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_1.sol
new file mode 100644
index 0000000000..a43c7489e7
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_1.sol
@@ -0,0 +1,17 @@
+contract C
+{
+	function f(uint x) public pure {
+		require(x == 0);
+		while (x < 2) {
+			++x;
+		}
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Warning 4661: (98-112): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_2.sol
new file mode 100644
index 0000000000..c16f755b66
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_2.sol
@@ -0,0 +1,18 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 2) {
+			++x;
+			break;
+		}
+		assert(x == 0);
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 2
+// ----
+// Warning 4661: (93-107): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_3.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_3.sol
new file mode 100644
index 0000000000..acaf4f9a3e
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_assertion_fails_3.sol
@@ -0,0 +1,17 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 2) {
+			++x;
+			continue;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Warning 4661: (96-110): BMC: Assertion violation happens here.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_1.sol
new file mode 100644
index 0000000000..c8b45bac04
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_1.sol
@@ -0,0 +1,16 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			++x;
+			break;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_2.sol
new file mode 100644
index 0000000000..c4a8c2f39b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_2.sol
@@ -0,0 +1,17 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			if (x > 0)
+				break;
+			++x;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_3.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_3.sol
new file mode 100644
index 0000000000..c089b906bc
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_3.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			if (x > 0) {
+				++x;
+				break;
+			}
+			++x;
+		}
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol
new file mode 100644
index 0000000000..d1939871bf
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_4.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			++x;
+			if (x > 0) {
+ 				++x;
+				break;
+			}
+		}
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_5.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_5.sol
new file mode 100644
index 0000000000..f7ba610a69
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_5.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			++x;
+			if (x > 1) {
+				++x;
+				break;
+			}
+		}
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol
new file mode 100644
index 0000000000..0546e48c0d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_6.sol
@@ -0,0 +1,23 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			++x;
+			if (x > 0) {
+ 				x = 2;
+				break;
+			}
+			if (x > 1) {
+				x = 3;
+				break;
+			}
+		}
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol
new file mode 100644
index 0000000000..8e4d3b6261
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_7.sol
@@ -0,0 +1,23 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			++x;
+			if (x > 1) {
+				x = 3;
+				break;
+ 			}
+			if (x > 0) {
+				x = 2;
+				break;
+ 			}
+		}
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_8.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_8.sol
new file mode 100644
index 0000000000..be6b04bb27
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_8.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		while (x < 3) {
+			if (x >= 0) {
+				++x;
+				break;
+			}
+			++x;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_9.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_9.sol
new file mode 100644
index 0000000000..caaa4f570a
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_9.sol
@@ -0,0 +1,18 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		while (x < 3) {
+			++x;
+			break;
+			++x;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Warning 5740: (94-97): Unreachable code.
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_1.sol
new file mode 100644
index 0000000000..bb95545234
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_1.sol
@@ -0,0 +1,21 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			if (x > 1) {
+				break;
+ 			}
+			if (x >= 0) {
+				x = 10;
+				continue;
+ 			}
+		}
+		assert(x == 10);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_2.sol
new file mode 100644
index 0000000000..b65404e22f
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_break_continue_2.sol
@@ -0,0 +1,22 @@
+contract C {
+	function f() public pure {
+		uint x;
+		while (x < 3) {
+			if (x > 1) {
+				x = 3;
+				break;
+ 			}
+			if (x >= 0) {
+				x = 2;
+				continue;
+ 			}
+		}
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_1.sol
new file mode 100644
index 0000000000..e17fa30373
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_1.sol
@@ -0,0 +1,19 @@
+contract C {
+	function f() public pure {
+		uint x;
+		uint i;
+		while (i < 3) {
+			++i;
+			if (i > 1)
+				continue;
+			++x;
+		}
+		assert(x == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_2.sol
new file mode 100644
index 0000000000..3670f8dacb
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_continue_2.sol
@@ -0,0 +1,24 @@
+contract C {
+	function f(uint x) public pure {
+		require(x == 0);
+		uint i;
+		while (i < 3) {
+			 ++i;
+			if (i == 2) {
+				x = 2;
+				continue;
+			}
+			if (i == 1) {
+				x = 1;
+				continue;
+			}
+		}
+		assert(x == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested.sol
new file mode 100644
index 0000000000..887ce60f7d
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested.sol
@@ -0,0 +1,22 @@
+contract C {
+	function f(uint z) public pure {
+		uint x = 0;
+		require(z == 0);
+		while (x < 2) {
+			uint y = 0;
+			while (y < 2) {
+				++z;
+				++y;
+			}
+			++x;
+		}
+		assert(z == 4);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_break.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_break.sol
new file mode 100644
index 0000000000..170c5a3c3c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_break.sol
@@ -0,0 +1,23 @@
+contract C {
+	function f(uint z) public pure {
+		uint x = 0;
+		require(z == 0);
+		while (x < 2) {
+			uint y = 0;
+			while (y < 2) {
+				if (y > 0)
+					break;
+				++z;
+				++y;
+			}
+			++x;
+		}
+		assert(z == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_continue.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_continue.sol
new file mode 100644
index 0000000000..66ad2081b4
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_nested_continue.sol
@@ -0,0 +1,23 @@
+contract C {
+	function f() public pure {
+		uint x;
+		uint i;
+		while (i < 3) {
+			++i;
+			uint j;
+			while (j < 3) {
+				++j;
+				if (i > 1)
+					continue;
+				++x;
+			}
+		}
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol
new file mode 100644
index 0000000000..eb497be7cb
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol
@@ -0,0 +1,20 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		int y = 0;
+		while (x < 3 || y == 1) {
+			if (x >= 3)
+				y = 1;
+			++x;
+		}
+        // BMC loop iteration setting is not enough to leave the loop
+		assert(x == 3);
+		assert(y == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 3
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
new file mode 100644
index 0000000000..90682c7f77
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
@@ -0,0 +1,21 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		int y = 0;
+		while (x < 3 || y == 1) {
+			if (x >= 3)
+				y = 1;
+			++x;
+		}
+        // BMC loop iteration setting is just enough to leave the loop
+		assert(x == 3); // should hold
+		assert(y == 1); // should fail
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 4
+// ----
+// Warning 4661: (240-254): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol
new file mode 100644
index 0000000000..992ac7f802
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol
@@ -0,0 +1,20 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		int y = 0;
+		while (x < 3 || y == 1) {
+			if (x >= 3)
+				y = 1;
+			++x;
+		}
+        // BMC loop iteration setting is more than enough to leave the loop
+		assert(x == 3); // should hold
+		assert(y == 0); // should hold
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_shallow_unroll.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_shallow_unroll.sol
new file mode 100644
index 0000000000..3134e35c47
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_shallow_unroll.sol
@@ -0,0 +1,17 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		while (x < 5) {
+			x = x + 1;
+		}
+		// nothing is reported because loop condition is true after unrolling the loop one time
+		assert(x == 5);
+		assert(x == 3);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 1
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol b/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
index 783a2f2689..4a6245b0fd 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_break_direct.sol
@@ -1,5 +1,4 @@
-contract C
-{
+contract C {
 	function f(uint x) public pure {
 		x = 0;
 		while (x < 10)
@@ -12,4 +11,3 @@ contract C
 // SMTSolvers: z3
 // ----
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 6838: (65-71): BMC: Condition is always true.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
index 2a9f39d1a2..ee7ab8bcc7 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
@@ -24,4 +24,4 @@ contract C {
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (184-197): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (228-244): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol b/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol
index 8d54f103f9..63976d59f9 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_inside_while.sol
@@ -11,4 +11,3 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 6321: (43-47): Unnamed return variable can remain unassigned. Add an explicit return with value to all non-reverting code paths or name the variable.
-// Warning 6838: (59-63): BMC: Condition is always true.
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 1b5d8da49d..30a8b28307 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -142,6 +142,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			"--optimize",
 			"--optimize-runs=1000",
 			"--yul-optimizations=agf",
+			"--model-checker-bmc-loop-iterations=2",
 			"--model-checker-contracts=contract1.yul:A,contract2.yul:B",
 			"--model-checker-div-mod-no-slacks",
 			"--model-checker-engine=bmc",
@@ -152,7 +153,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			"--model-checker-show-unsupported",
 			"--model-checker-solvers=z3,smtlib2",
 			"--model-checker-targets=underflow,divByZero",
-			"--model-checker-timeout=5",
+			"--model-checker-timeout=5"
 		};
 
 		if (inputMode == InputMode::CompilerWithASTImport)
@@ -210,6 +211,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 
 		expectedOptions.modelChecker.initialize = true;
 		expectedOptions.modelChecker.settings = {
+			2,
 			{{{"contract1.yul", {"A"}}, {"contract2.yul", {"B"}}}},
 			true,
 			{true, false},
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 60b871cf79..531fc3c177 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -105,6 +105,7 @@ void FuzzerUtil::testCompiler(
 	{
 		forceSMT(_input);
 		compiler.setModelCheckerSettings({
+			/*bmcLoopIterations*/1,
 			frontend::ModelCheckerContracts::Default(),
 			/*divModWithSlacks*/true,
 			frontend::ModelCheckerEngine::All(),

From 42a068b44997e3b56b7266b65806f4a1246f47ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 24 May 2023 14:22:18 +0200
Subject: [PATCH 1419/1748] CommandLineParser: Store the state of EVM assembly
 and Yul optimizer explicitly

- Does not change the meaning of CLI options, just the way we map them to internal variables.
---
 solc/CommandLineInterface.cpp   |  3 ---
 solc/CommandLineParser.cpp      | 19 +++++++++++-------
 solc/CommandLineParser.h        |  4 ++--
 test/solc/CommandLineParser.cpp | 35 +++++++++++++++++++++++++++++++--
 test/solc/Common.h              |  1 +
 5 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 0d0f4c5f9c..ae6888dfd2 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -1074,9 +1074,6 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 	map<string, yul::YulStack> yulStacks;
 	for (auto const& src: m_fileReader.sourceUnits())
 	{
-		// --no-optimize-yul option is not accepted in assembly mode.
-		solAssert(!m_options.optimizer.noOptimizeYul);
-
 		auto& stack = yulStacks[src.first] = yul::YulStack(
 			m_options.output.evmVersion,
 			m_options.output.eofVersion,
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index aab6b67104..5dbee10cd8 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -247,9 +247,9 @@ bool CommandLineOptions::operator==(CommandLineOptions const& _other) const noex
 		metadata.format == _other.metadata.format &&
 		metadata.hash == _other.metadata.hash &&
 		metadata.literalSources == _other.metadata.literalSources &&
-		optimizer.enabled == _other.optimizer.enabled &&
+		optimizer.optimizeEvmasm == _other.optimizer.optimizeEvmasm &&
+		optimizer.optimizeYul == _other.optimizer.optimizeYul &&
 		optimizer.expectedExecutionsPerDeployment == _other.optimizer.expectedExecutionsPerDeployment &&
-		optimizer.noOptimizeYul == _other.optimizer.noOptimizeYul &&
 		optimizer.yulSteps == _other.optimizer.yulSteps &&
 		modelChecker.initialize == _other.modelChecker.initialize &&
 		modelChecker.settings == _other.modelChecker.settings;
@@ -259,12 +259,12 @@ OptimiserSettings CommandLineOptions::optimiserSettings() const
 {
 	OptimiserSettings settings;
 
-	if (optimizer.enabled)
+	if (optimizer.optimizeEvmasm || optimizer.optimizeYul)
 		settings = OptimiserSettings::standard();
 	else
 		settings = OptimiserSettings::minimal();
 
-	if (optimizer.noOptimizeYul)
+	if (!optimizer.optimizeYul)
 		settings.runYulOptimiser = false;
 
 	if (optimizer.expectedExecutionsPerDeployment.has_value())
@@ -1166,8 +1166,10 @@ void CommandLineParser::processArgs()
 		);
 
 	// We deliberately ignore --optimize-yul
-	m_options.optimizer.enabled = (m_args.count(g_strOptimize) > 0);
-	m_options.optimizer.noOptimizeYul = (m_args.count(g_strNoOptimizeYul) > 0);
+	m_options.optimizer.optimizeEvmasm = (m_args.count(g_strOptimize) > 0);
+	m_options.optimizer.optimizeYul = (
+		m_args.count(g_strOptimize) > 0 && m_args.count(g_strNoOptimizeYul) == 0
+	);
 	if (!m_args[g_strOptimizeRuns].defaulted())
 		m_options.optimizer.expectedExecutionsPerDeployment = m_args.at(g_strOptimizeRuns).as<unsigned>();
 
@@ -1235,7 +1237,10 @@ void CommandLineParser::processArgs()
 			else
 				solThrow(CommandLineValidationError, "Invalid option for --" + g_strYulDialect + ": " + dialect);
 		}
-		if (m_options.optimizer.enabled && (m_options.assembly.inputLanguage != Input::StrictAssembly))
+		if (
+				(m_options.optimizer.optimizeEvmasm || m_options.optimizer.optimizeYul) &&
+				m_options.assembly.inputLanguage != Input::StrictAssembly
+			)
 			solThrow(
 				CommandLineValidationError,
 				"Optimizer can only be used for strict assembly. Use --"  + g_strStrictAssembly + "."
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index a4c5a77194..6b391e7240 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -223,9 +223,9 @@ struct CommandLineOptions
 
 	struct
 	{
-		bool enabled = false;
+		bool optimizeEvmasm = false;
+		bool optimizeYul = false;
 		std::optional<unsigned> expectedExecutionsPerDeployment;
-		bool noOptimizeYul = false;
 		std::optional<std::string> yulSteps;
 	} optimizer;
 
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 30a8b28307..54cc054178 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -140,6 +140,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			"--metadata-hash=swarm",
 			"--metadata-literal",
 			"--optimize",
+			"--optimize-yul",
 			"--optimize-runs=1000",
 			"--yul-optimizations=agf",
 			"--model-checker-bmc-loop-iterations=2",
@@ -205,7 +206,8 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 		};
 		expectedOptions.metadata.hash = CompilerStack::MetadataHash::Bzzr1;
 		expectedOptions.metadata.literalSources = true;
-		expectedOptions.optimizer.enabled = true;
+		expectedOptions.optimizer.optimizeEvmasm = true;
+		expectedOptions.optimizer.optimizeYul = true;
 		expectedOptions.optimizer.expectedExecutionsPerDeployment = 1000;
 		expectedOptions.optimizer.yulSteps = "agf";
 
@@ -336,7 +338,8 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		expectedOptions.compiler.outputs.astCompactJson = true;
 		if (expectedLanguage == YulStack::Language::StrictAssembly)
 		{
-			expectedOptions.optimizer.enabled = true;
+			expectedOptions.optimizer.optimizeEvmasm = true;
+			expectedOptions.optimizer.optimizeYul = true;
 			expectedOptions.optimizer.yulSteps = "agf";
 			expectedOptions.optimizer.expectedExecutionsPerDeployment = 1000;
 		}
@@ -435,6 +438,34 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 		}
 }
 
+BOOST_AUTO_TEST_CASE(optimizer_flags)
+{
+	OptimiserSettings evmasmOnly = OptimiserSettings::standard();
+	evmasmOnly.runYulOptimiser = false;
+
+	map<vector<string>, OptimiserSettings> settingsMap = {
+		{{}, OptimiserSettings::minimal()},
+		{{"--optimize"}, OptimiserSettings::standard()},
+		{{"--no-optimize-yul"}, OptimiserSettings::minimal()},
+		{{"--optimize-yul"}, OptimiserSettings::minimal()},
+		{{"--optimize", "--no-optimize-yul"}, evmasmOnly},
+		{{"--optimize", "--optimize-yul"}, OptimiserSettings::standard()},
+	};
+
+	map<InputMode, string> inputModeFlagMap = {
+		{InputMode::Compiler, ""},
+		{InputMode::CompilerWithASTImport, "--import-ast"},
+	};
+
+	for (auto const& [inputMode, inputModeFlag]: inputModeFlagMap)
+		for (auto const& [optimizerFlags, expectedOptimizerSettings]: settingsMap)
+		{
+			vector<string> commandLine = {"solc", inputModeFlag, "file"};
+			commandLine += optimizerFlags;
+			BOOST_CHECK(parseCommandLine(commandLine).optimiserSettings() == expectedOptimizerSettings);
+		}
+}
+
 BOOST_AUTO_TEST_CASE(default_optimiser_sequence)
 {
 	CommandLineOptions const& commandLineOptions = parseCommandLine({"solc", "contract.sol", "--optimize"});
diff --git a/test/solc/Common.h b/test/solc/Common.h
index 3575bea74e..69131bf2ca 100644
--- a/test/solc/Common.h
+++ b/test/solc/Common.h
@@ -28,6 +28,7 @@
 
 BOOST_TEST_DONT_PRINT_LOG_VALUE(solidity::frontend::CommandLineOptions)
 BOOST_TEST_DONT_PRINT_LOG_VALUE(solidity::frontend::InputMode)
+BOOST_TEST_DONT_PRINT_LOG_VALUE(solidity::frontend::OptimiserSettings)
 
 namespace solidity::frontend::test
 {

From 2769bb52f65c5d6d3ff6150499fe8ece79b43047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 23 May 2023 14:59:54 +0200
Subject: [PATCH 1420/1748] Make --optimize-yul work again

---
 Changelog.md                                  |  1 +
 solc/CommandLineParser.cpp                    | 40 ++++++++-----------
 .../args                                      |  1 -
 .../err                                       |  1 -
 .../exit                                      |  1 -
 .../input.yul                                 |  3 --
 test/solc/CommandLineParser.cpp               |  7 +++-
 7 files changed, 24 insertions(+), 30 deletions(-)
 delete mode 100644 test/cmdlineTests/strict_asm_invalid_option_optimize_yul/args
 delete mode 100644 test/cmdlineTests/strict_asm_invalid_option_optimize_yul/err
 delete mode 100644 test/cmdlineTests/strict_asm_invalid_option_optimize_yul/exit
 delete mode 100644 test/cmdlineTests/strict_asm_invalid_option_optimize_yul/input.yul

diff --git a/Changelog.md b/Changelog.md
index 62806a5e1d..c47ac3e47d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 Compiler Features:
  * Commandline Interface: Add ``--ast-compact-json`` output in assembler mode.
  * Commandline Interface: Add ``--ir-ast-json`` and ``--ir-optimized-ast-json`` outputs for Solidity input, providing AST in compact JSON format for IR and optimized IR.
+ * Commandline Interface: Respect ``--optimize-yul`` and ``--no-optimize-yul`` in compiler mode and accept them in assembler mode as well. ``--optimize --no-optimize-yul`` combination now allows enabling EVM assembly optimizer without enabling Yul optimizer.
  * EWasm: Remove EWasm backend.
  * Parser: Introduce ``pragma experimental solidity``, which will enable an experimental language mode that in particular has no stability guarantees between non-breaking releases and is not suited for production use.
  * Standard JSON Interface: Add ``ast`` file-level output for Yul input.
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 5dbee10cd8..9cc93d78da 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -259,13 +259,16 @@ OptimiserSettings CommandLineOptions::optimiserSettings() const
 {
 	OptimiserSettings settings;
 
-	if (optimizer.optimizeEvmasm || optimizer.optimizeYul)
+	if (optimizer.optimizeEvmasm)
 		settings = OptimiserSettings::standard();
 	else
 		settings = OptimiserSettings::minimal();
 
-	if (!optimizer.optimizeYul)
-		settings.runYulOptimiser = false;
+	settings.runYulOptimiser = optimizer.optimizeYul;
+	if (optimizer.optimizeYul)
+		// NOTE: Standard JSON disables optimizeStackAllocation by default when yul optimizer is disabled.
+		// --optimize --no-optimize-yul on the CLI does not have that effect.
+		settings.optimizeStackAllocation = true;
 
 	if (optimizer.expectedExecutionsPerDeployment.has_value())
 		settings.expectedExecutionsPerDeployment = optimizer.expectedExecutionsPerDeployment.value();
@@ -644,21 +647,15 @@ General Information)").c_str(),
 		)
 		(
 			g_strAssemble.c_str(),
-			("Switch to assembly mode, ignoring all options except "
-			"--" + g_strMachine + ", --" + g_strYulDialect + ", --" + g_strOptimize + " and --" + g_strYulOptimizations + " "
-			"and assumes input is assembly.").c_str()
+			"Switch to assembly mode and assume input is assembly."
 		)
 		(
 			g_strYul.c_str(),
-			("Switch to Yul mode, ignoring all options except "
-			"--" + g_strMachine + ", --" + g_strYulDialect + ", --" + g_strOptimize + " and --" + g_strYulOptimizations + " "
-			"and assumes input is Yul.").c_str()
+			"Switch to Yul mode and assume input is Yul."
 		)
 		(
 			g_strStrictAssembly.c_str(),
-			("Switch to strict assembly mode, ignoring all options except "
-			"--" + g_strMachine + ", --" + g_strYulDialect + ", --" + g_strOptimize + " and --" + g_strYulOptimizations + " "
-			"and assumes input is strict assembly.").c_str()
+			"Switch to strict assembly mode and assume input is strict assembly."
 		)
 		(
 			g_strImportAst.c_str(),
@@ -784,7 +781,7 @@ General Information)").c_str(),
 	optimizerOptions.add_options()
 		(
 			g_strOptimize.c_str(),
-			"Enable bytecode optimizer."
+			"Enable optimizer."
 		)
 		(
 			g_strOptimizeRuns.c_str(),
@@ -796,16 +793,18 @@ General Information)").c_str(),
 		)
 		(
 			g_strOptimizeYul.c_str(),
-			("Legacy option, ignored. Use the general --" + g_strOptimize + " to enable Yul optimizer.").c_str()
+			("Enable Yul optimizer (independently of the EVM assembly optimizer). "
+			"The general --" + g_strOptimize + " option automatically enables this unless --" +
+			g_strNoOptimizeYul + " is specified.").c_str()
 		)
 		(
 			g_strNoOptimizeYul.c_str(),
-			"Disable Yul optimizer in Solidity."
+			"Disable Yul optimizer (independently of the EVM assembly optimizer)."
 		)
 		(
 			g_strYulOptimizations.c_str(),
 			po::value<string>()->value_name("steps"),
-			"Forces yul optimizer to use the specified sequence of optimization steps instead of the built-in one."
+			"Forces Yul optimizer to use the specified sequence of optimization steps instead of the built-in one."
 		)
 	;
 	desc.add(optimizerOptions);
@@ -1165,10 +1164,10 @@ void CommandLineParser::processArgs()
 			"Options --" + g_strOptimizeYul + " and --" + g_strNoOptimizeYul + " cannot be used together."
 		);
 
-	// We deliberately ignore --optimize-yul
 	m_options.optimizer.optimizeEvmasm = (m_args.count(g_strOptimize) > 0);
 	m_options.optimizer.optimizeYul = (
-		m_args.count(g_strOptimize) > 0 && m_args.count(g_strNoOptimizeYul) == 0
+		(m_args.count(g_strOptimize) > 0 && m_args.count(g_strNoOptimizeYul) == 0) ||
+		m_args.count(g_strOptimizeYul) > 0
 	);
 	if (!m_args[g_strOptimizeRuns].defaulted())
 		m_options.optimizer.expectedExecutionsPerDeployment = m_args.at(g_strOptimizeRuns).as<unsigned>();
@@ -1201,8 +1200,6 @@ void CommandLineParser::processArgs()
 			g_strOutputDir,
 			g_strGas,
 			g_strCombinedJson,
-			g_strOptimizeYul,
-			g_strNoOptimizeYul,
 		};
 		if (countEnabledOptions(nonAssemblyModeOptions) >= 1)
 		{
@@ -1210,9 +1207,6 @@ void CommandLineParser::processArgs()
 			auto enabledOptions = nonAssemblyModeOptions | ranges::views::filter(optionEnabled) | ranges::to_vector;
 
 			string message = "The following options are invalid in assembly mode: " + joinOptionNames(enabledOptions) + ".";
-			if (m_args.count(g_strOptimizeYul) || m_args.count(g_strNoOptimizeYul))
-				message += " Optimization is disabled by default and can be enabled with --" + g_strOptimize + ".";
-
 			solThrow(CommandLineValidationError, message);
 		}
 
diff --git a/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/args b/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/args
deleted file mode 100644
index 827d998294..0000000000
--- a/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/args
+++ /dev/null
@@ -1 +0,0 @@
---strict-assembly --optimize-yul
diff --git a/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/err b/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/err
deleted file mode 100644
index a6378a665e..0000000000
--- a/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/err
+++ /dev/null
@@ -1 +0,0 @@
-The following options are invalid in assembly mode: --optimize-yul. Optimization is disabled by default and can be enabled with --optimize.
diff --git a/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/exit b/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/exit
deleted file mode 100644
index d00491fd7e..0000000000
--- a/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/input.yul b/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/input.yul
deleted file mode 100644
index f21cd2b7e0..0000000000
--- a/test/cmdlineTests/strict_asm_invalid_option_optimize_yul/input.yul
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    sstore(0, 1)
-}
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 54cc054178..1fc033533d 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -440,6 +440,10 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 
 BOOST_AUTO_TEST_CASE(optimizer_flags)
 {
+	OptimiserSettings yulOnly = OptimiserSettings::minimal();
+	yulOnly.runYulOptimiser = true;
+	yulOnly.optimizeStackAllocation = true;
+
 	OptimiserSettings evmasmOnly = OptimiserSettings::standard();
 	evmasmOnly.runYulOptimiser = false;
 
@@ -447,7 +451,7 @@ BOOST_AUTO_TEST_CASE(optimizer_flags)
 		{{}, OptimiserSettings::minimal()},
 		{{"--optimize"}, OptimiserSettings::standard()},
 		{{"--no-optimize-yul"}, OptimiserSettings::minimal()},
-		{{"--optimize-yul"}, OptimiserSettings::minimal()},
+		{{"--optimize-yul"}, yulOnly},
 		{{"--optimize", "--no-optimize-yul"}, evmasmOnly},
 		{{"--optimize", "--optimize-yul"}, OptimiserSettings::standard()},
 	};
@@ -455,6 +459,7 @@ BOOST_AUTO_TEST_CASE(optimizer_flags)
 	map<InputMode, string> inputModeFlagMap = {
 		{InputMode::Compiler, ""},
 		{InputMode::CompilerWithASTImport, "--import-ast"},
+		{InputMode::Assembler, "--strict-assembly"},
 	};
 
 	for (auto const& [inputMode, inputModeFlag]: inputModeFlagMap)

From 47969adf91dc3952592f473e4afbe5e306e477aa Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 18 May 2023 15:22:09 +0200
Subject: [PATCH 1421/1748] Experimental standard library

Change import syntax and cover with tests
---
 CMakeLists.txt                                |  1 +
 libsolidity/interface/CompilerStack.cpp       | 12 +++++++
 libsolidity/parsing/Parser.cpp                | 29 ++++++++++++---
 libsolidity/parsing/Parser.h                  |  5 +++
 libstdlib/CMakeLists.txt                      | 18 ++++++++++
 libstdlib/src/stub.sol                        |  9 +++++
 libstdlib/stdlib.h.in                         | 15 ++++++++
 libstdlib/stdlib.src.h.in                     | 13 +++++++
 scripts/ASTImportTest.sh                      |  2 +-
 scripts/test_antlr_grammar.sh                 |  2 +-
 test/libsolidity/SyntaxTest.cpp               | 35 ++++++++++---------
 .../experimental/parsing_stdlib_import_1.sol  |  8 +++++
 .../experimental/parsing_stdlib_import_2.sol  |  8 +++++
 .../experimental/parsing_stdlib_import_3.sol  |  8 +++++
 .../experimental/parsing_stdlib_import_4.sol  |  8 +++++
 ...parsing_stdlib_import_without_pragma_1.sol |  3 ++
 ...parsing_stdlib_import_without_pragma_2.sol |  3 ++
 17 files changed, 157 insertions(+), 22 deletions(-)
 create mode 100644 libstdlib/CMakeLists.txt
 create mode 100644 libstdlib/src/stub.sol
 create mode 100644 libstdlib/stdlib.h.in
 create mode 100644 libstdlib/stdlib.src.h.in
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_1.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_2.sol

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9a7a18761..85d2f64ce8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -140,6 +140,7 @@ add_subdirectory(libevmasm)
 add_subdirectory(libyul)
 add_subdirectory(libsolidity)
 add_subdirectory(libsolc)
+add_subdirectory(libstdlib)
 add_subdirectory(tools)
 
 if (NOT EMSCRIPTEN)
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index f8a5fed6ec..aad2bc2baf 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -59,6 +59,8 @@
 #include <libsolidity/codegen/ir/Common.h>
 #include <libsolidity/codegen/ir/IRGenerator.h>
 
+#include <libstdlib/stdlib.h>
+
 #include <libyul/YulString.h>
 #include <libyul/AsmPrinter.h>
 #include <libyul/AsmJsonConverter.h>
@@ -95,6 +97,7 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
+using namespace solidity::stdlib;
 
 using solidity::util::errinfo_comment;
 
@@ -369,6 +372,15 @@ bool CompilerStack::parse()
 			for (auto const& import: ASTNode::filteredNodes<ImportDirective>(source.ast->nodes()))
 			{
 				solAssert(!import->path().empty(), "Import path cannot be empty.");
+				// Check whether the import directive is for the standard library,
+				// and if yes, add specified file to source units to be parsed.
+				auto it = stdlib::sources.find(import->path());
+				if (it != stdlib::sources.end())
+				{
+					auto [name, content] = *it;
+					m_sources[name].charStream = make_unique<CharStream>(content, name);
+					sourcesToParse.push_back(name);
+				}
 
 				// The current value of `path` is the absolute path as seen from this source file.
 				// We first have to apply remappings before we can store the actual absolute path
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 34fc9644e8..efbe854482 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -271,9 +271,9 @@ ASTPointer<ImportDirective> Parser::parseImportDirective()
 	SourceLocation unitAliasLocation{};
 	ImportDirective::SymbolAliasList symbolAliases;
 
-	if (m_scanner->currentToken() == Token::StringLiteral)
+	if (isQuotedPath() || isStdlibPath())
 	{
-		path = getLiteralAndAdvance();
+		path = isQuotedPath() ? getLiteralAndAdvance() : getStdlibImportPathAndAdvance();
 		if (m_scanner->currentToken() == Token::As)
 		{
 			advance();
@@ -315,9 +315,9 @@ ASTPointer<ImportDirective> Parser::parseImportDirective()
 		if (m_scanner->currentToken() != Token::Identifier || m_scanner->currentLiteral() != "from")
 			fatalParserError(8208_error, "Expected \"from\".");
 		advance();
-		if (m_scanner->currentToken() != Token::StringLiteral)
+		if (!isQuotedPath() && !isStdlibPath())
 			fatalParserError(6845_error, "Expected import path.");
-		path = getLiteralAndAdvance();
+		path = isQuotedPath() ? getLiteralAndAdvance() : getStdlibImportPathAndAdvance();
 	}
 	if (path->empty())
 		fatalParserError(6326_error, "Import path cannot be empty.");
@@ -2486,4 +2486,25 @@ ASTPointer<ASTString> Parser::getLiteralAndAdvance()
 	return identifier;
 }
 
+bool Parser::isQuotedPath() const
+{
+	return m_scanner->currentToken() == Token::StringLiteral;
+}
+
+bool Parser::isStdlibPath() const
+{
+	return m_experimentalSolidityEnabledInCurrentSourceUnit
+		&& m_scanner->currentToken() == Token::Identifier
+		&& m_scanner->currentLiteral() == "std";
+}
+
+ASTPointer<ASTString> Parser::getStdlibImportPathAndAdvance()
+{
+	ASTPointer<ASTString> std = expectIdentifierToken();
+	if (m_scanner->currentToken() == Token::Period)
+		advance();
+	ASTPointer<ASTString> library = expectIdentifierToken();
+	return make_shared<ASTString>(*std + "." + *library);
+}
+
 }
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index c83b307b85..65e8f61f31 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -219,6 +219,11 @@ class Parser: public langutil::ParserBase
 	ASTPointer<ASTString> getLiteralAndAdvance();
 	///@}
 
+	bool isQuotedPath() const;
+	bool isStdlibPath() const;
+
+	ASTPointer<ASTString> getStdlibImportPathAndAdvance();
+
 	/// Creates an empty ParameterList at the current location (used if parameters can be omitted).
 	ASTPointer<ParameterList> createEmptyParameterList();
 
diff --git a/libstdlib/CMakeLists.txt b/libstdlib/CMakeLists.txt
new file mode 100644
index 0000000000..a4523b99eb
--- /dev/null
+++ b/libstdlib/CMakeLists.txt
@@ -0,0 +1,18 @@
+# This will re-generate the headers if any file within src was modified.
+set_directory_properties(PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/stdlib/src/)
+
+set(STDLIB stub)
+set(GENERATED_STDLIB_HEADERS)
+foreach(src IN LISTS STDLIB)
+    set(STDLIB_FILE ${CMAKE_SOURCE_DIR}/libstdlib/src/${src}.sol)
+    file(READ ${STDLIB_FILE} STDLIB_FILE_CONTENT HEX)
+    string(REGEX MATCHALL ".." STDLIB_FILE_CONTENT "${STDLIB_FILE_CONTENT}")
+    list(REMOVE_ITEM STDLIB_FILE_CONTENT "0d")
+    string(REGEX REPLACE ";" ",\n\t0x" STDLIB_FILE_CONTENT "${STDLIB_FILE_CONTENT}")
+    set(STDLIB_FILE_CONTENT "0x${STDLIB_FILE_CONTENT}")
+    set(STDLIB_FILE_NAME ${src})
+    configure_file("${CMAKE_SOURCE_DIR}/libstdlib/stdlib.src.h.in" ${CMAKE_BINARY_DIR}/include/libstdlib/${src}.h NEWLINE_STYLE LF @ONLY)
+    list(APPEND GENERATED_STDLIB_HEADERS ${CMAKE_BINARY_DIR}/include/libstdlib/${src}.h)
+endforeach()
+
+configure_file("${CMAKE_SOURCE_DIR}/libstdlib/stdlib.h.in" ${CMAKE_BINARY_DIR}/include/libstdlib/stdlib.h NEWLINE_STYLE LF @ONLY)
diff --git a/libstdlib/src/stub.sol b/libstdlib/src/stub.sol
new file mode 100644
index 0000000000..46ae21dcf5
--- /dev/null
+++ b/libstdlib/src/stub.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity >=0.0;
+
+pragma experimental solidity;
+
+function identity(uint256 x) pure returns (uint256)
+{
+  return x;
+}
diff --git a/libstdlib/stdlib.h.in b/libstdlib/stdlib.h.in
new file mode 100644
index 0000000000..3b86029dc6
--- /dev/null
+++ b/libstdlib/stdlib.h.in
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <map>
+#include <string>
+
+#include "libstdlib/stub.h"
+
+namespace solidity::stdlib
+{
+
+static std::map<std::string, std::string> sources = {
+	{ "std.stub", stub }
+};
+
+} // namespace solidity::stdlib
diff --git a/libstdlib/stdlib.src.h.in b/libstdlib/stdlib.src.h.in
new file mode 100644
index 0000000000..0407663d6b
--- /dev/null
+++ b/libstdlib/stdlib.src.h.in
@@ -0,0 +1,13 @@
+// The generation of this file is defined in stdlib/CMakeLists.txt.
+// This file was generated by using the content of stdlib/src/@STDLIB_FILE_NAME@.sol.
+
+#pragma once
+
+namespace solidity::stdlib
+{
+
+static char const @STDLIB_FILE_NAME@[] = {
+	@STDLIB_FILE_CONTENT@, 0
+};
+
+} // namespace solidity::stdlib
diff --git a/scripts/ASTImportTest.sh b/scripts/ASTImportTest.sh
index faf98c1926..c245261951 100755
--- a/scripts/ASTImportTest.sh
+++ b/scripts/ASTImportTest.sh
@@ -209,7 +209,7 @@ esac
 # boost_filesystem_bug specifically tests a local fix for a boost::filesystem
 # bug. Since the test involves a malformed path, there is no point in running
 # tests on it. See https://github.com/boostorg/filesystem/issues/176
-IMPORT_TEST_FILES=$(find "${TEST_DIRS[@]}" -name "*.sol" -and -not -name "boost_filesystem_bug.sol")
+IMPORT_TEST_FILES=$(find "${TEST_DIRS[@]}" -name "*.sol" -and -not -name "boost_filesystem_bug.sol" -not -path "*/experimental/*")
 
 NSOURCES="$(echo "${IMPORT_TEST_FILES}" | wc -l)"
 echo "Looking at ${NSOURCES} .sol files..."
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
index e84f9b064a..4dde11bf7d 100755
--- a/scripts/test_antlr_grammar.sh
+++ b/scripts/test_antlr_grammar.sh
@@ -110,7 +110,7 @@ do
   SOL_FILES+=("$line")
 done < <(
   grep --include "*.sol" -riL -E \
-    "^\/\/ (Syntax|Type|Declaration)Error|^\/\/ ParserError (1684|2837|3716|3997|5333|6275|6281|6933|7319|8185|7637)|^==== Source:" \
+    "^\/\/ (Syntax|Type|Declaration)Error|^\/\/ ParserError (1684|2837|3716|3997|5333|6275|6281|6933|7319|8185|7637)|^==== Source:|^pragma experimental solidity;" \
     "${ROOT_DIR}/test/libsolidity/syntaxTests" \
     "${ROOT_DIR}/test/libsolidity/semanticTests" |
       # Skipping the unicode tests as I couldn't adapt the lexical grammar to recursively counting RLO/LRO/PDF's.
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index ee3c4b4b06..159f9dcb12 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -123,25 +123,28 @@ void SyntaxTest::filterObtainedErrors()
 		string sourceName;
 		if (SourceLocation const* location = currentError->sourceLocation())
 		{
+			locationStart = location->start;
+			locationEnd = location->end;
 			solAssert(location->sourceName, "");
 			sourceName = *location->sourceName;
-			solAssert(m_sources.sources.count(sourceName) == 1, "");
-
-			int preambleSize =
-				static_cast<int>(compiler().charStream(sourceName).size()) -
-				static_cast<int>(m_sources.sources[sourceName].size());
-			solAssert(preambleSize >= 0, "");
-
-			// ignore the version & license pragma inserted by the testing tool when calculating locations.
-			if (location->start != -1)
-			{
-				solAssert(location->start >= preambleSize, "");
-				locationStart = location->start - preambleSize;
-			}
-			if (location->end != -1)
+			if(m_sources.sources.count(sourceName) == 1)
 			{
-				solAssert(location->end >= preambleSize, "");
-				locationEnd = location->end - preambleSize;
+				int preambleSize =
+						static_cast<int>(compiler().charStream(sourceName).size()) -
+						static_cast<int>(m_sources.sources[sourceName].size());
+				solAssert(preambleSize >= 0, "");
+
+				// ignore the version & license pragma inserted by the testing tool when calculating locations.
+				if (location->start != -1)
+				{
+					solAssert(location->start >= preambleSize, "");
+					locationStart = location->start - preambleSize;
+				}
+				if (location->end != -1)
+				{
+					solAssert(location->end >= preambleSize, "");
+					locationEnd = location->end - preambleSize;
+				}
 			}
 		}
 		m_errorList.emplace_back(SyntaxTestError{
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
new file mode 100644
index 0000000000..beec24c1e4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
@@ -0,0 +1,8 @@
+pragma experimental solidity;
+
+import std.stub;
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
new file mode 100644
index 0000000000..85d3a4ac7b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
@@ -0,0 +1,8 @@
+pragma experimental solidity;
+
+import std.stub as stub;
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
new file mode 100644
index 0000000000..7e51a73b10
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
@@ -0,0 +1,8 @@
+pragma experimental solidity;
+
+import { identity } from std.stub;
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
new file mode 100644
index 0000000000..3c4ff41d6c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
@@ -0,0 +1,8 @@
+pragma experimental solidity;
+
+import * as stub from std.stub;
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_1.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_1.sol
new file mode 100644
index 0000000000..0106846f98
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_1.sol
@@ -0,0 +1,3 @@
+import std.stub;
+// ----
+// ParserError 9478: (7-10): Expected string literal (path), "*" or alias list.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_2.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_2.sol
new file mode 100644
index 0000000000..3a6c1848ba
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_2.sol
@@ -0,0 +1,3 @@
+import { identity } from std.stub;
+// ----
+// ParserError 6845: (25-28): Expected import path.

From 25c78be73e7f077e1c750ed65b8004938f5f5cc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 6 Jun 2023 10:07:31 +0200
Subject: [PATCH 1422/1748] Give error_message in msg_on_error an initial value
 to make it compatible with set -u

---
 scripts/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index b5c6ada914..da8726f3fa 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -121,7 +121,7 @@ function assertFail
 
 function msg_on_error
 {
-    local error_message
+    local error_message=""
     local no_stdout=false
     local no_stderr=false
 

From e6716e320805416ee17d64a136de0912eefeb0f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 1 Jun 2023 16:39:11 +0200
Subject: [PATCH 1423/1748] Helpers for removing decorations form solc output

---
 scripts/common_cmdline.sh                     | 27 +++++++++++++++++
 test/cmdlineTests/~via_ir_equivalence/test.sh | 30 +++++++++----------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/scripts/common_cmdline.sh b/scripts/common_cmdline.sh
index d364f64448..1b40f50d53 100644
--- a/scripts/common_cmdline.sh
+++ b/scripts/common_cmdline.sh
@@ -103,3 +103,30 @@ function compileFull
         false
     fi
 }
+
+function stripCLIDecorations
+{
+    sed -e '/^=======.*=======$/d' \
+        -e '/^Binary:$/d' \
+        -e '/^Binary of the runtime part:$/d' \
+        -e '/^Opcodes:$/d' \
+        -e '/^IR:$/d' \
+        -e '/^Optimized IR:$/d' \
+        -e '/^EVM assembly:$/d' \
+        -e '/^JSON AST (compact format):$/d' \
+        -e '/^Function signatures:$/d' \
+        -e '/^Contract Storage Layout:$/d' \
+        -e '/^Developer Documentation$/d' \
+        -e '/^User Documentation$/d' \
+        -e '/^Contract JSON ABI$/d' \
+        -e '/^Metadata:$/d' \
+        -e '/^EVM$/d' \
+        -e '/^Pretty printed source:$/d' \
+        -e '/^Text representation:$/d' \
+        -e '/^Binary representation:$/d'
+}
+
+function stripEmptyLines
+{
+    sed -e '/^\s*$/d'
+}
diff --git a/test/cmdlineTests/~via_ir_equivalence/test.sh b/test/cmdlineTests/~via_ir_equivalence/test.sh
index 4da72d1518..c318f262a0 100755
--- a/test/cmdlineTests/~via_ir_equivalence/test.sh
+++ b/test/cmdlineTests/~via_ir_equivalence/test.sh
@@ -3,6 +3,8 @@ set -eo pipefail
 
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
+# shellcheck source=scripts/common_cmdline.sh
+source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
 function test_via_ir_equivalence()
 {
@@ -21,24 +23,24 @@ function test_via_ir_equivalence()
     [[ $optimize_flag == "" ]] || optimizer_flags+=("$optimize_flag")
     [[ $optimize_flag == "" ]] || output_file_prefix+="_optimize"
 
-    msg_on_error --no-stderr "$SOLC" --ir-optimized --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
-        sed '/^Optimized IR:$/d' |
-        split_on_empty_lines_into_numbered_files "$output_file_prefix" ".yul"
+    msg_on_error --no-stderr \
+        "$SOLC" --ir-optimized --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
+            stripCLIDecorations |
+            split_on_empty_lines_into_numbered_files "$output_file_prefix" ".yul"
 
     local asm_output_two_stage asm_output_via_ir
 
     for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
         asm_output_two_stage+=$(
-            msg_on_error --no-stderr "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" "$yul_file" |
-                sed '/^Text representation:$/d' |
-                sed '/^=======/d'
+            msg_on_error --no-stderr \
+                "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" "$yul_file" | stripCLIDecorations
         )
     done
 
     asm_output_via_ir=$(
-        msg_on_error --no-stderr "$SOLC" --via-ir --asm --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
-            sed '/^EVM assembly:$/d' |
-            sed '/^=======/d'
+        msg_on_error --no-stderr \
+            "$SOLC" --via-ir --asm --debug-info location "${optimizer_flags[@]}" "$solidity_file" |
+                stripCLIDecorations
     )
 
     diff_values "$asm_output_two_stage" "$asm_output_via_ir" --ignore-space-change --ignore-blank-lines
@@ -47,16 +49,14 @@ function test_via_ir_equivalence()
 
     for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
         bin_output_two_stage+=$(
-            msg_on_error --no-stderr "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" |
-                sed '/^Binary representation:$/d' |
-                sed '/^=======/d'
+            msg_on_error --no-stderr \
+                "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" | stripCLIDecorations
         )
     done
 
     bin_output_via_ir=$(
-        msg_on_error --no-stderr "$SOLC" --via-ir --bin "${optimizer_flags[@]}" "$solidity_file" |
-            sed '/^Binary:$/d' |
-            sed '/^=======/d'
+        msg_on_error --no-stderr \
+            "$SOLC" --via-ir --bin "${optimizer_flags[@]}" "$solidity_file" | stripCLIDecorations
     )
 
     diff_values "$bin_output_two_stage" "$bin_output_via_ir" --ignore-space-change --ignore-blank-lines

From 64ef9d581bb2d526dac1a3f21b7b22b21673eee9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 1 Jun 2023 16:42:45 +0200
Subject: [PATCH 1424/1748] Command-line test for equivalence of optimizer
 options on the CLI and in Standard JSON

---
 scripts/common_cmdline.sh                     | 39 ++++++++++++
 .../test.sh                                   | 61 +++++++++++++++++++
 2 files changed, 100 insertions(+)
 create mode 100755 test/cmdlineTests/~cli_and_standard_json_equivalence/test.sh

diff --git a/scripts/common_cmdline.sh b/scripts/common_cmdline.sh
index 1b40f50d53..5e32a76dc9 100644
--- a/scripts/common_cmdline.sh
+++ b/scripts/common_cmdline.sh
@@ -104,6 +104,45 @@ function compileFull
     fi
 }
 
+function singleContractOutputViaStandardJSON
+{
+    (( $# == 4 )) || assertFail
+    local language="$1"
+    local selected_output="$2"
+    local extra_settings="$3"
+    local input_file="$4"
+    [[ $selected_output != "*" ]] || assertFail
+
+    json_output=$(
+        "$SOLC" --standard-json --allow-paths "$(basename "$input_file")" - <<EOF
+        {
+            "language": "${language}",
+            "sources": {"${input_file}": {"urls": ["${input_file}"]}},
+            "settings": {
+                "outputSelection": {"*": { "*": ["${selected_output}"]}},
+                ${extra_settings}
+            }
+        }
+EOF
+    )
+
+    local error_list output has_contract_level_outputs
+
+    error_list=$(echo "$json_output" | jq '.errors[] | select(.severity=="error")')
+    [[ $error_list == '' ]] || \
+        fail "Failed to compile ${input_file} via Standard JSON. Errors: ${error_list}"
+
+    has_contract_level_outputs=$(echo "$json_output" | jq 'has("contracts")')
+    [[ $has_contract_level_outputs == true ]] || \
+        fail "Standard JSON output ${selected_output} was ignored by the compiler."
+
+    output=$(echo "$json_output" | jq --raw-output ".contracts[\"${input_file}\"][].${selected_output}")
+    [[ $output != null ]] || \
+        fail "Compiler failed to produce the ${selected_output} output when compiling ${input_file} via Standard JSON."
+
+    echo "$output"
+}
+
 function stripCLIDecorations
 {
     sed -e '/^=======.*=======$/d' \
diff --git a/test/cmdlineTests/~cli_and_standard_json_equivalence/test.sh b/test/cmdlineTests/~cli_and_standard_json_equivalence/test.sh
new file mode 100755
index 0000000000..4a7fe05b8b
--- /dev/null
+++ b/test/cmdlineTests/~cli_and_standard_json_equivalence/test.sh
@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+# shellcheck source=scripts/common_cmdline.sh
+source "${REPO_ROOT}/scripts/common_cmdline.sh"
+
+function test_cli_and_standard_json_equivalence
+{
+    (( $# == 5 )) || assertFail
+    local cli_options="$1"
+    local selected_cli_output="$2"
+    local standard_json_settings="$3"
+    local selected_standard_json_output="$4"
+    local input_file_relative_path="$5"
+
+    # CLI normalizes paths, Standard JSON uses them as is. Using paths that would change under this
+    # normalization will make the comparison fail. To avoid this use already normalized paths.
+    # The sanity check below should reject most of these by disallowing absolute paths, relative
+    # paths with ./ or ../ segments and paths with redundant slashes, but keep in mind it's not foolproof.
+    [[ $input_file_relative_path =~ ^/|^\.$|\./|^\.\.$|\.\./|// ]] && assertfail
+
+    local cli_output standard_json_output
+    cli_output=$(
+        # shellcheck disable=SC2086 # Intentionally unquoted. May contain multiple options.
+        msg_on_error --no-stderr \
+            "$SOLC" $cli_options "$selected_cli_output" "$input_file_relative_path"
+    )
+    standard_json_output=$(
+        singleContractOutputViaStandardJSON \
+            Solidity \
+            "$selected_standard_json_output" \
+            "$standard_json_settings" \
+            "$input_file_relative_path"
+    )
+
+    diff_values \
+        "$(echo "$cli_output" | stripCLIDecorations | stripEmptyLines)" \
+        "$(echo "$standard_json_output" | stripEmptyLines)" \
+        --ignore-space-change \
+        --ignore-blank-lines
+}
+
+cd "$REPO_ROOT"
+
+printTask "    - --optimize vs optimizer.enabled: true (--asm output)"
+test_cli_and_standard_json_equivalence \
+    '--optimize' \
+    '--asm' \
+    '"optimizer": {"enabled": true}' \
+    'evm.assembly' \
+    "test/libsolidity/semanticTests/various/erc20.sol"
+
+printTask "    - --optimize-yul vs optimizer.details.yul: true (--asm output)"
+test_cli_and_standard_json_equivalence \
+    '--optimize-yul' \
+    '--asm' \
+    '"optimizer": {"enabled": false, "details": {"yul": true}}' \
+    'evm.assembly' \
+    "test/libsolidity/semanticTests/various/erc20.sol"

From 7ab730d410e31ba5015551a0b9e5b67fa89b48e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 16 May 2023 11:05:09 +0200
Subject: [PATCH 1425/1748] Update tests that would become ineffective with
 minimal optimizations applied

---
 .../standard_yul_debug_info_print_all/in.yul       |  1 +
 .../standard_yul_debug_info_print_all/output.json  |  1 +
 .../in.yul                                         |  1 +
 .../output.json                                    |  1 +
 .../standard_yul_debug_info_print_none/in.yul      |  1 +
 .../standard_yul_debug_info_print_none/output.json |  1 +
 .../in.yul                                         |  1 +
 .../strict_asm_debug_info_print_all/input.yul      |  1 +
 .../strict_asm_debug_info_print_all/output         |  5 +++--
 .../input.yul                                      |  1 +
 .../output                                         |  5 +++--
 .../strict_asm_debug_info_print_none/input.yul     |  1 +
 .../strict_asm_debug_info_print_none/output        |  5 +++--
 .../input.yul                                      |  1 +
 test/libyul/objectCompiler/function_series.yul     | 14 +++++++++++---
 test/libyul/objectCompiler/jump_tags.yul           | 14 +++++++++++---
 16 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/test/cmdlineTests/standard_yul_debug_info_print_all/in.yul b/test/cmdlineTests/standard_yul_debug_info_print_all/in.yul
index 6d1ebe21b9..aa564d00ce 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/in.yul
+++ b/test/cmdlineTests/standard_yul_debug_info_print_all/in.yul
@@ -9,6 +9,7 @@ object "C_6_deployed" {
 
         /// @src 0:77:99  "function f() public {}"
         function fun_f_5() {
+            sstore(0, 42)
         }
         /// @src 0:60:101  "contract C {..."
     }
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json b/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
index 78f14c08da..0c78efb800 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
@@ -16,6 +16,7 @@ tag_2:
     /* \"input.sol\":77:99   */
   jump(tag_3)
 tag_1:
+  sstore(0x00, 0x2a)
   jump\t// out
 tag_3:
 "
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_location_only/in.yul b/test/cmdlineTests/standard_yul_debug_info_print_location_only/in.yul
index 6d1ebe21b9..aa564d00ce 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_location_only/in.yul
+++ b/test/cmdlineTests/standard_yul_debug_info_print_location_only/in.yul
@@ -9,6 +9,7 @@ object "C_6_deployed" {
 
         /// @src 0:77:99  "function f() public {}"
         function fun_f_5() {
+            sstore(0, 42)
         }
         /// @src 0:60:101  "contract C {..."
     }
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json b/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
index 526a6a5c63..53be3d073b 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
@@ -16,6 +16,7 @@ tag_2:
     /* \"input.sol\":77:99 */
   jump(tag_3)
 tag_1:
+  sstore(0x00, 0x2a)
   jump\t// out
 tag_3:
 "
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_none/in.yul b/test/cmdlineTests/standard_yul_debug_info_print_none/in.yul
index 6d1ebe21b9..aa564d00ce 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/in.yul
+++ b/test/cmdlineTests/standard_yul_debug_info_print_none/in.yul
@@ -9,6 +9,7 @@ object "C_6_deployed" {
 
         /// @src 0:77:99  "function f() public {}"
         function fun_f_5() {
+            sstore(0, 42)
         }
         /// @src 0:60:101  "contract C {..."
     }
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json b/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
index f5b5c63644..ac2a93b0f2 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
@@ -14,6 +14,7 @@
 tag_2:
   jump(tag_3)
 tag_1:
+  sstore(0x00, 0x2a)
   jump\t// out
 tag_3:
 "
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/in.yul b/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/in.yul
index 6d1ebe21b9..aa564d00ce 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/in.yul
+++ b/test/cmdlineTests/standard_yul_debug_info_print_snippet_only/in.yul
@@ -9,6 +9,7 @@ object "C_6_deployed" {
 
         /// @src 0:77:99  "function f() public {}"
         function fun_f_5() {
+            sstore(0, 42)
         }
         /// @src 0:60:101  "contract C {..."
     }
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_all/input.yul b/test/cmdlineTests/strict_asm_debug_info_print_all/input.yul
index 6d1ebe21b9..aa564d00ce 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_all/input.yul
+++ b/test/cmdlineTests/strict_asm_debug_info_print_all/input.yul
@@ -9,6 +9,7 @@ object "C_6_deployed" {
 
         /// @src 0:77:99  "function f() public {}"
         function fun_f_5() {
+            sstore(0, 42)
         }
         /// @src 0:60:101  "contract C {..."
     }
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_all/output b/test/cmdlineTests/strict_asm_debug_info_print_all/output
index e83614b62a..2242e6630e 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_all/output
+++ b/test/cmdlineTests/strict_asm_debug_info_print_all/output
@@ -10,13 +10,13 @@ object "C_6_deployed" {
         fun_f_5()
         /// @src 0:77:99
         function fun_f_5()
-        { }
+        { sstore(0, 42) }
     }
 }
 
 
 Binary representation:
-6080604052600a600e565b6010565b565b
+6080604052600a600e565b6014565b602a5f55565b
 
 Text representation:
     /* "input.sol":60:101   */
@@ -28,5 +28,6 @@ tag_2:
     /* "input.sol":77:99   */
   jump(tag_3)
 tag_1:
+  sstore(0x00, 0x2a)
   jump	// out
 tag_3:
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_location_only/input.yul b/test/cmdlineTests/strict_asm_debug_info_print_location_only/input.yul
index 6d1ebe21b9..aa564d00ce 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_location_only/input.yul
+++ b/test/cmdlineTests/strict_asm_debug_info_print_location_only/input.yul
@@ -9,6 +9,7 @@ object "C_6_deployed" {
 
         /// @src 0:77:99  "function f() public {}"
         function fun_f_5() {
+            sstore(0, 42)
         }
         /// @src 0:60:101  "contract C {..."
     }
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_location_only/output b/test/cmdlineTests/strict_asm_debug_info_print_location_only/output
index a4fd0e4940..c5de7c4399 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_location_only/output
+++ b/test/cmdlineTests/strict_asm_debug_info_print_location_only/output
@@ -10,13 +10,13 @@ object "C_6_deployed" {
         fun_f_5()
         /// @src 0:77:99
         function fun_f_5()
-        { }
+        { sstore(0, 42) }
     }
 }
 
 
 Binary representation:
-6080604052600a600e565b6010565b565b
+6080604052600a600e565b6014565b602a5f55565b
 
 Text representation:
     /* "input.sol":60:101 */
@@ -28,5 +28,6 @@ tag_2:
     /* "input.sol":77:99 */
   jump(tag_3)
 tag_1:
+  sstore(0x00, 0x2a)
   jump	// out
 tag_3:
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_none/input.yul b/test/cmdlineTests/strict_asm_debug_info_print_none/input.yul
index 6d1ebe21b9..aa564d00ce 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_none/input.yul
+++ b/test/cmdlineTests/strict_asm_debug_info_print_none/input.yul
@@ -9,6 +9,7 @@ object "C_6_deployed" {
 
         /// @src 0:77:99  "function f() public {}"
         function fun_f_5() {
+            sstore(0, 42)
         }
         /// @src 0:60:101  "contract C {..."
     }
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_none/output b/test/cmdlineTests/strict_asm_debug_info_print_none/output
index fc8841c9a8..3db44c1f5b 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_none/output
+++ b/test/cmdlineTests/strict_asm_debug_info_print_none/output
@@ -8,13 +8,13 @@ object "C_6_deployed" {
         mstore(64, 128)
         fun_f_5()
         function fun_f_5()
-        { }
+        { sstore(0, 42) }
     }
 }
 
 
 Binary representation:
-6080604052600a600e565b6010565b565b
+6080604052600a600e565b6014565b602a5f55565b
 
 Text representation:
   mstore(0x40, 0x80)
@@ -24,5 +24,6 @@ Text representation:
 tag_2:
   jump(tag_3)
 tag_1:
+  sstore(0x00, 0x2a)
   jump	// out
 tag_3:
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/input.yul b/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/input.yul
index 6d1ebe21b9..aa564d00ce 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/input.yul
+++ b/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/input.yul
@@ -9,6 +9,7 @@ object "C_6_deployed" {
 
         /// @src 0:77:99  "function f() public {}"
         function fun_f_5() {
+            sstore(0, 42)
         }
         /// @src 0:60:101  "contract C {..."
     }
diff --git a/test/libyul/objectCompiler/function_series.yul b/test/libyul/objectCompiler/function_series.yul
index 10a018160a..7be2db96b9 100644
--- a/test/libyul/objectCompiler/function_series.yul
+++ b/test/libyul/objectCompiler/function_series.yul
@@ -3,6 +3,10 @@ object "Contract" {
     function f() {}
     function g() {}
     sstore(0, 1)
+
+    // NOTE: msize forces the compiler to completely disable the Yul optimizer.
+    // Otherwise the functions would get optimized out.
+    pop(msize())
   }
 }
 
@@ -26,6 +30,10 @@ object "Contract" {
 //   0x00
 //     /* "source":73:85   */
 //   sstore
-// Bytecode: 6009565b5b565b5b565b60015f55
-// Opcodes: PUSH1 0x9 JUMP JUMPDEST JUMPDEST JUMP JUMPDEST JUMPDEST JUMP JUMPDEST PUSH1 0x1 PUSH0 SSTORE
-// SourceMappings: 33:15:0:-:0;;;;:::o;53:::-;;:::o;:::-;83:1;80;73:12
+//     /* "source":231:238   */
+//   msize
+//     /* "source":227:239   */
+//   pop
+// Bytecode: 6009565b5b565b5b565b60015f555950
+// Opcodes: PUSH1 0x9 JUMP JUMPDEST JUMPDEST JUMP JUMPDEST JUMPDEST JUMP JUMPDEST PUSH1 0x1 PUSH0 SSTORE MSIZE POP
+// SourceMappings: 33:15:0:-:0;;;;:::o;53:::-;;:::o;:::-;83:1;80;73:12;231:7;227:12
diff --git a/test/libyul/objectCompiler/jump_tags.yul b/test/libyul/objectCompiler/jump_tags.yul
index ba0984b102..0d1f1ff791 100644
--- a/test/libyul/objectCompiler/jump_tags.yul
+++ b/test/libyul/objectCompiler/jump_tags.yul
@@ -3,6 +3,10 @@ object "Contract" {
     function f() { g(1) }
     function g(x) { if x { leave } g(add(x, 2)) }
     g(1)
+
+    // NOTE: msize forces the compiler to completely disable the Yul optimizer.
+    // Otherwise f() would get optimized out.
+    pop(msize())
   }
 }
 
@@ -62,6 +66,10 @@ object "Contract" {
 //   tag_2
 //   jump	// in
 // tag_9:
-// Bytecode: 6026565b600b6001600e565b5b565b8015601857506024565b602260028201600e565b505b565b602e6001600e565b
-// Opcodes: PUSH1 0x26 JUMP JUMPDEST PUSH1 0xB PUSH1 0x1 PUSH1 0xE JUMP JUMPDEST JUMPDEST JUMP JUMPDEST DUP1 ISZERO PUSH1 0x18 JUMPI POP PUSH1 0x24 JUMP JUMPDEST PUSH1 0x22 PUSH1 0x2 DUP3 ADD PUSH1 0xE JUMP JUMPDEST POP JUMPDEST JUMP JUMPDEST PUSH1 0x2E PUSH1 0x1 PUSH1 0xE JUMP JUMPDEST
-// SourceMappings: 33:21:0:-:0;;;48:4;50:1;48:4;:::i;:::-;33:21;:::o;59:45::-;78:1;75:14;;;82:5;;;75:14;90:12;99:1;96;92:9;90:12;:::i;:::-;59:45;;:::o;:::-;109:4;111:1;109:4;:::i;:::-
+//     /* "source":249:256   */
+//   msize
+//     /* "source":245:257   */
+//   pop
+// Bytecode: 6026565b600b6001600e565b5b565b8015601857506024565b602260028201600e565b505b565b602e6001600e565b5950
+// Opcodes: PUSH1 0x26 JUMP JUMPDEST PUSH1 0xB PUSH1 0x1 PUSH1 0xE JUMP JUMPDEST JUMPDEST JUMP JUMPDEST DUP1 ISZERO PUSH1 0x18 JUMPI POP PUSH1 0x24 JUMP JUMPDEST PUSH1 0x22 PUSH1 0x2 DUP3 ADD PUSH1 0xE JUMP JUMPDEST POP JUMPDEST JUMP JUMPDEST PUSH1 0x2E PUSH1 0x1 PUSH1 0xE JUMP JUMPDEST MSIZE POP
+// SourceMappings: 33:21:0:-:0;;;48:4;50:1;48:4;:::i;:::-;33:21;:::o;59:45::-;78:1;75:14;;;82:5;;;75:14;90:12;99:1;96;92:9;90:12;:::i;:::-;59:45;;:::o;:::-;109:4;111:1;109:4;:::i;:::-;249:7;245:12

From 8e35e8dd8e90b883a61cd845c3d351c3c0303373 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sat, 29 Apr 2023 01:40:36 +0200
Subject: [PATCH 1426/1748] Command-line tests checking behavior of msize
 without optimizer

---
 .../strict_asm_msize_with_optimizer/args      |   1 +
 .../strict_asm_msize_with_optimizer/input.yul |  13 +
 .../strict_asm_msize_with_optimizer/output    |  14 +
 .../strict_asm_msize_without_optimizer/args   |   1 +
 .../input.yul                                 |  13 +
 .../strict_asm_msize_without_optimizer/output |  40 +++
 .../viair_msize_without_optimizer/args        |   1 +
 .../viair_msize_without_optimizer/input.sol   |  21 ++
 .../viair_msize_without_optimizer/output      | 261 ++++++++++++++++++
 9 files changed, 365 insertions(+)
 create mode 100644 test/cmdlineTests/strict_asm_msize_with_optimizer/args
 create mode 100644 test/cmdlineTests/strict_asm_msize_with_optimizer/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_msize_with_optimizer/output
 create mode 100644 test/cmdlineTests/strict_asm_msize_without_optimizer/args
 create mode 100644 test/cmdlineTests/strict_asm_msize_without_optimizer/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_msize_without_optimizer/output
 create mode 100644 test/cmdlineTests/viair_msize_without_optimizer/args
 create mode 100644 test/cmdlineTests/viair_msize_without_optimizer/input.sol
 create mode 100644 test/cmdlineTests/viair_msize_without_optimizer/output

diff --git a/test/cmdlineTests/strict_asm_msize_with_optimizer/args b/test/cmdlineTests/strict_asm_msize_with_optimizer/args
new file mode 100644
index 0000000000..f1cb61514f
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_msize_with_optimizer/args
@@ -0,0 +1 @@
+--strict-assembly --debug-info none --optimize
diff --git a/test/cmdlineTests/strict_asm_msize_with_optimizer/input.yul b/test/cmdlineTests/strict_asm_msize_with_optimizer/input.yul
new file mode 100644
index 0000000000..ccff7a32f4
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_msize_with_optimizer/input.yul
@@ -0,0 +1,13 @@
+{
+    function f() -> x {
+        x := mload(0)
+    }
+
+    // In pure Yul optimization in presence of msize is allowed.
+    // Everything in this file should get optimized out.
+    pop(msize())
+
+    let x := 0
+    let y := x
+    mstore(0, f())
+}
diff --git a/test/cmdlineTests/strict_asm_msize_with_optimizer/output b/test/cmdlineTests/strict_asm_msize_with_optimizer/output
new file mode 100644
index 0000000000..fbc1e69fac
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_msize_with_optimizer/output
@@ -0,0 +1,14 @@
+
+======= strict_asm_msize_with_optimizer/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code { { } }
+}
+
+
+Binary representation:
+00
+
+Text representation:
+  stop
diff --git a/test/cmdlineTests/strict_asm_msize_without_optimizer/args b/test/cmdlineTests/strict_asm_msize_without_optimizer/args
new file mode 100644
index 0000000000..7e891dd86b
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_msize_without_optimizer/args
@@ -0,0 +1 @@
+--strict-assembly --debug-info none
diff --git a/test/cmdlineTests/strict_asm_msize_without_optimizer/input.yul b/test/cmdlineTests/strict_asm_msize_without_optimizer/input.yul
new file mode 100644
index 0000000000..e787c40097
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_msize_without_optimizer/input.yul
@@ -0,0 +1,13 @@
+{
+    function f() -> x {
+        x := mload(0)
+    }
+
+    // In pure Yul without optimizer presence of msize disables stack optimization.
+    // This file should remain untouched when passed through the optimizer.
+    pop(msize())
+
+    let x := 0
+    let y := x
+    mstore(0, f())
+}
diff --git a/test/cmdlineTests/strict_asm_msize_without_optimizer/output b/test/cmdlineTests/strict_asm_msize_without_optimizer/output
new file mode 100644
index 0000000000..fabd2e874a
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_msize_without_optimizer/output
@@ -0,0 +1,40 @@
+
+======= strict_asm_msize_without_optimizer/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code {
+        function f() -> x
+        { x := mload(0) }
+        pop(msize())
+        let x := 0
+        let y := x
+        mstore(0, f())
+    }
+}
+
+
+Binary representation:
+600b565b5f8051905090565b5f8060136003565b5f525050
+
+Text representation:
+  jump(tag_2)
+tag_1:
+  0x00
+  dup1
+  mload
+  swap1
+  pop
+  swap1
+  jump	// out
+tag_2:
+  0x00
+  dup1
+  tag_4
+  tag_1
+  jump	// in
+tag_4:
+  0x00
+  mstore
+  pop
+  pop
diff --git a/test/cmdlineTests/viair_msize_without_optimizer/args b/test/cmdlineTests/viair_msize_without_optimizer/args
new file mode 100644
index 0000000000..3b9da15f97
--- /dev/null
+++ b/test/cmdlineTests/viair_msize_without_optimizer/args
@@ -0,0 +1 @@
+--via-ir --ir-optimized --asm --debug-info none
diff --git a/test/cmdlineTests/viair_msize_without_optimizer/input.sol b/test/cmdlineTests/viair_msize_without_optimizer/input.sol
new file mode 100644
index 0000000000..e70ba17fb2
--- /dev/null
+++ b/test/cmdlineTests/viair_msize_without_optimizer/input.sol
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {
+    function f() pure public {
+        assembly ("memory-safe") {
+            function f() -> x {
+                x := mload(0)
+            }
+
+            // Presence of msize disables all Yul optimizations, including the minimal steps or
+            // stack optimization that would normally be performed even with the optimizer nominally disabled.
+            // This block should remain untouched when passed through the optimizer.
+            pop(msize())
+
+            let x := 0
+            let y := x
+            mstore(0, f())
+        }
+    }
+}
diff --git a/test/cmdlineTests/viair_msize_without_optimizer/output b/test/cmdlineTests/viair_msize_without_optimizer/output
new file mode 100644
index 0000000000..b54f8a3f56
--- /dev/null
+++ b/test/cmdlineTests/viair_msize_without_optimizer/output
@@ -0,0 +1,261 @@
+
+======= viair_msize_without_optimizer/input.sol:C =======
+EVM assembly:
+  mstore(0x40, 0x80)
+  jumpi(tag_4, iszero(callvalue))
+  tag_5
+  tag_2
+  jump	// in
+tag_5:
+tag_4:
+  tag_6
+  tag_3
+  jump	// in
+tag_6:
+  tag_7
+  tag_1
+  jump	// in
+tag_7:
+  dataSize(sub_0)
+  dataOffset(sub_0)
+  dup3
+  codecopy
+  dataSize(sub_0)
+  dup2
+  return
+tag_1:
+  0x00
+  mload(0x40)
+  swap1
+  pop
+  swap1
+  jump	// out
+tag_2:
+  0x00
+  dup1
+  revert
+tag_3:
+  jump	// out
+stop
+
+sub_0: assembly {
+      mstore(0x40, 0x80)
+      jumpi(tag_10, lt(calldatasize, 0x04))
+      tag_11
+      calldataload(0x00)
+      tag_1
+      jump	// in
+    tag_11:
+      dup1
+      0x26121ff0
+      dup2
+      sub
+      tag_12
+      jumpi
+      tag_14
+      tag_7
+      jump	// in
+    tag_14:
+    tag_12:
+      pop
+      pop
+    tag_10:
+      tag_15
+      tag_8
+      jump	// in
+    tag_15:
+      jump(tag_16)
+    tag_1:
+      0x00
+      dup2
+      0xe0
+      shr
+      swap1
+      pop
+      swap2
+      swap1
+      pop
+      jump	// out
+    tag_2:
+      0x00
+      mload(0x40)
+      swap1
+      pop
+      swap1
+      jump	// out
+    tag_3:
+      0x00
+      dup1
+      revert
+    tag_4:
+      0x00
+      dup1
+      revert
+    tag_5:
+      0x00
+      dup2
+      dup4
+      sub
+      slt
+      iszero
+      tag_22
+      jumpi
+      tag_23
+      tag_4
+      jump	// in
+    tag_23:
+    tag_22:
+      pop
+      pop
+      jump	// out
+    tag_6:
+      0x00
+      dup1
+      dup3
+      add
+      swap1
+      pop
+      swap2
+      swap1
+      pop
+      jump	// out
+    tag_7:
+      jumpi(tag_26, iszero(callvalue))
+      tag_27
+      tag_3
+      jump	// in
+    tag_27:
+    tag_26:
+      tag_28
+      calldatasize
+      0x04
+      tag_5
+      jump	// in
+    tag_28:
+      tag_29
+      tag_9
+      jump	// in
+    tag_29:
+      tag_30
+      tag_2
+      jump	// in
+    tag_30:
+      tag_31
+      dup2
+      tag_6
+      jump	// in
+    tag_31:
+      dup2
+      dup2
+      sub
+      dup3
+      return
+    tag_8:
+      0x00
+      dup1
+      revert
+    tag_9:
+      jump(tag_35)
+    tag_34:
+      0x00
+      dup1
+      mload
+      swap1
+      pop
+      swap1
+      jump	// out
+    tag_35:
+      0x00
+      dup1
+      tag_37
+      tag_34
+      jump	// in
+    tag_37:
+      0x00
+      mstore
+      pop
+      pop
+      jump	// out
+    tag_16:
+
+    auxdata: <AUXDATA REMOVED>
+}
+
+Optimized IR:
+/// @use-src 0:"viair_msize_without_optimizer/input.sol"
+object "C_7" {
+    code {
+        mstore(64, memoryguard(128))
+        if callvalue()
+        {
+            revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+        }
+        constructor_C_7()
+        let _1 := allocate_unbounded()
+        codecopy(_1, dataoffset("C_7_deployed"), datasize("C_7_deployed"))
+        return(_1, datasize("C_7_deployed"))
+        function allocate_unbounded() -> memPtr
+        { memPtr := mload(64) }
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+        { revert(0, 0) }
+        function constructor_C_7()
+        { }
+    }
+    /// @use-src 0:"viair_msize_without_optimizer/input.sol"
+    object "C_7_deployed" {
+        code {
+            mstore(64, memoryguard(128))
+            if iszero(lt(calldatasize(), 4))
+            {
+                let selector := shift_right_224_unsigned(calldataload(0))
+                switch selector
+                case 0x26121ff0 { external_fun_f_6() }
+                default { }
+            }
+            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+            function shift_right_224_unsigned(value) -> newValue
+            { newValue := shr(224, value) }
+            function allocate_unbounded() -> memPtr
+            { memPtr := mload(64) }
+            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+            { revert(0, 0) }
+            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
+            { revert(0, 0) }
+            function abi_decode_tuple_(headStart, dataEnd)
+            {
+                if slt(sub(dataEnd, headStart), 0)
+                {
+                    revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
+                }
+            }
+            function abi_encode_tuple__to__fromStack(headStart) -> tail
+            { tail := add(headStart, 0) }
+            function external_fun_f_6()
+            {
+                if callvalue()
+                {
+                    revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+                }
+                abi_decode_tuple_(4, calldatasize())
+                fun_f_6()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_tuple__to__fromStack(memPos)
+                return(memPos, sub(memEnd, memPos))
+            }
+            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+            { revert(0, 0) }
+            function fun_f_6()
+            {
+                {
+                    function usr$f() -> usr$x
+                    { usr$x := mload(0) }
+                    pop(msize())
+                    let usr$x := 0
+                    let usr$y := usr$x
+                    mstore(0, usr$f())
+                }
+            }
+        }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+}

From dff774d82fcc045fbc4ae847f14e98162367ffcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 May 2023 14:19:40 +0200
Subject: [PATCH 1427/1748] Overload MSizeFinder::containsMSize() for Yul
 objects

---
 libyul/optimiser/Semantics.cpp | 13 +++++++++++++
 libyul/optimiser/Semantics.h   |  6 ++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
index 12349394a0..d87c205743 100644
--- a/libyul/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@@ -94,6 +94,19 @@ bool MSizeFinder::containsMSize(Dialect const& _dialect, Block const& _ast)
 	return finder.m_msizeFound;
 }
 
+bool MSizeFinder::containsMSize(Dialect const& _dialect, Object const& _object)
+{
+	if (containsMSize(_dialect, *_object.code))
+		return true;
+
+	for (shared_ptr<ObjectNode> const& node: _object.subObjects)
+		if (auto const* object = dynamic_cast<Object const*>(node.get()))
+			if (containsMSize(_dialect, *object))
+				return true;
+
+	return false;
+}
+
 void MSizeFinder::operator()(FunctionCall const& _functionCall)
 {
 	ASTWalker::operator()(_functionCall);
diff --git a/libyul/optimiser/Semantics.h b/libyul/optimiser/Semantics.h
index 32b9c9b582..762c801106 100644
--- a/libyul/optimiser/Semantics.h
+++ b/libyul/optimiser/Semantics.h
@@ -21,10 +21,11 @@
 
 #pragma once
 
-#include <libyul/optimiser/ASTWalker.h>
+#include <libyul/AST.h>
+#include <libyul/Object.h>
 #include <libyul/SideEffects.h>
+#include <libyul/optimiser/ASTWalker.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
-#include <libyul/AST.h>
 
 #include <set>
 
@@ -143,6 +144,7 @@ class MSizeFinder: public ASTWalker
 {
 public:
 	static bool containsMSize(Dialect const& _dialect, Block const& _ast);
+	static bool containsMSize(Dialect const& _dialect, Object const& _object);
 
 	using ASTWalker::operator();
 	void operator()(FunctionCall const& _funCall) override;

From 25be38905f78d52ebf06a2a42dfdeb7966eee523 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 21 Apr 2023 15:14:03 +0200
Subject: [PATCH 1428/1748] YulStack: When Yul optimization is not requested,
 run Yul optimizer with a minimal sequence instead of disabling it

---
 Changelog.md                               |  1 +
 docs/using-the-compiler.rst                |  2 +-
 libsolidity/interface/OptimiserSettings.h  |  2 +-
 libyul/YulStack.cpp                        | 18 +++++++++++-------
 test/cmdlineTests/~assembler_modes/test.sh | 10 +++++-----
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c47ac3e47d..9b70219969 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -11,6 +11,7 @@ Compiler Features:
  * Parser: Introduce ``pragma experimental solidity``, which will enable an experimental language mode that in particular has no stability guarantees between non-breaking releases and is not suited for production use.
  * Standard JSON Interface: Add ``ast`` file-level output for Yul input.
  * Standard JSON Interface: Add ``irAst`` and ``irOptimizedAst`` contract-level outputs for Solidity input, providing AST in compact JSON format for IR and optimized IR.
+ * Yul Optimizer: Stack-to-memory mover is now enabled by default whenever possible for via IR code generation and pure Yul compilation.
 
 
 Bugfixes:
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 3ef280a105..6fb32871c8 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -304,7 +304,7 @@ Input Description
               // optimization-sequence:clean-up-sequence. For more information see
               // "The Optimizer > Selecting Optimizations".
               // This field is optional, and if not provided, the default sequences for both
-              // optimization and clean-up are used. If only one of the options is provivded
+              // optimization and clean-up are used. If only one of the sequences is provided
               // the other will not be run.
               // If only the delimiter ":" is provided then neither the optimization nor the clean-up
               // sequence will be run.
diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h
index bae343f2d1..8b0299c47d 100644
--- a/libsolidity/interface/OptimiserSettings.h
+++ b/libsolidity/interface/OptimiserSettings.h
@@ -103,8 +103,8 @@ struct OptimiserSettings
 			case OptimisationPreset::Minimal: return minimal();
 			case OptimisationPreset::Standard: return standard();
 			case OptimisationPreset::Full: return full();
-			default: solAssert(false, "");
 		}
+		util::unreachable();
 	}
 
 	bool operator==(OptimiserSettings const& _other) const
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index a4f9615646..cc8fbc589d 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -86,9 +86,6 @@ bool YulStack::parseAndAnalyze(std::string const& _sourceName, std::string const
 
 void YulStack::optimize()
 {
-	if (!m_optimiserSettings.runYulOptimiser)
-		return;
-
 	yulAssert(m_analysisSuccessful, "Analysis was not successful.");
 
 	m_analysisSuccessful = false;
@@ -159,13 +156,15 @@ void YulStack::optimize(Object& _object, bool _isCreation)
 	unique_ptr<GasMeter> meter;
 	if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&dialect))
 		meter = make_unique<GasMeter>(*evmDialect, _isCreation, m_optimiserSettings.expectedExecutionsPerDeployment);
+
 	OptimiserSuite::run(
 		dialect,
 		meter.get(),
 		_object,
-		m_optimiserSettings.optimizeStackAllocation,
-		m_optimiserSettings.yulOptimiserSteps,
-		m_optimiserSettings.yulOptimiserCleanupSteps,
+		// Defaults are the minimum necessary to avoid running into "Stack too deep" constantly.
+		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.optimizeStackAllocation : true,
+		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.yulOptimiserSteps : "u",
+		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.yulOptimiserCleanupSteps : "",
 		_isCreation ? nullopt : make_optional(m_optimiserSettings.expectedExecutionsPerDeployment),
 		{}
 	);
@@ -231,7 +230,12 @@ YulStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
 
 	evmasm::Assembly assembly(m_evmVersion, true, {});
 	EthAssemblyAdapter adapter(assembly);
-	compileEVM(adapter, m_optimiserSettings.optimizeStackAllocation);
+
+	// NOTE: We always need stack optimization when Yul optimizer is disabled. It being disabled
+	// just means that we don't use the full step sequence. We still run it with the minimal steps
+	// required to avoid "stack too deep".
+	bool optimize = m_optimiserSettings.optimizeStackAllocation || !m_optimiserSettings.runYulOptimiser;
+	compileEVM(adapter, optimize);
 
 	assembly.optimise(evmasm::Assembly::OptimiserSettings::translateSettings(m_optimiserSettings, m_evmVersion));
 
diff --git a/test/cmdlineTests/~assembler_modes/test.sh b/test/cmdlineTests/~assembler_modes/test.sh
index 34e8993286..5ca1bb40f8 100755
--- a/test/cmdlineTests/~assembler_modes/test.sh
+++ b/test/cmdlineTests/~assembler_modes/test.sh
@@ -36,8 +36,8 @@ echo '{}' | "$SOLC" - --yul --optimize &>/dev/null && fail "solc --yul --optimiz
 # Test yul and strict assembly output
 # Non-empty code results in non-empty binary representation with optimizations turned off,
 # while it results in empty binary representation with optimizations turned on.
-test_solc_assembly_output "{ let x:u256 := 0:u256 }" "{ let x := 0 }" "--yul"
-test_solc_assembly_output "{ let x:u256 := bitnot(7:u256) }" "{ let x := bitnot(7) }" "--yul"
-test_solc_assembly_output "{ let t:bool := not(true) }" "{ let t:bool := not(true) }" "--yul"
-test_solc_assembly_output "{ let x := 0 }" "{ let x := 0 }" "--strict-assembly"
-test_solc_assembly_output "{ let x := 0 }" "{ { } }" "--strict-assembly --optimize"
+test_solc_assembly_output "{ let x:u256 := 0:u256 mstore(0, x) }" "{ { let x := 0 mstore(0, x) } }" "--yul"
+test_solc_assembly_output "{ let x:u256 := bitnot(7:u256) mstore(0, x) }" "{ { let x := bitnot(7) mstore(0, x) } }" "--yul"
+test_solc_assembly_output "{ let t:bool := not(true) if t { mstore(0, 1) } }" "{ { let t:bool := not(true) if t { mstore(0, 1) } } }" "--yul"
+test_solc_assembly_output "{ let x := 0 mstore(0, x) }" "{ { let x := 0 mstore(0, x) } }" "--strict-assembly"
+test_solc_assembly_output "{ let x := 0 mstore(0, x) }" "{ { } }" "--strict-assembly --optimize"

From 51cd87c94d0fa2374551e92a0368db60891491e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 15 May 2023 14:20:56 +0200
Subject: [PATCH 1429/1748] YulStack: Don't enable stack optimizations in
 unoptimized mode when msize is present

---
 libyul/YulStack.cpp | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index cc8fbc589d..66acc3f60e 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -30,6 +30,7 @@
 #include <libyul/backends/evm/EVMObjectCompiler.h>
 #include <libyul/backends/evm/EVMMetrics.h>
 #include <libyul/ObjectParser.h>
+#include <libyul/optimiser/Semantics.h>
 #include <libyul/optimiser/Suite.h>
 #include <libevmasm/Assembly.h>
 #include <liblangutil/Scanner.h>
@@ -87,6 +88,13 @@ bool YulStack::parseAndAnalyze(std::string const& _sourceName, std::string const
 void YulStack::optimize()
 {
 	yulAssert(m_analysisSuccessful, "Analysis was not successful.");
+	yulAssert(m_parserResult);
+
+	if (
+		!m_optimiserSettings.runYulOptimiser &&
+		yul::MSizeFinder::containsMSize(languageToDialect(m_language, m_evmVersion), *m_parserResult)
+	)
+		return;
 
 	m_analysisSuccessful = false;
 	yulAssert(m_parserResult, "");
@@ -231,10 +239,13 @@ YulStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
 	evmasm::Assembly assembly(m_evmVersion, true, {});
 	EthAssemblyAdapter adapter(assembly);
 
-	// NOTE: We always need stack optimization when Yul optimizer is disabled. It being disabled
-	// just means that we don't use the full step sequence. We still run it with the minimal steps
-	// required to avoid "stack too deep".
-	bool optimize = m_optimiserSettings.optimizeStackAllocation || !m_optimiserSettings.runYulOptimiser;
+	// NOTE: We always need stack optimization when Yul optimizer is disabled (unless code contains
+	// msize). It being disabled just means that we don't use the full step sequence. We still run
+	// it with the minimal steps required to avoid "stack too deep".
+	bool optimize = m_optimiserSettings.optimizeStackAllocation || (
+		!m_optimiserSettings.runYulOptimiser &&
+		!yul::MSizeFinder::containsMSize(languageToDialect(m_language, m_evmVersion), *m_parserResult)
+	);
 	compileEVM(adapter, optimize);
 
 	assembly.optimise(evmasm::Assembly::OptimiserSettings::translateSettings(m_optimiserSettings, m_evmVersion));

From 5e32a728fe796111146322e63906c39739d7a24a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 16 May 2023 11:40:04 +0200
Subject: [PATCH 1430/1748] Update test expectations

---
 .../output                                    | 130 ++--
 .../linking_strict_assembly/output            |  12 +-
 .../output                                    |  11 +-
 .../output                                    |  11 +-
 .../output                                    |  21 +-
 .../output                                    |  21 +-
 .../output                                    |  11 +-
 .../output                                    |  11 +-
 .../output                                    |  21 +-
 .../output.json                               | 648 +++++++-----------
 .../output.json                               |  53 +-
 test/cmdlineTests/standard_yul/output.json    |  18 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../output.json                               |   3 +-
 .../standard_yul_object/output.json           |  17 +-
 .../standard_yul_object_name/output.json      |  22 +-
 .../strict_asm_ast_compact_json/output        | 104 ++-
 .../strict_asm_debug_info_print_all/output    |  15 +-
 .../output                                    |  15 +-
 .../strict_asm_debug_info_print_none/output   |  13 +-
 .../yul_function_name_clashes/output          |  60 +-
 .../output                                    |  92 +--
 test/libyul/objectCompiler/data.yul           |   8 +-
 test/libyul/objectCompiler/datacopy.yul       |   6 +-
 .../libyul/objectCompiler/dataoffset_code.yul |  10 +-
 .../libyul/objectCompiler/dataoffset_data.yul |   8 +-
 .../libyul/objectCompiler/dataoffset_self.yul |   8 +-
 test/libyul/objectCompiler/datasize_code.yul  |  10 +-
 test/libyul/objectCompiler/datasize_data.yul  |   8 +-
 test/libyul/objectCompiler/datasize_self.yul  |   8 +-
 ..._long_name_does_not_end_up_in_bytecode.yul |   8 +-
 test/libyul/objectCompiler/linkersymbol.yul   |  34 +-
 test/libyul/objectCompiler/metadata.yul       |  19 +-
 test/libyul/objectCompiler/namedObject.yul    |   6 +-
 .../libyul/objectCompiler/namedObjectCode.yul |   8 +-
 test/libyul/objectCompiler/simple.yul         |   8 +-
 test/libyul/objectCompiler/smoke.yul          |   6 +-
 .../libyul/objectCompiler/sourceLocations.yul |   5 +-
 test/libyul/objectCompiler/subObject.yul      |  10 +-
 .../libyul/objectCompiler/subObjectAccess.yul |  54 +-
 test/libyul/objectCompiler/subSubObject.yul   |  12 +-
 42 files changed, 674 insertions(+), 877 deletions(-)

diff --git a/test/cmdlineTests/inline_assembly_function_name_clash/output b/test/cmdlineTests/inline_assembly_function_name_clash/output
index 889514d96a..8becb87ae0 100644
--- a/test/cmdlineTests/inline_assembly_function_name_clash/output
+++ b/test/cmdlineTests/inline_assembly_function_name_clash/output
@@ -5,171 +5,201 @@
         {
             "function-debug-runtime":
             {
-                "abi_decode_tuple_":
+                "abi_decode":
                 {
-                    "entryPoint": 117,
+                    "entryPoint": 80,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
-                "abi_encode_t_uint256_to_t_uint256_fromStack":
+                "abi_encode_uint256":
                 {
-                    "entryPoint": 149,
+                    "entryPoint": 111,
                     "parameterSlots": 2,
-                    "returnSlots": 0
+                    "returnSlots": 1
                 },
-                "abi_encode_tuple_t_uint256__to_t_uint256__fromStack":
+                "abi_encode_uint256_to_uint256":
                 {
-                    "entryPoint": 164,
+                    "entryPoint": 98,
                     "parameterSlots": 2,
-                    "returnSlots": 1
+                    "returnSlots": 0
                 },
                 "allocate_unbounded":
                 {
-                    "entryPoint": 100,
+                    "entryPoint": 66,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "cleanup_t_uint256":
+                "cleanup_uint256":
                 {
-                    "entryPoint": 140,
+                    "entryPoint": 95,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "convert_t_uint256_to_t_uint256":
+                "convert_uint256_to_uint256":
                 {
-                    "entryPoint": 398,
+                    "entryPoint": 276,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "external_fun_f_25":
+                "external_fun_f":
                 {
-                    "entryPoint": 189,
+                    "entryPoint": 132,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
-                "external_fun_g_36":
+                "external_fun_g":
                 {
-                    "entryPoint": 247,
+                    "entryPoint": 185,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
-                "fun_f_25":
+                "fun_f":
                 {
-                    "entryPoint": 653,
+                    "entryPoint": 442,
                     "id": 25,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "fun_f_25_inner":
+                "fun_f_inner":
                 {
-                    "entryPoint": 621,
+                    "entryPoint": 430,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "fun_g_36":
+                "fun_g":
                 {
-                    "entryPoint": 858,
+                    "entryPoint": 564,
                     "id": 36,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "fun_g_36_inner":
+                "fun_g_inner":
                 {
-                    "entryPoint": 826,
+                    "entryPoint": 552,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "identity":
                 {
-                    "entryPoint": 389,
+                    "entryPoint": 273,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "modifier_m_17":
+                "modifier_m":
                 {
-                    "entryPoint": 475,
+                    "entryPoint": 509,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "modifier_m_19":
+                "modifier_m_17":
                 {
-                    "entryPoint": 548,
+                    "entryPoint": 344,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "modifier_m_28":
+                "modifier_m_19":
                 {
-                    "entryPoint": 680,
+                    "entryPoint": 387,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "modifier_m_30":
+                "modifier_m_28":
                 {
-                    "entryPoint": 753,
+                    "entryPoint": 466,
                     "id": 14,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "prepare_store_t_uint256":
+                "prepare_store_uint256":
                 {
-                    "entryPoint": 431,
+                    "entryPoint": 304,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
                 "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74":
                 {
-                    "entryPoint": 305,
+                    "entryPoint": 238,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
                 "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb":
                 {
-                    "entryPoint": 109,
+                    "entryPoint": 72,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
                 "revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b":
                 {
-                    "entryPoint": 113,
+                    "entryPoint": 76,
                     "parameterSlots": 0,
                     "returnSlots": 0
                 },
-                "shift_left_0":
+                "shift_left":
                 {
-                    "entryPoint": 313,
+                    "entryPoint": 246,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "shift_right_224_unsigned":
+                "shift_right_unsigned":
                 {
-                    "entryPoint": 88,
+                    "entryPoint": 60,
                     "parameterSlots": 1,
                     "returnSlots": 1
                 },
-                "update_byte_slice_32_shift_0":
+                "update_byte_slice_shift":
                 {
-                    "entryPoint": 324,
+                    "entryPoint": 251,
                     "parameterSlots": 2,
                     "returnSlots": 1
                 },
-                "update_storage_value_offset_0t_uint256_to_t_uint256":
+                "update_storage_value_offsett_uint256_to_uint256":
                 {
-                    "entryPoint": 440,
+                    "entryPoint": 307,
                     "parameterSlots": 2,
                     "returnSlots": 0
                 },
                 "usr$f":
                 {
-                    "entryPoint": 496,
+                    "entryPoint": 339,
+                    "parameterSlots": 0,
+                    "returnSlots": 1
+                },
+                "usr$f_17":
+                {
+                    "entryPoint": 382,
+                    "parameterSlots": 0,
+                    "returnSlots": 1
+                },
+                "usr$f_22":
+                {
+                    "entryPoint": 425,
+                    "parameterSlots": 0,
+                    "returnSlots": 1
+                },
+                "usr$f_26":
+                {
+                    "entryPoint": 461,
+                    "parameterSlots": 0,
+                    "returnSlots": 1
+                },
+                "usr$f_32":
+                {
+                    "entryPoint": 504,
+                    "parameterSlots": 0,
+                    "returnSlots": 1
+                },
+                "usr$f_37":
+                {
+                    "entryPoint": 547,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 },
-                "zero_value_for_split_t_uint256":
+                "zero_value_for_split_uint256":
                 {
-                    "entryPoint": 309,
+                    "entryPoint": 242,
                     "parameterSlots": 0,
                     "returnSlots": 1
                 }
diff --git a/test/cmdlineTests/linking_strict_assembly/output b/test/cmdlineTests/linking_strict_assembly/output
index 520b3cf7bb..29a8abdfae 100644
--- a/test/cmdlineTests/linking_strict_assembly/output
+++ b/test/cmdlineTests/linking_strict_assembly/output
@@ -4,23 +4,23 @@
 Pretty printed source:
 object "a" {
     code {
-        let addr := linkersymbol("contract/test.sol:L")
-        sstore(0, addr)
+        {
+            let addr := linkersymbol("contract/test.sol:L")
+            sstore(0, addr)
+        }
     }
 }
 
 
 Binary representation:
-731234567890123456789012345678901234567890805f5550
+7312345678901234567890123456789012345678905f5500
 
 Text representation:
     /* "linking_strict_assembly/input.yul":44:79   */
   linkerSymbol("f919ba91ac99f96129544b80b9516b27a80e376b9dc693819d0b18b7e0395612")
-    /* "linking_strict_assembly/input.yul":98:102   */
-  dup1
     /* "linking_strict_assembly/input.yul":95:96   */
   0x00
     /* "linking_strict_assembly/input.yul":88:103   */
   sstore
     /* "linking_strict_assembly/input.yul":22:109   */
-  pop
+  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output b/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output
index a919ba72ec..e4fa4fcbd9 100644
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output
+++ b/test/cmdlineTests/linking_strict_assembly_qualified_library_qualified_reference/output
@@ -4,18 +4,19 @@
 Pretty printed source:
 object "a" {
     code {
-        let addr := linkersymbol(":L")
-        sstore(0, addr)
+        {
+            let addr := linkersymbol(":L")
+            sstore(0, addr)
+        }
     }
 }
 
 
 Binary representation:
-731234567890123456789012345678901234567890805f5550
+7312345678901234567890123456789012345678905f5500
 
 Text representation:
   linkerSymbol("20a18a9bf97d889dcf77111b674da319a4e9e3e05d3f4df9e0bf5c588dd4f0f8")
-  dup1
   0x00
   sstore
-  pop
+  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output b/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output
index 660876888a..ebf7f6542c 100644
--- a/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output
+++ b/test/cmdlineTests/linking_strict_assembly_qualified_library_unqualified_reference/output
@@ -4,18 +4,19 @@
 Pretty printed source:
 object "a" {
     code {
-        let addr := linkersymbol("L")
-        sstore(0, addr)
+        {
+            let addr := linkersymbol("L")
+            sstore(0, addr)
+        }
     }
 }
 
 
 Binary representation:
-73__$8aa64f937099b65a4febc243a5ae0f2d64$__805f5550
+73__$8aa64f937099b65a4febc243a5ae0f2d64$__5f5500
 
 Text representation:
   linkerSymbol("8aa64f937099b65a4febc243a5ae0f2d6416bb9e473c30dd29c1ee498fb7c5a8")
-  dup1
   0x00
   sstore
-  pop
+  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output
index 5babd2279d..4aecfc6b26 100644
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output
+++ b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files/output
@@ -4,34 +4,33 @@
 Pretty printed source:
 object "a" {
     code {
-        let addr1 := linkersymbol("library1.sol:L")
-        let addr2 := linkersymbol("library2.sol:L")
-        sstore(0, addr1)
-        sstore(1, addr2)
+        {
+            let addr1 := linkersymbol("library1.sol:L")
+            let addr2 := linkersymbol("library2.sol:L")
+            sstore(0, addr1)
+            sstore(1, addr2)
+        }
     }
 }
 
 
 Binary representation:
-731111111111111111111111111111111111111111732222222222222222222222222222222222222222815f55806001555050
+731111111111111111111111111111111111111111732222222222222222222222222222222222222222905f5560015500
 
 Text representation:
     /* "linking_strict_assembly_same_library_name_different_files/input.yul":45:75   */
   linkerSymbol("f3ffc10c396a7cc41ae954b050792839d20947bf73497d30c49a9fda1ea477ec")
     /* "linking_strict_assembly_same_library_name_different_files/input.yul":97:127   */
   linkerSymbol("c3523432985587641d17c68161d2f700c57aaf4ed21cda4f25d76193c831f97f")
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":146:151   */
-  dup2
+    /* "linking_strict_assembly_same_library_name_different_files/input.yul":136:152   */
+  swap1
     /* "linking_strict_assembly_same_library_name_different_files/input.yul":143:144   */
   0x00
     /* "linking_strict_assembly_same_library_name_different_files/input.yul":136:152   */
   sstore
-    /* "linking_strict_assembly_same_library_name_different_files/input.yul":171:176   */
-  dup1
     /* "linking_strict_assembly_same_library_name_different_files/input.yul":168:169   */
   0x01
     /* "linking_strict_assembly_same_library_name_different_files/input.yul":161:177   */
   sstore
     /* "linking_strict_assembly_same_library_name_different_files/input.yul":22:183   */
-  pop
-  pop
+  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output
index 0eba8cf848..10a7fe7fe0 100644
--- a/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output
+++ b/test/cmdlineTests/linking_strict_assembly_same_library_name_different_files_in_link_references/output
@@ -4,34 +4,33 @@
 Pretty printed source:
 object "a" {
     code {
-        let addr1 := linkersymbol("library1.sol:L")
-        let addr2 := linkersymbol("library2.sol:L")
-        sstore(0, addr1)
-        sstore(1, addr2)
+        {
+            let addr1 := linkersymbol("library1.sol:L")
+            let addr2 := linkersymbol("library2.sol:L")
+            sstore(0, addr1)
+            sstore(1, addr2)
+        }
     }
 }
 
 
 Binary representation:
-73123456789012345678901234567890123456789073__$c3523432985587641d17c68161d2f700c5$__815f55806001555050
+73123456789012345678901234567890123456789073__$c3523432985587641d17c68161d2f700c5$__905f5560015500
 
 Text representation:
     /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":45:75   */
   linkerSymbol("f3ffc10c396a7cc41ae954b050792839d20947bf73497d30c49a9fda1ea477ec")
     /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":97:127   */
   linkerSymbol("c3523432985587641d17c68161d2f700c57aaf4ed21cda4f25d76193c831f97f")
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":146:151   */
-  dup2
+    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":136:152   */
+  swap1
     /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":143:144   */
   0x00
     /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":136:152   */
   sstore
-    /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":171:176   */
-  dup1
     /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":168:169   */
   0x01
     /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":161:177   */
   sstore
     /* "linking_strict_assembly_same_library_name_different_files_in_link_references/input.yul":22:183   */
-  pop
-  pop
+  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output b/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output
index 71d19f7aeb..aaf03d0733 100644
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output
+++ b/test/cmdlineTests/linking_strict_assembly_unqualified_library_qualified_reference/output
@@ -4,18 +4,19 @@
 Pretty printed source:
 object "a" {
     code {
-        let addr := linkersymbol(":L")
-        sstore(0, addr)
+        {
+            let addr := linkersymbol(":L")
+            sstore(0, addr)
+        }
     }
 }
 
 
 Binary representation:
-73__$20a18a9bf97d889dcf77111b674da319a4$__805f5550
+73__$20a18a9bf97d889dcf77111b674da319a4$__5f5500
 
 Text representation:
   linkerSymbol("20a18a9bf97d889dcf77111b674da319a4e9e3e05d3f4df9e0bf5c588dd4f0f8")
-  dup1
   0x00
   sstore
-  pop
+  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output b/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output
index 6f3ee5eb75..d91d89f5ca 100644
--- a/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output
+++ b/test/cmdlineTests/linking_strict_assembly_unqualified_library_unqualified_reference/output
@@ -4,18 +4,19 @@
 Pretty printed source:
 object "a" {
     code {
-        let addr := linkersymbol("L")
-        sstore(0, addr)
+        {
+            let addr := linkersymbol("L")
+            sstore(0, addr)
+        }
     }
 }
 
 
 Binary representation:
-731234567890123456789012345678901234567890805f5550
+7312345678901234567890123456789012345678905f5500
 
 Text representation:
   linkerSymbol("8aa64f937099b65a4febc243a5ae0f2d6416bb9e473c30dd29c1ee498fb7c5a8")
-  dup1
   0x00
   sstore
-  pop
+  stop
diff --git a/test/cmdlineTests/linking_strict_assembly_unresolved_references/output b/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
index bc2e167b33..a110db5a3e 100644
--- a/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
+++ b/test/cmdlineTests/linking_strict_assembly_unresolved_references/output
@@ -4,34 +4,33 @@
 Pretty printed source:
 object "a" {
     code {
-        let addr1 := linkersymbol("contract/test.sol:L1")
-        let addr2 := linkersymbol("contract/test.sol:L2")
-        sstore(0, addr1)
-        sstore(1, addr2)
+        {
+            let addr1 := linkersymbol("contract/test.sol:L1")
+            let addr2 := linkersymbol("contract/test.sol:L2")
+            sstore(0, addr1)
+            sstore(1, addr2)
+        }
     }
 }
 
 
 Binary representation:
-73123456789012345678901234567890123456789073__$fb58009a6b1ecea3b9d99bedd645df4ec3$__815f55806001555050
+73123456789012345678901234567890123456789073__$fb58009a6b1ecea3b9d99bedd645df4ec3$__905f5560015500
 
 Text representation:
     /* "linking_strict_assembly_unresolved_references/input.yul":45:81   */
   linkerSymbol("05b0326038374a21e0895480a58bda0768cdcc04c8d18f154362d1ca5223d245")
     /* "linking_strict_assembly_unresolved_references/input.yul":103:139   */
   linkerSymbol("fb58009a6b1ecea3b9d99bedd645df4ec308f17bc0087e5f39d078f77f809177")
-    /* "linking_strict_assembly_unresolved_references/input.yul":158:163   */
-  dup2
+    /* "linking_strict_assembly_unresolved_references/input.yul":148:164   */
+  swap1
     /* "linking_strict_assembly_unresolved_references/input.yul":155:156   */
   0x00
     /* "linking_strict_assembly_unresolved_references/input.yul":148:164   */
   sstore
-    /* "linking_strict_assembly_unresolved_references/input.yul":183:188   */
-  dup1
     /* "linking_strict_assembly_unresolved_references/input.yul":180:181   */
   0x01
     /* "linking_strict_assembly_unresolved_references/input.yul":173:189   */
   sstore
     /* "linking_strict_assembly_unresolved_references/input.yul":22:195   */
-  pop
-  pop
+  stop
diff --git a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
index ed7138c8f4..200b653ff4 100644
--- a/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_ast_requested/output.json
@@ -17,277 +17,266 @@
                             "statements":
                             [
                                 {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
-                                            {
-                                                "kind": "number",
-                                                "nativeSrc": "103:2:0",
-                                                "nodeType": "YulLiteral",
-                                                "src": "56:13:0",
-                                                "type": "",
-                                                "value": "64"
-                                            },
+                                    "nativeSrc": "44:790:0",
+                                    "nodeType": "YulBlock",
+                                    "src": "-1:-1:0",
+                                    "statements":
+                                    [
+                                        {
+                                            "expression":
                                             {
                                                 "arguments":
                                                 [
                                                     {
                                                         "kind": "number",
-                                                        "nativeSrc": "119:3:0",
+                                                        "nativeSrc": "103:2:0",
                                                         "nodeType": "YulLiteral",
                                                         "src": "56:13:0",
                                                         "type": "",
-                                                        "value": "128"
+                                                        "value": "64"
+                                                    },
+                                                    {
+                                                        "arguments":
+                                                        [
+                                                            {
+                                                                "kind": "number",
+                                                                "nativeSrc": "119:3:0",
+                                                                "nodeType": "YulLiteral",
+                                                                "src": "56:13:0",
+                                                                "type": "",
+                                                                "value": "0x80"
+                                                            }
+                                                        ],
+                                                        "functionName":
+                                                        {
+                                                            "name": "memoryguard",
+                                                            "nativeSrc": "107:11:0",
+                                                            "nodeType": "YulIdentifier",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "nativeSrc": "107:16:0",
+                                                        "nodeType": "YulFunctionCall",
+                                                        "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName":
                                                 {
-                                                    "name": "memoryguard",
-                                                    "nativeSrc": "107:11:0",
+                                                    "name": "mstore",
+                                                    "nativeSrc": "96:6:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "107:16:0",
+                                                "nativeSrc": "96:28:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
-                                            }
-                                        ],
-                                        "functionName":
-                                        {
-                                            "name": "mstore",
-                                            "nativeSrc": "96:6:0",
-                                            "nodeType": "YulIdentifier",
+                                            },
+                                            "nativeSrc": "96:28:0",
+                                            "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         },
-                                        "nativeSrc": "96:28:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "nativeSrc": "96:28:0",
-                                    "nodeType": "YulExpressionStatement",
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "body":
-                                    {
-                                        "nativeSrc": "148:83:0",
-                                        "nodeType": "YulBlock",
-                                        "src": "56:13:0",
-                                        "statements":
-                                        [
+                                        {
+                                            "body":
                                             {
-                                                "expression":
-                                                {
-                                                    "arguments": [],
-                                                    "functionName":
+                                                "nativeSrc": "148:83:0",
+                                                "nodeType": "YulBlock",
+                                                "src": "56:13:0",
+                                                "statements":
+                                                [
                                                     {
-                                                        "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
-                                                        "nativeSrc": "150:77:0",
-                                                        "nodeType": "YulIdentifier",
+                                                        "expression":
+                                                        {
+                                                            "arguments": [],
+                                                            "functionName":
+                                                            {
+                                                                "name": "revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb",
+                                                                "nativeSrc": "150:77:0",
+                                                                "nodeType": "YulIdentifier",
+                                                                "src": "56:13:0"
+                                                            },
+                                                            "nativeSrc": "150:79:0",
+                                                            "nodeType": "YulFunctionCall",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "nativeSrc": "150:79:0",
+                                                        "nodeType": "YulExpressionStatement",
                                                         "src": "56:13:0"
-                                                    },
-                                                    "nativeSrc": "150:79:0",
-                                                    "nodeType": "YulFunctionCall",
+                                                    }
+                                                ]
+                                            },
+                                            "condition":
+                                            {
+                                                "arguments": [],
+                                                "functionName":
+                                                {
+                                                    "name": "callvalue",
+                                                    "nativeSrc": "136:9:0",
+                                                    "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "150:79:0",
-                                                "nodeType": "YulExpressionStatement",
+                                                "nativeSrc": "136:11:0",
+                                                "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
-                                            }
-                                        ]
-                                    },
-                                    "condition":
-                                    {
-                                        "arguments": [],
-                                        "functionName":
-                                        {
-                                            "name": "callvalue",
-                                            "nativeSrc": "136:9:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "56:13:0"
-                                        },
-                                        "nativeSrc": "136:11:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "nativeSrc": "133:98:0",
-                                    "nodeType": "YulIf",
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "expression":
-                                    {
-                                        "arguments": [],
-                                        "functionName":
-                                        {
-                                            "name": "constructor_C_2",
-                                            "nativeSrc": "241:15:0",
-                                            "nodeType": "YulIdentifier",
-                                            "src": "56:13:0"
-                                        },
-                                        "nativeSrc": "241:17:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "nativeSrc": "241:17:0",
-                                    "nodeType": "YulExpressionStatement",
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "nativeSrc": "268:30:0",
-                                    "nodeType": "YulVariableDeclaration",
-                                    "src": "56:13:0",
-                                    "value":
-                                    {
-                                        "arguments": [],
-                                        "functionName":
-                                        {
-                                            "name": "allocate_unbounded",
-                                            "nativeSrc": "278:18:0",
-                                            "nodeType": "YulIdentifier",
+                                            },
+                                            "nativeSrc": "133:98:0",
+                                            "nodeType": "YulIf",
                                             "src": "56:13:0"
                                         },
-                                        "nativeSrc": "278:20:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "variables":
-                                    [
                                         {
-                                            "name": "_1",
-                                            "nativeSrc": "272:2:0",
-                                            "nodeType": "YulTypedName",
+                                            "nativeSrc": "268:30:0",
+                                            "nodeType": "YulVariableDeclaration",
                                             "src": "56:13:0",
-                                            "type": ""
-                                        }
-                                    ]
-                                },
-                                {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
+                                            "value":
                                             {
-                                                "name": "_1",
-                                                "nativeSrc": "316:2:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "56:13:0"
-                                            },
-                                            {
-                                                "arguments":
-                                                [
-                                                    {
-                                                        "hexValue": "435f325f6465706c6f796564",
-                                                        "kind": "string",
-                                                        "nativeSrc": "331:14:0",
-                                                        "nodeType": "YulLiteral",
-                                                        "src": "56:13:0",
-                                                        "type": "",
-                                                        "value": "C_2_deployed"
-                                                    }
-                                                ],
+                                                "arguments": [],
                                                 "functionName":
                                                 {
-                                                    "name": "dataoffset",
-                                                    "nativeSrc": "320:10:0",
+                                                    "name": "allocate_unbounded",
+                                                    "nativeSrc": "278:18:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "320:26:0",
+                                                "nativeSrc": "278:20:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
                                             },
+                                            "variables":
+                                            [
+                                                {
+                                                    "name": "_1",
+                                                    "nativeSrc": "272:2:0",
+                                                    "nodeType": "YulTypedName",
+                                                    "src": "56:13:0",
+                                                    "type": ""
+                                                }
+                                            ]
+                                        },
+                                        {
+                                            "expression":
                                             {
                                                 "arguments":
                                                 [
                                                     {
-                                                        "hexValue": "435f325f6465706c6f796564",
-                                                        "kind": "string",
-                                                        "nativeSrc": "357:14:0",
-                                                        "nodeType": "YulLiteral",
-                                                        "src": "56:13:0",
-                                                        "type": "",
-                                                        "value": "C_2_deployed"
+                                                        "name": "_1",
+                                                        "nativeSrc": "316:2:0",
+                                                        "nodeType": "YulIdentifier",
+                                                        "src": "56:13:0"
+                                                    },
+                                                    {
+                                                        "arguments":
+                                                        [
+                                                            {
+                                                                "hexValue": "435f325f6465706c6f796564",
+                                                                "kind": "string",
+                                                                "nativeSrc": "331:14:0",
+                                                                "nodeType": "YulLiteral",
+                                                                "src": "56:13:0",
+                                                                "type": "",
+                                                                "value": "C_2_deployed"
+                                                            }
+                                                        ],
+                                                        "functionName":
+                                                        {
+                                                            "name": "dataoffset",
+                                                            "nativeSrc": "320:10:0",
+                                                            "nodeType": "YulIdentifier",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "nativeSrc": "320:26:0",
+                                                        "nodeType": "YulFunctionCall",
+                                                        "src": "56:13:0"
+                                                    },
+                                                    {
+                                                        "arguments":
+                                                        [
+                                                            {
+                                                                "hexValue": "435f325f6465706c6f796564",
+                                                                "kind": "string",
+                                                                "nativeSrc": "357:14:0",
+                                                                "nodeType": "YulLiteral",
+                                                                "src": "56:13:0",
+                                                                "type": "",
+                                                                "value": "C_2_deployed"
+                                                            }
+                                                        ],
+                                                        "functionName":
+                                                        {
+                                                            "name": "datasize",
+                                                            "nativeSrc": "348:8:0",
+                                                            "nodeType": "YulIdentifier",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "nativeSrc": "348:24:0",
+                                                        "nodeType": "YulFunctionCall",
+                                                        "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName":
                                                 {
-                                                    "name": "datasize",
-                                                    "nativeSrc": "348:8:0",
+                                                    "name": "codecopy",
+                                                    "nativeSrc": "307:8:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "348:24:0",
+                                                "nativeSrc": "307:66:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
-                                            }
-                                        ],
-                                        "functionName":
-                                        {
-                                            "name": "codecopy",
-                                            "nativeSrc": "307:8:0",
-                                            "nodeType": "YulIdentifier",
+                                            },
+                                            "nativeSrc": "307:66:0",
+                                            "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
                                         },
-                                        "nativeSrc": "307:66:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "nativeSrc": "307:66:0",
-                                    "nodeType": "YulExpressionStatement",
-                                    "src": "56:13:0"
-                                },
-                                {
-                                    "expression":
-                                    {
-                                        "arguments":
-                                        [
-                                            {
-                                                "name": "_1",
-                                                "nativeSrc": "390:2:0",
-                                                "nodeType": "YulIdentifier",
-                                                "src": "56:13:0"
-                                            },
+                                        {
+                                            "expression":
                                             {
                                                 "arguments":
                                                 [
                                                     {
-                                                        "hexValue": "435f325f6465706c6f796564",
-                                                        "kind": "string",
-                                                        "nativeSrc": "403:14:0",
-                                                        "nodeType": "YulLiteral",
-                                                        "src": "56:13:0",
-                                                        "type": "",
-                                                        "value": "C_2_deployed"
+                                                        "name": "_1",
+                                                        "nativeSrc": "390:2:0",
+                                                        "nodeType": "YulIdentifier",
+                                                        "src": "56:13:0"
+                                                    },
+                                                    {
+                                                        "arguments":
+                                                        [
+                                                            {
+                                                                "hexValue": "435f325f6465706c6f796564",
+                                                                "kind": "string",
+                                                                "nativeSrc": "403:14:0",
+                                                                "nodeType": "YulLiteral",
+                                                                "src": "56:13:0",
+                                                                "type": "",
+                                                                "value": "C_2_deployed"
+                                                            }
+                                                        ],
+                                                        "functionName":
+                                                        {
+                                                            "name": "datasize",
+                                                            "nativeSrc": "394:8:0",
+                                                            "nodeType": "YulIdentifier",
+                                                            "src": "56:13:0"
+                                                        },
+                                                        "nativeSrc": "394:24:0",
+                                                        "nodeType": "YulFunctionCall",
+                                                        "src": "56:13:0"
                                                     }
                                                 ],
                                                 "functionName":
                                                 {
-                                                    "name": "datasize",
-                                                    "nativeSrc": "394:8:0",
+                                                    "name": "return",
+                                                    "nativeSrc": "383:6:0",
                                                     "nodeType": "YulIdentifier",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "394:24:0",
+                                                "nativeSrc": "383:36:0",
                                                 "nodeType": "YulFunctionCall",
                                                 "src": "56:13:0"
-                                            }
-                                        ],
-                                        "functionName":
-                                        {
-                                            "name": "return",
-                                            "nativeSrc": "383:6:0",
-                                            "nodeType": "YulIdentifier",
+                                            },
+                                            "nativeSrc": "383:36:0",
+                                            "nodeType": "YulExpressionStatement",
                                             "src": "56:13:0"
-                                        },
-                                        "nativeSrc": "383:36:0",
-                                        "nodeType": "YulFunctionCall",
-                                        "src": "56:13:0"
-                                    },
-                                    "nativeSrc": "383:36:0",
-                                    "nodeType": "YulExpressionStatement",
-                                    "src": "56:13:0"
+                                        }
+                                    ]
                                 },
                                 {
                                     "body":
@@ -403,19 +392,6 @@
                                     "nativeSrc": "522:125:0",
                                     "nodeType": "YulFunctionDefinition",
                                     "src": "56:13:0"
-                                },
-                                {
-                                    "body":
-                                    {
-                                        "nativeSrc": "726:59:0",
-                                        "nodeType": "YulBlock",
-                                        "src": "56:13:0",
-                                        "statements": []
-                                    },
-                                    "name": "constructor_C_2",
-                                    "nativeSrc": "699:86:0",
-                                    "nodeType": "YulFunctionDefinition",
-                                    "src": "56:13:0"
                                 }
                             ]
                         },
@@ -436,217 +412,83 @@
                                     "statements":
                                     [
                                         {
-                                            "expression":
-                                            {
-                                                "arguments":
-                                                [
-                                                    {
-                                                        "kind": "number",
-                                                        "nativeSrc": "966:2:0",
-                                                        "nodeType": "YulLiteral",
-                                                        "src": "56:13:0",
-                                                        "type": "",
-                                                        "value": "64"
-                                                    },
+                                            "nativeSrc": "899:588:0",
+                                            "nodeType": "YulBlock",
+                                            "src": "-1:-1:0",
+                                            "statements":
+                                            [
+                                                {
+                                                    "expression":
                                                     {
                                                         "arguments":
                                                         [
                                                             {
                                                                 "kind": "number",
-                                                                "nativeSrc": "982:3:0",
+                                                                "nativeSrc": "966:2:0",
                                                                 "nodeType": "YulLiteral",
                                                                 "src": "56:13:0",
                                                                 "type": "",
-                                                                "value": "128"
+                                                                "value": "64"
+                                                            },
+                                                            {
+                                                                "arguments":
+                                                                [
+                                                                    {
+                                                                        "kind": "number",
+                                                                        "nativeSrc": "982:3:0",
+                                                                        "nodeType": "YulLiteral",
+                                                                        "src": "56:13:0",
+                                                                        "type": "",
+                                                                        "value": "0x80"
+                                                                    }
+                                                                ],
+                                                                "functionName":
+                                                                {
+                                                                    "name": "memoryguard",
+                                                                    "nativeSrc": "970:11:0",
+                                                                    "nodeType": "YulIdentifier",
+                                                                    "src": "56:13:0"
+                                                                },
+                                                                "nativeSrc": "970:16:0",
+                                                                "nodeType": "YulFunctionCall",
+                                                                "src": "56:13:0"
                                                             }
                                                         ],
                                                         "functionName":
                                                         {
-                                                            "name": "memoryguard",
-                                                            "nativeSrc": "970:11:0",
+                                                            "name": "mstore",
+                                                            "nativeSrc": "959:6:0",
                                                             "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "nativeSrc": "970:16:0",
+                                                        "nativeSrc": "959:28:0",
                                                         "nodeType": "YulFunctionCall",
                                                         "src": "56:13:0"
-                                                    }
-                                                ],
-                                                "functionName":
-                                                {
-                                                    "name": "mstore",
-                                                    "nativeSrc": "959:6:0",
-                                                    "nodeType": "YulIdentifier",
-                                                    "src": "56:13:0"
-                                                },
-                                                "nativeSrc": "959:28:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            },
-                                            "nativeSrc": "959:28:0",
-                                            "nodeType": "YulExpressionStatement",
-                                            "src": "56:13:0"
-                                        },
-                                        {
-                                            "expression":
-                                            {
-                                                "arguments": [],
-                                                "functionName":
-                                                {
-                                                    "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
-                                                    "nativeSrc": "1001:77:0",
-                                                    "nodeType": "YulIdentifier",
+                                                    },
+                                                    "nativeSrc": "959:28:0",
+                                                    "nodeType": "YulExpressionStatement",
                                                     "src": "56:13:0"
                                                 },
-                                                "nativeSrc": "1001:79:0",
-                                                "nodeType": "YulFunctionCall",
-                                                "src": "56:13:0"
-                                            },
-                                            "nativeSrc": "1001:79:0",
-                                            "nodeType": "YulExpressionStatement",
-                                            "src": "56:13:0"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1147:77:0",
-                                                "nodeType": "YulBlock",
-                                                "src": "56:13:0",
-                                                "statements":
-                                                [
-                                                    {
-                                                        "nativeSrc": "1165:44:0",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "56:13:0",
-                                                        "value":
-                                                        {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1198:3:0",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "56:13:0",
-                                                                    "type": "",
-                                                                    "value": "224"
-                                                                },
-                                                                {
-                                                                    "name": "value",
-                                                                    "nativeSrc": "1203:5:0",
-                                                                    "nodeType": "YulIdentifier",
-                                                                    "src": "56:13:0"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "shr",
-                                                                "nativeSrc": "1194:3:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            },
-                                                            "nativeSrc": "1194:15:0",
-                                                            "nodeType": "YulFunctionCall",
-                                                            "src": "56:13:0"
-                                                        },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "newValue",
-                                                                "nativeSrc": "1165:8:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "shift_right_224_unsigned",
-                                            "nativeSrc": "1094:130:0",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "parameters":
-                                            [
                                                 {
-                                                    "name": "value",
-                                                    "nativeSrc": "1128:5:0",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "56:13:0",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "newValue",
-                                                    "nativeSrc": "1138:8:0",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "56:13:0",
-                                                    "type": ""
-                                                }
-                                            ],
-                                            "src": "56:13:0"
-                                        },
-                                        {
-                                            "body":
-                                            {
-                                                "nativeSrc": "1278:51:0",
-                                                "nodeType": "YulBlock",
-                                                "src": "56:13:0",
-                                                "statements":
-                                                [
+                                                    "expression":
                                                     {
-                                                        "nativeSrc": "1296:19:0",
-                                                        "nodeType": "YulAssignment",
-                                                        "src": "56:13:0",
-                                                        "value":
+                                                        "arguments": [],
+                                                        "functionName":
                                                         {
-                                                            "arguments":
-                                                            [
-                                                                {
-                                                                    "kind": "number",
-                                                                    "nativeSrc": "1312:2:0",
-                                                                    "nodeType": "YulLiteral",
-                                                                    "src": "56:13:0",
-                                                                    "type": "",
-                                                                    "value": "64"
-                                                                }
-                                                            ],
-                                                            "functionName":
-                                                            {
-                                                                "name": "mload",
-                                                                "nativeSrc": "1306:5:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            },
-                                                            "nativeSrc": "1306:9:0",
-                                                            "nodeType": "YulFunctionCall",
+                                                            "name": "revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74",
+                                                            "nativeSrc": "1001:77:0",
+                                                            "nodeType": "YulIdentifier",
                                                             "src": "56:13:0"
                                                         },
-                                                        "variableNames":
-                                                        [
-                                                            {
-                                                                "name": "memPtr",
-                                                                "nativeSrc": "1296:6:0",
-                                                                "nodeType": "YulIdentifier",
-                                                                "src": "56:13:0"
-                                                            }
-                                                        ]
-                                                    }
-                                                ]
-                                            },
-                                            "name": "allocate_unbounded",
-                                            "nativeSrc": "1238:91:0",
-                                            "nodeType": "YulFunctionDefinition",
-                                            "returnVariables":
-                                            [
-                                                {
-                                                    "name": "memPtr",
-                                                    "nativeSrc": "1271:6:0",
-                                                    "nodeType": "YulTypedName",
-                                                    "src": "56:13:0",
-                                                    "type": ""
+                                                        "nativeSrc": "1001:79:0",
+                                                        "nodeType": "YulFunctionCall",
+                                                        "src": "56:13:0"
+                                                    },
+                                                    "nativeSrc": "1001:79:0",
+                                                    "nodeType": "YulExpressionStatement",
+                                                    "src": "56:13:0"
                                                 }
-                                            ],
-                                            "src": "56:13:0"
+                                            ]
                                         },
                                         {
                                             "body":
diff --git a/test/cmdlineTests/standard_irOptimized_requested/output.json b/test/cmdlineTests/standard_irOptimized_requested/output.json
index b3a27c5ca5..88ce648957 100644
--- a/test/cmdlineTests/standard_irOptimized_requested/output.json
+++ b/test/cmdlineTests/standard_irOptimized_requested/output.json
@@ -8,37 +8,38 @@
                 "irOptimized": "/// @use-src 0:\"A\"
 object \"C_7\" {
     code {
-        /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-        mstore(64, memoryguard(128))
-        if callvalue()
         {
-            revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+            /// @src 0:79:121  \"contract C { function f() public pure {} }\"
+            mstore(64, memoryguard(0x80))
+            if callvalue()
+            {
+                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+            }
+            let _1 := allocate_unbounded()
+            codecopy(_1, dataoffset(\"C_7_deployed\"), datasize(\"C_7_deployed\"))
+            return(_1, datasize(\"C_7_deployed\"))
         }
-        constructor_C_7()
-        let _1 := allocate_unbounded()
-        codecopy(_1, dataoffset(\"C_7_deployed\"), datasize(\"C_7_deployed\"))
-        return(_1, datasize(\"C_7_deployed\"))
         function allocate_unbounded() -> memPtr
         { memPtr := mload(64) }
         function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
         { revert(0, 0) }
-        function constructor_C_7()
-        { }
     }
     /// @use-src 0:\"A\"
     object \"C_7_deployed\" {
         code {
-            /// @src 0:79:121  \"contract C { function f() public pure {} }\"
-            mstore(64, memoryguard(128))
-            if iszero(lt(calldatasize(), 4))
             {
-                let selector := shift_right_224_unsigned(calldataload(0))
-                switch selector
-                case 0x26121ff0 { external_fun_f_6() }
-                default { }
+                /// @src 0:79:121  \"contract C { function f() public pure {} }\"
+                mstore(64, memoryguard(0x80))
+                if iszero(lt(calldatasize(), 4))
+                {
+                    let selector := shift_right_unsigned(calldataload(0))
+                    switch selector
+                    case 0x26121ff0 { external_fun_f() }
+                    default { }
+                }
+                revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
             }
-            revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
-            function shift_right_224_unsigned(value) -> newValue
+            function shift_right_unsigned(value) -> newValue
             { newValue := shr(224, value) }
             function allocate_unbounded() -> memPtr
             { memPtr := mload(64) }
@@ -46,32 +47,28 @@ object \"C_7\" {
             { revert(0, 0) }
             function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
             { revert(0, 0) }
-            function abi_decode_tuple_(headStart, dataEnd)
+            function abi_decode(headStart, dataEnd)
             {
                 if slt(sub(dataEnd, headStart), 0)
                 {
                     revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
                 }
             }
-            function abi_encode_tuple__to__fromStack(headStart) -> tail
+            function abi_encode_tuple(headStart) -> tail
             { tail := add(headStart, 0) }
-            function external_fun_f_6()
+            function external_fun_f()
             {
                 if callvalue()
                 {
                     revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
                 }
-                abi_decode_tuple_(4, calldatasize())
-                fun_f_6()
+                abi_decode(4, calldatasize())
                 let memPos := allocate_unbounded()
-                let memEnd := abi_encode_tuple__to__fromStack(memPos)
+                let memEnd := abi_encode_tuple(memPos)
                 return(memPos, sub(memEnd, memPos))
             }
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
             { revert(0, 0) }
-            /// @ast-id 6 @src 0:92:119  \"function f() public pure {}\"
-            function fun_f_6()
-            { }
         }
         data \".metadata\" hex\"<BYTECODE REMOVED>\"
     }
diff --git a/test/cmdlineTests/standard_yul/output.json b/test/cmdlineTests/standard_yul/output.json
index d335c3a966..9dcf201139 100644
--- a/test/cmdlineTests/standard_yul/output.json
+++ b/test/cmdlineTests/standard_yul/output.json
@@ -7,22 +7,18 @@
             {
                 "evm":
                 {
-                    "assembly": "    /* \"A\":17:18   */
+                    "assembly": "    /* \"A\":38:39   */
   0x00
     /* \"A\":11:19   */
-  mload
-    /* \"A\":38:39   */
-  0x00
-    /* \"A\":34:35   */
   dup1
-    /* \"A\":31:32   */
-  dup3
+  dup1
+  mload
     /* \"A\":27:36   */
   add
     /* \"A\":20:40   */
   sstore
     /* \"A\":0:42   */
-  pop
+  stop
 ",
                     "bytecode":
                     {
@@ -43,8 +39,10 @@
 ",
                 "irOptimized": "object \"object\" {
     code {
-        let x := mload(0)
-        sstore(add(x, 0), 0)
+        {
+            let x := mload(0)
+            sstore(add(x, 0), 0)
+        }
     }
 }
 "
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json b/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
index 0c78efb800..9d675a0691 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_all/output.json
@@ -13,12 +13,11 @@
   tag_1
   jump\t// in
 tag_2:
+  stop
     /* \"input.sol\":77:99   */
-  jump(tag_3)
 tag_1:
   sstore(0x00, 0x2a)
   jump\t// out
-tag_3:
 "
                 }
             }
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json b/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
index 53be3d073b..8cbbd326c7 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_location_only/output.json
@@ -13,12 +13,11 @@
   tag_1
   jump\t// in
 tag_2:
+  stop
     /* \"input.sol\":77:99 */
-  jump(tag_3)
 tag_1:
   sstore(0x00, 0x2a)
   jump\t// out
-tag_3:
 "
                 }
             }
diff --git a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json b/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
index ac2a93b0f2..d1e4cff4cb 100644
--- a/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
+++ b/test/cmdlineTests/standard_yul_debug_info_print_none/output.json
@@ -12,11 +12,10 @@
   tag_1
   jump\t// in
 tag_2:
-  jump(tag_3)
+  stop
 tag_1:
   sstore(0x00, 0x2a)
   jump\t// out
-tag_3:
 "
                 }
             }
diff --git a/test/cmdlineTests/standard_yul_object/output.json b/test/cmdlineTests/standard_yul_object/output.json
index af55758f4d..edf139dc0d 100644
--- a/test/cmdlineTests/standard_yul_object/output.json
+++ b/test/cmdlineTests/standard_yul_object/output.json
@@ -7,20 +7,17 @@
             {
                 "evm":
                 {
-                    "assembly": "    /* \"A\":39:61   */
-  data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
-    /* \"A\":80:81   */
+                    "assembly": "    /* \"A\":80:81   */
   0x00
-    /* \"A\":76:77   */
+    /* \"A\":39:61   */
   dup1
-    /* \"A\":73:74   */
-  dup3
+  data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
     /* \"A\":69:78   */
   add
     /* \"A\":62:82   */
   sstore
     /* \"A\":28:84   */
-  pop
+  stop
 stop
 data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
 ",
@@ -44,8 +41,10 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
 ",
                 "irOptimized": "object \"NamedObject\" {
     code {
-        let x := dataoffset(\"DataName\")
-        sstore(add(x, 0), 0)
+        {
+            let x := dataoffset(\"DataName\")
+            sstore(add(x, 0), 0)
+        }
     }
     data \"DataName\" hex\"616263\"
 }
diff --git a/test/cmdlineTests/standard_yul_object_name/output.json b/test/cmdlineTests/standard_yul_object_name/output.json
index e94a9bc6ac..7faeed3c32 100644
--- a/test/cmdlineTests/standard_yul_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_object_name/output.json
@@ -7,29 +7,25 @@
             {
                 "evm":
                 {
-                    "assembly": "    /* \"A\":39:61   */
-  data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
-    /* \"A\":80:81   */
+                    "assembly": "    /* \"A\":80:81   */
   0x00
-    /* \"A\":76:77   */
+    /* \"A\":39:61   */
   dup1
-    /* \"A\":73:74   */
-  dup3
+  data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45
     /* \"A\":69:78   */
   add
     /* \"A\":62:82   */
   sstore
     /* \"A\":28:84   */
-  pop
+  stop
 stop
 data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
 
 sub_0: assembly {
         /* \"A\":147:148   */
       0x00
-        /* \"A\":144:145   */
-      dup1
         /* \"A\":137:149   */
+      dup1
       revert
 }
 ",
@@ -66,12 +62,14 @@ sub_0: assembly {
 ",
                 "irOptimized": "object \"NamedObject\" {
     code {
-        let x := dataoffset(\"DataName\")
-        sstore(add(x, 0), 0)
+        {
+            let x := dataoffset(\"DataName\")
+            sstore(add(x, 0), 0)
+        }
     }
     data \"DataName\" hex\"616263\"
     object \"OtherObject\" {
-        code { revert(0, 0) }
+        code { { revert(0, 0) } }
     }
 }
 "
diff --git a/test/cmdlineTests/strict_asm_ast_compact_json/output b/test/cmdlineTests/strict_asm_ast_compact_json/output
index ff944e8e47..98afddcfa9 100644
--- a/test/cmdlineTests/strict_asm_ast_compact_json/output
+++ b/test/cmdlineTests/strict_asm_ast_compact_json/output
@@ -13,73 +13,49 @@ AST:
             "statements":
             [
                 {
-                    "expression":
-                    {
-                        "arguments":
-                        [
+                    "nativeSrc": "60:246:0",
+                    "nodeType": "YulBlock",
+                    "src": "-1:-1:0",
+                    "statements":
+                    [
+                        {
+                            "expression":
                             {
-                                "kind": "number",
-                                "nativeSrc": "122:2:0",
-                                "nodeType": "YulLiteral",
-                                "src": "60:41:0",
-                                "type": "",
-                                "value": "64"
+                                "arguments":
+                                [
+                                    {
+                                        "kind": "number",
+                                        "nativeSrc": "122:2:0",
+                                        "nodeType": "YulLiteral",
+                                        "src": "60:41:0",
+                                        "type": "",
+                                        "value": "64"
+                                    },
+                                    {
+                                        "kind": "number",
+                                        "nativeSrc": "126:3:0",
+                                        "nodeType": "YulLiteral",
+                                        "src": "60:41:0",
+                                        "type": "",
+                                        "value": "128"
+                                    }
+                                ],
+                                "functionName":
+                                {
+                                    "name": "mstore",
+                                    "nativeSrc": "115:6:0",
+                                    "nodeType": "YulIdentifier",
+                                    "src": "60:41:0"
+                                },
+                                "nativeSrc": "115:15:0",
+                                "nodeType": "YulFunctionCall",
+                                "src": "60:41:0"
                             },
-                            {
-                                "kind": "number",
-                                "nativeSrc": "126:3:0",
-                                "nodeType": "YulLiteral",
-                                "src": "60:41:0",
-                                "type": "",
-                                "value": "128"
-                            }
-                        ],
-                        "functionName":
-                        {
-                            "name": "mstore",
-                            "nativeSrc": "115:6:0",
-                            "nodeType": "YulIdentifier",
+                            "nativeSrc": "115:15:0",
+                            "nodeType": "YulExpressionStatement",
                             "src": "60:41:0"
-                        },
-                        "nativeSrc": "115:15:0",
-                        "nodeType": "YulFunctionCall",
-                        "src": "60:41:0"
-                    },
-                    "nativeSrc": "115:15:0",
-                    "nodeType": "YulExpressionStatement",
-                    "src": "60:41:0"
-                },
-                {
-                    "expression":
-                    {
-                        "arguments": [],
-                        "functionName":
-                        {
-                            "name": "fun_f_5",
-                            "nativeSrc": "155:7:0",
-                            "nodeType": "YulIdentifier",
-                            "src": "60:41:0"
-                        },
-                        "nativeSrc": "155:9:0",
-                        "nodeType": "YulFunctionCall",
-                        "src": "60:41:0"
-                    },
-                    "nativeSrc": "155:9:0",
-                    "nodeType": "YulExpressionStatement",
-                    "src": "60:41:0"
-                },
-                {
-                    "body":
-                    {
-                        "nativeSrc": "244:11:0",
-                        "nodeType": "YulBlock",
-                        "src": "77:22:0",
-                        "statements": []
-                    },
-                    "name": "fun_f_5",
-                    "nativeSrc": "225:30:0",
-                    "nodeType": "YulFunctionDefinition",
-                    "src": "77:22:0"
+                        }
+                    ]
                 }
             ]
         },
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_all/output b/test/cmdlineTests/strict_asm_debug_info_print_all/output
index 2242e6630e..0e58baf578 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_all/output
+++ b/test/cmdlineTests/strict_asm_debug_info_print_all/output
@@ -5,18 +5,20 @@ Pretty printed source:
 /// @use-src 0:"input.sol"
 object "C_6_deployed" {
     code {
-        /// @src 0:60:101
-        mstore(64, 128)
-        fun_f_5()
+        {
+            /// @src 0:60:101
+            mstore(64, 128)
+            fun_f()
+        }
         /// @src 0:77:99
-        function fun_f_5()
+        function fun_f()
         { sstore(0, 42) }
     }
 }
 
 
 Binary representation:
-6080604052600a600e565b6014565b602a5f55565b
+6080604052600a600c565b005b602a5f5556
 
 Text representation:
     /* "input.sol":60:101   */
@@ -25,9 +27,8 @@ Text representation:
   tag_1
   jump	// in
 tag_2:
+  stop
     /* "input.sol":77:99   */
-  jump(tag_3)
 tag_1:
   sstore(0x00, 0x2a)
   jump	// out
-tag_3:
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_location_only/output b/test/cmdlineTests/strict_asm_debug_info_print_location_only/output
index c5de7c4399..17d2f50e2e 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_location_only/output
+++ b/test/cmdlineTests/strict_asm_debug_info_print_location_only/output
@@ -5,18 +5,20 @@ Pretty printed source:
 /// @use-src 0:"input.sol"
 object "C_6_deployed" {
     code {
-        /// @src 0:60:101
-        mstore(64, 128)
-        fun_f_5()
+        {
+            /// @src 0:60:101
+            mstore(64, 128)
+            fun_f()
+        }
         /// @src 0:77:99
-        function fun_f_5()
+        function fun_f()
         { sstore(0, 42) }
     }
 }
 
 
 Binary representation:
-6080604052600a600e565b6014565b602a5f55565b
+6080604052600a600c565b005b602a5f5556
 
 Text representation:
     /* "input.sol":60:101 */
@@ -25,9 +27,8 @@ Text representation:
   tag_1
   jump	// in
 tag_2:
+  stop
     /* "input.sol":77:99 */
-  jump(tag_3)
 tag_1:
   sstore(0x00, 0x2a)
   jump	// out
-tag_3:
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_none/output b/test/cmdlineTests/strict_asm_debug_info_print_none/output
index 3db44c1f5b..51f779490a 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_none/output
+++ b/test/cmdlineTests/strict_asm_debug_info_print_none/output
@@ -5,16 +5,18 @@ Pretty printed source:
 /// @use-src 0:"input.sol"
 object "C_6_deployed" {
     code {
-        mstore(64, 128)
-        fun_f_5()
-        function fun_f_5()
+        {
+            mstore(64, 128)
+            fun_f()
+        }
+        function fun_f()
         { sstore(0, 42) }
     }
 }
 
 
 Binary representation:
-6080604052600a600e565b6014565b602a5f55565b
+6080604052600a600c565b005b602a5f5556
 
 Text representation:
   mstore(0x40, 0x80)
@@ -22,8 +24,7 @@ Text representation:
   tag_1
   jump	// in
 tag_2:
-  jump(tag_3)
+  stop
 tag_1:
   sstore(0x00, 0x2a)
   jump	// out
-tag_3:
diff --git a/test/cmdlineTests/yul_function_name_clashes/output b/test/cmdlineTests/yul_function_name_clashes/output
index cfbb96bfa8..2c54b6f508 100644
--- a/test/cmdlineTests/yul_function_name_clashes/output
+++ b/test/cmdlineTests/yul_function_name_clashes/output
@@ -4,63 +4,43 @@
 Pretty printed source:
 object "object" {
     code {
-        let a
-        let b
         {
-            function z() -> y
-            { y := calldataload(0) }
+            let a
+            let b
             a := z()
+            b := z_1()
+            sstore(a, b)
         }
-        {
-            function z() -> y
-            { y := calldataload(0x20) }
-            b := z()
-        }
-        sstore(a, b)
+        function z() -> y
+        { y := calldataload(0) }
+        function z_1() -> y
+        { y := calldataload(0x20) }
     }
 }
 
 
 Binary representation:
-5f80600d565b5f8035905090565b60136005565b91506022565b5f602035905090565b60286019565b90508082555050
+6005600f565b600b6014565b9055005b5f3590565b6020359056
 
 Text representation:
-  0x00
-  dup1
-  jump(tag_2)
+  tag_3
+  tag_1
+  jump	// in
+tag_3:
+  tag_4
+  tag_2
+  jump	// in
+tag_4:
+  swap1
+  sstore
+  stop
 tag_1:
   0x00
-  dup1
   calldataload
   swap1
-  pop
-  swap1
   jump	// out
 tag_2:
-  tag_4
-  tag_1
-  jump	// in
-tag_4:
-  swap2
-  pop
-  jump(tag_6)
-tag_5:
-  0x00
   0x20
   calldataload
   swap1
-  pop
-  swap1
   jump	// out
-tag_6:
-  tag_8
-  tag_5
-  jump	// in
-tag_8:
-  swap1
-  pop
-  dup1
-  dup3
-  sstore
-  pop
-  pop
diff --git a/test/cmdlineTests/yul_function_name_clashes_different_params/output b/test/cmdlineTests/yul_function_name_clashes_different_params/output
index cd0dce30c4..22cee64c1f 100644
--- a/test/cmdlineTests/yul_function_name_clashes_different_params/output
+++ b/test/cmdlineTests/yul_function_name_clashes_different_params/output
@@ -4,90 +4,56 @@
 Pretty printed source:
 object "object" {
     code {
-        let a
-        let b
         {
-            function z() -> y
-            { y := calldataload(0) }
+            let a
+            let b
             a := z()
+            b := z_1(0x70)
+            sstore(a, b)
         }
-        {
-            function z(r) -> y
-            { y := calldataload(r) }
-            b := z(0x70)
-        }
-        sstore(a, b)
+        function z() -> y
+        { y := calldataload(0) }
+        function z_1(r) -> y
+        { y := calldataload(r) }
     }
 }
 
 
 Binary representation:
-5f80600d565b5f8035905090565b60136005565b91506023565b5f81359050919050565b602b60706019565b90508082555050
+60056011565b600d60706016565b9055005b5f3590565b359056
 
 Text representation:
-    /* "yul_function_name_clashes_different_params/input.yul":37:42   */
-  0x00
-    /* "yul_function_name_clashes_different_params/input.yul":51:56   */
-  dup1
+    /* "yul_function_name_clashes_different_params/input.yul":151:154   */
+  tag_3
+  tag_1
+  jump	// in
+tag_3:
+    /* "yul_function_name_clashes_different_params/input.yul":260:267   */
+  tag_4
+    /* "yul_function_name_clashes_different_params/input.yul":262:266   */
+  0x70
+    /* "yul_function_name_clashes_different_params/input.yul":260:267   */
+  tag_2
+  jump	// in
+tag_4:
+    /* "yul_function_name_clashes_different_params/input.yul":286:298   */
+  swap1
+  sstore
+    /* "yul_function_name_clashes_different_params/input.yul":27:304   */
+  stop
     /* "yul_function_name_clashes_different_params/input.yul":79:133   */
-  jump(tag_2)
 tag_1:
-    /* "yul_function_name_clashes_different_params/input.yul":95:96   */
-  0x00
     /* "yul_function_name_clashes_different_params/input.yul":129:130   */
-  dup1
+  0x00
     /* "yul_function_name_clashes_different_params/input.yul":116:131   */
   calldataload
-    /* "yul_function_name_clashes_different_params/input.yul":111:131   */
-  swap1
-  pop
     /* "yul_function_name_clashes_different_params/input.yul":79:133   */
   swap1
   jump	// out
-tag_2:
-    /* "yul_function_name_clashes_different_params/input.yul":151:154   */
-  tag_4
-  tag_1
-  jump	// in
-tag_4:
-    /* "yul_function_name_clashes_different_params/input.yul":146:154   */
-  swap2
-  pop
     /* "yul_function_name_clashes_different_params/input.yul":187:242   */
-  jump(tag_6)
-tag_5:
-    /* "yul_function_name_clashes_different_params/input.yul":204:205   */
-  0x00
-    /* "yul_function_name_clashes_different_params/input.yul":238:239   */
-  dup2
+tag_2:
     /* "yul_function_name_clashes_different_params/input.yul":225:240   */
   calldataload
-    /* "yul_function_name_clashes_different_params/input.yul":220:240   */
-  swap1
-  pop
     /* "yul_function_name_clashes_different_params/input.yul":187:242   */
-  swap2
   swap1
-  pop
   jump	// out
-tag_6:
-    /* "yul_function_name_clashes_different_params/input.yul":260:267   */
-  tag_8
-    /* "yul_function_name_clashes_different_params/input.yul":262:266   */
-  0x70
-    /* "yul_function_name_clashes_different_params/input.yul":260:267   */
-  tag_5
-  jump	// in
-tag_8:
-    /* "yul_function_name_clashes_different_params/input.yul":255:267   */
-  swap1
-  pop
-    /* "yul_function_name_clashes_different_params/input.yul":296:297   */
-  dup1
-    /* "yul_function_name_clashes_different_params/input.yul":293:294   */
-  dup3
-    /* "yul_function_name_clashes_different_params/input.yul":286:298   */
-  sstore
-    /* "yul_function_name_clashes_different_params/input.yul":27:304   */
-  pop
-  pop
diff --git a/test/libyul/objectCompiler/data.yul b/test/libyul/objectCompiler/data.yul
index 611715b653..caa6499218 100644
--- a/test/libyul/objectCompiler/data.yul
+++ b/test/libyul/objectCompiler/data.yul
@@ -5,8 +5,10 @@ object "a" {
 }
 // ----
 // Assembly:
+//     /* "source":20:22   */
+//   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: fe
-// Opcodes: INVALID
-// SourceMappings:
+// Bytecode: 00fe
+// Opcodes: STOP INVALID
+// SourceMappings: 20:2:0:-:0
diff --git a/test/libyul/objectCompiler/datacopy.yul b/test/libyul/objectCompiler/datacopy.yul
index a5fbfb7b0b..cb9fbcb18b 100644
--- a/test/libyul/objectCompiler/datacopy.yul
+++ b/test/libyul/objectCompiler/datacopy.yul
@@ -42,9 +42,11 @@ object "a" {
 //       0x00
 //         /* "source":178:206   */
 //       mstore
+//         /* "source":135:212   */
+//       stop
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
-// Bytecode: 6008600b5f3960085ff3fe5f8055600d5f52fe
-// Opcodes: PUSH1 0x8 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x8 PUSH0 RETURN INVALID PUSH0 DUP1 SSTORE PUSH1 0xD PUSH0 MSTORE INVALID
+// Bytecode: 6009600b5f3960095ff3fe5f8055600d5f5200fe
+// Opcodes: PUSH1 0x9 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x9 PUSH0 RETURN INVALID PUSH0 DUP1 SSTORE PUSH1 0xD PUSH0 MSTORE STOP INVALID
 // SourceMappings: 57:15:0:-:0;38:17;35:1;26:47;88:15;85:1;78:26
diff --git a/test/libyul/objectCompiler/dataoffset_code.yul b/test/libyul/objectCompiler/dataoffset_code.yul
index e363ec7c61..58521c87f9 100644
--- a/test/libyul/objectCompiler/dataoffset_code.yul
+++ b/test/libyul/objectCompiler/dataoffset_code.yul
@@ -13,6 +13,8 @@ object "a" {
 //   0x00
 //     /* "source":22:50   */
 //   sstore
+//     /* "source":20:52   */
+//   stop
 // stop
 //
 // sub_0: assembly {
@@ -22,9 +24,11 @@ object "a" {
 //       0x00
 //         /* "source":81:93   */
 //       sstore
+//         /* "source":79:95   */
+//       stop
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
-// Bytecode: 60055f55fe60085f55fe
-// Opcodes: PUSH1 0x5 PUSH0 SSTORE INVALID PUSH1 0x8 PUSH0 SSTORE INVALID
-// SourceMappings: 32:17:0:-:0;29:1;22:28
+// Bytecode: 60065f5500fe60085f5500fe
+// Opcodes: PUSH1 0x6 PUSH0 SSTORE STOP INVALID PUSH1 0x8 PUSH0 SSTORE STOP INVALID
+// SourceMappings: 32:17:0:-:0;29:1;22:28;20:32
diff --git a/test/libyul/objectCompiler/dataoffset_data.yul b/test/libyul/objectCompiler/dataoffset_data.yul
index 2bb68e8a8a..61f0c44189 100644
--- a/test/libyul/objectCompiler/dataoffset_data.yul
+++ b/test/libyul/objectCompiler/dataoffset_data.yul
@@ -10,8 +10,10 @@ object "a" {
 //   0x00
 //     /* "source":22:52   */
 //   sstore
+//     /* "source":20:54   */
+//   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 60055f55fe48656c6c6f2c20576f726c6421
-// Opcodes: PUSH1 0x5 PUSH0 SSTORE INVALID BASEFEE PUSH6 0x6C6C6F2C2057 PUSH16 0x726C6421000000000000000000000000
-// SourceMappings: 32:19:0:-:0;29:1;22:30
+// Bytecode: 60065f5500fe48656c6c6f2c20576f726c6421
+// Opcodes: PUSH1 0x6 PUSH0 SSTORE STOP INVALID BASEFEE PUSH6 0x6C6C6F2C2057 PUSH16 0x726C6421000000000000000000000000
+// SourceMappings: 32:19:0:-:0;29:1;22:30;20:34
diff --git a/test/libyul/objectCompiler/dataoffset_self.yul b/test/libyul/objectCompiler/dataoffset_self.yul
index e56097ab57..7c38b9502a 100644
--- a/test/libyul/objectCompiler/dataoffset_self.yul
+++ b/test/libyul/objectCompiler/dataoffset_self.yul
@@ -10,8 +10,10 @@ object "a" {
 //   dup1
 //     /* "source":22:48   */
 //   sstore
+//     /* "source":20:50   */
+//   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 5f8055fe
-// Opcodes: PUSH0 DUP1 SSTORE INVALID
-// SourceMappings: 32:15:0:-:0;29:1;22:26
+// Bytecode: 5f805500fe
+// Opcodes: PUSH0 DUP1 SSTORE STOP INVALID
+// SourceMappings: 32:15:0:-:0;29:1;22:26;20:30
diff --git a/test/libyul/objectCompiler/datasize_code.yul b/test/libyul/objectCompiler/datasize_code.yul
index 0a379cb33a..4e559ab895 100644
--- a/test/libyul/objectCompiler/datasize_code.yul
+++ b/test/libyul/objectCompiler/datasize_code.yul
@@ -13,6 +13,8 @@ object "a" {
 //   0x00
 //     /* "source":22:48   */
 //   sstore
+//     /* "source":20:50   */
+//   stop
 // stop
 //
 // sub_0: assembly {
@@ -22,9 +24,11 @@ object "a" {
 //       0x00
 //         /* "source":79:91   */
 //       sstore
+//         /* "source":77:93   */
+//       stop
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
-// Bytecode: 60055f55fe
-// Opcodes: PUSH1 0x5 PUSH0 SSTORE INVALID
-// SourceMappings: 32:15:0:-:0;29:1;22:26
+// Bytecode: 60065f5500fe
+// Opcodes: PUSH1 0x6 PUSH0 SSTORE STOP INVALID
+// SourceMappings: 32:15:0:-:0;29:1;22:26;20:30
diff --git a/test/libyul/objectCompiler/datasize_data.yul b/test/libyul/objectCompiler/datasize_data.yul
index 815e78fe4f..3281bd9ba7 100644
--- a/test/libyul/objectCompiler/datasize_data.yul
+++ b/test/libyul/objectCompiler/datasize_data.yul
@@ -10,8 +10,10 @@ object "a" {
 //   0x00
 //     /* "source":22:50   */
 //   sstore
+//     /* "source":20:52   */
+//   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 600d5f55fe
-// Opcodes: PUSH1 0xD PUSH0 SSTORE INVALID
-// SourceMappings: 32:17:0:-:0;29:1;22:28
+// Bytecode: 600d5f5500fe
+// Opcodes: PUSH1 0xD PUSH0 SSTORE STOP INVALID
+// SourceMappings: 32:17:0:-:0;29:1;22:28;20:32
diff --git a/test/libyul/objectCompiler/datasize_self.yul b/test/libyul/objectCompiler/datasize_self.yul
index 178e3a9482..6bc520af58 100644
--- a/test/libyul/objectCompiler/datasize_self.yul
+++ b/test/libyul/objectCompiler/datasize_self.yul
@@ -10,8 +10,10 @@ object "a" {
 //   0x00
 //     /* "source":22:46   */
 //   sstore
+//     /* "source":20:48   */
+//   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
-// Bytecode: 60055f55fe
-// Opcodes: PUSH1 0x5 PUSH0 SSTORE INVALID
-// SourceMappings: 32:13:0:-:0;29:1;22:24
+// Bytecode: 60065f5500fe
+// Opcodes: PUSH1 0x6 PUSH0 SSTORE STOP INVALID
+// SourceMappings: 32:13:0:-:0;29:1;22:24;20:28
diff --git a/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul b/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul
index e991dc6b7b..285a8a8d54 100644
--- a/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul
+++ b/test/libyul/objectCompiler/immutable_long_name_does_not_end_up_in_bytecode.yul
@@ -15,6 +15,8 @@ object "a" {
 //   0x00
 //     /* "source":32:219   */
 //   assignImmutable("0x85a5b1db611c82c46f5fa18e39ae218397536256c451e5de155a86de843a9ad6")
-// Bytecode: 7312345678901234567890123456789012345678905f5050
-// Opcodes: PUSH20 0x1234567890123456789012345678901234567890 PUSH0 POP POP
-// SourceMappings: 167:42:0:-:0;58:1;32:187;
+//     /* "source":22:225   */
+//   stop
+// Bytecode: 7312345678901234567890123456789012345678905f505000
+// Opcodes: PUSH20 0x1234567890123456789012345678901234567890 PUSH0 POP POP STOP
+// SourceMappings: 167:42:0:-:0;58:1;32:187;;22:203
diff --git a/test/libyul/objectCompiler/linkersymbol.yul b/test/libyul/objectCompiler/linkersymbol.yul
index a28ee23e23..c4da288e61 100644
--- a/test/libyul/objectCompiler/linkersymbol.yul
+++ b/test/libyul/objectCompiler/linkersymbol.yul
@@ -7,7 +7,15 @@ object "a" {
 }
 // ----
 // Assembly:
+//     /* "source":179:180   */
+//   0x00
+//     /* "source":174:177   */
+//   0x80
+//     /* "source":171:172   */
+//   0x04
 //     /* "source":44:79   */
+//   dup2
+//   dup4
 //   linkerSymbol("f919ba91ac99f96129544b80b9516b27a80e376b9dc693819d0b18b7e0395612")
 //     /* "source":109:119   */
 //   0x18530aaf
@@ -15,29 +23,15 @@ object "a" {
 //   0xe3
 //     /* "source":100:120   */
 //   shl
-//     /* "source":95:98   */
-//   0x80
 //     /* "source":88:121   */
+//   dup4
 //   mstore
-//     /* "source":179:180   */
-//   0x00
-//     /* "source":174:177   */
-//   0x80
-//     /* "source":171:172   */
-//   0x04
-//     /* "source":166:169   */
-//   0x80
-//     /* "source":163:164   */
-//   0x00
-//     /* "source":157:161   */
-//   dup6
 //     /* "source":150:155   */
 //   gas
 //     /* "source":145:181   */
 //   call
-//     /* "source":22:187   */
-//   pop
-//   pop
-// Bytecode: 7300000000000000000000000000000000000000006318530aaf60e31b6080525f6080600460805f855af15050
-// Opcodes: PUSH20 0x0 PUSH4 0x18530AAF PUSH1 0xE3 SHL PUSH1 0x80 MSTORE PUSH0 PUSH1 0x80 PUSH1 0x4 PUSH1 0x80 PUSH0 DUP6 GAS CALL POP POP
-// SourceMappings: 44:35:0:-:0;109:10;104:3;100:20;95:3;88:33;179:1;174:3;171:1;166:3;163:1;157:4;150:5;145:36;22:165;
+//     /* "source":130:181   */
+//   stop
+// Bytecode: 5f6080600481837300000000000000000000000000000000000000006318530aaf60e31b83525af100
+// Opcodes: PUSH0 PUSH1 0x80 PUSH1 0x4 DUP2 DUP4 PUSH20 0x0 PUSH4 0x18530AAF PUSH1 0xE3 SHL DUP4 MSTORE GAS CALL STOP
+// SourceMappings: 179:1:0:-:0;174:3;171:1;44:35;;;109:10;104:3;100:20;88:33;;150:5;145:36;130:51
diff --git a/test/libyul/objectCompiler/metadata.yul b/test/libyul/objectCompiler/metadata.yul
index 5a75507ba1..335522d04d 100644
--- a/test/libyul/objectCompiler/metadata.yul
+++ b/test/libyul/objectCompiler/metadata.yul
@@ -25,21 +25,18 @@ object "A" {
 //   0x0e
 //     /* "source":62:75   */
 //   0x03
-//     /* "source":90:91   */
-//   dup2
+//     /* "source":80:92   */
+//   swap1
 //     /* "source":87:88   */
 //   0x00
 //     /* "source":80:92   */
 //   sstore
-//     /* "source":108:109   */
-//   dup1
 //     /* "source":104:106   */
 //   0x20
 //     /* "source":97:110   */
 //   sstore
 //     /* "source":20:114   */
-//   pop
-//   pop
+//   stop
 // stop
 // data_211450822d7f8c345093893187e7e1fbebc4ec67af72601920194be14104e336 48656c6c6f2c20576f726c643221
 // data_e1629b9dda060bb30c7908346f6af189c16773fa148d3366701fbaa35d54f3c8 414243
@@ -47,14 +44,12 @@ object "A" {
 // sub_0: assembly {
 //         /* "source":157:176   */
 //       data_211450822d7f8c345093893187e7e1fbebc4ec67af72601920194be14104e336
-//         /* "source":193:194   */
-//       dup1
 //         /* "source":190:191   */
 //       0x00
 //         /* "source":183:195   */
 //       sstore
 //         /* "source":140:201   */
-//       pop
+//       stop
 //     stop
 //     data_211450822d7f8c345093893187e7e1fbebc4ec67af72601920194be14104e336 48656c6c6f2c20576f726c643221
 //
@@ -62,6 +57,6 @@ object "A" {
 // }
 //
 // auxdata: 0x4d32
-// Bytecode: 600e6003815f55806020555050fe4d32
-// Opcodes: PUSH1 0xE PUSH1 0x3 DUP2 PUSH0 SSTORE DUP1 PUSH1 0x20 SSTORE POP POP INVALID 0x4D ORIGIN
-// SourceMappings: 35:13:0:-:0;62;90:1;87;80:12;108:1;104:2;97:13;20:94;
+// Bytecode: 600e6003905f5560205500fe4d32
+// Opcodes: PUSH1 0xE PUSH1 0x3 SWAP1 PUSH0 SSTORE PUSH1 0x20 SSTORE STOP INVALID 0x4D ORIGIN
+// SourceMappings: 35:13:0:-:0;62;80:12;87:1;80:12;104:2;97:13;20:94
diff --git a/test/libyul/objectCompiler/namedObject.yul b/test/libyul/objectCompiler/namedObject.yul
index 940160fd26..d55c3ca253 100644
--- a/test/libyul/objectCompiler/namedObject.yul
+++ b/test/libyul/objectCompiler/namedObject.yul
@@ -3,4 +3,8 @@ object "a" {
 }
 // ----
 // Assembly:
-// -- empty bytecode --
+//     /* "source":20:22   */
+//   stop
+// Bytecode: 00
+// Opcodes: STOP
+// SourceMappings: 20:2:0:-:0
diff --git a/test/libyul/objectCompiler/namedObjectCode.yul b/test/libyul/objectCompiler/namedObjectCode.yul
index f9e97bec4a..5936aa7443 100644
--- a/test/libyul/objectCompiler/namedObjectCode.yul
+++ b/test/libyul/objectCompiler/namedObjectCode.yul
@@ -9,6 +9,8 @@ object "a" {
 //   0x00
 //     /* "source":22:34   */
 //   sstore
-// Bytecode: 60015f55
-// Opcodes: PUSH1 0x1 PUSH0 SSTORE
-// SourceMappings: 32:1:0:-:0;29;22:12
+//     /* "source":20:36   */
+//   stop
+// Bytecode: 60015f5500
+// Opcodes: PUSH1 0x1 PUSH0 SSTORE STOP
+// SourceMappings: 32:1:0:-:0;29;22:12;20:16
diff --git a/test/libyul/objectCompiler/simple.yul b/test/libyul/objectCompiler/simple.yul
index d94b53de90..b84c49a5a4 100644
--- a/test/libyul/objectCompiler/simple.yul
+++ b/test/libyul/objectCompiler/simple.yul
@@ -9,6 +9,8 @@
 //   0x00
 //     /* "source":4:16   */
 //   sstore
-// Bytecode: 60015f55
-// Opcodes: PUSH1 0x1 PUSH0 SSTORE
-// SourceMappings: 14:1:0:-:0;11;4:12
+//     /* "source":0:18   */
+//   stop
+// Bytecode: 60015f5500
+// Opcodes: PUSH1 0x1 PUSH0 SSTORE STOP
+// SourceMappings: 14:1:0:-:0;11;4:12;0:18
diff --git a/test/libyul/objectCompiler/smoke.yul b/test/libyul/objectCompiler/smoke.yul
index b2e44d4dcd..3f1079aa70 100644
--- a/test/libyul/objectCompiler/smoke.yul
+++ b/test/libyul/objectCompiler/smoke.yul
@@ -2,4 +2,8 @@
 }
 // ----
 // Assembly:
-// -- empty bytecode --
+//     /* "source":0:3   */
+//   stop
+// Bytecode: 00
+// Opcodes: STOP
+// SourceMappings: 0:3:0:-:0
diff --git a/test/libyul/objectCompiler/sourceLocations.yul b/test/libyul/objectCompiler/sourceLocations.yul
index 849d275fec..1c84773249 100644
--- a/test/libyul/objectCompiler/sourceLocations.yul
+++ b/test/libyul/objectCompiler/sourceLocations.yul
@@ -46,9 +46,10 @@ object "a" {
 //       sstore
 //         /* "abc.sol":2:5   */
 //       mstore(0x00, 0x0d)
+//       stop
 //     stop
 //     data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 // }
-// Bytecode: 6008600b5f3960085ff3fe5f8055600d5f52fe
-// Opcodes: PUSH1 0x8 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x8 PUSH0 RETURN INVALID PUSH0 DUP1 SSTORE PUSH1 0xD PUSH0 MSTORE INVALID
+// Bytecode: 6009600b5f3960095ff3fe5f8055600d5f5200fe
+// Opcodes: PUSH1 0x9 PUSH1 0xB PUSH0 CODECOPY PUSH1 0x9 PUSH0 RETURN INVALID PUSH0 DUP1 SSTORE PUSH1 0xD PUSH0 MSTORE STOP INVALID
 // SourceMappings: 0:2::-:0;;;;5:1;0:2;
diff --git a/test/libyul/objectCompiler/subObject.yul b/test/libyul/objectCompiler/subObject.yul
index f99b071af5..46fc03f10e 100644
--- a/test/libyul/objectCompiler/subObject.yul
+++ b/test/libyul/objectCompiler/subObject.yul
@@ -6,6 +6,8 @@ object "a" {
 }
 // ----
 // Assembly:
+//     /* "source":20:22   */
+//   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 //
@@ -16,7 +18,9 @@ object "a" {
 //       0x00
 //         /* "source":139:151   */
 //       sstore
+//         /* "source":137:153   */
+//       stop
 // }
-// Bytecode: fe
-// Opcodes: INVALID
-// SourceMappings:
+// Bytecode: 00fe
+// Opcodes: STOP INVALID
+// SourceMappings: 20:2:0:-:0
diff --git a/test/libyul/objectCompiler/subObjectAccess.yul b/test/libyul/objectCompiler/subObjectAccess.yul
index e8bf0bcafc..291749220a 100644
--- a/test/libyul/objectCompiler/subObjectAccess.yul
+++ b/test/libyul/objectCompiler/subObjectAccess.yul
@@ -80,69 +80,55 @@ object "A" {
 //     /* "source":192:207   */
 //   dataSize(sub_0.sub_0)
 //     /* "source":224:241   */
+//   swap1
 //   dataOffset(sub_0.sub_1)
 //     /* "source":258:273   */
+//   swap3
 //   dataSize(sub_0.sub_1)
 //     /* "source":291:310   */
+//   swap5
 //   dataOffset(sub_0.sub_0.sub_0)
 //     /* "source":328:345   */
+//   swap7
 //   dataSize(sub_0.sub_0.sub_0)
-//     /* "source":361:364   */
-//   dup10
+//     /* "source":351:365   */
+//   swap9
 //     /* "source":358:359   */
 //   0x00
 //     /* "source":351:365   */
 //   sstore
-//     /* "source":381:384   */
-//   dup9
 //     /* "source":377:379   */
 //   0x20
 //     /* "source":370:385   */
 //   sstore
-//     /* "source":401:404   */
-//   dup8
 //     /* "source":397:399   */
 //   0x40
 //     /* "source":390:405   */
 //   sstore
-//     /* "source":421:424   */
-//   dup7
 //     /* "source":417:419   */
 //   0x60
 //     /* "source":410:425   */
 //   sstore
-//     /* "source":442:446   */
-//   dup6
 //     /* "source":437:440   */
 //   0x80
 //     /* "source":430:447   */
 //   sstore
-//     /* "source":464:468   */
-//   dup5
 //     /* "source":459:462   */
 //   0xa0
 //     /* "source":452:469   */
 //   sstore
-//     /* "source":486:490   */
-//   dup4
 //     /* "source":481:484   */
 //   0xc0
 //     /* "source":474:491   */
 //   sstore
-//     /* "source":508:512   */
-//   dup3
 //     /* "source":503:506   */
 //   0xe0
 //     /* "source":496:513   */
 //   sstore
-//     /* "source":530:535   */
-//   dup2
 //     /* "source":525:528   */
 //   0x0100
 //     /* "source":518:536   */
 //   sstore
-//     /* "source":553:558   */
-//   dup1
 //     /* "source":548:551   */
 //   0x0120
 //     /* "source":541:559   */
@@ -166,41 +152,33 @@ object "A" {
 //         /* "source":756:769   */
 //       dataSize(sub_1)
 //         /* "source":788:805   */
+//       swap1
 //       dataOffset(sub_0.sub_0)
 //         /* "source":824:839   */
+//       swap3
 //       dataSize(sub_0.sub_0)
-//         /* "source":857:860   */
-//       dup6
+//         /* "source":847:861   */
+//       swap5
 //         /* "source":854:855   */
 //       0x00
 //         /* "source":847:861   */
 //       sstore
-//         /* "source":879:882   */
-//       dup5
 //         /* "source":875:877   */
 //       0x20
 //         /* "source":868:883   */
 //       sstore
-//         /* "source":901:904   */
-//       dup4
 //         /* "source":897:899   */
 //       0x40
 //         /* "source":890:905   */
 //       sstore
-//         /* "source":923:926   */
-//       dup3
 //         /* "source":919:921   */
 //       0x60
 //         /* "source":912:927   */
 //       sstore
-//         /* "source":946:950   */
-//       dup2
 //         /* "source":941:944   */
 //       0x80
 //         /* "source":934:951   */
 //       sstore
-//         /* "source":970:974   */
-//       dup1
 //         /* "source":965:968   */
 //       0xa0
 //         /* "source":958:975   */
@@ -218,14 +196,12 @@ object "A" {
 //           dataOffset(sub_0)
 //             /* "source":1087:1100   */
 //           dataSize(sub_0)
-//             /* "source":1120:1123   */
-//           dup2
+//             /* "source":1110:1124   */
+//           swap1
 //             /* "source":1117:1118   */
 //           0x00
 //             /* "source":1110:1124   */
 //           sstore
-//             /* "source":1144:1147   */
-//           dup1
 //             /* "source":1140:1142   */
 //           0x20
 //             /* "source":1133:1148   */
@@ -249,6 +225,6 @@ object "A" {
 //           invalid
 //     }
 // }
-// Bytecode: 5f608e6042603a607d6011607c6001607c6001895f55886020558760405586606055856080558460a0558360c0558260e055816101005580610120556101405ff3fe602860116039600160396001855f55846020558360405582606055816080558060a05560c05ff3fe60106001815f558060205560405ff3fefefefe60106001815f558060205560405ff3fefe
-// Opcodes: PUSH0 PUSH1 0x8E PUSH1 0x42 PUSH1 0x3A PUSH1 0x7D PUSH1 0x11 PUSH1 0x7C PUSH1 0x1 PUSH1 0x7C PUSH1 0x1 DUP10 PUSH0 SSTORE DUP9 PUSH1 0x20 SSTORE DUP8 PUSH1 0x40 SSTORE DUP7 PUSH1 0x60 SSTORE DUP6 PUSH1 0x80 SSTORE DUP5 PUSH1 0xA0 SSTORE DUP4 PUSH1 0xC0 SSTORE DUP3 PUSH1 0xE0 SSTORE DUP2 PUSH2 0x100 SSTORE DUP1 PUSH2 0x120 SSTORE PUSH2 0x140 PUSH0 RETURN INVALID PUSH1 0x28 PUSH1 0x11 PUSH1 0x39 PUSH1 0x1 PUSH1 0x39 PUSH1 0x1 DUP6 PUSH0 SSTORE DUP5 PUSH1 0x20 SSTORE DUP4 PUSH1 0x40 SSTORE DUP3 PUSH1 0x60 SSTORE DUP2 PUSH1 0x80 SSTORE DUP1 PUSH1 0xA0 SSTORE PUSH1 0xC0 PUSH0 RETURN INVALID PUSH1 0x10 PUSH1 0x1 DUP2 PUSH0 SSTORE DUP1 PUSH1 0x20 SSTORE PUSH1 0x40 PUSH0 RETURN INVALID INVALID INVALID INVALID PUSH1 0x10 PUSH1 0x1 DUP2 PUSH0 SSTORE DUP1 PUSH1 0x20 SSTORE PUSH1 0x40 PUSH0 RETURN INVALID INVALID
-// SourceMappings: 37:15:0:-:0;68:13;97:15;128:13;158:17;192:15;224:17;258:15;291:19;328:17;361:3;358:1;351:14;381:3;377:2;370:15;401:3;397:2;390:15;421:3;417:2;410:15;442:4;437:3;430:17;464:4;459:3;452:17;486:4;481:3;474:17;508:4;503:3;496:17;530:5;525:3;518:18;553:5;548:3;541:18;574:3;571:1;564:14
+// Bytecode: 5f6084603d603660746010906073926001946073966001985f5560205560405560605560805560a05560c05560e05561010055610120556101405ff3fe6025601060356001906035926001945f5560205560405560605560805560a05560c05ff3fe600f6001905f5560205560405ff3fefefefe600f6001905f5560205560405ff3fefe
+// Opcodes: PUSH0 PUSH1 0x84 PUSH1 0x3D PUSH1 0x36 PUSH1 0x74 PUSH1 0x10 SWAP1 PUSH1 0x73 SWAP3 PUSH1 0x1 SWAP5 PUSH1 0x73 SWAP7 PUSH1 0x1 SWAP9 PUSH0 SSTORE PUSH1 0x20 SSTORE PUSH1 0x40 SSTORE PUSH1 0x60 SSTORE PUSH1 0x80 SSTORE PUSH1 0xA0 SSTORE PUSH1 0xC0 SSTORE PUSH1 0xE0 SSTORE PUSH2 0x100 SSTORE PUSH2 0x120 SSTORE PUSH2 0x140 PUSH0 RETURN INVALID PUSH1 0x25 PUSH1 0x10 PUSH1 0x35 PUSH1 0x1 SWAP1 PUSH1 0x35 SWAP3 PUSH1 0x1 SWAP5 PUSH0 SSTORE PUSH1 0x20 SSTORE PUSH1 0x40 SSTORE PUSH1 0x60 SSTORE PUSH1 0x80 SSTORE PUSH1 0xA0 SSTORE PUSH1 0xC0 PUSH0 RETURN INVALID PUSH1 0xF PUSH1 0x1 SWAP1 PUSH0 SSTORE PUSH1 0x20 SSTORE PUSH1 0x40 PUSH0 RETURN INVALID INVALID INVALID INVALID PUSH1 0xF PUSH1 0x1 SWAP1 PUSH0 SSTORE PUSH1 0x20 SSTORE PUSH1 0x40 PUSH0 RETURN INVALID INVALID
+// SourceMappings: 37:15:0:-:0;68:13;97:15;128:13;158:17;192:15;224:17;;258:15;;291:19;;328:17;;351:14;358:1;351:14;377:2;370:15;397:2;390:15;417:2;410:15;437:3;430:17;459:3;452:17;481:3;474:17;503:3;496:17;525:3;518:18;548:3;541:18;574:3;571:1;564:14
diff --git a/test/libyul/objectCompiler/subSubObject.yul b/test/libyul/objectCompiler/subSubObject.yul
index a36f97619e..a9936d58fb 100644
--- a/test/libyul/objectCompiler/subSubObject.yul
+++ b/test/libyul/objectCompiler/subSubObject.yul
@@ -12,6 +12,8 @@ object "a" {
 }
 // ----
 // Assembly:
+//     /* "source":20:22   */
+//   stop
 // stop
 // data_acaf3289d7b601cbd114fb36c4d29c85bbfd5e133f14cb355c3fd8d99367964f 48656c6c6f2c20576f726c6421
 //
@@ -22,6 +24,8 @@ object "a" {
 //       0x00
 //         /* "source":143:155   */
 //       sstore
+//         /* "source":141:157   */
+//       stop
 //     stop
 //
 //     sub_0: assembly {
@@ -31,10 +35,12 @@ object "a" {
 //           0x02
 //             /* "source":193:205   */
 //           sstore
+//             /* "source":191:207   */
+//           stop
 //         stop
 //         data_6adf031833174bbe4c85eafe59ddb54e6584648c2c962c6f94791ab49caa0ad4 123456
 //     }
 // }
-// Bytecode: fe
-// Opcodes: INVALID
-// SourceMappings:
+// Bytecode: 00fe
+// Opcodes: STOP INVALID
+// SourceMappings: 20:2:0:-:0

From 0ea06e1c710c7cfb112e8c91d8aa2e9fe3c69b86 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 7 Jun 2023 13:40:14 +0200
Subject: [PATCH 1431/1748] Do not let low-level semantic test calls depend on
 a well-defined contract ABI.

---
 test/libsolidity/SemanticTest.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 1d8a9c9c09..50f2a3cf10 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -410,7 +410,8 @@ TestCase::TestResult SemanticTest::runTest(
 
 			test.setFailure(!m_transactionSuccessful);
 			test.setRawBytes(std::move(output));
-			test.setContractABI(m_compiler.contractABI(m_compiler.lastContractName(m_sources.mainSourceFile)));
+			if (test.call().kind != FunctionCall::Kind::LowLevel)
+				test.setContractABI(m_compiler.contractABI(m_compiler.lastContractName(m_sources.mainSourceFile)));
 		}
 
 		vector<string> effects;

From 3aaa207162424ee15e6b8bda32d2bbfa91d700c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 21 Apr 2023 15:14:35 +0200
Subject: [PATCH 1432/1748] Enable unoptimized presets in those external tests
 where they now pass

---
 test/externalTests/bleeps.sh           | 4 ++--
 test/externalTests/brink.sh            | 4 ++--
 test/externalTests/chainlink.sh        | 4 ++--
 test/externalTests/elementfi.sh        | 4 ++--
 test/externalTests/ens.sh              | 6 +++---
 test/externalTests/euler.sh            | 4 ++--
 test/externalTests/gnosis.sh           | 4 ++--
 test/externalTests/gp2.sh              | 6 +++---
 test/externalTests/perpetual-pools.sh  | 4 ++--
 test/externalTests/pool-together.sh    | 4 ++--
 test/externalTests/prb-math.sh         | 7 ++++---
 test/externalTests/trident.sh          | 6 +++---
 test/externalTests/uniswap.sh          | 4 ++--
 test/externalTests/yield-liquidator.sh | 4 ++--
 test/externalTests/zeppelin.sh         | 7 ++++---
 15 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/test/externalTests/bleeps.sh b/test/externalTests/bleeps.sh
index 9395521004..30f0ec9240 100755
--- a/test/externalTests/bleeps.sh
+++ b/test/externalTests/bleeps.sh
@@ -46,8 +46,8 @@ function bleeps_test
     local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize            # Compilation fails with: "YulException: Variable param_0 is 2 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only      # Compilation fails with: "YulException: Variable param_0 is 2 slot(s) too deep inside the stack."
+        #ir-no-optimize            # Compilation fails with: "YulException: Variable expr_15509_mpos is 4 too deep in the stack". No memoryguard was present.
+        #ir-optimize-evm-only      # Compilation fails with: "YulException: Variable expr_15260_mpos is 4 too deep in the stack". No memoryguard was present.
         ir-optimize-evm+yul
         #legacy-no-optimize        # Compilation fails with: "CompilerError: Stack too deep, try removing local variables."
         #legacy-optimize-evm-only  # Compilation fails with: "CompilerError: Stack too deep, try removing local variables."
diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
index 77dd62f940..06e2207bd0 100755
--- a/test/externalTests/brink.sh
+++ b/test/externalTests/brink.sh
@@ -45,8 +45,8 @@ function brink_test
     local extra_optimizer_settings="runs: 800"
 
     local compile_only_presets=(
-        #ir-no-optimize            # Compilation fails with "YulException: Variable var_signature_127_offset is 2 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_signature_127_offset is 2 slot(s) too deep inside the stack."
+        ir-no-optimize             # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
+        ir-optimize-evm-only       # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
         ir-optimize-evm+yul        # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
         legacy-optimize-evm+yul    # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
         legacy-no-optimize         # Lots of test failures. Tests depend on constants.js, which seems to be calculated specifically for 0.8.10.
diff --git a/test/externalTests/chainlink.sh b/test/externalTests/chainlink.sh
index a11266c3b8..4d5080730f 100755
--- a/test/externalTests/chainlink.sh
+++ b/test/externalTests/chainlink.sh
@@ -47,8 +47,8 @@ function chainlink_test
     )
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var__value_775 is 1 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var__value_10 is 1 slot(s) too deep inside the stack"
+        #ir-no-optimize           # Compilation fails with "YulException: Variable expr_10724_mpos is 2 too deep in the stack". No memoryguard was present.
+        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable expr_1891_mpos is 2 too deep in the stack". No memoryguard was present.
         ir-optimize-evm+yul
         legacy-optimize-evm-only  # NOTE: This requires >= 4 GB RAM in CI not to crash
         legacy-optimize-evm+yul   # NOTE: This requires >= 4 GB RAM in CI not to crash
diff --git a/test/externalTests/elementfi.sh b/test/externalTests/elementfi.sh
index b3348e339c..94e622d10c 100755
--- a/test/externalTests/elementfi.sh
+++ b/test/externalTests/elementfi.sh
@@ -45,8 +45,8 @@ function elementfi_test
     local compile_only_presets=(
         # ElementFi's test suite is hard-coded for Mainnet forked via alchemy.io.
         # Locally we can only compile.
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_amount_9311 is 10 slot(s) too deep inside the stack."
+        ir-no-optimize
+        ir-optimize-evm-only
         ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
diff --git a/test/externalTests/ens.sh b/test/externalTests/ens.sh
index 7f713f4abd..aee291a1a4 100755
--- a/test/externalTests/ens.sh
+++ b/test/externalTests/ens.sh
@@ -42,13 +42,13 @@ function ens_test
     local config_file="hardhat.config.js"
 
     local compile_only_presets=(
+        ir-no-optimize            # FIXME: Tests fail with "Error: cannot estimate gas; transaction may fail or may require manual gas limit"
         legacy-no-optimize        # Compiles but tests fail to deploy GovernorCompatibilityBravo (code too large).
     )
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var__945 is 1 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var__945 is 1 slot(s) too deep inside the stack."
-        ir-optimize-evm+yul      # Needs memory-safe inline assembly patch
+        ir-optimize-evm-only
+        ir-optimize-evm+yul       # Needs memory-safe inline assembly patch
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
     )
diff --git a/test/externalTests/euler.sh b/test/externalTests/euler.sh
index 586526124f..80f18e702d 100755
--- a/test/externalTests/euler.sh
+++ b/test/externalTests/euler.sh
@@ -47,8 +47,8 @@ function euler_test
     local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var_utilisation_307 is 6 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_utilisation_307 is 6 slot(s) too deep inside the stack."
+        #ir-no-optimize           # Compilation fails with "YulException: Variable var_v_mpos is 4 too deep in the stack". No memoryguard was present.
+        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_v_mpos is 4 too deep in the stack". No memoryguard was present.
         ir-optimize-evm+yul
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
diff --git a/test/externalTests/gnosis.sh b/test/externalTests/gnosis.sh
index de0624c06c..5f7ea48765 100755
--- a/test/externalTests/gnosis.sh
+++ b/test/externalTests/gnosis.sh
@@ -45,8 +45,8 @@ function gnosis_safe_test
     local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize            # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_call_430_mpos is 1 slot(s) too deep inside the stack."
+        #ir-no-optimize            # Compilation fails with "YulException: Variable var_txHash is 1 too deep in the stack". No memoryguard was present.
+        #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_txHash is 1 too deep in the stack". No memoryguard was present.
         # TODO: Uncomment the preset below when the issue: https://github.com/safe-global/safe-contracts/issues/544 is solved.
         #ir-optimize-evm+yul       # Compilation fails with "YulException: Cannot swap Variable var_operation with Variable _1: too deep in the stack by 4 slots."
         legacy-no-optimize
diff --git a/test/externalTests/gp2.sh b/test/externalTests/gp2.sh
index 25403a879c..bbb442226f 100755
--- a/test/externalTests/gp2.sh
+++ b/test/externalTests/gp2.sh
@@ -43,12 +43,12 @@ function gp2_test
     local config_var="config"
 
     local compile_only_presets=(
-        legacy-no-optimize        # Tests doing `new GPv2VaultRelayer` fail with "Error: Transaction reverted: trying to deploy a contract whose code is too large"
+        ir-no-optimize            # Tests fail with "Error: Transaction reverted: trying to deploy a contract whose code is too large"
+        legacy-no-optimize        # Tests fail with "Error: Transaction reverted: trying to deploy a contract whose code is too large"
     )
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var_amount_1468 is 10 slot(s) too deep inside the stack."
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var_offset_3451 is 1 slot(s) too deep inside the stack."
+        ir-optimize-evm-only
         ir-optimize-evm+yul
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
diff --git a/test/externalTests/perpetual-pools.sh b/test/externalTests/perpetual-pools.sh
index 70a14c4993..8d8dc34e21 100755
--- a/test/externalTests/perpetual-pools.sh
+++ b/test/externalTests/perpetual-pools.sh
@@ -45,8 +45,8 @@ function perpetual_pools_test
     local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize            # Compilation fails with "YulException: Variable var_amount_527 is 9 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_amount_527 is 9 slot(s) too deep inside the stack."
+        ir-no-optimize
+        ir-optimize-evm-only
         ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
diff --git a/test/externalTests/pool-together.sh b/test/externalTests/pool-together.sh
index 77b3ad1499..3f7141d9ba 100755
--- a/test/externalTests/pool-together.sh
+++ b/test/externalTests/pool-together.sh
@@ -45,8 +45,8 @@ function pool_together_test
     local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize            # Compilation fails with "YulException: Variable var_amount_205 is 9 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only      # Compilation fails with "YulException: Variable var_amount_205 is 9 slot(s) too deep inside the stack."
+        ir-no-optimize
+        ir-optimize-evm-only
         ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
index 614c285f72..fcf1aa208e 100755
--- a/test/externalTests/prb-math.sh
+++ b/test/externalTests/prb-math.sh
@@ -45,11 +45,12 @@ function prb_math_test
     local config_file="hardhat.config.ts"
     local config_var="config"
 
-    local compile_only_presets=()
+    local compile_only_presets=(
+        ir-no-optimize            # Tests fail with "Error: Transaction reverted: trying to deploy a contract whose code is too large"
+    )
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var_y_1960 is 8 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_y_1960 is 8 slot(s) too deep inside the stack."
+        ir-optimize-evm-only
         ir-optimize-evm+yul
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
diff --git a/test/externalTests/trident.sh b/test/externalTests/trident.sh
index f02123217a..d8d94eb3c1 100755
--- a/test/externalTests/trident.sh
+++ b/test/externalTests/trident.sh
@@ -54,9 +54,9 @@ function trident_test
     local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize            # Compilation fails with: "YulException: Variable var_amount_165 is 9 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only      # Compilation fails with: "YulException: Variable var_amount_165 is 9 slot(s) too deep inside the stack."
-        ir-optimize-evm+yul       # Needs memory-safe inline assembly patch
+        ir-no-optimize
+        ir-optimize-evm-only
+        ir-optimize-evm+yul        # Needs memory-safe inline assembly patch
         legacy-no-optimize
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
diff --git a/test/externalTests/uniswap.sh b/test/externalTests/uniswap.sh
index 37fed86443..8d2551b619 100755
--- a/test/externalTests/uniswap.sh
+++ b/test/externalTests/uniswap.sh
@@ -45,8 +45,8 @@ function uniswap_test
     local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with: "YulException: Variable ret_0 is 1 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # Compilation fails with: "YulException: Variable ret_0 is 1 slot(s) too deep inside the stack."
+        ir-no-optimize
+        ir-optimize-evm-only
         ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only
diff --git a/test/externalTests/yield-liquidator.sh b/test/externalTests/yield-liquidator.sh
index 3c7137f737..7a4353af57 100755
--- a/test/externalTests/yield-liquidator.sh
+++ b/test/externalTests/yield-liquidator.sh
@@ -45,8 +45,8 @@ function yield_liquidator_test
     local compile_only_presets=()
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var_roles_168_mpos is 2 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var__33 is 6 slot(s) too deep inside the stack."
+        ir-no-optimize
+        ir-optimize-evm-only
         ir-optimize-evm+yul
         legacy-optimize-evm-only
         legacy-optimize-evm+yul
diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 4ac04a66d1..a8d72e82a2 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -46,11 +46,12 @@ function zeppelin_test
     local ref="master"
     local config_file="hardhat.config.js"
 
-    local compile_only_presets=()
+    local compile_only_presets=(
+        #ir-no-optimize           # Compilation fails with "Contract initcode size is 49410 bytes and exceeds 49152 bytes (a limit introduced in Shanghai)."
+        ir-optimize-evm-only      # FIXME: A few tests fail with "Transaction: ... exited with an error (status 0) after consuming all gas."
+)
     local settings_presets=(
         "${compile_only_presets[@]}"
-        #ir-no-optimize           # Compilation fails with "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
-        #ir-optimize-evm-only     # Compilation fails with "YulException: Variable var_account_852 is 4 slot(s) too deep inside the stack."
         ir-optimize-evm+yul
         legacy-no-optimize
         legacy-optimize-evm-only

From b1a773be2fd0bda89b6fe7084e8c9e78f4e7984f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 17 May 2023 14:03:16 +0200
Subject: [PATCH 1433/1748] IRGenerator: Leave IR optimization up to the caller
 to avoid unnecessarily doing it twice

---
 Changelog.md                                  |  1 +
 libsolidity/codegen/ir/IRGenerationContext.h  |  4 --
 libsolidity/codegen/ir/IRGenerator.cpp        | 28 +-------------
 libsolidity/codegen/ir/IRGenerator.h          | 10 +----
 libsolidity/interface/CompilerStack.cpp       | 37 ++++++++++++++-----
 test/cmdlineTests/~via_ir_equivalence/test.sh |  6 ++-
 6 files changed, 36 insertions(+), 50 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 9b70219969..c5625d9dbc 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -18,6 +18,7 @@ Bugfixes:
  * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
  * SMTChecker: Fix false negative when a verification target can be violated only by trusted external call from another public function.
+ * Yul Optimizer: Fix optimized IR being unnecessarily passed through the Yul optimizer again before bytecode generation.
 
 AST Changes:
  * AST: Add the ``experimentalSolidity`` field to the ``SourceUnit`` nodes, which indicate whether the experimental parsing mode has been enabled via ``pragma experimental solidity``.
diff --git a/libsolidity/codegen/ir/IRGenerationContext.h b/libsolidity/codegen/ir/IRGenerationContext.h
index 14a70a8a6c..833b768a31 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.h
+++ b/libsolidity/codegen/ir/IRGenerationContext.h
@@ -23,7 +23,6 @@
 
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/codegen/ir/IRVariable.h>
-#include <libsolidity/interface/OptimiserSettings.h>
 #include <libsolidity/interface/DebugSettings.h>
 
 #include <libsolidity/codegen/MultiUseYulFunctionCollector.h>
@@ -73,7 +72,6 @@ class IRGenerationContext
 		langutil::EVMVersion _evmVersion,
 		ExecutionContext _executionContext,
 		RevertStrings _revertStrings,
-		OptimiserSettings _optimiserSettings,
 		std::map<std::string, unsigned> _sourceIndices,
 		langutil::DebugInfoSelection const& _debugInfoSelection,
 		langutil::CharStreamProvider const* _soliditySourceProvider
@@ -81,7 +79,6 @@ class IRGenerationContext
 		m_evmVersion(_evmVersion),
 		m_executionContext(_executionContext),
 		m_revertStrings(_revertStrings),
-		m_optimiserSettings(std::move(_optimiserSettings)),
 		m_sourceIndices(std::move(_sourceIndices)),
 		m_debugInfoSelection(_debugInfoSelection),
 		m_soliditySourceProvider(_soliditySourceProvider)
@@ -176,7 +173,6 @@ class IRGenerationContext
 	langutil::EVMVersion m_evmVersion;
 	ExecutionContext m_executionContext;
 	RevertStrings m_revertStrings;
-	OptimiserSettings m_optimiserSettings;
 	std::map<std::string, unsigned> m_sourceIndices;
 	std::set<std::string> m_usedSourceNames;
 	ContractDefinition const* m_mostDerivedContract = nullptr;
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index bbc5ef3ac7..223d712f0d 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -89,36 +89,13 @@ set<CallableDeclaration const*, ASTNode::CompareByID> collectReachableCallables(
 
 }
 
-tuple<string, Json::Value, string, Json::Value> IRGenerator::run(
+string IRGenerator::run(
 	ContractDefinition const& _contract,
 	bytes const& _cborMetadata,
 	map<ContractDefinition const*, string_view const> const& _otherYulSources
 )
 {
-	string ir = yul::reindent(generate(_contract, _cborMetadata, _otherYulSources));
-
-	yul::YulStack asmStack(
-		m_evmVersion,
-		m_eofVersion,
-		yul::YulStack::Language::StrictAssembly,
-		m_optimiserSettings,
-		m_context.debugInfoSelection()
-	);
-	if (!asmStack.parseAndAnalyze("", ir))
-	{
-		string errorMessage;
-		for (auto const& error: asmStack.errors())
-			errorMessage += langutil::SourceReferenceFormatter::formatErrorInformation(
-				*error,
-				asmStack.charStream("")
-			);
-		solAssert(false, ir + "\n\nInvalid IR generated:\n" + errorMessage + "\n");
-	}
-	Json::Value irAst = asmStack.astJson();
-	asmStack.optimize();
-	Json::Value irOptAst = asmStack.astJson();
-
-	return {std::move(ir), std::move(irAst), asmStack.print(m_context.soliditySourceProvider()), std::move(irOptAst)};
+	return yul::reindent(generate(_contract, _cborMetadata, _otherYulSources));
 }
 
 string IRGenerator::generate(
@@ -1116,7 +1093,6 @@ void IRGenerator::resetContext(ContractDefinition const& _contract, ExecutionCon
 		m_evmVersion,
 		_context,
 		m_context.revertStrings(),
-		m_optimiserSettings,
 		m_context.sourceIndices(),
 		m_context.debugInfoSelection(),
 		m_context.soliditySourceProvider()
diff --git a/libsolidity/codegen/ir/IRGenerator.h b/libsolidity/codegen/ir/IRGenerator.h
index 9001244b2c..fafe471280 100644
--- a/libsolidity/codegen/ir/IRGenerator.h
+++ b/libsolidity/codegen/ir/IRGenerator.h
@@ -23,7 +23,6 @@
 
 #pragma once
 
-#include <libsolidity/interface/OptimiserSettings.h>
 #include <libsolidity/ast/ASTForward.h>
 #include <libsolidity/ast/CallGraph.h>
 #include <libsolidity/codegen/ir/IRGenerationContext.h>
@@ -50,19 +49,16 @@ class IRGenerator
 		langutil::EVMVersion _evmVersion,
 		std::optional<uint8_t> _eofVersion,
 		RevertStrings _revertStrings,
-		OptimiserSettings _optimiserSettings,
 		std::map<std::string, unsigned> _sourceIndices,
 		langutil::DebugInfoSelection const& _debugInfoSelection,
 		langutil::CharStreamProvider const* _soliditySourceProvider
 	):
 		m_evmVersion(_evmVersion),
 		m_eofVersion(_eofVersion),
-		m_optimiserSettings(_optimiserSettings),
 		m_context(
 			_evmVersion,
 			ExecutionContext::Creation,
 			_revertStrings,
-			std::move(_optimiserSettings),
 			std::move(_sourceIndices),
 			_debugInfoSelection,
 			_soliditySourceProvider
@@ -70,9 +66,8 @@ class IRGenerator
 		m_utils(_evmVersion, m_context.revertStrings(), m_context.functionCollector())
 	{}
 
-	/// Generates and returns the IR code, in unoptimized and optimized form
-	/// (or just pretty-printed, depending on the optimizer settings).
-	std::tuple<std::string, Json::Value, std::string, Json::Value> run(
+	/// Generates and returns (unoptimized) IR code.
+	std::string run(
 		ContractDefinition const& _contract,
 		bytes const& _cborMetadata,
 		std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
@@ -143,7 +138,6 @@ class IRGenerator
 
 	langutil::EVMVersion const m_evmVersion;
 	std::optional<uint8_t> const m_eofVersion;
-	OptimiserSettings const m_optimiserSettings;
 
 	IRGenerationContext m_context;
 	YulUtilFunctions m_utils;
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index aad2bc2baf..bbebc25085 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -70,6 +70,7 @@
 
 #include <liblangutil/Scanner.h>
 #include <liblangutil/SemVerHandler.h>
+#include <liblangutil/SourceReferenceFormatter.h>
 
 #include <libevmasm/Exceptions.h>
 
@@ -1468,22 +1469,38 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 		m_evmVersion,
 		m_eofVersion,
 		m_revertStrings,
-		m_optimiserSettings,
 		sourceIndices(),
 		m_debugInfoSelection,
 		this
 	);
-
-	tie(
-		compiledContract.yulIR,
-		compiledContract.yulIRAst,
-		compiledContract.yulIROptimized,
-		compiledContract.yulIROptimizedAst
-	) = generator.run(
+	compiledContract.yulIR = generator.run(
 		_contract,
 		createCBORMetadata(compiledContract, /* _forIR */ true),
 		otherYulSources
 	);
+
+	yul::YulStack stack(
+		m_evmVersion,
+		m_eofVersion,
+		yul::YulStack::Language::StrictAssembly,
+		m_optimiserSettings,
+		m_debugInfoSelection
+	);
+	if (!stack.parseAndAnalyze("", compiledContract.yulIR))
+	{
+		string errorMessage;
+		for (auto const& error: stack.errors())
+			errorMessage += langutil::SourceReferenceFormatter::formatErrorInformation(
+				*error,
+				stack.charStream("")
+			);
+		solAssert(false, compiledContract.yulIR + "\n\nInvalid IR generated:\n" + errorMessage + "\n");
+	}
+
+	compiledContract.yulIRAst = stack.astJson();
+	stack.optimize();
+	compiledContract.yulIROptimized = stack.print(this);
+	compiledContract.yulIROptimizedAst = stack.astJson();
 }
 
 void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
@@ -1508,8 +1525,8 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 		m_optimiserSettings,
 		m_debugInfoSelection
 	);
-	stack.parseAndAnalyze("", compiledContract.yulIROptimized);
-	stack.optimize();
+	bool analysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIROptimized);
+	solAssert(analysisSuccessful);
 
 	//cout << yul::AsmPrinter{}(*stack.parserResult()->code) << endl;
 
diff --git a/test/cmdlineTests/~via_ir_equivalence/test.sh b/test/cmdlineTests/~via_ir_equivalence/test.sh
index c318f262a0..d663bef858 100755
--- a/test/cmdlineTests/~via_ir_equivalence/test.sh
+++ b/test/cmdlineTests/~via_ir_equivalence/test.sh
@@ -33,7 +33,8 @@ function test_via_ir_equivalence()
     for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
         asm_output_two_stage+=$(
             msg_on_error --no-stderr \
-                "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" "$yul_file" | stripCLIDecorations
+                "$SOLC" --strict-assembly --asm "${optimizer_flags[@]}" --no-optimize-yul "$yul_file" |
+                    stripCLIDecorations
         )
     done
 
@@ -50,7 +51,8 @@ function test_via_ir_equivalence()
     for yul_file in $(find . -name "${output_file_prefix}*.yul" | sort -V); do
         bin_output_two_stage+=$(
             msg_on_error --no-stderr \
-                "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" | stripCLIDecorations
+                "$SOLC" --strict-assembly --bin "${optimizer_flags[@]}" "$yul_file" --no-optimize-yul |
+                    stripCLIDecorations
         )
     done
 

From 74a38fc3d837d276cdf1aa0eb217e69f2890f8ec Mon Sep 17 00:00:00 2001
From: Jun Zhang <jun@junz.org>
Date: Thu, 8 Jun 2023 19:03:59 +0800
Subject: [PATCH 1434/1748] Fix incorrect CMAKE_SOURCE_DIR usage

When using solidity as a third-party library (include it into our
project using FetchContent), we encountered a strange compilation error.
For some reason, cmake considers the root directory of the project as
the root directory of the dependency (solidity). This is because
solidity is incorrectly using CMAKE_SOURCE_DIR variable, which should be
PROJECT_SOURCE_DIR (The former one refers to the top-level source
directory that contains a CMakeLists.txt, while the latter refers to the
source directory of the most recent project() command)

I've created a repo for demonstration (https://github.com/junaire/test-solidity-fetch-content)

Signed-off-by: Jun Zhang <jun@junz.org>
---
 CMakeLists.txt                  | 6 +++---
 cmake/EthCompilerSettings.cmake | 2 +-
 cmake/fmtlib.cmake              | 2 +-
 cmake/jsoncpp.cmake             | 2 +-
 cmake/range-v3.cmake            | 2 +-
 libsolutil/CMakeLists.txt       | 2 +-
 libstdlib/CMakeLists.txt        | 8 ++++----
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85d2f64ce8..6583f7cd47 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,7 @@ list(APPEND CMAKE_MODULE_PATH ${ETH_CMAKE_DIR})
 
 # Set the build type, if none was specified.
 if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-	if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+	if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
 		set(DEFAULT_BUILD_TYPE "RelWithDebInfo")
 	else()
 		set(DEFAULT_BUILD_TYPE "Release")
@@ -66,12 +66,12 @@ include(EthUtils)
 
 # Create license.h from LICENSE.txt and template
 # Converting to char array is required due to MSVC's string size limit.
-file(READ ${CMAKE_SOURCE_DIR}/LICENSE.txt LICENSE_TEXT HEX)
+file(READ ${PROJECT_SOURCE_DIR}/LICENSE.txt LICENSE_TEXT HEX)
 string(REGEX MATCHALL ".." LICENSE_TEXT "${LICENSE_TEXT}")
 string(REGEX REPLACE ";" ",\n\t0x" LICENSE_TEXT "${LICENSE_TEXT}")
 set(LICENSE_TEXT "0x${LICENSE_TEXT}")
 
-configure_file("${CMAKE_SOURCE_DIR}/cmake/templates/license.h.in" include/license.h)
+configure_file("${PROJECT_SOURCE_DIR}/cmake/templates/license.h.in" include/license.h)
 
 include(EthOptions)
 configure_project(TESTS)
diff --git a/cmake/EthCompilerSettings.cmake b/cmake/EthCompilerSettings.cmake
index 4dd5934584..6cfa864c1d 100644
--- a/cmake/EthCompilerSettings.cmake
+++ b/cmake/EthCompilerSettings.cmake
@@ -28,7 +28,7 @@ if(PEDANTIC)
 endif()
 
 # Prevent the path of the source directory from ending up in the binary via __FILE__ macros.
-eth_add_cxx_compiler_flag_if_supported("-fmacro-prefix-map=${CMAKE_SOURCE_DIR}=/solidity")
+eth_add_cxx_compiler_flag_if_supported("-fmacro-prefix-map=${PROJECT_SOURCE_DIR}=/solidity")
 
 # -Wpessimizing-move warns when a call to std::move would prevent copy elision
 # if the argument was not wrapped in a call.  This happens when moving a local
diff --git a/cmake/fmtlib.cmake b/cmake/fmtlib.cmake
index 5ed196cea0..2610424f60 100644
--- a/cmake/fmtlib.cmake
+++ b/cmake/fmtlib.cmake
@@ -3,7 +3,7 @@ include(FetchContent)
 FetchContent_Declare(
 	fmtlib
 	PREFIX "${CMAKE_BINARY_DIR}/deps"
-	DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/downloads"
+	DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
 	DOWNLOAD_NAME fmt-8.0.1.tar.gz
 	URL https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz
 	URL_HASH SHA256=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake
index 29b8f5f051..48a9d2b493 100644
--- a/cmake/jsoncpp.cmake
+++ b/cmake/jsoncpp.cmake
@@ -42,7 +42,7 @@ endif()
 
 ExternalProject_Add(jsoncpp-project
     PREFIX "${prefix}"
-    DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/downloads"
+    DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
     DOWNLOAD_NAME jsoncpp-1.9.3.tar.gz
     URL https://github.com/open-source-parsers/jsoncpp/archive/1.9.3.tar.gz
     URL_HASH SHA256=8593c1d69e703563d94d8c12244e2e18893eeb9a8a9f8aa3d09a327aa45c8f7d
diff --git a/cmake/range-v3.cmake b/cmake/range-v3.cmake
index 75ed5a92e3..4f3225420e 100644
--- a/cmake/range-v3.cmake
+++ b/cmake/range-v3.cmake
@@ -11,7 +11,7 @@ set(RANGE_V3_INCLUDE_DIR "${prefix}/include")
 
 ExternalProject_Add(range-v3-project
     PREFIX "${prefix}"
-    DOWNLOAD_DIR "${CMAKE_SOURCE_DIR}/deps/downloads"
+    DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
     DOWNLOAD_NAME range-v3-0.12.0.tar.gz
     URL https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz
     URL_HASH SHA256=015adb2300a98edfceaf0725beec3337f542af4915cec4d0b89fa0886f4ba9cb
diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
index b368e12f9d..201429bb75 100644
--- a/libsolutil/CMakeLists.txt
+++ b/libsolutil/CMakeLists.txt
@@ -46,7 +46,7 @@ set(sources
 
 add_library(solutil ${sources})
 target_link_libraries(solutil PUBLIC jsoncpp Boost::boost Boost::filesystem Boost::system range-v3 fmt::fmt-header-only)
-target_include_directories(solutil PUBLIC "${CMAKE_SOURCE_DIR}")
+target_include_directories(solutil PUBLIC "${PROJECT_SOURCE_DIR}")
 add_dependencies(solutil solidity_BuildInfo.h)
 
 if(SOLC_LINK_STATIC)
diff --git a/libstdlib/CMakeLists.txt b/libstdlib/CMakeLists.txt
index a4523b99eb..4a995c78f1 100644
--- a/libstdlib/CMakeLists.txt
+++ b/libstdlib/CMakeLists.txt
@@ -1,18 +1,18 @@
 # This will re-generate the headers if any file within src was modified.
-set_directory_properties(PROPERTY CMAKE_CONFIGURE_DEPENDS ${CMAKE_SOURCE_DIR}/stdlib/src/)
+set_directory_properties(PROPERTY CMAKE_CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/stdlib/src/)
 
 set(STDLIB stub)
 set(GENERATED_STDLIB_HEADERS)
 foreach(src IN LISTS STDLIB)
-    set(STDLIB_FILE ${CMAKE_SOURCE_DIR}/libstdlib/src/${src}.sol)
+    set(STDLIB_FILE ${PROJECT_SOURCE_DIR}/libstdlib/src/${src}.sol)
     file(READ ${STDLIB_FILE} STDLIB_FILE_CONTENT HEX)
     string(REGEX MATCHALL ".." STDLIB_FILE_CONTENT "${STDLIB_FILE_CONTENT}")
     list(REMOVE_ITEM STDLIB_FILE_CONTENT "0d")
     string(REGEX REPLACE ";" ",\n\t0x" STDLIB_FILE_CONTENT "${STDLIB_FILE_CONTENT}")
     set(STDLIB_FILE_CONTENT "0x${STDLIB_FILE_CONTENT}")
     set(STDLIB_FILE_NAME ${src})
-    configure_file("${CMAKE_SOURCE_DIR}/libstdlib/stdlib.src.h.in" ${CMAKE_BINARY_DIR}/include/libstdlib/${src}.h NEWLINE_STYLE LF @ONLY)
+    configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.src.h.in" ${CMAKE_BINARY_DIR}/include/libstdlib/${src}.h NEWLINE_STYLE LF @ONLY)
     list(APPEND GENERATED_STDLIB_HEADERS ${CMAKE_BINARY_DIR}/include/libstdlib/${src}.h)
 endforeach()
 
-configure_file("${CMAKE_SOURCE_DIR}/libstdlib/stdlib.h.in" ${CMAKE_BINARY_DIR}/include/libstdlib/stdlib.h NEWLINE_STYLE LF @ONLY)
+configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.h.in" ${CMAKE_BINARY_DIR}/include/libstdlib/stdlib.h NEWLINE_STYLE LF @ONLY)

From 8c5ecd1c0114aeb5e0ac24dc58218220d858237b Mon Sep 17 00:00:00 2001
From: Jun Zhang <jun@junz.org>
Date: Sat, 10 Jun 2023 00:21:55 +0800
Subject: [PATCH 1435/1748] Fix incorrectly CMAKE_BINARY_DIR usage

Similiar to CMAKE_SOURCE_DIR. Using CMAKE_BINARY_DIR will put the
generated header (stdlib.h) in build/include/solidity/libstdlib but it
should start with build/third-party/solidity or the library can't find
the header.

Signed-off-by: Jun Zhang <jun@junz.org>
---
 cmake/fmtlib.cmake       | 2 +-
 cmake/jsoncpp.cmake      | 2 +-
 cmake/range-v3.cmake     | 2 +-
 libstdlib/CMakeLists.txt | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cmake/fmtlib.cmake b/cmake/fmtlib.cmake
index 2610424f60..792bf3b027 100644
--- a/cmake/fmtlib.cmake
+++ b/cmake/fmtlib.cmake
@@ -2,7 +2,7 @@ include(FetchContent)
 
 FetchContent_Declare(
 	fmtlib
-	PREFIX "${CMAKE_BINARY_DIR}/deps"
+	PREFIX "${PROJECT_BINARY_DIR}/deps"
 	DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
 	DOWNLOAD_NAME fmt-8.0.1.tar.gz
 	URL https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake
index 48a9d2b493..cf1cc656b3 100644
--- a/cmake/jsoncpp.cmake
+++ b/cmake/jsoncpp.cmake
@@ -6,7 +6,7 @@ else()
     set(JSONCPP_CMAKE_COMMAND ${CMAKE_COMMAND})
 endif()
 
-set(prefix "${CMAKE_BINARY_DIR}/deps")
+set(prefix "${PROJECT_BINARY_DIR}/deps")
 set(JSONCPP_LIBRARY "${prefix}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}jsoncpp${CMAKE_STATIC_LIBRARY_SUFFIX}")
 set(JSONCPP_INCLUDE_DIR "${prefix}/include")
 
diff --git a/cmake/range-v3.cmake b/cmake/range-v3.cmake
index 4f3225420e..d2f54452b3 100644
--- a/cmake/range-v3.cmake
+++ b/cmake/range-v3.cmake
@@ -6,7 +6,7 @@ else()
     set(RANGE_V3_CMAKE_COMMAND ${CMAKE_COMMAND})
 endif()
 
-set(prefix "${CMAKE_BINARY_DIR}/deps")
+set(prefix "${PROJECT_BINARY_DIR}/deps")
 set(RANGE_V3_INCLUDE_DIR "${prefix}/include")
 
 ExternalProject_Add(range-v3-project
diff --git a/libstdlib/CMakeLists.txt b/libstdlib/CMakeLists.txt
index 4a995c78f1..65a3a1cda1 100644
--- a/libstdlib/CMakeLists.txt
+++ b/libstdlib/CMakeLists.txt
@@ -11,8 +11,8 @@ foreach(src IN LISTS STDLIB)
     string(REGEX REPLACE ";" ",\n\t0x" STDLIB_FILE_CONTENT "${STDLIB_FILE_CONTENT}")
     set(STDLIB_FILE_CONTENT "0x${STDLIB_FILE_CONTENT}")
     set(STDLIB_FILE_NAME ${src})
-    configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.src.h.in" ${CMAKE_BINARY_DIR}/include/libstdlib/${src}.h NEWLINE_STYLE LF @ONLY)
-    list(APPEND GENERATED_STDLIB_HEADERS ${CMAKE_BINARY_DIR}/include/libstdlib/${src}.h)
+    configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.src.h.in" ${PROJECT_BINARY_DIR}/include/libstdlib/${src}.h NEWLINE_STYLE LF @ONLY)
+    list(APPEND GENERATED_STDLIB_HEADERS ${PROJECT_BINARY_DIR}/include/libstdlib/${src}.h)
 endforeach()
 
-configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.h.in" ${CMAKE_BINARY_DIR}/include/libstdlib/stdlib.h NEWLINE_STYLE LF @ONLY)
+configure_file("${PROJECT_SOURCE_DIR}/libstdlib/stdlib.h.in" ${PROJECT_BINARY_DIR}/include/libstdlib/stdlib.h NEWLINE_STYLE LF @ONLY)

From 54c0ca99c3978ac4dc5fe28317f3110c15158ad8 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 12 Jun 2023 14:49:11 +0200
Subject: [PATCH 1436/1748] Bump circleci cimg/node version

---
 .circleci/config.yml | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 68092cc98f..d5ea61ad26 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -592,13 +592,14 @@ defaults:
       name: t_native_test_ext_gnosis
       project: gnosis
       binary_type: native
-      image: cimg/node:16.18
+      image: cimg/node:18.16
 
   - job_native_test_ext_zeppelin: &job_native_test_ext_zeppelin
       <<: *requires_b_ubu_static
       name: t_native_test_ext_zeppelin
       project: zeppelin
       binary_type: native
+      image: cimg/node:18.16
       resource_class: large
 
   - job_native_test_ext_ens: &job_native_test_ext_ens
@@ -606,14 +607,14 @@ defaults:
       name: t_native_test_ext_ens
       project: ens
       binary_type: native
-      image: cimg/node:18.11
+      image: cimg/node:18.16
 
   - job_native_test_ext_trident: &job_native_test_ext_trident
       <<: *requires_b_ubu_static
       name: t_native_test_ext_trident
       project: trident
       binary_type: native
-      image: cimg/node:16.18
+      image: cimg/node:18.16
 
   - job_native_test_ext_euler: &job_native_test_ext_euler
       <<: *requires_b_ubu_static
@@ -627,6 +628,7 @@ defaults:
       name: t_native_test_ext_yield_liquidator
       project: yield-liquidator
       binary_type: native
+      image: cimg/node:18.16
 
   - job_native_test_ext_bleeps: &job_native_test_ext_bleeps
       <<: *requires_b_ubu_static
@@ -640,34 +642,35 @@ defaults:
       name: t_native_test_ext_pool_together
       project: pool-together
       binary_type: native
-      image: cimg/node:16.18
+      image: cimg/node:18.16
 
   - job_native_test_ext_perpetual_pools: &job_native_test_ext_perpetual_pools
       <<: *requires_b_ubu_static
       name: t_native_test_ext_perpetual_pools
       project: perpetual-pools
       binary_type: native
-      image: cimg/node:18.11
+      image: cimg/node:18.16
 
   - job_native_test_ext_uniswap: &job_native_test_ext_uniswap
       <<: *requires_b_ubu_static
       name: t_native_test_ext_uniswap
       project: uniswap
       binary_type: native
-      image: cimg/node:16.18
+      image: cimg/node:18.16
 
   - job_native_test_ext_prb_math: &job_native_test_ext_prb_math
       <<: *requires_b_ubu_static
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
-      image: cimg/node:18.11
+      image: cimg/node:18.16
 
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
       <<: *requires_b_ubu_static
       name: t_native_test_ext_elementfi
       project: elementfi
       binary_type: native
+      image: cimg/node:18.16
       resource_class: medium
 
   - job_native_test_ext_brink: &job_native_test_ext_brink
@@ -675,14 +678,14 @@ defaults:
       name: t_native_test_ext_brink
       project: brink
       binary_type: native
-      image: cimg/node:18.11
+      image: cimg/node:18.16
 
   - job_native_test_ext_chainlink: &job_native_test_ext_chainlink
       <<: *requires_b_ubu_static
       name: t_native_test_ext_chainlink
       project: chainlink
       binary_type: native
-      image: cimg/node:16.18
+      image: cimg/node:18.16
       resource_class: large # Tests run out of memory on a smaller machine
 
   - job_native_test_ext_gp2: &job_native_test_ext_gp2
@@ -690,7 +693,7 @@ defaults:
       name: t_native_test_ext_gp2
       project: gp2
       binary_type: native
-      image: cimg/node:18.11
+      image: cimg/node:18.16
 
   - job_b_ubu_asan_clang: &job_b_ubu_asan_clang
       <<: *on_all_tags_and_branches
@@ -1228,7 +1231,7 @@ jobs:
   t_ems_ext_hardhat:
     <<: *base_node_small
     docker:
-      - image: cimg/node:18.11
+      - image: cimg/node:18.16
     environment:
       TERM: xterm
       HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js

From b7abd9bba47d9fad50cc196ed7b16b92c4f5b309 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 7 Jun 2023 15:55:22 +0200
Subject: [PATCH 1437/1748] Deterministically choose memory slots for variables
 independently of names that may depend on AST IDs.

---
 Changelog.md                                  |  1 +
 libyul/CompilabilityChecker.cpp               |  4 +-
 libyul/CompilabilityChecker.h                 |  2 +-
 libyul/optimiser/CallGraphGenerator.cpp       |  5 ++-
 libyul/optimiser/CallGraphGenerator.h         |  2 +-
 libyul/optimiser/FullInliner.cpp              |  5 ++-
 libyul/optimiser/StackLimitEvader.cpp         | 15 ++++---
 libyul/optimiser/StackLimitEvader.h           |  2 +-
 test/libyul/YulOptimizerTestCommon.cpp        |  5 ++-
 .../fakeStackLimitEvader/connected.yul        | 10 ++---
 .../fakeStackLimitEvader/stub.yul             | 14 +++----
 .../stackLimitEvader/too_many_args_14.yul     | 18 ++++-----
 .../stackLimitEvader/too_many_args_15.yul     | 24 +++++------
 .../stackLimitEvader/too_many_args_16.yul     | 26 ++++++------
 .../verbatim_many_arguments.yul               |  6 +--
 .../verbatim_many_arguments_and_returns.yul   | 40 +++++++++----------
 16 files changed, 97 insertions(+), 82 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c5625d9dbc..75d1cf773f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -18,6 +18,7 @@ Bugfixes:
  * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
  * SMTChecker: Fix false negative when a verification target can be violated only by trusted external call from another public function.
+ * Yul Optimizer: Ensure that the assignment of memory slots for variables moved to memory does not depend on AST IDs that may depend on whether additional files are included during compilation.
  * Yul Optimizer: Fix optimized IR being unnecessarily passed through the Yul optimizer again before bytecode generation.
 
 AST Changes:
diff --git a/libyul/CompilabilityChecker.cpp b/libyul/CompilabilityChecker.cpp
index acb48cfa54..b9b51731b1 100644
--- a/libyul/CompilabilityChecker.cpp
+++ b/libyul/CompilabilityChecker.cpp
@@ -63,7 +63,9 @@ CompilabilityChecker::CompilabilityChecker(
 
 		for (StackTooDeepError const& error: transform.stackErrors())
 		{
-			unreachableVariables[error.functionName].emplace(error.variable);
+			auto& unreachables = unreachableVariables[error.functionName];
+			if (!util::contains(unreachables, error.variable))
+				unreachables.emplace_back(error.variable);
 			int& deficit = stackDeficit[error.functionName];
 			deficit = std::max(error.depth, deficit);
 		}
diff --git a/libyul/CompilabilityChecker.h b/libyul/CompilabilityChecker.h
index 307d719e4b..c046df94ff 100644
--- a/libyul/CompilabilityChecker.h
+++ b/libyul/CompilabilityChecker.h
@@ -45,7 +45,7 @@ namespace solidity::yul
 struct CompilabilityChecker
 {
 	CompilabilityChecker(Dialect const& _dialect, Object const& _object, bool _optimizeStackAllocation);
-	std::map<YulString, std::set<YulString>> unreachableVariables;
+	std::map<YulString, std::vector<YulString>> unreachableVariables;
 	std::map<YulString, int> stackDeficit;
 };
 
diff --git a/libyul/optimiser/CallGraphGenerator.cpp b/libyul/optimiser/CallGraphGenerator.cpp
index 5aeff50be5..66f740391d 100644
--- a/libyul/optimiser/CallGraphGenerator.cpp
+++ b/libyul/optimiser/CallGraphGenerator.cpp
@@ -22,6 +22,7 @@
 #include <libyul/AST.h>
 #include <libyul/optimiser/CallGraphGenerator.h>
 
+#include <libsolutil/CommonData.h>
 #include <stack>
 
 using namespace std;
@@ -79,7 +80,9 @@ CallGraph CallGraphGenerator::callGraph(Block const& _ast)
 
 void CallGraphGenerator::operator()(FunctionCall const& _functionCall)
 {
-	m_callGraph.functionCalls[m_currentFunction].insert(_functionCall.functionName.name);
+	auto& functionCalls = m_callGraph.functionCalls[m_currentFunction];
+	if (!util::contains(functionCalls, _functionCall.functionName.name))
+		functionCalls.emplace_back(_functionCall.functionName.name);
 	ASTWalker::operator()(_functionCall);
 }
 
diff --git a/libyul/optimiser/CallGraphGenerator.h b/libyul/optimiser/CallGraphGenerator.h
index a581df0182..ad19878b68 100644
--- a/libyul/optimiser/CallGraphGenerator.h
+++ b/libyul/optimiser/CallGraphGenerator.h
@@ -32,7 +32,7 @@ namespace solidity::yul
 
 struct CallGraph
 {
-	std::map<YulString, std::set<YulString>> functionCalls;
+	std::map<YulString, std::vector<YulString>> functionCalls;
 	std::set<YulString> functionsWithLoops;
 	/// @returns the set of functions contained in cycles in the call graph, i.e.
 	/// functions that are part of a (mutual) recursion.
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index 9ffe871faf..0482e20d62 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -37,6 +37,8 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Visitor.h>
 
+#include <range/v3/action/remove.hpp>
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
@@ -156,7 +158,8 @@ map<YulString, size_t> FullInliner::callDepths() const
 		}
 
 		for (auto& call: cg.functionCalls)
-			call.second -= removed;
+			for (YulString toBeRemoved: removed)
+				ranges::actions::remove(call.second, toBeRemoved);
 
 		currentDepth++;
 
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index b4b9d5469a..4c84f5155d 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -97,9 +97,9 @@ struct MemoryOffsetAllocator
 
 	/// Maps function names to the set of unreachable variables in that function.
 	/// An empty variable name means that the function has too many arguments or return variables.
-	map<YulString, set<YulString>> const& unreachableVariables;
+	map<YulString, vector<YulString>> const& unreachableVariables;
 	/// The graph of immediate function calls of all functions.
-	map<YulString, set<YulString>> const& callGraph;
+	map<YulString, vector<YulString>> const& callGraph;
 	/// Maps the name of each user-defined function to its definition.
 	map<YulString, FunctionDefinition const*> const& functionDefinitions;
 
@@ -149,18 +149,23 @@ void StackLimitEvader::run(
 	map<YulString, vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
 )
 {
-	map<YulString, set<YulString>> unreachableVariables;
+	map<YulString, vector<YulString>> unreachableVariables;
 	for (auto&& [function, stackTooDeepErrors]: _stackTooDeepErrors)
+	{
+		auto& unreachables = unreachableVariables[function];
 		// TODO: choose wisely.
 		for (auto const& stackTooDeepError: stackTooDeepErrors)
-			unreachableVariables[function] += stackTooDeepError.variableChoices | ranges::views::take(stackTooDeepError.deficit) | ranges::to<set<YulString>>;
+			for (auto variable: stackTooDeepError.variableChoices | ranges::views::take(stackTooDeepError.deficit))
+				if (!util::contains(unreachables, variable))
+					unreachables.emplace_back(variable);
+	}
 	run(_context, _object, unreachableVariables);
 }
 
 void StackLimitEvader::run(
 	OptimiserStepContext& _context,
 	Object& _object,
-	map<YulString, set<YulString>> const& _unreachableVariables
+	map<YulString, vector<YulString>> const& _unreachableVariables
 )
 {
 	yulAssert(_object.code, "");
diff --git a/libyul/optimiser/StackLimitEvader.h b/libyul/optimiser/StackLimitEvader.h
index ae2d31c375..025553200f 100644
--- a/libyul/optimiser/StackLimitEvader.h
+++ b/libyul/optimiser/StackLimitEvader.h
@@ -60,7 +60,7 @@ class StackLimitEvader
 	static void run(
 		OptimiserStepContext& _context,
 		Object& _object,
-		std::map<YulString, std::set<YulString>> const& _unreachableVariables
+		std::map<YulString, std::vector<YulString>> const& _unreachableVariables
 	);
 	/// @a _stackTooDeepErrors can be determined by the StackLayoutGenerator.
 	/// Can only be run on the EVM dialect with objects.
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 7e5f324305..48c7ea4038 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -349,7 +349,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			// Mark all variables with a name starting with "$" for escalation to memory.
 			struct FakeUnreachableGenerator: ASTWalker
 			{
-				map<YulString, set<YulString>> fakeUnreachables;
+				map<YulString, vector<YulString>> fakeUnreachables;
 				using ASTWalker::operator();
 				void operator()(FunctionDefinition const& _function) override
 				{
@@ -365,7 +365,8 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 				void visitVariableName(YulString _var)
 				{
 					if (!_var.empty() && _var.str().front() == '$')
-						fakeUnreachables[m_currentFunction].insert(_var);
+						if (!util::contains(fakeUnreachables[m_currentFunction], _var))
+							fakeUnreachables[m_currentFunction].emplace_back(_var);
 				}
 				void operator()(VariableDeclaration const& _varDecl) override
 				{
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/connected.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/connected.yul
index 82ab48a513..99e92c183e 100644
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/connected.yul
+++ b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/connected.yul
@@ -36,13 +36,13 @@
 //     }
 //     function f() -> x
 //     {
-//         mstore(0x20, 0)
-//         mstore(0x20, 42)
+//         mstore(0x40, 0)
+//         mstore(0x40, 42)
 //         let $x3_4, $x4_5 := g()
 //         mstore(0x00, $x4_5)
-//         mstore(0x40, $x3_4)
-//         x := mul(add(mload(0x20), mload(0x40)), h(mload(0x00)))
-//         sstore(mload(0x40), mload(0x00))
+//         mstore(0x20, $x3_4)
+//         x := mul(add(mload(0x40), mload(0x20)), h(mload(0x00)))
+//         sstore(mload(0x20), mload(0x00))
 //     }
 //     function h(v) -> a_1
 //     {
diff --git a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/stub.yul b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/stub.yul
index d2fcb116ea..e86619e464 100644
--- a/test/libyul/yulOptimizerTests/fakeStackLimitEvader/stub.yul
+++ b/test/libyul/yulOptimizerTests/fakeStackLimitEvader/stub.yul
@@ -30,10 +30,10 @@
 //     mstore(0x40, memoryguard(0x80))
 //     function f()
 //     {
-//         mstore(0x40, 0)
-//         mstore(0x60, 42)
-//         sstore(mload(0x40), mload(0x60))
-//         mstore(0x40, 21)
+//         mstore(0x60, 0)
+//         mstore(0x40, 42)
+//         sstore(mload(0x60), mload(0x40))
+//         mstore(0x60, 21)
 //     }
 //     function g(gx)
 //     {
@@ -60,9 +60,9 @@
 //     {
 //         let $hx_9, $hy_10, $hz_11, $hw_12 := tuple4()
 //         mstore(0x00, $hw_12)
-//         mstore(0x60, $hz_11)
+//         mstore(0x20, $hz_11)
 //         mstore(0x40, $hy_10)
-//         mstore(0x20, $hx_9)
+//         mstore(0x60, $hx_9)
 //         {
 //             let hx_13, $hy_14, hz_15, $hw_16 := tuple4()
 //             mstore(0x00, $hw_16)
@@ -73,7 +73,7 @@
 //         {
 //             let $hx_17, $hy_18, hz_19, hw_20 := tuple4()
 //             mstore(0x40, $hy_18)
-//             mstore(0x20, $hx_17)
+//             mstore(0x60, $hx_17)
 //             hw := hw_20
 //             hz := hz_19
 //         }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_14.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_14.yul
index 74c74e36f3..02614c492d 100644
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_14.yul
+++ b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_14.yul
@@ -39,17 +39,17 @@
 //         mstore(0x0140, b12)
 //         mstore(0x0120, b13)
 //         mstore(0x0100, b14)
-//         mstore(0xc0, b17)
-//         mstore(0xa0, b18)
-//         mstore(0x80, b19)
-//         mstore(0xe0, b29)
+//         mstore(0xe0, b17)
+//         mstore(0xc0, b18)
+//         mstore(0xa0, b19)
+//         mstore(0x80, b29)
 //         sstore(0, mload(0x0100))
 //         sstore(1, b15)
 //         sstore(2, b16)
-//         sstore(3, mload(0xc0))
-//         sstore(4, mload(0xa0))
-//         sstore(5, mload(0x80))
-//         sstore(6, mload(0xe0))
-//         v := add(mload(0x02a0), mload(0xe0))
+//         sstore(3, mload(0xe0))
+//         sstore(4, mload(0xc0))
+//         sstore(5, mload(0xa0))
+//         sstore(6, mload(0x80))
+//         v := add(mload(0x02a0), mload(0x80))
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_15.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_15.yul
index 8df48f3768..9ce9be70ab 100644
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_15.yul
+++ b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_15.yul
@@ -42,20 +42,20 @@
 //         mstore(0x0160, b13)
 //         mstore(0x0140, b14)
 //         mstore(0x0120, b15)
-//         mstore(0xc0, b17)
-//         mstore(0xa0, b18)
-//         mstore(0x80, b19)
-//         mstore(0xe0, b29)
-//         mstore(0x0100, b30)
+//         mstore(0x0100, b17)
+//         mstore(0xe0, b18)
+//         mstore(0xc0, b19)
+//         mstore(0xa0, b29)
+//         mstore(0x80, b30)
 //         sstore(0, mload(0x0140))
 //         sstore(1, mload(0x0120))
 //         sstore(2, b16)
-//         sstore(3, mload(0xc0))
-//         sstore(4, mload(0xa0))
-//         sstore(5, mload(0x80))
-//         sstore(6, mload(0xe0))
-//         sstore(7, mload(0x0100))
-//         v := mload(0x0100)
-//         sstore(mload(0x02e0), mload(0x0100))
+//         sstore(3, mload(0x0100))
+//         sstore(4, mload(0xe0))
+//         sstore(5, mload(0xc0))
+//         sstore(6, mload(0xa0))
+//         sstore(7, mload(0x80))
+//         v := mload(0x80)
+//         sstore(mload(0x02e0), mload(0x80))
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_16.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_16.yul
index 42e1aabc26..5a3b3454c5 100644
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_16.yul
+++ b/test/libyul/yulOptimizerTests/stackLimitEvader/too_many_args_16.yul
@@ -43,21 +43,21 @@
 //         mstore(0x0180, b14)
 //         mstore(0x0160, b15)
 //         mstore(0x0140, b16)
-//         mstore(0xc0, b17)
-//         mstore(0xa0, b18)
-//         mstore(0x80, b19)
-//         mstore(0xe0, b29)
-//         mstore(0x0120, b30)
-//         mstore(0x0100, b31)
+//         mstore(0x0120, b17)
+//         mstore(0x0100, b18)
+//         mstore(0xe0, b19)
+//         mstore(0xc0, b29)
+//         mstore(0xa0, b30)
+//         mstore(0x80, b31)
 //         sstore(0, mload(0x0180))
 //         sstore(1, mload(0x0160))
 //         sstore(2, mload(0x0140))
-//         sstore(3, mload(0xc0))
-//         sstore(4, mload(0xa0))
-//         sstore(5, mload(0x80))
-//         sstore(6, mload(0xe0))
-//         sstore(7, mload(0x0120))
-//         sstore(8, mload(0x0100))
-//         v := add(mload(0x0320), mload(0x0100))
+//         sstore(3, mload(0x0120))
+//         sstore(4, mload(0x0100))
+//         sstore(5, mload(0xe0))
+//         sstore(6, mload(0xc0))
+//         sstore(7, mload(0xa0))
+//         sstore(8, mload(0x80))
+//         v := add(mload(0x0320), mload(0x80))
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments.yul
index cb4d692690..bde030f68e 100644
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments.yul
+++ b/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments.yul
@@ -39,8 +39,8 @@
 //         mstore(0x0140, 7)
 //         mstore(0x0160, 8)
 //         mstore(0x0180, 9)
-//         mstore(0x01c0, 10)
-//         mstore(0x01a0, 11)
+//         mstore(0x01a0, 10)
+//         mstore(0x01c0, 11)
 //         mstore(0x01e0, 12)
 //         let a_13 := 13
 //         let a_14 := 14
@@ -50,6 +50,6 @@
 //         let a_18 := 18
 //         let a_19 := 19
 //         let a_20 := 20
-//         verbatim_20i_0o("test", mload(0x80), mload(0xa0), mload(0xc0), mload(0xe0), mload(0x0100), mload(0x0120), mload(0x0140), mload(0x0160), mload(0x0180), mload(0x01c0), mload(0x01a0), mload(0x01e0), a_13, a_14, a_15, a_16, a_17, a_18, a_19, a_20)
+//         verbatim_20i_0o("test", mload(0x80), mload(0xa0), mload(0xc0), mload(0xe0), mload(0x0100), mload(0x0120), mload(0x0140), mload(0x0160), mload(0x0180), mload(0x01a0), mload(0x01c0), mload(0x01e0), a_13, a_14, a_15, a_16, a_17, a_18, a_19, a_20)
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments_and_returns.yul b/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments_and_returns.yul
index de023e9190..46435dd210 100644
--- a/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments_and_returns.yul
+++ b/test/libyul/yulOptimizerTests/stackLimitEvader/verbatim_many_arguments_and_returns.yul
@@ -51,17 +51,17 @@
 // {
 //     {
 //         mstore(0x40, memoryguard(0x0280))
-//         mstore(0x80, 1)
-//         mstore(0xa0, 2)
-//         mstore(0xc0, 3)
-//         mstore(0xe0, 4)
-//         mstore(0x0100, 5)
-//         mstore(0x0120, 6)
-//         mstore(0x0140, 7)
-//         mstore(0x0160, 8)
-//         mstore(0x0180, 9)
-//         mstore(0x0240, 10)
-//         mstore(0x0220, 11)
+//         mstore(0x0100, 1)
+//         mstore(0x0120, 2)
+//         mstore(0x0140, 3)
+//         mstore(0x0160, 4)
+//         mstore(0x0180, 5)
+//         mstore(0x01a0, 6)
+//         mstore(0x01c0, 7)
+//         mstore(0x01e0, 8)
+//         mstore(0x0200, 9)
+//         mstore(0x0220, 10)
+//         mstore(0x0240, 11)
 //         mstore(0x0260, 12)
 //         let a_13 := 13
 //         let a_14 := 14
@@ -71,11 +71,11 @@
 //         let a_18 := 18
 //         let a_19 := 19
 //         let a_20 := 20
-//         let b_1_1, b_2_2, b_3_3, b_4_4, b_5_5, b_6_6, b_7_7, b_8_8, b_9_9, b_10_10, b_11_11, b_12_12, b_13_13, b_14_14, b_15_15, b_16_16, b_17_17, b_18_18, b_19_19, b_20_20 := verbatim_20i_20o("test", mload(0x80), mload(0xa0), mload(0xc0), mload(0xe0), mload(0x0100), mload(0x0120), mload(0x0140), mload(0x0160), mload(0x0180), mload(0x0240), mload(0x0220), mload(0x0260), a_13, a_14, a_15, a_16, a_17, a_18, a_19, a_20)
-//         mstore(0x01a0, b_4_4)
-//         mstore(0x01c0, b_3_3)
-//         mstore(0x01e0, b_2_2)
-//         mstore(0x0200, b_1_1)
+//         let b_1_1, b_2_2, b_3_3, b_4_4, b_5_5, b_6_6, b_7_7, b_8_8, b_9_9, b_10_10, b_11_11, b_12_12, b_13_13, b_14_14, b_15_15, b_16_16, b_17_17, b_18_18, b_19_19, b_20_20 := verbatim_20i_20o("test", mload(0x0100), mload(0x0120), mload(0x0140), mload(0x0160), mload(0x0180), mload(0x01a0), mload(0x01c0), mload(0x01e0), mload(0x0200), mload(0x0220), mload(0x0240), mload(0x0260), a_13, a_14, a_15, a_16, a_17, a_18, a_19, a_20)
+//         mstore(0x80, b_4_4)
+//         mstore(0xa0, b_3_3)
+//         mstore(0xc0, b_2_2)
+//         mstore(0xe0, b_1_1)
 //         let b_20 := b_20_20
 //         let b_19 := b_19_19
 //         let b_18 := b_18_18
@@ -92,10 +92,10 @@
 //         let b_7 := b_7_7
 //         let b_6 := b_6_6
 //         let b_5 := b_5_5
-//         sstore(1, mload(0x0200))
-//         sstore(2, mload(0x01e0))
-//         sstore(3, mload(0x01c0))
-//         sstore(4, mload(0x01a0))
+//         sstore(1, mload(0xe0))
+//         sstore(2, mload(0xc0))
+//         sstore(3, mload(0xa0))
+//         sstore(4, mload(0x80))
 //         sstore(5, b_5)
 //         sstore(6, b_6)
 //         sstore(7, b_7)

From 28573dc71b01275a11914260c3a203b5070b5fc4 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 14 Jun 2023 09:36:40 +0200
Subject: [PATCH 1438/1748] Workaround open-zeppelin expectRevertCustomError
 bug

---
 test/externalTests/zeppelin.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index a8d72e82a2..5c02711251 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -88,6 +88,12 @@ function zeppelin_test
     sed -i "s|it(\('does not allow remote callback'\)|it.skip(\1|g" test/security/ReentrancyGuard.test.js
     sed -i "s|shouldBehaveLikeAccessControlDefaultAdminRules|\/\/&|" test/access/AccessControlDefaultAdminRules.test.js
 
+    # TODO: Remove when hardhat properly handle reverts of custom errors with via-ir enabled
+    # and/or open-zeppelin fix https://github.com/OpenZeppelin/openzeppelin-contracts/issues/4349
+    sed -i "s|it(\('cannot nest reinitializers'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
+    sed -i "s|it(\('prevents re-initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
+    sed -i "s|it(\('can lock contract after initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
+
     # Here only the testToInt(248) and testToInt(256) cases fail so change the loop range to skip them
     sed -i "s|range(8, 256, 8)\(.forEach(bits => testToInt(bits));\)|range(8, 240, 8)\1|" test/utils/math/SafeCast.test.js
 

From aa012233987ec493a979fe8cc73081262e75b1f0 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 13 Jun 2023 15:21:26 +0200
Subject: [PATCH 1439/1748] Account for unassigned return variables in stack
 layout generation.

---
 libyul/backends/evm/StackLayoutGenerator.cpp  | 33 +++++++++++++------
 libyul/backends/evm/StackLayoutGenerator.h    |  3 +-
 .../unassigned_return_variable.yul            | 19 +++++++++++
 3 files changed, 44 insertions(+), 11 deletions(-)
 create mode 100644 test/libyul/evmCodeTransform/unassigned_return_variable.yul

diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index 2d5cdde87f..71bf19458b 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -51,10 +51,10 @@ using namespace std;
 StackLayout StackLayoutGenerator::run(CFG const& _cfg)
 {
 	StackLayout stackLayout;
-	StackLayoutGenerator{stackLayout}.processEntryPoint(*_cfg.entry);
+	StackLayoutGenerator{stackLayout, nullptr}.processEntryPoint(*_cfg.entry);
 
 	for (auto& functionInfo: _cfg.functionInfo | ranges::views::values)
-		StackLayoutGenerator{stackLayout}.processEntryPoint(*functionInfo.entry, &functionInfo);
+		StackLayoutGenerator{stackLayout, &functionInfo}.processEntryPoint(*functionInfo.entry, &functionInfo);
 
 	return stackLayout;
 }
@@ -83,13 +83,15 @@ vector<StackLayoutGenerator::StackTooDeep> StackLayoutGenerator::reportStackTooD
 		yulAssert(functionInfo, "Function not found.");
 	}
 
-	StackLayoutGenerator generator{stackLayout};
+	StackLayoutGenerator generator{stackLayout, functionInfo};
 	CFG::BasicBlock const* entry = functionInfo ? functionInfo->entry : _cfg.entry;
 	generator.processEntryPoint(*entry);
 	return generator.reportStackTooDeep(*entry);
 }
 
-StackLayoutGenerator::StackLayoutGenerator(StackLayout& _layout): m_layout(_layout)
+StackLayoutGenerator::StackLayoutGenerator(StackLayout& _layout, CFG::FunctionInfo const* _functionInfo):
+	m_layout(_layout),
+	m_currentFunctionInfo(_functionInfo)
 {
 }
 
@@ -740,7 +742,7 @@ void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block, CFG::Functi
 		});
 	};
 	/// @returns the number of operations required to transform @a _source to @a _target.
-	auto evaluateTransform = [](Stack _source, Stack const& _target) -> size_t {
+	auto evaluateTransform = [&](Stack _source, Stack const& _target) -> size_t {
 		size_t opGas = 0;
 		auto swap = [&](unsigned _swapDepth)
 		{
@@ -755,12 +757,23 @@ void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block, CFG::Functi
 				opGas += evmasm::GasMeter::runGas(evmasm::pushInstruction(32), langutil::EVMVersion());
 			else
 			{
-				auto depth = util::findOffset(_source | ranges::views::reverse, _slot);
-				yulAssert(depth);
-				if (*depth < 16)
-					opGas += evmasm::GasMeter::runGas(evmasm::dupInstruction(static_cast<unsigned>(*depth + 1)), langutil::EVMVersion());
+				if (auto depth = util::findOffset(_source | ranges::views::reverse, _slot))
+				{
+					if (*depth < 16)
+						opGas += evmasm::GasMeter::runGas(evmasm::dupInstruction(static_cast<unsigned>(*depth + 1)), langutil::EVMVersion());
+					else
+						opGas += 1000;
+				}
 				else
-					opGas += 1000;
+				{
+					// This has to be a previously unassigned return variable.
+					// We at least sanity-check that it is among the return variables at all.
+					yulAssert(m_currentFunctionInfo && holds_alternative<VariableSlot>(_slot));
+					yulAssert(util::contains(m_currentFunctionInfo->returnVariables, get<VariableSlot>(_slot)));
+					// Strictly speaking the cost of the PUSH0 depends on the targeted EVM version, but the difference
+					// will not matter here.
+					opGas += evmasm::GasMeter::runGas(evmasm::pushInstruction(0), langutil::EVMVersion());;
+				}
 			}
 		};
 		auto pop = [&]() { opGas += evmasm::GasMeter::runGas(evmasm::Instruction::POP,langutil::EVMVersion()); };
diff --git a/libyul/backends/evm/StackLayoutGenerator.h b/libyul/backends/evm/StackLayoutGenerator.h
index 40b554cd60..d04b80bdc0 100644
--- a/libyul/backends/evm/StackLayoutGenerator.h
+++ b/libyul/backends/evm/StackLayoutGenerator.h
@@ -66,7 +66,7 @@ class StackLayoutGenerator
 	static std::vector<StackTooDeep> reportStackTooDeep(CFG const& _cfg, YulString _functionName);
 
 private:
-	StackLayoutGenerator(StackLayout& _context);
+	StackLayoutGenerator(StackLayout& _context, CFG::FunctionInfo const* _functionInfo);
 
 	/// @returns the optimal entry stack layout, s.t. @a _operation can be applied to it and
 	/// the result can be transformed to @a _exitStack with minimal stack shuffling.
@@ -115,6 +115,7 @@ class StackLayoutGenerator
 	void fillInJunk(CFG::BasicBlock const& _block, CFG::FunctionInfo const* _functionInfo = nullptr);
 
 	StackLayout& m_layout;
+	CFG::FunctionInfo const* m_currentFunctionInfo = nullptr;
 };
 
 }
diff --git a/test/libyul/evmCodeTransform/unassigned_return_variable.yul b/test/libyul/evmCodeTransform/unassigned_return_variable.yul
new file mode 100644
index 0000000000..666fefe1aa
--- /dev/null
+++ b/test/libyul/evmCodeTransform/unassigned_return_variable.yul
@@ -0,0 +1,19 @@
+{
+  // This used to throw during stack layout generation.
+  function g(b,s) -> y {
+    y := g(b, g(y, s))
+  }
+}
+// ====
+// stackOptimization: true
+// ----
+//     /* "":0:111   */
+//   stop
+//     /* "":60:109   */
+// tag_1:
+//   pop
+//     /* "":99:100   */
+//   0x00
+//     /* "":97:104   */
+//   tag_1
+//   jump	// in

From f4217bdc2c566ee986a622f7acfb0b97df101dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 13 Jun 2023 13:09:28 +0200
Subject: [PATCH 1440/1748] Fix Bash syntax error that shows up in CLI tests
 when updating expectations

---
 test/cmdlineTests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 0731fc5b2c..3edcc5db37 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -115,7 +115,7 @@ function update_expectation {
     local newExpectation="${1}"
     local expectationFile="${2}"
 
-    if [[ $newExpectation == "" || $newExpectation -eq 0 && $expectationFile == */exit ]]
+    if [[ $newExpectation == '' || $newExpectation == '0' && $expectationFile == */exit ]]
     then
         if [[ -f $expectationFile ]]
         then

From 0713adde0454af92bb8ac052050f6df682976c6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 13 Jun 2023 11:27:35 +0200
Subject: [PATCH 1441/1748] Fix bad indentation in handleCombinedJSON()

---
 solc/CommandLineInterface.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index ae6888dfd2..7a28900b32 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -914,9 +914,9 @@ void CommandLineInterface::handleCombinedJSON()
 		{
 			output[g_strSources][sourceCode.first] = Json::Value(Json::objectValue);
 			output[g_strSources][sourceCode.first]["AST"] = ASTJsonExporter(
-																m_compiler->state(),
-																m_compiler->sourceIndices()
-															).toJson(m_compiler->ast(sourceCode.first));
+				m_compiler->state(),
+				m_compiler->sourceIndices()
+			).toJson(m_compiler->ast(sourceCode.first));
 			output[g_strSources][sourceCode.first]["id"] = m_compiler->sourceIndices().at(sourceCode.first);
 		}
 	}

From f8a1af8bd539cd4d72c233403c38b1822e7daf7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 13 Jun 2023 15:47:03 +0200
Subject: [PATCH 1442/1748] CommandLineParser: Fix some outputs not being
 properly disallowed with --stop-after parsing

---
 Changelog.md                                   |  1 +
 solc/CommandLineParser.cpp                     | 18 ++++--------------
 test/cmdlineTests/stop_after_parsing_abi/args  |  1 +
 test/cmdlineTests/stop_after_parsing_abi/err   |  1 +
 test/cmdlineTests/stop_after_parsing_abi/exit  |  1 +
 .../stop_after_parsing_abi/input.sol           |  8 ++++++++
 6 files changed, 16 insertions(+), 14 deletions(-)
 create mode 100644 test/cmdlineTests/stop_after_parsing_abi/args
 create mode 100644 test/cmdlineTests/stop_after_parsing_abi/err
 create mode 100644 test/cmdlineTests/stop_after_parsing_abi/exit
 create mode 100644 test/cmdlineTests/stop_after_parsing_abi/input.sol

diff --git a/Changelog.md b/Changelog.md
index c5625d9dbc..c8f0789f8e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -15,6 +15,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Commandline Interface: Fix internal error when using ``--stop-after parsing`` and requesting some of the outputs that require full analysis or compilation.
  * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
  * SMTChecker: Fix false negative when a verification target can be violated only by trusted external call from another public function.
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 9cc93d78da..dda7a6ba2b 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -997,21 +997,11 @@ void CommandLineParser::processArgs()
 		return;
 
 	checkMutuallyExclusive({g_strColor, g_strNoColor});
+	checkMutuallyExclusive({g_strStopAfter, g_strGas});
 
-	array<string, 9> const conflictingWithStopAfter{
-		CompilerOutputs::componentName(&CompilerOutputs::binary),
-		CompilerOutputs::componentName(&CompilerOutputs::ir),
-		CompilerOutputs::componentName(&CompilerOutputs::irAstJson),
-		CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
-		CompilerOutputs::componentName(&CompilerOutputs::irOptimizedAstJson),
-		g_strGas,
-		CompilerOutputs::componentName(&CompilerOutputs::asm_),
-		CompilerOutputs::componentName(&CompilerOutputs::asmJson),
-		CompilerOutputs::componentName(&CompilerOutputs::opcodes),
-	};
-
-	for (auto& option: conflictingWithStopAfter)
-		checkMutuallyExclusive({g_strStopAfter, option});
+	for (string const& option: CompilerOutputs::componentMap() | ranges::views::keys)
+		if (option != CompilerOutputs::componentName(&CompilerOutputs::astCompactJson))
+			checkMutuallyExclusive({g_strStopAfter, option});
 
 	if (
 		m_options.input.mode != InputMode::Compiler &&
diff --git a/test/cmdlineTests/stop_after_parsing_abi/args b/test/cmdlineTests/stop_after_parsing_abi/args
new file mode 100644
index 0000000000..9ec9f63e43
--- /dev/null
+++ b/test/cmdlineTests/stop_after_parsing_abi/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4 --stop-after parsing --abi
diff --git a/test/cmdlineTests/stop_after_parsing_abi/err b/test/cmdlineTests/stop_after_parsing_abi/err
new file mode 100644
index 0000000000..9beceafe7b
--- /dev/null
+++ b/test/cmdlineTests/stop_after_parsing_abi/err
@@ -0,0 +1 @@
+The following options are mutually exclusive: --stop-after, --abi. Select at most one.
diff --git a/test/cmdlineTests/stop_after_parsing_abi/exit b/test/cmdlineTests/stop_after_parsing_abi/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/stop_after_parsing_abi/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/stop_after_parsing_abi/input.sol b/test/cmdlineTests/stop_after_parsing_abi/input.sol
new file mode 100644
index 0000000000..978517b3c2
--- /dev/null
+++ b/test/cmdlineTests/stop_after_parsing_abi/input.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+import "A";
+
+contract C {
+    function f() public {}
+}

From e87333f20f729df2a1c6f398708bfc9f6b8e5138 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 13 Jun 2023 12:33:05 +0200
Subject: [PATCH 1443/1748] More CLI tests for --stop-after parsing

---
 .../args                                      |  1 +
 .../in.sol                                    |  6 +++
 .../input.json                                | 12 +++++
 .../output.json                               | 54 +++++++++++++++++++
 .../args                                      |  1 +
 .../in.sol                                    |  6 +++
 .../input.json                                | 12 +++++
 .../output.json                               | 12 +++++
 .../args                                      |  1 +
 .../in.sol                                    |  8 +++
 .../input.json                                | 19 +++++++
 .../output.json                               |  9 ++++
 test/cmdlineTests/stop_after_parsing_ast/args |  1 +
 .../stop_after_parsing_ast/input.sol          |  6 +++
 .../stop_after_parsing_ast/output             | 48 +++++++++++++++++
 15 files changed, 196 insertions(+)
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_ast_requested/args
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_ast_requested/in.sol
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_ast_requested/input.json
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/args
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/in.sol
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/input.json
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/args
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/in.sol
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/input.json
 create mode 100644 test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/output.json
 create mode 100644 test/cmdlineTests/stop_after_parsing_ast/args
 create mode 100644 test/cmdlineTests/stop_after_parsing_ast/input.sol
 create mode 100644 test/cmdlineTests/stop_after_parsing_ast/output

diff --git a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/args b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/args
new file mode 100644
index 0000000000..18532c5a6d
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/args
@@ -0,0 +1 @@
+--allow-paths .
diff --git a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/in.sol b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/in.sol
new file mode 100644
index 0000000000..e78a24ff78
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+import "A";
+
+contract C {}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/input.json b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/input.json
new file mode 100644
index 0000000000..34f1574950
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/input.json
@@ -0,0 +1,12 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_stop_after_parsing_ast_requested/in.sol"]}
+	},
+	"settings": {
+		"stopAfter": "parsing",
+		"outputSelection": {
+			"*": {"": ["ast"]}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json
new file mode 100644
index 0000000000..6907d4780f
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_ast_requested/output.json
@@ -0,0 +1,54 @@
+{
+    "sources":
+    {
+        "C":
+        {
+            "ast":
+            {
+                "absolutePath": "C",
+                "id": 4,
+                "license": "GPL-3.0",
+                "nodeType": "SourceUnit",
+                "nodes":
+                [
+                    {
+                        "id": 1,
+                        "literals":
+                        [
+                            "solidity",
+                            "*"
+                        ],
+                        "nodeType": "PragmaDirective",
+                        "src": "36:18:0"
+                    },
+                    {
+                        "absolutePath": "A",
+                        "file": "A",
+                        "id": 2,
+                        "nameLocation": "-1:-1:-1",
+                        "nodeType": "ImportDirective",
+                        "src": "56:11:0",
+                        "symbolAliases": [],
+                        "unitAlias": ""
+                    },
+                    {
+                        "abstract": false,
+                        "baseContracts": [],
+                        "contractDependencies": [],
+                        "contractKind": "contract",
+                        "id": 3,
+                        "name": "C",
+                        "nameLocation": "78:1:0",
+                        "nodeType": "ContractDefinition",
+                        "nodes": [],
+                        "src": "69:13:0",
+                        "usedErrors": [],
+                        "usedEvents": []
+                    }
+                ],
+                "src": "36:47:0"
+            },
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/args b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/args
new file mode 100644
index 0000000000..18532c5a6d
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/args
@@ -0,0 +1 @@
+--allow-paths .
diff --git a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/in.sol b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/in.sol
new file mode 100644
index 0000000000..e78a24ff78
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+import "A";
+
+contract C {}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/input.json b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/input.json
new file mode 100644
index 0000000000..7ef3d37fd3
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/input.json
@@ -0,0 +1,12 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_stop_after_parsing_bytecode_requested/in.sol"]}
+	},
+	"settings": {
+		"stopAfter": "parsing",
+		"outputSelection": {
+			"*": {"*": ["evm.bytecode.object"]}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json
new file mode 100644
index 0000000000..3719530963
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_bytecode_requested/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Requested output selection conflicts with \"settings.stopAfter\".",
+            "message": "Requested output selection conflicts with \"settings.stopAfter\".",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/args b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/args
new file mode 100644
index 0000000000..18532c5a6d
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/args
@@ -0,0 +1 @@
+--allow-paths .
diff --git a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/in.sol b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/in.sol
new file mode 100644
index 0000000000..978517b3c2
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/in.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+import "A";
+
+contract C {
+    function f() public {}
+}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/input.json b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/input.json
new file mode 100644
index 0000000000..ac4d623c71
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/input.json
@@ -0,0 +1,19 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_stop_after_parsing_non_binary_output_requested/in.sol"]}
+	},
+	"settings": {
+		"stopAfter": "parsing",
+		"outputSelection": {
+			"*": {"*": [
+				"abi",
+				"devdoc",
+				"userdoc",
+				"metadata",
+				"storageLayout",
+				"evm.methodIdentifiers"
+			]}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/output.json b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/output.json
new file mode 100644
index 0000000000..5b64763be8
--- /dev/null
+++ b/test/cmdlineTests/standard_stop_after_parsing_non_binary_output_requested/output.json
@@ -0,0 +1,9 @@
+{
+    "sources":
+    {
+        "C":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/stop_after_parsing_ast/args b/test/cmdlineTests/stop_after_parsing_ast/args
new file mode 100644
index 0000000000..72df9974ab
--- /dev/null
+++ b/test/cmdlineTests/stop_after_parsing_ast/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4 --stop-after parsing --ast-compact-json
diff --git a/test/cmdlineTests/stop_after_parsing_ast/input.sol b/test/cmdlineTests/stop_after_parsing_ast/input.sol
new file mode 100644
index 0000000000..e78a24ff78
--- /dev/null
+++ b/test/cmdlineTests/stop_after_parsing_ast/input.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+import "A";
+
+contract C {}
diff --git a/test/cmdlineTests/stop_after_parsing_ast/output b/test/cmdlineTests/stop_after_parsing_ast/output
new file mode 100644
index 0000000000..1639418604
--- /dev/null
+++ b/test/cmdlineTests/stop_after_parsing_ast/output
@@ -0,0 +1,48 @@
+JSON AST (compact format):
+
+
+======= stop_after_parsing_ast/input.sol =======
+{
+    "absolutePath": "stop_after_parsing_ast/input.sol",
+    "id": 4,
+    "license": "GPL-3.0",
+    "nodeType": "SourceUnit",
+    "nodes":
+    [
+        {
+            "id": 1,
+            "literals":
+            [
+                "solidity",
+                "*"
+            ],
+            "nodeType": "PragmaDirective",
+            "src": "36:18:0"
+        },
+        {
+            "absolutePath": "A",
+            "file": "A",
+            "id": 2,
+            "nameLocation": "-1:-1:-1",
+            "nodeType": "ImportDirective",
+            "src": "56:11:0",
+            "symbolAliases": [],
+            "unitAlias": ""
+        },
+        {
+            "abstract": false,
+            "baseContracts": [],
+            "contractDependencies": [],
+            "contractKind": "contract",
+            "id": 3,
+            "name": "C",
+            "nameLocation": "78:1:0",
+            "nodeType": "ContractDefinition",
+            "nodes": [],
+            "src": "69:13:0",
+            "usedErrors": [],
+            "usedEvents": []
+        }
+    ],
+    "src": "36:47:0"
+}

From e6b1f5ccee25d47567b1aa03093b43abd03d3a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 14 Jun 2023 09:19:37 +0200
Subject: [PATCH 1444/1748] cmdlineTest.sh: Remove compiler version from
 metadata in Standard JSON output as well

---
 test/cmdlineTests.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 3edcc5db37..e1d8a57468 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -221,6 +221,7 @@ EOF
         # shellcheck disable=SC1003
         sed -i.bak -E -e 's/\\n/\'$'\n/g' "$stdout_path"
         sed -i.bak -e 's/\(^[ ]*auxdata:[[:space:]]\)0x[0-9a-f]*$/\1<AUXDATA REMOVED>/' "$stdout_path"
+        sed -i.bak -e 's/\(\\"version\\":[ ]*\\"\)[^"\\]*\(\\"\)/\1<VERSION REMOVED>\2/' "$stdout_path"
         rm "$stdout_path.bak"
     else
         sed -i.bak -e '/^Warning: This is a pre-release compiler version, please do not use it in production./d' "$stderr_path"

From e45e6cc31dfbdf6479112a8b5f182002f28be6c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 14 Jun 2023 09:11:36 +0200
Subject: [PATCH 1445/1748] CLI tests for metadata output

---
 test/cmdlineTests/metadata/args               |  1 +
 test/cmdlineTests/metadata/input.sol          |  4 ++++
 test/cmdlineTests/metadata/output             |  4 ++++
 test/cmdlineTests/standard_metadata/args      |  1 +
 test/cmdlineTests/standard_metadata/in.sol    |  4 ++++
 .../cmdlineTests/standard_metadata/input.json | 11 +++++++++++
 .../standard_metadata/output.json             | 19 +++++++++++++++++++
 7 files changed, 44 insertions(+)
 create mode 100644 test/cmdlineTests/metadata/args
 create mode 100644 test/cmdlineTests/metadata/input.sol
 create mode 100644 test/cmdlineTests/metadata/output
 create mode 100644 test/cmdlineTests/standard_metadata/args
 create mode 100644 test/cmdlineTests/standard_metadata/in.sol
 create mode 100644 test/cmdlineTests/standard_metadata/input.json
 create mode 100644 test/cmdlineTests/standard_metadata/output.json

diff --git a/test/cmdlineTests/metadata/args b/test/cmdlineTests/metadata/args
new file mode 100644
index 0000000000..5cbfceb472
--- /dev/null
+++ b/test/cmdlineTests/metadata/args
@@ -0,0 +1 @@
+--metadata
diff --git a/test/cmdlineTests/metadata/input.sol b/test/cmdlineTests/metadata/input.sol
new file mode 100644
index 0000000000..a3a86cc8d3
--- /dev/null
+++ b/test/cmdlineTests/metadata/input.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {}
diff --git a/test/cmdlineTests/metadata/output b/test/cmdlineTests/metadata/output
new file mode 100644
index 0000000000..bf1e750c95
--- /dev/null
+++ b/test/cmdlineTests/metadata/output
@@ -0,0 +1,4 @@
+
+======= metadata/input.sol:C =======
+Metadata:
+{"compiler":{"version": "<VERSION REMOVED>"},"language":"Solidity","output":{"abi":[],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"metadata/input.sol":"C"},"evmVersion":"shanghai","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"enabled":false,"runs":200},"remappings":[]},"sources":{"metadata/input.sol":{"keccak256":"0x5cf617b1707a484e3c4bd59643013dec76ab7d75900b46855214729ae3e0ceb0","license":"GPL-3.0","urls":["bzz-raw://ac418a02dfadf87234150d3568f33269e3f49460345cb39300e017a6d755eff2","dweb:/ipfs/QmQq3owBu25x2WV46HB1WyKzJpxiAPecU7eMKqtXCF7eeS"]}},"version":1}
diff --git a/test/cmdlineTests/standard_metadata/args b/test/cmdlineTests/standard_metadata/args
new file mode 100644
index 0000000000..18532c5a6d
--- /dev/null
+++ b/test/cmdlineTests/standard_metadata/args
@@ -0,0 +1 @@
+--allow-paths .
diff --git a/test/cmdlineTests/standard_metadata/in.sol b/test/cmdlineTests/standard_metadata/in.sol
new file mode 100644
index 0000000000..a3a86cc8d3
--- /dev/null
+++ b/test/cmdlineTests/standard_metadata/in.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {}
diff --git a/test/cmdlineTests/standard_metadata/input.json b/test/cmdlineTests/standard_metadata/input.json
new file mode 100644
index 0000000000..ae4bfe8f59
--- /dev/null
+++ b/test/cmdlineTests/standard_metadata/input.json
@@ -0,0 +1,11 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_metadata/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {
+			"*": {"*": ["metadata"]}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_metadata/output.json b/test/cmdlineTests/standard_metadata/output.json
new file mode 100644
index 0000000000..4429466676
--- /dev/null
+++ b/test/cmdlineTests/standard_metadata/output.json
@@ -0,0 +1,19 @@
+{
+    "contracts":
+    {
+        "C":
+        {
+            "C":
+            {
+                "metadata": "{\"compiler\":{\"version\":\"<VERSION REMOVED>\"},\"language\":\"Solidity\",\"output\":{\"abi\":[],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"C\":\"C\"},\"evmVersion\":\"shanghai\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":false,\"runs\":200},\"remappings\":[]},\"sources\":{\"C\":{\"keccak256\":\"0x5cf617b1707a484e3c4bd59643013dec76ab7d75900b46855214729ae3e0ceb0\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://ac418a02dfadf87234150d3568f33269e3f49460345cb39300e017a6d755eff2\",\"dweb:/ipfs/QmQq3owBu25x2WV46HB1WyKzJpxiAPecU7eMKqtXCF7eeS\"]}},\"version\":1}"
+            }
+        }
+    },
+    "sources":
+    {
+        "C":
+        {
+            "id": 0
+        }
+    }
+}

From f50820fcae4a387f1c74d0b55ac2afc6adde2f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 14 Jun 2023 08:47:45 +0200
Subject: [PATCH 1446/1748] Tests checking outputs produced in presence of
 errors

---
 .../args                                      |   1 +
 .../in.sol                                    |   8 +
 .../input.json                                |  14 +
 .../output.json                               |  26 ++
 .../args                                      |   1 +
 .../in.sol                                    |   6 +
 .../input.json                                |  14 +
 .../output.json                               | 127 ++++++++
 .../args                                      |   1 +
 .../in.sol                                    |   9 +
 .../input.json                                |  14 +
 .../output.json                               |  26 ++
 .../args                                      |   1 +
 .../in.sol                                    |  13 +
 .../input.json                                |  15 +
 .../output.json                               | 280 ++++++++++++++++++
 .../standard_outputs_on_parsing_error/args    |   1 +
 .../standard_outputs_on_parsing_error/in.sol  |   5 +
 .../input.json                                |  14 +
 .../output.json                               |  26 ++
 20 files changed, 602 insertions(+)
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_fatal/args
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_fatal/in.sol
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_fatal/input.json
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/args
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/in.sol
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/input.json
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/args
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/in.sol
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/input.json
 create mode 100644 test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/output.json
 create mode 100644 test/cmdlineTests/standard_outputs_on_compilation_error/args
 create mode 100644 test/cmdlineTests/standard_outputs_on_compilation_error/in.sol
 create mode 100644 test/cmdlineTests/standard_outputs_on_compilation_error/input.json
 create mode 100644 test/cmdlineTests/standard_outputs_on_compilation_error/output.json
 create mode 100644 test/cmdlineTests/standard_outputs_on_parsing_error/args
 create mode 100644 test/cmdlineTests/standard_outputs_on_parsing_error/in.sol
 create mode 100644 test/cmdlineTests/standard_outputs_on_parsing_error/input.json
 create mode 100644 test/cmdlineTests/standard_outputs_on_parsing_error/output.json

diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/args b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/args
new file mode 100644
index 0000000000..18532c5a6d
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/args
@@ -0,0 +1 @@
+--allow-paths .
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/in.sol b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/in.sol
new file mode 100644
index 0000000000..b31d640322
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/in.sol
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {
+    // This will trigger a fatal error at the analysis stage, of the kind that terminates analysis
+    // immediately without letting the current step finish.
+    constructor(uint[] storage) {}
+}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/input.json b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/input.json
new file mode 100644
index 0000000000..b640f033dc
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/input.json
@@ -0,0 +1,14 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_outputs_on_analysis_error_fatal/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {
+			"*": {
+				"*": ["*"],
+				"": ["*"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json
new file mode 100644
index 0000000000..51d12668fb
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal/output.json
@@ -0,0 +1,26 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "3644",
+            "formattedMessage": "TypeError: This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.
+ --> C:7:17:
+  |
+7 |     constructor(uint[] storage) {}
+  |                 ^^^^^^^^^^^^^^
+
+",
+            "message": "This parameter has a type that can only be used internally. You can make the contract abstract to avoid this problem.",
+            "severity": "error",
+            "sourceLocation":
+            {
+                "end": 258,
+                "file": "C",
+                "start": 244
+            },
+            "type": "TypeError"
+        }
+    ],
+    "sources": {}
+}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/args b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/args
new file mode 100644
index 0000000000..18532c5a6d
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/args
@@ -0,0 +1 @@
+--allow-paths .
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/in.sol b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/in.sol
new file mode 100644
index 0000000000..6c8bb3938b
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+// This will trigger a fatal error at the analysis stage, of the kind that lets the current
+// analysis steps finish but terminates analysis after immediately after that step.
+function f(uint immutable x) {}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/input.json b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/input.json
new file mode 100644
index 0000000000..0214e00e84
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/input.json
@@ -0,0 +1,14 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_outputs_on_analysis_error_fatal_after_current_step/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {
+			"*": {
+				"*": ["*"],
+				"": ["*"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json
new file mode 100644
index 0000000000..29f3228a7d
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json
@@ -0,0 +1,127 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "8297",
+            "formattedMessage": "DeclarationError: The \"immutable\" keyword can only be used for state variables.
+ --> C:6:12:
+  |
+6 | function f(uint immutable x) {}
+  |            ^^^^^^^^^^^^^^^^
+
+",
+            "message": "The \"immutable\" keyword can only be used for state variables.",
+            "severity": "error",
+            "sourceLocation":
+            {
+                "end": 259,
+                "file": "C",
+                "start": 243
+            },
+            "type": "DeclarationError"
+        }
+    ],
+    "sources":
+    {
+        "C":
+        {
+            "ast":
+            {
+                "absolutePath": "C",
+                "exportedSymbols":
+                {
+                    "f":
+                    [
+                        7
+                    ]
+                },
+                "id": 8,
+                "license": "GPL-3.0",
+                "nodeType": "SourceUnit",
+                "nodes":
+                [
+                    {
+                        "id": 1,
+                        "literals":
+                        [
+                            "solidity",
+                            "*"
+                        ],
+                        "nodeType": "PragmaDirective",
+                        "src": "36:18:0"
+                    },
+                    {
+                        "body":
+                        {
+                            "id": 6,
+                            "nodeType": "Block",
+                            "src": "261:2:0",
+                            "statements": []
+                        },
+                        "id": 7,
+                        "implemented": true,
+                        "kind": "freeFunction",
+                        "modifiers": [],
+                        "name": "f",
+                        "nameLocation": "241:1:0",
+                        "nodeType": "FunctionDefinition",
+                        "parameters":
+                        {
+                            "id": 4,
+                            "nodeType": "ParameterList",
+                            "parameters":
+                            [
+                                {
+                                    "constant": false,
+                                    "id": 3,
+                                    "mutability": "immutable",
+                                    "name": "x",
+                                    "nameLocation": "258:1:0",
+                                    "nodeType": "VariableDeclaration",
+                                    "scope": 7,
+                                    "src": "243:16:0",
+                                    "stateVariable": false,
+                                    "storageLocation": "default",
+                                    "typeDescriptions":
+                                    {
+                                        "typeIdentifier": "t_uint256",
+                                        "typeString": "uint256"
+                                    },
+                                    "typeName":
+                                    {
+                                        "id": 2,
+                                        "name": "uint",
+                                        "nodeType": "ElementaryTypeName",
+                                        "src": "243:4:0",
+                                        "typeDescriptions":
+                                        {
+                                            "typeIdentifier": "t_uint256",
+                                            "typeString": "uint256"
+                                        }
+                                    },
+                                    "visibility": "internal"
+                                }
+                            ],
+                            "src": "242:18:0"
+                        },
+                        "returnParameters":
+                        {
+                            "id": 5,
+                            "nodeType": "ParameterList",
+                            "parameters": [],
+                            "src": "261:0:0"
+                        },
+                        "scope": 8,
+                        "src": "232:31:0",
+                        "stateMutability": "nonpayable",
+                        "virtual": false,
+                        "visibility": "internal"
+                    }
+                ],
+                "src": "36:228:0"
+            },
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/args b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/args
new file mode 100644
index 0000000000..18532c5a6d
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/args
@@ -0,0 +1 @@
+--allow-paths .
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/in.sol b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/in.sol
new file mode 100644
index 0000000000..050f5ad436
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/in.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {
+    // This will trigger a non-fatal error at the analysis stage.
+    // With this kind of error we still run subsequent analysis stages.
+    uint x;
+    string y = x;
+}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/input.json b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/input.json
new file mode 100644
index 0000000000..904ebc5bf2
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/input.json
@@ -0,0 +1,14 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_outputs_on_analysis_error_non_fatal/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {
+			"*": {
+				"*": ["*"],
+				"": ["*"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/output.json b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/output.json
new file mode 100644
index 0000000000..2f3aaae442
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_non_fatal/output.json
@@ -0,0 +1,26 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "7407",
+            "formattedMessage": "TypeError: Type uint256 is not implicitly convertible to expected type string storage ref.
+ --> C:8:16:
+  |
+8 |     string y = x;
+  |                ^
+
+",
+            "message": "Type uint256 is not implicitly convertible to expected type string storage ref.",
+            "severity": "error",
+            "sourceLocation":
+            {
+                "end": 235,
+                "file": "C",
+                "start": 234
+            },
+            "type": "TypeError"
+        }
+    ],
+    "sources": {}
+}
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/args b/test/cmdlineTests/standard_outputs_on_compilation_error/args
new file mode 100644
index 0000000000..18532c5a6d
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_compilation_error/args
@@ -0,0 +1 @@
+--allow-paths .
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/in.sol b/test/cmdlineTests/standard_outputs_on_compilation_error/in.sol
new file mode 100644
index 0000000000..1d5118b872
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_compilation_error/in.sol
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {
+    // This will trigger an error at the compilation stage.
+    // CodeGenerationError due to immutable initialization in constructor being optimized out.
+    uint immutable public x;
+
+    constructor() {
+        x = 0;
+        while (true) {}
+    }
+}
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/input.json b/test/cmdlineTests/standard_outputs_on_compilation_error/input.json
new file mode 100644
index 0000000000..855f007689
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_compilation_error/input.json
@@ -0,0 +1,15 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_outputs_on_compilation_error/in.sol"]}
+	},
+	"settings": {
+		"optimizer": {"enabled": true},
+		"outputSelection": {
+			"*": {
+				"*": ["*"],
+				"": ["*"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_outputs_on_compilation_error/output.json b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
new file mode 100644
index 0000000000..ac01fb1eba
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_compilation_error/output.json
@@ -0,0 +1,280 @@
+{
+    "contracts":
+    {
+        "C":
+        {
+            "C":
+            {
+                "abi":
+                [
+                    {
+                        "inputs": [],
+                        "stateMutability": "nonpayable",
+                        "type": "constructor"
+                    },
+                    {
+                        "inputs": [],
+                        "name": "x",
+                        "outputs":
+                        [
+                            {
+                                "internalType": "uint256",
+                                "name": "",
+                                "type": "uint256"
+                            }
+                        ],
+                        "stateMutability": "view",
+                        "type": "function"
+                    }
+                ],
+                "devdoc":
+                {
+                    "kind": "dev",
+                    "methods": {},
+                    "version": 1
+                },
+                "evm":
+                {
+                    "methodIdentifiers":
+                    {
+                        "x()": "0c55699c"
+                    }
+                },
+                "metadata": "{\"compiler\":{\"version\":\"<VERSION REMOVED>\"},\"language\":\"Solidity\",\"output\":{\"abi\":[{\"inputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"inputs\":[],\"name\":\"x\",\"outputs\":[{\"internalType\":\"uint256\",\"name\":\"\",\"type\":\"uint256\"}],\"stateMutability\":\"view\",\"type\":\"function\"}],\"devdoc\":{\"kind\":\"dev\",\"methods\":{},\"version\":1},\"userdoc\":{\"kind\":\"user\",\"methods\":{},\"version\":1}},\"settings\":{\"compilationTarget\":{\"C\":\"C\"},\"evmVersion\":\"shanghai\",\"libraries\":{},\"metadata\":{\"bytecodeHash\":\"ipfs\"},\"optimizer\":{\"enabled\":true,\"runs\":200},\"remappings\":[]},\"sources\":{\"C\":{\"keccak256\":\"0x67a13ebd685e4c6f792e71eb747dac57edb99e94d04d841ee6c979ae517934ce\",\"license\":\"GPL-3.0\",\"urls\":[\"bzz-raw://665b000da768823654f680d02686c1e59d682a0b3882e43a77fed9f80ce64ae8\",\"dweb:/ipfs/QmVnKvuidH6KiCdNQpoAQUtDbB8hXkafVLXWMNitUcxnqC\"]}},\"version\":1}",
+                "storageLayout":
+                {
+                    "storage": [],
+                    "types": null
+                },
+                "userdoc":
+                {
+                    "kind": "user",
+                    "methods": {},
+                    "version": 1
+                }
+            }
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "1284",
+            "formattedMessage": "CodeGenerationError: Some immutables were read from but never assigned, possibly because of optimization.
+
+",
+            "message": "Some immutables were read from but never assigned, possibly because of optimization.",
+            "severity": "error",
+            "type": "CodeGenerationError"
+        }
+    ],
+    "sources":
+    {
+        "C":
+        {
+            "ast":
+            {
+                "absolutePath": "C",
+                "exportedSymbols":
+                {
+                    "C":
+                    [
+                        15
+                    ]
+                },
+                "id": 16,
+                "license": "GPL-3.0",
+                "nodeType": "SourceUnit",
+                "nodes":
+                [
+                    {
+                        "id": 1,
+                        "literals":
+                        [
+                            "solidity",
+                            "*"
+                        ],
+                        "nodeType": "PragmaDirective",
+                        "src": "36:18:0"
+                    },
+                    {
+                        "abstract": false,
+                        "baseContracts": [],
+                        "canonicalName": "C",
+                        "contractDependencies": [],
+                        "contractKind": "contract",
+                        "fullyImplemented": true,
+                        "id": 15,
+                        "linearizedBaseContracts":
+                        [
+                            15
+                        ],
+                        "name": "C",
+                        "nameLocation": "65:1:0",
+                        "nodeType": "ContractDefinition",
+                        "nodes":
+                        [
+                            {
+                                "constant": false,
+                                "functionSelector": "0c55699c",
+                                "id": 3,
+                                "mutability": "immutable",
+                                "name": "x",
+                                "nameLocation": "250:1:0",
+                                "nodeType": "VariableDeclaration",
+                                "scope": 15,
+                                "src": "228:23:0",
+                                "stateVariable": true,
+                                "storageLocation": "default",
+                                "typeDescriptions":
+                                {
+                                    "typeIdentifier": "t_uint256",
+                                    "typeString": "uint256"
+                                },
+                                "typeName":
+                                {
+                                    "id": 2,
+                                    "name": "uint",
+                                    "nodeType": "ElementaryTypeName",
+                                    "src": "228:4:0",
+                                    "typeDescriptions":
+                                    {
+                                        "typeIdentifier": "t_uint256",
+                                        "typeString": "uint256"
+                                    }
+                                },
+                                "visibility": "public"
+                            },
+                            {
+                                "body":
+                                {
+                                    "id": 13,
+                                    "nodeType": "Block",
+                                    "src": "272:46:0",
+                                    "statements":
+                                    [
+                                        {
+                                            "expression":
+                                            {
+                                                "id": 8,
+                                                "isConstant": false,
+                                                "isLValue": false,
+                                                "isPure": false,
+                                                "lValueRequested": false,
+                                                "leftHandSide":
+                                                {
+                                                    "id": 6,
+                                                    "name": "x",
+                                                    "nodeType": "Identifier",
+                                                    "overloadedDeclarations": [],
+                                                    "referencedDeclaration": 3,
+                                                    "src": "282:1:0",
+                                                    "typeDescriptions":
+                                                    {
+                                                        "typeIdentifier": "t_uint256",
+                                                        "typeString": "uint256"
+                                                    }
+                                                },
+                                                "nodeType": "Assignment",
+                                                "operator": "=",
+                                                "rightHandSide":
+                                                {
+                                                    "hexValue": "30",
+                                                    "id": 7,
+                                                    "isConstant": false,
+                                                    "isLValue": false,
+                                                    "isPure": true,
+                                                    "kind": "number",
+                                                    "lValueRequested": false,
+                                                    "nodeType": "Literal",
+                                                    "src": "286:1:0",
+                                                    "typeDescriptions":
+                                                    {
+                                                        "typeIdentifier": "t_rational_0_by_1",
+                                                        "typeString": "int_const 0"
+                                                    },
+                                                    "value": "0"
+                                                },
+                                                "src": "282:5:0",
+                                                "typeDescriptions":
+                                                {
+                                                    "typeIdentifier": "t_uint256",
+                                                    "typeString": "uint256"
+                                                }
+                                            },
+                                            "id": 9,
+                                            "nodeType": "ExpressionStatement",
+                                            "src": "282:5:0"
+                                        },
+                                        {
+                                            "body":
+                                            {
+                                                "id": 11,
+                                                "nodeType": "Block",
+                                                "src": "310:2:0",
+                                                "statements": []
+                                            },
+                                            "condition":
+                                            {
+                                                "hexValue": "74727565",
+                                                "id": 10,
+                                                "isConstant": false,
+                                                "isLValue": false,
+                                                "isPure": true,
+                                                "kind": "bool",
+                                                "lValueRequested": false,
+                                                "nodeType": "Literal",
+                                                "src": "304:4:0",
+                                                "typeDescriptions":
+                                                {
+                                                    "typeIdentifier": "t_bool",
+                                                    "typeString": "bool"
+                                                },
+                                                "value": "true"
+                                            },
+                                            "id": 12,
+                                            "nodeType": "WhileStatement",
+                                            "src": "297:15:0"
+                                        }
+                                    ]
+                                },
+                                "id": 14,
+                                "implemented": true,
+                                "kind": "constructor",
+                                "modifiers": [],
+                                "name": "",
+                                "nameLocation": "-1:-1:-1",
+                                "nodeType": "FunctionDefinition",
+                                "parameters":
+                                {
+                                    "id": 4,
+                                    "nodeType": "ParameterList",
+                                    "parameters": [],
+                                    "src": "269:2:0"
+                                },
+                                "returnParameters":
+                                {
+                                    "id": 5,
+                                    "nodeType": "ParameterList",
+                                    "parameters": [],
+                                    "src": "272:0:0"
+                                },
+                                "scope": 15,
+                                "src": "258:60:0",
+                                "stateMutability": "nonpayable",
+                                "virtual": false,
+                                "visibility": "public"
+                            }
+                        ],
+                        "scope": 16,
+                        "src": "56:264:0",
+                        "usedErrors": [],
+                        "usedEvents": []
+                    }
+                ],
+                "src": "36:285:0"
+            },
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_outputs_on_parsing_error/args b/test/cmdlineTests/standard_outputs_on_parsing_error/args
new file mode 100644
index 0000000000..18532c5a6d
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_parsing_error/args
@@ -0,0 +1 @@
+--allow-paths .
diff --git a/test/cmdlineTests/standard_outputs_on_parsing_error/in.sol b/test/cmdlineTests/standard_outputs_on_parsing_error/in.sol
new file mode 100644
index 0000000000..a4d891c1b2
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_parsing_error/in.sol
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+// This will trigger an error at the parsing stage
+contract C {}}
diff --git a/test/cmdlineTests/standard_outputs_on_parsing_error/input.json b/test/cmdlineTests/standard_outputs_on_parsing_error/input.json
new file mode 100644
index 0000000000..a0d00c4e9e
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_parsing_error/input.json
@@ -0,0 +1,14 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"C": {"urls": ["standard_outputs_on_parsing_error/in.sol"]}
+	},
+	"settings": {
+		"outputSelection": {
+			"*": {
+				"*": ["*"],
+				"": ["*"]
+			}
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_outputs_on_parsing_error/output.json b/test/cmdlineTests/standard_outputs_on_parsing_error/output.json
new file mode 100644
index 0000000000..8c1f6c0dbe
--- /dev/null
+++ b/test/cmdlineTests/standard_outputs_on_parsing_error/output.json
@@ -0,0 +1,26 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "7858",
+            "formattedMessage": "ParserError: Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
+ --> C:5:14:
+  |
+5 | contract C {}}
+  |              ^
+
+",
+            "message": "Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.",
+            "severity": "error",
+            "sourceLocation":
+            {
+                "end": 121,
+                "file": "C",
+                "start": 120
+            },
+            "type": "ParserError"
+        }
+    ],
+    "sources": {}
+}

From 712229a5c6e1c7a0c072343d7516b3c5f7b05890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 14 Jun 2023 12:02:24 +0200
Subject: [PATCH 1447/1748] Fix StandardCompiler returning an incomplete AST in
 Standard JSON in case of an early exit during analysis

---
 Changelog.md                                  |   1 +
 libsolidity/interface/StandardCompiler.cpp    |  12 +-
 .../standard_empty_file_name/output.json      |   8 +-
 .../output.json                               | 103 +-----------------
 4 files changed, 12 insertions(+), 112 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index aac8ab8b28..efca354e72 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -19,6 +19,7 @@ Bugfixes:
  * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
  * SMTChecker: Fix false negative when a verification target can be violated only by trusted external call from another public function.
+ * Standard JSON Interface: Fix an incomplete AST being returned when analysis is interrupted by certain kinds of fatal errors.
  * Yul Optimizer: Ensure that the assignment of memory slots for variables moved to memory does not depend on AST IDs that may depend on whether additional files are included during compilation.
  * Yul Optimizer: Fix optimized IR being unnecessarily passed through the Yul optimizer again before bytecode generation.
 
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index f18c618e9c..9d1ac1f1f3 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1305,15 +1305,21 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		));
 	}
 
+	bool parsingSuccess = compilerStack.state() >= CompilerStack::State::Parsed;
 	bool analysisPerformed = compilerStack.state() >= CompilerStack::State::AnalysisPerformed;
-	bool const compilationSuccess = compilerStack.state() == CompilerStack::State::CompilationSuccessful;
+	bool compilationSuccess = compilerStack.state() == CompilerStack::State::CompilationSuccessful;
 
 	if (compilerStack.hasError() && !_inputsAndSettings.parserErrorRecovery)
 		analysisPerformed = false;
 
+	// If analysis fails, the artifacts inside CompilerStack are potentially incomplete and must not be returned.
+	// Note that not completing analysis due to stopAfter does not count as a failure. It's neither failure nor success.
+	bool analysisFailed = !analysisPerformed && _inputsAndSettings.stopAfter >= CompilerStack::State::AnalysisPerformed;
+	bool compilationFailed = !compilationSuccess && binariesRequested;
+
 	/// Inconsistent state - stop here to receive error reports from users
 	if (
-		((binariesRequested && !compilationSuccess) || !analysisPerformed) &&
+		(compilationFailed || !analysisPerformed) &&
 		(errors.empty() && _inputsAndSettings.stopAfter >= CompilerStack::State::AnalysisPerformed)
 	)
 		return formatFatalError(Error::Type::InternalCompilerError, "No error reported, but compilation failed.");
@@ -1331,7 +1337,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 
 	output["sources"] = Json::objectValue;
 	unsigned sourceIndex = 0;
-	if (compilerStack.state() >= CompilerStack::State::Parsed && (!compilerStack.hasError() || _inputsAndSettings.parserErrorRecovery))
+	if (parsingSuccess && !analysisFailed && (!compilerStack.hasError() || _inputsAndSettings.parserErrorRecovery))
 		for (string const& sourceName: compilerStack.sourceNames())
 		{
 			Json::Value sourceResult = Json::objectValue;
diff --git a/test/cmdlineTests/standard_empty_file_name/output.json b/test/cmdlineTests/standard_empty_file_name/output.json
index e419d0a5ee..4e4d84c41c 100644
--- a/test/cmdlineTests/standard_empty_file_name/output.json
+++ b/test/cmdlineTests/standard_empty_file_name/output.json
@@ -18,11 +18,5 @@
             "type": "DeclarationError"
         }
     ],
-    "sources":
-    {
-        "":
-        {
-            "id": 0
-        }
-    }
+    "sources": {}
 }
diff --git a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json
index 29f3228a7d..d47ded5d40 100644
--- a/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json
+++ b/test/cmdlineTests/standard_outputs_on_analysis_error_fatal_after_current_step/output.json
@@ -22,106 +22,5 @@
             "type": "DeclarationError"
         }
     ],
-    "sources":
-    {
-        "C":
-        {
-            "ast":
-            {
-                "absolutePath": "C",
-                "exportedSymbols":
-                {
-                    "f":
-                    [
-                        7
-                    ]
-                },
-                "id": 8,
-                "license": "GPL-3.0",
-                "nodeType": "SourceUnit",
-                "nodes":
-                [
-                    {
-                        "id": 1,
-                        "literals":
-                        [
-                            "solidity",
-                            "*"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "36:18:0"
-                    },
-                    {
-                        "body":
-                        {
-                            "id": 6,
-                            "nodeType": "Block",
-                            "src": "261:2:0",
-                            "statements": []
-                        },
-                        "id": 7,
-                        "implemented": true,
-                        "kind": "freeFunction",
-                        "modifiers": [],
-                        "name": "f",
-                        "nameLocation": "241:1:0",
-                        "nodeType": "FunctionDefinition",
-                        "parameters":
-                        {
-                            "id": 4,
-                            "nodeType": "ParameterList",
-                            "parameters":
-                            [
-                                {
-                                    "constant": false,
-                                    "id": 3,
-                                    "mutability": "immutable",
-                                    "name": "x",
-                                    "nameLocation": "258:1:0",
-                                    "nodeType": "VariableDeclaration",
-                                    "scope": 7,
-                                    "src": "243:16:0",
-                                    "stateVariable": false,
-                                    "storageLocation": "default",
-                                    "typeDescriptions":
-                                    {
-                                        "typeIdentifier": "t_uint256",
-                                        "typeString": "uint256"
-                                    },
-                                    "typeName":
-                                    {
-                                        "id": 2,
-                                        "name": "uint",
-                                        "nodeType": "ElementaryTypeName",
-                                        "src": "243:4:0",
-                                        "typeDescriptions":
-                                        {
-                                            "typeIdentifier": "t_uint256",
-                                            "typeString": "uint256"
-                                        }
-                                    },
-                                    "visibility": "internal"
-                                }
-                            ],
-                            "src": "242:18:0"
-                        },
-                        "returnParameters":
-                        {
-                            "id": 5,
-                            "nodeType": "ParameterList",
-                            "parameters": [],
-                            "src": "261:0:0"
-                        },
-                        "scope": 8,
-                        "src": "232:31:0",
-                        "stateMutability": "nonpayable",
-                        "virtual": false,
-                        "visibility": "internal"
-                    }
-                ],
-                "src": "36:228:0"
-            },
-            "id": 0
-        }
-    }
+    "sources": {}
 }

From d4be1d9c2fc70bc3549f92143faaae9f97d81d97 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Wed, 26 Apr 2023 12:50:36 +0200
Subject: [PATCH 1448/1748] Add --print-smt flag to output SMTChecker SMTLIB
 code

---
 Changelog.md                                  |   1 +
 libsmtutil/CHCSmtLib2Interface.cpp            |  55 +-
 libsmtutil/CHCSmtLib2Interface.h              |   5 +
 libsmtutil/SMTLib2Interface.cpp               |   6 +
 libsmtutil/SMTLib2Interface.h                 |   2 +
 libsmtutil/SMTPortfolio.cpp                   |  13 +-
 libsmtutil/SMTPortfolio.h                     |   6 +-
 libsolidity/formal/BMC.cpp                    |  14 +-
 libsolidity/formal/CHC.cpp                    |  11 +
 libsolidity/formal/ModelCheckerSettings.h     |   2 +
 libsolidity/interface/StandardCompiler.cpp    |  14 +-
 scripts/error_codes.py                        |   2 +
 solc/CommandLineParser.cpp                    |  20 +-
 .../model_checker_print_query_all/args        |   1 +
 .../model_checker_print_query_all/err         | 165 ++++++
 .../model_checker_print_query_all/input.sol   |   9 +
 .../model_checker_print_query_bmc/args        |   1 +
 .../model_checker_print_query_bmc/err         |  32 ++
 .../model_checker_print_query_bmc/input.sol   |   9 +
 .../model_checker_print_query_chc/args        |   1 +
 .../model_checker_print_query_chc/err         | 129 +++++
 .../model_checker_print_query_chc/input.sol   |   9 +
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../input.sol                                 |   9 +
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../input.sol                                 |   9 +
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../input.sol                                 |   9 +
 .../input.json                                |  27 +
 .../output.json                               | 540 ++++++++++++++++++
 .../input.json                                |  26 +
 .../output.json                               | 129 +++++
 .../input.json                                |  27 +
 .../output.json                               | 420 ++++++++++++++
 .../input.json                                |  25 +
 .../output.json                               |  12 +
 .../input.json                                |  25 +
 .../output.json                               |  12 +
 .../input.json                                |  26 +
 .../output.json                               |  12 +
 .../output.json                               |   7 +-
 test/solc/CommandLineParser.cpp               |   1 +
 test/tools/fuzzer_common.cpp                  |   1 +
 49 files changed, 1799 insertions(+), 34 deletions(-)
 create mode 100644 test/cmdlineTests/model_checker_print_query_all/args
 create mode 100644 test/cmdlineTests/model_checker_print_query_all/err
 create mode 100644 test/cmdlineTests/model_checker_print_query_all/input.sol
 create mode 100644 test/cmdlineTests/model_checker_print_query_bmc/args
 create mode 100644 test/cmdlineTests/model_checker_print_query_bmc/err
 create mode 100644 test/cmdlineTests/model_checker_print_query_bmc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_print_query_chc/args
 create mode 100644 test/cmdlineTests/model_checker_print_query_chc/err
 create mode 100644 test/cmdlineTests/model_checker_print_query_chc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/args
 create mode 100644 test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err
 create mode 100644 test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/exit
 create mode 100644 test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/args
 create mode 100644 test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err
 create mode 100644 test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/exit
 create mode 100644 test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/input.sol
 create mode 100644 test/cmdlineTests/model_checker_print_query_superflous_solver/args
 create mode 100644 test/cmdlineTests/model_checker_print_query_superflous_solver/err
 create mode 100644 test/cmdlineTests/model_checker_print_query_superflous_solver/exit
 create mode 100644 test/cmdlineTests/model_checker_print_query_superflous_solver/input.sol
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_all/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_all/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_bmc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_chc/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_chc/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_invalid_arg/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_invalid_arg/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/output.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_superflous_solver/input.json
 create mode 100644 test/cmdlineTests/standard_model_checker_print_query_superflous_solver/output.json

diff --git a/Changelog.md b/Changelog.md
index aac8ab8b28..d843aeb85e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,7 @@ Compiler Features:
  * Commandline Interface: Respect ``--optimize-yul`` and ``--no-optimize-yul`` in compiler mode and accept them in assembler mode as well. ``--optimize --no-optimize-yul`` combination now allows enabling EVM assembly optimizer without enabling Yul optimizer.
  * EWasm: Remove EWasm backend.
  * Parser: Introduce ``pragma experimental solidity``, which will enable an experimental language mode that in particular has no stability guarantees between non-breaking releases and is not suited for production use.
+ * SMTChecker: Add ``--model-checker-print-query`` CLI option and ``settings.modelChecker.printQuery`` JSON option to output the SMTChecker queries in the SMTLIB2 format. This requires using `smtlib2` solver only.
  * Standard JSON Interface: Add ``ast`` file-level output for Yul input.
  * Standard JSON Interface: Add ``irAst`` and ``irOptimizedAst`` contract-level outputs for Solidity input, providing AST in compact JSON format for IR and optimized IR.
  * Yul Optimizer: Stack-to-memory mover is now enabled by default whenever possible for via IR code generation and pure Yul compilation.
diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index e1f80e62bd..4229cf5d66 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -91,23 +91,8 @@ void CHCSmtLib2Interface::addRule(Expression const& _expr, std::string const& /*
 
 tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Interface::query(Expression const& _block)
 {
-	string accumulated{};
-	swap(m_accumulatedOutput, accumulated);
-	solAssert(m_smtlib2, "");
-	writeHeader();
-	for (auto const& decl: m_smtlib2->userSorts() | ranges::views::values)
-		write(decl);
-	m_accumulatedOutput += accumulated;
-
-	string queryRule = "(assert\n(forall " + forall() + "\n" +
-		"(=> " + _block.name + " false)"
-		"))";
-	string response = querySolver(
-		m_accumulatedOutput +
-		queryRule +
-		"\n(check-sat)"
-	);
-	swap(m_accumulatedOutput, accumulated);
+	string query = dumpQuery(_block);
+	string response = querySolver(query);
 
 	CheckResult result;
 	// TODO proper parsing
@@ -151,13 +136,6 @@ string CHCSmtLib2Interface::toSmtLibSort(vector<SortPointer> const& _sorts)
 	return ssort;
 }
 
-void CHCSmtLib2Interface::writeHeader()
-{
-	if (m_queryTimeout)
-		write("(set-option :timeout " + to_string(*m_queryTimeout) + ")");
-	write("(set-logic HORN)\n");
-}
-
 string CHCSmtLib2Interface::forall()
 {
 	string vars("(");
@@ -217,3 +195,32 @@ string CHCSmtLib2Interface::querySolver(string const& _input)
 	m_unhandledQueries.push_back(_input);
 	return "unknown\n";
 }
+
+std::string CHCSmtLib2Interface::dumpQuery(Expression const& _expr)
+{
+	std::stringstream s;
+
+	s
+		<< createHeaderAndDeclarations()
+		<< m_accumulatedOutput << std::endl
+		<< createQueryAssertion(_expr.name) << std::endl
+		<< "(check-sat)" << std::endl;
+
+	return s.str();
+}
+
+std::string CHCSmtLib2Interface::createHeaderAndDeclarations() {
+	std::stringstream s;
+	if (m_queryTimeout)
+		s << "(set-option :timeout " + to_string(*m_queryTimeout) + ")\n";
+	s << "(set-logic HORN)" << std::endl;
+
+	for (auto const& decl: m_smtlib2->userSorts() | ranges::views::values)
+		s << decl << std::endl;
+
+	return s.str();
+}
+
+std::string CHCSmtLib2Interface::createQueryAssertion(std::string name) {
+	return "(assert\n(forall " + forall() + "\n" +	"(=> " + name + " false)))";
+}
diff --git a/libsmtutil/CHCSmtLib2Interface.h b/libsmtutil/CHCSmtLib2Interface.h
index 4748af8da6..0f3a68ee40 100644
--- a/libsmtutil/CHCSmtLib2Interface.h
+++ b/libsmtutil/CHCSmtLib2Interface.h
@@ -51,6 +51,8 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 
 	void declareVariable(std::string const& _name, SortPointer const& _sort) override;
 
+	std::string dumpQuery(Expression const& _expr);
+
 	std::vector<std::string> unhandledQueries() const { return m_unhandledQueries; }
 
 	SMTLib2Interface* smtlib2Interface() const { return m_smtlib2.get(); }
@@ -66,6 +68,9 @@ class CHCSmtLib2Interface: public CHCSolverInterface
 
 	void write(std::string _data);
 
+	std::string createQueryAssertion(std::string name);
+	std::string createHeaderAndDeclarations();
+
 	/// Communicates with the solver via the callback. Throws SMTSolverError on error.
 	std::string querySolver(std::string const& _input);
 
diff --git a/libsmtutil/SMTLib2Interface.cpp b/libsmtutil/SMTLib2Interface.cpp
index 3e117913aa..85103d00eb 100644
--- a/libsmtutil/SMTLib2Interface.cpp
+++ b/libsmtutil/SMTLib2Interface.cpp
@@ -322,3 +322,9 @@ string SMTLib2Interface::querySolver(string const& _input)
 	m_unhandledQueries.push_back(_input);
 	return "unknown\n";
 }
+
+string SMTLib2Interface::dumpQuery(vector<Expression> const& _expressionsToEvaluate)
+{
+	return boost::algorithm::join(m_accumulatedOutput, "\n") +
+		checkSatAndGetValuesCommand(_expressionsToEvaluate);
+}
diff --git a/libsmtutil/SMTLib2Interface.h b/libsmtutil/SMTLib2Interface.h
index 9454d551f3..9ef8e94a8c 100644
--- a/libsmtutil/SMTLib2Interface.h
+++ b/libsmtutil/SMTLib2Interface.h
@@ -68,6 +68,8 @@ class SMTLib2Interface: public SolverInterface
 
 	std::vector<std::pair<std::string, std::string>> const& userSorts() const { return m_userSorts; }
 
+	std::string dumpQuery(std::vector<Expression> const& _expressionsToEvaluate);
+
 private:
 	void declareFunction(std::string const& _name, SortPointer const& _sort);
 
diff --git a/libsmtutil/SMTPortfolio.cpp b/libsmtutil/SMTPortfolio.cpp
index 77a404a475..be961d01f6 100644
--- a/libsmtutil/SMTPortfolio.cpp
+++ b/libsmtutil/SMTPortfolio.cpp
@@ -36,10 +36,12 @@ SMTPortfolio::SMTPortfolio(
 	map<h256, string> _smtlib2Responses,
 	frontend::ReadCallback::Callback _smtCallback,
 	[[maybe_unused]] SMTSolverChoice _enabledSolvers,
-	optional<unsigned> _queryTimeout
+	optional<unsigned> _queryTimeout,
+	bool _printQuery
 ):
 	SolverInterface(_queryTimeout)
 {
+	solAssert(!_printQuery || _enabledSolvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
 	if (_enabledSolvers.smtlib2)
 		m_solvers.emplace_back(make_unique<SMTLib2Interface>(std::move(_smtlib2Responses), std::move(_smtCallback), m_queryTimeout));
 #ifdef HAVE_Z3
@@ -155,3 +157,12 @@ bool SMTPortfolio::solverAnswered(CheckResult result)
 {
 	return result == CheckResult::SATISFIABLE || result == CheckResult::UNSATISFIABLE;
 }
+
+string SMTPortfolio::dumpQuery(vector<Expression> const& _expressionsToEvaluate)
+{
+	// This code assumes that the constructor guarantees that
+	// SmtLib2Interface is in position 0, if enabled.
+	auto smtlib2 = dynamic_cast<SMTLib2Interface*>(m_solvers.front().get());
+	solAssert(smtlib2, "Must use SMTLib2 solver to dump queries");
+	return smtlib2->dumpQuery(_expressionsToEvaluate);
+}
diff --git a/libsmtutil/SMTPortfolio.h b/libsmtutil/SMTPortfolio.h
index 3d82756c35..cdb33368e8 100644
--- a/libsmtutil/SMTPortfolio.h
+++ b/libsmtutil/SMTPortfolio.h
@@ -46,7 +46,8 @@ class SMTPortfolio: public SolverInterface
 		std::map<util::h256, std::string> _smtlib2Responses = {},
 		frontend::ReadCallback::Callback _smtCallback = {},
 		SMTSolverChoice _enabledSolvers = SMTSolverChoice::All(),
-		std::optional<unsigned> _queryTimeout = {}
+		std::optional<unsigned> _queryTimeout = {},
+		bool _printQuery = false
 	);
 
 	void reset() override;
@@ -62,6 +63,9 @@ class SMTPortfolio: public SolverInterface
 
 	std::vector<std::string> unhandledQueries() override;
 	size_t solvers() override { return m_solvers.size(); }
+
+	std::string dumpQuery(std::vector<Expression> const& _expressionsToEvaluate);
+
 private:
 	static bool solverAnswered(CheckResult result);
 
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index be29000fed..d38f27b6ad 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -47,8 +47,11 @@ BMC::BMC(
 	CharStreamProvider const& _charStreamProvider
 ):
 	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider),
-	m_interface(make_unique<smtutil::SMTPortfolio>(_smtlib2Responses, _smtCallback, _settings.solvers, _settings.timeout))
+	m_interface(make_unique<smtutil::SMTPortfolio>(
+		_smtlib2Responses, _smtCallback, _settings.solvers, _settings.timeout, _settings.printQuery
+	))
 {
+	solAssert(!_settings.printQuery || _settings.solvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
 #if defined (HAVE_Z3) || defined (HAVE_CVC4)
 	if (m_settings.solvers.cvc4 || m_settings.solvers.z3)
 		if (!_smtlib2Responses.empty())
@@ -1192,6 +1195,15 @@ BMC::checkSatisfiableAndGenerateModel(vector<smtutil::Expression> const& _expres
 	vector<string> values;
 	try
 	{
+		if (m_settings.printQuery)
+		{
+			auto portfolio = dynamic_cast<smtutil::SMTPortfolio*>(m_interface.get());
+			string smtlibCode = portfolio->dumpQuery(_expressionsToEvaluate);
+			m_errorReporter.info(
+				6240_error,
+				"BMC: Requested query:\n" + smtlibCode
+			);
+		}
 		tie(result, values) = m_interface->check(_expressionsToEvaluate);
 	}
 	catch (smtutil::SolverError const& _e)
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 1f7fc8bade..30c3bb0e98 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -72,6 +72,7 @@ CHC::CHC(
 	m_smtlib2Responses(_smtlib2Responses),
 	m_smtCallback(_smtCallback)
 {
+	solAssert(!_settings.printQuery || _settings.solvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
 }
 
 void CHC::analyze(SourceUnit const& _source)
@@ -1807,6 +1808,16 @@ tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query
 	CheckResult result;
 	smtutil::Expression invariant(true);
 	CHCSolverInterface::CexGraph cex;
+	if (m_settings.printQuery)
+	{
+		auto smtLibInterface = dynamic_cast<CHCSmtLib2Interface*>(m_interface.get());
+		solAssert(smtLibInterface, "Requested to print queries but CHCSmtLib2Interface not available");
+		string smtLibCode = smtLibInterface->dumpQuery(_query);
+		m_errorReporter.info(
+			2339_error,
+			"CHC: Requested query:\n" + smtLibCode
+		);
+	}
 	tie(result, invariant, cex) = m_interface->query(_query);
 	switch (result)
 	{
diff --git a/libsolidity/formal/ModelCheckerSettings.h b/libsolidity/formal/ModelCheckerSettings.h
index d190116d96..b645f7c3b6 100644
--- a/libsolidity/formal/ModelCheckerSettings.h
+++ b/libsolidity/formal/ModelCheckerSettings.h
@@ -169,6 +169,7 @@ struct ModelCheckerSettings
 	ModelCheckerEngine engine = ModelCheckerEngine::None();
 	ModelCheckerExtCalls externalCalls = {};
 	ModelCheckerInvariants invariants = ModelCheckerInvariants::Default();
+	bool printQuery = false;
 	bool showProvedSafe = false;
 	bool showUnproved = false;
 	bool showUnsupported = false;
@@ -186,6 +187,7 @@ struct ModelCheckerSettings
 			engine == _other.engine &&
 			externalCalls.mode == _other.externalCalls.mode &&
 			invariants == _other.invariants &&
+			printQuery == _other.printQuery &&
 			showProvedSafe == _other.showProvedSafe &&
 			showUnproved == _other.showUnproved &&
 			showUnsupported == _other.showUnsupported &&
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index f18c618e9c..77f5581be6 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -430,7 +430,7 @@ std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
 
 std::optional<Json::Value> checkModelCheckerSettingsKeys(Json::Value const& _input)
 {
-	static set<string> keys{"bmcLoopIterations", "contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "showProvedSafe", "showUnproved", "showUnsupported", "solvers", "targets", "timeout"};
+	static set<string> keys{"bmcLoopIterations", "contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "printQuery", "showProvedSafe", "showUnproved", "showUnsupported", "solvers", "targets", "timeout"};
 	return checkKeys(_input, keys, "modelChecker");
 }
 
@@ -1096,6 +1096,18 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.modelCheckerSettings.solvers = solvers;
 	}
 
+	if (modelCheckerSettings.isMember("printQuery"))
+	{
+		auto const& printQuery = modelCheckerSettings["printQuery"];
+		if (!printQuery.isBool())
+			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.printQuery must be a Boolean value.");
+
+		if (!(ret.modelCheckerSettings.solvers == smtutil::SMTSolverChoice::SMTLIB2()))
+			return formatFatalError(Error::Type::JSONError, "Only SMTLib2 solver can be enabled to print queries");
+
+		ret.modelCheckerSettings.printQuery = printQuery.asBool();
+	}
+
 	if (modelCheckerSettings.isMember("targets"))
 	{
 		auto const& targetsArray = modelCheckerSettings["targets"];
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 890d90ecb3..d5b7ed76e2 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -204,7 +204,9 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "1834", # Unimplemented feature error, as we do not test it anymore via cmdLineTests
         "5430", # basefee being used in inline assembly for EVMVersion < london
         "1180", # SMTChecker, covered by CL tests
+        "2339", # SMTChecker, covered by CL tests
         "2961", # SMTChecker, covered by CL tests
+        "6240", # SMTChecker, covered by CL tests
         "9576", # SMTChecker, covered by CL tests
     }
     assert len(test_ids & white_ids) == 0, "The sets are not supposed to intersect"
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index dda7a6ba2b..060c1ad8fe 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -70,6 +70,7 @@ static string const g_strModelCheckerDivModNoSlacks = "model-checker-div-mod-no-
 static string const g_strModelCheckerEngine = "model-checker-engine";
 static string const g_strModelCheckerExtCalls = "model-checker-ext-calls";
 static string const g_strModelCheckerInvariants = "model-checker-invariants";
+static string const g_strModelCheckerPrintQuery = "model-checker-print-query";
 static string const g_strModelCheckerShowProvedSafe = "model-checker-show-proved-safe";
 static string const g_strModelCheckerShowUnproved = "model-checker-show-unproved";
 static string const g_strModelCheckerShowUnsupported = "model-checker-show-unsupported";
@@ -841,6 +842,10 @@ General Information)").c_str(),
 			" Multiple types of invariants can be selected at the same time, separated by a comma and no spaces."
 			" By default no invariants are reported."
 		)
+		(
+			g_strModelCheckerPrintQuery.c_str(),
+			"Print the queries created by the SMTChecker in the SMTLIB2 format."
+		)
 		(
 			g_strModelCheckerShowProvedSafe.c_str(),
 			"Show all targets that were proved safe separately."
@@ -963,12 +968,14 @@ void CommandLineParser::processArgs()
 		{g_strMetadataLiteral, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strNoCBORMetadata, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strMetadataHash, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerShowProvedSafe, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerShowUnproved, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
-		{g_strModelCheckerShowUnsupported, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerContracts, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerDivModNoSlacks, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerEngine, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerInvariants, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerPrintQuery, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerShowProvedSafe, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerShowUnproved, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
+		{g_strModelCheckerShowUnsupported, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerSolvers, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerTimeout, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerBMCLoopIterations, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
@@ -1322,6 +1329,13 @@ void CommandLineParser::processArgs()
 		m_options.modelChecker.settings.solvers = *solvers;
 	}
 
+	if (m_args.count(g_strModelCheckerPrintQuery))
+	{
+		if (!(m_options.modelChecker.settings.solvers == smtutil::SMTSolverChoice::SMTLIB2()))
+			solThrow(CommandLineValidationError, "Only SMTLib2 solver can be enabled to print queries");
+		m_options.modelChecker.settings.printQuery = true;
+	}
+
 	if (m_args.count(g_strModelCheckerTargets))
 	{
 		string targetsStr = m_args[g_strModelCheckerTargets].as<string>();
diff --git a/test/cmdlineTests/model_checker_print_query_all/args b/test/cmdlineTests/model_checker_print_query_all/args
new file mode 100644
index 0000000000..d0b07d5aff
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_all/args
@@ -0,0 +1 @@
+--model-checker-engine all --model-checker-print-query --model-checker-solvers smtlib2 --model-checker-timeout 1000
diff --git a/test/cmdlineTests/model_checker_print_query_all/err b/test/cmdlineTests/model_checker_print_query_all/err
new file mode 100644
index 0000000000..1a04042cd7
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_all/err
@@ -0,0 +1,165 @@
+Info: CHC: Requested query:
+(set-option :timeout 1000)
+(set-logic HORN)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
+
+
+(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
+
+
+(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
+
+
+(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |error_target_3_0| () Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
+
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> error_target_3_0 false)))
+(check-sat)
+
+
+Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
+
+Info: BMC: Requested query:
+(set-option :produce-models true)
+(set-option :timeout 1000)
+(set-logic ALL)
+(declare-fun |x_5_3| () Int)
+(declare-fun |error_0| () Int)
+(declare-fun |this_0| () Int)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-fun |tx_0| () |tx_type|)
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-fun |crypto_0| () |crypto_type|)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-fun |abi_0| () |abi_type|)
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |state_0| () |state_type|)
+(declare-fun |x_5_4| () Int)
+(declare-fun |x_5_0| () Int)
+(declare-fun |expr_6_0| () Int)
+(declare-fun |x_5_1| () Int)
+(declare-fun |expr_9_0| () Int)
+(declare-fun |expr_10_0| () Int)
+(declare-fun |expr_11_1| () Bool)
+
+(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
+(declare-const |EVALEXPR_0| Int)
+(assert (= |EVALEXPR_0| x_5_1))
+(check-sat)
+(get-value (|EVALEXPR_0| ))
+
+
+Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
diff --git a/test/cmdlineTests/model_checker_print_query_all/input.sol b/test/cmdlineTests/model_checker_print_query_all/input.sol
new file mode 100644
index 0000000000..eb4cd572ae
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_all/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C
+{
+	function f() public pure {
+		uint x = 0;
+		assert(x == 0);
+	}
+}
diff --git a/test/cmdlineTests/model_checker_print_query_bmc/args b/test/cmdlineTests/model_checker_print_query_bmc/args
new file mode 100644
index 0000000000..d13bdc43b3
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_bmc/args
@@ -0,0 +1 @@
+--model-checker-engine bmc --model-checker-print-query --model-checker-solvers smtlib2
diff --git a/test/cmdlineTests/model_checker_print_query_bmc/err b/test/cmdlineTests/model_checker_print_query_bmc/err
new file mode 100644
index 0000000000..1a59f87b0d
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_bmc/err
@@ -0,0 +1,32 @@
+Info: BMC: Requested query:
+(set-option :produce-models true)
+(set-logic ALL)
+(declare-fun |error_0| () Int)
+(declare-fun |this_0| () Int)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-fun |tx_0| () |tx_type|)
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-fun |crypto_0| () |crypto_type|)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-fun |abi_0| () |abi_type|)
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |state_0| () |state_type|)
+(declare-fun |x_5_0| () Int)
+(declare-fun |expr_6_0| () Int)
+(declare-fun |x_5_1| () Int)
+(declare-fun |expr_9_0| () Int)
+(declare-fun |expr_10_0| () Int)
+(declare-fun |expr_11_1| () Bool)
+
+(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
+(declare-const |EVALEXPR_0| Int)
+(assert (= |EVALEXPR_0| x_5_1))
+(check-sat)
+(get-value (|EVALEXPR_0| ))
+
+
+Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
diff --git a/test/cmdlineTests/model_checker_print_query_bmc/input.sol b/test/cmdlineTests/model_checker_print_query_bmc/input.sol
new file mode 100644
index 0000000000..eb4cd572ae
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_bmc/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C
+{
+	function f() public pure {
+		uint x = 0;
+		assert(x == 0);
+	}
+}
diff --git a/test/cmdlineTests/model_checker_print_query_chc/args b/test/cmdlineTests/model_checker_print_query_chc/args
new file mode 100644
index 0000000000..752709efbb
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_chc/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-print-query --model-checker-solvers smtlib2 --model-checker-timeout 1000
diff --git a/test/cmdlineTests/model_checker_print_query_chc/err b/test/cmdlineTests/model_checker_print_query_chc/err
new file mode 100644
index 0000000000..1dd7f0c988
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_chc/err
@@ -0,0 +1,129 @@
+Info: CHC: Requested query:
+(set-option :timeout 1000)
+(set-logic HORN)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
+
+
+(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
+
+
+(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
+
+
+(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |error_target_3_0| () Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
+
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> error_target_3_0 false)))
+(check-sat)
+
+
+Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option "show unproved" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
diff --git a/test/cmdlineTests/model_checker_print_query_chc/input.sol b/test/cmdlineTests/model_checker_print_query_chc/input.sol
new file mode 100644
index 0000000000..eb4cd572ae
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_chc/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C
+{
+	function f() public pure {
+		uint x = 0;
+		assert(x == 0);
+	}
+}
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/args b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/args
new file mode 100644
index 0000000000..12b7c32458
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/args
@@ -0,0 +1 @@
+--model-checker-engine bmc --model-checker-print-query --model-checker-solvers z3
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err
new file mode 100644
index 0000000000..db94bc9ba5
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err
@@ -0,0 +1 @@
+Only SMTLib2 solver can be enabled to print queries
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/exit b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/input.sol b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/input.sol
new file mode 100644
index 0000000000..eb4cd572ae
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C
+{
+	function f() public pure {
+		uint x = 0;
+		assert(x == 0);
+	}
+}
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/args b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/args
new file mode 100644
index 0000000000..e3a8c32d47
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/args
@@ -0,0 +1 @@
+--model-checker-engine chc --model-checker-print-query --model-checker-solvers z3
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err
new file mode 100644
index 0000000000..db94bc9ba5
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err
@@ -0,0 +1 @@
+Only SMTLib2 solver can be enabled to print queries
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/exit b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/input.sol b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/input.sol
new file mode 100644
index 0000000000..eb4cd572ae
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C
+{
+	function f() public pure {
+		uint x = 0;
+		assert(x == 0);
+	}
+}
diff --git a/test/cmdlineTests/model_checker_print_query_superflous_solver/args b/test/cmdlineTests/model_checker_print_query_superflous_solver/args
new file mode 100644
index 0000000000..64e5d88728
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_superflous_solver/args
@@ -0,0 +1 @@
+--model-checker-engine bmc --model-checker-print-query --model-checker-solvers z3,smtlib2
diff --git a/test/cmdlineTests/model_checker_print_query_superflous_solver/err b/test/cmdlineTests/model_checker_print_query_superflous_solver/err
new file mode 100644
index 0000000000..db94bc9ba5
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_superflous_solver/err
@@ -0,0 +1 @@
+Only SMTLib2 solver can be enabled to print queries
diff --git a/test/cmdlineTests/model_checker_print_query_superflous_solver/exit b/test/cmdlineTests/model_checker_print_query_superflous_solver/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_superflous_solver/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/model_checker_print_query_superflous_solver/input.sol b/test/cmdlineTests/model_checker_print_query_superflous_solver/input.sol
new file mode 100644
index 0000000000..eb4cd572ae
--- /dev/null
+++ b/test/cmdlineTests/model_checker_print_query_superflous_solver/input.sol
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+contract C
+{
+	function f() public pure {
+		uint x = 0;
+		assert(x == 0);
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_all/input.json b/test/cmdlineTests/standard_model_checker_print_query_all/input.json
new file mode 100644
index 0000000000..67fc5d8c79
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_all/input.json
@@ -0,0 +1,27 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
+                contract C
+                {
+                    function f() public pure {
+                        uint x = 0;
+                        assert(x == 0);
+                    }
+                }"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+            "printQuery": true,
+			"solvers": ["smtlib2"],
+			"timeout": 1000
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_all/output.json b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
new file mode 100644
index 0000000000..b8e11ced73
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_all/output.json
@@ -0,0 +1,540 @@
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x1880095c52d8681601c6821e4a5c29740649509af99947bce54102546dd3376a": "(set-option :timeout 1000)
+(set-logic HORN)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
+
+
+(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
+
+
+(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
+
+
+(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |error_target_3_0| () Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
+
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> error_target_3_0 false)))
+(check-sat)
+",
+            "0xcbfcc2413b217c6564ee01f322c9ca1f34fd79d19961dc3e62aa9c2e5dcb6efc": "(set-option :produce-models true)
+(set-option :timeout 1000)
+(set-logic ALL)
+(declare-fun |x_5_3| () Int)
+(declare-fun |error_0| () Int)
+(declare-fun |this_0| () Int)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-fun |tx_0| () |tx_type|)
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-fun |crypto_0| () |crypto_type|)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-fun |abi_0| () |abi_type|)
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |state_0| () |state_type|)
+(declare-fun |x_5_4| () Int)
+(declare-fun |x_5_0| () Int)
+(declare-fun |expr_6_0| () Int)
+(declare-fun |x_5_1| () Int)
+(declare-fun |expr_9_0| () Int)
+(declare-fun |expr_10_0| () Int)
+(declare-fun |expr_11_1| () Bool)
+
+(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
+(declare-const |EVALEXPR_0| Int)
+(assert (= |EVALEXPR_0| x_5_1))
+(check-sat)
+(get-value (|EVALEXPR_0| ))
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2339",
+            "formattedMessage": "Info: CHC: Requested query:
+(set-option :timeout 1000)
+(set-logic HORN)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
+
+
+(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
+
+
+(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
+
+
+(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |error_target_3_0| () Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
+
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> error_target_3_0 false)))
+(check-sat)
+
+
+",
+            "message": "CHC: Requested query:
+(set-option :timeout 1000)
+(set-logic HORN)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
+
+
+(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
+
+
+(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
+
+
+(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |error_target_3_0| () Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
+
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> error_target_3_0 false)))
+(check-sat)
+",
+            "severity": "info",
+            "type": "Info"
+        },
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+",
+            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "3996",
+            "formattedMessage": "Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
+
+",
+            "message": "CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "6240",
+            "formattedMessage": "Info: BMC: Requested query:
+(set-option :produce-models true)
+(set-option :timeout 1000)
+(set-logic ALL)
+(declare-fun |x_5_3| () Int)
+(declare-fun |error_0| () Int)
+(declare-fun |this_0| () Int)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-fun |tx_0| () |tx_type|)
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-fun |crypto_0| () |crypto_type|)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-fun |abi_0| () |abi_type|)
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |state_0| () |state_type|)
+(declare-fun |x_5_4| () Int)
+(declare-fun |x_5_0| () Int)
+(declare-fun |expr_6_0| () Int)
+(declare-fun |x_5_1| () Int)
+(declare-fun |expr_9_0| () Int)
+(declare-fun |expr_10_0| () Int)
+(declare-fun |expr_11_1| () Bool)
+
+(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
+(declare-const |EVALEXPR_0| Int)
+(assert (= |EVALEXPR_0| x_5_1))
+(check-sat)
+(get-value (|EVALEXPR_0| ))
+
+
+",
+            "message": "BMC: Requested query:
+(set-option :produce-models true)
+(set-option :timeout 1000)
+(set-logic ALL)
+(declare-fun |x_5_3| () Int)
+(declare-fun |error_0| () Int)
+(declare-fun |this_0| () Int)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-fun |tx_0| () |tx_type|)
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-fun |crypto_0| () |crypto_type|)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-fun |abi_0| () |abi_type|)
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |state_0| () |state_type|)
+(declare-fun |x_5_4| () Int)
+(declare-fun |x_5_0| () Int)
+(declare-fun |expr_6_0| () Int)
+(declare-fun |x_5_1| () Int)
+(declare-fun |expr_9_0| () Int)
+(declare-fun |expr_10_0| () Int)
+(declare-fun |expr_11_1| () Bool)
+
+(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
+(declare-const |EVALEXPR_0| Int)
+(assert (= |EVALEXPR_0| x_5_1))
+(check-sat)
+(get-value (|EVALEXPR_0| ))
+",
+            "severity": "info",
+            "type": "Info"
+        },
+        {
+            "component": "general",
+            "errorCode": "2788",
+            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+",
+            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "8084",
+            "formattedMessage": "Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
+
+",
+            "message": "BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_bmc/input.json b/test/cmdlineTests/standard_model_checker_print_query_bmc/input.json
new file mode 100644
index 0000000000..7957a58e3e
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_bmc/input.json
@@ -0,0 +1,26 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
+                contract C
+                {
+                    function f() public pure {
+                        uint x = 0;
+                        assert(x == 0);
+                    }
+                }"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "bmc",
+            "printQuery": true,
+			"solvers": ["smtlib2"]
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json b/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
new file mode 100644
index 0000000000..f7b4dc7e28
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_bmc/output.json
@@ -0,0 +1,129 @@
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x8704a7b848b706ef33cbfc06e4f185636f568a29621126b7244355dd0de956bb": "(set-option :produce-models true)
+(set-logic ALL)
+(declare-fun |error_0| () Int)
+(declare-fun |this_0| () Int)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-fun |tx_0| () |tx_type|)
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-fun |crypto_0| () |crypto_type|)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-fun |abi_0| () |abi_type|)
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |state_0| () |state_type|)
+(declare-fun |x_5_0| () Int)
+(declare-fun |expr_6_0| () Int)
+(declare-fun |x_5_1| () Int)
+(declare-fun |expr_9_0| () Int)
+(declare-fun |expr_10_0| () Int)
+(declare-fun |expr_11_1| () Bool)
+
+(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
+(declare-const |EVALEXPR_0| Int)
+(assert (= |EVALEXPR_0| x_5_1))
+(check-sat)
+(get-value (|EVALEXPR_0| ))
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6240",
+            "formattedMessage": "Info: BMC: Requested query:
+(set-option :produce-models true)
+(set-logic ALL)
+(declare-fun |error_0| () Int)
+(declare-fun |this_0| () Int)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-fun |tx_0| () |tx_type|)
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-fun |crypto_0| () |crypto_type|)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-fun |abi_0| () |abi_type|)
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |state_0| () |state_type|)
+(declare-fun |x_5_0| () Int)
+(declare-fun |expr_6_0| () Int)
+(declare-fun |x_5_1| () Int)
+(declare-fun |expr_9_0| () Int)
+(declare-fun |expr_10_0| () Int)
+(declare-fun |expr_11_1| () Bool)
+
+(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
+(declare-const |EVALEXPR_0| Int)
+(assert (= |EVALEXPR_0| x_5_1))
+(check-sat)
+(get-value (|EVALEXPR_0| ))
+
+
+",
+            "message": "BMC: Requested query:
+(set-option :produce-models true)
+(set-logic ALL)
+(declare-fun |error_0| () Int)
+(declare-fun |this_0| () Int)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-fun |tx_0| () |tx_type|)
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-fun |crypto_0| () |crypto_type|)
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-fun |abi_0| () |abi_type|)
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |state_0| () |state_type|)
+(declare-fun |x_5_0| () Int)
+(declare-fun |expr_6_0| () Int)
+(declare-fun |x_5_1| () Int)
+(declare-fun |expr_9_0| () Int)
+(declare-fun |expr_10_0| () Int)
+(declare-fun |expr_11_1| () Bool)
+
+(assert (and (and (and true true) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> (and true true) true) (and (= expr_10_0 0) (and (=> (and true true) (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_1) (and (ite (and true true) (= x_5_1 expr_6_0) (= x_5_1 x_5_0)) (and (=> (and true true) true) (and (= expr_6_0 0) (and (= x_5_0 0) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) true))))))))))) (not expr_11_1)))
+(declare-const |EVALEXPR_0| Int)
+(assert (= |EVALEXPR_0| x_5_1))
+(check-sat)
+(get-value (|EVALEXPR_0| ))
+",
+            "severity": "info",
+            "type": "Info"
+        },
+        {
+            "component": "general",
+            "errorCode": "2788",
+            "formattedMessage": "Warning: BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+",
+            "message": "BMC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "8084",
+            "formattedMessage": "Warning: BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.
+
+",
+            "message": "BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available. None of the installed solvers was enabled.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_chc/input.json b/test/cmdlineTests/standard_model_checker_print_query_chc/input.json
new file mode 100644
index 0000000000..d5801ef260
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_chc/input.json
@@ -0,0 +1,27 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
+                contract C
+                {
+                    function f() public pure {
+                        uint x = 0;
+                        assert(x == 0);
+                    }
+                }"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "chc",
+            "printQuery": true,
+			"solvers": ["smtlib2"],
+			"timeout": 1000
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_chc/output.json b/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
new file mode 100644
index 0000000000..9ef925b205
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_chc/output.json
@@ -0,0 +1,420 @@
+{
+    "auxiliaryInputRequested":
+    {
+        "smtlib2queries":
+        {
+            "0x1880095c52d8681601c6821e4a5c29740649509af99947bce54102546dd3376a": "(set-option :timeout 1000)
+(set-logic HORN)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
+
+
+(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
+
+
+(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
+
+
+(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |error_target_3_0| () Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
+
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> error_target_3_0 false)))
+(check-sat)
+"
+        }
+    },
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "2339",
+            "formattedMessage": "Info: CHC: Requested query:
+(set-option :timeout 1000)
+(set-logic HORN)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
+
+
+(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
+
+
+(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
+
+
+(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |error_target_3_0| () Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
+
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> error_target_3_0 false)))
+(check-sat)
+
+
+",
+            "message": "CHC: Requested query:
+(set-option :timeout 1000)
+(set-logic HORN)
+(declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
+(declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
+(declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
+(declare-datatypes ((|crypto_type| 0)) (((|crypto_type| (|ecrecover| (Array |ecrecover_input_type| Int)) (|keccak256| (Array |bytes_tuple| Int)) (|ripemd160| (Array |bytes_tuple| Int)) (|sha256| (Array |bytes_tuple| Int))))))
+(declare-datatypes ((|abi_type| 0)) (((|abi_type|))))
+(declare-datatypes ((|state_type| 0)) (((|state_type| (|balances| (Array Int Int))))))
+(declare-fun |interface_0_C_16_0| (Int |abi_type| |crypto_type| |state_type| ) Bool)
+(declare-fun |nondet_interface_1_C_16_0| (Int Int |abi_type| |crypto_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_constructor_2_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (state_0 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (= error_0 0) (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_0))))
+
+
+(declare-fun |summary_3_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |summary_4_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|))
+(=> (and (and (nondet_interface_1_C_16_0 error_0 this_0 abi_0 crypto_0 state_0 state_1) true) (and (= error_0 0) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2))) (nondet_interface_1_C_16_0 error_1 this_0 abi_0 crypto_0 state_0 state_2))))
+
+
+(declare-fun |block_5_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_6_f_14_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int))
+(=> (and (and (block_5_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true)) true) (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1))))
+
+
+(declare-fun |block_7_return_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(declare-fun |block_8_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true)))))))))) (and (and true (not expr_11_1)) (= error_1 1))) (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (block_8_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2) (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_6_f_14_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (= error_1 error_0) (and (= expr_11_1 (= expr_9_0 expr_10_0)) (and (=> true true) (and (= expr_10_0 0) (and (=> true (and (>= expr_9_0 0) (<= expr_9_0 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (= expr_9_0 x_5_2) (and (= x_5_2 expr_6_0) (and (=> true true) (and (= expr_6_0 0) (and (= x_5_1 0) true))))))))))) true) (block_7_return_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_7_return_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) true) true) (summary_3_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |block_9_function_f__15_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| Int ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1)))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (block_9_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1 x_5_1) (and (summary_3_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_2 state_3) (and (= state_2 (|state_type| (store (|balances| state_1) this_0 (+ (select (|balances| state_1) this_0) funds_2_0)))) (and (and (>= (+ (select (|balances| state_1) this_0) funds_2_0) 0) (<= (+ (select (|balances| state_1) this_0) funds_2_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935)) (and (>= funds_2_0 (|msg.value| tx_0)) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (and (and (and (and (and (= (|msg.value| tx_0) 0) (= (|msg.sig| tx_0) 638722032)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 0) 38)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 1) 18)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 2) 31)) (= (select (|bytes_tuple_accessor_array| (|msg.data| tx_0)) 3) 240)) (>= (|bytes_tuple_accessor_length| (|msg.data| tx_0)) 4))) (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true))))))) true) (summary_4_function_f__15_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_3))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |contract_initializer_10_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(declare-fun |contract_initializer_entry_11_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (= state_1 state_0) (= error_0 0)) true) (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |contract_initializer_after_init_12_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_entry_11_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (contract_initializer_after_init_12_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) true) (contract_initializer_10_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(declare-fun |implicit_constructor_entry_13_C_16_0| (Int Int |abi_type| |crypto_type| |tx_type| |state_type| |state_type| ) Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (and (and (and (= state_1 state_0) (= error_0 0)) true) true) true) (>= (select (|balances| state_1) this_0) (|msg.value| tx_0))) (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true)) (> error_1 0)) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (implicit_constructor_entry_13_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (and (= error_1 0) (and (contract_initializer_10_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_1 state_2) true))) true) (summary_constructor_2_C_16_0 error_1 this_0 abi_0 crypto_0 tx_0 state_0 state_2))))
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (summary_constructor_2_C_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) true) (and (and (and (and (and (and (and (and (and (and (and (and (and (> (|block.prevrandao| tx_0) 18446744073709551616) (and (>= (|block.basefee| tx_0) 0) (<= (|block.basefee| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.chainid| tx_0) 0) (<= (|block.chainid| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.coinbase| tx_0) 0) (<= (|block.coinbase| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|block.prevrandao| tx_0) 0) (<= (|block.prevrandao| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.gaslimit| tx_0) 0) (<= (|block.gaslimit| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.number| tx_0) 0) (<= (|block.number| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|block.timestamp| tx_0) 0) (<= (|block.timestamp| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|msg.sender| tx_0) 0) (<= (|msg.sender| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|msg.value| tx_0) 0) (<= (|msg.value| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (and (>= (|tx.origin| tx_0) 0) (<= (|tx.origin| tx_0) 1461501637330902918203684832716283019655932542975))) (and (>= (|tx.gasprice| tx_0) 0) (<= (|tx.gasprice| tx_0) 115792089237316195423570985008687907853269984665640564039457584007913129639935))) (= (|msg.value| tx_0) 0)) (= error_0 0))) (interface_0_C_16_0 this_0 abi_0 crypto_0 state_1))))
+
+
+(declare-fun |error_target_3_0| () Bool)
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> (and (and (interface_0_C_16_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__15_16_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 state_1) (= error_0 1))) error_target_3_0)))
+
+
+
+(assert
+(forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_10_0 Int) (expr_11_1 Bool) (expr_6_0 Int) (expr_9_0 Int) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_5_0 Int) (x_5_1 Int) (x_5_2 Int))
+(=> error_target_3_0 false)))
+(check-sat)
+",
+            "severity": "info",
+            "type": "Info"
+        },
+        {
+            "component": "general",
+            "errorCode": "5840",
+            "formattedMessage": "Warning: CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.
+
+",
+            "message": "CHC: 1 verification condition(s) could not be proved. Enable the model checker option \"show unproved\" to see all of them. Consider choosing a specific contract to be verified in order to reduce the solving problems. Consider increasing the timeout per query.",
+            "severity": "warning",
+            "type": "Warning"
+        },
+        {
+            "component": "general",
+            "errorCode": "3996",
+            "formattedMessage": "Warning: CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.
+
+",
+            "message": "CHC analysis was not possible. No Horn solver was available. None of the installed solvers was enabled.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/input.json b/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/input.json
new file mode 100644
index 0000000000..97822c2bde
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/input.json
@@ -0,0 +1,25 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
+                contract C
+                {
+                    function f() public pure {
+                        uint x = 0;
+                        assert(x == 0);
+                    }
+                }"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+            "printQuery": 17
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/output.json b/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/output.json
new file mode 100644
index 0000000000..00c389f7a4
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_invalid_arg/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "settings.modelChecker.printQuery must be a Boolean value.",
+            "message": "settings.modelChecker.printQuery must be a Boolean value.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/input.json b/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/input.json
new file mode 100644
index 0000000000..0159c256e6
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/input.json
@@ -0,0 +1,25 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
+                contract C
+                {
+                    function f() public pure {
+                        uint x = 0;
+                        assert(x == 0);
+                    }
+                }"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+            "printQuery": true
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/output.json b/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/output.json
new file mode 100644
index 0000000000..42d4b5b2db
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_no_smtlib2_solver/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Only SMTLib2 solver can be enabled to print queries",
+            "message": "Only SMTLib2 solver can be enabled to print queries",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/input.json b/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/input.json
new file mode 100644
index 0000000000..9ebda00174
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/input.json
@@ -0,0 +1,26 @@
+{
+	"language": "Solidity",
+	"sources":
+	{
+		"A":
+		{
+			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0;\n
+                contract C
+                {
+                    function f() public pure {
+                        uint x = 0;
+                        assert(x == 0);
+                    }
+                }"
+		}
+	},
+	"settings":
+	{
+		"modelChecker":
+		{
+			"engine": "all",
+            "printQuery": true,
+            "solvers": ["smtlib2", "z3"]
+		}
+	}
+}
diff --git a/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/output.json b/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/output.json
new file mode 100644
index 0000000000..42d4b5b2db
--- /dev/null
+++ b/test/cmdlineTests/standard_model_checker_print_query_superflous_solver/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Only SMTLib2 solver can be enabled to print queries",
+            "message": "Only SMTLib2 solver can be enabled to print queries",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
index bf59a0d9da..ebeca53f5b 100644
--- a/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
+++ b/test/cmdlineTests/standard_model_checker_solvers_smtlib2/output.json
@@ -30,8 +30,7 @@
 (check-sat)
 (get-value (|EVALEXPR_0| ))
 ",
-            "0xa991e3c158410479bc0a0540fb60ce7010aec315a5b0010d254f12f3d1f0a4e5": "(set-logic HORN)
-
+            "0xe3dc20257e2b1bd9c6eb77b75913ec3a5752be174e0fd56af16d9fc95afa1b15": "(set-logic HORN)
 (declare-datatypes ((|bytes_tuple| 0)) (((|bytes_tuple| (|bytes_tuple_accessor_array| (Array Int Int)) (|bytes_tuple_accessor_length| Int)))))
 (declare-datatypes ((|tx_type| 0)) (((|tx_type| (|block.basefee| Int) (|block.chainid| Int) (|block.coinbase| Int) (|block.gaslimit| Int) (|block.number| Int) (|block.prevrandao| Int) (|block.timestamp| Int) (|blockhash| (Array Int Int)) (|msg.data| |bytes_tuple|) (|msg.sender| Int) (|msg.sig| Int) (|msg.value| Int) (|tx.gasprice| Int) (|tx.origin| Int)))))
 (declare-datatypes ((|ecrecover_input_type| 0)) (((|ecrecover_input_type| (|hash| Int) (|v| Int) (|r| Int) (|s| Int)))))
@@ -148,10 +147,12 @@
 (=> (and (and (interface_0_C_14_0 this_0 abi_0 crypto_0 state_0) true) (and (summary_4_function_f__13_14_0 error_0 this_0 abi_0 crypto_0 tx_0 state_0 x_3_0 state_1 x_3_1) (= error_0 1))) error_target_3_0)))
 
 
+
 (assert
 (forall ( (abi_0 |abi_type|) (crypto_0 |crypto_type|) (error_0 Int) (error_1 Int) (expr_7_0 Int) (expr_8_0 Int) (expr_9_1 Bool) (funds_2_0 Int) (state_0 |state_type|) (state_1 |state_type|) (state_2 |state_type|) (state_3 |state_type|) (this_0 Int) (tx_0 |tx_type|) (x_3_0 Int) (x_3_1 Int) (x_3_2 Int))
 (=> error_target_3_0 false)))
-(check-sat)"
+(check-sat)
+"
         }
     },
     "errors":
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 1fc033533d..4a76ce4f15 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -219,6 +219,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			{true, false},
 			{ModelCheckerExtCalls::Mode::TRUSTED},
 			{{InvariantType::Contract, InvariantType::Reentrancy}},
+			false, // --model-checker-print-query
 			true,
 			true,
 			true,
diff --git a/test/tools/fuzzer_common.cpp b/test/tools/fuzzer_common.cpp
index 531fc3c177..1bb04bf66a 100644
--- a/test/tools/fuzzer_common.cpp
+++ b/test/tools/fuzzer_common.cpp
@@ -111,6 +111,7 @@ void FuzzerUtil::testCompiler(
 			frontend::ModelCheckerEngine::All(),
 			frontend::ModelCheckerExtCalls{},
 			frontend::ModelCheckerInvariants::All(),
+			/*printQuery=*/false,
 			/*showProvedSafe=*/false,
 			/*showUnproved=*/false,
 			/*showUnsupported=*/false,

From 32e82970489b3c408a08b0d5361a2038ec92a79b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 19 Jun 2023 14:16:20 +0200
Subject: [PATCH 1449/1748] Remove unused bytecodecompare/deploy_key.enc

---
 scripts/bytecodecompare/deploy_key.enc | Bin 1680 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 scripts/bytecodecompare/deploy_key.enc

diff --git a/scripts/bytecodecompare/deploy_key.enc b/scripts/bytecodecompare/deploy_key.enc
deleted file mode 100644
index acab2a279151f2cfb5f33c8d4cd9614a1898db4d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1680
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
a)1IY2pV51-`N#7&Y02#vV+C5FawJKy>q|%g


From 4752b31e6c2e2d9f7cdfd7822d86ce69814a326d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 16 Jun 2023 14:29:18 +0200
Subject: [PATCH 1450/1748] cmdlineTests.sh: Rewrite test selection to use find

---
 test/cmdlineTests.sh | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index e1d8a57468..7a219a1a98 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -42,8 +42,7 @@ source "${REPO_ROOT}/scripts/common_cmdline.sh"
 pushd "${REPO_ROOT}/test/cmdlineTests" > /dev/null
 autoupdate=false
 no_smt=false
-declare -a selected_tests
-declare -a patterns_with_no_matches
+declare -a included_test_patterns
 while [[ $# -gt 0 ]]
 do
     case "$1" in
@@ -56,30 +55,35 @@ do
             shift
             ;;
         *)
-            matching_tests=$(find . -mindepth 1 -maxdepth 1 -type d -name "$1" | cut -c 3- | LC_COLLATE=C sort)
-
-            if [[ $matching_tests == "" ]]
-            then
-                patterns_with_no_matches+=("$1")
-                printWarning "No tests matching pattern '$1' found."
-            else
-                # shellcheck disable=SC2206 # We do not support test names containing spaces.
-                selected_tests+=($matching_tests)
-            fi
-
+            included_test_patterns+=("$1")
             shift
             ;;
     esac
 done
 
-if (( ${#selected_tests[@]} == 0 && ${#patterns_with_no_matches[@]} == 0 ))
+(( ${#included_test_patterns[@]} > 0 )) || included_test_patterns+=('*')
+
+test_name_filter=('(' -name "${included_test_patterns[0]}")
+for pattern in "${included_test_patterns[@]:1}"
+do
+    test_name_filter+=(-or -name "$pattern")
+done
+test_name_filter+=(')')
+
+# NOTE: We want leading symbols in names to affect the sort order but without
+# LC_COLLATE=C sort seems to ignore them.
+# shellcheck disable=SC2207 # We do not support test names containing spaces.
+selected_tests=($(find . -mindepth 1 -maxdepth 1 -type d "${test_name_filter[@]}" | cut -c 3- | LC_COLLATE=C sort))
+
+if (( ${#selected_tests[@]} == 0 ))
 then
-    # NOTE: We want leading symbols in names to affect the sort order but without
-    # LC_COLLATE=C sort seems to ignore them.
-    all_tests=$(echo * | tr '[:space:]' '\n' | LC_COLLATE=C sort)
-    # shellcheck disable=SC2206 # We do not support test names containing spaces.
-    selected_tests=($all_tests)
+    printWarning "The pattern '${test_name_filter[*]}' did not match any tests."
+    exit 0;
+else
+    test_count=$(find . -mindepth 1 -maxdepth 1 -type d | wc -l)
+    printLog "Selected ${#selected_tests[@]} out of ${test_count} tests."
 fi
+
 popd > /dev/null
 
 case "$OSTYPE" in

From 399457d74b8953457db206d937a2ae11654a6cfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 16 Jun 2023 14:36:24 +0200
Subject: [PATCH 1451/1748] cmdlineTests.sh: Add --exclude option

---
 docs/contributing.rst |  6 ++++--
 test/cmdlineTests.sh  | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 02ca00455b..7f444871d5 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -280,6 +280,7 @@ one per subdirectory, and can be executed using the ``cmdlineTests.sh`` script.
 By default the script runs all available tests.
 You can also provide one or more `file name patterns <https://www.gnu.org/software/bash/manual/bash.html#Filename-Expansion>`_,
 in which case only the tests matching at least one pattern will be executed.
+It is also possible to exclude files matching a specific pattern by prefixing it with ``--exclude``.
 
 By default the script assumes that a ``solc`` binary is available inside the ``build/`` subdirectory
 inside the working copy.
@@ -291,10 +292,11 @@ Example:
 .. code-block:: bash
 
     export SOLIDITY_BUILD_DIR=~/solidity/build/
-    test/cmdlineTests.sh "standard_*" "*_yul_*"
+    test/cmdlineTests.sh "standard_*" "*_yul_*" --exclude "standard_yul_*"
 
 The commands above will run tests from directories starting with ``test/cmdlineTests/standard_`` and
-subdirectories of ``test/cmdlineTests/`` that have ``_yul_`` somewhere in the name.
+subdirectories of ``test/cmdlineTests/`` that have ``_yul_`` somewhere in the name,
+but no test whose name starts with ``standard_yul_`` will be executed.
 It will also assume that the file ``solidity/build/solc/solc`` inside your home directory is the
 compiler binary (unless you are on Windows -- then ``solidity/build/solc/Release/solc.exe``).
 
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 7a219a1a98..b02880557c 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -43,6 +43,7 @@ pushd "${REPO_ROOT}/test/cmdlineTests" > /dev/null
 autoupdate=false
 no_smt=false
 declare -a included_test_patterns
+declare -a excluded_test_patterns
 while [[ $# -gt 0 ]]
 do
     case "$1" in
@@ -54,6 +55,12 @@ do
             no_smt=true
             shift
             ;;
+        --exclude)
+            [[ $2 != '' ]] || fail "No pattern given to --exclude option or the pattern is empty."
+            excluded_test_patterns+=("$2")
+            shift
+            shift
+            ;;
         *)
             included_test_patterns+=("$1")
             shift
@@ -70,6 +77,11 @@ do
 done
 test_name_filter+=(')')
 
+for pattern in "${excluded_test_patterns[@]}"
+do
+    test_name_filter+=(-and -not -name "$pattern")
+done
+
 # NOTE: We want leading symbols in names to affect the sort order but without
 # LC_COLLATE=C sort seems to ignore them.
 # shellcheck disable=SC2207 # We do not support test names containing spaces.

From fac7ca943bb1db8d5b8afab61d73f8b03e2bbe5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 16 Jun 2023 19:37:53 +0200
Subject: [PATCH 1452/1748] Parallelize CLI tests

---
 .circleci/config.yml            |  6 ++++-
 .circleci/parallel_cli_tests.py | 45 +++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 1 deletion(-)
 create mode 100755 .circleci/parallel_cli_tests.py

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d5ea61ad26..65222f0827 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -202,7 +202,7 @@ defaults:
   - run_cmdline_tests: &run_cmdline_tests
       name: command line tests
       no_output_timeout: 30m
-      command: ./test/cmdlineTests.sh
+      command: .circleci/parallel_cli_tests.py
 
   - run_docs_pragma_min_version: &run_docs_pragma_min_version
       name: docs pragma version check
@@ -1053,6 +1053,7 @@ jobs:
 
   t_osx_cli:
     <<: *base_osx
+    parallelism: 7 # Should match number of tests in .circleci/cli.sh
     steps:
       - checkout
       - when:
@@ -1147,6 +1148,7 @@ jobs:
 
   t_ubu_cli: &t_ubu_cli
     <<: *base_ubuntu2204_small
+    parallelism: 7 # Should match number of tests in .circleci/cli.sh
     <<: *steps_cmdline_tests
 
   t_ubu_force_release_cli: &t_ubu_force_release_cli
@@ -1164,6 +1166,7 @@ jobs:
   t_ubu_asan_cli:
     # Runs slightly faster on medium but we only run it nightly so efficiency matters more.
     <<: *base_ubuntu2204
+    parallelism: 7 # Should match number of tests in .circleci/cli.sh
     environment:
       TERM: xterm
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
@@ -1205,6 +1208,7 @@ jobs:
 
   t_ubu_ubsan_clang_cli:
     <<: *base_ubuntu2204_clang
+    parallelism: 7 # Should match number of tests in .circleci/cli.sh
     <<: *steps_cmdline_tests
 
   t_ems_solcjs:
diff --git a/.circleci/parallel_cli_tests.py b/.circleci/parallel_cli_tests.py
new file mode 100755
index 0000000000..ef78921806
--- /dev/null
+++ b/.circleci/parallel_cli_tests.py
@@ -0,0 +1,45 @@
+#!/usr/bin/env python3
+
+import subprocess
+import sys
+
+# Slowest CLI tests, whose execution takes time on the order of minutes (as of June 2023).
+# When adding/removing items here, remember to update `parallelism` value in jobs that run this script.
+# TODO: We should switch to time-based splitting but that requires JUnit XML report support in cmdlineTests.sh.
+tests_to_run_in_parallel = [
+    '~ast_import_export',                   # ~7 min
+    '~ast_export_with_stop_after_parsing',  # ~4 min
+    '~soljson_via_fuzzer',                  # ~3 min
+    '~via_ir_equivalence',                  # ~1 min
+    '~compilation_tests',                   # ~1 min
+    '~documentation_examples',              # ~1 min
+    '*',                                    # This item represents all the remaining tests
+]
+
+# Ask CircleCI to select a subset of tests for this parallel execution.
+# If `parallelism` in CI config is set correctly, we should get just one but we can handle any split.
+selected_tests = subprocess.check_output(
+    ['circleci', 'tests', 'split'],
+    input='\n'.join(tests_to_run_in_parallel),
+    encoding='ascii',
+).strip().split('\n')
+selected_tests = set(selected_tests) - {''}
+excluded_tests = set(tests_to_run_in_parallel) - selected_tests
+assert selected_tests.issubset(set(tests_to_run_in_parallel))
+
+if len(selected_tests) == 0:
+    print("No tests to run.")
+    sys.exit(0)
+
+if '*' in selected_tests:
+    filters = [arg for test_name in excluded_tests for arg in ['--exclude', test_name]]
+else:
+    filters = list(selected_tests)
+
+subprocess.run(
+    ['test/cmdlineTests.sh'] + filters,
+    stdin=sys.stdin,
+    stdout=sys.stdout,
+    stderr=sys.stderr,
+    check=True,
+)

From edd99b07fe947a133fac6039680c5282ee239801 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 21 Jun 2023 12:19:55 +0200
Subject: [PATCH 1453/1748] Disable failing OZ tests

---
 test/externalTests/zeppelin.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 5c02711251..cf8df4363e 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -93,6 +93,10 @@ function zeppelin_test
     sed -i "s|it(\('cannot nest reinitializers'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
     sed -i "s|it(\('prevents re-initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
     sed -i "s|it(\('can lock contract after initialization'\)|it.skip(\1|g" test/proxy/utils/Initializable.test.js
+    sed -i "s|it(\('calling upgradeTo on the implementation reverts'\)|it.skip(\1|g" test/proxy/utils/UUPSUpgradeable.test.js
+    sed -i "s|it(\('calling upgradeToAndCall on the implementation reverts'\)|it.skip(\1|g" test/proxy/utils/UUPSUpgradeable.test.js
+    sed -i "s|it(\('calling upgradeTo from a contract that is not an ERC1967 proxy\)|it.skip(\1|g" test/proxy/utils/UUPSUpgradeable.test.js
+    sed -i "s|it(\('calling upgradeToAndCall from a contract that is not an ERC1967 proxy\)|it.skip(\1|g" test/proxy/utils/UUPSUpgradeable.test.js
 
     # Here only the testToInt(248) and testToInt(256) cases fail so change the loop range to skip them
     sed -i "s|range(8, 256, 8)\(.forEach(bits => testToInt(bits));\)|range(8, 240, 8)\1|" test/utils/math/SafeCast.test.js

From e8c4d0e324fc86b60da3d27918b8a0de6f8d91fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 15 Jun 2023 12:43:37 +0200
Subject: [PATCH 1454/1748] More consistent file naming for bytecode compare
 artifacts

- This will make it easier to have a single variable specifying the interface.
---
 .circleci/config.yml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 65222f0827..f0af5e7a9d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -81,17 +81,16 @@ commands:
     steps:
       - run: mkdir test-cases/
       - run: cd test-cases && python3 ../scripts/isolate_tests.py ../test/
-      - run: cd test-cases && python3 ../scripts/bytecodecompare/prepare_report.py << parameters.binary_path >> --interface standard-json --report-file "../bytecode-report-<< parameters.label >>-json.txt"
+      - run: cd test-cases && python3 ../scripts/bytecodecompare/prepare_report.py << parameters.binary_path >> --interface standard-json --report-file "../bytecode-report-<< parameters.label >>-standard-json.txt"
       - run: cd test-cases && python3 ../scripts/bytecodecompare/prepare_report.py << parameters.binary_path >> --interface cli --report-file "../bytecode-report-<< parameters.label >>-cli.txt"
       - store_artifacts:
-          path: bytecode-report-<< parameters.label >>-json.txt
+          path: bytecode-report-<< parameters.label >>-standard-json.txt
       - store_artifacts:
           path: bytecode-report-<< parameters.label >>-cli.txt
       - persist_to_workspace:
           root: .
           paths:
-            - bytecode-report-<< parameters.label >>-json.txt
-            - bytecode-report-<< parameters.label >>-cli.txt
+            - bytecode-report-<< parameters.label >>-*.txt
       - matrix_notify_failure_unless_pr
 
   install_python3:
@@ -1553,13 +1552,13 @@ jobs:
     environment:
       REPORT_FILES: |
         bytecode-report-emscripten.txt
-        bytecode-report-ubuntu2004-static-json.txt
+        bytecode-report-ubuntu2004-static-standard-json.txt
         bytecode-report-ubuntu2004-static-cli.txt
-        bytecode-report-ubuntu-json.txt
+        bytecode-report-ubuntu-standard-json.txt
         bytecode-report-ubuntu-cli.txt
-        bytecode-report-osx-json.txt
+        bytecode-report-osx-standard-json.txt
         bytecode-report-osx-cli.txt
-        bytecode-report-windows-json.txt
+        bytecode-report-windows-standard-json.txt
         bytecode-report-windows-cli.txt
     steps:
       - attach_workspace:

From 3b80aa2ea401ba70f50d9f6be23c74bd280a2191 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 15 Jun 2023 14:06:32 +0200
Subject: [PATCH 1455/1748] Run Standard JSON and CLI bytecode report
 generation in parallel

---
 .circleci/config.yml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f0af5e7a9d..7e568f9d13 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -80,9 +80,22 @@ commands:
         type: string
     steps:
       - run: mkdir test-cases/
-      - run: cd test-cases && python3 ../scripts/isolate_tests.py ../test/
-      - run: cd test-cases && python3 ../scripts/bytecodecompare/prepare_report.py << parameters.binary_path >> --interface standard-json --report-file "../bytecode-report-<< parameters.label >>-standard-json.txt"
-      - run: cd test-cases && python3 ../scripts/bytecodecompare/prepare_report.py << parameters.binary_path >> --interface cli --report-file "../bytecode-report-<< parameters.label >>-cli.txt"
+      - run:
+          name: Prepare input files
+          command: |
+            cd test-cases/
+            python3 ../scripts/isolate_tests.py ../test/
+      - run:
+          name: Generate bytecode report
+          command: |
+            cd test-cases/
+            interface=$(echo -e "standard-json\ncli" | circleci tests split)
+            echo "Selected interface: ${interface}"
+
+            python3 ../scripts/bytecodecompare/prepare_report.py \
+              << parameters.binary_path >> \
+              --interface "$interface" \
+              --report-file "../bytecode-report-<< parameters.label >>-${interface}.txt"
       - store_artifacts:
           path: bytecode-report-<< parameters.label >>-standard-json.txt
       - store_artifacts:
@@ -1476,6 +1489,7 @@ jobs:
       TERM: xterm
       MAKEFLAGS: -j 2
       LC_ALL: C
+    parallelism: 2 # For prepare_bytecode_report
     steps:
       - checkout
       - attach_workspace:
@@ -1490,6 +1504,7 @@ jobs:
       TERM: xterm
       MAKEFLAGS: -j 2
       LC_ALL: C
+    parallelism: 2 # For prepare_bytecode_report
     steps:
       - checkout
       - attach_workspace:
@@ -1504,6 +1519,7 @@ jobs:
       TERM: xterm
       MAKEFLAGS: -j 5
       LC_ALL: C
+    parallelism: 2 # For prepare_bytecode_report
     steps:
       - checkout
       - attach_workspace:
@@ -1516,6 +1532,7 @@ jobs:
     <<: *base_win
     environment:
       LC_ALL: C
+    parallelism: 2 # For prepare_bytecode_report
     steps:
       # NOTE: For bytecode generation we need the input files to be byte-for-byte identical on all
       # platforms so line ending conversions must absolutely be disabled.

From 826fd90dcf51a8b89dda5362dd686159d0bd6a55 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Tue, 20 Jun 2023 19:38:30 +0200
Subject: [PATCH 1456/1748] Fix error in SMTChecker: Use rich indentifier
 instead of external identifier to ecnode member access to functions

---
 Changelog.md                                       |  1 +
 libsolidity/formal/SMTEncoder.cpp                  |  6 +++++-
 .../functions/functions_library_internal.sol       | 14 ++++++++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol

diff --git a/Changelog.md b/Changelog.md
index 7456a8a46e..69bd02624e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -20,6 +20,7 @@ Bugfixes:
  * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
  * SMTChecker: Fix false negative when a verification target can be violated only by trusted external call from another public function.
+ * SMTChecker: Fix internal error caused by using external identifier to encode member access to functions that take an internal function as a parameter.
  * Standard JSON Interface: Fix an incomplete AST being returned when analysis is interrupted by certain kinds of fatal errors.
  * Yul Optimizer: Ensure that the assignment of memory slots for variables moved to memory does not depend on AST IDs that may depend on whether additional files are included during compilation.
  * Yul Optimizer: Fix optimized IR being unnecessarily passed through the Yul optimizer again before bytecode generation.
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 818efac5cb..a328a7781a 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -33,6 +33,7 @@
 #include <liblangutil/CharStreamProvider.h>
 
 #include <libsolutil/Algorithms.h>
+#include <libsolutil/FunctionSelector.h>
 
 #include <range/v3/view.hpp>
 
@@ -1358,7 +1359,10 @@ bool SMTEncoder::visit(MemberAccess const& _memberAccess)
 	{
 		auto const* functionType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type);
 		if (functionType && functionType->hasDeclaration())
-			defineExpr(_memberAccess, functionType->externalIdentifier());
+			defineExpr(
+				_memberAccess,
+				util::selectorFromSignatureU32(functionType->richIdentifier())
+			);
 
 		return true;
 	}
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol b/test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol
new file mode 100644
index 0000000000..405c3f7150
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/functions/functions_library_internal.sol
@@ -0,0 +1,14 @@
+library L {
+	function value(function()internal a, uint256 b) internal {}
+}
+contract C {
+	using L for function()internal;
+
+	function f() public {
+		function()internal x;
+		x.value(42);
+ 	}
+}
+// ====
+// SMTEngine: all
+// ----

From 10670d62864791dff542025c610f027f9ca7c07a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 19 Jun 2023 11:28:40 +0200
Subject: [PATCH 1457/1748] prepare_report: Replace hard-coded optimize setting
 with selectable presets

---
 scripts/bytecodecompare/prepare_report.js     | 174 ++++++++++--------
 scripts/bytecodecompare/prepare_report.py     |  58 +++++-
 .../test_bytecodecompare_prepare_report.py    |  14 +-
 3 files changed, 152 insertions(+), 94 deletions(-)

diff --git a/scripts/bytecodecompare/prepare_report.js b/scripts/bytecodecompare/prepare_report.js
index 36acfbb358..8c714679be 100755
--- a/scripts/bytecodecompare/prepare_report.js
+++ b/scripts/bytecodecompare/prepare_report.js
@@ -4,6 +4,10 @@ const fs = require('fs')
 
 const compiler = require('solc')
 
+SETTINGS_PRESETS = {
+    'legacy-optimize':    {optimize: true},
+    'legacy-no-optimize': {optimize: false},
+}
 
 function loadSource(sourceFileName, stripSMTPragmas)
 {
@@ -23,96 +27,112 @@ function cleanString(string)
     return (string !== '' ? string : undefined)
 }
 
-
+let inputFiles = []
 let stripSMTPragmas = false
-let firstFileArgumentIndex = 2
+let presets = []
 
-if (process.argv.length >= 3 && process.argv[2] === '--strip-smt-pragmas')
+for (let i = 2; i < process.argv.length; ++i)
 {
-    stripSMTPragmas = true
-    firstFileArgumentIndex = 3
-}
-
-for (const optimize of [false, true])
-{
-    for (const filename of process.argv.slice(firstFileArgumentIndex))
+    if (process.argv[i] === '--strip-smt-pragmas')
+        stripSMTPragmas = true
+    else if (process.argv[i] === '--preset')
     {
-        if (filename !== undefined)
-        {
-            let input = {
-                language: 'Solidity',
-                sources: {
-                    [filename]: {content: loadSource(filename, stripSMTPragmas)}
-                },
-                settings: {
-                    optimizer: {enabled: optimize},
-                    outputSelection: {'*': {'*': ['evm.bytecode.object', 'metadata']}}
-                }
-            }
-            if (!stripSMTPragmas)
-                input['settings']['modelChecker'] = {engine: 'none'}
+        if (i + 1 === process.argv.length)
+            throw Error("Option --preset was used, but no preset name given.")
 
-            let serializedOutput
-            let result
-            const serializedInput = JSON.stringify(input)
+        presets.push(process.argv[i + 1])
+        ++i;
+    }
+    else
+        inputFiles.push(process.argv[i])
+}
 
-            let internalCompilerError = false
-            try
-            {
-                serializedOutput = compiler.compile(serializedInput)
-            }
-            catch (exception)
-            {
-                internalCompilerError = true
-            }
+if (presets.length === 0)
+    presets = ['legacy-no-optimize', 'legacy-optimize']
 
-            if (!internalCompilerError)
-            {
-                result = JSON.parse(serializedOutput)
-
-                if ('errors' in result)
-                    for (const error of result['errors'])
-                        // JSON interface still returns contract metadata in case of an internal compiler error while
-                        // CLI interface does not. To make reports comparable we must force this case to be detected as
-                        // an error in both cases.
-                        if (['UnimplementedFeatureError', 'CompilerError', 'CodeGenerationError'].includes(error['type']))
-                        {
-                            internalCompilerError = true
-                            break
-                        }
-            }
+for (const preset of presets)
+    if (!(preset in SETTINGS_PRESETS))
+        throw Error(`Invalid preset name: ${preset}.`)
 
-            if (
-                internalCompilerError ||
-                !('contracts' in result) ||
-                Object.keys(result['contracts']).length === 0 ||
-                Object.keys(result['contracts']).every(file => Object.keys(result['contracts'][file]).length === 0)
-            )
-                // NOTE: do not exit here because this may be run on source which cannot be compiled
-                console.log(filename + ': <ERROR>')
-            else
-                for (const contractFile in result['contracts'])
-                    for (const contractName in result['contracts'][contractFile])
-                    {
-                        const contractResults = result['contracts'][contractFile][contractName]
+for (const preset of presets)
+{
+    settings = SETTINGS_PRESETS[preset]
 
-                        let bytecode = '<NO BYTECODE>'
-                        let metadata = '<NO METADATA>'
+    for (const filename of inputFiles)
+    {
+        let input = {
+            language: 'Solidity',
+            sources: {
+                [filename]: {content: loadSource(filename, stripSMTPragmas)}
+            },
+            settings: {
+                optimizer: {enabled: settings.optimize},
+                outputSelection: {'*': {'*': ['evm.bytecode.object', 'metadata']}}
+            }
+        }
+        if (!stripSMTPragmas)
+            input['settings']['modelChecker'] = {engine: 'none'}
 
-                        if (
-                            'evm' in contractResults &&
-                            'bytecode' in contractResults['evm'] &&
-                            'object' in contractResults['evm']['bytecode'] &&
-                            cleanString(contractResults.evm.bytecode.object) !== undefined
-                        )
-                            bytecode = cleanString(contractResults.evm.bytecode.object)
+        let serializedOutput
+        let result
+        const serializedInput = JSON.stringify(input)
 
-                        if ('metadata' in contractResults && cleanString(contractResults.metadata) !== undefined)
-                            metadata = contractResults.metadata
+        let internalCompilerError = false
+        try
+        {
+            serializedOutput = compiler.compile(serializedInput)
+        }
+        catch (exception)
+        {
+            internalCompilerError = true
+        }
 
-                        console.log(filename + ':' + contractName + ' ' + bytecode)
-                        console.log(filename + ':' + contractName + ' ' + metadata)
+        if (!internalCompilerError)
+        {
+            result = JSON.parse(serializedOutput)
+
+            if ('errors' in result)
+                for (const error of result['errors'])
+                    // JSON interface still returns contract metadata in case of an internal compiler error while
+                    // CLI interface does not. To make reports comparable we must force this case to be detected as
+                    // an error in both cases.
+                    if (['UnimplementedFeatureError', 'CompilerError', 'CodeGenerationError'].includes(error['type']))
+                    {
+                        internalCompilerError = true
+                        break
                     }
         }
+
+        if (
+            internalCompilerError ||
+            !('contracts' in result) ||
+            Object.keys(result['contracts']).length === 0 ||
+            Object.keys(result['contracts']).every(file => Object.keys(result['contracts'][file]).length === 0)
+        )
+            // NOTE: do not exit here because this may be run on source which cannot be compiled
+            console.log(filename + ': <ERROR>')
+        else
+            for (const contractFile in result['contracts'])
+                for (const contractName in result['contracts'][contractFile])
+                {
+                    const contractResults = result['contracts'][contractFile][contractName]
+
+                    let bytecode = '<NO BYTECODE>'
+                    let metadata = '<NO METADATA>'
+
+                    if (
+                        'evm' in contractResults &&
+                        'bytecode' in contractResults['evm'] &&
+                        'object' in contractResults['evm']['bytecode'] &&
+                        cleanString(contractResults.evm.bytecode.object) !== undefined
+                    )
+                        bytecode = cleanString(contractResults.evm.bytecode.object)
+
+                    if ('metadata' in contractResults && cleanString(contractResults.metadata) !== undefined)
+                        metadata = contractResults.metadata
+
+                    console.log(filename + ':' + contractName + ' ' + bytecode)
+                    console.log(filename + ':' + contractName + ' ' + metadata)
+                }
     }
 }
diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
index 90901e8b79..6ec80e753a 100755
--- a/scripts/bytecodecompare/prepare_report.py
+++ b/scripts/bytecodecompare/prepare_report.py
@@ -26,12 +26,29 @@ class CompilerInterface(Enum):
     STANDARD_JSON = 'standard-json'
 
 
+class SettingsPreset(Enum):
+    LEGACY_OPTIMIZE = 'legacy-optimize'
+    LEGACY_NO_OPTIMIZE = 'legacy-no-optimize'
+
+
 class SMTUse(Enum):
     PRESERVE = 'preserve'
     DISABLE = 'disable'
     STRIP_PRAGMAS = 'strip-pragmas'
 
 
+@dataclass(frozen=True)
+class CompilerSettings:
+    optimize: bool
+
+    @staticmethod
+    def from_preset(preset: SettingsPreset):
+        return {
+            SettingsPreset.LEGACY_OPTIMIZE:    CompilerSettings(optimize=True),
+            SettingsPreset.LEGACY_NO_OPTIMIZE: CompilerSettings(optimize=False),
+        }[preset]
+
+
 @dataclass(frozen=True)
 class ContractReport:
     contract_name: str
@@ -190,13 +207,15 @@ def parse_cli_output(source_file_name: Path, cli_output: str) -> FileReport:
 def prepare_compiler_input(
     compiler_path: Path,
     source_file_name: Path,
-    optimize: bool,
     force_no_optimize_yul: bool,
     interface: CompilerInterface,
+    preset: SettingsPreset,
     smt_use: SMTUse,
     metadata_option_supported: bool,
 ) -> Tuple[List[str], str]:
 
+    settings = CompilerSettings.from_preset(preset)
+
     if interface == CompilerInterface.STANDARD_JSON:
         json_input: dict = {
             'language': 'Solidity',
@@ -204,7 +223,7 @@ def prepare_compiler_input(
                 str(source_file_name): {'content': load_source(source_file_name, smt_use)}
             },
             'settings': {
-                'optimizer': {'enabled': optimize},
+                'optimizer': {'enabled': settings.optimize},
                 'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}},
             }
         }
@@ -220,7 +239,7 @@ def prepare_compiler_input(
         compiler_options = [str(source_file_name), '--bin']
         if metadata_option_supported:
             compiler_options.append('--metadata')
-        if optimize:
+        if settings.optimize:
             compiler_options.append('--optimize')
         elif force_no_optimize_yul:
             compiler_options.append('--no-optimize-yul')
@@ -259,9 +278,9 @@ def detect_metadata_cli_option_support(compiler_path: Path):
 def run_compiler(
     compiler_path: Path,
     source_file_name: Path,
-    optimize: bool,
     force_no_optimize_yul: bool,
     interface: CompilerInterface,
+    preset: SettingsPreset,
     smt_use: SMTUse,
     metadata_option_supported: bool,
     tmp_dir: Path,
@@ -272,9 +291,9 @@ def run_compiler(
         (command_line, compiler_input) = prepare_compiler_input(
             compiler_path,
             Path(source_file_name.name),
-            optimize,
             force_no_optimize_yul,
             interface,
+            preset,
             smt_use,
             metadata_option_supported,
         )
@@ -295,9 +314,9 @@ def run_compiler(
         (command_line, compiler_input) = prepare_compiler_input(
             compiler_path.absolute(),
             Path(source_file_name.name),
-            optimize,
             force_no_optimize_yul,
             interface,
+            preset,
             smt_use,
             metadata_option_supported,
         )
@@ -324,6 +343,7 @@ def generate_report(
     source_file_names: List[str],
     compiler_path: Path,
     interface: CompilerInterface,
+    presets: List[SettingsPreset],
     smt_use: SMTUse,
     force_no_optimize_yul: bool,
     report_file_path: Path,
@@ -335,16 +355,16 @@ def generate_report(
 
     try:
         with open(report_file_path, mode='w', encoding='utf8', newline='\n') as report_file:
-            for optimize in [False, True]:
+            for preset in presets:
                 with TemporaryDirectory(prefix='prepare_report-') as tmp_dir:
                     for source_file_name in sorted(source_file_names):
                         try:
                             report = run_compiler(
                                 compiler_path,
                                 Path(source_file_name),
-                                optimize,
                                 force_no_optimize_yul,
                                 interface,
+                                preset,
                                 smt_use,
                                 metadata_option_supported,
                                 Path(tmp_dir),
@@ -358,7 +378,7 @@ def generate_report(
                         except subprocess.CalledProcessError as exception:
                             print(
                                 f"\n\nInterrupted by an exception while processing file "
-                                f"'{source_file_name}' with optimize={optimize}\n\n"
+                                f"'{source_file_name}' with preset={preset}\n\n"
                                 f"COMPILER STDOUT:\n{exception.stdout}\n"
                                 f"COMPILER STDERR:\n{exception.stderr}\n",
                                 file=sys.stderr
@@ -367,7 +387,7 @@ def generate_report(
                         except:
                             print(
                                 f"\n\nInterrupted by an exception while processing file "
-                                f"'{source_file_name}' with optimize={optimize}\n",
+                                f"'{source_file_name}' with preset={preset}\n\n",
                                 file=sys.stderr
                             )
                             raise
@@ -390,6 +410,15 @@ def commandline_parser() -> ArgumentParser:
         choices=[c.value for c in CompilerInterface],
         help="Compiler interface to use.",
     )
+    parser.add_argument(
+        '--preset',
+        dest='presets',
+        default=None,
+        nargs='+',
+        action='append',
+        choices=[p.value for p in SettingsPreset],
+        help="Predefined set of settings to pass to the compiler. More than one can be selected.",
+    )
     parser.add_argument(
         '--smt-use',
         dest='smt_use',
@@ -418,10 +447,19 @@ def commandline_parser() -> ArgumentParser:
 
 if __name__ == "__main__":
     options = commandline_parser().parse_args()
+
+    if options.presets is None:
+        # NOTE: Can't put it in add_argument()'s default because then it would be always present.
+        # See https://github.com/python/cpython/issues/60603
+        presets = [[SettingsPreset.LEGACY_NO_OPTIMIZE.value, SettingsPreset.LEGACY_OPTIMIZE.value]]
+    else:
+        presets = options.presets
+
     generate_report(
         glob("*.sol"),
         Path(options.compiler_path),
         CompilerInterface(options.interface),
+        [SettingsPreset(p) for preset_group in presets for p in preset_group],
         SMTUse(options.smt_use),
         options.force_no_optimize_yul,
         Path(options.report_file),
diff --git a/test/scripts/test_bytecodecompare_prepare_report.py b/test/scripts/test_bytecodecompare_prepare_report.py
index e0a8ca76a6..16d73ee39a 100644
--- a/test/scripts/test_bytecodecompare_prepare_report.py
+++ b/test/scripts/test_bytecodecompare_prepare_report.py
@@ -9,7 +9,7 @@
 
 # NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
 # pragma pylint: disable=import-error
-from bytecodecompare.prepare_report import CompilerInterface, FileReport, ContractReport, SMTUse, Statistics
+from bytecodecompare.prepare_report import CompilerInterface, FileReport, ContractReport, SettingsPreset, SMTUse, Statistics
 from bytecodecompare.prepare_report import load_source, parse_cli_output, parse_standard_json_output, prepare_compiler_input
 # pragma pylint: enable=import-error
 
@@ -224,7 +224,7 @@ def test_prepare_compiler_input_should_work_with_standard_json_interface(self):
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
             SMT_SMOKE_TEST_SOL_PATH,
-            optimize=True,
+            preset=SettingsPreset.LEGACY_OPTIMIZE,
             force_no_optimize_yul=False,
             interface=CompilerInterface.STANDARD_JSON,
             smt_use=SMTUse.DISABLE,
@@ -238,7 +238,7 @@ def test_prepare_compiler_input_should_work_with_cli_interface(self):
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
             SMT_SMOKE_TEST_SOL_PATH,
-            optimize=True,
+            preset=SettingsPreset.LEGACY_OPTIMIZE,
             force_no_optimize_yul=False,
             interface=CompilerInterface.CLI,
             smt_use=SMTUse.DISABLE,
@@ -273,7 +273,7 @@ def test_prepare_compiler_input_for_json_preserves_newlines(self):
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
             SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH,
-            optimize=True,
+            preset=SettingsPreset.LEGACY_OPTIMIZE,
             force_no_optimize_yul=False,
             interface=CompilerInterface.STANDARD_JSON,
             smt_use=SMTUse.DISABLE,
@@ -287,7 +287,7 @@ def test_prepare_compiler_input_for_cli_preserves_newlines(self):
         (_command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
             SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH,
-            optimize=True,
+            preset=SettingsPreset.LEGACY_OPTIMIZE,
             force_no_optimize_yul=True,
             interface=CompilerInterface.CLI,
             smt_use=SMTUse.DISABLE,
@@ -300,7 +300,7 @@ def test_prepare_compiler_input_for_cli_should_handle_force_no_optimize_yul_flag
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
             SMT_SMOKE_TEST_SOL_PATH,
-            optimize=False,
+            preset=SettingsPreset.LEGACY_NO_OPTIMIZE,
             force_no_optimize_yul=True,
             interface=CompilerInterface.CLI,
             smt_use=SMTUse.DISABLE,
@@ -317,7 +317,7 @@ def test_prepare_compiler_input_for_cli_should_not_use_metadata_option_if_not_su
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
             SMT_SMOKE_TEST_SOL_PATH,
-            optimize=True,
+            preset=SettingsPreset.LEGACY_OPTIMIZE,
             force_no_optimize_yul=False,
             interface=CompilerInterface.CLI,
             smt_use=SMTUse.PRESERVE,

From ea1327707b12c906103a0e037da312052f23e992 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 22 Jun 2023 19:00:12 +0200
Subject: [PATCH 1458/1748] CI: Don't use requires_nothing for jobs that
 explicitly state what they require

---
 .circleci/config.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7e568f9d13..c8fcac73ed 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1743,27 +1743,27 @@ workflows:
 
       # Bytecode comparison:
       - b_bytecode_ubu_static:
-          <<: *requires_nothing
+          <<: *on_all_tags_and_branches
           requires:
             - b_ubu_static
       - b_bytecode_ubu:
-          <<: *requires_nothing
+          <<: *on_all_tags_and_branches
           requires:
             - b_ubu
       - b_bytecode_win:
-          <<: *requires_nothing
+          <<: *on_all_tags_and_branches
           requires:
             - b_win
       - b_bytecode_osx:
-          <<: *requires_nothing
+          <<: *on_all_tags_and_branches
           requires:
             - b_osx
       - b_bytecode_ems:
-          <<: *requires_nothing
+          <<: *on_all_tags_and_branches
           requires:
             - b_ems
       - t_bytecode_compare:
-          <<: *requires_nothing
+          <<: *on_all_tags_and_branches
           requires:
             - b_bytecode_ubu_static
             - b_bytecode_ubu

From 69ffcfc24237f9dda59d426780808c0b2c9939a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 19 Jun 2023 14:19:06 +0200
Subject: [PATCH 1459/1748] CI: Move bytecode report comparison logic to a
 script

---
 .circleci/compare_bytecode_reports.sh | 57 +++++++++++++++++++++++++++
 .circleci/config.yml                  | 24 +----------
 2 files changed, 59 insertions(+), 22 deletions(-)
 create mode 100755 .circleci/compare_bytecode_reports.sh

diff --git a/.circleci/compare_bytecode_reports.sh b/.circleci/compare_bytecode_reports.sh
new file mode 100755
index 0000000000..adff761b62
--- /dev/null
+++ b/.circleci/compare_bytecode_reports.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+#------------------------------------------------------------------------------
+# Compares bytecode reports generated by prepare_report.py/.js.
+#
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2023 solidity contributors.
+#------------------------------------------------------------------------------
+
+no_cli_platforms=(
+    emscripten
+)
+native_platforms=(
+    ubuntu2004-static
+    ubuntu
+    osx
+    windows
+)
+interfaces=(
+    cli
+    standard-json
+)
+
+report_files=()
+for platform in "${no_cli_platforms[@]}"; do
+    report_files+=("bytecode-report-${platform}.txt")
+done
+for platform in "${native_platforms[@]}"; do
+    for interface in "${interfaces[@]}"; do
+        report_files+=("bytecode-report-${platform}-${interface}.txt")
+    done
+done
+
+echo "Reports to compare:"
+printf -- "- %s\n" "${report_files[@]}"
+
+if ! diff --brief --report-identical-files --from-file "${report_files[@]}"; then
+    diff --unified=0 --report-identical-files --from-file "${report_files[@]}" | head --lines 50
+    zip "all-bytecode-reports.zip" "${report_files[@]}"
+    exit 1
+fi
diff --git a/.circleci/config.yml b/.circleci/config.yml
index c8fcac73ed..eb2709a638 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1566,31 +1566,11 @@ jobs:
 
   t_bytecode_compare:
     <<: *base_ubuntu2204_small
-    environment:
-      REPORT_FILES: |
-        bytecode-report-emscripten.txt
-        bytecode-report-ubuntu2004-static-standard-json.txt
-        bytecode-report-ubuntu2004-static-cli.txt
-        bytecode-report-ubuntu-standard-json.txt
-        bytecode-report-ubuntu-cli.txt
-        bytecode-report-osx-standard-json.txt
-        bytecode-report-osx-cli.txt
-        bytecode-report-windows-standard-json.txt
-        bytecode-report-windows-cli.txt
     steps:
+      - checkout
       - attach_workspace:
           at: .
-      - run:
-          name: Compare reports
-          command: diff --brief --report-identical-files --from-file $REPORT_FILES
-      - run:
-          name: Print diff
-          when: on_fail
-          command: diff --unified=0 --report-identical-files --from-file $REPORT_FILES | head --lines 50
-      - run:
-          name: Bundle reports into a single package
-          when: on_fail
-          command: zip all-bytecode-reports.zip $REPORT_FILES
+      - run: .circleci/compare_bytecode_reports.sh
       - store_artifacts:
           # NOTE: store_artifacts does not support the 'when' attribute.
           # Fortunately when the artifact does not exist it just says "No artifact files found" and ignores it.

From 45c2ffcd55cb1cca8e570d0432eb4041082e7464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 23 Jun 2023 10:24:15 +0200
Subject: [PATCH 1460/1748] CI: Merge prepare_bytecode_report and
 storebytecode.sh script into a new script and use it for all platforms in CI

---
 .circleci/config.yml                     | 70 ++++++++---------------
 .circleci/parallel_bytecode_report.sh    | 73 ++++++++++++++++++++++++
 scripts/bytecodecompare/storebytecode.sh | 73 ------------------------
 3 files changed, 98 insertions(+), 118 deletions(-)
 create mode 100755 .circleci/parallel_bytecode_report.sh
 delete mode 100755 scripts/bytecodecompare/storebytecode.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eb2709a638..b618d15748 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -76,34 +76,31 @@ commands:
     parameters:
       label:
         type: string
+      binary_type:
+        type: enum
+        enum:
+          - solcjs
+          - native
       binary_path:
         type: string
     steps:
-      - run: mkdir test-cases/
-      - run:
-          name: Prepare input files
-          command: |
-            cd test-cases/
-            python3 ../scripts/isolate_tests.py ../test/
       - run:
-          name: Generate bytecode report
+          name: Generate bytecode reports for the selected preset
           command: |
-            cd test-cases/
-            interface=$(echo -e "standard-json\ncli" | circleci tests split)
-            echo "Selected interface: ${interface}"
-
-            python3 ../scripts/bytecodecompare/prepare_report.py \
-              << parameters.binary_path >> \
-              --interface "$interface" \
-              --report-file "../bytecode-report-<< parameters.label >>-${interface}.txt"
+            .circleci/parallel_bytecode_report.sh \
+                "<< parameters.label >>" \
+                "<< parameters.binary_type >>" \
+                "${PWD}/<< parameters.binary_path >>"
       - store_artifacts:
           path: bytecode-report-<< parameters.label >>-standard-json.txt
       - store_artifacts:
           path: bytecode-report-<< parameters.label >>-cli.txt
+      - store_artifacts:
+          path: bytecode-report-<< parameters.label >>.txt
       - persist_to_workspace:
           root: .
           paths:
-            - bytecode-report-<< parameters.label >>-*.txt
+            - bytecode-report-<< parameters.label >>*.txt
       - matrix_notify_failure_unless_pr
 
   install_python3:
@@ -1485,10 +1482,6 @@ jobs:
   # It can be safely removed once we move both to the same Ubuntu version.
   b_bytecode_ubu_static:
     <<: *base_ubuntu2004_small
-    environment:
-      TERM: xterm
-      MAKEFLAGS: -j 2
-      LC_ALL: C
     parallelism: 2 # For prepare_bytecode_report
     steps:
       - checkout
@@ -1496,14 +1489,11 @@ jobs:
           at: build
       - prepare_bytecode_report:
           label: "ubuntu2004-static"
-          binary_path: "../build/solc/solc-static-linux"
+          binary_type: native
+          binary_path: "build/solc/solc-static-linux"
 
   b_bytecode_ubu:
     <<: *base_ubuntu2204_small
-    environment:
-      TERM: xterm
-      MAKEFLAGS: -j 2
-      LC_ALL: C
     parallelism: 2 # For prepare_bytecode_report
     steps:
       - checkout
@@ -1511,14 +1501,11 @@ jobs:
           at: build
       - prepare_bytecode_report:
           label: "ubuntu"
-          binary_path: "../build/solc/solc"
+          binary_type: native
+          binary_path: "build/solc/solc"
 
   b_bytecode_osx:
     <<: *base_osx
-    environment:
-      TERM: xterm
-      MAKEFLAGS: -j 5
-      LC_ALL: C
     parallelism: 2 # For prepare_bytecode_report
     steps:
       - checkout
@@ -1526,12 +1513,11 @@ jobs:
           at: .
       - prepare_bytecode_report:
           label: "osx"
-          binary_path: "../build/solc/solc"
+          binary_type: native
+          binary_path: "build/solc/solc"
 
   b_bytecode_win:
     <<: *base_win
-    environment:
-      LC_ALL: C
     parallelism: 2 # For prepare_bytecode_report
     steps:
       # NOTE: For bytecode generation we need the input files to be byte-for-byte identical on all
@@ -1544,25 +1530,19 @@ jobs:
           at: build
       - prepare_bytecode_report:
           label: "windows"
-          binary_path: "../build/solc/Release/solc.exe"
+          binary_type: native
+          binary_path: "build/solc/Release/solc.exe"
 
   b_bytecode_ems:
     <<: *base_node_small
-    environment:
-      SOLC_EMSCRIPTEN: "On"
-      LC_ALL: C
     steps:
       - checkout
       - attach_workspace:
           at: emscripten_build/libsolc
-      - run: scripts/bytecodecompare/storebytecode.sh && mv -v report.txt bytecode-report-emscripten.txt
-      - store_artifacts:
-          path: bytecode-report-emscripten.txt
-      - persist_to_workspace:
-          root: .
-          paths:
-            - bytecode-report-emscripten.txt
-      - matrix_notify_failure_unless_pr
+      - prepare_bytecode_report:
+          label: "emscripten"
+          binary_type: solcjs
+          binary_path: "emscripten_build/libsolc/soljson.js"
 
   t_bytecode_compare:
     <<: *base_ubuntu2204_small
diff --git a/.circleci/parallel_bytecode_report.sh b/.circleci/parallel_bytecode_report.sh
new file mode 100755
index 0000000000..fd435bf61d
--- /dev/null
+++ b/.circleci/parallel_bytecode_report.sh
@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+#------------------------------------------------------------------------------
+# Splits all test source code into multiple files, generates bytecode and metadata
+# for each file and combines it into a single report.txt file.
+#
+# The script is meant to be executed in CI on all supported platforms. All generated
+# reports must be identical for a given compiler version.
+#
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2023 solidity contributors.
+#------------------------------------------------------------------------------
+
+(( $# == 3 )) || { >&2 echo "Wrong number of arguments."; exit 1; }
+label="$1"
+binary_type="$2"
+binary_path="$3" # This path must be absolute
+
+[[ $binary_type == native || $binary_type == solcjs ]] || { >&2 echo "Invalid binary type: ${binary_type}"; exit 1; }
+
+# NOTE: Locale affects the order of the globbed files.
+export LC_ALL=C
+
+mkdir test-cases/
+cd test-cases/
+
+echo "Preparing input files"
+python3 ../scripts/isolate_tests.py ../test/
+
+if [[ $binary_type == native ]]; then
+    interface=$(echo -e "standard-json\ncli" | circleci tests split)
+    echo "Selected interface: ${interface}"
+
+    echo "Generating bytecode reports"
+    python3 ../scripts/bytecodecompare/prepare_report.py \
+        "$binary_path" \
+        --interface "$interface" \
+        --report-file "../bytecode-report-${label}-${interface}.txt"
+else
+    echo "Installing solc-js"
+    git clone --depth 1 https://github.com/ethereum/solc-js.git solc-js
+    cp "$binary_path" solc-js/soljson.js
+
+    cd solc-js/
+    npm install
+    npm run build
+
+    cd ..
+    npm install ./solc-js/dist
+
+    cp ../scripts/bytecodecompare/prepare_report.js .
+
+    echo "Generating bytecode reports"
+    # shellcheck disable=SC2035
+    ./prepare_report.js \
+        *.sol > "../bytecode-report-${label}.txt"
+fi
diff --git a/scripts/bytecodecompare/storebytecode.sh b/scripts/bytecodecompare/storebytecode.sh
deleted file mode 100755
index beeb79d093..0000000000
--- a/scripts/bytecodecompare/storebytecode.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env bash
-
-#------------------------------------------------------------------------------
-# Script used for cross-platform comparison of the bytecode generated by the compiler.
-# Splits all test source code into multiple files, generates bytecode and metadata
-# for each file and combines it into a single report.txt file.
-#
-# The script is meant to be executed in CI on all supported platforms. All generated
-# reports must be identical for a given compiler version.
-#
-# ------------------------------------------------------------------------------
-# 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/>
-#
-# (c) 2017 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-REPO_ROOT="$(dirname "$0")"/../..
-cd "$REPO_ROOT"
-REPO_ROOT=$(pwd) # make it absolute
-
-BUILD_DIR="${1:-${REPO_ROOT}/build}"
-
-# Set locale to C to prevent it from affecting glob sort order.
-export LC_ALL=C
-
-echo "Compiling all test contracts into bytecode..."
-TMPDIR=$(mktemp -d)
-(
-    cd "$TMPDIR"
-
-    "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
-
-    if [[ "$SOLC_EMSCRIPTEN" = "On" ]]
-    then
-        echo "Installing solc-js..."
-        # npm install solc
-        git clone --depth 1 https://github.com/ethereum/solc-js.git solc-js
-        cp "$REPO_ROOT/emscripten_build/libsolc/soljson.js" solc-js/
-        pushd solc-js/
-        npm install
-        npm run build
-        popd
-
-        cp "$REPO_ROOT/scripts/bytecodecompare/prepare_report.js" .
-        npm install ./solc-js/dist
-
-        echo "Running the compiler..."
-        # shellcheck disable=SC2035
-        ./prepare_report.js *.sol > report.txt
-        echo "Finished running the compiler."
-    else
-        "$REPO_ROOT/scripts/bytecodecompare/prepare_report.py" "$BUILD_DIR/solc/solc"
-    fi
-
-    cp report.txt "$REPO_ROOT"
-)
-rm -rf "$TMPDIR"
-echo "Storebytecode finished."

From 92816eb6c508926ec0b5fd9769283ab42ee722ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 23 Jun 2023 10:27:21 +0200
Subject: [PATCH 1461/1748] CI: Generate optimized and unoptimized bytecode
 reports in parallel

---
 .circleci/compare_bytecode_reports.sh | 32 ++++++++-------
 .circleci/config.yml                  | 59 ++++++++++++++++++++++++---
 .circleci/parallel_bytecode_report.sh |  9 ++--
 3 files changed, 76 insertions(+), 24 deletions(-)

diff --git a/.circleci/compare_bytecode_reports.sh b/.circleci/compare_bytecode_reports.sh
index adff761b62..7b62656bf2 100755
--- a/.circleci/compare_bytecode_reports.sh
+++ b/.circleci/compare_bytecode_reports.sh
@@ -37,21 +37,23 @@ interfaces=(
     standard-json
 )
 
-report_files=()
-for platform in "${no_cli_platforms[@]}"; do
-    report_files+=("bytecode-report-${platform}.txt")
-done
-for platform in "${native_platforms[@]}"; do
-    for interface in "${interfaces[@]}"; do
-        report_files+=("bytecode-report-${platform}-${interface}.txt")
+for preset in "$@"; do
+    report_files=()
+    for platform in "${no_cli_platforms[@]}"; do
+        report_files+=("bytecode-report-${platform}-${preset}.txt")
+    done
+    for platform in "${native_platforms[@]}"; do
+        for interface in "${interfaces[@]}"; do
+            report_files+=("bytecode-report-${platform}-${interface}-${preset}.txt")
+        done
     done
-done
 
-echo "Reports to compare:"
-printf -- "- %s\n" "${report_files[@]}"
+    echo "Reports to compare:"
+    printf -- "- %s\n" "${report_files[@]}"
 
-if ! diff --brief --report-identical-files --from-file "${report_files[@]}"; then
-    diff --unified=0 --report-identical-files --from-file "${report_files[@]}" | head --lines 50
-    zip "all-bytecode-reports.zip" "${report_files[@]}"
-    exit 1
-fi
+    if ! diff --brief --report-identical-files --from-file "${report_files[@]}"; then
+        diff --unified=0 --report-identical-files --from-file "${report_files[@]}" | head --lines 50
+        zip "bytecode-reports-${preset}.zip" "${report_files[@]}"
+        exit 1
+    fi
+done
diff --git a/.circleci/config.yml b/.circleci/config.yml
index b618d15748..bbf52f9747 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -83,6 +83,8 @@ commands:
           - native
       binary_path:
         type: string
+      preset:
+        type: string
     steps:
       - run:
           name: Generate bytecode reports for the selected preset
@@ -90,13 +92,14 @@ commands:
             .circleci/parallel_bytecode_report.sh \
                 "<< parameters.label >>" \
                 "<< parameters.binary_type >>" \
-                "${PWD}/<< parameters.binary_path >>"
+                "${PWD}/<< parameters.binary_path >>" \
+                "<< parameters.preset >>"
       - store_artifacts:
-          path: bytecode-report-<< parameters.label >>-standard-json.txt
+          path: bytecode-report-<< parameters.label >>-standard-json-<< parameters.preset >>.txt
       - store_artifacts:
-          path: bytecode-report-<< parameters.label >>-cli.txt
+          path: bytecode-report-<< parameters.label >>-cli-<< parameters.preset >>.txt
       - store_artifacts:
-          path: bytecode-report-<< parameters.label >>.txt
+          path: bytecode-report-<< parameters.label >>-<< parameters.preset >>.txt
       - persist_to_workspace:
           root: .
           paths:
@@ -217,6 +220,21 @@ defaults:
       name: docs pragma version check
       command: ./scripts/docs_version_pragma_check.sh
 
+  # --------------------------------------------------------------------------
+  # Matrix templates
+
+  - bytecode_compare_env_presets: &bytecode_compare_env_presets
+      PRESETS:
+        legacy-optimize
+        legacy-no-optimize
+
+  - bytecode_compare_preset_matrix: &bytecode_compare_preset_matrix
+      parameters:
+        preset:
+          # NOTE: Keep in sync with preset list in bytecode_compare_env_presets
+          - legacy-optimize
+          - legacy-no-optimize
+
   # --------------------------------------------------------------------------
   # Artifacts Templates
 
@@ -1481,6 +1499,9 @@ jobs:
   # are currently built on different Ubuntu base images.
   # It can be safely removed once we move both to the same Ubuntu version.
   b_bytecode_ubu_static:
+    parameters:
+      preset:
+        type: string
     <<: *base_ubuntu2004_small
     parallelism: 2 # For prepare_bytecode_report
     steps:
@@ -1491,8 +1512,12 @@ jobs:
           label: "ubuntu2004-static"
           binary_type: native
           binary_path: "build/solc/solc-static-linux"
+          preset: "<< parameters.preset >>"
 
   b_bytecode_ubu:
+    parameters:
+      preset:
+        type: string
     <<: *base_ubuntu2204_small
     parallelism: 2 # For prepare_bytecode_report
     steps:
@@ -1503,8 +1528,12 @@ jobs:
           label: "ubuntu"
           binary_type: native
           binary_path: "build/solc/solc"
+          preset: "<< parameters.preset >>"
 
   b_bytecode_osx:
+    parameters:
+      preset:
+        type: string
     <<: *base_osx
     parallelism: 2 # For prepare_bytecode_report
     steps:
@@ -1515,8 +1544,12 @@ jobs:
           label: "osx"
           binary_type: native
           binary_path: "build/solc/solc"
+          preset: "<< parameters.preset >>"
 
   b_bytecode_win:
+    parameters:
+      preset:
+        type: string
     <<: *base_win
     parallelism: 2 # For prepare_bytecode_report
     steps:
@@ -1532,8 +1565,12 @@ jobs:
           label: "windows"
           binary_type: native
           binary_path: "build/solc/Release/solc.exe"
+          preset: "<< parameters.preset >>"
 
   b_bytecode_ems:
+    parameters:
+      preset:
+        type: string
     <<: *base_node_small
     steps:
       - checkout
@@ -1543,18 +1580,23 @@ jobs:
           label: "emscripten"
           binary_type: solcjs
           binary_path: "emscripten_build/libsolc/soljson.js"
+          preset: "<< parameters.preset >>"
 
   t_bytecode_compare:
     <<: *base_ubuntu2204_small
+    environment:
+      <<: *bytecode_compare_env_presets
+      TERM: xterm
+      MAKEFLAGS: -j 2
     steps:
       - checkout
       - attach_workspace:
           at: .
-      - run: .circleci/compare_bytecode_reports.sh
+      - run: .circleci/compare_bytecode_reports.sh $PRESETS
       - store_artifacts:
           # NOTE: store_artifacts does not support the 'when' attribute.
           # Fortunately when the artifact does not exist it just says "No artifact files found" and ignores it.
-          path: all-bytecode-reports.zip
+          path: bytecode-reports-*.zip
       - matrix_notify_failure_unless_pr
 
   c_release_binaries:
@@ -1704,22 +1746,27 @@ workflows:
       # Bytecode comparison:
       - b_bytecode_ubu_static:
           <<: *on_all_tags_and_branches
+          matrix: *bytecode_compare_preset_matrix
           requires:
             - b_ubu_static
       - b_bytecode_ubu:
           <<: *on_all_tags_and_branches
+          matrix: *bytecode_compare_preset_matrix
           requires:
             - b_ubu
       - b_bytecode_win:
           <<: *on_all_tags_and_branches
+          matrix: *bytecode_compare_preset_matrix
           requires:
             - b_win
       - b_bytecode_osx:
           <<: *on_all_tags_and_branches
+          matrix: *bytecode_compare_preset_matrix
           requires:
             - b_osx
       - b_bytecode_ems:
           <<: *on_all_tags_and_branches
+          matrix: *bytecode_compare_preset_matrix
           requires:
             - b_ems
       - t_bytecode_compare:
diff --git a/.circleci/parallel_bytecode_report.sh b/.circleci/parallel_bytecode_report.sh
index fd435bf61d..2082306221 100755
--- a/.circleci/parallel_bytecode_report.sh
+++ b/.circleci/parallel_bytecode_report.sh
@@ -27,10 +27,11 @@ set -euo pipefail
 # (c) 2023 solidity contributors.
 #------------------------------------------------------------------------------
 
-(( $# == 3 )) || { >&2 echo "Wrong number of arguments."; exit 1; }
+(( $# == 4 )) || { >&2 echo "Wrong number of arguments."; exit 1; }
 label="$1"
 binary_type="$2"
 binary_path="$3" # This path must be absolute
+preset="$4"
 
 [[ $binary_type == native || $binary_type == solcjs ]] || { >&2 echo "Invalid binary type: ${binary_type}"; exit 1; }
 
@@ -51,7 +52,8 @@ if [[ $binary_type == native ]]; then
     python3 ../scripts/bytecodecompare/prepare_report.py \
         "$binary_path" \
         --interface "$interface" \
-        --report-file "../bytecode-report-${label}-${interface}.txt"
+        --preset "$preset" \
+        --report-file "../bytecode-report-${label}-${interface}-${preset}.txt"
 else
     echo "Installing solc-js"
     git clone --depth 1 https://github.com/ethereum/solc-js.git solc-js
@@ -69,5 +71,6 @@ else
     echo "Generating bytecode reports"
     # shellcheck disable=SC2035
     ./prepare_report.js \
-        *.sol > "../bytecode-report-${label}.txt"
+        --preset "$preset" \
+        *.sol > "../bytecode-report-${label}-${preset}.txt"
 fi

From b70477d7956133b7b1ed529938b092c308ffdce0 Mon Sep 17 00:00:00 2001
From: Alexandre Ferreira <alexjorgef@protonmail.com>
Date: Thu, 1 Jun 2023 19:22:21 +0100
Subject: [PATCH 1462/1748] Change installation documentation for Arch Linux

Correct inline code with double backquotes


Add more information

Add external links to packages;
Add a note to inform that packages don't have official support.
---
 docs/installing-solidity.rst | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index bd954ece05..9eb0ee76f0 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -132,11 +132,13 @@ The nightly version can be installed using these commands:
 Furthermore, some Linux distributions provide their own packages. These packages are not directly
 maintained by us but usually kept up-to-date by the respective package maintainers.
 
-For example, Arch Linux has packages for the latest development version:
+For example, Arch Linux has packages for the latest development version as AUR packages: `solidity <https://aur.archlinux.org/packages/solidity>`_
+and `solidity-bin <https://aur.archlinux.org/packages/solidity-bin>`_.
 
-.. code-block:: bash
+.. note::
 
-    pacman -S solidity
+    Please be aware that `AUR <https://wiki.archlinux.org/title/Arch_User_Repository>`_ packages
+    are user-produced content and unofficial packages. Exercise caution when using them.
 
 There is also a `snap package <https://snapcraft.io/solc>`_, however, it is **currently unmaintained**.
 It is installable in all the `supported Linux distros <https://snapcraft.io/docs/core/install>`_. To

From a4777937ed20c2dcbe822523ebef75421aaec309 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 26 Jun 2023 20:08:20 +0200
Subject: [PATCH 1463/1748] Remove triage workflow in favor of github built-in
 automation

---
 .github/workflows/triage.yml | 127 -----------------------------------
 1 file changed, 127 deletions(-)
 delete mode 100644 .github/workflows/triage.yml

diff --git a/.github/workflows/triage.yml b/.github/workflows/triage.yml
deleted file mode 100644
index a20ea57145..0000000000
--- a/.github/workflows/triage.yml
+++ /dev/null
@@ -1,127 +0,0 @@
-name: Add new issues to triage column
-
-on:
-  issues:
-    types:
-      - opened
-
-env:
-  GH_TOKEN: ${{ secrets.PROJECT_BOARD_AUTOMATION }}
-  ORGANIZATION: ethereum
-  PROJECT_NUMBER: 27 # Solidity Bug Triaging Board
-  # See: https://github.com/orgs/ethereum/projects/27/settings/fields/Status
-  COLUMN_FIELD_NAME: "Status"
-  TRIAGE_COLUMN_NAME: "To Triage"
-  DRY_RUN: false
-
-jobs:
-  triage_issues:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Retrieve the content of selected field on the project board
-        run: |
-          gh api graphql \
-            --raw-field organization="$ORGANIZATION" \
-            --field project_number="$PROJECT_NUMBER" \
-            --raw-field query='
-              query($organization: String!, $project_number: Int!) {
-                organization(login: $organization) {
-                  projectV2(number: $project_number) {
-                    id
-                    fields(first: 20) {
-                      nodes {
-                        ... on ProjectV2Field {
-                          id
-                          name
-                        }
-                        ... on ProjectV2SingleSelectField {
-                          id
-                          name
-                          options {
-                            id
-                            name
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }' > single_select_fields.json
-          echo 'PROJECT_ID='$(
-            jq \
-              '.data.organization.projectV2.id' \
-              single_select_fields.json
-          ) >> $GITHUB_ENV
-          echo 'COLUMN_FIELD_ID='$(
-            jq \
-              --arg column_field_name "$COLUMN_FIELD_NAME" \
-              '.data.organization.projectV2.fields.nodes[]
-              | select(.name == $column_field_name)
-              | .id' \
-              single_select_fields.json
-          ) >> $GITHUB_ENV
-          echo 'TRIAGE_COLUMN_ID='$(
-            jq --raw-output \
-              --arg column_field_name "$COLUMN_FIELD_NAME" \
-              --arg triage_column_name "$TRIAGE_COLUMN_NAME" \
-              '.data.organization.projectV2.fields.nodes[]
-              | select(.name == $column_field_name)
-              | .options[]
-              | select(.name == $triage_column_name)
-              | .id' \
-              single_select_fields.json
-          ) >> $GITHUB_ENV
-
-      - name: Add issue#${{ github.event.issue.number }} to project
-        env:
-          ISSUE_ID: ${{ github.event.issue.node_id }}
-        run: |
-          echo "Adding issue: ${{ github.event.issue.number }} to project ${{ env.PROJECT_NUMBER }}"
-          if [[ $DRY_RUN == 'false' ]]; then
-            echo 'ITEM_ID='$(
-              gh api graphql \
-                --jq '.data.addProjectV2ItemById.item.id' \
-                --raw-field project_id="$PROJECT_ID" \
-                --raw-field issue_id="$ISSUE_ID" \
-                --raw-field query='
-                mutation($project_id: ID!, $issue_id: ID!) {
-                  addProjectV2ItemById(input: {projectId: $project_id, contentId: $issue_id}) {
-                    item {
-                      id
-                    }
-                  }
-                }'
-            ) >> $GITHUB_ENV
-          fi
-
-      - name: Move issue#${{ github.event.issue.number }} to Triage column
-        run: |
-          echo "Moving issue: ${{ github.event.issue.number }} to Triage column in project ${{ env.PROJECT_NUMBER }}"
-          if [[ $DRY_RUN == 'false' ]]; then
-            gh api graphql \
-              --silent \
-              --raw-field project_id="$PROJECT_ID" \
-              --raw-field item_id="$ITEM_ID" \
-              --raw-field column_field_id="$COLUMN_FIELD_ID" \
-              --raw-field column_value_id="$TRIAGE_COLUMN_ID" \
-              --raw-field query='
-                mutation (
-                  $project_id: ID!
-                  $item_id: ID!
-                  $column_field_id: ID!
-                  $column_value_id: String!
-                ) {
-                  updateProjectV2ItemFieldValue(input: {
-                    projectId: $project_id
-                    itemId: $item_id
-                    fieldId: $column_field_id
-                    value: {
-                      singleSelectOptionId: $column_value_id
-                    }
-                  }) {
-                    projectV2Item {
-                      id
-                    }
-                  }
-                }'
-          fi

From 87d0c849608d50ed9f6eb5bcfac9353d8d5e9eef Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Mon, 15 May 2023 16:54:06 +0200
Subject: [PATCH 1464/1748] Stack optimizer fuzzer: Detect stack-too-deep
 during optimization

Co-authored-by: r0qs <deepmarolaest@gmail.com>
---
 test/libyul/YulOptimizerTestCommon.cpp        |   1 +
 .../tools/ossfuzz/StackReuseCodegenFuzzer.cpp | 114 ++++++++++++------
 test/tools/ossfuzz/YulEvmoneInterface.cpp     |   5 +
 test/tools/ossfuzz/YulEvmoneInterface.h       |   1 +
 test/tools/ossfuzz/protoToYul.cpp             |  17 ++-
 test/tools/ossfuzz/protoToYul.h               |   9 +-
 6 files changed, 105 insertions(+), 42 deletions(-)

diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 48c7ea4038..92482814b1 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -97,6 +97,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 		}},
 		{"blockFlattener", [&]() {
 			disambiguate();
+			FunctionGrouper::run(*m_context, *m_ast);
 			BlockFlattener::run(*m_context, *m_ast);
 		}},
 		{"constantOptimiser", [&]() {
diff --git a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
index d7779a58d9..fb502af527 100644
--- a/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
+++ b/test/tools/ossfuzz/StackReuseCodegenFuzzer.cpp
@@ -27,6 +27,9 @@
 #include <libyul/backends/evm/EVMCodeTransform.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
+#include <libyul/optimiser/CallGraphGenerator.h>
+#include <libyul/CompilabilityChecker.h>
+
 #include <libevmasm/Instruction.h>
 
 #include <liblangutil/EVMVersion.h>
@@ -47,6 +50,24 @@ using namespace std;
 
 static evmc::VM evmone = evmc::VM{evmc_create_evmone()};
 
+namespace
+{
+/// @returns true if there are recursive functions, false otherwise.
+bool recursiveFunctionExists(Dialect const& _dialect, yul::Object& _object)
+{
+	auto recursiveFunctions = CallGraphGenerator::callGraph(*_object.code).recursiveFunctions();
+	for(auto&& [function, variables]: CompilabilityChecker{
+			_dialect,
+			_object,
+			true
+		}.unreachableVariables
+	)
+		if(recursiveFunctions.count(function))
+			return true;
+	return false;
+}
+}
+
 DEFINE_PROTO_FUZZER(Program const& _input)
 {
 	// Solidity creates an invalid instruction for subobjects, so we simply
@@ -78,45 +99,58 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	settings.runYulOptimiser = false;
 	settings.optimizeStackAllocation = false;
 	bytes unoptimisedByteCode;
+	bool recursiveFunction = false;
+	bool unoptimizedStackTooDeep = false;
 	try
 	{
-		unoptimisedByteCode = YulAssembler{version, nullopt, settings, yul_source}.assemble();
+		YulAssembler assembler{version, nullopt, settings, yul_source};
+		unoptimisedByteCode = assembler.assemble();
+		auto yulObject = assembler.object();
+		recursiveFunction = recursiveFunctionExists(
+			EVMDialect::strictAssemblyForEVMObjects(version),
+			*yulObject
+		);
 	}
 	catch (solidity::yul::StackTooDeepError const&)
 	{
-		return;
+		unoptimizedStackTooDeep = true;
 	}
 
-	evmc::Result deployResult = YulEvmoneUtility{}.deployCode(unoptimisedByteCode, hostContext);
-	if (deployResult.status_code != EVMC_SUCCESS)
-		return;
-	auto callMessage = YulEvmoneUtility{}.callMessage(deployResult.create_address);
-	evmc::Result callResult = hostContext.call(callMessage);
-	// If the fuzzer synthesized input does not contain the revert opcode which
-	// we lazily check by string find, the EVM call should not revert.
-	bool noRevertInSource = yul_source.find("revert") == string::npos;
-	bool noInvalidInSource = yul_source.find("invalid") == string::npos;
-	if (noInvalidInSource)
-		solAssert(
-			callResult.status_code != EVMC_INVALID_INSTRUCTION,
-			"Invalid instruction."
-		);
-	if (noRevertInSource)
+	ostringstream unoptimizedState;
+	bool noRevertInSource = true;
+	bool noInvalidInSource = true;
+	if (!unoptimizedStackTooDeep)
+	{
+		evmc::Result deployResult = YulEvmoneUtility{}.deployCode(unoptimisedByteCode, hostContext);
+		if (deployResult.status_code != EVMC_SUCCESS)
+			return;
+		auto callMessage = YulEvmoneUtility{}.callMessage(deployResult.create_address);
+		evmc::Result callResult = hostContext.call(callMessage);
+		// If the fuzzer synthesized input does not contain the revert opcode which
+		// we lazily check by string find, the EVM call should not revert.
+		noRevertInSource = yul_source.find("revert") == string::npos;
+		noInvalidInSource = yul_source.find("invalid") == string::npos;
+		if (noInvalidInSource)
+			solAssert(
+				callResult.status_code != EVMC_INVALID_INSTRUCTION,
+				"Invalid instruction."
+			);
+		if (noRevertInSource)
+			solAssert(
+				callResult.status_code != EVMC_REVERT,
+				"SolidityEvmoneInterface: EVM One reverted"
+			);
+		// Bail out on serious errors encountered during a call.
+		if (YulEvmoneUtility{}.seriousCallError(callResult.status_code))
+			return;
 		solAssert(
-			callResult.status_code != EVMC_REVERT,
-			"SolidityEvmoneInterface: EVM One reverted"
+			(callResult.status_code == EVMC_SUCCESS ||
+			(!noRevertInSource && callResult.status_code == EVMC_REVERT) ||
+			(!noInvalidInSource && callResult.status_code == EVMC_INVALID_INSTRUCTION)),
+			"Unoptimised call failed."
 		);
-	// Bail out on serious errors encountered during a call.
-	if (YulEvmoneUtility{}.seriousCallError(callResult.status_code))
-		return;
-	solAssert(
-		(callResult.status_code == EVMC_SUCCESS ||
-		(!noRevertInSource && callResult.status_code == EVMC_REVERT) ||
-		(!noInvalidInSource && callResult.status_code == EVMC_INVALID_INSTRUCTION)),
-		"Unoptimised call failed."
-	);
-	ostringstream unoptimizedState;
-	unoptimizedState << EVMHostPrinter{hostContext, deployResult.create_address}.state();
+		unoptimizedState << EVMHostPrinter{hostContext, deployResult.create_address}.state();
+	}
 
 	settings.runYulOptimiser = true;
 	settings.optimizeStackAllocation = true;
@@ -127,9 +161,14 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	}
 	catch (solidity::yul::StackTooDeepError const&)
 	{
-		return;
+		if (!recursiveFunction)
+			throw;
+		else
+			return;
 	}
 
+	if (unoptimizedStackTooDeep)
+		return;
 	// Reset host before running optimised code.
 	hostContext.reset();
 	evmc::Result deployResultOpt = YulEvmoneUtility{}.deployCode(optimisedByteCode, hostContext);
@@ -158,8 +197,13 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 	ostringstream optimizedState;
 	optimizedState << EVMHostPrinter{hostContext, deployResultOpt.create_address}.state();
 
-	solAssert(
-		unoptimizedState.str() == optimizedState.str(),
-		"State of unoptimised and optimised stack reused code do not match."
-	);
+	if (unoptimizedState.str() != optimizedState.str())
+	{
+		cout << unoptimizedState.str() << endl;
+		cout << optimizedState.str() << endl;
+		solAssert(
+			false,
+			"State of unoptimised and optimised stack reused code do not match."
+		);
+	}
 }
diff --git a/test/tools/ossfuzz/YulEvmoneInterface.cpp b/test/tools/ossfuzz/YulEvmoneInterface.cpp
index f3a9f74453..b892454430 100644
--- a/test/tools/ossfuzz/YulEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/YulEvmoneInterface.cpp
@@ -38,6 +38,11 @@ bytes YulAssembler::assemble()
 	return m_stack.assemble(YulStack::Machine::EVM).bytecode->bytecode;
 }
 
+std::shared_ptr<yul::Object> YulAssembler::object()
+{
+	return m_stack.parserResult();
+}
+
 evmc::Result YulEvmoneUtility::deployCode(bytes const& _input, EVMHost& _host)
 {
 	// Zero initialize all message fields
diff --git a/test/tools/ossfuzz/YulEvmoneInterface.h b/test/tools/ossfuzz/YulEvmoneInterface.h
index 9224a949de..71a47507e8 100644
--- a/test/tools/ossfuzz/YulEvmoneInterface.h
+++ b/test/tools/ossfuzz/YulEvmoneInterface.h
@@ -47,6 +47,7 @@ class YulAssembler
 		m_optimiseYul(_optSettings.runYulOptimiser)
 	{}
 	solidity::bytes assemble();
+	std::shared_ptr<yul::Object> object();
 private:
 	solidity::yul::YulStack m_stack;
 	std::string m_yulProgram;
diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 25b5a977df..8076857893 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -640,7 +640,7 @@ void ProtoConverter::visit(UnaryOp const& _x)
 	{
 		m_output << "mod(";
 		visit(_x.operand());
-		m_output << ", " << to_string(s_maxMemory) << ")";
+		m_output << ", " << to_string(s_maxMemory - 32) << ")";
 	}
 	else
 		visit(_x.operand());
@@ -1125,12 +1125,21 @@ void ProtoConverter::visit(StoreFunc const& _x)
 	// Write to memory within bounds, storage is unbounded
 	if (storeType == StoreFunc::SSTORE)
 		visit(_x.loc());
-	else
+	else if (storeType == StoreFunc::MSTORE8)
 	{
 		m_output << "mod(";
 		visit(_x.loc());
 		m_output << ", " << to_string(s_maxMemory) << ")";
 	}
+	else if (storeType == StoreFunc::MSTORE)
+	{
+		// Since we write 32 bytes, ensure it does not exceed
+		// upper bound on memory.
+		m_output << "mod(";
+		visit(_x.loc());
+		m_output << ", " << to_string(s_maxMemory - 32) << ")";
+
+	}
 	m_output << ", ";
 	visit(_x.val());
 	m_output << ")\n";
@@ -1706,7 +1715,7 @@ void ProtoConverter::fillFunctionCallInput(unsigned _numInParams)
 		case 1:
 		{
 			// Access memory within stipulated bounds
-			slot = "mod(" + dictionaryToken() + ", " + to_string(s_maxMemory) + ")";
+			slot = "mod(" + dictionaryToken() + ", " + to_string(s_maxMemory - 32) + ")";
 			m_output << "mload(" << slot << ")";
 			break;
 		}
@@ -1940,6 +1949,8 @@ void ProtoConverter::visit(Program const& _x)
 	{
 	case Program::kBlock:
 		m_output << "{\n";
+		m_output << "mstore(memoryguard(0x10000), 1)\n";
+		m_output << "sstore(mload(calldataload(0)), 1)\n";
 		visit(_x.block());
 		m_output << "}\n";
 		break;
diff --git a/test/tools/ossfuzz/protoToYul.h b/test/tools/ossfuzz/protoToYul.h
index 00559fa93a..b7f7c72e5a 100644
--- a/test/tools/ossfuzz/protoToYul.h
+++ b/test/tools/ossfuzz/protoToYul.h
@@ -344,11 +344,12 @@ class ProtoConverter
 	static unsigned constexpr s_modOutputParams = 5;
 	/// Hard-coded identifier for a Yul object's data block
 	static auto constexpr s_dataIdentifier = "datablock";
-	/// Upper bound on memory writes = 2**32 - 1
-	/// See: https://eips.ethereum.org/EIPS/eip-1985#memory-size
-	static unsigned constexpr s_maxMemory = 4294967295;
+	/// Upper bound on memory writes is 64KB in order to
+	/// preserve semantic equivalence in the presence of
+	/// memory guard
+	static unsigned constexpr s_maxMemory = 65536;
 	/// Upper bound on size for range copy functions
-	static unsigned constexpr s_maxSize = 65536;
+	static unsigned constexpr s_maxSize = 32768;
 	/// Predicate to keep track of for body scope. If false, break/continue
 	/// statements can not be created.
 	bool m_inForBodyScope;

From d12a981ba80fe9cfa3635243a0dfd3f00b6a7900 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 23 Jun 2023 12:52:46 +0200
Subject: [PATCH 1465/1748] CI: Define aliases for all the base environment
 dicts

---
 .circleci/config.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bbf52f9747..a9bf33a375 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -358,7 +358,7 @@ defaults:
   - base_archlinux: &base_archlinux
       docker:
         - image: archlinux:base
-      environment:
+      environment: &base_archlinux_env
         TERM: xterm
         MAKEFLAGS: -j 3
 
@@ -366,7 +366,7 @@ defaults:
       docker:
         - image: archlinux:base
       resource_class: large
-      environment:
+      environment: &base_archlinux_large_env
         TERM: xterm
         MAKEFLAGS: -j 5
 
@@ -374,7 +374,7 @@ defaults:
       docker:
         - image: cimg/base:current
       resource_class: small
-      environment:
+      environment: &base_cimg_small_env
         TERM: xterm
         MAKEFLAGS: -j 2
 
@@ -382,7 +382,7 @@ defaults:
       docker:
         - image: << pipeline.parameters.emscripten-docker-image >>
       resource_class: large
-      environment:
+      environment: &base_ems_large_env
         TERM: xterm
         MAKEFLAGS: -j 5
 
@@ -390,7 +390,7 @@ defaults:
       docker:
         - image: cimg/node:current
       resource_class: small
-      environment:
+      environment: &base_node_small_env
         TERM: xterm
         MAKEFLAGS: -j 2
 
@@ -398,7 +398,7 @@ defaults:
       macos:
         xcode: "14.2.0"
       resource_class: macos.x86.medium.gen2
-      environment:
+      environment: &base_osx_env
         TERM: xterm
         MAKEFLAGS: -j5
 
@@ -406,7 +406,7 @@ defaults:
       macos:
         xcode: "14.2.0"
       resource_class: large
-      environment:
+      environment: &base_osx_large_env
         TERM: xterm
         MAKEFLAGS: -j10
 
@@ -414,56 +414,56 @@ defaults:
       docker:
         - image: cimg/python:3.6
       resource_class: small
-      environment:
+      environment: &base_python_small_env
         TERM: xterm
         MAKEFLAGS: -j 2
 
   - base_ubuntu_clang: &base_ubuntu_clang
       docker:
         - image: << pipeline.parameters.ubuntu-clang-ossfuzz-docker-image >>
-      environment:
+      environment: &base_ubuntu_clang_env
         TERM: xterm
         MAKEFLAGS: -j 3
 
   - base_ubuntu_clang_small: &base_ubuntu_clang_small
       <<: *base_ubuntu_clang
       resource_class: small
-      environment:
+      environment: &base_ubuntu_clang_small_env
         TERM: xterm
         MAKEFLAGS: -j 2
 
   - base_ubuntu2004: &base_ubuntu2004
       docker:
           - image: << pipeline.parameters.ubuntu-2004-docker-image >>
-      environment:
+      environment: &base_ubuntu2004_env
           TERM: xterm
           MAKEFLAGS: -j 3
 
   - base_ubuntu2004_small: &base_ubuntu2004_small
       <<: *base_ubuntu2004
       resource_class: small
-      environment:
+      environment: &base_ubuntu2004_small_env
           TERM: xterm
           MAKEFLAGS: -j 2
 
   - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
       <<: *base_ubuntu2004
       resource_class: xlarge
-      environment:
+      environment: &base_ubuntu2004_xlarge_env
           TERM: xterm
           MAKEFLAGS: -j 10
 
   - base_ubuntu2204: &base_ubuntu2204
       docker:
         - image: << pipeline.parameters.ubuntu-2204-docker-image >>
-      environment:
+      environment: &base_ubuntu2204_env
         TERM: xterm
         MAKEFLAGS: -j 3
 
   - base_ubuntu2204_clang: &base_ubuntu2204_clang
       docker:
         - image: << pipeline.parameters.ubuntu-2204-clang-docker-image >>
-      environment:
+      environment: &base_ubuntu2204_clang_env
         TERM: xterm
         CC: clang
         CXX: clang++
@@ -472,7 +472,7 @@ defaults:
   - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
       <<: *base_ubuntu2204_clang
       resource_class: large
-      environment:
+      environment: &base_ubuntu2204_clang_large_env
         TERM: xterm
         CC: clang
         CXX: clang++
@@ -481,21 +481,21 @@ defaults:
   - base_ubuntu2204_small: &base_ubuntu2204_small
       <<: *base_ubuntu2204
       resource_class: small
-      environment:
+      environment: &base_ubuntu2204_small_env
         TERM: xterm
         MAKEFLAGS: -j 2
 
   - base_ubuntu2204_large: &base_ubuntu2204_large
       <<: *base_ubuntu2204
       resource_class: large
-      environment:
+      environment: &base_ubuntu2204_large_env
         TERM: xterm
         MAKEFLAGS: -j 5
 
   - base_ubuntu2204_xlarge: &base_ubuntu2204_xlarge
       <<: *base_ubuntu2204
       resource_class: xlarge
-      environment:
+      environment: &base_ubuntu2204_xlarge_env
         TERM: xterm
         MAKEFLAGS: -j 10
 

From 793adc8106df639f020b52a7d345e8dcca0d5c97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 23 Jun 2023 12:55:19 +0200
Subject: [PATCH 1466/1748] CI: Define base environments in terms of
 environments of dicts they depend on

---
 .circleci/config.yml | 36 ++++++++++++++++--------------------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a9bf33a375..4a041faadc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -363,11 +363,10 @@ defaults:
         MAKEFLAGS: -j 3
 
   - base_archlinux_large: &base_archlinux_large
-      docker:
-        - image: archlinux:base
+      <<: *base_archlinux
       resource_class: large
       environment: &base_archlinux_large_env
-        TERM: xterm
+        <<: *base_archlinux_env
         MAKEFLAGS: -j 5
 
   - base_cimg_small: &base_cimg_small
@@ -403,11 +402,10 @@ defaults:
         MAKEFLAGS: -j5
 
   - base_osx_large: &base_osx_large
-      macos:
-        xcode: "14.2.0"
+      <<: *base_osx
       resource_class: large
       environment: &base_osx_large_env
-        TERM: xterm
+        <<: *base_osx_env
         MAKEFLAGS: -j10
 
   - base_python_small: &base_python_small
@@ -429,29 +427,29 @@ defaults:
       <<: *base_ubuntu_clang
       resource_class: small
       environment: &base_ubuntu_clang_small_env
-        TERM: xterm
+        <<: *base_ubuntu_clang_env
         MAKEFLAGS: -j 2
 
   - base_ubuntu2004: &base_ubuntu2004
       docker:
-          - image: << pipeline.parameters.ubuntu-2004-docker-image >>
+        - image: << pipeline.parameters.ubuntu-2004-docker-image >>
       environment: &base_ubuntu2004_env
-          TERM: xterm
-          MAKEFLAGS: -j 3
+        TERM: xterm
+        MAKEFLAGS: -j 3
 
   - base_ubuntu2004_small: &base_ubuntu2004_small
       <<: *base_ubuntu2004
       resource_class: small
       environment: &base_ubuntu2004_small_env
-          TERM: xterm
-          MAKEFLAGS: -j 2
+        <<: *base_ubuntu2004_env
+        MAKEFLAGS: -j 2
 
   - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
       <<: *base_ubuntu2004
       resource_class: xlarge
       environment: &base_ubuntu2004_xlarge_env
-          TERM: xterm
-          MAKEFLAGS: -j 10
+        <<: *base_ubuntu2004_env
+        MAKEFLAGS: -j 10
 
   - base_ubuntu2204: &base_ubuntu2204
       docker:
@@ -473,30 +471,28 @@ defaults:
       <<: *base_ubuntu2204_clang
       resource_class: large
       environment: &base_ubuntu2204_clang_large_env
-        TERM: xterm
-        CC: clang
-        CXX: clang++
+        <<: *base_ubuntu2204_clang_env
         MAKEFLAGS: -j 5
 
   - base_ubuntu2204_small: &base_ubuntu2204_small
       <<: *base_ubuntu2204
       resource_class: small
       environment: &base_ubuntu2204_small_env
-        TERM: xterm
+        <<: *base_ubuntu2204_env
         MAKEFLAGS: -j 2
 
   - base_ubuntu2204_large: &base_ubuntu2204_large
       <<: *base_ubuntu2204
       resource_class: large
       environment: &base_ubuntu2204_large_env
-        TERM: xterm
+        <<: *base_ubuntu2204_env
         MAKEFLAGS: -j 5
 
   - base_ubuntu2204_xlarge: &base_ubuntu2204_xlarge
       <<: *base_ubuntu2204
       resource_class: xlarge
       environment: &base_ubuntu2204_xlarge_env
-        TERM: xterm
+        <<: *base_ubuntu2204_env
         MAKEFLAGS: -j 10
 
   - base_win: &base_win

From 8b64195d4b1549ae598f102e12d951c464314850 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 23 Jun 2023 12:57:02 +0200
Subject: [PATCH 1467/1748] CI: Make jobs extend base environments instead of
 redefining them

- Also remove variables that are now redundant.
- Note that this adds new variables for jobs that previously did not have them. This should not affect behavior because we were simply omitting those variables where they were not necessary.
---
 .circleci/config.yml | 43 ++++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 23 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4a041faadc..06cc0c475b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -884,17 +884,15 @@ jobs:
     # Runs slightly faster on large and xlarge but we only run it nightly so efficiency matters more.
     <<: *base_ubuntu2204
     environment:
+      <<: *base_ubuntu2204_env
       CMAKE_OPTIONS: -DSANITIZE=address
-      MAKEFLAGS: -j 3
       CMAKE_BUILD_TYPE: Release
     <<: *steps_build
 
   b_ubu_clang: &b_ubu_clang
     <<: *base_ubuntu2204_clang_large
     environment:
-      TERM: xterm
-      CC: clang
-      CXX: clang++
+      <<: *base_ubuntu2204_clang_large_env
       MAKEFLAGS: -j 10
     <<: *steps_build
 
@@ -905,18 +903,15 @@ jobs:
         type: string
     <<: *base_ubuntu2204_clang
     environment:
-      TERM: xterm
-      CC: clang
-      CXX: clang++
-      MAKEFLAGS: -j 3
+      <<: *base_ubuntu2204_clang_env
       CMAKE_OPTIONS: << parameters.cmake_options >>
     <<: *steps_build
 
   b_ubu_force_release: &b_ubu_force_release
     <<: *b_ubu
     environment:
+      <<: *base_ubuntu2204_xlarge_env
       FORCE_RELEASE: ON
-      MAKEFLAGS: -j 10
 
   b_ubu_static:
     # We temporarily keep building static release binaries on ubuntu 20.04
@@ -925,8 +920,7 @@ jobs:
     # On large runs 2x faster than on medium. 3x on xlarge.
     <<: *base_ubuntu2004_xlarge
     environment:
-      TERM: xterm
-      MAKEFLAGS: -j 10
+      <<: *base_ubuntu2204_xlarge_env
       CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DUSE_CVC4=OFF -DSOLC_STATIC_STDLIBS=ON
     steps:
       - checkout
@@ -948,9 +942,9 @@ jobs:
     # Runs ~30% faster on large but we only run it nightly so efficiency matters more.
     <<: *base_ubuntu2204
     environment:
+      <<: *base_ubuntu2204_env
       COVERAGE: ON
       CMAKE_BUILD_TYPE: Debug
-      MAKEFLAGS: -j 3
     steps:
       - checkout
       - run: *run_build
@@ -960,6 +954,7 @@ jobs:
   t_ubu_codecov:
     <<: *base_ubuntu2204_large
     environment:
+      <<: *base_ubuntu2204_large_env
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 1
     steps:
@@ -984,6 +979,7 @@ jobs:
   b_ubu_cxx20:
     <<: *base_ubuntu2204_large
     environment:
+      <<: *base_ubuntu2204_large_env
       CMAKE_BUILD_TYPE: Debug
       CMAKE_OPTIONS: -DCMAKE_CXX_STANDARD=20 -DUSE_CVC4=OFF
       MAKEFLAGS: -j 10
@@ -1019,8 +1015,7 @@ jobs:
   b_archlinux:
     <<: *base_archlinux_large
     environment:
-      TERM: xterm
-      MAKEFLAGS: -j 5
+      <<: *base_archlinux_large_env
       # This can be switched off if we run out of sync with Arch.
       USE_Z3: ON
     steps:
@@ -1037,9 +1032,8 @@ jobs:
   b_osx:
     <<: *base_osx_large
     environment:
-      TERM: xterm
+      <<: *base_osx_large_env
       CMAKE_BUILD_TYPE: Release
-      MAKEFLAGS: -j10
     steps:
       - checkout
       - when:
@@ -1059,9 +1053,9 @@ jobs:
   t_osx_soltest: &t_osx_soltest
     <<: *base_osx
     environment:
+      <<: *base_osx_env
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
-      TERM: xterm
     steps:
       - checkout
       - when:
@@ -1091,7 +1085,7 @@ jobs:
   b_ems:
     <<: *base_ems_large
     environment:
-      TERM: xterm
+      <<: *base_ems_large_env
       MAKEFLAGS: -j 10
     steps:
       - checkout
@@ -1138,9 +1132,9 @@ jobs:
     <<: *base_archlinux
     parallelism: 20
     environment:
+      <<: *base_archlinux_env
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
-      TERM: xterm
       # For Archlinux we do not have prebuilt docker images and we would need to build evmone from source,
       # thus we forgo semantics tests to speed things up.
       SOLTEST_FLAGS: --no-semantic-tests --no-smt
@@ -1157,6 +1151,7 @@ jobs:
     <<: *base_ubuntu2204_clang
     parallelism: 20
     environment:
+      <<: *base_ubuntu2204_clang_env
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
       # The high parallelism in this job is causing the SMT tests to run out of memory,
@@ -1191,7 +1186,7 @@ jobs:
     <<: *base_ubuntu2204
     parallelism: 7 # Should match number of tests in .circleci/cli.sh
     environment:
-      TERM: xterm
+      <<: *base_ubuntu2204_env
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
       # Suppress CLN memory leak.
       # See: https://github.com/ethereum/solidity/issues/13891 for details.
@@ -1202,6 +1197,7 @@ jobs:
     <<: *base_ubuntu2204
     parallelism: 20
     environment:
+      <<: *base_ubuntu2204_env
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
       SOLTEST_FLAGS: --no-smt
@@ -1215,6 +1211,7 @@ jobs:
     <<: *base_ubuntu2204_clang
     parallelism: 20
     environment:
+      <<: *base_ubuntu2204_clang_env
       EVM: << pipeline.parameters.evm-version >>
       OPTIMIZE: 0
       SOLTEST_FLAGS: --no-smt
@@ -1225,6 +1222,7 @@ jobs:
     <<: *base_ubuntu2204_clang
     parallelism: 20
     environment:
+      <<: *base_ubuntu2204_clang_env
       EVM: << pipeline.parameters.evm-version >>
       SOLTEST_FLAGS: --no-smt
     <<: *steps_soltest
@@ -1260,7 +1258,7 @@ jobs:
     docker:
       - image: cimg/node:18.16
     environment:
-      TERM: xterm
+      <<: *base_node_small_env
       HARDHAT_TESTS_SOLC_PATH: /tmp/workspace/soljson.js
     steps:
       - checkout
@@ -1581,9 +1579,8 @@ jobs:
   t_bytecode_compare:
     <<: *base_ubuntu2204_small
     environment:
+      <<: *base_ubuntu2204_small_env
       <<: *bytecode_compare_env_presets
-      TERM: xterm
-      MAKEFLAGS: -j 2
     steps:
       - checkout
       - attach_workspace:

From 29041c8101d13a5e4372e9c2b94e83a5e254d66e Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@gmail.com>
Date: Tue, 27 Jun 2023 17:42:06 +0200
Subject: [PATCH 1468/1748] Remove ReasoningBasedSimplifier from libyul

Due to a design decision to move away from a bundled SMT solver,
ReasoningBasedSimplifier in its current form cannot be use any longer.
This is a necessary step to allow a unified way to call solvers using
only SMTLIB interface.

Since this optimization pass has always been marked as highly
experimental and never turned on by default, it should be OK to remove
it.
---
 Changelog.md                                  |   1 +
 docs/internals/optimizer.rst                  |  21 --
 libyul/CMakeLists.txt                         |   4 -
 libyul/optimiser/ReasoningBasedSimplifier.cpp | 228 ------------------
 libyul/optimiser/ReasoningBasedSimplifier.h   |  75 ------
 libyul/optimiser/SMTSolver.cpp                | 160 ------------
 libyul/optimiser/SMTSolver.h                  |  92 -------
 libyul/optimiser/Suite.cpp                    |   3 -
 test/libyul/YulOptimizerTest.cpp              |   7 -
 test/libyul/YulOptimizerTestCommon.cpp        |   8 +-
 .../reasoningBasedSimplifier/arith.yul        |  13 -
 .../arith_movable.yul                         |  19 --
 .../arith_non_movable.yul                     |  23 --
 .../reasoningBasedSimplifier/mulcheck.yul     |  32 ---
 .../reasoningBasedSimplifier/mulmod.yul       |  31 ---
 .../negative_rounding.yul                     |  16 --
 .../reasoningBasedSimplifier/nested.yul       |  26 --
 .../signed_division.yul                       |  31 ---
 .../reasoningBasedSimplifier/smod.yul         |  53 ----
 .../reasoningBasedSimplifier/smoke.yul        |   5 -
 .../reasoningBasedSimplifier/wrapping.yul     |  15 --
 test/tools/yulopti.cpp                        |   1 -
 test/yulPhaser/Chromosome.cpp                 |   2 +-
 23 files changed, 3 insertions(+), 863 deletions(-)
 delete mode 100644 libyul/optimiser/ReasoningBasedSimplifier.cpp
 delete mode 100644 libyul/optimiser/ReasoningBasedSimplifier.h
 delete mode 100644 libyul/optimiser/SMTSolver.cpp
 delete mode 100644 libyul/optimiser/SMTSolver.h
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith.yul
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith_movable.yul
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith_non_movable.yul
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/mulcheck.yul
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/mulmod.yul
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/negative_rounding.yul
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/nested.yul
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/signed_division.yul
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/smod.yul
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/smoke.yul
 delete mode 100644 test/libyul/yulOptimizerTests/reasoningBasedSimplifier/wrapping.yul

diff --git a/Changelog.md b/Changelog.md
index 69bd02624e..2ddf6647e0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ Compiler Features:
  * SMTChecker: Add ``--model-checker-print-query`` CLI option and ``settings.modelChecker.printQuery`` JSON option to output the SMTChecker queries in the SMTLIB2 format. This requires using `smtlib2` solver only.
  * Standard JSON Interface: Add ``ast`` file-level output for Yul input.
  * Standard JSON Interface: Add ``irAst`` and ``irOptimizedAst`` contract-level outputs for Solidity input, providing AST in compact JSON format for IR and optimized IR.
+ * Yul Optimizer: Remove experimental `ReasoningBasedSimplifier` optimization step.
  * Yul Optimizer: Stack-to-memory mover is now enabled by default whenever possible for via IR code generation and pure Yul compilation.
 
 
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index d3df1b6009..cd4624a1a1 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -316,7 +316,6 @@ Abbreviation Full name
 ``L``        :ref:`load-resolver`
 ``M``        :ref:`loop-invariant-code-motion`
 ``r``        :ref:`redundant-assign-eliminator`
-``R``        :ref:`reasoning-based-simplifier` - highly experimental
 ``m``        :ref:`rematerialiser`
 ``V``        :ref:`SSA-reverser`
 ``a``        :ref:`SSA-transform`
@@ -330,10 +329,6 @@ Abbreviation Full name
 Some steps depend on properties ensured by ``BlockFlattener``, ``FunctionGrouper``, ``ForLoopInitRewriter``.
 For this reason the Yul optimizer always applies them before applying any steps supplied by the user.
 
-The ReasoningBasedSimplifier is an optimizer step that is currently not enabled
-in the default set of steps. It uses an SMT solver to simplify arithmetic expressions
-and boolean conditions. It has not received thorough testing or validation yet and can produce
-non-reproducible results, so please use with care!
 
 Selecting Optimizations
 -----------------------
@@ -863,22 +858,6 @@ Works best if the code is in SSA form.
 
 Prerequisite: Disambiguator, ForLoopInitRewriter.
 
-.. _reasoning-based-simplifier:
-
-ReasoningBasedSimplifier
-^^^^^^^^^^^^^^^^^^^^^^^^
-
-This optimizer uses SMT solvers to check whether ``if`` conditions are constant.
-
-- If ``constraints AND condition`` is UNSAT, the condition is never true and the whole body can be removed.
-- If ``constraints AND NOT condition`` is UNSAT, the condition is always true and can be replaced by ``1``.
-
-The simplifications above can only be applied if the condition is movable.
-
-It is only effective on the EVM dialect, but safe to use on other dialects.
-
-Prerequisite: Disambiguator, SSATransform.
-
 Statement-Scale Simplifications
 -------------------------------
 
diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 2cf02f8383..0bb98e4677 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -143,8 +143,6 @@ add_library(yul
 	optimiser/OptimiserStep.h
 	optimiser/OptimizerUtilities.cpp
 	optimiser/OptimizerUtilities.h
-	optimiser/ReasoningBasedSimplifier.cpp
-	optimiser/ReasoningBasedSimplifier.h
 	optimiser/UnusedAssignEliminator.cpp
 	optimiser/UnusedAssignEliminator.h
 	optimiser/UnusedStoreBase.cpp
@@ -153,8 +151,6 @@ add_library(yul
 	optimiser/UnusedStoreEliminator.h
 	optimiser/Rematerialiser.cpp
 	optimiser/Rematerialiser.h
-	optimiser/SMTSolver.cpp
-	optimiser/SMTSolver.h
 	optimiser/SSAReverser.cpp
 	optimiser/SSAReverser.h
 	optimiser/SSATransform.cpp
diff --git a/libyul/optimiser/ReasoningBasedSimplifier.cpp b/libyul/optimiser/ReasoningBasedSimplifier.cpp
deleted file mode 100644
index 24882d84e8..0000000000
--- a/libyul/optimiser/ReasoningBasedSimplifier.cpp
+++ /dev/null
@@ -1,228 +0,0 @@
-/*
-	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/>.
-*/
-
-#include <libyul/optimiser/ReasoningBasedSimplifier.h>
-#include <libyul/optimiser/SMTSolver.h>
-
-#include <libyul/optimiser/SSAValueTracker.h>
-#include <libyul/optimiser/Semantics.h>
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-
-#include <libsmtutil/SMTPortfolio.h>
-#include <libsmtutil/Helpers.h>
-
-#include <libsolutil/CommonData.h>
-
-#include <libevmasm/Instruction.h>
-
-#include <utility>
-#include <memory>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::util;
-using namespace solidity::yul;
-using namespace solidity::smtutil;
-
-void ReasoningBasedSimplifier::run(OptimiserStepContext& _context, Block& _ast)
-{
-	set<YulString> ssaVars = SSAValueTracker::ssaVariables(_ast);
-	ReasoningBasedSimplifier{_context.dialect, ssaVars}(_ast);
-}
-
-std::optional<string> ReasoningBasedSimplifier::invalidInCurrentEnvironment()
-{
-	// SMTLib2 interface is always available, but we would like to have synchronous answers.
-	if (smtutil::SMTPortfolio{}.solvers() <= 1)
-		return string{"No SMT solvers available."};
-	else
-		return nullopt;
-}
-
-void ReasoningBasedSimplifier::operator()(VariableDeclaration& _varDecl)
-{
-	SMTSolver::encodeVariableDeclaration(_varDecl);
-}
-
-void ReasoningBasedSimplifier::operator()(If& _if)
-{
-	if (!SideEffectsCollector{m_dialect, *_if.condition}.movable())
-		return;
-
-	smtutil::Expression condition = encodeExpression(*_if.condition);
-	m_solver->push();
-	m_solver->addAssertion(condition == constantValue(0));
-	CheckResult result = m_solver->check({}).first;
-	m_solver->pop();
-	if (result == CheckResult::UNSATISFIABLE)
-	{
-		Literal trueCondition = m_dialect.trueLiteral();
-		trueCondition.debugData = debugDataOf(*_if.condition);
-		_if.condition = make_unique<yul::Expression>(std::move(trueCondition));
-	}
-	else
-	{
-		m_solver->push();
-		m_solver->addAssertion(condition != constantValue(0));
-		CheckResult result2 = m_solver->check({}).first;
-		m_solver->pop();
-		if (result2 == CheckResult::UNSATISFIABLE)
-		{
-			Literal falseCondition = m_dialect.zeroLiteralForType(m_dialect.boolType);
-			falseCondition.debugData = debugDataOf(*_if.condition);
-			_if.condition = make_unique<yul::Expression>(std::move(falseCondition));
-			_if.body = yul::Block{};
-			// Nothing left to be done.
-			return;
-		}
-	}
-
-	m_solver->push();
-	m_solver->addAssertion(condition != constantValue(0));
-
-	ASTModifier::operator()(_if.body);
-
-	m_solver->pop();
-}
-
-ReasoningBasedSimplifier::ReasoningBasedSimplifier(
-	Dialect const& _dialect,
-	set<YulString> const& _ssaVariables
-):
-	SMTSolver(_ssaVariables, _dialect),
-	m_dialect(_dialect)
-{
-}
-
-
-smtutil::Expression ReasoningBasedSimplifier::encodeEVMBuiltin(
-	evmasm::Instruction _instruction,
-	vector<yul::Expression> const& _arguments
-)
-{
-	vector<smtutil::Expression> arguments = applyMap(
-		_arguments,
-		[this](yul::Expression const& _expr) { return encodeExpression(_expr); }
-	);
-	switch (_instruction)
-	{
-	case evmasm::Instruction::ADD:
-		return wrap(arguments.at(0) + arguments.at(1));
-	case evmasm::Instruction::MUL:
-		return wrap(arguments.at(0) * arguments.at(1));
-	case evmasm::Instruction::SUB:
-		return wrap(arguments.at(0) - arguments.at(1));
-	case evmasm::Instruction::DIV:
-		return smtutil::Expression::ite(
-			arguments.at(1) == constantValue(0),
-			constantValue(0),
-			arguments.at(0) / arguments.at(1)
-		);
-	case evmasm::Instruction::SDIV:
-		return smtutil::Expression::ite(
-			arguments.at(1) == constantValue(0),
-			constantValue(0),
-			// No `wrap()` needed here, because -2**255 / -1 results
-			// in 2**255 which is "converted" to its two's complement
-			// representation 2**255 in `signedToTwosComplement`
-			signedToTwosComplement(smtutil::signedDivisionEVM(
-				twosComplementToSigned(arguments.at(0)),
-				twosComplementToSigned(arguments.at(1))
-			))
-		);
-	case evmasm::Instruction::MOD:
-		return smtutil::Expression::ite(
-			arguments.at(1) == constantValue(0),
-			constantValue(0),
-			arguments.at(0) % arguments.at(1)
-		);
-	case evmasm::Instruction::SMOD:
-		return smtutil::Expression::ite(
-			arguments.at(1) == constantValue(0),
-			constantValue(0),
-			signedToTwosComplement(signedModuloEVM(
-				twosComplementToSigned(arguments.at(0)),
-				twosComplementToSigned(arguments.at(1))
-			))
-		);
-	case evmasm::Instruction::LT:
-		return booleanValue(arguments.at(0) < arguments.at(1));
-	case evmasm::Instruction::SLT:
-		return booleanValue(twosComplementToSigned(arguments.at(0)) < twosComplementToSigned(arguments.at(1)));
-	case evmasm::Instruction::GT:
-		return booleanValue(arguments.at(0) > arguments.at(1));
-	case evmasm::Instruction::SGT:
-		return booleanValue(twosComplementToSigned(arguments.at(0)) > twosComplementToSigned(arguments.at(1)));
-	case evmasm::Instruction::EQ:
-		return booleanValue(arguments.at(0) == arguments.at(1));
-	case evmasm::Instruction::ISZERO:
-		return booleanValue(arguments.at(0) == constantValue(0));
-	case evmasm::Instruction::AND:
-		return smtutil::Expression::ite(
-			(arguments.at(0) == 0 || arguments.at(0) == 1) &&
-			(arguments.at(1) == 0 || arguments.at(1) == 1),
-			booleanValue(arguments.at(0) == 1 && arguments.at(1) == 1),
-			bv2int(int2bv(arguments.at(0)) & int2bv(arguments.at(1)))
-		);
-	case evmasm::Instruction::OR:
-		return smtutil::Expression::ite(
-			(arguments.at(0) == 0 || arguments.at(0) == 1) &&
-			(arguments.at(1) == 0 || arguments.at(1) == 1),
-			booleanValue(arguments.at(0) == 1 || arguments.at(1) == 1),
-			bv2int(int2bv(arguments.at(0)) | int2bv(arguments.at(1)))
-		);
-	case evmasm::Instruction::XOR:
-		return bv2int(int2bv(arguments.at(0)) ^ int2bv(arguments.at(1)));
-	case evmasm::Instruction::NOT:
-		return smtutil::Expression(u256(-1)) - arguments.at(0);
-	case evmasm::Instruction::SHL:
-		return smtutil::Expression::ite(
-			arguments.at(0) > 255,
-			constantValue(0),
-			bv2int(int2bv(arguments.at(1)) << int2bv(arguments.at(0)))
-		);
-	case evmasm::Instruction::SHR:
-		return smtutil::Expression::ite(
-			arguments.at(0) > 255,
-			constantValue(0),
-			bv2int(int2bv(arguments.at(1)) >> int2bv(arguments.at(0)))
-		);
-	case evmasm::Instruction::SAR:
-		return smtutil::Expression::ite(
-			arguments.at(0) > 255,
-			constantValue(0),
-			bv2int(smtutil::Expression::ashr(int2bv(arguments.at(1)), int2bv(arguments.at(0))))
-		);
-	case evmasm::Instruction::ADDMOD:
-		return smtutil::Expression::ite(
-			arguments.at(2) == constantValue(0),
-			constantValue(0),
-			(arguments.at(0) + arguments.at(1)) % arguments.at(2)
-		);
-	case evmasm::Instruction::MULMOD:
-		return smtutil::Expression::ite(
-			arguments.at(2) == constantValue(0),
-			constantValue(0),
-			(arguments.at(0) * arguments.at(1)) % arguments.at(2)
-		);
-	// TODO SIGNEXTEND
-	default:
-		break;
-	}
-	return newRestrictedVariable();
-}
diff --git a/libyul/optimiser/ReasoningBasedSimplifier.h b/libyul/optimiser/ReasoningBasedSimplifier.h
deleted file mode 100644
index c458a36d09..0000000000
--- a/libyul/optimiser/ReasoningBasedSimplifier.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-	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/>.
-*/
-#pragma once
-
-#include <libyul/optimiser/SMTSolver.h>
-#include <libyul/optimiser/ASTWalker.h>
-#include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/Dialect.h>
-
-// because of instruction
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <map>
-
-namespace solidity::smtutil
-{
-class SolverInterface;
-class Expression;
-struct Sort;
-}
-
-namespace solidity::yul
-{
-
-/**
- * Reasoning-based simplifier.
- * This optimizer uses SMT solvers to check whether `if` conditions are constant.
- * - If `constraints AND condition` is UNSAT, the condition is never true and the whole body can be removed.
- * - If `constraints AND NOT condition` is UNSAT, the condition is always true and can be replaced by `1`.
- * The simplifications above can only be applied if the condition is movable.
- *
- * It is only effective on the EVM dialect, but safe to use on other dialects.
- *
- * Prerequisite: Disambiguator, SSATransform.
- */
-class ReasoningBasedSimplifier: public ASTModifier, SMTSolver
-{
-public:
-	static constexpr char const* name{"ReasoningBasedSimplifier"};
-	static void run(OptimiserStepContext& _context, Block& _ast);
-	static std::optional<std::string> invalidInCurrentEnvironment();
-
-	using ASTModifier::operator();
-	void operator()(VariableDeclaration& _varDecl) override;
-	void operator()(If& _if) override;
-
-private:
-	explicit ReasoningBasedSimplifier(
-		Dialect const& _dialect,
-		std::set<YulString> const& _ssaVariables
-	);
-
-	smtutil::Expression encodeEVMBuiltin(
-		evmasm::Instruction _instruction,
-		std::vector<Expression> const& _arguments
-	) override;
-
-	Dialect const& m_dialect;
-};
-
-}
diff --git a/libyul/optimiser/SMTSolver.cpp b/libyul/optimiser/SMTSolver.cpp
deleted file mode 100644
index c0c6bcb5ec..0000000000
--- a/libyul/optimiser/SMTSolver.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-	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/>.
-*/
-
-#include <libyul/optimiser/SMTSolver.h>
-#include <libyul/optimiser/OptimizerUtilities.h>
-
-#include <libyul/AST.h>
-#include <libyul/Utilities.h>
-
-#include <libsolutil/Visitor.h>
-#include <libsolutil/CommonData.h>
-
-#include <libsmtutil/SMTPortfolio.h>
-#include <libsmtutil/Helpers.h>
-
-using namespace solidity::yul;
-using namespace solidity::util;
-using namespace solidity::smtutil;
-using namespace solidity;
-using namespace std;
-
-SMTSolver::SMTSolver(set<YulString> const& _ssaVariables, Dialect const& _dialect):
-	m_ssaVariables(_ssaVariables),
-	m_solver(make_unique<smtutil::SMTPortfolio>()),
-	m_dialect(_dialect)
-{ }
-
-smtutil::Expression SMTSolver::encodeExpression(Expression const& _expression)
-{
-	return std::visit(GenericVisitor{
-		[&](FunctionCall const& _functionCall)
-		{
-			if (auto instruction = toEVMInstruction(m_dialect, _functionCall.functionName.name))
-				return encodeEVMBuiltin(*instruction, _functionCall.arguments);
-
-			return newRestrictedVariable();
-		},
-		[&](Identifier const& _identifier)
-		{
-			if (
-				m_ssaVariables.count(_identifier.name) &&
-				m_variables.count(_identifier.name)
-			)
-				return m_variables.at(_identifier.name);
-			else
-				return newRestrictedVariable();
-		},
-		[&](Literal const& _literal)
-		{
-			return literalValue(_literal);
-		}
-	}, _expression);
-}
-
-smtutil::Expression SMTSolver::int2bv(smtutil::Expression _arg)
-{
-	return smtutil::Expression::int2bv(std::move(_arg), 256);
-}
-
-smtutil::Expression SMTSolver::bv2int(smtutil::Expression _arg)
-{
-	return smtutil::Expression::bv2int(std::move(_arg));
-}
-
-smtutil::Expression SMTSolver::newVariable()
-{
-	return m_solver->newVariable(uniqueName(), defaultSort());
-}
-
-smtutil::Expression SMTSolver::newRestrictedVariable(bigint _maxValue)
-{
-	smtutil::Expression var = newVariable();
-	m_solver->addAssertion(0 <= var && var <= smtutil::Expression(_maxValue));
-	return var;
-}
-
-string SMTSolver::uniqueName()
-{
-	return "expr_" + to_string(m_varCounter++);
-}
-
-shared_ptr<Sort> SMTSolver::defaultSort() const
-{
-	return SortProvider::intSort();
-}
-
-smtutil::Expression SMTSolver::booleanValue(smtutil::Expression _value)
-{
-	return smtutil::Expression::ite(_value, constantValue(1), constantValue(0));
-}
-
-smtutil::Expression SMTSolver::constantValue(bigint _value)
-{
-	return _value;
-}
-
-smtutil::Expression SMTSolver::literalValue(Literal const& _literal)
-{
-	return smtutil::Expression(valueOfLiteral(_literal));
-}
-
-smtutil::Expression SMTSolver::twosComplementToSigned(smtutil::Expression _value)
-{
-	return smtutil::Expression::ite(
-		_value < smtutil::Expression(bigint(1) << 255),
-		_value,
-		_value - smtutil::Expression(bigint(1) << 256)
-	);
-}
-
-smtutil::Expression SMTSolver::signedToTwosComplement(smtutil::Expression _value)
-{
-	return smtutil::Expression::ite(
-		_value >= 0,
-		_value,
-		_value + smtutil::Expression(bigint(1) << 256)
-	);
-}
-
-smtutil::Expression SMTSolver::wrap(smtutil::Expression _value)
-{
-	smtutil::Expression rest = newRestrictedVariable();
-	smtutil::Expression multiplier = newVariable();
-	m_solver->addAssertion(_value == multiplier * smtutil::Expression(bigint(1) << 256) + rest);
-	return rest;
-}
-
-void SMTSolver::encodeVariableDeclaration(VariableDeclaration const& _varDecl)
-{
-	if (
-		_varDecl.variables.size() == 1 &&
-		_varDecl.value &&
-		m_ssaVariables.count(_varDecl.variables.front().name)
-	)
-	{
-		YulString const& variableName = _varDecl.variables.front().name;
-		bool const inserted = m_variables.insert({
-			variableName,
-			m_solver->newVariable("yul_" + variableName.str(), defaultSort())
-		}).second;
-		yulAssert(inserted, "");
-		m_solver->addAssertion(
-			m_variables.at(variableName) == encodeExpression(*_varDecl.value)
-		);
-	}
-}
diff --git a/libyul/optimiser/SMTSolver.h b/libyul/optimiser/SMTSolver.h
deleted file mode 100644
index d92a84c1d5..0000000000
--- a/libyul/optimiser/SMTSolver.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-	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/>.
-*/
-#pragma once
-
-#include <libyul/AST.h>
-#include <libyul/Dialect.h>
-#include <libyul/Exceptions.h>
-
-// because of instruction
-#include <libyul/backends/evm/EVMDialect.h>
-
-#include <libsmtutil/SolverInterface.h>
-
-#include <memory>
-
-namespace solidity::smtutil
-{
-
-class SolverInterface;
-class Expression;
-struct Sort;
-
-}
-
-namespace solidity::yul
-{
-
-/**
- * Base class for SMT based optimization steps.
- *
- * Works best when used with AST in SSA form.
- */
-class SMTSolver
-{
-protected:
-	SMTSolver(
-		std::set<YulString> const& _ssaVariables,
-		Dialect const& _dialect
-	);
-
-	/// Helper function that encodes VariableDeclaration
-	void encodeVariableDeclaration(VariableDeclaration const& _varDecl);
-
-	/// The encoding for a builtin. The type of encoding determines what we are
-	/// solving for.
-	virtual smtutil::Expression encodeEVMBuiltin(
-		evmasm::Instruction _instruction,
-		std::vector<Expression> const& _arguments
-	) = 0;
-
-	smtutil::Expression encodeExpression(Expression const& _expression);
-
-	static smtutil::Expression int2bv(smtutil::Expression _arg);
-	static smtutil::Expression bv2int(smtutil::Expression _arg);
-
-	smtutil::Expression newVariable();
-	virtual smtutil::Expression newRestrictedVariable(bigint _maxValue = (bigint(1) << 256) - 1);
-	std::string uniqueName();
-
-	virtual std::shared_ptr<smtutil::Sort> defaultSort() const;
-	static smtutil::Expression booleanValue(smtutil::Expression _value);
-	static smtutil::Expression constantValue(bigint _value);
-	static smtutil::Expression literalValue(Literal const& _literal);
-	static smtutil::Expression twosComplementToSigned(smtutil::Expression _value);
-	static smtutil::Expression signedToTwosComplement(smtutil::Expression _value);
-	smtutil::Expression wrap(smtutil::Expression _value);
-
-	std::set<YulString> const& m_ssaVariables;
-	std::unique_ptr<smtutil::SolverInterface> m_solver;
-	std::map<YulString, smtutil::Expression> m_variables;
-
-	Dialect const& m_dialect;
-
-private:
-	size_t m_varCounter = 0;
-};
-
-}
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index e29112b01d..bd966e5d30 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -43,7 +43,6 @@
 #include <libyul/optimiser/ForLoopInitRewriter.h>
 #include <libyul/optimiser/ForLoopConditionIntoBody.h>
 #include <libyul/optimiser/FunctionSpecializer.h>
-#include <libyul/optimiser/ReasoningBasedSimplifier.h>
 #include <libyul/optimiser/Rematerialiser.h>
 #include <libyul/optimiser/UnusedFunctionParameterPruner.h>
 #include <libyul/optimiser/UnusedPruner.h>
@@ -272,7 +271,6 @@ map<string, unique_ptr<OptimiserStep>> const& OptimiserSuite::allSteps()
 			LoopInvariantCodeMotion,
 			UnusedAssignEliminator,
 			UnusedStoreEliminator,
-			ReasoningBasedSimplifier,
 			Rematerialiser,
 			SSAReverser,
 			SSATransform,
@@ -312,7 +310,6 @@ map<string, char> const& OptimiserSuite::stepNameToAbbreviationMap()
 		{LiteralRematerialiser::name,         'T'},
 		{LoadResolver::name,                  'L'},
 		{LoopInvariantCodeMotion::name,       'M'},
-		{ReasoningBasedSimplifier::name,      'R'},
 		{UnusedAssignEliminator::name,        'r'},
 		{UnusedStoreEliminator::name,         'S'},
 		{Rematerialiser::name,                'm'},
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 6404fa7c6a..b50bcb38e5 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -24,7 +24,6 @@
 #include <test/Common.h>
 
 #include <libyul/Object.h>
-#include <libyul/optimiser/ReasoningBasedSimplifier.h>
 #include <libyul/AsmPrinter.h>
 
 #include <liblangutil/CharStreamProvider.h>
@@ -53,12 +52,6 @@ YulOptimizerTest::YulOptimizerTest(string const& _filename):
 		BOOST_THROW_EXCEPTION(runtime_error("Filename path has to contain a directory: \"" + _filename + "\"."));
 	m_optimizerStep = std::prev(std::prev(path.end()))->string();
 
-	if (m_optimizerStep == "reasoningBasedSimplifier" && (
-		solidity::test::CommonOptions::get().disableSMT ||
-		ReasoningBasedSimplifier::invalidInCurrentEnvironment()
-	))
-		m_shouldRun = false;
-
 	m_source = m_reader.source();
 
 	auto dialectName = m_reader.stringSetting("dialect", "evm");
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 48c7ea4038..ed29f339c6 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -49,7 +49,6 @@
 #include <libyul/optimiser/UnusedPruner.h>
 #include <libyul/optimiser/ExpressionJoiner.h>
 #include <libyul/optimiser/OptimiserStep.h>
-#include <libyul/optimiser/ReasoningBasedSimplifier.h>
 #include <libyul/optimiser/SSAReverser.h>
 #include <libyul/optimiser/SSATransform.h>
 #include <libyul/optimiser/Semantics.h>
@@ -289,10 +288,6 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			LiteralRematerialiser::run(*m_context, *m_ast);
 			StructuralSimplifier::run(*m_context, *m_ast);
 		}},
-		{"reasoningBasedSimplifier", [&]() {
-			disambiguate();
-			ReasoningBasedSimplifier::run(*m_context, *m_object->code);
-		}},
 		{"equivalentFunctionCombiner", [&]() {
 			disambiguate();
 			ForLoopInitRewriter::run(*m_context, *m_ast);
@@ -424,8 +419,7 @@ string YulOptimizerTestCommon::randomOptimiserStep(unsigned _seed)
 			// it can sometimes drain memory.
 			if (
 				optimiserStep == "mainFunction"	||
-				optimiserStep == "wordSizeTransform" ||
-				optimiserStep == "reasoningBasedSimplifier"
+				optimiserStep == "wordSizeTransform"
 			)
 				// "Fullsuite" is fuzzed roughly four times more frequently than
 				// other steps because of the filtering in place above.
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith.yul
deleted file mode 100644
index 7ff9307663..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith.yul
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    let x := 7
-    let y := 8
-    if eq(add(x, y), 15) { }
-}
-// ----
-// step: reasoningBasedSimplifier
-//
-// {
-//     let x := 7
-//     let y := 8
-//     if 1 { }
-// }
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith_movable.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith_movable.yul
deleted file mode 100644
index 2080a678c0..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith_movable.yul
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	function f() -> z
-	{
-		z := 15
-	}
-	let x := 7
-	let y := 8
-	if eq(add(x, y), f()) { }
-}
-// ----
-// step: reasoningBasedSimplifier
-//
-// {
-//     function f() -> z
-//     { z := 15 }
-//     let x := 7
-//     let y := 8
-//     if eq(add(x, y), f()) { }
-// }
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith_non_movable.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith_non_movable.yul
deleted file mode 100644
index ed50224d02..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/arith_non_movable.yul
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	function f() -> z
-	{
-		sstore(1, 15)
-		z := 15
-	}
-	let x := 7
-	let y := 8
-	if eq(add(x, y), f()) { }
-}
-// ----
-// step: reasoningBasedSimplifier
-//
-// {
-//     function f() -> z
-//     {
-//         sstore(1, 15)
-//         z := 15
-//     }
-//     let x := 7
-//     let y := 8
-//     if eq(add(x, y), f()) { }
-// }
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/mulcheck.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/mulcheck.yul
deleted file mode 100644
index 31a3423393..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/mulcheck.yul
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    let vloc_x := calldataload(0)
-    let vloc_y := calldataload(1)
-    if lt(vloc_x, shl(100, 1)) {
-        if lt(vloc_y, shl(100, 1)) {
-            if iszero(and(iszero(iszero(vloc_x)), gt(vloc_y, div(not(0), vloc_x)))) {
-                let vloc := mul(vloc_x, vloc_y)
-                sstore(0, vloc)
-            }
-        }
-    }
-}
-// ====
-// EVMVersion: >=constantinople
-// ----
-// step: reasoningBasedSimplifier
-//
-// {
-//     let vloc_x := calldataload(0)
-//     let vloc_y := calldataload(1)
-//     if lt(vloc_x, shl(100, 1))
-//     {
-//         if lt(vloc_y, shl(100, 1))
-//         {
-//             if 1
-//             {
-//                 let vloc := mul(vloc_x, vloc_y)
-//                 sstore(0, vloc)
-//             }
-//         }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/mulmod.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/mulmod.yul
deleted file mode 100644
index f5226acf77..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/mulmod.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    let x := calldataload(0)
-    let y := calldataload(32)
-    let z := calldataload(64)
-    let result := mulmod(x, y, z)
-
-    // should be zero
-    if gt(result, z) { sstore(0, 1) }
-
-    // mulmod is equal to mod of product for small numbers
-    if and(and(lt(x, 1000), lt(y, 1000)), lt(z, 1000)) {
-        if eq(result, mod(mul(x, y), z)) { sstore(0, 9) }
-    }
-
-    // but not in general
-    if and(and(gt(x, sub(0, 5)), eq(y, 2)), eq(z, 3)) {
-        if eq(result, mod(mul(x, y), z)) { sstore(0, 5) }
-    }
-}
-// ----
-// step: reasoningBasedSimplifier
-//
-// {
-//     let x := calldataload(0)
-//     let y := calldataload(32)
-//     let z := calldataload(64)
-//     let result := mulmod(x, y, z)
-//     if 0 { }
-//     if and(and(lt(x, 1000), lt(y, 1000)), lt(z, 1000)) { if 1 { sstore(0, 9) } }
-//     if and(and(gt(x, sub(0, 5)), eq(y, 2)), eq(z, 3)) { if 0 { } }
-// }
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/negative_rounding.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/negative_rounding.yul
deleted file mode 100644
index 6e4b3f5ede..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/negative_rounding.yul
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-    let x := sub(0, 7)
-    let y := 2
-    // (-7)/2 == -3 on the evm
-    if iszero(add(sdiv(x, y), 3)) { }
-    if iszero(add(sdiv(x, y), 4)) { }
-}
-// ----
-// step: reasoningBasedSimplifier
-//
-// {
-//     let x := sub(0, 7)
-//     let y := 2
-//     if 1 { }
-//     if 0 { }
-// }
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/nested.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/nested.yul
deleted file mode 100644
index d7002c99b5..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/nested.yul
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    let x := calldataload(2)
-    let t := lt(x, 20)
-    if t {
-        if lt(x, 21) { }
-        if lt(x, 20) { }
-        if lt(x, 19) { }
-        if gt(x, 20) { }
-        if iszero(gt(x, 20)) { }
-    }
-}
-// ----
-// step: reasoningBasedSimplifier
-//
-// {
-//     let x := calldataload(2)
-//     let t := lt(x, 20)
-//     if t
-//     {
-//         if 1 { }
-//         if 1 { }
-//         if lt(x, 19) { }
-//         if 0 { }
-//         if 1 { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/signed_division.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/signed_division.yul
deleted file mode 100644
index 1e409079e8..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/signed_division.yul
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    let y := calldataload(0)
-    let t := calldataload(32)
-
-    if sgt(sub(y, 1), y) {
-        // y - 1 > y, i.e. y is the most negative value
-        if eq(sdiv(y, sub(0, 1)), y) {
-            // should be true: y / -1 == y
-            sstore(0, 7)
-        }
-        if iszero(eq(y, t)) {
-            // t is not the most negative value
-            if eq(sdiv(t, sub(0, 1)), sub(0, t)) {
-                // should be true: t / -1 = 0 - t
-                sstore(1, 7)
-            }
-        }
-    }
-}
-// ----
-// step: reasoningBasedSimplifier
-//
-// {
-//     let y := calldataload(0)
-//     let t := calldataload(32)
-//     if sgt(sub(y, 1), y)
-//     {
-//         if 1 { sstore(0, 7) }
-//         if iszero(eq(y, t)) { if 1 { sstore(1, 7) } }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/smod.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/smod.yul
deleted file mode 100644
index 12f04c857c..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/smod.yul
+++ /dev/null
@@ -1,53 +0,0 @@
-{
-    // 7 % 5 == 2
-    // 7 % -5 == 2
-    // -7 % 5 == -2
-    // -7 % -5 == -2
-    // -5 % -5 == 0
-    let x := calldataload(0)
-    let y := calldataload(32)
-    let result := smod(x, y)
-    if eq(x, 7) {
-        if eq(y, 5) {
-            if eq(result, 2) { sstore(0, 7)}
-        }
-        if eq(y, sub(0, 5)) {
-            if eq(result, 2) { sstore(0, 7)}
-        }
-    }
-    if eq(x, sub(0, 7)) {
-        if eq(y, 5) {
-            if eq(result, sub(0, 2)) { sstore(0, 7)}
-        }
-        if eq(y, sub(0, 5)) {
-            if eq(result, sub(0, 2)) { sstore(0, 7)}
-        }
-    }
-    if eq(x, sub(0, 5)) {
-        if eq(y, sub(0, 5)) {
-            if eq(result, 0) { sstore(0, 7)}
-        }
-    }
-}
-// ----
-// step: reasoningBasedSimplifier
-//
-// {
-//     let x := calldataload(0)
-//     let y := calldataload(32)
-//     let result := smod(x, y)
-//     if eq(x, 7)
-//     {
-//         if eq(y, 5) { if 1 { sstore(0, 7) } }
-//         if eq(y, sub(0, 5)) { if 1 { sstore(0, 7) } }
-//     }
-//     if eq(x, sub(0, 7))
-//     {
-//         if eq(y, 5) { if 1 { sstore(0, 7) } }
-//         if eq(y, sub(0, 5)) { if 1 { sstore(0, 7) } }
-//     }
-//     if eq(x, sub(0, 5))
-//     {
-//         if eq(y, sub(0, 5)) { if 1 { sstore(0, 7) } }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/smoke.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/smoke.yul
deleted file mode 100644
index 6f860dc132..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/smoke.yul
+++ /dev/null
@@ -1,5 +0,0 @@
-{ }
-// ----
-// step: reasoningBasedSimplifier
-//
-// { }
diff --git a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/wrapping.yul b/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/wrapping.yul
deleted file mode 100644
index 69f5c67697..0000000000
--- a/test/libyul/yulOptimizerTests/reasoningBasedSimplifier/wrapping.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let x := 7
-    let y := 8
-    if gt(sub(x, y), 20) { }
-    if eq(sub(x, y), 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff) {}
-}
-// ----
-// step: reasoningBasedSimplifier
-//
-// {
-//     let x := 7
-//     let y := 8
-//     if 1 { }
-//     if 1 { }
-// }
diff --git a/test/tools/yulopti.cpp b/test/tools/yulopti.cpp
index ad98ab9bee..20491afe16 100644
--- a/test/tools/yulopti.cpp
+++ b/test/tools/yulopti.cpp
@@ -37,7 +37,6 @@
 #include <libyul/optimiser/StackCompressor.h>
 #include <libyul/optimiser/VarNameCleaner.h>
 #include <libyul/optimiser/Suite.h>
-#include <libyul/optimiser/ReasoningBasedSimplifier.h>
 
 #include <libyul/backends/evm/EVMDialect.h>
 
diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp
index 90e278f42e..1d12bf18c1 100644
--- a/test/yulPhaser/Chromosome.cpp
+++ b/test/yulPhaser/Chromosome.cpp
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_strin
 
 	BOOST_TEST(chromosome.length() == allSteps.size());
 	BOOST_TEST(chromosome.optimisationSteps() == allSteps);
-	BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMRmVatrpuSd");
+	BOOST_TEST(toString(chromosome) == "flcCUnDEvejsxIOoighFTLMmVatrpuSd");
 }
 
 BOOST_AUTO_TEST_CASE(optimisationSteps_should_translate_chromosomes_genes_to_optimisation_step_names)

From 3599c8c6b92cac837b7fa3f0c0c196a12e749151 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@gmail.com>
Date: Fri, 30 Jun 2023 15:02:06 +0200
Subject: [PATCH 1469/1748] SMTChecker: Fix generation of smtlib scripts

When both CHC and BMC engines are used, the type of state variable
changes when trusted mode for external calls is used. This is because in
CHC engine, trusted mode means we pack more information into the
symbolic state. In BMC this type is always simple.

However, if BMC is run after CHC, in the current code state variables
are reset (and their declaration dumped into SMT-LIB script) before BMC
resets the type of the state variable.

The proposed solution is to simply reset the variable type before the
first variable of this type is created.
---
 libsolidity/formal/BMC.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index d38f27b6ad..cead3a528f 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -81,13 +81,13 @@ void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<Verificatio
 
 	SMTEncoder::resetSourceAnalysis();
 
+	state().prepareForSourceUnit(_source, false);
 	m_solvedTargets = std::move(_solvedTargets);
 	m_context.setSolver(m_interface.get());
 	m_context.reset();
 	m_context.setAssertionAccumulation(true);
 	m_variableUsage.setFunctionInlining(shouldInlineFunctionCall);
 	createFreeConstants(sourceDependencies(_source));
-	state().prepareForSourceUnit(_source, false);
 	m_unprovedAmt = 0;
 
 	_source.accept(*this);

From 29358806f4f209edafe3b9d083c9a244c5547f0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Criado-P=C3=A9rez?= <alejandro@criadoperez.com>
Date: Sun, 9 Jul 2023 01:45:54 +0200
Subject: [PATCH 1470/1748] updated protoToAbiv2.h

---
 test/tools/ossfuzz/protoToAbiV2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/tools/ossfuzz/protoToAbiV2.h b/test/tools/ossfuzz/protoToAbiV2.h
index 7038ed7064..be583d4971 100644
--- a/test/tools/ossfuzz/protoToAbiV2.h
+++ b/test/tools/ossfuzz/protoToAbiV2.h
@@ -390,7 +390,7 @@ class ProtoConverter
 		return m_isLastDynParamRightPadded;
 	}
 
-	/// Convert delimter to a comma or null string.
+	/// Convert delimiter to a comma or null string.
 	static std::string delimiterToString(Delimiter _delimiter, bool _space = true);
 	/// Generates number in the range [1, @param _n] uniformly at random.
 	unsigned randomNumberOneToN(unsigned _n)

From 58a42969894de1ababf064f6e157ec1b9a10405a Mon Sep 17 00:00:00 2001
From: Cliff Syner <33703995+alpinevm@users.noreply.github.com>
Date: Mon, 10 Jul 2023 00:33:05 -0500
Subject: [PATCH 1471/1748] Update using-the-compiler.rst

Reflect all available evm options in compiler standard input docs
---
 docs/using-the-compiler.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 6fb32871c8..6e6a64bb28 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -316,7 +316,7 @@ Input Description
         },
         // Version of the EVM to compile for.
         // Affects type checking and code generation. Can be homestead,
-        // tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg, istanbul, berlin, london or paris
+        // tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg, istanbul, berlin, london, paris or shanghai
         "evmVersion": "byzantium",
         // Optional: Change compilation pipeline to go through the Yul intermediate representation.
         // This is false by default.

From a9c8b4b4d1879909a1cf2adec31613f9eb56e968 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 10 Jul 2023 13:12:46 +0200
Subject: [PATCH 1472/1748] Purge using namespace std

---
 CODING_STYLE.md                             |  20 +---
 libevmasm/Assembly.cpp                      | 121 ++++++++++----------
 libevmasm/AssemblyItem.cpp                  |  88 +++++++-------
 libevmasm/BlockDeduplicator.cpp             |   9 +-
 libevmasm/CommonSubexpressionEliminator.cpp |  29 +++--
 libevmasm/ConstantOptimiser.cpp             |   9 +-
 libevmasm/ControlFlowGraph.cpp              |  25 ++--
 libevmasm/Disassemble.cpp                   |   7 +-
 libevmasm/ExpressionClasses.cpp             |  29 +++--
 libevmasm/GasMeter.cpp                      |   3 +-
 libevmasm/Inliner.cpp                       |  29 +++--
 libevmasm/Instruction.cpp                   |   3 +-
 libevmasm/JumpdestRemover.cpp               |  11 +-
 libevmasm/KnownState.cpp                    |  49 ++++----
 libevmasm/LinkerObject.cpp                  |  17 ++-
 libevmasm/PathGasMeter.cpp                  |  15 ++-
 libevmasm/PeepholeOptimiser.cpp             |  43 ++++---
 libevmasm/SemanticInformation.cpp           |   9 +-
 libevmasm/SimplificationRules.cpp           |  21 ++--
 19 files changed, 255 insertions(+), 282 deletions(-)

diff --git a/CODING_STYLE.md b/CODING_STYLE.md
index cd46800da6..5b9129fbd0 100644
--- a/CODING_STYLE.md
+++ b/CODING_STYLE.md
@@ -51,11 +51,11 @@ To set indentation and tab width settings uniformly, the repository contains an
 ## 1. Namespaces
 
 1. No `using namespace` declarations in header files.
-2. Use `using namespace std;` in cpp files, but avoid importing namespaces from boost and others.
-3. All symbols should be declared in a namespace except for final applications.
-4. Use anonymous namespaces for helpers whose scope is a cpp file only.
-5. Preprocessor symbols should be prefixed with the namespace in all-caps and an underscore.
-6. Do not use `std::` qualifier in cpp files (see 2.), except for `std::move` and `std::forward`, which will otherwise cause the `check_style` step to fail.
+2. `using namespace solidity;` and other project local namespaces is fine in cpp files, and generally encouraged.
+3. Avoid `using namespace` at file level for third party libraries, such as boost, ranges, etc.
+4. All symbols should be declared in a namespace except for final applications.
+5. Use anonymous namespaces for helpers whose scope is a cpp file only.
+6. Preprocessor symbols should be prefixed with the namespace in all-caps and an underscore.
 
 Only in the header:
 ```cpp
@@ -66,16 +66,6 @@ std::tuple<float, float> meanAndSigma(std::vector<float> const& _v);
 }
 ```
 
-Only in the cpp file:
-```cpp
-#include <cassert>
-using namespace std;
-tuple<float, float> myNamespace::meanAndSigma(vector<float> const& _v)
-{
-  // ...
-}
-```
-
 ## 2. Preprocessor
 
 1. File comment is always at top, and includes:
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index b9b946aa59..f524aad66b 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -42,7 +42,6 @@
 #include <fstream>
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
@@ -77,7 +76,7 @@ unsigned Assembly::codeSize(unsigned subTagSize) const
 namespace
 {
 
-string locationFromSources(StringMap const& _sourceCodes, SourceLocation const& _location)
+std::string locationFromSources(StringMap const& _sourceCodes, SourceLocation const& _location)
 {
 	if (!_location.hasText() || _sourceCodes.empty())
 		return {};
@@ -92,7 +91,7 @@ string locationFromSources(StringMap const& _sourceCodes, SourceLocation const&
 class Functionalizer
 {
 public:
-	Functionalizer (ostream& _out, string const& _prefix, StringMap const& _sourceCodes, Assembly const& _assembly):
+	Functionalizer (std::ostream& _out, std::string const& _prefix, StringMap const& _sourceCodes, Assembly const& _assembly):
 		m_out(_out), m_prefix(_prefix), m_sourceCodes(_sourceCodes), m_assembly(_assembly)
 	{}
 
@@ -105,7 +104,7 @@ class Functionalizer
 			printLocation(_debugInfoSelection);
 		}
 
-		string expression = _item.toAssemblyText(m_assembly);
+		std::string expression = _item.toAssemblyText(m_assembly);
 
 		if (!(
 			_item.canBeFunctional() &&
@@ -114,7 +113,7 @@ class Functionalizer
 		))
 		{
 			flush();
-			m_out << m_prefix << (_item.type() == Tag ? "" : "  ") << expression << endl;
+			m_out << m_prefix << (_item.type() == Tag ? "" : "  ") << expression << std::endl;
 			return;
 		}
 		if (_item.arguments() > 0)
@@ -137,8 +136,8 @@ class Functionalizer
 
 	void flush()
 	{
-		for (string const& expression: m_pending)
-			m_out << m_prefix << "  " << expression << endl;
+		for (std::string const& expression: m_pending)
+			m_out << m_prefix << "  " << expression << std::endl;
 		m_pending.clear();
 	}
 
@@ -154,7 +153,7 @@ class Functionalizer
 			if (m_location.sourceName)
 				m_out << " " + escapeAndQuoteString(*m_location.sourceName);
 			if (m_location.hasText())
-				m_out << ":" << to_string(m_location.start) + ":" + to_string(m_location.end);
+				m_out << ":" << std::to_string(m_location.start) + ":" + std::to_string(m_location.end);
 		}
 
 		if (_debugInfoSelection.snippet)
@@ -165,15 +164,15 @@ class Functionalizer
 			m_out << locationFromSources(m_sourceCodes, m_location);
 		}
 
-		m_out << " */" << endl;
+		m_out << " */" << std::endl;
 	}
 
 private:
 	strings m_pending;
 	SourceLocation m_location;
 
-	ostream& m_out;
-	string const& m_prefix;
+	std::ostream& m_out;
+	std::string const& m_prefix;
 	StringMap const& m_sourceCodes;
 	Assembly const& m_assembly;
 };
@@ -181,9 +180,9 @@ class Functionalizer
 }
 
 void Assembly::assemblyStream(
-	ostream& _out,
+	std::ostream& _out,
 	DebugInfoSelection const& _debugInfoSelection,
-	string const& _prefix,
+	std::string const& _prefix,
 	StringMap const& _sourceCodes
 ) const
 {
@@ -195,34 +194,34 @@ void Assembly::assemblyStream(
 
 	if (!m_data.empty() || !m_subs.empty())
 	{
-		_out << _prefix << "stop" << endl;
+		_out << _prefix << "stop" << std::endl;
 		for (auto const& i: m_data)
 			if (u256(i.first) >= m_subs.size())
-				_out << _prefix << "data_" << toHex(u256(i.first)) << " " << util::toHex(i.second) << endl;
+				_out << _prefix << "data_" << toHex(u256(i.first)) << " " << util::toHex(i.second) << std::endl;
 
 		for (size_t i = 0; i < m_subs.size(); ++i)
 		{
-			_out << endl << _prefix << "sub_" << i << ": assembly {\n";
+			_out << std::endl << _prefix << "sub_" << i << ": assembly {\n";
 			m_subs[i]->assemblyStream(_out, _debugInfoSelection, _prefix + "    ", _sourceCodes);
-			_out << _prefix << "}" << endl;
+			_out << _prefix << "}" << std::endl;
 		}
 	}
 
 	if (m_auxiliaryData.size() > 0)
-		_out << endl << _prefix << "auxdata: 0x" << util::toHex(m_auxiliaryData) << endl;
+		_out << std::endl << _prefix << "auxdata: 0x" << util::toHex(m_auxiliaryData) << std::endl;
 }
 
-string Assembly::assemblyString(
+std::string Assembly::assemblyString(
 	DebugInfoSelection const& _debugInfoSelection,
 	StringMap const& _sourceCodes
 ) const
 {
-	ostringstream tmp;
+	std::ostringstream tmp;
 	assemblyStream(tmp, _debugInfoSelection, "", _sourceCodes);
 	return tmp.str();
 }
 
-Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices, bool _includeSourceList) const
+Json::Value Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourceIndices, bool _includeSourceList) const
 {
 	Json::Value root;
 	root[".code"] = Json::arrayValue;
@@ -244,7 +243,7 @@ Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices,
 		jsonItem["end"] = item.location().end;
 		if (item.m_modifierDepth != 0)
 			jsonItem["modifierDepth"] = static_cast<int>(item.m_modifierDepth);
-		string jumpType = item.getJumpTypeAsString();
+		std::string jumpType = item.getJumpTypeAsString();
 		if (!jumpType.empty())
 			jsonItem["jumpType"] = jumpType;
 		if (name == "PUSHLIB")
@@ -286,8 +285,8 @@ Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices,
 
 		for (size_t i = 0; i < m_subs.size(); ++i)
 		{
-			stringstream hexStr;
-			hexStr << hex << i;
+			std::stringstream hexStr;
+			hexStr << std::hex << i;
 			data[hexStr.str()] = m_subs[i]->assemblyJSON(_sourceIndices, /*_includeSourceList = */false);
 		}
 	}
@@ -298,7 +297,7 @@ Json::Value Assembly::assemblyJSON(map<string, unsigned> const& _sourceIndices,
 	return root;
 }
 
-AssemblyItem Assembly::namedTag(string const& _name, size_t _params, size_t _returns, optional<uint64_t> _sourceID)
+AssemblyItem Assembly::namedTag(std::string const& _name, size_t _params, size_t _returns, std::optional<uint64_t> _sourceID)
 {
 	assertThrow(!_name.empty(), AssemblyException, "Empty named tag.");
 	if (m_namedTags.count(_name))
@@ -312,21 +311,21 @@ AssemblyItem Assembly::namedTag(string const& _name, size_t _params, size_t _ret
 	return AssemblyItem{Tag, m_namedTags.at(_name).id};
 }
 
-AssemblyItem Assembly::newPushLibraryAddress(string const& _identifier)
+AssemblyItem Assembly::newPushLibraryAddress(std::string const& _identifier)
 {
 	h256 h(util::keccak256(_identifier));
 	m_libraries[h] = _identifier;
 	return AssemblyItem{PushLibraryAddress, h};
 }
 
-AssemblyItem Assembly::newPushImmutable(string const& _identifier)
+AssemblyItem Assembly::newPushImmutable(std::string const& _identifier)
 {
 	h256 h(util::keccak256(_identifier));
 	m_immutables[h] = _identifier;
 	return AssemblyItem{PushImmutable, h};
 }
 
-AssemblyItem Assembly::newImmutableAssignment(string const& _identifier)
+AssemblyItem Assembly::newImmutableAssignment(std::string const& _identifier)
 {
 	h256 h(util::keccak256(_identifier));
 	m_immutables[h] = _identifier;
@@ -339,9 +338,9 @@ Assembly& Assembly::optimise(OptimiserSettings const& _settings)
 	return *this;
 }
 
-map<u256, u256> const& Assembly::optimiseInternal(
+std::map<u256, u256> const& Assembly::optimiseInternal(
 	OptimiserSettings const& _settings,
-	set<size_t> _tagsReferencedFromOutside
+	std::set<size_t> _tagsReferencedFromOutside
 )
 {
 	if (m_tagReplacements)
@@ -352,7 +351,7 @@ map<u256, u256> const& Assembly::optimiseInternal(
 	{
 		OptimiserSettings settings = _settings;
 		Assembly& sub = *m_subs[subId];
-		map<u256, u256> const& subTagReplacements = sub.optimiseInternal(
+		std::map<u256, u256> const& subTagReplacements = sub.optimiseInternal(
 			settings,
 			JumpdestRemover::referencedTags(m_items, subId)
 		);
@@ -360,7 +359,7 @@ map<u256, u256> const& Assembly::optimiseInternal(
 		BlockDeduplicator::applyTagReplacement(m_items, subTagReplacements, subId);
 	}
 
-	map<u256, u256> tagReplacements;
+	std::map<u256, u256> tagReplacements;
 	// Iterate until no new optimisation possibilities are found.
 	for (unsigned count = 1; count > 0;)
 	{
@@ -401,7 +400,7 @@ map<u256, u256> const& Assembly::optimiseInternal(
 				for (auto const& replacement: deduplicator.replacedTags())
 				{
 					assertThrow(
-						replacement.first <= numeric_limits<size_t>::max() && replacement.second <= numeric_limits<size_t>::max(),
+						replacement.first <= std::numeric_limits<size_t>::max() && replacement.second <= std::numeric_limits<size_t>::max(),
 						OptimizerException,
 						"Invalid tag replacement."
 					);
@@ -494,7 +493,7 @@ LinkerObject const& Assembly::assemble() const
 	LinkerObject& ret = m_assembledObject;
 
 	size_t subTagSize = 1;
-	map<u256, pair<string, vector<size_t>>> immutableReferencesBySub;
+	std::map<u256, std::pair<std::string, std::vector<size_t>>> immutableReferencesBySub;
 	for (auto const& sub: m_subs)
 	{
 		auto const& linkerObject = sub->assemble();
@@ -508,7 +507,7 @@ LinkerObject const& Assembly::assemble() const
 			immutableReferencesBySub = linkerObject.immutableReferences;
 		}
 		for (size_t tagPos: sub->m_tagPositionsInBytecode)
-			if (tagPos != numeric_limits<size_t>::max() && tagPos > subTagSize)
+			if (tagPos != std::numeric_limits<size_t>::max() && tagPos > subTagSize)
 				subTagSize = tagPos;
 	}
 
@@ -531,11 +530,11 @@ LinkerObject const& Assembly::assemble() const
 		);
 
 	unsigned bytesRequiredForCode = codeSize(static_cast<unsigned>(subTagSize));
-	m_tagPositionsInBytecode = vector<size_t>(m_usedTags, numeric_limits<size_t>::max());
-	map<size_t, pair<size_t, size_t>> tagRef;
-	multimap<h256, unsigned> dataRef;
-	multimap<size_t, size_t> subRef;
-	vector<unsigned> sizeRef; ///< Pointers to code locations where the size of the program is inserted
+	m_tagPositionsInBytecode = std::vector<size_t>(m_usedTags, std::numeric_limits<size_t>::max());
+	std::map<size_t, std::pair<size_t, size_t>> tagRef;
+	std::multimap<h256, unsigned> dataRef;
+	std::multimap<size_t, size_t> subRef;
+	std::vector<unsigned> sizeRef; ///< Pointers to code locations where the size of the program is inserted
 	unsigned bytesPerTag = numberEncodingSize(bytesRequiredForCode);
 	uint8_t tagPush = static_cast<uint8_t>(pushInstruction(bytesPerTag));
 
@@ -550,7 +549,7 @@ LinkerObject const& Assembly::assemble() const
 	for (AssemblyItem const& i: m_items)
 	{
 		// store position of the invalid jump destination
-		if (i.type() != Tag && m_tagPositionsInBytecode[0] == numeric_limits<size_t>::max())
+		if (i.type() != Tag && m_tagPositionsInBytecode[0] == std::numeric_limits<size_t>::max())
 			m_tagPositionsInBytecode[0] = ret.bytecode.size();
 
 		switch (i.type())
@@ -583,21 +582,21 @@ LinkerObject const& Assembly::assemble() const
 		}
 		case PushData:
 			ret.bytecode.push_back(dataRefPush);
-			dataRef.insert(make_pair(h256(i.data()), ret.bytecode.size()));
+			dataRef.insert(std::make_pair(h256(i.data()), ret.bytecode.size()));
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
 			break;
 		case PushSub:
-			assertThrow(i.data() <= numeric_limits<size_t>::max(), AssemblyException, "");
+			assertThrow(i.data() <= std::numeric_limits<size_t>::max(), AssemblyException, "");
 			ret.bytecode.push_back(dataRefPush);
-			subRef.insert(make_pair(static_cast<size_t>(i.data()), ret.bytecode.size()));
+			subRef.insert(std::make_pair(static_cast<size_t>(i.data()), ret.bytecode.size()));
 			ret.bytecode.resize(ret.bytecode.size() + bytesPerDataRef);
 			break;
 		case PushSubSize:
 		{
-			assertThrow(i.data() <= numeric_limits<size_t>::max(), AssemblyException, "");
+			assertThrow(i.data() <= std::numeric_limits<size_t>::max(), AssemblyException, "");
 			auto s = subAssemblyById(static_cast<size_t>(i.data()))->assemble().bytecode.size();
 			i.setPushedValue(u256(s));
-			unsigned b = max<unsigned>(1, numberEncodingSize(s));
+			unsigned b = std::max<unsigned>(1, numberEncodingSize(s));
 			ret.bytecode.push_back(static_cast<uint8_t>(pushInstruction(b)));
 			ret.bytecode.resize(ret.bytecode.size() + b);
 			bytesRef byr(&ret.bytecode.back() + 1 - b, b);
@@ -618,7 +617,7 @@ LinkerObject const& Assembly::assemble() const
 			break;
 		case PushImmutable:
 			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::PUSH32));
-			// Maps keccak back to the "identifier" string of that immutable.
+			// Maps keccak back to the "identifier" std::string of that immutable.
 			ret.immutableReferences[i.data()].first = m_immutables.at(i.data());
 			// Record the bytecode offset of the PUSH32 argument.
 			ret.immutableReferences[i.data()].second.emplace_back(ret.bytecode.size());
@@ -661,10 +660,10 @@ LinkerObject const& Assembly::assemble() const
 		case Tag:
 		{
 			assertThrow(i.data() != 0, AssemblyException, "Invalid tag position.");
-			assertThrow(i.splitForeignPushTag().first == numeric_limits<size_t>::max(), AssemblyException, "Foreign tag.");
+			assertThrow(i.splitForeignPushTag().first == std::numeric_limits<size_t>::max(), AssemblyException, "Foreign tag.");
 			size_t tagId = static_cast<size_t>(i.data());
 			assertThrow(ret.bytecode.size() < 0xffffffffL, AssemblyException, "Tag too large.");
-			assertThrow(m_tagPositionsInBytecode[tagId] == numeric_limits<size_t>::max(), AssemblyException, "Duplicate tag position.");
+			assertThrow(m_tagPositionsInBytecode[tagId] == std::numeric_limits<size_t>::max(), AssemblyException, "Duplicate tag position.");
 			m_tagPositionsInBytecode[tagId] = ret.bytecode.size();
 			ret.bytecode.push_back(static_cast<uint8_t>(Instruction::JUMPDEST));
 			break;
@@ -686,7 +685,7 @@ LinkerObject const& Assembly::assemble() const
 		// Append an INVALID here to help tests find miscompilation.
 		ret.bytecode.push_back(static_cast<uint8_t>(Instruction::INVALID));
 
-	map<LinkerObject, size_t> subAssemblyOffsets;
+	std::map<LinkerObject, size_t> subAssemblyOffsets;
 	for (auto const& [subIdPath, bytecodeOffset]: subRef)
 	{
 		LinkerObject subObject = subAssemblyById(subIdPath)->assemble();
@@ -709,15 +708,15 @@ LinkerObject const& Assembly::assemble() const
 	{
 		size_t subId;
 		size_t tagId;
-		tie(subId, tagId) = i.second;
-		assertThrow(subId == numeric_limits<size_t>::max() || subId < m_subs.size(), AssemblyException, "Invalid sub id");
-		vector<size_t> const& tagPositions =
-			subId == numeric_limits<size_t>::max() ?
+		std::tie(subId, tagId) = i.second;
+		assertThrow(subId == std::numeric_limits<size_t>::max() || subId < m_subs.size(), AssemblyException, "Invalid sub id");
+		std::vector<size_t> const& tagPositions =
+			subId == std::numeric_limits<size_t>::max() ?
 			m_tagPositionsInBytecode :
 			m_subs[subId]->m_tagPositionsInBytecode;
 		assertThrow(tagId < tagPositions.size(), AssemblyException, "Reference to non-existing tag.");
 		size_t pos = tagPositions[tagId];
-		assertThrow(pos != numeric_limits<size_t>::max(), AssemblyException, "Reference to tag without position.");
+		assertThrow(pos != std::numeric_limits<size_t>::max(), AssemblyException, "Reference to tag without position.");
 		assertThrow(numberEncodingSize(pos) <= bytesPerTag, AssemblyException, "Tag too large for reserved space.");
 		bytesRef r(ret.bytecode.data() + i.first, bytesPerTag);
 		toBigEndian(pos, r);
@@ -725,7 +724,7 @@ LinkerObject const& Assembly::assemble() const
 	for (auto const& [name, tagInfo]: m_namedTags)
 	{
 		size_t position = m_tagPositionsInBytecode.at(tagInfo.id);
-		optional<size_t> tagIndex;
+		std::optional<size_t> tagIndex;
 		for (auto&& [index, item]: m_items | ranges::views::enumerate)
 			if (item.type() == Tag && static_cast<size_t>(item.data()) == tagInfo.id)
 			{
@@ -733,7 +732,7 @@ LinkerObject const& Assembly::assemble() const
 				break;
 			}
 		ret.functionDebugData[name] = {
-			position == numeric_limits<size_t>::max() ? nullopt : optional<size_t>{position},
+			position == std::numeric_limits<size_t>::max() ? std::nullopt : std::optional<size_t>{position},
 			tagIndex,
 			tagInfo.sourceID,
 			tagInfo.params,
@@ -764,7 +763,7 @@ LinkerObject const& Assembly::assemble() const
 	return ret;
 }
 
-vector<size_t> Assembly::decodeSubPath(size_t _subObjectId) const
+std::vector<size_t> Assembly::decodeSubPath(size_t _subObjectId) const
 {
 	if (_subObjectId < m_subs.size())
 		return {_subObjectId};
@@ -779,7 +778,7 @@ vector<size_t> Assembly::decodeSubPath(size_t _subObjectId) const
 	return subIdPathIt->first;
 }
 
-size_t Assembly::encodeSubPath(vector<size_t> const& _subPath)
+size_t Assembly::encodeSubPath(std::vector<size_t> const& _subPath)
 {
 	assertThrow(!_subPath.empty(), AssemblyException, "");
 	if (_subPath.size() == 1)
@@ -790,7 +789,7 @@ size_t Assembly::encodeSubPath(vector<size_t> const& _subPath)
 
 	if (m_subPaths.find(_subPath) == m_subPaths.end())
 	{
-		size_t objectId = numeric_limits<size_t>::max() - m_subPaths.size();
+		size_t objectId = std::numeric_limits<size_t>::max() - m_subPaths.size();
 		assertThrow(objectId >= m_subs.size(), AssemblyException, "");
 		m_subPaths[_subPath] = objectId;
 	}
@@ -800,7 +799,7 @@ size_t Assembly::encodeSubPath(vector<size_t> const& _subPath)
 
 Assembly const* Assembly::subAssemblyById(size_t _subId) const
 {
-	vector<size_t> subIds = decodeSubPath(_subId);
+	std::vector<size_t> subIds = decodeSubPath(_subId);
 	Assembly const* currentAssembly = this;
 	for (size_t currentSubId: subIds)
 	{
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
index 5661fb9402..6c2b673c69 100644
--- a/libevmasm/AssemblyItem.cpp
+++ b/libevmasm/AssemblyItem.cpp
@@ -30,7 +30,7 @@
 #include <fstream>
 #include <limits>
 
-using namespace std;
+using namespace std::literals;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
@@ -40,10 +40,10 @@ static_assert(sizeof(size_t) <= 8, "size_t must be at most 64-bits wide");
 namespace
 {
 
-string toStringInHex(u256 _value)
+std::string toStringInHex(u256 _value)
 {
-	stringstream hexStr;
-	hexStr << uppercase << hex << _value;
+	std::stringstream hexStr;
+	hexStr << std::uppercase << std::hex << _value;
 	return hexStr.str();
 }
 
@@ -60,16 +60,16 @@ AssemblyItem AssemblyItem::toSubAssemblyTag(size_t _subId) const
 	return r;
 }
 
-pair<size_t, size_t> AssemblyItem::splitForeignPushTag() const
+std::pair<size_t, size_t> AssemblyItem::splitForeignPushTag() const
 {
 	assertThrow(m_type == PushTag || m_type == Tag, util::Exception, "");
 	u256 combined = u256(data());
 	size_t subId = static_cast<size_t>((combined >> 64) - 1);
 	size_t tag = static_cast<size_t>(combined & 0xffffffffffffffffULL);
-	return make_pair(subId, tag);
+	return std::make_pair(subId, tag);
 }
 
-pair<string, string> AssemblyItem::nameAndData(langutil::EVMVersion _evmVersion) const
+std::pair<std::string, std::string> AssemblyItem::nameAndData(langutil::EVMVersion _evmVersion) const
 {
 	switch (type())
 	{
@@ -111,7 +111,7 @@ void AssemblyItem::setPushTagSubIdAndTag(size_t _subId, size_t _tag)
 {
 	assertThrow(m_type == PushTag || m_type == Tag, util::Exception, "");
 	u256 data = _tag;
-	if (_subId != numeric_limits<size_t>::max())
+	if (_subId != std::numeric_limits<size_t>::max())
 		data |= (u256(_subId) + 1) << 64;
 	setData(data);
 }
@@ -124,7 +124,7 @@ size_t AssemblyItem::bytesRequired(size_t _addressLength, Precision _precision)
 	case Tag: // 1 byte for the JUMPDEST
 		return 1;
 	case Push:
-		return 1 + max<size_t>(1, numberEncodingSize(data()));
+		return 1 + std::max<size_t>(1, numberEncodingSize(data()));
 	case PushSubSize:
 	case PushProgramSize:
 		return 1 + 4;		// worst case: a 16MB program
@@ -158,7 +158,7 @@ size_t AssemblyItem::bytesRequired(size_t _addressLength, Precision _precision)
 			return 2;
 	}
 	case VerbatimBytecode:
-		return get<2>(*m_verbatimBytecode).size();
+		return std::get<2>(*m_verbatimBytecode).size();
 	default:
 		break;
 	}
@@ -172,7 +172,7 @@ size_t AssemblyItem::arguments() const
 		// the same across all EVM versions except for the instruction name.
 		return static_cast<size_t>(instructionInfo(instruction(), EVMVersion()).args);
 	else if (type() == VerbatimBytecode)
-		return get<0>(*m_verbatimBytecode);
+		return std::get<0>(*m_verbatimBytecode);
 	else if (type() == AssignImmutable)
 		return 2;
 	else
@@ -200,7 +200,7 @@ size_t AssemblyItem::returnValues() const
 	case Tag:
 		return 0;
 	case VerbatimBytecode:
-		return get<1>(*m_verbatimBytecode);
+		return std::get<1>(*m_verbatimBytecode);
 	default:
 		break;
 	}
@@ -233,7 +233,7 @@ bool AssemblyItem::canBeFunctional() const
 	return false;
 }
 
-string AssemblyItem::getJumpTypeAsString() const
+std::string AssemblyItem::getJumpTypeAsString() const
 {
 	switch (m_jumpType)
 	{
@@ -247,9 +247,9 @@ string AssemblyItem::getJumpTypeAsString() const
 	}
 }
 
-string AssemblyItem::toAssemblyText(Assembly const& _assembly) const
+std::string AssemblyItem::toAssemblyText(Assembly const& _assembly) const
 {
-	string text;
+	std::string text;
 	switch (type())
 	{
 	case Operation:
@@ -265,26 +265,26 @@ string AssemblyItem::toAssemblyText(Assembly const& _assembly) const
 	{
 		size_t sub{0};
 		size_t tag{0};
-		tie(sub, tag) = splitForeignPushTag();
-		if (sub == numeric_limits<size_t>::max())
-			text = string("tag_") + to_string(tag);
+		std::tie(sub, tag) = splitForeignPushTag();
+		if (sub == std::numeric_limits<size_t>::max())
+			text = std::string("tag_") + std::to_string(tag);
 		else
-			text = string("tag_") + to_string(sub) + "_" + to_string(tag);
+			text = std::string("tag_") + std::to_string(sub) + "_" + std::to_string(tag);
 		break;
 	}
 	case Tag:
 		assertThrow(data() < 0x10000, AssemblyException, "Declaration of sub-assembly tag.");
-		text = string("tag_") + to_string(static_cast<size_t>(data())) + ":";
+		text = std::string("tag_") + std::to_string(static_cast<size_t>(data())) + ":";
 		break;
 	case PushData:
-		text = string("data_") + toHex(data());
+		text = std::string("data_") + toHex(data());
 		break;
 	case PushSub:
 	case PushSubSize:
 	{
-		vector<string> subPathComponents;
+		std::vector<std::string> subPathComponents;
 		for (size_t subPathComponentId: _assembly.decodeSubPath(static_cast<size_t>(data())))
-			subPathComponents.emplace_back("sub_" + to_string(subPathComponentId));
+			subPathComponents.emplace_back("sub_" + std::to_string(subPathComponentId));
 		text =
 			(type() == PushSub ? "dataOffset"s : "dataSize"s) +
 			"(" +
@@ -293,25 +293,25 @@ string AssemblyItem::toAssemblyText(Assembly const& _assembly) const
 		break;
 	}
 	case PushProgramSize:
-		text = string("bytecodeSize");
+		text = std::string("bytecodeSize");
 		break;
 	case PushLibraryAddress:
-		text = string("linkerSymbol(\"") + toHex(data()) + string("\")");
+		text = std::string("linkerSymbol(\"") + toHex(data()) + std::string("\")");
 		break;
 	case PushDeployTimeAddress:
-		text = string("deployTimeAddress()");
+		text = std::string("deployTimeAddress()");
 		break;
 	case PushImmutable:
-		text = string("immutable(\"") + "0x" + util::toHex(toCompactBigEndian(data(), 1)) + "\")";
+		text = std::string("immutable(\"") + "0x" + util::toHex(toCompactBigEndian(data(), 1)) + "\")";
 		break;
 	case AssignImmutable:
-		text = string("assignImmutable(\"") + "0x" + util::toHex(toCompactBigEndian(data(), 1)) + "\")";
+		text = std::string("assignImmutable(\"") + "0x" + util::toHex(toCompactBigEndian(data(), 1)) + "\")";
 		break;
 	case UndefinedItem:
 		assertThrow(false, AssemblyException, "Invalid assembly item.");
 		break;
 	case VerbatimBytecode:
-		text = string("verbatimbytecode_") + util::toHex(get<2>(*m_verbatimBytecode));
+		text = std::string("verbatimbytecode_") + util::toHex(std::get<2>(*m_verbatimBytecode));
 		break;
 	default:
 		assertThrow(false, InvalidOpcode, "");
@@ -328,7 +328,7 @@ string AssemblyItem::toAssemblyText(Assembly const& _assembly) const
 }
 
 // Note: This method is exclusively used for debugging.
-ostream& solidity::evmasm::operator<<(ostream& _out, AssemblyItem const& _item)
+std::ostream& solidity::evmasm::operator<<(std::ostream& _out, AssemblyItem const& _item)
 {
 	switch (_item.type())
 	{
@@ -338,12 +338,12 @@ ostream& solidity::evmasm::operator<<(ostream& _out, AssemblyItem const& _item)
 			_out << "\t" << _item.getJumpTypeAsString();
 		break;
 	case Push:
-		_out << " PUSH " << hex << _item.data() << dec;
+		_out << " PUSH " << std::hex << _item.data() <<  std::dec;
 		break;
 	case PushTag:
 	{
 		size_t subId = _item.splitForeignPushTag().first;
-		if (subId == numeric_limits<size_t>::max())
+		if (subId == std::numeric_limits<size_t>::max())
 			_out << " PushTag " << _item.splitForeignPushTag().second;
 		else
 			_out << " PushTag " << subId << ":" << _item.splitForeignPushTag().second;
@@ -353,20 +353,20 @@ ostream& solidity::evmasm::operator<<(ostream& _out, AssemblyItem const& _item)
 		_out << " Tag " << _item.data();
 		break;
 	case PushData:
-		_out << " PushData " << hex << static_cast<unsigned>(_item.data()) << dec;
+		_out << " PushData " << std::hex << static_cast<unsigned>(_item.data()) <<  std::dec;
 		break;
 	case PushSub:
-		_out << " PushSub " << hex << static_cast<size_t>(_item.data()) << dec;
+		_out << " PushSub " << std::hex << static_cast<size_t>(_item.data()) <<  std::dec;
 		break;
 	case PushSubSize:
-		_out << " PushSubSize " << hex << static_cast<size_t>(_item.data()) << dec;
+		_out << " PushSubSize " << std::hex << static_cast<size_t>(_item.data()) <<  std::dec;
 		break;
 	case PushProgramSize:
 		_out << " PushProgramSize";
 		break;
 	case PushLibraryAddress:
 	{
-		string hash(util::h256((_item.data())).hex());
+		std::string hash(util::h256((_item.data())).hex());
 		_out << " PushLibraryAddress " << hash.substr(0, 8) + "..." + hash.substr(hash.length() - 8);
 		break;
 	}
@@ -411,12 +411,12 @@ size_t AssemblyItem::opcodeCount() const noexcept
 	}
 }
 
-string AssemblyItem::computeSourceMapping(
+std::string AssemblyItem::computeSourceMapping(
 	AssemblyItems const& _items,
-	map<string, unsigned> const& _sourceIndicesMap
+	std::map<std::string, unsigned> const& _sourceIndicesMap
 )
 {
-	string ret;
+	std::string ret;
 
 	int prevStart = -1;
 	int prevLength = -1;
@@ -465,17 +465,17 @@ string AssemblyItem::computeSourceMapping(
 		if (components-- > 0)
 		{
 			if (location.start != prevStart)
-				ret += to_string(location.start);
+				ret += std::to_string(location.start);
 			if (components-- > 0)
 			{
 				ret += ':';
 				if (length != prevLength)
-					ret += to_string(length);
+					ret += std::to_string(length);
 				if (components-- > 0)
 				{
 					ret += ':';
 					if (sourceIndex != prevSourceIndex)
-						ret += to_string(sourceIndex);
+						ret += std::to_string(sourceIndex);
 					if (components-- > 0)
 					{
 						ret += ':';
@@ -485,7 +485,7 @@ string AssemblyItem::computeSourceMapping(
 						{
 							ret += ':';
 							if (modifierDepth != prevModifierDepth)
-								ret += to_string(modifierDepth);
+								ret += std::to_string(modifierDepth);
 						}
 					}
 				}
@@ -493,7 +493,7 @@ string AssemblyItem::computeSourceMapping(
 		}
 
 		if (item.opcodeCount() > 1)
-			ret += string(item.opcodeCount() - 1, ';');
+			ret += std::string(item.opcodeCount() - 1, ';');
 
 		prevStart = location.start;
 		prevLength = length;
diff --git a/libevmasm/BlockDeduplicator.cpp b/libevmasm/BlockDeduplicator.cpp
index 5f9fa768ff..c978bae2bb 100644
--- a/libevmasm/BlockDeduplicator.cpp
+++ b/libevmasm/BlockDeduplicator.cpp
@@ -30,7 +30,6 @@
 #include <functional>
 #include <set>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 
@@ -49,7 +48,7 @@ bool BlockDeduplicator::deduplicate()
 	)
 		return false;
 
-	function<bool(size_t, size_t)> comparator = [&](size_t _i, size_t _j)
+	std::function<bool(size_t, size_t)> comparator = [&](size_t _i, size_t _j)
 	{
 		if (_i == _j)
 			return false;
@@ -81,7 +80,7 @@ bool BlockDeduplicator::deduplicate()
 	for (; ; ++iterations)
 	{
 		//@todo this should probably be optimized.
-		set<size_t, function<bool(size_t, size_t)>> blocksSeen(comparator);
+		std::set<size_t, std::function<bool(size_t, size_t)>> blocksSeen(comparator);
 		for (size_t i = 0; i < m_items.size(); ++i)
 		{
 			if (m_items.at(i).type() != Tag)
@@ -101,7 +100,7 @@ bool BlockDeduplicator::deduplicate()
 
 bool BlockDeduplicator::applyTagReplacement(
 	AssemblyItems& _items,
-	map<u256, u256> const& _replacements,
+	std::map<u256, u256> const& _replacements,
 	size_t _subId
 )
 {
@@ -111,7 +110,7 @@ bool BlockDeduplicator::applyTagReplacement(
 		{
 			size_t subId;
 			size_t tagId;
-			tie(subId, tagId) = item.splitForeignPushTag();
+			std::tie(subId, tagId) = item.splitForeignPushTag();
 			if (subId != _subId)
 				continue;
 			auto it = _replacements.find(tagId);
diff --git a/libevmasm/CommonSubexpressionEliminator.cpp b/libevmasm/CommonSubexpressionEliminator.cpp
index d097f3c725..de1e5a364a 100644
--- a/libevmasm/CommonSubexpressionEliminator.cpp
+++ b/libevmasm/CommonSubexpressionEliminator.cpp
@@ -30,12 +30,11 @@
 
 #include <range/v3/view/reverse.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
 
-vector<AssemblyItem> CommonSubexpressionEliminator::getOptimizedItems()
+std::vector<AssemblyItem> CommonSubexpressionEliminator::getOptimizedItems()
 {
 	optimizeBreakingItem();
 
@@ -52,11 +51,11 @@ vector<AssemblyItem> CommonSubexpressionEliminator::getOptimizedItems()
 		m_state = std::move(nextState);
 	});
 
-	map<int, Id> initialStackContents;
-	map<int, Id> targetStackContents;
+	std::map<int, Id> initialStackContents;
+	std::map<int, Id> targetStackContents;
 	int minHeight = m_state.stackHeight() + 1;
 	if (!m_state.stackElements().empty())
-		minHeight = min(minHeight, m_state.stackElements().begin()->first);
+		minHeight = std::min(minHeight, m_state.stackElements().begin()->first);
 	for (int height = minHeight; height <= m_initialState.stackHeight(); ++height)
 		initialStackContents[height] = m_initialState.stackElement(height, SourceLocation());
 	for (int height = minHeight; height <= m_state.stackHeight(); ++height)
@@ -125,19 +124,19 @@ void CommonSubexpressionEliminator::optimizeBreakingItem()
 
 CSECodeGenerator::CSECodeGenerator(
 	ExpressionClasses& _expressionClasses,
-	vector<CSECodeGenerator::StoreOperation> const& _storeOperations
+	std::vector<CSECodeGenerator::StoreOperation> const& _storeOperations
 ):
 	m_expressionClasses(_expressionClasses)
 {
 	for (auto const& store: _storeOperations)
-		m_storeOperations[make_pair(store.target, store.slot)].push_back(store);
+		m_storeOperations[std::make_pair(store.target, store.slot)].push_back(store);
 }
 
 AssemblyItems CSECodeGenerator::generateCode(
 	unsigned _initialSequenceNumber,
 	int _initialStackHeight,
-	map<int, Id> const& _initialStack,
-	map<int, Id> const& _targetStackContents
+	std::map<int, Id> const& _initialStack,
+	std::map<int, Id> const& _targetStackContents
 )
 {
 	m_stackHeight = _initialStackHeight;
@@ -156,7 +155,7 @@ AssemblyItems CSECodeGenerator::generateCode(
 	}
 
 	// store all needed sequenced expressions
-	set<pair<unsigned, Id>> sequencedExpressions;
+	std::set<std::pair<unsigned, Id>> sequencedExpressions;
 	for (auto const& p: m_neededBy)
 		for (auto id: {p.first, p.second})
 			if (unsigned seqNr = m_expressionClasses.representative(id).sequenceNumber)
@@ -165,7 +164,7 @@ AssemblyItems CSECodeGenerator::generateCode(
 				// @todo quick fix for now. Proper fix needs to choose representative with higher
 				// sequence number during dependency analysis.
 				assertThrow(seqNr >= _initialSequenceNumber, StackTooDeepException, util::stackTooDeepString);
-				sequencedExpressions.insert(make_pair(seqNr, id));
+				sequencedExpressions.insert(std::make_pair(seqNr, id));
 			}
 
 	// Perform all operations on storage and memory in order, if they are needed.
@@ -230,7 +229,7 @@ void CSECodeGenerator::addDependencies(Id _c)
 	for (Id argument: expr.arguments)
 	{
 		addDependencies(argument);
-		m_neededBy.insert(make_pair(argument, _c));
+		m_neededBy.insert(std::make_pair(argument, _c));
 	}
 	if (expr.item && expr.item->type() == Operation && (
 		expr.item->instruction() == Instruction::SLOAD ||
@@ -294,7 +293,7 @@ void CSECodeGenerator::addDependencies(Id _c)
 				if (it->sequenceNumber < expr.sequenceNumber)
 					latestStore = it->expression;
 			addDependencies(latestStore);
-			m_neededBy.insert(make_pair(latestStore, _c));
+			m_neededBy.insert(std::make_pair(latestStore, _c));
 		}
 	}
 }
@@ -331,7 +330,7 @@ void CSECodeGenerator::generateClassElement(Id _c, bool _allowSequenced)
 		OptimizerException,
 		"Undefined item requested but not available."
 	);
-	vector<Id> const& arguments = expr.arguments;
+	std::vector<Id> const& arguments = expr.arguments;
 	for (Id arg: arguments | ranges::views::reverse)
 		generateClassElement(arg);
 
@@ -495,7 +494,7 @@ void CSECodeGenerator::appendOrRemoveSwap(int _fromPosition, SourceLocation cons
 		m_classPositions[m_stack[m_stackHeight]].insert(_fromPosition);
 		m_classPositions[m_stack[_fromPosition]].erase(_fromPosition);
 		m_classPositions[m_stack[_fromPosition]].insert(m_stackHeight);
-		swap(m_stack[m_stackHeight], m_stack[_fromPosition]);
+		std::swap(m_stack[m_stackHeight], m_stack[_fromPosition]);
 	}
 	if (m_generatedItems.size() >= 2 &&
 		SemanticInformation::isSwapInstruction(m_generatedItems.back()) &&
diff --git a/libevmasm/ConstantOptimiser.cpp b/libevmasm/ConstantOptimiser.cpp
index 5bce21cf1e..62dbc803bb 100644
--- a/libevmasm/ConstantOptimiser.cpp
+++ b/libevmasm/ConstantOptimiser.cpp
@@ -24,7 +24,6 @@
 #include <libevmasm/Assembly.h>
 #include <libevmasm/GasMeter.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 
@@ -39,11 +38,11 @@ unsigned ConstantOptimisationMethod::optimiseConstants(
 	AssemblyItems& _items = _assembly.items();
 
 	unsigned optimisations = 0;
-	map<AssemblyItem, size_t> pushes;
+	std::map<AssemblyItem, size_t> pushes;
 	for (AssemblyItem const& item: _items)
 		if (item.type() == Push)
 			pushes[item]++;
-	map<u256, AssemblyItems> pendingReplacements;
+	std::map<u256, AssemblyItems> pendingReplacements;
 	for (auto it: pushes)
 	{
 		AssemblyItem const& item = it.first;
@@ -108,7 +107,7 @@ size_t ConstantOptimisationMethod::bytesRequired(AssemblyItems const& _items)
 
 void ConstantOptimisationMethod::replaceConstants(
 	AssemblyItems& _items,
-	map<u256, AssemblyItems> const& _replacements
+	std::map<u256, AssemblyItems> const& _replacements
 )
 {
 	AssemblyItems replaced;
@@ -255,7 +254,7 @@ AssemblyItems ComputeMethod::findRepresentation(u256 const& _value)
 bool ComputeMethod::checkRepresentation(u256 const& _value, AssemblyItems const& _routine) const
 {
 	// This is a tiny EVM that can only evaluate some instructions.
-	vector<u256> stack;
+	std::vector<u256> stack;
 	for (AssemblyItem const& item: _routine)
 	{
 		switch (item.type())
diff --git a/libevmasm/ControlFlowGraph.cpp b/libevmasm/ControlFlowGraph.cpp
index cb648f90f2..9d2927ed9c 100644
--- a/libevmasm/ControlFlowGraph.cpp
+++ b/libevmasm/ControlFlowGraph.cpp
@@ -31,7 +31,6 @@
 #include <libevmasm/SemanticInformation.h>
 #include <libevmasm/KnownState.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 
@@ -64,7 +63,7 @@ void ControlFlowGraph::findLargestTag()
 		{
 			// Assert that it can be converted.
 			BlockId(item.data());
-			m_lastUsedId = max(unsigned(item.data()), m_lastUsedId);
+			m_lastUsedId = std::max(unsigned(item.data()), m_lastUsedId);
 		}
 }
 
@@ -111,7 +110,7 @@ void ControlFlowGraph::splitBlocks()
 
 void ControlFlowGraph::resolveNextLinks()
 {
-	map<unsigned, BlockId> blockByBeginPos;
+	std::map<unsigned, BlockId> blockByBeginPos;
 	for (auto const& idAndBlock: m_blocks)
 		if (idAndBlock.second.begin != idAndBlock.second.end)
 			blockByBeginPos[idAndBlock.second.begin] = idAndBlock.first;
@@ -138,8 +137,8 @@ void ControlFlowGraph::resolveNextLinks()
 
 void ControlFlowGraph::removeUnusedBlocks()
 {
-	vector<BlockId> blocksToProcess{BlockId::initial()};
-	set<BlockId> neededBlocks{BlockId::initial()};
+	std::vector<BlockId> blocksToProcess{BlockId::initial()};
+	std::set<BlockId> neededBlocks{BlockId::initial()};
 	while (!blocksToProcess.empty())
 	{
 		BasicBlock const& block = m_blocks.at(blocksToProcess.back());
@@ -219,16 +218,16 @@ void ControlFlowGraph::gatherKnowledge()
 {
 	// @todo actually we know that memory is filled with zeros at the beginning,
 	// we could make use of that.
-	KnownStatePointer emptyState = make_shared<KnownState>();
+	KnownStatePointer emptyState = std::make_shared<KnownState>();
 	bool unknownJumpEncountered = false;
 
 	struct WorkQueueItem {
 		BlockId blockId;
 		KnownStatePointer state;
-		set<BlockId> blocksSeen;
+		std::set<BlockId> blocksSeen;
 	};
 
-	vector<WorkQueueItem> workQueue{WorkQueueItem{BlockId::initial(), emptyState->copy(), set<BlockId>()}};
+	std::vector<WorkQueueItem> workQueue{WorkQueueItem{BlockId::initial(), emptyState->copy(), std::set<BlockId>()}};
 	auto addWorkQueueItem = [&](WorkQueueItem const& _currentItem, BlockId _to, KnownStatePointer const& _state)
 	{
 		WorkQueueItem item;
@@ -275,7 +274,7 @@ void ControlFlowGraph::gatherKnowledge()
 			assertThrow(block.begin <= pc && pc == block.end - 1, OptimizerException, "");
 			//@todo in the case of JUMPI, add knowledge about the condition to the state
 			// (for both values of the condition)
-			set<u256> tags = state->tagsInExpression(
+			std::set<u256> tags = state->tagsInExpression(
 				state->stackElement(state->stackHeight(), langutil::SourceLocation{})
 			);
 			state->feedItem(m_items.at(pc++));
@@ -289,7 +288,7 @@ void ControlFlowGraph::gatherKnowledge()
 					unknownJumpEncountered = true;
 					for (auto const& it: m_blocks)
 						if (it.second.begin < it.second.end && m_items[it.second.begin].type() == Tag)
-							workQueue.push_back(WorkQueueItem{it.first, emptyState->copy(), set<BlockId>()});
+							workQueue.push_back(WorkQueueItem{it.first, emptyState->copy(), std::set<BlockId>()});
 				}
 			}
 			else
@@ -321,16 +320,16 @@ void ControlFlowGraph::gatherKnowledge()
 
 BasicBlocks ControlFlowGraph::rebuildCode()
 {
-	map<BlockId, unsigned> pushes;
+	std::map<BlockId, unsigned> pushes;
 	for (auto& idAndBlock: m_blocks)
 		for (BlockId ref: idAndBlock.second.pushedTags)
 			if (m_blocks.count(ref))
 				pushes[ref]++;
 
-	set<BlockId> blocksToAdd;
+	std::set<BlockId> blocksToAdd;
 	for (auto it: m_blocks)
 		blocksToAdd.insert(it.first);
-	set<BlockId> blocksAdded;
+	std::set<BlockId> blocksAdded;
 	BasicBlocks blocks;
 
 	for (
diff --git a/libevmasm/Disassemble.cpp b/libevmasm/Disassemble.cpp
index f1c904b699..27e860661d 100644
--- a/libevmasm/Disassemble.cpp
+++ b/libevmasm/Disassemble.cpp
@@ -22,7 +22,6 @@
 #include <libsolutil/CommonIO.h>
 #include <functional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::evmasm;
@@ -31,7 +30,7 @@ using namespace solidity::evmasm;
 void solidity::evmasm::eachInstruction(
 	bytes const& _mem,
 	langutil::EVMVersion _evmVersion,
-	function<void(Instruction,u256 const&)> const& _onInstruction
+	std::function<void(Instruction,u256 const&)> const& _onInstruction
 )
 {
 	for (auto it = _mem.begin(); it < _mem.end(); ++it)
@@ -58,9 +57,9 @@ void solidity::evmasm::eachInstruction(
 	}
 }
 
-string solidity::evmasm::disassemble(bytes const& _mem, langutil::EVMVersion _evmVersion, string const& _delimiter)
+std::string solidity::evmasm::disassemble(bytes const& _mem, langutil::EVMVersion _evmVersion, std::string const& _delimiter)
 {
-	stringstream ret;
+	std::stringstream ret;
 	eachInstruction(_mem, _evmVersion, [&](Instruction _instr, u256 const& _data) {
 		if (!isValidInstruction(_instr))
 			ret << "0x" << std::uppercase << std::hex << static_cast<int>(_instr) << _delimiter;
diff --git a/libevmasm/ExpressionClasses.cpp b/libevmasm/ExpressionClasses.cpp
index 8cd97b6a89..dd66eea328 100644
--- a/libevmasm/ExpressionClasses.cpp
+++ b/libevmasm/ExpressionClasses.cpp
@@ -34,7 +34,6 @@
 #include <limits>
 #include <tuple>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
@@ -58,10 +57,10 @@ bool ExpressionClasses::Expression::operator==(ExpressionClasses::Expression con
 			std::tie(_other.item->data(), _other.arguments, _other.sequenceNumber);
 }
 
-std::size_t ExpressionClasses::Expression::ExpressionHash::operator()(Expression const& _expression) const
+size_t ExpressionClasses::Expression::ExpressionHash::operator()(Expression const& _expression) const
 {
 	assertThrow(!!_expression.item, OptimizerException, "");
-	std::size_t seed = 0;
+	size_t seed = 0;
 	auto type = _expression.item->type();
 	boost::hash_combine(seed, type);
 
@@ -171,7 +170,7 @@ bool ExpressionClasses::knownNonZero(Id _c)
 
 u256 const* ExpressionClasses::knownConstant(Id _c)
 {
-	map<unsigned, Expression const*> matchGroups;
+	std::map<unsigned, Expression const*> matchGroups;
 	Pattern constant(Push);
 	constant.setMatchGroup(1, matchGroups);
 	if (!constant.matches(representative(_c), *this))
@@ -181,15 +180,15 @@ u256 const* ExpressionClasses::knownConstant(Id _c)
 
 AssemblyItem const* ExpressionClasses::storeItem(AssemblyItem const& _item)
 {
-	m_spareAssemblyItems.push_back(make_shared<AssemblyItem>(_item));
+	m_spareAssemblyItems.push_back(std::make_shared<AssemblyItem>(_item));
 	return m_spareAssemblyItems.back().get();
 }
 
-string ExpressionClasses::fullDAGToString(ExpressionClasses::Id _id) const
+std::string ExpressionClasses::fullDAGToString(ExpressionClasses::Id _id) const
 {
 	Expression const& expr = representative(_id);
-	stringstream str;
-	str << dec << expr.id << ":";
+	std::stringstream str;
+	str << std::dec << expr.id << ":";
 	if (expr.item)
 	{
 		str << *expr.item << "(";
@@ -212,25 +211,25 @@ ExpressionClasses::Id ExpressionClasses::tryToSimplify(Expression const& _expr)
 		_expr.item->type() != Operation ||
 		!SemanticInformation::isDeterministic(*_expr.item)
 	)
-		return numeric_limits<unsigned>::max();
+		return std::numeric_limits<unsigned>::max();
 
 	if (auto match = rules.findFirstMatch(_expr, *this))
 	{
 		// Debug info
 		if (false)
 		{
-			cout << "Simplifying " << *_expr.item << "(";
+			std::cout << "Simplifying " << *_expr.item << "(";
 			for (Id arg: _expr.arguments)
-				cout << fullDAGToString(arg) << ", ";
-			cout << ")" << endl;
-			cout << "with rule " << match->pattern.toString() << endl;
-			cout << "to " << match->action().toString() << endl;
+				std::cout << fullDAGToString(arg) << ", ";
+			std::cout << ")" << std::endl;
+			std::cout << "with rule " << match->pattern.toString() << std::endl;
+			std::cout << "to " << match->action().toString() << std::endl;
 		}
 
 		return rebuildExpression(ExpressionTemplate(match->action(), _expr.item->location()));
 	}
 
-	return numeric_limits<unsigned>::max();
+	return std::numeric_limits<unsigned>::max();
 }
 
 ExpressionClasses::Id ExpressionClasses::rebuildExpression(ExpressionTemplate const& _template)
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
index 6a0c597db0..271a6ce2de 100644
--- a/libevmasm/GasMeter.cpp
+++ b/libevmasm/GasMeter.cpp
@@ -20,7 +20,6 @@
 
 #include <libevmasm/KnownState.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::evmasm;
@@ -32,7 +31,7 @@ GasMeter::GasConsumption& GasMeter::GasConsumption::operator+=(GasConsumption co
 	if (isInfinite)
 		return *this;
 	bigint v = bigint(value) + _other.value;
-	if (v > numeric_limits<u256>::max())
+	if (v > std::numeric_limits<u256>::max())
 		*this = infinite();
 	else
 		value = u256(v);
diff --git a/libevmasm/Inliner.cpp b/libevmasm/Inliner.cpp
index d365e312a9..ded5172ddc 100644
--- a/libevmasm/Inliner.cpp
+++ b/libevmasm/Inliner.cpp
@@ -38,7 +38,6 @@
 #include <optional>
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 
@@ -54,7 +53,7 @@ u256 executionCost(RangeType const& _itemRange, langutil::EVMVersion _evmVersion
 		[&gasMeter](auto const& _item) { return gasMeter.estimateMax(_item, false); }
 	), GasMeter::GasConsumption());
 	if (gasConsumption.isInfinite)
-		return numeric_limits<u256>::max();
+		return std::numeric_limits<u256>::max();
 	else
 		return gasConsumption.value;
 }
@@ -66,14 +65,14 @@ uint64_t codeSize(RangeType const& _itemRange)
 		[](auto const& _item) { return _item.bytesRequired(2, Precision::Approximate); }
 	), 0u);
 }
-/// @returns the tag id, if @a _item is a PushTag or Tag into the current subassembly, nullopt otherwise.
-optional<size_t> getLocalTag(AssemblyItem const& _item)
+/// @returns the tag id, if @a _item is a PushTag or Tag into the current subassembly, std::nullopt otherwise.
+std::optional<size_t> getLocalTag(AssemblyItem const& _item)
 {
 	if (_item.type() != PushTag && _item.type() != Tag)
-		return nullopt;
+		return std::nullopt;
 	auto [subId, tag] = _item.splitForeignPushTag();
-	if (subId != numeric_limits<size_t>::max())
-		return nullopt;
+	if (subId != std::numeric_limits<size_t>::max())
+		return std::nullopt;
 	return tag;
 }
 }
@@ -99,7 +98,7 @@ bool Inliner::isInlineCandidate(size_t _tag, ranges::span<AssemblyItem const> _i
 	return true;
 }
 
-map<size_t, Inliner::InlinableBlock> Inliner::determineInlinableBlocks(AssemblyItems const& _items) const
+std::map<size_t, Inliner::InlinableBlock> Inliner::determineInlinableBlocks(AssemblyItems const& _items) const
 {
 	std::map<size_t, ranges::span<AssemblyItem const>> inlinableBlockItems;
 	std::map<size_t, uint64_t> numPushTags;
@@ -108,7 +107,7 @@ map<size_t, Inliner::InlinableBlock> Inliner::determineInlinableBlocks(AssemblyI
 	{
 		// The number of PushTags approximates the number of calls to a block.
 		if (item.type() == PushTag)
-			if (optional<size_t> tag = getLocalTag(item))
+			if (std::optional<size_t> tag = getLocalTag(item))
 				++numPushTags[*tag];
 
 		// We can only inline blocks with straight control flow that end in a jump.
@@ -116,7 +115,7 @@ map<size_t, Inliner::InlinableBlock> Inliner::determineInlinableBlocks(AssemblyI
 		if (lastTag && SemanticInformation::breaksCSEAnalysisBlock(item, false))
 		{
 			ranges::span<AssemblyItem const> block = _items | ranges::views::slice(*lastTag + 1, index + 1);
-			if (optional<size_t> tag = getLocalTag(_items[*lastTag]))
+			if (std::optional<size_t> tag = getLocalTag(_items[*lastTag]))
 				if (isInlineCandidate(*tag, block))
 					inlinableBlockItems[*tag] = block;
 			lastTag.reset();
@@ -130,7 +129,7 @@ map<size_t, Inliner::InlinableBlock> Inliner::determineInlinableBlocks(AssemblyI
 	}
 
 	// Store the number of PushTags alongside the assembly items and discard tags that are never pushed.
-	map<size_t, InlinableBlock> result;
+	std::map<size_t, InlinableBlock> result;
 	for (auto&& [tag, items]: inlinableBlockItems)
 		if (uint64_t const* numPushes = util::valueOrNullptr(numPushTags, tag))
 			result.emplace(tag, InlinableBlock{items, *numPushes});
@@ -199,7 +198,7 @@ bool Inliner::shouldInlineFullFunctionBody(size_t _tag, ranges::span<AssemblyIte
 	return false;
 }
 
-optional<AssemblyItem> Inliner::shouldInline(size_t _tag, AssemblyItem const& _jump, InlinableBlock const& _block) const
+std::optional<AssemblyItem> Inliner::shouldInline(size_t _tag, AssemblyItem const& _jump, InlinableBlock const& _block) const
 {
 	assertThrow(_jump == Instruction::JUMP, OptimizerException, "");
 	AssemblyItem blockExit = _block.items.back();
@@ -232,7 +231,7 @@ optional<AssemblyItem> Inliner::shouldInline(size_t _tag, AssemblyItem const& _j
 			return blockExit;
 	}
 
-	return nullopt;
+	return std::nullopt;
 }
 
 
@@ -252,7 +251,7 @@ void Inliner::optimise()
 			AssemblyItem const& nextItem = *next(it);
 			if (item.type() == PushTag && nextItem == Instruction::JUMP)
 			{
-				if (optional<size_t> tag = getLocalTag(item))
+				if (std::optional<size_t> tag = getLocalTag(item))
 					if (auto* inlinableBlock = util::valueOrNullptr(inlinableBlocks, *tag))
 						if (auto exitItem = shouldInline(*tag, nextItem, *inlinableBlock))
 						{
@@ -264,7 +263,7 @@ void Inliner::optimise()
 							// We might increase the number of push tags to other blocks.
 							for (AssemblyItem const& inlinedItem: inlinableBlock->items)
 								if (inlinedItem.type() == PushTag)
-									if (optional<size_t> duplicatedTag = getLocalTag(inlinedItem))
+									if (std::optional<size_t> duplicatedTag = getLocalTag(inlinedItem))
 										if (auto* block = util::valueOrNullptr(inlinableBlocks, *duplicatedTag))
 											++block->pushTagCount;
 
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index 2c313fd752..174d12b5e3 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -22,7 +22,6 @@
 
 #include <libevmasm/Instruction.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::evmasm;
@@ -335,7 +334,7 @@ InstructionInfo solidity::evmasm::instructionInfo(Instruction _inst, langutil::E
 	}
 	catch (...)
 	{
-		return InstructionInfo({"<INVALID_INSTRUCTION: " + to_string(static_cast<unsigned>(_inst)) + ">", 0, 0, 0, false, Tier::Invalid});
+		return InstructionInfo({"<INVALID_INSTRUCTION: " + std::to_string(static_cast<unsigned>(_inst)) + ">", 0, 0, 0, false, Tier::Invalid});
 	}
 }
 
diff --git a/libevmasm/JumpdestRemover.cpp b/libevmasm/JumpdestRemover.cpp
index 2c0c5875ef..7afa715a88 100644
--- a/libevmasm/JumpdestRemover.cpp
+++ b/libevmasm/JumpdestRemover.cpp
@@ -26,14 +26,13 @@
 
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::evmasm;
 
-bool JumpdestRemover::optimise(set<size_t> const& _tagsReferencedFromOutside)
+bool JumpdestRemover::optimise(std::set<size_t> const& _tagsReferencedFromOutside)
 {
-	set<size_t> references{referencedTags(m_items, numeric_limits<size_t>::max())};
+	std::set<size_t> references{referencedTags(m_items, std::numeric_limits<size_t>::max())};
 	references.insert(_tagsReferencedFromOutside.begin(), _tagsReferencedFromOutside.end());
 
 	size_t initialSize = m_items.size();
@@ -46,7 +45,7 @@ bool JumpdestRemover::optimise(set<size_t> const& _tagsReferencedFromOutside)
 			if (_item.type() != Tag)
 				return false;
 			auto asmIdAndTag = _item.splitForeignPushTag();
-			assertThrow(asmIdAndTag.first == numeric_limits<size_t>::max(), OptimizerException, "Sub-assembly tag used as label.");
+			assertThrow(asmIdAndTag.first == std::numeric_limits<size_t>::max(), OptimizerException, "Sub-assembly tag used as label.");
 			size_t tag = asmIdAndTag.second;
 			return !references.count(tag);
 		}
@@ -55,9 +54,9 @@ bool JumpdestRemover::optimise(set<size_t> const& _tagsReferencedFromOutside)
 	return m_items.size() != initialSize;
 }
 
-set<size_t> JumpdestRemover::referencedTags(AssemblyItems const& _items, size_t _subId)
+std::set<size_t> JumpdestRemover::referencedTags(AssemblyItems const& _items, size_t _subId)
 {
-	set<size_t> ret;
+	std::set<size_t> ret;
 	for (auto const& item: _items)
 		if (item.type() == PushTag)
 		{
diff --git a/libevmasm/KnownState.cpp b/libevmasm/KnownState.cpp
index a2bda5af71..91f798bf38 100644
--- a/libevmasm/KnownState.cpp
+++ b/libevmasm/KnownState.cpp
@@ -28,17 +28,16 @@
 
 #include <functional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
 
-ostream& KnownState::stream(ostream& _out) const
+std::ostream& KnownState::stream(std::ostream& _out) const
 {
-	auto streamExpressionClass = [this](ostream& _out, Id _id)
+	auto streamExpressionClass = [this](std::ostream& _out, Id _id)
 	{
 		auto const& expr = m_expressionClasses->representative(_id);
-		_out << "  " << dec << _id << ": ";
+		_out << "  " << std::dec << _id << ": ";
 		if (!expr.item)
 			_out << " no item";
 		else if (expr.item->type() == UndefinedItem)
@@ -46,26 +45,26 @@ ostream& KnownState::stream(ostream& _out) const
 		else
 			_out << *expr.item;
 		if (expr.sequenceNumber)
-			_out << "@" << dec << expr.sequenceNumber;
+			_out << "@" << std::dec << expr.sequenceNumber;
 		_out << "(";
 		for (Id arg: expr.arguments)
-			_out << dec << arg << ",";
-		_out << ")" << endl;
+			_out << std::dec << arg << ",";
+		_out << ")" << std::endl;
 	};
 
-	_out << "=== State ===" << endl;
-	_out << "Stack height: " << dec << m_stackHeight << endl;
-	_out << "Equivalence classes:" << endl;
+	_out << "=== State ===" << std::endl;
+	_out << "Stack height: " << std::dec << m_stackHeight << std::endl;
+	_out << "Equivalence classes:" << std::endl;
 	for (Id eqClass = 0; eqClass < m_expressionClasses->size(); ++eqClass)
 		streamExpressionClass(_out, eqClass);
 
-	_out << "Stack:" << endl;
+	_out << "Stack:" << std::endl;
 	for (auto const& it: m_stackElements)
 	{
-		_out << "  " << dec << it.first << ": ";
+		_out << "  " << std::dec << it.first << ": ";
 		streamExpressionClass(_out, it.second);
 	}
-	_out << "Storage:" << endl;
+	_out << "Storage:" << std::endl;
 	for (auto const& it: m_storageContent)
 	{
 		_out << "  ";
@@ -73,7 +72,7 @@ ostream& KnownState::stream(ostream& _out) const
 		_out << ": ";
 		streamExpressionClass(_out, it.second);
 	}
-	_out << "Memory:" << endl;
+	_out << "Memory:" << std::endl;
 	for (auto const& it: m_memoryContent)
 	{
 		_out << "  ";
@@ -149,7 +148,7 @@ KnownState::StoreOperation KnownState::feedItem(AssemblyItem const& _item, bool
 			);
 		else if (instruction != Instruction::POP)
 		{
-			vector<Id> arguments(static_cast<size_t>(info.args));
+			std::vector<Id> arguments(static_cast<size_t>(info.args));
 			for (size_t i = 0; i < static_cast<size_t>(info.args); ++i)
 				arguments[i] = stackElement(m_stackHeight - static_cast<int>(i), _item.location());
 			switch (_item.instruction())
@@ -233,8 +232,8 @@ void KnownState::reduceToCommonKnowledge(KnownState const& _other, bool _combine
 				++it;
 			else
 			{
-				set<u256> theseTags = tagsInExpression(it->second);
-				set<u256> otherTags = tagsInExpression(other);
+				std::set<u256> theseTags = tagsInExpression(it->second);
+				std::set<u256> otherTags = tagsInExpression(other);
 				if (!theseTags.empty() && !otherTags.empty())
 				{
 					theseTags.insert(otherTags.begin(), otherTags.end());
@@ -251,7 +250,7 @@ void KnownState::reduceToCommonKnowledge(KnownState const& _other, bool _combine
 	// Use the smaller stack height. Essential to terminate in case of loops.
 	if (m_stackHeight > _other.m_stackHeight)
 	{
-		map<int, Id> shiftedStack;
+		std::map<int, Id> shiftedStack;
 		for (auto const& stackElement: m_stackElements)
 			shiftedStack[stackElement.first - stackDiff] = stackElement.second;
 		m_stackElements = std::move(shiftedStack);
@@ -261,7 +260,7 @@ void KnownState::reduceToCommonKnowledge(KnownState const& _other, bool _combine
 	intersect(m_storageContent, _other.m_storageContent);
 	intersect(m_memoryContent, _other.m_memoryContent);
 	if (_combineSequenceNumbers)
-		m_sequenceNumber = max(m_sequenceNumber, _other.m_sequenceNumber);
+		m_sequenceNumber = std::max(m_sequenceNumber, _other.m_sequenceNumber);
 }
 
 bool KnownState::operator==(KnownState const& _other) const
@@ -316,7 +315,7 @@ void KnownState::swapStackElements(
 	stackElement(_stackHeightA, _location);
 	stackElement(_stackHeightB, _location);
 
-	swap(m_stackElements[_stackHeightA], m_stackElements[_stackHeightB]);
+	std::swap(m_stackElements[_stackHeightA], m_stackElements[_stackHeightB]);
 }
 
 KnownState::StoreOperation KnownState::storeInStorage(
@@ -400,7 +399,7 @@ KnownState::Id KnownState::applyKeccak256(
 	if (!l || *l > 128)
 		return m_expressionClasses->find(keccak256Item, {_start, _length}, true, m_sequenceNumber);
 	unsigned length = unsigned(*l);
-	vector<Id> arguments;
+	std::vector<Id> arguments;
 	for (unsigned i = 0; i < length; i += 32)
 	{
 		Id slot = m_expressionClasses->find(
@@ -426,19 +425,19 @@ KnownState::Id KnownState::applyKeccak256(
 	return m_knownKeccak256Hashes[{arguments, length}] = v;
 }
 
-set<u256> KnownState::tagsInExpression(KnownState::Id _expressionId)
+std::set<u256> KnownState::tagsInExpression(KnownState::Id _expressionId)
 {
 	if (m_tagUnions.left.count(_expressionId))
 		return m_tagUnions.left.at(_expressionId);
 	// Might be a tag, then return the set of itself.
 	ExpressionClasses::Expression expr = m_expressionClasses->representative(_expressionId);
 	if (expr.item && expr.item->type() == PushTag)
-		return set<u256>({expr.item->data()});
+		return std::set<u256>({expr.item->data()});
 	else
-		return set<u256>();
+		return std::set<u256>();
 }
 
-KnownState::Id KnownState::tagUnion(set<u256> _tags)
+KnownState::Id KnownState::tagUnion(std::set<u256> _tags)
 {
 	if (m_tagUnions.right.count(_tags))
 		return m_tagUnions.right.at(_tags);
diff --git a/libevmasm/LinkerObject.cpp b/libevmasm/LinkerObject.cpp
index 5a0631e329..1b09f4ced0 100644
--- a/libevmasm/LinkerObject.cpp
+++ b/libevmasm/LinkerObject.cpp
@@ -24,7 +24,6 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Keccak256.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::evmasm;
@@ -36,24 +35,24 @@ void LinkerObject::append(LinkerObject const& _other)
 	bytecode += _other.bytecode;
 }
 
-void LinkerObject::link(map<string, h160> const& _libraryAddresses)
+void LinkerObject::link(std::map<std::string, h160> const& _libraryAddresses)
 {
 	std::map<size_t, std::string> remainingRefs;
 	for (auto const& linkRef: linkReferences)
 		if (h160 const* address = matchLibrary(linkRef.second, _libraryAddresses))
-			copy(address->data(), address->data() + 20, bytecode.begin() + vector<uint8_t>::difference_type(linkRef.first));
+			copy(address->data(), address->data() + 20, bytecode.begin() + std::vector<uint8_t>::difference_type(linkRef.first));
 		else
 			remainingRefs.insert(linkRef);
 	linkReferences.swap(remainingRefs);
 }
 
-string LinkerObject::toHex() const
+std::string LinkerObject::toHex() const
 {
-	string hex = solidity::util::toHex(bytecode);
+	std::string hex = solidity::util::toHex(bytecode);
 	for (auto const& ref: linkReferences)
 	{
 		size_t pos = ref.first * 2;
-		string hash = libraryPlaceholder(ref.second);
+		std::string hash = libraryPlaceholder(ref.second);
 		hex[pos] = hex[pos + 1] = hex[pos + 38] = hex[pos + 39] = '_';
 		for (size_t i = 0; i < 36; ++i)
 			hex[pos + 2 + i] = hash.at(i);
@@ -61,15 +60,15 @@ string LinkerObject::toHex() const
 	return hex;
 }
 
-string LinkerObject::libraryPlaceholder(string const& _libraryName)
+std::string LinkerObject::libraryPlaceholder(std::string const& _libraryName)
 {
 	return "$" + keccak256(_libraryName).hex().substr(0, 34) + "$";
 }
 
 h160 const*
 LinkerObject::matchLibrary(
-	string const& _linkRefName,
-	map<string, h160> const& _libraryAddresses
+	std::string const& _linkRefName,
+	std::map<std::string, h160> const& _libraryAddresses
 )
 {
 	auto it = _libraryAddresses.find(_linkRefName);
diff --git a/libevmasm/PathGasMeter.cpp b/libevmasm/PathGasMeter.cpp
index c165985cff..2acafea22c 100644
--- a/libevmasm/PathGasMeter.cpp
+++ b/libevmasm/PathGasMeter.cpp
@@ -24,7 +24,6 @@
 #include <libevmasm/KnownState.h>
 #include <libevmasm/SemanticInformation.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 
@@ -38,17 +37,17 @@ PathGasMeter::PathGasMeter(AssemblyItems const& _items, langutil::EVMVersion _ev
 
 GasMeter::GasConsumption PathGasMeter::estimateMax(
 	size_t _startIndex,
-	shared_ptr<KnownState> const& _state
+	std::shared_ptr<KnownState> const& _state
 )
 {
-	auto path = make_unique<GasPath>();
+	auto path = std::make_unique<GasPath>();
 	path->index = _startIndex;
 	path->state = _state->copy();
 	queue(std::move(path));
 
 	GasMeter::GasConsumption gas;
 	while (!m_queue.empty() && !gas.isInfinite)
-		gas = max(gas, handleQueueItem());
+		gas = std::max(gas, handleQueueItem());
 	return gas;
 }
 
@@ -67,10 +66,10 @@ GasMeter::GasConsumption PathGasMeter::handleQueueItem()
 {
 	assertThrow(!m_queue.empty(), OptimizerException, "");
 
-	unique_ptr<GasPath> path = std::move(m_queue.rbegin()->second);
+	std::unique_ptr<GasPath> path = std::move(m_queue.rbegin()->second);
 	m_queue.erase(--m_queue.end());
 
-	shared_ptr<KnownState> state = path->state;
+	std::shared_ptr<KnownState> state = path->state;
 	GasMeter meter(state, m_evmVersion, path->largestMemoryAccess);
 	ExpressionClasses& classes = state->expressionClasses();
 	GasMeter::GasConsumption gas = path->gas;
@@ -82,7 +81,7 @@ GasMeter::GasConsumption PathGasMeter::handleQueueItem()
 		// return the current gas value.
 		return gas;
 
-	set<u256> jumpTags;
+	std::set<u256> jumpTags;
 	for (; index < m_items.size() && !gas.isInfinite; ++index)
 	{
 		bool branchStops = false;
@@ -121,7 +120,7 @@ GasMeter::GasConsumption PathGasMeter::handleQueueItem()
 
 		for (u256 const& tag: jumpTags)
 		{
-			auto newPath = make_unique<GasPath>();
+			auto newPath = std::make_unique<GasPath>();
 			newPath->index = m_items.size();
 			if (m_tagPositions.count(tag))
 				newPath->index = m_tagPositions.at(tag);
diff --git a/libevmasm/PeepholeOptimiser.cpp b/libevmasm/PeepholeOptimiser.cpp
index 22d40c8ea1..e9231c0a56 100644
--- a/libevmasm/PeepholeOptimiser.cpp
+++ b/libevmasm/PeepholeOptimiser.cpp
@@ -25,7 +25,6 @@
 #include <libevmasm/AssemblyItem.h>
 #include <libevmasm/SemanticInformation.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 
@@ -38,7 +37,7 @@ struct OptimiserState
 {
 	AssemblyItems const& items;
 	size_t i;
-	back_insert_iterator<AssemblyItems> out;
+	std::back_insert_iterator<AssemblyItems> out;
 };
 
 template<typename FunctionType>
@@ -55,8 +54,8 @@ struct SimplePeepholeOptimizerMethod
 	template <size_t... Indices>
 	static bool applyRule(
 		AssemblyItems::const_iterator _in,
-		back_insert_iterator<AssemblyItems> _out,
-		index_sequence<Indices...>
+		std::back_insert_iterator<AssemblyItems> _out,
+		std::index_sequence<Indices...>
 	)
 	{
 		return Method::applySimple(_in[Indices]..., _out);
@@ -66,7 +65,7 @@ struct SimplePeepholeOptimizerMethod
 		static constexpr size_t WindowSize = FunctionParameterCount<decltype(Method::applySimple)>::value - 1;
 		if (
 			_state.i + WindowSize <= _state.items.size() &&
-			applyRule(_state.items.begin() + static_cast<ptrdiff_t>(_state.i), _state.out, make_index_sequence<WindowSize>{})
+			applyRule(_state.items.begin() + static_cast<ptrdiff_t>(_state.i), _state.out, std::make_index_sequence<WindowSize>{})
 		)
 		{
 			_state.i += WindowSize;
@@ -81,7 +80,7 @@ struct Identity: SimplePeepholeOptimizerMethod<Identity>
 {
 	static bool applySimple(
 		AssemblyItem const& _item,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		*_out = _item;
@@ -94,7 +93,7 @@ struct PushPop: SimplePeepholeOptimizerMethod<PushPop>
 	static bool applySimple(
 		AssemblyItem const& _push,
 		AssemblyItem const& _pop,
-		back_insert_iterator<AssemblyItems>
+		std::back_insert_iterator<AssemblyItems>
 	)
 	{
 		auto t = _push.type();
@@ -111,7 +110,7 @@ struct OpPop: SimplePeepholeOptimizerMethod<OpPop>
 	static bool applySimple(
 		AssemblyItem const& _op,
 		AssemblyItem const& _pop,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (_pop == Instruction::POP && _op.type() == Operation)
@@ -133,7 +132,7 @@ struct OpStop: SimplePeepholeOptimizerMethod<OpStop>
 	static bool applySimple(
 		AssemblyItem const& _op,
 		AssemblyItem const& _stop,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (_stop == Instruction::STOP)
@@ -164,7 +163,7 @@ struct OpReturnRevert: SimplePeepholeOptimizerMethod<OpReturnRevert>
 		AssemblyItem const& _push,
 		AssemblyItem const& _pushOrDup,
 		AssemblyItem const& _returnRevert,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -191,7 +190,7 @@ struct DoubleSwap: SimplePeepholeOptimizerMethod<DoubleSwap>
 	static size_t applySimple(
 		AssemblyItem const& _s1,
 		AssemblyItem const& _s2,
-		back_insert_iterator<AssemblyItems>
+		std::back_insert_iterator<AssemblyItems>
 	)
 	{
 		return _s1 == _s2 && SemanticInformation::isSwapInstruction(_s1);
@@ -203,7 +202,7 @@ struct DoublePush: SimplePeepholeOptimizerMethod<DoublePush>
 	static bool applySimple(
 		AssemblyItem const& _push1,
 		AssemblyItem const& _push2,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (_push1.type() == Push && _push2.type() == Push && _push1.data() == _push2.data())
@@ -222,7 +221,7 @@ struct CommutativeSwap: SimplePeepholeOptimizerMethod<CommutativeSwap>
 	static bool applySimple(
 		AssemblyItem const& _swap,
 		AssemblyItem const& _op,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		// Remove SWAP1 if following instruction is commutative
@@ -244,10 +243,10 @@ struct SwapComparison: SimplePeepholeOptimizerMethod<SwapComparison>
 	static bool applySimple(
 		AssemblyItem const& _swap,
 		AssemblyItem const& _op,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
-		static map<Instruction, Instruction> const swappableOps{
+		static std::map<Instruction, Instruction> const swappableOps{
 			{ Instruction::LT, Instruction::GT },
 			{ Instruction::GT, Instruction::LT },
 			{ Instruction::SLT, Instruction::SGT },
@@ -274,7 +273,7 @@ struct DupSwap: SimplePeepholeOptimizerMethod<DupSwap>
 	static size_t applySimple(
 		AssemblyItem const& _dupN,
 		AssemblyItem const& _swapN,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -299,7 +298,7 @@ struct IsZeroIsZeroJumpI: SimplePeepholeOptimizerMethod<IsZeroIsZeroJumpI>
 		AssemblyItem const& _iszero2,
 		AssemblyItem const& _pushTag,
 		AssemblyItem const& _jumpi,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -325,7 +324,7 @@ struct EqIsZeroJumpI: SimplePeepholeOptimizerMethod<EqIsZeroJumpI>
 		AssemblyItem const& _iszero,
 		AssemblyItem const& _pushTag,
 		AssemblyItem const& _jumpi,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -354,7 +353,7 @@ struct DoubleJump: SimplePeepholeOptimizerMethod<DoubleJump>
 		AssemblyItem const& _pushTag2,
 		AssemblyItem const& _jump,
 		AssemblyItem const& _tag1,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -383,7 +382,7 @@ struct JumpToNext: SimplePeepholeOptimizerMethod<JumpToNext>
 		AssemblyItem const& _pushTag,
 		AssemblyItem const& _jump,
 		AssemblyItem const& _tag,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (
@@ -409,7 +408,7 @@ struct TagConjunctions: SimplePeepholeOptimizerMethod<TagConjunctions>
 		AssemblyItem const& _pushTag,
 		AssemblyItem const& _pushConstant,
 		AssemblyItem const& _and,
-		back_insert_iterator<AssemblyItems> _out
+		std::back_insert_iterator<AssemblyItems> _out
 	)
 	{
 		if (_and != Instruction::AND)
@@ -444,7 +443,7 @@ struct TruthyAnd: SimplePeepholeOptimizerMethod<TruthyAnd>
 		AssemblyItem const& _push,
 		AssemblyItem const& _not,
 		AssemblyItem const& _and,
-		back_insert_iterator<AssemblyItems>
+		std::back_insert_iterator<AssemblyItems>
 	)
 	{
 		return (
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index b6bcc82802..1971d9d45b 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -25,11 +25,10 @@
 #include <libevmasm/SemanticInformation.h>
 #include <libevmasm/AssemblyItem.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 
-vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(Instruction _instruction)
+std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(Instruction _instruction)
 {
 	switch (_instruction)
 	{
@@ -111,7 +110,7 @@ vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(
 	case Instruction::DELEGATECALL:
 	{
 		size_t paramCount = static_cast<size_t>(instructionInfo(_instruction, langutil::EVMVersion()).args);
-		vector<Operation> operations{
+		std::vector<Operation> operations{
 			Operation{Location::Memory, Effect::Read, paramCount - 4, paramCount - 3, {}},
 			Operation{Location::Storage, Effect::Read, {}, {}, {}}
 		};
@@ -130,7 +129,7 @@ vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(
 	}
 	case Instruction::CREATE:
 	case Instruction::CREATE2:
-		return vector<Operation>{
+		return std::vector<Operation>{
 			Operation{
 				Location::Memory,
 				Effect::Read,
@@ -143,7 +142,7 @@ vector<SemanticInformation::Operation> SemanticInformation::readWriteOperations(
 		};
 	case Instruction::MSIZE:
 		// This is just to satisfy the assert below.
-		return vector<Operation>{};
+		return std::vector<Operation>{};
 	default:
 		assertThrow(storage(_instruction) == None && memory(_instruction) == None, AssemblyException, "");
 	}
diff --git a/libevmasm/SimplificationRules.cpp b/libevmasm/SimplificationRules.cpp
index bcb8da3882..ef2d68c7fd 100644
--- a/libevmasm/SimplificationRules.cpp
+++ b/libevmasm/SimplificationRules.cpp
@@ -32,7 +32,6 @@
 #include <utility>
 #include <functional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
@@ -92,7 +91,7 @@ Rules::Rules()
 	Y.setMatchGroup(6, m_matchGroups);
 	Z.setMatchGroup(7, m_matchGroups);
 
-	addRules(simplificationRuleList(nullopt, A, B, C, W, X, Y, Z));
+	addRules(simplificationRuleList(std::nullopt, A, B, C, W, X, Y, Z));
 	assertThrow(isInitialized(), OptimizerException, "Rule list not properly initialized.");
 }
 
@@ -103,7 +102,7 @@ Pattern::Pattern(Instruction _instruction, std::initializer_list<Pattern> _argum
 {
 }
 
-void Pattern::setMatchGroup(unsigned _group, map<unsigned, Expression const*>& _matchGroups)
+void Pattern::setMatchGroup(unsigned _group, std::map<unsigned, Expression const*>& _matchGroups)
 {
 	m_matchGroup = _group;
 	m_matchGroups = &_matchGroups;
@@ -135,9 +134,9 @@ AssemblyItem Pattern::toAssemblyItem(SourceLocation const& _location) const
 		return AssemblyItem(m_type, data(), _location);
 }
 
-string Pattern::toString() const
+std::string Pattern::toString() const
 {
-	stringstream s;
+	std::stringstream s;
 	switch (m_type)
 	{
 	case Operation:
@@ -146,7 +145,7 @@ string Pattern::toString() const
 		break;
 	case Push:
 		if (m_data)
-			s << "PUSH " << hex << data();
+			s << "PUSH " << std::hex << data();
 		else
 			s << "PUSH ";
 		break;
@@ -155,15 +154,15 @@ string Pattern::toString() const
 		break;
 	default:
 		if (m_data)
-			s << "t=" << dec << m_type << " d=" << hex << data();
+			s << "t=" << std::dec << m_type << " d=" << std::hex << data();
 		else
-			s << "t=" << dec << m_type << " d: nullptr";
+			s << "t=" << std::dec << m_type << " d: nullptr";
 		break;
 	}
 	if (!m_requireDataMatch)
 		s << " ~";
 	if (m_matchGroup)
-		s << "[" << dec << m_matchGroup << "]";
+		s << "[" << std::dec << m_matchGroup << "]";
 	s << "(";
 	for (Pattern const& p: m_arguments)
 		s << p.toString() << ", ";
@@ -216,9 +215,9 @@ ExpressionTemplate::ExpressionTemplate(Pattern const& _pattern, SourceLocation c
 		arguments.emplace_back(arg, _location);
 }
 
-string ExpressionTemplate::toString() const
+std::string ExpressionTemplate::toString() const
 {
-	stringstream s;
+	std::stringstream s;
 	if (hasId)
 		s << id;
 	else

From ce0fbae00b5ec37a9faeaf34a90c473c2f743817 Mon Sep 17 00:00:00 2001
From: minaminao <minaminaoy@gmail.com>
Date: Wed, 5 Jul 2023 10:12:49 +0900
Subject: [PATCH 1473/1748] fix docs

Co-authored-by: r0qs <rodrigo.saramago@protonmail.com>
---
 docs/contracts/interfaces.rst       | 2 +-
 docs/smtchecker.rst                 | 5 +++--
 docs/units-and-global-variables.rst | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/contracts/interfaces.rst b/docs/contracts/interfaces.rst
index cc71cf64e6..a3085667b7 100644
--- a/docs/contracts/interfaces.rst
+++ b/docs/contracts/interfaces.rst
@@ -65,7 +65,7 @@ inheritance.
 Types defined inside interfaces and other contract-like structures
 can be accessed from other contracts: ``Token.TokenType`` or ``Token.Coin``.
 
-.. warning:
+.. warning::
 
     Interfaces have supported ``enum`` types since :doc:`Solidity version 0.5.0 <050-breaking-changes>`, make
     sure the pragma version specifies this version as a minimum.
diff --git a/docs/smtchecker.rst b/docs/smtchecker.rst
index b68d58ed33..f8085b63de 100644
--- a/docs/smtchecker.rst
+++ b/docs/smtchecker.rst
@@ -636,7 +636,7 @@ expression type.
 It is also helpful to cast the called contract's variable as the type of the
 most derived type in case of inheritance.
 
-   .. code-block:: solidity
+.. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0;
@@ -697,8 +697,9 @@ storage for ``address`` variables, therefore if ``B.a`` had type ``address``
 the encoding would assume that its storage does not change in between
 transactions to ``B``.
 
-   .. code-block:: solidity
+.. code-block:: solidity
 
+    // SPDX-License-Identifier: GPL-3.0
     pragma solidity >=0.8.0;
 
     contract A {
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index e702996795..d2256884eb 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -380,7 +380,7 @@ The following properties are available for a contract type ``C``:
 In addition to the properties above, the following properties are available
 for an interface type ``I``:
 
-``type(I).interfaceId``:
+``type(I).interfaceId``
     A ``bytes4`` value containing the `EIP-165 <https://eips.ethereum.org/EIPS/eip-165>`_
     interface identifier of the given interface ``I``. This identifier is defined as the ``XOR`` of all
     function selectors defined within the interface itself - excluding all inherited functions.

From 09c30566eb9264bd81b6e57cd89cc2288b835c37 Mon Sep 17 00:00:00 2001
From: Cliff Syner <33703995+alpinevm@users.noreply.github.com>
Date: Mon, 10 Jul 2023 09:20:10 -0500
Subject: [PATCH 1474/1748] Formatting docs/using-the-compiler.rst

Co-authored-by: Nuno Santos <nunofilipesantos@gmail.com>
---
 docs/using-the-compiler.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 6e6a64bb28..3c0c1a70b6 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -316,7 +316,8 @@ Input Description
         },
         // Version of the EVM to compile for.
         // Affects type checking and code generation. Can be homestead,
-        // tangerineWhistle, spuriousDragon, byzantium, constantinople, petersburg, istanbul, berlin, london, paris or shanghai
+        // tangerineWhistle, spuriousDragon, byzantium, constantinople,
+        // petersburg, istanbul, berlin, london, paris or shanghai (default)
         "evmVersion": "byzantium",
         // Optional: Change compilation pipeline to go through the Yul intermediate representation.
         // This is false by default.

From 919408901da4be2d958045a2b1c14e238b311102 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 10 Jul 2023 14:20:55 +0200
Subject: [PATCH 1475/1748] Remove token requirement from external contributor
 greeter

---
 .github/workflows/welcome-external-pr.yml | 32 +++--------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/welcome-external-pr.yml b/.github/workflows/welcome-external-pr.yml
index eefc7d62bb..ac8d1362ea 100644
--- a/.github/workflows/welcome-external-pr.yml
+++ b/.github/workflows/welcome-external-pr.yml
@@ -6,42 +6,16 @@ on:
       - opened
 
 env:
-  ORGANIZATION: Ethereum
   DRY_RUN: false
 
 jobs:
   comment-external-pr:
     runs-on: ubuntu-latest
     steps:
-      - name: Get organization members
-        id: get_members
-        env:
-          GH_TOKEN: ${{ secrets.READ_ORG }}
-          CONTRIBUTOR: ${{ github.event.pull_request.user.login }}
-        run: |
-          gh api graphql \
-            --raw-field organization="$ORGANIZATION" \
-            --raw-field query='
-              query($organization: String!) {
-                organization(login: $organization) {
-                  team(slug: "Solidity") {
-                    members(first: 100) {
-                      nodes {
-                        login
-                      }
-                    }
-                  }
-                }
-              }' > org_members.json
-          echo "CONTRIBUTOR_IS_ORG_MEMBER=$(
-            jq \
-              --arg contributor $CONTRIBUTOR \
-              '.data.organization.team.members | any(.nodes[].login; . == $contributor)' \
-              org_members.json
-          )" >> $GITHUB_OUTPUT
-
+      # Note: this step requires that the INTERNAL_CONTRIBUTORS environment variable
+      # is already defined in the repository with the current json list of internal contributors.
       - name: Comment on external contribution PR
-        if: ${{ steps.get_members.outputs.CONTRIBUTOR_IS_ORG_MEMBER == 'false' }}
+        if: "!contains(fromJSON(vars.INTERNAL_CONTRIBUTORS), github.event.pull_request.user.login)"
         env:
           GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PR: ${{ github.event.pull_request.html_url }}

From c1ca2bf9d290a4b3be6e8e06824957952aee8035 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 11 Jul 2023 20:28:21 +0200
Subject: [PATCH 1476/1748] Check style coverage for using namespace std

---
 scripts/check_style.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 0953106d3b..0d5fe18268 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -20,6 +20,10 @@ EXCLUDE_FILES=(
 EXCLUDE_FILES_JOINED=$(printf "%s\|" "${EXCLUDE_FILES[@]}")
 EXCLUDE_FILES_JOINED=${EXCLUDE_FILES_JOINED%??}
 
+NAMESPACE_STD_FREE_FILES=(
+    libevmasm/*
+)
+
 (
 REPO_ROOT="$(dirname "$0")"/..
 cd "$REPO_ROOT" || exit 1
@@ -58,6 +62,9 @@ FORMATERROR=$(
     # unqualified move()/forward() checks, i.e. make sure that std::move() and std::forward() are used instead of move() and forward()
     preparedGrep "move\(.+\)" | grep -v "std::move" | grep -E "[^a-z]move"
     preparedGrep "forward\(.+\)" | grep -v "std::forward" | grep -E "[^a-z]forward"
+    # make sure `using namespace std` is not used in INCLUDE_DIRECTORIES
+    # shellcheck disable=SC2068,SC2068
+    grep -nIE -d skip "using namespace std;" ${NAMESPACE_STD_FREE_FILES[@]}
 ) | grep -E -v -e "^[a-zA-Z\./]*:[0-9]*:\s*\/(\/|\*)" -e "^test/" || true
 )
 

From e81f2bdbd66e9c8780f74b8a8d67b4dc2c87945e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 12 Jul 2023 10:05:47 +0200
Subject: [PATCH 1477/1748] Purge using namespace std from liblangutil

---
 liblangutil/CharStream.cpp               | 43 ++++++++++-----------
 liblangutil/DebugInfoSelection.cpp       | 19 +++++----
 liblangutil/ErrorReporter.cpp            | 49 ++++++++++++------------
 liblangutil/Exceptions.cpp               |  1 -
 liblangutil/ParserBase.cpp               | 27 +++++++------
 liblangutil/Scanner.cpp                  | 23 ++++++-----
 liblangutil/SemVerHandler.cpp            | 10 ++---
 liblangutil/SourceLocation.cpp           |  5 +--
 liblangutil/SourceReferenceExtractor.cpp | 19 +++++----
 liblangutil/SourceReferenceFormatter.cpp |  7 ++--
 liblangutil/Token.cpp                    | 38 +++++++++---------
 scripts/check_style.sh                   |  1 +
 12 files changed, 116 insertions(+), 126 deletions(-)

diff --git a/liblangutil/CharStream.cpp b/liblangutil/CharStream.cpp
index 6ecd85bfed..c6b58ef647 100644
--- a/liblangutil/CharStream.cpp
+++ b/liblangutil/CharStream.cpp
@@ -51,7 +51,6 @@
 #include <liblangutil/CharStream.h>
 #include <liblangutil/Exceptions.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 
@@ -79,21 +78,21 @@ char CharStream::setPosition(size_t _location)
 	return get();
 }
 
-string CharStream::lineAtPosition(int _position) const
+std::string CharStream::lineAtPosition(int _position) const
 {
 	// if _position points to \n, it returns the line before the \n
-	using size_type = string::size_type;
-	size_type searchStart = min<size_type>(m_source.size(), size_type(_position));
+	using size_type = std::string::size_type;
+	size_type searchStart = std::min<size_type>(m_source.size(), size_type(_position));
 	if (searchStart > 0)
 		searchStart--;
 	size_type lineStart = m_source.rfind('\n', searchStart);
-	if (lineStart == string::npos)
+	if (lineStart == std::string::npos)
 		lineStart = 0;
 	else
 		lineStart++;
-	string line = m_source.substr(
+	std::string line = m_source.substr(
 		lineStart,
-		min(m_source.find('\n', lineStart), m_source.size()) - lineStart
+		std::min(m_source.find('\n', lineStart), m_source.size()) - lineStart
 	);
 	if (!line.empty() && line.back() == '\r')
 		line.pop_back();
@@ -102,9 +101,9 @@ string CharStream::lineAtPosition(int _position) const
 
 LineColumn CharStream::translatePositionToLineColumn(int _position) const
 {
-	using size_type = string::size_type;
-	using diff_type = string::difference_type;
-	size_type searchPosition = min<size_type>(m_source.size(), size_type(_position));
+	using size_type = std::string::size_type;
+	using diff_type = std::string::difference_type;
+	size_type searchPosition = std::min<size_type>(m_source.size(), size_type(_position));
 	int lineNumber = static_cast<int>(count(m_source.begin(), m_source.begin() + diff_type(searchPosition), '\n'));
 	size_type lineStart;
 	if (searchPosition == 0)
@@ -112,24 +111,24 @@ LineColumn CharStream::translatePositionToLineColumn(int _position) const
 	else
 	{
 		lineStart = m_source.rfind('\n', searchPosition - 1);
-		lineStart = lineStart == string::npos ? 0 : lineStart + 1;
+		lineStart = lineStart == std::string::npos ? 0 : lineStart + 1;
 	}
 	return LineColumn{lineNumber, static_cast<int>(searchPosition - lineStart)};
 }
 
-string_view CharStream::text(SourceLocation const& _location) const
+std::string_view CharStream::text(SourceLocation const& _location) const
 {
 	if (!_location.hasText())
 		return {};
 	solAssert(_location.sourceName && *_location.sourceName == m_name, "");
 	solAssert(static_cast<size_t>(_location.end) <= m_source.size(), "");
-	return string_view{m_source}.substr(
+	return std::string_view{m_source}.substr(
 		static_cast<size_t>(_location.start),
 		static_cast<size_t>(_location.end - _location.start)
 	);
 }
 
-string CharStream::singleLineSnippet(string const& _sourceCode, SourceLocation const& _location)
+std::string CharStream::singleLineSnippet(std::string const& _sourceCode, SourceLocation const& _location)
 {
 	if (!_location.hasText())
 		return {};
@@ -137,39 +136,39 @@ string CharStream::singleLineSnippet(string const& _sourceCode, SourceLocation c
 	if (static_cast<size_t>(_location.start) >= _sourceCode.size())
 		return {};
 
-	string cut = _sourceCode.substr(static_cast<size_t>(_location.start), static_cast<size_t>(_location.end - _location.start));
+	std::string cut = _sourceCode.substr(static_cast<size_t>(_location.start), static_cast<size_t>(_location.end - _location.start));
 	auto newLinePos = cut.find_first_of("\n\r");
-	if (newLinePos != string::npos)
+	if (newLinePos != std::string::npos)
 		cut = cut.substr(0, newLinePos) + "...";
 
 	return cut;
 }
 
-optional<int> CharStream::translateLineColumnToPosition(LineColumn const& _lineColumn) const
+std::optional<int> CharStream::translateLineColumnToPosition(LineColumn const& _lineColumn) const
 {
 	return translateLineColumnToPosition(m_source, _lineColumn);
 }
 
-optional<int> CharStream::translateLineColumnToPosition(std::string const& _text, LineColumn const& _input)
+std::optional<int> CharStream::translateLineColumnToPosition(std::string const& _text, LineColumn const& _input)
 {
 	if (_input.line < 0)
-		return nullopt;
+		return std::nullopt;
 
 	size_t offset = 0;
 	for (int i = 0; i < _input.line; i++)
 	{
 		offset = _text.find('\n', offset);
 		if (offset == _text.npos)
-			return nullopt;
+			return std::nullopt;
 		offset++; // Skip linefeed.
 	}
 
 	size_t endOfLine = _text.find('\n', offset);
-	if (endOfLine == string::npos)
+	if (endOfLine == std::string::npos)
 		endOfLine = _text.size();
 
 	if (offset + static_cast<size_t>(_input.column) > endOfLine)
-		return nullopt;
+		return std::nullopt;
 	return offset + static_cast<size_t>(_input.column);
 }
 
diff --git a/liblangutil/DebugInfoSelection.cpp b/liblangutil/DebugInfoSelection.cpp
index 6ff023c01d..88e09cdb7a 100644
--- a/liblangutil/DebugInfoSelection.cpp
+++ b/liblangutil/DebugInfoSelection.cpp
@@ -30,7 +30,6 @@
 
 #include <vector>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::util;
@@ -50,7 +49,7 @@ DebugInfoSelection const DebugInfoSelection::Only(bool DebugInfoSelection::* _me
 	return result;
 }
 
-optional<DebugInfoSelection> DebugInfoSelection::fromString(string_view _input)
+std::optional<DebugInfoSelection> DebugInfoSelection::fromString(std::string_view _input)
 {
 	// TODO: Make more stuff constexpr and make it a static_assert().
 	solAssert(componentMap().count("all") == 0, "");
@@ -61,11 +60,11 @@ optional<DebugInfoSelection> DebugInfoSelection::fromString(string_view _input)
 	if (_input == "none")
 		return None();
 
-	return fromComponents(_input | ranges::views::split(',') | ranges::to<vector<string>>);
+	return fromComponents(_input | ranges::views::split(',') | ranges::to<std::vector<std::string>>);
 }
 
-optional<DebugInfoSelection> DebugInfoSelection::fromComponents(
-	vector<string> const& _componentNames,
+std::optional<DebugInfoSelection> DebugInfoSelection::fromComponents(
+	std::vector<std::string> const& _componentNames,
 	bool _acceptWildcards
 )
 {
@@ -75,16 +74,16 @@ optional<DebugInfoSelection> DebugInfoSelection::fromComponents(
 	for (auto const& component: _componentNames)
 	{
 		if (component == "*")
-			return (_acceptWildcards ? make_optional(DebugInfoSelection::All()) : nullopt);
+			return (_acceptWildcards ? std::make_optional(DebugInfoSelection::All()) : std::nullopt);
 
 		if (!selection.enable(component))
-			return nullopt;
+			return std::nullopt;
 	}
 
 	return selection;
 }
 
-bool DebugInfoSelection::enable(string _component)
+bool DebugInfoSelection::enable(std::string _component)
 {
 	auto memberIt = componentMap().find(boost::trim_copy(_component));
 	if (memberIt == componentMap().end())
@@ -146,9 +145,9 @@ bool DebugInfoSelection::operator==(DebugInfoSelection const& _other) const noex
 	return true;
 }
 
-ostream& langutil::operator<<(ostream& _stream, DebugInfoSelection const& _selection)
+std::ostream& langutil::operator<<(std::ostream& _stream, DebugInfoSelection const& _selection)
 {
-	vector<string> selectedComponentNames;
+	std::vector<std::string> selectedComponentNames;
 	for (auto const& [name, member]: _selection.componentMap())
 		if (_selection.*member)
 			selectedComponentNames.push_back(name);
diff --git a/liblangutil/ErrorReporter.cpp b/liblangutil/ErrorReporter.cpp
index f99247b328..298e4f630f 100644
--- a/liblangutil/ErrorReporter.cpp
+++ b/liblangutil/ErrorReporter.cpp
@@ -25,7 +25,6 @@
 #include <liblangutil/SourceLocation.h>
 #include <memory>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 
@@ -37,7 +36,7 @@ ErrorReporter& ErrorReporter::operator=(ErrorReporter const& _errorReporter)
 	return *this;
 }
 
-void ErrorReporter::warning(ErrorId _error, string const& _description)
+void ErrorReporter::warning(ErrorId _error, std::string const& _description)
 {
 	error(_error, Error::Type::Warning, SourceLocation(), _description);
 }
@@ -45,7 +44,7 @@ void ErrorReporter::warning(ErrorId _error, string const& _description)
 void ErrorReporter::warning(
 	ErrorId _error,
 	SourceLocation const& _location,
-	string const& _description
+	std::string const& _description
 )
 {
 	error(_error, Error::Type::Warning, _location, _description);
@@ -54,27 +53,27 @@ void ErrorReporter::warning(
 void ErrorReporter::warning(
 	ErrorId _error,
 	SourceLocation const& _location,
-	string const& _description,
+	std::string const& _description,
 	SecondarySourceLocation const& _secondaryLocation
 )
 {
 	error(_error, Error::Type::Warning, _location, _secondaryLocation, _description);
 }
 
-void ErrorReporter::error(ErrorId _errorId, Error::Type _type, SourceLocation const& _location, string const& _description)
+void ErrorReporter::error(ErrorId _errorId, Error::Type _type, SourceLocation const& _location, std::string const& _description)
 {
 	if (checkForExcessiveErrors(_type))
 		return;
 
-	m_errorList.push_back(make_shared<Error>(_errorId, _type, _description, _location));
+	m_errorList.push_back(std::make_shared<Error>(_errorId, _type, _description, _location));
 }
 
-void ErrorReporter::error(ErrorId _errorId, Error::Type _type, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, string const& _description)
+void ErrorReporter::error(ErrorId _errorId, Error::Type _type, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, std::string const& _description)
 {
 	if (checkForExcessiveErrors(_type))
 		return;
 
-	m_errorList.push_back(make_shared<Error>(_errorId, _type, _description, _location, _secondaryLocation));
+	m_errorList.push_back(std::make_shared<Error>(_errorId, _type, _description, _location, _secondaryLocation));
 }
 
 bool ErrorReporter::hasExcessiveErrors() const
@@ -89,7 +88,7 @@ bool ErrorReporter::checkForExcessiveErrors(Error::Type _type)
 		m_warningCount++;
 
 		if (m_warningCount == c_maxWarningsAllowed)
-			m_errorList.push_back(make_shared<Error>(4591_error, Error::Type::Warning, "There are more than 256 warnings. Ignoring the rest."));
+			m_errorList.push_back(std::make_shared<Error>(4591_error, Error::Type::Warning, "There are more than 256 warnings. Ignoring the rest."));
 
 		if (m_warningCount >= c_maxWarningsAllowed)
 			return true;
@@ -99,7 +98,7 @@ bool ErrorReporter::checkForExcessiveErrors(Error::Type _type)
 		m_infoCount++;
 
 		if (m_infoCount == c_maxInfosAllowed)
-			m_errorList.push_back(make_shared<Error>(2833_error, Error::Type::Info, "There are more than 256 infos. Ignoring the rest."));
+			m_errorList.push_back(std::make_shared<Error>(2833_error, Error::Type::Info, "There are more than 256 infos. Ignoring the rest."));
 
 		if (m_infoCount >= c_maxInfosAllowed)
 			return true;
@@ -110,7 +109,7 @@ bool ErrorReporter::checkForExcessiveErrors(Error::Type _type)
 
 		if (m_errorCount > c_maxErrorsAllowed)
 		{
-			m_errorList.push_back(make_shared<Error>(4013_error, Error::Type::Warning, "There are more than 256 errors. Aborting."));
+			m_errorList.push_back(std::make_shared<Error>(4013_error, Error::Type::Warning, "There are more than 256 errors. Aborting."));
 			BOOST_THROW_EXCEPTION(FatalError());
 		}
 	}
@@ -118,13 +117,13 @@ bool ErrorReporter::checkForExcessiveErrors(Error::Type _type)
 	return false;
 }
 
-void ErrorReporter::fatalError(ErrorId _error, Error::Type _type, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, string const& _description)
+void ErrorReporter::fatalError(ErrorId _error, Error::Type _type, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, std::string const& _description)
 {
 	error(_error, _type, _location, _secondaryLocation, _description);
 	BOOST_THROW_EXCEPTION(FatalError());
 }
 
-void ErrorReporter::fatalError(ErrorId _error, Error::Type _type, SourceLocation const& _location, string const& _description)
+void ErrorReporter::fatalError(ErrorId _error, Error::Type _type, SourceLocation const& _location, std::string const& _description)
 {
 	error(_error, _type, _location, _description);
 	BOOST_THROW_EXCEPTION(FatalError());
@@ -140,7 +139,7 @@ void ErrorReporter::clear()
 	m_errorList.clear();
 }
 
-void ErrorReporter::declarationError(ErrorId _error, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, string const& _description)
+void ErrorReporter::declarationError(ErrorId _error, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, std::string const& _description)
 {
 	error(
 		_error,
@@ -151,7 +150,7 @@ void ErrorReporter::declarationError(ErrorId _error, SourceLocation const& _loca
 	);
 }
 
-void ErrorReporter::declarationError(ErrorId _error, SourceLocation const& _location, string const& _description)
+void ErrorReporter::declarationError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 {
 	error(
 		_error,
@@ -170,7 +169,7 @@ void ErrorReporter::fatalDeclarationError(ErrorId _error, SourceLocation const&
 		_description);
 }
 
-void ErrorReporter::parserError(ErrorId _error, SourceLocation const& _location, string const& _description)
+void ErrorReporter::parserError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 {
 	error(
 		_error,
@@ -180,7 +179,7 @@ void ErrorReporter::parserError(ErrorId _error, SourceLocation const& _location,
 	);
 }
 
-void ErrorReporter::fatalParserError(ErrorId _error, SourceLocation const& _location, string const& _description)
+void ErrorReporter::fatalParserError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 {
 	fatalError(
 		_error,
@@ -190,7 +189,7 @@ void ErrorReporter::fatalParserError(ErrorId _error, SourceLocation const& _loca
 	);
 }
 
-void ErrorReporter::syntaxError(ErrorId _error, SourceLocation const& _location, string const& _description)
+void ErrorReporter::syntaxError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 {
 	error(
 		_error,
@@ -200,7 +199,7 @@ void ErrorReporter::syntaxError(ErrorId _error, SourceLocation const& _location,
 	);
 }
 
-void ErrorReporter::typeError(ErrorId _error, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, string const& _description)
+void ErrorReporter::typeError(ErrorId _error, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, std::string const& _description)
 {
 	error(
 		_error,
@@ -211,7 +210,7 @@ void ErrorReporter::typeError(ErrorId _error, SourceLocation const& _location, S
 	);
 }
 
-void ErrorReporter::typeError(ErrorId _error, SourceLocation const& _location, string const& _description)
+void ErrorReporter::typeError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 {
 	error(
 		_error,
@@ -222,7 +221,7 @@ void ErrorReporter::typeError(ErrorId _error, SourceLocation const& _location, s
 }
 
 
-void ErrorReporter::fatalTypeError(ErrorId _error, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, string const& _description)
+void ErrorReporter::fatalTypeError(ErrorId _error, SourceLocation const& _location, SecondarySourceLocation const& _secondaryLocation, std::string const& _description)
 {
 	fatalError(
 		_error,
@@ -233,7 +232,7 @@ void ErrorReporter::fatalTypeError(ErrorId _error, SourceLocation const& _locati
 	);
 }
 
-void ErrorReporter::fatalTypeError(ErrorId _error, SourceLocation const& _location, string const& _description)
+void ErrorReporter::fatalTypeError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 {
 	fatalError(
 		_error,
@@ -243,7 +242,7 @@ void ErrorReporter::fatalTypeError(ErrorId _error, SourceLocation const& _locati
 	);
 }
 
-void ErrorReporter::docstringParsingError(ErrorId _error, SourceLocation const& _location, string const& _description)
+void ErrorReporter::docstringParsingError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 {
 	error(
 		_error,
@@ -256,13 +255,13 @@ void ErrorReporter::docstringParsingError(ErrorId _error, SourceLocation const&
 void ErrorReporter::info(
 	ErrorId _error,
 	SourceLocation const& _location,
-	string const& _description
+	std::string const& _description
 )
 {
 	error(_error, Error::Type::Info, _location, _description);
 }
 
-void ErrorReporter::info(ErrorId _error, string const& _description)
+void ErrorReporter::info(ErrorId _error, std::string const& _description)
 {
 	error(_error, Error::Type::Info, SourceLocation(), _description);
 }
diff --git a/liblangutil/Exceptions.cpp b/liblangutil/Exceptions.cpp
index 92fe2589ac..118720b745 100644
--- a/liblangutil/Exceptions.cpp
+++ b/liblangutil/Exceptions.cpp
@@ -26,7 +26,6 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/algorithm/string/trim.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 
diff --git a/liblangutil/ParserBase.cpp b/liblangutil/ParserBase.cpp
index 91f67861ab..12a00d04f1 100644
--- a/liblangutil/ParserBase.cpp
+++ b/liblangutil/ParserBase.cpp
@@ -25,7 +25,6 @@
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ErrorReporter.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 
@@ -44,7 +43,7 @@ Token ParserBase::peekNextToken() const
 	return m_scanner->peekNextToken();
 }
 
-string ParserBase::currentLiteral() const
+std::string ParserBase::currentLiteral() const
 {
 	return m_scanner->currentLiteral();
 }
@@ -54,7 +53,7 @@ Token ParserBase::advance()
 	return m_scanner->next();
 }
 
-string ParserBase::tokenName(Token _token)
+std::string ParserBase::tokenName(Token _token)
 {
 	if (_token == Token::Identifier)
 		return "identifier";
@@ -76,7 +75,7 @@ void ParserBase::expectToken(Token _value, bool _advance)
 	Token tok = m_scanner->currentToken();
 	if (tok != _value)
 	{
-		string const expectedToken = ParserBase::tokenName(_value);
+		std::string const expectedToken = ParserBase::tokenName(_value);
 		if (m_parserErrorRecovery)
 			parserError(6635_error, "Expected " + expectedToken + " but got " + tokenName(tok));
 		else
@@ -92,7 +91,7 @@ void ParserBase::expectToken(Token _value, bool _advance)
 		advance();
 }
 
-void ParserBase::expectTokenOrConsumeUntil(Token _value, string const& _currentNodeName, bool _advance)
+void ParserBase::expectTokenOrConsumeUntil(Token _value, std::string const& _currentNodeName, bool _advance)
 {
 	solAssert(m_inParserRecovery, "The function is supposed to be called during parser recovery only.");
 
@@ -104,12 +103,12 @@ void ParserBase::expectTokenOrConsumeUntil(Token _value, string const& _currentN
 		while (m_scanner->currentToken() != _value && m_scanner->currentToken() != Token::EOS)
 			advance();
 
-		string const expectedToken = ParserBase::tokenName(_value);
+		std::string const expectedToken = ParserBase::tokenName(_value);
 		if (m_scanner->currentToken() == Token::EOS)
 		{
 			// rollback to where the token started, and raise exception to be caught at a higher level.
 			m_scanner->setPosition(static_cast<size_t>(startPosition));
-			string const msg = "In " + _currentNodeName + ", " + expectedToken + "is expected; got " + ParserBase::tokenName(tok) + " instead.";
+			std::string const msg = "In " + _currentNodeName + ", " + expectedToken + "is expected; got " + ParserBase::tokenName(tok) + " instead.";
 			fatalParserError(1957_error, errorLoc, msg);
 		}
 		else
@@ -120,7 +119,7 @@ void ParserBase::expectTokenOrConsumeUntil(Token _value, string const& _currentN
 	}
 	else
 	{
-		string expectedToken = ParserBase::tokenName(_value);
+		std::string expectedToken = ParserBase::tokenName(_value);
 		parserWarning(3347_error, "Recovered in " + _currentNodeName + " at " + expectedToken + ".");
 		m_inParserRecovery = false;
 	}
@@ -142,32 +141,32 @@ void ParserBase::decreaseRecursionDepth()
 	m_recursionDepth--;
 }
 
-void ParserBase::parserWarning(ErrorId _error, string const& _description)
+void ParserBase::parserWarning(ErrorId _error, std::string const& _description)
 {
 	m_errorReporter.warning(_error, currentLocation(), _description);
 }
 
-void ParserBase::parserWarning(ErrorId _error, SourceLocation const& _location, string const& _description)
+void ParserBase::parserWarning(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 {
 	m_errorReporter.warning(_error, _location, _description);
 }
 
-void ParserBase::parserError(ErrorId _error, SourceLocation const& _location, string const& _description)
+void ParserBase::parserError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 {
 	m_errorReporter.parserError(_error, _location, _description);
 }
 
-void ParserBase::parserError(ErrorId _error, string const& _description)
+void ParserBase::parserError(ErrorId _error, std::string const& _description)
 {
 	parserError(_error, currentLocation(), _description);
 }
 
-void ParserBase::fatalParserError(ErrorId _error, string const& _description)
+void ParserBase::fatalParserError(ErrorId _error, std::string const& _description)
 {
 	fatalParserError(_error, currentLocation(), _description);
 }
 
-void ParserBase::fatalParserError(ErrorId _error, SourceLocation const& _location, string const& _description)
+void ParserBase::fatalParserError(ErrorId _error, SourceLocation const& _location, std::string const& _description)
 {
 	m_errorReporter.fatalParserError(_error, _location, _description);
 }
diff --git a/liblangutil/Scanner.cpp b/liblangutil/Scanner.cpp
index 1b9b2afac2..2d5607607a 100644
--- a/liblangutil/Scanner.cpp
+++ b/liblangutil/Scanner.cpp
@@ -61,12 +61,11 @@
 #include <tuple>
 #include <array>
 
-using namespace std;
 
 namespace solidity::langutil
 {
 
-string to_string(ScannerError _errorCode)
+std::string to_string(ScannerError _errorCode)
 {
 	switch (_errorCode)
 	{
@@ -92,7 +91,7 @@ string to_string(ScannerError _errorCode)
 }
 
 
-ostream& operator<<(ostream& os, ScannerError _errorCode)
+std::ostream& operator<<(std::ostream& os, ScannerError _errorCode)
 {
 	return os << to_string(_errorCode);
 }
@@ -275,12 +274,12 @@ namespace
 ///          to the user.
 static ScannerError validateBiDiMarkup(CharStream& _stream, size_t _startPosition)
 {
-	static array<pair<string_view, int>, 5> constexpr directionalSequences{
-		pair<string_view, int>{"\xE2\x80\xAD", 1}, // U+202D (LRO - Left-to-Right Override)
-		pair<string_view, int>{"\xE2\x80\xAE", 1}, // U+202E (RLO - Right-to-Left Override)
-		pair<string_view, int>{"\xE2\x80\xAA", 1}, // U+202A (LRE - Left-to-Right Embedding)
-		pair<string_view, int>{"\xE2\x80\xAB", 1}, // U+202B (RLE - Right-to-Left Embedding)
-		pair<string_view, int>{"\xE2\x80\xAC", -1} // U+202C (PDF - Pop Directional Formatting
+	static std::array<std::pair<std::string_view, int>, 5> constexpr directionalSequences{
+		std::pair<std::string_view, int>{"\xE2\x80\xAD", 1}, // U+202D (LRO - Left-to-Right Override)
+		std::pair<std::string_view, int>{"\xE2\x80\xAE", 1}, // U+202E (RLO - Right-to-Left Override)
+		std::pair<std::string_view, int>{"\xE2\x80\xAA", 1}, // U+202A (LRE - Left-to-Right Embedding)
+		std::pair<std::string_view, int>{"\xE2\x80\xAB", 1}, // U+202B (RLE - Right-to-Left Embedding)
+		std::pair<std::string_view, int>{"\xE2\x80\xAC", -1} // U+202C (PDF - Pop Directional Formatting
 	};
 
 	size_t endPosition = _stream.position();
@@ -712,7 +711,7 @@ void Scanner::scanToken()
 		default:
 			if (isIdentifierStart(m_char))
 			{
-				tie(token, m, n) = scanIdentifierOrKeyword();
+				std::tie(token, m, n) = scanIdentifierOrKeyword();
 
 				// Special case for hexadecimal literals
 				if (token == Token::Hex)
@@ -757,7 +756,7 @@ void Scanner::scanToken()
 	m_tokens[NextNext].location.end = static_cast<int>(sourcePos());
 	m_tokens[NextNext].location.sourceName = m_sourceName;
 	m_tokens[NextNext].token = token;
-	m_tokens[NextNext].extendedTokenInfo = make_tuple(m, n);
+	m_tokens[NextNext].extendedTokenInfo = std::make_tuple(m, n);
 }
 
 bool Scanner::scanEscape()
@@ -1011,7 +1010,7 @@ Token Scanner::scanNumber(char _charSeen)
 	return Token::Number;
 }
 
-tuple<Token, unsigned, unsigned> Scanner::scanIdentifierOrKeyword()
+std::tuple<Token, unsigned, unsigned> Scanner::scanIdentifierOrKeyword()
 {
 	solAssert(isIdentifierStart(m_char), "");
 	LiteralScope literal(this, LITERAL_TYPE_STRING);
diff --git a/liblangutil/SemVerHandler.cpp b/liblangutil/SemVerHandler.cpp
index 6e85e2609d..2358eec5ef 100644
--- a/liblangutil/SemVerHandler.cpp
+++ b/liblangutil/SemVerHandler.cpp
@@ -29,18 +29,18 @@
 #include <limits>
 #include <fmt/format.h>
 
-using namespace std;
+using namespace std::string_literals;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::util;
 
-SemVerMatchExpressionParser::SemVerMatchExpressionParser(vector<Token> _tokens, vector<string> _literals):
+SemVerMatchExpressionParser::SemVerMatchExpressionParser(std::vector<Token> _tokens, std::vector<std::string> _literals):
 	m_tokens(std::move(_tokens)), m_literals(std::move(_literals))
 {
 	solAssert(m_tokens.size() == m_literals.size(), "");
 }
 
-SemVerVersion::SemVerVersion(string const& _versionString)
+SemVerVersion::SemVerVersion(std::string const& _versionString)
 {
 	auto i = _versionString.begin();
 	auto end = _versionString.end();
@@ -63,13 +63,13 @@ SemVerVersion::SemVerVersion(string const& _versionString)
 	{
 		auto prereleaseStart = ++i;
 		while (i != end && *i != '+') ++i;
-		prerelease = string(prereleaseStart, i);
+		prerelease = std::string(prereleaseStart, i);
 	}
 	if (i != end && *i == '+')
 	{
 		auto buildStart = ++i;
 		while (i != end) ++i;
-		build = string(buildStart, i);
+		build = std::string(buildStart, i);
 	}
 	if (i != end)
 		solThrow(SemVerError, "Invalid versionString "s + _versionString);
diff --git a/liblangutil/SourceLocation.cpp b/liblangutil/SourceLocation.cpp
index 72f2506e8a..61fe40f926 100644
--- a/liblangutil/SourceLocation.cpp
+++ b/liblangutil/SourceLocation.cpp
@@ -25,14 +25,13 @@
 
 using namespace solidity;
 using namespace solidity::langutil;
-using namespace std;
 
-SourceLocation solidity::langutil::parseSourceLocation(string const& _input, vector<shared_ptr<string const>> const& _sourceNames)
+SourceLocation solidity::langutil::parseSourceLocation(std::string const& _input, std::vector<std::shared_ptr<std::string const>> const& _sourceNames)
 {
 	// Expected input: "start:length:sourceindex"
 	enum SrcElem: size_t { Start, Length, Index };
 
-	vector<string> pos;
+	std::vector<std::string> pos;
 
 	boost::algorithm::split(pos, _input, boost::is_any_of(":"));
 
diff --git a/liblangutil/SourceReferenceExtractor.cpp b/liblangutil/SourceReferenceExtractor.cpp
index 01f22a1f77..9389a77aa6 100644
--- a/liblangutil/SourceReferenceExtractor.cpp
+++ b/liblangutil/SourceReferenceExtractor.cpp
@@ -24,7 +24,6 @@
 #include <cmath>
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 
@@ -36,7 +35,7 @@ SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
 {
 	SourceLocation const* location = boost::get_error_info<errinfo_sourceLocation>(_exception);
 
-	string const* message = boost::get_error_info<util::errinfo_comment>(_exception);
+	std::string const* message = boost::get_error_info<util::errinfo_comment>(_exception);
 	SourceReference primary = extract(_charStreamProvider, location, message ? *message : "");
 
 	std::vector<SourceReference> secondary;
@@ -45,7 +44,7 @@ SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
 		for (auto const& info: secondaryLocation->infos)
 			secondary.emplace_back(extract(_charStreamProvider, &info.second, info.first));
 
-	return Message{std::move(primary), _typeOrSeverity, std::move(secondary), nullopt};
+	return Message{std::move(primary), _typeOrSeverity, std::move(secondary), std::nullopt};
 }
 
 SourceReferenceExtractor::Message SourceReferenceExtractor::extract(
@@ -78,7 +77,7 @@ SourceReference SourceReferenceExtractor::extract(
 	LineColumn end = charStream.translatePositionToLineColumn(_location->end);
 	bool const isMultiline = start.line != end.line;
 
-	string line = charStream.lineAtPosition(_location->start);
+	std::string line = charStream.lineAtPosition(_location->start);
 
 	int locationLength =
 		isMultiline ?
@@ -88,7 +87,7 @@ SourceReference SourceReferenceExtractor::extract(
 	if (locationLength > 150)
 	{
 		auto const lhs = static_cast<size_t>(start.column) + 35;
-		string::size_type const rhs = (isMultiline ? line.length() : static_cast<size_t>(end.column)) - 35;
+		std::string::size_type const rhs = (isMultiline ? line.length() : static_cast<size_t>(end.column)) - 35;
 		line = line.substr(0, lhs) + " ... " + line.substr(rhs);
 		end.column = start.column + 75;
 		locationLength = 75;
@@ -98,9 +97,9 @@ SourceReference SourceReferenceExtractor::extract(
 	{
 		int const len = static_cast<int>(line.length());
 		line = line.substr(
-			static_cast<size_t>(max(0, start.column - 35)),
-			static_cast<size_t>(min(start.column, 35)) + static_cast<size_t>(
-				min(locationLength + 35, len - start.column)
+			static_cast<size_t>(std::max(0, start.column - 35)),
+			static_cast<size_t>(std::min(start.column, 35)) + static_cast<size_t>(
+				std::min(locationLength + 35, len - start.column)
 			)
 		);
 		if (start.column + locationLength + 35 < len)
@@ -119,7 +118,7 @@ SourceReference SourceReferenceExtractor::extract(
 		interest,
 		isMultiline,
 		line,
-		min(start.column, static_cast<int>(line.length())),
-		min(end.column, static_cast<int>(line.length()))
+		std::min(start.column, static_cast<int>(line.length())),
+		std::min(end.column, static_cast<int>(line.length()))
 	};
 }
diff --git a/liblangutil/SourceReferenceFormatter.cpp b/liblangutil/SourceReferenceFormatter.cpp
index 4765b9fb24..76cb1df61a 100644
--- a/liblangutil/SourceReferenceFormatter.cpp
+++ b/liblangutil/SourceReferenceFormatter.cpp
@@ -28,7 +28,6 @@
 #include <string_view>
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::util;
@@ -114,15 +113,15 @@ void SourceReferenceFormatter::printSourceLocation(SourceReference const& _ref)
 		return; // No line available, nothing else to print
 	}
 
-	string line = std::to_string(_ref.position.line + 1); // one-based line number as string
-	string leftpad = string(line.size(), ' ');
+	std::string line = std::to_string(_ref.position.line + 1); // one-based line number as string
+	std::string leftpad = std::string(line.size(), ' ');
 
 	// line 0: source name
 	m_stream << leftpad;
 	frameColored() << "-->";
 	m_stream << ' ' << _ref.sourceName << ':' << line << ':' << (_ref.position.column + 1) << ":\n";
 
-	string_view text = _ref.text;
+	std::string_view text = _ref.text;
 
 	if (m_charStreamProvider.charStream(_ref.sourceName).isImportedFromAST())
 		return;
diff --git a/liblangutil/Token.cpp b/liblangutil/Token.cpp
index 60b8aa7987..8a860791fa 100644
--- a/liblangutil/Token.cpp
+++ b/liblangutil/Token.cpp
@@ -46,8 +46,6 @@
 
 #include <map>
 
-using namespace std;
-
 namespace solidity::langutil
 {
 
@@ -71,25 +69,25 @@ std::string ElementaryTypeNameToken::toString(bool const& tokenValue) const
 
 void ElementaryTypeNameToken::assertDetails(Token _baseType, unsigned const& _first, unsigned const& _second)
 {
-	solAssert(TokenTraits::isElementaryTypeName(_baseType), "Expected elementary type name: " + string(TokenTraits::toString(_baseType)));
+	solAssert(TokenTraits::isElementaryTypeName(_baseType), "Expected elementary type name: " + std::string(TokenTraits::toString(_baseType)));
 	if (_baseType == Token::BytesM)
 	{
 		solAssert(_second == 0, "There should not be a second size argument to type bytesM.");
-		solAssert(_first <= 32, "No elementary type bytes" + to_string(_first) + ".");
+		solAssert(_first <= 32, "No elementary type bytes" + std::to_string(_first) + ".");
 	}
 	else if (_baseType == Token::UIntM || _baseType == Token::IntM)
 	{
-		solAssert(_second == 0, "There should not be a second size argument to type " + string(TokenTraits::toString(_baseType)) + ".");
+		solAssert(_second == 0, "There should not be a second size argument to type " + std::string(TokenTraits::toString(_baseType)) + ".");
 		solAssert(
 			_first <= 256 && _first % 8 == 0,
-			"No elementary type " + string(TokenTraits::toString(_baseType)) + to_string(_first) + "."
+			"No elementary type " + std::string(TokenTraits::toString(_baseType)) + std::to_string(_first) + "."
 		);
 	}
 	else if (_baseType == Token::UFixedMxN || _baseType == Token::FixedMxN)
 	{
 		solAssert(
 			_first >= 8 && _first <= 256 && _first % 8 == 0 && _second <= 80,
-			"No elementary type " + string(TokenTraits::toString(_baseType)) + to_string(_first) + "x" + to_string(_second) + "."
+			"No elementary type " + std::string(TokenTraits::toString(_baseType)) + std::to_string(_first) + "x" + std::to_string(_second) + "."
 		);
 	}
 	else
@@ -136,29 +134,29 @@ std::string friendlyName(Token tok)
 }
 
 
-static Token keywordByName(string const& _name)
+static Token keywordByName(std::string const& _name)
 {
 	// The following macros are used inside TOKEN_LIST and cause non-keyword tokens to be ignored
 	// and keywords to be put inside the keywords variable.
 #define KEYWORD(name, string, precedence) {string, Token::name},
 #define TOKEN(name, string, precedence)
-	static map<string, Token> const keywords({TOKEN_LIST(TOKEN, KEYWORD)});
+	static std::map<std::string, Token> const keywords({TOKEN_LIST(TOKEN, KEYWORD)});
 #undef KEYWORD
 #undef TOKEN
 	auto it = keywords.find(_name);
 	return it == keywords.end() ? Token::Identifier : it->second;
 }
 
-bool isYulKeyword(string const& _literal)
+bool isYulKeyword(std::string const& _literal)
 {
 	return _literal == "leave" || isYulKeyword(keywordByName(_literal));
 }
 
-tuple<Token, unsigned int, unsigned int> fromIdentifierOrKeyword(string const& _literal)
+std::tuple<Token, unsigned int, unsigned int> fromIdentifierOrKeyword(std::string const& _literal)
 {
 	// Used for `bytesM`, `uintM`, `intM`, `fixedMxN`, `ufixedMxN`.
 	// M/N must be shortest representation. M can never be 0. N can be zero.
-	auto parseSize = [](string::const_iterator _begin, string::const_iterator _end) -> int
+	auto parseSize = [](std::string::const_iterator _begin, std::string::const_iterator _end) -> int
 	{
 		// No number.
 		if (distance(_begin, _end) == 0)
@@ -185,23 +183,23 @@ tuple<Token, unsigned int, unsigned int> fromIdentifierOrKeyword(string const& _
 	auto positionM = find_if(_literal.begin(), _literal.end(), util::isDigit);
 	if (positionM != _literal.end())
 	{
-		string baseType(_literal.begin(), positionM);
+		std::string baseType(_literal.begin(), positionM);
 		auto positionX = find_if_not(positionM, _literal.end(), util::isDigit);
 		int m = parseSize(positionM, positionX);
 		Token keyword = keywordByName(baseType);
 		if (keyword == Token::Bytes)
 		{
 			if (0 < m && m <= 32 && positionX == _literal.end())
-				return make_tuple(Token::BytesM, m, 0);
+				return std::make_tuple(Token::BytesM, m, 0);
 		}
 		else if (keyword == Token::UInt || keyword == Token::Int)
 		{
 			if (0 < m && m <= 256 && m % 8 == 0 && positionX == _literal.end())
 			{
 				if (keyword == Token::UInt)
-					return make_tuple(Token::UIntM, m, 0);
+					return std::make_tuple(Token::UIntM, m, 0);
 				else
-					return make_tuple(Token::IntM, m, 0);
+					return std::make_tuple(Token::IntM, m, 0);
 			}
 		}
 		else if (keyword == Token::UFixed || keyword == Token::Fixed)
@@ -218,16 +216,16 @@ tuple<Token, unsigned int, unsigned int> fromIdentifierOrKeyword(string const& _
 					0 <= n && n <= 80
 				) {
 					if (keyword == Token::UFixed)
-						return make_tuple(Token::UFixedMxN, m, n);
+						return std::make_tuple(Token::UFixedMxN, m, n);
 					else
-						return make_tuple(Token::FixedMxN, m, n);
+						return std::make_tuple(Token::FixedMxN, m, n);
 				}
 			}
 		}
-		return make_tuple(Token::Identifier, 0, 0);
+		return std::make_tuple(Token::Identifier, 0, 0);
 	}
 
-	return make_tuple(keywordByName(_literal), 0, 0);
+	return std::make_tuple(keywordByName(_literal), 0, 0);
 }
 
 }
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 0d5fe18268..bd9fbf0056 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -22,6 +22,7 @@ EXCLUDE_FILES_JOINED=${EXCLUDE_FILES_JOINED%??}
 
 NAMESPACE_STD_FREE_FILES=(
     libevmasm/*
+    liblangutil/*
 )
 
 (

From 62723b7534bcd0975e8c926978b7b27d6dc035f7 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 12 Jul 2023 14:09:19 +0200
Subject: [PATCH 1478/1748] Purge using namespace std in libsmtutil and libsolc

---
 libsmtutil/CHCSmtLib2Interface.cpp | 43 ++++++++--------
 libsmtutil/CVC4Interface.cpp       | 29 ++++++-----
 libsmtutil/SMTLib2Interface.cpp    | 79 +++++++++++++++---------------
 libsmtutil/SMTPortfolio.cpp        | 25 +++++-----
 libsmtutil/Sorts.cpp               | 12 ++---
 libsmtutil/Z3CHCInterface.cpp      | 33 ++++++-------
 libsmtutil/Z3Interface.cpp         | 49 +++++++++---------
 libsmtutil/Z3Loader.cpp            |  5 +-
 libsolc/libsolc.cpp                | 21 ++++----
 scripts/check_style.sh             |  2 +
 10 files changed, 145 insertions(+), 153 deletions(-)

diff --git a/libsmtutil/CHCSmtLib2Interface.cpp b/libsmtutil/CHCSmtLib2Interface.cpp
index 4229cf5d66..ef7c56ac0c 100644
--- a/libsmtutil/CHCSmtLib2Interface.cpp
+++ b/libsmtutil/CHCSmtLib2Interface.cpp
@@ -31,20 +31,19 @@
 #include <memory>
 #include <stdexcept>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
 using namespace solidity::smtutil;
 
 CHCSmtLib2Interface::CHCSmtLib2Interface(
-	map<h256, string> const& _queryResponses,
+	std::map<h256, std::string> const& _queryResponses,
 	ReadCallback::Callback _smtCallback,
 	SMTSolverChoice _enabledSolvers,
-	optional<unsigned> _queryTimeout
+	std::optional<unsigned> _queryTimeout
 ):
 	CHCSolverInterface(_queryTimeout),
-	m_smtlib2(make_unique<SMTLib2Interface>(_queryResponses, _smtCallback, m_queryTimeout)),
+	m_smtlib2(std::make_unique<SMTLib2Interface>(_queryResponses, _smtCallback, m_queryTimeout)),
 	m_queryResponses(std::move(_queryResponses)),
 	m_smtCallback(_smtCallback),
 	m_enabledSolvers(_enabledSolvers)
@@ -66,8 +65,8 @@ void CHCSmtLib2Interface::registerRelation(Expression const& _expr)
 	smtAssert(_expr.sort->kind == Kind::Function);
 	if (!m_variables.count(_expr.name))
 	{
-		auto fSort = dynamic_pointer_cast<FunctionSort>(_expr.sort);
-		string domain = toSmtLibSort(fSort->domain);
+		auto fSort = std::dynamic_pointer_cast<FunctionSort>(_expr.sort);
+		std::string domain = toSmtLibSort(fSort->domain);
 		// Relations are predicates which have implicit codomain Bool.
 		m_variables.insert(_expr.name);
 		write(
@@ -89,10 +88,10 @@ void CHCSmtLib2Interface::addRule(Expression const& _expr, std::string const& /*
 	);
 }
 
-tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Interface::query(Expression const& _block)
+std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Interface::query(Expression const& _block)
 {
-	string query = dumpQuery(_block);
-	string response = querySolver(query);
+	std::string query = dumpQuery(_block);
+	std::string response = querySolver(query);
 
 	CheckResult result;
 	// TODO proper parsing
@@ -108,7 +107,7 @@ tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> CHCSmtLib2Interface
 	return {result, Expression(true), {}};
 }
 
-void CHCSmtLib2Interface::declareVariable(string const& _name, SortPointer const& _sort)
+void CHCSmtLib2Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
 {
 	smtAssert(_sort);
 	if (_sort->kind == Kind::Function)
@@ -120,25 +119,25 @@ void CHCSmtLib2Interface::declareVariable(string const& _name, SortPointer const
 	}
 }
 
-string CHCSmtLib2Interface::toSmtLibSort(Sort const& _sort)
+std::string CHCSmtLib2Interface::toSmtLibSort(Sort const& _sort)
 {
 	if (!m_sortNames.count(&_sort))
 		m_sortNames[&_sort] = m_smtlib2->toSmtLibSort(_sort);
 	return m_sortNames.at(&_sort);
 }
 
-string CHCSmtLib2Interface::toSmtLibSort(vector<SortPointer> const& _sorts)
+std::string CHCSmtLib2Interface::toSmtLibSort(std::vector<SortPointer> const& _sorts)
 {
-	string ssort("(");
+	std::string ssort("(");
 	for (auto const& sort: _sorts)
 		ssort += toSmtLibSort(*sort) + " ";
 	ssort += ")";
 	return ssort;
 }
 
-string CHCSmtLib2Interface::forall()
+std::string CHCSmtLib2Interface::forall()
 {
-	string vars("(");
+	std::string vars("(");
 	for (auto const& [name, sort]: m_smtlib2->variables())
 	{
 		solAssert(sort, "");
@@ -149,17 +148,17 @@ string CHCSmtLib2Interface::forall()
 	return vars;
 }
 
-void CHCSmtLib2Interface::declareFunction(string const& _name, SortPointer const& _sort)
+void CHCSmtLib2Interface::declareFunction(std::string const& _name, SortPointer const& _sort)
 {
 	smtAssert(_sort);
 	smtAssert(_sort->kind == Kind::Function);
 	// TODO Use domain and codomain as key as well
 	if (!m_variables.count(_name))
 	{
-		auto fSort = dynamic_pointer_cast<FunctionSort>(_sort);
+		auto fSort = std::dynamic_pointer_cast<FunctionSort>(_sort);
 		smtAssert(fSort->codomain);
-		string domain = toSmtLibSort(fSort->domain);
-		string codomain = toSmtLibSort(*fSort->codomain);
+		std::string domain = toSmtLibSort(fSort->domain);
+		std::string codomain = toSmtLibSort(*fSort->codomain);
 		m_variables.insert(_name);
 		write(
 			"(declare-fun |" +
@@ -173,12 +172,12 @@ void CHCSmtLib2Interface::declareFunction(string const& _name, SortPointer const
 	}
 }
 
-void CHCSmtLib2Interface::write(string _data)
+void CHCSmtLib2Interface::write(std::string _data)
 {
 	m_accumulatedOutput += std::move(_data) + "\n";
 }
 
-string CHCSmtLib2Interface::querySolver(string const& _input)
+std::string CHCSmtLib2Interface::querySolver(std::string const& _input)
 {
 	util::h256 inputHash = util::keccak256(_input);
 	if (m_queryResponses.count(inputHash))
@@ -212,7 +211,7 @@ std::string CHCSmtLib2Interface::dumpQuery(Expression const& _expr)
 std::string CHCSmtLib2Interface::createHeaderAndDeclarations() {
 	std::stringstream s;
 	if (m_queryTimeout)
-		s << "(set-option :timeout " + to_string(*m_queryTimeout) + ")\n";
+		s << "(set-option :timeout " + std::to_string(*m_queryTimeout) + ")\n";
 	s << "(set-logic HORN)" << std::endl;
 
 	for (auto const& decl: m_smtlib2->userSorts() | ranges::views::values)
diff --git a/libsmtutil/CVC4Interface.cpp b/libsmtutil/CVC4Interface.cpp
index 3c047782a4..f53c92ab57 100644
--- a/libsmtutil/CVC4Interface.cpp
+++ b/libsmtutil/CVC4Interface.cpp
@@ -23,12 +23,11 @@
 
 #include <cvc4/util/bitvector.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::smtutil;
 
-CVC4Interface::CVC4Interface(optional<unsigned> _queryTimeout):
+CVC4Interface::CVC4Interface(std::optional<unsigned> _queryTimeout):
 	SolverInterface(_queryTimeout),
 	m_solver(&m_context)
 {
@@ -56,7 +55,7 @@ void CVC4Interface::pop()
 	m_solver.pop();
 }
 
-void CVC4Interface::declareVariable(string const& _name, SortPointer const& _sort)
+void CVC4Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
 {
 	smtAssert(_sort, "");
 	m_variables[_name] = m_context.mkVar(_name.c_str(), cvc4Sort(*_sort));
@@ -86,10 +85,10 @@ void CVC4Interface::addAssertion(Expression const& _expr)
 	}
 }
 
-pair<CheckResult, vector<string>> CVC4Interface::check(vector<Expression> const& _expressionsToEvaluate)
+std::pair<CheckResult, std::vector<std::string>> CVC4Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
 {
 	CheckResult result;
-	vector<string> values;
+	std::vector<std::string> values;
 	try
 	{
 		switch (m_solver.checkSat().isSat())
@@ -119,7 +118,7 @@ pair<CheckResult, vector<string>> CVC4Interface::check(vector<Expression> const&
 		values.clear();
 	}
 
-	return make_pair(result, values);
+	return std::make_pair(result, values);
 }
 
 CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
@@ -128,13 +127,13 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 	if (_expr.arguments.empty() && m_variables.count(_expr.name))
 		return m_variables.at(_expr.name);
 
-	vector<CVC4::Expr> arguments;
+	std::vector<CVC4::Expr> arguments;
 	for (auto const& arg: _expr.arguments)
 		arguments.push_back(toCVC4Expr(arg));
 
 	try
 	{
-		string const& n = _expr.name;
+		std::string const& n = _expr.name;
 		// Function application
 		if (!arguments.empty() && m_variables.count(_expr.name))
 			return m_context.mkExpr(CVC4::kind::APPLY_UF, m_variables.at(n), arguments);
@@ -145,7 +144,7 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 				return m_context.mkConst(true);
 			else if (n == "false")
 				return m_context.mkConst(false);
-			else if (auto sortSort = dynamic_pointer_cast<SortSort>(_expr.sort))
+			else if (auto sortSort = std::dynamic_pointer_cast<SortSort>(_expr.sort))
 				return m_context.mkVar(n, cvc4Sort(*sortSort->inner));
 			else
 				try
@@ -224,7 +223,7 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 		}
 		else if (n == "bv2int")
 		{
-			auto intSort = dynamic_pointer_cast<IntSort>(_expr.sort);
+			auto intSort = std::dynamic_pointer_cast<IntSort>(_expr.sort);
 			smtAssert(intSort, "");
 			auto nat = m_context.mkExpr(CVC4::kind::BITVECTOR_TO_NAT, arguments[0]);
 			if (!intSort->isSigned)
@@ -254,13 +253,13 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 			return m_context.mkExpr(CVC4::kind::STORE, arguments[0], arguments[1], arguments[2]);
 		else if (n == "const_array")
 		{
-			shared_ptr<SortSort> sortSort = std::dynamic_pointer_cast<SortSort>(_expr.arguments[0].sort);
+			std::shared_ptr<SortSort> sortSort = std::dynamic_pointer_cast<SortSort>(_expr.arguments[0].sort);
 			smtAssert(sortSort, "");
 			return m_context.mkConst(CVC4::ArrayStoreAll(cvc4Sort(*sortSort->inner), arguments[1]));
 		}
 		else if (n == "tuple_get")
 		{
-			shared_ptr<TupleSort> tupleSort = std::dynamic_pointer_cast<TupleSort>(_expr.arguments[0].sort);
+			std::shared_ptr<TupleSort> tupleSort = std::dynamic_pointer_cast<TupleSort>(_expr.arguments[0].sort);
 			smtAssert(tupleSort, "");
 			CVC4::DatatypeType tt = m_context.mkTupleType(cvc4Sort(tupleSort->components));
 			CVC4::Datatype const& dt = tt.getDatatype();
@@ -270,7 +269,7 @@ CVC4::Expr CVC4Interface::toCVC4Expr(Expression const& _expr)
 		}
 		else if (n == "tuple_constructor")
 		{
-			shared_ptr<TupleSort> tupleSort = std::dynamic_pointer_cast<TupleSort>(_expr.sort);
+			std::shared_ptr<TupleSort> tupleSort = std::dynamic_pointer_cast<TupleSort>(_expr.sort);
 			smtAssert(tupleSort, "");
 			CVC4::DatatypeType tt = m_context.mkTupleType(cvc4Sort(tupleSort->components));
 			CVC4::Datatype const& dt = tt.getDatatype();
@@ -328,9 +327,9 @@ CVC4::Type CVC4Interface::cvc4Sort(Sort const& _sort)
 	return m_context.integerType();
 }
 
-vector<CVC4::Type> CVC4Interface::cvc4Sort(vector<SortPointer> const& _sorts)
+std::vector<CVC4::Type> CVC4Interface::cvc4Sort(std::vector<SortPointer> const& _sorts)
 {
-	vector<CVC4::Type> cvc4Sorts;
+	std::vector<CVC4::Type> cvc4Sorts;
 	for (auto const& _sort: _sorts)
 		cvc4Sorts.push_back(cvc4Sort(*_sort));
 	return cvc4Sorts;
diff --git a/libsmtutil/SMTLib2Interface.cpp b/libsmtutil/SMTLib2Interface.cpp
index 85103d00eb..ac5645bf12 100644
--- a/libsmtutil/SMTLib2Interface.cpp
+++ b/libsmtutil/SMTLib2Interface.cpp
@@ -33,16 +33,15 @@
 #include <string>
 #include <utility>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
 using namespace solidity::smtutil;
 
 SMTLib2Interface::SMTLib2Interface(
-	map<h256, string> _queryResponses,
+	std::map<h256, std::string> _queryResponses,
 	ReadCallback::Callback _smtCallback,
-	optional<unsigned> _queryTimeout
+	std::optional<unsigned> _queryTimeout
 ):
 	SolverInterface(_queryTimeout),
 	m_queryResponses(std::move(_queryResponses)),
@@ -59,7 +58,7 @@ void SMTLib2Interface::reset()
 	m_userSorts.clear();
 	write("(set-option :produce-models true)");
 	if (m_queryTimeout)
-		write("(set-option :timeout " + to_string(*m_queryTimeout) + ")");
+		write("(set-option :timeout " + std::to_string(*m_queryTimeout) + ")");
 	write("(set-logic ALL)");
 }
 
@@ -74,7 +73,7 @@ void SMTLib2Interface::pop()
 	m_accumulatedOutput.pop_back();
 }
 
-void SMTLib2Interface::declareVariable(string const& _name, SortPointer const& _sort)
+void SMTLib2Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
 {
 	smtAssert(_sort, "");
 	if (_sort->kind == Kind::Function)
@@ -86,16 +85,16 @@ void SMTLib2Interface::declareVariable(string const& _name, SortPointer const& _
 	}
 }
 
-void SMTLib2Interface::declareFunction(string const& _name, SortPointer const& _sort)
+void SMTLib2Interface::declareFunction(std::string const& _name, SortPointer const& _sort)
 {
 	smtAssert(_sort, "");
 	smtAssert(_sort->kind == Kind::Function, "");
 	// TODO Use domain and codomain as key as well
 	if (!m_variables.count(_name))
 	{
-		auto const& fSort = dynamic_pointer_cast<FunctionSort>(_sort);
-		string domain = toSmtLibSort(fSort->domain);
-		string codomain = toSmtLibSort(*fSort->codomain);
+		auto const& fSort = std::dynamic_pointer_cast<FunctionSort>(_sort);
+		std::string domain = toSmtLibSort(fSort->domain);
+		std::string codomain = toSmtLibSort(*fSort->codomain);
 		m_variables.emplace(_name, _sort);
 		write(
 			"(declare-fun |" +
@@ -114,9 +113,9 @@ void SMTLib2Interface::addAssertion(Expression const& _expr)
 	write("(assert " + toSExpr(_expr) + ")");
 }
 
-pair<CheckResult, vector<string>> SMTLib2Interface::check(vector<Expression> const& _expressionsToEvaluate)
+std::pair<CheckResult, std::vector<std::string>> SMTLib2Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
 {
-	string response = querySolver(
+	std::string response = querySolver(
 		boost::algorithm::join(m_accumulatedOutput, "\n") +
 		checkSatAndGetValuesCommand(_expressionsToEvaluate)
 	);
@@ -132,13 +131,13 @@ pair<CheckResult, vector<string>> SMTLib2Interface::check(vector<Expression> con
 	else
 		result = CheckResult::ERROR;
 
-	vector<string> values;
+	std::vector<std::string> values;
 	if (result == CheckResult::SATISFIABLE && !_expressionsToEvaluate.empty())
 		values = parseValues(find(response.cbegin(), response.cend(), '\n'), response.cend());
-	return make_pair(result, values);
+	return std::make_pair(result, values);
 }
 
-string SMTLib2Interface::toSExpr(Expression const& _expr)
+std::string SMTLib2Interface::toSExpr(Expression const& _expr)
 {
 	if (_expr.arguments.empty())
 		return _expr.name;
@@ -148,16 +147,16 @@ string SMTLib2Interface::toSExpr(Expression const& _expr)
 	{
 		size_t size = std::stoul(_expr.arguments[1].name);
 		auto arg = toSExpr(_expr.arguments.front());
-		auto int2bv = "(_ int2bv " + to_string(size) + ")";
+		auto int2bv = "(_ int2bv " + std::to_string(size) + ")";
 		// Some solvers treat all BVs as unsigned, so we need to manually apply 2's complement if needed.
-		sexpr += string("ite ") +
+		sexpr += std::string("ite ") +
 			"(>= " + arg + " 0) " +
 			"(" + int2bv + " " + arg + ") " +
 			"(bvneg (" + int2bv + " (- " + arg + ")))";
 	}
 	else if (_expr.name == "bv2int")
 	{
-		auto intSort = dynamic_pointer_cast<IntSort>(_expr.sort);
+		auto intSort = std::dynamic_pointer_cast<IntSort>(_expr.sort);
 		smtAssert(intSort, "");
 
 		auto arg = toSExpr(_expr.arguments.front());
@@ -166,13 +165,13 @@ string SMTLib2Interface::toSExpr(Expression const& _expr)
 		if (!intSort->isSigned)
 			return nat;
 
-		auto bvSort = dynamic_pointer_cast<BitVectorSort>(_expr.arguments.front().sort);
+		auto bvSort = std::dynamic_pointer_cast<BitVectorSort>(_expr.arguments.front().sort);
 		smtAssert(bvSort, "");
-		auto size = to_string(bvSort->size);
-		auto pos = to_string(bvSort->size - 1);
+		auto size = std::to_string(bvSort->size);
+		auto pos = std::to_string(bvSort->size - 1);
 
 		// Some solvers treat all BVs as unsigned, so we need to manually apply 2's complement if needed.
-		sexpr += string("ite ") +
+		sexpr += std::string("ite ") +
 			"(= ((_ extract " + pos + " " + pos + ")" + arg + ") #b0) " +
 			nat + " " +
 			"(- (bv2nat (bvneg " + arg + ")))";
@@ -182,7 +181,7 @@ string SMTLib2Interface::toSExpr(Expression const& _expr)
 		smtAssert(_expr.arguments.size() == 2, "");
 		auto sortSort = std::dynamic_pointer_cast<SortSort>(_expr.arguments.at(0).sort);
 		smtAssert(sortSort, "");
-		auto arraySort = dynamic_pointer_cast<ArraySort>(sortSort->inner);
+		auto arraySort = std::dynamic_pointer_cast<ArraySort>(sortSort->inner);
 		smtAssert(arraySort, "");
 		sexpr += "(as const " + toSmtLibSort(*arraySort) + ") ";
 		sexpr += toSExpr(_expr.arguments.at(1));
@@ -190,14 +189,14 @@ string SMTLib2Interface::toSExpr(Expression const& _expr)
 	else if (_expr.name == "tuple_get")
 	{
 		smtAssert(_expr.arguments.size() == 2, "");
-		auto tupleSort = dynamic_pointer_cast<TupleSort>(_expr.arguments.at(0).sort);
+		auto tupleSort = std::dynamic_pointer_cast<TupleSort>(_expr.arguments.at(0).sort);
 		size_t index = std::stoul(_expr.arguments.at(1).name);
 		smtAssert(index < tupleSort->members.size(), "");
 		sexpr += "|" + tupleSort->members.at(index) + "| " + toSExpr(_expr.arguments.at(0));
 	}
 	else if (_expr.name == "tuple_constructor")
 	{
-		auto tupleSort = dynamic_pointer_cast<TupleSort>(_expr.sort);
+		auto tupleSort = std::dynamic_pointer_cast<TupleSort>(_expr.sort);
 		smtAssert(tupleSort, "");
 		sexpr += "|" + tupleSort->name + "|";
 		for (auto const& arg: _expr.arguments)
@@ -213,7 +212,7 @@ string SMTLib2Interface::toSExpr(Expression const& _expr)
 	return sexpr;
 }
 
-string SMTLib2Interface::toSmtLibSort(Sort const& _sort)
+std::string SMTLib2Interface::toSmtLibSort(Sort const& _sort)
 {
 	switch (_sort.kind)
 	{
@@ -222,7 +221,7 @@ string SMTLib2Interface::toSmtLibSort(Sort const& _sort)
 	case Kind::Bool:
 		return "Bool";
 	case Kind::BitVector:
-		return "(_ BitVec " + to_string(dynamic_cast<BitVectorSort const&>(_sort).size) + ")";
+		return "(_ BitVec " + std::to_string(dynamic_cast<BitVectorSort const&>(_sort).size) + ")";
 	case Kind::Array:
 	{
 		auto const& arraySort = dynamic_cast<ArraySort const&>(_sort);
@@ -232,11 +231,11 @@ string SMTLib2Interface::toSmtLibSort(Sort const& _sort)
 	case Kind::Tuple:
 	{
 		auto const& tupleSort = dynamic_cast<TupleSort const&>(_sort);
-		string tupleName = "|" + tupleSort.name + "|";
+		std::string tupleName = "|" + tupleSort.name + "|";
 		auto isName = [&](auto entry) { return entry.first == tupleName; };
 		if (ranges::find_if(m_userSorts, isName) == m_userSorts.end())
 		{
-			string decl("(declare-datatypes ((" + tupleName + " 0)) (((" + tupleName);
+			std::string decl("(declare-datatypes ((" + tupleName + " 0)) (((" + tupleName);
 			smtAssert(tupleSort.members.size() == tupleSort.components.size(), "");
 			for (unsigned i = 0; i < tupleSort.members.size(); ++i)
 				decl += " (|" + tupleSort.members.at(i) + "| " + toSmtLibSort(*tupleSort.components.at(i)) + ")";
@@ -252,24 +251,24 @@ string SMTLib2Interface::toSmtLibSort(Sort const& _sort)
 	}
 }
 
-string SMTLib2Interface::toSmtLibSort(vector<SortPointer> const& _sorts)
+std::string SMTLib2Interface::toSmtLibSort(std::vector<SortPointer> const& _sorts)
 {
-	string ssort("(");
+	std::string ssort("(");
 	for (auto const& sort: _sorts)
 		ssort += toSmtLibSort(*sort) + " ";
 	ssort += ")";
 	return ssort;
 }
 
-void SMTLib2Interface::write(string _data)
+void SMTLib2Interface::write(std::string _data)
 {
 	smtAssert(!m_accumulatedOutput.empty(), "");
 	m_accumulatedOutput.back() += std::move(_data) + "\n";
 }
 
-string SMTLib2Interface::checkSatAndGetValuesCommand(vector<Expression> const& _expressionsToEvaluate)
+std::string SMTLib2Interface::checkSatAndGetValuesCommand(std::vector<Expression> const& _expressionsToEvaluate)
 {
-	string command;
+	std::string command;
 	if (_expressionsToEvaluate.empty())
 		command = "(check-sat)\n";
 	else
@@ -279,22 +278,22 @@ string SMTLib2Interface::checkSatAndGetValuesCommand(vector<Expression> const& _
 		{
 			auto const& e = _expressionsToEvaluate.at(i);
 			smtAssert(e.sort->kind == Kind::Int || e.sort->kind == Kind::Bool, "Invalid sort for expression to evaluate.");
-			command += "(declare-const |EVALEXPR_" + to_string(i) + "| " + (e.sort->kind == Kind::Int ? "Int" : "Bool") + ")\n";
-			command += "(assert (= |EVALEXPR_" + to_string(i) + "| " + toSExpr(e) + "))\n";
+			command += "(declare-const |EVALEXPR_" + std::to_string(i) + "| " + (e.sort->kind == Kind::Int ? "Int" : "Bool") + ")\n";
+			command += "(assert (= |EVALEXPR_" + std::to_string(i) + "| " + toSExpr(e) + "))\n";
 		}
 		command += "(check-sat)\n";
 		command += "(get-value (";
 		for (size_t i = 0; i < _expressionsToEvaluate.size(); i++)
-			command += "|EVALEXPR_" + to_string(i) + "| ";
+			command += "|EVALEXPR_" + std::to_string(i) + "| ";
 		command += "))\n";
 	}
 
 	return command;
 }
 
-vector<string> SMTLib2Interface::parseValues(string::const_iterator _start, string::const_iterator _end)
+std::vector<std::string> SMTLib2Interface::parseValues(std::string::const_iterator _start, std::string::const_iterator _end)
 {
-	vector<string> values;
+	std::vector<std::string> values;
 	while (_start < _end)
 	{
 		auto valStart = find(_start, _end, ' ');
@@ -308,7 +307,7 @@ vector<string> SMTLib2Interface::parseValues(string::const_iterator _start, stri
 	return values;
 }
 
-string SMTLib2Interface::querySolver(string const& _input)
+std::string SMTLib2Interface::querySolver(std::string const& _input)
 {
 	h256 inputHash = keccak256(_input);
 	if (m_queryResponses.count(inputHash))
@@ -323,7 +322,7 @@ string SMTLib2Interface::querySolver(string const& _input)
 	return "unknown\n";
 }
 
-string SMTLib2Interface::dumpQuery(vector<Expression> const& _expressionsToEvaluate)
+std::string SMTLib2Interface::dumpQuery(std::vector<Expression> const& _expressionsToEvaluate)
 {
 	return boost::algorithm::join(m_accumulatedOutput, "\n") +
 		checkSatAndGetValuesCommand(_expressionsToEvaluate);
diff --git a/libsmtutil/SMTPortfolio.cpp b/libsmtutil/SMTPortfolio.cpp
index be961d01f6..76c69d0180 100644
--- a/libsmtutil/SMTPortfolio.cpp
+++ b/libsmtutil/SMTPortfolio.cpp
@@ -26,31 +26,30 @@
 #endif
 #include <libsmtutil/SMTLib2Interface.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
 using namespace solidity::smtutil;
 
 SMTPortfolio::SMTPortfolio(
-	map<h256, string> _smtlib2Responses,
+	std::map<h256, std::string> _smtlib2Responses,
 	frontend::ReadCallback::Callback _smtCallback,
 	[[maybe_unused]] SMTSolverChoice _enabledSolvers,
-	optional<unsigned> _queryTimeout,
+	std::optional<unsigned> _queryTimeout,
 	bool _printQuery
 ):
 	SolverInterface(_queryTimeout)
 {
 	solAssert(!_printQuery || _enabledSolvers == smtutil::SMTSolverChoice::SMTLIB2(), "Only SMTLib2 solver can be enabled to print queries");
 	if (_enabledSolvers.smtlib2)
-		m_solvers.emplace_back(make_unique<SMTLib2Interface>(std::move(_smtlib2Responses), std::move(_smtCallback), m_queryTimeout));
+		m_solvers.emplace_back(std::make_unique<SMTLib2Interface>(std::move(_smtlib2Responses), std::move(_smtCallback), m_queryTimeout));
 #ifdef HAVE_Z3
 	if (_enabledSolvers.z3 && Z3Interface::available())
-		m_solvers.emplace_back(make_unique<Z3Interface>(m_queryTimeout));
+		m_solvers.emplace_back(std::make_unique<Z3Interface>(m_queryTimeout));
 #endif
 #ifdef HAVE_CVC4
 	if (_enabledSolvers.cvc4)
-		m_solvers.emplace_back(make_unique<CVC4Interface>(m_queryTimeout));
+		m_solvers.emplace_back(std::make_unique<CVC4Interface>(m_queryTimeout));
 #endif
 }
 
@@ -72,7 +71,7 @@ void SMTPortfolio::pop()
 		s->pop();
 }
 
-void SMTPortfolio::declareVariable(string const& _name, SortPointer const& _sort)
+void SMTPortfolio::declareVariable(std::string const& _name, SortPointer const& _sort)
 {
 	smtAssert(_sort, "");
 	for (auto const& s: m_solvers)
@@ -115,14 +114,14 @@ void SMTPortfolio::addAssertion(Expression const& _expr)
  *
  *   If all solvers return ERROR, the result is ERROR.
 */
-pair<CheckResult, vector<string>> SMTPortfolio::check(vector<Expression> const& _expressionsToEvaluate)
+std::pair<CheckResult, std::vector<std::string>> SMTPortfolio::check(std::vector<Expression> const& _expressionsToEvaluate)
 {
 	CheckResult lastResult = CheckResult::ERROR;
-	vector<string> finalValues;
+	std::vector<std::string> finalValues;
 	for (auto const& s: m_solvers)
 	{
 		CheckResult result;
-		vector<string> values;
+		std::vector<std::string> values;
 		tie(result, values) = s->check(_expressionsToEvaluate);
 		if (solverAnswered(result))
 		{
@@ -140,10 +139,10 @@ pair<CheckResult, vector<string>> SMTPortfolio::check(vector<Expression> const&
 		else if (result == CheckResult::UNKNOWN && lastResult == CheckResult::ERROR)
 			lastResult = result;
 	}
-	return make_pair(lastResult, finalValues);
+	return std::make_pair(lastResult, finalValues);
 }
 
-vector<string> SMTPortfolio::unhandledQueries()
+std::vector<std::string> SMTPortfolio::unhandledQueries()
 {
 	// This code assumes that the constructor guarantees that
 	// SmtLib2Interface is in position 0, if enabled.
@@ -158,7 +157,7 @@ bool SMTPortfolio::solverAnswered(CheckResult result)
 	return result == CheckResult::SATISFIABLE || result == CheckResult::UNSATISFIABLE;
 }
 
-string SMTPortfolio::dumpQuery(vector<Expression> const& _expressionsToEvaluate)
+std::string SMTPortfolio::dumpQuery(std::vector<Expression> const& _expressionsToEvaluate)
 {
 	// This code assumes that the constructor guarantees that
 	// SmtLib2Interface is in position 0, if enabled.
diff --git a/libsmtutil/Sorts.cpp b/libsmtutil/Sorts.cpp
index 543c7ba0f8..b45bb303c8 100644
--- a/libsmtutil/Sorts.cpp
+++ b/libsmtutil/Sorts.cpp
@@ -19,22 +19,20 @@
 
 #include <libsmtutil/Sorts.h>
 
-using namespace std;
-
 namespace solidity::smtutil
 {
 
-shared_ptr<Sort> const SortProvider::boolSort{make_shared<Sort>(Kind::Bool)};
-shared_ptr<IntSort> const SortProvider::uintSort{make_shared<IntSort>(false)};
-shared_ptr<IntSort> const SortProvider::sintSort{make_shared<IntSort>(true)};
+std::shared_ptr<Sort> const SortProvider::boolSort{std::make_shared<Sort>(Kind::Bool)};
+std::shared_ptr<IntSort> const SortProvider::uintSort{std::make_shared<IntSort>(false)};
+std::shared_ptr<IntSort> const SortProvider::sintSort{std::make_shared<IntSort>(true)};
 
-shared_ptr<IntSort> SortProvider::intSort(bool _signed)
+std::shared_ptr<IntSort> SortProvider::intSort(bool _signed)
 {
 	if (_signed)
 		return sintSort;
 	return uintSort;
 }
 
-shared_ptr<BitVectorSort> const SortProvider::bitVectorSort{make_shared<BitVectorSort>(256)};
+std::shared_ptr<BitVectorSort> const SortProvider::bitVectorSort{std::make_shared<BitVectorSort>(256)};
 
 }
diff --git a/libsmtutil/Z3CHCInterface.cpp b/libsmtutil/Z3CHCInterface.cpp
index bfbc9841b6..a25890e8d1 100644
--- a/libsmtutil/Z3CHCInterface.cpp
+++ b/libsmtutil/Z3CHCInterface.cpp
@@ -23,21 +23,20 @@
 #include <set>
 #include <stack>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::smtutil;
 
-Z3CHCInterface::Z3CHCInterface(optional<unsigned> _queryTimeout):
+Z3CHCInterface::Z3CHCInterface(std::optional<unsigned> _queryTimeout):
 	CHCSolverInterface(_queryTimeout),
-	m_z3Interface(make_unique<Z3Interface>(m_queryTimeout)),
+	m_z3Interface(std::make_unique<Z3Interface>(m_queryTimeout)),
 	m_context(m_z3Interface->context()),
 	m_solver(*m_context)
 {
 	Z3_get_version(
-		&get<0>(m_version),
-		&get<1>(m_version),
-		&get<2>(m_version),
-		&get<3>(m_version)
+		&std::get<0>(m_version),
+		&std::get<1>(m_version),
+		&std::get<2>(m_version),
+		&std::get<3>(m_version)
 	);
 
 	// These need to be set globally.
@@ -51,7 +50,7 @@ Z3CHCInterface::Z3CHCInterface(optional<unsigned> _queryTimeout):
 	setSpacerOptions();
 }
 
-void Z3CHCInterface::declareVariable(string const& _name, SortPointer const& _sort)
+void Z3CHCInterface::declareVariable(std::string const& _name, SortPointer const& _sort)
 {
 	smtAssert(_sort, "");
 	m_z3Interface->declareVariable(_name, _sort);
@@ -62,7 +61,7 @@ void Z3CHCInterface::registerRelation(Expression const& _expr)
 	m_solver.register_relation(m_z3Interface->functions().at(_expr.name));
 }
 
-void Z3CHCInterface::addRule(Expression const& _expr, string const& _name)
+void Z3CHCInterface::addRule(Expression const& _expr, std::string const& _name)
 {
 	z3::expr rule = m_z3Interface->toZ3Expr(_expr);
 	if (m_z3Interface->constants().empty())
@@ -77,7 +76,7 @@ void Z3CHCInterface::addRule(Expression const& _expr, string const& _name)
 	}
 }
 
-tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> Z3CHCInterface::query(Expression const& _expr)
+std::tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> Z3CHCInterface::query(Expression const& _expr)
 {
 	CheckResult result;
 	try
@@ -90,7 +89,7 @@ tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> Z3CHCInterface::que
 			result = CheckResult::SATISFIABLE;
 			// z3 version 4.8.8 modified Spacer to also return
 			// proofs containing nonlinear clauses.
-			if (m_version >= tuple(4, 8, 8, 0))
+			if (m_version >= std::tuple(4, 8, 8, 0))
 			{
 				auto proof = m_solver.get_answer();
 				return {result, Expression(true), cexGraph(proof)};
@@ -113,7 +112,7 @@ tuple<CheckResult, Expression, CHCSolverInterface::CexGraph> Z3CHCInterface::que
 	}
 	catch (z3::exception const& _err)
 	{
-		set<string> msgs{
+		std::set<std::string> msgs{
 			/// Resource limit (rlimit) exhausted.
 			"max. resource limit exceeded",
 			/// User given timeout exhausted.
@@ -178,13 +177,13 @@ CHCSolverInterface::CexGraph Z3CHCInterface::cexGraph(z3::expr const& _proof)
 
 	CexGraph graph;
 
-	stack<z3::expr> proofStack;
+	std::stack<z3::expr> proofStack;
 	proofStack.push(_proof.arg(0));
 
 	auto const& root = proofStack.top();
 	graph.nodes.emplace(root.id(), m_z3Interface->fromZ3Expr(fact(root)));
 
-	set<unsigned> visited;
+	std::set<unsigned> visited;
 	visited.insert(root.id());
 
 	while (!proofStack.empty())
@@ -227,16 +226,16 @@ z3::expr Z3CHCInterface::fact(z3::expr const& _node)
 	return _node.arg(_node.num_args() - 1);
 }
 
-string Z3CHCInterface::name(z3::expr const& _predicate)
+std::string Z3CHCInterface::name(z3::expr const& _predicate)
 {
 	smtAssert(_predicate.is_app(), "");
 	return _predicate.decl().name().str();
 }
 
-vector<string> Z3CHCInterface::arguments(z3::expr const& _predicate)
+std::vector<std::string> Z3CHCInterface::arguments(z3::expr const& _predicate)
 {
 	smtAssert(_predicate.is_app(), "");
-	vector<string> args;
+	std::vector<std::string> args;
 	for (unsigned i = 0; i < _predicate.num_args(); ++i)
 		args.emplace_back(_predicate.arg(i).to_string());
 	return args;
diff --git a/libsmtutil/Z3Interface.cpp b/libsmtutil/Z3Interface.cpp
index 21b31d19f8..a16e75668e 100644
--- a/libsmtutil/Z3Interface.cpp
+++ b/libsmtutil/Z3Interface.cpp
@@ -26,7 +26,6 @@
 #include <libsmtutil/Z3Loader.h>
 #endif
 
-using namespace std;
 using namespace solidity::smtutil;
 using namespace solidity::util;
 
@@ -69,7 +68,7 @@ void Z3Interface::pop()
 	m_solver.pop();
 }
 
-void Z3Interface::declareVariable(string const& _name, SortPointer const& _sort)
+void Z3Interface::declareVariable(std::string const& _name, SortPointer const& _sort)
 {
 	smtAssert(_sort, "");
 	if (_sort->kind == Kind::Function)
@@ -80,7 +79,7 @@ void Z3Interface::declareVariable(string const& _name, SortPointer const& _sort)
 		m_constants.emplace(_name, m_context.constant(_name.c_str(), z3Sort(*_sort)));
 }
 
-void Z3Interface::declareFunction(string const& _name, Sort const& _sort)
+void Z3Interface::declareFunction(std::string const& _name, Sort const& _sort)
 {
 	smtAssert(_sort.kind == Kind::Function, "");
 	FunctionSort fSort = dynamic_cast<FunctionSort const&>(_sort);
@@ -95,10 +94,10 @@ void Z3Interface::addAssertion(Expression const& _expr)
 	m_solver.add(toZ3Expr(_expr));
 }
 
-pair<CheckResult, vector<string>> Z3Interface::check(vector<Expression> const& _expressionsToEvaluate)
+std::pair<CheckResult, std::vector<std::string>> Z3Interface::check(std::vector<Expression> const& _expressionsToEvaluate)
 {
 	CheckResult result;
-	vector<string> values;
+	std::vector<std::string> values;
 	try
 	{
 		switch (m_solver.check())
@@ -123,7 +122,7 @@ pair<CheckResult, vector<string>> Z3Interface::check(vector<Expression> const& _
 	}
 	catch (z3::exception const& _err)
 	{
-		set<string> msgs{
+		std::set<std::string> msgs{
 			/// Resource limit (rlimit) exhausted.
 			"max. resource limit exceeded",
 			/// User given timeout exhausted.
@@ -137,7 +136,7 @@ pair<CheckResult, vector<string>> Z3Interface::check(vector<Expression> const& _
 		values.clear();
 	}
 
-	return make_pair(result, values);
+	return std::make_pair(result, values);
 }
 
 z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
@@ -150,7 +149,7 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
 
 	try
 	{
-		string const& n = _expr.name;
+		std::string const& n = _expr.name;
 		if (m_functions.count(n))
 			return m_functions.at(n)(arguments);
 		else if (m_constants.count(n))
@@ -166,7 +165,7 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
 				return m_context.bool_val(false);
 			else if (_expr.sort->kind == Kind::Sort)
 			{
-				auto sortSort = dynamic_pointer_cast<SortSort>(_expr.sort);
+				auto sortSort = std::dynamic_pointer_cast<SortSort>(_expr.sort);
 				smtAssert(sortSort, "");
 				return m_context.constant(n.c_str(), z3Sort(*sortSort->inner));
 			}
@@ -233,7 +232,7 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
 		}
 		else if (n == "bv2int")
 		{
-			auto intSort = dynamic_pointer_cast<IntSort>(_expr.sort);
+			auto intSort = std::dynamic_pointer_cast<IntSort>(_expr.sort);
 			smtAssert(intSort, "");
 			return z3::bv2int(arguments[0], intSort->isSigned);
 		}
@@ -243,9 +242,9 @@ z3::expr Z3Interface::toZ3Expr(Expression const& _expr)
 			return z3::store(arguments[0], arguments[1], arguments[2]);
 		else if (n == "const_array")
 		{
-			shared_ptr<SortSort> sortSort = std::dynamic_pointer_cast<SortSort>(_expr.arguments[0].sort);
+			std::shared_ptr<SortSort> sortSort = std::dynamic_pointer_cast<SortSort>(_expr.arguments[0].sort);
 			smtAssert(sortSort, "");
-			auto arraySort = dynamic_pointer_cast<ArraySort>(sortSort->inner);
+			auto arraySort = std::dynamic_pointer_cast<ArraySort>(sortSort->inner);
 			smtAssert(arraySort && arraySort->domain, "");
 			return z3::const_array(z3Sort(*arraySort->domain), arguments[1]);
 		}
@@ -285,7 +284,7 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 
 	if (_expr.is_quantifier())
 	{
-		string quantifierName;
+		std::string quantifierName;
 		if (_expr.is_exists())
 			quantifierName = "exists";
 		else if (_expr.is_forall())
@@ -297,7 +296,7 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 		return Expression(quantifierName, {fromZ3Expr(_expr.body())}, sort);
 	}
 	smtAssert(_expr.is_app(), "");
-	vector<Expression> arguments;
+	std::vector<Expression> arguments;
 	for (unsigned i = 0; i < _expr.num_args(); ++i)
 		arguments.push_back(fromZ3Expr(_expr.arg(i)));
 
@@ -370,12 +369,12 @@ Expression Z3Interface::fromZ3Expr(z3::expr const& _expr)
 		return Expression::store(arguments[0], arguments[1], arguments[2]);
 	else if (kind == Z3_OP_CONST_ARRAY)
 	{
-		auto sortSort = make_shared<SortSort>(fromZ3Sort(_expr.get_sort()));
+		auto sortSort = std::make_shared<SortSort>(fromZ3Sort(_expr.get_sort()));
 		return Expression::const_array(Expression(sortSort), arguments[0]);
 	}
 	else if (kind == Z3_OP_DT_CONSTRUCTOR)
 	{
-		auto sortSort = make_shared<SortSort>(fromZ3Sort(_expr.get_sort()));
+		auto sortSort = std::make_shared<SortSort>(fromZ3Sort(_expr.get_sort()));
 		return Expression::tuple_constructor(Expression(sortSort), arguments);
 	}
 	else if (kind == Z3_OP_DT_ACCESSOR)
@@ -412,12 +411,12 @@ z3::sort Z3Interface::z3Sort(Sort const& _sort)
 	case Kind::Tuple:
 	{
 		auto const& tupleSort = dynamic_cast<TupleSort const&>(_sort);
-		vector<char const*> cMembers;
+		std::vector<char const*> cMembers;
 		for (auto const& member: tupleSort.members)
 			cMembers.emplace_back(member.c_str());
 		/// Using this instead of the function below because with that one
 		/// we can't use `&sorts[0]` here.
-		vector<z3::sort> sorts;
+		std::vector<z3::sort> sorts;
 		for (auto const& sort: tupleSort.components)
 			sorts.push_back(z3Sort(*sort));
 		z3::func_decl_vector projs(m_context);
@@ -439,7 +438,7 @@ z3::sort Z3Interface::z3Sort(Sort const& _sort)
 	return m_context.int_sort();
 }
 
-z3::sort_vector Z3Interface::z3Sort(vector<SortPointer> const& _sorts)
+z3::sort_vector Z3Interface::z3Sort(std::vector<SortPointer> const& _sorts)
 {
 	z3::sort_vector z3Sorts(m_context);
 	for (auto const& _sort: _sorts)
@@ -454,27 +453,27 @@ SortPointer Z3Interface::fromZ3Sort(z3::sort const& _sort)
 	if (_sort.is_int())
 		return SortProvider::sintSort;
 	if (_sort.is_bv())
-		return make_shared<BitVectorSort>(_sort.bv_size());
+		return std::make_shared<BitVectorSort>(_sort.bv_size());
 	if (_sort.is_array())
-		return make_shared<ArraySort>(fromZ3Sort(_sort.array_domain()), fromZ3Sort(_sort.array_range()));
+		return std::make_shared<ArraySort>(fromZ3Sort(_sort.array_domain()), fromZ3Sort(_sort.array_range()));
 	if (_sort.is_datatype())
 	{
 		auto name = _sort.name().str();
 		auto constructor = z3::func_decl(m_context, Z3_get_tuple_sort_mk_decl(m_context, _sort));
-		vector<string> memberNames;
-		vector<SortPointer> memberSorts;
+		std::vector<std::string> memberNames;
+		std::vector<SortPointer> memberSorts;
 		for (unsigned i = 0; i < constructor.arity(); ++i)
 		{
 			auto accessor = z3::func_decl(m_context, Z3_get_tuple_sort_field_decl(m_context, _sort, i));
 			memberNames.push_back(accessor.name().str());
 			memberSorts.push_back(fromZ3Sort(accessor.range()));
 		}
-		return make_shared<TupleSort>(name, memberNames, memberSorts);
+		return std::make_shared<TupleSort>(name, memberNames, memberSorts);
 	}
 	smtAssert(false, "");
 }
 
-vector<SortPointer> Z3Interface::fromZ3Sort(z3::sort_vector const& _sorts)
+std::vector<SortPointer> Z3Interface::fromZ3Sort(z3::sort_vector const& _sorts)
 {
 	return applyMap(_sorts, [this](auto const& sort) { return fromZ3Sort(sort); });
 }
diff --git a/libsmtutil/Z3Loader.cpp b/libsmtutil/Z3Loader.cpp
index 86b17aa030..0211f600d9 100644
--- a/libsmtutil/Z3Loader.cpp
+++ b/libsmtutil/Z3Loader.cpp
@@ -27,7 +27,6 @@
 #endif
 #include <dlfcn.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::smtutil;
 
@@ -41,7 +40,7 @@ void* Z3Loader::loadSymbol(char const* _name) const
 {
 	smtAssert(m_handle, "Attempted to use dynamically loaded Z3, even though it is not available.");
 	void* sym = dlsym(m_handle, _name);
-	smtAssert(sym, string("Symbol \"") + _name + "\" not found in libz3.so");
+	smtAssert(sym, std::string("Symbol \"") + _name + "\" not found in libz3.so");
 	return sym;
 }
 
@@ -59,7 +58,7 @@ bool Z3Loader::available() const
 
 Z3Loader::Z3Loader()
 {
-	string libname{"libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION)};
+	std::string libname{"libz3.so." + std::to_string(Z3_MAJOR_VERSION) + "." + std::to_string(Z3_MINOR_VERSION)};
 	m_handle = dlmopen(LM_ID_NEWLM, libname.c_str(), RTLD_NOW);
 }
 
diff --git a/libsolc/libsolc.cpp b/libsolc/libsolc.cpp
index 4ceeeac6fa..1059492532 100644
--- a/libsolc/libsolc.cpp
+++ b/libsolc/libsolc.cpp
@@ -32,7 +32,6 @@
 
 #include "license.h"
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 
@@ -42,21 +41,21 @@ using solidity::frontend::StandardCompiler;
 namespace
 {
 
-// The strings in this list must not be resized after they have been added here (via solidity_alloc()), because
+// The std::strings in this list must not be resized after they have been added here (via solidity_alloc()), because
 // this may potentially change the pointer that was passed to the caller from solidity_alloc().
-static list<string> solidityAllocations;
+static std::list<std::string> solidityAllocations;
 
 /// Find the equivalent to @p _data in the list of allocations of solidity_alloc(),
 /// removes it from the list and returns its value.
 ///
 /// If any invalid argument is being passed, it is considered a programming error
 /// on the caller-side and hence, will call abort() then.
-string takeOverAllocation(char const* _data)
+std::string takeOverAllocation(char const* _data)
 {
 	for (auto iter = begin(solidityAllocations); iter != end(solidityAllocations); ++iter)
 		if (iter->data() == _data)
 		{
-			string chunk = std::move(*iter);
+			std::string chunk = std::move(*iter);
 			solidityAllocations.erase(iter);
 			return chunk;
 		}
@@ -64,11 +63,11 @@ string takeOverAllocation(char const* _data)
 	abort();
 }
 
-/// Resizes a std::string to the proper length based on the occurrence of a zero terminator.
-void truncateCString(string& _data)
+/// Resizes a std::std::string to the proper length based on the occurrence of a zero terminator.
+void truncateCString(std::string& _data)
 {
 	size_t pos = _data.find('\0');
-	if (pos != string::npos)
+	if (pos != std::string::npos)
 		_data.resize(pos);
 }
 
@@ -77,7 +76,7 @@ ReadCallback::Callback wrapReadCallback(CStyleReadFileCallback _readCallback, vo
 	ReadCallback::Callback readCallback;
 	if (_readCallback)
 	{
-		readCallback = [=](string const& _kind, string const& _data)
+		readCallback = [=](std::string const& _kind, std::string const& _data)
 		{
 			char* contents_c = nullptr;
 			char* error_c = nullptr;
@@ -106,7 +105,7 @@ ReadCallback::Callback wrapReadCallback(CStyleReadFileCallback _readCallback, vo
 	return readCallback;
 }
 
-string compile(string _input, CStyleReadFileCallback _readCallback, void* _readContext)
+std::string compile(std::string _input, CStyleReadFileCallback _readCallback, void* _readContext)
 {
 	StandardCompiler compiler(wrapReadCallback(_readCallback, _readContext));
 	return compiler.compile(std::move(_input));
@@ -118,7 +117,7 @@ extern "C"
 {
 extern char const* solidity_license() noexcept
 {
-	static string fullLicenseText = otherLicenses + licenseText;
+	static std::string fullLicenseText = otherLicenses + licenseText;
 	return fullLicenseText.c_str();
 }
 
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index bd9fbf0056..34fbf0381b 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -23,6 +23,8 @@ EXCLUDE_FILES_JOINED=${EXCLUDE_FILES_JOINED%??}
 NAMESPACE_STD_FREE_FILES=(
     libevmasm/*
     liblangutil/*
+    libsmtutil/*
+    libsolc/*
 )
 
 (

From 16220db75963a6f1d0a3dbdc9a0665509018b4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 28 Jun 2023 13:52:24 +0200
Subject: [PATCH 1479/1748] IRGeneratorForStatements: Fix undefined order of
 functions when generating code for index expressions

---
 Changelog.md                                        | 1 +
 libsolidity/codegen/ir/IRGeneratorForStatements.cpp | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 2ddf6647e0..fa6ea616b8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -17,6 +17,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Code Generator: Fix not entirely deterministic order of functions in unoptimized Yul output. The choice of C++ compiler in some cases would result in different (but equivalent) bytecode (especially from native binaries vs emscripten binaries)
  * Commandline Interface: Fix internal error when using ``--stop-after parsing`` and requesting some of the outputs that require full analysis or compilation.
  * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index 509cc28c7a..e4eaaf5e84 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2295,8 +2295,9 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 			}
 			case DataLocation::Memory:
 			{
+				string indexAccessFunction = m_utils.memoryArrayIndexAccessFunction(arrayType);
 				string const memAddress =
-					m_utils.memoryArrayIndexAccessFunction(arrayType) +
+					indexAccessFunction +
 					"(" +
 					IRVariable(_indexAccess.baseExpression()).part("mpos").name() +
 					", " +

From 5b70830a6410ecfb935231b1c9f33a3b10687901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 13 Jul 2023 11:07:40 +0200
Subject: [PATCH 1480/1748] IRGeneratorForStatements: Small refactor in
 endVisit(IndexAccess) for readability

---
 .../codegen/ir/IRGeneratorForStatements.cpp   | 37 +++++++++----------
 1 file changed, 18 insertions(+), 19 deletions(-)

diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index e4eaaf5e84..b2d9571d9d 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -2295,14 +2295,13 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 			}
 			case DataLocation::Memory:
 			{
-				string indexAccessFunction = m_utils.memoryArrayIndexAccessFunction(arrayType);
-				string const memAddress =
-					indexAccessFunction +
-					"(" +
-					IRVariable(_indexAccess.baseExpression()).part("mpos").name() +
-					", " +
-					expressionAsType(*_indexAccess.indexExpression(), *TypeProvider::uint256()) +
-					")";
+				string const indexAccessFunction = m_utils.memoryArrayIndexAccessFunction(arrayType);
+				string const baseRef = IRVariable(_indexAccess.baseExpression()).part("mpos").name();
+				string const indexExpression = expressionAsType(
+					*_indexAccess.indexExpression(),
+					*TypeProvider::uint256()
+				);
+				string const memAddress = indexAccessFunction + "(" + baseRef + ", " + indexExpression + ")";
 
 				setLValue(_indexAccess, IRLValue{
 					*arrayType.baseType(),
@@ -2312,28 +2311,28 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 			}
 			case DataLocation::CallData:
 			{
-				string indexAccessFunction = m_utils.calldataArrayIndexAccessFunction(arrayType);
-				string const indexAccessFunctionCall =
-					indexAccessFunction +
-					"(" +
-					IRVariable(_indexAccess.baseExpression()).commaSeparatedList() +
-					", " +
-					expressionAsType(*_indexAccess.indexExpression(), *TypeProvider::uint256()) +
-					")";
+				string const indexAccessFunction = m_utils.calldataArrayIndexAccessFunction(arrayType);
+				string const baseRef = IRVariable(_indexAccess.baseExpression()).commaSeparatedList();
+				string const indexExpression = expressionAsType(
+					*_indexAccess.indexExpression(),
+					*TypeProvider::uint256()
+				);
+				string const calldataAddress = indexAccessFunction + "(" + baseRef + ", " + indexExpression + ")";
+
 				if (arrayType.isByteArrayOrString())
 					define(_indexAccess) <<
 						m_utils.cleanupFunction(*arrayType.baseType()) <<
 						"(calldataload(" <<
-						indexAccessFunctionCall <<
+						calldataAddress <<
 						"))\n";
 				else if (arrayType.baseType()->isValueType())
 					define(_indexAccess) <<
 						m_utils.readFromCalldata(*arrayType.baseType()) <<
 						"(" <<
-						indexAccessFunctionCall <<
+						calldataAddress <<
 						")\n";
 				else
-					define(_indexAccess) << indexAccessFunctionCall << "\n";
+					define(_indexAccess) << calldataAddress << "\n";
 				break;
 			}
 		}

From 1628678de2410ac66eac3bb2131c2728b05a16fd Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 14 Jul 2023 12:54:28 +0200
Subject: [PATCH 1481/1748] Remove missing test from OZ script

---
 test/externalTests/zeppelin.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index cf8df4363e..f0570bf468 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -83,10 +83,9 @@ function zeppelin_test
     sed -i "s|it(\('reverts if index is greater than supply'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
     sed -i "s|it(\('burns all tokens'\)|it.skip(\1|g" test/token/ERC721/ERC721.behavior.js
     sed -i "s|it(\('guards transfer against invalid user'\)|it.skip(\1|g" test/access/Ownable2Step.test.js
-    sed -i "s|it(\('reverting initialization'\)|it.skip(\1|g" test/proxy/beacon/BeaconProxy.test.js
+    sed -i "s|it(\('reverting initialization function'\)|it.skip(\1|g" test/proxy/beacon/BeaconProxy.test.js
     sed -i "s|describe(\('reverting initialization'\)|describe.skip(\1|g" test/proxy/Proxy.behaviour.js
     sed -i "s|it(\('does not allow remote callback'\)|it.skip(\1|g" test/security/ReentrancyGuard.test.js
-    sed -i "s|shouldBehaveLikeAccessControlDefaultAdminRules|\/\/&|" test/access/AccessControlDefaultAdminRules.test.js
 
     # TODO: Remove when hardhat properly handle reverts of custom errors with via-ir enabled
     # and/or open-zeppelin fix https://github.com/OpenZeppelin/openzeppelin-contracts/issues/4349

From ea724071b1535ae54f12e24cdcf5f1225c26d136 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 19 Jun 2023 11:29:00 +0200
Subject: [PATCH 1482/1748] prepare_report: Add viaIR presets

---
 scripts/bytecodecompare/prepare_report.js           |  8 ++++++--
 scripts/bytecodecompare/prepare_report.py           | 13 +++++++++++--
 test/scripts/test_bytecodecompare_prepare_report.py |  7 ++++---
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/scripts/bytecodecompare/prepare_report.js b/scripts/bytecodecompare/prepare_report.js
index 8c714679be..451a67bb1d 100755
--- a/scripts/bytecodecompare/prepare_report.js
+++ b/scripts/bytecodecompare/prepare_report.js
@@ -5,8 +5,10 @@ const fs = require('fs')
 const compiler = require('solc')
 
 SETTINGS_PRESETS = {
-    'legacy-optimize':    {optimize: true},
-    'legacy-no-optimize': {optimize: false},
+    'legacy-optimize':    {optimize: true,  viaIR: false},
+    'legacy-no-optimize': {optimize: false, viaIR: false},
+    'via-ir-optimize':    {optimize: true,  viaIR: true},
+    'via-ir-no-optimize': {optimize: false, viaIR: true},
 }
 
 function loadSource(sourceFileName, stripSMTPragmas)
@@ -67,6 +69,8 @@ for (const preset of presets)
             },
             settings: {
                 optimizer: {enabled: settings.optimize},
+                // NOTE: We omit viaIR rather than set it to false to handle older versions that don't have it.
+                viaIR: settings.viaIR ? true : undefined,
                 outputSelection: {'*': {'*': ['evm.bytecode.object', 'metadata']}}
             }
         }
diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
index 6ec80e753a..b99e06b7d5 100755
--- a/scripts/bytecodecompare/prepare_report.py
+++ b/scripts/bytecodecompare/prepare_report.py
@@ -29,6 +29,8 @@ class CompilerInterface(Enum):
 class SettingsPreset(Enum):
     LEGACY_OPTIMIZE = 'legacy-optimize'
     LEGACY_NO_OPTIMIZE = 'legacy-no-optimize'
+    VIA_IR_OPTIMIZE = 'via-ir-optimize'
+    VIA_IR_NO_OPTIMIZE = 'via-ir-no-optimize'
 
 
 class SMTUse(Enum):
@@ -40,12 +42,15 @@ class SMTUse(Enum):
 @dataclass(frozen=True)
 class CompilerSettings:
     optimize: bool
+    via_ir: bool
 
     @staticmethod
     def from_preset(preset: SettingsPreset):
         return {
-            SettingsPreset.LEGACY_OPTIMIZE:    CompilerSettings(optimize=True),
-            SettingsPreset.LEGACY_NO_OPTIMIZE: CompilerSettings(optimize=False),
+            SettingsPreset.LEGACY_OPTIMIZE:    CompilerSettings(optimize=True,  via_ir=False),
+            SettingsPreset.LEGACY_NO_OPTIMIZE: CompilerSettings(optimize=False, via_ir=False),
+            SettingsPreset.VIA_IR_OPTIMIZE:    CompilerSettings(optimize=True,  via_ir=True),
+            SettingsPreset.VIA_IR_NO_OPTIMIZE: CompilerSettings(optimize=False, via_ir=True),
         }[preset]
 
 
@@ -224,6 +229,8 @@ def prepare_compiler_input(
             },
             'settings': {
                 'optimizer': {'enabled': settings.optimize},
+                # NOTE: We omit viaIR rather than set it to false to handle older versions that don't have it.
+                **({'viaIR': True} if settings.via_ir else {}),
                 'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}},
             }
         }
@@ -243,6 +250,8 @@ def prepare_compiler_input(
             compiler_options.append('--optimize')
         elif force_no_optimize_yul:
             compiler_options.append('--no-optimize-yul')
+        if settings.via_ir:
+            compiler_options.append('--via-ir')
         if smt_use == SMTUse.DISABLE:
             compiler_options += ['--model-checker-engine', 'none']
 
diff --git a/test/scripts/test_bytecodecompare_prepare_report.py b/test/scripts/test_bytecodecompare_prepare_report.py
index 16d73ee39a..b8a1791d65 100644
--- a/test/scripts/test_bytecodecompare_prepare_report.py
+++ b/test/scripts/test_bytecodecompare_prepare_report.py
@@ -265,6 +265,7 @@ def test_prepare_compiler_input_for_json_preserves_newlines(self):
             },
             'settings': {
                 'optimizer': {'enabled': True},
+                'viaIR': True,
                 'outputSelection': {'*': {'*': ['evm.bytecode.object', 'metadata']}},
                 'modelChecker': {'engine': 'none'},
             }
@@ -273,7 +274,7 @@ def test_prepare_compiler_input_for_json_preserves_newlines(self):
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
             SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH,
-            preset=SettingsPreset.LEGACY_OPTIMIZE,
+            preset=SettingsPreset.VIA_IR_OPTIMIZE,
             force_no_optimize_yul=False,
             interface=CompilerInterface.STANDARD_JSON,
             smt_use=SMTUse.DISABLE,
@@ -317,7 +318,7 @@ def test_prepare_compiler_input_for_cli_should_not_use_metadata_option_if_not_su
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
             SMT_SMOKE_TEST_SOL_PATH,
-            preset=SettingsPreset.LEGACY_OPTIMIZE,
+            preset=SettingsPreset.VIA_IR_OPTIMIZE,
             force_no_optimize_yul=False,
             interface=CompilerInterface.CLI,
             smt_use=SMTUse.PRESERVE,
@@ -326,7 +327,7 @@ def test_prepare_compiler_input_for_cli_should_not_use_metadata_option_if_not_su
 
         self.assertEqual(
             command_line,
-            ['solc', str(SMT_SMOKE_TEST_SOL_PATH), '--bin', '--optimize'],
+            ['solc', str(SMT_SMOKE_TEST_SOL_PATH), '--bin', '--optimize', '--via-ir'],
         )
         self.assertEqual(compiler_input, SMT_SMOKE_TEST_SOL_CODE)
 

From ae3b7625c9d2e3e9afa35324961d0e908726bf88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 20 Jun 2023 14:51:53 +0200
Subject: [PATCH 1483/1748] CI: Include via IR presets in the bytecode
 comparison

---
 .circleci/config.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 06cc0c475b..bb6e562f11 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -88,6 +88,7 @@ commands:
     steps:
       - run:
           name: Generate bytecode reports for the selected preset
+          no_output_timeout: 30m
           command: |
             .circleci/parallel_bytecode_report.sh \
                 "<< parameters.label >>" \
@@ -227,6 +228,8 @@ defaults:
       PRESETS:
         legacy-optimize
         legacy-no-optimize
+        via-ir-optimize
+        via-ir-no-optimize
 
   - bytecode_compare_preset_matrix: &bytecode_compare_preset_matrix
       parameters:
@@ -234,6 +237,8 @@ defaults:
           # NOTE: Keep in sync with preset list in bytecode_compare_env_presets
           - legacy-optimize
           - legacy-no-optimize
+          - via-ir-optimize
+          - via-ir-no-optimize
 
   # --------------------------------------------------------------------------
   # Artifacts Templates

From 23955ba42800f354b66b37675a1a0cb68b1c6229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 20 Jun 2023 16:38:48 +0200
Subject: [PATCH 1484/1748] CI: Workaround for some test cases crashing the
 compiler via IR during bytecode comparison due to a regex-related bug

---
 .circleci/parallel_bytecode_report.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.circleci/parallel_bytecode_report.sh b/.circleci/parallel_bytecode_report.sh
index 2082306221..4a19015ce6 100755
--- a/.circleci/parallel_bytecode_report.sh
+++ b/.circleci/parallel_bytecode_report.sh
@@ -44,6 +44,9 @@ cd test-cases/
 echo "Preparing input files"
 python3 ../scripts/isolate_tests.py ../test/
 
+# FIXME: These cases crash because of https://github.com/ethereum/solidity/issues/13583
+rm ./*_bytecode_too_large_*.sol ./*_combined_too_large_*.sol
+
 if [[ $binary_type == native ]]; then
     interface=$(echo -e "standard-json\ncli" | circleci tests split)
     echo "Selected interface: ${interface}"

From bccfcd40a02b06af97f536e0636253a2dbfad775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 28 Jun 2023 17:28:41 +0200
Subject: [PATCH 1485/1748] prepare_report: Add YulException to the list of
 ICEs for which we ignore Standard JSON outputs even when present

---
 scripts/bytecodecompare/prepare_report.js | 2 +-
 scripts/bytecodecompare/prepare_report.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/bytecodecompare/prepare_report.js b/scripts/bytecodecompare/prepare_report.js
index 451a67bb1d..cba7a08001 100755
--- a/scripts/bytecodecompare/prepare_report.js
+++ b/scripts/bytecodecompare/prepare_report.js
@@ -100,7 +100,7 @@ for (const preset of presets)
                     // JSON interface still returns contract metadata in case of an internal compiler error while
                     // CLI interface does not. To make reports comparable we must force this case to be detected as
                     // an error in both cases.
-                    if (['UnimplementedFeatureError', 'CompilerError', 'CodeGenerationError'].includes(error['type']))
+                    if (['UnimplementedFeatureError', 'CompilerError', 'CodeGenerationError', 'YulException'].includes(error['type']))
                     {
                         internalCompilerError = true
                         break
diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
index b99e06b7d5..4cf24bb8aa 100755
--- a/scripts/bytecodecompare/prepare_report.py
+++ b/scripts/bytecodecompare/prepare_report.py
@@ -157,7 +157,7 @@ def parse_standard_json_output(source_file_name: Path, standard_json_output: str
     # CLI interface does not. To make reports comparable we must force this case to be detected as
     # an error in both cases.
     internal_compiler_error = any(
-        error['type'] in ['UnimplementedFeatureError', 'CompilerError', 'CodeGenerationError']
+        error['type'] in ['UnimplementedFeatureError', 'CompilerError', 'CodeGenerationError', 'YulException']
         for error in decoded_json_output.get('errors', {})
     )
 

From 0afe025f193bbe1cd43db2579f5da96b11960beb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 2 Jun 2023 12:40:19 +0200
Subject: [PATCH 1486/1748] Minor tweaks to immutable tests for better diffs

---
 .../immutable/ctor_initialization_indirect_reading.sol     | 2 +-
 .../immutable/function_initialization_reading.sol          | 2 +-
 .../syntaxTests/immutable/function_pointer_reading.sol     | 4 ++--
 .../immutable/indirect_reading_during_statevar_init.sol    | 4 ++--
 .../immutable/inheritance_virtual_functions.sol            | 6 +++---
 .../immutable/init_in_constructor_modifier_param.sol       | 7 +++++++
 .../immutable/init_in_inheritance_specifier_param.sol      | 2 +-
 .../syntaxTests/immutable/init_in_modifier_param.sol       | 7 -------
 .../immutable/multiple_inheritance_virtual_functions.sol   | 6 +++---
 .../multiple_inheritance_virtual_functions_with_super.sol  | 6 +++---
 .../syntaxTests/immutable/read_in_function_before_init.sol | 4 ++--
 .../immutable/reading_after_initialization_function.sol    | 4 ++--
 .../syntaxTests/immutable/try_catch_initialized.sol        | 1 -
 13 files changed, 27 insertions(+), 28 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol
 delete mode 100644 test/libsolidity/syntaxTests/immutable/init_in_modifier_param.sol

diff --git a/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol b/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
index 0ee583b562..1bd0f6b913 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
@@ -4,7 +4,7 @@ contract C {
         x = f();
     }
 
-    function f() public pure returns (uint) { return 3 + x; }
+    function f() public view returns (uint) { return 3 + x; }
 }
 // ----
 // TypeError 7733: (136-137): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol b/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
index 7933f8e7f9..0686885847 100644
--- a/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
@@ -1,7 +1,7 @@
 contract C {
     uint immutable x = f();
 
-    function f() public pure returns (uint) { return 3 + x; }
+    function f() public view returns (uint) { return 3 + x; }
 }
 // ----
 // TypeError 7733: (99-100): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol b/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
index e94fd155cc..5c026300c2 100644
--- a/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
@@ -7,7 +7,7 @@ abstract contract B {
 }
 
 contract C is B(C.f) {
-    function f() internal returns(uint) { return x + 2; }
+    function f() internal view returns(uint) { return x + 2; }
 }
 // ----
-// TypeError 7733: (200-201): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (205-206): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol b/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
index eaa2186f10..ff7927277c 100644
--- a/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
+++ b/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
@@ -2,7 +2,7 @@ contract C {
     uint immutable x = 0;
     uint y = f();
 
-    function f() internal returns(uint) { return x; }
+    function f() internal pure returns(uint) { return x; }
 }
 // ----
-// TypeError 7733: (107-108): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (112-113): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
index dc11b8a61c..f33ce4cc4d 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
@@ -5,15 +5,15 @@ contract B {
         x = xInit();
     }
 
-    function xInit() internal virtual returns(uint) {
+    function xInit() internal view virtual returns(uint) {
         return 3;
     }
 }
 
 contract C is B {
-    function xInit() internal override returns(uint) {
+    function xInit() internal view override returns(uint) {
         return x;
     }
 }
 // ----
-// TypeError 7733: (253-254): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (263-264): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol
new file mode 100644
index 0000000000..d23416942f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol
@@ -0,0 +1,7 @@
+contract D {
+    uint immutable t;
+    modifier m(uint) { _; }
+    constructor() m(t = 2) {}
+}
+// ----
+// TypeError 1581: (83-84): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
index 63662e1b7a..cc56202e73 100644
--- a/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
+++ b/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
@@ -1,6 +1,6 @@
 contract C { constructor(uint) {} }
 contract D is C(D.t = 2) {
-  uint immutable t;
+    uint immutable t;
 }
 // ----
 // TypeError 1581: (52-55): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_modifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_modifier_param.sol
deleted file mode 100644
index 3e354b4e92..0000000000
--- a/test/libsolidity/syntaxTests/immutable/init_in_modifier_param.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-contract D {
-  uint immutable t;
-  modifier m(uint) { _; }
-  constructor() m(t=2) {}
-}
-// ----
-// TypeError 1581: (77-78): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
index 33749c8cdc..401b068cb6 100644
--- a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
+++ b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
@@ -13,7 +13,7 @@ contract B {
         return f();
     }
 
-    function f() internal virtual returns(uint) { return 3; }
+    function f() internal view virtual returns(uint) { return 3; }
 }
 
 contract C is A, B {
@@ -21,9 +21,9 @@ contract C is A, B {
         return B.xInit();
     }
 
-    function f() internal override(A, B) returns(uint) {
+    function f() internal view override(A, B) returns(uint) {
         return x;
     }
 }
 // ----
-// TypeError 7733: (489-490): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (499-500): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
index 11da864db2..bf5a1f85b3 100644
--- a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
+++ b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
@@ -13,7 +13,7 @@ contract B {
         return f();
     }
 
-    function f() internal virtual returns(uint) { return 3; }
+    function f() internal view virtual returns(uint) { return 3; }
 }
 
 contract C is A, B {
@@ -21,9 +21,9 @@ contract C is A, B {
         return super.xInit();
     }
 
-    function f() internal override(A, B) returns(uint) {
+    function f() internal view override(A, B) returns(uint) {
         return x;
     }
 }
 // ----
-// TypeError 7733: (493-494): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (503-504): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
index 3ca0df2700..6e934ff9d4 100644
--- a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
+++ b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
@@ -2,11 +2,11 @@ abstract contract A {
 	uint public t;
 	constructor() { t = f(); }
 
-	function f() virtual view internal returns (uint);
+	function f() virtual pure internal returns (uint);
 }
 contract B is A {
 	uint immutable x = 2;
-	function f() override view internal returns (uint) { return x; }
+	function f() override pure internal returns (uint) { return x; }
 }
 // ----
 // TypeError 7733: (223-224): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol b/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
index 70d4ac4c84..32ac0cceb4 100644
--- a/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
+++ b/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
@@ -1,5 +1,5 @@
 contract C {
-    uint immutable x ;
+	uint immutable x;
 
 	constructor()
 	{
@@ -13,4 +13,4 @@ contract C {
 	}
 }
 // ----
-// TypeError 7733: (145-146): Immutable variables cannot be read before they are initialized.
+// TypeError 7733: (141-142): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol b/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol
index 2d901a0200..9cd18a2b61 100644
--- a/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol
@@ -31,7 +31,6 @@ contract B
         revert();
     }
 }
-
 // ====
 // EVMVersion: >=byzantium
 // ----

From 490b90d0abea120d96e219798ed98fc78905cd3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 5 Jun 2023 14:12:56 +0200
Subject: [PATCH 1487/1748] Implement ImmutableItem::setToZero() to make delete
 work with immutables

---
 libsolidity/codegen/LValue.cpp | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp
index 8f20cd992a..b99ebceddd 100644
--- a/libsolidity/codegen/LValue.cpp
+++ b/libsolidity/codegen/LValue.cpp
@@ -187,9 +187,16 @@ void ImmutableItem::storeValue(Type const& _sourceType, SourceLocation const&, b
 	m_context << Instruction::POP;
 }
 
-void ImmutableItem::setToZero(SourceLocation const&, bool) const
+void ImmutableItem::setToZero(SourceLocation const&, bool _removeReference) const
 {
-	solAssert(false, "Attempted to set immutable variable to zero.");
+	CompilerUtils utils(m_context);
+	solUnimplementedAssert(m_dataType->isValueType());
+	solAssert(_removeReference);
+
+	m_context << m_context.immutableMemoryOffset(m_variable);
+	utils.pushZeroValue(*m_dataType);
+	utils.storeInMemoryDynamic(*m_dataType);
+	m_context << Instruction::POP;
 }
 
 StorageItem::StorageItem(CompilerContext& _compilerContext, VariableDeclaration const& _declaration):

From dad2bf64723cc83f0168bae0310714db01983a50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 30 May 2023 16:07:00 +0200
Subject: [PATCH 1488/1748] Relax restrictions on immutable initialization

---
 Changelog.md                                  |   1 +
 docs/cheatsheet.rst                           |   2 +-
 docs/contracts/constant-state-variables.rst   |  48 ++--
 docs/ir-breaking-changes.rst                  |   2 +
 libsolidity/analysis/ImmutableValidator.cpp   | 261 +-----------------
 libsolidity/analysis/ImmutableValidator.h     |  38 +--
 .../semanticTests/immutable/delete.sol        |  15 +
 .../immutable/increment_decrement.sol         |  18 ++
 .../immutable/multiple_initializations.sol    |  27 ++
 .../semanticTests/immutable/uninitialized.sol |  11 +
 .../conditional_return_uninitialized.sol      |   2 -
 .../immutable/conditionally_initialized.sol   |   2 -
 .../ctor_initialization_indirect_reading.sol  |   2 -
 .../immutable/ctor_initialization_reading.sol |   2 -
 .../immutable/ctor_modifier_args.sol          |   1 -
 .../immutable/ctor_modifier_reading.sol       |   2 -
 .../syntaxTests/immutable/decrement.sol       |   2 -
 .../syntaxTests/immutable/delete.sol          |   8 -
 .../immutable/delete_and_initialize.sol       |   8 -
 .../function_initialization_reading.sol       |   2 -
 .../function_pointer_initializing.sol         |   1 -
 .../immutable/function_pointer_reading.sol    |   1 -
 .../syntaxTests/immutable/increment.sol       |   2 -
 .../immutable/increment_decrement.sol         |  11 -
 .../indirect_reading_during_statevar_init.sol |   1 -
 .../immutable/inheritance_ctor_argument.sol   |   2 -
 ...e_ctor_inherit_specifier_argument_init.sol |   2 -
 ...tor_inherit_specifier_argument_reading.sol |   2 -
 .../inheritance_virtual_functions.sol         |   1 -
 .../inheritance_virtual_modifiers.sol         |   2 -
 .../immutable/inheritance_wrong_ctor.sol      |   2 -
 .../init_in_constructor_modifier_param.sol    |   1 -
 .../immutable/init_in_ctor_param.sol          |   2 -
 .../init_in_function_modifier_param.sol       |   7 +
 .../init_in_function_via_contract_name.sol    |  11 +
 .../immutable/init_in_function_via_super.sol  |  13 +
 .../init_in_inheritance_specifier_param.sol   |   2 -
 .../immutable/loop_initialized.sol            |   2 -
 ...multiple_inheritance_virtual_functions.sol |   1 -
 ...heritance_virtual_functions_with_super.sol |   1 -
 .../immutable/multiple_initializations.sol    |   2 -
 .../immutable/private_state_var.sol           |   2 -
 .../read_in_function_before_init.sol          |   2 -
 .../read_in_function_before_init2.sol         |   2 -
 .../reading_after_initialization_function.sol |   1 -
 .../reading_during_statevar_init.sol          |   2 -
 .../immutable/return_uninitialized.sol        |   2 +-
 .../state_var_external_access_read.sol        |  13 +
 .../state_var_external_access_write.sol       |  11 +
 .../immutable/try_catch_initialized.sol       |   6 -
 .../syntaxTests/immutable/uninitialized.sol   |   2 -
 .../uninitialized_private_state_var.sol       |   3 -
 .../variable_declaration_already.sol          |   3 -
 .../immutable/variable_declaration_value.sol  |   2 -
 54 files changed, 178 insertions(+), 396 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/immutable/delete.sol
 create mode 100644 test/libsolidity/semanticTests/immutable/increment_decrement.sol
 create mode 100644 test/libsolidity/semanticTests/immutable/multiple_initializations.sol
 create mode 100644 test/libsolidity/semanticTests/immutable/uninitialized.sol
 delete mode 100644 test/libsolidity/syntaxTests/immutable/delete.sol
 delete mode 100644 test/libsolidity/syntaxTests/immutable/delete_and_initialize.sol
 delete mode 100644 test/libsolidity/syntaxTests/immutable/increment_decrement.sol
 create mode 100644 test/libsolidity/syntaxTests/immutable/init_in_function_modifier_param.sol
 create mode 100644 test/libsolidity/syntaxTests/immutable/init_in_function_via_contract_name.sol
 create mode 100644 test/libsolidity/syntaxTests/immutable/init_in_function_via_super.sol
 create mode 100644 test/libsolidity/syntaxTests/immutable/state_var_external_access_read.sol
 create mode 100644 test/libsolidity/syntaxTests/immutable/state_var_external_access_write.sol

diff --git a/Changelog.md b/Changelog.md
index fa6ea616b8..4cbddb3dd9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 Language Features:
  * Allow qualified access to events from other contracts.
+ * Relax restrictions on initialization of immutable variables. Reads and writes may now happen at any point at construction time outside of functions and modifiers. Explicit initialization is no longer mandatory.
 
 Compiler Features:
  * Commandline Interface: Add ``--ast-compact-json`` output in assembler mode.
diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index 34ad46df6a..a60d3b50f5 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -150,7 +150,7 @@ Modifiers
 - ``view`` for functions: Disallows modification of state.
 - ``payable`` for functions: Allows them to receive Ether together with a call.
 - ``constant`` for state variables: Disallows assignment (except initialisation), does not occupy storage slot.
-- ``immutable`` for state variables: Allows exactly one assignment at construction time and is constant afterwards. Is stored in code.
+- ``immutable`` for state variables: Allows assignment at construction time and is constant when deployed. Is stored in code.
 - ``anonymous`` for events: Does not store event signature as topic.
 - ``indexed`` for event parameters: Stores the parameter as topic.
 - ``virtual`` for functions and modifiers: Allows the function's or modifier's
diff --git a/docs/contracts/constant-state-variables.rst b/docs/contracts/constant-state-variables.rst
index 1b57bf3bec..a1bc24f50c 100644
--- a/docs/contracts/constant-state-variables.rst
+++ b/docs/contracts/constant-state-variables.rst
@@ -30,19 +30,23 @@ Not all types for constants and immutables are implemented at this time. The onl
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.7.4;
+    pragma solidity ^0.8.21;
 
     uint constant X = 32**22 + 8;
 
     contract C {
         string constant TEXT = "abc";
         bytes32 constant MY_HASH = keccak256("abc");
-        uint immutable decimals;
+        uint immutable decimals = 18;
         uint immutable maxBalance;
         address immutable owner = msg.sender;
 
         constructor(uint decimals_, address ref) {
-            decimals = decimals_;
+            if (decimals_ != 0)
+                // Immutables are only immutable when deployed.
+                // At construction time they can be assigned to any number of times.
+                decimals = decimals_;
+
             // Assignments to immutables can even access the environment.
             maxBalance = ref.balance;
         }
@@ -74,10 +78,29 @@ Immutable
 =========
 
 Variables declared as ``immutable`` are a bit less restricted than those
-declared as ``constant``: Immutable variables can be assigned an arbitrary
-value in the constructor of the contract or at the point of their declaration.
-They can be assigned only once and can, from that point on, be read even during
-construction time.
+declared as ``constant``: Immutable variables can be assigned a
+value at construction time.
+The value can be changed at any time before deployment and then it becomes permanent.
+
+One additional restriction is that immutables can only be assigned to inside expressions for which
+there is no possibility of being executed after creation.
+This excludes all modifier definitions and functions other than constructors.
+
+There are no restrictions on reading immutable variables.
+The read is even allowed to happen before the variable is written to for the first time because variables in
+Solidity always have a well-defined initial value.
+For this reason it is also allowed to never explicitly assign a value to an immutable.
+
+.. warning::
+    When accessing immutables at construction time, please keep the :ref:`initialization order
+    <state-variable-initialization-order>` in mind.
+    Even if you provide an explicit initializer, some expressions may end up being evaluated before
+    that initializer, especially when they are at a different level in inheritance hierarchy.
+
+.. note::
+    Before Solidity 0.8.21 initialization of immutable variables was more restrictive.
+    Such variables had to be initialized exactly once at construction time and could not be read
+    before then.
 
 The contract creation code generated by the compiler will modify the
 contract's runtime code before it is returned by replacing all references
@@ -86,14 +109,3 @@ you are comparing the
 runtime code generated by the compiler with the one actually stored in the
 blockchain. The compiler outputs where these immutables are located in the deployed bytecode
 in the ``immutableReferences`` field of the :ref:`compiler JSON standard output <compiler-api>`.
-
-.. note::
-  Immutables that are assigned at their declaration are only considered
-  initialized once the constructor of the contract is executing.
-  This means you cannot initialize immutables inline with a value
-  that depends on another immutable. You can do this, however,
-  inside the constructor of the contract.
-
-  This is a safeguard against different interpretations about the order
-  of state variable initialization and constructor execution, especially
-  with regards to inheritance.
diff --git a/docs/ir-breaking-changes.rst b/docs/ir-breaking-changes.rst
index 38e6b552f3..4917cfc715 100644
--- a/docs/ir-breaking-changes.rst
+++ b/docs/ir-breaking-changes.rst
@@ -30,6 +30,8 @@ Semantic Only Changes
 This section lists the changes that are semantic-only, thus potentially
 hiding new and different behavior in existing code.
 
+.. _state-variable-initialization-order:
+
 - The order of state variable initialization has changed in case of inheritance.
 
   The order used to be:
diff --git a/libsolidity/analysis/ImmutableValidator.cpp b/libsolidity/analysis/ImmutableValidator.cpp
index 8e89c49ab9..0f5a2ee2e0 100644
--- a/libsolidity/analysis/ImmutableValidator.cpp
+++ b/libsolidity/analysis/ImmutableValidator.cpp
@@ -18,8 +18,6 @@
 
 #include <libsolidity/analysis/ImmutableValidator.h>
 
-#include <libsolutil/CommonData.h>
-
 #include <range/v3/view/reverse.hpp>
 
 using namespace solidity::frontend;
@@ -27,275 +25,44 @@ using namespace solidity::langutil;
 
 void ImmutableValidator::analyze()
 {
-	m_inCreationContext = true;
-
 	auto linearizedContracts = m_mostDerivedContract.annotation().linearizedBaseContracts | ranges::views::reverse;
 
-	for (ContractDefinition const* contract: linearizedContracts)
-		for (VariableDeclaration const* stateVar: contract->stateVariables())
-			if (stateVar->value())
-				stateVar->value()->accept(*this);
-
-	for (ContractDefinition const* contract: linearizedContracts)
-		for (std::shared_ptr<InheritanceSpecifier> const& inheritSpec: contract->baseContracts())
-			if (auto args = inheritSpec->arguments())
-				ASTNode::listAccept(*args, *this);
-
-	for (ContractDefinition const* contract: linearizedContracts)
-	{
-		for (VariableDeclaration const* stateVar: contract->stateVariables())
-			if (stateVar->value())
-				m_initializedStateVariables.emplace(stateVar);
-
-		if (contract->constructor())
-			visitCallableIfNew(*contract->constructor());
-	}
-
-	m_inCreationContext = false;
-
 	for (ContractDefinition const* contract: linearizedContracts)
 	{
-		for (auto funcDef: contract->definedFunctions())
-			visitCallableIfNew(*funcDef);
+		for (FunctionDefinition const* function: contract->definedFunctions())
+			function->accept(*this);
 
-		for (auto modDef: contract->functionModifiers())
-			visitCallableIfNew(*modDef);
+		for (ModifierDefinition const* modifier: contract->functionModifiers())
+			modifier->accept(*this);
 	}
-
-	checkAllVariablesInitialized(m_mostDerivedContract.location());
 }
 
-bool ImmutableValidator::visit(Assignment const& _assignment)
-{
-	// Need to visit values first (rhs) as they might access other immutables.
-	_assignment.rightHandSide().accept(*this);
-	_assignment.leftHandSide().accept(*this);
-	return false;
-}
-
-
 bool ImmutableValidator::visit(FunctionDefinition const& _functionDefinition)
 {
-	return analyseCallable(_functionDefinition);
-}
-
-bool ImmutableValidator::visit(ModifierDefinition const& _modifierDefinition)
-{
-	return analyseCallable(_modifierDefinition);
-}
-
-bool ImmutableValidator::visit(MemberAccess const& _memberAccess)
-{
-	_memberAccess.expression().accept(*this);
-
-	if (auto contractType = dynamic_cast<ContractType const*>(_memberAccess.expression().annotation().type))
-		if (!contractType->isSuper())
-			// external access, no analysis needed.
-			return false;
-
-	if (auto varDecl = dynamic_cast<VariableDeclaration const*>(_memberAccess.annotation().referencedDeclaration))
-		analyseVariableReference(*varDecl, _memberAccess);
-	else if (auto funcType = dynamic_cast<FunctionType const*>(_memberAccess.annotation().type))
-		if (funcType->kind() == FunctionType::Kind::Internal && funcType->hasDeclaration())
-			visitCallableIfNew(funcType->declaration());
-
-	return false;
-}
-
-bool ImmutableValidator::visit(IfStatement const& _ifStatement)
-{
-	bool prevInBranch = m_inBranch;
-
-	_ifStatement.condition().accept(*this);
-
-	m_inBranch = true;
-	_ifStatement.trueStatement().accept(*this);
-
-	if (auto falseStatement = _ifStatement.falseStatement())
-		falseStatement->accept(*this);
-
-	m_inBranch = prevInBranch;
-
-	return false;
-}
-
-bool ImmutableValidator::visit(WhileStatement const& _whileStatement)
-{
-	bool prevInLoop = m_inLoop;
-	m_inLoop = true;
-
-	_whileStatement.condition().accept(*this);
-	_whileStatement.body().accept(*this);
-
-	m_inLoop = prevInLoop;
-
-	return false;
-}
-
-bool ImmutableValidator::visit(TryStatement const& _tryStatement)
-{
-	ScopedSaveAndRestore constructorGuard{m_inTryStatement, true};
-
-	_tryStatement.externalCall().accept(*this);
-
-	for (auto&& clause: _tryStatement.clauses())
-		if (clause)
-			clause->accept(*this);
-
-	return false;
+	return !_functionDefinition.isConstructor();
 }
 
-void ImmutableValidator::endVisit(IdentifierPath const& _identifierPath)
+void ImmutableValidator::endVisit(MemberAccess const& _memberAccess)
 {
-	if (auto const callableDef = dynamic_cast<CallableDeclaration const*>(_identifierPath.annotation().referencedDeclaration))
-		visitCallableIfNew(
-			*_identifierPath.annotation().requiredLookup == VirtualLookup::Virtual ?
-			callableDef->resolveVirtual(m_mostDerivedContract) :
-			*callableDef
-		);
-
-	solAssert(!dynamic_cast<VariableDeclaration const*>(_identifierPath.annotation().referencedDeclaration), "");
+	analyseVariableReference(_memberAccess.annotation().referencedDeclaration, _memberAccess);
 }
 
 void ImmutableValidator::endVisit(Identifier const& _identifier)
 {
-	if (auto const callableDef = dynamic_cast<CallableDeclaration const*>(_identifier.annotation().referencedDeclaration))
-		visitCallableIfNew(*_identifier.annotation().requiredLookup == VirtualLookup::Virtual ? callableDef->resolveVirtual(m_mostDerivedContract) : *callableDef);
-	if (auto const varDecl = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration))
-		analyseVariableReference(*varDecl, _identifier);
-}
-
-void ImmutableValidator::endVisit(Return const& _return)
-{
-	if (m_currentConstructor != nullptr)
-		checkAllVariablesInitialized(_return.location());
-}
-
-bool ImmutableValidator::analyseCallable(CallableDeclaration const& _callableDeclaration)
-{
-	ScopedSaveAndRestore constructorGuard{m_currentConstructor, {}};
-	ScopedSaveAndRestore constructorContractGuard{m_currentConstructorContract, {}};
-
-	if (FunctionDefinition const* funcDef = dynamic_cast<decltype(funcDef)>(&_callableDeclaration))
-	{
-		ASTNode::listAccept(funcDef->modifiers(), *this);
-
-		if (funcDef->isConstructor())
-		{
-			m_currentConstructorContract = funcDef->annotation().contract;
-			m_currentConstructor = funcDef;
-		}
-
-		if (funcDef->isImplemented())
-			funcDef->body().accept(*this);
-	}
-	else if (ModifierDefinition const* modDef = dynamic_cast<decltype(modDef)>(&_callableDeclaration))
-		if (modDef->isImplemented())
-			modDef->body().accept(*this);
-
-	return false;
+	analyseVariableReference(_identifier.annotation().referencedDeclaration, _identifier);
 }
 
-void ImmutableValidator::analyseVariableReference(VariableDeclaration const& _variableReference, Expression const& _expression)
+void ImmutableValidator::analyseVariableReference(Declaration const* _reference, Expression const& _expression)
 {
-	if (!_variableReference.isStateVariable() || !_variableReference.immutable())
+	auto const* variable = dynamic_cast<VariableDeclaration const*>(_reference);
+	if (!variable || !variable->isStateVariable() || !variable->immutable())
 		return;
 
 	// If this is not an ordinary assignment, we write and read at the same time.
-	bool write = _expression.annotation().willBeWrittenTo;
-	bool read = !_expression.annotation().willBeWrittenTo || !_expression.annotation().lValueOfOrdinaryAssignment;
-	if (write)
-	{
-		if (!m_currentConstructor)
-			m_errorReporter.typeError(
-				1581_error,
-				_expression.location(),
-				"Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor."
-			);
-		else if (m_currentConstructor->annotation().contract->id() != _variableReference.annotation().contract->id())
-			m_errorReporter.typeError(
-				7484_error,
-				_expression.location(),
-				"Cannot write to immutable here: Immutable variables must be initialized in the constructor of the contract they are defined in."
-			);
-		else if (m_inLoop)
-			m_errorReporter.typeError(
-				6672_error,
-				_expression.location(),
-				"Cannot write to immutable here: Immutable variables cannot be initialized inside a loop."
-			);
-		else if (m_inBranch)
-			m_errorReporter.typeError(
-				4599_error,
-				_expression.location(),
-				"Cannot write to immutable here: Immutable variables cannot be initialized inside an if statement."
-			);
-		else if (m_inTryStatement)
-			m_errorReporter.typeError(
-					4130_error,
-					_expression.location(),
-					"Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement."
-			);
-		else if (m_initializedStateVariables.count(&_variableReference))
-		{
-			if (!read)
-				m_errorReporter.typeError(
-					1574_error,
-					_expression.location(),
-					"Immutable state variable already initialized."
-				);
-			else
-				m_errorReporter.typeError(
-					2718_error,
-					_expression.location(),
-					"Immutable variables cannot be modified after initialization."
-				);
-		}
-		else if (read)
-			m_errorReporter.typeError(
-				3969_error,
-				_expression.location(),
-				"Immutable variables must be initialized using an assignment."
-			);
-		m_initializedStateVariables.emplace(&_variableReference);
-	}
-	if (
-		read &&
-		m_inCreationContext &&
-		!m_initializedStateVariables.count(&_variableReference)
-	)
+	if (_expression.annotation().willBeWrittenTo)
 		m_errorReporter.typeError(
-			7733_error,
+			1581_error,
 			_expression.location(),
-			"Immutable variables cannot be read before they are initialized."
+			"Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor."
 		);
 }
-
-void ImmutableValidator::checkAllVariablesInitialized(solidity::langutil::SourceLocation const& _location)
-{
-	for (ContractDefinition const* contract: m_mostDerivedContract.annotation().linearizedBaseContracts | ranges::views::reverse)
-	{
-		for (VariableDeclaration const* varDecl: contract->stateVariables())
-			if (varDecl->immutable())
-				if (!util::contains(m_initializedStateVariables, varDecl))
-					m_errorReporter.typeError(
-						2658_error,
-						_location,
-						solidity::langutil::SecondarySourceLocation().append("Not initialized: ", varDecl->location()),
-						"Construction control flow ends without initializing all immutable state variables."
-					);
-
-		// Don't check further than the current c'tors contract
-		if (contract == m_currentConstructorContract)
-			break;
-	}
-}
-
-void ImmutableValidator::visitCallableIfNew(Declaration const& _declaration)
-{
-	CallableDeclaration const* _callable = dynamic_cast<CallableDeclaration const*>(&_declaration);
-	solAssert(_callable != nullptr, "");
-
-	if (m_visitedCallables.emplace(_callable).second)
-		_declaration.accept(*this);
-}
diff --git a/libsolidity/analysis/ImmutableValidator.h b/libsolidity/analysis/ImmutableValidator.h
index 43a4b5dbf4..78d85a61ce 100644
--- a/libsolidity/analysis/ImmutableValidator.h
+++ b/libsolidity/analysis/ImmutableValidator.h
@@ -21,25 +21,15 @@
 #include <libsolidity/ast/ASTVisitor.h>
 #include <liblangutil/ErrorReporter.h>
 
-#include <memory>
-
 namespace solidity::frontend
 {
 
 /**
  * Validates access and initialization of immutable variables:
- * must be directly initialized in their respective c'tor or inline
- * cannot be read before being initialized
- * cannot be read when initializing state variables inline
- * must be initialized outside loops (only one initialization)
- * must be initialized outside ifs (must be initialized unconditionally)
- * must be initialized exactly once (no multiple statements)
- * must be initialized exactly once (no early return to skip initialization)
+ * must be directly initialized in a c'tor or inline
 */
 class ImmutableValidator: private ASTConstVisitor
 {
-	using CallableDeclarationSet = std::set<CallableDeclaration const*, ASTNode::CompareByID>;
-
 public:
 	ImmutableValidator(langutil::ErrorReporter& _errorReporter, ContractDefinition const& _contractDefinition):
 		m_mostDerivedContract(_contractDefinition),
@@ -49,37 +39,15 @@ class ImmutableValidator: private ASTConstVisitor
 	void analyze();
 
 private:
-	bool visit(Assignment const& _assignment);
 	bool visit(FunctionDefinition const& _functionDefinition);
-	bool visit(ModifierDefinition const& _modifierDefinition);
-	bool visit(MemberAccess const& _memberAccess);
-	bool visit(IfStatement const& _ifStatement);
-	bool visit(WhileStatement const& _whileStatement);
-	bool visit(TryStatement const& _tryStatement);
-	void endVisit(IdentifierPath const& _identifierPath);
+	void endVisit(MemberAccess const& _memberAccess);
 	void endVisit(Identifier const& _identifier);
-	void endVisit(Return const& _return);
-
-	bool analyseCallable(CallableDeclaration const& _callableDeclaration);
-	void analyseVariableReference(VariableDeclaration const& _variableReference, Expression const& _expression);
 
-	void checkAllVariablesInitialized(langutil::SourceLocation const& _location);
-
-	void visitCallableIfNew(Declaration const& _declaration);
+	void analyseVariableReference(Declaration const* _variableReference, Expression const& _expression);
 
 	ContractDefinition const& m_mostDerivedContract;
 
-	CallableDeclarationSet m_visitedCallables;
-
-	std::set<VariableDeclaration const*, ASTNode::CompareByID> m_initializedStateVariables;
 	langutil::ErrorReporter& m_errorReporter;
-
-	FunctionDefinition const* m_currentConstructor = nullptr;
-	ContractDefinition const* m_currentConstructorContract = nullptr;
-	bool m_inLoop = false;
-	bool m_inBranch = false;
-	bool m_inCreationContext = true;
-	bool m_inTryStatement = false;
 };
 
 }
diff --git a/test/libsolidity/semanticTests/immutable/delete.sol b/test/libsolidity/semanticTests/immutable/delete.sol
new file mode 100644
index 0000000000..76e219a77d
--- /dev/null
+++ b/test/libsolidity/semanticTests/immutable/delete.sol
@@ -0,0 +1,15 @@
+contract C {
+    uint8 immutable public a;
+    uint8 immutable public b = 0x42;
+    uint public c;
+
+    constructor() {
+        delete a;
+        delete b;
+        c = b * 2 + a;
+    }
+}
+// ----
+// a() -> 0
+// b() -> 0
+// c() -> 0
diff --git a/test/libsolidity/semanticTests/immutable/increment_decrement.sol b/test/libsolidity/semanticTests/immutable/increment_decrement.sol
new file mode 100644
index 0000000000..14304513a3
--- /dev/null
+++ b/test/libsolidity/semanticTests/immutable/increment_decrement.sol
@@ -0,0 +1,18 @@
+contract C {
+    int immutable x = 1;
+    int immutable y = 3;
+
+    constructor() {
+        x--;
+        --x;
+        y++;
+        ++y;
+        --y;
+    }
+
+    function f() public view returns (int, int) {
+        return (x, y);
+    }
+}
+// ----
+// f() -> -1, 4
diff --git a/test/libsolidity/semanticTests/immutable/multiple_initializations.sol b/test/libsolidity/semanticTests/immutable/multiple_initializations.sol
new file mode 100644
index 0000000000..b72f05b110
--- /dev/null
+++ b/test/libsolidity/semanticTests/immutable/multiple_initializations.sol
@@ -0,0 +1,27 @@
+contract A {
+    uint immutable x = x + 1;
+    uint immutable y = x += 2;
+
+    constructor(uint) m(x += 16) m(x += 32) {
+        x += 64;
+        x += 128;
+    }
+
+    modifier m(uint) {
+        _;
+    }
+
+    function get() public returns (uint) {
+        return x;
+    }
+}
+
+contract B is A(A.x += 8) {
+    constructor(uint) {}
+}
+
+contract C is B {
+    constructor() B(x += 4) {}
+}
+// ----
+// get() -> 0xff
diff --git a/test/libsolidity/semanticTests/immutable/uninitialized.sol b/test/libsolidity/semanticTests/immutable/uninitialized.sol
new file mode 100644
index 0000000000..f6d59ce768
--- /dev/null
+++ b/test/libsolidity/semanticTests/immutable/uninitialized.sol
@@ -0,0 +1,11 @@
+contract C {
+    uint immutable u;
+    bool immutable b;
+    address immutable a;
+
+    function get() public returns (uint, bool, address) {
+        return (u, b, a);
+    }
+}
+// ----
+// get() -> 0, false, 0x0
diff --git a/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol b/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol
index 77e73c51f5..d2c473fbb9 100644
--- a/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/conditional_return_uninitialized.sol
@@ -7,5 +7,3 @@ contract C {
         x = 1;
     }
 }
-// ----
-// TypeError 2658: (86-93): Construction control flow ends without initializing all immutable state variables.
diff --git a/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol b/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol
index 052a1b5974..312a76083a 100644
--- a/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/conditionally_initialized.sol
@@ -5,5 +5,3 @@ contract C {
             x = 1;
     }
 }
-// ----
-// TypeError 4599: (86-87): Cannot write to immutable here: Immutable variables cannot be initialized inside an if statement.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol b/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
index 1bd0f6b913..b23d161c17 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_initialization_indirect_reading.sol
@@ -6,5 +6,3 @@ contract C {
 
     function f() public view returns (uint) { return 3 + x; }
 }
-// ----
-// TypeError 7733: (136-137): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol b/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol
index 38ff92945f..5df8d162f6 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_initialization_reading.sol
@@ -4,5 +4,3 @@ contract C {
         x = 3 + x;
     }
 }
-// ----
-// TypeError 7733: (71-72): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol b/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol
index 0a966f7c37..09c3aefa70 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_modifier_args.sol
@@ -9,4 +9,3 @@ contract C {
     function f(uint a) internal pure {}
 }
 // ----
-// TypeError 1581: (59-60): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol b/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol
index 5e3442e55e..113cda75fc 100644
--- a/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/ctor_modifier_reading.sol
@@ -10,5 +10,3 @@ contract C {
 
     function f(uint a) internal pure {}
 }
-// ----
-// TypeError 7733: (119-120): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/decrement.sol b/test/libsolidity/syntaxTests/immutable/decrement.sol
index dd081438a3..4931b5f9f9 100644
--- a/test/libsolidity/syntaxTests/immutable/decrement.sol
+++ b/test/libsolidity/syntaxTests/immutable/decrement.sol
@@ -4,5 +4,3 @@ contract C {
         x--;
     }
 }
-// ----
-// TypeError 3969: (63-64): Immutable variables must be initialized using an assignment.
diff --git a/test/libsolidity/syntaxTests/immutable/delete.sol b/test/libsolidity/syntaxTests/immutable/delete.sol
deleted file mode 100644
index bbb418c17f..0000000000
--- a/test/libsolidity/syntaxTests/immutable/delete.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint immutable x;
-    constructor() {
-        delete x;
-    }
-}
-// ----
-// TypeError 3969: (70-71): Immutable variables must be initialized using an assignment.
diff --git a/test/libsolidity/syntaxTests/immutable/delete_and_initialize.sol b/test/libsolidity/syntaxTests/immutable/delete_and_initialize.sol
deleted file mode 100644
index 1e55d90ce8..0000000000
--- a/test/libsolidity/syntaxTests/immutable/delete_and_initialize.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    uint immutable x = 3;
-    constructor() {
-        delete x;
-    }
-}
-// ----
-// TypeError 2718: (74-75): Immutable variables cannot be modified after initialization.
diff --git a/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol b/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
index 0686885847..e276ba7835 100644
--- a/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/function_initialization_reading.sol
@@ -3,5 +3,3 @@ contract C {
 
     function f() public view returns (uint) { return 3 + x; }
 }
-// ----
-// TypeError 7733: (99-100): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol b/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol
index 0d9dabf90a..cc175d0831 100644
--- a/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol
+++ b/test/libsolidity/syntaxTests/immutable/function_pointer_initializing.sol
@@ -11,4 +11,3 @@ contract C is B(C.f) {
 }
 // ----
 // TypeError 1581: (200-201): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
-// TypeError 1574: (109-110): Immutable state variable already initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol b/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
index 5c026300c2..2658d35d23 100644
--- a/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/function_pointer_reading.sol
@@ -10,4 +10,3 @@ contract C is B(C.f) {
     function f() internal view returns(uint) { return x + 2; }
 }
 // ----
-// TypeError 7733: (205-206): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/increment.sol b/test/libsolidity/syntaxTests/immutable/increment.sol
index 020620159c..62506d88ff 100644
--- a/test/libsolidity/syntaxTests/immutable/increment.sol
+++ b/test/libsolidity/syntaxTests/immutable/increment.sol
@@ -4,5 +4,3 @@ contract C {
         x++;
     }
 }
-// ----
-// TypeError 3969: (63-64): Immutable variables must be initialized using an assignment.
diff --git a/test/libsolidity/syntaxTests/immutable/increment_decrement.sol b/test/libsolidity/syntaxTests/immutable/increment_decrement.sol
deleted file mode 100644
index 7b8092e1e3..0000000000
--- a/test/libsolidity/syntaxTests/immutable/increment_decrement.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-  uint immutable x;
-  uint immutable y;
-  constructor() {
-    ++x;
-    --y;
-  }
-}
-// ----
-// TypeError 3969: (77-78): Immutable variables must be initialized using an assignment.
-// TypeError 3969: (86-87): Immutable variables must be initialized using an assignment.
diff --git a/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol b/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
index ff7927277c..985e5d0b39 100644
--- a/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
+++ b/test/libsolidity/syntaxTests/immutable/indirect_reading_during_statevar_init.sol
@@ -5,4 +5,3 @@ contract C {
     function f() internal pure returns(uint) { return x; }
 }
 // ----
-// TypeError 7733: (112-113): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol
index bc084400e6..025f561612 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_argument.sol
@@ -10,5 +10,3 @@ contract C is B {
     uint immutable y;
     constructor() B(y = 3) { }
 }
-// ----
-// TypeError 1581: (148-149): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol
index 503f182d6c..f1787ab428 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_init.sol
@@ -9,5 +9,3 @@ contract B {
 contract C is B(C.y = 3) {
     uint immutable y;
 }
-// ----
-// TypeError 1581: (104-107): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol
index 2c670df6c5..0ac37261fe 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_ctor_inherit_specifier_argument_reading.sol
@@ -12,5 +12,3 @@ contract C is B(C.y) {
         y = 3;
     }
 }
-// ----
-// TypeError 7733: (104-107): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
index f33ce4cc4d..addd3249c8 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_functions.sol
@@ -16,4 +16,3 @@ contract C is B {
     }
 }
 // ----
-// TypeError 7733: (263-264): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol
index 95ea3e686b..31f510dccc 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_virtual_modifiers.sol
@@ -17,5 +17,3 @@ contract C is B {
         _; f(x);
     }
 }
-// ----
-// TypeError 7733: (245-246): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol b/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol
index 748d9da55b..d7586c433d 100644
--- a/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol
+++ b/test/libsolidity/syntaxTests/immutable/inheritance_wrong_ctor.sol
@@ -7,5 +7,3 @@ contract C is B {
         x = 3;
     }
 }
-// ----
-// TypeError 7484: (88-89): Cannot write to immutable here: Immutable variables must be initialized in the constructor of the contract they are defined in.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol
index d23416942f..f638ae7bf9 100644
--- a/test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol
+++ b/test/libsolidity/syntaxTests/immutable/init_in_constructor_modifier_param.sol
@@ -4,4 +4,3 @@ contract D {
     constructor() m(t = 2) {}
 }
 // ----
-// TypeError 1581: (83-84): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol
index b67d149b2a..63c6057d3e 100644
--- a/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol
+++ b/test/libsolidity/syntaxTests/immutable/init_in_ctor_param.sol
@@ -3,5 +3,3 @@ contract D is C {
   uint immutable t;
   constructor() C(t=2) {}
 }
-// ----
-// TypeError 1581: (92-93): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_function_modifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_function_modifier_param.sol
new file mode 100644
index 0000000000..b429439591
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/init_in_function_modifier_param.sol
@@ -0,0 +1,7 @@
+contract D {
+    uint immutable t;
+    modifier m(uint) { _; }
+    function f() public m(t = 2) {}
+}
+// ----
+// TypeError 1581: (89-90): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_function_via_contract_name.sol b/test/libsolidity/syntaxTests/immutable/init_in_function_via_contract_name.sol
new file mode 100644
index 0000000000..01163f2fe2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/init_in_function_via_contract_name.sol
@@ -0,0 +1,11 @@
+contract B {
+    uint immutable x;
+}
+
+contract C is B {
+    function f() public {
+        B.x = 42;
+    }
+}
+// ----
+// TypeError 1581: (90-93): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_function_via_super.sol b/test/libsolidity/syntaxTests/immutable/init_in_function_via_super.sol
new file mode 100644
index 0000000000..941b5e5167
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/init_in_function_via_super.sol
@@ -0,0 +1,13 @@
+contract B {
+    uint immutable x;
+
+    function g() public {}
+}
+
+contract C is B {
+    function f() public {
+        super.x = 42;
+    }
+}
+// ----
+// TypeError 9582: (118-125): Member "x" not found or not visible after argument-dependent lookup in type(contract super C).
diff --git a/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol b/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
index cc56202e73..f80c238e63 100644
--- a/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
+++ b/test/libsolidity/syntaxTests/immutable/init_in_inheritance_specifier_param.sol
@@ -2,5 +2,3 @@ contract C { constructor(uint) {} }
 contract D is C(D.t = 2) {
     uint immutable t;
 }
-// ----
-// TypeError 1581: (52-55): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/loop_initialized.sol b/test/libsolidity/syntaxTests/immutable/loop_initialized.sol
index d8c8ca47fe..1cbe9add1a 100644
--- a/test/libsolidity/syntaxTests/immutable/loop_initialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/loop_initialized.sol
@@ -5,5 +5,3 @@ contract C {
             x = 1;
     }
 }
-// ----
-// TypeError 6672: (88-89): Cannot write to immutable here: Immutable variables cannot be initialized inside a loop.
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
index 401b068cb6..a87ec76805 100644
--- a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
+++ b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions.sol
@@ -26,4 +26,3 @@ contract C is A, B {
     }
 }
 // ----
-// TypeError 7733: (499-500): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
index bf5a1f85b3..8b8c5dd281 100644
--- a/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
+++ b/test/libsolidity/syntaxTests/immutable/multiple_inheritance_virtual_functions_with_super.sol
@@ -26,4 +26,3 @@ contract C is A, B {
     }
 }
 // ----
-// TypeError 7733: (503-504): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol b/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol
index 93e01db301..8fe5ddcfc0 100644
--- a/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol
+++ b/test/libsolidity/syntaxTests/immutable/multiple_initializations.sol
@@ -5,5 +5,3 @@ contract C {
         x = 4;
     }
 }
-// ----
-// TypeError 1574: (78-79): Immutable state variable already initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/private_state_var.sol b/test/libsolidity/syntaxTests/immutable/private_state_var.sol
index 50af6ace8d..cce1ca0f5f 100644
--- a/test/libsolidity/syntaxTests/immutable/private_state_var.sol
+++ b/test/libsolidity/syntaxTests/immutable/private_state_var.sol
@@ -16,5 +16,3 @@ contract C is B {
     function f() internal view override returns(uint) { return readX(); }
 
 }
-// ----
-// TypeError 7733: (202-203): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
index 6e934ff9d4..b4f56a269d 100644
--- a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
+++ b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init.sol
@@ -8,5 +8,3 @@ contract B is A {
 	uint immutable x = 2;
 	function f() override pure internal returns (uint) { return x; }
 }
-// ----
-// TypeError 7733: (223-224): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol
index 6e939b0b28..7234e0ef0a 100644
--- a/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol
+++ b/test/libsolidity/syntaxTests/immutable/read_in_function_before_init2.sol
@@ -3,5 +3,3 @@ contract C {
   uint x = f();
   function f() internal pure returns (uint) { return t; }
 }
-// ----
-// TypeError 7733: (106-107): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol b/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
index 32ac0cceb4..618ad36f43 100644
--- a/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
+++ b/test/libsolidity/syntaxTests/immutable/reading_after_initialization_function.sol
@@ -13,4 +13,3 @@ contract C {
 	}
 }
 // ----
-// TypeError 7733: (141-142): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol b/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol
index ae73679eab..755de6481a 100644
--- a/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol
+++ b/test/libsolidity/syntaxTests/immutable/reading_during_statevar_init.sol
@@ -2,5 +2,3 @@ contract C {
     uint immutable x = 0;
     uint y = x;
 }
-// ----
-// TypeError 7733: (52-53): Immutable variables cannot be read before they are initialized.
diff --git a/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol b/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol
index 852b5d350b..3a0b3f4367 100644
--- a/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/return_uninitialized.sol
@@ -7,4 +7,4 @@ contract C {
     }
 }
 // ----
-// TypeError 2658: (63-70): Construction control flow ends without initializing all immutable state variables.
+// Warning 5740: (80-85): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/immutable/state_var_external_access_read.sol b/test/libsolidity/syntaxTests/immutable/state_var_external_access_read.sol
new file mode 100644
index 0000000000..64b24b069d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/state_var_external_access_read.sol
@@ -0,0 +1,13 @@
+contract C {
+    uint immutable public x = 42;
+
+    function g() external view returns (uint) {}
+
+    function f() public view returns (uint) {
+        return this.x();
+    }
+
+    function h() public view returns (function () external view returns (uint)) {
+        return this.x;
+    }
+}
diff --git a/test/libsolidity/syntaxTests/immutable/state_var_external_access_write.sol b/test/libsolidity/syntaxTests/immutable/state_var_external_access_write.sol
new file mode 100644
index 0000000000..4baa743cb2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/immutable/state_var_external_access_write.sol
@@ -0,0 +1,11 @@
+contract C {
+    uint immutable public x = 42;
+
+    function g() external view returns (uint) {}
+
+    function f() public view {
+        this.x = this.g;
+    }
+}
+// ----
+// TypeError 4247: (137-143): Expression has to be an lvalue.
diff --git a/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol b/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol
index 9cd18a2b61..fe969a20d0 100644
--- a/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/try_catch_initialized.sol
@@ -33,9 +33,3 @@ contract B
 }
 // ====
 // EVMVersion: >=byzantium
-// ----
-// TypeError 4130: (108-116): Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement.
-// TypeError 4130: (144-152): Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement.
-// TypeError 4130: (216-224): Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement.
-// TypeError 4130: (297-305): Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement.
-// TypeError 4130: (357-365): Cannot write to immutable here: Immutable variables cannot be initialized inside a try/catch statement.
diff --git a/test/libsolidity/syntaxTests/immutable/uninitialized.sol b/test/libsolidity/syntaxTests/immutable/uninitialized.sol
index d1791fe0f8..bf7c68a847 100644
--- a/test/libsolidity/syntaxTests/immutable/uninitialized.sol
+++ b/test/libsolidity/syntaxTests/immutable/uninitialized.sol
@@ -1,5 +1,3 @@
 contract C {
     uint immutable x;
 }
-// ----
-// TypeError 2658: (0-36): Construction control flow ends without initializing all immutable state variables.
diff --git a/test/libsolidity/syntaxTests/immutable/uninitialized_private_state_var.sol b/test/libsolidity/syntaxTests/immutable/uninitialized_private_state_var.sol
index 544111e4c8..70bd1448a9 100644
--- a/test/libsolidity/syntaxTests/immutable/uninitialized_private_state_var.sol
+++ b/test/libsolidity/syntaxTests/immutable/uninitialized_private_state_var.sol
@@ -16,6 +16,3 @@ contract C is B {
     function f() internal view override returns(uint) { return readX(); }
 
 }
-// ----
-// TypeError 2658: (0-202): Construction control flow ends without initializing all immutable state variables.
-// TypeError 2658: (204-361): Construction control flow ends without initializing all immutable state variables.
diff --git a/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol b/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol
index 06d2bfa798..2917f276b7 100644
--- a/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol
+++ b/test/libsolidity/syntaxTests/immutable/variable_declaration_already.sol
@@ -3,6 +3,3 @@ contract C {
     uint immutable x = z = y = 3;
     uint immutable y = 5;
 }
-// ----
-// TypeError 1581: (66-67): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
-// TypeError 1581: (62-63): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.
diff --git a/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol b/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol
index 2c98ffd791..6451c8e207 100644
--- a/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol
+++ b/test/libsolidity/syntaxTests/immutable/variable_declaration_value.sol
@@ -1,5 +1,3 @@
 contract C {
     int immutable x = x = 5;
 }
-// ----
-// TypeError 1581: (35-36): Cannot write to immutable here: Immutable variables can only be initialized inline or assigned directly in the constructor.

From 11be2f4881d1644f15b026d1022388f06a034a34 Mon Sep 17 00:00:00 2001
From: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date: Fri, 14 Jul 2023 11:31:06 -0700
Subject: [PATCH 1489/1748] Squashed commit of the following: (#14401)

commit 6f38009a31b2ff5d6f53de7b74469f495fe04092
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 10 15:36:03 2023 -0700

    remove default sphinx footer

commit 0d842749566f40fa8c2dd434fa67bcc5e9df3aa0
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 10 15:21:26 2023 -0700

    linting

commit c8484ac7c1f54067b0d3c4aa4aa81de7d36df71d
Merge: 8339800d0 b583e9e64
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 10 14:15:03 2023 -0700

    Merge branch 'develop' into docs-rebrand

commit 8339800d0fdd197f589337e1198867d4198a3850
Merge: 633c673c5 88d5e06d4
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 10 14:11:58 2023 -0700

    Merge branch 'rebrand' into docs-rebrand

commit 88d5e06d4ce79696b9451991b33834ecc55bf66d
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 10 14:11:52 2023 -0700

    remove dev code

commit 633c673c5e227009917d888e1f0991f33aa75f44
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 10 14:02:25 2023 -0700

    update home url poitner to production domain

commit b3689cb7c230e1fb3a97400e5412ec14c34fc586
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 10 13:59:34 2023 -0700

    fix external link arrow to match core site

commit b7a28a5dfe7517a88870afe67783e9e300b85af4
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 10 13:59:19 2023 -0700

    swap in cdnfonts for overpass fonts

commit e979ad5c9f69c9c7ee369a0700a64ea6d9061c2b
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 10 08:30:48 2023 -0700

    fix external link arrow spacing/underline

commit b90077863cfff5d8776f5dc74f82f061e0162d37
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Thu Jul 6 16:26:28 2023 -0700

    update foot note

commit ed9ddfd327cd0e382286abf0c8896c7c879512b2
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Thu Jul 6 13:12:14 2023 -0700

    update nav link hover color

commit 077d3a0c9333c96cbabc3ce2bccf00afac19a312
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Tue Jul 4 20:27:05 2023 -0700

    bug fixed for header/nav-link styling

commit 2584dd2e419255ec93430446bd049ff90155987e
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Tue Jul 4 12:15:09 2023 -0700

    fix link shift bug

commit 885d2bc52ca3ed9e4727d7f0eaed0e312fedaaaa
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Tue Jul 4 12:13:03 2023 -0700

    update nav link hover styling

commit d06c81592ad88ad2e81701cec9e85b6a3cee86ee
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 3 18:25:37 2023 -0700

    extract event listener functions

commit 414e444ee67fe937d1295b14ac8591a710bfbdff
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jul 3 18:22:08 2023 -0700

    a11y: skip to content link

commit 6c628ea73995dad9b9a6fb502bb216d88f0e9602
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 21:57:24 2023 -0700

    fine-tuning more styling

commit 71b617abaf27c34fcecaf6e30795687abf9885f7
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 21:37:02 2023 -0700

    fix primary link color

commit d90627418c605bff4398a9e24ae0c5c685f73992
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 21:21:30 2023 -0700

    fix mobile versions expansion

commit f0f0fbbcb74ea35efa6e4cf87ab1d855f1ae2bd2
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 21:21:16 2023 -0700

    update code styling

commit 727c7ee9b69427eddd73012a89e6ee9ae1ccec8d
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 21:20:38 2023 -0700

    remix link styling

commit 4059c00e3d704002ef34f85fd86495f2a4ac9e57
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 21:19:49 2023 -0700

    fix whitespace styling

commit 631e2910a53484b97770cad1b3439d412a0ab6d0
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 20:33:54 2023 -0700

    fix search input styling

commit 5e06b22a7200b0774bd135c666b4e3437d342350
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 19:37:19 2023 -0700

    css adjustments

commit 637d5122038fd6075cd53d57537d728b730acbcf
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 19:15:05 2023 -0700

    selector adjustments, linting

commit 781dc7c3009dc406b36cd2bdcb2d02c3c34fafa6
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 18:26:09 2023 -0700

    top version/search layout adjustments

commit 7341e17003700133659e5f64ee2d1369ac50e434
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jul 2 18:18:21 2023 -0700

    update version div styling

commit 3a4b3feb581b1799e48d395b73aca05760dc5658
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sat Jul 1 21:18:12 2023 -0700

    restyle external link arrow for forum link

commit e6cef6312ca73c125c01b78573f21c75fcbbfc87
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sat Jul 1 20:50:31 2023 -0700

    add woff2 fonts, use absolute font urls

commit 3bc401b1dbe971501826011a692c38ee9ce4b992
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sat Jul 1 15:15:26 2023 -0700

    fix nav button alignment

commit b7d607b7090e1ac6ded55ac6e534549609226236
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Fri Jun 30 19:02:24 2023 -0700

    rename pcm param to color

commit d67e23539f720250bb298c11fd2b1b6d7dbb0815
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Fri Jun 30 17:34:56 2023 -0700

    center align footer buttons, fix bug on pre text

commit 34a665038dc27e2b8874b3e16ffc581c33f31bc5
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Thu Jun 29 16:40:26 2023 -0700

    preload fonts

commit 5b987c31455ffe02135e357ea560bbad8a9c6745
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Thu Jun 29 15:31:41 2023 -0700

    antialiased font smoothing

commit 9585fb5bb73f67e37a4f9f1da83e7b133f0b4446
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Thu Jun 29 13:44:51 2023 -0700

    search results styling

commit 224ed028b181b3944d2f2e33f4122b15f38f7608
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Thu Jun 29 13:29:09 2023 -0700

    restore search functionality

commit ec5782a01cd0f1c1808b353560c39911c9fdc645
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Wed Jun 28 21:55:11 2023 -0700

    more mobile menu and styling fixes

commit c033f05e2ab839309e7d3864ae66c465d801e806
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Wed Jun 28 13:14:22 2023 -0700

    patch location cleaner

commit 6cae3b5ad67e38f6decfa18eeacce973783a2fc1
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Tue Jun 27 17:49:28 2023 -0700

    patch location cleaner

commit e86e6a11189ed57f122382c901fe7a0f49518e83
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Tue Jun 27 17:40:11 2023 -0700

    color mode continuity

commit c3ba4ee6c614fa637a34eacbae60c5e88cd018c5
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Tue Jun 27 15:32:11 2023 -0700

    refactor layout

commit ac3bae8f34ccbd08f68cb784b3ec00bad70a9281
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jun 26 14:35:00 2023 -0700

    color and styling updates

commit 42e301818d3d11152c5ce630c8085db1c1664a13
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jun 26 13:23:03 2023 -0700

    highlight active nav link

commit fb72573c01494486ab9b0942c3f67c372af0d5e6
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jun 26 12:34:25 2023 -0700

    patch mobile menu bottom scroll stop

commit 2dcef754301d35143ea24ca197906c974e128a25
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Mon Jun 26 12:32:38 2023 -0700

    adjust header icon sizes

commit dc75b636b7f442dfe7aaa80ad82470be0f3d4f19
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jun 25 21:41:18 2023 -0700

    fix header icon sizes

commit de70f1a56eba85c89c1f01f37770b1d6bd91d5db
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sun Jun 25 19:58:18 2023 -0700

    mobile meun debugging

commit 1fe20565a838c2f2212cd95045cd309b076c8b2b
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sat Jun 24 13:21:23 2023 -0700

    icon color mode improvements

commit fcb134a4209371277693e919fb06eaeb53e36cb6
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sat Jun 24 11:51:24 2023 -0700

    initialize with menu closed

commit defa7c78e981037409ec9d2b9ab871910023f5b0
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Sat Jun 24 11:37:47 2023 -0700

    color toggle and mobile menu

commit 695d719612be0ed9cac0f246f0eaf91f3fdb2e75
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Fri Jun 23 16:39:32 2023 -0700

    forum url as external link

commit ad182602095909d84331339993b31f2a37bf1cd7
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Fri Jun 23 16:28:14 2023 -0700

    patch contributing path

commit fbfeaa7a12a1b9bc86b766a0e490b85d2ded8849
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Fri Jun 23 16:20:57 2023 -0700

    update contribute path

commit f7dbf1f2e0a3e31d164d6cc67c952f89c3f8f49e
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Fri Jun 23 16:05:22 2023 -0700

    dev: point to vercel build for new solidity site

commit c344c1df86e78ad6ab9bc066ac75659180d068cf
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Fri Jun 23 14:30:40 2023 -0700

    update stylesheets, constants, logos

commit c15135378c8568ed93bf685552940cdbe1c07b70
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Fri Jun 23 10:25:05 2023 -0700

    bg color cleanup

commit c049df77d9d55adc796bc2f8cd7c186d833aca69
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Thu Jun 22 19:02:49 2023 -0700

    clean up initialize and toggle scripts

    deprecate dark.css in lieu of a dark more html attribute indicator and css selectors for this attribute. Avoids needing to enable/disable dark stylesheet

commit 881c9cce66e18d30b50c467a22d98836698f5b58
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Thu Jun 22 18:59:24 2023 -0700

    import type faces

commit e9b26157aabf4374754cf14d9a4a980c92bd139c
Author: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date:   Thu Jun 22 15:39:00 2023 -0700

    implement initial styling adjustments
---
 docs/README.md                                |  23 +
 docs/_static/css/custom-dark.css              | 595 +++++++++++++
 docs/_static/css/custom.css                   | 807 +++++++++++++++++-
 docs/_static/css/dark.css                     | 652 --------------
 docs/_static/css/fonts.css                    |   2 +
 docs/_static/css/pygments.css                 | 399 +++++++++
 docs/_static/css/toggle.css                   |  15 +-
 docs/_static/fonts/overpass-bold.otf          | Bin 0 -> 68828 bytes
 docs/_static/fonts/overpass-bold.woff2        | Bin 0 -> 38728 bytes
 docs/_static/fonts/overpass-italic.otf        | Bin 0 -> 72500 bytes
 docs/_static/fonts/overpass-light.otf         | Bin 0 -> 69324 bytes
 docs/_static/fonts/overpass-mono-bold.otf     | Bin 0 -> 95240 bytes
 docs/_static/fonts/overpass-mono-bold.woff2   | Bin 0 -> 20532 bytes
 docs/_static/fonts/overpass-mono-regular.otf  | Bin 0 -> 94520 bytes
 .../_static/fonts/overpass-mono-regular.woff2 | Bin 0 -> 20532 bytes
 .../overpass-mono/overpass-mono-bold.otf      | Bin 0 -> 95240 bytes
 .../overpass-mono/overpass-mono-regular.otf   | Bin 0 -> 94520 bytes
 docs/_static/fonts/overpass-regular.otf       | Bin 0 -> 69808 bytes
 docs/_static/fonts/overpass-regular.woff2     | Bin 0 -> 38728 bytes
 docs/_static/fonts/overpass-semibold.otf      | Bin 0 -> 65704 bytes
 docs/_static/fonts/overpass/overpass-bold.otf | Bin 0 -> 68828 bytes
 .../fonts/overpass/overpass-italic.otf        | Bin 0 -> 72500 bytes
 .../_static/fonts/overpass/overpass-light.otf | Bin 0 -> 69324 bytes
 .../fonts/overpass/overpass-regular.otf       | Bin 0 -> 69808 bytes
 .../fonts/overpass/overpass-semibold.otf      | Bin 0 -> 65704 bytes
 docs/_static/img/favicon.ico                  | Bin 0 -> 15086 bytes
 docs/_static/img/hamburger-dark.svg           |   3 +
 docs/_static/img/hamburger-light.svg          |   3 +
 docs/_static/img/logo-dark.svg                |   8 +
 docs/_static/img/logo.svg                     |   8 +
 docs/_static/img/moon.svg                     |   3 +
 docs/_static/img/sun.svg                      |  13 +
 docs/_static/js/constants.js                  |  31 +
 docs/_static/js/initialize.js                 | 250 ++++++
 docs/_static/js/toggle.js                     |  74 +-
 docs/conf.py                                  |  14 +-
 docs/logo.svg                                 |  33 +-
 37 files changed, 2178 insertions(+), 755 deletions(-)
 create mode 100644 docs/README.md
 create mode 100644 docs/_static/css/custom-dark.css
 delete mode 100644 docs/_static/css/dark.css
 create mode 100644 docs/_static/css/fonts.css
 create mode 100644 docs/_static/css/pygments.css
 create mode 100644 docs/_static/fonts/overpass-bold.otf
 create mode 100644 docs/_static/fonts/overpass-bold.woff2
 create mode 100644 docs/_static/fonts/overpass-italic.otf
 create mode 100644 docs/_static/fonts/overpass-light.otf
 create mode 100644 docs/_static/fonts/overpass-mono-bold.otf
 create mode 100644 docs/_static/fonts/overpass-mono-bold.woff2
 create mode 100644 docs/_static/fonts/overpass-mono-regular.otf
 create mode 100644 docs/_static/fonts/overpass-mono-regular.woff2
 create mode 100644 docs/_static/fonts/overpass-mono/overpass-mono-bold.otf
 create mode 100644 docs/_static/fonts/overpass-mono/overpass-mono-regular.otf
 create mode 100644 docs/_static/fonts/overpass-regular.otf
 create mode 100644 docs/_static/fonts/overpass-regular.woff2
 create mode 100644 docs/_static/fonts/overpass-semibold.otf
 create mode 100644 docs/_static/fonts/overpass/overpass-bold.otf
 create mode 100644 docs/_static/fonts/overpass/overpass-italic.otf
 create mode 100644 docs/_static/fonts/overpass/overpass-light.otf
 create mode 100644 docs/_static/fonts/overpass/overpass-regular.otf
 create mode 100644 docs/_static/fonts/overpass/overpass-semibold.otf
 create mode 100644 docs/_static/img/favicon.ico
 create mode 100644 docs/_static/img/hamburger-dark.svg
 create mode 100644 docs/_static/img/hamburger-light.svg
 create mode 100644 docs/_static/img/logo-dark.svg
 create mode 100644 docs/_static/img/logo.svg
 create mode 100644 docs/_static/img/moon.svg
 create mode 100644 docs/_static/img/sun.svg
 create mode 100644 docs/_static/js/constants.js
 create mode 100644 docs/_static/js/initialize.js

diff --git a/docs/README.md b/docs/README.md
new file mode 100644
index 0000000000..a3b5f25aed
--- /dev/null
+++ b/docs/README.md
@@ -0,0 +1,23 @@
+# Solidity Language Docs
+
+## Local environment setup
+
+1. Install python https://www.python.org/downloads/
+1. Install sphinx (the tool used to generate the docs) https://www.sphinx-doc.org/en/master/usage/installation.html
+
+Go to `/docs` and run `./docs.sh` to install dependencies and build the project:
+
+```sh
+cd docs
+./docs.sh
+```
+
+That will output the generated htmls under _build/
+
+## Serve environment
+
+```py
+python3 -m http.server -d _build/html --cgi 8080
+```
+
+Visit dev server at http://localhost:8080
diff --git a/docs/_static/css/custom-dark.css b/docs/_static/css/custom-dark.css
new file mode 100644
index 0000000000..044a8f800d
--- /dev/null
+++ b/docs/_static/css/custom-dark.css
@@ -0,0 +1,595 @@
+
+
+/* DARK MODE STYLING */
+
+/* code directives */
+
+:root[style*=dark] .method dt,
+:root[style*=dark] .class dt,
+:root[style*=dark] .data dt,
+:root[style*=dark] .attribute dt,
+:root[style*=dark] .function dt,
+:root[style*=dark] .classmethod dt,
+:root[style*=dark] .exception dt,
+:root[style*=dark] .descclassname,
+:root[style*=dark] .descname {
+  background-color: #2d2d2d !important;
+}
+
+:root[style*=dark] .rst-content dl:not(.docutils) dt {
+  background-color: #0008;
+  border-top: solid 3px #fff2;
+  border-left: solid 3px #fff2;
+}
+
+:root[style*=dark] em.property {
+  color: #888888;
+}
+
+
+/* tables */
+
+:root[style*=dark] .rst-content table.docutils td {
+  border: 0px;
+}
+
+:root[style*=dark] .rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td {
+  background-color: #0002;
+}
+
+:root[style*=dark] .rst-content pre {
+  background: none;
+}
+
+/* inlined code highlights */
+
+:root[style*=dark] .xref,
+:root[style*=dark] .py-meth {
+  color: #aaddff !important;
+  font-weight: normal !important;
+}
+
+/* highlight color search text */
+
+:root[style*=dark] .rst-content .highlighted {
+  background: #ff5722;
+  box-shadow: 0 0 0 2px #f0978b;
+}
+
+/* notes, warnings, hints */
+
+:root[style*=dark] .hint .admonition-title {
+  background: #2aa87c !important;
+}
+
+:root[style*=dark] .warning .admonition-title {
+  background: #cc4444 !important;
+}
+
+:root[style*=dark] .admonition-title {
+  background: #3a7ca8 !important;
+}
+
+:root[style*=dark] .admonition,
+:root[style*=dark] .note {
+  background-color: #0008 !important;
+}
+
+
+/* table of contents */
+
+:root[style*=dark] .sidebar {
+  background-color: #191919 !important;
+}
+
+:root[style*=dark] .sidebar-title {
+  background-color: #2b2b2b !important;
+}
+
+:root[style*=dark] .wy-menu-vertical code.docutils.literal.notranslate {
+  background: none !important;
+  border: none !important;
+}
+
+
+:root[style*=dark] .toc-backref {
+  color: grey !important;
+}
+
+:root[style*=dark] .highlight {
+  background: #0008;
+  color: #f8f8f2
+}
+
+:root[style*=dark] .highlight .c {
+  color: #888
+}
+
+
+/* Comment */
+
+:root[style*=dark] .highlight .err {
+  color: #960050;
+  background-color: #1e0010
+}
+
+
+/* Error */
+
+:root[style*=dark] .highlight .k {
+  color: #66d9ef
+}
+
+
+/* Keyword */
+
+:root[style*=dark] .highlight .l {
+  color: #ae81ff
+}
+
+
+/* Literal */
+
+:root[style*=dark] .highlight .n {
+  color: #f8f8f2
+}
+
+
+/* Name */
+
+:root[style*=dark] .highlight .o {
+  color: #f92672
+}
+
+
+/* Operator */
+
+:root[style*=dark] .highlight .p {
+  color: #f8f8f2
+}
+
+
+/* Punctuation */
+
+:root[style*=dark] .highlight .ch {
+  color: #888
+}
+
+
+/* Comment.Hashbang */
+
+:root[style*=dark] .highlight .cm {
+  color: #888
+}
+
+
+/* Comment.Multiline */
+
+:root[style*=dark] .highlight .cp {
+  color: #888
+}
+
+
+/* Comment.Preproc */
+
+:root[style*=dark] .highlight .cpf {
+  color: #888
+}
+
+
+/* Comment.PreprocFile */
+
+:root[style*=dark] .highlight .c1 {
+  color: #888
+}
+
+
+/* Comment.Single */
+
+:root[style*=dark] .highlight .cs {
+  color: #888
+}
+
+
+/* Comment.Special */
+
+:root[style*=dark] .highlight .gd {
+  color: #f92672
+}
+
+
+/* Generic.Deleted */
+
+:root[style*=dark] .highlight .ge {
+  font-style: italic
+}
+
+
+/* Generic.Emph */
+
+:root[style*=dark] .highlight .gi {
+  color: #a6e22e
+}
+
+
+/* Generic.Inserted */
+
+:root[style*=dark] .highlight .gs {
+  font-weight: bold
+}
+
+
+/* Generic.Strong */
+
+:root[style*=dark] .highlight .gu {
+  color: #888
+}
+
+
+/* Generic.Subheading */
+
+:root[style*=dark] .highlight .kc {
+  color: #66d9ef
+}
+
+
+/* Keyword.Constant */
+
+:root[style*=dark] .highlight .kd {
+  color: #66d9ef
+}
+
+
+/* Keyword.Declaration */
+
+:root[style*=dark] .highlight .kn {
+  color: #f92672
+}
+
+
+/* Keyword.Namespace */
+
+:root[style*=dark] .highlight .kp {
+  color: #66d9ef
+}
+
+
+/* Keyword.Pseudo */
+
+:root[style*=dark] .highlight .kr {
+  color: #66d9ef
+}
+
+
+/* Keyword.Reserved */
+
+:root[style*=dark] .highlight .kt {
+  color: #66d9ef
+}
+
+
+/* Keyword.Type */
+
+:root[style*=dark] .highlight .ld {
+  color: #e6db74
+}
+
+
+/* Literal.Date */
+
+:root[style*=dark] .highlight .m {
+  color: #ae81ff
+}
+
+
+/* Literal.Number */
+
+:root[style*=dark] .highlight .s {
+  color: #e6db74
+}
+
+
+/* Literal.String */
+
+:root[style*=dark] .highlight .na {
+  color: #a6e22e
+}
+
+
+/* Name.Attribute */
+
+:root[style*=dark] .highlight .nb {
+  color: #f8f8f2
+}
+
+
+/* Name.Builtin */
+
+:root[style*=dark] .highlight .nc {
+  color: #a6e22e
+}
+
+
+/* Name.Class */
+
+:root[style*=dark] .highlight .no {
+  color: #66d9ef
+}
+
+
+/* Name.Constant */
+
+:root[style*=dark] .highlight .nd {
+  color: #a6e22e
+}
+
+
+/* Name.Decorator */
+
+:root[style*=dark] .highlight .ni {
+  color: #f8f8f2
+}
+
+
+/* Name.Entity */
+
+:root[style*=dark] .highlight .ne {
+  color: #a6e22e
+}
+
+
+/* Name.Exception */
+
+:root[style*=dark] .highlight .nf {
+  color: #a6e22e
+}
+
+
+/* Name.Function */
+
+:root[style*=dark] .highlight .nl {
+  color: #f8f8f2
+}
+
+
+/* Name.Label */
+
+:root[style*=dark] .highlight .nn {
+  color: #f8f8f2
+}
+
+
+/* Name.Namespace */
+
+:root[style*=dark] .highlight .nx {
+  color: #a6e22e
+}
+
+
+/* Name.Other */
+
+:root[style*=dark] .highlight .py {
+  color: #f8f8f2
+}
+
+
+/* Name.Property */
+
+:root[style*=dark] .highlight .nt {
+  color: #f92672
+}
+
+
+/* Name.Tag */
+
+:root[style*=dark] .highlight .nv {
+  color: #f8f8f2
+}
+
+
+/* Name.Variable */
+
+:root[style*=dark] .highlight .ow {
+  color: #f92672
+}
+
+
+/* Operator.Word */
+
+:root[style*=dark] .highlight .w {
+  color: #f8f8f2
+}
+
+
+/* Text.Whitespace */
+
+:root[style*=dark] .highlight .mb {
+  color: #ae81ff
+}
+
+
+/* Literal.Number.Bin */
+
+:root[style*=dark] .highlight .mf {
+  color: #ae81ff
+}
+
+
+/* Literal.Number.Float */
+
+:root[style*=dark] .highlight .mh {
+  color: #ae81ff
+}
+
+
+/* Literal.Number.Hex */
+
+:root[style*=dark] .highlight .mi {
+  color: #ae81ff
+}
+
+
+/* Literal.Number.Integer */
+
+:root[style*=dark] .highlight .mo {
+  color: #ae81ff
+}
+
+
+/* Literal.Number.Oct */
+
+:root[style*=dark] .highlight .sa {
+  color: #e6db74
+}
+
+
+/* Literal.String.Affix */
+
+:root[style*=dark] .highlight .sb {
+  color: #e6db74
+}
+
+
+/* Literal.String.Backtick */
+
+:root[style*=dark] .highlight .sc {
+  color: #e6db74
+}
+
+
+/* Literal.String.Char */
+
+:root[style*=dark] .highlight .dl {
+  color: #e6db74
+}
+
+
+/* Literal.String.Delimiter */
+
+:root[style*=dark] .highlight .sd {
+  color: #e6db74
+}
+
+
+/* Literal.String.Doc */
+
+:root[style*=dark] .highlight .s2 {
+  color: #e6db74
+}
+
+
+/* Literal.String.Double */
+
+:root[style*=dark] .highlight .se {
+  color: #ae81ff
+}
+
+
+/* Literal.String.Escape */
+
+:root[style*=dark] .highlight .sh {
+  color: #e6db74
+}
+
+
+/* Literal.String.Heredoc */
+
+:root[style*=dark] .highlight .si {
+  color: #e6db74
+}
+
+
+/* Literal.String.Interpol */
+
+:root[style*=dark] .highlight .sx {
+  color: #e6db74
+}
+
+
+/* Literal.String.Other */
+
+:root[style*=dark] .highlight .sr {
+  color: #e6db74
+}
+
+
+/* Literal.String.Regex */
+
+:root[style*=dark] .highlight .s1 {
+  color: #e6db74
+}
+
+
+/* Literal.String.Single */
+
+:root[style*=dark] .highlight .ss {
+  color: #e6db74
+}
+
+
+/* Literal.String.Symbol */
+
+:root[style*=dark] .highlight .bp {
+  color: #f8f8f2
+}
+
+
+/* Name.Builtin.Pseudo */
+
+:root[style*=dark] .highlight .fm {
+  color: #a6e22e
+}
+
+
+/* Name.Function.Magic */
+
+:root[style*=dark] .highlight .vc {
+  color: #f8f8f2
+}
+
+
+/* Name.Variable.Class */
+
+:root[style*=dark] .highlight .vg {
+  color: #f8f8f2
+}
+
+
+/* Name.Variable.Global */
+
+:root[style*=dark] .highlight .vi {
+  color: #f8f8f2
+}
+
+
+/* Name.Variable.Instance */
+
+:root[style*=dark] .highlight .vm {
+  color: #f8f8f2
+}
+
+
+/* Name.Variable.Magic */
+
+:root[style*=dark] .highlight .il {
+  color: #ae81ff
+}
+
+
+/* Grammar */
+
+:root[style*=dark] .railroad-diagram {
+  fill: white;
+}
+
+:root[style*=dark] .railroad-diagram path {
+  stroke: white;
+}
+
+:root[style*=dark] .railroad-diagram rect {
+  stroke: white;
+}
+
+:root[style*=dark] .a4 .sig-name {
+  background-color: transparent !important;
+}
diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
index 4189fcd06c..ed21675dd2 100644
--- a/docs/_static/css/custom.css
+++ b/docs/_static/css/custom.css
@@ -1,9 +1,166 @@
+/* ROOT DECLARATIONS */
+:root {
+    /* Text */
+    --color-a: #2B247C;
+    --color-b: #672AC8;
+    --color-c: #5554D9;
+    --color-d: #9F94E8;
+    --color-e: #AEC0F1;
+    --color-f: #E6E3EC;
+    /* Background */
+
+    --white: #FAF8FF;
+    --black: #110C4E;
+    --menu-bg: #2B247C06;
+    --shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
+
+    --navHeight: 4.5rem;
+    --sideWidth: 300px;
+
+    text-rendering: geometricPrecision;
+    -webkit-font-smoothing: antialiased;
+}
+
+a,
+button {
+    border-radius: 0;
+}
+
+:root[style*=dark] {
+    --color-a: #E6E3EC !important;
+    --color-b: #AEC0F1 !important;
+    --color-c: #9F94E8 !important;
+    --color-d: #5554D9 !important;
+    --color-e: #672AC8 !important;
+    --color-f: #2B247C !important;
+
+    --white: #110C4E !important;
+    --black: #FAF8FF !important;
+    --menu-bg: #E6E3EC06 !important;
+}
+
+html,
+body,
+.unified-header::before,
+.wy-nav-side,
+.rst-versions,
+code,
+div,
+input[type=text],
+a,
+.wy-grid-for-nav {
+    transition: background 150ms ease-in-out;
+}
+
+html,
+body,
+.wy-grid-for-nav {
+    background-color: var(--color-f) !important;
+    position: relative;
+}
+
+body {
+    font-family: "Overpass", sans-serif;
+}
+
+a {
+    color: var(--color-c);
+}
+
+hr {
+    margin-block: 2rem;
+    border-color: var(--color-d) !important;
+}
+
+
+/* HEADER STYLES */
+h1 {
+    font-family: 'Overpass', sans-serif;
+    font-weight: 700;
+    font-size: 44px;
+    color: var(--color-a) !important;
+    line-height: 1.1;
+    text-wrap: balance;
+    margin-top: 4rem;
+    margin-bottom: 1.5rem;
+}
+
+section:first-of-type h1:first-of-type {
+    font-family: 'Overpass mono', monospace;
+    font-size: 48px;
+    margin-top: 3rem;
+    margin-bottom: 5rem;
+}
+
+h2 {
+    font-family: 'Overpass', sans-serif;
+    font-weight: 700;
+    font-size: 38px;
+    color: var(--color-a) !important;
+    line-height: 46px;
+    text-wrap: balance;
+    margin-top: 4rem;
+    margin-bottom: 1.5rem;
+}
+
+*:not([role=navigation])>p[role=heading]>span,
+h3 {
+    font-family: 'Overpass', sans-serif;
+    font-weight: 700;
+    font-size: 32px;
+    color: var(--color-a) !important;
+    line-height: 46px;
+    text-wrap: balance;
+    margin-top: 4rem;
+    margin-bottom: 1.5rem;
+}
+
+h4 {
+    font-family: 'Overpass', sans-serif;
+    font-weight: 700;
+    font-size: 32px;
+    color: var(--color-a) !important;
+    line-height: 46px;
+    text-wrap: balance;
+    margin-top: 3rem;
+    margin-bottom: 1.5rem;
+}
+
+h5 {
+    font-family: 'Overpass', sans-serif;
+    font-weight: 700;
+    font-size: 18px;
+    color: var(--color-a) !important;
+    line-height: 1.4;
+    text-wrap: balance;
+}
+
+h6 {
+    font-family: 'Overpass', sans-serif;
+    font-weight: 700;
+    font-size: 16px;
+    color: var(--color-a) !important;
+    line-height: 1.4;
+    text-wrap: balance;
+}
+
+span.pre,
 pre {
-    white-space: pre-wrap;       /* css-3 */
-    white-space: -moz-pre-wrap;  /* Mozilla, since 1999 */
-    white-space: -pre-wrap;      /* Opera 4-6 */
-    white-space: -o-pre-wrap;    /* Opera 7 */
+    /* css-3 */
+    white-space: pre-wrap;
+    /* Mozilla, since 1999 */
+    white-space: -moz-pre-wrap;
+    /* Opera 4-6 */
+    white-space: -pre-wrap;
+    /* Opera 7 */
+    white-space: -o-pre-wrap;
     word-wrap: break-word;
+    font-family: 'Overpass Mono', monospace;
+}
+
+small,
+small * {
+    font-size: 12px;
 }
 
 .wy-table-responsive table td,
@@ -16,10 +173,6 @@ pre {
 }
 
 /* links */
-.rst-content a:not(:visited) {
-    color: #002fa7;
-}
-
 .rst-content .highlighted {
     background: #eac545;
 }
@@ -29,24 +182,12 @@ pre {
     background: #fafafa;
 }
 
-.wy-side-nav-search > a img.logo {
-    width: 100px;
-    padding: 0;
-}
-
-.wy-side-nav-search > a {
-    padding: 0;
-    margin: 0;
-}
-
 /* project version (displayed under project logo) */
-.wy-side-nav-search > div.version {
-    color: #272525;
-}
-
-/* menu section headers */
-.wy-menu p.caption {
-    color: #65afff;
+.wy-side-nav-search>div.version {
+    color: var(--color-b);
+    margin-top: 0;
+    margin-bottom: 0.5rem;
+    text-align: start;
 }
 
 /* Link to Remix IDE shown next to code snippets */
@@ -58,18 +199,618 @@ pre {
 }
 
 .rst-content .remix-link-container a.remix-link {
-    display: inline-block;
     font-size: 0.7em;
-    padding: 0.1em 0.4em;
-    background: #e1e4e5;
-    color: #707070;
-}
-
-.rst-content .remix-link-container a.remix-link:hover {
-    background: #c8cbcc;
+    padding: 0.1em 0.5em;
+    background: transparent;
+    color: var(--color-a) !important;
+    border: 1px solid var(--color-a);
+    text-decoration: none;
 }
 
 .rst-content div.highlight-solidity,
 .rst-content div.highlight-yul {
     margin-top: 0;
 }
+
+/* CUSTOMIZATION UPDATES */
+
+.wy-nav-content-wrap,
+.wy-nav-content {
+    background: transparent !important;
+}
+
+.wy-side-nav-search {
+    background-color: transparent !important;
+    color: var(--color-a) !important;
+    box-shadow: 0 4 4 0 var(--color-a);
+    border-bottom: 1px solid var(--color-d) !important;
+}
+
+.wy-side-nav-search svg {
+    color: var(--color-a) !important;
+}
+
+.wy-nav-top {
+    background-color: transparent !important;
+    color: var(--color-a) !important;
+}
+
+.wy-nav-top a {
+    color: var(--color-a) !important;
+}
+
+.wy-breadcrumbs a.icon-home:before {
+    content: "Documentation";
+    font-family: "Overpass", sans-serif;
+}
+
+.rst-content table.docutils thead {
+    color: var(--color-a);
+}
+
+code.docutils.literal.notranslate {
+    padding: 2px 4px;
+    font-size: 0.875em;
+    font-family: "Overpass Mono", monospace;
+    background: var(--white);
+    color: var(--color-c);
+    border: 0px;
+}
+
+dt code.docutils.literal.notranslate {
+    background: none;
+}
+
+.wy-nav-content {
+    color: var(--color-a);
+}
+
+/* .rst-content a:not(:visited) { */
+/* color: var(--color-b) !important; */
+/* } */
+
+.rst-content a:visited {
+    color: var(--color-c) !important;
+}
+
+.rst-content a {
+    text-decoration: underline;
+}
+
+.rst-content a:where(:focus, :focus-visible, :hover) {
+    color: var(--color-d) !important;
+}
+
+.wy-side-scroll a {
+    color: var(--color-a);
+    background: transparent;
+    font-size: 1rem;
+    line-height: 125%;
+}
+
+.wy-menu-vertical li.current a,
+.wy-menu-vertical li.current li a,
+.wy-menu-vertical li.current li a code {
+    border: none;
+    color: var(--color-a);
+}
+
+ul.current ul,
+.wy-menu-vertical li.current a:hover,
+.wy-menu-vertical li.toctree-l2.current li.toctree-l3>a,
+.wy-menu-vertical li.toctree-l3.current li.toctree-l4>a,
+.wy-menu-vertical li.toctree-l4.current li.toctree-l5>a,
+.wy-menu-vertical li.toctree-l5.current li.toctree-l6>a,
+.wy-menu-vertical li.current {
+    background: var(--menu-bg) !important;
+}
+
+.wy-menu.wy-menu-vertical>ul {
+    margin-bottom: 3rem;
+}
+
+.wy-menu.wy-menu-vertical>p {
+    color: var(--color-c);
+}
+
+.wy-menu-vertical li.on a,
+.wy-menu-vertical li.current>a {
+    background: var(--menu-bg) !important;
+    border-bottom: 0px !important;
+    border-top: 0px !important;
+}
+
+.btn {
+    border-radius: 0;
+    text-decoration: none !important;
+}
+
+.wy-breadcrumbs-aside a,
+.wy-breadcrumbs-aside a:visited,
+/* .wy-breadcrumbs-aside a:not(:visited), */
+a.fa.fa-github,
+a.fa.fa-github:visited,
+a.fa.fa-github:not(:visited),
+a.btn.btn-neutral:visited,
+a.btn.btn-neutral:not(:visited),
+a.btn.btn-neutral {
+    background: transparent !important;
+    color: var(--color-a) !important;
+    border: 2px solid var(--color-a) !important;
+    text-decoration: none;
+}
+
+.rst-content .remix-link-container a.remix-link:hover,
+.wy-breadcrumbs-aside a:hover,
+a.fa.fa-github:hover,
+a.btn.btn-neutral:hover {
+    background: var(--white) !important;
+    color: var(--color-b) !important;
+    border-color: var(--color-b) !important;
+}
+
+footer .rst-footer-buttons {
+    display: flex;
+    justify-content: center;
+    gap: 2rem;
+}
+
+/**
+ * Customization for the unified layout
+ */
+
+/* Site wrapper, and two children: header and rest */
+.unified-wrapper {
+    position: fixed;
+    inset: 0;
+    top: var(--navHeight);
+    max-width: 80rem;
+    margin-inline: auto;
+}
+
+/* Site header */
+.unified-header {
+    position: fixed;
+    top: 0;
+    inset-inline: 0;
+    z-index: 99999;
+    display: flex;
+    align-items: center;
+    box-shadow: var(--shadow);
+    backdrop-filter: blur(3px);
+}
+
+.unified-header .inner-header {
+    display: flex;
+    margin-inline: auto;
+    width: 100%;
+    max-width: 80rem;
+    align-items: center;
+    justify-content: space-between;
+    padding-inline: 2rem;
+    padding-block: 1rem;
+}
+
+.unified-header::before {
+    content: "";
+    position: absolute;
+    inset: 0;
+    opacity: 95%;
+    background: var(--color-f);
+    z-index: -1;
+}
+
+.unified-header .home-link {
+    display: block;
+    text-decoration: none;
+    width: 25px;
+    height: 40px;
+}
+
+.unified-header .home-link:hover .solidity-logo {
+    transform: scale(1.1);
+    transition: transform 100ms ease-in-out;
+}
+
+.unified-header img.solidity-logo {
+    transform: scale(1);
+    transition: transform 100ms ease-in-out;
+    width: 100%;
+    height: 100%;
+}
+
+.unified-header .nav-bar {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+}
+
+.unified-header .nav-bar .nav-button-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.5rem;
+}
+
+.unified-header .nav-link {
+    display: inline-block;
+    padding-inline: 8px;
+    padding-block: 4px;
+    font-size: 14px;
+    font-family: 'Overpass Mono', monospace;
+    text-decoration: none;
+    color: var(--color-a);
+    letter-spacing: -0.02em;
+    font-weight: 400;
+    box-sizing: content-box;
+    border-bottom: 1px solid transparent;
+}
+
+.unified-header .nav-link.active {
+    background: var(--white);
+}
+
+.unified-header .nav-link:hover {
+    color: var(--color-c);
+    border-bottom: 1px solid var(--color-c);
+}
+
+/* Rest: Grid, with two children: side bar, and content */
+.unified-wrapper .wy-grid-for-nav {
+    position: relative !important;
+    display: grid !important;
+    grid-template-columns: var(--sideWidth) 1fr;
+    gap: 1rem;
+}
+
+/* First child: Side bar */
+.unified-wrapper .wy-grid-for-nav nav.wy-nav-side {
+    position: relative;
+    display: flex;
+    flex-direction: column;
+    background: var(--color-f);
+    color: var(--color-a);
+    top: 0;
+    bottom: 0;
+    left: 0;
+    padding-bottom: unset !important;
+    min-height: unset !important;
+    z-index: 10 !important;
+    max-width: var(--sideWidth) !important;
+}
+
+.unified-wrapper .wy-grid-for-nav nav.wy-nav-side .wy-side-scroll {
+    position: relative !important;
+    width: fit-content !important;
+    height: unset !important;
+}
+
+.unified-wrapper .wy-grid-for-nav nav.wy-nav-side .wy-side-scroll .wy-side-nav-search {
+    margin: 0 !important;
+    width: var(--sideWidth) !important;
+}
+
+.wy-nav-side,
+.wy-side-scroll,
+.wy-side-nav-search,
+.my-menu {
+    width: 100% !important;
+}
+
+.wy-nav-side input[type=text] {
+    font-family: "Overpass", sans-serif;
+    border-radius: 0;
+    border-color: var(--color-d);
+    background: var(--white);
+    box-shadow: none;
+    color: var(--color-a);
+}
+
+.wy-nav-side input[type=text]::placeholder {
+    font-family: "Overpass", sans-serif;
+    color: var(--color-e);
+    font-size: 16px;
+    position: relative;
+    top: 4px;
+}
+
+/* Second child: Content */
+.unified-wrapper .wy-grid-for-nav .wy-nav-content {
+    position: relative !important;
+    overflow-y: scroll !important;
+    width: 100%;
+    max-width: 100vw !important;
+    padding-inline: 2rem;
+}
+
+.unified-wrapper .wy-grid-for-nav .wy-nav-content .rst-content {
+    max-width: 70ch;
+    margin-inline: auto;
+}
+
+.unified-wrapper.menu-open .backdrop {
+    opacity: 0.5;
+}
+
+.unified-wrapper .wy-nav-side,
+.unified-wrapper .rst-versions {
+    left: auto;
+
+}
+
+.unified-wrapper .backdrop {
+    opacity: 0;
+    transition: opacity 200ms ease-in-out;
+}
+
+@media (max-width: 768px) {
+    h2 {
+        margin-top: 3rem;
+        margin-bottom: 1rem;
+    }
+
+    h3 {
+        margin-top: 3rem;
+        margin-bottom: 1rem;
+    }
+
+    h4 {
+        margin-top: 2rem;
+        margin-bottom: 1rem;
+    }
+
+    /* Menu closed styles */
+    .unified-header .nav-link {
+        display: none;
+    }
+
+    .unified-header .inner-header {
+        padding-inline: 1rem;
+    }
+
+    .unified-wrapper .wy-grid-for-nav {
+        grid-template-columns: 1fr;
+    }
+
+    .unified-wrapper .wy-grid-for-nav nav.wy-nav-side {
+        position: absolute;
+        inset-block: 0;
+        inset-inline-start: 0;
+        width: var(--sideWidth);
+        overflow-y: scroll;
+        transform: translateX(-100%);
+        transition: transform 200ms ease-in-out;
+    }
+
+    /* Menu open styles */
+    .unified-wrapper .wy-grid-for-nav nav.wy-nav-side {
+        position: absolute;
+
+    }
+
+    .unified-wrapper.menu-open nav.wy-nav-side {
+        transform: translateX(0);
+        transition: transform 200ms ease-in-out;
+    }
+
+    .unified-wrapper.menu-open .rst-versions {
+        position: sticky;
+        bottom: 0;
+        width: 100%;
+    }
+
+    .unified-wrapper.menu-open .backdrop {
+        display: block;
+        position: fixed;
+        inset: 0;
+        opacity: 1;
+        transition: opacity 200ms ease-in-out;
+        z-index: 5;
+        background: #0006;
+    }
+
+    a.skip-to-content {
+        display: none;
+    }
+}
+
+ul.search .context {
+    color: var(--color-a) !important;
+}
+
+.rst-versions {
+    background: var(--color-f);
+}
+
+.rst-versions.shift-up {
+    height: unset !important;
+    max-height: unset !important;
+    overflow-y: unset !important;
+}
+
+.rst-content dl:not(.docutils) dt {
+    color: var(--color-a);
+    background-color: #fff8;
+    border-top: solid 3px #0002;
+    border-inline-start: solid 3px #0002;
+    padding: 2px 6px;
+}
+
+.rst-versions .rst-current-version {
+    border-color: var(--color-d) !important;
+}
+
+.rst-current-version *,
+.rst-current-version .fa:before,
+.rst-current-version .fa-element {
+    color: var(--color-b) !important;
+}
+
+.rst-current-version dt,
+.rst-current-version dd,
+.rst-current-version dd a,
+.rst-other-versions dl:last-of-type dt,
+.rst-other-versions dl:last-of-type dd,
+.rst-other-versions dl:last-of-type dd a {
+    font-size: 14px !important;
+}
+
+.rst-other-versions {
+    background: var(--white) !important;
+    color: var(--color-a) !important;
+}
+
+.rst-other-versions a {
+    text-decoration: underline;
+    color: var(--color-c) !important;
+}
+
+.rst-other-versions dt {
+    color: var(--color-a) !important;
+}
+
+.rst-other-versions dl {
+    margin-bottom: 1.5rem !important;
+}
+
+.rst-other-versions dl:last-of-type {
+    margin-top: 2rem !important;
+}
+
+/* Bottom Search */
+.wy-nav-side input[type=text],
+.rst-other-versions dl:last-of-type dd {
+    width: 100%;
+}
+
+.rst-other-versions dl:last-of-type dt {
+    color: var(--color-b) !important;
+}
+
+.rst-other-versions dl:last-of-type div[style*=padding],
+.rst-other-versions dl dd:first-of-type a {
+    padding-inline-start: 0 !important;
+}
+
+button.toctree-expand {
+    color: var(--black) !important;
+}
+
+/* Light/dark color mode toggle 🌓 */
+button.color-toggle {
+    display: inline-flex;
+    appearance: none;
+    -webkit-box-align: center;
+    align-items: center;
+    -webkit-box-pack: center;
+    justify-content: center;
+    user-select: none;
+    outline: none;
+    height: 28px;
+    width: 28px;
+    background: none;
+    border: none;
+    padding: 6px;
+    margin: 6px;
+    transition-duration: 200ms;
+    transition-property: background-color,
+        color,
+        fill,
+        stroke,
+        opacity;
+}
+
+button.color-toggle:focus-visible {
+    outline: 2px solid var(--color-c);
+    color: var(--color-c);
+}
+
+button.color-toggle:hover {
+    color: var(--color-c);
+    background: #0002;
+}
+
+button.color-toggle .color-toggle-icon {
+    width: 100%;
+    height: 100%;
+    margin: 0;
+    display: inline-block;
+    line-height: 1em;
+    -webkit-flex-shrink: 0;
+    -ms-flex-negative: 0;
+    flex-shrink: 0;
+    vertical-align: middle;
+    /* color: var(--color-a); */
+}
+
+
+button.mobile-menu-button {
+    display: none;
+}
+
+@media (max-width: 768px) {
+    nav.wy-nav-top {
+        display: none;
+    }
+
+    button.mobile-menu-button {
+        display: flex;
+    }
+}
+
+
+.hidden {
+    display: none;
+}
+
+#search-results .search li:first-child,
+#search-results .search li {
+    border-color: var(--color-d);
+}
+
+#search-results .search li:last-child {
+    border: 0px;
+}
+
+.forum-link::after {
+    content: ' ↗';
+    font-size: 14px;
+    font-family: 'Overpass Mono', monospace;
+}
+
+.wy-breadcrumbs-aside {
+    display: block;
+    padding-top: 0;
+}
+
+.wy-breadcrumbs-aside a {
+    padding: 0.5rem 0.75rem;
+    font-size: 12px;
+    font-family: "'Overpass'", sans-serif;
+    font-weight: 700;
+}
+
+a.skip-to-content:visited,
+a.skip-to-content:not(:visited),
+a.skip-to-content {
+    display: block;
+    pointer-events: none;
+    width: fit-content;
+    opacity: 0;
+    transition: opacity 200ms ease-in-out;
+    padding: 2px 4px;
+    font-size: 14px;
+    margin-inline-end: auto;
+    margin-inline-start: 2rem;
+    color: var(--color-a);
+}
+
+a.skip-to-content:focus {
+    opacity: 1;
+    transition: opacity 200ms ease-in-out;
+}
+
+#content {
+    scroll-margin-top: 6rem;
+    scroll-behavior: smooth;
+}
\ No newline at end of file
diff --git a/docs/_static/css/dark.css b/docs/_static/css/dark.css
deleted file mode 100644
index cba22066bf..0000000000
--- a/docs/_static/css/dark.css
+++ /dev/null
@@ -1,652 +0,0 @@
-/* links */
-
-.rst-content a:not(:visited) {
-    color: #aaddff;
-}
-
-/* code directives */
-
-.method dt,
-.class dt,
-.data dt,
-.attribute dt,
-.function dt,
-.classmethod dt,
-.exception dt,
-.descclassname,
-.descname {
-    background-color: #2d2d2d !important;
-}
-
-.rst-content dl:not(.docutils) dt {
-    color: #aaddff;
-    background-color: #2d2d2d;
-    border-top: solid 3px #525252;
-    border-left: solid 3px #525252;
-}
-
-em.property {
-    color: #888888;
-}
-
-
-/* tables */
-
-.rst-content table.docutils thead {
-    color: #ddd;
-}
-
-.rst-content table.docutils td {
-    border: 0px;
-}
-
-.rst-content table.docutils:not(.field-list) tr:nth-child(2n-1) td {
-    background-color: #5a5a5a;
-}
-
-.rst-content pre {
-    background: none;
-}
-
-/* inlined code highlights */
-
-.xref,
-.py-meth,
-.rst-content a code {
-    color: #aaddff !important;
-    font-weight: normal !important;
-}
-
-.rst-content code {
-    color: #eee !important;
-    font-weight: normal !important;
-}
-
-code.literal {
-    background-color: #2d2d2d !important;
-    border: 1px solid #6d6d6d !important;
-}
-
-code.docutils.literal.notranslate {
-    color: #ddd;
-}
-
-/* highlight color search text */
-
-.rst-content .highlighted {
-    background: #ff5722;
-    box-shadow: 0 0 0 2px #f0978b;
-}
-
-/* notes, warnings, hints */
-
-.hint .admonition-title {
-    background: #2aa87c !important;
-}
-
-.warning .admonition-title {
-    background: #cc4444 !important;
-}
-
-.admonition-title {
-    background: #3a7ca8 !important;
-}
-
-.admonition,
-.note {
-    background-color: #2d2d2d !important;
-}
-
-
-/* table of contents */
-
-.wy-nav-content-wrap {
-    background-color: rgba(0, 0, 0, 0.6) !important;
-}
-
-.sidebar {
-    background-color: #191919 !important;
-}
-
-.sidebar-title {
-    background-color: #2b2b2b !important;
-}
-
-.wy-menu-vertical a {
-    color: #ddd;
-}
-
-.wy-menu-vertical code.docutils.literal.notranslate {
-    color: #404040;
-    background: none !important;
-    border: none !important;
-}
-
-.wy-nav-content {
-    background: #3c3c3c;
-    color: #dddddd;
-}
-
-.wy-menu-vertical li.on a,
-.wy-menu-vertical li.current>a {
-    background: #a3a3a3;
-    border-bottom: 0px !important;
-    border-top: 0px !important;
-}
-
-.wy-menu-vertical li.current {
-    background: #b3b3b3;
-}
-
-.toc-backref {
-    color: grey !important;
-}
-
-.highlight .hll {
-    background-color: #49483e
-}
-
-.highlight {
-    background: #222;
-    color: #f8f8f2
-}
-
-.highlight .c {
-    color: #888
-}
-
-
-/* Comment */
-
-.highlight .err {
-    color: #960050;
-    background-color: #1e0010
-}
-
-
-/* Error */
-
-.highlight .k {
-    color: #66d9ef
-}
-
-
-/* Keyword */
-
-.highlight .l {
-    color: #ae81ff
-}
-
-
-/* Literal */
-
-.highlight .n {
-    color: #f8f8f2
-}
-
-
-/* Name */
-
-.highlight .o {
-    color: #f92672
-}
-
-
-/* Operator */
-
-.highlight .p {
-    color: #f8f8f2
-}
-
-
-/* Punctuation */
-
-.highlight .ch {
-    color: #888
-}
-
-
-/* Comment.Hashbang */
-
-.highlight .cm {
-    color: #888
-}
-
-
-/* Comment.Multiline */
-
-.highlight .cp {
-    color: #888
-}
-
-
-/* Comment.Preproc */
-
-.highlight .cpf {
-    color: #888
-}
-
-
-/* Comment.PreprocFile */
-
-.highlight .c1 {
-    color: #888
-}
-
-
-/* Comment.Single */
-
-.highlight .cs {
-    color: #888
-}
-
-
-/* Comment.Special */
-
-.highlight .gd {
-    color: #f92672
-}
-
-
-/* Generic.Deleted */
-
-.highlight .ge {
-    font-style: italic
-}
-
-
-/* Generic.Emph */
-
-.highlight .gi {
-    color: #a6e22e
-}
-
-
-/* Generic.Inserted */
-
-.highlight .gs {
-    font-weight: bold
-}
-
-
-/* Generic.Strong */
-
-.highlight .gu {
-    color: #888
-}
-
-
-/* Generic.Subheading */
-
-.highlight .kc {
-    color: #66d9ef
-}
-
-
-/* Keyword.Constant */
-
-.highlight .kd {
-    color: #66d9ef
-}
-
-
-/* Keyword.Declaration */
-
-.highlight .kn {
-    color: #f92672
-}
-
-
-/* Keyword.Namespace */
-
-.highlight .kp {
-    color: #66d9ef
-}
-
-
-/* Keyword.Pseudo */
-
-.highlight .kr {
-    color: #66d9ef
-}
-
-
-/* Keyword.Reserved */
-
-.highlight .kt {
-    color: #66d9ef
-}
-
-
-/* Keyword.Type */
-
-.highlight .ld {
-    color: #e6db74
-}
-
-
-/* Literal.Date */
-
-.highlight .m {
-    color: #ae81ff
-}
-
-
-/* Literal.Number */
-
-.highlight .s {
-    color: #e6db74
-}
-
-
-/* Literal.String */
-
-.highlight .na {
-    color: #a6e22e
-}
-
-
-/* Name.Attribute */
-
-.highlight .nb {
-    color: #f8f8f2
-}
-
-
-/* Name.Builtin */
-
-.highlight .nc {
-    color: #a6e22e
-}
-
-
-/* Name.Class */
-
-.highlight .no {
-    color: #66d9ef
-}
-
-
-/* Name.Constant */
-
-.highlight .nd {
-    color: #a6e22e
-}
-
-
-/* Name.Decorator */
-
-.highlight .ni {
-    color: #f8f8f2
-}
-
-
-/* Name.Entity */
-
-.highlight .ne {
-    color: #a6e22e
-}
-
-
-/* Name.Exception */
-
-.highlight .nf {
-    color: #a6e22e
-}
-
-
-/* Name.Function */
-
-.highlight .nl {
-    color: #f8f8f2
-}
-
-
-/* Name.Label */
-
-.highlight .nn {
-    color: #f8f8f2
-}
-
-
-/* Name.Namespace */
-
-.highlight .nx {
-    color: #a6e22e
-}
-
-
-/* Name.Other */
-
-.highlight .py {
-    color: #f8f8f2
-}
-
-
-/* Name.Property */
-
-.highlight .nt {
-    color: #f92672
-}
-
-
-/* Name.Tag */
-
-.highlight .nv {
-    color: #f8f8f2
-}
-
-
-/* Name.Variable */
-
-.highlight .ow {
-    color: #f92672
-}
-
-
-/* Operator.Word */
-
-.highlight .w {
-    color: #f8f8f2
-}
-
-
-/* Text.Whitespace */
-
-.highlight .mb {
-    color: #ae81ff
-}
-
-
-/* Literal.Number.Bin */
-
-.highlight .mf {
-    color: #ae81ff
-}
-
-
-/* Literal.Number.Float */
-
-.highlight .mh {
-    color: #ae81ff
-}
-
-
-/* Literal.Number.Hex */
-
-.highlight .mi {
-    color: #ae81ff
-}
-
-
-/* Literal.Number.Integer */
-
-.highlight .mo {
-    color: #ae81ff
-}
-
-
-/* Literal.Number.Oct */
-
-.highlight .sa {
-    color: #e6db74
-}
-
-
-/* Literal.String.Affix */
-
-.highlight .sb {
-    color: #e6db74
-}
-
-
-/* Literal.String.Backtick */
-
-.highlight .sc {
-    color: #e6db74
-}
-
-
-/* Literal.String.Char */
-
-.highlight .dl {
-    color: #e6db74
-}
-
-
-/* Literal.String.Delimiter */
-
-.highlight .sd {
-    color: #e6db74
-}
-
-
-/* Literal.String.Doc */
-
-.highlight .s2 {
-    color: #e6db74
-}
-
-
-/* Literal.String.Double */
-
-.highlight .se {
-    color: #ae81ff
-}
-
-
-/* Literal.String.Escape */
-
-.highlight .sh {
-    color: #e6db74
-}
-
-
-/* Literal.String.Heredoc */
-
-.highlight .si {
-    color: #e6db74
-}
-
-
-/* Literal.String.Interpol */
-
-.highlight .sx {
-    color: #e6db74
-}
-
-
-/* Literal.String.Other */
-
-.highlight .sr {
-    color: #e6db74
-}
-
-
-/* Literal.String.Regex */
-
-.highlight .s1 {
-    color: #e6db74
-}
-
-
-/* Literal.String.Single */
-
-.highlight .ss {
-    color: #e6db74
-}
-
-
-/* Literal.String.Symbol */
-
-.highlight .bp {
-    color: #f8f8f2
-}
-
-
-/* Name.Builtin.Pseudo */
-
-.highlight .fm {
-    color: #a6e22e
-}
-
-
-/* Name.Function.Magic */
-
-.highlight .vc {
-    color: #f8f8f2
-}
-
-
-/* Name.Variable.Class */
-
-.highlight .vg {
-    color: #f8f8f2
-}
-
-
-/* Name.Variable.Global */
-
-.highlight .vi {
-    color: #f8f8f2
-}
-
-
-/* Name.Variable.Instance */
-
-.highlight .vm {
-    color: #f8f8f2
-}
-
-
-/* Name.Variable.Magic */
-
-.highlight .il {
-    color: #ae81ff
-}
-
-
-/* Link to Remix IDE shown over code snippets */
-
-.rst-content .remix-link-container a.remix-link {
-    color: black;
-}
-
-
-/* Grammar */
-
-.railroad-diagram {
-    fill: white;
-}
-
-.railroad-diagram path {
-    stroke: white;
-}
-
-.railroad-diagram rect {
-    stroke: white;
-}
-
-.a4 .sig-name {
-    background-color: transparent !important;
-}
diff --git a/docs/_static/css/fonts.css b/docs/_static/css/fonts.css
new file mode 100644
index 0000000000..1a987a6da1
--- /dev/null
+++ b/docs/_static/css/fonts.css
@@ -0,0 +1,2 @@
+@import url("https://fonts.cdnfonts.com/css/overpass");
+@import url("https://fonts.cdnfonts.com/css/overpass-mono");
\ No newline at end of file
diff --git a/docs/_static/css/pygments.css b/docs/_static/css/pygments.css
new file mode 100644
index 0000000000..0e640681de
--- /dev/null
+++ b/docs/_static/css/pygments.css
@@ -0,0 +1,399 @@
+pre {
+  line-height: 125%;
+}
+
+td.linenos .normal {
+  color: inherit;
+  background-color: transparent;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+span.linenos {
+  color: inherit;
+  background-color: transparent;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+td.linenos .special {
+  color: #000000;
+  background-color: #ffffc0;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+span.linenos.special {
+  color: #000000;
+  background-color: #ffffc0;
+  padding-left: 5px;
+  padding-right: 5px;
+}
+
+.highlight .hll {
+  background-color: #ffffcc
+}
+
+.highlight {
+  background: #eeffcc;
+}
+
+.highlight .c {
+  color: #408090;
+  font-style: italic
+}
+
+/* Comment */
+.highlight .err {
+  border: 1px solid #FF0000
+}
+
+/* Error */
+.highlight .k {
+  color: #007020;
+  font-weight: bold
+}
+
+/* Keyword */
+.highlight .o {
+  color: #666666
+}
+
+/* Operator */
+.highlight .ch {
+  color: #408090;
+  font-style: italic
+}
+
+/* Comment.Hashbang */
+.highlight .cm {
+  color: #408090;
+  font-style: italic
+}
+
+/* Comment.Multiline */
+.highlight .cp {
+  color: #007020
+}
+
+/* Comment.Preproc */
+.highlight .cpf {
+  color: #408090;
+  font-style: italic
+}
+
+/* Comment.PreprocFile */
+.highlight .c1 {
+  color: #408090;
+  font-style: italic
+}
+
+/* Comment.Single */
+.highlight .cs {
+  color: #408090;
+  background-color: #fff0f0
+}
+
+/* Comment.Special */
+.highlight .gd {
+  color: #A00000
+}
+
+/* Generic.Deleted */
+.highlight .ge {
+  font-style: italic
+}
+
+/* Generic.Emph */
+.highlight .gr {
+  color: #FF0000
+}
+
+/* Generic.Error */
+.highlight .gh {
+  color: #000080;
+  font-weight: bold
+}
+
+/* Generic.Heading */
+.highlight .gi {
+  color: #00A000
+}
+
+/* Generic.Inserted */
+.highlight .go {
+  color: #333333
+}
+
+/* Generic.Output */
+.highlight .gp {
+  color: #c65d09;
+  font-weight: bold
+}
+
+/* Generic.Prompt */
+.highlight .gs {
+  font-weight: bold
+}
+
+/* Generic.Strong */
+.highlight .gu {
+  color: #800080;
+  font-weight: bold
+}
+
+/* Generic.Subheading */
+.highlight .gt {
+  color: #0044DD
+}
+
+/* Generic.Traceback */
+.highlight .kc {
+  color: #007020;
+  font-weight: bold
+}
+
+/* Keyword.Constant */
+.highlight .kd {
+  color: #007020;
+  font-weight: bold
+}
+
+/* Keyword.Declaration */
+.highlight .kn {
+  color: #007020;
+  font-weight: bold
+}
+
+/* Keyword.Namespace */
+.highlight .kp {
+  color: #007020
+}
+
+/* Keyword.Pseudo */
+.highlight .kr {
+  color: #007020;
+  font-weight: bold
+}
+
+/* Keyword.Reserved */
+.highlight .kt {
+  color: #902000
+}
+
+/* Keyword.Type */
+.highlight .m {
+  color: #208050
+}
+
+/* Literal.Number */
+.highlight .s {
+  color: #4070a0
+}
+
+/* Literal.String */
+.highlight .na {
+  color: #4070a0
+}
+
+/* Name.Attribute */
+.highlight .nb {
+  color: #007020
+}
+
+/* Name.Builtin */
+.highlight .nc {
+  color: #0e84b5;
+  font-weight: bold
+}
+
+/* Name.Class */
+.highlight .no {
+  color: #60add5
+}
+
+/* Name.Constant */
+.highlight .nd {
+  color: #555555;
+  font-weight: bold
+}
+
+/* Name.Decorator */
+.highlight .ni {
+  color: #d55537;
+  font-weight: bold
+}
+
+/* Name.Entity */
+.highlight .ne {
+  color: #007020
+}
+
+/* Name.Exception */
+.highlight .nf {
+  color: #06287e
+}
+
+/* Name.Function */
+.highlight .nl {
+  color: #002070;
+  font-weight: bold
+}
+
+/* Name.Label */
+.highlight .nn {
+  color: #0e84b5;
+  font-weight: bold
+}
+
+/* Name.Namespace */
+.highlight .nt {
+  color: #062873;
+  font-weight: bold
+}
+
+/* Name.Tag */
+.highlight .nv {
+  color: #bb60d5
+}
+
+/* Name.Variable */
+.highlight .ow {
+  color: #007020;
+  font-weight: bold
+}
+
+/* Operator.Word */
+.highlight .w {
+  color: #bbbbbb
+}
+
+/* Text.Whitespace */
+.highlight .mb {
+  color: #208050
+}
+
+/* Literal.Number.Bin */
+.highlight .mf {
+  color: #208050
+}
+
+/* Literal.Number.Float */
+.highlight .mh {
+  color: #208050
+}
+
+/* Literal.Number.Hex */
+.highlight .mi {
+  color: #208050
+}
+
+/* Literal.Number.Integer */
+.highlight .mo {
+  color: #208050
+}
+
+/* Literal.Number.Oct */
+.highlight .sa {
+  color: #4070a0
+}
+
+/* Literal.String.Affix */
+.highlight .sb {
+  color: #4070a0
+}
+
+/* Literal.String.Backtick */
+.highlight .sc {
+  color: #4070a0
+}
+
+/* Literal.String.Char */
+.highlight .dl {
+  color: #4070a0
+}
+
+/* Literal.String.Delimiter */
+.highlight .sd {
+  color: #4070a0;
+  font-style: italic
+}
+
+/* Literal.String.Doc */
+.highlight .s2 {
+  color: #4070a0
+}
+
+/* Literal.String.Double */
+.highlight .se {
+  color: #4070a0;
+  font-weight: bold
+}
+
+/* Literal.String.Escape */
+.highlight .sh {
+  color: #4070a0
+}
+
+/* Literal.String.Heredoc */
+.highlight .si {
+  color: #70a0d0;
+  font-style: italic
+}
+
+/* Literal.String.Interpol */
+.highlight .sx {
+  color: #c65d09
+}
+
+/* Literal.String.Other */
+.highlight .sr {
+  color: #235388
+}
+
+/* Literal.String.Regex */
+.highlight .s1 {
+  color: #4070a0
+}
+
+/* Literal.String.Single */
+.highlight .ss {
+  color: #517918
+}
+
+/* Literal.String.Symbol */
+.highlight .bp {
+  color: #007020
+}
+
+/* Name.Builtin.Pseudo */
+.highlight .fm {
+  color: #06287e
+}
+
+/* Name.Function.Magic */
+.highlight .vc {
+  color: #bb60d5
+}
+
+/* Name.Variable.Class */
+.highlight .vg {
+  color: #bb60d5
+}
+
+/* Name.Variable.Global */
+.highlight .vi {
+  color: #bb60d5
+}
+
+/* Name.Variable.Instance */
+.highlight .vm {
+  color: #bb60d5
+}
+
+/* Name.Variable.Magic */
+.highlight .il {
+  color: #208050
+}
+
+/* Literal.Number.Integer.Long */
\ No newline at end of file
diff --git a/docs/_static/css/toggle.css b/docs/_static/css/toggle.css
index add134f6c2..6f03e6fb6a 100644
--- a/docs/_static/css/toggle.css
+++ b/docs/_static/css/toggle.css
@@ -9,6 +9,13 @@ input[type=checkbox] {
     padding: 10px;
     display: flex;
     justify-content: space-between;
+    background-color: var(--color-f);
+    border-top: 1px solid var(--color-c);
+}
+
+.fa-caret-down,
+.fa-book {
+    color: var(--color-a) !important;
 }
 
 .rst-versions .rst-current-version .fa-book,
@@ -76,8 +83,6 @@ html.transition *:after {
     transition-delay: 0 !important;
 }
 
-nav.wy-nav-side {
-    /* The default padding of 2em is too small and the "Keyword Index" link gets obscured
-     * by the version toggle. */
-    padding-bottom: 3em;
-}
+.wy-menu-vertical a:hover {
+    background-color: #0002;
+}
\ No newline at end of file
diff --git a/docs/_static/fonts/overpass-bold.otf b/docs/_static/fonts/overpass-bold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..962a5d7628df54752943bc65a97c9aa656b7f6de
GIT binary patch
literal 68828
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

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-bold.woff2 b/docs/_static/fonts/overpass-bold.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..f8133b0e93b133773ebac59b65d51e03dd620082
GIT binary patch
literal 38728
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
IKGdgV1zXGahX4Qo

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-italic.otf b/docs/_static/fonts/overpass-italic.otf
new file mode 100644
index 0000000000000000000000000000000000000000..19224a86dc1d636bfd9aa978d4c776a2718590cf
GIT binary patch
literal 72500
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%0D1QGP88
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

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-light.otf b/docs/_static/fonts/overpass-light.otf
new file mode 100644
index 0000000000000000000000000000000000000000..b060651a442a5e7fbe9425c4a7f0990b8ec6636d
GIT binary patch
literal 69324
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

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-mono-bold.otf b/docs/_static/fonts/overpass-mono-bold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..f8291d926d984f94367ac8d9edfdf2b4c728432f
GIT binary patch
literal 95240
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
YzCqcx*A03%7jYbFlYtsf{%d9bHy>eJ+5i9m

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-mono-bold.woff2 b/docs/_static/fonts/overpass-mono-bold.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..280570a46adcfdb48ea30406090fb0e3a4673509
GIT binary patch
literal 20532
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
H`Gw0BF8zcF

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-mono-regular.otf b/docs/_static/fonts/overpass-mono-regular.otf
new file mode 100644
index 0000000000000000000000000000000000000000..80a4b839b76cf53992e7fdf51428d0194b48bf46
GIT binary patch
literal 94520
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
PABx=cLXOA&yR`os%KIp-

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-mono-regular.woff2 b/docs/_static/fonts/overpass-mono-regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..280570a46adcfdb48ea30406090fb0e3a4673509
GIT binary patch
literal 20532
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
H`Gw0BF8zcF

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-mono/overpass-mono-bold.otf b/docs/_static/fonts/overpass-mono/overpass-mono-bold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..f8291d926d984f94367ac8d9edfdf2b4c728432f
GIT binary patch
literal 95240
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
YzCqcx*A03%7jYbFlYtsf{%d9bHy>eJ+5i9m

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-mono/overpass-mono-regular.otf b/docs/_static/fonts/overpass-mono/overpass-mono-regular.otf
new file mode 100644
index 0000000000000000000000000000000000000000..80a4b839b76cf53992e7fdf51428d0194b48bf46
GIT binary patch
literal 94520
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
PABx=cLXOA&yR`os%KIp-

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-regular.otf b/docs/_static/fonts/overpass-regular.otf
new file mode 100644
index 0000000000000000000000000000000000000000..3a7c095fab33942b0597fcbd57fbfec815c9a2c5
GIT binary patch
literal 69808
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
D3Nx>f

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-regular.woff2 b/docs/_static/fonts/overpass-regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..f8133b0e93b133773ebac59b65d51e03dd620082
GIT binary patch
literal 38728
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
IKGdgV1zXGahX4Qo

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass-semibold.otf b/docs/_static/fonts/overpass-semibold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..176fb43ce14a23251c04318345785f99bf52f2c3
GIT binary patch
literal 65704
zcmdqKd0bT0|37}t9cBh*bX3M6g=PWV1qIx47Xg(-Ko+;$5C#|p28Ye9v`n)!b7^<2
z%*-uQQ%fzE%oa0kG0k$R%odG`>WuG;`Fp<Zoe?m5zu%wt<MI9HC%!o6o_m(pdF|(%
zdoO8OS!t{ho5M70K*FFwj%8a$+{IYNEXF*;2PY;CiqP1PGWPZf#@Nq;)6+5=m1#p5
zJ92=r*wuqGvj+}(zw<kciHVE_4N1%F95*3%+78A7A4L6$xy3o98Q0@KXKWzqH(6Qe
z%*iu8yygP#eG2Gah=RZewPC0~5!bB>i_52Z{}?`%G2VzVeO7VKv{L?AI&QIJ09{E=
zv2)qj5$#a_TgG~xEp?Zb-#Ej@0N=5=?_eyQ@z0Rs01abfy3P!l(4@~FOr!Z8CG69J
zP96N|Uw`~HKVWk}8`RY>iAwSB7sjM5tfkb0#YwTOIS*vbrLioIpJlD2XIZ2aihB>R
zF;W~GDm}@1@Efd$^aV3WTbY5q%M6+}tP#Hl;AAa$Fw2%ISvnw-`sK}8f4+`IOB+}R
zX$XtcWFo(x^<iJKXg-<^0<@EYF)rG$^DL4tWJ8g*;#Y6{DlK4l^JOeT%4Y+ldsvJ#
zkC}j1Z)pUs?_ez?C(;otmg-Ym-?%h(I{$+;*K}chq&*n-S>XN%i^m+tNTUIr0o!qX
zn2q6W*aWE?=Jz7XV%Zo?E2QrLzQz4%zH}W@&_hZE?yqBhPqB8IEaV?S8PSJmQqJ-S
zXQb^g{viJQ4Vf>&*v(Oo=%z#6I6x%mnua!%@5Y9LW$~QdI4HG2K9HqrhNCXZ6<$y~
z)Z>rh-dWa;&tx{-8zcn*-&5!#7y#aI@Pn7&K4?#=LI;{R0nMA{?4J|iPdMEU2uI*o
zAAny7@H-B86L9$^ZX_%9f$*viF__m9@QC^xhItq<k0-&8a>!OE7OzQReG~|Xye+}}
zmaxu*w<i6@?~tuNklY6Rl=`wJO8<jFgFN8>A?CE4*&ti(_-l}x6PWkUXg>z`fEV~5
zNwTNVA_}rre53j%T^gZ}My!d3c<!eY_^r7Qun29dfpdTG?@japAlbSpU!x%Vqz~Xb
zA9iB_`fSU)1CQ>&kN7$gfVrc-B9qiU;0$o0aflE86nV&=gSWYH67Vm;ABxP8+z}9;
zd;lJ#fId1vQ$Qr33E*MCFu(*rAYcSQ2YgzQ4k_ahk7>Nyq(o<hRwN(9qkl?CXFkS#
zvJWJ)GzXHA|CEw`QT=~Pp?iuf9fs}chWWI)aTfCRF4CWoo<;fv(xblXuRyCTMOTPk
zkVVZs&|AOmK!2$W{ZM*P(Pik96b^_5e*&4FbQ@`+6no=C{sQb1UC%~JdO`YjYx*nr
z=r1FFkgWex3VBuT!%mQ{N^08Amqz<+X}g;?Rkf|{NT>aFMbT~8mz(K6$Y>(2=K&9r
z1JbSkW2)FF*ol8iZ`yXhjrZGjU&>=(M<H*@*w6<>559!_t%E+Wzr27y_y?Ff^gF-=
zy*bHx1gr%;Ne?@KW}m?~RKNyMI*c^}Sfm=JCA}g2kRD_`(1%d`#2nU!e2L;i$d^oG
zdOn_6_#}+i8EuN8E0bU={@Z#V0B<L2sc8fqK+3;o?UBaen#$ueucF`YS*&IxO94b{
zo?t1`r#B%|6ArqCgYHx}mE}=8>Z^W=xhrLq`awE``Y*9|<cl?@{`!_10?z#P$BhL6
zn-%Y@`dj5UJa&N8NgBnp(11sfGDwb+V%}qT997aQHI-lR>&)T5OiW4{!PYXzjT_R>
zH*^@I4WEIV%jrJ9A?-urph$p4@YOfR?M^oV^gEDs_vIzz`}y)3b|)L;%LlM#Y?3dp
zWnrw$m)D_uu`jR3JlFX0fy~H``tm^-{bOI=!1}V^e0d}I+1ZzG1fC@N@{OCW;^TaI
z6LU8EmoIN-S-}%94;~N%tc!wo`0||HX}0_Fz~9{4m)Een%n81H0E;ls^yRgzyLpu_
zuS5AKzPz5Ln-L``{Rgs;=1IPM5F60^9$((TW;9>n%Ntn-i^Z33#NsUdefh@Wy)09G
zc@ulT`zBw$DQnuJ!k2G`{5)UY%r^9RBEelc-Qy}KEO)%@h>MBs?wB;)k>Sj949O{v
zawM1Jc5=iQ6*-g|We$(C%;~9g=5<P|bb3m2%E~gG#jb(wqP#AhVq#)?lRWhH--`C%
z^A|Y$1tXlEGMBr=ahpc|x_@u%Ds$vG$~`%G&f*-;6o)&%A(n~GqDrS@kh`S3OwEpT
zl^1$kB?aZ~k|;-3p}RPz%yG9ncZ#c|ZpQ6$+tZw5qyPJf7nYZo_UhcZs;a7!$C+1{
zQ{E}pU0km)kMPJRH0VZTq$9<Z>ntgA8Vq&ADx)=^ag@Q3Rfri9{*Fv{etA`n$LT;p
zk=i=XQBjiT^f<~3osP`p6h~UAvqY`z>psfiCu(e`*iLF^zP8j&uDjF)o=$QWxvQca
zIVE{im{U~dcH~s%xQcQn6*(PMAQ(tID1Nvjr@WWJH>a{(kE;}uDRUKda(fCorwvLm
z7z~m4ry`P`l<F9imYU^ANlr*g%}jC_>LKEYcEoje402BLROEQ3gVZrS42J0FXkQ2E
z8A<WO2BstdU8keK4Sa~LG{?Wq&(RJ8w|5X#%H58#a#wLhQBFCKc6*BQs$6+aN1n41
zvnwrjf`aHJ*Ik5Zxji}MF31Hj#8K*TPj=>(mqjUERFsywJ>|-1%H3R#6Lle#&is7b
zP*BOqC2@1*DikY%FjcrPbS^qCF0LqXmAjnijHn5m(0e7}k>kksIFX>#O<c<NVA%vT
zr#M_Cj;caeZlQurnWH#oIvC<8E5xMoRGt)5C%8b((i~5D3G}4URjP8v4Z3*BI+37&
zK7&%gJ}|RPnZQjcQ3Q{$LB|zk&b%m)sv-}pk8%{d^IZ8P1cVtz#7sP{NfqTNA%u&j
zJD?y%?vesZF&3^t>=JjmqYU~@Rsn^@WhCBZouE)EQ89m4Np2CwpoS&W!3K}3QYAV~
z8uxQ^N(h}vkl-Rh#92JanU_bohFAcv&Tfx7nktLvuFS6sKJtRp&^cu!zb$gmx)jpv
z!<ME^*xrgrJ)9L1)ZGV;h3+bdk4Hh4rVM;N&LU?H^`&Ya%}rr}qkMX)lO)VXbhTfP
zb83al<5Z*%;^Sj67=f}Ju+y);bt>)1a|3G{ET^;-)JI)~e(u}~r58mWY4|cCEokrS
z6P@G2<*7G8k_ts5v0;#$nw*uKmYQk!xPdMC1c>BAerOo#tIVlrNxrKHNZg#N%4A2K
zr5Xa(J3Z~n+TU&hBuKd+k_Xt6O$M?MowADDLZS&~N)oP02L^OkcyciZ8ZZjN;DSu~
zY>Ubc-@Fwa#C$%^@VOe*%%y_I_2)pOQu$t1>df^CwmP^YC%@chDq;3~zOAer)`IAY
zxlr$EaA>ZQoFc#3tlu}$hs+0T1=$0zx&bLk`%B#==nFzu=BTeo|4cs`bC_QPeHOC*
zn761-G3*WraZaA1Smo|0u)D}v4pE45kdjnPf*~repn{V=YeD6TiE$S>Pb%W7+R}RH
z`mO6NlLtShJ8}ziN<fkVh?%E2hwPt+ipfa&1+XC*NMIc$&MJqqq|)Vamk@Pnn(-Co
zg>KK^Cs*bwfI)-)(=blTL8l8~9g8Vn?#wMLapi&|RUQ}d55ueaRtm8N8>$N3pnS<q
zqvaFi1~_4OMGw-GGKM8*W<n1fZ5#<{sfj+FNOyXQU1dt_0r7-Abz+7<p#)YiO10bM
zI$)6toQjtqGWy1MPb!BZ6De|lM=7j<O5O$tD2-r&RJ%JJ_5?Lyd!0&$iskcJVwBc5
zf2tdSbuDUWs4Gft+HG_NfAbH+LLkVu`PDlg;_I#=WI?h#I4XBZSucYjw!I_O2{-Rk
zj|Qm26nPX2gn7BZeiz!op;dq*brM9@-f>fR(BM{?hHm@)n$K&XFK1CcI1|_Y-?zN&
z%>2FG^d9wzruedd_8E$Rkx%wH4QCE~ufjT#BQR5So`@0<AyBy*2E!yH=u(VQIa#s#
zcD@W1Rd?pIYk3YIJ<0Nw!y-oKz=tA8aZW4u8@s}a;+&Fbgco^AoJHHPWQjpN5R;4z
z9Dv7N>Tyv(Qw$`b9(C1=o#kj)j<CYzEXpfWf&pqr1E7mZuwn?UR6`CV>O8m`$oks&
zaE3o~!B$tgoK>I+M4twSw0gjuE)Wg(-`M%jJV7(1`QOd7>MdaA%N)*WrJ$axT+!)r
z1VhlJdJ5>%JU=G6ZV!AqOsit^5^gd?bwWO$f*LRZKFeG}Q472$>4nc8fQ;}(AP7Z#
z<RQpLm!cJ{6A6Oq{%F$VHM_P~A{nYjX!}(9)}fVKYVfTZw|aFO>JWlCXs|DWz##s}
zu-IJ=o8T<Tb9+EHQnWmT8|5xskcqifi%@l1uCr88=bYRrCGILjP6aB#Z`wfUbUi$7
zhch{7VsSmBJ!&wCQbZ8{hCQH7H<dOGCg?L>6h>kab;e1t3ly^Yq#DM$2oo-@C{tpo
z`aTkTK%fN1{XHa7jiA!VN5c9IZ;iw1>m_XI|NHo>0VO~n#nohyt4WQgn5*HcYmyUY
zlOntdNCa`B((OWIpYOM^isJiBkKaV!3}T`5{s9t`GZRwclZPc`7_x>WscWswv_V-T
z<1>;R$(fGyjI<HSiAjl$kK;3O{YjK#WOCM!wCpSgYGlNxW{t*b!4aQ2+A%aaH8IMO
zGz!bE%uGjGh9h}cdP;H<%92wPQnC}1QwKW+qFrhlt>%U$XQ9)qG^MGptK=lK8{_~k
z2}96x{J`Xt<gC$AjzP&;snq8nbQ<qSkI%?TPRLG)&v2w?XW-B(34J7@+tlRLK^Yh&
zX;=~#jOZvKEq!!G^57v^QD~HfLafv?;uDjG#b*qSA`H_o<qU^Xr4z73AC9CE)HriU
zd`gOg2y(Lz$B?v?MAROb1nlFntW?p##1;BQITGWC#Sf+#`1_@5z8Ta}fG9OMDK#l0
zJ|)VLnVyu8Oc{_aIU^|n2%;v)jme`FJt4ZtOd6hz0@U*l0UiuVQcwrZ@%W!W@}bT+
z6*HuMveGg@10O0QlQWZ|9Pt^+nZ$%a8EM1NIamQ2(HyfuLR5vEsrV9GsEqC@i|?BP
zfm+nsN4UhK_!M*qxk&wc-A@0o!p|)(>+FlnJD27ZI6IXVmi9+TRy@I#*B1-V302NX
z4hJ<Z^KFC_lvF5t1LQ-CocZOQ$@s&o6qXkkCFeVm9fdjYuw_nK4Oe&|_=xx56yRIo
zgA}hxkqTlw(uuM{cLgmvlt`z*h1d+s&6AGgvYeb;L@!m?&tVD7%}UvH=3y>YzzSJ8
zHu_!$#IYD0!*xe)67D)!26M7Jq(fK^>O>)z%t}};>x5i9E5eVXULR%3l@nWxPLx(E
zZ9B0vCFj9-Ik-c0Qf`hq5O@?}gf8eYM)~Q@5?K;zj9|V0)-oDLkxo{O*8X;X@B7vo
zBNSZ9(8dkS9slJ>xAyzrjO<e8mV+_MG5Z|Mig3+AehSLmEFZuBnVyNLU8GRTfvsD@
zwH*D`FCB?Fl!I5qvl4KvT&YDo$wH}H8H=cUH}bg{lWN_L&+TxxJ?g2vj%CsRPq<Dp
zRSur_Vx93*rTlaP?j%oziZpcs9)$JnYZCQTdgLqfBx?9uMB>;&m7-kKD#0Bm4zLZk
zoo$^&|1<5Ql-5K=m4|-%J0Neww{l=ld~{+|wMG%ry0J+^Du4&!>_MKmM0GQvEh$LT
zKnKFJj<dI7Ph7lJQe!b+0)xWe+l}kThUi!dj8t8ngtQ1HRf@jmD0um6=HN~l?l~}@
zN`MR3InebY1>Y)M6Yg}EaE)ifm3%q4Xt;$>WtcxnVkue>XGp_}kh)P?0FI}jeTqU?
z1GuIB)Tc-~v^-TAB@Jm7aw(uzf>N4^-ww3BJw+UlSdw0{QiFi^B#c-Aj6I6QB7Vo<
zIEv&UTKS<|9R}&p!6eLV7;H!iaw>I+TLr*frH@}*{e1k-{Bz&{MV&EemS0v#Lmi+@
zIcQT19EsNDK1vgv$np`*Np2j<Z?c)hyHeCAi6OhJS`Okd*<0ckwWXe1K6~NU5C__M
zaCb7==Hh;tA_0CZDsZ<{X-mEO=T_I2`04cZtJ+E@WS{PPl)n6!<e+cAbt5gH`I78A
zfSqcYDv+wPrn{<^)BH<NPFRzNAc^<4Q!!L=uf%<o9wdYL3Qj~Fe_f)Ds!Mb)N1;=d
zf+Ja38s7n$k|yUWlI))!Sw^zP<kd(+h%aP^REt#CKXJ;BiK<U(pX9xW4kc*oQQDI1
z(^!6;ar<aWcS&pOBukYH8iP1Unn~FBIq-K|QXglPHY&yyXh%2^?TEe=$g5gUCB^8O
zuJe6mb#qeZsPcq#b`n~W91_p`6fROILmry=Nc=BAPQ6w!CCd3Fy96~zipZ9b6#L@^
zwPvw`r)s^47OICLn%B*YFeb|8qP;o~|A-|DCaNtZ39m2deom|MLvl#`R;fd?A~_^m
zrqYP~FWt+-kH75S(L$B6&X^Nf@w&Oy@tA559q3*|zu=b{ReFgcL<_=Q<pZ^%v5ABJ
z*vNt2R0$@k-%49QxBayJPZYU5oz>9^pWC%p=}6H-74RbK<58qbrL3RJDt!riqAkgU
zDm(Rko}V&xT0j(-u4t>@ax|3m`uI}cQ^7x%LZdp{r&^!-aznk6RizfB&#HFT$Asv9
zdvBSCmc#*~yDGmqz^@duBJQaD`sYD)bAeGEE_L?NKYQ|ds?@4--w;n#iqtzauYclz
zYAfnI6ve-T;0sd$Spf2nnatpzBYib4{99b&u=*&HkNJ`P@z2JO7jdl4mym@ZPEx(U
zb5)J}{VfwP=B+D*At)oQr?J|h7xH=k9S2kmBcGs368S))y+2M?DXUtYGW1C{+%G38
zPyIH$zU@%0xf}I8XrbB}{|w2_kY%82(t?I@OMUHV$Zyr^5WN-tfchB<#p-Ks9Y0c4
zJ^n{N_@%18zLzPwkqgY~TWsQqf98Z8Ss5CWII2dKYP8pI?MB{!FeaT);|7&4e%#a0
z1FiIkYUG7(i8lWc@A_ks?^5Fm|5{3oOzNnR3At!!6;<C)Q3v@=bxlLFqFIu!BD`<)
zNdJrc`R6$dBQ^Aa4PwZDoTr~Zx3iI|bkZHaC8p?yM)B*uTd|o`gD6B14&5Qi^LvsC
z$e<b#k=ORsa5PtHQq-o#7XJFwUX5Z%&zz{|$4{kreXdZn(vZ3h>--1KD_E)&Ctag)
zR4F0vuUcQyIEp3x*r~Pskz^eeRO$S8(%`qSWPhFTI1c<Sf!87HNOSPZuAiIn3a!XH
zdHyTTkv%R@`c}Od^{&pwiILPY)lV1TiaalksFsuN5CtekCGST%QiXdI-KqMg^0K~v
zqezsjE#dCxmm2Sqq~9vn>g@fz`)4{Svv06sNrLSe22YTwtSHGJIPj321FI#<CpPpG
zc>J2MqFoZ&ZSm`>YCVZZWbsuVs#G9c{n3#>8uWW?RVHXf=Ts!c&p|Z`YB+y4dL=7F
z65*E$isAkC%HQXIrT}S<I+7X#(X~I`ovz^F@00GRJoIB&7xSt2{PsX?M{~cO-J!Z9
z`>KZ^JuXsu_P6%0t^IY#+x<P>R<TmoH~+WUlEt5NbKT~jy`NH~hyIm=pRzO-;j6Bw
zC|{<m(hb-%Ab*^SnW`%jReJq>{j=PuQ4x8XhSr99A?>G;X*_j>Mk{Wj5#e#G4I*k%
zZQA*`)$gcU^dIar#-l#`zFv(#>*8@$dR4rLSNXp6R-7{P|9#B=o@ck>_V=~NKS>%%
zm?}m8%Q}Oo^6yp}6rGdK*4H{!Qv8}pob=0rx|cvve_ef*U+Rvq8YQbcU4E?9)~Yr6
zr+A*CP3n>6>0h0ZJowjoYLwSdKK(Ht;Yo59jZ|HSQeR}Drr|gFr23IvA@qi%qy+Ve
z;^dj@_Or;^sXG;FOsvYDDw%aOpcMf5ANuV=eHu&UFHw?eJ8#=N*&V``Mx<25jpQ*;
z(HH-!(LbJl1}YYll%C1&Q~X;uE21;;=yq#xH|`K_YP{$lry-ry^%>EK`XyZ@PpeW~
z)f@lJRom+E=}s4))u6T2f6~tXMNibx>SQkiIMHnC*1~m`$rnvGSX)qJrJf!T9cj%*
za!EFz&QBBPNa9q#bbAlj(C7IhIzLTFS3LNkvDCP#F3w9(WTau-U4JFi2_t7I5<~n`
z`%t3*+Kco1VY1Zzy%u%t>Gu~6;{#P1Nw)nGLM>^w{xyVOQmCd%OTQ;4Dia_5v+{G=
zzc1BQ;Wgn((&X>YzmjVhKmMm#*R`s@MyVIM-Q;4!e(SjX_f><sGpG7s|4Lo;0qRW1
zhN?4EHJ3aw@t&+BNdT?gN#kjDs<x4qs=FJ+3H1(H4bqYSB<*Ui(;#h5$OLgf9h)re
z6!bxRCnTMDN|aPbb-&%Mivv{|sG}I22>E&R-_lvNj&<#BPif+X-~RaPs(TRsoA#(N
zX}1P)^UoYqefO=glgf$PMNU*-wUYl~CFF|=ND7D#s!ZH2o+Ak%Ng!^McBmTn-|SHk
zE`A!*p0zqsLn-{H5$pHwm#+Hjg@5vws<rt4!~WMl%fzj#nk?*csjHe)oW}U~x&GZ*
z7jc_(iu^8F*b;C@wGn=PRpKt~zmhbOZq@OizNXz8_1qdoQ#+CwH6A88Q$78yGoW=>
zCe~mnz&{yQgyuu|4?&Jjru^qxnaB-7`AF2GvnM)3&%|#!iAuv6SF&>AoyZ*6V~SVq
z;6B#7B#9$&mwHTN*+}V{`pCd<Ix`!M66%}I;!~BYp{P$QLTa1DMk!+?p-&nw4ee;`
zVJM}uwj^IYYC*HeR#uX!Y%ppK^o^H_Rx~cvrxhr14VWTL!*Bnn4Y8u0)$s^3l`aXG
zgNk!J`leG+>T9%uC+&4+0S7;xL^;AV9*~aT8MsR)gV|_BS5%sfG#&NSlS1m5up(?}
z*EAJ0$xzb4=#?-~PZ(8N(W*HeV^fX6z$;6^f<~g*QB9&=7VgKRS87kA4pmB3%!nq$
zWx}Pd7xMo!wu%SQe}u0;+OMVgr{ITrRwd-`c+hheX{bY^Qr`oSs<bDn(P^bBS1NT>
zj@QW_VV#Ik2w$3a9nb6IOO*dR4{j#|e(q9V#2unXib91<&@Txbp`O$dYESw=@}1zL
zpxUP@-9%M?U6qFF-Uab*IJl|OUG4AIS<t*jDm1I3x=LrlkmQ6$RQJjK`k?l%^3abD
z$t=l|UlZ!6LRv<c&`88<x}p(C6G)QMKvTNs*Fsf}{Cvz-+WLE?b`9z4*A{<0f4hHY
zAygXq$ELpP=1$T<v{W%9F00h|&;52n#8>~RjD~yRe?P;|h2<;5S$@NMoe>4)D6vi_
z<O%`(VQ(q^DrOTD``Z`z(&_&MW#usm7&>l_OuH2Ip9rD-x(cj8C_13$2FSwGc>_gM
zw3pmj$x-A_YXx-%#VEV=37t%3{JJNDk`)h-tc*<0IyjM|KGYRLKE|ZeTy;N;c&n}?
z)OD@8P9o2*dKQXJXg`!9aDOyKz0uAj`5<-IxJ;=*o`&`usipd4gaiAx#G^8lQOv0B
z%~ato^@o3WZxrtnGN~2P0DLB*-1pXG6uo7rlxyHvs9eYKt}Y8=g5et$%0GYVyZnbF
zgyAa-tR)M@`=56*E3+{>&<JM{*k)|ST4OV@EyDEntOM%^L5~KRJL4gWSUhCWg>_}!
z@Tf%(b{Fdj*7e30ANt}w)BbFLBIXH-u^OZp(que(G!$$f1{EL^I~=N$3Bk>VAsh*3
zgg4FEJ!~u+$Hqf6CW07~Kn@~aK1fDO?a2tJiy%f6Zk6Idkb?Mf%&7tltirNyI-9{}
zvRUk2b|0I~=CJ$O18gpPkj-QB*+Xmrdzd}K7P3X`QM}pu7+b=YvSoOe_Hp(Edy+lH
zo@URmXW0t2lC5H^@xJR?_8fbjy};J77ukCD65D`B;5M>NY%|-!wz5~)Hufsp&UUb!
z>@~KF?Phz}>+B7-m+fQw*_(VVdy5@l2iYNZn7z%8uy^p*?7Qqe_CEUnU;Frw9cLf0
z6YM1Wn0<n;g?z?NvCr9Qc7}by&f=RHU$Jv|bNT|i$i8OZV20naOYA##nSIZGU_Y{-
z*cEn_{miQIM)j|F>oy>OJ|c1-Xs!kA?_)Q(mUrU=c_z>0)A($@jDL!^g~OyC(oyL>
z=_^gJrj6!h%|6Wm+dNy1!{V?xBJdtZjH8RAmm|?J+p*5EIb0iV4i5>B2yYYKDLgBD
zeE2irZ-k!@zZ4-w=pvd#1V>mRLL+Pu9V3QBOpI{0e!umxKM%{&jT^wj!Paudb-X)I
z;8{G6PsjKl@>;0{#(xLnpRPCl9NTXWv!jK>p^P8r=y}`mGsEu*UlP6}{EP4lzVVx3
z{FXPz&-0DXZ``=?Cu2AM02Vj@-Ds<3mG{`+#Czzo{wla0bp2TE&tH4LUZmc;@brZZ
z7e`-s>cS%zn_jqbA@aha3$riWd;Z=FB^L@VBwXn0@9f;m=UzLvnz8c_F?Q~ua}S>L
zoEvy9;VeJ<u~Gxt2<c<|F8(Cn%8&CaQgi61O^TB6mbZlWvI*+{lj5ZA(!ly9x64ay
zq`Ra+lJcP#^pT}P{hHDcd~=0C=5{G^TmwlpLz<t19B+d>?q<J3rhkHzuV=w{uX`=z
zcm-sxnl*t8?`I~~m^FnIzXjPl1F0o_dI1{s6?EzgNaIDHG;(Ozw~9m_gr-@b8J88g
zoQW6MgP=F}V)pkz?`A{uc0l(Yg!Yl{Er9ls?n%(TN1=a<p?i-(6Lv!XmMR(;2n%)$
za?3d964&qmNU)CUc_0ts25#hycw=tjO?Xq@j0bZwZ_X_|gx|qi@RmH3hw(ePmD{+T
zJ9s#c;E}u)Z_V5Aw!9s0&%Wo;yc3V%vAip^qC4*a{`BO%cyHc^_vQUyMFV($K7hwV
zV-k2GPvV34U_OK=^Sk*_p2CNb4)Y9XQx?zWBlt)@ijU@F_&t0q-e%Xr>Q3Z2kaH)`
z=LNiwyZB^2g%|N+Uc%kHluzXzUdAhV6`#ZJXCLwh_+0)VzV~3n*AM11nbq=+Jc_6C
zG+xdt*md?7Pv^t=1U{Zm;<?cG-+bEsD>VNXvL*as#gd%jk0@5<bJ(v>*|U5ve~s_v
zuk-!<O}>xs;(PcT{189P-{wd7JNzg=$lvAf@%Q-${22e3pM*{x=O6JC{4IU}Hmx~d
z#rE(uiao;DiQq=?9U|r5A^dg#?gNlNS*rr1jX}ax*oE|Yzzcw<0PB2EgY-ooyo_|c
z56nnk^1(AmH~4`1qk06;Gsvk5+mLSZ0e$sgvk!J7-Qt7ak#6<DDx|OY;3uTip5RHq
zt3DuHw)-F$DZcBZKr^H}eXthkYd#=cXr2Ts05moMeUWL852}&A?t>;s-|zvAxz`8#
zk<uIpOaQtjXbgaTQlKf)w|qe3AMgQ{9rVFjq{JJ7Gl0WBIDqtRz!5+N;2j?jZ;tw)
z3hBE(_zLNJKA48|eII;*^aCG!iIl!kMQ{=DA>bpxIlu`YaHJ=FFdZq`M1pStp8!4u
zd<`Ia5zstN`Ctap&wXG)dfEphM>IEr%K*ZO=6wl3I1$VQ&>RT#0K$nN2yos9E0JFC
z!M#Xn4g|9RgcHGifNy*-2PxrAFdIPQ5!?^>&IcqfgcHF7fbV_qAkrUvFc;~M0FuFZ
zfGa*&fb^;l9zyyvfMn-kz%M?KkpAj}g-Cz%!J|lPe6R>9$vwehz#l$Xg7i-xJcd;G
zfOtzWA_2+xH6JWP`Y#_WMJfYo0m}i`eGrKBFCQ3?-tYlrf+Ned_=WMg4iKZ><FUvC
zh&J@46W#?74d@E!20%T0QHk*Z04j?I3`Bhm(geV8Kz~36AQR<>kY)iU_{t_C%|SWF
z=92)q04mD^l=;$fq!oZlA3*l`8~|jUfMl6NUO8leKLCJyaFPWhQt)1Z`A9({0@80z
zZH^-kI&tU$KLO|nI0^U|kP7$&@F{@C2Q9gejvO@PpdC+#A8(-o%|~jf0w0ew6cC0w
zn3L2)1$<G3;Y&pdkbFr;RUo;L-cx}?mZZ}F(i6y<bXEnDBk4;ONFJrHR3KT?1gpRy
zKbkfwaLAbEWfjOqYWAtXA-9?XDv+(U%>m2<o}i-*c-U%?2kjhYKy%>mHd2cU@LJ4)
z`8qI9vONyWk$`M~19K&SM`PILV%XkN?3TlZJb-M2!=VDa9dm@MKsLn@p#oxe<^cW#
zWJ4X0EdsJ7jyOOU^bb99^aS)m`3a<nDj*tX4)B_QLth;0RNzaHZdQTpT{z^7fG<Ug
zITDaegomiWmm>u}1Xw|^aNt6~A4l3r1rGefGXYsBe-i0EfbqybjTGY%@V!WB3;=%(
zDUAW(yOGiu01i0}r+(2N-;b2~0&wsu{3#XqE~L~ifbT*2j0*e>q&om8<A;z^UjTj(
zDcu8b@F@HX0Az(jzQWI`K=K`aUImi(@C$%%PzO2@{w?4V@^9gjM3M^Rw<B~akPnP#
zq5}Eth-NB~KaU7jfi*{JQGu^S+EN9?CoCdV1@gBMkP8BeFCw6O1myE0hNwWkH)5g+
z6q`ik0i3Aw5@W4l2MNf(wTAs7z!#L*pNCaI9K>V}z#QPic+JZSkUsO@+bTf%t-)RV
zyKxFD*W3K#`0x`$KpXtGkM2-uhigW5tr5T0Sh{8k=-NngsZoI3sMd66z~+Cwp}o^$
zXmV$Zb<K|7Spd5Hj&AVzrX~o#Y^)6y-}Dv~?G2B@LOCA`;puD+LhQu|r=MYKF~O}c
z?t5V@--D2!f}^_(XX8a+9fT0NCBo#^2sq;q2KPgln~I?J9)y}j2vYAuVEPz;g0JB(
z@>da1zJ<{71Qw59@C*Dh|C#?wVv=5JCfzATO6{c>EMIy`1EitS2x*iwPRf;BQiU{A
zx?g%oS}r{$y&%0LZIND=jz}k^&!w-VZ=~;}D^iX0FAdY^G-geRCPEXf>7_~1q-ZiV
z<28AjQq3&Q1DXYz<(k!+b(+nZ9h$c^?`V!`KGB@foY!2|{G|C!<JH^<&;}R-nglct
z2oGo%&^4e}z~F$?fb4*K0wx9&1QZ991xyc^6R<E~X~0tf&j)M>cr{>Oz>$FW13n8l
z8*nM$N<dA(zqCwi&^FbEXd|^9w6WT|wEeY%w8OMn+Hu-EZLzjoJ5&3BcA<8;c7^tN
z?aSKj+I`x$wa2xmwHLKNXn)oIOQ+E_(uL@3y0*GlT`yg{Zm2F>H&*A=73s=!vvhNH
zi*(C%D|IjEHtJs0?a{rZdq?-7?o-`a-PgJwbie3??k~Mo-$-xPx70iIZS|e>UG=^7
z75e%5#rW(^Ow7QZY7(a=UGTOp-oMSk7jp9PiG*^z1c>+lsGxv8s)NrgP`<39xLEnR
z2fZik$|=I<X!7yidtOCud8vy!>Jr}*pLe2fKqxQ7PxEzI?!<fIMe0c1ki^BsbT4wx
zz-J_!NfjQqaw9%59xu-0BNREl#9e^5@TbI2^5C;BR3kPaDc)C>l#`3E-l&C%3Ccx6
zuFHeZuH+Xvr{yS3a+TuTy5ihCcX>`OzT{M%gU<+{eQs_JhD*3voTy$azmrrX@_<lI
zd6Lp0K7j;GlIm5bd-ygCA)TkRa;o?_Z`Mgt3kKI=F<9xPpspZEX*u|2lLDo}V7z%;
zjMpUz-GZC<3Mb(cIZFM)x(<e*Fu5EbW5H((=y$S;5#FIE#0u(ll&o}}tm2e>v)3VY
zeW@fJ<Weds7l|>+cT*;=OAnXY@b0?mlk2js$*xXW8AB&4l)YQ|Jq4oUEGfc^)2`eU
zr6fhcy~vlZn_&uYnNknYB3u_Kb%)k3t(Q-&moHKJOI3cCD6Nu83R0C!no0zGIgDtL
zrcBGN{7x&ZC@IMCR1_EGKom*}N*Z)X-^IoE915N8`qkWJMLGC9z)jgpRFo$+F*dF4
zhDW*Wsn=UZ{k(FwO!=KzN4&DSY=(k&SuVcrgs)#IEa)CrR<8@Ss7vNeG~!|hW+{!z
zmEW1ZrsWU|g>kX**@|4?6Ba}Sk5VgJAwm}FWYZVcvg=PXTdkN`e^6B*8q`vyp~9D_
zLr`A|f{9&6DhO6V@hhDpmEY=(E>(4tty1cYR_oLiPge@6@X;%L^ubj&y6(<Me;Iuv
zqilNJjTuT$V{Xc{GV=toarjajnVgs|0~5;dK7UExjGL8;T_xcC7^Ugd3K&3AaD3e%
zPpKc*om$7nC<ZGwR=JAlF-R%w)<vljO9BuV+pTL(zRMMJSI@4obd3Uh;R5=HuT`km
zs;!NW!PTJd30-D5J?>6<CGKJvI3+EwQm>WXVyW-A*tqWb_}-FwyAX<`<jP#r)D(!8
zC^;v6_fN?wy_QrIgU8NJlv1yh=Hv5eN)3GaM$ITa)2%Y4A0>yLZ&s!ZKD~!QDW^1}
zjDlCs9_o-(kmK>V@vR?VpyVpx7EqAqt}0QhD)jG`kf0RPYvpS3UCQ+&d>cr;?(S=y
zr#4IKsuT}Y=`c{eN>bUNxGhM$@9HkKX1toH3`-oSTqP;Ih#lBNxk^;4BoPbZViOb8
zL}g}DTt)04crLXpQAv{2!4s2kt7}}3m>A_lhjm}*7~3v)tn%T(|KrCNZ+<}0{~<-T
zoFXqXjxWYwD|0jZ7@Ldn*!HW!_Sz*WRB|8+>LU%8=1VK2HPT+`jC4gaLi48PZOu8&
z)qsG2mH{0Dx(D<|e6ld$RKRs@pth5?8)A)-h%+j*v$adL?`uERp4a}M3)i*RMe7FY
zl6AunNsQB#>Z)`v>UQf6>)uD)a7K4gZ_vl;d+EpN3-tHv7wMPlU(@f?AJ<>dU)BGr
z|09qE8Ujs$%>&y8b_|RQ>=l?4m>QTJI5sdRaAx4_z(s*e0-p_B6Zm4_mcX|IKMgz+
zcs}r(!0!XE1pXBy1(|~G2(ku62DJ<76x1`QPf&bNQqZuV;X&C!`9V{HJV6fx%@2Aa
zXm!v_L7ReJ4SFl+SkRfEOF_Q`)dY#48wS0hk>L)5ZR<-fZQbgAsj$%PE-ZY>z1419
zX-GYA{$abgqFcOb(fa2?MUQr$%Z+76=Vz>PpG$2;giUTPKD7L}<jB@zVTax+jC#~=
zvWN%~Gsha;C;E#yRuL}8XpN$u%%1Do<L<JO9NWh3+LvD4z3PLoQ(N5q>~8%U*Z3#K
zhPCZDN;cSy7STcIJ{FVg-ocTzgY~i_DL*!L&^F<)`3mxcVUTETGs)UB!)rczeZ%?}
zZF1vREXjo%_a1)p`S*70ynoh9_P+Y!(n+2XVL&CU=9CB(t>s3$+HAA;fAQ|;-wr*n
zW8?9Ub`|BWwEeV6d$w%gJF+oMj_B2+o!tCS=aoYHS0$g9_76=QmEV6r#;*5EZ0!rQ
zkz0RE7R|zpmMs<91Fvm(^I+)f#V_W&il^olZkYOtZBB9d)S34NVz}l<KEGt|q8pcA
zkeXWX%Imf+y12LdiRLzAmwSqb4WF>(qD>r$l#l4;uBV6pd3e|A*EZXX1^VYJ^46t=
z$<4Zgs)N3d6+s7fu6$*KeY`#;Z-U(60ow&J$<pth4{HS9ee}!Mc9yx;+U2QwXE{DR
z6=r(QP+O><v1sO_Rkr)r%v~{OmAuzm&?4e`dX3kuTlMg&M^@M#pZ55SCuWMnweA*1
z%P+_G{kY!VZlm^|dkag)hQ&{Ozour_2WNI~EX{k?{__^?cg2HtMu*APZf)g0a-WOs
zgw<~Heq(W1jcp9+)=9#sHCjI3u>Y)ml&<*Us(U@7C+tlOGkV8fm46qLh3l&95?SKh
z)!IQiQ;pazqIAM0Z`TT=PHrXkYX5v`&$nNO{+|7-JisRJ)z!$yEohakzx=}RG1(;}
zx<UjFY+3W%8vCei+WY6;`@pm?cg3nLMr|8|vAFL>-JaD`-Gx)9xr(N&d1H>fXN9)k
za|g$r4l~w>mvrJ0Z(ps9aR$qu%7ewHloyZG_S2fgBGFg7e97Xa3-PmH$<juxjiTAY
zYVYIK!Dq!o@&kg2`;ck{%!K*0w||Ius9KKHnLoYw!CO~^B~)}6AO^@&<S7H>0dfb~
z@@9vNLv7}7<%qW8q3=+w>-Q5+Q8oU$(2G08ov+J!naLp&2XyUZGg*GuZQP@E?>ac+
zc$la-D~5~s@5+D5K575tcWs2OXuS5NiP<ZMgvk}X<>7LC=jS>eOtK%pV)5*~|Hz?G
zp?g!b6K!7GI=kv6TSV;~%S6{xYut9R#v7_#H};A2>`+-ZN^U2&v6-eDNYnN_abV>e
z`vP~ow*2VPQ18sh+SU4juHuMto9Ufx`%az?eK-H*oV>!~amIdDDCHvU(z#0(EM2;E
z@sdWZMBfa9QM?pTQn6;;3(u|HuxWK=nP*zn6uVKoc<$WA^TX!Npa0<e#Sbl+3nu-j
z^LnloYNK?<Yb)c?tZTm`j?9VEawgl1mN!3J`N4bkkvrclIUTmrkfs=rpBfmD!I|X~
zC)p0?CqFSFOtA{~hE~CNTI20C+ahvAEPirCj*L{!!A~rHkm3sE_D=%jo^m76O!UOh
z%~WoNQj}9_H!eA=74c`}MY`E?)n`uaOV6%ZwJ~hly2?qDrj(4GICa&E3j5f>T4Sf#
zm(wf71DAfgY?S+oMcVnx=PjN$Z~lULjatb>sQGgjJTyP_!6oyTE?K^K@p7ASZRNG}
z{s!Yz!%FMP$p-U2qt|{}eqJYD5SO%H)i&xZ9@EP&$X{zsv#Y&ptBo%%U$bTH+WGfw
zv|ZFcTRi3Q+_2&4o@l%Ao4qf;cVxG#o6Wdw1FUb!27Fnygsks2Q2E=V2hUx|c&q<Z
z&%6g_+Mj>#-StPF2t1>gdrckCTDFI_-<$ZW?My)4)aPG$^~JT@x4%^BEO3|S*-Z<r
z7eoxdaIe9*Y{`<POBO6&u-tAeTX<DWzACb=!pg=jKlP`G4gGP<iO4R)vhM2s_Q-SV
zURd_zv$nE+*;QE&1)dSzEV-VwuWnoa{PrE|%L{0kNtXTGMfsf0SW|Ar^b4%emS05k
zXsh}Ak+t6>8%W`g=;CoN*I<<6&&tC^h4Grl+t?CkFk0H^y3J`nJ>RyeOndBu&8M!0
z8eLPJ({o@{MU#!9@s%2v(1B--C(Di6M{bdIqLKY<K=#a!kALv&XNL~1NF0(fYe1IW
zq+PIl`GO^3OP4HJwq(I$^D!^WrK1PG+Euo#;5obT?2(sugK($!?K=AUlpTF>^8u^Q
zG;c!wgy}N_jT-N=5IM`M6%G-hm7DA2j&hvVtJO!2(O&OXBc|y;{7`h1-_WAsQz62n
zlOOet5u?N-TDg%<eqO$;6_+DnS4ELtG!-4R#(j~s%WK3@y|HNBtDd7_v#wgk6uh*t
z+%7!&ZO?C8yEp9g?!<O7pP1IyZmP0Yi{Rj6>#fElL-5HOQ8>?Fp5_e+$+F5vb>=<f
zAB^WG{6G|#*tV}RcT?%s1vaDN=4@iFIBEHA$=l>(j}*o{YOkFnS13NuZmd|dY3ANA
zlZX<J%TZ#vR@Ul7l)PMP#MR>{RZ3)~<cwfvemoN_To)5B8rRMOpPn)pPY1|cCpZXV
z@@7=aKYFi3>Wtpyk;eTs;;9;=yyx-CYlT%@Zsa|wksHnKZ#8+BR~ZHK+Ey5h=kEUU
z*DvorXB1<qYZtT?V`{G$Mck9;j*9M~#!7GBi`}joy_2hJC+m!}uZqjY(EYEx`OOb|
za!WSbcK)p0Gc0{w=P<d;z;>;T+O|5QV|KOprusmNVgDZ*W6g6Ap(*k<?Fdn*H}YfC
ztj6Fy)xu*e)XPCT`dN)~(2U2w)QV=2ax?w%UUJ|{ZC2YuI-^|S{ox|tD$Z%PdVk2Y
zn$}k47>tiwy_r?UPgYosBIaqUah|o>_<&X3C4VAzDf~PpKGB)R8x9ynu&2f&f+5$x
z8{bX+W?5D6$*+vi`~`E3^4z0ezh<ly-7XuaL-3h#t-M+Ljc%>jtTnm}CVr_#V{9k)
zG0y!QW@N(W#@VZBv|yu1(urQjMBvrm(*>6Y*p1a*Z<TSf)m%EsYW#iwu`ixqGyndT
zHaM0=TH`Unj9T;BJkdxyRA-);CpR(<ZJXEn5ji5zc;VIk?;qPXy1VhhNc0>m>uZc>
z#fG!|)$_t}UL&%M+L=>5b3I|X_rI{kZlqvn`)de>Y<=~{FRI=zc-<x+mD4RoASw>5
zFkA|$F_u|P=`I82w7ptPt~LfQ5j*9v=Zw|M3}=m^vv_3x4*YQA;FH>WtjR`BoAcOr
zUBs|O$qp!Ibw`v_H*D%+Zx%-x*g0N7XTEfV@dCqP0i89hRZfgIU~^W72Y^^m4?3_L
zXr--V?DW3MX^$6M-`KT%SJ}&bkJD)mHgk`2I(j_8>EQ7cjvhJtoYTSK8BRxr*vY<#
zvq6rBi0A}6hhr0!9waJbbhz-Ma^(CB!{ZDH`sqjl{~uM(4puV0h~tqY?Azm*04FAV
z38(%1g$&O#&_Mw9?w2bkk`w71oQ?yWwE54mA3vF~X`BvCwkb!uiy0m~!gEY?<mX~|
z*aFW>VUHK51{|C9*iV0l;prz1G^S|SRL&|m9=V`>@*T=a_)aa`%juZoAg4nXoD<v^
zz#a_1gHrri30v9xMS2_rd*=LkhTUxb9OKx-24UATzK-#i7~jPB2FABAzL9bK(Sp|)
z-@*7RjBjOpC*#{BJWGJ%1Dqz{fB<I=IFi7r0e_Ru8u$U);m4r>_WbdH0ZtA05e<Kz
zj>7l{v@y<)G5$H7kYV?jpQ0l%Y$EeBjGt!w8^$j%>?rfEIRBRMFB$)u@$-ydWc)JY
z-!XoP@n0GLk@4>t$6plqf$?7$|0#giF#adwe=shv0nfP1@U$DppAfi4$7xbyCI#S}
zO_Bofm<f}xQEg@tXA=JUk%38CNovBRAcj9rgEKcNm`RP8WMX(eM`}tZZ&EWRStQ9u
zCvQ>&lk7~gGU-k_gp(XhYC})oN#RV2WKwG;wPR8&liG8sGn3jfsUwr3nH0tFl#dj{
zq)trg!lb+CVIQd%le#h~fl1w%l*pt$bebpiWPE@|>dmCSOuC0j{h8E{VH;f<#H1vK
zKe8bWmZVfB-7QI(OiE)?29t&}JpLn%pof3(7bK)?hQB`}jbqYiE{$c<1SXAV(nK!h
zacL5l@|omfQW291xKzxf$xL!Hsf<Y_Oq#-^sZ1(oQYn)vxa7g#lcE)F0MkJiR^gF>
zvp8C;#X~lo@eoQrpT%G0vSg65q)Ac<{%FM$()-efl2>EWR0QyVn1JH}m$WUkL$zzP
z2epT_N3<VlFYCJK#^~1TP5MOrv-;lx!vj|a{vH$<)HY~H(3qf^LGKwJG%PXvX86l^
zhtY2AYaC{rV4Px{W}IVOWc<PCZ6q}cZB*81ZllK=t!wm3qpuqM*f_j#bmO}kk7(>}
z{8;0c8^783gT@z3-Asw5DW(~wCr!IeXG~{JKbu68fF>iF6gQdHWNDKNP4!K~ns#WK
z(6qGaLrp(z`gPN*%?36b)of$4Z=2l+9v-|U_^sg6!M~cDnH}aBbANNO`6=_;&F^U5
zx_Q^;@y#bSFKs@j`D4vDHvhc&x6OZRe#2t7bhD&b@+`9~>ns;ST80#a?7d^y9qv0;
zwFqpH)naXnt1YgzG__1_Ij&`4%Zs6nLSsU+LN|nN4AY182+Iyz9d_x?A$Pj&oO0)i
zJKwk3tSQz!>pbf*o8H#THo{hFTW)*acEonho@_sDziO{`G<I}#-0g5W9&zk+eB`*|
z_&I!9_#@#f!cT=?ix?b{8Ic_^HDX)DTM;KCE=2Ok;K<0xZjq^x6C<ZZJ{I{x<hIED
zksm~U9{Fu6{N0sS=2op*-PJ0y)x=i!wOZJ!w$)#)o40P?dO+(btzT>t)TTw7c5Mc?
zxxdY_Hf!2!YqP)2i8ep9`Bz(g+xBfIwash$PTSLMe`(jaUAuPu+l^?qtbIWHkoK+G
z_ijI~{mk|+wBOVI%l5S$936UfDD1GU!}$(3I)-=b+A+D~#E#QDuJ3rJ<F6fSqO?)X
zqhg~*Mdd}!jCv&Mxu{p74n>`c=FyhusOY5VQPD-w4@N&9y+8U?^q-xYcIwjU?oLxW
zJ=5t*XItmk&PknfJKxv&$<8ly-rM=z&R@h>Vp_*^i5VL6T+FL6Z^e8T^G(dPSbgmL
zSUIj|Tz1^NxOd~ub!pKhrpwSS)4S~La<YruwMo~`U59pccir9f+pfQM3+$HN?cr`u
zcH7$RaJN(4e(YA;y;=8G-Q&9#bf4M%vF^`z-`)Mg?%#C3)}u*}$R4eGwC&Np$Cw^d
zdOXl$S&#KSF5H!H*NL8edoJ#|q-Slfw!QA}b+EUg_o&`4^nS7Tt9?`ZPVAf8cS_$G
zedqRltnaSAC;NWe_pg2t{W|pP+Ap);gnq^S7WI3%-@$%o`v>$l_3zk!TK}i}UmnnQ
zK;?jE2J9Jd9w#eP;+Mvs9~d++dSKeXrv_e42u&zUSe<Y@(Udqc@xH|Ei5HVBNn?^$
z-<@*ziCT+kfMGZSqIFkApKo}DRU=-(TBqx0SjWVOj^o4~9lo%?u`lbu@U$^641Z?G
zqb<AWw?F*KgPZRgJ+j52k?$SbpSv|}MZcCiE3!AFhRKavcaUvz=+Es$sQqd{LdKEP
zUmZO3+2@Cb_wJuDe4yPl6bs!eRZm+lg(&fzDA9>Ks<lF|m+xq+6>B2pYJJiOt*qCd
zJfJnn*Vk6^vo)HtAvNM--O<;zSM+J)v<Pt#BFmR3-$9R3Q{^DTXIM2aTVW8tU0WJq
zJ$ijr8>^|<Ahvoxjj$fBz0lTR+Bw)Nw$x}u<+Y{l3|;?<wsf<0^)BykSm&Lk5s}_c
z+Zp6`f5mk+tXx|uBC5r-Y7tVk$togNS>+@V5~&kAYR5lrNV(5?RSd7<r)tFX8qIuz
zn6HHEzw2xEYQ<=MzV$`Ju@u80?{<y1Jz*k0e0`~9h~Zha)S(gY5=L^n+D|RX*54PN
z8B{55oDu0ut=`dJBhJfz0wHZ}_u6>NS32`XZ?9y%dHXDbc~j~kz4)^Bx}~GR^zK5@
zL+(_0^|W^kS~Wh4R)g!eTBx*Ij#dlN$~ytA&g#q^FCNsJ7oN@*PxsTCJI=M57kaF<
zeXp&4mmm8|bIhA=S!EE({+>mE+bX^}YhE>HjlsNnPLu(;u2%E7Ife3${#IP<ygrsX
z?K_8hT{XwoZQnWQchww^Ro>_w;>I#e^z;siG01DZ>8~0v1dx|&<cfc7<riu+7rc_C
z#ycTW_t(|{B{eM(uWz%8*Dd#2k=1zf_&IN$Mw}4OTSS~3_sJ)6oQM-$MBIQ=a-7_S
zt`ZXH4&_e`(3&8~@~^W+TkmI8!S7??)V#)g0vjONme+L~#D1;tM9Ln$`NCVZk61bZ
zlN|3|Vl&@^(0tFebjy?0lOa!9O^3kz;TJ{Ei(+6Ef6e>7MwmmsMf2fWVb_(&!?nH(
zo$l$2T3M%CCwgjy?_!fdwgYs!`?^t?NA5{A)Qev)T9m4GrPws7y+|EU`CO&<hDhpJ
zwYDl4())JJr?lb2%n!{GbK6^Lbmq)Cm-N4`{NiH~6e`-tx?LS#u_dlgeGXfO+cv)Y
z-u9y06|`k&?l@=Khoj!=y&}-uWzJWTdbIDQ51*bspj)Wi{1@ltLfe^=k7);SY<^<W
zh+XfO(hj1z?VOjoo=CksBhVx&A2pcYN-&sjxU4qwTRnD1i$*pqb*Jup+it#baNX`h
z2Vb0&fjc8S<Fjn0&u3q~yYd>l9DEc~QZ2%(m;YkkDb~)meDm?vHxJm&l}F>X!lsj3
zimsd9Uh%=ABQ4wLN*<gtdx}k#L<_BX^RXR=_gx76e&F$r9s8%Z%XlGgZ@SIAv(NZ`
z8FE0VY`oZ4m~7_Fd#*LIY~MU}+(cK&c(=W1ThZ37q1!jSxWiUdyU}9aIb`B%@4ffN
zt8Z_$V@Ee0z2+5;E6olw)wU<DF02aPBSOp*iLvIjV5_|O+Sn?7655|7hgg2qx%PI$
zK2}MnDE?0L*s<5vS~sM3vfM@<A1aT3S8nlcZ|vwQO+^11&6`S-ch9~nT8QzXVtle_
zGvq9q?6~JUxrbaFDwlMV+qv$snWDT^V!AxCN=&H=79~HJOT|uah~-45Q-`$XC4;}u
zcujj!_uH0|Z(B{y%w6-LR%oO3=2BU!UwwDh_Ewuq;!x{1m-d7%GiPw8Q&}gzfBuA)
zl%kr86*YK90jeQ}R?9=hut<5BJhZJCDi5pCnX(KI8EV_io@<z`h;<8^=`8Pj%`Bk(
zyUuI9b`JY`rswarax#(IU?NY$ypMTHj1%2Ne1;e<XUk(o%H!m2a{SxaBgwW`2gm`%
zm@M`j)?;r%F9KecTgV}@sZ@5zdb>$3TU+Vfak`&~4HoTd%-cl!keX}hy>;djsa2z<
z4GuGJ>j!&onzQg%@3Ly{O<H02AjDhstL)XS{Ost#%liU<Km7Td!Wb$Vb^Th7kacmX
zaW31B6SZ$Yx9gS9!#>$RZusB~XIhb64jCew<N!G<)Kr1Rcx5%#^}*iug7t)=d@tU>
zG{S36i|{YT9ZY)3ZvN%njT;Uh3;jLr8`&&t`(|{XY`c=L-MMz#s~?7avORBT=ES_a
z?b&S)>dfE&xP4S=?_sV1>BHB5I>p{0PupSpxuK$Im}w34zspbJ6A=s<@`lx5`!x){
zr^|Og#dwFyO?2|VYD=_3yp8og1;}&J5w=1;f%^e=>#BuAove5fh{cG2D|C1;P-x`#
z8TZVnEU`Z;25H5<>RPL=O#WGDbF?q7-?j>yGH*@j(S2xo$3D61o||kRc9*tf^GAh3
z8)hm+uS?Kz75@N?dk%~{ijG@d{SGGxVX>EG^N`VHQ%mjJg!PZ(B5+k;wO(F1UN*`J
z^1Y#Q^cS*0+-0i{=$rBS7hk^p`k6C_$Mx!yISyMtvEbg1zj84IJq`(3Z&)Nc?-z@)
zv3Yl((AE~U7T4g5<+Q=_fQRL|fu`9&V?nhTQXLF5`u-tYfAj_Ue-rNjnbtri_~JcB
zlD62*R}OF5^v3bfn(kl7&E@7j`a}-iH1<%D&HURS*FD2wi-NDj;H1QS#hV_GGI8hr
zgS)oA|Nid6?9me@rP$5C$yWmUWbOO-qeF+kIP-Sq;KYnEz_fJsAEMVE;=w=oJ|T%!
zLehx-7<JK8kjcT~*-+6bUIgJ-pjEpVIaId&7$-tb>|6iBT3fN)D`LE3ULZDM*I9ax
z+<p4fL$9AXeP~=l{}JPQ+f7gx(N>I~YY>;9GxDzi@CQ`ZMs8Lqeidzlw~A<JucX`_
zR6E+@G%Udu)8u6a?;C<ye%H%iLOB51-}SYV<xFiCJrs3R^$**u-ca~2`HcX@iTRtn
zW%&m6M5Z<ZUL1-9K-MHTC2v)BHF!<UPWUTx&50WG6>P|7SZY@5L>m!5U)&Wc0tQ@^
z?ed)+yI@znMtAXz{a=2(J!iO0ZYsw=A!me|e}7Z<kmidKv%mW0V$V~;_36NiKYSH@
z^z!*jqW?+3&YM3U;O#owvVH5LOE%fpeye>Tf71N%VRG*_2>7s3trHe;m+16e2f2ye
zy!$}Z*uE3y%v-v8<<d>dciA@Ks3J~h{^-Em@!Fl0u9XwQWS-z?+xp0$i~Dx2*|nZp
zIG1j&+!9v(ZH;IxddeZ<PI&@;ddQvSQai?$%R~n`SWL2+KR-|@9=A-Kx@G@|I}ab(
z{letY8TrYnc9X{dU+dL)cZEb6b}sx$xPKDaKLulFXu}`9{xJW331<9yy4b82{f`Ri
z$78PJT{qgz-VZizI(#Jb$Lz~;Z`%y{H46@Ovc+Ax?^ll+pD`h~i{1SD4*4UCoFd$!
zlTH{mWTubtWOcTi*1;4WgY0`}cQ71Xc-6b;>Jo!G#Aw6QwLe=Tyo<68!>tse##obK
z5RTC<HC@(-V+~J~9yIXhtm5jQ8n14)rM<!Qm0EjO6~A<^!TUtWV(TLY{$q{i#}L~0
zO<Q5*-bQdj3uoVDc&p5CsV2`_FCN}(6@wqI+?;E`%)MP}%+s!o54n~ep_kKYlOLQh
zw{rfBmh)FWxc0%7a=JHJJyA33wmy7#!E?4JC$GNenJIzhJ)&Q&UG(+d`OM~3`=8w0
zazVwznT4U|X|-m(=>iQXPSt3xv5<~dliTp1m9TagmH}y4uW8kYcGn@=-GWe8{_=5y
zzs9a@%bwb7-yeVW;MkMeGaqk+z_3se-y5Ez!gowG$_h&(w;2U*Ve*|3i8gP-TbKq<
z?=yacedHHCvk&yv&YwB`;b~!}H`i{p(!Sq&wC@*dHC6h26NT?bW+QMfgoV0Ny~W_Y
zVwquui(6==!vpcl>{ixS%M3fbXEkDTNR3X+y_T+(H99%AcGkRU4<O2D`QWApHq2Ws
zck#|@AqVJ8qN>cW=h|Y87#Y&qu&&Io-}{EfTOJ~?e?CS0CB};Hl)ZF^e821v_fuYs
zmA}JA?_XNf!KULgTGP%lgR*Ye64DL9J*UwAP{<I2yi^XkdM)%SuddNl!_|seSLNo{
zLPhhd@+_T6zUhX&CdCie`uy<CW}*)SVIA&WJ15U-FPdLRwALPGL<v;9_i4PN#c!5B
zbsG$S;>1$Sz*?x8oOFrL_b$`Smy;~sWtVD~=}ZqBUK86iqSX6o7lSFu`Y4@&%<^hN
zs>OL-q}9BywKZk-)ovHX<*UJ`))~YBSkF7Y{87Y<K3#v7n`Pp0m8o{ISRZ+h);#Tc
z_Zq!<&rW^u`mN>fgxz=5GA?iJHk=-m>0ey2eba%kGrQ7c9+{Ke$8J*h#yNJz;q0R7
z#@LTBo}F!Zd)um)VHu{)F_`zrea^KN7TdE|s|@J|j$Ql(nD^G%mT>HNzhuyeDc+tI
zp}!>S-`5Sb_Us?~d2P=cy(vW=dseVThF~<9USs}JJR*;^%(TLLco5-!*}<9y5$SuC
zpPFpYoPu5+)umYFBRKET$6LkIG#^v8RXGv5Kqo?S`1RK<<`ccF1EyNBbjw9Vcynbr
z4W_fa)Ea!MMvS8W=6%<CpvQAM5!U-i<dBi&qo>&3DjBslGi>BNGjdAo<}cq+&RMYX
z+4t4!uN{7G)5QKZ`JEbZP=E8%ltvxm7;X>3hY?ouX{Xh^C&h|Qec$>z!Z6c79GP!0
zpWYdHeXMW!Xx@`=#SI@B55M~S=Jj@YfxhMqt@-q|D9n7%B>l^!`OjyB$(Fm61M#oh
ziDvevuUh&}JSzClyFWht`m59OUa(`OGj&?QWIS^qPXncT{yMt~6EtrlTJ1ofHp5`v
z_Uunu^NA8<-iw4U>M;8UQT+pd>krWb47ztVR?PAvvwsqoE^)zYG@}frLhJ3H7%)YG
zsO!8_G@>x%icX|?mun++a*+JZyy*|kd1z+KhgLlF<h)g~L44C9QfK;QAtLrhPZ@%@
zUTXy(+drf$Fo-rpp^vTJiJGk;IGVp8T0FV(@fAy-Zn^Bf<ujk0aY1g;f==xFi`58I
z9;TD@L|HRu#@v|?-q&*8(+@m5XH}xmw4ej_82MqXscRJ>gk`-|9?=<VZz!z;N}Ftz
zpAwIJ=QUPwp~ob@fc9P1CoV47{dwpy{m-sVsZZG6ePYX|pK<m1E4x2lY`d(N%?o<;
zlcPh2>qq0yQrTw3JgeKj)-~Fmu9u_F_Y>v?SSi%t5o_&QWl>veveY1tdDacpwnnpq
z41{^{`O_jg^d0^FwOh8^p8al?F0XRSe)|!<i0*M(HZQhy)_=U<l?nYr@7A~5GUeU-
zZK?OWrnJLV|AGmL7-xxCS)GGN1iX`><ZHcM#Y&5L;wuL8TGxWgvV!5mk8}?+PwbFC
z;4b?q-Im2`Uw9?Vy!ObE;TOW-Uvb#S#mEBa+mneD^*OA9U0-X7G<>`kr%{_e<D%ls
zr8An>5DvaAuzY<*cUbPGU2l+QU2CD;@Z6fMJ3^0V9vm_xGkZwx>cW@HZJ)hq@l>r@
zzkbb{b?eqtm6ldjdF(Q;9rl1>-E!-Wt2kmN&*-|S5kJdwEfcLT?D*sH<40aO-?9VF
z(56hv9~34x&w^oVDgt*Q)Ny>Wt$4&1`;WV|C)|Bc$}Pg=DgBitNzdbWb|QPGeZ-Jh
zLy>j3_1Ge-7)?7k@}t<oiLt(D{b{x0*KmG`&~kuPBwk->QT*FB!|npZZupeVzA49E
z-wb!RP&xU$P_wMSu#_5!r+l}~zr|eN+{!x4AbQhokomqN*GpR&aQQ4*SMz=174_OH
zc|Q%u^^eyhTN#q9AK@HzPxaIS!|-Zaz3*k>?r5t*V)LvyOKQKd_-*l=*48BJ2N#_e
z6)U}0)OgQ#wwiZ$H<<U98q8HIYR~(t?xvc%PyO&2I(`g%aVtIVpCi_JKj?vx2mE+F
z#9#N#0j;f$<<|Eqy@}N@$RYwHe^Mp+_OF*8*}LxRmjC6$HPIh;6hX7>*@KDFBMc&z
zs4(ODESPFs9U>x#INznW5z*j!=YVi)x`8OLzs6Hw$Ok?D6j}c1{}5YSjm8gKpQE0-
zTrZ_F`G>8dxzbhe&1(<!HS&5S-JYs&$Fs!xs=t@-<p}jOA2#)a)drYpI;-C04N%Cp
z73A9m@@;({<b$O>4okZgmNv~Gy3nZ8ug{7w;Nop%%vklxYoZY!x!yU#Fy4oKd4Zu!
zk%kfeaes@ct)}}Jvx3~}6>-CRKHku~_NNHL5UYq*WMtNNGz&U1-`C!1Lh+mbUvJ+5
zA4Sprzk8P}*^3c!UVzJccSscwsnUDzAkvG3DoC$MAf)%+2@rZOLZk>HT~t6snn)*r
zfCUU1bT)26{@-WzE(wTl{eAwspM7?BcIMfs&ph)y&&=?;63A9Q?=Bm8oe4y%Lo!|d
zyHdM^_I<?r(tDI9Ho*1sfEAQx^7jew_L5uYL+I$m{0mA-azZdo?!6GQ4LZjz%e^g3
zTBJLkKS*!Ri?+eZeR)`o?M1V7yY*Y;*<c&y%fo+W4Sp8aVPNyCmW`5!TOMEe?(r|}
zzO7TIZO1q2Ty6i@@w405sUPm!zir#zy<4ZgH)h%tSXWdHW<%LMHUyRGvwYC@U`zgE
z{k5#4pRT+4#@5O&x7M0{b@1+vSydj@u4$+>yWd;N>sF=O$p%km+dbcp&u6_Kve105
zr%V`$0pyeG-tydh455`G{r*qZ9!vS$n2;Wyk#1%69_r0cl-Bxy!?SlD47T-IIWcFl
z!~8?f2KV*h@!@e{_NYPgI}e;?^n@8*exXOccnZVgp=jqT6b}pYzIvJoM+5eZ-|pD8
zcID24)`B+MTWzy<*xY^nKI=yxu0D2h$Ls~G?AK1~_PyVCcU>Pv^Y*}+@2(s3@eId!
zzgZJTSQ}iNdU2Zl$_F=R54H{)vv6Ry(L2`8v$yZ18@%VrghxJS*e{l*+d8e<Z{4_h
z<&ISQrP*K48)=;r6fi#wUBOH?g>4qUWV^KNJvPO1<MhezzUy<kRjYn|+P6R1?}o!O
z35>1C(hBaN|49Q+gRZ?W@=o!1>f;Nul|u%l!+@&Q>YRbW2?oGD&;cj>%m)1Ib*6w#
zEa+ZfetL!ieX1)o8h-ucqtkW_gLb|@u#fN50gn0g*67Vof7#Wq&)e@z91*xUF?q3L
z$lJQm4cj7feb_4xZnD>JjrzL9dJLV;tlNCzw3TUETv9w=f4!H|$?nN!247?e7nt_K
zwTt4HS6H=gS^cZ*)y_7h`Zde9tnJtOJf$rx4C=8ix|1t69yw_JYRW0tTei}FtMsxk
z?L)(%tQoVXFP=Th!Es%@$o5~n$WiI8$Q3%<k}q1mJFw@A^^P9vbkqIj&7bJgZTgjS
zXV%@gynEHcsjD4dZ`JJ!82L#nAH{pL@=D$6`;Y~dfvZcQ@uJ8oUuLy0GyiY3kV|c~
zTxP#9?M3BqXXd7te^!38$gMgX6j2F|@QYZbh%8vwsi@UumZ;C1`Bd>MV160vbxNE8
z?DA!>%a^I?Qp321Uhx2RiW+CTLmxZz*N4BRfm3EfEiCC*<vsn!u(N6MD@GH0?&=hc
zeq2+Xl2DV4*84WlDUE9~jedMn9iS(JLDT6UKBuvwDAy~{273>co?>M4rN8Y=a0{Dk
zV$x%_=CQb=pl}ifVN;o8VO5^qh8*&ZYIzFkVYl9`M?0>M>h_hQ^--!+YX&>IH=Z_U
zRhahN>FWm^tv@;6hiQF^20ym6>3=XU@5@8iuAk`LWw)ct_<?;|`^W>lTMs;aVZ7tQ
z?h{{K_qq1v@Mg{Wj{vWpf|i$BDntC;DMM^f9m8`jLu^o>S9U8SxY#`&#ugB9bWlYc
z8i+VFs)(aKL>$V`T&fWdA$<pn`~hpP<5G?Gs#HS*sfI?UY#~2G<5|Z>_rJa`8$h#y
z3NS4FnccL2)i-d1$ok4Ar9RuFQzSi`QUtfx8?o9wmD+l<KOVs3w!lEd{}v;D_r6m7
zYgYZf!Lye%wp1Rr<#)CR?I#hVnK9q7)~p*_(3E*Av)4N2)cHN?*C8vEs#OvL6BaGB
z?wvMvOKX_2D#rTA&e!g?M3qX;w{#t~@7wDqj@`NX$;9@p1`KTI@C;I_<`=$}FYcE&
zYxgTvE%N64qH1~;#cnA9?6gkS<QGNP*Rw$7oD!#euk(CJ?HFU&n~=<|g8zcT8$}-$
z-zX^bXE*hpAA*^Nv{hsce_;;zNC~#=*_N?%lVjOWn{8}4gTYeKVMX|%Ee7{}hxVRe
zzX#Ev>FX6RRqk&6h&hx!hIZSB-vB`wt5m&T*c3c?V<fmHesuD)^*=h~9}OF_xB*|t
zR{KqEz~}4J?_C)175!+K9pX1-!Ge^mY4(<ez%ARtKE@zm0NZelRk(WXnz-XWYkN=2
z4zQh;du*Maz1}#dbI-y4b0*t2bkwce_R+FWeNJqg-_NnokUi`D^vOPLTlm&}>#LD@
z2llL5wZ>6@mu1w<bsz29vtr-I55q&&I(i!X7QF923BP!oZOCJ5^2FWu*_a1fwrIYT
z=hkQ9q1)?i%_j}-<?w87+ag8Ueqm8h&9|6ea3`Dj@blKz=37(Yw#8<?H68N`hWcQ%
z)cU#?`ra$@QhC)F45qf?c{N5-A?qWz?X<Eb-gt#`*6h@2ldKS@DWe|Cb4YwwZ~*c&
zOTig*s!!Qc*#q*iU})UfKYqT)YB{Rw-ySu*RhJ2SKZiIH9B9W-Hqg4Ny1xM$fQ~6j
z3&_+Ix65xc2lD?{*#ii<Itj>*GCN0RUVVhn%{I({VreuKLx*&*fc8w0-5~-VhyowT
z+E_3eE&8Cg4ARgIQV4mzR$dE1R#m<7cG2+~Y!nd_)<gLTG}TkdmRsIum=DRk3beUO
zjD=O+a`HTT%_{d)$HoSyy(WtLc6obEK42bbXg_fh+0>@6W*8wHC>teAmYd32i+LDE
z36q0x@!^0uTN&%d-Lm19tqu_`aJ4KK!|nB!WxbLD*$U#SDSBjKRb`)ybs1Yz*HuZG
zyJSk*0_G_4sqDE`+9J=z5U!Uu)9KB*Gi<U($*|ygh7I4A(YIylr|Gs+>X+#@Pj)hx
znZ^6866>K}TGk-g($~hm@^%8xQIhOdm<n!F28&-^nj?Y5hkOtW&r`X5VGfw)N8tLN
zg6n(4OyKsbLsSJWZH-N~gRuaoCJ*jlYg4=#%syKaoZrN0XWAs+3qz9Q1?C0vOmDgF
zW92wZy_-K)n!`YR`{Sb5qV(n+nbW4GjrCCiJJH}{m<{Tz-5;iALE5;Z+ARwSxM;-U
zb_kOF+WS8Y^55Vn8e>>6V`}gim^|(be%RnKt8|-Hc--J22`-lW3So!YkJRZ`Pi;Q7
z$1#}OAddmlzsvTri45)fP9Hqper#OdEp2_2>WwhKcbNS!vEdC?-Od6rvB5mE{M3e`
zS;|yPo8ezQg)cJQyMCxwHM@Ccwc))<f91`h?u&<HhxQPQvdE76MGn1ZlB9G;m8!)o
zelSX`f1cIXGQHf>(obS@z5Ah0>@J^9mEdfiwMQOj*)>Pk8alz;RW^Jsdx5OH91<4>
zaz$XXZ@G}GVOZ!p4*J}C%zQQfDhi$@vPxQZR-TF?SAvvo=yq6;@;Tl-=cuNg$07V;
z8PF%{p`m)VSz@tlp#?_!3t?7(i$q}<-}3>jf%@)l&c0ijUA&=zv}Y(EK(HPuHWuv~
z*kK5P!S36(1-2CQA(ngJ-DB0!BYG^C<ch(TN9PY**z0I|OgCowxS7Lz+KxT`t-piS
z*XQ2TDZcu+W$|=o#AjuB)MSgfYnJ}%%6(_<`JCA|ea3c&YCF2DuaDBSBg7tFvmJx=
zlbYzR>*GS=LvaSi2L^i797Apo^-9I{-&ALfKrg?6#A6Fvp;g-t+6;GD1{dCH&{U?7
z<mUc$=2iEh7t<E7z8m>CL>>=;R)W$_6`SeJ*G?PCBxh_GOn5Pj+9a`2phHc({Uv3T
zlJXJ}Tdz;^*(MrRh!|FA<?v4}`GX9Kv?%j8-4jFTZ>~{Aw2hA_bhQi_H5B*d+^m%u
zbHZEcl!^tcq9N=Cb4QUB)nc2WPuWbGh(V}jsxpNXDQay}jF!n%$tFs2QKEF}HfwsD
zM$1P8D4shDT=Oibs%P_OM`f!wdv(u~D^qOT$x&pzZW%4Xb+kmpp<iL@>k=DLoQIar
zB?9sr<f6=iOGDcz{DuSstS6@)@7R!mkf=|4Ujk|PgDohl6z5PW8aibPUl75W$VCdu
z?d~?n?6(n;HqYvhwK*MFB>iP*ao$)+^=aT1nPNLph7DD$%xh~x_d5k<25xYFlr@a7
zu~@>n@L5ZuOy%6=352=$ky}+zvSZ{^HWa3T0Cs)W3SRr$=+|#Zlb^M$Ve4;``;+gu
z;z#^N$0=na`h*JgU4iyHUIAjIRJk&`c^Y;St9yH;v|M&W4y<O|_`um0By{yG$uq`=
zua|C%%d*jyMu9U%MN~OsW@BD(s?QxZLmDAoAsG=oZEj9D(`{h1A#E7Sr46}X>IUk&
zHYM3XtduT?5m~tOHu;08vUmsn#w+2CZ3lK9y`Ssopl>#F=+K@^;FU)+g^Xf6Q|{!m
zPxHkqzq1t(EPr#ya^#cjb-9jn-7a75d_lK5H*5c4>%owH{<-$^=i6TG(L=Xx(&+4A
zK0`(?o;%6W{hJOQE_T-WO$r$^+&VmS%&Pb8UAkOtd-faM+}!=aM||?#+6+0Bmv{8^
zwd+UwG;21bFZ6)X=v#ij!#h3JyKv*XHdazxgi6)b_ALo%4*x+m+YtO@7q_nguX(pc
z)||5G2};9;3YZGNQ>ELG(!6tz4a%>3kE-+m64M|X&5MPfz$7@OKZk^xwhPD!HYyHE
zpmuk(@;=IrGZ#;tcewi6)ZzgUxs{W@waJu}lX6Iy^cIC|?V1sS|1r&-4G;>MZ_6Hp
z#$i5mV9)8i96P&hfY|?Lx#?(Q4CdQiXN(=ye~JWmZ+7wTCa0lc)gX%{mdw)yxz`mc
z6(k?VN;S}^N{2TvaH0W@Y@te7v=fbHsI)~w4R^A4x7iIEVJXqYf#C9vyujt%2A6jP
zT;6Rbm$$x~MB2DSXAQ3_h1#GMMfgR<fp6N>ukv83@(IO{=&LG!ODJxDuf1%!61Zv9
zQ`QCFx7U?a)dWORkXsz359{mO5{mLmG1a3q9xGnK|HD&wtSIkIo2m#r!y2YYte6{a
zwdw_>V>ylBqhM8$LV_5sm0;o%^Wk#pjv%Nz4m;Hya`(c?BWy)2ik|sN9VAr;^X22i
z_ni8SgYqJIm*vZQ{U7R~su-h~n=tbmhK;i)K+Ax6cXgHeN_|qBI29>@?_)r8P?>bc
z(r)yH+duCA{OZx%>9dzRl);8c^Cm4A?c@25?arNS7^_hw9*R2L5MsG+@3_=0?o^Li
z%i`XU#(`ko2084Ut&+npsVbXgWjYGIp=};2^Pz%)*-}?9yMK`N96lBn<w4BH=_p1#
zhbT|K>>?oqQBN-Y!+*{&ucH{D?5J-m%7^c{RAIY2883u-fC^uiYU-y)uKn!T_?O9f
zQ15=O?=j1F_<$w0wrXW(w%g2`_^7pam=B`!j2$Kfr;l$vy4A6L<+hcpH*`N=d8Ez!
zXU~`MQtG78w{O;ARl@A%XM<*bFlH#4z@Li>8(Y+wp-PNi<))B(Bvw{<vA5tE0fFaT
zs{Kcc@{nf{5~hKGcO*rxi&R6~yGS~kV^bAW2W1E~Uzf%d|4dq{8(d3uur39>4W@HR
zwlwh%wAN>`o@aMq@d`IJJZ1NYdu(9A8=xKLz3gMk@iE|O&DR#$IF<v11(n>&yz)rT
z+(jzht_DUON9aq;YYTGcF#EVZ0&aUQ;F%H9_Fq}E$1M9-lEznNm2SFJ)x(vAwV`VI
zhM9rmJgc;c<JdP%dXI3NcK&>8U7Jg#-CiP<_8@A9tO+{WB&Q0FMfH(L3n!cDlkx#R
zy;L2i;wg9x%Qvt4=@RlN)4M><y014sdfW&qy?Yq#KWd^}EPW)$I`@mRNa=pj@Yqec
zSU~e)Nb%=*eDGeW>Te6F{x)I8C8_>2tlB-L+Cx$Rj_KdzOM_<|4IX|%;(mbPCk-90
zpx^reLx(F$rQ)2i=ri&CJN|t<?-$E`FS<<<={V{lzz+oQ4nkL4M1kOhu67b{SGwZ%
zsz3A(6YuRW_yoi2+EmU%i&M!joCi9cQAyxjbcy^cw|RE}b$`H}jfjB!n@Y)lKo|Mb
zM*AA6c!0qycb(}wvi}kr_qv309h2`Y<$T~%KGp5dvBejN{{MzhKWwzmvlXQq%zt*x
zln`&?QEqd;Pgw0PNcK=-Q3jXtGb5?OCr~6Il<z^+Jwc5c3kuHffr$N7AWuci{JHr8
zbeRK-N41a?9nH04ua`xFWk8=~{z*B><@Bs|@f1rd8&q(}p&;c0Jog6+B)6By_Ca37
zt4XioM=hkW662zOXlDzb_r*?7Z=j5P){=a2^?}m$SvPn(GD7-#yabAJgH@Vfn_2X<
zwygu4mPk<RZex|k+b}yas<y2)cp;cN5F=^OE1lRS=<?qsffFXRhU!=-*WmgXZvU!t
z8errl*mluB8=^PcZX@k*VN4$hrpIZ8F>grSp4G5GPuzQiw4bb(@%s}P#@zRw3w6`8
zPPO45ad28H`%6jBYS*@@cFsV{hEg^cr@8^{IG}}j-gQi!egdOre~F#lHG<oKur9Dj
z+CrFNi&IZU{c}+pVyBfT7-&SZ+6eYJKJj3oMV;u=2HTxJPOA=<U6=-@cgC}~Nc#m{
z31|~(pbxSZ)S2cL&m#564X8&BLOqh_%Em{m(vMD)5M>(WTz`BCByIR^R%uUx`LU|N
z{vF}+(astb?W=9e>uy6dDSO|hq_LAAnJ@hFN2*P%0r;PCKV`4YvVELN)WW>8+#qou
z28lbz+2kEX<H+|n_|;B|qRU=IZV7?N{>;zRiNsl$NL)Ci`oA&BJUtMT%=Z_)SGm7y
z&T*+$o*m~X%gs$@Ux9qM^z_Ovt`IZPi-K<-%iDg-XGU=2?@`A}R`Mp^`dbwDt_H5%
zMd!1)1j0q=e*>YfDka;9%n!<z2BI-NV!6Cm{VlF2uiA5?0G3;r`Zg3+D~RQn*f3(B
z7ry98Zbeys)aB`W%I72G>1j6!l4h91P{TQghGQe~87ct;Xg4rqnq^U{wY2@NXQ@LV
zN;?Qq+6{=(4wi}1Za|cF&?!nwme?4MC>_lK7CK8M;^u+4XYnjw=`gAYx8S+XDm_+h
zc<K}z(F**P$OY$_`Hs`z;1sK*NCoDfoJI$~!RX*8GCKGTMh8E^=peCpsm1*0<!cz2
ze{!v2kSxg+D9uV=R5LX$`zY0lw&;?tRL=7MU5fF{XDwCBe*?vLZgC*&7|Q&}{~+p<
zR{Tiy1NQHADXF*t`AN6!`laoHLTx_TVzb6~GEtB>*-?yb%(qE>tusGnQr4YsnWt<0
z2K#@ze#5r9d3~5$Sd}3?b>`cRz?M(5DRrSWf7oS#-1|qbBfmenGq(UgpGiNzg`e-j
z&!427IrPAq-*rcqP4=D}`seJjZrPNx@7T7v{wwU4ztrvi;GNtiK5w)c-muZ>sb9@>
zoSSheV5D{2#Kl7gPT00;fxTm&tz%BkI2&GNa1WjNmg}eB56J2Rzg)^Httc@6$qhe7
zD+?{=XMa;Jf4a(L0Rq!haxyFaj8!@d9-fT1h7w~jIo)=FOt`#Qbis@}W|?iJq&)Qn
zr@8fzZjJnCp>3_cZ#$j&DPkfc`ElvCFBWWCAh)~k1#6QvcVO{D!%FinzP7a==@Jv;
z6EYl|lQyQW&B}gM*?gmo)Nj?8gMs#eoz=wLm}Z+y6d1oOwHm8M)J%y(EXjz4(DrAQ
z%<?d45GC*F-y~0VB~P_M!+_vJiE7_drKM_%rt~Z|ih24(D>pB^F~X({E6y7!dA<ia
zz2-4n4AD{;h~qYxujLm7)n<d0#mXyn*elAK0=9;EJjN0Mi(zpS0z{SWGb4oida%y^
z&=Gt{I)dy+n{AiaEBBRGm{GmGZ>T<8r@Y;!(KW>gP}`{-h$r494_pzE6}dwPTkGP@
zHEdmp<8jXD{+Ja$rzM}UnRpsfEAN0>IiA=UGOX*v$y<wOMhgA=9WTCs0Mqf&Zy?)1
z{EbUxjj8;%z48j?WJ|L+G5Zyb&Sw5Cu6PCH4;Ve1FKCr5wZ*58*;Y>H0-)*uzvEJ6
z$J_RhT|-_$E@TNi;je`KS~#&e#2E)m7h5r3{hQ@h%q5Cz!IiEO$8)~GA9w-_oR$|`
zNi<=e7J`2ksQ=s^f`meVvYcqEKgAMC`awim&4Kq_5hLCGMLz0S2}{F*Gk3^1PsSYU
z#<oKr9k{vO@%_%z=deD(-$Y9p#WbCnJ<6V@A3S5K@6aW-{v6rkUNCbyU-0D4dZhD~
zTvg@o4!Afq<x7M4S{>U6gZUQmYY^<zq?&fb8Od8j<jjHW?eei?e%)<k&?x6{Hfj;L
z?V8dgNghp<Oc_*M-2!u}{q?0%e*;N8)Cp9adoz=D!W6Iq&--G>II&M~dShXn)=w<w
zk4sfWwt)n$-#cYq%C{H+)|6ZZUBqp&NszLk#<)bXJ7E5TUmdJ3xn^Ho;^Ha?{#1VY
z)gFr1Mw)%)^anXV2sLDF&v|>sQ(39_egmm=niccsasLJw%TKea$CD6-B=m&UCPaWD
z+e9PR2N=2TM7+r_cO6Ww8IY)sMqFVb_AOX6;h}TVnS238i4c+Xl9DjTLKSbb>JXUk
zT90}00m~=ti`-}2k+f~&ZtEwLw@es2X?j1q*|*)nu3t>D(_ECd*d@r>>tgc%TUlV_
z#yTB-QyrlFxdi88-3Uoka==h3iA1xCbx=&3y_8iTSAzMdGHM!vwkkAS?vMwgZua&A
z=v=;r`tAWs!rZw5pSBwM{(=wYLQKD}K~eLEm{P(L3>SB<`*h#-SzT1a3*p|^_n;c`
zy3B?vt<kSN<+c|^di|acSMOM|%gElor-uySO?}+@=+%*{jI24{pDH8t;VYw7tqHcx
zP4r7y2(y7nO)l!w{n8dB&M`J_a#J5Rc>1`BenwBZQE(m`d1p}`8<ppE=)OFGG=PZu
zEfx&(`#Xns-&pHtzCkxJc)`3eKJUDL<mRoNM^5irGizps<L+kNu>ju_wR{w}&MhI}
zw|~=;xjPmrx$SMg6i>D=_wQ~ny91+Jd;6P^t-E)GC%gHUV*j=kbGNGsMtoimEyXQT
zGeYmtH27zEcb>?q6kG#UjSaSZc5LIWt&SPr=w|!P2=@2+z(3<N2lF;uI?goLS#4{6
zpTn)1zB^oLVpn<?{DP(g%njY%qH<PBPI^wJQPCJ09h!2=zOB$~*_1VPM4ws1hmLfx
z3Wmp7t2Wy`<<CI!rK?v+@fqw#7VDP_p7PYQkU!s;FDVC=4Hk2LNIg<b{b?a}sKd-c
zD7yI}Jid5S-c=$j@@rR%UeiNK%K8SMW4lX)u4Lx(LkJceIK$dQf8I(fzXg4F^;=*6
zde$*;hpuklR+Ad|H0!rx=L`p%CZ`%$Vu(_Yc`EIEu;Nf#EZh;R%*MJjud@LTrIXy&
z!rB`4eEj*^OFrk%OdbEBLuqR8%n!fXZvh*KRXF$z#NJqlW1M8(+kxf{PA}HIi)Whr
zx3@zliDf(eZoC?Lm5s%+9f5b{E(l=G3R#cJSWhw!34wz8Q_K&{3OQap0fBc42>fx#
zOBYIlCv~kP&-`V!`xoi|EW){d2gM<U;xMgP_nytX*S9T2<o)?`-XCMdmzF07e{UyO
zd`f90v02M(=~t64ZYy0(gpJ6wnLj>>xr;k{Pz+9D?&6G->fFU0Cyy0R0MZ?~K)U1P
z1b|#1+Hq1vlyNob;)$!LuVSf<7>Nx8p26QUZ<>=ixTwbh$(;3l7jp7jw}0+AAH2!&
zN-nS^T>-YN?+M!#VEg!cVDskb8Ua*0Z7dF$=BMl?L~Sv-^A_y7Qr1c411Z}jxUaL}
zRi3Nt1FBCbwV$K_6`shwm9)TCUc0jLhf`xtg`Qk?a`VYer}~{*dNTB+?<ue2r+o3S
z?Btd&w*ZEm@;!wv5z5d`0^2V?ummg#Ua?}yk`*h1vjYNxgZ%AgtR3Glz_KtqXhlwT
zcFxM6?1ceAaEIaI!X-f~R>EyXP`3Y~#X$jfvuF%aGKO3HvpJHLD}t8<1Ox>K*x4O#
ze?pwSWaWw=xCO(_tPwgKZbyi7Rscy((6WGqL4gbHX15ALQFrf!*^5^!U$&Hx0|y~D
zR;}va$P%#B6+z%x9PDqGr+HJPbCw~}flC$wHzHl3LWiQ^jevYH#d-yhP^<&&a<>Fa
z0Fr_~uE+uAg^Ppm$EwDVB6B-@P*Ja-w3BZ{o99RN62d_FfoOEl2}<U0cwW46*|MdC
zWubo%u&|zSgqjk=eJ|vZ4$%mW0+6ft<r287xf);xEtdmWtf+)M(JDTLGcdNNS*ei`
zn`{xIQ1qY{chwoU-YYOKHvS{Yn<m9>4OeH&hGVj9A|~OsyW+)WUWck?rZ;BU`qCuZ
z)mPN1yT0Kz^J>hn-4t<^RYpY>W6&cviC7?Yv8k2PQ(1>k(p7N>tf+5lS>K3$HsvyY
z{OIaVm<RsgeM^sumxp?HZXGl`+2P-@SHHV|(Q6x)k@=1F3P%-ugc|r8D&Qm3zu#I(
zK)6<l7-&->+2&0)wwV$l7h^pduQNBzzGu+*Z(_=^-n<%9j(yQ=J(bmL=SLDJ3P>B<
zq$ZASqSVQ{D=Zr-$C;SJF%w>{-#NxprVqDKs@Uf8$zq$IOBa2VuCiv(T|3jpHdEpX
z4V1LiKL8z1+)*TMHBTJdM5&wP$7-ty{Dk#ln~=hfsf{6pmyyD&ltQ+7EtHo?V=GKJ
zXT34+x2yM4eX#7yJjaf<b+a+gy;wQxjQk<&%6DjgIb&hx+1<|+qb@i#IW)s3BRL}{
z$#H~j)FoymW~5j%!qdW{!(!ti?aD_(bfK}qv7y$m?5NBrJ2MVc?kbqr34zqvA4JSh
z)yh*?tJYGH?-CeN$-Ya*DxSS1d)d$AkIz^#($g|hVl!g197FMsoS5j0FrTpK(BMeN
zyNXdkR62HGz^WJr>O!M}qQb19OJXx)?F>JUOU;N)hPv5?X)ME$t{87Dua=(TU|m_Z
z4r_-cr&!aXQX<oAcE$U>CGt>A7F|*_RPo-A71_Ee*}CwQ)R<HsH9Cio_OoX!$r*_W
zsSfthQC()@lEh4FMo>y<id`|DV0YQMj+d45%H4OFQMV*AI+LOqwlKyqRN1JD4T%kl
zvWBHcWWd^xr+x=g&%R=<ECXy~nWyX<OvYxu!F!o!6I<CI<*YN7Z!asr&5S2PrS8&a
zK<){V-ub)Yj=~acp(ktAPTHfGbeLMX2MYqeWs`0Caf*quQLz<9qq>c{tHp|X?JTJ&
zN$H4syMYoV*fdTjk1#OPxX}<BVv)7T^e8N{78w(TMb_HBWRW#y+M_EPVNgtakU8YR
znK^7Bl_lw3G3wCE-HQgRDPs31Man&Aid1if%^`1VP9BxpMT1*Q$~`K0cF$GtY=6ri
z<T->+K88_9I{VR?JsO@p8WmYl_e@Nm$3zQu>sc?<9u2QO8YdEV+xgY=7uNo++|N(^
z?yk156<cHpmXwd=eoc!u$VN4bQj(KW((TP`p1;V?Zi@2Y2juUvCC%ng+{f$WHboO!
z%I?Zfw9HjY$%Re+{H|919M()l{gjUk&OA5D8(;<51^l!Aj>!5vV81=k%0miASujN(
z%ib%U9DK2?Ha5z7;ND?i6~DRk$M5GlDi!QS9UjOX46KtPFpbg}6~u`rkE1D!hMluB
zN(kok<-+R<T;bfezyI+~C#9l2N-dt0aMWECc`8;DM3JLW$vJ*Zx(TzG9oj?kGmE_A
zX3-A4JfV2(%WBx{jrZgler&p*nE$;z`Fm|)PGJp8cPKhFx}D?J3>s)vEU&*#lU-l`
zomoz;|6<=hd!N&~e*LGkXl7NgET~cwmWjCI>~?e7)gdSBO!rx+<oS_}Dt_Tyxt--u
zQ8&Z#15IoLY>PhC$=wbW4bunh*2xnO6;0G<@7BR9QHbHT<)d^(-G<A<^x5NeMH7e1
z6ZJuO7&ct)re8F&w^Uk)yCk4C`xe%h->@wB8mo3;&91e!fMaOYYAK!5uj!%tO23P}
zf&t7f<rO@eeRnaBoFTg3@9I5wVY(c`54TZss-_PZyw;|!{<WZ|u4~iZ^*Kj*Fb`+2
zS5ypZ&SKU&Z*Zj%K?6tgl)Dp;jcL2*<yDrqY}f9#(X%E^cYw3<Zpt)w(N(mHX98w=
ziL4)LR8zUH1+*5eti|11&UU#_NwwT%LQ}nR(2d`Tb^!H$6|)-CHchWR|Nr8y{pm0G
z6@DRCWp3A*8~+E}fLhyBal5N;?Z$7csv_{J1!8cyX$NZDEhVKD`|0L)H(Rn%UWl0a
zoZN`*ad~>es@_zpe#fB!li#JL2J<;ZQmVFORoin|%Y`JKjcN%r9LKD3sjF4aGf*hf
zT^hAX<q$tnQ}1~rYDG>4YrdTg-jI{=`LdWT;TbER)_US~C_8S+=lf$ff1H!LJZNQ7
zdUQt0mZ-EPTawe39}dgR*`4<Fk#zI+AzryGFv_w%XU8EQa|i6lwrWM<isj3fc~moF
z8MNGW;gb*f<YXnJr#rT8Sg~Yf=8B9eD>BwDS#Dk98ymdG9-AJQ5tm_%iii)381`A}
z0&C#3h|p;Jtgu;&<_8$V!$Ts2eHH}dtaPkNS+Qz;#EMnc?3A3$CCMK|uC$}w#ijVH
zS+*)W!?Aj4Qck8dB@U-OZgteEh}A~3&`Yekc=y5`GdCM2?(si<)VkcT*Z+34_eRX>
zH7Q|u(nNbqLQIS`JSHsE-yXCm$bWG_bX0UyOhhPVdPW6=`bGH#`5B`^V?)BMfr-(H
zcJxSDKIV`*SZnQIy9w(ZOZ?LP7Fy@b3ttcsnUEN1$C{=~7Nr=Y5@VB6tmdi}1Yv1b
z*3z8drOWVE6>F^}g9@5M;J#A7a{1Dn<hbOxR7XHaa6q&@EG|4gG{zVj7ZDi}k`WwW
zHHRQXKyX-~H6$f6E5;7bv8hPe>X_A$MxO2A+dm1&^f6a;$7*UHS>jg3WQS)Pqtik&
z6Rk-}@hK@;nM=}RQX^CBL-vMc`sYL?SBXlFOr^}ujLC{$5}%ToljKn|+F-8W)<KAi
zh>MK0h9!h2huM>(k|L6$jIoIc@rgc3i3!OGj`XC|WNTb1uv)h*-MV~}Jt-|IEiKuY
z9G#kO&C1@Gw$u(EDXEEZiHX*P#KeRI`|26Gh~(6$B|e!MX=!PWrI|}Jm!}!il9Lls
ztqE~)iLpMBG12icamFA&zu*NvW_O{3usA$DBf^oPPfm(W@>#YlC3UGIJ9Syg(iCG-
zVp2kiH7PD3)*cs^5a$yc5g74-BPKW~da+N0J|ZeUIoc7O9F-8d)QD0|LL?Fr5)<qR
z$%)CyNm=R1iRoF!l%)8iBx_dm@(>I+u=PlAOh}l+?1rcCq{SKb_~^(O3?afQ2%*vI
zQ**LbWv@w^wm2#wKE;u)$B?6fkeU`Bo#HSH9V!a3d>+ZF)!8|jnc-ongisVxLlT1K
zS>s}2Vv#JkXoQH!_+&?Na$>eMJ3K3xe7SX46tytKKPxRG%#j_rHhz&cIyxve${uM5
zPYg|sv@f5RIX7jtal_24!S7ka5`!|bvr@B@><Os}>8aM;3l7ZP3h9q1tlqhBdG{IC
z;F!ReFnd~LW^78BF)1i2HP~lSKv-a`BQ`EBc23Of0DElO^hMTy=;(++_K29o<g~=(
zgcL{Wvc#oJt!c4ov9S@9>RCa)Au~qBED!gIiHeDJ#4Qh8WHq~?VnxJ&RpHSVp2({$
zDRHS0$#!IHJhC@F(W6F6R6=a5H5SDfhpa;h){C~p#3v-B#3jc#l2HT{wu6wE92P}6
z-9d<ni&wo?71I1INvK`%s9;s%Vxw`Q=;GrNec;h3>`t`MH%GD|E;>Fj){zjM7?Ti(
zrDRTLuo2>J%)Hvh-qy-vU=5tW2B7<^dcW2ut=2jgoSSua?$^f6p?*u}4VwGG_|bve
z2l#xjXx7YNN9bH%MHBe0vCfp16I)o7I_zD{$o98qvJn<#L}ylOdlIU8vSa0O-J8dm
z=d^P^KQOn0SN1xVPSPcZB!!1qM>JL}3glhN=y>+d5;=Vd>$>El<$7i1azk+Gs}Zlc
zneO)0%}YGo<2_7|r2^CA#Kd3^kAh^6S6Ietg*wYwv${lkOYAM{j}<0&VUwGN;vz9h
zJc*5J+GE+eWX&4vIeJm^i`EUx*1d(zX5Q5XXmhlywR^RnYHw(N)fT&H-0EW!nYM1T
z-Tbg|Or+aZx8rVKxIJ+D&Fv4j5}jRFOV?1>RM$z@Pd7sss!Pxv!BTfuux$IUx+1-&
z-i+;EhU>@bgY^;m6m0vl9-F@G(SNExsz0H>um8iKH5joRo|mDL!N=e*v@!HCOft+c
z%rPuBgc)KDiH1#v9fmIqmkd7{o*JGRHO4B&w~Vcgos8X$y^RBnlZ}DKIAfY|xp9qg
zqjA6Su<?}fYvTnh-~O{P-}uy6;_l{da`$m}VDa|m?(ML2dr$Wv?&IBOx(B#Nx+h}c
z_7(0M+_$^$b3g7}LHfnj0B8xBm#qfiTpb!q_vY&%nQEwmN-|&n<29_|&8k261<O&i
zX^5q+RoiFP@EMDUk%_a*zL|`h9iEt&>a<UP&Sq}vLyIy~e}{#oug%=Xt<|$WNS}{|
z(49tjhilq?#7YqIh|JuS)rl*rBnG4`$ehGpDH>53?)6~tUQOSms8jfa=y|aLRbp2}
ztqIw!=;Th7!F_0oI){#noUgjC4d2~V?p(PlEUMEnn6jour9?zU$3%tO$uL(Jjv+*R
zWIR@Ej)Ki_0_IIcr6*&RV5HLc-QmX%-`S^Vavg(LznAmj-)Zq$9v{tw_Z=tZ9}F1x
zoElFzZ0D7!*MSPE+-}Ihcd*)Z4W|8xb#XjU7S~~3iw!OM_iCaz-eF!a8Zz$3*EcWj
znJ{{r{l{avbH07QQmj78#CniAwpV(8kJ+`;uq-jF@ZG5gyBz=F<lK(mV!fd0n4|T{
zRb`ld>9)07KUrt|YWty0-&!vZI@Y*-zad=~+i&>m_N1>{_mNNTs(G_Nm>D>Ap`*>X
z?(G#1t7-GfRUdw6{d&Y_EqaWYFkr6z`V8IX%$!wQeYWN-m^C|a!DNT2vvMJ7e$1lS
z#Z_XLMz4rk)r?)JTu<K&u71%0+%;x-)SAw4t*Q6i`{DN8yQh3O)_3ZZ@#D9B@G%mG
zTv}T=m?or~mAeuCF`;}ydQ4`-N-Rlow{i_Vd$%Y~=Lu=$6Nn0b=p?P0qf5)mPFn7>
zb#1_$*?s}j{ex37!yUsWVF}{|)=rla9*wofBch@rqmsgtXzlUe10=N^9_nwigK2A1
zHz#ISNeoJxnKmy^IaK+fp8W$;;%n-W%T!>bhG*xzOP@{cXAE!cIIQ22xN7Nol<V2g
zj-PeSweIoRptFw4Zhx6+jh`|I#fLfMiPejS8Wd}vSv~uWUUy`Uz0nw5)7>}U%lGkY
zV*@c9={8~J`W@Iv0n27%6NOoG#ydRQNqZGfQ@Pc7*|xu^8NV=?Hm+K>b*uIK&;za8
z3>npR%Cec8{IHlhXYd`(Y*<3uFRzbeg54zZ{h9gF8Y=9#ML9lPQidtVd)3pkjf$_O
z8uMlKeuiAycd*m|CI>LSdIaOE8>Xh12{Mt%SZuqTo%i}8H;Z!}_o6w)lXd6iL1g#c
zwP=v)&tWQDO)LNRCsRzht)D4gLKGATA`&9Q5~F>>!Xv_>62lTh97iB;SeTR?MxvR_
zC8-XRyeq$`j$W=KXX|bkEw3$CG!(s2l&$l$46>Of+xm^$@FQ)7P(0F5a8Sp37-p{C
z9JJf#6WS4h*7y#O36HWyrbMM-4Q0_Z73EFl!KPh1wtTXC>c+`Qj?{g*`&KNUu)gwu
zNh7+pv-ZoKzSnL_w)Mf(VXdic@I%#@(WF$<n;>T>6T6r!_f8(ZzGv=7<5xILt|f@b
zY97-lU^0(67v|NiZO&N~%&2G8zfinzN<*;VQB#NKJY)bY5V59)2~!~-(A52D%G+{{
z$I3xWZfW!w%hC^G8y^?>=#@G}11;<oHYIy)&bF*|Rh0b(Oj!&b3Gy+>z%p-O-61Ro
z)`)dgVjLzVdci|xHkB%*b!{X*AI$_KXygDb)?=at;#{l4(b8}Z(>quj(PVj3?>9rY
za?1EjEHT9Au(Vm#XUBVvL9MYR$*Rpd{||SE?)OotJsJ;Rj^YX|L-vzp$Q4+I?5E`@
zXkkXkQ%t1Sohy`I-f*wL*Ejq`2*gs+g#-Lds$PIA1x%Br()A_saxluSVfKe{@G<6P
zqMXcaZChnCS$iFvc+rk68YUN*y4sGK<a?G6w`|zGW5$N}9a&q}Zdkr_%9_eU#?BZv
z*gAU4>|88*t}cxM6Hs+=4AZK4GqR@m44W{2=v;@18G6}FhxU!U;DeRa^Gp|3$JtCn
zZK7!at>3-Dslh6*zEX8pNczubKYw`ky$ki`&x;HRz&mVve_`VOFI~pH^IgWhm@ulx
zf|pnTqnhdI=bJytT^}5@(r)S#oFJL}gBONl(fV{rYbv)4#IWa<fiN}Z(lOKfKtz_2
z%E&TP<E1w2r;wSFoswbA3{DJ9L=%6p|IAauDtp5GY$uG*nAUVA*lAK~g4W%{jzcL`
zF^_lMt@0JifJyVF&q4)S$l~+G%PdxVnZ;XJY`zi;@?0YHBdyl_5aBkhjDCq4?`<p}
z-V4Qm1=(qR_TcMm*!3j@y!O*15loP6dfPOd<}yXeH?>hTm+9vHBFwR*RfJ%P4xJm;
z5#sBJU%;K!iua@TV-m4W2G(t77Yj@lteNM}dg~vq?=@oZ^!{izGscbl(1y0BKSld;
zc<W6I{A{LsZ0J2x>2fKkKUgqjze&-@KV;V*V#cP{G{&~eX5zx`K#2t1Sjzz`s<&jD
z-jz(mn9TD_$%MwBBbvCWa6om_)mvAY>8iNuHmh<+`@od&U_Gn<;HeR@!kRYwO}UtJ
z7n2XndTd|dngFQ9BKMg0q-&zb6trj9t7b7#k9$36Cx}|{SXDn5Mg=DQM%D@Ia?MgY
z=}ecDJ#Ep3O(KkKv@9RpjOH%p7MdRAUcQBy7ADvU!}`~Bm2J2xLTjg8PphdXu~|y}
zyIv+Ji7+@41P@$?v5L7yun9V__#*8k4%l2605}wzLW;szEa;3?!*Pn>j6(s#vEaCf
zwbii*IJSq}19${`FpF3&9jka_hh;3cjs1JErZ#r9Ee0$Rff;+RR{%7NcEH!gT7Y%1
zbFYY9)Vl)q5c>nZBaQ@oPsD$*kt9|;$1doz0q0?tb5TshI_X+$DY;6}3Rrs^@dZXK
zIW1Dy(z^x=wqL|o4g6!Vb?%?iN|z)&(IRA*ZhZy`p3}z8n;}$1I2<J<{B9Dwh1Z2v
zf_ujiU8@Q`I(HmYRT$EFAmD`F9Y<6Z=Jf5~r>YRruTPh%LejwgeX9yNgUHWT?1@)Z
zz+R#pkBB_1Bvf<0X|Nx6WudzBO^cnns|YomZ*JI%(<;<-zUh!2A8gC1V$ll~g?|XO
zoo@!g3uW|%^UVkypIw01ga6MRJDoa&y3RLAupm|Sgg3{}nmbFBIIO^-H;4b=uo{PN
zaQGI7O*w4EVFwPoO`SMrhS-P0K^%_aZ~}+ZIGo2}AcqkgCUBU+Vb1iibEb;xIo!%&
zE{7j;c#y;69G>LxEQgmkyvAYP^r_RQiVrw^#Nlro${ao;sBz;^;;;gT-W>jeLzDwA
z`~MBn;^rD)`oF%5sLK?y{{>PFruzTiK^<!AYp6{Pg%&)YL;(xU^OQCdeeq-z^rF8s
ztD>=Di`U#NZ>s;XG=(evS9u<;G|&zm+Ll-)gMYOO?XazEFJX}Io-j>VAVgr_gA^f4
z$PqST&w|6)V&O72Pq-^Q!j99lnQR5oF4n-m>y|v?@DKd8e#sv~gOXp%J!yqEN))HN
z>f;f7+(gdREjb{(S#npXk5(pfA0pnd^uM^F<SB=Lf*Nct`BU6l!pc2q#dRgcPIuME
zQ~3B9G-gA|WpPu<FWA?>g763lyk|>JAU0=9&Wbyo@44LdEO*Tn_rO()@44cxlBakB
z9=rv?_hoSx;h}FFhGXl15Xvc^FrO6oLfMz>MULZ8?|_=hbGVNb`x_{omiY2W(3M;)
zc~r8o<Zj88l3z>Klqe;Cz_l^p#*%G-zv8+JKfmHV7tiztA0;PnT`Ad%9QuzBl!Egp
zdFXn2`5iIA;e_0;Gd|q?<zfEnikRY$>V*>IM_C+R{{B1`iUDEaDgQVAO}XU6tI*w<
ztJphQJy7SI@o~BQ-JN_=_`mz^axa<Z`lHL`<@b`a<c=EdIwYsdm6Cwcyg6Hf?M6z@
zqI9tv$lo0==HT=G)UU|1e=oNlmDL2w<>zs^-pbtR>EFTZ3hBE4H(^S{{!Of0-(P+&
zm(v0$O1Y!_mojJGs_vqVJuFLYxv#wTqTO9lOWWBRcy5pjLYKBES7}mc)IYS^GCa>c
zN#xU2(j^=5{G3mo*Psq?#}+blIRDM-5a@vFTT;K3LaF2;e=e=_rC*#693#b<*T@&Y
z{_}Uj?MmtMWlC88dX&WQmiq_t;Sp%rL!?;8^NY7qq~KMaTdua?Og~{R{YwroP(Bfk
z9PXRv1MmeQUm6S2^YvDZ6~1zsfp8R-Qd?R+YAj!ThY#Lj5Dqn<d`a+fpcp+;|Nhrh
zmUnr1?JDoX^<4H39zR#wUx=s6clkSdi_+ZYu{(k|qmGwsL%%JR9KajZ)GH-N5b8Cx
z*5E7tP;yEwee@}mFX;bprs1Mm2H&XHdr=eHpw^z{*NL(}xnfWjZ<ouzb9cq!uYO;a
zV<-V<OC$fhK2Yp=tpUefMa5DY6J7^gZzw0Vw63Tw^o}0%gtI2Rinp7n`yDxEp6jLl
zsCGNc-dP(;^I82P55wK~Kh*fR+U4Ds)eqo%ffl=R0`8Ra&hqB?4j|9LJ2?3UC)IM6
zBbC-4)MlL}M<sR^H9<`)QdAO-G&)102COMr0&c=du}V(4;!m~P_582y<$aca{#W5j
zziTSQ5Z_aIgtZsOIB)V8{{ha+PPvTpBGQZa|L+ISm;ZvE{i{EN6LZFo($D`weS{i&
zmB##m+JxHruP{CTy{t##csa#()eHQG*FpXtw9n^5{);z^DZ%{<&KA-JPZ+B@k5`>{
zwa1W<vMQh#ja{Gr>76kBdp`dunioH!);>~G$ZIv)JkR5YM8S{`l*6D?bd=>VXcYPp
z)NE?k&QtYM20;l+xo{qu+Kscdx_qg02Qet)$y}dG?=RMR>UF6tsU@U(E5qw7H`Iqx
z1pnqk8ICfXs8^J_yXY~gpX7C}JUaS{n1Cvj3q$lAJcr94?-k1Nl7C;DTy)44vJ5Bw
zfpT!VJGl*BZfdQic5wyoRCa2+AQyV#p<H-X3@$us3|)BP`a&;WJ{IM$o}l{i*EG1=
zX!%gCXA13l<}HK2{1r#3pa19qsV>8gki6EG@(=2_(i-gQEqDk@JAGI4iSiE5RNks9
z)&BpKrZ`(l`2;w5!BQv6_x}`cY2bhIz+3Hq7~g+_uJjYHQ>C@J)cJpS;Q6bO&QZVQ
zecbyr#{1Y_5&Y0|v4^ij(3l*Q$3x_qM%qmND|M@MoJ;(u#)DG=_58OF@KrZU)}Wpf
z-J(9@Uyk5;p1#mKK405j{5d#3&OelQ$G=Ek@Haiw-?anadEw8cI3*YN<#K^v$|<$}
zhU59gkS_~y5&26Y?t*K%g4}p6_g$FPyDN?~LZYJtyJPbEzr!iR57Lf4TMhFUNd4MN
zj(-xL{~!cU;jh9AAzb<MPySIZMlbi}qN?!t8u9!{rL#9sgM#0slwZLZ=>)Gw)c>hG
zwZ>S1^JH$7?Fi@T%pa;H#9yLJ${%W6;qIhM<-Z{$_0zonelaAkap=2LoURnBp*amw
zzY#T}9<KBNZ^&gf<Un6=sxd<!jdzlmIdPT-;SbywZ>uk+fMY_s$j9?x_!s&E#|iw;
z`_Slr<N36*@><CGbofrZG};n&oxP>UhNO_RdV_jk(^7st6fcW6#Jl1T;xFP;@lWwC
zlooo8hsH}&S!37K(A3p5)HKty(R9-E(DcJKNW82Wq4CvB(oECLLAYNu{+b|71g<zu
z3SeDLmL^BDR<jvTJMbQ)*(2W291x#sj%vQpoWXza7vLv+z6e`(#sLGJS<aKfJ5Pk+
zr{;oY2jcjrrU&rcB|IFL2jZ!oJ%E+)(wT*C{;mrl1;n!arAOR6@W1j`Ww^PnD|oge
z6*Ul_7q449j+9oqzSsPOJX))HqWOd0>A4fW6lpbd*BTM09nW1munFlNSa7{YcU}T0
z1+7(ERa;B@Ci3@y#uqvEvTGW0vE0Q=&Q*FSLF^ve0yRVw-y#U<Ha+*{(1XL?90I_7
z6o(Ty9LiyR4l8pwox^biX&Yep_u=qe4qJ0b5*|?;&*2;nX?!Y*139eC;b;!~aJZGj
zt^{e1WcZ{pu_(U6p_RLD<}if2nE7)Af8N63Ke$T}S_NtOC@ktY;8YIXIpi3`xzC{e
z)2Q(oOwXc)!?py4DE>T=LmP+R@vwvV*N|t}%vbn@yEo*p4tKv!P@Cn}1z(-*h-eWm
z5md>U_a&{k-w3#A(E<&EJ2aZjq1k8&tzK);)wa-0v==&HEZ<4!3@t@hp_|ZM=ppok
zzM{9#N9Zf`6Z%8@IUjlpKj=FHuvzjVXgb#myP)Mf3O(m>XgRM6*Ra9u4dEtqr?-VX
zYyy23J1u`N+!r1Q525>HLLt|EmWZOL6?LLPbcg=)74cPUh-(%tVkNPP=p))hhxoc!
zU92hAhAy<8SRWRLO`#8MDYh2ditWXYVrQ`%G^4%5K4L#?qdQO>Bn}aWi6g{O;uz5v
z8qx{aT6ePefjCW^A<h!#Ku@|r^cNRmyWJo$L<|!nKy9?pAvQoUt;N30?&5ar$y^b+
zV}yRP2DXO&655zk(8pktWy}q9<=X#6o~^(h+>~#hmdm$q{?Bsm#e8f0ALraZ&o@!P
zCdb&!*oeC20ZsTYVYo0-7$uB`PHQao)1H9+xF=zg?8(@3`vYMr^jy;sVkUIuf!OXl
zNC*}}peql9t~>(y8YM&vF+wc#VDZ?xJW)u(F5fB8hpiU2Vk7U}(4l_@?fDPFAJCfr
zDHI9ML^L1KP1K7Xq9^oYUgB%ekyRC|i8aJp;+tY4@oll0*g@<hb`iUZ-Nl|_Z?Uh~
zANuom#lhlGakw~A91T7CSaG~KQJgFKi2<->T`UHRp<=igi5<~Jr0yR=Gu$g<j8hf0
zp*reAO=tld3GWC4h1tSh;UKm|KY^{BUA5$#aGuu`(t*~ZI)%H49u2slYhMM7K4^2`
zjky(p8@D3Rb1Q<X+=`$MTGf2CM6x1i#jOasa4Ui#+=^f*>d7(WGg%Rg<W>ZuxfQ{5
z-jZf>D}s64iXezv5k#Qv)Dlv-6+sraB3Q?*2zGHRf&<)&;B#(8@Flk*_=;N*d`odA
zy8xuhjbhF(4dPu5rv`aY1Mmx+B3i~tKx!N4yimH7T8ZoH+~Hpby}kjb7gB42tf~dq
zpSDE$G)P@5_-u_+3!2jge`<?U$7zoq)TaZ&b;M}|73u^UMU+SnTGSPxy5Tf|CUwVi
z51byLO+E3iUN}8Lqk6+;pbt(j(5k+$80d$yB4}2BxD3E)2Ho;Q9Q<)=LB9fkc_B^-
zbZimAQoEFRzH8As*W>vZP6>4FIQ)N&(@XdUrv^0c8eE9VX+h`i0MA{}I0;nlA@CIA
z)WWW(1f`DyP%C1ObWl4Tpg}YU5~!X#ph+}Ar}_$d8Z9W`tAG{7ihyR(3}_K8f({h1
z5?~edNjgwQ)FV(w8+6RCi?0J>e`>&*Voku>Vr{@WVjaMGVm(0Y1T7dqI~xKv78?UL
z6`Kl1)QRSxcrC@2fUU*WfNjOLfbGTh2-Q*S2-sQd4A@QV2G~RFf!OvEdja+l`vCS6
z`vDFR2LKL4&*}jRJP2@zI0SH*I81m2)OZBoDD>#BfGUpx^c8&tPt?3|fD^<CfRn|^
z!mFUu9{^4hrvc6oX8_I;X93O;=K#(V=K(Gd7YG$V!~FpliVFb)#X!IyF-Y(NO%DMK
z6T<|v7y;^TMvc^nX=rJ5xPj8U3r*lApe4V}-JS<k%e{K@XB#Y41ho2Qxayz<`~&sB
z0W|4WSd`c?Zu5a9Nj+z%w@}`sVb|iKQ@v9QDtjk4H`H`JVq!r3c1KJg&UIoS3modP
z=``V@gZK{tlHND*u3i;U1I^HwzXp333#<`bM|J#N{ihcA>y|q`kpt@47&1pXg;JO1
z&bCRs+4Bc!-d`uX861u9Tz0(aeDo@H;^UsuH<FQhkfjdp6eqIkX@>Jvv`4z=Xo9rU
zLH>wB(9sYlg%SDX$~VeMI`#Z?{hJ4P4pc{6)l1^{M#xPq(pmlzd9D&q)V$oKzL)n$
z&s0z75RqSH7rndOsB|>=N;XX7`lj=n%a7}>x|225o6p6@^+y$>>WgZrdQ}A7qPpT$
zdQoijpre1i%-qd@I#K?j+D;eMc2|vmdHxZlABc<FvjCR~b(8GJXe4Yv8F?TU!*CkV
z&ku*MkvO&J??)kqqjA219&9YaQLk@6zyCg5CgXHR|33vdKEUY#K42=`r{R1R{J?aS
z#SEN!@C7sBG7D!#@CTvDr!brv^np?MOEmZb9XNw{xF>)wFoHA40nXJpMQ{jPfpZ5=
z4{!>*;h${o4B!|(!}A%O6~H<C06%}=6v06dk6naQ6rSPKQZ)mWzzOIkx&i7%J)no^
zfv=vTCtwA!0-%@Z1^Aly8elcC8mMp$u?Ao*u@>N);+uet#72PNKR_`%h#k<Ib`imo
zg9qsen%i6K4cHgs9wYdX{($d@?*P6lz6;7bSR4#ER2&L8TpTW#z^9A^1g`=LJ60SE
zsyZHH8V_(S69MOnb3sr2L_g5b05Je?k+=wOvA7s8SPTYb3>8BG!^Ln=#z@!+dWkXM
zZ>YX%@aCdjNF7x!)IE}a{PTmfA*2r>3Rwvhu@b0I4LrYrR#!(LUdbKQ@pba#JglIT
zMCWLfMu&PQ`k)^4uDVf6Kre~<r^bi4CH3$?+*Fz-;9lF=N+`bcu3iG_j~B{b51MA+
zUsO;Ne^>Dne5Kr3m(%Yu8czP{O+Cq`kk03i+Q8+5`lnK6SInRHQ?c~bgU7D)6*2Kd
zU8f$1;^c#`|G-%pHJmQ>P}8pZQ(Y?Yeu(mruCjwLs3|LR`|DFp#8tgK_?@UO^<3qz
zvRtG(;kqbipZ7;$)Ozybf2b_f@}RpLr~kEZce%R0yY6M-)pVDSjqAD04?R)Oq4pm1
zCZe=m7rhI-q^PvYU(`q0P@~YI%UzViYA#c4e+}^!Q3^x~i0>!vRf`&Az*`5LBIhx+
zoX2$I+@*%|l{(H>YB*ifbBbmVQgP}zpGY(08lvSB&n0qhNXxk)E$4=`oEy?|Zpe*u
zLvEZKa^tO9&s(*Dw`v1#)dt?G4V=@_a88G)HCZOw(ORnFG@#{GLtLrPbwi7+foG~^
zuVBRT4(jVboJNdXW}|)X#p!_&%t7Edgj35$GH#r+*J0HACDK6ry$++_Q+PgyQ-kr%
zdH7UE!;s*C!=j!-%}1gJW&8kM{*Ml_zZ6PahFVj~>HxjdrAJyVhza$?YJAFmUlEjw
zdNU(($cSfe<PJe<Q%2|Y8d@cBVG?hfWnro3Q~#+0ek|WrdX`b9GT&uSWgK0Z8`LAf
zMc7DoM2Cu5eI`DW4wdVpr;3PO`GfL-4mD2dNRr-(k5YLlSDhwTs=Z|gg>{8jT`4A%
zCOTdJF7xkt@<3eGt0KQstSHvyFM-GN`M9cX&-+tTtMb(@{OX<DT<%mlYC9*&L8YXA
zbNO-kQ{znO#>fcp#S2b2R9{p})$2917^*A8@u?U2vb^-F%-uDp6XmZm%0ac=i^sbX
zu+@S;cf_4)8S(sj9wVxe-S9;Azf>YR#DwBP+_*|rBu-T{oT}*fm{rSZiyNmcIzDD4
zDFJu_E@ScF{FVoov6#Sbfe!%BH3?XW>+;}Smx*&-Mkl{ToR)!0>{PzWgVU&2IOk;I
zJd-=;nLHqi`V_GuIiAS*Cl5}?bdWY&h0ArEBIl({kUad3XRHYeScp@ET;@;25Nn#?
znfNMq(TI5s9-<^dLc}>I56EPift%?hb^`1!b_XPm$HZx)#A&0%X`{qB9wVoa5~q+F
zP9Zg%LTa3R4~+%2PC7{=Lamcp(zsCTq?t52)Rv>1I!-xte2l2)V?;gYhfF9ZvR<#k
zONnGNR6ZnAP)o+mSu!L?aC7Em`P?G8fZKEV^w%8XdGnIgsOeBspvGN|HH~TAczmfP
z5N9NbU34kW&CgK#SDNQQtzDg;@iuy_-jJ}Uvo!kgSsD}gERBVHmPQJnrLmFE(m2Rx
zX<Xp5G=AW-G@d~(L)cuiG@3yU(}%kmkr(P*jW>}yosc8s(+GO2&e^Dskx6INUDee!
zcjGNce7YdlR9Dv=js}QdSJZ9Q)isx+AtXZG&{wIht~nizAR+3GzDsp=&FyFmiBS&$
z5`P{C*Bp-~kRkPiWxeX^n(NUNGVNZ%U}4DEvD4;h^c;F}=*^*>!&)4^#bGlJ+i}>9
z!+snNnJ{DKbj^DlPT=qZ4rg(=fWtrz!#IrLFp0wq4wp@uGj_aYHHTX{+{58v4o`A;
zfx{adKH%^Phkp{(x=ow%{#dOihp%yH<*+J;wK#l}!^Rx8;IJKsT{!GDZRYrC+5sF6
z;cyg(<2anm;S3Jvak!AfkQwu*&(TJ4n80BghuIvi<ZwNQTRF_-@M8`Sa(H~^oC!0u
zCpkRJ;Ux~QahS*90}dZ?_#1~ZhtCMQxy_wFYp$EbVFeDoIs6BQ)i`{E!?!qW%3&)G
zJ8;;Iw{x{UQJbfB^?!92(LM;{e-EiGsS=X^A5S9Z*#0+25-XC>5TxFidOm{G9}_oC
zP^Di)p-8hrka&^*4bljUxc~nint0g%7J3VBL88?TG-#kOLKp}6#vDkI!yv0j6P5{U
z(Yx*fcm0KM7X0!p#1!!qzfki@{Eg?4M%XMIa6TP}FYZUkbKV~~@1#wnH2&ng)9gWd
zcYXif`F{6bey4KL0Ke<+e?q>&O9t``HGUsE-}gJ;&mz8}h(C(I@P88LN-p>pTqzc+
z3&~HQsfX(g?gse?{Y$(go`u^br<(@pcSE249{Td}_`1K`n<#!Pd<DO`9B$=sJ%=j+
zHR4Ld>{Zm(iefT+<?#8AS&(&z;xb_iU>sa1W*OW?jTwyxL`Z){$UDlr_`)UbIhTHL
z2`P0E!B<c{rSYN%W=m=?&y!|Mjzc`gfulSt<cf`jj{xh6O%R`tTxk;5K#RCeTrX}A
zH;S9Y&EghuD=_^6-p?vjg?xnOkg0RO1_(odZJW3TaeNh8$F;b7i64sVaIYxt5ZB}D
zPH_WZuDB8KBXJYpF3h;nh`XVw)QEe48}ce#jYY_`NqU9<P)WLpZShQ+95=BYf6_qP
z?uof&h%;jQ@>q(Hv(fk$xr38xtO!1W;5ZJsW(d7LVI2kj%ooxq`bu+PNnZH|WIq$|
zxAMBLn%oD?027hcJ;-5tT7#HVd1$~z4CVK(;9?2aC|s2=Vr`B;cg43chz&G}uKxkY
jcI43x<V-GdWEXN`4-emg$6ABfjl(-hyD9X<m-+vHF!Qj5

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass/overpass-bold.otf b/docs/_static/fonts/overpass/overpass-bold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..962a5d7628df54752943bc65a97c9aa656b7f6de
GIT binary patch
literal 68828
zcmdqKcYIXE`aeE%wk5l;Aj?Kb*z6`iXzBC-Vk!he5|YrQrfdqNvDqXP1*F?S6dN6+
z_b!Sc3L-WX8zLAL%T*My&2mqa-}^admjs0Cy`R_X`_GT~?97=n<>~Xx%sI!5oSY2S
zgw0|ac6VY*ilcJk!ZOCPnlm<K(SW4nl+a-N>x`XR#Tff(KxRhv*;8>X7<+ROW4*Kk
zvWF$4oQgWZxaJAQ{0C-aN5zhRed;mB{N|$mg#5DH%B(-*KV~c;hp}eMik-OyrpYVo
zaPI>^k75+~mFj{}e*&)C6_>fE7$;^J7~@SCGvt)zPO0P{X5tom3!pF0Epvv){$)n}
zi;VTIsH~`RU#nx|85{aD?mHOEWc)+qI6%YL){}kT9N(<(?@Xil4khe^qR7s^^sn=O
z&DU<#hM}&8NmPn|zcVHsVgXWb7AtjUcW^86c`Sl|&Du*FSR1J`Yc0)Z!=#=pReBV4
znzNqLzgQFL2srowGitiCCVV`gl(pt|)T?2cfDG!FJ6M0dn?*>wS!Zb|i`8Tze}eU8
z|3d#oECtX}YJ)z}hW)_8_!Dd}`;N8a_1CUotW^FK3z3|xzjP0ak{)19r7<i{8i(sZ
zcBfQ^bR3JO`hfP{acS&KE?7%VU)EPTh4PKSX&&;2kUAAQhDn=o{U#g6!`VHcxutXf
z<=xpZO$Vf>02groUT?Y$Dfl4`2d>9J+ZxtZlY{(9lo5Zx6Mi2nAe@nQ#Q1mf->%7g
zKkFrhpiXZ#Sh9jf;%{fv9mCox`2;qYH)Zj>>9r$LB=T04sTqg5C|B-NJG9|X<KEY-
zBcIKJaW4h@YAt<*KElBpk`3g+t8pK^rxfF7D0CC;L^sjwqlxe*oNfh#Bk*esz^^s%
zdk1h7@J%D!RC<Ue0>Y~?^aWi@fgAOi4LX{EjupUV26)|*#cR@7Uj=%ymf+JUKpgNM
zq{+MXqjZ+VX?_BIsvarwlrmT|DH-~g4jz;M|BoTJr-0ig(0zcl<?n&+AK75dD23m#
zkbhg!J*AJH(6uSoE-QRl&H^Pn`mnQRnhWTIctiksYc>KN0G^kDbAQP1ef04@3xi&^
zCEZl|8Ux)Yo<r_@%(aEmbk>0<v0y+m;MG=|3;^wlPLe*Oz4k0{qA^rCs44Q$y<i@G
z?Onj{fL|4zBfTRaIe7sxNCSU}Pr-m506X9*z!*RYzyfdrT1vBEJFp>TJd!budyAC#
ztniBTgJg8Olx*fp-1qqhqJebepHi|f(u>=rusubW-h}T-fX@lPb{6_|3h5Q3Un2b!
z>6=Ku=f-R2z^g39R)}BFMa?A0F3@W`uwRrNAv;!5vSrwl)E3a4wTE5#lWikSmbzn%
zUEnQUFG5OoLH2f2s?kB-zA};r(Q>;K`l{TApCDV6)U>}hjq>`^j@Nyv>RUUKP5b<c
zV%zX9*VDJ4qeF51F!YJ^fNbl3OcfsmKXJSCx^MUSc%N_gro0dQDD+LSJJ^F_2j9ac
zcEcXnU!Mcc^N+!sQEaf*0lWE<_0+BaKgkX|vv}zuYoeJ4Tlp60Sil%&)ksW7c0=|d
z&1F5&#|34ccmQ^WxkQ;mXfC;*8F)Uk@<|x42imxqgO@<Q|82cG@Gqa;iSas8%722d
z%x4j}rt%2QS=iD~ti5IdO9OP&yvx!g&vj_4=?cDe1>dP|IxC=d)K}w_V+<;z)CZ7J
ztY!o2NOQ5~qrWb4qxS4y=dUf)ZdGPyOt!v%n6b4|FX<(wg9SV&jYRoiHRa>jcpgjj
z{Ct&_d7Wl@^<PqQ+HkgtIj&uke!8Z|7-4)GZZ4s_{2KaXsEbGdJez-g+#YljK)-&h
zhc_=VExXH`*RWPB!JF5zrtBVXUdMu1kvFeL`D}0A06HJ@=KYw79q{J;G5RrY-pKl~
zFTHsa<Z1Wjo4|K>^X8j2U(Sbk^JeC}<9l!3!g5+<fDW$p2iB!6)_U`tHMcbL<|XE5
zv3v6x7H#R^&1+epWrR1cV?8XBy?H&#H+b^~mT7s#oA+Y@E${H={n_0uef=2Ow3bEQ
zaue&^@(XXi35&Iwy!oafan^p`yqTTqQR~fH*v6jmi4~PoT_r`uZpS7^Y;;TyN8VIN
zmb1VyFxMUKNG;Egbi|jII+Pk!4wtja>8f!SL}t`DU6r|2RS6ZP1zjVfqoezf%=`F?
zBdFYW;h>A*PFGb)MY-b^m3{SYY*bR^$aT0~xdqO$T-PK=Md6KDB{@rLoQ{-=a(9)Q
z9Z}*gc9oPDxhu-U9XZ7nWw}+3K^6IvO3E83?3mw)XpD*Y?+Gn-yDQ_OqH1evBVEpd
z;#_xRennZM!UDphkkFtTZQDB1O7flMRZgR^VOV9f8+aOSH0Bh8Lc-sXT~X++&2>2)
zC@5817dWcR3!E;8yV&W-PEB)UR65Jm%HHn79X^J}M8-s_oq5|*H~AHnC6HmBv$Uc%
z+>u*eK!v%bRTYlhn%t7o+`Lk!qZSMUi&Nr<I&$4{MlVfO`L2>m5K~oB8d>2gipoey
zGa8L;@lQo0GdbOnl98U{NJ~vjPR~wu7#ktth;YRAaHKf%T-CX*sbF<<Pops+BEs82
zW>#|ikc6~kpzCxLRRA9nE7ABj`WziGa3=?G#a-d3a+j1<m*%>GbcL(5pthvI=_qj4
zfV#>uCpd^+@+(R~R)s6qT>`xzfjBB%6%(EL?y7L5i|WeC3YS|MO}U%za-uFY(pgxD
z8wx79`J`?o`3lEMp-j~!7&;%Fmz7nQm$*xu=#01toX~p>;gRbobUBfrw1T8m=)!Uc
zXijpJlsjsROY(~qY^oe(xl<t!M^!P1Do|xoMxEdSH7j#n?sC{jaY>~rnF{d5RTW8!
z0{*0=L3|Kql|sOEEm0JYutCSwRnCHNu&TNMq7QeJRTPvIk`fSR7!j1XO7g1RC?SMP
zr#fIDr4{8xlwvGggW2U3Zbuc&mAn87%c@Adt0G}gDpNs!NqK%L#-N7fQy~UdNsY>M
zA{zJebIS>xJZNw!A>u5{a~2d(?nW$tS5$>d9Zl6mbXVoG1uuKSYS^4IlF#=zXuSz-
z_F_w96Sg-a(g<gT1r7IsV{t_-)W@YDOC$qdm$THFOMR)9N3<y-aJZ*dI!VL4OjrAL
zIVV?_xSWdiL4CX;h9FRu3vv3)x51<x1r@-W2FtCi1ou%_;a^35wbF~Ck2HK0u@=1d
z_KD7MQQ~SuAZdkSk=O`GO;629%}CESzJG%+IRiurp+7VX^;P9mtfa7{6i8erRTZ+M
z!BY){=$)>PRh@1{04Y*FnB)TX<dcCcRHv#sznFLeN=d_2?ZAK))vkQdKm&$D8A_m2
zUf-gM!%MefgP`aAEbr8!y18`7xG@dHDpl@PmCk&xVylBYatqyFR|&W0oy)4+@D{{Z
z&_cauU;-;C&n@-2&BlEbf5?5nSCBt|sBd5;S$}0kIr@UqRXG|P((U<2V-E3Ipw~k-
z9`h#CDTCi3CC)8S49i^+4sn+{-B5*a2N_9q9vqRonhM_YdJ8I7Tueo&^F2jfRbSc&
zU7vToiFn9ksw2NRw;U`ff||L?a>@U>sF<9jPXTXa11YSd+*#{zme-WHD$0qwL}q-o
zyST#jcjBr_ir~;-|1^w~a<J(lc*iozyPf&P<t6!$NUf`c<cHx^d#i-nLJYOV72tgN
zb*JT3<Qs6p@QNK|CT9&v&CZ4$IKmu>8R<!0o5*y!%1Ww~xC815f9eE<K%pF7FkJQ9
zG<Cou7de$#g4pOCzaq~KLnc<_0*^{~1C_luAfPmY2U7j+RQMCrgzt4K9V(vB>xog?
z*!`)~2)t|QjgGpy{JP&pSD0^ZGb|K><~E;s7eak2Y6)4etN;^LMR`@6(HPUok?zDa
z?=_DbP=_mWDIN%Pl|cL@Xom@{8WL&HAoBK(>$ZaiH|sQP+c&RyXASh_EG>j&Vmtlk
zmbawL*W2~kqcPKzx$O3HhN56JCwnIiXD;SmMRcS`5T-hLB1%AnK;>%K3zv+bOL0nW
z@?wqsd=)CH)0x+=6*#>7B+uuDM~ukD9Eu>tImPXBcE#0Yx#bZEFA9`6i?&zE6N7tT
zCOI2S0IrHkR|y3)Wk3?<(NMk2=|)30!io}SX+f0|3{X270A1w4iy^d99XXI_n87Q6
zthbF9XUu0M@YOXX&RXyUs!xMMTV0S&SExqC-^6))nV^}{{O@jBoh{(zs~pZLmEc~9
zTd`?3f+5&aBLnnWo)44!3K!;dxK_pIC0-YZIth8_6x4tV@OtKQidryxl3jTH0oaJS
z2n?Z!k7fw+(UoWg??j5APJcu+&6?dhDUl4-BecCHee=-DEj9R7om->2H`)+_Iasha
zg1{iY$gr%!4WHmFFQ{;VZ)9i%2shj%xF8pEvlXH0lzeBUV$QkwlgcY<5jhp948QIJ
zVbhK9xE0PcL6e9ZA?;FwNt7aj_z&U%Z@R0zxq(2h^P(^kL^L=j#V=6E>eXsE>rxP0
zR$ZmUQjO<G$N_;81o!ulNOgirBQFaZH@rCxYiyVBrT_2auNyc41}Rfb4ox-b@f362
zxa!Jt!fjH7R}GCINz_!7AhIv?`B=s9y{^aSqOS+BFnZqrNvYY1Y4NE;lCz9C1C!OY
zR(3{8&WQM|WJhYYBQq;wcxqB|lH>jOY+RoScZ^8Q8JICF$AKDI@##6Euv&1$r;l<B
zPEAh=cO;L*vMW2=k&)#{9g>-rnvAm4^u)AbNvY`r90_Qbo<Xa*A*ng&G$%u8>g_5u
z8SPRWz$I}YdX7&>O-s!g74Aq$%}J*|Q_yL=BQriLCpB?cT6~rxb66G*qmt1_61q)K
zO;5?fD9J;Tv0y|;i5Z!rvQh^O%n3)M928=uo)w>zJS0AAa5!O@0g|&EN|i`pi9Q_3
z!>Muh!1%N@2QlP&AC7?;X-TM^kPPhOv8+_l0pSY&!W~KRL*fSz1-^c%nwNqG4iKjX
zB&R25#ixZkvNMwtQz--1rDi230zuRSyFolk(G#MJ?Bt=tP=I>AAs~Z+$qMSgIUfHd
zl76TZr-MT3CnqBdJn*72A~icX+!3FZnoUAT$;udl&LIl$h-e%J7NRQjOvRVPLS=MM
zS$tnt2-Kq1UdAOQ$ETq~=tcV9>qg#Yg`Zzm73Gc0qbhTYoRO8qmHiQtm5nbc=!b>p
z_*!S4!$FO!yc;1!<<-jG0L`JL&O&z-Ie*M5#qP4w)Ivw9qc|5cY?YH%!__V*KH@!0
z3Yc3l2Pv~AMJkB#$R?_aE2?SHp+q`GC5X+i+<ecGT9uodkLaZq`#CI;Rj^7nmAP06
zHu{PgHe1;yKr9Z|Vz5={V0pOfU|Gz`3Xl$Dxu_G4Tq-MP`79E-cvgx(N25Nflq)Bz
zLMs=mQQAhb3?=8nc)7S!g$>6Fv@2j;(Mz=Q*M}vsWR}K;vp#>T9dW(>&HXs8-x;oq
zR|Q%sfSu#N?D^*Y{?kY$z}o@*9pHisX#qwoL+WCaP*%YT@q2q-C82hy!UYFQQE+sl
zzs98_fV&%VAbFHSB5tJ?@jC~l70OtI!64-GF(%czl?*%LZYR`J<ru>v{+~#c^u-N%
z#<3{;)hd6Hz@2oZ7+i5fviS<ux2{RtQ~6P-&`I3zwP?%Q0{=8nn2%cJxZ`9-{N0M$
z25r4P@57bW#6?wxKK?scHpVUluC<CBofuWEQF_DJr2W;vgK%~sPg0_~*|3B(q#57?
z;n^VBo3SS;-mIZ9pqId?$oE#``miBBRsti{4)c(fqNG-_#asn1U(H<Hslq+d(;7et
zu5)3>r3${axF+0HElz>;4ps7QNYRM$#uBXp?@1FYQA&~_%PK`$fzl#KJOf&srtsAW
zX{mpWIg$x$PDk%4sF@B5i6g0yAeCn0*MYXT=7<9tOWI2wC<S=uVZ>@hKIDx^-qAQh
zB7KNZ{wUXgK_+Z48I%oyXGlX%<t|C92)L{K@mZ@+j{ht_2M#?{ipjFb=BY=rPzN~U
z25-uMBk|hp<uvh$JRI?y^v0q5l0PKbRiZv=4EbEubC8V5my)!oE%j95^%p)1aiE<G
zcPFB4KJHg38sNjC8h0y|w$!VSwuZJOPp7wE)kiv^`*h!>^yR}O7k&G@8(ARHOS<m>
zcB*HpMygUxcU3DV`pZ#HSd;fBjrX-vF;sD{!F`n<<Vgz^oQONVy2KmRmgrut!lzmV
zNAj{Xz5_fZOU_p`*+(CFM)Jm_BV-{Y7xF`@M{4MwB;~_IwI{Vtnwf|X<!I|t+LG?m
zSU#Jn@bZ-IlGQe7mZ}*v21$@Cld$ng;P1YqG0rM)RE(?9j&LI05r3<ZSFN5(%Fr`i
z7kbMYXi{lZWkNQahnA#=Br_j}OBK%0>`QVa`4=IlUaOcA=X{!7jvAyz<V#44eX)RA
zvrNHL_1?q_b%r9IH&8|x6KC_$UZuk~V!48e>Ptz(8*92x(yIQD9+JFO?hsX^hvdst
z9?|?u_X_amEBjBpP<1Q{G?5o?pshj1RD<|H_imgQd^)3QFL8u;LAa}OpjI??<G9Cx
z-c$`HuHVdCpR|3v{U?sxn$PO!gwL(ot9+#Bp%%E2_i-uOrE=CMWtG2#J@J-wLe-td
zbDobg4OT!Ln5tN-&vV?U>5cKFz9&O|B?^xke4pxl8tV=9N?w&(kUgu`*%%Yz`>kio
z0<<Iv5Z_h(%>{mypo*lU_UogA>gEHZ23#8aqmO!;^Hi->_5MaYRV`BQ5M8&Efa)t6
zW+;ktQ!p2%19AW~KV~zdqYX;QE=i-Zk!z%X4jamdBZUC+KR#-Fc#*`YojRA0hagE(
zy}wIUjp}_ZZxvGwL_cKpG*(CSLUZ1KCjr&MXiiWyiRM7!y)RByIjee|D)dP{+@~k1
zOnpAQvF}j5c?Igb&_eYyJ_^atkY}K4vVt4qmd4g`qr6qGL;P0c1MX)j93z^^PN=U2
zd8Dg$d|NsAw5qYaS1GoU56l{SY?6tOa>9<JOk<Kn)u>X9_HJC4(QH5%lTD~`gDMvv
z?iuKTR&m5NnuTtPHgAh}<1uOOQsWBW8cNls1}@yBl^8{x`zh+6d6RUP=u_oOa~0uz
z^NjR=(LW!ZLom{fbKngz<ZbEn$>&x+Qq@kn<MYH6{m>{r+pkc3Ce<JgQG`QxNb`I%
zNi}p(jfiO0_SSH;RBBSxrp6Y&`qW;HV#v;%sOQ5^<#=PMP_%L*cW<oo50Y1~R5?zz
zM&qbjLbJc>eaYffxvA8swSAFf0~b{7{7>58^RVQ9otSYP_$`Muk#{5-e7ftCX1u~H
znw?z#mE_1D7b$(Kvl#WRQscx(YMDAu7vYL#UK&v?C)*(oP>f2mAK6GP?oo87+Mh~&
z<N1vuQS!EgyH8%K&XcC!tk){_KH1%#PYU%ntXPuadxl^p$i|;KA2{$}oCB*Rnj4aC
zoG0+eG+|W+%xNdZXRE6BBpH#%S7oSjfp8^%M*8ZD27NPysuQ%Lb1L_J5>%t08|kk=
zujGYDBYavxF}%-T`TG244iF~lNNNm3*S>gns)C2FPr9SZ(1&3|%%|S-`2)2b(S9qx
zLv=~_)fs~9xK!!c*V?zX_SK=;?(gxoij}&)`QNA|kDqsa-R7g-$0@Qy-^#(qSsIJ*
zRaaD$uToa&M(i2Te4GwS)s=~=y}rI~uXk!xL^I8e-iCT1uT3M<c<Ks`R@}rR!sBKi
zMBJp>wDWQEyrWvtKlo{kM}7F_dNuweJ8QhwQ1K#J6?)fOu?pq?_c8x_nca-r-`5_u
z(=^gBRg3;F>kQ(`e_Cl!bWS$g*y>bG@mVHG(x(gRUIIlk4fR!dsk^;ul&tQu`LI@7
ztKQ^x@jOMF)FaX9Tb+?U_||%A^mL<s`eHu9lk_YCsk#oOzQ{vO!7q8J#*tky?1r?Y
z9QBFgG&48sXOXv4cPiAFSk*mMGaGn7D*&2*=(hy*X)IN~#7U~{yk+m?cL-Y=kx~^m
z(#HbDUVN)Y-*`R>R4nq8o@w5v__u*7;xozUR%`GI+#%f5c+oe`jeJ(uXT&4wmu!`0
zT9xBBMpmkCb$M;4tJiDL+UlRI^Z#Ne>SztRmj#@Nn*R_@->|lz$cpAOiW#OrR;uoi
z4``UDNphrd>b!L88SutA&ll18w1I5Jg+CfgjjI~syhKGuZj8GduY@8oa*m=ggr(Yt
z8U@f^oNpc`Pwm@lQP-Zn`Qpa-K-EUlZJ&lvOQP1dhVW?$)l_-uo5_jGBu5`rK1uub
zrMfAyCR|CIeEs=WayQ10|3q~|tHx`TMv>cfDc;!cf0~EXojG+5_N~;_IY6a^e5gvH
zYPmEMlkCYmk_OP)oh+WHQ>~4xRNdVmNvL<oYmklnleVk9PJ#DwLMKQ9>e%FIC!r78
zJ0a~XP@<#;uKWCMLma5;Km*6<M93$j|CZ0HcWh{PYfh6aeE!E*SKWj7zgdqOlXkyB
zZ*DI^b?&}7c2XsAtH_D!t6uUSRzlvWfV6<*pz6e};yKa~(gcz=S%+$I|IHo+;o{>l
z?OCfM-Kd4P8?kZ!KJ99}Ubx+Ssd|h5KkR?qUMFr|)#PB8OI_8Z<21&%&-I_qx=7k&
zQ#9|Ahb@P6R3G7!R}Jpc{wrw{*;a!L8e7`UQP0g$G_@n0QR89KGj*oFnF3mOWn&GN
z2K-auMTj24e;{&=&$Y6Zlc5|o0`=(ZiO$Ef@k=LB893ugRZg~(m;-xE@yZ?C$9k7E
zaRlyCj~Q$jQo5!-vhYi1W}{F-XA5-Bo~~RCMtxclQrl!UQW+x|ebRUtXh&lYK`EWJ
zC41{p3!-9}vXV?^15hi$J6<|k(YREfR-hy`V2U&YzrIm##EN=W$0N*Cz9fPM73X;L
zO{b#N*C+)~+Uv{#4n92TM369z2V~+m3wP;ca2Q(A6_pM{nu&VqNg?%2SP{0gYnl$8
zWGU$Y^hy}0CyXkuXw{sFv8l!Y;FY6bK_d}$RFk-ugZuI5mD<y&gOyShGvWzJnQ&?7
zh30=6Tg8L;Kiu0N?bj0hY51d_RSo$&9`p=F2I|nL)OP|>mG{IoI;~XoO686!@do`P
ztdlSb;Y)Nk$h<MW#QDF=;8r@|lP>i|(jk7NDO|_~|B@jQ>Pao3_GAyF--%uhs(q^3
zO<eWWRe7lHU6A~SLYgYy)&6d#g6JBd@T`IBDxV2M(i0ldw=dElV;Yli_TfW1OS<H<
zga)pVl@TU163LpbXauqZ(xeRVl<xVgP#wc3$6-oaU$4~eM*jM&#aGYQuHoeS?;b+s
zk#B73yMcDn4&tSXAxT-~#y|HPiHPriIm6F~=c~e5{*8O)QHX+al~^Ydxne+n_*;s<
z%JBIC^1uCnFP;96S5_W*z|e7hWZI=@{6q-t*HvQ;LeT*|H$Wbqo;sq4iuS&vlpIC=
zv{q0lC_`DQ;^9-3p6OWzCvsFrT>%uLPdcqt_q#}T>PkUfx2o$Pn%UKvgJKWb@1zLZ
z7cEh5wDU-FjJhjarPQFAg!UAvCGCsA>ajmdGN?is#f0kKOD*nFfB1)YIq~ivliDHG
z;?oUo@0*O_^hTgkuEE4X<$CTx9e*ZR08;wrOVz8}{RXf*@s?(57KnE;+b|moW_F+v
z!a}i)*p9WwW?=_};hk7#)&+_j0i>hwkVFg~mgvg5vF>=3q9^OcdP6jQ@D+xBc=xkE
zyIWD?M8z4UD2_4}j}{GvScgEx$%PJuX=Fn&hr!W}z+^KD?}m<MW7t@RcU9R0Fe4A_
zAm$Z<Wwex@h=92iYC_>uB@X;3NOyy%Y6!3v%etv-8k^4UW%sceY$lt<?#ElDbJ$!q
zkIiQb*h2OIdyqZE9%hfQNAZs7BDR=4j`v%iU{A88>?!s%dxkyBo@2|{a<+o4#JjMo
z*&4Q%tz*x#^=t#%h{xA9vn^~Z+s3xD9c(At#dfnjY%kl#_TxR(gX{%%h`q>OVu#tw
zd=)#wj<Q$q&g!e|HFlhxV6U^2><xB`y@@Yyyv^QW@3PbEJ@!63gLjlaWFN7Q*(dBQ
z`;?typRx1o0{fiRu`lqR>sO%gBKw+s!@k8E&i`WH<DKbC>__$!yUc!OSJ*F1tECTn
z%mB}I;Qb7Cjq7-Kp1`wtKA*y8^2hlHc!M`c>M6Z0y&;{~w9tfUHfdhc91Wfq{Hw$2
z2zG?x9gJv4S4W&9$uZNh&apK_7h(ws2nh`d3yBQL2^kmiOvs^-&qKZrl|uEQ%|cs*
zT0;XvgG0N74h)?T>TG|i{ab&$DofX{0S^aT#TnQ09z2of@B%&+<G;=8rB)dK1jhfQ
z(fG51e{onGtsD+z{8&ftTaKR{GCE{Y$exf-L+ZTa-+}R4Umw4~J3ha5?b;uVUBfp*
z8vb4DpyvOAZT$5z;NHKA{`CLzt@@w7^nCfSdav&3x{Y6qs(Y&L!7rNEU8-wa_i)|J
zy8AxAudckVs4lUtpRczIn=b6Tu!6DA7ch2V!G*aOTo)29B%b5v-dAeC8lioR_u@<W
zcK!~(B(;Qn220@*-n^FZt~5d8e^RW}18?E~!#^nu?{ud~%Ew#K2fqJ8(D<J;P#TDF
zS3wU+kAH=xTA<CVp~pL+j|bRq(CHtb<?C4sb_X<jGxYpJ=ub1~@L^`g``68(#Ydof
zXQ8!ZPitXO=V4QyLL0yEY9oh*T~svk6<C@Tmhr8km(!U6US}EX?p|o$EZE-tu#4HS
zyg7>PErj)v?Mbk{M__-C!uB46CG3U$Emkbh4<76-=q=-%OI*XX&|p0`a6j(PjoieW
z@TT0%oAKuS4&H)WcuQ{O0sKzhinr#0Jczg9HXh9F+`&V5C~wQ#@%B87ci<g)C-xnW
z;E_C<$M9~jiXOZt<kOqS@jkpS@5k?g7uE9q{B9l(i%H~3JejBP0em1&<%9TOp2mle
z4f8BmQw|@-hw~A9Bp=1^;iLH&J{A_I=M#7?^xVk{c@Zz>C43^E#7lV@FXt7!l27I?
zUd3y8EuY2jXK(Y_d=8(>=i%M<CU}!xX7#)a59jGTgS&Y(`;+~}Gx<<Ho{!^sJRkP{
zi`Uw(!18}4UxM!ykSF<wKd5+>kKw;QV9)Xw`96MtzrYXkm-$P4KR?J1@nif|{u)2d
zPw?0IEBqvXgP-DW^0)Z={5{y@JN#XKnjhgu;nQ03<?J9|srVy&F$mL0N3Vt*L+Sv`
z0MLB0N(E>egNCWFAL$yvTEJ6)bzb-t>GNLLgmk?ZEJ!za;TfbGy+Hj@Jp$Mn^i+kN
zNVj-_zC^Iq3kQ&H^TKaPw|ikZ(j8v-0V%a7SPIzX1;S;w7g`|Q<Apnr?)Abdr2D);
zxDcHL&jDy`f)4=)y>J=n3tni3^pF>5%on|I7%9;}fbTEC{#0m+6#hwp=17ltfyO`T
z1uA>R3+IrMYzWQ*UiHFJq^|*v1F8Whyg;&f-3zryPkP}z(l@*?1?ed-e2NrbQc>VD
zr1ae=f-eAX1KtH(0G##$NBW)@rXnSuNN^Ew2JivkO91hUfav(h3)7H(>;)^*PrN{S
zM6?ln3m}|`?ymua6Tx%<(Li7T5KaXCfX}_K3~8Mg?n6p65ZntOoCszBzVgB>q=YxY
zOaP5Xa6jN1FOa?vP6V?7-+5s!(tmkj4$|)dq=WMSm%OkL>5pDmfb=H->COXypS>U<
zz2b$3kpAL@N09#Ng@=)n-V;0u_}vSOkpAI?$B+sykZdszDnL4Z)eDa!{kInuBb5R5
zfF*!Gz2JxRFE1F8Uh@KUf+Ndy_`&#G4~SOp@fhR*#2fnh2=5Ar0CWR%2cRCl#KQR9
z04j?IB%r<qX(C`Kpg$lBkd5+VNOJ(=y=4=S=As;9^E^O4fXWI0Ro>K%v>H(31?WDX
z1%R#-kS=rRD~B%NOF0Z*+hUw_!GsjDS71I;@Q8ryn^T*2kO!YQ?0}yJbOF2vcps1s
zI0N_qK;wg#+{;G}9&+%GXJQ_2r2^3-wN`<TLmCJOLLJZ~^;CgJA%!gykbX(8t3Y}o
zy`ch!E=ivN$WEYZ(m54KkEG93Abph1t3bM@X`up#{%FEf;LtJ6CKbp>YF<)-LvJ-l
zRUls*JPR-nc!H0?z$5rq<iR_K1<(>WyoS`O0%k4d0KE>-NxsJc8VSe;I6x}_W;BLv
zEQakX#cw%+kq3}(a5z-JY{wiSDv(ccgsOnpojHI%0r^k|bc=v|i6a)!75&4G9K8W?
zC_jxfNd-jX%mG;waM+7uoeF#r(yc0xzYBq$5%9%GK_da_L`Z-Nd<jzELx2?o3jr<!
z{0XFyDsbQ*k`2f~`BJ2#0ppN=8Y#vj;4dPjF#voYQW^t*uadD48Uw(ghauE2`s0U@
zQeOZLS%o~M0=~4wLa1K=KZx`h75E{fdjKfo$B<HA0R9S6x(DEpQOKtN=n98^g<Md9
z^gHBp6-eJh>HuG%4s0UiBH(M}k1!T0sX+5~s9pt{14EmsK=XF!9V*a#9@;_$))J{z
z1-=YvYZVZmu+TsiXub`FUJy`x5enNQpgBKupb9kihE7m{Vw2DUfD?5#FxDP^kbvg4
z_V8Z>d<9(Qt12K4VloGS2Fzjn*G&qLJ@el>C_whD!Cm~jb{^~1Tm0kr7!yN4Yrf%Q
zIaJd5s)=1~!ml=!JT0}on`pjoqLrJ}o7-r&{`-)wjrG-LZCd?y$9ru`ceP-@q6>Ul
zsTo4AU>1gjcOUHK4aSmrEEdM<?#C>I*N?(1mVwMo2y+fV{a*uV??Lsy!qnnHNU22_
z-5de44WV%)k3|679|3L#0@(=&TPGtpy^k;8i}`ZCk?%!FcmjdqY5oyE&oA=t`OjQP
zlGH@H1B*Dj)L!Z!MM~YI{?Z^RQyMOfktRq*QkhgG&6FOJ7E8;e)zSuOoAiQoM0!(t
zPdX!=l|GZck}gZXO4l?^u>5PKX{(9UbkoFXQZ!kbk(zOuNt(%;TFq?DBbp~Q%QPD`
zJ2Wq9j%nV|e4sg}`9kxZ<_FCcjYm_j)o2Y`v$mzSwKhx}q3x#aqfO8b(T>!P(-vw=
zwJz;+?Og4H+C|#uwCnLn%H7(Rw8yk>Y0qfSYU{K=YX7ahrqk(6x)!?Dx=>vwU8JtN
zuCFdxH&{1RH&QoVSEwt~xpmWZb9E2vmgtu2*6FtC_Uc~Ny{>ytcUJeM?t9&@x_Z4<
zZ`R+b57BqjN9lX$@752{XX;1l$Lovr75XXqnfeFxi}X+FSLiqBx9j)mU(&y-KczpT
z|5X2l{yY88dZGWzpf#8bEex#<4nqe+q@kOkkD=Ny8y~BQj!x*UCSBDe7Vp^Nt=U|B
z*QO93HgMzBJ-oF?1x55J9DE#s@@n1gRn=u>%BMN#CEt?VQhZCM5HGD4RO3x-yjYDl
zxl1ccsBYKz-uOlneaJz1t9^>Eli1kk9;Fr2@bL$y(q(*7JYIFjXCrd+T=?`#ZbcDZ
zo1a9tViJ?oBso4gHy<CUNmPDw@%lb4^3@BqZDM|j3!h6VEXC{64cWwk3U_WkzPjX2
z%+JLL`O0s+GES13S4T_2__^+6wXgi^t&*!<75HikA(yN)O1^#zUorx+&W3BXqXMPZ
zq6QQODD{ez-vQTa7hTT{z`Ma^c%hMy9N5sTs8MloLvgY?N^xGUE7gq;r{I$V^qZ>U
zi1*zI)l_A$67^SYFrcA})ayf+MCN1-RvDb4BuUX=Ds?c3E@Qj)EKt}osG;%1hU_4P
z{S%enWTn|a!b%;lR4GnViYGydoaLo>@wp_wv=LdQ>fJ^qX+SMqX<4rPrZ>Ll?XiJd
z=}P;OiRDTPb;?l5AKa)_DS9k#bX`$gU0#&ysxB+dt#(%^9Li9BE2>I!@yb5wRYpTL
zODS+EzgdmCaW%?kDZ{&z-;BoHXDiLBl;7+IzEw43v-9!sC48JpWqwRmqh6Jw9<kYf
zD^g50HYUD2mp-P8k3|$KRumhPkfWf0ubV0AiqD-X*J|IfIgrgT^_Cl1e20Q+RV%a)
zqmQEvYmE9ZRf^T#giJ9>88{}X+lU7IYa6m7VE6bOl$W3p3emO7?+AQ!3Ljl4sjBs5
zhAE>?Ra%T{=wfO^_8z6>H0Af6>-vgs+(6f-HC&UDCiWht6oXEDOs)ImYPd48OnhCT
zpt><l)kI|#Ud1mj7^MuYwCJg5e%F}T+`^KQ=w7|M#ZYlfOjr7PMinuyYeJ%0)C1p}
zfQ8}P5oIOi(34tUFVS6Ndni?+yDN!$6&s^E+4yJ_ru0bcI?d^-h%6|tD0A1UsZzOn
zSA3k#=~Qm01>FkqowDoK-4he5Ku)<*fRE0ocbxQDKBWl0GP1n7%%${B8S0(VLVRXP
z%}{q#QdKfVO_lzrMCp$*YJZd?9Aaa-=ek@KwbhjhM!kC~SIRe0)Pi10K|w`rISo%V
zspY+ua(eMwxlZop?WUkyz3#5k>Ki8}fs_i2QrVZ#UBUT!cL_a}y9vG2Bwk69yh(!6
zbsjzpq!!am5gU_C%tq3cXuaN15(zmrCMmf(CIz#Sa-mFtu$pe_m5M=<D(Yla36f(`
zzguk2=xF8Bgbm--7}GI-jPkj_|M8QE4*J|7TSc+fU2Gf<6;@!Y;}`ZPHUi7BmHUNs
zrxYb6NMjM_Oq8Zdv!$n`Wg4BPlO{%!t$6_P%2v$*jYn(LrfajbW3<KE$=a3L=MjOt
zrhOCf#+|xex*>=xrs!rPs@S62qdTelNN>^y>qGV7`tJI^h$4pS^Yx|rN<<K|_3QNS
z=sz|vL<c<#afbeeB*QSn1Ve$L*idSiVVGxl#IVG$$#Bx}k)h6T(eSh34?l}vuwR&8
zf4?NZA%4UC#`@*?P4ipqx76=>zpZ||{oe4q;P->yWxqfC{_>an4gNv?(f-N)gZ#7o
zNBEENFZZwVul1kp|A7Ca{!9Fy_uuZn-~VO*WBzaXf98M5|7ZVy8~u!T8Uu|Tja`i0
zjQx#i#!<#XW0}!yoMn92__T4Iaiej&aj)@+@s#mhQS+G?D&j?aoER$C$kn~&p>n(&
ze_kFcs_nv{mD`LFt%Y8&L&7fFh&G4hR<gk{T6V}mcJm;k6JMHgZYtYl7efMeZQ8VJ
zSJ@`#^)i!Hg!VDYl0G&*_Cp;~5h6$HOroQ><BZ6+dy)}ECmZCJX+<&7Lw1Ok!M>70
zVNDV3g3TEByk6WbYgfl~AK)q-8@wZ2w`u>O<!=PNvvu-7d!=Fdq`W6a2ZePUDI4u3
zS$l5iZ}0A3|NOdOS%27?K56})mkzBwzH8^48SCw-hRVs#>QO;vtMJo{ls?7`BhWLR
zJ^It7lzkny+J`M4yL@xt`t{H5JG5y^)w<x%-q!6c&e+v8C@gMNRQKZ(gr?Ab+`V^t
zQD9;5jM3S-TUXTt_ZgrYw(HZ9^FgLu+uZpJ7S5j&EU%G==;q8{IPW3+JvwiGllEeb
zoTi(<<gtZ|f=uF$Pu{t--!5zR>4r}#C`=2IjUz>X@DtJ=VH4K3x0emyZWrt&-G^my
zAIYtQ<kGw3v2u4g{v(K^+-|;_DVypC818+z_K~T<vzOn$^8RP#9i9QLWWPT%g~^ky
zf9}DR4?GwA#MGs=PuwT=*Qd8K{r=vOpEufN?Ka)$`zB5v8#FNY#P{FtJNf>;&6Neu
z+J$DP?#I%E{T+j3du*88NA7#Eqp;h}9+%L`{}wqSA8EemCoT$I{TRJ@<b*>>L2>27
z`q*F9Z+>{yQ|p3EYsz&?o_gl7=Ylq`oL1$UI<0idjK`mxV;^3i1AqPQH7cC$Xf#{T
zZ94X;JzHP)K<x}ykg22X@kflJ1yzDD<nW$G@p*tRYZCrxM$=lOe#1W9<b6k{zZE2^
z6*c{)`n%!p+due2C;RIw@^sHn81d}jAh{-vls0;G<k2MiCqiefJuv6+i-Cf@0F|}v
z*nI!=wZYN##a3t8lgp~?;z9A3Zsmj}BS!~1#*i8Zo2`Ec>rru!-IELU<{0E=S(7ue
za-TmkIk@d8UDW<BMqUmwCmRb$lTG(lR?e9mR629zM!Q%kj8|l%C^E?Y**ZC@fBTQ+
z{RY#U4+)(ZBs3yb=*HW`8=|?UPP}N9UmR(aOXWjpvPLfs%7d&jN39M*BX<y~!;FU}
z>fYFO^y5zg-zeNNF3&k>bpFQ5t#gCtI19&5o$hB^HP~p%PPEmnvz6N{FPW^z-(C5}
z3H$IpZ<L=6de*kkF22@3w)Wxms{%!@4j;?SQnPFF3xZ!R9Q5Sypq{Cd%f{Ksa`qlr
z{(8_`TVOe+-J3S=-c`1_pa7rbE7)AR+inuY;#aG<W8W`lKOgtQW5yl_y9l#=qkPQ@
zy0!Xx*Pq3@3!bsovF;r&A6mWp(4o~uqsG+akG6aI){mujS3X4_U{In_XpV~L5}Qdx
z_dMEp==j?FiNU6sLfhf8C#u#oJki$TgBOjS)?1CalZK?1Z2l@3-0=T%v_beE(}_4k
z?edK?b_Tt)XZ5b<?dCqVx*Vg)qnT;#h$Q+~d4(Qae^2*yy{)Zy*dVWx-`1Jqjf)pG
zX>YQA@umEMcvUnzp<B9W>7pkBm(G0n{zro4H;?NcnKSp{1wpgt%$>d9k^3K+Wj`(-
z)7|&TWA{H1^u%LNKDF3>LYQ@C-NHEw=gbeBw`l(3rgcl7-LP!+!uz%b|6o`)vE=c*
zpp0~PCwrgx_8-<q2!De~zDMh<T)S=C`t`eZJzrT;GP%lWH?I>rHrloxUjIqp$5}^X
z`(=zwm=^qXwQk3fm8-S~ZGLV_b*1axQk%&-)@bfC^B2+NlF<HQy2tpnu(x>YNt@+o
z5#%{*y~}3#F0=k@SEJr6*60>3dGxVGfsfB$G!KSy;RpGG-Xu0@D{GgpS+jD*`i;w`
zxZTsHmfKC2X9|O7_C}*eg1VW6RsW@k(20BG2+!TH;FGZASfsJA<UO$DSiRh`ez5fy
zF=*+^r`Il7*;;<kV74CIzJ1^R;vM70mK06M-B$d9-F#+|&9rFI;zbLWEL>tYy|}_A
z{Kbm~Q&DBnv~fYEnsTFQn||N2n#tugQ_IRGFWdKo(R6V8wgdZ%x1*Ed3FEhwykIw3
z7aHvYZLvlZuQI~0#XI^0o9WRdk1kmhxOn~|lZ7!$6?<xCPg{N8`grRPddoiMiMz{S
zd4WxtHFfrcAd_chfSd)w+Kcu&IaDvVlRN5!45Q1@{TYQ0YYeZwD#GOLI+Ofmvh8cp
zL}Su;mIVlhUVhj!Qj8G~>ty6t$`^IwqTB?ovWXaJ5Ec=oGc7u!6L)_pKcSx~PrWcf
zx8d34&#VvHvU*BUVR=<<VdZnrx$Pt3F=ZY7TF%fvy<yGTJ*)iQFs+&lYDO3}rd;D(
zqv^MYL|?hXXfn?2S7R(wOcnRqd*=?iTfQUE6i{n3y_ZLHYfSsLZrQtM;?~>=lP2cp
zZJD&+Zkl2fg~H$DnFyIo)SC_;81p{Z>NzhAT+9I-LiU`uRvJYUJ*0ofR?+m*Z$%KJ
zS#Dk|n>vQ>ly$JtZ?t2lo5E(o>6{YUr)<Im`TJij)DwS9E!>#qzCHQMX9p{G7p=e?
z2^as3DKt7Qr&ssmqt35cyXeVhgKGwis?J#GcR}>97ELyZzG9>GyVs5!vYDE+k2M~U
zTbitid8fYndGE0^FKw-?e%3BeG)$_QG;Ms4InlThcAoU~Tc<_8K-2y9s4CrEYmS+O
zU2X}w_{SBvYob|8-XWh5JG{()O`Oo1<!NHB(D9GN<C>4eT&s8-ggve|ud3N+GrhcO
zlkF`L4e$99sk3Y4)~QE=%+T<E)tcn_*5ljPtzK!*-lLl}XU3c<K~=TSZdD9&G7R$h
z^}BYf23cS?@43cC%)-G((Jc0ZX^<`0B#-ob0Ebd1OyYzvnPxs<GhH21%T1YL))hYA
zb6zuF%(8mUU#UM2>)WKAtlHW0n^Ze1vzs<7U$JFd;JYIZ_3Sl#%z(lb<r}94n`YZA
z%(U_$q4$&uJ#^x*$!!!fO>)hu8c+By?SujT@QBfJ&@|3C&uE%pTw_`z@6!FKUoCd&
zOb1=t^Or#|{`E^tKXnuulN>Id5aD8pPPXXfaCwQ&RHyBz|4CSN<~g4ZsS)EoHC;@)
z_}$lu7vW)Bn3m2IexCa`LK!=c8=5ff-bWYT7mVg^o$1mGufM<SxrK9|2}U=#wiek;
zHDW!2s(XND$V0!1SATsg$9T*WgF)GIx-?mL3W46Ub2^)>+il;7$G_pbE{SHBG-8yg
z$Y{RCV`ecSag)#-F_PYbpwEB*oNxb5H2+2;vP?oZy;hXhwh&Vwd)=G*-J<DkxhXOx
z#6F7`Ei%1m`<U#&`rYxPXF+xz$X@&WRJ$lPY+kixg-Kp42MEnoCN$i%;1`dZpYu%A
zcn+D)F1MM=jWiJ~Ql<lhq4SRIJhtl?H+?N0y~suN&zf~681)Ggr&9%N7(dMLr~*5x
z95NnPjtj9HjZI~o!C=e#IXbMSvzN7uFXU{Ma?ZUGTgrMow#58<(lKL#jW)coKfR07
z&NMdcvDb_(cI-gE!RZVNThQ-tIxs!W>A3VG9GG(UF{k6svz!h(vH$)BPBb|leWG*s
zT#o0W=<%m2Mn@vp1>ejV_V@2&c<O=<Qt;m+%8AD^#vkT*kP0U}IMBfP297UqQb7k7
z4>9`KK28yE=&(dNN}WIl_;g0$#OVabBUfw+r=y;o%7OHw43A6U=_@*@EMa&=1W$Qk
zcN%9MbbRrZa%hv!ILMr&VUszl=6FzqcK7!v=l6Sc>_tw8Gp}$u8p7$u3@w|h#XdHF
zhI4Qa`|Qs#zJ>8+8ortyXyI!ZUnlYHjBnt4GsA%f$N%-<J;t{&zLWDk4FBT@zL)W%
zbWXxQqEk5>R`3Hl{xY44;2;A3HwpfVo_|6I8vK+7$94Q0I<VvKYdHR=02dfP$M{!_
zpJn_a<DW79DdXoE|D5q37_XD~CC0yI{97hzndHa#cU&?sewpEa^uRrg|HyEjCm9*P
z!uZdO|DxkpwK&Pc0iVPfP7frBOFAz3Gs(oHrcCO{r1nf|!Xz^u3}R9<E`>Ac4kmSB
zQVYG*3nzaXDUwNcofO8Tu1xB{q;5>=#BmBJMKGy1lcJdv#iSS}#W6fqBz0#}A9}7x
zif2+H4pKEz7L)oiDVa%kF{vMu`ZN50Af&sQl)&&m29c7ORLZ0jCJkiL045D$QYw=M
zGie-?(lq$LgWxeEDO)Rz;?e{r6*FlJlSVUXER!mkG@eP5nUu>U7nAa}QWcX*xa8*2
zBqo({sfI}v_<u&x8d}Trko$UQa~=B$5A-z0<1J5P9etSpAtm9o;E2Xw6R(+oJ^$yi
zcD|_jw|26Q>$>XR*ZoUx!%BFg{-pjB?3iEF%Z5RQD#L4jv3^B<Z~1q^YV|W?Pvc<Y
zBI6e0YsNZLtmzxmFHJ@@nbhRrCQmhavB{|>=bC)m<o70jH8nIXZt8A2ujyfPl)1lo
zxOudBqWKx~dh>bn_vYW5nVW?*i*M#^Hm%u$W-FTg+Fai}y7^trM>nr(KBxJ-=Bt`-
zZodBx(;fCZI^Qwrj+gHE@Qxo^m|C=Lk=<fqi+wF#ZSlUPgXJ#EBFlcu+bz4bT+(uL
z%QstIvNpAbSbJCpS*xtiSx*GC3FsWqJ0K;%8Bi54C*bjby#Z$fz6tp4PJXBT&c1hM
z-#O{d*>`Tb^L(pTtx8*+YhBs;@z%!!`vlGlJRKAi)FG&M(Da}MK~J@5+2*b`g>4>d
z^L3kVZG&yIY^!a*2lowL8GIu6Wbn^+hkc&?nEf;RpLlR?s$-kulMo)#E+h_*%gqeA
z96BxZvCze#heJOI{Veo{woz^K+fHx0vhC`2QSIW}Wwl$_Zfm<g+Z)>7**>bhyZwXh
zSGPaV{^RyPw!a#t4+{(H8Wtax9#$My6E-L8@vvoKo5EfVJ0A8?*uTR5?9i%1`wqi9
z<aapR;arC+9b0tl)G@o`rcSY)26h_T$=&JsPJ24N(&?Q}=Q?>h2Xt=NIkxkd&QEk+
z+S${kX_t0g61z<3GOf!KUET^$2_G9iDg6HM)#0y%e;?r&5g9QwqB>%6#I}g~$ZnB2
zk?zO^k<Uc#ihMKj&#08Bf~dl%s;JpfYogwX`XuU7lpNhG+7{hCIwyK&^y27^(XU6J
zkN!DE9}^lA7n2!N9<wOsNX(g-Ut+t&&Wzn2douR3Sh;Jfu3=rfc8%|v-nFRf^Ii9K
zeY5MOZnka_-4eSE?KZw!S-0uk{_0-aeO32U-Rpbw?~&bOVULYH&h+%}nccIx=dzxA
zdw$UK*IuoA_31US*OXq5_4=xJNbjiL1A33?UD10^?<ae2?tQrT$G!g@*DS70Ty)%B
zaXE4Mans|TiaQYZLfngShvUAByV|FDpO`+$eP;Hl@B3swso(H^Bm2G9?~l8B-!<p1
zQ~mq*U)cY_{!heriN7m8K7Leub^Lwto8nI=v`L6b7@jaK;i-gO2_Ga}Ow=W|OH5C6
zCf=90KJj?s#iZDzjHDGwmy_>Go{(Ig{CKiR2~J5&S(Wm7O8o%)0QZ1523#CiFz~T~
zFQwj@T9djw_3hL@2lXBF<e>8z4`nv1Z*A^v8-&G_cmNB`$SV)kZZ}#!6FX;GMfVTI
z9U@wUO%SajKD8fwG41uN%+afdKArMNYs;nfhV2h-nYZcwabsG&nfdw~yC-fQ@zl`P
zo8049-V-ESI=7cw+by5TfrvkXf`wK)XvC4zA02+_?bC-x#t#@dVxZl;+Bn{(sSEH-
z5C-`>F-9+ff7OXQ4RUa(PArj|$UhnejL^w<8s0skGs{<3)$nr_wsQdp&fnG_Kd2Kr
z!_aX$@sbj=%NGno$LnOB;rIcaxzH%&tBXTzZ~eKvozXnWC|>Y<5NbPFU)RBAKA3D1
zTM^ERsaF?=*`oi7u*P8jN_6mi5N4CR{1qE+d}>t<miT(?Qs_mCT7-++X|WxEP{1zw
z>qWn}h5zM0GO)x>w9EZPi>Hm^aDDcE<G6b&hTUa14<tUm1wIa~<sSgm!U~%>vC}BG
z%qglVbJ@jQb%}8aE7MnWBHd87c8B}bps7M@9W(KO?O@QEJ%b}V<mV*X%}Z^FqYiua
zYCN5Y7<ulWi>>{Qn{DDOQ6opye_$P86Pky<j;j&BT@*=A8a<gmTbQM=@v>*Lvg+Bb
zE_y6m5|0|hclB4Sna0z!zUW%>eVr#24gJ1B!vT#OKBP2U;%)d48hVP+@Eg6Q%Y|bG
z%R_ZJVo9vQ(&c%h<)PKK`nao)pW&x|(46vQT7U4w_190GHRb*ZL1<<c8NQ(e`|4k{
zM)Bo0mgTeVwOLlo+OTZR)?K}fxEy1%jGa{|@9k;B#r{9X&_MlW(MZc@(NJ9txRi_J
zO}aEupcHC5>3^i~6?;{wUu`maQn9=^`pI&vcsDLvy=`aUTccj>HDH7@y(;*NQr+`U
zJp0^+p!LsAb=S<8GSNP<hu-pC<5lMJy-yg;@)}R(%Qg_;TbONle*ap(<6B->|ABYy
zJt9$Ad+%Jba;3WVu5jJ=xKX|=SO0rEudA@td8D;Q&v@)3{k2^y{FR(}0j-Xeu=AYQ
zV|Cfg3;ytw@lQQv8gW`YV-*o{#QF1b1j6e`5z(Vgj*ug96%p54gd-mzhkxEfXNHZ+
zKg|?fJ#W;uI3;?@A&8VuLqUgGU)OICFY1I__LtoTOWle3h1P>RckDk<xMSRylA`ew
zwiO++o8>W{u3{HIC@yIZUd^;FvmFmuW;4GEO&|P|i1<mw)$)CwUo@h5z!h{iSSJGX
z74l%+&&tK!wr78$jn*}^`q${6Q7)brak?=5WI0YJ2k6%+7cRQc=<n^QyW8fLBdCdz
z7ydt4m9_zTDmLeZi&0%`*3@_|i=lC~t7=<(ESl{S{@7%(VA;N4mbgD0yL6W9Szj4`
zUViqB@DCK7WW)Z59l-<EWvx0A_`=rbUpc;GQvP$ng6+^*y3DG5@1A3EEBq{7XMHC7
z8_+`^L)+S{ySoR<t$r!^ra1V+inm<@0@Egx3?4l4z^Te$S(B%;beOd%=B>1EYyHe(
z;$oxaNPnB<^SW{0KV}TJ9O-eOi)a@7FYTD>9WUE0pC4Ma`^6X56pg~2G1d8Fg3TYp
z$otlK>VIf4*O(7mZ!R>mg~75{tet7Cdw27ZBX*1Hc#=*;=w-X;v+3}%cOE|3dZKai
z{PNk8gCm7jXW4pc&(Xtmfj=a?)v426L)&Gq%zr5}*s{0JgoL4vK)GpMU(q7ivi0Cq
zKkK%Q?s2&l<#|>1vK_81+XHv5TeBm$wEk(UWpA2u=do9I?s#>ZUEC>mN2etvc{QVh
z%=PU_+7H#XI4Ig$CXm1_s~~Q9!(!We!l)5BasX{u7roR|bP*E+#l(xE*S^ESvY&on
zpH#VvJStGW=cL@`WS?NAjp&a?FRN`%o;!(^(mjD<RI2DQ@Eo<-H|nC?OP&}gPwXLg
zE*=$Zj=07@qXqKiSxlaQm0PJ`mI-37$6|fI%NK9xEUS_(jox(P;or7Tyb@9}ZsPKz
zI^icX+0U?i#P}_aZ92<@iS1GA_u}IZjxI~;{Kb$nKP)@0BRhJ@2n!NPSkxzp6exU(
zoQ&OyWO;z_*PH9xF0J9aMR(0EnOWm(=6SaIu$c>tGp%DmdW*%jdp%ET?j<Uk=smWp
z7j#b>%`0bOc|BL?;i=7HxoD~p=P>Dwc}0vAaUvm0WXhxD(K+%6Y;fHDnw%v@VP4R-
zE61GJOf*?9TK@LyM!7luOck;<6joM?wfTl`qeQ<JqMc}B*(us#+PIn-p|_mQti5OI
zfFR4xD4{W!YaYV#x(4HVdSTF00iG$~z<2uP?;L&MyO;fbI`;m{!W1Zs-7m^*Whpu%
zx)7RvkM8K2y<6W2dUL-sCw+KvcDY?{l`Q+ok~}8RJPCw|TtKqWxA3$P=FY-w`A!@H
zHEpk)6^?VGUmf(k-SYEmn>WAmcHkeeU&vNj>X+3W9ZR{o-K(~3IUe-pwxVGpoW(=!
z=`td3%XeRFACo;`c*%gA5$oQaWS6D!x{iD51`BhL`C0gl&O-8})p8GxJ2W0^fG~>A
zUkRzJCrxgpm;YT~uIumdGYCm5PtuD?Vz16zMkr!C1DrNsWi%4Ye!pw%6C_~!dLSAl
zbU#2Jo5Twycey8j#<X(#QW35bdxfFCt-eOSB21%nn>K7){$kL32lC?kWRB>Xkh^yE
zMEigUUFpu##X<@)SI{6}tXNaaPr)o7rOw|%=V6z>6@j8n<hOD_=J?v`$@X2M*&oLR
zU*;$D26@vsL>mL-sey9D1?;`Y1w+h<!}q>_=IFjNXO8A3CJoQSgxm$v{Y?0AkwCpB
z1c;{kheh}i0W3v=pYW@nEc=P?4RQ-PIZf{WfIQ33JYy!jLk%K=-a>-kHb)|g7$urS
ziKdoc#3|s_<<d98dSUeIDO>H9ONTe?I&?blj~<`MfpTEayBx{8#vHB)w)~Pjam>)3
zfwJ{dwCEgcx#St9%`Dh?=*8VzPn_5@arBt{!c4p67x^1){KyyHe)HwSAAa!4sKKej
z#wOT_AO2vhzo-D-FG6b{6=scy!@x_Q#CBD(SP>|q?uPQ+Er+#_mD|XUOWj1^$%Cuc
ztO+iWBirV+o$n{CVx6`B=soYheR$tTAHJNMntV?l0v#9^BEumIjN&{jO#YV^W>z1z
zv_^cJW84KR#GvP`2X|oOwrKmfaq7nHL3^M2R4Yy;PVRc;%x8gbIJb<?EyStBhRSVo
zgJ<Uz<>6Gq{DSQl*r-8123`Sl$k$Jlvvr*fZ~=pb?t9;C>IuSZDu1ZOl=^}Vhas0x
zPvFd?i9sBLJdepHo!r!5mhS|jp0PsHVx{nZUUY*?_IDdCmqeP#T5DXdhd=8xPxKBH
zI_%jxWLuYRa+hE@lymzIeRyiSb0p6F<UWtf8G)AHPRP^9n~32vzdrYE%mp#_)4tz+
z@pX&We?0eti2PJY-&hVD_4J-;-L>P9MceJ`F6(AZm@sdAkld@?cW@{@v72fZy+qdw
z5wfw<n3S<I=P!Qt=|!8D?6Yqb@j7^kcaP33(ruYmx-2(H)+B_4wL3AO?%=Lvd)L{~
zvGa+YQ#S_*&DXz+FwtASQv}I*`0Fi4$rZ92Q)CNKY`1)T)Fqy^I;%DxI<@QQvE8f7
z#^w~KWg#v#@|{;(YCJCnv^Bo)5VUe6pg)*WWfZGLQ}P$T)nTT<M)oTP5r0xhmrhMO
z-D{KG;(24!hGQoJzt8zr?iV~=-fopUqhUY&g=OROMivzJv0HxICBJT!Gtp&Nz2NIc
zj+o#c)f)k<vWW<5pNl!?_nFpCHaf-flsBAUDdUYaK3)Gg4z4`q!;Cc#^;Opd;kJQr
zGRMKOepFqJzmMZMNhcShs1AGEBlYGNXO<e#yLca3onkW|GKw9wyzU5XS9_KO%(Xpg
z<g|1DbpQ@WQWn`b_WKd}KQgn2?c{7@ooM2;`PLxYZ6f}OnyrJ4;D;v!zI)2m!T{_s
z`y1rc`lz|n=1!SEz4iR(=B}8#OdjZoY9%+N9e<CXe%%9m9#|3lMCH>Hmsa^%4vM?#
zTZ+3pEuLKW^tLC~w|-#C1Np8%%anRQgZbQS<6}0>RsVp_HuL47gtv08Lg!Ep+asWM
zIs6tD9gSBU%W1{Y_Z?xp{71Tw<OI8XKrar<AMQ7fzo#MxR!B!QF*Tkm!hleO`m-FQ
z4)<<fymX7*GUaf>*RPK`t^4TAW}*2#@W%7_V9P=8k$mv&j^s1$O>mC3kNhMm<48Z<
z!kIH3xG%^|+vwgs^tyluqqzz$SD8a01Z=*;y}U6KtFEF|Zku_8jh}-waOME<x3%q=
zZQSnpStGV!4W}0iu4XE`(b4r~^QX;q&#!7dZ|&SQ^Owmnp0ZZ56?^67vyFSMK8;=A
zfcD0nvyBHmXEmPb0m81ACyT$ps&8~M@;13zwux%Wi#+)od9wVM4t3y^AJ&-<&Niyc
zy{!Q;#-%n+>#4&5{f!50mn&?SDH@oEm0WY|4<m+?=ivmw8!33qYN$}}4HXXBL@zAm
zwxRUu1$mx~pzlwHsUNfXg2lEsJr8O;L&c9)%n9-Yk46`%mvieiI$Yu?z6`6BKsot)
z90okDnJ*_>J&%81k7J2PZLf+$8ZpE3L6ps$U_`j4C;*mX_j;s&b~ux5udK^ETo!Nb
zw29+z+pW%jkLN1-biFJ$A6{5fjs@i-SWphvS*H9MgCj)C!QF<^b=zuR3Azs}%5f8y
zZK<(~62qEjx37OG=>0u8VO^XVm==5oJNz)&!{(XRF4xBqn#ne(@v}3nuk2jDc`bD4
zJ{&U0cU|Zttij8Lc7`p(#@)shFzMY;T%)`jvtq=RAAjM3gFnbyh4zZ9J+2>YGtaas
zoh_EfSZCQRpLixvcz&>xF&k~7u_OOco>B8rK)x~4R(}1!vd(*8DTn^K!)iI*!`S~G
zBmbzvmX9dTw+B!LA3UYlh7*Iqm}UT$m#+4tje$?~qFvn4kknz-qe_BbsvNr}J!trZ
z+JbUyL>y8M8V?vOFP-1D`}phY3;G1hFQCZ*!}*=NPbk;s>|)z2Q0oZ_m;iJ~ff3Id
z>FBw{hTV`*qq0Zx)=wQFi<4N=TXG6%NpJaNH;$Ues0;c`&{wv0r~6pYG+NS^9I(9*
zbY{1*q))Q@_(9Cwv3m15yF3rAj_NF*Tn$q=Q()NaDp@%^NVazGEcaKQn`mZVhK>^R
zk6r$5&zolsY@Ir3m0d12xTjC7yeG)qa2kZ8pq(ED^fp>fA4OMYxzo%m;`1x~6?jkt
zRvIy9CN@9hhiCpKPG8}_LsHc<t^0N?d3K}yncsB1Y;oI1eI9Ja!vHPb!#R2Yc<EV!
z0Q->Ma<GHZ903um^UTnQVmw!(7a1O$BboHFMm{rd`hxowOmDs5x%tn`e-5$unO3-A
z_8nffprgx5kr)sS?7A5Hp_{GfW@~^5(w`U2mp-?2+2W^LKR)A$X-lVHkejzcv791S
zAX<7rCkN@1+s>Lkd)nL?t>-;G>$zFWQhsfPLeWcpKxgh#P8dC`5yA5CaHD$c#OcuK
zSik_A{EV3Mn@3yAg${&%0h9gBkn(8Bo_7OJ8|un-jd(iv<)=4q{|Z;{ZrgqOvEbhf
za_a@%`pc1l>4pi@$|eT8L)YlHE-N2zA7YRrzr0JdUWk>@Wjvd&Tcs@X>&<J8$YY&v
zZWyawg>4V{jMk5S^@)fKe8X^H`Nl25tADH3Pnx=Ezx|{^M0WjHZv9wrsNwX2?F9n@
zQw&`<6(5-qJYq(fvj?sQ6z8X4patS7(T{(6Q5?Fc@x+Lyte1D4t1<S8wO`b4dF;8h
zTVFYvT^EG;{Cm-ci;*rE;<BsHh1jnA`JA<_@!YDZM$hukxS0O==XIK$0m7m`M$7h1
z`eRsnixzr$&ec108`dn}wmb0j&|@hnSve^M%Stx5gFicBt(v-G-MZz=*REMH)#aKp
z#cl6UpJF{L3Ljtb<mSbzS}&?uTKf2uPvpW@=A}!GCu%&uDs#IS^)HRMgcH;W#<jbC
zd+ObjyDql=pC3l*^^Tk@a;Dga4UDucv{4wK9Mx*Xc-p3upT<62xNWcTU*C-Xrp046
z#K8X_Z{GnQwXys!`FwY_&KU4<esJdQOfLZfgb+#~^j;h=5L#%an_gTnwy}+SFI1b}
ztLdEt0)!IMAcPJfkU;Pw^pztU|G%@kb4htG@4esWul;Bwt+r`2J3Bi&yW1~+Srd!#
zW<%W1vap_o%S>vsdY)B9OSpQbv<7XVV0^<i5OR#)zFoKx&Fmlxu;y`txkb*DqR`3<
z5CfO+0M98v4NG?ktv6JG#?TXm(@kK($7_+_N@CH*P`0_0r|c|Wt|l2n?-g3@0Xs;P
zJGl7hnNkO)BW=bJf%TDZqW~e{(FM0D+|lq_mJZT6`Va@dKf-?NBN-3iTaL`K80Tda
z+@gR-DBRv#_ij?SsJnOW_^C-A3ujy9v+pA3cJ~U+JnMF~EVUO&pU*{i(wTTV^TaP%
zhF`MWlKWG}+2b1?R{7h;T5nx?i@5~be7n+*=q*8X20FqDL%{3tbb=7U-m^c-20}q$
zeP?f}uLa*8Xc;wA8pvFL*Vk+S|L#X`7yN>#(Ux_TPUFJqWP=iIVU>779>veIDJ7pm
zE4>~<wCyp2Rh`IOC$g$Y?d3k6*hA&5g4+}VjG8bAX1!lF0CzipyZy5)%Yiv??knKj
z`<F@WE$nT|G_)|JIz4>iC_6pL5@i@)Sid^w@VxLNXG$ZFQ_sMc=k~l&!7u7t$_qO2
zJXt_qcA9Hl@Tj`<zJ)d7<P!3LzJ&PYQSeK6^URDPET^o$?8=EI<QaXbBRJSDeegHT
zwdYLfLzG}Y>(5INltrIQ!44tS-txP<EsC~C@DIn#e&Z%~U+!dLVu<z})9Q@5y>-Uv
z>m=i*t(L6?)3qmbTjc4GI|Ai_FIdf&;yUJpj*b&5lswS%>$Pi7er@x8ox1OTP^a$o
zHcxCXoc*S5-Me?w=H0tDO&L9U>SWkCKuGX|^~Y!;sC~>?!^T7YaDJk@vE;MkYwv=d
zDwi1lJ>K_uiSgfzTfPU{F0PWNIM>wInck<NVl^wa&l^9TW_9-?1wivxYzotQykO;e
zp&$J8hNm3FbWk`bk99lu<{VBt=8~9^kda|#Z@tnPpDOR`=6n{ob(i_zwnH}`934G%
zyY&#$Xb<=7v#z0+(!4|Mngf=PSvJ{beAu_zJzZ2nWPF4*YVh1%182Ipdn<0tS$>I1
zagLQ^?MOIXsklLkx^@Bf20?qqZnNdCTe0J)`9<p;t+rY_Z|Joy*Sux(%EKqN&zif^
zdjDJP5x<_hkd3yvPql$-M(v$q^P4ks>`-%qOOr28w%(ZV)vOWb5q|TA^ct~k%}i_a
z4%!b7ULE&~*IC9)?``d~VwZXK^5vUStzXSLGkdgo?t*#2QD{h}v#~5!{G3F;(QK^g
z*2VMJu66&SWs6=t+O#>}>$c53MZSw7vsmVe0S^|d3|lLGs?DEuqp%+r7xI&oGkT?6
zUqz^1|AOMon#Izv!^(gcEc^xQ^upr{NHxC9wH3so;4dih32nZh&)b`O)@lqnwQc<1
z{(ch&*{0OktTP5b$o1*l_M<VwL&B0$LTtvv{hMfw!J+H7MeXxqhM#Y+ns<j@XbCAW
z<csy2PFyfEr}r*H=yg(r?n+0P(vAze&cbg!x^?Ng`1xJt`6H|H6S~ooQs<KCN7mw~
z?gym>Oj7EjcYAK-`cICSznFZ%+p4tJ{it*@J-Vgen>AzZtkBu8a-)>KxXV`D{en_@
z_7i*4PD=U0^xcu&=Qr9~Z`971Hz#niSD)$Mo;$PpyNla%LZ;=|uIFlx&Ka_=jh9k+
znBrEi`T@uvupee0<_kAOX8M8IeqaGVXrRB?f`?z2a6|d5H4}CD&dM()xm63jw=yGQ
z_JTFuY=*W)L8~9wd|lS;7s})pY;xvmtrDV#fR0vJbDwIsJFI+eqs2W<4Xy{(PBhd#
znC=m@c;CtX8ulscVS*W`P8q1%_ehK0hpx76_dTuRq4R5|RpJyK8>kxvrFa7c^S{Qo
z*0PE^_YIOL+t57<^c-OM1zp0^tb#0JwCVG(cP%nBQ&1emfD(4V^s3)9OFj&NOswkb
zyRdbx=Y3bPR>P>@aNBo7yPi@+FU3m{nk)5`x=d)!yqNgasqc>1Iv%?0^UABBA4JFw
z{SI8ccIv?8D<}JR-)-yR=i9%Xm)ys*-GI-&@Uvaqb@H<-Uf+E-qD|ZWBih^CW60bz
z1nO4wXjFA;eMp1#?dsP0=)Nh3l|g(k10gZEF&UZ#)&g2(y>j+BJBx8Vy}n?w@`1L2
zUb#;i8cLCeyMbWxWY$jm3j(kYw2EHO&el-Q*3>H7DB#Eh*16%Mi;q|lRL2X*AP6XV
zU}EE0kyfdyQ)(&8l-g{WRx#_?I0b&DhOAn5rJBwdh#QFCEvO$9c$?X9|46Z2WVT0o
z_fD1(WXy(fHc}04hH5E+Sv4#TEN#?P)|z!;bDJ<vC2);xs-k%o{m)@*6^|-OVTtn-
z=ez8f;<vUvMl=<dhA<PXdcQR@+hAB`>Naxs#cxl1di~q|<GXhB9SDs_u;L8`hk`FX
zC~wysRJ={{c4#U*bu5H^gL;2l%NU*$6+y>lLO~U-e6MwX$ZPupRN9NvEONHuy;jP<
zS#Y56CjPoVhC1Chg}q?MSviq4MCmIbOeRG49VEIhd!Y@PIuoYDlf%h$IEm?5xq>rF
zxd+|!&_NFB;b(o)M$5{7mBXsBPUelQlCoCcYWv{3U_xUR?`Qc{pNXsySWJDC^z7$r
z{%Mnc(63v<tyDv|TOV;N)lpu(`@%}K;I4i~XvnnSfaE3Ptqt|_wr`KzhyKSPw*DRy
z?q2>u+>yr`Kh{87yVLZTt$|g3lbnv-d;?~Tvu<jwUB7+T(!*ZI*Uueb3(_x{F*$v_
zSDRKN>%aZQ&|61ySFT)XYj)T)V&<x?dvcfUTel@DVwJ7GJ}}TfcpS25!`44ysSm|H
zPgvh48Ws{PJ#zM$c=+1&?MKd>*)jC}HWP;V*xZ{*`_vBfV5VCk8E>=MVQnD2ZN=>r
z$#{G>uG43Yn=_2e3z??XO*H3M<>m6q5$Nw7!2L#a_99outlwm2VV=gT8}OJhCuPPI
zGxUebFs6}*!4Q+VZc_D!htWvCWJ_fY>|1xjzEw3%9kqS@A*gW|6kI?xeSD8Ku%U<0
za`f=_Jtyq?#0v6j9mRai8x_~-dT1?LrztJWithVn%p3pXi7c>p_|Tp=(*Bgyk_Bi_
zcS3s#+u8BsM~>J@X|Fn6aMr|T>!)GJudi;Zazu+kKld2K)rxXwkVa?La;?O^fWlPE
zUg_Msk=7(!BX5VMZHc5bD%kWk>qb0@^-`W{e?j+U5sV3`^X@UtvR{ccG4tk&U$H7?
zxh2y+SG1?~Fk0S}y(%_zhxL~|QtJ*iFBkOCcN^<peKvJe-ePSIv$n;36`<qST{q`S
zt*EcEEoJ!{wXdT1JC}4}O1#~7ka6Sf0CBxss9EnR7wVK`QVF@}-hrfyF_!%FRhjG4
z)>cWKl{Gy*fR$JBE4v?*Hp|iIQud&pjWKr>*rbwaqJB-Wfg|0+z!5>0QP5@fkkVIb
zKyc<v1V#@QSl|Jf9L8!xQCOdKQ%?<p4tKhR-S)Ht^tNCr$n~c#`DqY<^U)uvA$3#x
zBk(uAl)Lc`Ngf2zm*|k_(IKfJLCwbneY<MzcfFSP3pb!k!cIbkSMz-d7M<w0uzk#6
zoGVZ9l)FIH`4!sn7Pz*6%JUEyN8@OnaYvT_q;%+qgWB+MDf^@v<J?_aQy1^F8Fy6s
zr-`Q5{DZl?KE%A4<<R!|v)9`Sn(Jpyn>ZiVwHTv>^{6w`<h@{;n$JC!SeOecOaR$?
zTsgDh=w934JzvbY?Da8vBnzb&8~druB!CV*rVk!tJwDoJeLF9uMq^Cxuo(kj{#%#T
zu(D8g*<_q{BkkDM^Io4Go!BPTRxncWGj$q%IuD`9boBDUz8J!oMpmUDdK+2D9+PdF
zV`L#~dsbl6xu;u{_tQ|--u-5*#O8VK%iVHh@3i$3(`}i%b{@!CK5Sd%K7Iq*w=wtG
zHTeLNKv<0VeM7^3@+ea)iqcBLSRj%Zt6uq#Ab;l`^CR;<!?b6ZO+>?5Q^UTJN0|0(
z-Lh-<<Sk=H`(ygz7XQ6AB}{3Drj3OuU(n0lj+dCyu-E23C39~6gaGIoA~Y;340Z}^
zID4bu)Hc>BACvAefsHe<3d%SLO5>FBY#i5CK)@H73keUsNO(}@6|QO^9c;}7f7X>%
zoxlte)UFOo;2qM3N(1!hn@Dq{L~6P855IZ{RU*VfH;A!v#V}LerDInP+TJ>&9WliZ
zx}a`j4t*VLW3_a<A8M7My7(mtISE+_=?NK&-D<Hpx?S*1)?Hq)_tf_oLY(Tq({_M~
z+QU8iF7NH7H2DBy9F=C+2I~A8X>aJ_!xADAA`=!Qgv@uVHCi|3ZS6z6UiVFH)(HIg
zJhV8Q*;b8O2UkHdBA;dO;Z<#w<Q~jbg5SVkTl3t5iD=pSVkSbK9KdHHC|N)+*AeQB
z*H7zvTG$ZJW)_`$M2R91F+K(}Yd6ILj4mprQ0$G42wT1z%vny^2Y={i#QB+zp+S41
zkI1w4h0qZ?h>p<Jtrl%vea2gguoPCv&Z-r12dz>OsaMoTT&B<%v102mgtcy<<@dwK
z%KPeYGAAuQqD-V^ahG4DNoW4atpB9${U-v<20983y8%Hp958<NsciA&(^vQ#?rSTs
zJTk46@M5J@il6k$Ppc-efrU4~E=trM^4sLCEPyvgLLAJ81&}g?_2A5h0$)L|ah5b<
zro=nkL3X;i1-fZaT8Hul@vI?Sh2m$~Olh=y)3A@l&%z=po4$oN`e3Mpx}f1ih;HLm
zLOfMMhdgjgO6EDm^tG@BluX#0mf&E%7I_$@Q~0y9w*@TkgfAvA@Uac{CO;kAvgeyt
z2-Zbn3n|hRM5=)&xsN>(e{kk}^*#P>h!ko0p3_9KWu;tQ!_HEtnI!OAq&C?syBk-r
z<LHWy1h-u^%i<m{;oZ0Q#Vt9gU(@7oYxBS)uA_;nN?x}caj*4Ir-(m8mqLE)-zC3A
zlE@OEE*Zx)SUXQ^d+9ngBi%=`Wrdukfj0W`J0$%p(O-#AA>hnLxHH>}=L*b^4B~SI
z4s1L5Q?9LruKBb<gSux+=sNI{Zz5YQ_p~2SgIA-CzKPn)=U`m^!F2S%;#E6s-*mov
zx5Fjvik(^ekC+dI?+@N#y>#iFdtJL~SC1dDXsFlV5n*%2+q!(+{JrnmYlFszj~;3s
zmN_bCg0*AEAK&@vYwg^f`@@fVF|Bi_p{K51J96sV%ZK~5X*;YRwEPP}IZq$+VL#@Z
zzq+4=DQ`rOSqJIs$Hls*<7k8L_aog_YGEh49;=&l8wT)g2$}i$DYc0_Q+T}N_bFc2
zN0^1C^L|7X;4mqpfN$e`;a<VF6#tk|%W?zAVuJ>wchl{$Mm`xQo%`~_HJh@8ns?}p
zmlpbH%PJ<@PaQqf$K2!S=*w2+gq*;Yjw`b^rmd-xIy-AxMgUhjHl<XXKkq!31^oK(
zIhEv>$ID44X1pVpi?`T}$4;C&aXH7zZt4H-^iJcgQu8~<=#6)<#>B9`*%JIKvLF6x
zwr6pLl$(-e9x#^%^gvCBo?>-EWi8m|sk*}r5{&qGA5X48#9y!r)o_4ipY-WE3#tE9
zY4r}fN_|Wvx-bMn>n9Le??7n%1VZZ_yU@Dc!lEg@KPpH)%UlbqOA$yd_m*Y7rMN25
zD_KLe1xmTMERGRaXtyxj_>`)`tNi7Sq{5BP^(>A-AbJTE&t7`Fg(^zHFNlgn8_~y|
zF3eFg{E@!xbirL@=orRTXVcJJL>XccY!ch`!1!_L@!S`Dik{sba)yOr8iw(BsllaC
z3@#nF4=%}r@+S<G3OW}&4YjEDs2KO!#xzGCVG!x493khL&Ohq)Bc>n?)J{;!HN>E`
ze&eihD+hQf<(t-n%-8sKedZXo3c*wo4D~3Jex+$f*Y4~)`R&o|GiEQfDLow1jEI5W
ze2lSW)`TiYN7Ri57~J~$v3+=}9Mucfvd{<WOA34bK6q`X9F^Bzp?YDI!J$)ltmF3s
zEnRY?R(9RzZeAzy3vNR*YG>3VEJq2$R|x-zMl71^Op)7hR&_UX!GM|_`-nrN-hsx#
ze?kR%FWz$e<dvUn>mUmLVg4+}p}*60oi=KS54cWiwTiTy%VyC$z(7mJV~om@KK2ef
zrbPFX&V91^)2+7cE4Qy&yQ%&6m4{f2w<1Z%`&pN~CUK)<rl(S)Q61PkHN9DfnHRw7
z?Zc^)M-DO@@ANn_`a7%fSa^PYlPcaRb9Jh;2a_g;%3dzdX`w4BMFUbGKXwp~w?yOh
zlPr9=zPQO~YzebqDii<5Mxxx&g+I|~;Z1e4@Mt|A3!EoPiq3&@*`3-tS;O(4U%1?v
z;uH4!Jc2okYc+5s<34tn@IM+dxbb?pMNR0invhx*Fgv>HMUtbO>376K^-sy*U7+O*
ztGWz5u;WMrbzwAQ^s;G0OB?+qlGL@V+69y*w2Q@82{Y}Pp*6m#52bt?i4yV(#Mo}N
zB|M=c)1*<qPv$V0D%@p_9o7o{sV!s;(cVW{?4zSB+E=0hQrSfBlo@z8Mmj9r2N7u5
zKo4%_04!yAVv=_9T^-cc+U9!W&6|orZ_H~26(QZb(LH%9+PekGXninEPLI|?Idh-p
z%TZPyOmp~=eJB>9(MH|%LmN+@*gLtcRauYc+yv=0vpiBPKVqPHfOg`C4NpTcruKYb
zTmdVyAl~!2injRSEQ?|*T-L`jM17B$S$IDQEw$sVwcr-%?~|!vBGZfzs(LTqh!o}N
z<4DUCs&uakJE?)t42^xXow;pC`&^&?c;CVl3JL##kI)<634bs8)jkE^QViuDZ+KwE
zF(+>sAKsCl64gUFeDdhAA68jm(SfO&dZXNB>d2u~VG5jijG>s}Y4aGDmjXHUC948C
zb@vv`W%l3VH&&g?yvt_%ZCK$2O6vK+9VheFTjh)u7QOMePSkQyd(Y*kTdXQ3Dbl#o
zQxq7a1+8@9@;(+H61K)ry@)GJ>tn(AhcDHN_=3w+Y_<?xz?LXAFd~mb2T(8ulFbUF
z+=+$5np@toPv?!Wuxh-3>Xcr#+7t77e^GAoiM^~(;Y3q&X)0u=C}k4vx*WA|dlz{z
zr=QM+KR37RvoJo;g2DBdrGl`d)V3%ezG+E8_(+Y?;Y}BWIGZZv`@jhPGOIS$;)kIe
z(0P5Sjr2jPBxeMCB4x8`#;0Q}7_3e(8D;*`__U4G3_Svj*~>;x%o<iYu*(>PhGmwg
z4gn`>*+f1TUqk=(9W4xSPz}I^bEyao-!$B2p<({~SYHXs@67zz+LlglYMKHp?p>m#
zJ(#U|3#Hk^s=*>?yu>=b>FOwvlAkK^2?A3rDQ{{!d>yH?kL}1u^21lnO|#s96+hEx
zZcMSTn+FHNJSYLmvnH@;TSq4UbyzbsgI^2U4YVksu+E7@ftc%Qyr4K4<iA(?!Ix}$
z*oypg$mKKMG@?OBj7@=`VQA_oYekLpZHyUWQ0gWIrH(F>Zg7N(m@ImmRl5cA3vLjk
zOa=bzsO_(GWL{@yU?q)>tlDPOpzEqV!Y@eR`b0@-T##!r-d0h4y^VCEvjs(v->2_m
zm%(()7U31q8EXiEq@)bYHo=1V2_EPfW8(jDwc{)wEEomV(U&@!VPB7C*iW_^ZzIp+
zclK^OcP4kjdse#%liV7LqN7=7RvbR+viCsNnX~5ne(DkuNplkC{pk`C%i`C>EwyF@
zFAB^IVOt7XSN7F+pEy+!p+&OWT(Gl9^l;XxoWsXl_U_L(^SPOQn*hFn0vyCg-_iG&
zFs&Mbqkn-G+R?xGn2WV7-;_iDg7kV{KZdD>8*jK<6#7&r1&pKRi00$LdG?m$Ia&@i
z3bh@bbEHmS)p=|eZ?~Vv7u>Ecp_6kyKkXgMC`drw7K|STP)}e~!CiW#;+upc{^}RP
z@+o=+HU22cp~q*Tyk33%rscc5c&%=NGN5_9Df{M6Hz~9}1<Wau20{sW6iUdOP(mIp
zQ9|B?67r~B2^nKyBY9d&AwR<EYALifTx9GC>VnnBRc`fhoRbdOXMM%0-Q&|%8cK>-
zSl&TfSd3*5^SWuDK@4?cHN^x9yUZ;|?o%4cg)2<Pt15NfZzIK6WG~*F_XlOE`F=*<
zs%Sw`#ra~w%^)h>v^Oo)2{#z!tZfM>41vwbIEhlICZ!kttiHqam1<IQVST)twMfck
z+PCM*uVA)J_G5J)#i2>P#ZIA<WxT!IvP*0HCo8w)$M2ZCnblQ14%FId?Xb4bs^jJ(
zxf{-3+~YqQ;yxw;{4lfa1;yP<sng<JOgm!Ee!ot%U7!B#%x>nMLnn3Y*#E$VsbuxP
zz1F?1OuL}UfbLr3?M9G&Vl7HNZpzT{nFmZ|9zTMCq475c@ylc^z~DI^o@QP={*(D>
zyWG~BtUjv-<ZSz^^<0{q8-IV2?ZS*t=Zz_|oXghX=cjzRpo(udt+4=k{x);v)}T+J
zN2v!%f^2js;}kG<<UE_3=?sK8Va!v1!R$8DEQC`{><C5sShZ6?Q3$uP^RWva1rR(!
z+DPLUNni7c{vOoH9Q(*9vt0U;mm?vnZa$)2FW;IjZPfK{t2MqvNo0I|;v(tP+zoT(
zcb<8?Vy-!lFz;(5MR~H^vU6$D`s8&PtFo%VLdbZtg{AxIk5A0E_UokL?xy`a#&epR
zZNb_J#VkxoM48Fbh!Sm&CSv-ZnH%+??|i6!=X8`FvIrI_Kz~W?BFmhkNlG_$u>yCc
zgWY(ExjqHwmb>QP94IN{3h(~Wj%hUb^>S#6#?hJw3&3RMV_5S5cH~)#o(+ap4y%ta
zNm&j{iRBP+oE6N|g3VL}GH`zO41*#X42lGoGLQ<HHa&8tx<Jc$zCO#dKdjPH3oEs}
zt5@x)23a1FqJrB#Lhse7w5<wheQQ`S<j;eE|L$i+5RmK^492-@NJ63^|NR*9A7p`?
z#FNo5pJHCeqd$G@fyhT8{89Hkgsmi@$zf42$a4EWnYm2Jk)Y3kJduZvAN5#>@A2q(
z4|{{gInujeeEV50XM91=NRD#Y8w|4SBI^?*vmP3g4LqG9q%#_}C)Wx;Rny@?kkS+c
znFUs&+PvhFa>eK${;Yth>1_+g*FXcbnmB3**k%n2j3kB;M>U4rBQeNP^h>-869>yt
z=62#S8e}((>=q{-*#7B_t+q!yzxtLnG0T6s$kR}wx2g-R={jF5A~;A@DY*CNX=2XK
zP}sLI*9VVDFuyI=P-Vlz2X>x(w87d7MbI0s*O7+kjkmi@88ZwD3F_~l*d<+IUhGH2
z0fF*nrOVBxcD9hUs$JX)hqzu#nrx9r5W7<b!AJ;3a0lO#io^9LjaLV-a~{k@#wnA*
z%*%$dOJ<4oU@VF={V}D&aTT)2a!9rO18MA(o9JBDk{mX8zd)_W#zI9H!Zvfw^B#<@
zAd{nSNyT#^Z*k?D37PQ8kO!$OYiTZ|BZS<ZSU41gJb>)PzsXj3w*hQw?XwiwRNg+F
zM<RTdqLr6)4oce9vd98WCCW%0V3ZLZ;GHPr2X?zX{%#n(TSZ+iWg-d)Bfd-E2d|zx
z=6uQ*bu<*UVs%XDR_o(E5_Eo@Ea}kN^05MR59D^H!`p(FjXfB-tIGEDjqCTCkBr+g
zYQ)&decF85{+yrHy`ZLCmtDtTdJD}Cx$bi4{)VX@vY>jfZpw9d7rLY0GhgvyULFd#
zt#OsILFH`5kzli{+DL`&umr%%19&MIKUJnpLt5|2MYmf#^!WT&*5nD;-8UEpeZsPI
ztWwtl9}FHFIC+-Un7g-5!F#{z@itL^amVVz`?k&KWp$r~QLrCryt@W$Vy-|9*$qZ9
zFK>IwA+RNQq1(JZdsF5%7uNKV4(f(_y7+Z5tD;uAuy^tNQW>m^%8tp-A={Wc4~~qU
zx<j>%>Cu;LV_LMYU2k?$AlY@u;~RdX%M3`LlQhfaorX7b5g$*TFfrK0U2YZji1m9k
z`62Ut=yB|c?Eg>Z^8_Dt8!UL8>Hf)mch}k)ZPNOM&6+*hYrw>#SFdhAb~<<M%qdy6
zU$$t!nLX$*^3k<#saO^3rIyUqHebm#z0~<h)pg9NZ~`U=UAe`enLExb?J%=Ok=nOV
zED$Rd%XclAgc)`|6AoX)>+3tzv0S{O;arUCGzfbsul-qMm6_|eV8$4zKYe2T-W|4y
zH?>n|O`Sj2Yx=ybLpEmAUpv8^?y%bCU%P+OtdY-P<sGZiMIRLIA3QBAw^8LqDa$jK
zq`TDDH~wV8*Ve81Zl-lv(}wq%_R+|(HcTLXxF~0x)m=V__CoXXH#E!~76ALghcwh|
zWZ}Qn4wjT%%6gOW*YNrl*@^*98hN(im1FeTidVeI@Kby-#3-A7E`afRGl_Ky`;O%n
z3EgQf-0g6z<naaOP2{nb8o3e74r<)K`0Ptt-(A{<eOixg;`Lsy9lNL6*f=>&&k`13
zfYM!Q>xDT<Z7`E14)*R%Fy+(7rgV@ynpiXap8coSeCPG;g(-g9ZAwGE`>V+N9p|#X
zcW?g4=K*)lYneCNV%*n`rtO9n<nPCQ_yh?aOQp7JP7J$-VZfF4C~F=}{*ev5?|}tR
z<PL~uTom5hVjLI_aq9?X<1PxnSm=lNI|anwAHGzAk0S|jjpg=L%8)I*-|@jiEFeRf
zrrI+#{d|tE5HxOu&A4x5CKX{^;Iy&B%?Q%!{D22m_-0V}1c=saEa^XnUEPG)!6Vip
z)3cZ!yttcVdhnvNm>xXvtU5h-(ODEI$YM;+?T@mY4MfwK+uvf`aJCn$&ymc%@T<q}
zeReN7z$4MZ2H49*&C-DT%tQ-9`4n_BJ^t#mN8fz>O@mo;7cL0485i9jXTkfq8xPL<
z+6zx|I>@+G@sqEj_z1*{ua<qsRg`_heU!Z_$3njc$pMEX7K73wuQ{oED64i@dn!+7
zJe;~wg4a&TcqmnlP!6E<heo3Ghf+~`+~F~`mt~GrG8mQh@Z5-V3(hV(yXowvb4$-I
zI6Ly3$H{XeakK2~=Fc|+hMyaG4mrUPFiKzt<)2K!OG2}A7B9(O5w;{KI5afSY7`}*
zaS-|EWG{h#=#t<d@@L&VgBOS9tl)l&1Lw^TLs%?7qGS#>1uhLkB8yk72wM~sJU<+P
zfA9=k0>35j3x!`O{EW`t;m6yW<}I0@y<+jw<=J7&0)s<Cf~^HzJ?AY6$yvT^+47vQ
zC4tB+$ZB+H*DkP$DQIa}&Wc5gb5?{e4h*6UWq;40#bG(w%itHXI5;Sb3Q@s3ykKw>
zlz2XsIA=vDUW8KME{Ucfe8!5!OLDT2a`61nV5`x)qEKLLOG#6ab5?{cMv)O3MGjJn
zOevtqlyo~uP_hOimH8`{EnAwC4P*p{A{Ev>o|49gAiuE1_z(&m?kqG3;{L#>nlkyL
zX}}tWsiLw3@~2WSe=76_G%<T&)OJhM9LxC&=azqQ=-~2RJ$r}r7>*fot-w~UsMF#-
z`K0*3u;7Rhd{Vr!CgHfn(+3S<<o(T3B+Xqv?3lWa3Gu(1oW8(9RaQyDMEd4;F`@P+
zjDPuiVv77onjyc+J{Nx^=HjnfZBe#H-D57O0%9Um6YoWV*iSuFi9ISJ*!H`{$u=y@
zS*9*dHh${NlEul?s^G4yjoM|2GW~S!#GQK|9?g(yD&F%X<to1G{)0o9Yw*Am<b5~s
z!8+FD-mfm#l_O2Cq=E74ooEo3MP6ry>$k6ZY(<rL&iX`x>hnPK&q4EfAo=ILEXw+*
z?NZb+>Cs1*=2^0LY~QeQ=g#$WCr_9WG!Bz#7qU&;Eo{>q%Z2mjmtWv`?Gw_S<5hlk
zspGF6=N}tKo+oo7T5rI(N=2@5B&|81tYJHgmvQQi;k%t|(~pn99zEEYycT)Jhu|+y
z9qi@dFa$`Fo$j&>Od0UUvQz#@^{3k>IbL<^CBiA&R2r#R%&aU68D}ZR7~8Z9#pXEs
z;lpDYQVqpMIFpMAW2+t@Y2fTraD-JHO>86K$uEFaS5b9{^<f)<tNp|vfU7IO)iuHu
z&>^u+$E06A`gWcr2de}UwgM*EvDFC6W3b+2;M>)cx$DB@-puszFsYNoOb4~@v(LzT
z#5M9B4HM3opaZ^qMse4Mr6psr!mQ-XWy!Wv?4&knQBqclIWsCfA|^6E4$F>S_)r@W
z7aAXKj#wO>6>VkZeUwYeXIghwbtgn!AC25+sB{pE{`Fo&6D{T5i#`sO+-J*60(e&P
z;WMVp^z_WsxXidkwtnn0?b6uT%mrQ%u@PYlZ9YnQ1?6b|E<=(^`M%l((P1$W=I|v5
zZDq(gJ|iP81w`+S8C<^fT?w9PX;|OShLvSEm0H4Zv1C=M3|}n6tjS%sxS*R-<&ZWx
zGBP>ZYhiSBR9tdYY9yj4o3xRsX|ZWuYWWUg8rZorrj+!g#0(q5Vvbo!i<1_aGs99A
zq*|5opF?5!*}FfWV3&PZdF|qbF_{rw5it?-<7^)S0de7R5z*#|jHpbQzycSWfeUt%
zy=4lMM!>MWS2*T<=?i*=A7GW<20{q;l%bq(rn`l`VCSBTn}2Jf$*(mO>)?543+n3j
zW6jd07P+o&gyN9|V)V|B0VNK?f(-FWTa*2>`+R7jZ#9n8%I{#I!4bnGr4JT!jLyK4
zunQN)M!VHidMS90jE#vlN2NxmVVTF|3@h_Epe=X@vy%6>m0<O?#(@X6dM95w?fVx{
zLCgLHeroC2D_(l#mA&*7EPn`$Plr%Ag%$XHY{BY%$}9fQ*{ek(@Xy(!#zn%^a6ul0
zrQD$Omw$ln_aM7&M@SVFAyw2Q3;Z*&NJdSV#<3S~CeT8T?WNST`IdqzNYY&|S6PfC
z8OuVT8Z^U(d9e4M%UuG*?_X*1KW6hxO{M)no3cahQmtUSTv<0#@#u;&c*u{Rit^~!
z6zGa+v1C&!jMB<&3l`LtJ(X*ErNTZSpf?bZ8kx2LsQA!=zvoC>zVb>VUxAfeK^J9*
z-u^!-%iEECZ}dZ6LnqK5qnAIt*2rV?hhYk=QlXa8+cu?CvT2d2YO?f~%8$}+)-%Ib
z7yp^}O?Sm$Eok#vZleeO-JdHBkgq+_8)};QOXa?f5+hn~rNT4h&_Hp=FGW-)P+Y^;
z7xSKcMTt3brN60uOmF&_*;6GZJmsWzP=0KZ_dYGytCK%2oDQm+u;H2b>od8}Gfn>b
z{Msg3zcev2DoI_xG&(7QuV4BZtzQ~J>z8I?{nAsId%ewX<=_EWkD^W;r5xa|tla18
zKHIa$+VPUMug`>*&CHmtRZFP_^I2Tsy4>>re$Z(vbLY#YrqFV!SR2*qevH?V{HbzV
z)5(Hn`jw~Nmcpcf(^|RN$%3xBuw1R&|73x$Zpkh!f)Z=VpCXsTk6zhNThPo`?y6fl
zR$DN@SN7F~j?)%&^_83H0zRalUX`7FB~ty%uP-+>1)bU@`6=b*UeMM@ovNT6Wmy;<
z6SokoY$>gvyf8MVWCdmNQCCn-OOjYc?U%Y0{r13?%xz^a?LT2UsU}@q7PR@jwP}$t
zNzq<W(a{T|lOvNOZ3mPJ+IqTxo_?&{E-A2|wrjN~x|Qd5D{gx%Ij6K=p*mOWVTqNj
zj3Q^GCZ{F9#ipdW)uQCV2V|d@S6^t@J$Z+zspb3UALv-anx>b}(R=FQS@XqnG-Qnu
zo?nG|W?ztJANf5K_<6<s+V@{w*RzTv!2vRqNYkt5)pW{EXS&#v-9xF`QAjMNZOyC1
zTDnSwox9qTuW5Smyaq<h8p%ywUVX_kV242e)vCYJwRI-QYS-j6S#hNHO0{-+r6Ms9
zsy`~BbCOdUv7+1G+-|{oc`%<B#$354JI^C|jMP43wQno6zhSi@5a32{%zat|x3!fz
zxNX7ebcVK;)v0CYOn*o?f%R&Er0wb2za6}+CXa^5=tv_z(yILew@)dbTs1?$=X&M=
z4(Wa=Iww1my|;}GSf8DFdRgq|$jlWlYd`fkwj_S>>4R~b_GhOp4_%R*5tEs^IXZpu
z=9Kj1$0M?`_oQF^B*VCEphqqXi8igv-f_&!*iNV*tjtNuS-yOkTXo|qtcJKYa>6mM
z>_v$g8MZC!a~7}2%E_#fleuQ`a`WnuabbI{aT)QM@tH2sQ3(-IAAOcK*Bs&>wIIei
zJ!1O2IYBOwk>Lx&yygaFuduC7%~`oFDrcp6Nosc1;*?1XS6E}y(&AISRxew*B-6HP
zX>xX!IW->68ow%fWz;H+==Tu4=kE#LF>RB}*u8-#KQ%Ac?+d(B{o^6idyGpQoIKVV
zn;08wj*N|15NHjZ7aBM}C?+~4IyP!S$il$rpalWZ0igjd(F@|jBg`R5F-g{>#I!|T
z#_)PrMDl1`zje070T}_o=9#l2=SD3|Oj>9iklk(Zyi}Lyq`2f%v(dW(mYH0%XlZuX
z(q(w^#tM=tsTmNQ;lDz+V)@eSl=zhRG+R)3SWt{LA|A$su`UbZqZWpTXNCotjp2w9
z6c!O;4o_XUDAtO=acTInRk5oUx^T2dZaWl|<z@7C#WIn*Oz|sYmqadciAi6Om1Is%
zPDo8%l(je`Hf>?5b>O~;tibH(lq%6F3)2YMS+R=}7AK@8WhcAUiqRV@IJXnxqv97X
zG)E*xrbJj%qLZUiqFv&W5)+cVl9Lis5^WjDX({ITG^A?Yx^&C(jn?G!<n;6umz0>a
z4D+HT8`76r5h67$DLyI5oS2l9m}p%!RU4I(7QNUj3ldJcZE4ohtmWx0=_x6RY39WE
z_@p>5;x)1HE};PdVROBVu0lIueq=^wlr2-2k{p-pwQN~x+EUw+v}LJFQ(cmik`q(S
z$?=JC*7*3uc(1sqkf=#E%(su3?-iwsicUz0vBjiBCoWj(g1?%KLL??8C0Y|xl2THV
z7iFX*Wh`<@O-@KoHZO`<9*&Nm5H5tphDX?p&bW(Ao}Xz=h*=nmj$1?pVL{Bgv}~-<
zygJ!`esp3&sx3ojbOLFor6<Is+KfWGib7mQLS}|}<*FswSy_=0X_TNSq=hGj&Nj!#
z#>U~Z;Nv7jElfzUrKBV+F)xW+6h@((+s%s(4i8+Eo*7|VvT#kpJabG;Xk4^)p*}Kc
zLE1v=^4VFlQfIiVpSEbg$L5Hn(99)^(v~D!6Vnni(#(729-g(uY8;8RQ+Eb0?>f~S
z78?>9VNG9{6_*;}k{lYH7UnfCC?X`z78f5MH#2rdkTouS$~<#WOiYxoH7Yg<(p*Yn
zsx56<($b~o^tkl6xG4JS>7gUTrw)r<9_bYu9UEthUmh~gY;*=;Ma4pF;>8x8%BxJN
z@o7;hRv<P3=uJp+tC<>|7#C-b!*7fS>hK5OiZR6|BqpcEr^MP)@CztzI{{5*G-0}(
z5F4MM2K5%w15L@Gt^^QRmH4<AIQ+VV_#`g`bP@I>ndqG@MIRrNkQ8T2j7f@3jK@k;
zCo<U(aSxXH+6seac?2xm6PXX%RqqG254BojoBQ?jFK1nJ*|Z>F>1^LwlQ3;-n~&F|
zdDEwb*%r(isW^r7cd0kA<ycHBsK@$aE=r&^iw!X;LprkB+mb=*DYg|SwGB=(cmJ=w
z9x~^nSNGYLj?<=uCr5^xhcv~SK%Jm@8=k;ETr6iSW}O%BTCP)8EZ2t>Kf2&CH_O$!
z>b)X2*912MbC$3yFLO>xa&u#@scz-i>Pq?Urf-buHX4nA6o0G>`w~0qju7WzPufCk
zAJ*1sA~pxx?z9Wrf<4vfG?HevW|?N6=7{E|MsYSfTb=7UH*xOhJluJc^8sw#b<X)$
z=NHa}*tAQ+mR&Wpb+rw#WmhY0TkR<AL~STG=~}Gaf(^Pp(_Ycu)ZW!Tzy@8v=|pVI
z)l%0+*GV@Tn{uV-*66ll1Fl=xfa?V|-}2Vi)OXhR(|@G@SU*}nP9LO?*JtWi={M+4
z>Tl_P&=<IfE?O4}TWb8nrK*d!OI??SF3nxucj@Xf$YrR@7%W8U?=ssZ$R))k-DRW8
zc9;DwM_o?3oN>ACa?9l*HraUTlJ9D8wYb)Dt?$~%^#j-Lu7h1CVv~)zt_xi=U01kn
zbIo-<<a);SlIva9f4V+%EtFg(lVp?XNN-EcrFK}{)JGby%<`v}S;3Y%td><Vz}UXD
zsXcZRP^z_-6#aWrJInp=XcL5*KRv<1+pQZv#k?ih>IYk3rEkMhjAW4Su*N4-d`z0d
ztcgE2&m7AHlQLXK)4*3|ZRXR!v!-NV*)$Ww(Chb@YNn3M+Wv=eSu7j3E3Y#%c^TSa
zMMJqu`i7JhNjX)Lf>HuAreWSg=gRPZi>yb>=~@&tj`EKUjGI>_Zh7pAh^^JJ8cQu*
z&4R{}lVeohm=z1RwvZcFR?6#8NYj~X4{Qx}qbHB;-OGR1UTZ^L)6?%WPphH%=*hkN
zj^A;IZxx_i)GLke4#+!oaOK{uRs*V>^JCV<mIvJ{CQyazJM{aojp8{F22?O;--mrQ
zs$JYWX80EC>$BR+!+U<EczG$~>MQ+W-qQ0YEJx;VGx+P*&KkP{YdKVGMz(Zaerm$p
z4((a8ZL@8vzRRe|O3ek<2W+&d!{~F5un79)gWG1!$f1=TCeNJ|G|J2U^x=)i&X|w-
zZyY_=f9j~Qn`i8>8oDVvqvyuVi4Cq2n;pF-dS!dIv$D6Y9ee|#XLH|})zPcE!*>$4
z#-O!F*5nV+D(JSkDPJxOjtS)}HN-5z8a4*@Wo5izz6A;B&%3b=thNpd3T?m)N*x%-
z9_^FO2Or$Pe9!*Rl@3+~#`A8N4S_Yjef76i4;uE-jG=98h8~jNRP5BUX$p3F(AKpW
zp6jl#O{pt0wk2m*Nea%Klp1hF*;M(3j(KCjh)Gzl-oUWjQkvYBPvq-_?sX?<1u&_P
zr53csT;(;8l2apN&~+~nu??nXSngd9>l`eYrpEwDhLVD{TBfjc#mFr>uF5SuvCcbo
ze9^&<;ry|Ov~*hiwy*%6rcD0;3tQD!3`ZJ$-^*&ek8Z1;WjsN+=0A=49wr6P_PxfO
z3e$e?+UT%-(7Z8r?fClCXJ3EQ?_`(G{d_xjIo1Cg+b!o=K{;3!Va3|jD+6cF3<#QI
zGnBDYk%O?z`f`VTN(c;ew1&T0eR57{&?H)Y5{v1x-MYNv>kjVT5Ein^n*Cb4dWQd!
zv0fidoINT488|lXILkNg@E<yQ(~MFZcQD%UMhmqFUmnS@U`oKOfFKw5QhJZ*<QV8Z
z4Dw#4EBJ>_{)fCk`>-GflThF23rq#!TK78|jQwEpBW#|U0FF{{RYt)zfx{I~@V8xe
z#!fLVu*`TD&T(~B+~NB!W`yF34La7aUM0O7L(?#aiMByqFvXzsF4j|E6C3C$NZ9|q
zp2A>iXE9tlYEehKv9Lb+P2DVp8><FOh7JyMX)KRqJZ>;KHU%=wg>jmJRw^;{wXC5<
zX$<nMCKjxAuQQCdY(2K|s`*O46Mwd824A?7Z*Rf$2Gbd={lCKIyT`uv|I9$F{a>;u
z|9gY@qWl}NC_fA~u_nBZRrw6N4`Az-k1#8=p3U8aWiOkA)ejnH&7G#bcwyI-mu3Uz
zRiR~^pl4ZkSU=W`b$FX~QsQg|tk2Oiz_4m4sQRssEe36DM#f%CdTMM+G<L(F)dH7D
zhFhO+J+jAUFjdn9&(toTJT?>az4%<KHY<DW_}J##O8ZKey-pjvH5ZdGRW5Hc+&X&T
z+>wcUP%l5ls`el-jD^$XnC{MjEuWvxo!G*v9KrLK2@+e(Z8@RM&Yu8EqQ%-Ud|EQq
zDr48KgW1b4)vEWHfgRshr&<{t3q6gJ94kE;)RlYXTPU)9(bXZJz1IzkuFm9(u4eH?
zSC<COo)ZSLp9r#tDcSimJ7G#@Q1m*3eUX|`5-ec&Dm4a>SasYlU@q8r>Dq@+t(Z}L
z#dIzGC?=GhI5P1AOephJrkQ-EYyf&-fM}3!n{u~q+P7=U`U$qI%`4Zg%o(%3@`uBw
z4fZh)*)nY}{@75MeJn%0A6jq=yI?e?ttG0$5*yn!xEYQCL&|P-LYLwu-_<B?7`Ac0
zZ)>WX6dOEyQvbo9z3Wxi&rqy5HjEFPiV-Xf0sUmfwg(NFU|{RlO5bCUlUYBwg&N`7
zjs`<5S7<QQV6J<t!%J)29n-`atF~=lpR+x8L(s&D(*vO1)+yBuuu;z+$CqzX29}tz
zqqV@!4V98ChV+jt1`n738_*d{OHOsGX=rT`4SjqMUNL;mDj3>-uN`8Elni8mWAK%B
z!ZZ<hOHD~m%`j|{91~M$dy4yyu@KO0%?UCUao1y~l-5UJ<(a54d}JAk{Y_e<#<(lx
zN7QO#h?dUIHDFA*{i7rT9tUZr(*ptqe~WwDnX{rJLu{*0eZKK*mdhP1LNK$nVS#1%
zH7^4c^63E{7awCQjW2E=GN5+HMj90CF@o(+)y-V|r%un=yTI0Xmew#4&C^red3If^
z)YKWsNaH)J;SuwBWMFgg3AF60W6f1sa255Uc+#d(owR8ndrjDa8n8EsD<mEKM{!=}
zWz4F_Kd7kB=zx7&)YXE=>J2Oelh5}s;eefACO%lp8vppzF<yb@Ws=2!m5E`i{61|3
zQi>fIX6SSL$7Bxks{htt#m#2GtRym2IoRBA=Nj!(vGQkD@uB7?gU2Ar(5Inajd;cC
zVgO&QaE~Of4_f3Iv^{lDNkKz|8^h6qD^Kpg)?w?c-Ld;?_QZ+lW4!wI#`J2#4g3T)
zi#G6i(&FjQ&kZK5hckwC*4<j;W4IP@e!?NEa!l!KGBi%W^wlufu^2p3*%4)2p5Z1&
zV@@%xVKmK52t>OevMi`yX(zJQX_xTHZ<)acu$c%NPgetaa)RK7^EmdBa1t!oH60ro
zV4rh0!1n|nz(Lr_SQJKKiwW%A04EB8*z;b*juM%GYiWZEVK1C0d?K6x`~o{yh{84O
z?=E8RckG9N9nlK`i$tU>8pH~KM$rmbO{@)APka~fJ+U)jH?c3^hvHDck45Awjux@$
zgg8N*0XSP+2$+ODD>ULt?8mGTDx=IU=&jQB0-`wFejSFZ6E+&S1n7kD*z$shr*EZG
z5}s-hvs0H|zJj~|sM%8mZ^Xw@RK%|aY^+>OXeGF|AJW-d=+?2lueUI;V?RK@p6!Qt
z3p0E7?d2_m_vzKiTS)HLx3{;D?Mq>{V24(3+J~B_BLav25USgsoP=^HZ4LXAMsOFZ
z2sQ0b&e+P?EYz|;Y4JT?*w$H1MJH4gstR@NPkO-v|ERA0$pyo`RslL1o}Vjr$+ijg
z?N5?m!dJZ|G#E2|)^t(gumXpk99HG9I)`;RY{X$R4qI{9j>9gK$IhH8_Ttc&!(kly
zap=$CYz{*>jN&kn!%Pmdr;M68SzO2A77lYc+|S`r4o`A;mcuVOyv*Ts4)0ExJY}-@
z6Nh;mKIc&8@C`vHXAUI}D{$z^VO0+CANarj-ym&d;e?d_udgECH~fEtM8Q-K{yV4z
zwN?T(H3i+P^#uEe@Gos4Vv7*eGQAk=<ZQ?@<$AhQ`N$lu=46f*bO<h5KE-((+(V1n
zC0g(Dw`Odd*-7Xj_+tA^e_<|66XLO{%pz<`z5#p39LH8SSFnlAJs}U<YRY^|5UW@d
zxz{gx&7p#P8x|?T+eLDzJB?7csL<}OhIow-Pk_PtMTdn3MbCtWs3jr~A>tVvNL*j^
z8;6D92b+ot#Vts+<W3{5EqY`3S3~@U5U;>x))ze%Hx@B*6F8zsA&~BuMfXseFN=N_
zciNw^j|@F?->c$Y_-gQcRoq?l8=jC3o<2e7$Jm&LI4<6CctUWpd_kD1R=Zj=gwmky
z?gP$os8>MIa-8GRfZAMJXn_CIf@Ae#Y~C}8^W<Jd*p5b=Rdf((_M)!^d;!=Gm{5Im
zf*whdZ(m%ouaFpuGaUD2V^C}gTizbFJi?Yo*zyQl9%b!ACGp-;qYrq?`zYfxL0j})
z(W9c(MfZv>6}>20f&cbi(d#0mXhYFfT%Q%)Df$}kHx%XK{wnu5h3Bh9`w*j$hg49C
z|KdPS0`e(DuJ?<6#@{S;z+c9f-~eWXqDPK9+&=*h><8k#M(o!`c@*mJ9TXm^@DtyG
zE1n9~xO7Fn_NPBf&mR5>l>;Z0Ef4ws%Q*J56;KyH)Gx(XR8dny8uYc#;L6~jB!9gB
z)9>Tu{fjt`*hSOI;8sI<;P2g|_qZZuxD)&dU&IfsT2lC<o)q0exLEw{FL9l%{uA8&
zj4-u}cH_Fi@m==V_Dkt+0ft_e#wy2t9%1lbAD~YD?~CrM;qdRu{2NO5_bHV45S^%$
z^ZPLW?wRuaUyhP8{Aa14t^wO9HFgsFy9aQ9zX|s<r^sg<xAyXbqF$p`U$X!0Cq=jT
z+dO*4JJcRr{|twvzMs>}t&%!dT&_y|?_mEhIzR>XKY?$!!&AKn4k;9+bIAXn{o77C
zLL!=$M^-_lQulO==c2E1g``yauyX~<<7ZIlIeO=yHF`&NsdV_#_r>A9LrnU1s=sR4
z{!J}HxOiYH52-7_+*Qy#wnr<b%h%woXf>&hz?Wl!r|qcmPf%7WTXs<>$7i;Rb%OY7
z@9|h_jm#@bK{|F^a({3Io+rUP^*@x#m%dl|{ok>dfWmX0f~#EYr<P7})IOAeI6|o$
zDc7<GQn^DR9QdQRh*yeAxX&MONaf_UkZR(;%%LPdv_$x~>cMeF|7dH`C%~_^=rF$I
z60rXX-b<XSwMbW6bV0>-(I*Ijo%fK2%CFKnjedzZU*g}qkFUr>7)tROD3)ps|6`8)
zO0K{Ewvsph>Q1Hbe-+|izxzFo%5uBEj*IV5Yc}T|e;uym4LIqg628s<5m5oPv*qA$
z08{E8(-MW@nNtb*;m_aVcvX<b6V6L=Rm#Ad*F~p<_C$3!Wx)l{)NT}02K@6NZ@eIS
z<gFK{Q2HbGJfCq+#-9<Qn2+(d)IuUW(j$7Zr>Ww|o`0Eg+T-wWXz7!R&N*5GP65ON
z_u2W!QQZG*rz-)}L}h*fx;n?X*Ox^HxU};O($Q*8Uy(e8JkZlsw4JSZnfH;rhg87v
z@JyxTH5ymWXZZ&LP)Uo+uGVaO&2adZym!RmU-CEW50B$iDUjs6s;SmD=)X2ciqw*y
z;8<6L^7spnfXn|R#nMIjH}@QS7a-T!|Ioh){y)72XSj#IAUpCRn&#Ap+~Etk3{Jh?
z#~sln$+n=v|0&zQ5!q3qzY+9548m(1+WWtV1|7tIc7VF`P@_w5s7l+Av>e|+IHWW|
zHH9iwa~x7FDf}xA`WI!W0X}XeUe4c_6T0B)Q4*HtDDh{9Y=Cx_AJupZpa@Mtx8>~d
z?XUjErOMw3^S=Z^UkbhM|1Srx%NM|T9ejg$=$G^iN76j?N2ouc{xeSN#bL`(KK|kh
zIEqp1%6<as*CX)0Qgs<Q@xEFq+Tb!dxLje`_Rm2Z#gfJ!_<^HTYMyAB6>wa8D9818
z<>7BtNtfOb9r7zLL)oxppUS4kIl<59JEOm@9-Lzn*CuQNcW756io<1)ukjW=Cwm&j
zaVRFRLp<e6NBTS+Ji$3yFG%y~DV35-IfqpF5b>wtnuc@=%W@_>7x#AU1+`z))ak$3
zJ$QXVi~Jhxs~v~@Yi`m1r7*lq^hH!Qlo@wiwj>`l4bXz)8|{hO{rQ(5WgZUDUN?Cf
ze;$J<kht$N&XGw|z{3@{iN)XS$f)=`93I72-rC<mO7`|t?GgMdzT^0w;w1j#o4@3)
z|8YwHIs*PzUfI03WI^%`_1!oQ)f8~A6n#hcrN55u?UbO_N={W2hW?f+N#joa|D?US
z`up;5dZnC*ChT;;<NsCrLM7n6nX)PIzFM&tZ=?Q@m-@OSm*U|6(+%n#^?`XkDoLm$
zm$Gk4{7b_A{X0k-N--V&Nwj~L`oDW$DoH298Is{D_o?iMt1Ga+y694=_qat_lF+9l
zS^9;8+ms1Wt;`cWU~6eZFi-b<m3|ndFe8<Hph4MDr~eS+Pd#`K>j@-eic6IC<WKW2
z6Bi->(A)ZV_(1xHf1fgPQ+winA;Y2O{2?DI2-T=E1uFZXRr@^-PlT3%TdH5Liy{ff
zjyI*QW#T{%ea8D4yiOtxG+br5d8wH8TeYM`8`Q@l?7&V(S)N~XiuY2Q@;6*t!2{WQ
zLCDk5&fHS{OTnI{?n~YN%ToO}aWE$K_Ycr2wIsjGr}!)W^sl1tLjBc-CAs|hH<ZB~
zjbo^-B5wihxX$J6NggyYr^tu5PvD*STXsAm50d8o?&0Jzn(9*(&nk_PpF5|sd+0-|
z9JrXHs>vZ2RURwDZSC)%AqFo~_0y$zF}<b!J?C@0#V$*WoYxW$<di^HH9a2h6o*`X
z!<(NG<`ys66QVLm3TnLH<;K4OT0+EtL{O5N<BsR`hd4YZ(nInzkp`DB9B~9EeJ75m
z+$uEAjQ;|jeHHk?IFY`wz6Jc;FlOt70gdbY{8_vr-W2bN55*_qOYt}H9tMJSPHs*f
zPL-XkPBoqCJ2iG{?)1L+n^Om;ZaDjhSDbtiW{A^Br*Vk)#L3@jrc)r!P^T!sc&AjS
zMNZjHYj8J{yG`OvryWjvoen#F>U0MAAQvY$o}PfXB`y>xkV~~YM|?_Uuibs&G!tb+
zS&+^>dpd3?ZB4uDfD(2<>Byzxy}#ph`T{<IWlkN^bwhro&&u#~oZsT!im#}N^8Eh1
z%F9?Ekj~pq_kp8qr(c|&@+<C<Z@klMrvkcaoKU8jWzLySeVjIFTr}=<<$nNwK~qU%
z)_7}b1HU^^(!GCrjszA<o&3)^{vQ6IAQsgEEr?<hf&$T~DEe|};;<`+)Y}tbFF<e<
zhr>C1hr_BIPULVLL5xIFNG}eDaoC!}Ob&^kieg6&2XXiohy6I*!l4gAfutQ#v~WoM
zQ4!V+<iC^OSLgRJ{Qe*OK7rqp_FEJdf)|Ox4ekR@fVky3oXMdlhr2kO{^nOfbo!9r
z52t&vGKcRI6cYLUI1X!YNZei&KjLqr-`qf$=iI+3hYh&@O@f*y&e?ctuR+9xaEdgJ
zt75&VHV+#GKMm@h9`b|%dgm5GOY~Y>gWt8mh~x)CJE6VMLFkAP-_GcncNMw`-7)st
zQ|Kl17W!c1(Fe98bA<p{j|2(9!aUfGtP^&_X5>>?jhw_t<2B(r@NiSO1xu7W!d>A9
zj12!M+!r1QKLNw91SaHjOOhf{6g8q&)QhgLCMhSD7c0V^#3cShtRi}e7SSeF6KjaI
z#5%Anc}r|4HWr(~x}>GpT5KbJAhs7fid|r5(nIVe_7Q!=exk29Q2a<7A`XL1`bgND
z_=)3SZ!$^r7pIET#hI`=nJWg0!D5IQDu#;@Vic;O1{N7_1HEg+&4R1AP23AB4G~)X
z>agiJBYcjL?Q<C0{vLh?;OTwfVuGkcUj32V0OU6aZ({zB@tGs6;5a=}3a4NFpJDa)
zIBohLWA$I+RLtNQal-hs3n<SGR!1KRgM}f&P+^!b9QFevV1YDR7=uyovBEfEyf8tS
zi1F{quq&7%OckbKBs@fzFN6wVLO86GB4C{qB`g%8f#p~s4t56#LZXl)Bnv69Ku8nP
zg$!6PWecl>Ey50A53H9ygWVEY3_TQH!)EC>p+I<pX)aEpGya>4=q9?06+{oQlIST`
z7R_Q+(JFe2)y0}(ZLzLcUu+;Y5#JS?i!H=f;`?Gdu>)o}bQZgc-Nl|_Z?P{dn)>6v
z4-yB9L&f2+Y#Jqw5yy%X#mV9nahf<ooF&c?1H>TAiI^{ji3`L?aiJIsj5x#gr@63A
z*p7QMbYI?}uo|GTT0&!?iSVJ&PZ%J~5cUcCg`>hT;goQ?nEJjJzTp%|mMXQ0R&f>4
zM#6pt7Evof!(OP%#4*X%%bDAH>A0<zH@EewhuS&^HJog{T5(&iPTbaOAh-1z1R6Vm
zKSZ`(L%FTjaBk~0h1bv-+}3M0xAh9;wq8-FleL9ZZtJy(+j_0#wqCort=D00>vfvj
zdVS7qy)JNDukWbLWW9y2f_)dtOs5mdT^-H|c&G_@22MncI}1p4jzW;F8gVePsc=Pj
zlC|}4Mm)J<yv+bt2{n@>hn8?o_{LTU-x^MX`uaZdYXhg{oJ|Mb)()}T!?}RRbwC=#
z=XBt7oe`@GoB<rKEAG3&xq<U_M~*$<+`$2RqOa5o&InG}8=RsKoCi2!U-<aIRRUKG
zKp6tzG~kXwNI4iz0+*bJxKy(xj(rVy<~rP;fRn&APa^z9IHT|toD(?cb@&hu)qsos
zfOPJGgG%6`KO>z&I1N^xDFO}P0Mv*YK&_|+)QfsS0#9`XG>8URzmyZp0hULLqydku
z2xt_IfF{u-Xu)s)0a!(>0_cTSR14l~fi+Myu^M0vu?Ao*u@+z*u?}E8u^!-C;#+_X
z#fE|&oVhVzQ?V&vGqIWA0?K#~{IsRm60o({8nBJn2Ji#%1H@`Cwg>EpHdzNA-UYCm
z*bSxaA@%_5CH4aBBlZFG5q$vriTwmOa9m%&f#N{GkHn9Ja^Uqt0Edag07t;eupIdQ
zNWmTSHyY4S^aGqAP7o@f6_^C*FZu&c6{iAD7pDWx6lVg?7H0#_73T^S(Lw|Q28+Rf
zAz}z%C@g1;XfeV8Bg6=yk{E@yqmq~bURNG;=Om`vdyUSp>v2U56hVXaL6d(xNVaes
z>R7iKHaG(KKuer;VfR-Bc7X4qhh765!wcg!m4$cU)Prn`$gWC*lbm{`+EnsPe$JqG
z9ZI4HmAjH9A^3&k@J89(xFhaNwZ*_;V{jrj`&j|BT^+RO0ghv|_qXaG0jj5Jo*Jaz
zsFZU922}SpcoezT#XjYbRuk?VWl*oJkd_9#un~W3j{B0MvHiAUv6nYWSNf<4%TAKx
z)G}%Cmg>Jd{s^6PfCBlI!bxy+)PkcpB0n8?BTSOhap%aJM<@eoqO9ua&9BYD$2IuQ
z(kIDZWQi-nzvNV(ONXO-q7ynq;H%^$yFEI|kN%Dm?woL?r^fbojxcm>jg$Oab82i{
zrZkQmONSyVRnH3GB}6L~i%%+z4*%+pXLasJcB`dNqINoo+Ucb4`E&dc#~+WAzJ&1X
z4%&19$D}_)lt@zRM{p9Pg~13l1WtoCX(-Az3{D5>VK~Y=0#1XLZ4~ky4X5F9goL!m
z<Lv}EH%Jr{f!#@P<sn&2hQB|Y5fa7}lz%FmD<q9+@R<&0g2b@^_=|vZLJJv<9AhA9
zxIorOfPW$+4FhD2OyDUSt{kL|Rq)>eR{>JT4&<^2PRm<V2@=R>xc>sK5|>0YkVPIM
z<ZCz)G6`As6~KwY8#pZyA$SNJptI-<h)Irsn5rl^Lt=457<bVfu!2|t&_nb9tRz+f
z^b|e8b1RFL0nMTru&P)Uu)0_sT)3uK6R@^e8?dfe7aYI7SRb%~*Z@9F#3q1{cEFcg
zh%MmXN<^K6+=EtAY$vuuo83w51lV2dE*KyI^#trK_6F<=`)&i;{0{;9i~Yfo2Z#dz
z2SFlsgLE_)oOh@=6cADp`0^<9<H|!;8Ur{MJ-hOdnI?j_P8KHvP7$X7P7|jA&VYq@
zMaWUJz>(*Ob8sIZ1_&OIse%CKiSq#Gi}L})#4vE-1>yq0NHJ3Igsim?FcuOQS&}=6
zG2jt&)Bz`@+AV;x-N9G?^-+(%u7$cSfD6~fX+aGXz=azL&A>|<f=2734wW3$L32d)
z4i2SWYZnJlIRce~I09N~aCNdA7wjC00+vVFDspE7Bz~#quqoPtiuTh36pO!(I_n8Y
zeNgpKc{kk?AEsLEa20_8)mg!5$-P_bQw?dExU(l?zcfKAZlL%I_Giae(IeMC;%c<N
zqjHz<X!2}~77Y4iT&X>A!`r%WphJFA2pzti4hm<3qoW3#$~nq%4@$w&wm9<U5z2tZ
zD64vw=T|C~8@{vjDe!VqS&1ebr}|tv9NiP0s0a1`9VhwGNze3mYU8dpuJlA@bG&z4
z--RFfzl(3DyWi)c=2Q}js8l^Yz@>;*jKwDsz@Ih!$ytf}Ie{ihpG56+61CGwWrEfp
zepTT_^hCDdemfj-WE-f7sEQ<OCoUt4T=I41lCOr#yiQ!&)pBXqNf-&|!g;HXb5%X~
zV;b@!8P-XBTYMXwrLl-sNhGOI6yFiwfe%S-&RlA9=2Dw8m)e}U)TZH5n}$nm8eac(
zyyok9&DZmquje&i&m}S^E|F2`J@Fr`z^*r(9<oMtd>_%1GboN)dTR6C(Z~7_^|l|J
z3;J3EKp`{WT+!#+2Mq3qGobHv6zLs<)9^l+Gw+jVp$GUJ-$p$XE%X8BaQ`)&6MAOf
zAf&1vQ2C82XX%laNWYBNQ4fCie+zW@UaCpzp<W&JRrM!7`kN+{M3pt{f$f)yC>!;m
zT!9Z)-2VgkB3K#D)qYk2-pFP`0=7yYR43Iubx0r6lZu@y{)XyG!aICCd0Hj@j=O&#
zElSP7Q`D5zx0UUIh*zpdMU<}e;owecnMmqY4=pZq(xLtfx+9sR<Z$ri5+79pRJo!f
z?~=EUJ2#Y7JuC7n@fIDvyY#8@b}9|ggyU47ONXO-l};R~JFdjv9Xy`?4*g$}*T|R3
z=6LV8!i)Q>-(9&(X&gCH7)L0gQuVBamVju*z4)Y1)GzttS%v#)Kog};!mx^EqIM5n
zw#x9Sjc~3gGiIG2Z4qUne?l!_7u;!i3G{fTe!LEHB=w!B&u!qG$BA<u4exC`m*PJf
z-rFWE#~`FW7&4;7r9+A9mE0f^j)l)SI5#dAN~PpNm1~u=b1l+js*<0?IaoO^)wywb
z&ebl@9TAQo4CyyTF55|*%W0r3xdxvba3YuR+@Lvmg?p_11(**fLjUv|N~pl8(w-}q
z>Ld{k{aTXbBxswOLuTqAb^z=ub_G;rDdLs}&Mgg`TN=15<-&QUf%8l!&NH1j&vfEE
zvmEcmI@>uX^<|yy{F8dL&UP+J{aWWzyi~(^sfPD%b-Z`0<5H9x{u9lSs)D~q|4;ot
zqz!Sj38V*cwzml?E=yyJw+3bK^hXSF-26!kK)rEi-Wzx3y>VyW8+R_l`-$Qtv6D8n
z%pAblypGUZI%=EMIe_n?RqKh~i8>Ro51$F>$7cct^O=CDd?w%qJ`?aLp9%Oap9%Po
z&jfsfaVkoU`gSxEusQTcy||wXu%gZfYyj+Z05&M33-F`P3v7r!QAbd&>g$*v*a$t<
zPQaS#>zF6_Hp<r-l&$(Y<_k7Pzpe|~F4fmDZ?Fk8TV2tXslJZ+gH567>L&EJ`#R<k
zz60G?cg)>V!#d^@HiM?W2in1bqel79cG7X^&Y>rVRt{@(*oedC9Jb}K3x|C;9OyT7
z+7zdcIrQUj5{J_{oXcSdhY=jca+u6vCWp($%^WqxX%&ZCINZzOaSqRN_$`MwIsA#k
zryTx9P~+@Bar`KaJBO7xG;`?9VQmf@aM+Z?796(auoH(p{HKla*Z6Qaki%gdj^=Oz
zhf_J6&0#Qy;Zx^KnW>59Fp<M_4wrDag2QzjZs9PO!~Gl{<?!URnSN6>XF2?m!^<3A
z=kP9vKXI7H;d2gU4&M-TcAhn7`YdOO!wMXFa#)qa>KxYPun~vNIBdmXI}W?>TCQ?%
zs_|5>{;#go<DnG)dq{PuJa7H}f82>^y{NqZ3nX0=NnHe~#iw?UAhms@2O-GE2swwM
z@h0*iY2<%{6?qE(3pDT){#)pY9&&SVn{MDtL!g_PB+P{NI|90tbYYpW25swZNZ4nD
zFCjDE#<${o|6d_z@6tdJMDcw~DiK9d1S=astV9btv9T2^tDqs8|HD#j1Q837Ks0`9
zOkxnRw6GCUrL+>Uut;HP<!|OLq7bmi?Csmxop*B=c6TNlJtcn9r~4>|v+$5!J)-40
z<PekcJuNNMYQFkNOFN-%^-lX+T7Uhw-JVNi{Eqc6qAmVph_3jUx=ZW#X}t+w35#mG
zO<T7bf-O*Eksub+;g<`bFOCiQeMYs^1Z$;O<o<0Jw8BijMvwbnHDUW1-KxtAmt~hl
zWK<Dm{k*3G+D7ZZ&(!Y`ACdOMIdTicnC&`}FdKGc2V^tlnjksT|AQ=oZ2TZ%Hn#WF
z@_M~QwIWeCJC&b@N1i#c8LFBNHRL3Fz3ouz+>=V=R*zKHu}*ZVGo9;#k=m@!M#C79
zfhlIl<aF^;SZ1_KmEhP<F7}XeP}e%598g7NT5oiWtm*_=(<!pfnck>d^0!e9#wLcw
zXIeAxx7}e6Yg@i;WFKO%JXA(=eib>b+{fu<IK#F(%Otle_PQ3Nvo}_(BTVL9dR~iJ
z-$u={I?EB|vR3<_g$z6R31a!{So@v18+VPSq1<Z&58G7<=Jteajb%CI$V#B#npxxs
tJJ?w)FVMCM8*--|dyH{~k1BYkibv{rqT&7Loppp=o_Zhst#_fD{x`dLA~yg4

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass/overpass-italic.otf b/docs/_static/fonts/overpass/overpass-italic.otf
new file mode 100644
index 0000000000000000000000000000000000000000..19224a86dc1d636bfd9aa978d4c776a2718590cf
GIT binary patch
literal 72500
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%0D1QGP88
z%`3?SjxNst=^ofcx3Fo7rI9UO@($o)%DwB|mMjDJdeOaSZY#W`77g3b__qZY;{ro8
zQ_9@F)&n|xjgC0QvR83d81HAa(#;Vt;(T^j<t>h51I}fT33<=cjW$1?E~s|40m`Zd
zL(apsNxg*fy6>oe3^;*8^dk$Hw4+;HPk7u*J)XeK&jnqDAlcT1QJ-|w39msSM?3mF
z^Hul+9>!fbXb~m-!BB3~YTZ8;B!{}aG{{Z*rc`$mZ&XH6Mxj$FbxjfOFb&6HFzAJ@
z{3exdS-_BF1?$|WGxQBGkylJNu{#Dw&O&ywS|~rhf6tT6hMzW`zPg@t!M<B9{>y#0
znq3_Ek05<)W>#F5cH|P*>0>cSohya<ULy&^Njt}D#IYM`0ieml={ggWn;2AE5A8bs
zyh1-z*8{cq8#JPJ{^OU9*19ZMUzMGZmt2VTFvr6L)v2k{A%Mf9J!5=)G_6led3bzZ
z(auf!Fc-ehvWYHigndNs0I6Oit((KCh!3En_i3knvH^6oQmD13eX>~&0b@tOM-cb1
zf$2d2tJ(`I1u>jSCx<{f$=-IS2&Gm)VzHO|*;w%ahH~uXQuaAoh3`Ro!3r3M*i-BX
zVBKUU_8bdwWk<n+A$^Qd-A%kvP!Yb_9%!xh4J&}#Qn_RDi#OQ<U~-v8Ip9S%CgP`4
zx(X(w9E&L(TOj-eOK?HmuU!Po!do|%sw+rU!@^s>F=4%cM5n@nHkgi%qvJ`lBgT`|
z-*-sQ35+tIvZ?5H^G{f$OVQM|Zvsj^=eGQ3tTp~syunwb<gTsIu3HyjEM}WG`M75<
z)Q+C!4n^Us;?K`?(9)Pi$>$WR(4zHnvQV6&-jo-SZ7hwbXc?0en;VyBzb9!+`995;
z-fNe;PG8(}QrWmK-SrM;xj4#)oJFvyweD(X=`6n*(#=6gi96hyiape;b?+)j6X`6o
zIGAgkb&k)_J-JE|tmi83B$#W&ABnwVUwpM>sw1A_kMl5M){^5sq_#Sg&KGWwx36Is
zR0l=&4aH6p$fs;bSW}=;U4Jlb_ZXL@UW+{Rs=euzP{a%{_u_A0%9?;qqB>{ymP+mB
zQr~IDSihJc14CxDKY#8#naQwOqrOv#jo2((#gW}R4i<i8PdX^F&hx5gnAj#ji=U~<
ziA7`3L&cH}mC9I!N{lLuU6-Y~cJR{kySuT5m*TZ{%$m3!s<gqqu;9iaBEd5$$S_M`
z8pdB%sGcQ-B>Dtv!s8?3qV*puFj2m*@SnVJ>=bW%2eGS>Y`s$BNZe}^&5wx(CdU=f
zo!|QU!08PJ)rHX|`~ts~Uekckn(4Le^zS?F-8xXP+%ws5a|8cnluuO~Ep!BsxqQ}f
z|L})~VbWI1u0gZv7D1En_&4&|uanNb4?5D@o!^yuw>dWQ2Sd&k_2gx{&JzCE<!_Id
z%^fA#%;*OVy!4Lox_IF#2L+_|239tu8P)sttlLy!2tLL8c)R<$YyE;U%Ciy+lkyE~
zNlX6LSLEFvNLS4r*PRob$Ig)2uhcJ+T)cwZe0?KY<_yhBF3wz=+cK~-AMF*3%#Yr=
z?696V*6P%2GCUU#UpeIcp@tHo<9}OSxNd{iLA;0$OtY$6S4neUG730?!bEHgV?(-M
zCtla&fAptt0?ngmr1x)=&jL>H{=3qr?;RcaqoJ-wD#31Sm=*AeIT?qNH3`vcrY4)n
z9P^46HI_Azm{0I=;Ze(@G;t}x8)MSge4>w{)&q;%CNJH2j@SZ<aJ+2ZNXgb^z{dvc
zY3HRT|4?LC@zN6ofC*%R@gzBVg2bN$Af&brFzc<MMV<*D%X>BFemQUWqJr-@s@L52
zwcUqq-M7?0Jj5b95)}%6Z%X~NSYFasYAVG_D*+38myD+f|54&SwbaMXY=_lOL+$qL
zKT~o;d+p-l*;|3^YHK<@$A@5or1ZISnl7{_e_WY#MHT3bW%0qz<8@@e*;l;)b`xFB
zZh#wG(ykw<dwtI|pZPA>GcA<vnFha`v2B_GYwH`gP6JTum^G$<oGm;}RshWQQ#F>K
zBd!n=aJj#Jsyn=Ii>q#<`GvbqYHt2cZC&+#MGKtpk8~-$FI`Fx-_~{S*amGhwn4M5
zdoNq}rFIit_wI{?cv=%;lx;4c2{|l7LZ-1j+>nq~(YpOU-<@EY)fMZ`xtznU0yMkh
zk=-B7l3Eq)`s0OfAZrXBKL*Yziv`$b3919*7t-CT4x}vbiq-8${#=7~q#_#Qm=i9y
z&*cduwpa%(h{~e_+XCRV_5bc=eRS5v|9$Hgs#P9cf4E4a@aTZO%-r+zoANecFEf>I
zhp*grjP6ahGt2iV0<PG1xQox+*+VpA_RhSb-%pCw@Z#>5A(R*Rdbq7vG0&jd(t+)v
zwPm<<6Rj;>U+$tsR!8gdPH#PN{`AeWP=1mNmq;5+j)TicYwXQdU>=<SeM;Floj6+B
zqE>}$wd6dc3^@-ug`9_!A?F9nSk4cgvgZ8YR^)u3m5=kPKw2DQp&L+q(CDr+hnWZD
z>FiZO#dK%CLWOC$Aa<Abt5rcqEcAnlDQ8=Oeo!&!?=QA+ww0Cs{v*LJ71Nv%3%13(
zxl}vtqC4^U^z752r}9pfo!W4E?CIQ7p{HE2T|$%7uCV2uDnD5c({$SPv`Qw!(NY6t
z5V?M@_RlU6Ru>v`{QZp~etH#7IO*!I4#){vU67MgP#BUE;2#2aGTbR3J7jes+*XI=
z_yq=sK%mUoo1~0sYQLNkp>VY^+uuLL=&vXDocywlt5@e_7p@M0n-Oj*8=3Q=ew1p#
zYEUQ$$@32g2@24wY@5l<!<+(gf>-C~<x<L^K`Gm}YUS5W?Vrn%1|q>mKfSoj$sdFZ
z^0HSK24x3;Fp}G>nX`FXH&70y>0J#9G`;?MacF|tADKXOs|!FjAUFikwX!#vRsHY+
zbXU_XQ?E!crHcg9;FJwWfHN<XGN-|3aA96vE+rA*7XlJwL>#3{v%!1^u;iL-WZnG1
zNyL{8cMCK9@jb2)vn>PpEjQ&!weFBh(G45sL{yQZRowMU<Rd68Cqzuq1xg>I<2S1z
z(V}~5ymeoG!Rdm6?z4vtHG;6AhU6E|wxuBZs^veBYoF@az8#X6=`{J!hm1rq7t+q@
zG4>#NgLX<!Eq&7C|J)@#r9Dz(Z-lSU!eY7=NEVV|Ixi>gPOonJAq619o@g>0DMiwI
zo7DfjdF3DH+$x8<uM7`fWw7idNNe^|>;dtoodoC49`mQ21RW$l(@E0#Bx&u-T{uVH
zy(lLmOrPt#*KR$sHCrcb!k6gxD(-Q${IOHDqVQ=YUEfW(?6WPT)e7Tsj7yf9PLL0d
zqnB~~#?rz3NJg2Qg^IGR4ZXl3o#emChqOOQI-TV1TqLc}${&WRNtZP%bc+X!UQ9v4
zWvn!a%2FKRq-=^VK>GM2S{@koumTx`nU)d*p2ji>^rdA&wpa?~r)qg)N1ZB2UShM`
z=g1q5_<#?W2L6PB#43C>U+eTP&^`~mMg&%7ZwIrB5ru`_6BJU;U}zpmNdv#Hf#1tW
zNrEsA;rvKR1K)`9ENKnK1(K4_bzb1yHp)3VUIXi})!&vp9c38nX}~a2(!epIXkb||
zDRCCc%eFC|d8}}wJi~qsR;CdR;~I9aTMxb!uh1<TFa~^U6JI-?BO|b#!ypKXjp9lo
z%;V<^eFP%x;2lbI8^m(?ql;>Chx~jPnm<!YvME!Wk(`;EXsE;%e+lV{X~~+*h;&nQ
zL~LB7UdnOdLt~Axp_;JF=<G;6;igDG(`BG!PK<D{cD!7SAR`*K4*b*BtCCNEPU6j8
zSwPf^ULiV5<l>Ht>a4W%%;ea#xO9UH;>?YW&J5FrMw?7ghN&2;A!(yV62u~LQ+Q)!
zXmpq+G&?pk7N{#1J}xyaHW|PhbvPEkjYl^9oUr9)S~6YnZF*(P&6udT*eJc^Feh7F
zhBa&1=4Fz@u7BOP^ApL$N2FliPAzzI6uhavs7_8xOh`45oJu|uE5b508KKF>RK3I<
zAwQGbqs~fqq@Sk}8J`suofWDLiw+HrHMjtx7Z)BI5v>VL3(vwQ8{F9e?vVZ9&OpJ9
z@S>NA!jHX7+X>%QXN^oOzBp4bMYst-Szo)#?WnyeueJR*{QOARCfV?2J(QL<{0D-l
zSIo!r%PnxBeF1v@k3LX<UX>GHsh=9WNl!6g3A4{4Au2p3CR{Js%;!au9l<RoJv}Bx
zo0^i6mJ*X3m2QyWjgLx?Op1tzjEQR620IhrIXoshN)wS1m70>Cl!Og-ZMN}dlbvL<
zZJYqPx(^=?_N4*25ga1`n0@Cr?5306T_LtL54Gf+T%b9ZE?9F;{ncvk%WJh(pHh{1
zsJ|{XWhE+$bb(eDav?-VcJ#ke&;4SOeOoUJHOYLrJNL!)0Ezk&(Mt9KBm2NY*4#D|
z*wIJb73A29_x*J#si3Bi9%S<$+K~s@Y?I2cm<Y>8!Fp0fJwL(XKx}0*<f=Fc)UV5H
zJCY!^<YVEnv`d`S&s-$hP!4~B<*}+-`^%i@a)Wxiu8xX`i3tP5cmXf=G*22NDx{xB
z3Mlpla$@CmxmXGGs(F&M+s;~Aa<K?8y49*6G#PP&)I)+argnx}dS8;gEA=zDjT9JJ
zJte!{4%4~IzdyT%-Cy+P;Wx$McBG%g{VsJzER4isMxi!99Ia*r%Tj}27GGAP2zrAC
zb-Gsl`|no=NpI`j>?GM%R&uNOl<?H(w6xUZ6l_@Ag{)eH98}P3(sppP)?O`^UpAL3
z#Km=!X9}U=sHM5<uZul>$t+*)=NqCCEK93>S1sjM@(EE9iP2h9M0jX)LPTP?;Q-o0
za8gnz?OL+3QVo^AV7bn^31c)8HqEBHY(OT9tzU@t%(_ztD)p0&@?*v<>D@yk4aMe1
zZK2x29si-Xm)@9iLjT(#J|{IJIYX0aObkoZJCw1uRqH4AQ|~oTv&-4qRX0!w*~W|0
z_L{Mg_%2@b-D~z$<n89+m3C6KzM=yw+METvdD<)y`yRORX5U$&uOfI3Z(cl0oTdnw
zk78c0L#tJ})^-qEtG%lE35q$=+sT6e30_iI+uXN`wS)K*fDkzGs^VRe6YMHiJQYsh
ziQ=jP6c8aOG{i_7EH*gyn~*HbA#a1C_dve4GjPhQk23=51_BmZ>n`&*8>-wK+9!y^
zi2OE@V=1keqW(a5c(t2?3~<K6i>uhXiA-^FhRx1FY8OxV>xAdXNK`z%=&DAC&u`~D
zU&o&I3O9TJFl$?@hL3&<>6k6Mqm!Z$>?O7}#8zJGX=M>ja5v|NmPFJInS_03uVT|#
zG6j(`n}gH_OF`_e6FU|g$woErC)r(B^s}Y6H9E<0t?;N{SL{l+eKbBu<mb!xE)OD8
z9m%L`05dv~qP0SnU<Wz#oBi!n7ZL?KNwI@@d=nnA<<vE~*hCzmW*;rZc0N(KmL-rk
z?HtG(QL76wNY71Va%n-viM*Kd@QlJ|?VdUw%!$iBu{XACcR^}?NMTZXbVf>fR9bd<
za$5eOu*`xTY3B~7)4{b&Ws=#*NKh0O!)`u^g}5@Asc3cL>iqn?rma=Q*g<q%_@aZ_
zf~<t}bVEhy>g>YI)fp{UXROW6*Q{}kHSW~MrpE!RVILI{9~SY&u~Z*T(6WfoX#I+?
z6@jb#?Zd-Okw&eLe?g&PP0H$`l8Dtsnw*q^%<SYPk%ju0)YP~X?V7xzoD4&8Zc;&}
zCM6DkeOz%=QADx5N;Z;f6}%&0vqzcz{GEPBk7)AkcKO|DJ<Daq$OQ@0lIH7U5@KRB
z;W1&Me)^EW5Wism=&0zZn26AzNWUomP~Rxu5MTSK&{$KLCMYpFQIC&U7S<GZ#D1%l
z{oG0n*}mz%0UA&5aG!|Cgv3bw<bvVZfhqP;iLps38da-iGFfg`R&IeYHxEy(u<>d#
zwo_L*!@W>Zn4epa9G4uIYVbE1{iF3^apCcyG4@yv5ot1I82vRW6GHeK!-6!Xl*p_Y
zJv_&zB4@=h#gX<Z48&#OoA&u<YE`Y8U~AQF>bRnqobVj`=(NzxL`_msd`e1IW_Ef^
zYGjIj%C4|Xzk;abmQl%(sg&87F<J51@hOP~Nln{E+o_t_I?LiB;vyq8VF}^MVfy5#
zq=@7w``E;U_(W||VnT9)Aw4NISreBEs+x_t75N+VNoh%GY037<(W&X0teo{}xqA3W
zNllDPOw=SKCMG24i{1H%<kYBaZDvMVTACp@GdD9o%|0zTIU!Y(5EqvitBs6_j*p46
z5ApRi`e;>6WX`hS@brubLxv(bDK<%)mzR>7Ysg8>OUX^KPfAQmNYNz4CB*9E;u7Mt
zu@ONLOAIl_kmz7-gd!p;J~`SDog9@Anrn|zO+q3P5)u=z7(OvMIVmeWIWaxUJ|!tW
zDM^zRosUU1hcn2GF{Uts$`-cpq~HvFd~{?CW@=&0WTDX|sRda@Ict)Z1xF>srx?-|
znAtUxrKZJ4rx;W+=eK0B>G2uqnxf*Ig3QeDuvAKrlckyxLcBF`F)^{o7F=v(5s~r9
zhUDbL98FGmmXZ3hbq<UQF!^PrWrP`WBG<+TYNDe<FtCcW3r`G9jnwCRXL_Zqv@i9@
znmkJrmKc(ela-o-RsE?6>8Y9>KKs2Y^eR_uGrT1rf0(<*7!wo|rcaB^j7<r%PYQ`j
zHEIL>!-8TBv2k&+o-r%^^|5Ko12z89(GipM5iyAvi6tkb7*g{Rb8|Imv1zdwVIkKm
zLR?MmGh*_?wJ}jKv4*((pg@hv78NTZCXzCRZjbv^ELNw)rA8#{!B}i}kIK=sO-fWk
zY^)|0#TW<Hp#(cet7GC5l2YQ5V+_eC0vgs?mY5tCMLF#(i;0W3cx@$1^HV3GcEzKD
zwTz36#ver&AD5_wM|;_hL^XY9NVbcMj!%p=Bw%0oggAQ#@@och;dTI(wvl`y7iVXv
zNdg&<Pg|>p?e_IvYw)?SqRQ)>eOah)uJ<IbCG%zmZ5pp#61c*{XbAOkm284Ox9_<4
z)A_wLQb+Q+)Qb4&Gl`2@av4P0ZAwB_Pc{@D<=;O_9I)}lV`5u*eU~A30iSG23O8w7
zKEh~lFvf(7Gs)-KVtO_ilC3aWE!*<#rNaEJnN9S?J?on`iEpaBCEQouN^IKnesa?{
zh}2xHQGcznoY&%vt(&)Ce`gNo+Reu4b&qjAT|b;gx87!p%@z4O^4ao*@<91o`6l^!
z+YfEW+J0d>$9B1Gm~ENu4%=$myS$G7fbYc*<o$Ugzk}b;e~ZP2oZ=Il?KWI7MloBF
zg!9~T6>Ah{6jh4faZ*bcyN~P!*$uNBWw+ce&@R+2!7kM<%Wk*bWxEGBqvdBi$zEx%
zw%6EyY(LO`sQpNLH+v6zFZ)>gMEiC2U)pcC-(&xc{cW7j^4R`~{crYv*uQ8Z$4M<t
zP2O$N8RxWo)?`qVVNE79ncie+lfWj%CP_{5nykh-EgPF`$2l!uH#yzpT$77UZa4X{
z$y02FEE9M^z)3Bwg)TyOp%)gtj}@i~bAj(`SUK_<y04Yg#RBeo>ryw;ME_CaGLgzk
zisZvGkzgznaY!mmT%C*aPr6r(7(CM5W2PQQEv(=5&H7{7ojd%;o8T$P5aGrbc+M@H
zpq04R<0Xx<0qpSCNC&z?=5LV>YNGt+%7c8YkDe6z#rz4{iOWk5q$Z?cmNQ5ZYm74*
zHN*Fh`(3a6ORW^uN&Q(P<?!bnCM@XVHs+~+12RrZ$2>%n8kG_e6&(|WS;#7>3m+a8
z9T^`HACVjx)wC_N^B-XHk&GFM66;3Vl1r&MxtkJGT1F*#BnIlYOVwEZOBQ75u$1&!
zgnzhqY*fqWeT&F5ez-#FB0ck+$*07xi!0Fkk!RV0`p+-|X(rkAC3d2G6-2;yUw4JA
zTW$U926@-;uUG`-bp`Pf{nPT(ixQGrCe1rw_Jihx<X|D!hYIX-;1eAZx-u@hWz1ez
z(Hr|~O7qPg5&p&%aWO3`?L_w;b`Dlp(d(EZ^~3X(H@6tDal@3AbD_Ezz3j+s((Eu1
zemlHjxm$+e7Itm$8@s2sR_fedYJv4%&CmDz-QaLfapx5&e(}^4ixmI1MT-APu@K=J
zml6U2eoHFB&(SH{2?K@sm?<jN4-{h4+R0d{Dvgz%@!`QnpJ+{7QcPh?!36RQde6t^
z2poB`wG68?nXZ}X=9h&rUGrb)<{K3Aud3xO3gweH&*DGsZBzLlFbodrTRrG$ElSb_
zbCl?$C~ZVkRAf|Acv84QsXl-HbT#%onLGr0o=n~`^Qa-~wA#zEsYyjiJ~lb=@K|C{
z-kogKwc@~?Lj(YiCdF62+^yYMWDLzUl-}a=f;=-<XlH%lIb|M>5KzW{D^@~v|L#4p
zIVPDOIuUoa^I=B?Y5pw~y2M#SntV=llC$LBUcvzeZMJs%dYT?fezC+8e)GQNzqqvg
z+5-*ga0#2n^&;|ZA9R*lFYGOKlni<YF^DdHGb<J1a`CIIZ+P=UMF=*z5*6kZ=3`(y
zJ*B8RM^Gp&Tcddj%Av+9bA3n#h2$&M>xU6-+Ov)2#JT17Vp=fWphzjv6Go!bFjvPX
zkIvQU2_!L5vC+|*h}4L*<dnq36ut5cM0L)-ShPG)DL*T{`^v%{%btMVIK9QXa7Q@^
z{hAevt;80I7HR*FuL}GBB<cUvBIsBB*eL3E_bV*jp%l9_Xf?D;GVulSl9rN^ni7*9
zlWtHBGF~U$uIwSB*fB__`Ckef@UK`s7aM4pES&&Y;ULaIO07t$Sf}}U#^H{WXRMsF
z2%3Z<Y{%sQ0RA*VNzZ!PfjJmfBll!0345^(^Vm8<b93wsM*E=!WM58U{+f*ZmSd$~
zd5258%Dy_JQDSEiwj<V<*C3y-uDzlNYQWNzb`nP?%3Y*Yd}??~<3#xbI#E_Wa-yfv
z9H=4T*r%~;U-F(b#vqM@a{nwpif(`Vjbg79sHSRI(w6Oj)=r@uD?FpXG38w2&6%U=
zZcRZ-AHY48d{THg>Ud;SR76x#bPDRY^?)vy%vr??4X3ZFBUi^37i+91bZsaO4J^=O
z0{u+w;ggXcWKiOij~hx#+EJ-Kdu-j-eK-&+)Cs#od@N4E(Mw5u8-;XHdhj)QfL)+0
zXG85IL0I?RiB~El99&@*IW@2+?Wo78(y$AnrrQ#_?^&{LJMnyY`!P!8u|k<4$L7vc
z)jPLtI#A)gW^tk+`^b)6MfqNqWr?3@X3=GdO7*TS+jf?(YCOUPJ2+P3s1wURc3`b_
zCp)FOyPzz_fhy{6&PtH05$*_|otkNx<cB6g@Cd0wB$X;C-TgC!veis`G}oX6UIpYB
zV%%whV5IC^s8fn}azU!1qGWeTz#8`iL-y7UrMX#NSuKXnS&otEoOS+XdL^V2i4h6m
zhDs`(NK6jR&}Kq9kpk$EjCY7lNx>*SJr(nW*kp{Gm2{_`HMf*L;W{M`(N}VcCM_x@
zQaR0M9@TE`v1+%JE?B#iTk5wDGRX^5aZJmz-1A%3kT?G!9%<1-(b0S;bo8?26cjm}
zC*u`;KOQQ{J)|!7$}8R=>x@H&t|=<E@m^)ygAZ!0hqUcA?e*D;PRX)CA3dvw@2*hp
zB*E;Iqc@MVf@DiO0zLUcgM%>)QJ%X}e(j`TM9Il{*RZy=bn|XQu1;yeWMGqW<s>v3
z<q2|!r$dNRKFvST7yD*e&Un*1gwxfihv{n6ui0wUuNCNiC+U>H=Wt5Cr$TAj|I-0I
z3DC33-@OGTHac=t@;z|AP{WpISYDvIuB<5EusKb)M7Q36LP0yF8@nk1{-*9q-}O-E
zjk>R_=bRzb<CIPn<;u_4`qg9P9p#m;us+NS>%){5)y2HZVHVYeQhHN*dk}g16J|<p
zDvMSwRYG!N5vHhIA)rw<fU}>`ilKAp5PywG*OZT-wej#(qDO+>K^b85()uW|O~~7q
zrMK@fQ<<Z4;H8Vo+C|{Z8>f-HX-qMoR0Q?ncdyZ{c9(3Gw2C<@1A%<^@yk)7<x=RZ
zGBu@XTczS7bCQx)^~IKD^GY=nIvXU#JYJcYr(M6s&u6*2_cA54SlQW1DO8Q)bL@fa
zUPXG!l_cG$KDxJPO9e_AXT0p)wRiVkFdUy~y58GCh98HkDQ<0Ww~=*`@tA0EG9}zN
zSx@{q*{3+Inv?Z~(vXu4mJNY9Ts8{k82mZeIN5lZQ}O3y)9~kH)A8qUvh_@uZuAHh
z9Qv{p=5qWw9GbEM<|_O-oO&G!GaP5Ba5yRkhsEH0lpQb+<182s2f&<zc|-OX=I=5Q
zro`Fd>}@6245o_H!F-o%2eTvB5oTxZ1DGFj-C_3RkaF%*?o*hbaY#Scm+K3&KQ|cW
zaBdvTi5$|2le1^ToXa7d+#+rzOm8j{W+Im)lXFElNn9>#0nXTCvP<WDpz+Gx1_#t!
z#<NT&$Zpz%$ZQ4=#fc0K%jS5y<D_p}xXbG6={e)zsFSR>tjPeEA+2OX2Mw6iN;YxO
zM3}Qi4RC2CTQX+c=vFeHv7-mKl7&qiH>Q;=X%h95hf{)E(bIDn6%M8Hw$*MUdjsjR
zxXWb@GMuu`{Mh1@agEi^Bh6Z?U4g?~-m%*4WR5bO)ou@Uu-<BKg0tHVR=Xfm%Ua3a
zowvekh3phFtC(5M%$v--%gpbY`GlFjGE-#c3u<z<OXqvKa{@CRnW<rBYi4$0=10uz
z&CG$!9Lday%yd~k$8#w+mzj&0>CQ}VW(F|R#LOsWCNMLNnK{fX1pjFn{ck2c62}HK
z{{OyntbY8zo3^NXjwoBydzQnGtf}nIZD#eh3AdN;{l-}JdMAC07cJk>4A#tIHIvi0
z$~Z$0w0IsAxK_QHs}>T8p|a69o8DFCjusk)vz~U#DrHB}9<SnXr+>=KoDFBsIdboC
zow!~&ef|p^3*?QsJJmm7=5xgQLH%>thxNa_Vw1}{)Js-(i;pMpQG>j9sy`rmzy7}L
z1KE2BPeTgan)*U+ZGAPju6{RHf~&NC8n?dwJh!1fk}Io!!j<EF1;TN7^Ng8)$ZYWD
z54e(7Y;sVjv$|V+JcEy)(6USGuYuY>xiZvqj`~2{RrQ5PaaH{ZZVRYV+j-djKpLy+
zw{hD+eJ7~Xr}K?Zw(Q-Ph{f{$rSE6({S$avRc`{7Yuq-(wjHrix{Ml&F;ZruzePFU
zx~lahxS)nnKI*GkX^fGT$SQE?l%)htp|`n?bFZG@IHqQt6H1^p*MaN7_2CAhPaDfk
z;#@daZUN`V#c?TI7FWQn<;u9t+)i#kcZB<zJIh_-u5-7!2i%X`QyV9ncWheQbg=1S
z)7@sE&1jp6HecAxvT?InVv}Q2Xj5WSVYAofkj+_}OE!1qAIS&HC(6H&&yu^zm&jMh
zedIw%Yma)`D~F@(sQnQ$e`F?g39rA7-1Mmb0k-GNmHO@hyBy|uxZaed)IUHz7uVmQ
zRJfV-H@I1_+v0sS*IL$+YlEvD`nK0&xrjcFQlhoTRrWsjA+C>Q@5600<sCxMniPim
zX7TmXZb@B38f|4G>ko6TxaQ(=t3QmGN7h%tr3x-paH(pbiP$W;e3e22otLS5>C&VA
zRr}wCZSd1XW<ttSa6QK*qK3DYbw=(xBQKq~5qKU&bJmy&3%%D($_qVsp$9MYf8u;i
zBPT3n_R>_!x`J{yT>otfXely2GxPPbwDA5vyET`+htiu`e_S@Le!t8G*K}Mnam~lI
z5LXzk9eBSJ_hYz@!~Y3ff57cU{c+B|em^JRa>PZ;8zm>}z`5d@i_1;cfz^$d{Aj2H
zmRj+uX{o=j*WyPq8|_ojlo=+zyBS}|9<)`~U#)*szp4It{f+ux>I>^7*q+GR!+efs
z*kP8{Z)4B*+4Bjw-KgJPe;;q|qi_B{{Lo5dXbCjdM`$a5`9tjZS<OexPSYX5jmG~R
z<`YWiKmBMJ79Y)rg$|7!6d28aLjgT}L;Oe!;{xT$zxg$!h^6vpD-W9^q{LjTasCSd
zp&_1zH!Qt0cI5W&el-7dTm)Z_Kz|eNIA#zfM9b&^N`~>ZzNV2!0&{7JH#9e<`sFO_
zFZIho=|uf`{GX$LIDmU~{We*1P-Wb*#1EQyf{7BdxUkSHeg7_%%onR2mhkNPPdslZ
zi<fj8Z2z9y4ZdEzzYNis?^j>{t^NPz+d>AMybhim_*<f{y{Nwkj^4*bYv0xSA1x`x
z^DnGsJ+ZVQW=H*oALc^&&HOah1ja{N7C%~3fj20B7N#LWP=8L#la=%a>WXh!<Bw6#
zKp9haRu<@aXnZGF`Ci6288wpq1Uh=Q+N>7%gm3&B-oRR4&BEWUKgnp*)c=R})zD*r
z6X*x%&r+{wI7^z~(wJw94;BZw#eCnOe1Qw?Mef5VOR=@ivpiAXxL&QTW%VW&_Bp-N
z6j09M%gTP1{s?Z#*5_Zq5%e(lqi>{cmJpV=G;D*d;chKamVQQ=hIww~R)Z&YXDLJK
z==+8j^>^?@V`OnPy5haHj2eA5x-bfOqCEjikA-(HX<Def{*2abO*yM;M^JYTAoM1D
zg}_bxk04a@hVr2lP?K)RS|XM+%-?R9I3Kir9o&ytTxCOGyJ7W#UKU>pR;n~VlmdLy
z6w<s<u3KHL=@J-^t+`|Gn!}{M-wjqTX@5pbnU=!|kaD*82c<U|)$`UGakrr*(O4)2
z7V19iv<x3Lq=>#{NwVDE#Cw`1R;yS_X{}<Z#M7HrpEPc3PVn{#>bbSOF`v6ZopNP2
zYjcQ+@$fy|(F&~;C=Z+C{Z05QWWFOorx0|`phPVBqP_4FP@!%9Nqr>s1>cP+vrwY(
z(~ISbec9mN^3^hC_U7>OFYTv+!e8EPnqQ)0f_IMV_oD~+1mS59az>_yS&eiy=Kn84
z|4)vneNQOQEc~LpWtXMxQPc8#<JDg5e~PgE{}lTF6xhl)R+H+FTiPB*-mDc^-(mDi
z-_%#(?VGe!V$S-1__6j&+c3%rCLIk}YdCXbtq$+3HSy1c|NhONed4(rF3P+1kebOb
zr^T<n4wr~As-?Bi`8NGI)0E(%wdUp5L_p1Y56|5iS{C*Cm%pJnba=pPZ(6?g^#9uf
zYjc!u=r2&~=qQNtko6a=m08=LwdC&7h%J4(wco*bxgjy&B}P{-{|)Z1-z`0n#jT-K
zSX-m53@Nd`X|y%CAYP>HzxlEDgx;fGWI3Yk*jgiC!=L8hWvVH~SHDt7|G(4~ODN{^
zwKUY9#+%cxrmP_*>Sm4UwGjVJ`v1xg>uDQ$Q`SEt4;V$koku)x(%4vhw0D&1AHr;G
z1y(!Gux|KS%9%b{=;FDt)zt3?RrJW9hfy>x%x^5z8GRbhlltEpDY4wqH#7tbg?iuc
zWU*OdfoYwwz+Xd~U@e692bSL}@z60{75&q2vX5Y+)ENb9zkwi@JidHxpkt-R`fU0Z
z;Uv^xHfH<R(tSPD|M-NQz0A-5NbBDQN6D~}0rkYb_4F&x>HwZC<<ZzO;ert`Eyo6u
zFKsM5EmKSVvDmD9ws4k}KjWn(^s8Ui*X*yv`a1oFSpOgH?91{05bi$&VZF1prv3-7
z|J!SuH(cnrqNPvE1l-?1DbP9Q6O4Q49HoZ#L@#*-H%K4g$5M0Yj4AowMDP5!@4k@P
zH2o)yS5v6f;A=y*3A82eM$7vzIf{{3P5nCRA0cV&sCl(V`PZ0fyK3-3bJTGCt51sy
z_;BAk#(Sk!A|^|0|1#PE$9|#XNBVoE|DnB;giycX-$=*e>ov2n$7yi2%m5pnUfv;t
zVn3E2jO82N)O$AAtnV?0tdEn;rB8Hj(C}k5i?&VLOVd2kvG2<t9Xb5v?=@d9ef-z{
z>#u_gRcws%GW378{fYj|zVy%O0sRy8zM$WnmCzH^hgb8(VzP`9tdY`rw3X|u52p3w
zJb1=h9cY*shv}^Q{wtJx{&SL<4;x`1t=~#-?QqB}?LeE>8(L>+J+%=!(YNn-zLS77
zKpDznp?w=InLpJNYin!l17A-8Qb*?_H1&T9$!OsVj9lT(OU}{otn@AKEMMzazsB_I
zYMr})vSp5j7}$KzQva<q|CAD>8~$mp@TVMD{QYYxtnM@hmKK(WS9)@pO_QdSPeK=6
zQ*aSuSLBKE@rKOCUSw~Y>k_PQ@I7WF%Gp1#|0iV7O`(gF%VctA87Ci#YqadFe6W0^
ze7t;$?IHOLTyt?P!sU+3TOJ@c;T|PVz?CM?fxQq{39btHR{3surTnP;l)Oq_Ex#$p
zQH+e%6Zx-lQU1dAkgYBJQJRZv1>0t}PPXsZwzlm6_b#^GZF}1~+YYrIZ99?0{e|r;
zTQ}P!c((%nX&Nl?(|8-`Q<{{{UtN^$tCx>$knO8iLwq#OS1%gpt5=w9jBS!_2IBXo
z7tNP#o^7%1dfQFbbkY2HQ+_nut#-<j#*6WT@`PSUcf-ZfL}}AJ{P}K;oADgH`nx;A
zvGSn#WpV%2ot2es7fYG_>m4*K<w$u%)BWdrqnqt^l*wNBsd)9?SoXC18!nU+EmvAz
zuiYsR!E?sTzq+H|uzK+4yR}|6)K6MZ8tNC&#<S$8XY5Yv1<H`sx&Pvhe4t*^diHns
z#&+=M_Q2YOjH@4lo`S2tVe=Wx1zbHeTpg$j7h^;9I{#$$ZZ^H)@}<p9nA4ek7k$f3
zVfJIp?#g^#V)pgSY{OipGV?rhImsy4Gy4l>4rXu5nY}HuE0}$>H585U3ueE-+&^XZ
zP0X%h_8dmjnc0t1yN!~*mEB=3i&+Y7n0*GbH(~a9%<jrey0V7je3<<W_I44q%e<Jq
zH?v=2b~hV}GWmnqmoopA?CmP*BD>984pX~LH<qe2=F`mF571a_df8MWuCJNhhH_iZ
zvDDsUbZB?UVWm9P*Yo(MGy$@sr>qxHGQBb5?*p7nKUsg7GiK%kWrG-AW~gi!5Hlm7
zpBe?d`WV?*hM8F<^O5;NzwR#!kOcz!QX<<9+{+Q!SJ1Sd1M20b>|5C_Sq-$kcVu^E
z_hk2F-$DESQ1-p-5zsJ1Rx86^YqEOa<>egD*>O#Pi+O{4lY0xu7&Z4c*OJq6I?lko
z%e}|7<=O)y1AGkEmHUY64s^_?K*jV08fE}Dh#Lys@knko^vC0YiJ8Prfkxkjn*kKQ
zD{wJx&?hf~hJP97&aL1)fsXNkemQ^(;zBqR7sf@Pm$!wqqYL;_g}*&?&gHTu+(vFE
z5GNEd(^}RB$boCHj{(o@7{4f|D2IlEE2FI(nIW4aTPRyBTLPSrJ5WNDLw-OXq{s@u
zp9BA2FJ~HKM{z~ry4`PoZ)QBhcm;#ku`xDY1I8F*HUkEX7i=~M&v;?+j*TIhMaUw?
zK?#e4B7_JcU?4b#7y<|(h!jX7q$q46kwW-EP(=8FP=pjEK?=!tPj%0{v5i20(xp1p
zue!Usx^DHUd#i6fwNC%G>1_x65&E8fJWu#7zKX}EoXvB78!w-3>)~lu@jPqnYTIhp
z+4XjV-PHROh9q*CetC%=TAn`+4@jc1&QYSTf38e>pW+Lp`SoRapzMs6PC|(>`@(P$
z-dmU8yR{t8t;@m+q_Hxrk_Xr2$mL2&W?d$m9e8cs%3H8A+!l6)?}giu(+|QO;ZCG=
zci0_%h)>u3crHANKi4yObGet)hv8HF7I?v|U?n8huvWYnI;_)<v=MkRjIl1f87A07
zR)DztX4))yHk@H++SzuFooDCUB3oih?LxcQE|pY!kmwq_%GTKi+a$Se>y_+I+ok?@
z1Yd9Wg(uh_LKu#PKY~6vnqE0JOhH#&6c&f2;p*_LyewV{zYf0%Z-h6qK8q(9Eo7l9
zOxBxk_;LBdrl*Lhdx_y8mhgqd{pQ@u%XKC9n=8q0t}MT~ns{J<{N_63H#bNeFj#(b
zL*+L&On!5R%Wv)owfb=R%^fAbxzX~Q8^b%XjheXM+&KBoO{Jeb49~dV-08d_ui&5O
zeslBXH+Qc5=9bHEuA4VxK-eI^xvj85SGZYzbGOQG?z{4v+a<rbJLETar~KyblHc6j
z@|)W&zqxzmH}|0Y=Jv{OZlC<-_RDYX1=_+rq*7XV6fHD{U|CBhJe9XxjiV{N>GPm1
z@Ie`#s1rJ1(U}}SfsnwavpDlaLJC*Rrd3ZO6veJ3_;oJV`TS=E7CDvDoNG%w{TW;}
zk5Gqo&t(5BLId_an|sYCw8A&%a!2=GY=e0g;3IcFp&dWQh1B6XLP86Fhx=YnD8bL$
zDaYUGnp!)BtM{<~D?$ynewj0WPiPOX6B3yF9dewzQ`q}2l<+>xU4yOvL(YE*39OB$
z56qo{MJs}3E93W6wJKP*I(@6fTEI4I1KX_~Jj@OQ2im|;gy9E+Lv1K{xE&4-x8b3L
zWJiLdZ8SL6#)9K)9OyohC1iaJILRi3GGoCMaGFg6XV?sw+r1{Ml73avuS)t=q<=D3
zonoher`c)XJevoeWoJ>_`8FRs*UkkO*aC2&Ed&?a;?Q6`xd2>d%fO55qR_(FatXNH
zmV+zszHEV;yF)8|X(hPYR)g2twV{o1<~!ha+Ya7nH-b0Y&7qxf=N52>?Fb!qD<e<`
zy(Y2U_<Z=5hUt12-5c&0<s1n3LH2GP+8c_GN1(?ZMH~Y|41pV_!48A)pB#qI)?mK&
z@V!UdRAfBT?@06zQ~XeyetTX@pLJF!(Nim`NoQ6<puYzCqlX&Nw}x;MUkqBZ*h>Fo
zVJ!XXXwcaw=o`XF?jG-%Q2vCb&_WBuFcC)b5PEaQQ`WHxDyRt(N*hiozRh62Z`0Qc
zezqxV1X#^#s|;Wy@7Xw|UMKfSJ<2^u`)zSf+0V;uedh+h))e!0^Op4ByilYKK5rXI
zU1O{&ok6V<o-@V?N=@}_;SS@QV*K5AZoJ0(iEl=G^+o@k=ecycINC+(xs$SE`8jzS
z^ZnPPrW)ln^P0qCo_a5hu@z48zS7nkIZO+<FZO|Pfb!gzw>f$Xd-UF(_xMA%pSST6
zVuCD6gu^70Dr5gev|{w%z632G(P&ga7g)|6-Iu!+jbH`&J%lov!Akbmgv+_=3PLMm
z)s^&xs|XD=xV5zZIzp>PuK{Qo8@XyTp*`#%7^Bxtp7%C1hYsm@HS~siXoLF+4K#<n
zT>B)UMPpk5E#evO^$MXNZ6ZOR_>glxBNV&~1w*soy+FHgFKrfof)%U4m<?l8M%!ow
z2QUg2&^kK6PU{3m*(kVdjE#X!x~vNvZ^+Ch7<~zCWFk3JZ7PUX0$0wondHy1S>SA&
zP5Ecr+3?*tb`E%+od=$ehj|TcWf8c<mV`Q5%Tn+{yAZtCE)IvG!CVTWo5GAe)&mc&
zvQ^+3e9>FbX|96r*4a96gKYpe*(UI6eAL^}U$?@N+iV;A*V%Pp0NU*J;0<;Ic$3`(
z?zEk7`YyDfR+=ZV+uRqNZ5(eqb24mG!w98^f}A7AyVp3JI1+Rw9LD!a*Y&5-$EWiq
zPDHLp)9Z#tPb-d$MNZCE&T+oQbV~e@{r0?ZdLI}8>4T|iQtCaYPTgEv8v;`dVSg%8
zcN|O@l0|37cCIMWgZxj;@@+DAkN0$JG=(9wKn#Omb`LXpa}KAhBNg&;JRQwFtAq-r
z#4VN__wmKo<}4jx2iO0YMQ_?B(|?&+q()w+Dn|zr`fpJdeqQ87Z)ZIC)rOJv^Ygug
z{Qmj9^J9JKWa=7YU8&cq%5%opP#RQEudDZoJjUOB=f-Q|H*IJ2K}~Tg`yM^drQ>7e
z6jJ}?b<2<E=?wBb-&5Z^@Gky49*t*tFO9JcR`9;!>n~zd5y&cfST(2Z%JVU#IeH6w
z9Faw@(_qd>>Dxz8>OMk>h42J<2|A^ZKW?eIt?HpHjo#2X=W^V2$yB;z0gL_|&UKBl
zE?u%DU9v7+vJ9VIO3!ijtb}et1IAp#zB6V;{8$w~)@17%^8hzcn)71?HoTiQa@MP0
z`{L;?``5&P73rIGbo@V&|7U_RGw?UA{RhFA9r!2sZvty(2$2UXR<jz6;M`ZS$wnVB
z*8vlA9Wb%!Ha*kPQt4=^bhK1DT58?a4OhC3R*;TXK<mE}t#hrd1=rhpaHDMmH```#
zi){g&r>a;6*RbzARTEFu#8Wl#R82ZvT{>M|I$c>hU742dq?ZoisfH7ZdN=FHa0KI4
zv@S;Teiq;+w=u>NTCn97(Q1ncWo){oyi->bD%f_<()!O4YOG~=k+NSRq_Xu2SbJ}f
z^Clt9tv>2|D`muf6L@F+E&k@Wl6WQOy_k9*j+_7XSmycA{HY@r!2vbtq;8QHDx}UX
z1)(!#HH&rLAb(G5ygxx~Ny6sb81LztK=YQfOmkk}zL$0IHjuJnX@0EOv>)Gm&yAX-
z?{!kU<}K&fSf|nfN8_3P4#%y6O#3#!HordRdQJS9JbXS==GQf-jqevp^ES`ZIDYl7
zYd)ss=j5sPlY=+U%ky12F5h-BrP~$pSbk1^USFLDA5<g1TioJV-b-VQTxGO!9{oI*
z?7?x6@_g)Vj^4r^y|;Vx`Z!a@RYIN~N7-(n`-;GmK)1L}wzi2G6ER~d`???ojQV3y
z+*cI$6~%fb+1e)i8t;5UQC7CezBX}RQS+gZ^@_5iO%}8p&?tSfpiLHZ<hY_Zt|*Qx
z%2GC2$|g(MWGValKfVXbZZ+AhCcD*Sw=$QFm70hF6ER>S228|&sTeR71E#W43*xns
zY}JC;tt5-JAdV}^ZY_xE&_~e`YV>UXGZ*JKL$-WR)0;hyJzt0AqfSwyPAMC8e7vct
zRTGUgMYV0J@ur~hrl|3zq}e3b;xDB)`>4~<{9Row-#}NtoN|5aX*6l;aU5!qM9SGX
z<g#dJ1Zt5cUY8CYN2A6;qftYnQL*1><hptN5Tntj%mG&8m?X`;Dh<6MsWl|E1~Y%h
zp(CGar-EnNnPAkNT`o1rr6#%5q&rt6otmVRNIHq6lW6Q|k&IHws4N+!l2KVQN+qMR
zWRyxqWsOEfjYdU{MkS3#CF#+1WHwY1igSF{B$YxY6`xBgWbN2IZu<;Tp<f$)-dNqu
zNZbEOd^RM_YVWflX;x#O4JoLu1!~sWPfKyjEtMsf*T$`>LO<#GtZe$F>eQ?!xUEu<
ztx}M!g0)2-uG#6uyZWtv?c#21tV(ru^7XGHnM0Y2#+0vvU7&TatF;bxyVk+prFF26
zY8~v0S_k`<*1>+Lb+DghrNwoyqu`=bcq9A{6`tSM!;Z!tIiC5z^RnEyGIk8M%1mYm
z7i76{jqF(Lm=l;aJU`2gt7UzjcNUzsFw2eWX2+r1p2)1?qAWMApdF8vI~(p>oaM%~
zv`1qboy4r;k}Nl_s-1wfG>13&f-E<#uRR8R_+)y~(y*+jXZ<xvN!ThJBs@~sB|KJm
zoN$hCo^XM1+3Jm(HYAq`R}0q)Hw&*7-YDE5+$Fq2c#rVD%eVBbN*)yM6+R>UrSMhZ
zTf%pR9|-?0{M0cmtiS4tp0riiDI6voA?y-P6iyS)6wVQzE}Xx9)2j99Lg6yua^Xth
zmBNj}YlPc{w`|<DVN1GG_<iAS;l08KgnNX0h5Loi311YxylKnojp?hx*Mx5i-x0ni
z{6P4T@Dt&`gr7MU3R|~r-dd;$2M7lVj}VR$ju##)oFSYgoGYBidy)|Sefp-;I3xCT
z(BGvvBl-W>GwG>c58boK=V2XPgY)s$(Z^h$33GIgl5Y^`I;C^V*G1RxOnTl|#kxxP
zsyGN{I}Wxv3ud~6nYy)M3tH9==Gu0L`@%zv=}%(={g$t_f8+~=_cs6Dt#-0c)J948
zX?P*qdzrIzPIxa%KgiOLveZ|x`V)VcrTOu{X20M6!s9NNg!1#df9f-Ks#j;c)}G6L
zKcD@6jry8#NBda!b{*GqxEHxzo0vnn_O5c@RbHo_GqJagwY~OsmY4AS1vH7v&>&WE
z#q&+SjC=o%bN37P3ik*f026zFnzhke+wD%yx?leu@gwHp%<c=1gSV68HM>VSv1S96
zvzwe<SzTjJx1ZlHX8}34^yc6LL5+R1bIb89(iM#1iO<GjnGZ&y`?2Mp0w-Y4-x;3D
zpNW6ed&nNPJ@$w_YLBrh{Bhe$NgtzG4htigC7;3wIfv13J|o{UO8c4pggUm_K6{9?
z!=A8*N!wXXzK5efw@1MJ_9*z2JqA9_O8Ufp!MFc}_2zp)bP{G3rc-~PRq=HVylr+8
z`+v~h9PK5nW^ZMMJ9VbEhpweDPwZ2?v<|_0tk1<bt`vHC#;EV*FGnlvMnmzO6`sS~
z(RgMkS97=Kuef7%#%rD{Uj^@f#{KuItrN5e|3{MqO<;}ATn-Lqj^TLjd<Mr>P#gZ;
nB)=bJ?4ymIq-FNgB2Uv2&*=KOs&zu`R`R=*>;39AhdTd%DIu2D

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass/overpass-light.otf b/docs/_static/fonts/overpass/overpass-light.otf
new file mode 100644
index 0000000000000000000000000000000000000000..b060651a442a5e7fbe9425c4a7f0990b8ec6636d
GIT binary patch
literal 69324
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

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass/overpass-regular.otf b/docs/_static/fonts/overpass/overpass-regular.otf
new file mode 100644
index 0000000000000000000000000000000000000000..3a7c095fab33942b0597fcbd57fbfec815c9a2c5
GIT binary patch
literal 69808
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
D3Nx>f

literal 0
HcmV?d00001

diff --git a/docs/_static/fonts/overpass/overpass-semibold.otf b/docs/_static/fonts/overpass/overpass-semibold.otf
new file mode 100644
index 0000000000000000000000000000000000000000..176fb43ce14a23251c04318345785f99bf52f2c3
GIT binary patch
literal 65704
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

literal 0
HcmV?d00001

diff --git a/docs/_static/img/favicon.ico b/docs/_static/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..a2b8f877a358ab47a3b62854598b4e5fbef720b5
GIT binary patch
literal 15086
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
aexB;|fAgO+`^Uile+=+FAU~fN4g3dslxRW#

literal 0
HcmV?d00001

diff --git a/docs/_static/img/hamburger-dark.svg b/docs/_static/img/hamburger-dark.svg
new file mode 100644
index 0000000000..26d9fed9df
--- /dev/null
+++ b/docs/_static/img/hamburger-dark.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="#E6E3EC" xmlns="http://www.w3.org/2000/svg" focusable="false" class="color-toggle-icon" aria-hidden="true">
+<path d="M 3 5 A 1.0001 1.0001 0 1 0 3 7 L 21 7 A 1.0001 1.0001 0 1 0 21 5 L 3 5 z M 3 11 A 1.0001 1.0001 0 1 0 3 13 L 21 13 A 1.0001 1.0001 0 1 0 21 11 L 3 11 z M 3 17 A 1.0001 1.0001 0 1 0 3 19 L 21 19 A 1.0001 1.0001 0 1 0 21 17 L 3 17 z" />
+</svg>
\ No newline at end of file
diff --git a/docs/_static/img/hamburger-light.svg b/docs/_static/img/hamburger-light.svg
new file mode 100644
index 0000000000..d5d0d0aed2
--- /dev/null
+++ b/docs/_static/img/hamburger-light.svg
@@ -0,0 +1,3 @@
+<svg width="24px" height="24px" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" focusable="false" class="color-toggle-icon" aria-hidden="true">
+<path fill="#2B247C" d="M 3 5 A 1.0001 1.0001 0 1 0 3 7 L 21 7 A 1.0001 1.0001 0 1 0 21 5 L 3 5 z M 3 11 A 1.0001 1.0001 0 1 0 3 13 L 21 13 A 1.0001 1.0001 0 1 0 21 11 L 3 11 z M 3 17 A 1.0001 1.0001 0 1 0 3 19 L 21 19 A 1.0001 1.0001 0 1 0 21 17 L 3 17 z" />
+</svg>
\ No newline at end of file
diff --git a/docs/_static/img/logo-dark.svg b/docs/_static/img/logo-dark.svg
new file mode 100644
index 0000000000..92a12a9fed
--- /dev/null
+++ b/docs/_static/img/logo-dark.svg
@@ -0,0 +1,8 @@
+<svg width="100" height="160" viewBox="0 0 100 160" fill="#E6E3EC" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.8" d="M50 44.3013L25 1L0 44.3013L25 87.6025L50 44.3013Z" />
+<path opacity="0.45" d="M50 44.3091L75 1.00781L25 1.00781L0 44.3091H50Z" />
+<path opacity="0.6" d="M75 1.00781L25 1.00781L50 44.3091H100L75 1.00781Z" />
+<path opacity="0.8" d="M50 115.699L75 159L100 115.699L75 72.3975L50 115.699Z" />
+<path opacity="0.45" d="M50 115.691L25 158.993H75L100 115.691L50 115.691Z" />
+<path opacity="0.6" d="M25 158.993H75L50 115.691L0 115.691L25 158.993Z" />
+</svg>
diff --git a/docs/_static/img/logo.svg b/docs/_static/img/logo.svg
new file mode 100644
index 0000000000..19391843b4
--- /dev/null
+++ b/docs/_static/img/logo.svg
@@ -0,0 +1,8 @@
+<svg width="100" height="160" viewBox="0 0 100 160" fill="#2B247C" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.8" d="M50 44.3013L25 1L0 44.3013L25 87.6025L50 44.3013Z" />
+<path opacity="0.45" d="M50 44.3091L75 1.00781L25 1.00781L0 44.3091H50Z" />
+<path opacity="0.6" d="M75 1.00781L25 1.00781L50 44.3091H100L75 1.00781Z" />
+<path opacity="0.8" d="M50 115.699L75 159L100 115.699L75 72.3975L50 115.699Z" />
+<path opacity="0.45" d="M50 115.691L25 158.993H75L100 115.691L50 115.691Z" />
+<path opacity="0.6" d="M25 158.993H75L50 115.691L0 115.691L25 158.993Z" />
+</svg>
diff --git a/docs/_static/img/moon.svg b/docs/_static/img/moon.svg
new file mode 100644
index 0000000000..607dc1b47f
--- /dev/null
+++ b/docs/_static/img/moon.svg
@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="#2B247C" xmlns="http://www.w3.org/2000/svg" focusable="false" class="color-toggle-icon" aria-hidden="true">
+<path d="M21.4,13.7C20.6,13.9,19.8,14,19,14c-5,0-9-4-9-9c0-0.8,0.1-1.6,0.3-2.4c0.1-0.3,0-0.7-0.3-1 c-0.3-0.3-0.6-0.4-1-0.3C4.3,2.7,1,7.1,1,12c0,6.1,4.9,11,11,11c4.9,0,9.3-3.3,10.6-8.1c0.1-0.3,0-0.7-0.3-1 C22.1,13.7,21.7,13.6,21.4,13.7z" />
+</svg>
\ No newline at end of file
diff --git a/docs/_static/img/sun.svg b/docs/_static/img/sun.svg
new file mode 100644
index 0000000000..f86fd22b2d
--- /dev/null
+++ b/docs/_static/img/sun.svg
@@ -0,0 +1,13 @@
+<svg width="24" height="24" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" focusable="false" class="color-toggle-icon" aria-hidden="true">
+  <g stroke-linejoin="round" stroke-linecap="round" stroke-width="2" fill="none" stroke="#E6E3EC">
+    <circle cx="12" cy="12" r="5" />
+    <path d="M12 1v2" />
+    <path d="M12 21v2" />
+    <path d="M4.22 4.22l1.42 1.42" />
+    <path d="M18.36 18.36l1.42 1.42" />
+    <path d="M1 12h2" />
+    <path d="M21 12h2" />
+    <path d="M4.22 19.78l1.42-1.42" />
+    <path d="M18.36 5.64l1.42-1.42" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/docs/_static/js/constants.js b/docs/_static/js/constants.js
new file mode 100644
index 0000000000..abdeb4464f
--- /dev/null
+++ b/docs/_static/js/constants.js
@@ -0,0 +1,31 @@
+// Color mode constants
+const [DARK, LIGHT] = ["dark", "light"];
+const LIGHT_LOGO_PATH = "_static/img/logo.svg";
+const DARK_LOGO_PATH = "_static/img/logo-dark.svg";
+const SUN_ICON_PATH = "_static/img/sun.svg";
+const MOON_ICON_PATH = "_static/img/moon.svg";
+const LIGHT_HAMBURGER_PATH = "_static/img/hamburger-light.svg";
+const DARK_HAMBURGER_PATH = "_static/img/hamburger-dark.svg";
+const COLOR_TOGGLE_ICON_CLASS = "color-toggle-icon";
+const SOLIDITY_LOGO_CLASS = "solidity-logo";
+const LS_COLOR_SCHEME = "color-scheme";
+
+// Solidity navigation constants
+const SOLIDITY_HOME_URL = "https://soliditylang.org";
+const BLOG_URL = `${SOLIDITY_HOME_URL}/blog`;
+const DOCS_URL = "/";
+const USE_CASES_PATH = `${SOLIDITY_HOME_URL}/use-cases`;
+const CONTRIBUTE_PATH = `/en/latest/contributing.html`;
+const ABOUT_PATH = `${SOLIDITY_HOME_URL}/about`;
+const FORUM_URL = "https://forum.soliditylang.org/";
+const NAV_LINKS = [
+  { name: "Blog", href: BLOG_URL },
+  { name: "Documentation", href: DOCS_URL },
+  { name: "Use cases", href: USE_CASES_PATH },
+  { name: "Contribute", href: CONTRIBUTE_PATH },
+  { name: "About", href: ABOUT_PATH },
+  { name: "Forum", href: FORUM_URL },
+];
+
+const MOBILE_MENU_TOGGLE_CLASS = "shift";
+const WRAPPER_CLASS = "unified-wrapper";
diff --git a/docs/_static/js/initialize.js b/docs/_static/js/initialize.js
new file mode 100644
index 0000000000..c875b37df8
--- /dev/null
+++ b/docs/_static/js/initialize.js
@@ -0,0 +1,250 @@
+const getLogoSrc = (isDark) => (isDark ? DARK_LOGO_PATH : LIGHT_LOGO_PATH);
+
+const getModeIconSrc = (isDark) => (isDark ? SUN_ICON_PATH : MOON_ICON_PATH);
+
+const getMenuIconSrc = (isDark) =>
+  isDark ? DARK_HAMBURGER_PATH : LIGHT_HAMBURGER_PATH;
+
+function addFooterNote() {
+  const contentInfo = document.querySelector("div[role=contentinfo]");
+  const footerNote = document.createElement("p");
+  footerNote.classList.add("footer-note");
+  footerNote.innerHTML =
+    'Customized with ❤️ by the <a href="https://ethereum.org/" target="_blank">ethereum.org</a> team.';
+  contentInfo.parentNode.insertBefore(footerNote, contentInfo.nextSibling);
+}
+
+function rearrangeDom() {
+  const bodyDivs = document.querySelectorAll("body>div");
+  bodyDivs.forEach((div) => div.remove());
+  const wrapperDiv = document.createElement("div");
+  wrapperDiv.classList.add(WRAPPER_CLASS);
+  bodyDivs.forEach((div) => wrapperDiv.appendChild(div));
+  document.body.prepend(wrapperDiv);
+
+  const rstVersions = document.querySelector(".rst-versions");
+  rstVersions.remove();
+  const wyNavSide = document.querySelector("nav.wy-nav-side");
+  wyNavSide.appendChild(rstVersions);
+  const backdrop = document.createElement("div");
+  backdrop.classList.add("backdrop");
+  wrapperDiv.appendChild(backdrop);
+
+  const content = document.querySelector(".wy-nav-content");
+  content.id = "content";
+  const oldWrap = document.querySelector("section.wy-nav-content-wrap");
+  oldWrap.remove();
+  document.querySelector(".wy-grid-for-nav").appendChild(content);
+}
+
+function buildHeader() {
+  const isDarkMode = localStorage.getItem(LS_COLOR_SCHEME) == DARK;
+
+  const header = document.createElement("div");
+  header.classList.add("unified-header");
+  document.querySelector(`.${WRAPPER_CLASS}`).prepend(header);
+
+  const innerHeader = document.createElement("div");
+  innerHeader.classList.add("inner-header");
+  header.appendChild(innerHeader);
+
+  const homeLink = document.createElement("a");
+  homeLink.classList.add("home-link");
+  homeLink.href = SOLIDITY_HOME_URL;
+  homeLink.ariaLabel = "Solidity home";
+  innerHeader.appendChild(homeLink);
+
+  const logo = document.createElement("img");
+  logo.classList.add(SOLIDITY_LOGO_CLASS);
+  logo.src = getLogoSrc(isDarkMode);
+  logo.alt = "Solidity logo";
+  homeLink.appendChild(logo);
+
+  const skipToContent = document.createElement("a");
+  skipToContent.classList.add("skip-to-content");
+  skipToContent.href = "#content";
+  skipToContent.innerText = "{ skip to content }";
+  innerHeader.appendChild(skipToContent);
+
+  const navBar = document.createElement("nav");
+  navBar.classList.add("nav-bar");
+  innerHeader.appendChild(navBar);
+
+  const linkElements = NAV_LINKS.map(({ name, href }) => {
+    const link = document.createElement("a");
+    link.classList.add("nav-link");
+    link.setAttribute("key", name);
+    link.setAttribute("href", href);
+    link.setAttribute("aria-label", name);
+    if (href === FORUM_URL) {
+      link.classList.add("forum-link");
+      link.setAttribute("target", "_blank");
+      link.setAttribute("rel", "noopener noreferrer");
+    }
+    link.innerText = name;
+    return link;
+  });
+  linkElements.forEach((link) => navBar.appendChild(link));
+
+  // Flex wrapper for color mode and mobile menu buttons
+  const navButtonContainer = document.createElement("div");
+  navButtonContainer.classList.add("nav-button-container");
+  navBar.appendChild(navButtonContainer);
+
+  // Build color toggle
+  const toggleIcon = document.createElement("img");
+  toggleIcon.classList.add(COLOR_TOGGLE_ICON_CLASS);
+  toggleIcon.src = getModeIconSrc(isDarkMode);
+  toggleIcon.alt = "Color mode toggle icon";
+  toggleIcon.setAttribute("aria-hidden", "true");
+  toggleIcon.setAttribute("key", "toggle icon");
+  const colorModeButton = document.createElement("button");
+  colorModeButton.classList.add("color-toggle");
+  colorModeButton.setAttribute("type", "button");
+  colorModeButton.setAttribute("aria-label", "Toggle light dark mode");
+  colorModeButton.setAttribute("key", "color mode button");
+  colorModeButton.addEventListener("click", toggleColorMode);
+  colorModeButton.appendChild(toggleIcon);
+  navButtonContainer.appendChild(colorModeButton);
+
+  // Build mobile hamburger menu
+  const menuIcon = document.createElement("img");
+  menuIcon.classList.add(COLOR_TOGGLE_ICON_CLASS);
+  menuIcon.src = getMenuIconSrc(isDarkMode);
+  menuIcon.alt = "Toggle menu";
+  menuIcon.setAttribute("aria-hidden", "true");
+  menuIcon.setAttribute("key", "menu icon");
+  const menuButton = document.createElement("button");
+  menuButton.classList.add("color-toggle");
+  menuButton.classList.add("mobile-menu-button");
+  menuButton.setAttribute("type", "button");
+  menuButton.setAttribute("aria-label", "Toggle menu");
+  menuButton.setAttribute("key", "menu button");
+  menuButton.addEventListener("click", toggleMenu);
+  menuButton.appendChild(menuIcon);
+  navButtonContainer.appendChild(menuButton);
+}
+
+const updateActiveNavLink = () => {
+  const navLinks = document.querySelectorAll(".unified-header .nav-link");
+  navLinks.forEach((link) => {
+    const href = link.getAttribute("href");
+    if (document.documentURI.includes("contributing.html")) {
+      link.classList[href.includes("contributing.html") ? "add" : "remove"](
+        "active"
+      );
+    } else {
+      link.classList[document.documentURI.includes(href) ? "add" : "remove"](
+        "active"
+      );
+    }
+  });
+};
+
+document.addEventListener("locationchange", updateActiveNavLink);
+
+function initialize() {
+  // Preload fonts
+  const fonts = [
+    "overpass-regular.otf",
+    "overpass-bold.otf",
+    "overpass-mono-regular.otf",
+    "overpass-mono-bold.otf",
+  ];
+  fonts.forEach((filename) => {
+    const link = document.createElement("link");
+    link.rel = "preload";
+    link.as = "font";
+    link.href = `https://solidity-docs-dev.readthedocs.io/en/latest/_static/fonts/${filename}`;
+    link.crossOrigin = "";
+    document.head.appendChild(link);
+  });
+
+  // Rearrange DOM elements for styling
+  rearrangeDom();
+
+  // Check localStorage for existing color scheme preference
+  var prefersDark = localStorage.getItem(LS_COLOR_SCHEME) == DARK;
+  // Check link for search param "color"... it may be "light" or "dark"
+  var urlParams = new URLSearchParams(window.location.search);
+  if (urlParams.size > 0) {
+    // This is used for color mode continuity between the main Solidity Lang site and the docs
+    var colorSchemeParam = urlParams.get("color");
+    // If present, overwrite prefersDark accordingly
+    if (colorSchemeParam) {
+      prefersDark = colorSchemeParam == DARK;
+    }
+
+    // Remove "color" search param from URL
+    const { location, title } = document;
+    const { pathname, origin, search, hash } = location;
+    const newSearchParams = new URLSearchParams(search);
+    newSearchParams.delete("color");
+    const sanitizedSearch =
+      newSearchParams.size < 1 ? "" : "?" + newSearchParams.toString();
+    window.history.replaceState(
+      origin,
+      title,
+      pathname + sanitizedSearch + hash
+    );
+  }
+
+  // In case none existed, establish localStorage color scheme preference
+  var mode = prefersDark ? DARK : LIGHT;
+  localStorage.setItem(LS_COLOR_SCHEME, mode);
+
+  // Select the root element and set the style attribute to denote color-scheme attribute
+  document
+    .querySelector(":root")
+    .setAttribute("style", `--color-scheme: ${mode}`);
+
+  // Remove old input and RTD logo anchor element
+  document.querySelector("input[name=mode]").remove();
+  document.querySelector("label[for=switch]").remove();
+  document.querySelector(".wy-side-nav-search > a").remove();
+
+  // Add footer note
+  addFooterNote();
+
+  // Build header
+  buildHeader();
+
+  // Close menu
+  toggleMenu({ force: false });
+
+  // Update active nav link
+  updateActiveNavLink();
+}
+
+document.addEventListener("DOMContentLoaded", initialize);
+
+const handleClick = (e) => {
+  if (e.target.closest(".backdrop")) {
+    toggleMenu({ force: false });
+  }
+
+  if (e.target.closest("a")) {
+    const target = e.target.closest("a");
+    const href = target.getAttribute("href");
+    if (href.includes(SOLIDITY_HOME_URL)) {
+      const url = new URL(href);
+      const params = new URLSearchParams(url.search);
+      params.set("color", localStorage.getItem(LS_COLOR_SCHEME));
+      url.search = params.toString();
+      target.setAttribute("href", url.toString());
+    }
+  }
+};
+document.addEventListener("click", handleClick);
+
+const handleKeyDown = (e) => {
+  if (e.metaKey && e.key === "k") {
+    document.querySelector("#rtd-search-form input").focus();
+  } else if (e.key === "Escape") {
+    toggleMenu({ force: false });
+  }
+  if (e.metaKey && e.code === "Backslash") {
+    toggleColorMode();
+  }
+};
+document.addEventListener("keydown", handleKeyDown);
diff --git a/docs/_static/js/toggle.js b/docs/_static/js/toggle.js
index 780ea9ee71..6ea2dd1f80 100644
--- a/docs/_static/js/toggle.js
+++ b/docs/_static/js/toggle.js
@@ -1,39 +1,47 @@
-document.addEventListener('DOMContentLoaded', function() {
+function toggleColorMode() {
+  // Check localStorage for previous color scheme preference, assign the opposite
+  var newMode = localStorage.getItem(LS_COLOR_SCHEME) == DARK ? LIGHT : DARK;
 
-    function toggleCssMode(isDay) {
-        var mode = (isDay ? "Day" : "Night");
-        localStorage.setItem("css-mode", mode);
+  // Update localStorage with new color scheme preference
+  localStorage.setItem(LS_COLOR_SCHEME, newMode);
 
-        var url_root = DOCUMENTATION_OPTIONS.URL_ROOT == "./" ? "" : DOCUMENTATION_OPTIONS.URL_ROOT;
-        var daysheet = $(`link[href="${url_root}_static/pygments.css"]`)[0].sheet;
-        daysheet.disabled = !isDay;
+  // Update the root element with the new color scheme preference
+  document
+    .querySelector(":root")
+    .setAttribute("style", `--color-scheme: ${newMode}`);
 
-        var nightsheet = $(`link[href="${url_root}_static/css/dark.css"]`)[0];
-        if (!isDay && nightsheet === undefined) {
-            var element = document.createElement("link");
-            element.setAttribute("rel", "stylesheet");
-            element.setAttribute("type", "text/css");
-            element.setAttribute("href", `${url_root}_static/css/dark.css`);
-            document.getElementsByTagName("head")[0].appendChild(element);
-            return;
-        }
-        if (nightsheet !== undefined) {
-            nightsheet.sheet.disabled = isDay;
-        }
-    }
-
-    var initial = localStorage.getItem("css-mode") != "Night";
-    var checkbox = document.querySelector('input[name=mode]');
+  // Update logo
+  document
+    .querySelector(`img.${SOLIDITY_LOGO_CLASS}`)
+    .setAttribute("src", newMode === LIGHT ? LIGHT_LOGO_PATH : DARK_LOGO_PATH);
 
-    toggleCssMode(initial);
-    checkbox.checked = initial;
+  // Update color mode toggle icon
+  document
+    .querySelector(`img.${COLOR_TOGGLE_ICON_CLASS}`)
+    .setAttribute("src", newMode === LIGHT ? MOON_ICON_PATH : SUN_ICON_PATH);
 
-    checkbox.addEventListener('change', function() {
-        document.documentElement.classList.add('transition');
-        window.setTimeout(() => {
-            document.documentElement.classList.remove('transition');
-        }, 1000)
-        toggleCssMode(this.checked);
-    })
+  // Update hamburger menu icon color
+  document
+    .querySelector("button.mobile-menu-button img")
+    .setAttribute(
+      "src",
+      newMode === LIGHT ? LIGHT_HAMBURGER_PATH : DARK_HAMBURGER_PATH
+    );
+}
 
-});
\ No newline at end of file
+function toggleMenu(options = {}) {
+  const handleClassToggle = ({ classList }, className) => {
+    if (typeof options.force !== "undefined") {
+      classList.toggle(className, options.force);
+    } else {
+      classList.toggle(className);
+    }
+  };
+  document
+    .querySelectorAll('[data-toggle="rst-versions"]')
+    .forEach((e) => handleClassToggle(e, MOBILE_MENU_TOGGLE_CLASS));
+  document
+    .querySelectorAll('[data-toggle="wy-nav-shift"]')
+    .forEach((e) => handleClassToggle(e, MOBILE_MENU_TOGGLE_CLASS));
+  handleClassToggle(document.querySelector(`.${WRAPPER_CLASS}`), "menu-open");
+}
diff --git a/docs/conf.py b/docs/conf.py
index 7cd047a060..550fbf4b36 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -31,7 +31,10 @@ def setup(sphinx):
     sphinx.add_lexer('Solidity', SolidityLexer)
     sphinx.add_lexer('Yul', YulLexer)
 
+    sphinx.add_css_file('css/fonts.css')
     sphinx.add_css_file('css/custom.css')
+    sphinx.add_css_file('css/custom-dark.css')
+    sphinx.add_css_file('css/pygments.css')
 
 # -- General configuration ------------------------------------------------
 
@@ -132,7 +135,6 @@ def setup(sphinx):
 # documentation.
 html_theme_options = {
     'logo_only': True,
-    'style_nav_header_background': '#65afff',
     'display_version': True,
 }
 
@@ -148,12 +150,12 @@ def setup(sphinx):
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-html_logo = "logo.svg"
+# html_logo = "logo.svg"
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-html_favicon = "_static/img/favicon.png"
+html_favicon = "_static/img/favicon.ico"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -162,12 +164,12 @@ def setup(sphinx):
 
 html_css_files = ["css/toggle.css"]
 
-html_js_files = ["js/toggle.js"]
+html_js_files = ["js/constants.js", "js/initialize.js", "js/toggle.js"]
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-html_extra_path = ["_static/css"]
+html_extra_path = ["_static/css", "_static/fonts"]
 
 # List of templates of static files to be included in the HTML output.
 # Keys represent paths to input files and values are dicts containing:
@@ -210,7 +212,7 @@ def setup(sphinx):
 #html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+html_show_sphinx = False
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
 #html_show_copyright = True
diff --git a/docs/logo.svg b/docs/logo.svg
index 86b9f4995b..19391843b4 100644
--- a/docs/logo.svg
+++ b/docs/logo.svg
@@ -1,27 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
-	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1300px" height="1300px"
-	 viewBox="0 0 1300 1300" enable-background="new 0 0 1300 1300" xml:space="preserve">
-<title>Vector 1</title>
-<desc>Created with Sketch.</desc>
-<g id="Page-1" sketch:type="MSPage">
-	<g id="solidity" transform="translate(402.000000, 118.000000)" sketch:type="MSLayerGroup">
-		<g id="Group" sketch:type="MSShapeGroup">
-			<path id="Shape" opacity="0.45" enable-background="new    " d="M371.772,135.308L241.068,367.61H-20.158l130.614-232.302
-				H371.772"/>
-			<path id="Shape_1_" opacity="0.6" enable-background="new    " d="M241.068,367.61h261.318L371.772,135.308H110.456
-				L241.068,367.61z"/>
-			<path id="Shape_2_" opacity="0.8" enable-background="new    " d="M110.456,599.822L241.068,367.61L110.456,135.308
-				L-20.158,367.61L110.456,599.822z"/>
-			<path id="Shape_3_" opacity="0.45" enable-background="new    " d="M111.721,948.275l130.704-232.303h261.318L373.038,948.275
-				H111.721"/>
-			<path id="Shape_4_" opacity="0.6" enable-background="new    " d="M242.424,715.973H-18.893l130.613,232.303h261.317
-				L242.424,715.973z"/>
-			<path id="Shape_5_" opacity="0.8" enable-background="new    " d="M373.038,483.761L242.424,715.973l130.614,232.303
-				l130.704-232.303L373.038,483.761z"/>
-		</g>
-	</g>
-</g>
+<svg width="100" height="160" viewBox="0 0 100 160" fill="#2B247C" xmlns="http://www.w3.org/2000/svg">
+<path opacity="0.8" d="M50 44.3013L25 1L0 44.3013L25 87.6025L50 44.3013Z" />
+<path opacity="0.45" d="M50 44.3091L75 1.00781L25 1.00781L0 44.3091H50Z" />
+<path opacity="0.6" d="M75 1.00781L25 1.00781L50 44.3091H100L75 1.00781Z" />
+<path opacity="0.8" d="M50 115.699L75 159L100 115.699L75 72.3975L50 115.699Z" />
+<path opacity="0.45" d="M50 115.691L25 158.993H75L100 115.691L50 115.691Z" />
+<path opacity="0.6" d="M25 158.993H75L50 115.691L0 115.691L25 158.993Z" />
 </svg>

From edceb4d2d1ee40e47e73fb8ee3271047e57d002a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 11 Jul 2023 11:49:05 +0200
Subject: [PATCH 1490/1748] Allow testing FullInliner without
 ExpressionSplitter

---
 test/libyul/YulOptimizerTestCommon.cpp        |  6 ++++++
 .../fullInlinerWithoutSplitter/simple.sol     | 19 +++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/simple.sol

diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 64b19182ea..7e2a4c9593 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -168,6 +168,12 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			FullInliner::run(*m_context, *m_ast);
 			ExpressionJoiner::run(*m_context, *m_ast);
 		}},
+		{"fullInlinerWithoutSplitter", [&]() {
+			disambiguate();
+			FunctionHoister::run(*m_context, *m_ast);
+			FunctionGrouper::run(*m_context, *m_ast);
+			FullInliner::run(*m_context, *m_ast);
+		}},
 		{"mainFunction", [&]() {
 			disambiguate();
 			FunctionGrouper::run(*m_context, *m_ast);
diff --git a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/simple.sol b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/simple.sol
new file mode 100644
index 0000000000..80b975903c
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/simple.sol
@@ -0,0 +1,19 @@
+{
+    function f(a) -> x {
+        x := add(a, a)
+    }
+    let y := f(2)
+}
+// ----
+// step: fullInlinerWithoutSplitter
+//
+// {
+//     {
+//         let a_1 := 2
+//         let x_2 := 0
+//         x_2 := add(a_1, a_1)
+//         let y := x_2
+//     }
+//     function f(a) -> x
+//     { x := add(a, a) }
+// }

From a07f6c443ae6abe6b232999a7991929077dfb2ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 11 Jul 2023 11:32:02 +0200
Subject: [PATCH 1491/1748] Tests for Yul argument evaluation order after
 optimization

---
 .../call_arguments_with_side_effects.yul      | 28 +++++++++++
 .../call_arguments_without_side_effects.yul   | 49 +++++++++++++++++++
 .../call_arguments_with_side_effects.yul      | 27 ++++++++++
 .../call_arguments_without_side_effects.yul   | 44 +++++++++++++++++
 .../call_arguments_with_side_effects.yul      | 12 +++++
 .../call_arguments_without_side_effects.yul   | 48 ++++++++++++++++++
 6 files changed, 208 insertions(+)
 create mode 100644 test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul
 create mode 100644 test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul
 create mode 100644 test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
 create mode 100644 test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/call_arguments_with_side_effects.yul
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul

diff --git a/test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul b/test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul
new file mode 100644
index 0000000000..5046bbb9d7
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul
@@ -0,0 +1,28 @@
+{
+    function fun_revert() -> ret { revert(0, 0) }
+    function fun_return() -> ret { return(0, 0) }
+    function empty(a, b) {}
+
+    // Evaluation order in Yul is right to left so fun_revert() should run first.
+    empty(fun_return(), fun_revert())
+}
+// ----
+// step: fullInliner
+//
+// {
+//     {
+//         let ret_7 := 0
+//         revert(0, 0)
+//         let _1 := ret_7
+//         let ret_1_10 := 0
+//         return(0, 0)
+//         let a_13 := ret_1_10
+//         let b_14 := _1
+//     }
+//     function fun_revert() -> ret
+//     { revert(0, 0) }
+//     function fun_return() -> ret_1
+//     { return(0, 0) }
+//     function empty(a, b)
+//     { }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul b/test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul
new file mode 100644
index 0000000000..1e2e86a209
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul
@@ -0,0 +1,49 @@
+{
+    function empty(a, b, c) {}
+
+    // Constants
+    empty(111, 222, 333)
+
+    // Variables
+    let x := 111
+    let y := 222
+    let z := 333
+    empty(x, y, z)
+
+    // Calls
+    empty(mload(111), sload(222), calldataload(333))
+
+    // Mix
+    let a := 222
+    empty(111, a, mload(333))
+}
+// ----
+// step: fullInliner
+//
+// {
+//     {
+//         let _1 := 333
+//         let _2 := 222
+//         let a_13 := 111
+//         let b_14 := _2
+//         let c_15 := _1
+//         let x := 111
+//         let y := 222
+//         let z := 333
+//         let a_16 := x
+//         let b_17 := y
+//         let c_18 := z
+//         let _5 := calldataload(333)
+//         let _7 := sload(222)
+//         let a_19 := mload(111)
+//         let b_20 := _7
+//         let c_21 := _5
+//         let a_1 := 222
+//         let _11 := mload(333)
+//         let a_22 := 111
+//         let b_23 := a_1
+//         let c_24 := _11
+//     }
+//     function empty(a, b, c)
+//     { }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
new file mode 100644
index 0000000000..b5214e8e49
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
@@ -0,0 +1,27 @@
+{
+    function fun_revert() -> ret { revert(0, 0) }
+    function fun_return() -> ret { return(0, 0) }
+    function empty(a, b) {}
+
+    // Evaluation order in Yul is right to left so fun_revert() should run first.
+    empty(fun_return(), fun_revert())
+}
+// ----
+// step: fullInlinerWithoutSplitter
+//
+// {
+//     {
+//         let ret_1_3 := 0
+//         return(0, 0)
+//         let a_1 := ret_1_3
+//         let ret_4 := 0
+//         revert(0, 0)
+//         let b_2 := ret_4
+//     }
+//     function fun_revert() -> ret
+//     { revert(0, 0) }
+//     function fun_return() -> ret_1
+//     { return(0, 0) }
+//     function empty(a, b)
+//     { }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
new file mode 100644
index 0000000000..4c0705bd35
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
@@ -0,0 +1,44 @@
+{
+    function empty(a, b, c) {}
+
+    // Constants
+    empty(111, 222, 333)
+
+    // Variables
+    let x := 111
+    let y := 222
+    let z := 333
+    empty(x, y, z)
+
+    // Calls
+    empty(mload(111), sload(222), calldataload(333))
+
+    // Mix
+    let a := 222
+    empty(111, a, mload(333))
+}
+// ----
+// step: fullInlinerWithoutSplitter
+//
+// {
+//     {
+//         let a_2 := 111
+//         let b_3 := 222
+//         let c_4 := 333
+//         let x := 111
+//         let y := 222
+//         let z := 333
+//         let a_5 := x
+//         let b_6 := y
+//         let c_7 := z
+//         let a_8 := mload(111)
+//         let b_9 := sload(222)
+//         let c_10 := calldataload(333)
+//         let a_1 := 222
+//         let a_11 := 111
+//         let b_12 := a_1
+//         let c_13 := mload(333)
+//     }
+//     function empty(a, b, c)
+//     { }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/call_arguments_with_side_effects.yul b/test/libyul/yulOptimizerTests/fullSuite/call_arguments_with_side_effects.yul
new file mode 100644
index 0000000000..c8c969d884
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/call_arguments_with_side_effects.yul
@@ -0,0 +1,12 @@
+{
+    function fun_revert() -> ret { revert(0, 0) }
+    function fun_return() -> ret { return(0, 0) }
+    function empty(a, b) {}
+
+    // Evaluation order in Yul is always right to left so optimized code should reach the revert first.
+    empty(fun_return(), fun_revert())
+}
+// ----
+// step: fullSuite
+//
+// { { revert(0, 0) } }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul b/test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul
new file mode 100644
index 0000000000..fc36bdfa37
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/call_arguments_without_side_effects.yul
@@ -0,0 +1,48 @@
+{
+    function empty(a, b, c) {
+        mstore(a, 1)
+        mstore(b, 1)
+        mstore(c, 1)
+    }
+
+    // Constants
+    empty(1, 2, 3)
+
+    // Variables
+    let x := 4
+    let y := 5
+    let z := 6
+    empty(x, y, z)
+
+    // Calls
+    empty(mload(7), sload(8), calldataload(9))
+
+    // Mix
+    let a := 12
+    empty(11, a, mload(13))
+
+    return(0, 32)
+}
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         let _1 := 1
+//         mstore(_1, _1)
+//         mstore(2, _1)
+//         mstore(3, _1)
+//         mstore(4, _1)
+//         mstore(5, _1)
+//         mstore(6, _1)
+//         let _2 := sload(8)
+//         mstore(mload(7), _1)
+//         mstore(_2, _1)
+//         mstore(calldataload(9), _1)
+//         let _3 := mload(13)
+//         mstore(11, _1)
+//         mstore(12, _1)
+//         mstore(_3, _1)
+//         return(0, 32)
+//     }
+// }

From 5e1e0e7752f2c71eb0e07d5a9dc7d677e22366a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 11 Jul 2023 12:13:00 +0200
Subject: [PATCH 1492/1748] FullInliner: Fix order of arguments of inlined
 functions

---
 Changelog.md                                  |  4 ++
 docs/bugs.json                                | 13 ++++++
 docs/bugs_by_version.json                     | 46 +++++++++++++++++--
 docs/internals/optimizer.rst                  |  2 +-
 libyul/optimiser/FullInliner.cpp              |  6 ++-
 libyul/optimiser/FullInliner.h                |  2 +-
 .../call_arguments_with_side_effects.yul      |  5 +-
 .../call_arguments_without_side_effects.yul   | 20 ++++----
 .../move_up_rightwards_argument.yul           |  9 ++--
 .../fullInliner/multi_fun.yul                 |  9 ++--
 .../call_arguments_with_side_effects.yul      | 10 ++--
 .../call_arguments_without_side_effects.yul   | 24 +++++-----
 12 files changed, 106 insertions(+), 44 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4cbddb3dd9..4da52893ac 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
 ### 0.8.21 (unreleased)
 
+Important Bugfixes:
+ * Yul Optimizer: Fix ``FullInliner`` step (``i``) not preserving the evaluation order of arguments passed into inlined functions in code that is not in expression-split form (i.e. when using a custom optimizer sequence in which the step not preceded by ``ExpressionSplitter`` (``x``)).
+
+
 Language Features:
  * Allow qualified access to events from other contracts.
  * Relax restrictions on initialization of immutable variables. Reads and writes may now happen at any point at construction time outside of functions and modifiers. Explicit initialization is no longer mandatory.
diff --git a/docs/bugs.json b/docs/bugs.json
index 9c9780c935..e8b8507fad 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -1,4 +1,17 @@
 [
+    {
+        "uid": "SOL-2023-2",
+        "name": "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+        "summary": "Optimizer sequences containing FullInliner do not preserve the evaluation order of arguments of inlined function calls in code that is not in expression-split form.",
+        "description": "Function call arguments in Yul are evaluated right to left. This order matters when the argument expressions have side-effects, and changing it may change contract behavior. FullInliner is an optimizer step that can replace a function call with the body of that function. The transformation involves assigning argument expressions to temporary variables, which imposes an explicit evaluation order. FullInliner was written with the assumption that this order does not necessarily have to match usual argument evaluation order because the argument expressions have no side-effects. In most circumstances this assumption is true because the default optimization step sequence contains the ExpressionSplitter step. ExpressionSplitter ensures that the code is in *expression-split form*, which means that function calls cannot appear nested inside expressions, and all function call arguments have to be variables. The assumption is, however, not guaranteed to be true in general. Version 0.6.7 introduced a setting allowing users to specify an arbitrary optimization step sequence, making it possible for the FullInliner to actually encounter argument expressions with side-effects, which can result in behavior differences between optimized and unoptimized bytecode. Contracts compiled without optimization or with the default optimization sequence are not affected. To trigger the bug the user has to explicitly choose compiler settings that contain a sequence with FullInliner step not preceded by ExpressionSplitter.",
+        "link": "https://blog.soliditylang.org/2023/07/19/full-inliner-non-expression-split-argument-evaluation-order-bug/",
+        "introduced": "0.6.7",
+        "fixed": "0.8.21",
+        "severity": "low",
+        "conditions": {
+            "yulOptimizer": true
+        }
+    },
     {
         "uid": "SOL-2022-7",
         "name": "StorageWriteRemovalBeforeConditionalTermination",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index ce621f1954..8f2ba18180 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1422,6 +1422,7 @@
     },
     "0.6.10": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1436,6 +1437,7 @@
     },
     "0.6.11": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1450,6 +1452,7 @@
     },
     "0.6.12": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1548,6 +1551,7 @@
     },
     "0.6.7": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCalldataArrayAbiReencodingSizeValidation",
@@ -1564,6 +1568,7 @@
     },
     "0.6.8": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCalldataArrayAbiReencodingSizeValidation",
@@ -1577,6 +1582,7 @@
     },
     "0.6.9": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1592,6 +1598,7 @@
     },
     "0.7.0": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1606,6 +1613,7 @@
     },
     "0.7.1": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1621,6 +1629,7 @@
     },
     "0.7.2": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1635,6 +1644,7 @@
     },
     "0.7.3": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1648,6 +1658,7 @@
     },
     "0.7.4": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1660,6 +1671,7 @@
     },
     "0.7.5": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1672,6 +1684,7 @@
     },
     "0.7.6": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1684,6 +1697,7 @@
     },
     "0.8.0": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1696,6 +1710,7 @@
     },
     "0.8.1": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1708,6 +1723,7 @@
     },
     "0.8.10": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1717,6 +1733,7 @@
     },
     "0.8.11": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1727,6 +1744,7 @@
     },
     "0.8.12": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1737,6 +1755,7 @@
     },
     "0.8.13": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "StorageWriteRemovalBeforeConditionalTermination",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
@@ -1748,6 +1767,7 @@
     },
     "0.8.14": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "StorageWriteRemovalBeforeConditionalTermination",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
@@ -1757,6 +1777,7 @@
     },
     "0.8.15": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "StorageWriteRemovalBeforeConditionalTermination",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup"
         ],
@@ -1764,24 +1785,32 @@
     },
     "0.8.16": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "StorageWriteRemovalBeforeConditionalTermination"
         ],
         "released": "2022-08-08"
     },
     "0.8.17": {
-        "bugs": [],
+        "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder"
+        ],
         "released": "2022-09-08"
     },
     "0.8.18": {
-        "bugs": [],
+        "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder"
+        ],
         "released": "2023-02-01"
     },
     "0.8.19": {
-        "bugs": [],
+        "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder"
+        ],
         "released": "2023-02-22"
     },
     "0.8.2": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1793,11 +1822,14 @@
         "released": "2021-03-02"
     },
     "0.8.20": {
-        "bugs": [],
+        "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder"
+        ],
         "released": "2023-05-10"
     },
     "0.8.3": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1809,6 +1841,7 @@
     },
     "0.8.4": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1819,6 +1852,7 @@
     },
     "0.8.5": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1829,6 +1863,7 @@
     },
     "0.8.6": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1839,6 +1874,7 @@
     },
     "0.8.7": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1849,6 +1885,7 @@
     },
     "0.8.8": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1860,6 +1897,7 @@
     },
     "0.8.9": {
         "bugs": [
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index cd4624a1a1..da72eed4ea 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -570,7 +570,7 @@ It is not applied to loop iteration-condition, because the loop control flow doe
 this "outlining" of the inner expressions in all cases. We can sidestep this limitation by applying
 :ref:`for-loop-condition-into-body` to move the iteration condition into loop body.
 
-The final program should be in a form such that (with the exception of loop conditions)
+The final program should be in an *expression-split form*, where (with the exception of loop conditions)
 function calls cannot appear nested inside expressions
 and all function call arguments have to be variables.
 
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index 0482e20d62..16bfcf1250 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -38,6 +38,8 @@
 #include <libsolutil/Visitor.h>
 
 #include <range/v3/action/remove.hpp>
+#include <range/v3/view/reverse.hpp>
+#include <range/v3/view/zip.hpp>
 
 using namespace std;
 using namespace solidity;
@@ -305,8 +307,8 @@ vector<Statement> InlineModifier::performInline(Statement& _statement, FunctionC
 		newStatements.emplace_back(std::move(varDecl));
 	};
 
-	for (size_t i = 0; i < _funCall.arguments.size(); ++i)
-		newVariable(function->parameters[i], &_funCall.arguments[i]);
+	for (auto&& [parameter, argument]: ranges::views::zip(function->parameters, _funCall.arguments) | ranges::views::reverse)
+		newVariable(parameter, &argument);
 	for (auto const& var: function->returnVariables)
 		newVariable(var, nullptr);
 
diff --git a/libyul/optimiser/FullInliner.h b/libyul/optimiser/FullInliner.h
index 5029abf392..3001453cbe 100644
--- a/libyul/optimiser/FullInliner.h
+++ b/libyul/optimiser/FullInliner.h
@@ -58,8 +58,8 @@ class NameCollector;
  *
  * function f(a, b) -> c { ... }
  *
- * let f_a := x
  * let f_b := y
+ * let f_a := x
  * let f_c
  * code of f, with replacements: a -> f_a, b -> f_b, c -> f_c
  * let z := f_c
diff --git a/test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul b/test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul
index 5046bbb9d7..94b0c72d29 100644
--- a/test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/call_arguments_with_side_effects.yul
@@ -16,8 +16,9 @@
 //         let _1 := ret_7
 //         let ret_1_10 := 0
 //         return(0, 0)
-//         let a_13 := ret_1_10
-//         let b_14 := _1
+//         let _2 := ret_1_10
+//         let b_13 := _1
+//         let a_14 := _2
 //     }
 //     function fun_revert() -> ret
 //     { revert(0, 0) }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul b/test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul
index 1e2e86a209..747ac80849 100644
--- a/test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/call_arguments_without_side_effects.yul
@@ -24,25 +24,27 @@
 //     {
 //         let _1 := 333
 //         let _2 := 222
-//         let a_13 := 111
+//         let _3 := 111
+//         let c_13 := _1
 //         let b_14 := _2
-//         let c_15 := _1
+//         let a_15 := _3
 //         let x := 111
 //         let y := 222
-//         let z := 333
-//         let a_16 := x
+//         let c_16 := 333
 //         let b_17 := y
-//         let c_18 := z
+//         let a_18 := x
 //         let _5 := calldataload(333)
 //         let _7 := sload(222)
-//         let a_19 := mload(111)
+//         let _9 := mload(111)
+//         let c_19 := _5
 //         let b_20 := _7
-//         let c_21 := _5
+//         let a_21 := _9
 //         let a_1 := 222
 //         let _11 := mload(333)
-//         let a_22 := 111
+//         let _12 := 111
+//         let c_22 := _11
 //         let b_23 := a_1
-//         let c_24 := _11
+//         let a_24 := _12
 //     }
 //     function empty(a, b, c)
 //     { }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul b/test/libyul/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul
index 7bc959ec8f..1f777237ac 100644
--- a/test/libyul/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/move_up_rightwards_argument.yul
@@ -13,12 +13,13 @@
 //         let _2 := mload(5)
 //         let _4 := mload(4)
 //         let _6 := mload(3)
-//         let a_13 := mload(2)
+//         let _8 := mload(2)
+//         let c_13 := _4
 //         let b_14 := _6
-//         let c_15 := _4
+//         let a_15 := _8
 //         let x_16 := 0
-//         x_16 := add(a_13, b_14)
-//         x_16 := mul(x_16, c_15)
+//         x_16 := add(a_15, b_14)
+//         x_16 := mul(x_16, c_13)
 //         let _10 := add(x_16, _2)
 //         let y := add(mload(1), _10)
 //     }
diff --git a/test/libyul/yulOptimizerTests/fullInliner/multi_fun.yul b/test/libyul/yulOptimizerTests/fullInliner/multi_fun.yul
index a5194457a4..b30078cb61 100644
--- a/test/libyul/yulOptimizerTests/fullInliner/multi_fun.yul
+++ b/test/libyul/yulOptimizerTests/fullInliner/multi_fun.yul
@@ -12,13 +12,14 @@
 //         let a_8 := 3
 //         let x_9 := 0
 //         x_9 := add(a_8, a_8)
-//         let b_10 := x_9
-//         let c_11 := _1
+//         let _3 := x_9
+//         let c_10 := _1
+//         let b_11 := _3
 //         let y_12 := 0
-//         let a_6_13 := b_10
+//         let a_6_13 := b_11
 //         let x_7_14 := 0
 //         x_7_14 := add(a_6_13, a_6_13)
-//         y_12 := mul(mload(c_11), x_7_14)
+//         y_12 := mul(mload(c_10), x_7_14)
 //         let y_1 := y_12
 //     }
 //     function f(a) -> x
diff --git a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
index b5214e8e49..3a297b9d54 100644
--- a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
+++ b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
@@ -11,12 +11,12 @@
 //
 // {
 //     {
-//         let ret_1_3 := 0
-//         return(0, 0)
-//         let a_1 := ret_1_3
-//         let ret_4 := 0
+//         let ret_3 := 0
 //         revert(0, 0)
-//         let b_2 := ret_4
+//         let b_1 := ret_3
+//         let ret_1_4 := 0
+//         return(0, 0)
+//         let a_2 := ret_1_4
 //     }
 //     function fun_revert() -> ret
 //     { revert(0, 0) }
diff --git a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
index 4c0705bd35..d3516f66ca 100644
--- a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
+++ b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
@@ -22,22 +22,22 @@
 //
 // {
 //     {
-//         let a_2 := 111
-//         let b_3 := 222
-//         let c_4 := 333
+//         let c_1 := 333
+//         let b_2 := 222
+//         let a_3 := 111
 //         let x := 111
 //         let y := 222
 //         let z := 333
-//         let a_5 := x
-//         let b_6 := y
-//         let c_7 := z
-//         let a_8 := mload(111)
-//         let b_9 := sload(222)
-//         let c_10 := calldataload(333)
+//         let c_4 := z
+//         let b_5 := y
+//         let a_6 := x
+//         let c_7 := calldataload(333)
+//         let b_8 := sload(222)
+//         let a_9 := mload(111)
 //         let a_1 := 222
-//         let a_11 := 111
-//         let b_12 := a_1
-//         let c_13 := mload(333)
+//         let c_10 := mload(333)
+//         let b_11 := a_1
+//         let a_12 := 111
 //     }
 //     function empty(a, b, c)
 //     { }

From ba3f9dd2a2056a5b9def06568eef19b28be74af0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 11 Jul 2023 12:33:33 +0200
Subject: [PATCH 1493/1748] FullInliner: Do not include calls whose arguments
 may have side-effects

---
 Changelog.md                                              | 1 +
 libyul/optimiser/FullInliner.cpp                          | 6 ++++++
 .../call_arguments_with_side_effects.yul                  | 7 +------
 .../call_arguments_without_side_effects.yul               | 8 ++------
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4da52893ac..fa2ea96668 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -30,6 +30,7 @@ Bugfixes:
  * SMTChecker: Fix internal error caused by using external identifier to encode member access to functions that take an internal function as a parameter.
  * Standard JSON Interface: Fix an incomplete AST being returned when analysis is interrupted by certain kinds of fatal errors.
  * Yul Optimizer: Ensure that the assignment of memory slots for variables moved to memory does not depend on AST IDs that may depend on whether additional files are included during compilation.
+ * Yul Optimizer: Fix ``FullInliner`` step not ignoring code that is not in expression-split form.
  * Yul Optimizer: Fix optimized IR being unnecessarily passed through the Yul optimizer again before bytecode generation.
 
 AST Changes:
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index 16bfcf1250..ebf82e763d 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -189,6 +189,12 @@ bool FullInliner::shallInline(FunctionCall const& _funCall, YulString _callSite)
 	if (m_noInlineFunctions.count(_funCall.functionName.name) || recursive(*calledFunction))
 		return false;
 
+	// No inlining of calls where argument expressions may have side-effects.
+	// To avoid running into this, make sure that ExpressionSplitter runs before FullInliner.
+	for (auto const& argument: _funCall.arguments)
+		if (!holds_alternative<Literal>(argument) && !holds_alternative<Identifier>(argument))
+			return false;
+
 	// Inline really, really tiny functions
 	size_t size = m_functionSizes.at(calledFunction->name);
 	if (size <= 1)
diff --git a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
index 3a297b9d54..a89dd89137 100644
--- a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
+++ b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_with_side_effects.yul
@@ -11,12 +11,7 @@
 //
 // {
 //     {
-//         let ret_3 := 0
-//         revert(0, 0)
-//         let b_1 := ret_3
-//         let ret_1_4 := 0
-//         return(0, 0)
-//         let a_2 := ret_1_4
+//         empty(fun_return(), fun_revert())
 //     }
 //     function fun_revert() -> ret
 //     { revert(0, 0) }
diff --git a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
index d3516f66ca..8f903b4844 100644
--- a/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
+++ b/test/libyul/yulOptimizerTests/fullInlinerWithoutSplitter/call_arguments_without_side_effects.yul
@@ -31,13 +31,9 @@
 //         let c_4 := z
 //         let b_5 := y
 //         let a_6 := x
-//         let c_7 := calldataload(333)
-//         let b_8 := sload(222)
-//         let a_9 := mload(111)
+//         empty(mload(111), sload(222), calldataload(333))
 //         let a_1 := 222
-//         let c_10 := mload(333)
-//         let b_11 := a_1
-//         let a_12 := 111
+//         empty(111, a_1, mload(333))
 //     }
 //     function empty(a, b, c)
 //     { }

From 735326d50d0463290fdc18b786ab1566d8ce8064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 11 Jul 2023 14:05:04 +0200
Subject: [PATCH 1494/1748] Properly document FullInliner's prerequisites

---
 docs/internals/optimizer.rst   | 7 ++++++-
 libyul/optimiser/FullInliner.h | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index da72eed4ea..ab37872ffb 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -1192,7 +1192,7 @@ This component can only be used on sources with unique names.
 FullInliner
 ^^^^^^^^^^^
 
-The Full Inliner replaces certain calls of certain functions
+The FullInliner replaces certain calls of certain functions
 by the function's body. This is not very helpful in most cases, because
 it just increases the code size but does not have a benefit. Furthermore,
 code is usually very expensive and we would often rather have shorter
@@ -1216,6 +1216,11 @@ we can run the optimizer on this specialized function. If it
 results in heavy gains, the specialized function is kept,
 otherwise the original function is used instead.
 
+FunctionHoister and ExpressionSplitter are recommended as prerequisites since they make the step
+more efficient, but are not required for correctness.
+In particular, function calls with other function calls as arguments are not inlined, but running
+ExpressionSplitter beforehand ensures that there are no such calls in the input.
+
 Cleanup
 -------
 
diff --git a/libyul/optimiser/FullInliner.h b/libyul/optimiser/FullInliner.h
index 3001453cbe..931315305c 100644
--- a/libyul/optimiser/FullInliner.h
+++ b/libyul/optimiser/FullInliner.h
@@ -44,10 +44,10 @@ class NameCollector;
  * Optimiser component that modifies an AST in place, inlining functions.
  * Expressions are expected to be split, i.e. the component will only inline
  * function calls that are at the root of the expression and that only contains
- * variables as arguments. More specifically, it will inline
+ * variables or literals as arguments. More specifically, it will inline
  *  - let x1, ..., xn := f(a1, ..., am)
  *  - x1, ..., xn := f(a1, ..., am)
- * f(a1, ..., am)
+ *  - f(a1, ..., am)
  *
  * The transform changes code of the form
  *

From 0ab0842c2944680c3f92119ee4185822b9a63350 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 26 Jun 2023 17:00:52 +0200
Subject: [PATCH 1495/1748] Disallow conversions between declaration function
 types.

---
 Changelog.md                                          |  1 +
 libsolidity/ast/Types.cpp                             |  6 ++++++
 .../functionTypes/declaration_type_conversion.sol     | 11 +++++++++++
 .../declaration_type_conversion_internal_base.sol     | 11 +++++++++++
 4 files changed, 29 insertions(+)
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion_internal_base.sol

diff --git a/Changelog.md b/Changelog.md
index fa2ea96668..723df45834 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -29,6 +29,7 @@ Bugfixes:
  * SMTChecker: Fix false negative when a verification target can be violated only by trusted external call from another public function.
  * SMTChecker: Fix internal error caused by using external identifier to encode member access to functions that take an internal function as a parameter.
  * Standard JSON Interface: Fix an incomplete AST being returned when analysis is interrupted by certain kinds of fatal errors.
+ * Type Checker: Function declaration types referring to different declarations are no longer convertible to each other.
  * Yul Optimizer: Ensure that the assignment of memory slots for variables moved to memory does not depend on AST IDs that may depend on whether additional files are included during compilation.
  * Yul Optimizer: Fix ``FullInliner`` step not ignoring code that is not in expression-split form.
  * Yul Optimizer: Fix optimized IR being unnecessarily passed through the Yul optimizer again before bytecode generation.
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 6308dbe3d1..915440caa0 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -3127,6 +3127,12 @@ BoolResult FunctionType::isImplicitlyConvertibleTo(Type const& _convertTo) const
 	if (convertTo.kind() != kind())
 		return BoolResult::err("Special functions cannot be converted to function types.");
 
+	if (
+		kind() == FunctionType::Kind::Declaration &&
+		m_declaration != convertTo.m_declaration
+	)
+		return BoolResult::err("Function declaration types referring to different functions cannot be converted to each other.");
+
 	if (!equalExcludingStateMutability(convertTo))
 		return false;
 
diff --git a/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol b/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol
new file mode 100644
index 0000000000..a26460dc12
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol
@@ -0,0 +1,11 @@
+contract D {
+	function f() external {}
+	function g() external {}
+}
+contract C {
+	function f(bool c) public pure {
+		(c ? D.f : D.g);
+	}
+}
+// ----
+// TypeError 1080: (117-130): True expression's type function D.f() does not match false expression's type function D.g().
diff --git a/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion_internal_base.sol b/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion_internal_base.sol
new file mode 100644
index 0000000000..210211b287
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion_internal_base.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() internal {}
+    function g() internal {}
+}
+
+contract D is C {
+    function h(bool b) public pure {
+        (b ? C.f : C.g);
+    }
+}
+// ----

From f3fc19080aba715b44c22323fd5ffa436aa8274c Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 27 Jun 2023 14:52:15 -0300
Subject: [PATCH 1496/1748] Override mobileType of MagicType to null

---
 Changelog.md                                  |  1 +
 libsolidity/ast/Types.h                       |  2 ++
 .../module_from_ternary_expression.sol        | 15 +++++++++++++++
 .../tuple_from_ternary_expression.sol         |  9 +++++++++
 .../smtCheckerTests/special/msg_parens_1.sol  |  4 ++--
 ...odule_function_from_ternary_expression.sol | 19 +++++++++++++++++++
 .../unnamed_type_tuple_in_inline_array.sol    |  7 +++++++
 .../unnamed_types_in_inline_array_1.sol       |  2 +-
 .../unnamed_types_in_inline_array_2.sol       |  2 +-
 ...word_from_ternary_with_type_expression.sol |  8 ++++++++
 ...Code_from_ternary_with_type_expression.sol | 16 ++++++++++++++++
 .../metaTypes/type_expression_tuple_max.sol   |  6 ++++++
 .../syntaxTests/metaTypes/type_max.sol        |  6 ++++++
 .../type_max_from_ternary_expression.sol      |  8 ++++++++
 .../metaTypes/type_runtimecode.sol            |  9 +++++++++
 ...e_runtimecode_from_ternary_expression_.sol | 14 ++++++++++++++
 16 files changed, 124 insertions(+), 4 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol
 create mode 100644 test/libsolidity/semanticTests/expressions/tuple_from_ternary_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/imports/module_function_from_ternary_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/inline_arrays/unnamed_type_tuple_in_inline_array.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/max_keyword_from_ternary_with_type_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/runtimeCode_from_ternary_with_type_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/type_expression_tuple_max.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/type_max.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/type_max_from_ternary_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/type_runtimecode.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/type_runtimecode_from_ternary_expression_.sol

diff --git a/Changelog.md b/Changelog.md
index 723df45834..7b19d37c0d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -22,6 +22,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * Code Generator: Disallow complex expressions whose results are types, built-ins, modules or some unassignable functions. The legacy code generation pipeline would not actually evaluate them, discarding any side-effects they might have.
  * Code Generator: Fix not entirely deterministic order of functions in unoptimized Yul output. The choice of C++ compiler in some cases would result in different (but equivalent) bytecode (especially from native binaries vs emscripten binaries)
  * Commandline Interface: Fix internal error when using ``--stop-after parsing`` and requesting some of the outputs that require full analysis or compilation.
  * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 1fc0a7e17f..02b7308635 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1694,6 +1694,8 @@ class MagicType: public Type
 
 	Type const* typeArgument() const;
 
+	Type const* mobileType() const override { return nullptr; }
+
 protected:
 	std::vector<std::tuple<std::string, Type const*>> makeStackItems() const override { return {}; }
 private:
diff --git a/test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol b/test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol
new file mode 100644
index 0000000000..7aa8a5caa8
--- /dev/null
+++ b/test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol
@@ -0,0 +1,15 @@
+==== Source: A ====
+contract C {
+}
+==== Source: B ====
+import "A" as M;
+
+contract C {
+    function f() public pure returns (bool) {
+        bool flag;
+        ((flag = true) ? M : M).C;
+        return flag;
+    }
+}
+// ----
+// f() -> true
diff --git a/test/libsolidity/semanticTests/expressions/tuple_from_ternary_expression.sol b/test/libsolidity/semanticTests/expressions/tuple_from_ternary_expression.sol
new file mode 100644
index 0000000000..c8a2ced2cc
--- /dev/null
+++ b/test/libsolidity/semanticTests/expressions/tuple_from_ternary_expression.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() public pure returns (bool){
+        bool flag;
+        ((flag = true) ? (1, 2, 3) : (3, 2, 1));
+        return flag;
+    }
+}
+// ----
+// f() -> true
diff --git a/test/libsolidity/smtCheckerTests/special/msg_parens_1.sol b/test/libsolidity/smtCheckerTests/special/msg_parens_1.sol
index 6eb19e5e80..6368eb2ddd 100644
--- a/test/libsolidity/smtCheckerTests/special/msg_parens_1.sol
+++ b/test/libsolidity/smtCheckerTests/special/msg_parens_1.sol
@@ -9,5 +9,5 @@ contract C {
 // SMTIgnoreOS: macos
 // SMTIgnoreCex: yes
 // ----
-// Warning 6328: (46-71): CHC: Assertion violation happens here.
-// Warning 6328: (75-113): CHC: Assertion violation happens here.
+// TypeError 9717: (90-93): Invalid mobile type in true expression.
+// TypeError 3703: (96-99): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/imports/module_function_from_ternary_expression.sol b/test/libsolidity/syntaxTests/imports/module_function_from_ternary_expression.sol
new file mode 100644
index 0000000000..d97bbee3d3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/imports/module_function_from_ternary_expression.sol
@@ -0,0 +1,19 @@
+==== Source: A ====
+function f() pure returns (uint) {
+    return 42;
+}
+==== Source: B ====
+function f() pure returns (uint) {
+    return 24;
+}
+==== Source: C ====
+import "A" as A;
+import "B" as B;
+
+contract C {
+    function f(bool b) public pure returns (uint) {
+        return (b ? A : B).f();
+    }
+}
+// ----
+// TypeError 1080: (C:116-125): True expression's type module "A" does not match false expression's type module "B".
diff --git a/test/libsolidity/syntaxTests/inline_arrays/unnamed_type_tuple_in_inline_array.sol b/test/libsolidity/syntaxTests/inline_arrays/unnamed_type_tuple_in_inline_array.sol
new file mode 100644
index 0000000000..21f112c5cf
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inline_arrays/unnamed_type_tuple_in_inline_array.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() public {
+        [(1, 2, 3), (4, 5, 6)];
+    }
+}
+// ----
+// TypeError 9656: (47-69): Unable to deduce nameable type for array elements. Try adding explicit type conversion for the first element.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol
index d00f818a7e..b848b7b12b 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_1.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9656: (47-52): Unable to deduce nameable type for array elements. Try adding explicit type conversion for the first element.
+// TypeError 9563: (48-51): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol
index 0abd5ca256..7f659209c5 100644
--- a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol
+++ b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_2.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// TypeError 9656: (47-56): Unable to deduce nameable type for array elements. Try adding explicit type conversion for the first element.
+// TypeError 9563: (48-55): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/metaTypes/max_keyword_from_ternary_with_type_expression.sol b/test/libsolidity/syntaxTests/metaTypes/max_keyword_from_ternary_with_type_expression.sol
new file mode 100644
index 0000000000..ce4a126230
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/max_keyword_from_ternary_with_type_expression.sol
@@ -0,0 +1,8 @@
+contract C {
+    function max(bool isUint) pure public returns (uint8) {
+        return (isUint ? type(uint8) : type(int8)).max;
+    }
+}
+// ----
+// TypeError 9717: (98-109): Invalid mobile type in true expression.
+// TypeError 3703: (112-122): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/runtimeCode_from_ternary_with_type_expression.sol b/test/libsolidity/syntaxTests/metaTypes/runtimeCode_from_ternary_with_type_expression.sol
new file mode 100644
index 0000000000..b2b9b2adcb
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/runtimeCode_from_ternary_with_type_expression.sol
@@ -0,0 +1,16 @@
+contract A {
+    function f() public {}
+}
+
+contract B {
+    function g() public {}
+}
+
+contract C {
+    function ab(bool getA) pure public returns (bytes memory) {
+        return (getA ? type(A) : type(B)).runtimeCode;
+    }
+}
+// ----
+// TypeError 9717: (186-193): Invalid mobile type in true expression.
+// TypeError 3703: (196-203): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_expression_tuple_max.sol b/test/libsolidity/syntaxTests/metaTypes/type_expression_tuple_max.sol
new file mode 100644
index 0000000000..c5a5e82c3c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/type_expression_tuple_max.sol
@@ -0,0 +1,6 @@
+contract C {
+    function max() public pure returns (uint8) {
+        return (type(uint8)).max;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_max.sol b/test/libsolidity/syntaxTests/metaTypes/type_max.sol
new file mode 100644
index 0000000000..4d3b5886e3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/type_max.sol
@@ -0,0 +1,6 @@
+contract C {
+    function max() public pure returns (uint8) {
+        return type(uint8).max;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_max_from_ternary_expression.sol b/test/libsolidity/syntaxTests/metaTypes/type_max_from_ternary_expression.sol
new file mode 100644
index 0000000000..873b2e679b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/type_max_from_ternary_expression.sol
@@ -0,0 +1,8 @@
+contract C {
+    function max(bool isUint) public returns (uint8) {
+        return (isUint ? type(uint8) : type(int8)).max;
+    }
+}
+// ----
+// TypeError 9717: (93-104): Invalid mobile type in true expression.
+// TypeError 3703: (107-117): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_runtimecode.sol b/test/libsolidity/syntaxTests/metaTypes/type_runtimecode.sol
new file mode 100644
index 0000000000..6b054b4dac
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/type_runtimecode.sol
@@ -0,0 +1,9 @@
+contract A {
+}
+
+contract C {
+    function f() public pure returns (bytes memory) {
+        return type(A).runtimeCode;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_runtimecode_from_ternary_expression_.sol b/test/libsolidity/syntaxTests/metaTypes/type_runtimecode_from_ternary_expression_.sol
new file mode 100644
index 0000000000..8fcf65480e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/type_runtimecode_from_ternary_expression_.sol
@@ -0,0 +1,14 @@
+contract A {
+}
+
+contract B {
+}
+
+contract C {
+    function f(bool getA) public returns (bytes memory) {
+        return (getA ? type(A) : type(B)).runtimeCode;
+    }
+}
+// ----
+// TypeError 9717: (126-133): Invalid mobile type in true expression.
+// TypeError 3703: (136-143): Invalid mobile type in false expression.

From 4fd5bbf50b24c9457fa87a091101295b0fbde7fc Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Thu, 22 Jun 2023 10:56:08 -0300
Subject: [PATCH 1497/1748] Restrict mobileType of TypeType

---
 libsolidity/ast/Types.h                       |  1 +
 ...licit_conversion_of_super_in_operators.sol |  2 +-
 .../unnamed_types_in_inline_array_3.sol       |  7 +++++++
 .../metaTypes/array_type_from_ternary.sol     |  8 ++++++++
 .../metaTypes/contract_from_ternary.sol       |  9 +++++++++
 .../metaTypes/explicit_type_conversion.sol    |  8 ++++++++
 .../metaTypes/library_from_ternary.sol        | 12 ++++++++++++
 .../metaTypes/struct_from_ternary.sol         | 14 ++++++++++++++
 ..._expression_nested_ternary_max_keyword.sol |  8 ++++++++
 .../metaTypes/type_from_ternary_condition.sol |  8 ++++++++
 .../abi_decode_array_of_unitary_tuples.sol    | 17 +++++++++++++++++
 .../abidecode/abi_decode_enum.sol             |  8 ++++++++
 ..._array_length_ternary_with_max_keyword.sol |  9 +++++++++
 ...ecode_invalid_argument_array_of_tuples.sol |  7 +++++++
 ...invalid_argument_indexed_array_literal.sol |  7 +++++++
 ...id_argument_indexed_ternary_expression.sol |  9 +++++++++
 ..._argument_ternary_condition_expression.sol |  8 ++++++++
 ..._ternary_expression_inside_parentheses.sol |  8 ++++++++
 ...alid_argument_ternary_with_side_effect.sol |  9 +++++++++
 ...abi_decode_invalid_argument_tuple_type.sol |  7 +++++++
 ...ecode_invalid_argument_type_expression.sol |  7 +++++++
 .../abidecode/abi_decode_member_acess.sol     | 19 +++++++++++++++++++
 .../abi_decode_unitary_nested_tuple.sol       | 13 +++++++++++++
 23 files changed, 204 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_3.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/array_type_from_ternary.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/contract_from_ternary.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/explicit_type_conversion.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/library_from_ternary.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/struct_from_ternary.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/type_expression_nested_ternary_max_keyword.sol
 create mode 100644 test/libsolidity/syntaxTests/metaTypes/type_from_ternary_condition.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_array_of_unitary_tuples.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_enum.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_length_ternary_with_max_keyword.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_of_tuples.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_array_literal.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_ternary_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_condition_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_expression_inside_parentheses.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_with_side_effect.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_tuple_type.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_type_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_member_acess.sol
 create mode 100644 test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_unitary_nested_tuple.sol

diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index 02b7308635..fd1b6a7d3d 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1598,6 +1598,7 @@ class TypeType: public Type
 	bool hasSimpleZeroValueInMemory() const override { solAssert(false, ""); }
 	std::string toString(bool _withoutDataLocation) const override { return "type(" + m_actualType->toString(_withoutDataLocation) + ")"; }
 	MemberList::MemberMap nativeMembers(ASTNode const* _currentScope) const override;
+	Type const* mobileType() const override { return nullptr; }
 
 	BoolResult isExplicitlyConvertibleTo(Type const& _convertTo) const override;
 protected:
diff --git a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
index 40e9075e1f..234657a224 100644
--- a/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
+++ b/test/libsolidity/syntaxTests/conversion/implicit_conversion_of_super_in_operators.sol
@@ -53,4 +53,4 @@ contract C {
 // TypeError 7366: (480-493): Operator -= not compatible with types type(contract super C) and contract C.
 // TypeError 4247: (503-508): Expression has to be an lvalue.
 // TypeError 7366: (503-516): Operator += not compatible with types type(contract super C) and contract C.
-// TypeError 1080: (527-546): True expression's type type(contract super C) does not match false expression's type contract C.
+// TypeError 9717: (534-539): Invalid mobile type in true expression.
diff --git a/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_3.sol b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_3.sol
new file mode 100644
index 0000000000..78c5493e5f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inline_arrays/unnamed_types_in_inline_array_3.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() public pure {
+        [uint];
+    }
+}
+// ----
+// TypeError 9563: (53-57): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/metaTypes/array_type_from_ternary.sol b/test/libsolidity/syntaxTests/metaTypes/array_type_from_ternary.sol
new file mode 100644
index 0000000000..b4f11310ce
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/array_type_from_ternary.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f(bool c) public {
+        (c ? uint[2] : uint[2])[3];
+    }
+}
+// ----
+// TypeError 9717: (58-65): Invalid mobile type in true expression.
+// TypeError 3703: (68-75): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/contract_from_ternary.sol b/test/libsolidity/syntaxTests/metaTypes/contract_from_ternary.sol
new file mode 100644
index 0000000000..7f4f17552e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/contract_from_ternary.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() public pure { }
+    function g(bool c) public {
+        (c ? C : C).f();
+    }
+}
+// ----
+// TypeError 9717: (91-92): Invalid mobile type in true expression.
+// TypeError 3703: (95-96): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/explicit_type_conversion.sol b/test/libsolidity/syntaxTests/metaTypes/explicit_type_conversion.sol
new file mode 100644
index 0000000000..3afd4d296f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/explicit_type_conversion.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f(bool c) pure public returns (int) {
+        return (c ? int : int)(0);
+    }
+}
+// ----
+// TypeError 9717: (84-87): Invalid mobile type in true expression.
+// TypeError 3703: (90-93): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/library_from_ternary.sol b/test/libsolidity/syntaxTests/metaTypes/library_from_ternary.sol
new file mode 100644
index 0000000000..e1e147a15c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/library_from_ternary.sol
@@ -0,0 +1,12 @@
+library L {
+    function f() public pure { }
+}
+
+contract C {
+    function g(bool c) public {
+        (c ? L : L).f();
+    }
+}
+// ----
+// TypeError 9717: (106-107): Invalid mobile type in true expression.
+// TypeError 3703: (110-111): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/struct_from_ternary.sol b/test/libsolidity/syntaxTests/metaTypes/struct_from_ternary.sol
new file mode 100644
index 0000000000..5d531d23fc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/struct_from_ternary.sol
@@ -0,0 +1,14 @@
+struct S {
+    uint x;
+    uint y;
+    uint z;
+}
+
+contract C {
+    function f(bool c) public pure {
+        S memory s = (c ? S : S)(0, 1, 2);
+    }
+}
+// ----
+// TypeError 9717: (126-127): Invalid mobile type in true expression.
+// TypeError 3703: (130-131): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_expression_nested_ternary_max_keyword.sol b/test/libsolidity/syntaxTests/metaTypes/type_expression_nested_ternary_max_keyword.sol
new file mode 100644
index 0000000000..9e926738d2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/type_expression_nested_ternary_max_keyword.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f(bool b) public pure returns (uint) {
+        return type(b ? uint : uint).max;
+    }
+}
+// ----
+// TypeError 9717: (89-93): Invalid mobile type in true expression.
+// TypeError 3703: (96-100): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/metaTypes/type_from_ternary_condition.sol b/test/libsolidity/syntaxTests/metaTypes/type_from_ternary_condition.sol
new file mode 100644
index 0000000000..b015641738
--- /dev/null
+++ b/test/libsolidity/syntaxTests/metaTypes/type_from_ternary_condition.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f(bool c) pure public {
+        type(c ? uint : uint);
+    }
+}
+// ----
+// TypeError 9717: (67-71): Invalid mobile type in true expression.
+// TypeError 3703: (74-78): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_array_of_unitary_tuples.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_array_of_unitary_tuples.sol
new file mode 100644
index 0000000000..1f12fcf31f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_array_of_unitary_tuples.sol
@@ -0,0 +1,17 @@
+contract C {
+    function f() pure public {
+        abi.decode("", ((uint)[2]));
+        abi.decode("", ((uint)[]));
+        abi.decode("", ((uint)[][3]));
+        abi.decode("", ((uint)[4][]));
+        abi.decode("", ((uint)[5][6]));
+        abi.decode("", (((uint))[5][6]));
+    }
+}
+// ----
+// Warning 6133: (52-79): Statement has no effect.
+// Warning 6133: (89-115): Statement has no effect.
+// Warning 6133: (125-154): Statement has no effect.
+// Warning 6133: (164-193): Statement has no effect.
+// Warning 6133: (203-233): Statement has no effect.
+// Warning 6133: (243-275): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_enum.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_enum.sol
new file mode 100644
index 0000000000..a44a657392
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_enum.sol
@@ -0,0 +1,8 @@
+contract C {
+    enum Color { red, green, blue }
+    function f() pure public {
+        abi.decode("", (Color));
+    }
+}
+// ----
+// Warning 6133: (88-111): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_length_ternary_with_max_keyword.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_length_ternary_with_max_keyword.sol
new file mode 100644
index 0000000000..f958f74f31
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_length_ternary_with_max_keyword.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() pure public {
+        bool x;
+        abi.decode("", (uint[type(x = true ? uint8 : uint8).max]));
+    }
+}
+// ----
+// TypeError 9717: (105-110): Invalid mobile type in true expression.
+// TypeError 3703: (113-118): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_of_tuples.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_of_tuples.sol
new file mode 100644
index 0000000000..3b5dc90594
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_array_of_tuples.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() pure public {
+        abi.decode("", ((uint, int)[5][6]));
+    }
+}
+// ----
+// TypeError 2614: (68-79): Indexed expression has to be a type, mapping or array (is tuple(type(uint256),type(int256)))
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_array_literal.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_array_literal.sol
new file mode 100644
index 0000000000..6f481e0d38
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_array_literal.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() pure public {
+        abi.decode("", ([uint][2]));
+    }
+}
+// ----
+// TypeError 9563: (69-73): Invalid mobile type.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_ternary_expression.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_ternary_expression.sol
new file mode 100644
index 0000000000..97b15f4bbb
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_indexed_ternary_expression.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() pure public {
+        bool x;
+        abi.decode("", ((x = true ? uint : uint)[0]));
+    }
+}
+// ----
+// TypeError 9717: (96-100): Invalid mobile type in true expression.
+// TypeError 3703: (103-107): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_condition_expression.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_condition_expression.sol
new file mode 100644
index 0000000000..6e64de7235
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_condition_expression.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f() pure public {
+        abi.decode("", (true ? uint : uint));
+    }
+}
+// ----
+// TypeError 9717: (75-79): Invalid mobile type in true expression.
+// TypeError 3703: (82-86): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_expression_inside_parentheses.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_expression_inside_parentheses.sol
new file mode 100644
index 0000000000..8911648129
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_expression_inside_parentheses.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f() pure public {
+        abi.decode("", ((true ? uint : uint)));
+    }
+}
+// ----
+// TypeError 9717: (76-80): Invalid mobile type in true expression.
+// TypeError 3703: (83-87): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_with_side_effect.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_with_side_effect.sol
new file mode 100644
index 0000000000..62592e4296
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_ternary_with_side_effect.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() pure public {
+        int x;
+        abi.decode("", ((x = 1) > 0 ? int : int));
+    }
+}
+// ----
+// TypeError 9717: (97-100): Invalid mobile type in true expression.
+// TypeError 3703: (103-106): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_tuple_type.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_tuple_type.sol
new file mode 100644
index 0000000000..317244a094
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_tuple_type.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() pure public {
+        abi.decode("", ((uint, int)));
+    }
+}
+// ----
+// TypeError 1039: (68-79): Argument has to be a type name.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_type_expression.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_type_expression.sol
new file mode 100644
index 0000000000..84640abd2a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_invalid_argument_type_expression.sol
@@ -0,0 +1,7 @@
+contract C {
+    function f() pure public {
+        abi.decode("", (type(uint)));
+    }
+}
+// ----
+// TypeError 1039: (68-78): Argument has to be a type name.
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_member_acess.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_member_acess.sol
new file mode 100644
index 0000000000..5078fcdebf
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_member_acess.sol
@@ -0,0 +1,19 @@
+library L {
+    struct S { int a; }
+    enum State { idle, running, blocked }
+}
+
+contract D {
+    struct X { uint b; }
+    enum Color { red, green, blue }
+}
+
+contract C {
+    function f() pure public {
+        abi.decode("", (L.S));
+        abi.decode("", (L.State));
+        abi.decode("", (D.X));
+        abi.decode("", (D.Color));
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_unitary_nested_tuple.sol b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_unitary_nested_tuple.sol
new file mode 100644
index 0000000000..8da0f0a090
--- /dev/null
+++ b/test/libsolidity/syntaxTests/specialFunctions/abidecode/abi_decode_unitary_nested_tuple.sol
@@ -0,0 +1,13 @@
+struct S { int a; }
+
+contract C {
+    function f() pure public {
+        abi.decode("", (((uint))));
+        abi.decode("", ((((uint)))));
+        abi.decode("", (((S))));
+    }
+}
+// ----
+// Warning 6133: (73-99): Statement has no effect.
+// Warning 6133: (109-137): Statement has no effect.
+// Warning 6133: (147-170): Statement has no effect.

From 110e2a656da142bdec13f13bf06b9961cc074588 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 26 Jun 2023 19:07:24 +0200
Subject: [PATCH 1498/1748] Restrict mobile types of function types.

Move ternary tests to semanticTests
---
 Changelog.md                                  |  1 +
 libsolidity/ast/Types.cpp                     |  8 ++++++--
 .../functionTypes/selector_ternary.sol        | 10 ++++++++++
 ...ry_function_pointer_from_function_call.sol | 19 +++++++++++++++++++
 .../ternary_contract_internal_function.sol    | 10 ++++++++++
 ...ary_contract_library_internal_function.sol | 13 +++++++++++++
 .../ternary_contract_public_function.sol      | 10 ++++++++++
 .../errors/error_ternary_operator.sol         | 11 +++++++++++
 ...error_ternary_operator_different_types.sol | 18 ------------------
 .../events/event_ternary_operator.sol         | 10 ++++++++++
 ...event_ternary_operator_different_types.sol | 17 -----------------
 .../functionTypes/from_ternary_expression.sol |  8 ++++++++
 ...tor_ternary_contract_external_function.sol | 10 ++++++++++
 ...ary_different_contract_public_function.sol | 13 +++++++++++++
 ..._different_contracts_external_function.sol | 16 ++++++++++++++++
 ..._different_interface_external_function.sol | 16 ++++++++++++++++
 16 files changed, 153 insertions(+), 37 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/functionTypes/selector_ternary.sol
 create mode 100644 test/libsolidity/semanticTests/functionTypes/selector_ternary_function_pointer_from_function_call.sol
 create mode 100644 test/libsolidity/semanticTests/functionTypes/ternary_contract_internal_function.sol
 create mode 100644 test/libsolidity/semanticTests/functionTypes/ternary_contract_library_internal_function.sol
 create mode 100644 test/libsolidity/semanticTests/functionTypes/ternary_contract_public_function.sol
 create mode 100644 test/libsolidity/syntaxTests/errors/error_ternary_operator.sol
 delete mode 100644 test/libsolidity/syntaxTests/errors/error_ternary_operator_different_types.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_ternary_operator.sol
 delete mode 100644 test/libsolidity/syntaxTests/events/event_ternary_operator_different_types.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/from_ternary_expression.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/selector_ternary_contract_external_function.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contract_public_function.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contracts_external_function.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_interface_external_function.sol

diff --git a/Changelog.md b/Changelog.md
index 7b19d37c0d..06a761e6e8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -30,6 +30,7 @@ Bugfixes:
  * SMTChecker: Fix false negative when a verification target can be violated only by trusted external call from another public function.
  * SMTChecker: Fix internal error caused by using external identifier to encode member access to functions that take an internal function as a parameter.
  * Standard JSON Interface: Fix an incomplete AST being returned when analysis is interrupted by certain kinds of fatal errors.
+ * Type Checker: Disallow using certain unassignable function types in complex expressions.
  * Type Checker: Function declaration types referring to different declarations are no longer convertible to each other.
  * Yul Optimizer: Ensure that the assignment of memory slots for variables moved to memory does not depend on AST IDs that may depend on whether additional files are included during compilation.
  * Yul Optimizer: Fix ``FullInliner`` step not ignoring code that is not in expression-split form.
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 915440caa0..47e1fea04c 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -3472,7 +3472,11 @@ Type const* FunctionType::mobileType() const
 	if (valueSet() || gasSet() || saltSet() || hasBoundFirstArgument())
 		return nullptr;
 
-	// return function without parameter names
+	// Special function types do not get a mobile type, such that they cannot be used in complex expressions.
+	if (m_kind != FunctionType::Kind::Internal && m_kind != FunctionType::Kind::External && m_kind != FunctionType::Kind::DelegateCall)
+		return nullptr;
+
+	// return function without parameter names and without declaration
 	return TypeProvider::function(
 		m_parameterTypes,
 		m_returnParameterTypes,
@@ -3480,7 +3484,7 @@ Type const* FunctionType::mobileType() const
 		strings(m_returnParameterNames.size()),
 		m_kind,
 		m_stateMutability,
-		m_declaration,
+		nullptr,
 		Options::fromFunctionType(*this)
 	);
 }
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_ternary.sol b/test/libsolidity/semanticTests/functionTypes/selector_ternary.sol
new file mode 100644
index 0000000000..567b7c14b9
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/selector_ternary.sol
@@ -0,0 +1,10 @@
+contract C {
+	function f() public {}
+	function g() public {}
+	function h(bool c) public returns (bytes4) {
+		return (c ? this.f : this.g).selector;
+	}
+}
+// ----
+// h(bool): true -> 0x26121ff000000000000000000000000000000000000000000000000000000000
+// h(bool): false -> 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_ternary_function_pointer_from_function_call.sol b/test/libsolidity/semanticTests/functionTypes/selector_ternary_function_pointer_from_function_call.sol
new file mode 100644
index 0000000000..83415f728c
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/selector_ternary_function_pointer_from_function_call.sol
@@ -0,0 +1,19 @@
+contract A {
+    function f() public {}
+	function g() public {}
+}
+
+contract C {
+    A a = new A();
+
+    function getContract() public view returns (A) {
+        return a;
+    }
+
+    function test(bool b) public view returns (bytes4) {
+        return (b ? getContract().f : getContract().g).selector;
+    }
+}
+// ----
+// test(bool): true -> 0x26121ff000000000000000000000000000000000000000000000000000000000
+// test(bool): false -> 0xe2179b8e00000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/functionTypes/ternary_contract_internal_function.sol b/test/libsolidity/semanticTests/functionTypes/ternary_contract_internal_function.sol
new file mode 100644
index 0000000000..f7dc890489
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/ternary_contract_internal_function.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() internal pure returns(uint256) { return 1;}
+    function g() internal pure returns(uint256) { return 2; }
+    function test(bool b) public returns(uint256) {
+        return (b ? C.f : C.g)();
+    }
+}
+// ----
+// test(bool): true -> 1
+// test(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/functionTypes/ternary_contract_library_internal_function.sol b/test/libsolidity/semanticTests/functionTypes/ternary_contract_library_internal_function.sol
new file mode 100644
index 0000000000..a29a678d50
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/ternary_contract_library_internal_function.sol
@@ -0,0 +1,13 @@
+library L {
+    function f() internal pure returns(uint256){ return 1; }
+}
+
+contract C {
+    function g() internal pure returns(uint256) { return 2; }
+    function test(bool b) public returns(uint256) {
+        return (b ? L.f : C.g)();
+    }
+}
+// ----
+// test(bool): true -> 1
+// test(bool): false -> 2
diff --git a/test/libsolidity/semanticTests/functionTypes/ternary_contract_public_function.sol b/test/libsolidity/semanticTests/functionTypes/ternary_contract_public_function.sol
new file mode 100644
index 0000000000..6d52017a5e
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/ternary_contract_public_function.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public pure returns(uint256) { return 1; }
+    function g() public pure returns(uint256) { return 2; }
+    function test(bool b) public returns(uint256) {
+        return (b ? C.f : C.g)();
+    }
+}
+// ----
+// test(bool): true -> 1
+// test(bool): false -> 2
diff --git a/test/libsolidity/syntaxTests/errors/error_ternary_operator.sol b/test/libsolidity/syntaxTests/errors/error_ternary_operator.sol
new file mode 100644
index 0000000000..c4600a858c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/errors/error_ternary_operator.sol
@@ -0,0 +1,11 @@
+error MyCustomError(uint, bool);
+
+contract C {
+    function f() pure public {
+        true ? MyCustomError : MyCustomError;
+    }
+}
+
+// ----
+// TypeError 9717: (93-106): Invalid mobile type in true expression.
+// TypeError 3703: (109-122): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/errors/error_ternary_operator_different_types.sol b/test/libsolidity/syntaxTests/errors/error_ternary_operator_different_types.sol
deleted file mode 100644
index 680ab8058e..0000000000
--- a/test/libsolidity/syntaxTests/errors/error_ternary_operator_different_types.sol
+++ /dev/null
@@ -1,18 +0,0 @@
-error MyCustomError(uint, bool);
-error MyCustomError2(uint, bool);
-error MyCustomError3(uint, bool, bool);
-
-contract C {
-    function f() pure public {
-        true ? MyCustomError : MyCustomError;
-        true ? MyCustomError : MyCustomError2;
-        true ? MyCustomError : MyCustomError3;
-        true ? MyCustomError : true;
-        true ? true : MyCustomError;
-    }
-}
-
-// ----
-// TypeError 1080: (253-290): True expression's type error MyCustomError(uint256,bool) does not match false expression's type error MyCustomError3(uint256,bool,bool).
-// TypeError 1080: (300-327): True expression's type error MyCustomError(uint256,bool) does not match false expression's type bool.
-// TypeError 1080: (337-364): True expression's type bool does not match false expression's type error MyCustomError(uint256,bool).
diff --git a/test/libsolidity/syntaxTests/events/event_ternary_operator.sol b/test/libsolidity/syntaxTests/events/event_ternary_operator.sol
new file mode 100644
index 0000000000..0ba773241f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_ternary_operator.sol
@@ -0,0 +1,10 @@
+contract C {
+    event MyCustomEvent(uint);
+    function f() pure public {
+        true ? MyCustomEvent : MyCustomEvent;
+    }
+}
+
+// ----
+// TypeError 9717: (90-103): Invalid mobile type in true expression.
+// TypeError 3703: (106-119): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/events/event_ternary_operator_different_types.sol b/test/libsolidity/syntaxTests/events/event_ternary_operator_different_types.sol
deleted file mode 100644
index ca2f1e1d68..0000000000
--- a/test/libsolidity/syntaxTests/events/event_ternary_operator_different_types.sol
+++ /dev/null
@@ -1,17 +0,0 @@
-contract C {
-    event MyCustomEvent(uint);
-    event MyCustomEvent2(uint);
-    event MyCustomEvent3(uint, bool);
-    function f() pure public {
-        true ? MyCustomEvent : MyCustomEvent;
-        true ? MyCustomEvent : MyCustomEvent2;
-        true ? MyCustomEvent : MyCustomEvent3;
-        true ? MyCustomEvent : true;
-        true ? true : MyCustomEvent;
-    }
-}
-
-// ----
-// TypeError 1080: (246-283): True expression's type event MyCustomEvent(uint256) does not match false expression's type event MyCustomEvent3(uint256,bool).
-// TypeError 1080: (293-320): True expression's type event MyCustomEvent(uint256) does not match false expression's type bool.
-// TypeError 1080: (330-357): True expression's type bool does not match false expression's type event MyCustomEvent(uint256).
diff --git a/test/libsolidity/syntaxTests/functionTypes/from_ternary_expression.sol b/test/libsolidity/syntaxTests/functionTypes/from_ternary_expression.sol
new file mode 100644
index 0000000000..62ad8aa93d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/from_ternary_expression.sol
@@ -0,0 +1,8 @@
+contract C {
+    function f() public pure returns (uint x) {
+        x = (true ? addmod : addmod)(3, 4, 5);
+    }
+}
+// ----
+// TypeError 9717: (81-87): Invalid mobile type in true expression.
+// TypeError 3703: (90-96): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_contract_external_function.sol b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_contract_external_function.sol
new file mode 100644
index 0000000000..847caad06f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_contract_external_function.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() external pure { }
+    function g() external pure { }
+    function test(bool b) public returns(bytes4) {
+        (b ? C.f : C.g).selector;
+    }
+}
+// ----
+// TypeError 9717: (147-150): Invalid mobile type in true expression.
+// TypeError 3703: (153-156): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contract_public_function.sol b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contract_public_function.sol
new file mode 100644
index 0000000000..5f5edfa9fc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contract_public_function.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public pure { }
+    function g() public pure { }
+}
+
+contract A {
+    function test(bool b) public returns(bytes4) {
+        (b ? C.f : C.g).selector;
+    }
+}
+// ----
+// TypeError 9717: (159-162): Invalid mobile type in true expression.
+// TypeError 3703: (165-168): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contracts_external_function.sol b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contracts_external_function.sol
new file mode 100644
index 0000000000..e015f43150
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_contracts_external_function.sol
@@ -0,0 +1,16 @@
+contract C {
+    function f() external pure { }
+}
+
+contract D {
+    function g() external pure { }
+}
+
+contract A {
+    function test(bool b) public returns(bytes4) {
+        (b ? C.f : D.g).selector;
+    }
+}
+// ----
+// TypeError 9717: (179-182): Invalid mobile type in true expression.
+// TypeError 3703: (185-188): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_interface_external_function.sol b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_interface_external_function.sol
new file mode 100644
index 0000000000..4109a14ced
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/selector_ternary_different_interface_external_function.sol
@@ -0,0 +1,16 @@
+interface I1 {
+    function f() external pure;
+}
+
+interface I2 {
+    function g() external pure;
+}
+
+contract C {
+    function test(bool b) public returns(bytes4) {
+        (b ? I1.f : I2.g).selector;
+    }
+}
+// ----
+// TypeError 9717: (177-181): Invalid mobile type in true expression.
+// TypeError 3703: (184-188): Invalid mobile type in false expression.

From 82cb5338a90b13a6d9483164bdb7734ed021c86a Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 18 Jul 2023 13:55:46 +0200
Subject: [PATCH 1499/1748] Relax delegatecall type restriction plus test

---
 libsolidity/ast/Types.cpp                            |  8 +++-----
 .../functionTypes/declaration_type_conversion.sol    |  3 ++-
 .../ternary_contract_delegate_function.sol           | 12 ++++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/ternary_contract_delegate_function.sol

diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 47e1fea04c..2b955369fc 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -3423,12 +3423,10 @@ MemberList::MemberMap FunctionType::nativeMembers(ASTNode const* _scope) const
 	}
 	case Kind::DelegateCall:
 	{
-		auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(m_declaration);
-		solAssert(functionDefinition, "");
-		solAssert(functionDefinition->visibility() != Visibility::Private, "");
-		if (functionDefinition->visibility() != Visibility::Internal)
+		if (auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(m_declaration))
 		{
-			auto const* contract = dynamic_cast<ContractDefinition const*>(m_declaration->scope());
+			solAssert(functionDefinition->visibility() > Visibility::Internal, "");
+			auto const *contract = dynamic_cast<ContractDefinition const*>(m_declaration->scope());
 			solAssert(contract, "");
 			solAssert(contract->isLibrary(), "");
 			return {{"selector", TypeProvider::fixedBytes(4)}};
diff --git a/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol b/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol
index a26460dc12..c31c49aea9 100644
--- a/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/declaration_type_conversion.sol
@@ -8,4 +8,5 @@ contract C {
 	}
 }
 // ----
-// TypeError 1080: (117-130): True expression's type function D.f() does not match false expression's type function D.g().
+// TypeError 9717: (121-124): Invalid mobile type in true expression.
+// TypeError 3703: (127-130): Invalid mobile type in false expression.
diff --git a/test/libsolidity/syntaxTests/functionTypes/ternary_contract_delegate_function.sol b/test/libsolidity/syntaxTests/functionTypes/ternary_contract_delegate_function.sol
new file mode 100644
index 0000000000..810f5eb210
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/ternary_contract_delegate_function.sol
@@ -0,0 +1,12 @@
+library L {
+    function f() external {}
+}
+
+contract C {
+    function test() public {
+        (true ? L.f : L.f).selector;
+    }
+}
+
+// ----
+// TypeError 9582: (94-121): Member "selector" not found or not visible after argument-dependent lookup in function ().

From 5c7214cbe343a57540754accb8a4bbc4db3027bd Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 26 Jun 2023 17:14:08 +0200
Subject: [PATCH 1500/1748] Always generate code for .selector member access.

---
 Changelog.md                                        |  3 +++
 libsolidity/codegen/ExpressionCompiler.cpp          |  4 ++++
 .../selector_expression_side_effect.sol             | 13 +++++++++++++
 3 files changed, 20 insertions(+)
 create mode 100644 test/libsolidity/semanticTests/functionTypes/selector_expression_side_effect.sol

diff --git a/Changelog.md b/Changelog.md
index 06a761e6e8..c47d26ba2d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.21 (unreleased)
 
 Important Bugfixes:
+ * Code Generator: Always generate code for the expression in ``expression.selector``.
  * Yul Optimizer: Fix ``FullInliner`` step (``i``) not preserving the evaluation order of arguments passed into inlined functions in code that is not in expression-split form (i.e. when using a custom optimizer sequence in which the step not preceded by ``ExpressionSplitter`` (``x``)).
 
 
@@ -8,6 +9,7 @@ Language Features:
  * Allow qualified access to events from other contracts.
  * Relax restrictions on initialization of immutable variables. Reads and writes may now happen at any point at construction time outside of functions and modifiers. Explicit initialization is no longer mandatory.
 
+
 Compiler Features:
  * Commandline Interface: Add ``--ast-compact-json`` output in assembler mode.
  * Commandline Interface: Add ``--ir-ast-json`` and ``--ir-optimized-ast-json`` outputs for Solidity input, providing AST in compact JSON format for IR and optimized IR.
@@ -36,6 +38,7 @@ Bugfixes:
  * Yul Optimizer: Fix ``FullInliner`` step not ignoring code that is not in expression-split form.
  * Yul Optimizer: Fix optimized IR being unnecessarily passed through the Yul optimizer again before bytecode generation.
 
+
 AST Changes:
  * AST: Add the ``experimentalSolidity`` field to the ``SourceUnit`` nodes, which indicate whether the experimental parsing mode has been enabled via ``pragma experimental solidity``.
 
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 25bd15d5a5..fa94d2f58f 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1659,6 +1659,10 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 	{
 		if (functionType->hasDeclaration())
 		{
+			// Still visit the expression in case it has side effects.
+			_memberAccess.expression().accept(*this);
+			utils().popStackElement(*functionType);
+
 			if (functionType->kind() == FunctionType::Kind::Event)
 				m_context << u256(h256::Arith(util::keccak256(functionType->externalSignature())));
 			else
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_expression_side_effect.sol b/test/libsolidity/semanticTests/functionTypes/selector_expression_side_effect.sol
new file mode 100644
index 0000000000..cdb7b98dfe
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/selector_expression_side_effect.sol
@@ -0,0 +1,13 @@
+contract C {
+	uint x;
+	function f() public returns (uint256) {
+		h().f.selector;
+		return x;
+	}
+	function h() public returns (C) {
+		x = 42;
+		return this;
+	}
+}
+// ----
+// f() -> 42

From 86602852be6495c0adb07daea443a8c095b65263 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 11 Jul 2023 11:54:24 +0200
Subject: [PATCH 1501/1748] Add buglist entry
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 Changelog.md                                  |  2 +-
 docs/bugs.json                                | 13 +++++
 docs/bugs_by_version.json                     | 47 +++++++++++++++++--
 .../selector_assignment_expression.sol        | 10 ++++
 4 files changed, 67 insertions(+), 5 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/functionTypes/selector_assignment_expression.sol

diff --git a/Changelog.md b/Changelog.md
index c47d26ba2d..ff5a995036 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,7 +1,7 @@
 ### 0.8.21 (unreleased)
 
 Important Bugfixes:
- * Code Generator: Always generate code for the expression in ``expression.selector``.
+ * Code Generator: Always generate code for the expression in ``<expression>.selector`` in the legacy code generation pipeline.
  * Yul Optimizer: Fix ``FullInliner`` step (``i``) not preserving the evaluation order of arguments passed into inlined functions in code that is not in expression-split form (i.e. when using a custom optimizer sequence in which the step not preceded by ``ExpressionSplitter`` (``x``)).
 
 
diff --git a/docs/bugs.json b/docs/bugs.json
index e8b8507fad..6245bdeda5 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -12,6 +12,19 @@
             "yulOptimizer": true
         }
     },
+    {
+        "uid": "SOL-2023-1",
+        "name": "MissingSideEffectsOnSelectorAccess",
+        "summary": "Accessing the ``.selector`` member on complex expressions leaves the expression unevaluated in the legacy code generation.",
+        "description": "When accessing the ``.selector`` member on an expression with side-effects, like an assignment, a function call or a conditional, the expression would not be evaluated in the legacy code generation. This would happen in expressions where the functions used in the expression were all known at compilation time, regardless of whether the whole expression could be evaluated at compilation time or not. Note that the code generated by the IR pipeline was unaffected and would behave as expected.",
+        "link": "https://blog.soliditylang.org/2023/07/19/missing-side-effects-on-selector-access-bug/",
+        "introduced": "0.6.2",
+        "fixed": "0.8.21",
+        "severity": "low",
+        "conditions": {
+            "viaIR": false
+        }
+    },
     {
         "uid": "SOL-2022-7",
         "name": "StorageWriteRemovalBeforeConditionalTermination",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 8f2ba18180..43d5af799a 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1423,6 +1423,7 @@
     "0.6.10": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1438,6 +1439,7 @@
     "0.6.11": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1453,6 +1455,7 @@
     "0.6.12": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1467,6 +1470,7 @@
     },
     "0.6.2": {
         "bugs": [
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCalldataArrayAbiReencodingSizeValidation",
@@ -1484,6 +1488,7 @@
     },
     "0.6.3": {
         "bugs": [
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCalldataArrayAbiReencodingSizeValidation",
@@ -1501,6 +1506,7 @@
     },
     "0.6.4": {
         "bugs": [
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCalldataArrayAbiReencodingSizeValidation",
@@ -1518,6 +1524,7 @@
     },
     "0.6.5": {
         "bugs": [
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCalldataArrayAbiReencodingSizeValidation",
@@ -1535,6 +1542,7 @@
     },
     "0.6.6": {
         "bugs": [
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCalldataArrayAbiReencodingSizeValidation",
@@ -1552,6 +1560,7 @@
     "0.6.7": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCalldataArrayAbiReencodingSizeValidation",
@@ -1569,6 +1578,7 @@
     "0.6.8": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "NestedCalldataArrayAbiReencodingSizeValidation",
@@ -1583,6 +1593,7 @@
     "0.6.9": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1599,6 +1610,7 @@
     "0.7.0": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1614,6 +1626,7 @@
     "0.7.1": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1630,6 +1643,7 @@
     "0.7.2": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1645,6 +1659,7 @@
     "0.7.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1659,6 +1674,7 @@
     "0.7.4": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1672,6 +1688,7 @@
     "0.7.5": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1685,6 +1702,7 @@
     "0.7.6": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1698,6 +1716,7 @@
     "0.8.0": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1711,6 +1730,7 @@
     "0.8.1": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1724,6 +1744,7 @@
     "0.8.10": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1734,6 +1755,7 @@
     "0.8.11": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1745,6 +1767,7 @@
     "0.8.12": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1756,6 +1779,7 @@
     "0.8.13": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
@@ -1768,6 +1792,7 @@
     "0.8.14": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
@@ -1778,6 +1803,7 @@
     "0.8.15": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup"
         ],
@@ -1786,31 +1812,36 @@
     "0.8.16": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination"
         ],
         "released": "2022-08-08"
     },
     "0.8.17": {
         "bugs": [
-            "FullInlinerNonExpressionSplitArgumentEvaluationOrder"
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess"
         ],
         "released": "2022-09-08"
     },
     "0.8.18": {
         "bugs": [
-            "FullInlinerNonExpressionSplitArgumentEvaluationOrder"
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess"
         ],
         "released": "2023-02-01"
     },
     "0.8.19": {
         "bugs": [
-            "FullInlinerNonExpressionSplitArgumentEvaluationOrder"
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess"
         ],
         "released": "2023-02-22"
     },
     "0.8.2": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1823,13 +1854,15 @@
     },
     "0.8.20": {
         "bugs": [
-            "FullInlinerNonExpressionSplitArgumentEvaluationOrder"
+            "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess"
         ],
         "released": "2023-05-10"
     },
     "0.8.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1842,6 +1875,7 @@
     "0.8.4": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1853,6 +1887,7 @@
     "0.8.5": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1864,6 +1899,7 @@
     "0.8.6": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1875,6 +1911,7 @@
     "0.8.7": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1886,6 +1923,7 @@
     "0.8.8": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
@@ -1898,6 +1936,7 @@
     "0.8.9": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
+            "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
             "DirtyBytesArrayToStorage",
             "DataLocationChangeInInternalOverride",
diff --git a/test/libsolidity/semanticTests/functionTypes/selector_assignment_expression.sol b/test/libsolidity/semanticTests/functionTypes/selector_assignment_expression.sol
new file mode 100644
index 0000000000..896dbeb992
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/selector_assignment_expression.sol
@@ -0,0 +1,10 @@
+contract C {
+    bool public z;
+    function f() public {
+        ((z = true) ? this.f : this.f).selector;
+    }
+}
+
+// ----
+// f()
+// z() -> true

From aba7d1769c1430570a2b66fea315f129322813b8 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 18 Jul 2023 18:06:56 +0200
Subject: [PATCH 1502/1748] Fix broken links in docs

---
 docs/installing-solidity.rst | 2 +-
 docs/resources.rst           | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index 9eb0ee76f0..c46767366b 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -380,7 +380,7 @@ Prerequisites - macOS
 ---------------------
 
 For macOS builds, ensure that you have the latest version of
-`Xcode installed <https://developer.apple.com/xcode/download/>`_.
+`Xcode installed <https://developer.apple.com/xcode/resources/>`_.
 This contains the `Clang C++ compiler <https://en.wikipedia.org/wiki/Clang>`_, the
 `Xcode IDE <https://en.wikipedia.org/wiki/Xcode>`_ and other Apple development
 tools that are required for building C++ applications on OS X.
diff --git a/docs/resources.rst b/docs/resources.rst
index f51dba4bd9..84df74fb73 100644
--- a/docs/resources.rst
+++ b/docs/resources.rst
@@ -71,7 +71,7 @@ Editor Integrations
 
 * Visual Studio Code (VS Code)
 
-    * `Ethereum Remix Visual Studio Code extension <https://marketplace.visualstudio.com/items?itemName=RemixProject.ethereum-remix>`_
+    * `Ethereum Remix Visual Studio Code extension <https://github.com/ethereum/remix-vscode>`_
         Ethereum Remix extension pack for VS Code
 
     * `Solidity Visual Studio Code extension, by Juan Blanco <https://juan.blanco.ws/solidity-contracts-in-visual-studio-code/>`_
@@ -113,9 +113,6 @@ Solidity Tools
 * `leafleth <https://github.com/clemlak/leafleth>`_
     A documentation generator for Solidity smart-contracts.
 
-* `PIET <https://piet.slock.it/>`_
-    A tool to develop, audit and use Solidity smart contracts through a simple graphical interface.
-
 * `Scaffold-ETH <https://github.com/scaffold-eth/scaffold-eth>`_
     Forkable Ethereum development stack focused on fast product iterations.
 

From f622a6c5148f87c498dbd1dbbdf3426a89782e38 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@gmail.com>
Date: Tue, 18 Jul 2023 20:28:52 +0200
Subject: [PATCH 1503/1748] Add missing changelog entries

---
 Changelog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index ff5a995036..e5a8ca925b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -30,6 +30,8 @@ Bugfixes:
  * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.
  * SMTChecker: Fix false negative when a verification target can be violated only by trusted external call from another public function.
+ * SMTChecker: Fix generation of invalid SMT-LIB2 scripts in BMC engine with trusted mode for external calls when CHC engine times out.
+ * SMTChecker: Fix internal error caused by incorrectly classifying external function call using function pointer as a public getter.
  * SMTChecker: Fix internal error caused by using external identifier to encode member access to functions that take an internal function as a parameter.
  * Standard JSON Interface: Fix an incomplete AST being returned when analysis is interrupted by certain kinds of fatal errors.
  * Type Checker: Disallow using certain unassignable function types in complex expressions.

From 09628b7502f85de143983726c3649dda8a09bfb4 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 19 Jul 2023 09:27:09 +0200
Subject: [PATCH 1504/1748] Set release date for 0.8.21

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index e5a8ca925b..c5ff48ebda 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.21 (unreleased)
+### 0.8.21 (2023-07-19)
 
 Important Bugfixes:
  * Code Generator: Always generate code for the expression in ``<expression>.selector`` in the legacy code generation pipeline.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 43d5af799a..d15c72a654 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1859,6 +1859,10 @@
         ],
         "released": "2023-05-10"
     },
+    "0.8.21": {
+        "bugs": [],
+        "released": "2023-07-19"
+    },
     "0.8.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",

From 601104ea942de985082863b15206c5fa03a649a7 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 18 Jul 2023 19:56:07 +0200
Subject: [PATCH 1505/1748] Sort Changelog for 0.8.21 release

---
 Changelog.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e5a8ca925b..a78b29f410 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,16 +16,16 @@ Compiler Features:
  * Commandline Interface: Respect ``--optimize-yul`` and ``--no-optimize-yul`` in compiler mode and accept them in assembler mode as well. ``--optimize --no-optimize-yul`` combination now allows enabling EVM assembly optimizer without enabling Yul optimizer.
  * EWasm: Remove EWasm backend.
  * Parser: Introduce ``pragma experimental solidity``, which will enable an experimental language mode that in particular has no stability guarantees between non-breaking releases and is not suited for production use.
- * SMTChecker: Add ``--model-checker-print-query`` CLI option and ``settings.modelChecker.printQuery`` JSON option to output the SMTChecker queries in the SMTLIB2 format. This requires using `smtlib2` solver only.
+ * SMTChecker: Add ``--model-checker-print-query`` CLI option and ``settings.modelChecker.printQuery`` JSON option to output the SMTChecker queries in the SMTLIB2 format. This requires using ``smtlib2`` solver only.
  * Standard JSON Interface: Add ``ast`` file-level output for Yul input.
  * Standard JSON Interface: Add ``irAst`` and ``irOptimizedAst`` contract-level outputs for Solidity input, providing AST in compact JSON format for IR and optimized IR.
- * Yul Optimizer: Remove experimental `ReasoningBasedSimplifier` optimization step.
+ * Yul Optimizer: Remove experimental ``ReasoningBasedSimplifier`` optimization step.
  * Yul Optimizer: Stack-to-memory mover is now enabled by default whenever possible for via IR code generation and pure Yul compilation.
 
 
 Bugfixes:
  * Code Generator: Disallow complex expressions whose results are types, built-ins, modules or some unassignable functions. The legacy code generation pipeline would not actually evaluate them, discarding any side-effects they might have.
- * Code Generator: Fix not entirely deterministic order of functions in unoptimized Yul output. The choice of C++ compiler in some cases would result in different (but equivalent) bytecode (especially from native binaries vs emscripten binaries)
+ * Code Generator: Fix not entirely deterministic order of functions in unoptimized Yul output. The choice of C++ compiler in some cases would result in different (but equivalent) bytecode (especially from native binaries vs emscripten binaries).
  * Commandline Interface: Fix internal error when using ``--stop-after parsing`` and requesting some of the outputs that require full analysis or compilation.
  * Commandline Interface: It is no longer possible to specify both ``--optimize-yul`` and ``--no-optimize-yul`` at the same time.
  * SMTChecker: Fix encoding of side-effects inside ``if`` and ``ternary conditional``statements in the BMC engine.

From c2670e4afb0d5eca9495796e1ef69cc807bb87ed Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 18 Jul 2023 20:06:45 +0200
Subject: [PATCH 1506/1748] Set version to 0.8.22

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6583f7cd47..51f1511ce6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.21")
+set(PROJECT_VERSION "0.8.22")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index a86b6d58b8..4205e7416b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.22 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.21 (2023-07-19)
 
 Important Bugfixes:

From b2ce8898eadf105f346a7e7bb94b61078411ad4c Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 19 Jul 2023 12:18:26 +0200
Subject: [PATCH 1507/1748] Update solidity-website links in release checklist

---
 ReleaseChecklist.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 8892566820..2d94281bb0 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -3,7 +3,7 @@
 ### Requirements
  - [ ] GitHub account with access to [solidity](https://github.com/ethereum/solidity), [solc-js](https://github.com/ethereum/solc-js),
        [solc-bin](https://github.com/ethereum/solc-bin), [homebrew-ethereum](https://github.com/ethereum/homebrew-ethereum),
-       [solidity-blog](https://github.com/ethereum/solidity-blog) and [solidity-portal](https://github.com/ethereum/solidity-portal) repositories.
+       [solidity-website](https://github.com/ethereum/solidity-website).
  - [ ] DockerHub account with push rights to the [``solc`` image](https://hub.docker.com/r/ethereum/solc).
  - [ ] Lauchpad (Ubuntu One) account with a membership in the ["Ethereum" team](https://launchpad.net/~ethereum) and
        a gnupg key for your email in the ``ethereum.org`` domain (has to be version 1, gpg2 won't work).
@@ -37,8 +37,8 @@ At least a day before the release:
  - [ ] Prepare drafts of Twitter, Reddit and Solidity Forum announcements.
 
 ### Blog Post
- - [ ] Create a post on [solidity-blog](https://github.com/ethereum/solidity-blog) in the ``Releases`` category and explain some of the new features or concepts.
- - [ ] Create a post on [solidity-blog](https://github.com/ethereum/solidity-blog) in the ``Security Alerts`` category in case of important bug(s).
+ - [ ] Create a post on [solidity-website](https://github.com/ethereum/solidity-website/tree/main/src/posts) in the ``Releases`` category and explain some of the new features or concepts.
+ - [ ] Create a post on [solidity-website](https://github.com/ethereum/solidity-website/tree/main/src/posts) in the ``Security Alerts`` category in case of important bug(s).
 
 ### Changelog
  - [ ] Sort the changelog entries alphabetically and correct any errors you notice. Commit it.
@@ -104,9 +104,9 @@ At least a day before the release:
  - [ ] Make sure the documentation for the new release has been published successfully.
        Go to the [documentation status page at ReadTheDocs](https://readthedocs.org/projects/solidity/) and verify that the new version is listed, works and is marked as default.
  - [ ] Remove "still in progress" warning from the [release notes](https://github.com/ethereum/solidity/releases).
- - [ ] Merge the [blog posts](https://github.com/ethereum/solidity-blog/pulls) related to the release.
+ - [ ] Merge the [blog posts](https://github.com/ethereum/solidity-website/pulls) related to the release.
  - [ ] Create a commit to increase the version number on ``develop`` in ``CMakeLists.txt`` and add a new skeleton changelog entry.
- - [ ] Update the release information section [in the source of soliditylang.org](https://github.com/ethereum/solidity-portal/blob/master/index.html).
+ - [ ] Update the release information section [in the source of soliditylang.org](https://github.com/ethereum/solidity-website/blob/main/src/pages/index.tsx).
  - [ ] Announce on [Twitter](https://twitter.com/solidity_lang), including links to the release and the blog post.
  - [ ] Announce on [Fosstodon](https://fosstodon.org/@solidity/), including links to the release and the blog post.
  - [ ] Share the announcement on Reddit in [``/r/ethdev``](https://reddit.com/r/ethdev/), cross-posted to [``/r/ethereum``](https://reddit.com/r/ethereum/).

From 5b72c4f494a4330ae04fde7f9250084c9dfb1434 Mon Sep 17 00:00:00 2001
From: omahs <73983677+omahs@users.noreply.github.com>
Date: Tue, 18 Jul 2023 22:15:14 +0200
Subject: [PATCH 1508/1748] Fix typos

---
 CMakeLists.txt                | 2 +-
 ReleaseChecklist.md           | 2 +-
 docs/060-breaking-changes.rst | 2 +-
 docs/using-the-compiler.rst   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51f1511ce6..73e7930b72 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.13.0)
 
-set(ETH_CMAKE_DIR   "${CMAKE_CURRENT_LIST_DIR}/cmake"   CACHE PATH "The the path to the cmake directory")
+set(ETH_CMAKE_DIR   "${CMAKE_CURRENT_LIST_DIR}/cmake"   CACHE PATH "The path to the cmake directory")
 list(APPEND CMAKE_MODULE_PATH ${ETH_CMAKE_DIR})
 
 # Set the build type, if none was specified.
diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 8892566820..994b9692fe 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -5,7 +5,7 @@
        [solc-bin](https://github.com/ethereum/solc-bin), [homebrew-ethereum](https://github.com/ethereum/homebrew-ethereum),
        [solidity-blog](https://github.com/ethereum/solidity-blog) and [solidity-portal](https://github.com/ethereum/solidity-portal) repositories.
  - [ ] DockerHub account with push rights to the [``solc`` image](https://hub.docker.com/r/ethereum/solc).
- - [ ] Lauchpad (Ubuntu One) account with a membership in the ["Ethereum" team](https://launchpad.net/~ethereum) and
+ - [ ] Launchpad (Ubuntu One) account with a membership in the ["Ethereum" team](https://launchpad.net/~ethereum) and
        a gnupg key for your email in the ``ethereum.org`` domain (has to be version 1, gpg2 won't work).
  - [ ] Ubuntu/Debian dependencies of the PPA scripts: ``devscripts``, ``debhelper``, ``dput``, ``git``, ``wget``, ``ca-certificates``.
  - [ ] [npm Registry](https://www.npmjs.com) account added as a collaborator for the [``solc`` package](https://www.npmjs.com/package/solc).
diff --git a/docs/060-breaking-changes.rst b/docs/060-breaking-changes.rst
index 25bc15b875..e7c93057f6 100644
--- a/docs/060-breaking-changes.rst
+++ b/docs/060-breaking-changes.rst
@@ -112,7 +112,7 @@ New Error Reporter
 ~~~~~~~~~~~~~~~~~~
 
 A new error reporter was introduced, which aims at producing more accessible error messages on the command-line.
-It is enabled by default, but passing ``--old-reporter`` falls back to the the deprecated old error reporter.
+It is enabled by default, but passing ``--old-reporter`` falls back to the deprecated old error reporter.
 
 Metadata Hash Options
 ~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 3c0c1a70b6..1a7406f449 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -359,7 +359,7 @@ Input Description
         // Addresses of the libraries. If not all libraries are given here,
         // it can result in unlinked objects whose output data is different.
         "libraries": {
-          // The top level key is the the name of the source file where the library is used.
+          // The top level key is the name of the source file where the library is used.
           // If remappings are used, this source file should match the global path
           // after remappings were applied.
           // If this key is an empty string, that refers to a global level.

From 927eddee84a645807ff59f82567d5fd8e69a80ce Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 21 Jul 2023 15:54:59 +0200
Subject: [PATCH 1509/1748] Add TMP and remove TODO and FIXME from pylint note
 tags list

---
 scripts/pylintrc | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/pylintrc b/scripts/pylintrc
index 735810ad52..5ef5a6eff3 100644
--- a/scripts/pylintrc
+++ b/scripts/pylintrc
@@ -63,3 +63,7 @@ expected-line-ending-format=LF
 
 # Maximum number of characters on a single line.
 max-line-length=130
+
+[MISCELLANEOUS]
+
+notes=XXX,TMP

From ab4f5f298330da2c25e478d94be0f840df6e9ae1 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Fri, 13 Jan 2023 11:43:34 +0100
Subject: [PATCH 1510/1748] Initial prototype of prb-math external tests using
 foundry rewritten in python
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 .circleci/config.yml                     |   6 +-
 scripts/externalTests/runners/base.py    | 172 +++++++++++++++++++++++
 scripts/externalTests/runners/foundry.py | 110 +++++++++++++++
 scripts/externalTests/test_helpers.py    | 151 ++++++++++++++++++++
 test/externalTests/prb-math.py           |  53 +++++++
 test/external_tests.py                   |   2 +-
 6 files changed, 491 insertions(+), 3 deletions(-)
 create mode 100644 scripts/externalTests/runners/base.py
 create mode 100644 scripts/externalTests/runners/foundry.py
 create mode 100644 scripts/externalTests/test_helpers.py
 create mode 100755 test/externalTests/prb-math.py

diff --git a/.circleci/config.yml b/.circleci/config.yml
index bb6e562f11..38e9ee47f2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -691,7 +691,7 @@ defaults:
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
-      image: cimg/node:18.16
+      image: cimg/rust:1.70
 
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
       <<: *requires_b_ubu_static
@@ -1724,11 +1724,13 @@ workflows:
             - t_native_test_ext_yield_liquidator
             - t_native_test_ext_perpetual_pools
             - t_native_test_ext_uniswap
-            - t_native_test_ext_prb_math
             - t_native_test_ext_elementfi
             - t_native_test_ext_brink
             # NOTE: We are disabling gp2 tests due to constant failures.
             #- t_native_test_ext_gp2
+            # TODO: Dropping prb-math from the benchmarks since it is not implemented yet
+            # in the new Foundry external testing infrastructure.
+            # - t_native_test_ext_prb_math
             # NOTE: The external tests below were commented because they
             # depend on a specific version of hardhat which does not support shanghai EVM.
             #- t_native_test_ext_trident
diff --git a/scripts/externalTests/runners/base.py b/scripts/externalTests/runners/base.py
new file mode 100644
index 0000000000..a79ed53442
--- /dev/null
+++ b/scripts/externalTests/runners/base.py
@@ -0,0 +1,172 @@
+#!/usr/bin/env python3
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2023 solidity contributors.
+# ------------------------------------------------------------------------------
+
+import os
+import subprocess
+from abc import ABCMeta
+from abc import abstractmethod
+from dataclasses import dataclass
+from dataclasses import field
+from pathlib import Path
+from shutil import rmtree
+from tempfile import mkdtemp
+from textwrap import dedent
+from typing import List
+from typing import Set
+
+from test_helpers import download_project
+from test_helpers import get_solc_short_version
+from test_helpers import parse_command_line
+from test_helpers import parse_custom_presets
+from test_helpers import parse_solc_version
+from test_helpers import replace_version_pragmas
+from test_helpers import settings_from_preset
+from test_helpers import SettingsPreset
+
+CURRENT_EVM_VERSION: str = "shanghai"
+
+@dataclass
+class TestConfig:
+    name: str
+    repo_url: str
+    ref_type: str
+    ref: str
+    compile_only_presets: List[SettingsPreset] = field(default_factory=list)
+    settings_presets: List[SettingsPreset] = field(default_factory=lambda: list(SettingsPreset))
+    evm_version: str = field(default=CURRENT_EVM_VERSION)
+
+    def selected_presets(self) -> Set[SettingsPreset]:
+        return set(self.compile_only_presets + self.settings_presets)
+
+
+class BaseRunner(metaclass=ABCMeta):
+    config: TestConfig
+    solc_binary_type: str
+    solc_binary_path: Path
+    presets: Set[SettingsPreset]
+
+    def __init__(self, argv, config: TestConfig):
+        args = parse_command_line(f"{config.name} external tests", argv)
+        self.config = config
+        self.solc_binary_type = args.solc_binary_type
+        self.solc_binary_path = args.solc_binary_path
+        self.presets = parse_custom_presets(args.selected_presets) if args.selected_presets else config.selected_presets()
+        self.env = os.environ.copy()
+        self.tmp_dir = mkdtemp(prefix=f"ext-test-{config.name}-")
+        self.test_dir = Path(self.tmp_dir) / "ext"
+
+    def setup_solc(self) -> str:
+        if self.solc_binary_type == "solcjs":
+            # TODO: add support to solc-js
+            raise NotImplementedError()
+        print("Setting up solc...")
+        solc_version_output = subprocess.check_output(
+            [self.solc_binary_path, "--version"],
+            shell=False,
+            encoding="utf-8"
+        ).split(":")[1]
+        return parse_solc_version(solc_version_output)
+
+    @staticmethod
+    def enter_test_dir(fn):
+        """Run a function inside the test directory"""
+
+        previous_dir = os.getcwd()
+        def f(self, *args, **kwargs):
+            try:
+                assert self.test_dir is not None
+                os.chdir(self.test_dir)
+                return fn(self, *args, **kwargs)
+            finally:
+                # Restore the previous directory after execute fn
+                os.chdir(previous_dir)
+        return f
+
+    def setup_environment(self):
+        """Configure the project build environment"""
+        print("Configuring Runner building environment...")
+        replace_version_pragmas(self.test_dir)
+
+    @enter_test_dir
+    def clean(self):
+        """Clean temporary directories"""
+        rmtree(self.tmp_dir)
+
+    @enter_test_dir
+    @abstractmethod
+    def configure(self):
+        raise NotImplementedError()
+
+    @enter_test_dir
+    @abstractmethod
+    def compile(self, preset: SettingsPreset):
+        raise NotImplementedError()
+
+    @enter_test_dir
+    @abstractmethod
+    def run_test(self):
+        raise NotImplementedError()
+
+def run_test(runner: BaseRunner):
+    print(f"Testing {runner.config.name}...\n===========================")
+    print(f"Selected settings presets: {' '.join(p.value for p in runner.presets)}")
+
+    # Configure solc compiler
+    solc_version = runner.setup_solc()
+    print(f"Using compiler version {solc_version}")
+
+    # Download project
+    download_project(runner.test_dir, runner.config.repo_url, runner.config.ref_type, runner.config.ref)
+
+    # Configure run environment
+    runner.setup_environment()
+
+    # Configure TestRunner instance
+    print(dedent(f"""\
+        Configuring runner's profiles with:
+        -------------------------------------
+        Binary type: {runner.solc_binary_type}
+        Compiler path: {runner.solc_binary_path}
+        -------------------------------------
+    """))
+    runner.configure()
+    for preset in runner.presets:
+        print("Running compile function...")
+        settings = settings_from_preset(preset, runner.config.evm_version)
+        print(dedent(f"""\
+            -------------------------------------
+            Settings preset: {preset.value}
+            Settings: {settings}
+            EVM version: {runner.config.evm_version}
+            Compiler version: {get_solc_short_version(solc_version)}
+            Compiler version (full): {solc_version}
+            -------------------------------------
+        """))
+        runner.compile(preset)
+        # TODO: COMPILE_ONLY should be a command-line option
+        if os.environ.get("COMPILE_ONLY") == "1" or preset in runner.config.compile_only_presets:
+            print("Skipping test function...")
+        else:
+            print("Running test function...")
+            runner.run_test()
+        # TODO: store_benchmark_report
+    runner.clean()
+    print("Done.")
diff --git a/scripts/externalTests/runners/foundry.py b/scripts/externalTests/runners/foundry.py
new file mode 100644
index 0000000000..0b171250f7
--- /dev/null
+++ b/scripts/externalTests/runners/foundry.py
@@ -0,0 +1,110 @@
+#!/usr/bin/env python3
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2023 solidity contributors.
+# ------------------------------------------------------------------------------
+
+import os
+import re
+import subprocess
+from shutil import which
+from textwrap import dedent
+from typing import Optional
+
+from runners.base import BaseRunner
+from test_helpers import SettingsPreset
+from test_helpers import settings_from_preset
+
+def run_forge_command(command: str, env: Optional[dict] = None):
+    subprocess.run(
+        command.split(),
+        env=env if env is not None else os.environ.copy(),
+        check=True
+    )
+
+
+class FoundryRunner(BaseRunner):
+    """Configure and run Foundry-based projects"""
+
+    FOUNDRY_CONFIG_FILE = "foundry.toml"
+
+    def setup_environment(self):
+        super().setup_environment()
+        if which("forge") is None:
+            raise RuntimeError("Forge not found.")
+
+    @staticmethod
+    def profile_name(preset: SettingsPreset):
+        """Returns foundry profile name"""
+        # Replace - or + by underscore to avoid invalid toml syntax
+        return re.sub(r"(\-|\+)+", "_", preset.value)
+
+    @staticmethod
+    def profile_section(profile_fields: dict) -> str:
+        return dedent("""\
+            [profile.{name}]
+            gas_reports = ["*"]
+            auto_detect_solc = false
+            solc = "{solc}"
+            evm_version = "{evm_version}"
+            optimizer = {optimizer}
+            via_ir = {via_ir}
+
+            [profile.{name}.optimizer_details]
+            yul = {yul}
+        """).format(**profile_fields)
+
+    @BaseRunner.enter_test_dir
+    def configure(self):
+        """Configure forge tests profiles"""
+
+        profiles = []
+        for preset in self.presets:
+            settings = settings_from_preset(preset, self.config.evm_version)
+            profiles.append(self.profile_section({
+                "name": self.profile_name(preset),
+                "solc": self.solc_binary_path,
+                "evm_version": self.config.evm_version,
+                "optimizer": str(settings["optimizer"]["enabled"]).lower(),
+                "via_ir": str(settings["viaIR"]).lower(),
+                "yul": str(settings["optimizer"]["details"]["yul"]).lower(),
+            }))
+
+        with open(
+            file=self.test_dir / self.FOUNDRY_CONFIG_FILE,
+            mode="a",
+            encoding="utf-8",
+        ) as f:
+            for profile in profiles:
+                f.write(profile)
+
+        run_forge_command("forge install", self.env)
+
+    @BaseRunner.enter_test_dir
+    def compile(self, preset: SettingsPreset):
+        """Compile project"""
+
+        # Set the Foundry profile environment variable
+        self.env.update({"FOUNDRY_PROFILE": self.profile_name(preset)})
+        run_forge_command("forge build", self.env)
+
+    @BaseRunner.enter_test_dir
+    def run_test(self):
+        """Run project tests"""
+
+        run_forge_command("forge test --gas-report", self.env)
diff --git a/scripts/externalTests/test_helpers.py b/scripts/externalTests/test_helpers.py
new file mode 100644
index 0000000000..9a573d50ad
--- /dev/null
+++ b/scripts/externalTests/test_helpers.py
@@ -0,0 +1,151 @@
+#!/usr/bin/env python3
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2023 solidity contributors.
+# ------------------------------------------------------------------------------
+
+import os
+import re
+import subprocess
+import sys
+from argparse import ArgumentParser
+from enum import Enum
+from pathlib import Path
+from typing import List
+from typing import Set
+
+# Our scripts/ is not a proper Python package so we need to modify PYTHONPATH to import from it
+# pragma pylint: disable=import-error,wrong-import-position
+PROJECT_ROOT = Path(__file__).parents[2]
+sys.path.insert(0, f"{PROJECT_ROOT}/scripts/common")
+
+from git_helpers import git_commit_hash
+
+SOLC_FULL_VERSION_REGEX = re.compile(r"^[a-zA-Z: ]*(.*)$")
+SOLC_SHORT_VERSION_REGEX = re.compile(r"^([0-9.]+).*\+|\-$")
+
+
+class SettingsPreset(Enum):
+    LEGACY_NO_OPTIMIZE = 'legacy-no-optimize'
+    IR_NO_OPTIMIZE = 'ir-no-optimize'
+    LEGACY_OPTIMIZE_EVM_ONLY = 'legacy-optimize-evm-only'
+    IR_OPTIMIZE_EVM_ONLY = 'ir-optimize-evm-only'
+    LEGACY_OPTIMIZE_EVM_YUL = 'legacy-optimize-evm+yul'
+    IR_OPTIMIZE_EVM_YUL = 'ir-optimize-evm+yul'
+
+
+def compiler_settings(evm_version: str, via_ir: bool = False, optimizer: bool = False, yul: bool = False) -> dict:
+    return {
+        "optimizer": {"enabled": optimizer, "details": {"yul": yul}},
+        "evmVersion": evm_version,
+        "viaIR": via_ir,
+    }
+
+
+def settings_from_preset(preset: SettingsPreset, evm_version: str) -> dict:
+    return {
+        SettingsPreset.LEGACY_NO_OPTIMIZE:       compiler_settings(evm_version),
+        SettingsPreset.IR_NO_OPTIMIZE:           compiler_settings(evm_version, via_ir=True),
+        SettingsPreset.LEGACY_OPTIMIZE_EVM_ONLY: compiler_settings(evm_version, optimizer=True),
+        SettingsPreset.IR_OPTIMIZE_EVM_ONLY:     compiler_settings(evm_version, via_ir=True, optimizer=True),
+        SettingsPreset.LEGACY_OPTIMIZE_EVM_YUL:  compiler_settings(evm_version, optimizer=True, yul=True),
+        SettingsPreset.IR_OPTIMIZE_EVM_YUL:      compiler_settings(evm_version, via_ir=True, optimizer=True, yul=True),
+    }[preset]
+
+
+def parse_custom_presets(presets: List[str]) -> Set[SettingsPreset]:
+    return {SettingsPreset(p) for p in presets}
+
+def parse_command_line(description: str, args: List[str]):
+    arg_parser = ArgumentParser(description)
+    arg_parser.add_argument(
+        "solc_binary_type",
+        metavar="solc-binary-type",
+        type=str,
+        default="native",
+        choices=["native", "solcjs"],
+        help="""Solidity compiler binary type""",
+    )
+    arg_parser.add_argument(
+        "solc_binary_path",
+        metavar="solc-binary-path",
+        type=Path,
+        help="""Path to solc binary""",
+    )
+    arg_parser.add_argument(
+        "selected_presets",
+        metavar="selected-presets",
+        help="""List of compiler settings presets""",
+        nargs='*',
+    )
+    return arg_parser.parse_args(args)
+
+
+def download_project(test_dir: Path, repo_url: str, ref_type: str = "branch", ref: str = "master"):
+    assert ref_type in ("commit", "branch", "tag")
+
+    print(f"Cloning {ref_type} {ref} of {repo_url}...")
+    if ref_type == "commit":
+        os.mkdir(test_dir)
+        os.chdir(test_dir)
+        subprocess.run(["git", "init"], check=True)
+        subprocess.run(["git", "remote", "add", "origin", repo_url], check=True)
+        subprocess.run(["git", "fetch", "--depth", "1", "origin", ref], check=True)
+        subprocess.run(["git", "reset", "--hard", "FETCH_HEAD"], check=True)
+    else:
+        os.chdir(test_dir.parent)
+        subprocess.run(["git", "clone", "--no-progress", "--depth", "1", repo_url, "-b", ref, test_dir.resolve()], check=True)
+        if not test_dir.exists():
+            raise RuntimeError("Failed to clone the project.")
+        os.chdir(test_dir)
+
+    if (test_dir / ".gitmodules").exists():
+        subprocess.run(["git", "submodule", "update", "--init"], check=True)
+
+    print(f"Current commit hash: {git_commit_hash()}")
+
+
+def parse_solc_version(solc_version_string: str) -> str:
+    solc_version_match = re.search(SOLC_FULL_VERSION_REGEX, solc_version_string)
+    if solc_version_match is None:
+        raise RuntimeError(f"Solc version could not be found in: {solc_version_string}.")
+    return solc_version_match.group(1)
+
+
+def get_solc_short_version(solc_full_version: str) -> str:
+    solc_short_version_match = re.search(SOLC_SHORT_VERSION_REGEX, solc_full_version)
+    if solc_short_version_match is None:
+        raise RuntimeError(f"Error extracting short version string from: {solc_full_version}.")
+    return solc_short_version_match.group(1)
+
+
+def store_benchmark_report(self):
+    raise NotImplementedError()
+
+
+def replace_version_pragmas(test_dir: Path):
+    """
+    Replace fixed-version pragmas (part of Consensys best practice).
+    Include all directories to also cover node dependencies.
+    """
+    print("Replacing fixed-version pragmas...")
+    for source in test_dir.glob("**/*.sol"):
+        content = source.read_text(encoding="utf-8")
+        content = re.sub(r"pragma solidity [^;]+;", r"pragma solidity >=0.0;", content)
+        with open(source, "w", encoding="utf-8") as f:
+            f.write(content)
diff --git a/test/externalTests/prb-math.py b/test/externalTests/prb-math.py
new file mode 100755
index 0000000000..0a4ce8ff95
--- /dev/null
+++ b/test/externalTests/prb-math.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python3
+
+# ------------------------------------------------------------------------------
+# 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/>
+#
+# (c) 2023 solidity contributors.
+# ------------------------------------------------------------------------------
+
+import sys
+from pathlib import Path
+
+# Our scripts/ is not a proper Python package so we need to modify PYTHONPATH to import from it
+# pragma pylint: disable=import-error,wrong-import-position
+PROJECT_ROOT = Path(__file__).parents[2]
+sys.path.insert(0, f"{PROJECT_ROOT}/scripts/externalTests")
+
+from runners.base import run_test
+from runners.base import TestConfig
+from runners.foundry import FoundryRunner
+from test_helpers import SettingsPreset
+
+test_config = TestConfig(
+    name="PRBMath",
+    repo_url="https://github.com/PaulRBerg/prb-math.git",
+    ref_type="branch",
+    ref="main",
+    compile_only_presets=[
+        # pylint: disable=line-too-long
+        # SettingsPreset.IR_NO_OPTIMIZE,       # Error: Yul exception:Variable expr_15699_address is 2 slot(s) too deep inside the stack. Stack too deep.
+        # SettingsPreset.IR_OPTIMIZE_EVM_ONLY, # Error: Yul exception:Variable expr_15699_address is 2 slot(s) too deep inside the stack. Stack too deep.
+    ],
+    settings_presets=[
+        SettingsPreset.LEGACY_NO_OPTIMIZE,
+        SettingsPreset.LEGACY_OPTIMIZE_EVM_ONLY,
+        SettingsPreset.LEGACY_OPTIMIZE_EVM_YUL,
+        SettingsPreset.IR_OPTIMIZE_EVM_YUL,
+    ],
+)
+
+sys.exit(run_test(FoundryRunner(argv=sys.argv[1:], config=test_config)))
diff --git a/test/external_tests.py b/test/external_tests.py
index 59b22af7e5..a7b8e87e83 100755
--- a/test/external_tests.py
+++ b/test/external_tests.py
@@ -36,7 +36,7 @@ def detect_external_tests() -> dict:
     return {
         file_path.stem: file_path
         for file_path in Path(EXTERNAL_TESTS_DIR).iterdir()
-        if file_path.is_file() and file_path.suffix == ".sh"
+        if file_path.is_file() and file_path.suffix in (".sh", ".py")
     }
 
 

From dcbd6457984844af420b3ee2abe461fb0859dcf3 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 19 Apr 2023 17:16:21 +0200
Subject: [PATCH 1511/1748] Delete old prb-math.sh script

---
 test/externalTests/prb-math.sh | 116 ---------------------------------
 1 file changed, 116 deletions(-)
 delete mode 100755 test/externalTests/prb-math.sh

diff --git a/test/externalTests/prb-math.sh b/test/externalTests/prb-math.sh
deleted file mode 100755
index fcf1aa208e..0000000000
--- a/test/externalTests/prb-math.sh
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/usr/bin/env bash
-
-# ------------------------------------------------------------------------------
-# 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/>
-#
-# (c) 2022 solidity contributors.
-#------------------------------------------------------------------------------
-
-set -e
-
-source scripts/common.sh
-source scripts/externalTests/common.sh
-
-REPO_ROOT=$(realpath "$(dirname "$0")/../..")
-
-verify_input "$@"
-BINARY_TYPE="$1"
-BINARY_PATH="$(realpath "$2")"
-SELECTED_PRESETS="$3"
-
-function compile_fn { yarn compile; }
-# NOTE: `yarn test` runs `mocha` which seems to disable the gas reporter.
-function test_fn { npx --no hardhat --no-compile test; }
-
-function prb_math_test
-{
-    local repo="https://github.com/paulrberg/prb-math"
-    local ref_type=branch
-    # We currently pin the prb-math version to the latest version that support hardhat
-    # Please see here for details: https://github.com/ethereum/solidity/issues/13767
-    local ref=v2.5.0
-    local config_file="hardhat.config.ts"
-    local config_var="config"
-
-    local compile_only_presets=(
-        ir-no-optimize            # Tests fail with "Error: Transaction reverted: trying to deploy a contract whose code is too large"
-    )
-    local settings_presets=(
-        "${compile_only_presets[@]}"
-        ir-optimize-evm-only
-        ir-optimize-evm+yul
-        legacy-optimize-evm-only
-        legacy-optimize-evm+yul
-        legacy-no-optimize
-    )
-
-    [[ $SELECTED_PRESETS != "" ]] || SELECTED_PRESETS=$(circleci_select_steps_multiarg "${settings_presets[@]}")
-    print_presets_or_exit "$SELECTED_PRESETS"
-
-    setup_solc "$DIR" "$BINARY_TYPE" "$BINARY_PATH"
-    download_project "$repo" "$ref_type" "$ref" "$DIR"
-
-    cp .env.example .env
-
-    # The project has yarn 3.1.0 binary stored in the repo and yarnrc forces the yarn 1.x binary
-    # installed system-wide to use it. Unfortunately Yarn 3 fails in weird ways when we remove
-    # yarn.lock. Remove the config to restore Yarn 1.x.
-    rm .yarnrc.yml
-
-    # Disable tests that won't pass on the ir presets due to Hardhat heuristics. Note that this also disables
-    # them for other presets but that's fine - we want same code run for benchmarks to be comparable.
-    # TODO: Remove this when Hardhat adjusts heuristics for IR (https://github.com/nomiclabs/hardhat/issues/3365).
-    pushd test/contracts/prbMathUd60x18/pure/
-    sed -i 's|context(\("when the sum overflows"\)|context.skip(\1|g' add.test.ts
-    sed -i 's|context(\("when the sum does not overflow"\)|context.skip(\1|g' add.test.ts
-    sed -i 's|context(\("when both operands are zero"\)|context.skip(\1|g' avg.test.ts
-    sed -i 's|context(\("when one operand is zero and the other is not zero"\)|context.skip(\1|g' avg.test.ts
-    sed -i 's|context(\("when the denominator is zero"\)|context.skip(\1|g' div.test.ts
-    sed -i 's|context(\("when x is zero"\)|context.skip(\1|g' inv.test.ts
-    popd
-    pushd test/contracts/prbMathSd59x18/pure/
-    sed -i 's|context(\("when the sum overflows"\)|context.skip(\1|g' add.test.ts
-    sed -i 's|context(\("when the sum underflows"\)|context.skip(\1|g' add.test.ts
-    sed -i 's|context(\("when the denominator is zero"\)|context.skip(\1|g' div.test.ts
-    sed -i 's|context(\("when x is zero"\)|context.skip(\1|g' inv.test.ts
-    sed -i 's|context(\("when the difference underflows"\)|context.skip(\1|g' sub.test.ts
-    sed -i 's|context(\("when the difference overflows"\)|context.skip(\1|g' sub.test.ts
-    popd
-
-    neutralize_package_lock
-    neutralize_package_json_hooks
-    force_hardhat_compiler_binary "$config_file" "$BINARY_TYPE" "$BINARY_PATH"
-    force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")" "$config_var"
-    yarn install --no-lock-file
-    yarn add hardhat-gas-reporter
-
-    # Workaround for error caused by the last release of hardhat-waffle@2.0.6 that bumps ethereum-waffle
-    # to version 4.0.10 and breaks prb-math build with the following error:
-    #
-    #  Cannot find module 'ethereum-waffle/dist/cjs/src/deployContract'
-    #
-    # See: https://github.com/NomicFoundation/hardhat-waffle/commit/83ee9cb36ee59d0bedacbbd00043f030af104ad0
-    yarn add '@nomiclabs/hardhat-waffle@2.0.5'
-
-    replace_version_pragmas
-
-    for preset in $SELECTED_PRESETS; do
-        hardhat_run_test "$config_file" "$preset" "${compile_only_presets[*]}" compile_fn test_fn "$config_var"
-        store_benchmark_report hardhat prb-math "$repo" "$preset"
-    done
-}
-
-external_test PRBMath prb_math_test

From 964bdc711ccd81253251ebc0af4fb1919de5681e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 20 Jul 2023 13:28:03 +0200
Subject: [PATCH 1512/1748] Fix ICE when emitting event from another contract

---
 Changelog.md                                  |   1 +
 libsolidity/interface/Natspec.cpp             |  17 --
 .../event_emitted_from_foreign_contract.sol   | 112 +++++++
 .../event_emitted_from_foreign_contract.json  | 289 ++++++++++++++++++
 .../event_emitted_from_foreign_contract.sol   |  10 +
 ...itted_from_foreign_contract_parseOnly.json | 194 ++++++++++++
 test/libsolidity/SolidityNatspecJSON.cpp      | 173 +++++++++++
 .../event_emit_from_a_foreign_contract.sol    |  13 +
 ...emit_from_a_foreign_contract_same_name.sol |  17 ++
 ...event_emit_interface_event_via_library.sol |  19 ++
 .../events/event_emit_via_interface.sol       |  13 +
 11 files changed, 841 insertions(+), 17 deletions(-)
 create mode 100644 test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol
 create mode 100644 test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json
 create mode 100644 test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.sol
 create mode 100644 test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json
 create mode 100644 test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract.sol
 create mode 100644 test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract_same_name.sol
 create mode 100644 test/libsolidity/semanticTests/events/event_emit_interface_event_via_library.sol
 create mode 100644 test/libsolidity/semanticTests/events/event_emit_via_interface.sol

diff --git a/Changelog.md b/Changelog.md
index 4205e7416b..38a8aae412 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * NatSpec: Fix internal error when requesting userdoc or devdoc for a contract that emits an event defined in a foreign contract or interface.
 
 
 ### 0.8.21 (2023-07-19)
diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp
index b192dfda1b..5733d3063c 100644
--- a/libsolidity/interface/Natspec.cpp
+++ b/libsolidity/interface/Natspec.cpp
@@ -80,14 +80,6 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
 
 	for (auto const& event: uniqueInterfaceEvents(_contractDef))
 	{
-		ContractDefinition const* eventOrigin = event->annotation().contract;
-		solAssert(eventOrigin);
-		solAssert(
-			*eventOrigin == _contractDef ||
-			(!eventOrigin->isLibrary() && _contractDef.derivesFrom(*eventOrigin)) ||
-			(eventOrigin->isLibrary() && !_contractDef.derivesFrom(*eventOrigin))
-		);
-
 		string value = extractDoc(event->annotation().docTags, "notice");
 		if (!value.empty())
 			doc["events"][event->functionType(true)->externalSignature()]["notice"] = value;
@@ -178,16 +170,7 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
 
 	for (auto const& event: uniqueInterfaceEvents(_contractDef))
 		if (auto devDoc = devDocumentation(event->annotation().docTags); !devDoc.empty())
-		{
-			ContractDefinition const* eventOrigin = event->annotation().contract;
-			solAssert(eventOrigin);
-			solAssert(
-				*eventOrigin == _contractDef ||
-				(!eventOrigin->isLibrary() && _contractDef.derivesFrom(*eventOrigin)) ||
-				(eventOrigin->isLibrary() && !_contractDef.derivesFrom(*eventOrigin))
-			);
 			doc["events"][event->functionType(true)->externalSignature()] = devDoc;
-		}
 	for (auto const& error: _contractDef.interfaceErrors())
 		if (auto devDoc = devDocumentation(error->annotation().docTags); !devDoc.empty())
 			doc["errors"][error->functionType(true)->externalSignature()].append(devDoc);
diff --git a/test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol b/test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol
new file mode 100644
index 0000000000..30c1156697
--- /dev/null
+++ b/test/libsolidity/ABIJson/event_emitted_from_foreign_contract.sol
@@ -0,0 +1,112 @@
+interface I {
+    event Event(uint256 value);
+}
+contract C {
+    event Event(address indexed sender);
+}
+contract D {
+    event Event(address indexed sender);
+    function test(address sender) public {
+        emit I.Event(1);
+        emit C.Event(msg.sender);
+        emit Event(msg.sender);
+    }
+}
+// ----
+//     :C
+// [
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": true,
+//         "internalType": "address",
+//         "name": "sender",
+//         "type": "address"
+//       }
+//     ],
+//     "name": "Event",
+//     "type": "event"
+//   }
+// ]
+//
+//
+//     :D
+// [
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "uint256",
+//         "name": "value",
+//         "type": "uint256"
+//       }
+//     ],
+//     "name": "Event",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": true,
+//         "internalType": "address",
+//         "name": "sender",
+//         "type": "address"
+//       }
+//     ],
+//     "name": "Event",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": true,
+//         "internalType": "address",
+//         "name": "sender",
+//         "type": "address"
+//       }
+//     ],
+//     "name": "Event",
+//     "type": "event"
+//   },
+//   {
+//     "inputs":
+//     [
+//       {
+//         "internalType": "address",
+//         "name": "sender",
+//         "type": "address"
+//       }
+//     ],
+//     "name": "test",
+//     "outputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "function"
+//   }
+// ]
+//
+//
+//     :I
+// [
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "uint256",
+//         "name": "value",
+//         "type": "uint256"
+//       }
+//     ],
+//     "name": "Event",
+//     "type": "event"
+//   }
+// ]
diff --git a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json
new file mode 100644
index 0000000000..2d70e2f9fe
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.json
@@ -0,0 +1,289 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "C":
+    [
+      5
+    ],
+    "D":
+    [
+      19
+    ]
+  },
+  "id": 20,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "C",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 5,
+      "linearizedBaseContracts":
+      [
+        5
+      ],
+      "name": "C",
+      "nameLocation": "9:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "eventSelector": "bd1155618a34fd53d1a2de9f705f42f3582842cba0b985b25c59888d86e0c929",
+          "id": 4,
+          "name": "E",
+          "nameLocation": "23:1:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 3,
+            "nodeType": "ParameterList",
+            "parameters":
+            [
+              {
+                "constant": false,
+                "id": 2,
+                "indexed": true,
+                "mutability": "mutable",
+                "name": "sender",
+                "nameLocation": "41:6:1",
+                "nodeType": "VariableDeclaration",
+                "scope": 4,
+                "src": "25:22:1",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions":
+                {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                },
+                "typeName":
+                {
+                  "id": 1,
+                  "name": "address",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "25:7:1",
+                  "stateMutability": "nonpayable",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  }
+                },
+                "visibility": "internal"
+              }
+            ],
+            "src": "24:24:1"
+          },
+          "src": "17:32:1"
+        }
+      ],
+      "scope": 20,
+      "src": "0:51:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        4
+      ]
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "D",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 19,
+      "linearizedBaseContracts":
+      [
+        19
+      ],
+      "name": "D",
+      "nameLocation": "61:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 17,
+            "nodeType": "Block",
+            "src": "106:37:1",
+            "statements":
+            [
+              {
+                "eventCall":
+                {
+                  "arguments":
+                  [
+                    {
+                      "expression":
+                      {
+                        "id": 13,
+                        "name": "msg",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "referencedDeclaration": -15,
+                        "src": "125:3:1",
+                        "typeDescriptions":
+                        {
+                          "typeIdentifier": "t_magic_message",
+                          "typeString": "msg"
+                        }
+                      },
+                      "id": 14,
+                      "isConstant": false,
+                      "isLValue": false,
+                      "isPure": false,
+                      "lValueRequested": false,
+                      "memberLocation": "129:6:1",
+                      "memberName": "sender",
+                      "nodeType": "MemberAccess",
+                      "src": "125:10:1",
+                      "typeDescriptions":
+                      {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    }
+                  ],
+                  "expression":
+                  {
+                    "argumentTypes":
+                    [
+                      {
+                        "typeIdentifier": "t_address",
+                        "typeString": "address"
+                      }
+                    ],
+                    "expression":
+                    {
+                      "id": 10,
+                      "name": "C",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "referencedDeclaration": 5,
+                      "src": "121:1:1",
+                      "typeDescriptions":
+                      {
+                        "typeIdentifier": "t_type$_t_contract$_C_$5_$",
+                        "typeString": "type(contract C)"
+                      }
+                    },
+                    "id": 12,
+                    "isConstant": false,
+                    "isLValue": false,
+                    "isPure": false,
+                    "lValueRequested": false,
+                    "memberLocation": "123:1:1",
+                    "memberName": "E",
+                    "nodeType": "MemberAccess",
+                    "referencedDeclaration": 4,
+                    "src": "121:3:1",
+                    "typeDescriptions":
+                    {
+                      "typeIdentifier": "t_function_event_nonpayable$_t_address_$returns$__$",
+                      "typeString": "function (address)"
+                    }
+                  },
+                  "id": 15,
+                  "isConstant": false,
+                  "isLValue": false,
+                  "isPure": false,
+                  "kind": "functionCall",
+                  "lValueRequested": false,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "121:15:1",
+                  "tryCall": false,
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_tuple$__$",
+                    "typeString": "tuple()"
+                  }
+                },
+                "id": 16,
+                "nodeType": "EmitStatement",
+                "src": "116:20:1"
+              }
+            ]
+          },
+          "functionSelector": "bb29998e",
+          "id": 18,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "test",
+          "nameLocation": "78:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 8,
+            "nodeType": "ParameterList",
+            "parameters":
+            [
+              {
+                "constant": false,
+                "id": 7,
+                "mutability": "mutable",
+                "name": "sender",
+                "nameLocation": "91:6:1",
+                "nodeType": "VariableDeclaration",
+                "scope": 18,
+                "src": "83:14:1",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions":
+                {
+                  "typeIdentifier": "t_address",
+                  "typeString": "address"
+                },
+                "typeName":
+                {
+                  "id": 6,
+                  "name": "address",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "83:7:1",
+                  "stateMutability": "nonpayable",
+                  "typeDescriptions":
+                  {
+                    "typeIdentifier": "t_address",
+                    "typeString": "address"
+                  }
+                },
+                "visibility": "internal"
+              }
+            ],
+            "src": "82:16:1"
+          },
+          "returnParameters":
+          {
+            "id": 9,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "106:0:1"
+          },
+          "scope": 19,
+          "src": "69:74:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 20,
+      "src": "52:93:1",
+      "usedErrors": [],
+      "usedEvents":
+      [
+        4
+      ]
+    }
+  ],
+  "src": "0:146:1"
+}
diff --git a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.sol b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.sol
new file mode 100644
index 0000000000..6cad968f6b
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract.sol
@@ -0,0 +1,10 @@
+contract C {
+    event E(address indexed sender);
+}
+contract D {
+    function test(address sender) public {
+        emit C.E(msg.sender);
+    }
+}
+
+// ----
diff --git a/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json
new file mode 100644
index 0000000000..b6c0ca5e03
--- /dev/null
+++ b/test/libsolidity/ASTJSON/event_emitted_from_foreign_contract_parseOnly.json
@@ -0,0 +1,194 @@
+{
+  "absolutePath": "a",
+  "id": 20,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "id": 5,
+      "name": "C",
+      "nameLocation": "9:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "anonymous": false,
+          "id": 4,
+          "name": "E",
+          "nameLocation": "23:1:1",
+          "nodeType": "EventDefinition",
+          "parameters":
+          {
+            "id": 3,
+            "nodeType": "ParameterList",
+            "parameters":
+            [
+              {
+                "constant": false,
+                "id": 2,
+                "indexed": true,
+                "mutability": "mutable",
+                "name": "sender",
+                "nameLocation": "41:6:1",
+                "nodeType": "VariableDeclaration",
+                "src": "25:22:1",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {},
+                "typeName":
+                {
+                  "id": 1,
+                  "name": "address",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "25:7:1",
+                  "stateMutability": "nonpayable",
+                  "typeDescriptions": {}
+                },
+                "visibility": "internal"
+              }
+            ],
+            "src": "24:24:1"
+          },
+          "src": "17:32:1"
+        }
+      ],
+      "src": "0:51:1",
+      "usedErrors": [],
+      "usedEvents": []
+    },
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "id": 19,
+      "name": "D",
+      "nameLocation": "61:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 17,
+            "nodeType": "Block",
+            "src": "106:37:1",
+            "statements":
+            [
+              {
+                "eventCall":
+                {
+                  "arguments":
+                  [
+                    {
+                      "expression":
+                      {
+                        "id": 13,
+                        "name": "msg",
+                        "nodeType": "Identifier",
+                        "overloadedDeclarations": [],
+                        "src": "125:3:1",
+                        "typeDescriptions": {}
+                      },
+                      "id": 14,
+                      "memberLocation": "129:6:1",
+                      "memberName": "sender",
+                      "nodeType": "MemberAccess",
+                      "src": "125:10:1",
+                      "typeDescriptions": {}
+                    }
+                  ],
+                  "expression":
+                  {
+                    "expression":
+                    {
+                      "id": 10,
+                      "name": "C",
+                      "nodeType": "Identifier",
+                      "overloadedDeclarations": [],
+                      "src": "121:1:1",
+                      "typeDescriptions": {}
+                    },
+                    "id": 12,
+                    "memberLocation": "123:1:1",
+                    "memberName": "E",
+                    "nodeType": "MemberAccess",
+                    "src": "121:3:1",
+                    "typeDescriptions": {}
+                  },
+                  "id": 15,
+                  "nameLocations": [],
+                  "names": [],
+                  "nodeType": "FunctionCall",
+                  "src": "121:15:1",
+                  "tryCall": false,
+                  "typeDescriptions": {}
+                },
+                "id": 16,
+                "nodeType": "EmitStatement",
+                "src": "116:20:1"
+              }
+            ]
+          },
+          "id": 18,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "test",
+          "nameLocation": "78:4:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 8,
+            "nodeType": "ParameterList",
+            "parameters":
+            [
+              {
+                "constant": false,
+                "id": 7,
+                "mutability": "mutable",
+                "name": "sender",
+                "nameLocation": "91:6:1",
+                "nodeType": "VariableDeclaration",
+                "src": "83:14:1",
+                "stateVariable": false,
+                "storageLocation": "default",
+                "typeDescriptions": {},
+                "typeName":
+                {
+                  "id": 6,
+                  "name": "address",
+                  "nodeType": "ElementaryTypeName",
+                  "src": "83:7:1",
+                  "stateMutability": "nonpayable",
+                  "typeDescriptions": {}
+                },
+                "visibility": "internal"
+              }
+            ],
+            "src": "82:16:1"
+          },
+          "returnParameters":
+          {
+            "id": 9,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "106:0:1"
+          },
+          "src": "69:74:1",
+          "stateMutability": "nonpayable",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "src": "52:93:1",
+      "usedErrors": [],
+      "usedEvents": []
+    }
+  ],
+  "src": "0:146:1"
+}
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index a54460eb62..9ecd35aeff 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -485,6 +485,179 @@ BOOST_AUTO_TEST_CASE(event)
 	checkNatspec(sourceCode, "ERC20", userDoc, true);
 }
 
+BOOST_AUTO_TEST_CASE(emit_event_from_foreign_contract)
+{
+	char const* sourceCode = R"(
+		contract X {
+			/// @notice Userdoc for event E.
+			/// @dev Devdoc for event E.
+			event E();
+		}
+
+		contract C {
+			function g() public {
+				emit X.E();
+			}
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"E()":
+			{
+				"details": "Devdoc for event E."
+			}
+		},
+		"kind": "dev",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+		"events":
+		{
+			"E()":
+			{
+				"notice": "Userdoc for event E."
+			}
+		},
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", userDoc, true);
+}
+
+BOOST_AUTO_TEST_CASE(emit_event_from_foreign_contract_with_same_signature)
+{
+	char const* sourceCode = R"(
+		contract C {
+			/// @notice C.E event
+			/// @dev C.E event
+			event E(uint256 value);
+		}
+
+		contract D {
+			/// @notice D.E event
+			/// @dev D.E event
+			event E(uint256 value);
+
+			function test() public {
+				emit C.E(1);
+				emit E(2);
+			}
+		}
+	)";
+
+	char const* devDocC = R"ABCDEF(
+	{
+		"events":
+		{
+			"E(uint256)":
+			{
+				"details": "C.E event"
+			}
+		},
+		"kind": "dev",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", devDocC, false);
+
+	char const* devDocD = R"ABCDEF(
+	{
+		"events":
+		{
+			"E(uint256)":
+			{
+				"details": "D.E event"
+			}
+		},
+		"kind": "dev",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "D", devDocD, false);
+
+	char const* userDocC = R"ABCDEF(
+	{
+		"events":
+		{
+			"E(uint256)":
+			{
+				"notice": "C.E event"
+			}
+		},
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "C", userDocC, true);
+
+	char const* userDocD = R"ABCDEF(
+	{
+		"events":
+		{
+			"E(uint256)":
+			{
+				"notice": "D.E event"
+			}
+		},
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "D", userDocD, true);
+}
+
+// Tests that emitting an event from contract C in contract D does not inherit natspec from C.E
+BOOST_AUTO_TEST_CASE(emit_event_from_foreign_contract_no_inheritance)
+{
+	char const* sourceCode = R"(
+		contract C {
+			/// @notice C.E event
+			/// @dev C.E event
+			event E();
+		}
+
+		contract D {
+			event E();
+
+			function test() public {
+				emit C.E();
+			}
+		}
+	)";
+
+	char const* devDoc = R"ABCDEF(
+	{
+		"kind": "dev",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "D", devDoc, false);
+
+	char const* userDoc = R"ABCDEF(
+	{
+		"kind": "user",
+		"methods": {},
+		"version": 1
+	}
+	)ABCDEF";
+	checkNatspec(sourceCode, "D", userDoc, true);
+}
+
 BOOST_AUTO_TEST_CASE(emit_same_signature_event_library_contract)
 {
 	char const* sourceCode = R"(
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract.sol
new file mode 100644
index 0000000000..fcd7b6f4c5
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract.sol
@@ -0,0 +1,13 @@
+contract C {
+    event E();
+}
+
+contract D {
+    function test() public {
+        emit C.E();
+    }
+}
+
+// ----
+// test() ->
+// ~ emit E()
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract_same_name.sol b/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract_same_name.sol
new file mode 100644
index 0000000000..05c03c20fe
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/event_emit_from_a_foreign_contract_same_name.sol
@@ -0,0 +1,17 @@
+contract C {
+    event E(uint256 value);
+}
+
+contract D {
+    event E(uint256 value);
+
+    function test() public {
+        emit C.E(1);
+        emit E(2);
+    }
+}
+
+// ----
+// test() ->
+// ~ emit E(uint256): 0x01
+// ~ emit E(uint256): 0x02
diff --git a/test/libsolidity/semanticTests/events/event_emit_interface_event_via_library.sol b/test/libsolidity/semanticTests/events/event_emit_interface_event_via_library.sol
new file mode 100644
index 0000000000..9e24287ab7
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/event_emit_interface_event_via_library.sol
@@ -0,0 +1,19 @@
+interface I {
+    event E();
+}
+
+library L {
+    function f() internal {
+        emit I.E();
+    }
+}
+
+contract C {
+    function g() public {
+        L.f();
+    }
+}
+
+// ----
+// g() ->
+// ~ emit E()
diff --git a/test/libsolidity/semanticTests/events/event_emit_via_interface.sol b/test/libsolidity/semanticTests/events/event_emit_via_interface.sol
new file mode 100644
index 0000000000..7268e9ac50
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/event_emit_via_interface.sol
@@ -0,0 +1,13 @@
+interface I {
+    event Event(address indexed _from, uint256 _value);
+}
+
+contract C {
+    function emitEvent(uint256 _value) public {
+        emit I.Event(msg.sender, _value);
+    }
+}
+
+// ----
+// emitEvent(uint256): 100 ->
+// ~ emit Event(address,uint256): #0x1212121212121212121212121212120000000012, 0x64

From b4407d90a58bb6d1e3666ec3bd8d57537dbe9c46 Mon Sep 17 00:00:00 2001
From: shalaamum <120459177+shalaamum@users.noreply.github.com>
Date: Sat, 10 Jun 2023 17:10:39 +0200
Subject: [PATCH 1513/1748] Small documentation fixes

---
 docs/path-resolution.rst       | 2 +-
 docs/types/reference-types.rst | 2 +-
 docs/using-the-compiler.rst    | 2 +-
 docs/yul.rst                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/path-resolution.rst b/docs/path-resolution.rst
index 00831e609a..1c5a39516f 100644
--- a/docs/path-resolution.rst
+++ b/docs/path-resolution.rst
@@ -515,7 +515,7 @@ you can use the following in your source file:
 
 The compiler will look for the file in the VFS under ``dapp-bin/library/math.sol``.
 If the file is not available there, the source unit name will be passed to the Host Filesystem
-Loader, which will then look in ``/project/dapp-bin/library/iterable_mapping.sol``.
+Loader, which will then look in ``/project/dapp-bin/library/math.sol``.
 
 .. warning::
 
diff --git a/docs/types/reference-types.rst b/docs/types/reference-types.rst
index a136497e63..d2e9300e64 100644
--- a/docs/types/reference-types.rst
+++ b/docs/types/reference-types.rst
@@ -372,7 +372,7 @@ Array Members
 
 .. note::
     In EVM versions before Byzantium, it was not possible to access
-    dynamic arrays return from function calls. If you call functions
+    dynamic arrays returned from function calls. If you call functions
     that return dynamic arrays, make sure to use an EVM that is set to
     Byzantium mode.
 
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 1a7406f449..4df00d975a 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -408,7 +408,7 @@ Input Description
         //   evm.methodIdentifiers - The list of function hashes
         //   evm.gasEstimates - Function gas estimates
         //
-        // Note that using a using `evm`, `evm.bytecode`, etc. will select every
+        // Note that using `evm`, `evm.bytecode`, etc. will select every
         // target part of that output. Additionally, `*` can be used as a wildcard to request everything.
         //
         "outputSelection": {
diff --git a/docs/yul.rst b/docs/yul.rst
index 436d0b1462..cf47c1e877 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -741,7 +741,7 @@ EVM Dialect
 -----------
 
 The default dialect of Yul currently is the EVM dialect for the currently selected version of the EVM.
-with a version of the EVM. The only type available in this dialect
+The only type available in this dialect
 is ``u256``, the 256-bit native type of the Ethereum Virtual Machine.
 Since it is the default type of this dialect, it can be omitted.
 

From 4fa48a6eb1a1c33f60fc92e5895486dbdea294be Mon Sep 17 00:00:00 2001
From: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date: Mon, 24 Jul 2023 07:48:18 -0700
Subject: [PATCH 1514/1748] patch other-version menu overflow [Fixes #14429]
 (#14431)

---
 docs/_static/css/custom.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
index ed21675dd2..7519db8e1c 100644
--- a/docs/_static/css/custom.css
+++ b/docs/_static/css/custom.css
@@ -16,6 +16,7 @@
 
     --navHeight: 4.5rem;
     --sideWidth: 300px;
+    --currentVersionHeight: 45px;
 
     text-rendering: geometricPrecision;
     -webkit-font-smoothing: antialiased;
@@ -658,6 +659,8 @@ ul.search .context {
 .rst-other-versions {
     background: var(--white) !important;
     color: var(--color-a) !important;
+    max-height: calc(100vh - var(--navHeight) - var(--currentVersionHeight));
+    overflow-y: scroll;
 }
 
 .rst-other-versions a {

From 83fe3d4011e3d14385f83aef0c32a0d894273501 Mon Sep 17 00:00:00 2001
From: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date: Mon, 24 Jul 2023 07:48:39 -0700
Subject: [PATCH 1515/1748] update GH edit path to `develop` branch (#14437)

---
 docs/_static/js/initialize.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/docs/_static/js/initialize.js b/docs/_static/js/initialize.js
index c875b37df8..04afa10e45 100644
--- a/docs/_static/js/initialize.js
+++ b/docs/_static/js/initialize.js
@@ -143,6 +143,19 @@ const updateActiveNavLink = () => {
 
 document.addEventListener("locationchange", updateActiveNavLink);
 
+function updateGitHubEditPath() {
+  // Replaces the version number in the GitHub edit path with "develop"
+  const gitHubEditAnchor = document.querySelector(".wy-breadcrumbs-aside > a");
+  const url = new URL(gitHubEditAnchor.href);
+  const split = url.pathname.split("/");
+  const versionIndex = split.indexOf("blob") + 1;
+  split[versionIndex] = "develop";
+  url.pathname = split.join("/");
+  gitHubEditAnchor.setAttribute("href", url.toString());
+  gitHubEditAnchor.setAttribute("target", "_blank");
+  gitHubEditAnchor.setAttribute("rel", "noopener noreferrer");
+}
+
 function initialize() {
   // Preload fonts
   const fonts = [
@@ -214,6 +227,9 @@ function initialize() {
 
   // Update active nav link
   updateActiveNavLink();
+
+  // Update GitHub edit path to direct to `develop` branch
+  updateGitHubEditPath();
 }
 
 document.addEventListener("DOMContentLoaded", initialize);

From 2e3879840893d927926482ab3826220b7e617552 Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@gmail.com>
Date: Mon, 24 Jul 2023 17:01:12 +0200
Subject: [PATCH 1516/1748] SMTChecker: Keep counterexamples on test
 expectation update

---
 test/libsolidity/SMTCheckerTest.cpp | 8 ++++++++
 test/libsolidity/SMTCheckerTest.h   | 4 ++++
 2 files changed, 12 insertions(+)

diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 288527e048..dddee7da43 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -140,6 +140,7 @@ TestCase::TestResult SMTCheckerTest::run(ostream& _stream, string const& _linePr
 void SMTCheckerTest::filterObtainedErrors()
 {
 	SyntaxTest::filterObtainedErrors();
+	m_unfilteredErrorList = m_errorList;
 
 	static auto removeCex = [](vector<SyntaxTestError>& errors) {
 		for (auto& e: errors)
@@ -156,3 +157,10 @@ void SMTCheckerTest::filterObtainedErrors()
 		removeCex(m_errorList);
 	}
 }
+
+void SMTCheckerTest::printUpdatedExpectations(ostream &_stream, const string &_linePrefix) const {
+	if (!m_unfilteredErrorList.empty())
+		printErrorList(_stream, m_unfilteredErrorList, _linePrefix, false);
+	else
+		CommonSyntaxTest::printUpdatedExpectations(_stream, _linePrefix);
+}
diff --git a/test/libsolidity/SMTCheckerTest.h b/test/libsolidity/SMTCheckerTest.h
index 965705f30c..459a6c5656 100644
--- a/test/libsolidity/SMTCheckerTest.h
+++ b/test/libsolidity/SMTCheckerTest.h
@@ -42,6 +42,8 @@ class SMTCheckerTest: public SyntaxTest
 
 	void filterObtainedErrors() override;
 
+	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
+
 protected:
 	/*
 	Options that can be set in the test:
@@ -62,6 +64,8 @@ class SMTCheckerTest: public SyntaxTest
 	ModelCheckerSettings m_modelCheckerSettings;
 
 	bool m_ignoreCex = false;
+
+	std::vector<SyntaxTestError> m_unfilteredErrorList;
 };
 
 }

From cdfc19b5032d3d9e2e5f77003a379da4bb1ae00b Mon Sep 17 00:00:00 2001
From: Martin Blicha <martin.blicha@gmail.com>
Date: Mon, 24 Jul 2023 18:33:43 +0200
Subject: [PATCH 1517/1748] SMTChecker: Bring back counterexample checks in
 regression tests

Since the default is now to ignore the counterexamples when checking
test output, we bring back counterexample checks in tests where the
counterexample is (mostly) deterministic.
---
 .../array_members/pop_1_unsafe.sol            |  1 +
 .../array_members/pop_constructor_unsafe.sol  |  1 +
 .../array_members/push_zero_unsafe.sol        |  3 ++-
 .../control_flow/short_circuit_and_fail.sol   |  3 ++-
 .../short_circuit_and_need_both_fail.sol      |  3 ++-
 .../control_flow/short_circuit_or_fail.sol    |  3 ++-
 .../short_circuit_or_need_both_fail.sol       |  3 ++-
 .../external_calls/call_mutex_unsafe.sol      |  4 ++--
 .../external_calls/external_reentrancy_2.sol  |  3 ++-
 .../underflow_only_in_external_call.sol       |  3 ++-
 .../smtCheckerTests/file_level/easy.sol       |  3 ++-
 .../smtCheckerTests/file_level/struct.sol     |  5 +++--
 .../functions/functions_identity_1_fail.sol   |  1 +
 .../functions/functions_identity_2_fail.sol   |  1 +
 .../functions/getters/array_2.sol             |  4 ++--
 .../functions/getters/array_of_structs_2.sol  |  3 ++-
 .../functions/getters/mapping_1.sol           |  3 ++-
 .../functions/getters/mapping_2.sol           |  3 ++-
 .../functions/getters/struct_1.sol            |  3 ++-
 .../functions/getters/struct_2.sol            |  3 ++-
 .../getters/struct_with_reassignment.sol      |  5 +++--
 .../functions/getters/uint.sol                |  3 ++-
 .../functions/super_function_assert.sol       |  5 +++--
 .../base_contract_assertion_fail_1.sol        |  3 ++-
 .../base_contract_assertion_fail_2.sol        |  3 ++-
 .../base_contract_assertion_fail_3.sol        |  3 ++-
 .../base_contract_assertion_fail_4.sol        |  3 ++-
 .../base_contract_assertion_fail_5.sol        |  3 ++-
 .../base_contract_assertion_fail_6.sol        |  3 ++-
 .../base_contract_assertion_fail_7.sol        |  3 ++-
 .../base_contract_assertion_fail_8.sol        |  1 +
 .../base_contract_assertion_fail_9.sol        |  5 +++--
 .../inheritance/diamond_super_1.sol           |  3 ++-
 .../inheritance/diamond_super_2.sol           |  5 +++--
 .../inheritance/diamond_super_3.sol           |  3 ++-
 .../loops/while_loop_simple_1.sol             |  1 +
 .../assignment_chain_tuple_contract_2.sol     |  5 ++++-
 .../assignment_chain_tuple_contract_3.sol     |  7 ++++--
 .../operators/bitwise_and_int.sol             | 11 +++++-----
 .../operators/shifts/shift_cex.sol            | 22 +++++++++++++++++++
 .../smtCheckerTests/operators/unary_add.sol   |  3 ++-
 .../smtCheckerTests/operators/unary_sub.sol   |  3 ++-
 .../out_of_bounds/fixed_bytes_2.sol           |  1 +
 .../smtCheckerTests/simple/cex_smoke_test.sol | 12 ++++++++++
 .../smtCheckerTests/try_catch/try_3.sol       |  3 ++-
 .../smtCheckerTests/types/array_literal_2.sol |  3 ++-
 .../smtCheckerTests/types/array_literal_3.sol |  1 +
 .../smtCheckerTests/types/array_literal_5.sol |  3 ++-
 .../smtCheckerTests/types/array_literal_6.sol |  5 +++--
 .../smtCheckerTests/types/bool_simple_1.sol   |  1 +
 .../smtCheckerTests/types/mapping_1_fail.sol  |  1 +
 .../struct/struct_constructor_named_args.sol  |  3 ++-
 .../smtCheckerTests/types/tuple_function.sol  |  1 +
 .../types/tuple_function_2.sol                |  3 ++-
 .../types/tuple_function_3.sol                |  5 +++--
 .../smtCheckerTests/userTypes/constant.sol    |  3 ++-
 56 files changed, 147 insertions(+), 57 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/operators/shifts/shift_cex.sol
 create mode 100644 test/libsolidity/smtCheckerTests/simple/cex_smoke_test.sol

diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol
index 270fa28fba..8339834691 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_1_unsafe.sol
@@ -6,5 +6,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 2529: (49-56): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol
index 1cb1ed0137..7e1eb8b694 100644
--- a/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/pop_constructor_unsafe.sol
@@ -6,5 +6,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 2529: (43-50): CHC: Empty array "pop" happens here.\nCounterexample:\na = []\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol b/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
index aab7b5b78c..ed846fae09 100644
--- a/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/array_members/push_zero_unsafe.sol
@@ -7,6 +7,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (61-91): CHC: Assertion violation happens here.
+// Warning 6328: (61-91): CHC: Assertion violation happens here.\nCounterexample:\na = [0]\n\nTransaction trace:\nC.constructor()\nState: a = []\nC.f()
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
index 0935d29c64..a38ffdf8a9 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_fail.sol
@@ -14,6 +14,7 @@ contract c {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (194-203): CHC: Assertion violation happens here.
+// Warning 6328: (194-203): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n = false\nb = false\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
index d21d8e0412..a5337675eb 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_and_need_both_fail.sol
@@ -14,6 +14,7 @@ contract c {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.
+// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
index 8ac219ae54..c60dcc1131 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_fail.sol
@@ -14,6 +14,7 @@ contract c {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.
+// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
index ea71f34b05..e528cf49df 100644
--- a/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
+++ b/test/libsolidity/smtCheckerTests/control_flow/short_circuit_or_need_both_fail.sol
@@ -14,6 +14,7 @@ contract c {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (192-202): CHC: Assertion violation happens here.
+// Warning 6328: (192-202): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n = false\nb = true\n\nTransaction trace:\nc.constructor()\nState: x = 0\nc.g()\n    c.f() -- internal call\n    c.f() -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol b/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
index 64494971a2..e8c17d3eb0 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/call_mutex_unsafe.sol
@@ -21,7 +21,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreCex: yes
+// SMTIgnoreCex: no
 // ----
 // Warning 9302: (212-228): Return value of low-level calls not used.
-// Warning 6328: (232-246): CHC: Assertion violation happens here.
+// Warning 6328: (232-246): CHC: Assertion violation happens here.\nCounterexample:\nx = 0, lock = false\n_a = 0x0\ny = 1\n\nTransaction trace:\nC.constructor()\nState: x = 0, lock = false\nC.set(1)\nState: x = 1, lock = false\nC.f(0x0)\n    _a.call("aaaaa") -- untrusted external call, synthesized as:\n        C.set(0) -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
index 268db82b46..1783be7814 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/external_reentrancy_2.sol
@@ -12,5 +12,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (117-131): CHC: Assertion violation happens here.
+// Warning 6328: (117-131): CHC: Assertion violation happens here.\nCounterexample:\nlocked = false\ntarget = 0x0\n\nTransaction trace:\nC.constructor()\nState: locked = true\nC.call(0x0)\n    D(target).e() -- untrusted external call, synthesized as:\n        C.call(0x0) -- reentrant call
diff --git a/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol b/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol
index a0c3a06b4d..0b5c8fa07d 100644
--- a/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol
+++ b/test/libsolidity/smtCheckerTests/external_calls/underflow_only_in_external_call.sol
@@ -18,6 +18,7 @@ contract C {
 }
 // ====
 // SMTEngine: chc
+// SMTIgnoreCex: no
 // SMTTargets: underflow
 // ----
-// Warning 3944: (109-112): CHC: Underflow (resulting value less than 0) happens here.
+// Warning 3944: (109-112): CHC: Underflow (resulting value less than 0) happens here.\nCounterexample:\nv = 0, guard = false\n = 0\n\nTransaction trace:\nC.constructor()\nState: v = 0, guard = true\nC.f()\n    C.dec() -- trusted external call
diff --git a/test/libsolidity/smtCheckerTests/file_level/easy.sol b/test/libsolidity/smtCheckerTests/file_level/easy.sol
index 07ad9f0793..2cbef3f5cc 100644
--- a/test/libsolidity/smtCheckerTests/file_level/easy.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/easy.sol
@@ -13,6 +13,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (222-239): CHC: Assertion violation happens here.
+// Warning 6328: (222-239): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f(7) -- internal call\n        add(7, 2) -- internal call\n    C.f(8) -- internal call\n        add(8, 2) -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/file_level/struct.sol b/test/libsolidity/smtCheckerTests/file_level/struct.sol
index 664e1ac5fe..f469933dba 100644
--- a/test/libsolidity/smtCheckerTests/file_level/struct.sol
+++ b/test/libsolidity/smtCheckerTests/file_level/struct.sol
@@ -22,7 +22,8 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (317-333): CHC: Assertion violation happens here.
-// Warning 6328: (352-371): CHC: Assertion violation happens here.
+// Warning 6328: (317-333): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 2, a: [1]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(2, 1) -- internal call
+// Warning 6328: (352-371): CHC: Assertion violation happens here.\nCounterexample:\n\ns = {x: 2, a: [1]}\n\nTransaction trace:\nC.constructor()\nC.f()\n    allocate(2, 1) -- internal call
 // Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
index ceb42881ff..414a8a52bc 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_1_fail.sol
@@ -11,5 +11,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 6328: (129-142): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol b/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
index 4d6ff0a647..955f6906ce 100644
--- a/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
+++ b/test/libsolidity/smtCheckerTests/functions/functions_identity_2_fail.sol
@@ -15,5 +15,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 6328: (197-210): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.h(0) -- internal call\n        C.k(0) -- internal call
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
index 3c9fc7eb80..2d92413d5e 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_2.sol
@@ -17,7 +17,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
-// SMTIgnoreCex: yes
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (242-256): CHC: Assertion violation happens here.
+// Warning 6328: (242-256): CHC: Assertion violation happens here.\nCounterexample:\na = [[], [], [0, 0, 0, 0]]\ny = 0\n\nTransaction trace:\nC.constructor()\nState: a = [[], [], [0, 0, 0, 0]]\nC.f()
 // Info 1391: CHC: 7 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
index 36ea9da2fe..b62611b519 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/array_of_structs_2.sol
@@ -18,6 +18,7 @@ contract D {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (267-281): CHC: Assertion violation happens here.
+// Warning 6328: (267-281): CHC: Assertion violation happens here.\nCounterexample:\nitems = [{x: 42, y: 43}]\na = 42\nb = 43\n\nTransaction trace:\nD.constructor()\nState: items = []\nD.test()
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
index 1077c2ee23..4dbd6a489a 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/mapping_1.sol
@@ -9,6 +9,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (142-156): CHC: Assertion violation happens here.
+// Warning 6328: (142-156): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
index c97084164f..418515a208 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/mapping_2.sol
@@ -9,6 +9,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (166-180): CHC: Assertion violation happens here.
+// Warning 6328: (166-180): CHC: Assertion violation happens here.\nCounterexample:\n\ny = 0\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
index 521f108e0c..06c021706b 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_1.sol
@@ -26,6 +26,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (338-355): CHC: Assertion violation happens here.
+// Warning 6328: (338-355): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 0, t: {t: 0}, b: false, a: []}\ny = 0\nc = false\nt = {t: 0}\n\nTransaction trace:\nC.constructor()\nState: s = {x: 0, t: {t: 0}, b: false, a: []}\nC.f()
 // Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
index eec69480a5..b43df21fcb 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_2.sol
@@ -16,6 +16,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (175-189): CHC: Assertion violation happens here.
+// Warning 6328: (175-189): CHC: Assertion violation happens here.\nCounterexample:\ns = {a: [0, 0], u: 0}\nu = 0\n\nTransaction trace:\nC.constructor()\nState: s = {a: [0, 0], u: 0}\nC.f()
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol b/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
index 4f4f8e13c0..a322f4fb41 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/struct_with_reassignment.sol
@@ -27,7 +27,8 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (255-272): CHC: Assertion violation happens here.
-// Warning 6328: (377-391): CHC: Assertion violation happens here.
+// Warning 6328: (255-272): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 1, b: false}\nx = 1\nb = false\ny = 0\nc = false\n\nTransaction trace:\nC.constructor()\nState: s = {x: 1, b: false}\nC.f()
+// Warning 6328: (377-391): CHC: Assertion violation happens here.\nCounterexample:\ns = {x: 42, b: false}\nx = 1\nb = false\ny = 42\nc = false\n\nTransaction trace:\nC.constructor()\nState: s = {x: 1, b: false}\nC.f()
 // Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/getters/uint.sol b/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
index 35a781dd76..d05753dd7c 100644
--- a/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
+++ b/test/libsolidity/smtCheckerTests/functions/getters/uint.sol
@@ -9,6 +9,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (114-128): CHC: Assertion violation happens here.
+// Warning 6328: (114-128): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\ny = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol b/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
index 3bec690e64..e0b1915733 100644
--- a/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
+++ b/test/libsolidity/smtCheckerTests/functions/super_function_assert.sol
@@ -28,7 +28,8 @@ contract D is C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (205-219): CHC: Assertion violation happens here.
-// Warning 6328: (328-342): CHC: Assertion violation happens here.
+// Warning 6328: (205-219): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.proxy()\n    C.f() -- internal call\n        A.f() -- internal call
+// Warning 6328: (328-342): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nD.constructor()\nState: x = 0\nA.proxy()\n    D.f() -- internal call\n        C.f() -- internal call\n            A.f() -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
index 587a23bb02..6ecfed7914 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_1.sol
@@ -14,6 +14,7 @@ contract C is B {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (52-66): CHC: Assertion violation happens here.
+// Warning 6328: (52-66): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, x = 0\nC.g()\n    B.f() -- internal call
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
index 97c79428b7..85e2677f78 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_2.sol
@@ -21,6 +21,7 @@ contract C is B {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (54-68): CHC: Assertion violation happens here.
+// Warning 6328: (54-68): CHC: Assertion violation happens here.\nCounterexample:\ny = 0, z = 0, w = 0, a = 0, b = 0, x = 1\n\nTransaction trace:\nC.constructor()\nState: y = 0, z = 0, w = 0, a = 0, b = 0, x = 0\nC.g()\n    A.f() -- internal call
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
index c92b0c5014..f1481197f1 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_3.sol
@@ -27,6 +27,7 @@ contract C is B {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.
+// Warning 6328: (64-78): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    B.f() -- internal call\n        A.f() -- internal call\n            C.v() -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
index 593a6ba3aa..04b7ea7480 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_4.sol
@@ -34,6 +34,7 @@ contract C is B, A1 {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (64-78): CHC: Assertion violation happens here.
+// Warning 6328: (64-78): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    C.f() -- internal call\n        A1.f() -- internal call\n            B.f() -- internal call\n                A.f() -- internal call\n                    C.v() -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
index 818906cd3a..e386c4b445 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_5.sol
@@ -28,6 +28,7 @@ contract C is B {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (97-111): CHC: Assertion violation happens here.
+// Warning 6328: (97-111): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    B.f() -- internal call\n        A.f() -- internal call\n            C.v() -- internal call\n                A.v() -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
index 04033a00f0..2bac9303b2 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_6.sol
@@ -30,6 +30,7 @@ contract C is B {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (183-197): CHC: Assertion violation happens here.
+// Warning 6328: (183-197): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.g()\n    A.v() -- internal call
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
index e33e6a3bc0..45cf7fe186 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_7.sol
@@ -21,6 +21,7 @@ contract C is A {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (56-70): CHC: Assertion violation happens here.
+// Warning 6328: (56-70): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.g()\n    A.f() -- internal call\n        C.v() -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol
index a326ccf3bc..068531b448 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_8.sol
@@ -14,5 +14,6 @@ contract C is  A {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 6328: (61-75): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nC.constructor()\nState: x = 0\nA.f()
diff --git a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
index 2ec47f7d94..9972c7e3ff 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/base_contract_assertion_fail_9.sol
@@ -27,7 +27,8 @@ contract C is B {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (62-76): CHC: Assertion violation happens here.
-// Warning 6328: (131-145): CHC: Assertion violation happens here.
+// Warning 6328: (62-76): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 0\nB.f()\n    A.f() -- internal call\n        C.v() -- internal call
+// Warning 6328: (131-145): CHC: Assertion violation happens here.\nCounterexample:\nx = 0\n\nTransaction trace:\nA.constructor()\nState: x = 0\nA.f()\n    A.v() -- internal call
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
index 7af69f2e4a..546f934b70 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_1.sol
@@ -28,6 +28,7 @@ contract D is B, C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (437-452): CHC: Assertion violation happens here.
+// Warning 6328: (437-452): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 15\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
 // Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
index c5f8383973..1825098a80 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_2.sol
@@ -29,7 +29,8 @@ contract D is B, C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (443-458): CHC: Assertion violation happens here.
-// Warning 6328: (477-492): CHC: Assertion violation happens here.
+// Warning 6328: (443-458): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 22\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
+// Warning 6328: (477-492): CHC: Assertion violation happens here.\nCounterexample:\n\nr = 22\n\nTransaction trace:\nD.constructor()\nD.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
 // Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
index af22069eb6..f6674021eb 100644
--- a/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
+++ b/test/libsolidity/smtCheckerTests/inheritance/diamond_super_3.sol
@@ -31,6 +31,7 @@ contract E is C,D {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (379-394): CHC: Assertion violation happens here.
+// Warning 6328: (379-394): CHC: Assertion violation happens here.\nCounterexample:\nx = 111\n\nTransaction trace:\nE.constructor()\nState: x = 0\nE.f()\n    C.f() -- internal call\n        B.f() -- internal call\n            A.f() -- internal call
 // Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol
index 59edfb55b6..461e4f4e68 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_loop_simple_1.sol
@@ -11,5 +11,6 @@ contract C {
 // ====
 // SMTEngine: all
 // SMTSolvers: z3
+// SMTIgnoreCex: no
 // ----
 // Warning 6328: (162-176): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f(0)
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
index 461761bafa..c89314e0fd 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_2.sol
@@ -9,6 +9,9 @@ contract C {
         assert(x != 2); // should fail
     }
 }
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (174-188): CHC: Assertion violation happens here.
+// Warning 6328: (174-188): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 2\nC.g()
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol
index 6496ec525b..e53436a0f6 100644
--- a/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/assignment_chain_tuple_contract_3.sol
@@ -17,7 +17,10 @@ contract D is C {
         assert(y == 3); // should hold
     }
 }
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (95-109): CHC: Assertion violation happens here.
-// Warning 6328: (180-194): CHC: Assertion violation happens here.
+// Warning 6328: (95-109): CHC: Assertion violation happens here.\nCounterexample:\ny = 3, x = 3\n\nTransaction trace:\nD.constructor()\nState: y = 3, x = 3\nC.f()
+// Warning 6328: (180-194): CHC: Assertion violation happens here.\nCounterexample:\nx = 2\n\nTransaction trace:\nC.constructor()\nState: x = 2\nC.g()
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol b/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
index 4bae4f67b8..b280038acc 100644
--- a/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
+++ b/test/libsolidity/smtCheckerTests/operators/bitwise_and_int.sol
@@ -2,18 +2,19 @@ contract C {
 	function f() public pure {
 		int8 x = 1;
 		int8 y = 0;
-		assert(x & y != 0);
+		assert(x & y != 0); // should fail
 		x = -1; y = 3;
-		assert(x & y == 3);
+		assert(x & y == 3); // should hold
 		y = -1;
 		int8 z = x & y;
-		assert(z == -1);
+		assert(z == -1); // should hold
 		y = 127;
-		assert(x & y == 127);
+		assert(x & y == 127); // should hold
 	}
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (71-89): CHC: Assertion violation happens here.
+// Warning 6328: (71-89): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\ny = 0\nz = 0\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/shifts/shift_cex.sol b/test/libsolidity/smtCheckerTests/operators/shifts/shift_cex.sol
new file mode 100644
index 0000000000..8670b79c06
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/operators/shifts/shift_cex.sol
@@ -0,0 +1,22 @@
+contract C {
+	function left() public pure {
+		uint x = 0x4266;
+		assert(x << 0x0 == 0x4266);
+		// Fails because the above is true.
+		assert(x << 0x0 == 0x4268);
+	}
+
+	function right() public pure {
+		uint x = 0x4266;
+		assert(x >> 0x0 == 0x4266);
+		// Fails because the above is true.
+		assert(x >> 0x0 == 0x4268);
+	}
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: no
+// ----
+// Warning 6328: (133-159): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 16998\n\nTransaction trace:\nC.constructor()\nC.left()
+// Warning 6328: (286-312): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 16998\n\nTransaction trace:\nC.constructor()\nC.right()
+// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_add.sol b/test/libsolidity/smtCheckerTests/operators/unary_add.sol
index 9716624b2a..571cd666c1 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_add.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_add.sol
@@ -13,6 +13,7 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (161-174): CHC: Assertion violation happens here.
+// Warning 6328: (161-174): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 4\na = 3\nb = 3\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/unary_sub.sol b/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
index adf70fe42c..86ec98062f 100644
--- a/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
+++ b/test/libsolidity/smtCheckerTests/operators/unary_sub.sol
@@ -13,6 +13,7 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (161-174): CHC: Assertion violation happens here.
+// Warning 6328: (161-174): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\na = 4\nb = 4\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol
index f4e90ddb78..d51685f397 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/fixed_bytes_2.sol
@@ -5,5 +5,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 6368: (83-87): CHC: Out of bounds access happens here.\nCounterexample:\n\nx = 0x0\ny = 4\n = 0x0\n\nTransaction trace:\nC.constructor()\nC.r(0x0, 4)
diff --git a/test/libsolidity/smtCheckerTests/simple/cex_smoke_test.sol b/test/libsolidity/smtCheckerTests/simple/cex_smoke_test.sol
new file mode 100644
index 0000000000..a592331035
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/simple/cex_smoke_test.sol
@@ -0,0 +1,12 @@
+contract C {
+
+    function f() public pure {
+        uint x = 1;
+        assert(x == 2);
+    }
+}
+// ====
+// SMTEngine: all
+// SMTIgnoreCex: yes
+// ----
+// Warning 6328: (73-87): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 1\n\nTransaction trace:\nC.constructor()\nC.f()
diff --git a/test/libsolidity/smtCheckerTests/try_catch/try_3.sol b/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
index 77e53f8608..7698eed0f0 100644
--- a/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
+++ b/test/libsolidity/smtCheckerTests/try_catch/try_3.sol
@@ -21,7 +21,8 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 5667: (259-273): Unused try/catch parameter. Remove or comment out the variable name to silence this warning.
-// Warning 6328: (280-294): CHC: Assertion violation happens here.
+// Warning 6328: (280-294): CHC: Assertion violation happens here.\nCounterexample:\nx = 1\ns = []\n\nTransaction trace:\nC.constructor()\nState: x = 0\nC.f()\n    C.postinc() -- internal call
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_2.sol b/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
index 1136a9d1f3..d48644c2fd 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_2.sol
@@ -10,6 +10,7 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (167-187): CHC: Assertion violation happens here.
+// Warning 6328: (167-187): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4]\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_3.sol b/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
index 52baec977d..cdaff2bf44 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_3.sol
@@ -9,6 +9,7 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 6328: (168-188): CHC: Assertion violation happens here.
 // Info 1391: CHC: 8 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_5.sol b/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
index 7c4c9d3d9a..0a6fe02bc5 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_5.sol
@@ -12,6 +12,7 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (176-196): CHC: Assertion violation happens here.
+// Warning 6328: (176-196): CHC: Assertion violation happens here.\nCounterexample:\ns = [1, 2, 3]\na = [1, 2, 3]\n\nTransaction trace:\nC.constructor()\nState: s = []\nC.f()
 // Info 1391: CHC: 9 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/array_literal_6.sol b/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
index e612b08a28..b017aa93e5 100644
--- a/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_literal_6.sol
@@ -13,7 +13,8 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (146-174): CHC: Assertion violation happens here.
-// Warning 6328: (235-255): CHC: Assertion violation happens here.
+// Warning 6328: (146-174): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4, 3]\nc = [1, 2, 4, 3]\n\nTransaction trace:\nC.constructor()\nC.f()
+// Warning 6328: (235-255): CHC: Assertion violation happens here.\nCounterexample:\n\na = [1, 2, 3]\nb = [1, 2, 4, 3]\nc = [1, 2, 4, 3]\n\nTransaction trace:\nC.constructor()\nC.f()
 // Info 1391: CHC: 11 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol b/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol
index 52b05f3bd2..a9ea6c7f96 100644
--- a/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/bool_simple_1.sol
@@ -5,5 +5,6 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 6328: (58-67): CHC: Assertion violation happens here.\nCounterexample:\n\nx = false\n\nTransaction trace:\nC.constructor()\nC.f(false)
diff --git a/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol b/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol
index d72f62be9e..7e9669eaf2 100644
--- a/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol
+++ b/test/libsolidity/smtCheckerTests/types/mapping_1_fail.sol
@@ -9,5 +9,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 6328: (101-120): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 3\n\nTransaction trace:\nC.constructor()\nC.f(3)
diff --git a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
index b12882ef7c..d52a716977 100644
--- a/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
+++ b/test/libsolidity/smtCheckerTests/types/struct/struct_constructor_named_args.sol
@@ -19,6 +19,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (232-255): CHC: Assertion violation happens here.
+// Warning 6328: (232-255): CHC: Assertion violation happens here.\nCounterexample:\n\ninner = {x: 43}\nouter = {s: {x: 43}, y: 512}\n\nTransaction trace:\nC.constructor()\nC.test()
 // Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function.sol b/test/libsolidity/smtCheckerTests/types/tuple_function.sol
index ef3ad0102a..97156f5cfb 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_function.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_function.sol
@@ -13,6 +13,7 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
 // Warning 6328: (149-163): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
 // Warning 6328: (167-181): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 3\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol b/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
index 362755ac96..62b73e904a 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_function_2.sol
@@ -13,6 +13,7 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (166-180): CHC: Assertion violation happens here.
+// Warning 6328: (166-180): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 2\ny = 0\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol b/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
index f33f9bfc84..0e0c7bded9 100644
--- a/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
+++ b/test/libsolidity/smtCheckerTests/types/tuple_function_3.sol
@@ -15,7 +15,8 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (172-186): CHC: Assertion violation happens here.
-// Warning 6328: (190-204): CHC: Assertion violation happens here.
+// Warning 6328: (172-186): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
+// Warning 6328: (190-204): CHC: Assertion violation happens here.\nCounterexample:\n\nx = 0\ny = 0\nb = false\n\nTransaction trace:\nC.constructor()\nC.g()\n    C.f() -- internal call
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/userTypes/constant.sol b/test/libsolidity/smtCheckerTests/userTypes/constant.sol
index 0d49dec4bc..baba50d07d 100644
--- a/test/libsolidity/smtCheckerTests/userTypes/constant.sol
+++ b/test/libsolidity/smtCheckerTests/userTypes/constant.sol
@@ -14,6 +14,7 @@ contract C {
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (531-555): CHC: Assertion violation happens here.
+// Warning 6328: (531-555): CHC: Assertion violation happens here.\nCounterexample:\nu = 165521356710917456517261742455526507355687727119203895813322792776\n\nTransaction trace:\nC.constructor()\nState: u = 165521356710917456517261742455526507355687727119203895813322792776\nC.f()
 // Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 0fa594e50114911cab9a1d97908ab06882b17189 Mon Sep 17 00:00:00 2001
From: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date: Wed, 26 Jul 2023 06:17:38 -0700
Subject: [PATCH 1518/1748] fix docs layout and link bugs [Fixes #14436]
 (#14439)

using cdnfonts import instead

fix mobile menu layout

fix mobile content positioning/sizing

fix desktop content widths

prevent header links from wrapping

update desktop positioning

fix backdrop-filter

move to .unified-header::before

feat: independent scrolling for content and menu
---
 docs/_static/css/custom.css                   |  95 ++++++++++--------
 docs/_static/fonts/overpass-bold.otf          | Bin 68828 -> 0 bytes
 docs/_static/fonts/overpass-bold.woff2        | Bin 38728 -> 0 bytes
 docs/_static/fonts/overpass-italic.otf        | Bin 72500 -> 0 bytes
 docs/_static/fonts/overpass-light.otf         | Bin 69324 -> 0 bytes
 docs/_static/fonts/overpass-mono-bold.otf     | Bin 95240 -> 0 bytes
 docs/_static/fonts/overpass-mono-bold.woff2   | Bin 20532 -> 0 bytes
 docs/_static/fonts/overpass-mono-regular.otf  | Bin 94520 -> 0 bytes
 .../_static/fonts/overpass-mono-regular.woff2 | Bin 20532 -> 0 bytes
 .../overpass-mono/overpass-mono-bold.otf      | Bin 95240 -> 0 bytes
 .../overpass-mono/overpass-mono-regular.otf   | Bin 94520 -> 0 bytes
 docs/_static/fonts/overpass-regular.otf       | Bin 69808 -> 0 bytes
 docs/_static/fonts/overpass-regular.woff2     | Bin 38728 -> 0 bytes
 docs/_static/fonts/overpass-semibold.otf      | Bin 65704 -> 0 bytes
 docs/_static/fonts/overpass/overpass-bold.otf | Bin 68828 -> 0 bytes
 .../fonts/overpass/overpass-italic.otf        | Bin 72500 -> 0 bytes
 .../_static/fonts/overpass/overpass-light.otf | Bin 69324 -> 0 bytes
 .../fonts/overpass/overpass-regular.otf       | Bin 69808 -> 0 bytes
 .../fonts/overpass/overpass-semibold.otf      | Bin 65704 -> 0 bytes
 docs/_static/js/initialize.js                 |  18 +---
 docs/conf.py                                  |   2 +-
 21 files changed, 53 insertions(+), 62 deletions(-)
 delete mode 100644 docs/_static/fonts/overpass-bold.otf
 delete mode 100644 docs/_static/fonts/overpass-bold.woff2
 delete mode 100644 docs/_static/fonts/overpass-italic.otf
 delete mode 100644 docs/_static/fonts/overpass-light.otf
 delete mode 100644 docs/_static/fonts/overpass-mono-bold.otf
 delete mode 100644 docs/_static/fonts/overpass-mono-bold.woff2
 delete mode 100644 docs/_static/fonts/overpass-mono-regular.otf
 delete mode 100644 docs/_static/fonts/overpass-mono-regular.woff2
 delete mode 100644 docs/_static/fonts/overpass-mono/overpass-mono-bold.otf
 delete mode 100644 docs/_static/fonts/overpass-mono/overpass-mono-regular.otf
 delete mode 100644 docs/_static/fonts/overpass-regular.otf
 delete mode 100644 docs/_static/fonts/overpass-regular.woff2
 delete mode 100644 docs/_static/fonts/overpass-semibold.otf
 delete mode 100644 docs/_static/fonts/overpass/overpass-bold.otf
 delete mode 100644 docs/_static/fonts/overpass/overpass-italic.otf
 delete mode 100644 docs/_static/fonts/overpass/overpass-light.otf
 delete mode 100644 docs/_static/fonts/overpass/overpass-regular.otf
 delete mode 100644 docs/_static/fonts/overpass/overpass-semibold.otf

diff --git a/docs/_static/css/custom.css b/docs/_static/css/custom.css
index 7519db8e1c..25ab265443 100644
--- a/docs/_static/css/custom.css
+++ b/docs/_static/css/custom.css
@@ -16,6 +16,9 @@
 
     --navHeight: 4.5rem;
     --sideWidth: 300px;
+    --maxWidth: 80rem;
+    --desktopInlinePadding: 2rem;
+    --mobileInlinePadding: 1rem;
     --currentVersionHeight: 45px;
 
     text-rendering: geometricPrecision;
@@ -57,7 +60,6 @@ html,
 body,
 .wy-grid-for-nav {
     background-color: var(--color-f) !important;
-    position: relative;
 }
 
 body {
@@ -68,6 +70,10 @@ a {
     color: var(--color-c);
 }
 
+a, section {
+    scroll-margin-top: calc(var(--navHeight) + 2rem);
+}
+
 hr {
     margin-block: 2rem;
     border-color: var(--color-d) !important;
@@ -328,7 +334,6 @@ ul.current ul,
 
 .wy-breadcrumbs-aside a,
 .wy-breadcrumbs-aside a:visited,
-/* .wy-breadcrumbs-aside a:not(:visited), */
 a.fa.fa-github,
 a.fa.fa-github:visited,
 a.fa.fa-github:not(:visited),
@@ -362,10 +367,11 @@ footer .rst-footer-buttons {
 
 /* Site wrapper, and two children: header and rest */
 .unified-wrapper {
-    position: fixed;
+    position: relative;
+    display: flex;
+    flex-direction: column;
     inset: 0;
-    top: var(--navHeight);
-    max-width: 80rem;
+    max-width: var(--maxWidth);
     margin-inline: auto;
 }
 
@@ -378,17 +384,16 @@ footer .rst-footer-buttons {
     display: flex;
     align-items: center;
     box-shadow: var(--shadow);
-    backdrop-filter: blur(3px);
 }
 
 .unified-header .inner-header {
     display: flex;
     margin-inline: auto;
     width: 100%;
-    max-width: 80rem;
+    max-width: var(--maxWidth);
     align-items: center;
     justify-content: space-between;
-    padding-inline: 2rem;
+    padding-inline: var(--desktopInlinePadding);
     padding-block: 1rem;
 }
 
@@ -399,6 +404,7 @@ footer .rst-footer-buttons {
     opacity: 95%;
     background: var(--color-f);
     z-index: -1;
+    backdrop-filter: blur(3px);
 }
 
 .unified-header .home-link {
@@ -445,6 +451,7 @@ footer .rst-footer-buttons {
     font-weight: 400;
     box-sizing: content-box;
     border-bottom: 1px solid transparent;
+    white-space: nowrap;
 }
 
 .unified-header .nav-link.active {
@@ -456,34 +463,36 @@ footer .rst-footer-buttons {
     border-bottom: 1px solid var(--color-c);
 }
 
-/* Rest: Grid, with two children: side bar, and content */
+/* Rest: Flex-row, with two children: side bar, and content */
 .unified-wrapper .wy-grid-for-nav {
     position: relative !important;
-    display: grid !important;
-    grid-template-columns: var(--sideWidth) 1fr;
-    gap: 1rem;
+    display: flex;
+    margin-inline: auto;
 }
 
 /* First child: Side bar */
 .unified-wrapper .wy-grid-for-nav nav.wy-nav-side {
-    position: relative;
+    position: fixed;
     display: flex;
     flex-direction: column;
     background: var(--color-f);
     color: var(--color-a);
-    top: 0;
-    bottom: 0;
-    left: 0;
     padding-bottom: unset !important;
-    min-height: unset !important;
     z-index: 10 !important;
-    max-width: var(--sideWidth) !important;
+    min-height: unset !important;
+    width: var(--sideWidth) !important;
+    top: var(--navHeight);
+    bottom: 0;
+    left: auto;
+    overflow: auto;
 }
 
 .unified-wrapper .wy-grid-for-nav nav.wy-nav-side .wy-side-scroll {
-    position: relative !important;
-    width: fit-content !important;
+    position: static !important;
+    width: unset !important;
+    overflow: unset !important;
     height: unset !important;
+    padding-bottom: 2rem;
 }
 
 .unified-wrapper .wy-grid-for-nav nav.wy-nav-side .wy-side-scroll .wy-side-nav-search {
@@ -517,15 +526,15 @@ footer .rst-footer-buttons {
 
 /* Second child: Content */
 .unified-wrapper .wy-grid-for-nav .wy-nav-content {
-    position: relative !important;
-    overflow-y: scroll !important;
     width: 100%;
-    max-width: 100vw !important;
-    padding-inline: 2rem;
+    max-width: unset !important; /* override */
+    padding-inline: var(--desktopInlinePadding);
+    margin-inline-start: var(--sideWidth);
+    margin-top: var(--navHeight);
 }
 
 .unified-wrapper .wy-grid-for-nav .wy-nav-content .rst-content {
-    max-width: 70ch;
+    max-width: min(70ch, calc(100vw -  2 * var(--desktopInlinePadding) - var(--sideWidth)));
     margin-inline: auto;
 }
 
@@ -566,29 +575,15 @@ footer .rst-footer-buttons {
     }
 
     .unified-header .inner-header {
-        padding-inline: 1rem;
-    }
-
-    .unified-wrapper .wy-grid-for-nav {
-        grid-template-columns: 1fr;
+        padding-inline: var(--mobileInlinePadding);
     }
 
     .unified-wrapper .wy-grid-for-nav nav.wy-nav-side {
-        position: absolute;
-        inset-block: 0;
-        inset-inline-start: 0;
-        width: var(--sideWidth);
-        overflow-y: scroll;
         transform: translateX(-100%);
         transition: transform 200ms ease-in-out;
     }
 
     /* Menu open styles */
-    .unified-wrapper .wy-grid-for-nav nav.wy-nav-side {
-        position: absolute;
-
-    }
-
     .unified-wrapper.menu-open nav.wy-nav-side {
         transform: translateX(0);
         transition: transform 200ms ease-in-out;
@@ -613,6 +608,18 @@ footer .rst-footer-buttons {
     a.skip-to-content {
         display: none;
     }
+
+    .wy-nav-content {
+        margin-inline-start: 0 !important;
+    }
+
+    .rst-content {
+        max-width: 100% !important;
+    }
+
+    .wy-side-scroll {
+        padding-bottom: 0 !important;
+    }
 }
 
 ul.search .context {
@@ -781,9 +788,8 @@ button.mobile-menu-button {
     font-family: 'Overpass Mono', monospace;
 }
 
-.wy-breadcrumbs-aside {
-    display: block;
-    padding-top: 0;
+.wy-breadcrumbs>li {
+    padding-top: 8px;
 }
 
 .wy-breadcrumbs-aside a {
@@ -804,8 +810,9 @@ a.skip-to-content {
     padding: 2px 4px;
     font-size: 14px;
     margin-inline-end: auto;
-    margin-inline-start: 2rem;
+    margin-inline-start: 1.5rem;
     color: var(--color-a);
+    white-space: nowrap;
 }
 
 a.skip-to-content:focus {
diff --git a/docs/_static/fonts/overpass-bold.otf b/docs/_static/fonts/overpass-bold.otf
deleted file mode 100644
index 962a5d7628df54752943bc65a97c9aa656b7f6de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 68828
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

diff --git a/docs/_static/fonts/overpass-bold.woff2 b/docs/_static/fonts/overpass-bold.woff2
deleted file mode 100644
index f8133b0e93b133773ebac59b65d51e03dd620082..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38728
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
IKGdgV1zXGahX4Qo

diff --git a/docs/_static/fonts/overpass-italic.otf b/docs/_static/fonts/overpass-italic.otf
deleted file mode 100644
index 19224a86dc1d636bfd9aa978d4c776a2718590cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72500
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%0D1QGP88
z%`3?SjxNst=^ofcx3Fo7rI9UO@($o)%DwB|mMjDJdeOaSZY#W`77g3b__qZY;{ro8
zQ_9@F)&n|xjgC0QvR83d81HAa(#;Vt;(T^j<t>h51I}fT33<=cjW$1?E~s|40m`Zd
zL(apsNxg*fy6>oe3^;*8^dk$Hw4+;HPk7u*J)XeK&jnqDAlcT1QJ-|w39msSM?3mF
z^Hul+9>!fbXb~m-!BB3~YTZ8;B!{}aG{{Z*rc`$mZ&XH6Mxj$FbxjfOFb&6HFzAJ@
z{3exdS-_BF1?$|WGxQBGkylJNu{#Dw&O&ywS|~rhf6tT6hMzW`zPg@t!M<B9{>y#0
znq3_Ek05<)W>#F5cH|P*>0>cSohya<ULy&^Njt}D#IYM`0ieml={ggWn;2AE5A8bs
zyh1-z*8{cq8#JPJ{^OU9*19ZMUzMGZmt2VTFvr6L)v2k{A%Mf9J!5=)G_6led3bzZ
z(auf!Fc-ehvWYHigndNs0I6Oit((KCh!3En_i3knvH^6oQmD13eX>~&0b@tOM-cb1
zf$2d2tJ(`I1u>jSCx<{f$=-IS2&Gm)VzHO|*;w%ahH~uXQuaAoh3`Ro!3r3M*i-BX
zVBKUU_8bdwWk<n+A$^Qd-A%kvP!Yb_9%!xh4J&}#Qn_RDi#OQ<U~-v8Ip9S%CgP`4
zx(X(w9E&L(TOj-eOK?HmuU!Po!do|%sw+rU!@^s>F=4%cM5n@nHkgi%qvJ`lBgT`|
z-*-sQ35+tIvZ?5H^G{f$OVQM|Zvsj^=eGQ3tTp~syunwb<gTsIu3HyjEM}WG`M75<
z)Q+C!4n^Us;?K`?(9)Pi$>$WR(4zHnvQV6&-jo-SZ7hwbXc?0en;VyBzb9!+`995;
z-fNe;PG8(}QrWmK-SrM;xj4#)oJFvyweD(X=`6n*(#=6gi96hyiape;b?+)j6X`6o
zIGAgkb&k)_J-JE|tmi83B$#W&ABnwVUwpM>sw1A_kMl5M){^5sq_#Sg&KGWwx36Is
zR0l=&4aH6p$fs;bSW}=;U4Jlb_ZXL@UW+{Rs=euzP{a%{_u_A0%9?;qqB>{ymP+mB
zQr~IDSihJc14CxDKY#8#naQwOqrOv#jo2((#gW}R4i<i8PdX^F&hx5gnAj#ji=U~<
ziA7`3L&cH}mC9I!N{lLuU6-Y~cJR{kySuT5m*TZ{%$m3!s<gqqu;9iaBEd5$$S_M`
z8pdB%sGcQ-B>Dtv!s8?3qV*puFj2m*@SnVJ>=bW%2eGS>Y`s$BNZe}^&5wx(CdU=f
zo!|QU!08PJ)rHX|`~ts~Uekckn(4Le^zS?F-8xXP+%ws5a|8cnluuO~Ep!BsxqQ}f
z|L})~VbWI1u0gZv7D1En_&4&|uanNb4?5D@o!^yuw>dWQ2Sd&k_2gx{&JzCE<!_Id
z%^fA#%;*OVy!4Lox_IF#2L+_|239tu8P)sttlLy!2tLL8c)R<$YyE;U%Ciy+lkyE~
zNlX6LSLEFvNLS4r*PRob$Ig)2uhcJ+T)cwZe0?KY<_yhBF3wz=+cK~-AMF*3%#Yr=
z?696V*6P%2GCUU#UpeIcp@tHo<9}OSxNd{iLA;0$OtY$6S4neUG730?!bEHgV?(-M
zCtla&fAptt0?ngmr1x)=&jL>H{=3qr?;RcaqoJ-wD#31Sm=*AeIT?qNH3`vcrY4)n
z9P^46HI_Azm{0I=;Ze(@G;t}x8)MSge4>w{)&q;%CNJH2j@SZ<aJ+2ZNXgb^z{dvc
zY3HRT|4?LC@zN6ofC*%R@gzBVg2bN$Af&brFzc<MMV<*D%X>BFemQUWqJr-@s@L52
zwcUqq-M7?0Jj5b95)}%6Z%X~NSYFasYAVG_D*+38myD+f|54&SwbaMXY=_lOL+$qL
zKT~o;d+p-l*;|3^YHK<@$A@5or1ZISnl7{_e_WY#MHT3bW%0qz<8@@e*;l;)b`xFB
zZh#wG(ykw<dwtI|pZPA>GcA<vnFha`v2B_GYwH`gP6JTum^G$<oGm;}RshWQQ#F>K
zBd!n=aJj#Jsyn=Ii>q#<`GvbqYHt2cZC&+#MGKtpk8~-$FI`Fx-_~{S*amGhwn4M5
zdoNq}rFIit_wI{?cv=%;lx;4c2{|l7LZ-1j+>nq~(YpOU-<@EY)fMZ`xtznU0yMkh
zk=-B7l3Eq)`s0OfAZrXBKL*Yziv`$b3919*7t-CT4x}vbiq-8${#=7~q#_#Qm=i9y
z&*cduwpa%(h{~e_+XCRV_5bc=eRS5v|9$Hgs#P9cf4E4a@aTZO%-r+zoANecFEf>I
zhp*grjP6ahGt2iV0<PG1xQox+*+VpA_RhSb-%pCw@Z#>5A(R*Rdbq7vG0&jd(t+)v
zwPm<<6Rj;>U+$tsR!8gdPH#PN{`AeWP=1mNmq;5+j)TicYwXQdU>=<SeM;Floj6+B
zqE>}$wd6dc3^@-ug`9_!A?F9nSk4cgvgZ8YR^)u3m5=kPKw2DQp&L+q(CDr+hnWZD
z>FiZO#dK%CLWOC$Aa<Abt5rcqEcAnlDQ8=Oeo!&!?=QA+ww0Cs{v*LJ71Nv%3%13(
zxl}vtqC4^U^z752r}9pfo!W4E?CIQ7p{HE2T|$%7uCV2uDnD5c({$SPv`Qw!(NY6t
z5V?M@_RlU6Ru>v`{QZp~etH#7IO*!I4#){vU67MgP#BUE;2#2aGTbR3J7jes+*XI=
z_yq=sK%mUoo1~0sYQLNkp>VY^+uuLL=&vXDocywlt5@e_7p@M0n-Oj*8=3Q=ew1p#
zYEUQ$$@32g2@24wY@5l<!<+(gf>-C~<x<L^K`Gm}YUS5W?Vrn%1|q>mKfSoj$sdFZ
z^0HSK24x3;Fp}G>nX`FXH&70y>0J#9G`;?MacF|tADKXOs|!FjAUFikwX!#vRsHY+
zbXU_XQ?E!crHcg9;FJwWfHN<XGN-|3aA96vE+rA*7XlJwL>#3{v%!1^u;iL-WZnG1
zNyL{8cMCK9@jb2)vn>PpEjQ&!weFBh(G45sL{yQZRowMU<Rd68Cqzuq1xg>I<2S1z
z(V}~5ymeoG!Rdm6?z4vtHG;6AhU6E|wxuBZs^veBYoF@az8#X6=`{J!hm1rq7t+q@
zG4>#NgLX<!Eq&7C|J)@#r9Dz(Z-lSU!eY7=NEVV|Ixi>gPOonJAq619o@g>0DMiwI
zo7DfjdF3DH+$x8<uM7`fWw7idNNe^|>;dtoodoC49`mQ21RW$l(@E0#Bx&u-T{uVH
zy(lLmOrPt#*KR$sHCrcb!k6gxD(-Q${IOHDqVQ=YUEfW(?6WPT)e7Tsj7yf9PLL0d
zqnB~~#?rz3NJg2Qg^IGR4ZXl3o#emChqOOQI-TV1TqLc}${&WRNtZP%bc+X!UQ9v4
zWvn!a%2FKRq-=^VK>GM2S{@koumTx`nU)d*p2ji>^rdA&wpa?~r)qg)N1ZB2UShM`
z=g1q5_<#?W2L6PB#43C>U+eTP&^`~mMg&%7ZwIrB5ru`_6BJU;U}zpmNdv#Hf#1tW
zNrEsA;rvKR1K)`9ENKnK1(K4_bzb1yHp)3VUIXi})!&vp9c38nX}~a2(!epIXkb||
zDRCCc%eFC|d8}}wJi~qsR;CdR;~I9aTMxb!uh1<TFa~^U6JI-?BO|b#!ypKXjp9lo
z%;V<^eFP%x;2lbI8^m(?ql;>Chx~jPnm<!YvME!Wk(`;EXsE;%e+lV{X~~+*h;&nQ
zL~LB7UdnOdLt~Axp_;JF=<G;6;igDG(`BG!PK<D{cD!7SAR`*K4*b*BtCCNEPU6j8
zSwPf^ULiV5<l>Ht>a4W%%;ea#xO9UH;>?YW&J5FrMw?7ghN&2;A!(yV62u~LQ+Q)!
zXmpq+G&?pk7N{#1J}xyaHW|PhbvPEkjYl^9oUr9)S~6YnZF*(P&6udT*eJc^Feh7F
zhBa&1=4Fz@u7BOP^ApL$N2FliPAzzI6uhavs7_8xOh`45oJu|uE5b508KKF>RK3I<
zAwQGbqs~fqq@Sk}8J`suofWDLiw+HrHMjtx7Z)BI5v>VL3(vwQ8{F9e?vVZ9&OpJ9
z@S>NA!jHX7+X>%QXN^oOzBp4bMYst-Szo)#?WnyeueJR*{QOARCfV?2J(QL<{0D-l
zSIo!r%PnxBeF1v@k3LX<UX>GHsh=9WNl!6g3A4{4Au2p3CR{Js%;!au9l<RoJv}Bx
zo0^i6mJ*X3m2QyWjgLx?Op1tzjEQR620IhrIXoshN)wS1m70>Cl!Og-ZMN}dlbvL<
zZJYqPx(^=?_N4*25ga1`n0@Cr?5306T_LtL54Gf+T%b9ZE?9F;{ncvk%WJh(pHh{1
zsJ|{XWhE+$bb(eDav?-VcJ#ke&;4SOeOoUJHOYLrJNL!)0Ezk&(Mt9KBm2NY*4#D|
z*wIJb73A29_x*J#si3Bi9%S<$+K~s@Y?I2cm<Y>8!Fp0fJwL(XKx}0*<f=Fc)UV5H
zJCY!^<YVEnv`d`S&s-$hP!4~B<*}+-`^%i@a)Wxiu8xX`i3tP5cmXf=G*22NDx{xB
z3Mlpla$@CmxmXGGs(F&M+s;~Aa<K?8y49*6G#PP&)I)+argnx}dS8;gEA=zDjT9JJ
zJte!{4%4~IzdyT%-Cy+P;Wx$McBG%g{VsJzER4isMxi!99Ia*r%Tj}27GGAP2zrAC
zb-Gsl`|no=NpI`j>?GM%R&uNOl<?H(w6xUZ6l_@Ag{)eH98}P3(sppP)?O`^UpAL3
z#Km=!X9}U=sHM5<uZul>$t+*)=NqCCEK93>S1sjM@(EE9iP2h9M0jX)LPTP?;Q-o0
za8gnz?OL+3QVo^AV7bn^31c)8HqEBHY(OT9tzU@t%(_ztD)p0&@?*v<>D@yk4aMe1
zZK2x29si-Xm)@9iLjT(#J|{IJIYX0aObkoZJCw1uRqH4AQ|~oTv&-4qRX0!w*~W|0
z_L{Mg_%2@b-D~z$<n89+m3C6KzM=yw+METvdD<)y`yRORX5U$&uOfI3Z(cl0oTdnw
zk78c0L#tJ})^-qEtG%lE35q$=+sT6e30_iI+uXN`wS)K*fDkzGs^VRe6YMHiJQYsh
ziQ=jP6c8aOG{i_7EH*gyn~*HbA#a1C_dve4GjPhQk23=51_BmZ>n`&*8>-wK+9!y^
zi2OE@V=1keqW(a5c(t2?3~<K6i>uhXiA-^FhRx1FY8OxV>xAdXNK`z%=&DAC&u`~D
zU&o&I3O9TJFl$?@hL3&<>6k6Mqm!Z$>?O7}#8zJGX=M>ja5v|NmPFJInS_03uVT|#
zG6j(`n}gH_OF`_e6FU|g$woErC)r(B^s}Y6H9E<0t?;N{SL{l+eKbBu<mb!xE)OD8
z9m%L`05dv~qP0SnU<Wz#oBi!n7ZL?KNwI@@d=nnA<<vE~*hCzmW*;rZc0N(KmL-rk
z?HtG(QL76wNY71Va%n-viM*Kd@QlJ|?VdUw%!$iBu{XACcR^}?NMTZXbVf>fR9bd<
za$5eOu*`xTY3B~7)4{b&Ws=#*NKh0O!)`u^g}5@Asc3cL>iqn?rma=Q*g<q%_@aZ_
zf~<t}bVEhy>g>YI)fp{UXROW6*Q{}kHSW~MrpE!RVILI{9~SY&u~Z*T(6WfoX#I+?
z6@jb#?Zd-Okw&eLe?g&PP0H$`l8Dtsnw*q^%<SYPk%ju0)YP~X?V7xzoD4&8Zc;&}
zCM6DkeOz%=QADx5N;Z;f6}%&0vqzcz{GEPBk7)AkcKO|DJ<Daq$OQ@0lIH7U5@KRB
z;W1&Me)^EW5Wism=&0zZn26AzNWUomP~Rxu5MTSK&{$KLCMYpFQIC&U7S<GZ#D1%l
z{oG0n*}mz%0UA&5aG!|Cgv3bw<bvVZfhqP;iLps38da-iGFfg`R&IeYHxEy(u<>d#
zwo_L*!@W>Zn4epa9G4uIYVbE1{iF3^apCcyG4@yv5ot1I82vRW6GHeK!-6!Xl*p_Y
zJv_&zB4@=h#gX<Z48&#OoA&u<YE`Y8U~AQF>bRnqobVj`=(NzxL`_msd`e1IW_Ef^
zYGjIj%C4|Xzk;abmQl%(sg&87F<J51@hOP~Nln{E+o_t_I?LiB;vyq8VF}^MVfy5#
zq=@7w``E;U_(W||VnT9)Aw4NISreBEs+x_t75N+VNoh%GY037<(W&X0teo{}xqA3W
zNllDPOw=SKCMG24i{1H%<kYBaZDvMVTACp@GdD9o%|0zTIU!Y(5EqvitBs6_j*p46
z5ApRi`e;>6WX`hS@brubLxv(bDK<%)mzR>7Ysg8>OUX^KPfAQmNYNz4CB*9E;u7Mt
zu@ONLOAIl_kmz7-gd!p;J~`SDog9@Anrn|zO+q3P5)u=z7(OvMIVmeWIWaxUJ|!tW
zDM^zRosUU1hcn2GF{Uts$`-cpq~HvFd~{?CW@=&0WTDX|sRda@Ict)Z1xF>srx?-|
znAtUxrKZJ4rx;W+=eK0B>G2uqnxf*Ig3QeDuvAKrlckyxLcBF`F)^{o7F=v(5s~r9
zhUDbL98FGmmXZ3hbq<UQF!^PrWrP`WBG<+TYNDe<FtCcW3r`G9jnwCRXL_Zqv@i9@
znmkJrmKc(ela-o-RsE?6>8Y9>KKs2Y^eR_uGrT1rf0(<*7!wo|rcaB^j7<r%PYQ`j
zHEIL>!-8TBv2k&+o-r%^^|5Ko12z89(GipM5iyAvi6tkb7*g{Rb8|Imv1zdwVIkKm
zLR?MmGh*_?wJ}jKv4*((pg@hv78NTZCXzCRZjbv^ELNw)rA8#{!B}i}kIK=sO-fWk
zY^)|0#TW<Hp#(cet7GC5l2YQ5V+_eC0vgs?mY5tCMLF#(i;0W3cx@$1^HV3GcEzKD
zwTz36#ver&AD5_wM|;_hL^XY9NVbcMj!%p=Bw%0oggAQ#@@och;dTI(wvl`y7iVXv
zNdg&<Pg|>p?e_IvYw)?SqRQ)>eOah)uJ<IbCG%zmZ5pp#61c*{XbAOkm284Ox9_<4
z)A_wLQb+Q+)Qb4&Gl`2@av4P0ZAwB_Pc{@D<=;O_9I)}lV`5u*eU~A30iSG23O8w7
zKEh~lFvf(7Gs)-KVtO_ilC3aWE!*<#rNaEJnN9S?J?on`iEpaBCEQouN^IKnesa?{
zh}2xHQGcznoY&%vt(&)Ce`gNo+Reu4b&qjAT|b;gx87!p%@z4O^4ao*@<91o`6l^!
z+YfEW+J0d>$9B1Gm~ENu4%=$myS$G7fbYc*<o$Ugzk}b;e~ZP2oZ=Il?KWI7MloBF
zg!9~T6>Ah{6jh4faZ*bcyN~P!*$uNBWw+ce&@R+2!7kM<%Wk*bWxEGBqvdBi$zEx%
zw%6EyY(LO`sQpNLH+v6zFZ)>gMEiC2U)pcC-(&xc{cW7j^4R`~{crYv*uQ8Z$4M<t
zP2O$N8RxWo)?`qVVNE79ncie+lfWj%CP_{5nykh-EgPF`$2l!uH#yzpT$77UZa4X{
z$y02FEE9M^z)3Bwg)TyOp%)gtj}@i~bAj(`SUK_<y04Yg#RBeo>ryw;ME_CaGLgzk
zisZvGkzgznaY!mmT%C*aPr6r(7(CM5W2PQQEv(=5&H7{7ojd%;o8T$P5aGrbc+M@H
zpq04R<0Xx<0qpSCNC&z?=5LV>YNGt+%7c8YkDe6z#rz4{iOWk5q$Z?cmNQ5ZYm74*
zHN*Fh`(3a6ORW^uN&Q(P<?!bnCM@XVHs+~+12RrZ$2>%n8kG_e6&(|WS;#7>3m+a8
z9T^`HACVjx)wC_N^B-XHk&GFM66;3Vl1r&MxtkJGT1F*#BnIlYOVwEZOBQ75u$1&!
zgnzhqY*fqWeT&F5ez-#FB0ck+$*07xi!0Fkk!RV0`p+-|X(rkAC3d2G6-2;yUw4JA
zTW$U926@-;uUG`-bp`Pf{nPT(ixQGrCe1rw_Jihx<X|D!hYIX-;1eAZx-u@hWz1ez
z(Hr|~O7qPg5&p&%aWO3`?L_w;b`Dlp(d(EZ^~3X(H@6tDal@3AbD_Ezz3j+s((Eu1
zemlHjxm$+e7Itm$8@s2sR_fedYJv4%&CmDz-QaLfapx5&e(}^4ixmI1MT-APu@K=J
zml6U2eoHFB&(SH{2?K@sm?<jN4-{h4+R0d{Dvgz%@!`QnpJ+{7QcPh?!36RQde6t^
z2poB`wG68?nXZ}X=9h&rUGrb)<{K3Aud3xO3gweH&*DGsZBzLlFbodrTRrG$ElSb_
zbCl?$C~ZVkRAf|Acv84QsXl-HbT#%onLGr0o=n~`^Qa-~wA#zEsYyjiJ~lb=@K|C{
z-kogKwc@~?Lj(YiCdF62+^yYMWDLzUl-}a=f;=-<XlH%lIb|M>5KzW{D^@~v|L#4p
zIVPDOIuUoa^I=B?Y5pw~y2M#SntV=llC$LBUcvzeZMJs%dYT?fezC+8e)GQNzqqvg
z+5-*ga0#2n^&;|ZA9R*lFYGOKlni<YF^DdHGb<J1a`CIIZ+P=UMF=*z5*6kZ=3`(y
zJ*B8RM^Gp&Tcddj%Av+9bA3n#h2$&M>xU6-+Ov)2#JT17Vp=fWphzjv6Go!bFjvPX
zkIvQU2_!L5vC+|*h}4L*<dnq36ut5cM0L)-ShPG)DL*T{`^v%{%btMVIK9QXa7Q@^
z{hAevt;80I7HR*FuL}GBB<cUvBIsBB*eL3E_bV*jp%l9_Xf?D;GVulSl9rN^ni7*9
zlWtHBGF~U$uIwSB*fB__`Ckef@UK`s7aM4pES&&Y;ULaIO07t$Sf}}U#^H{WXRMsF
z2%3Z<Y{%sQ0RA*VNzZ!PfjJmfBll!0345^(^Vm8<b93wsM*E=!WM58U{+f*ZmSd$~
zd5258%Dy_JQDSEiwj<V<*C3y-uDzlNYQWNzb`nP?%3Y*Yd}??~<3#xbI#E_Wa-yfv
z9H=4T*r%~;U-F(b#vqM@a{nwpif(`Vjbg79sHSRI(w6Oj)=r@uD?FpXG38w2&6%U=
zZcRZ-AHY48d{THg>Ud;SR76x#bPDRY^?)vy%vr??4X3ZFBUi^37i+91bZsaO4J^=O
z0{u+w;ggXcWKiOij~hx#+EJ-Kdu-j-eK-&+)Cs#od@N4E(Mw5u8-;XHdhj)QfL)+0
zXG85IL0I?RiB~El99&@*IW@2+?Wo78(y$AnrrQ#_?^&{LJMnyY`!P!8u|k<4$L7vc
z)jPLtI#A)gW^tk+`^b)6MfqNqWr?3@X3=GdO7*TS+jf?(YCOUPJ2+P3s1wURc3`b_
zCp)FOyPzz_fhy{6&PtH05$*_|otkNx<cB6g@Cd0wB$X;C-TgC!veis`G}oX6UIpYB
zV%%whV5IC^s8fn}azU!1qGWeTz#8`iL-y7UrMX#NSuKXnS&otEoOS+XdL^V2i4h6m
zhDs`(NK6jR&}Kq9kpk$EjCY7lNx>*SJr(nW*kp{Gm2{_`HMf*L;W{M`(N}VcCM_x@
zQaR0M9@TE`v1+%JE?B#iTk5wDGRX^5aZJmz-1A%3kT?G!9%<1-(b0S;bo8?26cjm}
zC*u`;KOQQ{J)|!7$}8R=>x@H&t|=<E@m^)ygAZ!0hqUcA?e*D;PRX)CA3dvw@2*hp
zB*E;Iqc@MVf@DiO0zLUcgM%>)QJ%X}e(j`TM9Il{*RZy=bn|XQu1;yeWMGqW<s>v3
z<q2|!r$dNRKFvST7yD*e&Un*1gwxfihv{n6ui0wUuNCNiC+U>H=Wt5Cr$TAj|I-0I
z3DC33-@OGTHac=t@;z|AP{WpISYDvIuB<5EusKb)M7Q36LP0yF8@nk1{-*9q-}O-E
zjk>R_=bRzb<CIPn<;u_4`qg9P9p#m;us+NS>%){5)y2HZVHVYeQhHN*dk}g16J|<p
zDvMSwRYG!N5vHhIA)rw<fU}>`ilKAp5PywG*OZT-wej#(qDO+>K^b85()uW|O~~7q
zrMK@fQ<<Z4;H8Vo+C|{Z8>f-HX-qMoR0Q?ncdyZ{c9(3Gw2C<@1A%<^@yk)7<x=RZ
zGBu@XTczS7bCQx)^~IKD^GY=nIvXU#JYJcYr(M6s&u6*2_cA54SlQW1DO8Q)bL@fa
zUPXG!l_cG$KDxJPO9e_AXT0p)wRiVkFdUy~y58GCh98HkDQ<0Ww~=*`@tA0EG9}zN
zSx@{q*{3+Inv?Z~(vXu4mJNY9Ts8{k82mZeIN5lZQ}O3y)9~kH)A8qUvh_@uZuAHh
z9Qv{p=5qWw9GbEM<|_O-oO&G!GaP5Ba5yRkhsEH0lpQb+<182s2f&<zc|-OX=I=5Q
zro`Fd>}@6245o_H!F-o%2eTvB5oTxZ1DGFj-C_3RkaF%*?o*hbaY#Scm+K3&KQ|cW
zaBdvTi5$|2le1^ToXa7d+#+rzOm8j{W+Im)lXFElNn9>#0nXTCvP<WDpz+Gx1_#t!
z#<NT&$Zpz%$ZQ4=#fc0K%jS5y<D_p}xXbG6={e)zsFSR>tjPeEA+2OX2Mw6iN;YxO
zM3}Qi4RC2CTQX+c=vFeHv7-mKl7&qiH>Q;=X%h95hf{)E(bIDn6%M8Hw$*MUdjsjR
zxXWb@GMuu`{Mh1@agEi^Bh6Z?U4g?~-m%*4WR5bO)ou@Uu-<BKg0tHVR=Xfm%Ua3a
zowvekh3phFtC(5M%$v--%gpbY`GlFjGE-#c3u<z<OXqvKa{@CRnW<rBYi4$0=10uz
z&CG$!9Lday%yd~k$8#w+mzj&0>CQ}VW(F|R#LOsWCNMLNnK{fX1pjFn{ck2c62}HK
z{{OyntbY8zo3^NXjwoBydzQnGtf}nIZD#eh3AdN;{l-}JdMAC07cJk>4A#tIHIvi0
z$~Z$0w0IsAxK_QHs}>T8p|a69o8DFCjusk)vz~U#DrHB}9<SnXr+>=KoDFBsIdboC
zow!~&ef|p^3*?QsJJmm7=5xgQLH%>thxNa_Vw1}{)Js-(i;pMpQG>j9sy`rmzy7}L
z1KE2BPeTgan)*U+ZGAPju6{RHf~&NC8n?dwJh!1fk}Io!!j<EF1;TN7^Ng8)$ZYWD
z54e(7Y;sVjv$|V+JcEy)(6USGuYuY>xiZvqj`~2{RrQ5PaaH{ZZVRYV+j-djKpLy+
zw{hD+eJ7~Xr}K?Zw(Q-Ph{f{$rSE6({S$avRc`{7Yuq-(wjHrix{Ml&F;ZruzePFU
zx~lahxS)nnKI*GkX^fGT$SQE?l%)htp|`n?bFZG@IHqQt6H1^p*MaN7_2CAhPaDfk
z;#@daZUN`V#c?TI7FWQn<;u9t+)i#kcZB<zJIh_-u5-7!2i%X`QyV9ncWheQbg=1S
z)7@sE&1jp6HecAxvT?InVv}Q2Xj5WSVYAofkj+_}OE!1qAIS&HC(6H&&yu^zm&jMh
zedIw%Yma)`D~F@(sQnQ$e`F?g39rA7-1Mmb0k-GNmHO@hyBy|uxZaed)IUHz7uVmQ
zRJfV-H@I1_+v0sS*IL$+YlEvD`nK0&xrjcFQlhoTRrWsjA+C>Q@5600<sCxMniPim
zX7TmXZb@B38f|4G>ko6TxaQ(=t3QmGN7h%tr3x-paH(pbiP$W;e3e22otLS5>C&VA
zRr}wCZSd1XW<ttSa6QK*qK3DYbw=(xBQKq~5qKU&bJmy&3%%D($_qVsp$9MYf8u;i
zBPT3n_R>_!x`J{yT>otfXely2GxPPbwDA5vyET`+htiu`e_S@Le!t8G*K}Mnam~lI
z5LXzk9eBSJ_hYz@!~Y3ff57cU{c+B|em^JRa>PZ;8zm>}z`5d@i_1;cfz^$d{Aj2H
zmRj+uX{o=j*WyPq8|_ojlo=+zyBS}|9<)`~U#)*szp4It{f+ux>I>^7*q+GR!+efs
z*kP8{Z)4B*+4Bjw-KgJPe;;q|qi_B{{Lo5dXbCjdM`$a5`9tjZS<OexPSYX5jmG~R
z<`YWiKmBMJ79Y)rg$|7!6d28aLjgT}L;Oe!;{xT$zxg$!h^6vpD-W9^q{LjTasCSd
zp&_1zH!Qt0cI5W&el-7dTm)Z_Kz|eNIA#zfM9b&^N`~>ZzNV2!0&{7JH#9e<`sFO_
zFZIho=|uf`{GX$LIDmU~{We*1P-Wb*#1EQyf{7BdxUkSHeg7_%%onR2mhkNPPdslZ
zi<fj8Z2z9y4ZdEzzYNis?^j>{t^NPz+d>AMybhim_*<f{y{Nwkj^4*bYv0xSA1x`x
z^DnGsJ+ZVQW=H*oALc^&&HOah1ja{N7C%~3fj20B7N#LWP=8L#la=%a>WXh!<Bw6#
zKp9haRu<@aXnZGF`Ci6288wpq1Uh=Q+N>7%gm3&B-oRR4&BEWUKgnp*)c=R})zD*r
z6X*x%&r+{wI7^z~(wJw94;BZw#eCnOe1Qw?Mef5VOR=@ivpiAXxL&QTW%VW&_Bp-N
z6j09M%gTP1{s?Z#*5_Zq5%e(lqi>{cmJpV=G;D*d;chKamVQQ=hIww~R)Z&YXDLJK
z==+8j^>^?@V`OnPy5haHj2eA5x-bfOqCEjikA-(HX<Def{*2abO*yM;M^JYTAoM1D
zg}_bxk04a@hVr2lP?K)RS|XM+%-?R9I3Kir9o&ytTxCOGyJ7W#UKU>pR;n~VlmdLy
z6w<s<u3KHL=@J-^t+`|Gn!}{M-wjqTX@5pbnU=!|kaD*82c<U|)$`UGakrr*(O4)2
z7V19iv<x3Lq=>#{NwVDE#Cw`1R;yS_X{}<Z#M7HrpEPc3PVn{#>bbSOF`v6ZopNP2
zYjcQ+@$fy|(F&~;C=Z+C{Z05QWWFOorx0|`phPVBqP_4FP@!%9Nqr>s1>cP+vrwY(
z(~ISbec9mN^3^hC_U7>OFYTv+!e8EPnqQ)0f_IMV_oD~+1mS59az>_yS&eiy=Kn84
z|4)vneNQOQEc~LpWtXMxQPc8#<JDg5e~PgE{}lTF6xhl)R+H+FTiPB*-mDc^-(mDi
z-_%#(?VGe!V$S-1__6j&+c3%rCLIk}YdCXbtq$+3HSy1c|NhONed4(rF3P+1kebOb
zr^T<n4wr~As-?Bi`8NGI)0E(%wdUp5L_p1Y56|5iS{C*Cm%pJnba=pPZ(6?g^#9uf
zYjc!u=r2&~=qQNtko6a=m08=LwdC&7h%J4(wco*bxgjy&B}P{-{|)Z1-z`0n#jT-K
zSX-m53@Nd`X|y%CAYP>HzxlEDgx;fGWI3Yk*jgiC!=L8hWvVH~SHDt7|G(4~ODN{^
zwKUY9#+%cxrmP_*>Sm4UwGjVJ`v1xg>uDQ$Q`SEt4;V$koku)x(%4vhw0D&1AHr;G
z1y(!Gux|KS%9%b{=;FDt)zt3?RrJW9hfy>x%x^5z8GRbhlltEpDY4wqH#7tbg?iuc
zWU*OdfoYwwz+Xd~U@e692bSL}@z60{75&q2vX5Y+)ENb9zkwi@JidHxpkt-R`fU0Z
z;Uv^xHfH<R(tSPD|M-NQz0A-5NbBDQN6D~}0rkYb_4F&x>HwZC<<ZzO;ert`Eyo6u
zFKsM5EmKSVvDmD9ws4k}KjWn(^s8Ui*X*yv`a1oFSpOgH?91{05bi$&VZF1prv3-7
z|J!SuH(cnrqNPvE1l-?1DbP9Q6O4Q49HoZ#L@#*-H%K4g$5M0Yj4AowMDP5!@4k@P
zH2o)yS5v6f;A=y*3A82eM$7vzIf{{3P5nCRA0cV&sCl(V`PZ0fyK3-3bJTGCt51sy
z_;BAk#(Sk!A|^|0|1#PE$9|#XNBVoE|DnB;giycX-$=*e>ov2n$7yi2%m5pnUfv;t
zVn3E2jO82N)O$AAtnV?0tdEn;rB8Hj(C}k5i?&VLOVd2kvG2<t9Xb5v?=@d9ef-z{
z>#u_gRcws%GW378{fYj|zVy%O0sRy8zM$WnmCzH^hgb8(VzP`9tdY`rw3X|u52p3w
zJb1=h9cY*shv}^Q{wtJx{&SL<4;x`1t=~#-?QqB}?LeE>8(L>+J+%=!(YNn-zLS77
zKpDznp?w=InLpJNYin!l17A-8Qb*?_H1&T9$!OsVj9lT(OU}{otn@AKEMMzazsB_I
zYMr})vSp5j7}$KzQva<q|CAD>8~$mp@TVMD{QYYxtnM@hmKK(WS9)@pO_QdSPeK=6
zQ*aSuSLBKE@rKOCUSw~Y>k_PQ@I7WF%Gp1#|0iV7O`(gF%VctA87Ci#YqadFe6W0^
ze7t;$?IHOLTyt?P!sU+3TOJ@c;T|PVz?CM?fxQq{39btHR{3surTnP;l)Oq_Ex#$p
zQH+e%6Zx-lQU1dAkgYBJQJRZv1>0t}PPXsZwzlm6_b#^GZF}1~+YYrIZ99?0{e|r;
zTQ}P!c((%nX&Nl?(|8-`Q<{{{UtN^$tCx>$knO8iLwq#OS1%gpt5=w9jBS!_2IBXo
z7tNP#o^7%1dfQFbbkY2HQ+_nut#-<j#*6WT@`PSUcf-ZfL}}AJ{P}K;oADgH`nx;A
zvGSn#WpV%2ot2es7fYG_>m4*K<w$u%)BWdrqnqt^l*wNBsd)9?SoXC18!nU+EmvAz
zuiYsR!E?sTzq+H|uzK+4yR}|6)K6MZ8tNC&#<S$8XY5Yv1<H`sx&Pvhe4t*^diHns
z#&+=M_Q2YOjH@4lo`S2tVe=Wx1zbHeTpg$j7h^;9I{#$$ZZ^H)@}<p9nA4ek7k$f3
zVfJIp?#g^#V)pgSY{OipGV?rhImsy4Gy4l>4rXu5nY}HuE0}$>H585U3ueE-+&^XZ
zP0X%h_8dmjnc0t1yN!~*mEB=3i&+Y7n0*GbH(~a9%<jrey0V7je3<<W_I44q%e<Jq
zH?v=2b~hV}GWmnqmoopA?CmP*BD>984pX~LH<qe2=F`mF571a_df8MWuCJNhhH_iZ
zvDDsUbZB?UVWm9P*Yo(MGy$@sr>qxHGQBb5?*p7nKUsg7GiK%kWrG-AW~gi!5Hlm7
zpBe?d`WV?*hM8F<^O5;NzwR#!kOcz!QX<<9+{+Q!SJ1Sd1M20b>|5C_Sq-$kcVu^E
z_hk2F-$DESQ1-p-5zsJ1Rx86^YqEOa<>egD*>O#Pi+O{4lY0xu7&Z4c*OJq6I?lko
z%e}|7<=O)y1AGkEmHUY64s^_?K*jV08fE}Dh#Lys@knko^vC0YiJ8Prfkxkjn*kKQ
zD{wJx&?hf~hJP97&aL1)fsXNkemQ^(;zBqR7sf@Pm$!wqqYL;_g}*&?&gHTu+(vFE
z5GNEd(^}RB$boCHj{(o@7{4f|D2IlEE2FI(nIW4aTPRyBTLPSrJ5WNDLw-OXq{s@u
zp9BA2FJ~HKM{z~ry4`PoZ)QBhcm;#ku`xDY1I8F*HUkEX7i=~M&v;?+j*TIhMaUw?
zK?#e4B7_JcU?4b#7y<|(h!jX7q$q46kwW-EP(=8FP=pjEK?=!tPj%0{v5i20(xp1p
zue!Usx^DHUd#i6fwNC%G>1_x65&E8fJWu#7zKX}EoXvB78!w-3>)~lu@jPqnYTIhp
z+4XjV-PHROh9q*CetC%=TAn`+4@jc1&QYSTf38e>pW+Lp`SoRapzMs6PC|(>`@(P$
z-dmU8yR{t8t;@m+q_Hxrk_Xr2$mL2&W?d$m9e8cs%3H8A+!l6)?}giu(+|QO;ZCG=
zci0_%h)>u3crHANKi4yObGet)hv8HF7I?v|U?n8huvWYnI;_)<v=MkRjIl1f87A07
zR)DztX4))yHk@H++SzuFooDCUB3oih?LxcQE|pY!kmwq_%GTKi+a$Se>y_+I+ok?@
z1Yd9Wg(uh_LKu#PKY~6vnqE0JOhH#&6c&f2;p*_LyewV{zYf0%Z-h6qK8q(9Eo7l9
zOxBxk_;LBdrl*Lhdx_y8mhgqd{pQ@u%XKC9n=8q0t}MT~ns{J<{N_63H#bNeFj#(b
zL*+L&On!5R%Wv)owfb=R%^fAbxzX~Q8^b%XjheXM+&KBoO{Jeb49~dV-08d_ui&5O
zeslBXH+Qc5=9bHEuA4VxK-eI^xvj85SGZYzbGOQG?z{4v+a<rbJLETar~KyblHc6j
z@|)W&zqxzmH}|0Y=Jv{OZlC<-_RDYX1=_+rq*7XV6fHD{U|CBhJe9XxjiV{N>GPm1
z@Ie`#s1rJ1(U}}SfsnwavpDlaLJC*Rrd3ZO6veJ3_;oJV`TS=E7CDvDoNG%w{TW;}
zk5Gqo&t(5BLId_an|sYCw8A&%a!2=GY=e0g;3IcFp&dWQh1B6XLP86Fhx=YnD8bL$
zDaYUGnp!)BtM{<~D?$ynewj0WPiPOX6B3yF9dewzQ`q}2l<+>xU4yOvL(YE*39OB$
z56qo{MJs}3E93W6wJKP*I(@6fTEI4I1KX_~Jj@OQ2im|;gy9E+Lv1K{xE&4-x8b3L
zWJiLdZ8SL6#)9K)9OyohC1iaJILRi3GGoCMaGFg6XV?sw+r1{Ml73avuS)t=q<=D3
zonoher`c)XJevoeWoJ>_`8FRs*UkkO*aC2&Ed&?a;?Q6`xd2>d%fO55qR_(FatXNH
zmV+zszHEV;yF)8|X(hPYR)g2twV{o1<~!ha+Ya7nH-b0Y&7qxf=N52>?Fb!qD<e<`
zy(Y2U_<Z=5hUt12-5c&0<s1n3LH2GP+8c_GN1(?ZMH~Y|41pV_!48A)pB#qI)?mK&
z@V!UdRAfBT?@06zQ~XeyetTX@pLJF!(Nim`NoQ6<puYzCqlX&Nw}x;MUkqBZ*h>Fo
zVJ!XXXwcaw=o`XF?jG-%Q2vCb&_WBuFcC)b5PEaQQ`WHxDyRt(N*hiozRh62Z`0Qc
zezqxV1X#^#s|;Wy@7Xw|UMKfSJ<2^u`)zSf+0V;uedh+h))e!0^Op4ByilYKK5rXI
zU1O{&ok6V<o-@V?N=@}_;SS@QV*K5AZoJ0(iEl=G^+o@k=ecycINC+(xs$SE`8jzS
z^ZnPPrW)ln^P0qCo_a5hu@z48zS7nkIZO+<FZO|Pfb!gzw>f$Xd-UF(_xMA%pSST6
zVuCD6gu^70Dr5gev|{w%z632G(P&ga7g)|6-Iu!+jbH`&J%lov!Akbmgv+_=3PLMm
z)s^&xs|XD=xV5zZIzp>PuK{Qo8@XyTp*`#%7^Bxtp7%C1hYsm@HS~siXoLF+4K#<n
zT>B)UMPpk5E#evO^$MXNZ6ZOR_>glxBNV&~1w*soy+FHgFKrfof)%U4m<?l8M%!ow
z2QUg2&^kK6PU{3m*(kVdjE#X!x~vNvZ^+Ch7<~zCWFk3JZ7PUX0$0wondHy1S>SA&
zP5Ecr+3?*tb`E%+od=$ehj|TcWf8c<mV`Q5%Tn+{yAZtCE)IvG!CVTWo5GAe)&mc&
zvQ^+3e9>FbX|96r*4a96gKYpe*(UI6eAL^}U$?@N+iV;A*V%Pp0NU*J;0<;Ic$3`(
z?zEk7`YyDfR+=ZV+uRqNZ5(eqb24mG!w98^f}A7AyVp3JI1+Rw9LD!a*Y&5-$EWiq
zPDHLp)9Z#tPb-d$MNZCE&T+oQbV~e@{r0?ZdLI}8>4T|iQtCaYPTgEv8v;`dVSg%8
zcN|O@l0|37cCIMWgZxj;@@+DAkN0$JG=(9wKn#Omb`LXpa}KAhBNg&;JRQwFtAq-r
z#4VN__wmKo<}4jx2iO0YMQ_?B(|?&+q()w+Dn|zr`fpJdeqQ87Z)ZIC)rOJv^Ygug
z{Qmj9^J9JKWa=7YU8&cq%5%opP#RQEudDZoJjUOB=f-Q|H*IJ2K}~Tg`yM^drQ>7e
z6jJ}?b<2<E=?wBb-&5Z^@Gky49*t*tFO9JcR`9;!>n~zd5y&cfST(2Z%JVU#IeH6w
z9Faw@(_qd>>Dxz8>OMk>h42J<2|A^ZKW?eIt?HpHjo#2X=W^V2$yB;z0gL_|&UKBl
zE?u%DU9v7+vJ9VIO3!ijtb}et1IAp#zB6V;{8$w~)@17%^8hzcn)71?HoTiQa@MP0
z`{L;?``5&P73rIGbo@V&|7U_RGw?UA{RhFA9r!2sZvty(2$2UXR<jz6;M`ZS$wnVB
z*8vlA9Wb%!Ha*kPQt4=^bhK1DT58?a4OhC3R*;TXK<mE}t#hrd1=rhpaHDMmH```#
zi){g&r>a;6*RbzARTEFu#8Wl#R82ZvT{>M|I$c>hU742dq?ZoisfH7ZdN=FHa0KI4
zv@S;Teiq;+w=u>NTCn97(Q1ncWo){oyi->bD%f_<()!O4YOG~=k+NSRq_Xu2SbJ}f
z^Clt9tv>2|D`muf6L@F+E&k@Wl6WQOy_k9*j+_7XSmycA{HY@r!2vbtq;8QHDx}UX
z1)(!#HH&rLAb(G5ygxx~Ny6sb81LztK=YQfOmkk}zL$0IHjuJnX@0EOv>)Gm&yAX-
z?{!kU<}K&fSf|nfN8_3P4#%y6O#3#!HordRdQJS9JbXS==GQf-jqevp^ES`ZIDYl7
zYd)ss=j5sPlY=+U%ky12F5h-BrP~$pSbk1^USFLDA5<g1TioJV-b-VQTxGO!9{oI*
z?7?x6@_g)Vj^4r^y|;Vx`Z!a@RYIN~N7-(n`-;GmK)1L}wzi2G6ER~d`???ojQV3y
z+*cI$6~%fb+1e)i8t;5UQC7CezBX}RQS+gZ^@_5iO%}8p&?tSfpiLHZ<hY_Zt|*Qx
z%2GC2$|g(MWGValKfVXbZZ+AhCcD*Sw=$QFm70hF6ER>S228|&sTeR71E#W43*xns
zY}JC;tt5-JAdV}^ZY_xE&_~e`YV>UXGZ*JKL$-WR)0;hyJzt0AqfSwyPAMC8e7vct
zRTGUgMYV0J@ur~hrl|3zq}e3b;xDB)`>4~<{9Row-#}NtoN|5aX*6l;aU5!qM9SGX
z<g#dJ1Zt5cUY8CYN2A6;qftYnQL*1><hptN5Tntj%mG&8m?X`;Dh<6MsWl|E1~Y%h
zp(CGar-EnNnPAkNT`o1rr6#%5q&rt6otmVRNIHq6lW6Q|k&IHws4N+!l2KVQN+qMR
zWRyxqWsOEfjYdU{MkS3#CF#+1WHwY1igSF{B$YxY6`xBgWbN2IZu<;Tp<f$)-dNqu
zNZbEOd^RM_YVWflX;x#O4JoLu1!~sWPfKyjEtMsf*T$`>LO<#GtZe$F>eQ?!xUEu<
ztx}M!g0)2-uG#6uyZWtv?c#21tV(ru^7XGHnM0Y2#+0vvU7&TatF;bxyVk+prFF26
zY8~v0S_k`<*1>+Lb+DghrNwoyqu`=bcq9A{6`tSM!;Z!tIiC5z^RnEyGIk8M%1mYm
z7i76{jqF(Lm=l;aJU`2gt7UzjcNUzsFw2eWX2+r1p2)1?qAWMApdF8vI~(p>oaM%~
zv`1qboy4r;k}Nl_s-1wfG>13&f-E<#uRR8R_+)y~(y*+jXZ<xvN!ThJBs@~sB|KJm
zoN$hCo^XM1+3Jm(HYAq`R}0q)Hw&*7-YDE5+$Fq2c#rVD%eVBbN*)yM6+R>UrSMhZ
zTf%pR9|-?0{M0cmtiS4tp0riiDI6voA?y-P6iyS)6wVQzE}Xx9)2j99Lg6yua^Xth
zmBNj}YlPc{w`|<DVN1GG_<iAS;l08KgnNX0h5Loi311YxylKnojp?hx*Mx5i-x0ni
z{6P4T@Dt&`gr7MU3R|~r-dd;$2M7lVj}VR$ju##)oFSYgoGYBidy)|Sefp-;I3xCT
z(BGvvBl-W>GwG>c58boK=V2XPgY)s$(Z^h$33GIgl5Y^`I;C^V*G1RxOnTl|#kxxP
zsyGN{I}Wxv3ud~6nYy)M3tH9==Gu0L`@%zv=}%(={g$t_f8+~=_cs6Dt#-0c)J948
zX?P*qdzrIzPIxa%KgiOLveZ|x`V)VcrTOu{X20M6!s9NNg!1#df9f-Ks#j;c)}G6L
zKcD@6jry8#NBda!b{*GqxEHxzo0vnn_O5c@RbHo_GqJagwY~OsmY4AS1vH7v&>&WE
z#q&+SjC=o%bN37P3ik*f026zFnzhke+wD%yx?leu@gwHp%<c=1gSV68HM>VSv1S96
zvzwe<SzTjJx1ZlHX8}34^yc6LL5+R1bIb89(iM#1iO<GjnGZ&y`?2Mp0w-Y4-x;3D
zpNW6ed&nNPJ@$w_YLBrh{Bhe$NgtzG4htigC7;3wIfv13J|o{UO8c4pggUm_K6{9?
z!=A8*N!wXXzK5efw@1MJ_9*z2JqA9_O8Ufp!MFc}_2zp)bP{G3rc-~PRq=HVylr+8
z`+v~h9PK5nW^ZMMJ9VbEhpweDPwZ2?v<|_0tk1<bt`vHC#;EV*FGnlvMnmzO6`sS~
z(RgMkS97=Kuef7%#%rD{Uj^@f#{KuItrN5e|3{MqO<;}ATn-Lqj^TLjd<Mr>P#gZ;
nB)=bJ?4ymIq-FNgB2Uv2&*=KOs&zu`R`R=*>;39AhdTd%DIu2D

diff --git a/docs/_static/fonts/overpass-light.otf b/docs/_static/fonts/overpass-light.otf
deleted file mode 100644
index b060651a442a5e7fbe9425c4a7f0990b8ec6636d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69324
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

diff --git a/docs/_static/fonts/overpass-mono-bold.otf b/docs/_static/fonts/overpass-mono-bold.otf
deleted file mode 100644
index f8291d926d984f94367ac8d9edfdf2b4c728432f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95240
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
YzCqcx*A03%7jYbFlYtsf{%d9bHy>eJ+5i9m

diff --git a/docs/_static/fonts/overpass-mono-bold.woff2 b/docs/_static/fonts/overpass-mono-bold.woff2
deleted file mode 100644
index 280570a46adcfdb48ea30406090fb0e3a4673509..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20532
zcmV)7K*zs#Pew8T0RR9108lgl5&!@I0GvPo08hyP0RR9100000000000000000000
z0000Qfj}D|9En^%NLE2of&>O&KT}jeRDm7<g%&SX5eN!_lW_PR3xrkxFzX%xHUcCA
zi6{gh1&25Xix?Z<iZyJTcEh_J;Jx<!>MM$}IQwu$B7}_t1VrAK{r{hn8!|*IM0H#J
zpcfIIQbM&7OlXAULM@ZI)igO+YjE}kGc*fjYD<eq9?%3xrDVAyK#+zYNOT57rO}~n
zo(Tx?Vr3fAh$zau0k#`?DOq4K8*I$NYq^DTs-CkvUg*T}=zotH`{Si-#Ko;mrg;VO
zrulpSgWsADJ>A_hSuW|4Zt%W&>KWipj!3)+QH_D_-rawIQ3Hbp0GWwPnRR)5C4#Du
z6$*HWZ(Bd_!L6bZDtY3CiWef`5gH)kg{Fu|9)yU3-We)gc&@ogWo~QT-^^|8HgjFK
zHM`h;-?d|1v&-G@FFU?nMruYb{+~_r4=jmjWIkZ7E`U{Dy3~0+?(9kj0FsO(%Pa%3
z4zUbP%?+_>q(ok9i-<RlJ`v@g-%ob#bF2skV_!<EmLe8wGzZxqJ~!)M!)pl9M~D+b
z`Wix@G-PN>I}FP(RAy$i>;2ZX9!}pB`c~}rO%Es2(~4-<SnrB;jG3XCdv*2B7#1{^
z_4i$umm0gIPMS`(7ASXyL$IvIn{>YRBg5gEUN-k%utS2t5EP@XFarWhpxR-Y6o%)w
z`F|GW)-KwdOvD~4Vj+>DR7#{&8eBw>(kTYk=E_C(d%eilwe45!&;QT)bv2GL<-Eyc
zN_TQRbDZwf`ZZfx`D`EGyN0*>*~(YX)aGj@>+?7cA%-YHBv-^6L_|QuD?xHar03`M
z7-KD)k{GM<!BFG<ud4a+34$a{kyN!$QCcr!`qavlm)QcHDZ`TSUZ%XgmFY^WvD{^y
zM6-e<h?-46nlpi~EddPxyuro|CH{X^%WvN$gfVBMxDn2D#yE1kMMLe#F?6ZQMfdpd
zAm9Ol1yYn3lqOId$p)ph1xced6gGeyjiKN<TsbE>Yt|_}X=cx2W*x9u&RVCKs(AVo
zn#x7%<Dzm?x^(wLQTD%f{RwQR3nJ?w01GA~>^u(x&@9HZoL!3X<BQqzup<HFOZ9W8
zZy&_wFESQR5wZ{=^yHif9b;jq{TXZZJp^ZuyKU`qCQ<|fyb%e_Y5fP72-BqV_JCd~
zDe)&9f`ACH0pJOMcfeqP@CD(=4@7`i5b-iVWGVqsW($a|YQYdd!AHiz#|Qfuu;&F0
z5kfs^06qX@3M@bZnRp=Efs!){Bv7b%Yy*tk90>u;p$f(`=$9nQ4DXTPue~%Jd>X(h
z-Lg$623U}_45`W`2KihdTKCAQD@&%ceEq8_gRp=|Z{I3)ME4tdR=*(zqsC2|_Lj|=
zTcUvod8bM%AQF~VpDrseg&eLr;cOtv<w8|1M7>;|R|5Gz5*R|55GC-1gmEcXt4b>&
z$#vZgW#2}>LITKVyJ8@7BpI~DbVY&~)y~18EIqsl(kITsdxY&`E)+r3AKmcWOnmw@
zUNnY1r81+LQe`4WxXjKZ3@IISH8j#1hfc#$Z<naCVKdlK(q%D|YK{?__MHHNNiYjG
z0STgj1tKT{6$HU3SS)M)^qFR{Epkc~2@0zuvd+uc$PUmc4lbz(NGT@xRM`I>ahZdF
z$&h+B0M=gyV=dii2rn_-ML5d@IRjFffkw#(iY_p+%{ET49Fyg<Xc@!<is*dMsx_F_
zU|WN04ZbxNq9udKOx+EPfyI|3$v`L9UPV(4TFK!^z3+RHrAjmVS=OUdYf?_6RWS(3
zv()a;akz{U%n>TV95W?|QGxrz$H6=@g}3c9GZ4HrX9-R=OCcdkh@_LA`pa|$uvmx)
zjK<a>nGUH`wW;h@rXFWgHGv?r0N7xJ)101d5S+Jchfr0B<Vb`ot60bugf%rUaPr4Y
z;UFs|g6>j)0Y|%ns(^v?(%^(|44NZ%xVmMh0oUpaS;Icz@|G4?g!OZb(0_EZA?qh0
zUJ|Yy+3MFV-};5Zx=1ZtxI&Zbkkv*F;BmtSI{+S8=vO{AR$v*hlW!^$kOcMPKLUJh
zdA<Zx-Pa!!ppC6w056#h;uCr%{{jpFxP%cfj0AuLFcaS3Er(D7uCe-mc3%D)01O%m
z&kccI{y_l9|6FaHi7eU1SRepn;jU{c_})3S20HuET+pxxh{zPFjv0$XfD*9B4h6SU
zLjI5gAq=%K)Wop~&21}KD#9&%>@Wl+H5}2j1%iycuv3P(5*o~P%>UYQVMUN|I?E6;
zEr#M&Jc-Gf7G)4+2xTnAf#O1Or%)*&ln4r+qM@A4z;1gpewrz}+b+)l41<C$LTAB>
z^p(a?$P}mB%%Fr1RsbA&W4?B7KrP8Hlbj?Wi60ixPHa0y0|3DAz1S<UGWsC)v*DA&
zuf4&ye>MKJy^hZf;0dh)0<Z?)gekx`nBB=fWjp_S^qITfd%&DE_~?Vb{nvO1FygWQ
znDD#Na1aK<g8ODc;IY68Ye;O_vFF5vD+)Ir`~(OTgf19Ms4(Hyc;=z!S%JTDgN-jn
zta!=RNs&q_OST*`a%x42l_*nAqe`_JTTC(eUl!n&dzJ#=-yrbSrzp&+Gm|BFVm>OL
z!-F%<<}Lvkjpfa0_1?JTf_{HM1A_z$3Jf?bS;@u<M2^T-aX`SGH&0%CQ9}VAt1*ON
zir}vlN2Dk`YjH&rNRl9tP=+*O>EdjlluMyNUTBbSlL{ME(kiqWjmm5PH|?cYUVs3M
zv=IRWW1)e;uPUg9g}$(prYPiI647YM+dvH3<P~59V$lKGKE$CLUqF1beVGxd22IK=
zF&L5@OG^Hnv4P8gU55Zu$MVvaqP+7CX{hXE6H1pvl0JQ?l}uKUU=3|XY)C~DR38dW
zs?HMt1u{wzbLXH|D)LYV38^B4TBIU~hi)i+oh6N!rV5m2+A@a#sHThpnY4$Zn|iGf
z>LDmiiJ+-HE#KfOSOSW<TSyDH@d)OT*IMNwB&cS18Oj{%2?De(&jvgMQ>086HN|5d
zhIx@g-26I<kgGGAP^4*=$3l!4S<L4|jHdIjAgIM8$q^yXbm^82#6wg)p2-O<UR5P$
zCNl4q4Uu)&EwH>}&bY-YmMieQrtmbJu5+o9DM_}-!$m0LRF7^k#|uUZs{si4EdL8T
zMr)Yr=aFNpIjN!q0mEdGKqDC0yVUHWs31pyNXRfkK8^J}CSWwTFsDQQC)N&3r>)nf
z(*{I5`Asu#hM~gSQN-)$RI;F15uNo>xSNKa7j<9fq<uqKhyBMP%eUW#JzGN|SJqJ?
zAoE&4BPrEQvl)u<BF)-<v%~wlh0D%Sr_QECqd%qOP&`0JfM;>=91ebc=ejrRC=O&e
zmx;e%=P2X+Moy0vLSaao2YarZ`fO-qzezq?hI&~>L}HiAa9D70N5!ZTk|8OCkY{dy
z0wyyC$uz*%szJbMI?6^O^pHcL&`*wVNi)~?$W%RS$Ys=ADX6-{hIMz9Dk`hJxItOE
zSL9097&TS6A8}|W=|K9@dOdJ;Bt7?rycx@P?<VgXgUYqh+cw<0@1c65kGS;gQenN2
z0I8KHL}N|IX9r=1GB(y;vd;Dh(&hb%j?E12@>0XQPU|qG8S$~h?JV7+MzSv7kYztR
zbfV&MLu$xgB&OBWx)4(KPO3~IuZr}wJc3I^Uj7bB+(ljqFX-#-QSfR-lvW6K2kw2O
zckRUONl#FPjGv*6&LC@Yx+fh`*o?Q;{WPYhX-aP~Gc-9V+%nR%%R7YTPahkyzXW`L
zO%Lpq=$>U^Nh=P+k7P?OzSr=c?Ij~BC%7jqe8AV{N<DRnzOJ~uIk?M<g4UHCxx2=?
z&tL52D)hd@jupU+a=!58|9ezKB|1FJI^oo;wi=>NgVkvb9+_?{&G4>*6PVqMr@g9Y
zFD{j#dOhhFn?h6|za2Rg2C1bDGSf1k&LWBos_>MR!AD+OWk_~VN`~9CALF(-coh!?
zEQQg<2p@7qOfeV-k<p@?CacFNC!-G>=9c#70M0^{Dnk^IBL}<uL!*Cn^B0QyG&2@I
zp-#1er`;WW6Yen8$>5Mtx{WDi)1HaV@MKI1xuhz=FWMQ=yPyf=pc0bj5&v;Fp=Yp}
zlx8HDB7<1u&SveQy|g+0Z|^Uc>P+;$g&EdZHA@+)Hv}J~<w~~ZSSe<haq6a4&cjXF
zA6sRh97!j=lD3FKrXW=ra`>rrM+aNX4vv3bDO%h!c03xs0le;hdogaPH`VUIraavM
zb?igEOOQfL_j%+7owgdON`=|<W^<^#*~jxPu~G;xJr#z7zj<oc&5>mZgM)h8@PKD=
z7bc<acXeqdq1LvGD^4-%P&CEbyD#-nfwviV1fZF2LSq%BOu*kydpN}jc?iFrl`=Hz
zFA*?g;b{v}sPk!#*Pj?)!nrN)B4G;<T!i|pTHPZc@Vz4SKTk&_@Q#fUuqhdmG;f)>
zd2}Y;PD~Jtx1dd{fqJG4D)mXYk$X^IAL2x?HmDe5qV{hq6hd$wf8|C2_Z&h3J+6_5
zv06A<+4j*;g@9Sh+%0%ag!)AN{7D7^{N@)P>VuWpMuEZYW;}6rN~rm|Hr;J!|AZU+
ztLWN38*Eq80NOllTr*m|hJlqOZWQ1tJ>ongz+T5Q8UIB8)5Z^RfAu!QbFVKsyw8`u
zh_lBkGb-RIxwjX+<edh4Dn^~V$9J=}KQZC1{R&j?#~tf>>4xjk!;~x~!8jpS3J;R(
z>p3MT>~Qep8FumwD<wW1zR)Mo7Z`~-M&%?8eQgJ}hQ#AtzhK-o8#0(_v>?0l-@z(z
zQp?@Q8`)lTv7u~$W9F_l4~1XC&rzVa&bujB_H;IxkM^{uk-kk<w<&H9_JDd;o^4>&
z+w7(hSR2}Dcjfc|Mb%a=WIhPF27T`;`x>ejLS$U_#B3wh!RZW@k_;&bXFCYCj6h07
zz(QRHCrautwM|izA4!sVSjTG)xURGeWlN2|0XCqqW146{PsRO=ZgOsc;xX})<2zE?
z(a0u53hfPR-(7@tDbUcwTJt%?i47PRNO`sr#950Z!|#Hff(8W~PkE7cW8}t@*>$Vc
zes#QU#hJ2Jhk}nhJnO;$+Kn^(_4AL`CMiWR?XFRz3B{3biZ=qUnm%<sAxXnrxwNsY
z0d*$z1!qANHMcH<>*`0^=(*!is=Ue@#w2Ybt9eju3cf|N^}rtRrL<3BmtypF>rl1K
z9uQg@7QUZQjyh$Y8+4S4*cL8N3lD$ub;Xu9tl9)rE1%jo$UrC7qLpJoRz5foqRooy
zaX-DrHnoNlw$dt}CiOAPCOm-+T!sSJr0*-~4XDEGCTm+}W>@R8K2u<Hx8Uh(G)!+)
zsghxy3-k6WMuHp_6{^Q_^jvQSlQz8^9{H#ag;+V^TfTfjIx#(;1s|cBzCSHPf^RS4
zHxmaL8D)xg@8-7>X6uJW@SfZuOVZn0?i`KdY<*j@kcV;;`@@S`LJVp9s^@ZTcbwM6
z3Ex#%Q30=5?8ZU^?f?eg4$En3hO(#uK*rnrf_+u8$!ZO2bXajBOcNESK@`g*9Zsem
z;mH%5iL*?GD>ON3(2EUZdPNc}Za1YUnMhe)p0ZH<stN^PYMTStTWV~B8Jc3#lPxog
z3=%SU3~RRDS~K4%x~n&G>;B-Pk!!jq<vPc^KwmxdgnA|9tuZx=bK&+?H2T8#kB<SL
z=%~JQNw$-I7WfVBAg4_2Fg!gcfE4X4_XQ-U(I_xIK?ei}Tyg>CgKaB7Rfb$VIy60F
z34uoh$ES)X6-B1c2pg4*C*i;y)OG8rsU7lt<Y?zWnUUOQCo_HUIC*+}53r-VG@PRQ
z!j&JVfnBM0%1fqPO3N&HE$HSbn3f7_Pc3FjDMhk9W}&R%5Z#;V*Lc$(nlV$R);(@)
zG|ObS?yUd!G-e(%@z5KhwjBhDPP*T&lcYbb%p?>mQ??EF#Yj7T^ia6YXN;#{mevQ$
z9`0UZT(Z7fm!V1wH`d`~bwH8$gVwlVleTX~ww*7GsQG{Trjlf^<LYzU7j+Rp5x)<6
zImv>rsZr`GZH_;Rlr{K9+vT<Q(7QM3XKySV|KaSV0?j&heaRZJ8%8LqjVUWzrqA+f
z%UC=-04wsnRpFA)Gn?EO9B9t|v+AWSZD#idJ-$8K0rdJmamw~yZlN6zwRlGrn{4a0
zol6km@qF76Y+#zt!2ywr9d#6R*P*8Vmu)xqos8H~h>~`^>lN6yDt^P;`f&yP?H=^Z
zZ6mid-TG)9SNm=|F$=5HO4L0qoD(^Z)sEcf83*GExzeS`rneWKP&ktmFa~C6qeky|
zI^Hc`>}oCfTie~o+jk%G9dvI~2@Y&}zreKl!_2AvX5DoVTod+&UwBwaY4&2-T=)6)
zrt1riHlKft2*Wo&pKh8S1g)zA176$5Nch`5<uf%S=QKWJZyjIzvYnWXHEI=Ne@nxO
ztjB7{rspXKAq5{AxVn=)eOt%GQOmE_v|<MI(k0T~WME{;2yiDk8U7^X6Jmts>^l&|
zu*qI1&ul`EM9>s4E-p~Pinl%O9qOl__p66sVC7$f;olqyR(p$06|Te9H@niZ1|=8&
z+-<D4YoW5}`B=ymyEU^t!}86CSAh6stQ-DCji=LPlH~zw`LuZ3!;E{~orYT?`m59u
zBZzmN$IDtWqh$8$31;YJ&{0VHxL~=Vi?GMrY*6~A$mioYS_mi79;@wX&jg1YO3vn6
zE%<#^8ykOcIP+eQ82iJje3?)CqyTDi-fHjjN)X8fe;K)TwuDy3Hu`wlLzOe_1>b8y
zi;){bTR+zX@Bm7?*msrEzR~RmZh9G4HH5;1+IxW9I-7TGSy_Nn-W6S4+*BuWEvrd;
z<?I~fk!cA9{p!}sw$1iG4QP;js}1cuz2QI}am|5^<Z4lq{v}<p(N0LQxiN+P0Ny{n
zl7!l|XBPImW3N*-*3!1PYRiMSKpa;J_>~!s&|RIYslmdm%n`fR6AeOKdOO4=Zv0Ot
zUMH;$WC*xJd-=}zMc?Y?KpxS;5@?+UA*D$jAd}L5-A2{vYX%h^>Z50cz}=V#9}Oq|
z40>7IVAlQlzOGkym~}BqXl#rUSQiiPo%{MfNB0L<&R*KV6`?TivogUm-OL704oI+k
z@ZxjtjJPubyt4}Dk*<;Dh8=mSsj>60Z(nOk<WBz&=K(hf43?Rmg7`l;YuPvOXe>sw
zZp!JrBX$W<J2?78J_S5!<mbr~E3hd{+Y|T%c`6wWdKCq@cU>Qc1eyZeUCy6Fz}vof
zH%&P1a2tn@6I7J=M#^Tcw$`A@L8YE0JcrfP<-8YXDR*tq&}w6)XS-DQckmlpHA&UW
z`yg3DHSW||R8TvJW{$+MqfT1VN2KP<HuAYKmXm^lNMjp3_Y-k6mW8#JyoDda)eECm
z+Go3Mifur_!KvKlEpQ3^c4$tUheY8;U7L7F!=$|2QN%%G1tQ}DIjyt+Ss1M_*tHE%
z@VoFX^oXcDE8Tkp>|Ny!kk^QN0ZP`2PqFQY;e_r$hF1p>-;kbe9~=7o+Hc9R5rMgc
zN=*NIE^&|tYT2#7?UsAguW#1IJf}=>t-m;~q6<blKfiW8IFZO`XRRgr3bTvv`9M62
z+zhJUOdZs}x}yv0!>DIHt$2Xy*7LszafLo!FDsY&_S-JGad`6ay-LcZs0pZ8x4~<8
z9NuMra!=#)#mtMWw`$%PQiDAhtixC3%O=h$N}qiu2%lqX$K%z8nEsG;PH+By?sT{M
z7$JVcm`qOH9u%<|K|Xy#C2t%L@xfL$FgjHHm&9S)tB<zDZP&E+PmbCE$|6)26AX5i
zqdE_MaQM!lnUOW^+3zPxzCOeQGo9nm(}`HPlv*KQT^_61V1pczRrSPsUs0QEpe3Dh
z$O-}5Q)^B8<{nF`brZIq2veQ*yB_Z!r+cig?&$&?I~-RrL#}@X(GP?bM-YoG&fhD{
zrT-2Wj?wFP?s$C9@Y4hEIhdtr#jF;`E(8uJnw}hD^;YcZ>o(Bc$a=`)1l*O+^%MKN
zp_>q5Mx9OuHNkMOTmdYX>g(<K>1Pb~9;)>?Q?`WVl?ZZrqc}MM{fT%{3aX@&Leti9
z?Q||;%!QV>Vgaffx^&V%xo29InR7y}Ui}>&ETOWK&-WmF7BzDFU9t}p{hv5kot7>a
z(S=IY+DxuZ!U%Y$j^9mG4i@%{s|c)(F_9|Ki(RB;QY$JGSlRopIhcIgd))JHp3t%h
zSLJh{Vq5?0aKAd-<9_|5cI(!s9j@(la=m_9+w0qQ_>-GgyI=0^-1q3+;U7K$r&bjx
z3qs@W*^>V}n^@nuIg7ZzSoY<#S#uSeb<q}fV^B-)4;R}Erii&mBC29F$&vD%b}WV;
zw&V!1xLtO!Lu~r$?oHK~3ZeGd$Ns&W{HtxSeA_xyw%BnTJWT@BKD~IopJ42{A1Zvk
z`;6t)-R*vNkaqgwigWEdpWMIP{Y5gPmzhiX`<D8kF!!?wJ$D{Iot$e{ecL~M0s?*b
zUWeh;;p3V&ce;0}yD6KU_TSs&6X!^JB!#l;&jHLnN`tz`M7m_ZKlTUE{P}eHxK8@x
z6%Rs>YCp1pZdmg~(uc^1@g%b)XX>2(=ATP+AcwWwP-Cca&fkaFOhFr!R6}RBqUu(&
z(i1|yjZ5b_C+d`jV~iTIsKE^p1X2sJrc{8ll>U^wVVh9n)B3NEftyKy5}k2>cs5Jw
zIwe%?HA{uN6=|LRq08Q|@&2`v)_m5o54na}7$<65Ei+;yRd?-Xw$9aID_dLI?H$2(
z{mAw+0A&Miu4*Wc82A2JXOy+#_j4hxu6S9}f3Yc?&8Mvgl=9Uehs92-8ebl#B^3MP
zJ$j0}3>S205^viyWu*2kAdDRSHZkjZRc23XrtAOrd-v~FkYs(+oY?mnVskcGRWkX&
zx$^~PD+;D(?tGZAzGLp1yinX1SJ@Ld{wwHgU!3=D>=ovQ<J2j~jh`@M3J>mq<-CvW
z#<rjIYf5WybZV9I%RcB?_4HjkQ=_P79h7|yz(n1%XeOwiovB1*>j3A^i_<U4>u(mY
zj9ZJjhSB0il=_%`RXx3N(+w)W0;-s<){Q{A>0=B>MlzW5E4i|D4kHt;LWQ9&n1j4|
z0N(3r@tCm%5_;wHoD^q6g+!EkzhHT3MkN!)zX{zmx)d>|PwBp%SkEv9ib*x{HN}+~
zqIur(YJJ(zIP|nUsKa$G51TT5-w*6^+52)r8d)_L6>5hD>B(XCy}>M^y2MQr``|{F
zW0shkQgmpN2o1LB4nhetu*|X;G|pGaG=_?4UZ_P=%SDBzq3;WLhrfo507bN)wjgG4
z<ZORmv#NcpieBPfbH}Mh!Zp(DuznBM?O~d<%(6^UjoPZuj<S8x;)1Fwe`V2Nhhse=
z5h8Qx3IWJZIeO=Zv3qx3pY8qN=X+znzqnBE_3R!V@$B@PI(Lo?ckTu%78~@L9u<N{
z{+fG{S4t-KiCux*Z+cR=TqjuLs4JxtdqobPK48J0S^Y5AwBbqY(N3*WAGG4nu6?+{
zyy0owkuHt$Sy^mDQIS|>$$vcn&%qE&{KheWs(T&ggn_|Vex@MW<6+k}REDdVF@Zfi
z?tw--R;k*{Q&Sz?ryA|PQ*!A^PrL5ak$we%P!ioF?4C~V3xizdKgiV&r-=f{g1WXg
zD<gt#@=5|bC&r|m6yHeP;YxH#=q=cKWm+J3O}sX;ontVc<ZE^rCDH>-gbD7u9j|J;
z@O}$eoUSIprv~`p_r348HU8-?1mc-;H`2lQg`qx?6gZ>_F>^vJs!O)<xvE~i(UoO;
z=7r|2dqwK6;@D2w)bDpoYYx@Kjxj(f8@So0_}h3=mvQyW*V}<jW`E9?{ri7iUj4sG
zjLLDULv_axbUeDfrOhV{vnc(-{+$<lc@Z{ks9D(9A7O!^Zz*SQoId{5nrqsP;`si<
zGCqGJsvf9V=&sp))gA14Xn^r@ns@Q#n!Tr#HXAUwa=vhvG{>A9zZ<Mh;}U+*7d|!B
z$8G5E;Yg*7If~nNdMfmuGt#ZH^@oi{ynAh`Xg8>3=5WpzzwCLvL|cM6j5j+jxr{e$
z!S+Xwwsei&@5}w$cv6*d{>#_fhE_>GhdCq_vIi0zp=^uUI3V15<TA)-8mkBqWY^`z
zDw?$##6-k6Rq)1gk<L_koW#z|B&8jztUPCP%YSo-j|0zaDYxRoDRDZG|H5#%(Xx$r
zc&5vIS$SqzMQ+}j*r-yj?&Pqmv1CnNdMYg&t}ugArjK&A$@53kOY6`dxqI`{^ZBZ}
zqOw&EuR=nTO0kkGdYCU%_?sH?KR{Oga-o>q*#bJeDw;uLuh(gGUi23?hCv~dwpPBW
zW$hBeD|rpb&D39`ic&JP%~=>!hZ(-1exh;pmTZrLLGyV)K6BZ<oZyEKZjhCXMMsl2
z32u_pOS9El968XURw6L4Y>!8DmMJ5f3j@z2xTB`-TVnIKPAN)10pGR;Y+%+NIRS~m
zeRa(bla2F=L}HH!myyF?_<@5%5@K?jpn?o5@{WO5g~!2R^h6l)OUW8{w+MPbQATDs
zxSlHKFBwV5VqGCD&CPSl$kgr@yVvJ#ZZVHs5f&iXG4M310EVU~ZqD$G$pxQN@Ad4X
zmlUi&Z(VN%ssv|?zdF4kb#3CVx-JS9g-RrBDNAE;o3@OlwUr%T*Fy;TL%{_@mSEO9
zw|ziV>8~o_@(rTXiPLGKyvZ+LRmVMNt3@l(Sx0B$PSbx2TBil7t9oRbb(l&mq>}Z;
zBE!2UTp^qO+`X1~^omlxUoEWY;EVtDg2~-tZ7QHz;DKda&SNAbrgPK?3@V{MEV*mp
z*#-?3RPFub&o8BT2zW1rBG_Y7Y9$ai%$Os<&ws0m_B^op_htOt^18Jx{vCN`Bae^t
zFo)&xISkzmrmOca*!$ifl|QC#{vO@ff(klKxYZZ;-oKYCe@)%~^IN@zkdw1+#ro5@
z_2A%)V(PvYxfkFZo_XZ&T^v0d1y84G?YscjqoFl-&Yftw2_^soLSD1(#8;N`r{h)l
zOMj>v!~X8!@E79s2hRwWcir!ZrvYC?(AGHc-agWEg|Ew@ef{AaoQHF9KE8wR;k)le
zz&egRc<<*I1qx<6KHZ*<XSS+TKR$TX<L^ee?0fpHt`bPT1veABjLZ!v+3vIU*{56x
zHwZ^$9cQY~>MQlh^1X6qsm^8XzmdaK#KC(%y;Q20t@6%cyF&BBgXcdY!Mhni+}8!I
z1gHac&_O-0J&~QY(|LWNK1ipt@;eTVM|M6YrwKVGYP*wh>3PDVxJM;{z@k+^(1|0G
z9{42o7WFSaB0#+fhjwC~B;b*^T{F+?!sVd7?JxXk7(XU<od8adj=*aTAPiX=cY}u_
zV@0pWio341=chj4fl%!Kizc6qe(oAXe(_^g>aN=lN*&|BBpVi-`40D;ql;KaVW#jY
z4JuJRM#Do-<jD!wyL>{tSTR4_cAv8L0TyPW{ER%VF8jP@s`b+wr7b-#j%>-j+TF77
z_P=(cI#LI0^~Vj1#6OiYnfb9a9lITcPGccrB0aqgoLF^Y;=?oR>tkj^n1{=u<%KdB
zIy}RoXyR!kbXaD*#Ld^|DpwxQeZ<u$dUA~wVqS0%FOVjv%n(PR>ECJNmNJTlRpNGr
zdv|{aZ!a&B<ljtDH_Z#G|2X=~w|Y=@`RdSpn#Wg~jMs5)+;2US1JL|kwE(r)3ud!H
z>4)*B##eetPGePjKF2fIph49$yYZ?`=G@6Nwu#B$SpSw}-4^RQkJW26$r2^$l!5bA
z8_{EIZ)igC8b|A!vltuu;{{#~8EwRDz!sqz(<VMS;1%(#<d;=vGRA5oX$|w&3(?38
z)RP#XVjWLRJMQvlA37ws!`o~f={W6%$m88LD^FbTta#kHBl2X|mKFGeux;g&<Lx)(
z+mymvz2AuM>@L!)dmR~CU+LOZCXOH^BcdC$1<@QVu|`c?ynbW;M$L|n+q`UGx%a9<
zpSen}Df_%@xkgv8)%1K@DX!LKA(9^Q-~B#_l~xI7q?djVzRH^(RnJwAes7{FKVW>o
zP|&QupL(<U(uX%7pqs!@Ti61fk<n;13fNW)J=Q$V6OJ^?gvoJEvviarNXnW8BcnXv
z8qI{suY2Uc@8-V!?fEdbPeA49Wjt_u+Myqrd-s@qjDXtI_g}_6zBC!1oZCH$|6Bl9
zf_g(FLdqUWXJrl~cXunb!N8G`QlVg^cw4<+ZwdrzGW3#@4W3v;sqXHc94!={b%<cO
z%3(2cw_eMf8kVXQLsG_+R?pZyBnDnL`}9k1AN5cN3pZ!(HQNKjeu&L#i|`sY;@9=W
z*rm8Ge%tX2I~MQQz00xaVAU#SAkPCeDjl6#A&H}kQ|M{fb<qTy9yh46i}vo3w#@4V
z&sQD2>vw*>a%UUTK|{=SAzNems~y5s;jO>DXzLR1FTx>^wexlb^IS<I`@~Y!qM%K$
z(g80y73bLz<Y1=?*;8?iM$zB+|Ano8GUaSTgSkyodgI{6gWS1R>3b^oh|UR4=eM;e
zWhd{OCW6-pluBgnc`hnQYu0yBtDV(kxYh8oni*#=n2o1@qWaPx&+Y>53nVQmMDo(s
z%^>_PEuxGh)@2b`+M*EMTlDt{h|l?9n?Bk*oES$$6A7?ad*9*Ne$?iP1Ok@4ndAIC
zrJBd$2qcn~UW@lxfX3ULlLbc{rf%L3--)1!VY$-7xC6eheE{bXHk2xFbxvNe_kT^r
z84<0`YCd_kg+O%dt<P@>Z7dw-9)93_Fr_!#+msmfuwAot<IP9Ifay--dEp0H>dYb@
z8%Juw6}pWi5xx_C*{eAtkH;aDouSwRBK{}8xW1TM0}em&T^S2pNuU?<#R;DE1JrK4
z)mH)O^Qa`-7L4EG?0u`(P#Y43=(y(M+}PuQ%h12|H1ir`g6?|1vSK(9SCOpM>h(}F
zYA6|3KBCjLD7m}{UnB6a`J7IPjO&Lx!tWdfDw&6g>2O>5n=7J$1C%%YAodJzuAQCL
zf<5_p&_64Co&X1<x)jU3;e&mV)hn@8YlsgVE4IHbCgLM>^&C60<%aK5{VP{gB$qY=
zwda)U0qH!;X)6Rh^*m`>-sE<{voB*dLd;p>*17j0@ZC}DF14;$Sz9x;c>&oDQ;<k}
zB<$QhpsMHEfzs0pmB9-&E0$`C7w1{oU3Ksu7+*vYv%3}+!$P8ogMZJ+3QwQvyA^Y^
z^<X9a@8Ppasm6^X%qy3VKC7AYl7rsgD#tIL8n4{F`!E9;i(DzzZmu6FuJ4I|syCK0
zIr9UeQt%S5S#9YI8e1?}N`2{%L9_>tlk0gb;N&^vt%2n#c`-j1CdfKHJfJo`d`CHZ
z);X3><dp;K>AF?ro#ZsUdQasFV(sjh<WdI&QCXK-B<WPkq5{f5kh|QIutry1qpDf8
z!;sTe;X>7_uh9KjqASl<%CbW?b*r<yWC*%mV3(o9na)hy+H5KZLDTc?V8!%}EyHc#
zhbJiM#+O;>>vK+UQ(jI2sxY|F7dggk2)M)=G%sKT0sKy7`E$omuA3cB;=6Z{Z{v|W
z%r@j$3YWzwLnaVVs03_R9c@<%z*GPM01*mO{%p$<ln3b8qFY*^UqbV+Q_Cg(D-@Q^
zx~2tLs(2rSt%+w^KeV)NX&tstXldWlzNI}lA*mZ`Usf~S_=G*kT6(nfXz4N2BRxB~
zWpK;jmcilh1e0x#HAx`b%GPgasxEB%QU&5`A?BdskPzQs5|M3*I%Sj60R&Nlxrl5l
zTNe$QC@7oOD+tT@gylXevMo_pi$XO`OqjFFv&*x~Tb2toVN-(Mg9h48&;_617fuPM
zg)_og;T)WA#(-OSBKP8L@s4;G?t#L(?^+KaJ`@9?AjKiH`w)5(gFx{$=YShUSUJ!^
z0Il`Kj_kXe+CSd|G1>R#IQWTx2HE%LIsltG2!{kk9a-5A<~R&mG}lAO4s7b+rVel7
zs20r{1d<H=p9lbSwAt0|=J3v%vL6D1CD=kiaL#S92Sl~Z&PCQ$!Je^Q-L`<)XRtV|
z{saFD_C7xV@AzT7jmDk?>goVyA_|%q3-!0@<xFt$LKLO7G2XDDH54^5@Uwx)&VTOF
zs0}HI!hJ`VE(8LRiIb!>HECij)ZaqN1ig&H6g4rhT2$=-Y8CWrZYR&$U;-~GSXxlw
z&`#jhF?B6Xqhm)OHg&mI3yE6!pgw^7^$-?RWNBfGo^e`L^xsu!D1k};Z*CoJ>u1Wb
zRy3OyaG@tjGFJ<AXwlI5tD`7@MJ@ZGajlKpKn+CIVSqmPm^MX@SOYrtnT`Vk%pqnz
zG6@UE7~{w~f#@+*WLy@t-QG%h9BXyThn?am2uf^5ZU?ok!AexBQ%6h;R$aoR042)?
zzNZV%h>T=)C%Yk8CzE|VS-bJTCaXK68^{FeE_VHTE$j}YwXB;02%=dUK;vmeU63~8
zE&NB5Gr^9R8AkiqR8$;LSwmUUw3xTL9BYF%lrWP!0kWz79Bv16sT<kX*dF^2k#tBP
z00IHxqBH=+WdP#@SdEP*UW$6(`q7`vp&(CVl_)dcQZ+Vs&LMyIPaiwwtAJn}>=0fd
zicPUKPQ}IeIfmo6n7971>6x76c_M$yFAfUnR=yQftct9ps;V8ezy4Jh>t(&GIp?bj
zqj0DdP0@C=AKUph-tlNg5AU2F+mm}$KhcMK6DH#y#dqVU7Xd~x9OK^f>lijhi)qE|
zm98&7y!g@L7mKGB_Y%;&iMfmU3OgYGEdO_jvhK-zh6^jll^*4SGN4>h?k<g&E%tWy
zUiM-3C49p0YGs!D)MBe~*f@D3?S=)rbltnX<~c$W4rR$zdx1`OvFqI}SZ4VRhi*Zf
zyOlHCz-8PtU@wW1%7#@$7IdtjVG)wkv+{s+yWqNeQspR8E~*8iM%1Pm@_+tILtu!i
z=*SpnWQwO_2xhYfvsa-Vdyt1Ps?dlsSO{q2lsUOeGus$ufbFz(T`tV6iYckIvdXWx
zV!NR%C}gYl^~Kbu?o+!*I_7!r<h^!UyT%<3`MU4B$RlpK?~_mKzaHzom;U6}|3u=(
zXIvhr`KX#qaVpcCqmWuAHV>89#_}quvie%;ZlHG&2_8yC01Iva0I8(p>*rb0c`N>y
zf6rs_#)#65VT%vZ%O^elViG2xzMbSz`kDBiKq`#_q{JR^n~y1!&)o4Km>tOu-oFJS
zY5x&QYCEzQZ#Doz8lgskKES#^2DsrSKNVlWA7PzE#DdhVjFt|KmN^+Pb}df56W;@G
zZ?*3W3XQ7bG<?#K#=ykmH~gw)A&f^JVPwR|gi)65VgQx;%R8Y+=+14Mw`aFGpFrE5
zc_tnO133}mbN#<AUm<?2FCCL9h`Xfy^s6QR&#SLV-5DG1c&hsSuht(`F`u7{=MsHV
zVg;jhKHwWlnfSb3NeXo_Cv#04)_f0M<TJV}HQ$fuV=>i4;1k_wo~Am4d2=0QXy5fA
zvLw1q|IeaKIz8Y&N~1DC=$U>}xl~qSWNB3w?5+6z6ATLtVC5pNghNQ@quyH9rIsQx
zlfj2RR>)Q>`9RLSjQkD@IB+uy_M}z|d^z+xLrejt&%9OEBf+xBWum=-ekYX-OsmNl
zWf%}$fMft6VNzs>SUF(PZv|925c$j&45e!n?q`aOXTs-1C>Rkcv_SC3SFUe)%GdnG
zKJDIc;QO64OTRS<vs%Wj%mPMSM3$YCRO&do<xYQ@+9w8p+OQtq*xk$Jb!0`4ipyru
zcvV7JGTuWbnFXFNG_&kRlzO8d&pC;RA2;ZK+<!nuL5B%Q;a4cX7Hs~Q@Kj3{=p0mI
zU+L{<w$pv^sYj!muvJER-vgt>*BKr_@&NkWX4g3i(D*qg{Gs^R!ohhvJJK4xh<BV4
z;f7W5mva<KzrxH!em$Y&B{rvK-4h^RQ0`~hqp#jqO8d`6d%{NW<bbME=)h}cge|17
z+4$y(%q)@t3QDzs^Zbg-iBBPOIen~s{Ks`qmUY4mU9y++H7M!=9T#hgKk<GTIf1T8
z+?x4ORE;-{hfa~w%#jLVNcG<EQq#0;tFhkQJAGYNHCIEl6P3VO_#WC|7o39g`e8aP
ztJ8OCJ_$yeaqoo4T`{R|mt;iU*a)O`);h@dmta2jnYIV4LshbRRc3uIE{-DLtfojX
z-6@zKrLeh~<i~>X;N1tjGDgNHAZ=MwHg+3GUO;Aio{=)Zr0ct1t3G6VW{EOKWZ8t9
zypsn7oLX}Ah*V|_X&g<4>)ORm7pZITrgCv{$;YSoJUPRmvP26_Ul!ebIgn8?;VEa|
znsTVH?0%OT9Yal?)N2?@8|ArH(#?9w^(7ZbtPR6Ghv=?sXmncwXA&@n3TF+N^8_fY
z04xhE;YwU-&quQcI2xO2Iij(2M@A9|Wvg>kSj(x^HDt|s$C=wP@m>Lu<%b+_4#K({
zt?>cdP`b_zqKfjTYCWp|kowi8ubrqBiCJ|!KG9{9F7B5K7sFw0?rR4m9%o`n;wuUp
zxFMD-(s|pal6`JRd9Nck>-#jf>6`Yd$UGmZZh%})IZeNHgcl(B+{JIbutcTcoJ1(6
z_)nO<{VK;JS2&M+cqh>8yM7$E94#w)x}BpP3E>NnIPO$!AN@p>`U$#TAkgi*Y>5iJ
zAoJy5PAH&M1e;JCe+}3`M&G%v#Fhr_o`V=&&Cc37*qu+<$h?r4=kSfkx{aEs)2S8e
zZQGjpAa*s*vGD(>-Bnf7@~Ny@cG1P3fALx}RRtB1#fy}7xHF)~Wm`0Jc|Yvrhtg<e
zv3jGXadok)u*70PsLIIkjR9P@^Vha3R)=0zzwEY%3WFSI^}wiy;cT#9F4NBzGRh9~
zLKvEt+>}KL3H4w)TTM+KH-<hOmgS_gO!YkWMMU?vGC1km@}X=4ayK;M71T0wk``-1
zgocN@H)I=KTzT(~!DnuNE{<Cpw-ptyY3CYCggdJ-ktuuk;KP!0)==?xbc-NJpk%FY
zr?9r>YrMe39)Fx%y%x%ax6@9|Jx5oochq}8hJ)pUrpcgX!$83<ib2L3Wq3w+k*2(u
zdKtG%d<A)d4ygr;DJu=Iph6wN$uVp_>gmV%8SWZw-QV*)1K9c!ZZC<d{x_{DZ{_ME
zy9)%jFp>tFR*cOz5Y3U<<#QsE($H4I5*h+tFW3;xWmwDf&-vXR*%<CL+m3AtxV|Fx
zT0ab*<Ch*E8*)~O#7Sw#ogr4Sb|HR1`y9Q;eKHA1RsxwrVV24K0l(!Am4h(V+K>XF
zWoxNN%N0#$=0Nvl-${Ee=gb_r=cOkimvDlBWg1#4yqZ(jJp$+><>N~EPB%89C`Qp9
z;F`Sgum;>Tyx1}fFMBn88Ln>AV_vUT6RZ<XO{b8A0z*pLw8eAS*oef>6}RXg1tgA9
zkXP+*QsZUtE&OjVEwjU?kGxwwc4+%j>8@7GkeLWLhea7T2;Ev|?Pd}2p@oT9`S?|o
z`?n&`OXsuG0BvfBXY`gBIs(WxVjO@`*y29*FMvag8W6Y`&IhV8V}ksQ&C45}_t52L
zh-!n?smbDL>+Xt8IQ?jYrNH-4UTFxW{g1aJNQ24^=RZxljHcdblY)8LDG?2Pk2Zxw
z5hdcJF%!;rg~F)wE-TK8z;g&_&>#$a121C`74=6rF;2CVP%vtzDOZ*DBPmPK(c`KC
zkmjk_ZGU{JzGTr}ZyYI)jDjN<Dvx!qp1C9J#M{1e`xcUWE^}o&B9X3F#s@W?Y5xYb
z3}>b14(#tsV*<?YmkzVHa~2bWKSvp@r2X00EX0Mj(|xeg!^ih}@gqREJ1lGsr2CgD
zwiGs2jY00)ku|{|K$PDl_a9H|m?rXR9w(ij;xoTSk3K&z^hYNR(vZ&>Vt!^xnH81=
zpx?E3eM(#cj;DY>CJn<zZ<m8vLT2wrn>6ECnyI!Q=aEeW^K(ZMq8bA+(<kvL^9wii
zNA;vc^-ACulBA@haej-R1|jGyoX%iX<@D*GKTwEta5m_{^WzqsRu}llBoK6n3Xihr
zc5(}yeeK_u9p>(>-BWy~{rdaszH64?ZxNvo$b=-G|K5Hea;2-Pj@FWDNDcH<H}u^0
z(%(_mHh`^f<RKb98y;P8F*XXc$Yv#T{bi?gpYnk`(=8pTQlJ}p=il1};cXu;Wq}oL
zXILXcFQHBXzINRVL{$3mvHjyx9&iqcgXei^0eJG`dJ;}iI(!X;UHS?skZsTtc8jOm
z3FxxM@LT^>FAzi2^SJnuy(tDtTkWqu!-Vp3e@BGdzoDW`Dw53qVB-ngnZgvu!<%w@
zwwuM{7(T8b>3|e?UKR9Awd0PWIl?gs3^p;jY7jH>uCPA7&o7}VTWpb6z^?3(z<f3u
z1)h8-`|W(_V>mDzTk(`^*07woT&I^;4xQb`d0)>tUn_;7b|WA;BGd%M7%DO$th2_Q
z8?u1pj?mvIr4M0<Hj7d&<MJj?T$!jh6TQsQCw$dtu&z^?8gLy-@heJ~>G0I+_ID_E
zE&&M8ln2><o{Sxkn4Bz%Eh9LVhv#^S?k=o``DLEVnG-=_1e`38h10kCY{+8$@T*p{
zxXA=TvIVzyfRMD$-m2)e7T?R4!thn;7OfCTH?K32&u>(TQ0N&WkW9^l<%@rWmkZlb
zOOb-2uL_0?Ue)GAQ(EWI8%vRm$?;y-;?COc{-Xl)98V69AY(`2LTfS8A>2{H#T8+k
zKpV)MaD;l+q|&k>*-`qCeT{0wvusP(v`N{Zu<I|aSTj2pNDEVV$9EhoDZhsed2*h~
za2|U@wD##zHdc+Ut7s(1z$=AedH#QB0IZqjQxQ-3OR)*axL!=5ODHWlqr)72vGEqN
z)NtSd9j1PyQ#c54yxNR?E?G{<*yjXy%|9a?9&H-GmmQZkk7OvK4d&y)UG-M4%ZhGK
zD^#e;_9O9<Z&oRe-&FEkqISNlHznLBXz8k|6RxJ45(%*CqVtWpMATG}Me&7CcZep2
z&Nsv6{KCx()IYz@TP2l5Q<PHne{ysxWs$2hN%@^sRzvvg_K0?(esCQO!2n!_8(<`R
zqHb^#TnEE&6Bxh<bplBfyEaaZa7(hcmVTG6zA*X<$xNgF+wf3yS3FgQaMpi{r~q?O
zo|TfEk|nP{P3p=ji<D)h`2d`MwF}*BImL2|=^8FR6A~4SS+PK+E-Ni8X!bcYXd!~g
z-ghzdW3A@o+r4o5>o(9lP@h7IvW-xJCd#Joz>4X2T7KIfTV^zywOYF!1m~rFv0R>+
zk)16mOawkS0N+7f3=L`$M^{O5a$lI^>2alHu&P+RSZ>Q6oh29WMXUZwvvE#4P;&+f
z>KEu9IEd$~#x}wr?v#g(Mx#C(9|>%GM>j)sRCrE)ag{IkG_l^b?MYhPfVCee>!mQj
zhqyK6ns(9)E|evNsT+b?Z8V(vGCDlpFl!$k7h{BskooHPjZR9sWgP+`c3mABc2i_%
z=W`t+4;z>ZZx-NPqnS+yI-nIkI)S4`gW`_4PCV0*3|5<xG)LDp_iwOv=$@4z+;Gif
zqbeDJQw@o?-e_iQDPR5nsvp%Zo-I8R+nl$ol0dW)g#2kosF2oB(P1rI$2$JF?}IcU
zl!B|=zL4Ap(=%gW9H^LJLEo2s`R~8fbXZ?jX1ugy!J1(UEWaI6Dpdxg??%eNCoVjJ
zabx2i`N|5CDf!&4NKweNQsz6{K#j(+7}}h4&cuw%_*I^9kwT_p;(p3wY`MY|jf6O0
zB{izXd6n#=G+6$mWst&;v>c$&_9?(6f)C0({cW+?)6DEUi2}}(w>L6mPJ>tb#f&m%
z0*BRIo-8s_0l|_4+O~Sy=MsbjES-`mR-vZByp1!s{`z?DG|aN^1@KkPOd-o$Q#_uE
zQCLF282hj|_6$~e{-MU&eju`!w3mpFwuLUlaqwLhk+z*#=9@oUE_cI*!v&T$g9hFM
zOPr`nvr}dSQSIFe%C}Zz1kuCVKmGC44HJaI_<4xeJ+2k!FP6!g;F$;)ZA%0*^)g?!
zE6OLW<L)&H7crw|v=9%C8D}>IA(z}2`+;uhP09)2$PLq}A;uRhdO%7qUjFa-iO#Aq
zkqg6uX{gS~wY13s5HZO}<mDm}G-9^+)z)Px3z&anKpp_{&{JZ*H*4x0X*HeUC7!PR
zH%6#8<EQ=>-%T<;9bV-%TpflKcf>vP(D@1~0(Wg<p1>L9*9N8|4^Cd1V|Zq#wih9h
z2b9hFUf!tkhEI1_J8QzI1r2uQmXU>;Fz(7}D<)nU#3}H;woHYNDr(T4@!{bXMpSe$
zJ!w5x;KU4Gcd6E4!d_K0uI;?#;%7`?xc1M;m$yurBN8>L0->tCd*=?P?cq^%JZDYr
zyt!XzBQaG-%MP?~I$D(6FlwY{)MUWRTEoyTRwY4MP#P)j>&Vp`Al?x}lC2R9ise+3
z)@hN}G?svLeKi`_^YX?5Z+@N8kiy#Q^bfgi10aoG{#!1+UDmum=BHJtOty&ac=8IS
z;A6cg6I{&IyF3@7n#<A_f9X_QVy?SfvV@x;Ji64T|M*&-9q8|*aX<C1fSbHA<otcz
z=z|mR-6EVjtC2Z5W?Gg^$>6Xl%9>WxsMID`43fe*WA;0#5td^!#(TCvn57)YD2pbw
zUgN;Z3Cvqd(}p;BM@pyr$GI~=H?O(qrk0X0IKwkT&-cNST`9PDYH=8M!^TQPwLpf`
z&_ycebKi!iAtIyQhQRHbhh~4g%HlMYHx;s@W47cPvTeD}@ifmY`pE)gwt3Pnoz@tq
zqVg*ji!)+RNn#m6Tq4RFW}Grd-ZIR^UrIS%u}EnWw>n!txFxJ=C&BS7g+o9+-2jj0
zJnK)ww2TLQ!2=!IvmXAC2@2a$XsoYg`6;_;Mi#L2Dsfb~94VcFVbO1}lqFPRoFE{_
zu}q*7?KLzGJ;BokWyyjF36P5I7=Ci`Y8@-fDv<Gtrko}XSeGJkUD0o_ZVSM9ul#2`
zUt<m924kw)_>QTkobJ#kXdTRr2YKZ>7K|-TMwTtPX5N#Exade(MhgpsX{v3US)Iy=
z7|>bXHm3L#HJMn<OwzfA%~(Sd)|5`CM^QMM<2-Ioxz=Jt$0{!^9E?mw8W*0Ou9abA
zNFL2}ID&6PcG%1-C7cv!%_iMEj-M|pFv50Zoq~`rkl;pubx3KJu2FX@lD~e`lH6K5
zkqnsoO-)N_pPZgy|MT6f0_=kX{2-o!sP)ME9}nQF1GJDNf#64IGXFUV8D2AS&Fk<Y
zLI2QxnAO24=``uQ5MzQ+XuB?NpjYp7>WBiM`j8P;>T<_wY0hXkLQE;!|7&L*&n)7(
z9(!O0!swWKrlrcWFu8{-w+&vryGxi*m<Ws-h&q0|u)OEB9B$P55gQ~?rH5ezZ9?r&
zG=Wi%7&p$a*M81AZHB%vPBL~d7N?;mDDsdG4`ipS)jI<%8A>e;!<uIb%O1bk2q@h0
znyYSQd5S$7-pm_4f&3#;L~W$Tm_^xFs}Lb=fPAzcjRg6K*tsjpaX@XV(z3`iIsQT{
zxJ+a;7CJO*4zi~0mcnK;N{uBAIZ=c|?7gTFRXpP~+IyM!_02^k5G=RV-rz)5W;e7c
z^xS%fzPgJj1&QpEnZ!5&{0{^0ak8Q!VX5nug4)7`ay^sg`(aNfQ@Tq$QqR@2*CXZg
zrFzrN%Pg%%ZBA9I6}BN;t6uZ@!Vg43g6AaMD%Vvkh*7PVt?D>~k?T0pL<LW`Z~0<t
zk=dufIIYLaF}^j$AfZY#IE=sUi96Vm;-~+YD&?>Xv}h}CJ1oDV9k-}O;MAD3oP;MJ
zyt`Th+Aa37ll>m>r&YJ17;|>?f=-3zi+8k)G>#UKP+2oZ_`VLd8tod6n!DCA(ni)Q
zQKboC!`;yzi3doKg!lLupW9in3~({veWZT&p~h*_(uE5jo!Wj9FwdJ?$k?61GZY;?
zf|u$b&5@Jew1>c2f4RT5i|dTtOA%YGGaZ(vRlze#u&|XARGj(h28pt+H|lfjy|d%B
zmfo;sj>oU9gr4t(6=9<)qibG9O@c7*3(MG1HupV1YHt}H6y1o9KT!So!*Dff+mzGA
zh;mON;duiSLm%O0B<+p4pp2XzkX*<oqlWwoGneVhi@nKJ%<b!hn&!RLX*CQMF+$wQ
z%WIfA<gp6#S9EAZf$7=I<*4c;lq%nf3Sh1})${u@)-92L@a4!g%U3dphv=Cz7W5#^
z&%!F_i`@J#DQ0o^PqYL`Leu7x+1;9t+h9)G7f?49VP|eiDMPV-V3Wp!6Q%JbT^Tfc
znL*|=7xT-aP0UN)(p-VwHK@hBb%bfSEI-*VR3_KA<ElVmA!7a}K^TdZa5X)N&taiY
z8~I;-uQ+ZLozJh}$Gu~jJ+4W1pKcoGzqgG8>m*mM(@!746=oZS^rmqZO*xs4!CyBw
zgB?Ym@HDp;rTIh1c>Mp~HY%c3K-Lc68XMh$-a{`mG+w6BH#9><fNP)ZV-E^B8v!XQ
z{T990c__c6OJFjKCYN0>sSGTaPEE6q)Cf?Z%RPwC-MBZ1qEs=KTXZ<RtMn!`MHxJU
z(dbx(QI;ywE3g4kWu65IYl(0*mL;*>D?bNgd{Hp%p>%b1?^&V|m?H5HCa&5@^H5)|
zng*}g-oATd>3KhtQr9&iD*#Wd@K@J4rOEa2gp*TfMZ{C$baqT^XU3;mW<pJ+Ws_i(
z9uL(9D-D;c=V!)-Sm<X@7wA})GqGu7S#<{M^Xsdk$qsw*LWzmwxF+E)%hOC<77gW%
z=V|O?_vuwIcOd><*q*VyQg}+dh+0jdDv?IK;gq6MabP%O^R5eCUUcL^`Ctoq0Hv#?
z@I$m4`l@7_J@c5Fm4c>F|6H`ndSDN?f3VJm4=u&}(aY~f)>wMKdIC3Jlreue!cX<U
zdF=n)QU5{)sgU1Z4S6g#mG~lCTAf~?u7z=)^T!nTChN<gJxRwGIMA0&cS9Dzf`*F|
zZ7f#WW{~fEn>V^mo0}<D*$W!7!rL>J1QEe`xO_m<`&KL;w@rdv_h;*ZCabK8L0lfo
zN}|+HoR#9P-D#`z$L+wr6sydqol7+_(Wb7izbo=Y_#|^i$YT(fMJ(@XBPeL3BWP^X
zvhtDNi)tsTJ7~m}K;{|y>FPfWv>k9Ok7@2{5A0-0yYvH5{6uA^+`~RX9(;liyc0ff
z8@st3S-XP{MK$@D{V;nf|1VyE)~(!S7mJZGcmbu)RIX88mr2pl$aj2=W#vq$L#aAk
z<}l<Z5!(fMvsrD)4C{?_HX$1$*;pznG&lnF6CP`O=%mDC&-2>j06DKmEn(*nheZ%{
zQkY~ZJoG?y029u~hEHURgC>#_f;f@DkiUPZVG=BibXs{UoCn@~@rr!qf$~k()=%OY
zvzV^4POq2WF3OXp;?2z+WU>Tz`Uh2@^6YaTYL1i_4N)qXM%1JQr=#&qy?b>$lrc^R
z)bi!Ko+dq-?@1Gj=SWOb8-XXlJQCHEjkXrMk8$4-J0oy>+@UsBW-fkvo$CO4J6U8M
z{SdAcinxt&{s@Vg&}Np(ZooE`PFFKv`TUJA9-=W|fpTUZ<?=YN{oophY%$GF?TETS
zW?U{s8VOu=Z}$Mo17FH?xSPB8FpY1&Q8W_;&#%=3r=SbW^w--~*iKD@Ed~k_z*Az3
zMfdFn44QcJWeNq4whn8Tz}S>0QQ;+lza>kR6t`tV!$@H(2a}F0-(aX2k&-BXx}8P2
zCt_Kr-2SRvDq{SeHofP|_DiIJ#u^W(eT~aCIS*5_a?FTEuidzMDO3?rSyffhF#L95
zR$kS_)Fz`0k~qGA!pI`J`idJxN_9NP&KxT3am08an%#edp?qljBEG;s-VJ5pi_Tfg
zfmf|u$M=S6y9MWo=Yoi`RkDz0y)<^5BjH!(Z><kdTb{X)6n;l=OIX|&51?W|nd5K^
zSTG8(=34s5V_+f!GN|7(CT3;$1b<KjPHzgg<gNVUR05M-m+jCuPTvX8#xi9He5Q+C
zV9=L9DS*j<MkpbF{G@L-iXy%v{7`@&P8`czv~(*Nm-^lfOFTHZvjDYD>W0)4=FmYM
zVjp)%#xJiK`)%Go)dS(R4GwAf#V!+A{IT;E1+?^yhq~pvmdD9!7Xj10;`xh!YW2R%
zdTAsDQX>|SdVp2UXr_mDu<#|R$%JCZ$S8b9_~hj*iiCM8XQZb1d{D1X$7uvDRccXl
zk6{ofyHa#qL^#dyjhj9M;;X0MCxXuKx(gd&Dodu&Z(}h8CG;IbKL^Hbe&|>ICf%Nb
zN0W)|ugLn$M8PsarZZdkBNIrVYQlk+>IUA$QJBUXXL8A^v^@$=(~^X_mCkrbR&-fI
z3b3y2dZ)EW#0wVVmWiMKGXn|<dvy-ZOd;^$;ho6y$_9j018TlZ6(e7-Xa)%BxJ(d_
zPHIQ^m+J}?0p{=e1N)#qq64HS%mF?&XsW2U%E+agRdhbX=oh}Hmc6TQ@^^<fIV-_~
zYJfO<8`Sb?+TU93(q6SNBe9nUI|8(STW|O?OgE_U`6Gt+er2hS0~+@2_j4Y~z&{@j
zkUQyiQNK&hDr~$z=+gd<w>fY9&}WxY>|%+9d__w5w}VWGB4%YCJGE%JP5d%BepC_H
zKa~qBIiTgy;;w)MOaJ?i&o-3Ke9}z`EcB+$zP@n!iKT(E)I2KTT+7SvLDqL<&wHn@
zWl{T<C=&6{lj)9#&}OTr#;$nlGiMamJ?05tBC^4ATT>ubn4U&wSXD6}^p5F6OY?t<
za@mco2YkdK@pi!>GQau*vs-^Jy_h(5*l|*_4lD@}-CLQMuv5^%Z18wlY7A}QQ`;tp
z!ddaXXagG>N^dJWEo%6@{08Q-BKuZ@tX>PCXXOp|iSQ2MgZpPc0bY&tzdsq-N#|?`
zL$roC%_l~jRvfxu8siM`vX6nNj=W+5%8&-WSy9^V`f2CqBXraBF!1STAtISs8*{Iy
zM3EywSXf%RPGd0{v0iV`Cy-82&}A@0dKN=S1ckxf-6U}X70F0zsyaMl*1yYI7v_hf
z1L_UoWu{Vi2&;KU&&@MuZrut5Qg1OQCnrB}=2BICeRqR9pLNzj@v5Q>i3T%%SqwG>
zf>Q&N^T}^>YFr3>5`8-y@}_e77LZ%OI#FObF15n{{+32E>jIyk6o}kcHp;4pHn~CA
zT49j)=j`goaW#N1mylpF-=zTo1JIqPGgGzvBdO{{B4r!^0D#wS`_F2#!cTrISbjLO
zCpRm@m^2S1f!1fW;b0<3_K;p+X-}+)=E1mJFA599SSJBvz-Z0*e9!u=QPjm;Ct<P8
z%)l557=iY=dL<}94SJ!2iuqmxa9~oLf{s@7B_mo9?2B!P1ZV^c7REa+1Eqx-t4I*h
z+O{ww2HK$jj9`GNxt;*}feoG6=fMOV5j1h~5gG6nTCCf&&<hRF2Ltd3j_syS<RjMu
zJ<t`o)<Ofm4nKx(!{+Y#x(J3<?te>}o8tv!nIrfx^p@!YDHc972Xm*cwE^ZYaL6)-
zt#-g9!W(lM_!Cngw!}~2EpRQzw7-Qzz~G^gEwqu0qV<3eE>Hm@B8AX`2FFpY7{yo*
zra%OJkPS0X9p-Q}&YOC|>Hr*pmy{od$nhwn<)e1I58!D)3?=mQdj3PP-iI&}rdz)~
zYoP*-t;Y-vmQC(gJO=RH0?-?(m&i}Bk__fem|5<tn~(ztpuz#b$AGOMsCvN=n1CR{
z^otBb;gAb7o`nqptg;UXfT6Yn1n?fasRLTndmw>L{ZIg_A(4OqK8?ZxYIAUaHV*K>
zefTT@HVRk*(v-0R#A)~=0DSBtTDc0FRVt*Sra{3#mkM4=9JKtsPPKfVE9BZ_lR8T|
zl*$!F%)Iy#SCwb#(5wuZJ~Y^}ibE+v(Ac9=7{n!2g+O_hl}5&k<Wq{1+n3fU7+GPQ
z6&_hhUvtR0d|9w0!^&tYg^<5OSXHS~Vn<hE3PfL-Yidb9T_K4zBwCvt01}dmS?CW@
z<g^oOXOF#^S7KIS@MZ>5vJy|qWvViD1%xtKOFj*anN%Wts8%VJwm~W5Rc$SyG&{>D
zSc;vD2@J5a59-j<98wFC7a>*{R%2*s5YEj?6Q|9EaNL%sc+v_-^69Cy{1Cesz+C?c
z2LGmTPM-7Hc%f4A_J2O|-8SNPzG(dT8+FHB_XLEfJAT0nFx>YCl|SuuL9Y<+Fs-gg
zzWlfc)Fy<Bu*Q_$i0sWm$%^dRm+BNlpj@mOaVlP1wrmt%?fbPqq*1LVB&d=U3PM*h
ze{X4tY_`=lTO7CDMQPp>ODFNI3{pCE>eX5=Q<iLRU6xZ@{VX9IxaPW}j#=5#s^p^`
zIfaKTD)s!&0|ByzY+NDHm6Ej8PJ79&(m_X^bk;>zDZ1&dhn{*#)mtBZrRm3zx%>?<
zka-IQNjF%AAu?Sp%TU7%H^MctjWh~`Yvssg1#6tSI0MNE?z-HxgB56q*2cr8X!=~j
zV}T_ya#1)8e$($K1AcbOX~V8UfyV=m7R_4iq}LeV7&dsV$rTs{e50dS2z)SW5QQ68
z-^taDTO3&9O)ycRNhZ6_6jK$Mrr2~PW+-L1XuCY}m&cy?yY*&1=<e*c!5An*nLv1^
zkU%6Qr@Zp=|L?o^Y{o<c4&vwPI<&&AbXtij<okc3Y(yUJsxoK_{p6U3iHQ?s?5|ji
zn9gJj9nmGTGBOj=DU&QA_nl>OvMEuKk#Vp?PdlOsOj#@1kTks`n#K^VK+*KEqUljY
zE1;T;po4&R1Oya{rXY6|1O!S)K{W*d1-Vnowgp~HBjN<PG=_p6g$(mhMnozyk&8k!
zL{mIFP^t!nLuahAr?${3tW}um`KtG7iiJ!g)~<ikJ~_6}TU~!=X~DDZIz!hoP4RLZ
zVT$EVD@J*7*>XMqk1gJIqjPEBO;E+yjDc85+JX_g4A>vXY1?WVYT0NxnbLxcD22|p
z<U!ac6H~FIqYHj{y8dv+&0H1|Xy_t&GH>VuuPWT0g(330bC&uf_nYW8Ec7(;U$CIh
H`Gw0BF8zcF

diff --git a/docs/_static/fonts/overpass-mono-regular.otf b/docs/_static/fonts/overpass-mono-regular.otf
deleted file mode 100644
index 80a4b839b76cf53992e7fdf51428d0194b48bf46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94520
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
PABx=cLXOA&yR`os%KIp-

diff --git a/docs/_static/fonts/overpass-mono-regular.woff2 b/docs/_static/fonts/overpass-mono-regular.woff2
deleted file mode 100644
index 280570a46adcfdb48ea30406090fb0e3a4673509..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 20532
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
H`Gw0BF8zcF

diff --git a/docs/_static/fonts/overpass-mono/overpass-mono-bold.otf b/docs/_static/fonts/overpass-mono/overpass-mono-bold.otf
deleted file mode 100644
index f8291d926d984f94367ac8d9edfdf2b4c728432f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95240
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
YzCqcx*A03%7jYbFlYtsf{%d9bHy>eJ+5i9m

diff --git a/docs/_static/fonts/overpass-mono/overpass-mono-regular.otf b/docs/_static/fonts/overpass-mono/overpass-mono-regular.otf
deleted file mode 100644
index 80a4b839b76cf53992e7fdf51428d0194b48bf46..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94520
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
PABx=cLXOA&yR`os%KIp-

diff --git a/docs/_static/fonts/overpass-regular.otf b/docs/_static/fonts/overpass-regular.otf
deleted file mode 100644
index 3a7c095fab33942b0597fcbd57fbfec815c9a2c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69808
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
D3Nx>f

diff --git a/docs/_static/fonts/overpass-regular.woff2 b/docs/_static/fonts/overpass-regular.woff2
deleted file mode 100644
index f8133b0e93b133773ebac59b65d51e03dd620082..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 38728
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
IKGdgV1zXGahX4Qo

diff --git a/docs/_static/fonts/overpass-semibold.otf b/docs/_static/fonts/overpass-semibold.otf
deleted file mode 100644
index 176fb43ce14a23251c04318345785f99bf52f2c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65704
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

diff --git a/docs/_static/fonts/overpass/overpass-bold.otf b/docs/_static/fonts/overpass/overpass-bold.otf
deleted file mode 100644
index 962a5d7628df54752943bc65a97c9aa656b7f6de..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 68828
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

diff --git a/docs/_static/fonts/overpass/overpass-italic.otf b/docs/_static/fonts/overpass/overpass-italic.otf
deleted file mode 100644
index 19224a86dc1d636bfd9aa978d4c776a2718590cf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 72500
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%0D1QGP88
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

diff --git a/docs/_static/fonts/overpass/overpass-light.otf b/docs/_static/fonts/overpass/overpass-light.otf
deleted file mode 100644
index b060651a442a5e7fbe9425c4a7f0990b8ec6636d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69324
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

diff --git a/docs/_static/fonts/overpass/overpass-regular.otf b/docs/_static/fonts/overpass/overpass-regular.otf
deleted file mode 100644
index 3a7c095fab33942b0597fcbd57fbfec815c9a2c5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 69808
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
D3Nx>f

diff --git a/docs/_static/fonts/overpass/overpass-semibold.otf b/docs/_static/fonts/overpass/overpass-semibold.otf
deleted file mode 100644
index 176fb43ce14a23251c04318345785f99bf52f2c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 65704
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

diff --git a/docs/_static/js/initialize.js b/docs/_static/js/initialize.js
index 04afa10e45..a20d4fce71 100644
--- a/docs/_static/js/initialize.js
+++ b/docs/_static/js/initialize.js
@@ -63,7 +63,7 @@ function buildHeader() {
   const skipToContent = document.createElement("a");
   skipToContent.classList.add("skip-to-content");
   skipToContent.href = "#content";
-  skipToContent.innerText = "{ skip to content }";
+  skipToContent.innerText = "{skip to content}";
   innerHeader.appendChild(skipToContent);
 
   const navBar = document.createElement("nav");
@@ -157,22 +157,6 @@ function updateGitHubEditPath() {
 }
 
 function initialize() {
-  // Preload fonts
-  const fonts = [
-    "overpass-regular.otf",
-    "overpass-bold.otf",
-    "overpass-mono-regular.otf",
-    "overpass-mono-bold.otf",
-  ];
-  fonts.forEach((filename) => {
-    const link = document.createElement("link");
-    link.rel = "preload";
-    link.as = "font";
-    link.href = `https://solidity-docs-dev.readthedocs.io/en/latest/_static/fonts/${filename}`;
-    link.crossOrigin = "";
-    document.head.appendChild(link);
-  });
-
   // Rearrange DOM elements for styling
   rearrangeDom();
 
diff --git a/docs/conf.py b/docs/conf.py
index 550fbf4b36..ddc3ee81bb 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -169,7 +169,7 @@ def setup(sphinx):
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-html_extra_path = ["_static/css", "_static/fonts"]
+html_extra_path = ["_static/css"]
 
 # List of templates of static files to be included in the HTML output.
 # Keys represent paths to input files and values are dicts containing:

From db5baebff889a09214b47d6f5b534f4c8c24aef0 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Fri, 21 Jul 2023 18:02:06 +0200
Subject: [PATCH 1519/1748] SMTChecker fix: Do not unroll loop after it
 completes

---
 Changelog.md                                  |  1 +
 libsolidity/formal/BMC.cpp                    | 14 +++++-----
 .../loops/do_while_bmc_iterations_6.sol       | 26 +++++++++++++++++++
 .../do_while_bmc_iterations_semantics_2.sol   |  5 ++--
 .../do_while_bmc_iterations_semantics_3.sol   |  2 +-
 .../do_while_bmc_iterations_semantics_4.sol   | 20 ++++++++++++++
 .../loops/for_loop_bmc_iterations_9.sol       | 26 +++++++++++++++++++
 .../loops/while_bmc_iterations_6.sol          | 26 +++++++++++++++++++
 8 files changed, 110 insertions(+), 10 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_6.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_9.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_6.sol

diff --git a/Changelog.md b/Changelog.md
index 38a8aae412..7a08269778 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
 
 Bugfixes:
  * NatSpec: Fix internal error when requesting userdoc or devdoc for a contract that emits an event defined in a foreign contract or interface.
+ * SMTChecker: Fix encoding error that causes loops to unroll after completion.
 
 
 ### 0.8.21 (2023-07-19)
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index cead3a528f..dcaffbdb61 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -328,13 +328,13 @@ bool BMC::visit(WhileStatement const& _node)
 				indicesBefore,
 				copyVariableIndices()
 			);
-			loopCondition = expr(_node.condition());
+			loopCondition = loopCondition && expr(_node.condition());
 			broke = broke || brokeInCurrentIteration;
 			m_loopCheckpoints.pop();
 		}
 	}
 	else {
-		smtutil::Expression loopConditionOnPreviousIteration(true);
+		smtutil::Expression loopConditionOnPreviousIterations(true);
 		for (unsigned int i = 0; i < bmcLoopIterations; ++i)
 		{
 			m_loopCheckpoints.emplace();
@@ -361,13 +361,13 @@ bool BMC::visit(WhileStatement const& _node)
 			// breaks in current iterations are handled when traversing loop checkpoints
 			// handles case when the loop condition no longer holds but bmc loop iterations still unrolls the loop
 			mergeVariables(
-				broke || !loopConditionOnPreviousIteration,
+				broke || !loopConditionOnPreviousIterations,
 				indicesBefore,
 				copyVariableIndices()
 			);
 			m_loopCheckpoints.pop();
 			broke = broke || brokeInCurrentIteration;
-			loopConditionOnPreviousIteration = loopCondition;
+			loopConditionOnPreviousIterations = loopConditionOnPreviousIterations && loopCondition;
 		}
 	}
 	if (bmcLoopIterations > 0)
@@ -384,7 +384,7 @@ bool BMC::visit(ForStatement const& _node)
 
 	smtutil::Expression broke(false);
 	smtutil::Expression forCondition(true);
-	smtutil::Expression forConditionOnPreviousIteration(true);
+	smtutil::Expression forConditionOnPreviousIterations(true);
 	unsigned int bmcLoopIterations = m_settings.bmcLoopIterations.value_or(1);
 	for (unsigned int i = 0; i < bmcLoopIterations; ++i)
 	{
@@ -427,13 +427,13 @@ bool BMC::visit(ForStatement const& _node)
 		// breaks in current iterations are handled when traversing loop checkpoints
 		// handles case when the loop condition no longer holds but bmc loop iterations still unrolls the loop
 		mergeVariables(
-			broke || !forConditionOnPreviousIteration,
+			broke || !forConditionOnPreviousIterations,
 			indicesBefore,
 			copyVariableIndices()
 		);
 		m_loopCheckpoints.pop();
 		broke = broke || brokeInCurrentIteration;
-		forConditionOnPreviousIteration = forCondition;
+		forConditionOnPreviousIterations = forConditionOnPreviousIterations && forCondition;
 	}
 	if (bmcLoopIterations > 0)
 		m_context.addAssertion(not(forCondition) || broke);
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_6.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_6.sol
new file mode 100644
index 0000000000..8f7c82ad9f
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_6.sol
@@ -0,0 +1,26 @@
+contract C
+{
+	uint x;
+	uint y;
+
+	function condition() private returns(bool) {
+		x = (x + 1) % 2;
+		return (x == 1);
+	}
+
+	function f() public {
+		require(x == 0);
+		require(y == 0);
+		do {
+			++y;
+		} while (condition());
+		assert(y == 2);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Warning 2661: (85-90): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
index b98bba18a0..f1e296a00a 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
@@ -9,7 +9,7 @@ contract C {
 		} while (x < 3 || y == 1);
         // BMC loop iteration setting is just enough to leave the loop
 		assert(x == 3); // should hold
-		assert(y == 1); // should hold
+		assert(y == 1); // should fail, when x == 3 loop is completed
 	}
 }
 // ====
@@ -17,4 +17,5 @@ contract C {
 // SMTSolvers: z3
 // BMCLoopIterations: 4
 // ----
-// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Warning 4661: (244-258): BMC: Assertion violation happens here.
+// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
index 2a5866e162..70edda38b6 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
@@ -9,7 +9,7 @@ contract C {
 		} while (x < 3 || y == 1);
         // BMC loop iteration setting is more than enough to leave the loop
 		assert(x == 3); // should hold
-		assert(y == 1); // should hold
+		assert(y == 0); // should hold
 	}
 }
 // ====
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol
new file mode 100644
index 0000000000..bf814ab760
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol
@@ -0,0 +1,20 @@
+contract C {
+	function f() public pure {
+		uint x = 0;
+		int y = 0;
+		do {
+            ++x;
+			if (x >= 3)
+				y = 1;
+		} while (x < 3 || y == 1);
+        // BMC loop iteration setting is more than enough to leave the loop
+		assert(x == 3); // should hold
+		assert(y == 1); // should hold
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_9.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_9.sol
new file mode 100644
index 0000000000..a460106802
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_9.sol
@@ -0,0 +1,26 @@
+contract C
+{
+	uint x;
+	uint y;
+
+	function condition() private returns(bool) {
+		x = (x + 1) % 2;
+		return (x == 1);
+	}
+
+	function f() public {
+		require(x == 0);
+		require(y == 0);
+		for (; condition();) {
+			++y;
+		}
+		assert(y == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Warning 2661: (85-90): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_6.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_6.sol
new file mode 100644
index 0000000000..ffdeeba1a4
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_6.sol
@@ -0,0 +1,26 @@
+contract C
+{
+	uint x;
+	uint y;
+
+	function condition() private returns(bool) {
+		x = (x + 1) % 2;
+		return (x == 1);
+	}
+
+	function f() public {
+		require(x == 0);
+		require(y == 0);
+		while (condition()) {
+			++y;
+		}
+		assert(y == 1);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 5
+// ----
+// Warning 2661: (85-90): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 451232985b01653bb75c04080b57807946fd2ec8 Mon Sep 17 00:00:00 2001
From: franzihei <41991517+franzihei@users.noreply.github.com>
Date: Thu, 27 Jul 2023 15:04:07 +0200
Subject: [PATCH 1520/1748] re-upload original solidity logo to brand guide
 (#14451)

---
 docs/brand-guide.rst   |  2 +-
 docs/solidity_logo.svg | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 docs/solidity_logo.svg

diff --git a/docs/brand-guide.rst b/docs/brand-guide.rst
index 5601b16a8e..cf471c5e3c 100644
--- a/docs/brand-guide.rst
+++ b/docs/brand-guide.rst
@@ -67,7 +67,7 @@ When using the Solidity logo, please respect the Solidity logo guidelines.
 Solidity Logo Guidelines
 ========================
 
-.. image:: logo.svg
+.. image:: solidity_logo.svg
   :width: 256
 
 *(Right click on the logo to download it.)*
diff --git a/docs/solidity_logo.svg b/docs/solidity_logo.svg
new file mode 100644
index 0000000000..86b9f4995b
--- /dev/null
+++ b/docs/solidity_logo.svg
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 16.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns:sketch="http://www.bohemiancoding.com/sketch/ns"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="1300px" height="1300px"
+	 viewBox="0 0 1300 1300" enable-background="new 0 0 1300 1300" xml:space="preserve">
+<title>Vector 1</title>
+<desc>Created with Sketch.</desc>
+<g id="Page-1" sketch:type="MSPage">
+	<g id="solidity" transform="translate(402.000000, 118.000000)" sketch:type="MSLayerGroup">
+		<g id="Group" sketch:type="MSShapeGroup">
+			<path id="Shape" opacity="0.45" enable-background="new    " d="M371.772,135.308L241.068,367.61H-20.158l130.614-232.302
+				H371.772"/>
+			<path id="Shape_1_" opacity="0.6" enable-background="new    " d="M241.068,367.61h261.318L371.772,135.308H110.456
+				L241.068,367.61z"/>
+			<path id="Shape_2_" opacity="0.8" enable-background="new    " d="M110.456,599.822L241.068,367.61L110.456,135.308
+				L-20.158,367.61L110.456,599.822z"/>
+			<path id="Shape_3_" opacity="0.45" enable-background="new    " d="M111.721,948.275l130.704-232.303h261.318L373.038,948.275
+				H111.721"/>
+			<path id="Shape_4_" opacity="0.6" enable-background="new    " d="M242.424,715.973H-18.893l130.613,232.303h261.317
+				L242.424,715.973z"/>
+			<path id="Shape_5_" opacity="0.8" enable-background="new    " d="M373.038,483.761L242.424,715.973l130.614,232.303
+				l130.704-232.303L373.038,483.761z"/>
+		</g>
+	</g>
+</g>
+</svg>

From ea7ee3d5fe824261a7c72a491736d4688ab58409 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Thu, 27 Jul 2023 18:41:52 +0200
Subject: [PATCH 1521/1748] Fix yul ast ID to 0 instead of 1.

---
 Changelog.md                                              | 1 +
 libsolidity/interface/StandardCompiler.cpp                | 2 +-
 test/cmdlineTests/standard_yul/output.json                | 2 +-
 test/cmdlineTests/standard_yul_object/output.json         | 2 +-
 test/cmdlineTests/standard_yul_object_name/output.json    | 2 +-
 test/cmdlineTests/standard_yul_optimiserSteps/output.json | 2 +-
 test/cmdlineTests/standard_yul_optimized/output.json      | 2 +-
 7 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7a08269778..377b5f9cea 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * AST: Fix wrong initial ID for Yul nodes in the AST.
  * NatSpec: Fix internal error when requesting userdoc or devdoc for a contract that emits an event defined in a foreign contract or interface.
  * SMTChecker: Fix encoding error that causes loops to unroll after completion.
 
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index fc1de42498..767792601b 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1553,7 +1553,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "ast", wildcardMatchesExperimental))
 	{
 		Json::Value sourceResult = Json::objectValue;
-		sourceResult["id"] = 1;
+		sourceResult["id"] = 0;
 		sourceResult["ast"] = stack.astJson();
 		output["sources"][sourceName] = sourceResult;
 	}
diff --git a/test/cmdlineTests/standard_yul/output.json b/test/cmdlineTests/standard_yul/output.json
index 9dcf201139..c1b22726fb 100644
--- a/test/cmdlineTests/standard_yul/output.json
+++ b/test/cmdlineTests/standard_yul/output.json
@@ -169,7 +169,7 @@
                 "nodeType": "YulObject",
                 "subObjects": []
             },
-            "id": 1
+            "id": 0
         }
     }
 }
diff --git a/test/cmdlineTests/standard_yul_object/output.json b/test/cmdlineTests/standard_yul_object/output.json
index edf139dc0d..1404cd3aa7 100644
--- a/test/cmdlineTests/standard_yul_object/output.json
+++ b/test/cmdlineTests/standard_yul_object/output.json
@@ -179,7 +179,7 @@ data_4e03657aea45a94fc7d47ba826c8d667c0d1e6e33a64a036ec44f58fa12d6c45 616263
                     }
                 ]
             },
-            "id": 1
+            "id": 0
         }
     }
 }
diff --git a/test/cmdlineTests/standard_yul_object_name/output.json b/test/cmdlineTests/standard_yul_object_name/output.json
index 7faeed3c32..6803c322d1 100644
--- a/test/cmdlineTests/standard_yul_object_name/output.json
+++ b/test/cmdlineTests/standard_yul_object_name/output.json
@@ -258,7 +258,7 @@ sub_0: assembly {
                     }
                 ]
             },
-            "id": 1
+            "id": 0
         }
     }
 }
diff --git a/test/cmdlineTests/standard_yul_optimiserSteps/output.json b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
index 54dd24ac68..85a34261f0 100644
--- a/test/cmdlineTests/standard_yul_optimiserSteps/output.json
+++ b/test/cmdlineTests/standard_yul_optimiserSteps/output.json
@@ -166,7 +166,7 @@
                 "nodeType": "YulObject",
                 "subObjects": []
             },
-            "id": 1
+            "id": 0
         }
     }
 }
diff --git a/test/cmdlineTests/standard_yul_optimized/output.json b/test/cmdlineTests/standard_yul_optimized/output.json
index b260f72edc..d580ef6ae0 100644
--- a/test/cmdlineTests/standard_yul_optimized/output.json
+++ b/test/cmdlineTests/standard_yul_optimized/output.json
@@ -161,7 +161,7 @@
                 "nodeType": "YulObject",
                 "subObjects": []
             },
-            "id": 1
+            "id": 0
         }
     }
 }

From ead0615ca30374a3048d47c5b25d6883f740ffd5 Mon Sep 17 00:00:00 2001
From: Paul Wackerow <54227730+wackerow@users.noreply.github.com>
Date: Wed, 2 Aug 2023 03:41:18 -0700
Subject: [PATCH 1522/1748] add site_url root path to images [Fixes #14435]
 (#14462)

---
 docs/_static/js/constants.js | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/docs/_static/js/constants.js b/docs/_static/js/constants.js
index abdeb4464f..67fa16cdb0 100644
--- a/docs/_static/js/constants.js
+++ b/docs/_static/js/constants.js
@@ -1,11 +1,18 @@
+// Site URL
+const SITE_URL = "https://docs.soliditylang.org"
+const { origin, pathname } = location;
+const pathSplit = pathname.split("/");
+const rootPath = origin.includes(SITE_URL) && pathSplit.length > 3 ? pathSplit.splice(1, 2).join("/") : ''
+const ROOT_URL = `${origin}/${rootPath}`;
+
 // Color mode constants
 const [DARK, LIGHT] = ["dark", "light"];
-const LIGHT_LOGO_PATH = "_static/img/logo.svg";
-const DARK_LOGO_PATH = "_static/img/logo-dark.svg";
-const SUN_ICON_PATH = "_static/img/sun.svg";
-const MOON_ICON_PATH = "_static/img/moon.svg";
-const LIGHT_HAMBURGER_PATH = "_static/img/hamburger-light.svg";
-const DARK_HAMBURGER_PATH = "_static/img/hamburger-dark.svg";
+const LIGHT_LOGO_PATH = `${ROOT_URL}/_static/img/logo.svg`;
+const DARK_LOGO_PATH = `${ROOT_URL}/_static/img/logo-dark.svg`;
+const SUN_ICON_PATH = `${ROOT_URL}/_static/img/sun.svg`;
+const MOON_ICON_PATH = `${ROOT_URL}/_static/img/moon.svg`;
+const LIGHT_HAMBURGER_PATH = `${ROOT_URL}/_static/img/hamburger-light.svg`;
+const DARK_HAMBURGER_PATH = `${ROOT_URL}/_static/img/hamburger-dark.svg`;
 const COLOR_TOGGLE_ICON_CLASS = "color-toggle-icon";
 const SOLIDITY_LOGO_CLASS = "solidity-logo";
 const LS_COLOR_SCHEME = "color-scheme";

From 6574c10f2589d868ab7e2846d990807ebd2fd0e7 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Thu, 27 Jul 2023 18:16:35 +0200
Subject: [PATCH 1523/1748] SMTChecker: Visit the condition in for and while
 loops after loop is unrolled

---
 Changelog.md                                  |  1 +
 libsolidity/formal/BMC.cpp                    | 47 +++++++++++++++----
 libsolidity/formal/BMC.h                      |  2 +-
 .../loops/do_while_bmc_iterations_7.sol       | 19 ++++++++
 .../do_while_bmc_iterations_semantics_1.sol   |  2 +-
 .../do_while_bmc_iterations_semantics_2.sol   |  9 ++--
 .../do_while_bmc_iterations_semantics_3.sol   |  8 ++--
 .../do_while_bmc_iterations_semantics_4.sol   |  4 +-
 .../loops/for_loop_bmc_iterations_10.sol      | 19 ++++++++
 .../for_loop_bmc_iterations_semantics_1.sol   |  6 +--
 .../for_loop_bmc_iterations_semantics_2.sol   | 10 ++--
 .../for_loop_bmc_iterations_semantics_3.sol   | 10 ++--
 .../loops/while_bmc_iterations_8.sol          | 18 +++++++
 .../while_bmc_iterations_semantics_1.sol      |  8 ++--
 .../while_bmc_iterations_semantics_2.sol      | 11 +++--
 .../while_bmc_iterations_semantics_3.sol      | 10 ++--
 .../out_of_bounds/array_2d_4.sol              |  2 +-
 17 files changed, 142 insertions(+), 44 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_7.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_10.sol
 create mode 100644 test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol

diff --git a/Changelog.md b/Changelog.md
index 377b5f9cea..4f74b2dea5 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -10,6 +10,7 @@ Bugfixes:
  * AST: Fix wrong initial ID for Yul nodes in the AST.
  * NatSpec: Fix internal error when requesting userdoc or devdoc for a contract that emits an event defined in a foreign contract or interface.
  * SMTChecker: Fix encoding error that causes loops to unroll after completion.
+ * SMTChecker: Fix inconsistency on constant condition checks when ``while`` or ``for`` loops are unrolled before the condition check.
 
 
 ### 0.8.21 (2023-07-19)
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index dcaffbdb61..220f6411a5 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -313,7 +313,7 @@ bool BMC::visit(WhileStatement const& _node)
 			auto indicesBefore = copyVariableIndices();
 			_node.body().accept(*this);
 
-			auto [continues, brokeInCurrentIteration] =	mergeVariablesFromLoopCheckpoints();
+			auto brokeInCurrentIteration = mergeVariablesFromLoopCheckpoints();
 
 			auto indicesBreak = copyVariableIndices();
 			_node.condition().accept(*this);
@@ -332,6 +332,8 @@ bool BMC::visit(WhileStatement const& _node)
 			broke = broke || brokeInCurrentIteration;
 			m_loopCheckpoints.pop();
 		}
+		if (bmcLoopIterations > 0)
+			m_context.addAssertion(!loopCondition || broke);
 	}
 	else {
 		smtutil::Expression loopConditionOnPreviousIterations(true);
@@ -348,7 +350,7 @@ bool BMC::visit(WhileStatement const& _node)
 			_node.body().accept(*this);
 			popPathCondition();
 
-			auto [continues, brokeInCurrentIteration] =	mergeVariablesFromLoopCheckpoints();
+			auto brokeInCurrentIteration =	mergeVariablesFromLoopCheckpoints();
 
 			// merges indices modified when accepting loop condition that no longer holds
 			mergeVariables(
@@ -369,9 +371,21 @@ bool BMC::visit(WhileStatement const& _node)
 			broke = broke || brokeInCurrentIteration;
 			loopConditionOnPreviousIterations = loopConditionOnPreviousIterations && loopCondition;
 		}
+		if (bmcLoopIterations > 0)
+		{
+			//after loop iterations are done, we check the loop condition last final time
+			auto indices = copyVariableIndices();
+			_node.condition().accept(*this);
+			loopCondition = expr(_node.condition());
+			// asseert that the loop is complete
+			m_context.addAssertion(!loopCondition || broke || !loopConditionOnPreviousIterations);
+			mergeVariables(
+				broke || !loopConditionOnPreviousIterations,
+				indices,
+				copyVariableIndices()
+			);
+		}
 	}
-	if (bmcLoopIterations > 0)
-		m_context.addAssertion(not(loopCondition) || broke);
 	m_loopExecutionHappened = true;
 	return false;
 }
@@ -401,7 +415,7 @@ bool BMC::visit(ForStatement const& _node)
 		pushPathCondition(forCondition);
 		_node.body().accept(*this);
 
-		auto [continues, brokeInCurrentIteration] =	mergeVariablesFromLoopCheckpoints();
+		auto brokeInCurrentIteration =	mergeVariablesFromLoopCheckpoints();
 
 		// accept loop expression if there was no break
 		if (_node.loopExpression())
@@ -436,12 +450,29 @@ bool BMC::visit(ForStatement const& _node)
 		forConditionOnPreviousIterations = forConditionOnPreviousIterations && forCondition;
 	}
 	if (bmcLoopIterations > 0)
-		m_context.addAssertion(not(forCondition) || broke);
+	{
+		//after loop iterations are done, we check the loop condition last final time
+		auto indices = copyVariableIndices();
+		if (_node.condition())
+		{
+			_node.condition()->accept(*this);
+			forCondition = expr(*_node.condition());
+		}
+		// asseert that the loop is complete
+		m_context.addAssertion(!forCondition || broke || !forConditionOnPreviousIterations);
+		mergeVariables(
+			broke || !forConditionOnPreviousIterations,
+			indices,
+			copyVariableIndices()
+		);
+	}
 	m_loopExecutionHappened = true;
 	return false;
 }
 
-std::tuple<smtutil::Expression, smtutil::Expression> BMC::mergeVariablesFromLoopCheckpoints()
+// merges variables based on loop control statements
+// returns expression indicating whether there was a break in current loop unroll iteration
+smtutil::Expression BMC::mergeVariablesFromLoopCheckpoints()
 {
 	smtutil::Expression continues(false);
 	smtutil::Expression brokeInCurrentIteration(false);
@@ -461,7 +492,7 @@ std::tuple<smtutil::Expression, smtutil::Expression> BMC::mergeVariablesFromLoop
 		else if (loopControl.kind == LoopControlKind::Continue)
 			continues = continues || loopControl.pathConditions;
 	}
-	return std::pair(continues, brokeInCurrentIteration);
+	return brokeInCurrentIteration;
 }
 
 bool BMC::visit(TryStatement const& _tryStatement)
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index 3abaac1bd2..dfd4169e29 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -190,7 +190,7 @@ class BMC: public SMTEncoder
 	smtutil::CheckResult checkSatisfiable();
 	//@}
 
-	std::tuple<smtutil::Expression, smtutil::Expression> mergeVariablesFromLoopCheckpoints();
+	smtutil::Expression mergeVariablesFromLoopCheckpoints();
 	bool isInsideLoop() const;
 
 	std::unique_ptr<smtutil::SolverInterface> m_interface;
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_7.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_7.sol
new file mode 100644
index 0000000000..81d94e1b9c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_7.sol
@@ -0,0 +1,19 @@
+contract C
+{
+	uint256[] y;
+
+	function f() public view {
+		uint256 x = 0;
+		do {
+			++x;
+		} while (x < y.length);
+		require(x != 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 1
+// ----
+// Warning 6838: (124-130): BMC: Condition is always true.
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol
index 6656817809..4d1112ac06 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_1.sol
@@ -7,7 +7,7 @@ contract C {
 				y = 1;
 			++x;
 		} while (x < 3 || y == 1);
-        // BMC loop iteration setting is not enough to leave the loop
+		// BMC loop iteration setting is not enough to leave the loop
 		assert(x == 0); // should hold - no assumptions on value if didn't complete loop
 		assert(y == 0); // should hold - no assumptions on value if didn't complete loop
 	}
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
index f1e296a00a..9db49261c0 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_2.sol
@@ -7,9 +7,10 @@ contract C {
 				y = 1;
 			++x;
 		} while (x < 3 || y == 1);
-        // BMC loop iteration setting is just enough to leave the loop
-		assert(x == 3); // should hold
+		// BMC loop iteration setting is just enough to leave the loop
+		assert(x == 3);
 		assert(y == 1); // should fail, when x == 3 loop is completed
+		assert(y == 0);
 	}
 }
 // ====
@@ -17,5 +18,5 @@ contract C {
 // SMTSolvers: z3
 // BMCLoopIterations: 4
 // ----
-// Warning 4661: (244-258): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Warning 4661: (223-237): BMC: Assertion violation happens here.
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
index 70edda38b6..e5e03d3d62 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_3.sol
@@ -7,9 +7,10 @@ contract C {
 				y = 1;
 			++x;
 		} while (x < 3 || y == 1);
-        // BMC loop iteration setting is more than enough to leave the loop
-		assert(x == 3); // should hold
-		assert(y == 0); // should hold
+		// BMC loop iteration setting is more than enough to leave the loop
+		assert(x == 3);
+		assert(y == 1); // should fail
+		assert(y == 0);
 	}
 }
 // ====
@@ -17,4 +18,5 @@ contract C {
 // SMTSolvers: z3
 // BMCLoopIterations: 5
 // ----
+// Warning 4661: (228-242): BMC: Assertion violation happens here.
 // Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol
index bf814ab760..04d197045d 100644
--- a/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol
+++ b/test/libsolidity/smtCheckerTests/loops/do_while_bmc_iterations_semantics_4.sol
@@ -3,11 +3,11 @@ contract C {
 		uint x = 0;
 		int y = 0;
 		do {
-            ++x;
+			++x;
 			if (x >= 3)
 				y = 1;
 		} while (x < 3 || y == 1);
-        // BMC loop iteration setting is more than enough to leave the loop
+		// BMC loop iteration setting is more than enough to leave the loop
 		assert(x == 3); // should hold
 		assert(y == 1); // should hold
 	}
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_10.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_10.sol
new file mode 100644
index 0000000000..5c91d2ce5c
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_10.sol
@@ -0,0 +1,19 @@
+contract C
+{
+	uint256[] y;
+
+	function f() public view {
+		uint256 x = 0;
+		for (uint i = 0; i < y.length; i++) {
+			x = 1;
+		}
+		// tests that constant condition warning is not reported
+		require(x != 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 1
+// ----
+// Info 6002: BMC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol
index 915c0e6908..d3a6c825fc 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_1.sol
@@ -7,13 +7,13 @@ contract C {
 				y = 1;
 		}
         // BMC loop iteration setting is not enough to leave the loop
-		assert(x == 0); // should hold - no assumptions on value if didn't complete loop
-		assert(y == 0); // should hold - no assumptions on value if didn't complete loop
+		assert(x == 0); // should hold - no assumptions on value if didn't complete the loop
+		assert(y == 0); // should hold - no assumptions on value if didn't complete the loop
 	}
 }
 // ====
 // SMTEngine: bmc
 // SMTSolvers: z3
-// BMCLoopIterations: 3
+// BMCLoopIterations: 2
 // ----
 // Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol
index 337515c9a0..720f621dfd 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_2.sol
@@ -6,14 +6,16 @@ contract C {
 			if (x >= 3)
 				y = 1;
 		}
-        // BMC loop iteration setting is just enough to leave the loop
-		assert(x == 3); // should hold - no assumptions on value if didn't complete loop
-		assert(y == 0); // should hold - no assumptions on value if didn't complete loop
+		// BMC loop iteration setting is just enough to leave the loop
+		assert(x == 3);
+		assert(y == 1); // should fail
+		assert(y == 0);
 	}
 }
 // ====
 // SMTEngine: bmc
 // SMTSolvers: z3
-// BMCLoopIterations: 4
+// BMCLoopIterations: 3
 // ----
+// Warning 4661: (216-230): BMC: Assertion violation happens here.
 // Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol
index 5ff9d17782..00cd3a5ce8 100644
--- a/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol
+++ b/test/libsolidity/smtCheckerTests/loops/for_loop_bmc_iterations_semantics_3.sol
@@ -6,14 +6,16 @@ contract C {
 			if (x >= 3)
 				y = 1;
 		}
-        // BMC loop iteration setting is more than enough to leave the loop
-		assert(x == 3); // should hold - no assumptions on value if didn't complete loop
-		assert(y == 0); // should hold - no assumptions on value if didn't complete loop
+		// BMC loop iteration setting is more than enough to leave the loop
+		assert(x == 3);
+		assert(y == 1); // should fail
+		assert(y == 0);
 	}
 }
 // ====
 // SMTEngine: bmc
 // SMTSolvers: z3
-// BMCLoopIterations: 5
+// BMCLoopIterations: 4
 // ----
+// Warning 4661: (221-235): BMC: Assertion violation happens here.
 // Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol
new file mode 100644
index 0000000000..b7ad4e2ecb
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_8.sol
@@ -0,0 +1,18 @@
+contract C
+{
+	uint256[] y;
+
+	function f() public view {
+ 		uint256 x = 0;
+		while (x < y.length) {
+			x = 1;
+		}
+		// tests that constant condition warning is not reported
+		require(x != 0);
+	}
+}
+// ====
+// SMTEngine: bmc
+// SMTSolvers: z3
+// BMCLoopIterations: 1
+// ----
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol
index eb497be7cb..7de8b8146a 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_1.sol
@@ -7,14 +7,14 @@ contract C {
 				y = 1;
 			++x;
 		}
-        // BMC loop iteration setting is not enough to leave the loop
-		assert(x == 3);
-		assert(y == 1);
+		// BMC loop iteration setting is not enough to leave the loop
+		assert(x == 0); // should hold - no assumptions on value if didn't complete the loop
+		assert(y == 0); // should hold - no assumptions on value if didn't complete the loop
 	}
 }
 // ====
 // SMTEngine: bmc
 // SMTSolvers: z3
-// BMCLoopIterations: 3
+// BMCLoopIterations: 2
 // ----
 // Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
index 90682c7f77..a50acf4d2b 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_2.sol
@@ -7,15 +7,16 @@ contract C {
 				y = 1;
 			++x;
 		}
-        // BMC loop iteration setting is just enough to leave the loop
-		assert(x == 3); // should hold
+ 		// BMC loop iteration setting is just enough to leave the loop
+		assert(x == 3);
 		assert(y == 1); // should fail
+		assert(y == 0);
 	}
 }
 // ====
 // SMTEngine: bmc
 // SMTSolvers: z3
-// BMCLoopIterations: 4
+// BMCLoopIterations: 3
 // ----
-// Warning 4661: (240-254): BMC: Assertion violation happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Warning 4661: (220-234): BMC: Assertion violation happens here.
+// Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol
index 992ac7f802..6ead58142c 100644
--- a/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol
+++ b/test/libsolidity/smtCheckerTests/loops/while_bmc_iterations_semantics_3.sol
@@ -7,14 +7,16 @@ contract C {
 				y = 1;
 			++x;
 		}
-        // BMC loop iteration setting is more than enough to leave the loop
-		assert(x == 3); // should hold
-		assert(y == 0); // should hold
+		// BMC loop iteration setting is more than enough to leave the loop
+		assert(x == 3);
+		assert(y == 1); // should fail
+		assert(y == 0);
 	}
 }
 // ====
 // SMTEngine: bmc
 // SMTSolvers: z3
-// BMCLoopIterations: 5
+// BMCLoopIterations: 4
 // ----
+// Warning 4661: (224-238): BMC: Assertion violation happens here.
 // Info 6002: BMC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
index ee7ab8bcc7..2a9f39d1a2 100644
--- a/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
+++ b/test/libsolidity/smtCheckerTests/out_of_bounds/array_2d_4.sol
@@ -24,4 +24,4 @@ contract C {
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (184-197): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
 // Warning 2661: (228-244): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
-// Info 6002: BMC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From aecb11eff4a7c7a1cbbfbd956a95ae5c685d6f45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 17:42:22 +0200
Subject: [PATCH 1524/1748] Make better use of virtual functions to customize
 CommonSyntaxTest in test cases based on it

---
 test/libsolidity/SMTCheckerTest.cpp |  9 +++------
 test/libsolidity/SMTCheckerTest.h   |  3 +--
 test/libsolidity/SyntaxTest.cpp     | 13 ++++---------
 test/libsolidity/SyntaxTest.h       |  4 +---
 4 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index dddee7da43..366f0f9f47 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -127,14 +127,11 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	m_modelCheckerSettings.bmcLoopIterations = std::optional<unsigned>{bmcLoopIterations};
 }
 
-TestCase::TestResult SMTCheckerTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+void SMTCheckerTest::setupCompiler()
 {
-	setupCompiler();
-	compiler().setModelCheckerSettings(m_modelCheckerSettings);
-	parseAndAnalyze();
-	filterObtainedErrors();
+	SyntaxTest::setupCompiler();
 
-	return conclude(_stream, _linePrefix, _formatted);
+	compiler().setModelCheckerSettings(m_modelCheckerSettings);
 }
 
 void SMTCheckerTest::filterObtainedErrors()
diff --git a/test/libsolidity/SMTCheckerTest.h b/test/libsolidity/SMTCheckerTest.h
index 459a6c5656..3e8d8238bb 100644
--- a/test/libsolidity/SMTCheckerTest.h
+++ b/test/libsolidity/SMTCheckerTest.h
@@ -38,8 +38,7 @@ class SMTCheckerTest: public SyntaxTest
 	}
 	SMTCheckerTest(std::string const& _filename);
 
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
-
+	void setupCompiler() override;
 	void filterObtainedErrors() override;
 
 	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 159f9dcb12..8efea57203 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -43,15 +43,6 @@ SyntaxTest::SyntaxTest(string const& _filename, langutil::EVMVersion _evmVersion
 	m_parserErrorRecovery = _parserErrorRecovery;
 }
 
-TestCase::TestResult SyntaxTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
-{
-	setupCompiler();
-	parseAndAnalyze();
-	filterObtainedErrors();
-
-	return conclude(_stream, _linePrefix, _formatted);
-}
-
 string SyntaxTest::addPreamble(string const& _sourceCode)
 {
 	// Silence compiler version warning
@@ -83,6 +74,8 @@ void SyntaxTest::setupCompiler()
 
 void SyntaxTest::parseAndAnalyze()
 {
+	setupCompiler();
+
 	if (compiler().parse() && compiler().analyze())
 		try
 		{
@@ -112,6 +105,8 @@ void SyntaxTest::parseAndAnalyze()
 				-1
 			});
 		}
+
+	filterObtainedErrors();
 }
 
 void SyntaxTest::filterObtainedErrors()
diff --git a/test/libsolidity/SyntaxTest.h b/test/libsolidity/SyntaxTest.h
index 597fa0e1b2..4f47f10124 100644
--- a/test/libsolidity/SyntaxTest.h
+++ b/test/libsolidity/SyntaxTest.h
@@ -47,13 +47,11 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
 	}
 	SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion, bool _parserErrorRecovery = false);
 
-	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
-
 protected:
 	/// Returns @param _sourceCode prefixed with the version pragma and the SPDX license identifier.
 	static std::string addPreamble(std::string const& _sourceCode);
 
-	void setupCompiler();
+	virtual void setupCompiler();
 	void parseAndAnalyze() override;
 	virtual void filterObtainedErrors();
 

From f87bef24311e8a10a8fad4718f184d28bde0876e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 16:25:33 +0200
Subject: [PATCH 1525/1748] AnalysisFramework: Make it possible to customize
 CompilerStack creation

---
 test/libsolidity/AnalysisFramework.cpp | 5 +++++
 test/libsolidity/AnalysisFramework.h   | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 7bbaaaa5d2..199a03e0b2 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -75,6 +75,11 @@ AnalysisFramework::parseAnalyseAndReturnError(
 	return make_pair(&compiler().ast(""), std::move(errors));
 }
 
+std::unique_ptr<CompilerStack> AnalysisFramework::createStack() const
+{
+	return std::make_unique<CompilerStack>();
+}
+
 ErrorList AnalysisFramework::filterErrors(ErrorList const& _errorList, bool _includeWarningsAndInfos) const
 {
 	ErrorList errors;
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index 7dbbb902ff..cb1162d59c 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -76,7 +76,7 @@ class AnalysisFramework
 	solidity::frontend::CompilerStack& compiler()
 	{
 		if (!m_compiler)
-			m_compiler = std::make_unique<solidity::frontend::CompilerStack>();
+			m_compiler = createStack();
 		return *m_compiler;
 	}
 
@@ -84,10 +84,14 @@ class AnalysisFramework
 	solidity::frontend::CompilerStack const& compiler() const
 	{
 		if (!m_compiler)
-			m_compiler = std::make_unique<solidity::frontend::CompilerStack>();
+			m_compiler = createStack();
 		return *m_compiler;
 	}
 
+	/// Creates a new instance of @p CompilerStack. Override if your test case needs to pass in
+	/// custom constructor arguments.
+	virtual std::unique_ptr<CompilerStack> createStack() const;
+
 private:
 	mutable std::unique_ptr<solidity::frontend::CompilerStack> m_compiler;
 };

From e62bc30e9e9b34c1ea6b83736be7c1c01a0a6934 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 20:37:21 +0200
Subject: [PATCH 1526/1748] AnalysisFramework.filterErrors(): Provide default
 for _includeWarningsAndInfos

---
 test/libsolidity/AnalysisFramework.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index 7dbbb902ff..f2be710256 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -66,8 +66,8 @@ class AnalysisFramework
 		std::string const& _signature
 	);
 
-	// filter out the warnings in m_warningsToFilter or all warnings and infos if _includeWarningsAndInfos is false
-	langutil::ErrorList filterErrors(langutil::ErrorList const& _errorList, bool _includeWarningsAndInfos) const;
+	/// filter out the warnings in m_warningsToFilter or all warnings and infos if _includeWarningsAndInfos is false
+	langutil::ErrorList filterErrors(langutil::ErrorList const& _errorList, bool _includeWarningsAndInfos = true) const;
 
 	std::vector<std::string> m_warningsToFilter = {"This is a pre-release compiler version"};
 	std::vector<std::string> m_messagesToCut = {"Source file requires different compiler version (current compiler is"};

From 6f3a3795574c1fafc61620e0e1dbedd019f7a2a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 20:38:15 +0200
Subject: [PATCH 1527/1748] AnalysisFramework: Add filteredErrors()

---
 test/libsolidity/AnalysisFramework.cpp | 2 +-
 test/libsolidity/AnalysisFramework.h   | 4 ++++
 test/libsolidity/SyntaxTest.cpp        | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 7bbaaaa5d2..14eb334bd6 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -68,7 +68,7 @@ AnalysisFramework::parseAnalyseAndReturnError(
 
 	compiler().analyze();
 
-	ErrorList errors = filterErrors(compiler().errors(), _reportWarnings);
+	ErrorList errors = filteredErrors(_reportWarnings);
 	if (errors.size() > 1 && !_allowMultipleErrors)
 		BOOST_FAIL("Multiple errors found: " + formatErrors());
 
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index f2be710256..f265384933 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -68,6 +68,10 @@ class AnalysisFramework
 
 	/// filter out the warnings in m_warningsToFilter or all warnings and infos if _includeWarningsAndInfos is false
 	langutil::ErrorList filterErrors(langutil::ErrorList const& _errorList, bool _includeWarningsAndInfos = true) const;
+	langutil::ErrorList filteredErrors(bool _includeWarningsAndInfos = true) const
+	{
+		return filterErrors(compiler().errors(), _includeWarningsAndInfos);
+	}
 
 	std::vector<std::string> m_warningsToFilter = {"This is a pre-release compiler version"};
 	std::vector<std::string> m_messagesToCut = {"Source file requires different compiler version (current compiler is"};
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 159f9dcb12..e13d1f0dcf 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -116,7 +116,7 @@ void SyntaxTest::parseAndAnalyze()
 
 void SyntaxTest::filterObtainedErrors()
 {
-	for (auto const& currentError: filterErrors(compiler().errors(), true))
+	for (auto const& currentError: filteredErrors())
 	{
 		int locationStart = -1;
 		int locationEnd = -1;

From 6c1bcb9a81d39f6f783513bee2117813b49e5043 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 13:32:32 +0200
Subject: [PATCH 1528/1748] AnalysisFramework.formatErrors(): Support colored
 output and error IDs

---
 test/libsolidity/AnalysisFramework.cpp | 21 +++++++++++++++++----
 test/libsolidity/AnalysisFramework.h   | 11 +++++++++--
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 14eb334bd6..eacf92c435 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -141,17 +141,30 @@ ErrorList AnalysisFramework::expectError(std::string const& _source, bool _warni
 	return sourceAndErrors.second;
 }
 
-string AnalysisFramework::formatErrors() const
+string AnalysisFramework::formatErrors(
+	bool _colored,
+	bool _withErrorIds
+) const
 {
 	string message;
 	for (auto const& error: compiler().errors())
-		message += formatError(*error);
+		message += formatError(*error, _colored, _withErrorIds);
 	return message;
 }
 
-string AnalysisFramework::formatError(Error const& _error) const
+string AnalysisFramework::formatError(
+	Error const& _error,
+	bool _colored,
+	bool _withErrorIds
+) const
 {
-	return SourceReferenceFormatter::formatErrorInformation(_error, *m_compiler);
+	return SourceReferenceFormatter::formatExceptionInformation(
+		_error,
+		_error.type(),
+		*m_compiler,
+		_colored,
+		_withErrorIds
+	);
 }
 
 ContractDefinition const* AnalysisFramework::retrieveContractByName(SourceUnit const& _source, string const& _name)
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index f265384933..dc855688c5 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -57,8 +57,15 @@ class AnalysisFramework
 	bool success(std::string const& _source);
 	langutil::ErrorList expectError(std::string const& _source, bool _warning = false, bool _allowMultiple = false);
 
-	std::string formatErrors() const;
-	std::string formatError(langutil::Error const& _error) const;
+	std::string formatErrors(
+		bool _colored = false,
+		bool _withErrorIds = false
+	) const;
+	std::string formatError(
+		langutil::Error const& _error,
+		bool _colored = false,
+		bool _withErrorIds = false
+	) const;
 
 	static ContractDefinition const* retrieveContractByName(SourceUnit const& _source, std::string const& _name);
 	static FunctionTypePointer retrieveFunctionBySignature(

From e42242cd6f704fe95400354679ea60865db0cc1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 20:39:37 +0200
Subject: [PATCH 1529/1748] AnalysisFramework.formatErrors(): Require providing
 errors explicitly

---
 test/libsolidity/AnalysisFramework.cpp | 9 +++++----
 test/libsolidity/AnalysisFramework.h   | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index eacf92c435..cbcedfba6a 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -63,14 +63,14 @@ AnalysisFramework::parseAnalyseAndReturnError(
 	_allowMultipleErrors = _allowMultipleErrors || _allowRecoveryErrors;
 	if (!compiler().parse())
 	{
-		BOOST_FAIL("Parsing contract failed in analysis test suite:" + formatErrors());
+		BOOST_FAIL("Parsing contract failed in analysis test suite:" + formatErrors(compiler().errors()));
 	}
 
 	compiler().analyze();
 
 	ErrorList errors = filteredErrors(_reportWarnings);
 	if (errors.size() > 1 && !_allowMultipleErrors)
-		BOOST_FAIL("Multiple errors found: " + formatErrors());
+		BOOST_FAIL("Multiple errors found: " + formatErrors(compiler().errors()));
 
 	return make_pair(&compiler().ast(""), std::move(errors));
 }
@@ -123,7 +123,7 @@ SourceUnit const* AnalysisFramework::parseAndAnalyse(string const& _source)
 	BOOST_REQUIRE(!!sourceAndError.first);
 	string message;
 	if (!sourceAndError.second.empty())
-		message = "Unexpected error: " + formatErrors();
+		message = "Unexpected error: " + formatErrors(compiler().errors());
 	BOOST_REQUIRE_MESSAGE(sourceAndError.second.empty(), message);
 	return sourceAndError.first;
 }
@@ -142,12 +142,13 @@ ErrorList AnalysisFramework::expectError(std::string const& _source, bool _warni
 }
 
 string AnalysisFramework::formatErrors(
+	langutil::ErrorList _errors,
 	bool _colored,
 	bool _withErrorIds
 ) const
 {
 	string message;
-	for (auto const& error: compiler().errors())
+	for (auto const& error: _errors)
 		message += formatError(*error, _colored, _withErrorIds);
 	return message;
 }
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index dc855688c5..6eaa00790f 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -58,6 +58,7 @@ class AnalysisFramework
 	langutil::ErrorList expectError(std::string const& _source, bool _warning = false, bool _allowMultiple = false);
 
 	std::string formatErrors(
+		langutil::ErrorList _errors,
 		bool _colored = false,
 		bool _withErrorIds = false
 	) const;
@@ -158,7 +159,7 @@ do \
 	auto sourceAndError = parseAnalyseAndReturnError((text), true); \
 	std::string message; \
 	if (!sourceAndError.second.empty()) \
-		message = formatErrors();\
+		message = formatErrors(compiler().errors());\
 	BOOST_CHECK_MESSAGE(sourceAndError.second.empty(), message); \
 } \
 while(0)

From 6d8b1374c50c568fc710f34bccdd73544d539f4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 15:27:27 +0200
Subject: [PATCH 1530/1748] Use AnalysisFramework's error formatting and
 filtering features in more test cases

---
 test/libsolidity/AnalysisFramework.cpp | 2 +-
 test/libsolidity/GasTest.cpp           | 3 +--
 test/libsolidity/MemoryGuardTest.cpp   | 3 +++
 test/libsolidity/SolidityCompiler.cpp  | 5 ++++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index cbcedfba6a..47643deea8 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -70,7 +70,7 @@ AnalysisFramework::parseAnalyseAndReturnError(
 
 	ErrorList errors = filteredErrors(_reportWarnings);
 	if (errors.size() > 1 && !_allowMultipleErrors)
-		BOOST_FAIL("Multiple errors found: " + formatErrors(compiler().errors()));
+		BOOST_FAIL("Multiple errors found: " + formatErrors(errors));
 
 	return make_pair(&compiler().ast(""), std::move(errors));
 }
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index 030472e8a1..78a0ca907f 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -118,8 +118,7 @@ TestCase::TestResult GasTest::run(ostream& _stream, string const& _linePrefix, b
 
 	if (!compiler().parseAndAnalyze() || !compiler().compile())
 	{
-		SourceReferenceFormatter{_stream, compiler(), _formatted, false}
-			.printErrorInformation(compiler().errors());
+		_stream << formatErrors(filteredErrors(), _formatted);
 		return TestResult::FatalError;
 	}
 
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index b757e673fe..06d6723f08 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -44,7 +44,10 @@ TestCase::TestResult MemoryGuardTest::run(ostream& _stream, string const& _lineP
 	compiler().setViaIR(true);
 	compiler().setOptimiserSettings(OptimiserSettings::none());
 	if (!compiler().compile())
+	{
+		_stream << formatErrors(filteredErrors(), _formatted);
 		return TestResult::FatalError;
+	}
 
 	m_obtainedResult.clear();
 	for (string contractName: compiler().contractNames())
diff --git a/test/libsolidity/SolidityCompiler.cpp b/test/libsolidity/SolidityCompiler.cpp
index cd99cbf53f..71c19e596e 100644
--- a/test/libsolidity/SolidityCompiler.cpp
+++ b/test/libsolidity/SolidityCompiler.cpp
@@ -42,7 +42,10 @@ BOOST_AUTO_TEST_CASE(does_not_include_creation_time_only_internal_functions)
 	)";
 	compiler().setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 	BOOST_REQUIRE(success(sourceCode));
-	BOOST_REQUIRE_MESSAGE(compiler().compile(), "Compiling contract failed");
+	BOOST_REQUIRE_MESSAGE(
+		compiler().compile(),
+		"Contract compilation failed:\n" + formatErrors(filteredErrors(), true /* _colored */)
+	);
 	bytes const& creationBytecode = solidity::test::bytecodeSansMetadata(compiler().object("C").bytecode);
 	bytes const& runtimeBytecode = solidity::test::bytecodeSansMetadata(compiler().runtimeObject("C").bytecode);
 	BOOST_CHECK(creationBytecode.size() >= 90);

From 96e7b4f46bc1e2f1827bb9d730b176b28a52568e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 4 Aug 2023 12:27:18 +0200
Subject: [PATCH 1531/1748] Rematerialize zero literals

---
 Changelog.md                                  |   1 +
 libyul/optimiser/Metrics.cpp                  |   4 +
 .../output                                    |   9 +-
 .../output                                    |   9 +-
 .../output                                    |   9 +-
 .../debug_info_in_yul_snippet_escaping/output |  55 +++--
 .../ir_compiler_subobjects/output             |  25 +-
 .../output                                    |   9 +-
 .../output                                    |   9 +-
 test/cmdlineTests/name_simplifier/output      | 119 +++++-----
 .../cmdlineTests/optimizer_array_sload/output |  25 +-
 .../output.json                               | 220 +++++++-----------
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               |   9 +-
 .../output.json                               | 154 ++++++------
 .../viair_subobject_optimization/output       |  99 ++++----
 test/cmdlineTests/viair_subobjects/output     |  25 +-
 test/libsolidity/gasTests/abiv2_optimised.sol |   6 +-
 .../abiEncoderV1/abi_decode_v2_storage.sol    |   4 +-
 .../abi_encode_calldata_slice.sol             |   4 +-
 .../struct/struct_storage_ptr.sol             |   2 +-
 .../abi_encode_calldata_slice.sol             |   4 +-
 .../abiEncoderV2/abi_encode_v2.sol            |   2 +-
 ...2_in_function_inherited_in_v1_contract.sol |   2 +-
 .../abiEncoderV2/calldata_array.sol           |   2 +-
 .../calldata_overlapped_dynamic_arrays.sol    |   2 +-
 .../abiEncoderV2/storage_array_encoding.sol   |   4 +-
 .../abi_decode_simple_storage.sol             |   4 +-
 .../array/array_memory_index_access.sol       |   2 +-
 .../array/array_storage_index_access.sol      |  18 +-
 .../array_storage_index_boundary_test.sol     |   4 +-
 .../array/array_storage_index_zeroed_test.sol |   8 +-
 .../array/array_storage_length_access.sol     |   2 +-
 .../array/array_storage_push_empty.sol        |   4 +-
 ...rray_storage_push_empty_length_address.sol |   4 +-
 .../array/array_storage_push_pop.sol          |   4 +-
 .../arrays_complex_from_and_to_storage.sol    |   2 +-
 .../array/byte_array_transitional_2.sol       |   2 +-
 .../array/bytes_length_member.sol             |   4 +-
 .../array/constant_var_as_array_length.sol    |   2 +-
 .../copying/array_copy_calldata_storage.sol   |   2 +-
 .../copying/array_copy_cleanup_uint40.sol     |   2 +-
 .../copying/array_copy_clear_storage.sol      |   2 +-
 .../copying/array_copy_different_packing.sol  |   2 +-
 .../copying/array_copy_including_array.sol    |   4 +-
 .../array/copying/array_copy_nested_array.sol |   2 +-
 ...ay_copy_storage_storage_different_base.sol |   2 +-
 ..._storage_storage_different_base_nested.sol |   2 +-
 .../array_copy_storage_storage_dyn_dyn.sol    |   2 +-
 ...y_copy_storage_storage_dynamic_dynamic.sol |   2 +-
 ...ay_copy_storage_storage_static_dynamic.sol |   2 +-
 ...ray_copy_storage_storage_static_static.sol |   2 +-
 .../array_copy_storage_storage_struct.sol     |   2 +-
 .../array_copy_storage_to_memory_nested.sol   |   4 +-
 .../copying/array_copy_target_leftover.sol    |   2 +-
 .../copying/array_copy_target_simple.sol      |   2 +-
 .../copying/array_copy_target_simple_2.sol    |   2 +-
 .../copying/array_elements_to_mapping.sol     |   4 +-
 .../array_nested_calldata_to_storage.sol      |   8 +-
 .../array_nested_memory_to_storage.sol        |   4 +-
 ...on_external_storage_to_storage_dynamic.sol |   2 +-
 ...o_storage_dynamic_different_mutability.sol |   2 +-
 .../array_of_struct_calldata_to_storage.sol   |   2 +-
 .../array_of_struct_memory_to_storage.sol     |   2 +-
 ..._containing_arrays_calldata_to_storage.sol |   2 +-
 ...ts_containing_arrays_memory_to_storage.sol |   2 +-
 .../array_storage_multi_items_per_slot.sol    |   2 +-
 .../array/copying/array_to_mapping.sol        |   4 +-
 .../array/copying/bytes_inside_mappings.sol   |   4 +-
 .../copying/bytes_storage_to_storage.sol      |  14 +-
 .../calldata_array_dynamic_to_storage.sol     |   2 +-
 .../copying/calldata_array_to_mapping.sol     |   2 +-
 ...nup_during_multi_element_per_slot_copy.sol |   2 +-
 .../copy_byte_array_in_struct_to_storage.sol  |   8 +-
 .../copying/copy_byte_array_to_storage.sol    |   4 +-
 .../copy_function_internal_storage_array.sol  |   2 +-
 .../array/copying/copy_removes_bytes_data.sol |   4 +-
 .../copying/copying_bytes_multiassign.sol     |   4 +-
 ...d_array_of_structs_calldata_to_storage.sol |   6 +-
 ...ted_array_of_structs_memory_to_storage.sol |   6 +-
 .../function_type_array_to_storage.sol        |   2 +-
 .../memory_dyn_2d_bytes_to_storage.sol        |   4 +-
 ...ested_array_element_storage_to_storage.sol |   6 +-
 ...d_array_of_structs_calldata_to_storage.sol |   6 +-
 ...ted_array_of_structs_memory_to_storage.sol |   6 +-
 ...ed_array_of_structs_storage_to_storage.sol |   4 +-
 ...amic_array_element_calldata_to_storage.sol |   4 +-
 .../array/copying/storage_memory_nested.sol   |   2 +-
 .../copying/storage_memory_nested_bytes.sol   |   4 +-
 .../storage_memory_nested_from_pointer.sol    |   2 +-
 .../copying/storage_memory_nested_struct.sol  |   2 +-
 .../copying/storage_memory_packed_dyn.sol     |   2 +-
 .../array/create_memory_array.sol             |   2 +-
 .../array/delete/bytes_delete_element.sol     |   4 +-
 .../array/dynamic_array_cleanup.sol           |   2 +-
 .../array/dynamic_arrays_in_storage.sol       |   2 +-
 .../array/dynamic_multi_array_cleanup.sol     |   2 +-
 .../array/fixed_array_cleanup.sol             |   2 +-
 .../array/fixed_arrays_as_return_type.sol     |   2 +-
 .../array/fixed_arrays_in_constructors.sol    |   2 +-
 .../array/function_array_cross_calls.sol      |   2 +-
 ...nvalid_encoding_for_storage_byte_array.sol |   2 +-
 .../array/pop/array_pop_array_transition.sol  |   2 +-
 .../array/pop/array_pop_uint16_transition.sol |   2 +-
 .../array/pop/array_pop_uint24_transition.sol |   2 +-
 .../pop/byte_array_pop_long_storage_empty.sol |   2 +-
 ...ray_pop_long_storage_empty_garbage_ref.sol |   2 +-
 .../array/pop/byte_array_pop_masking_long.sol |   2 +-
 .../semanticTests/array/push/array_push.sol   |   2 +-
 .../push/array_push_nested_from_calldata.sol  |   2 +-
 .../array/push/array_push_struct.sol          |   2 +-
 .../push/array_push_struct_from_calldata.sol  |   2 +-
 .../array/push/byte_array_push_transition.sol |   2 +-
 .../array/push/nested_bytes_push.sol          |   4 +-
 .../array/push/push_no_args_2d.sol            |   4 +-
 .../array/push/push_no_args_bytes.sol         |   2 +-
 .../semanticTests/array/reusing_memory.sol    |   2 +-
 .../byte_array_to_storage_cleanup.sol         |   4 +-
 .../copy_from_calldata_removes_bytes_data.sol |   4 +-
 .../constructor/arrays_in_constructors.sol    |   2 +-
 .../bytes_in_constructors_packer.sol          |   4 +-
 .../bytes_in_constructors_unpacker.sol        |   4 +-
 .../constructor_arguments_external.sol        |   2 +-
 .../constructor_static_array_argument.sol     |   2 +-
 .../constructor/no_callvalue_check.sol        |   2 +-
 .../constructor_inheritance_init_order.sol    |   2 +-
 .../constructor_inheritance_init_order_2.sol  |   2 +-
 .../semanticTests/constructor_with_params.sol |   2 +-
 ...ructor_with_params_diamond_inheritance.sol |   2 +-
 .../constructor_with_params_inheritance.sol   |   2 +-
 .../events/event_dynamic_array_storage.sol    |   2 +-
 .../events/event_dynamic_array_storage_v2.sol |   2 +-
 .../event_dynamic_nested_array_storage_v2.sol |   4 +-
 .../events/event_indexed_string.sol           |   2 +-
 .../externalContracts/FixedFeeRegistrar.sol   |   2 +-
 .../externalContracts/base64.sol              |   6 +-
 .../externalContracts/deposit_contract.sol    |  10 +-
 .../externalContracts/prbmath_signed.sol      |   2 +-
 .../externalContracts/prbmath_unsigned.sol    |   2 +-
 .../externalContracts/ramanujan_pi.sol        |   2 +-
 .../semanticTests/externalContracts/snark.sol |   4 +-
 .../externalContracts/strings.sol             |   4 +-
 .../creation_function_call_with_args.sol      |   2 +-
 .../creation_function_call_with_salt.sol      |   2 +-
 .../functionCall/failed_create.sol            |   4 +-
 .../functionCall/gas_and_value_basic.sol      |   2 +-
 .../gas_and_value_brace_syntax.sol            |   2 +-
 .../mapping_array_internal_argument.sol       |   2 +-
 .../immutable/multi_creation.sol              |   2 +-
 .../semanticTests/immutable/use_scratch.sol   |   2 +-
 .../inheritance/value_for_constructor.sol     |   2 +-
 .../balance_other_contract.sol                |   2 +-
 .../libraries/internal_types_in_library.sol   |   2 +-
 .../using_library_mappings_public.sol         |   2 +-
 .../using_library_mappings_return.sol         |   2 +-
 .../salted_create/salted_create.sol           |   2 +-
 .../salted_create_with_value.sol              |   2 +-
 .../semanticTests/smoke/constructor.sol       |   2 +-
 .../semanticTests/state/blockhash_basic.sol   |   2 +-
 .../storage/empty_nonempty_empty.sol          |   4 +-
 .../storage/packed_storage_structs_bytes.sol  |   2 +-
 ...ta_struct_with_nested_array_to_storage.sol |   2 +-
 .../conversion/recursive_storage_memory.sol   |   2 +-
 .../structs/copy_from_mapping.sol             |   4 +-
 .../copy_struct_array_from_storage.sol        |   2 +-
 .../copy_substructures_from_mapping.sol       |   4 +-
 .../structs/copy_substructures_to_mapping.sol |  12 +-
 .../semanticTests/structs/copy_to_mapping.sol |   8 +-
 .../structs/memory_structs_nested_load.sol    |   2 +-
 ...truct_containing_bytes_copy_and_delete.sol |   8 +-
 .../semanticTests/structs/struct_copy.sol     |   4 +-
 .../structs/struct_copy_via_local.sol         |   2 +-
 .../struct_delete_storage_with_array.sol      |   4 +-
 .../struct_memory_to_storage_function_ptr.sol |   2 +-
 .../semanticTests/structs/structs.sol         |   2 +-
 .../userDefinedValueType/calldata.sol         |   4 +-
 .../userDefinedValueType/erc20.sol            |   2 +-
 .../semanticTests/various/address_code.sol    |   4 +-
 .../semanticTests/various/create_calldata.sol |   4 +-
 .../various/destructuring_assignment.sol      |   4 +-
 .../semanticTests/various/erc20.sol           |   2 +-
 .../various/negative_stack_height.sol         |   2 +-
 .../semanticTests/various/senders_balance.sol |   2 +-
 .../skip_dynamic_types_for_structs.sol        |   4 +-
 .../various/staticcall_for_view_and_pure.sol  |   4 +-
 .../various/swap_in_storage_overwrite.sol     |   2 +-
 .../semanticTests/various/value_complex.sol   |   2 +-
 .../semanticTests/various/value_insane.sol    |   2 +-
 .../viaYul/copy_struct_invalid_ir_bug.sol     |   2 +-
 .../fullSuite/abi_example1.yul                |  19 +-
 .../fullSuite/clear_after_if_continue.yul     |  12 +-
 .../fullSuite/create2_and_mask.yul            |   7 +-
 .../static_array_slot_computation.yul         |  15 +-
 .../unusedFunctionParameterPruner_loop.yul    |  11 +-
 195 files changed, 661 insertions(+), 740 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 4f74b2dea5..6f220005e1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * Yul Optimizer: If ``PUSH0`` is supported, favor zero literals over storing zero values in variables.
 
 
 Bugfixes:
diff --git a/libyul/optimiser/Metrics.cpp b/libyul/optimiser/Metrics.cpp
index 2eac515956..a48cbf91b1 100644
--- a/libyul/optimiser/Metrics.cpp
+++ b/libyul/optimiser/Metrics.cpp
@@ -158,6 +158,10 @@ void CodeCost::operator()(Literal const& _literal)
 	case LiteralKind::Number:
 		for (u256 n = u256(_literal.value.str()); n >= 0x100; n >>= 8)
 			cost++;
+		if (valueOfLiteral(_literal) == 0)
+			if (auto evmDialect = dynamic_cast<EVMDialect const*>(&m_dialect))
+				if (evmDialect->evmVersion().hasPush0())
+					--m_cost;
 		break;
 	case LiteralKind::String:
 		cost = _literal.value.str().size();
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
index 115bf34cc2..a232fed8fc 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all/output
@@ -189,12 +189,11 @@ object "C_6" {
                 /// @src 0:60:101  "contract C {..."
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(_1, _1)
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        return(0, 0)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
index 33faf3cf19..00a6b290f8 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_location_only/output
@@ -188,12 +188,11 @@ object "C_6" {
                 /// @src 0:60:101
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(_1, _1)
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        return(0, 0)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
index 3307150233..c8715df150 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_none/output
@@ -177,12 +177,11 @@ object "C_6" {
             {
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(_1, _1)
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        return(0, 0)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
index 9fb9a2dbc6..94dfb86426 100644
--- a/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
+++ b/test/cmdlineTests/debug_info_in_yul_snippet_escaping/output
@@ -434,65 +434,64 @@ object "D_27" {
                 mstore(_2, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _3 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_3)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_3, _3) }
-                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         /// @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..."
-                        let _4 := datasize("C_2")
-                        let _5 := add(_1, _4)
-                        let _6 := 0xffffffffffffffff
-                        if or(gt(_5, _6), lt(_5, _1))
+                        let _3 := datasize("C_2")
+                        let _4 := add(_1, _3)
+                        let _5 := 0xffffffffffffffff
+                        if or(gt(_4, _5), lt(_4, _1))
                         {
                             /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
-                            revert(_3, 0x24)
+                            revert(0, 0x24)
                         }
                         /// @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..."
-                        datacopy(_1, dataoffset("C_2"), _4)
-                        if iszero(create(/** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ _3, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _1, sub(_5, _1)))
+                        datacopy(_1, dataoffset("C_2"), _3)
+                        if iszero(create(/** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ 0, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _1, sub(_4, _1)))
                         {
                             /// @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..."
                             let pos := mload(_2)
-                            returndatacopy(pos, _3, returndatasize())
+                            returndatacopy(pos, 0, returndatasize())
                             revert(pos, returndatasize())
                         }
                         let memPtr := mload(_2)
                         let newFreePtr := add(memPtr, _2)
-                        if or(gt(newFreePtr, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _6), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr, memPtr))
+                        if or(gt(newFreePtr, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _5), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr, memPtr))
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
-                            revert(_3, 0x24)
+                            revert(0, 0x24)
                         }
                         mstore(_2, newFreePtr)
                         mstore(memPtr, 2)
-                        let _7 := 32
-                        mstore(add(memPtr, _7), "/*")
+                        let _6 := 32
+                        mstore(add(memPtr, _6), "/*")
                         let memPtr_1 := mload(_2)
                         let newFreePtr_1 := add(memPtr_1, 96)
-                        if or(gt(newFreePtr_1, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _6), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_1))
+                        if or(gt(newFreePtr_1, /** @src 0:446:491  "new /// @src 0:149:156  \"new C()\"..." */ _5), /** @src 0:279:599  "contract D /** @src 0:96:165  \"contract D {...\" *\/ {..." */ lt(newFreePtr_1, memPtr_1))
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
-                            revert(_3, 0x24)
+                            revert(0, 0x24)
                         }
                         mstore(_2, newFreePtr_1)
                         mstore(memPtr_1, 39)
-                        mstore(add(memPtr_1, _7), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
+                        mstore(add(memPtr_1, _6), 0x2f2a2a204073726320303a39363a313635202022636f6e74726163742044207b)
                         mstore(add(memPtr_1, _2), shl(200, 0x2e2e2e22202a2f))
                         let memPos := mload(_2)
-                        mstore(memPos, _7)
+                        mstore(memPos, _6)
                         let length := mload(memPtr_1)
-                        mstore(add(memPos, _7), length)
-                        let i := _3
-                        for { } lt(i, length) { i := add(i, _7) }
+                        mstore(add(memPos, _6), length)
+                        let i := 0
+                        for { } lt(i, length) { i := add(i, _6) }
                         {
-                            mstore(add(add(memPos, i), _2), mload(add(add(memPtr_1, i), _7)))
+                            mstore(add(add(memPos, i), _2), mload(add(add(memPtr_1, i), _6)))
                         }
-                        mstore(add(add(memPos, length), _2), _3)
+                        mstore(add(add(memPos, length), _2), 0)
                         return(memPos, add(sub(add(memPos, and(add(length, 31), not(31))), memPos), _2))
                     }
                 }
diff --git a/test/cmdlineTests/ir_compiler_subobjects/output b/test/cmdlineTests/ir_compiler_subobjects/output
index 0a505a4acd..39ef53f552 100644
--- a/test/cmdlineTests/ir_compiler_subobjects/output
+++ b/test/cmdlineTests/ir_compiler_subobjects/output
@@ -47,31 +47,30 @@ object "D_16" {
                 mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _2 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_2)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         /// @src 0:149:156  "new C()"
-                        let _3 := datasize("C_3")
-                        let _4 := add(_1, _3)
-                        if or(gt(_4, 0xffffffffffffffff), lt(_4, _1))
+                        let _2 := datasize("C_3")
+                        let _3 := add(_1, _2)
+                        if or(gt(_3, 0xffffffffffffffff), lt(_3, _1))
                         {
                             /// @src 0:96:165  "contract D {..."
-                            mstore(_2, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
-                            revert(_2, 0x24)
+                            revert(0, 0x24)
                         }
                         /// @src 0:149:156  "new C()"
-                        datacopy(_1, dataoffset("C_3"), _3)
-                        if iszero(create(/** @src 0:96:165  "contract D {..." */ _2, /** @src 0:149:156  "new C()" */ _1, sub(_4, _1)))
+                        datacopy(_1, dataoffset("C_3"), _2)
+                        if iszero(create(/** @src 0:96:165  "contract D {..." */ 0, /** @src 0:149:156  "new C()" */ _1, sub(_3, _1)))
                         {
                             /// @src 0:96:165  "contract D {..."
                             let pos := mload(64)
-                            returndatacopy(pos, _2, returndatasize())
+                            returndatacopy(pos, 0, returndatasize())
                             revert(pos, returndatasize())
                         }
-                        return(_2, _2)
+                        return(0, 0)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
index 50915c8dc3..5c822949a4 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_creation/output
@@ -17,12 +17,11 @@ object "D_12" {
                 /// @src 0:82:175  "contract D {..."
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(_1, _1)
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        return(0, 0)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
index b81febf73d..f6be1493ec 100644
--- a/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
+++ b/test/cmdlineTests/ir_with_assembly_no_memoryguard_runtime/output
@@ -19,12 +19,11 @@ object "D_8" {
                 /// @src 0:82:166  "contract D {..."
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(_1, _1)
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        return(0, 0)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/name_simplifier/output b/test/cmdlineTests/name_simplifier/output
index 170e58ffb1..936378bd33 100644
--- a/test/cmdlineTests/name_simplifier/output
+++ b/test/cmdlineTests/name_simplifier/output
@@ -21,101 +21,100 @@ object "C_59" {
                 let _2 := 4
                 if iszero(lt(calldatasize(), _2))
                 {
-                    let _3 := 0
-                    if eq(0xf8eddcc6, shr(224, calldataload(_3)))
+                    if eq(0xf8eddcc6, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_3, _3) }
-                        let _4 := 32
-                        if slt(add(calldatasize(), not(3)), _4) { revert(_3, _3) }
+                        if callvalue() { revert(0, 0) }
+                        let _3 := 32
+                        if slt(add(calldatasize(), not(3)), _3) { revert(0, 0) }
                         let offset := calldataload(_2)
-                        let _5 := 0xffffffffffffffff
-                        if gt(offset, _5) { revert(_3, _3) }
-                        if iszero(slt(add(offset, 35), calldatasize())) { revert(_3, _3) }
-                        let _6 := calldataload(add(_2, offset))
-                        let _7 := 36
-                        if gt(_6, _5)
+                        let _4 := 0xffffffffffffffff
+                        if gt(offset, _4) { revert(0, 0) }
+                        if iszero(slt(add(offset, 35), calldatasize())) { revert(0, 0) }
+                        let _5 := calldataload(add(_2, offset))
+                        let _6 := 36
+                        if gt(_5, _4)
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(_2, 0x41)
-                            revert(_3, _7)
+                            revert(0, _6)
                         }
-                        let _8 := shl(5, _6)
-                        let _9 := not(31)
-                        let newFreePtr := add(_1, and(add(_8, 63), _9))
-                        if or(gt(newFreePtr, _5), lt(newFreePtr, _1))
+                        let _7 := shl(5, _5)
+                        let _8 := not(31)
+                        let newFreePtr := add(_1, and(add(_7, 63), _8))
+                        if or(gt(newFreePtr, _4), lt(newFreePtr, _1))
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(_2, 0x41)
-                            revert(_3, _7)
+                            revert(0, _6)
                         }
-                        let _10 := 64
-                        mstore(_10, newFreePtr)
+                        let _9 := 64
+                        mstore(_9, newFreePtr)
                         let dst := _1
-                        mstore(_1, _6)
-                        dst := add(_1, _4)
+                        mstore(_1, _5)
+                        dst := add(_1, _3)
                         let dst_1 := dst
-                        let srcEnd := add(add(offset, _8), _7)
-                        if gt(srcEnd, calldatasize()) { revert(_3, _3) }
-                        let src := add(offset, _7)
-                        for { } lt(src, srcEnd) { src := add(src, _4) }
+                        let srcEnd := add(add(offset, _7), _6)
+                        if gt(srcEnd, calldatasize()) { revert(0, 0) }
+                        let src := add(offset, _6)
+                        for { } lt(src, srcEnd) { src := add(src, _3) }
                         {
-                            if slt(sub(calldatasize(), src), _4) { revert(_3, _3) }
-                            let memPtr := mload(_10)
-                            let newFreePtr_1 := add(memPtr, _4)
-                            if or(gt(newFreePtr_1, _5), lt(newFreePtr_1, memPtr))
+                            if slt(sub(calldatasize(), src), _3) { revert(0, 0) }
+                            let memPtr := mload(_9)
+                            let newFreePtr_1 := add(memPtr, _3)
+                            if or(gt(newFreePtr_1, _4), lt(newFreePtr_1, memPtr))
                             {
-                                mstore(_3, shl(224, 0x4e487b71))
+                                mstore(0, shl(224, 0x4e487b71))
                                 mstore(_2, 0x41)
-                                revert(_3, _7)
+                                revert(0, _6)
                             }
-                            mstore(_10, newFreePtr_1)
+                            mstore(_9, newFreePtr_1)
                             mstore(memPtr, calldataload(src))
                             mstore(dst, memPtr)
-                            dst := add(dst, _4)
+                            dst := add(dst, _3)
                         }
                         if iszero(mload(_1))
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(_2, 0x32)
-                            revert(_3, _7)
+                            revert(0, _6)
                         }
-                        sstore(_3, mload(/** @src 0:469:474  "_s[0]" */ mload(dst_1)))
+                        sstore(0, mload(/** @src 0:469:474  "_s[0]" */ mload(dst_1)))
                         /// @src 0:346:625  "contract C {..."
                         if iszero(lt(/** @src 0:492:493  "1" */ 0x01, /** @src 0:346:625  "contract C {..." */ mload(_1)))
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(_2, 0x32)
-                            revert(_3, _7)
+                            revert(0, _6)
                         }
-                        let _11 := mload(/** @src 0:489:494  "_s[1]" */ mload(/** @src 0:346:625  "contract C {..." */ add(_1, _10)))
-                        sstore(0x02, _11)
-                        let memPtr_1 := mload(_10)
+                        let _10 := mload(/** @src 0:489:494  "_s[1]" */ mload(/** @src 0:346:625  "contract C {..." */ add(_1, _9)))
+                        sstore(0x02, _10)
+                        let memPtr_1 := mload(_9)
                         let newFreePtr_2 := add(memPtr_1, 160)
-                        if or(gt(newFreePtr_2, _5), lt(newFreePtr_2, memPtr_1))
+                        if or(gt(newFreePtr_2, _4), lt(newFreePtr_2, memPtr_1))
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(_2, 0x41)
-                            revert(_3, _7)
+                            revert(0, _6)
                         }
-                        mstore(_10, newFreePtr_2)
+                        mstore(_9, newFreePtr_2)
                         mstore(memPtr_1, 100)
-                        mstore(add(memPtr_1, _4), "longstringlongstringlongstringlo")
-                        mstore(add(memPtr_1, _10), "ngstringlongstringlongstringlong")
-                        let _12 := 96
-                        mstore(add(memPtr_1, _12), "stringlongstringlongstringlongst")
+                        mstore(add(memPtr_1, _3), "longstringlongstringlongstringlo")
+                        mstore(add(memPtr_1, _9), "ngstringlongstringlongstringlong")
+                        let _11 := 96
+                        mstore(add(memPtr_1, _11), "stringlongstringlongstringlongst")
                         mstore(add(memPtr_1, 128), "ring")
-                        let memPos := mload(_10)
-                        mstore(memPos, _11)
-                        mstore(add(memPos, _4), _10)
+                        let memPos := mload(_9)
+                        mstore(memPos, _10)
+                        mstore(add(memPos, _3), _9)
                         let length := mload(memPtr_1)
-                        mstore(add(memPos, _10), length)
-                        let i := _3
-                        for { } lt(i, length) { i := add(i, _4) }
+                        mstore(add(memPos, _9), length)
+                        let i := 0
+                        for { } lt(i, length) { i := add(i, _3) }
                         {
-                            mstore(add(add(memPos, i), _12), mload(add(add(memPtr_1, i), _4)))
+                            mstore(add(add(memPos, i), _11), mload(add(add(memPtr_1, i), _3)))
                         }
-                        mstore(add(add(memPos, length), _12), _3)
-                        return(memPos, add(sub(add(memPos, and(add(length, 31), _9)), memPos), _12))
+                        mstore(add(add(memPos, length), _11), 0)
+                        return(memPos, add(sub(add(memPos, and(add(length, 31), _8)), memPos), _11))
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/optimizer_array_sload/output b/test/cmdlineTests/optimizer_array_sload/output
index 98b23306af..f2f95f15d1 100644
--- a/test/cmdlineTests/optimizer_array_sload/output
+++ b/test/cmdlineTests/optimizer_array_sload/output
@@ -21,26 +21,25 @@ object "Arraysum_34" {
                 let _1 := 4
                 if iszero(lt(calldatasize(), _1))
                 {
-                    let _2 := 0
-                    if eq(0x81d73423, shr(224, calldataload(_2)))
+                    if eq(0x81d73423, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
-                        let var_sum := _2
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        let var_sum := 0
                         /// @src 0:368:378  "uint i = 0"
-                        let var_i := /** @src 0:80:429  "contract Arraysum {..." */ _2
-                        let _3 := sload(_2)
+                        let var_i := /** @src 0:80:429  "contract Arraysum {..." */ var_sum
+                        let _2 := sload(var_sum)
                         /// @src 0:364:423  "for(uint i = 0; i < values.length; i++)..."
                         for { }
-                        /** @src 0:380:397  "i < values.length" */ lt(var_i, _3)
+                        /** @src 0:380:397  "i < values.length" */ lt(var_i, _2)
                         /// @src 0:368:378  "uint i = 0"
                         {
                             /// @src 0:80:429  "contract Arraysum {..."
                             if eq(var_i, not(0))
                             {
-                                mstore(_2, shl(224, 0x4e487b71))
+                                mstore(0, shl(224, 0x4e487b71))
                                 mstore(_1, 0x11)
-                                revert(_2, 0x24)
+                                revert(0, 0x24)
                             }
                             /// @src 0:399:402  "i++"
                             var_i := /** @src 0:80:429  "contract Arraysum {..." */ add(var_i, 1)
@@ -48,13 +47,13 @@ object "Arraysum_34" {
                         /// @src 0:399:402  "i++"
                         {
                             /// @src 0:80:429  "contract Arraysum {..."
-                            mstore(_2, _2)
+                            mstore(0, 0)
                             let sum := add(var_sum, sload(add(18569430475105882587588266137607568536673111973893317399460219858819262702947, var_i)))
                             if gt(var_sum, sum)
                             {
-                                mstore(_2, shl(224, 0x4e487b71))
+                                mstore(0, shl(224, 0x4e487b71))
                                 mstore(_1, 0x11)
-                                revert(_2, 0x24)
+                                revert(0, 0x24)
                             }
                             /// @src 0:407:423  "sum += values[i]"
                             var_sum := sum
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index 28a76eb956..339df2093e 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -82,20 +82,16 @@ sub_0: assembly {
         /* \"C\":79:428  contract C... */
       0x80
       0x40
-      dup2
-      dup2
+      swap1
+      dup1
+      dup3
       mstore
       jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
       0x00
       dup1
       revert
     tag_2:
-      0x00
-      swap2
-      dup3
-      calldataload
-      0xe0
-      shr
+      shr(0xe0, calldataload(0x00))
       swap1
       dup2
       0x26121ff0
@@ -117,13 +113,8 @@ sub_0: assembly {
       revert
     tag_8:
       jumpi(tag_12, callvalue)
-      dup2
-      add(calldatasize, not(0x03))
-      slt
-      tag_12
-      jumpi
-      dup2
-      sload
+      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
+      sload(0x00)
       sub(shl(0xff, 0x01), 0x01)
       dup2
       eq
@@ -131,11 +122,11 @@ sub_0: assembly {
       jumpi
       0x01
       add
-      swap2
-      dup3
+      swap1
       dup2
+      0x00
       sstore
-      dup2
+      dup1
       mload
       shl(0xe4, 0x026121ff)
         /* \"C\":403:411  this.f() */
@@ -152,37 +143,40 @@ sub_0: assembly {
         /* \"C\":403:411  this.f() */
       gas
       staticcall
-      swap2
-      dup3
+      swap1
+      dup2
       iszero
       tag_16
       jumpi
-      dup1
-      swap3
+        /* \"C\":79:428  contract C... */
+      0x00
+        /* \"C\":403:411  this.f() */
+      swap2
       tag_18
       jumpi
         /* \"C\":79:428  contract C... */
     tag_19:
-        /* \"C\":403:411  this.f() */
-      0x20
         /* \"C\":392:411  stateVar + this.f() */
-      dup5
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      pop
       tag_20
-        /* \"C\":392:411  stateVar + this.f() */
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
       tag_21
-      dup7
-      dup10
+        /* \"C\":392:411  stateVar + this.f() */
+      swap2
+        /* \"C\":403:411  this.f() */
+      0x20
+        /* \"C\":392:411  stateVar + this.f() */
+      swap5
       tag_1
       jump\t// in
-    tag_21:
+    tag_20:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       swap1
       tag_1
       jump\t// in
-    tag_20:
+    tag_21:
         /* \"C\":79:428  contract C... */
       swap1
       mload
@@ -193,8 +187,6 @@ sub_0: assembly {
         /* \"C\":403:411  this.f() */
     tag_18:
       swap1
-      swap2
-      pop
       0x20
       returndatasize
       dup2
@@ -238,9 +230,8 @@ sub_0: assembly {
       pop
       mload
         /* \"C\":392:411  stateVar + this.f() */
-      tag_21
+      tag_20
         /* \"C\":403:411  this.f() */
-      0x20
       jump(tag_19)
         /* \"C\":79:428  contract C... */
     tag_26:
@@ -263,20 +254,21 @@ sub_0: assembly {
       jump(tag_23)
     tag_16:
         /* \"C\":79:428  contract C... */
-      dup4
+      dup3
       mload
-      swap1
       returndatasize
-      swap1
+      0x00
       dup3
       returndatacopy
       returndatasize
       swap1
       revert
     tag_14:
+        /* \"C\":117:119  41 */
       shl(0xe0, 0x4e487b71)
+        /* \"C\":79:428  contract C... */
+      0x00
         /* \"C\":117:119  41 */
-      dup4
       mstore
       0x11
         /* \"C\":79:428  contract C... */
@@ -284,24 +276,22 @@ sub_0: assembly {
         /* \"C\":117:119  41 */
       mstore
       0x24
-      dup4
+        /* \"C\":79:428  contract C... */
+      0x00
+        /* \"C\":117:119  41 */
       revert
         /* \"C\":79:428  contract C... */
     tag_12:
-      pop
+      0x00
       dup1
       revert
     tag_6:
       pop
       jumpi(tag_12, callvalue)
-      dup2
-      add(calldatasize, not(0x03))
-      slt
-      tag_12
-      jumpi
+      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
       0x20
-      swap2
-      sload
+      swap1
+      sload(0x00)
       swap1
       mload
       swap1
@@ -309,22 +299,17 @@ sub_0: assembly {
       mstore
       return
     tag_4:
-      dup4
-      swap1
       jumpi(tag_12, callvalue)
-      dup2
-      add(calldatasize, not(0x03))
-      slt
-      tag_12
-      jumpi
+      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
         /* \"C\":290:298  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":117:119  41 */
-      dup1
-      0x29
-      add
       swap1
       dup2
+      0x29
+      add
+      swap2
+      dup3
       slt
       0x01
       and
@@ -332,8 +317,7 @@ sub_0: assembly {
       jumpi
         /* \"C\":79:428  contract C... */
       0x20
-      swap3
-      pop
+      swap2
       dup2
       mstore
       return
@@ -360,13 +344,9 @@ sub_0: assembly {
       iszero
       and
       or
-      tag_38
+      tag_14
       jumpi
       jump\t// out
-    tag_38:
-      mstore(0x00, shl(0xe0, 0x4e487b71))
-      mstore(0x04, 0x11)
-      revert(0x00, 0x24)
 
     auxdata: <AUXDATA REMOVED>
 }
@@ -471,20 +451,16 @@ sub_0: assembly {
         /* \"D\":91:166  contract D is C(3)... */
       0x80
       0x40
-      dup2
-      dup2
+      swap1
+      dup1
+      dup3
       mstore
       jumpi(tag_2, iszero(lt(calldatasize, 0x04)))
       0x00
       dup1
       revert
     tag_2:
-      0x00
-      swap2
-      dup3
-      calldataload
-      0xe0
-      shr
+      shr(0xe0, calldataload(0x00))
       swap1
       dup2
       0x26121ff0
@@ -506,13 +482,8 @@ sub_0: assembly {
       revert
     tag_8:
       jumpi(tag_12, callvalue)
-      dup2
-      add(calldatasize, not(0x03))
-      slt
-      tag_12
-      jumpi
-      dup2
-      sload
+      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
+      sload(0x00)
       sub(shl(0xff, 0x01), 0x01)
       dup2
       eq
@@ -520,11 +491,11 @@ sub_0: assembly {
       jumpi
       0x01
       add
-      swap2
-      dup3
+      swap1
       dup2
+      0x00
       sstore
-      dup2
+      dup1
       mload
       shl(0xe4, 0x026121ff)
         /* \"C\":403:411  this.f() */
@@ -541,37 +512,40 @@ sub_0: assembly {
         /* \"C\":403:411  this.f() */
       gas
       staticcall
-      swap2
-      dup3
+      swap1
+      dup2
       iszero
       tag_16
       jumpi
-      dup1
-      swap3
+        /* \"D\":91:166  contract D is C(3)... */
+      0x00
+        /* \"C\":403:411  this.f() */
+      swap2
       tag_18
       jumpi
         /* \"D\":91:166  contract D is C(3)... */
     tag_19:
-        /* \"C\":403:411  this.f() */
-      0x20
         /* \"C\":392:411  stateVar + this.f() */
-      dup5
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      pop
       tag_20
-        /* \"C\":392:411  stateVar + this.f() */
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
       tag_21
-      dup7
-      dup10
+        /* \"C\":392:411  stateVar + this.f() */
+      swap2
+        /* \"C\":403:411  this.f() */
+      0x20
+        /* \"C\":392:411  stateVar + this.f() */
+      swap5
       tag_1
       jump\t// in
-    tag_21:
+    tag_20:
         /* \"C\":414:422  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":392:422  stateVar + this.f() + immutVar */
       swap1
       tag_1
       jump\t// in
-    tag_20:
+    tag_21:
         /* \"D\":91:166  contract D is C(3)... */
       swap1
       mload
@@ -582,8 +556,6 @@ sub_0: assembly {
         /* \"C\":403:411  this.f() */
     tag_18:
       swap1
-      swap2
-      pop
       0x20
       returndatasize
       dup2
@@ -627,9 +599,8 @@ sub_0: assembly {
       pop
       mload
         /* \"C\":392:411  stateVar + this.f() */
-      tag_21
+      tag_20
         /* \"C\":403:411  this.f() */
-      0x20
       jump(tag_19)
         /* \"D\":91:166  contract D is C(3)... */
     tag_26:
@@ -652,20 +623,21 @@ sub_0: assembly {
       jump(tag_23)
     tag_16:
         /* \"D\":91:166  contract D is C(3)... */
-      dup4
+      dup3
       mload
-      swap1
       returndatasize
-      swap1
+      0x00
       dup3
       returndatacopy
       returndatasize
       swap1
       revert
     tag_14:
+        /* \"C\":117:119  41 */
       shl(0xe0, 0x4e487b71)
+        /* \"D\":91:166  contract D is C(3)... */
+      0x00
         /* \"C\":117:119  41 */
-      dup4
       mstore
       0x11
         /* \"D\":91:166  contract D is C(3)... */
@@ -673,24 +645,22 @@ sub_0: assembly {
         /* \"C\":117:119  41 */
       mstore
       0x24
-      dup4
+        /* \"D\":91:166  contract D is C(3)... */
+      0x00
+        /* \"C\":117:119  41 */
       revert
         /* \"D\":91:166  contract D is C(3)... */
     tag_12:
-      pop
+      0x00
       dup1
       revert
     tag_6:
       pop
       jumpi(tag_12, callvalue)
-      dup2
-      add(calldatasize, not(0x03))
-      slt
-      tag_12
-      jumpi
+      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
       0x20
-      swap2
-      sload
+      swap1
+      sload(0x00)
       swap1
       mload
       swap1
@@ -698,22 +668,17 @@ sub_0: assembly {
       mstore
       return
     tag_4:
-      dup4
-      swap1
       jumpi(tag_12, callvalue)
-      dup2
-      add(calldatasize, not(0x03))
-      slt
-      tag_12
-      jumpi
+      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
         /* \"C\":290:298  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":117:119  41 */
-      dup1
-      0x29
-      add
       swap1
       dup2
+      0x29
+      add
+      swap2
+      dup3
       slt
       0x01
       and
@@ -721,8 +686,7 @@ sub_0: assembly {
       jumpi
         /* \"D\":91:166  contract D is C(3)... */
       0x20
-      swap3
-      pop
+      swap2
       dup2
       mstore
       return
@@ -749,13 +713,9 @@ sub_0: assembly {
       iszero
       and
       or
-      tag_38
+      tag_14
       jumpi
       jump\t// out
-    tag_38:
-      mstore(0x00, shl(0xe0, 0x4e487b71))
-      mstore(0x04, 0x11)
-      revert(0x00, 0x24)
 
     auxdata: <AUXDATA REMOVED>
 }
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
index 2fe90b70ef..ee958b55b0 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_all/output.json
@@ -194,12 +194,11 @@ object \"C_6\" {
                 /// @src 0:60:101  \"contract C {...\"
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(_1, _1)
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        return(0, 0)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
index 3600f633c8..007b7fc62b 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_location_only/output.json
@@ -193,12 +193,11 @@ object \"C_6\" {
                 /// @src 0:60:101
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(_1, _1)
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        return(0, 0)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
index 7393f8b444..884da9eb97 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_and_evm_asm_print_none/output.json
@@ -182,12 +182,11 @@ object \"C_6\" {
             {
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _1 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_1)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_1, _1) }
-                        if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-                        return(_1, _1)
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        return(0, 0)
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index d564db75a7..c563f88052 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -658,78 +658,77 @@ object \"C_54\" {
                 mstore(_2, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _3 := 0
-                    switch shr(224, calldataload(_3))
+                    switch shr(224, calldataload(0))
                     case 0x26121ff0 {
-                        if callvalue() { revert(_3, _3) }
-                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         /// @src 0:297:305  \"immutVar\"
-                        let _4 := loadimmutable(\"8\")
+                        let _3 := loadimmutable(\"8\")
                         /// @src 0:79:435  \"contract C...\"
-                        let sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 0:79:435  \"contract C...\" */ _4)
-                        if and(1, slt(sum, _4))
+                        let sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 0:79:435  \"contract C...\" */ _3)
+                        if and(1, slt(sum, _3))
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x11)
-                            revert(_3, 0x24)
+                            revert(0, 0x24)
                         }
                         mstore(_1, sum)
                         return(_1, 32)
                     }
                     case 0x793816ec {
-                        if callvalue() { revert(_3, _3) }
-                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
-                        let _5 := sload(_3)
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        let _4 := sload(0)
                         let memPos := mload(_2)
-                        mstore(memPos, _5)
+                        mstore(memPos, _4)
                         return(memPos, 32)
                     }
                     case 0x9942ec6f {
-                        if callvalue() { revert(_3, _3) }
-                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
-                        let _6 := sload(_3)
-                        if eq(_6, sub(shl(255, 1), 1))
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        let _5 := sload(0)
+                        if eq(_5, sub(shl(255, 1), 1))
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x11)
-                            revert(_3, 0x24)
+                            revert(0, 0x24)
                         }
-                        let ret := add(_6, 1)
-                        sstore(_3, ret)
+                        let ret := add(_5, 1)
+                        sstore(0, ret)
                         /// @src 0:410:418  \"this.f()\"
-                        let _7 := /** @src 0:79:435  \"contract C...\" */ mload(_2)
+                        let _6 := /** @src 0:79:435  \"contract C...\" */ mload(_2)
                         /// @src 0:410:418  \"this.f()\"
-                        mstore(_7, /** @src 0:79:435  \"contract C...\" */ shl(228, 0x026121ff))
+                        mstore(_6, /** @src 0:79:435  \"contract C...\" */ shl(228, 0x026121ff))
                         /// @src 0:410:418  \"this.f()\"
-                        let _8 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _7, /** @src 0:79:435  \"contract C...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _7, 32)
-                        if iszero(_8)
+                        let _7 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _6, /** @src 0:79:435  \"contract C...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _6, 32)
+                        if iszero(_7)
                         {
                             /// @src 0:79:435  \"contract C...\"
                             let pos := mload(_2)
-                            returndatacopy(pos, _3, returndatasize())
+                            returndatacopy(pos, 0, returndatasize())
                             revert(pos, returndatasize())
                         }
                         /// @src 0:410:418  \"this.f()\"
-                        let expr := /** @src 0:79:435  \"contract C...\" */ _3
+                        let expr := /** @src 0:79:435  \"contract C...\" */ 0
                         /// @src 0:410:418  \"this.f()\"
-                        if _8
+                        if _7
                         {
-                            let _9 := 32
-                            if gt(_9, returndatasize()) { _9 := returndatasize() }
+                            let _8 := 32
+                            if gt(_8, returndatasize()) { _8 := returndatasize() }
                             /// @src 0:79:435  \"contract C...\"
-                            let newFreePtr := add(_7, and(add(_9, 31), not(31)))
-                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _7))
+                            let newFreePtr := add(_6, and(add(_8, 31), not(31)))
+                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _6))
                             {
-                                mstore(_3, shl(224, 0x4e487b71))
+                                mstore(expr, shl(224, 0x4e487b71))
                                 mstore(4, 0x41)
-                                revert(_3, 0x24)
+                                revert(expr, 0x24)
                             }
                             mstore(_2, newFreePtr)
-                            if slt(sub(/** @src 0:410:418  \"this.f()\" */ add(_7, _9), /** @src 0:79:435  \"contract C...\" */ _7), /** @src 0:410:418  \"this.f()\" */ 32)
+                            if slt(sub(/** @src 0:410:418  \"this.f()\" */ add(_6, _8), /** @src 0:79:435  \"contract C...\" */ _6), /** @src 0:410:418  \"this.f()\" */ 32)
                             /// @src 0:79:435  \"contract C...\"
-                            { revert(_3, _3) }
+                            { revert(expr, expr) }
                             /// @src 0:410:418  \"this.f()\"
-                            expr := /** @src 0:79:435  \"contract C...\" */ mload(_7)
+                            expr := /** @src 0:79:435  \"contract C...\" */ mload(_6)
                         }
                         /// @src 0:399:418  \"stateVar + this.f()\"
                         let expr_1 := checked_add_int256(ret, expr)
@@ -741,8 +740,8 @@ object \"C_54\" {
                         return(memPos_1, /** @src 0:410:418  \"this.f()\" */ 32)
                     }
                     case /** @src 0:79:435  \"contract C...\" */ 0xa00b982b {
-                        if callvalue() { revert(_3, _3) }
-                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         let memPos_2 := mload(_2)
                         mstore(memPos_2, /** @src 0:124:126  \"41\" */ 0x29)
                         /// @src 0:79:435  \"contract C...\"
@@ -1504,78 +1503,77 @@ object \"D_72\" {
                 mstore(_2, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _3 := 0
-                    switch shr(224, calldataload(_3))
+                    switch shr(224, calldataload(0))
                     case 0x26121ff0 {
-                        if callvalue() { revert(_3, _3) }
-                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         /// @src 0:297:305  \"immutVar\"
-                        let _4 := loadimmutable(\"8\")
+                        let _3 := loadimmutable(\"8\")
                         /// @src 1:91:166  \"contract D is C(3)...\"
-                        let sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 1:91:166  \"contract D is C(3)...\" */ _4)
-                        if and(1, slt(sum, _4))
+                        let sum := add(/** @src 0:124:126  \"41\" */ 0x29, /** @src 1:91:166  \"contract D is C(3)...\" */ _3)
+                        if and(1, slt(sum, _3))
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x11)
-                            revert(_3, 0x24)
+                            revert(0, 0x24)
                         }
                         mstore(_1, sum)
                         return(_1, 32)
                     }
                     case 0x793816ec {
-                        if callvalue() { revert(_3, _3) }
-                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
-                        let _5 := sload(_3)
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        let _4 := sload(0)
                         let memPos := mload(_2)
-                        mstore(memPos, _5)
+                        mstore(memPos, _4)
                         return(memPos, 32)
                     }
                     case 0x9942ec6f {
-                        if callvalue() { revert(_3, _3) }
-                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
-                        let _6 := sload(_3)
-                        if eq(_6, sub(shl(255, 1), 1))
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+                        let _5 := sload(0)
+                        if eq(_5, sub(shl(255, 1), 1))
                         {
-                            mstore(_3, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x11)
-                            revert(_3, 0x24)
+                            revert(0, 0x24)
                         }
-                        let ret := add(_6, 1)
-                        sstore(_3, ret)
+                        let ret := add(_5, 1)
+                        sstore(0, ret)
                         /// @src 0:410:418  \"this.f()\"
-                        let _7 := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_2)
+                        let _6 := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_2)
                         /// @src 0:410:418  \"this.f()\"
-                        mstore(_7, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
+                        mstore(_6, /** @src 1:91:166  \"contract D is C(3)...\" */ shl(228, 0x026121ff))
                         /// @src 0:410:418  \"this.f()\"
-                        let _8 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _7, /** @src 1:91:166  \"contract D is C(3)...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _7, 32)
-                        if iszero(_8)
+                        let _7 := staticcall(gas(), /** @src 0:410:414  \"this\" */ address(), /** @src 0:410:418  \"this.f()\" */ _6, /** @src 1:91:166  \"contract D is C(3)...\" */ 4, /** @src 0:410:418  \"this.f()\" */ _6, 32)
+                        if iszero(_7)
                         {
                             /// @src 1:91:166  \"contract D is C(3)...\"
                             let pos := mload(_2)
-                            returndatacopy(pos, _3, returndatasize())
+                            returndatacopy(pos, 0, returndatasize())
                             revert(pos, returndatasize())
                         }
                         /// @src 0:410:418  \"this.f()\"
-                        let expr := /** @src 1:91:166  \"contract D is C(3)...\" */ _3
+                        let expr := /** @src 1:91:166  \"contract D is C(3)...\" */ 0
                         /// @src 0:410:418  \"this.f()\"
-                        if _8
+                        if _7
                         {
-                            let _9 := 32
-                            if gt(_9, returndatasize()) { _9 := returndatasize() }
+                            let _8 := 32
+                            if gt(_8, returndatasize()) { _8 := returndatasize() }
                             /// @src 1:91:166  \"contract D is C(3)...\"
-                            let newFreePtr := add(_7, and(add(_9, 31), not(31)))
-                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _7))
+                            let newFreePtr := add(_6, and(add(_8, 31), not(31)))
+                            if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _6))
                             {
-                                mstore(_3, shl(224, 0x4e487b71))
+                                mstore(expr, shl(224, 0x4e487b71))
                                 mstore(4, 0x41)
-                                revert(_3, 0x24)
+                                revert(expr, 0x24)
                             }
                             mstore(_2, newFreePtr)
-                            if slt(sub(/** @src 0:410:418  \"this.f()\" */ add(_7, _9), /** @src 1:91:166  \"contract D is C(3)...\" */ _7), /** @src 0:410:418  \"this.f()\" */ 32)
+                            if slt(sub(/** @src 0:410:418  \"this.f()\" */ add(_6, _8), /** @src 1:91:166  \"contract D is C(3)...\" */ _6), /** @src 0:410:418  \"this.f()\" */ 32)
                             /// @src 1:91:166  \"contract D is C(3)...\"
-                            { revert(_3, _3) }
+                            { revert(expr, expr) }
                             /// @src 0:410:418  \"this.f()\"
-                            expr := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_7)
+                            expr := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_6)
                         }
                         /// @src 0:399:418  \"stateVar + this.f()\"
                         let expr_1 := checked_add_int256(ret, expr)
@@ -1587,8 +1585,8 @@ object \"D_72\" {
                         return(memPos_1, /** @src 0:410:418  \"this.f()\" */ 32)
                     }
                     case /** @src 1:91:166  \"contract D is C(3)...\" */ 0xa00b982b {
-                        if callvalue() { revert(_3, _3) }
-                        if slt(add(calldatasize(), not(3)), _3) { revert(_3, _3) }
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         let memPos_2 := mload(_2)
                         mstore(memPos_2, /** @src 0:124:126  \"41\" */ 0x29)
                         /// @src 1:91:166  \"contract D is C(3)...\"
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
index 4d5aa7f70d..c9fefe0518 100644
--- a/test/cmdlineTests/viair_subobject_optimization/output
+++ b/test/cmdlineTests/viair_subobject_optimization/output
@@ -110,103 +110,87 @@ sub_0: assembly {
       dup1
       revert
     tag_1:
-      0x00
-      dup1
-      calldataload
-      0xe0
-      shr
-      0x26121ff0
-      eq
-      tag_3
-      jumpi
+      jumpi(tag_3, eq(0x26121ff0, shr(0xe0, calldataload(0x00))))
       0x00
       dup1
       revert
     tag_3:
       jumpi(tag_7, callvalue)
-      dup1
-      add(calldatasize, not(0x03))
-      slt
-      tag_7
-      jumpi
+      jumpi(tag_7, slt(add(not(0x03), calldatasize), 0x00))
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
       dataSize(sub_0)
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      swap2
-      not(0x1f)
       swap1
-      dup2
+      not(0x1f)
+      dup1
       0x3f
-      dup6
+      dup5
       add
       and
-      dup2
+      dup3
       add
-      swap3
-      dup2
-      dup5
+      swap2
+      dup1
+      dup4
       lt
       0xffffffffffffffff
-      dup6
+      dup5
       gt
       or
       tag_9
       jumpi
+      swap3
       swap1
-      swap2
       0x40
-      swap4
-      dup5
+      swap3
+      dup4
       mstore
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
+      dup2
       dup5
-      dup4
       mstore
       0x20
-      swap5
+      swap2
       dataOffset(sub_0)
+      dup4
       dup7
-      dup6
       add
       codecopy
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      dup4
+      dup3
       mload
-      swap5
+      swap4
+      dup3
       dup6
-      swap3
-      dup2
+      swap4
       dup5
       mstore
-      dup5
+      dup2
       mload
       swap2
       dup3
-      dup2
+      dup3
       dup7
       add
       mstore
-      dup2
-      swap6
+      0x00
     tag_11:
       dup4
-      dup8
+      dup2
       lt
       tag_12
       jumpi
       pop
       pop
+      0x00
+      dup5
       dup4
-      swap5
-      pop
-      dup6
-      dup3
-      0x1f
-      swap5
-      swap6
       add
+      dup7
       add
       mstore
+      pop
+      0x1f
       add
       and
       dup2
@@ -216,35 +200,30 @@ sub_0: assembly {
       swap1
       return
     tag_12:
-      dup7
+      dup2
       dup2
       add
-      dup3
+      dup4
       add
       mload
-      dup10
       dup9
+      dup3
       add
-      dup10
+      dup9
       add
       mstore
-      swap6
-      dup2
-      add
-      swap6
-      dup9
+      dup8
       swap6
       pop
+      dup3
+      add
       jump(tag_11)
     tag_9:
-      shl(0xe0, 0x4e487b71)
-      dup2
-      mstore
+      mstore(0x00, shl(0xe0, 0x4e487b71))
       mstore(0x04, 0x41)
-      0x24
-      swap1
-      revert
+      revert(0x00, 0x24)
     tag_7:
+      0x00
       dup1
       revert
     stop
diff --git a/test/cmdlineTests/viair_subobjects/output b/test/cmdlineTests/viair_subobjects/output
index 500472f8a8..7a6bc8e657 100644
--- a/test/cmdlineTests/viair_subobjects/output
+++ b/test/cmdlineTests/viair_subobjects/output
@@ -59,31 +59,30 @@ object "D_16" {
                 mstore(64, _1)
                 if iszero(lt(calldatasize(), 4))
                 {
-                    let _2 := 0
-                    if eq(0x26121ff0, shr(224, calldataload(_2)))
+                    if eq(0x26121ff0, shr(224, calldataload(0)))
                     {
-                        if callvalue() { revert(_2, _2) }
-                        if slt(add(calldatasize(), not(3)), _2) { revert(_2, _2) }
+                        if callvalue() { revert(0, 0) }
+                        if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         /// @src 0:149:156  "new C()"
-                        let _3 := datasize("C_3")
-                        let _4 := add(_1, _3)
-                        if or(gt(_4, 0xffffffffffffffff), lt(_4, _1))
+                        let _2 := datasize("C_3")
+                        let _3 := add(_1, _2)
+                        if or(gt(_3, 0xffffffffffffffff), lt(_3, _1))
                         {
                             /// @src 0:96:165  "contract D {..."
-                            mstore(_2, shl(224, 0x4e487b71))
+                            mstore(0, shl(224, 0x4e487b71))
                             mstore(4, 0x41)
-                            revert(_2, 0x24)
+                            revert(0, 0x24)
                         }
                         /// @src 0:149:156  "new C()"
-                        datacopy(_1, dataoffset("C_3"), _3)
-                        if iszero(create(/** @src 0:96:165  "contract D {..." */ _2, /** @src 0:149:156  "new C()" */ _1, sub(_4, _1)))
+                        datacopy(_1, dataoffset("C_3"), _2)
+                        if iszero(create(/** @src 0:96:165  "contract D {..." */ 0, /** @src 0:149:156  "new C()" */ _1, sub(_3, _1)))
                         {
                             /// @src 0:96:165  "contract D {..."
                             let pos := mload(64)
-                            returndatacopy(pos, _2, returndatasize())
+                            returndatacopy(pos, 0, returndatasize())
                             revert(pos, returndatasize())
                         }
-                        return(_2, _2)
+                        return(0, 0)
                     }
                 }
                 revert(0, 0)
diff --git a/test/libsolidity/gasTests/abiv2_optimised.sol b/test/libsolidity/gasTests/abiv2_optimised.sol
index 2d4100df48..608d1c8ba3 100644
--- a/test/libsolidity/gasTests/abiv2_optimised.sol
+++ b/test/libsolidity/gasTests/abiv2_optimised.sol
@@ -17,9 +17,9 @@ contract C {
 // optimize-yul: true
 // ----
 // creation:
-//   codeDepositCost: 640600
-//   executionCost: 674
-//   totalCost: 641274
+//   codeDepositCost: 638600
+//   executionCost: 668
+//   totalCost: 639268
 // external:
 //   a(): 2283
 //   b(uint256): 4649
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
index c13f004fba..b4ef43c441 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_decode_v2_storage.sol
@@ -21,6 +21,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 0x8, 0x40, 0x3, 0x9, 0xa, 0xb
-// gas irOptimized: 203166
+// gas irOptimized: 203149
 // gas legacy: 206263
-// gas legacyOptimized: 203151
+// gas legacyOptimized: 203156
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index e043853e09..fe38d8078a 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -59,10 +59,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 361321
+// gas irOptimized: 360827
 // gas legacy: 411269
 // gas legacyOptimized: 317754
 // test_uint256() ->
-// gas irOptimized: 509988
+// gas irOptimized: 509533
 // gas legacy: 577469
 // gas legacyOptimized: 440931
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index 575b759074..9edb07a18c 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -24,6 +24,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 166506
+// gas irOptimized: 166467
 // gas legacy: 169283
 // gas legacyOptimized: 167248
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 8d98179d91..beb283664e 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 361321
+// gas irOptimized: 360827
 // gas legacy: 411269
 // gas legacyOptimized: 317754
 // test_uint256() ->
-// gas irOptimized: 509988
+// gas irOptimized: 509533
 // gas legacy: 577469
 // gas legacyOptimized: 440931
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
index cdf2d3087d..5e50d5e9a8 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2.sol
@@ -50,6 +50,6 @@ contract C {
 // f2() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f3() -> 0x20, 0xa0, 0x1, 0x60, 0x2, 0x3, "abc"
 // f4() -> 0x20, 0x160, 0x1, 0x80, 0xc0, 0x2, 0x3, "abc", 0x7, 0x40, 0x2, 0x2, 0x3
-// gas irOptimized: 112641
+// gas irOptimized: 112630
 // gas legacy: 114794
 // gas legacyOptimized: 112572
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index add5458967..901e158dbc 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -30,6 +30,6 @@ contract C is B {
 }
 // ----
 // test() -> 77
-// gas irOptimized: 119177
+// gas irOptimized: 110731
 // gas legacy: 151866
 // gas legacyOptimized: 110359
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 915514754a..bd8517a959 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -20,6 +20,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 127012
+// gas irOptimized: 126849
 // gas legacy: 139800
 // gas legacyOptimized: 119092
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
index 796488a9fe..2af8b8cde9 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -33,7 +33,7 @@ contract C {
 // f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1, 5, 6 -> 0x20, 0x40, 5, 2
 // f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1 -> FAILURE
 // f_storage(uint256[],uint256[2]): 0x20, 1, 2 -> 0x20, 0x60, 0x20, 1, 2
-// gas irOptimized: 111650
+// gas irOptimized: 111639
 // gas legacy: 112944
 // gas legacyOptimized: 112092
 // f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x20, 0x80, 0x20, 2, 5, 6
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index c72ac00750..6685776d06 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -18,10 +18,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 180823
+// gas irOptimized: 180808
 // gas legacy: 184830
 // gas legacyOptimized: 181493
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
-// gas irOptimized: 112459
+// gas irOptimized: 112425
 // gas legacy: 115398
 // gas legacyOptimized: 112982
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index 03084f0a35..c0c2fbfe38 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -8,6 +8,6 @@ contract C {
 }
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
-// gas irOptimized: 135693
+// gas irOptimized: 135662
 // gas legacy: 137278
-// gas legacyOptimized: 136043
+// gas legacyOptimized: 136048
diff --git a/test/libsolidity/semanticTests/array/array_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
index 116582415f..1e75afeffc 100644
--- a/test/libsolidity/semanticTests/array/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
@@ -26,7 +26,7 @@ contract C {
 // index(uint256): 10 -> true
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
-// gas irOptimized: 135073
+// gas irOptimized: 135060
 // gas legacy: 241703
 // gas legacyOptimized: 151613
 // accessIndex(uint256,int256): 10, 1 -> 2
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_access.sol b/test/libsolidity/semanticTests/array/array_storage_index_access.sol
index 1b6e461a36..1ea50824fd 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_access.sol
@@ -16,38 +16,38 @@ contract C {
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
-// gas irOptimized: 3019936
+// gas irOptimized: 3016570
 // gas legacy: 3069098
 // gas legacyOptimized: 3013250
 // test_indices(uint256): 5 ->
-// gas irOptimized: 577789
+// gas irOptimized: 576716
 // gas legacy: 574754
 // gas legacyOptimized: 572383
 // test_indices(uint256): 10 ->
-// gas irOptimized: 158291
+// gas irOptimized: 158059
 // gas legacy: 162468
 // gas legacyOptimized: 158336
 // test_indices(uint256): 15 ->
-// gas irOptimized: 173296
+// gas irOptimized: 172984
 // gas legacy: 179513
 // gas legacyOptimized: 173606
 // test_indices(uint256): 0xFF ->
-// gas irOptimized: 5678606
+// gas irOptimized: 5672104
 // gas legacy: 5775928
 // gas legacyOptimized: 5666726
 // test_indices(uint256): 1000 ->
-// gas irOptimized: 18197173
+// gas irOptimized: 18173701
 // gas legacy: 18583810
 // gas legacyOptimized: 18171248
 // test_indices(uint256): 129 ->
-// gas irOptimized: 4156312
+// gas irOptimized: 4147676
 // gas legacy: 4164468
 // gas legacyOptimized: 4122100
 // test_indices(uint256): 128 ->
-// gas irOptimized: 411289
+// gas irOptimized: 409209
 // gas legacy: 463706
 // gas legacyOptimized: 418061
 // test_indices(uint256): 1 ->
-// gas irOptimized: 581362
+// gas irOptimized: 580316
 // gas legacy: 576904
 // gas legacyOptimized: 575649
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
index ffe98ee430..a9e4fd8d33 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
@@ -16,11 +16,11 @@ contract C {
 // test_boundary_check(uint256,uint256): 1, 1 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
-// gas irOptimized: 140383
+// gas irOptimized: 137904
 // gas legacy: 133633
 // gas legacyOptimized: 114354
 // test_boundary_check(uint256,uint256): 256, 255 -> 0
-// gas irOptimized: 142515
+// gas irOptimized: 140039
 // gas legacy: 135949
 // gas legacyOptimized: 116533
 // test_boundary_check(uint256,uint256): 256, 0xFFFF -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
index 6b3f4643cb..836901963e 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131925
+// gas irOptimized: 131804
 // gas legacy: 132804
 // gas legacyOptimized: 130649
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 225874
+// gas irOptimized: 225692
 // gas legacy: 227786
 // gas legacyOptimized: 223830
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 323938
+// gas irOptimized: 323700
 // gas legacy: 326902
 // gas legacyOptimized: 321206
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 5116738
+// gas irOptimized: 5112496
 // gas legacy: 5165874
 // gas legacyOptimized: 5062182
diff --git a/test/libsolidity/semanticTests/array/array_storage_length_access.sol b/test/libsolidity/semanticTests/array/array_storage_length_access.sol
index 6a611cc171..0669a32097 100644
--- a/test/libsolidity/semanticTests/array/array_storage_length_access.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_length_access.sol
@@ -16,7 +16,7 @@ contract C {
 // gas legacy: 128571
 // gas legacyOptimized: 110143
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1220647
+// gas irOptimized: 1209119
 // gas legacy: 1689548
 // gas legacyOptimized: 1393535
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_empty.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
index b59afd0391..9949b59ea4 100644
--- a/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
@@ -12,11 +12,11 @@ contract C {
 // EVMVersion: >=petersburg
 // ----
 // pushEmpty(uint256): 128
-// gas irOptimized: 406413
+// gas irOptimized: 404095
 // gas legacy: 415744
 // gas legacyOptimized: 397380
 // pushEmpty(uint256): 256
-// gas irOptimized: 693185
+// gas irOptimized: 689843
 // gas legacy: 715316
 // gas legacyOptimized: 688632
 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
index 9c3a426fe9..4b5b407eaf 100644
--- a/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_push_empty_length_address.sol
@@ -21,11 +21,11 @@ contract C {
 // gas legacy: 77730
 // gas legacyOptimized: 77162
 // set_get_length(uint256): 0xFF -> 0xFF
-// gas irOptimized: 161440
+// gas irOptimized: 158881
 // gas legacy: 696850
 // gas legacyOptimized: 134488
 // set_get_length(uint256): 0xFFF -> 0xFFF
-// gas irOptimized: 1800622
+// gas irOptimized: 1762213
 // gas legacy: 9857362
 // gas legacyOptimized: 1393660
 // set_get_length(uint256): 0xFFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_pop.sol b/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
index 91948540f9..5befbe2282 100644
--- a/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_push_pop.sol
@@ -17,11 +17,11 @@ contract C {
 // gas legacy: 105722
 // gas legacyOptimized: 103508
 // set_get_length(uint256): 0xFF -> 0
-// gas irOptimized: 821106
+// gas irOptimized: 815997
 // gas legacy: 808020
 // gas legacyOptimized: 784467
 // set_get_length(uint256): 0xFFF -> 0
-// gas irOptimized: 12828798
+// gas irOptimized: 12746889
 // gas legacy: 12612192
 // gas legacyOptimized: 12239199
 // set_get_length(uint256): 0xFFFF -> FAILURE # Out-of-gas #
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index 05a663c0be..715e8a589c 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -12,7 +12,7 @@ contract Test {
 }
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 186537
+// gas irOptimized: 186554
 // gas legacy: 211054
 // gas legacyOptimized: 206042
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index 554f4361a1..92f58bd110 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 125584
+// gas irOptimized: 125212
 // gas legacy: 150372
 // gas legacyOptimized: 146391
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index 04dcf2d340..750467a212 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -13,7 +13,7 @@ contract c {
 // ----
 // getLength() -> 0
 // set(): 1, 2 -> true
-// gas irOptimized: 110400
+// gas irOptimized: 110392
 // gas legacy: 110952
-// gas legacyOptimized: 110580
+// gas legacyOptimized: 110579
 // getLength() -> 68
diff --git a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
index fe6f07a40e..ca65f07065 100644
--- a/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
+++ b/test/libsolidity/semanticTests/array/constant_var_as_array_length.sol
@@ -8,7 +8,7 @@ contract C {
 }
 // ----
 // constructor(): 1, 2, 3 ->
-// gas irOptimized: 140952
+// gas irOptimized: 139656
 // gas legacy: 180517
 // gas legacyOptimized: 150462
 // a(uint256): 0 -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
index 3be5ba29f4..7d52198784 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -20,7 +20,7 @@ contract c {
 }
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
-// gas irOptimized: 648323
+// gas irOptimized: 648319
 // gas legacy: 694356
 // gas legacyOptimized: 693864
 // retrieve() -> 9, 28, 9, 28, 4, 3, 32
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
index d88aaebcda..a06ee7f89a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> true
-// gas irOptimized: 117369
+// gas irOptimized: 117261
 // gas legacy: 124660
 // gas legacyOptimized: 122801
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
index ebc6dadbe7..0bdcda1d9e 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_clear_storage.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 0
-// gas irOptimized: 107488
+// gas irOptimized: 107453
 // gas legacy: 108218
 // gas legacyOptimized: 107625
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 6f616f4b53..6d83f3758c 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -18,6 +18,6 @@ contract c {
 }
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 208122
+// gas irOptimized: 208044
 // gas legacy: 221769
 // gas legacyOptimized: 220611
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index 80364f0257..d28090277a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -35,12 +35,12 @@ contract c {
 }
 // ----
 // test() -> 0x02000202
-// gas irOptimized: 4548245
+// gas irOptimized: 4548150
 // gas legacy: 4476222
 // gas legacyOptimized: 4448113
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4475224
+// gas irOptimized: 4475134
 // gas legacy: 4408014
 // gas legacyOptimized: 4381784
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index 7b5b30b79f..4297f11fc2 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -12,6 +12,6 @@ contract c {
 }
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
-// gas irOptimized: 689714
+// gas irOptimized: 689666
 // gas legacy: 686178
 // gas legacyOptimized: 685628
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
index d17e45a2f3..911653b374 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4
-// gas irOptimized: 205062
+// gas irOptimized: 205045
 // gas legacy: 213863
 // gas legacyOptimized: 212902
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
index 4ab3d0bd87..f75338bb74 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -21,6 +21,6 @@ contract c {
 }
 // ----
 // test() -> 3, 4
-// gas irOptimized: 169602
+// gas irOptimized: 169586
 // gas legacy: 175424
 // gas legacyOptimized: 172535
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
index 29c845f130..99dd1ca934 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dyn_dyn.sol
@@ -15,7 +15,7 @@ contract c {
 // ----
 // setData1(uint256,uint256,uint256): 10, 5, 4 ->
 // copyStorageStorage() ->
-// gas irOptimized: 111366
+// gas irOptimized: 111348
 // gas legacy: 109272
 // gas legacyOptimized: 109262
 // getData2(uint256): 5 -> 10, 4
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
index fcdcf9c2d2..30173409eb 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_dynamic_dynamic.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4
-// gas irOptimized: 252986
+// gas irOptimized: 252929
 // gas legacy: 250892
 // gas legacyOptimized: 250046
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
index 943a5206ee..13cd7ed0ce 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
@@ -11,6 +11,6 @@ contract c {
 }
 // ----
 // test() -> 9, 4
-// gas irOptimized: 123142
+// gas irOptimized: 123136
 // gas legacy: 123567
 // gas legacyOptimized: 123202
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
index 3b0a229c96..0d613e5e94 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_static.sol
@@ -14,6 +14,6 @@ contract c {
 }
 // ----
 // test() -> 8, 0
-// gas irOptimized: 196278
+// gas irOptimized: 196259
 // gas legacy: 194843
 // gas legacyOptimized: 194281
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
index 4339c89b55..cfb623393c 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_struct.sol
@@ -17,7 +17,7 @@ contract c {
 }
 // ----
 // test() -> 4, 5
-// gas irOptimized: 190870
+// gas irOptimized: 190694
 // gas legacy: 190852
 // gas legacyOptimized: 189658
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
index c9c6e32284..86c76e7651 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
@@ -15,6 +15,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
-// gas irOptimized: 161715
+// gas irOptimized: 161627
 // gas legacy: 162203
-// gas legacyOptimized: 159941
+// gas legacyOptimized: 159934
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index 31addad5ec..74d2ab9096 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 104665
+// gas irOptimized: 104534
 // gas legacy: 166874
 // gas legacyOptimized: 145474
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index 0a306cade4..b229059898 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -18,6 +18,6 @@ contract c {
 }
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
-// gas irOptimized: 273576
+// gas irOptimized: 273564
 // gas legacy: 283666
 // gas legacyOptimized: 282023
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index de100d0964..ad4c5818b6 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -18,6 +18,6 @@ contract c {
 }
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
-// gas irOptimized: 233285
+// gas irOptimized: 233271
 // gas legacy: 236523
 // gas legacyOptimized: 235592
diff --git a/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
index 53ca44cdc5..b1e8659be8 100644
--- a/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_elements_to_mapping.sol
@@ -52,9 +52,9 @@ contract C {
 }
 // ----
 // from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 150061
+// gas irOptimized: 150004
 // gas legacy: 150745
-// gas legacyOptimized: 148685
+// gas legacyOptimized: 148678
 // from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
 // from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
 // from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
index 8cc849ecdc..ad79a5ec53 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
@@ -38,10 +38,10 @@ contract c {
 // compileViaYul: true
 // ----
 // test1(uint256[][]): 0x20, 2, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 180759
+// gas irOptimized: 180716
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
-// gas irOptimized: 157562
+// gas irOptimized: 157544
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 134637
+// gas irOptimized: 134629
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
-// gas irOptimized: 111270
+// gas irOptimized: 111252
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index 08e427eea5..9bd19d6299 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -38,12 +38,12 @@ contract Test {
 }
 // ----
 // test() -> 24
-// gas irOptimized: 226687
+// gas irOptimized: 226661
 // gas legacy: 227084
 // gas legacyOptimized: 226529
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 141244
+// gas irOptimized: 141223
 // gas legacy: 142238
 // gas legacyOptimized: 141365
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
index 9a2ab14cbb..01329504d2 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic.sol
@@ -45,7 +45,7 @@ contract C {
 }
 // ----
 // copyExternalStorageArrayOfFunctionType() -> true
-// gas irOptimized: 104606
+// gas irOptimized: 104592
 // gas legacy: 108554
 // gas legacyOptimized: 102413
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
index dc30e44b6f..50756d0b0c 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_function_external_storage_to_storage_dynamic_different_mutability.sol
@@ -48,7 +48,7 @@ contract C {
 }
 // ----
 // copyExternalStorageArraysOfFunctionType() -> true
-// gas irOptimized: 104279
+// gas irOptimized: 104265
 // gas legacy: 108295
 // gas legacyOptimized: 102146
 // copyInternalArrayOfFunctionType() -> true
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
index ec193d693a..b908649a23 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
@@ -17,4 +17,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
-// gas irOptimized: 119736
+// gas irOptimized: 119691
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
index 3024f44adc..32deb9e06e 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
@@ -19,4 +19,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 10, 11, 12
-// gas irOptimized: 118393
+// gas irOptimized: 118360
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
index b60a7c3c2a..e3998e9551 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
@@ -23,4 +23,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
-// gas irOptimized: 327759
+// gas irOptimized: 327383
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
index e175dd87c7..de7553c282 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 3, 3, 3, 1
-// gas irOptimized: 181950
+// gas irOptimized: 181912
diff --git a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
index e335d86849..5c44ef16a5 100644
--- a/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_storage_multi_items_per_slot.sol
@@ -12,6 +12,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3
-// gas irOptimized: 131932
+// gas irOptimized: 131915
 // gas legacy: 134606
 // gas legacyOptimized: 131938
diff --git a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
index 9fcbbffcea..540c6516fe 100644
--- a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
@@ -37,8 +37,8 @@ contract C {
 }
 // ----
 // from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 147892
+// gas irOptimized: 147868
 // gas legacy: 148896
-// gas legacyOptimized: 146908
+// gas legacyOptimized: 146901
 // from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
 // from_memory() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
index 523a0ebebb..c20d536e23 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -5,11 +5,11 @@ contract c {
 }
 // ----
 // set(uint256): 1, 2 -> true
-// gas irOptimized: 110574
+// gas irOptimized: 110558
 // gas legacy: 111312
 // gas legacyOptimized: 110744
 // set(uint256): 2, 2, 3, 4, 5 -> true
-// gas irOptimized: 177525
+// gas irOptimized: 177509
 // gas legacy: 178314
 // gas legacyOptimized: 177719
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 9448970b78..5b96afb03a 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -17,25 +17,25 @@ contract c {
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 109255
+// gas irOptimized: 109794
 // gas legacy: 123948
 // gas legacyOptimized: 118948
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 123936
+// gas irOptimized: 124047
 // gas legacy: 140362
 // gas legacyOptimized: 135386
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 130543
+// gas irOptimized: 130663
 // gas legacy: 147916
-// gas legacyOptimized: 142290
+// gas legacyOptimized: 142278
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 139333
+// gas irOptimized: 139543
 // gas legacy: 171136
-// gas legacyOptimized: 161550
+// gas legacyOptimized: 161538
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 441985
+// gas irOptimized: 442419
 // gas legacy: 505021
 // gas legacyOptimized: 486997
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
index 3f629686f7..2dfde7afa7 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
@@ -9,6 +9,6 @@ contract C {
 }
 // ----
 // f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
-// gas irOptimized: 110970
+// gas irOptimized: 110962
 // gas legacy: 111551
 // gas legacyOptimized: 111339
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
index 26f3d587f0..64b8cd9308 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
@@ -14,4 +14,4 @@ contract C {
 // compileViaYul: true
 // ----
 // from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 139905
+// gas irOptimized: 139685
diff --git a/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
index 9a111e2bcd..d2361dac54 100644
--- a/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
+++ b/test/libsolidity/semanticTests/array/copying/cleanup_during_multi_element_per_slot_copy.sol
@@ -16,7 +16,7 @@ contract C {
 }
 // ----
 // constructor()
-// gas irOptimized: 234419
+// gas irOptimized: 226349
 // gas legacy: 215757
 // gas legacyOptimized: 181760
 // f() -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index edb657ad97..cc2344cea9 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -35,12 +35,12 @@ contract C {
 }
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179752
+// gas irOptimized: 179737
 // gas legacy: 181001
-// gas legacyOptimized: 180014
+// gas legacyOptimized: 180018
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 106682
+// gas irOptimized: 106666
 // gas legacy: 109720
-// gas legacyOptimized: 106937
+// gas legacyOptimized: 106932
 // h() -> 0x40, 0x60, 0x00, 0x00
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
index 61d5ccf869..d4599cdb7e 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_to_storage.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> 0xff
-// gas irOptimized: 143426
+// gas irOptimized: 143412
 // gas legacy: 153395
-// gas legacyOptimized: 146722
+// gas legacyOptimized: 146720
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index 18795ff798..850803c138 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -15,6 +15,6 @@ contract C {
 }
 // ----
 // test() -> 7
-// gas irOptimized: 122477
+// gas irOptimized: 122454
 // gas legacy: 205176
 // gas legacyOptimized: 204971
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
index 58fc1c13da..752dd6494f 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -7,9 +7,9 @@ contract c {
 }
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
-// gas irOptimized: 177383
+// gas irOptimized: 177375
 // gas legacy: 177954
-// gas legacyOptimized: 177554
+// gas legacyOptimized: 177553
 // storageEmpty -> 0
 // reset() -> true
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index 8277df30a1..4bf021094e 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -18,9 +18,9 @@ contract sender {
 }
 // ----
 // (): 7 ->
-// gas irOptimized: 110820
+// gas irOptimized: 110831
 // gas legacy: 111388
-// gas legacyOptimized: 111071
+// gas legacyOptimized: 111070
 // val() -> 0
 // forward(bool): true -> true
 // val() -> 0x80
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
index eb0eb108fb..1214a73dbf 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
@@ -31,8 +31,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 327821
+// gas irOptimized: 327844
 // test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 140867
+// gas irOptimized: 140870
 // test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 188473
+// gas irOptimized: 188515
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
index 9dbc64f734..b3eda21223 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
@@ -31,8 +31,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 332527
+// gas irOptimized: 332687
 // test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 145155
+// gas irOptimized: 145161
 // test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 192476
+// gas irOptimized: 192608
diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
index 68db475194..53455e9eb5 100644
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
@@ -46,7 +46,7 @@ contract C {
 }
 // ----
 // test() -> 0x20, 0x14, "[a called][b called]"
-// gas irOptimized: 116638
+// gas irOptimized: 116631
 // gas legacy: 118936
 // gas legacyOptimized: 116975
 // test2() -> 0x20, 0x14, "[b called][a called]"
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index 074ca934ff..f659c28d62 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 3
-// gas irOptimized: 128116
+// gas irOptimized: 128273
 // gas legacy: 130584
-// gas legacyOptimized: 129031
+// gas legacyOptimized: 129028
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
index c962d815f4..ad8cbbb2a7 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
@@ -70,15 +70,15 @@ contract C {
 }
 // ----
 // test1() ->
-// gas irOptimized: 150508
+// gas irOptimized: 150460
 // gas legacy: 150949
 // gas legacyOptimized: 150906
 // test2() -> FAILURE
-// gas irOptimized: 150385
+// gas irOptimized: 150378
 // gas legacy: 150673
 // gas legacyOptimized: 150576
 // test3() ->
-// gas irOptimized: 123776
+// gas irOptimized: 123762
 // gas legacy: 125333
 // gas legacyOptimized: 125127
 // test4() -> FAILURE
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
index fe60365e4a..52dcb25659 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
@@ -29,8 +29,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 304714
+// gas irOptimized: 304751
 // test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 116454
+// gas irOptimized: 116449
 // test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 187962
+// gas irOptimized: 188004
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
index ccf2f2a208..48513d0019 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
@@ -29,8 +29,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 309068
+// gas irOptimized: 309071
 // test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 118167
+// gas irOptimized: 118264
 // test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 190961
+// gas irOptimized: 191003
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
index fb06b31887..be2e2447e3 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
@@ -63,7 +63,7 @@ contract C {
 // compileViaYul: true
 // ----
 // test1()
-// gas irOptimized: 123237
+// gas irOptimized: 123202
 // test2()
-// gas irOptimized: 123043
+// gas irOptimized: 123030
 // test3()
diff --git a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
index 6e44ed2686..c32f7bf6b0 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
@@ -30,7 +30,7 @@ contract C {
 // compileViaYul: true
 // ----
 // test(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// gas irOptimized: 138054
+// gas irOptimized: 138040
 // test2(uint8[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// gas irOptimized: 164232
+// gas irOptimized: 164248
 // gas legacyOptimized: 120228
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
index f7a863b469..f6079f1a83 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -17,6 +17,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 205974
+// gas irOptimized: 205881
 // gas legacy: 212237
 // gas legacyOptimized: 211425
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index 2a78630158..5bbff52fb6 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -11,6 +11,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
-// gas irOptimized: 202805
+// gas irOptimized: 202738
 // gas legacy: 204798
-// gas legacyOptimized: 203368
+// gas legacyOptimized: 203357
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
index 0f3f7783d4..ce4e31769d 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 205974
+// gas irOptimized: 205881
 // gas legacy: 212242
 // gas legacyOptimized: 211430
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
index b40bfacedc..cfbf5c8745 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_struct.sol
@@ -24,6 +24,6 @@ contract C {
 }
 // ----
 // f() -> 11, 0x0c, 1, 0x15, 22, 4
-// gas irOptimized: 291155
+// gas irOptimized: 291047
 // gas legacy: 293407
 // gas legacyOptimized: 290218
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index 341a4c9d90..bfda8d7aff 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 2, 3, 4
-// gas irOptimized: 109804
+// gas irOptimized: 109698
 // gas legacy: 126129
 // gas legacyOptimized: 120622
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
index 0d099815bf..ecfecb9c0c 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> "A", 8, 4, "B"
-// gas irOptimized: 125827
+// gas irOptimized: 125819
 // gas legacy: 121382
 // gas legacyOptimized: 115488
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index a653db837f..583f6af17f 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test1() -> true
-// gas irOptimized: 206322
+// gas irOptimized: 206086
 // gas legacy: 254056
-// gas legacyOptimized: 246887
+// gas legacyOptimized: 246892
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index 13d510f80b..a04ea013a8 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -14,7 +14,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 519276
+// gas irOptimized: 519266
 // gas legacy: 521414
 // gas legacyOptimized: 516983
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
index bce78baa41..2f6769a241 100644
--- a/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_arrays_in_storage.sol
@@ -41,7 +41,7 @@ contract c {
 // ----
 // getLengths() -> 0, 0
 // setLengths(uint256,uint256): 48, 49 ->
-// gas irOptimized: 111301
+// gas irOptimized: 110797
 // gas legacy: 108273
 // gas legacyOptimized: 100269
 // getLengths() -> 48, 49
diff --git a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
index 4c5f646951..7621d05bdc 100644
--- a/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_multi_array_cleanup.sol
@@ -16,7 +16,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() -> 8
-// gas irOptimized: 122916
+// gas irOptimized: 122742
 // gas legacy: 121602
 // gas legacyOptimized: 120589
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index 337946a20c..a354cf8042 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -10,7 +10,7 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 465324
+// gas irOptimized: 465314
 // gas legacy: 471178
 // gas legacyOptimized: 467478
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 9d8dc0bc7b..79c0f8fbfd 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -18,6 +18,6 @@ contract B {
 }
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 115828
+// gas irOptimized: 114204
 // gas legacy: 230001
 // gas legacyOptimized: 130637
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
index 71fec7bda0..ac11d779a5 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_in_constructors.sol
@@ -9,7 +9,7 @@ contract Creator {
 }
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 127659
+// gas irOptimized: 126363
 // gas legacy: 174186
 // gas legacyOptimized: 128709
 // r() -> 4
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index 7e29d82a81..a2bc2ff900 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -42,6 +42,6 @@ contract C {
 }
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 260895
+// gas irOptimized: 256074
 // gas legacy: 441556
 // gas legacyOptimized: 279321
diff --git a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
index 815c1768c2..4d8422ecdf 100644
--- a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
+++ b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
@@ -40,7 +40,7 @@ contract C {
 // copyFromStorageShort()
 // x() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
 // copyFromStorageLong()
-// gas irOptimized: 121123
+// gas irOptimized: 121104
 // gas legacy: 121904
 // gas legacyOptimized: 121400
 // x() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
index 7f80f1bd07..a08d27ac0b 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_array_transition.sol
@@ -23,7 +23,7 @@ contract c {
 }
 // ----
 // test() -> 1, 2, 3
-// gas irOptimized: 1828169
+// gas irOptimized: 1827730
 // gas legacy: 1822466
 // gas legacyOptimized: 1813404
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index 6a657032bb..93e1512bc4 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 38, 28, 18
-// gas irOptimized: 148168
+// gas irOptimized: 148087
 // gas legacy: 151184
 // gas legacyOptimized: 142418
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index 1a74ea9722..c28e1b91c5 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 20, 10
-// gas irOptimized: 125933
+// gas irOptimized: 126072
 // gas legacy: 127216
 // gas legacyOptimized: 122224
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index 95a2b012c7..68e52a1959 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -16,7 +16,7 @@ contract c {
 }
 // ----
 // test() -> true
-// gas irOptimized: 140325
+// gas irOptimized: 140056
 // gas legacy: 178397
 // gas legacyOptimized: 163832
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
index f6eb8e1270..a014e761ea 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty_garbage_ref.sol
@@ -15,7 +15,7 @@ contract c {
 }
 // ----
 // test() ->
-// gas irOptimized: 113826
+// gas irOptimized: 113782
 // gas legacy: 131245
 // gas legacyOptimized: 126668
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index 623b58739a..e4e0b0b0dd 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -9,6 +9,6 @@ contract c {
 }
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 108053
+// gas irOptimized: 107969
 // gas legacy: 125420
 // gas legacyOptimized: 122472
diff --git a/test/libsolidity/semanticTests/array/push/array_push.sol b/test/libsolidity/semanticTests/array/push/array_push.sol
index 0dbd7c11bf..3e7ceb5a8b 100644
--- a/test/libsolidity/semanticTests/array/push/array_push.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4, 3, 3
-// gas irOptimized: 111401
+// gas irOptimized: 111363
 // gas legacy: 111807
 // gas legacyOptimized: 111122
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
index 87616f1f5f..66af798b9c 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -12,6 +12,6 @@ contract C {
 }
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
-// gas irOptimized: 112825
+// gas irOptimized: 112813
 // gas legacy: 113659
 // gas legacyOptimized: 113482
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
index f7918bbb48..bc09edeb5f 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
@@ -20,6 +20,6 @@ contract c {
 }
 // ----
 // test() -> 2, 3, 4, 5
-// gas irOptimized: 135199
+// gas irOptimized: 135082
 // gas legacy: 147443
 // gas legacyOptimized: 146434
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index 91a6a0b372..bce81a8680 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
-// gas irOptimized: 137087
+// gas irOptimized: 137031
 // gas legacy: 142423
 // gas legacyOptimized: 137993
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 08cfe58a3f..3b49b22d78 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -15,6 +15,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 173252
+// gas irOptimized: 172113
 // gas legacy: 215891
 // gas legacyOptimized: 203615
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index b2fbbc977b..a21e1ba21f 100644
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 179165
+// gas irOptimized: 179110
 // gas legacy: 181014
-// gas legacyOptimized: 180413
+// gas legacyOptimized: 180422
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
index 4b5a2b89d7..6901e32b8b 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_2d.sol
@@ -27,14 +27,14 @@ contract C {
 // ----
 // l() -> 0
 // f(uint256,uint256): 42, 64 ->
-// gas irOptimized: 112290
+// gas irOptimized: 112266
 // gas legacy: 107920
 // gas legacyOptimized: 101897
 // l() -> 1
 // ll(uint256): 0 -> 43
 // a(uint256,uint256): 0, 42 -> 64
 // f(uint256,uint256): 84, 128 ->
-// gas irOptimized: 118710
+// gas irOptimized: 118686
 // gas legacy: 109972
 // gas legacyOptimized: 96331
 // l() -> 2
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 8ba57af020..6a2b70153a 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -21,7 +21,7 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 182362
+// gas irOptimized: 182497
 // gas legacy: 183445
 // gas legacyOptimized: 178995
 // l() -> 70
diff --git a/test/libsolidity/semanticTests/array/reusing_memory.sol b/test/libsolidity/semanticTests/array/reusing_memory.sol
index b690fad1de..92b0c06bfb 100644
--- a/test/libsolidity/semanticTests/array/reusing_memory.sol
+++ b/test/libsolidity/semanticTests/array/reusing_memory.sol
@@ -24,6 +24,6 @@ contract Main {
 }
 // ----
 // f(uint256): 0x34 -> 0x46bddb1178e94d7f2892ff5f366840eb658911794f2c3a44c450aa2c505186c1
-// gas irOptimized: 112161
+// gas irOptimized: 111924
 // gas legacy: 125162
 // gas legacyOptimized: 113012
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index d76260c9ab..c09528d2ba 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,9 +28,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 442746
+// gas irOptimized: 439080
 // gas legacy: 711299
-// gas legacyOptimized: 481080
+// gas legacyOptimized: 481296
 // h() -> 0x20, 0x40, 0x00, 0
 // ~ emit ev(uint256[],uint256): 0x40, 0x21, 0x02, 0x00, 0x00
 // g() -> 0x20, 0x40, 0, 0x00
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
index 3dd93c12e4..c87f6bfcff 100644
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -9,9 +9,9 @@ contract c {
 // EVMVersion: >=byzantium
 // ----
 // (): 1, 2, 3, 4, 5 ->
-// gas irOptimized: 155155
+// gas irOptimized: 155131
 // gas legacy: 155473
-// gas legacyOptimized: 155299
+// gas legacyOptimized: 155298
 // checkIfDataIsEmpty() -> false
 // sendMessage() -> true, 0x40, 0
 // checkIfDataIsEmpty() -> true
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 24c33facb6..2bfab4fe6c 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 429160
+// gas irOptimized: 424511
 // gas legacy: 581443
 // gas legacyOptimized: 444588
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 3df201222e..b4d5dd880f 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 278528
+// gas irOptimized: 275287
 // gas legacy: 418462
-// gas legacyOptimized: 291755
+// gas legacyOptimized: 291760
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index 99260d2efd..b77793c0f1 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -8,8 +8,8 @@ contract Test {
 }
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 269441
+// gas irOptimized: 268145
 // gas legacy: 311324
-// gas legacyOptimized: 258351
+// gas legacyOptimized: 258388
 // m_x() -> 7
 // m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
index 4f8ebefeaa..3037aaa317 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_arguments_external.sol
@@ -17,7 +17,7 @@ contract Main {
 }
 // ----
 // constructor(): "abc", true
-// gas irOptimized: 105906
+// gas irOptimized: 104394
 // gas legacy: 143300
 // gas legacyOptimized: 102961
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index dd91c86a20..75fa809ed5 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -9,7 +9,7 @@ contract C {
 }
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 172314
+// gas irOptimized: 171018
 // gas legacy: 218378
 // gas legacyOptimized: 176195
 // a() -> 1
diff --git a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
index 9319d592a5..eec01005eb 100644
--- a/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
+++ b/test/libsolidity/semanticTests/constructor/no_callvalue_check.sol
@@ -17,6 +17,6 @@ contract C {
 }
 // ----
 // f(), 2000 ether -> true
-// gas irOptimized: 119457
+// gas irOptimized: 119441
 // gas legacy: 122621
 // gas legacyOptimized: 122490
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
index 00dfef4abc..20cd8760b9 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order.sol
@@ -14,5 +14,5 @@ contract B is A {
 // compileViaYul: true
 // ----
 // constructor() ->
-// gas irOptimized: 120936
+// gas irOptimized: 119640
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
index 9b982d6e99..820c56a4ee 100644
--- a/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
+++ b/test/libsolidity/semanticTests/constructor_inheritance_init_order_2.sol
@@ -9,7 +9,7 @@ contract B is A {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 120936
+// gas irOptimized: 119640
 // gas legacy: 133594
 // gas legacyOptimized: 115341
 // y() -> 42
diff --git a/test/libsolidity/semanticTests/constructor_with_params.sol b/test/libsolidity/semanticTests/constructor_with_params.sol
index 13bdb625bf..1916f692fd 100644
--- a/test/libsolidity/semanticTests/constructor_with_params.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params.sol
@@ -9,7 +9,7 @@ contract C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 102902
+// gas irOptimized: 101390
 // gas legacy: 115678
 // i() -> 2
 // k() -> 0
diff --git a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
index fc2dd8f715..b2f66e4500 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_diamond_inheritance.sol
@@ -21,7 +21,7 @@ contract D is B, C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 153694
+// gas irOptimized: 151966
 // gas legacy: 168623
 // gas legacyOptimized: 144577
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
index a0b4c772d6..f5b20d9816 100644
--- a/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
+++ b/test/libsolidity/semanticTests/constructor_with_params_inheritance.sol
@@ -12,7 +12,7 @@ contract D is C {
 }
 // ----
 // constructor(): 2, 0 ->
-// gas irOptimized: 123317
+// gas irOptimized: 121805
 // gas legacy: 137193
 // gas legacyOptimized: 118548
 // i() -> 2
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
index 057496c6dd..fec281c59a 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage.sol
@@ -13,6 +13,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 113510
+// gas irOptimized: 113485
 // gas legacy: 116314
 // gas legacyOptimized: 114407
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
index 5c5138742a..2b5a7114d9 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_array_storage_v2.sol
@@ -14,6 +14,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[]): 0x20, 0x03, 0x2a, 0x2b, 0x2c
-// gas irOptimized: 113510
+// gas irOptimized: 113485
 // gas legacy: 116314
 // gas legacyOptimized: 114407
diff --git a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
index 7b9a9400be..d6cfb68bef 100644
--- a/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
+++ b/test/libsolidity/semanticTests/events/event_dynamic_nested_array_storage_v2.sol
@@ -15,6 +15,6 @@ contract C {
 // ----
 // createEvent(uint256): 42 ->
 // ~ emit E(uint256[][]): 0x20, 0x02, 0x40, 0xa0, 0x02, 0x2a, 0x2b, 0x02, 0x2c, 0x2d
-// gas irOptimized: 185095
+// gas irOptimized: 185033
 // gas legacy: 187495
-// gas legacyOptimized: 184534
+// gas legacyOptimized: 184525
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index a6283f274e..dfd9dd3993 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -17,6 +17,6 @@ contract C {
 // ----
 // deposit() ->
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
-// gas irOptimized: 332157
+// gas irOptimized: 330920
 // gas legacy: 387608
 // gas legacyOptimized: 373772
diff --git a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
index f2ee4894f1..f9f53275bb 100644
--- a/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
+++ b/test/libsolidity/semanticTests/externalContracts/FixedFeeRegistrar.sol
@@ -74,7 +74,7 @@ contract FixedFeeRegistrar is Registrar {
 }
 // ----
 // constructor()
-// gas irOptimized: 413501
+// gas irOptimized: 384610
 // gas legacy: 913421
 // gas legacyOptimized: 476928
 // reserve(string), 69 ether: 0x20, 3, "abc" ->
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index 328b55ec99..fd7288c8ff 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,7 +33,7 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 409367
+// gas irOptimized: 406907
 // gas legacy: 737652
 // gas legacyOptimized: 526820
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
@@ -51,10 +51,10 @@ contract test {
 // encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
 // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
 // encode_inline_asm_large()
-// gas irOptimized: 1373038
+// gas irOptimized: 1373025
 // gas legacy: 1672031
 // gas legacyOptimized: 1199031
 // encode_no_asm_large()
-// gas irOptimized: 3276098
+// gas irOptimized: 3276081
 // gas legacy: 4705075
 // gas legacyOptimized: 2890075
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 38bb477593..5e815fad49 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,7 +176,7 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 1415659
+// gas irOptimized: 1391860
 // gas legacy: 2391952
 // gas legacyOptimized: 1752320
 // supportsInterface(bytes4): 0x0 -> 0
@@ -184,27 +184,27 @@ contract DepositContract is IDepositContract, ERC165 {
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 117264
+// gas irOptimized: 116864
 // gas legacy: 151981
 // gas legacyOptimized: 124447
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 117264
+// gas irOptimized: 116864
 // gas legacy: 151981
 // gas legacyOptimized: 124447
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 117249
+// gas irOptimized: 116849
 // gas legacy: 151990
 // gas legacyOptimized: 124459
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 117249
+// gas irOptimized: 116849
 // gas legacy: 151990
 // gas legacyOptimized: 124459
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index 7860560f62..8bb2b37c47 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -48,7 +48,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1870040
+// gas irOptimized: 1849535
 // gas legacy: 2430726
 // gas legacyOptimized: 1854979
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 6cda4f1e98..1e546feab8 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,7 +48,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1731900
+// gas irOptimized: 1723462
 // gas legacy: 2210160
 // gas legacyOptimized: 1734152
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index b3ba449644..19a79f5373 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -33,7 +33,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 424583
+// gas irOptimized: 406643
 // gas legacy: 631753
 // gas legacyOptimized: 459425
 // prb_pi() -> 3141592656369545286
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index 254befe014..e92f95b4ad 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -294,11 +294,11 @@ contract Test {
 // f() -> true
 // g() -> true
 // pair() -> true
-// gas irOptimized: 269918
+// gas irOptimized: 269901
 // gas legacy: 275678
 // gas legacyOptimized: 267193
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 783371
+// gas irOptimized: 783281
 // gas legacy: 804346
 // gas legacyOptimized: 772349
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index c2ad61557d..c3eba4e0ff 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,7 +49,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 636074
+// gas irOptimized: 632372
 // gas legacy: 1065857
 // gas legacyOptimized: 725207
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
@@ -69,6 +69,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 1981693
+// gas irOptimized: 1981664
 // gas legacy: 4235651
 // gas legacyOptimized: 2319622
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index 0fd2efeb9f..cbbded9d5a 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -15,7 +15,7 @@ contract D {
 }
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 193999
+// gas irOptimized: 193567
 // gas legacy: 241234
 // gas legacyOptimized: 192961
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index 5952a88e06..e6b4ae90b2 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -17,7 +17,7 @@ contract D {
 // EVMVersion: >=constantinople
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 194162
+// gas irOptimized: 193730
 // gas legacy: 241606
 // gas legacyOptimized: 193193
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index ffe7a7f377..6460794adc 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -17,7 +17,7 @@ contract C {
 // EVMVersion: >=byzantium
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 177446
+// gas irOptimized: 171806
 // gas legacy: 285547
 // gas legacyOptimized: 168515
 // f(uint256): 20 -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
@@ -25,7 +25,7 @@ contract C {
 // f(uint256): 20 -> FAILURE
 // x() -> 1
 // stack(uint256): 1023 -> FAILURE
-// gas irOptimized: 259624
+// gas irOptimized: 252410
 // gas legacy: 477722
 // gas legacyOptimized: 299567
 // x() -> 1
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 9c73e208e7..6ebab90fff 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -38,7 +38,7 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 260052
+// gas irOptimized: 253950
 // gas legacy: 391588
 // gas legacyOptimized: 268089
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 801b22d177..1cb5e0d548 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -37,7 +37,7 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 260052
+// gas irOptimized: 253950
 // gas legacy: 391588
 // gas legacyOptimized: 268089
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
index bb2221f2c3..28c1822d77 100644
--- a/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
+++ b/test/libsolidity/semanticTests/functionCall/mapping_array_internal_argument.sol
@@ -18,7 +18,7 @@ contract test {
 }
 // ----
 // set(uint8,uint8,uint8,uint8,uint8): 1, 21, 22, 42, 43 -> 0, 0, 0, 0
-// gas irOptimized: 111668
+// gas irOptimized: 111628
 // gas legacy: 113748
 // gas legacyOptimized: 111772
 // get(uint8): 1 -> 21, 22, 42, 43
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index 8aaf961aa2..e038614509 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -27,7 +27,7 @@ contract C {
 }
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 124849
+// gas irOptimized: 124003
 // gas legacy: 148528
 // gas legacyOptimized: 123971
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/immutable/use_scratch.sol b/test/libsolidity/semanticTests/immutable/use_scratch.sol
index ff10c13aa2..0a5ccf729f 100644
--- a/test/libsolidity/semanticTests/immutable/use_scratch.sol
+++ b/test/libsolidity/semanticTests/immutable/use_scratch.sol
@@ -15,7 +15,7 @@ contract C {
 }
 // ----
 // constructor(): 3 ->
-// gas irOptimized: 124838
+// gas irOptimized: 123542
 // gas legacy: 197645
 // gas legacyOptimized: 137678
 // f() -> 84, 23
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index 5390f64db0..3866d3be0a 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -39,7 +39,7 @@ contract Main {
 }
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 266886
+// gas irOptimized: 262320
 // gas legacy: 392786
 // gas legacyOptimized: 261633
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
index 39f3c2d0fa..306bc35670 100644
--- a/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
+++ b/test/libsolidity/semanticTests/isoltestTesting/balance_other_contract.sol
@@ -16,7 +16,7 @@ contract ClientReceipt {
 }
 // ----
 // constructor(), 2000 wei ->
-// gas irOptimized: 171865
+// gas irOptimized: 169915
 // gas legacy: 230038
 // gas legacyOptimized: 173883
 // balance -> 1500
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index 169f2e295b..8a4356061d 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -22,6 +22,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 4, 0x11
-// gas irOptimized: 112209
+// gas irOptimized: 112115
 // gas legacy: 135413
 // gas legacyOptimized: 119325
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index b180d52e4e..1f06908e2c 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -19,6 +19,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 119654
+// gas irOptimized: 119642
 // gas legacy: 124674
 // gas legacyOptimized: 119669
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
index d46ed0a56a..e26ccacb9c 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
@@ -17,6 +17,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 120265
+// gas irOptimized: 120200
 // gas legacy: 125109
 // gas legacyOptimized: 120128
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create.sol b/test/libsolidity/semanticTests/salted_create/salted_create.sol
index 11b74168d9..743ff5fd2a 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create.sol
@@ -21,6 +21,6 @@ contract A {
 // ----
 // different_salt() -> true
 // same_salt() -> true
-// gas irOptimized: 98438897
+// gas irOptimized: 98438895
 // gas legacy: 98439109
 // gas legacyOptimized: 98438967
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 025c8259db..34180fa697 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -21,6 +21,6 @@ contract A {
 // EVMVersion: >=constantinople
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 254238
+// gas irOptimized: 253035
 // gas legacy: 381063
 // gas legacyOptimized: 279694
diff --git a/test/libsolidity/semanticTests/smoke/constructor.sol b/test/libsolidity/semanticTests/smoke/constructor.sol
index eb1d73a448..79b92867bc 100644
--- a/test/libsolidity/semanticTests/smoke/constructor.sol
+++ b/test/libsolidity/semanticTests/smoke/constructor.sol
@@ -12,7 +12,7 @@ contract C {
 }
 // ----
 // constructor(), 2 wei: 3 ->
-// gas irOptimized: 106374
+// gas irOptimized: 104412
 // gas legacy: 148308
 // gas legacyOptimized: 106727
 // state() -> 3
diff --git a/test/libsolidity/semanticTests/state/blockhash_basic.sol b/test/libsolidity/semanticTests/state/blockhash_basic.sol
index 62138a9b28..01069aa0c6 100644
--- a/test/libsolidity/semanticTests/state/blockhash_basic.sol
+++ b/test/libsolidity/semanticTests/state/blockhash_basic.sol
@@ -12,7 +12,7 @@ contract C {
 }
 // ----
 // constructor()
-// gas irOptimized: 109878
+// gas irOptimized: 108150
 // gas legacy: 152179
 // gas legacyOptimized: 106750
 // genesisHash() -> 0x3737373737373737373737373737373737373737373737373737373737373737
diff --git a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
index 20755a0694..7897144d52 100644
--- a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
+++ b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
@@ -22,9 +22,9 @@ contract Test {
 // set(bytes): 0x20, 0
 // storageEmpty -> 1
 // set(bytes): 0x20, 66, "12345678901234567890123456789012", "12345678901234567890123456789012", "12"
-// gas irOptimized: 111895
+// gas irOptimized: 111878
 // gas legacy: 112734
-// gas legacyOptimized: 112110
+// gas legacyOptimized: 112115
 // storageEmpty -> 0
 // set(bytes): 0x20, 3, "abc"
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
index b1686d9074..2c29abc79b 100644
--- a/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
+++ b/test/libsolidity/semanticTests/storage/packed_storage_structs_bytes.sol
@@ -42,6 +42,6 @@ contract C {
 }
 // ----
 // test() -> true
-// gas irOptimized: 132505
+// gas irOptimized: 132493
 // gas legacy: 136009
 // gas legacyOptimized: 133478
diff --git a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
index 0bcc74b6ba..add42a8f3b 100644
--- a/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/structs/calldata/calldata_struct_with_nested_array_to_storage.sol
@@ -16,6 +16,6 @@ contract C {
 }
 // ----
 // f(uint32,(uint128,uint256[][2],uint32)): 55, 0x40, 77, 0x60, 88, 0x40, 0x40, 2, 1, 2 -> 55, 77, 1, 2, 88
-// gas irOptimized: 202829
+// gas irOptimized: 202843
 // gas legacy: 207384
 // gas legacyOptimized: 203584
diff --git a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
index 52ad00649b..699836179b 100644
--- a/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
+++ b/test/libsolidity/semanticTests/structs/conversion/recursive_storage_memory.sol
@@ -23,6 +23,6 @@ contract CopyTest {
 }
 // ----
 // run() -> 2, 23, 42
-// gas irOptimized: 193687
+// gas irOptimized: 193677
 // gas legacy: 185731
 // gas legacyOptimized: 184458
diff --git a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
index df118de323..75898d3162 100644
--- a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
@@ -36,8 +36,8 @@ contract C {
 }
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121497
+// gas irOptimized: 121487
 // gas legacy: 123069
-// gas legacyOptimized: 121758
+// gas legacyOptimized: 121759
 // to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
index aed54f98b6..937eeeaf43 100644
--- a/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
+++ b/test/libsolidity/semanticTests/structs/copy_struct_array_from_storage.sol
@@ -87,7 +87,7 @@ contract Test {
 // EVMVersion: >homestead
 // ----
 // test1() -> true
-// gas irOptimized: 152954
+// gas irOptimized: 152882
 // gas legacy: 153012
 // gas legacyOptimized: 152637
 // test2() -> true
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
index 66954a7f5c..b6e374f2a2 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
@@ -44,8 +44,8 @@ contract C {
 }
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121598
+// gas irOptimized: 121584
 // gas legacy: 123208
-// gas legacyOptimized: 121765
+// gas legacyOptimized: 121766
 // to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
index 065187cdc3..2e1d5cb2d4 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
@@ -52,14 +52,14 @@ contract C {
 }
 // ----
 // from_memory() -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 123029
+// gas irOptimized: 123028
 // gas legacy: 130227
-// gas legacyOptimized: 128762
+// gas legacyOptimized: 128761
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121721
+// gas irOptimized: 121703
 // gas legacy: 123282
-// gas legacyOptimized: 121870
+// gas legacyOptimized: 121871
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115116
+// gas irOptimized: 115113
 // gas legacy: 122516
-// gas legacyOptimized: 120806
+// gas legacyOptimized: 120807
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
index 5b99efc647..5b55a99b92 100644
--- a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
@@ -45,18 +45,18 @@ contract C {
 }
 // ----
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121693
+// gas irOptimized: 121680
 // gas legacy: 123144
 // gas legacyOptimized: 121811
 // from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121737
+// gas irOptimized: 121725
 // gas legacy: 123193
 // gas legacyOptimized: 121863
 // from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 122942
+// gas irOptimized: 122939
 // gas legacy: 130088
 // gas legacyOptimized: 128757
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 21, 3, 0x666f6f0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115056
+// gas irOptimized: 115032
 // gas legacy: 118301
 // gas legacyOptimized: 115435
diff --git a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
index 3089f97b52..e5b139d5c3 100644
--- a/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
+++ b/test/libsolidity/semanticTests/structs/memory_structs_nested_load.sol
@@ -66,7 +66,7 @@ contract Test {
 }
 // ----
 // load() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
-// gas irOptimized: 110326
+// gas irOptimized: 110317
 // gas legacy: 112964
 // gas legacyOptimized: 110876
 // store() -> 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index 4a64f08136..c8437300d5 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -23,17 +23,17 @@ contract c {
 // ----
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133596
+// gas irOptimized: 133582
 // gas legacy: 134628
-// gas legacyOptimized: 133875
+// gas legacyOptimized: 133874
 // test(uint256): 32 -> "3"
 // storageEmpty -> 0
 // copy() -> true
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133596
+// gas irOptimized: 133582
 // gas legacy: 134628
-// gas legacyOptimized: 133875
+// gas legacyOptimized: 133874
 // storageEmpty -> 0
 // del() -> true
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/structs/struct_copy.sol b/test/libsolidity/semanticTests/structs/struct_copy.sol
index 6da42ebec7..a321f06868 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy.sol
@@ -35,12 +35,12 @@ contract c {
 }
 // ----
 // set(uint256): 7 -> true
-// gas irOptimized: 109896
+// gas irOptimized: 109893
 // gas legacy: 110597
 // gas legacyOptimized: 110003
 // retrieve(uint256): 7 -> 1, 3, 4, 2
 // copy(uint256,uint256): 7, 8 -> true
-// gas irOptimized: 118593
+// gas irOptimized: 118582
 // gas legacy: 119147
 // gas legacyOptimized: 118619
 // retrieve(uint256): 7 -> 1, 3, 4, 2
diff --git a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
index 22d9dd29de..71b40acc80 100644
--- a/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
+++ b/test/libsolidity/semanticTests/structs/struct_copy_via_local.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> true
-// gas irOptimized: 109713
+// gas irOptimized: 109706
 // gas legacy: 110615
 // gas legacyOptimized: 109705
diff --git a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
index 7ec85c929d..d76618bbc9 100644
--- a/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
+++ b/test/libsolidity/semanticTests/structs/struct_delete_storage_with_array.sol
@@ -42,10 +42,10 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 113232
+// gas irOptimized: 113210
 // gas legacy: 113591
 // gas legacyOptimized: 113103
 // g() ->
-// gas irOptimized: 118604
+// gas irOptimized: 118580
 // gas legacy: 118764
 // gas legacyOptimized: 118172
diff --git a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
index c19875062f..9af3774692 100644
--- a/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
+++ b/test/libsolidity/semanticTests/structs/struct_memory_to_storage_function_ptr.sol
@@ -28,6 +28,6 @@ contract C {
 }
 // ----
 // f() -> 42, 23, 34, 42, 42
-// gas irOptimized: 110388
+// gas irOptimized: 110382
 // gas legacy: 111993
 // gas legacyOptimized: 110546
diff --git a/test/libsolidity/semanticTests/structs/structs.sol b/test/libsolidity/semanticTests/structs/structs.sol
index 61456cd7e3..b5e9d10bb8 100644
--- a/test/libsolidity/semanticTests/structs/structs.sol
+++ b/test/libsolidity/semanticTests/structs/structs.sol
@@ -30,7 +30,7 @@ contract test {
 // ----
 // check() -> false
 // set() ->
-// gas irOptimized: 134435
+// gas irOptimized: 134417
 // gas legacy: 135246
 // gas legacyOptimized: 134062
 // check() -> true
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 1e58c9b037..2e85c34637 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -49,11 +49,11 @@ contract C {
 }
 // ----
 // test_f() -> true
-// gas irOptimized: 122489
+// gas irOptimized: 122388
 // gas legacy: 126030
 // gas legacyOptimized: 123120
 // test_g() -> true
-// gas irOptimized: 106871
+// gas irOptimized: 106740
 // gas legacy: 112300
 // gas legacyOptimized: 107649
 // addresses(uint256): 0 -> 0x18
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
index 31e754a9b7..27ab530cd7 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/erc20.sol
@@ -113,7 +113,7 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 360201
+// gas irOptimized: 352698
 // gas legacy: 834932
 // gas legacyOptimized: 412648
 // totalSupply() -> 20
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 2712503a45..6067377466 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -14,9 +14,9 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 175145
+// gas irOptimized: 172853
 // gas legacy: 241796
-// gas legacyOptimized: 153411
+// gas legacyOptimized: 153454
 // initCode() -> 0x20, 0
 // f() -> true
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/various/create_calldata.sol b/test/libsolidity/semanticTests/various/create_calldata.sol
index fc4e885ff1..b40b0eab41 100644
--- a/test/libsolidity/semanticTests/various/create_calldata.sol
+++ b/test/libsolidity/semanticTests/various/create_calldata.sol
@@ -8,7 +8,7 @@ contract C {
 }
 // ----
 // constructor(): 42 ->
-// gas irOptimized: 146699
+// gas irOptimized: 144924
 // gas legacy: 173845
-// gas legacyOptimized: 137736
+// gas legacyOptimized: 137677
 // s() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 1534891dc1..b13db85d15 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -33,6 +33,6 @@ contract C {
 }
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 241853
+// gas irOptimized: 241832
 // gas legacy: 243284
-// gas legacyOptimized: 242421
+// gas legacyOptimized: 242420
diff --git a/test/libsolidity/semanticTests/various/erc20.sol b/test/libsolidity/semanticTests/various/erc20.sol
index 47f4005e38..b752a52101 100644
--- a/test/libsolidity/semanticTests/various/erc20.sol
+++ b/test/libsolidity/semanticTests/various/erc20.sol
@@ -96,7 +96,7 @@ contract ERC20 {
 // ----
 // constructor()
 // ~ emit Transfer(address,address,uint256): #0x00, #0x1212121212121212121212121212120000000012, 0x14
-// gas irOptimized: 355485
+// gas irOptimized: 353276
 // gas legacy: 807683
 // gas legacyOptimized: 408718
 // totalSupply() -> 20
diff --git a/test/libsolidity/semanticTests/various/negative_stack_height.sol b/test/libsolidity/semanticTests/various/negative_stack_height.sol
index 92b6b5650c..3c9130e9fd 100644
--- a/test/libsolidity/semanticTests/various/negative_stack_height.sol
+++ b/test/libsolidity/semanticTests/various/negative_stack_height.sol
@@ -66,4 +66,4 @@ contract C {
 // ----
 // constructor() ->
 // gas legacy: 575272
-// gas legacyOptimized: 346970
+// gas legacyOptimized: 345026
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 6a8da27784..37d6919db3 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -16,7 +16,7 @@ contract D {
 }
 // ----
 // constructor(), 27 wei ->
-// gas irOptimized: 169377
+// gas irOptimized: 168729
 // gas legacy: 218459
 // gas legacyOptimized: 167292
 // f() -> 27
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index efff7a9507..e6b9a6aae7 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -19,6 +19,6 @@ contract C {
 }
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178542
+// gas irOptimized: 178487
 // gas legacy: 180839
-// gas legacyOptimized: 179375
+// gas legacyOptimized: 179374
diff --git a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
index d95a2cd7ca..1306529d41 100644
--- a/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
+++ b/test/libsolidity/semanticTests/various/staticcall_for_view_and_pure.sol
@@ -37,10 +37,10 @@ contract D {
 // f() -> 0x1 # This should work, next should throw #
 // gas legacy: 102095
 // fview() -> FAILURE
-// gas irOptimized: 98438596
+// gas irOptimized: 98438588
 // gas legacy: 98438774
 // gas legacyOptimized: 98438580
 // fpure() -> FAILURE
-// gas irOptimized: 98438596
+// gas irOptimized: 98438589
 // gas legacy: 98438774
 // gas legacyOptimized: 98438580
diff --git a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
index 482847b67f..bd5a59519c 100644
--- a/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
+++ b/test/libsolidity/semanticTests/various/swap_in_storage_overwrite.sol
@@ -26,7 +26,7 @@ contract c {
 // x() -> 0, 0
 // y() -> 0, 0
 // set() ->
-// gas irOptimized: 109690
+// gas irOptimized: 109684
 // gas legacy: 109728
 // gas legacyOptimized: 109680
 // x() -> 1, 2
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 80f8bb55cc..880dfbc208 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -19,7 +19,7 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 174351
+// gas irOptimized: 173055
 // gas legacy: 252296
 // gas legacyOptimized: 180352
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 4a44327584..897b9faba4 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -18,7 +18,7 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 175215
+// gas irOptimized: 173919
 // gas legacy: 253820
 // gas legacyOptimized: 180784
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index 4b8f599a8f..ed5ecf3ed1 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -21,6 +21,6 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 113010
+// gas irOptimized: 112980
 // gas legacy: 112890
 // gas legacyOptimized: 112580
diff --git a/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul b/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
index b69d19cdb2..8a453e0040 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
@@ -457,26 +457,25 @@
     }
 }
 // ====
-// EVMVersion: >=constantinople
+// EVMVersion: >=shanghai
 // ----
 // step: fullSuite
 //
 // {
 //     {
-//         let _1 := 0
-//         let _2 := mload(_1)
+//         let _1 := mload(0)
 //         let pos := 0x20
-//         let length := mload(_2)
+//         let length := mload(_1)
 //         mstore(pos, length)
 //         pos := 64
-//         let srcPtr := add(_2, 0x20)
-//         let i := _1
+//         let srcPtr := add(_1, 0x20)
+//         let i := 0
 //         for { } lt(i, length) { i := add(i, 1) }
 //         {
-//             let _3 := mload(srcPtr)
+//             let _2 := mload(srcPtr)
 //             let pos_1 := pos
-//             let srcPtr_1 := _3
-//             let i_1 := _1
+//             let srcPtr_1 := _2
+//             let i_1 := 0
 //             for { } lt(i_1, 0x3) { i_1 := add(i_1, 1) }
 //             {
 //                 mstore(pos_1, and(mload(srcPtr_1), sub(shl(160, 1), 1)))
@@ -489,7 +488,7 @@
 //         let a, b, c, d := abi_decode_uint256t_uint256t_array_uint256_dynt_array_array_uint256_memory_dyn(mload(0x20), mload(64))
 //         sstore(a, b)
 //         sstore(c, d)
-//         sstore(_1, pos)
+//         sstore(0, pos)
 //     }
 //     function abi_decode_array_array_uint256_memory_dyn(offset, end) -> array
 //     {
diff --git a/test/libyul/yulOptimizerTests/fullSuite/clear_after_if_continue.yul b/test/libyul/yulOptimizerTests/fullSuite/clear_after_if_continue.yul
index 71ed36d979..d5a5af8338 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/clear_after_if_continue.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/clear_after_if_continue.yul
@@ -6,6 +6,8 @@
     }
     if y { revert(0, 0) }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // step: fullSuite
 //
@@ -13,15 +15,7 @@
 //     {
 //         let y := mload(0x20)
 //         let _1 := iszero(and(y, 8))
-//         for { }
-//         iszero(_1)
-//         {
-//             if y
-//             {
-//                 let _2 := 0
-//                 revert(_2, _2)
-//             }
-//         }
+//         for { } iszero(_1) { if y { revert(0, 0) } }
 //         {
 //             if y { continue }
 //             sstore(1, 0)
diff --git a/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul b/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul
index 813c2706e3..f9d248e2fe 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/create2_and_mask.yul
@@ -7,15 +7,14 @@
     sstore(a, b)
 }
 // ====
-// EVMVersion: >=constantinople
+// EVMVersion: >=shanghai
 // ----
 // step: fullSuite
 //
 // {
 //     {
 //         let _1 := sub(shl(160, 1), 1)
-//         let _2 := 0
-//         let a := and(create2(_2, _2, 0x20, _2), _1)
-//         sstore(a, and(_1, create2(_2, _2, 0x20, _2)))
+//         let a := and(create2(0, 0, 0x20, 0), _1)
+//         sstore(a, and(_1, create2(0, 0, 0x20, 0)))
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul b/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
index 72c09d3dc3..bf74af6f47 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/static_array_slot_computation.yul
@@ -22,22 +22,21 @@
     }
 }
 // ====
-// EVMVersion: >=constantinople
+// EVMVersion: >=shanghai
 // ----
 // step: fullSuite
 //
 // {
 //     {
-//         let _1 := 0
-//         if eq(0x26121ff0, shr(224, calldataload(_1)))
+//         if eq(0x26121ff0, shr(224, calldataload(0)))
 //         {
-//             if callvalue() { revert(_1, _1) }
-//             if slt(add(calldatasize(), not(3)), _1) { revert(_1, _1) }
-//             if iszero(lt(0x0a, sload(_1)))
+//             if callvalue() { revert(0, 0) }
+//             if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
+//             if iszero(lt(0x0a, sload(0)))
 //             {
-//                 mstore(_1, shl(224, 0x4e487b71))
+//                 mstore(0, shl(224, 0x4e487b71))
 //                 mstore(4, 0x32)
-//                 revert(_1, 0x24)
+//                 revert(0, 0x24)
 //             }
 //             sstore(0x290decd9548b62a8d60345a988386fc84ba6bc95484008f6362f93160ef3e56d, 0x05)
 //         }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
index 7955ee12ea..f0b7546d05 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/unusedFunctionParameterPruner_loop.yul
@@ -12,6 +12,8 @@
         }
     }
 }
+// ====
+// EVMVersion: >=shanghai
 // ----
 // step: fullSuite
 //
@@ -25,13 +27,12 @@
 //     function f()
 //     {
 //         let b := 10
-//         let _1 := 0
-//         let a := calldataload(_1)
-//         let _2 := iszero(a)
+//         let a := calldataload(0)
+//         let _1 := iszero(a)
 //         for { } iszero(b) { b := add(b, not(0)) }
 //         {
-//             mstore(a, _1)
-//             if _2 { leave }
+//             mstore(a, 0)
+//             if _1 { leave }
 //         }
 //     }
 // }

From ec240c64220ad6661c9b70103cfd8c3ef850c568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 7 Aug 2023 17:23:53 +0200
Subject: [PATCH 1532/1748] CI: Set CPUs for soltest.sh based on the number of
 available cores

---
 .circleci/config.yml | 19 +++++++++++++++++++
 .circleci/soltest.sh |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 38e9ee47f2..c3e1c588bd 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -366,6 +366,7 @@ defaults:
       environment: &base_archlinux_env
         TERM: xterm
         MAKEFLAGS: -j 3
+        CPUs: 3
 
   - base_archlinux_large: &base_archlinux_large
       <<: *base_archlinux
@@ -373,6 +374,7 @@ defaults:
       environment: &base_archlinux_large_env
         <<: *base_archlinux_env
         MAKEFLAGS: -j 5
+        CPUs: 5
 
   - base_cimg_small: &base_cimg_small
       docker:
@@ -381,6 +383,7 @@ defaults:
       environment: &base_cimg_small_env
         TERM: xterm
         MAKEFLAGS: -j 2
+        CPUs: 2
 
   - base_ems_large: &base_ems_large
       docker:
@@ -389,6 +392,7 @@ defaults:
       environment: &base_ems_large_env
         TERM: xterm
         MAKEFLAGS: -j 5
+        CPUs: 5
 
   - base_node_small: &base_node_small
       docker:
@@ -397,6 +401,7 @@ defaults:
       environment: &base_node_small_env
         TERM: xterm
         MAKEFLAGS: -j 2
+        CPUs: 2
 
   - base_osx: &base_osx
       macos:
@@ -405,6 +410,7 @@ defaults:
       environment: &base_osx_env
         TERM: xterm
         MAKEFLAGS: -j5
+        CPUs: 5
 
   - base_osx_large: &base_osx_large
       <<: *base_osx
@@ -412,6 +418,7 @@ defaults:
       environment: &base_osx_large_env
         <<: *base_osx_env
         MAKEFLAGS: -j10
+        CPUs: 10
 
   - base_python_small: &base_python_small
       docker:
@@ -420,6 +427,7 @@ defaults:
       environment: &base_python_small_env
         TERM: xterm
         MAKEFLAGS: -j 2
+        CPUs: 2
 
   - base_ubuntu_clang: &base_ubuntu_clang
       docker:
@@ -427,6 +435,7 @@ defaults:
       environment: &base_ubuntu_clang_env
         TERM: xterm
         MAKEFLAGS: -j 3
+        CPUs: 3
 
   - base_ubuntu_clang_small: &base_ubuntu_clang_small
       <<: *base_ubuntu_clang
@@ -434,6 +443,7 @@ defaults:
       environment: &base_ubuntu_clang_small_env
         <<: *base_ubuntu_clang_env
         MAKEFLAGS: -j 2
+        CPUs: 2
 
   - base_ubuntu2004: &base_ubuntu2004
       docker:
@@ -441,6 +451,7 @@ defaults:
       environment: &base_ubuntu2004_env
         TERM: xterm
         MAKEFLAGS: -j 3
+        CPUs: 3
 
   - base_ubuntu2004_small: &base_ubuntu2004_small
       <<: *base_ubuntu2004
@@ -448,6 +459,7 @@ defaults:
       environment: &base_ubuntu2004_small_env
         <<: *base_ubuntu2004_env
         MAKEFLAGS: -j 2
+        CPUs: 2
 
   - base_ubuntu2004_xlarge: &base_ubuntu2004_xlarge
       <<: *base_ubuntu2004
@@ -455,6 +467,7 @@ defaults:
       environment: &base_ubuntu2004_xlarge_env
         <<: *base_ubuntu2004_env
         MAKEFLAGS: -j 10
+        CPUs: 10
 
   - base_ubuntu2204: &base_ubuntu2204
       docker:
@@ -462,6 +475,7 @@ defaults:
       environment: &base_ubuntu2204_env
         TERM: xterm
         MAKEFLAGS: -j 3
+        CPUs: 3
 
   - base_ubuntu2204_clang: &base_ubuntu2204_clang
       docker:
@@ -471,6 +485,7 @@ defaults:
         CC: clang
         CXX: clang++
         MAKEFLAGS: -j 3
+        CPUs: 3
 
   - base_ubuntu2204_clang_large: &base_ubuntu2204_clang_large
       <<: *base_ubuntu2204_clang
@@ -478,6 +493,7 @@ defaults:
       environment: &base_ubuntu2204_clang_large_env
         <<: *base_ubuntu2204_clang_env
         MAKEFLAGS: -j 5
+        CPUs: 5
 
   - base_ubuntu2204_small: &base_ubuntu2204_small
       <<: *base_ubuntu2204
@@ -485,6 +501,7 @@ defaults:
       environment: &base_ubuntu2204_small_env
         <<: *base_ubuntu2204_env
         MAKEFLAGS: -j 2
+        CPUs: 2
 
   - base_ubuntu2204_large: &base_ubuntu2204_large
       <<: *base_ubuntu2204
@@ -492,6 +509,7 @@ defaults:
       environment: &base_ubuntu2204_large_env
         <<: *base_ubuntu2204_env
         MAKEFLAGS: -j 5
+        CPUs: 5
 
   - base_ubuntu2204_xlarge: &base_ubuntu2204_xlarge
       <<: *base_ubuntu2204
@@ -499,6 +517,7 @@ defaults:
       environment: &base_ubuntu2204_xlarge_env
         <<: *base_ubuntu2204_env
         MAKEFLAGS: -j 10
+        CPUs: 10
 
   - base_win: &base_win
       executor:
diff --git a/.circleci/soltest.sh b/.circleci/soltest.sh
index e350aa23d7..488201bae3 100755
--- a/.circleci/soltest.sh
+++ b/.circleci/soltest.sh
@@ -36,6 +36,7 @@ set -e
 
 OPTIMIZE=${OPTIMIZE:-"0"}
 EVM=${EVM:-"invalid"}
+CPUs=${CPUs:-3}
 REPODIR="$(realpath "$(dirname "$0")/..")"
 
 IFS=" " read -r -a BOOST_TEST_ARGS <<< "$BOOST_TEST_ARGS"
@@ -67,7 +68,6 @@ get_logfile_basename() {
 # long-running test cases are next to each other.
 CIRCLE_NODE_INDEX=$(((CIRCLE_NODE_INDEX + 23 * INDEX_SHIFT) % CIRCLE_NODE_TOTAL))
 
-CPUs=3
 PIDs=()
 for run in $(seq 0 $((CPUs - 1)))
 do

From f121e7e9dd34a65474d6f92fc9ce23d6fd0396d3 Mon Sep 17 00:00:00 2001
From: Markus Osterlund / robriks <80549215+robriks@users.noreply.github.com>
Date: Wed, 17 May 2023 07:10:07 -0400
Subject: [PATCH 1533/1748] Update abi-spec.rst

Rearranged the calldata encoding explanations for the example functions so they are more easy to understand since they now visually match the order the functions are declared:

Foo.bar()
Foo.baz()
Foo.sam()

Maybe I'm smolbrain but it was confusing to reference the functions when they are declared in a different order than they are explained. I kept imagining calldata encoding layouts for bar() even though the example I was looking at discussed baz() instead.

Minor change but makes a big difference for less experienced calldataooors like me.
---
 docs/abi-spec.rst | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/abi-spec.rst b/docs/abi-spec.rst
index 41967dd46d..0d48b51dd7 100644
--- a/docs/abi-spec.rst
+++ b/docs/abi-spec.rst
@@ -252,7 +252,21 @@ Given the contract:
     }
 
 
-Thus, for our ``Foo`` example if we wanted to call ``baz`` with the parameters ``69`` and
+Thus, for our ``Foo`` example, if we wanted to call ``bar`` with the argument ``["abc", "def"]``, we would pass 68 bytes total, broken down into:
+
+- ``0xfce353f6``: the Method ID. This is derived from the signature ``bar(bytes3[2])``.
+- ``0x6162630000000000000000000000000000000000000000000000000000000000``: the first part of the first
+  parameter, a ``bytes3`` value ``"abc"`` (left-aligned).
+- ``0x6465660000000000000000000000000000000000000000000000000000000000``: the second part of the first
+  parameter, a ``bytes3`` value ``"def"`` (left-aligned).
+
+In total:
+
+.. code-block:: none
+
+    0xfce353f661626300000000000000000000000000000000000000000000000000000000006465660000000000000000000000000000000000000000000000000000000000
+
+If we wanted to call ``baz`` with the parameters ``69`` and
 ``true``, we would pass 68 bytes total, which can be broken down into:
 
 - ``0xcdcd77c0``: the Method ID. This is derived as the first 4 bytes of the Keccak hash of
@@ -271,20 +285,6 @@ In total:
 It returns a single ``bool``. If, for example, it were to return ``false``, its output would be
 the single byte array ``0x0000000000000000000000000000000000000000000000000000000000000000``, a single bool.
 
-If we wanted to call ``bar`` with the argument ``["abc", "def"]``, we would pass 68 bytes total, broken down into:
-
-- ``0xfce353f6``: the Method ID. This is derived from the signature ``bar(bytes3[2])``.
-- ``0x6162630000000000000000000000000000000000000000000000000000000000``: the first part of the first
-  parameter, a ``bytes3`` value ``"abc"`` (left-aligned).
-- ``0x6465660000000000000000000000000000000000000000000000000000000000``: the second part of the first
-  parameter, a ``bytes3`` value ``"def"`` (left-aligned).
-
-In total:
-
-.. code-block:: none
-
-    0xfce353f661626300000000000000000000000000000000000000000000000000000000006465660000000000000000000000000000000000000000000000000000000000
-
 If we wanted to call ``sam`` with the arguments ``"dave"``, ``true`` and ``[1,2,3]``, we would
 pass 292 bytes total, broken down into:
 

From b7d2c8bb0ae4d0de0b83aed4bd4ebaf9ff3094da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 8 Aug 2023 16:11:57 +0200
Subject: [PATCH 1534/1748] SourceReferenceFormatter: Line wrapping and unused
 includes

---
 liblangutil/SourceReferenceFormatter.h | 5 ++++-
 libsolidity/codegen/ir/IRGenerator.cpp | 2 --
 test/libsolidity/GasTest.cpp           | 1 -
 test/libyul/Common.cpp                 | 1 -
 test/libyul/ControlFlowGraphTest.cpp   | 1 -
 tools/yulPhaser/Program.cpp            | 1 -
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
index def216efa1..c072e72e24 100644
--- a/liblangutil/SourceReferenceFormatter.h
+++ b/liblangutil/SourceReferenceFormatter.h
@@ -46,7 +46,10 @@ class SourceReferenceFormatter
 		bool _colored,
 		bool _withErrorIds
 	):
-		m_stream(_stream), m_charStreamProvider(_charStreamProvider), m_colored(_colored), m_withErrorIds(_withErrorIds)
+		m_stream(_stream),
+		m_charStreamProvider(_charStreamProvider),
+		m_colored(_colored),
+		m_withErrorIds(_withErrorIds)
 	{}
 
 	/// Prints source location if it is given.
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 223d712f0d..67adb61bbf 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -38,8 +38,6 @@
 #include <libsolutil/StringUtils.h>
 #include <libsolutil/Whiskers.h>
 
-#include <liblangutil/SourceReferenceFormatter.h>
-
 #include <json/json.h>
 
 #include <sstream>
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index 78a0ca907f..0060c81e40 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -20,7 +20,6 @@
 #include <test/Common.h>
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/JSON.h>
-#include <liblangutil/SourceReferenceFormatter.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index 800684f353..f10414a9f7 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -33,7 +33,6 @@
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/ErrorReporter.h>
 #include <liblangutil/Scanner.h>
-#include <liblangutil/SourceReferenceFormatter.h>
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/test/libyul/ControlFlowGraphTest.cpp b/test/libyul/ControlFlowGraphTest.cpp
index dffc7ecbfd..44fff4219f 100644
--- a/test/libyul/ControlFlowGraphTest.cpp
+++ b/test/libyul/ControlFlowGraphTest.cpp
@@ -24,7 +24,6 @@
 #include <libyul/backends/evm/ControlFlowGraphBuilder.h>
 #include <libyul/backends/evm/StackHelpers.h>
 #include <libyul/Object.h>
-#include <liblangutil/SourceReferenceFormatter.h>
 
 #include <libsolutil/AnsiColorized.h>
 #include <libsolutil/Visitor.h>
diff --git a/tools/yulPhaser/Program.cpp b/tools/yulPhaser/Program.cpp
index c62b8e1303..3089591ed8 100644
--- a/tools/yulPhaser/Program.cpp
+++ b/tools/yulPhaser/Program.cpp
@@ -20,7 +20,6 @@
 
 #include <liblangutil/CharStream.h>
 #include <liblangutil/ErrorReporter.h>
-#include <liblangutil/SourceReferenceFormatter.h>
 
 #include <libyul/AsmAnalysis.h>
 #include <libyul/AsmAnalysisInfo.h>

From 8407c8c615c39236db6c29d6c4f8ccbf071ee334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 8 Aug 2023 17:08:37 +0200
Subject: [PATCH 1535/1748] SourceReferenceFormatter: Support full range of
 options in formatErrorInformation()

---
 liblangutil/SourceReferenceFormatter.h        | 26 ++++++++++++++-----
 libsolidity/interface/CompilerStack.cpp       | 17 +++++-------
 test/libsolidity/InlineAssembly.cpp           | 10 +++----
 .../tools/ossfuzz/SolidityEvmoneInterface.cpp |  9 +++----
 4 files changed, 35 insertions(+), 27 deletions(-)

diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
index c072e72e24..02a38288aa 100644
--- a/liblangutil/SourceReferenceFormatter.h
+++ b/liblangutil/SourceReferenceFormatter.h
@@ -90,14 +90,28 @@ class SourceReferenceFormatter
 
 	static std::string formatErrorInformation(
 		Error const& _error,
-		CharStreamProvider const& _charStreamProvider
+		CharStreamProvider const& _charStreamProvider,
+		bool _colored = false,
+		bool _withErrorIds = false
 	)
 	{
-		return formatExceptionInformation(
-			_error,
-			Error::errorSeverity(_error.type()),
-			_charStreamProvider
-		);
+		std::ostringstream errorOutput;
+		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, _withErrorIds);
+		formatter.printErrorInformation(_error);
+		return errorOutput.str();
+	}
+
+	static std::string formatErrorInformation(
+		langutil::ErrorList const& _errors,
+		CharStreamProvider const& _charStreamProvider,
+		bool _colored = false,
+		bool _withErrorIds = false
+	)
+	{
+		std::ostringstream errorOutput;
+		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, _withErrorIds);
+		formatter.printErrorInformation(_errors);
+		return errorOutput.str();
 	}
 
 	static std::string formatErrorInformation(Error const& _error, CharStream const& _charStream);
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index bbebc25085..84f886d721 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1486,16 +1486,13 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 		m_optimiserSettings,
 		m_debugInfoSelection
 	);
-	if (!stack.parseAndAnalyze("", compiledContract.yulIR))
-	{
-		string errorMessage;
-		for (auto const& error: stack.errors())
-			errorMessage += langutil::SourceReferenceFormatter::formatErrorInformation(
-				*error,
-				stack.charStream("")
-			);
-		solAssert(false, compiledContract.yulIR + "\n\nInvalid IR generated:\n" + errorMessage + "\n");
-	}
+	bool yulAnalysisSuccessful = stack.parseAndAnalyze("", compiledContract.yulIR);
+	solAssert(
+		yulAnalysisSuccessful,
+		compiledContract.yulIR + "\n\n"
+		"Invalid IR generated:\n" +
+		langutil::SourceReferenceFormatter::formatErrorInformation(stack.errors(), stack) + "\n"
+	);
 
 	compiledContract.yulIRAst = stack.astJson();
 	stack.optimize();
diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp
index 4a8a9d6172..d59b843ddb 100644
--- a/test/libsolidity/InlineAssembly.cpp
+++ b/test/libsolidity/InlineAssembly.cpp
@@ -85,12 +85,10 @@ std::optional<Error> parseAndReturnFirstError(
 		if (_allowWarnings && e->type() == Error::Type::Warning)
 			continue;
 		if (error)
-		{
-			string errors;
-			for (auto const& err: stack.errors())
-				errors += SourceReferenceFormatter::formatErrorInformation(*err, stack);
-			BOOST_FAIL("Found more than one error:\n" + errors);
-		}
+			BOOST_FAIL(
+				"Found more than one error:\n" +
+				SourceReferenceFormatter::formatErrorInformation(stack.errors(), stack)
+			);
 		error = e;
 	}
 	if (!success)
diff --git a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
index d2d18bcf5e..3414709088 100644
--- a/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
+++ b/test/tools/ossfuzz/SolidityEvmoneInterface.cpp
@@ -42,11 +42,10 @@ optional<CompilerOutput> SolidityCompilationFramework::compileContract()
 		if (m_compilerInput.debugFailure)
 		{
 			cerr << "Compiling contract failed" << endl;
-			for (auto const& error: m_compiler.errors())
-				cerr << SourceReferenceFormatter::formatErrorInformation(
-					*error,
-					m_compiler
-				);
+			cerr << SourceReferenceFormatter::formatErrorInformation(
+				m_compiler.errors(),
+				m_compiler
+			);
 		}
 		return {};
 	}

From 4020552e1d7146ae0373092a3d04c86d40db2b27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 8 Aug 2023 17:54:05 +0200
Subject: [PATCH 1536/1748] SourceReferenceFormatter: Remove the ineffective
 _withErrorIds parameter from formatExceptionInformation()

---
 liblangutil/SourceReferenceFormatter.h     | 10 ++++------
 libsolidity/interface/StandardCompiler.cpp |  3 +--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
index 02a38288aa..8d3121a7a8 100644
--- a/liblangutil/SourceReferenceFormatter.h
+++ b/liblangutil/SourceReferenceFormatter.h
@@ -64,12 +64,11 @@ class SourceReferenceFormatter
 		util::Exception const& _exception,
 		Error::Type _type,
 		CharStreamProvider const& _charStreamProvider,
-		bool _colored = false,
-		bool _withErrorIds = false
+		bool _colored = false
 	)
 	{
 		std::ostringstream errorOutput;
-		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, _withErrorIds);
+		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, false /* _withErrorIds */);
 		formatter.printExceptionInformation(_exception, _type);
 		return errorOutput.str();
 	}
@@ -78,12 +77,11 @@ class SourceReferenceFormatter
 		util::Exception const& _exception,
 		Error::Severity _severity,
 		CharStreamProvider const& _charStreamProvider,
-		bool _colored = false,
-		bool _withErrorIds = false
+		bool _colored = false
 	)
 	{
 		std::ostringstream errorOutput;
-		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, _withErrorIds);
+		SourceReferenceFormatter formatter(errorOutput, _charStreamProvider, _colored, false /* _withErrorIds */);
 		formatter.printExceptionInformation(_exception, _severity);
 		return errorOutput.str();
 	}
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 767792601b..32d6cf8e8b 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -125,8 +125,7 @@ Json::Value formatErrorWithException(
 		_exception,
 		_type,
 		_charStreamProvider,
-		false, // colored
-		false // _withErrorIds
+		false // colored
 	);
 
 	if (string const* description = _exception.comment())

From a59fc39f101449587bad937a92c0c9802c7d6438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 8 Aug 2023 17:17:37 +0200
Subject: [PATCH 1537/1748] Use printErrorInformation() over
 printExceptionInformation() where possible

---
 liblangutil/SourceReferenceFormatter.h       | 4 ++++
 solc/CommandLineInterface.cpp                | 2 +-
 test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp | 5 +----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
index 8d3121a7a8..91f1d7ddd0 100644
--- a/liblangutil/SourceReferenceFormatter.h
+++ b/liblangutil/SourceReferenceFormatter.h
@@ -52,6 +52,10 @@ class SourceReferenceFormatter
 		m_withErrorIds(_withErrorIds)
 	{}
 
+	// WARNING: Use the xyzErrorInformation() variants over xyzExceptionInformation() when you
+	// do have access to an Error instance. Error is implicitly convertible to util::Exception
+	// but the conversion loses the error ID.
+
 	/// Prints source location if it is given.
 	void printSourceLocation(SourceReference const& _ref);
 	void printExceptionInformation(SourceReferenceExtractor::Message const& _msg);
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 7a28900b32..509279a715 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -827,7 +827,7 @@ void CommandLineInterface::compile()
 		else
 		{
 			m_hasOutput = true;
-			formatter.printExceptionInformation(_error, Error::errorSeverity(_error.type()));
+			formatter.printErrorInformation(_error);
 			solThrow(CommandLineExecutionError, "");
 		}
 	}
diff --git a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
index b1725a8fa8..d1717a159a 100644
--- a/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
+++ b/test/tools/ossfuzz/yulProto_diff_ossfuzz.cpp
@@ -77,10 +77,7 @@ DEFINE_PROTO_FUZZER(Program const& _input)
 		Error::containsErrors(stack.errors())
 	)
 	{
-		SourceReferenceFormatter formatter(std::cout, stack, false, false);
-
-		for (auto const& error: stack.errors())
-			formatter.printExceptionInformation(*error, Error::errorSeverity(error->type()));
+		SourceReferenceFormatter{std::cout, stack, false, false}.printErrorInformation(stack.errors());
 		yulAssert(false, "Proto fuzzer generated malformed program");
 	}
 

From 339053f185253fd50f3476dc75a57fd958544bcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 8 Aug 2023 17:19:43 +0200
Subject: [PATCH 1538/1748] AnalysisFramework.formatErrors(): Fix _withErrorIds
 flag not having any effect

---
 test/libsolidity/AnalysisFramework.cpp | 15 ++++++++-------
 test/libsolidity/AnalysisFramework.h   |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index dc1e4fbcfc..6c6ad0cb86 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -147,15 +147,17 @@ ErrorList AnalysisFramework::expectError(std::string const& _source, bool _warni
 }
 
 string AnalysisFramework::formatErrors(
-	langutil::ErrorList _errors,
+	langutil::ErrorList const& _errors,
 	bool _colored,
 	bool _withErrorIds
 ) const
 {
-	string message;
-	for (auto const& error: _errors)
-		message += formatError(*error, _colored, _withErrorIds);
-	return message;
+	return SourceReferenceFormatter::formatErrorInformation(
+		_errors,
+		*m_compiler,
+		_colored,
+		_withErrorIds
+	);
 }
 
 string AnalysisFramework::formatError(
@@ -164,9 +166,8 @@ string AnalysisFramework::formatError(
 	bool _withErrorIds
 ) const
 {
-	return SourceReferenceFormatter::formatExceptionInformation(
+	return SourceReferenceFormatter::formatErrorInformation(
 		_error,
-		_error.type(),
 		*m_compiler,
 		_colored,
 		_withErrorIds
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index 2e5d00e1da..d36884390a 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -58,7 +58,7 @@ class AnalysisFramework
 	langutil::ErrorList expectError(std::string const& _source, bool _warning = false, bool _allowMultiple = false);
 
 	std::string formatErrors(
-		langutil::ErrorList _errors,
+		langutil::ErrorList const& _errors,
 		bool _colored = false,
 		bool _withErrorIds = false
 	) const;

From de1a017ccb935d149ed6bcbdb730d89883f8ce02 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 14 Aug 2023 10:37:11 +0200
Subject: [PATCH 1539/1748] Purge using namespace std from libsolidity/analysis

---
 libsolidity/analysis/ConstantEvaluator.cpp    |  89 ++++++------
 libsolidity/analysis/ContractLevelChecker.cpp |  33 ++---
 libsolidity/analysis/ControlFlowAnalyzer.cpp  |  19 ++-
 libsolidity/analysis/ControlFlowBuilder.cpp   |   6 +-
 libsolidity/analysis/ControlFlowGraph.cpp     |   1 -
 libsolidity/analysis/DeclarationContainer.cpp |  21 ++-
 .../analysis/DeclarationTypeChecker.cpp       |  15 +-
 libsolidity/analysis/DocStringAnalyser.cpp    |  15 +-
 libsolidity/analysis/DocStringTagParser.cpp   |  39 +++--
 libsolidity/analysis/FunctionCallGraph.cpp    |  33 ++---
 libsolidity/analysis/GlobalContext.cpp        |  16 +-
 libsolidity/analysis/NameAndTypeResolver.cpp  |  63 ++++----
 libsolidity/analysis/OverrideChecker.cpp      |  85 ++++++-----
 libsolidity/analysis/PostTypeChecker.cpp      |  15 +-
 .../analysis/PostTypeContractLevelChecker.cpp |   5 +-
 libsolidity/analysis/ReferencesResolver.cpp   |  23 ++-
 libsolidity/analysis/Scoper.cpp               |   1 -
 libsolidity/analysis/StaticAnalyzer.cpp       |  17 +--
 libsolidity/analysis/SyntaxChecker.cpp        |  35 +++--
 libsolidity/analysis/TypeChecker.cpp          | 137 +++++++++---------
 libsolidity/analysis/ViewPureChecker.cpp      |  15 +-
 scripts/check_style.sh                        |   1 +
 22 files changed, 331 insertions(+), 353 deletions(-)

diff --git a/libsolidity/analysis/ConstantEvaluator.cpp b/libsolidity/analysis/ConstantEvaluator.cpp
index 7fde36ec0e..8e18183a81 100644
--- a/libsolidity/analysis/ConstantEvaluator.cpp
+++ b/libsolidity/analysis/ConstantEvaluator.cpp
@@ -29,7 +29,6 @@
 
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 using namespace solidity::langutil;
@@ -47,9 +46,9 @@ bool fitsPrecisionExp(bigint const& _base, bigint const& _exp)
 
 	solAssert(_base > 0, "");
 
-	size_t const bitsMax = 4096;
+	std::size_t const bitsMax = 4096;
 
-	size_t mostSignificantBaseBit = static_cast<size_t>(boost::multiprecision::msb(_base));
+	std::size_t mostSignificantBaseBit = static_cast<std::size_t>(boost::multiprecision::msb(_base));
 	if (mostSignificantBaseBit == 0) // _base == 1
 		return true;
 	if (mostSignificantBaseBit > bitsMax) // _base >= 2 ^ 4096
@@ -68,7 +67,7 @@ bool fitsPrecisionBase2(bigint const& _mantissa, uint32_t _expBase2)
 
 }
 
-optional<rational> ConstantEvaluator::evaluateBinaryOperator(Token _operator, rational const& _left, rational const& _right)
+std::optional<rational> ConstantEvaluator::evaluateBinaryOperator(Token _operator, rational const& _left, rational const& _right)
 {
 	bool fractional = _left.denominator() != 1 || _right.denominator() != 1;
 	switch (_operator)
@@ -76,17 +75,17 @@ optional<rational> ConstantEvaluator::evaluateBinaryOperator(Token _operator, ra
 	//bit operations will only be enabled for integers and fixed types that resemble integers
 	case Token::BitOr:
 		if (fractional)
-			return nullopt;
+			return std::nullopt;
 		else
 			return _left.numerator() | _right.numerator();
 	case Token::BitXor:
 		if (fractional)
-			return nullopt;
+			return std::nullopt;
 		else
 			return _left.numerator() ^ _right.numerator();
 	case Token::BitAnd:
 		if (fractional)
-			return nullopt;
+			return std::nullopt;
 		else
 			return _left.numerator() & _right.numerator();
 	case Token::Add: return _left + _right;
@@ -94,12 +93,12 @@ optional<rational> ConstantEvaluator::evaluateBinaryOperator(Token _operator, ra
 	case Token::Mul: return _left * _right;
 	case Token::Div:
 		if (_right == rational(0))
-			return nullopt;
+			return std::nullopt;
 		else
 			return _left / _right;
 	case Token::Mod:
 		if (_right == rational(0))
-			return nullopt;
+			return std::nullopt;
 		else if (fractional)
 		{
 			rational tempValue = _left / _right;
@@ -111,7 +110,7 @@ optional<rational> ConstantEvaluator::evaluateBinaryOperator(Token _operator, ra
 	case Token::Exp:
 	{
 		if (_right.denominator() != 1)
-			return nullopt;
+			return std::nullopt;
 		bigint const& exp = _right.numerator();
 
 		// x ** 0 = 1
@@ -127,13 +126,13 @@ optional<rational> ConstantEvaluator::evaluateBinaryOperator(Token _operator, ra
 		}
 		else
 		{
-			if (abs(exp) > numeric_limits<uint32_t>::max())
-				return nullopt; // This will need too much memory to represent.
+			if (abs(exp) > std::numeric_limits<uint32_t>::max())
+				return std::nullopt; // This will need too much memory to represent.
 
 			uint32_t absExp = bigint(abs(exp)).convert_to<uint32_t>();
 
 			if (!fitsPrecisionExp(abs(_left.numerator()), absExp) || !fitsPrecisionExp(abs(_left.denominator()), absExp))
-				return nullopt;
+				return std::nullopt;
 
 			static auto const optimizedPow = [](bigint const& _base, uint32_t _exponent) -> bigint {
 				if (_base == 1)
@@ -158,18 +157,18 @@ optional<rational> ConstantEvaluator::evaluateBinaryOperator(Token _operator, ra
 	case Token::SHL:
 	{
 		if (fractional)
-			return nullopt;
+			return std::nullopt;
 		else if (_right < 0)
-			return nullopt;
-		else if (_right > numeric_limits<uint32_t>::max())
-			return nullopt;
+			return std::nullopt;
+		else if (_right > std::numeric_limits<uint32_t>::max())
+			return std::nullopt;
 		if (_left.numerator() == 0)
 			return 0;
 		else
 		{
 			uint32_t exponent = _right.numerator().convert_to<uint32_t>();
 			if (!fitsPrecisionBase2(abs(_left.numerator()), exponent))
-				return nullopt;
+				return std::nullopt;
 			return _left.numerator() * boost::multiprecision::pow(bigint(2), exponent);
 		}
 		break;
@@ -179,11 +178,11 @@ optional<rational> ConstantEvaluator::evaluateBinaryOperator(Token _operator, ra
 	case Token::SAR:
 	{
 		if (fractional)
-			return nullopt;
+			return std::nullopt;
 		else if (_right < 0)
-			return nullopt;
-		else if (_right > numeric_limits<uint32_t>::max())
-			return nullopt;
+			return std::nullopt;
+		else if (_right > std::numeric_limits<uint32_t>::max())
+			return std::nullopt;
 		if (_left.numerator() == 0)
 			return 0;
 		else
@@ -209,60 +208,60 @@ optional<rational> ConstantEvaluator::evaluateBinaryOperator(Token _operator, ra
 		break;
 	}
 	default:
-		return nullopt;
+		return std::nullopt;
 	}
 }
 
-optional<rational> ConstantEvaluator::evaluateUnaryOperator(Token _operator, rational const& _input)
+std::optional<rational> ConstantEvaluator::evaluateUnaryOperator(Token _operator, rational const& _input)
 {
 	switch (_operator)
 	{
 	case Token::BitNot:
 		if (_input.denominator() != 1)
-			return nullopt;
+			return std::nullopt;
 		else
 			return ~_input.numerator();
 	case Token::Sub:
 		return -_input;
 	default:
-		return nullopt;
+		return std::nullopt;
 	}
 }
 
 namespace
 {
 
-optional<TypedRational> convertType(rational const& _value, Type const& _type)
+std::optional<TypedRational> convertType(rational const& _value, Type const& _type)
 {
 	if (_type.category() == Type::Category::RationalNumber)
 		return TypedRational{TypeProvider::rationalNumber(_value), _value};
 	else if (auto const* integerType = dynamic_cast<IntegerType const*>(&_type))
 	{
 		if (_value > integerType->maxValue() || _value < integerType->minValue())
-			return nullopt;
+			return std::nullopt;
 		else
 			return TypedRational{&_type, _value.numerator() / _value.denominator()};
 	}
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
-optional<TypedRational> convertType(optional<TypedRational> const& _value, Type const& _type)
+std::optional<TypedRational> convertType(std::optional<TypedRational> const& _value, Type const& _type)
 {
-	return _value ? convertType(_value->value, _type) : nullopt;
+	return _value ? convertType(_value->value, _type) : std::nullopt;
 }
 
-optional<TypedRational> constantToTypedValue(Type const& _type)
+std::optional<TypedRational> constantToTypedValue(Type const& _type)
 {
 	if (_type.category() == Type::Category::RationalNumber)
 		return TypedRational{&_type, dynamic_cast<RationalNumberType const&>(_type).value()};
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
 }
 
-optional<TypedRational> ConstantEvaluator::evaluate(
+std::optional<TypedRational> ConstantEvaluator::evaluate(
 	langutil::ErrorReporter& _errorReporter,
 	Expression const& _expr
 )
@@ -271,7 +270,7 @@ optional<TypedRational> ConstantEvaluator::evaluate(
 }
 
 
-optional<TypedRational> ConstantEvaluator::evaluate(ASTNode const& _node)
+std::optional<TypedRational> ConstantEvaluator::evaluate(ASTNode const& _node)
 {
 	if (!m_values.count(&_node))
 	{
@@ -280,7 +279,7 @@ optional<TypedRational> ConstantEvaluator::evaluate(ASTNode const& _node)
 			solAssert(varDecl->isConstant(), "");
 			// In some circumstances, we do not yet have a type for the variable.
 			if (!varDecl->value() || !varDecl->type())
-				m_values[&_node] = nullopt;
+				m_values[&_node] = std::nullopt;
 			else
 			{
 				m_depth++;
@@ -298,7 +297,7 @@ optional<TypedRational> ConstantEvaluator::evaluate(ASTNode const& _node)
 		{
 			expression->accept(*this);
 			if (!m_values.count(&_node))
-				m_values[&_node] = nullopt;
+				m_values[&_node] = std::nullopt;
 		}
 	}
 	return m_values.at(&_node);
@@ -306,7 +305,7 @@ optional<TypedRational> ConstantEvaluator::evaluate(ASTNode const& _node)
 
 void ConstantEvaluator::endVisit(UnaryOperation const& _operation)
 {
-	optional<TypedRational> value = evaluate(_operation.subExpression());
+	std::optional<TypedRational> value = evaluate(_operation.subExpression());
 	if (!value)
 		return;
 
@@ -317,9 +316,9 @@ void ConstantEvaluator::endVisit(UnaryOperation const& _operation)
 	if (!value)
 		return;
 
-	if (optional<rational> result = evaluateUnaryOperator(_operation.getOperator(), value->value))
+	if (std::optional<rational> result = evaluateUnaryOperator(_operation.getOperator(), value->value))
 	{
-		optional<TypedRational> convertedValue = convertType(*result, *resultType);
+		std::optional<TypedRational> convertedValue = convertType(*result, *resultType);
 		if (!convertedValue)
 			m_errorReporter.fatalTypeError(
 				3667_error,
@@ -332,8 +331,8 @@ void ConstantEvaluator::endVisit(UnaryOperation const& _operation)
 
 void ConstantEvaluator::endVisit(BinaryOperation const& _operation)
 {
-	optional<TypedRational> left = evaluate(_operation.leftExpression());
-	optional<TypedRational> right = evaluate(_operation.rightExpression());
+	std::optional<TypedRational> left = evaluate(_operation.leftExpression());
+	std::optional<TypedRational> right = evaluate(_operation.rightExpression());
 	if (!left || !right)
 		return;
 
@@ -349,7 +348,7 @@ void ConstantEvaluator::endVisit(BinaryOperation const& _operation)
 			6020_error,
 			_operation.location(),
 			"Operator " +
-			string(TokenTraits::toString(_operation.getOperator())) +
+			std::string(TokenTraits::toString(_operation.getOperator())) +
 			" not compatible with types " +
 			left->type->toString() +
 			" and " +
@@ -363,9 +362,9 @@ void ConstantEvaluator::endVisit(BinaryOperation const& _operation)
 	if (!left || !right)
 		return;
 
-	if (optional<rational> value = evaluateBinaryOperator(_operation.getOperator(), left->value, right->value))
+	if (std::optional<rational> value = evaluateBinaryOperator(_operation.getOperator(), left->value, right->value))
 	{
-		optional<TypedRational> convertedValue = convertType(*value, *resultType);
+		std::optional<TypedRational> convertedValue = convertType(*value, *resultType);
 		if (!convertedValue)
 			m_errorReporter.fatalTypeError(
 				2643_error,
diff --git a/libsolidity/analysis/ContractLevelChecker.cpp b/libsolidity/analysis/ContractLevelChecker.cpp
index e7e7041a0f..eaeaf48517 100644
--- a/libsolidity/analysis/ContractLevelChecker.cpp
+++ b/libsolidity/analysis/ContractLevelChecker.cpp
@@ -32,7 +32,6 @@
 
 #include <range/v3/view/reverse.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -49,10 +48,10 @@ bool hasEqualExternalCallableParameters(T const& _a, B const& _b)
 }
 
 template<typename T>
-map<ASTString, vector<T const*>> filterDeclarations(
-	map<ASTString, vector<Declaration const*>> const& _declarations)
+std::map<ASTString, std::vector<T const*>> filterDeclarations(
+	std::map<ASTString, std::vector<Declaration const*>> const& _declarations)
 {
-	map<ASTString, vector<T const*>> filteredDeclarations;
+	std::map<ASTString, std::vector<T const*>> filteredDeclarations;
 	for (auto const& [name, overloads]: _declarations)
 		for (auto const* declaration: overloads)
 			if (auto typedDeclaration = dynamic_cast<T const*>(declaration))
@@ -106,7 +105,7 @@ void ContractLevelChecker::checkDuplicateFunctions(ContractDefinition const& _co
 {
 	/// Checks that two functions with the same name defined in this contract have different
 	/// argument types and that there is at most one constructor.
-	map<string, vector<FunctionDefinition const*>> functions;
+	std::map<std::string, std::vector<FunctionDefinition const*>> functions;
 	FunctionDefinition const* constructor = nullptr;
 	FunctionDefinition const* fallback = nullptr;
 	FunctionDefinition const* receive = nullptr;
@@ -157,7 +156,7 @@ void ContractLevelChecker::checkDuplicateEvents(ContractDefinition const& _contr
 {
 	/// Checks that two events with the same name defined in this contract have different
 	/// argument types
-	map<string, vector<EventDefinition const*>> events;
+	std::map<std::string, std::vector<EventDefinition const*>> events;
 	for (auto const* contract: _contract.annotation().linearizedBaseContracts)
 		for (EventDefinition const* event: contract->events())
 			events[event->name()].push_back(event);
@@ -195,12 +194,12 @@ void ContractLevelChecker::checkReceiveFunction(ContractDefinition const& _contr
 }
 
 template <class T>
-void ContractLevelChecker::findDuplicateDefinitions(map<string, vector<T>> const& _definitions)
+void ContractLevelChecker::findDuplicateDefinitions(std::map<std::string, std::vector<T>> const& _definitions)
 {
 	for (auto const& it: _definitions)
 	{
-		vector<T> const& overloads = it.second;
-		set<size_t> reported;
+		std::vector<T> const& overloads = it.second;
+		std::set<size_t> reported;
 		for (size_t i = 0; i < overloads.size() && !reported.count(i); ++i)
 		{
 			SecondarySourceLocation ssl;
@@ -228,15 +227,15 @@ void ContractLevelChecker::findDuplicateDefinitions(map<string, vector<T>> const
 			if (ssl.infos.size() > 0)
 			{
 				ErrorId error;
-				string message;
-				if constexpr (is_same_v<T, FunctionDefinition const*>)
+				std::string message;
+				if constexpr (std::is_same_v<T, FunctionDefinition const*>)
 				{
 					error = 1686_error;
 					message = "Function with same name and parameter types defined twice.";
 				}
 				else
 				{
-					static_assert(is_same_v<T, EventDefinition const*>, "Expected \"FunctionDefinition const*\" or \"EventDefinition const*\"");
+					static_assert(std::is_same_v<T, EventDefinition const*>, "Expected \"FunctionDefinition const*\" or \"EventDefinition const*\"");
 					error = 5883_error;
 					message = "Event with same name and parameter types defined twice.";
 				}
@@ -258,7 +257,7 @@ void ContractLevelChecker::checkAbstractDefinitions(ContractDefinition const& _c
 {
 	// Collects functions, static variable getters and modifiers. If they
 	// override (unimplemented) base class ones, they are replaced.
-	set<OverrideProxy, OverrideProxy::CompareBySignature> proxies;
+	std::set<OverrideProxy, OverrideProxy::CompareBySignature> proxies;
 
 	auto registerProxy = [&proxies](OverrideProxy const& _overrideProxy)
 	{
@@ -323,7 +322,7 @@ void ContractLevelChecker::checkAbstractDefinitions(ContractDefinition const& _c
 
 void ContractLevelChecker::checkBaseConstructorArguments(ContractDefinition const& _contract)
 {
-	vector<ContractDefinition const*> const& bases = _contract.annotation().linearizedBaseContracts;
+	std::vector<ContractDefinition const*> const& bases = _contract.annotation().linearizedBaseContracts;
 
 	// Determine the arguments that are used for the base constructors.
 	for (ContractDefinition const* contract: bases)
@@ -430,7 +429,7 @@ void ContractLevelChecker::annotateBaseConstructorArguments(
 
 void ContractLevelChecker::checkExternalTypeClashes(ContractDefinition const& _contract)
 {
-	map<string, vector<pair<Declaration const*, FunctionTypePointer>>> externalDeclarations;
+	std::map<std::string, std::vector<std::pair<Declaration const*, FunctionTypePointer>>> externalDeclarations;
 	for (ContractDefinition const* contract: _contract.annotation().linearizedBaseContracts)
 	{
 		for (FunctionDefinition const* f: contract->definedFunctions())
@@ -467,7 +466,7 @@ void ContractLevelChecker::checkExternalTypeClashes(ContractDefinition const& _c
 
 void ContractLevelChecker::checkHashCollisions(ContractDefinition const& _contract)
 {
-	set<util::FixedHash<4>> hashes;
+	std::set<util::FixedHash<4>> hashes;
 	for (auto const& it: _contract.interfaceFunctionList())
 	{
 		util::FixedHash<4> const& hash = it.first;
@@ -475,7 +474,7 @@ void ContractLevelChecker::checkHashCollisions(ContractDefinition const& _contra
 			m_errorReporter.fatalTypeError(
 				1860_error,
 				_contract.location(),
-				string("Function signature hash collision for ") + it.second->externalSignature()
+				std::string("Function signature hash collision for ") + it.second->externalSignature()
 			);
 		hashes.insert(hash);
 	}
diff --git a/libsolidity/analysis/ControlFlowAnalyzer.cpp b/libsolidity/analysis/ControlFlowAnalyzer.cpp
index e80964aceb..7ae1aa76e2 100644
--- a/libsolidity/analysis/ControlFlowAnalyzer.cpp
+++ b/libsolidity/analysis/ControlFlowAnalyzer.cpp
@@ -25,7 +25,6 @@
 
 #include <functional>
 
-using namespace std;
 using namespace std::placeholders;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -44,7 +43,7 @@ void ControlFlowAnalyzer::analyze(FunctionDefinition const& _function, ContractD
 	if (!_function.isImplemented())
 		return;
 
-	optional<string> mostDerivedContractName;
+	std::optional<std::string> mostDerivedContractName;
 
 	// The name of the most derived contract only required if it differs from
 	// the functions contract
@@ -61,13 +60,13 @@ void ControlFlowAnalyzer::analyze(FunctionDefinition const& _function, ContractD
 }
 
 
-void ControlFlowAnalyzer::checkUninitializedAccess(CFGNode const* _entry, CFGNode const* _exit, bool _emptyBody, optional<string> _contractName)
+void ControlFlowAnalyzer::checkUninitializedAccess(CFGNode const* _entry, CFGNode const* _exit, bool _emptyBody, std::optional<std::string> _contractName)
 {
 	struct NodeInfo
 	{
-		set<VariableDeclaration const*> unassignedVariablesAtEntry;
-		set<VariableDeclaration const*> unassignedVariablesAtExit;
-		set<VariableOccurrence const*> uninitializedVariableAccesses;
+		std::set<VariableDeclaration const*> unassignedVariablesAtEntry;
+		std::set<VariableDeclaration const*> unassignedVariablesAtExit;
+		std::set<VariableOccurrence const*> uninitializedVariableAccesses;
 		/// Propagate the information from another node to this node.
 		/// To be used to propagate information from a node to its exit nodes.
 		/// Returns true, if new variables were added and thus the current node has
@@ -84,8 +83,8 @@ void ControlFlowAnalyzer::checkUninitializedAccess(CFGNode const* _entry, CFGNod
 			;
 		}
 	};
-	map<CFGNode const*, NodeInfo> nodeInfos;
-	set<CFGNode const*> nodesToTraverse;
+	std::map<CFGNode const*, NodeInfo> nodeInfos;
+	std::set<CFGNode const*> nodesToTraverse;
 	nodesToTraverse.insert(_entry);
 
 	// Walk all paths starting from the nodes in ``nodesToTraverse`` until ``NodeInfo::propagateFrom``
@@ -138,7 +137,7 @@ void ControlFlowAnalyzer::checkUninitializedAccess(CFGNode const* _entry, CFGNod
 	auto const& exitInfo = nodeInfos[_exit];
 	if (!exitInfo.uninitializedVariableAccesses.empty())
 	{
-		vector<VariableOccurrence const*> uninitializedAccessesOrdered(
+		std::vector<VariableOccurrence const*> uninitializedAccessesOrdered(
 			exitInfo.uninitializedVariableAccesses.begin(),
 			exitInfo.uninitializedVariableAccesses.end()
 		);
@@ -168,7 +167,7 @@ void ControlFlowAnalyzer::checkUninitializedAccess(CFGNode const* _entry, CFGNod
 						varDecl.location(),
 					ssl,
 					"This variable is of " +
-					string(isStorage ? "storage" : "calldata") +
+					std::string(isStorage ? "storage" : "calldata") +
 					" pointer type and can be " +
 					(variableOccurrence->kind() == VariableOccurrence::Kind::Return ? "returned" : "accessed") +
 					" without prior assignment, which would lead to undefined behaviour."
diff --git a/libsolidity/analysis/ControlFlowBuilder.cpp b/libsolidity/analysis/ControlFlowBuilder.cpp
index 1f2cfcac9d..c20968a14d 100644
--- a/libsolidity/analysis/ControlFlowBuilder.cpp
+++ b/libsolidity/analysis/ControlFlowBuilder.cpp
@@ -21,10 +21,8 @@
 #include <libyul/AST.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
-using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
-using namespace std;
 
 ControlFlowBuilder::ControlFlowBuilder(CFG::NodeContainer& _nodeContainer, FunctionFlow const& _functionFlow, ContractDefinition const* _contract):
 	m_nodeContainer(_nodeContainer),
@@ -37,13 +35,13 @@ ControlFlowBuilder::ControlFlowBuilder(CFG::NodeContainer& _nodeContainer, Funct
 }
 
 
-unique_ptr<FunctionFlow> ControlFlowBuilder::createFunctionFlow(
+std::unique_ptr<FunctionFlow> ControlFlowBuilder::createFunctionFlow(
 	CFG::NodeContainer& _nodeContainer,
 	FunctionDefinition const& _function,
 	ContractDefinition const* _contract
 )
 {
-	auto functionFlow = make_unique<FunctionFlow>();
+	auto functionFlow = std::make_unique<FunctionFlow>();
 	functionFlow->entry = _nodeContainer.newNode();
 	functionFlow->exit = _nodeContainer.newNode();
 	functionFlow->revert = _nodeContainer.newNode();
diff --git a/libsolidity/analysis/ControlFlowGraph.cpp b/libsolidity/analysis/ControlFlowGraph.cpp
index 71acb8a672..518743ef19 100644
--- a/libsolidity/analysis/ControlFlowGraph.cpp
+++ b/libsolidity/analysis/ControlFlowGraph.cpp
@@ -20,7 +20,6 @@
 
 #include <libsolidity/analysis/ControlFlowBuilder.h>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 
diff --git a/libsolidity/analysis/DeclarationContainer.cpp b/libsolidity/analysis/DeclarationContainer.cpp
index b6cd3eef01..df6e664bac 100644
--- a/libsolidity/analysis/DeclarationContainer.cpp
+++ b/libsolidity/analysis/DeclarationContainer.cpp
@@ -29,7 +29,6 @@
 #include <range/v3/view/filter.hpp>
 #include <range/v3/range/conversion.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
@@ -41,7 +40,7 @@ Declaration const* DeclarationContainer::conflictingDeclaration(
 	if (!_name)
 		_name = &_declaration.name();
 	solAssert(!_name->empty(), "");
-	vector<Declaration const*> declarations;
+	std::vector<Declaration const*> declarations;
 	if (m_declarations.count(*_name))
 		declarations += m_declarations.at(*_name);
 	if (m_invisibleDeclarations.count(*_name))
@@ -127,7 +126,7 @@ bool DeclarationContainer::registerDeclaration(
 			m_homonymCandidates.emplace_back(*_name, _location ? _location : &_declaration.location());
 	}
 
-	vector<Declaration const*>& decls = _invisible ? m_invisibleDeclarations[*_name] : m_declarations[*_name];
+	std::vector<Declaration const*>& decls = _invisible ? m_invisibleDeclarations[*_name] : m_declarations[*_name];
 	if (!util::contains(decls, &_declaration))
 		decls.push_back(&_declaration);
 	return true;
@@ -142,13 +141,13 @@ bool DeclarationContainer::registerDeclaration(
 	return registerDeclaration(_declaration, nullptr, nullptr, _invisible, _update);
 }
 
-vector<Declaration const*> DeclarationContainer::resolveName(
+std::vector<Declaration const*> DeclarationContainer::resolveName(
 	ASTString const& _name,
 	ResolvingSettings _settings
 ) const
 {
 	solAssert(!_name.empty(), "Attempt to resolve empty name.");
-	vector<Declaration const*> result;
+	std::vector<Declaration const*> result;
 
 	if (m_declarations.count(_name))
 	{
@@ -172,24 +171,24 @@ vector<Declaration const*> DeclarationContainer::resolveName(
 	return result;
 }
 
-vector<ASTString> DeclarationContainer::similarNames(ASTString const& _name) const
+std::vector<ASTString> DeclarationContainer::similarNames(ASTString const& _name) const
 {
 
 	// because the function below has quadratic runtime - it will not magically improve once a better algorithm is discovered ;)
 	// since 80 is the suggested line length limit, we use 80^2 as length threshold
 	static size_t const MAXIMUM_LENGTH_THRESHOLD = 80 * 80;
 
-	vector<ASTString> similar;
+	std::vector<ASTString> similar;
 	size_t maximumEditDistance = _name.size() > 3 ? 2 : _name.size() / 2;
 	for (auto const& declaration: m_declarations)
 	{
-		string const& declarationName = declaration.first;
+		std::string const& declarationName = declaration.first;
 		if (util::stringWithinDistance(_name, declarationName, maximumEditDistance, MAXIMUM_LENGTH_THRESHOLD))
 			similar.push_back(declarationName);
 	}
 	for (auto const& declaration: m_invisibleDeclarations)
 	{
-		string const& declarationName = declaration.first;
+		std::string const& declarationName = declaration.first;
 		if (util::stringWithinDistance(_name, declarationName, maximumEditDistance, MAXIMUM_LENGTH_THRESHOLD))
 			similar.push_back(declarationName);
 	}
@@ -200,7 +199,7 @@ vector<ASTString> DeclarationContainer::similarNames(ASTString const& _name) con
 	return similar;
 }
 
-void DeclarationContainer::populateHomonyms(back_insert_iterator<Homonyms> _it) const
+void DeclarationContainer::populateHomonyms(std::back_insert_iterator<Homonyms> _it) const
 {
 	for (DeclarationContainer const* innerContainer: m_innerContainers)
 		innerContainer->populateHomonyms(_it);
@@ -210,7 +209,7 @@ void DeclarationContainer::populateHomonyms(back_insert_iterator<Homonyms> _it)
 		ResolvingSettings settings;
 		settings.recursive = true;
 		settings.alsoInvisible = true;
-		vector<Declaration const*> const& declarations = m_enclosingContainer->resolveName(name, std::move(settings));
+		std::vector<Declaration const*> const& declarations = m_enclosingContainer->resolveName(name, std::move(settings));
 		if (!declarations.empty())
 			_it = make_pair(location, declarations);
 	}
diff --git a/libsolidity/analysis/DeclarationTypeChecker.cpp b/libsolidity/analysis/DeclarationTypeChecker.cpp
index f17c854a7b..28c051c0a0 100644
--- a/libsolidity/analysis/DeclarationTypeChecker.cpp
+++ b/libsolidity/analysis/DeclarationTypeChecker.cpp
@@ -29,7 +29,6 @@
 
 #include <range/v3/view/transform.hpp>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 
@@ -336,10 +335,10 @@ void DeclarationTypeChecker::endVisit(ArrayTypeName const& _typeName)
 
 	if (Expression const* length = _typeName.length())
 	{
-		optional<rational> lengthValue;
+		std::optional<rational> lengthValue;
 		if (length->annotation().type && length->annotation().type->category() == Type::Category::RationalNumber)
 			lengthValue = dynamic_cast<RationalNumberType const&>(*length->annotation().type).value();
-		else if (optional<ConstantEvaluator::TypedRational> value = ConstantEvaluator::evaluate(m_errorReporter, *length))
+		else if (std::optional<ConstantEvaluator::TypedRational> value = ConstantEvaluator::evaluate(m_errorReporter, *length))
 			lengthValue = value->value;
 
 		if (!lengthValue)
@@ -399,10 +398,10 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 	Location varLoc = _variable.referenceLocation();
 	DataLocation typeLoc = DataLocation::Memory;
 
-	set<Location> allowedDataLocations = _variable.allowedDataLocations();
+	std::set<Location> allowedDataLocations = _variable.allowedDataLocations();
 	if (!allowedDataLocations.count(varLoc))
 	{
-		auto locationToString = [](VariableDeclaration::Location _location) -> string
+		auto locationToString = [](VariableDeclaration::Location _location) -> std::string
 		{
 			switch (_location)
 			{
@@ -414,7 +413,7 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 			return {};
 		};
 
-		string errorString;
+		std::string errorString;
 		if (!_variable.hasReferenceOrMappingType())
 			errorString = "Data location can only be specified for array, struct or mapping types";
 		else
@@ -430,9 +429,9 @@ void DeclarationTypeChecker::endVisit(VariableDeclaration const& _variable)
 			else if (_variable.isCallableOrCatchParameter())
 				errorString +=
 					" for " +
-					string(_variable.isReturnParameter() ? "return " : "") +
+					std::string(_variable.isReturnParameter() ? "return " : "") +
 					"parameter in" +
-					string(_variable.isExternalCallableParameter() ? " external" : "") +
+					std::string(_variable.isExternalCallableParameter() ? " external" : "") +
 					" function";
 			else
 				errorString += " for variable";
diff --git a/libsolidity/analysis/DocStringAnalyser.cpp b/libsolidity/analysis/DocStringAnalyser.cpp
index 5cff34f2a0..d4afadf26f 100644
--- a/libsolidity/analysis/DocStringAnalyser.cpp
+++ b/libsolidity/analysis/DocStringAnalyser.cpp
@@ -30,7 +30,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -38,7 +37,7 @@ using namespace solidity::frontend;
 namespace
 {
 
-void copyMissingTags(set<CallableDeclaration const*> const& _baseFunctions, StructurallyDocumentedAnnotation& _target, FunctionType const* _functionType = nullptr)
+void copyMissingTags(std::set<CallableDeclaration const*> const& _baseFunctions, StructurallyDocumentedAnnotation& _target, FunctionType const* _functionType = nullptr)
 {
 	// Only copy if there is exactly one direct base function.
 	if (_baseFunctions.size() != 1)
@@ -50,7 +49,7 @@ void copyMissingTags(set<CallableDeclaration const*> const& _baseFunctions, Stru
 
 	for (auto it = sourceDoc.docTags.begin(); it != sourceDoc.docTags.end();)
 	{
-		string const& tag = it->first;
+		std::string const& tag = it->first;
 		// Don't copy tag "inheritdoc", custom tags or already existing tags
 		if (tag == "inheritdoc" || _target.docTags.count(tag) || boost::starts_with(tag, "custom"))
 		{
@@ -68,7 +67,7 @@ void copyMissingTags(set<CallableDeclaration const*> const& _baseFunctions, Stru
 			if (_functionType && tag == "return")
 			{
 				size_t docParaNameEndPos = content.content.find_first_of(" \t");
-				string const docParameterName = content.content.substr(0, docParaNameEndPos);
+				std::string const docParameterName = content.content.substr(0, docParaNameEndPos);
 
 				if (
 					_functionType->returnParameterNames().size() > n &&
@@ -80,10 +79,10 @@ void copyMissingTags(set<CallableDeclaration const*> const& _baseFunctions, Stru
 						baseFunction.returnParameters().size() > n &&
 						baseFunction.returnParameters().at(n)->name().empty();
 
-					string paramName = _functionType->returnParameterNames().at(n);
+					std::string paramName = _functionType->returnParameterNames().at(n);
 					content.content =
 						(paramName.empty() ? "" : std::move(paramName) + " ") + (
-							string::npos == docParaNameEndPos || baseHasNoName ?
+							std::string::npos == docParaNameEndPos || baseHasNoName ?
 							content.content :
 							content.content.substr(docParaNameEndPos + 1)
 						);
@@ -95,7 +94,7 @@ void copyMissingTags(set<CallableDeclaration const*> const& _baseFunctions, Stru
 	}
 }
 
-CallableDeclaration const* findBaseCallable(set<CallableDeclaration const*> const& _baseFunctions, int64_t _contractId)
+CallableDeclaration const* findBaseCallable(std::set<CallableDeclaration const*> const& _baseFunctions, int64_t _contractId)
 {
 	for (CallableDeclaration const* baseFuncCandidate: _baseFunctions)
 		if (baseFuncCandidate->annotation().contract->id() == _contractId)
@@ -181,7 +180,7 @@ void DocStringAnalyser::handleCallable(
 }
 
 CallableDeclaration const* DocStringAnalyser::resolveInheritDoc(
-	set<CallableDeclaration const*> const& _baseFuncs,
+	std::set<CallableDeclaration const*> const& _baseFuncs,
 	StructurallyDocumented const& _node,
 	StructurallyDocumentedAnnotation& _annotation
 )
diff --git a/libsolidity/analysis/DocStringTagParser.cpp b/libsolidity/analysis/DocStringTagParser.cpp
index 1dc2711ef1..5d95f42e90 100644
--- a/libsolidity/analysis/DocStringTagParser.cpp
+++ b/libsolidity/analysis/DocStringTagParser.cpp
@@ -37,7 +37,6 @@
 #include <regex>
 #include <string_view>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -67,7 +66,7 @@ bool DocStringTagParser::validateDocStringsUsingTypes(SourceUnit const& _sourceU
 					if (tagName == "return")
 					{
 						returnTagsVisited++;
-						vector<string> returnParameterNames;
+						std::vector<std::string> returnParameterNames;
 
 						if (auto const* varDecl = dynamic_cast<VariableDeclaration const*>(&_node))
 						{
@@ -82,8 +81,8 @@ bool DocStringTagParser::validateDocStringsUsingTypes(SourceUnit const& _sourceU
 						else
 							continue;
 
-						string content = tagValue.content;
-						string firstWord = content.substr(0, content.find_first_of(" \t"));
+						std::string content = tagValue.content;
+						std::string firstWord = content.substr(0, content.find_first_of(" \t"));
 
 						if (returnTagsVisited > returnParameterNames.size())
 							m_errorReporter.docstringParsingError(
@@ -94,7 +93,7 @@ bool DocStringTagParser::validateDocStringsUsingTypes(SourceUnit const& _sourceU
 							);
 						else
 						{
-							string const& parameter = returnParameterNames.at(returnTagsVisited - 1);
+							std::string const& parameter = returnParameterNames.at(returnTagsVisited - 1);
 							if (!parameter.empty() && parameter != firstWord)
 								m_errorReporter.docstringParsingError(
 									5856_error,
@@ -113,7 +112,7 @@ bool DocStringTagParser::validateDocStringsUsingTypes(SourceUnit const& _sourceU
 
 bool DocStringTagParser::visit(ContractDefinition const& _contract)
 {
-	static set<string> const validTags = set<string>{"author", "title", "dev", "notice"};
+	static std::set<std::string> const validTags = std::set<std::string>{"author", "title", "dev", "notice"};
 	parseDocStrings(_contract, _contract.annotation(), validTags, "contracts");
 
 	return true;
@@ -193,12 +192,12 @@ bool DocStringTagParser::visit(InlineAssembly const& _assembly)
 	{
 		if (tagName == "solidity")
 		{
-			vector<string> values;
+			std::vector<std::string> values;
 			boost::split(values, tagValue.content, isWhiteSpace);
 
-			set<string> valuesSeen;
-			set<string> duplicates;
-			for (auto const& value: values | ranges::views::filter(not_fn(&string::empty)))
+			std::set<std::string> valuesSeen;
+			std::set<std::string> duplicates;
+			for (auto const& value: values | ranges::views::filter(not_fn(&std::string::empty)))
 				if (valuesSeen.insert(value).second)
 				{
 					if (value == "memory-safe-assembly")
@@ -244,7 +243,7 @@ void DocStringTagParser::checkParameters(
 	StructurallyDocumentedAnnotation& _annotation
 )
 {
-	set<string> validParams;
+	std::set<std::string> validParams;
 	for (auto const& p: _callable.parameters())
 		validParams.insert(p->name());
 	if (_callable.returnParameterList())
@@ -268,7 +267,7 @@ void DocStringTagParser::handleConstructor(
 	StructurallyDocumentedAnnotation& _annotation
 )
 {
-	static set<string> const validTags = set<string>{"author", "dev", "notice", "param"};
+	static std::set<std::string> const validTags = std::set<std::string>{"author", "dev", "notice", "param"};
 	parseDocStrings(_node, _annotation, validTags, "constructor");
 	checkParameters(_callable, _node, _annotation);
 }
@@ -279,10 +278,10 @@ void DocStringTagParser::handleCallable(
 	StructurallyDocumentedAnnotation& _annotation
 )
 {
-	static set<string> const validEventTags = set<string>{"dev", "notice", "return", "param"};
-	static set<string> const validErrorTags = set<string>{"dev", "notice", "param"};
-	static set<string> const validModifierTags = set<string>{"dev", "notice", "param", "inheritdoc"};
-	static set<string> const validTags = set<string>{"dev", "notice", "return", "param", "inheritdoc"};
+	static std::set<std::string> const validEventTags = std::set<std::string>{"dev", "notice", "return", "param"};
+	static std::set<std::string> const validErrorTags = std::set<std::string>{"dev", "notice", "param"};
+	static std::set<std::string> const validModifierTags = std::set<std::string>{"dev", "notice", "param", "inheritdoc"};
+	static std::set<std::string> const validTags = std::set<std::string>{"dev", "notice", "return", "param", "inheritdoc"};
 
 	if (dynamic_cast<EventDefinition const*>(&_callable))
 		parseDocStrings(_node, _annotation, validEventTags, "events");
@@ -299,8 +298,8 @@ void DocStringTagParser::handleCallable(
 void DocStringTagParser::parseDocStrings(
 	StructurallyDocumented const& _node,
 	StructurallyDocumentedAnnotation& _annotation,
-	set<string> const& _validTags,
-	string const& _nodeName
+	std::set<std::string> const& _validTags,
+	std::string const& _nodeName
 )
 {
 	if (!_node.documentation())
@@ -310,7 +309,7 @@ void DocStringTagParser::parseDocStrings(
 
 	for (auto const& [tagName, tagValue]: _annotation.docTags)
 	{
-		string_view static constexpr customPrefix("custom:");
+		std::string_view static constexpr customPrefix("custom:");
 		if (tagName == "custom" || tagName == "custom:")
 			m_errorReporter.docstringParsingError(
 				6564_error,
@@ -319,7 +318,7 @@ void DocStringTagParser::parseDocStrings(
 			);
 		else if (boost::starts_with(tagName, customPrefix) && tagName.size() > customPrefix.size())
 		{
-			regex static const customRegex("^custom:[a-z][a-z-]*$");
+			std::regex static const customRegex("^custom:[a-z][a-z-]*$");
 			if (!regex_match(tagName, customRegex))
 				m_errorReporter.docstringParsingError(
 					2968_error,
diff --git a/libsolidity/analysis/FunctionCallGraph.cpp b/libsolidity/analysis/FunctionCallGraph.cpp
index ce5c539346..1d01f1a6bc 100644
--- a/libsolidity/analysis/FunctionCallGraph.cpp
+++ b/libsolidity/analysis/FunctionCallGraph.cpp
@@ -24,7 +24,6 @@
 #include <range/v3/view/reverse.hpp>
 #include <range/v3/view/transform.hpp>
 
-using namespace std;
 using namespace solidity::frontend;
 using namespace solidity::util;
 
@@ -72,7 +71,7 @@ CallGraph FunctionCallGraphBuilder::buildDeployedGraph(
 	FunctionCallGraphBuilder builder(_contract);
 	solAssert(builder.m_currentNode == CallGraph::Node(CallGraph::SpecialNode::Entry), "");
 
-	auto getSecondElement = [](auto const& _tuple){ return get<1>(_tuple); };
+	auto getSecondElement = [](auto const& _tuple){ return std::get<1>(_tuple); };
 
 	// Create graph for all publicly reachable functions
 	for (FunctionTypePointer functionType: _contract.interfaceFunctionList() | ranges::views::transform(getSecondElement))
@@ -96,14 +95,14 @@ CallGraph FunctionCallGraphBuilder::buildDeployedGraph(
 	// All functions present in internal dispatch at creation time could potentially be pointers
 	// assigned to state variables and as such may be reachable after deployment as well.
 	builder.m_currentNode = CallGraph::SpecialNode::InternalDispatch;
-	set<CallGraph::Node, CallGraph::CompareByID> defaultNode;
+	std::set<CallGraph::Node, CallGraph::CompareByID> defaultNode;
 	for (CallGraph::Node const& dispatchTarget: util::valueOrDefault(_creationGraph.edges, CallGraph::SpecialNode::InternalDispatch, defaultNode))
 	{
-		solAssert(!holds_alternative<CallGraph::SpecialNode>(dispatchTarget), "");
-		solAssert(get<CallableDeclaration const*>(dispatchTarget) != nullptr, "");
+		solAssert(!std::holds_alternative<CallGraph::SpecialNode>(dispatchTarget), "");
+		solAssert(std::get<CallableDeclaration const*>(dispatchTarget) != nullptr, "");
 
 		// Visit the callable to add not only it but also everything it calls too
-		builder.functionReferenced(*get<CallableDeclaration const*>(dispatchTarget), false);
+		builder.functionReferenced(*std::get<CallableDeclaration const*>(dispatchTarget), false);
 	}
 
 	builder.m_currentNode = CallGraph::SpecialNode::Entry;
@@ -262,10 +261,10 @@ void FunctionCallGraphBuilder::processQueue()
 	while (!m_visitQueue.empty())
 	{
 		m_currentNode = m_visitQueue.front();
-		solAssert(holds_alternative<CallableDeclaration const*>(m_currentNode), "");
+		solAssert(std::holds_alternative<CallableDeclaration const*>(m_currentNode), "");
 
 		m_visitQueue.pop_front();
-		get<CallableDeclaration const*>(m_currentNode)->accept(*this);
+		std::get<CallableDeclaration const*>(m_currentNode)->accept(*this);
 	}
 
 	m_currentNode = CallGraph::SpecialNode::Entry;
@@ -281,7 +280,7 @@ void FunctionCallGraphBuilder::functionReferenced(CallableDeclaration const& _ca
 	if (_calledDirectly)
 	{
 		solAssert(
-			holds_alternative<CallGraph::SpecialNode>(m_currentNode) || m_graph.edges.count(m_currentNode) > 0,
+			std::holds_alternative<CallGraph::SpecialNode>(m_currentNode) || m_graph.edges.count(m_currentNode) > 0,
 			"Adding an edge from a node that has not been visited yet."
 		);
 
@@ -293,10 +292,10 @@ void FunctionCallGraphBuilder::functionReferenced(CallableDeclaration const& _ca
 	enqueueCallable(_callable);
 }
 
-ostream& solidity::frontend::operator<<(ostream& _out, CallGraph::Node const& _node)
+std::ostream& solidity::frontend::operator<<(std::ostream& _out, CallGraph::Node const& _node)
 {
-	if (holds_alternative<CallGraph::SpecialNode>(_node))
-		switch (get<CallGraph::SpecialNode>(_node))
+	if (std::holds_alternative<CallGraph::SpecialNode>(_node))
+		switch (std::get<CallGraph::SpecialNode>(_node))
 		{
 		case CallGraph::SpecialNode::InternalDispatch:
 			_out << "InternalDispatch";
@@ -309,19 +308,19 @@ ostream& solidity::frontend::operator<<(ostream& _out, CallGraph::Node const& _n
 		}
 	else
 	{
-		solAssert(holds_alternative<CallableDeclaration const*>(_node), "");
+		solAssert(std::holds_alternative<CallableDeclaration const*>(_node), "");
 
-		auto const* callableDeclaration = get<CallableDeclaration const*>(_node);
+		auto const* callableDeclaration = std::get<CallableDeclaration const*>(_node);
 		solAssert(callableDeclaration, "");
 
 		auto const* function = dynamic_cast<FunctionDefinition const *>(callableDeclaration);
 		auto const* event = dynamic_cast<EventDefinition const *>(callableDeclaration);
 		auto const* modifier = dynamic_cast<ModifierDefinition const *>(callableDeclaration);
 
-		auto typeToString = [](auto const& _var) -> string { return _var->type()->toString(true); };
-		vector<string> parameters = callableDeclaration->parameters() | ranges::views::transform(typeToString) | ranges::to<vector<string>>();
+		auto typeToString = [](auto const& _var) -> std::string { return _var->type()->toString(true); };
+		std::vector<std::string> parameters = callableDeclaration->parameters() | ranges::views::transform(typeToString) | ranges::to<std::vector<std::string>>();
 
-		string scopeName;
+		std::string scopeName;
 		if (!function || !function->isFree())
 		{
 			solAssert(callableDeclaration->annotation().scope, "");
diff --git a/libsolidity/analysis/GlobalContext.cpp b/libsolidity/analysis/GlobalContext.cpp
index 58ebea7b1a..8f0ce96349 100644
--- a/libsolidity/analysis/GlobalContext.cpp
+++ b/libsolidity/analysis/GlobalContext.cpp
@@ -29,8 +29,6 @@
 #include <libsolidity/ast/Types.h>
 #include <memory>
 
-using namespace std;
-
 namespace solidity::frontend
 {
 
@@ -65,10 +63,10 @@ int magicVariableToID(std::string const& _name)
 		solAssert(false, "Unknown magic variable: \"" + _name + "\".");
 }
 
-inline vector<shared_ptr<MagicVariableDeclaration const>> constructMagicVariables()
+inline std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMagicVariables()
 {
-	static auto const magicVarDecl = [](string const& _name, Type const* _type) {
-		return make_shared<MagicVariableDeclaration>(magicVariableToID(_name), _name, _type);
+	static auto const magicVarDecl = [](std::string const& _name, Type const* _type) {
+		return std::make_shared<MagicVariableDeclaration>(magicVariableToID(_name), _name, _type);
 	};
 
 	return {
@@ -116,9 +114,9 @@ void GlobalContext::setCurrentContract(ContractDefinition const& _contract)
 	m_currentContract = &_contract;
 }
 
-vector<Declaration const*> GlobalContext::declarations() const
+std::vector<Declaration const*> GlobalContext::declarations() const
 {
-	vector<Declaration const*> declarations;
+	std::vector<Declaration const*> declarations;
 	declarations.reserve(m_magicVariables.size());
 	for (ASTPointer<MagicVariableDeclaration const> const& variable: m_magicVariables)
 		declarations.push_back(variable.get());
@@ -133,7 +131,7 @@ MagicVariableDeclaration const* GlobalContext::currentThis() const
 		if (m_currentContract)
 			type = TypeProvider::contract(*m_currentContract);
 		m_thisPointer[m_currentContract] =
-			make_shared<MagicVariableDeclaration>(magicVariableToID("this"), "this", type);
+			std::make_shared<MagicVariableDeclaration>(magicVariableToID("this"), "this", type);
 	}
 	return m_thisPointer[m_currentContract].get();
 }
@@ -146,7 +144,7 @@ MagicVariableDeclaration const* GlobalContext::currentSuper() const
 		if (m_currentContract)
 			type = TypeProvider::typeType(TypeProvider::contract(*m_currentContract, true));
 		m_superPointer[m_currentContract] =
-			make_shared<MagicVariableDeclaration>(magicVariableToID("super"), "super", type);
+			std::make_shared<MagicVariableDeclaration>(magicVariableToID("super"), "super", type);
 	}
 	return m_superPointer[m_currentContract].get();
 }
diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index 641f022804..d6ff63dbf3 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -30,7 +30,6 @@
 #include <boost/algorithm/string.hpp>
 #include <unordered_set>
 
-using namespace std;
 using namespace solidity::langutil;
 
 namespace solidity::frontend
@@ -45,7 +44,7 @@ NameAndTypeResolver::NameAndTypeResolver(
 	m_errorReporter(_errorReporter),
 	m_globalContext(_globalContext)
 {
-	m_scopes[nullptr] = make_shared<DeclarationContainer>();
+	m_scopes[nullptr] = std::make_shared<DeclarationContainer>();
 	for (Declaration const* declaration: _globalContext.declarations())
 	{
 		solAssert(m_scopes[nullptr]->registerDeclaration(*declaration, false, false), "Unable to register global declaration.");
@@ -68,14 +67,14 @@ bool NameAndTypeResolver::registerDeclarations(SourceUnit& _sourceUnit, ASTNode
 	return true;
 }
 
-bool NameAndTypeResolver::performImports(SourceUnit& _sourceUnit, map<string, SourceUnit const*> const& _sourceUnits)
+bool NameAndTypeResolver::performImports(SourceUnit& _sourceUnit, std::map<std::string, SourceUnit const*> const& _sourceUnits)
 {
 	DeclarationContainer& target = *m_scopes.at(&_sourceUnit);
 	bool error = false;
 	for (auto const& node: _sourceUnit.nodes())
 		if (auto imp = dynamic_cast<ImportDirective const*>(node.get()))
 		{
-			string const& path = *imp->annotation().absolutePath;
+			std::string const& path = *imp->annotation().absolutePath;
 			// The import resolution in CompilerStack enforces this.
 			solAssert(_sourceUnits.count(path), "");
 			auto scope = m_scopes.find(_sourceUnits.at(path));
@@ -127,7 +126,7 @@ bool NameAndTypeResolver::resolveNamesAndTypes(SourceUnit& _source)
 {
 	try
 	{
-		for (shared_ptr<ASTNode> const& node: _source.nodes())
+		for (std::shared_ptr<ASTNode> const& node: _source.nodes())
 		{
 			setScope(&_source);
 			if (!resolveNamesAndTypesInternal(*node, true))
@@ -159,7 +158,7 @@ bool NameAndTypeResolver::updateDeclaration(Declaration const& _declaration)
 	return true;
 }
 
-void NameAndTypeResolver::activateVariable(string const& _name)
+void NameAndTypeResolver::activateVariable(std::string const& _name)
 {
 	solAssert(m_currentScope, "");
 	// Scoped local variables are invisible before activation.
@@ -171,15 +170,15 @@ void NameAndTypeResolver::activateVariable(string const& _name)
 		m_currentScope->activateVariable(_name);
 }
 
-vector<Declaration const*> NameAndTypeResolver::resolveName(ASTString const& _name, ASTNode const* _scope) const
+std::vector<Declaration const*> NameAndTypeResolver::resolveName(ASTString const& _name, ASTNode const* _scope) const
 {
 	auto iterator = m_scopes.find(_scope);
 	if (iterator == end(m_scopes))
-		return vector<Declaration const*>({});
+		return std::vector<Declaration const*>({});
 	return iterator->second->resolveName(_name);
 }
 
-vector<Declaration const*> NameAndTypeResolver::nameFromCurrentScope(ASTString const& _name, bool _includeInvisibles) const
+std::vector<Declaration const*> NameAndTypeResolver::nameFromCurrentScope(ASTString const& _name, bool _includeInvisibles) const
 {
 	ResolvingSettings settings;
 	settings.recursive = true;
@@ -187,7 +186,7 @@ vector<Declaration const*> NameAndTypeResolver::nameFromCurrentScope(ASTString c
 	return m_currentScope->resolveName(_name, std::move(settings));
 }
 
-Declaration const* NameAndTypeResolver::pathFromCurrentScope(vector<ASTString> const& _path) const
+Declaration const* NameAndTypeResolver::pathFromCurrentScope(std::vector<ASTString> const& _path) const
 {
 	if (auto declarations = pathFromCurrentScopeWithAllDeclarations(_path); !declarations.empty())
 		return declarations.back();
@@ -201,13 +200,13 @@ std::vector<Declaration const*> NameAndTypeResolver::pathFromCurrentScopeWithAll
 ) const
 {
 	solAssert(!_path.empty(), "");
-	vector<Declaration const*> pathDeclarations;
+	std::vector<Declaration const*> pathDeclarations;
 
 	ResolvingSettings settings;
 	settings.recursive = true;
 	settings.alsoInvisible = _includeInvisibles;
 	settings.onlyVisibleAsUnqualifiedNames = true;
-	vector<Declaration const*> candidates = m_currentScope->resolveName(_path.front(), settings);
+	std::vector<Declaration const*> candidates = m_currentScope->resolveName(_path.front(), settings);
 
 	// inside the loop, use default settings, except for alsoInvisible
 	settings.recursive = false;
@@ -305,7 +304,7 @@ bool NameAndTypeResolver::resolveNamesAndTypesInternal(ASTNode& _node, bool _res
 		if (success)
 		{
 			linearizeBaseContracts(*contract);
-			vector<ContractDefinition const*> properBases(
+			std::vector<ContractDefinition const*> properBases(
 				++contract->annotation().linearizedBaseContracts.begin(),
 				contract->annotation().linearizedBaseContracts.end()
 			);
@@ -405,7 +404,7 @@ void NameAndTypeResolver::linearizeBaseContracts(ContractDefinition& _contract)
 {
 	// order in the lists is from derived to base
 	// list of lists to linearize, the last element is the list of direct bases
-	list<list<ContractDefinition const*>> input(1, list<ContractDefinition const*>{});
+	std::list<std::list<ContractDefinition const*>> input(1, std::list<ContractDefinition const*>{});
 	for (ASTPointer<InheritanceSpecifier> const& baseSpecifier: _contract.baseContracts())
 	{
 		IdentifierPath const& baseName = baseSpecifier->name();
@@ -415,25 +414,25 @@ void NameAndTypeResolver::linearizeBaseContracts(ContractDefinition& _contract)
 		// "push_front" has the effect that bases mentioned later can overwrite members of bases
 		// mentioned earlier
 		input.back().push_front(base);
-		vector<ContractDefinition const*> const& basesBases = base->annotation().linearizedBaseContracts;
+		std::vector<ContractDefinition const*> const& basesBases = base->annotation().linearizedBaseContracts;
 		if (basesBases.empty())
 			m_errorReporter.fatalTypeError(2449_error, baseName.location(), "Definition of base has to precede definition of derived contract");
-		input.push_front(list<ContractDefinition const*>(basesBases.begin(), basesBases.end()));
+		input.push_front(std::list<ContractDefinition const*>(basesBases.begin(), basesBases.end()));
 	}
 	input.back().push_front(&_contract);
-	vector<ContractDefinition const*> result = cThreeMerge(input);
+	std::vector<ContractDefinition const*> result = cThreeMerge(input);
 	if (result.empty())
 		m_errorReporter.fatalTypeError(5005_error, _contract.location(), "Linearization of inheritance graph impossible");
 	_contract.annotation().linearizedBaseContracts = result;
 }
 
 template <class T>
-vector<T const*> NameAndTypeResolver::cThreeMerge(list<list<T const*>>& _toMerge)
+std::vector<T const*> NameAndTypeResolver::cThreeMerge(std::list<std::list<T const*>>& _toMerge)
 {
 	// returns true iff _candidate appears only as last element of the lists
 	auto appearsOnlyAtHead = [&](T const* _candidate) -> bool
 	{
-		for (list<T const*> const& bases: _toMerge)
+		for (std::list<T const*> const& bases: _toMerge)
 		{
 			solAssert(!bases.empty(), "");
 			if (find(++bases.begin(), bases.end(), _candidate) != bases.end())
@@ -444,7 +443,7 @@ vector<T const*> NameAndTypeResolver::cThreeMerge(list<list<T const*>>& _toMerge
 	// returns the next candidate to append to the linearized list or nullptr on failure
 	auto nextCandidate = [&]() -> T const*
 	{
-		for (list<T const*> const& bases: _toMerge)
+		for (std::list<T const*> const& bases: _toMerge)
 		{
 			solAssert(!bases.empty(), "");
 			if (appearsOnlyAtHead(bases.front()))
@@ -465,26 +464,26 @@ vector<T const*> NameAndTypeResolver::cThreeMerge(list<list<T const*>>& _toMerge
 		}
 	};
 
-	_toMerge.remove_if([](list<T const*> const& _bases) { return _bases.empty(); });
-	vector<T const*> result;
+	_toMerge.remove_if([](std::list<T const*> const& _bases) { return _bases.empty(); });
+	std::vector<T const*> result;
 	while (!_toMerge.empty())
 	{
 		T const* candidate = nextCandidate();
 		if (!candidate)
-			return vector<T const*>();
+			return std::vector<T const*>();
 		result.push_back(candidate);
 		removeCandidate(candidate);
 	}
 	return result;
 }
 
-string NameAndTypeResolver::similarNameSuggestions(ASTString const& _name) const
+	std::string NameAndTypeResolver::similarNameSuggestions(ASTString const& _name) const
 {
 	return util::quotedAlternativesList(m_currentScope->similarNames(_name));
 }
 
 DeclarationRegistrationHelper::DeclarationRegistrationHelper(
-	map<ASTNode const*, shared_ptr<DeclarationContainer>>& _scopes,
+	std::map<ASTNode const*, std::shared_ptr<DeclarationContainer>>& _scopes,
 	ASTNode& _astRoot,
 	ErrorReporter& _errorReporter,
 	GlobalContext& _globalContext,
@@ -502,7 +501,7 @@ DeclarationRegistrationHelper::DeclarationRegistrationHelper(
 bool DeclarationRegistrationHelper::registerDeclaration(
 	DeclarationContainer& _container,
 	Declaration const& _declaration,
-	string const* _name,
+	std::string const* _name,
 	SourceLocation const* _errorLocation,
 	bool _inactive,
 	ErrorReporter& _errorReporter
@@ -511,13 +510,13 @@ bool DeclarationRegistrationHelper::registerDeclaration(
 	if (!_errorLocation)
 		_errorLocation = &_declaration.location();
 
-	string name = _name ? *_name : _declaration.name();
+	std::string name = _name ? *_name : _declaration.name();
 
 	// We use "invisible" for both inactive variables in blocks and for members invisible in contracts.
 	// They cannot both be true at the same time.
 	solAssert(!(_inactive && !_declaration.isVisibleInContract()), "");
 
-	static set<string> illegalNames{"_", "super", "this"};
+	static std::set<std::string> illegalNames{"_", "super", "this"};
 
 	if (illegalNames.count(name))
 	{
@@ -580,7 +579,7 @@ bool DeclarationRegistrationHelper::visit(SourceUnit& _sourceUnit)
 {
 	if (!m_scopes[&_sourceUnit])
 		// By importing, it is possible that the container already exists.
-		m_scopes[&_sourceUnit] = make_shared<DeclarationContainer>(m_currentScope, m_scopes[m_currentScope].get());
+		m_scopes[&_sourceUnit] = std::make_shared<DeclarationContainer>(m_currentScope, m_scopes[m_currentScope].get());
 	return ASTVisitor::visit(_sourceUnit);
 }
 
@@ -594,7 +593,7 @@ bool DeclarationRegistrationHelper::visit(ImportDirective& _import)
 	SourceUnit const* importee = _import.annotation().sourceUnit;
 	solAssert(!!importee, "");
 	if (!m_scopes[importee])
-		m_scopes[importee] = make_shared<DeclarationContainer>(nullptr, m_scopes[nullptr].get());
+		m_scopes[importee] = std::make_shared<DeclarationContainer>(nullptr, m_scopes[nullptr].get());
 	m_scopes[&_import] = m_scopes[importee];
 	ASTVisitor::visit(_import);
 	return false; // Do not recurse into child nodes (Identifier for symbolAliases)
@@ -641,7 +640,7 @@ bool DeclarationRegistrationHelper::visitNode(ASTNode& _node)
 
 	if (auto* annotation = dynamic_cast<TypeDeclarationAnnotation*>(&_node.annotation()))
 	{
-		string canonicalName = dynamic_cast<Declaration const&>(_node).name();
+		std::string canonicalName = dynamic_cast<Declaration const&>(_node).name();
 		solAssert(!canonicalName.empty(), "");
 
 		for (
@@ -684,7 +683,7 @@ void DeclarationRegistrationHelper::enterNewSubScope(ASTNode& _subScope)
 	{
 		bool newlyAdded = m_scopes.emplace(
 			&_subScope,
-			make_shared<DeclarationContainer>(m_currentScope, m_scopes[m_currentScope].get())
+			std::make_shared<DeclarationContainer>(m_currentScope, m_scopes[m_currentScope].get())
 		).second;
 		solAssert(newlyAdded, "Unable to add new scope.");
 	}
diff --git a/libsolidity/analysis/OverrideChecker.cpp b/libsolidity/analysis/OverrideChecker.cpp
index d342ab1003..f2a99340de 100644
--- a/libsolidity/analysis/OverrideChecker.cpp
+++ b/libsolidity/analysis/OverrideChecker.cpp
@@ -31,7 +31,6 @@
 #include <boost/algorithm/string/predicate.hpp>
 
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 using namespace solidity::langutil;
@@ -46,7 +45,7 @@ namespace
 // Helper struct to do a search by name
 struct MatchByName
 {
-	string const& m_name;
+	std::string const& m_name;
 	bool operator()(OverrideProxy const& _item)
 	{
 		return _item.name() == m_name;
@@ -61,7 +60,7 @@ struct MatchByName
  */
 struct OverrideGraph
 {
-	OverrideGraph(set<OverrideProxy> const& _baseCallables)
+	OverrideGraph(std::set<OverrideProxy> const& _baseCallables)
 	{
 		for (auto const& baseFunction: _baseCallables)
 			addEdge(0, visit(baseFunction));
@@ -131,17 +130,17 @@ struct CutVertexFinder
 				run(vInd, _depth + 1);
 				if (m_low[vInd] >= m_depths[_u] && m_parent[_u] != -1)
 					m_cutVertices.insert(m_graph.nodeInv.at(static_cast<int>(_u)));
-				m_low[_u] = min(m_low[_u], m_low[vInd]);
+				m_low[_u] = std::min(m_low[_u], m_low[vInd]);
 			}
 			else if (v != m_parent[_u])
-				m_low[_u] = min(m_low[_u], m_depths[vInd]);
+				m_low[_u] = std::min(m_low[_u], m_depths[vInd]);
 		}
 	}
 };
 
-vector<ContractDefinition const*> resolveDirectBaseContracts(ContractDefinition const& _contract)
+std::vector<ContractDefinition const*> resolveDirectBaseContracts(ContractDefinition const& _contract)
 {
-	vector<ContractDefinition const*> resolvedContracts;
+	std::vector<ContractDefinition const*> resolvedContracts;
 
 	for (ASTPointer<InheritanceSpecifier> const& specifier: _contract.baseContracts())
 	{
@@ -155,7 +154,7 @@ vector<ContractDefinition const*> resolveDirectBaseContracts(ContractDefinition
 	return resolvedContracts;
 }
 
-vector<ASTPointer<IdentifierPath>> sortByContract(vector<ASTPointer<IdentifierPath>> const& _list)
+std::vector<ASTPointer<IdentifierPath>> sortByContract(std::vector<ASTPointer<IdentifierPath>> const& _list)
 {
 	auto sorted = _list;
 
@@ -197,17 +196,17 @@ bool OverrideProxy::operator<(OverrideProxy const& _other) const
 
 bool OverrideProxy::isVariable() const
 {
-	return holds_alternative<VariableDeclaration const*>(m_item);
+	return std::holds_alternative<VariableDeclaration const*>(m_item);
 }
 
 bool OverrideProxy::isFunction() const
 {
-	return holds_alternative<FunctionDefinition const*>(m_item);
+	return std::holds_alternative<FunctionDefinition const*>(m_item);
 }
 
 bool OverrideProxy::isModifier() const
 {
-	return holds_alternative<ModifierDefinition const*>(m_item);
+	return std::holds_alternative<ModifierDefinition const*>(m_item);
 }
 
 bool OverrideProxy::CompareBySignature::operator()(OverrideProxy const& _a, OverrideProxy const& _b) const
@@ -222,18 +221,18 @@ size_t OverrideProxy::id() const
 	}, m_item);
 }
 
-shared_ptr<OverrideSpecifier> OverrideProxy::overrides() const
+std::shared_ptr<OverrideSpecifier> OverrideProxy::overrides() const
 {
 	return std::visit(GenericVisitor{
 		[&](auto const* _item) { return _item->overrides(); }
 	}, m_item);
 }
 
-set<OverrideProxy> OverrideProxy::baseFunctions() const
+std::set<OverrideProxy> OverrideProxy::baseFunctions() const
 {
 	return std::visit(GenericVisitor{
-		[&](auto const* _item) -> set<OverrideProxy> {
-			set<OverrideProxy> ret;
+		[&](auto const* _item) -> std::set<OverrideProxy> {
+			std::set<OverrideProxy> ret;
 			for (auto const* f: _item->annotation().baseFunctions)
 				ret.insert(makeOverrideProxy(*f));
 			return ret;
@@ -256,10 +255,10 @@ void OverrideProxy::storeBaseFunction(OverrideProxy const& _base) const
 	}, m_item);
 }
 
-string const& OverrideProxy::name() const
+std::string const& OverrideProxy::name() const
 {
 	return std::visit(GenericVisitor{
-		[&](auto const* _item) -> string const& { return _item->name(); }
+		[&](auto const* _item) -> std::string const& { return _item->name(); }
 	}, m_item);
 }
 
@@ -272,7 +271,7 @@ ContractDefinition const& OverrideProxy::contract() const
 	}, m_item);
 }
 
-string const& OverrideProxy::contractName() const
+std::string const& OverrideProxy::contractName() const
 {
 	return contract().name();
 }
@@ -357,7 +356,7 @@ SourceLocation const& OverrideProxy::location() const
 	}, m_item);
 }
 
-string OverrideProxy::astNodeName() const
+std::string OverrideProxy::astNodeName() const
 {
 	return std::visit(GenericVisitor{
 		[&](FunctionDefinition const*) { return "function"; },
@@ -366,7 +365,7 @@ string OverrideProxy::astNodeName() const
 	}, m_item);
 }
 
-string OverrideProxy::astNodeNameCapitalized() const
+std::string OverrideProxy::astNodeNameCapitalized() const
 {
 	return std::visit(GenericVisitor{
 		[&](FunctionDefinition const*) { return "Function"; },
@@ -375,7 +374,7 @@ string OverrideProxy::astNodeNameCapitalized() const
 	}, m_item);
 }
 
-string OverrideProxy::distinguishingProperty() const
+std::string OverrideProxy::distinguishingProperty() const
 {
 	return std::visit(GenericVisitor{
 		[&](FunctionDefinition const*) { return "name and parameter types"; },
@@ -418,10 +417,10 @@ OverrideProxy::OverrideComparator const& OverrideProxy::overrideComparator() con
 {
 	if (!m_comparator)
 	{
-		m_comparator = make_shared<OverrideComparator>(std::visit(GenericVisitor{
+		m_comparator = std::make_shared<OverrideComparator>(std::visit(GenericVisitor{
 			[&](FunctionDefinition const* _function)
 			{
-				vector<string> paramTypes;
+				std::vector<std::string> paramTypes;
 				for (Type const* t: externalFunctionType()->parameterTypes())
 					paramTypes.emplace_back(t->richIdentifier());
 				return OverrideComparator{
@@ -432,7 +431,7 @@ OverrideProxy::OverrideComparator const& OverrideProxy::overrideComparator() con
 			},
 			[&](VariableDeclaration const* _var)
 			{
-				vector<string> paramTypes;
+				std::vector<std::string> paramTypes;
 				for (Type const* t: externalFunctionType()->parameterTypes())
 					paramTypes.emplace_back(t->richIdentifier());
 				return OverrideComparator{
@@ -674,21 +673,21 @@ void OverrideChecker::checkOverride(OverrideProxy const& _overriding, OverridePr
 
 void OverrideChecker::overrideListError(
 	OverrideProxy const& _item,
-	set<ContractDefinition const*, CompareByID> _secondary,
+	std::set<ContractDefinition const*, CompareByID> _secondary,
 	ErrorId _error,
-	string const& _message1,
-	string const& _message2
+	std::string const& _message1,
+	std::string const& _message2
 )
 {
 	// Using a set rather than a vector so the order is always the same
-	set<string> names;
+	std::set<std::string> names;
 	SecondarySourceLocation ssl;
 	for (Declaration const* c: _secondary)
 	{
 		ssl.append("This contract: ", c->location());
 		names.insert("\"" + c->name() + "\"");
 	}
-	string contractSingularPlural = "contract ";
+	std::string contractSingularPlural = "contract ";
 	if (_secondary.size() > 1)
 		contractSingularPlural = "contracts ";
 
@@ -708,8 +707,8 @@ void OverrideChecker::overrideError(
 	OverrideProxy const& _overriding,
 	OverrideProxy const& _super,
 	ErrorId _error,
-	string const& _message,
-	optional<string> const& _secondaryMsg
+	std::string const& _message,
+	std::optional<std::string> const& _secondaryMsg
 )
 {
 	m_errorReporter.typeError(
@@ -766,7 +765,7 @@ void OverrideChecker::checkAmbiguousOverrides(ContractDefinition const& _contrac
 	}
 }
 
-void OverrideChecker::checkAmbiguousOverridesInternal(set<OverrideProxy> _baseCallables, SourceLocation const& _location) const
+void OverrideChecker::checkAmbiguousOverridesInternal(std::set<OverrideProxy> _baseCallables, SourceLocation const& _location) const
 {
 	if (_baseCallables.size() <= 1)
 		return;
@@ -799,17 +798,17 @@ void OverrideChecker::checkAmbiguousOverridesInternal(set<OverrideProxy> _baseCa
 	for (OverrideProxy const& baseFunction: _baseCallables)
 		ssl.append("Definition in \"" + baseFunction.contractName() + "\": ", baseFunction.location());
 
-	string callableName = _baseCallables.begin()->astNodeName();
+	std::string callableName = _baseCallables.begin()->astNodeName();
 	if (_baseCallables.begin()->isVariable())
 		callableName = "function";
-	string distinguishigProperty = _baseCallables.begin()->distinguishingProperty();
+	std::string distinguishigProperty = _baseCallables.begin()->distinguishingProperty();
 
 	bool foundVariable = false;
 	for (auto const& base: _baseCallables)
 		if (base.isVariable())
 			foundVariable = true;
 
-	string message =
+	std::string message =
 		"Derived contract must override " + callableName + " \"" +
 		_baseCallables.begin()->name() +
 		"\". Two or more base classes define " + callableName + " with same " + distinguishigProperty + ".";
@@ -822,9 +821,9 @@ void OverrideChecker::checkAmbiguousOverridesInternal(set<OverrideProxy> _baseCa
 	m_errorReporter.typeError(6480_error, _location, ssl, message);
 }
 
-set<ContractDefinition const*, OverrideChecker::CompareByID> OverrideChecker::resolveOverrideList(OverrideSpecifier const& _overrides) const
+std::set<ContractDefinition const*, OverrideChecker::CompareByID> OverrideChecker::resolveOverrideList(OverrideSpecifier const& _overrides) const
 {
-	set<ContractDefinition const*, CompareByID> resolved;
+	std::set<ContractDefinition const*, CompareByID> resolved;
 
 	for (ASTPointer<IdentifierPath> const& override: _overrides.overrides())
 	{
@@ -842,7 +841,7 @@ set<ContractDefinition const*, OverrideChecker::CompareByID> OverrideChecker::re
 
 void OverrideChecker::checkOverrideList(OverrideProxy _item, OverrideProxyBySignatureMultiSet const& _inherited)
 {
-	set<ContractDefinition const*, CompareByID> specifiedContracts =
+	std::set<ContractDefinition const*, CompareByID> specifiedContracts =
 		_item.overrides() ?
 		resolveOverrideList(*_item.overrides()) :
 		decltype(specifiedContracts){};
@@ -851,7 +850,7 @@ void OverrideChecker::checkOverrideList(OverrideProxy _item, OverrideProxyBySign
 	if (_item.overrides() && specifiedContracts.size() != _item.overrides()->overrides().size())
 	{
 		// Sort by contract id to find duplicate for error reporting
-		vector<ASTPointer<IdentifierPath>> list =
+		std::vector<ASTPointer<IdentifierPath>> list =
 			sortByContract(_item.overrides()->overrides());
 
 		// Find duplicates and output error
@@ -880,7 +879,7 @@ void OverrideChecker::checkOverrideList(OverrideProxy _item, OverrideProxyBySign
 		}
 	}
 
-	set<ContractDefinition const*, CompareByID> expectedContracts;
+	std::set<ContractDefinition const*, CompareByID> expectedContracts;
 
 	// Build list of expected contracts
 	for (auto [begin, end] = _inherited.equal_range(_item); begin != end; begin++)
@@ -898,7 +897,7 @@ void OverrideChecker::checkOverrideList(OverrideProxy _item, OverrideProxyBySign
 			_item.astNodeNameCapitalized() + " has override specified but does not override anything."
 		);
 
-	set<ContractDefinition const*, CompareByID> missingContracts;
+	std::set<ContractDefinition const*, CompareByID> missingContracts;
 	// If we expect only one contract, no contract needs to be specified
 	if (expectedContracts.size() > 1)
 		missingContracts = expectedContracts - specifiedContracts;
@@ -931,7 +930,7 @@ OverrideChecker::OverrideProxyBySignatureMultiSet const& OverrideChecker::inheri
 
 		for (auto const* base: resolveDirectBaseContracts(_contract))
 		{
-			set<OverrideProxy, OverrideProxy::CompareBySignature> functionsInBase;
+			std::set<OverrideProxy, OverrideProxy::CompareBySignature> functionsInBase;
 			for (FunctionDefinition const* fun: base->definedFunctions())
 				if (!fun->isConstructor())
 					functionsInBase.emplace(OverrideProxy{fun});
@@ -960,7 +959,7 @@ OverrideChecker::OverrideProxyBySignatureMultiSet const& OverrideChecker::inheri
 
 		for (auto const* base: resolveDirectBaseContracts(_contract))
 		{
-			set<OverrideProxy, OverrideProxy::CompareBySignature> modifiersInBase;
+			std::set<OverrideProxy, OverrideProxy::CompareBySignature> modifiersInBase;
 			for (ModifierDefinition const* mod: base->functionModifiers())
 				modifiersInBase.emplace(OverrideProxy{mod});
 
diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp
index c8b3b5f162..bc9df3dc4c 100644
--- a/libsolidity/analysis/PostTypeChecker.cpp
+++ b/libsolidity/analysis/PostTypeChecker.cpp
@@ -27,7 +27,6 @@
 
 #include <memory>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -204,7 +203,7 @@ struct ConstStateVarCircularReferenceChecker: public PostTypeChecker::Checker
 			// Iterating through the dependencies needs to be deterministic and thus cannot
 			// depend on the memory layout.
 			// Because of that, we sort by AST node id.
-			vector<VariableDeclaration const*> dependencies(
+			std::vector<VariableDeclaration const*> dependencies(
 				m_constVariableDependencies[&_variable].begin(),
 				m_constVariableDependencies[&_variable].end()
 			);
@@ -427,10 +426,10 @@ struct ReservedErrorSelector: public PostTypeChecker::Checker
 
 PostTypeChecker::PostTypeChecker(langutil::ErrorReporter& _errorReporter): m_errorReporter(_errorReporter)
 {
-	m_checkers.push_back(make_shared<ConstStateVarCircularReferenceChecker>(_errorReporter));
-	m_checkers.push_back(make_shared<OverrideSpecifierChecker>(_errorReporter));
-	m_checkers.push_back(make_shared<ModifierContextChecker>(_errorReporter));
-	m_checkers.push_back(make_shared<EventOutsideEmitErrorOutsideRevertChecker>(_errorReporter));
-	m_checkers.push_back(make_shared<NoVariablesInInterfaceChecker>(_errorReporter));
-	m_checkers.push_back(make_shared<ReservedErrorSelector>(_errorReporter));
+	m_checkers.push_back(std::make_shared<ConstStateVarCircularReferenceChecker>(_errorReporter));
+	m_checkers.push_back(std::make_shared<OverrideSpecifierChecker>(_errorReporter));
+	m_checkers.push_back(std::make_shared<ModifierContextChecker>(_errorReporter));
+	m_checkers.push_back(std::make_shared<EventOutsideEmitErrorOutsideRevertChecker>(_errorReporter));
+	m_checkers.push_back(std::make_shared<NoVariablesInInterfaceChecker>(_errorReporter));
+	m_checkers.push_back(std::make_shared<ReservedErrorSelector>(_errorReporter));
 }
diff --git a/libsolidity/analysis/PostTypeContractLevelChecker.cpp b/libsolidity/analysis/PostTypeContractLevelChecker.cpp
index 67d0623aa0..6d8dc416aa 100644
--- a/libsolidity/analysis/PostTypeContractLevelChecker.cpp
+++ b/libsolidity/analysis/PostTypeContractLevelChecker.cpp
@@ -26,7 +26,6 @@
 #include <libsolutil/FunctionSelector.h>
 #include <liblangutil/ErrorReporter.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -48,10 +47,10 @@ bool PostTypeContractLevelChecker::check(ContractDefinition const& _contract)
 		""
 	);
 
-	map<uint32_t, map<string, SourceLocation>> errorHashes;
+	std::map<uint32_t, std::map<std::string, SourceLocation>> errorHashes;
 	for (ErrorDefinition const* error: _contract.interfaceErrors())
 	{
-		string signature = error->functionType(true)->externalSignature();
+		std::string signature = error->functionType(true)->externalSignature();
 		uint32_t hash = util::selectorFromSignatureU32(signature);
 		// Fail if there is a different signature for the same hash.
 		if (!errorHashes[hash].empty() && !errorHashes[hash].count(signature))
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index 399c15b56e..e680021331 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -39,7 +39,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/split.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -121,8 +120,8 @@ bool ReferencesResolver::visit(Identifier const& _identifier)
 	auto declarations = m_resolver.nameFromCurrentScope(_identifier.name());
 	if (declarations.empty())
 	{
-		string suggestions = m_resolver.similarNameSuggestions(_identifier.name());
-		string errorMessage = "Undeclared identifier.";
+		std::string suggestions = m_resolver.similarNameSuggestions(_identifier.name());
+		std::string errorMessage = "Undeclared identifier.";
 		if (!suggestions.empty())
 		{
 			if ("\"" + _identifier.name() + "\"" == suggestions)
@@ -192,10 +191,10 @@ bool ReferencesResolver::visit(UsingForDirective const& _usingFor)
 		// _includeInvisibles is enabled here because external library functions are marked invisible.
 		// As unintended side-effects other invisible names (eg.: super, this) may be returned as well.
 		// DeclarationTypeChecker should detect and report such situations.
-		vector<Declaration const*> declarations = m_resolver.pathFromCurrentScopeWithAllDeclarations(path->path(), true /* _includeInvisibles */);
+		std::vector<Declaration const*> declarations = m_resolver.pathFromCurrentScopeWithAllDeclarations(path->path(), true /* _includeInvisibles */);
 		if (declarations.empty())
 		{
-			string libraryOrFunctionNameErrorMessage =
+			std::string libraryOrFunctionNameErrorMessage =
 				_usingFor.usesBraces() ?
 				"Identifier is not a function name or not unique." :
 				"Identifier is not a library name.";
@@ -253,9 +252,9 @@ void ReferencesResolver::operator()(yul::Identifier const& _identifier)
 {
 	solAssert(nativeLocationOf(_identifier) == originLocationOf(_identifier), "");
 
-	static set<string> suffixes{"slot", "offset", "length", "address", "selector"};
-	string suffix;
-	for (string const& s: suffixes)
+	static std::set<std::string> suffixes{"slot", "offset", "length", "address", "selector"};
+	std::string suffix;
+	for (std::string const& s: suffixes)
 		if (boost::algorithm::ends_with(_identifier.name.str(), "." + s))
 			suffix = s;
 
@@ -269,7 +268,7 @@ void ReferencesResolver::operator()(yul::Identifier const& _identifier)
 		if (!declarations.empty())
 			// the special identifier exists itself, we should not allow that.
 			return;
-		string realName = _identifier.name.str().substr(0, _identifier.name.str().size() - suffix.size() - 1);
+		std::string realName = _identifier.name.str().substr(0, _identifier.name.str().size() - suffix.size() - 1);
 		solAssert(!realName.empty(), "Empty name.");
 		declarations = m_resolver.nameFromCurrentScope(realName);
 		if (!declarations.empty())
@@ -350,7 +349,7 @@ void ReferencesResolver::resolveInheritDoc(StructuredDocumentation const& _docum
 		break;
 	case 1:
 	{
-		string const& name = _annotation.docTags.find("inheritdoc")->second.content;
+		std::string const& name = _annotation.docTags.find("inheritdoc")->second.content;
 		if (name.empty())
 		{
 			m_errorReporter.docstringParsingError(
@@ -361,7 +360,7 @@ void ReferencesResolver::resolveInheritDoc(StructuredDocumentation const& _docum
 			return;
 		}
 
-		vector<string> path;
+		std::vector<std::string> path;
 		boost::split(path, name, boost::is_any_of("."));
 		if (any_of(path.begin(), path.end(), [](auto& _str) { return _str.empty(); }))
 		{
@@ -421,7 +420,7 @@ void ReferencesResolver::validateYulIdentifierName(yul::YulString _name, SourceL
 			"User-defined identifiers in inline assembly cannot contain '.'."
 		);
 
-	if (set<string>{"this", "super", "_"}.count(_name.str()))
+	if (std::set<std::string>{"this", "super", "_"}.count(_name.str()))
 		m_errorReporter.declarationError(
 			4113_error,
 			_location,
diff --git a/libsolidity/analysis/Scoper.cpp b/libsolidity/analysis/Scoper.cpp
index 98716cf0f8..a14ca45597 100644
--- a/libsolidity/analysis/Scoper.cpp
+++ b/libsolidity/analysis/Scoper.cpp
@@ -20,7 +20,6 @@
 
 #include <libsolidity/ast/AST.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
diff --git a/libsolidity/analysis/StaticAnalyzer.cpp b/libsolidity/analysis/StaticAnalyzer.cpp
index 01ca601f12..10c2c922ca 100644
--- a/libsolidity/analysis/StaticAnalyzer.cpp
+++ b/libsolidity/analysis/StaticAnalyzer.cpp
@@ -28,7 +28,6 @@
 #include <liblangutil/ErrorReporter.h>
 #include <memory>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -71,7 +70,7 @@ class solidity::frontend::ConstructorUsesAssembly
 		return m_usesAssembly[&_contract];
 	}
 
-	map<ContractDefinition const*, bool> m_usesAssembly;
+	std::map<ContractDefinition const*, bool> m_usesAssembly;
 };
 
 StaticAnalyzer::StaticAnalyzer(ErrorReporter& _errorReporter):
@@ -124,7 +123,7 @@ void StaticAnalyzer::endVisit(FunctionDefinition const&)
 						5667_error,
 						var.first.second->location(),
 						"Unused " +
-						string(var.first.second->isTryCatchParameter() ? "try/catch" : "function") +
+						std::string(var.first.second->isTryCatchParameter() ? "try/catch" : "function") +
 						" parameter. Remove or comment out the variable name to silence this warning."
 					);
 				else
@@ -142,7 +141,7 @@ bool StaticAnalyzer::visit(Identifier const& _identifier)
 		{
 			solAssert(!var->name().empty(), "");
 			if (var->isLocalVariable())
-				m_localVarUseCount[make_pair(var->id(), var)] += 1;
+				m_localVarUseCount[std::make_pair(var->id(), var)] += 1;
 		}
 	return true;
 }
@@ -154,7 +153,7 @@ bool StaticAnalyzer::visit(VariableDeclaration const& _variable)
 		solAssert(_variable.isLocalVariable(), "");
 		if (_variable.name() != "")
 			// This is not a no-op, the entry might pre-exist.
-			m_localVarUseCount[make_pair(_variable.id(), &_variable)] += 0;
+			m_localVarUseCount[std::make_pair(_variable.id(), &_variable)] += 0;
 	}
 
 	if (_variable.isStateVariable() || _variable.referenceLocation() == VariableDeclaration::Location::Storage)
@@ -162,7 +161,7 @@ bool StaticAnalyzer::visit(VariableDeclaration const& _variable)
 			for (Type const* type: varType->fullDecomposition())
 				if (type->storageSizeUpperBound() >= (bigint(1) << 64))
 				{
-					string message = "Type " + type->toString(true) +
+					std::string message = "Type " + type->toString(true) +
 						" covers a large part of storage and thus makes collisions likely."
 						" Either use mappings or dynamic arrays and allow their size to be increased only"
 						" in small quantities per transaction.";
@@ -179,7 +178,7 @@ bool StaticAnalyzer::visit(Return const& _return)
 	if (m_currentFunction && _return.expression())
 		for (auto const& var: m_currentFunction->returnParameters())
 			if (!var->name().empty())
-				m_localVarUseCount[make_pair(var->id(), var.get())] += 1;
+				m_localVarUseCount[std::make_pair(var->id(), var.get())] += 1;
 	return true;
 }
 
@@ -214,7 +213,7 @@ bool StaticAnalyzer::visit(MemberAccess const& _memberAccess)
 		else if (type->kind() == MagicType::Kind::MetaType && _memberAccess.memberName() == "runtimeCode")
 		{
 			if (!m_constructorUsesAssembly)
-				m_constructorUsesAssembly = make_unique<ConstructorUsesAssembly>();
+				m_constructorUsesAssembly = std::make_unique<ConstructorUsesAssembly>();
 			ContractType const& contract = dynamic_cast<ContractType const&>(*type->typeArgument());
 			if (m_constructorUsesAssembly->check(contract.contractDefinition()))
 				m_errorReporter.warning(
@@ -288,7 +287,7 @@ bool StaticAnalyzer::visit(InlineAssembly const& _inlineAssembly)
 		{
 			solAssert(!var->name().empty(), "");
 			if (var->isLocalVariable())
-				m_localVarUseCount[make_pair(var->id(), var)] += 1;
+				m_localVarUseCount[std::make_pair(var->id(), var)] += 1;
 		}
 	}
 
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index 4f99f67ac6..2546cfdda6 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -32,7 +32,6 @@
 
 #include <string>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -55,17 +54,17 @@ void SyntaxChecker::endVisit(SourceUnit const& _sourceUnit)
 {
 	if (!m_versionPragmaFound)
 	{
-		string errorString("Source file does not specify required compiler version!");
-		SemVerVersion recommendedVersion{string(VersionString)};
+		std::string errorString("Source file does not specify required compiler version!");
+		SemVerVersion recommendedVersion{std::string(VersionString)};
 		if (!recommendedVersion.isPrerelease())
 			errorString +=
 				" Consider adding \"pragma solidity ^" +
-				to_string(recommendedVersion.major()) +
-				string(".") +
-				to_string(recommendedVersion.minor()) +
-				string(".") +
-				to_string(recommendedVersion.patch()) +
-				string(";\"");
+				std::to_string(recommendedVersion.major()) +
+				std::string(".") +
+				std::to_string(recommendedVersion.minor()) +
+				std::string(".") +
+				std::to_string(recommendedVersion.patch()) +
+				std::string(";\"");
 
 		// when reporting the warning, print the source name only
 		m_errorReporter.warning(3420_error, {-1, -1, _sourceUnit.location().sourceName}, errorString);
@@ -84,7 +83,7 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
 	else if (_pragma.literals()[0] == "experimental")
 	{
 		solAssert(m_sourceUnit, "");
-		vector<string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
+		std::vector<std::string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
 		if (literals.empty())
 			m_errorReporter.syntaxError(
 				9679_error,
@@ -99,7 +98,7 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
 			);
 		else
 		{
-			string const literal = literals[0];
+			std::string const literal = literals[0];
 			if (literal.empty())
 				m_errorReporter.syntaxError(3250_error, _pragma.location(), "Empty experimental feature name is invalid.");
 			else if (!ExperimentalFeatureNames.count(literal))
@@ -135,7 +134,7 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
 		solAssert(m_sourceUnit, "");
 		if (
 			_pragma.literals().size() != 2 ||
-			!set<string>{"v1", "v2"}.count(_pragma.literals()[1])
+			!std::set<std::string>{"v1", "v2"}.count(_pragma.literals()[1])
 		)
 			m_errorReporter.syntaxError(
 				2745_error,
@@ -155,17 +154,17 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
 	{
 		try
 		{
-			vector<Token> tokens(_pragma.tokens().begin() + 1, _pragma.tokens().end());
-			vector<string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
+			std::vector<Token> tokens(_pragma.tokens().begin() + 1, _pragma.tokens().end());
+			std::vector<std::string> literals(_pragma.literals().begin() + 1, _pragma.literals().end());
 			SemVerMatchExpressionParser parser(tokens, literals);
 			SemVerMatchExpression matchExpression = parser.parse();
-			static SemVerVersion const currentVersion{string(VersionString)};
+			static SemVerVersion const currentVersion{std::string(VersionString)};
 			if (!matchExpression.matches(currentVersion))
 				m_errorReporter.syntaxError(
 					3997_error,
 					_pragma.location(),
 					"Source file requires different compiler version (current compiler is " +
-					string(VersionString) + ") - note that nightly builds are considered to be "
+					std::string(VersionString) + ") - note that nightly builds are considered to be "
 					"strictly less than the released version"
 				);
 			m_versionPragmaFound = true;
@@ -412,7 +411,7 @@ bool SyntaxChecker::visit(UsingForDirective const& _usingFor)
 	if (!_usingFor.usesBraces())
 		solAssert(
 			_usingFor.functionsAndOperators().size() == 1 &&
-			!get<1>(_usingFor.functionsAndOperators().front())
+			!std::get<1>(_usingFor.functionsAndOperators().front())
 		);
 
 	if (!m_currentContractKind && !_usingFor.typeName())
@@ -455,7 +454,7 @@ bool SyntaxChecker::visit(FunctionDefinition const& _function)
 
 	if (!_function.isFree() && !_function.isConstructor() && _function.noVisibilitySpecified())
 	{
-		string suggestedVisibility =
+		std::string suggestedVisibility =
 			_function.isFallback() ||
 			_function.isReceive() ||
 			m_currentContractKind == ContractKind::Interface
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index e7721fd9e5..5c28d3cd2a 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -51,7 +51,6 @@
 #include <memory>
 #include <vector>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -205,7 +204,7 @@ void TypeChecker::checkDoubleStorageAssignment(Assignment const& _assignment)
 
 TypePointers TypeChecker::typeCheckABIDecodeAndRetrieveReturnType(FunctionCall const& _functionCall, bool _abiEncoderV2)
 {
-	vector<ASTPointer<Expression const>> arguments = _functionCall.arguments();
+	std::vector<ASTPointer<Expression const>> arguments = _functionCall.arguments();
 	if (arguments.size() != 2)
 		m_errorReporter.typeError(
 			5782_error,
@@ -296,7 +295,7 @@ TypePointers TypeChecker::typeCheckABIDecodeAndRetrieveReturnType(FunctionCall c
 
 TypePointers TypeChecker::typeCheckMetaTypeFunctionAndRetrieveReturnType(FunctionCall const& _functionCall)
 {
-	vector<ASTPointer<Expression const>> arguments = _functionCall.arguments();
+	std::vector<ASTPointer<Expression const>> arguments = _functionCall.arguments();
 	if (arguments.size() != 1)
 		m_errorReporter.fatalTypeError(
 			8885_error,
@@ -442,7 +441,7 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
 			m_errorReporter.typeError(5587_error, _function.location(), "\"internal\" and \"private\" functions cannot be payable.");
 	}
 
-	vector<VariableDeclaration const*> internalParametersInConstructor;
+	std::vector<VariableDeclaration const*> internalParametersInConstructor;
 
 	auto checkArgumentAndReturnParameter = [&](VariableDeclaration const& _var) {
 		if (type(_var)->containsNestedMapping())
@@ -472,7 +471,7 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
 
 			if (!iType)
 			{
-				string message = iType.message();
+				std::string message = iType.message();
 				solAssert(!message.empty(), "Expected detailed error message!");
 				if (_function.isConstructor())
 					message += " You can make the contract abstract to avoid this problem.";
@@ -483,7 +482,7 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
 				!typeSupportedByOldABIEncoder(*type(_var), _function.libraryFunction())
 			)
 			{
-				string message =
+				std::string message =
 					"This type is only supported in ABI coder v2. "
 					"Use \"pragma abicoder v2;\" to enable the feature.";
 				if (_function.isConstructor())
@@ -509,10 +508,10 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
 		var->accept(*this);
 	}
 
-	set<Declaration const*> modifiers;
+	std::set<Declaration const*> modifiers;
 	for (ASTPointer<ModifierInvocation> const& modifier: _function.modifiers())
 	{
-		vector<ContractDefinition const*> baseContracts;
+		std::vector<ContractDefinition const*> baseContracts;
 		if (auto contract = dynamic_cast<ContractDefinition const*>(_function.scope()))
 		{
 			baseContracts = contract->annotation().linearizedBaseContracts;
@@ -522,7 +521,7 @@ bool TypeChecker::visit(FunctionDefinition const& _function)
 
 		visitManually(
 			*modifier,
-			_function.isConstructor() ? baseContracts : vector<ContractDefinition const*>()
+			_function.isConstructor() ? baseContracts : std::vector<ContractDefinition const*>()
 		);
 		Declaration const* decl = &dereference(modifier->name());
 		if (modifiers.count(decl))
@@ -642,7 +641,7 @@ bool TypeChecker::visit(VariableDeclaration const& _variable)
 		FunctionType getter(_variable);
 		if (!useABICoderV2())
 		{
-			vector<string> unsupportedTypes;
+			std::vector<std::string> unsupportedTypes;
 			for (auto const& param: getter.parameterTypes() + getter.returnParameterTypes())
 				if (!typeSupportedByOldABIEncoder(*param, false /* isLibrary */))
 					unsupportedTypes.emplace_back(param->humanReadableName());
@@ -713,7 +712,7 @@ void TypeChecker::endVisit(StructDefinition const& _struct)
 
 void TypeChecker::visitManually(
 	ModifierInvocation const& _modifier,
-	vector<ContractDefinition const*> const& _bases
+	std::vector<ContractDefinition const*> const& _bases
 )
 {
 	std::vector<ASTPointer<Expression>> const& arguments =
@@ -724,8 +723,8 @@ void TypeChecker::visitManually(
 	_modifier.name().accept(*this);
 
 	auto const* declaration = &dereference(_modifier.name());
-	vector<ASTPointer<VariableDeclaration>> emptyParameterList;
-	vector<ASTPointer<VariableDeclaration>> const* parameters = nullptr;
+	std::vector<ASTPointer<VariableDeclaration>> emptyParameterList;
+	std::vector<ASTPointer<VariableDeclaration>> const* parameters = nullptr;
 	if (auto modifierDecl = dynamic_cast<ModifierDefinition const*>(declaration))
 	{
 		parameters = &modifierDecl->parameters();
@@ -920,8 +919,8 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 
 			if (!identifierInfo.suffix.empty())
 			{
-				string const& suffix = identifierInfo.suffix;
-				solAssert((set<string>{"offset", "slot", "length", "selector", "address"}).count(suffix), "");
+				std::string const& suffix = identifierInfo.suffix;
+				solAssert((std::set<std::string>{"offset", "slot", "length", "selector", "address"}).count(suffix), "");
 				if (!var->isConstant() && (var->isStateVariable() || var->type()->dataStoredIn(DataLocation::Storage)))
 				{
 					if (suffix != "slot" && suffix != "offset")
@@ -1042,7 +1041,7 @@ bool TypeChecker::visit(InlineAssembly const& _inlineAssembly)
 		return true;
 	};
 	solAssert(!_inlineAssembly.annotation().analysisInfo, "");
-	_inlineAssembly.annotation().analysisInfo = make_shared<yul::AsmAnalysisInfo>();
+	_inlineAssembly.annotation().analysisInfo = std::make_shared<yul::AsmAnalysisInfo>();
 	yul::AsmAnalyzer analyzer(
 		*_inlineAssembly.annotation().analysisInfo,
 		m_errorReporter,
@@ -1113,9 +1112,9 @@ void TypeChecker::endVisit(TryStatement const& _tryStatement)
 				2800_error,
 				successClause.location(),
 				"Function returns " +
-				to_string(functionType.returnParameterTypes().size()) +
+				std::to_string(functionType.returnParameterTypes().size()) +
 				" values, but returns clause has " +
-				to_string(parameters.size()) +
+				std::to_string(parameters.size()) +
 				" variables."
 			);
 		for (auto&& [parameter, returnType]: ranges::views::zip(parameters, returnTypes))
@@ -1363,7 +1362,7 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
 	else
 		valueTypes = TypePointers{type(*_statement.initialValue())};
 
-	vector<ASTPointer<VariableDeclaration>> const& variables = _statement.declarations();
+	std::vector<ASTPointer<VariableDeclaration>> const& variables = _statement.declarations();
 	if (variables.empty())
 		// We already have an error for this in the SyntaxChecker.
 		solAssert(m_errorReporter.hasErrors(), "");
@@ -1378,7 +1377,7 @@ bool TypeChecker::visit(VariableDeclarationStatement const& _statement)
 			")."
 		);
 
-	for (size_t i = 0; i < min(variables.size(), valueTypes.size()); ++i)
+	for (size_t i = 0; i < std::min(variables.size(), valueTypes.size()); ++i)
 	{
 		if (!variables[i])
 			continue;
@@ -1535,14 +1534,14 @@ void TypeChecker::checkExpressionAssignment(Type const& _type, Expression const&
 			m_errorReporter.typeError(5547_error, _expression.location(), "Empty tuple on the left hand side.");
 
 		auto const* tupleType = dynamic_cast<TupleType const*>(&_type);
-		auto const& types = tupleType && tupleExpression->components().size() != 1 ? tupleType->components() : vector<Type const*> { &_type };
+		auto const& types = tupleType && tupleExpression->components().size() != 1 ? tupleType->components() : std::vector<Type const*> { &_type };
 
 		solAssert(
 			tupleExpression->components().size() == types.size() || m_errorReporter.hasErrors(),
 			"Array sizes don't match and no errors generated."
 		);
 
-		for (size_t i = 0; i < min(tupleExpression->components().size(), types.size()); i++)
+		for (size_t i = 0; i < std::min(tupleExpression->components().size(), types.size()); i++)
 			if (types[i])
 			{
 				solAssert(!!tupleExpression->components()[i], "");
@@ -1607,7 +1606,7 @@ bool TypeChecker::visit(Assignment const& _assignment)
 				7366_error,
 				_assignment.location(),
 				"Operator " +
-				string(TokenTraits::friendlyName(_assignment.assignmentOperator())) +
+				std::string(TokenTraits::friendlyName(_assignment.assignmentOperator())) +
 				" not compatible with types " +
 				t->humanReadableName() +
 				" and " +
@@ -1621,7 +1620,7 @@ bool TypeChecker::visit(Assignment const& _assignment)
 bool TypeChecker::visit(TupleExpression const& _tuple)
 {
 	_tuple.annotation().isConstant = false;
-	vector<ASTPointer<Expression>> const& components = _tuple.components();
+	std::vector<ASTPointer<Expression>> const& components = _tuple.components();
 	TypePointers types;
 
 	if (_tuple.annotation().willBeWrittenTo)
@@ -1734,7 +1733,7 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 
 	// Check if the operator is built-in or user-defined.
 	TypeResult builtinResult = operandType->unaryOperatorResult(op);
-	set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = operandType->operatorDefinitions(
+	std::set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = operandType->operatorDefinitions(
 		op,
 		*currentDefinitionScope(),
 		true // _unary
@@ -1760,7 +1759,7 @@ bool TypeChecker::visit(UnaryOperation const& _operation)
 	}
 	else
 	{
-		string description = fmt::format(
+		std::string description = fmt::format(
 			"Built-in unary operator {} cannot be applied to type {}.",
 			TokenTraits::friendlyName(op),
 			operandType->humanReadableName()
@@ -1802,7 +1801,7 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 
 	// Check if the operator is built-in or user-defined.
 	TypeResult builtinResult = leftType->binaryOperatorResult(_operation.getOperator(), rightType);
-	set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = leftType->operatorDefinitions(
+	std::set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = leftType->operatorDefinitions(
 		_operation.getOperator(),
 		*currentDefinitionScope(),
 		false // _unary
@@ -1828,7 +1827,7 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 	}
 	else
 	{
-		string description = fmt::format(
+		std::string description = fmt::format(
 			"Built-in binary operator {} cannot be applied to types {} and {}.",
 			TokenTraits::friendlyName(_operation.getOperator()),
 			leftType->humanReadableName(),
@@ -1893,7 +1892,7 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 
 	if (_operation.getOperator() == Token::Exp || _operation.getOperator() == Token::SHL)
 	{
-		string operation = _operation.getOperator() == Token::Exp ? "exponentiation" : "shift";
+		std::string operation = _operation.getOperator() == Token::Exp ? "exponentiation" : "shift";
 		if (
 			leftType->category() == Type::Category::RationalNumber &&
 			rightType->category() != Type::Category::RationalNumber
@@ -1933,7 +1932,7 @@ Type const* TypeChecker::typeCheckTypeConversionAndRetrieveReturnType(
 	solAssert(*_functionCall.annotation().kind == FunctionCallKind::TypeConversion, "");
 	Type const* expressionType = type(_functionCall.expression());
 
-	vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
+	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
 	bool const isPositionalCall = _functionCall.names().empty();
 
 	Type const* resultType = dynamic_cast<TypeType const&>(*expressionType).actualType();
@@ -2215,7 +2214,7 @@ void TypeChecker::typeCheckABIEncodeFunctions(
 	}
 
 	// Check additional arguments for variadic functions
-	vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
+	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
 	for (size_t i = 0; i < arguments.size(); ++i)
 	{
 		auto const& argType = type(*arguments[i]);
@@ -2274,7 +2273,7 @@ void TypeChecker::typeCheckABIEncodeFunctions(
 
 void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCall)
 {
-	vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
+	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
 
 	// Expecting first argument to be the function pointer and second to be a tuple.
 	if (arguments.size() != 2)
@@ -2311,7 +2310,7 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 		externalFunctionType->kind() != FunctionType::Kind::Declaration
 	)
 	{
-		string msg = "Expected regular external function type, or external view on public function.";
+		std::string msg = "Expected regular external function type, or external view on public function.";
 
 		switch (externalFunctionType->kind())
 		{
@@ -2360,7 +2359,7 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 	}
 	solAssert(!externalFunctionType->takesArbitraryParameters(), "Function must have fixed parameters.");
 	// Tuples with only one component become that component
-	vector<ASTPointer<Expression const>> callArguments;
+	std::vector<ASTPointer<Expression const>> callArguments;
 
 	auto const* tupleType = dynamic_cast<TupleType const*>(type(*arguments[1]));
 	if (tupleType)
@@ -2387,9 +2386,9 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 				7788_error,
 				_functionCall.location(),
 				"Expected " +
-				to_string(externalFunctionType->parameterTypes().size()) +
+				std::to_string(externalFunctionType->parameterTypes().size()) +
 				" instead of " +
-				to_string(callArguments.size()) +
+				std::to_string(callArguments.size()) +
 				" components for the tuple parameter."
 			);
 		else
@@ -2397,13 +2396,13 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 				7515_error,
 				_functionCall.location(),
 				"Expected a tuple with " +
-				to_string(externalFunctionType->parameterTypes().size()) +
+				std::to_string(externalFunctionType->parameterTypes().size()) +
 				" components instead of a single non-tuple parameter."
 			);
 	}
 
 	// Use min() to check as much as we can before failing fatally
-	size_t const numParameters = min(callArguments.size(), externalFunctionType->parameterTypes().size());
+	size_t const numParameters = std::min(callArguments.size(), externalFunctionType->parameterTypes().size());
 
 	for (size_t i = 0; i < numParameters; i++)
 	{
@@ -2414,7 +2413,7 @@ void TypeChecker::typeCheckABIEncodeCallFunction(FunctionCall const& _functionCa
 				5407_error,
 				callArguments[i]->location(),
 				"Cannot implicitly convert component at position " +
-				to_string(i) +
+				std::to_string(i) +
 				" from \"" +
 				argType.humanReadableName() +
 				"\" to \"" +
@@ -2437,7 +2436,7 @@ void TypeChecker::typeCheckStringConcatFunction(
 
 	typeCheckFunctionGeneralChecks(_functionCall, _functionType);
 
-	for (shared_ptr<Expression const> const& argument: _functionCall.arguments())
+	for (std::shared_ptr<Expression const> const& argument: _functionCall.arguments())
 	{
 		Type const* argumentType = type(*argument);
 		bool notConvertibleToString = !argumentType->isImplicitlyConvertibleTo(*TypeProvider::stringMemory());
@@ -2464,7 +2463,7 @@ void TypeChecker::typeCheckBytesConcatFunction(
 
 	typeCheckFunctionGeneralChecks(_functionCall, _functionType);
 
-	for (shared_ptr<Expression const> const& argument: _functionCall.arguments())
+	for (std::shared_ptr<Expression const> const& argument: _functionCall.arguments())
 	{
 		Type const* argumentType = type(*argument);
 		bool notConvertibleToBytes =
@@ -2504,8 +2503,8 @@ void TypeChecker::typeCheckFunctionGeneralChecks(
 	);
 
 	TypePointers const& parameterTypes = _functionType->parameterTypes();
-	vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
-	vector<ASTPointer<ASTString>> const& argumentNames = _functionCall.names();
+	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
+	std::vector<ASTPointer<ASTString>> const& argumentNames = _functionCall.names();
 
 	// Check number of passed in arguments
 	if (
@@ -2516,22 +2515,22 @@ void TypeChecker::typeCheckFunctionGeneralChecks(
 		bool const isStructConstructorCall =
 			functionCallKind == FunctionCallKind::StructConstructorCall;
 
-		auto [errorId, description] = [&]() -> tuple<ErrorId, string> {
-			string msg = isVariadic ?
+		auto [errorId, description] = [&]() -> std::tuple<ErrorId, std::string> {
+			std::string msg = isVariadic ?
 				"Need at least " +
 				toString(parameterTypes.size()) +
 				" arguments for " +
-				string(isStructConstructorCall ? "struct constructor" : "function call") +
+				std::string(isStructConstructorCall ? "struct constructor" : "function call") +
 				", but provided only " +
 				toString(arguments.size()) +
 				"."
 				:
 				"Wrong argument count for " +
-				string(isStructConstructorCall ? "struct constructor" : "function call") +
+				std::string(isStructConstructorCall ? "struct constructor" : "function call") +
 				": " +
 				toString(arguments.size()) +
 				" arguments given but " +
-				string(isVariadic ? "need at least " : "expected ") +
+				std::string(isVariadic ? "need at least " : "expected ") +
 				toString(parameterTypes.size()) +
 				".";
 
@@ -2659,8 +2658,8 @@ void TypeChecker::typeCheckFunctionGeneralChecks(
 		BoolResult result = type(*paramArgMap[i])->isImplicitlyConvertibleTo(*parameterTypes[i]);
 		if (!result)
 		{
-			auto [errorId, description] = [&]() -> tuple<ErrorId, string> {
-				string msg =
+			auto [errorId, description] = [&]() -> std::tuple<ErrorId, std::string> {
+				std::string msg =
 					"Invalid type for argument in function call. "
 					"Invalid implicit conversion from " +
 					type(*paramArgMap[i])->humanReadableName() +
@@ -2751,7 +2750,7 @@ void TypeChecker::typeCheckFunctionGeneralChecks(
 
 bool TypeChecker::visit(FunctionCall const& _functionCall)
 {
-	vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
+	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.arguments();
 	bool argumentsArePure = true;
 
 	// We need to check arguments' type first as they will be needed for overload resolution.
@@ -2991,7 +2990,7 @@ bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
 			"{...}-option."
 		);
 
-	auto setCheckOption = [&](bool& _option, string const& _name)
+	auto setCheckOption = [&](bool& _option, std::string const& _name)
 	{
 		if (_option)
 			m_errorReporter.typeError(
@@ -3005,7 +3004,7 @@ bool TypeChecker::visit(FunctionCallOptions const& _functionCallOptions)
 
 	for (size_t i = 0; i < _functionCallOptions.names().size(); ++i)
 	{
-		string const& name = *(_functionCallOptions.names()[i]);
+		std::string const& name = *(_functionCallOptions.names()[i]);
 		if (name == "salt")
 		{
 			if (kind == FunctionType::Kind::Creation)
@@ -3185,8 +3184,8 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 				);
 		}
 
-		auto [errorId, description] = [&]() -> tuple<ErrorId, string> {
-			string errorMsg = "Member \"" + memberName + "\" not found or not visible "
+		auto [errorId, description] = [&]() -> std::tuple<ErrorId, std::string> {
+			std::string errorMsg = "Member \"" + memberName + "\" not found or not visible "
 				"after argument-dependent lookup in " + exprType->humanReadableName() + ".";
 
 			if (auto const* funType = dynamic_cast<FunctionType const*>(exprType))
@@ -3222,7 +3221,7 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 					if (addressMember.name == memberName)
 					{
 						auto const* var = dynamic_cast<Identifier const*>(&_memberAccess.expression());
-						string varName = var ? var->name() : "...";
+						std::string varName = var ? var->name() : "...";
 						errorMsg += " Use \"address(" + varName + ")." + memberName + "\" to access this address member.";
 						return { 3125_error, errorMsg };
 					}
@@ -3606,13 +3605,13 @@ bool TypeChecker::visit(IndexRangeAccess const& _access)
 	return false;
 }
 
-vector<Declaration const*> TypeChecker::cleanOverloadedDeclarations(
+std::vector<Declaration const*> TypeChecker::cleanOverloadedDeclarations(
 	Identifier const& _identifier,
-	vector<Declaration const*> const& _candidates
+	std::vector<Declaration const*> const& _candidates
 )
 {
 	solAssert(_candidates.size() > 1, "");
-	vector<Declaration const*> uniqueDeclarations;
+	std::vector<Declaration const*> uniqueDeclarations;
 
 	for (Declaration const* declaration: _candidates)
 	{
@@ -3665,7 +3664,7 @@ bool TypeChecker::visit(Identifier const& _identifier)
 		else if (!annotation.arguments)
 		{
 			// The identifier should be a public state variable shadowing other functions
-			vector<Declaration const*> candidates;
+			std::vector<Declaration const*> candidates;
 
 			for (Declaration const* declaration: annotation.overloadedDeclarations)
 			{
@@ -3681,7 +3680,7 @@ bool TypeChecker::visit(Identifier const& _identifier)
 		}
 		else
 		{
-			vector<Declaration const*> candidates;
+			std::vector<Declaration const*> candidates;
 
 			for (Declaration const* declaration: annotation.overloadedDeclarations)
 			{
@@ -3700,7 +3699,7 @@ bool TypeChecker::visit(Identifier const& _identifier)
 					if (!declaration->location().isValid())
 					{
 						// Try to re-construct function definition
-						string description;
+						std::string description;
 						for (auto const& param: declaration->functionType(true)->parameterTypes())
 							description += (description.empty() ? "" : ", ") + param->humanReadableName();
 						description = "function " + _identifier.name() + "(" + description + ")";
@@ -3816,12 +3815,12 @@ void TypeChecker::endVisit(Literal const& _literal)
 		// Assign type here if it even looks like an address. This prevents double errors for invalid addresses
 		_literal.annotation().type = TypeProvider::address();
 
-		string msg;
+		std::string msg;
 		if (_literal.valueWithoutUnderscores().length() != 42) // "0x" + 40 hex digits
 			// looksLikeAddress enforces that it is a hex literal starting with "0x"
 			msg =
 				"This looks like an address but is not exactly 40 hex digits. It is " +
-				to_string(_literal.valueWithoutUnderscores().length() - 2) +
+				std::to_string(_literal.valueWithoutUnderscores().length() - 2) +
 				" hex digits.";
 		else if (!_literal.passesAddressChecksum())
 		{
@@ -4034,7 +4033,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 			bool isBinaryOnlyOperator = (TokenTraits::isBinaryOp(operator_.value()) && !TokenTraits::isUnaryOp(operator_.value()));
 			bool firstParameterMatchesUsingFor = parameterCount == 0 || *usingForType == *parameterTypes.front();
 
-			optional<string> wrongParametersMessage;
+			std::optional<std::string> wrongParametersMessage;
 			if (isBinaryOnlyOperator && (parameterCount != 2 || !identicalFirstTwoParameters))
 				wrongParametersMessage = fmt::format("two parameters of type {} and the same data location", usingForType->canonicalName());
 			else if (isUnaryOnlyOperator && (parameterCount != 1 || !firstParameterMatchesUsingFor))
@@ -4065,7 +4064,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 			TypePointers const& returnParameterTypes = functionType->returnParameterTypes();
 			size_t const returnParameterCount = returnParameterTypes.size();
 
-			optional<string> wrongReturnParametersMessage;
+			std::optional<std::string> wrongReturnParametersMessage;
 			if (!TokenTraits::isCompareOp(operator_.value()) && operator_.value() != Token::Not)
 			{
 				if (returnParameterCount != 1 || *usingForType != *returnParameterTypes.front())
@@ -4100,7 +4099,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 			{
 				// TODO: This is pretty inefficient. For every operator binding we find, we're
 				// traversing all bindings in all `using for` directives in the current scope.
-				set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = usingForType->operatorDefinitions(
+				std::set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions = usingForType->operatorDefinitions(
 					operator_.value(),
 					*currentDefinitionScope(),
 					parameterCount == 1 // _unary
@@ -4133,7 +4132,7 @@ void TypeChecker::endVisit(UsingForDirective const& _usingFor)
 
 void TypeChecker::checkErrorAndEventParameters(CallableDeclaration const& _callable)
 {
-	string kind = dynamic_cast<EventDefinition const*>(&_callable) ? "event" : "error";
+	std::string kind = dynamic_cast<EventDefinition const*>(&_callable) ? "event" : "error";
 	for (ASTPointer<VariableDeclaration> const& var: _callable.parameters())
 	{
 		if (type(*var)->containsNestedMapping())
@@ -4223,7 +4222,7 @@ void TypeChecker::requireLValue(Expression const& _expression, bool _ordinaryAss
 	if (*_expression.annotation().isLValue)
 		return;
 
-	auto [errorId, description] = [&]() -> tuple<ErrorId, string> {
+	auto [errorId, description] = [&]() -> std::tuple<ErrorId, std::string> {
 		if (*_expression.annotation().isConstant)
 			return { 6520_error, "Cannot assign to a constant variable." };
 
diff --git a/libsolidity/analysis/ViewPureChecker.cpp b/libsolidity/analysis/ViewPureChecker.cpp
index c370f8f9f1..3f6b954e75 100644
--- a/libsolidity/analysis/ViewPureChecker.cpp
+++ b/libsolidity/analysis/ViewPureChecker.cpp
@@ -27,7 +27,6 @@
 #include <utility>
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -312,13 +311,13 @@ ViewPureChecker::MutabilityAndLocation const& ViewPureChecker::modifierMutabilit
 	{
 		MutabilityAndLocation bestMutabilityAndLocation{};
 		FunctionDefinition const* currentFunction = nullptr;
-		swap(bestMutabilityAndLocation, m_bestMutabilityAndLocation);
-		swap(currentFunction, m_currentFunction);
+		std::swap(bestMutabilityAndLocation, m_bestMutabilityAndLocation);
+		std::swap(currentFunction, m_currentFunction);
 
 		_modifier.accept(*this);
 
-		swap(bestMutabilityAndLocation, m_bestMutabilityAndLocation);
-		swap(currentFunction, m_currentFunction);
+		std::swap(bestMutabilityAndLocation, m_bestMutabilityAndLocation);
+		std::swap(currentFunction, m_currentFunction);
 	}
 	return m_inferredMutability.at(&_modifier);
 }
@@ -384,8 +383,8 @@ void ViewPureChecker::endVisit(MemberAccess const& _memberAccess)
 		break;
 	case Type::Category::Magic:
 	{
-		using MagicMember = pair<MagicType::Kind, string>;
-		set<MagicMember> static const pureMembers{
+		using MagicMember = std::pair<MagicType::Kind, std::string>;
+		std::set<MagicMember> static const pureMembers{
 			{MagicType::Kind::ABI, "decode"},
 			{MagicType::Kind::ABI, "encode"},
 			{MagicType::Kind::ABI, "encodePacked"},
@@ -401,7 +400,7 @@ void ViewPureChecker::endVisit(MemberAccess const& _memberAccess)
 			{MagicType::Kind::MetaType, "min"},
 			{MagicType::Kind::MetaType, "max"},
 		};
-		set<MagicMember> static const payableMembers{
+		std::set<MagicMember> static const payableMembers{
 			{MagicType::Kind::Message, "value"}
 		};
 
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 34fbf0381b..a396a7d760 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -25,6 +25,7 @@ NAMESPACE_STD_FREE_FILES=(
     liblangutil/*
     libsmtutil/*
     libsolc/*
+	libsolidity/analysis/*
 )
 
 (

From 2a2a9d37ee69ca77ef530fe18524a3dc8b053104 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 14 Aug 2023 14:39:16 +0200
Subject: [PATCH 1540/1748] Purge using namespace std from libsolidity/ast

---
 libsolidity/ast/AST.cpp             |  81 +++--
 libsolidity/ast/ASTAnnotations.cpp  |   1 -
 libsolidity/ast/ASTJsonExporter.cpp | 485 ++++++++++++++--------------
 libsolidity/ast/ASTJsonImporter.cpp | 116 ++++---
 libsolidity/ast/CallGraph.cpp       |  15 +-
 libsolidity/ast/TypeProvider.cpp    | 251 +++++++-------
 libsolidity/ast/Types.cpp           | 387 +++++++++++-----------
 scripts/check_style.sh              |   3 +-
 8 files changed, 666 insertions(+), 673 deletions(-)

diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index 833ba739e1..c0bf900918 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -39,13 +39,12 @@
 #include <functional>
 #include <utility>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
 namespace
 {
-TryCatchClause const* findClause(vector<ASTPointer<TryCatchClause>> const& _clauses, optional<string> _errorName = {})
+TryCatchClause const* findClause(std::vector<ASTPointer<TryCatchClause>> const& _clauses, std::optional<std::string> _errorName = {})
 {
 	for (auto const& clause: ranges::views::tail(_clauses))
 		if (_errorName.has_value() ? clause->errorName() == _errorName : clause->errorName().empty())
@@ -119,7 +118,7 @@ FunctionDefinition const* ASTNode::resolveFunctionCall(FunctionCall const& _func
 ASTAnnotation& ASTNode::annotation() const
 {
 	if (!m_annotation)
-		m_annotation = make_unique<ASTAnnotation>();
+		m_annotation = std::make_unique<ASTAnnotation>();
 	return *m_annotation;
 }
 
@@ -128,9 +127,9 @@ SourceUnitAnnotation& SourceUnit::annotation() const
 	return initAnnotation<SourceUnitAnnotation>();
 }
 
-set<SourceUnit const*> SourceUnit::referencedSourceUnits(bool _recurse, set<SourceUnit const*> _skipList) const
+std::set<SourceUnit const*> SourceUnit::referencedSourceUnits(bool _recurse, std::set<SourceUnit const*> _skipList) const
 {
-	set<SourceUnit const*> sourceUnits;
+	std::set<SourceUnit const*> sourceUnits;
 	for (ImportDirective const* importDirective: filteredNodes<ImportDirective>(nodes()))
 	{
 		auto const& sourceUnit = importDirective->annotation().sourceUnit;
@@ -161,11 +160,11 @@ bool ContractDefinition::derivesFrom(ContractDefinition const& _base) const
 	return util::contains(annotation().linearizedBaseContracts, &_base);
 }
 
-map<util::FixedHash<4>, FunctionTypePointer> ContractDefinition::interfaceFunctions(bool _includeInheritedFunctions) const
+std::map<util::FixedHash<4>, FunctionTypePointer> ContractDefinition::interfaceFunctions(bool _includeInheritedFunctions) const
 {
 	auto exportedFunctionList = interfaceFunctionList(_includeInheritedFunctions);
 
-	map<util::FixedHash<4>, FunctionTypePointer> exportedFunctions;
+	std::map<util::FixedHash<4>, FunctionTypePointer> exportedFunctions;
 	for (auto const& it: exportedFunctionList)
 		exportedFunctions.insert(it);
 
@@ -208,11 +207,11 @@ FunctionDefinition const* ContractDefinition::receiveFunction() const
 	return nullptr;
 }
 
-vector<EventDefinition const*> const& ContractDefinition::definedInterfaceEvents() const
+std::vector<EventDefinition const*> const& ContractDefinition::definedInterfaceEvents() const
 {
 	return m_interfaceEvents.init([&]{
-		set<string> eventsSeen;
-		vector<EventDefinition const*> interfaceEvents;
+		std::set<std::string> eventsSeen;
+		std::vector<EventDefinition const*> interfaceEvents;
 
 		for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
 			for (EventDefinition const* e: contract->events())
@@ -222,7 +221,7 @@ vector<EventDefinition const*> const& ContractDefinition::definedInterfaceEvents
 				///       and not to function encoding (jump vs. call)
 				FunctionType const* functionType = e->functionType(true);
 				solAssert(functionType, "");
-				string eventSignature = functionType->externalSignature();
+				std::string eventSignature = functionType->externalSignature();
 				if (eventsSeen.count(eventSignature) == 0)
 				{
 					eventsSeen.insert(eventSignature);
@@ -233,7 +232,7 @@ vector<EventDefinition const*> const& ContractDefinition::definedInterfaceEvents
 	});
 }
 
-vector<EventDefinition const*> const ContractDefinition::usedInterfaceEvents() const
+std::vector<EventDefinition const*> const ContractDefinition::usedInterfaceEvents() const
 {
 	solAssert(annotation().creationCallGraph.set(), "");
 
@@ -243,9 +242,9 @@ vector<EventDefinition const*> const ContractDefinition::usedInterfaceEvents() c
 	);
 }
 
-vector<EventDefinition const*> ContractDefinition::interfaceEvents(bool _requireCallGraph) const
+std::vector<EventDefinition const*> ContractDefinition::interfaceEvents(bool _requireCallGraph) const
 {
-	set<EventDefinition const*, CompareByID> result;
+	std::set<EventDefinition const*, CompareByID> result;
 	for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
 		result += contract->events();
 	solAssert(annotation().creationCallGraph.set() == annotation().deployedCallGraph.set());
@@ -255,12 +254,12 @@ vector<EventDefinition const*> ContractDefinition::interfaceEvents(bool _require
 		result += usedInterfaceEvents();
 	// We could filter out all events that do not have an external interface
 	// if _requireCallGraph is false.
-	return util::convertContainer<vector<EventDefinition const*>>(std::move(result));
+	return util::convertContainer<std::vector<EventDefinition const*>>(std::move(result));
 }
 
-vector<ErrorDefinition const*> ContractDefinition::interfaceErrors(bool _requireCallGraph) const
+std::vector<ErrorDefinition const*> ContractDefinition::interfaceErrors(bool _requireCallGraph) const
 {
-	set<ErrorDefinition const*, CompareByID> result;
+	std::set<ErrorDefinition const*, CompareByID> result;
 	for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
 		result += filteredNodes<ErrorDefinition>(contract->m_subNodes);
 	solAssert(annotation().creationCallGraph.set() == annotation().deployedCallGraph.set(), "");
@@ -270,20 +269,20 @@ vector<ErrorDefinition const*> ContractDefinition::interfaceErrors(bool _require
 		result +=
 			(*annotation().creationCallGraph)->usedErrors +
 			(*annotation().deployedCallGraph)->usedErrors;
-	return util::convertContainer<vector<ErrorDefinition const*>>(std::move(result));
+	return util::convertContainer<std::vector<ErrorDefinition const*>>(std::move(result));
 }
 
-vector<pair<util::FixedHash<4>, FunctionTypePointer>> const& ContractDefinition::interfaceFunctionList(bool _includeInheritedFunctions) const
+std::vector<std::pair<util::FixedHash<4>, FunctionTypePointer>> const& ContractDefinition::interfaceFunctionList(bool _includeInheritedFunctions) const
 {
 	return m_interfaceFunctionList[_includeInheritedFunctions].init([&]{
-		set<string> signaturesSeen;
-		vector<pair<util::FixedHash<4>, FunctionTypePointer>> interfaceFunctionList;
+		std::set<std::string> signaturesSeen;
+		std::vector<std::pair<util::FixedHash<4>, FunctionTypePointer>> interfaceFunctionList;
 
 		for (ContractDefinition const* contract: annotation().linearizedBaseContracts)
 		{
 			if (_includeInheritedFunctions == false && contract != this)
 				continue;
-			vector<FunctionTypePointer> functions;
+			std::vector<FunctionTypePointer> functions;
 			for (FunctionDefinition const* f: contract->definedFunctions())
 				if (f->isPartOfExternalInterface())
 					functions.push_back(TypeProvider::function(*f, FunctionType::Kind::External));
@@ -295,7 +294,7 @@ vector<pair<util::FixedHash<4>, FunctionTypePointer>> const& ContractDefinition:
 				if (!fun->interfaceFunctionType())
 					// Fails hopefully because we already registered the error
 					continue;
-				string functionSignature = fun->externalSignature();
+				std::string functionSignature = fun->externalSignature();
 				if (signaturesSeen.count(functionSignature) == 0)
 				{
 					signaturesSeen.insert(functionSignature);
@@ -357,7 +356,7 @@ FunctionDefinition const* ContractDefinition::nextConstructor(ContractDefinition
 	return nullptr;
 }
 
-multimap<std::string, FunctionDefinition const*> const& ContractDefinition::definedFunctionsByName() const
+std::multimap<std::string, FunctionDefinition const*> const& ContractDefinition::definedFunctionsByName() const
 {
 	return m_definedFunctionsByName.init([&]{
 		std::multimap<std::string, FunctionDefinition const*> result;
@@ -386,7 +385,7 @@ TypeDeclarationAnnotation& UserDefinedValueTypeDefinition::annotation() const
 
 std::vector<std::pair<ASTPointer<IdentifierPath>, std::optional<Token>>> UsingForDirective::functionsAndOperators() const
 {
-	return ranges::zip_view(m_functionsOrLibrary, m_operators) | ranges::to<vector>;
+	return ranges::zip_view(m_functionsOrLibrary, m_operators) | ranges::to<std::vector>;
 }
 
 Type const* StructDefinition::type() const
@@ -484,12 +483,12 @@ Type const* FunctionDefinition::typeViaContractName() const
 		return TypeProvider::function(*this, FunctionType::Kind::Declaration);
 }
 
-string FunctionDefinition::externalSignature() const
+std::string FunctionDefinition::externalSignature() const
 {
 	return TypeProvider::function(*this)->externalSignature();
 }
 
-string FunctionDefinition::externalIdentifierHex() const
+std::string FunctionDefinition::externalIdentifierHex() const
 {
 	return TypeProvider::function(*this)->externalIdentifierHex();
 }
@@ -639,7 +638,7 @@ CallableDeclaration const* Scopable::functionOrModifierDefinition() const
 	return nullptr;
 }
 
-string Scopable::sourceUnitName() const
+std::string Scopable::sourceUnitName() const
 {
 	return *sourceUnit().annotation().path;
 }
@@ -701,7 +700,7 @@ bool VariableDeclaration::isCallableOrCatchParameter() const
 	if (isReturnParameter() || isTryCatchParameter())
 		return true;
 
-	vector<ASTPointer<VariableDeclaration>> const* parameters = nullptr;
+	std::vector<ASTPointer<VariableDeclaration>> const* parameters = nullptr;
 
 	if (auto const* funTypeName = dynamic_cast<FunctionTypeName const*>(scope()))
 		parameters = &funTypeName->parameterTypes();
@@ -722,7 +721,7 @@ bool VariableDeclaration::isLocalOrReturn() const
 
 bool VariableDeclaration::isReturnParameter() const
 {
-	vector<ASTPointer<VariableDeclaration>> const* returnParameters = nullptr;
+	std::vector<ASTPointer<VariableDeclaration>> const* returnParameters = nullptr;
 
 	if (auto const* funTypeName = dynamic_cast<FunctionTypeName const*>(scope()))
 		returnParameters = &funTypeName->returnParameterTypes();
@@ -813,15 +812,15 @@ bool VariableDeclaration::isFileLevelVariable() const
 	return dynamic_cast<SourceUnit const*>(scope());
 }
 
-set<VariableDeclaration::Location> VariableDeclaration::allowedDataLocations() const
+std::set<VariableDeclaration::Location> VariableDeclaration::allowedDataLocations() const
 {
 	using Location = VariableDeclaration::Location;
 
 	if (!hasReferenceOrMappingType() || isStateVariable() || isEventOrErrorParameter())
-		return set<Location>{ Location::Unspecified };
+		return std::set<Location>{ Location::Unspecified };
 	else if (isCallableOrCatchParameter())
 	{
-		set<Location> locations{ Location::Memory };
+		std::set<Location> locations{ Location::Memory };
 		if (
 			isConstructorParameter() ||
 			isInternalCallableParameter() ||
@@ -835,13 +834,13 @@ set<VariableDeclaration::Location> VariableDeclaration::allowedDataLocations() c
 	}
 	else if (isLocalVariable())
 		// Further restrictions will be imposed later on.
-		return set<Location>{ Location::Memory, Location::Storage, Location::CallData };
+		return std::set<Location>{ Location::Memory, Location::Storage, Location::CallData };
 	else
 		// Struct members etc.
-		return set<Location>{ Location::Unspecified };
+		return std::set<Location>{ Location::Unspecified };
 }
 
-string VariableDeclaration::externalIdentifierHex() const
+std::string VariableDeclaration::externalIdentifierHex() const
 {
 	solAssert(isStateVariable() && isPublic(), "Can only be called for public state variables");
 	return TypeProvider::function(*this)->externalIdentifierHex();
@@ -958,7 +957,7 @@ FunctionCallAnnotation& FunctionCall::annotation() const
 	return initAnnotation<FunctionCallAnnotation>();
 }
 
-vector<ASTPointer<Expression const>> FunctionCall::sortedArguments() const
+std::vector<ASTPointer<Expression const>> FunctionCall::sortedArguments() const
 {
 	// normal arguments
 	if (m_names.empty())
@@ -975,7 +974,7 @@ vector<ASTPointer<Expression const>> FunctionCall::sortedArguments() const
 	else
 		functionType = dynamic_cast<FunctionType const*>(m_expression->annotation().type);
 
-	vector<ASTPointer<Expression const>> sorted;
+	std::vector<ASTPointer<Expression const>> sorted;
 	for (auto const& parameterName: functionType->parameterNames())
 	{
 		bool found = false;
@@ -1030,13 +1029,13 @@ bool Literal::passesAddressChecksum() const
 	return util::passesAddressChecksum(valueWithoutUnderscores(), true);
 }
 
-string Literal::getChecksummedAddress() const
+std::string Literal::getChecksummedAddress() const
 {
 	solAssert(isHexNumber(), "Expected hex number");
 	/// Pad literal to be a proper hex address.
-	string address = valueWithoutUnderscores().substr(2);
+	std::string address = valueWithoutUnderscores().substr(2);
 	if (address.length() > 40)
-		return string();
+		return std::string();
 	address.insert(address.begin(), 40 - address.size(), '0');
 	return util::getChecksummedAddress(address);
 }
diff --git a/libsolidity/ast/ASTAnnotations.cpp b/libsolidity/ast/ASTAnnotations.cpp
index 3556041d84..84d49fa2fd 100644
--- a/libsolidity/ast/ASTAnnotations.cpp
+++ b/libsolidity/ast/ASTAnnotations.cpp
@@ -23,7 +23,6 @@
 
 #include <libsolidity/ast/ASTAnnotations.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index da7f769362..ac847a3394 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -44,7 +44,6 @@
 #include <type_traits>
 #include <range/v3/view/map.hpp>
 
-using namespace std;
 using namespace std::string_literals;
 using namespace solidity::langutil;
 
@@ -52,14 +51,14 @@ namespace
 {
 
 template<typename V, template<typename> typename C>
-void addIfSet(std::vector<pair<string, Json::Value>>& _attributes, string const& _name, C<V> const& _value)
+void addIfSet(std::vector<std::pair<std::string, Json::Value>>& _attributes, std::string const& _name, C<V> const& _value)
 {
 	if constexpr (std::is_same_v<C<V>, solidity::util::SetOnce<V>>)
 	{
 		if (!_value.set())
 			return;
 	}
-	else if constexpr (std::is_same_v<C<V>, optional<V>>)
+	else if constexpr (std::is_same_v<C<V>, std::optional<V>>)
 	{
 		if (!_value.has_value())
 			return;
@@ -73,7 +72,7 @@ void addIfSet(std::vector<pair<string, Json::Value>>& _attributes, string const&
 namespace solidity::frontend
 {
 
-ASTJsonExporter::ASTJsonExporter(CompilerStack::State _stackState, map<string, unsigned> _sourceIndices):
+ASTJsonExporter::ASTJsonExporter(CompilerStack::State _stackState, std::map<std::string, unsigned> _sourceIndices):
 	m_stackState(_stackState),
 	m_sourceIndices(std::move(_sourceIndices))
 {
@@ -82,21 +81,21 @@ ASTJsonExporter::ASTJsonExporter(CompilerStack::State _stackState, map<string, u
 
 void ASTJsonExporter::setJsonNode(
 	ASTNode const& _node,
-	string const& _nodeName,
-	initializer_list<pair<string, Json::Value>>&& _attributes
+	std::string const& _nodeName,
+	std::initializer_list<std::pair<std::string, Json::Value>>&& _attributes
 )
 {
 	ASTJsonExporter::setJsonNode(
 		_node,
 		_nodeName,
-		std::vector<pair<string, Json::Value>>(std::move(_attributes))
+		std::vector<std::pair<std::string, Json::Value>>(std::move(_attributes))
 	);
 }
 
 void ASTJsonExporter::setJsonNode(
 	ASTNode const& _node,
-	string const& _nodeType,
-	std::vector<pair<string, Json::Value>>&& _attributes
+	std::string const& _nodeType,
+	std::vector<std::pair<std::string, Json::Value>>&& _attributes
 )
 {
 	m_currentValue = Json::objectValue;
@@ -110,24 +109,24 @@ void ASTJsonExporter::setJsonNode(
 		m_currentValue[e.first] = std::move(e.second);
 }
 
-optional<size_t> ASTJsonExporter::sourceIndexFromLocation(SourceLocation const& _location) const
+std::optional<size_t> ASTJsonExporter::sourceIndexFromLocation(SourceLocation const& _location) const
 {
 	if (_location.sourceName && m_sourceIndices.count(*_location.sourceName))
 		return m_sourceIndices.at(*_location.sourceName);
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
-string ASTJsonExporter::sourceLocationToString(SourceLocation const& _location) const
+std::string ASTJsonExporter::sourceLocationToString(SourceLocation const& _location) const
 {
-	optional<size_t> sourceIndexOpt = sourceIndexFromLocation(_location);
+	std::optional<size_t> sourceIndexOpt = sourceIndexFromLocation(_location);
 	int length = -1;
 	if (_location.start >= 0 && _location.end >= 0)
 		length = _location.end - _location.start;
-	return to_string(_location.start) + ":" + to_string(length) + ":" + (sourceIndexOpt.has_value() ? to_string(sourceIndexOpt.value()) : "-1");
+	return std::to_string(_location.start) + ":" + std::to_string(length) + ":" + (sourceIndexOpt.has_value() ? std::to_string(sourceIndexOpt.value()) : "-1");
 }
 
-Json::Value ASTJsonExporter::sourceLocationsToJson(vector<SourceLocation> const& _sourceLocations) const
+Json::Value ASTJsonExporter::sourceLocationsToJson(std::vector<SourceLocation> const& _sourceLocations) const
 {
 	Json::Value locations = Json::arrayValue;
 
@@ -137,7 +136,7 @@ Json::Value ASTJsonExporter::sourceLocationsToJson(vector<SourceLocation> const&
 	return locations;
 }
 
-string ASTJsonExporter::namePathToString(std::vector<ASTString> const& _namePath)
+std::string ASTJsonExporter::namePathToString(std::vector<ASTString> const& _namePath)
 {
 	return boost::algorithm::join(_namePath, "."s);
 }
@@ -164,13 +163,13 @@ Json::Value ASTJsonExporter::typePointerToJson(std::optional<FuncCallArguments>
 }
 
 void ASTJsonExporter::appendExpressionAttributes(
-	std::vector<pair<string, Json::Value>>& _attributes,
+	std::vector<std::pair<std::string, Json::Value>>& _attributes,
 	ExpressionAnnotation const& _annotation
 )
 {
-	std::vector<pair<string, Json::Value>> exprAttributes = {
-		make_pair("typeDescriptions", typePointerToJson(_annotation.type)),
-		make_pair("argumentTypes", typePointerToJson(_annotation.arguments))
+	std::vector<std::pair<std::string, Json::Value>> exprAttributes = {
+		std::make_pair("typeDescriptions", typePointerToJson(_annotation.type)),
+		std::make_pair("argumentTypes", typePointerToJson(_annotation.arguments))
 	};
 
 	addIfSet(exprAttributes, "isLValue", _annotation.isLValue);
@@ -183,7 +182,7 @@ void ASTJsonExporter::appendExpressionAttributes(
 	_attributes += exprAttributes;
 }
 
-Json::Value ASTJsonExporter::inlineAssemblyIdentifierToJson(pair<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const
+Json::Value ASTJsonExporter::inlineAssemblyIdentifierToJson(std::pair<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> _info) const
 {
 	Json::Value tuple(Json::objectValue);
 	tuple["src"] = sourceLocationToString(nativeLocationOf(*_info.first));
@@ -199,7 +198,7 @@ Json::Value ASTJsonExporter::inlineAssemblyIdentifierToJson(pair<yul::Identifier
 	return tuple;
 }
 
-void ASTJsonExporter::print(ostream& _stream, ASTNode const& _node, util::JsonFormat const& _format)
+void ASTJsonExporter::print(std::ostream& _stream, ASTNode const& _node, util::JsonFormat const& _format)
 {
 	_stream << util::jsonPrint(toJson(_node), _format);
 }
@@ -212,9 +211,9 @@ Json::Value ASTJsonExporter::toJson(ASTNode const& _node)
 
 bool ASTJsonExporter::visit(SourceUnit const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("license", _node.licenseString() ? Json::Value(*_node.licenseString()) : Json::nullValue),
-		make_pair("nodes", toJson(_node.nodes())),
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("license", _node.licenseString() ? Json::Value(*_node.licenseString()) : Json::nullValue),
+		std::make_pair("nodes", toJson(_node.nodes())),
 	};
 
 	if (_node.experimentalSolidity())
@@ -246,17 +245,17 @@ bool ASTJsonExporter::visit(PragmaDirective const& _node)
 	for (auto const& literal: _node.literals())
 		literals.append(literal);
 	setJsonNode(_node, "PragmaDirective", {
-		make_pair("literals", std::move(literals))
+		std::make_pair("literals", std::move(literals))
 	});
 	return false;
 }
 
 bool ASTJsonExporter::visit(ImportDirective const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("file", _node.path()),
-		make_pair("sourceUnit", idOrNull(_node.annotation().sourceUnit)),
-		make_pair("scope", idOrNull(_node.scope()))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("file", _node.path()),
+		std::make_pair("sourceUnit", idOrNull(_node.annotation().sourceUnit)),
+		std::make_pair("scope", idOrNull(_node.scope()))
 	};
 
 	addIfSet(attributes, "absolutePath", _node.annotation().absolutePath);
@@ -281,19 +280,19 @@ bool ASTJsonExporter::visit(ImportDirective const& _node)
 
 bool ASTJsonExporter::visit(ContractDefinition const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("name", _node.name()),
-		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		make_pair("contractKind", contractKind(_node.contractKind())),
-		make_pair("abstract", _node.abstract()),
-		make_pair("baseContracts", toJson(_node.baseContracts())),
-		make_pair("contractDependencies", getContainerIds(_node.annotation().contractDependencies | ranges::views::keys)),
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("name", _node.name()),
+		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
+		std::make_pair("contractKind", contractKind(_node.contractKind())),
+		std::make_pair("abstract", _node.abstract()),
+		std::make_pair("baseContracts", toJson(_node.baseContracts())),
+		std::make_pair("contractDependencies", getContainerIds(_node.annotation().contractDependencies | ranges::views::keys)),
 		// Do not require call graph because the AST is also created for incorrect sources.
-		make_pair("usedEvents", getContainerIds(_node.interfaceEvents(false))),
-		make_pair("usedErrors", getContainerIds(_node.interfaceErrors(false))),
-		make_pair("nodes", toJson(_node.subNodes())),
-		make_pair("scope", idOrNull(_node.scope()))
+		std::make_pair("usedEvents", getContainerIds(_node.interfaceEvents(false))),
+		std::make_pair("usedErrors", getContainerIds(_node.interfaceErrors(false))),
+		std::make_pair("nodes", toJson(_node.subNodes())),
+		std::make_pair("scope", idOrNull(_node.scope()))
 	};
 	addIfSet(attributes, "canonicalName", _node.annotation().canonicalName);
 
@@ -306,7 +305,7 @@ bool ASTJsonExporter::visit(ContractDefinition const& _node)
 	{
 		Json::Value internalFunctionIDs(Json::objectValue);
 		for (auto const& [functionDefinition, internalFunctionID]: _node.annotation().internalFunctionIDs)
-			internalFunctionIDs[to_string(functionDefinition->id())] = internalFunctionID;
+			internalFunctionIDs[std::to_string(functionDefinition->id())] = internalFunctionID;
 		attributes.emplace_back("internalFunctionIDs", std::move(internalFunctionIDs));
 	}
 
@@ -322,9 +321,9 @@ bool ASTJsonExporter::visit(IdentifierPath const& _node)
 		nameLocations.append(sourceLocationToString(location));
 
 	setJsonNode(_node, "IdentifierPath", {
-		make_pair("name", namePathToString(_node.path())),
-		make_pair("nameLocations", nameLocations),
-		make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration))
+		std::make_pair("name", namePathToString(_node.path())),
+		std::make_pair("nameLocations", nameLocations),
+		std::make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration))
 	});
 	return false;
 }
@@ -332,16 +331,16 @@ bool ASTJsonExporter::visit(IdentifierPath const& _node)
 bool ASTJsonExporter::visit(InheritanceSpecifier const& _node)
 {
 	setJsonNode(_node, "InheritanceSpecifier", {
-		make_pair("baseName", toJson(_node.name())),
-		make_pair("arguments", _node.arguments() ? toJson(*_node.arguments()) : Json::nullValue)
+		std::make_pair("baseName", toJson(_node.name())),
+		std::make_pair("arguments", _node.arguments() ? toJson(*_node.arguments()) : Json::nullValue)
 	});
 	return false;
 }
 
 bool ASTJsonExporter::visit(UsingForDirective const& _node)
 {
-	vector<pair<string, Json::Value>> attributes = {
-		make_pair("typeName", _node.typeName() ? toJson(*_node.typeName()) : Json::nullValue)
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("typeName", _node.typeName() ? toJson(*_node.typeName()) : Json::nullValue)
 	};
 
 	if (_node.usesBraces())
@@ -355,7 +354,7 @@ bool ASTJsonExporter::visit(UsingForDirective const& _node)
 			else
 			{
 				functionNode["definition"] = toJson(*function);
-				functionNode["operator"] = string(TokenTraits::toString(*op));
+				functionNode["operator"] = std::string(TokenTraits::toString(*op));
 			}
 			functionList.append(std::move(functionNode));
 		}
@@ -377,13 +376,13 @@ bool ASTJsonExporter::visit(UsingForDirective const& _node)
 
 bool ASTJsonExporter::visit(StructDefinition const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("name", _node.name()),
-		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
-		make_pair("members", toJson(_node.members())),
-		make_pair("scope", idOrNull(_node.scope()))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("name", _node.name()),
+		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
+		std::make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
+		std::make_pair("members", toJson(_node.members())),
+		std::make_pair("scope", idOrNull(_node.scope()))
 	};
 
 	addIfSet(attributes,"canonicalName", _node.annotation().canonicalName);
@@ -395,11 +394,11 @@ bool ASTJsonExporter::visit(StructDefinition const& _node)
 
 bool ASTJsonExporter::visit(EnumDefinition const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("name", _node.name()),
-		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		make_pair("members", toJson(_node.members()))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("name", _node.name()),
+		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
+		std::make_pair("members", toJson(_node.members()))
 	};
 
 	addIfSet(attributes,"canonicalName", _node.annotation().canonicalName);
@@ -412,8 +411,8 @@ bool ASTJsonExporter::visit(EnumDefinition const& _node)
 bool ASTJsonExporter::visit(EnumValue const& _node)
 {
 	setJsonNode(_node, "EnumValue", {
-		make_pair("name", _node.name()),
-		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		std::make_pair("name", _node.name()),
+		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
 	});
 	return false;
 }
@@ -421,10 +420,10 @@ bool ASTJsonExporter::visit(EnumValue const& _node)
 bool ASTJsonExporter::visit(UserDefinedValueTypeDefinition const& _node)
 {
 	solAssert(_node.underlyingType(), "");
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("name", _node.name()),
-		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		make_pair("underlyingType", toJson(*_node.underlyingType()))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("name", _node.name()),
+		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		std::make_pair("underlyingType", toJson(*_node.underlyingType()))
 	};
 	addIfSet(attributes, "canonicalName", _node.annotation().canonicalName);
 
@@ -436,7 +435,7 @@ bool ASTJsonExporter::visit(UserDefinedValueTypeDefinition const& _node)
 bool ASTJsonExporter::visit(ParameterList const& _node)
 {
 	setJsonNode(_node, "ParameterList", {
-		make_pair("parameters", toJson(_node.parameters()))
+		std::make_pair("parameters", toJson(_node.parameters()))
 	});
 	return false;
 }
@@ -444,30 +443,30 @@ bool ASTJsonExporter::visit(ParameterList const& _node)
 bool ASTJsonExporter::visit(OverrideSpecifier const& _node)
 {
 	setJsonNode(_node, "OverrideSpecifier", {
-		make_pair("overrides", toJson(_node.overrides()))
+		std::make_pair("overrides", toJson(_node.overrides()))
 	});
 	return false;
 }
 
 bool ASTJsonExporter::visit(FunctionDefinition const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("name", _node.name()),
-		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		make_pair("kind", _node.isFree() ? "freeFunction" : TokenTraits::toString(_node.kind())),
-		make_pair("stateMutability", stateMutabilityToString(_node.stateMutability())),
-		make_pair("virtual", _node.markedVirtual()),
-		make_pair("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json::nullValue),
-		make_pair("parameters", toJson(_node.parameterList())),
-		make_pair("returnParameters", toJson(*_node.returnParameterList())),
-		make_pair("modifiers", toJson(_node.modifiers())),
-		make_pair("body", _node.isImplemented() ? toJson(_node.body()) : Json::nullValue),
-		make_pair("implemented", _node.isImplemented()),
-		make_pair("scope", idOrNull(_node.scope()))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("name", _node.name()),
+		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
+		std::make_pair("kind", _node.isFree() ? "freeFunction" : TokenTraits::toString(_node.kind())),
+		std::make_pair("stateMutability", stateMutabilityToString(_node.stateMutability())),
+		std::make_pair("virtual", _node.markedVirtual()),
+		std::make_pair("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json::nullValue),
+		std::make_pair("parameters", toJson(_node.parameterList())),
+		std::make_pair("returnParameters", toJson(*_node.returnParameterList())),
+		std::make_pair("modifiers", toJson(_node.modifiers())),
+		std::make_pair("body", _node.isImplemented() ? toJson(_node.body()) : Json::nullValue),
+		std::make_pair("implemented", _node.isImplemented()),
+		std::make_pair("scope", idOrNull(_node.scope()))
 	};
 
-	optional<Visibility> visibility;
+	std::optional<Visibility> visibility;
 	if (_node.isConstructor())
 	{
 		if (_node.annotation().contract)
@@ -482,7 +481,7 @@ bool ASTJsonExporter::visit(FunctionDefinition const& _node)
 	if (_node.isPartOfExternalInterface() && m_stackState > CompilerStack::State::ParsedAndImported)
 		attributes.emplace_back("functionSelector", _node.externalIdentifierHex());
 	if (!_node.annotation().baseFunctions.empty())
-		attributes.emplace_back(make_pair("baseFunctions", getContainerIds(_node.annotation().baseFunctions, true)));
+		attributes.emplace_back(std::make_pair("baseFunctions", getContainerIds(_node.annotation().baseFunctions, true)));
 
 	setJsonNode(_node, "FunctionDefinition", std::move(attributes));
 	return false;
@@ -490,19 +489,19 @@ bool ASTJsonExporter::visit(FunctionDefinition const& _node)
 
 bool ASTJsonExporter::visit(VariableDeclaration const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("name", _node.name()),
-		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		make_pair("typeName", toJson(_node.typeName())),
-		make_pair("constant", _node.isConstant()),
-		make_pair("mutability", VariableDeclaration::mutabilityToString(_node.mutability())),
-		make_pair("stateVariable", _node.isStateVariable()),
-		make_pair("storageLocation", location(_node.referenceLocation())),
-		make_pair("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json::nullValue),
-		make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
-		make_pair("value", _node.value() ? toJson(*_node.value()) : Json::nullValue),
-		make_pair("scope", idOrNull(_node.scope())),
-		make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("name", _node.name()),
+		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		std::make_pair("typeName", toJson(_node.typeName())),
+		std::make_pair("constant", _node.isConstant()),
+		std::make_pair("mutability", VariableDeclaration::mutabilityToString(_node.mutability())),
+		std::make_pair("stateVariable", _node.isStateVariable()),
+		std::make_pair("storageLocation", location(_node.referenceLocation())),
+		std::make_pair("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json::nullValue),
+		std::make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
+		std::make_pair("value", _node.value() ? toJson(*_node.value()) : Json::nullValue),
+		std::make_pair("scope", idOrNull(_node.scope())),
+		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
 	};
 	if (_node.isStateVariable() && _node.isPublic())
 		attributes.emplace_back("functionSelector", _node.externalIdentifierHex());
@@ -511,34 +510,34 @@ bool ASTJsonExporter::visit(VariableDeclaration const& _node)
 	if (m_inEvent)
 		attributes.emplace_back("indexed", _node.isIndexed());
 	if (!_node.annotation().baseFunctions.empty())
-		attributes.emplace_back(make_pair("baseFunctions", getContainerIds(_node.annotation().baseFunctions, true)));
+		attributes.emplace_back(std::make_pair("baseFunctions", getContainerIds(_node.annotation().baseFunctions, true)));
 	setJsonNode(_node, "VariableDeclaration", std::move(attributes));
 	return false;
 }
 
 bool ASTJsonExporter::visit(ModifierDefinition const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("name", _node.name()),
-		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
-		make_pair("parameters", toJson(_node.parameterList())),
-		make_pair("virtual", _node.markedVirtual()),
-		make_pair("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json::nullValue),
-		make_pair("body", _node.isImplemented() ? toJson(_node.body()) : Json::nullValue)
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("name", _node.name()),
+		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
+		std::make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
+		std::make_pair("parameters", toJson(_node.parameterList())),
+		std::make_pair("virtual", _node.markedVirtual()),
+		std::make_pair("overrides", _node.overrides() ? toJson(*_node.overrides()) : Json::nullValue),
+		std::make_pair("body", _node.isImplemented() ? toJson(_node.body()) : Json::nullValue)
 	};
 	if (!_node.annotation().baseFunctions.empty())
-		attributes.emplace_back(make_pair("baseModifiers", getContainerIds(_node.annotation().baseFunctions, true)));
+		attributes.emplace_back(std::make_pair("baseModifiers", getContainerIds(_node.annotation().baseFunctions, true)));
 	setJsonNode(_node, "ModifierDefinition", std::move(attributes));
 	return false;
 }
 
 bool ASTJsonExporter::visit(ModifierInvocation const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes{
-		make_pair("modifierName", toJson(_node.name())),
-		make_pair("arguments", _node.arguments() ? toJson(*_node.arguments()) : Json::nullValue)
+	std::vector<std::pair<std::string, Json::Value>> attributes{
+		std::make_pair("modifierName", toJson(_node.name())),
+		std::make_pair("arguments", _node.arguments() ? toJson(*_node.arguments()) : Json::nullValue)
 	};
 	if (Declaration const* declaration = _node.name().annotation().referencedDeclaration)
 	{
@@ -554,16 +553,16 @@ bool ASTJsonExporter::visit(ModifierInvocation const& _node)
 bool ASTJsonExporter::visit(EventDefinition const& _node)
 {
 	m_inEvent = true;
-	std::vector<pair<string, Json::Value>> _attributes = {
-		make_pair("name", _node.name()),
-		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		make_pair("parameters", toJson(_node.parameterList())),
-		make_pair("anonymous", _node.isAnonymous())
+	std::vector<std::pair<std::string, Json::Value>> _attributes = {
+		std::make_pair("name", _node.name()),
+		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
+		std::make_pair("parameters", toJson(_node.parameterList())),
+		std::make_pair("anonymous", _node.isAnonymous())
 	};
 	if (m_stackState >= CompilerStack::State::AnalysisPerformed)
 			_attributes.emplace_back(
-				make_pair(
+				std::make_pair(
 					"eventSelector",
 					toHex(u256(util::h256::Arith(util::keccak256(_node.functionType(true)->externalSignature()))))
 				));
@@ -574,14 +573,14 @@ bool ASTJsonExporter::visit(EventDefinition const& _node)
 
 bool ASTJsonExporter::visit(ErrorDefinition const& _node)
 {
-	std::vector<pair<string, Json::Value>> _attributes = {
-		make_pair("name", _node.name()),
-		make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
-		make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
-		make_pair("parameters", toJson(_node.parameterList()))
+	std::vector<std::pair<std::string, Json::Value>> _attributes = {
+		std::make_pair("name", _node.name()),
+		std::make_pair("nameLocation", sourceLocationToString(_node.nameLocation())),
+		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
+		std::make_pair("parameters", toJson(_node.parameterList()))
 	};
 	if (m_stackState >= CompilerStack::State::AnalysisPerformed)
-		_attributes.emplace_back(make_pair("errorSelector", _node.functionType(true)->externalIdentifierHex()));
+		_attributes.emplace_back(std::make_pair("errorSelector", _node.functionType(true)->externalIdentifierHex()));
 
 	setJsonNode(_node, "ErrorDefinition", std::move(_attributes));
 	return false;
@@ -589,13 +588,13 @@ bool ASTJsonExporter::visit(ErrorDefinition const& _node)
 
 bool ASTJsonExporter::visit(ElementaryTypeName const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("name", _node.typeName().toString()),
-		make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("name", _node.typeName().toString()),
+		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
 	};
 
 	if (_node.stateMutability())
-		attributes.emplace_back(make_pair("stateMutability", stateMutabilityToString(*_node.stateMutability())));
+		attributes.emplace_back(std::make_pair("stateMutability", stateMutabilityToString(*_node.stateMutability())));
 
 	setJsonNode(_node, "ElementaryTypeName", std::move(attributes));
 	return false;
@@ -604,9 +603,9 @@ bool ASTJsonExporter::visit(ElementaryTypeName const& _node)
 bool ASTJsonExporter::visit(UserDefinedTypeName const& _node)
 {
 	setJsonNode(_node, "UserDefinedTypeName", {
-		make_pair("pathNode", toJson(_node.pathNode())),
-		make_pair("referencedDeclaration", idOrNull(_node.pathNode().annotation().referencedDeclaration)),
-		make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
+		std::make_pair("pathNode", toJson(_node.pathNode())),
+		std::make_pair("referencedDeclaration", idOrNull(_node.pathNode().annotation().referencedDeclaration)),
+		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
 	});
 	return false;
 }
@@ -614,11 +613,11 @@ bool ASTJsonExporter::visit(UserDefinedTypeName const& _node)
 bool ASTJsonExporter::visit(FunctionTypeName const& _node)
 {
 	setJsonNode(_node, "FunctionTypeName", {
-		make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
-		make_pair("stateMutability", stateMutabilityToString(_node.stateMutability())),
-		make_pair("parameterTypes", toJson(*_node.parameterTypeList())),
-		make_pair("returnParameterTypes", toJson(*_node.returnParameterTypeList())),
-		make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
+		std::make_pair("visibility", Declaration::visibilityToString(_node.visibility())),
+		std::make_pair("stateMutability", stateMutabilityToString(_node.stateMutability())),
+		std::make_pair("parameterTypes", toJson(*_node.parameterTypeList())),
+		std::make_pair("returnParameterTypes", toJson(*_node.returnParameterTypeList())),
+		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
 	});
 	return false;
 }
@@ -626,13 +625,13 @@ bool ASTJsonExporter::visit(FunctionTypeName const& _node)
 bool ASTJsonExporter::visit(Mapping const& _node)
 {
 	setJsonNode(_node, "Mapping", {
-		make_pair("keyType", toJson(_node.keyType())),
-		make_pair("keyName", _node.keyName()),
-		make_pair("keyNameLocation", sourceLocationToString(_node.keyNameLocation())),
-		make_pair("valueType", toJson(_node.valueType())),
-		make_pair("valueName", _node.valueName()),
-		make_pair("valueNameLocation", sourceLocationToString(_node.valueNameLocation())),
-		make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
+		std::make_pair("keyType", toJson(_node.keyType())),
+		std::make_pair("keyName", _node.keyName()),
+		std::make_pair("keyNameLocation", sourceLocationToString(_node.keyNameLocation())),
+		std::make_pair("valueType", toJson(_node.valueType())),
+		std::make_pair("valueName", _node.valueName()),
+		std::make_pair("valueNameLocation", sourceLocationToString(_node.valueNameLocation())),
+		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
 	});
 	return false;
 }
@@ -640,20 +639,20 @@ bool ASTJsonExporter::visit(Mapping const& _node)
 bool ASTJsonExporter::visit(ArrayTypeName const& _node)
 {
 	setJsonNode(_node, "ArrayTypeName", {
-		make_pair("baseType", toJson(_node.baseType())),
-		make_pair("length", toJsonOrNull(_node.length())),
-		make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
+		std::make_pair("baseType", toJson(_node.baseType())),
+		std::make_pair("length", toJsonOrNull(_node.length())),
+		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type, true))
 	});
 	return false;
 }
 
 bool ASTJsonExporter::visit(InlineAssembly const& _node)
 {
-	vector<pair<string, Json::Value>> externalReferences;
+	std::vector<std::pair<std::string, Json::Value>> externalReferences;
 
 	for (auto const& it: _node.annotation().externalReferences)
 		if (it.first)
-			externalReferences.emplace_back(make_pair(
+			externalReferences.emplace_back(std::make_pair(
 				it.first->name.str(),
 				inlineAssemblyIdentifierToJson(it)
 			));
@@ -664,10 +663,10 @@ bool ASTJsonExporter::visit(InlineAssembly const& _node)
 	for (Json::Value& it: externalReferences | ranges::views::values)
 		externalReferencesJson.append(std::move(it));
 
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("AST", Json::Value(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations()))),
-		make_pair("externalReferences", std::move(externalReferencesJson)),
-		make_pair("evmVersion", dynamic_cast<solidity::yul::EVMDialect const&>(_node.dialect()).evmVersion().name())
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("AST", Json::Value(yul::AsmJsonConverter(sourceIndexFromLocation(_node.location()))(_node.operations()))),
+		std::make_pair("externalReferences", std::move(externalReferencesJson)),
+		std::make_pair("evmVersion", dynamic_cast<solidity::yul::EVMDialect const&>(_node.dialect()).evmVersion().name())
 	};
 
 	if (_node.flags())
@@ -678,7 +677,7 @@ bool ASTJsonExporter::visit(InlineAssembly const& _node)
 				flags.append(*flag);
 			else
 				flags.append(Json::nullValue);
-		attributes.emplace_back(make_pair("flags", std::move(flags)));
+		attributes.emplace_back(std::make_pair("flags", std::move(flags)));
 	}
 	setJsonNode(_node, "InlineAssembly", std::move(attributes));
 
@@ -688,7 +687,7 @@ bool ASTJsonExporter::visit(InlineAssembly const& _node)
 bool ASTJsonExporter::visit(Block const& _node)
 {
 	setJsonNode(_node, _node.unchecked() ? "UncheckedBlock" : "Block", {
-		make_pair("statements", toJson(_node.statements()))
+		std::make_pair("statements", toJson(_node.statements()))
 	});
 	return false;
 }
@@ -702,9 +701,9 @@ bool ASTJsonExporter::visit(PlaceholderStatement const& _node)
 bool ASTJsonExporter::visit(IfStatement const& _node)
 {
 	setJsonNode(_node, "IfStatement", {
-		make_pair("condition", toJson(_node.condition())),
-		make_pair("trueBody", toJson(_node.trueStatement())),
-		make_pair("falseBody", toJsonOrNull(_node.falseStatement()))
+		std::make_pair("condition", toJson(_node.condition())),
+		std::make_pair("trueBody", toJson(_node.trueStatement())),
+		std::make_pair("falseBody", toJsonOrNull(_node.falseStatement()))
 	});
 	return false;
 }
@@ -712,9 +711,9 @@ bool ASTJsonExporter::visit(IfStatement const& _node)
 bool ASTJsonExporter::visit(TryCatchClause const& _node)
 {
 	setJsonNode(_node, "TryCatchClause", {
-		make_pair("errorName", _node.errorName()),
-		make_pair("parameters", toJsonOrNull(_node.parameters())),
-		make_pair("block", toJson(_node.block()))
+		std::make_pair("errorName", _node.errorName()),
+		std::make_pair("parameters", toJsonOrNull(_node.parameters())),
+		std::make_pair("block", toJson(_node.block()))
 	});
 	return false;
 }
@@ -722,8 +721,8 @@ bool ASTJsonExporter::visit(TryCatchClause const& _node)
 bool ASTJsonExporter::visit(TryStatement const& _node)
 {
 	setJsonNode(_node, "TryStatement", {
-		make_pair("externalCall", toJson(_node.externalCall())),
-		make_pair("clauses", toJson(_node.clauses()))
+		std::make_pair("externalCall", toJson(_node.externalCall())),
+		std::make_pair("clauses", toJson(_node.clauses()))
 	});
 	return false;
 }
@@ -734,8 +733,8 @@ bool ASTJsonExporter::visit(WhileStatement const& _node)
 		_node,
 		_node.isDoWhile() ? "DoWhileStatement" : "WhileStatement",
 		{
-			make_pair("condition", toJson(_node.condition())),
-			make_pair("body", toJson(_node.body()))
+			std::make_pair("condition", toJson(_node.condition())),
+			std::make_pair("body", toJson(_node.body()))
 		}
 	);
 	return false;
@@ -744,10 +743,10 @@ bool ASTJsonExporter::visit(WhileStatement const& _node)
 bool ASTJsonExporter::visit(ForStatement const& _node)
 {
 	setJsonNode(_node, "ForStatement", {
-		make_pair("initializationExpression", toJsonOrNull(_node.initializationExpression())),
-		make_pair("condition", toJsonOrNull(_node.condition())),
-		make_pair("loopExpression", toJsonOrNull(_node.loopExpression())),
-		make_pair("body", toJson(_node.body()))
+		std::make_pair("initializationExpression", toJsonOrNull(_node.initializationExpression())),
+		std::make_pair("condition", toJsonOrNull(_node.condition())),
+		std::make_pair("loopExpression", toJsonOrNull(_node.loopExpression())),
+		std::make_pair("body", toJson(_node.body()))
 	});
 	return false;
 }
@@ -767,8 +766,8 @@ bool ASTJsonExporter::visit(Break const& _node)
 bool ASTJsonExporter::visit(Return const& _node)
 {
 	setJsonNode(_node, "Return", {
-		make_pair("expression", toJsonOrNull(_node.expression())),
-		make_pair("functionReturnParameters", idOrNull(_node.annotation().functionReturnParameters))
+		std::make_pair("expression", toJsonOrNull(_node.expression())),
+		std::make_pair("functionReturnParameters", idOrNull(_node.annotation().functionReturnParameters))
 	});
 	return false;
 }
@@ -782,7 +781,7 @@ bool ASTJsonExporter::visit(Throw const& _node)
 bool ASTJsonExporter::visit(EmitStatement const& _node)
 {
 	setJsonNode(_node, "EmitStatement", {
-		make_pair("eventCall", toJson(_node.eventCall()))
+		std::make_pair("eventCall", toJson(_node.eventCall()))
 	});
 	return false;
 }
@@ -790,7 +789,7 @@ bool ASTJsonExporter::visit(EmitStatement const& _node)
 bool ASTJsonExporter::visit(RevertStatement const& _node)
 {
 	setJsonNode(_node, "RevertStatement", {
-		make_pair("errorCall", toJson(_node.errorCall()))
+		std::make_pair("errorCall", toJson(_node.errorCall()))
 	});
 	return false;
 }
@@ -801,9 +800,9 @@ bool ASTJsonExporter::visit(VariableDeclarationStatement const& _node)
 	for (auto const& v: _node.declarations())
 		appendMove(varDecs, idOrNull(v.get()));
 	setJsonNode(_node, "VariableDeclarationStatement", {
-		make_pair("assignments", std::move(varDecs)),
-		make_pair("declarations", toJson(_node.declarations())),
-		make_pair("initialValue", toJsonOrNull(_node.initialValue()))
+		std::make_pair("assignments", std::move(varDecs)),
+		std::make_pair("declarations", toJson(_node.declarations())),
+		std::make_pair("initialValue", toJsonOrNull(_node.initialValue()))
 	});
 	return false;
 }
@@ -811,17 +810,17 @@ bool ASTJsonExporter::visit(VariableDeclarationStatement const& _node)
 bool ASTJsonExporter::visit(ExpressionStatement const& _node)
 {
 	setJsonNode(_node, "ExpressionStatement", {
-		make_pair("expression", toJson(_node.expression()))
+		std::make_pair("expression", toJson(_node.expression()))
 	});
 	return false;
 }
 
 bool ASTJsonExporter::visit(Conditional const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("condition", toJson(_node.condition())),
-		make_pair("trueExpression", toJson(_node.trueExpression())),
-		make_pair("falseExpression", toJson(_node.falseExpression()))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("condition", toJson(_node.condition())),
+		std::make_pair("trueExpression", toJson(_node.trueExpression())),
+		std::make_pair("falseExpression", toJson(_node.falseExpression()))
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
 	setJsonNode(_node, "Conditional", std::move(attributes));
@@ -830,10 +829,10 @@ bool ASTJsonExporter::visit(Conditional const& _node)
 
 bool ASTJsonExporter::visit(Assignment const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("operator", TokenTraits::toString(_node.assignmentOperator())),
-		make_pair("leftHandSide", toJson(_node.leftHandSide())),
-		make_pair("rightHandSide", toJson(_node.rightHandSide()))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("operator", TokenTraits::toString(_node.assignmentOperator())),
+		std::make_pair("leftHandSide", toJson(_node.leftHandSide())),
+		std::make_pair("rightHandSide", toJson(_node.rightHandSide()))
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
 	setJsonNode(_node, "Assignment", std::move(attributes));
@@ -842,9 +841,9 @@ bool ASTJsonExporter::visit(Assignment const& _node)
 
 bool ASTJsonExporter::visit(TupleExpression const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("isInlineArray", Json::Value(_node.isInlineArray())),
-		make_pair("components", toJson(_node.components())),
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("isInlineArray", Json::Value(_node.isInlineArray())),
+		std::make_pair("components", toJson(_node.components())),
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
 	setJsonNode(_node, "TupleExpression", std::move(attributes));
@@ -853,10 +852,10 @@ bool ASTJsonExporter::visit(TupleExpression const& _node)
 
 bool ASTJsonExporter::visit(UnaryOperation const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("prefix", _node.isPrefixOperation()),
-		make_pair("operator", TokenTraits::toString(_node.getOperator())),
-		make_pair("subExpression", toJson(_node.subExpression()))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("prefix", _node.isPrefixOperation()),
+		std::make_pair("operator", TokenTraits::toString(_node.getOperator())),
+		std::make_pair("subExpression", toJson(_node.subExpression()))
 	};
 	// NOTE: This annotation is guaranteed to be set but only if we didn't stop at the parsing stage.
 	if (_node.annotation().userDefinedFunction.set() && *_node.annotation().userDefinedFunction != nullptr)
@@ -868,11 +867,11 @@ bool ASTJsonExporter::visit(UnaryOperation const& _node)
 
 bool ASTJsonExporter::visit(BinaryOperation const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("operator", TokenTraits::toString(_node.getOperator())),
-		make_pair("leftExpression", toJson(_node.leftExpression())),
-		make_pair("rightExpression", toJson(_node.rightExpression())),
-		make_pair("commonType", typePointerToJson(_node.annotation().commonType)),
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("operator", TokenTraits::toString(_node.getOperator())),
+		std::make_pair("leftExpression", toJson(_node.leftExpression())),
+		std::make_pair("rightExpression", toJson(_node.rightExpression())),
+		std::make_pair("commonType", typePointerToJson(_node.annotation().commonType)),
 	};
 	// NOTE: This annotation is guaranteed to be set but only if we didn't stop at the parsing stage.
 	if (_node.annotation().userDefinedFunction.set() && *_node.annotation().userDefinedFunction != nullptr)
@@ -887,12 +886,12 @@ bool ASTJsonExporter::visit(FunctionCall const& _node)
 	Json::Value names(Json::arrayValue);
 	for (auto const& name: _node.names())
 		names.append(Json::Value(*name));
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("expression", toJson(_node.expression())),
-		make_pair("names", std::move(names)),
-		make_pair("nameLocations", sourceLocationsToJson(_node.nameLocations())),
-		make_pair("arguments", toJson(_node.arguments())),
-		make_pair("tryCall", _node.annotation().tryCall)
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("expression", toJson(_node.expression())),
+		std::make_pair("names", std::move(names)),
+		std::make_pair("nameLocations", sourceLocationsToJson(_node.nameLocations())),
+		std::make_pair("arguments", toJson(_node.arguments())),
+		std::make_pair("tryCall", _node.annotation().tryCall)
 	};
 
 	if (_node.annotation().kind.set())
@@ -912,10 +911,10 @@ bool ASTJsonExporter::visit(FunctionCallOptions const& _node)
 	for (auto const& name: _node.names())
 		names.append(Json::Value(*name));
 
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("expression", toJson(_node.expression())),
-		make_pair("names", std::move(names)),
-		make_pair("options", toJson(_node.options())),
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("expression", toJson(_node.expression())),
+		std::make_pair("names", std::move(names)),
+		std::make_pair("options", toJson(_node.options())),
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
 
@@ -925,8 +924,8 @@ bool ASTJsonExporter::visit(FunctionCallOptions const& _node)
 
 bool ASTJsonExporter::visit(NewExpression const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("typeName", toJson(_node.typeName()))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("typeName", toJson(_node.typeName()))
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
 	setJsonNode(_node, "NewExpression", std::move(attributes));
@@ -935,11 +934,11 @@ bool ASTJsonExporter::visit(NewExpression const& _node)
 
 bool ASTJsonExporter::visit(MemberAccess const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("memberName", _node.memberName()),
-		make_pair("memberLocation", Json::Value(sourceLocationToString(_node.memberLocation()))),
-		make_pair("expression", toJson(_node.expression())),
-		make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration)),
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("memberName", _node.memberName()),
+		std::make_pair("memberLocation", Json::Value(sourceLocationToString(_node.memberLocation()))),
+		std::make_pair("expression", toJson(_node.expression())),
+		std::make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration)),
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
 	setJsonNode(_node, "MemberAccess", std::move(attributes));
@@ -948,9 +947,9 @@ bool ASTJsonExporter::visit(MemberAccess const& _node)
 
 bool ASTJsonExporter::visit(IndexAccess const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("baseExpression", toJson(_node.baseExpression())),
-		make_pair("indexExpression", toJsonOrNull(_node.indexExpression())),
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("baseExpression", toJson(_node.baseExpression())),
+		std::make_pair("indexExpression", toJsonOrNull(_node.indexExpression())),
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
 	setJsonNode(_node, "IndexAccess", std::move(attributes));
@@ -959,10 +958,10 @@ bool ASTJsonExporter::visit(IndexAccess const& _node)
 
 bool ASTJsonExporter::visit(IndexRangeAccess const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("baseExpression", toJson(_node.baseExpression())),
-		make_pair("startExpression", toJsonOrNull(_node.startExpression())),
-		make_pair("endExpression", toJsonOrNull(_node.endExpression())),
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("baseExpression", toJson(_node.baseExpression())),
+		std::make_pair("startExpression", toJsonOrNull(_node.startExpression())),
+		std::make_pair("endExpression", toJsonOrNull(_node.endExpression())),
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
 	setJsonNode(_node, "IndexRangeAccess", std::move(attributes));
@@ -975,19 +974,19 @@ bool ASTJsonExporter::visit(Identifier const& _node)
 	for (auto const& dec: _node.annotation().overloadedDeclarations)
 		overloads.append(nodeId(*dec));
 	setJsonNode(_node, "Identifier", {
-		make_pair("name", _node.name()),
-		make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration)),
-		make_pair("overloadedDeclarations", overloads),
-		make_pair("typeDescriptions", typePointerToJson(_node.annotation().type)),
-		make_pair("argumentTypes", typePointerToJson(_node.annotation().arguments))
+		std::make_pair("name", _node.name()),
+		std::make_pair("referencedDeclaration", idOrNull(_node.annotation().referencedDeclaration)),
+		std::make_pair("overloadedDeclarations", overloads),
+		std::make_pair("typeDescriptions", typePointerToJson(_node.annotation().type)),
+		std::make_pair("argumentTypes", typePointerToJson(_node.annotation().arguments))
 	});
 	return false;
 }
 
 bool ASTJsonExporter::visit(ElementaryTypeNameExpression const& _node)
 {
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("typeName", toJson(_node.type()))
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("typeName", toJson(_node.type()))
 	};
 	appendExpressionAttributes(attributes, _node.annotation());
 	setJsonNode(_node, "ElementaryTypeNameExpression", std::move(attributes));
@@ -1000,11 +999,11 @@ bool ASTJsonExporter::visit(Literal const& _node)
 	if (!util::validateUTF8(_node.value()))
 		value = Json::nullValue;
 	Token subdenomination = Token(_node.subDenomination());
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("kind", literalTokenKind(_node.token())),
-		make_pair("value", value),
-		make_pair("hexValue", util::toHex(util::asBytes(_node.value()))),
-		make_pair(
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("kind", literalTokenKind(_node.token())),
+		std::make_pair("value", value),
+		std::make_pair("hexValue", util::toHex(util::asBytes(_node.value()))),
+		std::make_pair(
 			"subdenomination",
 			subdenomination == Token::Illegal ?
 			Json::nullValue :
@@ -1019,8 +1018,8 @@ bool ASTJsonExporter::visit(Literal const& _node)
 bool ASTJsonExporter::visit(StructuredDocumentation const& _node)
 {
 	Json::Value text{*_node.text()};
-	std::vector<pair<string, Json::Value>> attributes = {
-		make_pair("text", text)
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
+		std::make_pair("text", text)
 	};
 	setJsonNode(_node, "StructuredDocumentation", std::move(attributes));
 	return false;
@@ -1033,7 +1032,7 @@ void ASTJsonExporter::endVisit(EventDefinition const&)
 	m_inEvent = false;
 }
 
-string ASTJsonExporter::location(VariableDeclaration::Location _location)
+std::string ASTJsonExporter::location(VariableDeclaration::Location _location)
 {
 	switch (_location)
 	{
@@ -1050,7 +1049,7 @@ string ASTJsonExporter::location(VariableDeclaration::Location _location)
 	return {};
 }
 
-string ASTJsonExporter::contractKind(ContractKind _kind)
+std::string ASTJsonExporter::contractKind(ContractKind _kind)
 {
 	switch (_kind)
 	{
@@ -1066,7 +1065,7 @@ string ASTJsonExporter::contractKind(ContractKind _kind)
 	return {};
 }
 
-string ASTJsonExporter::functionCallKind(FunctionCallKind _kind)
+std::string ASTJsonExporter::functionCallKind(FunctionCallKind _kind)
 {
 	switch (_kind)
 	{
@@ -1081,7 +1080,7 @@ string ASTJsonExporter::functionCallKind(FunctionCallKind _kind)
 	}
 }
 
-string ASTJsonExporter::literalTokenKind(Token _token)
+std::string ASTJsonExporter::literalTokenKind(Token _token)
 {
 	switch (_token)
 	{
@@ -1101,12 +1100,12 @@ string ASTJsonExporter::literalTokenKind(Token _token)
 	}
 }
 
-string ASTJsonExporter::type(Expression const& _expression)
+std::string ASTJsonExporter::type(Expression const& _expression)
 {
 	return _expression.annotation().type ? _expression.annotation().type->toString() : "Unknown";
 }
 
-string ASTJsonExporter::type(VariableDeclaration const& _varDecl)
+std::string ASTJsonExporter::type(VariableDeclaration const& _varDecl)
 {
 	return _varDecl.annotation().type ? _varDecl.annotation().type->toString() : "Unknown";
 }
diff --git a/libsolidity/ast/ASTJsonImporter.cpp b/libsolidity/ast/ASTJsonImporter.cpp
index dd7098aabf..6e6dd9eb5e 100644
--- a/libsolidity/ast/ASTJsonImporter.cpp
+++ b/libsolidity/ast/ASTJsonImporter.cpp
@@ -37,8 +37,6 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string.hpp>
 
-using namespace std;
-
 namespace solidity::frontend
 {
 
@@ -50,16 +48,16 @@ ASTPointer<T> ASTJsonImporter::nullOrCast(Json::Value const& _json)
 	if (_json.isNull())
 		return nullptr;
 	else
-		return dynamic_pointer_cast<T>(convertJsonToASTNode(_json));
+		return std::dynamic_pointer_cast<T>(convertJsonToASTNode(_json));
 }
 
 
 // ============ public ===========================
 
-map<string, ASTPointer<SourceUnit>> ASTJsonImporter::jsonToSourceUnit(map<string, Json::Value> const& _sourceList)
+std::map<std::string, ASTPointer<SourceUnit>> ASTJsonImporter::jsonToSourceUnit(std::map<std::string, Json::Value> const& _sourceList)
 {
 	for (auto const& src: _sourceList)
-		m_sourceNames.emplace_back(make_shared<string const>(src.first));
+		m_sourceNames.emplace_back(std::make_shared<std::string const>(src.first));
 	for (auto const& srcPair: _sourceList)
 	{
 		astAssert(!srcPair.second.isNull());
@@ -81,7 +79,7 @@ ASTPointer<T> ASTJsonImporter::createASTNode(Json::Value const& _node, Args&&...
 
 	astAssert(m_usedIDs.insert(id).second, "Found duplicate node ID!");
 
-	auto n = make_shared<T>(
+	auto n = std::make_shared<T>(
 		id,
 		createSourceLocation(_node),
 		std::forward<Args>(_args)...
@@ -96,9 +94,9 @@ SourceLocation const ASTJsonImporter::createSourceLocation(Json::Value const& _n
 	return solidity::langutil::parseSourceLocation(_node["src"].asString(), m_sourceNames);
 }
 
-optional<vector<SourceLocation>> ASTJsonImporter::createSourceLocations(Json::Value const& _node) const
+std::optional<std::vector<SourceLocation>> ASTJsonImporter::createSourceLocations(Json::Value const& _node) const
 {
-	vector<SourceLocation> locations;
+	std::vector<SourceLocation> locations;
 
 	if (_node.isMember("nameLocations") && _node["nameLocations"].isArray())
 	{
@@ -107,7 +105,7 @@ optional<vector<SourceLocation>> ASTJsonImporter::createSourceLocations(Json::Va
 		return locations;
 	}
 
-	return nullopt;
+	return std::nullopt;
 }
 
 SourceLocation ASTJsonImporter::createNameSourceLocation(Json::Value const& _node)
@@ -134,7 +132,7 @@ SourceLocation ASTJsonImporter::createValueNameSourceLocation(Json::Value const&
 template<class T>
 ASTPointer<T> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _node)
 {
-	ASTPointer<T> ret = dynamic_pointer_cast<T>(convertJsonToASTNode(_node));
+	ASTPointer<T> ret = std::dynamic_pointer_cast<T>(convertJsonToASTNode(_node));
 	astAssert(ret, "cast of converted json-node must not be nullptr");
 	return ret;
 }
@@ -143,7 +141,7 @@ ASTPointer<T> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _node)
 ASTPointer<ASTNode> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _json)
 {
 	astAssert(_json["nodeType"].isString() && _json.isMember("id"), "JSON-Node needs to have 'nodeType' and 'id' fields.");
-	string nodeType = _json["nodeType"].asString();
+	std::string nodeType = _json["nodeType"].asString();
 	if (nodeType == "PragmaDirective")
 		return createPragmaDirective(_json);
 	if (nodeType == "ImportDirective")
@@ -265,9 +263,9 @@ ASTPointer<ASTNode> ASTJsonImporter::convertJsonToASTNode(Json::Value const& _js
 
 // ============ functions to instantiate the AST-Nodes from Json-Nodes ==============
 
-ASTPointer<SourceUnit> ASTJsonImporter::createSourceUnit(Json::Value const& _node, string const& _srcName)
+ASTPointer<SourceUnit> ASTJsonImporter::createSourceUnit(Json::Value const& _node, std::string const& _srcName)
 {
-	optional<string> license;
+	std::optional<std::string> license;
 	if (_node.isMember("license") && !_node["license"].isNull())
 		license = _node["license"].asString();
 
@@ -275,7 +273,7 @@ ASTPointer<SourceUnit> ASTJsonImporter::createSourceUnit(Json::Value const& _nod
 	if (_node.isMember("experimentalSolidity") && !_node["experimentalSolidity"].isNull())
 		experimentalSolidity = _node["experimentalSolidity"].asBool();
 
-	vector<ASTPointer<ASTNode>> nodes;
+	std::vector<ASTPointer<ASTNode>> nodes;
 	for (auto& child: member(_node, "nodes"))
 		nodes.emplace_back(convertJsonToASTNode(child));
 
@@ -286,11 +284,11 @@ ASTPointer<SourceUnit> ASTJsonImporter::createSourceUnit(Json::Value const& _nod
 
 ASTPointer<PragmaDirective> ASTJsonImporter::createPragmaDirective(Json::Value const& _node)
 {
-	vector<Token> tokens;
-	vector<ASTString> literals;
+	std::vector<Token> tokens;
+	std::vector<ASTString> literals;
 	for (auto const& lit: member(_node, "literals"))
 	{
-		string l = lit.asString();
+		std::string l = lit.asString();
 		literals.push_back(l);
 		tokens.push_back(scanSingleToken(l));
 	}
@@ -309,7 +307,7 @@ ASTPointer<ImportDirective> ASTJsonImporter::createImportDirective(Json::Value c
 
 		symbolAliases.push_back({
 			createIdentifier(tuple["foreign"]),
-			tuple["local"].isNull() ? nullptr : make_shared<ASTString>(tuple["local"].asString()),
+			tuple["local"].isNull() ? nullptr : std::make_shared<ASTString>(tuple["local"].asString()),
 			createSourceLocation(tuple["foreign"])}
 		);
 	}
@@ -343,7 +341,7 @@ ASTPointer<ContractDefinition> ASTJsonImporter::createContractDefinition(Json::V
 
 	return createASTNode<ContractDefinition>(
 		_node,
-		make_shared<ASTString>(_node["name"].asString()),
+		std::make_shared<ASTString>(_node["name"].asString()),
 		createNameSourceLocation(_node),
 		_node["documentation"].isNull() ? nullptr : createDocumentation(member(_node, "documentation")),
 		baseContracts,
@@ -357,13 +355,13 @@ ASTPointer<IdentifierPath> ASTJsonImporter::createIdentifierPath(Json::Value con
 {
 	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
 
-	vector<ASTString> namePath;
-	vector<SourceLocation> namePathLocations;
-	vector<string> strs;
-	string nameString = member(_node, "name").asString();
+	std::vector<ASTString> namePath;
+	std::vector<SourceLocation> namePathLocations;
+	std::vector<std::string> strs;
+	std::string nameString = member(_node, "name").asString();
 	boost::algorithm::split(strs, nameString, boost::is_any_of("."));
 	astAssert(!strs.empty(), "Expected at least one element in IdentifierPath.");
-	for (string s: strs)
+	for (std::string s: strs)
 	{
 		astAssert(!s.empty(), "Expected non-empty string for IdentifierPath element.");
 		namePath.emplace_back(s);
@@ -395,20 +393,20 @@ ASTPointer<InheritanceSpecifier> ASTJsonImporter::createInheritanceSpecifier(Jso
 	return createASTNode<InheritanceSpecifier>(
 		_node,
 		createIdentifierPath(member(_node, "baseName")),
-		member(_node, "arguments").isNull() ? nullptr : make_unique<std::vector<ASTPointer<Expression>>>(arguments)
+		member(_node, "arguments").isNull() ? nullptr : std::make_unique<std::vector<ASTPointer<Expression>>>(arguments)
 	);
 }
 
 ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json::Value const& _node)
 {
-	vector<ASTPointer<IdentifierPath>> functions;
-	vector<optional<Token>> operators;
+	std::vector<ASTPointer<IdentifierPath>> functions;
+	std::vector<std::optional<Token>> operators;
 	if (_node.isMember("libraryName"))
 	{
 		astAssert(!_node["libraryName"].isArray());
 		astAssert(!_node["libraryName"]["operator"]);
 		functions.emplace_back(createIdentifierPath(_node["libraryName"]));
-		operators.emplace_back(nullopt);
+		operators.emplace_back(std::nullopt);
 	}
 	else if (_node.isMember("functionList"))
 		for (Json::Value const& function: _node["functionList"])
@@ -419,7 +417,7 @@ ASTPointer<UsingForDirective> ASTJsonImporter::createUsingForDirective(Json::Val
 				astAssert(!function.isMember("definition"));
 
 				functions.emplace_back(createIdentifierPath(function["function"]));
-				operators.emplace_back(nullopt);
+				operators.emplace_back(std::nullopt);
 			}
 			else
 			{
@@ -520,7 +518,7 @@ ASTPointer<FunctionDefinition> ASTJsonImporter::createFunctionDefinition(Json::V
 
 	Token kind;
 	bool freeFunction = false;
-	string kindStr = member(_node, "kind").asString();
+	std::string kindStr = member(_node, "kind").asString();
 
 	if (kindStr == "constructor")
 		kind = Token::Constructor;
@@ -572,7 +570,7 @@ ASTPointer<VariableDeclaration> ASTJsonImporter::createVariableDeclaration(Json:
 
 	VariableDeclaration::Mutability mutability{};
 	astAssert(member(_node, "mutability").isString(), "'mutability' expected to be string.");
-	string const mutabilityStr = member(_node, "mutability").asString();
+	std::string const mutabilityStr = member(_node, "mutability").asString();
 	if (mutabilityStr == "constant")
 	{
 		mutability = VariableDeclaration::Mutability::Constant;
@@ -592,7 +590,7 @@ ASTPointer<VariableDeclaration> ASTJsonImporter::createVariableDeclaration(Json:
 	return createASTNode<VariableDeclaration>(
 		_node,
 		nullOrCast<TypeName>(member(_node, "typeName")),
-		make_shared<ASTString>(member(_node, "name").asString()),
+		std::make_shared<ASTString>(member(_node, "name").asString()),
 		createNameSourceLocation(_node),
 		nullOrCast<Expression>(member(_node, "value")),
 		visibility(_node),
@@ -626,7 +624,7 @@ ASTPointer<ModifierInvocation> ASTJsonImporter::createModifierInvocation(Json::V
 	return createASTNode<ModifierInvocation>(
 		_node,
 		createIdentifierPath(member(_node, "modifierName")),
-		member(_node, "arguments").isNull() ? nullptr : make_unique<std::vector<ASTPointer<Expression>>>(arguments)
+		member(_node, "arguments").isNull() ? nullptr : std::make_unique<std::vector<ASTPointer<Expression>>>(arguments)
 	);
 }
 
@@ -660,9 +658,9 @@ ASTPointer<ElementaryTypeName> ASTJsonImporter::createElementaryTypeName(Json::V
 
 	astAssert(_node["name"].isString(), "Expected 'name' to be a string!");
 
-	string name = member(_node, "name").asString();
+	std::string name = member(_node, "name").asString();
 	Token token;
-	tie(token, firstNum, secondNum) = TokenTraits::fromIdentifierOrKeyword(name);
+	std::tie(token, firstNum, secondNum) = TokenTraits::fromIdentifierOrKeyword(name);
 	ElementaryTypeNameToken elem(token, firstNum,  secondNum);
 
 	std::optional<StateMutability> mutability = {};
@@ -721,19 +719,19 @@ ASTPointer<InlineAssembly> ASTJsonImporter::createInlineAssembly(Json::Value con
 	astAssert(m_evmVersion == evmVersion, "Imported tree evm version differs from configured evm version!");
 
 	yul::Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(evmVersion.value());
-	ASTPointer<vector<ASTPointer<ASTString>>> flags;
+	ASTPointer<std::vector<ASTPointer<ASTString>>> flags;
 	if (_node.isMember("flags"))
 	{
-		flags = make_shared<vector<ASTPointer<ASTString>>>();
+		flags = std::make_shared<std::vector<ASTPointer<ASTString>>>();
 		Json::Value const& flagsNode = _node["flags"];
 		astAssert(flagsNode.isArray(), "Assembly flags must be an array.");
 		for (Json::ArrayIndex i = 0; i < flagsNode.size(); ++i)
 		{
 			astAssert(flagsNode[i].isString(), "Assembly flag must be a string.");
-			flags->emplace_back(make_shared<ASTString>(flagsNode[i].asString()));
+			flags->emplace_back(std::make_shared<ASTString>(flagsNode[i].asString()));
 		}
 	}
-	shared_ptr<yul::Block> operations = make_shared<yul::Block>(yul::AsmJsonImporter(m_sourceNames).createBlock(member(_node, "AST")));
+	std::shared_ptr<yul::Block> operations = std::make_shared<yul::Block>(yul::AsmJsonImporter(m_sourceNames).createBlock(member(_node, "AST")));
 	return createASTNode<InlineAssembly>(
 		_node,
 		nullOrASTString(_node, "documentation"),
@@ -787,7 +785,7 @@ ASTPointer<TryCatchClause> ASTJsonImporter::createTryCatchClause(Json::Value con
 
 ASTPointer<TryStatement> ASTJsonImporter::createTryStatement(Json::Value const&  _node)
 {
-	vector<ASTPointer<TryCatchClause>> clauses;
+	std::vector<ASTPointer<TryCatchClause>> clauses;
 
 	for (auto& param: _node["clauses"])
 		clauses.emplace_back(createTryCatchClause(param));
@@ -957,10 +955,10 @@ ASTPointer<FunctionCall> ASTJsonImporter::createFunctionCall(Json::Value const&
 	for (auto& name: member(_node, "names"))
 	{
 		astAssert(name.isString(), "Expected 'names' members to be strings!");
-		names.push_back(make_shared<ASTString>(name.asString()));
+		names.push_back(std::make_shared<ASTString>(name.asString()));
 	}
 
-	optional<vector<SourceLocation>> sourceLocations = createSourceLocations(_node);
+	std::optional<std::vector<SourceLocation>> sourceLocations = createSourceLocations(_node);
 
 	return createASTNode<FunctionCall>(
 		_node,
@@ -969,7 +967,7 @@ ASTPointer<FunctionCall> ASTJsonImporter::createFunctionCall(Json::Value const&
 		names,
 		sourceLocations ?
 			*sourceLocations :
-			vector<SourceLocation>(names.size())
+			std::vector<SourceLocation>(names.size())
 	);
 }
 
@@ -982,7 +980,7 @@ ASTPointer<FunctionCallOptions> ASTJsonImporter::createFunctionCallOptions(Json:
 	for (auto& name: member(_node, "names"))
 	{
 		astAssert(name.isString(), "Expected 'names' members to be strings!");
-		names.push_back(make_shared<ASTString>(name.asString()));
+		names.push_back(std::make_shared<ASTString>(name.asString()));
 	}
 
 	return createASTNode<FunctionCallOptions>(
@@ -1049,14 +1047,14 @@ ASTPointer<ElementaryTypeNameExpression> ASTJsonImporter::createElementaryTypeNa
 
 ASTPointer<ASTNode> ASTJsonImporter::createLiteral(Json::Value const&  _node)
 {
-	static string const valStr = "value";
-	static string const hexValStr = "hexValue";
+	static std::string const valStr = "value";
+	static std::string const hexValStr = "hexValue";
 
 	astAssert(member(_node, valStr).isString() || member(_node, hexValStr).isString(), "Literal-value is unset.");
 
 	ASTPointer<ASTString> value = _node.isMember(hexValStr) ?
-		make_shared<ASTString>(util::asString(util::fromHex(_node[hexValStr].asString()))) :
-		make_shared<ASTString>(_node[valStr].asString());
+		std::make_shared<ASTString>(util::asString(util::fromHex(_node[hexValStr].asString()))) :
+		std::make_shared<ASTString>(_node[valStr].asString());
 
 	return createASTNode<Literal>(
 		_node,
@@ -1068,19 +1066,19 @@ ASTPointer<ASTNode> ASTJsonImporter::createLiteral(Json::Value const&  _node)
 
 ASTPointer<StructuredDocumentation> ASTJsonImporter::createDocumentation(Json::Value const&  _node)
 {
-	static string const textString = "text";
+	static std::string const textString = "text";
 
 	astAssert(member(_node, textString).isString(), "'text' must be a string");
 
 	return createASTNode<StructuredDocumentation>(
 		_node,
-		make_shared<ASTString>(_node[textString].asString())
+		std::make_shared<ASTString>(_node[textString].asString())
 	);
 }
 
 // ===== helper functions ==========
 
-Json::Value ASTJsonImporter::member(Json::Value const& _node, string const& _name)
+Json::Value ASTJsonImporter::member(Json::Value const& _node, std::string const& _name)
 {
 	if (!_node.isMember(_name))
 		return Json::nullValue;
@@ -1095,19 +1093,19 @@ Token ASTJsonImporter::scanSingleToken(Json::Value const& _node)
 	return scanner.currentToken();
 }
 
-ASTPointer<ASTString> ASTJsonImporter::nullOrASTString(Json::Value const& _json, string const& _name)
+ASTPointer<ASTString> ASTJsonImporter::nullOrASTString(Json::Value const& _json, std::string const& _name)
 {
 	return _json[_name].isString() ? memberAsASTString(_json, _name) : nullptr;
 }
 
-ASTPointer<ASTString> ASTJsonImporter::memberAsASTString(Json::Value const& _node, string const& _name)
+ASTPointer<ASTString> ASTJsonImporter::memberAsASTString(Json::Value const& _node, std::string const& _name)
 {
 	Json::Value value = member(_node, _name);
 	astAssert(value.isString(), "field " + _name + " must be of type string.");
-	return make_shared<ASTString>(_node[_name].asString());
+	return std::make_shared<ASTString>(_node[_name].asString());
 }
 
-bool ASTJsonImporter::memberAsBool(Json::Value const& _node, string const& _name)
+bool ASTJsonImporter::memberAsBool(Json::Value const& _node, std::string const& _name)
 {
 	Json::Value value = member(_node, _name);
 	astAssert(value.isBool(), "field " + _name + " must be of type boolean.");
@@ -1156,7 +1154,7 @@ Visibility ASTJsonImporter::visibility(Json::Value const& _node)
 	Json::Value visibility = member(_node, "visibility");
 	astAssert(visibility.isString(), "'visibility' expected to be a string.");
 
-	string const visibilityStr = visibility.asString();
+	std::string const visibilityStr = visibility.asString();
 
 	if (visibilityStr == "default")
 		return Visibility::Default;
@@ -1180,7 +1178,7 @@ VariableDeclaration::Location ASTJsonImporter::location(Json::Value const& _node
 	Json::Value storageLoc = member(_node, "storageLocation");
 	astAssert(storageLoc.isString(), "'storageLocation' expected to be a string.");
 
-	string const storageLocStr = storageLoc.asString();
+	std::string const storageLocStr = storageLoc.asString();
 
 	if (storageLocStr == "default")
 		return VariableDeclaration::Location::Unspecified;
@@ -1206,7 +1204,7 @@ Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _no
 
 	astAssert(subDen.isString(), "'subDenomination' expected to be string.");
 
-	string const subDenStr = subDen.asString();
+	std::string const subDenStr = subDen.asString();
 
 	if (subDenStr == "wei")
 		return Literal::SubDenomination::Wei;
@@ -1236,7 +1234,7 @@ Literal::SubDenomination ASTJsonImporter::subdenomination(Json::Value const& _no
 StateMutability ASTJsonImporter::stateMutability(Json::Value const& _node)
 {
 	astAssert(member(_node, "stateMutability").isString(), "StateMutability' expected to be string.");
-	string const mutabilityStr = member(_node, "stateMutability").asString();
+	std::string const mutabilityStr = member(_node, "stateMutability").asString();
 
 	if (mutabilityStr == "pure")
 		return StateMutability::Pure;
diff --git a/libsolidity/ast/CallGraph.cpp b/libsolidity/ast/CallGraph.cpp
index bf37b2264d..04275c3740 100644
--- a/libsolidity/ast/CallGraph.cpp
+++ b/libsolidity/ast/CallGraph.cpp
@@ -18,7 +18,6 @@
 
 #include <libsolidity/ast/CallGraph.h>
 
-using namespace std;
 using namespace solidity::frontend;
 
 bool CallGraph::CompareByID::operator()(Node const& _lhs, Node const& _rhs) const
@@ -26,21 +25,21 @@ bool CallGraph::CompareByID::operator()(Node const& _lhs, Node const& _rhs) cons
 	if (_lhs.index() != _rhs.index())
 		return _lhs.index() < _rhs.index();
 
-	if (holds_alternative<SpecialNode>(_lhs))
-		return get<SpecialNode>(_lhs) < get<SpecialNode>(_rhs);
-	return get<CallableDeclaration const*>(_lhs)->id() < get<CallableDeclaration const*>(_rhs)->id();
+	if (std::holds_alternative<SpecialNode>(_lhs))
+		return std::get<SpecialNode>(_lhs) < std::get<SpecialNode>(_rhs);
+	return std::get<CallableDeclaration const*>(_lhs)->id() < std::get<CallableDeclaration const*>(_rhs)->id();
 }
 
 bool CallGraph::CompareByID::operator()(Node const& _lhs, int64_t _rhs) const
 {
-	solAssert(!holds_alternative<SpecialNode>(_lhs), "");
+	solAssert(!std::holds_alternative<SpecialNode>(_lhs), "");
 
-	return get<CallableDeclaration const*>(_lhs)->id() < _rhs;
+	return std::get<CallableDeclaration const*>(_lhs)->id() < _rhs;
 }
 
 bool CallGraph::CompareByID::operator()(int64_t _lhs, Node const& _rhs) const
 {
-	solAssert(!holds_alternative<SpecialNode>(_rhs), "");
+	solAssert(!std::holds_alternative<SpecialNode>(_rhs), "");
 
-	return _lhs < get<CallableDeclaration const*>(_rhs)->id();
+	return _lhs < std::get<CallableDeclaration const*>(_rhs)->id();
 }
diff --git a/libsolidity/ast/TypeProvider.cpp b/libsolidity/ast/TypeProvider.cpp
index 6cf8b5c039..da50875568 100644
--- a/libsolidity/ast/TypeProvider.cpp
+++ b/libsolidity/ast/TypeProvider.cpp
@@ -21,7 +21,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/split.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 using namespace solidity::util;
@@ -31,126 +30,126 @@ InaccessibleDynamicType const TypeProvider::m_inaccessibleDynamic{};
 
 /// The string and bytes unique_ptrs are initialized when they are first used because
 /// they rely on `byte` being available which we cannot guarantee in the static init context.
-unique_ptr<ArrayType> TypeProvider::m_bytesStorage;
-unique_ptr<ArrayType> TypeProvider::m_bytesMemory;
-unique_ptr<ArrayType> TypeProvider::m_bytesCalldata;
-unique_ptr<ArrayType> TypeProvider::m_stringStorage;
-unique_ptr<ArrayType> TypeProvider::m_stringMemory;
+std::unique_ptr<ArrayType> TypeProvider::m_bytesStorage;
+std::unique_ptr<ArrayType> TypeProvider::m_bytesMemory;
+std::unique_ptr<ArrayType> TypeProvider::m_bytesCalldata;
+std::unique_ptr<ArrayType> TypeProvider::m_stringStorage;
+std::unique_ptr<ArrayType> TypeProvider::m_stringMemory;
 
 TupleType const TypeProvider::m_emptyTuple{};
 AddressType const TypeProvider::m_payableAddress{StateMutability::Payable};
 AddressType const TypeProvider::m_address{StateMutability::NonPayable};
 
-array<unique_ptr<IntegerType>, 32> const TypeProvider::m_intM{{
-	{make_unique<IntegerType>(8 * 1, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 2, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 3, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 4, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 5, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 6, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 7, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 8, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 9, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 10, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 11, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 12, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 13, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 14, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 15, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 16, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 17, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 18, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 19, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 20, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 21, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 22, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 23, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 24, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 25, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 26, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 27, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 28, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 29, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 30, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 31, IntegerType::Modifier::Signed)},
-	{make_unique<IntegerType>(8 * 32, IntegerType::Modifier::Signed)}
+std::array<std::unique_ptr<IntegerType>, 32> const TypeProvider::m_intM{{
+	{std::make_unique<IntegerType>(8 * 1, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 2, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 3, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 4, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 5, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 6, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 7, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 8, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 9, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 10, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 11, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 12, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 13, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 14, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 15, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 16, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 17, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 18, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 19, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 20, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 21, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 22, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 23, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 24, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 25, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 26, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 27, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 28, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 29, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 30, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 31, IntegerType::Modifier::Signed)},
+	{std::make_unique<IntegerType>(8 * 32, IntegerType::Modifier::Signed)}
 }};
 
-array<unique_ptr<IntegerType>, 32> const TypeProvider::m_uintM{{
-	{make_unique<IntegerType>(8 * 1, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 2, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 3, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 4, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 5, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 6, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 7, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 8, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 9, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 10, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 11, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 12, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 13, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 14, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 15, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 16, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 17, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 18, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 19, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 20, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 21, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 22, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 23, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 24, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 25, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 26, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 27, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 28, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 29, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 30, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 31, IntegerType::Modifier::Unsigned)},
-	{make_unique<IntegerType>(8 * 32, IntegerType::Modifier::Unsigned)}
+std::array<std::unique_ptr<IntegerType>, 32> const TypeProvider::m_uintM{{
+	{std::make_unique<IntegerType>(8 * 1, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 2, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 3, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 4, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 5, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 6, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 7, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 8, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 9, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 10, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 11, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 12, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 13, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 14, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 15, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 16, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 17, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 18, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 19, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 20, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 21, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 22, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 23, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 24, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 25, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 26, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 27, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 28, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 29, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 30, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 31, IntegerType::Modifier::Unsigned)},
+	{std::make_unique<IntegerType>(8 * 32, IntegerType::Modifier::Unsigned)}
 }};
 
-array<unique_ptr<FixedBytesType>, 32> const TypeProvider::m_bytesM{{
-	{make_unique<FixedBytesType>(1)},
-	{make_unique<FixedBytesType>(2)},
-	{make_unique<FixedBytesType>(3)},
-	{make_unique<FixedBytesType>(4)},
-	{make_unique<FixedBytesType>(5)},
-	{make_unique<FixedBytesType>(6)},
-	{make_unique<FixedBytesType>(7)},
-	{make_unique<FixedBytesType>(8)},
-	{make_unique<FixedBytesType>(9)},
-	{make_unique<FixedBytesType>(10)},
-	{make_unique<FixedBytesType>(11)},
-	{make_unique<FixedBytesType>(12)},
-	{make_unique<FixedBytesType>(13)},
-	{make_unique<FixedBytesType>(14)},
-	{make_unique<FixedBytesType>(15)},
-	{make_unique<FixedBytesType>(16)},
-	{make_unique<FixedBytesType>(17)},
-	{make_unique<FixedBytesType>(18)},
-	{make_unique<FixedBytesType>(19)},
-	{make_unique<FixedBytesType>(20)},
-	{make_unique<FixedBytesType>(21)},
-	{make_unique<FixedBytesType>(22)},
-	{make_unique<FixedBytesType>(23)},
-	{make_unique<FixedBytesType>(24)},
-	{make_unique<FixedBytesType>(25)},
-	{make_unique<FixedBytesType>(26)},
-	{make_unique<FixedBytesType>(27)},
-	{make_unique<FixedBytesType>(28)},
-	{make_unique<FixedBytesType>(29)},
-	{make_unique<FixedBytesType>(30)},
-	{make_unique<FixedBytesType>(31)},
-	{make_unique<FixedBytesType>(32)}
+std::array<std::unique_ptr<FixedBytesType>, 32> const TypeProvider::m_bytesM{{
+	{std::make_unique<FixedBytesType>(1)},
+	{std::make_unique<FixedBytesType>(2)},
+	{std::make_unique<FixedBytesType>(3)},
+	{std::make_unique<FixedBytesType>(4)},
+	{std::make_unique<FixedBytesType>(5)},
+	{std::make_unique<FixedBytesType>(6)},
+	{std::make_unique<FixedBytesType>(7)},
+	{std::make_unique<FixedBytesType>(8)},
+	{std::make_unique<FixedBytesType>(9)},
+	{std::make_unique<FixedBytesType>(10)},
+	{std::make_unique<FixedBytesType>(11)},
+	{std::make_unique<FixedBytesType>(12)},
+	{std::make_unique<FixedBytesType>(13)},
+	{std::make_unique<FixedBytesType>(14)},
+	{std::make_unique<FixedBytesType>(15)},
+	{std::make_unique<FixedBytesType>(16)},
+	{std::make_unique<FixedBytesType>(17)},
+	{std::make_unique<FixedBytesType>(18)},
+	{std::make_unique<FixedBytesType>(19)},
+	{std::make_unique<FixedBytesType>(20)},
+	{std::make_unique<FixedBytesType>(21)},
+	{std::make_unique<FixedBytesType>(22)},
+	{std::make_unique<FixedBytesType>(23)},
+	{std::make_unique<FixedBytesType>(24)},
+	{std::make_unique<FixedBytesType>(25)},
+	{std::make_unique<FixedBytesType>(26)},
+	{std::make_unique<FixedBytesType>(27)},
+	{std::make_unique<FixedBytesType>(28)},
+	{std::make_unique<FixedBytesType>(29)},
+	{std::make_unique<FixedBytesType>(30)},
+	{std::make_unique<FixedBytesType>(31)},
+	{std::make_unique<FixedBytesType>(32)}
 }};
 
-array<unique_ptr<MagicType>, 4> const TypeProvider::m_magics{{
-	{make_unique<MagicType>(MagicType::Kind::Block)},
-	{make_unique<MagicType>(MagicType::Kind::Message)},
-	{make_unique<MagicType>(MagicType::Kind::Transaction)},
-	{make_unique<MagicType>(MagicType::Kind::ABI)}
+std::array<std::unique_ptr<MagicType>, 4> const TypeProvider::m_magics{{
+	{std::make_unique<MagicType>(MagicType::Kind::Block)},
+	{std::make_unique<MagicType>(MagicType::Kind::Message)},
+	{std::make_unique<MagicType>(MagicType::Kind::Transaction)},
+	{std::make_unique<MagicType>(MagicType::Kind::ABI)}
 	// MetaType is stored separately
 }};
 
@@ -160,7 +159,7 @@ inline void clearCache(Type const& type)
 }
 
 template <typename T>
-inline void clearCache(unique_ptr<T> const& type)
+inline void clearCache(std::unique_ptr<T> const& type)
 {
 	// Some lazy-initialized types might not exist yet.
 	if (type)
@@ -200,7 +199,7 @@ void TypeProvider::reset()
 template <typename T, typename... Args>
 inline T const* TypeProvider::createAndGet(Args&& ... _args)
 {
-	instance().m_generalTypes.emplace_back(make_unique<T>(std::forward<Args>(_args)...));
+	instance().m_generalTypes.emplace_back(std::make_unique<T>(std::forward<Args>(_args)...));
 	return static_cast<T const*>(instance().m_generalTypes.back().get());
 }
 
@@ -259,15 +258,15 @@ Type const* TypeProvider::fromElementaryTypeName(ElementaryTypeNameToken const&
 	}
 }
 
-Type const* TypeProvider::fromElementaryTypeName(string const& _name)
+Type const* TypeProvider::fromElementaryTypeName(std::string const& _name)
 {
-	vector<string> nameParts;
+	std::vector<std::string> nameParts;
 	boost::split(nameParts, _name, boost::is_any_of(" "));
 	solAssert(nameParts.size() == 1 || nameParts.size() == 2, "Cannot parse elementary type: " + _name);
 
 	Token token;
 	unsigned short firstNum, secondNum;
-	tie(token, firstNum, secondNum) = TokenTraits::fromIdentifierOrKeyword(nameParts[0]);
+	std::tie(token, firstNum, secondNum) = TokenTraits::fromIdentifierOrKeyword(nameParts[0]);
 
 	auto t = fromElementaryTypeName(ElementaryTypeNameToken(token, firstNum, secondNum));
 	if (auto* ref = dynamic_cast<ReferenceType const*>(t))
@@ -307,35 +306,35 @@ Type const* TypeProvider::fromElementaryTypeName(string const& _name)
 ArrayType const* TypeProvider::bytesStorage()
 {
 	if (!m_bytesStorage)
-		m_bytesStorage = make_unique<ArrayType>(DataLocation::Storage, false);
+		m_bytesStorage = std::make_unique<ArrayType>(DataLocation::Storage, false);
 	return m_bytesStorage.get();
 }
 
 ArrayType const* TypeProvider::bytesMemory()
 {
 	if (!m_bytesMemory)
-		m_bytesMemory = make_unique<ArrayType>(DataLocation::Memory, false);
+		m_bytesMemory = std::make_unique<ArrayType>(DataLocation::Memory, false);
 	return m_bytesMemory.get();
 }
 
 ArrayType const* TypeProvider::bytesCalldata()
 {
 	if (!m_bytesCalldata)
-		m_bytesCalldata = make_unique<ArrayType>(DataLocation::CallData, false);
+		m_bytesCalldata = std::make_unique<ArrayType>(DataLocation::CallData, false);
 	return m_bytesCalldata.get();
 }
 
 ArrayType const* TypeProvider::stringStorage()
 {
 	if (!m_stringStorage)
-		m_stringStorage = make_unique<ArrayType>(DataLocation::Storage, true);
+		m_stringStorage = std::make_unique<ArrayType>(DataLocation::Storage, true);
 	return m_stringStorage.get();
 }
 
 ArrayType const* TypeProvider::stringMemory()
 {
 	if (!m_stringMemory)
-		m_stringMemory = make_unique<ArrayType>(DataLocation::Memory, true);
+		m_stringMemory = std::make_unique<ArrayType>(DataLocation::Memory, true);
 	return m_stringMemory.get();
 }
 
@@ -376,30 +375,30 @@ RationalNumberType const* TypeProvider::rationalNumber(Literal const& _literal)
 	return nullptr;
 }
 
-StringLiteralType const* TypeProvider::stringLiteral(string const& literal)
+StringLiteralType const* TypeProvider::stringLiteral(std::string const& literal)
 {
 	auto i = instance().m_stringLiteralTypes.find(literal);
 	if (i != instance().m_stringLiteralTypes.end())
 		return i->second.get();
 	else
-		return instance().m_stringLiteralTypes.emplace(literal, make_unique<StringLiteralType>(literal)).first->second.get();
+		return instance().m_stringLiteralTypes.emplace(literal, std::make_unique<StringLiteralType>(literal)).first->second.get();
 }
 
 FixedPointType const* TypeProvider::fixedPoint(unsigned m, unsigned n, FixedPointType::Modifier _modifier)
 {
 	auto& map = _modifier == FixedPointType::Modifier::Unsigned ? instance().m_ufixedMxN : instance().m_fixedMxN;
 
-	auto i = map.find(make_pair(m, n));
+	auto i = map.find(std::make_pair(m, n));
 	if (i != map.end())
 		return i->second.get();
 
 	return map.emplace(
-		make_pair(m, n),
-		make_unique<FixedPointType>(m, n, _modifier)
+		std::make_pair(m, n),
+		std::make_unique<FixedPointType>(m, n, _modifier)
 	).first->second.get();
 }
 
-TupleType const* TypeProvider::tuple(vector<Type const*> members)
+TupleType const* TypeProvider::tuple(std::vector<Type const*> members)
 {
 	if (members.empty())
 		return &m_emptyTuple;
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 2b955369fc..7b3e421438 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -54,7 +54,6 @@
 #include <unordered_set>
 #include <utility>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -111,7 +110,7 @@ util::Result<TypePointers> transformParametersToExternal(TypePointers const& _pa
 	return transformed;
 }
 
-string toStringInParentheses(TypePointers const& _types, bool _withoutDataLocation)
+std::string toStringInParentheses(TypePointers const& _types, bool _withoutDataLocation)
 {
 	return '(' + util::joinHumanReadable(
 		_types | ranges::views::transform([&](auto const* _type) { return _type->toString(_withoutDataLocation); }),
@@ -125,7 +124,7 @@ MemberList::Member::Member(Declaration const* _declaration, Type const* _type):
 	Member(_declaration, _type, _declaration->name())
 {}
 
-MemberList::Member::Member(Declaration const* _declaration, Type const* _type, string _name):
+MemberList::Member::Member(Declaration const* _declaration, Type const* _type, std::string _name):
 	name(std::move(_name)),
 	type(_type),
 	declaration(_declaration)
@@ -143,7 +142,7 @@ void StorageOffsets::computeOffsets(TypePointers const& _types)
 {
 	bigint slotOffset = 0;
 	unsigned byteOffset = 0;
-	map<size_t, pair<u256, unsigned>> offsets;
+	std::map<size_t, std::pair<u256, unsigned>> offsets;
 	for (size_t i = 0; i < _types.size(); ++i)
 	{
 		Type const* type = _types[i];
@@ -156,7 +155,7 @@ void StorageOffsets::computeOffsets(TypePointers const& _types)
 			byteOffset = 0;
 		}
 		solAssert(slotOffset < bigint(1) << 256 ,"Object too large for storage.");
-		offsets[i] = make_pair(u256(slotOffset), byteOffset);
+		offsets[i] = std::make_pair(u256(slotOffset), byteOffset);
 		solAssert(type->storageSize() >= 1, "Invalid storage size.");
 		if (type->storageSize() == 1 && byteOffset + type->storageBytes() <= 32)
 			byteOffset += type->storageBytes();
@@ -173,7 +172,7 @@ void StorageOffsets::computeOffsets(TypePointers const& _types)
 	swap(m_offsets, offsets);
 }
 
-pair<u256, unsigned> const* StorageOffsets::offset(size_t _index) const
+std::pair<u256, unsigned> const* StorageOffsets::offset(size_t _index) const
 {
 	if (m_offsets.count(_index))
 		return &m_offsets.at(_index);
@@ -186,7 +185,7 @@ void MemberList::combine(MemberList const & _other)
 	m_memberTypes += _other.m_memberTypes;
 }
 
-pair<u256, unsigned> const* MemberList::memberStorageOffset(string const& _name) const
+std::pair<u256, unsigned> const* MemberList::memberStorageOffset(std::string const& _name) const
 {
 	StorageOffsets const& offsets = storageOffsets();
 
@@ -219,33 +218,33 @@ StorageOffsets const& MemberList::storageOffsets() const {
 namespace
 {
 
-string parenthesizeIdentifier(string const& _internal)
+std::string parenthesizeIdentifier(std::string const& _internal)
 {
 	return "(" + _internal + ")";
 }
 
 template <class Range>
-string identifierList(Range const&& _list)
+std::string identifierList(Range const&& _list)
 {
 	return parenthesizeIdentifier(boost::algorithm::join(_list, ","));
 }
 
-string richIdentifier(Type const* _type)
+std::string richIdentifier(Type const* _type)
 {
 	return _type ? _type->richIdentifier() : "";
 }
 
-string identifierList(vector<Type const*> const& _list)
+std::string identifierList(std::vector<Type const*> const& _list)
 {
 	return identifierList(_list | ranges::views::transform(richIdentifier));
 }
 
-string identifierList(Type const* _type)
+std::string identifierList(Type const* _type)
 {
 	return parenthesizeIdentifier(richIdentifier(_type));
 }
 
-string identifierList(Type const* _type1, Type const* _type2)
+std::string identifierList(Type const* _type1, Type const* _type2)
 {
 	TypePointers list;
 	list.push_back(_type1);
@@ -253,16 +252,16 @@ string identifierList(Type const* _type1, Type const* _type2)
 	return identifierList(list);
 }
 
-string parenthesizeUserIdentifier(string const& _internal)
+std::string parenthesizeUserIdentifier(std::string const& _internal)
 {
 	return parenthesizeIdentifier(_internal);
 }
 
 }
 
-string Type::escapeIdentifier(string const& _identifier)
+std::string Type::escapeIdentifier(std::string const& _identifier)
 {
-	string ret = _identifier;
+	std::string ret = _identifier;
 	// FIXME: should be _$$$_
 	boost::algorithm::replace_all(ret, "$", "$$$");
 	boost::algorithm::replace_all(ret, ",", "_$_");
@@ -271,12 +270,12 @@ string Type::escapeIdentifier(string const& _identifier)
 	return ret;
 }
 
-string Type::identifier() const
+std::string Type::identifier() const
 {
-	string ret = escapeIdentifier(richIdentifier());
+	std::string ret = escapeIdentifier(richIdentifier());
 	solAssert(ret.find_first_of("0123456789") != 0, "Identifier cannot start with a number.");
 	solAssert(
-		ret.find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMONPQRSTUVWXYZ_$") == string::npos,
+		ret.find_first_not_of("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMONPQRSTUVWXYZ_$") == std::string::npos,
 		"Identifier contains invalid characters."
 	);
 	return ret;
@@ -306,7 +305,7 @@ MemberList const& Type::members(ASTNode const* _currentScope) const
 		MemberList::MemberMap members = nativeMembers(_currentScope);
 		if (_currentScope)
 			members += attachedFunctions(*this, *_currentScope);
-		m_members[_currentScope] = make_unique<MemberList>(std::move(members));
+		m_members[_currentScope] = std::make_unique<MemberList>(std::move(members));
 	}
 	return *m_members[_currentScope];
 }
@@ -341,9 +340,9 @@ Type const* Type::fullEncodingType(bool _inLibraryCall, bool _encoderV2, bool) c
 namespace
 {
 
-vector<UsingForDirective const*> usingForDirectivesForType(Type const& _type, ASTNode const& _scope)
+std::vector<UsingForDirective const*> usingForDirectivesForType(Type const& _type, ASTNode const& _scope)
 {
-	vector<UsingForDirective const*> usingForDirectives;
+	std::vector<UsingForDirective const*> usingForDirectives;
 	SourceUnit const* sourceUnit = dynamic_cast<SourceUnit const*>(&_scope);
 	if (auto const* contract = dynamic_cast<ContractDefinition const*>(&_scope))
 	{
@@ -378,12 +377,12 @@ vector<UsingForDirective const*> usingForDirectivesForType(Type const& _type, AS
 				_directive->typeName()->annotation().type,
 				true
 			);
-	}) | ranges::to<vector<UsingForDirective const*>>;
+	}) | ranges::to<std::vector<UsingForDirective const*>>;
 }
 
 }
 
-set<FunctionDefinition const*, ASTNode::CompareByID> Type::operatorDefinitions(
+std::set<FunctionDefinition const*, ASTNode::CompareByID> Type::operatorDefinitions(
 	Token _token,
 	ASTNode const& _scope,
 	bool _unary
@@ -392,7 +391,7 @@ set<FunctionDefinition const*, ASTNode::CompareByID> Type::operatorDefinitions(
 	if (!typeDefinition())
 		return {};
 
-	set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions;
+	std::set<FunctionDefinition const*, ASTNode::CompareByID> matchingDefinitions;
 	for (UsingForDirective const* directive: usingForDirectivesForType(*this, _scope))
 		for (auto const& [identifierPath, operator_]: directive->functionsAndOperators())
 		{
@@ -419,8 +418,8 @@ MemberList::MemberMap Type::attachedFunctions(Type const& _type, ASTNode const&
 {
 	MemberList::MemberMap members;
 
-	set<pair<string, Declaration const*>> seenFunctions;
-	auto addFunction = [&](FunctionDefinition const& _function, optional<string> _name = {})
+	std::set<std::pair<std::string, Declaration const*>> seenFunctions;
+	auto addFunction = [&](FunctionDefinition const& _function, std::optional<std::string> _name = {})
 	{
 		if (!_name)
 			_name = _function.name();
@@ -432,7 +431,7 @@ MemberList::MemberMap Type::attachedFunctions(Type const& _type, ASTNode const&
 		solAssert(withBoundFirstArgument, "");
 
 		if (_type.isImplicitlyConvertibleTo(*withBoundFirstArgument->selfType()))
-			if (seenFunctions.insert(make_pair(*_name, &_function)).second)
+			if (seenFunctions.insert(std::make_pair(*_name, &_function)).second)
 				members.emplace_back(&_function, withBoundFirstArgument, *_name);
 	};
 
@@ -474,7 +473,7 @@ AddressType::AddressType(StateMutability _stateMutability):
 	solAssert(m_stateMutability == StateMutability::Payable || m_stateMutability == StateMutability::NonPayable, "");
 }
 
-string AddressType::richIdentifier() const
+std::string AddressType::richIdentifier() const
 {
 	if (m_stateMutability == StateMutability::Payable)
 		return "t_address_payable";
@@ -508,7 +507,7 @@ BoolResult AddressType::isExplicitlyConvertibleTo(Type const& _convertTo) const
 	return false;
 }
 
-string AddressType::toString(bool) const
+std::string AddressType::toString(bool) const
 {
 	if (m_stateMutability == StateMutability::Payable)
 		return "address payable";
@@ -516,7 +515,7 @@ string AddressType::toString(bool) const
 		return "address";
 }
 
-string AddressType::canonicalName() const
+std::string AddressType::canonicalName() const
 {
 	return "address";
 }
@@ -596,9 +595,9 @@ IntegerType::IntegerType(unsigned _bits, IntegerType::Modifier _modifier):
 	);
 }
 
-string IntegerType::richIdentifier() const
+std::string IntegerType::richIdentifier() const
 {
-	return "t_" + string(isSigned() ? "" : "u") + "int" + to_string(numBits());
+	return "t_" + std::string(isSigned() ? "" : "u") + "int" + std::to_string(numBits());
 }
 
 BoolResult IntegerType::isImplicitlyConvertibleTo(Type const& _convertTo) const
@@ -666,9 +665,9 @@ bool IntegerType::operator==(Type const& _other) const
 	return other.m_bits == m_bits && other.m_modifier == m_modifier;
 }
 
-string IntegerType::toString(bool) const
+std::string IntegerType::toString(bool) const
 {
-	string prefix = isSigned() ? "int" : "uint";
+	std::string prefix = isSigned() ? "int" : "uint";
 	return prefix + util::toString(m_bits);
 }
 
@@ -763,9 +762,9 @@ FixedPointType::FixedPointType(unsigned _totalBits, unsigned _fractionalDigits,
 	);
 }
 
-string FixedPointType::richIdentifier() const
+std::string FixedPointType::richIdentifier() const
 {
-	return "t_" + string(isSigned() ? "" : "u") + "fixed" + to_string(m_totalBits) + "x" + to_string(m_fractionalDigits);
+	return "t_" + std::string(isSigned() ? "" : "u") + "fixed" + std::to_string(m_totalBits) + "x" + std::to_string(m_fractionalDigits);
 }
 
 BoolResult FixedPointType::isImplicitlyConvertibleTo(Type const& _convertTo) const
@@ -815,9 +814,9 @@ bool FixedPointType::operator==(Type const& _other) const
 	return other.m_totalBits == m_totalBits && other.m_fractionalDigits == m_fractionalDigits && other.m_modifier == m_modifier;
 }
 
-string FixedPointType::toString(bool) const
+std::string FixedPointType::toString(bool) const
 {
-	string prefix = isSigned() ? "fixed" : "ufixed";
+	std::string prefix = isSigned() ? "fixed" : "ufixed";
 	return prefix + util::toString(m_totalBits) + "x" + util::toString(m_fractionalDigits);
 }
 
@@ -858,7 +857,7 @@ IntegerType const* FixedPointType::asIntegerType() const
 	return TypeProvider::integer(numBits(), isSigned() ? IntegerType::Modifier::Signed : IntegerType::Modifier::Unsigned);
 }
 
-tuple<bool, rational> RationalNumberType::parseRational(string const& _value)
+std::tuple<bool, rational> RationalNumberType::parseRational(std::string const& _value)
 {
 	rational value;
 	try
@@ -871,7 +870,7 @@ tuple<bool, rational> RationalNumberType::parseRational(string const& _value)
 				!all_of(radixPoint + 1, _value.end(), util::isDigit) ||
 				!all_of(_value.begin(), radixPoint, util::isDigit)
 			)
-				return make_tuple(false, rational(0));
+				return std::make_tuple(false, rational(0));
 
 			// Only decimal notation allowed here, leading zeros would switch to octal.
 			auto fractionalBegin = find_if_not(
@@ -883,25 +882,25 @@ tuple<bool, rational> RationalNumberType::parseRational(string const& _value)
 			rational numerator;
 			rational denominator(1);
 
-			denominator = bigint(string(fractionalBegin, _value.end()));
+			denominator = bigint(std::string(fractionalBegin, _value.end()));
 			denominator /= boost::multiprecision::pow(
 				bigint(10),
 				static_cast<unsigned>(distance(radixPoint + 1, _value.end()))
 			);
-			numerator = bigint(string(_value.begin(), radixPoint));
+			numerator = bigint(std::string(_value.begin(), radixPoint));
 			value = numerator + denominator;
 		}
 		else
 			value = bigint(_value);
-		return make_tuple(true, value);
+		return std::make_tuple(true, value);
 	}
 	catch (...)
 	{
-		return make_tuple(false, rational(0));
+		return std::make_tuple(false, rational(0));
 	}
 }
 
-tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal)
+std::tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal)
 {
 	rational value;
 	try
@@ -920,27 +919,27 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
 		else if (expPoint != valueString.end())
 		{
 			// Parse mantissa and exponent. Checks numeric limit.
-			tuple<bool, rational> mantissa = parseRational(string(valueString.begin(), expPoint));
+			std::tuple<bool, rational> mantissa = parseRational(std::string(valueString.begin(), expPoint));
 
-			if (!get<0>(mantissa))
-				return make_tuple(false, rational(0));
-			value = get<1>(mantissa);
+			if (!std::get<0>(mantissa))
+				return std::make_tuple(false, rational(0));
+			value = std::get<1>(mantissa);
 
 			// 0E... is always zero.
 			if (value == 0)
-				return make_tuple(true, rational(0));
+				return std::make_tuple(true, rational(0));
 
-			bigint exp = bigint(string(expPoint + 1, valueString.end()));
+			bigint exp = bigint(std::string(expPoint + 1, valueString.end()));
 
-			if (exp > numeric_limits<int32_t>::max() || exp < numeric_limits<int32_t>::min())
-				return make_tuple(false, rational(0));
+			if (exp > std::numeric_limits<int32_t>::max() || exp < std::numeric_limits<int32_t>::min())
+				return std::make_tuple(false, rational(0));
 
 			uint32_t expAbs = bigint(abs(exp)).convert_to<uint32_t>();
 
 			if (exp < 0)
 			{
 				if (!fitsPrecisionBase10(abs(value.denominator()), expAbs))
-					return make_tuple(false, rational(0));
+					return std::make_tuple(false, rational(0));
 				value /= boost::multiprecision::pow(
 					bigint(10),
 					expAbs
@@ -949,7 +948,7 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
 			else if (exp > 0)
 			{
 				if (!fitsPrecisionBase10(abs(value.numerator()), expAbs))
-					return make_tuple(false, rational(0));
+					return std::make_tuple(false, rational(0));
 				value *= boost::multiprecision::pow(
 					bigint(10),
 					expAbs
@@ -959,15 +958,15 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
 		else
 		{
 			// parse as rational number
-			tuple<bool, rational> tmp = parseRational(valueString);
-			if (!get<0>(tmp))
+			std::tuple<bool, rational> tmp = parseRational(valueString);
+			if (!std::get<0>(tmp))
 				return tmp;
-			value = get<1>(tmp);
+			value = std::get<1>(tmp);
 		}
 	}
 	catch (...)
 	{
-		return make_tuple(false, rational(0));
+		return std::make_tuple(false, rational(0));
 	}
 	switch (_literal.subDenomination())
 	{
@@ -999,7 +998,7 @@ tuple<bool, rational> RationalNumberType::isValidLiteral(Literal const& _literal
 	}
 
 
-	return make_tuple(true, value);
+	return std::make_tuple(true, value);
 }
 
 BoolResult RationalNumberType::isImplicitlyConvertibleTo(Type const& _convertTo) const
@@ -1062,7 +1061,7 @@ BoolResult RationalNumberType::isExplicitlyConvertibleTo(Type const& _convertTo)
 
 TypeResult RationalNumberType::unaryOperatorResult(Token _operator) const
 {
-	if (optional<rational> value = ConstantEvaluator::evaluateUnaryOperator(_operator, m_value))
+	if (std::optional<rational> value = ConstantEvaluator::evaluateUnaryOperator(_operator, m_value))
 		return TypeResult{TypeProvider::rationalNumber(*value)};
 	else
 		return nullptr;
@@ -1120,10 +1119,10 @@ TypeResult RationalNumberType::binaryOperatorResult(Token _operator, Type const*
 			return nullptr;
 		return thisMobile->binaryOperatorResult(_operator, otherMobile);
 	}
-	else if (optional<rational> value = ConstantEvaluator::evaluateBinaryOperator(_operator, m_value, other.m_value))
+	else if (std::optional<rational> value = ConstantEvaluator::evaluateBinaryOperator(_operator, m_value, other.m_value))
 	{
 		// verify that numerator and denominator fit into 4096 bit after every operation
-		if (value->numerator() != 0 && max(boost::multiprecision::msb(abs(value->numerator())), boost::multiprecision::msb(abs(value->denominator()))) > 4096)
+		if (value->numerator() != 0 && std::max(boost::multiprecision::msb(abs(value->numerator())), boost::multiprecision::msb(abs(value->denominator()))) > 4096)
 			return TypeResult::err("Precision of rational constants is limited to 4096 bits.");
 
 		return TypeResult{TypeProvider::rationalNumber(*value)};
@@ -1132,7 +1131,7 @@ TypeResult RationalNumberType::binaryOperatorResult(Token _operator, Type const*
 		return nullptr;
 }
 
-string RationalNumberType::richIdentifier() const
+std::string RationalNumberType::richIdentifier() const
 {
 	// rational seemingly will put the sign always on the numerator,
 	// but let just make it deterministic here.
@@ -1152,24 +1151,24 @@ bool RationalNumberType::operator==(Type const& _other) const
 	return m_value == other.m_value;
 }
 
-string RationalNumberType::bigintToReadableString(bigint const& _num)
+std::string RationalNumberType::bigintToReadableString(bigint const& _num)
 {
-	string str = _num.str();
+	std::string str = _num.str();
 	if (str.size() > 32)
 	{
 		size_t omitted = str.size() - 8;
-		str = str.substr(0, 4) + "...(" + to_string(omitted) + " digits omitted)..." + str.substr(str.size() - 4, 4);
+		str = str.substr(0, 4) + "...(" + std::to_string(omitted) + " digits omitted)..." + str.substr(str.size() - 4, 4);
 	}
 	return str;
 }
 
-string RationalNumberType::toString(bool) const
+std::string RationalNumberType::toString(bool) const
 {
 	if (!isFractional())
 		return "int_const " + bigintToReadableString(m_value.numerator());
 
-	string numerator = bigintToReadableString(m_value.numerator());
-	string denominator = bigintToReadableString(m_value.denominator());
+	std::string numerator = bigintToReadableString(m_value.numerator());
+	std::string denominator = bigintToReadableString(m_value.denominator());
 	return "rational_const " + numerator + " / " + denominator;
 }
 
@@ -1221,7 +1220,7 @@ IntegerType const* RationalNumberType::integerType() const
 		return nullptr;
 	else
 		return TypeProvider::integer(
-			max(numberEncodingSize(value), 1u) * 8,
+			std::max(numberEncodingSize(value), 1u) * 8,
 			negative ? IntegerType::Modifier::Signed : IntegerType::Modifier::Unsigned
 		);
 }
@@ -1255,7 +1254,7 @@ FixedPointType const* RationalNumberType::fixedPointType() const
 	if (v > u256(-1))
 		return nullptr;
 
-	unsigned totalBits = max(numberEncodingSize(v), 1u) * 8;
+	unsigned totalBits = std::max(numberEncodingSize(v), 1u) * 8;
 	solAssert(totalBits <= 256, "");
 
 	return TypeProvider::fixedPoint(
@@ -1269,7 +1268,7 @@ StringLiteralType::StringLiteralType(Literal const& _literal):
 {
 }
 
-StringLiteralType::StringLiteralType(string _value):
+StringLiteralType::StringLiteralType(std::string _value):
 	m_value{std::move(_value)}
 {
 }
@@ -1300,9 +1299,9 @@ BoolResult StringLiteralType::isImplicitlyConvertibleTo(Type const& _convertTo)
 		return false;
 }
 
-string StringLiteralType::richIdentifier() const
+std::string StringLiteralType::richIdentifier() const
 {
-	// Since we have to return a valid identifier and the string itself may contain
+	// Since we have to return a valid identifier and the std::string itself may contain
 	// anything, we hash it.
 	return "t_stringliteral_" + util::toHex(util::keccak256(m_value).asBytes());
 }
@@ -1316,7 +1315,7 @@ bool StringLiteralType::operator==(Type const& _other) const
 
 std::string StringLiteralType::toString(bool) const
 {
-	auto isPrintableASCII = [](string const& s)
+	auto isPrintableASCII = [](std::string const& s)
 	{
 		for (auto c: s)
 		{
@@ -1405,9 +1404,9 @@ MemberList::MemberMap FixedBytesType::nativeMembers(ASTNode const*) const
 	return MemberList::MemberMap{MemberList::Member{"length", TypeProvider::uint(8)}};
 }
 
-string FixedBytesType::richIdentifier() const
+std::string FixedBytesType::richIdentifier() const
 {
-	return "t_bytes" + to_string(m_bytes);
+	return "t_bytes" + std::to_string(m_bytes);
 }
 
 bool FixedBytesType::operator==(Type const& _other) const
@@ -1511,10 +1510,10 @@ TypeResult ContractType::unaryOperatorResult(Token _operator) const
 		return nullptr;
 }
 
-vector<Type const*> CompositeType::fullDecomposition() const
+std::vector<Type const*> CompositeType::fullDecomposition() const
 {
-	vector<Type const*> res = {this};
-	unordered_set<string> seen = {richIdentifier()};
+	std::vector<Type const*> res = {this};
+	std::unordered_set<std::string> seen = {richIdentifier()};
 	for (size_t k = 0; k < res.size(); ++k)
 		if (auto composite = dynamic_cast<CompositeType const*>(res[k]))
 			for (Type const* next: composite->decomposition())
@@ -1562,12 +1561,12 @@ Type const* ReferenceType::copyForLocationIfReference(Type const* _type) const
 	return TypeProvider::withLocationIfReference(m_location, _type);
 }
 
-string ReferenceType::stringForReferencePart() const
+std::string ReferenceType::stringForReferencePart() const
 {
 	switch (m_location)
 	{
 	case DataLocation::Storage:
-		return string("storage ") + (isPointer() ? "pointer" : "ref");
+		return std::string("storage ") + (isPointer() ? "pointer" : "ref");
 	case DataLocation::CallData:
 		return "calldata";
 	case DataLocation::Memory:
@@ -1577,9 +1576,9 @@ string ReferenceType::stringForReferencePart() const
 	return "";
 }
 
-string ReferenceType::identifierLocationSuffix() const
+std::string ReferenceType::identifierLocationSuffix() const
 {
-	string id;
+	std::string id;
 	switch (location())
 	{
 	case DataLocation::Storage:
@@ -1656,7 +1655,7 @@ BoolResult ArrayType::isExplicitlyConvertibleTo(Type const& _convertTo) const
 {
 	if (isImplicitlyConvertibleTo(_convertTo))
 		return true;
-	// allow conversion bytes <-> string and bytes -> bytesNN
+	// allow conversion bytes <-> std::string and bytes -> bytesNN
 	if (_convertTo.category() != category())
 		return isByteArray() && _convertTo.category() == Type::Category::FixedBytes;
 	auto& convertTo = dynamic_cast<ArrayType const&>(_convertTo);
@@ -1667,9 +1666,9 @@ BoolResult ArrayType::isExplicitlyConvertibleTo(Type const& _convertTo) const
 	return true;
 }
 
-string ArrayType::richIdentifier() const
+std::string ArrayType::richIdentifier() const
 {
-	string id;
+	std::string id;
 	if (isString())
 		id = "t_string";
 	else if (isByteArrayOrString())
@@ -1735,13 +1734,13 @@ BoolResult ArrayType::validForLocation(DataLocation _loc) const
 				size *= type->memoryHeadSize();
 			else
 				size *= type->memoryDataSize();
-			if (size >= numeric_limits<unsigned>::max())
+			if (size >= std::numeric_limits<unsigned>::max())
 				return BoolResult::err("Type too large for memory.");
 			break;
 		}
 		case DataLocation::CallData:
 		{
-			if (unlimitedStaticCalldataSize(true) >= numeric_limits<unsigned>::max())
+			if (unlimitedStaticCalldataSize(true) >= std::numeric_limits<unsigned>::max())
 				return BoolResult::err("Type too large for calldata.");
 			break;
 		}
@@ -1766,7 +1765,7 @@ unsigned ArrayType::calldataEncodedSize(bool _padded) const
 {
 	solAssert(!isDynamicallyEncoded(), "");
 	bigint size = unlimitedStaticCalldataSize(_padded);
-	solAssert(size <= numeric_limits<unsigned>::max(), "Array size does not fit unsigned.");
+	solAssert(size <= std::numeric_limits<unsigned>::max(), "Array size does not fit unsigned.");
 	return unsigned(size);
 }
 
@@ -1778,7 +1777,7 @@ unsigned ArrayType::calldataEncodedTailSize() const
 		// length must still be present.
 		return 32;
 	bigint size = unlimitedStaticCalldataSize(false);
-	solAssert(size <= numeric_limits<unsigned>::max(), "Array size does not fit unsigned.");
+	solAssert(size <= std::numeric_limits<unsigned>::max(), "Array size does not fit unsigned.");
 	return unsigned(size);
 }
 
@@ -1812,10 +1811,10 @@ u256 ArrayType::storageSize() const
 	else
 		size = bigint(length()) * baseType()->storageSize();
 	solAssert(size < bigint(1) << 256, "Array too large for storage.");
-	return max<u256>(1, u256(size));
+	return std::max<u256>(1, u256(size));
 }
 
-vector<tuple<string, Type const*>> ArrayType::makeStackItems() const
+std::vector<std::tuple<std::string, Type const*>> ArrayType::makeStackItems() const
 {
 	switch (m_location)
 	{
@@ -1833,9 +1832,9 @@ vector<tuple<string, Type const*>> ArrayType::makeStackItems() const
 	solAssert(false, "");
 }
 
-string ArrayType::toString(bool _withoutDataLocation) const
+std::string ArrayType::toString(bool _withoutDataLocation) const
 {
-	string ret;
+	std::string ret;
 	if (isString())
 		ret = "string";
 	else if (isByteArrayOrString())
@@ -1852,9 +1851,9 @@ string ArrayType::toString(bool _withoutDataLocation) const
 	return ret;
 }
 
-string ArrayType::humanReadableName() const
+std::string ArrayType::humanReadableName() const
 {
-	string ret;
+	std::string ret;
 	if (isString())
 		ret = "string";
 	else if (isByteArrayOrString())
@@ -1870,9 +1869,9 @@ string ArrayType::humanReadableName() const
 	return ret;
 }
 
-string ArrayType::canonicalName() const
+std::string ArrayType::canonicalName() const
 {
-	string ret;
+	std::string ret;
 	if (isString())
 		ret = "string";
 	else if (isByteArrayOrString())
@@ -1887,7 +1886,7 @@ string ArrayType::canonicalName() const
 	return ret;
 }
 
-string ArrayType::signatureInExternalFunction(bool _structsByName) const
+std::string ArrayType::signatureInExternalFunction(bool _structsByName) const
 {
 	if (isByteArrayOrString())
 		return canonicalName();
@@ -1914,21 +1913,21 @@ MemberList::MemberMap ArrayType::nativeMembers(ASTNode const*) const
 			members.emplace_back("push", TypeProvider::function(
 				TypePointers{thisAsPointer},
 				TypePointers{baseType()},
-				strings{string()},
-				strings{string()},
+				strings{std::string()},
+				strings{std::string()},
 				FunctionType::Kind::ArrayPush
 			)->withBoundFirstArgument());
 			members.emplace_back("push", TypeProvider::function(
 				TypePointers{thisAsPointer, baseType()},
 				TypePointers{},
-				strings{string(),string()},
+				strings{std::string(),std::string()},
 				strings{},
 				FunctionType::Kind::ArrayPush
 			)->withBoundFirstArgument());
 			members.emplace_back("pop", TypeProvider::function(
 				TypePointers{thisAsPointer},
 				TypePointers{},
-				strings{string()},
+				strings{std::string()},
 				strings{},
 				FunctionType::Kind::ArrayPop
 			)->withBoundFirstArgument());
@@ -2006,13 +2005,13 @@ u256 ArrayType::memoryDataSize() const
 	solAssert(m_location == DataLocation::Memory, "");
 	solAssert(!isByteArrayOrString(), "");
 	bigint size = bigint(m_length) * m_baseType->memoryHeadSize();
-	solAssert(size <= numeric_limits<u256>::max(), "Array size does not fit u256.");
+	solAssert(size <= std::numeric_limits<u256>::max(), "Array size does not fit u256.");
 	return u256(size);
 }
 
 std::unique_ptr<ReferenceType> ArrayType::copyForLocation(DataLocation _location, bool _isPointer) const
 {
-	auto copy = make_unique<ArrayType>(_location);
+	auto copy = std::make_unique<ArrayType>(_location);
 	if (_location == DataLocation::Storage)
 		copy->m_isPointer = _isPointer;
 	copy->m_arrayKind = m_arrayKind;
@@ -2040,7 +2039,7 @@ BoolResult ArraySliceType::isExplicitlyConvertibleTo(Type const& _convertTo) con
 		m_arrayType.isExplicitlyConvertibleTo(_convertTo);
 }
 
-string ArraySliceType::richIdentifier() const
+std::string ArraySliceType::richIdentifier() const
 {
 	return m_arrayType.richIdentifier() + "_slice";
 }
@@ -2052,12 +2051,12 @@ bool ArraySliceType::operator==(Type const& _other) const
 	return false;
 }
 
-string ArraySliceType::toString(bool _withoutDataLocation) const
+std::string ArraySliceType::toString(bool _withoutDataLocation) const
 {
 	return m_arrayType.toString(_withoutDataLocation) + " slice";
 }
 
-string ArraySliceType::humanReadableName() const
+std::string ArraySliceType::humanReadableName() const
 {
 	return m_arrayType.humanReadableName() + " slice";
 }
@@ -2080,9 +2079,9 @@ std::vector<std::tuple<std::string, Type const*>> ArraySliceType::makeStackItems
 	return {{"offset", TypeProvider::uint256()}, {"length", TypeProvider::uint256()}};
 }
 
-string ContractType::richIdentifier() const
+std::string ContractType::richIdentifier() const
 {
-	return (m_super ? "t_super" : "t_contract") + parenthesizeUserIdentifier(m_contract.name()) + to_string(m_contract.id());
+	return (m_super ? "t_super" : "t_contract") + parenthesizeUserIdentifier(m_contract.name()) + std::to_string(m_contract.id());
 }
 
 bool ContractType::operator==(Type const& _other) const
@@ -2093,15 +2092,15 @@ bool ContractType::operator==(Type const& _other) const
 	return other.m_contract == m_contract && other.m_super == m_super;
 }
 
-string ContractType::toString(bool) const
+std::string ContractType::toString(bool) const
 {
 	return
-		string(m_contract.isLibrary() ? "library " : "contract ") +
-		string(m_super ? "super " : "") +
+		std::string(m_contract.isLibrary() ? "library " : "contract ") +
+		std::string(m_super ? "super " : "") +
 		m_contract.name();
 }
 
-string ContractType::canonicalName() const
+std::string ContractType::canonicalName() const
 {
 	return *m_contract.annotation().canonicalName;
 }
@@ -2127,9 +2126,9 @@ FunctionType const* ContractType::newExpressionType() const
 	return m_constructorType;
 }
 
-vector<tuple<VariableDeclaration const*, u256, unsigned>> ContractType::stateVariables() const
+std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> ContractType::stateVariables() const
 {
-	vector<VariableDeclaration const*> variables;
+	std::vector<VariableDeclaration const*> variables;
 	for (ContractDefinition const* contract: m_contract.annotation().linearizedBaseContracts | ranges::views::reverse)
 		for (VariableDeclaration const* variable: contract->stateVariables())
 			if (!(variable->isConstant() || variable->immutable()))
@@ -2140,16 +2139,16 @@ vector<tuple<VariableDeclaration const*, u256, unsigned>> ContractType::stateVar
 	StorageOffsets offsets;
 	offsets.computeOffsets(types);
 
-	vector<tuple<VariableDeclaration const*, u256, unsigned>> variablesAndOffsets;
+	std::vector<std::tuple<VariableDeclaration const*, u256, unsigned>> variablesAndOffsets;
 	for (size_t index = 0; index < variables.size(); ++index)
 		if (auto const* offset = offsets.offset(index))
 			variablesAndOffsets.emplace_back(variables[index], offset->first, offset->second);
 	return variablesAndOffsets;
 }
 
-vector<VariableDeclaration const*> ContractType::immutableVariables() const
+std::vector<VariableDeclaration const*> ContractType::immutableVariables() const
 {
-	vector<VariableDeclaration const*> variables;
+	std::vector<VariableDeclaration const*> variables;
 	for (ContractDefinition const* contract: m_contract.annotation().linearizedBaseContracts | ranges::views::reverse)
 		for (VariableDeclaration const* variable: contract->stateVariables())
 			if (variable->immutable())
@@ -2157,12 +2156,12 @@ vector<VariableDeclaration const*> ContractType::immutableVariables() const
 	return variables;
 }
 
-vector<tuple<string, Type const*>> ContractType::makeStackItems() const
+std::vector<std::tuple<std::string, Type const*>> ContractType::makeStackItems() const
 {
 	if (m_super)
 		return {};
 	else
-		return {make_tuple("address", isPayable() ? TypeProvider::payableAddress() : TypeProvider::address())};
+		return {std::make_tuple("address", isPayable() ? TypeProvider::payableAddress() : TypeProvider::address())};
 }
 
 void StructType::clearCache() const
@@ -2194,9 +2193,9 @@ BoolResult StructType::isImplicitlyConvertibleTo(Type const& _convertTo) const
 	return this->m_struct == convertTo.m_struct;
 }
 
-string StructType::richIdentifier() const
+std::string StructType::richIdentifier() const
 {
-	return "t_struct" + parenthesizeUserIdentifier(m_struct.name()) + to_string(m_struct.id()) + identifierLocationSuffix();
+	return "t_struct" + parenthesizeUserIdentifier(m_struct.name()) + std::to_string(m_struct.id()) + identifierLocationSuffix();
 }
 
 bool StructType::operator==(Type const& _other) const
@@ -2284,7 +2283,7 @@ bigint StructType::storageSizeUpperBound() const
 
 u256 StructType::storageSize() const
 {
-	return max<u256>(1, members(nullptr).storageSize());
+	return std::max<u256>(1, members(nullptr).storageSize());
 }
 
 bool StructType::containsNestedMapping() const
@@ -2323,9 +2322,9 @@ bool StructType::containsNestedMapping() const
 	return m_struct.annotation().containsNestedMapping.value();
 }
 
-string StructType::toString(bool _withoutDataLocation) const
+std::string StructType::toString(bool _withoutDataLocation) const
 {
-	string ret = "struct " + *m_struct.annotation().canonicalName;
+	std::string ret = "struct " + *m_struct.annotation().canonicalName;
 	if (!_withoutDataLocation)
 		ret += " " + stringForReferencePart();
 	return ret;
@@ -2482,20 +2481,20 @@ bool StructType::recursive() const
 
 std::unique_ptr<ReferenceType> StructType::copyForLocation(DataLocation _location, bool _isPointer) const
 {
-	auto copy = make_unique<StructType>(m_struct, _location);
+	auto copy = std::make_unique<StructType>(m_struct, _location);
 	if (_location == DataLocation::Storage)
 		copy->m_isPointer = _isPointer;
 	return copy;
 }
 
-string StructType::signatureInExternalFunction(bool _structsByName) const
+std::string StructType::signatureInExternalFunction(bool _structsByName) const
 {
 	if (_structsByName)
 		return canonicalName();
 	else
 	{
 		TypePointers memberTypes = memoryMemberTypes();
-		auto memberTypeStrings = memberTypes | ranges::views::transform([&](Type const* _t) -> string
+		auto memberTypeStrings = memberTypes | ranges::views::transform([&](Type const* _t) -> std::string
 		{
 			solAssert(_t, "Parameter should have external type.");
 			auto t = _t->interfaceType(_structsByName);
@@ -2506,7 +2505,7 @@ string StructType::signatureInExternalFunction(bool _structsByName) const
 	}
 }
 
-string StructType::canonicalName() const
+std::string StructType::canonicalName() const
 {
 	return *m_struct.annotation().canonicalName;
 }
@@ -2530,14 +2529,14 @@ FunctionTypePointer StructType::constructorType() const
 	);
 }
 
-pair<u256, unsigned> const& StructType::storageOffsetsOfMember(string const& _name) const
+std::pair<u256, unsigned> const& StructType::storageOffsetsOfMember(std::string const& _name) const
 {
 	auto const* offsets = members(nullptr).memberStorageOffset(_name);
 	solAssert(offsets, "Storage offset of non-existing member requested.");
 	return *offsets;
 }
 
-u256 StructType::memoryOffsetOfMember(string const& _name) const
+u256 StructType::memoryOffsetOfMember(std::string const& _name) const
 {
 	u256 offset;
 	for (auto const& member: members(nullptr))
@@ -2559,7 +2558,7 @@ TypePointers StructType::memoryMemberTypes() const
 	return types;
 }
 
-vector<tuple<string, Type const*>> StructType::makeStackItems() const
+std::vector<std::tuple<std::string, Type const*>> StructType::makeStackItems() const
 {
 	switch (m_location)
 	{
@@ -2573,9 +2572,9 @@ vector<tuple<string, Type const*>> StructType::makeStackItems() const
 	solAssert(false, "");
 }
 
-vector<Type const*> StructType::decomposition() const
+std::vector<Type const*> StructType::decomposition() const
 {
-	vector<Type const*> res;
+	std::vector<Type const*> res;
 	for (MemberList::Member const& member: members(nullptr))
 		res.push_back(member.type);
 	return res;
@@ -2597,9 +2596,9 @@ TypeResult EnumType::unaryOperatorResult(Token _operator) const
 	return _operator == Token::Delete ? TypeProvider::emptyTuple() : nullptr;
 }
 
-string EnumType::richIdentifier() const
+std::string EnumType::richIdentifier() const
 {
-	return "t_enum" + parenthesizeUserIdentifier(m_enum.name()) + to_string(m_enum.id());
+	return "t_enum" + parenthesizeUserIdentifier(m_enum.name()) + std::to_string(m_enum.id());
 }
 
 bool EnumType::operator==(Type const& _other) const
@@ -2616,12 +2615,12 @@ unsigned EnumType::storageBytes() const
 	return 1;
 }
 
-string EnumType::toString(bool) const
+std::string EnumType::toString(bool) const
 {
-	return string("enum ") + *m_enum.annotation().canonicalName;
+	return std::string("enum ") + *m_enum.annotation().canonicalName;
 }
 
-string EnumType::canonicalName() const
+std::string EnumType::canonicalName() const
 {
 	return *m_enum.annotation().canonicalName;
 }
@@ -2665,9 +2664,9 @@ Declaration const* UserDefinedValueType::typeDefinition() const
 	return &m_definition;
 }
 
-string UserDefinedValueType::richIdentifier() const
+std::string UserDefinedValueType::richIdentifier() const
 {
-	return "t_userDefinedValueType" + parenthesizeIdentifier(m_definition.name()) + to_string(m_definition.id());
+	return "t_userDefinedValueType" + parenthesizeIdentifier(m_definition.name()) + std::to_string(m_definition.id());
 }
 
 bool UserDefinedValueType::operator==(Type const& _other) const
@@ -2678,17 +2677,17 @@ bool UserDefinedValueType::operator==(Type const& _other) const
 	return other.definition() == definition();
 }
 
-string UserDefinedValueType::toString(bool /* _withoutDataLocation */) const
+std::string UserDefinedValueType::toString(bool /* _withoutDataLocation */) const
 {
 	return *definition().annotation().canonicalName;
 }
 
-string UserDefinedValueType::canonicalName() const
+std::string UserDefinedValueType::canonicalName() const
 {
 	return *definition().annotation().canonicalName;
 }
 
-vector<tuple<string, Type const*>> UserDefinedValueType::makeStackItems() const
+std::vector<std::tuple<std::string, Type const*>> UserDefinedValueType::makeStackItems() const
 {
 	return underlyingType().stackItems();
 }
@@ -2713,7 +2712,7 @@ BoolResult TupleType::isImplicitlyConvertibleTo(Type const& _other) const
 		return false;
 }
 
-string TupleType::richIdentifier() const
+std::string TupleType::richIdentifier() const
 {
 	return "t_tuple" + identifierList(components());
 }
@@ -2726,22 +2725,22 @@ bool TupleType::operator==(Type const& _other) const
 		return false;
 }
 
-string TupleType::toString(bool _withoutDataLocation) const
+std::string TupleType::toString(bool _withoutDataLocation) const
 {
 	if (components().empty())
 		return "tuple()";
-	string str = "tuple(";
+	std::string str = "tuple(";
 	for (auto const& t: components())
 		str += (t ? t->toString(_withoutDataLocation) : "") + ",";
 	str.pop_back();
 	return str + ")";
 }
 
-string TupleType::humanReadableName() const
+std::string TupleType::humanReadableName() const
 {
 	if (components().empty())
 		return "tuple()";
-	string str = "tuple(";
+	std::string str = "tuple(";
 	for (auto const& t: components())
 		str += (t ? t->humanReadableName() : "") + ",";
 	str.pop_back();
@@ -2753,9 +2752,9 @@ u256 TupleType::storageSize() const
 	solAssert(false, "Storage size of non-storable tuple type requested.");
 }
 
-vector<tuple<string, Type const*>> TupleType::makeStackItems() const
+std::vector<std::tuple<std::string, Type const*>> TupleType::makeStackItems() const
 {
-	vector<tuple<string, Type const*>> slots;
+	std::vector<std::tuple<std::string, Type const*>> slots;
 	unsigned i = 1;
 	for (auto const& t: components())
 	{
@@ -2990,11 +2989,11 @@ FunctionTypePointer FunctionType::newExpressionType(ContractDefinition const& _c
 	);
 }
 
-vector<string> FunctionType::parameterNames() const
+std::vector<std::string> FunctionType::parameterNames() const
 {
 	if (!hasBoundFirstArgument())
 		return m_parameterNames;
-	return vector<string>(m_parameterNames.cbegin() + 1, m_parameterNames.cend());
+	return std::vector<std::string>(m_parameterNames.cbegin() + 1, m_parameterNames.cend());
 }
 
 TypePointers FunctionType::returnParameterTypesWithoutDynamicTypes() const
@@ -3031,9 +3030,9 @@ TypePointers const& FunctionType::parameterTypesIncludingSelf() const
 	return m_parameterTypes;
 }
 
-string FunctionType::richIdentifier() const
+std::string FunctionType::richIdentifier() const
 {
-	string id = "t_function_";
+	std::string id = "t_function_";
 	switch (m_kind)
 	{
 	case Kind::Declaration: id += "declaration"; break;
@@ -3178,13 +3177,13 @@ TypeResult FunctionType::binaryOperatorResult(Token _operator, Type const* _othe
 	return nullptr;
 }
 
-string FunctionType::canonicalName() const
+std::string FunctionType::canonicalName() const
 {
 	solAssert(m_kind == Kind::External, "");
 	return "function";
 }
 
-string FunctionType::humanReadableName() const
+std::string FunctionType::humanReadableName() const
 {
 	switch (m_kind)
 	{
@@ -3197,9 +3196,9 @@ string FunctionType::humanReadableName() const
 	}
 }
 
-string FunctionType::toString(bool _withoutDataLocation) const
+std::string FunctionType::toString(bool _withoutDataLocation) const
 {
-	string name = "function ";
+	std::string name = "function ";
 	if (m_kind == Kind::Declaration)
 	{
 		auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(m_declaration);
@@ -3263,9 +3262,9 @@ bool FunctionType::nameable() const
 		!saltSet();
 }
 
-vector<tuple<string, Type const*>> FunctionType::makeStackItems() const
+std::vector<std::tuple<std::string, Type const*>> FunctionType::makeStackItems() const
 {
-	vector<tuple<string, Type const*>> slots;
+	std::vector<std::tuple<std::string, Type const*>> slots;
 	Kind kind = m_kind;
 	if (m_kind == Kind::SetGas || m_kind == Kind::SetValue)
 	{
@@ -3278,8 +3277,8 @@ vector<tuple<string, Type const*>> FunctionType::makeStackItems() const
 	case Kind::External:
 	case Kind::DelegateCall:
 		slots = {
-			make_tuple("address", TypeProvider::address()),
-			make_tuple("functionSelector", TypeProvider::uint(32))
+			std::make_tuple("address", TypeProvider::address()),
+			std::make_tuple("functionSelector", TypeProvider::uint(32))
 		};
 		break;
 	case Kind::BareCall:
@@ -3288,10 +3287,10 @@ vector<tuple<string, Type const*>> FunctionType::makeStackItems() const
 	case Kind::BareStaticCall:
 	case Kind::Transfer:
 	case Kind::Send:
-		slots = {make_tuple("address", TypeProvider::address())};
+		slots = {std::make_tuple("address", TypeProvider::address())};
 		break;
 	case Kind::Internal:
-		slots = {make_tuple("functionIdentifier", TypeProvider::uint256())};
+		slots = {std::make_tuple("functionIdentifier", TypeProvider::uint256())};
 		break;
 	case Kind::ArrayPush:
 	case Kind::ArrayPop:
@@ -3597,7 +3596,7 @@ bool FunctionType::isBareCall() const
 	}
 }
 
-string FunctionType::externalSignature() const
+std::string FunctionType::externalSignature() const
 {
 	solAssert(m_declaration != nullptr, "External signature of function needs declaration");
 	solAssert(!m_declaration->name().empty(), "Fallback function has no signature.");
@@ -3624,9 +3623,9 @@ string FunctionType::externalSignature() const
 
 	solAssert(extParams.message().empty(), extParams.message());
 
-	auto typeStrings = extParams.get() | ranges::views::transform([&](Type const* _t) -> string
+	auto typeStrings = extParams.get() | ranges::views::transform([&](Type const* _t) -> std::string
 	{
-		string typeName = _t->signatureInExternalFunction(inLibrary);
+		std::string typeName = _t->signatureInExternalFunction(inLibrary);
 
 		if (inLibrary && _t->dataStoredIn(DataLocation::Storage))
 			typeName += " storage";
@@ -3640,7 +3639,7 @@ u256 FunctionType::externalIdentifier() const
 	return util::selectorFromSignatureU32(externalSignature());
 }
 
-string FunctionType::externalIdentifierHex() const
+std::string FunctionType::externalIdentifierHex() const
 {
 	return util::selectorFromSignatureH32(externalSignature()).hex();
 }
@@ -3672,7 +3671,7 @@ TypePointers FunctionType::parseElementaryTypeVector(strings const& _types)
 {
 	TypePointers pointers;
 	pointers.reserve(_types.size());
-	for (string const& type: _types)
+	for (std::string const& type: _types)
 		pointers.push_back(TypeProvider::fromElementaryTypeName(type));
 	return pointers;
 }
@@ -3797,7 +3796,7 @@ Type const* MappingType::encodingType() const
 	return TypeProvider::integer(256, IntegerType::Modifier::Unsigned);
 }
 
-string MappingType::richIdentifier() const
+std::string MappingType::richIdentifier() const
 {
 	return "t_mapping" + identifierList(m_keyType, m_valueType);
 }
@@ -3810,12 +3809,12 @@ bool MappingType::operator==(Type const& _other) const
 	return *other.m_keyType == *m_keyType && *other.m_valueType == *m_valueType;
 }
 
-string MappingType::toString(bool _withoutDataLocation) const
+std::string MappingType::toString(bool _withoutDataLocation) const
 {
 	return "mapping(" + keyType()->toString(_withoutDataLocation) + " => " + valueType()->toString(_withoutDataLocation) + ")";
 }
 
-string MappingType::canonicalName() const
+std::string MappingType::canonicalName() const
 {
 	return "mapping(" + keyType()->canonicalName() + " => " + valueType()->canonicalName() + ")";
 }
@@ -3848,7 +3847,7 @@ std::vector<std::tuple<std::string, Type const*>> MappingType::makeStackItems()
 	return {std::make_tuple("slot", TypeProvider::uint256())};
 }
 
-string TypeType::richIdentifier() const
+std::string TypeType::richIdentifier() const
 {
 	return "t_type" + identifierList(actualType());
 }
@@ -3866,13 +3865,13 @@ u256 TypeType::storageSize() const
 	solAssert(false, "Storage size of non-storable type type requested.");
 }
 
-vector<tuple<string, Type const*>> TypeType::makeStackItems() const
+std::vector<std::tuple<std::string, Type const*>> TypeType::makeStackItems() const
 {
 	if (auto contractType = dynamic_cast<ContractType const*>(m_actualType))
 		if (contractType->contractDefinition().isLibrary())
 		{
 			solAssert(!contractType->isSuper(), "");
-			return {make_tuple("address", TypeProvider::address())};
+			return {std::make_tuple("address", TypeProvider::address())};
 		}
 
 	return {};
@@ -3959,8 +3958,8 @@ MemberList::MemberMap TypeType::nativeMembers(ASTNode const* _currentScope) cons
 			TypeProvider::function(
 				TypePointers{&userDefined.underlyingType()},
 				TypePointers{&userDefined},
-				strings{string{}},
-				strings{string{}},
+				strings{std::string{}},
+				strings{std::string{}},
 				FunctionType::Kind::Wrap,
 				StateMutability::Pure
 			)
@@ -3970,8 +3969,8 @@ MemberList::MemberMap TypeType::nativeMembers(ASTNode const* _currentScope) cons
 			TypeProvider::function(
 				TypePointers{&userDefined},
 				TypePointers{&userDefined.underlyingType()},
-				strings{string{}},
-				strings{string{}},
+				strings{std::string{}},
+				strings{std::string{}},
 				FunctionType::Kind::Unwrap,
 				StateMutability::Pure
 			)
@@ -3985,7 +3984,7 @@ MemberList::MemberMap TypeType::nativeMembers(ASTNode const* _currentScope) cons
 			TypePointers{},
 			TypePointers{arrayType->isString() ? TypeProvider::stringMemory() : TypeProvider::bytesMemory()},
 			strings{},
-			strings{string{}},
+			strings{std::string{}},
 			arrayType->isString() ? FunctionType::Kind::StringConcat : FunctionType::Kind::BytesConcat,
 			StateMutability::Pure,
 			nullptr,
@@ -4017,7 +4016,7 @@ u256 ModifierType::storageSize() const
 	solAssert(false, "Storage size of non-storable type type requested.");
 }
 
-string ModifierType::richIdentifier() const
+std::string ModifierType::richIdentifier() const
 {
 	return "t_modifier" + identifierList(m_parameterTypes);
 }
@@ -4042,17 +4041,17 @@ bool ModifierType::operator==(Type const& _other) const
 	return true;
 }
 
-string ModifierType::toString(bool _withoutDataLocation) const
+std::string ModifierType::toString(bool _withoutDataLocation) const
 {
-	string name = "modifier (";
+	std::string name = "modifier (";
 	for (auto it = m_parameterTypes.begin(); it != m_parameterTypes.end(); ++it)
 		name += (*it)->toString(_withoutDataLocation) + (it + 1 == m_parameterTypes.end() ? "" : ",");
 	return name + ")";
 }
 
-string ModuleType::richIdentifier() const
+std::string ModuleType::richIdentifier() const
 {
-	return "t_module_" + to_string(m_sourceUnit.id());
+	return "t_module_" + std::to_string(m_sourceUnit.id());
 }
 
 bool ModuleType::operator==(Type const& _other) const
@@ -4071,12 +4070,12 @@ MemberList::MemberMap ModuleType::nativeMembers(ASTNode const*) const
 	return symbols;
 }
 
-string ModuleType::toString(bool) const
+std::string ModuleType::toString(bool) const
 {
-	return string("module \"") + *m_sourceUnit.annotation().path + string("\"");
+	return std::string("module \"") + *m_sourceUnit.annotation().path + std::string("\"");
 }
 
-string MagicType::richIdentifier() const
+std::string MagicType::richIdentifier() const
 {
 	switch (m_kind)
 	{
@@ -4243,7 +4242,7 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 	return {};
 }
 
-string MagicType::toString(bool _withoutDataLocation) const
+std::string MagicType::toString(bool _withoutDataLocation) const
 {
 	switch (m_kind)
 	{
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index a396a7d760..6a48034139 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -25,7 +25,8 @@ NAMESPACE_STD_FREE_FILES=(
     liblangutil/*
     libsmtutil/*
     libsolc/*
-	libsolidity/analysis/*
+    libsolidity/analysis/*
+    libsolidity/ast/*
 )
 
 (

From ce423e5ae5673f5cc0f565371e26ed9a37861f94 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 14 Aug 2023 21:37:31 +0200
Subject: [PATCH 1541/1748] Purge using namespace std from libsolidity/codegen

---
 libsolidity/codegen/ABIFunctions.cpp          | 181 +++--
 libsolidity/codegen/ArrayUtils.cpp            |   5 +-
 libsolidity/codegen/Compiler.cpp              |   3 +-
 libsolidity/codegen/CompilerContext.cpp       |  73 +-
 libsolidity/codegen/CompilerUtils.cpp         |  37 +-
 libsolidity/codegen/ContractCompiler.cpp      |  57 +-
 libsolidity/codegen/ExpressionCompiler.cpp    |  45 +-
 libsolidity/codegen/LValue.cpp                |   9 +-
 .../codegen/MultiUseYulFunctionCollector.cpp  |  23 +-
 libsolidity/codegen/YulUtilFunctions.cpp      | 622 +++++++++---------
 libsolidity/codegen/ir/Common.cpp             |  65 +-
 .../codegen/ir/IRGenerationContext.cpp        |  11 +-
 libsolidity/codegen/ir/IRGenerator.cpp        | 202 +++---
 .../codegen/ir/IRGeneratorForStatements.cpp   | 231 ++++---
 libsolidity/codegen/ir/IRVariable.cpp         |  15 +-
 scripts/check_style.sh                        |   2 +
 16 files changed, 785 insertions(+), 796 deletions(-)

diff --git a/libsolidity/codegen/ABIFunctions.cpp b/libsolidity/codegen/ABIFunctions.cpp
index c92525f212..bbcdb395b3 100644
--- a/libsolidity/codegen/ABIFunctions.cpp
+++ b/libsolidity/codegen/ABIFunctions.cpp
@@ -30,12 +30,11 @@
 
 #include <boost/algorithm/string/join.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
 
-string ABIFunctions::tupleEncoder(
+std::string ABIFunctions::tupleEncoder(
 	TypePointers const& _givenTypes,
 	TypePointers _targetTypes,
 	bool _encodeAsLibraryTypes,
@@ -56,7 +55,7 @@ string ABIFunctions::tupleEncoder(
 		solAssert(t, "");
 	}
 
-	string functionName = string("abi_encode_tuple_");
+	std::string functionName = std::string("abi_encode_tuple_");
 	for (auto const& t: _givenTypes)
 		functionName += t->identifier() + "_";
 	functionName += "_to_";
@@ -76,8 +75,8 @@ string ABIFunctions::tupleEncoder(
 		)");
 		templ("functionName", functionName);
 		size_t const headSize_ = headSize(_targetTypes);
-		templ("headSize", to_string(headSize_));
-		string encodeElements;
+		templ("headSize", std::to_string(headSize_));
+		std::string encodeElements;
 		size_t headPos = 0;
 		size_t stackPos = 0;
 		for (size_t i = 0; i < _givenTypes.size(); ++i)
@@ -88,24 +87,24 @@ string ABIFunctions::tupleEncoder(
 			bool dynamic = _targetTypes[i]->isDynamicallyEncoded();
 			Whiskers elementTempl(
 				dynamic ?
-				string(R"(
+				std::string(R"(
 					mstore(add(headStart, <pos>), sub(tail, headStart))
 					tail := <abiEncode>(<values> tail)
 				)") :
-				string(R"(
+				std::string(R"(
 					<abiEncode>(<values> add(headStart, <pos>))
 				)")
 			);
-			string values = suffixedVariableNameList("value", stackPos, stackPos + sizeOnStack);
+			std::string values = suffixedVariableNameList("value", stackPos, stackPos + sizeOnStack);
 			elementTempl("values", values.empty() ? "" : values + ", ");
-			elementTempl("pos", to_string(headPos));
+			elementTempl("pos", std::to_string(headPos));
 			elementTempl("abiEncode", abiEncodingFunction(*_givenTypes[i], *_targetTypes[i], options));
 			encodeElements += elementTempl.render();
 			headPos += _targetTypes[i]->calldataHeadSize();
 			stackPos += sizeOnStack;
 		}
 		solAssert(headPos == headSize_, "");
-		string valueParams =
+		std::string valueParams =
 			_reversed ?
 			suffixedVariableNameList("value", stackPos, 0) :
 			suffixedVariableNameList("value", 0, stackPos);
@@ -116,7 +115,7 @@ string ABIFunctions::tupleEncoder(
 	});
 }
 
-string ABIFunctions::tupleEncoderPacked(
+std::string ABIFunctions::tupleEncoderPacked(
 	TypePointers const& _givenTypes,
 	TypePointers _targetTypes,
 	bool _reversed
@@ -135,7 +134,7 @@ string ABIFunctions::tupleEncoderPacked(
 		solAssert(t, "");
 	}
 
-	string functionName = string("abi_encode_tuple_packed_");
+	std::string functionName = std::string("abi_encode_tuple_packed_");
 	for (auto const& t: _givenTypes)
 		functionName += t->identifier() + "_";
 	functionName += "_to_";
@@ -154,7 +153,7 @@ string ABIFunctions::tupleEncoderPacked(
 			}
 		)");
 		templ("functionName", functionName);
-		string encodeElements;
+		std::string encodeElements;
 		size_t stackPos = 0;
 		for (size_t i = 0; i < _givenTypes.size(); ++i)
 		{
@@ -164,23 +163,23 @@ string ABIFunctions::tupleEncoderPacked(
 			bool dynamic = _targetTypes[i]->isDynamicallyEncoded();
 			Whiskers elementTempl(
 				dynamic ?
-				string(R"(
+				std::string(R"(
 					pos := <abiEncode>(<values> pos)
 				)") :
-				string(R"(
+				std::string(R"(
 					<abiEncode>(<values> pos)
 					pos := add(pos, <calldataEncodedSize>)
 				)")
 			);
-			string values = suffixedVariableNameList("value", stackPos, stackPos + sizeOnStack);
+			std::string values = suffixedVariableNameList("value", stackPos, stackPos + sizeOnStack);
 			elementTempl("values", values.empty() ? "" : values + ", ");
 			if (!dynamic)
-				elementTempl("calldataEncodedSize", to_string(_targetTypes[i]->calldataEncodedSize(false)));
+				elementTempl("calldataEncodedSize", std::to_string(_targetTypes[i]->calldataEncodedSize(false)));
 			elementTempl("abiEncode", abiEncodingFunction(*_givenTypes[i], *_targetTypes[i], options));
 			encodeElements += elementTempl.render();
 			stackPos += sizeOnStack;
 		}
-		string valueParams =
+		std::string valueParams =
 			_reversed ?
 			suffixedVariableNameList("value", stackPos, 0) :
 			suffixedVariableNameList("value", 0, stackPos);
@@ -190,9 +189,9 @@ string ABIFunctions::tupleEncoderPacked(
 		return templ.render();
 	});
 }
-string ABIFunctions::tupleDecoder(TypePointers const& _types, bool _fromMemory)
+std::string ABIFunctions::tupleDecoder(TypePointers const& _types, bool _fromMemory)
 {
-	string functionName = string("abi_decode_tuple_");
+	std::string functionName = std::string("abi_decode_tuple_");
 	for (auto const& t: _types)
 		functionName += t->identifier();
 	if (_fromMemory)
@@ -211,10 +210,10 @@ string ABIFunctions::tupleDecoder(TypePointers const& _types, bool _fromMemory)
 		)");
 		templ("functionName", functionName);
 		templ("revertString", revertReasonIfDebugFunction("ABI decoding: tuple data too short"));
-		templ("minimumSize", to_string(headSize(decodingTypes)));
+		templ("minimumSize", std::to_string(headSize(decodingTypes)));
 
-		string decodeElements;
-		vector<string> valueReturnParams;
+		std::string decodeElements;
+		std::vector<std::string> valueReturnParams;
 		size_t headPos = 0;
 		size_t stackPos = 0;
 		for (size_t i = 0; i < _types.size(); ++i)
@@ -224,11 +223,11 @@ string ABIFunctions::tupleDecoder(TypePointers const& _types, bool _fromMemory)
 			size_t sizeOnStack = _types[i]->sizeOnStack();
 			solAssert(sizeOnStack == decodingTypes[i]->sizeOnStack(), "");
 			solAssert(sizeOnStack > 0, "");
-			vector<string> valueNamesLocal;
+			std::vector<std::string> valueNamesLocal;
 			for (size_t j = 0; j < sizeOnStack; j++)
 			{
-				valueNamesLocal.emplace_back("value" + to_string(stackPos));
-				valueReturnParams.emplace_back("value" + to_string(stackPos));
+				valueNamesLocal.emplace_back("value" + std::to_string(stackPos));
+				valueReturnParams.emplace_back("value" + std::to_string(stackPos));
 				stackPos++;
 			}
 			Whiskers elementTempl(R"(
@@ -247,7 +246,7 @@ string ABIFunctions::tupleDecoder(TypePointers const& _types, bool _fromMemory)
 			elementTempl("revertString", revertReasonIfDebugFunction("ABI decoding: invalid tuple offset"));
 			elementTempl("load", _fromMemory ? "mload" : "calldataload");
 			elementTempl("values", boost::algorithm::join(valueNamesLocal, ", "));
-			elementTempl("pos", to_string(headPos));
+			elementTempl("pos", std::to_string(headPos));
 			elementTempl("abiDecode", abiDecodingFunction(*_types[i], _fromMemory, true));
 			decodeElements += elementTempl.render();
 			headPos += decodingTypes[i]->calldataHeadSize();
@@ -260,9 +259,9 @@ string ABIFunctions::tupleDecoder(TypePointers const& _types, bool _fromMemory)
 	});
 }
 
-string ABIFunctions::EncodingOptions::toFunctionNameSuffix() const
+std::string ABIFunctions::EncodingOptions::toFunctionNameSuffix() const
 {
-	string suffix;
+	std::string suffix;
 	if (!padded)
 		suffix += "_nonPadded";
 	if (dynamicInplace)
@@ -274,7 +273,7 @@ string ABIFunctions::EncodingOptions::toFunctionNameSuffix() const
 	return suffix;
 }
 
-string ABIFunctions::abiEncodingFunction(
+std::string ABIFunctions::abiEncodingFunction(
 	Type const& _from,
 	Type const& _to,
 	EncodingOptions const& _options
@@ -349,7 +348,7 @@ string ABIFunctions::abiEncodingFunction(
 	solAssert(_from.sizeOnStack() == 1, "");
 	solAssert(to.isValueType(), "");
 	solAssert(to.calldataEncodedSize() == 32, "");
-	string functionName =
+	std::string functionName =
 		"abi_encode_" +
 		_from.identifier() +
 		"_to_" +
@@ -376,7 +375,7 @@ string ABIFunctions::abiEncodingFunction(
 		}
 		else
 		{
-			string cleanupConvert;
+			std::string cleanupConvert;
 			if (_from == to)
 				cleanupConvert = m_utils.cleanupFunction(_from) + "(value)";
 			else
@@ -389,21 +388,21 @@ string ABIFunctions::abiEncodingFunction(
 	});
 }
 
-string ABIFunctions::abiEncodeAndReturnUpdatedPosFunction(
+std::string ABIFunctions::abiEncodeAndReturnUpdatedPosFunction(
 	Type const& _givenType,
 	Type const& _targetType,
 	ABIFunctions::EncodingOptions const& _options
 )
 {
-	string functionName =
+	std::string functionName =
 		"abi_encodeUpdatedPos_" +
 		_givenType.identifier() +
 		"_to_" +
 		_targetType.identifier() +
 		_options.toFunctionNameSuffix();
 	return createFunction(functionName, [&]() {
-		string values = suffixedVariableNameList("value", 0, numVariablesForType(_givenType, _options));
-		string encoder = abiEncodingFunction(_givenType, _targetType, _options);
+		std::string values = suffixedVariableNameList("value", 0, numVariablesForType(_givenType, _options));
+		std::string encoder = abiEncodingFunction(_givenType, _targetType, _options);
 		Type const* targetEncoding = _targetType.fullEncodingType(_options.encodeAsLibraryTypes, true, false);
 		solAssert(targetEncoding, "");
 		if (targetEncoding->isDynamicallyEncoded())
@@ -435,7 +434,7 @@ string ABIFunctions::abiEncodeAndReturnUpdatedPosFunction(
 	});
 }
 
-string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
+std::string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
 	Type const& _from,
 	Type const& _to,
 	EncodingOptions const& _options
@@ -461,7 +460,7 @@ string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
 		""
 	);
 
-	string functionName =
+	std::string functionName =
 		"abi_encode_" +
 		_from.identifier() +
 		"_to_" +
@@ -522,13 +521,13 @@ string ABIFunctions::abiEncodingFunctionCalldataArrayWithoutCleanup(
 	});
 }
 
-string ABIFunctions::abiEncodingFunctionSimpleArray(
+std::string ABIFunctions::abiEncodingFunctionSimpleArray(
 	ArrayType const& _from,
 	ArrayType const& _to,
 	EncodingOptions const& _options
 )
 {
-	string functionName =
+	std::string functionName =
 		"abi_encode_" +
 		_from.identifier() +
 		"_to_" +
@@ -548,7 +547,7 @@ string ABIFunctions::abiEncodingFunctionSimpleArray(
 		EncodingOptions subOptions(_options);
 		subOptions.encodeFunctionFromStack = false;
 		subOptions.padded = true;
-		string elementValues = suffixedVariableNameList("elementValue", 0, numVariablesForType(*_from.baseType(), subOptions));
+		std::string elementValues = suffixedVariableNameList("elementValue", 0, numVariablesForType(*_from.baseType(), subOptions));
 		Whiskers templ(
 			usesTail ?
 			R"(
@@ -632,13 +631,13 @@ string ABIFunctions::abiEncodingFunctionSimpleArray(
 	});
 }
 
-string ABIFunctions::abiEncodingFunctionMemoryByteArray(
+std::string ABIFunctions::abiEncodingFunctionMemoryByteArray(
 	ArrayType const& _from,
 	ArrayType const& _to,
 	EncodingOptions const& _options
 )
 {
-	string functionName =
+	std::string functionName =
 		"abi_encode_" +
 		_from.identifier() +
 		"_to_" +
@@ -669,13 +668,13 @@ string ABIFunctions::abiEncodingFunctionMemoryByteArray(
 	});
 }
 
-string ABIFunctions::abiEncodingFunctionCompactStorageArray(
+std::string ABIFunctions::abiEncodingFunctionCompactStorageArray(
 	ArrayType const& _from,
 	ArrayType const& _to,
 	EncodingOptions const& _options
 )
 {
-	string functionName =
+	std::string functionName =
 		"abi_encode_" +
 		_from.identifier() +
 		"_to_" +
@@ -791,13 +790,13 @@ string ABIFunctions::abiEncodingFunctionCompactStorageArray(
 				templ("useSpill", "1");
 			else
 				templ("useSpill", "0");
-			templ("itemsPerSlot", to_string(itemsPerSlot));
+			templ("itemsPerSlot", std::to_string(itemsPerSlot));
 			templ("stride", toCompactHexWithPrefix(_to.calldataStride()));
 
 			EncodingOptions subOptions(_options);
 			subOptions.encodeFunctionFromStack = false;
 			subOptions.padded = true;
-			string encodeToMemoryFun = abiEncodingFunction(
+			std::string encodeToMemoryFun = abiEncodingFunction(
 				*_from.baseType(),
 				*_to.baseType(),
 				subOptions
@@ -820,13 +819,13 @@ string ABIFunctions::abiEncodingFunctionCompactStorageArray(
 	});
 }
 
-string ABIFunctions::abiEncodingFunctionStruct(
+std::string ABIFunctions::abiEncodingFunctionStruct(
 	StructType const& _from,
 	StructType const& _to,
 	EncodingOptions const& _options
 )
 {
-	string functionName =
+	std::string functionName =
 		"abi_encode_" +
 		_from.identifier() +
 		"_to_" +
@@ -867,7 +866,7 @@ string ABIFunctions::abiEncodingFunctionStruct(
 		templ("init", _from.dataStoredIn(DataLocation::Storage) ? "let slotValue := 0" : "");
 		u256 previousSlotOffset(-1);
 		u256 encodingOffset = 0;
-		vector<map<string, string>> members;
+		std::vector<std::map<std::string, std::string>> members;
 		for (auto const& member: _to.members(nullptr))
 		{
 			solAssert(member.type, "");
@@ -890,7 +889,7 @@ string ABIFunctions::abiEncodingFunctionStruct(
 					solAssert(memberTypeFrom->isValueType() == memberTypeTo->isValueType(), "");
 					u256 storageSlotOffset;
 					size_t intraSlotOffset;
-					tie(storageSlotOffset, intraSlotOffset) = _from.storageOffsetsOfMember(member.name);
+					std::tie(storageSlotOffset, intraSlotOffset) = _from.storageOffsetsOfMember(member.name);
 					if (memberTypeFrom->isValueType())
 					{
 						if (storageSlotOffset != previousSlotOffset)
@@ -910,13 +909,13 @@ string ABIFunctions::abiEncodingFunctionStruct(
 				}
 				case DataLocation::Memory:
 				{
-					string sourceOffset = toCompactHexWithPrefix(_from.memoryOffsetOfMember(member.name));
+					std::string sourceOffset = toCompactHexWithPrefix(_from.memoryOffsetOfMember(member.name));
 					members.back()["retrieveValue"] = "mload(add(value, " + sourceOffset + "))";
 					break;
 				}
 				case DataLocation::CallData:
 				{
-					string sourceOffset = toCompactHexWithPrefix(_from.calldataOffsetOfMember(member.name));
+					std::string sourceOffset = toCompactHexWithPrefix(_from.calldataOffsetOfMember(member.name));
 					members.back()["retrieveValue"] = calldataAccessFunction(*memberTypeFrom) + "(value, add(value, " + sourceOffset + "))";
 					break;
 				}
@@ -929,10 +928,10 @@ string ABIFunctions::abiEncodingFunctionStruct(
 			// Like with arrays, struct members are always padded.
 			subOptions.padded = true;
 
-			string memberValues = suffixedVariableNameList("memberValue", 0, numVariablesForType(*memberTypeFrom, subOptions));
+			std::string memberValues = suffixedVariableNameList("memberValue", 0, numVariablesForType(*memberTypeFrom, subOptions));
 			members.back()["memberValues"] = memberValues;
 
-			string encode;
+			std::string encode;
 			if (_options.dynamicInplace)
 				encode = Whiskers{"pos := <encode>(<memberValues>, pos)"}
 					("encode", abiEncodeAndReturnUpdatedPosFunction(*memberTypeFrom, *memberTypeTo, subOptions))
@@ -942,7 +941,7 @@ string ABIFunctions::abiEncodingFunctionStruct(
 			{
 				Whiskers encodeTempl(
 					dynamicMember ?
-					string(R"(
+					std::string(R"(
 						mstore(add(pos, <encodingOffset>), sub(tail, pos))
 						tail := <abiEncode>(<memberValues>, tail)
 					)") :
@@ -966,7 +965,7 @@ string ABIFunctions::abiEncodingFunctionStruct(
 	});
 }
 
-string ABIFunctions::abiEncodingFunctionStringLiteral(
+std::string ABIFunctions::abiEncodingFunctionStringLiteral(
 	Type const& _from,
 	Type const& _to,
 	EncodingOptions const& _options
@@ -974,7 +973,7 @@ string ABIFunctions::abiEncodingFunctionStringLiteral(
 {
 	solAssert(_from.category() == Type::Category::StringLiteral, "");
 
-	string functionName =
+	std::string functionName =
 		"abi_encode_" +
 		_from.identifier() +
 		"_to_" +
@@ -982,7 +981,7 @@ string ABIFunctions::abiEncodingFunctionStringLiteral(
 		_options.toFunctionNameSuffix();
 	return createFunction(functionName, [&]() {
 		auto const& strType = dynamic_cast<StringLiteralType const&>(_from);
-		string const& value = strType.value();
+		std::string const& value = strType.value();
 		solAssert(_from.sizeOnStack() == 0, "");
 
 		if (_to.isDynamicallySized())
@@ -998,12 +997,12 @@ string ABIFunctions::abiEncodingFunctionStringLiteral(
 			templ("functionName", functionName);
 
 			// TODO this can make use of CODECOPY for large strings once we have that in Yul
-			templ("length", to_string(value.size()));
+			templ("length", std::to_string(value.size()));
 			templ("storeLength", arrayStoreLengthForEncodingFunction(dynamic_cast<ArrayType const&>(_to), _options));
 			if (_options.padded)
-				templ("overallSize", to_string(((value.size() + 31) / 32) * 32));
+				templ("overallSize", std::to_string(((value.size() + 31) / 32) * 32));
 			else
-				templ("overallSize", to_string(value.size()));
+				templ("overallSize", std::to_string(value.size()));
 			templ("storeLiteralInMemory", m_utils.storeLiteralInMemoryFunction(value));
 			return templ.render();
 		}
@@ -1023,7 +1022,7 @@ string ABIFunctions::abiEncodingFunctionStringLiteral(
 	});
 }
 
-string ABIFunctions::abiEncodingFunctionFunctionType(
+std::string ABIFunctions::abiEncodingFunctionFunctionType(
 	FunctionType const& _from,
 	Type const& _to,
 	EncodingOptions const& _options
@@ -1036,7 +1035,7 @@ string ABIFunctions::abiEncodingFunctionFunctionType(
 		"Invalid function type conversion requested"
 	);
 
-	string functionName =
+	std::string functionName =
 		"abi_encode_" +
 		_from.identifier() +
 		"_to_" +
@@ -1069,7 +1068,7 @@ string ABIFunctions::abiEncodingFunctionFunctionType(
 		});
 }
 
-string ABIFunctions::abiDecodingFunction(Type const& _type, bool _fromMemory, bool _forUseOnStack)
+std::string ABIFunctions::abiDecodingFunction(Type const& _type, bool _fromMemory, bool _forUseOnStack)
 {
 	// The decoding function has to perform bounds checks unless it decodes a value type.
 	// Conversely, bounds checks have to be performed before the decoding function
@@ -1104,7 +1103,7 @@ string ABIFunctions::abiDecodingFunction(Type const& _type, bool _fromMemory, bo
 		return abiDecodingFunctionValueType(_type, _fromMemory);
 }
 
-string ABIFunctions::abiDecodingFunctionValueType(Type const& _type, bool _fromMemory)
+std::string ABIFunctions::abiDecodingFunctionValueType(Type const& _type, bool _fromMemory)
 {
 	Type const* decodingType = _type.decodingType();
 	solAssert(decodingType, "");
@@ -1113,7 +1112,7 @@ string ABIFunctions::abiDecodingFunctionValueType(Type const& _type, bool _fromM
 	solAssert(!decodingType->isDynamicallyEncoded(), "");
 	solAssert(decodingType->calldataEncodedSize() == 32, "");
 
-	string functionName =
+	std::string functionName =
 		"abi_decode_" +
 		_type.identifier() +
 		(_fromMemory ? "_fromMemory" : "");
@@ -1134,17 +1133,17 @@ string ABIFunctions::abiDecodingFunctionValueType(Type const& _type, bool _fromM
 
 }
 
-string ABIFunctions::abiDecodingFunctionArray(ArrayType const& _type, bool _fromMemory)
+std::string ABIFunctions::abiDecodingFunctionArray(ArrayType const& _type, bool _fromMemory)
 {
 	solAssert(_type.dataStoredIn(DataLocation::Memory), "");
 
-	string functionName =
+	std::string functionName =
 		"abi_decode_" +
 		_type.identifier() +
 		(_fromMemory ? "_fromMemory" : "");
 
 	return createFunction(functionName, [&]() {
-		string load = _fromMemory ? "mload" : "calldataload";
+		std::string load = _fromMemory ? "mload" : "calldataload";
 		Whiskers templ(
 			R"(
 				// <readableTypeName>
@@ -1166,14 +1165,14 @@ string ABIFunctions::abiDecodingFunctionArray(ArrayType const& _type, bool _from
 	});
 }
 
-string ABIFunctions::abiDecodingFunctionArrayAvailableLength(ArrayType const& _type, bool _fromMemory)
+std::string ABIFunctions::abiDecodingFunctionArrayAvailableLength(ArrayType const& _type, bool _fromMemory)
 {
 	solAssert(_type.dataStoredIn(DataLocation::Memory), "");
 	if (_type.isByteArrayOrString())
 		return abiDecodingFunctionByteArrayAvailableLength(_type, _fromMemory);
 	solAssert(_type.calldataStride() > 0, "");
 
-	string functionName =
+	std::string functionName =
 		"abi_decode_available_length_" +
 		_type.identifier() +
 		(_fromMemory ? "_fromMemory" : "");
@@ -1224,7 +1223,7 @@ string ABIFunctions::abiDecodingFunctionArrayAvailableLength(ArrayType const& _t
 	});
 }
 
-string ABIFunctions::abiDecodingFunctionCalldataArray(ArrayType const& _type)
+std::string ABIFunctions::abiDecodingFunctionCalldataArray(ArrayType const& _type)
 {
 	solAssert(_type.dataStoredIn(DataLocation::CallData), "");
 	if (!_type.isDynamicallySized())
@@ -1232,7 +1231,7 @@ string ABIFunctions::abiDecodingFunctionCalldataArray(ArrayType const& _type)
 	solAssert(_type.calldataStride() > 0, "");
 	solAssert(_type.calldataStride() < u256("0xffffffffffffffff"), "");
 
-	string functionName =
+	std::string functionName =
 		"abi_decode_" +
 		_type.identifier();
 	return createFunction(functionName, [&]() {
@@ -1273,12 +1272,12 @@ string ABIFunctions::abiDecodingFunctionCalldataArray(ArrayType const& _type)
 	});
 }
 
-string ABIFunctions::abiDecodingFunctionByteArrayAvailableLength(ArrayType const& _type, bool _fromMemory)
+std::string ABIFunctions::abiDecodingFunctionByteArrayAvailableLength(ArrayType const& _type, bool _fromMemory)
 {
 	solAssert(_type.dataStoredIn(DataLocation::Memory), "");
 	solAssert(_type.isByteArrayOrString(), "");
 
-	string functionName =
+	std::string functionName =
 		"abi_decode_available_length_" +
 		_type.identifier() +
 		(_fromMemory ? "_fromMemory" : "");
@@ -1302,10 +1301,10 @@ string ABIFunctions::abiDecodingFunctionByteArrayAvailableLength(ArrayType const
 	});
 }
 
-string ABIFunctions::abiDecodingFunctionCalldataStruct(StructType const& _type)
+std::string ABIFunctions::abiDecodingFunctionCalldataStruct(StructType const& _type)
 {
 	solAssert(_type.dataStoredIn(DataLocation::CallData), "");
-	string functionName =
+	std::string functionName =
 		"abi_decode_" +
 		_type.identifier();
 
@@ -1321,15 +1320,15 @@ string ABIFunctions::abiDecodingFunctionCalldataStruct(StructType const& _type)
 		w("revertString", revertReasonIfDebugFunction("ABI decoding: struct calldata too short"));
 		w("functionName", functionName);
 		w("readableTypeName", _type.toString(true));
-		w("minimumSize", to_string(_type.isDynamicallyEncoded() ? _type.calldataEncodedTailSize() : _type.calldataEncodedSize(true)));
+		w("minimumSize", std::to_string(_type.isDynamicallyEncoded() ? _type.calldataEncodedTailSize() : _type.calldataEncodedSize(true)));
 		return w.render();
 	});
 }
 
-string ABIFunctions::abiDecodingFunctionStruct(StructType const& _type, bool _fromMemory)
+std::string ABIFunctions::abiDecodingFunctionStruct(StructType const& _type, bool _fromMemory)
 {
 	solAssert(!_type.dataStoredIn(DataLocation::CallData), "");
-	string functionName =
+	std::string functionName =
 		"abi_decode_" +
 		_type.identifier() +
 		(_fromMemory ? "_fromMemory" : "");
@@ -1356,7 +1355,7 @@ string ABIFunctions::abiDecodingFunctionStruct(StructType const& _type, bool _fr
 		solAssert(_type.memoryDataSize() < u256("0xffffffffffffffff"), "");
 		templ("memorySize", toCompactHexWithPrefix(_type.memoryDataSize()));
 		size_t headPos = 0;
-		vector<map<string, string>> members;
+		std::vector<std::map<std::string, std::string>> members;
 		for (auto const& member: _type.members(nullptr))
 		{
 			solAssert(member.type, "");
@@ -1376,7 +1375,7 @@ string ABIFunctions::abiDecodingFunctionStruct(StructType const& _type, bool _fr
 			// TODO add test
 			memberTempl("revertString", revertReasonIfDebugFunction("ABI decoding: invalid struct offset"));
 			memberTempl("load", _fromMemory ? "mload" : "calldataload");
-			memberTempl("pos", to_string(headPos));
+			memberTempl("pos", std::to_string(headPos));
 			memberTempl("memoryOffset", toCompactHexWithPrefix(_type.memoryOffsetOfMember(member.name)));
 			memberTempl("abiDecode", abiDecodingFunction(*member.type, _fromMemory, false));
 
@@ -1391,11 +1390,11 @@ string ABIFunctions::abiDecodingFunctionStruct(StructType const& _type, bool _fr
 	});
 }
 
-string ABIFunctions::abiDecodingFunctionFunctionType(FunctionType const& _type, bool _fromMemory, bool _forUseOnStack)
+std::string ABIFunctions::abiDecodingFunctionFunctionType(FunctionType const& _type, bool _fromMemory, bool _forUseOnStack)
 {
 	solAssert(_type.kind() == FunctionType::Kind::External, "");
 
-	string functionName =
+	std::string functionName =
 		"abi_decode_" +
 		_type.identifier() +
 		(_fromMemory ? "_fromMemory" : "") +
@@ -1430,10 +1429,10 @@ string ABIFunctions::abiDecodingFunctionFunctionType(FunctionType const& _type,
 	});
 }
 
-string ABIFunctions::calldataAccessFunction(Type const& _type)
+std::string ABIFunctions::calldataAccessFunction(Type const& _type)
 {
 	solAssert(_type.isValueType() || _type.dataStoredIn(DataLocation::CallData), "");
-	string functionName = "calldata_access_" + _type.identifier();
+	std::string functionName = "calldata_access_" + _type.identifier();
 	return createFunction(functionName, [&]() {
 		if (_type.isDynamicallyEncoded())
 		{
@@ -1477,7 +1476,7 @@ string ABIFunctions::calldataAccessFunction(Type const& _type)
 		}
 		else if (_type.isValueType())
 		{
-			string decodingFunction;
+			std::string decodingFunction;
 			if (auto const* functionType = dynamic_cast<FunctionType const*>(&_type))
 				decodingFunction = abiDecodingFunctionFunctionType(*functionType, false, false);
 			else
@@ -1510,9 +1509,9 @@ string ABIFunctions::calldataAccessFunction(Type const& _type)
 	});
 }
 
-string ABIFunctions::arrayStoreLengthForEncodingFunction(ArrayType const& _type, EncodingOptions const& _options)
+std::string ABIFunctions::arrayStoreLengthForEncodingFunction(ArrayType const& _type, EncodingOptions const& _options)
 {
-	string functionName = "array_storeLengthForEncoding_" + _type.identifier() + _options.toFunctionNameSuffix();
+	std::string functionName = "array_storeLengthForEncoding_" + _type.identifier() + _options.toFunctionNameSuffix();
 	return createFunction(functionName, [&]() {
 		if (_type.isDynamicallySized() && !_options.dynamicInplace)
 			return Whiskers(R"(
@@ -1534,7 +1533,7 @@ string ABIFunctions::arrayStoreLengthForEncodingFunction(ArrayType const& _type,
 	});
 }
 
-string ABIFunctions::createFunction(string const& _name, function<string ()> const& _creator)
+std::string ABIFunctions::createFunction(std::string const& _name, std::function<std::string ()> const& _creator)
 {
 	return m_functionCollector.createFunction(_name, _creator);
 }
diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
index 609ff9993b..afcc38fe8a 100644
--- a/libsolidity/codegen/ArrayUtils.cpp
+++ b/libsolidity/codegen/ArrayUtils.cpp
@@ -36,7 +36,6 @@
 #include <libevmasm/Instruction.h>
 #include <liblangutil/Exceptions.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::frontend;
@@ -314,7 +313,7 @@ void ArrayUtils::copyArrayToMemory(ArrayType const& _sourceType, bool _padToWord
 		if (!_sourceType.isByteArrayOrString())
 			convertLengthToSize(_sourceType);
 
-		string routine = "calldatacopy(target, source, len)\n";
+		std::string routine = "calldatacopy(target, source, len)\n";
 		if (_padToWordBoundaries)
 			routine += R"(
 				// Set padding suffix to zero
@@ -890,7 +889,7 @@ void ArrayUtils::popStorageArrayElement(ArrayType const& _type) const
 			sstore(ref, slot_value)
 		})");
 		code("panicSelector", util::selectorFromSignatureU256("Panic(uint256)").str());
-		code("emptyArrayPop", to_string(unsigned(util::PanicCode::EmptyArrayPop)));
+		code("emptyArrayPop", std::to_string(unsigned(util::PanicCode::EmptyArrayPop)));
 		m_context.appendInlineAssembly(code.render(), {"ref", "slot_value", "length"});
 		m_context << Instruction::POP << Instruction::POP << Instruction::POP;
 	}
diff --git a/libsolidity/codegen/Compiler.cpp b/libsolidity/codegen/Compiler.cpp
index c044760a02..844de8ba82 100644
--- a/libsolidity/codegen/Compiler.cpp
+++ b/libsolidity/codegen/Compiler.cpp
@@ -26,13 +26,12 @@
 #include <libsolidity/codegen/ContractCompiler.h>
 #include <libevmasm/Assembly.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
 void Compiler::compileContract(
 	ContractDefinition const& _contract,
-	std::map<ContractDefinition const*, shared_ptr<Compiler const>> const& _otherCompilers,
+	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers,
 	bytes const& _metadata
 )
 {
diff --git a/libsolidity/codegen/CompilerContext.cpp b/libsolidity/codegen/CompilerContext.cpp
index bc69f82c57..d9264c6ac5 100644
--- a/libsolidity/codegen/CompilerContext.cpp
+++ b/libsolidity/codegen/CompilerContext.cpp
@@ -55,7 +55,6 @@
 #undef SOL_OUTPUT_ASM
 
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::evmasm;
@@ -68,7 +67,7 @@ void CompilerContext::addStateVariable(
 	unsigned _byteOffset
 )
 {
-	m_stateVariables[&_declaration] = make_pair(_storageOffset, _byteOffset);
+	m_stateVariables[&_declaration] = std::make_pair(_storageOffset, _byteOffset);
 }
 
 void CompilerContext::addImmutable(VariableDeclaration const& _variable)
@@ -88,14 +87,14 @@ size_t CompilerContext::immutableMemoryOffset(VariableDeclaration const& _variab
 	return m_immutableVariables.at(&_variable);
 }
 
-vector<string> CompilerContext::immutableVariableSlotNames(VariableDeclaration const& _variable)
+std::vector<std::string> CompilerContext::immutableVariableSlotNames(VariableDeclaration const& _variable)
 {
-	string baseName = to_string(_variable.id());
+	std::string baseName = std::to_string(_variable.id());
 	solAssert(_variable.annotation().type->sizeOnStack() > 0, "");
 	if (_variable.annotation().type->sizeOnStack() == 1)
 		return {baseName};
-	vector<string> names;
-	auto collectSlotNames = [&](string const& _baseName, Type const* type, auto const& _recurse) -> void {
+	std::vector<std::string> names;
+	auto collectSlotNames = [&](std::string const& _baseName, Type const* type, auto const& _recurse) -> void {
 		for (auto const& [slot, type]: type->stackItems())
 			if (type)
 				_recurse(_baseName + " " + slot, type, _recurse);
@@ -121,10 +120,10 @@ void CompilerContext::startFunction(Declaration const& _function)
 }
 
 void CompilerContext::callLowLevelFunction(
-	string const& _name,
+	std::string const& _name,
 	unsigned _inArgs,
 	unsigned _outArgs,
-	function<void(CompilerContext&)> const& _generator
+	std::function<void(CompilerContext&)> const& _generator
 )
 {
 	evmasm::AssemblyItem retTag = pushNewTag();
@@ -138,7 +137,7 @@ void CompilerContext::callLowLevelFunction(
 }
 
 void CompilerContext::callYulFunction(
-	string const& _name,
+	std::string const& _name,
 	unsigned _inArgs,
 	unsigned _outArgs
 )
@@ -152,10 +151,10 @@ void CompilerContext::callYulFunction(
 }
 
 evmasm::AssemblyItem CompilerContext::lowLevelFunctionTag(
-	string const& _name,
+	std::string const& _name,
 	unsigned _inArgs,
 	unsigned _outArgs,
-	function<void(CompilerContext&)> const& _generator
+	std::function<void(CompilerContext&)> const& _generator
 )
 {
 	auto it = m_lowLevelFunctions.find(_name);
@@ -174,10 +173,10 @@ void CompilerContext::appendMissingLowLevelFunctions()
 {
 	while (!m_lowLevelFunctionGenerationQueue.empty())
 	{
-		string name;
+		std::string name;
 		unsigned inArgs;
 		unsigned outArgs;
-		function<void(CompilerContext&)> generator;
+		std::function<void(CompilerContext&)> generator;
 		tie(name, inArgs, outArgs, generator) = m_lowLevelFunctionGenerationQueue.front();
 		m_lowLevelFunctionGenerationQueue.pop();
 
@@ -195,7 +194,7 @@ void CompilerContext::appendYulUtilityFunctions(OptimiserSettings const& _optimi
 	solAssert(!m_appendYulUtilityFunctionsRan, "requestedYulFunctions called more than once.");
 	m_appendYulUtilityFunctionsRan = true;
 
-	string code = m_yulFunctionCollector.requestedFunctions();
+	std::string code = m_yulFunctionCollector.requestedFunctions();
 	if (!code.empty())
 	{
 		appendInlineAssembly(
@@ -233,7 +232,7 @@ void CompilerContext::removeVariable(Declaration const& _declaration)
 
 void CompilerContext::removeVariablesAboveStackHeight(unsigned _stackHeight)
 {
-	vector<Declaration const*> toRemove;
+	std::vector<Declaration const*> toRemove;
 	for (auto _var: m_localVariables)
 	{
 		solAssert(!_var.second.empty(), "");
@@ -250,14 +249,14 @@ unsigned CompilerContext::numberOfLocalVariables() const
 	return static_cast<unsigned>(m_localVariables.size());
 }
 
-shared_ptr<evmasm::Assembly> CompilerContext::compiledContract(ContractDefinition const& _contract) const
+std::shared_ptr<evmasm::Assembly> CompilerContext::compiledContract(ContractDefinition const& _contract) const
 {
 	auto ret = m_otherCompilers.find(&_contract);
 	solAssert(ret != m_otherCompilers.end(), "Compiled contract not found.");
 	return ret->second->assemblyPtr();
 }
 
-shared_ptr<evmasm::Assembly> CompilerContext::compiledContractRuntime(ContractDefinition const& _contract) const
+std::shared_ptr<evmasm::Assembly> CompilerContext::compiledContractRuntime(ContractDefinition const& _contract) const
 {
 	auto ret = m_otherCompilers.find(&_contract);
 	solAssert(ret != m_otherCompilers.end(), "Compiled contract not found.");
@@ -320,7 +319,7 @@ unsigned CompilerContext::currentToBaseStackOffset(unsigned _offset) const
 	return static_cast<unsigned>(m_asm->deposit()) - _offset - 1;
 }
 
-pair<u256, unsigned> CompilerContext::storageLocationOfVariable(Declaration const& _declaration) const
+std::pair<u256, unsigned> CompilerContext::storageLocationOfVariable(Declaration const& _declaration) const
 {
 	auto it = m_stateVariables.find(&_declaration);
 	solAssert(it != m_stateVariables.end(), "Variable not found in storage.");
@@ -349,13 +348,13 @@ CompilerContext& CompilerContext::appendConditionalPanic(util::PanicCode _code)
 	return *this;
 }
 
-CompilerContext& CompilerContext::appendRevert(string const& _message)
+CompilerContext& CompilerContext::appendRevert(std::string const& _message)
 {
 	appendInlineAssembly("{ " + revertReasonIfDebug(_message) + " }");
 	return *this;
 }
 
-CompilerContext& CompilerContext::appendConditionalRevert(bool _forwardReturnData, string const& _message)
+CompilerContext& CompilerContext::appendConditionalRevert(bool _forwardReturnData, std::string const& _message)
 {
 	if (_forwardReturnData && m_evmVersion.supportsReturndata())
 		appendInlineAssembly(R"({
@@ -372,24 +371,24 @@ CompilerContext& CompilerContext::appendConditionalRevert(bool _forwardReturnDat
 
 void CompilerContext::resetVisitedNodes(ASTNode const* _node)
 {
-	stack<ASTNode const*> newStack;
+	std::stack<ASTNode const*> newStack;
 	newStack.push(_node);
 	std::swap(m_visitedNodes, newStack);
 	updateSourceLocation();
 }
 
 void CompilerContext::appendInlineAssembly(
-	string const& _assembly,
-	vector<string> const& _localVariables,
-	set<string> const& _externallyUsedFunctions,
+	std::string const& _assembly,
+	std::vector<std::string> const& _localVariables,
+	std::set<std::string> const& _externallyUsedFunctions,
 	bool _system,
 	OptimiserSettings const& _optimiserSettings,
-	string _sourceName
+	std::string _sourceName
 )
 {
 	unsigned startStackHeight = stackHeight();
 
-	set<yul::YulString> externallyUsedIdentifiers;
+	std::set<yul::YulString> externallyUsedIdentifiers;
 	for (auto const& fun: _externallyUsedFunctions)
 		externallyUsedIdentifiers.insert(yul::YulString(fun));
 	for (auto const& var: _localVariables)
@@ -438,19 +437,19 @@ void CompilerContext::appendInlineAssembly(
 	ErrorReporter errorReporter(errors);
 	langutil::CharStream charStream(_assembly, _sourceName);
 	yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
-	optional<langutil::SourceLocation> locationOverride;
+	std::optional<langutil::SourceLocation> locationOverride;
 	if (!_system)
 		locationOverride = m_asm->currentSourceLocation();
-	shared_ptr<yul::Block> parserResult =
+	std::shared_ptr<yul::Block> parserResult =
 		yul::Parser(errorReporter, dialect, std::move(locationOverride))
 		.parse(charStream);
 #ifdef SOL_OUTPUT_ASM
 	cout << yul::AsmPrinter(&dialect)(*parserResult) << endl;
 #endif
 
-	auto reportError = [&](string const& _context)
+	auto reportError = [&](std::string const& _context)
 	{
-		string message =
+		std::string message =
 			"Error parsing/analyzing inline assembly block:\n" +
 			_context + "\n"
 			"------------------ Input: -----------------\n" +
@@ -483,7 +482,7 @@ void CompilerContext::appendInlineAssembly(
 	{
 		yul::Object obj;
 		obj.code = parserResult;
-		obj.analysisInfo = make_shared<yul::AsmAnalysisInfo>(analysisInfo);
+		obj.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(analysisInfo);
 
 		solAssert(!dialect.providesObjectAccess());
 		optimizeYul(obj, dialect, _optimiserSettings, externallyUsedIdentifiers);
@@ -493,7 +492,7 @@ void CompilerContext::appendInlineAssembly(
 			// Store as generated sources, but first re-parse to update the source references.
 			solAssert(m_generatedYulUtilityCode.empty(), "");
 			m_generatedYulUtilityCode = yul::AsmPrinter(dialect)(*obj.code);
-			string code = yul::AsmPrinter{dialect}(*obj.code);
+			std::string code = yul::AsmPrinter{dialect}(*obj.code);
 			langutil::CharStream charStream(m_generatedYulUtilityCode, _sourceName);
 			obj.code = yul::Parser(errorReporter, dialect).parse(charStream);
 			*obj.analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(dialect, obj);
@@ -548,7 +547,7 @@ void CompilerContext::optimizeYul(yul::Object& _object, yul::EVMDialect const& _
 		_optimiserSettings.optimizeStackAllocation,
 		_optimiserSettings.yulOptimiserSteps,
 		_optimiserSettings.yulOptimiserCleanupSteps,
-		isCreation? nullopt : make_optional(_optimiserSettings.expectedExecutionsPerDeployment),
+		isCreation? std::nullopt : std::make_optional(_optimiserSettings.expectedExecutionsPerDeployment),
 		_externalIdentifiers
 	);
 
@@ -558,11 +557,11 @@ void CompilerContext::optimizeYul(yul::Object& _object, yul::EVMDialect const& _
 #endif
 }
 
-string CompilerContext::revertReasonIfDebug(string const& _message)
+std::string CompilerContext::revertReasonIfDebug(std::string const& _message)
 {
 	return YulUtilFunctions::revertReasonIfDebugBody(
 		m_revertStrings,
-		"mload(" + to_string(CompilerUtils::freeMemoryPointer) + ")",
+		"mload(" + std::to_string(CompilerUtils::freeMemoryPointer) + ")",
 		_message
 	);
 }
@@ -590,14 +589,14 @@ evmasm::AssemblyItem CompilerContext::FunctionCompilationQueue::entryLabel(
 		}
 
 		// some name that cannot clash with yul function names.
-		string labelName = "@" + _declaration.name() + "_" + to_string(_declaration.id());
+		std::string labelName = "@" + _declaration.name() + "_" + std::to_string(_declaration.id());
 		evmasm::AssemblyItem tag = _context.namedTag(
 			labelName,
 			params,
 			returns,
 			_declaration.id()
 		);
-		m_entryLabels.insert(make_pair(&_declaration, tag));
+		m_entryLabels.insert(std::make_pair(&_declaration, tag));
 		m_functionsToCompile.push(&_declaration);
 		return tag.tag();
 	}
diff --git a/libsolidity/codegen/CompilerUtils.cpp b/libsolidity/codegen/CompilerUtils.cpp
index 783a7b1a45..bf4f25bf28 100644
--- a/libsolidity/codegen/CompilerUtils.cpp
+++ b/libsolidity/codegen/CompilerUtils.cpp
@@ -33,7 +33,6 @@
 #include <libsolutil/Whiskers.h>
 #include <libsolutil/StackTooDeepString.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::frontend;
@@ -105,9 +104,9 @@ void CompilerUtils::revertWithStringData(Type const& _argumentType)
 }
 
 void CompilerUtils::revertWithError(
-	string const& _signature,
-	vector<Type const*> const& _parameterTypes,
-	vector<Type const*> const& _argumentTypes
+	std::string const& _signature,
+	std::vector<Type const*> const& _parameterTypes,
+	std::vector<Type const*> const& _argumentTypes
 )
 {
 	fetchFreeMemoryPointer();
@@ -215,7 +214,7 @@ void CompilerUtils::storeInMemoryDynamic(Type const& _type, bool _padToWordBound
 		m_context << Instruction::DUP1;
 		storeStringData(bytesConstRef(str->value()));
 		if (_padToWordBoundaries)
-			m_context << u256(max<size_t>(32, ((str->value().size() + 31) / 32) * 32));
+			m_context << u256(std::max<size_t>(32, ((str->value().size() + 31) / 32) * 32));
 		else
 			m_context << u256(str->value().size());
 		m_context << Instruction::ADD;
@@ -264,7 +263,7 @@ void CompilerUtils::abiDecode(TypePointers const& _typeParameters, bool _fromMem
 	Whiskers templ(R"({
 		if lt(len, <encodedSize>) { <revertString> }
 	})");
-	templ("encodedSize", to_string(encodedSize));
+	templ("encodedSize", std::to_string(encodedSize));
 	templ("revertString", m_context.revertReasonIfDebug("Calldata too short"));
 	m_context.appendInlineAssembly(templ.render(), {"len"});
 
@@ -320,7 +319,7 @@ void CompilerUtils::abiDecode(TypePointers const& _typeParameters, bool _fromMem
 						mstore(dst, array_length)
 						dst := add(dst, 0x20)
 					})");
-					templ("item_size", to_string(arrayType.calldataStride()));
+					templ("item_size", std::to_string(arrayType.calldataStride()));
 					// TODO add test
 					templ("revertStringPointer", m_context.revertReasonIfDebug("ABI memory decoding: invalid data pointer"));
 					templ("revertStringStart", m_context.revertReasonIfDebug("ABI memory decoding: invalid data start"));
@@ -374,7 +373,7 @@ void CompilerUtils::abiDecode(TypePointers const& _typeParameters, bool _fromMem
 					m_context.appendInlineAssembly(Whiskers(R"({
 						if or(
 							gt(array_length, 0x100000000),
-							gt(add(data_ptr, mul(array_length, )" + to_string(arrayType.calldataStride()) + R"()), input_end)
+							gt(add(data_ptr, mul(array_length, )" + std::to_string(arrayType.calldataStride()) + R"()), input_end)
 						) { <revertString> }
 					})")
 					("revertString", m_context.revertReasonIfDebug("ABI calldata decoding: invalid data pointer"))
@@ -618,7 +617,7 @@ void CompilerUtils::abiEncodeV2(
 
 	// stack: <$value0> <$value1> ... <$value(n-1)> <$headStart>
 
-	string encoderName =
+	std::string encoderName =
 		_padToWordBoundaries ?
 		m_context.abiFunctions().tupleEncoderReversed(_givenTypes, _targetTypes, _encodeAsLibraryTypes) :
 		m_context.abiFunctions().tupleEncoderPackedReversed(_givenTypes, _targetTypes);
@@ -631,7 +630,7 @@ void CompilerUtils::abiDecodeV2(TypePointers const& _parameterTypes, bool _fromM
 	m_context << Instruction::DUP2 << Instruction::ADD;
 	m_context << Instruction::SWAP1;
 	// stack: <end> <start>
-	string decoderName = m_context.abiFunctions().tupleDecoder(_parameterTypes, _fromMemory);
+	std::string decoderName = m_context.abiFunctions().tupleDecoder(_parameterTypes, _fromMemory);
 	m_context.callYulFunction(decoderName, 2, sizeOnStack(_parameterTypes));
 }
 
@@ -646,7 +645,7 @@ void CompilerUtils::zeroInitialiseMemoryArray(ArrayType const& _type)
 			calldatacopy(memptr, calldatasize(), size)
 			memptr := add(memptr, size)
 		})");
-		templ("element_size", to_string(_type.memoryStride()));
+		templ("element_size", std::to_string(_type.memoryStride()));
 		m_context.appendInlineAssembly(templ.render(), {"length", "memptr"});
 	}
 	else
@@ -842,7 +841,7 @@ void CompilerUtils::convertType(
 				m_context << Instruction::POP << u256(0);
 			else if (targetType.numBytes() > typeOnStack.numBytes() || _cleanupNeeded)
 			{
-				unsigned bytes = min(typeOnStack.numBytes(), targetType.numBytes());
+				unsigned bytes = std::min(typeOnStack.numBytes(), targetType.numBytes());
 				m_context << ((u256(1) << (256 - bytes * 8)) - 1);
 				m_context << Instruction::NOT << Instruction::AND;
 			}
@@ -960,7 +959,7 @@ void CompilerUtils::convertType(
 	case Type::Category::StringLiteral:
 	{
 		auto const& literalType = dynamic_cast<StringLiteralType const&>(_typeOnStack);
-		string const& value = literalType.value();
+		std::string const& value = literalType.value();
 		bytesConstRef data(value);
 		if (targetTypeCategory == Type::Category::FixedBytes)
 		{
@@ -1186,7 +1185,7 @@ void CompilerUtils::convertType(
 					for (auto const& member: typeOnStack->members(nullptr))
 					{
 						solAssert(!member.type->containsNestedMapping());
-						pair<u256, unsigned> const& offsets = typeOnStack->storageOffsetsOfMember(member.name);
+						std::pair<u256, unsigned> const& offsets = typeOnStack->storageOffsetsOfMember(member.name);
 						_context << offsets.first << Instruction::DUP3 << Instruction::ADD;
 						_context << u256(offsets.second);
 						StorageItem(_context, *member.type).retrieveValue(SourceLocation(), true);
@@ -1268,7 +1267,7 @@ void CompilerUtils::convertType(
 				if (sourceSize > 0 || targetSize > 0)
 				{
 					// Move it back into its place.
-					for (unsigned j = 0; j < min(sourceSize, targetSize); ++j)
+					for (unsigned j = 0; j < std::min(sourceSize, targetSize); ++j)
 						m_context <<
 							swapInstruction(depth + targetSize - sourceSize) <<
 							Instruction::POP;
@@ -1375,7 +1374,7 @@ void CompilerUtils::pushZeroValue(Type const& _type)
 		[type](CompilerContext& _context) {
 			CompilerUtils utils(_context);
 
-			utils.allocateMemory(max<u256>(32u, type->memoryDataSize()));
+			utils.allocateMemory(std::max<u256>(32u, type->memoryDataSize()));
 			_context << Instruction::DUP1;
 
 			if (auto structType = dynamic_cast<StructType const*>(type))
@@ -1493,7 +1492,7 @@ void CompilerUtils::popAndJump(unsigned _toHeight, evmasm::AssemblyItem const& _
 	m_context.adjustStackOffset(static_cast<int>(amount));
 }
 
-unsigned CompilerUtils::sizeOnStack(vector<Type const*> const& _variableTypes)
+unsigned CompilerUtils::sizeOnStack(std::vector<Type const*> const& _variableTypes)
 {
 	unsigned size = 0;
 	for (Type const* type: _variableTypes)
@@ -1509,7 +1508,7 @@ void CompilerUtils::computeHashStatic()
 
 void CompilerUtils::copyContractCodeToMemory(ContractDefinition const& contract, bool _creation)
 {
-	string which = _creation ? "Creation" : "Runtime";
+	std::string which = _creation ? "Creation" : "Runtime";
 	m_context.callLowLevelFunction(
 		"$copyContract" + which + "CodeToMemory_" + contract.type()->identifier(),
 		1,
@@ -1517,7 +1516,7 @@ void CompilerUtils::copyContractCodeToMemory(ContractDefinition const& contract,
 		[&contract, _creation](CompilerContext& _context)
 		{
 			// copy the contract's code into memory
-			shared_ptr<evmasm::Assembly> assembly =
+			std::shared_ptr<evmasm::Assembly> assembly =
 				_creation ?
 				_context.compiledContract(contract) :
 				_context.compiledContractRuntime(contract);
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index a6e7ab2fb3..3dfdf76d87 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -55,7 +55,6 @@
 #include <algorithm>
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::frontend;
@@ -80,7 +79,7 @@ class StackHeightChecker
 	{
 		solAssert(
 			m_context.stackHeight() == stackHeight,
-			std::string("I sense a disturbance in the stack: ") + to_string(m_context.stackHeight()) + " vs " + to_string(stackHeight)
+			std::string("I sense a disturbance in the stack: ") + std::to_string(m_context.stackHeight()) + " vs " + std::to_string(stackHeight)
 		);
 	}
 private:
@@ -92,7 +91,7 @@ class StackHeightChecker
 
 void ContractCompiler::compileContract(
 	ContractDefinition const& _contract,
-	map<ContractDefinition const*, shared_ptr<Compiler const>> const& _otherCompilers
+	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers
 )
 {
 	CompilerContext::LocationSetter locationSetter(m_context, _contract);
@@ -111,7 +110,7 @@ void ContractCompiler::compileContract(
 
 size_t ContractCompiler::compileConstructor(
 	ContractDefinition const& _contract,
-	std::map<ContractDefinition const*, shared_ptr<Compiler const>> const& _otherCompilers
+	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers
 )
 {
 	CompilerContext::LocationSetter locationSetter(m_context, _contract);
@@ -126,7 +125,7 @@ size_t ContractCompiler::compileConstructor(
 
 void ContractCompiler::initializeContext(
 	ContractDefinition const& _contract,
-	map<ContractDefinition const*, shared_ptr<Compiler const>> const& _otherCompilers
+	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> const& _otherCompilers
 )
 {
 	m_context.setUseABICoderV2(*_contract.sourceUnit().annotation().useABICoderV2);
@@ -187,7 +186,7 @@ size_t ContractCompiler::packIntoContractCreator(ContractDefinition const& _cont
 	CompilerContext::LocationSetter locationSetter(m_context, _contract);
 	m_context << deployRoutine;
 
-	solAssert(m_context.runtimeSub() != numeric_limits<size_t>::max(), "Runtime sub not registered");
+	solAssert(m_context.runtimeSub() != std::numeric_limits<size_t>::max(), "Runtime sub not registered");
 
 	ContractType contractType(_contract);
 	auto const& immutables = contractType.immutableVariables();
@@ -231,7 +230,7 @@ size_t ContractCompiler::deployLibrary(ContractDefinition const& _contract)
 
 	CompilerContext::LocationSetter locationSetter(m_context, _contract);
 
-	solAssert(m_context.runtimeSub() != numeric_limits<size_t>::max(), "Runtime sub not registered");
+	solAssert(m_context.runtimeSub() != std::numeric_limits<size_t>::max(), "Runtime sub not registered");
 	m_context.pushSubroutineSize(m_context.runtimeSub());
 	m_context.pushSubroutineOffset(m_context.runtimeSub());
 	// This code replaces the address added by appendDeployTimeAddress().
@@ -324,8 +323,8 @@ void ContractCompiler::appendDelegatecallCheck()
 }
 
 void ContractCompiler::appendInternalSelector(
-	map<FixedHash<4>, evmasm::AssemblyItem const> const& _entryPoints,
-	vector<FixedHash<4>> const& _ids,
+	std::map<FixedHash<4>, evmasm::AssemblyItem const> const& _entryPoints,
+	std::vector<FixedHash<4>> const& _ids,
 	evmasm::AssemblyItem const& _notFoundTag,
 	size_t _runs
 )
@@ -369,11 +368,11 @@ void ContractCompiler::appendInternalSelector(
 		m_context << dupInstruction(1) << u256(FixedHash<4>::Arith(pivot)) << Instruction::GT;
 		evmasm::AssemblyItem lessTag{m_context.appendConditionalJump()};
 		// Here, we have funid >= pivot
-		vector<FixedHash<4>> larger{_ids.begin() + static_cast<ptrdiff_t>(pivotIndex), _ids.end()};
+		std::vector<FixedHash<4>> larger{_ids.begin() + static_cast<ptrdiff_t>(pivotIndex), _ids.end()};
 		appendInternalSelector(_entryPoints, larger, _notFoundTag, _runs);
 		m_context << lessTag;
 		// Here, we have funid < pivot
-		vector<FixedHash<4>> smaller{_ids.begin(), _ids.begin() + static_cast<ptrdiff_t>(pivotIndex)};
+		std::vector<FixedHash<4>> smaller{_ids.begin(), _ids.begin() + static_cast<ptrdiff_t>(pivotIndex)};
 		appendInternalSelector(_entryPoints, smaller, _notFoundTag, _runs);
 	}
 	else
@@ -411,8 +410,8 @@ bool hasPayableFunctions(ContractDefinition const& _contract)
 
 void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contract)
 {
-	map<FixedHash<4>, FunctionTypePointer> interfaceFunctions = _contract.interfaceFunctions();
-	map<FixedHash<4>, evmasm::AssemblyItem const> callDataUnpackerEntryPoints;
+	std::map<FixedHash<4>, FunctionTypePointer> interfaceFunctions = _contract.interfaceFunctions();
+	std::map<FixedHash<4>, evmasm::AssemblyItem const> callDataUnpackerEntryPoints;
 
 	if (_contract.isLibrary())
 	{
@@ -448,7 +447,7 @@ void ContractCompiler::appendFunctionSelector(ContractDefinition const& _contrac
 		CompilerUtils(m_context).loadFromMemory(0, IntegerType(CompilerUtils::dataStartOffset * 8), true, false);
 
 		// stack now is: <can-call-non-view-functions>? <funhash>
-		vector<FixedHash<4>> sortedIDs;
+		std::vector<FixedHash<4>> sortedIDs;
 		for (auto const& it: interfaceFunctions)
 		{
 			callDataUnpackerEntryPoints.emplace(it.first, m_context.newTag());
@@ -572,7 +571,7 @@ void ContractCompiler::appendReturnValuePacker(TypePointers const& _typeParamete
 void ContractCompiler::registerStateVariables(ContractDefinition const& _contract)
 {
 	for (auto const& var: ContractType(_contract).stateVariables())
-		m_context.addStateVariable(*get<0>(var), get<1>(var), get<2>(var));
+		m_context.addStateVariable(*std::get<0>(var), std::get<1>(var), std::get<2>(var));
 }
 
 void ContractCompiler::registerImmutableVariables(ContractDefinition const& _contract)
@@ -645,7 +644,7 @@ bool ContractCompiler::visit(FunctionDefinition const& _function)
 	m_breakTags.clear();
 	m_continueTags.clear();
 	m_currentFunction = &_function;
-	m_modifierDepth = numeric_limits<unsigned>::max();
+	m_modifierDepth = std::numeric_limits<unsigned>::max();
 	m_scopeStackHeight.clear();
 	m_context.setModifierDepth(0);
 
@@ -662,10 +661,10 @@ bool ContractCompiler::visit(FunctionDefinition const& _function)
 	unsigned const c_argumentsSize = CompilerUtils::sizeOnStack(_function.parameters());
 	unsigned const c_returnValuesSize = CompilerUtils::sizeOnStack(_function.returnParameters());
 
-	vector<int> stackLayout;
+	std::vector<int> stackLayout;
 	if (!_function.isConstructor() && !_function.isFallback())
 		stackLayout.push_back(static_cast<int>(c_returnValuesSize)); // target of return address
-	stackLayout += vector<int>(c_argumentsSize, -1); // discard all arguments
+	stackLayout += std::vector<int>(c_argumentsSize, -1); // discard all arguments
 	for (size_t i = 0; i < c_returnValuesSize; ++i)
 		stackLayout.push_back(static_cast<int>(i));
 
@@ -684,7 +683,7 @@ bool ContractCompiler::visit(FunctionDefinition const& _function)
 		else
 		{
 			m_context << swapInstruction(static_cast<unsigned>(stackLayout.size()) - static_cast<unsigned>(stackLayout.back()) - 1u);
-			swap(stackLayout[static_cast<size_t>(stackLayout.back())], stackLayout.back());
+			std::swap(stackLayout[static_cast<size_t>(stackLayout.back())], stackLayout.back());
 		}
 	for (size_t i = 0; i < stackLayout.size(); ++i)
 		if (stackLayout[i] != static_cast<int>(i))
@@ -790,7 +789,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 					unsigned stackDiff = static_cast<unsigned>(_assembly.stackHeight()) - m_context.baseStackOffsetOfVariable(*variable);
 					if (!ref->second.suffix.empty())
 					{
-						string const& suffix = ref->second.suffix;
+						std::string const& suffix = ref->second.suffix;
 						if (variable->type()->dataStoredIn(DataLocation::Storage))
 						{
 							solAssert(suffix == "offset" || suffix == "slot", "");
@@ -865,7 +864,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 			// lvalue context
 			auto variable = dynamic_cast<VariableDeclaration const*>(decl);
 			unsigned stackDiff = static_cast<unsigned>(_assembly.stackHeight()) - m_context.baseStackOffsetOfVariable(*variable) - 1;
-			string const& suffix = ref->second.suffix;
+			std::string const& suffix = ref->second.suffix;
 			if (variable->type()->dataStoredIn(DataLocation::Storage))
 			{
 				solAssert(
@@ -928,7 +927,7 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 	yul::AsmAnalysisInfo* analysisInfo = _inlineAssembly.annotation().analysisInfo.get();
 
 	// Only used in the scope below, but required to live outside to keep the
-	// shared_ptr's alive
+	// std::shared_ptr's alive
 	yul::Object object = {};
 
 	// The optimiser cannot handle external references
@@ -941,8 +940,8 @@ bool ContractCompiler::visit(InlineAssembly const& _inlineAssembly)
 		solAssert(dialect, "");
 
 		// Create a modifiable copy of the code and analysis
-		object.code = make_shared<yul::Block>(yul::ASTCopier().translate(*code));
-		object.analysisInfo = make_shared<yul::AsmAnalysisInfo>(yul::AsmAnalyzer::analyzeStrictAssertCorrect(*dialect, object));
+		object.code = std::make_shared<yul::Block>(yul::ASTCopier().translate(*code));
+		object.analysisInfo = std::make_shared<yul::AsmAnalysisInfo>(yul::AsmAnalyzer::analyzeStrictAssertCorrect(*dialect, object));
 
 		m_context.optimizeYul(object, *dialect, m_optimiserSettings);
 
@@ -989,10 +988,10 @@ bool ContractCompiler::visit(TryStatement const& _tryStatement)
 		TryCatchClause const& successClause = *_tryStatement.clauses().front();
 		if (successClause.parameters())
 		{
-			vector<Type const*> exprTypes{_tryStatement.externalCall().annotation().type};
+			std::vector<Type const*> exprTypes{_tryStatement.externalCall().annotation().type};
 			if (auto tupleType = dynamic_cast<TupleType const*>(exprTypes.front()))
 				exprTypes = tupleType->components();
-			vector<ASTPointer<VariableDeclaration>> const& params = successClause.parameters()->parameters();
+			std::vector<ASTPointer<VariableDeclaration>> const& params = successClause.parameters()->parameters();
 			solAssert(exprTypes.size() == params.size(), "");
 			for (size_t i = 0; i < exprTypes.size(); ++i)
 				solAssert(params[i] && exprTypes[i] && *params[i]->annotation().type == *exprTypes[i], "");
@@ -1008,7 +1007,7 @@ bool ContractCompiler::visit(TryStatement const& _tryStatement)
 	return false;
 }
 
-void ContractCompiler::handleCatch(vector<ASTPointer<TryCatchClause>> const& _catchClauses)
+void ContractCompiler::handleCatch(std::vector<ASTPointer<TryCatchClause>> const& _catchClauses)
 {
 	// Stack is empty.
 	ASTPointer<TryCatchClause> error{};
@@ -1285,7 +1284,7 @@ bool ContractCompiler::visit(Return const& _return)
 	if (Expression const* expression = _return.expression())
 	{
 		solAssert(_return.annotation().functionReturnParameters, "Invalid return parameters pointer.");
-		vector<ASTPointer<VariableDeclaration>> const& returnParameters =
+		std::vector<ASTPointer<VariableDeclaration>> const& returnParameters =
 			_return.annotation().functionReturnParameters->parameters();
 		TypePointers types;
 		for (auto const& retVariable: returnParameters)
@@ -1432,7 +1431,7 @@ void ContractCompiler::appendModifierOrFunctionCode()
 	solAssert(m_currentFunction, "");
 	unsigned stackSurplus = 0;
 	Block const* codeBlock = nullptr;
-	vector<VariableDeclaration const*> addedVariables;
+	std::vector<VariableDeclaration const*> addedVariables;
 
 	m_modifierDepth++;
 	m_context.setModifierDepth(m_modifierDepth);
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index fa94d2f58f..517f49c353 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -43,7 +43,6 @@
 #include <numeric>
 #include <utility>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::frontend;
@@ -242,7 +241,7 @@ void ExpressionCompiler::appendStateVariableAccessor(VariableDeclaration const&
 			if (auto arrayType = dynamic_cast<ArrayType const*>(returnTypes[i]))
 				if (!arrayType->isByteArrayOrString())
 					continue;
-			pair<u256, unsigned> const& offsets = structType->storageOffsetsOfMember(names[i]);
+			std::pair<u256, unsigned> const& offsets = structType->storageOffsetsOfMember(names[i]);
 			m_context << Instruction::DUP1 << u256(offsets.first) << Instruction::ADD << u256(offsets.second);
 			Type const* memberType = structType->memberType(names[i]);
 			StorageItem(m_context, *memberType).retrieveValue(SourceLocation(), true);
@@ -370,7 +369,7 @@ bool ExpressionCompiler::visit(TupleExpression const& _tuple)
 		ArrayType const& arrayType = dynamic_cast<ArrayType const&>(*_tuple.annotation().type);
 
 		solAssert(!arrayType.isDynamicallySized(), "Cannot create dynamically sized inline array.");
-		utils().allocateMemory(max(u256(32u), arrayType.memoryDataSize()));
+		utils().allocateMemory(std::max(u256(32u), arrayType.memoryDataSize()));
 		m_context << Instruction::DUP1;
 
 		for (auto const& component: _tuple.components())
@@ -383,7 +382,7 @@ bool ExpressionCompiler::visit(TupleExpression const& _tuple)
 	}
 	else
 	{
-		vector<unique_ptr<LValue>> lvalues;
+		std::vector<std::unique_ptr<LValue>> lvalues;
 		for (auto const& component: _tuple.components())
 			if (component)
 			{
@@ -395,13 +394,13 @@ bool ExpressionCompiler::visit(TupleExpression const& _tuple)
 				}
 			}
 			else if (_tuple.annotation().willBeWrittenTo)
-				lvalues.push_back(unique_ptr<LValue>());
+				lvalues.push_back(std::unique_ptr<LValue>());
 		if (_tuple.annotation().willBeWrittenTo)
 		{
 			if (_tuple.components().size() == 1)
 				m_currentLValue = std::move(lvalues[0]);
 			else
-				m_currentLValue = make_unique<TupleObject>(m_context, std::move(lvalues));
+				m_currentLValue = std::make_unique<TupleObject>(m_context, std::move(lvalues));
 		}
 	}
 	return false;
@@ -524,7 +523,7 @@ bool ExpressionCompiler::visit(UnaryOperation const& _unaryOperation)
 			m_context << u256(0) << Instruction::SUB;
 		break;
 	default:
-		solAssert(false, "Invalid unary operator: " + string(TokenTraits::toString(_unaryOperation.getOperator())));
+		solAssert(false, "Invalid unary operator: " + std::string(TokenTraits::toString(_unaryOperation.getOperator())));
 	}
 	return false;
 }
@@ -659,14 +658,14 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 
 	TypePointers parameterTypes = functionType->parameterTypes();
 
-	vector<ASTPointer<Expression const>> const& arguments = _functionCall.sortedArguments();
+	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.sortedArguments();
 
 	if (functionCallKind == FunctionCallKind::StructConstructorCall)
 	{
 		TypeType const& type = dynamic_cast<TypeType const&>(*_functionCall.expression().annotation().type);
 		auto const& structType = dynamic_cast<StructType const&>(*type.actualType());
 
-		utils().allocateMemory(max(u256(32u), structType.memoryDataSize()));
+		utils().allocateMemory(std::max(u256(32u), structType.memoryDataSize()));
 		m_context << Instruction::DUP1;
 
 		for (unsigned i = 0; i < arguments.size(); ++i)
@@ -992,7 +991,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 		case FunctionType::Kind::Error:
 		{
 			_functionCall.expression().accept(*this);
-			vector<Type const*> argumentTypes;
+			std::vector<Type const*> argumentTypes;
 			for (ASTPointer<Expression const> const& arg: _functionCall.sortedArguments())
 			{
 				arg->accept(*this);
@@ -1060,7 +1059,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 		case FunctionType::Kind::RIPEMD160:
 		{
 			_functionCall.expression().accept(*this);
-			static map<FunctionType::Kind, u256> const contractAddresses{
+			static std::map<FunctionType::Kind, u256> const contractAddresses{
 				{FunctionType::Kind::ECRecover, 1},
 				{FunctionType::Kind::SHA256, 2},
 				{FunctionType::Kind::RIPEMD160, 3}
@@ -1151,8 +1150,8 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 		case FunctionType::Kind::BytesConcat:
 		{
 			_functionCall.expression().accept(*this);
-			vector<Type const*> argumentTypes;
-			vector<Type const*> targetTypes;
+			std::vector<Type const*> argumentTypes;
+			std::vector<Type const*> targetTypes;
 			for (auto const& argument: arguments)
 			{
 				argument->accept(*this);
@@ -1416,7 +1415,7 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 				// stack: <memory pointer> <selector>
 
 				// load current memory, mask and combine the selector
-				string mask = formatNumber((u256(-1) >> 32));
+				std::string mask = formatNumber((u256(-1) >> 32));
 				m_context.appendInlineAssembly(R"({
 					let data_start := add(mem_ptr, 0x20)
 					let data := mload(data_start)
@@ -1476,7 +1475,7 @@ bool ExpressionCompiler::visit(FunctionCallOptions const& _functionCallOptions)
 	// Desired Stack: [salt], [gas], [value]
 	enum Option { Salt, Gas, Value };
 
-	vector<Option> presentOptions;
+	std::vector<Option> presentOptions;
 	FunctionType const& funType = dynamic_cast<FunctionType const&>(
 		*_functionCallOptions.expression().annotation().type
 	);
@@ -1486,7 +1485,7 @@ bool ExpressionCompiler::visit(FunctionCallOptions const& _functionCallOptions)
 
 	for (size_t i = 0; i < _functionCallOptions.options().size(); ++i)
 	{
-		string const& name = *_functionCallOptions.names()[i];
+		std::string const& name = *_functionCallOptions.names()[i];
 		Type const* requiredType = TypeProvider::uint256();
 		Option newOption;
 		if (name == "salt")
@@ -1818,7 +1817,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 			);
 			m_context << Instruction::EXTCODEHASH;
 		}
-		else if ((set<string>{"send", "transfer"}).count(member))
+		else if ((std::set<std::string>{"send", "transfer"}).count(member))
 		{
 			solAssert(dynamic_cast<AddressType const&>(*_memberAccess.expression().annotation().type).stateMutability() == StateMutability::Payable, "");
 			utils().convertType(
@@ -1827,7 +1826,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 				true
 			);
 		}
-		else if ((set<string>{"call", "callcode", "delegatecall", "staticcall"}).count(member))
+		else if ((std::set<std::string>{"call", "callcode", "delegatecall", "staticcall"}).count(member))
 			utils().convertType(
 				*_memberAccess.expression().annotation().type,
 				*TypeProvider::address(),
@@ -1910,7 +1909,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 				Whiskers(R"({
 					mstore(start, sub(end, add(start, 0x20)))
 					mstore(<free>, and(add(end, 31), not(31)))
-				})")("free", to_string(CompilerUtils::freeMemoryPointer)).render(),
+				})")("free", std::to_string(CompilerUtils::freeMemoryPointer)).render(),
 				{"start", "end"}
 			);
 			m_context << Instruction::POP;
@@ -1946,7 +1945,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 				solAssert(false, "min/max not available for the given type.");
 
 		}
-		else if ((set<string>{"encode", "encodePacked", "encodeWithSelector", "encodeWithSignature", "decode"}).count(member))
+		else if ((std::set<std::string>{"encode", "encodePacked", "encodeWithSelector", "encodeWithSignature", "decode"}).count(member))
 		{
 			// no-op
 		}
@@ -1961,7 +1960,7 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 		{
 		case DataLocation::Storage:
 		{
-			pair<u256, unsigned> const& offsets = type.storageOffsetsOfMember(member);
+			std::pair<u256, unsigned> const& offsets = type.storageOffsetsOfMember(member);
 			m_context << offsets.first << Instruction::ADD << u256(offsets.second);
 			setLValueToStorageItem(_memberAccess);
 			break;
@@ -2454,7 +2453,7 @@ void ExpressionCompiler::appendArithmeticOperatorCode(Token _operator, Type cons
 	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
 	if (m_context.arithmetic() == Arithmetic::Checked)
 	{
-		string functionName;
+		std::string functionName;
 		switch (_operator)
 		{
 		case Token::Add:
@@ -2620,7 +2619,7 @@ void ExpressionCompiler::appendExpOperatorCode(Type const& _valueType, Type cons
 
 void ExpressionCompiler::appendExternalFunctionCall(
 	FunctionType const& _functionType,
-	vector<ASTPointer<Expression const>> const& _arguments,
+	std::vector<ASTPointer<Expression const>> const& _arguments,
 	bool _tryCall
 )
 {
diff --git a/libsolidity/codegen/LValue.cpp b/libsolidity/codegen/LValue.cpp
index b99ebceddd..3fbf103834 100644
--- a/libsolidity/codegen/LValue.cpp
+++ b/libsolidity/codegen/LValue.cpp
@@ -30,7 +30,6 @@
 
 #include <libsolutil/StackTooDeepString.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::frontend;
@@ -410,7 +409,7 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 					if (sourceType.location() == DataLocation::Storage)
 					{
 						// stack layout: source_ref target_ref
-						pair<u256, unsigned> const& offsets = sourceType.storageOffsetsOfMember(member.name);
+						std::pair<u256, unsigned> const& offsets = sourceType.storageOffsetsOfMember(member.name);
 						m_context << offsets.first << Instruction::DUP3 << Instruction::ADD;
 						m_context << u256(offsets.second);
 						// stack: source_ref target_ref source_member_ref source_member_off
@@ -427,7 +426,7 @@ void StorageItem::storeValue(Type const& _sourceType, SourceLocation const& _loc
 						// stack layout: source_ref target_ref source_value...
 					}
 					unsigned stackSize = sourceMemberType->sizeOnStack();
-					pair<u256, unsigned> const& offsets = structType.storageOffsetsOfMember(member.name);
+					std::pair<u256, unsigned> const& offsets = structType.storageOffsetsOfMember(member.name);
 					m_context << dupInstruction(1 + stackSize) << offsets.first << Instruction::ADD;
 					m_context << u256(offsets.second);
 					// stack: source_ref target_ref target_off source_value... target_member_ref target_member_byte_off
@@ -469,7 +468,7 @@ void StorageItem::setToZero(SourceLocation const&, bool _removeReference) const
 			Type const* memberType = member.type;
 			if (memberType->category() == Type::Category::Mapping)
 				continue;
-			pair<u256, unsigned> const& offsets = structType.storageOffsetsOfMember(member.name);
+			std::pair<u256, unsigned> const& offsets = structType.storageOffsetsOfMember(member.name);
 			m_context
 				<< offsets.first << Instruction::DUP3 << Instruction::ADD
 				<< u256(offsets.second);
@@ -592,7 +591,7 @@ void TupleObject::storeValue(Type const& _sourceType, SourceLocation const& _loc
 	// We will assign from right to left to optimize stack layout.
 	for (size_t i = 0; i < m_lvalues.size(); ++i)
 	{
-		unique_ptr<LValue> const& lvalue = m_lvalues[m_lvalues.size() - i - 1];
+		std::unique_ptr<LValue> const& lvalue = m_lvalues[m_lvalues.size() - i - 1];
 		Type const* valType = valueTypes[valueTypes.size() - i - 1];
 		unsigned stackHeight = m_context.stackHeight();
 		solAssert(!valType == !lvalue, "");
diff --git a/libsolidity/codegen/MultiUseYulFunctionCollector.cpp b/libsolidity/codegen/MultiUseYulFunctionCollector.cpp
index 39df884495..306f651219 100644
--- a/libsolidity/codegen/MultiUseYulFunctionCollector.cpp
+++ b/libsolidity/codegen/MultiUseYulFunctionCollector.cpp
@@ -26,44 +26,43 @@
 #include <libsolutil/Whiskers.h>
 #include <libsolutil/StringUtils.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 using namespace solidity::util;
 
-string MultiUseYulFunctionCollector::requestedFunctions()
+std::string MultiUseYulFunctionCollector::requestedFunctions()
 {
-	string result = std::move(m_code);
+	std::string result = std::move(m_code);
 	m_code.clear();
 	m_requestedFunctions.clear();
 	return result;
 }
 
-string MultiUseYulFunctionCollector::createFunction(string const& _name, function<string ()> const& _creator)
+std::string MultiUseYulFunctionCollector::createFunction(std::string const& _name, std::function<std::string()> const& _creator)
 {
 	if (!m_requestedFunctions.count(_name))
 	{
 		m_requestedFunctions.insert(_name);
-		string fun = _creator();
+		std::string fun = _creator();
 		solAssert(!fun.empty(), "");
-		solAssert(fun.find("function " + _name + "(") != string::npos, "Function not properly named.");
+		solAssert(fun.find("function " + _name + "(") != std::string::npos, "Function not properly named.");
 		m_code += std::move(fun);
 	}
 	return _name;
 }
 
-string MultiUseYulFunctionCollector::createFunction(
-	string const& _name,
-	function<string(vector<string>&, vector<string>&)> const& _creator
+std::string MultiUseYulFunctionCollector::createFunction(
+	std::string const& _name,
+	std::function<std::string(std::vector<std::string>&, std::vector<std::string>&)> const& _creator
 )
 {
 	solAssert(!_name.empty(), "");
 	if (!m_requestedFunctions.count(_name))
 	{
 		m_requestedFunctions.insert(_name);
-		vector<string> arguments;
-		vector<string> returnParameters;
-		string body = _creator(arguments, returnParameters);
+		std::vector<std::string> arguments;
+		std::vector<std::string> returnParameters;
+		std::string body = _creator(arguments, returnParameters);
 		solAssert(!body.empty(), "");
 
 		m_code += Whiskers(R"(
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index db020fc67d..5ff5ac4f3b 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -31,24 +31,24 @@
 #include <libsolutil/StringUtils.h>
 #include <libsolidity/ast/TypeProvider.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
+using namespace std::string_literals;
 
-string YulUtilFunctions::identityFunction()
+std::string YulUtilFunctions::identityFunction()
 {
-	string functionName = "identity";
-	return m_functionCollector.createFunction("identity", [&](vector<string>& _args, vector<string>& _rets) {
+	std::string functionName = "identity";
+	return m_functionCollector.createFunction("identity", [&](std::vector<std::string>& _args, std::vector<std::string>& _rets) {
 		_args.push_back("value");
 		_rets.push_back("ret");
 		return "ret := value";
 	});
 }
 
-string YulUtilFunctions::combineExternalFunctionIdFunction()
+std::string YulUtilFunctions::combineExternalFunctionIdFunction()
 {
-	string functionName = "combine_external_function_id";
+	std::string functionName = "combine_external_function_id";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(addr, selector) -> combined {
@@ -62,9 +62,9 @@ string YulUtilFunctions::combineExternalFunctionIdFunction()
 	});
 }
 
-string YulUtilFunctions::splitExternalFunctionIdFunction()
+std::string YulUtilFunctions::splitExternalFunctionIdFunction()
 {
-	string functionName = "split_external_function_id";
+	std::string functionName = "split_external_function_id";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(combined) -> addr, selector {
@@ -80,9 +80,9 @@ string YulUtilFunctions::splitExternalFunctionIdFunction()
 	});
 }
 
-string YulUtilFunctions::copyToMemoryFunction(bool _fromCalldata, bool _cleanup)
+std::string YulUtilFunctions::copyToMemoryFunction(bool _fromCalldata, bool _cleanup)
 {
-	string functionName =
+	std::string functionName =
 		"copy_"s +
 		(_fromCalldata ? "calldata"s : "memory"s) +
 		"_to_memory"s +
@@ -120,9 +120,9 @@ string YulUtilFunctions::copyToMemoryFunction(bool _fromCalldata, bool _cleanup)
 	});
 }
 
-string YulUtilFunctions::copyLiteralToMemoryFunction(string const& _literal)
+std::string YulUtilFunctions::copyLiteralToMemoryFunction(std::string const& _literal)
 {
-	string functionName = "copy_literal_to_memory_" + util::toHex(util::keccak256(_literal).asBytes());
+	std::string functionName = "copy_literal_to_memory_" + util::toHex(util::keccak256(_literal).asBytes());
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
@@ -133,22 +133,22 @@ string YulUtilFunctions::copyLiteralToMemoryFunction(string const& _literal)
 			)")
 			("functionName", functionName)
 			("arrayAllocationFunction", allocateMemoryArrayFunction(*TypeProvider::array(DataLocation::Memory, true)))
-			("size", to_string(_literal.size()))
+			("size", std::to_string(_literal.size()))
 			("storeLiteralInMem", storeLiteralInMemoryFunction(_literal))
 			.render();
 	});
 }
 
-string YulUtilFunctions::storeLiteralInMemoryFunction(string const& _literal)
+std::string YulUtilFunctions::storeLiteralInMemoryFunction(std::string const& _literal)
 {
-	string functionName = "store_literal_in_memory_" + util::toHex(util::keccak256(_literal).asBytes());
+	std::string functionName = "store_literal_in_memory_" + util::toHex(util::keccak256(_literal).asBytes());
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		size_t words = (_literal.length() + 31) / 32;
-		vector<map<string, string>> wordParams(words);
+		std::vector<std::map<std::string, std::string>> wordParams(words);
 		for (size_t i = 0; i < words; ++i)
 		{
-			wordParams[i]["offset"] = to_string(i * 32);
+			wordParams[i]["offset"] = std::to_string(i * 32);
 			wordParams[i]["wordValue"] = formatAsStringOrNumber(_literal.substr(32 * i, 32));
 		}
 
@@ -165,20 +165,20 @@ string YulUtilFunctions::storeLiteralInMemoryFunction(string const& _literal)
 	});
 }
 
-string YulUtilFunctions::copyLiteralToStorageFunction(string const& _literal)
+std::string YulUtilFunctions::copyLiteralToStorageFunction(std::string const& _literal)
 {
-	string functionName = "copy_literal_to_storage_" + util::toHex(util::keccak256(_literal).asBytes());
+	std::string functionName = "copy_literal_to_storage_" + util::toHex(util::keccak256(_literal).asBytes());
 
-	return m_functionCollector.createFunction(functionName, [&](vector<string>& _args, vector<string>&) {
+	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
 		_args = {"slot"};
 
 		if (_literal.size() >= 32)
 		{
 			size_t words = (_literal.length() + 31) / 32;
-			vector<map<string, string>> wordParams(words);
+			std::vector<std::map<std::string, std::string>> wordParams(words);
 			for (size_t i = 0; i < words; ++i)
 			{
-				wordParams[i]["offset"] = to_string(i);
+				wordParams[i]["offset"] = std::to_string(i);
 				wordParams[i]["wordValue"] = formatAsStringOrNumber(_literal.substr(32 * i, 32));
 			}
 			return Whiskers(R"(
@@ -194,8 +194,8 @@ string YulUtilFunctions::copyLiteralToStorageFunction(string const& _literal)
 			("cleanUpArrayEnd", cleanUpDynamicByteArrayEndSlotsFunction(*TypeProvider::bytesStorage()))
 			("dataArea", arrayDataAreaFunction(*TypeProvider::bytesStorage()))
 			("word", wordParams)
-			("length", to_string(_literal.size()))
-			("encodedLen", to_string(2 * _literal.size() + 1))
+			("length", std::to_string(_literal.size()))
+			("encodedLen", std::to_string(2 * _literal.size() + 1))
 			.render();
 		}
 		else
@@ -207,16 +207,16 @@ string YulUtilFunctions::copyLiteralToStorageFunction(string const& _literal)
 			("byteArrayLength", extractByteArrayLengthFunction())
 			("cleanUpArrayEnd", cleanUpDynamicByteArrayEndSlotsFunction(*TypeProvider::bytesStorage()))
 			("wordValue", formatAsStringOrNumber(_literal))
-			("length", to_string(_literal.size()))
-			("encodedLen", to_string(2 * _literal.size()))
+			("length", std::to_string(_literal.size()))
+			("encodedLen", std::to_string(2 * _literal.size()))
 			.render();
 	});
 }
 
-string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _messageType)
+std::string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _messageType)
 {
-	string functionName =
-		string(_assert ? "assert_helper" : "require_helper") +
+	std::string functionName =
+		std::string(_assert ? "assert_helper" : "require_helper") +
 		(_messageType ? ("_" + _messageType->identifier()) : "");
 
 	solAssert(!_assert || !_messageType, "Asserts can't have messages!");
@@ -235,7 +235,7 @@ string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _mess
 		int const hashHeaderSize = 4;
 		u256 const errorHash = util::selectorFromSignatureU256("Error(string)");
 
-		string const encodeFunc = ABIFunctions(m_evmVersion, m_revertStrings, m_functionCollector)
+		std::string const encodeFunc = ABIFunctions(m_evmVersion, m_revertStrings, m_functionCollector)
 			.tupleEncoder(
 				{_messageType},
 				{TypeProvider::stringMemory()}
@@ -255,7 +255,7 @@ string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _mess
 		("allocateUnbounded", allocateUnboundedFunction())
 		("errorHash", formatNumber(errorHash))
 		("abiEncodeFunc", encodeFunc)
-		("hashHeaderSize", to_string(hashHeaderSize))
+		("hashHeaderSize", std::to_string(hashHeaderSize))
 		("messageVars",
 			(_messageType->sizeOnStack() > 0 ? ", " : "") +
 			suffixedVariableNameList("message_", 1, 1 + _messageType->sizeOnStack())
@@ -264,9 +264,9 @@ string YulUtilFunctions::requireOrAssertFunction(bool _assert, Type const* _mess
 	});
 }
 
-string YulUtilFunctions::leftAlignFunction(Type const& _type)
+std::string YulUtilFunctions::leftAlignFunction(Type const& _type)
 {
-	string functionName = string("leftAlign_") + _type.identifier();
+	std::string functionName = std::string("leftAlign_") + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers templ(R"(
 			function <functionName>(value) -> aligned {
@@ -324,11 +324,11 @@ string YulUtilFunctions::leftAlignFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::shiftLeftFunction(size_t _numBits)
+std::string YulUtilFunctions::shiftLeftFunction(size_t _numBits)
 {
 	solAssert(_numBits < 256, "");
 
-	string functionName = "shift_left_" + to_string(_numBits);
+	std::string functionName = "shift_left_" + std::to_string(_numBits);
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -342,16 +342,16 @@ string YulUtilFunctions::shiftLeftFunction(size_t _numBits)
 			}
 			)")
 			("functionName", functionName)
-			("numBits", to_string(_numBits))
+			("numBits", std::to_string(_numBits))
 			("hasShifts", m_evmVersion.hasBitwiseShifting())
 			("multiplier", toCompactHexWithPrefix(u256(1) << _numBits))
 			.render();
 	});
 }
 
-string YulUtilFunctions::shiftLeftFunctionDynamic()
+std::string YulUtilFunctions::shiftLeftFunctionDynamic()
 {
-	string functionName = "shift_left_dynamic";
+	std::string functionName = "shift_left_dynamic";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -370,14 +370,14 @@ string YulUtilFunctions::shiftLeftFunctionDynamic()
 	});
 }
 
-string YulUtilFunctions::shiftRightFunction(size_t _numBits)
+std::string YulUtilFunctions::shiftRightFunction(size_t _numBits)
 {
 	solAssert(_numBits < 256, "");
 
 	// Note that if this is extended with signed shifts,
 	// the opcodes SAR and SDIV behave differently with regards to rounding!
 
-	string functionName = "shift_right_" + to_string(_numBits) + "_unsigned";
+	std::string functionName = "shift_right_" + std::to_string(_numBits) + "_unsigned";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -392,15 +392,15 @@ string YulUtilFunctions::shiftRightFunction(size_t _numBits)
 			)")
 			("functionName", functionName)
 			("hasShifts", m_evmVersion.hasBitwiseShifting())
-			("numBits", to_string(_numBits))
+			("numBits", std::to_string(_numBits))
 			("multiplier", toCompactHexWithPrefix(u256(1) << _numBits))
 			.render();
 	});
 }
 
-string YulUtilFunctions::shiftRightFunctionDynamic()
+std::string YulUtilFunctions::shiftRightFunctionDynamic()
 {
-	string const functionName = "shift_right_unsigned_dynamic";
+	std::string const functionName = "shift_right_unsigned_dynamic";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -419,9 +419,9 @@ string YulUtilFunctions::shiftRightFunctionDynamic()
 	});
 }
 
-string YulUtilFunctions::shiftRightSignedFunctionDynamic()
+std::string YulUtilFunctions::shiftRightSignedFunctionDynamic()
 {
-	string const functionName = "shift_right_signed_dynamic";
+	std::string const functionName = "shift_right_signed_dynamic";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -446,13 +446,13 @@ string YulUtilFunctions::shiftRightSignedFunctionDynamic()
 }
 
 
-string YulUtilFunctions::typedShiftLeftFunction(Type const& _type, Type const& _amountType)
+std::string YulUtilFunctions::typedShiftLeftFunction(Type const& _type, Type const& _amountType)
 {
 	solUnimplementedAssert(_type.category() != Type::Category::FixedPoint, "Not yet implemented - FixedPointType.");
 	solAssert(_type.category() == Type::Category::FixedBytes || _type.category() == Type::Category::Integer, "");
 	solAssert(_amountType.category() == Type::Category::Integer, "");
 	solAssert(!dynamic_cast<IntegerType const&>(_amountType).isSigned(), "");
-	string const functionName = "shift_left_" + _type.identifier() + "_" + _amountType.identifier();
+	std::string const functionName = "shift_left_" + _type.identifier() + "_" + _amountType.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -469,7 +469,7 @@ string YulUtilFunctions::typedShiftLeftFunction(Type const& _type, Type const& _
 	});
 }
 
-string YulUtilFunctions::typedShiftRightFunction(Type const& _type, Type const& _amountType)
+std::string YulUtilFunctions::typedShiftRightFunction(Type const& _type, Type const& _amountType)
 {
 	solUnimplementedAssert(_type.category() != Type::Category::FixedPoint, "Not yet implemented - FixedPointType.");
 	solAssert(_type.category() == Type::Category::FixedBytes || _type.category() == Type::Category::Integer, "");
@@ -478,7 +478,7 @@ string YulUtilFunctions::typedShiftRightFunction(Type const& _type, Type const&
 	IntegerType const* integerType = dynamic_cast<IntegerType const*>(&_type);
 	bool valueSigned = integerType && integerType->isSigned();
 
-	string const functionName = "shift_right_" + _type.identifier() + "_" + _amountType.identifier();
+	std::string const functionName = "shift_right_" + _type.identifier() + "_" + _amountType.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -495,13 +495,13 @@ string YulUtilFunctions::typedShiftRightFunction(Type const& _type, Type const&
 	});
 }
 
-string YulUtilFunctions::updateByteSliceFunction(size_t _numBytes, size_t _shiftBytes)
+std::string YulUtilFunctions::updateByteSliceFunction(size_t _numBytes, size_t _shiftBytes)
 {
 	solAssert(_numBytes <= 32, "");
 	solAssert(_shiftBytes <= 32, "");
 	size_t numBits = _numBytes * 8;
 	size_t shiftBits = _shiftBytes * 8;
-	string functionName = "update_byte_slice_" + to_string(_numBytes) + "_shift_" + to_string(_shiftBytes);
+	std::string functionName = "update_byte_slice_" + std::to_string(_numBytes) + "_shift_" + std::to_string(_shiftBytes);
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -519,11 +519,11 @@ string YulUtilFunctions::updateByteSliceFunction(size_t _numBytes, size_t _shift
 	});
 }
 
-string YulUtilFunctions::updateByteSliceFunctionDynamic(size_t _numBytes)
+std::string YulUtilFunctions::updateByteSliceFunctionDynamic(size_t _numBytes)
 {
 	solAssert(_numBytes <= 32, "");
 	size_t numBits = _numBytes * 8;
-	string functionName = "update_byte_slice_dynamic" + to_string(_numBytes);
+	std::string functionName = "update_byte_slice_dynamic" + std::to_string(_numBytes);
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -542,9 +542,9 @@ string YulUtilFunctions::updateByteSliceFunctionDynamic(size_t _numBytes)
 	});
 }
 
-string YulUtilFunctions::maskBytesFunctionDynamic()
+std::string YulUtilFunctions::maskBytesFunctionDynamic()
 {
-	string functionName = "mask_bytes_dynamic";
+	std::string functionName = "mask_bytes_dynamic";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(data, bytes) -> result {
@@ -557,9 +557,9 @@ string YulUtilFunctions::maskBytesFunctionDynamic()
 	});
 }
 
-string YulUtilFunctions::maskLowerOrderBytesFunction(size_t _bytes)
+std::string YulUtilFunctions::maskLowerOrderBytesFunction(size_t _bytes)
 {
-	string functionName = "mask_lower_order_bytes_" + to_string(_bytes);
+	std::string functionName = "mask_lower_order_bytes_" + std::to_string(_bytes);
 	solAssert(_bytes <= 32, "");
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
@@ -572,9 +572,9 @@ string YulUtilFunctions::maskLowerOrderBytesFunction(size_t _bytes)
 	});
 }
 
-string YulUtilFunctions::maskLowerOrderBytesFunctionDynamic()
+std::string YulUtilFunctions::maskLowerOrderBytesFunctionDynamic()
 {
-	string functionName = "mask_lower_order_bytes_dynamic";
+	std::string functionName = "mask_lower_order_bytes_dynamic";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(data, bytes) -> result {
@@ -587,9 +587,9 @@ string YulUtilFunctions::maskLowerOrderBytesFunctionDynamic()
 	});
 }
 
-string YulUtilFunctions::roundUpFunction()
+std::string YulUtilFunctions::roundUpFunction()
 {
-	string functionName = "round_up_to_mul_of_32";
+	std::string functionName = "round_up_to_mul_of_32";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -602,11 +602,11 @@ string YulUtilFunctions::roundUpFunction()
 	});
 }
 
-string YulUtilFunctions::divide32CeilFunction()
+std::string YulUtilFunctions::divide32CeilFunction()
 {
 	return m_functionCollector.createFunction(
 		"divide_by_32_ceil",
-		[&](vector<string>& _args, vector<string>& _ret) {
+		[&](std::vector<std::string>& _args, std::vector<std::string>& _ret) {
 			_args = {"value"};
 			_ret = {"result"};
 			return "result := div(add(value, 31), 32)";
@@ -614,9 +614,9 @@ string YulUtilFunctions::divide32CeilFunction()
 	);
 }
 
-string YulUtilFunctions::overflowCheckedIntAddFunction(IntegerType const& _type)
+std::string YulUtilFunctions::overflowCheckedIntAddFunction(IntegerType const& _type)
 {
-	string functionName = "checked_add_" + _type.identifier();
+	std::string functionName = "checked_add_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -658,9 +658,9 @@ string YulUtilFunctions::overflowCheckedIntAddFunction(IntegerType const& _type)
 	});
 }
 
-string YulUtilFunctions::wrappingIntAddFunction(IntegerType const& _type)
+std::string YulUtilFunctions::wrappingIntAddFunction(IntegerType const& _type)
 {
-	string functionName = "wrapping_add_" + _type.identifier();
+	std::string functionName = "wrapping_add_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -674,9 +674,9 @@ string YulUtilFunctions::wrappingIntAddFunction(IntegerType const& _type)
 	});
 }
 
-string YulUtilFunctions::overflowCheckedIntMulFunction(IntegerType const& _type)
+std::string YulUtilFunctions::overflowCheckedIntMulFunction(IntegerType const& _type)
 {
-	string functionName = "checked_mul_" + _type.identifier();
+	std::string functionName = "checked_mul_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			// Multiplication by zero could be treated separately and directly return zero.
@@ -728,9 +728,9 @@ string YulUtilFunctions::overflowCheckedIntMulFunction(IntegerType const& _type)
 	});
 }
 
-string YulUtilFunctions::wrappingIntMulFunction(IntegerType const& _type)
+std::string YulUtilFunctions::wrappingIntMulFunction(IntegerType const& _type)
 {
-	string functionName = "wrapping_mul_" + _type.identifier();
+	std::string functionName = "wrapping_mul_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -744,9 +744,9 @@ string YulUtilFunctions::wrappingIntMulFunction(IntegerType const& _type)
 	});
 }
 
-string YulUtilFunctions::overflowCheckedIntDivFunction(IntegerType const& _type)
+std::string YulUtilFunctions::overflowCheckedIntDivFunction(IntegerType const& _type)
 {
-	string functionName = "checked_div_" + _type.identifier();
+	std::string functionName = "checked_div_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -774,9 +774,9 @@ string YulUtilFunctions::overflowCheckedIntDivFunction(IntegerType const& _type)
 	});
 }
 
-string YulUtilFunctions::wrappingIntDivFunction(IntegerType const& _type)
+std::string YulUtilFunctions::wrappingIntDivFunction(IntegerType const& _type)
 {
-	string functionName = "wrapping_div_" + _type.identifier();
+	std::string functionName = "wrapping_div_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -795,9 +795,9 @@ string YulUtilFunctions::wrappingIntDivFunction(IntegerType const& _type)
 	});
 }
 
-string YulUtilFunctions::intModFunction(IntegerType const& _type)
+std::string YulUtilFunctions::intModFunction(IntegerType const& _type)
 {
-	string functionName = "mod_" + _type.identifier();
+	std::string functionName = "mod_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -816,9 +816,9 @@ string YulUtilFunctions::intModFunction(IntegerType const& _type)
 	});
 }
 
-string YulUtilFunctions::overflowCheckedIntSubFunction(IntegerType const& _type)
+std::string YulUtilFunctions::overflowCheckedIntSubFunction(IntegerType const& _type)
 {
-	string functionName = "checked_sub_" + _type.identifier();
+	std::string functionName = "checked_sub_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&] {
 		return
 			Whiskers(R"(
@@ -860,9 +860,9 @@ string YulUtilFunctions::overflowCheckedIntSubFunction(IntegerType const& _type)
 	});
 }
 
-string YulUtilFunctions::wrappingIntSubFunction(IntegerType const& _type)
+std::string YulUtilFunctions::wrappingIntSubFunction(IntegerType const& _type)
 {
-	string functionName = "wrapping_sub_" + _type.identifier();
+	std::string functionName = "wrapping_sub_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&] {
 		return
 			Whiskers(R"(
@@ -876,14 +876,14 @@ string YulUtilFunctions::wrappingIntSubFunction(IntegerType const& _type)
 	});
 }
 
-string YulUtilFunctions::overflowCheckedIntExpFunction(
+std::string YulUtilFunctions::overflowCheckedIntExpFunction(
 	IntegerType const& _type,
 	IntegerType const& _exponentType
 )
 {
 	solAssert(!_exponentType.isSigned(), "");
 
-	string functionName = "checked_exp_" + _type.identifier() + "_" + _exponentType.identifier();
+	std::string functionName = "checked_exp_" + _type.identifier() + "_" + _exponentType.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -909,7 +909,7 @@ string YulUtilFunctions::overflowCheckedIntExpFunction(
 	});
 }
 
-string YulUtilFunctions::overflowCheckedIntLiteralExpFunction(
+std::string YulUtilFunctions::overflowCheckedIntLiteralExpFunction(
 	RationalNumberType const& _baseType,
 	IntegerType const& _exponentType,
 	IntegerType const& _commonType
@@ -919,7 +919,7 @@ string YulUtilFunctions::overflowCheckedIntLiteralExpFunction(
 	solAssert(_baseType.isNegative() == _commonType.isSigned(), "");
 	solAssert(_commonType.numBits() == 256, "");
 
-	string functionName = "checked_exp_" + _baseType.richIdentifier() + "_" + _exponentType.identifier();
+	std::string functionName = "checked_exp_" + _baseType.richIdentifier() + "_" + _exponentType.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&]()
 	{
@@ -1015,14 +1015,14 @@ string YulUtilFunctions::overflowCheckedIntLiteralExpFunction(
 			("functionName", functionName)
 			("exponentCleanupFunction", cleanupFunction(_exponentType))
 			("needsOverflowCheck", needsOverflowCheck)
-			("exponentUpperbound", to_string(exponentUpperbound))
+			("exponentUpperbound", std::to_string(exponentUpperbound))
 			("panic", panicFunction(PanicCode::UnderOverflow))
 			("base", bigint2u(baseValue).str())
 			.render();
 	});
 }
 
-string YulUtilFunctions::overflowCheckedUnsignedExpFunction()
+std::string YulUtilFunctions::overflowCheckedUnsignedExpFunction()
 {
 	// Checks for the "small number specialization" below.
 	using namespace boost::multiprecision;
@@ -1034,7 +1034,7 @@ string YulUtilFunctions::overflowCheckedUnsignedExpFunction()
 	solAssert(pow(bigint(307), 31) >= pow(bigint(2), 256), "");
 	solAssert(pow(bigint(306), 32) >= pow(bigint(2), 256), "");
 
-	string functionName = "checked_exp_unsigned";
+	std::string functionName = "checked_exp_unsigned";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -1080,9 +1080,9 @@ string YulUtilFunctions::overflowCheckedUnsignedExpFunction()
 	});
 }
 
-string YulUtilFunctions::overflowCheckedSignedExpFunction()
+std::string YulUtilFunctions::overflowCheckedSignedExpFunction()
 {
-	string functionName = "checked_exp_signed";
+	std::string functionName = "checked_exp_signed";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -1130,7 +1130,7 @@ string YulUtilFunctions::overflowCheckedSignedExpFunction()
 	});
 }
 
-string YulUtilFunctions::overflowCheckedExpLoopFunction()
+std::string YulUtilFunctions::overflowCheckedExpLoopFunction()
 {
 	// We use this loop for both signed and unsigned exponentiation
 	// because we pull out the first iteration in the signed case which
@@ -1138,7 +1138,7 @@ string YulUtilFunctions::overflowCheckedExpLoopFunction()
 
 	// This function does not include the final multiplication.
 
-	string functionName = "checked_exp_helper";
+	std::string functionName = "checked_exp_helper";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -1170,14 +1170,14 @@ string YulUtilFunctions::overflowCheckedExpLoopFunction()
 	});
 }
 
-string YulUtilFunctions::wrappingIntExpFunction(
+std::string YulUtilFunctions::wrappingIntExpFunction(
 	IntegerType const& _type,
 	IntegerType const& _exponentType
 )
 {
 	solAssert(!_exponentType.isSigned(), "");
 
-	string functionName = "wrapping_exp_" + _type.identifier() + "_" + _exponentType.identifier();
+	std::string functionName = "wrapping_exp_" + _type.identifier() + "_" + _exponentType.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return
 			Whiskers(R"(
@@ -1194,9 +1194,9 @@ string YulUtilFunctions::wrappingIntExpFunction(
 	});
 }
 
-string YulUtilFunctions::arrayLengthFunction(ArrayType const& _type)
+std::string YulUtilFunctions::arrayLengthFunction(ArrayType const& _type)
 {
-	string functionName = "array_length_" + _type.identifier();
+	std::string functionName = "array_length_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers w(R"(
 			function <functionName>(value<?dynamic><?calldata>, len</calldata></dynamic>) -> length {
@@ -1236,9 +1236,9 @@ string YulUtilFunctions::arrayLengthFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::extractByteArrayLengthFunction()
+std::string YulUtilFunctions::extractByteArrayLengthFunction()
 {
-	string functionName = "extract_byte_array_length";
+	std::string functionName = "extract_byte_array_length";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers w(R"(
 			function <functionName>(data) -> length {
@@ -1267,7 +1267,7 @@ std::string YulUtilFunctions::resizeArrayFunction(ArrayType const& _type)
 	if (_type.isByteArrayOrString())
 		return resizeDynamicByteArrayFunction(_type);
 
-	string functionName = "resize_array_" + _type.identifier();
+	std::string functionName = "resize_array_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers templ(R"(
 			function <functionName>(array, newLen) {
@@ -1299,15 +1299,15 @@ std::string YulUtilFunctions::resizeArrayFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::cleanUpStorageArrayEndFunction(ArrayType const& _type)
+std::string YulUtilFunctions::cleanUpStorageArrayEndFunction(ArrayType const& _type)
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solAssert(_type.baseType()->category() != Type::Category::Mapping, "");
 	solAssert(!_type.isByteArrayOrString(), "");
 	solUnimplementedAssert(_type.baseType()->storageBytes() <= 32);
 
-	string functionName = "cleanup_storage_array_end_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&](vector<string>& _args, vector<string>&) {
+	std::string functionName = "cleanup_storage_array_end_" + _type.identifier();
+	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
 		_args = {"array", "len", "startIndex"};
 		return Whiskers(R"(
 			if lt(startIndex, len) {
@@ -1330,17 +1330,17 @@ string YulUtilFunctions::cleanUpStorageArrayEndFunction(ArrayType const& _type)
 		("dataPosition", arrayDataAreaFunction(_type))
 		("clearStorageRange", clearStorageRangeFunction(*_type.baseType()))
 		("packed", _type.baseType()->storageBytes() <= 16)
-		("itemsPerSlot", to_string(32 / _type.baseType()->storageBytes()))
-		("storageBytes", to_string(_type.baseType()->storageBytes()))
+		("itemsPerSlot", std::to_string(32 / _type.baseType()->storageBytes()))
+		("storageBytes", std::to_string(_type.baseType()->storageBytes()))
 		("partialClearStorageSlot", partialClearStorageSlotFunction())
 		.render();
 	});
 }
 
-string YulUtilFunctions::resizeDynamicByteArrayFunction(ArrayType const& _type)
+std::string YulUtilFunctions::resizeDynamicByteArrayFunction(ArrayType const& _type)
 {
-	string functionName = "resize_array_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&](vector<string>& _args, vector<string>&) {
+	std::string functionName = "resize_array_" + _type.identifier();
+	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
 		_args = {"array", "newLen"};
 		return Whiskers(R"(
 			let data := sload(array)
@@ -1361,13 +1361,13 @@ string YulUtilFunctions::resizeDynamicByteArrayFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::cleanUpDynamicByteArrayEndSlotsFunction(ArrayType const& _type)
+std::string YulUtilFunctions::cleanUpDynamicByteArrayEndSlotsFunction(ArrayType const& _type)
 {
 	solAssert(_type.isByteArrayOrString(), "");
 	solAssert(_type.isDynamicallySized(), "");
 
-	string functionName = "clean_up_bytearray_end_slots_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&](vector<string>& _args, vector<string>&) {
+	std::string functionName = "clean_up_bytearray_end_slots_" + _type.identifier();
+	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
 		_args = {"array", "len", "startIndex"};
 		return Whiskers(R"(
 			if gt(len, 31) {
@@ -1385,9 +1385,9 @@ string YulUtilFunctions::cleanUpDynamicByteArrayEndSlotsFunction(ArrayType const
 	});
 }
 
-string YulUtilFunctions::decreaseByteArraySizeFunction(ArrayType const& _type)
+std::string YulUtilFunctions::decreaseByteArraySizeFunction(ArrayType const& _type)
 {
-	string functionName = "byte_array_decrease_size_" + _type.identifier();
+	std::string functionName = "byte_array_decrease_size_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(array, data, oldLen, newLen) {
@@ -1428,10 +1428,10 @@ string YulUtilFunctions::decreaseByteArraySizeFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::increaseByteArraySizeFunction(ArrayType const& _type)
+std::string YulUtilFunctions::increaseByteArraySizeFunction(ArrayType const& _type)
 {
-	string functionName = "byte_array_increase_size_" + _type.identifier();
-	return m_functionCollector.createFunction(functionName, [&](vector<string>& _args, vector<string>&) {
+	std::string functionName = "byte_array_increase_size_" + _type.identifier();
+	return m_functionCollector.createFunction(functionName, [&](std::vector<std::string>& _args, std::vector<std::string>&) {
 		_args = {"array", "data", "oldLen", "newLen"};
 		return Whiskers(R"(
 			if gt(newLen, <maxArrayLength>) { <panic>() }
@@ -1463,9 +1463,9 @@ string YulUtilFunctions::increaseByteArraySizeFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::byteArrayTransitLongToShortFunction(ArrayType const& _type)
+std::string YulUtilFunctions::byteArrayTransitLongToShortFunction(ArrayType const& _type)
 {
-	string functionName = "transit_byte_array_long_to_short_" + _type.identifier();
+	std::string functionName = "transit_byte_array_long_to_short_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(array, len) {
@@ -1483,9 +1483,9 @@ string YulUtilFunctions::byteArrayTransitLongToShortFunction(ArrayType const& _t
 	});
 }
 
-string YulUtilFunctions::shortByteArrayEncodeUsedAreaSetLengthFunction()
+std::string YulUtilFunctions::shortByteArrayEncodeUsedAreaSetLengthFunction()
 {
-	string functionName = "extract_used_part_and_set_length_of_short_byte_array";
+	std::string functionName = "extract_used_part_and_set_length_of_short_byte_array";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(data, len) -> used {
@@ -1500,11 +1500,11 @@ string YulUtilFunctions::shortByteArrayEncodeUsedAreaSetLengthFunction()
 	});
 }
 
-string YulUtilFunctions::longByteArrayStorageIndexAccessNoCheckFunction()
+std::string YulUtilFunctions::longByteArrayStorageIndexAccessNoCheckFunction()
 {
 	return m_functionCollector.createFunction(
 		"long_byte_array_index_access_no_checks",
-		[&](vector<string>& _args, vector<string>& _returnParams) {
+		[&](std::vector<std::string>& _args, std::vector<std::string>& _returnParams) {
 			_args = {"array", "index"};
 			_returnParams = {"slot", "offset"};
 			return Whiskers(R"(
@@ -1518,7 +1518,7 @@ string YulUtilFunctions::longByteArrayStorageIndexAccessNoCheckFunction()
 	);
 }
 
-string YulUtilFunctions::storageArrayPopFunction(ArrayType const& _type)
+std::string YulUtilFunctions::storageArrayPopFunction(ArrayType const& _type)
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solAssert(_type.isDynamicallySized(), "");
@@ -1526,7 +1526,7 @@ string YulUtilFunctions::storageArrayPopFunction(ArrayType const& _type)
 	if (_type.isByteArrayOrString())
 		return storageByteArrayPopFunction(_type);
 
-	string functionName = "array_pop_" + _type.identifier();
+	std::string functionName = "array_pop_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(array) {
@@ -1549,13 +1549,13 @@ string YulUtilFunctions::storageArrayPopFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::storageByteArrayPopFunction(ArrayType const& _type)
+std::string YulUtilFunctions::storageByteArrayPopFunction(ArrayType const& _type)
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solAssert(_type.isDynamicallySized(), "");
 	solAssert(_type.isByteArrayOrString(), "");
 
-	string functionName = "byte_array_pop_" + _type.identifier();
+	std::string functionName = "byte_array_pop_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(array) {
@@ -1593,7 +1593,7 @@ string YulUtilFunctions::storageByteArrayPopFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::storageArrayPushFunction(ArrayType const& _type, Type const* _fromType)
+std::string YulUtilFunctions::storageArrayPushFunction(ArrayType const& _type, Type const* _fromType)
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solAssert(_type.isDynamicallySized(), "");
@@ -1602,8 +1602,8 @@ string YulUtilFunctions::storageArrayPushFunction(ArrayType const& _type, Type c
 	else if (_fromType->isValueType())
 		solUnimplementedAssert(*_fromType == *_type.baseType());
 
-	string functionName =
-		string{"array_push_from_"} +
+	std::string functionName =
+		std::string{"array_push_from_"} +
 		_fromType->identifier() +
 		"_to_" +
 		_type.identifier();
@@ -1664,13 +1664,13 @@ string YulUtilFunctions::storageArrayPushFunction(ArrayType const& _type, Type c
 	});
 }
 
-string YulUtilFunctions::storageArrayPushZeroFunction(ArrayType const& _type)
+std::string YulUtilFunctions::storageArrayPushZeroFunction(ArrayType const& _type)
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 	solAssert(_type.isDynamicallySized(), "");
 	solUnimplementedAssert(_type.baseType()->storageBytes() <= 32, "Base type is not yet implemented.");
 
-	string functionName = "array_push_zero_" + _type.identifier();
+	std::string functionName = "array_push_zero_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(array) -> slot, offset {
@@ -1697,9 +1697,9 @@ string YulUtilFunctions::storageArrayPushZeroFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::partialClearStorageSlotFunction()
+std::string YulUtilFunctions::partialClearStorageSlotFunction()
 {
-	string functionName = "partial_clear_storage_slot";
+	std::string functionName = "partial_clear_storage_slot";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 		function <functionName>(slot, offset) {
@@ -1714,12 +1714,12 @@ string YulUtilFunctions::partialClearStorageSlotFunction()
 	});
 }
 
-string YulUtilFunctions::clearStorageRangeFunction(Type const& _type)
+std::string YulUtilFunctions::clearStorageRangeFunction(Type const& _type)
 {
 	if (_type.storageBytes() < 32)
 		solAssert(_type.isValueType(), "");
 
-	string functionName = "clear_storage_range_" + _type.identifier();
+	std::string functionName = "clear_storage_range_" + _type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
@@ -1737,7 +1737,7 @@ string YulUtilFunctions::clearStorageRangeFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::clearStorageArrayFunction(ArrayType const& _type)
+std::string YulUtilFunctions::clearStorageArrayFunction(ArrayType const& _type)
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 
@@ -1750,7 +1750,7 @@ string YulUtilFunctions::clearStorageArrayFunction(ArrayType const& _type)
 	if (_type.baseType()->isValueType())
 		solAssert(_type.baseType()->storageSize() <= 1, "Invalid size for value type.");
 
-	string functionName = "clear_storage_array_" + _type.identifier();
+	std::string functionName = "clear_storage_array_" + _type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
@@ -1777,17 +1777,17 @@ string YulUtilFunctions::clearStorageArrayFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::clearStorageStructFunction(StructType const& _type)
+std::string YulUtilFunctions::clearStorageStructFunction(StructType const& _type)
 {
 	solAssert(_type.location() == DataLocation::Storage, "");
 
-	string functionName = "clear_struct_storage_" + _type.identifier();
+	std::string functionName = "clear_struct_storage_" + _type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&] {
 		MemberList::MemberMap structMembers = _type.nativeMembers(nullptr);
-		vector<map<string, string>> memberSetValues;
+		std::vector<std::map<std::string, std::string>> memberSetValues;
 
-		set<u256> slotsCleared;
+		std::set<u256> slotsCleared;
 		for (auto const& member: structMembers)
 		{
 			if (member.type->category() == Type::Category::Mapping)
@@ -1811,7 +1811,7 @@ string YulUtilFunctions::clearStorageStructFunction(StructType const& _type)
 					)")
 					("setZero", storageSetToZeroFunction(*member.type))
 					("memberSlotDiff",  memberSlotDiff.str())
-					("memberStorageOffset", to_string(memberStorageOffset))
+					("memberStorageOffset", std::to_string(memberStorageOffset))
 					.render()
 				);
 			}
@@ -1830,7 +1830,7 @@ string YulUtilFunctions::clearStorageStructFunction(StructType const& _type)
 	});
 }
 
-string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
+std::string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
 {
 	solAssert(
 		(*_fromType.copyForLocation(_toType.location(), _toType.isPointer())).equals(dynamic_cast<ReferenceType const&>(_toType)),
@@ -1847,7 +1847,7 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 	solAssert(_toType.storageStride() == 32);
 	solAssert(!_fromType.baseType()->isValueType());
 
-	string functionName = "copy_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
+	std::string functionName = "copy_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
 	return m_functionCollector.createFunction(functionName, [&](){
 		Whiskers templ(R"(
 			function <functionName>(slot, value<?isFromDynamicCalldata>, len</isFromDynamicCalldata>) {
@@ -1915,9 +1915,9 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 		templ("updateStorageValue", updateStorageValueFunction(*_fromType.baseType(), *_toType.baseType(), 0));
 		templ("srcStride",
 			fromCalldata ?
-			to_string(_fromType.calldataStride()) :
+			std::to_string(_fromType.calldataStride()) :
 				fromMemory ?
-				to_string(_fromType.memoryStride()) :
+				std::to_string(_fromType.memoryStride()) :
 				formatNumber(_fromType.baseType()->storageSize())
 		);
 		templ("storageSize", _toType.baseType()->storageSize().str());
@@ -1927,7 +1927,7 @@ string YulUtilFunctions::copyArrayToStorageFunction(ArrayType const& _fromType,
 }
 
 
-string YulUtilFunctions::copyByteArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
+std::string YulUtilFunctions::copyByteArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
 {
 	solAssert(
 		(*_fromType.copyForLocation(_toType.location(), _toType.isPointer())).equals(dynamic_cast<ReferenceType const&>(_toType)),
@@ -1936,7 +1936,7 @@ string YulUtilFunctions::copyByteArrayToStorageFunction(ArrayType const& _fromTy
 	solAssert(_fromType.isByteArrayOrString(), "");
 	solAssert(_toType.isByteArrayOrString(), "");
 
-	string functionName = "copy_byte_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
+	std::string functionName = "copy_byte_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
 	return m_functionCollector.createFunction(functionName, [&](){
 		Whiskers templ(R"(
 			function <functionName>(slot, src<?fromCalldata>, len</fromCalldata>) {
@@ -1995,7 +1995,7 @@ string YulUtilFunctions::copyByteArrayToStorageFunction(ArrayType const& _fromTy
 		if (fromStorage)
 			templ("srcDataLocation", arrayDataAreaFunction(_fromType));
 		templ("cleanUpEndArray", cleanUpDynamicByteArrayEndSlotsFunction(_toType));
-		templ("srcIncrement", to_string(fromStorage ? 1 : 0x20));
+		templ("srcIncrement", std::to_string(fromStorage ? 1 : 0x20));
 		templ("read", fromStorage ? "sload" : fromCalldata ? "calldataload" : "mload");
 		templ("maskBytes", maskBytesFunctionDynamic());
 		templ("byteArrayCombineShort", shortByteArrayEncodeUsedAreaSetLengthFunction());
@@ -2004,7 +2004,7 @@ string YulUtilFunctions::copyByteArrayToStorageFunction(ArrayType const& _fromTy
 	});
 }
 
-string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
+std::string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromType, ArrayType const& _toType)
 {
 	solAssert(_fromType.baseType()->isValueType(), "");
 	solAssert(_toType.baseType()->isValueType(), "");
@@ -2017,7 +2017,7 @@ string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromT
 	solAssert(_fromType.storageStride() <= _toType.storageStride(), "");
 	solAssert(_toType.storageStride() <= 32, "");
 
-	string functionName = "copy_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
+	std::string functionName = "copy_array_to_storage_from_" + _fromType.identifier() + "_to_" + _toType.identifier();
 	return m_functionCollector.createFunction(functionName, [&](){
 		Whiskers templ(R"(
 			function <functionName>(dst, src<?isFromDynamicCalldata>, len</isFromDynamicCalldata>) {
@@ -2110,14 +2110,14 @@ string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromT
 		templ("readFromMemoryOrCalldata", readFromMemoryOrCalldata(*_fromType.baseType(), fromCalldata));
 		templ("srcDataLocation", arrayDataAreaFunction(_fromType));
 		templ("dstDataLocation", arrayDataAreaFunction(_toType));
-		templ("srcStride", to_string(_fromType.storageStride()));
+		templ("srcStride", std::to_string(_fromType.storageStride()));
 		templ("stackItems", suffixedVariableNameList(
 			"stackItem_",
 			0,
 			_fromType.baseType()->stackItems().size()
 		));
 		unsigned itemsPerSlot = 32 / _toType.storageStride();
-		templ("itemsPerSlot", to_string(itemsPerSlot));
+		templ("itemsPerSlot", std::to_string(itemsPerSlot));
 		templ("multipleItemsPerSlotDst", itemsPerSlot > 1);
 		bool sameTypeFromStorage = fromStorage && (*_fromType.baseType() == *_toType.baseType());
 		if (auto functionType = dynamic_cast<FunctionType const*>(_fromType.baseType()))
@@ -2135,7 +2135,7 @@ string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromT
 		}
 		else
 		{
-			templ("dstStride", to_string(_toType.storageStride()));
+			templ("dstStride", std::to_string(_toType.storageStride()));
 			templ("extractFromSlot", extractFromStorageValueDynamic(*_fromType.baseType()));
 			templ("updateByteSlice", updateByteSliceFunctionDynamic(_toType.storageStride()));
 			templ("convert", conversionFunction(*_fromType.baseType(), *_toType.baseType()));
@@ -2157,14 +2157,14 @@ string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromT
 				</srcReadMultiPerSlot>
 				)")
 				("srcReadMultiPerSlot", !sameTypeFromStorage && _fromType.storageStride() <= 16)
-				("srcItemsPerSlot", to_string(32 / _fromType.storageStride()))
+				("srcItemsPerSlot", std::to_string(32 / _fromType.storageStride()))
 				.render()
 			);
 		else
 			templ("updateSrcPtr", Whiskers(R"(
 					srcPtr := add(srcPtr, <srcStride>)
 				)")
-				("srcStride", fromCalldata ? to_string(_fromType.calldataStride()) : to_string(_fromType.memoryStride()))
+				("srcStride", fromCalldata ? std::to_string(_fromType.calldataStride()) : std::to_string(_fromType.memoryStride()))
 				.render()
 			);
 
@@ -2173,9 +2173,9 @@ string YulUtilFunctions::copyValueArrayToStorageFunction(ArrayType const& _fromT
 }
 
 
-string YulUtilFunctions::arrayConvertLengthToSize(ArrayType const& _type)
+std::string YulUtilFunctions::arrayConvertLengthToSize(ArrayType const& _type)
 {
-	string functionName = "array_convert_length_to_size_" + _type.identifier();
+	std::string functionName = "array_convert_length_to_size_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Type const& baseType = *_type.baseType();
 
@@ -2199,7 +2199,7 @@ string YulUtilFunctions::arrayConvertLengthToSize(ArrayType const& _type)
 					})")
 					("functionName", functionName)
 					("multiSlot", baseType.storageSize() > 1)
-					("itemsPerSlot", to_string(32 / baseStorageBytes))
+					("itemsPerSlot", std::to_string(32 / baseStorageBytes))
 					("storageSize", baseType.storageSize().str())
 					("mul", overflowCheckedIntMulFunction(*TypeProvider::uint256()))
 					.render();
@@ -2215,7 +2215,7 @@ string YulUtilFunctions::arrayConvertLengthToSize(ArrayType const& _type)
 						</byteArray>
 					})")
 					("functionName", functionName)
-					("stride", to_string(_type.location() == DataLocation::Memory ? _type.memoryStride() : _type.calldataStride()))
+					("stride", std::to_string(_type.location() == DataLocation::Memory ? _type.memoryStride() : _type.calldataStride()))
 					("byteArray", _type.isByteArrayOrString())
 					("mul", overflowCheckedIntMulFunction(*TypeProvider::uint256()))
 					.render();
@@ -2226,10 +2226,10 @@ string YulUtilFunctions::arrayConvertLengthToSize(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::arrayAllocationSizeFunction(ArrayType const& _type)
+std::string YulUtilFunctions::arrayAllocationSizeFunction(ArrayType const& _type)
 {
 	solAssert(_type.dataStoredIn(DataLocation::Memory), "");
-	string functionName = "array_allocation_size_" + _type.identifier();
+	std::string functionName = "array_allocation_size_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers w(R"(
 			function <functionName>(length) -> size {
@@ -2255,9 +2255,9 @@ string YulUtilFunctions::arrayAllocationSizeFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::arrayDataAreaFunction(ArrayType const& _type)
+std::string YulUtilFunctions::arrayDataAreaFunction(ArrayType const& _type)
 {
-	string functionName = "array_dataslot_" + _type.identifier();
+	std::string functionName = "array_dataslot_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		// No special processing for calldata arrays, because they are stored as
 		// offset of the data area and length on the stack, so the offset already
@@ -2286,9 +2286,9 @@ string YulUtilFunctions::arrayDataAreaFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::storageArrayIndexAccessFunction(ArrayType const& _type)
+std::string YulUtilFunctions::storageArrayIndexAccessFunction(ArrayType const& _type)
 {
-	string functionName = "storage_array_index_access_" + _type.identifier();
+	std::string functionName = "storage_array_index_access_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(array, index) -> slot, offset {
@@ -2326,14 +2326,14 @@ string YulUtilFunctions::storageArrayIndexAccessFunction(ArrayType const& _type)
 		("isBytesArray", _type.isByteArrayOrString())
 		("storageSize", _type.baseType()->storageSize().str())
 		("storageBytes", toString(_type.baseType()->storageBytes()))
-		("itemsPerSlot", to_string(32 / _type.baseType()->storageBytes()))
+		("itemsPerSlot", std::to_string(32 / _type.baseType()->storageBytes()))
 		.render();
 	});
 }
 
-string YulUtilFunctions::memoryArrayIndexAccessFunction(ArrayType const& _type)
+std::string YulUtilFunctions::memoryArrayIndexAccessFunction(ArrayType const& _type)
 {
-	string functionName = "memory_array_index_access_" + _type.identifier();
+	std::string functionName = "memory_array_index_access_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(baseRef, index) -> addr {
@@ -2351,16 +2351,16 @@ string YulUtilFunctions::memoryArrayIndexAccessFunction(ArrayType const& _type)
 		("functionName", functionName)
 		("panic", panicFunction(PanicCode::ArrayOutOfBounds))
 		("arrayLen", arrayLengthFunction(_type))
-		("stride", to_string(_type.memoryStride()))
+		("stride", std::to_string(_type.memoryStride()))
 		("dynamicallySized", _type.isDynamicallySized())
 		.render();
 	});
 }
 
-string YulUtilFunctions::calldataArrayIndexAccessFunction(ArrayType const& _type)
+std::string YulUtilFunctions::calldataArrayIndexAccessFunction(ArrayType const& _type)
 {
 	solAssert(_type.dataStoredIn(DataLocation::CallData), "");
-	string functionName = "calldata_array_index_access_" + _type.identifier();
+	std::string functionName = "calldata_array_index_access_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(base_ref<?dynamicallySized>, length</dynamicallySized>, index) -> addr<?dynamicallySizedBase>, len</dynamicallySizedBase> {
@@ -2373,7 +2373,7 @@ string YulUtilFunctions::calldataArrayIndexAccessFunction(ArrayType const& _type
 		)")
 		("functionName", functionName)
 		("panic", panicFunction(PanicCode::ArrayOutOfBounds))
-		("stride", to_string(_type.calldataStride()))
+		("stride", std::to_string(_type.calldataStride()))
 		("dynamicallySized", _type.isDynamicallySized())
 		("dynamicallyEncodedBase", _type.baseType()->isDynamicallyEncoded())
 		("dynamicallySizedBase", _type.baseType()->isDynamicallySized())
@@ -2383,11 +2383,11 @@ string YulUtilFunctions::calldataArrayIndexAccessFunction(ArrayType const& _type
 	});
 }
 
-string YulUtilFunctions::calldataArrayIndexRangeAccess(ArrayType const& _type)
+std::string YulUtilFunctions::calldataArrayIndexRangeAccess(ArrayType const& _type)
 {
 	solAssert(_type.dataStoredIn(DataLocation::CallData), "");
 	solAssert(_type.isDynamicallySized(), "");
-	string functionName = "calldata_array_index_range_access_" + _type.identifier();
+	std::string functionName = "calldata_array_index_range_access_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(offset, length, startIndex, endIndex) -> offsetOut, lengthOut {
@@ -2398,18 +2398,18 @@ string YulUtilFunctions::calldataArrayIndexRangeAccess(ArrayType const& _type)
 			}
 		)")
 		("functionName", functionName)
-		("stride", to_string(_type.calldataStride()))
+		("stride", std::to_string(_type.calldataStride()))
 		("revertSliceStartAfterEnd", revertReasonIfDebugFunction("Slice starts after end"))
 		("revertSliceGreaterThanLength", revertReasonIfDebugFunction("Slice is greater than length"))
 		.render();
 	});
 }
 
-string YulUtilFunctions::accessCalldataTailFunction(Type const& _type)
+std::string YulUtilFunctions::accessCalldataTailFunction(Type const& _type)
 {
 	solAssert(_type.isDynamicallyEncoded(), "");
 	solAssert(_type.dataStoredIn(DataLocation::CallData), "");
-	string functionName = "access_calldata_tail_" + _type.identifier();
+	std::string functionName = "access_calldata_tail_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(base_ref, ptr_to_tail) -> addr<?dynamicallySized>, length</dynamicallySized> {
@@ -2435,12 +2435,12 @@ string YulUtilFunctions::accessCalldataTailFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::nextArrayElementFunction(ArrayType const& _type)
+std::string YulUtilFunctions::nextArrayElementFunction(ArrayType const& _type)
 {
 	solAssert(!_type.isByteArrayOrString(), "");
 	if (_type.dataStoredIn(DataLocation::Storage))
 		solAssert(_type.baseType()->storageBytes() > 16, "");
-	string functionName = "array_nextElement_" + _type.identifier();
+	std::string functionName = "array_nextElement_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers templ(R"(
 			function <functionName>(ptr) -> next {
@@ -2472,7 +2472,7 @@ string YulUtilFunctions::nextArrayElementFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::copyArrayFromStorageToMemoryFunction(ArrayType const& _from, ArrayType const& _to)
+std::string YulUtilFunctions::copyArrayFromStorageToMemoryFunction(ArrayType const& _from, ArrayType const& _to)
 {
 	solAssert(_from.dataStoredIn(DataLocation::Storage), "");
 	solAssert(_to.dataStoredIn(DataLocation::Memory), "");
@@ -2480,7 +2480,7 @@ string YulUtilFunctions::copyArrayFromStorageToMemoryFunction(ArrayType const& _
 	if (!_from.isDynamicallySized())
 		solAssert(_from.length() == _to.length(), "");
 
-	string functionName = "copy_array_from_storage_to_memory_" + _from.identifier();
+	std::string functionName = "copy_array_from_storage_to_memory_" + _from.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		if (_from.baseType()->isValueType())
@@ -2536,15 +2536,15 @@ string YulUtilFunctions::copyArrayFromStorageToMemoryFunction(ArrayType const& _
 	});
 }
 
-string YulUtilFunctions::bytesOrStringConcatFunction(
-	vector<Type const*> const& _argumentTypes,
+std::string YulUtilFunctions::bytesOrStringConcatFunction(
+	std::vector<Type const*> const& _argumentTypes,
 	FunctionType::Kind _functionTypeKind
 )
 {
 	solAssert(_functionTypeKind == FunctionType::Kind::BytesConcat || _functionTypeKind == FunctionType::Kind::StringConcat);
 	std::string functionName = (_functionTypeKind == FunctionType::Kind::StringConcat) ? "string_concat" : "bytes_concat";
 	size_t totalParams = 0;
-	vector<Type const*> targetTypes;
+	std::vector<Type const*> targetTypes;
 
 	for (Type const* argumentType: _argumentTypes)
 	{
@@ -2600,9 +2600,9 @@ string YulUtilFunctions::bytesOrStringConcatFunction(
 	});
 }
 
-string YulUtilFunctions::mappingIndexAccessFunction(MappingType const& _mappingType, Type const& _keyType)
+std::string YulUtilFunctions::mappingIndexAccessFunction(MappingType const& _mappingType, Type const& _keyType)
 {
-	string functionName = "mapping_index_access_" + _mappingType.identifier() + "_of_" + _keyType.identifier();
+	std::string functionName = "mapping_index_access_" + _mappingType.identifier() + "_of_" + _keyType.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		if (_mappingType.keyType()->isDynamicallySized())
 			return Whiskers(R"(
@@ -2640,7 +2640,7 @@ string YulUtilFunctions::mappingIndexAccessFunction(MappingType const& _mappingT
 	});
 }
 
-string YulUtilFunctions::readFromStorage(Type const& _type, size_t _offset, bool _splitFunctionTypes)
+std::string YulUtilFunctions::readFromStorage(Type const& _type, size_t _offset, bool _splitFunctionTypes)
 {
 	if (_type.isValueType())
 		return readFromStorageValueType(_type, _offset, _splitFunctionTypes);
@@ -2651,13 +2651,13 @@ string YulUtilFunctions::readFromStorage(Type const& _type, size_t _offset, bool
 	}
 }
 
-string YulUtilFunctions::readFromStorageDynamic(Type const& _type, bool _splitFunctionTypes)
+std::string YulUtilFunctions::readFromStorageDynamic(Type const& _type, bool _splitFunctionTypes)
 {
 	if (_type.isValueType())
 		return readFromStorageValueType(_type, {}, _splitFunctionTypes);
-	string functionName =
+	std::string functionName =
 		"read_from_storage__dynamic_" +
-		string(_splitFunctionTypes ? "split_" : "") +
+		std::string(_splitFunctionTypes ? "split_" : "") +
 		_type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&] {
@@ -2674,15 +2674,15 @@ string YulUtilFunctions::readFromStorageDynamic(Type const& _type, bool _splitFu
 	});
 }
 
-string YulUtilFunctions::readFromStorageValueType(Type const& _type, optional<size_t> _offset, bool _splitFunctionTypes)
+std::string YulUtilFunctions::readFromStorageValueType(Type const& _type, std::optional<size_t> _offset, bool _splitFunctionTypes)
 {
 	solAssert(_type.isValueType(), "");
 
-	string functionName =
+	std::string functionName =
 			"read_from_storage_" +
-			string(_splitFunctionTypes ? "split_" : "") + (
+			std::string(_splitFunctionTypes ? "split_" : "") + (
 				_offset.has_value() ?
-				"offset_" + to_string(*_offset) :
+				"offset_" + std::to_string(*_offset) :
 				"dynamic"
 			) +
 			"_" +
@@ -2712,7 +2712,7 @@ string YulUtilFunctions::readFromStorageValueType(Type const& _type, optional<si
 	});
 }
 
-string YulUtilFunctions::readFromStorageReferenceType(Type const& _type)
+std::string YulUtilFunctions::readFromStorageReferenceType(Type const& _type)
 {
 	if (auto const* arrayType = dynamic_cast<ArrayType const*>(&_type))
 	{
@@ -2724,12 +2724,12 @@ string YulUtilFunctions::readFromStorageReferenceType(Type const& _type)
 	}
 	solAssert(_type.category() == Type::Category::Struct, "");
 
-	string functionName = "read_from_storage_reference_type_" + _type.identifier();
+	std::string functionName = "read_from_storage_reference_type_" + _type.identifier();
 
 	auto const& structType = dynamic_cast<StructType const&>(_type);
 	solAssert(structType.location() == DataLocation::Memory, "");
 	MemberList::MemberMap structMembers = structType.nativeMembers(nullptr);
-	vector<map<string, string>> memberSetValues(structMembers.size());
+	std::vector<std::map<std::string, std::string>> memberSetValues(structMembers.size());
 	for (size_t i = 0; i < structMembers.size(); ++i)
 	{
 		auto const& [memberSlotDiff, memberStorageOffset] = structType.storageOffsetsOfMember(structMembers[i].name);
@@ -2765,25 +2765,25 @@ string YulUtilFunctions::readFromStorageReferenceType(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::readFromMemory(Type const& _type)
+std::string YulUtilFunctions::readFromMemory(Type const& _type)
 {
 	return readFromMemoryOrCalldata(_type, false);
 }
 
-string YulUtilFunctions::readFromCalldata(Type const& _type)
+std::string YulUtilFunctions::readFromCalldata(Type const& _type)
 {
 	return readFromMemoryOrCalldata(_type, true);
 }
 
-string YulUtilFunctions::updateStorageValueFunction(
+std::string YulUtilFunctions::updateStorageValueFunction(
 	Type const& _fromType,
 	Type const& _toType,
 	std::optional<unsigned> const& _offset
 )
 {
-	string const functionName =
+	std::string const functionName =
 		"update_storage_value_" +
-		(_offset.has_value() ? ("offset_" + to_string(*_offset)) : "") +
+		(_offset.has_value() ? ("offset_" + std::to_string(*_offset)) : "") +
 		_fromType.identifier() +
 		"_to_" +
 		_toType.identifier();
@@ -2887,9 +2887,9 @@ string YulUtilFunctions::updateStorageValueFunction(
 	});
 }
 
-string YulUtilFunctions::writeToMemoryFunction(Type const& _type)
+std::string YulUtilFunctions::writeToMemoryFunction(Type const& _type)
 {
-	string const functionName = "write_to_memory_" + _type.identifier();
+	std::string const functionName = "write_to_memory_" + _type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&] {
 		solAssert(!dynamic_cast<StringLiteralType const*>(&_type), "");
@@ -2943,9 +2943,9 @@ string YulUtilFunctions::writeToMemoryFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::extractFromStorageValueDynamic(Type const& _type)
+std::string YulUtilFunctions::extractFromStorageValueDynamic(Type const& _type)
 {
-	string functionName =
+	std::string functionName =
 		"extract_from_storage_value_dynamic" +
 		_type.identifier();
 	return m_functionCollector.createFunction(functionName, [&] {
@@ -2961,9 +2961,9 @@ string YulUtilFunctions::extractFromStorageValueDynamic(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::extractFromStorageValue(Type const& _type, size_t _offset)
+std::string YulUtilFunctions::extractFromStorageValue(Type const& _type, size_t _offset)
 {
-	string functionName = "extract_from_storage_value_offset_" + to_string(_offset) + _type.identifier();
+	std::string functionName = "extract_from_storage_value_offset_" + std::to_string(_offset) + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&] {
 		return Whiskers(R"(
 			function <functionName>(slot_value) -> value {
@@ -2977,11 +2977,11 @@ string YulUtilFunctions::extractFromStorageValue(Type const& _type, size_t _offs
 	});
 }
 
-string YulUtilFunctions::cleanupFromStorageFunction(Type const& _type)
+std::string YulUtilFunctions::cleanupFromStorageFunction(Type const& _type)
 {
 	solAssert(_type.isValueType(), "");
 
-	string functionName = string("cleanup_from_storage_") + _type.identifier();
+	std::string functionName = std::string("cleanup_from_storage_") + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&] {
 		Whiskers templ(R"(
 			function <functionName>(value) -> cleaned {
@@ -2997,7 +2997,7 @@ string YulUtilFunctions::cleanupFromStorageFunction(Type const& _type)
 		if (IntegerType const* intType = dynamic_cast<IntegerType const*>(encodingType))
 			if (intType->isSigned() && storageBytes != 32)
 			{
-				templ("cleaned", "signextend(" + to_string(storageBytes - 1) + ", value)");
+				templ("cleaned", "signextend(" + std::to_string(storageBytes - 1) + ", value)");
 				return templ.render();
 			}
 
@@ -3012,9 +3012,9 @@ string YulUtilFunctions::cleanupFromStorageFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::prepareStoreFunction(Type const& _type)
+std::string YulUtilFunctions::prepareStoreFunction(Type const& _type)
 {
-	string functionName = "prepare_store_" + _type.identifier();
+	std::string functionName = "prepare_store_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		solAssert(_type.isValueType(), "");
 		auto const* funType = dynamic_cast<FunctionType const*>(&_type);
@@ -3048,9 +3048,9 @@ string YulUtilFunctions::prepareStoreFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::allocationFunction()
+std::string YulUtilFunctions::allocationFunction()
 {
-	string functionName = "allocate_memory";
+	std::string functionName = "allocate_memory";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(size) -> memPtr {
@@ -3065,24 +3065,24 @@ string YulUtilFunctions::allocationFunction()
 	});
 }
 
-string YulUtilFunctions::allocateUnboundedFunction()
+std::string YulUtilFunctions::allocateUnboundedFunction()
 {
-	string functionName = "allocate_unbounded";
+	std::string functionName = "allocate_unbounded";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>() -> memPtr {
 				memPtr := mload(<freeMemoryPointer>)
 			}
 		)")
-		("freeMemoryPointer", to_string(CompilerUtils::freeMemoryPointer))
+		("freeMemoryPointer", std::to_string(CompilerUtils::freeMemoryPointer))
 		("functionName", functionName)
 		.render();
 	});
 }
 
-string YulUtilFunctions::finalizeAllocationFunction()
+std::string YulUtilFunctions::finalizeAllocationFunction()
 {
-	string functionName = "finalize_allocation";
+	std::string functionName = "finalize_allocation";
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(memPtr, size) {
@@ -3093,25 +3093,25 @@ string YulUtilFunctions::finalizeAllocationFunction()
 			}
 		)")
 		("functionName", functionName)
-		("freeMemoryPointer", to_string(CompilerUtils::freeMemoryPointer))
+		("freeMemoryPointer", std::to_string(CompilerUtils::freeMemoryPointer))
 		("roundUp", roundUpFunction())
 		("panic", panicFunction(PanicCode::ResourceError))
 		.render();
 	});
 }
 
-string YulUtilFunctions::zeroMemoryArrayFunction(ArrayType const& _type)
+std::string YulUtilFunctions::zeroMemoryArrayFunction(ArrayType const& _type)
 {
 	if (_type.baseType()->hasSimpleZeroValueInMemory())
 		return zeroMemoryFunction(*_type.baseType());
 	return zeroComplexMemoryArrayFunction(_type);
 }
 
-string YulUtilFunctions::zeroMemoryFunction(Type const& _type)
+std::string YulUtilFunctions::zeroMemoryFunction(Type const& _type)
 {
 	solAssert(_type.hasSimpleZeroValueInMemory(), "");
 
-	string functionName = "zero_memory_chunk_" + _type.identifier();
+	std::string functionName = "zero_memory_chunk_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(dataStart, dataSizeInBytes) {
@@ -3123,11 +3123,11 @@ string YulUtilFunctions::zeroMemoryFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::zeroComplexMemoryArrayFunction(ArrayType const& _type)
+std::string YulUtilFunctions::zeroComplexMemoryArrayFunction(ArrayType const& _type)
 {
 	solAssert(!_type.baseType()->hasSimpleZeroValueInMemory(), "");
 
-	string functionName = "zero_complex_memory_array_" + _type.identifier();
+	std::string functionName = "zero_complex_memory_array_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		solAssert(_type.memoryStride() == 32, "");
 		return Whiskers(R"(
@@ -3138,15 +3138,15 @@ string YulUtilFunctions::zeroComplexMemoryArrayFunction(ArrayType const& _type)
 			}
 		)")
 		("functionName", functionName)
-		("stride", to_string(_type.memoryStride()))
+		("stride", std::to_string(_type.memoryStride()))
 		("zeroValue", zeroValueFunction(*_type.baseType(), false))
 		.render();
 	});
 }
 
-string YulUtilFunctions::allocateMemoryArrayFunction(ArrayType const& _type)
+std::string YulUtilFunctions::allocateMemoryArrayFunction(ArrayType const& _type)
 {
-	string functionName = "allocate_memory_array_" + _type.identifier();
+	std::string functionName = "allocate_memory_array_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 				function <functionName>(length) -> memPtr {
@@ -3165,9 +3165,9 @@ string YulUtilFunctions::allocateMemoryArrayFunction(ArrayType const& _type)
 	});
 }
 
-string YulUtilFunctions::allocateAndInitializeMemoryArrayFunction(ArrayType const& _type)
+std::string YulUtilFunctions::allocateAndInitializeMemoryArrayFunction(ArrayType const& _type)
 {
-	string functionName = "allocate_and_zero_memory_array_" + _type.identifier();
+	std::string functionName = "allocate_and_zero_memory_array_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 				function <functionName>(length) -> memPtr {
@@ -3190,9 +3190,9 @@ string YulUtilFunctions::allocateAndInitializeMemoryArrayFunction(ArrayType cons
 	});
 }
 
-string YulUtilFunctions::allocateMemoryStructFunction(StructType const& _type)
+std::string YulUtilFunctions::allocateMemoryStructFunction(StructType const& _type)
 {
-	string functionName = "allocate_memory_struct_" + _type.identifier();
+	std::string functionName = "allocate_memory_struct_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers templ(R"(
 		function <functionName>() -> memPtr {
@@ -3207,9 +3207,9 @@ string YulUtilFunctions::allocateMemoryStructFunction(StructType const& _type)
 	});
 }
 
-string YulUtilFunctions::allocateAndInitializeMemoryStructFunction(StructType const& _type)
+std::string YulUtilFunctions::allocateAndInitializeMemoryStructFunction(StructType const& _type)
 {
-	string functionName = "allocate_and_zero_memory_struct_" + _type.identifier();
+	std::string functionName = "allocate_and_zero_memory_struct_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers templ(R"(
 		function <functionName>() -> memPtr {
@@ -3226,7 +3226,7 @@ string YulUtilFunctions::allocateAndInitializeMemoryStructFunction(StructType co
 
 		TypePointers const& members = _type.memoryMemberTypes();
 
-		vector<map<string, string>> memberParams(members.size());
+		std::vector<std::map<std::string, std::string>> memberParams(members.size());
 		for (size_t i = 0; i < members.size(); ++i)
 		{
 			solAssert(members[i]->memoryHeadSize() == 32, "");
@@ -3240,7 +3240,7 @@ string YulUtilFunctions::allocateAndInitializeMemoryStructFunction(StructType co
 	});
 }
 
-string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
+std::string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 {
 	if (_from.category() == Type::Category::UserDefinedValueType)
 	{
@@ -3264,7 +3264,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 			fromType.kind() == targetType.kind(),
 			"Invalid function type conversion requested."
 		);
-		string const functionName =
+		std::string const functionName =
 			"convert_" +
 			_from.identifier() +
 			"_to_" +
@@ -3305,7 +3305,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 		if (!targetType.dataStoredIn(DataLocation::CallData))
 			return arrayConversionFunction(fromType.arrayType(), targetType);
 
-		string const functionName =
+		std::string const functionName =
 			"convert_" +
 			_from.identifier() +
 			"_to_" +
@@ -3336,7 +3336,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 	if (_from.sizeOnStack() != 1 || _to.sizeOnStack() != 1)
 		return conversionFunctionSpecial(_from, _to);
 
-	string functionName =
+	std::string functionName =
 		"convert_" +
 		_from.identifier() +
 		"_to_" +
@@ -3348,7 +3348,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 			}
 		)");
 		templ("functionName", functionName);
-		string body;
+		std::string body;
 		auto toCategory = _to.category();
 		auto fromCategory = _from.category();
 		switch (fromCategory)
@@ -3378,7 +3378,7 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 				Whiskers bodyTemplate("converted := <cleanOutput>(<convert>(<cleanInput>(value)))");
 				bodyTemplate("cleanInput", cleanupFunction(_from));
 				bodyTemplate("cleanOutput", cleanupFunction(_to));
-				string convert;
+				std::string convert;
 
 				solAssert(_to.category() != Type::Category::UserDefinedValueType, "");
 				if (auto const* toFixedBytes = dynamic_cast<FixedBytesType const*>(&_to))
@@ -3528,11 +3528,11 @@ string YulUtilFunctions::conversionFunction(Type const& _from, Type const& _to)
 	});
 }
 
-string YulUtilFunctions::bytesToFixedBytesConversionFunction(ArrayType const& _from, FixedBytesType const& _to)
+std::string YulUtilFunctions::bytesToFixedBytesConversionFunction(ArrayType const& _from, FixedBytesType const& _to)
 {
 	solAssert(_from.isByteArray(), "");
 	solAssert(_from.isDynamicallySized(), "");
-	string functionName = "convert_bytes_to_fixedbytes_from_" + _from.identifier() + "_to_" + _to.identifier();
+	std::string functionName = "convert_bytes_to_fixedbytes_from_" + _from.identifier() + "_to_" + _to.identifier();
 	return m_functionCollector.createFunction(functionName, [&](auto& _args, auto& _returnParams) {
 		_args = { "array" };
 		bool fromCalldata = _from.dataStoredIn(DataLocation::CallData);
@@ -3567,7 +3567,7 @@ string YulUtilFunctions::bytesToFixedBytesConversionFunction(ArrayType const& _f
 		)");
 		templ("fromCalldata", fromCalldata);
 		templ("arrayLen", arrayLengthFunction(_from));
-		templ("fixedBytesLen", to_string(_to.numBytes()));
+		templ("fixedBytesLen", std::to_string(_to.numBytes()));
 		templ("fromMemory", _from.dataStoredIn(DataLocation::Memory));
 		templ("fromStorage", _from.dataStoredIn(DataLocation::Storage));
 		templ("dataArea", arrayDataAreaFunction(_from));
@@ -3586,12 +3586,12 @@ string YulUtilFunctions::bytesToFixedBytesConversionFunction(ArrayType const& _f
 	});
 }
 
-string YulUtilFunctions::copyStructToStorageFunction(StructType const& _from, StructType const& _to)
+std::string YulUtilFunctions::copyStructToStorageFunction(StructType const& _from, StructType const& _to)
 {
 	solAssert(_to.dataStoredIn(DataLocation::Storage), "");
 	solAssert(_from.structDefinition() == _to.structDefinition(), "");
 
-	string functionName =
+	std::string functionName =
 		"copy_struct_to_storage_from_" +
 		_from.identifier() +
 		"_to_" +
@@ -3613,7 +3613,7 @@ string YulUtilFunctions::copyStructToStorageFunction(StructType const& _from, St
 		MemberList::MemberMap structMembers = _from.nativeMembers(nullptr);
 		MemberList::MemberMap toStructMembers = _to.nativeMembers(nullptr);
 
-		vector<map<string, string>> memberParams(structMembers.size());
+		std::vector<std::map<std::string, std::string>> memberParams(structMembers.size());
 		for (size_t i = 0; i < structMembers.size(); ++i)
 		{
 			Type const& memberType = *structMembers[i].type;
@@ -3664,7 +3664,7 @@ string YulUtilFunctions::copyStructToStorageFunction(StructType const& _from, St
 			t("memberStorageSlotDiff", slotDiff.str());
 			if (fromCalldata)
 			{
-				t("memberOffset", to_string(_from.calldataOffsetOfMember(structMembers[i].name)));
+				t("memberOffset", std::to_string(_from.calldataOffsetOfMember(structMembers[i].name)));
 				t("dynamicallyEncodedMember", memberType.isDynamicallyEncoded());
 				if (memberType.isDynamicallyEncoded())
 					t("accessCalldataTail", accessCalldataTailFunction(memberType));
@@ -3689,7 +3689,7 @@ string YulUtilFunctions::copyStructToStorageFunction(StructType const& _from, St
 			t("updateStorageValue", updateStorageValueFunction(
 				memberType,
 				*toStructMembers[i].type,
-				optional<unsigned>{offset}
+				std::optional<unsigned>{offset}
 			));
 			memberParams[i]["updateMemberCall"] = t.render();
 		}
@@ -3699,7 +3699,7 @@ string YulUtilFunctions::copyStructToStorageFunction(StructType const& _from, St
 	});
 }
 
-string YulUtilFunctions::arrayConversionFunction(ArrayType const& _from, ArrayType const& _to)
+std::string YulUtilFunctions::arrayConversionFunction(ArrayType const& _from, ArrayType const& _to)
 {
 	if (_to.dataStoredIn(DataLocation::CallData))
 		solAssert(
@@ -3715,7 +3715,7 @@ string YulUtilFunctions::arrayConversionFunction(ArrayType const& _from, ArrayTy
 			"Invalid conversion to storage type."
 		);
 
-	string functionName =
+	std::string functionName =
 		"convert_array_" +
 		_from.identifier() +
 		"_to_" +
@@ -3781,12 +3781,12 @@ string YulUtilFunctions::arrayConversionFunction(ArrayType const& _from, ArrayTy
 	});
 }
 
-string YulUtilFunctions::cleanupFunction(Type const& _type)
+std::string YulUtilFunctions::cleanupFunction(Type const& _type)
 {
 	if (auto userDefinedValueType = dynamic_cast<UserDefinedValueType const*>(&_type))
 		return cleanupFunction(userDefinedValueType->underlyingType());
 
-	string functionName = string("cleanup_") + _type.identifier();
+	std::string functionName = std::string("cleanup_") + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers templ(R"(
 			function <functionName>(value) -> cleaned {
@@ -3805,7 +3805,7 @@ string YulUtilFunctions::cleanupFunction(Type const& _type)
 			if (type.numBits() == 256)
 				templ("body", "cleaned := value");
 			else if (type.isSigned())
-				templ("body", "cleaned := signextend(" + to_string(type.numBits() / 8 - 1) + ", value)");
+				templ("body", "cleaned := signextend(" + std::to_string(type.numBits() / 8 - 1) + ", value)");
 			else
 				templ("body", "cleaned := and(value, " + toCompactHexWithPrefix((u256(1) << type.numBits()) - 1) + ")");
 			break;
@@ -3881,9 +3881,9 @@ string YulUtilFunctions::cleanupFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::validatorFunction(Type const& _type, bool _revertOnFailure)
+std::string YulUtilFunctions::validatorFunction(Type const& _type, bool _revertOnFailure)
 {
-	string functionName = string("validator_") + (_revertOnFailure ? "revert_" : "assert_") + _type.identifier();
+	std::string functionName = std::string("validator_") + (_revertOnFailure ? "revert_" : "assert_") + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		Whiskers templ(R"(
 			function <functionName>(value) {
@@ -3916,7 +3916,7 @@ string YulUtilFunctions::validatorFunction(Type const& _type, bool _revertOnFail
 			size_t members = dynamic_cast<EnumType const&>(_type).numberOfMembers();
 			solAssert(members > 0, "empty enum should have caused a parser error.");
 			panicCode = PanicCode::EnumConversionError;
-			templ("condition", "lt(value, " + to_string(members) + ")");
+			templ("condition", "lt(value, " + std::to_string(members) + ")");
 			break;
 		}
 		case Type::Category::InaccessibleDynamic:
@@ -3935,12 +3935,12 @@ string YulUtilFunctions::validatorFunction(Type const& _type, bool _revertOnFail
 	});
 }
 
-string YulUtilFunctions::packedHashFunction(
-	vector<Type const*> const& _givenTypes,
-	vector<Type const*> const& _targetTypes
+std::string YulUtilFunctions::packedHashFunction(
+	std::vector<Type const*> const& _givenTypes,
+	std::vector<Type const*> const& _targetTypes
 )
 {
-	string functionName = string("packed_hashed_");
+	std::string functionName = std::string("packed_hashed_");
 	for (auto const& t: _givenTypes)
 		functionName += t->identifier() + "_";
 	functionName += "_to_";
@@ -3966,10 +3966,10 @@ string YulUtilFunctions::packedHashFunction(
 	});
 }
 
-string YulUtilFunctions::forwardingRevertFunction()
+std::string YulUtilFunctions::forwardingRevertFunction()
 {
 	bool forward = m_evmVersion.supportsReturndata();
-	string functionName = "revert_forward_" + to_string(forward);
+	std::string functionName = "revert_forward_" + std::to_string(forward);
 	return m_functionCollector.createFunction(functionName, [&]() {
 		if (forward)
 			return Whiskers(R"(
@@ -3998,7 +3998,7 @@ std::string YulUtilFunctions::decrementCheckedFunction(Type const& _type)
 	solAssert(_type.category() == Type::Category::Integer, "");
 	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
 
-	string const functionName = "decrement_" + _type.identifier();
+	std::string const functionName = "decrement_" + _type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
@@ -4021,7 +4021,7 @@ std::string YulUtilFunctions::decrementWrappingFunction(Type const& _type)
 	solAssert(_type.category() == Type::Category::Integer, "");
 	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
 
-	string const functionName = "decrement_wrapping_" + _type.identifier();
+	std::string const functionName = "decrement_wrapping_" + _type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
@@ -4040,7 +4040,7 @@ std::string YulUtilFunctions::incrementCheckedFunction(Type const& _type)
 	solAssert(_type.category() == Type::Category::Integer, "");
 	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
 
-	string const functionName = "increment_" + _type.identifier();
+	std::string const functionName = "increment_" + _type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
@@ -4063,7 +4063,7 @@ std::string YulUtilFunctions::incrementWrappingFunction(Type const& _type)
 	solAssert(_type.category() == Type::Category::Integer, "");
 	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
 
-	string const functionName = "increment_wrapping_" + _type.identifier();
+	std::string const functionName = "increment_wrapping_" + _type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
@@ -4077,13 +4077,13 @@ std::string YulUtilFunctions::incrementWrappingFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::negateNumberCheckedFunction(Type const& _type)
+std::string YulUtilFunctions::negateNumberCheckedFunction(Type const& _type)
 {
 	solAssert(_type.category() == Type::Category::Integer, "");
 	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
 	solAssert(type.isSigned(), "Expected signed type!");
 
-	string const functionName = "negate_" + _type.identifier();
+	std::string const functionName = "negate_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(value) -> ret {
@@ -4100,13 +4100,13 @@ string YulUtilFunctions::negateNumberCheckedFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::negateNumberWrappingFunction(Type const& _type)
+std::string YulUtilFunctions::negateNumberWrappingFunction(Type const& _type)
 {
 	solAssert(_type.category() == Type::Category::Integer, "");
 	IntegerType const& type = dynamic_cast<IntegerType const&>(_type);
 	solAssert(type.isSigned(), "Expected signed type!");
 
-	string const functionName = "negate_wrapping_" + _type.identifier();
+	std::string const functionName = "negate_wrapping_" + _type.identifier();
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>(value) -> ret {
@@ -4119,11 +4119,11 @@ string YulUtilFunctions::negateNumberWrappingFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::zeroValueFunction(Type const& _type, bool _splitFunctionTypes)
+std::string YulUtilFunctions::zeroValueFunction(Type const& _type, bool _splitFunctionTypes)
 {
 	solAssert(_type.category() != Type::Category::Mapping, "");
 
-	string const functionName = "zero_value_for_" + string(_splitFunctionTypes ? "split_" : "") + _type.identifier();
+	std::string const functionName = "zero_value_for_" + std::string(_splitFunctionTypes ? "split_" : "") + _type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		FunctionType const* fType = dynamic_cast<FunctionType const*>(&_type);
@@ -4179,9 +4179,9 @@ string YulUtilFunctions::zeroValueFunction(Type const& _type, bool _splitFunctio
 			if (auto const* arrayType = dynamic_cast<ArrayType const*>(&_type))
 			{
 				if (_type.isDynamicallySized())
-					templ("zeroValue", to_string(CompilerUtils::zeroPointer));
+					templ("zeroValue", std::to_string(CompilerUtils::zeroPointer));
 				else
-					templ("zeroValue", allocateAndInitializeMemoryArrayFunction(*arrayType) + "(" + to_string(unsigned(arrayType->length())) + ")");
+					templ("zeroValue", allocateAndInitializeMemoryArrayFunction(*arrayType) + "(" + std::to_string(unsigned(arrayType->length())) + ")");
 
 			}
 			else if (auto const* structType = dynamic_cast<StructType const*>(&_type))
@@ -4194,9 +4194,9 @@ string YulUtilFunctions::zeroValueFunction(Type const& _type, bool _splitFunctio
 	});
 }
 
-string YulUtilFunctions::storageSetToZeroFunction(Type const& _type)
+std::string YulUtilFunctions::storageSetToZeroFunction(Type const& _type)
 {
-	string const functionName = "storage_set_to_zero_" + _type.identifier();
+	std::string const functionName = "storage_set_to_zero_" + _type.identifier();
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		if (_type.isValueType())
@@ -4238,9 +4238,9 @@ string YulUtilFunctions::storageSetToZeroFunction(Type const& _type)
 	});
 }
 
-string YulUtilFunctions::conversionFunctionSpecial(Type const& _from, Type const& _to)
+std::string YulUtilFunctions::conversionFunctionSpecial(Type const& _from, Type const& _to)
 {
-	string functionName =
+	std::string functionName =
 		"convert_" +
 		_from.identifier() +
 		"_to_" +
@@ -4289,7 +4289,7 @@ string YulUtilFunctions::conversionFunctionSpecial(Type const& _from, Type const
 			_from.category() == Type::Category::StringLiteral,
 			"Type conversion " + _from.toString() + " -> " + _to.toString() + " not yet implemented."
 		);
-		string const& data = dynamic_cast<StringLiteralType const&>(_from).value();
+		std::string const& data = dynamic_cast<StringLiteralType const&>(_from).value();
 		if (_to.category() == Type::Category::FixedBytes)
 		{
 			unsigned const numBytes = dynamic_cast<FixedBytesType const&>(_to).numBytes();
@@ -4321,15 +4321,15 @@ string YulUtilFunctions::conversionFunctionSpecial(Type const& _from, Type const
 		else
 			solAssert(
 				false,
-				"Invalid conversion from string literal to " + _to.toString() + " requested."
+				"Invalid conversion from std::string literal to " + _to.toString() + " requested."
 			);
 	});
 }
 
-string YulUtilFunctions::readFromMemoryOrCalldata(Type const& _type, bool _fromCalldata)
+std::string YulUtilFunctions::readFromMemoryOrCalldata(Type const& _type, bool _fromCalldata)
 {
-	string functionName =
-		string("read_from_") +
+	std::string functionName =
+		std::string("read_from_") +
 		(_fromCalldata ? "calldata" : "memory") +
 		_type.identifier();
 
@@ -4394,18 +4394,18 @@ string YulUtilFunctions::readFromMemoryOrCalldata(Type const& _type, bool _fromC
 	});
 }
 
-string YulUtilFunctions::revertReasonIfDebugFunction(string const& _message)
+std::string YulUtilFunctions::revertReasonIfDebugFunction(std::string const& _message)
 {
-	string functionName = "revert_error_" + util::toHex(util::keccak256(_message).asBytes());
-	return m_functionCollector.createFunction(functionName, [&](auto&, auto&) -> string {
+	std::string functionName = "revert_error_" + util::toHex(util::keccak256(_message).asBytes());
+	return m_functionCollector.createFunction(functionName, [&](auto&, auto&) -> std::string {
 		return revertReasonIfDebugBody(m_revertStrings, allocateUnboundedFunction() + "()", _message);
 	});
 }
 
-string YulUtilFunctions::revertReasonIfDebugBody(
+std::string YulUtilFunctions::revertReasonIfDebugBody(
 	RevertStrings _revertStrings,
-	string const& _allocation,
-	string const& _message
+	std::string const& _allocation,
+	std::string const& _message
 )
 {
 	if (_revertStrings < RevertStrings::Debug || _message.empty())
@@ -4427,24 +4427,24 @@ string YulUtilFunctions::revertReasonIfDebugBody(
 	)");
 	templ("allocate", _allocation);
 	templ("sig", util::selectorFromSignatureU256("Error(string)").str());
-	templ("length", to_string(_message.length()));
+	templ("length", std::to_string(_message.length()));
 
 	size_t words = (_message.length() + 31) / 32;
-	vector<map<string, string>> wordParams(words);
+	std::vector<std::map<std::string, std::string>> wordParams(words);
 	for (size_t i = 0; i < words; ++i)
 	{
-		wordParams[i]["offset"] = to_string(i * 32);
+		wordParams[i]["offset"] = std::to_string(i * 32);
 		wordParams[i]["wordValue"] = formatAsStringOrNumber(_message.substr(32 * i, 32));
 	}
 	templ("word", wordParams);
-	templ("overallLength", to_string(4 + 0x20 + 0x20 + words * 32));
+	templ("overallLength", std::to_string(4 + 0x20 + 0x20 + words * 32));
 
 	return templ.render();
 }
 
-string YulUtilFunctions::panicFunction(util::PanicCode _code)
+std::string YulUtilFunctions::panicFunction(util::PanicCode _code)
 {
-	string functionName = "panic_error_" + toCompactHexWithPrefix(uint64_t(_code));
+	std::string functionName = "panic_error_" + toCompactHexWithPrefix(uint64_t(_code));
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return Whiskers(R"(
 			function <functionName>() {
@@ -4460,9 +4460,9 @@ string YulUtilFunctions::panicFunction(util::PanicCode _code)
 	});
 }
 
-string YulUtilFunctions::returnDataSelectorFunction()
+std::string YulUtilFunctions::returnDataSelectorFunction()
 {
-	string const functionName = "return_data_selector";
+	std::string const functionName = "return_data_selector";
 	solAssert(m_evmVersion.supportsReturndata(), "");
 
 	return m_functionCollector.createFunction(functionName, [&]() {
@@ -4480,9 +4480,9 @@ string YulUtilFunctions::returnDataSelectorFunction()
 	});
 }
 
-string YulUtilFunctions::tryDecodeErrorMessageFunction()
+std::string YulUtilFunctions::tryDecodeErrorMessageFunction()
 {
-	string const functionName = "try_decode_error_message";
+	std::string const functionName = "try_decode_error_message";
 	solAssert(m_evmVersion.supportsReturndata(), "");
 
 	return m_functionCollector.createFunction(functionName, [&]() {
@@ -4519,9 +4519,9 @@ string YulUtilFunctions::tryDecodeErrorMessageFunction()
 	});
 }
 
-string YulUtilFunctions::tryDecodePanicDataFunction()
+std::string YulUtilFunctions::tryDecodePanicDataFunction()
 {
-	string const functionName = "try_decode_panic_data";
+	std::string const functionName = "try_decode_panic_data";
 	solAssert(m_evmVersion.supportsReturndata(), "");
 
 	return m_functionCollector.createFunction(functionName, [&]() {
@@ -4539,9 +4539,9 @@ string YulUtilFunctions::tryDecodePanicDataFunction()
 	});
 }
 
-string YulUtilFunctions::extractReturndataFunction()
+std::string YulUtilFunctions::extractReturndataFunction()
 {
-	string const functionName = "extract_returndata";
+	std::string const functionName = "extract_returndata";
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return util::Whiskers(R"(
@@ -4568,12 +4568,12 @@ string YulUtilFunctions::extractReturndataFunction()
 	});
 }
 
-string YulUtilFunctions::copyConstructorArgumentsToMemoryFunction(
+std::string YulUtilFunctions::copyConstructorArgumentsToMemoryFunction(
 	ContractDefinition const& _contract,
-	string const& _creationObjectName
+	std::string const& _creationObjectName
 )
 {
-	string functionName = "copy_arguments_for_constructor_" +
+	std::string functionName = "copy_arguments_for_constructor_" +
 		toString(_contract.constructor()->id()) +
 		"_object_" +
 		_contract.name() +
@@ -4581,7 +4581,7 @@ string YulUtilFunctions::copyConstructorArgumentsToMemoryFunction(
 		toString(_contract.id());
 
 	return m_functionCollector.createFunction(functionName, [&]() {
-		string returnParams = suffixedVariableNameList("ret_param_",0, CompilerUtils::sizeOnStack(_contract.constructor()->parameters()));
+		std::string returnParams = suffixedVariableNameList("ret_param_",0, CompilerUtils::sizeOnStack(_contract.constructor()->parameters()));
 		ABIFunctions abiFunctions(m_evmVersion, m_revertStrings, m_functionCollector);
 
 		return util::Whiskers(R"(
@@ -4604,9 +4604,9 @@ string YulUtilFunctions::copyConstructorArgumentsToMemoryFunction(
 	});
 }
 
-string YulUtilFunctions::externalCodeFunction()
+std::string YulUtilFunctions::externalCodeFunction()
 {
-	string functionName = "external_code_at";
+	std::string functionName = "external_code_at";
 
 	return m_functionCollector.createFunction(functionName, [&]() {
 		return util::Whiskers(R"(
diff --git a/libsolidity/codegen/ir/Common.cpp b/libsolidity/codegen/ir/Common.cpp
index 8f73f57335..9300c78485 100644
--- a/libsolidity/codegen/ir/Common.cpp
+++ b/libsolidity/codegen/ir/Common.cpp
@@ -24,7 +24,6 @@
 
 #include <libyul/AsmPrinter.h>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::util;
@@ -41,110 +40,110 @@ YulArity YulArity::fromType(FunctionType const& _functionType)
 	};
 }
 
-string IRNames::externalFunctionABIWrapper(Declaration const& _functionOrVarDecl)
+std::string IRNames::externalFunctionABIWrapper(Declaration const& _functionOrVarDecl)
 {
 	if (auto const* function = dynamic_cast<FunctionDefinition const*>(&_functionOrVarDecl))
 		solAssert(!function->isConstructor());
 
-	return "external_fun_" + _functionOrVarDecl.name() + "_" + to_string(_functionOrVarDecl.id());
+	return "external_fun_" + _functionOrVarDecl.name() + "_" + std::to_string(_functionOrVarDecl.id());
 }
 
-string IRNames::function(FunctionDefinition const& _function)
+std::string IRNames::function(FunctionDefinition const& _function)
 {
 	if (_function.isConstructor())
 		return constructor(*_function.annotation().contract);
 
-	return "fun_" + _function.name() + "_" + to_string(_function.id());
+	return "fun_" + _function.name() + "_" + std::to_string(_function.id());
 }
 
-string IRNames::function(VariableDeclaration const& _varDecl)
+std::string IRNames::function(VariableDeclaration const& _varDecl)
 {
-	return "getter_fun_" + _varDecl.name() + "_" + to_string(_varDecl.id());
+	return "getter_fun_" + _varDecl.name() + "_" + std::to_string(_varDecl.id());
 }
 
-string IRNames::modifierInvocation(ModifierInvocation const& _modifierInvocation)
+std::string IRNames::modifierInvocation(ModifierInvocation const& _modifierInvocation)
 {
 	// This uses the ID of the modifier invocation because it has to be unique
 	// for each invocation.
 	solAssert(!_modifierInvocation.name().path().empty(), "");
-	string const& modifierName = _modifierInvocation.name().path().back();
+	std::string const& modifierName = _modifierInvocation.name().path().back();
 	solAssert(!modifierName.empty(), "");
-	return "modifier_" + modifierName + "_" + to_string(_modifierInvocation.id());
+	return "modifier_" + modifierName + "_" + std::to_string(_modifierInvocation.id());
 }
 
-string IRNames::functionWithModifierInner(FunctionDefinition const& _function)
+std::string IRNames::functionWithModifierInner(FunctionDefinition const& _function)
 {
-	return "fun_" + _function.name() + "_" + to_string(_function.id()) + "_inner";
+	return "fun_" + _function.name() + "_" + std::to_string(_function.id()) + "_inner";
 }
 
-string IRNames::creationObject(ContractDefinition const& _contract)
+std::string IRNames::creationObject(ContractDefinition const& _contract)
 {
 	return _contract.name() + "_" + toString(_contract.id());
 }
 
-string IRNames::deployedObject(ContractDefinition const& _contract)
+std::string IRNames::deployedObject(ContractDefinition const& _contract)
 {
 	return _contract.name() + "_" + toString(_contract.id()) + "_deployed";
 }
 
-string IRNames::internalDispatch(YulArity const& _arity)
+std::string IRNames::internalDispatch(YulArity const& _arity)
 {
 	return "dispatch_internal"
-		"_in_" + to_string(_arity.in) +
-		"_out_" + to_string(_arity.out);
+		"_in_" + std::to_string(_arity.in) +
+		"_out_" + std::to_string(_arity.out);
 }
 
-string IRNames::constructor(ContractDefinition const& _contract)
+std::string IRNames::constructor(ContractDefinition const& _contract)
 {
-	return "constructor_" + _contract.name() + "_" + to_string(_contract.id());
+	return "constructor_" + _contract.name() + "_" + std::to_string(_contract.id());
 }
 
-string IRNames::libraryAddressImmutable()
+std::string IRNames::libraryAddressImmutable()
 {
 	return "library_deploy_address";
 }
 
-string IRNames::constantValueFunction(VariableDeclaration const& _constant)
+std::string IRNames::constantValueFunction(VariableDeclaration const& _constant)
 {
 	solAssert(_constant.isConstant(), "");
-	return "constant_" + _constant.name() + "_" + to_string(_constant.id());
+	return "constant_" + _constant.name() + "_" + std::to_string(_constant.id());
 }
 
-string IRNames::localVariable(VariableDeclaration const& _declaration)
+std::string IRNames::localVariable(VariableDeclaration const& _declaration)
 {
 	return "var_" + _declaration.name() + '_' + std::to_string(_declaration.id());
 }
 
-string IRNames::localVariable(Expression const& _expression)
+std::string IRNames::localVariable(Expression const& _expression)
 {
-	return "expr_" + to_string(_expression.id());
+	return "expr_" + std::to_string(_expression.id());
 }
 
-string IRNames::trySuccessConditionVariable(Expression const& _expression)
+std::string IRNames::trySuccessConditionVariable(Expression const& _expression)
 {
 	auto annotation = dynamic_cast<FunctionCallAnnotation const*>(&_expression.annotation());
 	solAssert(annotation, "");
 	solAssert(annotation->tryCall, "Parameter must be a FunctionCall with tryCall-annotation set.");
 
-	return "trySuccessCondition_" + to_string(_expression.id());
+	return "trySuccessCondition_" + std::to_string(_expression.id());
 }
 
-string IRNames::tupleComponent(size_t _i)
+std::string IRNames::tupleComponent(size_t _i)
 {
-	return "component_" + to_string(_i + 1);
+	return "component_" + std::to_string(_i + 1);
 }
 
-string IRNames::zeroValue(Type const& _type, string const& _variableName)
+std::string IRNames::zeroValue(Type const& _type, std::string const& _variableName)
 {
 	return "zero_" + _type.identifier() + _variableName;
 }
 
-string dispenseLocationComment(langutil::SourceLocation const& _location, IRGenerationContext& _context)
+std::string dispenseLocationComment(langutil::SourceLocation const& _location, IRGenerationContext& _context)
 {
 	solAssert(_location.sourceName, "");
 	_context.markSourceUsed(*_location.sourceName);
 
-	string debugInfo = AsmPrinter::formatSourceLocation(
+	std::string debugInfo = AsmPrinter::formatSourceLocation(
 		_location,
 		_context.sourceIndices(),
 		_context.debugInfoSelection(),
@@ -154,7 +153,7 @@ string dispenseLocationComment(langutil::SourceLocation const& _location, IRGene
 	return debugInfo.empty() ? "" : "/// " + debugInfo;
 }
 
-string dispenseLocationComment(ASTNode const& _node, IRGenerationContext& _context)
+std::string dispenseLocationComment(ASTNode const& _node, IRGenerationContext& _context)
 {
 	return dispenseLocationComment(_node.location(), _context);
 }
diff --git a/libsolidity/codegen/ir/IRGenerationContext.cpp b/libsolidity/codegen/ir/IRGenerationContext.cpp
index 9ff3a6afea..668056cf52 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.cpp
+++ b/libsolidity/codegen/ir/IRGenerationContext.cpp
@@ -32,14 +32,13 @@
 
 #include <range/v3/view/map.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
 
-string IRGenerationContext::enqueueFunctionForCodeGeneration(FunctionDefinition const& _function)
+std::string IRGenerationContext::enqueueFunctionForCodeGeneration(FunctionDefinition const& _function)
 {
-	string name = IRNames::function(_function);
+	std::string name = IRNames::function(_function);
 
 	if (!m_functions.contains(name))
 		m_functionGenerationQueue.insert(&_function);
@@ -121,12 +120,12 @@ void IRGenerationContext::addStateVariable(
 	unsigned _byteOffset
 )
 {
-	m_stateVariables[&_declaration] = make_pair(std::move(_storageOffset), _byteOffset);
+	m_stateVariables[&_declaration] = std::make_pair(std::move(_storageOffset), _byteOffset);
 }
 
-string IRGenerationContext::newYulVariable()
+std::string IRGenerationContext::newYulVariable()
 {
-	return "_" + to_string(++m_varCounter);
+	return "_" + std::to_string(++m_varCounter);
 }
 
 void IRGenerationContext::initializeInternalDispatch(InternalDispatchMap _internalDispatch)
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 67adb61bbf..e3375c692e 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -43,18 +43,18 @@
 #include <sstream>
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 using namespace solidity::langutil;
 using namespace solidity::util;
+using namespace std::string_literals;
 
 namespace
 {
 
 void verifyCallGraph(
-	set<CallableDeclaration const*, ASTNode::CompareByID> const& _expectedCallables,
-	set<FunctionDefinition const*> _generatedFunctions
+	std::set<CallableDeclaration const*, ASTNode::CompareByID> const& _expectedCallables,
+	std::set<FunctionDefinition const*> _generatedFunctions
 )
 {
 	for (auto const& expectedCallable: _expectedCallables)
@@ -73,47 +73,47 @@ void verifyCallGraph(
 	);
 }
 
-set<CallableDeclaration const*, ASTNode::CompareByID> collectReachableCallables(
+std::set<CallableDeclaration const*, ASTNode::CompareByID> collectReachableCallables(
 	CallGraph const& _graph
 )
 {
-	set<CallableDeclaration const*, ASTNode::CompareByID> reachableCallables;
+	std::set<CallableDeclaration const*, ASTNode::CompareByID> reachableCallables;
 	for (CallGraph::Node const& reachableNode: _graph.edges | ranges::views::keys)
-		if (holds_alternative<CallableDeclaration const*>(reachableNode))
-			reachableCallables.emplace(get<CallableDeclaration const*>(reachableNode));
+		if (std::holds_alternative<CallableDeclaration const*>(reachableNode))
+			reachableCallables.emplace(std::get<CallableDeclaration const*>(reachableNode));
 
 	return reachableCallables;
 }
 
 }
 
-string IRGenerator::run(
+std::string IRGenerator::run(
 	ContractDefinition const& _contract,
 	bytes const& _cborMetadata,
-	map<ContractDefinition const*, string_view const> const& _otherYulSources
+	std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
 )
 {
 	return yul::reindent(generate(_contract, _cborMetadata, _otherYulSources));
 }
 
-string IRGenerator::generate(
+std::string IRGenerator::generate(
 	ContractDefinition const& _contract,
 	bytes const& _cborMetadata,
-	map<ContractDefinition const*, string_view const> const& _otherYulSources
+	std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
 )
 {
-	auto subObjectSources = [&_otherYulSources](std::set<ContractDefinition const*, ASTNode::CompareByID> const& subObjects) -> string
+	auto subObjectSources = [&_otherYulSources](std::set<ContractDefinition const*, ASTNode::CompareByID> const& subObjects) -> std::string
 	{
 		std::string subObjectsSources;
 		for (ContractDefinition const* subObject: subObjects)
 			subObjectsSources += _otherYulSources.at(subObject);
 		return subObjectsSources;
 	};
-	auto formatUseSrcMap = [](IRGenerationContext const& _context) -> string
+	auto formatUseSrcMap = [](IRGenerationContext const& _context) -> std::string
 	{
 		return joinHumanReadable(
-			ranges::views::transform(_context.usedSourceNames(), [_context](string const& _sourceName) {
-				return to_string(_context.sourceIndices().at(_sourceName)) + ":" + escapeAndQuoteString(_sourceName);
+			ranges::views::transform(_context.usedSourceNames(), [_context](std::string const& _sourceName) {
+				return std::to_string(_context.sourceIndices().at(_sourceName)) + ":" + escapeAndQuoteString(_sourceName);
 			}),
 			", "
 		);
@@ -162,7 +162,7 @@ string IRGenerator::generate(
 
 	FunctionDefinition const* constructor = _contract.constructor();
 	t("callValueCheck", !constructor || !constructor->isPayable() ? callValueCheck() : "");
-	vector<string> constructorParams;
+	std::vector<std::string> constructorParams;
 	if (constructor && !constructor->parameters().empty())
 	{
 		for (size_t i = 0; i < CompilerUtils::sizeOnStack(constructor->parameters()); ++i)
@@ -178,7 +178,7 @@ string IRGenerator::generate(
 
 	t("deploy", deployCode(_contract));
 	generateConstructors(_contract);
-	set<FunctionDefinition const*> creationFunctionList = generateQueuedFunctions();
+	std::set<FunctionDefinition const*> creationFunctionList = generateQueuedFunctions();
 	InternalDispatchMap internalDispatchMap = generateInternalDispatchFunctions(_contract);
 
 	t("functions", m_context.functionCollector().requestedFunctions());
@@ -201,7 +201,7 @@ string IRGenerator::generate(
 	t("sourceLocationCommentDeployed", dispenseLocationComment(_contract));
 	t("library_address", IRNames::libraryAddressImmutable());
 	t("dispatch", dispatchRoutine(_contract));
-	set<FunctionDefinition const*> deployedFunctionList = generateQueuedFunctions();
+	std::set<FunctionDefinition const*> deployedFunctionList = generateQueuedFunctions();
 	generateInternalDispatchFunctions(_contract);
 	t("deployedFunctions", m_context.functionCollector().requestedFunctions());
 	t("deployedSubObjects", subObjectSources(m_context.subObjectsCreated()));
@@ -222,16 +222,16 @@ string IRGenerator::generate(
 	return t.render();
 }
 
-string IRGenerator::generate(Block const& _block)
+std::string IRGenerator::generate(Block const& _block)
 {
 	IRGeneratorForStatements generator(m_context, m_utils);
 	generator.generate(_block);
 	return generator.code();
 }
 
-set<FunctionDefinition const*> IRGenerator::generateQueuedFunctions()
+std::set<FunctionDefinition const*> IRGenerator::generateQueuedFunctions()
 {
-	set<FunctionDefinition const*> functions;
+	std::set<FunctionDefinition const*> functions;
 
 	while (!m_context.functionGenerationQueueEmpty())
 	{
@@ -256,7 +256,7 @@ InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefin
 	InternalDispatchMap internalDispatchMap = m_context.consumeInternalDispatchMap();
 	for (YulArity const& arity: internalDispatchMap | ranges::views::keys)
 	{
-		string funName = IRNames::internalDispatch(arity);
+		std::string funName = IRNames::internalDispatch(arity);
 		m_context.functionCollector().createFunction(funName, [&]() {
 			Whiskers templ(R"(
 				<sourceLocationComment>
@@ -278,7 +278,7 @@ InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefin
 			templ("in", suffixedVariableNameList("in_", 0, arity.in));
 			templ("out", suffixedVariableNameList("out_", 0, arity.out));
 
-			vector<map<string, string>> cases;
+			std::vector<std::map<std::string, std::string>> cases;
 			for (FunctionDefinition const* function: internalDispatchMap.at(arity))
 			{
 				solAssert(function, "");
@@ -291,8 +291,8 @@ InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefin
 				solAssert(function->id() != 0, "Unexpected function ID: 0");
 				solAssert(m_context.functionCollector().contains(IRNames::function(*function)), "");
 
-				cases.emplace_back(map<string, string>{
-					{"funID", to_string(m_context.mostDerivedContract().annotation().internalFunctionIDs.at(function))},
+				cases.emplace_back(std::map<std::string, std::string>{
+					{"funID", std::to_string(m_context.mostDerivedContract().annotation().internalFunctionIDs.at(function))},
 					{"name", IRNames::function(*function)}
 				});
 			}
@@ -311,9 +311,9 @@ InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefin
 	return internalDispatchMap;
 }
 
-string IRGenerator::generateFunction(FunctionDefinition const& _function)
+std::string IRGenerator::generateFunction(FunctionDefinition const& _function)
 {
-	string functionName = IRNames::function(_function);
+	std::string functionName = IRNames::function(_function);
 	return m_context.functionCollector().createFunction(functionName, [&]() {
 		m_context.resetLocalVariables();
 		Whiskers t(R"(
@@ -326,7 +326,7 @@ string IRGenerator::generateFunction(FunctionDefinition const& _function)
 		)");
 
 		if (m_context.debugInfoSelection().astID)
-			t("astIDComment", "/// @ast-id " + to_string(_function.id()) + "\n");
+			t("astIDComment", "/// @ast-id " + std::to_string(_function.id()) + "\n");
 		else
 			t("astIDComment", "");
 		t("sourceLocationComment", dispenseLocationComment(_function));
@@ -336,12 +336,12 @@ string IRGenerator::generateFunction(FunctionDefinition const& _function)
 		);
 
 		t("functionName", functionName);
-		vector<string> params;
+		std::vector<std::string> params;
 		for (auto const& varDecl: _function.parameters())
 			params += m_context.addLocalVariable(*varDecl).stackSlots();
 		t("params", joinHumanReadable(params));
-		vector<string> retParams;
-		string retInit;
+		std::vector<std::string> retParams;
+		std::string retInit;
 		for (auto const& varDecl: _function.returnParameters())
 		{
 			retParams += m_context.addLocalVariable(*varDecl).stackSlots();
@@ -358,14 +358,14 @@ string IRGenerator::generateFunction(FunctionDefinition const& _function)
 			for (size_t i = 0; i < _function.modifiers().size(); ++i)
 			{
 				ModifierInvocation const& modifier = *_function.modifiers().at(i);
-				string next =
+				std::string next =
 					i + 1 < _function.modifiers().size() ?
 					IRNames::modifierInvocation(*_function.modifiers().at(i + 1)) :
 					IRNames::functionWithModifierInner(_function);
 				generateModifier(modifier, _function, next);
 			}
 			t("body",
-				(retParams.empty() ? string{} : joinHumanReadable(retParams) + " := ") +
+				(retParams.empty() ? std::string{} : joinHumanReadable(retParams) + " := ") +
 				IRNames::modifierInvocation(*_function.modifiers().at(0)) +
 				"(" +
 				joinHumanReadable(retParams + params) +
@@ -378,13 +378,13 @@ string IRGenerator::generateFunction(FunctionDefinition const& _function)
 	});
 }
 
-string IRGenerator::generateModifier(
+std::string IRGenerator::generateModifier(
 	ModifierInvocation const& _modifierInvocation,
 	FunctionDefinition const& _function,
-	string const& _nextFunction
+	std::string const& _nextFunction
 )
 {
-	string functionName = IRNames::modifierInvocation(_modifierInvocation);
+	std::string functionName = IRNames::modifierInvocation(_modifierInvocation);
 	return m_context.functionCollector().createFunction(functionName, [&]() {
 		m_context.resetLocalVariables();
 		Whiskers t(R"(
@@ -398,15 +398,15 @@ string IRGenerator::generateModifier(
 		)");
 
 		t("functionName", functionName);
-		vector<string> retParamsIn;
+		std::vector<std::string> retParamsIn;
 		for (auto const& varDecl: _function.returnParameters())
 			retParamsIn += m_context.addLocalVariable(*varDecl).stackSlots();
-		vector<string> params = retParamsIn;
+		std::vector<std::string> params = retParamsIn;
 		for (auto const& varDecl: _function.parameters())
 			params += m_context.addLocalVariable(*varDecl).stackSlots();
 		t("params", joinHumanReadable(params));
-		vector<string> retParams;
-		string assignRetParams;
+		std::vector<std::string> retParams;
+		std::string assignRetParams;
 		for (size_t i = 0; i < retParamsIn.size(); ++i)
 		{
 			retParams.emplace_back(m_context.newYulVariable());
@@ -421,7 +421,7 @@ string IRGenerator::generateModifier(
 		solAssert(modifier, "");
 
 		if (m_context.debugInfoSelection().astID)
-			t("astIDComment", "/// @ast-id " + to_string(modifier->id()) + "\n");
+			t("astIDComment", "/// @ast-id " + std::to_string(modifier->id()) + "\n");
 		else
 			t("astIDComment", "");
 		t("sourceLocationComment", dispenseLocationComment(*modifier));
@@ -463,7 +463,7 @@ string IRGenerator::generateModifier(
 
 		t("evalArgs", expressionEvaluator.code());
 		IRGeneratorForStatements generator(m_context, m_utils, [&]() {
-			string ret = joinHumanReadable(retParams);
+			std::string ret = joinHumanReadable(retParams);
 			return
 				(ret.empty() ? "" : ret + " := ") +
 				_nextFunction + "(" + joinHumanReadable(params) + ")\n";
@@ -474,9 +474,9 @@ string IRGenerator::generateModifier(
 	});
 }
 
-string IRGenerator::generateFunctionWithModifierInner(FunctionDefinition const& _function)
+std::string IRGenerator::generateFunctionWithModifierInner(FunctionDefinition const& _function)
 {
-	string functionName = IRNames::functionWithModifierInner(_function);
+	std::string functionName = IRNames::functionWithModifierInner(_function);
 	return m_context.functionCollector().createFunction(functionName, [&]() {
 		m_context.resetLocalVariables();
 		Whiskers t(R"(
@@ -493,17 +493,17 @@ string IRGenerator::generateFunctionWithModifierInner(FunctionDefinition const&
 			dispenseLocationComment(m_context.mostDerivedContract())
 		);
 		t("functionName", functionName);
-		vector<string> retParams;
-		vector<string> retParamsIn;
+		std::vector<std::string> retParams;
+		std::vector<std::string> retParamsIn;
 		for (auto const& varDecl: _function.returnParameters())
 			retParams += m_context.addLocalVariable(*varDecl).stackSlots();
-		string assignRetParams;
+		std::string assignRetParams;
 		for (size_t i = 0; i < retParams.size(); ++i)
 		{
 			retParamsIn.emplace_back(m_context.newYulVariable());
 			assignRetParams += retParams.at(i) + " := " + retParamsIn.at(i) + "\n";
 		}
-		vector<string> params = retParamsIn;
+		std::vector<std::string> params = retParamsIn;
 		for (auto const& varDecl: _function.parameters())
 			params += m_context.addLocalVariable(*varDecl).stackSlots();
 		t("params", joinHumanReadable(params));
@@ -514,9 +514,9 @@ string IRGenerator::generateFunctionWithModifierInner(FunctionDefinition const&
 	});
 }
 
-string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
+std::string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 {
-	string functionName = IRNames::function(_varDecl);
+	std::string functionName = IRNames::function(_varDecl);
 	return m_context.functionCollector().createFunction(functionName, [&]() {
 		Type const* type = _varDecl.annotation().type;
 
@@ -538,7 +538,7 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 			(
 				"astIDComment",
 				m_context.debugInfoSelection().astID ?
-					"/// @ast-id " + to_string(_varDecl.id()) + "\n" :
+					"/// @ast-id " + std::to_string(_varDecl.id()) + "\n" :
 					""
 			)
 			("sourceLocationComment", dispenseLocationComment(_varDecl))
@@ -547,7 +547,7 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 				dispenseLocationComment(m_context.mostDerivedContract())
 			)
 			("functionName", functionName)
-			("id", to_string(_varDecl.id()))
+			("id", std::to_string(_varDecl.id()))
 			.render();
 		}
 		else if (_varDecl.isConstant())
@@ -563,7 +563,7 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 			(
 				"astIDComment",
 				m_context.debugInfoSelection().astID ?
-					"/// @ast-id " + to_string(_varDecl.id()) + "\n" :
+					"/// @ast-id " + std::to_string(_varDecl.id()) + "\n" :
 					""
 			)
 			("sourceLocationComment", dispenseLocationComment(_varDecl))
@@ -577,7 +577,7 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 			.render();
 		}
 
-		string code;
+		std::string code;
 
 		auto const& location = m_context.storageLocationOfStateVariable(_varDecl);
 		code += Whiskers(R"(
@@ -585,7 +585,7 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 			let offset := <offset>
 		)")
 		("slot", location.first.str())
-		("offset", to_string(location.second))
+		("offset", std::to_string(location.second))
 		.render();
 
 		if (!paramTypes.empty())
@@ -601,8 +601,8 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 		// The initial value of @a currentType is only used if we skip the loop completely.
 		Type const* currentType = _varDecl.annotation().type;
 
-		vector<string> parameters;
-		vector<string> returnVariables;
+		std::vector<std::string> parameters;
+		std::vector<std::string> returnVariables;
 
 		for (size_t i = 0; i < paramTypes.size(); ++i)
 		{
@@ -610,7 +610,7 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 			ArrayType const* arrayType = dynamic_cast<ArrayType const*>(currentType);
 			solAssert(mappingType || arrayType, "");
 
-			vector<string> keys = IRVariable("key_" + to_string(i),
+			std::vector<std::string> keys = IRVariable("key_" + std::to_string(i),
 				mappingType ? *mappingType->keyType() : *TypeProvider::uint256()
 			).stackSlots();
 			parameters += keys;
@@ -653,8 +653,8 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 				)
 					continue;
 
-				pair<u256, unsigned> const& offsets = structType->storageOffsetsOfMember(names[i]);
-				vector<string> retVars = IRVariable("ret_" + to_string(returnVariables.size()), *returnTypes[i]).stackSlots();
+				std::pair<u256, unsigned> const& offsets = structType->storageOffsetsOfMember(names[i]);
+				std::vector<std::string> retVars = IRVariable("ret_" + std::to_string(returnVariables.size()), *returnTypes[i]).stackSlots();
 				returnVariables += retVars;
 				code += Whiskers(R"(
 					<ret> := <readStorage>(add(slot, <slotOffset>))
@@ -671,7 +671,7 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 			auto const* arrayType = dynamic_cast<ArrayType const*>(returnTypes.front());
 			if (arrayType)
 				solAssert(arrayType->isByteArrayOrString(), "");
-			vector<string> retVars = IRVariable("ret", *returnTypes.front()).stackSlots();
+			std::vector<std::string> retVars = IRVariable("ret", *returnTypes.front()).stackSlots();
 			returnVariables += retVars;
 			code += Whiskers(R"(
 				<ret> := <readStorage>(slot, offset)
@@ -695,7 +695,7 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 		(
 			"astIDComment",
 			m_context.debugInfoSelection().astID ?
-				"/// @ast-id " + to_string(_varDecl.id()) + "\n" :
+				"/// @ast-id " + std::to_string(_varDecl.id()) + "\n" :
 				""
 		)
 		("sourceLocationComment", dispenseLocationComment(_varDecl))
@@ -707,10 +707,10 @@ string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 	});
 }
 
-string IRGenerator::generateExternalFunction(ContractDefinition const& _contract, FunctionType const& _functionType)
+std::string IRGenerator::generateExternalFunction(ContractDefinition const& _contract, FunctionType const& _functionType)
 {
-	string functionName = IRNames::externalFunctionABIWrapper(_functionType.declaration());
-	return m_context.functionCollector().createFunction(functionName, [&](vector<string>&, vector<string>&) -> string {
+	std::string functionName = IRNames::externalFunctionABIWrapper(_functionType.declaration());
+	return m_context.functionCollector().createFunction(functionName, [&](std::vector<std::string>&, std::vector<std::string>&) -> std::string {
 		Whiskers t(R"X(
 			<callValueCheck>
 			<?+params>let <params> := </+params> <abiDecode>(4, calldatasize())
@@ -721,8 +721,8 @@ string IRGenerator::generateExternalFunction(ContractDefinition const& _contract
 		)X");
 		t("callValueCheck", (_functionType.isPayable() || _contract.isLibrary()) ? "" : callValueCheck());
 
-		unsigned paramVars = make_shared<TupleType>(_functionType.parameterTypes())->sizeOnStack();
-		unsigned retVars = make_shared<TupleType>(_functionType.returnParameterTypes())->sizeOnStack();
+		unsigned paramVars = std::make_shared<TupleType>(_functionType.parameterTypes())->sizeOnStack();
+		unsigned retVars = std::make_shared<TupleType>(_functionType.returnParameterTypes())->sizeOnStack();
 
 		ABIFunctions abiFunctions(m_evmVersion, m_context.revertStrings(), m_context.functionCollector());
 		t("abiDecode", abiFunctions.tupleDecoder(_functionType.parameterTypes()));
@@ -745,14 +745,14 @@ string IRGenerator::generateExternalFunction(ContractDefinition const& _contract
 	});
 }
 
-string IRGenerator::generateInitialAssignment(VariableDeclaration const& _varDecl)
+std::string IRGenerator::generateInitialAssignment(VariableDeclaration const& _varDecl)
 {
 	IRGeneratorForStatements generator(m_context, m_utils);
 	generator.initializeLocalVar(_varDecl);
 	return generator.code();
 }
 
-pair<string, map<ContractDefinition const*, vector<string>>> IRGenerator::evaluateConstructorArguments(
+std::pair<std::string, std::map<ContractDefinition const*, std::vector<std::string>>> IRGenerator::evaluateConstructorArguments(
 	ContractDefinition const& _contract
 )
 {
@@ -765,12 +765,12 @@ pair<string, map<ContractDefinition const*, vector<string>>> IRGenerator::evalua
 			auto it2 = find(linearizedBaseContracts.begin(), linearizedBaseContracts.end(), _c2);
 			return it1 < it2;
 		}
-		vector<ContractDefinition const*> const& linearizedBaseContracts;
+		std::vector<ContractDefinition const*> const& linearizedBaseContracts;
 	} inheritanceOrder{_contract.annotation().linearizedBaseContracts};
 
-	map<ContractDefinition const*, vector<string>> constructorParams;
+	std::map<ContractDefinition const*, std::vector<std::string>> constructorParams;
 
-	map<ContractDefinition const*, std::vector<ASTPointer<Expression>>const *, InheritanceOrder>
+	std::map<ContractDefinition const*, std::vector<ASTPointer<Expression>>const *, InheritanceOrder>
 		baseConstructorArguments(inheritanceOrder);
 
 	for (ASTPointer<InheritanceSpecifier> const& base: _contract.baseContracts())
@@ -802,7 +802,7 @@ pair<string, map<ContractDefinition const*, vector<string>>> IRGenerator::evalua
 		solAssert(baseContract && arguments, "");
 		if (baseContract->constructor() && !arguments->empty())
 		{
-			vector<string> params;
+			std::vector<std::string> params;
 			for (size_t i = 0; i < arguments->size(); ++i)
 				params += generator.evaluateExpression(
 					*(arguments->at(i)),
@@ -815,7 +815,7 @@ pair<string, map<ContractDefinition const*, vector<string>>> IRGenerator::evalua
 	return {generator.code(), constructorParams};
 }
 
-string IRGenerator::initStateVariables(ContractDefinition const& _contract)
+std::string IRGenerator::initStateVariables(ContractDefinition const& _contract)
 {
 	IRGeneratorForStatements generator{m_context, m_utils};
 	for (VariableDeclaration const* variable: _contract.stateVariables())
@@ -829,16 +829,16 @@ string IRGenerator::initStateVariables(ContractDefinition const& _contract)
 void IRGenerator::generateConstructors(ContractDefinition const& _contract)
 {
 	auto listAllParams =
-		[&](map<ContractDefinition const*, vector<string>> const& baseParams) -> vector<string>
+		[&](std::map<ContractDefinition const*, std::vector<std::string>> const& baseParams) -> std::vector<std::string>
 		{
-			vector<string> params;
+			std::vector<std::string> params;
 			for (ContractDefinition const* contract: _contract.annotation().linearizedBaseContracts)
 				if (baseParams.count(contract))
 					params += baseParams.at(contract);
 			return params;
 		};
 
-	map<ContractDefinition const*, vector<string>> baseConstructorParams;
+	std::map<ContractDefinition const*, std::vector<std::string>> baseConstructorParams;
 	for (size_t i = 0; i < _contract.annotation().linearizedBaseContracts.size(); ++i)
 	{
 		ContractDefinition const* contract = _contract.annotation().linearizedBaseContracts[i];
@@ -857,13 +857,13 @@ void IRGenerator::generateConstructors(ContractDefinition const& _contract)
 				}
 				<contractSourceLocationComment>
 			)");
-			vector<string> params;
+			std::vector<std::string> params;
 			if (contract->constructor())
 				for (ASTPointer<VariableDeclaration> const& varDecl: contract->constructor()->parameters())
 					params += m_context.addLocalVariable(*varDecl).stackSlots();
 
 			if (m_context.debugInfoSelection().astID && contract->constructor())
-				t("astIDComment", "/// @ast-id " + to_string(contract->constructor()->id()) + "\n");
+				t("astIDComment", "/// @ast-id " + std::to_string(contract->constructor()->id()) + "\n");
 			else
 				t("astIDComment", "");
 			t("sourceLocationComment", dispenseLocationComment(
@@ -877,11 +877,11 @@ void IRGenerator::generateConstructors(ContractDefinition const& _contract)
 			);
 
 			t("params", joinHumanReadable(params));
-			vector<string> baseParams = listAllParams(baseConstructorParams);
+			std::vector<std::string> baseParams = listAllParams(baseConstructorParams);
 			t("baseParams", joinHumanReadable(baseParams));
 			t("comma", !params.empty() && !baseParams.empty() ? ", " : "");
 			t("functionName", IRNames::constructor(*contract));
-			pair<string, map<ContractDefinition const*, vector<string>>> evaluatedArgs = evaluateConstructorArguments(*contract);
+			std::pair<std::string, std::map<ContractDefinition const*, std::vector<std::string>>> evaluatedArgs = evaluateConstructorArguments(*contract);
 			baseConstructorParams.insert(evaluatedArgs.second.begin(), evaluatedArgs.second.end());
 			t("evalBaseArguments", evaluatedArgs.first);
 			if (i < _contract.annotation().linearizedBaseContracts.size() - 1)
@@ -894,10 +894,10 @@ void IRGenerator::generateConstructors(ContractDefinition const& _contract)
 			else
 				t("hasNextConstructor", false);
 			t("initStateVariables", initStateVariables(*contract));
-			string body;
+			std::string body;
 			if (FunctionDefinition const* constructor = contract->constructor())
 			{
-				vector<ModifierInvocation*> realModifiers;
+				std::vector<ModifierInvocation*> realModifiers;
 				for (auto const& modifierInvocation: constructor->modifiers())
 					// Filter out the base constructor calls
 					if (dynamic_cast<ModifierDefinition const*>(modifierInvocation->name().annotation().referencedDeclaration))
@@ -909,7 +909,7 @@ void IRGenerator::generateConstructors(ContractDefinition const& _contract)
 					for (size_t i = 0; i < realModifiers.size(); ++i)
 					{
 						ModifierInvocation const& modifier = *realModifiers.at(i);
-						string next =
+						std::string next =
 							i + 1 < realModifiers.size() ?
 							IRNames::modifierInvocation(*realModifiers.at(i + 1)) :
 							IRNames::functionWithModifierInner(*constructor);
@@ -931,7 +931,7 @@ void IRGenerator::generateConstructors(ContractDefinition const& _contract)
 	}
 }
 
-string IRGenerator::deployCode(ContractDefinition const& _contract)
+std::string IRGenerator::deployCode(ContractDefinition const& _contract)
 {
 	Whiskers t(R"X(
 		let <codeOffset> := <allocateUnbounded>()
@@ -945,11 +945,11 @@ string IRGenerator::deployCode(ContractDefinition const& _contract)
 	t("codeOffset", m_context.newYulVariable());
 	t("object", IRNames::deployedObject(_contract));
 
-	vector<map<string, string>> immutables;
+	std::vector<std::map<std::string, std::string>> immutables;
 	if (_contract.isLibrary())
 	{
 		solAssert(ContractType(_contract).immutableVariables().empty(), "");
-		immutables.emplace_back(map<string, string>{
+		immutables.emplace_back(std::map<std::string, std::string>{
 			{"immutableName"s, IRNames::libraryAddressImmutable()},
 			{"value"s, "address()"}
 		});
@@ -960,21 +960,21 @@ string IRGenerator::deployCode(ContractDefinition const& _contract)
 		{
 			solUnimplementedAssert(immutable->type()->isValueType());
 			solUnimplementedAssert(immutable->type()->sizeOnStack() == 1);
-			immutables.emplace_back(map<string, string>{
-				{"immutableName"s, to_string(immutable->id())},
-				{"value"s, "mload(" + to_string(m_context.immutableMemoryOffset(*immutable)) + ")"}
+			immutables.emplace_back(std::map<std::string, std::string>{
+				{"immutableName"s, std::to_string(immutable->id())},
+				{"value"s, "mload(" + std::to_string(m_context.immutableMemoryOffset(*immutable)) + ")"}
 			});
 		}
 	t("immutables", std::move(immutables));
 	return t.render();
 }
 
-string IRGenerator::callValueCheck()
+std::string IRGenerator::callValueCheck()
 {
 	return "if callvalue() { " + m_utils.revertReasonIfDebugFunction("Ether sent to non-payable function") + "() }";
 }
 
-string IRGenerator::dispatchRoutine(ContractDefinition const& _contract)
+std::string IRGenerator::dispatchRoutine(ContractDefinition const& _contract)
 {
 	Whiskers t(R"X(
 		<?+cases>if iszero(lt(calldatasize(), 4))
@@ -995,15 +995,15 @@ string IRGenerator::dispatchRoutine(ContractDefinition const& _contract)
 		<fallback>
 	)X");
 	t("shr224", m_utils.shiftRightFunction(224));
-	vector<map<string, string>> functions;
+	std::vector<std::map<std::string, std::string>> functions;
 	for (auto const& function: _contract.interfaceFunctions())
 	{
 		functions.emplace_back();
-		map<string, string>& templ = functions.back();
+		std::map<std::string, std::string>& templ = functions.back();
 		templ["functionSelector"] = "0x" + function.first.hex();
 		FunctionTypePointer const& type = function.second;
 		templ["functionName"] = type->externalSignature();
-		string delegatecallCheck;
+		std::string delegatecallCheck;
 		if (_contract.isLibrary())
 		{
 			solAssert(!type->isPayable(), "");
@@ -1031,7 +1031,7 @@ string IRGenerator::dispatchRoutine(ContractDefinition const& _contract)
 	if (FunctionDefinition const* fallback = _contract.fallbackFunction())
 	{
 		solAssert(!_contract.isLibrary(), "");
-		string fallbackCode;
+		std::string fallbackCode;
 		if (!fallback->isPayable())
 			fallbackCode += callValueCheck() + "\n";
 		if (fallback->parameters().empty())
@@ -1055,7 +1055,7 @@ string IRGenerator::dispatchRoutine(ContractDefinition const& _contract)
 	return t.render();
 }
 
-string IRGenerator::memoryInit(bool _useMemoryGuard)
+std::string IRGenerator::memoryInit(bool _useMemoryGuard)
 {
 	// This function should be called at the beginning of the EVM call frame
 	// and thus can assume all memory to be zero, including the contents of
@@ -1066,10 +1066,10 @@ string IRGenerator::memoryInit(bool _useMemoryGuard)
 			"mstore(<memPtr>, memoryguard(<freeMemoryStart>))" :
 			"mstore(<memPtr>, <freeMemoryStart>)"
 		}
-		("memPtr", to_string(CompilerUtils::freeMemoryPointer))
+		("memPtr", std::to_string(CompilerUtils::freeMemoryPointer))
 		(
 			"freeMemoryStart",
-			to_string(CompilerUtils::generalPurposeMemoryStart + m_context.reservedMemory())
+			std::to_string(CompilerUtils::generalPurposeMemoryStart + m_context.reservedMemory())
 		).render();
 }
 
@@ -1099,10 +1099,10 @@ void IRGenerator::resetContext(ContractDefinition const& _contract, ExecutionCon
 
 	m_context.setMostDerivedContract(_contract);
 	for (auto const& var: ContractType(_contract).stateVariables())
-		m_context.addStateVariable(*get<0>(var), get<1>(var), get<2>(var));
+		m_context.addStateVariable(*std::get<0>(var), std::get<1>(var), std::get<2>(var));
 }
 
-string IRGenerator::dispenseLocationComment(ASTNode const& _node)
+std::string IRGenerator::dispenseLocationComment(ASTNode const& _node)
 {
 	return ::dispenseLocationComment(_node, m_context);
 }
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index b2d9571d9d..c05fffbffb 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -49,7 +49,6 @@
 
 #include <range/v3/view/transform.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
@@ -95,8 +94,8 @@ struct CopyTranslate: public yul::ASTCopier
 			return ASTCopier::translate(_identifier);
 
 		yul::Expression translated = translateReference(_identifier);
-		solAssert(holds_alternative<yul::Identifier>(translated));
-		return get<yul::Identifier>(std::move(translated));
+		solAssert(std::holds_alternative<yul::Identifier>(translated));
+		return std::get<yul::Identifier>(std::move(translated));
 	}
 
 private:
@@ -109,9 +108,9 @@ struct CopyTranslate: public yul::ASTCopier
 		auto const& reference = m_references.at(&_identifier);
 		auto const varDecl = dynamic_cast<VariableDeclaration const*>(reference.declaration);
 		solUnimplementedAssert(varDecl);
-		string const& suffix = reference.suffix;
+		std::string const& suffix = reference.suffix;
 
-		string value;
+		std::string value;
 		if (suffix.empty() && varDecl->isLocalVariable())
 		{
 			auto const& var = m_context.localVariable(*varDecl);
@@ -165,7 +164,7 @@ struct CopyTranslate: public yul::ASTCopier
 			if (suffix == "slot")
 				value = m_context.storageLocationOfStateVariable(*varDecl).first.str();
 			else if (suffix == "offset")
-				value = to_string(m_context.storageLocationOfStateVariable(*varDecl).second);
+				value = std::to_string(m_context.storageLocationOfStateVariable(*varDecl).second);
 			else
 				solAssert(false);
 		}
@@ -216,7 +215,7 @@ struct CopyTranslate: public yul::ASTCopier
 
 }
 
-string IRGeneratorForStatementsBase::code() const
+std::string IRGeneratorForStatementsBase::code() const
 {
 	return m_code.str();
 }
@@ -240,7 +239,7 @@ void IRGeneratorForStatementsBase::setLocation(ASTNode const& _node)
 	m_currentLocation = _node.location();
 }
 
-string IRGeneratorForStatements::code() const
+std::string IRGeneratorForStatements::code() const
 {
 	solAssert(!m_currentLValue, "LValue not reset!");
 	return IRGeneratorForStatementsBase::code();
@@ -338,11 +337,11 @@ IRVariable IRGeneratorForStatements::evaluateExpression(Expression const& _expre
 	}
 }
 
-string IRGeneratorForStatements::constantValueFunction(VariableDeclaration const& _constant)
+std::string IRGeneratorForStatements::constantValueFunction(VariableDeclaration const& _constant)
 {
 	try
 	{
-		string functionName = IRNames::constantValueFunction(_constant);
+		std::string functionName = IRNames::constantValueFunction(_constant);
 		return m_context.functionCollector().createFunction(functionName, [&] {
 			Whiskers templ(R"(
 				<sourceLocationComment>
@@ -410,7 +409,7 @@ bool IRGeneratorForStatements::visit(Conditional const& _conditional)
 
 	setLocation(_conditional);
 
-	string condition = expressionAsType(_conditional.condition(), *TypeProvider::boolean());
+	std::string condition = expressionAsType(_conditional.condition(), *TypeProvider::boolean());
 	declare(_conditional);
 
 	appendCode() << "switch " << condition << "\n" "case 0 {\n";
@@ -501,7 +500,7 @@ bool IRGeneratorForStatements::visit(TupleExpression const& _tuple)
 			_tuple.components().size() <<
 			")\n";
 
-		string mpos = IRVariable(_tuple).part("mpos").name();
+		std::string mpos = IRVariable(_tuple).part("mpos").name();
 		Type const& baseType = *arrayType.baseType();
 		for (size_t i = 0; i < _tuple.components().size(); i++)
 		{
@@ -512,7 +511,7 @@ bool IRGeneratorForStatements::visit(TupleExpression const& _tuple)
 			appendCode() <<
 				m_utils.writeToMemoryFunction(baseType) <<
 				"(" <<
-				("add(" + mpos + ", " + to_string(i * arrayType.memoryStride()) + ")") <<
+				("add(" + mpos + ", " + std::to_string(i * arrayType.memoryStride()) + ")") <<
 				", " <<
 				converted.commaSeparatedList() <<
 				")\n";
@@ -535,7 +534,7 @@ bool IRGeneratorForStatements::visit(TupleExpression const& _tuple)
 		}
 		else
 		{
-			vector<optional<IRLValue>> lvalues;
+			std::vector<std::optional<IRLValue>> lvalues;
 			for (size_t i = 0; i < _tuple.components().size(); ++i)
 				if (auto const& component = _tuple.components()[i])
 				{
@@ -586,7 +585,7 @@ bool IRGeneratorForStatements::visit(IfStatement const& _ifStatement)
 {
 	_ifStatement.condition().accept(*this);
 	setLocation(_ifStatement);
-	string condition = expressionAsType(_ifStatement.condition(), *TypeProvider::boolean());
+	std::string condition = expressionAsType(_ifStatement.condition(), *TypeProvider::boolean());
 
 	if (_ifStatement.falseStatement())
 	{
@@ -658,7 +657,7 @@ void IRGeneratorForStatements::endVisit(Return const& _return)
 	if (Expression const* value = _return.expression())
 	{
 		solAssert(_return.annotation().functionReturnParameters, "Invalid return parameters pointer.");
-		vector<ASTPointer<VariableDeclaration>> const& returnParameters =
+		std::vector<ASTPointer<VariableDeclaration>> const& returnParameters =
 			_return.annotation().functionReturnParameters->parameters();
 		if (returnParameters.size() > 1)
 			for (size_t i = 0; i < returnParameters.size(); ++i)
@@ -685,7 +684,7 @@ bool IRGeneratorForStatements::visit(UnaryOperation const& _unaryOperation)
 		solAssert(function->returnParameters().size() == 1);
 		solAssert(*function->returnParameters()[0]->type() == *_unaryOperation.annotation().type);
 
-		string argument = expressionAsType(_unaryOperation.subExpression(), *function->parameters()[0]->type());
+		std::string argument = expressionAsType(_unaryOperation.subExpression(), *function->parameters()[0]->type());
 		solAssert(!argument.empty());
 
 		solAssert(_unaryOperation.userDefinedFunctionType()->kind() == FunctionType::Kind::Internal);
@@ -812,8 +811,8 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 		solAssert(function->returnParameters().size() == 1);
 		solAssert(*function->returnParameters()[0]->type() == *_binOp.annotation().type);
 
-		string left = expressionAsType(_binOp.leftExpression(), *function->parameters()[0]->type());
-		string right = expressionAsType(_binOp.rightExpression(), *function->parameters()[1]->type());
+		std::string left = expressionAsType(_binOp.leftExpression(), *function->parameters()[0]->type());
+		std::string right = expressionAsType(_binOp.rightExpression(), *function->parameters()[1]->type());
 		solAssert(!left.empty() && !right.empty());
 
 		solAssert(_binOp.userDefinedFunctionType()->kind() == FunctionType::Kind::Internal);
@@ -853,13 +852,13 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 		if (auto type = dynamic_cast<IntegerType const*>(commonType))
 			isSigned = type->isSigned();
 
-		string args = expressionAsCleanedType(_binOp.leftExpression(), *commonType);
+		std::string args = expressionAsCleanedType(_binOp.leftExpression(), *commonType);
 		args += ", " + expressionAsCleanedType(_binOp.rightExpression(), *commonType);
 
 		auto functionType = dynamic_cast<FunctionType const*>(commonType);
 		solAssert(functionType ? (op == Token::Equal || op == Token::NotEqual) : true, "Invalid function pointer comparison!");
 
-		string expr;
+		std::string expr;
 
 		if (functionType && functionType->kind() ==  FunctionType::Kind::External)
 		{
@@ -879,9 +878,9 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 		else if (op == Token::NotEqual)
 			expr = "iszero(eq(" + std::move(args) + "))";
 		else if (op == Token::GreaterThanOrEqual)
-			expr = "iszero(" + string(isSigned ? "slt(" : "lt(") + std::move(args) + "))";
+			expr = "iszero(" + std::string(isSigned ? "slt(" : "lt(") + std::move(args) + "))";
 		else if (op == Token::LessThanOrEqual)
-			expr = "iszero(" + string(isSigned ? "sgt(" : "gt(") + std::move(args) + "))";
+			expr = "iszero(" + std::string(isSigned ? "sgt(" : "gt(") + std::move(args) + "))";
 		else if (op == Token::GreaterThan)
 			expr = (isSigned ? "sgt(" : "gt(") + std::move(args) + ")";
 		else if (op == Token::LessThan)
@@ -925,8 +924,8 @@ bool IRGeneratorForStatements::visit(BinaryOperation const& _binOp)
 	}
 	else
 	{
-		string left = expressionAsType(_binOp.leftExpression(), *commonType);
-		string right = expressionAsType(_binOp.rightExpression(), *commonType);
+		std::string left = expressionAsType(_binOp.leftExpression(), *commonType);
+		std::string right = expressionAsType(_binOp.rightExpression(), *commonType);
 		define(_binOp) << binaryOperation(_binOp.getOperator(), *commonType, left, right) << "\n";
 	}
 	return false;
@@ -960,7 +959,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 
 	TypePointers parameterTypes = functionType->parameterTypes();
 
-	vector<ASTPointer<Expression const>> const& arguments = _functionCall.sortedArguments();
+	std::vector<ASTPointer<Expression const>> const& arguments = _functionCall.sortedArguments();
 
 	if (functionCallKind == FunctionCallKind::StructConstructorCall)
 	{
@@ -1001,7 +1000,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 
 		solAssert(!functionType->takesArbitraryParameters());
 
-		vector<string> args;
+		std::vector<std::string> args;
 		if (functionType->hasBoundFirstArgument())
 			args += IRVariable(_functionCall.expression()).part("self").stackSlots();
 
@@ -1049,8 +1048,8 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		TypePointers paramTypes = functionType->parameterTypes();
 		ABIFunctions abi(m_context.evmVersion(), m_context.revertStrings(), m_context.functionCollector());
 
-		vector<IRVariable> indexedArgs;
-		vector<string> nonIndexedArgs;
+		std::vector<IRVariable> indexedArgs;
+		std::vector<std::string> nonIndexedArgs;
 		TypePointers nonIndexedArgTypes;
 		TypePointers nonIndexedParamTypes;
 		if (!event.isAnonymous())
@@ -1061,7 +1060,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 			Expression const& arg = *arguments[i];
 			if (event.parameters()[i]->isIndexed())
 			{
-				string value;
+				std::string value;
 				if (auto const& referenceType = dynamic_cast<ReferenceType const*>(paramTypes[i]))
 					define(indexedArgs.emplace_back(m_context.newYulVariable(), *TypeProvider::uint256())) <<
 						m_utils.packedHashFunction({arg.annotation().type}, {referenceType}) <<
@@ -1106,7 +1105,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
 		templ("encode", abi.tupleEncoder(nonIndexedArgTypes, nonIndexedParamTypes));
 		templ("nonIndexedArgs", joinHumanReadablePrefixed(nonIndexedArgs));
-		templ("log", "log" + to_string(indexedArgs.size()));
+		templ("log", "log" + std::to_string(indexedArgs.size()));
 		templ("indexedArgs", joinHumanReadablePrefixed(indexedArgs | ranges::views::transform([&](auto const& _arg) {
 			return _arg.commaSeparatedList();
 		})));
@@ -1152,7 +1151,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 			arguments.size() > 1 && m_context.revertStrings() != RevertStrings::Strip ?
 			arguments[1]->annotation().type :
 			nullptr;
-		string requireOrAssertFunction = m_utils.requireOrAssertFunction(
+		std::string requireOrAssertFunction = m_utils.requireOrAssertFunction(
 			functionType->kind() == FunctionType::Kind::Assert,
 			messageArgumentType
 		);
@@ -1179,9 +1178,9 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 
 		TypePointers argumentTypes;
 		TypePointers targetTypes;
-		vector<string> argumentVars;
-		string selector;
-		vector<ASTPointer<Expression const>> argumentsOfEncodeFunction;
+		std::vector<std::string> argumentVars;
+		std::string selector;
+		std::vector<ASTPointer<Expression const>> argumentsOfEncodeFunction;
 
 		if (functionType->kind() == FunctionType::Kind::ABIEncodeCall)
 		{
@@ -1252,13 +1251,13 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 				// TODO This is an abuse of the `allocateUnbounded` function.
 				// We might want to introduce a new set of memory handling functions here
 				// a la "setMemoryCheckPoint" and "freeUntilCheckPoint".
-				string freeMemoryPre = m_context.newYulVariable();
+				std::string freeMemoryPre = m_context.newYulVariable();
 				appendCode() << "let " << freeMemoryPre << " := " << m_utils.allocateUnboundedFunction() << "()\n";
 				IRVariable array = convert(*arguments[0], *TypeProvider::bytesMemory());
 				IRVariable hashVariable(m_context.newYulVariable(), *TypeProvider::fixedBytes(32));
 
-				string dataAreaFunction = m_utils.arrayDataAreaFunction(*TypeProvider::bytesMemory());
-				string arrayLengthFunction = m_utils.arrayLengthFunction(*TypeProvider::bytesMemory());
+				std::string dataAreaFunction = m_utils.arrayDataAreaFunction(*TypeProvider::bytesMemory());
+				std::string arrayLengthFunction = m_utils.arrayLengthFunction(*TypeProvider::bytesMemory());
 				define(hashVariable) <<
 					"keccak256(" <<
 					(dataAreaFunction + "(" + array.commaSeparatedList() + ")") <<
@@ -1389,8 +1388,8 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		{
 			auto array = convert(*arguments[0], *arrayType);
 
-			string dataAreaFunction = m_utils.arrayDataAreaFunction(*arrayType);
-			string arrayLengthFunction = m_utils.arrayLengthFunction(*arrayType);
+			std::string dataAreaFunction = m_utils.arrayDataAreaFunction(*arrayType);
+			std::string arrayLengthFunction = m_utils.arrayLengthFunction(*arrayType);
 			define(_functionCall) <<
 				"keccak256(" <<
 				(dataAreaFunction + "(" + array.commaSeparatedList() + ")") <<
@@ -1453,7 +1452,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::BytesConcat:
 	{
 		TypePointers argumentTypes;
-		vector<string> argumentVars;
+		std::vector<std::string> argumentVars;
 		for (ASTPointer<Expression const> const& argument: arguments)
 		{
 			argumentTypes.emplace_back(&type(*argument));
@@ -1473,7 +1472,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::AddMod:
 	case FunctionType::Kind::MulMod:
 	{
-		static map<FunctionType::Kind, string> functions = {
+		static std::map<FunctionType::Kind, std::string> functions = {
 			{FunctionType::Kind::AddMod, "addmod"},
 			{FunctionType::Kind::MulMod, "mulmod"},
 		};
@@ -1487,7 +1486,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		templ("panic", m_utils.panicFunction(PanicCode::DivisionByZero));
 		appendCode() << templ.render();
 
-		string args;
+		std::string args;
 		for (size_t i = 0; i < 2; ++i)
 			args += expressionAsType(*arguments[i], *(parameterTypes[i])) + ", ";
 		args += modulus.name();
@@ -1498,14 +1497,14 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::Selfdestruct:
 	case FunctionType::Kind::BlockHash:
 	{
-		static map<FunctionType::Kind, string> functions = {
+		static std::map<FunctionType::Kind, std::string> functions = {
 			{FunctionType::Kind::GasLeft, "gas"},
 			{FunctionType::Kind::Selfdestruct, "selfdestruct"},
 			{FunctionType::Kind::BlockHash, "blockhash"},
 		};
 		solAssert(functions.find(functionType->kind()) != functions.end());
 
-		string args;
+		std::string args;
 		for (size_t i = 0; i < arguments.size(); ++i)
 			args += (args.empty() ? "" : ", ") + expressionAsType(*arguments[i], *(parameterTypes[i]));
 		define(_functionCall) << functions[functionType->kind()] << "(" << args << ")\n";
@@ -1520,7 +1519,7 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		);
 
 		TypePointers argumentTypes;
-		vector<string> constructorParams;
+		std::vector<std::string> constructorParams;
 		for (ASTPointer<Expression const> const& arg: arguments)
 		{
 			argumentTypes.push_back(arg->annotation().type);
@@ -1575,8 +1574,8 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::Transfer:
 	{
 		solAssert(arguments.size() == 1 && parameterTypes.size() == 1);
-		string address{IRVariable(_functionCall.expression()).part("address").name()};
-		string value{expressionAsType(*arguments[0], *(parameterTypes[0]))};
+		std::string address{IRVariable(_functionCall.expression()).part("address").name()};
+		std::string value{expressionAsType(*arguments[0], *(parameterTypes[0]))};
 		Whiskers templ(R"(
 			let <gas> := 0
 			if iszero(<value>) { <gas> := <callStipend> }
@@ -1608,14 +1607,14 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 		solAssert(!functionType->gasSet());
 		solAssert(!functionType->hasBoundFirstArgument());
 
-		static map<FunctionType::Kind, std::tuple<unsigned, size_t>> precompiles = {
+		static std::map<FunctionType::Kind, std::tuple<unsigned, size_t>> precompiles = {
 			{FunctionType::Kind::ECRecover, std::make_tuple(1, 0)},
 			{FunctionType::Kind::SHA256, std::make_tuple(2, 0)},
 			{FunctionType::Kind::RIPEMD160, std::make_tuple(3, 12)},
 		};
 		auto [ address, offset ] = precompiles[functionType->kind()];
 		TypePointers argumentTypes;
-		vector<string> argumentStrings;
+		std::vector<std::string> argumentStrings;
 		for (auto const& arg: arguments)
 		{
 			argumentTypes.emplace_back(&type(*arg));
@@ -1676,11 +1675,11 @@ void IRGeneratorForStatements::endVisit(FunctionCallOptions const& _options)
 
 	// Copy over existing values.
 	for (auto const& item: previousType.stackItems())
-		define(IRVariable(_options).part(get<0>(item)), IRVariable(_options.expression()).part(get<0>(item)));
+		define(IRVariable(_options).part(std::get<0>(item)), IRVariable(_options.expression()).part(std::get<0>(item)));
 
 	for (size_t i = 0; i < _options.names().size(); ++i)
 	{
-		string const& name = *_options.names()[i];
+		std::string const& name = *_options.names()[i];
 		solAssert(name == "salt" || name == "gas" || name == "value");
 
 		define(IRVariable(_options).part(name), *_options.options()[i]);
@@ -1785,7 +1784,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 				")\n";
 		else if (member == "code")
 		{
-			string externalCodeFunction = m_utils.externalCodeFunction();
+			std::string externalCodeFunction = m_utils.externalCodeFunction();
 			define(_memberAccess) <<
 				externalCodeFunction <<
 				"(" <<
@@ -1797,12 +1796,12 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 				"extcodehash(" <<
 				expressionAsType(_memberAccess.expression(), *TypeProvider::address()) <<
 				")\n";
-		else if (set<string>{"send", "transfer"}.count(member))
+		else if (std::set<std::string>{"send", "transfer"}.count(member))
 		{
 			solAssert(dynamic_cast<AddressType const&>(*_memberAccess.expression().annotation().type).stateMutability() == StateMutability::Payable);
 			define(IRVariable{_memberAccess}.part("address"), _memberAccess.expression());
 		}
-		else if (set<string>{"call", "callcode", "delegatecall", "staticcall"}.count(member))
+		else if (std::set<std::string>{"call", "callcode", "delegatecall", "staticcall"}.count(member))
 			define(IRVariable{_memberAccess}.part("address"), _memberAccess.expression());
 		else
 			solAssert(false, "Invalid member access to address");
@@ -1945,7 +1944,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		{
 			MagicType const* arg = dynamic_cast<MagicType const*>(_memberAccess.expression().annotation().type);
 
-			string requestedValue;
+			std::string requestedValue;
 			if (IntegerType const* integerType = dynamic_cast<IntegerType const*>(arg->typeArgument()))
 			{
 				if (member == "min")
@@ -1956,16 +1955,16 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 			else if (EnumType const* enumType = dynamic_cast<EnumType const*>(arg->typeArgument()))
 			{
 				if (member == "min")
-					requestedValue = to_string(enumType->minValue());
+					requestedValue = std::to_string(enumType->minValue());
 				else
-					requestedValue = to_string(enumType->maxValue());
+					requestedValue = std::to_string(enumType->maxValue());
 			}
 			else
 				solAssert(false, "min/max requested on unexpected type.");
 
 			define(_memberAccess) << requestedValue << "\n";
 		}
-		else if (set<string>{"encode", "encodePacked", "encodeWithSelector", "encodeCall", "encodeWithSignature", "decode"}.count(member))
+		else if (std::set<std::string>{"encode", "encodePacked", "encodeWithSelector", "encodeCall", "encodeWithSignature", "decode"}.count(member))
 		{
 			// no-op
 		}
@@ -1981,8 +1980,8 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		{
 		case DataLocation::Storage:
 		{
-			pair<u256, unsigned> const& offsets = structType.storageOffsetsOfMember(member);
-			string slot = m_context.newYulVariable();
+			std::pair<u256, unsigned> const& offsets = structType.storageOffsetsOfMember(member);
+			std::string slot = m_context.newYulVariable();
 			appendCode() << "let " << slot << " := " <<
 				("add(" + expression.part("slot").name() + ", " + offsets.first.str() + ")\n");
 			setLValue(_memberAccess, IRLValue{
@@ -1993,7 +1992,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		}
 		case DataLocation::Memory:
 		{
-			string pos = m_context.newYulVariable();
+			std::string pos = m_context.newYulVariable();
 			appendCode() << "let " << pos << " := " <<
 				("add(" + expression.part("mpos").name() + ", " + structType.memoryOffsetOfMember(member).str() + ")\n");
 			setLValue(_memberAccess, IRLValue{
@@ -2004,9 +2003,9 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 		}
 		case DataLocation::CallData:
 		{
-			string baseRef = expression.part("offset").name();
-			string offset = m_context.newYulVariable();
-			appendCode() << "let " << offset << " := " << "add(" << baseRef << ", " << to_string(structType.calldataOffsetOfMember(member)) << ")\n";
+			std::string baseRef = expression.part("offset").name();
+			std::string offset = m_context.newYulVariable();
+			appendCode() << "let " << offset << " := " << "add(" << baseRef << ", " << std::to_string(structType.calldataOffsetOfMember(member)) << ")\n";
 			if (_memberAccess.annotation().type->isDynamicallyEncoded())
 				define(_memberAccess) <<
 					m_utils.accessCalldataTailFunction(*_memberAccess.annotation().type) <<
@@ -2036,7 +2035,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 	case Type::Category::Enum:
 	{
 		EnumType const& type = dynamic_cast<EnumType const&>(*_memberAccess.expression().annotation().type);
-		define(_memberAccess) << to_string(type.memberValue(_memberAccess.memberName())) << "\n";
+		define(_memberAccess) << std::to_string(type.memberValue(_memberAccess.memberName())) << "\n";
 		break;
 	}
 	case Type::Category::Array:
@@ -2076,7 +2075,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 	{
 		auto const& type = dynamic_cast<FixedBytesType const&>(*_memberAccess.expression().annotation().type);
 		if (member == "length")
-			define(_memberAccess) << to_string(type.numBytes()) << "\n";
+			define(_memberAccess) << std::to_string(type.numBytes()) << "\n";
 		else
 			solAssert(false, "Illegal fixed bytes member.");
 		break;
@@ -2162,7 +2161,7 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 				solAssert(false);
 		}
 		else if (EnumType const* enumType = dynamic_cast<EnumType const*>(&actualType))
-			define(_memberAccess) << to_string(enumType->memberValue(_memberAccess.memberName())) << "\n";
+			define(_memberAccess) << std::to_string(enumType->memberValue(_memberAccess.memberName())) << "\n";
 		else if (dynamic_cast<UserDefinedValueType const*>(&actualType))
 			solAssert(member == "wrap" || member == "unwrap");
 		else if (auto const* arrayType = dynamic_cast<ArrayType const*>(&actualType))
@@ -2222,7 +2221,7 @@ bool IRGeneratorForStatements::visit(InlineAssembly const& _inlineAsm)
 
 	yul::Statement modified = bodyCopier(_inlineAsm.operations());
 
-	solAssert(holds_alternative<yul::Block>(modified));
+	solAssert(std::holds_alternative<yul::Block>(modified));
 
 	// Do not provide dialect so that we get the full type information.
 	appendCode() << yul::AsmPrinter()(std::get<yul::Block>(modified)) << "\n";
@@ -2242,7 +2241,7 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 		MappingType const& mappingType = dynamic_cast<MappingType const&>(baseType);
 		Type const& keyType = *_indexAccess.indexExpression()->annotation().type;
 
-		string slot = m_context.newYulVariable();
+		std::string slot = m_context.newYulVariable();
 		Whiskers templ("let <slot> := <indexAccess>(<base><?+key>,<key></+key>)\n");
 		templ("slot", slot);
 		templ("indexAccess", m_utils.mappingIndexAccessFunction(mappingType, keyType));
@@ -2273,8 +2272,8 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 		{
 			case DataLocation::Storage:
 			{
-				string slot = m_context.newYulVariable();
-				string offset = m_context.newYulVariable();
+				std::string slot = m_context.newYulVariable();
+				std::string offset = m_context.newYulVariable();
 
 				appendCode() << Whiskers(R"(
 					let <slot>, <offset> := <indexFunc>(<array>, <index>)
@@ -2295,13 +2294,13 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 			}
 			case DataLocation::Memory:
 			{
-				string const indexAccessFunction = m_utils.memoryArrayIndexAccessFunction(arrayType);
-				string const baseRef = IRVariable(_indexAccess.baseExpression()).part("mpos").name();
-				string const indexExpression = expressionAsType(
+				std::string const indexAccessFunction = m_utils.memoryArrayIndexAccessFunction(arrayType);
+				std::string const baseRef = IRVariable(_indexAccess.baseExpression()).part("mpos").name();
+				std::string const indexExpression = expressionAsType(
 					*_indexAccess.indexExpression(),
 					*TypeProvider::uint256()
 				);
-				string const memAddress = indexAccessFunction + "(" + baseRef + ", " + indexExpression + ")";
+				std::string const memAddress = indexAccessFunction + "(" + baseRef + ", " + indexExpression + ")";
 
 				setLValue(_indexAccess, IRLValue{
 					*arrayType.baseType(),
@@ -2311,13 +2310,13 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 			}
 			case DataLocation::CallData:
 			{
-				string const indexAccessFunction = m_utils.calldataArrayIndexAccessFunction(arrayType);
-				string const baseRef = IRVariable(_indexAccess.baseExpression()).commaSeparatedList();
-				string const indexExpression = expressionAsType(
+				std::string const indexAccessFunction = m_utils.calldataArrayIndexAccessFunction(arrayType);
+				std::string const baseRef = IRVariable(_indexAccess.baseExpression()).commaSeparatedList();
+				std::string const indexExpression = expressionAsType(
 					*_indexAccess.indexExpression(),
 					*TypeProvider::uint256()
 				);
-				string const calldataAddress = indexAccessFunction + "(" + baseRef + ", " + indexExpression + ")";
+				std::string const calldataAddress = indexAccessFunction + "(" + baseRef + ", " + indexExpression + ")";
 
 				if (arrayType.isByteArrayOrString())
 					define(_indexAccess) <<
@@ -2349,7 +2348,7 @@ void IRGeneratorForStatements::endVisit(IndexAccess const& _indexAccess)
 			let <result> := <shl248>(byte(<index>, <array>))
 		)")
 		("index", index.name())
-		("length", to_string(fixedBytesType.numBytes()))
+		("length", std::to_string(fixedBytesType.numBytes()))
 		("panic", m_utils.panicFunction(PanicCode::ArrayOutOfBounds))
 		("array", IRVariable(_indexAccess.baseExpression()).name())
 		("shl248", m_utils.shiftLeftFunction(256 - 8))
@@ -2538,7 +2537,7 @@ void IRGeneratorForStatements::handleVariableReference(
 
 void IRGeneratorForStatements::appendExternalFunctionCall(
 	FunctionCall const& _functionCall,
-	vector<ASTPointer<Expression const>> const& _arguments
+	std::vector<ASTPointer<Expression const>> const& _arguments
 )
 {
 	FunctionType const& funType = dynamic_cast<FunctionType const&>(type(_functionCall.expression()));
@@ -2559,7 +2558,7 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 
 	TypePointers parameterTypes = funType.parameterTypes();
 	TypePointers argumentTypes;
-	vector<string> argumentStrings;
+	std::vector<std::string> argumentStrings;
 	if (funType.hasBoundFirstArgument())
 	{
 		parameterTypes.insert(parameterTypes.begin(), funType.selfType());
@@ -2581,7 +2580,7 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 		// We could also just use MLOAD; POP right before the gas calculation, but the optimizer
 		// would remove that, so we use MSTORE here.
 		if (!funType.gasSet() && returnInfo.estimatedReturnSize > 0)
-			appendCode() << "mstore(add(" << m_utils.allocateUnboundedFunction() << "() , " << to_string(returnInfo.estimatedReturnSize) << "), 0)\n";
+			appendCode() << "mstore(add(" << m_utils.allocateUnboundedFunction() << "() , " << std::to_string(returnInfo.estimatedReturnSize) << "), 0)\n";
 	}
 
 	// NOTE: When the expected size of returndata is static, we pass that in to the call opcode and it gets copied automatically.
@@ -2649,10 +2648,10 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 	if (returnInfo.dynamicReturnSize)
 		solAssert(m_context.evmVersion().supportsReturndata());
 	templ("returnDataSizeVar", m_context.newYulVariable());
-	templ("staticReturndataSize", to_string(returnInfo.estimatedReturnSize));
+	templ("staticReturndataSize", std::to_string(returnInfo.estimatedReturnSize));
 	templ("supportsReturnData", m_context.evmVersion().supportsReturndata());
 
-	string const retVars = IRVariable(_functionCall).commaSeparatedList();
+	std::string const retVars = IRVariable(_functionCall).commaSeparatedList();
 	templ("retVars", retVars);
 	solAssert(retVars.empty() == returnInfo.returnTypes.empty());
 
@@ -2704,7 +2703,7 @@ void IRGeneratorForStatements::appendExternalFunctionCall(
 
 void IRGeneratorForStatements::appendBareCall(
 	FunctionCall const& _functionCall,
-	vector<ASTPointer<Expression const>> const& _arguments
+	std::vector<ASTPointer<Expression const>> const& _arguments
 )
 {
 	FunctionType const& funType = dynamic_cast<FunctionType const&>(type(_functionCall.expression()));
@@ -2807,7 +2806,7 @@ void IRGeneratorForStatements::assignInternalFunctionIDIfNotCalledDirectly(
 		return;
 
 	define(IRVariable(_expression).part("functionIdentifier")) <<
-		to_string(m_context.mostDerivedContract().annotation().internalFunctionIDs.at(&_referencedFunction)) <<
+		std::to_string(m_context.mostDerivedContract().annotation().internalFunctionIDs.at(&_referencedFunction)) <<
 		"\n";
 	m_context.addToInternalDispatch(_referencedFunction);
 }
@@ -2864,7 +2863,7 @@ void IRGeneratorForStatements::declare(IRVariable const& _var)
 
 void IRGeneratorForStatements::declareAssign(IRVariable const& _lhs, IRVariable const& _rhs, bool _declare, bool _forceCleanup)
 {
-	string output;
+	std::string output;
 	if (_lhs.type() == _rhs.type() && !_forceCleanup)
 		for (auto const& [stackItemName, stackItemType]: _lhs.type().stackItems())
 			if (stackItemType)
@@ -2894,7 +2893,7 @@ IRVariable IRGeneratorForStatements::zeroValue(Type const& _type, bool _splitFun
 
 void IRGeneratorForStatements::appendSimpleUnaryOperation(UnaryOperation const& _operation, Expression const& _expr)
 {
-	string func;
+	std::string func;
 
 	if (_operation.getOperator() == Token::Not)
 		func = "iszero";
@@ -2913,18 +2912,18 @@ void IRGeneratorForStatements::appendSimpleUnaryOperation(UnaryOperation const&
 		")\n";
 }
 
-string IRGeneratorForStatements::binaryOperation(
+std::string IRGeneratorForStatements::binaryOperation(
 	langutil::Token _operator,
 	Type const& _type,
-	string const& _left,
-	string const& _right
+	std::string const& _left,
+	std::string const& _right
 )
 {
 	solAssert(
 		!TokenTraits::isShiftOp(_operator),
 		"Have to use specific shift operation function for shifts."
 	);
-	string fun;
+	std::string fun;
 	if (TokenTraits::isBitOp(_operator))
 	{
 		solAssert(
@@ -3030,12 +3029,12 @@ void IRGeneratorForStatements::writeToLValue(IRLValue const& _lvalue, IRVariable
 	std::visit(
 		util::GenericVisitor{
 			[&](IRLValue::Storage const& _storage) {
-				string offsetArgument;
-				optional<unsigned> offsetStatic;
+				std::string offsetArgument;
+				std::optional<unsigned> offsetStatic;
 
 				std::visit(GenericVisitor{
 					[&](unsigned _offset) { offsetStatic = _offset; },
-					[&](string const& _offset) { offsetArgument = ", " + _offset; }
+					[&](std::string const& _offset) { offsetArgument = ", " + _offset; }
 				}, _storage.offset);
 
 				appendCode() <<
@@ -3068,7 +3067,7 @@ void IRGeneratorForStatements::writeToLValue(IRLValue const& _lvalue, IRVariable
 				}
 				else if (auto const* literalType = dynamic_cast<StringLiteralType const*>(&_value.type()))
 				{
-					string writeUInt = m_utils.writeToMemoryFunction(*TypeProvider::uint256());
+					std::string writeUInt = m_utils.writeToMemoryFunction(*TypeProvider::uint256());
 					appendCode() <<
 						writeUInt <<
 						"(" <<
@@ -3099,7 +3098,7 @@ void IRGeneratorForStatements::writeToLValue(IRLValue const& _lvalue, IRVariable
 				IRVariable prepared(m_context.newYulVariable(), _lvalue.type);
 				define(prepared, _value);
 
-				appendCode() << "mstore(" << to_string(memOffset) << ", " << prepared.commaSeparatedList() << ")\n";
+				appendCode() << "mstore(" << std::to_string(memOffset) << ", " << prepared.commaSeparatedList() << ")\n";
 			},
 			[&](IRLValue::Tuple const& _tuple) {
 				auto components = std::move(_tuple.components);
@@ -3122,13 +3121,13 @@ IRVariable IRGeneratorForStatements::readFromLValue(IRLValue const& _lvalue)
 		[&](IRLValue::Storage const& _storage) {
 			if (!_lvalue.type.isValueType())
 				define(result) << _storage.slot << "\n";
-			else if (std::holds_alternative<string>(_storage.offset))
+			else if (std::holds_alternative<std::string>(_storage.offset))
 				define(result) <<
 					m_utils.readFromStorageDynamic(_lvalue.type, true) <<
 					"(" <<
 					_storage.slot <<
 					", " <<
-					std::get<string>(_storage.offset) <<
+					std::get<std::string>(_storage.offset) <<
 					")\n";
 			else
 				define(result) <<
@@ -3156,15 +3155,15 @@ IRVariable IRGeneratorForStatements::readFromLValue(IRLValue const& _lvalue)
 			solAssert(_lvalue.type == *_immutable.variable->type());
 			if (m_context.executionContext() == IRGenerationContext::ExecutionContext::Creation)
 			{
-				string readFunction = m_utils.readFromMemory(*_immutable.variable->type());
+				std::string readFunction = m_utils.readFromMemory(*_immutable.variable->type());
 				define(result) <<
 					readFunction <<
 					"(" <<
-					to_string(m_context.immutableMemoryOffset(*_immutable.variable)) <<
+					std::to_string(m_context.immutableMemoryOffset(*_immutable.variable)) <<
 					")\n";
 			}
 			else
-				define(result) << "loadimmutable(\"" << to_string(_immutable.variable->id()) << "\")\n";
+				define(result) << "loadimmutable(\"" << std::to_string(_immutable.variable->id()) << "\")\n";
 		},
 		[&](IRLValue::Tuple const&) {
 			solAssert(false, "Attempted to read from tuple lvalue.");
@@ -3181,7 +3180,7 @@ void IRGeneratorForStatements::setLValue(Expression const& _expression, IRLValue
 	{
 		m_currentLValue.emplace(std::move(_lvalue));
 		if (_lvalue.type.dataStoredIn(DataLocation::CallData))
-			solAssert(holds_alternative<IRLValue::Stack>(_lvalue.kind));
+			solAssert(std::holds_alternative<IRLValue::Stack>(_lvalue.kind));
 	}
 	else
 		// Only define the expression, if it will not be written to.
@@ -3196,7 +3195,7 @@ void IRGeneratorForStatements::generateLoop(
 	bool _isDoWhile
 )
 {
-	string firstRun;
+	std::string firstRun;
 
 	if (_isDoWhile)
 	{
@@ -3278,7 +3277,7 @@ bool IRGeneratorForStatements::visit(TryStatement const& _tryStatement)
 void IRGeneratorForStatements::handleCatch(TryStatement const& _tryStatement)
 {
 	setLocation(_tryStatement);
-	string const runFallback = m_context.newYulVariable();
+	std::string const runFallback = m_context.newYulVariable();
 	appendCode() << "let " << runFallback << " := 1\n";
 
 	// This function returns zero on "short returndata". We have to add a success flag
@@ -3290,7 +3289,7 @@ void IRGeneratorForStatements::handleCatch(TryStatement const& _tryStatement)
 	{
 		appendCode() << "case " << selectorFromSignatureU32("Error(string)") << " {\n";
 		setLocation(*errorClause);
-		string const dataVariable = m_context.newYulVariable();
+		std::string const dataVariable = m_context.newYulVariable();
 		appendCode() << "let " << dataVariable << " := " << m_utils.tryDecodeErrorMessageFunction() << "()\n";
 		appendCode() << "if " << dataVariable << " {\n";
 		appendCode() << runFallback << " := 0\n";
@@ -3310,8 +3309,8 @@ void IRGeneratorForStatements::handleCatch(TryStatement const& _tryStatement)
 	{
 		appendCode() << "case " << selectorFromSignatureU32("Panic(uint256)") << " {\n";
 		setLocation(*panicClause);
-		string const success = m_context.newYulVariable();
-		string const code = m_context.newYulVariable();
+		std::string const success = m_context.newYulVariable();
+		std::string const code = m_context.newYulVariable();
 		appendCode() << "let " << success << ", " << code << " := " << m_utils.tryDecodePanicDataFunction() << "()\n";
 		appendCode() << "if " << success << " {\n";
 		appendCode() << runFallback << " := 0\n";
@@ -3358,9 +3357,9 @@ void IRGeneratorForStatements::handleCatchFallback(TryCatchClause const& _fallba
 }
 
 void IRGeneratorForStatements::revertWithError(
-	string const& _signature,
-	vector<Type const*> const& _parameterTypes,
-	vector<ASTPointer<Expression const>> const& _errorArguments
+	std::string const& _signature,
+	std::vector<Type const*> const& _parameterTypes,
+	std::vector<ASTPointer<Expression const>> const& _errorArguments
 )
 {
 	Whiskers templ(R"({
@@ -3374,8 +3373,8 @@ void IRGeneratorForStatements::revertWithError(
 	templ("hash", util::selectorFromSignatureU256(_signature).str());
 	templ("allocateUnbounded", m_utils.allocateUnboundedFunction());
 
-	vector<string> errorArgumentVars;
-	vector<Type const*> errorArgumentTypes;
+	std::vector<std::string> errorArgumentVars;
+	std::vector<Type const*> errorArgumentTypes;
 	for (ASTPointer<Expression const> const& arg: _errorArguments)
 	{
 		errorArgumentVars += IRVariable(*arg).stackSlots();
@@ -3395,7 +3394,7 @@ bool IRGeneratorForStatements::visit(TryCatchClause const& _clause)
 	return false;
 }
 
-string IRGeneratorForStatements::linkerSymbol(ContractDefinition const& _library) const
+std::string IRGeneratorForStatements::linkerSymbol(ContractDefinition const& _library) const
 {
 	solAssert(_library.isLibrary());
 	return "linkersymbol(" + util::escapeAndQuoteString(_library.fullyQualifiedName()) + ")";
diff --git a/libsolidity/codegen/ir/IRVariable.cpp b/libsolidity/codegen/ir/IRVariable.cpp
index 3d5f2f5a4f..690ef4fc36 100644
--- a/libsolidity/codegen/ir/IRVariable.cpp
+++ b/libsolidity/codegen/ir/IRVariable.cpp
@@ -20,7 +20,6 @@
 #include <libsolidity/ast/AST.h>
 #include <libsolutil/StringUtils.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 using namespace solidity::util;
@@ -41,7 +40,7 @@ IRVariable::IRVariable(Expression const& _expression):
 {
 }
 
-IRVariable IRVariable::part(string const& _name) const
+IRVariable IRVariable::part(std::string const& _name) const
 {
 	for (auto const& [itemName, itemType]: m_type.stackItems())
 		if (itemName == _name)
@@ -63,9 +62,9 @@ bool IRVariable::hasPart(std::string const& _name) const
 	return false;
 }
 
-vector<string> IRVariable::stackSlots() const
+std::vector<std::string> IRVariable::stackSlots() const
 {
-	vector<string> result;
+	std::vector<std::string> result;
 	for (auto const& [itemName, itemType]: m_type.stackItems())
 		if (itemType)
 		{
@@ -81,17 +80,17 @@ vector<string> IRVariable::stackSlots() const
 	return result;
 }
 
-string IRVariable::commaSeparatedList() const
+std::string IRVariable::commaSeparatedList() const
 {
 	return joinHumanReadable(stackSlots());
 }
 
-string IRVariable::commaSeparatedListPrefixed() const
+std::string IRVariable::commaSeparatedListPrefixed() const
 {
 	return joinHumanReadablePrefixed(stackSlots());
 }
 
-string IRVariable::name() const
+std::string IRVariable::name() const
 {
 	solAssert(m_type.sizeOnStack() == 1, "");
 	auto const& [itemName, type] = m_type.stackItems().front();
@@ -108,7 +107,7 @@ IRVariable IRVariable::tupleComponent(size_t _i) const
 	return part(IRNames::tupleComponent(_i));
 }
 
-string IRVariable::suffixedName(string const& _suffix) const
+std::string IRVariable::suffixedName(std::string const& _suffix) const
 {
 	if (_suffix.empty())
 		return m_baseName;
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 6a48034139..917deea113 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -27,6 +27,8 @@ NAMESPACE_STD_FREE_FILES=(
     libsolc/*
     libsolidity/analysis/*
     libsolidity/ast/*
+    libsolidity/codegen/ir/*
+    libsolidity/codegen/*
 )
 
 (

From d0a5556fd0e9f6ca5ea5a6737f89e54688171fbd Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 14 Aug 2023 22:19:11 +0200
Subject: [PATCH 1542/1748] Purge using namespace from libsolidity/formal

---
 libsolidity/formal/ArraySlicePredicate.cpp  |  13 +-
 libsolidity/formal/BMC.cpp                  |  61 ++++---
 libsolidity/formal/CHC.cpp                  | 179 ++++++++++---------
 libsolidity/formal/EncodingContext.cpp      |  21 ++-
 libsolidity/formal/ExpressionFormatter.cpp  |  25 ++-
 libsolidity/formal/Invariants.cpp           |  13 +-
 libsolidity/formal/ModelChecker.cpp         |  21 ++-
 libsolidity/formal/ModelCheckerSettings.cpp |  33 ++--
 libsolidity/formal/Predicate.cpp            | 107 ++++++------
 libsolidity/formal/PredicateInstance.cpp    |  47 +++--
 libsolidity/formal/PredicateSort.cpp        |  35 ++--
 libsolidity/formal/SMTEncoder.cpp           | 184 ++++++++++----------
 libsolidity/formal/SSAVariable.cpp          |   1 -
 libsolidity/formal/SymbolicState.cpp        |  93 +++++-----
 libsolidity/formal/SymbolicTypes.cpp        |  95 +++++-----
 libsolidity/formal/SymbolicVariables.cpp    |  65 ++++---
 libsolidity/formal/VariableUsage.cpp        |   3 +-
 scripts/check_style.sh                      |   1 +
 18 files changed, 491 insertions(+), 506 deletions(-)

diff --git a/libsolidity/formal/ArraySlicePredicate.cpp b/libsolidity/formal/ArraySlicePredicate.cpp
index f73985f181..21d5fb1add 100644
--- a/libsolidity/formal/ArraySlicePredicate.cpp
+++ b/libsolidity/formal/ArraySlicePredicate.cpp
@@ -20,18 +20,17 @@
 
 #include <liblangutil/Exceptions.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::smtutil;
 using namespace solidity::frontend;
 using namespace solidity::frontend::smt;
 
-map<string, ArraySlicePredicate::SliceData> ArraySlicePredicate::m_slicePredicates;
+std::map<std::string, ArraySlicePredicate::SliceData> ArraySlicePredicate::m_slicePredicates;
 
-pair<bool, ArraySlicePredicate::SliceData const&> ArraySlicePredicate::create(SortPointer _sort, EncodingContext& _context)
+std::pair<bool, ArraySlicePredicate::SliceData const&> ArraySlicePredicate::create(SortPointer _sort, EncodingContext& _context)
 {
 	solAssert(_sort->kind == Kind::Tuple, "");
-	auto tupleSort = dynamic_pointer_cast<TupleSort>(_sort);
+	auto tupleSort = std::dynamic_pointer_cast<TupleSort>(_sort);
 	solAssert(tupleSort, "");
 
 	auto tupleName = tupleSort->name;
@@ -47,12 +46,12 @@ pair<bool, ArraySlicePredicate::SliceData const&> ArraySlicePredicate::create(So
 	smt::SymbolicIntVariable endVar{TypeProvider::uint256(), TypeProvider::uint256(), "end_" + tupleName, _context };
 	smt::SymbolicIntVariable iVar{TypeProvider::uint256(), TypeProvider::uint256(), "i_" + tupleName, _context};
 
-	vector<SortPointer> domain{sort, sort, startVar.sort(), endVar.sort()};
-	auto sliceSort = make_shared<FunctionSort>(domain, SortProvider::boolSort);
+	std::vector<SortPointer> domain{sort, sort, startVar.sort(), endVar.sort()};
+	auto sliceSort = std::make_shared<FunctionSort>(domain, SortProvider::boolSort);
 	Predicate const& slice = *Predicate::create(sliceSort, "array_slice_" + tupleName, PredicateType::Custom, _context);
 
 	domain.emplace_back(iVar.sort());
-	auto predSort = make_shared<FunctionSort>(domain, SortProvider::boolSort);
+	auto predSort = std::make_shared<FunctionSort>(domain, SortProvider::boolSort);
 	Predicate const& header = *Predicate::create(predSort, "array_slice_header_" + tupleName, PredicateType::Custom, _context);
 	Predicate const& loop = *Predicate::create(predSort, "array_slice_loop_" + tupleName, PredicateType::Custom, _context);
 
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index 220f6411a5..dede97cc03 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -31,7 +31,6 @@
 #include <z3_version.h>
 #endif
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -41,13 +40,13 @@ BMC::BMC(
 	smt::EncodingContext& _context,
 	UniqueErrorReporter& _errorReporter,
 	UniqueErrorReporter& _unsupportedErrorReporter,
-	map<h256, string> const& _smtlib2Responses,
+	std::map<h256, std::string> const& _smtlib2Responses,
 	ReadCallback::Callback const& _smtCallback,
 	ModelCheckerSettings _settings,
 	CharStreamProvider const& _charStreamProvider
 ):
 	SMTEncoder(_context, _settings, _errorReporter, _unsupportedErrorReporter, _charStreamProvider),
-	m_interface(make_unique<smtutil::SMTPortfolio>(
+	m_interface(std::make_unique<smtutil::SMTPortfolio>(
 		_smtlib2Responses, _smtCallback, _settings.solvers, _settings.timeout, _settings.printQuery
 	))
 {
@@ -65,7 +64,7 @@ BMC::BMC(
 #endif
 }
 
-void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<VerificationTargetType>, smt::EncodingContext::IdCompare> _solvedTargets)
+void BMC::analyze(SourceUnit const& _source, std::map<ASTNode const*, std::set<VerificationTargetType>, smt::EncodingContext::IdCompare> _solvedTargets)
 {
 	// At this point every enabled solver is available.
 	if (!m_settings.solvers.cvc4 && !m_settings.solvers.smtlib2 && !m_settings.solvers.z3)
@@ -97,7 +96,7 @@ void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<Verificatio
 			2788_error,
 			{},
 			"BMC: " +
-			to_string(m_unprovedAmt) +
+			std::to_string(m_unprovedAmt) +
 			" verification condition(s) could not be proved." +
 			" Enable the model checker option \"show unproved\" to see all of them." +
 			" Consider choosing a specific contract to be verified in order to reduce the solving problems." +
@@ -108,7 +107,7 @@ void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<Verificatio
 		m_errorReporter.info(
 			6002_error,
 			"BMC: " +
-			to_string(m_safeTargets.size()) +
+			std::to_string(m_safeTargets.size()) +
 			" verification condition(s) proved safe!" +
 			" Enable the model checker option \"show proved safe\" to see all of them."
 		);
@@ -138,7 +137,7 @@ void BMC::analyze(SourceUnit const& _source, map<ASTNode const*, set<Verificatio
 			"BMC analysis was not possible. No SMT solver (Z3 or CVC4) was available."
 			" None of the installed solvers was enabled."
 #ifdef HAVE_Z3_DLOPEN
-			" Install libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION) + " to enable Z3."
+			" Install libz3.so." + std::to_string(Z3_MAJOR_VERSION) + "." + std::to_string(Z3_MINOR_VERSION) + " to enable Z3."
 #endif
 		);
 }
@@ -504,11 +503,11 @@ bool BMC::visit(TryStatement const& _tryStatement)
 	if (_tryStatement.successClause()->parameters())
 		expressionToTupleAssignment(_tryStatement.successClause()->parameters()->parameters(), *externalCall);
 
-	smtutil::Expression clauseId = m_context.newVariable("clause_choice_" + to_string(m_context.newUniqueId()), smtutil::SortProvider::uintSort);
+	smtutil::Expression clauseId = m_context.newVariable("clause_choice_" + std::to_string(m_context.newUniqueId()), smtutil::SortProvider::uintSort);
 	auto const& clauses = _tryStatement.clauses();
 	m_context.addAssertion(clauseId >= 0 && clauseId < clauses.size());
 	solAssert(clauses[0].get() == _tryStatement.successClause(), "First clause of TryStatement should be the success clause");
-	vector<pair<VariableIndices, smtutil::Expression>> clausesVisitResults;
+	std::vector<std::pair<VariableIndices, smtutil::Expression>> clausesVisitResults;
 	for (size_t i = 0; i < clauses.size(); ++i)
 		clausesVisitResults.push_back(visitBranch(clauses[i].get()));
 
@@ -736,7 +735,7 @@ void BMC::internalOrExternalFunctionCall(FunctionCall const& _funCall)
 	}
 }
 
-pair<smtutil::Expression, smtutil::Expression> BMC::arithmeticOperation(
+std::pair<smtutil::Expression, smtutil::Expression> BMC::arithmeticOperation(
 	Token _op,
 	smtutil::Expression const& _left,
 	smtutil::Expression const& _right,
@@ -800,10 +799,10 @@ void BMC::reset()
 	m_loopExecutionHappened = false;
 }
 
-pair<vector<smtutil::Expression>, vector<string>> BMC::modelExpressions()
+std::pair<std::vector<smtutil::Expression>, std::vector<std::string>> BMC::modelExpressions()
 {
-	vector<smtutil::Expression> expressionsToEvaluate;
-	vector<string> expressionNames;
+	std::vector<smtutil::Expression> expressionsToEvaluate;
+	std::vector<std::string> expressionNames;
 	for (auto const& var: m_context.variables())
 		if (var.first->type()->isValueType())
 		{
@@ -826,7 +825,7 @@ pair<vector<smtutil::Expression>, vector<string>> BMC::modelExpressions()
 		if (uf->annotation().type->isValueType())
 		{
 			expressionsToEvaluate.emplace_back(expr(*uf));
-			string expressionName;
+			std::string expressionName;
 			if (uf->location().hasText())
 				expressionName = m_charStreamProvider.charStream(*uf->location().sourceName).text(
 					uf->location()
@@ -839,7 +838,7 @@ pair<vector<smtutil::Expression>, vector<string>> BMC::modelExpressions()
 
 /// Verification targets.
 
-string BMC::targetDescription(BMCVerificationTarget const& _target)
+std::string BMC::targetDescription(BMCVerificationTarget const& _target)
 {
 	if (
 		_target.type == VerificationTargetType::Underflow ||
@@ -1065,20 +1064,20 @@ void BMC::addVerificationTarget(
 void BMC::checkCondition(
 	BMCVerificationTarget const& _target,
 	smtutil::Expression _condition,
-	vector<SMTEncoder::CallStackEntry> const& _callStack,
-	pair<vector<smtutil::Expression>, vector<string>> const& _modelExpressions,
+	std::vector<SMTEncoder::CallStackEntry> const& _callStack,
+	std::pair<std::vector<smtutil::Expression>, std::vector<std::string>> const& _modelExpressions,
 	SourceLocation const& _location,
 	ErrorId _errorHappens,
 	ErrorId _errorMightHappen,
-	string const& _additionalValueName,
+	std::string const& _additionalValueName,
 	smtutil::Expression const* _additionalValue
 )
 {
 	m_interface->push();
 	m_interface->addAssertion(_condition);
 
-	vector<smtutil::Expression> expressionsToEvaluate;
-	vector<string> expressionNames;
+	std::vector<smtutil::Expression> expressionsToEvaluate;
+	std::vector<std::string> expressionNames;
 	tie(expressionsToEvaluate, expressionNames) = _modelExpressions;
 	if (!_callStack.empty())
 		if (_additionalValue)
@@ -1087,10 +1086,10 @@ void BMC::checkCondition(
 			expressionNames.push_back(_additionalValueName);
 		}
 	smtutil::CheckResult result;
-	vector<string> values;
+	std::vector<std::string> values;
 	tie(result, values) = checkSatisfiableAndGenerateModel(expressionsToEvaluate);
 
-	string extraComment = SMTEncoder::extraComment();
+	std::string extraComment = SMTEncoder::extraComment();
 	if (m_loopExecutionHappened)
 		extraComment +=
 			"False negatives are possible when unrolling loops.\n"
@@ -1119,7 +1118,7 @@ void BMC::checkCondition(
 		if (values.size() == expressionNames.size())
 		{
 			modelMessage << "Counterexample:\n";
-			map<string, string> sortedModel;
+			std::map<std::string, std::string> sortedModel;
 			for (size_t i = 0; i < values.size(); ++i)
 				if (expressionsToEvaluate.at(i).name != values.at(i))
 					sortedModel[expressionNames.at(i)] = values.at(i);
@@ -1165,7 +1164,7 @@ void BMC::checkBooleanNotConstant(
 	Expression const& _condition,
 	smtutil::Expression const& _constraints,
 	smtutil::Expression const& _value,
-	vector<SMTEncoder::CallStackEntry> const& _callStack
+	std::vector<SMTEncoder::CallStackEntry> const& _callStack
 )
 {
 	// Do not check for const-ness if this is a constant.
@@ -1198,7 +1197,7 @@ void BMC::checkBooleanNotConstant(
 		m_errorReporter.warning(2512_error, _condition.location(), "BMC: Condition unreachable.", SMTEncoder::callStackMessage(_callStack));
 	else
 	{
-		string description;
+		std::string description;
 		if (positiveResult == smtutil::CheckResult::SATISFIABLE)
 		{
 			solAssert(negatedResult == smtutil::CheckResult::UNSATISFIABLE, "");
@@ -1219,17 +1218,17 @@ void BMC::checkBooleanNotConstant(
 	}
 }
 
-pair<smtutil::CheckResult, vector<string>>
-BMC::checkSatisfiableAndGenerateModel(vector<smtutil::Expression> const& _expressionsToEvaluate)
+std::pair<smtutil::CheckResult, std::vector<std::string>>
+BMC::checkSatisfiableAndGenerateModel(std::vector<smtutil::Expression> const& _expressionsToEvaluate)
 {
 	smtutil::CheckResult result;
-	vector<string> values;
+	std::vector<std::string> values;
 	try
 	{
 		if (m_settings.printQuery)
 		{
 			auto portfolio = dynamic_cast<smtutil::SMTPortfolio*>(m_interface.get());
-			string smtlibCode = portfolio->dumpQuery(_expressionsToEvaluate);
+			std::string smtlibCode = portfolio->dumpQuery(_expressionsToEvaluate);
 			m_errorReporter.info(
 				6240_error,
 				"BMC: Requested query:\n" + smtlibCode
@@ -1239,14 +1238,14 @@ BMC::checkSatisfiableAndGenerateModel(vector<smtutil::Expression> const& _expres
 	}
 	catch (smtutil::SolverError const& _e)
 	{
-		string description("BMC: Error querying SMT solver");
+		std::string description("BMC: Error querying SMT solver");
 		if (_e.comment())
 			description += ": " + *_e.comment();
 		m_errorReporter.warning(8140_error, description);
 		result = smtutil::CheckResult::ERROR;
 	}
 
-	for (string& value: values)
+	for (std::string& value: values)
 	{
 		try
 		{
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 30c3bb0e98..a803f87d0a 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -51,7 +51,6 @@
 #include <charconv>
 #include <queue>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -63,7 +62,7 @@ CHC::CHC(
 	EncodingContext& _context,
 	UniqueErrorReporter& _errorReporter,
 	UniqueErrorReporter& _unsupportedErrorReporter,
-	map<util::h256, string> const& _smtlib2Responses,
+	std::map<util::h256, std::string> const& _smtlib2Responses,
 	ReadCallback::Callback const& _smtCallback,
 	ModelCheckerSettings _settings,
 	CharStreamProvider const& _charStreamProvider
@@ -130,7 +129,7 @@ void CHC::analyze(SourceUnit const& _source)
 		);
 }
 
-vector<string> CHC::unhandledQueries() const
+std::vector<std::string> CHC::unhandledQueries() const
 {
 	if (auto smtlib2 = dynamic_cast<CHCSmtLib2Interface const*>(m_interface.get()))
 		return smtlib2->unhandledQueries();
@@ -213,7 +212,7 @@ void CHC::endVisit(ContractDefinition const& _contract)
 			auto baseConstructor = base->constructor();
 			if (baseConstructor && baseArgs.count(base))
 			{
-				vector<ASTPointer<Expression>> const& args = baseArgs.at(base);
+				std::vector<ASTPointer<Expression>> const& args = baseArgs.at(base);
 				auto const& params = baseConstructor->parameters();
 				solAssert(params.size() == args.size(), "");
 				for (unsigned i = 0; i < params.size(); ++i)
@@ -280,7 +279,7 @@ bool CHC::visit(FunctionDefinition const& _function)
 			conj = conj && currentEqualInitialVarsConstraints(stateVariablesIncludingInheritedAndPrivate(_function));
 
 		conj = conj && errorFlag().currentValue() == 0;
-		addRule(smtutil::Expression::implies(conj, summary(_function)), "summary_function_" + to_string(_function.id()));
+		addRule(smtutil::Expression::implies(conj, summary(_function)), "summary_function_" + std::to_string(_function.id()));
 		return false;
 	}
 
@@ -433,7 +432,7 @@ bool CHC::visit(WhileStatement const& _while)
 	solAssert(m_currentFunction, "");
 	auto const& functionBody = m_currentFunction->body();
 
-	auto namePrefix = string(_while.isDoWhile() ? "do_" : "") + "while";
+	auto namePrefix = std::string(_while.isDoWhile() ? "do_" : "") + "while";
 	auto loopHeaderBlock = createBlock(&_while, PredicateType::FunctionBlock, namePrefix + "_header_");
 	auto loopBodyBlock = createBlock(&_while.body(), PredicateType::FunctionBlock, namePrefix + "_body_");
 	auto afterLoopBlock = createBlock(&functionBody, PredicateType::FunctionBlock);
@@ -622,8 +621,8 @@ void CHC::endVisit(IndexRangeAccess const& _range)
 {
 	createExpr(_range);
 
-	auto baseArray = dynamic_pointer_cast<SymbolicArrayVariable>(m_context.expression(_range.baseExpression()));
-	auto sliceArray = dynamic_pointer_cast<SymbolicArrayVariable>(m_context.expression(_range));
+	auto baseArray = std::dynamic_pointer_cast<SymbolicArrayVariable>(m_context.expression(_range.baseExpression()));
+	auto sliceArray = std::dynamic_pointer_cast<SymbolicArrayVariable>(m_context.expression(_range));
 	solAssert(baseArray && sliceArray, "");
 
 	auto const& sliceData = ArraySlicePredicate::create(sliceArray->sort(), m_context);
@@ -864,7 +863,7 @@ void CHC::nondetCall(ContractDefinition const& _contract, VariableDeclaration co
 	state().readStateVars(_contract, address);
 
 	m_context.addAssertion(state().state() == state().state(0));
-	auto preCallState = vector<smtutil::Expression>{state().state()} + currentStateVariables(_contract);
+	auto preCallState = std::vector<smtutil::Expression>{state().state()} + currentStateVariables(_contract);
 
 	state().newState();
 	for (auto const* var: _contract.stateVariables())
@@ -879,8 +878,8 @@ void CHC::nondetCall(ContractDefinition const& _contract, VariableDeclaration co
 		&_var,
 		m_currentContract
 	);
-	auto postCallState = vector<smtutil::Expression>{state().state()} + currentStateVariables(_contract);
-	vector<smtutil::Expression> stateExprs{error, address, state().abi(), state().crypto()};
+	auto postCallState = std::vector<smtutil::Expression>{state().state()} + currentStateVariables(_contract);
+	std::vector<smtutil::Expression> stateExprs{error, address, state().abi(), state().crypto()};
 
 	auto nondet = (*m_nondetInterfaces.at(&_contract))(stateExprs + preCallState + postCallState);
 	auto nondetCall = callPredicate(stateExprs + preCallState + postCallState);
@@ -945,7 +944,7 @@ void CHC::externalFunctionCall(FunctionCall const& _funCall)
 	if (Expression const* value = valueOption(callOptions))
 		decreaseBalanceFromOptionsValue(*value);
 
-	auto preCallState = vector<smtutil::Expression>{state().state()} + currentStateVariables();
+	auto preCallState = std::vector<smtutil::Expression>{state().state()} + currentStateVariables();
 
 	if (!usesStaticCall(_funCall))
 	{
@@ -962,8 +961,8 @@ void CHC::externalFunctionCall(FunctionCall const& _funCall)
 		PredicateType::ExternalCallUntrusted,
 		&_funCall
 	);
-	auto postCallState = vector<smtutil::Expression>{state().state()} + currentStateVariables();
-	vector<smtutil::Expression> stateExprs{error, state().thisAddress(), state().abi(), state().crypto()};
+	auto postCallState = std::vector<smtutil::Expression>{state().state()} + currentStateVariables();
+	std::vector<smtutil::Expression> stateExprs{error, state().thisAddress(), state().abi(), state().crypto()};
 
 	auto nondet = (*m_nondetInterfaces.at(m_currentContract))(stateExprs + preCallState + postCallState);
 	auto nondetCall = callPredicate(stateExprs + preCallState + postCallState);
@@ -1076,7 +1075,7 @@ void CHC::makeArrayPopVerificationTarget(FunctionCall const& _arrayPop)
 
 	auto memberAccess = dynamic_cast<MemberAccess const*>(cleanExpression(_arrayPop.expression()));
 	solAssert(memberAccess, "");
-	auto symbArray = dynamic_pointer_cast<SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
+	auto symbArray = std::dynamic_pointer_cast<SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
 	solAssert(symbArray, "");
 
 	verificationTargetEncountered(&_arrayPop, VerificationTargetType::PopEmptyArray, symbArray->length() <= 0);
@@ -1089,7 +1088,7 @@ void CHC::makeOutOfBoundsVerificationTarget(IndexAccess const& _indexAccess)
 
 	auto baseType = _indexAccess.baseExpression().annotation().type;
 
-	optional<smtutil::Expression> length;
+	std::optional<smtutil::Expression> length;
 	if (smt::isArray(*baseType))
 		length = dynamic_cast<smt::SymbolicArrayVariable const&>(
 			*m_context.expression(_indexAccess.baseExpression())
@@ -1097,7 +1096,7 @@ void CHC::makeOutOfBoundsVerificationTarget(IndexAccess const& _indexAccess)
 	else if (auto const* type = dynamic_cast<FixedBytesType const*>(baseType))
 		length = smtutil::Expression(static_cast<size_t>(type->numBytes()));
 
-	optional<smtutil::Expression> target;
+	std::optional<smtutil::Expression> target;
 	if (
 		auto index = _indexAccess.indexExpression();
 		index && length
@@ -1108,7 +1107,7 @@ void CHC::makeOutOfBoundsVerificationTarget(IndexAccess const& _indexAccess)
 		verificationTargetEncountered(&_indexAccess, VerificationTargetType::OutOfBounds, *target);
 }
 
-pair<smtutil::Expression, smtutil::Expression> CHC::arithmeticOperation(
+std::pair<smtutil::Expression, smtutil::Expression> CHC::arithmeticOperation(
 	Token _op,
 	smtutil::Expression const& _left,
 	smtutil::Expression const& _right,
@@ -1192,7 +1191,7 @@ void CHC::resetSourceAnalysis()
 		solAssert(m_settings.solvers.smtlib2 || m_settings.solvers.eld);
 
 		if (!m_interface)
-			m_interface = make_unique<CHCSmtLib2Interface>(m_smtlib2Responses, m_smtCallback, m_settings.solvers, m_settings.timeout);
+			m_interface = std::make_unique<CHCSmtLib2Interface>(m_smtlib2Responses, m_smtCallback, m_settings.solvers, m_settings.timeout);
 
 		auto smtlib2Interface = dynamic_cast<CHCSmtLib2Interface*>(m_interface.get());
 		solAssert(smtlib2Interface, "");
@@ -1249,9 +1248,9 @@ void CHC::setCurrentBlock(Predicate const& _block)
 	m_currentBlock = predicate(_block);
 }
 
-set<unsigned> CHC::transactionVerificationTargetsIds(ASTNode const* _txRoot)
+std::set<unsigned> CHC::transactionVerificationTargetsIds(ASTNode const* _txRoot)
 {
-	set<unsigned> verificationTargetsIds;
+	std::set<unsigned> verificationTargetsIds;
 	struct ASTNodeCompare: EncodingContext::IdCompare
 	{
 		bool operator<(ASTNodeCompare _other) const { return operator()(node, _other.node); }
@@ -1273,9 +1272,9 @@ bool CHC::usesStaticCall(FunctionCall const& _funCall)
 	return (function && (function->stateMutability() == StateMutability::Pure || function->stateMutability() == StateMutability::View)) || kind == FunctionType::Kind::BareStaticCall;
 }
 
-optional<CHC::CHCNatspecOption> CHC::natspecOptionFromString(string const& _option)
+std::optional<CHC::CHCNatspecOption> CHC::natspecOptionFromString(std::string const& _option)
 {
-	static map<string, CHCNatspecOption> options{
+	static std::map<std::string, CHCNatspecOption> options{
 		{"abstract-function-nondet", CHCNatspecOption::AbstractFunctionNondet}
 	};
 	if (options.count(_option))
@@ -1283,15 +1282,15 @@ optional<CHC::CHCNatspecOption> CHC::natspecOptionFromString(string const& _opti
 	return {};
 }
 
-set<CHC::CHCNatspecOption> CHC::smtNatspecTags(FunctionDefinition const& _function)
+std::set<CHC::CHCNatspecOption> CHC::smtNatspecTags(FunctionDefinition const& _function)
 {
-	set<CHC::CHCNatspecOption> options;
-	string smtStr = "custom:smtchecker";
+	std::set<CHC::CHCNatspecOption> options;
+	std::string smtStr = "custom:smtchecker";
 	bool errorSeen = false;
 	for (auto const& [tag, value]: _function.annotation().docTags)
 		if (tag == smtStr)
 		{
-			string const& content = value.content;
+			std::string const& content = value.content;
 			if (auto option = natspecOptionFromString(content))
 				options.insert(*option);
 			else if (!errorSeen)
@@ -1327,7 +1326,7 @@ SortPointer CHC::sort(ASTNode const* _node)
 	return functionBodySort(*m_currentFunction, m_currentContract, state());
 }
 
-Predicate const* CHC::createSymbolicBlock(SortPointer _sort, string const& _name, PredicateType _predType, ASTNode const* _node, ContractDefinition const* _contractContext)
+Predicate const* CHC::createSymbolicBlock(SortPointer _sort, std::string const& _name, PredicateType _predType, ASTNode const* _node, ContractDefinition const* _contractContext)
 {
 	auto const* block = Predicate::create(_sort, _name, _predType, m_context, _node, _contractContext, m_scopes);
 	m_interface->registerRelation(block->functor());
@@ -1339,7 +1338,7 @@ void CHC::defineInterfacesAndSummaries(SourceUnit const& _source)
 	for (auto const& node: _source.nodes())
 		if (auto const* contract = dynamic_cast<ContractDefinition const*>(node.get()))
 		{
-			string suffix = contract->name() + "_" + to_string(contract->id());
+			std::string suffix = contract->name() + "_" + std::to_string(contract->id());
 			m_interfaces[contract] = createSymbolicBlock(interfaceSort(*contract, state()), "interface_" + uniquePrefix() + "_" + suffix, PredicateType::Interface, contract, contract);
 			m_nondetInterfaces[contract] = createSymbolicBlock(nondetInterfaceSort(*contract, state()), "nondet_interface_" + uniquePrefix() + "_" + suffix, PredicateType::NondetInterface, contract, contract);
 			m_constructorSummaries[contract] = createConstructorBlock(*contract, "summary_constructor");
@@ -1385,10 +1384,10 @@ void CHC::defineInterfacesAndSummaries(SourceUnit const& _source)
 					auto errorPost = errorFlag().increaseIndex();
 					auto nondetPost = smt::nondetInterface(iface, *contract, m_context, 0, 2);
 
-					vector<smtutil::Expression> args{errorPost, state().thisAddress(), state().abi(), state().crypto(), state().tx(), state().state(1)};
+					std::vector<smtutil::Expression> args{errorPost, state().thisAddress(), state().abi(), state().crypto(), state().tx(), state().state(1)};
 					args += state1 +
 						applyMap(function->parameters(), [this](auto _var) { return valueAtIndex(*_var, 0); }) +
-						vector<smtutil::Expression>{state().state(2)} +
+						std::vector<smtutil::Expression>{state().state(2)} +
 						state2 +
 						applyMap(function->parameters(), [this](auto _var) { return valueAtIndex(*_var, 1); }) +
 						applyMap(function->returnParameters(), [this](auto _var) { return valueAtIndex(*_var, 1); });
@@ -1416,7 +1415,7 @@ void CHC::defineExternalFunctionInterface(FunctionDefinition const& _function, C
 	// block.coinbase, which do not trigger calls into the contract.
 	// So the only constraint we can add here is that the balance of
 	// the contract grows by at least `msg.value`.
-	SymbolicIntVariable k{TypeProvider::uint256(), TypeProvider::uint256(), "funds_" + to_string(m_context.newUniqueId()), m_context};
+	SymbolicIntVariable k{TypeProvider::uint256(), TypeProvider::uint256(), "funds_" + std::to_string(m_context.newUniqueId()), m_context};
 	m_context.addAssertion(k.currentValue() >= state().txMember("msg.value"));
 	// Assume that address(this).balance cannot overflow.
 	m_context.addAssertion(smt::symbolicUnknownConstraints(state().balance(state().thisAddress()) + k.currentValue(), TypeProvider::uint256()));
@@ -1582,7 +1581,7 @@ smtutil::Expression CHC::externalSummary(FunctionDefinition const& _function)
 	return externalSummary(_function, *m_currentContract);
 }
 
-Predicate const* CHC::createBlock(ASTNode const* _node, PredicateType _predType, string const& _prefix)
+Predicate const* CHC::createBlock(ASTNode const* _node, PredicateType _predType, std::string const& _prefix)
 {
 	auto block = createSymbolicBlock(
 		sort(_node),
@@ -1607,7 +1606,7 @@ Predicate const* CHC::createSummaryBlock(FunctionDefinition const& _function, Co
 	);
 }
 
-Predicate const* CHC::createConstructorBlock(ContractDefinition const& _contract, string const& _prefix)
+Predicate const* CHC::createConstructorBlock(ContractDefinition const& _contract, std::string const& _prefix)
 {
 	return createSymbolicBlock(
 		constructorSort(_contract, state()),
@@ -1622,7 +1621,7 @@ void CHC::createErrorBlock()
 {
 	m_errorPredicate = createSymbolicBlock(
 		arity0FunctionSort(),
-		"error_target_" + to_string(m_context.newUniqueId()),
+		"error_target_" + std::to_string(m_context.newUniqueId()),
 		PredicateType::Error
 	);
 	m_interface->registerRelation(m_errorPredicate->functor());
@@ -1650,18 +1649,18 @@ smtutil::Expression CHC::initialConstraints(ContractDefinition const& _contract,
 	return conj;
 }
 
-vector<smtutil::Expression> CHC::initialStateVariables()
+std::vector<smtutil::Expression> CHC::initialStateVariables()
 {
 	return stateVariablesAtIndex(0);
 }
 
-vector<smtutil::Expression> CHC::stateVariablesAtIndex(unsigned _index)
+std::vector<smtutil::Expression> CHC::stateVariablesAtIndex(unsigned _index)
 {
 	solAssert(m_currentContract, "");
 	return stateVariablesAtIndex(_index, *m_currentContract);
 }
 
-vector<smtutil::Expression> CHC::stateVariablesAtIndex(unsigned _index, ContractDefinition const& _contract)
+std::vector<smtutil::Expression> CHC::stateVariablesAtIndex(unsigned _index, ContractDefinition const& _contract)
 {
 	return applyMap(
 		SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract),
@@ -1669,27 +1668,27 @@ vector<smtutil::Expression> CHC::stateVariablesAtIndex(unsigned _index, Contract
 	);
 }
 
-vector<smtutil::Expression> CHC::currentStateVariables()
+std::vector<smtutil::Expression> CHC::currentStateVariables()
 {
 	solAssert(m_currentContract, "");
 	return currentStateVariables(*m_currentContract);
 }
 
-vector<smtutil::Expression> CHC::currentStateVariables(ContractDefinition const& _contract)
+std::vector<smtutil::Expression> CHC::currentStateVariables(ContractDefinition const& _contract)
 {
 	return applyMap(SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract), [this](auto _var) { return currentValue(*_var); });
 }
 
-smtutil::Expression CHC::currentEqualInitialVarsConstraints(vector<VariableDeclaration const*> const& _vars) const
+smtutil::Expression CHC::currentEqualInitialVarsConstraints(std::vector<VariableDeclaration const*> const& _vars) const
 {
 	return fold(_vars, smtutil::Expression(true), [this](auto&& _conj, auto _var) {
 		return std::move(_conj) && currentValue(*_var) == m_context.variable(*_var)->valueAtIndex(0);
 	});
 }
 
-string CHC::predicateName(ASTNode const* _node, ContractDefinition const* _contract)
+std::string CHC::predicateName(ASTNode const* _node, ContractDefinition const* _contract)
 {
-	string prefix;
+	std::string prefix;
 	if (auto funDef = dynamic_cast<FunctionDefinition const*>(_node))
 	{
 		prefix += TokenTraits::toString(funDef->kind());
@@ -1701,7 +1700,7 @@ string CHC::predicateName(ASTNode const* _node, ContractDefinition const* _contr
 
 	auto contract = _contract ? _contract : m_currentContract;
 	solAssert(contract, "");
-	return prefix + "_" + to_string(_node->id()) + "_" + to_string(contract->id());
+	return prefix + "_" + std::to_string(_node->id()) + "_" + std::to_string(contract->id());
 }
 
 smtutil::Expression CHC::predicate(Predicate const& _block)
@@ -1756,7 +1755,7 @@ smtutil::Expression CHC::predicate(FunctionCall const& _funCall)
 		solAssert(false, "Unreachable!");
 	};
 	errorFlag().increaseIndex();
-	vector<smtutil::Expression> args{errorFlag().currentValue(), contractAddressValue(_funCall), state().abi(), state().crypto(), state().tx(), state().state()};
+	std::vector<smtutil::Expression> args{errorFlag().currentValue(), contractAddressValue(_funCall), state().abi(), state().crypto(), state().tx(), state().state()};
 
 	auto const* contract = function->annotation().contract;
 	auto const& hierarchy = m_currentContract->annotation().linearizedBaseContracts;
@@ -1773,7 +1772,7 @@ smtutil::Expression CHC::predicate(FunctionCall const& _funCall)
 		for (auto const& var: stateVariablesIncludingInheritedAndPrivate(*contract))
 			m_context.variable(*var)->increaseIndex();
 	}
-	args += vector<smtutil::Expression>{state().state()};
+	args += std::vector<smtutil::Expression>{state().state()};
 	args += currentStateVariables(*contract);
 
 	for (auto var: function->parameters() + function->returnParameters())
@@ -1798,12 +1797,12 @@ smtutil::Expression CHC::predicate(FunctionCall const& _funCall)
 	return callPredicate(args);
 }
 
-void CHC::addRule(smtutil::Expression const& _rule, string const& _ruleName)
+void CHC::addRule(smtutil::Expression const& _rule, std::string const& _ruleName)
 {
 	m_interface->addRule(_rule, _ruleName);
 }
 
-tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query(smtutil::Expression const& _query, langutil::SourceLocation const& _location)
+std::tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query(smtutil::Expression const& _query, langutil::SourceLocation const& _location)
 {
 	CheckResult result;
 	smtutil::Expression invariant(true);
@@ -1812,13 +1811,13 @@ tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query
 	{
 		auto smtLibInterface = dynamic_cast<CHCSmtLib2Interface*>(m_interface.get());
 		solAssert(smtLibInterface, "Requested to print queries but CHCSmtLib2Interface not available");
-		string smtLibCode = smtLibInterface->dumpQuery(_query);
+		std::string smtLibCode = smtLibInterface->dumpQuery(_query);
 		m_errorReporter.info(
 			2339_error,
 			"CHC: Requested query:\n" + smtLibCode
 		);
 	}
-	tie(result, invariant, cex) = m_interface->query(_query);
+	std::tie(result, invariant, cex) = m_interface->query(_query);
 	switch (result)
 	{
 	case CheckResult::SATISFIABLE:
@@ -1836,7 +1835,7 @@ tuple<CheckResult, smtutil::Expression, CHCSolverInterface::CexGraph> CHC::query
 			CheckResult resultNoOpt;
 			smtutil::Expression invariantNoOpt(true);
 			CHCSolverInterface::CexGraph cexNoOpt;
-			tie(resultNoOpt, invariantNoOpt, cexNoOpt) = m_interface->query(_query);
+			std::tie(resultNoOpt, invariantNoOpt, cexNoOpt) = m_interface->query(_query);
 
 			if (resultNoOpt == CheckResult::SATISFIABLE)
 				cex = std::move(cexNoOpt);
@@ -1902,7 +1901,7 @@ void CHC::verificationTargetEncountered(
 	m_context.addAssertion(errorFlag().currentValue() == previousError);
 }
 
-pair<string, ErrorId> CHC::targetDescription(CHCVerificationTarget const& _target)
+std::pair<std::string, ErrorId> CHC::targetDescription(CHCVerificationTarget const& _target)
 {
 	if (_target.type == VerificationTargetType::PopEmptyArray)
 	{
@@ -1950,7 +1949,7 @@ void CHC::checkVerificationTargets()
 	// Also, all possible contexts in which an external function can be called has been recorded (m_queryPlaceholders).
 	// Here we combine every context in which an external function can be called with all possible verification conditions
 	// in its call graph. Each such combination forms a unique verification target.
-	map<unsigned, vector<CHCQueryPlaceholder>> targetEntryPoints;
+	std::map<unsigned, std::vector<CHCQueryPlaceholder>> targetEntryPoints;
 	for (auto const& [function, placeholders]: m_queryPlaceholders)
 	{
 		auto functionTargets = transactionVerificationTargetsIds(function);
@@ -1959,7 +1958,7 @@ void CHC::checkVerificationTargets()
 				targetEntryPoints[id].push_back(placeholder);
 	}
 
-	set<unsigned> checkedErrorIds;
+	std::set<unsigned> checkedErrorIds;
 	for (auto const& [targetId, placeholders]: targetEntryPoints)
 	{
 		auto const& target = m_verificationTargets.at(targetId);
@@ -1988,7 +1987,7 @@ void CHC::checkVerificationTargets()
 			5840_error,
 			{},
 			"CHC: " +
-			to_string(m_unprovedTargets.size()) +
+			std::to_string(m_unprovedTargets.size()) +
 			" verification condition(s) could not be proved." +
 			" Enable the model checker option \"show unproved\" to see all of them." +
 			" Consider choosing a specific contract to be verified in order to reduce the solving problems." +
@@ -1999,7 +1998,7 @@ void CHC::checkVerificationTargets()
 		m_errorReporter.info(
 			1391_error,
 			"CHC: " +
-			to_string(m_safeTargets.size()) +
+			std::to_string(m_safeTargets.size()) +
 			" verification condition(s) proved safe!" +
 			" Enable the model checker option \"show proved safe\" to see all of them."
 		);
@@ -2016,17 +2015,17 @@ void CHC::checkVerificationTargets()
 
 	if (!m_settings.invariants.invariants.empty())
 	{
-		string msg;
+		std::string msg;
 		for (auto pred: m_invariants | ranges::views::keys)
 		{
 			ASTNode const* node = pred->programNode();
-			string what;
+			std::string what;
 			if (auto contract = dynamic_cast<ContractDefinition const*>(node))
 				what = contract->fullyQualifiedName();
 			else
 				solAssert(false, "");
 
-			string invType;
+			std::string invType;
 			if (pred->type() == PredicateType::Interface)
 				invType = "Contract invariant(s)";
 			else if (pred->type() == PredicateType::NondetInterface)
@@ -2038,16 +2037,16 @@ void CHC::checkVerificationTargets()
 			for (auto const& inv: m_invariants.at(pred))
 				msg += inv + "\n";
 		}
-		if (msg.find("<errorCode>") != string::npos)
+		if (msg.find("<errorCode>") != std::string::npos)
 		{
-			set<unsigned> seenErrors;
+			std::set<unsigned> seenErrors;
 			msg += "<errorCode> = 0 -> no errors\n";
 			for (auto const& [id, target]: m_verificationTargets)
 				if (!seenErrors.count(target.errorId))
 				{
 					seenErrors.insert(target.errorId);
-					string loc = string(m_charStreamProvider.charStream(*target.errorNode->location().sourceName).text(target.errorNode->location()));
-					msg += "<errorCode> = " + to_string(target.errorId) + " -> " + ModelCheckerTargets::targetTypeToString.at(target.type) + " at " + loc + "\n";
+					std::string loc = std::string(m_charStreamProvider.charStream(*target.errorNode->location().sourceName).text(target.errorNode->location()));
+					msg += "<errorCode> = " + std::to_string(target.errorId) + " -> " + ModelCheckerTargets::targetTypeToString.at(target.type) + " at " + loc + "\n";
 
 				}
 		}
@@ -2058,12 +2057,12 @@ void CHC::checkVerificationTargets()
 	// There can be targets in internal functions that are not reachable from the external interface.
 	// These are safe by definition and are not even checked by the CHC engine, but this information
 	// must still be reported safe by the BMC engine.
-	set<unsigned> allErrorIds;
+	std::set<unsigned> allErrorIds;
 	for (auto const& entry: m_functionTargetIds)
 		for (unsigned id: entry.second)
 			allErrorIds.insert(id);
 
-	set<unsigned> unreachableErrorIds;
+	std::set<unsigned> unreachableErrorIds;
 	set_difference(
 		allErrorIds.begin(),
 		allErrorIds.end(),
@@ -2077,10 +2076,10 @@ void CHC::checkVerificationTargets()
 
 void CHC::checkAndReportTarget(
 	CHCVerificationTarget const& _target,
-	vector<CHCQueryPlaceholder> const& _placeholders,
+	std::vector<CHCQueryPlaceholder> const& _placeholders,
 	ErrorId _errorReporterId,
-	string _satMsg,
-	string _unknownMsg
+	std::string _satMsg,
+	std::string _unknownMsg
 )
 {
 	if (m_unsafeTargets.count(_target.errorNode) && m_unsafeTargets.at(_target.errorNode).count(_target.type))
@@ -2098,12 +2097,12 @@ void CHC::checkAndReportTarget(
 	if (result == CheckResult::UNSATISFIABLE)
 	{
 		m_safeTargets[_target.errorNode].insert(_target);
-		set<Predicate const*> predicates;
+		std::set<Predicate const*> predicates;
 		for (auto const* pred: m_interfaces | ranges::views::values)
 			predicates.insert(pred);
 		for (auto const* pred: m_nondetInterfaces | ranges::views::values)
 			predicates.insert(pred);
-		map<Predicate const*, set<string>> invariants = collectInvariants(invariant, predicates, m_settings.invariants);
+		std::map<Predicate const*, std::set<std::string>> invariants = collectInvariants(invariant, predicates, m_settings.invariants);
 		for (auto pred: invariants | ranges::views::keys)
 			m_invariants[pred] += std::move(invariants.at(pred));
 	}
@@ -2153,9 +2152,9 @@ the function summaries in the callgraph of the error node is the reverse transac
 The first function summary seen contains the values for the state, input and output variables at the
 error point.
 */
-optional<string> CHC::generateCounterexample(CHCSolverInterface::CexGraph const& _graph, string const& _root)
+std::optional<std::string> CHC::generateCounterexample(CHCSolverInterface::CexGraph const& _graph, std::string const& _root)
 {
-	optional<unsigned> rootId;
+	std::optional<unsigned> rootId;
 	for (auto const& [id, node]: _graph.nodes)
 		if (node.name == _root)
 		{
@@ -2165,8 +2164,8 @@ optional<string> CHC::generateCounterexample(CHCSolverInterface::CexGraph const&
 	if (!rootId)
 		return {};
 
-	vector<string> path;
-	string localState;
+	std::vector<std::string> path;
+	std::string localState;
 
 	auto callGraph = summaryCalls(_graph, *rootId);
 
@@ -2204,7 +2203,7 @@ optional<string> CHC::generateCounterexample(CHCSolverInterface::CexGraph const&
 					if (auto outStr = formatVariableModel(outParams, outValues, "\n"); !outStr.empty())
 						localState += outStr + "\n";
 
-					optional<unsigned> localErrorId;
+					std::optional<unsigned> localErrorId;
 					solidity::util::BreadthFirstSearch<unsigned> bfs{{summaryId}};
 					bfs.run([&](auto _nodeId, auto&& _addChild) {
 						auto const& children = _graph.edges.at(_nodeId);
@@ -2239,9 +2238,9 @@ optional<string> CHC::generateCounterexample(CHCSolverInterface::CexGraph const&
 			}
 		}
 
-		string txCex = summaryPredicate->formatSummaryCall(summaryArgs, m_charStreamProvider);
+		std::string txCex = summaryPredicate->formatSummaryCall(summaryArgs, m_charStreamProvider);
 
-		list<string> calls;
+		std::list<std::string> calls;
 		auto dfs = [&](unsigned parent, unsigned node, unsigned depth, auto&& _dfs) -> void {
 			auto pred = nodePred(node);
 			auto parentPred = nodePred(parent);
@@ -2254,7 +2253,7 @@ optional<string> CHC::generateCounterexample(CHCSolverInterface::CexGraph const&
 
 			bool appendTxVars = pred->isConstructorSummary() || pred->isFunctionSummary() || pred->isExternalCallUntrusted();
 
-			calls.push_front(string(depth * 4, ' ') + pred->formatSummaryCall(nodeArgs(node), m_charStreamProvider, appendTxVars));
+			calls.push_front(std::string(depth * 4, ' ') + pred->formatSummaryCall(nodeArgs(node), m_charStreamProvider, appendTxVars));
 			if (pred->isInternalCall())
 				calls.front() += " -- internal call";
 			else if (pred->isExternalCallTrusted())
@@ -2281,12 +2280,12 @@ optional<string> CHC::generateCounterexample(CHCSolverInterface::CexGraph const&
 	return localState + "\nTransaction trace:\n" + boost::algorithm::join(path | ranges::views::reverse, "\n");
 }
 
-map<unsigned, vector<unsigned>> CHC::summaryCalls(CHCSolverInterface::CexGraph const& _graph, unsigned _root)
+std::map<unsigned, std::vector<unsigned>> CHC::summaryCalls(CHCSolverInterface::CexGraph const& _graph, unsigned _root)
 {
-	map<unsigned, vector<unsigned>> calls;
+	std::map<unsigned, std::vector<unsigned>> calls;
 
 	auto compare = [&](unsigned _a, unsigned _b) {
-		auto extract = [&](string const& _s) {
+		auto extract = [&](std::string const& _s) {
 			// We want to sort sibling predicates in the counterexample graph by their unique predicate id.
 			// For most predicates, this actually doesn't matter.
 			// The cases where this matters are internal and external function calls which have the form:
@@ -2312,7 +2311,7 @@ map<unsigned, vector<unsigned>> CHC::summaryCalls(CHCSolverInterface::CexGraph c
 		return extract(_graph.nodes.at(_a).name) > extract(_graph.nodes.at(_b).name);
 	};
 
-	queue<pair<unsigned, unsigned>> q;
+	std::queue<std::pair<unsigned, unsigned>> q;
 	q.push({_root, _root});
 	while (!q.empty())
 	{
@@ -2334,19 +2333,19 @@ map<unsigned, vector<unsigned>> CHC::summaryCalls(CHCSolverInterface::CexGraph c
 			root = node;
 		}
 		auto const& edges = _graph.edges.at(node);
-		for (unsigned v: set<unsigned, decltype(compare)>(begin(edges), end(edges), compare))
+		for (unsigned v: std::set<unsigned, decltype(compare)>(begin(edges), end(edges), compare))
 			q.push({v, root});
 	}
 
 	return calls;
 }
 
-string CHC::cex2dot(CHCSolverInterface::CexGraph const& _cex)
+std::string CHC::cex2dot(CHCSolverInterface::CexGraph const& _cex)
 {
-	string dot = "digraph {\n";
+	std::string dot = "digraph {\n";
 
 	auto pred = [&](CHCSolverInterface::CexNode const& _node) {
-		vector<string> args = applyMap(
+		std::vector<std::string> args = applyMap(
 			_node.arguments,
 			[&](auto const& arg) { return arg.name; }
 		);
@@ -2361,14 +2360,14 @@ string CHC::cex2dot(CHCSolverInterface::CexGraph const& _cex)
 	return dot;
 }
 
-string CHC::uniquePrefix()
+std::string CHC::uniquePrefix()
 {
-	return to_string(m_blockCounter++);
+	return std::to_string(m_blockCounter++);
 }
 
-string CHC::contractSuffix(ContractDefinition const& _contract)
+std::string CHC::contractSuffix(ContractDefinition const& _contract)
 {
-	return _contract.name() + "_" + to_string(_contract.id());
+	return _contract.name() + "_" + std::to_string(_contract.id());
 }
 
 unsigned CHC::newErrorId()
diff --git a/libsolidity/formal/EncodingContext.cpp b/libsolidity/formal/EncodingContext.cpp
index 2000efd07e..e0a09bcf7b 100644
--- a/libsolidity/formal/EncodingContext.cpp
+++ b/libsolidity/formal/EncodingContext.cpp
@@ -20,7 +20,6 @@
 
 #include <libsolidity/formal/SymbolicTypes.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend::smt;
@@ -51,7 +50,7 @@ unsigned EncodingContext::newUniqueId()
 
 /// Variables.
 
-shared_ptr<SymbolicVariable> EncodingContext::variable(frontend::VariableDeclaration const& _varDecl)
+std::shared_ptr<SymbolicVariable> EncodingContext::variable(frontend::VariableDeclaration const& _varDecl)
 {
 	solAssert(knownVariable(_varDecl), "");
 	return m_variables[&_varDecl];
@@ -61,7 +60,7 @@ bool EncodingContext::createVariable(frontend::VariableDeclaration const& _varDe
 {
 	solAssert(!knownVariable(_varDecl), "");
 	auto const& type = _varDecl.type();
-	auto result = newSymbolicVariable(*type, _varDecl.name() + "_" + to_string(_varDecl.id()), *this);
+	auto result = newSymbolicVariable(*type, _varDecl.name() + "_" + std::to_string(_varDecl.id()), *this);
 	m_variables.emplace(&_varDecl, result.second);
 	return result.first;
 }
@@ -77,13 +76,13 @@ void EncodingContext::resetVariable(frontend::VariableDeclaration const& _variab
 	setUnknownValue(_variable);
 }
 
-void EncodingContext::resetVariables(set<frontend::VariableDeclaration const*> const& _variables)
+void EncodingContext::resetVariables(std::set<frontend::VariableDeclaration const*> const& _variables)
 {
 	for (auto const* decl: _variables)
 		resetVariable(*decl);
 }
 
-void EncodingContext::resetVariables(function<bool(frontend::VariableDeclaration const&)> const& _filter)
+void EncodingContext::resetVariables(std::function<bool(frontend::VariableDeclaration const&)> const& _filter)
 {
 	for_each(begin(m_variables), end(m_variables), [&](auto _variable)
 	{
@@ -127,14 +126,14 @@ void EncodingContext::setUnknownValue(SymbolicVariable& _variable)
 
 /// Expressions
 
-shared_ptr<SymbolicVariable> EncodingContext::expression(frontend::Expression const& _e)
+std::shared_ptr<SymbolicVariable> EncodingContext::expression(frontend::Expression const& _e)
 {
 	if (!knownExpression(_e))
 		createExpression(_e);
 	return m_expressions.at(&_e);
 }
 
-bool EncodingContext::createExpression(frontend::Expression const& _e, shared_ptr<SymbolicVariable> _symbVar)
+bool EncodingContext::createExpression(frontend::Expression const& _e, std::shared_ptr<SymbolicVariable> _symbVar)
 {
 	solAssert(_e.annotation().type, "");
 	if (knownExpression(_e))
@@ -149,7 +148,7 @@ bool EncodingContext::createExpression(frontend::Expression const& _e, shared_pt
 	}
 	else
 	{
-		auto result = newSymbolicVariable(*_e.annotation().type, "expr_" + to_string(_e.id()), *this);
+		auto result = newSymbolicVariable(*_e.annotation().type, "expr_" + std::to_string(_e.id()), *this);
 		m_expressions.emplace(&_e, result.second);
 		return result.first;
 	}
@@ -162,13 +161,13 @@ bool EncodingContext::knownExpression(frontend::Expression const& _e) const
 
 /// Global variables and functions.
 
-shared_ptr<SymbolicVariable> EncodingContext::globalSymbol(string const& _name)
+std::shared_ptr<SymbolicVariable> EncodingContext::globalSymbol(std::string const& _name)
 {
 	solAssert(knownGlobalSymbol(_name), "");
 	return m_globalContext.at(_name);
 }
 
-bool EncodingContext::createGlobalSymbol(string const& _name, frontend::Expression const& _expr)
+bool EncodingContext::createGlobalSymbol(std::string const& _name, frontend::Expression const& _expr)
 {
 	solAssert(!knownGlobalSymbol(_name), "");
 	auto result = newSymbolicVariable(*_expr.annotation().type, _name, *this);
@@ -177,7 +176,7 @@ bool EncodingContext::createGlobalSymbol(string const& _name, frontend::Expressi
 	return result.first;
 }
 
-bool EncodingContext::knownGlobalSymbol(string const& _var) const
+bool EncodingContext::knownGlobalSymbol(std::string const& _var) const
 {
 	return m_globalContext.count(_var);
 }
diff --git a/libsolidity/formal/ExpressionFormatter.cpp b/libsolidity/formal/ExpressionFormatter.cpp
index 2591328f84..cf2f2c3b81 100644
--- a/libsolidity/formal/ExpressionFormatter.cpp
+++ b/libsolidity/formal/ExpressionFormatter.cpp
@@ -29,7 +29,6 @@
 #include <vector>
 #include <string>
 
-using namespace std;
 using boost::algorithm::starts_with;
 using namespace solidity;
 using namespace solidity::util;
@@ -42,7 +41,7 @@ namespace solidity::frontend::smt
 namespace
 {
 
-string formatDatatypeAccessor(smtutil::Expression const& _expr, vector<string> const& _args)
+std::string formatDatatypeAccessor(smtutil::Expression const& _expr, std::vector<std::string> const& _args)
 {
 	auto const& op = _expr.name;
 
@@ -63,9 +62,9 @@ string formatDatatypeAccessor(smtutil::Expression const& _expr, vector<string> c
 	if (op == "dt_accessor_ecrecover")
 		return "ecrecover";
 
-	string accessorStr = "accessor_";
+	std::string accessorStr = "accessor_";
 	// Struct members have suffix "accessor_<memberName>".
-	string type = op.substr(op.rfind(accessorStr) + accessorStr.size());
+	std::string type = op.substr(op.rfind(accessorStr) + accessorStr.size());
 	solAssert(_expr.arguments.size() == 1, "");
 
 	if (type == "length")
@@ -87,22 +86,22 @@ string formatDatatypeAccessor(smtutil::Expression const& _expr, vector<string> c
 	return _args.at(0) + "." + type;
 }
 
-string formatGenericOp(smtutil::Expression const& _expr, vector<string> const& _args)
+std::string formatGenericOp(smtutil::Expression const& _expr, std::vector<std::string> const& _args)
 {
 	return _expr.name + "(" + boost::algorithm::join(_args, ", ") + ")";
 }
 
-string formatInfixOp(string const& _op, vector<string> const& _args)
+std::string formatInfixOp(std::string const& _op, std::vector<std::string> const& _args)
 {
 	return "(" + boost::algorithm::join(_args, " " + _op + " ") + ")";
 }
 
-string formatArrayOp(smtutil::Expression const& _expr, vector<string> const& _args)
+std::string formatArrayOp(smtutil::Expression const& _expr, std::vector<std::string> const& _args)
 {
 	if (_expr.name == "select")
 	{
 		auto const& a0 = _args.at(0);
-		static set<string> const ufs{"keccak256", "sha256", "ripemd160", "ecrecover"};
+		static std::set<std::string> const ufs{"keccak256", "sha256", "ripemd160", "ecrecover"};
 		if (ufs.count(a0) || starts_with(a0, "t_function_abi"))
 			return _args.at(0) + "(" + _args.at(1) + ")";
 		return _args.at(0) + "[" + _args.at(1) + "]";
@@ -112,7 +111,7 @@ string formatArrayOp(smtutil::Expression const& _expr, vector<string> const& _ar
 	return formatGenericOp(_expr, _args);
 }
 
-string formatUnaryOp(smtutil::Expression const& _expr, vector<string> const& _args)
+std::string formatUnaryOp(smtutil::Expression const& _expr, std::vector<std::string> const& _args)
 {
 	if (_expr.name == "not")
 		return "!" + _args.at(0);
@@ -122,7 +121,7 @@ string formatUnaryOp(smtutil::Expression const& _expr, vector<string> const& _ar
 
 }
 
-smtutil::Expression substitute(smtutil::Expression _from, map<string, string> const& _subst)
+smtutil::Expression substitute(smtutil::Expression _from, std::map<std::string, std::string> const& _subst)
 {
 	// TODO For now we ignore nested quantifier expressions,
 	// but we should support them in the future.
@@ -135,7 +134,7 @@ smtutil::Expression substitute(smtutil::Expression _from, map<string, string> co
 	return _from;
 }
 
-string toSolidityStr(smtutil::Expression const& _expr)
+std::string toSolidityStr(smtutil::Expression const& _expr)
 {
 	auto const& op = _expr.name;
 
@@ -150,7 +149,7 @@ string toSolidityStr(smtutil::Expression const& _expr)
 		return formatDatatypeAccessor(_expr, strArgs);
 
 	// Infix operators with format replacements.
-	static map<string, string> const infixOps{
+	static std::map<std::string, std::string> const infixOps{
 		{"and", "&&"},
 		{"or", "||"},
 		{"implies", "=>"},
@@ -170,7 +169,7 @@ string toSolidityStr(smtutil::Expression const& _expr)
 	if (infixOps.count(op))
 		return formatInfixOp(infixOps.at(op), strArgs);
 
-	static set<string> const arrayOps{"select", "store", "const_array"};
+	static std::set<std::string> const arrayOps{"select", "store", "const_array"};
 	if (arrayOps.count(op))
 		return formatArrayOp(_expr, strArgs);
 
diff --git a/libsolidity/formal/Invariants.cpp b/libsolidity/formal/Invariants.cpp
index 9177a4d431..017ab1e3ae 100644
--- a/libsolidity/formal/Invariants.cpp
+++ b/libsolidity/formal/Invariants.cpp
@@ -25,7 +25,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-using namespace std;
 using boost::algorithm::starts_with;
 using namespace solidity;
 using namespace solidity::smtutil;
@@ -34,19 +33,19 @@ using namespace solidity::frontend::smt;
 namespace solidity::frontend::smt
 {
 
-map<Predicate const*, set<string>> collectInvariants(
+std::map<Predicate const*, std::set<std::string>> collectInvariants(
 	smtutil::Expression const& _proof,
-	set<Predicate const*> const& _predicates,
+	std::set<Predicate const*> const& _predicates,
 	ModelCheckerInvariants const& _invariantsSetting
 )
 {
-	set<string> targets;
+	std::set<std::string> targets;
 	if (_invariantsSetting.has(InvariantType::Contract))
 		targets.insert("interface_");
 	if (_invariantsSetting.has(InvariantType::Reentrancy))
 		targets.insert("nondet_interface_");
 
-	map<string, pair<smtutil::Expression, smtutil::Expression>> equalities;
+	std::map<std::string, std::pair<smtutil::Expression, smtutil::Expression>> equalities;
 	// Collect equalities where one of the sides is a predicate we're interested in.
 	util::BreadthFirstSearch<smtutil::Expression const*>{{&_proof}}.run([&](auto&& _expr, auto&& _addChild) {
 		if (_expr->name == "=")
@@ -63,7 +62,7 @@ map<Predicate const*, set<string>> collectInvariants(
 			_addChild(&arg);
 	});
 
-	map<Predicate const*, set<string>> invariants;
+	std::map<Predicate const*, std::set<std::string>> invariants;
 	for (auto pred: _predicates)
 	{
 		auto predName = pred->functor().name;
@@ -74,7 +73,7 @@ map<Predicate const*, set<string>> collectInvariants(
 
 		auto const& [predExpr, invExpr] = equalities.at(predName);
 
-		static set<string> const ignore{"true", "false"};
+		static std::set<std::string> const ignore{"true", "false"};
 		auto r = substitute(invExpr, pred->expressionSubstitution(predExpr));
 		// No point in reporting true/false as invariants.
 		if (!ignore.count(r.name))
diff --git a/libsolidity/formal/ModelChecker.cpp b/libsolidity/formal/ModelChecker.cpp
index bc97c55349..5632ff5c4e 100644
--- a/libsolidity/formal/ModelChecker.cpp
+++ b/libsolidity/formal/ModelChecker.cpp
@@ -31,7 +31,6 @@
 #include <range/v3/algorithm/any_of.hpp>
 #include <range/v3/view.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -41,7 +40,7 @@ using namespace solidity::smtutil;
 ModelChecker::ModelChecker(
 	ErrorReporter& _errorReporter,
 	langutil::CharStreamProvider const& _charStreamProvider,
-	map<h256, string> const& _smtlib2Responses,
+	std::map<h256, std::string> const& _smtlib2Responses,
 	ModelCheckerSettings _settings,
 	ReadCallback::Callback const& _smtCallback
 ):
@@ -54,19 +53,19 @@ ModelChecker::ModelChecker(
 }
 
 // TODO This should be removed for 0.9.0.
-bool ModelChecker::isPragmaPresent(vector<shared_ptr<SourceUnit>> const& _sources)
+bool ModelChecker::isPragmaPresent(std::vector<std::shared_ptr<SourceUnit>> const& _sources)
 {
 	return ranges::any_of(_sources, [](auto _source) {
 		return _source && _source->annotation().experimentalFeatures.count(ExperimentalFeature::SMTChecker);
 	});
 }
 
-void ModelChecker::checkRequestedSourcesAndContracts(vector<shared_ptr<SourceUnit>> const& _sources)
+void ModelChecker::checkRequestedSourcesAndContracts(std::vector<std::shared_ptr<SourceUnit>> const& _sources)
 {
-	map<string, set<string>> exist;
+	std::map<std::string, std::set<std::string>> exist;
 	for (auto const& source: _sources)
 		for (auto node: source->nodes())
-			if (auto contract = dynamic_pointer_cast<ContractDefinition>(node))
+			if (auto contract = std::dynamic_pointer_cast<ContractDefinition>(node))
 				exist[contract->sourceUnitName()].insert(contract->name());
 
 	// Requested sources
@@ -100,7 +99,7 @@ void ModelChecker::analyze(SourceUnit const& _source)
 	{
 		PragmaDirective const* smtPragma = nullptr;
 		for (auto node: _source.nodes())
-			if (auto pragma = dynamic_pointer_cast<PragmaDirective>(node))
+			if (auto pragma = std::dynamic_pointer_cast<PragmaDirective>(node))
 				if (
 					pragma->literals().size() >= 2 &&
 					pragma->literals().at(1) == "SMTChecker"
@@ -125,7 +124,7 @@ void ModelChecker::analyze(SourceUnit const& _source)
 	if (m_settings.engine.chc)
 		m_chc.analyze(_source);
 
-	map<ASTNode const*, set<VerificationTargetType>, smt::EncodingContext::IdCompare> solvedTargets;
+	std::map<ASTNode const*, std::set<VerificationTargetType>, smt::EncodingContext::IdCompare> solvedTargets;
 
 	for (auto const& [node, targets]: m_chc.safeTargets())
 		for (auto const& target: targets)
@@ -147,7 +146,7 @@ void ModelChecker::analyze(SourceUnit const& _source)
 			5724_error,
 			{},
 			"SMTChecker: " +
-			to_string(m_unsupportedErrorReporter.errors().size()) +
+			std::to_string(m_unsupportedErrorReporter.errors().size()) +
 			" unsupported language feature(s)."
 			" Enable the model checker option \"show unsupported\" to see all of them."
 		);
@@ -156,7 +155,7 @@ void ModelChecker::analyze(SourceUnit const& _source)
 	m_uniqueErrorReporter.clear();
 }
 
-vector<string> ModelChecker::unhandledQueries()
+std::vector<std::string> ModelChecker::unhandledQueries()
 {
 	return m_bmc.unhandledQueries() + m_chc.unhandledQueries();
 }
@@ -212,7 +211,7 @@ SMTSolverChoice ModelChecker::checkRequestedSolvers(SMTSolverChoice _enabled, Er
 			SourceLocation(),
 			"Solver z3 was selected for SMTChecker but it is not available."
 #ifdef HAVE_Z3_DLOPEN
-			" libz3.so." + to_string(Z3_MAJOR_VERSION) + "." + to_string(Z3_MINOR_VERSION) + " was not found."
+			" libz3.so." + std::to_string(Z3_MAJOR_VERSION) + "." + std::to_string(Z3_MINOR_VERSION) + " was not found."
 #endif
 		);
 	}
diff --git a/libsolidity/formal/ModelCheckerSettings.cpp b/libsolidity/formal/ModelCheckerSettings.cpp
index d1e383d63f..ed4d5ce204 100644
--- a/libsolidity/formal/ModelCheckerSettings.cpp
+++ b/libsolidity/formal/ModelCheckerSettings.cpp
@@ -21,18 +21,17 @@
 #include <optional>
 #include <range/v3/view.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
-map<string, InvariantType> const ModelCheckerInvariants::validInvariants{
+std::map<std::string, InvariantType> const ModelCheckerInvariants::validInvariants{
 	{"contract", InvariantType::Contract},
 	{"reentrancy", InvariantType::Reentrancy}
 };
 
-std::optional<ModelCheckerInvariants> ModelCheckerInvariants::fromString(string const& _invs)
+std::optional<ModelCheckerInvariants> ModelCheckerInvariants::fromString(std::string const& _invs)
 {
-	set<InvariantType> chosenInvs;
+	std::set<InvariantType> chosenInvs;
 	if (_invs == "default")
 	{
 		// The default is that no invariants are reported.
@@ -41,7 +40,7 @@ std::optional<ModelCheckerInvariants> ModelCheckerInvariants::fromString(string
 		for (auto&& v: validInvariants | ranges::views::values)
 			chosenInvs.insert(v);
 	else
-		for (auto&& t: _invs | ranges::views::split(',') | ranges::to<vector<string>>())
+		for (auto&& t: _invs | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
 		{
 			if (!validInvariants.count(t))
 				return {};
@@ -51,7 +50,7 @@ std::optional<ModelCheckerInvariants> ModelCheckerInvariants::fromString(string
 	return ModelCheckerInvariants{chosenInvs};
 }
 
-bool ModelCheckerInvariants::setFromString(string const& _inv)
+bool ModelCheckerInvariants::setFromString(std::string const& _inv)
 {
 	if (!validInvariants.count(_inv))
 		return false;
@@ -60,7 +59,7 @@ bool ModelCheckerInvariants::setFromString(string const& _inv)
 }
 
 using TargetType = VerificationTargetType;
-map<string, TargetType> const ModelCheckerTargets::targetStrings{
+std::map<std::string, TargetType> const ModelCheckerTargets::targetStrings{
 	{"constantCondition", TargetType::ConstantCondition},
 	{"underflow", TargetType::Underflow},
 	{"overflow", TargetType::Overflow},
@@ -71,7 +70,7 @@ map<string, TargetType> const ModelCheckerTargets::targetStrings{
 	{"outOfBounds", TargetType::OutOfBounds}
 };
 
-map<TargetType, string> const ModelCheckerTargets::targetTypeToString{
+std::map<TargetType, std::string> const ModelCheckerTargets::targetTypeToString{
 	{TargetType::ConstantCondition, "Constant condition"},
 	{TargetType::Underflow, "Underflow"},
 	{TargetType::Overflow, "Overflow"},
@@ -82,9 +81,9 @@ map<TargetType, string> const ModelCheckerTargets::targetTypeToString{
 	{TargetType::OutOfBounds, "Out of bounds access"}
 };
 
-std::optional<ModelCheckerTargets> ModelCheckerTargets::fromString(string const& _targets)
+std::optional<ModelCheckerTargets> ModelCheckerTargets::fromString(std::string const& _targets)
 {
-	set<TargetType> chosenTargets;
+	std::set<TargetType> chosenTargets;
 	if (_targets == "default" || _targets == "all")
 	{
 		bool all = _targets == "all";
@@ -96,7 +95,7 @@ std::optional<ModelCheckerTargets> ModelCheckerTargets::fromString(string const&
 		}
 	}
 	else
-		for (auto&& t: _targets | ranges::views::split(',') | ranges::to<vector<string>>())
+		for (auto&& t: _targets | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
 		{
 			if (!targetStrings.count(t))
 				return {};
@@ -106,7 +105,7 @@ std::optional<ModelCheckerTargets> ModelCheckerTargets::fromString(string const&
 	return ModelCheckerTargets{chosenTargets};
 }
 
-bool ModelCheckerTargets::setFromString(string const& _target)
+bool ModelCheckerTargets::setFromString(std::string const& _target)
 {
 	if (!targetStrings.count(_target))
 		return false;
@@ -114,15 +113,15 @@ bool ModelCheckerTargets::setFromString(string const& _target)
 	return true;
 }
 
-std::optional<ModelCheckerContracts> ModelCheckerContracts::fromString(string const& _contracts)
+std::optional<ModelCheckerContracts> ModelCheckerContracts::fromString(std::string const& _contracts)
 {
-	map<string, set<string>> chosen;
+	std::map<std::string, std::set<std::string>> chosen;
 	if (_contracts == "default")
 		return ModelCheckerContracts::Default();
 
-	for (auto&& sourceContract: _contracts | ranges::views::split(',') | ranges::to<vector<string>>())
+	for (auto&& sourceContract: _contracts | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
 	{
-		auto&& names = sourceContract | ranges::views::split(':') | ranges::to<vector<string>>();
+		auto&& names = sourceContract | ranges::views::split(':') | ranges::to<std::vector<std::string>>();
 		if (names.size() != 2 || names.at(0).empty() || names.at(1).empty())
 			return {};
 		chosen[names.at(0)].insert(names.at(1));
@@ -131,7 +130,7 @@ std::optional<ModelCheckerContracts> ModelCheckerContracts::fromString(string co
 	return ModelCheckerContracts{chosen};
 }
 
-std::optional<ModelCheckerExtCalls> ModelCheckerExtCalls::fromString(string const& _mode)
+std::optional<ModelCheckerExtCalls> ModelCheckerExtCalls::fromString(std::string const& _mode)
 {
 	if (_mode == "untrusted")
 		return ModelCheckerExtCalls{Mode::UNTRUSTED};
diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
index 7119a59e8b..2ab494fc4d 100644
--- a/libsolidity/formal/Predicate.cpp
+++ b/libsolidity/formal/Predicate.cpp
@@ -31,27 +31,26 @@
 #include <range/v3/view.hpp>
 #include <utility>
 
-using namespace std;
 using boost::algorithm::starts_with;
 using namespace solidity;
 using namespace solidity::smtutil;
 using namespace solidity::frontend;
 using namespace solidity::frontend::smt;
 
-map<string, Predicate> Predicate::m_predicates;
+std::map<std::string, Predicate> Predicate::m_predicates;
 
 Predicate const* Predicate::create(
 	SortPointer _sort,
-	string _name,
+	std::string _name,
 	PredicateType _type,
 	EncodingContext& _context,
 	ASTNode const* _node,
 	ContractDefinition const* _contractContext,
-	vector<ScopeOpener const*> _scopeStack
+	std::vector<ScopeOpener const*> _scopeStack
 )
 {
 	smt::SymbolicFunctionVariable predicate{_sort, std::move(_name), _context};
-	string functorName = predicate.currentName();
+	std::string functorName = predicate.currentName();
 	solAssert(!m_predicates.count(functorName), "");
 	return &m_predicates.emplace(
 		std::piecewise_construct,
@@ -65,7 +64,7 @@ Predicate::Predicate(
 	PredicateType _type,
 	ASTNode const* _node,
 	ContractDefinition const* _contractContext,
-	vector<ScopeOpener const*> _scopeStack
+	std::vector<ScopeOpener const*> _scopeStack
 ):
 	m_predicate(std::move(_predicate)),
 	m_type(_type),
@@ -75,7 +74,7 @@ Predicate::Predicate(
 {
 }
 
-Predicate const* Predicate::predicate(string const& _name)
+Predicate const* Predicate::predicate(std::string const& _name)
 {
 	return &m_predicates.at(_name);
 }
@@ -85,7 +84,7 @@ void Predicate::reset()
 	m_predicates.clear();
 }
 
-smtutil::Expression Predicate::operator()(vector<smtutil::Expression> const& _args) const
+smtutil::Expression Predicate::operator()(std::vector<smtutil::Expression> const& _args) const
 {
 	return m_predicate(_args);
 }
@@ -149,12 +148,12 @@ VariableDeclaration  const* Predicate::programVariable() const
 	return dynamic_cast<VariableDeclaration const*>(m_node);
 }
 
-optional<vector<VariableDeclaration const*>> Predicate::stateVariables() const
+std::optional<std::vector<VariableDeclaration const*>> Predicate::stateVariables() const
 {
 	if (m_contractContext)
 		return SMTEncoder::stateVariablesIncludingInheritedAndPrivate(*m_contractContext);
 
-	return nullopt;
+	return std::nullopt;
 }
 
 bool Predicate::isSummary() const
@@ -211,8 +210,8 @@ bool Predicate::isNondetInterface() const
 	return m_type == PredicateType::NondetInterface;
 }
 
-string Predicate::formatSummaryCall(
-	vector<smtutil::Expression> const& _args,
+std::string Predicate::formatSummaryCall(
+	std::vector<smtutil::Expression> const& _args,
 	langutil::CharStreamProvider const& _charStreamProvider,
 	bool _appendTxVars
 ) const
@@ -225,7 +224,7 @@ string Predicate::formatSummaryCall(
 	if (auto funCall = programFunctionCall())
 	{
 		if (funCall->location().hasText())
-			return string(_charStreamProvider.charStream(*funCall->location().sourceName).text(funCall->location()));
+			return std::string(_charStreamProvider.charStream(*funCall->location().sourceName).text(funCall->location()));
 		else
 			return {};
 	}
@@ -233,11 +232,11 @@ string Predicate::formatSummaryCall(
 	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockChainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
 	/// Here we are interested in preInputVars to format the function call.
 
-	string txModel;
+	std::string txModel;
 
 	if (_appendTxVars)
 	{
-		set<string> txVars;
+		std::set<std::string> txVars;
 		if (isFunctionSummary())
 		{
 			solAssert(programFunction(), "");
@@ -276,7 +275,7 @@ string Predicate::formatSummaryCall(
 				return true;
 			}
 
-			set<string> txVars;
+			std::set<std::string> txVars;
 		} txVarsVisitor;
 
 		if (auto fun = programFunction())
@@ -287,7 +286,7 @@ string Predicate::formatSummaryCall(
 
 		// Here we are interested in txData from the summary predicate.
 		auto txValues = readTxVars(_args.at(4));
-		vector<string> values;
+		std::vector<std::string> values;
 		for (auto const& _var: txVars)
 			if (auto v = txValues.at(_var))
 				values.push_back(_var + ": " + *v);
@@ -309,8 +308,8 @@ string Predicate::formatSummaryCall(
 	solAssert(first >= _args.begin() && first <= _args.end(), "");
 	solAssert(last >= _args.begin() && last <= _args.end(), "");
 	auto inTypes = SMTEncoder::replaceUserTypes(FunctionType(*fun).parameterTypes());
-	vector<optional<string>> functionArgsCex = formatExpressions(vector<smtutil::Expression>(first, last), inTypes);
-	vector<string> functionArgs;
+	std::vector<std::optional<std::string>> functionArgsCex = formatExpressions(std::vector<smtutil::Expression>(first, last), inTypes);
+	std::vector<std::string> functionArgs;
 
 	auto const& params = fun->parameters();
 	solAssert(params.size() == functionArgsCex.size(), "");
@@ -320,12 +319,12 @@ string Predicate::formatSummaryCall(
 		else
 			functionArgs.emplace_back(params[i]->name());
 
-	string fName = fun->isConstructor() ? "constructor" :
+	std::string fName = fun->isConstructor() ? "constructor" :
 		fun->isFallback() ? "fallback" :
 		fun->isReceive() ? "receive" :
 		fun->name();
 
-	string prefix;
+	std::string prefix;
 	if (fun->isFree())
 		prefix = !fun->sourceUnitName().empty() ? (fun->sourceUnitName() + ":") : "";
 	else
@@ -336,7 +335,7 @@ string Predicate::formatSummaryCall(
 	return prefix + fName + "(" + boost::algorithm::join(functionArgs, ", ") + ")" + txModel;
 }
 
-vector<optional<string>> Predicate::summaryStateValues(vector<smtutil::Expression> const& _args) const
+std::vector<std::optional<std::string>> Predicate::summaryStateValues(std::vector<smtutil::Expression> const& _args) const
 {
 	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
 	/// The signature of the summary predicate of a contract without constructor is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, postBlockchainState, preStateVars, postStateVars).
@@ -344,8 +343,8 @@ vector<optional<string>> Predicate::summaryStateValues(vector<smtutil::Expressio
 	auto stateVars = stateVariables();
 	solAssert(stateVars.has_value(), "");
 
-	vector<smtutil::Expression>::const_iterator stateFirst;
-	vector<smtutil::Expression>::const_iterator stateLast;
+	std::vector<smtutil::Expression>::const_iterator stateFirst;
+	std::vector<smtutil::Expression>::const_iterator stateLast;
 	if (auto const* function = programFunction())
 	{
 		stateFirst = _args.begin() + 6 + static_cast<int>(stateVars->size()) + static_cast<int>(function->parameters().size()) + 1;
@@ -364,13 +363,13 @@ vector<optional<string>> Predicate::summaryStateValues(vector<smtutil::Expressio
 	solAssert(stateFirst >= _args.begin() && stateFirst <= _args.end(), "");
 	solAssert(stateLast >= _args.begin() && stateLast <= _args.end(), "");
 
-	vector<smtutil::Expression> stateArgs(stateFirst, stateLast);
+	std::vector<smtutil::Expression> stateArgs(stateFirst, stateLast);
 	solAssert(stateArgs.size() == stateVars->size(), "");
 	auto stateTypes = util::applyMap(*stateVars, [&](auto const& _var) { return _var->type(); });
 	return formatExpressions(stateArgs, stateTypes);
 }
 
-vector<optional<string>> Predicate::summaryPostInputValues(vector<smtutil::Expression> const& _args) const
+std::vector<std::optional<std::string>> Predicate::summaryPostInputValues(std::vector<smtutil::Expression> const& _args) const
 {
 	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
 	/// Here we are interested in postInputVars.
@@ -388,13 +387,13 @@ vector<optional<string>> Predicate::summaryPostInputValues(vector<smtutil::Expre
 	solAssert(first >= _args.begin() && first <= _args.end(), "");
 	solAssert(last >= _args.begin() && last <= _args.end(), "");
 
-	vector<smtutil::Expression> inValues(first, last);
+	std::vector<smtutil::Expression> inValues(first, last);
 	solAssert(inValues.size() == inParams.size(), "");
 	auto inTypes = SMTEncoder::replaceUserTypes(FunctionType(*function).parameterTypes());
 	return formatExpressions(inValues, inTypes);
 }
 
-vector<optional<string>> Predicate::summaryPostOutputValues(vector<smtutil::Expression> const& _args) const
+std::vector<std::optional<std::string>> Predicate::summaryPostOutputValues(std::vector<smtutil::Expression> const& _args) const
 {
 	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
 	/// Here we are interested in outputVars.
@@ -410,13 +409,13 @@ vector<optional<string>> Predicate::summaryPostOutputValues(vector<smtutil::Expr
 
 	solAssert(first >= _args.begin() && first <= _args.end(), "");
 
-	vector<smtutil::Expression> outValues(first, _args.end());
+	std::vector<smtutil::Expression> outValues(first, _args.end());
 	solAssert(outValues.size() == function->returnParameters().size(), "");
 	auto outTypes = SMTEncoder::replaceUserTypes(FunctionType(*function).returnParameterTypes());
 	return formatExpressions(outValues, outTypes);
 }
 
-pair<vector<optional<string>>, vector<VariableDeclaration const*>> Predicate::localVariableValues(vector<smtutil::Expression> const& _args) const
+std::pair<std::vector<std::optional<std::string>>, std::vector<VariableDeclaration const*>> Predicate::localVariableValues(std::vector<smtutil::Expression> const& _args) const
 {
 	/// The signature of a local block predicate is:
 	/// block(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars, localVars).
@@ -426,7 +425,7 @@ pair<vector<optional<string>>, vector<VariableDeclaration const*>> Predicate::lo
 
 	auto const& localVars = SMTEncoder::localVariablesIncludingModifiers(*function, m_contractContext);
 	auto first = _args.end() - static_cast<int>(localVars.size());
-	vector<smtutil::Expression> outValues(first, _args.end());
+	std::vector<smtutil::Expression> outValues(first, _args.end());
 
 	auto mask = util::applyMap(
 		localVars,
@@ -442,10 +441,10 @@ pair<vector<optional<string>>, vector<VariableDeclaration const*>> Predicate::lo
 	return {formatExpressions(outValuesInScope, outTypes), localVarsInScope};
 }
 
-map<string, string> Predicate::expressionSubstitution(smtutil::Expression const& _predExpr) const
+std::map<std::string, std::string> Predicate::expressionSubstitution(smtutil::Expression const& _predExpr) const
 {
-	map<string, string> subst;
-	string predName = functor().name;
+	std::map<std::string, std::string> subst;
+	std::string predName = functor().name;
 
 	solAssert(contextContract(), "");
 	auto const& stateVars = SMTEncoder::stateVariablesIncludingInheritedAndPrivate(*contextContract());
@@ -486,16 +485,16 @@ map<string, string> Predicate::expressionSubstitution(smtutil::Expression const&
 	return subst;
 }
 
-vector<optional<string>> Predicate::formatExpressions(vector<smtutil::Expression> const& _exprs, vector<Type const*> const& _types) const
+std::vector<std::optional<std::string>> Predicate::formatExpressions(std::vector<smtutil::Expression> const& _exprs, std::vector<Type const*> const& _types) const
 {
 	solAssert(_exprs.size() == _types.size(), "");
-	vector<optional<string>> strExprs;
+	std::vector<std::optional<std::string>> strExprs;
 	for (unsigned i = 0; i < _exprs.size(); ++i)
 		strExprs.push_back(expressionToString(_exprs.at(i), _types.at(i)));
 	return strExprs;
 }
 
-optional<string> Predicate::expressionToString(smtutil::Expression const& _expr, Type const* _type) const
+std::optional<std::string> Predicate::expressionToString(smtutil::Expression const& _expr, Type const* _type) const
 {
 	if (smt::isNumber(*_type))
 	{
@@ -514,10 +513,10 @@ optional<string> Predicate::expressionToString(smtutil::Expression const& _expr,
 				// For some reason the code below returns "0x" for "0".
 				return util::toHex(toCompactBigEndian(bigint(_expr.name)), util::HexPrefix::Add, util::HexCase::Lower);
 			}
-			catch (out_of_range const&)
+			catch (std::out_of_range const&)
 			{
 			}
-			catch (invalid_argument const&)
+			catch (std::invalid_argument const&)
 			{
 			}
 		}
@@ -550,11 +549,11 @@ optional<string> Predicate::expressionToString(smtutil::Expression const& _expr,
 		{
 			length = stoul(_expr.arguments.at(1).name);
 		}
-		catch(out_of_range const&)
+		catch(std::out_of_range const&)
 		{
 			return {};
 		}
-		catch(invalid_argument const&)
+		catch(std::invalid_argument const&)
 		{
 			return {};
 		}
@@ -567,12 +566,12 @@ optional<string> Predicate::expressionToString(smtutil::Expression const& _expr,
 			return {};
 		try
 		{
-			vector<string> array(length);
+			std::vector<std::string> array(length);
 			if (!fillArray(_expr.arguments.at(0), array, arrayType))
 				return {};
 			return "[" + boost::algorithm::join(array, ", ") + "]";
 		}
-		catch (bad_alloc const&)
+		catch (std::bad_alloc const&)
 		{
 			// Solver gave a concrete array but length is too large.
 		}
@@ -585,10 +584,10 @@ optional<string> Predicate::expressionToString(smtutil::Expression const& _expr,
 		auto members = structType.structDefinition().members();
 		solAssert(tupleSort.components.size() == members.size(), "");
 		solAssert(_expr.arguments.size() == members.size(), "");
-		vector<string> elements;
+		std::vector<std::string> elements;
 		for (unsigned i = 0; i < members.size(); ++i)
 		{
-			optional<string> elementStr = expressionToString(_expr.arguments.at(i), members[i]->type());
+			std::optional<std::string> elementStr = expressionToString(_expr.arguments.at(i), members[i]->type());
 			elements.push_back(members[i]->name() + (elementStr.has_value() ?  ": " + elementStr.value() : ""));
 		}
 		return "{" + boost::algorithm::join(elements, ", ") + "}";
@@ -597,13 +596,13 @@ optional<string> Predicate::expressionToString(smtutil::Expression const& _expr,
 	return {};
 }
 
-bool Predicate::fillArray(smtutil::Expression const& _expr, vector<string>& _array, ArrayType const& _type) const
+bool Predicate::fillArray(smtutil::Expression const& _expr, std::vector<std::string>& _array, ArrayType const& _type) const
 {
 	// Base case
 	if (_expr.name == "const_array")
 	{
 		auto length = _array.size();
-		optional<string> elemStr = expressionToString(_expr.arguments.at(1), _type.baseType());
+		std::optional<std::string> elemStr = expressionToString(_expr.arguments.at(1), _type.baseType());
 		if (!elemStr)
 			return false;
 		_array.clear();
@@ -616,7 +615,7 @@ bool Predicate::fillArray(smtutil::Expression const& _expr, vector<string>& _arr
 	{
 		if (!fillArray(_expr.arguments.at(0), _array, _type))
 			return false;
-		optional<string> indexStr = expressionToString(_expr.arguments.at(1), TypeProvider::uint256());
+		std::optional<std::string> indexStr = expressionToString(_expr.arguments.at(1), TypeProvider::uint256());
 		if (!indexStr)
 			return false;
 		// Sometimes the solver assigns huge lengths that are not related,
@@ -626,15 +625,15 @@ bool Predicate::fillArray(smtutil::Expression const& _expr, vector<string>& _arr
 		{
 			index = stoul(*indexStr);
 		}
-		catch (out_of_range const&)
+		catch (std::out_of_range const&)
 		{
 			return true;
 		}
-		catch (invalid_argument const&)
+		catch (std::invalid_argument const&)
 		{
 			return true;
 		}
-		optional<string> elemStr = expressionToString(_expr.arguments.at(2), _type.baseType());
+		std::optional<std::string> elemStr = expressionToString(_expr.arguments.at(2), _type.baseType());
 		if (!elemStr)
 			return false;
 		if (index < _array.size())
@@ -652,9 +651,9 @@ bool Predicate::fillArray(smtutil::Expression const& _expr, vector<string>& _arr
 	solAssert(false, "");
 }
 
-map<string, optional<string>> Predicate::readTxVars(smtutil::Expression const& _tx) const
+std::map<std::string, std::optional<std::string>> Predicate::readTxVars(smtutil::Expression const& _tx) const
 {
-	map<string, Type const*> const txVars{
+	std::map<std::string, Type const*> const txVars{
 		{"block.basefee", TypeProvider::uint256()},
 		{"block.chainid", TypeProvider::uint256()},
 		{"block.coinbase", TypeProvider::address()},
@@ -670,7 +669,7 @@ map<string, optional<string>> Predicate::readTxVars(smtutil::Expression const& _
 		{"tx.gasprice", TypeProvider::uint256()},
 		{"tx.origin", TypeProvider::address()}
 	};
-	map<string, optional<string>> vars;
+	std::map<std::string, std::optional<std::string>> vars;
 	for (auto&& [i, v]: txVars | ranges::views::enumerate)
 		vars.emplace(v.first, expressionToString(_tx.arguments.at(i), v.second));
 	return vars;
diff --git a/libsolidity/formal/PredicateInstance.cpp b/libsolidity/formal/PredicateInstance.cpp
index 5e057efe37..0bf352dd47 100644
--- a/libsolidity/formal/PredicateInstance.cpp
+++ b/libsolidity/formal/PredicateInstance.cpp
@@ -21,7 +21,6 @@
 #include <libsolidity/formal/EncodingContext.h>
 #include <libsolidity/formal/SMTEncoder.h>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::smtutil;
 
@@ -30,14 +29,14 @@ namespace solidity::frontend::smt
 smtutil::Expression interfacePre(Predicate const& _pred, ContractDefinition const& _contract, EncodingContext& _context)
 {
 	auto& state = _context.state();
-	vector<smtutil::Expression> stateExprs{state.thisAddress(0), state.abi(0), state.crypto(0), state.state(0)};
+	std::vector<smtutil::Expression> stateExprs{state.thisAddress(0), state.abi(0), state.crypto(0), state.state(0)};
 	return _pred(stateExprs + initialStateVariables(_contract, _context));
 }
 
 smtutil::Expression interface(Predicate const& _pred, ContractDefinition const& _contract, EncodingContext& _context)
 {
 	auto const& state = _context.state();
-	vector<smtutil::Expression> stateExprs{state.thisAddress(0), state.abi(0), state.crypto(0), state.state()};
+	std::vector<smtutil::Expression> stateExprs{state.thisAddress(0), state.abi(0), state.crypto(0), state.state()};
 	return _pred(stateExprs + currentStateVariables(_contract, _context));
 }
 
@@ -49,12 +48,12 @@ smtutil::Expression nondetInterface(
 	unsigned _postIdx)
 {
 	auto const& state = _context.state();
-	vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), state.thisAddress(), state.abi(), state.crypto()};
+	std::vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), state.thisAddress(), state.abi(), state.crypto()};
 	return _pred(
 		stateExprs +
-		vector<smtutil::Expression>{_context.state().state(_preIdx)} +
+		std::vector<smtutil::Expression>{_context.state().state(_preIdx)} +
 		stateVariablesAtIndex(_preIdx, _contract, _context) +
-		vector<smtutil::Expression>{_context.state().state(_postIdx)} +
+		std::vector<smtutil::Expression>{_context.state().state(_postIdx)} +
 		stateVariablesAtIndex(_postIdx, _contract, _context)
 	);
 }
@@ -66,7 +65,7 @@ smtutil::Expression constructor(Predicate const& _pred, EncodingContext& _contex
 		return _pred(currentFunctionVariablesForDefinition(*constructor, &contract, _context));
 
 	auto& state = _context.state();
-	vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), state.thisAddress(0), state.abi(0), state.crypto(0), state.tx(0), state.state(0), state.state()};
+	std::vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), state.thisAddress(0), state.abi(0), state.crypto(0), state.tx(0), state.state(0), state.state()};
 	return _pred(stateExprs + initialStateVariables(contract, _context) + currentStateVariables(contract, _context));
 }
 
@@ -77,9 +76,9 @@ smtutil::Expression constructorCall(Predicate const& _pred, EncodingContext& _co
 		return _pred(currentFunctionVariablesForCall(*constructor, &contract, _context, _internal));
 
 	auto& state = _context.state();
-	vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), _internal ? state.thisAddress(0) : state.thisAddress(), state.abi(0), state.crypto(0), _internal ? state.tx(0) : state.tx(), state.state()};
+	std::vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), _internal ? state.thisAddress(0) : state.thisAddress(), state.abi(0), state.crypto(0), _internal ? state.tx(0) : state.tx(), state.state()};
 	state.newState();
-	stateExprs += vector<smtutil::Expression>{state.state()};
+	stateExprs += std::vector<smtutil::Expression>{state.state()};
 	stateExprs += currentStateVariables(contract, _context);
 	stateExprs += newStateVariables(contract, _context);
 	return _pred(stateExprs);
@@ -117,12 +116,12 @@ smtutil::Expression functionBlock(
 
 /// Helpers
 
-vector<smtutil::Expression> initialStateVariables(ContractDefinition const& _contract, EncodingContext& _context)
+std::vector<smtutil::Expression> initialStateVariables(ContractDefinition const& _contract, EncodingContext& _context)
 {
 	return stateVariablesAtIndex(0, _contract, _context);
 }
 
-vector<smtutil::Expression> stateVariablesAtIndex(unsigned _index, ContractDefinition const& _contract, EncodingContext& _context)
+std::vector<smtutil::Expression> stateVariablesAtIndex(unsigned _index, ContractDefinition const& _contract, EncodingContext& _context)
 {
 	return applyMap(
 		SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract),
@@ -130,7 +129,7 @@ vector<smtutil::Expression> stateVariablesAtIndex(unsigned _index, ContractDefin
 	);
 }
 
-vector<smtutil::Expression> currentStateVariables(ContractDefinition const& _contract, EncodingContext& _context)
+std::vector<smtutil::Expression> currentStateVariables(ContractDefinition const& _contract, EncodingContext& _context)
 {
 	return applyMap(
 		SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract),
@@ -138,7 +137,7 @@ vector<smtutil::Expression> currentStateVariables(ContractDefinition const& _con
 	);
 }
 
-vector<smtutil::Expression> newStateVariables(ContractDefinition const& _contract, EncodingContext& _context)
+std::vector<smtutil::Expression> newStateVariables(ContractDefinition const& _contract, EncodingContext& _context)
 {
 	return applyMap(
 		SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract),
@@ -146,24 +145,24 @@ vector<smtutil::Expression> newStateVariables(ContractDefinition const& _contrac
 	);
 }
 
-vector<smtutil::Expression> currentFunctionVariablesForDefinition(
+std::vector<smtutil::Expression> currentFunctionVariablesForDefinition(
 	FunctionDefinition const& _function,
 	ContractDefinition const* _contract,
 	EncodingContext& _context
 )
 {
 	auto& state = _context.state();
-	vector<smtutil::Expression> exprs{state.errorFlag().currentValue(), state.thisAddress(0), state.abi(0), state.crypto(0), state.tx(0), state.state(0)};
-	exprs += _contract ? initialStateVariables(*_contract, _context) : vector<smtutil::Expression>{};
+	std::vector<smtutil::Expression> exprs{state.errorFlag().currentValue(), state.thisAddress(0), state.abi(0), state.crypto(0), state.tx(0), state.state(0)};
+	exprs += _contract ? initialStateVariables(*_contract, _context) : std::vector<smtutil::Expression>{};
 	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->valueAtIndex(0); });
-	exprs += vector<smtutil::Expression>{state.state()};
-	exprs += _contract ? currentStateVariables(*_contract, _context) : vector<smtutil::Expression>{};
+	exprs += std::vector<smtutil::Expression>{state.state()};
+	exprs += _contract ? currentStateVariables(*_contract, _context) : std::vector<smtutil::Expression>{};
 	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->currentValue(); });
 	exprs += applyMap(_function.returnParameters(), [&](auto _var) { return _context.variable(*_var)->currentValue(); });
 	return exprs;
 }
 
-vector<smtutil::Expression> currentFunctionVariablesForCall(
+std::vector<smtutil::Expression> currentFunctionVariablesForCall(
 	FunctionDefinition const& _function,
 	ContractDefinition const* _contract,
 	EncodingContext& _context,
@@ -171,20 +170,20 @@ vector<smtutil::Expression> currentFunctionVariablesForCall(
 )
 {
 	auto& state = _context.state();
-	vector<smtutil::Expression> exprs{state.errorFlag().currentValue(), _internal ? state.thisAddress(0) : state.thisAddress(), state.abi(0), state.crypto(0), _internal ? state.tx(0) : state.tx(), state.state()};
-	exprs += _contract ? currentStateVariables(*_contract, _context) : vector<smtutil::Expression>{};
+	std::vector<smtutil::Expression> exprs{state.errorFlag().currentValue(), _internal ? state.thisAddress(0) : state.thisAddress(), state.abi(0), state.crypto(0), _internal ? state.tx(0) : state.tx(), state.state()};
+	exprs += _contract ? currentStateVariables(*_contract, _context) : std::vector<smtutil::Expression>{};
 	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->currentValue(); });
 
 	state.newState();
 
-	exprs += vector<smtutil::Expression>{state.state()};
-	exprs += _contract ? newStateVariables(*_contract, _context) : vector<smtutil::Expression>{};
+	exprs += std::vector<smtutil::Expression>{state.state()};
+	exprs += _contract ? newStateVariables(*_contract, _context) : std::vector<smtutil::Expression>{};
 	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->increaseIndex(); });
 	exprs += applyMap(_function.returnParameters(), [&](auto _var) { return _context.variable(*_var)->currentValue(); });
 	return exprs;
 }
 
-vector<smtutil::Expression> currentBlockVariables(FunctionDefinition const& _function, ContractDefinition const* _contract, EncodingContext& _context)
+std::vector<smtutil::Expression> currentBlockVariables(FunctionDefinition const& _function, ContractDefinition const* _contract, EncodingContext& _context)
 {
 	return currentFunctionVariablesForDefinition(_function, _contract, _context) +
 		applyMap(
diff --git a/libsolidity/formal/PredicateSort.cpp b/libsolidity/formal/PredicateSort.cpp
index dc134766d8..2e95a29a53 100644
--- a/libsolidity/formal/PredicateSort.cpp
+++ b/libsolidity/formal/PredicateSort.cpp
@@ -21,7 +21,6 @@
 #include <libsolidity/formal/SMTEncoder.h>
 #include <libsolidity/formal/SymbolicTypes.h>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::smtutil;
 
@@ -30,8 +29,8 @@ namespace solidity::frontend::smt
 
 SortPointer interfaceSort(ContractDefinition const& _contract, SymbolicState& _state)
 {
-	return make_shared<FunctionSort>(
-		vector<SortPointer>{_state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.stateSort()} + stateSorts(_contract),
+	return std::make_shared<FunctionSort>(
+		std::vector<SortPointer>{_state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.stateSort()} + stateSorts(_contract),
 		SortProvider::boolSort
 	);
 }
@@ -39,9 +38,9 @@ SortPointer interfaceSort(ContractDefinition const& _contract, SymbolicState& _s
 SortPointer nondetInterfaceSort(ContractDefinition const& _contract, SymbolicState& _state)
 {
 	auto varSorts = stateSorts(_contract);
-	vector<SortPointer> stateSort{_state.stateSort()};
-	return make_shared<FunctionSort>(
-		vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort()} +
+	std::vector<SortPointer> stateSort{_state.stateSort()};
+	return std::make_shared<FunctionSort>(
+		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort()} +
 			stateSort +
 			varSorts +
 			stateSort +
@@ -56,9 +55,9 @@ SortPointer constructorSort(ContractDefinition const& _contract, SymbolicState&
 		return functionSort(*constructor, &_contract, _state);
 
 	auto varSorts = stateSorts(_contract);
-	vector<SortPointer> stateSort{_state.stateSort()};
-	return make_shared<FunctionSort>(
-		vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.txSort(), _state.stateSort(), _state.stateSort()} + varSorts + varSorts,
+	std::vector<SortPointer> stateSort{_state.stateSort()};
+	return std::make_shared<FunctionSort>(
+		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.txSort(), _state.stateSort(), _state.stateSort()} + varSorts + varSorts,
 		SortProvider::boolSort
 	);
 }
@@ -66,14 +65,14 @@ SortPointer constructorSort(ContractDefinition const& _contract, SymbolicState&
 SortPointer functionSort(FunctionDefinition const& _function, ContractDefinition const* _contract, SymbolicState& _state)
 {
 	auto smtSort = [](auto _var) { return smt::smtSortAbstractFunction(*_var->type()); };
-	auto varSorts = _contract ? stateSorts(*_contract) : vector<SortPointer>{};
+	auto varSorts = _contract ? stateSorts(*_contract) : std::vector<SortPointer>{};
 	auto inputSorts = applyMap(_function.parameters(), smtSort);
 	auto outputSorts = applyMap(_function.returnParameters(), smtSort);
-	return make_shared<FunctionSort>(
-		vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.txSort(), _state.stateSort()} +
+	return std::make_shared<FunctionSort>(
+		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.txSort(), _state.stateSort()} +
 			varSorts +
 			inputSorts +
-			vector<SortPointer>{_state.stateSort()} +
+			std::vector<SortPointer>{_state.stateSort()} +
 			varSorts +
 			inputSorts +
 			outputSorts,
@@ -83,11 +82,11 @@ SortPointer functionSort(FunctionDefinition const& _function, ContractDefinition
 
 SortPointer functionBodySort(FunctionDefinition const& _function, ContractDefinition const* _contract, SymbolicState& _state)
 {
-	auto fSort = dynamic_pointer_cast<FunctionSort>(functionSort(_function, _contract, _state));
+	auto fSort = std::dynamic_pointer_cast<FunctionSort>(functionSort(_function, _contract, _state));
 	solAssert(fSort, "");
 
 	auto smtSort = [](auto _var) { return smt::smtSortAbstractFunction(*_var->type()); };
-	return make_shared<FunctionSort>(
+	return std::make_shared<FunctionSort>(
 		fSort->domain + applyMap(SMTEncoder::localVariablesIncludingModifiers(_function, _contract), smtSort),
 		SortProvider::boolSort
 	);
@@ -95,15 +94,15 @@ SortPointer functionBodySort(FunctionDefinition const& _function, ContractDefini
 
 SortPointer arity0FunctionSort()
 {
-	return make_shared<FunctionSort>(
-		vector<SortPointer>(),
+	return std::make_shared<FunctionSort>(
+		std::vector<SortPointer>(),
 		SortProvider::boolSort
 	);
 }
 
 /// Helpers
 
-vector<SortPointer> stateSorts(ContractDefinition const& _contract)
+std::vector<SortPointer> stateSorts(ContractDefinition const& _contract)
 {
 	return applyMap(
 		SMTEncoder::stateVariablesIncludingInheritedAndPrivate(_contract),
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index a328a7781a..d985e359ef 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -40,11 +40,11 @@
 #include <limits>
 #include <deque>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
+using namespace std::string_literals;
 
 SMTEncoder::SMTEncoder(
 	smt::EncodingContext& _context,
@@ -72,8 +72,8 @@ bool SMTEncoder::visit(ContractDefinition const& _contract)
 
 	for (auto const& node: _contract.subNodes())
 		if (
-			!dynamic_pointer_cast<FunctionDefinition>(node) &&
-			!dynamic_pointer_cast<VariableDeclaration>(node)
+			!std::dynamic_pointer_cast<FunctionDefinition>(node) &&
+			!std::dynamic_pointer_cast<VariableDeclaration>(node)
 		)
 			node->accept(*this);
 
@@ -198,7 +198,7 @@ void SMTEncoder::inlineModifierInvocation(ModifierInvocation const* _invocation,
 	solAssert(_invocation, "");
 	_invocation->accept(*this);
 
-	vector<smtutil::Expression> args;
+	std::vector<smtutil::Expression> args;
 	if (auto const* arguments = _invocation->arguments())
 	{
 		auto const& modifierParams = _definition->parameters();
@@ -314,8 +314,8 @@ bool SMTEncoder::visit(InlineAssembly const& _inlineAsm)
 			this->operator()(_inlineAsm.operations());
 		}
 
-		map<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> const& externalReferences;
-		set<VariableDeclaration const*> assignedVars;
+		std::map<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> const& externalReferences;
+		std::set<VariableDeclaration const*> assignedVars;
 
 		using yul::ASTWalker::operator();
 		void operator()(yul::Assignment const& _assignment)
@@ -425,14 +425,14 @@ void SMTEncoder::endVisit(TupleExpression const& _tuple)
 	if (_tuple.isInlineArray())
 	{
 		// Add constraints for the length and values as it is known.
-		auto symbArray = dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(_tuple));
+		auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(_tuple));
 		solAssert(symbArray, "");
 
 		addArrayLiteralAssertions(*symbArray, applyMap(_tuple.components(), [&](auto const& c) { return expr(*c); }));
 	}
 	else
 	{
-		auto values = applyMap(_tuple.components(), [this](auto const& component) -> optional<smtutil::Expression> {
+		auto values = applyMap(_tuple.components(), [this](auto const& component) -> std::optional<smtutil::Expression> {
 			if (component)
 			{
 				if (!m_context.knownExpression(*component))
@@ -816,19 +816,19 @@ void SMTEncoder::visitABIFunction(FunctionCall const& _funCall)
 		defineExpr(_funCall, smt::zeroValue(TypeProvider::bytesMemory()));
 		return;
 	}
-	vector<smtutil::Expression> symbArgs;
+	std::vector<smtutil::Expression> symbArgs;
 	for (unsigned i = 0; i < argsActualLength; ++i)
 		if (args.at(i))
 			symbArgs.emplace_back(expr(*args.at(i), inTypes.at(i)));
 
-	optional<smtutil::Expression> arg;
+	std::optional<smtutil::Expression> arg;
 	if (inTypes.size() == 1)
 		arg = expr(*args.at(0), inTypes.at(0));
 	else
 	{
 		auto inputSort = dynamic_cast<smtutil::ArraySort&>(*symbFunction.sort).domain;
 		arg = smtutil::Expression::tuple_constructor(
-			smtutil::Expression(make_shared<smtutil::SortSort>(inputSort), ""),
+			smtutil::Expression(std::make_shared<smtutil::SortSort>(inputSort), ""),
 			symbArgs
 		);
 	}
@@ -838,7 +838,7 @@ void SMTEncoder::visitABIFunction(FunctionCall const& _funCall)
 		defineExpr(_funCall, out);
 	else
 	{
-		auto symbTuple = dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(_funCall));
+		auto symbTuple = std::dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(_funCall));
 		solAssert(symbTuple, "");
 		solAssert(symbTuple->components().size() == outTypes.size(), "");
 		solAssert(out.sort->kind == smtutil::Kind::Tuple, "");
@@ -854,7 +854,7 @@ void SMTEncoder::visitCryptoFunction(FunctionCall const& _funCall)
 	auto const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
 	auto kind = funType.kind();
 	auto arg0 = expr(*_funCall.arguments().at(0));
-	optional<smtutil::Expression> result;
+	std::optional<smtutil::Expression> result;
 	if (kind == FunctionType::Kind::KECCAK256)
 		result = smtutil::Expression::select(state().cryptoFunction("keccak256"), arg0);
 	else if (kind == FunctionType::Kind::SHA256)
@@ -870,7 +870,7 @@ void SMTEncoder::visitCryptoFunction(FunctionCall const& _funCall)
 		auto arg3 = expr(*_funCall.arguments().at(3));
 		auto inputSort = dynamic_cast<smtutil::ArraySort&>(*e.sort).domain;
 		auto ecrecoverInput = smtutil::Expression::tuple_constructor(
-			smtutil::Expression(make_shared<smtutil::SortSort>(inputSort), ""),
+			smtutil::Expression(std::make_shared<smtutil::SortSort>(inputSort), ""),
 			{arg0, arg1, arg2, arg3}
 		);
 		result = smtutil::Expression::select(e, ecrecoverInput);
@@ -883,7 +883,7 @@ void SMTEncoder::visitCryptoFunction(FunctionCall const& _funCall)
 
 void SMTEncoder::visitGasLeft(FunctionCall const& _funCall)
 {
-	string gasLeft = "gasleft";
+	std::string gasLeft = "gasleft";
 	// We increase the variable index since gasleft changes
 	// inside a tx.
 	defineGlobalVariable(gasLeft, _funCall, true);
@@ -930,7 +930,7 @@ void SMTEncoder::visitObjectCreation(FunctionCall const& _funCall)
 	smtutil::Expression arraySize = expr(*args.front());
 	setSymbolicUnknownValue(arraySize, TypeProvider::uint256(), m_context);
 
-	auto symbArray = dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(_funCall));
+	auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(_funCall));
 	solAssert(symbArray, "");
 	smt::setSymbolicZeroValue(*symbArray, m_context);
 	auto zeroElements = symbArray->elements();
@@ -1004,9 +1004,9 @@ bool isReturnedFromStructGetter(Type const* _type)
 	return true;
 }
 
-vector<string> structGetterReturnedMembers(StructType const& _structType)
+std::vector<std::string> structGetterReturnedMembers(StructType const& _structType)
 {
-	vector<string> returnedMembers;
+	std::vector<std::string> returnedMembers;
 	for (auto const& member: _structType.nativeMembers(nullptr))
 		if (isReturnedFromStructGetter(member.type))
 			returnedMembers.push_back(member.name);
@@ -1023,7 +1023,7 @@ void SMTEncoder::visitPublicGetter(FunctionCall const& _funCall)
 	auto paramExpectedTypes = replaceUserTypes(FunctionType(*var).parameterTypes());
 	auto actualArguments = _funCall.arguments();
 	solAssert(actualArguments.size() == paramExpectedTypes.size(), "");
-	deque<smtutil::Expression> symbArguments;
+	std::deque<smtutil::Expression> symbArguments;
 	for (unsigned i = 0; i < paramExpectedTypes.size(); ++i)
 		symbArguments.push_back(expr(*actualArguments[i], paramExpectedTypes[i]));
 
@@ -1063,11 +1063,11 @@ void SMTEncoder::visitPublicGetter(FunctionCall const& _funCall)
 			case Type::Category::Struct:
 			{
 				solAssert(symbArguments.empty(), "");
-				smt::SymbolicStructVariable structVar(dynamic_cast<StructType const*>(type), "struct_temp_" + to_string(_funCall.id()), m_context);
+				smt::SymbolicStructVariable structVar(dynamic_cast<StructType const*>(type), "struct_temp_" + std::to_string(_funCall.id()), m_context);
 				m_context.addAssertion(structVar.currentValue() == currentExpr);
 				auto returnedMembers = structGetterReturnedMembers(dynamic_cast<StructType const&>(*structVar.type()));
 				solAssert(!returnedMembers.empty(), "");
-				auto returnedValues = applyMap(returnedMembers, [&](string const& memberName) -> optional<smtutil::Expression> { return structVar.member(memberName); });
+				auto returnedValues = applyMap(returnedMembers, [&](std::string const& memberName) -> std::optional<smtutil::Expression> { return structVar.member(memberName); });
 				defineExpr(_funCall, returnedValues);
 				return;
 			}
@@ -1118,7 +1118,7 @@ void SMTEncoder::visitTypeConversion(FunctionCall const& _funCall)
 
 	if (arrayType && arrayType->isByteArrayOrString() && smt::isFixedBytes(*funCallType))
 	{
-		auto array = dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(*argument));
+		auto array = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(*argument));
 		bytesToFixedBytesAssertions(*array, _funCall);
 		return;
 	}
@@ -1129,8 +1129,8 @@ void SMTEncoder::visitTypeConversion(FunctionCall const& _funCall)
 	unsigned castSize = funCallType->storageBytes();
 	bool castIsSigned = smt::isNumber(*funCallType) && smt::isSigned(funCallType);
 	bool argIsSigned = smt::isNumber(*argType) && smt::isSigned(argType);
-	optional<smtutil::Expression> symbMin;
-	optional<smtutil::Expression> symbMax;
+	std::optional<smtutil::Expression> symbMin;
+	std::optional<smtutil::Expression> symbMax;
 	if (smt::isNumber(*funCallType))
 	{
 		symbMin = smt::minValue(funCallType);
@@ -1285,7 +1285,7 @@ void SMTEncoder::endVisit(Literal const& _literal)
 		createExpr(_literal);
 
 		// Add constraints for the length and values as it is known.
-		auto symbArray = dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(_literal));
+		auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(_literal));
 		solAssert(symbArray, "");
 
 		addArrayLiteralAssertions(
@@ -1299,7 +1299,7 @@ void SMTEncoder::endVisit(Literal const& _literal)
 
 void SMTEncoder::addArrayLiteralAssertions(
 	smt::SymbolicArrayVariable& _symArray,
-	vector<smtutil::Expression> const& _elementValues
+	std::vector<smtutil::Expression> const& _elementValues
 )
 {
 	m_context.addAssertion(_symArray.length() == _elementValues.size());
@@ -1314,7 +1314,7 @@ void SMTEncoder::bytesToFixedBytesAssertions(
 {
 	auto const& fixed = dynamic_cast<FixedBytesType const&>(*_fixedBytes.annotation().type);
 	auto intType = TypeProvider::uint256();
-	string suffix = to_string(_fixedBytes.id()) + "_" + to_string(m_context.newUniqueId());
+	std::string suffix = std::to_string(_fixedBytes.id()) + "_" + std::to_string(m_context.newUniqueId());
 	smt::SymbolicIntVariable k(intType, intType, "k_" + suffix, m_context);
 	m_context.addAssertion(k.currentValue() == 0);
 	size_t n = fixed.numBytes();
@@ -1333,7 +1333,7 @@ void SMTEncoder::endVisit(Return const& _return)
 		auto returnParams = m_callStack.back().first->returnParameters();
 		if (returnParams.size() > 1)
 		{
-			auto const& symbTuple = dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(*_return.expression()));
+			auto const& symbTuple = std::dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(*_return.expression()));
 			solAssert(symbTuple, "");
 			solAssert(symbTuple->components().size() == returnParams.size(), "");
 
@@ -1428,7 +1428,7 @@ bool SMTEncoder::visit(MemberAccess const& _memberAccess)
 	else if (smt::isNonRecursiveStruct(*exprType))
 	{
 		memberExpr->accept(*this);
-		auto const& symbStruct = dynamic_pointer_cast<smt::SymbolicStructVariable>(m_context.expression(*memberExpr));
+		auto const& symbStruct = std::dynamic_pointer_cast<smt::SymbolicStructVariable>(m_context.expression(*memberExpr));
 		defineExpr(_memberAccess, symbStruct->member(_memberAccess.memberName()));
 		return false;
 	}
@@ -1471,7 +1471,7 @@ bool SMTEncoder::visit(MemberAccess const& _memberAccess)
 		memberExpr->accept(*this);
 		if (_memberAccess.memberName() == "length")
 		{
-			auto symbArray = dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(*memberExpr));
+			auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(*memberExpr));
 			solAssert(symbArray, "");
 			defineExpr(_memberAccess, symbArray->length());
 			m_uninterpretedTerms.insert(&_memberAccess);
@@ -1554,7 +1554,7 @@ void SMTEncoder::endVisit(IndexAccess const& _indexAccess)
 		return;
 	}
 
-	shared_ptr<smt::SymbolicVariable> array;
+	std::shared_ptr<smt::SymbolicVariable> array;
 	if (auto const* id = dynamic_cast<Identifier const*>(&_indexAccess.baseExpression()))
 	{
 		auto varDecl = identifierToVariable(*id);
@@ -1570,7 +1570,7 @@ void SMTEncoder::endVisit(IndexAccess const& _indexAccess)
 		array = m_context.expression(_indexAccess.baseExpression());
 	}
 
-	auto arrayVar = dynamic_pointer_cast<smt::SymbolicArrayVariable>(array);
+	auto arrayVar = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(array);
 	solAssert(arrayVar, "");
 
 	Type const* baseType = _indexAccess.baseExpression().annotation().type;
@@ -1611,10 +1611,10 @@ void SMTEncoder::indexOrMemberAssignment(Expression const& _expr, smtutil::Expre
 
 			Type const* baseType = base.annotation().type;
 			auto indexExpr = expr(*indexAccess->indexExpression(), keyType(baseType));
-			auto symbArray = dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(base));
+			auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(base));
 			solAssert(symbArray, "");
 			toStore = smtutil::Expression::tuple_constructor(
-				smtutil::Expression(make_shared<smtutil::SortSort>(smt::smtSort(*baseType)), baseType->toString(true)),
+				smtutil::Expression(std::make_shared<smtutil::SortSort>(smt::smtSort(*baseType)), baseType->toString(true)),
 				{smtutil::Expression::store(symbArray->elements(), indexExpr, toStore), symbArray->length()}
 			);
 			defineExpr(*indexAccess, smtutil::Expression::select(
@@ -1650,7 +1650,7 @@ void SMTEncoder::indexOrMemberAssignment(Expression const& _expr, smtutil::Expre
 				break;
 			}
 
-			auto symbStruct = dynamic_pointer_cast<smt::SymbolicStructVariable>(m_context.expression(base));
+			auto symbStruct = std::dynamic_pointer_cast<smt::SymbolicStructVariable>(m_context.expression(base));
 			solAssert(symbStruct, "");
 			symbStruct->assignMember(memberAccess->memberName(), toStore);
 			toStore = symbStruct->currentValue();
@@ -1688,7 +1688,7 @@ void SMTEncoder::arrayPush(FunctionCall const& _funCall)
 {
 	auto memberAccess = dynamic_cast<MemberAccess const*>(&_funCall.expression());
 	solAssert(memberAccess, "");
-	auto symbArray = dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
+	auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
 	solAssert(symbArray, "");
 	auto oldLength = symbArray->length();
 	m_context.addAssertion(oldLength >= 0);
@@ -1722,7 +1722,7 @@ void SMTEncoder::arrayPop(FunctionCall const& _funCall)
 {
 	auto memberAccess = dynamic_cast<MemberAccess const*>(cleanExpression(_funCall.expression()));
 	solAssert(memberAccess, "");
-	auto symbArray = dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
+	auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
 	solAssert(symbArray, "");
 
 	makeArrayPopVerificationTarget(_funCall);
@@ -1742,7 +1742,7 @@ void SMTEncoder::arrayPop(FunctionCall const& _funCall)
 	assignment(memberAccess->expression(), symbArray->currentValue());
 }
 
-void SMTEncoder::defineGlobalVariable(string const& _name, Expression const& _expr, bool _increaseIndex)
+void SMTEncoder::defineGlobalVariable(std::string const& _name, Expression const& _expr, bool _increaseIndex)
 {
 	if (!m_context.knownGlobalSymbol(_name))
 	{
@@ -1807,7 +1807,7 @@ void SMTEncoder::arithmeticOperation(BinaryOperation const& _op)
 	}
 }
 
-pair<smtutil::Expression, smtutil::Expression> SMTEncoder::arithmeticOperation(
+std::pair<smtutil::Expression, smtutil::Expression> SMTEncoder::arithmeticOperation(
 	Token _op,
 	smtutil::Expression const& _left,
 	smtutil::Expression const& _right,
@@ -1815,7 +1815,7 @@ pair<smtutil::Expression, smtutil::Expression> SMTEncoder::arithmeticOperation(
 	Expression const& _operation
 )
 {
-	static set<Token> validOperators{
+	static std::set<Token> validOperators{
 		Token::Add,
 		Token::Sub,
 		Token::Mul,
@@ -1862,7 +1862,7 @@ pair<smtutil::Expression, smtutil::Expression> SMTEncoder::arithmeticOperation(
 		// - RHS is -1
 		// the result is then -(type.min), which wraps back to type.min
 		smtutil::Expression maxLeft = _left == smt::minValue(*intType);
-		smtutil::Expression minusOneRight = _right == numeric_limits<size_t >::max();
+		smtutil::Expression minusOneRight = _right == std::numeric_limits<size_t >::max();
 		smtutil::Expression wrap = smtutil::Expression::ite(maxLeft && minusOneRight, smt::minValue(*intType), valueUnbounded);
 		return {wrap, valueUnbounded};
 	}
@@ -1871,7 +1871,7 @@ pair<smtutil::Expression, smtutil::Expression> SMTEncoder::arithmeticOperation(
 	auto symbMax = smt::maxValue(*intType);
 
 	smtutil::Expression intValueRange = (0 - symbMin) + symbMax + 1;
-	string suffix = to_string(_operation.id()) + "_" + to_string(m_context.newUniqueId());
+	std::string suffix = std::to_string(_operation.id()) + "_" + std::to_string(m_context.newUniqueId());
 	smt::SymbolicIntVariable k(intType, intType, "k_" + suffix, m_context);
 	smt::SymbolicIntVariable m(intType, intType, "m_" + suffix, m_context);
 
@@ -1905,7 +1905,7 @@ smtutil::Expression SMTEncoder::bitwiseOperation(
 	Type const* _commonType
 )
 {
-	static set<Token> validOperators{
+	static std::set<Token> validOperators{
 		Token::BitAnd,
 		Token::BitOr,
 		Token::BitXor,
@@ -1921,7 +1921,7 @@ smtutil::Expression SMTEncoder::bitwiseOperation(
 	auto bvLeft = smtutil::Expression::int2bv(_left, bvSize);
 	auto bvRight = smtutil::Expression::int2bv(_right, bvSize);
 
-	optional<smtutil::Expression> result;
+	std::optional<smtutil::Expression> result;
 	switch (_op)
 	{
 		case Token::BitAnd:
@@ -1962,10 +1962,10 @@ void SMTEncoder::compareOperation(BinaryOperation const& _op)
 		smtutil::Expression left(expr(_op.leftExpression(), commonType));
 		smtutil::Expression right(expr(_op.rightExpression(), commonType));
 		Token op = _op.getOperator();
-		shared_ptr<smtutil::Expression> value;
+		std::shared_ptr<smtutil::Expression> value;
 		if (smt::isNumber(*commonType))
 		{
-			value = make_shared<smtutil::Expression>(
+			value = std::make_shared<smtutil::Expression>(
 				op == Token::Equal ? (left == right) :
 				op == Token::NotEqual ? (left != right) :
 				op == Token::LessThan ? (left < right) :
@@ -1977,7 +1977,7 @@ void SMTEncoder::compareOperation(BinaryOperation const& _op)
 		else // Bool
 		{
 			solUnimplementedAssert(smt::isBool(*commonType), "Operation not yet supported");
-			value = make_shared<smtutil::Expression>(
+			value = std::make_shared<smtutil::Expression>(
 				op == Token::Equal ? (left == right) :
 				/*op == Token::NotEqual*/ (left != right)
 			);
@@ -2039,7 +2039,7 @@ void SMTEncoder::bitwiseNotOperation(UnaryOperation const& _op)
 	defineExpr(_op, smtutil::Expression::bv2int(~bvOperand, isSigned));
 }
 
-pair<smtutil::Expression, smtutil::Expression> SMTEncoder::divModWithSlacks(
+std::pair<smtutil::Expression, smtutil::Expression> SMTEncoder::divModWithSlacks(
 	smtutil::Expression _left,
 	smtutil::Expression _right,
 	IntegerType const& _type
@@ -2049,7 +2049,7 @@ pair<smtutil::Expression, smtutil::Expression> SMTEncoder::divModWithSlacks(
 		return {_left / _right, _left % _right};
 
 	IntegerType const* intType = &_type;
-	string suffix = "div_mod_" + to_string(m_context.newUniqueId());
+	std::string suffix = "div_mod_" + std::to_string(m_context.newUniqueId());
 	smt::SymbolicIntVariable dSymb(intType, intType, "d_" + suffix, m_context);
 	smt::SymbolicIntVariable rSymb(intType, intType, "r_" + suffix, m_context);
 	auto d = dSymb.currentValue();
@@ -2115,7 +2115,7 @@ void SMTEncoder::assignment(
 			{
 				auto memberAccess = dynamic_cast<MemberAccess const*>(&funCall->expression());
 				solAssert(memberAccess, "");
-				auto symbArray = dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
+				auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(memberAccess->expression()));
 				solAssert(symbArray, "");
 
 				auto oldLength = symbArray->length();
@@ -2190,14 +2190,14 @@ void SMTEncoder::tupleAssignment(Expression const& _left, Expression const& _rig
 
 smtutil::Expression SMTEncoder::compoundAssignment(Assignment const& _assignment)
 {
-	static map<Token, Token> const compoundToArithmetic{
+	static std::map<Token, Token> const compoundToArithmetic{
 		{Token::AssignAdd, Token::Add},
 		{Token::AssignSub, Token::Sub},
 		{Token::AssignMul, Token::Mul},
 		{Token::AssignDiv, Token::Div},
 		{Token::AssignMod, Token::Mod}
 	};
-	static map<Token, Token> const compoundToBitwise{
+	static std::map<Token, Token> const compoundToBitwise{
 		{Token::AssignBitAnd, Token::BitAnd},
 		{Token::AssignBitOr, Token::BitOr},
 		{Token::AssignBitXor, Token::BitXor},
@@ -2228,12 +2228,12 @@ smtutil::Expression SMTEncoder::compoundAssignment(Assignment const& _assignment
 	return values.first;
 }
 
-void SMTEncoder::expressionToTupleAssignment(vector<shared_ptr<VariableDeclaration>> const& _variables, Expression const& _rhs)
+void SMTEncoder::expressionToTupleAssignment(std::vector<std::shared_ptr<VariableDeclaration>> const& _variables, Expression const& _rhs)
 {
 	auto symbolicVar = m_context.expression(_rhs);
 	if (_variables.size() > 1)
 	{
-		auto symbTuple = dynamic_pointer_cast<smt::SymbolicTupleVariable>(symbolicVar);
+		auto symbTuple = std::dynamic_pointer_cast<smt::SymbolicTupleVariable>(symbolicVar);
 		solAssert(symbTuple, "");
 		auto const& symbComponents = symbTuple->components();
 		solAssert(symbComponents.size() == _variables.size(), "");
@@ -2282,7 +2282,7 @@ void SMTEncoder::assignment(smt::SymbolicVariable& _symVar, smtutil::Expression
 	m_context.addAssertion(_symVar.increaseIndex() == _value);
 }
 
-pair<SMTEncoder::VariableIndices, smtutil::Expression> SMTEncoder::visitBranch(
+std::pair<SMTEncoder::VariableIndices, smtutil::Expression> SMTEncoder::visitBranch(
 	ASTNode const* _statement,
 	smtutil::Expression _condition
 )
@@ -2290,7 +2290,7 @@ pair<SMTEncoder::VariableIndices, smtutil::Expression> SMTEncoder::visitBranch(
 	return visitBranch(_statement, &_condition);
 }
 
-pair<SMTEncoder::VariableIndices, smtutil::Expression> SMTEncoder::visitBranch(
+std::pair<SMTEncoder::VariableIndices, smtutil::Expression> SMTEncoder::visitBranch(
 	ASTNode const* _statement,
 	smtutil::Expression const* _condition
 )
@@ -2307,7 +2307,7 @@ pair<SMTEncoder::VariableIndices, smtutil::Expression> SMTEncoder::visitBranch(
 	return {indicesAfterBranch, pathConditionOnExit};
 }
 
-void SMTEncoder::initializeFunctionCallParameters(CallableDeclaration const& _function, vector<smtutil::Expression> const& _callArgs)
+void SMTEncoder::initializeFunctionCallParameters(CallableDeclaration const& _function, std::vector<smtutil::Expression> const& _callArgs)
 {
 	auto const& funParams = _function.parameters();
 	solAssert(funParams.size() == _callArgs.size(), "");
@@ -2319,7 +2319,7 @@ void SMTEncoder::initializeFunctionCallParameters(CallableDeclaration const& _fu
 				m_arrayAssignmentHappened = true;
 		}
 
-	vector<VariableDeclaration const*> localVars;
+	std::vector<VariableDeclaration const*> localVars;
 	if (auto const* fun = dynamic_cast<FunctionDefinition const*>(&_function))
 		localVars = localVariablesIncludingModifiers(*fun, m_currentContract);
 	else
@@ -2560,14 +2560,14 @@ void SMTEncoder::defineExpr(Expression const& _e, smtutil::Expression _value)
 		));
 }
 
-void SMTEncoder::defineExpr(Expression const& _e, vector<optional<smtutil::Expression>> const& _values)
+void SMTEncoder::defineExpr(Expression const& _e, std::vector<std::optional<smtutil::Expression>> const& _values)
 {
 	if (_values.size() == 1 && _values.front())
 	{
 		defineExpr(_e, *_values.front());
 		return;
 	}
-	auto const& symbTuple = dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(_e));
+	auto const& symbTuple = std::dynamic_pointer_cast<smt::SymbolicTupleVariable>(m_context.expression(_e));
 	solAssert(symbTuple, "");
 	symbTuple->increaseIndex();
 	auto const& symbComponents = symbTuple->components();
@@ -2606,7 +2606,7 @@ smtutil::Expression SMTEncoder::currentPathConditions()
 	return m_pathConditions.back();
 }
 
-SecondarySourceLocation SMTEncoder::callStackMessage(vector<CallStackEntry> const& _callStack)
+SecondarySourceLocation SMTEncoder::callStackMessage(std::vector<CallStackEntry> const& _callStack)
 {
 	SecondarySourceLocation callStackLocation;
 	solAssert(!_callStack.empty(), "");
@@ -2617,7 +2617,7 @@ SecondarySourceLocation SMTEncoder::callStackMessage(vector<CallStackEntry> cons
 	return callStackLocation;
 }
 
-pair<CallableDeclaration const*, ASTNode const*> SMTEncoder::popCallStack()
+std::pair<CallableDeclaration const*, ASTNode const*> SMTEncoder::popCallStack()
 {
 	solAssert(!m_callStack.empty(), "");
 	auto lastCalled = m_callStack.back();
@@ -2738,7 +2738,7 @@ TypePointers SMTEncoder::replaceUserTypes(TypePointers const& _types)
 	});
 }
 
-pair<Expression const*, FunctionCallOptions const*> SMTEncoder::functionCallExpression(FunctionCall const& _funCall)
+std::pair<Expression const*, FunctionCallOptions const*> SMTEncoder::functionCallExpression(FunctionCall const& _funCall)
 {
 	Expression const* callExpr = &_funCall.expression();
 	auto const* callOptions = dynamic_cast<FunctionCallOptions const*>(callExpr);
@@ -2775,9 +2775,9 @@ Expression const* SMTEncoder::cleanExpression(Expression const& _expr)
 	return expr;
 }
 
-set<VariableDeclaration const*> SMTEncoder::touchedVariables(ASTNode const& _node)
+std::set<VariableDeclaration const*> SMTEncoder::touchedVariables(ASTNode const& _node)
 {
-	vector<CallableDeclaration const*> callStack;
+	std::vector<CallableDeclaration const*> callStack;
 	for (auto const& call: m_callStack)
 		callStack.push_back(call.first);
 	return m_variableUsage.touchedVariables(_node, callStack);
@@ -2861,9 +2861,9 @@ bool SMTEncoder::isExternalCallToThis(Expression const* _expr) {
 	;
 }
 
-string SMTEncoder::extraComment()
+std::string SMTEncoder::extraComment()
 {
-	string extra;
+	std::string extra;
 	if (m_arrayAssignmentHappened)
 		extra +=
 			"\nNote that array aliasing is not supported,"
@@ -2921,28 +2921,28 @@ FunctionDefinition const* SMTEncoder::functionCallToDefinition(
 	return {};
 }
 
-vector<VariableDeclaration const*> SMTEncoder::stateVariablesIncludingInheritedAndPrivate(ContractDefinition const& _contract)
+std::vector<VariableDeclaration const*> SMTEncoder::stateVariablesIncludingInheritedAndPrivate(ContractDefinition const& _contract)
 {
 	return fold(
 		_contract.annotation().linearizedBaseContracts,
-		vector<VariableDeclaration const*>{},
+		std::vector<VariableDeclaration const*>{},
 		[](auto&& _acc, auto _contract) { return _acc + _contract->stateVariables(); }
 	);
 }
 
-vector<VariableDeclaration const*> SMTEncoder::stateVariablesIncludingInheritedAndPrivate(FunctionDefinition const& _function)
+std::vector<VariableDeclaration const*> SMTEncoder::stateVariablesIncludingInheritedAndPrivate(FunctionDefinition const& _function)
 {
 	if (auto contract = dynamic_cast<ContractDefinition const*>(_function.scope()))
 		return stateVariablesIncludingInheritedAndPrivate(*contract);
 	return {};
 }
 
-vector<VariableDeclaration const*> SMTEncoder::localVariablesIncludingModifiers(FunctionDefinition const& _function, ContractDefinition const* _contract)
+std::vector<VariableDeclaration const*> SMTEncoder::localVariablesIncludingModifiers(FunctionDefinition const& _function, ContractDefinition const* _contract)
 {
 	return _function.localVariables() + tryCatchVariables(_function) + modifiersVariables(_function, _contract);
 }
 
-vector<VariableDeclaration const*> SMTEncoder::tryCatchVariables(FunctionDefinition const& _function)
+std::vector<VariableDeclaration const*> SMTEncoder::tryCatchVariables(FunctionDefinition const& _function)
 {
 	struct TryCatchVarsVisitor : public ASTConstVisitor
 	{
@@ -2958,23 +2958,23 @@ vector<VariableDeclaration const*> SMTEncoder::tryCatchVariables(FunctionDefinit
 			return true;
 		}
 
-		vector<VariableDeclaration const*> vars;
+		std::vector<VariableDeclaration const*> vars;
 	} tryCatchVarsVisitor;
 	_function.accept(tryCatchVarsVisitor);
 	return tryCatchVarsVisitor.vars;
 }
 
-vector<VariableDeclaration const*> SMTEncoder::modifiersVariables(FunctionDefinition const& _function, ContractDefinition const* _contract)
+std::vector<VariableDeclaration const*> SMTEncoder::modifiersVariables(FunctionDefinition const& _function, ContractDefinition const* _contract)
 {
 	struct BlockVars: ASTConstVisitor
 	{
 		BlockVars(Block const& _block) { _block.accept(*this); }
 		void endVisit(VariableDeclaration const& _var) { vars.push_back(&_var); }
-		vector<VariableDeclaration const*> vars;
+		std::vector<VariableDeclaration const*> vars;
 	};
 
-	vector<VariableDeclaration const*> vars;
-	set<ModifierDefinition const*> visited;
+	std::vector<VariableDeclaration const*> vars;
+	std::set<ModifierDefinition const*> visited;
 	for (auto invok: _function.modifiers())
 	{
 		if (!invok)
@@ -3007,12 +3007,12 @@ ModifierDefinition const* SMTEncoder::resolveModifierInvocation(ModifierInvocati
 	return modifier;
 }
 
-set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contractFunctions(ContractDefinition const& _contract)
+std::set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contractFunctions(ContractDefinition const& _contract)
 {
 	if (!m_contractFunctions.count(&_contract))
 	{
 		auto const& functions = _contract.definedFunctions();
-		set<FunctionDefinition const*, ASTNode::CompareByID> resolvedFunctions(begin(functions), end(functions));
+		std::set<FunctionDefinition const*, ASTNode::CompareByID> resolvedFunctions(begin(functions), end(functions));
 		for (auto const* base: _contract.annotation().linearizedBaseContracts)
 		{
 			if (base == &_contract)
@@ -3042,7 +3042,7 @@ set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contract
 	return m_contractFunctions.at(&_contract);
 }
 
-set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contractFunctionsWithoutVirtual(ContractDefinition const& _contract)
+std::set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contractFunctionsWithoutVirtual(ContractDefinition const& _contract)
 {
 	if (!m_contractFunctionsWithoutVirtual.count(&_contract))
 	{
@@ -3057,9 +3057,9 @@ set<FunctionDefinition const*, ASTNode::CompareByID> const& SMTEncoder::contract
 	return m_contractFunctionsWithoutVirtual.at(&_contract);
 }
 
-map<ContractDefinition const*, vector<ASTPointer<frontend::Expression>>> SMTEncoder::baseArguments(ContractDefinition const& _contract)
+std::map<ContractDefinition const*, std::vector<ASTPointer<frontend::Expression>>> SMTEncoder::baseArguments(ContractDefinition const& _contract)
 {
-	map<ContractDefinition const*, vector<ASTPointer<Expression>>> baseArgs;
+	std::map<ContractDefinition const*, std::vector<ASTPointer<Expression>>> baseArgs;
 
 	for (auto contract: _contract.annotation().linearizedBaseContracts)
 	{
@@ -3104,7 +3104,7 @@ RationalNumberType const* SMTEncoder::isConstant(Expression const& _expr)
 	return nullptr;
 }
 
-set<FunctionCall const*, ASTCompareByID<FunctionCall>> SMTEncoder::collectABICalls(ASTNode const* _node)
+std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> SMTEncoder::collectABICalls(ASTNode const* _node)
 {
 	struct ABIFunctions: public ASTConstVisitor
 	{
@@ -3126,15 +3126,15 @@ set<FunctionCall const*, ASTCompareByID<FunctionCall>> SMTEncoder::collectABICal
 				}
 		}
 
-		set<FunctionCall const*, ASTCompareByID<FunctionCall>> abiCalls;
+		std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> abiCalls;
 	};
 
 	return ABIFunctions(_node).abiCalls;
 }
 
-set<SourceUnit const*, ASTNode::CompareByID> SMTEncoder::sourceDependencies(SourceUnit const& _source)
+std::set<SourceUnit const*, ASTNode::CompareByID> SMTEncoder::sourceDependencies(SourceUnit const& _source)
 {
-	set<SourceUnit const*, ASTNode::CompareByID> sources;
+	std::set<SourceUnit const*, ASTNode::CompareByID> sources;
 	sources.insert(&_source);
 	for (auto const& source: _source.referencedSourceUnits(true))
 		sources.insert(source);
@@ -3150,24 +3150,24 @@ void SMTEncoder::createReturnedExpressions(FunctionCall const& _funCall, Contrac
 	auto const& returnParams = funDef->returnParameters();
 	for (auto param: returnParams)
 		createVariable(*param);
-	auto returnValues = applyMap(returnParams, [this](auto const& param) -> optional<smtutil::Expression> {
+	auto returnValues = applyMap(returnParams, [this](auto const& param) -> std::optional<smtutil::Expression> {
 		solAssert(param && m_context.knownVariable(*param), "");
 		return currentValue(*param);
 	});
 	defineExpr(_funCall, returnValues);
 }
 
-vector<smtutil::Expression> SMTEncoder::symbolicArguments(FunctionCall const& _funCall, ContractDefinition const* _contextContract)
+std::vector<smtutil::Expression> SMTEncoder::symbolicArguments(FunctionCall const& _funCall, ContractDefinition const* _contextContract)
 {
 	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), _contextContract);
 	solAssert(funDef, "");
 
-	vector<smtutil::Expression> args;
+	std::vector<smtutil::Expression> args;
 	Expression const* calledExpr = &_funCall.expression();
 	auto funType = dynamic_cast<FunctionType const*>(calledExpr->annotation().type);
 	solAssert(funType, "");
 
-	vector<ASTPointer<Expression const>> arguments = _funCall.sortedArguments();
+	std::vector<ASTPointer<Expression const>> arguments = _funCall.sortedArguments();
 	auto functionParams = funDef->parameters();
 	unsigned firstParam = 0;
 	if (funType->hasBoundFirstArgument())
@@ -3204,7 +3204,7 @@ smtutil::Expression SMTEncoder::constantExpr(Expression const& _expr, VariableDe
 	solAssert(false, "");
 }
 
-void SMTEncoder::collectFreeFunctions(set<SourceUnit const*, ASTNode::CompareByID> const& _sources)
+void SMTEncoder::collectFreeFunctions(std::set<SourceUnit const*, ASTNode::CompareByID> const& _sources)
 {
 	for (auto source: _sources)
 		for (auto node: source->nodes())
@@ -3220,7 +3220,7 @@ void SMTEncoder::collectFreeFunctions(set<SourceUnit const*, ASTNode::CompareByI
 					m_freeFunctions.insert(function);
 }
 
-void SMTEncoder::createFreeConstants(set<SourceUnit const*, ASTNode::CompareByID> const& _sources)
+void SMTEncoder::createFreeConstants(std::set<SourceUnit const*, ASTNode::CompareByID> const& _sources)
 {
 	for (auto source: _sources)
 		for (auto node: source->nodes())
diff --git a/libsolidity/formal/SSAVariable.cpp b/libsolidity/formal/SSAVariable.cpp
index bb599c35a8..482388cedb 100644
--- a/libsolidity/formal/SSAVariable.cpp
+++ b/libsolidity/formal/SSAVariable.cpp
@@ -18,7 +18,6 @@
 
 #include <libsolidity/formal/SSAVariable.h>
 
-using namespace std;
 using namespace solidity::frontend;
 using namespace solidity::frontend::smt;
 
diff --git a/libsolidity/formal/SymbolicState.cpp b/libsolidity/formal/SymbolicState.cpp
index 68bd9b6462..3859e99c62 100644
--- a/libsolidity/formal/SymbolicState.cpp
+++ b/libsolidity/formal/SymbolicState.cpp
@@ -26,42 +26,41 @@
 
 #include <range/v3/view.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::smtutil;
 using namespace solidity::frontend::smt;
 
 BlockchainVariable::BlockchainVariable(
-	string _name,
-	map<string, smtutil::SortPointer> _members,
+	std::string _name,
+	std::map<std::string, smtutil::SortPointer> _members,
 	EncodingContext& _context
 ):
 	m_name(std::move(_name)),
 	m_members(std::move(_members)),
 	m_context(_context)
 {
-	vector<string> members;
-	vector<SortPointer> sorts;
+	std::vector<std::string> members;
+	std::vector<SortPointer> sorts;
 	for (auto const& [component, sort]: m_members)
 	{
 		members.emplace_back(component);
 		sorts.emplace_back(sort);
 		m_componentIndices[component] = static_cast<unsigned>(members.size() - 1);
 	}
-	m_tuple = make_unique<SymbolicTupleVariable>(
-		make_shared<smtutil::TupleSort>(m_name + "_type", members, sorts),
+	m_tuple = std::make_unique<SymbolicTupleVariable>(
+		std::make_shared<smtutil::TupleSort>(m_name + "_type", members, sorts),
 		m_name,
 		m_context
 	);
 }
 
-smtutil::Expression BlockchainVariable::member(string const& _member) const
+smtutil::Expression BlockchainVariable::member(std::string const& _member) const
 {
 	return m_tuple->component(m_componentIndices.at(_member));
 }
 
-smtutil::Expression BlockchainVariable::assignMember(string const& _member, smtutil::Expression const& _value)
+smtutil::Expression BlockchainVariable::assignMember(std::string const& _member, smtutil::Expression const& _value)
 {
 	smtutil::Expression newTuple = smt::assignMember(m_tuple->currentValue(), {{_member, _value}});
 	m_context.addAssertion(m_tuple->increaseIndex() == newTuple);
@@ -104,9 +103,9 @@ smtutil::Expression SymbolicState::blockhash(smtutil::Expression _blockNumber) c
 
 void SymbolicState::newBalances()
 {
-	auto tupleSort = dynamic_pointer_cast<TupleSort>(stateSort());
+	auto tupleSort = std::dynamic_pointer_cast<TupleSort>(stateSort());
 	auto balanceSort = tupleSort->components.at(tupleSort->memberToIndex.at("balances"));
-	SymbolicVariable newBalances(balanceSort, "fresh_balances_" + to_string(m_context.newUniqueId()), m_context);
+	SymbolicVariable newBalances(balanceSort, "fresh_balances_" + std::to_string(m_context.newUniqueId()), m_context);
 	m_state->assignMember("balances", newBalances.currentValue());
 }
 
@@ -158,7 +157,7 @@ void SymbolicState::newStorage()
 {
 	auto newStorageVar = SymbolicTupleVariable(
 		m_state->member("storage").sort,
-		"havoc_storage_" + to_string(m_context.newUniqueId()),
+		"havoc_storage_" + std::to_string(m_context.newUniqueId()),
 		m_context
 	);
 	m_state->assignMember("storage", newStorageVar.currentValue());
@@ -170,7 +169,7 @@ void SymbolicState::writeStateVars(ContractDefinition const& _contract, smtutil:
 	if (stateVars.empty())
 		return;
 
-	map<string, smtutil::Expression> values;
+	std::map<std::string, smtutil::Expression> values;
 	for (auto var: stateVars)
 		values.emplace(stateVarStorageKey(*var, _contract), m_context.variable(*var)->currentValue());
 
@@ -207,7 +206,7 @@ void SymbolicState::addBalance(smtutil::Expression _address, smtutil::Expression
 	m_state->assignMember("balances", newBalances);
 }
 
-smtutil::Expression SymbolicState::txMember(string const& _member) const
+smtutil::Expression SymbolicState::txMember(std::string const& _member) const
 {
 	return m_tx.member(_member);
 }
@@ -268,8 +267,8 @@ void SymbolicState::prepareForSourceUnit(SourceUnit const& _source, bool _storag
 {
 	auto allSources = _source.referencedSourceUnits(true);
 	allSources.insert(&_source);
-	set<FunctionCall const*, ASTCompareByID<FunctionCall>> abiCalls;
-	set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> contracts;
+	std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> abiCalls;
+	std::set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> contracts;
 	for (auto const& source: allSources)
 	{
 		abiCalls += SMTEncoder::collectABICalls(source);
@@ -283,34 +282,34 @@ void SymbolicState::prepareForSourceUnit(SourceUnit const& _source, bool _storag
 
 /// Private helpers.
 
-string SymbolicState::contractSuffix(ContractDefinition const& _contract) const
+std::string SymbolicState::contractSuffix(ContractDefinition const& _contract) const
 {
-	return "_" + _contract.name() + "_" + to_string(_contract.id());
+	return "_" + _contract.name() + "_" + std::to_string(_contract.id());
 }
 
-string SymbolicState::contractStorageKey(ContractDefinition const& _contract) const
+std::string SymbolicState::contractStorageKey(ContractDefinition const& _contract) const
 {
 	return "storage" + contractSuffix(_contract);
 }
 
-string SymbolicState::stateVarStorageKey(VariableDeclaration const& _var, ContractDefinition const& _contract) const
+std::string SymbolicState::stateVarStorageKey(VariableDeclaration const& _var, ContractDefinition const& _contract) const
 {
-	return _var.name() + "_" + to_string(_var.id()) + contractSuffix(_contract);
+	return _var.name() + "_" + std::to_string(_var.id()) + contractSuffix(_contract);
 }
 
-void SymbolicState::buildState(set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> const& _contracts, bool _allStorages)
+void SymbolicState::buildState(std::set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> const& _contracts, bool _allStorages)
 {
-	map<string, SortPointer> stateMembers{
-		{"balances", make_shared<smtutil::ArraySort>(smtutil::SortProvider::uintSort, smtutil::SortProvider::uintSort)}
+	std::map<std::string, SortPointer> stateMembers{
+		{"balances", std::make_shared<smtutil::ArraySort>(smtutil::SortProvider::uintSort, smtutil::SortProvider::uintSort)}
 	};
 
 	if (_allStorages)
 	{
-		vector<string> memberNames;
-		vector<SortPointer> memberSorts;
+		std::vector<std::string> memberNames;
+		std::vector<SortPointer> memberSorts;
 		for (auto contract: _contracts)
 		{
-			string suffix = contractSuffix(*contract);
+			std::string suffix = contractSuffix(*contract);
 
 			// z3 doesn't like empty tuples, so if the contract has 0
 			// state vars we can't put it there.
@@ -319,16 +318,16 @@ void SymbolicState::buildState(set<ContractDefinition const*, ASTCompareByID<Con
 				continue;
 
 			auto names = applyMap(stateVars, [&](auto var) {
-				return var->name() + "_" + to_string(var->id()) + suffix;
+				return var->name() + "_" + std::to_string(var->id()) + suffix;
 			});
 			auto sorts = applyMap(stateVars, [](auto var) { return smtSortAbstractFunction(*var->type()); });
 
-			string name = "storage" + suffix;
-			auto storageTuple = make_shared<smtutil::TupleSort>(
+			std::string name = "storage" + suffix;
+			auto storageTuple = std::make_shared<smtutil::TupleSort>(
 				name + "_type", names, sorts
 			);
 
-			auto storageSort = make_shared<smtutil::ArraySort>(
+			auto storageSort = std::make_shared<smtutil::ArraySort>(
 				smtSort(*TypeProvider::address()),
 				storageTuple
 			);
@@ -339,26 +338,26 @@ void SymbolicState::buildState(set<ContractDefinition const*, ASTCompareByID<Con
 
 		stateMembers.emplace(
 			"isActive",
-			make_shared<smtutil::ArraySort>(smtSort(*TypeProvider::address()), smtutil::SortProvider::boolSort)
+			std::make_shared<smtutil::ArraySort>(smtSort(*TypeProvider::address()), smtutil::SortProvider::boolSort)
 		);
 		stateMembers.emplace(
 			"storage",
-			make_shared<smtutil::TupleSort>(
+			std::make_shared<smtutil::TupleSort>(
 				"storage_type", memberNames, memberSorts
 			)
 		);
 	}
 
-	m_state = make_unique<BlockchainVariable>(
+	m_state = std::make_unique<BlockchainVariable>(
 		"state",
 		std::move(stateMembers),
 		m_context
 	);
 }
 
-void SymbolicState::buildABIFunctions(set<FunctionCall const*, ASTCompareByID<FunctionCall>> const& _abiFunctions)
+void SymbolicState::buildABIFunctions(std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> const& _abiFunctions)
 {
-	map<string, SortPointer> functions;
+	std::map<std::string, SortPointer> functions;
 
 	for (auto const* funCall: _abiFunctions)
 	{
@@ -375,8 +374,8 @@ void SymbolicState::buildABIFunctions(set<FunctionCall const*, ASTCompareByID<Fu
 
 		/// Since each abi.* function may have a different number of input/output parameters,
 		/// we generically compute those types.
-		vector<frontend::Type const*> inTypes;
-		vector<frontend::Type const*> outTypes;
+		std::vector<frontend::Type const*> inTypes;
+		std::vector<frontend::Type const*> outTypes;
 		if (t->kind() == FunctionType::Kind::ABIDecode)
 		{
 			/// abi.decode : (bytes, tuple_of_types(return_types)) -> (return_types)
@@ -415,7 +414,7 @@ void SymbolicState::buildABIFunctions(set<FunctionCall const*, ASTCompareByID<Fu
 				/// abi.encodeWithSelector : (bytes4, one_or_more_types) -> bytes
 				/// abi.encodeWithSignature : (string, one_or_more_types) -> bytes
 				inTypes.emplace_back(paramTypes.front());
-				inTypes += argTypes(vector<ASTPointer<Expression const>>(args.begin() + 1, args.end()));
+				inTypes += argTypes(std::vector<ASTPointer<Expression const>>(args.begin() + 1, args.end()));
 			}
 			else
 			{
@@ -455,25 +454,25 @@ void SymbolicState::buildABIFunctions(set<FunctionCall const*, ASTCompareByID<Fu
 
 		/// If there is only one input or output parameter, we use that type directly.
 		/// Otherwise we create a tuple wrapping the necessary input or output types.
-		auto typesToSort = [](auto const& _types, string const& _name) -> shared_ptr<Sort> {
+		auto typesToSort = [](auto const& _types, std::string const& _name) -> std::shared_ptr<Sort> {
 			if (_types.size() == 1)
 				return smtSortAbstractFunction(*_types.front());
 
-			vector<string> inNames;
-			vector<SortPointer> sorts;
+			std::vector<std::string> inNames;
+			std::vector<SortPointer> sorts;
 			for (unsigned i = 0; i < _types.size(); ++i)
 			{
-				inNames.emplace_back(_name + "_input_" + to_string(i));
+				inNames.emplace_back(_name + "_input_" + std::to_string(i));
 				sorts.emplace_back(smtSortAbstractFunction(*_types.at(i)));
 			}
-			return make_shared<smtutil::TupleSort>(
+			return std::make_shared<smtutil::TupleSort>(
 				_name + "_input",
 				inNames,
 				sorts
 			);
 		};
 
-		auto functionSort = make_shared<smtutil::ArraySort>(
+		auto functionSort = std::make_shared<smtutil::ArraySort>(
 			typesToSort(inTypes, name),
 			typesToSort(outTypes, name)
 		);
@@ -481,13 +480,13 @@ void SymbolicState::buildABIFunctions(set<FunctionCall const*, ASTCompareByID<Fu
 		functions[name] = functionSort;
 	}
 
-	m_abi = make_unique<BlockchainVariable>("abi", std::move(functions), m_context);
+	m_abi = std::make_unique<BlockchainVariable>("abi", std::move(functions), m_context);
 }
 
 smtutil::Expression SymbolicState::abiFunction(frontend::FunctionCall const* _funCall)
 {
 	solAssert(m_abi, "");
-	return m_abi->member(get<0>(m_abiMembers.at(_funCall)));
+	return m_abi->member(std::get<0>(m_abiMembers.at(_funCall)));
 }
 
 SymbolicState::SymbolicABIFunction const& SymbolicState::abiFunctionTypes(FunctionCall const* _funCall) const
diff --git a/libsolidity/formal/SymbolicTypes.cpp b/libsolidity/formal/SymbolicTypes.cpp
index ccabebcc3b..45b872b3d0 100644
--- a/libsolidity/formal/SymbolicTypes.cpp
+++ b/libsolidity/formal/SymbolicTypes.cpp
@@ -26,7 +26,6 @@
 #include <memory>
 #include <vector>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::smtutil;
 
@@ -52,7 +51,7 @@ SortPointer smtSort(frontend::Type const& _type)
 	{
 		auto fType = dynamic_cast<frontend::FunctionType const*>(&_type);
 		solAssert(fType, "");
-		vector<SortPointer> parameterSorts = smtSort(fType->parameterTypes());
+		std::vector<SortPointer> parameterSorts = smtSort(fType->parameterTypes());
 		auto returnTypes = fType->returnParameterTypes();
 		SortPointer returnSort;
 		// TODO change this when we support tuples.
@@ -64,22 +63,22 @@ SortPointer smtSort(frontend::Type const& _type)
 			returnSort = SortProvider::uintSort;
 		else
 			returnSort = smtSort(*returnTypes.front());
-		return make_shared<FunctionSort>(parameterSorts, returnSort);
+		return std::make_shared<FunctionSort>(parameterSorts, returnSort);
 	}
 	case Kind::Array:
 	{
-		shared_ptr<ArraySort> array;
+		std::shared_ptr<ArraySort> array;
 		if (isMapping(_type))
 		{
 			auto mapType = dynamic_cast<frontend::MappingType const*>(&_type);
 			solAssert(mapType, "");
-			array = make_shared<ArraySort>(smtSortAbstractFunction(*mapType->keyType()), smtSortAbstractFunction(*mapType->valueType()));
+			array = std::make_shared<ArraySort>(smtSortAbstractFunction(*mapType->keyType()), smtSortAbstractFunction(*mapType->valueType()));
 		}
 		else if (isStringLiteral(_type))
 		{
 			auto stringLitType = dynamic_cast<frontend::StringLiteralType const*>(&_type);
 			solAssert(stringLitType, "");
-			array = make_shared<ArraySort>(SortProvider::uintSort, SortProvider::uintSort);
+			array = std::make_shared<ArraySort>(SortProvider::uintSort, SortProvider::uintSort);
 		}
 		else
 		{
@@ -92,10 +91,10 @@ SortPointer smtSort(frontend::Type const& _type)
 				solAssert(false, "");
 
 			solAssert(arrayType, "");
-			array = make_shared<ArraySort>(SortProvider::uintSort, smtSortAbstractFunction(*arrayType->baseType()));
+			array = std::make_shared<ArraySort>(SortProvider::uintSort, smtSortAbstractFunction(*arrayType->baseType()));
 		}
 
-		string tupleName;
+		std::string tupleName;
 		auto sliceArrayType = dynamic_cast<ArraySliceType const*>(&_type);
 		ArrayType const* arrayType = sliceArrayType ? &sliceArrayType->arrayType() : dynamic_cast<ArrayType const*>(&_type);
 		if (
@@ -109,7 +108,7 @@ SortPointer smtSort(frontend::Type const& _type)
 			// Solidity allows implicit conversion also when assigning arrays.
 			// So if the base type potentially has a size, that size cannot go
 			// in the tuple's name.
-			if (auto tupleSort = dynamic_pointer_cast<TupleSort>(array->range))
+			if (auto tupleSort = std::dynamic_pointer_cast<TupleSort>(array->range))
 				tupleName = tupleSort->name;
 			else if (
 				baseType->category() == frontend::Type::Category::Integer ||
@@ -128,23 +127,23 @@ SortPointer smtSort(frontend::Type const& _type)
 
 		tupleName += "_tuple";
 
-		return make_shared<TupleSort>(
+		return std::make_shared<TupleSort>(
 			tupleName,
-			vector<string>{tupleName + "_accessor_array", tupleName + "_accessor_length"},
-			vector<SortPointer>{array, SortProvider::uintSort}
+			std::vector<std::string>{tupleName + "_accessor_array", tupleName + "_accessor_length"},
+			std::vector<SortPointer>{array, SortProvider::uintSort}
 		);
 	}
 	case Kind::Tuple:
 	{
-		vector<string> members;
+		std::vector<std::string> members;
 		auto const& tupleName = _type.toString(true);
-		vector<SortPointer> sorts;
+		std::vector<SortPointer> sorts;
 
 		if (auto const* tupleType = dynamic_cast<frontend::TupleType const*>(&_type))
 		{
 			auto const& components = tupleType->components();
 			for (unsigned i = 0; i < components.size(); ++i)
-				members.emplace_back(tupleName + "_accessor_" + to_string(i));
+				members.emplace_back(tupleName + "_accessor_" + std::to_string(i));
 			sorts = smtSortAbstractFunction(tupleType->components());
 		}
 		else if (auto const* structType = dynamic_cast<frontend::StructType const*>(&_type))
@@ -161,7 +160,7 @@ SortPointer smtSort(frontend::Type const& _type)
 		else
 			solAssert(false, "");
 
-		return make_shared<TupleSort>(tupleName, members, sorts);
+		return std::make_shared<TupleSort>(tupleName, members, sorts);
 	}
 	default:
 		// Abstract case.
@@ -169,9 +168,9 @@ SortPointer smtSort(frontend::Type const& _type)
 	}
 }
 
-vector<SortPointer> smtSort(vector<frontend::Type const*> const& _types)
+std::vector<SortPointer> smtSort(std::vector<frontend::Type const*> const& _types)
 {
-	vector<SortPointer> sorts;
+	std::vector<SortPointer> sorts;
 	for (auto const& type: _types)
 		sorts.push_back(smtSort(*type));
 	return sorts;
@@ -184,9 +183,9 @@ SortPointer smtSortAbstractFunction(frontend::Type const& _type)
 	return smtSort(_type);
 }
 
-vector<SortPointer> smtSortAbstractFunction(vector<frontend::Type const*> const& _types)
+std::vector<SortPointer> smtSortAbstractFunction(std::vector<frontend::Type const*> const& _types)
 {
-	vector<SortPointer> sorts;
+	std::vector<SortPointer> sorts;
 	for (auto const& type: _types)
 		if (type)
 			sorts.push_back(smtSortAbstractFunction(*type));
@@ -233,14 +232,14 @@ bool isSupportedTypeDeclaration(frontend::Type const& _type)
 		isFunction(_type);
 }
 
-pair<bool, shared_ptr<SymbolicVariable>> newSymbolicVariable(
+std::pair<bool, std::shared_ptr<SymbolicVariable>> newSymbolicVariable(
 	frontend::Type const& _type,
 	std::string const& _uniqueName,
 	EncodingContext& _context
 )
 {
 	bool abstract = false;
-	shared_ptr<SymbolicVariable> var;
+	std::shared_ptr<SymbolicVariable> var;
 	frontend::Type const* type = &_type;
 
 	if (auto userType = dynamic_cast<UserDefinedValueType const*>(type))
@@ -249,10 +248,10 @@ pair<bool, shared_ptr<SymbolicVariable>> newSymbolicVariable(
 	if (!isSupportedTypeDeclaration(_type))
 	{
 		abstract = true;
-		var = make_shared<SymbolicIntVariable>(frontend::TypeProvider::uint256(), type, _uniqueName, _context);
+		var = std::make_shared<SymbolicIntVariable>(frontend::TypeProvider::uint256(), type, _uniqueName, _context);
 	}
 	else if (isBool(_type))
-		var = make_shared<SymbolicBoolVariable>(type, _uniqueName, _context);
+		var = std::make_shared<SymbolicBoolVariable>(type, _uniqueName, _context);
 	else if (isFunction(_type))
 	{
 		auto const& fType = dynamic_cast<FunctionType const*>(type);
@@ -271,45 +270,45 @@ pair<bool, shared_ptr<SymbolicVariable>> newSymbolicVariable(
 		)
 		{
 			abstract = true;
-			var = make_shared<SymbolicIntVariable>(TypeProvider::uint256(), type, _uniqueName, _context);
+			var = std::make_shared<SymbolicIntVariable>(TypeProvider::uint256(), type, _uniqueName, _context);
 		}
 		else
-			var = make_shared<SymbolicFunctionVariable>(type, _uniqueName, _context);
+			var = std::make_shared<SymbolicFunctionVariable>(type, _uniqueName, _context);
 	}
 	else if (isInteger(_type))
-		var = make_shared<SymbolicIntVariable>(type, type, _uniqueName, _context);
+		var = std::make_shared<SymbolicIntVariable>(type, type, _uniqueName, _context);
 	else if (isFixedPoint(_type))
-		var = make_shared<SymbolicIntVariable>(type, type, _uniqueName, _context);
+		var = std::make_shared<SymbolicIntVariable>(type, type, _uniqueName, _context);
 	else if (isFixedBytes(_type))
 	{
 		auto fixedBytesType = dynamic_cast<frontend::FixedBytesType const*>(type);
 		solAssert(fixedBytesType, "");
-		var = make_shared<SymbolicFixedBytesVariable>(type, fixedBytesType->numBytes(), _uniqueName, _context);
+		var = std::make_shared<SymbolicFixedBytesVariable>(type, fixedBytesType->numBytes(), _uniqueName, _context);
 	}
 	else if (isAddress(_type) || isContract(_type))
-		var = make_shared<SymbolicAddressVariable>(_uniqueName, _context);
+		var = std::make_shared<SymbolicAddressVariable>(_uniqueName, _context);
 	else if (isEnum(_type))
-		var = make_shared<SymbolicEnumVariable>(type, _uniqueName, _context);
+		var = std::make_shared<SymbolicEnumVariable>(type, _uniqueName, _context);
 	else if (isRational(_type))
 	{
 		auto rational = dynamic_cast<frontend::RationalNumberType const*>(&_type);
 		solAssert(rational, "");
 		if (rational->isFractional())
-			var = make_shared<SymbolicIntVariable>(frontend::TypeProvider::uint256(), type, _uniqueName, _context);
+			var = std::make_shared<SymbolicIntVariable>(frontend::TypeProvider::uint256(), type, _uniqueName, _context);
 		else
-			var = make_shared<SymbolicIntVariable>(type, type, _uniqueName, _context);
+			var = std::make_shared<SymbolicIntVariable>(type, type, _uniqueName, _context);
 	}
 	else if (isMapping(_type) || isArray(_type))
-		var = make_shared<SymbolicArrayVariable>(type, type, _uniqueName, _context);
+		var = std::make_shared<SymbolicArrayVariable>(type, type, _uniqueName, _context);
 	else if (isTuple(_type))
-		var = make_shared<SymbolicTupleVariable>(type, _uniqueName, _context);
+		var = std::make_shared<SymbolicTupleVariable>(type, _uniqueName, _context);
 	else if (isStringLiteral(_type))
 	{
 		auto stringType = TypeProvider::stringMemory();
-		var = make_shared<SymbolicArrayVariable>(stringType, type, _uniqueName, _context);
+		var = std::make_shared<SymbolicArrayVariable>(stringType, type, _uniqueName, _context);
 	}
 	else if (isNonRecursiveStruct(_type))
-		var = make_shared<SymbolicStructVariable>(type, _uniqueName, _context);
+		var = std::make_shared<SymbolicStructVariable>(type, _uniqueName, _context);
 	else
 		solAssert(false, "");
 	return make_pair(abstract, var);
@@ -482,9 +481,9 @@ smtutil::Expression zeroValue(frontend::Type const* _type)
 			return smtutil::Expression(false);
 		if (isArray(*_type) || isMapping(*_type))
 		{
-			auto tupleSort = dynamic_pointer_cast<TupleSort>(smtSort(*_type));
+			auto tupleSort = std::dynamic_pointer_cast<TupleSort>(smtSort(*_type));
 			solAssert(tupleSort, "");
-			auto sortSort = make_shared<SortSort>(tupleSort->components.front());
+			auto sortSort = std::make_shared<SortSort>(tupleSort->components.front());
 
 			std::optional<smtutil::Expression> zeroArray;
 			auto length = bigint(0);
@@ -502,16 +501,16 @@ smtutil::Expression zeroValue(frontend::Type const* _type)
 			solAssert(zeroArray, "");
 			return smtutil::Expression::tuple_constructor(
 				smtutil::Expression(std::make_shared<SortSort>(tupleSort), tupleSort->name),
-				vector<smtutil::Expression>{*zeroArray, length}
+				std::vector<smtutil::Expression>{*zeroArray, length}
 			);
 
 		}
 		if (isNonRecursiveStruct(*_type))
 		{
 			auto const* structType = dynamic_cast<StructType const*>(_type);
-			auto structSort = dynamic_pointer_cast<TupleSort>(smtSort(*_type));
+			auto structSort = std::dynamic_pointer_cast<TupleSort>(smtSort(*_type));
 			return smtutil::Expression::tuple_constructor(
-				smtutil::Expression(make_shared<SortSort>(structSort), structSort->name),
+				smtutil::Expression(std::make_shared<SortSort>(structSort), structSort->name),
 				applyMap(
 					structType->structDefinition().members(),
 					[](auto var) { return zeroValue(var->type()); }
@@ -550,7 +549,7 @@ bool isSigned(frontend::Type const* _type)
 	return isSigned;
 }
 
-pair<unsigned, bool> typeBvSizeAndSignedness(frontend::Type const* _type)
+std::pair<unsigned, bool> typeBvSizeAndSignedness(frontend::Type const* _type)
 {
 	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_type))
 		return typeBvSizeAndSignedness(&userType->underlyingType());
@@ -596,7 +595,7 @@ smtutil::Expression symbolicUnknownConstraints(smtutil::Expression _expr, fronte
 	return smtutil::Expression(true);
 }
 
-optional<smtutil::Expression> symbolicTypeConversion(frontend::Type const* _from, frontend::Type const* _to)
+std::optional<smtutil::Expression> symbolicTypeConversion(frontend::Type const* _from, frontend::Type const* _to)
 {
 	if (auto userType = dynamic_cast<UserDefinedValueType const*>(_to))
 		return symbolicTypeConversion(_from, &userType->underlyingType());
@@ -618,7 +617,7 @@ optional<smtutil::Expression> symbolicTypeConversion(frontend::Type const* _from
 	return std::nullopt;
 }
 
-smtutil::Expression member(smtutil::Expression const& _tuple, string const& _member)
+smtutil::Expression member(smtutil::Expression const& _tuple, std::string const& _member)
 {
 	TupleSort const& _sort = dynamic_cast<TupleSort const&>(*_tuple.sort);
 	return smtutil::Expression::tuple_get(
@@ -627,16 +626,16 @@ smtutil::Expression member(smtutil::Expression const& _tuple, string const& _mem
 	);
 }
 
-smtutil::Expression assignMember(smtutil::Expression const _tuple, map<string, smtutil::Expression> const& _values)
+smtutil::Expression assignMember(smtutil::Expression const _tuple, std::map<std::string, smtutil::Expression> const& _values)
 {
 	TupleSort const& _sort = dynamic_cast<TupleSort const&>(*_tuple.sort);
-	vector<smtutil::Expression> args;
+	std::vector<smtutil::Expression> args;
 	for (auto const& m: _sort.members)
 		if (auto* value = util::valueOrNullptr(_values, m))
 			args.emplace_back(*value);
 		else
 			args.emplace_back(member(_tuple, m));
-	auto sortExpr = smtutil::Expression(make_shared<smtutil::SortSort>(_tuple.sort), _tuple.name);
+	auto sortExpr = smtutil::Expression(std::make_shared<smtutil::SortSort>(_tuple.sort), _tuple.name);
 	return smtutil::Expression::tuple_constructor(sortExpr, args);
 }
 
diff --git a/libsolidity/formal/SymbolicVariables.cpp b/libsolidity/formal/SymbolicVariables.cpp
index 799ac4adb4..6d6dbee65d 100644
--- a/libsolidity/formal/SymbolicVariables.cpp
+++ b/libsolidity/formal/SymbolicVariables.cpp
@@ -23,7 +23,6 @@
 
 #include <libsolutil/Algorithms.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::smtutil;
@@ -33,14 +32,14 @@ using namespace solidity::frontend::smt;
 SymbolicVariable::SymbolicVariable(
 	frontend::Type const* _type,
 	frontend::Type const* _originalType,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	m_type(_type),
 	m_originalType(_originalType),
 	m_uniqueName(std::move(_uniqueName)),
 	m_context(_context),
-	m_ssa(make_unique<SSAVariable>())
+	m_ssa(std::make_unique<SSAVariable>())
 {
 	solAssert(m_type, "");
 	m_sort = smtSort(*m_type);
@@ -49,13 +48,13 @@ SymbolicVariable::SymbolicVariable(
 
 SymbolicVariable::SymbolicVariable(
 	SortPointer _sort,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	m_sort(std::move(_sort)),
 	m_uniqueName(std::move(_uniqueName)),
 	m_context(_context),
-	m_ssa(make_unique<SSAVariable>())
+	m_ssa(std::make_unique<SSAVariable>())
 {
 	solAssert(m_sort, "");
 }
@@ -65,7 +64,7 @@ smtutil::Expression SymbolicVariable::currentValue(frontend::Type const*) const
 	return valueAtIndex(m_ssa->index());
 }
 
-string SymbolicVariable::currentName() const
+std::string SymbolicVariable::currentName() const
 {
 	return uniqueSymbol(m_ssa->index());
 }
@@ -75,14 +74,14 @@ smtutil::Expression SymbolicVariable::valueAtIndex(unsigned _index) const
 	return m_context.newVariable(uniqueSymbol(_index), m_sort);
 }
 
-string SymbolicVariable::nameAtIndex(unsigned _index) const
+std::string SymbolicVariable::nameAtIndex(unsigned _index) const
 {
 	return uniqueSymbol(_index);
 }
 
-string SymbolicVariable::uniqueSymbol(unsigned _index) const
+std::string SymbolicVariable::uniqueSymbol(unsigned _index) const
 {
-	return m_uniqueName + "_" + to_string(_index);
+	return m_uniqueName + "_" + std::to_string(_index);
 }
 
 smtutil::Expression SymbolicVariable::resetIndex()
@@ -105,7 +104,7 @@ smtutil::Expression SymbolicVariable::increaseIndex()
 
 SymbolicBoolVariable::SymbolicBoolVariable(
 	frontend::Type const* _type,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
@@ -116,7 +115,7 @@ SymbolicBoolVariable::SymbolicBoolVariable(
 SymbolicIntVariable::SymbolicIntVariable(
 	frontend::Type const* _type,
 	frontend::Type const* _originalType,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicVariable(_type, _originalType, std::move(_uniqueName), _context)
@@ -125,7 +124,7 @@ SymbolicIntVariable::SymbolicIntVariable(
 }
 
 SymbolicAddressVariable::SymbolicAddressVariable(
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicIntVariable(TypeProvider::uint(160), TypeProvider::uint(160), std::move(_uniqueName), _context)
@@ -135,7 +134,7 @@ SymbolicAddressVariable::SymbolicAddressVariable(
 SymbolicFixedBytesVariable::SymbolicFixedBytesVariable(
 	frontend::Type const* _originalType,
 	unsigned _numBytes,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicIntVariable(TypeProvider::uint(_numBytes * 8), _originalType, std::move(_uniqueName), _context)
@@ -144,7 +143,7 @@ SymbolicFixedBytesVariable::SymbolicFixedBytesVariable(
 
 SymbolicFunctionVariable::SymbolicFunctionVariable(
 	frontend::Type const* _type,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicVariable(_type, _type, std::move(_uniqueName), _context),
@@ -155,7 +154,7 @@ SymbolicFunctionVariable::SymbolicFunctionVariable(
 
 SymbolicFunctionVariable::SymbolicFunctionVariable(
 	SortPointer _sort,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicVariable(std::move(_sort), std::move(_uniqueName), _context),
@@ -204,7 +203,7 @@ smtutil::Expression SymbolicFunctionVariable::increaseIndex()
 	return m_abstract.currentValue();
 }
 
-smtutil::Expression SymbolicFunctionVariable::operator()(vector<smtutil::Expression> _arguments) const
+smtutil::Expression SymbolicFunctionVariable::operator()(std::vector<smtutil::Expression> _arguments) const
 {
 	return m_declaration(_arguments);
 }
@@ -216,7 +215,7 @@ void SymbolicFunctionVariable::resetDeclaration()
 
 SymbolicEnumVariable::SymbolicEnumVariable(
 	frontend::Type const* _type,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
@@ -226,7 +225,7 @@ SymbolicEnumVariable::SymbolicEnumVariable(
 
 SymbolicTupleVariable::SymbolicTupleVariable(
 	frontend::Type const* _type,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
@@ -236,7 +235,7 @@ SymbolicTupleVariable::SymbolicTupleVariable(
 
 SymbolicTupleVariable::SymbolicTupleVariable(
 	SortPointer _sort,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicVariable(std::move(_sort), std::move(_uniqueName), _context)
@@ -249,22 +248,22 @@ smtutil::Expression SymbolicTupleVariable::currentValue(frontend::Type const* _t
 	if (!_targetType || sort() == smtSort(*_targetType))
 		return SymbolicVariable::currentValue();
 
-	auto thisTuple = dynamic_pointer_cast<TupleSort>(sort());
-	auto otherTuple = dynamic_pointer_cast<TupleSort>(smtSort(*_targetType));
+	auto thisTuple = std::dynamic_pointer_cast<TupleSort>(sort());
+	auto otherTuple = std::dynamic_pointer_cast<TupleSort>(smtSort(*_targetType));
 	solAssert(thisTuple && otherTuple, "");
 	solAssert(thisTuple->components.size() == otherTuple->components.size(), "");
-	vector<smtutil::Expression> args;
+	std::vector<smtutil::Expression> args;
 	for (size_t i = 0; i < thisTuple->components.size(); ++i)
 		args.emplace_back(component(i, type(), _targetType));
 	return smtutil::Expression::tuple_constructor(
-		smtutil::Expression(make_shared<smtutil::SortSort>(smtSort(*_targetType)), ""),
+		smtutil::Expression(std::make_shared<smtutil::SortSort>(smtSort(*_targetType)), ""),
 		args
 	);
 }
 
-vector<SortPointer> const& SymbolicTupleVariable::components() const
+std::vector<SortPointer> const& SymbolicTupleVariable::components() const
 {
-	auto tupleSort = dynamic_pointer_cast<TupleSort>(m_sort);
+	auto tupleSort = std::dynamic_pointer_cast<TupleSort>(m_sort);
 	solAssert(tupleSort, "");
 	return tupleSort->components;
 }
@@ -275,7 +274,7 @@ smtutil::Expression SymbolicTupleVariable::component(
 	frontend::Type const* _toType
 ) const
 {
-	optional<smtutil::Expression> conversion = symbolicTypeConversion(_fromType, _toType);
+	std::optional<smtutil::Expression> conversion = symbolicTypeConversion(_fromType, _toType);
 	if (conversion)
 		return *conversion;
 
@@ -285,7 +284,7 @@ smtutil::Expression SymbolicTupleVariable::component(
 SymbolicArrayVariable::SymbolicArrayVariable(
 	frontend::Type const* _type,
 	frontend::Type const* _originalType,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicVariable(_type, _originalType, std::move(_uniqueName), _context),
@@ -300,7 +299,7 @@ SymbolicArrayVariable::SymbolicArrayVariable(
 
 SymbolicArrayVariable::SymbolicArrayVariable(
 	SortPointer _sort,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicVariable(std::move(_sort), std::move(_uniqueName), _context),
@@ -319,7 +318,7 @@ SymbolicArrayVariable::SymbolicArrayVariable(
 
 smtutil::Expression SymbolicArrayVariable::currentValue(frontend::Type const* _targetType) const
 {
-	optional<smtutil::Expression> conversion = symbolicTypeConversion(m_originalType, _targetType);
+	std::optional<smtutil::Expression> conversion = symbolicTypeConversion(m_originalType, _targetType);
 	if (conversion)
 		return *conversion;
 
@@ -343,7 +342,7 @@ smtutil::Expression SymbolicArrayVariable::length() const
 
 SymbolicStructVariable::SymbolicStructVariable(
 	frontend::Type const* _type,
-	string _uniqueName,
+	std::string _uniqueName,
 	EncodingContext& _context
 ):
 	SymbolicVariable(_type, _type, std::move(_uniqueName), _context)
@@ -359,12 +358,12 @@ SymbolicStructVariable::SymbolicStructVariable(
 	}
 }
 
-smtutil::Expression SymbolicStructVariable::member(string const& _member) const
+smtutil::Expression SymbolicStructVariable::member(std::string const& _member) const
 {
 	return smtutil::Expression::tuple_get(currentValue(), m_memberIndices.at(_member));
 }
 
-smtutil::Expression SymbolicStructVariable::assignMember(string const& _member, smtutil::Expression const& _memberValue)
+smtutil::Expression SymbolicStructVariable::assignMember(std::string const& _member, smtutil::Expression const& _memberValue)
 {
 	auto const* structType = dynamic_cast<StructType const*>(m_type);
 	solAssert(structType, "");
@@ -385,7 +384,7 @@ smtutil::Expression SymbolicStructVariable::assignMember(string const& _member,
 	return currentValue();
 }
 
-smtutil::Expression SymbolicStructVariable::assignAllMembers(vector<smtutil::Expression> const& _memberValues)
+smtutil::Expression SymbolicStructVariable::assignAllMembers(std::vector<smtutil::Expression> const& _memberValues)
 {
 	auto structType = dynamic_cast<StructType const*>(m_type);
 	solAssert(structType, "");
diff --git a/libsolidity/formal/VariableUsage.cpp b/libsolidity/formal/VariableUsage.cpp
index 9ae4120c80..ab7c425ae4 100644
--- a/libsolidity/formal/VariableUsage.cpp
+++ b/libsolidity/formal/VariableUsage.cpp
@@ -25,13 +25,12 @@
 
 #include <algorithm>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
 using namespace solidity::frontend::smt;
 
-set<VariableDeclaration const*> VariableUsage::touchedVariables(ASTNode const& _node, vector<CallableDeclaration const*> const& _outerCallstack)
+std::set<VariableDeclaration const*> VariableUsage::touchedVariables(ASTNode const& _node, std::vector<CallableDeclaration const*> const& _outerCallstack)
 {
 	m_touchedVariables.clear();
 	m_callStack.clear();
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 917deea113..cfc9def7ab 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -29,6 +29,7 @@ NAMESPACE_STD_FREE_FILES=(
     libsolidity/ast/*
     libsolidity/codegen/ir/*
     libsolidity/codegen/*
+    libsolidity/formal/*
 )
 
 (

From 342ba0324fafabd5f0e49101b20f365da9eeae86 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 15 Aug 2023 10:53:51 +0200
Subject: [PATCH 1543/1748] Purge using namespace std from
 libsolidity/interface

---
 libsolidity/interface/ABI.cpp              |  19 +-
 libsolidity/interface/CompilerStack.cpp    | 230 ++++++++++-----------
 libsolidity/interface/FileReader.cpp       |  30 ++-
 libsolidity/interface/GasEstimator.cpp     |  19 +-
 libsolidity/interface/ImportRemapper.cpp   |  45 ++--
 libsolidity/interface/Natspec.cpp          |  40 ++--
 libsolidity/interface/SMTSolverCommand.cpp |   9 +-
 libsolidity/interface/StandardCompiler.cpp | 156 +++++++-------
 libsolidity/interface/StorageLayout.cpp    |   3 +-
 libsolidity/interface/Version.cpp          |  20 +-
 scripts/check_style.sh                     |   1 +
 11 files changed, 276 insertions(+), 296 deletions(-)

diff --git a/libsolidity/interface/ABI.cpp b/libsolidity/interface/ABI.cpp
index bfc9c07a52..cf6e863bbb 100644
--- a/libsolidity/interface/ABI.cpp
+++ b/libsolidity/interface/ABI.cpp
@@ -23,7 +23,6 @@
 
 #include <libsolidity/ast/AST.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
@@ -42,9 +41,9 @@ bool anyDataStoredInStorage(TypePointers const& _pointers)
 Json::Value ABI::generate(ContractDefinition const& _contractDef)
 {
 	auto compare = [](Json::Value const& _a, Json::Value const& _b) -> bool {
-		return make_tuple(_a["type"], _a["name"]) < make_tuple(_b["type"], _b["name"]);
+		return std::make_tuple(_a["type"], _a["name"]) < std::make_tuple(_b["type"], _b["name"]);
 	};
-	multiset<Json::Value, decltype(compare)> abi(compare);
+	std::multiset<Json::Value, decltype(compare)> abi(compare);
 
 	for (auto it: _contractDef.interfaceFunctions())
 	{
@@ -144,9 +143,9 @@ Json::Value ABI::generate(ContractDefinition const& _contractDef)
 }
 
 Json::Value ABI::formatTypeList(
-	vector<string> const& _names,
-	vector<Type const*> const& _encodingTypes,
-	vector<Type const*> const& _solidityTypes,
+	std::vector<std::string> const& _names,
+	std::vector<Type const*> const& _encodingTypes,
+	std::vector<Type const*> const& _solidityTypes,
 	bool _forLibrary
 )
 {
@@ -162,7 +161,7 @@ Json::Value ABI::formatTypeList(
 }
 
 Json::Value ABI::formatType(
-	string const& _name,
+	std::string const& _name,
 	Type const& _encodingType,
 	Type const& _solidityType,
 	bool _forLibrary
@@ -171,7 +170,7 @@ Json::Value ABI::formatType(
 	Json::Value ret{Json::objectValue};
 	ret["name"] = _name;
 	ret["internalType"] = _solidityType.toString(true);
-	string suffix = (_forLibrary && _encodingType.dataStoredIn(DataLocation::Storage)) ? " storage" : "";
+	std::string suffix = (_forLibrary && _encodingType.dataStoredIn(DataLocation::Storage)) ? " storage" : "";
 	if (_encodingType.isValueType() || (_forLibrary && _encodingType.dataStoredIn(DataLocation::Storage)))
 		ret["type"] = _encodingType.canonicalName() + suffix;
 	else if (ArrayType const* arrayType = dynamic_cast<ArrayType const*>(&_encodingType))
@@ -180,11 +179,11 @@ Json::Value ABI::formatType(
 			ret["type"] = _encodingType.canonicalName() + suffix;
 		else
 		{
-			string suffix;
+			std::string suffix;
 			if (arrayType->isDynamicallySized())
 				suffix = "[]";
 			else
-				suffix = string("[") + arrayType->length().str() + "]";
+				suffix = std::string("[") + arrayType->length().str() + "]";
 			solAssert(arrayType->baseType(), "");
 			Json::Value subtype = formatType(
 				"",
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 84f886d721..295811fd06 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -94,11 +94,11 @@
 #include <limits>
 #include <string>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::stdlib;
+using namespace std::string_literals;
 
 using solidity::util::errinfo_comment;
 
@@ -132,10 +132,10 @@ void CompilerStack::createAndAssignCallGraphs()
 			ContractDefinitionAnnotation& annotation =
 				m_contracts.at(contract->fullyQualifiedName()).contract->annotation();
 
-			annotation.creationCallGraph = make_unique<CallGraph>(
+			annotation.creationCallGraph = std::make_unique<CallGraph>(
 				FunctionCallGraphBuilder::buildCreationGraph(*contract)
 			);
-			annotation.deployedCallGraph = make_unique<CallGraph>(
+			annotation.deployedCallGraph = std::make_unique<CallGraph>(
 				FunctionCallGraphBuilder::buildDeployedGraph(
 					*contract,
 					**annotation.creationCallGraph
@@ -155,7 +155,7 @@ void CompilerStack::createAndAssignCallGraphs()
 void CompilerStack::findAndReportCyclicContractDependencies()
 {
 	// Cycles we found, used to avoid duplicate reports for the same reference
-	set<ASTNode const*, ASTNode::CompareByID> foundCycles;
+	std::set<ASTNode const*, ASTNode::CompareByID> foundCycles;
 
 	for (Source const* source: m_sourceOrder)
 	{
@@ -208,7 +208,7 @@ void CompilerStack::findAndReportCyclicContractDependencies()
 	}
 }
 
-void CompilerStack::setRemappings(vector<ImportRemapper::Remapping> _remappings)
+void CompilerStack::setRemappings(std::vector<ImportRemapper::Remapping> _remappings)
 {
 	if (m_stackState >= ParsedAndImported)
 		solThrow(CompilerError, "Must set remappings before parsing.");
@@ -247,7 +247,7 @@ void CompilerStack::setModelCheckerSettings(ModelCheckerSettings _settings)
 	m_modelCheckerSettings = _settings;
 }
 
-void CompilerStack::setLibraries(map<string, util::h160> const& _libraries)
+void CompilerStack::setLibraries(std::map<std::string, util::h160> const& _libraries)
 {
 	if (m_stackState >= ParsedAndImported)
 		solThrow(CompilerError, "Must set libraries before parsing.");
@@ -271,7 +271,7 @@ void CompilerStack::setOptimiserSettings(OptimiserSettings _settings)
 void CompilerStack::setRevertStringBehaviour(RevertStrings _revertStrings)
 {
 	if (m_stackState >= ParsedAndImported)
-		solThrow(CompilerError, "Must set revert string settings before parsing.");
+		solThrow(CompilerError, "Must set revert std::string settings before parsing.");
 	solUnimplementedAssert(_revertStrings != RevertStrings::VerboseDebug);
 	m_revertStrings = _revertStrings;
 }
@@ -297,7 +297,7 @@ void CompilerStack::selectDebugInfo(DebugInfoSelection _debugInfoSelection)
 	m_debugInfoSelection = _debugInfoSelection;
 }
 
-void CompilerStack::addSMTLib2Response(h256 const& _hash, string const& _response)
+void CompilerStack::addSMTLib2Response(h256 const& _hash, std::string const& _response)
 {
 	if (m_stackState >= ParsedAndImported)
 		solThrow(CompilerError, "Must add SMTLib2 responses before parsing.");
@@ -340,7 +340,7 @@ void CompilerStack::setSources(StringMap _sources)
 	if (m_stackState != Empty)
 		solThrow(CompilerError, "Must set sources before parsing.");
 	for (auto source: _sources)
-		m_sources[source.first].charStream = make_unique<CharStream>(/*content*/std::move(source.second), /*name*/source.first);
+		m_sources[source.first].charStream = std::make_unique<CharStream>(/*content*/std::move(source.second), /*name*/source.first);
 	m_stackState = SourcesSet;
 }
 
@@ -350,18 +350,18 @@ bool CompilerStack::parse()
 		solThrow(CompilerError, "Must call parse only after the SourcesSet state.");
 	m_errorReporter.clear();
 
-	if (SemVerVersion{string(VersionString)}.isPrerelease())
+	if (SemVerVersion{std::string(VersionString)}.isPrerelease())
 		m_errorReporter.warning(3805_error, "This is a pre-release compiler version, please do not use it in production.");
 
 	Parser parser{m_errorReporter, m_evmVersion, m_parserErrorRecovery};
 
-	vector<string> sourcesToParse;
+	std::vector<std::string> sourcesToParse;
 	for (auto const& s: m_sources)
 		sourcesToParse.push_back(s.first);
 
 	for (size_t i = 0; i < sourcesToParse.size(); ++i)
 	{
-		string const& path = sourcesToParse[i];
+		std::string const& path = sourcesToParse[i];
 		Source& source = m_sources[path];
 		source.ast = parser.parse(*source.charStream);
 		if (!source.ast)
@@ -379,7 +379,7 @@ bool CompilerStack::parse()
 				if (it != stdlib::sources.end())
 				{
 					auto [name, content] = *it;
-					m_sources[name].charStream = make_unique<CharStream>(content, name);
+					m_sources[name].charStream = std::make_unique<CharStream>(content, name);
 					sourcesToParse.push_back(name);
 				}
 
@@ -395,9 +395,9 @@ bool CompilerStack::parse()
 			if (m_stopAfter >= ParsedAndImported)
 				for (auto const& newSource: loadMissingSources(*source.ast))
 				{
-					string const& newPath = newSource.first;
-					string const& newContents = newSource.second;
-					m_sources[newPath].charStream = make_shared<CharStream>(newContents, newPath);
+					std::string const& newPath = newSource.first;
+					std::string const& newContents = newSource.second;
+					m_sources[newPath].charStream = std::make_shared<CharStream>(newContents, newPath);
 					sourcesToParse.push_back(newPath);
 				}
 		}
@@ -415,17 +415,17 @@ bool CompilerStack::parse()
 	return !m_hasError;
 }
 
-void CompilerStack::importASTs(map<string, Json::Value> const& _sources)
+void CompilerStack::importASTs(std::map<std::string, Json::Value> const& _sources)
 {
 	if (m_stackState != Empty)
 		solThrow(CompilerError, "Must call importASTs only before the SourcesSet state.");
-	map<string, ASTPointer<SourceUnit>> reconstructedSources = ASTJsonImporter(m_evmVersion).jsonToSourceUnit(_sources);
+	std::map<std::string, ASTPointer<SourceUnit>> reconstructedSources = ASTJsonImporter(m_evmVersion).jsonToSourceUnit(_sources);
 	for (auto& src: reconstructedSources)
 	{
-		string const& path = src.first;
+		std::string const& path = src.first;
 		Source source;
 		source.ast = src.second;
-		source.charStream = make_shared<CharStream>(
+		source.charStream = std::make_shared<CharStream>(
 			util::jsonCompactPrint(_sources.at(src.first)),
 			src.first,
 			true // imported from AST
@@ -459,14 +459,14 @@ bool CompilerStack::analyze()
 			if (source->ast && !syntaxChecker.checkSyntax(*source->ast))
 				noErrors = false;
 
-		m_globalContext = make_shared<GlobalContext>();
+		m_globalContext = std::make_shared<GlobalContext>();
 		// We need to keep the same resolver during the whole process.
 		NameAndTypeResolver resolver(*m_globalContext, m_evmVersion, m_errorReporter);
 		for (Source const* source: m_sourceOrder)
 			if (source->ast && !resolver.registerDeclarations(*source->ast))
 				return false;
 
-		map<string, SourceUnit const*> sourceUnitsByName;
+		std::map<std::string, SourceUnit const*> sourceUnitsByName;
 		for (auto& source: m_sources)
 			sourceUnitsByName[source.first] = source.second.ast.get();
 		for (Source const* source: m_sourceOrder)
@@ -591,7 +591,7 @@ bool CompilerStack::analyze()
 		if (noErrors)
 		{
 			// Check for state mutability in every function.
-			vector<ASTPointer<ASTNode>> ast;
+			std::vector<ASTPointer<ASTNode>> ast;
 			for (Source const* source: m_sourceOrder)
 				if (source->ast)
 					ast.push_back(source->ast);
@@ -647,7 +647,7 @@ bool CompilerStack::parseAndAnalyze(State _stopAfter)
 	return success;
 }
 
-bool CompilerStack::isRequestedSource(string const& _sourceName) const
+bool CompilerStack::isRequestedSource(std::string const& _sourceName) const
 {
 	return
 		m_requestedContractNames.empty() ||
@@ -661,7 +661,7 @@ bool CompilerStack::isRequestedContract(ContractDefinition const& _contract) con
 	if (m_requestedContractNames.empty())
 		return true;
 
-	for (auto const& key: vector<string>{"", _contract.sourceUnitName()})
+	for (auto const& key: std::vector<std::string>{"", _contract.sourceUnitName()})
 	{
 		auto const& it = m_requestedContractNames.find(key);
 		if (it != m_requestedContractNames.end())
@@ -686,7 +686,7 @@ bool CompilerStack::compile(State _stopAfter)
 		solThrow(CompilerError, "Called compile with errors.");
 
 	// Only compile contracts individually which have been requested.
-	map<ContractDefinition const*, shared_ptr<Compiler const>> otherCompilers;
+	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> otherCompilers;
 
 	for (Source const* source: m_sourceOrder)
 		for (ASTPointer<ASTNode> const& node: source->ast->nodes())
@@ -719,7 +719,7 @@ bool CompilerStack::compile(State _stopAfter)
 							boost::get_error_info<langutil::errinfo_sourceLocation>(_unimplementedError)
 						)
 						{
-							string const* comment = _unimplementedError.comment();
+							std::string const* comment = _unimplementedError.comment();
 							m_errorReporter.error(
 								1834_error,
 								Error::Type::CodeGenerationError,
@@ -751,22 +751,22 @@ void CompilerStack::link()
 	}
 }
 
-vector<string> CompilerStack::contractNames() const
+std::vector<std::string> CompilerStack::contractNames() const
 {
 	if (m_stackState < Parsed)
 		solThrow(CompilerError, "Parsing was not successful.");
-	vector<string> contractNames;
+	std::vector<std::string> contractNames;
 	for (auto const& contract: m_contracts)
 		contractNames.push_back(contract.first);
 	return contractNames;
 }
 
-string const CompilerStack::lastContractName(optional<string> const& _sourceName) const
+std::string const CompilerStack::lastContractName(std::optional<std::string> const& _sourceName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Parsing was not successful.");
 	// try to find some user-supplied contract
-	string contractName;
+	std::string contractName;
 	for (auto const& it: m_sources)
 		if (_sourceName.value_or(it.first) == it.first)
 			for (auto const* contract: ASTNode::filteredNodes<ContractDefinition>(it.second.ast->nodes()))
@@ -774,7 +774,7 @@ string const CompilerStack::lastContractName(optional<string> const& _sourceName
 	return contractName;
 }
 
-evmasm::AssemblyItems const* CompilerStack::assemblyItems(string const& _contractName) const
+evmasm::AssemblyItems const* CompilerStack::assemblyItems(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -783,7 +783,7 @@ evmasm::AssemblyItems const* CompilerStack::assemblyItems(string const& _contrac
 	return currentContract.evmAssembly ? &currentContract.evmAssembly->items() : nullptr;
 }
 
-evmasm::AssemblyItems const* CompilerStack::runtimeAssemblyItems(string const& _contractName) const
+evmasm::AssemblyItems const* CompilerStack::runtimeAssemblyItems(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -792,7 +792,7 @@ evmasm::AssemblyItems const* CompilerStack::runtimeAssemblyItems(string const& _
 	return currentContract.evmRuntimeAssembly ? &currentContract.evmRuntimeAssembly->items() : nullptr;
 }
 
-Json::Value CompilerStack::generatedSources(string const& _contractName, bool _runtime) const
+Json::Value CompilerStack::generatedSources(std::string const& _contractName, bool _runtime) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -809,19 +809,19 @@ Json::Value CompilerStack::generatedSources(string const& _contractName, bool _r
 		if (c.compiler)
 		{
 			solAssert(!m_viaIR, "");
-			string source =
+			std::string source =
 				_runtime ?
 				c.compiler->runtimeGeneratedYulUtilityCode() :
 				c.compiler->generatedYulUtilityCode();
 			if (!source.empty())
 			{
-				string sourceName = CompilerContext::yulUtilityFileName();
+				std::string sourceName = CompilerContext::yulUtilityFileName();
 				unsigned sourceIndex = sourceIndices()[sourceName];
 				ErrorList errors;
 				ErrorReporter errorReporter(errors);
 				CharStream charStream(source, sourceName);
 				yul::EVMDialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(m_evmVersion);
-				shared_ptr<yul::Block> parserResult = yul::Parser{errorReporter, dialect}.parse(charStream);
+				std::shared_ptr<yul::Block> parserResult = yul::Parser{errorReporter, dialect}.parse(charStream);
 				solAssert(parserResult, "");
 				sources[0]["ast"] = yul::AsmJsonConverter{sourceIndex}(*parserResult);
 				sources[0]["name"] = sourceName;
@@ -834,7 +834,7 @@ Json::Value CompilerStack::generatedSources(string const& _contractName, bool _r
 	});
 }
 
-string const* CompilerStack::sourceMapping(string const& _contractName) const
+std::string const* CompilerStack::sourceMapping(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -848,7 +848,7 @@ string const* CompilerStack::sourceMapping(string const& _contractName) const
 	return c.sourceMapping ? &*c.sourceMapping : nullptr;
 }
 
-string const* CompilerStack::runtimeSourceMapping(string const& _contractName) const
+std::string const* CompilerStack::runtimeSourceMapping(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -864,7 +864,7 @@ string const* CompilerStack::runtimeSourceMapping(string const& _contractName) c
 	return c.runtimeSourceMapping ? &*c.runtimeSourceMapping : nullptr;
 }
 
-string const CompilerStack::filesystemFriendlyName(string const& _contractName) const
+std::string const CompilerStack::filesystemFriendlyName(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "No compiled contracts found.");
@@ -878,7 +878,7 @@ string const CompilerStack::filesystemFriendlyName(string const& _contractName)
 				contract.second.contract != matchContract.contract)
 		{
 			// If it does, then return its fully-qualified name, made fs-friendly
-			string friendlyName = boost::algorithm::replace_all_copy(_contractName, "/", "_");
+			std::string friendlyName = boost::algorithm::replace_all_copy(_contractName, "/", "_");
 			boost::algorithm::replace_all(friendlyName, ":", "_");
 			boost::algorithm::replace_all(friendlyName, ".", "_");
 			return friendlyName;
@@ -888,7 +888,7 @@ string const CompilerStack::filesystemFriendlyName(string const& _contractName)
 	return matchContract.contract->name();
 }
 
-string const& CompilerStack::yulIR(string const& _contractName) const
+std::string const& CompilerStack::yulIR(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -896,7 +896,7 @@ string const& CompilerStack::yulIR(string const& _contractName) const
 	return contract(_contractName).yulIR;
 }
 
-Json::Value const& CompilerStack::yulIRAst(string const& _contractName) const
+Json::Value const& CompilerStack::yulIRAst(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -904,7 +904,7 @@ Json::Value const& CompilerStack::yulIRAst(string const& _contractName) const
 	return contract(_contractName).yulIRAst;
 }
 
-string const& CompilerStack::yulIROptimized(string const& _contractName) const
+std::string const& CompilerStack::yulIROptimized(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -912,7 +912,7 @@ string const& CompilerStack::yulIROptimized(string const& _contractName) const
 	return contract(_contractName).yulIROptimized;
 }
 
-Json::Value const& CompilerStack::yulIROptimizedAst(string const& _contractName) const
+Json::Value const& CompilerStack::yulIROptimizedAst(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -920,7 +920,7 @@ Json::Value const& CompilerStack::yulIROptimizedAst(string const& _contractName)
 	return contract(_contractName).yulIROptimizedAst;
 }
 
-evmasm::LinkerObject const& CompilerStack::object(string const& _contractName) const
+evmasm::LinkerObject const& CompilerStack::object(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -928,7 +928,7 @@ evmasm::LinkerObject const& CompilerStack::object(string const& _contractName) c
 	return contract(_contractName).object;
 }
 
-evmasm::LinkerObject const& CompilerStack::runtimeObject(string const& _contractName) const
+evmasm::LinkerObject const& CompilerStack::runtimeObject(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -936,8 +936,8 @@ evmasm::LinkerObject const& CompilerStack::runtimeObject(string const& _contract
 	return contract(_contractName).runtimeObject;
 }
 
-/// TODO: cache this string
-string CompilerStack::assemblyString(string const& _contractName, StringMap const& _sourceCodes) const
+/// TODO: cache this std::string
+std::string CompilerStack::assemblyString(std::string const& _contractName, StringMap const& _sourceCodes) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -946,11 +946,11 @@ string CompilerStack::assemblyString(string const& _contractName, StringMap cons
 	if (currentContract.evmAssembly)
 		return currentContract.evmAssembly->assemblyString(m_debugInfoSelection, _sourceCodes);
 	else
-		return string();
+		return std::string();
 }
 
 /// TODO: cache the JSON
-Json::Value CompilerStack::assemblyJSON(string const& _contractName) const
+Json::Value CompilerStack::assemblyJSON(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -962,14 +962,14 @@ Json::Value CompilerStack::assemblyJSON(string const& _contractName) const
 		return Json::Value();
 }
 
-vector<string> CompilerStack::sourceNames() const
+std::vector<std::string> CompilerStack::sourceNames() const
 {
-	return ranges::to<vector>(m_sources | ranges::views::keys);
+	return ranges::to<std::vector>(m_sources | ranges::views::keys);
 }
 
-map<string, unsigned> CompilerStack::sourceIndices() const
+std::map<std::string, unsigned> CompilerStack::sourceIndices() const
 {
-	map<string, unsigned> indices;
+	std::map<std::string, unsigned> indices;
 	unsigned index = 0;
 	for (auto const& s: m_sources)
 		indices[s.first] = index++;
@@ -978,7 +978,7 @@ map<string, unsigned> CompilerStack::sourceIndices() const
 	return indices;
 }
 
-Json::Value const& CompilerStack::contractABI(string const& _contractName) const
+Json::Value const& CompilerStack::contractABI(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -996,7 +996,7 @@ Json::Value const& CompilerStack::contractABI(Contract const& _contract) const
 	return _contract.abi.init([&]{ return ABI::generate(*_contract.contract); });
 }
 
-Json::Value const& CompilerStack::storageLayout(string const& _contractName) const
+Json::Value const& CompilerStack::storageLayout(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1014,7 +1014,7 @@ Json::Value const& CompilerStack::storageLayout(Contract const& _contract) const
 	return _contract.storageLayout.init([&]{ return StorageLayout().generate(*_contract.contract); });
 }
 
-Json::Value const& CompilerStack::natspecUser(string const& _contractName) const
+Json::Value const& CompilerStack::natspecUser(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1032,7 +1032,7 @@ Json::Value const& CompilerStack::natspecUser(Contract const& _contract) const
 	return _contract.userDocumentation.init([&]{ return Natspec::userDocumentation(*_contract.contract); });
 }
 
-Json::Value const& CompilerStack::natspecDev(string const& _contractName) const
+Json::Value const& CompilerStack::natspecDev(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1050,7 +1050,7 @@ Json::Value const& CompilerStack::natspecDev(Contract const& _contract) const
 	return _contract.devDocumentation.init([&]{ return Natspec::devDocumentation(*_contract.contract); });
 }
 
-Json::Value CompilerStack::interfaceSymbols(string const& _contractName) const
+Json::Value CompilerStack::interfaceSymbols(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1063,7 +1063,7 @@ Json::Value CompilerStack::interfaceSymbols(string const& _contractName) const
 		interfaceSymbols["methods"][it.second->externalSignature()] = it.first.hex();
 	for (ErrorDefinition const* error: contractDefinition(_contractName).interfaceErrors())
 	{
-		string signature = error->functionType(true)->externalSignature();
+		std::string signature = error->functionType(true)->externalSignature();
 		interfaceSymbols["errors"][signature] = util::toHex(toCompactBigEndian(util::selectorFromSignatureU32(signature), 4));
 	}
 
@@ -1073,14 +1073,14 @@ Json::Value CompilerStack::interfaceSymbols(string const& _contractName) const
 	))
 		if (!event->isAnonymous())
 		{
-			string signature = event->functionType(true)->externalSignature();
+			std::string signature = event->functionType(true)->externalSignature();
 			interfaceSymbols["events"][signature] = toHex(u256(h256::Arith(util::keccak256(signature))));
 		}
 
 	return interfaceSymbols;
 }
 
-bytes CompilerStack::cborMetadata(string const& _contractName, bool _forIR) const
+bytes CompilerStack::cborMetadata(std::string const& _contractName, bool _forIR) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1088,7 +1088,7 @@ bytes CompilerStack::cborMetadata(string const& _contractName, bool _forIR) cons
 	return createCBORMetadata(contract(_contractName), _forIR);
 }
 
-string const& CompilerStack::metadata(Contract const& _contract) const
+std::string const& CompilerStack::metadata(Contract const& _contract) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1098,7 +1098,7 @@ string const& CompilerStack::metadata(Contract const& _contract) const
 	return _contract.metadata.init([&]{ return createMetadata(_contract, m_viaIR); });
 }
 
-CharStream const& CompilerStack::charStream(string const& _sourceName) const
+CharStream const& CompilerStack::charStream(std::string const& _sourceName) const
 {
 	if (m_stackState < SourcesSet)
 		solThrow(CompilerError, "No sources set.");
@@ -1108,7 +1108,7 @@ CharStream const& CompilerStack::charStream(string const& _sourceName) const
 	return *source(_sourceName).charStream;
 }
 
-SourceUnit const& CompilerStack::ast(string const& _sourceName) const
+SourceUnit const& CompilerStack::ast(std::string const& _sourceName) const
 {
 	if (m_stackState < Parsed)
 		solThrow(CompilerError, "Parsing not yet performed.");
@@ -1118,7 +1118,7 @@ SourceUnit const& CompilerStack::ast(string const& _sourceName) const
 	return *source(_sourceName).ast;
 }
 
-ContractDefinition const& CompilerStack::contractDefinition(string const& _contractName) const
+ContractDefinition const& CompilerStack::contractDefinition(std::string const& _contractName) const
 {
 	if (m_stackState < AnalysisPerformed)
 		solThrow(CompilerError, "Analysis was not successful.");
@@ -1127,7 +1127,7 @@ ContractDefinition const& CompilerStack::contractDefinition(string const& _contr
 }
 
 size_t CompilerStack::functionEntryPoint(
-	string const& _contractName,
+	std::string const& _contractName,
 	FunctionDefinition const& _function
 ) const
 {
@@ -1155,7 +1155,7 @@ h256 const& CompilerStack::Source::swarmHash() const
 	return swarmHashCached;
 }
 
-string const& CompilerStack::Source::ipfsUrl() const
+std::string const& CompilerStack::Source::ipfsUrl() const
 {
 	if (ipfsUrlCached.empty())
 		ipfsUrlCached = "dweb:/ipfs/" + util::ipfsHashBase58(charStream->source());
@@ -1171,12 +1171,12 @@ StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast)
 		for (auto const& node: _ast.nodes())
 			if (ImportDirective const* import = dynamic_cast<ImportDirective*>(node.get()))
 			{
-				string const& importPath = *import->annotation().absolutePath;
+				std::string const& importPath = *import->annotation().absolutePath;
 
 				if (m_sources.count(importPath) || newSources.count(importPath))
 					continue;
 
-				ReadCallback::Result result{false, string("File not supplied initially.")};
+				ReadCallback::Result result{false, std::string("File not supplied initially.")};
 				if (m_readFile)
 					result = m_readFile(ReadCallback::kindString(ReadCallback::Kind::ReadFile), importPath);
 
@@ -1187,7 +1187,7 @@ StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast)
 					m_errorReporter.parserError(
 						6275_error,
 						import->location(),
-						string("Source \"" + importPath + "\" not found: " + result.responseOrErrorMessage)
+						std::string("Source \"" + importPath + "\" not found: " + result.responseOrErrorMessage)
 					);
 					continue;
 				}
@@ -1200,7 +1200,7 @@ StringMap CompilerStack::loadMissingSources(SourceUnit const& _ast)
 	return newSources;
 }
 
-string CompilerStack::applyRemapping(string const& _path, string const& _context)
+std::string CompilerStack::applyRemapping(std::string const& _path, std::string const& _context)
 {
 	solAssert(m_stackState < ParsedAndImported, "");
 	return m_importRemapper.apply(_path, _context);
@@ -1211,10 +1211,10 @@ bool CompilerStack::resolveImports()
 	solAssert(m_stackState == ParsedAndImported, "");
 
 	// topological sorting (depth first search) of the import graph, cutting potential cycles
-	vector<Source const*> sourceOrder;
-	set<Source const*> sourcesSeen;
+	std::vector<Source const*> sourceOrder;
+	std::set<Source const*> sourcesSeen;
 
-	function<void(Source const*)> toposort = [&](Source const* _source)
+	std::function<void(Source const*)> toposort = [&](Source const* _source)
 	{
 		if (sourcesSeen.count(_source))
 			return;
@@ -1223,7 +1223,7 @@ bool CompilerStack::resolveImports()
 			for (ASTPointer<ASTNode> const& node: _source->ast->nodes())
 				if (ImportDirective const* import = dynamic_cast<ImportDirective*>(node.get()))
 				{
-					string const& path = *import->annotation().absolutePath;
+					std::string const& path = *import->annotation().absolutePath;
 					solAssert(m_sources.count(path), "");
 					import->annotation().sourceUnit = m_sources[path].ast.get();
 					toposort(&m_sources[path]);
@@ -1231,7 +1231,7 @@ bool CompilerStack::resolveImports()
 		sourceOrder.push_back(_source);
 	};
 
-	vector<PragmaDirective const*> experimentalPragmaDirectives;
+	std::vector<PragmaDirective const*> experimentalPragmaDirectives;
 	for (auto const& sourcePair: m_sources)
 	{
 		if (isRequestedSource(sourcePair.first))
@@ -1270,7 +1270,7 @@ void CompilerStack::storeContractDefinitions()
 				ASTNode::filteredNodes<ContractDefinition>(pair.second.ast->nodes())
 			)
 			{
-				string fullyQualifiedName = *pair.second.ast->annotation().path + ":" + contract->name();
+				std::string fullyQualifiedName = *pair.second.ast->annotation().path + ":" + contract->name();
 				// Note that we now reference contracts by their fully qualified names, and
 				// thus contracts can only conflict if declared in the same source file. This
 				// should already cause a double-declaration error elsewhere.
@@ -1293,7 +1293,7 @@ void CompilerStack::annotateInternalFunctionIDs()
 
 			if (auto const* deployTimeInternalDispatch = util::valueOrNullptr((*annotation.deployedCallGraph)->edges, CallGraph::SpecialNode::InternalDispatch))
 				for (auto const& node: *deployTimeInternalDispatch)
-					if (auto const* callable = get_if<CallableDeclaration const*>(&node))
+					if (auto const* callable = std::get_if<CallableDeclaration const*>(&node))
 						if (auto const* function = dynamic_cast<FunctionDefinition const*>(*callable))
 						{
 							solAssert(contract->annotation().internalFunctionIDs.count(function) == 0);
@@ -1301,7 +1301,7 @@ void CompilerStack::annotateInternalFunctionIDs()
 						}
 			if (auto const* creationTimeInternalDispatch = util::valueOrNullptr((*annotation.creationCallGraph)->edges, CallGraph::SpecialNode::InternalDispatch))
 				for (auto const& node: *creationTimeInternalDispatch)
-					if (auto const* callable = get_if<CallableDeclaration const*>(&node))
+					if (auto const* callable = std::get_if<CallableDeclaration const*>(&node))
 						if (auto const* function = dynamic_cast<FunctionDefinition const*>(*callable))
 							// Make sure the function already got an ID since it also occurs in the deploy-time internal dispatch.
 							solAssert(contract->annotation().internalFunctionIDs.count(function) != 0);
@@ -1311,7 +1311,7 @@ void CompilerStack::annotateInternalFunctionIDs()
 
 namespace
 {
-bool onlySafeExperimentalFeaturesActivated(set<ExperimentalFeature> const& features)
+bool onlySafeExperimentalFeaturesActivated(std::set<ExperimentalFeature> const& features)
 {
 	for (auto const feature: features)
 		if (!ExperimentalFeatureWithoutWarning.count(feature))
@@ -1322,8 +1322,8 @@ bool onlySafeExperimentalFeaturesActivated(set<ExperimentalFeature> const& featu
 
 void CompilerStack::assembleYul(
 	ContractDefinition const& _contract,
-	shared_ptr<evmasm::Assembly> _assembly,
-	shared_ptr<evmasm::Assembly> _runtimeAssembly
+	std::shared_ptr<evmasm::Assembly> _assembly,
+	std::shared_ptr<evmasm::Assembly> _runtimeAssembly
 )
 {
 	solAssert(m_stackState >= AnalysisPerformed, "");
@@ -1367,7 +1367,7 @@ void CompilerStack::assembleYul(
 			5574_error,
 			_contract.location(),
 			"Contract code size is "s +
-			to_string(compiledContract.runtimeObject.bytecode.size()) +
+			std::to_string(compiledContract.runtimeObject.bytecode.size()) +
 			" bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). "
 			"This contract may not be deployable on Mainnet. "
 			"Consider enabling the optimizer (with a low \"runs\" value!), "
@@ -1385,7 +1385,7 @@ void CompilerStack::assembleYul(
 			3860_error,
 			_contract.location(),
 			"Contract initcode size is "s +
-			to_string(compiledContract.object.bytecode.size()) +
+			std::to_string(compiledContract.object.bytecode.size()) +
 			" bytes and exceeds 49152 bytes (a limit introduced in Shanghai). "
 			"This contract may not be deployable on Mainnet. "
 			"Consider enabling the optimizer (with a low \"runs\" value!), "
@@ -1395,7 +1395,7 @@ void CompilerStack::assembleYul(
 
 void CompilerStack::compileContract(
 	ContractDefinition const& _contract,
-	map<ContractDefinition const*, shared_ptr<Compiler const>>& _otherCompilers
+	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>>& _otherCompilers
 )
 {
 	solAssert(!m_viaIR, "");
@@ -1415,7 +1415,7 @@ void CompilerStack::compileContract(
 
 	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
 
-	shared_ptr<Compiler> compiler = make_shared<Compiler>(m_evmVersion, m_revertStrings, m_optimiserSettings);
+	std::shared_ptr<Compiler> compiler = std::make_shared<Compiler>(m_evmVersion, m_revertStrings, m_optimiserSettings);
 	compiledContract.compiler = compiler;
 
 	solAssert(!m_viaIR, "");
@@ -1454,14 +1454,14 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 			"Using ABI coder v2 instead."
 		);
 
-	string dependenciesSource;
+	std::string dependenciesSource;
 	for (auto const& [dependency, referencee]: _contract.annotation().contractDependencies)
 		generateIR(*dependency);
 
 	if (!_contract.canBeDeployed())
 		return;
 
-	map<ContractDefinition const*, string_view const> otherYulSources;
+	std::map<ContractDefinition const*, std::string_view const> otherYulSources;
 	for (auto const& pair: m_contracts)
 		otherYulSources.emplace(pair.second.contract, pair.second.yulIR);
 
@@ -1527,13 +1527,13 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 
 	//cout << yul::AsmPrinter{}(*stack.parserResult()->code) << endl;
 
-	string deployedName = IRNames::deployedObject(_contract);
+	std::string deployedName = IRNames::deployedObject(_contract);
 	solAssert(!deployedName.empty(), "");
 	tie(compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly) = stack.assembleEVMWithDeployed(deployedName);
 	assembleYul(_contract, compiledContract.evmAssembly, compiledContract.evmRuntimeAssembly);
 }
 
-CompilerStack::Contract const& CompilerStack::contract(string const& _contractName) const
+CompilerStack::Contract const& CompilerStack::contract(std::string const& _contractName) const
 {
 	solAssert(m_stackState >= AnalysisPerformed, "");
 
@@ -1544,15 +1544,15 @@ CompilerStack::Contract const& CompilerStack::contract(string const& _contractNa
 	// To provide a measure of backward-compatibility, if a contract is not located by its
 	// fully-qualified name, a lookup will be attempted purely on the contract's name to see
 	// if anything will satisfy.
-	if (_contractName.find(':') == string::npos)
+	if (_contractName.find(':') == std::string::npos)
 	{
 		for (auto const& contractEntry: m_contracts)
 		{
-			stringstream ss;
+			std::stringstream ss;
 			ss.str(contractEntry.first);
 			// All entries are <source>:<contract>
-			string source;
-			string foundName;
+			std::string source;
+			std::string foundName;
 			getline(ss, source, ':');
 			getline(ss, foundName, ':');
 			if (foundName == _contractName)
@@ -1564,7 +1564,7 @@ CompilerStack::Contract const& CompilerStack::contract(string const& _contractNa
 	solThrow(CompilerError, "Contract \"" + _contractName + "\" not found.");
 }
 
-CompilerStack::Source const& CompilerStack::source(string const& _sourceName) const
+CompilerStack::Source const& CompilerStack::source(std::string const& _sourceName) const
 {
 	auto it = m_sources.find(_sourceName);
 	if (it == m_sources.end())
@@ -1573,11 +1573,11 @@ CompilerStack::Source const& CompilerStack::source(string const& _sourceName) co
 	return it->second;
 }
 
-string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) const
+std::string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) const
 {
 	Json::Value meta{Json::objectValue};
 	meta["version"] = 1;
-	string sourceType;
+	std::string sourceType;
 	switch (m_compilationSourceType)
 	{
 	case CompilationSourceType::Solidity:
@@ -1591,7 +1591,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 	meta["compiler"]["version"] = VersionStringStrict;
 
 	/// All the source files (including self), which should be included in the metadata.
-	set<string> referencedSources;
+	std::set<std::string> referencedSources;
 	referencedSources.insert(*_contract.contract->sourceUnit().annotation().path);
 	for (auto const sourceUnit: _contract.contract->sourceUnit().referencedSourceUnits(true))
 		referencedSources.insert(*sourceUnit->annotation().path);
@@ -1604,7 +1604,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 
 		solAssert(s.second.charStream, "Character stream not available");
 		meta["sources"][s.first]["keccak256"] = "0x" + util::toHex(s.second.keccak256().asBytes());
-		if (optional<string> licenseString = s.second.ast->licenseString())
+		if (std::optional<std::string> licenseString = s.second.ast->licenseString())
 			meta["sources"][s.first]["license"] = *licenseString;
 		if (m_metadataLiteralSources)
 			meta["sources"][s.first]["content"] = s.second.charStream->source();
@@ -1617,7 +1617,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 	}
 
 	static_assert(sizeof(m_optimiserSettings.expectedExecutionsPerDeployment) <= sizeof(Json::LargestUInt), "Invalid word size.");
-	solAssert(static_cast<Json::LargestUInt>(m_optimiserSettings.expectedExecutionsPerDeployment) < numeric_limits<Json::LargestUInt>::max(), "");
+	solAssert(static_cast<Json::LargestUInt>(m_optimiserSettings.expectedExecutionsPerDeployment) < std::numeric_limits<Json::LargestUInt>::max(), "");
 	meta["settings"]["optimizer"]["runs"] = Json::Value(Json::LargestUInt(m_optimiserSettings.expectedExecutionsPerDeployment));
 
 	/// Backwards compatibility: If set to one of the default settings, do not provide details.
@@ -1659,7 +1659,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 	if (m_metadataLiteralSources)
 		meta["settings"]["metadata"]["useLiteralContent"] = true;
 
-	static vector<string> hashes{"ipfs", "bzzr1", "none"};
+	static std::vector<std::string> hashes{"ipfs", "bzzr1", "none"};
 	meta["settings"]["metadata"]["bytecodeHash"] = hashes.at(unsigned(m_metadataHash));
 
 	if (_forIR)
@@ -1671,7 +1671,7 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 		*_contract.contract->annotation().canonicalName;
 
 	meta["settings"]["remappings"] = Json::arrayValue;
-	set<string> remappings;
+	std::set<std::string> remappings;
 	for (auto const& r: m_importRemapper.remappings())
 		remappings.insert(r.context + ":" + r.prefix + "=" + r.target);
 	for (auto const& r: remappings)
@@ -1691,21 +1691,21 @@ string CompilerStack::createMetadata(Contract const& _contract, bool _forIR) con
 class MetadataCBOREncoder
 {
 public:
-	void pushBytes(string const& key, bytes const& value)
+	void pushBytes(std::string const& key, bytes const& value)
 	{
 		m_entryCount++;
 		pushTextString(key);
 		pushByteString(value);
 	}
 
-	void pushString(string const& key, string const& value)
+	void pushString(std::string const& key, std::string const& value)
 	{
 		m_entryCount++;
 		pushTextString(key);
 		pushTextString(value);
 	}
 
-	void pushBool(string const& key, bool value)
+	void pushBool(std::string const& key, bool value)
 	{
 		m_entryCount++;
 		pushTextString(key);
@@ -1728,7 +1728,7 @@ class MetadataCBOREncoder
 	}
 
 private:
-	void pushTextString(string const& key)
+	void pushTextString(std::string const& key)
 	{
 		size_t length = key.size();
 		if (length < 24)
@@ -1742,7 +1742,7 @@ class MetadataCBOREncoder
 			m_data += key;
 		}
 		else
-			solAssert(false, "Text string too large.");
+			solAssert(false, "Text std::string too large.");
 	}
 	void pushByteString(bytes const& key)
 	{
@@ -1758,7 +1758,7 @@ class MetadataCBOREncoder
 			m_data += key;
 		}
 		else
-			solAssert(false, "Byte string too large.");
+			solAssert(false, "Byte std::string too large.");
 	}
 	void pushBool(bool value)
 	{
@@ -1780,7 +1780,7 @@ bytes CompilerStack::createCBORMetadata(Contract const& _contract, bool _forIR)
 		_contract.contract->sourceUnit().annotation().experimentalFeatures
 	);
 
-	string meta = (_forIR == m_viaIR ? metadata(_contract) : createMetadata(_contract, _forIR));
+	std::string meta = (_forIR == m_viaIR ? metadata(_contract) : createMetadata(_contract, _forIR));
 
 	MetadataCBOREncoder encoder;
 
@@ -1819,7 +1819,7 @@ Json::Value gasToJson(GasEstimator::GasConsumption const& _gas)
 
 }
 
-Json::Value CompilerStack::gasEstimates(string const& _contractName) const
+Json::Value CompilerStack::gasEstimates(std::string const& _contractName) const
 {
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
@@ -1852,14 +1852,14 @@ Json::Value CompilerStack::gasEstimates(string const& _contractName) const
 		Json::Value externalFunctions(Json::objectValue);
 		for (auto it: contract.interfaceFunctions())
 		{
-			string sig = it.second->externalSignature();
+			std::string sig = it.second->externalSignature();
 			externalFunctions[sig] = gasToJson(gasEstimator.functionalEstimation(*items, sig));
 		}
 
 		if (contract.fallbackFunction())
 			/// This needs to be set to an invalid signature in order to trigger the fallback,
 			/// without the shortcut (of CALLDATSIZE == 0), and therefore to receive the upper bound.
-			/// An empty string ("") would work to trigger the shortcut only.
+			/// An empty std::string ("") would work to trigger the shortcut only.
 			externalFunctions[""] = gasToJson(gasEstimator.functionalEstimation(*items, "INVALID"));
 
 		if (!externalFunctions.empty())
@@ -1880,7 +1880,7 @@ Json::Value CompilerStack::gasEstimates(string const& _contractName) const
 
 			/// TODO: This could move into a method shared with externalSignature()
 			FunctionType type(*it);
-			string sig = it->name() + "(";
+			std::string sig = it->name() + "(";
 			auto paramTypes = type.parameterTypes();
 			for (auto it = paramTypes.begin(); it != paramTypes.end(); ++it)
 				sig += (*it)->toString() + (it + 1 == paramTypes.end() ? "" : ",");
diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
index 8300feb572..7eda870810 100644
--- a/libsolidity/interface/FileReader.cpp
+++ b/libsolidity/interface/FileReader.cpp
@@ -35,17 +35,13 @@ using solidity::langutil::InternalCompilerError;
 using solidity::util::errinfo_comment;
 using solidity::util::readFileAsString;
 using solidity::util::joinHumanReadable;
-using std::map;
-using std::reference_wrapper;
-using std::string;
-using std::vector;
 
 namespace solidity::frontend
 {
 
 FileReader::FileReader(
 	boost::filesystem::path _basePath,
-	vector<boost::filesystem::path> const& _includePaths,
+	std::vector<boost::filesystem::path> const& _includePaths,
 	FileSystemPathSet _allowedDirectories
 ):
 	m_allowedDirectories(std::move(_allowedDirectories)),
@@ -99,19 +95,19 @@ void FileReader::setSourceUnits(StringMap _sources)
 	m_sourceCodes = std::move(_sources);
 }
 
-ReadCallback::Result FileReader::readFile(string const& _kind, string const& _sourceUnitName)
+ReadCallback::Result FileReader::readFile(std::string const& _kind, std::string const& _sourceUnitName)
 {
 	try
 	{
 		if (_kind != ReadCallback::kindString(ReadCallback::Kind::ReadFile))
 			solAssert(false, "ReadFile callback used as callback kind " + _kind);
-		string strippedSourceUnitName = _sourceUnitName;
+		std::string strippedSourceUnitName = _sourceUnitName;
 		if (strippedSourceUnitName.find("file://") == 0)
 			strippedSourceUnitName.erase(0, 7);
 
-		vector<boost::filesystem::path> candidates;
-		vector<reference_wrapper<boost::filesystem::path>> prefixes = {m_basePath};
-		prefixes += (m_includePaths | ranges::to<vector<reference_wrapper<boost::filesystem::path>>>);
+		std::vector<boost::filesystem::path> candidates;
+		std::vector<std::reference_wrapper<boost::filesystem::path>> prefixes = {m_basePath};
+		prefixes += (m_includePaths | ranges::to<std::vector<std::reference_wrapper<boost::filesystem::path>>>);
 
 		for (auto const& prefix: prefixes)
 		{
@@ -183,9 +179,9 @@ ReadCallback::Result FileReader::readFile(string const& _kind, string const& _so
 	}
 }
 
-string FileReader::cliPathToSourceUnitName(boost::filesystem::path const& _cliPath) const
+std::string FileReader::cliPathToSourceUnitName(boost::filesystem::path const& _cliPath) const
 {
-	vector<boost::filesystem::path> prefixes = {m_basePath.empty() ? normalizeCLIPathForVFS(".") : m_basePath};
+	std::vector<boost::filesystem::path> prefixes = {m_basePath.empty() ? normalizeCLIPathForVFS(".") : m_basePath};
 	prefixes += m_includePaths;
 
 	boost::filesystem::path normalizedPath = normalizeCLIPathForVFS(_cliPath);
@@ -200,17 +196,17 @@ string FileReader::cliPathToSourceUnitName(boost::filesystem::path const& _cliPa
 	return normalizedPath.generic_string();
 }
 
-map<string, FileReader::FileSystemPathSet> FileReader::detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths) const
+std::map<std::string, FileReader::FileSystemPathSet> FileReader::detectSourceUnitNameCollisions(FileSystemPathSet const& _cliPaths) const
 {
-	map<string, FileReader::FileSystemPathSet> nameToPaths;
+	std::map<std::string, FileReader::FileSystemPathSet> nameToPaths;
 	for (boost::filesystem::path const& cliPath: _cliPaths)
 	{
-		string sourceUnitName = cliPathToSourceUnitName(cliPath);
+		std::string sourceUnitName = cliPathToSourceUnitName(cliPath);
 		boost::filesystem::path normalizedPath = normalizeCLIPathForVFS(cliPath);
 		nameToPaths[sourceUnitName].insert(normalizedPath);
 	}
 
-	map<string, FileReader::FileSystemPathSet> collisions;
+	std::map<std::string, FileReader::FileSystemPathSet> collisions;
 	for (auto&& [sourceUnitName, cliPaths]: nameToPaths)
 		if (cliPaths.size() >= 2)
 			collisions[sourceUnitName] = std::move(cliPaths);
@@ -377,7 +373,7 @@ bool FileReader::hasDotDotSegments(boost::filesystem::path const& _path)
 
 bool FileReader::isUNCPath(boost::filesystem::path const& _path)
 {
-	string rootName = _path.root_name().string();
+	std::string rootName = _path.root_name().string();
 
 	return (
 		rootName.size() == 2 ||
diff --git a/libsolidity/interface/GasEstimator.cpp b/libsolidity/interface/GasEstimator.cpp
index 512f91bee2..fd3fbbc02c 100644
--- a/libsolidity/interface/GasEstimator.cpp
+++ b/libsolidity/interface/GasEstimator.cpp
@@ -37,7 +37,6 @@
 #include <map>
 #include <memory>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::frontend;
@@ -45,16 +44,16 @@ using namespace solidity::langutil;
 
 GasEstimator::GasConsumption GasEstimator::functionalEstimation(
 	AssemblyItems const& _items,
-	string const& _signature
+	std::string const& _signature
 ) const
 {
-	auto state = make_shared<KnownState>();
+	auto state = std::make_shared<KnownState>();
 
 	if (!_signature.empty())
 	{
 		ExpressionClasses& classes = state->expressionClasses();
 		using Id = ExpressionClasses::Id;
-		using Ids = vector<Id>;
+		using Ids = std::vector<Id>;
 		Id hashValue = classes.find(u256(util::selectorFromSignatureU32(_signature)));
 		Id calldata = classes.find(Instruction::CALLDATALOAD, Ids{classes.find(u256(0))});
 		if (!m_evmVersion.hasBitwiseShifting())
@@ -88,7 +87,7 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation(
 	FunctionDefinition const& _function
 ) const
 {
-	auto state = make_shared<KnownState>();
+	auto state = std::make_shared<KnownState>();
 
 	unsigned parametersSize = CompilerUtils::sizeOnStack(_function.parameters());
 	if (parametersSize > 16)
@@ -104,13 +103,13 @@ GasEstimator::GasConsumption GasEstimator::functionalEstimation(
 	return PathGasMeter::estimateMax(_items, m_evmVersion, _offset, state);
 }
 
-set<ASTNode const*> GasEstimator::finestNodesAtLocation(
-	vector<ASTNode const*> const& _roots
+std::set<ASTNode const*> GasEstimator::finestNodesAtLocation(
+	std::vector<ASTNode const*> const& _roots
 )
 {
-	map<SourceLocation, ASTNode const*> locations;
-	set<ASTNode const*> nodes;
-	SimpleASTVisitor visitor(function<bool(ASTNode const&)>(), [&](ASTNode const& _n)
+	std::map<SourceLocation, ASTNode const*> locations;
+	std::set<ASTNode const*> nodes;
+	SimpleASTVisitor visitor(std::function<bool(ASTNode const&)>(), [&](ASTNode const& _n)
 	{
 		if (!locations.count(_n.location()))
 		{
diff --git a/libsolidity/interface/ImportRemapper.cpp b/libsolidity/interface/ImportRemapper.cpp
index 4d4fa42d45..6b870875e3 100644
--- a/libsolidity/interface/ImportRemapper.cpp
+++ b/libsolidity/interface/ImportRemapper.cpp
@@ -19,29 +19,20 @@
 #include <libsolutil/CommonIO.h>
 #include <liblangutil/Exceptions.h>
 
-using std::equal;
-using std::find;
-using std::move;
-using std::nullopt;
-using std::optional;
-using std::string;
-using std::string_view;
-using std::vector;
-
 namespace solidity::frontend
 {
 
-void ImportRemapper::setRemappings(vector<Remapping> _remappings)
+void ImportRemapper::setRemappings(std::vector<Remapping> _remappings)
 {
 	for (auto const& remapping: _remappings)
 		solAssert(!remapping.prefix.empty(), "");
 	m_remappings = std::move(_remappings);
 }
 
-SourceUnitName ImportRemapper::apply(ImportPath const& _path, string const& _context) const
+SourceUnitName ImportRemapper::apply(ImportPath const& _path, std::string const& _context) const
 {
 	// Try to find the longest prefix match in all remappings that are active in the current context.
-	auto isPrefixOf = [](string const& _a, string const& _b)
+	auto isPrefixOf = [](std::string const& _a, std::string const& _b)
 	{
 		if (_a.length() > _b.length())
 			return false;
@@ -50,12 +41,12 @@ SourceUnitName ImportRemapper::apply(ImportPath const& _path, string const& _con
 
 	size_t longestPrefix = 0;
 	size_t longestContext = 0;
-	string bestMatchTarget;
+	std::string bestMatchTarget;
 
 	for (auto const& redir: m_remappings)
 	{
-		string context = util::sanitizePath(redir.context);
-		string prefix = util::sanitizePath(redir.prefix);
+		std::string context = util::sanitizePath(redir.context);
+		std::string prefix = util::sanitizePath(redir.prefix);
 
 		// Skip if current context is closer
 		if (context.length() < longestContext)
@@ -74,32 +65,32 @@ SourceUnitName ImportRemapper::apply(ImportPath const& _path, string const& _con
 		longestPrefix = prefix.length();
 		bestMatchTarget = util::sanitizePath(redir.target);
 	}
-	string path = bestMatchTarget;
-	path.append(_path.begin() + static_cast<string::difference_type>(longestPrefix), _path.end());
+	std::string path = bestMatchTarget;
+	path.append(_path.begin() + static_cast<std::string::difference_type>(longestPrefix), _path.end());
 	return path;
 }
 
-bool ImportRemapper::isRemapping(string_view _input)
+bool ImportRemapper::isRemapping(std::string_view _input)
 {
-	return _input.find("=") != string::npos;
+	return _input.find("=") != std::string::npos;
 }
 
-optional<ImportRemapper::Remapping> ImportRemapper::parseRemapping(string_view _input)
+	std::optional<ImportRemapper::Remapping> ImportRemapper::parseRemapping(std::string_view _input)
 {
-	auto equals = find(_input.cbegin(), _input.cend(), '=');
+	auto equals = std::find(_input.cbegin(), _input.cend(), '=');
 	if (equals == _input.end())
-		return nullopt;
+		return std::nullopt;
 
-	auto const colon = find(_input.cbegin(), equals, ':');
+	auto const colon = std::find(_input.cbegin(), equals, ':');
 
 	Remapping remapping{
-		(colon == equals ? "" : string(_input.cbegin(), colon)),
-		(colon == equals ? string(_input.cbegin(), equals) : string(colon + 1, equals)),
-		string(equals + 1, _input.cend()),
+		(colon == equals ? "" : std::string(_input.cbegin(), colon)),
+		(colon == equals ? std::string(_input.cbegin(), equals) : std::string(colon + 1, equals)),
+		std::string(equals + 1, _input.cend()),
 	};
 
 	if (remapping.prefix.empty())
-		return nullopt;
+		return std::nullopt;
 
 	return remapping;
 }
diff --git a/libsolidity/interface/Natspec.cpp b/libsolidity/interface/Natspec.cpp
index 5733d3063c..539a3573f5 100644
--- a/libsolidity/interface/Natspec.cpp
+++ b/libsolidity/interface/Natspec.cpp
@@ -30,8 +30,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
@@ -46,7 +44,7 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
 	auto constructorDefinition(_contractDef.constructor());
 	if (constructorDefinition)
 	{
-		string const value = extractDoc(constructorDefinition->annotation().docTags, "notice");
+		std::string const value = extractDoc(constructorDefinition->annotation().docTags, "notice");
 		if (!value.empty())
 		{
 			// add the constructor, only if we have any documentation to add
@@ -56,14 +54,14 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
 		}
 	}
 
-	string notice = extractDoc(_contractDef.annotation().docTags, "notice");
+	std::string notice = extractDoc(_contractDef.annotation().docTags, "notice");
 	if (!notice.empty())
 		doc["notice"] = Json::Value(notice);
 
 	for (auto const& it: _contractDef.interfaceFunctions())
 		if (it.second->hasDeclaration())
 		{
-			string value;
+			std::string value;
 
 			if (auto const* f = dynamic_cast<FunctionDefinition const*>(&it.second->declaration()))
 				value = extractDoc(f->annotation().docTags, "notice");
@@ -80,14 +78,14 @@ Json::Value Natspec::userDocumentation(ContractDefinition const& _contractDef)
 
 	for (auto const& event: uniqueInterfaceEvents(_contractDef))
 	{
-		string value = extractDoc(event->annotation().docTags, "notice");
+		std::string value = extractDoc(event->annotation().docTags, "notice");
 		if (!value.empty())
 			doc["events"][event->functionType(true)->externalSignature()]["notice"] = value;
 	}
 
 	for (auto const& error: _contractDef.interfaceErrors())
 	{
-		string value = extractDoc(error->annotation().docTags, "notice");
+		std::string value = extractDoc(error->annotation().docTags, "notice");
 		if (!value.empty())
 		{
 			Json::Value errorDoc{Json::objectValue};
@@ -152,7 +150,7 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
 		if (auto devDoc = devDocumentation(varDecl->annotation().docTags); !devDoc.empty())
 			doc["stateVariables"][varDecl->name()] = devDoc;
 
-		auto const assignIfNotEmpty = [&](string const& _name, Json::Value const& _content)
+		auto const assignIfNotEmpty = [&](std::string const& _name, Json::Value const& _content)
 		{
 			if (!_content.empty())
 				doc["stateVariables"][varDecl->name()][_name] = _content;
@@ -178,7 +176,7 @@ Json::Value Natspec::devDocumentation(ContractDefinition const& _contractDef)
 	return doc;
 }
 
-Json::Value Natspec::extractReturnParameterDocs(std::multimap<std::string, DocTag> const& _tags, vector<string> const& _returnParameterNames)
+Json::Value Natspec::extractReturnParameterDocs(std::multimap<std::string, DocTag> const& _tags, std::vector<std::string> const& _returnParameterNames)
 {
 	Json::Value jsonReturn{Json::objectValue};
 	auto returnDocs = _tags.equal_range("return");
@@ -188,8 +186,8 @@ Json::Value Natspec::extractReturnParameterDocs(std::multimap<std::string, DocTa
 		size_t n = 0;
 		for (auto i = returnDocs.first; i != returnDocs.second; i++)
 		{
-			string paramName = _returnParameterNames.at(n);
-			string content = i->second.content;
+			std::string paramName = _returnParameterNames.at(n);
+			std::string content = i->second.content;
 
 			if (paramName.empty())
 				paramName = "_" + std::to_string(n);
@@ -209,18 +207,18 @@ Json::Value Natspec::extractReturnParameterDocs(std::multimap<std::string, DocTa
 	return jsonReturn;
 }
 
-string Natspec::extractDoc(multimap<string, DocTag> const& _tags, string const& _name)
+std::string Natspec::extractDoc(std::multimap<std::string, DocTag> const& _tags, std::string const& _name)
 {
-	string value;
+	std::string value;
 	auto range = _tags.equal_range(_name);
 	for (auto i = range.first; i != range.second; i++)
 		value += i->second.content;
 	return value;
 }
 
-Json::Value Natspec::extractCustomDoc(multimap<string, DocTag> const& _tags)
+Json::Value Natspec::extractCustomDoc(std::multimap<std::string, DocTag> const& _tags)
 {
-	std::map<string, string> concatenated;
+	std::map<std::string, std::string> concatenated;
 	for (auto const& [tag, value]: _tags)
 		if (boost::starts_with(tag, "custom"))
 			concatenated[tag] += value.content;
@@ -255,9 +253,9 @@ Json::Value Natspec::devDocumentation(std::multimap<std::string, DocTag> const&
 	return json;
 }
 
-vector<EventDefinition const*>  Natspec::uniqueInterfaceEvents(ContractDefinition const& _contract)
+std::vector<EventDefinition const*>  Natspec::uniqueInterfaceEvents(ContractDefinition const& _contract)
 {
-	auto eventSignature = [](EventDefinition const* _event) -> string {
+	auto eventSignature = [](EventDefinition const* _event) -> std::string {
 		FunctionType const* functionType = _event->functionType(true);
 		solAssert(functionType, "");
 		return functionType->externalSignature();
@@ -267,13 +265,13 @@ vector<EventDefinition const*>  Natspec::uniqueInterfaceEvents(ContractDefinitio
 			return eventSignature(_lhs) < eventSignature(_rhs);
 		};
 
-	set<EventDefinition const*, decltype(compareBySignature)> uniqueEvents{compareBySignature};
+	std::set<EventDefinition const*, decltype(compareBySignature)> uniqueEvents{compareBySignature};
 	// Insert events defined in the contract first so that in case of a conflict
 	// they're the ones that get selected.
 	uniqueEvents += _contract.definedInterfaceEvents();
 
-	set<EventDefinition const*, decltype(compareBySignature)> filteredUsedEvents{compareBySignature};
-	set<string> usedSignatures;
+	std::set<EventDefinition const*, decltype(compareBySignature)> filteredUsedEvents{compareBySignature};
+	std::set<std::string> usedSignatures;
 	for (EventDefinition const* event: _contract.usedInterfaceEvents())
 	{
 		auto&& [eventIt, eventInserted] = filteredUsedEvents.insert(event);
@@ -283,5 +281,5 @@ vector<EventDefinition const*>  Natspec::uniqueInterfaceEvents(ContractDefinitio
 	}
 
 	uniqueEvents += filteredUsedEvents;
-	return util::convertContainer<vector<EventDefinition const*>>(std::move(uniqueEvents));
+	return util::convertContainer<std::vector<EventDefinition const*>>(std::move(uniqueEvents));
 }
diff --git a/libsolidity/interface/SMTSolverCommand.cpp b/libsolidity/interface/SMTSolverCommand.cpp
index 1896da3c64..92e0485b84 100644
--- a/libsolidity/interface/SMTSolverCommand.cpp
+++ b/libsolidity/interface/SMTSolverCommand.cpp
@@ -33,14 +33,13 @@
 using solidity::langutil::InternalCompilerError;
 using solidity::util::errinfo_comment;
 
-using namespace std;
 
 namespace solidity::frontend
 {
 
-SMTSolverCommand::SMTSolverCommand(string _solverCmd) : m_solverCmd(_solverCmd) {}
+SMTSolverCommand::SMTSolverCommand(std::string _solverCmd) : m_solverCmd(_solverCmd) {}
 
-ReadCallback::Result SMTSolverCommand::solve(string const& _kind, string const& _query)
+ReadCallback::Result SMTSolverCommand::solve(std::string const& _kind, std::string const& _query)
 {
 	try
 	{
@@ -66,8 +65,8 @@ ReadCallback::Result SMTSolverCommand::solve(string const& _kind, string const&
 			boost::process::std_out > pipe
 		);
 
-		vector<string> data;
-		string line;
+		std::vector<std::string> data;
+		std::string line;
 		while (eld.running() && std::getline(pipe, line))
 			if (!line.empty())
 				data.push_back(line);
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 32d6cf8e8b..e90d25e21c 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -44,20 +44,20 @@
 #include <algorithm>
 #include <optional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::frontend;
 using namespace solidity::langutil;
+using namespace std::string_literals;
 
 namespace
 {
 
 Json::Value formatError(
 	Error::Type _type,
-	string const& _component,
-	string const& _message,
-	string const& _formattedMessage = "",
+	std::string const& _component,
+	std::string const& _message,
+	std::string const& _formattedMessage = "",
 	Json::Value const& _sourceLocation = Json::Value(),
 	Json::Value const& _secondarySourceLocation = Json::Value()
 )
@@ -75,7 +75,7 @@ Json::Value formatError(
 	return error;
 }
 
-Json::Value formatFatalError(Error::Type _type, string const& _message)
+Json::Value formatFatalError(Error::Type _type, std::string const& _message)
 {
 	Json::Value output{Json::objectValue};
 	output["errors"] = Json::arrayValue;
@@ -114,21 +114,21 @@ Json::Value formatErrorWithException(
 	CharStreamProvider const& _charStreamProvider,
 	util::Exception const& _exception,
 	Error::Type _type,
-	string const& _component,
-	string const& _message,
-	optional<ErrorId> _errorId = nullopt
+	std::string const& _component,
+	std::string const& _message,
+	std::optional<ErrorId> _errorId = std::nullopt
 )
 {
-	string message;
+	std::string message;
 	// TODO: consider enabling color
-	string formattedMessage = SourceReferenceFormatter::formatExceptionInformation(
+	std::string formattedMessage = SourceReferenceFormatter::formatExceptionInformation(
 		_exception,
 		_type,
 		_charStreamProvider,
 		false // colored
 	);
 
-	if (string const* description = _exception.comment())
+	if (std::string const* description = _exception.comment())
 		message = ((_message.length() > 0) ? (_message + ":") : "") + *description;
 	else
 		message = _message;
@@ -143,20 +143,20 @@ Json::Value formatErrorWithException(
 	);
 
 	if (_errorId)
-		error["errorCode"] = to_string(_errorId.value().error);
+		error["errorCode"] = std::to_string(_errorId.value().error);
 
 	return error;
 }
 
-map<string, set<string>> requestedContractNames(Json::Value const& _outputSelection)
+std::map<std::string, std::set<std::string>> requestedContractNames(Json::Value const& _outputSelection)
 {
-	map<string, set<string>> contracts;
+	std::map<std::string, std::set<std::string>> contracts;
 	for (auto const& sourceName: _outputSelection.getMemberNames())
 	{
-		string key = (sourceName == "*") ? "" : sourceName;
+		std::string key = (sourceName == "*") ? "" : sourceName;
 		for (auto const& contractName: _outputSelection[sourceName].getMemberNames())
 		{
-			string value = (contractName == "*") ? "" : contractName;
+			std::string value = (contractName == "*") ? "" : contractName;
 			contracts[key].insert(value);
 		}
 	}
@@ -164,7 +164,7 @@ map<string, set<string>> requestedContractNames(Json::Value const& _outputSelect
 }
 
 /// Returns true iff @a _hash (hex with 0x prefix) is the Keccak256 hash of the binary data in @a _content.
-bool hashMatchesContent(string const& _hash, string const& _content)
+bool hashMatchesContent(std::string const& _hash, std::string const& _content)
 {
 	try
 	{
@@ -176,12 +176,12 @@ bool hashMatchesContent(string const& _hash, string const& _content)
 	}
 }
 
-bool isArtifactRequested(Json::Value const& _outputSelection, string const& _artifact, bool _wildcardMatchesExperimental)
+bool isArtifactRequested(Json::Value const& _outputSelection, std::string const& _artifact, bool _wildcardMatchesExperimental)
 {
-	static set<string> experimental{"ir", "irAst", "irOptimized", "irOptimizedAst"};
+	static std::set<std::string> experimental{"ir", "irAst", "irOptimized", "irOptimizedAst"};
 	for (auto const& selectedArtifactJson: _outputSelection)
 	{
-		string const& selectedArtifact = selectedArtifactJson.asString();
+		std::string const& selectedArtifact = selectedArtifactJson.asString();
 		if (
 			_artifact == selectedArtifact ||
 			boost::algorithm::starts_with(_artifact, selectedArtifact + ".")
@@ -210,17 +210,17 @@ bool isArtifactRequested(Json::Value const& _outputSelection, string const& _art
 ///
 /// @TODO optimise this. Perhaps flatten the structure upfront.
 ///
-bool isArtifactRequested(Json::Value const& _outputSelection, string const& _file, string const& _contract, string const& _artifact, bool _wildcardMatchesExperimental)
+bool isArtifactRequested(Json::Value const& _outputSelection, std::string const& _file, std::string const& _contract, std::string const& _artifact, bool _wildcardMatchesExperimental)
 {
 	if (!_outputSelection.isObject())
 		return false;
 
-	for (auto const& file: { _file, string("*") })
+	for (auto const& file: { _file, std::string("*") })
 		if (_outputSelection.isMember(file) && _outputSelection[file].isObject())
 		{
 			/// For SourceUnit-level targets (such as AST) only allow empty name, otherwise
 			/// for Contract-level targets try both contract name and wildcard
-			vector<string> contracts{ _contract };
+			std::vector<std::string> contracts{ _contract };
 			if (!_contract.empty())
 				contracts.emplace_back("*");
 			for (auto const& contract: contracts)
@@ -235,7 +235,7 @@ bool isArtifactRequested(Json::Value const& _outputSelection, string const& _fil
 	return false;
 }
 
-bool isArtifactRequested(Json::Value const& _outputSelection, string const& _file, string const& _contract, vector<string> const& _artifacts, bool _wildcardMatchesExperimental)
+bool isArtifactRequested(Json::Value const& _outputSelection, std::string const& _file, std::string const& _contract, std::vector<std::string> const& _artifacts, bool _wildcardMatchesExperimental)
 {
 	for (auto const& artifact: _artifacts)
 		if (isArtifactRequested(_outputSelection, _file, _contract, artifact, _wildcardMatchesExperimental))
@@ -244,10 +244,10 @@ bool isArtifactRequested(Json::Value const& _outputSelection, string const& _fil
 }
 
 /// @returns all artifact names of the EVM object, either for creation or deploy time.
-vector<string> evmObjectComponents(string const& _objectKind)
+std::vector<std::string> evmObjectComponents(std::string const& _objectKind)
 {
 	solAssert(_objectKind == "bytecode" || _objectKind == "deployedBytecode", "");
-	vector<string> components{"", ".object", ".opcodes", ".sourceMap", ".functionDebugData", ".generatedSources", ".linkReferences"};
+	std::vector<std::string> components{"", ".object", ".opcodes", ".sourceMap", ".functionDebugData", ".generatedSources", ".linkReferences"};
 	if (_objectKind == "deployedBytecode")
 		components.push_back(".immutableReferences");
 	return util::applyMap(components, [&](auto const& _s) { return "evm." + _objectKind + _s; });
@@ -260,7 +260,7 @@ bool isBinaryRequested(Json::Value const& _outputSelection)
 		return false;
 
 	// This does not include "evm.methodIdentifiers" on purpose!
-	static vector<string> const outputsThatRequireBinaries = vector<string>{
+	static std::vector<std::string> const outputsThatRequireBinaries = std::vector<std::string>{
 		"*",
 		"ir", "irAst", "irOptimized", "irOptimizedAst",
 		"evm.gasEstimates", "evm.legacyAssembly", "evm.assembly"
@@ -280,7 +280,7 @@ bool isEvmBytecodeRequested(Json::Value const& _outputSelection)
 	if (!_outputSelection.isObject())
 		return false;
 
-	static vector<string> const outputsThatRequireEvmBinaries = vector<string>{
+	static std::vector<std::string> const outputsThatRequireEvmBinaries = std::vector<std::string>{
 		"*",
 		"evm.gasEstimates", "evm.legacyAssembly", "evm.assembly"
 	} + evmObjectComponents("bytecode") + evmObjectComponents("deployedBytecode");
@@ -320,13 +320,13 @@ Json::Value formatLinkReferences(std::map<size_t, std::string> const& linkRefere
 
 	for (auto const& ref: linkReferences)
 	{
-		string const& fullname = ref.second;
+		std::string const& fullname = ref.second;
 
 		// If the link reference does not contain a colon, assume that the file name is missing and
-		// the whole string represents the library name.
+		// the whole std::string represents the library name.
 		size_t colon = fullname.rfind(':');
-		string file = (colon != string::npos ? fullname.substr(0, colon) : "");
-		string name = (colon != string::npos ? fullname.substr(colon + 1) : fullname);
+		std::string file = (colon != std::string::npos ? fullname.substr(0, colon) : "");
+		std::string name = (colon != std::string::npos ? fullname.substr(colon + 1) : fullname);
 
 		Json::Value fileObject = ret.get(file, Json::objectValue);
 		Json::Value libraryArray = fileObject.get(name, Json::arrayValue);
@@ -343,7 +343,7 @@ Json::Value formatLinkReferences(std::map<size_t, std::string> const& linkRefere
 	return ret;
 }
 
-Json::Value formatImmutableReferences(map<u256, pair<string, vector<size_t>>> const& _immutableReferences)
+Json::Value formatImmutableReferences(std::map<u256, std::pair<std::string, std::vector<size_t>>> const& _immutableReferences)
 {
 	Json::Value ret{Json::objectValue};
 
@@ -367,10 +367,10 @@ Json::Value formatImmutableReferences(map<u256, pair<string, vector<size_t>>> co
 Json::Value collectEVMObject(
 	langutil::EVMVersion _evmVersion,
 	evmasm::LinkerObject const& _object,
-	string const* _sourceMap,
+	std::string const* _sourceMap,
 	Json::Value _generatedSources,
 	bool _runtimeObject,
-	function<bool(string)> const& _artifactRequested
+	std::function<bool(std::string)> const& _artifactRequested
 )
 {
 	Json::Value output{Json::objectValue};
@@ -391,7 +391,7 @@ Json::Value collectEVMObject(
 	return output;
 }
 
-std::optional<Json::Value> checkKeys(Json::Value const& _input, set<string> const& _keys, string const& _name)
+std::optional<Json::Value> checkKeys(Json::Value const& _input, std::set<std::string> const& _keys, std::string const& _name)
 {
 	if (!!_input && !_input.isObject())
 		return formatFatalError(Error::Type::JSONError, "\"" + _name + "\" must be an object");
@@ -405,43 +405,43 @@ std::optional<Json::Value> checkKeys(Json::Value const& _input, set<string> cons
 
 std::optional<Json::Value> checkRootKeys(Json::Value const& _input)
 {
-	static set<string> keys{"auxiliaryInput", "language", "settings", "sources"};
+	static std::set<std::string> keys{"auxiliaryInput", "language", "settings", "sources"};
 	return checkKeys(_input, keys, "root");
 }
 
-std::optional<Json::Value> checkSourceKeys(Json::Value const& _input, string const& _name)
+std::optional<Json::Value> checkSourceKeys(Json::Value const& _input, std::string const& _name)
 {
-	static set<string> keys{"content", "keccak256", "urls"};
+	static std::set<std::string> keys{"content", "keccak256", "urls"};
 	return checkKeys(_input, keys, "sources." + _name);
 }
 
 std::optional<Json::Value> checkAuxiliaryInputKeys(Json::Value const& _input)
 {
-	static set<string> keys{"smtlib2responses"};
+	static std::set<std::string> keys{"smtlib2responses"};
 	return checkKeys(_input, keys, "auxiliaryInput");
 }
 
 std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
 {
-	static set<string> keys{"parserErrorRecovery", "debug", "evmVersion", "libraries", "metadata", "modelChecker", "optimizer", "outputSelection", "remappings", "stopAfter", "viaIR"};
+	static std::set<std::string> keys{"parserErrorRecovery", "debug", "evmVersion", "libraries", "metadata", "modelChecker", "optimizer", "outputSelection", "remappings", "stopAfter", "viaIR"};
 	return checkKeys(_input, keys, "settings");
 }
 
 std::optional<Json::Value> checkModelCheckerSettingsKeys(Json::Value const& _input)
 {
-	static set<string> keys{"bmcLoopIterations", "contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "printQuery", "showProvedSafe", "showUnproved", "showUnsupported", "solvers", "targets", "timeout"};
+	static std::set<std::string> keys{"bmcLoopIterations", "contracts", "divModNoSlacks", "engine", "extCalls", "invariants", "printQuery", "showProvedSafe", "showUnproved", "showUnsupported", "solvers", "targets", "timeout"};
 	return checkKeys(_input, keys, "modelChecker");
 }
 
 std::optional<Json::Value> checkOptimizerKeys(Json::Value const& _input)
 {
-	static set<string> keys{"details", "enabled", "runs"};
+	static std::set<std::string> keys{"details", "enabled", "runs"};
 	return checkKeys(_input, keys, "settings.optimizer");
 }
 
 std::optional<Json::Value> checkOptimizerDetailsKeys(Json::Value const& _input)
 {
-	static set<string> keys{"peephole", "inliner", "jumpdestRemover", "orderLiterals", "deduplicate", "cse", "constantOptimizer", "yul", "yulDetails"};
+	static std::set<std::string> keys{"peephole", "inliner", "jumpdestRemover", "orderLiterals", "deduplicate", "cse", "constantOptimizer", "yul", "yulDetails"};
 	return checkKeys(_input, keys, "settings.optimizer.details");
 }
 
@@ -456,7 +456,7 @@ std::optional<Json::Value> checkOptimizerDetail(Json::Value const& _details, std
 	return {};
 }
 
-std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details, std::string const& _name, string& _optimiserSetting, string& _cleanupSetting)
+std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details, std::string const& _name, std::string& _optimiserSetting, std::string& _cleanupSetting)
 {
 	if (_details.isMember(_name))
 	{
@@ -474,11 +474,11 @@ std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details
 				);
 			}
 
-			string const fullSequence = _details[_name].asString();
+			std::string const fullSequence = _details[_name].asString();
 			auto const delimiterPos = fullSequence.find(":");
 			_optimiserSetting = fullSequence.substr(0, delimiterPos);
 
-			if (delimiterPos != string::npos)
+			if (delimiterPos != std::string::npos)
 				_cleanupSetting = fullSequence.substr(delimiterPos + 1);
 			else
 				solAssert(_cleanupSetting == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
@@ -499,11 +499,11 @@ std::optional<Json::Value> checkMetadataKeys(Json::Value const& _input)
 		if (_input.isMember("useLiteralContent") && !_input["useLiteralContent"].isBool())
 			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.useLiteralContent\" must be Boolean");
 
-		static set<string> hashes{"ipfs", "bzzr1", "none"};
+		static std::set<std::string> hashes{"ipfs", "bzzr1", "none"};
 		if (_input.isMember("bytecodeHash") && !hashes.count(_input["bytecodeHash"].asString()))
 			return formatFatalError(Error::Type::JSONError, "\"settings.metadata.bytecodeHash\" must be \"ipfs\", \"bzzr1\" or \"none\"");
 	}
-	static set<string> keys{"appendCBOR", "useLiteralContent", "bytecodeHash"};
+	static std::set<std::string> keys{"appendCBOR", "useLiteralContent", "bytecodeHash"};
 	return checkKeys(_input, keys, "settings.metadata");
 }
 
@@ -645,7 +645,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	{
 		for (auto const& sourceName: sources.getMemberNames())
 		{
-			string hash;
+			std::string hash;
 
 			if (auto result = checkSourceKeys(sources[sourceName], sourceName))
 				return *result;
@@ -655,7 +655,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 
 			if (sources[sourceName]["content"].isString())
 			{
-				string content = sources[sourceName]["content"].asString();
+				std::string content = sources[sourceName]["content"].asString();
 				if (!hash.empty() && !hashMatchesContent(hash, content))
 					ret.errors.append(formatError(
 						Error::Type::IOError,
@@ -672,7 +672,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 						Error::Type::JSONError, "No import callback supplied, but URL is requested."
 					);
 
-				vector<string> failures;
+				std::vector<std::string> failures;
 				bool found = false;
 
 				for (auto const& url: sources[sourceName]["urls"])
@@ -832,11 +832,11 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 			if (!settings["debug"]["debugInfo"].isArray())
 				return formatFatalError(Error::Type::JSONError, "settings.debug.debugInfo must be an array.");
 
-			vector<string> components;
+			std::vector<std::string> components;
 			for (Json::Value const& arrayValue: settings["debug"]["debugInfo"])
 				components.push_back(arrayValue.asString());
 
-			optional<DebugInfoSelection> debugInfoSelection = DebugInfoSelection::fromComponents(
+			std::optional<DebugInfoSelection> debugInfoSelection = DebugInfoSelection::fromComponents(
 				components,
 				true /* _acceptWildcards */
 			);
@@ -887,7 +887,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		{
 			if (!jsonSourceName[library].isString())
 				return formatFatalError(Error::Type::JSONError, "Library address must be a string.");
-			string address = jsonSourceName[library].asString();
+			std::string address = jsonSourceName[library].asString();
 
 			if (!boost::starts_with(address, "0x"))
 				return formatFatalError(
@@ -969,7 +969,7 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		if (!sources.isObject() && !sources.isNull())
 			return formatFatalError(Error::Type::JSONError, "settings.modelChecker.contracts is not a JSON object.");
 
-		map<string, set<string>> sourceContracts;
+		std::map<std::string, std::set<std::string>> sourceContracts;
 		for (auto const& source: sources.getMemberNames())
 		{
 			if (source.empty())
@@ -1138,14 +1138,14 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 	return {std::move(ret)};
 }
 
-map<string, Json::Value> StandardCompiler::parseAstFromInput(StringMap const& _sources)
+std::map<std::string, Json::Value> StandardCompiler::parseAstFromInput(StringMap const& _sources)
 {
-	map<string, Json::Value> sourceJsons;
+	std::map<std::string, Json::Value> sourceJsons;
 	for (auto const& [sourceName, sourceCode]: _sources)
 	{
 		Json::Value ast;
 		astAssert(util::jsonParseStrict(sourceCode, ast), "Input file could not be parsed to JSON");
-		string astKey = ast.isMember("ast") ? "ast" : "AST";
+		std::string astKey = ast.isMember("ast") ? "ast" : "AST";
 
 		astAssert(ast.isMember(astKey), "astkey is not member");
 		astAssert(ast[astKey]["nodeType"].asString() == "SourceUnit", "Top-level node should be a 'SourceUnit'");
@@ -1341,7 +1341,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		output["errors"] = std::move(errors);
 
 	if (!compilerStack.unhandledSMTLib2Queries().empty())
-		for (string const& query: compilerStack.unhandledSMTLib2Queries())
+		for (std::string const& query: compilerStack.unhandledSMTLib2Queries())
 			output["auxiliaryInputRequested"]["smtlib2queries"]["0x" + util::keccak256(query).hex()] = query;
 
 	bool const wildcardMatchesExperimental = false;
@@ -1349,7 +1349,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	output["sources"] = Json::objectValue;
 	unsigned sourceIndex = 0;
 	if (parsingSuccess && !analysisFailed && (!compilerStack.hasError() || _inputsAndSettings.parserErrorRecovery))
-		for (string const& sourceName: compilerStack.sourceNames())
+		for (std::string const& sourceName: compilerStack.sourceNames())
 		{
 			Json::Value sourceResult = Json::objectValue;
 			sourceResult["id"] = sourceIndex++;
@@ -1359,12 +1359,12 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		}
 
 	Json::Value contractsOutput = Json::objectValue;
-	for (string const& contractName: analysisPerformed ? compilerStack.contractNames() : vector<string>())
+	for (std::string const& contractName: analysisPerformed ? compilerStack.contractNames() : std::vector<std::string>())
 	{
 		size_t colon = contractName.rfind(':');
-		solAssert(colon != string::npos, "");
-		string file = contractName.substr(0, colon);
-		string name = contractName.substr(colon + 1);
+		solAssert(colon != std::string::npos, "");
+		std::string file = contractName.substr(0, colon);
+		std::string name = contractName.substr(colon + 1);
 
 		// ABI, storage layout, documentation and metadata
 		Json::Value contractData(Json::objectValue);
@@ -1413,7 +1413,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 				compilerStack.sourceMapping(contractName),
 				compilerStack.generatedSources(contractName),
 				false,
-				[&](string const& _element) { return isArtifactRequested(
+				[&](std::string const& _element) { return isArtifactRequested(
 					_inputsAndSettings.outputSelection,
 					file,
 					name,
@@ -1435,7 +1435,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 				compilerStack.runtimeSourceMapping(contractName),
 				compilerStack.generatedSources(contractName, true),
 				true,
-				[&](string const& _element) { return isArtifactRequested(
+				[&](std::string const& _element) { return isArtifactRequested(
 					_inputsAndSettings.outputSelection,
 					file,
 					name,
@@ -1512,8 +1512,8 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 			_inputsAndSettings.debugInfoSelection.value() :
 			DebugInfoSelection::Default()
 	);
-	string const& sourceName = _inputsAndSettings.sources.begin()->first;
-	string const& sourceContents = _inputsAndSettings.sources.begin()->second;
+	std::string const& sourceName = _inputsAndSettings.sources.begin()->first;
+	std::string const& sourceContents = _inputsAndSettings.sources.begin()->second;
 
 	// Inconsistent state - stop here to receive error reports from users
 	if (!stack.parseAndAnalyze(sourceName, sourceContents) && stack.errors().empty())
@@ -1530,7 +1530,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 	{
 		for (auto const& error: stack.errors())
 		{
-			auto err = dynamic_pointer_cast<Error const>(error);
+			auto err = std::dynamic_pointer_cast<Error const>(error);
 
 			output["errors"].append(formatErrorWithException(
 				stack,
@@ -1543,7 +1543,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 		return output;
 	}
 
-	string contractName = stack.parserResult()->name.str();
+	std::string contractName = stack.parserResult()->name.str();
 
 	bool const wildcardMatchesExperimental = true;
 	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, contractName, "ir", wildcardMatchesExperimental))
@@ -1560,7 +1560,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 
 	MachineAssemblyObject object;
 	MachineAssemblyObject deployedObject;
-	tie(object, deployedObject) = stack.assembleWithDeployed();
+	std::tie(object, deployedObject) = stack.assembleWithDeployed();
 
 	if (object.bytecode)
 		object.bytecode->link(_inputsAndSettings.libraries);
@@ -1585,7 +1585,7 @@ Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 						o.sourceMappings.get(),
 						Json::arrayValue,
 						isDeployed,
-						[&, kind = kind](string const& _element) { return isArtifactRequested(
+						[&, kind = kind](std::string const& _element) { return isArtifactRequested(
 							_inputsAndSettings.outputSelection,
 							sourceName,
 							contractName,
@@ -1625,11 +1625,11 @@ Json::Value StandardCompiler::compile(Json::Value const& _input) noexcept
 	}
 	catch (Json::LogicError const& _exception)
 	{
-		return formatFatalError(Error::Type::InternalCompilerError, string("JSON logic exception: ") + _exception.what());
+		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON logic exception: ") + _exception.what());
 	}
 	catch (Json::RuntimeError const& _exception)
 	{
-		return formatFatalError(Error::Type::InternalCompilerError, string("JSON runtime exception: ") + _exception.what());
+		return formatFatalError(Error::Type::InternalCompilerError, std::string("JSON runtime exception: ") + _exception.what());
 	}
 	catch (util::Exception const& _exception)
 	{
@@ -1641,10 +1641,10 @@ Json::Value StandardCompiler::compile(Json::Value const& _input) noexcept
 	}
 }
 
-string StandardCompiler::compile(string const& _input) noexcept
+std::string StandardCompiler::compile(std::string const& _input) noexcept
 {
 	Json::Value input;
-	string errors;
+	std::string errors;
 	try
 	{
 		if (!util::jsonParseStrict(_input, input, &errors))
@@ -1670,7 +1670,7 @@ string StandardCompiler::compile(string const& _input) noexcept
 }
 
 Json::Value StandardCompiler::formatFunctionDebugData(
-	map<string, evmasm::LinkerObject::FunctionDebugData> const& _debugInfo
+	std::map<std::string, evmasm::LinkerObject::FunctionDebugData> const& _debugInfo
 )
 {
 	Json::Value ret(Json::objectValue);
diff --git a/libsolidity/interface/StorageLayout.cpp b/libsolidity/interface/StorageLayout.cpp
index 76c840db57..8e1d0eed10 100644
--- a/libsolidity/interface/StorageLayout.cpp
+++ b/libsolidity/interface/StorageLayout.cpp
@@ -20,7 +20,6 @@
 
 #include <libsolidity/ast/TypeProvider.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
@@ -112,7 +111,7 @@ void StorageLayout::generate(Type const* _type)
 	solAssert(typeInfo.isMember("encoding"), "");
 }
 
-string StorageLayout::typeKeyName(Type const* _type)
+std::string StorageLayout::typeKeyName(Type const* _type)
 {
 	if (auto refType = dynamic_cast<ReferenceType const*>(_type))
 		return TypeProvider::withLocationIfReference(refType->location(), _type)->richIdentifier();
diff --git a/libsolidity/interface/Version.cpp b/libsolidity/interface/Version.cpp
index 0017b6de1d..565ff2a60e 100644
--- a/libsolidity/interface/Version.cpp
+++ b/libsolidity/interface/Version.cpp
@@ -25,19 +25,17 @@
 
 #include <solidity/BuildInfo.h>
 
-using namespace std;
-
 char const* solidity::frontend::VersionNumber = ETH_PROJECT_VERSION;
 
-string const solidity::frontend::VersionString =
-	string(solidity::frontend::VersionNumber) +
-	(string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + string(SOL_VERSION_PRERELEASE)) +
-	(string(SOL_VERSION_BUILDINFO).empty() ? "" : "+" + string(SOL_VERSION_BUILDINFO));
+std::string const solidity::frontend::VersionString =
+	std::string(solidity::frontend::VersionNumber) +
+	(std::string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + std::string(SOL_VERSION_PRERELEASE)) +
+	(std::string(SOL_VERSION_BUILDINFO).empty() ? "" : "+" + std::string(SOL_VERSION_BUILDINFO));
 
-string const solidity::frontend::VersionStringStrict =
-	string(solidity::frontend::VersionNumber) +
-	(string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + string(SOL_VERSION_PRERELEASE)) +
-	(string(SOL_VERSION_COMMIT).empty() ? "" : "+" + string(SOL_VERSION_COMMIT));
+std::string const solidity::frontend::VersionStringStrict =
+	std::string(solidity::frontend::VersionNumber) +
+	(std::string(SOL_VERSION_PRERELEASE).empty() ? "" : "-" + std::string(SOL_VERSION_PRERELEASE)) +
+	(std::string(SOL_VERSION_COMMIT).empty() ? "" : "+" + std::string(SOL_VERSION_COMMIT));
 
 solidity::bytes const solidity::frontend::VersionCompactBytes = {
 	ETH_PROJECT_VERSION_MAJOR,
@@ -45,4 +43,4 @@ solidity::bytes const solidity::frontend::VersionCompactBytes = {
 	ETH_PROJECT_VERSION_PATCH
 };
 
-bool const solidity::frontend::VersionIsRelease = string(SOL_VERSION_PRERELEASE).empty();
+bool const solidity::frontend::VersionIsRelease = std::string(SOL_VERSION_PRERELEASE).empty();
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index cfc9def7ab..7c85e67194 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -30,6 +30,7 @@ NAMESPACE_STD_FREE_FILES=(
     libsolidity/codegen/ir/*
     libsolidity/codegen/*
     libsolidity/formal/*
+    libsolidity/interface/*
 )
 
 (

From f344dc164e9d720f604ac5b345df1243587d6942 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 15 Aug 2023 16:21:33 +0200
Subject: [PATCH 1544/1748] Purge using namespace from libsolidity/lsp and
 parsing

---
 libsolidity/interface/CompilerStack.cpp    |   2 +-
 libsolidity/interface/StandardCompiler.cpp |   2 +-
 libsolidity/lsp/DocumentHoverHandler.cpp   |   9 +-
 libsolidity/lsp/FileRepository.cpp         |  21 ++-
 libsolidity/lsp/GotoDefinition.cpp         |   5 +-
 libsolidity/lsp/HandlerBase.cpp            |   7 +-
 libsolidity/lsp/LanguageServer.cpp         |  75 +++++----
 libsolidity/lsp/RenameSymbol.cpp           |  17 +-
 libsolidity/lsp/SemanticTokensBuilder.cpp  |   5 +-
 libsolidity/lsp/Transport.cpp              |  33 ++--
 libsolidity/lsp/Utils.cpp                  |  43 +++---
 libsolidity/parsing/DocStringParser.cpp    |  37 +++--
 libsolidity/parsing/Parser.cpp             | 172 ++++++++++-----------
 scripts/check_style.sh                     |   2 +
 14 files changed, 210 insertions(+), 220 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 295811fd06..234ae5d009 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1859,7 +1859,7 @@ Json::Value CompilerStack::gasEstimates(std::string const& _contractName) const
 		if (contract.fallbackFunction())
 			/// This needs to be set to an invalid signature in order to trigger the fallback,
 			/// without the shortcut (of CALLDATSIZE == 0), and therefore to receive the upper bound.
-			/// An empty std::string ("") would work to trigger the shortcut only.
+			/// An empty string ("") would work to trigger the shortcut only.
 			externalFunctions[""] = gasToJson(gasEstimator.functionalEstimation(*items, "INVALID"));
 
 		if (!externalFunctions.empty())
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index e90d25e21c..20cec68ae0 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -323,7 +323,7 @@ Json::Value formatLinkReferences(std::map<size_t, std::string> const& linkRefere
 		std::string const& fullname = ref.second;
 
 		// If the link reference does not contain a colon, assume that the file name is missing and
-		// the whole std::string represents the library name.
+		// the whole string represents the library name.
 		size_t colon = fullname.rfind(':');
 		std::string file = (colon != std::string::npos ? fullname.substr(0, colon) : "");
 		std::string name = (colon != std::string::npos ? fullname.substr(colon + 1) : fullname);
diff --git a/libsolidity/lsp/DocumentHoverHandler.cpp b/libsolidity/lsp/DocumentHoverHandler.cpp
index 7700022289..39d1d72c33 100644
--- a/libsolidity/lsp/DocumentHoverHandler.cpp
+++ b/libsolidity/lsp/DocumentHoverHandler.cpp
@@ -23,9 +23,6 @@
 
 namespace solidity::lsp
 {
-
-using namespace std;
-
 using namespace solidity::lsp;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -35,16 +32,16 @@ namespace
 
 struct MarkdownBuilder
 {
-	stringstream result;
+	std::stringstream result;
 
-	MarkdownBuilder& solidityCode(string const& _code)
+	MarkdownBuilder& solidityCode(std::string const& _code)
 	{
 		auto constexpr SolidityLanguageId = "solidity";
 		result << "```" << SolidityLanguageId << '\n' << _code << "\n```\n\n";
 		return *this;
 	}
 
-	MarkdownBuilder& paragraph(string const& _text)
+	MarkdownBuilder& paragraph(std::string const& _text)
 	{
 		if (!_text.empty())
 		{
diff --git a/libsolidity/lsp/FileRepository.cpp b/libsolidity/lsp/FileRepository.cpp
index ca40343af3..7138cbd86a 100644
--- a/libsolidity/lsp/FileRepository.cpp
+++ b/libsolidity/lsp/FileRepository.cpp
@@ -34,7 +34,6 @@
 
 #include <fmt/format.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::lsp;
 using namespace solidity::frontend;
@@ -54,11 +53,11 @@ void FileRepository::setIncludePaths(std::vector<boost::filesystem::path> _paths
 	m_includePaths = std::move(_paths);
 }
 
-string FileRepository::sourceUnitNameToUri(string const& _sourceUnitName) const
+std::string FileRepository::sourceUnitNameToUri(std::string const& _sourceUnitName) const
 {
-	regex const windowsDriveLetterPath("^[a-zA-Z]:/");
+	std::regex const windowsDriveLetterPath("^[a-zA-Z]:/");
 
-	auto const ensurePathIsUnixLike = [&](string inputPath) -> string {
+	auto const ensurePathIsUnixLike = [&](std::string inputPath) -> std::string {
 		if (!regex_search(inputPath, windowsDriveLetterPath))
 			return inputPath;
 		else
@@ -86,13 +85,13 @@ string FileRepository::sourceUnitNameToUri(string const& _sourceUnitName) const
 		return "file:///" + _sourceUnitName;
 }
 
-string FileRepository::uriToSourceUnitName(string const& _path) const
+std::string FileRepository::uriToSourceUnitName(std::string const& _path) const
 {
 	lspRequire(boost::algorithm::starts_with(_path, "file://"), ErrorCode::InternalError, "URI must start with file://");
 	return stripFileUriSchemePrefix(_path);
 }
 
-void FileRepository::setSourceByUri(string const& _uri, string _source)
+void FileRepository::setSourceByUri(std::string const& _uri, std::string _source)
 {
 	// This is needed for uris outside the base path. It can lead to collisions,
 	// but we need to mostly rewrite this in a future version anyway.
@@ -110,9 +109,9 @@ Result<boost::filesystem::path> FileRepository::tryResolvePath(std::string const
 	)
 		return boost::filesystem::path(_strippedSourceUnitName);
 
-	vector<boost::filesystem::path> candidates;
-	vector<reference_wrapper<boost::filesystem::path const>> prefixes = {m_basePath};
-	prefixes += (m_includePaths | ranges::to<vector<reference_wrapper<boost::filesystem::path const>>>);
+	std::vector<boost::filesystem::path> candidates;
+	std::vector<std::reference_wrapper<boost::filesystem::path const>> prefixes = {m_basePath};
+	prefixes += (m_includePaths | ranges::to<std::vector<std::reference_wrapper<boost::filesystem::path const>>>);
 	auto const defaultInclude = m_basePath / "node_modules";
 	if (m_includePaths.empty())
 		prefixes.emplace_back(defaultInclude);
@@ -148,7 +147,7 @@ Result<boost::filesystem::path> FileRepository::tryResolvePath(std::string const
 	return candidates[0];
 }
 
-frontend::ReadCallback::Result FileRepository::readFile(string const& _kind, string const& _sourceUnitName)
+frontend::ReadCallback::Result FileRepository::readFile(std::string const& _kind, std::string const& _sourceUnitName)
 {
 	solAssert(
 		_kind == ReadCallback::kindString(ReadCallback::Kind::ReadFile),
@@ -161,7 +160,7 @@ frontend::ReadCallback::Result FileRepository::readFile(string const& _kind, str
 		if (m_sourceCodes.count(_sourceUnitName))
 			return ReadCallback::Result{true, m_sourceCodes.at(_sourceUnitName)};
 
-		string const strippedSourceUnitName = stripFileUriSchemePrefix(_sourceUnitName);
+		std::string const strippedSourceUnitName = stripFileUriSchemePrefix(_sourceUnitName);
 		Result<boost::filesystem::path> const resolvedPath = tryResolvePath(strippedSourceUnitName);
 		if (!resolvedPath.message().empty())
 			return ReadCallback::Result{false, resolvedPath.message()};
diff --git a/libsolidity/lsp/GotoDefinition.cpp b/libsolidity/lsp/GotoDefinition.cpp
index 532792c177..136e4d7c39 100644
--- a/libsolidity/lsp/GotoDefinition.cpp
+++ b/libsolidity/lsp/GotoDefinition.cpp
@@ -30,7 +30,6 @@
 using namespace solidity::frontend;
 using namespace solidity::langutil;
 using namespace solidity::lsp;
-using namespace std;
 
 void GotoDefinition::operator()(MessageID _id, Json::Value const& _args)
 {
@@ -38,7 +37,7 @@ void GotoDefinition::operator()(MessageID _id, Json::Value const& _args)
 
 	ASTNode const* sourceNode = m_server.astNodeAtSourceLocation(sourceUnitName, lineColumn);
 
-	vector<SourceLocation> locations;
+	std::vector<SourceLocation> locations;
 	if (auto const* expression = dynamic_cast<Expression const*>(sourceNode))
 	{
 		// Handles all expressions that can have one or more declaration annotation.
@@ -56,7 +55,7 @@ void GotoDefinition::operator()(MessageID _id, Json::Value const& _args)
 	{
 		auto const& path = *importDirective->annotation().absolutePath;
 		if (fileRepository().sourceUnits().count(path))
-			locations.emplace_back(SourceLocation{0, 0, make_shared<string const>(path)});
+			locations.emplace_back(SourceLocation{0, 0, std::make_shared<std::string const>(path)});
 	}
 
 	Json::Value reply = Json::arrayValue;
diff --git a/libsolidity/lsp/HandlerBase.cpp b/libsolidity/lsp/HandlerBase.cpp
index f40f189ab3..a23e43a83c 100644
--- a/libsolidity/lsp/HandlerBase.cpp
+++ b/libsolidity/lsp/HandlerBase.cpp
@@ -29,7 +29,6 @@
 using namespace solidity::langutil;
 using namespace solidity::lsp;
 using namespace solidity::util;
-using namespace std;
 
 Json::Value HandlerBase::toRange(SourceLocation const& _location) const
 {
@@ -52,10 +51,10 @@ Json::Value HandlerBase::toJson(SourceLocation const& _location) const
 	return item;
 }
 
-pair<string, LineColumn> HandlerBase::extractSourceUnitNameAndLineColumn(Json::Value const& _args) const
+std::pair<std::string, LineColumn> HandlerBase::extractSourceUnitNameAndLineColumn(Json::Value const& _args) const
 {
-	string const uri = _args["textDocument"]["uri"].asString();
-	string const sourceUnitName = fileRepository().uriToSourceUnitName(uri);
+	std::string const uri = _args["textDocument"]["uri"].asString();
+	std::string const sourceUnitName = fileRepository().uriToSourceUnitName(uri);
 	if (!fileRepository().sourceUnits().count(sourceUnitName))
 		BOOST_THROW_EXCEPTION(
 			RequestError(ErrorCode::RequestFailed) <<
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index aaa63b7f84..81b95e05a1 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -46,7 +46,6 @@
 
 #include <fmt/format.h>
 
-using namespace std;
 using namespace std::string_literals;
 using namespace std::placeholders;
 
@@ -109,7 +108,7 @@ Json::Value semanticTokensLegend()
 	tokenTypes.append("operator");
 	tokenTypes.append("parameter");
 	tokenTypes.append("property");
-	tokenTypes.append("string");
+	tokenTypes.append("std::string");
 	tokenTypes.append("struct");
 	tokenTypes.append("type");
 	tokenTypes.append("typeParameter");
@@ -137,19 +136,19 @@ LanguageServer::LanguageServer(Transport& _transport):
 		{"$/cancelRequest", [](auto, auto) {/*nothing for now as we are synchronous */}},
 		{"cancelRequest", [](auto, auto) {/*nothing for now as we are synchronous */}},
 		{"exit", [this](auto, auto) { m_state = (m_state == State::ShutdownRequested ? State::ExitRequested : State::ExitWithoutShutdown); }},
-		{"initialize", bind(&LanguageServer::handleInitialize, this, _1, _2)},
-		{"initialized", bind(&LanguageServer::handleInitialized, this, _1, _2)},
+		{"initialize", std::bind(&LanguageServer::handleInitialize, this, _1, _2)},
+		{"initialized", std::bind(&LanguageServer::handleInitialized, this, _1, _2)},
 		{"$/setTrace", [this](auto, Json::Value const& args) { setTrace(args["value"]); }},
 		{"shutdown", [this](auto, auto) { m_state = State::ShutdownRequested; }},
 		{"textDocument/definition", GotoDefinition(*this) },
-		{"textDocument/didOpen", bind(&LanguageServer::handleTextDocumentDidOpen, this, _2)},
-		{"textDocument/didChange", bind(&LanguageServer::handleTextDocumentDidChange, this, _2)},
-		{"textDocument/didClose", bind(&LanguageServer::handleTextDocumentDidClose, this, _2)},
+		{"textDocument/didOpen", std::bind(&LanguageServer::handleTextDocumentDidOpen, this, _2)},
+		{"textDocument/didChange", std::bind(&LanguageServer::handleTextDocumentDidChange, this, _2)},
+		{"textDocument/didClose", std::bind(&LanguageServer::handleTextDocumentDidClose, this, _2)},
 		{"textDocument/hover", DocumentHoverHandler(*this) },
 		{"textDocument/rename", RenameSymbol(*this) },
 		{"textDocument/implementation", GotoDefinition(*this) },
-		{"textDocument/semanticTokens/full", bind(&LanguageServer::semanticTokensFull, this, _1, _2)},
-		{"workspace/didChangeConfiguration", bind(&LanguageServer::handleWorkspaceDidChangeConfiguration, this, _2)},
+		{"textDocument/semanticTokens/full", std::bind(&LanguageServer::semanticTokensFull, this, _1, _2)},
+		{"workspace/didChangeConfiguration", std::bind(&LanguageServer::handleWorkspaceDidChangeConfiguration, this, _2)},
 	},
 	m_fileRepository("/" /* basePath */, {} /* no search paths */),
 	m_compilerStack{m_fileRepository.reader()}
@@ -196,7 +195,7 @@ void LanguageServer::changeConfiguration(Json::Value const& _settings)
 		int typeFailureCount = 0;
 		if (jsonIncludePaths.isArray())
 		{
-			vector<boost::filesystem::path> includePaths;
+			std::vector<boost::filesystem::path> includePaths;
 			for (Json::Value const& jsonPath: jsonIncludePaths)
 			{
 				if (jsonPath.isString())
@@ -214,9 +213,9 @@ void LanguageServer::changeConfiguration(Json::Value const& _settings)
 	}
 }
 
-vector<boost::filesystem::path> LanguageServer::allSolidityFilesFromProject() const
+std::vector<boost::filesystem::path> LanguageServer::allSolidityFilesFromProject() const
 {
-	vector<fs::path> collectedPaths{};
+	std::vector<fs::path> collectedPaths{};
 
 	// We explicitly decided against including all files from include paths but leave the possibility
 	// open for a future PR to enable such a feature to be optionally enabled (default disabled).
@@ -242,7 +241,7 @@ void LanguageServer::compile()
 	// so we just remove all non-open files.
 
 	FileRepository oldRepository(m_fileRepository.basePath(), m_fileRepository.includePaths());
-	swap(oldRepository, m_fileRepository);
+	std::swap(oldRepository, m_fileRepository);
 
 	// Load all solidity files from project.
 	if (m_fileLoadStrategy == FileLoadStrategy::ProjectDirectory)
@@ -256,7 +255,7 @@ void LanguageServer::compile()
 		}
 
 	// Overwrite all files as opened by the client, including the ones which might potentially have changes.
-	for (string const& fileName: m_openFiles)
+	for (std::string const& fileName: m_openFiles)
 		m_fileRepository.setSourceByUri(
 			fileName,
 			oldRepository.sourceUnits().at(oldRepository.uriToSourceUnitName(fileName))
@@ -275,13 +274,13 @@ void LanguageServer::compileAndUpdateDiagnostics()
 
 	// These are the source units we will sent diagnostics to the client for sure,
 	// even if it is just to clear previous diagnostics.
-	map<string, Json::Value> diagnosticsBySourceUnit;
-	for (string const& sourceUnitName: m_fileRepository.sourceUnits() | ranges::views::keys)
+	std::map<std::string, Json::Value> diagnosticsBySourceUnit;
+	for (std::string const& sourceUnitName: m_fileRepository.sourceUnits() | ranges::views::keys)
 		diagnosticsBySourceUnit[sourceUnitName] = Json::arrayValue;
-	for (string const& sourceUnitName: m_nonemptyDiagnostics)
+	for (std::string const& sourceUnitName: m_nonemptyDiagnostics)
 		diagnosticsBySourceUnit[sourceUnitName] = Json::arrayValue;
 
-	for (shared_ptr<Error const> const& error: m_compilerStack.errors())
+	for (std::shared_ptr<Error const> const& error: m_compilerStack.errors())
 	{
 		SourceLocation const* location = error->sourceLocation();
 		if (!location || !location->sourceName)
@@ -292,8 +291,8 @@ void LanguageServer::compileAndUpdateDiagnostics()
 		jsonDiag["source"] = "solc";
 		jsonDiag["severity"] = toDiagnosticSeverity(error->type());
 		jsonDiag["code"] = Json::UInt64{error->errorId().error};
-		string message = Error::formatErrorType(error->type()) + ":";
-		if (string const* comment = error->comment())
+		std::string message = Error::formatErrorType(error->type()) + ":";
+		if (std::string const* comment = error->comment())
 			message += " " + *comment;
 		jsonDiag["message"] = std::move(message);
 		jsonDiag["range"] = toRange(*location);
@@ -314,7 +313,7 @@ void LanguageServer::compileAndUpdateDiagnostics()
 	{
 		Json::Value extra;
 		extra["openFileCount"] = Json::UInt64(diagnosticsBySourceUnit.size());
-		m_client.trace("Number of currently open files: " + to_string(diagnosticsBySourceUnit.size()), extra);
+		m_client.trace("Number of currently open files: " + std::to_string(diagnosticsBySourceUnit.size()), extra);
 	}
 
 	m_nonemptyDiagnostics.clear();
@@ -336,13 +335,13 @@ bool LanguageServer::run()
 		MessageID id;
 		try
 		{
-			optional<Json::Value> const jsonMessage = m_client.receive();
+			std::optional<Json::Value> const jsonMessage = m_client.receive();
 			if (!jsonMessage)
 				continue;
 
 			if ((*jsonMessage)["method"].isString())
 			{
-				string const methodName = (*jsonMessage)["method"].asString();
+				std::string const methodName = (*jsonMessage)["method"].asString();
 				id = (*jsonMessage)["id"];
 				lspDebug(fmt::format("received method call: {}", methodName));
 
@@ -391,7 +390,7 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 
 	// The default of FileReader is to use `.`, but the path from where the LSP was started
 	// should not matter.
-	string rootPath("/");
+	std::string rootPath("/");
 	if (Json::Value uri = _args["rootUri"])
 	{
 		rootPath = uri.asString();
@@ -414,7 +413,7 @@ void LanguageServer::handleInitialize(MessageID _id, Json::Value const& _args)
 
 	Json::Value replyArgs;
 	replyArgs["serverInfo"]["name"] = "solc";
-	replyArgs["serverInfo"]["version"] = string(VersionNumber);
+	replyArgs["serverInfo"]["version"] = std::string(VersionNumber);
 	replyArgs["capabilities"]["definitionProvider"] = true;
 	replyArgs["capabilities"]["implementationProvider"] = true;
 	replyArgs["capabilities"]["textDocumentSync"]["change"] = 2; // 0=none, 1=full, 2=incremental
@@ -440,7 +439,7 @@ void LanguageServer::semanticTokensFull(MessageID _id, Json::Value const& _args)
 
 	compile();
 
-	auto const sourceName = m_fileRepository.uriToSourceUnitName(uri.as<string>());
+	auto const sourceName = m_fileRepository.uriToSourceUnitName(uri.as<std::string>());
 	SourceUnit const& ast = m_compilerStack.ast(sourceName);
 	m_compilerStack.charStream(sourceName);
 	Json::Value data = SemanticTokensBuilder().build(ast, m_compilerStack.charStream(sourceName));
@@ -465,7 +464,7 @@ void LanguageServer::setTrace(Json::Value const& _args)
 		// Simply ignore invalid parameter.
 		return;
 
-	string const stringValue = _args.asString();
+	std::string const stringValue = _args.asString();
 	if (stringValue == "off")
 		m_client.setTrace(TraceValue::Off);
 	else if (stringValue == "messages")
@@ -484,8 +483,8 @@ void LanguageServer::handleTextDocumentDidOpen(Json::Value const& _args)
 		"Text document parameter missing."
 	);
 
-	string text = _args["textDocument"]["text"].asString();
-	string uri = _args["textDocument"]["uri"].asString();
+	std::string text = _args["textDocument"]["text"].asString();
+	std::string uri = _args["textDocument"]["uri"].asString();
 	m_openFiles.insert(uri);
 	m_fileRepository.setSourceByUri(uri, std::move(text));
 	compileAndUpdateDiagnostics();
@@ -495,7 +494,7 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 {
 	requireServerInitialized();
 
-	string const uri = _args["textDocument"]["uri"].asString();
+	std::string const uri = _args["textDocument"]["uri"].asString();
 
 	for (Json::Value jsonContentChange: _args["contentChanges"])
 	{
@@ -505,24 +504,24 @@ void LanguageServer::handleTextDocumentDidChange(Json::Value const& _args)
 			"Invalid content reference."
 		);
 
-		string const sourceUnitName = m_fileRepository.uriToSourceUnitName(uri);
+		std::string const sourceUnitName = m_fileRepository.uriToSourceUnitName(uri);
 		lspRequire(
 			m_fileRepository.sourceUnits().count(sourceUnitName),
 			ErrorCode::RequestFailed,
 			"Unknown file: " + uri
 		);
 
-		string text = jsonContentChange["text"].asString();
+		std::string text = jsonContentChange["text"].asString();
 		if (jsonContentChange["range"].isObject()) // otherwise full content update
 		{
-			optional<SourceLocation> change = parseRange(m_fileRepository, sourceUnitName, jsonContentChange["range"]);
+			std::optional<SourceLocation> change = parseRange(m_fileRepository, sourceUnitName, jsonContentChange["range"]);
 			lspRequire(
 				change && change->hasText(),
 				ErrorCode::RequestFailed,
 				"Invalid source range: " + util::jsonCompactPrint(jsonContentChange["range"])
 			);
 
-			string buffer = m_fileRepository.sourceUnits().at(sourceUnitName);
+			std::string buffer = m_fileRepository.sourceUnits().at(sourceUnitName);
 			buffer.replace(static_cast<size_t>(change->start), static_cast<size_t>(change->end - change->start), std::move(text));
 			text = std::move(buffer);
 		}
@@ -542,7 +541,7 @@ void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
 		"Text document parameter missing."
 	);
 
-	string uri = _args["textDocument"]["uri"].asString();
+	std::string uri = _args["textDocument"]["uri"].asString();
 	m_openFiles.erase(uri);
 
 	compileAndUpdateDiagnostics();
@@ -550,17 +549,17 @@ void LanguageServer::handleTextDocumentDidClose(Json::Value const& _args)
 
 ASTNode const* LanguageServer::astNodeAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
 {
-	return get<ASTNode const*>(astNodeAndOffsetAtSourceLocation(_sourceUnitName, _filePos));
+	return std::get<ASTNode const*>(astNodeAndOffsetAtSourceLocation(_sourceUnitName, _filePos));
 }
 
-tuple<ASTNode const*, int> LanguageServer::astNodeAndOffsetAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
+std::tuple<ASTNode const*, int> LanguageServer::astNodeAndOffsetAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
 {
 	if (m_compilerStack.state() < CompilerStack::AnalysisPerformed)
 		return {nullptr, -1};
 	if (!m_fileRepository.sourceUnits().count(_sourceUnitName))
 		return {nullptr, -1};
 
-	optional<int> sourcePos = m_compilerStack.charStream(_sourceUnitName).translateLineColumnToPosition(_filePos);
+	std::optional<int> sourcePos = m_compilerStack.charStream(_sourceUnitName).translateLineColumnToPosition(_filePos);
 	if (!sourcePos)
 		return {nullptr, -1};
 
diff --git a/libsolidity/lsp/RenameSymbol.cpp b/libsolidity/lsp/RenameSymbol.cpp
index e205beb73f..75f032fcca 100644
--- a/libsolidity/lsp/RenameSymbol.cpp
+++ b/libsolidity/lsp/RenameSymbol.cpp
@@ -29,7 +29,6 @@
 using namespace solidity::frontend;
 using namespace solidity::langutil;
 using namespace solidity::lsp;
-using namespace std;
 
 namespace
 {
@@ -51,8 +50,8 @@ CallableDeclaration const* extractCallableDeclaration(FunctionCall const& _funct
 void RenameSymbol::operator()(MessageID _id, Json::Value const& _args)
 {
 	auto const&& [sourceUnitName, lineColumn] = extractSourceUnitNameAndLineColumn(_args);
-	string const newName = _args["newName"].asString();
-	string const uri = _args["textDocument"]["uri"].asString();
+	std::string const newName = _args["newName"].asString();
+	std::string const uri = _args["textDocument"]["uri"].asString();
 
 	ASTNode const* sourceNode = m_server.astNodeAtSourceLocation(sourceUnitName, lineColumn);
 
@@ -61,7 +60,7 @@ void RenameSymbol::operator()(MessageID _id, Json::Value const& _args)
 	m_sourceUnits = { &m_server.compilerStack().ast(sourceUnitName) };
 	m_locations.clear();
 
-	optional<int> cursorBytePosition = charStreamProvider()
+	std::optional<int> cursorBytePosition = charStreamProvider()
 		.charStream(sourceUnitName)
 		.translateLineColumnToPosition(lineColumn);
 	solAssert(cursorBytePosition.has_value(), "Expected source pos");
@@ -72,7 +71,7 @@ void RenameSymbol::operator()(MessageID _id, Json::Value const& _args)
 	for (auto const& [name, content]: fileRepository().sourceUnits())
 	{
 		auto const& sourceUnit = m_server.compilerStack().ast(name);
-		for (auto const* referencedSourceUnit: sourceUnit.referencedSourceUnits(true, util::convertContainer<set<SourceUnit const*>>(m_sourceUnits)))
+		for (auto const* referencedSourceUnit: sourceUnit.referencedSourceUnits(true, util::convertContainer<std::set<SourceUnit const*>>(m_sourceUnits)))
 			if (*referencedSourceUnit->location().sourceName == sourceUnitName)
 			{
 				m_sourceUnits.insert(&sourceUnit);
@@ -101,8 +100,8 @@ void RenameSymbol::operator()(MessageID _id, Json::Value const& _args)
 		solAssert(i->isValid());
 
 		// Replace in our file repository
-		string const uri = fileRepository().sourceUnitNameToUri(*i->sourceName);
-		string buffer = fileRepository().sourceUnits().at(*i->sourceName);
+		std::string const uri = fileRepository().sourceUnitNameToUri(*i->sourceName);
+		std::string buffer = fileRepository().sourceUnits().at(*i->sourceName);
 		buffer.replace((size_t)i->start, (size_t)(i->end - i->start), newName);
 		fileRepository().setSourceByUri(uri, std::move(buffer));
 
@@ -155,7 +154,7 @@ void RenameSymbol::extractNameAndDeclaration(ASTNode const& _node, int _cursorBy
 	else if (auto const* inlineAssembly = dynamic_cast<InlineAssembly const*>(&_node))
 		extractNameAndDeclaration(*inlineAssembly, _cursorBytePosition);
 	else
-		solAssert(false, "Unexpected ASTNODE id: " + to_string(_node.id()));
+		solAssert(false, "Unexpected ASTNODE id: " + std::to_string(_node.id()));
 
 	lspDebug(fmt::format("Goal: rename '{}', loc: {}-{}", m_symbolName, m_declarationToRename->nameLocation().start, m_declarationToRename->nameLocation().end));
 }
@@ -297,7 +296,7 @@ void RenameSymbol::Visitor::endVisit(InlineAssembly const& _node)
 {
 	for (auto&& [identifier, externalReference]: _node.annotation().externalReferences)
 	{
-		string identifierName = identifier->name.str();
+		std::string identifierName = identifier->name.str();
 		if (!externalReference.suffix.empty())
 			identifierName = identifierName.substr(0, identifierName.length() - externalReference.suffix.size() - 1);
 
diff --git a/libsolidity/lsp/SemanticTokensBuilder.cpp b/libsolidity/lsp/SemanticTokensBuilder.cpp
index dae48c1b50..ac52954738 100644
--- a/libsolidity/lsp/SemanticTokensBuilder.cpp
+++ b/libsolidity/lsp/SemanticTokensBuilder.cpp
@@ -23,7 +23,6 @@
 
 #include <fmt/format.h>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 
@@ -33,10 +32,10 @@ namespace solidity::lsp
 namespace
 {
 
-optional<SemanticTokenType> semanticTokenTypeForType(frontend::Type const* _type)
+std::optional<SemanticTokenType> semanticTokenTypeForType(frontend::Type const* _type)
 {
 	if (!_type)
-		return nullopt;
+		return std::nullopt;
 
 	switch (_type->category())
 	{
diff --git a/libsolidity/lsp/Transport.cpp b/libsolidity/lsp/Transport.cpp
index 5af723128a..7f8eb22834 100644
--- a/libsolidity/lsp/Transport.cpp
+++ b/libsolidity/lsp/Transport.cpp
@@ -37,34 +37,33 @@
 #include <fcntl.h>
 #endif
 
-using namespace std;
 using namespace solidity::lsp;
 
 // {{{ Transport
-optional<Json::Value> Transport::receive()
+std::optional<Json::Value> Transport::receive()
 {
 	auto const headers = parseHeaders();
 	if (!headers)
 	{
 		error({}, ErrorCode::ParseError, "Could not parse RPC headers.");
-		return nullopt;
+		return std::nullopt;
 	}
 
 	if (!headers->count("content-length"))
 	{
 		error({}, ErrorCode::ParseError, "No content-length header found.");
-		return nullopt;
+		return std::nullopt;
 	}
 
-	string const data = readBytes(stoul(headers->at("content-length")));
+	std::string const data = readBytes(stoul(headers->at("content-length")));
 
 	Json::Value jsonMessage;
-	string jsonParsingErrors;
+	std::string jsonParsingErrors;
 	solidity::util::jsonParseStrict(data, jsonMessage, &jsonParsingErrors);
 	if (!jsonParsingErrors.empty() || !jsonMessage || !jsonMessage.isObject())
 	{
 		error({}, ErrorCode::ParseError, "Could not parse RPC JSON payload. " + jsonParsingErrors);
-		return nullopt;
+		return std::nullopt;
 	}
 
 	return {std::move(jsonMessage)};
@@ -82,9 +81,9 @@ void Transport::trace(std::string _message, Json::Value _extra)
 	}
 }
 
-optional<map<string, string>> Transport::parseHeaders()
+std::optional<std::map<std::string, std::string>> Transport::parseHeaders()
 {
-	map<string, string> headers;
+	std::map<std::string, std::string> headers;
 
 	while (true)
 	{
@@ -93,18 +92,18 @@ optional<map<string, string>> Transport::parseHeaders()
 			break;
 
 		auto const delimiterPos = line.find(':');
-		if (delimiterPos == string::npos)
-			return nullopt;
+		if (delimiterPos == std::string::npos)
+			return std::nullopt;
 
 		auto const name = boost::to_lower_copy(line.substr(0, delimiterPos));
 		auto const value = line.substr(delimiterPos + 1);
 		if (!headers.emplace(boost::trim_copy(name), boost::trim_copy(value)).second)
-			return nullopt;
+			return std::nullopt;
 	}
 	return {std::move(headers)};
 }
 
-void Transport::notify(string _method, Json::Value _message)
+void Transport::notify(std::string _method, Json::Value _message)
 {
 	Json::Value json;
 	json["method"] = std::move(_method);
@@ -119,7 +118,7 @@ void Transport::reply(MessageID _id, Json::Value _message)
 	send(std::move(json), _id);
 }
 
-void Transport::error(MessageID _id, ErrorCode _code, string _message)
+void Transport::error(MessageID _id, ErrorCode _code, std::string _message)
 {
 	Json::Value json;
 	json["error"]["code"] = static_cast<int>(_code);
@@ -135,7 +134,7 @@ void Transport::send(Json::Value _json, MessageID _id)
 		_json["id"] = _id;
 
 	// Trailing CRLF only for easier readability.
-	string const jsonString = solidity::util::jsonCompactPrint(_json);
+	std::string const jsonString = solidity::util::jsonCompactPrint(_json);
 
 	writeBytes(fmt::format("Content-Length: {}\r\n\r\n", jsonString.size()));
 	writeBytes(jsonString);
@@ -144,7 +143,7 @@ void Transport::send(Json::Value _json, MessageID _id)
 // }}}
 
 // {{{ IOStreamTransport
-IOStreamTransport::IOStreamTransport(istream& _in, ostream& _out):
+IOStreamTransport::IOStreamTransport(std::istream& _in, std::ostream& _out):
 	m_input{_in},
 	m_output{_out}
 {
@@ -162,7 +161,7 @@ std::string IOStreamTransport::readBytes(size_t _length)
 
 std::string IOStreamTransport::getline()
 {
-	string line;
+	std::string line;
 	std::getline(m_input, line);
 	return line;
 }
diff --git a/libsolidity/lsp/Utils.cpp b/libsolidity/lsp/Utils.cpp
index ef19b4c2ef..85e27a4fda 100644
--- a/libsolidity/lsp/Utils.cpp
+++ b/libsolidity/lsp/Utils.cpp
@@ -30,21 +30,20 @@ namespace solidity::lsp
 
 using namespace frontend;
 using namespace langutil;
-using namespace std;
 
-optional<LineColumn> parseLineColumn(Json::Value const& _lineColumn)
+std::optional<LineColumn> parseLineColumn(Json::Value const& _lineColumn)
 {
 	if (_lineColumn.isObject() && _lineColumn["line"].isInt() && _lineColumn["character"].isInt())
 		return LineColumn{_lineColumn["line"].asInt(), _lineColumn["character"].asInt()};
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
 Json::Value toJson(LineColumn const& _pos)
 {
 	Json::Value json = Json::objectValue;
-	json["line"] = max(_pos.line, 0);
-	json["character"] = max(_pos.column, 0);
+	json["line"] = std::max(_pos.line, 0);
+	json["character"] = std::max(_pos.column, 0);
 
 	return json;
 }
@@ -70,10 +69,10 @@ Declaration const* referencedDeclaration(Expression const* _expression)
 	return nullptr;
 }
 
-optional<SourceLocation> declarationLocation(Declaration const* _declaration)
+std::optional<SourceLocation> declarationLocation(Declaration const* _declaration)
 {
 	if (!_declaration)
-		return nullopt;
+		return std::nullopt;
 
 	if (_declaration->nameLocation().isValid())
 		return _declaration->nameLocation();
@@ -81,43 +80,43 @@ optional<SourceLocation> declarationLocation(Declaration const* _declaration)
 	if (_declaration->location().isValid())
 		return _declaration->location();
 
-	return nullopt;
+	return std::nullopt;
 }
 
-optional<SourceLocation> parsePosition(
+std::optional<SourceLocation> parsePosition(
 	FileRepository const& _fileRepository,
-	string const& _sourceUnitName,
+	std::string const& _sourceUnitName,
 	Json::Value const& _position
 )
 {
 	if (!_fileRepository.sourceUnits().count(_sourceUnitName))
-		return nullopt;
+		return std::nullopt;
 
-	if (optional<LineColumn> lineColumn = parseLineColumn(_position))
-		if (optional<int> const offset = CharStream::translateLineColumnToPosition(
+	if (std::optional<LineColumn> lineColumn = parseLineColumn(_position))
+		if (std::optional<int> const offset = CharStream::translateLineColumnToPosition(
 			_fileRepository.sourceUnits().at(_sourceUnitName),
 			*lineColumn
 		))
-			return SourceLocation{*offset, *offset, make_shared<string>(_sourceUnitName)};
-	return nullopt;
+			return SourceLocation{*offset, *offset, std::make_shared<std::string>(_sourceUnitName)};
+	return std::nullopt;
 }
 
-optional<SourceLocation> parseRange(FileRepository const& _fileRepository, string const& _sourceUnitName, Json::Value const& _range)
+std::optional<SourceLocation> parseRange(FileRepository const& _fileRepository, std::string const& _sourceUnitName, Json::Value const& _range)
 {
 	if (!_range.isObject())
-		return nullopt;
-	optional<SourceLocation> start = parsePosition(_fileRepository, _sourceUnitName, _range["start"]);
-	optional<SourceLocation> end = parsePosition(_fileRepository, _sourceUnitName, _range["end"]);
+		return std::nullopt;
+	std::optional<SourceLocation> start = parsePosition(_fileRepository, _sourceUnitName, _range["start"]);
+	std::optional<SourceLocation> end = parsePosition(_fileRepository, _sourceUnitName, _range["end"]);
 	if (!start || !end)
-		return nullopt;
+		return std::nullopt;
 	solAssert(*start->sourceName == *end->sourceName);
 	start->end = end->end;
 	return start;
 }
 
-string stripFileUriSchemePrefix(string const& _path)
+std::string stripFileUriSchemePrefix(std::string const& _path)
 {
-	regex const windowsDriveLetterPath("^file:///[a-zA-Z]:/");
+	std::regex const windowsDriveLetterPath("^file:///[a-zA-Z]:/");
 	if (regex_search(_path, windowsDriveLetterPath))
 		return _path.substr(8);
 	if (_path.find("file://") == 0)
diff --git a/libsolidity/parsing/DocStringParser.cpp b/libsolidity/parsing/DocStringParser.cpp
index 7e6e158b76..b9f358e020 100644
--- a/libsolidity/parsing/DocStringParser.cpp
+++ b/libsolidity/parsing/DocStringParser.cpp
@@ -28,7 +28,6 @@
 #include <range/v3/algorithm/find_if_not.hpp>
 #include <range/v3/view/subrange.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -36,17 +35,17 @@ using namespace solidity::frontend;
 namespace
 {
 
-string::const_iterator skipLineOrEOS(
-	string::const_iterator _nlPos,
-	string::const_iterator _end
+std::string::const_iterator skipLineOrEOS(
+	std::string::const_iterator _nlPos,
+	std::string::const_iterator _end
 )
 {
 	return (_nlPos == _end) ? _end : ++_nlPos;
 }
 
-string::const_iterator firstNonIdentifier(
-	string::const_iterator _pos,
-	string::const_iterator _end
+std::string::const_iterator firstNonIdentifier(
+	std::string::const_iterator _pos,
+	std::string::const_iterator _end
 )
 {
 	auto currPos = _pos;
@@ -58,18 +57,18 @@ string::const_iterator firstNonIdentifier(
 	return currPos;
 }
 
-string::const_iterator firstWhitespaceOrNewline(
-	string::const_iterator _pos,
-	string::const_iterator _end
+std::string::const_iterator firstWhitespaceOrNewline(
+	std::string::const_iterator _pos,
+	std::string::const_iterator _end
 )
 {
 	return ranges::find_first_of(ranges::make_subrange(_pos, _end), " \t\n");
 }
 
 
-string::const_iterator skipWhitespace(
-	string::const_iterator _pos,
-	string::const_iterator _end
+std::string::const_iterator skipWhitespace(
+	std::string::const_iterator _pos,
+	std::string::const_iterator _end
 )
 {
 	auto isWhitespace = [](char const& c) { return (c == ' ' || c == '\t'); };
@@ -78,7 +77,7 @@ string::const_iterator skipWhitespace(
 
 }
 
-multimap<string, DocTag> DocStringParser::parse()
+std::multimap<std::string, DocTag> DocStringParser::parse()
 {
 	m_lastTag = nullptr;
 	m_docTags = {};
@@ -96,7 +95,7 @@ multimap<string, DocTag> DocStringParser::parse()
 		{
 			// we found a tag
 			iter tagNameEndPos = firstWhitespaceOrNewline(tagPos, end);
-			string tagName{tagPos + 1, tagNameEndPos};
+			std::string tagName{tagPos + 1, tagNameEndPos};
 			iter tagDataPos = (tagNameEndPos != end) ? tagNameEndPos + 1 : tagNameEndPos;
 			currPos = parseDocTag(tagDataPos, end, tagName);
 		}
@@ -141,7 +140,7 @@ DocStringParser::iter DocStringParser::parseDocTagParam(iter _pos, iter _end)
 		return _end;
 	}
 	auto nameEndPos = firstNonIdentifier(nameStartPos, _end);
-	auto paramName = string(nameStartPos, nameEndPos);
+	auto paramName = std::string(nameStartPos, nameEndPos);
 
 	auto descStartPos = skipWhitespace(nameEndPos, _end);
 	auto nlPos = find(descStartPos, _end, '\n');
@@ -152,7 +151,7 @@ DocStringParser::iter DocStringParser::parseDocTagParam(iter _pos, iter _end)
 		return _end;
 	}
 
-	auto paramDesc = string(descStartPos, nlPos);
+	auto paramDesc = std::string(descStartPos, nlPos);
 	newTag("param");
 	m_lastTag->paramName = paramName;
 	m_lastTag->content = paramDesc;
@@ -160,7 +159,7 @@ DocStringParser::iter DocStringParser::parseDocTagParam(iter _pos, iter _end)
 	return skipLineOrEOS(nlPos, _end);
 }
 
-DocStringParser::iter DocStringParser::parseDocTag(iter _pos, iter _end, string const& _tag)
+DocStringParser::iter DocStringParser::parseDocTag(iter _pos, iter _end, std::string const& _tag)
 {
 	// TODO: need to check for @(start of a tag) between here and the end of line
 	// for all cases.
@@ -178,7 +177,7 @@ DocStringParser::iter DocStringParser::parseDocTag(iter _pos, iter _end, string
 		return parseDocTagLine(_pos, _end, true);
 }
 
-void DocStringParser::newTag(string const& _tagName)
+void DocStringParser::newTag(std::string const& _tagName)
 {
 	m_lastTag = &m_docTags.insert(make_pair(_tagName, DocTag()))->second;
 }
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index efbe854482..127ff402b4 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -43,8 +43,8 @@
 #include <tuple>
 #include <vector>
 
-using namespace std;
 using namespace solidity::langutil;
+using namespace std::string_literals;
 
 namespace solidity::frontend
 {
@@ -76,7 +76,7 @@ class Parser::ASTNodeFactory
 		solAssert(m_location.sourceName, "");
 		if (m_location.end < 0)
 			markEndPosition();
-		return make_shared<NodeType>(m_parser.nextID(), m_location, std::forward<Args>(_args)...);
+		return std::make_shared<NodeType>(m_parser.nextID(), m_location, std::forward<Args>(_args)...);
 	}
 
 	SourceLocation const& location() const noexcept { return m_location; }
@@ -92,11 +92,11 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 	try
 	{
 		m_recursionDepth = 0;
-		m_scanner = make_shared<Scanner>(_charStream);
+		m_scanner = std::make_shared<Scanner>(_charStream);
 		ASTNodeFactory nodeFactory(*this);
 		m_experimentalSolidityEnabledInCurrentSourceUnit = false;
 
-		vector<ASTPointer<ASTNode>> nodes;
+		std::vector<ASTPointer<ASTNode>> nodes;
 		while (m_scanner->currentToken() == Token::Pragma)
 			nodes.push_back(parsePragmaDirective(false));
 
@@ -164,13 +164,13 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 	}
 }
 
-void Parser::parsePragmaVersion(SourceLocation const& _location, vector<Token> const& _tokens, vector<string> const& _literals)
+void Parser::parsePragmaVersion(SourceLocation const& _location, std::vector<Token> const& _tokens, std::vector<std::string> const& _literals)
 {
 	SemVerMatchExpressionParser parser(_tokens, _literals);
 	try
 	{
 		SemVerMatchExpression matchExpression = parser.parse();
-		static SemVerVersion const currentVersion{string(VersionString)};
+		static SemVerVersion const currentVersion{std::string(VersionString)};
 		// FIXME: only match for major version incompatibility
 		if (!matchExpression.matches(currentVersion))
 			// If m_parserErrorRecovery is true, the same message will appear from SyntaxChecker::visit(),
@@ -180,7 +180,7 @@ void Parser::parsePragmaVersion(SourceLocation const& _location, vector<Token> c
 					5333_error,
 					_location,
 					"Source file requires different compiler version (current compiler is " +
-					string(VersionString) + ") - note that nightly builds are considered to be "
+					std::string(VersionString) + ") - note that nightly builds are considered to be "
 					"strictly less than the released version"
 				);
 	}
@@ -201,7 +201,7 @@ ASTPointer<StructuredDocumentation> Parser::parseStructuredDocumentation()
 		ASTNodeFactory nodeFactory{*this};
 		nodeFactory.setLocation(m_scanner->currentCommentLocation());
 		return nodeFactory.createNode<StructuredDocumentation>(
-			make_shared<ASTString>(m_scanner->currentCommentLiteral())
+			std::make_shared<ASTString>(m_scanner->currentCommentLiteral())
 		);
 	}
 	return nullptr;
@@ -215,8 +215,8 @@ ASTPointer<PragmaDirective> Parser::parsePragmaDirective(bool const _finishedPar
 	// pragma solidity ^0.4.0 || ^0.3.0;
 	ASTNodeFactory nodeFactory(*this);
 	expectToken(Token::Pragma);
-	vector<string> literals;
-	vector<Token> tokens;
+	std::vector<std::string> literals;
+	std::vector<Token> tokens;
 
 	do
 	{
@@ -225,7 +225,7 @@ ASTPointer<PragmaDirective> Parser::parsePragmaDirective(bool const _finishedPar
 			parserError(6281_error, "Token incompatible with Solidity parser as part of pragma directive.");
 		else
 		{
-			string literal = m_scanner->currentLiteral();
+			std::string literal = m_scanner->currentLiteral();
 			if (literal.empty() && TokenTraits::toString(token))
 				literal = TokenTraits::toString(token);
 			literals.push_back(literal);
@@ -241,8 +241,8 @@ ASTPointer<PragmaDirective> Parser::parsePragmaDirective(bool const _finishedPar
 	{
 		parsePragmaVersion(
 			nodeFactory.location(),
-			vector<Token>(tokens.begin() + 1, tokens.end()),
-			vector<string>(literals.begin() + 1, literals.end())
+			std::vector<Token>(tokens.begin() + 1, tokens.end()),
+			std::vector<std::string>(literals.begin() + 1, literals.end())
 		);
 	}
 
@@ -267,7 +267,7 @@ ASTPointer<ImportDirective> Parser::parseImportDirective()
 	ASTNodeFactory nodeFactory(*this);
 	expectToken(Token::Import);
 	ASTPointer<ASTString> path;
-	ASTPointer<ASTString> unitAlias = make_shared<string>();
+	ASTPointer<ASTString> unitAlias = std::make_shared<std::string>();
 	SourceLocation unitAliasLocation{};
 	ImportDirective::SymbolAliasList symbolAliases;
 
@@ -361,8 +361,8 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition()
 	ASTPointer<ASTString> name =  nullptr;
 	SourceLocation nameLocation{};
 	ASTPointer<StructuredDocumentation> documentation;
-	vector<ASTPointer<InheritanceSpecifier>> baseContracts;
-	vector<ASTPointer<ASTNode>> subNodes;
+	std::vector<ASTPointer<InheritanceSpecifier>> baseContracts;
+	std::vector<ASTPointer<ASTNode>> subNodes;
 	std::pair<ContractKind, bool> contractKind{};
 	try
 	{
@@ -452,11 +452,11 @@ ASTPointer<InheritanceSpecifier> Parser::parseInheritanceSpecifier()
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
 	ASTPointer<IdentifierPath> name(parseIdentifierPath());
-	unique_ptr<vector<ASTPointer<Expression>>> arguments;
+	std::unique_ptr<std::vector<ASTPointer<Expression>>> arguments;
 	if (m_scanner->currentToken() == Token::LParen)
 	{
 		advance();
-		arguments = make_unique<vector<ASTPointer<Expression>>>(parseFunctionCallListArguments());
+		arguments = std::make_unique<std::vector<ASTPointer<Expression>>>(parseFunctionCallListArguments());
 		nodeFactory.markEndPosition();
 		expectToken(Token::RParen);
 	}
@@ -642,8 +642,8 @@ ASTPointer<ASTNode> Parser::parseFunctionDefinition(bool _freeFunction)
 				{Token::Receive, "receive function"},
 			}.at(m_scanner->currentToken());
 			nameLocation = currentLocation();
-			name = make_shared<ASTString>(TokenTraits::toString(m_scanner->currentToken()));
-			string message{
+			name = std::make_shared<ASTString>(TokenTraits::toString(m_scanner->currentToken()));
+			std::string message{
 				"This function is named \"" + *name + "\" but is not the " + expected + " of the contract. "
 				"If you intend this to be a " + expected + ", use \"" + *name + "(...) { ... }\" without "
 				"the \"function\" keyword to define it."
@@ -661,7 +661,7 @@ ASTPointer<ASTNode> Parser::parseFunctionDefinition(bool _freeFunction)
 	{
 		solAssert(kind == Token::Constructor || kind == Token::Fallback || kind == Token::Receive, "");
 		advance();
-		name = make_shared<ASTString>();
+		name = std::make_shared<ASTString>();
 	}
 
 	FunctionHeaderParserResult header = parseFunctionHeader(false);
@@ -699,7 +699,7 @@ ASTPointer<StructDefinition> Parser::parseStructDefinition()
 	ASTPointer<StructuredDocumentation> documentation = parseStructuredDocumentation();
 	expectToken(Token::Struct);
 	auto [name, nameLocation] = expectIdentifierWithLocation();
-	vector<ASTPointer<VariableDeclaration>> members;
+	std::vector<ASTPointer<VariableDeclaration>> members;
 	expectToken(Token::LBrace);
 	while (m_scanner->currentToken() != Token::RBrace)
 	{
@@ -726,7 +726,7 @@ ASTPointer<EnumDefinition> Parser::parseEnumDefinition()
 	ASTPointer<StructuredDocumentation> documentation = parseStructuredDocumentation();
 	expectToken(Token::Enum);
 	auto [name, nameLocation] = expectIdentifierWithLocation();
-	vector<ASTPointer<EnumValue>> members;
+	std::vector<ASTPointer<EnumValue>> members;
 	expectToken(Token::LBrace);
 
 	while (m_scanner->currentToken() != Token::RBrace)
@@ -815,7 +815,7 @@ ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration(
 				if (mutability != VariableDeclaration::Mutability::Mutable)
 					parserError(
 						3109_error,
-						string("Mutability already set to ") +
+						std::string("Mutability already set to ") +
 						(mutability == VariableDeclaration::Mutability::Constant ? "\"constant\"" : "\"immutable\"")
 					);
 				else if (token == Token::Constant)
@@ -853,7 +853,7 @@ ASTPointer<VariableDeclaration> Parser::parseVariableDeclaration(
 	}
 
 	if (_options.allowEmptyName && m_scanner->currentToken() != Token::Identifier)
-		identifier = make_shared<ASTString>("");
+		identifier = std::make_shared<ASTString>("");
 	else
 	{
 		nodeFactory.markEndPosition();
@@ -940,7 +940,7 @@ ASTPointer<ModifierDefinition> Parser::parseModifierDefinition()
 	return nodeFactory.createNode<ModifierDefinition>(name, nameLocation, documentation, parameters, isVirtual, overrides, block);
 }
 
-pair<ASTPointer<ASTString>, SourceLocation> Parser::expectIdentifierWithLocation()
+std::pair<ASTPointer<ASTString>, SourceLocation> Parser::expectIdentifierWithLocation()
 {
 	SourceLocation nameLocation = currentLocation();
 	ASTPointer<ASTString> name = expectIdentifierToken();
@@ -994,8 +994,8 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 
 	expectToken(Token::Using);
 
-	vector<ASTPointer<IdentifierPath>> functions;
-	vector<optional<Token>> operators;
+	std::vector<ASTPointer<IdentifierPath>> functions;
+	std::vector<std::optional<Token>> operators;
 	bool const usesBraces = m_scanner->currentToken() == Token::LBrace;
 	if (usesBraces)
 	{
@@ -1009,18 +1009,18 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 				Token operator_ = m_scanner->currentToken();
 				if (!util::contains(userDefinableOperators, operator_))
 				{
-					string operatorName;
+					std::string operatorName;
 					if (!m_scanner->currentLiteral().empty())
 						operatorName = m_scanner->currentLiteral();
 					else if (char const* tokenString = TokenTraits::toString(operator_))
-						operatorName = string(tokenString);
+						operatorName = std::string(tokenString);
 
 					parserError(
 						4403_error,
 						fmt::format(
 							"Not a user-definable operator: {}. Only the following operators can be user-defined: {}",
 							operatorName,
-							util::joinHumanReadable(userDefinableOperators | ranges::views::transform([](Token _t) { return string{TokenTraits::toString(_t)}; }))
+							util::joinHumanReadable(userDefinableOperators | ranges::views::transform([](Token _t) { return std::string{TokenTraits::toString(_t)}; }))
 						)
 					);
 				}
@@ -1028,7 +1028,7 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 				advance();
 			}
 			else
-				operators.emplace_back(nullopt);
+				operators.emplace_back(std::nullopt);
 		}
 		while (m_scanner->currentToken() == Token::Comma);
 		expectToken(Token::RBrace);
@@ -1036,7 +1036,7 @@ ASTPointer<UsingForDirective> Parser::parseUsingDirective()
 	else
 	{
 		functions.emplace_back(parseIdentifierPath());
-		operators.emplace_back(nullopt);
+		operators.emplace_back(std::nullopt);
 	}
 
 	ASTPointer<TypeName> typeName;
@@ -1061,11 +1061,11 @@ ASTPointer<ModifierInvocation> Parser::parseModifierInvocation()
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
 	ASTPointer<IdentifierPath> name(parseIdentifierPath());
-	unique_ptr<vector<ASTPointer<Expression>>> arguments;
+	std::unique_ptr<std::vector<ASTPointer<Expression>>> arguments;
 	if (m_scanner->currentToken() == Token::LParen)
 	{
 		advance();
-		arguments = make_unique<vector<ASTPointer<Expression>>>(parseFunctionCallListArguments());
+		arguments = std::make_unique<std::vector<ASTPointer<Expression>>>(parseFunctionCallListArguments());
 		nodeFactory.markEndPosition();
 		expectToken(Token::RParen);
 	}
@@ -1122,8 +1122,8 @@ ASTPointer<IdentifierPath> Parser::parseIdentifierPath()
 
 	auto [name, nameLocation] = expectIdentifierWithLocation();
 
-	vector<ASTString> identifierPath{*name};
-	vector<SourceLocation> identifierPathLocations{nameLocation};
+	std::vector<ASTString> identifierPath{*name};
+	std::vector<SourceLocation> identifierPathLocations{nameLocation};
 
 	while (m_scanner->currentToken() == Token::Period)
 	{
@@ -1165,14 +1165,14 @@ ASTPointer<TypeName> Parser::parseTypeName()
 	{
 		unsigned firstSize;
 		unsigned secondSize;
-		tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
+		std::tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
 		ElementaryTypeNameToken elemTypeName(token, firstSize, secondSize);
 		ASTNodeFactory nodeFactory(*this);
 		nodeFactory.markEndPosition();
 		advance();
 		auto stateMutability = elemTypeName.token() == Token::Address
-			? optional<StateMutability>{StateMutability::NonPayable}
-			: nullopt;
+			? std::optional<StateMutability>{StateMutability::NonPayable}
+			: std::nullopt;
 		if (TokenTraits::isStateMutabilitySpecifier(m_scanner->currentToken()))
 		{
 			if (elemTypeName.token() == Token::Address)
@@ -1228,7 +1228,7 @@ ASTPointer<Mapping> Parser::parseMapping()
 	Token token = m_scanner->currentToken();
 	unsigned firstSize;
 	unsigned secondSize;
-	tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
+	std::tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
 	if (token == Token::Identifier)
 		keyType = parseUserDefinedTypeName();
 	else if (TokenTraits::isElementaryTypeName(token))
@@ -1240,13 +1240,13 @@ ASTPointer<Mapping> Parser::parseMapping()
 	}
 	else
 		fatalParserError(1005_error, "Expected elementary type name or identifier for mapping key type");
-	ASTPointer<ASTString> keyName = make_shared<ASTString>("");
+	ASTPointer<ASTString> keyName = std::make_shared<ASTString>("");
 	SourceLocation keyNameLocation{};
 	if (m_scanner->currentToken() == Token::Identifier)
 		tie(keyName, keyNameLocation) = expectIdentifierWithLocation();
 	expectToken(Token::DoubleArrow);
 	ASTPointer<TypeName> valueType = parseTypeName();
-	ASTPointer<ASTString> valueName = make_shared<ASTString>("");
+	ASTPointer<ASTString> valueName = std::make_shared<ASTString>("");
 	SourceLocation valueNameLocation{};
 	if (m_scanner->currentToken() == Token::Identifier)
 		tie(valueName, valueNameLocation) = expectIdentifierWithLocation();
@@ -1262,7 +1262,7 @@ ASTPointer<ParameterList> Parser::parseParameterList(
 {
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
-	vector<ASTPointer<VariableDeclaration>> parameters;
+	std::vector<ASTPointer<VariableDeclaration>> parameters;
 	VarDeclParserOptions options(_options);
 	options.allowEmptyName = true;
 	expectToken(Token::LParen);
@@ -1294,7 +1294,7 @@ ASTPointer<Block> Parser::parseBlock(bool _allowUnchecked, ASTPointer<ASTString>
 		advance();
 	}
 	expectToken(Token::LBrace);
-	vector<ASTPointer<Statement>> statements;
+	std::vector<ASTPointer<Statement>> statements;
 	try
 	{
 		while (m_scanner->currentToken() != Token::RBrace)
@@ -1326,7 +1326,7 @@ ASTPointer<Statement> Parser::parseStatement(bool _allowUnchecked)
 	try
 	{
 		if (m_scanner->currentCommentLiteral() != "")
-			docString = make_shared<ASTString>(m_scanner->currentCommentLiteral());
+			docString = std::make_shared<ASTString>(m_scanner->currentCommentLiteral());
 		switch (m_scanner->currentToken())
 		{
 		case Token::If:
@@ -1421,15 +1421,15 @@ ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> con
 		advance();
 	}
 
-	ASTPointer<vector<ASTPointer<ASTString>>> flags;
+	ASTPointer<std::vector<ASTPointer<ASTString>>> flags;
 	if (m_scanner->currentToken() == Token::LParen)
 	{
-		flags = make_shared<vector<ASTPointer<ASTString>>>();
+		flags = std::make_shared<std::vector<ASTPointer<ASTString>>>();
 		do
 		{
 			advance();
 			expectToken(Token::StringLiteral, false);
-			flags->emplace_back(make_shared<ASTString>(m_scanner->currentLiteral()));
+			flags->emplace_back(std::make_shared<ASTString>(m_scanner->currentLiteral()));
 			advance();
 		}
 		while (m_scanner->currentToken() == Token::Comma);
@@ -1437,12 +1437,12 @@ ASTPointer<InlineAssembly> Parser::parseInlineAssembly(ASTPointer<ASTString> con
 	}
 
 	yul::Parser asmParser(m_errorReporter, dialect);
-	shared_ptr<yul::Block> block = asmParser.parseInline(m_scanner);
+	std::shared_ptr<yul::Block> block = asmParser.parseInline(m_scanner);
 	if (block == nullptr)
 		BOOST_THROW_EXCEPTION(FatalError());
 
 	location.end = nativeLocationOf(*block).end;
-	return make_shared<InlineAssembly>(nextID(), location, _docString, dialect, std::move(flags), block);
+	return std::make_shared<InlineAssembly>(nextID(), location, _docString, dialect, std::move(flags), block);
 }
 
 ASTPointer<IfStatement> Parser::parseIfStatement(ASTPointer<ASTString> const& _docString)
@@ -1472,7 +1472,7 @@ ASTPointer<TryStatement> Parser::parseTryStatement(ASTPointer<ASTString> const&
 	ASTNodeFactory nodeFactory(*this);
 	expectToken(Token::Try);
 	ASTPointer<Expression> externalCall = parseExpression();
-	vector<ASTPointer<TryCatchClause>> clauses;
+	std::vector<ASTPointer<TryCatchClause>> clauses;
 
 	ASTNodeFactory successClauseFactory(*this);
 	ASTPointer<ParameterList> returnsParameters;
@@ -1487,7 +1487,7 @@ ASTPointer<TryStatement> Parser::parseTryStatement(ASTPointer<ASTString> const&
 	ASTPointer<Block> successBlock = parseBlock();
 	successClauseFactory.setEndPositionFromNode(successBlock);
 	clauses.emplace_back(successClauseFactory.createNode<TryCatchClause>(
-		make_shared<ASTString>(), returnsParameters, successBlock
+		std::make_shared<ASTString>(), returnsParameters, successBlock
 	));
 
 	do
@@ -1506,7 +1506,7 @@ ASTPointer<TryCatchClause> Parser::parseCatchClause()
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
 	expectToken(Token::Catch);
-	ASTPointer<ASTString> errorName = make_shared<string>();
+	ASTPointer<ASTString> errorName = std::make_shared<std::string>();
 	ASTPointer<ParameterList> errorParameters;
 	if (m_scanner->currentToken() != Token::LBrace)
 	{
@@ -1674,17 +1674,17 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&
 		}
 
 		// Now see whether we have a variable declaration or an expression.
-		tie(statementType, iap) = tryParseIndexAccessedPath();
+		std::tie(statementType, iap) = tryParseIndexAccessedPath();
 		switch (statementType)
 		{
 		case LookAheadInfo::VariableDeclaration:
 		{
-			vector<ASTPointer<VariableDeclaration>> variables;
+			std::vector<ASTPointer<VariableDeclaration>> variables;
 			ASTPointer<Expression> value;
 			// We have already parsed something like `(,,,,a.b.c[2][3]`
 			VarDeclParserOptions options;
 			options.allowLocationSpecifier = true;
-			variables = vector<ASTPointer<VariableDeclaration>>(emptyComponents, nullptr);
+			variables = std::vector<ASTPointer<VariableDeclaration>>(emptyComponents, nullptr);
 			variables.push_back(parseVariableDeclaration(options, typeNameFromIndexAccessStructure(iap)));
 
 			while (m_scanner->currentToken() != Token::RParen)
@@ -1704,7 +1704,7 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&
 		case LookAheadInfo::Expression:
 		{
 			// Complete parsing the expression in the current component.
-			vector<ASTPointer<Expression>> components(emptyComponents, nullptr);
+			std::vector<ASTPointer<Expression>> components(emptyComponents, nullptr);
 			components.push_back(parseExpression(expressionFromIndexAccessStructure(iap)));
 			while (m_scanner->currentToken() != Token::RParen)
 			{
@@ -1724,7 +1724,7 @@ ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const&
 	}
 	else
 	{
-		tie(statementType, iap) = tryParseIndexAccessedPath();
+		std::tie(statementType, iap) = tryParseIndexAccessedPath();
 		switch (statementType)
 		{
 		case LookAheadInfo::VariableDeclaration:
@@ -1749,7 +1749,7 @@ bool Parser::IndexAccessedPath::empty() const
 }
 
 
-pair<Parser::LookAheadInfo, Parser::IndexAccessedPath> Parser::tryParseIndexAccessedPath()
+std::pair<Parser::LookAheadInfo, Parser::IndexAccessedPath> Parser::tryParseIndexAccessedPath()
 {
 	// These two cases are very hard to distinguish:
 	// x[7 * 20 + 3] a;     and     x[7 * 20 + 3] = 9;
@@ -1763,7 +1763,7 @@ pair<Parser::LookAheadInfo, Parser::IndexAccessedPath> Parser::tryParseIndexAcce
 	{
 	case LookAheadInfo::VariableDeclaration:
 	case LookAheadInfo::Expression:
-		return make_pair(statementType, IndexAccessedPath());
+		return std::make_pair(statementType, IndexAccessedPath());
 	default:
 		break;
 	}
@@ -1775,9 +1775,9 @@ pair<Parser::LookAheadInfo, Parser::IndexAccessedPath> Parser::tryParseIndexAcce
 	IndexAccessedPath iap = parseIndexAccessedPath();
 
 	if (m_scanner->currentToken() == Token::Identifier || TokenTraits::isLocationSpecifier(m_scanner->currentToken()))
-		return make_pair(LookAheadInfo::VariableDeclaration, std::move(iap));
+		return std::make_pair(LookAheadInfo::VariableDeclaration, std::move(iap));
 	else
-		return make_pair(LookAheadInfo::Expression, std::move(iap));
+		return std::make_pair(LookAheadInfo::Expression, std::move(iap));
 }
 
 ASTPointer<VariableDeclarationStatement> Parser::parseVariableDeclarationStatement(
@@ -1795,7 +1795,7 @@ ASTPointer<VariableDeclarationStatement> Parser::parseVariableDeclarationStateme
 
 	VarDeclParserOptions options;
 	options.allowLocationSpecifier = true;
-	vector<ASTPointer<VariableDeclaration>> variables;
+	std::vector<ASTPointer<VariableDeclaration>> variables;
 	variables.emplace_back(parseVariableDeclaration(options, _lookAheadArrayType));
 	nodeFactory.setEndPositionFromNode(variables.back());
 
@@ -2021,7 +2021,7 @@ ASTPointer<Expression> Parser::parseLiteral()
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
 	Token initialToken = m_scanner->currentToken();
-	ASTPointer<ASTString> value = make_shared<string>(m_scanner->currentLiteral());
+	ASTPointer<ASTString> value = std::make_shared<std::string>(m_scanner->currentLiteral());
 
 	switch (initialToken)
 	{
@@ -2091,7 +2091,7 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
 		// Inside expressions "type" is the name of a special, globally-available function.
 		nodeFactory.markEndPosition();
 		advance();
-		expression = nodeFactory.createNode<Identifier>(make_shared<ASTString>("type"));
+		expression = nodeFactory.createNode<Identifier>(std::make_shared<ASTString>("type"));
 		break;
 	case Token::LParen:
 	case Token::LBrack:
@@ -2100,7 +2100,7 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
 		// Special cases: ()/[] is empty tuple/array type, (x) is not a real tuple,
 		// (x,) is one-dimensional tuple, elements in arrays cannot be left out, only in tuples.
 		advance();
-		vector<ASTPointer<Expression>> components;
+		std::vector<ASTPointer<Expression>> components;
 		Token oppositeToken = (token == Token::LParen ? Token::RParen : Token::RBrack);
 		bool isArray = (token == Token::LBrack);
 
@@ -2133,7 +2133,7 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
 			//used for casts
 			unsigned firstSize;
 			unsigned secondSize;
-			tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
+			std::tie(firstSize, secondSize) = m_scanner->currentTokenInfo();
 			auto expressionType = nodeFactory.createNode<ElementaryTypeName>(
 				ElementaryTypeNameToken(m_scanner->currentToken(), firstSize, secondSize)
 			);
@@ -2147,10 +2147,10 @@ ASTPointer<Expression> Parser::parsePrimaryExpression()
 	return expression;
 }
 
-vector<ASTPointer<Expression>> Parser::parseFunctionCallListArguments()
+std::vector<ASTPointer<Expression>> Parser::parseFunctionCallListArguments()
 {
 	RecursionGuard recursionGuard(*this);
-	vector<ASTPointer<Expression>> arguments;
+	std::vector<ASTPointer<Expression>> arguments;
 	if (m_scanner->currentToken() != Token::RParen)
 	{
 		arguments.push_back(parseExpression());
@@ -2226,17 +2226,17 @@ bool Parser::variableDeclarationStart()
 		(currentToken == Token::Function && m_scanner->peekNextToken() == Token::LParen);
 }
 
-optional<string> Parser::findLicenseString(std::vector<ASTPointer<ASTNode>> const& _nodes)
+std::optional<std::string> Parser::findLicenseString(std::vector<ASTPointer<ASTNode>> const& _nodes)
 {
 	// We circumvent the scanner here, because it skips non-docstring comments.
-	static regex const licenseNameRegex("([a-zA-Z0-9 ()+.-]+)");
-	static regex const licenseDeclarationRegex("SPDX-License-Identifier:\\s*(.+?)([\n\r]|(\\*/))");
+	static std::regex const licenseNameRegex("([a-zA-Z0-9 ()+.-]+)");
+	static std::regex const licenseDeclarationRegex("SPDX-License-Identifier:\\s*(.+?)([\n\r]|(\\*/))");
 
 	// Search inside all parts of the source not covered by parsed nodes.
 	// This will leave e.g. "global comments".
 	using iter = std::string::const_iterator;
-	vector<pair<iter, iter>> sequencesToSearch;
-	string const& source = m_scanner->charStream().source();
+	std::vector<std::pair<iter, iter>> sequencesToSearch;
+	std::string const& source = m_scanner->charStream().source();
 	sequencesToSearch.emplace_back(source.begin(), source.end());
 	for (ASTPointer<ASTNode> const& node: _nodes)
 		if (node->location().hasText())
@@ -2245,7 +2245,7 @@ optional<string> Parser::findLicenseString(std::vector<ASTPointer<ASTNode>> cons
 			sequencesToSearch.emplace_back(source.begin() + node->location().end, source.end());
 		}
 
-	vector<string> licenseNames;
+	std::vector<std::string> licenseNames;
 	for (auto const& [start, end]: sequencesToSearch)
 	{
 		auto declarationsBegin = std::sregex_iterator(start, end, licenseDeclarationRegex);
@@ -2254,14 +2254,14 @@ optional<string> Parser::findLicenseString(std::vector<ASTPointer<ASTNode>> cons
 		for (std::sregex_iterator declIt = declarationsBegin; declIt != declarationsEnd; ++declIt)
 			if (!declIt->empty())
 			{
-				string license = boost::trim_copy(string((*declIt)[1]));
+				std::string license = boost::trim_copy(std::string((*declIt)[1]));
 				licenseNames.emplace_back(std::move(license));
 			}
 	}
 
 	if (licenseNames.size() == 1)
 	{
-		string const& license = licenseNames.front();
+std::string const& license = licenseNames.front();
 		if (regex_match(license, licenseNameRegex))
 			return license;
 		else
@@ -2340,7 +2340,7 @@ Parser::IndexAccessedPath Parser::parseIndexAccessedPath()
 	{
 		unsigned firstNum;
 		unsigned secondNum;
-		tie(firstNum, secondNum) = m_scanner->currentTokenInfo();
+		std::tie(firstNum, secondNum) = m_scanner->currentTokenInfo();
 		auto expressionType = ASTNodeFactory(*this).createNode<ElementaryTypeName>(
 			ElementaryTypeNameToken(m_scanner->currentToken(), firstNum, secondNum)
 		);
@@ -2394,8 +2394,8 @@ ASTPointer<TypeName> Parser::typeNameFromIndexAccessStructure(Parser::IndexAcces
 	}
 	else
 	{
-		vector<ASTString> path;
-		vector<SourceLocation> pathLocations;
+		std::vector<ASTString> path;
+		std::vector<SourceLocation> pathLocations;
 
 		for (auto const& el: _iap.path)
 		{
@@ -2434,7 +2434,7 @@ ASTPointer<Expression> Parser::expressionFromIndexAccessStructure(
 		Identifier const& identifier = dynamic_cast<Identifier const&>(*_iap.path[i]);
 		expression = nodeFactory.createNode<MemberAccess>(
 			expression,
-			make_shared<ASTString>(identifier.name()),
+			std::make_shared<ASTString>(identifier.name()),
 			identifier.location()
 		);
 	}
@@ -2454,7 +2454,7 @@ ASTPointer<ParameterList> Parser::createEmptyParameterList()
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
 	nodeFactory.setLocationEmpty();
-	return nodeFactory.createNode<ParameterList>(vector<ASTPointer<VariableDeclaration>>());
+	return nodeFactory.createNode<ParameterList>(std::vector<ASTPointer<VariableDeclaration>>());
 }
 
 ASTPointer<ASTString> Parser::expectIdentifierToken()
@@ -2468,7 +2468,7 @@ ASTPointer<ASTString> Parser::expectIdentifierTokenOrAddress()
 	ASTPointer<ASTString> result;
 	if (m_scanner->currentToken() == Token::Address)
 	{
-		result = make_shared<ASTString>("address");
+		result = std::make_shared<ASTString>("address");
 		advance();
 	}
 	else
@@ -2481,7 +2481,7 @@ ASTPointer<ASTString> Parser::expectIdentifierTokenOrAddress()
 
 ASTPointer<ASTString> Parser::getLiteralAndAdvance()
 {
-	ASTPointer<ASTString> identifier = make_shared<ASTString>(m_scanner->currentLiteral());
+	ASTPointer<ASTString> identifier = std::make_shared<ASTString>(m_scanner->currentLiteral());
 	advance();
 	return identifier;
 }
@@ -2504,7 +2504,7 @@ ASTPointer<ASTString> Parser::getStdlibImportPathAndAdvance()
 	if (m_scanner->currentToken() == Token::Period)
 		advance();
 	ASTPointer<ASTString> library = expectIdentifierToken();
-	return make_shared<ASTString>(*std + "." + *library);
+	return std::make_shared<ASTString>(*std + "." + *library);
 }
 
 }
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 7c85e67194..7c1167490a 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -31,6 +31,8 @@ NAMESPACE_STD_FREE_FILES=(
     libsolidity/codegen/*
     libsolidity/formal/*
     libsolidity/interface/*
+    libsolidity/lsp/*
+    libsolidity/parsing/*
 )
 
 (

From aaba5c408a1b16e685631dc983cf37490234ea37 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 16 Aug 2023 17:27:12 +0200
Subject: [PATCH 1545/1748] Remove obsolete main function yul optimiser step.

---
 libyul/CMakeLists.txt                         |  2 -
 libyul/optimiser/MainFunction.cpp             | 54 -------------------
 libyul/optimiser/MainFunction.h               | 47 ----------------
 test/libyul/YulOptimizerTestCommon.cpp        |  6 ---
 .../mainFunction/empty_block.yul              | 28 ----------
 .../mainFunction/multi_fun_mixed.yul          | 24 ---------
 .../mainFunction/nested_fun.yul               | 24 ---------
 .../mainFunction/single_fun.yul               | 15 ------
 .../yulOptimizerTests/mainFunction/smoke.yul  | 10 ----
 9 files changed, 210 deletions(-)
 delete mode 100644 libyul/optimiser/MainFunction.cpp
 delete mode 100644 libyul/optimiser/MainFunction.h
 delete mode 100644 test/libyul/yulOptimizerTests/mainFunction/empty_block.yul
 delete mode 100644 test/libyul/yulOptimizerTests/mainFunction/multi_fun_mixed.yul
 delete mode 100644 test/libyul/yulOptimizerTests/mainFunction/nested_fun.yul
 delete mode 100644 test/libyul/yulOptimizerTests/mainFunction/single_fun.yul
 delete mode 100644 test/libyul/yulOptimizerTests/mainFunction/smoke.yul

diff --git a/libyul/CMakeLists.txt b/libyul/CMakeLists.txt
index 0bb98e4677..811a6239b7 100644
--- a/libyul/CMakeLists.txt
+++ b/libyul/CMakeLists.txt
@@ -128,8 +128,6 @@ add_library(yul
 	optimiser/LoadResolver.h
 	optimiser/LoopInvariantCodeMotion.cpp
 	optimiser/LoopInvariantCodeMotion.h
-	optimiser/MainFunction.cpp
-	optimiser/MainFunction.h
 	optimiser/Metrics.cpp
 	optimiser/Metrics.h
 	optimiser/NameCollector.cpp
diff --git a/libyul/optimiser/MainFunction.cpp b/libyul/optimiser/MainFunction.cpp
deleted file mode 100644
index 8adabbe325..0000000000
--- a/libyul/optimiser/MainFunction.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-	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
-/**
- * Changes the topmost block to be a function with a specific name ("main") which has no
- * inputs nor outputs.
- */
-
-#include <libyul/optimiser/MainFunction.h>
-
-#include <libyul/optimiser/NameCollector.h>
-#include <libyul/Exceptions.h>
-
-#include <libyul/AST.h>
-
-#include <libsolutil/CommonData.h>
-
-using namespace std;
-using namespace solidity;
-using namespace solidity::yul;
-
-void MainFunction::operator()(Block& _block)
-{
-	assertThrow(_block.statements.size() >= 1, OptimizerException, "");
-	assertThrow(holds_alternative<Block>(_block.statements[0]), OptimizerException, "");
-	for (size_t i = 1; i < _block.statements.size(); ++i)
-		assertThrow(holds_alternative<FunctionDefinition>(_block.statements.at(i)), OptimizerException, "");
-	/// @todo this should handle scopes properly and instead of an assertion it should rename the conflicting function
-	assertThrow(NameCollector(_block).names().count("main"_yulstring) == 0, OptimizerException, "");
-
-	Block& block = std::get<Block>(_block.statements[0]);
-	FunctionDefinition main{
-		block.debugData,
-		"main"_yulstring,
-		{},
-		{},
-		std::move(block)
-	};
-	_block.statements[0] = std::move(main);
-}
diff --git a/libyul/optimiser/MainFunction.h b/libyul/optimiser/MainFunction.h
deleted file mode 100644
index c2f137e489..0000000000
--- a/libyul/optimiser/MainFunction.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-	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
-/**
- * Changes the topmost block to be a function with a specific name ("main") which has no
- * inputs nor outputs.
- */
-
-#pragma once
-
-#include <libyul/ASTForward.h>
-
-namespace solidity::yul
-{
-
-struct OptimiserStepContext;
-
-/**
- * Prerequisites: Function Grouper
- */
-class MainFunction
-{
-public:
-	static constexpr char const* name{"MainFunction"};
-	static void run(OptimiserStepContext&, Block& _ast) { MainFunction{}(_ast); }
-
-	void operator()(Block& _block);
-
-private:
-	MainFunction() = default;
-};
-
-}
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 7e2a4c9593..bcf180add5 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -40,7 +40,6 @@
 #include <libyul/optimiser/ForLoopInitRewriter.h>
 #include <libyul/optimiser/LoadResolver.h>
 #include <libyul/optimiser/LoopInvariantCodeMotion.h>
-#include <libyul/optimiser/MainFunction.h>
 #include <libyul/optimiser/StackLimitEvader.h>
 #include <libyul/optimiser/NameDisplacer.h>
 #include <libyul/optimiser/Rematerialiser.h>
@@ -174,11 +173,6 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			FunctionGrouper::run(*m_context, *m_ast);
 			FullInliner::run(*m_context, *m_ast);
 		}},
-		{"mainFunction", [&]() {
-			disambiguate();
-			FunctionGrouper::run(*m_context, *m_ast);
-			MainFunction::run(*m_context, *m_ast);
-		}},
 		{"rematerialiser", [&]() {
 			disambiguate();
 			ForLoopInitRewriter::run(*m_context, *m_ast);
diff --git a/test/libyul/yulOptimizerTests/mainFunction/empty_block.yul b/test/libyul/yulOptimizerTests/mainFunction/empty_block.yul
deleted file mode 100644
index 635e618d5f..0000000000
--- a/test/libyul/yulOptimizerTests/mainFunction/empty_block.yul
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-    let a:u256
-    { }
-    function f() -> x:bool {
-        let b:u256 := 4:u256
-        {}
-        for {} f() {} {}
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: mainFunction
-//
-// {
-//     function main()
-//     {
-//         let a
-//         { }
-//     }
-//     function f() -> x:bool
-//     {
-//         let b := 4
-//         { }
-//         for { } f() { }
-//         { }
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/mainFunction/multi_fun_mixed.yul b/test/libyul/yulOptimizerTests/mainFunction/multi_fun_mixed.yul
deleted file mode 100644
index 1d14937e7b..0000000000
--- a/test/libyul/yulOptimizerTests/mainFunction/multi_fun_mixed.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let a:u256
-    function f() { let b:u256 }
-    let c:u256
-    function g() { let d:u256 }
-    let e:u256
-}
-// ====
-// dialect: yul
-// ----
-// step: mainFunction
-//
-// {
-//     function main()
-//     {
-//         let a
-//         let c
-//         let e
-//     }
-//     function f()
-//     { let b }
-//     function g()
-//     { let d }
-// }
diff --git a/test/libyul/yulOptimizerTests/mainFunction/nested_fun.yul b/test/libyul/yulOptimizerTests/mainFunction/nested_fun.yul
deleted file mode 100644
index a888970e72..0000000000
--- a/test/libyul/yulOptimizerTests/mainFunction/nested_fun.yul
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-    let a:u256
-    function f() {
-        let b:u256
-        function g() { let c:u256}
-        let d:u256
-    }
-}
-// ====
-// dialect: yul
-// ----
-// step: mainFunction
-//
-// {
-//     function main()
-//     { let a }
-//     function f()
-//     {
-//         let b
-//         function g()
-//         { let c }
-//         let d
-//     }
-// }
diff --git a/test/libyul/yulOptimizerTests/mainFunction/single_fun.yul b/test/libyul/yulOptimizerTests/mainFunction/single_fun.yul
deleted file mode 100644
index 6b20d712ca..0000000000
--- a/test/libyul/yulOptimizerTests/mainFunction/single_fun.yul
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    let a:u256
-    function f() {}
-}
-// ====
-// dialect: yul
-// ----
-// step: mainFunction
-//
-// {
-//     function main()
-//     { let a }
-//     function f()
-//     { }
-// }
diff --git a/test/libyul/yulOptimizerTests/mainFunction/smoke.yul b/test/libyul/yulOptimizerTests/mainFunction/smoke.yul
deleted file mode 100644
index 5bad02dfba..0000000000
--- a/test/libyul/yulOptimizerTests/mainFunction/smoke.yul
+++ /dev/null
@@ -1,10 +0,0 @@
-{}
-// ====
-// dialect: yul
-// ----
-// step: mainFunction
-//
-// {
-//     function main()
-//     { }
-// }

From 9f237d38a669428b74dc0d27be30cda0f81af4e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20Criado-P=C3=A9rez?= <alejandro@criadoperez.com>
Date: Wed, 26 Jul 2023 02:03:21 +0200
Subject: [PATCH 1546/1748] Corrected text

---
 libyul/AsmAnalysis.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libyul/AsmAnalysis.h b/libyul/AsmAnalysis.h
index c71b4cbe31..c49e685591 100644
--- a/libyul/AsmAnalysis.h
+++ b/libyul/AsmAnalysis.h
@@ -101,7 +101,7 @@ class AsmAnalyzer
 	/// returns the type. Reports errors on errors and returns the default type.
 	YulString expectExpression(Expression const& _expr);
 	YulString expectUnlimitedStringLiteral(Literal const& _literal);
-	/// Vists the expression and expects it to return a single boolean value.
+	/// Visits the expression and expects it to return a single boolean value.
 	/// Reports an error otherwise.
 	void expectBoolExpression(Expression const& _expr);
 

From 0c2fce579afad30d186e64329d541bfbf2a493e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 18:48:15 +0200
Subject: [PATCH 1547/1748] Take into account multi-line license comments when
 adding preamble in test frameworks

---
 test/libsolidity/AnalysisFramework.cpp          | 2 +-
 test/libsolidity/SolidityExecutionFramework.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 6c6ad0cb86..d8b6c6e9e7 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -52,7 +52,7 @@ AnalysisFramework::parseAnalyseAndReturnError(
 {
 	compiler().reset();
 	// Do not insert license if it is already present.
-	bool insertLicense = _insertLicenseAndVersionPragma && _source.find("// SPDX-License-Identifier:") == string::npos;
+	bool insertLicense = _insertLicenseAndVersionPragma && _source.find("SPDX-License-Identifier:") == string::npos;
 	compiler().setSources({{"",
 		string{_insertLicenseAndVersionPragma ? "pragma solidity >=0.0;\n" : ""} +
 		string{insertLicense ? "// SPDX-License-Identifier: GPL-3.0\n" : ""} +
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index 7d18e1bb4a..e578dd6ac9 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -146,7 +146,7 @@ string SolidityExecutionFramework::addPreamble(string const& _sourceCode)
 {
 	// Silence compiler version warning
 	string preamble = "pragma solidity >=0.0;\n";
-	if (_sourceCode.find("// SPDX-License-Identifier:") == string::npos)
+	if (_sourceCode.find("SPDX-License-Identifier:") == string::npos)
 		preamble += "// SPDX-License-Identifier: unlicensed\n";
 	if (
 		solidity::test::CommonOptions::get().useABIEncoderV1 &&

From 18db62cf4148a095aae68ada2a5f72b43a378ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 18:54:06 +0200
Subject: [PATCH 1548/1748] Unify preamble handling between test cases based on
 AnalysisFramework

---
 test/CMakeLists.txt                    |  2 +
 test/libsolidity/AnalysisFramework.cpp |  9 +---
 test/libsolidity/GasTest.cpp           |  4 +-
 test/libsolidity/SyntaxTest.cpp        | 17 +-------
 test/libsolidity/SyntaxTest.h          |  3 --
 test/libsolidity/util/Common.cpp       | 46 +++++++++++++++++++++
 test/libsolidity/util/Common.h         | 34 +++++++++++++++
 test/solc/CommandLineInterface.cpp     | 57 ++++++++++++--------------
 test/tools/CMakeLists.txt              |  1 +
 9 files changed, 115 insertions(+), 58 deletions(-)
 create mode 100644 test/libsolidity/util/Common.cpp
 create mode 100644 test/libsolidity/util/Common.h

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 9a3fa84b49..1ea70fe7a1 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -112,6 +112,8 @@ set(libsolidity_util_sources
     libsolidity/util/BytesUtils.cpp
     libsolidity/util/BytesUtilsTests.cpp
     libsolidity/util/BytesUtils.h
+    libsolidity/util/Common.cpp
+    libsolidity/util/Common.h
     libsolidity/util/ContractABIUtils.cpp
     libsolidity/util/ContractABIUtils.h
     libsolidity/util/SoltestErrors.h
diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index d8b6c6e9e7..cb462b91d6 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -21,6 +21,7 @@
 
 #include <test/libsolidity/AnalysisFramework.h>
 
+#include <test/libsolidity/util/Common.h>
 #include <test/Common.h>
 
 #include <libsolidity/interface/CompilerStack.h>
@@ -51,13 +52,7 @@ AnalysisFramework::parseAnalyseAndReturnError(
 )
 {
 	compiler().reset();
-	// Do not insert license if it is already present.
-	bool insertLicense = _insertLicenseAndVersionPragma && _source.find("SPDX-License-Identifier:") == string::npos;
-	compiler().setSources({{"",
-		string{_insertLicenseAndVersionPragma ? "pragma solidity >=0.0;\n" : ""} +
-		string{insertLicense ? "// SPDX-License-Identifier: GPL-3.0\n" : ""} +
-		_source
-	}});
+	compiler().setSources({{"", _insertLicenseAndVersionPragma ? withPreamble(_source) : _source}});
 	compiler().setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 	compiler().setParserErrorRecovery(_allowRecoveryErrors);
 	_allowMultipleErrors = _allowMultipleErrors || _allowRecoveryErrors;
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index 0060c81e40..936c1b891f 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -17,6 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <test/libsolidity/GasTest.h>
+#include <test/libsolidity/util/Common.h>
 #include <test/Common.h>
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/JSON.h>
@@ -99,7 +100,6 @@ void GasTest::printUpdatedExpectations(ostream& _stream, string const& _linePref
 
 TestCase::TestResult GasTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
 {
-	string const preamble = "pragma solidity >=0.0;\n// SPDX-License-Identifier: GPL-3.0\n";
 	compiler().reset();
 	// Prerelease CBOR metadata varies in size due to changing version numbers and build dates.
 	// This leads to volatile creation cost estimates. Therefore we force the compiler to
@@ -113,7 +113,7 @@ TestCase::TestResult GasTest::run(ostream& _stream, string const& _linePrefix, b
 	}
 	settings.expectedExecutionsPerDeployment = m_optimiseRuns;
 	compiler().setOptimiserSettings(settings);
-	compiler().setSources({{"", preamble + m_source}});
+	compiler().setSources({{"", withPreamble(m_source)}});
 
 	if (!compiler().parseAndAnalyze() || !compiler().compile())
 	{
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 3efc818783..0a4793d30a 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -18,6 +18,7 @@
 
 #include <test/libsolidity/SyntaxTest.h>
 
+#include <test/libsolidity/util/Common.h>
 #include <test/Common.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
@@ -43,24 +44,10 @@ SyntaxTest::SyntaxTest(string const& _filename, langutil::EVMVersion _evmVersion
 	m_parserErrorRecovery = _parserErrorRecovery;
 }
 
-string SyntaxTest::addPreamble(string const& _sourceCode)
-{
-	// Silence compiler version warning
-	string preamble = "pragma solidity >=0.0;\n";
-	// NOTE: this check is intentionally loose to match weird cases.
-	// We can manually adjust a test case where this causes problem.
-	if (_sourceCode.find("SPDX-License-Identifier:") == string::npos)
-		preamble += "// SPDX-License-Identifier: GPL-3.0\n";
-	return preamble + _sourceCode;
-}
-
 void SyntaxTest::setupCompiler()
 {
 	compiler().reset();
-	auto sourcesWithPragma = m_sources.sources;
-	for (auto& source: sourcesWithPragma)
-		source.second = addPreamble(source.second);
-	compiler().setSources(sourcesWithPragma);
+	compiler().setSources(withPreamble(m_sources.sources));
 	compiler().setEVMVersion(m_evmVersion);
 	compiler().setParserErrorRecovery(m_parserErrorRecovery);
 	compiler().setOptimiserSettings(
diff --git a/test/libsolidity/SyntaxTest.h b/test/libsolidity/SyntaxTest.h
index 4f47f10124..6b3be8a28a 100644
--- a/test/libsolidity/SyntaxTest.h
+++ b/test/libsolidity/SyntaxTest.h
@@ -48,9 +48,6 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
 	SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion, bool _parserErrorRecovery = false);
 
 protected:
-	/// Returns @param _sourceCode prefixed with the version pragma and the SPDX license identifier.
-	static std::string addPreamble(std::string const& _sourceCode);
-
 	virtual void setupCompiler();
 	void parseAndAnalyze() override;
 	virtual void filterObtainedErrors();
diff --git a/test/libsolidity/util/Common.cpp b/test/libsolidity/util/Common.cpp
new file mode 100644
index 0000000000..8d065a4630
--- /dev/null
+++ b/test/libsolidity/util/Common.cpp
@@ -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
+
+#include <test/libsolidity/util/Common.h>
+
+using namespace std;
+using namespace solidity;
+using namespace solidity::frontend;
+
+string test::withPreamble(string const& _sourceCode)
+{
+	static string const versionPragma = "pragma solidity >=0.0;\n";
+	static string const licenseComment = "// SPDX-License-Identifier: GPL-3.0\n";
+
+	// NOTE: this check is intentionally loose to match weird cases.
+	// We can manually adjust a test case where this causes problem.
+	bool licenseMissing = _sourceCode.find("SPDX-License-Identifier:") == string::npos;
+
+	return
+		versionPragma +
+		(licenseMissing ? licenseComment : "") +
+		_sourceCode;
+}
+
+StringMap test::withPreamble(StringMap _sources)
+{
+	for (auto&& [sourceName, source]: _sources)
+		source = withPreamble(source);
+
+	return _sources;
+}
diff --git a/test/libsolidity/util/Common.h b/test/libsolidity/util/Common.h
new file mode 100644
index 0000000000..d030360784
--- /dev/null
+++ b/test/libsolidity/util/Common.h
@@ -0,0 +1,34 @@
+/*
+	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
+
+/// Utilities shared by multiple libsolidity tests.
+
+#include <libsolidity/interface/CompilerStack.h>
+
+#include <string>
+
+namespace solidity::frontend::test
+{
+
+/// @returns @p _sourceCode prefixed with the version pragma and the SPDX license identifier.
+std::string withPreamble(std::string const& _sourceCode);
+
+/// @returns a copy of @p _sources with preamble prepended to all sources.
+StringMap withPreamble(StringMap _sources);
+
+} // namespace solidity::frontend::test
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 8124b1545f..7732faf380 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -24,6 +24,7 @@
 #include <test/solc/Common.h>
 
 #include <test/Common.h>
+#include <test/libsolidity/util/Common.h>
 #include <test/libsolidity/util/SoltestErrors.h>
 #include <liblangutil/SemVerHandler.h>
 #include <test/FilesystemUtils.h>
@@ -921,10 +922,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 	TemporaryDirectory tempDir({"base/", "include/", "lib/nested/"}, TEST_CASE_NAME);
 	TemporaryWorkingDirectory tempWorkDir(tempDir);
 
-	string const preamble =
-		"// SPDX-License-Identifier: GPL-3.0\n"
-		"pragma solidity >=0.0;\n";
-	string const mainContractSource = preamble +
+	string const mainContractSource = withPreamble(
 		"import \"contract.sol\";\n"
 		"import \"contract_via_callback.sol\";\n"
 		"import \"include.sol\";\n"
@@ -932,8 +930,10 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 		"import \"nested.sol\";\n"
 		"import \"nested_via_callback.sol\";\n"
 		"import \"lib.sol\";\n"
-		"import \"lib_via_callback.sol\";\n";
+		"import \"lib_via_callback.sol\";\n"
+	);
 
+	string const onlyPreamble = withPreamble("");
 	createFilesWithParentDirs(
 		{
 			tempDir.path() / "base/contract.sol",
@@ -945,7 +945,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 			tempDir.path() / "lib/lib.sol",
 			tempDir.path() / "lib/lib_via_callback.sol",
 		},
-		preamble
+		onlyPreamble
 	);
 	createFilesWithParentDirs({tempDir.path() / "base/main.sol"}, mainContractSource);
 
@@ -985,14 +985,14 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 
 	map<string, string> expectedSources = {
 		{"main.sol", mainContractSource},
-		{"contract.sol", preamble},
-		{"contract_via_callback.sol", preamble},
-		{"include.sol", preamble},
-		{"include_via_callback.sol", preamble},
-		{"nested.sol", preamble},
-		{"nested_via_callback.sol", preamble},
-		{"lib.sol", preamble},
-		{"lib_via_callback.sol", preamble},
+		{"contract.sol", onlyPreamble},
+		{"contract_via_callback.sol", onlyPreamble},
+		{"include.sol", onlyPreamble},
+		{"include_via_callback.sol", onlyPreamble},
+		{"nested.sol", onlyPreamble},
+		{"nested_via_callback.sol", onlyPreamble},
+		{"lib.sol", onlyPreamble},
+		{"lib_via_callback.sol", onlyPreamble},
 	};
 
 	vector<boost::filesystem::path> expectedIncludePaths = {
@@ -1066,14 +1066,12 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 	TemporaryDirectory tempDir({"base/", "include/", "lib/nested/"}, TEST_CASE_NAME);
 	TemporaryWorkingDirectory tempWorkDir(tempDir);
 
-	string const preamble =
-		"// SPDX-License-Identifier: GPL-3.0\n"
-		"pragma solidity >=0.0;\n";
-	string const mainContractSource = preamble +
+	string const mainContractSource = withPreamble(
 		"import 'contract_via_callback.sol';\n"
 		"import 'include_via_callback.sol';\n"
 		"import 'nested_via_callback.sol';\n"
-		"import 'lib_via_callback.sol';\n";
+		"import 'lib_via_callback.sol';\n"
+	);
 
 	string const standardJsonInput = R"(
 		{
@@ -1084,6 +1082,7 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 		}
 	)";
 
+	string const onlyPreamble = withPreamble("");
 	createFilesWithParentDirs(
 		{
 			tempDir.path() / "base/contract_via_callback.sol",
@@ -1091,7 +1090,7 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 			tempDir.path() / "lib/nested/nested_via_callback.sol",
 			tempDir.path() / "lib/lib_via_callback.sol",
 		},
-		preamble
+		onlyPreamble
 	);
 
 	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::canonical(tempDir).relative_path();
@@ -1121,10 +1120,10 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 	// because FileReader is only used once to initialize the compiler stack and after that
 	// its sources are irrelevant (even though the callback still stores everything it loads).
 	map<string, string> expectedSources = {
-		{"contract_via_callback.sol", preamble},
-		{"include_via_callback.sol", preamble},
-		{"nested_via_callback.sol", preamble},
-		{"lib_via_callback.sol", preamble},
+		{"contract_via_callback.sol", onlyPreamble},
+		{"include_via_callback.sol", onlyPreamble},
+		{"nested_via_callback.sol", onlyPreamble},
+		{"lib_via_callback.sol", onlyPreamble},
 	};
 
 	vector<boost::filesystem::path> expectedIncludePaths = {
@@ -1335,14 +1334,10 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_ambiguous_import)
 	TemporaryDirectory tempDir({"base/", "include/"}, TEST_CASE_NAME);
 	TemporaryWorkingDirectory tempWorkDir(tempDir);
 
-	string const preamble =
-		"// SPDX-License-Identifier: GPL-3.0\n"
-		"pragma solidity >=0.0;\n";
-	string const mainContractSource = preamble +
-		// Ambiguous: both base/contract.sol and include/contract.sol match the import.
-		"import \"contract.sol\";";
+	// Ambiguous: both base/contract.sol and include/contract.sol match the import.
+	string const mainContractSource = withPreamble("import \"contract.sol\";");
 
-	createFilesWithParentDirs({"base/contract.sol", "include/contract.sol"}, preamble);
+	createFilesWithParentDirs({"base/contract.sol", "include/contract.sol"}, withPreamble(""));
 
 	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::canonical(tempDir).relative_path();
 
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index 5a2ba8da3f..d5a95676d3 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -19,6 +19,7 @@ add_executable(isoltest
 	../TestCase.cpp
 	../TestCaseReader.cpp
 	../libsolidity/util/BytesUtils.cpp
+	../libsolidity/util/Common.cpp
 	../libsolidity/util/ContractABIUtils.cpp
 	../libsolidity/util/TestFileParser.cpp
 	../libsolidity/util/TestFunctionCall.cpp

From ec92685bcb6b7c9a452ea8c436c916ad0747431d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 11 Aug 2023 14:43:37 +0200
Subject: [PATCH 1549/1748] Unify preamble handling between AnalysisFramework
 and SolidityExecutionFramework

---
 .../SolidityExecutionFramework.cpp            | 24 ++++---------------
 test/libsolidity/SolidityExecutionFramework.h |  3 ---
 test/libsolidity/util/Common.cpp              | 13 ++++++----
 test/libsolidity/util/Common.h                |  5 ++--
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index e578dd6ac9..7b79def1ed 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -22,6 +22,7 @@
  */
 
 #include <test/libsolidity/SolidityExecutionFramework.h>
+#include <test/libsolidity/util/Common.h>
 
 #include <liblangutil/DebugInfoSelection.h>
 #include <liblangutil/Exceptions.h>
@@ -48,12 +49,12 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 {
 	if (_mainSourceName.has_value())
 		solAssert(_sourceCode.find(_mainSourceName.value()) != _sourceCode.end(), "");
-	map<string, string> sourcesWithPreamble = _sourceCode;
-	for (auto& entry: sourcesWithPreamble)
-		entry.second = addPreamble(entry.second);
 
 	m_compiler.reset();
-	m_compiler.setSources(sourcesWithPreamble);
+	m_compiler.setSources(withPreamble(
+		_sourceCode,
+		solidity::test::CommonOptions::get().useABIEncoderV1 // _addAbicoderV1Pragma
+	));
 	m_compiler.setLibraries(_libraryAddresses);
 	m_compiler.setRevertStringBehaviour(m_revertStrings);
 	m_compiler.setEVMVersion(m_evmVersion);
@@ -141,18 +142,3 @@ bytes SolidityExecutionFramework::compileContract(
 		_libraryAddresses
 	);
 }
-
-string SolidityExecutionFramework::addPreamble(string const& _sourceCode)
-{
-	// Silence compiler version warning
-	string preamble = "pragma solidity >=0.0;\n";
-	if (_sourceCode.find("SPDX-License-Identifier:") == string::npos)
-		preamble += "// SPDX-License-Identifier: unlicensed\n";
-	if (
-		solidity::test::CommonOptions::get().useABIEncoderV1 &&
-		_sourceCode.find("pragma experimental ABIEncoderV2;") == string::npos &&
-		_sourceCode.find("pragma abicoder") == string::npos
-	)
-		preamble += "pragma abicoder v1;\n";
-	return preamble + _sourceCode;
-}
diff --git a/test/libsolidity/SolidityExecutionFramework.h b/test/libsolidity/SolidityExecutionFramework.h
index c2cea6600a..f91ba758f0 100644
--- a/test/libsolidity/SolidityExecutionFramework.h
+++ b/test/libsolidity/SolidityExecutionFramework.h
@@ -79,9 +79,6 @@ class SolidityExecutionFramework: public solidity::test::ExecutionFramework
 		std::map<std::string, solidity::test::Address> const& _libraryAddresses = {}
 	);
 
-	/// Returns @param _sourceCode prefixed with the version pragma and the abi coder v1 pragma,
-	/// the latter only if it is forced.
-	static std::string addPreamble(std::string const& _sourceCode);
 protected:
 	using CompilerStack = solidity::frontend::CompilerStack;
 	std::optional<uint8_t> m_eofVersion;
diff --git a/test/libsolidity/util/Common.cpp b/test/libsolidity/util/Common.cpp
index 8d065a4630..5ed6901f40 100644
--- a/test/libsolidity/util/Common.cpp
+++ b/test/libsolidity/util/Common.cpp
@@ -22,25 +22,30 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
-string test::withPreamble(string const& _sourceCode)
+string test::withPreamble(string const& _sourceCode, bool _addAbicoderV1Pragma)
 {
 	static string const versionPragma = "pragma solidity >=0.0;\n";
 	static string const licenseComment = "// SPDX-License-Identifier: GPL-3.0\n";
+	static string const abicoderPragma = "pragma abicoder v1;\n";
 
-	// NOTE: this check is intentionally loose to match weird cases.
+	// NOTE: These checks are intentionally loose to match weird cases.
 	// We can manually adjust a test case where this causes problem.
 	bool licenseMissing = _sourceCode.find("SPDX-License-Identifier:") == string::npos;
+	bool abicoderMissing =
+		_sourceCode.find("pragma experimental ABIEncoderV2;") == string::npos &&
+		_sourceCode.find("pragma abicoder") == string::npos;
 
 	return
 		versionPragma +
 		(licenseMissing ? licenseComment : "") +
+		(abicoderMissing && _addAbicoderV1Pragma ? abicoderPragma : "") +
 		_sourceCode;
 }
 
-StringMap test::withPreamble(StringMap _sources)
+StringMap test::withPreamble(StringMap _sources, bool _addAbicoderV1Pragma)
 {
 	for (auto&& [sourceName, source]: _sources)
-		source = withPreamble(source);
+		source = withPreamble(source, _addAbicoderV1Pragma);
 
 	return _sources;
 }
diff --git a/test/libsolidity/util/Common.h b/test/libsolidity/util/Common.h
index d030360784..a424d92d96 100644
--- a/test/libsolidity/util/Common.h
+++ b/test/libsolidity/util/Common.h
@@ -26,9 +26,10 @@ namespace solidity::frontend::test
 {
 
 /// @returns @p _sourceCode prefixed with the version pragma and the SPDX license identifier.
-std::string withPreamble(std::string const& _sourceCode);
+/// Can optionally also insert an abicoder pragma when missing.
+std::string withPreamble(std::string const& _sourceCode, bool _addAbicoderV1Pragma = false);
 
 /// @returns a copy of @p _sources with preamble prepended to all sources.
-StringMap withPreamble(StringMap _sources);
+StringMap withPreamble(StringMap _sources, bool _addAbicoderV1Pragma = false);
 
 } // namespace solidity::frontend::test

From 2baf9d4d8261395d837c6f96d6779a4f026d0bb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 11 Aug 2023 14:54:22 +0200
Subject: [PATCH 1550/1748] Put stripPreReleaseWarning() next to withPreamble()

---
 test/libsolidity/util/Common.cpp | 16 ++++++++++++++++
 test/libsolidity/util/Common.h   |  2 ++
 test/solc/Common.cpp             | 15 +--------------
 test/solc/Common.h               |  2 --
 4 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/test/libsolidity/util/Common.cpp b/test/libsolidity/util/Common.cpp
index 5ed6901f40..e5dddb721d 100644
--- a/test/libsolidity/util/Common.cpp
+++ b/test/libsolidity/util/Common.cpp
@@ -18,6 +18,8 @@
 
 #include <test/libsolidity/util/Common.h>
 
+#include <regex>
+
 using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
@@ -49,3 +51,17 @@ StringMap test::withPreamble(StringMap _sources, bool _addAbicoderV1Pragma)
 
 	return _sources;
 }
+
+string test::stripPreReleaseWarning(string const& _stderrContent)
+{
+	static regex const preReleaseWarningRegex{
+		R"(Warning( \(3805\))?: This is a pre-release compiler version, please do not use it in production\.\n)"
+		R"((\n)?)"
+	};
+	static regex const noOutputRegex{
+		R"(Compiler run successful, no output requested\.\n)"
+	};
+
+	string output = regex_replace(_stderrContent, preReleaseWarningRegex, "");
+	return regex_replace(std::move(output), noOutputRegex, "");
+}
diff --git a/test/libsolidity/util/Common.h b/test/libsolidity/util/Common.h
index a424d92d96..3f1750a66b 100644
--- a/test/libsolidity/util/Common.h
+++ b/test/libsolidity/util/Common.h
@@ -32,4 +32,6 @@ std::string withPreamble(std::string const& _sourceCode, bool _addAbicoderV1Prag
 /// @returns a copy of @p _sources with preamble prepended to all sources.
 StringMap withPreamble(StringMap _sources, bool _addAbicoderV1Pragma = false);
 
+std::string stripPreReleaseWarning(std::string const& _stderrContent);
+
 } // namespace solidity::frontend::test
diff --git a/test/solc/Common.cpp b/test/solc/Common.cpp
index 8e2e329e4f..24acd6b6c8 100644
--- a/test/solc/Common.cpp
+++ b/test/solc/Common.cpp
@@ -17,6 +17,7 @@
 // SPDX-License-Identifier: GPL-3.0
 
 #include <test/solc/Common.h>
+#include <test/libsolidity/util/Common.h>
 
 #include <solc/CommandLineInterface.h>
 
@@ -79,17 +80,3 @@ test::OptionsReaderAndMessages test::runCLI(
 		stripPreReleaseWarning(serr.str()),
 	};
 }
-
-string test::stripPreReleaseWarning(string const& _stderrContent)
-{
-	static regex const preReleaseWarningRegex{
-		R"(Warning( \(3805\))?: This is a pre-release compiler version, please do not use it in production\.\n)"
-		R"((\n)?)"
-	};
-	static regex const noOutputRegex{
-		R"(Compiler run successful, no output requested\.\n)"
-	};
-
-	string output = regex_replace(_stderrContent, preReleaseWarningRegex, "");
-	return regex_replace(std::move(output), noOutputRegex, "");
-}
diff --git a/test/solc/Common.h b/test/solc/Common.h
index 69131bf2ca..e2ddee6913 100644
--- a/test/solc/Common.h
+++ b/test/solc/Common.h
@@ -67,6 +67,4 @@ OptionsReaderAndMessages runCLI(
 	std::string const& _standardInputContent = ""
 );
 
-std::string stripPreReleaseWarning(std::string const& _stderrContent);
-
 } // namespace solidity::frontend::test

From 368ea01bb25f835d9221d2b574535c2883f928bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 17 Aug 2023 18:35:20 +0200
Subject: [PATCH 1551/1748] BytesUtils: Don't introduce garbage when formatting
 byte vectors shorter than expected

---
 test/libsolidity/util/BytesUtils.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp
index f2a5db7af2..47cdc17830 100644
--- a/test/libsolidity/util/BytesUtils.cpp
+++ b/test/libsolidity/util/BytesUtils.cpp
@@ -26,6 +26,8 @@
 
 #include <boost/algorithm/string.hpp>
 
+#include <algorithm>
+#include <iterator>
 #include <iomanip>
 #include <memory>
 #include <regex>
@@ -253,7 +255,8 @@ std::string BytesUtils::formatFixedPoint(bytes const& _bytes, bool _signed, size
 string BytesUtils::formatRawBytes(
 	bytes const& _bytes,
 	solidity::frontend::test::ParameterList const& _parameters,
-	string _linePrefix)
+	string _linePrefix
+)
 {
 	stringstream os;
 	ParameterList parameters;
@@ -263,16 +266,19 @@ string BytesUtils::formatRawBytes(
 		parameters = ContractABIUtils::defaultParameters((_bytes.size() + 31) / 32);
 	else
 		parameters = _parameters;
+	soltestAssert(ContractABIUtils::encodingSize(parameters) >= _bytes.size());
 
 	for (auto const& parameter: parameters)
 	{
-		bytes byteRange{it, it + static_cast<long>(parameter.abiType.size)};
+		long actualSize = min(distance(it, _bytes.end()), static_cast<long>(parameter.abiType.size));
+		bytes byteRange(parameter.abiType.size, 0);
+		copy(it, it + actualSize, byteRange.begin());
 
 		os << _linePrefix << byteRange;
 		if (&parameter != &parameters.back())
 			os << endl;
 
-		it += static_cast<long>(parameter.abiType.size);
+		it += actualSize;
 	}
 
 	return os.str();
@@ -368,11 +374,13 @@ string BytesUtils::formatBytesRange(
 		parameters = ContractABIUtils::defaultParameters((_bytes.size() + 31) / 32);
 	else
 		parameters = _parameters;
-
+	soltestAssert(ContractABIUtils::encodingSize(parameters) >= _bytes.size());
 
 	for (auto const& parameter: parameters)
 	{
-		bytes byteRange{it, it + static_cast<long>(parameter.abiType.size)};
+		long actualSize = min(distance(it, _bytes.end()), static_cast<long>(parameter.abiType.size));
+		bytes byteRange(parameter.abiType.size, 0);
+		copy(it, it + actualSize, byteRange.begin());
 
 		if (!parameter.matchesBytes(byteRange))
 			AnsiColorized(
@@ -386,7 +394,7 @@ string BytesUtils::formatBytesRange(
 		if (&parameter != &parameters.back())
 			os << ", ";
 
-		it += static_cast<long>(parameter.abiType.size);
+		it += actualSize;
 	}
 
 	return os.str();

From 0f5aacefa0bdd2cd7b1fff1f17525e0f240a6c60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 17 Aug 2023 19:52:57 +0200
Subject: [PATCH 1552/1748] BytesUtils: Don't format parameters shorter than 32
 bytes as integers

---
 test/libsolidity/util/BytesUtils.cpp | 30 ++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp
index 47cdc17830..57d7e12c6f 100644
--- a/test/libsolidity/util/BytesUtils.cpp
+++ b/test/libsolidity/util/BytesUtils.cpp
@@ -263,7 +263,20 @@ string BytesUtils::formatRawBytes(
 	auto it = _bytes.begin();
 
 	if (_bytes.size() != ContractABIUtils::encodingSize(_parameters))
-		parameters = ContractABIUtils::defaultParameters((_bytes.size() + 31) / 32);
+	{
+		// Interpret all full 32-byte values as integers.
+		parameters = ContractABIUtils::defaultParameters(_bytes.size() / 32);
+
+		// We'd introduce trailing zero bytes if we interpreted the final bit as an integer.
+		// We want a right-aligned sequence of bytes instead.
+		if (_bytes.size() % 32 != 0)
+			parameters.push_back({
+				bytes(),
+				"",
+				ABIType{ABIType::HexString, ABIType::AlignRight, _bytes.size() % 32},
+				FormatInfo{},
+			});
+	}
 	else
 		parameters = _parameters;
 	soltestAssert(ContractABIUtils::encodingSize(parameters) >= _bytes.size());
@@ -371,7 +384,20 @@ string BytesUtils::formatBytesRange(
 	auto it = _bytes.begin();
 
 	if (_bytes.size() != ContractABIUtils::encodingSize(_parameters))
-		parameters = ContractABIUtils::defaultParameters((_bytes.size() + 31) / 32);
+	{
+		// Interpret all full 32-byte values as integers.
+		parameters = ContractABIUtils::defaultParameters(_bytes.size() / 32);
+
+		// We'd introduce trailing zero bytes if we interpreted the final bit as an integer.
+		// We want a right-aligned sequence of bytes instead.
+		if (_bytes.size() % 32 != 0)
+			parameters.push_back({
+				bytes(),
+				"",
+				ABIType{ABIType::HexString, ABIType::AlignRight, _bytes.size() % 32},
+				FormatInfo{},
+			});
+	}
 	else
 		parameters = _parameters;
 	soltestAssert(ContractABIUtils::encodingSize(parameters) >= _bytes.size());

From 397a5543a4b8a42cb97d76b76181394abfd69be5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 17 Aug 2023 20:45:16 +0200
Subject: [PATCH 1553/1748] fixup! BytesUtils: Don't introduce garbage when
 formatting byte vectors shorter than expected

---
 test/libsolidity/util/BytesUtils.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp
index 57d7e12c6f..58d1baacd6 100644
--- a/test/libsolidity/util/BytesUtils.cpp
+++ b/test/libsolidity/util/BytesUtils.cpp
@@ -283,7 +283,10 @@ string BytesUtils::formatRawBytes(
 
 	for (auto const& parameter: parameters)
 	{
-		long actualSize = min(distance(it, _bytes.end()), static_cast<long>(parameter.abiType.size));
+		long actualSize = min(
+			distance(it, _bytes.end()),
+			static_cast<ParameterList::difference_type>(parameter.abiType.size)
+		);
 		bytes byteRange(parameter.abiType.size, 0);
 		copy(it, it + actualSize, byteRange.begin());
 
@@ -404,7 +407,10 @@ string BytesUtils::formatBytesRange(
 
 	for (auto const& parameter: parameters)
 	{
-		long actualSize = min(distance(it, _bytes.end()), static_cast<long>(parameter.abiType.size));
+		long actualSize = min(
+			distance(it, _bytes.end()),
+			static_cast<ParameterList::difference_type>(parameter.abiType.size)
+		);
 		bytes byteRange(parameter.abiType.size, 0);
 		copy(it, it + actualSize, byteRange.begin());
 

From ad7932555d70542acf38d78651e9f6b4191058ec Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 17 Aug 2023 15:53:20 +0200
Subject: [PATCH 1554/1748] Purge using namespace std from libsolutil

---
 libsolutil/CommonData.cpp         | 41 +++++++++---------
 libsolutil/CommonIO.cpp           | 25 ++++++-----
 libsolutil/Exceptions.cpp         | 11 +++--
 libsolutil/IndentedWriter.cpp     | 13 +++---
 libsolutil/IpfsHash.cpp           | 15 ++++---
 libsolutil/JSON.cpp               | 28 ++++++-------
 libsolutil/Keccak256.cpp          |  2 -
 libsolutil/StringUtils.cpp        | 45 ++++++++++----------
 libsolutil/SwarmHash.cpp          |  5 +--
 libsolutil/TemporaryDirectory.cpp | 11 +++--
 libsolutil/Whiskers.cpp           | 69 +++++++++++++++----------------
 scripts/check_style.sh            |  1 +
 12 files changed, 127 insertions(+), 139 deletions(-)

diff --git a/libsolutil/CommonData.cpp b/libsolutil/CommonData.cpp
index 437a090c2c..69f08308c2 100644
--- a/libsolutil/CommonData.cpp
+++ b/libsolutil/CommonData.cpp
@@ -29,7 +29,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 
@@ -41,7 +40,7 @@ static char const* lowerHexChars = "0123456789abcdef";
 
 }
 
-string solidity::util::toHex(uint8_t _data, HexCase _case)
+std::string solidity::util::toHex(uint8_t _data, HexCase _case)
 {
 	assertThrow(_case != HexCase::Mixed, BadHexCase, "Mixed case can only be used for byte arrays.");
 
@@ -53,7 +52,7 @@ string solidity::util::toHex(uint8_t _data, HexCase _case)
 	};
 }
 
-string solidity::util::toHex(bytes const& _data, HexPrefix _prefix, HexCase _case)
+std::string solidity::util::toHex(bytes const& _data, HexPrefix _prefix, HexCase _case)
 {
 	std::string ret(_data.size() * 2 + (_prefix == HexPrefix::Add ? 2 : 0), 0);
 
@@ -90,7 +89,7 @@ int solidity::util::fromHex(char _i, WhenError _throw)
 	if (_i >= 'A' && _i <= 'F')
 		return _i - 'A' + 10;
 	if (_throw == WhenError::Throw)
-		assertThrow(false, BadHexCharacter, to_string(_i));
+		assertThrow(false, BadHexCharacter, std::to_string(_i));
 	else
 		return -1;
 }
@@ -125,31 +124,31 @@ bytes solidity::util::fromHex(std::string const& _s, WhenError _throw)
 }
 
 
-bool solidity::util::passesAddressChecksum(string const& _str, bool _strict)
+bool solidity::util::passesAddressChecksum(std::string const& _str, bool _strict)
 {
-	string s = _str.substr(0, 2) == "0x" ? _str : "0x" + _str;
+	std::string s = _str.substr(0, 2) == "0x" ? _str : "0x" + _str;
 
 	if (s.length() != 42)
 		return false;
 
 	if (!_strict && (
-		s.find_first_of("abcdef") == string::npos ||
-		s.find_first_of("ABCDEF") == string::npos
+		s.find_first_of("abcdef") == std::string::npos ||
+		s.find_first_of("ABCDEF") == std::string::npos
 	))
 		return true;
 
 	return s == solidity::util::getChecksummedAddress(s);
 }
 
-string solidity::util::getChecksummedAddress(string const& _addr)
+std::string solidity::util::getChecksummedAddress(std::string const& _addr)
 {
-	string s = _addr.substr(0, 2) == "0x" ? _addr.substr(2) : _addr;
+	std::string s = _addr.substr(0, 2) == "0x" ? _addr.substr(2) : _addr;
 	assertThrow(s.length() == 40, InvalidAddress, "");
-	assertThrow(s.find_first_not_of("0123456789abcdefABCDEF") == string::npos, InvalidAddress, "");
+	assertThrow(s.find_first_not_of("0123456789abcdefABCDEF") == std::string::npos, InvalidAddress, "");
 
 	h256 hash = keccak256(boost::algorithm::to_lower_copy(s, std::locale::classic()));
 
-	string ret = "0x";
+	std::string ret = "0x";
 	for (unsigned i = 0; i < 40; ++i)
 	{
 		char addressCharacter = s[i];
@@ -162,16 +161,16 @@ string solidity::util::getChecksummedAddress(string const& _addr)
 	return ret;
 }
 
-bool solidity::util::isValidHex(string const& _string)
+bool solidity::util::isValidHex(std::string const& _string)
 {
 	if (_string.substr(0, 2) != "0x")
 		return false;
-	if (_string.find_first_not_of("0123456789abcdefABCDEF", 2) != string::npos)
+	if (_string.find_first_not_of("0123456789abcdefABCDEF", 2) != std::string::npos)
 		return false;
 	return true;
 }
 
-bool solidity::util::isValidDecimal(string const& _string)
+bool solidity::util::isValidDecimal(std::string const& _string)
 {
 	if (_string.empty())
 		return false;
@@ -180,12 +179,12 @@ bool solidity::util::isValidDecimal(string const& _string)
 	// No leading zeros
 	if (_string.front() == '0')
 		return false;
-	if (_string.find_first_not_of("0123456789") != string::npos)
+	if (_string.find_first_not_of("0123456789") != std::string::npos)
 		return false;
 	return true;
 }
 
-string solidity::util::formatAsStringOrNumber(string const& _value)
+std::string solidity::util::formatAsStringOrNumber(std::string const& _value)
 {
 	assertThrow(_value.length() <= 32, StringTooLong, "String to be formatted longer than 32 bytes.");
 
@@ -197,9 +196,9 @@ string solidity::util::formatAsStringOrNumber(string const& _value)
 }
 
 
-string solidity::util::escapeAndQuoteString(string const& _input)
+std::string solidity::util::escapeAndQuoteString(std::string const& _input)
 {
-	string out;
+	std::string out;
 
 	for (char c: _input)
 		if (c == '\\')
@@ -214,8 +213,8 @@ string solidity::util::escapeAndQuoteString(string const& _input)
 			out += "\\t";
 		else if (!isPrint(c))
 		{
-			ostringstream o;
-			o << "\\x" << std::hex << setfill('0') << setw(2) << (unsigned)(unsigned char)(c);
+			std::ostringstream o;
+			o << "\\x" << std::hex << std::setfill('0') << std::setw(2) << (unsigned)(unsigned char)(c);
 			out += o.str();
 		}
 		else
diff --git a/libsolutil/CommonIO.cpp b/libsolutil/CommonIO.cpp
index 6089f4db66..06ce23a024 100644
--- a/libsolutil/CommonIO.cpp
+++ b/libsolutil/CommonIO.cpp
@@ -31,7 +31,6 @@
 #include <termios.h>
 #endif
 
-using namespace std;
 using namespace solidity::util;
 
 namespace
@@ -55,35 +54,35 @@ inline T readFile(boost::filesystem::path const& _file)
 
 	// get length of file:
 	is.seekg(0, is.end);
-	streamoff length = is.tellg();
+	std::streamoff length = is.tellg();
 	if (length == 0)
 		return ret; // do not read empty file (MSVC does not like it)
 	is.seekg(0, is.beg);
 
 	ret.resize((static_cast<size_t>(length) + c_elementSize - 1) / c_elementSize);
-	is.read(const_cast<char*>(reinterpret_cast<char const*>(ret.data())), static_cast<streamsize>(length));
+	is.read(const_cast<char*>(reinterpret_cast<char const*>(ret.data())), static_cast<std::streamsize>(length));
 	return ret;
 }
 
 }
 
-string solidity::util::readFileAsString(boost::filesystem::path const& _file)
+std::string solidity::util::readFileAsString(boost::filesystem::path const& _file)
 {
-	return readFile<string>(_file);
+	return readFile<std::string>(_file);
 }
 
-string solidity::util::readUntilEnd(istream& _stdin)
+std::string solidity::util::readUntilEnd(std::istream& _stdin)
 {
-	ostringstream ss;
+	std::ostringstream ss;
 	ss << _stdin.rdbuf();
 	return ss.str();
 }
 
-string solidity::util::readBytes(istream& _input, size_t _length)
+std::string solidity::util::readBytes(std::istream& _input, size_t _length)
 {
-	string output;
+	std::string output;
 	output.resize(_length);
-	_input.read(output.data(), static_cast<streamsize>(_length));
+	_input.read(output.data(), static_cast<std::streamsize>(_length));
 	// If read() reads fewer bytes it sets failbit in addition to eofbit.
 	if (_input.fail())
 		output.resize(static_cast<size_t>(_input.gcount()));
@@ -135,10 +134,10 @@ class DisableConsoleBuffering
 int solidity::util::readStandardInputChar()
 {
 	DisableConsoleBuffering disableConsoleBuffering;
-	return cin.get();
+	return std::cin.get();
 }
 
-string solidity::util::absolutePath(string const& _path, string const& _reference)
+std::string solidity::util::absolutePath(std::string const& _path, std::string const& _reference)
 {
 	boost::filesystem::path p(_path);
 	// Anything that does not start with `.` is an absolute path.
@@ -158,6 +157,6 @@ string solidity::util::absolutePath(string const& _path, string const& _referenc
 	return result.generic_string();
 }
 
-string solidity::util::sanitizePath(string const& _path) {
+std::string solidity::util::sanitizePath(std::string const& _path) {
 	return boost::filesystem::path(_path).generic_string();
 }
diff --git a/libsolutil/Exceptions.cpp b/libsolutil/Exceptions.cpp
index fa4021d3be..00fe3e26ce 100644
--- a/libsolutil/Exceptions.cpp
+++ b/libsolutil/Exceptions.cpp
@@ -18,13 +18,12 @@
 
 #include <libsolutil/Exceptions.h>
 
-using namespace std;
 using namespace solidity::util;
 
 char const* Exception::what() const noexcept
 {
 	// Return the comment if available.
-	if (string const* cmt = comment())
+	if (std::string const* cmt = comment())
 		return cmt->data();
 
 	// Fallback to base what().
@@ -33,20 +32,20 @@ char const* Exception::what() const noexcept
 	return std::exception::what();
 }
 
-string Exception::lineInfo() const
+std::string Exception::lineInfo() const
 {
 	char const* const* file = boost::get_error_info<boost::throw_file>(*this);
 	int const* line = boost::get_error_info<boost::throw_line>(*this);
-	string ret;
+	std::string ret;
 	if (file)
 		ret += *file;
 	ret += ':';
 	if (line)
-		ret += to_string(*line);
+		ret += std::to_string(*line);
 	return ret;
 }
 
-string const* Exception::comment() const noexcept
+std::string const* Exception::comment() const noexcept
 {
 	return boost::get_error_info<errinfo_comment>(*this);
 }
diff --git a/libsolutil/IndentedWriter.cpp b/libsolutil/IndentedWriter.cpp
index 0e0aded3cc..b2a3c06c93 100644
--- a/libsolutil/IndentedWriter.cpp
+++ b/libsolutil/IndentedWriter.cpp
@@ -23,21 +23,20 @@
 #include <libsolutil/IndentedWriter.h>
 #include <libsolutil/Assertions.h>
 
-using namespace std;
 using namespace solidity::util;
 
-string IndentedWriter::format() const
+std::string IndentedWriter::format() const
 {
-	string result;
+	std::string result;
 	for (auto const& line: m_lines)
-		result += string(line.indentation * 4, ' ') + line.contents + "\n";
+		result += std::string(line.indentation * 4, ' ') + line.contents + "\n";
 	return result;
 }
 
 void IndentedWriter::newLine()
 {
 	if (!m_lines.back().contents.empty())
-		m_lines.emplace_back(Line{string(), m_lines.back().indentation});
+		m_lines.emplace_back(Line{std::string(), m_lines.back().indentation});
 }
 
 void IndentedWriter::indent()
@@ -53,12 +52,12 @@ void IndentedWriter::unindent()
 	m_lines.back().indentation--;
 }
 
-void IndentedWriter::add(string const& _str)
+void IndentedWriter::add(std::string const& _str)
 {
 	m_lines.back().contents += _str;
 }
 
-void IndentedWriter::addLine(string const& _line)
+void IndentedWriter::addLine(std::string const& _line)
 {
 	newLine();
 	add(_line);
diff --git a/libsolutil/IpfsHash.cpp b/libsolutil/IpfsHash.cpp
index dbf411dc78..3599b71218 100644
--- a/libsolutil/IpfsHash.cpp
+++ b/libsolutil/IpfsHash.cpp
@@ -23,7 +23,6 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Numeric.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 
@@ -56,11 +55,11 @@ bytes encodeLinkData(bytes const& _data)
 	return bytes{0x12} + varintEncoding(_data.size()) + _data;
 }
 
-string base58Encode(bytes const& _data)
+std::string base58Encode(bytes const& _data)
 {
-	static string const alphabet{"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"};
+	static std::string const alphabet{"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"};
 	bigint data(util::toHex(_data, HexPrefix::Add));
-	string output;
+	std::string output;
 	while (data)
 	{
 		output += alphabet[static_cast<size_t>(data % alphabet.size())];
@@ -84,7 +83,7 @@ struct Chunk
 	size_t blockSize = 0;
 };
 
-using Chunks = vector<Chunk>;
+using Chunks = std::vector<Chunk>;
 
 Chunk combineLinks(Chunks& _links)
 {
@@ -153,7 +152,7 @@ bytes groupChunksBottomUp(Chunks _currentLevel)
 }
 }
 
-bytes solidity::util::ipfsHash(string _data)
+bytes solidity::util::ipfsHash(std::string _data)
 {
 	size_t const maxChunkSize = 1024 * 256;
 	size_t chunkCount = _data.length() / maxChunkSize + (_data.length() % maxChunkSize > 0 ? 1 : 0);
@@ -164,7 +163,7 @@ bytes solidity::util::ipfsHash(string _data)
 	for (size_t chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++)
 	{
 		bytes chunkBytes = asBytes(
-			_data.substr(chunkIndex * maxChunkSize, min(maxChunkSize, _data.length() - chunkIndex * maxChunkSize))
+			_data.substr(chunkIndex * maxChunkSize, std::min(maxChunkSize, _data.length() - chunkIndex * maxChunkSize))
 		);
 
 		bytes lengthAsVarint = varintEncoding(chunkBytes.size());
@@ -197,7 +196,7 @@ bytes solidity::util::ipfsHash(string _data)
 	return groupChunksBottomUp(std::move(allChunks));
 }
 
-string solidity::util::ipfsHashBase58(string _data)
+std::string solidity::util::ipfsHashBase58(std::string _data)
 {
 	return base58Encode(ipfsHash(std::move(_data)));
 }
diff --git a/libsolutil/JSON.cpp b/libsolutil/JSON.cpp
index d27982acb3..27dcf677f2 100644
--- a/libsolutil/JSON.cpp
+++ b/libsolutil/JSON.cpp
@@ -30,8 +30,6 @@
 #include <map>
 #include <memory>
 
-using namespace std;
-
 static_assert(
 	(JSONCPP_VERSION_MAJOR == 1) && (JSONCPP_VERSION_MINOR == 9) && (JSONCPP_VERSION_PATCH == 3),
 	"Unexpected jsoncpp version: " JSONCPP_VERSION_STRING ". Expecting 1.9.3."
@@ -47,7 +45,7 @@ namespace
 class StreamWriterBuilder: public Json::StreamWriterBuilder
 {
 public:
-	explicit StreamWriterBuilder(map<string, Json::Value> const& _settings)
+	explicit StreamWriterBuilder(std::map<std::string, Json::Value> const& _settings)
 	{
 		for (auto const& iter: _settings)
 			this->settings_[iter.first] = iter.second;
@@ -68,10 +66,10 @@ class StrictModeCharReaderBuilder: public Json::CharReaderBuilder
 /// \param _input JSON input string
 /// \param _builder StreamWriterBuilder that is used to create new Json::StreamWriter
 /// \return serialized json object
-string print(Json::Value const& _input, Json::StreamWriterBuilder const& _builder)
+std::string print(Json::Value const& _input, Json::StreamWriterBuilder const& _builder)
 {
-	stringstream stream;
-	unique_ptr<Json::StreamWriter> writer(_builder.newStreamWriter());
+	std::stringstream stream;
+	std::unique_ptr<Json::StreamWriter> writer(_builder.newStreamWriter());
 	writer->write(_input, &stream);
 	return stream.str();
 }
@@ -82,9 +80,9 @@ string print(Json::Value const& _input, Json::StreamWriterBuilder const& _builde
 /// \param _json [out] resulting JSON object
 /// \param _errs [out] Formatted error messages
 /// \return \c true if the document was successfully parsed, \c false if an error occurred.
-bool parse(Json::CharReaderBuilder& _builder, string const& _input, Json::Value& _json, string* _errs)
+bool parse(Json::CharReaderBuilder& _builder, std::string const& _input, Json::Value& _json, std::string* _errs)
 {
-	unique_ptr<Json::CharReader> reader(_builder.newCharReader());
+	std::unique_ptr<Json::CharReader> reader(_builder.newCharReader());
 	return reader->parse(_input.c_str(), _input.c_str() + _input.length(), &_json, _errs);
 }
 
@@ -113,34 +111,34 @@ Json::Value removeNullMembers(Json::Value _json)
 	return _json;
 }
 
-string jsonPrettyPrint(Json::Value const& _input)
+std::string jsonPrettyPrint(Json::Value const& _input)
 {
 	return jsonPrint(_input, JsonFormat{ JsonFormat::Pretty });
 }
 
-string jsonCompactPrint(Json::Value const& _input)
+std::string jsonCompactPrint(Json::Value const& _input)
 {
 	return jsonPrint(_input, JsonFormat{ JsonFormat::Compact });
 }
 
-string jsonPrint(Json::Value const& _input, JsonFormat const& _format)
+std::string jsonPrint(Json::Value const& _input, JsonFormat const& _format)
 {
-	map<string, Json::Value> settings;
+	std::map<std::string, Json::Value> settings;
 	if (_format.format == JsonFormat::Pretty)
 	{
-		settings["indentation"] = string(_format.indent, ' ');
+		settings["indentation"] = std::string(_format.indent, ' ');
 		settings["enableYAMLCompatibility"] = true;
 	}
 	else
 		settings["indentation"] = "";
 	StreamWriterBuilder writerBuilder(settings);
-	string result = print(_input, writerBuilder);
+	std::string result = print(_input, writerBuilder);
 	if (_format.format == JsonFormat::Pretty)
 		boost::replace_all(result, " \n", "\n");
 	return result;
 }
 
-bool jsonParseStrict(string const& _input, Json::Value& _json, string* _errs /* = nullptr */)
+bool jsonParseStrict(std::string const& _input, Json::Value& _json, std::string* _errs /* = nullptr */)
 {
 	static StrictModeCharReaderBuilder readerBuilder;
 	return parse(readerBuilder, _input, _json, _errs);
diff --git a/libsolutil/Keccak256.cpp b/libsolutil/Keccak256.cpp
index 2128049049..c54dedabeb 100644
--- a/libsolutil/Keccak256.cpp
+++ b/libsolutil/Keccak256.cpp
@@ -25,8 +25,6 @@
 #include <cstdint>
 #include <cstring>
 
-using namespace std;
-
 namespace solidity::util
 {
 
diff --git a/libsolutil/StringUtils.cpp b/libsolutil/StringUtils.cpp
index d1c96fb2e2..1dc86714d8 100644
--- a/libsolutil/StringUtils.cpp
+++ b/libsolutil/StringUtils.cpp
@@ -26,11 +26,10 @@
 #include <string>
 #include <vector>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 
-bool solidity::util::stringWithinDistance(string const& _str1, string const& _str2, size_t _maxDistance, size_t _lenThreshold)
+bool solidity::util::stringWithinDistance(std::string const& _str1, std::string const& _str2, size_t _maxDistance, size_t _lenThreshold)
 {
 	if (_str1 == _str2)
 		return true;
@@ -47,13 +46,13 @@ bool solidity::util::stringWithinDistance(string const& _str1, string const& _st
 	return distance <= _maxDistance && distance < n1 && distance < n2;
 }
 
-size_t solidity::util::stringDistance(string const& _str1, string const& _str2)
+size_t solidity::util::stringDistance(std::string const& _str1, std::string const& _str2)
 {
 	size_t n1 = _str1.size();
 	size_t n2 = _str2.size();
 	// Optimize by storing only last 2 rows and current row. So first index is considered modulo 3
 	// This is a two-dimensional array of size 3 x (n2 + 1).
-	vector<size_t> dp(3 * (n2 + 1));
+	std::vector<size_t> dp(3 * (n2 + 1));
 
 	// In this dp formulation of Damerau–Levenshtein distance we are assuming that the strings are 1-based to make base case storage easier.
 	// So index accesser to _name1 and _name2 have to be adjusted accordingly
@@ -61,25 +60,25 @@ size_t solidity::util::stringDistance(string const& _str1, string const& _str2)
 		for (size_t i2 = 0; i2 <= n2; ++i2)
 		{
 			size_t x = 0;
-			if (min(i1, i2) == 0) // base case
-				x = max(i1, i2);
+			if (std::min(i1, i2) == 0) // base case
+				x = std::max(i1, i2);
 			else
 			{
 				size_t left = dp[(i1 - 1) % 3 + i2 * 3];
 				size_t up = dp[(i1 % 3) + (i2 - 1) * 3];
 				size_t upleft = dp[((i1 - 1) % 3) + (i2 - 1) * 3];
 				// deletion and insertion
-				x = min(left + 1, up + 1);
+				x = std::min(left + 1, up + 1);
 				if (_str1[i1-1] == _str2[i2-1])
 					// same chars, can skip
-					x = min(x, upleft);
+					x = std::min(x, upleft);
 				else
 					// different chars so try substitution
-					x = min(x, upleft + 1);
+					x = std::min(x, upleft + 1);
 
 				// transposing
 				if (i1 > 1 && i2 > 1 && _str1[i1 - 1] == _str2[i2 - 2] && _str1[i1 - 2] == _str2[i2 - 1])
-					x = min(x, dp[((i1 - 2) % 3) + (i2 - 2) * 3] + 1);
+					x = std::min(x, dp[((i1 - 2) % 3) + (i2 - 2) * 3] + 1);
 			}
 			dp[(i1 % 3) + i2 * 3] = x;
 		}
@@ -87,9 +86,9 @@ size_t solidity::util::stringDistance(string const& _str1, string const& _str2)
 	return dp[(n1 % 3) + n2 * 3];
 }
 
-string solidity::util::quotedAlternativesList(vector<string> const& suggestions)
+std::string solidity::util::quotedAlternativesList(std::vector<std::string> const& suggestions)
 {
-	vector<string> quotedSuggestions;
+	std::vector<std::string> quotedSuggestions;
 
 	for (auto& suggestion: suggestions)
 		quotedSuggestions.emplace_back("\"" + suggestion + "\"");
@@ -97,20 +96,20 @@ string solidity::util::quotedAlternativesList(vector<string> const& suggestions)
 	return joinHumanReadable(quotedSuggestions, ", ", " or ");
 }
 
-string solidity::util::suffixedVariableNameList(string const& _baseName, size_t _startSuffix, size_t _endSuffix)
+std::string solidity::util::suffixedVariableNameList(std::string const& _baseName, size_t _startSuffix, size_t _endSuffix)
 {
-	string result;
+	std::string result;
 	if (_startSuffix < _endSuffix)
 	{
-		result = _baseName + to_string(_startSuffix++);
+		result = _baseName + std::to_string(_startSuffix++);
 		while (_startSuffix < _endSuffix)
-			result += ", " + _baseName + to_string(_startSuffix++);
+			result += ", " + _baseName + std::to_string(_startSuffix++);
 	}
 	else if (_endSuffix < _startSuffix)
 	{
-		result = _baseName + to_string(_endSuffix++);
+		result = _baseName + std::to_string(_endSuffix++);
 		while (_endSuffix < _startSuffix)
-			result = _baseName + to_string(_endSuffix++) + ", " + result;
+			result = _baseName + std::to_string(_endSuffix++) + ", " + result;
 	}
 	return result;
 }
@@ -119,7 +118,7 @@ namespace
 {
 
 /// Try to format as N * 2**x
-optional<string> tryFormatPowerOfTwo(bigint const& _value)
+std::optional<std::string> tryFormatPowerOfTwo(bigint const& _value)
 {
 	bigint prefix = _value;
 
@@ -128,7 +127,7 @@ optional<string> tryFormatPowerOfTwo(bigint const& _value)
 	for (; (prefix & 0xff) == 0; prefix >>= 8)
 		++i;
 	if (i <= 2)
-		return nullopt;
+		return std::nullopt;
 
 	// 0x100 yields 2**8 (N is 1 and redundant)
 	if (prefix == 1)
@@ -150,11 +149,11 @@ optional<string> tryFormatPowerOfTwo(bigint const& _value)
 
 }
 
-string solidity::util::formatNumberReadable(bigint const& _value, bool _useTruncation)
+std::string solidity::util::formatNumberReadable(bigint const& _value, bool _useTruncation)
 {
 	bool const isNegative = _value < 0;
 	bigint const absValue = isNegative ? (bigint(-1) * _value) : bigint(_value);
-	string const sign = isNegative ? "-" : "";
+	std::string const sign = isNegative ? "-" : "";
 
 	// smaller numbers return as decimal
 	if (absValue <= 0x1000000)
@@ -165,7 +164,7 @@ string solidity::util::formatNumberReadable(bigint const& _value, bool _useTrunc
 	else if (auto result = tryFormatPowerOfTwo(absValue + 1))
 		return {sign + *result + (isNegative ? " + 1" : " - 1")};
 
-	string str = toHex(toCompactBigEndian(absValue), HexPrefix::Add, HexCase::Mixed);
+	std::string str = toHex(toCompactBigEndian(absValue), HexPrefix::Add, HexCase::Mixed);
 
 	if (_useTruncation)
 	{
diff --git a/libsolutil/SwarmHash.cpp b/libsolutil/SwarmHash.cpp
index 32e798d160..cf47cb1593 100644
--- a/libsolutil/SwarmHash.cpp
+++ b/libsolutil/SwarmHash.cpp
@@ -22,7 +22,6 @@
 
 #include <libsolutil/Keccak256.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 
@@ -42,7 +41,7 @@ h256 swarmHashSimple(bytesConstRef _data, size_t _size)
 	return keccak256(toLittleEndian(_size) + _data.toBytes());
 }
 
-h256 swarmHashIntermediate(string const& _input, size_t _offset, size_t _length)
+h256 swarmHashIntermediate(std::string const& _input, size_t _offset, size_t _length)
 {
 	bytesConstRef ref;
 	bytes innerNodes;
@@ -104,7 +103,7 @@ h256 chunkHash(bytesConstRef const _data, bool _forceHigherLevel = false)
 
 }
 
-h256 solidity::util::bzzr0Hash(string const& _input)
+h256 solidity::util::bzzr0Hash(std::string const& _input)
 {
 	return swarmHashIntermediate(_input, 0, _input.size());
 }
diff --git a/libsolutil/TemporaryDirectory.cpp b/libsolutil/TemporaryDirectory.cpp
index e82d87cf21..ff45047941 100644
--- a/libsolutil/TemporaryDirectory.cpp
+++ b/libsolutil/TemporaryDirectory.cpp
@@ -26,7 +26,6 @@
 #include <regex>
 #include <iostream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 
@@ -42,8 +41,8 @@ TemporaryDirectory::TemporaryDirectory(std::string const& _prefix):
 }
 
 TemporaryDirectory::TemporaryDirectory(
-	vector<boost::filesystem::path> const& _subdirectories,
-	string const& _prefix
+	std::vector<boost::filesystem::path> const& _subdirectories,
+	std::string const& _prefix
 ):
 	TemporaryDirectory(_prefix)
 {
@@ -71,9 +70,9 @@ TemporaryDirectory::~TemporaryDirectory()
 	uintmax_t numRemoved = fs::remove_all(m_path, errorCode);
 	if (errorCode.value() != boost::system::errc::success)
 	{
-		cerr << "Failed to completely remove temporary directory '" << m_path << "'. ";
-		cerr << "Only " << numRemoved << " files were actually removed." << endl;
-		cerr << "Reason: " << errorCode.message() << endl;
+		std::cerr << "Failed to completely remove temporary directory '" << m_path << "'. ";
+		std::cerr << "Only " << numRemoved << " files were actually removed." << std::endl;
+		std::cerr << "Reason: " << errorCode.message() << std::endl;
 	}
 }
 
diff --git a/libsolutil/Whiskers.cpp b/libsolutil/Whiskers.cpp
index b6d3ebde0c..1f026d9464 100644
--- a/libsolutil/Whiskers.cpp
+++ b/libsolutil/Whiskers.cpp
@@ -28,16 +28,15 @@
 
 #include <regex>
 
-using namespace std;
 using namespace solidity::util;
 
-Whiskers::Whiskers(string _template):
+Whiskers::Whiskers(std::string _template):
 	m_template(std::move(_template))
 {
 	checkTemplateValid();
 }
 
-Whiskers& Whiskers::operator()(string _parameter, string _value)
+Whiskers& Whiskers::operator()(std::string _parameter, std::string _value)
 {
 	checkParameterValid(_parameter);
 	checkParameterUnknown(_parameter);
@@ -46,7 +45,7 @@ Whiskers& Whiskers::operator()(string _parameter, string _value)
 	return *this;
 }
 
-Whiskers& Whiskers::operator()(string _parameter, bool _value)
+Whiskers& Whiskers::operator()(std::string _parameter, bool _value)
 {
 	checkParameterValid(_parameter);
 	checkParameterUnknown(_parameter);
@@ -56,8 +55,8 @@ Whiskers& Whiskers::operator()(string _parameter, bool _value)
 }
 
 Whiskers& Whiskers::operator()(
-	string _listParameter,
-	vector<map<string, string>> _values
+	std::string _listParameter,
+	std::vector<std::map<std::string, std::string>> _values
 )
 {
 	checkParameterValid(_listParameter);
@@ -70,15 +69,15 @@ Whiskers& Whiskers::operator()(
 	return *this;
 }
 
-string Whiskers::render() const
+std::string Whiskers::render() const
 {
 	return replace(m_template, m_parameters, m_conditions, m_listParameters);
 }
 
 void Whiskers::checkTemplateValid() const
 {
-	regex validTemplate("<[#?!\\/]\\+{0,1}[a-zA-Z0-9_$-]+(?:[^a-zA-Z0-9_$>-]|$)");
-	smatch match;
+	std::regex validTemplate("<[#?!\\/]\\+{0,1}[a-zA-Z0-9_$-]+(?:[^a-zA-Z0-9_$>-]|$)");
+	std::smatch match;
 	assertThrow(
 		!regex_search(m_template, match, validTemplate),
 		WhiskersError,
@@ -86,9 +85,9 @@ void Whiskers::checkTemplateValid() const
 	);
 }
 
-void Whiskers::checkParameterValid(string const& _parameter) const
+void Whiskers::checkParameterValid(std::string const& _parameter) const
 {
-	static regex validParam("^" + paramRegex() + "$");
+	static std::regex validParam("^" + paramRegex() + "$");
 	assertThrow(
 		regex_match(_parameter, validParam),
 		WhiskersError,
@@ -96,7 +95,7 @@ void Whiskers::checkParameterValid(string const& _parameter) const
 	);
 }
 
-void Whiskers::checkParameterUnknown(string const& _parameter) const
+void Whiskers::checkParameterUnknown(std::string const& _parameter) const
 {
 	assertThrow(
 		!m_parameters.count(_parameter),
@@ -115,13 +114,13 @@ void Whiskers::checkParameterUnknown(string const& _parameter) const
 	);
 }
 
-void Whiskers::checkTemplateContainsTags(string const& _parameter, vector<string> const& _prefixes) const
+void Whiskers::checkTemplateContainsTags(std::string const& _parameter, std::vector<std::string> const& _prefixes) const
 {
 	for (auto const& prefix: _prefixes)
 	{
-		string tag{"<" + prefix + _parameter + ">"};
+		std::string tag{"<" + prefix + _parameter + ">"};
 		assertThrow(
-			m_template.find(tag) != string::npos,
+			m_template.find(tag) != std::string::npos,
 			WhiskersError,
 			"Tag '" + tag + "' not found in template:\n" + m_template
 		);
@@ -131,17 +130,17 @@ void Whiskers::checkTemplateContainsTags(string const& _parameter, vector<string
 namespace
 {
 template<class ReplaceCallback>
-string regex_replace(
-	string const& _source,
-	regex const& _pattern,
+std::string regex_replace(
+	std::string const& _source,
+	std::regex const& _pattern,
 	ReplaceCallback _replace,
-	regex_constants::match_flag_type _flags = regex_constants::match_default
+	std::regex_constants::match_flag_type _flags = std::regex_constants::match_default
 )
 {
-	sregex_iterator curMatch(_source.begin(), _source.end(), _pattern, _flags);
-	sregex_iterator matchEnd;
-	string::const_iterator lastMatchedPos(_source.cbegin());
-	string result;
+	std::sregex_iterator curMatch(_source.begin(), _source.end(), _pattern, _flags);
+	std::sregex_iterator matchEnd;
+	std::string::const_iterator lastMatchedPos(_source.cbegin());
+	std::string result;
 	while (curMatch != matchEnd)
 	{
 		result.append(curMatch->prefix().first, curMatch->prefix().second);
@@ -154,23 +153,23 @@ string regex_replace(
 }
 }
 
-string Whiskers::replace(
-	string const& _template,
+std::string Whiskers::replace(
+	std::string const& _template,
 	StringMap const& _parameters,
-	map<string, bool> const& _conditions,
-	map<string, vector<StringMap>> const& _listParameters
+	std::map<std::string, bool> const& _conditions,
+	std::map<std::string, std::vector<StringMap>> const& _listParameters
 )
 {
-	static regex listOrTag(
+	static std::regex listOrTag(
 		"<(" + paramRegex() + ")>|"
 		"<#(" + paramRegex() + ")>((?:.|\\r|\\n)*?)</\\2>|"
 		"<\\?(\\+?" + paramRegex() + ")>((?:.|\\r|\\n)*?)(<!\\4>((?:.|\\r|\\n)*?))?</\\4>"
 	);
-	return regex_replace(_template, listOrTag, [&](match_results<string::const_iterator> _match) -> string
+	return regex_replace(_template, listOrTag, [&](std::match_results<std::string::const_iterator> _match) -> std::string
 	{
-		string tagName(_match[1]);
-		string listName(_match[2]);
-		string conditionName(_match[4]);
+		std::string tagName(_match[1]);
+		std::string listName(_match[2]);
+		std::string conditionName(_match[4]);
 		if (!tagName.empty())
 		{
 			assertThrow(
@@ -184,12 +183,12 @@ string Whiskers::replace(
 		}
 		else if (!listName.empty())
 		{
-			string templ(_match[3]);
+			std::string templ(_match[3]);
 			assertThrow(
 				_listParameters.count(listName),
 				WhiskersError, "List parameter " + listName + " not set."
 			);
-			string replacement;
+			std::string replacement;
 			for (auto const& parameters: _listParameters.at(listName))
 				replacement += replace(templ, joinMaps(_parameters, parameters), _conditions);
 			return replacement;
@@ -200,7 +199,7 @@ string Whiskers::replace(
 			bool conditionValue = false;
 			if (conditionName[0] == '+')
 			{
-				string tag = conditionName.substr(1);
+				std::string tag = conditionName.substr(1);
 
 				if (_parameters.count(tag))
 					conditionValue = !_parameters.at(tag).empty();
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 7c1167490a..5288cb9a5c 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -33,6 +33,7 @@ NAMESPACE_STD_FREE_FILES=(
     libsolidity/interface/*
     libsolidity/lsp/*
     libsolidity/parsing/*
+    libsolutil/*
 )
 
 (

From 969aea6d33bcabea2ddee42b2085ed72b76cafed Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Mon, 29 May 2023 05:58:48 -0300
Subject: [PATCH 1555/1748] Added new kind of test: check for specific
 properties of AST

---
 libsolutil/JSON.cpp                           |  15 ++
 libsolutil/JSON.h                             |   9 +
 test/CMakeLists.txt                           |   2 +
 test/InteractiveTests.h                       |   4 +-
 test/libsolidity/ASTPropertyTest.cpp          | 204 ++++++++++++++++++
 test/libsolidity/ASTPropertyTest.h            |  66 ++++++
 .../astPropertyTests/blank_test_case.sol      |   9 +
 .../multiple_nested_properties_per_node.sol   |  13 ++
 .../multiple_properties_per_node.sol          |  11 +
 .../astPropertyTests/nested_properties.sol    |  17 ++
 .../property_expectation_with_colon.sol       |   9 +
 .../astPropertyTests/simple_properties.sol    |  12 ++
 test/tools/CMakeLists.txt                     |   1 +
 13 files changed, 371 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/ASTPropertyTest.cpp
 create mode 100644 test/libsolidity/ASTPropertyTest.h
 create mode 100644 test/libsolidity/astPropertyTests/blank_test_case.sol
 create mode 100644 test/libsolidity/astPropertyTests/multiple_nested_properties_per_node.sol
 create mode 100644 test/libsolidity/astPropertyTests/multiple_properties_per_node.sol
 create mode 100644 test/libsolidity/astPropertyTests/nested_properties.sol
 create mode 100644 test/libsolidity/astPropertyTests/property_expectation_with_colon.sol
 create mode 100644 test/libsolidity/astPropertyTests/simple_properties.sol

diff --git a/libsolutil/JSON.cpp b/libsolutil/JSON.cpp
index 27dcf677f2..ea75ada0f7 100644
--- a/libsolutil/JSON.cpp
+++ b/libsolutil/JSON.cpp
@@ -144,4 +144,19 @@ bool jsonParseStrict(std::string const& _input, Json::Value& _json, std::string*
 	return parse(readerBuilder, _input, _json, _errs);
 }
 
+std::optional<Json::Value> jsonValueByPath(Json::Value const& _node, std::string_view _jsonPath)
+{
+	if (!_node.isObject() || _jsonPath.empty())
+		return {};
+
+	std::string memberName = std::string(_jsonPath.substr(0, _jsonPath.find_first_of('.')));
+	if (!_node.isMember(memberName))
+		return {};
+
+	if (memberName == _jsonPath)
+		return _node[memberName];
+
+	return jsonValueByPath(_node[memberName], _jsonPath.substr(memberName.size() + 1));
+}
+
 } // namespace solidity::util
diff --git a/libsolutil/JSON.h b/libsolutil/JSON.h
index 905859f6db..f368739e1a 100644
--- a/libsolutil/JSON.h
+++ b/libsolutil/JSON.h
@@ -26,6 +26,8 @@
 #include <json/json.h>
 
 #include <string>
+#include <string_view>
+#include <optional>
 
 namespace solidity::util
 {
@@ -67,6 +69,13 @@ std::string jsonPrint(Json::Value const& _input, JsonFormat const& _format);
 /// \return \c true if the document was successfully parsed, \c false if an error occurred.
 bool jsonParseStrict(std::string const& _input, Json::Value& _json, std::string* _errs = nullptr);
 
+/// Retrieves the value specified by @p _jsonPath by from a series of nested JSON dictionaries.
+/// @param _jsonPath A dot-separated series of dictionary keys.
+/// @param _node The node representing the start of the path.
+/// @returns The value of the last key on the path. @a nullptr if any node on the path descends
+/// into something that is not a dictionary or the key is not present.
+std::optional<Json::Value> jsonValueByPath(Json::Value const& _node, std::string_view _jsonPath);
+
 namespace detail
 {
 
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 1ea70fe7a1..119104aca6 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -105,6 +105,8 @@ set(libsolidity_sources
     libsolidity/ViewPureChecker.cpp
     libsolidity/analysis/FunctionCallGraph.cpp
     libsolidity/interface/FileReader.cpp
+    libsolidity/ASTPropertyTest.h
+    libsolidity/ASTPropertyTest.cpp
 )
 detect_stray_source_files("${libsolidity_sources}" "libsolidity/")
 
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
index 9e054c109c..52877af48c 100644
--- a/test/InteractiveTests.h
+++ b/test/InteractiveTests.h
@@ -21,6 +21,7 @@
 #include <test/TestCase.h>
 #include <test/libsolidity/ABIJsonTest.h>
 #include <test/libsolidity/ASTJSONTest.h>
+#include <test/libsolidity/ASTPropertyTest.h>
 #include <test/libsolidity/GasTest.h>
 #include <test/libsolidity/MemoryGuardTest.h>
 #include <test/libsolidity/SyntaxTest.h>
@@ -76,7 +77,8 @@ Testsuite const g_interactiveTestsuites[] = {
 	{"JSON ABI",               "libsolidity", "ABIJson",               false, false, &ABIJsonTest::create},
 	{"SMT Checker",            "libsolidity", "smtCheckerTests",       true,  false, &SMTCheckerTest::create},
 	{"Gas Estimates",          "libsolidity", "gasTests",              false, false, &GasTest::create},
-	{"Memory Guard Tests",     "libsolidity", "memoryGuardTests",     false, false, &MemoryGuardTest::create},
+	{"Memory Guard",           "libsolidity", "memoryGuardTests",      false, false, &MemoryGuardTest::create},
+	{"AST Properties",         "libsolidity", "astPropertyTests",      false, false, &ASTPropertyTest::create},
 };
 
 }
diff --git a/test/libsolidity/ASTPropertyTest.cpp b/test/libsolidity/ASTPropertyTest.cpp
new file mode 100644
index 0000000000..194b2c92b2
--- /dev/null
+++ b/test/libsolidity/ASTPropertyTest.cpp
@@ -0,0 +1,204 @@
+/*
+	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/libsolidity/ASTPropertyTest.h>
+#include <test/Common.h>
+
+#include <libsolidity/ast/ASTJsonExporter.h>
+#include <libsolidity/interface/CompilerStack.h>
+
+#include <liblangutil/Common.h>
+#include <liblangutil/SourceReferenceFormatter.h>
+#include <libsolutil/JSON.h>
+
+#include <boost/algorithm/string.hpp>
+#include <boost/throw_exception.hpp>
+
+#include <range/v3/algorithm/find_if.hpp>
+#include <range/v3/range/conversion.hpp>
+#include <range/v3/view/split.hpp>
+
+#include <queue>
+
+using namespace solidity::util;
+using namespace solidity::langutil;
+using namespace solidity::frontend;
+using namespace solidity::frontend::test;
+using namespace solidity;
+using namespace std;
+
+ASTPropertyTest::ASTPropertyTest(string const& _filename):
+	TestCase(_filename)
+{
+	if (!boost::algorithm::ends_with(_filename, ".sol"))
+		BOOST_THROW_EXCEPTION(runtime_error("Not a Solidity file: \"" + _filename + "\"."));
+
+	m_source = m_reader.source();
+	readExpectations();
+	soltestAssert(m_tests.size() > 0, "No tests specified in " + _filename);
+}
+
+string ASTPropertyTest::formatExpectations(bool _obtainedResult)
+{
+	string expectations;
+	for (string const& testId: m_testOrder)
+	{
+		soltestAssert(m_tests.count(testId) > 0);
+		expectations +=
+			testId +
+			": " +
+			(_obtainedResult ? m_tests[testId].obtainedValue : m_tests[testId].expectedValue)
+			+ "\n";
+	}
+	return expectations;
+}
+
+vector<StringPair> ASTPropertyTest::readKeyValuePairs(string const& _input)
+{
+	vector<StringPair> result;
+	for (string line: _input | ranges::views::split('\n') | ranges::to<vector<string>>)
+	{
+		boost::trim(line);
+		if (line.empty())
+			continue;
+
+		soltestAssert(
+			ranges::all_of(line, [](char c) { return isprint(c); }),
+			"Non-printable character(s) found in property test: " + line
+		);
+
+		auto colonPosition = line.find_first_of(':');
+		soltestAssert(colonPosition != string::npos, "Property test is missing a colon: " + line);
+
+		StringPair pair{
+			boost::trim_copy(line.substr(0, colonPosition)),
+			boost::trim_copy(line.substr(colonPosition + 1))
+		};
+		soltestAssert(!get<0>(pair).empty() != false, "Empty key in property test: " + line);
+		soltestAssert(!get<1>(pair).empty() != false, "Empty value in property test: " + line);
+
+		result.push_back(pair);
+	}
+	return result;
+}
+
+void ASTPropertyTest::readExpectations()
+{
+	for (auto const& [testId, testExpectation]: readKeyValuePairs(m_reader.simpleExpectations()))
+	{
+		soltestAssert(m_tests.count(testId) == 0, "More than one expectation for test \"" + testId + "\"");
+		m_tests.emplace(testId, Test{"", testExpectation, ""});
+		m_testOrder.push_back(testId);
+	}
+	m_expectation = formatExpectations(false /* _obtainedResult */);
+}
+
+void ASTPropertyTest::extractTestsFromAST(Json::Value const& _astJson)
+{
+	queue<Json::Value> nodesToVisit;
+	nodesToVisit.push(_astJson);
+
+	while (!nodesToVisit.empty())
+	{
+		Json::Value& node = nodesToVisit.front();
+
+		if (node.isArray())
+			for (auto&& member: node)
+				nodesToVisit.push(member);
+		else if (node.isObject())
+			for (string const& memberName: node.getMemberNames())
+			{
+				if (memberName != "documentation")
+				{
+					nodesToVisit.push(node[memberName]);
+					continue;
+				}
+
+				string nodeDocstring = node["documentation"].isObject() ?
+					node["documentation"]["text"].asString() :
+					node["documentation"].asString();
+				soltestAssert(!nodeDocstring.empty());
+
+				vector<StringPair> pairs = readKeyValuePairs(nodeDocstring);
+				if (pairs.empty())
+					continue;
+
+				for (auto const& [testId, testedProperty]: pairs)
+				{
+					soltestAssert(
+						m_tests.count(testId) > 0,
+						"Test \"" + testId + "\" does not have a corresponding expected value."
+					);
+					soltestAssert(
+						m_tests[testId].property.empty(),
+						"Test \"" + testId + "\" was already defined before."
+					);
+					m_tests[testId].property = testedProperty;
+
+					soltestAssert(node.isMember("nodeType"));
+					optional<Json::Value> propertyNode = jsonValueByPath(node, testedProperty);
+					soltestAssert(
+						propertyNode.has_value(),
+						node["nodeType"].asString() + " node does not have a property named \""s + testedProperty + "\""
+					);
+					soltestAssert(
+						!propertyNode->isObject() && !propertyNode->isArray(),
+						"Property \"" + testedProperty + "\" is an object or an array."
+					);
+					m_tests[testId].obtainedValue = propertyNode->asString();
+				}
+			}
+
+		nodesToVisit.pop();
+	}
+
+	auto firstTestWithoutProperty = ranges::find_if(
+		m_tests,
+		[&](auto const& _testCase) { return _testCase.second.property.empty(); }
+	);
+	soltestAssert(
+		firstTestWithoutProperty == ranges::end(m_tests),
+		"AST property not defined for test \"" + firstTestWithoutProperty->first + "\""
+	);
+
+	m_obtainedResult = formatExpectations(true /* _obtainedResult */);
+}
+
+TestCase::TestResult ASTPropertyTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
+{
+	CompilerStack compiler;
+
+	compiler.setSources({{
+		"A",
+		"pragma solidity >=0.0;\n// SPDX-License-Identifier: GPL-3.0\n" + m_source
+	}});
+	compiler.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
+	compiler.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
+	if (!compiler.parseAndAnalyze())
+		BOOST_THROW_EXCEPTION(runtime_error(
+			"Parsing contract failed" +
+			SourceReferenceFormatter::formatErrorInformation(compiler.errors(), compiler, _formatted)
+		));
+
+	Json::Value astJson = ASTJsonExporter(compiler.state()).toJson(compiler.ast("A"));
+	soltestAssert(astJson);
+
+	extractTestsFromAST(astJson);
+
+	return checkResult(_stream, _linePrefix, _formatted);
+}
diff --git a/test/libsolidity/ASTPropertyTest.h b/test/libsolidity/ASTPropertyTest.h
new file mode 100644
index 0000000000..e4cec05280
--- /dev/null
+++ b/test/libsolidity/ASTPropertyTest.h
@@ -0,0 +1,66 @@
+/*
+	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
+
+#pragma once
+
+#include <test/TestCase.h>
+
+#include <libsolutil/JSON.h>
+
+#include <string>
+#include <vector>
+
+namespace solidity::frontend
+{
+class CompilerStack;
+}
+
+namespace solidity::frontend::test
+{
+
+using StringPair = std::pair<std::string, std::string>;
+
+class ASTPropertyTest: public TestCase
+{
+public:
+	static std::unique_ptr<TestCase> create(Config const& _config)
+	{
+		return std::make_unique<ASTPropertyTest>(_config.filename);
+	}
+	ASTPropertyTest(std::string const& _filename);
+
+	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool const _formatted = false) override;
+
+private:
+	struct Test
+	{
+		std::string property;
+		std::string expectedValue;
+		std::string obtainedValue;
+	};
+
+	void readExpectations();
+	std::vector<StringPair> readKeyValuePairs(std::string const& _input);
+	void extractTestsFromAST(Json::Value const& _astJson);
+	std::string formatExpectations(bool _obtainedResult = true);
+
+	std::vector<std::string> m_testOrder;
+	std::map<std::string, Test> m_tests;
+};
+
+}
diff --git a/test/libsolidity/astPropertyTests/blank_test_case.sol b/test/libsolidity/astPropertyTests/blank_test_case.sol
new file mode 100644
index 0000000000..fc2fa58092
--- /dev/null
+++ b/test/libsolidity/astPropertyTests/blank_test_case.sol
@@ -0,0 +1,9 @@
+/// TestCase1: name
+contract C {
+    ///
+    ///
+    function f() public pure { }
+}
+// ----
+// TestCase1: C
+//
diff --git a/test/libsolidity/astPropertyTests/multiple_nested_properties_per_node.sol b/test/libsolidity/astPropertyTests/multiple_nested_properties_per_node.sol
new file mode 100644
index 0000000000..09841828f9
--- /dev/null
+++ b/test/libsolidity/astPropertyTests/multiple_nested_properties_per_node.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public pure {
+        /// TestCase1: condition.operator
+        /// TestCase2: initializationExpression.initialValue.value
+        /// TestCase3: loopExpression.expression.subExpression.name
+        for(uint i = 1; i < 42; i++) {
+        }
+    }
+}
+// ----
+// TestCase1: <
+// TestCase2: 1
+// TestCase3: i
diff --git a/test/libsolidity/astPropertyTests/multiple_properties_per_node.sol b/test/libsolidity/astPropertyTests/multiple_properties_per_node.sol
new file mode 100644
index 0000000000..c62aa6ac12
--- /dev/null
+++ b/test/libsolidity/astPropertyTests/multiple_properties_per_node.sol
@@ -0,0 +1,11 @@
+contract C {
+    /// TestCase1: name
+    /// TestCase2: functionSelector
+    /// TestCase3: visibility
+    function singleFunction() public pure {
+    }
+}
+// ----
+// TestCase1: singleFunction
+// TestCase2: 3d33252c
+// TestCase3: public
diff --git a/test/libsolidity/astPropertyTests/nested_properties.sol b/test/libsolidity/astPropertyTests/nested_properties.sol
new file mode 100644
index 0000000000..324fe64c9a
--- /dev/null
+++ b/test/libsolidity/astPropertyTests/nested_properties.sol
@@ -0,0 +1,17 @@
+contract C {
+    function f() public pure {
+        /// TestCase1: condition.operator
+        for(uint i = 0; i < 42; ++i) {
+        }
+        /// TestCase2: initializationExpression.initialValue.value
+        for(uint i = 1; i < 42; i = i * 2) {
+        }
+        /// TestCase3: loopExpression.expression.subExpression.name
+        for(uint i = 0; i < 42; i++) {
+        }
+    }
+}
+// ----
+// TestCase1: <
+// TestCase2: 1
+// TestCase3: i
diff --git a/test/libsolidity/astPropertyTests/property_expectation_with_colon.sol b/test/libsolidity/astPropertyTests/property_expectation_with_colon.sol
new file mode 100644
index 0000000000..7e228a56f4
--- /dev/null
+++ b/test/libsolidity/astPropertyTests/property_expectation_with_colon.sol
@@ -0,0 +1,9 @@
+/// TestCase1: nameLocation
+/// TestCase2: src
+contract C {
+    function f() public pure {
+    }
+}
+// ----
+// TestCase1: 115:1:-1
+// TestCase2: 106:51:-1
diff --git a/test/libsolidity/astPropertyTests/simple_properties.sol b/test/libsolidity/astPropertyTests/simple_properties.sol
new file mode 100644
index 0000000000..d7485fbecb
--- /dev/null
+++ b/test/libsolidity/astPropertyTests/simple_properties.sol
@@ -0,0 +1,12 @@
+/// TestContractC: name
+contract C {
+    /// TestStateVarX: stateVariable
+    uint x;
+    /// TestFunctionF: visibility
+    function f() public pure {
+    }
+}
+// ----
+// TestContractC: C
+// TestStateVarX: true
+// TestFunctionF: public
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index d5a95676d3..2e57718bda 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -32,6 +32,7 @@ add_executable(isoltest
 	../ExecutionFramework.cpp
 	../libsolidity/ABIJsonTest.cpp
 	../libsolidity/ASTJSONTest.cpp
+	../libsolidity/ASTPropertyTest.cpp
 	../libsolidity/SMTCheckerTest.cpp
 	../libyul/Common.cpp
 	../libyul/ControlFlowGraphTest.cpp

From e8d050a1cefbf8e03da085df264990bbdeac24ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 14 Jun 2023 06:30:25 +0200
Subject: [PATCH 1556/1748] Simplify redundant state check in
 CompilerStack::analyze()

---
 libsolidity/interface/CompilerStack.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 234ae5d009..320f2e9c51 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -440,7 +440,7 @@ void CompilerStack::importASTs(std::map<std::string, Json::Value> const& _source
 
 bool CompilerStack::analyze()
 {
-	if (m_stackState != ParsedAndImported || m_stackState >= AnalysisPerformed)
+	if (m_stackState != ParsedAndImported)
 		solThrow(CompilerError, "Must call analyze only after parsing was performed.");
 
 	if (!resolveImports())

From a15ef59eece9df631599e9fa6a899f32e742102a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 12 Jun 2023 12:03:34 +0200
Subject: [PATCH 1557/1748] Remove the ability to produce an AST in presence of
 errors in --error-recovery mode

This reverts commit 7fd7cc1e765e7e907604dd96fde85be22bde4f80.
---
 libsolidity/ast/AST.h                         |  12 +-
 libsolidity/ast/ASTJsonExporter.cpp           |   4 +-
 libsolidity/interface/CompilerStack.cpp       |  89 ++++-----
 libsolidity/interface/CompilerStack.h         |  11 +-
 libsolidity/interface/StandardCompiler.cpp    |  17 +-
 libsolidity/lsp/LanguageServer.cpp            |   4 +-
 scripts/check_style.sh                        |   2 +-
 solc/CommandLineInterface.cpp                 | 106 +++++-----
 .../cmdlineTests/recovery_ast_constructor/err |   3 -
 .../recovery_ast_constructor/exit             |   1 +
 .../recovery_ast_constructor/input.sol        |   7 +-
 .../recovery_ast_constructor/output           | 188 ------------------
 .../recovery_ast_empty_contract/err           |   3 -
 .../recovery_ast_empty_contract/exit          |   1 +
 .../recovery_standard_json/output.json        |  58 +-----
 test/libsolidity/ASTJSONTest.cpp              |   4 +-
 .../analysis/FunctionCallGraph.cpp            |   2 +-
 17 files changed, 119 insertions(+), 393 deletions(-)
 create mode 100644 test/cmdlineTests/recovery_ast_constructor/exit
 delete mode 100644 test/cmdlineTests/recovery_ast_constructor/output
 create mode 100644 test/cmdlineTests/recovery_ast_empty_contract/exit

diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index 9d754202da..ca23b0d619 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -87,15 +87,19 @@ class ASTNode
 	static void listAccept(std::vector<T> const& _list, ASTVisitor& _visitor)
 	{
 		for (T const& element: _list)
-			if (element)
-				element->accept(_visitor);
+		{
+			solAssert(element);
+			element->accept(_visitor);
+		}
 	}
 	template <class T>
 	static void listAccept(std::vector<T> const& _list, ASTConstVisitor& _visitor)
 	{
 		for (T const& element: _list)
-			if (element)
-				element->accept(_visitor);
+		{
+			solAssert(element);
+			element->accept(_visitor);
+		}
 	}
 
 	/// @returns a copy of the vector containing only the nodes which derive from T.
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index ac847a3394..b159178095 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -560,7 +560,7 @@ bool ASTJsonExporter::visit(EventDefinition const& _node)
 		std::make_pair("parameters", toJson(_node.parameterList())),
 		std::make_pair("anonymous", _node.isAnonymous())
 	};
-	if (m_stackState >= CompilerStack::State::AnalysisPerformed)
+	if (m_stackState >= CompilerStack::State::AnalysisSuccessful)
 			_attributes.emplace_back(
 				std::make_pair(
 					"eventSelector",
@@ -579,7 +579,7 @@ bool ASTJsonExporter::visit(ErrorDefinition const& _node)
 		std::make_pair("documentation", _node.documentation() ? toJson(*_node.documentation()) : Json::nullValue),
 		std::make_pair("parameters", toJson(_node.parameterList()))
 	};
-	if (m_stackState >= CompilerStack::State::AnalysisPerformed)
+	if (m_stackState >= CompilerStack::State::AnalysisSuccessful)
 		_attributes.emplace_back(std::make_pair("errorSelector", _node.functionType(true)->externalIdentifierHex()));
 
 	setJsonNode(_node, "ErrorDefinition", std::move(_attributes));
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 320f2e9c51..8151a87e2d 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -307,7 +307,6 @@ void CompilerStack::addSMTLib2Response(h256 const& _hash, std::string const& _re
 void CompilerStack::reset(bool _keepSettings)
 {
 	m_stackState = Empty;
-	m_hasError = false;
 	m_sources.clear();
 	m_smtlib2Responses.clear();
 	m_unhandledSMTLib2Queries.clear();
@@ -403,16 +402,12 @@ bool CompilerStack::parse()
 		}
 	}
 
-	if (m_stopAfter <= Parsed)
-		m_stackState = Parsed;
-	else
-		m_stackState = ParsedAndImported;
 	if (Error::containsErrors(m_errorReporter.errors()))
-		m_hasError = true;
+		return false;
 
+	m_stackState = (m_stopAfter <= Parsed ? Parsed : ParsedAndImported);
 	storeContractDefinitions();
-
-	return !m_hasError;
+	return true;
 }
 
 void CompilerStack::importASTs(std::map<std::string, Json::Value> const& _sources)
@@ -441,7 +436,7 @@ void CompilerStack::importASTs(std::map<std::string, Json::Value> const& _source
 bool CompilerStack::analyze()
 {
 	if (m_stackState != ParsedAndImported)
-		solThrow(CompilerError, "Must call analyze only after parsing was performed.");
+		solThrow(CompilerError, "Must call analyze only after parsing was successful.");
 
 	if (!resolveImports())
 		return false;
@@ -628,11 +623,11 @@ bool CompilerStack::analyze()
 		noErrors = false;
 	}
 
-	m_stackState = AnalysisPerformed;
 	if (!noErrors)
-		m_hasError = true;
+		return false;
 
-	return !m_hasError;
+	m_stackState = AnalysisSuccessful;
+	return true;
 }
 
 bool CompilerStack::parseAndAnalyze(State _stopAfter)
@@ -642,7 +637,7 @@ bool CompilerStack::parseAndAnalyze(State _stopAfter)
 	bool success = parse();
 	if (m_stackState >= m_stopAfter)
 		return success;
-	if (success || m_parserErrorRecovery)
+	if (success)
 		success = analyze();
 	return success;
 }
@@ -675,16 +670,13 @@ bool CompilerStack::isRequestedContract(ContractDefinition const& _contract) con
 bool CompilerStack::compile(State _stopAfter)
 {
 	m_stopAfter = _stopAfter;
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		if (!parseAndAnalyze(_stopAfter))
 			return false;
 
 	if (m_stackState >= m_stopAfter)
 		return true;
 
-	if (m_hasError)
-		solThrow(CompilerError, "Called compile with errors.");
-
 	// Only compile contracts individually which have been requested.
 	std::map<ContractDefinition const*, std::shared_ptr<Compiler const>> otherCompilers;
 
@@ -763,7 +755,7 @@ std::vector<std::string> CompilerStack::contractNames() const
 
 std::string const CompilerStack::lastContractName(std::optional<std::string> const& _sourceName) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Parsing was not successful.");
 	// try to find some user-supplied contract
 	std::string contractName;
@@ -866,7 +858,7 @@ std::string const* CompilerStack::runtimeSourceMapping(std::string const& _contr
 
 std::string const CompilerStack::filesystemFriendlyName(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "No compiled contracts found.");
 
 	// Look up the contract (by its fully-qualified name)
@@ -980,7 +972,7 @@ std::map<std::string, unsigned> CompilerStack::sourceIndices() const
 
 Json::Value const& CompilerStack::contractABI(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	return contractABI(contract(_contractName));
@@ -988,7 +980,7 @@ Json::Value const& CompilerStack::contractABI(std::string const& _contractName)
 
 Json::Value const& CompilerStack::contractABI(Contract const& _contract) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
@@ -998,7 +990,7 @@ Json::Value const& CompilerStack::contractABI(Contract const& _contract) const
 
 Json::Value const& CompilerStack::storageLayout(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	return storageLayout(contract(_contractName));
@@ -1006,7 +998,7 @@ Json::Value const& CompilerStack::storageLayout(std::string const& _contractName
 
 Json::Value const& CompilerStack::storageLayout(Contract const& _contract) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
@@ -1016,7 +1008,7 @@ Json::Value const& CompilerStack::storageLayout(Contract const& _contract) const
 
 Json::Value const& CompilerStack::natspecUser(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	return natspecUser(contract(_contractName));
@@ -1024,7 +1016,7 @@ Json::Value const& CompilerStack::natspecUser(std::string const& _contractName)
 
 Json::Value const& CompilerStack::natspecUser(Contract const& _contract) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
@@ -1034,7 +1026,7 @@ Json::Value const& CompilerStack::natspecUser(Contract const& _contract) const
 
 Json::Value const& CompilerStack::natspecDev(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	return natspecDev(contract(_contractName));
@@ -1042,7 +1034,7 @@ Json::Value const& CompilerStack::natspecDev(std::string const& _contractName) c
 
 Json::Value const& CompilerStack::natspecDev(Contract const& _contract) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
@@ -1052,7 +1044,7 @@ Json::Value const& CompilerStack::natspecDev(Contract const& _contract) const
 
 Json::Value CompilerStack::interfaceSymbols(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	Json::Value interfaceSymbols(Json::objectValue);
@@ -1082,7 +1074,7 @@ Json::Value CompilerStack::interfaceSymbols(std::string const& _contractName) co
 
 bytes CompilerStack::cborMetadata(std::string const& _contractName, bool _forIR) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	return createCBORMetadata(contract(_contractName), _forIR);
@@ -1090,7 +1082,7 @@ bytes CompilerStack::cborMetadata(std::string const& _contractName, bool _forIR)
 
 std::string const& CompilerStack::metadata(Contract const& _contract) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
@@ -1120,7 +1112,7 @@ SourceUnit const& CompilerStack::ast(std::string const& _sourceName) const
 
 ContractDefinition const& CompilerStack::contractDefinition(std::string const& _contractName) const
 {
-	if (m_stackState < AnalysisPerformed)
+	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	return *contract(_contractName).contract;
@@ -1219,15 +1211,15 @@ bool CompilerStack::resolveImports()
 		if (sourcesSeen.count(_source))
 			return;
 		sourcesSeen.insert(_source);
-		if (_source->ast)
-			for (ASTPointer<ASTNode> const& node: _source->ast->nodes())
-				if (ImportDirective const* import = dynamic_cast<ImportDirective*>(node.get()))
-				{
-					std::string const& path = *import->annotation().absolutePath;
-					solAssert(m_sources.count(path), "");
-					import->annotation().sourceUnit = m_sources[path].ast.get();
-					toposort(&m_sources[path]);
-				}
+		solAssert(_source->ast);
+		for (ASTPointer<ASTNode> const& node: _source->ast->nodes())
+			if (ImportDirective const* import = dynamic_cast<ImportDirective*>(node.get()))
+			{
+				std::string const& path = *import->annotation().absolutePath;
+				solAssert(m_sources.count(path), "");
+				import->annotation().sourceUnit = m_sources[path].ast.get();
+				toposort(&m_sources[path]);
+			}
 		sourceOrder.push_back(_source);
 	};
 
@@ -1326,8 +1318,7 @@ void CompilerStack::assembleYul(
 	std::shared_ptr<evmasm::Assembly> _runtimeAssembly
 )
 {
-	solAssert(m_stackState >= AnalysisPerformed, "");
-	solAssert(!m_hasError, "");
+	solAssert(m_stackState >= AnalysisSuccessful, "");
 
 	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
 
@@ -1400,9 +1391,7 @@ void CompilerStack::compileContract(
 {
 	solAssert(!m_viaIR, "");
 	solUnimplementedAssert(!m_eofVersion.has_value(), "Experimental EOF support is only available for via-IR compilation.");
-	solAssert(m_stackState >= AnalysisPerformed, "");
-	if (m_hasError)
-		solThrow(CompilerError, "Called compile with errors.");
+	solAssert(m_stackState >= AnalysisSuccessful, "");
 
 	if (_otherCompilers.count(&_contract))
 		return;
@@ -1438,9 +1427,7 @@ void CompilerStack::compileContract(
 
 void CompilerStack::generateIR(ContractDefinition const& _contract)
 {
-	solAssert(m_stackState >= AnalysisPerformed, "");
-	if (m_hasError)
-		solThrow(CompilerError, "Called generateIR with errors.");
+	solAssert(m_stackState >= AnalysisSuccessful, "");
 
 	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
 	if (!compiledContract.yulIR.empty())
@@ -1502,9 +1489,7 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 
 void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 {
-	solAssert(m_stackState >= AnalysisPerformed, "");
-	if (m_hasError)
-		solThrow(CompilerError, "Called generateEVMFromIR with errors.");
+	solAssert(m_stackState >= AnalysisSuccessful, "");
 
 	if (!_contract.canBeDeployed())
 		return;
@@ -1535,7 +1520,7 @@ void CompilerStack::generateEVMFromIR(ContractDefinition const& _contract)
 
 CompilerStack::Contract const& CompilerStack::contract(std::string const& _contractName) const
 {
-	solAssert(m_stackState >= AnalysisPerformed, "");
+	solAssert(m_stackState >= AnalysisSuccessful, "");
 
 	auto it = m_contracts.find(_contractName);
 	if (it != m_contracts.end())
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 8880770b82..072333f9f0 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -86,8 +86,6 @@ class DeclarationContainer;
  * Easy to use and self-contained Solidity compiler with as few header dependencies as possible.
  * It holds state and can be used to either step through the compilation stages (and abort e.g.
  * before compilation to bytecode) or run the whole compilation in one call.
- * If error recovery is active, it is possible to progress through the stages even when
- * there are errors. In any case, producing code is only possible without errors.
  */
 class CompilerStack: public langutil::CharStreamProvider
 {
@@ -101,7 +99,7 @@ class CompilerStack: public langutil::CharStreamProvider
 		SourcesSet,
 		Parsed,
 		ParsedAndImported,
-		AnalysisPerformed,
+		AnalysisSuccessful,
 		CompilationSuccessful
 	};
 
@@ -137,10 +135,6 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// @returns the current state.
 	State state() const { return m_stackState; }
 
-	bool hasError() const { return m_hasError; }
-
-	bool compilationSuccessful() const { return m_stackState >= CompilationSuccessful; }
-
 	/// Resets the compiler to an empty state. Unless @a _keepSettings is set to true,
 	/// all settings are reset as well.
 	void reset(bool _keepSettings = false);
@@ -520,9 +514,6 @@ class CompilerStack: public langutil::CharStreamProvider
 	bool m_parserErrorRecovery = false;
 	State m_stackState = Empty;
 	CompilationSourceType m_compilationSourceType = CompilationSourceType::Solidity;
-	/// Whether or not there has been an error during processing.
-	/// If this is true, the stack will refuse to generate code.
-	bool m_hasError = false;
 	MetadataFormat m_metadataFormat = defaultMetadataFormat();
 };
 
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 20cec68ae0..d16a2742f7 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1317,21 +1317,18 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 	}
 
 	bool parsingSuccess = compilerStack.state() >= CompilerStack::State::Parsed;
-	bool analysisPerformed = compilerStack.state() >= CompilerStack::State::AnalysisPerformed;
+	bool analysisSuccess = compilerStack.state() >= CompilerStack::State::AnalysisSuccessful;
 	bool compilationSuccess = compilerStack.state() == CompilerStack::State::CompilationSuccessful;
 
-	if (compilerStack.hasError() && !_inputsAndSettings.parserErrorRecovery)
-		analysisPerformed = false;
-
 	// If analysis fails, the artifacts inside CompilerStack are potentially incomplete and must not be returned.
 	// Note that not completing analysis due to stopAfter does not count as a failure. It's neither failure nor success.
-	bool analysisFailed = !analysisPerformed && _inputsAndSettings.stopAfter >= CompilerStack::State::AnalysisPerformed;
+	bool analysisFailed = !analysisSuccess && _inputsAndSettings.stopAfter >= CompilerStack::State::AnalysisSuccessful;
 	bool compilationFailed = !compilationSuccess && binariesRequested;
 
 	/// Inconsistent state - stop here to receive error reports from users
 	if (
-		(compilationFailed || !analysisPerformed) &&
-		(errors.empty() && _inputsAndSettings.stopAfter >= CompilerStack::State::AnalysisPerformed)
+		(compilationFailed || !analysisSuccess) &&
+		(errors.empty() && _inputsAndSettings.stopAfter >= CompilerStack::State::AnalysisSuccessful)
 	)
 		return formatFatalError(Error::Type::InternalCompilerError, "No error reported, but compilation failed.");
 
@@ -1348,7 +1345,9 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 
 	output["sources"] = Json::objectValue;
 	unsigned sourceIndex = 0;
-	if (parsingSuccess && !analysisFailed && (!compilerStack.hasError() || _inputsAndSettings.parserErrorRecovery))
+	// NOTE: A case that will pass `parsingSuccess && !analysisFailed` but not `analysisSuccess` is
+	// stopAfter: parsing with no parsing errors.
+	if (parsingSuccess && !analysisFailed)
 		for (std::string const& sourceName: compilerStack.sourceNames())
 		{
 			Json::Value sourceResult = Json::objectValue;
@@ -1359,7 +1358,7 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		}
 
 	Json::Value contractsOutput = Json::objectValue;
-	for (std::string const& contractName: analysisPerformed ? compilerStack.contractNames() : std::vector<std::string>())
+	for (std::string const& contractName: analysisSuccess ? compilerStack.contractNames() : std::vector<std::string>())
 	{
 		size_t colon = contractName.rfind(':');
 		solAssert(colon != std::string::npos, "");
diff --git a/libsolidity/lsp/LanguageServer.cpp b/libsolidity/lsp/LanguageServer.cpp
index 81b95e05a1..2b8b62706d 100644
--- a/libsolidity/lsp/LanguageServer.cpp
+++ b/libsolidity/lsp/LanguageServer.cpp
@@ -265,7 +265,7 @@ void LanguageServer::compile()
 
 	m_compilerStack.reset(false);
 	m_compilerStack.setSources(m_fileRepository.sourceUnits());
-	m_compilerStack.compile(CompilerStack::State::AnalysisPerformed);
+	m_compilerStack.compile(CompilerStack::State::AnalysisSuccessful);
 }
 
 void LanguageServer::compileAndUpdateDiagnostics()
@@ -554,7 +554,7 @@ ASTNode const* LanguageServer::astNodeAtSourceLocation(std::string const& _sourc
 
 std::tuple<ASTNode const*, int> LanguageServer::astNodeAndOffsetAtSourceLocation(std::string const& _sourceUnitName, LineColumn const& _filePos)
 {
-	if (m_compilerStack.state() < CompilerStack::AnalysisPerformed)
+	if (m_compilerStack.state() < CompilerStack::AnalysisSuccessful)
 		return {nullptr, -1};
 	if (!m_fileRepository.sourceUnits().count(_sourceUnitName))
 		return {nullptr, -1};
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 5288cb9a5c..3a268e777b 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -41,7 +41,7 @@ REPO_ROOT="$(dirname "$0")"/..
 cd "$REPO_ROOT" || exit 1
 
 WHITESPACE=$(git grep -n -I -E "^.*[[:space:]]+$" |
-    grep -v "test/libsolidity/ASTJSON\|test/libsolidity/ASTRecoveryTests\|test/compilationTests/zeppelin/LICENSE\|${EXCLUDE_FILES_JOINED}" || true
+    grep -v "test/libsolidity/ASTJSON\|test/compilationTests/zeppelin/LICENSE\|${EXCLUDE_FILES_JOINED}" || true
 )
 
 if [[ "$WHITESPACE" != "" ]]
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 509279a715..8cef23bac6 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -805,7 +805,7 @@ void CommandLineInterface::compile()
 			formatter.printErrorInformation(*error);
 		}
 
-		if (!successful && !m_options.input.errorRecovery)
+		if (!successful)
 			solThrow(CommandLineExecutionError, "");
 	}
 	catch (CompilerError const& _exception)
@@ -844,6 +844,7 @@ void CommandLineInterface::handleCombinedJSON()
 
 	output[g_strVersion] = frontend::VersionString;
 	vector<string> contracts = m_compiler->contractNames();
+	bool compilationSuccess = m_compiler->state() >= CompilerStack::State::CompilationSuccessful;
 
 	if (!contracts.empty())
 		output[g_strContracts] = Json::Value(Json::objectValue);
@@ -854,35 +855,35 @@ void CommandLineInterface::handleCombinedJSON()
 			contractData[g_strAbi] = m_compiler->contractABI(contractName);
 		if (m_options.compiler.combinedJsonRequests->metadata)
 			contractData["metadata"] = m_compiler->metadata(contractName);
-		if (m_options.compiler.combinedJsonRequests->binary && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->binary && compilationSuccess)
 			contractData[g_strBinary] = m_compiler->object(contractName).toHex();
-		if (m_options.compiler.combinedJsonRequests->binaryRuntime && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->binaryRuntime && compilationSuccess)
 			contractData[g_strBinaryRuntime] = m_compiler->runtimeObject(contractName).toHex();
-		if (m_options.compiler.combinedJsonRequests->opcodes && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->opcodes && compilationSuccess)
 			contractData[g_strOpcodes] = evmasm::disassemble(m_compiler->object(contractName).bytecode, m_options.output.evmVersion);
-		if (m_options.compiler.combinedJsonRequests->asm_ && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->asm_ && compilationSuccess)
 			contractData[g_strAsm] = m_compiler->assemblyJSON(contractName);
-		if (m_options.compiler.combinedJsonRequests->storageLayout && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->storageLayout && compilationSuccess)
 			contractData[g_strStorageLayout] = m_compiler->storageLayout(contractName);
-		if (m_options.compiler.combinedJsonRequests->generatedSources && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->generatedSources && compilationSuccess)
 			contractData[g_strGeneratedSources] = m_compiler->generatedSources(contractName, false);
-		if (m_options.compiler.combinedJsonRequests->generatedSourcesRuntime && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->generatedSourcesRuntime && compilationSuccess)
 			contractData[g_strGeneratedSourcesRuntime] = m_compiler->generatedSources(contractName, true);
-		if (m_options.compiler.combinedJsonRequests->srcMap && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->srcMap && compilationSuccess)
 		{
 			auto map = m_compiler->sourceMapping(contractName);
 			contractData[g_strSrcMap] = map ? *map : "";
 		}
-		if (m_options.compiler.combinedJsonRequests->srcMapRuntime && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->srcMapRuntime && compilationSuccess)
 		{
 			auto map = m_compiler->runtimeSourceMapping(contractName);
 			contractData[g_strSrcMapRuntime] = map ? *map : "";
 		}
-		if (m_options.compiler.combinedJsonRequests->funDebug && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->funDebug && compilationSuccess)
 			contractData[g_strFunDebug] = StandardCompiler::formatFunctionDebugData(
 				m_compiler->object(contractName).functionDebugData
 			);
-		if (m_options.compiler.combinedJsonRequests->funDebugRuntime && m_compiler->compilationSuccessful())
+		if (m_options.compiler.combinedJsonRequests->funDebugRuntime && compilationSuccess)
 			contractData[g_strFunDebugRuntime] = StandardCompiler::formatFunctionDebugData(
 				m_compiler->runtimeObject(contractName).functionDebugData
 			);
@@ -1164,57 +1165,56 @@ void CommandLineInterface::outputCompilationResults()
 	// do we need AST output?
 	handleAst();
 
-	if (
-		!m_compiler->compilationSuccessful() &&
-		m_options.output.stopAfter == CompilerStack::State::CompilationSuccessful
-	)
-	{
-		serr() << endl << "Compilation halted after AST generation due to errors." << endl;
-		return;
-	}
-
-	vector<string> contracts = m_compiler->contractNames();
-	for (string const& contract: contracts)
+	CompilerOutputs astOutputSelection;
+	astOutputSelection.astCompactJson = true;
+	if (m_options.compiler.outputs != CompilerOutputs() && m_options.compiler.outputs != astOutputSelection)
 	{
-		if (needsHumanTargetedStdout(m_options))
-			sout() << endl << "======= " << contract << " =======" << endl;
+		// Currently AST is the only output allowed with --stop-after parsing. For all of the others
+		// we can safely assume that full compilation was performed and successful.
+		solAssert(m_options.output.stopAfter >= CompilerStack::State::CompilationSuccessful);
 
-		// do we need EVM assembly?
-		if (m_options.compiler.outputs.asm_ || m_options.compiler.outputs.asmJson)
+		for (string const& contract: m_compiler->contractNames())
 		{
-			string ret;
-			if (m_options.compiler.outputs.asmJson)
-				ret = util::jsonPrint(removeNullMembers(m_compiler->assemblyJSON(contract)), m_options.formatting.json);
-			else
-				ret = m_compiler->assemblyString(contract, m_fileReader.sourceUnits());
+			if (needsHumanTargetedStdout(m_options))
+				sout() << endl << "======= " << contract << " =======" << endl;
 
-			if (!m_options.output.dir.empty())
-				createFile(m_compiler->filesystemFriendlyName(contract) + (m_options.compiler.outputs.asmJson ? "_evm.json" : ".evm"), ret);
-			else
-				sout() << "EVM assembly:" << endl << ret << endl;
-		}
+			// do we need EVM assembly?
+			if (m_options.compiler.outputs.asm_ || m_options.compiler.outputs.asmJson)
+			{
+				string ret;
+				if (m_options.compiler.outputs.asmJson)
+					ret = util::jsonPrint(removeNullMembers(m_compiler->assemblyJSON(contract)), m_options.formatting.json);
+				else
+					ret = m_compiler->assemblyString(contract, m_fileReader.sourceUnits());
+
+				if (!m_options.output.dir.empty())
+					createFile(m_compiler->filesystemFriendlyName(contract) + (m_options.compiler.outputs.asmJson ? "_evm.json" : ".evm"), ret);
+				else
+					sout() << "EVM assembly:" << endl << ret << endl;
+			}
 
-		if (m_options.compiler.estimateGas)
-			handleGasEstimation(contract);
-
-		handleBytecode(contract);
-		handleIR(contract);
-		handleIRAst(contract);
-		handleIROptimized(contract);
-		handleIROptimizedAst(contract);
-		handleSignatureHashes(contract);
-		handleMetadata(contract);
-		handleABI(contract);
-		handleStorageLayout(contract);
-		handleNatspec(true, contract);
-		handleNatspec(false, contract);
-	} // end of contracts iteration
+			if (m_options.compiler.estimateGas)
+				handleGasEstimation(contract);
+
+			handleBytecode(contract);
+			handleIR(contract);
+			handleIRAst(contract);
+			handleIROptimized(contract);
+			handleIROptimizedAst(contract);
+			handleSignatureHashes(contract);
+			handleMetadata(contract);
+			handleABI(contract);
+			handleStorageLayout(contract);
+			handleNatspec(true, contract);
+			handleNatspec(false, contract);
+		} // end of contracts iteration
+	}
 
 	if (!m_hasOutput)
 	{
 		if (!m_options.output.dir.empty())
 			sout() << "Compiler run successful. Artifact(s) can be found in directory " << m_options.output.dir << "." << endl;
-		else if (contracts.empty())
+		else if (m_compiler->contractNames().empty())
 			sout() << "Compiler run successful. No contracts to compile." << endl;
 		else
 			sout() << "Compiler run successful. No output generated." << endl;
diff --git a/test/cmdlineTests/recovery_ast_constructor/err b/test/cmdlineTests/recovery_ast_constructor/err
index ecff59f7a7..41d3be0482 100644
--- a/test/cmdlineTests/recovery_ast_constructor/err
+++ b/test/cmdlineTests/recovery_ast_constructor/err
@@ -9,6 +9,3 @@ Warning: Recovered in Statement at ';'.
   |
 6 |     balances[tx.origin] = ; // missing RHS.
   |                           ^
-
-
-Compilation halted after AST generation due to errors.
diff --git a/test/cmdlineTests/recovery_ast_constructor/exit b/test/cmdlineTests/recovery_ast_constructor/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/recovery_ast_constructor/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/recovery_ast_constructor/input.sol b/test/cmdlineTests/recovery_ast_constructor/input.sol
index 8da09638ae..ff516d2ae0 100644
--- a/test/cmdlineTests/recovery_ast_constructor/input.sol
+++ b/test/cmdlineTests/recovery_ast_constructor/input.sol
@@ -6,12 +6,7 @@ contract Error1 {
     balances[tx.origin] = ; // missing RHS.
   }
 
-  // Without error recovery we stop due to the above error.
-  // Error recovery however recovers at the above ';'
-  // There should be an AST for the above, albeit with error
-  // nodes.
-
-  // This function parses properly and should give AST info.
+  // This function parses properly
   function five() public view returns(uint) {
     return 5;
   }
diff --git a/test/cmdlineTests/recovery_ast_constructor/output b/test/cmdlineTests/recovery_ast_constructor/output
deleted file mode 100644
index fd92fb7fa6..0000000000
--- a/test/cmdlineTests/recovery_ast_constructor/output
+++ /dev/null
@@ -1,188 +0,0 @@
-JSON AST (compact format):
-
-
-======= recovery_ast_constructor/input.sol =======
-{
-  "absolutePath": "recovery_ast_constructor/input.sol",
-  "exportedSymbols":
-  {
-    "Error1":
-    [
-      18
-    ]
-  },
-  "id": 19,
-  "license": "GPL-3.0",
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 1,
-      "literals":
-      [
-        "solidity",
-        ">=",
-        "0.0",
-        ".0"
-      ],
-      "nodeType": "PragmaDirective",
-      "src": "36:24:0"
-    },
-    {
-      "abstract": false,
-      "baseContracts": [],
-      "canonicalName": "Error1",
-      "contractDependencies": [],
-      "contractKind": "contract",
-      "fullyImplemented": true,
-      "id": 18,
-      "linearizedBaseContracts":
-      [
-        18
-      ],
-      "name": "Error1",
-      "nameLocation": "71:6:0",
-      "nodeType": "ContractDefinition",
-      "nodes":
-      [
-        {
-          "body":
-          {
-            "id": 8,
-            "nodeType": "Block",
-            "src": "96:49:0",
-            "statements":
-            [
-              null
-            ]
-          },
-          "id": 9,
-          "implemented": true,
-          "kind": "constructor",
-          "modifiers": [],
-          "name": "",
-          "nameLocation": "-1:-1:-1",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 2,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "93:2:0"
-          },
-          "returnParameters":
-          {
-            "id": 3,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "96:0:0"
-          },
-          "scope": 18,
-          "src": "82:63:0",
-          "stateMutability": "nonpayable",
-          "virtual": false,
-          "visibility": "public"
-        },
-        {
-          "body":
-          {
-            "id": 16,
-            "nodeType": "Block",
-            "src": "440:19:0",
-            "statements":
-            [
-              {
-                "expression":
-                {
-                  "hexValue": "35",
-                  "id": 14,
-                  "isConstant": false,
-                  "isLValue": false,
-                  "isPure": true,
-                  "kind": "number",
-                  "lValueRequested": false,
-                  "nodeType": "Literal",
-                  "src": "453:1:0",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_rational_5_by_1",
-                    "typeString": "int_const 5"
-                  },
-                  "value": "5"
-                },
-                "functionReturnParameters": 13,
-                "id": 15,
-                "nodeType": "Return",
-                "src": "446:8:0"
-              }
-            ]
-          },
-          "functionSelector": "af11c34c",
-          "id": 17,
-          "implemented": true,
-          "kind": "function",
-          "modifiers": [],
-          "name": "five",
-          "nameLocation": "407:4:0",
-          "nodeType": "FunctionDefinition",
-          "parameters":
-          {
-            "id": 10,
-            "nodeType": "ParameterList",
-            "parameters": [],
-            "src": "411:2:0"
-          },
-          "returnParameters":
-          {
-            "id": 13,
-            "nodeType": "ParameterList",
-            "parameters":
-            [
-              {
-                "constant": false,
-                "id": 12,
-                "mutability": "mutable",
-                "name": "",
-                "nameLocation": "-1:-1:-1",
-                "nodeType": "VariableDeclaration",
-                "scope": 17,
-                "src": "434:4:0",
-                "stateVariable": false,
-                "storageLocation": "default",
-                "typeDescriptions":
-                {
-                  "typeIdentifier": "t_uint256",
-                  "typeString": "uint256"
-                },
-                "typeName":
-                {
-                  "id": 11,
-                  "name": "uint",
-                  "nodeType": "ElementaryTypeName",
-                  "src": "434:4:0",
-                  "typeDescriptions":
-                  {
-                    "typeIdentifier": "t_uint256",
-                    "typeString": "uint256"
-                  }
-                },
-                "visibility": "internal"
-              }
-            ],
-            "src": "433:6:0"
-          },
-          "scope": 18,
-          "src": "398:61:0",
-          "stateMutability": "view",
-          "virtual": false,
-          "visibility": "public"
-        }
-      ],
-      "scope": 19,
-      "src": "62:399:0",
-      "usedErrors": [],
-      "usedEvents": []
-    }
-  ],
-  "src": "36:426:0"
-}
diff --git a/test/cmdlineTests/recovery_ast_empty_contract/err b/test/cmdlineTests/recovery_ast_empty_contract/err
index fed0544709..c047cc82a3 100644
--- a/test/cmdlineTests/recovery_ast_empty_contract/err
+++ b/test/cmdlineTests/recovery_ast_empty_contract/err
@@ -3,6 +3,3 @@ Error: Expected pragma, import directive or contract/interface/library/struct/en
   |
 3 | c
   | ^
-
-
-Compilation halted after AST generation due to errors.
diff --git a/test/cmdlineTests/recovery_ast_empty_contract/exit b/test/cmdlineTests/recovery_ast_empty_contract/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/recovery_ast_empty_contract/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/recovery_standard_json/output.json b/test/cmdlineTests/recovery_standard_json/output.json
index 110b706169..fa23fde251 100644
--- a/test/cmdlineTests/recovery_standard_json/output.json
+++ b/test/cmdlineTests/recovery_standard_json/output.json
@@ -42,61 +42,5 @@
             "type": "Warning"
         }
     ],
-    "sources":
-    {
-        "A":
-        {
-            "ast":
-            {
-                "absolutePath": "A",
-                "exportedSymbols":
-                {
-                    "Errort6":
-                    [
-                        3
-                    ]
-                },
-                "id": 4,
-                "license": "GPL-3.0",
-                "nodeType": "SourceUnit",
-                "nodes":
-                [
-                    {
-                        "id": 1,
-                        "literals":
-                        [
-                            "solidity",
-                            ">=",
-                            "0.0"
-                        ],
-                        "nodeType": "PragmaDirective",
-                        "src": "36:22:0"
-                    },
-                    {
-                        "abstract": false,
-                        "baseContracts": [],
-                        "canonicalName": "Errort6",
-                        "contractDependencies": [],
-                        "contractKind": "contract",
-                        "fullyImplemented": true,
-                        "id": 3,
-                        "linearizedBaseContracts":
-                        [
-                            3
-                        ],
-                        "name": "Errort6",
-                        "nameLocation": "68:7:0",
-                        "nodeType": "ContractDefinition",
-                        "nodes": [],
-                        "scope": 4,
-                        "src": "59:35:0",
-                        "usedErrors": [],
-                        "usedEvents": []
-                    }
-                ],
-                "src": "36:84:0"
-            },
-            "id": 0
-        }
-    }
+    "sources": {}
 }
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index 6f264fc131..8018d71b36 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -59,7 +59,7 @@ string compilerStateToString(CompilerStack::State _state)
 		case CompilerStack::State::SourcesSet: return "SourcesSet";
 		case CompilerStack::State::Parsed: return "Parsed";
 		case CompilerStack::State::ParsedAndImported: return "ParsedAndImported";
-		case CompilerStack::State::AnalysisPerformed: return "AnalysisPerformed";
+		case CompilerStack::State::AnalysisSuccessful: return "AnalysisSuccessful";
 		case CompilerStack::State::CompilationSuccessful: return "CompilationSuccessful";
 	}
 	soltestAssert(false, "Unexpected value of state parameter");
@@ -102,7 +102,7 @@ void ASTJSONTest::generateTestVariants(string const& _filename)
 
 	const std::vector<CompilerStack::State> variantCompileStates = {
 		CompilerStack::State::Parsed,
-		CompilerStack::State::AnalysisPerformed
+		CompilerStack::State::AnalysisSuccessful,
 	};
 
 	for (const auto state: variantCompileStates)
diff --git a/test/libsolidity/analysis/FunctionCallGraph.cpp b/test/libsolidity/analysis/FunctionCallGraph.cpp
index da17fc4332..9de3441e6c 100644
--- a/test/libsolidity/analysis/FunctionCallGraph.cpp
+++ b/test/libsolidity/analysis/FunctionCallGraph.cpp
@@ -102,7 +102,7 @@ EdgeNames edgeNames(EdgeMap const& _edgeMap)
 
 tuple<CallGraphMap, CallGraphMap> collectGraphs(CompilerStack const& _compilerStack)
 {
-	soltestAssert(!_compilerStack.hasError(), "");
+	soltestAssert(_compilerStack.state() >= CompilerStack::State::AnalysisSuccessful);
 
 	tuple<CallGraphMap, CallGraphMap> graphs;
 

From b17757ea1765b8c332816424162b1906d06d1108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 14 Jun 2023 13:02:41 +0200
Subject: [PATCH 1558/1748] CompilerStack: Extend inconsistent error sanity
 check to cover stopAfter: parsing as well

---
 libsolidity/interface/StandardCompiler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index d16a2742f7..4d04a41574 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -1327,8 +1327,8 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 
 	/// Inconsistent state - stop here to receive error reports from users
 	if (
-		(compilationFailed || !analysisSuccess) &&
-		(errors.empty() && _inputsAndSettings.stopAfter >= CompilerStack::State::AnalysisSuccessful)
+		(compilationFailed || analysisFailed || !parsingSuccess) &&
+		errors.empty()
 	)
 		return formatFatalError(Error::Type::InternalCompilerError, "No error reported, but compilation failed.");
 

From 36429e397c86ee85bee8e7fc10e142977273f3c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 14 Jun 2023 13:41:41 +0200
Subject: [PATCH 1559/1748] Fix ICE when requesting `--combined-json` outputs
 other than AST with `--stop-after parsing`

---
 solc/CommandLineInterface.cpp                 | 13 +++--
 .../combined_json_stop_after_parsing/args     |  1 +
 .../input.sol                                 |  4 ++
 .../combined_json_stop_after_parsing/output   | 53 +++++++++++++++++++
 4 files changed, 66 insertions(+), 5 deletions(-)
 create mode 100644 test/cmdlineTests/combined_json_stop_after_parsing/args
 create mode 100644 test/cmdlineTests/combined_json_stop_after_parsing/input.sol
 create mode 100644 test/cmdlineTests/combined_json_stop_after_parsing/output

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 8cef23bac6..e27df9f45c 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -844,6 +844,9 @@ void CommandLineInterface::handleCombinedJSON()
 
 	output[g_strVersion] = frontend::VersionString;
 	vector<string> contracts = m_compiler->contractNames();
+
+	// NOTE: The state checks here are more strict that in Standard JSON. There we allow
+	// requesting certain outputs even if compilation fails as long as analysis went ok.
 	bool compilationSuccess = m_compiler->state() >= CompilerStack::State::CompilationSuccessful;
 
 	if (!contracts.empty())
@@ -851,9 +854,9 @@ void CommandLineInterface::handleCombinedJSON()
 	for (string const& contractName: contracts)
 	{
 		Json::Value& contractData = output[g_strContracts][contractName] = Json::objectValue;
-		if (m_options.compiler.combinedJsonRequests->abi)
+		if (m_options.compiler.combinedJsonRequests->abi && compilationSuccess)
 			contractData[g_strAbi] = m_compiler->contractABI(contractName);
-		if (m_options.compiler.combinedJsonRequests->metadata)
+		if (m_options.compiler.combinedJsonRequests->metadata && compilationSuccess)
 			contractData["metadata"] = m_compiler->metadata(contractName);
 		if (m_options.compiler.combinedJsonRequests->binary && compilationSuccess)
 			contractData[g_strBinary] = m_compiler->object(contractName).toHex();
@@ -887,11 +890,11 @@ void CommandLineInterface::handleCombinedJSON()
 			contractData[g_strFunDebugRuntime] = StandardCompiler::formatFunctionDebugData(
 				m_compiler->runtimeObject(contractName).functionDebugData
 			);
-		if (m_options.compiler.combinedJsonRequests->signatureHashes)
+		if (m_options.compiler.combinedJsonRequests->signatureHashes && compilationSuccess)
 			contractData[g_strSignatureHashes] = m_compiler->interfaceSymbols(contractName)["methods"];
-		if (m_options.compiler.combinedJsonRequests->natspecDev)
+		if (m_options.compiler.combinedJsonRequests->natspecDev && compilationSuccess)
 			contractData[g_strNatspecDev] = m_compiler->natspecDev(contractName);
-		if (m_options.compiler.combinedJsonRequests->natspecUser)
+		if (m_options.compiler.combinedJsonRequests->natspecUser && compilationSuccess)
 			contractData[g_strNatspecUser] = m_compiler->natspecUser(contractName);
 	}
 
diff --git a/test/cmdlineTests/combined_json_stop_after_parsing/args b/test/cmdlineTests/combined_json_stop_after_parsing/args
new file mode 100644
index 0000000000..692bfd79ea
--- /dev/null
+++ b/test/cmdlineTests/combined_json_stop_after_parsing/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4 --stop-after parsing --combined-json abi,asm,ast,bin,bin-runtime,devdoc,function-debug,function-debug-runtime,generated-sources,generated-sources-runtime,hashes,metadata,opcodes,srcmap,srcmap-runtime,storage-layout,userdoc
diff --git a/test/cmdlineTests/combined_json_stop_after_parsing/input.sol b/test/cmdlineTests/combined_json_stop_after_parsing/input.sol
new file mode 100644
index 0000000000..a3a86cc8d3
--- /dev/null
+++ b/test/cmdlineTests/combined_json_stop_after_parsing/input.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity *;
+
+contract C {}
diff --git a/test/cmdlineTests/combined_json_stop_after_parsing/output b/test/cmdlineTests/combined_json_stop_after_parsing/output
new file mode 100644
index 0000000000..32cdd019b8
--- /dev/null
+++ b/test/cmdlineTests/combined_json_stop_after_parsing/output
@@ -0,0 +1,53 @@
+{
+    "contracts":
+    {
+        "combined_json_stop_after_parsing/input.sol:C": {}
+    },
+    "sourceList":
+    [
+        "combined_json_stop_after_parsing/input.sol"
+    ],
+    "sources":
+    {
+        "combined_json_stop_after_parsing/input.sol":
+        {
+            "AST":
+            {
+                "absolutePath": "combined_json_stop_after_parsing/input.sol",
+                "id": 3,
+                "license": "GPL-3.0",
+                "nodeType": "SourceUnit",
+                "nodes":
+                [
+                    {
+                        "id": 1,
+                        "literals":
+                        [
+                            "solidity",
+                            "*"
+                        ],
+                        "nodeType": "PragmaDirective",
+                        "src": "36:18:0"
+                    },
+                    {
+                        "abstract": false,
+                        "baseContracts": [],
+                        "contractDependencies": [],
+                        "contractKind": "contract",
+                        "id": 2,
+                        "name": "C",
+                        "nameLocation": "65:1:0",
+                        "nodeType": "ContractDefinition",
+                        "nodes": [],
+                        "src": "56:13:0",
+                        "usedErrors": [],
+                        "usedEvents": []
+                    }
+                ],
+                "src": "36:34:0"
+            },
+            "id": 0
+        }
+    },
+    "version": "<VERSION REMOVED>"
+}

From 9adbced98e49588bcc29e181f2560c2eadaa22ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 22:54:48 +0200
Subject: [PATCH 1560/1748] Remove parser error recovery mode

---
 Changelog.md                                  |   1 +
 liblangutil/ParserBase.cpp                    |  54 +---
 liblangutil/ParserBase.h                      |  21 +-
 libsolidity/analysis/SyntaxChecker.cpp        |   9 +-
 libsolidity/interface/CompilerStack.cpp       |   4 +-
 libsolidity/interface/CompilerStack.h         |   9 -
 libsolidity/interface/StandardCompiler.cpp    |  10 +-
 libsolidity/interface/StandardCompiler.h      |   1 -
 libsolidity/parsing/Parser.cpp                | 287 +++++++-----------
 libsolidity/parsing/Parser.h                  |   5 +-
 scripts/error_codes.py                        |   1 -
 solc/CommandLineInterface.cpp                 |   3 -
 solc/CommandLineParser.cpp                    |   9 -
 solc/CommandLineParser.h                      |   1 -
 test/InteractiveTests.h                       |   1 -
 .../recovery_ast_constructor/args             |   1 -
 .../cmdlineTests/recovery_ast_constructor/err |  11 -
 .../recovery_ast_constructor/exit             |   1 -
 .../recovery_ast_constructor/input.sol        |  13 -
 .../recovery_ast_empty_contract/args          |   1 -
 .../recovery_ast_empty_contract/err           |   5 -
 .../recovery_ast_empty_contract/exit          |   1 -
 .../recovery_ast_empty_contract/input.sol     |   3 -
 .../recovery_standard_json/input.json         |  18 --
 .../recovery_standard_json/output.json        |  46 ---
 test/libsolidity/AnalysisFramework.cpp        |   5 +-
 test/libsolidity/AnalysisFramework.h          |   3 +-
 test/libsolidity/SolidityParser.cpp           |   9 +-
 test/libsolidity/StandardCompiler.cpp         |  37 ---
 test/libsolidity/SyntaxTest.cpp               |   4 +-
 test/libsolidity/SyntaxTest.h                 |   9 +-
 .../constructor_recovers.sol                  |  20 --
 .../errorRecoveryTests/contract_recovery.sol  |   6 -
 .../do_not_delete_at_error.sol                |  15 -
 .../errorRecoveryTests/error_to_eos.sol       |  23 --
 .../errorRecoveryTests/missing_rhs.sol        |  11 -
 .../errorRecoveryTests/multiple_errors.sol    |  29 --
 .../recovery_failed_eos.sol                   |  10 -
 .../wrong_compiler_recovers_1.sol             |   3 -
 .../wrong_compiler_recovers_2.sol             |   6 -
 .../wrong_compiler_recovers_3.sol             |   7 -
 .../wrong_compiler_recovers_4.sol             |   7 -
 test/libyul/SyntaxTest.h                      |   4 -
 test/solc/CommandLineParser.cpp               |   3 -
 44 files changed, 142 insertions(+), 585 deletions(-)
 delete mode 100644 test/cmdlineTests/recovery_ast_constructor/args
 delete mode 100644 test/cmdlineTests/recovery_ast_constructor/err
 delete mode 100644 test/cmdlineTests/recovery_ast_constructor/exit
 delete mode 100644 test/cmdlineTests/recovery_ast_constructor/input.sol
 delete mode 100644 test/cmdlineTests/recovery_ast_empty_contract/args
 delete mode 100644 test/cmdlineTests/recovery_ast_empty_contract/err
 delete mode 100644 test/cmdlineTests/recovery_ast_empty_contract/exit
 delete mode 100644 test/cmdlineTests/recovery_ast_empty_contract/input.sol
 delete mode 100644 test/cmdlineTests/recovery_standard_json/input.json
 delete mode 100644 test/cmdlineTests/recovery_standard_json/output.json
 delete mode 100644 test/libsolidity/errorRecoveryTests/constructor_recovers.sol
 delete mode 100644 test/libsolidity/errorRecoveryTests/contract_recovery.sol
 delete mode 100644 test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol
 delete mode 100644 test/libsolidity/errorRecoveryTests/error_to_eos.sol
 delete mode 100644 test/libsolidity/errorRecoveryTests/missing_rhs.sol
 delete mode 100644 test/libsolidity/errorRecoveryTests/multiple_errors.sol
 delete mode 100644 test/libsolidity/errorRecoveryTests/recovery_failed_eos.sol
 delete mode 100644 test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_1.sol
 delete mode 100644 test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_2.sol
 delete mode 100644 test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_3.sol
 delete mode 100644 test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_4.sol

diff --git a/Changelog.md b/Changelog.md
index 6f220005e1..eb2f99fd87 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,7 @@ Language Features:
 
 
 Compiler Features:
+ * Parser: Remove the experimental error recovery mode (``--error-recovery`` / ``settings.parserErrorRecovery``).
  * Yul Optimizer: If ``PUSH0`` is supported, favor zero literals over storing zero values in variables.
 
 
diff --git a/liblangutil/ParserBase.cpp b/liblangutil/ParserBase.cpp
index 12a00d04f1..fde0f27ecc 100644
--- a/liblangutil/ParserBase.cpp
+++ b/liblangutil/ParserBase.cpp
@@ -74,56 +74,10 @@ void ParserBase::expectToken(Token _value, bool _advance)
 {
 	Token tok = m_scanner->currentToken();
 	if (tok != _value)
-	{
-		std::string const expectedToken = ParserBase::tokenName(_value);
-		if (m_parserErrorRecovery)
-			parserError(6635_error, "Expected " + expectedToken + " but got " + tokenName(tok));
-		else
-			fatalParserError(2314_error, "Expected " + expectedToken + " but got " + tokenName(tok));
-		// Do not advance so that recovery can sync or make use of the current token.
-		// This is especially useful if the expected token
-		// is the only one that is missing and is at the end of a construct.
-		// "{ ... ; }" is such an example.
-		//        ^
-		_advance = false;
-	}
-	if (_advance)
-		advance();
-}
-
-void ParserBase::expectTokenOrConsumeUntil(Token _value, std::string const& _currentNodeName, bool _advance)
-{
-	solAssert(m_inParserRecovery, "The function is supposed to be called during parser recovery only.");
-
-	Token tok = m_scanner->currentToken();
-	if (tok != _value)
-	{
-		SourceLocation errorLoc = currentLocation();
-		int startPosition = errorLoc.start;
-		while (m_scanner->currentToken() != _value && m_scanner->currentToken() != Token::EOS)
-			advance();
-
-		std::string const expectedToken = ParserBase::tokenName(_value);
-		if (m_scanner->currentToken() == Token::EOS)
-		{
-			// rollback to where the token started, and raise exception to be caught at a higher level.
-			m_scanner->setPosition(static_cast<size_t>(startPosition));
-			std::string const msg = "In " + _currentNodeName + ", " + expectedToken + "is expected; got " + ParserBase::tokenName(tok) + " instead.";
-			fatalParserError(1957_error, errorLoc, msg);
-		}
-		else
-		{
-			parserWarning(3796_error, "Recovered in " + _currentNodeName + " at " + expectedToken + ".");
-			m_inParserRecovery = false;
-		}
-	}
-	else
-	{
-		std::string expectedToken = ParserBase::tokenName(_value);
-		parserWarning(3347_error, "Recovered in " + _currentNodeName + " at " + expectedToken + ".");
-		m_inParserRecovery = false;
-	}
-
+		fatalParserError(
+			2314_error,
+			"Expected " + ParserBase::tokenName(_value) + " but got " + tokenName(tok)
+		);
 	if (_advance)
 		advance();
 }
diff --git a/liblangutil/ParserBase.h b/liblangutil/ParserBase.h
index f72400f6c3..88fc76a9c3 100644
--- a/liblangutil/ParserBase.h
+++ b/liblangutil/ParserBase.h
@@ -38,14 +38,9 @@ struct ErrorId;
 class ParserBase
 {
 public:
-	/// Set @a _parserErrorRecovery to true for additional error
-	/// recovery.  This is experimental and intended for use
-	/// by front-end tools that need partial AST information even
-	/// when errors occur.
-	explicit ParserBase(ErrorReporter& errorReporter, bool _parserErrorRecovery = false): m_errorReporter(errorReporter)
-	{
-		m_parserErrorRecovery = _parserErrorRecovery;
-	}
+	explicit ParserBase(ErrorReporter& errorReporter):
+		m_errorReporter(errorReporter)
+	{}
 
 	virtual ~ParserBase() = default;
 
@@ -70,13 +65,9 @@ class ParserBase
 	///@{
 	///@name Helper functions
 	/// If current token value is not @a _value, throw exception otherwise advance token
-	//  @a if _advance is true and error recovery is in effect.
+	//  if @a _advance is true
 	void expectToken(Token _value, bool _advance = true);
 
-	/// Like expectToken but if there is an error ignores tokens until
-	/// the expected token or EOS is seen. If EOS is encountered, back up to the error point,
-	/// and throw an exception so that a higher grammar rule has an opportunity to recover.
-	void expectTokenOrConsumeUntil(Token _value, std::string const& _currentNodeName, bool _advance = true);
 	Token currentToken() const;
 	Token peekNextToken() const;
 	std::string tokenName(Token _token);
@@ -108,10 +99,6 @@ class ParserBase
 	ErrorReporter& m_errorReporter;
 	/// Current recursion depth during parsing.
 	size_t m_recursionDepth = 0;
-	/// True if we are in parser error recovery. Usually this means we are scanning for
-	/// a synchronization token like ';', or '}'. We use this to reduce cascaded error messages.
-	bool m_inParserRecovery = false;
-	bool m_parserErrorRecovery = false;
 };
 
 }
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index 2546cfdda6..b2dd73cc24 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -159,14 +159,7 @@ bool SyntaxChecker::visit(PragmaDirective const& _pragma)
 			SemVerMatchExpressionParser parser(tokens, literals);
 			SemVerMatchExpression matchExpression = parser.parse();
 			static SemVerVersion const currentVersion{std::string(VersionString)};
-			if (!matchExpression.matches(currentVersion))
-				m_errorReporter.syntaxError(
-					3997_error,
-					_pragma.location(),
-					"Source file requires different compiler version (current compiler is " +
-					std::string(VersionString) + ") - note that nightly builds are considered to be "
-					"strictly less than the released version"
-				);
+			solAssert(matchExpression.matches(currentVersion));
 			m_versionPragmaFound = true;
 		}
 		catch (SemVerError const&)
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 8151a87e2d..f646ff0146 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -352,7 +352,7 @@ bool CompilerStack::parse()
 	if (SemVerVersion{std::string(VersionString)}.isPrerelease())
 		m_errorReporter.warning(3805_error, "This is a pre-release compiler version, please do not use it in production.");
 
-	Parser parser{m_errorReporter, m_evmVersion, m_parserErrorRecovery};
+	Parser parser{m_errorReporter, m_evmVersion};
 
 	std::vector<std::string> sourcesToParse;
 	for (auto const& s: m_sources)
@@ -1104,7 +1104,7 @@ SourceUnit const& CompilerStack::ast(std::string const& _sourceName) const
 {
 	if (m_stackState < Parsed)
 		solThrow(CompilerError, "Parsing not yet performed.");
-	if (!source(_sourceName).ast && !m_parserErrorRecovery)
+	if (!source(_sourceName).ast)
 		solThrow(CompilerError, "Parsing was not successful.");
 
 	return *source(_sourceName).ast;
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 072333f9f0..0227896ae0 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -158,14 +158,6 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// Sets whether to strip revert strings, add additional strings or do nothing at all.
 	void setRevertStringBehaviour(RevertStrings _revertStrings);
 
-	/// Set whether or not parser error is desired.
-	/// When called without an argument it will revert to the default.
-	/// Must be set before parsing.
-	void setParserErrorRecovery(bool _wantErrorRecovery = false)
-	{
-		m_parserErrorRecovery = _wantErrorRecovery;
-	}
-
 	/// Sets the pipeline to go through the Yul IR or not.
 	/// Must be set before parsing.
 	void setViaIR(bool _viaIR);
@@ -511,7 +503,6 @@ class CompilerStack: public langutil::CharStreamProvider
 	bool m_metadataLiteralSources = false;
 	MetadataHash m_metadataHash = MetadataHash::IPFS;
 	langutil::DebugInfoSelection m_debugInfoSelection = langutil::DebugInfoSelection::Default();
-	bool m_parserErrorRecovery = false;
 	State m_stackState = Empty;
 	CompilationSourceType m_compilationSourceType = CompilationSourceType::Solidity;
 	MetadataFormat m_metadataFormat = defaultMetadataFormat();
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 4d04a41574..c46be3b22a 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -423,7 +423,7 @@ std::optional<Json::Value> checkAuxiliaryInputKeys(Json::Value const& _input)
 
 std::optional<Json::Value> checkSettingsKeys(Json::Value const& _input)
 {
-	static std::set<std::string> keys{"parserErrorRecovery", "debug", "evmVersion", "libraries", "metadata", "modelChecker", "optimizer", "outputSelection", "remappings", "stopAfter", "viaIR"};
+	static std::set<std::string> keys{"debug", "evmVersion", "libraries", "metadata", "modelChecker", "optimizer", "outputSelection", "remappings", "stopAfter", "viaIR"};
 	return checkKeys(_input, keys, "settings");
 }
 
@@ -773,13 +773,6 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		ret.stopAfter = CompilerStack::State::Parsed;
 	}
 
-	if (settings.isMember("parserErrorRecovery"))
-	{
-		if (!settings["parserErrorRecovery"].isBool())
-			return formatFatalError(Error::Type::JSONError, "\"settings.parserErrorRecovery\" must be a Boolean.");
-		ret.parserErrorRecovery = settings["parserErrorRecovery"].asBool();
-	}
-
 	if (settings.isMember("viaIR"))
 	{
 		if (!settings["viaIR"].isBool())
@@ -1166,7 +1159,6 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 		compilerStack.addSMTLib2Response(smtLib2Response.first, smtLib2Response.second);
 	compilerStack.setViaIR(_inputsAndSettings.viaIR);
 	compilerStack.setEVMVersion(_inputsAndSettings.evmVersion);
-	compilerStack.setParserErrorRecovery(_inputsAndSettings.parserErrorRecovery);
 	compilerStack.setRemappings(std::move(_inputsAndSettings.remappings));
 	compilerStack.setOptimiserSettings(std::move(_inputsAndSettings.optimiserSettings));
 	compilerStack.setRevertStringBehaviour(_inputsAndSettings.revertStrings);
diff --git a/libsolidity/interface/StandardCompiler.h b/libsolidity/interface/StandardCompiler.h
index 588813d76d..523c09d94e 100644
--- a/libsolidity/interface/StandardCompiler.h
+++ b/libsolidity/interface/StandardCompiler.h
@@ -72,7 +72,6 @@ class StandardCompiler
 	{
 		std::string language;
 		Json::Value errors;
-		bool parserErrorRecovery = false;
 		CompilerStack::State stopAfter = CompilerStack::State::CompilationSuccessful;
 		std::map<std::string, std::string> sources;
 		std::map<util::h256, std::string> smtLib2Responses;
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 127ff402b4..1f5611a2f3 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -173,16 +173,13 @@ void Parser::parsePragmaVersion(SourceLocation const& _location, std::vector<Tok
 		static SemVerVersion const currentVersion{std::string(VersionString)};
 		// FIXME: only match for major version incompatibility
 		if (!matchExpression.matches(currentVersion))
-			// If m_parserErrorRecovery is true, the same message will appear from SyntaxChecker::visit(),
-			// so we don't need to report anything here.
-			if (!m_parserErrorRecovery)
-				m_errorReporter.fatalParserError(
-					5333_error,
-					_location,
-					"Source file requires different compiler version (current compiler is " +
-					std::string(VersionString) + ") - note that nightly builds are considered to be "
-					"strictly less than the released version"
-				);
+			m_errorReporter.fatalParserError(
+				5333_error,
+				_location,
+				"Source file requires different compiler version (current compiler is " +
+				std::string(VersionString) + ") - note that nightly builds are considered to be "
+				"strictly less than the released version"
+			);
 	}
 	catch (SemVerError const& matchError)
 	{
@@ -364,78 +361,62 @@ ASTPointer<ContractDefinition> Parser::parseContractDefinition()
 	std::vector<ASTPointer<InheritanceSpecifier>> baseContracts;
 	std::vector<ASTPointer<ASTNode>> subNodes;
 	std::pair<ContractKind, bool> contractKind{};
-	try
-	{
-		documentation = parseStructuredDocumentation();
-		contractKind = parseContractKind();
-		tie(name, nameLocation) = expectIdentifierWithLocation();
-		if (m_scanner->currentToken() == Token::Is)
-			do
-			{
-				advance();
-				baseContracts.push_back(parseInheritanceSpecifier());
-			}
-			while (m_scanner->currentToken() == Token::Comma);
-		expectToken(Token::LBrace);
-		while (true)
+	documentation = parseStructuredDocumentation();
+	contractKind = parseContractKind();
+	std::tie(name, nameLocation) = expectIdentifierWithLocation();
+	if (m_scanner->currentToken() == Token::Is)
+		do
 		{
-			Token currentTokenValue = m_scanner->currentToken();
-			if (currentTokenValue == Token::RBrace)
-				break;
-			else if (
-				(currentTokenValue == Token::Function && m_scanner->peekNextToken() != Token::LParen) ||
-				currentTokenValue == Token::Constructor ||
-				currentTokenValue == Token::Receive ||
-				currentTokenValue == Token::Fallback
-			)
-				subNodes.push_back(parseFunctionDefinition());
-			else if (currentTokenValue == Token::Struct)
-				subNodes.push_back(parseStructDefinition());
-			else if (currentTokenValue == Token::Enum)
-				subNodes.push_back(parseEnumDefinition());
-			else if (currentTokenValue == Token::Type)
-				subNodes.push_back(parseUserDefinedValueTypeDefinition());
-			else if (
-				// Workaround because `error` is not a keyword.
-				currentTokenValue == Token::Identifier &&
-				currentLiteral() == "error" &&
-				m_scanner->peekNextToken() == Token::Identifier &&
-				m_scanner->peekNextNextToken() == Token::LParen
-			)
-				subNodes.push_back(parseErrorDefinition());
-			else if (variableDeclarationStart())
-			{
-				VarDeclParserOptions options;
-				options.kind = VarDeclKind::State;
-				options.allowInitialValue = true;
-				subNodes.push_back(parseVariableDeclaration(options));
-				expectToken(Token::Semicolon);
-			}
-			else if (currentTokenValue == Token::Modifier)
-				subNodes.push_back(parseModifierDefinition());
-			else if (currentTokenValue == Token::Event)
-				subNodes.push_back(parseEventDefinition());
-			else if (currentTokenValue == Token::Using)
-				subNodes.push_back(parseUsingDirective());
-			else
-				fatalParserError(9182_error, "Function, variable, struct or modifier declaration expected.");
+			advance();
+			baseContracts.push_back(parseInheritanceSpecifier());
 		}
-	}
-	catch (FatalError const&)
+		while (m_scanner->currentToken() == Token::Comma);
+	expectToken(Token::LBrace);
+	while (true)
 	{
-		if (
-			!m_errorReporter.hasErrors() ||
-			!m_parserErrorRecovery ||
-			m_errorReporter.hasExcessiveErrors()
+		Token currentTokenValue = m_scanner->currentToken();
+		if (currentTokenValue == Token::RBrace)
+			break;
+		else if (
+			(currentTokenValue == Token::Function && m_scanner->peekNextToken() != Token::LParen) ||
+			currentTokenValue == Token::Constructor ||
+			currentTokenValue == Token::Receive ||
+			currentTokenValue == Token::Fallback
 		)
-			BOOST_THROW_EXCEPTION(FatalError()); /* Don't try to recover here. */
-		m_inParserRecovery = true;
+			subNodes.push_back(parseFunctionDefinition());
+		else if (currentTokenValue == Token::Struct)
+			subNodes.push_back(parseStructDefinition());
+		else if (currentTokenValue == Token::Enum)
+			subNodes.push_back(parseEnumDefinition());
+		else if (currentTokenValue == Token::Type)
+			subNodes.push_back(parseUserDefinedValueTypeDefinition());
+		else if (
+			// Workaround because `error` is not a keyword.
+			currentTokenValue == Token::Identifier &&
+			currentLiteral() == "error" &&
+			m_scanner->peekNextToken() == Token::Identifier &&
+			m_scanner->peekNextNextToken() == Token::LParen
+		)
+			subNodes.push_back(parseErrorDefinition());
+		else if (variableDeclarationStart())
+		{
+			VarDeclParserOptions options;
+			options.kind = VarDeclKind::State;
+			options.allowInitialValue = true;
+			subNodes.push_back(parseVariableDeclaration(options));
+			expectToken(Token::Semicolon);
+		}
+		else if (currentTokenValue == Token::Modifier)
+			subNodes.push_back(parseModifierDefinition());
+		else if (currentTokenValue == Token::Event)
+			subNodes.push_back(parseEventDefinition());
+		else if (currentTokenValue == Token::Using)
+			subNodes.push_back(parseUsingDirective());
+		else
+			fatalParserError(9182_error, "Function, variable, struct or modifier declaration expected.");
 	}
 	nodeFactory.markEndPosition();
-	if (m_inParserRecovery)
-		expectTokenOrConsumeUntil(Token::RBrace, "ContractDefinition");
-	else
-		expectToken(Token::RBrace);
+	expectToken(Token::RBrace);
 	return nodeFactory.createNode<ContractDefinition>(
 		name,
 		nameLocation,
@@ -1295,26 +1276,10 @@ ASTPointer<Block> Parser::parseBlock(bool _allowUnchecked, ASTPointer<ASTString>
 	}
 	expectToken(Token::LBrace);
 	std::vector<ASTPointer<Statement>> statements;
-	try
-	{
-		while (m_scanner->currentToken() != Token::RBrace)
-			statements.push_back(parseStatement(true));
-		nodeFactory.markEndPosition();
-	}
-	catch (FatalError const&)
-	{
-		if (
-			!m_errorReporter.hasErrors() ||
-			!m_parserErrorRecovery ||
-			m_errorReporter.hasExcessiveErrors()
-		)
-			BOOST_THROW_EXCEPTION(FatalError()); /* Don't try to recover here. */
-		m_inParserRecovery = true;
-	}
-	if (m_inParserRecovery)
-		expectTokenOrConsumeUntil(Token::RBrace, "Block");
-	else
-		expectToken(Token::RBrace);
+	while (m_scanner->currentToken() != Token::RBrace)
+		statements.push_back(parseStatement(true));
+	nodeFactory.markEndPosition();
+	expectToken(Token::RBrace);
 	return nodeFactory.createNode<Block>(_docString, unchecked, statements);
 }
 
@@ -1323,86 +1288,70 @@ ASTPointer<Statement> Parser::parseStatement(bool _allowUnchecked)
 	RecursionGuard recursionGuard(*this);
 	ASTPointer<ASTString> docString;
 	ASTPointer<Statement> statement;
-	try
+	if (m_scanner->currentCommentLiteral() != "")
+		docString = std::make_shared<ASTString>(m_scanner->currentCommentLiteral());
+	switch (m_scanner->currentToken())
 	{
-		if (m_scanner->currentCommentLiteral() != "")
-			docString = std::make_shared<ASTString>(m_scanner->currentCommentLiteral());
-		switch (m_scanner->currentToken())
-		{
-		case Token::If:
-			return parseIfStatement(docString);
-		case Token::While:
-			return parseWhileStatement(docString);
-		case Token::Do:
-			return parseDoWhileStatement(docString);
-		case Token::For:
-			return parseForStatement(docString);
-		case Token::Unchecked:
-		case Token::LBrace:
-			return parseBlock(_allowUnchecked, docString);
-		case Token::Continue:
-			statement = ASTNodeFactory(*this).createNode<Continue>(docString);
-			advance();
-			break;
-		case Token::Break:
-			statement = ASTNodeFactory(*this).createNode<Break>(docString);
-			advance();
-			break;
-		case Token::Return:
-		{
-			ASTNodeFactory nodeFactory(*this);
-			ASTPointer<Expression> expression;
-			if (advance() != Token::Semicolon)
-				{
-					expression = parseExpression();
-					nodeFactory.setEndPositionFromNode(expression);
-				}
-			statement = nodeFactory.createNode<Return>(docString, expression);
-				break;
-		}
-		case Token::Throw:
-		{
-			statement = ASTNodeFactory(*this).createNode<Throw>(docString);
-			advance();
-			break;
-		}
-		case Token::Try:
-			return parseTryStatement(docString);
-		case Token::Assembly:
-			return parseInlineAssembly(docString);
-		case Token::Emit:
-			statement = parseEmitStatement(docString);
-			break;
-		case Token::Identifier:
-			if (m_scanner->currentLiteral() == "revert" && m_scanner->peekNextToken() == Token::Identifier)
-				statement = parseRevertStatement(docString);
-			else if (m_insideModifier && m_scanner->currentLiteral() == "_")
+	case Token::If:
+		return parseIfStatement(docString);
+	case Token::While:
+		return parseWhileStatement(docString);
+	case Token::Do:
+		return parseDoWhileStatement(docString);
+	case Token::For:
+		return parseForStatement(docString);
+	case Token::Unchecked:
+	case Token::LBrace:
+		return parseBlock(_allowUnchecked, docString);
+	case Token::Continue:
+		statement = ASTNodeFactory(*this).createNode<Continue>(docString);
+		advance();
+		break;
+	case Token::Break:
+		statement = ASTNodeFactory(*this).createNode<Break>(docString);
+		advance();
+		break;
+	case Token::Return:
+	{
+		ASTNodeFactory nodeFactory(*this);
+		ASTPointer<Expression> expression;
+		if (advance() != Token::Semicolon)
 			{
-				statement = ASTNodeFactory(*this).createNode<PlaceholderStatement>(docString);
-				advance();
+				expression = parseExpression();
+				nodeFactory.setEndPositionFromNode(expression);
 			}
-			else
-				statement = parseSimpleStatement(docString);
-			break;
-		default:
-			statement = parseSimpleStatement(docString);
+		statement = nodeFactory.createNode<Return>(docString, expression);
 			break;
-		}
 	}
-	catch (FatalError const&)
+	case Token::Throw:
 	{
-		if (
-			!m_errorReporter.hasErrors() ||
-			!m_parserErrorRecovery ||
-			m_errorReporter.hasExcessiveErrors()
-		)
-			BOOST_THROW_EXCEPTION(FatalError()); /* Don't try to recover here. */
-		m_inParserRecovery = true;
+		statement = ASTNodeFactory(*this).createNode<Throw>(docString);
+		advance();
+		break;
 	}
-	if (m_inParserRecovery)
-		expectTokenOrConsumeUntil(Token::Semicolon, "Statement");
-	else
-		expectToken(Token::Semicolon);
+	case Token::Try:
+		return parseTryStatement(docString);
+	case Token::Assembly:
+		return parseInlineAssembly(docString);
+	case Token::Emit:
+		statement = parseEmitStatement(docString);
+		break;
+	case Token::Identifier:
+		if (m_scanner->currentLiteral() == "revert" && m_scanner->peekNextToken() == Token::Identifier)
+			statement = parseRevertStatement(docString);
+		else if (m_insideModifier && m_scanner->currentLiteral() == "_")
+		{
+			statement = ASTNodeFactory(*this).createNode<PlaceholderStatement>(docString);
+			advance();
+		}
+		else
+			statement = parseSimpleStatement(docString);
+		break;
+	default:
+		statement = parseSimpleStatement(docString);
+		break;
+	}
+	expectToken(Token::Semicolon);
 	return statement;
 }
 
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index 65e8f61f31..5f2a1213d5 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -40,10 +40,9 @@ class Parser: public langutil::ParserBase
 public:
 	explicit Parser(
 		langutil::ErrorReporter& _errorReporter,
-		langutil::EVMVersion _evmVersion,
-		bool _errorRecovery = false
+		langutil::EVMVersion _evmVersion
 	):
-		ParserBase(_errorReporter, _errorRecovery),
+		ParserBase(_errorReporter),
 		m_evmVersion(_evmVersion)
 	{}
 
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index d5b7ed76e2..33a475214b 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -171,7 +171,6 @@ def print_ids_per_file(ids, id_to_file_names, top_dir):
 
 def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
     test_sub_dirs = [
-        path.join("test", "libsolidity", "errorRecoveryTests"),
         path.join("test", "libsolidity", "smtCheckerTests"),
         path.join("test", "libsolidity", "syntaxTests"),
         path.join("test", "libyul", "yulSyntaxTests")
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index e27df9f45c..5fd1511598 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -792,10 +792,7 @@ void CommandLineInterface::compile()
 			}
 		}
 		else
-		{
 			m_compiler->setSources(m_fileReader.sourceUnits());
-			m_compiler->setParserErrorRecovery(m_options.input.errorRecovery);
-		}
 
 		bool successful = m_compiler->compile(m_options.output.stopAfter);
 
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 060c1ad8fe..8ac4f969c8 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -43,7 +43,6 @@ static string const g_strBasePath = "base-path";
 static string const g_strIncludePath = "include-path";
 static string const g_strAssemble = "assemble";
 static string const g_strCombinedJson = "combined-json";
-static string const g_strErrorRecovery = "error-recovery";
 static string const g_strEVM = "evm";
 static string const g_strEVMVersion = "evm-version";
 static string const g_strEOFVersion = "experimental-eof-version";
@@ -226,7 +225,6 @@ bool CommandLineOptions::operator==(CommandLineOptions const& _other) const noex
 		input.includePaths == _other.input.includePaths &&
 		input.allowedDirectories == _other.input.allowedDirectories &&
 		input.ignoreMissingFiles == _other.input.ignoreMissingFiles &&
-		input.errorRecovery == _other.input.errorRecovery &&
 		output.dir == _other.output.dir &&
 		output.overwriteFiles == _other.output.overwriteFiles &&
 		output.evmVersion == _other.output.evmVersion &&
@@ -570,10 +568,6 @@ General Information)").c_str(),
 			g_strIgnoreMissingFiles.c_str(),
 			"Ignore missing files."
 		)
-		(
-			g_strErrorRecovery.c_str(),
-			"Enables additional parser error recovery."
-		)
 	;
 	desc.add(inputOptions);
 
@@ -962,7 +956,6 @@ void CommandLineParser::processArgs()
 
 	map<string, set<InputMode>> validOptionInputModeCombinations = {
 		// TODO: This should eventually contain all options.
-		{g_strErrorRecovery, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strExperimentalViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strMetadataLiteral, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
@@ -1369,8 +1362,6 @@ void CommandLineParser::processArgs()
 		m_args.count(g_strModelCheckerTargets) ||
 		m_args.count(g_strModelCheckerTimeout);
 	m_options.output.viaIR = (m_args.count(g_strExperimentalViaIR) > 0 || m_args.count(g_strViaIR) > 0);
-	if (m_options.input.mode == InputMode::Compiler)
-		m_options.input.errorRecovery = (m_args.count(g_strErrorRecovery) > 0);
 
 	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport);
 }
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 6b391e7240..33cb7bb094 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -174,7 +174,6 @@ struct CommandLineOptions
 		std::vector<boost::filesystem::path> includePaths;
 		FileReader::FileSystemPathSet allowedDirectories;
 		bool ignoreMissingFiles = false;
-		bool errorRecovery = false;
 	} input;
 
 	struct
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
index 52877af48c..01e47afe00 100644
--- a/test/InteractiveTests.h
+++ b/test/InteractiveTests.h
@@ -71,7 +71,6 @@ Testsuite const g_interactiveTestsuites[] = {
 	{"Yul Syntax",             "libyul",      "yulSyntaxTests",        false, false, &yul::test::SyntaxTest::create},
 	{"EVM Code Transform",     "libyul",      "evmCodeTransform",      false, false, &yul::test::EVMCodeTransformTest::create, {"nooptions"}},
 	{"Syntax",                 "libsolidity", "syntaxTests",           false, false, &SyntaxTest::create},
-	{"Error Recovery",         "libsolidity", "errorRecoveryTests",    false, false, &SyntaxTest::createErrorRecovery},
 	{"Semantic",               "libsolidity", "semanticTests",         false, true,  &SemanticTest::create},
 	{"JSON AST",               "libsolidity", "ASTJSON",               false, false, &ASTJSONTest::create},
 	{"JSON ABI",               "libsolidity", "ABIJson",               false, false, &ABIJsonTest::create},
diff --git a/test/cmdlineTests/recovery_ast_constructor/args b/test/cmdlineTests/recovery_ast_constructor/args
deleted file mode 100644
index 8b7c575db0..0000000000
--- a/test/cmdlineTests/recovery_ast_constructor/args
+++ /dev/null
@@ -1 +0,0 @@
---error-recovery --ast-compact-json --pretty-json  --hashes
diff --git a/test/cmdlineTests/recovery_ast_constructor/err b/test/cmdlineTests/recovery_ast_constructor/err
deleted file mode 100644
index 41d3be0482..0000000000
--- a/test/cmdlineTests/recovery_ast_constructor/err
+++ /dev/null
@@ -1,11 +0,0 @@
-Error: Expected primary expression.
- --> recovery_ast_constructor/input.sol:6:27:
-  |
-6 |     balances[tx.origin] = ; // missing RHS.
-  |                           ^
-
-Warning: Recovered in Statement at ';'.
- --> recovery_ast_constructor/input.sol:6:27:
-  |
-6 |     balances[tx.origin] = ; // missing RHS.
-  |                           ^
diff --git a/test/cmdlineTests/recovery_ast_constructor/exit b/test/cmdlineTests/recovery_ast_constructor/exit
deleted file mode 100644
index d00491fd7e..0000000000
--- a/test/cmdlineTests/recovery_ast_constructor/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/recovery_ast_constructor/input.sol b/test/cmdlineTests/recovery_ast_constructor/input.sol
deleted file mode 100644
index ff516d2ae0..0000000000
--- a/test/cmdlineTests/recovery_ast_constructor/input.sol
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma solidity >=0.0.0;
-
-contract Error1 {
-  constructor() {
-    balances[tx.origin] = ; // missing RHS.
-  }
-
-  // This function parses properly
-  function five() public view returns(uint) {
-    return 5;
-  }
-}
diff --git a/test/cmdlineTests/recovery_ast_empty_contract/args b/test/cmdlineTests/recovery_ast_empty_contract/args
deleted file mode 100644
index 2ad0232ec1..0000000000
--- a/test/cmdlineTests/recovery_ast_empty_contract/args
+++ /dev/null
@@ -1 +0,0 @@
---error-recovery
diff --git a/test/cmdlineTests/recovery_ast_empty_contract/err b/test/cmdlineTests/recovery_ast_empty_contract/err
deleted file mode 100644
index c047cc82a3..0000000000
--- a/test/cmdlineTests/recovery_ast_empty_contract/err
+++ /dev/null
@@ -1,5 +0,0 @@
-Error: Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
- --> recovery_ast_empty_contract/input.sol:3:1:
-  |
-3 | c
-  | ^
diff --git a/test/cmdlineTests/recovery_ast_empty_contract/exit b/test/cmdlineTests/recovery_ast_empty_contract/exit
deleted file mode 100644
index d00491fd7e..0000000000
--- a/test/cmdlineTests/recovery_ast_empty_contract/exit
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/test/cmdlineTests/recovery_ast_empty_contract/input.sol b/test/cmdlineTests/recovery_ast_empty_contract/input.sol
deleted file mode 100644
index bdc83a2c90..0000000000
--- a/test/cmdlineTests/recovery_ast_empty_contract/input.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0
-pragma 0.5.11;
-c
\ No newline at end of file
diff --git a/test/cmdlineTests/recovery_standard_json/input.json b/test/cmdlineTests/recovery_standard_json/input.json
deleted file mode 100644
index 9c8b150668..0000000000
--- a/test/cmdlineTests/recovery_standard_json/input.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"language": "Solidity",
-	"sources":
-	{
-		"A":
-		{
-			"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; contract Errort6 { using foo for  ; /* missing type name */ }"
-		}
-	},
-	"settings":
-	{
-		"parserErrorRecovery": true,
-		"outputSelection":
-		{
-			"*": { "": ["ast"] }
-		}
-	}
-}
diff --git a/test/cmdlineTests/recovery_standard_json/output.json b/test/cmdlineTests/recovery_standard_json/output.json
deleted file mode 100644
index fa23fde251..0000000000
--- a/test/cmdlineTests/recovery_standard_json/output.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-    "errors":
-    [
-        {
-            "component": "general",
-            "errorCode": "3546",
-            "formattedMessage": "ParserError: Expected type name
- --> A:2:58:
-  |
-2 | pragma solidity >=0.0; contract Errort6 { using foo for  ; /* missing type name */ }
-  |                                                          ^
-
-",
-            "message": "Expected type name",
-            "severity": "error",
-            "sourceLocation":
-            {
-                "end": 94,
-                "file": "A",
-                "start": 93
-            },
-            "type": "ParserError"
-        },
-        {
-            "component": "general",
-            "errorCode": "3796",
-            "formattedMessage": "Warning: Recovered in ContractDefinition at '}'.
- --> A:2:84:
-  |
-2 | pragma solidity >=0.0; contract Errort6 { using foo for  ; /* missing type name */ }
-  |                                                                                    ^
-
-",
-            "message": "Recovered in ContractDefinition at '}'.",
-            "severity": "warning",
-            "sourceLocation":
-            {
-                "end": 120,
-                "file": "A",
-                "start": 119
-            },
-            "type": "Warning"
-        }
-    ],
-    "sources": {}
-}
diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index cb462b91d6..199afe95af 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -47,15 +47,12 @@ AnalysisFramework::parseAnalyseAndReturnError(
 	string const& _source,
 	bool _reportWarnings,
 	bool _insertLicenseAndVersionPragma,
-	bool _allowMultipleErrors,
-	bool _allowRecoveryErrors
+	bool _allowMultipleErrors
 )
 {
 	compiler().reset();
 	compiler().setSources({{"", _insertLicenseAndVersionPragma ? withPreamble(_source) : _source}});
 	compiler().setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	compiler().setParserErrorRecovery(_allowRecoveryErrors);
-	_allowMultipleErrors = _allowMultipleErrors || _allowRecoveryErrors;
 	if (!compiler().parse())
 	{
 		BOOST_FAIL("Parsing contract failed in analysis test suite:" + formatErrors(compiler().errors()));
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index d36884390a..65b6940f65 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -48,8 +48,7 @@ class AnalysisFramework
 		std::string const& _source,
 		bool _reportWarnings = false,
 		bool _insertLicenseAndVersionPragma = true,
-		bool _allowMultipleErrors = false,
-		bool _allowRecoveryErrors = false
+		bool _allowMultipleErrors = false
 	);
 	virtual ~AnalysisFramework() = default;
 
diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp
index 77c01f1eaf..14ccbba46d 100644
--- a/test/libsolidity/SolidityParser.cpp
+++ b/test/libsolidity/SolidityParser.cpp
@@ -39,14 +39,13 @@ namespace solidity::frontend::test
 
 namespace
 {
-ASTPointer<ContractDefinition> parseText(std::string const& _source, ErrorList& _errors, bool errorRecovery = false)
+ASTPointer<ContractDefinition> parseText(std::string const& _source, ErrorList& _errors)
 {
 	ErrorReporter errorReporter(_errors);
 	auto charStream = CharStream(_source, "");
 	ASTPointer<SourceUnit> sourceUnit = Parser(
 		errorReporter,
-		solidity::test::CommonOptions::get().evmVersion(),
-		errorRecovery
+		solidity::test::CommonOptions::get().evmVersion()
 	).parse(charStream);
 	if (!sourceUnit)
 		return ASTPointer<ContractDefinition>();
@@ -78,12 +77,12 @@ bool successParse(std::string const& _source)
 	return true;
 }
 
-Error getError(std::string const& _source, bool errorRecovery = false)
+Error getError(std::string const& _source)
 {
 	ErrorList errors;
 	try
 	{
-		parseText(_source, errors, errorRecovery);
+		parseText(_source, errors);
 	}
 	catch (FatalError const& /*_exception*/)
 	{
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 785f142842..7d02e0a9e5 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -282,43 +282,6 @@ BOOST_AUTO_TEST_CASE(smoke_test)
 	BOOST_CHECK(containsAtMostWarnings(result));
 }
 
-BOOST_AUTO_TEST_CASE(error_recovery_field)
-{
-	auto input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"parserErrorRecovery": "1"
-		},
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-
-	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "\"settings.parserErrorRecovery\" must be a Boolean."));
-
-	input = R"(
-	{
-		"language": "Solidity",
-		"settings": {
-			"parserErrorRecovery": true
-		},
-		"sources": {
-			"empty": {
-				"content": ""
-			}
-		}
-	}
-	)";
-
-	result = compile(input);
-	BOOST_CHECK(containsAtMostWarnings(result));
-}
-
 BOOST_AUTO_TEST_CASE(optimizer_enabled_not_boolean)
 {
 	char const* input = R"(
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 0a4793d30a..e0d7a17e92 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -38,10 +38,9 @@ using namespace solidity::frontend::test;
 using namespace boost::unit_test;
 namespace fs = boost::filesystem;
 
-SyntaxTest::SyntaxTest(string const& _filename, langutil::EVMVersion _evmVersion, bool _parserErrorRecovery): CommonSyntaxTest(_filename, _evmVersion)
+SyntaxTest::SyntaxTest(string const& _filename, langutil::EVMVersion _evmVersion): CommonSyntaxTest(_filename, _evmVersion)
 {
 	m_optimiseYul = m_reader.boolSetting("optimize-yul", true);
-	m_parserErrorRecovery = _parserErrorRecovery;
 }
 
 void SyntaxTest::setupCompiler()
@@ -49,7 +48,6 @@ void SyntaxTest::setupCompiler()
 	compiler().reset();
 	compiler().setSources(withPreamble(m_sources.sources));
 	compiler().setEVMVersion(m_evmVersion);
-	compiler().setParserErrorRecovery(m_parserErrorRecovery);
 	compiler().setOptimiserSettings(
 		m_optimiseYul ?
 		OptimiserSettings::full() :
diff --git a/test/libsolidity/SyntaxTest.h b/test/libsolidity/SyntaxTest.h
index 6b3be8a28a..f4ca6d9bc9 100644
--- a/test/libsolidity/SyntaxTest.h
+++ b/test/libsolidity/SyntaxTest.h
@@ -39,13 +39,9 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
 public:
 	static std::unique_ptr<TestCase> create(Config const& _config)
 	{
-		return std::make_unique<SyntaxTest>(_config.filename, _config.evmVersion, false);
+		return std::make_unique<SyntaxTest>(_config.filename, _config.evmVersion);
 	}
-	static std::unique_ptr<TestCase> createErrorRecovery(Config const& _config)
-	{
-		return std::make_unique<SyntaxTest>(_config.filename, _config.evmVersion, true);
-	}
-	SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion, bool _parserErrorRecovery = false);
+	SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion);
 
 protected:
 	virtual void setupCompiler();
@@ -53,7 +49,6 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
 	virtual void filterObtainedErrors();
 
 	bool m_optimiseYul = true;
-	bool m_parserErrorRecovery = false;
 };
 
 }
diff --git a/test/libsolidity/errorRecoveryTests/constructor_recovers.sol b/test/libsolidity/errorRecoveryTests/constructor_recovers.sol
deleted file mode 100644
index cc03f1e89f..0000000000
--- a/test/libsolidity/errorRecoveryTests/constructor_recovers.sol
+++ /dev/null
@@ -1,20 +0,0 @@
-pragma solidity >=0.0.0;
-
-contract Error1 {
-  constructor() {
-    balances[tx.origin] = ; // missing RHS.
-  }
-
-  // Without error recovery we stop due to the above error.
-  // Error recovery however recovers at the above ';'
-  // There should be an AST for the above, albeit with error
-  // nodes.
-
-  // This function parses properly and should give AST info.
-  function five() public view returns(uint) {
-    return 5;
-  }
-}
-// ----
-// ParserError 6933: (88-89): Expected primary expression.
-// Warning 3347: (88-89): Recovered in Statement at ';'.
diff --git a/test/libsolidity/errorRecoveryTests/contract_recovery.sol b/test/libsolidity/errorRecoveryTests/contract_recovery.sol
deleted file mode 100644
index 082d91be6c..0000000000
--- a/test/libsolidity/errorRecoveryTests/contract_recovery.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract Errort6 {
-  using foo for  ; // missing type name
-}
-// ----
-// ParserError 3546: (36-37): Expected type name
-// Warning 3796: (59-60): Recovered in ContractDefinition at '}'.
diff --git a/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol b/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol
deleted file mode 100644
index ad228a7e13..0000000000
--- a/test/libsolidity/errorRecoveryTests/do_not_delete_at_error.sol
+++ /dev/null
@@ -1,15 +0,0 @@
-pragma solidity >=0.0.0;
-
-// Example to show why deleting the token at the
-// is bad when error recovery is in effect. Here, ")" is missing
-// and there is a ";" instead. That causes us to
-// not be able to synchronize to ';'. Advance again and
-// '}' is deleted and then we can't synchronize the contract.
-// There should be an an AST created this contract (with errors).
-contract Error2 {
-	mapping (address => uint balances; // missing ) before "balances"
-}
-// ----
-// ParserError 6635: (425-426): Expected ')' but got ';'
-// ParserError 6635: (425-426): Expected identifier but got ';'
-// ParserError 6635: (458-459): Expected ';' but got '}'
diff --git a/test/libsolidity/errorRecoveryTests/error_to_eos.sol b/test/libsolidity/errorRecoveryTests/error_to_eos.sol
deleted file mode 100644
index 5d09898601..0000000000
--- a/test/libsolidity/errorRecoveryTests/error_to_eos.sol
+++ /dev/null
@@ -1,23 +0,0 @@
-// Example which where scanning hits EOS, so we reset.
-// Here we recover in the contractDefinition.
-// There should be an an AST created this contract (with errors).
-contract Error2 {
-  mapping (address => uint balances) // missing ;
-}
-
-// There is no error in this contract
-contract SendCoin {
-  function sendCoin(address receiver, uint amount) public returns(bool sufficient) {
-    if (balances[msg.sender] < amount) return false;
-    balances[msg.sender] -= amount;
-    balances[receiver] += amount;
-    emit Transfer(msg.sender, receiver, amount);
-    return true;
-  }
-}
-// ----
-// ParserError 6635: (235-236): Expected identifier but got '}'
-// ParserError 6635: (276-284): Expected ';' but got 'contract'
-// ParserError 9182: (276-284): Function, variable, struct or modifier declaration expected.
-// Warning 3796: (572-573): Recovered in ContractDefinition at '}'.
-// ParserError 7858: (574-575): Expected pragma, import directive or contract/interface/library/struct/enum/constant/function/error definition.
diff --git a/test/libsolidity/errorRecoveryTests/missing_rhs.sol b/test/libsolidity/errorRecoveryTests/missing_rhs.sol
deleted file mode 100644
index aaf7a7509e..0000000000
--- a/test/libsolidity/errorRecoveryTests/missing_rhs.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-pragma solidity >=0.0.0;
-
-contract Error3 {
-	constructor() {
-	    balances[tx.origin] = ; // missing RHS.
-	}
-
-}
-// ----
-// ParserError 6933: (88-89): Expected primary expression.
-// Warning 3347: (88-89): Recovered in Statement at ';'.
diff --git a/test/libsolidity/errorRecoveryTests/multiple_errors.sol b/test/libsolidity/errorRecoveryTests/multiple_errors.sol
deleted file mode 100644
index c0a0bd32c5..0000000000
--- a/test/libsolidity/errorRecoveryTests/multiple_errors.sol
+++ /dev/null
@@ -1,29 +0,0 @@
-// An example with multiple errors.
-// Most are caught by inserting an expected token.
-// However some us S C Johnson recovery to
-// skip over tokens.
-
-pragma solidity >=0.0.0;
-
-contract Error4 {
-  constructor() {
-    balances[tx.origin] = 1 2; // missing operator
-  }
-
-  function sendCoin(address receiver, uint amount) public returns(bool sufficient) {
-    if (balances[msg.sender] < amount) return false;
-    balances[msg.sender] -= amount   // Missing ";"
-    balances[receiver] += amount   // Another missing ";"
-    emit Transfer(msg.sender  // truncated line
-    return true;
-  }
-
-
-}
-// ----
-// ParserError 6635: (242-243): Expected ';' but got 'Number'
-// ParserError 6635: (464-472): Expected ';' but got identifier
-// ParserError 6635: (522-526): Expected ';' but got 'emit'
-// ParserError 6635: (570-576): Expected ',' but got 'return'
-// ParserError 6933: (570-576): Expected primary expression.
-// Warning 3796: (581-582): Recovered in Statement at ';'.
diff --git a/test/libsolidity/errorRecoveryTests/recovery_failed_eos.sol b/test/libsolidity/errorRecoveryTests/recovery_failed_eos.sol
deleted file mode 100644
index 67c4cf7b4c..0000000000
--- a/test/libsolidity/errorRecoveryTests/recovery_failed_eos.sol
+++ /dev/null
@@ -1,10 +0,0 @@
-pragma solidity >=0.0.0;
-
-contract Error7 {
-    constructor() {
-        a =
-// ----
-// ParserError 6933: (76-76): Expected primary expression.
-// ParserError 1957: (76-76): In Statement, ';'is expected; got end of source instead.
-// ParserError 1957: (76-76): In Block, '}'is expected; got end of source instead.
-// ParserError 1957: (76-76): In ContractDefinition, '}'is expected; got end of source instead.
diff --git a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_1.sol b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_1.sol
deleted file mode 100644
index 9baa5638ec..0000000000
--- a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_1.sol
+++ /dev/null
@@ -1,3 +0,0 @@
-pragma solidity ^99.99.0;
-// ----
-// SyntaxError 3997: (0-25): Source file requires different compiler version (current compiler is ....
diff --git a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_2.sol b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_2.sol
deleted file mode 100644
index 1dcc4bc79a..0000000000
--- a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_2.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-pragma solidity ^99.99.0;
-this is surely invalid
-// ----
-// ParserError 6635: (31-33): Expected identifier but got 'is'
-// ParserError 6635: (34-40): Expected ';' but got identifier
-// ParserError 6635: (49-49): Expected ';' but got end of source
diff --git a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_3.sol b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_3.sol
deleted file mode 100644
index 40fae81162..0000000000
--- a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_3.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma solidity ^99.99.0;
-contract C {
-    uint ;
-}
-// ----
-// ParserError 6635: (48-49): Expected identifier but got ';'
-// ParserError 6635: (50-51): Expected ';' but got '}'
diff --git a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_4.sol b/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_4.sol
deleted file mode 100644
index fadf021c7b..0000000000
--- a/test/libsolidity/errorRecoveryTests/wrong_compiler_recovers_4.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-pragma solidity ^99.99.0;
-contract C {
-    function f() {}
-}
-// ----
-// SyntaxError 3997: (0-25): Source file requires different compiler version (current compiler is ....
-// SyntaxError 4937: (43-58): No visibility specified. Did you intend to add "public"?
diff --git a/test/libyul/SyntaxTest.h b/test/libyul/SyntaxTest.h
index 7234e1f2c6..27e59ee614 100644
--- a/test/libyul/SyntaxTest.h
+++ b/test/libyul/SyntaxTest.h
@@ -33,10 +33,6 @@ class SyntaxTest: public solidity::test::CommonSyntaxTest
 	{
 		return std::make_unique<SyntaxTest>(_config.filename, _config.evmVersion);
 	}
-	static std::unique_ptr<TestCase> createErrorRecovery(Config const& _config)
-	{
-		return std::make_unique<SyntaxTest>(_config.filename, _config.evmVersion);
-	}
 	SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion);
 	~SyntaxTest() override {}
 protected:
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 4a76ce4f15..43cef9d27a 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -116,7 +116,6 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 			"--include-path=/home/user/include",
 			"--allow-paths=/tmp,/home,project,../contracts",
 			"--ignore-missing",
-			"--error-recovery",
 			"--output-dir=/tmp/out",
 			"--overwrite",
 			"--evm-version=spuriousDragon",
@@ -177,7 +176,6 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 
 		expectedOptions.input.allowedDirectories = {"/tmp", "/home", "project", "../contracts", "c", "/usr/lib"};
 		expectedOptions.input.ignoreMissingFiles = true;
-		expectedOptions.input.errorRecovery = (inputMode == InputMode::Compiler);
 		expectedOptions.output.dir = "/tmp/out";
 		expectedOptions.output.overwriteFiles = true;
 		expectedOptions.output.evmVersion = EVMVersion::spuriousDragon();
@@ -405,7 +403,6 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 {
 	map<string, vector<string>> invalidOptionInputModeCombinations = {
 		// TODO: This should eventually contain all options.
-		{"--error-recovery", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--experimental-via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--metadata-literal", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},

From 9ae42aab4cd7be314ebec6947b4ba9a8d9553618 Mon Sep 17 00:00:00 2001
From: Saw-mon & Natalie <3140080+Saw-mon-and-Natalie@users.noreply.github.com>
Date: Sat, 19 Aug 2023 17:29:53 -0700
Subject: [PATCH 1561/1748] fixed a typo in KnownState.h

---
 libevmasm/KnownState.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libevmasm/KnownState.h b/libevmasm/KnownState.h
index 8c28fbb622..9cc22710fa 100644
--- a/libevmasm/KnownState.h
+++ b/libevmasm/KnownState.h
@@ -109,7 +109,7 @@ class KnownState
 
 	/// Resets any knowledge about storage.
 	void resetStorage() { m_storageContent.clear(); }
-	/// Resets any knowledge about storage.
+	/// Resets any knowledge about memory.
 	void resetMemory() { m_memoryContent.clear(); }
 	/// Resets known Keccak-256 hashes
 	void resetKnownKeccak256Hashes() { m_knownKeccak256Hashes.clear(); }

From a442f0608a6ebec0f3ebc9fc448446119632d1af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 7 Aug 2023 16:26:24 +0200
Subject: [PATCH 1562/1748] CI: Remove store_test_results to make naming less
 confusing

---
 .circleci/config.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c3e1c588bd..cb0707050a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -290,10 +290,6 @@ defaults:
   # --------------------------------------------------------------------------
   # Step Templates
 
-  # store_test_results helper
-  - store_test_results: &store_test_results
-      path: test_results/
-
   - steps_soltest: &steps_soltest
       steps:
         - checkout
@@ -303,7 +299,8 @@ defaults:
         # clang/gcc, windows/linux/macos, etc.). The executable used by these steps comes from the
         # attached workspace and we only see the items added to the workspace by jobs we depend on.
         - run: *run_soltest
-        - store_test_results: *store_test_results
+        - store_test_results:
+            path: test_results/
         - store_artifacts: *artifacts_test_results
         - matrix_notify_failure_unless_pr
 
@@ -335,7 +332,8 @@ defaults:
         - attach_workspace:
             at: build
         - run: *run_soltest_all
-        - store_test_results: *store_test_results
+        - store_test_results:
+            path: test_results/
         - store_artifacts: *artifacts_test_results
         - matrix_notify_failure_unless_pr
 
@@ -345,7 +343,8 @@ defaults:
         - attach_workspace:
             at: build
         - run: *run_cmdline_tests
-        - store_test_results: *store_test_results
+        - store_test_results:
+            path: test_results/
         - store_artifacts: *artifacts_test_results
         - matrix_notify_failure_unless_pr
 
@@ -1033,7 +1032,8 @@ jobs:
             git clone https://github.com/ethereum/solidity-fuzzing-corpus /tmp/solidity-fuzzing-corpus
             mkdir -p test_results
             scripts/regressions.py -o test_results
-      - store_test_results: *store_test_results
+      - store_test_results:
+          path: test_results/
       - store_artifacts: *artifacts_test_results
 
   b_archlinux:
@@ -1088,7 +1088,8 @@ jobs:
       - attach_workspace:
           at: .
       - run: *run_soltest
-      - store_test_results: *store_test_results
+      - store_test_results:
+          path: test_results/
       - store_artifacts: *artifacts_test_results
       - matrix_notify_failure_unless_pr
 
@@ -1509,7 +1510,8 @@ jobs:
           name: Executing solc LSP test suite
           command: python ./test/lsp.py .\build\solc\Release\solc.exe --non-interactive
           shell: powershell.exe
-      - store_test_results: *store_test_results
+      - store_test_results:
+          path: test_results/
       - store_artifacts: *artifacts_test_results
       - matrix_notify_failure_unless_pr
 

From d0dc9e7af0a33d9d243adc0392edd55834f506e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 7 Aug 2023 15:53:53 +0200
Subject: [PATCH 1563/1748] CI: Convert single-step templates into proper
 commands

---
 .circleci/config.yml | 118 +++++++++++++++++++++++++------------------
 1 file changed, 69 insertions(+), 49 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cb0707050a..5f2cd21c2d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -179,47 +179,67 @@ commands:
           paths:
             - << parameters.install_path >>
 
-defaults:
-
   # --------------------------------------------------------------------------
-  # Build Templates
+  # Build Commands
 
-  - setup_prerelease_commit_hash: &setup_prerelease_commit_hash
-      name: Store commit hash and prerelease
-      command: |
-        if [ "$CIRCLE_BRANCH" = release -o -n "$CIRCLE_TAG" ]; then echo -n > prerelease.txt; else date -u +"nightly.%Y.%-m.%-d" > prerelease.txt; fi
-        echo -n "$CIRCLE_SHA1" > commit_hash.txt
+  setup_prerelease_commit_hash:
+    steps:
+      - run:
+          name: Store commit hash and prerelease
+          command: |
+            if [[ $CIRCLE_BRANCH == release || -n $CIRCLE_TAG ]]; then
+              echo -n > prerelease.txt;
+            else
+              date -u +"nightly.%Y.%-m.%-d" > prerelease.txt;
+            fi
+            echo -n "$CIRCLE_SHA1" > commit_hash.txt
 
-  - run_build: &run_build
-      name: Build
-      command: scripts/ci/build.sh
+  run_build:
+    steps:
+      - run:
+          name: Build
+          command: scripts/ci/build.sh
+
+  run_build_ossfuzz:
+    steps:
+      - run:
+          name: Build_ossfuzz
+          command: scripts/ci/build_ossfuzz.sh
 
-  - run_build_ossfuzz: &run_build_ossfuzz
-      name: Build_ossfuzz
-      command: scripts/ci/build_ossfuzz.sh
+  run_proofs:
+    steps:
+      - run:
+          name: Correctness proofs for optimization rules
+          command: scripts/run_proofs.sh
 
-  - run_proofs: &run_proofs
-      name: Correctness proofs for optimization rules
-      command: scripts/run_proofs.sh
+  run_soltest:
+    steps:
+      - run:
+          name: soltest
+          no_output_timeout: 30m
+          command: ./.circleci/soltest.sh
 
-  - run_soltest: &run_soltest
-      name: soltest
-      no_output_timeout: 30m
-      command: ./.circleci/soltest.sh
+  run_soltest_all:
+    steps:
+      - run:
+          name: soltest_all
+          no_output_timeout: 30m
+          command: ./.circleci/soltest_all.sh
 
-  - run_soltest_all: &run_soltest_all
-      name: soltest_all
-      no_output_timeout: 30m
-      command: ./.circleci/soltest_all.sh
+  run_cmdline_tests:
+    steps:
+      - run:
+          name: command line tests
+          no_output_timeout: 30m
+          command: .circleci/parallel_cli_tests.py
 
-  - run_cmdline_tests: &run_cmdline_tests
-      name: command line tests
-      no_output_timeout: 30m
-      command: .circleci/parallel_cli_tests.py
+  run_docs_pragma_min_version:
+    steps:
+      - run:
+         name: docs pragma version check
+         command: ./scripts/docs_version_pragma_check.sh
 
-  - run_docs_pragma_min_version: &run_docs_pragma_min_version
-      name: docs pragma version check
-      command: ./scripts/docs_version_pragma_check.sh
+defaults:
 
   # --------------------------------------------------------------------------
   # Matrix templates
@@ -298,7 +318,7 @@ defaults:
         # NOTE: Different build jobs produce different soltest executables (release/debug,
         # clang/gcc, windows/linux/macos, etc.). The executable used by these steps comes from the
         # attached workspace and we only see the items added to the workspace by jobs we depend on.
-        - run: *run_soltest
+        - run_soltest
         - store_test_results:
             path: test_results/
         - store_artifacts: *artifacts_test_results
@@ -320,7 +340,7 @@ defaults:
   - steps_build: &steps_build
       steps:
         - checkout
-        - run: *run_build
+        - run_build
         - store_artifacts: *artifacts_solc
         - store_artifacts: *artifact_yul_phaser
         - persist_to_workspace: *artifacts_executables
@@ -331,7 +351,7 @@ defaults:
         - checkout
         - attach_workspace:
             at: build
-        - run: *run_soltest_all
+        - run_soltest_all
         - store_test_results:
             path: test_results/
         - store_artifacts: *artifacts_test_results
@@ -342,7 +362,7 @@ defaults:
         - checkout
         - attach_workspace:
             at: build
-        - run: *run_cmdline_tests
+        - run_cmdline_tests
         - store_test_results:
             path: test_results/
         - store_artifacts: *artifacts_test_results
@@ -867,14 +887,14 @@ jobs:
       - checkout
       - install_python3:
           packages: z3-solver
-      - run: *run_proofs
+      - run_proofs
       - matrix_notify_failure_unless_pr
 
   chk_docs_pragma_min_version:
     <<: *base_ubuntu2204_small
     steps:
       - checkout
-      - run: *run_docs_pragma_min_version
+      - run_docs_pragma_min_version
       - matrix_notify_failure_unless_pr
 
   t_ubu_pyscripts:
@@ -947,7 +967,7 @@ jobs:
       CMAKE_OPTIONS: -DCMAKE_BUILD_TYPE=Release -DUSE_Z3_DLOPEN=ON -DUSE_CVC4=OFF -DSOLC_STATIC_STDLIBS=ON
     steps:
       - checkout
-      - run: *run_build
+      - run_build
       - run:
           name: strip binary
           command: strip build/solc/solc
@@ -970,7 +990,7 @@ jobs:
       CMAKE_BUILD_TYPE: Debug
     steps:
       - checkout
-      - run: *run_build
+      - run_build
       - persist_to_workspace: *artifacts_executables
       - matrix_notify_failure_unless_pr
 
@@ -990,7 +1010,7 @@ jobs:
       - run:
           name: "Code Coverage: Syntax Tests"
           command: codecov --flags syntax --gcov-root build
-      - run: *run_soltest
+      - run_soltest
       - run:
           name: "Coverage: All"
           command: codecov --flags all --gcov-root build
@@ -1008,15 +1028,15 @@ jobs:
       MAKEFLAGS: -j 10
     steps:
       - checkout
-      - run: *run_build
+      - run_build
       - matrix_notify_failure_unless_pr
 
   b_ubu_ossfuzz: &b_ubu_ossfuzz
     <<: *base_ubuntu_clang
     steps:
       - checkout
-      - run: *setup_prerelease_commit_hash
-      - run: *run_build_ossfuzz
+      - setup_prerelease_commit_hash
+      - run_build_ossfuzz
       - persist_to_workspace: *artifacts_executables_ossfuzz
       - matrix_notify_failure_unless_pr
 
@@ -1048,7 +1068,7 @@ jobs:
           command: |
             pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake cvc4 git openssh tar
       - checkout
-      - run: *run_build
+      - run_build
       - store_artifacts: *artifacts_solc
       - persist_to_workspace: *artifacts_executables
       - matrix_notify_failure_unless_pr
@@ -1063,7 +1083,7 @@ jobs:
       - when:
           condition: true
           <<: *steps_install_dependencies_osx
-      - run: *run_build
+      - run_build
       - store_artifacts: *artifacts_solc
       - store_artifacts: *artifact_yul_phaser
       - persist_to_workspace:
@@ -1087,7 +1107,7 @@ jobs:
           <<: *steps_install_dependencies_osx
       - attach_workspace:
           at: .
-      - run: *run_soltest
+      - run_soltest
       - store_test_results:
           path: test_results/
       - store_artifacts: *artifacts_test_results
@@ -1103,7 +1123,7 @@ jobs:
           <<: *steps_install_dependencies_osx
       - attach_workspace:
           at: .
-      - run: *run_cmdline_tests
+      - run_cmdline_tests
       - store_artifacts: *artifacts_test_results
       - matrix_notify_failure_unless_pr
 
@@ -1135,7 +1155,7 @@ jobs:
     <<: *base_ubuntu2204_small
     steps:
       - checkout
-      - run: *setup_prerelease_commit_hash
+      - setup_prerelease_commit_hash
       - run:
           name: Build documentation
           command: ./docs/docs.sh

From 3d9f633bcd9303417203df76523be73ccd918e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 7 Aug 2023 16:32:12 +0200
Subject: [PATCH 1564/1748] CI: Convert artifact templates to commands

---
 .circleci/config.yml | 142 +++++++++++++++++++++++--------------------
 1 file changed, 77 insertions(+), 65 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5f2cd21c2d..6d1fc1d2f7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -239,6 +239,65 @@ commands:
          name: docs pragma version check
          command: ./scripts/docs_version_pragma_check.sh
 
+  # --------------------------------------------------------------------------
+  # Artifact Commands
+
+  store_artifacts_solc:
+    description: Store compiled solc executable as artifact
+    steps:
+      - store_artifacts:
+          path: build/solc/solc
+          destination: solc
+
+  store_artifacts_solc_windows:
+    description: Store compiled Windows solc executable as artifact
+    steps:
+      - store_artifacts:
+          path: upload/
+
+  store_artifacts_yul_phaser:
+    steps:
+      - store_artifacts:
+          path: build/tools/yul-phaser
+          destination: yul-phaser
+
+  persist_executables_to_workspace:
+    description: Persist compiled target executables to workspace
+    steps:
+      - persist_to_workspace:
+          root: build
+          paths:
+            - solc/solc
+            - test/soltest
+            - test/tools/solfuzzer
+
+  persist_ossfuzz_executables_to_workspace:
+    description: Persist compiled OSSFUZZ executables to workspace
+    steps:
+      - persist_to_workspace:
+          root: build
+          paths:
+            - test/tools/ossfuzz/abiv2_proto_ossfuzz
+            - test/tools/ossfuzz/abiv2_isabelle_ossfuzz
+            - test/tools/ossfuzz/const_opt_ossfuzz
+            - test/tools/ossfuzz/solc_mutator_ossfuzz
+            - test/tools/ossfuzz/solc_ossfuzz
+            - test/tools/ossfuzz/stack_reuse_codegen_ossfuzz
+            - test/tools/ossfuzz/strictasm_assembly_ossfuzz
+            - test/tools/ossfuzz/strictasm_diff_ossfuzz
+            - test/tools/ossfuzz/strictasm_opt_ossfuzz
+            - test/tools/ossfuzz/yul_proto_diff_ossfuzz
+            - test/tools/ossfuzz/yul_proto_diff_custom_mutate_ossfuzz
+            - test/tools/ossfuzz/yul_proto_ossfuzz
+            - test/tools/ossfuzz/sol_proto_ossfuzz
+
+  store_artifacts_test_results:
+    description: Store test output dir as artifact
+    steps:
+      - store_artifacts:
+          path: test_results/
+          destination: test_results/
+
 defaults:
 
   # --------------------------------------------------------------------------
@@ -260,53 +319,6 @@ defaults:
           - via-ir-optimize
           - via-ir-no-optimize
 
-  # --------------------------------------------------------------------------
-  # Artifacts Templates
-
-  # compiled solc executable target
-  - artifacts_solc: &artifacts_solc
-      path: build/solc/solc
-      destination: solc
-
-  # windows artifacts
-  - artifact_solc_windows: &artifact_solc_windows
-      path: upload/
-
-  - artifact_yul_phaser: &artifact_yul_phaser
-      path: build/tools/yul-phaser
-      destination: yul-phaser
-
-  # compiled executable targets
-  - artifacts_executables: &artifacts_executables
-      root: build
-      paths:
-        - solc/solc
-        - test/soltest
-        - test/tools/solfuzzer
-
-  # compiled OSSFUZZ targets
-  - artifacts_executables_ossfuzz: &artifacts_executables_ossfuzz
-      root: build
-      paths:
-        - test/tools/ossfuzz/abiv2_proto_ossfuzz
-        - test/tools/ossfuzz/abiv2_isabelle_ossfuzz
-        - test/tools/ossfuzz/const_opt_ossfuzz
-        - test/tools/ossfuzz/solc_mutator_ossfuzz
-        - test/tools/ossfuzz/solc_ossfuzz
-        - test/tools/ossfuzz/stack_reuse_codegen_ossfuzz
-        - test/tools/ossfuzz/strictasm_assembly_ossfuzz
-        - test/tools/ossfuzz/strictasm_diff_ossfuzz
-        - test/tools/ossfuzz/strictasm_opt_ossfuzz
-        - test/tools/ossfuzz/yul_proto_diff_ossfuzz
-        - test/tools/ossfuzz/yul_proto_diff_custom_mutate_ossfuzz
-        - test/tools/ossfuzz/yul_proto_ossfuzz
-        - test/tools/ossfuzz/sol_proto_ossfuzz
-
-  # test result output directory
-  - artifacts_test_results: &artifacts_test_results
-      path: test_results/
-      destination: test_results/
-
   # --------------------------------------------------------------------------
   # Step Templates
 
@@ -321,7 +333,7 @@ defaults:
         - run_soltest
         - store_test_results:
             path: test_results/
-        - store_artifacts: *artifacts_test_results
+        - store_artifacts_test_results
         - matrix_notify_failure_unless_pr
 
   - steps_test_lsp: &steps_test_lsp
@@ -341,9 +353,9 @@ defaults:
       steps:
         - checkout
         - run_build
-        - store_artifacts: *artifacts_solc
-        - store_artifacts: *artifact_yul_phaser
-        - persist_to_workspace: *artifacts_executables
+        - store_artifacts_solc
+        - store_artifacts_yul_phaser
+        - persist_executables_to_workspace
         - matrix_notify_failure_unless_pr
 
   - steps_soltest_all: &steps_soltest_all
@@ -354,7 +366,7 @@ defaults:
         - run_soltest_all
         - store_test_results:
             path: test_results/
-        - store_artifacts: *artifacts_test_results
+        - store_artifacts_test_results:
         - matrix_notify_failure_unless_pr
 
   - steps_cmdline_tests: &steps_cmdline_tests
@@ -365,7 +377,7 @@ defaults:
         - run_cmdline_tests
         - store_test_results:
             path: test_results/
-        - store_artifacts: *artifacts_test_results
+        - store_artifacts_test_results:
         - matrix_notify_failure_unless_pr
 
   - steps_install_dependencies_osx: &steps_install_dependencies_osx
@@ -991,7 +1003,7 @@ jobs:
     steps:
       - checkout
       - run_build
-      - persist_to_workspace: *artifacts_executables
+      - persist_executables_to_workspace
       - matrix_notify_failure_unless_pr
 
   t_ubu_codecov:
@@ -1014,7 +1026,7 @@ jobs:
       - run:
           name: "Coverage: All"
           command: codecov --flags all --gcov-root build
-      - store_artifacts: *artifacts_test_results
+      - store_artifacts_test_results
       - matrix_notify_failure_unless_pr
 
   # Builds in C++20 mode and uses debug build in order to speed up.
@@ -1037,7 +1049,7 @@ jobs:
       - checkout
       - setup_prerelease_commit_hash
       - run_build_ossfuzz
-      - persist_to_workspace: *artifacts_executables_ossfuzz
+      - persist_ossfuzz_executables_to_workspace
       - matrix_notify_failure_unless_pr
 
   t_ubu_ossfuzz: &t_ubu_ossfuzz
@@ -1054,7 +1066,7 @@ jobs:
             scripts/regressions.py -o test_results
       - store_test_results:
           path: test_results/
-      - store_artifacts: *artifacts_test_results
+      - store_artifacts_test_results
 
   b_archlinux:
     <<: *base_archlinux_large
@@ -1069,8 +1081,8 @@ jobs:
             pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake cvc4 git openssh tar
       - checkout
       - run_build
-      - store_artifacts: *artifacts_solc
-      - persist_to_workspace: *artifacts_executables
+      - store_artifacts_solc
+      - persist_executables_to_workspace
       - matrix_notify_failure_unless_pr
 
   b_osx:
@@ -1084,8 +1096,8 @@ jobs:
           condition: true
           <<: *steps_install_dependencies_osx
       - run_build
-      - store_artifacts: *artifacts_solc
-      - store_artifacts: *artifact_yul_phaser
+      - store_artifacts_solc
+      - store_artifacts_yul_phaser
       - persist_to_workspace:
           root: .
           paths:
@@ -1110,7 +1122,7 @@ jobs:
       - run_soltest
       - store_test_results:
           path: test_results/
-      - store_artifacts: *artifacts_test_results
+      - store_artifacts_test_results
       - matrix_notify_failure_unless_pr
 
   t_osx_cli:
@@ -1124,7 +1136,7 @@ jobs:
       - attach_workspace:
           at: .
       - run_cmdline_tests
-      - store_artifacts: *artifacts_test_results
+      - store_artifacts_test_results
       - matrix_notify_failure_unless_pr
 
   b_ems:
@@ -1499,7 +1511,7 @@ jobs:
           name: "Run solc.exe to make sure build was successful."
           command: .\build\solc\Release\solc.exe --version
           shell: powershell.exe
-      - store_artifacts: *artifact_solc_windows
+      - store_artifacts_solc_windows
       - persist_to_workspace:
           root: build
           paths:
@@ -1532,7 +1544,7 @@ jobs:
           shell: powershell.exe
       - store_test_results:
           path: test_results/
-      - store_artifacts: *artifacts_test_results
+      - store_artifacts_test_results
       - matrix_notify_failure_unless_pr
 
   # Note: b_bytecode_ubu_static is required because b_ubu_static and b_ubu

From e57581e7301e064a632c75b06b314e688f6ac2a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 7 Aug 2023 16:00:16 +0200
Subject: [PATCH 1565/1748] CI: Convert multi-step templates into proper
 commands

---
 .circleci/config.yml | 192 ++++++++++++++++++++++---------------------
 1 file changed, 99 insertions(+), 93 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6d1fc1d2f7..7206798690 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -298,6 +298,75 @@ commands:
           path: test_results/
           destination: test_results/
 
+  # --------------------------------------------------------------------------
+  # Complex Build Commands
+
+  soltest:
+    steps:
+      - checkout
+      - attach_workspace:
+          at: build
+      # NOTE: Different build jobs produce different soltest executables (release/debug,
+      # clang/gcc, windows/linux/macos, etc.). The executable used by these steps comes from the
+      # attached workspace and we only see the items added to the workspace by jobs we depend on.
+      - run_soltest
+      - store_test_results:
+          path: test_results/
+      - store_artifacts_test_results
+      - matrix_notify_failure_unless_pr
+
+  test_lsp:
+    steps:
+      - checkout
+      - attach_workspace:
+          at: build
+      - run:
+          name: Install dependencies
+          command: pip install --user deepdiff colorama
+      - run:
+          name: Executing solc LSP test suite
+          command: ./test/lsp.py ./build/solc/solc --non-interactive
+      - matrix_notify_failure_unless_pr
+
+  build:
+    steps:
+      - checkout
+      - run_build
+      - store_artifacts_solc
+      - store_artifacts_yul_phaser
+      - persist_executables_to_workspace
+      - matrix_notify_failure_unless_pr
+
+  soltest_all:
+    steps:
+      - checkout
+      - attach_workspace:
+          at: build
+      - run_soltest_all
+      - store_test_results:
+          path: test_results/
+      - store_artifacts_test_results
+      - matrix_notify_failure_unless_pr
+
+  cmdline_tests:
+    steps:
+      - checkout
+      - attach_workspace:
+          at: build
+      - run_cmdline_tests
+      - store_test_results:
+          path: test_results/
+      - store_artifacts_test_results
+      - matrix_notify_failure_unless_pr
+
+  install_dependencies_osx:
+    steps:
+      # FIXME: We used to cache dependencies on macOS but now it takes longer than just installing
+      # them each time. See https://github.com/ethereum/solidity/issues/12925.
+      - run:
+          name: Install build dependencies
+          command: ./.circleci/osx_install_dependencies.sh
+
 defaults:
 
   # --------------------------------------------------------------------------
@@ -320,74 +389,6 @@ defaults:
           - via-ir-no-optimize
 
   # --------------------------------------------------------------------------
-  # Step Templates
-
-  - steps_soltest: &steps_soltest
-      steps:
-        - checkout
-        - attach_workspace:
-            at: build
-        # NOTE: Different build jobs produce different soltest executables (release/debug,
-        # clang/gcc, windows/linux/macos, etc.). The executable used by these steps comes from the
-        # attached workspace and we only see the items added to the workspace by jobs we depend on.
-        - run_soltest
-        - store_test_results:
-            path: test_results/
-        - store_artifacts_test_results
-        - matrix_notify_failure_unless_pr
-
-  - steps_test_lsp: &steps_test_lsp
-      steps:
-        - checkout
-        - attach_workspace:
-            at: build
-        - run:
-            name: Install dependencies
-            command: pip install --user deepdiff colorama
-        - run:
-            name: Executing solc LSP test suite
-            command: ./test/lsp.py ./build/solc/solc --non-interactive
-        - matrix_notify_failure_unless_pr
-
-  - steps_build: &steps_build
-      steps:
-        - checkout
-        - run_build
-        - store_artifacts_solc
-        - store_artifacts_yul_phaser
-        - persist_executables_to_workspace
-        - matrix_notify_failure_unless_pr
-
-  - steps_soltest_all: &steps_soltest_all
-      steps:
-        - checkout
-        - attach_workspace:
-            at: build
-        - run_soltest_all
-        - store_test_results:
-            path: test_results/
-        - store_artifacts_test_results:
-        - matrix_notify_failure_unless_pr
-
-  - steps_cmdline_tests: &steps_cmdline_tests
-      steps:
-        - checkout
-        - attach_workspace:
-            at: build
-        - run_cmdline_tests
-        - store_test_results:
-            path: test_results/
-        - store_artifacts_test_results:
-        - matrix_notify_failure_unless_pr
-
-  - steps_install_dependencies_osx: &steps_install_dependencies_osx
-      steps:
-        # FIXME: We used to cache dependencies on macOS but now it takes longer than just installing
-        # them each time. See https://github.com/ethereum/solidity/issues/12925.
-        - run:
-            name: Install build dependencies
-            command: ./.circleci/osx_install_dependencies.sh
-
   # --------------------------------------------------------------------------
   # Base Image Templates
 
@@ -932,7 +933,8 @@ jobs:
     # this runs 2x faster on xlarge but takes 4x more resources (compared to medium).
     # Enough other jobs depend on it that it's worth it though.
     <<: *base_ubuntu2204_xlarge
-    <<: *steps_build
+    steps:
+      - build
 
   # x64 ASAN build, for testing for memory related bugs
   b_ubu_asan: &b_ubu_asan
@@ -942,14 +944,16 @@ jobs:
       <<: *base_ubuntu2204_env
       CMAKE_OPTIONS: -DSANITIZE=address
       CMAKE_BUILD_TYPE: Release
-    <<: *steps_build
+    steps:
+      - build
 
   b_ubu_clang: &b_ubu_clang
     <<: *base_ubuntu2204_clang_large
     environment:
       <<: *base_ubuntu2204_clang_large_env
       MAKEFLAGS: -j 10
-    <<: *steps_build
+    steps:
+      - build
 
   b_ubu_san_clang:
     # This runs a bit faster on large and xlarge but on nightly efficiency matters more.
@@ -960,7 +964,8 @@ jobs:
     environment:
       <<: *base_ubuntu2204_clang_env
       CMAKE_OPTIONS: << parameters.cmake_options >>
-    <<: *steps_build
+    steps:
+      - build
 
   b_ubu_force_release: &b_ubu_force_release
     <<: *b_ubu
@@ -1092,9 +1097,7 @@ jobs:
       CMAKE_BUILD_TYPE: Release
     steps:
       - checkout
-      - when:
-          condition: true
-          <<: *steps_install_dependencies_osx
+      - install_dependencies_osx
       - run_build
       - store_artifacts_solc
       - store_artifacts_yul_phaser
@@ -1114,9 +1117,7 @@ jobs:
       OPTIMIZE: 0
     steps:
       - checkout
-      - when:
-          condition: true
-          <<: *steps_install_dependencies_osx
+      - install_dependencies_osx
       - attach_workspace:
           at: .
       - run_soltest
@@ -1130,9 +1131,7 @@ jobs:
     parallelism: 7 # Should match number of tests in .circleci/cli.sh
     steps:
       - checkout
-      - when:
-          condition: true
-          <<: *steps_install_dependencies_osx
+      - install_dependencies_osx
       - attach_workspace:
           at: .
       - run_cmdline_tests
@@ -1179,11 +1178,13 @@ jobs:
   t_ubu_soltest_all: &t_ubu_soltest_all
     <<: *base_ubuntu2204_large
     parallelism: 50
-    <<: *steps_soltest_all
+    steps:
+      - soltest_all
 
   t_ubu_lsp: &t_ubu_lsp
     <<: *base_ubuntu2204_small
-    <<: *steps_test_lsp
+    steps:
+      - test_lsp
 
   t_archlinux_soltest: &t_archlinux_soltest
     <<: *base_archlinux
@@ -1200,9 +1201,7 @@ jobs:
           name: Install runtime dependencies
           command: |
             pacman --noconfirm -Syu --noprogressbar --needed base-devel boost cmake z3 cvc4 git openssh tar
-      - when:
-          condition: true
-          <<: *steps_soltest
+      - soltest
 
   t_ubu_clang_soltest: &t_ubu_clang_soltest
     <<: *base_ubuntu2204_clang
@@ -1214,7 +1213,8 @@ jobs:
       # The high parallelism in this job is causing the SMT tests to run out of memory,
       # so disabling for now.
       SOLTEST_FLAGS: --no-smt
-    <<: *steps_soltest
+    steps:
+      - soltest
 
   t_ubu_force_release_soltest_all: &t_ubu_force_release_soltest_all
     # NOTE: This definition is identical to t_ubu_soltest_all but in the workflow we make it depend on
@@ -1224,7 +1224,8 @@ jobs:
   t_ubu_cli: &t_ubu_cli
     <<: *base_ubuntu2204_small
     parallelism: 7 # Should match number of tests in .circleci/cli.sh
-    <<: *steps_cmdline_tests
+    steps:
+      - cmdline_tests
 
   t_ubu_force_release_cli: &t_ubu_force_release_cli
     <<: *t_ubu_cli
@@ -1248,7 +1249,8 @@ jobs:
       # Suppress CLN memory leak.
       # See: https://github.com/ethereum/solidity/issues/13891 for details.
       LSAN_OPTIONS: suppressions=/root/project/.circleci/cln-asan.supp:print_suppressions=0
-    <<: *steps_cmdline_tests
+    steps:
+      - cmdline_tests
 
   t_ubu_asan_soltest:
     <<: *base_ubuntu2204
@@ -1262,7 +1264,8 @@ jobs:
       # Suppress CLN memory leak.
       # See: https://github.com/ethereum/solidity/issues/13891 for details.
       LSAN_OPTIONS: suppressions=/root/project/.circleci/cln-asan.supp
-    <<: *steps_soltest
+    steps:
+      - soltest
 
   t_ubu_asan_clang_soltest:
     <<: *base_ubuntu2204_clang
@@ -1273,7 +1276,8 @@ jobs:
       OPTIMIZE: 0
       SOLTEST_FLAGS: --no-smt
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
-    <<: *steps_soltest
+    steps:
+      - soltest
 
   t_ubu_ubsan_clang_soltest:
     <<: *base_ubuntu2204_clang
@@ -1282,12 +1286,14 @@ jobs:
       <<: *base_ubuntu2204_clang_env
       EVM: << pipeline.parameters.evm-version >>
       SOLTEST_FLAGS: --no-smt
-    <<: *steps_soltest
+    steps:
+      - soltest
 
   t_ubu_ubsan_clang_cli:
     <<: *base_ubuntu2204_clang
     parallelism: 7 # Should match number of tests in .circleci/cli.sh
-    <<: *steps_cmdline_tests
+    steps:
+      - cmdline_tests
 
   t_ems_solcjs:
     # Unlike other t_ems jobs this one actually runs 2x faster on medium (compared to small).

From ccf2896594b9d7521e059f626a250aab0b3c8d36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 7 Aug 2023 16:40:06 +0200
Subject: [PATCH 1566/1748] CI: Remove store_artifacts_solc_windows

- For consistency: other things are also hard-coded in the Windows jobs
---
 .circleci/config.yml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7206798690..091fb70c23 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -249,12 +249,6 @@ commands:
           path: build/solc/solc
           destination: solc
 
-  store_artifacts_solc_windows:
-    description: Store compiled Windows solc executable as artifact
-    steps:
-      - store_artifacts:
-          path: upload/
-
   store_artifacts_yul_phaser:
     steps:
       - store_artifacts:
@@ -1517,7 +1511,8 @@ jobs:
           name: "Run solc.exe to make sure build was successful."
           command: .\build\solc\Release\solc.exe --version
           shell: powershell.exe
-      - store_artifacts_solc_windows
+      - store_artifacts:
+          path: upload/
       - persist_to_workspace:
           root: build
           paths:

From 97f206ea89138b5e39142d456e632a1fa10d8d29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 7 Aug 2023 16:41:48 +0200
Subject: [PATCH 1567/1748] CI: Add persist_executables_to_workspace_osx

---
 .circleci/config.yml | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 091fb70c23..32d6657343 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -265,6 +265,16 @@ commands:
             - test/soltest
             - test/tools/solfuzzer
 
+  persist_executables_to_workspace_osx:
+    description: Persist compiled target executables to workspace on macOS
+    steps:
+      - persist_to_workspace:
+          root: .
+          paths:
+            - build/solc/solc
+            - build/test/soltest
+            - build/test/tools/solfuzzer
+
   persist_ossfuzz_executables_to_workspace:
     description: Persist compiled OSSFUZZ executables to workspace
     steps:
@@ -1095,12 +1105,7 @@ jobs:
       - run_build
       - store_artifacts_solc
       - store_artifacts_yul_phaser
-      - persist_to_workspace:
-          root: .
-          paths:
-            - build/solc/solc
-            - build/test/soltest
-            - build/test/tools/solfuzzer
+      - persist_executables_to_workspace_osx
       - matrix_notify_failure_unless_pr
 
   t_osx_soltest: &t_osx_soltest

From af6d7793fbebd6dbeeddbd44fbb5593d0f5676aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 22 Aug 2023 15:51:13 +0200
Subject: [PATCH 1568/1748] CI: Remove redundant ./ prefixes from script
 invocation and path arguments

---
 .circleci/config.yml | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 32d6657343..7ae05a7aa3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -217,14 +217,14 @@ commands:
       - run:
           name: soltest
           no_output_timeout: 30m
-          command: ./.circleci/soltest.sh
+          command: .circleci/soltest.sh
 
   run_soltest_all:
     steps:
       - run:
           name: soltest_all
           no_output_timeout: 30m
-          command: ./.circleci/soltest_all.sh
+          command: .circleci/soltest_all.sh
 
   run_cmdline_tests:
     steps:
@@ -237,7 +237,7 @@ commands:
     steps:
       - run:
          name: docs pragma version check
-         command: ./scripts/docs_version_pragma_check.sh
+         command: scripts/docs_version_pragma_check.sh
 
   # --------------------------------------------------------------------------
   # Artifact Commands
@@ -329,7 +329,7 @@ commands:
           command: pip install --user deepdiff colorama
       - run:
           name: Executing solc LSP test suite
-          command: ./test/lsp.py ./build/solc/solc --non-interactive
+          command: test/lsp.py build/solc/solc --non-interactive
       - matrix_notify_failure_unless_pr
 
   build:
@@ -369,7 +369,7 @@ commands:
       # them each time. See https://github.com/ethereum/solidity/issues/12925.
       - run:
           name: Install build dependencies
-          command: ./.circleci/osx_install_dependencies.sh
+          command: .circleci/osx_install_dependencies.sh
 
 defaults:
 
@@ -803,7 +803,11 @@ jobs:
             pip install --user codespell
       - run:
           name: Check spelling
-          command: ~/.local/bin/codespell --skip "*.enc,.git,Dockerfile*,LICENSE,codespell_whitelist.txt,codespell_ignored_lines.txt" --ignore-words ./scripts/codespell_whitelist.txt --exclude-file ./scripts/codespell_ignored_lines.txt
+          command: |
+            ~/.local/bin/codespell \
+              --skip "*.enc,.git,Dockerfile*,LICENSE,codespell_whitelist.txt,codespell_ignored_lines.txt" \
+              --ignore-words scripts/codespell_whitelist.txt \
+              --exclude-file scripts/codespell_ignored_lines.txt
       - matrix_notify_failure_unless_pr
 
   chk_docs_examples:
@@ -817,7 +821,7 @@ jobs:
           command: sudo npm install -g solhint
       - run:
           name: Test Docs examples
-          command: ./test/docsCodeStyle.sh
+          command: test/docsCodeStyle.sh
       - matrix_notify_failure_unless_pr
 
   chk_coding_style:
@@ -831,13 +835,13 @@ jobs:
             sudo apt install -y shellcheck
       - run:
           name: Check for C++ coding style
-          command: ./scripts/check_style.sh
+          command: scripts/check_style.sh
       - run:
           name: checking shell scripts
-          command: ./scripts/chk_shellscripts/chk_shellscripts.sh
+          command: scripts/chk_shellscripts/chk_shellscripts.sh
       - run:
           name: Check for broken symlinks
-          command: ./scripts/check_symlinks.sh
+          command: scripts/check_symlinks.sh
       - matrix_notify_failure_unless_pr
 
   chk_errorcodes:
@@ -846,7 +850,7 @@ jobs:
       - checkout
       - run:
           name: Check for error codes
-          command: ./scripts/error_codes.py --check
+          command: scripts/error_codes.py --check
       - matrix_notify_failure_unless_pr
 
   chk_pylint:
@@ -866,7 +870,7 @@ jobs:
       - run: pylint --version
       - run:
           name: Linting Python Scripts
-          command: ./scripts/pylint_all.py
+          command: scripts/pylint_all.py
       - matrix_notify_failure_unless_pr
 
   chk_antlr_grammar:
@@ -880,7 +884,7 @@ jobs:
             sudo apt install -y openjdk-17-jdk
       - run:
           name: Run tests
-          command: ./scripts/test_antlr_grammar.sh
+          command: scripts/test_antlr_grammar.sh
       - matrix_notify_failure_unless_pr
 
   chk_buglist:
@@ -895,7 +899,7 @@ jobs:
             npm install mktemp
       - run:
           name: Test buglist
-          command: ./test/buglistTests.js
+          command: test/buglistTests.js
       - matrix_notify_failure_unless_pr
 
   chk_proofs:
@@ -1168,7 +1172,7 @@ jobs:
       - setup_prerelease_commit_hash
       - run:
           name: Build documentation
-          command: ./docs/docs.sh
+          command: docs/docs.sh
       - store_artifacts:
           path: docs/_build/html/
           destination: docs-html
@@ -1546,7 +1550,7 @@ jobs:
           command: python -m pip install --user deepdiff colorama
       - run:
           name: Executing solc LSP test suite
-          command: python ./test/lsp.py .\build\solc\Release\solc.exe --non-interactive
+          command: python test/lsp.py build\solc\Release\solc.exe --non-interactive
           shell: powershell.exe
       - store_test_results:
           path: test_results/

From 8e9496eb8bef165797b7c7dd73fda76893049c66 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Mon, 13 Sep 2021 20:37:16 +0200
Subject: [PATCH 1569/1748] Change semantic tests to use the proper via IR
 pipeline, without rerunning on exceptions

---
 .../SolidityExecutionFramework.cpp            | 50 ++-----------------
 1 file changed, 5 insertions(+), 45 deletions(-)

diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index 7b79def1ed..c8ec180884 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -25,6 +25,7 @@
 #include <test/libsolidity/util/Common.h>
 
 #include <liblangutil/DebugInfoSelection.h>
+#include <libyul/Exceptions.h>
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
@@ -60,13 +61,14 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 	m_compiler.setEVMVersion(m_evmVersion);
 	m_compiler.setEOFVersion(m_eofVersion);
 	m_compiler.setOptimiserSettings(m_optimiserSettings);
-	m_compiler.enableEvmBytecodeGeneration(!m_compileViaYul);
-	m_compiler.enableIRGeneration(m_compileViaYul);
+	m_compiler.enableEvmBytecodeGeneration(true);
+	m_compiler.setViaIR(m_compileViaYul);
 	m_compiler.setRevertStringBehaviour(m_revertStrings);
 	if (!m_appendCBORMetadata) {
 		m_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
 	}
 	m_compiler.setMetadataHash(m_metadataHash);
+
 	if (!m_compiler.compile())
 	{
 		// The testing framework expects an exception for
@@ -80,49 +82,7 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 		BOOST_ERROR("Compiling contract failed");
 	}
 	string contractName(_contractName.empty() ? m_compiler.lastContractName(_mainSourceName) : _contractName);
-	evmasm::LinkerObject obj;
-	if (m_compileViaYul)
-	{
-		// Try compiling twice: If the first run fails due to stack errors, forcefully enable
-		// the optimizer.
-		for (bool forceEnableOptimizer: {false, true})
-		{
-			OptimiserSettings optimiserSettings = m_optimiserSettings;
-			if (!forceEnableOptimizer && !optimiserSettings.runYulOptimiser)
-			{
-				// Enable some optimizations on the first run
-				optimiserSettings.runYulOptimiser = true;
-				optimiserSettings.yulOptimiserSteps = "uljmul jmul";
-			}
-			else if (forceEnableOptimizer)
-				optimiserSettings = OptimiserSettings::full();
-
-			yul::YulStack asmStack(
-				m_evmVersion,
-				m_eofVersion,
-				yul::YulStack::Language::StrictAssembly,
-				optimiserSettings,
-				DebugInfoSelection::All()
-			);
-			bool analysisSuccessful = asmStack.parseAndAnalyze("", m_compiler.yulIROptimized(contractName));
-			solAssert(analysisSuccessful, "Code that passed analysis in CompilerStack can't have errors");
-
-			try
-			{
-				asmStack.optimize();
-				obj = std::move(*asmStack.assemble(yul::YulStack::Machine::EVM).bytecode);
-				obj.link(_libraryAddresses);
-				break;
-			}
-			catch (...)
-			{
-				if (forceEnableOptimizer || optimiserSettings == OptimiserSettings::full())
-					throw;
-			}
-		}
-	}
-	else
-		obj = m_compiler.object(contractName);
+	evmasm::LinkerObject obj = m_compiler.object(contractName);
 	BOOST_REQUIRE(obj.linkReferences.empty());
 	if (m_showMetadata)
 		cout << "metadata: " << m_compiler.metadata(contractName) << endl;

From bc6d10f11d2594465edf77e9fa60976ea1b3d00a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 22 Aug 2023 20:00:00 +0200
Subject: [PATCH 1570/1748] SemanticTest: Add a setting that explicitly states
 the minimal Yul optimization level that avoids "Stack too deep"

---
 test/libsolidity/SemanticTest.cpp | 103 ++++++++++++++++++++++++++++--
 test/libsolidity/SemanticTest.h   |  25 +++++++-
 2 files changed, 123 insertions(+), 5 deletions(-)

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 50f2a3cf10..c33ceecea9 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -45,6 +45,17 @@ using namespace boost::algorithm;
 using namespace boost::unit_test;
 namespace fs = boost::filesystem;
 
+ostream& solidity::frontend::test::operator<<(ostream& _output, RequiresYulOptimizer _requiresYulOptimizer)
+{
+	switch (_requiresYulOptimizer)
+	{
+	case RequiresYulOptimizer::False: _output << "false"; break;
+	case RequiresYulOptimizer::MinimalStack: _output << "minimalStack"; break;
+	case RequiresYulOptimizer::Full: _output << "full"; break;
+	}
+	return _output;
+}
+
 SemanticTest::SemanticTest(
 	string const& _filename,
 	langutil::EVMVersion _evmVersion,
@@ -66,6 +77,16 @@ SemanticTest::SemanticTest(
 	static set<string> const yulRunTriggers{"also", "true"};
 	static set<string> const legacyRunTriggers{"also", "false", "default"};
 
+	m_requiresYulOptimizer = m_reader.enumSetting<RequiresYulOptimizer>(
+		"requiresYulOptimizer",
+		{
+			{toString(RequiresYulOptimizer::False), RequiresYulOptimizer::False},
+			{toString(RequiresYulOptimizer::MinimalStack), RequiresYulOptimizer::MinimalStack},
+			{toString(RequiresYulOptimizer::Full), RequiresYulOptimizer::Full},
+		},
+		toString(RequiresYulOptimizer::False)
+	);
+
 	m_runWithABIEncoderV1Only = m_reader.boolSetting("ABIEncoderV1Only", false);
 	if (m_runWithABIEncoderV1Only && !solidity::test::CommonOptions::get().useABIEncoderV1)
 		m_shouldRun = false;
@@ -272,15 +293,38 @@ optional<AnnotatedEventSignature> SemanticTest::matchEvent(util::h256 const& has
 	return result;
 }
 
+frontend::OptimiserSettings SemanticTest::optimizerSettingsFor(RequiresYulOptimizer _requiresYulOptimizer)
+{
+	switch (_requiresYulOptimizer) {
+	case RequiresYulOptimizer::False:
+		return OptimiserSettings::minimal();
+	case RequiresYulOptimizer::MinimalStack:
+	{
+		OptimiserSettings settings = OptimiserSettings::minimal();
+		settings.runYulOptimiser = true;
+		settings.yulOptimiserSteps = "uljmul jmul";
+		return settings;
+	}
+	case RequiresYulOptimizer::Full:
+		return OptimiserSettings::full();
+	}
+	unreachable();
+}
+
 TestCase::TestResult SemanticTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
 {
 	TestResult result = TestResult::Success;
 
 	if (m_testCaseWantsLegacyRun && !m_eofVersion.has_value())
-		result = runTest(_stream, _linePrefix, _formatted, false);
+		result = runTest(_stream, _linePrefix, _formatted, false /* _isYulRun */);
 
 	if (m_testCaseWantsYulRun && result == TestResult::Success)
-		result = runTest(_stream, _linePrefix, _formatted, true);
+	{
+		if (solidity::test::CommonOptions::get().optimize)
+			result = runTest(_stream, _linePrefix, _formatted, true /* _isYulRun */);
+		else
+			result = tryRunTestWithYulOptimizer(_stream, _linePrefix, _formatted);
+	}
 
 	if (result != TestResult::Success)
 		solidity::test::CommonOptions::get().printSelectedOptions(
@@ -296,7 +340,8 @@ TestCase::TestResult SemanticTest::runTest(
 	ostream& _stream,
 	string const& _linePrefix,
 	bool _formatted,
-	bool _isYulRun)
+	bool _isYulRun
+)
 {
 	bool success = true;
 	m_gasCostFailure = false;
@@ -470,6 +515,53 @@ TestCase::TestResult SemanticTest::runTest(
 	return TestResult::Success;
 }
 
+TestCase::TestResult SemanticTest::tryRunTestWithYulOptimizer(
+	std::ostream& _stream,
+	std::string const& _linePrefix,
+	bool _formatted
+)
+{
+	TestResult result{};
+	for (auto requiresYulOptimizer: {
+		RequiresYulOptimizer::False,
+		RequiresYulOptimizer::MinimalStack,
+		RequiresYulOptimizer::Full,
+	})
+	{
+		ScopedSaveAndRestore optimizerSettings(
+			m_optimiserSettings,
+			optimizerSettingsFor(requiresYulOptimizer)
+		);
+
+		try
+		{
+			result = runTest(_stream, _linePrefix, _formatted, true /* _isYulRun */);
+		}
+		catch (yul::StackTooDeepError const&)
+		{
+			if (requiresYulOptimizer == RequiresYulOptimizer::Full)
+				throw;
+			else
+				continue;
+		}
+
+		if (m_requiresYulOptimizer != requiresYulOptimizer && result != TestResult::FatalError)
+		{
+			soltestAssert(result == TestResult::Success || result == TestResult::Failure);
+
+			AnsiColorized(_stream, _formatted, {BOLD, YELLOW})
+				<< _linePrefix << endl
+				<< _linePrefix << "requiresYulOptimizer is set to " << m_requiresYulOptimizer
+				<< " but should be " << requiresYulOptimizer << endl;
+			m_requiresYulOptimizer = requiresYulOptimizer;
+			return TestResult::Failure;
+		}
+
+		return result;
+	}
+	unreachable();
+}
+
 bool SemanticTest::checkGasCostExpectation(TestFunctionCall& io_test, bool _compileViaYul) const
 {
 	string setting =
@@ -581,7 +673,10 @@ void SemanticTest::printUpdatedSettings(ostream& _stream, string const& _linePre
 
 	_stream << _linePrefix << "// ====" << endl;
 	for (auto const& [settingName, settingValue]: settings)
-		_stream << _linePrefix << "// " << settingName << ": " << settingValue<< endl;
+		if (settingName == "requiresYulOptimizer")
+			_stream << _linePrefix << "// " << settingName << ": " << m_requiresYulOptimizer << endl;
+		else
+			_stream << _linePrefix << "// " << settingName << ": " << settingValue<< endl;
 }
 
 void SemanticTest::parseExpectations(istream& _stream)
diff --git a/test/libsolidity/SemanticTest.h b/test/libsolidity/SemanticTest.h
index b5b7be83af..efc2b59030 100644
--- a/test/libsolidity/SemanticTest.h
+++ b/test/libsolidity/SemanticTest.h
@@ -37,6 +37,15 @@ struct AnnotatedEventSignature
 	std::vector<std::string> nonIndexedTypes;
 };
 
+enum class RequiresYulOptimizer
+{
+	False,
+	MinimalStack,
+	Full,
+};
+
+std::ostream& operator<<(std::ostream& _output, RequiresYulOptimizer _requiresYulOptimizer);
+
 /**
  * Class that represents a semantic test (or end-to-end test) and allows running it as part of the
  * boost unit test environment or isoltest. It reads the Solidity source and an additional comment
@@ -83,13 +92,26 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 	bool deploy(std::string const& _contractName, u256 const& _value, bytes const& _arguments, std::map<std::string, solidity::test::Address> const& _libraries = {});
 
 private:
-	TestResult runTest(std::ostream& _stream, std::string const& _linePrefix, bool _formatted, bool _isYulRun);
+	TestResult runTest(
+		std::ostream& _stream,
+		std::string const& _linePrefix,
+		bool _formatted,
+		bool _isYulRun
+	);
+	TestResult tryRunTestWithYulOptimizer(
+		std::ostream& _stream,
+		std::string const& _linePrefix,
+		bool _formatted
+	);
 	bool checkGasCostExpectation(TestFunctionCall& io_test, bool _compileViaYul) const;
 	std::map<std::string, Builtin> makeBuiltins();
 	std::vector<SideEffectHook> makeSideEffectHooks() const;
 	std::vector<std::string> eventSideEffectHook(FunctionCall const&) const;
 	std::optional<AnnotatedEventSignature> matchEvent(util::h256 const& hash) const;
 	static std::string formatEventParameter(std::optional<AnnotatedEventSignature> _signature, bool _indexed, size_t _index, bytes const& _data);
+
+	OptimiserSettings optimizerSettingsFor(RequiresYulOptimizer _requiresYulOptimizer);
+
 	SourceMap m_sources;
 	std::size_t m_lineOffset;
 	std::vector<TestFunctionCall> m_tests;
@@ -101,6 +123,7 @@ class SemanticTest: public SolidityExecutionFramework, public EVMVersionRestrict
 	bool m_allowNonExistingFunctions = false;
 	bool m_gasCostFailure = false;
 	bool m_enforceGasCost = false;
+	RequiresYulOptimizer m_requiresYulOptimizer{};
 	u256 m_enforceGasCostMinValue;
 };
 

From b9db435684416bf9c1007dba479378cf25e84aef Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 14 Sep 2021 16:58:40 +0200
Subject: [PATCH 1571/1748] Rerun SolidityEndToEndTest.cpp tests on stack
 errors.

---
 test/libsolidity/SolidityEndToEndTest.cpp | 34 +++++++++++++++++------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index b174419d21..c6304b727d 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -35,6 +35,8 @@
 #include <libsolutil/Keccak256.h>
 #include <libsolutil/ErrorCodes.h>
 
+#include <libyul/Exceptions.h>
+
 #include <boost/test/unit_test.hpp>
 
 #include <range/v3/view/transform.hpp>
@@ -51,16 +53,32 @@ using namespace solidity::util;
 using namespace solidity::test;
 using namespace solidity::langutil;
 
-#define ALSO_VIA_YUL(CODE)                      \
-{                                               \
-	m_compileViaYul = false;                    \
-	{ CODE }                                    \
-                                                \
-	m_compileViaYul = true;                     \
-	reset();                                    \
-	{ CODE }                                    \
+#define ALSO_VIA_YUL(CODE)                                      \
+{                                                               \
+	m_compileViaYul = false;                                    \
+	RUN_AND_RERUN_WITH_OPTIMIZER_ON_STACK_ERROR(CODE)           \
+                                                                \
+	m_compileViaYul = true;                                     \
+	reset();                                                    \
+	RUN_AND_RERUN_WITH_OPTIMIZER_ON_STACK_ERROR(CODE)           \
+}
+
+#define RUN_AND_RERUN_WITH_OPTIMIZER_ON_STACK_ERROR(CODE)       \
+{                                                               \
+	try                                                         \
+	{ CODE }                                                    \
+	catch (yul::StackTooDeepError const&)                       \
+	{                                                           \
+		if (m_optimiserSettings == OptimiserSettings::full())   \
+			throw;                                              \
+                                                                \
+		reset();                                                \
+		m_optimiserSettings = OptimiserSettings::full();        \
+		{ CODE }                                                \
+	}                                                           \
 }
 
+
 namespace solidity::frontend::test
 {
 

From ffd495bd895b64bc920d102cfbf3e32190967b9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 22 Aug 2023 18:41:10 +0200
Subject: [PATCH 1572/1748] Increase gas in call_options_overload test to make
 it pass on homestead

- After the test framework changes it fails via Yul on Homestead but passes on all other EVM versions and on legacy. The test itself does not seem to be testing these specific numbers so and increasing them resolves the problem.
---
 .../semanticTests/functionCall/call_options_overload.sol    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/libsolidity/semanticTests/functionCall/call_options_overload.sol b/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
index 5e889e925f..b9eb6ca428 100644
--- a/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
+++ b/test/libsolidity/semanticTests/functionCall/call_options_overload.sol
@@ -3,9 +3,9 @@ contract C {
     function f(uint x, uint y) external payable returns (uint) { return 2; }
     function call() public payable returns (uint v, uint x, uint y, uint z) {
         v = this.f{value: 10}(2);
-        x = this.f{gas: 1000}(2, 3);
-        y = this.f{gas: 1000, value: 10}(2, 3);
-        z = this.f{value: 10, gas: 1000}(2, 3);
+        x = this.f{gas: 10000}(2, 3);
+        y = this.f{gas: 10000, value: 10}(2, 3);
+        z = this.f{value: 10, gas: 10000}(2, 3);
     }
     function bal() external returns (uint) { return address(this).balance; }
     receive() external payable {}

From 38decf05dd387cc1542acd7acfc51bd08dc7bee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 22 Aug 2023 19:52:37 +0200
Subject: [PATCH 1573/1748] Update gas expectations

---
 ..._encode_v2_in_function_inherited_in_v1_contract.sol |  2 +-
 .../calldata_overlapped_dynamic_arrays.sol             |  2 +-
 .../array/array_storage_index_boundary_test.sol        |  4 ++--
 .../semanticTests/array/byte_array_transitional_2.sol  |  2 +-
 .../array/copying/array_copy_different_packing.sol     |  2 +-
 .../array/copying/array_copy_nested_array.sol          |  2 +-
 .../copying/array_copy_storage_to_memory_nested.sol    |  2 +-
 .../array/copying/array_nested_memory_to_storage.sol   |  2 +-
 ..._of_structs_containing_arrays_memory_to_storage.sol |  2 +-
 .../semanticTests/array/copying/array_to_mapping.sol   |  2 +-
 .../array/copying/bytes_storage_to_storage.sol         | 10 +++++-----
 .../copying/copy_byte_array_in_struct_to_storage.sol   |  4 ++--
 .../copying/copy_function_internal_storage_array.sol   |  2 +-
 ..._of_nested_array_of_structs_calldata_to_storage.sol |  4 ++--
 ...ts_of_nested_array_of_structs_memory_to_storage.sol |  6 +++---
 .../array/copying/function_type_array_to_storage.sol   |  4 ++--
 .../array/copying/memory_dyn_2d_bytes_to_storage.sol   |  2 +-
 .../nested_array_of_structs_calldata_to_storage.sol    |  6 +++---
 .../nested_array_of_structs_memory_to_storage.sol      |  6 +++---
 .../nested_array_of_structs_storage_to_storage.sol     |  2 +-
 .../array/copying/storage_memory_nested_bytes.sol      |  2 +-
 .../array/delete/bytes_delete_element.sol              |  2 +-
 .../semanticTests/array/function_array_cross_calls.sol |  2 +-
 .../array/pop/array_pop_uint16_transition.sol          |  2 +-
 .../array/pop/byte_array_pop_long_storage_empty.sol    |  2 +-
 .../array/pop/byte_array_pop_masking_long.sol          |  2 +-
 .../array/push/byte_array_push_transition.sol          |  2 +-
 .../semanticTests/array/push/push_no_args_bytes.sol    |  2 +-
 .../semanticTests/byte_array_to_storage_cleanup.sol    |  2 +-
 .../constructor/arrays_in_constructors.sol             |  2 +-
 .../constructor/bytes_in_constructors_packer.sol       |  2 +-
 .../constructor/constructor_static_array_argument.sol  |  2 +-
 .../externalContracts/prbmath_unsigned.sol             |  2 +-
 .../semanticTests/externalContracts/ramanujan_pi.sol   |  2 +-
 .../semanticTests/externalContracts/strings.sol        |  4 ++--
 .../semanticTests/immutable/multi_creation.sol         |  2 +-
 .../libraries/internal_types_in_library.sol            |  2 +-
 .../semanticTests/storage/empty_nonempty_empty.sol     |  2 +-
 .../structs/copy_substructures_from_mapping.sol        |  2 +-
 .../structs/copy_substructures_to_mapping.sol          |  6 +++---
 .../semanticTests/structs/copy_to_mapping.sol          |  8 ++++----
 .../semanticTests/various/destructuring_assignment.sol |  2 +-
 42 files changed, 62 insertions(+), 62 deletions(-)

diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index 901e158dbc..07e517b2d1 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -30,6 +30,6 @@ contract C is B {
 }
 // ----
 // test() -> 77
-// gas irOptimized: 110731
+// gas irOptimized: 110325
 // gas legacy: 151866
 // gas legacyOptimized: 110359
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
index 2af8b8cde9..a923360971 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_overlapped_dynamic_arrays.sol
@@ -33,7 +33,7 @@ contract C {
 // f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1, 5, 6 -> 0x20, 0x40, 5, 2
 // f_which(uint256[],uint256[2],uint256): 0x40, 1, 2, 1 -> FAILURE
 // f_storage(uint256[],uint256[2]): 0x20, 1, 2 -> 0x20, 0x60, 0x20, 1, 2
-// gas irOptimized: 111639
+// gas irOptimized: 111642
 // gas legacy: 112944
 // gas legacyOptimized: 112092
 // f_storage(uint256[],uint256[2]): 0x40, 1, 2, 5, 6 -> 0x20, 0x80, 0x20, 2, 5, 6
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
index a9e4fd8d33..c77aad0a45 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_boundary_test.sol
@@ -16,11 +16,11 @@ contract C {
 // test_boundary_check(uint256,uint256): 1, 1 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 10, 10 -> FAILURE, hex"4e487b71", 0x32
 // test_boundary_check(uint256,uint256): 256, 256 -> FAILURE, hex"4e487b71", 0x32
-// gas irOptimized: 137904
+// gas irOptimized: 137913
 // gas legacy: 133633
 // gas legacyOptimized: 114354
 // test_boundary_check(uint256,uint256): 256, 255 -> 0
-// gas irOptimized: 140039
+// gas irOptimized: 140048
 // gas legacy: 135949
 // gas legacyOptimized: 116533
 // test_boundary_check(uint256,uint256): 256, 0xFFFF -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index 92f58bd110..ae3d23a63b 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 125212
+// gas irOptimized: 125058
 // gas legacy: 150372
 // gas legacyOptimized: 146391
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 6d83f3758c..f039ce0be3 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -18,6 +18,6 @@ contract c {
 }
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 208044
+// gas irOptimized: 208053
 // gas legacy: 221769
 // gas legacyOptimized: 220611
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index 4297f11fc2..5e4adaa496 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -12,6 +12,6 @@ contract c {
 }
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
-// gas irOptimized: 689666
+// gas irOptimized: 689654
 // gas legacy: 686178
 // gas legacyOptimized: 685628
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
index 86c76e7651..6bd31ca5af 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_to_memory_nested.sol
@@ -15,6 +15,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 2, 0x40, 0xa0, 2, 0, 1, 2, 2, 3
-// gas irOptimized: 161627
+// gas irOptimized: 161624
 // gas legacy: 162203
 // gas legacyOptimized: 159934
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index 9bd19d6299..1bc50ab80a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -38,7 +38,7 @@ contract Test {
 }
 // ----
 // test() -> 24
-// gas irOptimized: 226661
+// gas irOptimized: 226666
 // gas legacy: 227084
 // gas legacyOptimized: 226529
 // test1() -> 3
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
index de7553c282..a388482943 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 3, 3, 3, 1
-// gas irOptimized: 181912
+// gas irOptimized: 181894
diff --git a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
index 540c6516fe..50ea19a1ea 100644
--- a/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_to_mapping.sol
@@ -37,7 +37,7 @@ contract C {
 }
 // ----
 // from_storage() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 147868
+// gas irOptimized: 147871
 // gas legacy: 148896
 // gas legacyOptimized: 146901
 // from_storage_ptr() -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 5b96afb03a..4b91f666c3 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -17,25 +17,25 @@ contract c {
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 109794
+// gas irOptimized: 109839
 // gas legacy: 123948
 // gas legacyOptimized: 118948
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 124047
+// gas irOptimized: 124049
 // gas legacy: 140362
 // gas legacyOptimized: 135386
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 130663
+// gas irOptimized: 130665
 // gas legacy: 147916
 // gas legacyOptimized: 142278
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 139543
+// gas irOptimized: 139545
 // gas legacy: 171136
 // gas legacyOptimized: 161538
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 442419
+// gas irOptimized: 442421
 // gas legacy: 505021
 // gas legacyOptimized: 486997
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index cc2344cea9..fdcc188353 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -35,11 +35,11 @@ contract C {
 }
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179737
+// gas irOptimized: 179734
 // gas legacy: 181001
 // gas legacyOptimized: 180018
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 106666
+// gas irOptimized: 106663
 // gas legacy: 109720
 // gas legacyOptimized: 106932
 // h() -> 0x40, 0x60, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index 850803c138..8ee78ab9bc 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -15,6 +15,6 @@ contract C {
 }
 // ----
 // test() -> 7
-// gas irOptimized: 122454
+// gas irOptimized: 122456
 // gas legacy: 205176
 // gas legacyOptimized: 204971
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
index 1214a73dbf..0562be2e27 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
@@ -31,8 +31,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 327844
+// gas irOptimized: 327847
 // test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
 // gas irOptimized: 140870
 // test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 188515
+// gas irOptimized: 188517
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
index b3eda21223..74dfa2d7a4 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
@@ -31,8 +31,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 332687
+// gas irOptimized: 332666
 // test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 145161
+// gas irOptimized: 145152
 // test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 192608
+// gas irOptimized: 192602
diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
index 53455e9eb5..a357147c56 100644
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
@@ -46,11 +46,11 @@ contract C {
 }
 // ----
 // test() -> 0x20, 0x14, "[a called][b called]"
-// gas irOptimized: 116631
+// gas irOptimized: 116633
 // gas legacy: 118936
 // gas legacyOptimized: 116975
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 103241
+// gas irOptimized: 103243
 // gas legacy: 102745
 // gas legacyOptimized: 101669
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index f659c28d62..1dd321d45f 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 3
-// gas irOptimized: 128273
+// gas irOptimized: 128264
 // gas legacy: 130584
 // gas legacyOptimized: 129028
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
index 52dcb25659..27046de2bf 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
@@ -29,8 +29,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 304751
+// gas irOptimized: 304720
 // test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 116449
+// gas irOptimized: 116455
 // test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 188004
+// gas irOptimized: 188006
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
index 48513d0019..2ebf292215 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
@@ -29,8 +29,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 309071
+// gas irOptimized: 309077
 // test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 118264
+// gas irOptimized: 118258
 // test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 191003
+// gas irOptimized: 190997
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
index be2e2447e3..c356e029f6 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_storage_to_storage.sol
@@ -65,5 +65,5 @@ contract C {
 // test1()
 // gas irOptimized: 123202
 // test2()
-// gas irOptimized: 123030
+// gas irOptimized: 123027
 // test3()
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index 5bbff52fb6..d394b65829 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -11,6 +11,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
-// gas irOptimized: 202738
+// gas irOptimized: 202735
 // gas legacy: 204798
 // gas legacyOptimized: 203357
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index 583f6af17f..4992898204 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test1() -> true
-// gas irOptimized: 206086
+// gas irOptimized: 206386
 // gas legacy: 254056
 // gas legacyOptimized: 246892
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index a2bc2ff900..e91608966a 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -42,6 +42,6 @@ contract C {
 }
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 256074
+// gas irOptimized: 256077
 // gas legacy: 441556
 // gas legacyOptimized: 279321
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index 93e1512bc4..a999ba5132 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 38, 28, 18
-// gas irOptimized: 148087
+// gas irOptimized: 148543
 // gas legacy: 151184
 // gas legacyOptimized: 142418
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
index 68e52a1959..a3ba9d4d21 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_long_storage_empty.sol
@@ -16,7 +16,7 @@ contract c {
 }
 // ----
 // test() -> true
-// gas irOptimized: 140056
+// gas irOptimized: 140154
 // gas legacy: 178397
 // gas legacyOptimized: 163832
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index e4e0b0b0dd..07bad3a26d 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -9,6 +9,6 @@ contract c {
 }
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 107969
+// gas irOptimized: 107976
 // gas legacy: 125420
 // gas legacyOptimized: 122472
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 3b49b22d78..808d0d8661 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -15,6 +15,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 172113
+// gas irOptimized: 171996
 // gas legacy: 215891
 // gas legacyOptimized: 203615
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 6a2b70153a..162f498173 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -21,7 +21,7 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 182497
+// gas irOptimized: 182707
 // gas legacy: 183445
 // gas legacyOptimized: 178995
 // l() -> 70
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index c09528d2ba..95d3b916f6 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,7 +28,7 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 439080
+// gas irOptimized: 442530
 // gas legacy: 711299
 // gas legacyOptimized: 481296
 // h() -> 0x20, 0x40, 0x00, 0
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index 2bfab4fe6c..f9038fb762 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 424511
+// gas irOptimized: 424508
 // gas legacy: 581443
 // gas legacyOptimized: 444588
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index b4d5dd880f..3361fa310b 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 275287
+// gas irOptimized: 275487
 // gas legacy: 418462
 // gas legacyOptimized: 291760
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index 75fa809ed5..4698d26ee6 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -9,7 +9,7 @@ contract C {
 }
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 171018
+// gas irOptimized: 170999
 // gas legacy: 218378
 // gas legacyOptimized: 176195
 // a() -> 1
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 1e546feab8..1ecfc154a1 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,7 +48,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1723462
+// gas irOptimized: 1723666
 // gas legacy: 2210160
 // gas legacyOptimized: 1734152
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index 19a79f5373..a1f1d63952 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -33,7 +33,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 406643
+// gas irOptimized: 407075
 // gas legacy: 631753
 // gas legacyOptimized: 459425
 // prb_pi() -> 3141592656369545286
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index c3eba4e0ff..41820c8a45 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,7 +49,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 632372
+// gas irOptimized: 633020
 // gas legacy: 1065857
 // gas legacyOptimized: 725207
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
@@ -69,6 +69,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 1981664
+// gas irOptimized: 1981677
 // gas legacy: 4235651
 // gas legacyOptimized: 2319622
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index e038614509..4302b42e1b 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -27,7 +27,7 @@ contract C {
 }
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 124003
+// gas irOptimized: 124024
 // gas legacy: 148528
 // gas legacyOptimized: 123971
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index 8a4356061d..3da10930c5 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -22,6 +22,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 4, 0x11
-// gas irOptimized: 112115
+// gas irOptimized: 112046
 // gas legacy: 135413
 // gas legacyOptimized: 119325
diff --git a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
index 7897144d52..5f32421657 100644
--- a/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
+++ b/test/libsolidity/semanticTests/storage/empty_nonempty_empty.sol
@@ -22,7 +22,7 @@ contract Test {
 // set(bytes): 0x20, 0
 // storageEmpty -> 1
 // set(bytes): 0x20, 66, "12345678901234567890123456789012", "12345678901234567890123456789012", "12"
-// gas irOptimized: 111878
+// gas irOptimized: 111886
 // gas legacy: 112734
 // gas legacyOptimized: 112115
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
index b6e374f2a2..902cc80e5a 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
@@ -44,7 +44,7 @@ contract C {
 }
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121584
+// gas irOptimized: 121598
 // gas legacy: 123208
 // gas legacyOptimized: 121766
 // to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
index 2e1d5cb2d4..66716e4002 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
@@ -52,14 +52,14 @@ contract C {
 }
 // ----
 // from_memory() -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 123028
+// gas irOptimized: 123034
 // gas legacy: 130227
 // gas legacyOptimized: 128761
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121703
+// gas irOptimized: 121709
 // gas legacy: 123282
 // gas legacyOptimized: 121871
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115113
+// gas irOptimized: 115131
 // gas legacy: 122516
 // gas legacyOptimized: 120807
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
index 5b55a99b92..30df195d8e 100644
--- a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
@@ -45,18 +45,18 @@ contract C {
 }
 // ----
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121680
+// gas irOptimized: 121686
 // gas legacy: 123144
 // gas legacyOptimized: 121811
 // from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121725
+// gas irOptimized: 121731
 // gas legacy: 123193
 // gas legacyOptimized: 121863
 // from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 122939
+// gas irOptimized: 122942
 // gas legacy: 130088
 // gas legacyOptimized: 128757
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 21, 3, 0x666f6f0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115032
+// gas irOptimized: 115046
 // gas legacy: 118301
 // gas legacyOptimized: 115435
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index b13db85d15..9fe9a8a74a 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -33,6 +33,6 @@ contract C {
 }
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 241832
+// gas irOptimized: 241841
 // gas legacy: 243284
 // gas legacyOptimized: 242420

From a4d777643d4c77904b13b31f1fdc05a5f44e7b4e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 22 Aug 2023 20:19:20 +0200
Subject: [PATCH 1574/1748] fixup! Change semantic tests to use the proper via
 IR pipeline, without rerunning on exceptions

---
 test/libsolidity/SemanticTest.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index c33ceecea9..14e6877c09 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -295,7 +295,8 @@ optional<AnnotatedEventSignature> SemanticTest::matchEvent(util::h256 const& has
 
 frontend::OptimiserSettings SemanticTest::optimizerSettingsFor(RequiresYulOptimizer _requiresYulOptimizer)
 {
-	switch (_requiresYulOptimizer) {
+	switch (_requiresYulOptimizer)
+	{
 	case RequiresYulOptimizer::False:
 		return OptimiserSettings::minimal();
 	case RequiresYulOptimizer::MinimalStack:

From 1bb596096b804aebc8e4bb84af2876d6c1c77a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 22 Aug 2023 20:32:12 +0200
Subject: [PATCH 1575/1748] fixup! Change semantic tests to use the proper via
 IR pipeline, without rerunning on exceptions

---
 test/libsolidity/SemanticTest.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 14e6877c09..0997a6625f 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -669,14 +669,15 @@ void SemanticTest::printUpdatedExpectations(ostream& _stream, string const&) con
 void SemanticTest::printUpdatedSettings(ostream& _stream, string const& _linePrefix)
 {
 	auto& settings = m_reader.settings();
-	if (settings.empty())
+	if (settings.empty() && m_requiresYulOptimizer == RequiresYulOptimizer::False)
 		return;
 
 	_stream << _linePrefix << "// ====" << endl;
+	if (m_requiresYulOptimizer != RequiresYulOptimizer::False)
+		_stream << _linePrefix << "// requiresYulOptimizer: " << m_requiresYulOptimizer << endl;
+
 	for (auto const& [settingName, settingValue]: settings)
-		if (settingName == "requiresYulOptimizer")
-			_stream << _linePrefix << "// " << settingName << ": " << m_requiresYulOptimizer << endl;
-		else
+		if (settingName != "requiresYulOptimizer")
 			_stream << _linePrefix << "// " << settingName << ": " << settingValue<< endl;
 }
 

From 86ed964c6a8528d971029a625ae1187b20bd3012 Mon Sep 17 00:00:00 2001
From: Jun Zhang <jun@junz.org>
Date: Wed, 23 Aug 2023 10:51:26 +0800
Subject: [PATCH 1576/1748] Purge using namespace std from solc

Signed-off-by: Jun Zhang <jun@junz.org>
---
 scripts/check_style.sh        |   1 +
 solc/CommandLineInterface.cpp | 275 +++++++++++++++--------------
 solc/CommandLineParser.cpp    | 313 +++++++++++++++++-----------------
 solc/main.cpp                 |  19 +--
 4 files changed, 303 insertions(+), 305 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 3a268e777b..f12fcc8e65 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -34,6 +34,7 @@ NAMESPACE_STD_FREE_FILES=(
     libsolidity/lsp/*
     libsolidity/parsing/*
     libsolutil/*
+    solc/*
 )
 
 (
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 5fd1511598..c729e45916 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -81,8 +81,7 @@
 	#define STDERR_FILENO 2
 #endif
 
-
-using namespace std;
+using namespace std::string_literals;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -90,7 +89,7 @@ using namespace solidity::langutil;
 namespace
 {
 
-set<frontend::InputMode> const CompilerInputModes{
+std::set<frontend::InputMode> const CompilerInputModes{
 	frontend::InputMode::Compiler,
 	frontend::InputMode::CompilerWithASTImport,
 };
@@ -100,14 +99,14 @@ set<frontend::InputMode> const CompilerInputModes{
 namespace solidity::frontend
 {
 
-ostream& CommandLineInterface::sout(bool _markAsUsed)
+std::ostream& CommandLineInterface::sout(bool _markAsUsed)
 {
 	if (_markAsUsed)
 		m_hasOutput = true;
 	return m_sout;
 }
 
-ostream& CommandLineInterface::serr(bool _markAsUsed)
+std::ostream& CommandLineInterface::serr(bool _markAsUsed)
 {
 	if (_markAsUsed)
 		m_hasOutput = true;
@@ -118,27 +117,27 @@ ostream& CommandLineInterface::serr(bool _markAsUsed)
 #define cout
 #define cerr
 
-static string const g_stdinFileName = "<stdin>";
-static string const g_strAbi = "abi";
-static string const g_strAsm = "asm";
-static string const g_strAst = "ast";
-static string const g_strBinary = "bin";
-static string const g_strBinaryRuntime = "bin-runtime";
-static string const g_strContracts = "contracts";
-static string const g_strFunDebug = "function-debug";
-static string const g_strFunDebugRuntime = "function-debug-runtime";
-static string const g_strGeneratedSources = "generated-sources";
-static string const g_strGeneratedSourcesRuntime = "generated-sources-runtime";
-static string const g_strNatspecDev = "devdoc";
-static string const g_strNatspecUser = "userdoc";
-static string const g_strOpcodes = "opcodes";
-static string const g_strSignatureHashes = "hashes";
-static string const g_strSourceList = "sourceList";
-static string const g_strSources = "sources";
-static string const g_strSrcMap = "srcmap";
-static string const g_strSrcMapRuntime = "srcmap-runtime";
-static string const g_strStorageLayout = "storage-layout";
-static string const g_strVersion = "version";
+static std::string const g_stdinFileName = "<stdin>";
+static std::string const g_strAbi = "abi";
+static std::string const g_strAsm = "asm";
+static std::string const g_strAst = "ast";
+static std::string const g_strBinary = "bin";
+static std::string const g_strBinaryRuntime = "bin-runtime";
+static std::string const g_strContracts = "contracts";
+static std::string const g_strFunDebug = "function-debug";
+static std::string const g_strFunDebugRuntime = "function-debug-runtime";
+static std::string const g_strGeneratedSources = "generated-sources";
+static std::string const g_strGeneratedSourcesRuntime = "generated-sources-runtime";
+static std::string const g_strNatspecDev = "devdoc";
+static std::string const g_strNatspecUser = "userdoc";
+static std::string const g_strOpcodes = "opcodes";
+static std::string const g_strSignatureHashes = "hashes";
+static std::string const g_strSourceList = "sourceList";
+static std::string const g_strSources = "sources";
+static std::string const g_strSrcMap = "srcmap";
+static std::string const g_strSrcMapRuntime = "srcmap-runtime";
+static std::string const g_strStorageLayout = "storage-layout";
+static std::string const g_strVersion = "version";
 
 static bool needsHumanTargetedStdout(CommandLineOptions const& _options)
 {
@@ -167,7 +166,7 @@ static bool coloredOutput(CommandLineOptions const& _options)
 		(_options.formatting.coloredOutput.has_value() && _options.formatting.coloredOutput.value());
 }
 
-void CommandLineInterface::handleBinary(string const& _contract)
+void CommandLineInterface::handleBinary(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
@@ -177,8 +176,8 @@ void CommandLineInterface::handleBinary(string const& _contract)
 			createFile(m_compiler->filesystemFriendlyName(_contract) + ".bin", objectWithLinkRefsHex(m_compiler->object(_contract)));
 		else
 		{
-			sout() << "Binary:" << endl;
-			sout() << objectWithLinkRefsHex(m_compiler->object(_contract)) << endl;
+			sout() << "Binary:" << std::endl;
+			sout() << objectWithLinkRefsHex(m_compiler->object(_contract)) << std::endl;
 		}
 	}
 	if (m_options.compiler.outputs.binaryRuntime)
@@ -187,13 +186,13 @@ void CommandLineInterface::handleBinary(string const& _contract)
 			createFile(m_compiler->filesystemFriendlyName(_contract) + ".bin-runtime", objectWithLinkRefsHex(m_compiler->runtimeObject(_contract)));
 		else
 		{
-			sout() << "Binary of the runtime part:" << endl;
-			sout() << objectWithLinkRefsHex(m_compiler->runtimeObject(_contract)) << endl;
+			sout() << "Binary of the runtime part:" << std::endl;
+			sout() << objectWithLinkRefsHex(m_compiler->runtimeObject(_contract)) << std::endl;
 		}
 	}
 }
 
-void CommandLineInterface::handleOpcode(string const& _contract)
+void CommandLineInterface::handleOpcode(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
@@ -201,13 +200,13 @@ void CommandLineInterface::handleOpcode(string const& _contract)
 		createFile(m_compiler->filesystemFriendlyName(_contract) + ".opcode", evmasm::disassemble(m_compiler->object(_contract).bytecode, m_options.output.evmVersion));
 	else
 	{
-		sout() << "Opcodes:" << endl;
-		sout() << uppercase << evmasm::disassemble(m_compiler->object(_contract).bytecode, m_options.output.evmVersion);
-		sout() << endl;
+		sout() << "Opcodes:" << std::endl;
+		sout() << std::uppercase << evmasm::disassemble(m_compiler->object(_contract).bytecode, m_options.output.evmVersion);
+		sout() << std::endl;
 	}
 }
 
-void CommandLineInterface::handleIR(string const& _contractName)
+void CommandLineInterface::handleIR(std::string const& _contractName)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
@@ -218,12 +217,12 @@ void CommandLineInterface::handleIR(string const& _contractName)
 		createFile(m_compiler->filesystemFriendlyName(_contractName) + ".yul", m_compiler->yulIR(_contractName));
 	else
 	{
-		sout() << "IR:" << endl;
-		sout() << m_compiler->yulIR(_contractName) << endl;
+		sout() << "IR:" << std::endl;
+		sout() << m_compiler->yulIR(_contractName) << std::endl;
 	}
 }
 
-void CommandLineInterface::handleIRAst(string const& _contractName)
+void CommandLineInterface::handleIRAst(std::string const& _contractName)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
@@ -240,15 +239,15 @@ void CommandLineInterface::handleIRAst(string const& _contractName)
 		);
 	else
 	{
-		sout() << "IR AST:" << endl;
+		sout() << "IR AST:" << std::endl;
 		sout() << util::jsonPrint(
 			m_compiler->yulIRAst(_contractName),
 			m_options.formatting.json
-		) << endl;
+		) << std::endl;
 	}
 }
 
-void CommandLineInterface::handleIROptimized(string const& _contractName)
+void CommandLineInterface::handleIROptimized(std::string const& _contractName)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
@@ -262,12 +261,12 @@ void CommandLineInterface::handleIROptimized(string const& _contractName)
 		);
 	else
 	{
-		sout() << "Optimized IR:" << endl;
-		sout() << m_compiler->yulIROptimized(_contractName) << endl;
+		sout() << "Optimized IR:" << std::endl;
+		sout() << m_compiler->yulIROptimized(_contractName) << std::endl;
 	}
 }
 
-void CommandLineInterface::handleIROptimizedAst(string const& _contractName)
+void CommandLineInterface::handleIROptimizedAst(std::string const& _contractName)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
@@ -284,15 +283,15 @@ void CommandLineInterface::handleIROptimizedAst(string const& _contractName)
 		);
 	else
 	{
-		sout() << "Optimized IR AST:" << endl;
+		sout() << "Optimized IR AST:" << std::endl;
 		sout() << util::jsonPrint(
 			m_compiler->yulIROptimizedAst(_contractName),
 			m_options.formatting.json
-		) << endl;
+		) << std::endl;
 	}
 }
 
-void CommandLineInterface::handleBytecode(string const& _contract)
+void CommandLineInterface::handleBytecode(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
@@ -302,7 +301,7 @@ void CommandLineInterface::handleBytecode(string const& _contract)
 		handleBinary(_contract);
 }
 
-void CommandLineInterface::handleSignatureHashes(string const& _contract)
+void CommandLineInterface::handleSignatureHashes(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
@@ -310,7 +309,7 @@ void CommandLineInterface::handleSignatureHashes(string const& _contract)
 		return;
 
 	Json::Value interfaceSymbols = m_compiler->interfaceSymbols(_contract);
-	string out = "Function signatures:\n";
+	std::string out = "Function signatures:\n";
 	for (auto const& name: interfaceSymbols["methods"].getMemberNames())
 		out += interfaceSymbols["methods"][name].asString() + ": " + name + "\n";
 
@@ -334,55 +333,55 @@ void CommandLineInterface::handleSignatureHashes(string const& _contract)
 		sout() << out;
 }
 
-void CommandLineInterface::handleMetadata(string const& _contract)
+void CommandLineInterface::handleMetadata(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.metadata)
 		return;
 
-	string data = m_compiler->metadata(_contract);
+	std::string data = m_compiler->metadata(_contract);
 	if (!m_options.output.dir.empty())
 		createFile(m_compiler->filesystemFriendlyName(_contract) + "_meta.json", data);
 	else
-		sout() << "Metadata:" << endl << data << endl;
+		sout() << "Metadata:" << std::endl << data << std::endl;
 }
 
-void CommandLineInterface::handleABI(string const& _contract)
+void CommandLineInterface::handleABI(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.abi)
 		return;
 
-	string data = jsonPrint(removeNullMembers(m_compiler->contractABI(_contract)), m_options.formatting.json);
+	std::string data = jsonPrint(removeNullMembers(m_compiler->contractABI(_contract)), m_options.formatting.json);
 	if (!m_options.output.dir.empty())
 		createFile(m_compiler->filesystemFriendlyName(_contract) + ".abi", data);
 	else
-		sout() << "Contract JSON ABI" << endl << data << endl;
+		sout() << "Contract JSON ABI" << std::endl << data << std::endl;
 }
 
-void CommandLineInterface::handleStorageLayout(string const& _contract)
+void CommandLineInterface::handleStorageLayout(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	if (!m_options.compiler.outputs.storageLayout)
 		return;
 
-	string data = jsonPrint(removeNullMembers(m_compiler->storageLayout(_contract)), m_options.formatting.json);
+	std::string data = jsonPrint(removeNullMembers(m_compiler->storageLayout(_contract)), m_options.formatting.json);
 	if (!m_options.output.dir.empty())
 		createFile(m_compiler->filesystemFriendlyName(_contract) + "_storage.json", data);
 	else
-		sout() << "Contract Storage Layout:" << endl << data << endl;
+		sout() << "Contract Storage Layout:" << std::endl << data << std::endl;
 }
 
-void CommandLineInterface::handleNatspec(bool _natspecDev, string const& _contract)
+void CommandLineInterface::handleNatspec(bool _natspecDev, std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	bool enabled = false;
-	string suffix;
-	string title;
+	std::string suffix;
+	std::string title;
 
 	if (_natspecDev)
 	{
@@ -399,7 +398,7 @@ void CommandLineInterface::handleNatspec(bool _natspecDev, string const& _contra
 
 	if (enabled)
 	{
-		string output = jsonPrint(
+		std::string output = jsonPrint(
 			removeNullMembers(
 				_natspecDev ?
 				m_compiler->natspecDev(_contract) :
@@ -412,51 +411,51 @@ void CommandLineInterface::handleNatspec(bool _natspecDev, string const& _contra
 			createFile(m_compiler->filesystemFriendlyName(_contract) + suffix, output);
 		else
 		{
-			sout() << title << endl;
-			sout() << output << endl;
+			sout() << title << std::endl;
+			sout() << output << std::endl;
 		}
 
 	}
 }
 
-void CommandLineInterface::handleGasEstimation(string const& _contract)
+void CommandLineInterface::handleGasEstimation(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
 	Json::Value estimates = m_compiler->gasEstimates(_contract);
-	sout() << "Gas estimation:" << endl;
+	sout() << "Gas estimation:" << std::endl;
 
 	if (estimates["creation"].isObject())
 	{
 		Json::Value creation = estimates["creation"];
-		sout() << "construction:" << endl;
+		sout() << "construction:" << std::endl;
 		sout() << "   " << creation["executionCost"].asString();
 		sout() << " + " << creation["codeDepositCost"].asString();
-		sout() << " = " << creation["totalCost"].asString() << endl;
+		sout() << " = " << creation["totalCost"].asString() << std::endl;
 	}
 
 	if (estimates["external"].isObject())
 	{
 		Json::Value externalFunctions = estimates["external"];
-		sout() << "external:" << endl;
+		sout() << "external:" << std::endl;
 		for (auto const& name: externalFunctions.getMemberNames())
 		{
 			if (name.empty())
 				sout() << "   fallback:\t";
 			else
 				sout() << "   " << name << ":\t";
-			sout() << externalFunctions[name].asString() << endl;
+			sout() << externalFunctions[name].asString() << std::endl;
 		}
 	}
 
 	if (estimates["internal"].isObject())
 	{
 		Json::Value internalFunctions = estimates["internal"];
-		sout() << "internal:" << endl;
+		sout() << "internal:" << std::endl;
 		for (auto const& name: internalFunctions.getMemberNames())
 		{
 			sout() << "   " << name << ":\t";
-			sout() << internalFunctions[name].asString() << endl;
+			sout() << internalFunctions[name].asString() << std::endl;
 		}
 	}
 }
@@ -465,7 +464,7 @@ void CommandLineInterface::readInputFiles()
 {
 	solAssert(!m_standardJsonInput.has_value());
 
-	static set<frontend::InputMode> const noInputFiles{
+	static std::set<frontend::InputMode> const noInputFiles{
 		frontend::InputMode::Help,
 		frontend::InputMode::License,
 		frontend::InputMode::Version
@@ -491,13 +490,13 @@ void CommandLineInterface::readInputFiles()
 	for (boost::filesystem::path const& allowedDirectory: m_options.input.allowedDirectories)
 		m_fileReader.allowDirectory(allowedDirectory);
 
-	map<string, set<boost::filesystem::path>> collisions =
+	std::map<std::string, std::set<boost::filesystem::path>> collisions =
 		m_fileReader.detectSourceUnitNameCollisions(m_options.input.paths);
 	if (!collisions.empty())
 	{
 		auto pathToQuotedString = [](boost::filesystem::path const& _path){ return "\"" + _path.string() + "\""; };
 
-		string message =
+		std::string message =
 			"Source unit name collision detected. "
 			"The specified values of base path and/or include paths would result in multiple "
 			"input files being assigned the same source unit name:\n";
@@ -518,7 +517,7 @@ void CommandLineInterface::readInputFiles()
 			if (!m_options.input.ignoreMissingFiles)
 				solThrow(CommandLineValidationError, '"' + infile.string() + "\" is not found.");
 			else
-				serr() << infile << " is not found. Skipping." << endl;
+				serr() << infile << " is not found. Skipping." << std::endl;
 
 			continue;
 		}
@@ -528,13 +527,13 @@ void CommandLineInterface::readInputFiles()
 			if (!m_options.input.ignoreMissingFiles)
 				solThrow(CommandLineValidationError, '"' + infile.string() + "\" is not a valid file.");
 			else
-				serr() << infile << " is not a valid file. Skipping." << endl;
+				serr() << infile << " is not a valid file. Skipping." << std::endl;
 
 			continue;
 		}
 
 		// NOTE: we ignore the FileNotFound exception as we manually check above
-		string fileContent = readFileAsString(infile);
+		std::string fileContent = readFileAsString(infile);
 		if (m_options.input.mode == InputMode::StandardJson)
 		{
 			solAssert(!m_standardJsonInput.has_value());
@@ -566,12 +565,12 @@ void CommandLineInterface::readInputFiles()
 		solThrow(CommandLineValidationError, "All specified input files either do not exist or are not regular files.");
 }
 
-map<string, Json::Value> CommandLineInterface::parseAstFromInput()
+std::map<std::string, Json::Value> CommandLineInterface::parseAstFromInput()
 {
 	solAssert(m_options.input.mode == InputMode::CompilerWithASTImport);
 
-	map<string, Json::Value> sourceJsons;
-	map<string, string> tmpSources;
+	std::map<std::string, Json::Value> sourceJsons;
+	std::map<std::string, std::string> tmpSources;
 
 	for (SourceCode const& sourceCode: m_fileReader.sourceUnits() | ranges::views::values)
 	{
@@ -581,7 +580,7 @@ map<string, Json::Value> CommandLineInterface::parseAstFromInput()
 
 		for (auto& src: ast["sources"].getMemberNames())
 		{
-			string astKey = ast["sources"][src].isMember("ast") ? "ast" : "AST";
+			std::string astKey = ast["sources"][src].isMember("ast") ? "ast" : "AST";
 
 			astAssert(ast["sources"][src].isMember(astKey), "astkey is not member");
 			astAssert(ast["sources"][src][astKey]["nodeType"].asString() == "SourceUnit",  "Top-level node should be a 'SourceUnit'");
@@ -596,7 +595,7 @@ map<string, Json::Value> CommandLineInterface::parseAstFromInput()
 	return sourceJsons;
 }
 
-void CommandLineInterface::createFile(string const& _fileName, string const& _data)
+void CommandLineInterface::createFile(std::string const& _fileName, std::string const& _data)
 {
 	namespace fs = boost::filesystem;
 
@@ -607,19 +606,19 @@ void CommandLineInterface::createFile(string const& _fileName, string const& _da
 	// The simplest workaround is to use an absolute path.
 	fs::create_directories(fs::absolute(m_options.output.dir));
 
-	string pathName = (m_options.output.dir / _fileName).string();
+	std::string pathName = (m_options.output.dir / _fileName).string();
 	if (fs::exists(pathName) && !m_options.output.overwriteFiles)
 		solThrow(CommandLineOutputError, "Refusing to overwrite existing file \"" + pathName + "\" (use --overwrite to force).");
 
-	ofstream outFile(pathName);
+	std::ofstream outFile(pathName);
 	outFile << _data;
 	if (!outFile)
 		solThrow(CommandLineOutputError, "Could not write to file \"" + pathName + "\".");
 }
 
-void CommandLineInterface::createJson(string const& _fileName, string const& _json)
+void CommandLineInterface::createJson(std::string const& _fileName, std::string const& _json)
 {
-	createFile(boost::filesystem::path(_fileName).stem().string() + string(".json"), _json);
+	createFile(boost::filesystem::path(_fileName).stem().string() + std::string(".json"), _json);
 }
 
 bool CommandLineInterface::run(int _argc, char const* const* _argv)
@@ -640,7 +639,7 @@ bool CommandLineInterface::run(int _argc, char const* const* _argv)
 		// There might be no message in the exception itself if the error output is bulky and has
 		// already been printed to stderr (this happens e.g. for compiler errors).
 		if (_exception.what() != ""s)
-			serr() << _exception.what() << endl;
+			serr() << _exception.what() << std::endl;
 
 		return false;
 	}
@@ -683,7 +682,7 @@ void CommandLineInterface::processInput()
 		solAssert(m_standardJsonInput.has_value());
 
 		StandardCompiler compiler(m_universalCallback.callback(), m_options.formatting.json);
-		sout() << compiler.compile(std::move(m_standardJsonInput.value())) << endl;
+		sout() << compiler.compile(std::move(m_standardJsonInput.value())) << std::endl;
 		m_standardJsonInput.reset();
 		break;
 	}
@@ -707,22 +706,22 @@ void CommandLineInterface::processInput()
 
 void CommandLineInterface::printVersion()
 {
-	sout() << "solc, the solidity compiler commandline interface" << endl;
-	sout() << "Version: " << solidity::frontend::VersionString << endl;
+	sout() << "solc, the solidity compiler commandline interface" << std::endl;
+	sout() << "Version: " << solidity::frontend::VersionString << std::endl;
 }
 
 void CommandLineInterface::printLicense()
 {
-	sout() << otherLicenses << endl;
+	sout() << otherLicenses << std::endl;
 	// This is a static variable generated by cmake from LICENSE.txt
-	sout() << licenseText << endl;
+	sout() << licenseText << std::endl;
 }
 
 void CommandLineInterface::compile()
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 
-	m_compiler = make_unique<CompilerStack>(m_universalCallback.callback());
+	m_compiler = std::make_unique<CompilerStack>(m_universalCallback.callback());
 
 	SourceReferenceFormatter formatter(serr(false), *m_compiler, coloredOutput(m_options), m_options.formatting.withErrorIds);
 
@@ -840,7 +839,7 @@ void CommandLineInterface::handleCombinedJSON()
 	Json::Value output(Json::objectValue);
 
 	output[g_strVersion] = frontend::VersionString;
-	vector<string> contracts = m_compiler->contractNames();
+	std::vector<std::string> contracts = m_compiler->contractNames();
 
 	// NOTE: The state checks here are more strict that in Standard JSON. There we allow
 	// requesting certain outputs even if compilation fails as long as analysis went ok.
@@ -848,7 +847,7 @@ void CommandLineInterface::handleCombinedJSON()
 
 	if (!contracts.empty())
 		output[g_strContracts] = Json::Value(Json::objectValue);
-	for (string const& contractName: contracts)
+	for (std::string const& contractName: contracts)
 	{
 		Json::Value& contractData = output[g_strContracts][contractName] = Json::objectValue;
 		if (m_options.compiler.combinedJsonRequests->abi && compilationSuccess)
@@ -922,11 +921,11 @@ void CommandLineInterface::handleCombinedJSON()
 		}
 	}
 
-	string json = jsonPrint(removeNullMembers(std::move(output)), m_options.formatting.json);
+	std::string json = jsonPrint(removeNullMembers(std::move(output)), m_options.formatting.json);
 	if (!m_options.output.dir.empty())
 		createJson("combined", json);
 	else
-		sout() << json << endl;
+		sout() << json << std::endl;
 }
 
 void CommandLineInterface::handleAst()
@@ -936,7 +935,7 @@ void CommandLineInterface::handleAst()
 	if (!m_options.compiler.outputs.astCompactJson)
 		return;
 
-	vector<ASTNode const*> asts;
+	std::vector<ASTNode const*> asts;
 	for (auto const& sourceCode: m_fileReader.sourceUnits())
 		asts.push_back(&m_compiler->ast(sourceCode.first));
 
@@ -944,8 +943,8 @@ void CommandLineInterface::handleAst()
 	{
 		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
-			stringstream data;
-			string postfix = "";
+			std::stringstream data;
+			std::string postfix = "";
 			ASTJsonExporter(m_compiler->state(), m_compiler->sourceIndices()).print(data, m_compiler->ast(sourceCode.first), m_options.formatting.json);
 			postfix += "_json";
 			boost::filesystem::path path(sourceCode.first);
@@ -954,10 +953,10 @@ void CommandLineInterface::handleAst()
 	}
 	else
 	{
-		sout() << "JSON AST (compact format):" << endl << endl;
+		sout() << "JSON AST (compact format):" << std::endl << std::endl;
 		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
-			sout() << endl << "======= " << sourceCode.first << " =======" << endl;
+			sout() << std::endl << "======= " << sourceCode.first << " =======" << std::endl;
 			ASTJsonExporter(m_compiler->state(), m_compiler->sourceIndices()).print(sout(), m_compiler->ast(sourceCode.first), m_options.formatting.json);
 		}
 	}
@@ -975,11 +974,11 @@ void CommandLineInterface::link()
 	solAssert(m_options.input.mode == InputMode::Linker);
 
 	// Map from how the libraries will be named inside the bytecode to their addresses.
-	map<string, h160> librariesReplacements;
+	std::map<std::string, h160> librariesReplacements;
 	int const placeholderSize = 40; // 20 bytes or 40 hex characters
 	for (auto const& library: m_options.linker.libraries)
 	{
-		string const& name = library.first;
+		std::string const& name = library.first;
 		// Library placeholders are 40 hex digits (20 bytes) that start and end with '__'.
 		// This leaves 36 characters for the library identifier. The identifier used to
 		// be just the cropped or '_'-padded library name, but this changed to
@@ -987,7 +986,7 @@ void CommandLineInterface::link()
 		// We support both ways of linking here.
 		librariesReplacements["__" + evmasm::LinkerObject::libraryPlaceholder(name) + "__"] = library.second;
 
-		string replacement = "__";
+		std::string replacement = "__";
 		for (size_t i = 0; i < placeholderSize - 4; ++i)
 			replacement.push_back(i < name.size() ? name[i] : '_');
 		replacement += "__";
@@ -1010,18 +1009,18 @@ void CommandLineInterface::link()
 			)
 				solThrow(
 					CommandLineExecutionError,
-					"Error in binary object file " + src.first + " at position " + to_string(it - src.second.begin()) + "\n" +
-					'"' + string(it, it + min(placeholderSize, static_cast<int>(end - it))) + "\" is not a valid link reference."
+					"Error in binary object file " + src.first + " at position " + std::to_string(it - src.second.begin()) + "\n" +
+					'"' + std::string(it, it + std::min(placeholderSize, static_cast<int>(end - it))) + "\" is not a valid link reference."
 				);
 
-			string foundPlaceholder(it, it + placeholderSize);
+			std::string foundPlaceholder(it, it + placeholderSize);
 			if (librariesReplacements.count(foundPlaceholder))
 			{
-				string hexStr(util::toHex(librariesReplacements.at(foundPlaceholder).asBytes()));
+				std::string hexStr(util::toHex(librariesReplacements.at(foundPlaceholder).asBytes()));
 				copy(hexStr.begin(), hexStr.end(), it);
 			}
 			else
-				serr() << "Reference \"" << foundPlaceholder << "\" in file \"" << src.first << "\" still unresolved." << endl;
+				serr() << "Reference \"" << foundPlaceholder << "\" in file \"" << src.first << "\" still unresolved." << std::endl;
 			it += placeholderSize;
 		}
 		// Remove hints for resolved libraries.
@@ -1039,25 +1038,25 @@ void CommandLineInterface::writeLinkedFiles()
 
 	for (auto const& src: m_fileReader.sourceUnits())
 		if (src.first == g_stdinFileName)
-			sout() << src.second << endl;
+			sout() << src.second << std::endl;
 		else
 		{
-			ofstream outFile(src.first);
+			std::ofstream outFile(src.first);
 			outFile << src.second;
 			if (!outFile)
 				solThrow(CommandLineOutputError, "Could not write to file " + src.first + ". Aborting.");
 		}
-	sout() << "Linking completed." << endl;
+	sout() << "Linking completed." << std::endl;
 }
 
-string CommandLineInterface::libraryPlaceholderHint(string const& _libraryName)
+std::string CommandLineInterface::libraryPlaceholderHint(std::string const& _libraryName)
 {
 	return "// " + evmasm::LinkerObject::libraryPlaceholder(_libraryName) + " -> " + _libraryName;
 }
 
-string CommandLineInterface::objectWithLinkRefsHex(evmasm::LinkerObject const& _obj)
+std::string CommandLineInterface::objectWithLinkRefsHex(evmasm::LinkerObject const& _obj)
 {
-	string out = _obj.toHex();
+	std::string out = _obj.toHex();
 	if (!_obj.linkReferences.empty())
 	{
 		out += "\n";
@@ -1072,7 +1071,7 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 	solAssert(m_options.input.mode == InputMode::Assembler);
 
 	bool successful = true;
-	map<string, yul::YulStack> yulStacks;
+	std::map<std::string, yul::YulStack> yulStacks;
 	for (auto const& src: m_fileReader.sourceUnits())
 	{
 		auto& stack = yulStacks[src.first] = yul::YulStack(
@@ -1114,8 +1113,8 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 	for (auto const& src: m_fileReader.sourceUnits())
 	{
 		solAssert(_targetMachine == yul::YulStack::Machine::EVM);
-		string machine = "EVM";
-		sout() << endl << "======= " << src.first << " (" << machine << ") =======" << endl;
+		std::string machine = "EVM";
+		sout() << std::endl << "======= " << src.first << " (" << machine << ") =======" << std::endl;
 
 		yul::YulStack& stack = yulStacks[src.first];
 
@@ -1123,8 +1122,8 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 		{
 			// NOTE: This actually outputs unoptimized code when the optimizer is disabled but
 			// 'ir' output in StandardCompiler works the same way.
-			sout() << endl << "Pretty printed source:" << endl;
-			sout() << stack.print() << endl;
+			sout() << std::endl << "Pretty printed source:" << std::endl;
+			sout() << stack.print() << std::endl;
 		}
 
 		yul::MachineAssemblyObject object;
@@ -1133,25 +1132,25 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 
 		if (m_options.compiler.outputs.binary)
 		{
-			sout() << endl << "Binary representation:" << endl;
+			sout() << std::endl << "Binary representation:" << std::endl;
 			if (object.bytecode)
-				sout() << object.bytecode->toHex() << endl;
+				sout() << object.bytecode->toHex() << std::endl;
 			else
-				serr() << "No binary representation found." << endl;
+				serr() << "No binary representation found." << std::endl;
 		}
 		if (m_options.compiler.outputs.astCompactJson)
 		{
-			sout() << "AST:" <<  endl <<  endl;
-			sout() << util::jsonPrint(stack.astJson(), m_options.formatting.json) << endl;
+			sout() << "AST:" << std::endl << std::endl;
+			sout() << util::jsonPrint(stack.astJson(), m_options.formatting.json) << std::endl;
 		}
 		solAssert(_targetMachine == yul::YulStack::Machine::EVM, "");
 		if (m_options.compiler.outputs.asm_)
 		{
-			sout() << endl << "Text representation:" << endl;
+			sout() << std::endl << "Text representation:" << std::endl;
 			if (!object.assembly.empty())
-				sout() << object.assembly << endl;
+				sout() << object.assembly << std::endl;
 			else
-				serr() << "No text representation found." << endl;
+				serr() << "No text representation found." << std::endl;
 		}
 	}
 }
@@ -1173,15 +1172,15 @@ void CommandLineInterface::outputCompilationResults()
 		// we can safely assume that full compilation was performed and successful.
 		solAssert(m_options.output.stopAfter >= CompilerStack::State::CompilationSuccessful);
 
-		for (string const& contract: m_compiler->contractNames())
+		for (std::string const& contract: m_compiler->contractNames())
 		{
 			if (needsHumanTargetedStdout(m_options))
-				sout() << endl << "======= " << contract << " =======" << endl;
+				sout() << std::endl << "======= " << contract << " =======" << std::endl;
 
 			// do we need EVM assembly?
 			if (m_options.compiler.outputs.asm_ || m_options.compiler.outputs.asmJson)
 			{
-				string ret;
+				std::string ret;
 				if (m_options.compiler.outputs.asmJson)
 					ret = util::jsonPrint(removeNullMembers(m_compiler->assemblyJSON(contract)), m_options.formatting.json);
 				else
@@ -1190,7 +1189,7 @@ void CommandLineInterface::outputCompilationResults()
 				if (!m_options.output.dir.empty())
 					createFile(m_compiler->filesystemFriendlyName(contract) + (m_options.compiler.outputs.asmJson ? "_evm.json" : ".evm"), ret);
 				else
-					sout() << "EVM assembly:" << endl << ret << endl;
+					sout() << "EVM assembly:" << std::endl << ret << std::endl;
 			}
 
 			if (m_options.compiler.estimateGas)
@@ -1213,11 +1212,11 @@ void CommandLineInterface::outputCompilationResults()
 	if (!m_hasOutput)
 	{
 		if (!m_options.output.dir.empty())
-			sout() << "Compiler run successful. Artifact(s) can be found in directory " << m_options.output.dir << "." << endl;
+			sout() << "Compiler run successful. Artifact(s) can be found in directory " << m_options.output.dir << "." << std::endl;
 		else if (m_compiler->contractNames().empty())
-			sout() << "Compiler run successful. No contracts to compile." << endl;
+			sout() << "Compiler run successful. No contracts to compile." << std::endl;
 		else
-			sout() << "Compiler run successful. No output generated." << endl;
+			sout() << "Compiler run successful. No output generated." << std::endl;
 	}
 }
 
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 8ac4f969c8..53f481ae84 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -30,7 +30,6 @@
 #include <range/v3/view/filter.hpp>
 #include <range/v3/range/conversion.hpp>
 
-using namespace std;
 using namespace solidity::langutil;
 
 namespace po = boost::program_options;
@@ -38,59 +37,59 @@ namespace po = boost::program_options;
 namespace solidity::frontend
 {
 
-static string const g_strAllowPaths = "allow-paths";
-static string const g_strBasePath = "base-path";
-static string const g_strIncludePath = "include-path";
-static string const g_strAssemble = "assemble";
-static string const g_strCombinedJson = "combined-json";
-static string const g_strEVM = "evm";
-static string const g_strEVMVersion = "evm-version";
-static string const g_strEOFVersion = "experimental-eof-version";
-static string const g_strViaIR = "via-ir";
-static string const g_strExperimentalViaIR = "experimental-via-ir";
-static string const g_strGas = "gas";
-static string const g_strHelp = "help";
-static string const g_strImportAst = "import-ast";
-static string const g_strInputFile = "input-file";
-static string const g_strYul = "yul";
-static string const g_strYulDialect = "yul-dialect";
-static string const g_strDebugInfo = "debug-info";
-static string const g_strIPFS = "ipfs";
-static string const g_strLicense = "license";
-static string const g_strLibraries = "libraries";
-static string const g_strLink = "link";
-static string const g_strLSP = "lsp";
-static string const g_strMachine = "machine";
-static string const g_strNoCBORMetadata = "no-cbor-metadata";
-static string const g_strMetadataHash = "metadata-hash";
-static string const g_strMetadataLiteral = "metadata-literal";
-static string const g_strModelCheckerContracts = "model-checker-contracts";
-static string const g_strModelCheckerDivModNoSlacks = "model-checker-div-mod-no-slacks";
-static string const g_strModelCheckerEngine = "model-checker-engine";
-static string const g_strModelCheckerExtCalls = "model-checker-ext-calls";
-static string const g_strModelCheckerInvariants = "model-checker-invariants";
-static string const g_strModelCheckerPrintQuery = "model-checker-print-query";
-static string const g_strModelCheckerShowProvedSafe = "model-checker-show-proved-safe";
-static string const g_strModelCheckerShowUnproved = "model-checker-show-unproved";
-static string const g_strModelCheckerShowUnsupported = "model-checker-show-unsupported";
-static string const g_strModelCheckerSolvers = "model-checker-solvers";
-static string const g_strModelCheckerTargets = "model-checker-targets";
-static string const g_strModelCheckerTimeout = "model-checker-timeout";
-static string const g_strModelCheckerBMCLoopIterations = "model-checker-bmc-loop-iterations";
-static string const g_strNone = "none";
-static string const g_strNoOptimizeYul = "no-optimize-yul";
-static string const g_strOptimize = "optimize";
-static string const g_strOptimizeRuns = "optimize-runs";
-static string const g_strOptimizeYul = "optimize-yul";
-static string const g_strYulOptimizations = "yul-optimizations";
-static string const g_strOutputDir = "output-dir";
-static string const g_strOverwrite = "overwrite";
-static string const g_strRevertStrings = "revert-strings";
-static string const g_strStopAfter = "stop-after";
-static string const g_strParsing = "parsing";
+static std::string const g_strAllowPaths = "allow-paths";
+static std::string const g_strBasePath = "base-path";
+static std::string const g_strIncludePath = "include-path";
+static std::string const g_strAssemble = "assemble";
+static std::string const g_strCombinedJson = "combined-json";
+static std::string const g_strEVM = "evm";
+static std::string const g_strEVMVersion = "evm-version";
+static std::string const g_strEOFVersion = "experimental-eof-version";
+static std::string const g_strViaIR = "via-ir";
+static std::string const g_strExperimentalViaIR = "experimental-via-ir";
+static std::string const g_strGas = "gas";
+static std::string const g_strHelp = "help";
+static std::string const g_strImportAst = "import-ast";
+static std::string const g_strInputFile = "input-file";
+static std::string const g_strYul = "yul";
+static std::string const g_strYulDialect = "yul-dialect";
+static std::string const g_strDebugInfo = "debug-info";
+static std::string const g_strIPFS = "ipfs";
+static std::string const g_strLicense = "license";
+static std::string const g_strLibraries = "libraries";
+static std::string const g_strLink = "link";
+static std::string const g_strLSP = "lsp";
+static std::string const g_strMachine = "machine";
+static std::string const g_strNoCBORMetadata = "no-cbor-metadata";
+static std::string const g_strMetadataHash = "metadata-hash";
+static std::string const g_strMetadataLiteral = "metadata-literal";
+static std::string const g_strModelCheckerContracts = "model-checker-contracts";
+static std::string const g_strModelCheckerDivModNoSlacks = "model-checker-div-mod-no-slacks";
+static std::string const g_strModelCheckerEngine = "model-checker-engine";
+static std::string const g_strModelCheckerExtCalls = "model-checker-ext-calls";
+static std::string const g_strModelCheckerInvariants = "model-checker-invariants";
+static std::string const g_strModelCheckerPrintQuery = "model-checker-print-query";
+static std::string const g_strModelCheckerShowProvedSafe = "model-checker-show-proved-safe";
+static std::string const g_strModelCheckerShowUnproved = "model-checker-show-unproved";
+static std::string const g_strModelCheckerShowUnsupported = "model-checker-show-unsupported";
+static std::string const g_strModelCheckerSolvers = "model-checker-solvers";
+static std::string const g_strModelCheckerTargets = "model-checker-targets";
+static std::string const g_strModelCheckerTimeout = "model-checker-timeout";
+static std::string const g_strModelCheckerBMCLoopIterations = "model-checker-bmc-loop-iterations";
+static std::string const g_strNone = "none";
+static std::string const g_strNoOptimizeYul = "no-optimize-yul";
+static std::string const g_strOptimize = "optimize";
+static std::string const g_strOptimizeRuns = "optimize-runs";
+static std::string const g_strOptimizeYul = "optimize-yul";
+static std::string const g_strYulOptimizations = "yul-optimizations";
+static std::string const g_strOutputDir = "output-dir";
+static std::string const g_strOverwrite = "overwrite";
+static std::string const g_strRevertStrings = "revert-strings";
+static std::string const g_strStopAfter = "stop-after";
+static std::string const g_strParsing = "parsing";
 
 /// Possible arguments to for --revert-strings
-static set<string> const g_revertStringsArgs
+static std::set<std::string> const g_revertStringsArgs
 {
 	revertStringsToString(RevertStrings::Default),
 	revertStringsToString(RevertStrings::Strip),
@@ -98,40 +97,40 @@ static set<string> const g_revertStringsArgs
 	revertStringsToString(RevertStrings::VerboseDebug)
 };
 
-static string const g_strSources = "sources";
-static string const g_strSourceList = "sourceList";
-static string const g_strStandardJSON = "standard-json";
-static string const g_strStrictAssembly = "strict-assembly";
-static string const g_strSwarm = "swarm";
-static string const g_strPrettyJson = "pretty-json";
-static string const g_strJsonIndent = "json-indent";
-static string const g_strVersion = "version";
-static string const g_strIgnoreMissingFiles = "ignore-missing";
-static string const g_strColor = "color";
-static string const g_strNoColor = "no-color";
-static string const g_strErrorIds = "error-codes";
+static std::string const g_strSources = "sources";
+static std::string const g_strSourceList = "sourceList";
+static std::string const g_strStandardJSON = "standard-json";
+static std::string const g_strStrictAssembly = "strict-assembly";
+static std::string const g_strSwarm = "swarm";
+static std::string const g_strPrettyJson = "pretty-json";
+static std::string const g_strJsonIndent = "json-indent";
+static std::string const g_strVersion = "version";
+static std::string const g_strIgnoreMissingFiles = "ignore-missing";
+static std::string const g_strColor = "color";
+static std::string const g_strNoColor = "no-color";
+static std::string const g_strErrorIds = "error-codes";
 
 /// Possible arguments to for --machine
-static set<string> const g_machineArgs
+static std::set<std::string> const g_machineArgs
 {
 	g_strEVM
 };
 
 /// Possible arguments to for --yul-dialect
-static set<string> const g_yulDialectArgs
+static std::set<std::string> const g_yulDialectArgs
 {
 	g_strEVM
 };
 
 /// Possible arguments to for --metadata-hash
-static set<string> const g_metadataHashArgs
+static std::set<std::string> const g_metadataHashArgs
 {
 	g_strIPFS,
 	g_strSwarm,
 	g_strNone
 };
 
-static map<InputMode, string> const g_inputModeName = {
+static std::map<InputMode, std::string> const g_inputModeName = {
 	{InputMode::Help, "help"},
 	{InputMode::License, "license"},
 	{InputMode::Version, "version"},
@@ -143,7 +142,7 @@ static map<InputMode, string> const g_inputModeName = {
 	{InputMode::LanguageServer, "language server (LSP)"},
 };
 
-void CommandLineParser::checkMutuallyExclusive(vector<string> const& _optionNames)
+void CommandLineParser::checkMutuallyExclusive(std::vector<std::string> const& _optionNames)
 {
 	if (countEnabledOptions(_optionNames) > 1)
 	{
@@ -163,9 +162,9 @@ bool CompilerOutputs::operator==(CompilerOutputs const& _other) const noexcept
 	return true;
 }
 
-ostream& operator<<(ostream& _out, CompilerOutputs const& _selection)
+std::ostream& operator<<(std::ostream& _out, CompilerOutputs const& _selection)
 {
-	vector<string> serializedSelection;
+	std::vector<std::string> serializedSelection;
 	for (auto&& [componentName, component]: CompilerOutputs::componentMap())
 		if (_selection.*component)
 			serializedSelection.push_back(CompilerOutputs::componentName(component));
@@ -173,7 +172,7 @@ ostream& operator<<(ostream& _out, CompilerOutputs const& _selection)
 	return _out << util::joinHumanReadable(serializedSelection, ",");
 }
 
-string const& CompilerOutputs::componentName(bool CompilerOutputs::* _component)
+std::string const& CompilerOutputs::componentName(bool CompilerOutputs::* _component)
 {
 	solAssert(_component, "");
 
@@ -194,9 +193,9 @@ bool CombinedJsonRequests::operator==(CombinedJsonRequests const& _other) const
 }
 
 
-ostream& operator<<(ostream& _out, CombinedJsonRequests const& _requests)
+std::ostream& operator<<(std::ostream& _out, CombinedJsonRequests const& _requests)
 {
-	vector<string> serializedRequests;
+	std::vector<std::string> serializedRequests;
 	for (auto&& [componentName, component]: CombinedJsonRequests::componentMap())
 		if (_requests.*component)
 			serializedRequests.push_back(CombinedJsonRequests::componentName(component));
@@ -204,7 +203,7 @@ ostream& operator<<(ostream& _out, CombinedJsonRequests const& _requests)
 	return _out << util::joinHumanReadable(serializedRequests, ",");
 }
 
-string const& CombinedJsonRequests::componentName(bool CombinedJsonRequests::* _component)
+std::string const& CombinedJsonRequests::componentName(bool CombinedJsonRequests::* _component)
 {
 	solAssert(_component, "");
 
@@ -274,11 +273,11 @@ OptimiserSettings CommandLineOptions::optimiserSettings() const
 
 	if (optimizer.yulSteps.has_value())
 	{
-		string const fullSequence = optimizer.yulSteps.value();
+		std::string const fullSequence = optimizer.yulSteps.value();
 		auto const delimiterPos = fullSequence.find(":");
 		settings.yulOptimiserSteps = fullSequence.substr(0, delimiterPos);
 
-		if (delimiterPos != string::npos)
+		if (delimiterPos != std::string::npos)
 			settings.yulOptimiserCleanupSteps = fullSequence.substr(delimiterPos + 1);
 		else
 			solAssert(settings.yulOptimiserCleanupSteps == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
@@ -298,11 +297,11 @@ void CommandLineParser::parseInputPathsAndRemappings()
 	m_options.input.ignoreMissingFiles = (m_args.count(g_strIgnoreMissingFiles) > 0);
 
 	if (m_args.count(g_strInputFile))
-		for (string const& positionalArg: m_args[g_strInputFile].as<vector<string>>())
+		for (std::string const& positionalArg: m_args[g_strInputFile].as<std::vector<std::string>>())
 		{
 			if (ImportRemapper::isRemapping(positionalArg))
 			{
-				optional<ImportRemapper::Remapping> remapping = ImportRemapper::parseRemapping(positionalArg);
+				std::optional<ImportRemapper::Remapping> remapping = ImportRemapper::parseRemapping(positionalArg);
 				if (!remapping.has_value())
 					solThrow(CommandLineValidationError, "Invalid remapping: \"" + positionalArg + "\".");
 
@@ -353,10 +352,10 @@ void CommandLineParser::parseInputPathsAndRemappings()
 		);
 }
 
-void CommandLineParser::parseLibraryOption(string const& _input)
+void CommandLineParser::parseLibraryOption(std::string const& _input)
 {
 	namespace fs = boost::filesystem;
-	string data = _input;
+	std::string data = _input;
 	try
 	{
 		if (fs::is_regular_file(_input))
@@ -375,19 +374,19 @@ void CommandLineParser::parseLibraryOption(string const& _input)
 		// Should not happen if `fs::is_regular_file` is correct.
 	}
 
-	vector<string> libraries;
+	std::vector<std::string> libraries;
 	boost::split(libraries, data, boost::is_space() || boost::is_any_of(","), boost::token_compress_on);
-	for (string const& lib: libraries)
+	for (std::string const& lib: libraries)
 		if (!lib.empty())
 		{
 			//search for equal sign or last colon in string as our binaries output placeholders in the form of file=Name or file:Name
 			//so we need to search for `=` or `:` in the string
 			auto separator = lib.rfind('=');
 			bool isSeparatorEqualSign = true;
-			if (separator == string::npos)
+			if (separator == std::string::npos)
 			{
 				separator = lib.rfind(':');
-				if (separator == string::npos)
+				if (separator == std::string::npos)
 					solThrow(
 						CommandLineValidationError,
 						"Equal sign separator missing in library address specifier \"" + lib + "\""
@@ -402,7 +401,7 @@ void CommandLineParser::parseLibraryOption(string const& _input)
 						"Only one equal sign \"=\" is allowed in the address string \"" + lib + "\"."
 					);
 
-			string libName(lib.begin(), lib.begin() + static_cast<ptrdiff_t>(separator));
+			std::string libName(lib.begin(), lib.begin() + static_cast<ptrdiff_t>(separator));
 			boost::trim(libName);
 			if (m_options.linker.libraries.count(libName))
 				solThrow(
@@ -410,7 +409,7 @@ void CommandLineParser::parseLibraryOption(string const& _input)
 					"Address specified more than once for library \"" + libName + "\"."
 				);
 
-			string addrString(lib.begin() + static_cast<ptrdiff_t>(separator) + 1, lib.end());
+			std::string addrString(lib.begin() + static_cast<ptrdiff_t>(separator) + 1, lib.end());
 			boost::trim(addrString);
 			if (addrString.empty())
 				solThrow(
@@ -433,7 +432,7 @@ void CommandLineParser::parseLibraryOption(string const& _input)
 				solThrow(
 					CommandLineValidationError,
 					"Invalid length for address for library \"" + libName + "\": " +
-					to_string(addrString.length()) + " instead of 40 characters."
+					std::to_string(addrString.length()) + " instead of 40 characters."
 				);
 			if (!util::passesAddressChecksum(addrString, false))
 				solThrow(
@@ -454,14 +453,14 @@ void CommandLineParser::parseLibraryOption(string const& _input)
 
 void CommandLineParser::parseOutputSelection()
 {
-	static auto outputSupported = [](InputMode _mode, string_view _outputName)
+	static auto outputSupported = [](InputMode _mode, std::string_view _outputName)
 	{
-		static set<string> const compilerModeOutputs = (
+		static std::set<std::string> const compilerModeOutputs = (
 			CompilerOutputs::componentMap() |
 			ranges::views::keys |
-			ranges::to<set>()
+			ranges::to<std::set>()
 		);
-		static set<string> const assemblerModeOutputs = {
+		static std::set<std::string> const assemblerModeOutputs = {
 			CompilerOutputs::componentName(&CompilerOutputs::asm_),
 			CompilerOutputs::componentName(&CompilerOutputs::binary),
 			CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
@@ -500,7 +499,7 @@ void CommandLineParser::parseOutputSelection()
 		m_options.compiler.outputs.irOptimized = true;
 	}
 
-	vector<string> unsupportedOutputs;
+	std::vector<std::string> unsupportedOutputs;
 	for (auto&& [optionName, outputComponent]: CompilerOutputs::componentMap())
 		if (m_options.compiler.outputs.*outputComponent && !outputSupported(m_options.input.mode, optionName))
 			unsupportedOutputs.push_back(optionName);
@@ -547,12 +546,12 @@ General Information)").c_str(),
 	inputOptions.add_options()
 		(
 			g_strBasePath.c_str(),
-			po::value<string>()->value_name("path"),
+			po::value<std::string>()->value_name("path"),
 			"Use the given path as the root of the source tree instead of the root of the filesystem."
 		)
 		(
 			g_strIncludePath.c_str(),
-			po::value<vector<string>>()->value_name("path"),
+			po::value<std::vector<std::string>>()->value_name("path"),
 			"Make an additional source directory available to the default import callback. "
 			"Use this option if you want to import contracts whose location is not fixed in relation "
 			"to your main source tree, e.g. third-party libraries installed using a package manager. "
@@ -561,7 +560,7 @@ General Information)").c_str(),
 		)
 		(
 			g_strAllowPaths.c_str(),
-			po::value<string>()->value_name("path(s)"),
+			po::value<std::string>()->value_name("path(s)"),
 			"Allow a given path for imports. A list of paths can be supplied by separating them with a comma."
 		)
 		(
@@ -575,7 +574,7 @@ General Information)").c_str(),
 	outputOptions.add_options()
 		(
 			(g_strOutputDir + ",o").c_str(),
-			po::value<string>()->value_name("path"),
+			po::value<std::string>()->value_name("path"),
 			"If given, creates one file per output component and contract/file at the specified directory."
 		)
 		(
@@ -584,7 +583,7 @@ General Information)").c_str(),
 		)
 		(
 			g_strEVMVersion.c_str(),
-			po::value<string>()->value_name("version")->default_value(EVMVersion{}.name()),
+			po::value<std::string>()->value_name("version")->default_value(EVMVersion{}.name()),
 			"Select desired EVM version. Either homestead, tangerineWhistle, spuriousDragon, "
 			"byzantium, constantinople, petersburg, istanbul, berlin, london, paris or shanghai."
 		)
@@ -610,19 +609,19 @@ General Information)").c_str(),
 		)
 		(
 			g_strRevertStrings.c_str(),
-			po::value<string>()->value_name(util::joinHumanReadable(g_revertStringsArgs, ",")),
+			po::value<std::string>()->value_name(util::joinHumanReadable(g_revertStringsArgs, ",")),
 			"Strip revert (and require) reason strings or add additional debugging information."
 		)
 		(
 			g_strDebugInfo.c_str(),
-			po::value<string>()->default_value(util::toString(DebugInfoSelection::Default())),
+			po::value<std::string>()->default_value(util::toString(DebugInfoSelection::Default())),
 			("Debug info components to be included in the produced EVM assembly and Yul code. "
 			"Value can be all, none or a comma-separated list containing one or more of the "
 			"following components: " + util::joinHumanReadable(DebugInfoSelection::componentMap() | ranges::views::keys) + ".").c_str()
 		)
 		(
 			g_strStopAfter.c_str(),
-			po::value<string>()->value_name("stage"),
+			po::value<std::string>()->value_name("stage"),
 			"Stop execution after the given compiler stage. Valid options: \"parsing\"."
 		)
 	;
@@ -670,12 +669,12 @@ General Information)").c_str(),
 	assemblyModeOptions.add_options()
 		(
 			g_strMachine.c_str(),
-			po::value<string>()->value_name(util::joinHumanReadable(g_machineArgs, ",")),
+			po::value<std::string>()->value_name(util::joinHumanReadable(g_machineArgs, ",")),
 			"Target machine in assembly or Yul mode."
 		)
 		(
 			g_strYulDialect.c_str(),
-			po::value<string>()->value_name(util::joinHumanReadable(g_yulDialectArgs, ",")),
+			po::value<std::string>()->value_name(util::joinHumanReadable(g_yulDialectArgs, ",")),
 			"Input dialect to use in assembly or yul mode."
 		)
 	;
@@ -685,7 +684,7 @@ General Information)").c_str(),
 	linkerModeOptions.add_options()
 		(
 			g_strLibraries.c_str(),
-			po::value<vector<string>>()->value_name("libs"),
+			po::value<std::vector<std::string>>()->value_name("libs"),
 			"Direct string or file containing library addresses. Syntax: "
 			"<libraryName>=<address> [, or whitespace] ...\n"
 			"Address is interpreted as a hex string prefixed by 0x."
@@ -748,7 +747,7 @@ General Information)").c_str(),
 		)
 		(
 			g_strCombinedJson.c_str(),
-			po::value<string>()->value_name(util::joinHumanReadable(CombinedJsonRequests::componentMap() | ranges::views::keys, ",")),
+			po::value<std::string>()->value_name(util::joinHumanReadable(CombinedJsonRequests::componentMap() | ranges::views::keys, ",")),
 			"Output a single json document containing the specified information."
 		)
 	;
@@ -762,7 +761,7 @@ General Information)").c_str(),
 		)
 		(
 			g_strMetadataHash.c_str(),
-			po::value<string>()->value_name(util::joinHumanReadable(g_metadataHashArgs, ",")),
+			po::value<std::string>()->value_name(util::joinHumanReadable(g_metadataHashArgs, ",")),
 			"Choose hash method for the bytecode metadata or disable it."
 		)
 		(
@@ -798,7 +797,7 @@ General Information)").c_str(),
 		)
 		(
 			g_strYulOptimizations.c_str(),
-			po::value<string>()->value_name("steps"),
+			po::value<std::string>()->value_name("steps"),
 			"Forces Yul optimizer to use the specified sequence of optimization steps instead of the built-in one."
 		)
 	;
@@ -808,7 +807,7 @@ General Information)").c_str(),
 	smtCheckerOptions.add_options()
 		(
 			g_strModelCheckerContracts.c_str(),
-			po::value<string>()->value_name("default,<source>:<contract>")->default_value("default"),
+			po::value<std::string>()->value_name("default,<source>:<contract>")->default_value("default"),
 			"Select which contracts should be analyzed using the form <source>:<contract>."
 			"Multiple pairs <source>:<contract> can be selected at the same time, separated by a comma "
 			"and no spaces."
@@ -820,18 +819,18 @@ General Information)").c_str(),
 		)
 		(
 			g_strModelCheckerEngine.c_str(),
-			po::value<string>()->value_name("all,bmc,chc,none")->default_value("none"),
+			po::value<std::string>()->value_name("all,bmc,chc,none")->default_value("none"),
 			"Select model checker engine."
 		)
 		(
 			g_strModelCheckerExtCalls.c_str(),
-			po::value<string>()->value_name("untrusted,trusted")->default_value("untrusted"),
+			po::value<std::string>()->value_name("untrusted,trusted")->default_value("untrusted"),
 			"Select whether to assume (trusted) that external calls always invoke"
 			" the code given by the type of the contract, if that code is available."
 		)
 		(
 			g_strModelCheckerInvariants.c_str(),
-			po::value<string>()->value_name("default,all,contract,reentrancy")->default_value("default"),
+			po::value<std::string>()->value_name("default,all,contract,reentrancy")->default_value("default"),
 			"Select whether to report inferred contract inductive invariants."
 			" Multiple types of invariants can be selected at the same time, separated by a comma and no spaces."
 			" By default no invariants are reported."
@@ -854,12 +853,12 @@ General Information)").c_str(),
 		)
 		(
 			g_strModelCheckerSolvers.c_str(),
-			po::value<string>()->value_name("cvc4,eld,z3,smtlib2")->default_value("z3"),
+			po::value<std::string>()->value_name("cvc4,eld,z3,smtlib2")->default_value("z3"),
 			"Select model checker solvers."
 		)
 		(
 			g_strModelCheckerTargets.c_str(),
-			po::value<string>()->value_name("default,all,constantCondition,underflow,overflow,divByZero,balance,assert,popEmptyArray,outOfBounds")->default_value("default"),
+			po::value<std::string>()->value_name("default,all,constantCondition,underflow,overflow,divByZero,balance,assert,popEmptyArray,outOfBounds")->default_value("default"),
 			"Select model checker verification targets."
 			"Multiple targets can be selected at the same time, separated by a comma and no spaces."
 			" By default all targets except underflow and overflow are selected."
@@ -880,7 +879,7 @@ General Information)").c_str(),
 	;
 	desc.add(smtCheckerOptions);
 
-	desc.add_options()(g_strInputFile.c_str(), po::value<vector<string>>(), "input file");
+	desc.add_options()(g_strInputFile.c_str(), po::value<std::vector<std::string>>(), "input file");
 	return desc;
 }
 
@@ -954,7 +953,7 @@ void CommandLineParser::processArgs()
 	)
 		return;
 
-	map<string, set<InputMode>> validOptionInputModeCombinations = {
+	std::map<std::string, std::set<InputMode>> validOptionInputModeCombinations = {
 		// TODO: This should eventually contain all options.
 		{g_strExperimentalViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strViaIR, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
@@ -975,7 +974,7 @@ void CommandLineParser::processArgs()
 		{g_strModelCheckerContracts, {InputMode::Compiler, InputMode::CompilerWithASTImport}},
 		{g_strModelCheckerTargets, {InputMode::Compiler, InputMode::CompilerWithASTImport}}
 	};
-	vector<string> invalidOptionsForCurrentInputMode;
+	std::vector<std::string> invalidOptionsForCurrentInputMode;
 	for (auto const& [optionName, inputModes]: validOptionInputModeCombinations)
 	{
 		if (
@@ -999,7 +998,7 @@ void CommandLineParser::processArgs()
 	checkMutuallyExclusive({g_strColor, g_strNoColor});
 	checkMutuallyExclusive({g_strStopAfter, g_strGas});
 
-	for (string const& option: CompilerOutputs::componentMap() | ranges::views::keys)
+	for (std::string const& option: CompilerOutputs::componentMap() | ranges::views::keys)
 		if (option != CompilerOutputs::componentName(&CompilerOutputs::astCompactJson))
 			checkMutuallyExclusive({g_strStopAfter, option});
 
@@ -1015,7 +1014,7 @@ void CommandLineParser::processArgs()
 				"Option --" + g_strOptimizeRuns + " is only valid in compiler and assembler modes."
 			);
 
-		for (string const& option: {g_strOptimize, g_strNoOptimizeYul, g_strOptimizeYul, g_strYulOptimizations})
+		for (std::string const& option: {g_strOptimize, g_strNoOptimizeYul, g_strOptimizeYul, g_strYulOptimizations})
 			if (m_args.count(option) > 0)
 				solThrow(
 					CommandLineValidationError,
@@ -1038,8 +1037,8 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strRevertStrings))
 	{
-		string revertStringsString = m_args[g_strRevertStrings].as<string>();
-		optional<RevertStrings> revertStrings = revertStringsFromString(revertStringsString);
+		std::string revertStringsString = m_args[g_strRevertStrings].as<std::string>();
+		std::optional<RevertStrings> revertStrings = revertStringsFromString(revertStringsString);
 		if (!revertStrings)
 			solThrow(
 				CommandLineValidationError,
@@ -1055,7 +1054,7 @@ void CommandLineParser::processArgs()
 
 	if (!m_args[g_strDebugInfo].defaulted())
 	{
-		string optionValue = m_args[g_strDebugInfo].as<string>();
+		std::string optionValue = m_args[g_strDebugInfo].as<std::string>();
 		m_options.output.debugInfoSelection = DebugInfoSelection::fromString(optionValue);
 		if (!m_options.output.debugInfoSelection.has_value())
 			solThrow(CommandLineValidationError, "Invalid value for --" + g_strDebugInfo + " option: " + optionValue);
@@ -1067,7 +1066,7 @@ void CommandLineParser::processArgs()
 	parseCombinedJsonOption();
 
 	if (m_args.count(g_strOutputDir))
-		m_options.output.dir = m_args.at(g_strOutputDir).as<string>();
+		m_options.output.dir = m_args.at(g_strOutputDir).as<std::string>();
 
 	m_options.output.overwriteFiles = (m_args.count(g_strOverwrite) > 0);
 
@@ -1086,14 +1085,14 @@ void CommandLineParser::processArgs()
 	m_options.compiler.estimateGas = (m_args.count(g_strGas) > 0);
 
 	if (m_args.count(g_strBasePath))
-		m_options.input.basePath = m_args[g_strBasePath].as<string>();
+		m_options.input.basePath = m_args[g_strBasePath].as<std::string>();
 
 	if (m_args.count(g_strIncludePath) > 0)
 	{
 		if (m_options.input.basePath.empty())
 			solThrow(CommandLineValidationError, "--" + g_strIncludePath + " option requires a non-empty base path.");
 
-		for (string const& includePath: m_args[g_strIncludePath].as<vector<string>>())
+		for (std::string const& includePath: m_args[g_strIncludePath].as<std::vector<std::string>>())
 		{
 			if (includePath.empty())
 				solThrow(CommandLineValidationError, "Empty values are not allowed in --" + g_strIncludePath + ".");
@@ -1104,15 +1103,15 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strAllowPaths))
 	{
-		vector<string> paths;
-		for (string const& allowedPath: boost::split(paths, m_args[g_strAllowPaths].as<string>(), boost::is_any_of(",")))
+		std::vector<std::string> paths;
+		for (std::string const& allowedPath: boost::split(paths, m_args[g_strAllowPaths].as<std::string>(), boost::is_any_of(",")))
 			if (!allowedPath.empty())
 				m_options.input.allowedDirectories.insert(allowedPath);
 	}
 
 	if (m_args.count(g_strStopAfter))
 	{
-		if (m_args[g_strStopAfter].as<string>() != "parsing")
+		if (m_args[g_strStopAfter].as<std::string>() != "parsing")
 			solThrow(CommandLineValidationError, "Valid options for --" + g_strStopAfter + " are: \"parsing\".\n");
 		else
 			m_options.output.stopAfter = CompilerStack::State::Parsed;
@@ -1124,7 +1123,7 @@ void CommandLineParser::processArgs()
 		return;
 
 	if (m_args.count(g_strLibraries))
-		for (string const& library: m_args[g_strLibraries].as<vector<string>>())
+		for (std::string const& library: m_args[g_strLibraries].as<std::vector<std::string>>())
 			parseLibraryOption(library);
 
 	if (m_options.input.mode == InputMode::Linker)
@@ -1132,8 +1131,8 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strEVMVersion))
 	{
-		string versionOptionStr = m_args[g_strEVMVersion].as<string>();
-		optional<langutil::EVMVersion> versionOption = langutil::EVMVersion::fromString(versionOptionStr);
+		std::string versionOptionStr = m_args[g_strEVMVersion].as<std::string>();
+		std::optional<langutil::EVMVersion> versionOption = langutil::EVMVersion::fromString(versionOptionStr);
 		if (!versionOption)
 			solThrow(CommandLineValidationError, "Invalid option for --" + g_strEVMVersion + ": " + versionOptionStr);
 		m_options.output.evmVersion = *versionOption;
@@ -1144,7 +1143,7 @@ void CommandLineParser::processArgs()
 		// Request as uint64_t, since uint8_t will be parsed as character by boost.
 		uint64_t versionOption = m_args[g_strEOFVersion].as<uint64_t>();
 		if (versionOption != 1)
-			solThrow(CommandLineValidationError, "Invalid option for --" + g_strEOFVersion + ": " + to_string(versionOption));
+			solThrow(CommandLineValidationError, "Invalid option for --" + g_strEOFVersion + ": " + std::to_string(versionOption));
 		m_options.output.eofVersion = 1;
 	}
 
@@ -1170,7 +1169,7 @@ void CommandLineParser::processArgs()
 
 		try
 		{
-			yul::OptimiserSuite::validateSequence(m_args[g_strYulOptimizations].as<string>());
+			yul::OptimiserSuite::validateSequence(m_args[g_strYulOptimizations].as<std::string>());
 		}
 		catch (yul::OptimizerException const& _exception)
 		{
@@ -1180,12 +1179,12 @@ void CommandLineParser::processArgs()
 			);
 		}
 
-		m_options.optimizer.yulSteps = m_args[g_strYulOptimizations].as<string>();
+		m_options.optimizer.yulSteps = m_args[g_strYulOptimizations].as<std::string>();
 	}
 
 	if (m_options.input.mode == InputMode::Assembler)
 	{
-		vector<string> const nonAssemblyModeOptions = {
+		std::vector<std::string> const nonAssemblyModeOptions = {
 			// TODO: The list is not complete. Add more.
 			g_strOutputDir,
 			g_strGas,
@@ -1193,10 +1192,10 @@ void CommandLineParser::processArgs()
 		};
 		if (countEnabledOptions(nonAssemblyModeOptions) >= 1)
 		{
-			auto optionEnabled = [&](string const& name){ return m_args.count(name) > 0; };
+			auto optionEnabled = [&](std::string const& name){ return m_args.count(name) > 0; };
 			auto enabledOptions = nonAssemblyModeOptions | ranges::views::filter(optionEnabled) | ranges::to_vector;
 
-			string message = "The following options are invalid in assembly mode: " + joinOptionNames(enabledOptions) + ".";
+			std::string message = "The following options are invalid in assembly mode: " + joinOptionNames(enabledOptions) + ".";
 			solThrow(CommandLineValidationError, message);
 		}
 
@@ -1207,7 +1206,7 @@ void CommandLineParser::processArgs()
 
 		if (m_args.count(g_strMachine))
 		{
-			string machine = m_args[g_strMachine].as<string>();
+			std::string machine = m_args[g_strMachine].as<std::string>();
 			if (machine == g_strEVM)
 				m_options.assembly.targetMachine = Machine::EVM;
 			else
@@ -1215,7 +1214,7 @@ void CommandLineParser::processArgs()
 		}
 		if (m_args.count(g_strYulDialect))
 		{
-			string dialect = m_args[g_strYulDialect].as<string>();
+			std::string dialect = m_args[g_strYulDialect].as<std::string>();
 			if (dialect == g_strEVM)
 				m_options.assembly.inputLanguage = Input::StrictAssembly;
 			else
@@ -1239,7 +1238,7 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strMetadataHash))
 	{
-		string hashStr = m_args[g_strMetadataHash].as<string>();
+		std::string hashStr = m_args[g_strMetadataHash].as<std::string>();
 		if (hashStr == g_strIPFS)
 			m_options.metadata.hash = CompilerStack::MetadataHash::IPFS;
 		else if (hashStr == g_strSwarm)
@@ -1267,8 +1266,8 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strModelCheckerContracts))
 	{
-		string contractsStr = m_args[g_strModelCheckerContracts].as<string>();
-		optional<ModelCheckerContracts> contracts = ModelCheckerContracts::fromString(contractsStr);
+		std::string contractsStr = m_args[g_strModelCheckerContracts].as<std::string>();
+		std::optional<ModelCheckerContracts> contracts = ModelCheckerContracts::fromString(contractsStr);
 		if (!contracts)
 			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerContracts + ": " + contractsStr);
 		m_options.modelChecker.settings.contracts = std::move(*contracts);
@@ -1279,8 +1278,8 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strModelCheckerEngine))
 	{
-		string engineStr = m_args[g_strModelCheckerEngine].as<string>();
-		optional<ModelCheckerEngine> engine = ModelCheckerEngine::fromString(engineStr);
+		std::string engineStr = m_args[g_strModelCheckerEngine].as<std::string>();
+		std::optional<ModelCheckerEngine> engine = ModelCheckerEngine::fromString(engineStr);
 		if (!engine)
 			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerEngine + ": " + engineStr);
 		m_options.modelChecker.settings.engine = *engine;
@@ -1288,8 +1287,8 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strModelCheckerExtCalls))
 	{
-		string mode = m_args[g_strModelCheckerExtCalls].as<string>();
-		optional<ModelCheckerExtCalls> extCallsMode = ModelCheckerExtCalls::fromString(mode);
+		std::string mode = m_args[g_strModelCheckerExtCalls].as<std::string>();
+		std::optional<ModelCheckerExtCalls> extCallsMode = ModelCheckerExtCalls::fromString(mode);
 		if (!extCallsMode)
 			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerExtCalls + ": " + mode);
 		m_options.modelChecker.settings.externalCalls = *extCallsMode;
@@ -1297,8 +1296,8 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strModelCheckerInvariants))
 	{
-		string invsStr = m_args[g_strModelCheckerInvariants].as<string>();
-		optional<ModelCheckerInvariants> invs = ModelCheckerInvariants::fromString(invsStr);
+		std::string invsStr = m_args[g_strModelCheckerInvariants].as<std::string>();
+		std::optional<ModelCheckerInvariants> invs = ModelCheckerInvariants::fromString(invsStr);
 		if (!invs)
 			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerInvariants + ": " + invsStr);
 		m_options.modelChecker.settings.invariants = *invs;
@@ -1315,8 +1314,8 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strModelCheckerSolvers))
 	{
-		string solversStr = m_args[g_strModelCheckerSolvers].as<string>();
-		optional<smtutil::SMTSolverChoice> solvers = smtutil::SMTSolverChoice::fromString(solversStr);
+		std::string solversStr = m_args[g_strModelCheckerSolvers].as<std::string>();
+		std::optional<smtutil::SMTSolverChoice> solvers = smtutil::SMTSolverChoice::fromString(solversStr);
 		if (!solvers)
 			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerSolvers + ": " + solversStr);
 		m_options.modelChecker.settings.solvers = *solvers;
@@ -1331,8 +1330,8 @@ void CommandLineParser::processArgs()
 
 	if (m_args.count(g_strModelCheckerTargets))
 	{
-		string targetsStr = m_args[g_strModelCheckerTargets].as<string>();
-		optional<ModelCheckerTargets> targets = ModelCheckerTargets::fromString(targetsStr);
+		std::string targetsStr = m_args[g_strModelCheckerTargets].as<std::string>();
+		std::optional<ModelCheckerTargets> targets = ModelCheckerTargets::fromString(targetsStr);
 		if (!targets)
 			solThrow(CommandLineValidationError, "Invalid option for --" + g_strModelCheckerTargets + ": " + targetsStr);
 		m_options.modelChecker.settings.targets = *targets;
@@ -1371,8 +1370,8 @@ void CommandLineParser::parseCombinedJsonOption()
 	if (!m_args.count(g_strCombinedJson))
 		return;
 
-	set<string> requests;
-	for (string const& item: boost::split(requests, m_args[g_strCombinedJson].as<string>(), boost::is_any_of(",")))
+	std::set<std::string> requests;
+	for (std::string const& item: boost::split(requests, m_args[g_strCombinedJson].as<std::string>(), boost::is_any_of(",")))
 		if (CombinedJsonRequests::componentMap().count(item) == 0)
 			solThrow(CommandLineValidationError, "Invalid option to --" + g_strCombinedJson + ": " + item);
 
@@ -1381,19 +1380,19 @@ void CommandLineParser::parseCombinedJsonOption()
 		m_options.compiler.combinedJsonRequests.value().*component = (requests.count(componentName) > 0);
 }
 
-size_t CommandLineParser::countEnabledOptions(vector<string> const& _optionNames) const
+size_t CommandLineParser::countEnabledOptions(std::vector<std::string> const& _optionNames) const
 {
 	size_t count = 0;
-	for (string const& _option: _optionNames)
+	for (std::string const& _option: _optionNames)
 		count += m_args.count(_option);
 
 	return count;
 }
 
-string CommandLineParser::joinOptionNames(vector<string> const& _optionNames, string _separator)
+std::string CommandLineParser::joinOptionNames(std::vector<std::string> const& _optionNames, std::string _separator)
 {
 	return util::joinHumanReadable(
-		_optionNames | ranges::views::transform([](string const& _option){ return "--" + _option; }),
+		_optionNames | ranges::views::transform([](std::string const& _option){ return "--" + _option; }),
 		_separator
 	);
 }
diff --git a/solc/main.cpp b/solc/main.cpp
index a6fa5015b1..4237f9ac6d 100644
--- a/solc/main.cpp
+++ b/solc/main.cpp
@@ -29,7 +29,6 @@
 
 #include <iostream>
 
-using namespace std;
 using namespace solidity;
 
 
@@ -37,31 +36,31 @@ int main(int argc, char** argv)
 {
 	try
 	{
-		solidity::frontend::CommandLineInterface cli(cin, cout, cerr);
+		solidity::frontend::CommandLineInterface cli(std::cin, std::cout, std::cerr);
 		return cli.run(argc, argv) ? 0 : 1;
 	}
 	catch (smtutil::SMTLogicError const& _exception)
 	{
-		cerr << "SMT logic error:" << endl;
-		cerr << boost::diagnostic_information(_exception);
+		std::cerr << "SMT logic error:" << std::endl;
+		std::cerr << boost::diagnostic_information(_exception);
 		return 2;
 	}
 	catch (langutil::UnimplementedFeatureError const& _exception)
 	{
-		cerr << "Unimplemented feature:" << endl;
-		cerr << boost::diagnostic_information(_exception);
+		std::cerr << "Unimplemented feature:" << std::endl;
+		std::cerr << boost::diagnostic_information(_exception);
 		return 2;
 	}
 	catch (langutil::InternalCompilerError const& _exception)
 	{
-		cerr << "Internal compiler error:" << endl;
-		cerr << boost::diagnostic_information(_exception);
+		std::cerr << "Internal compiler error:" << std::endl;
+		std::cerr << boost::diagnostic_information(_exception);
 		return 2;
 	}
 	catch (...)
 	{
-		cerr << "Uncaught exception:" << endl;
-		cerr << boost::current_exception_diagnostic_information() << endl;
+		std::cerr << "Uncaught exception:" << std::endl;
+		std::cerr << boost::current_exception_diagnostic_information() << std::endl;
 		return 2;
 	}
 }

From c5b81b66cd06e49b14e29606247ec2fd5ad4d441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 21 Aug 2023 10:26:01 +0200
Subject: [PATCH 1577/1748] Define Error::severity()

---
 liblangutil/Exceptions.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
index fc7286ed1c..df3128fe2a 100644
--- a/liblangutil/Exceptions.h
+++ b/liblangutil/Exceptions.h
@@ -206,6 +206,7 @@ class Error: virtual public util::Exception
 
 	ErrorId errorId() const { return m_errorId; }
 	Type type() const { return m_type; }
+	Severity severity() const { return errorSeverity(m_type); }
 
 	SourceLocation const* sourceLocation() const noexcept;
 	SecondarySourceLocation const* secondarySourceLocation() const noexcept;

From b1ead4af941f337c8103abcb6868777fef7aca02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 21 Aug 2023 10:22:23 +0200
Subject: [PATCH 1578/1748] Order Error::Severity enum from most to least
 severe

- Also reorder Error::Type to match initial values for some consistency
---
 liblangutil/Exceptions.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
index df3128fe2a..65362df31d 100644
--- a/liblangutil/Exceptions.h
+++ b/liblangutil/Exceptions.h
@@ -170,6 +170,8 @@ class Error: virtual public util::Exception
 public:
 	enum class Type
 	{
+		Info,
+		Warning,
 		CodeGenerationError,
 		DeclarationError,
 		DocstringParsingError,
@@ -185,15 +187,14 @@ class Error: virtual public util::Exception
 		UnimplementedFeatureError,
 		YulException,
 		SMTLogicException,
-		Warning,
-		Info
 	};
 
 	enum class Severity
 	{
-		Error,
+		// NOTE: We rely on these being ordered from least to most severe.
+		Info,
 		Warning,
-		Info
+		Error,
 	};
 
 	Error(

From 73b9077ab08860ccbe57f2fcf474446b723d636f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 21 Aug 2023 10:13:43 +0200
Subject: [PATCH 1579/1748] SyntaxTest: Default-initialize boolean fields
 without showing the value

- These get re-initialized in constructor anyway. The only purpose if initializing here is our convention to always initialize primitive types at declaration time. We don't want to have to repeat the defaults though.
---
 test/libsolidity/SyntaxTest.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libsolidity/SyntaxTest.h b/test/libsolidity/SyntaxTest.h
index f4ca6d9bc9..f9fd65319b 100644
--- a/test/libsolidity/SyntaxTest.h
+++ b/test/libsolidity/SyntaxTest.h
@@ -48,7 +48,7 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
 	void parseAndAnalyze() override;
 	virtual void filterObtainedErrors();
 
-	bool m_optimiseYul = true;
+	bool m_optimiseYul{};
 };
 
 }

From c965d6332c88e626249c7c3086b1f1c5df6129da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 21 Aug 2023 10:29:16 +0200
Subject: [PATCH 1580/1748] SyntaxTest: Allow derived test cases to filter out
 warnings and infos

---
 test/libsolidity/SyntaxTest.cpp | 11 ++++++++++-
 test/libsolidity/SyntaxTest.h   |  7 ++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index e0d7a17e92..ad53c2b265 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -38,7 +38,13 @@ using namespace solidity::frontend::test;
 using namespace boost::unit_test;
 namespace fs = boost::filesystem;
 
-SyntaxTest::SyntaxTest(string const& _filename, langutil::EVMVersion _evmVersion): CommonSyntaxTest(_filename, _evmVersion)
+SyntaxTest::SyntaxTest(
+	string const& _filename,
+	langutil::EVMVersion _evmVersion,
+	Error::Severity _minSeverity
+):
+	CommonSyntaxTest(_filename, _evmVersion),
+	m_minSeverity(_minSeverity)
 {
 	m_optimiseYul = m_reader.boolSetting("optimize-yul", true);
 }
@@ -98,6 +104,9 @@ void SyntaxTest::filterObtainedErrors()
 {
 	for (auto const& currentError: filteredErrors())
 	{
+		if (currentError->severity() < m_minSeverity)
+			continue;
+
 		int locationStart = -1;
 		int locationEnd = -1;
 		string sourceName;
diff --git a/test/libsolidity/SyntaxTest.h b/test/libsolidity/SyntaxTest.h
index f9fd65319b..a85e1f53fe 100644
--- a/test/libsolidity/SyntaxTest.h
+++ b/test/libsolidity/SyntaxTest.h
@@ -41,7 +41,11 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
 	{
 		return std::make_unique<SyntaxTest>(_config.filename, _config.evmVersion);
 	}
-	SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion);
+	SyntaxTest(
+		std::string const& _filename,
+		langutil::EVMVersion _evmVersion,
+		langutil::Error::Severity _minSeverity = langutil::Error::Severity::Info
+	);
 
 protected:
 	virtual void setupCompiler();
@@ -49,6 +53,7 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
 	virtual void filterObtainedErrors();
 
 	bool m_optimiseYul{};
+	langutil::Error::Severity m_minSeverity{};
 };
 
 }

From e847596e3950862a23e88cb21df4062ad0f3a398 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 18 Aug 2023 15:44:13 +0200
Subject: [PATCH 1581/1748] CommonSyntaxTest: Add support for syntax tests with
 custom expectations in addition to expected errors

---
 test/CommonSyntaxTest.cpp | 46 +++++++++++++++++++++++++++++++++++----
 test/CommonSyntaxTest.h   | 17 +++++++++++++--
 test/TestCaseReader.cpp   |  8 ++++---
 3 files changed, 62 insertions(+), 9 deletions(-)

diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index f794439de8..79b5978041 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -19,6 +19,7 @@
 #include <test/CommonSyntaxTest.h>
 #include <test/Common.h>
 #include <test/TestCase.h>
+#include <libsolutil/CommonIO.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/test/unit_test.hpp>
@@ -29,6 +30,7 @@
 
 using namespace std;
 using namespace solidity;
+using namespace solidity::util;
 using namespace solidity::util::formatting;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -66,6 +68,7 @@ CommonSyntaxTest::CommonSyntaxTest(string const& _filename, langutil::EVMVersion
 
 TestCase::TestResult CommonSyntaxTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
 {
+	parseCustomExpectations(m_reader.stream());
 	parseAndAnalyze();
 
 	return conclude(_stream, _linePrefix, _formatted);
@@ -73,7 +76,7 @@ TestCase::TestResult CommonSyntaxTest::run(ostream& _stream, string const& _line
 
 TestCase::TestResult CommonSyntaxTest::conclude(ostream& _stream, string const& _linePrefix, bool _formatted)
 {
-	if (m_expectations == m_errorList)
+	if (expectationsMatch())
 		return TestResult::Success;
 
 	printExpectationAndError(_stream, _linePrefix, _formatted);
@@ -84,9 +87,9 @@ void CommonSyntaxTest::printExpectationAndError(ostream& _stream, string const&
 {
 	string nextIndentLevel = _linePrefix + "  ";
 	util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl;
-	printErrorList(_stream, m_expectations, nextIndentLevel, _formatted);
+	printExpectedResult(_stream, nextIndentLevel, _formatted);
 	util::AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl;
-	printErrorList(_stream, m_errorList, nextIndentLevel, _formatted);
+	printObtainedResult(_stream, nextIndentLevel, _formatted);
 }
 
 void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix, bool _formatted) const
@@ -149,6 +152,30 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 		}
 }
 
+void CommonSyntaxTest::parseCustomExpectations(istream& _stream)
+{
+	string remainingExpectations = boost::trim_copy(readUntilEnd(_stream));
+	soltestAssert(
+		remainingExpectations.empty(),
+		"Found custom expectations not supported by the test case:\n" + remainingExpectations
+	);
+}
+
+bool CommonSyntaxTest::expectationsMatch()
+{
+	return m_expectations == m_errorList;
+}
+
+void CommonSyntaxTest::printExpectedResult(ostream& _stream, string const& _linePrefix, bool _formatted) const
+{
+	printErrorList(_stream, m_expectations, _linePrefix, _formatted);
+}
+
+void CommonSyntaxTest::printObtainedResult(ostream& _stream, string const& _linePrefix, bool _formatted) const
+{
+	printErrorList(_stream, m_errorList, _linePrefix, _formatted);
+}
+
 void CommonSyntaxTest::printErrorList(
 	ostream& _stream,
 	vector<SyntaxTestError> const& _errorList,
@@ -157,7 +184,10 @@ void CommonSyntaxTest::printErrorList(
 )
 {
 	if (_errorList.empty())
-		util::AnsiColorized(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << endl;
+	{
+		if (_formatted)
+			util::AnsiColorized(_stream, _formatted, {BOLD, GREEN}) << _linePrefix << "Success" << endl;
+	}
 	else
 		for (auto const& error: _errorList)
 		{
@@ -194,12 +224,20 @@ string CommonSyntaxTest::errorMessage(util::Exception const& _e)
 
 vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 {
+	static string const customExpectationsDelimiter("// ----");
+
 	vector<SyntaxTestError> expectations;
 	string line;
 	while (getline(_stream, line))
 	{
 		auto it = line.begin();
 
+		// Anything below the delimiter is left up to the derived class to process in a custom way.
+		// The delimiter is optional and identical to the one that starts error expectations in
+		// TestCaseReader::parseSourcesAndSettingsWithLineNumber().
+		if (boost::algorithm::starts_with(line, customExpectationsDelimiter))
+			break;
+
 		skipSlashes(it, line.end());
 		skipWhitespace(it, line.end());
 
diff --git a/test/CommonSyntaxTest.h b/test/CommonSyntaxTest.h
index 169824252d..606f61a88d 100644
--- a/test/CommonSyntaxTest.h
+++ b/test/CommonSyntaxTest.h
@@ -62,14 +62,27 @@ class CommonSyntaxTest: public frontend::test::EVMVersionRestrictedTestCase
 	void printSource(std::ostream& _stream, std::string const &_linePrefix = "", bool _formatted = false) const override;
 	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override
 	{
-		if (!m_errorList.empty())
-			printErrorList(_stream, m_errorList, _linePrefix, false);
+		printObtainedResult(_stream, _linePrefix, false);
 	}
 
 	static std::string errorMessage(util::Exception const& _e);
 protected:
+	/// Should be implemented by those derived test cases that want to allow extra expectations
+	/// after the error/warning expectations. The default implementation does not allow them and
+	/// fails instead.
+	/// @param _stream Input stream positioned at the beginning of the extra expectations.
+	virtual void parseCustomExpectations(std::istream& _stream);
+
 	virtual void parseAndAnalyze() = 0;
 
+	/// Should return true if obtained values match expectations.
+	/// The default implementation only compares the error list. Derived classes that support
+	/// custom expectations should override this to include them in the comparison.
+	virtual bool expectationsMatch();
+
+	virtual void printExpectedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const;
+	virtual void printObtainedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const;
+
 	static void printErrorList(
 		std::ostream& _stream,
 		std::vector<SyntaxTestError> const& _errors,
diff --git a/test/TestCaseReader.cpp b/test/TestCaseReader.cpp
index 43e4a6fc36..7ad752ef81 100644
--- a/test/TestCaseReader.cpp
+++ b/test/TestCaseReader.cpp
@@ -114,15 +114,17 @@ pair<SourceMap, size_t> TestCaseReader::parseSourcesAndSettingsWithLineNumber(is
 	static string const sourceDelimiterEnd("====");
 	static string const comment("// ");
 	static string const settingsDelimiter("// ====");
-	static string const delimiter("// ----");
+	static string const expectationsDelimiter("// ----");
 	bool sourcePart = true;
 	while (getline(_stream, line))
 	{
 		lineNumber++;
 
-		if (boost::algorithm::starts_with(line, delimiter))
+		// Anything below the delimiter is left up to the test case to process in a custom way.
+		if (boost::algorithm::starts_with(line, expectationsDelimiter))
 			break;
-		else if (boost::algorithm::starts_with(line, settingsDelimiter))
+
+		if (boost::algorithm::starts_with(line, settingsDelimiter))
 			sourcePart = false;
 		else if (sourcePart)
 		{

From 1ebdab43d88fdf97d47bc6355d21595125d9a1a2 Mon Sep 17 00:00:00 2001
From: Jun Zhang <jun@junz.org>
Date: Wed, 23 Aug 2023 10:24:09 +0800
Subject: [PATCH 1582/1748] Purge using namespace std from libyul/backends

Signed-off-by: Jun Zhang <jun@junz.org>
---
 libyul/backends/evm/AsmCodeGen.cpp            |  1 -
 libyul/backends/evm/ConstantOptimiser.cpp     | 15 ++--
 .../backends/evm/ControlFlowGraphBuilder.cpp  | 47 +++++++------
 libyul/backends/evm/EVMCodeTransform.cpp      | 51 +++++++-------
 libyul/backends/evm/EVMDialect.cpp            | 68 +++++++++---------
 libyul/backends/evm/EVMMetrics.cpp            |  5 +-
 libyul/backends/evm/EVMObjectCompiler.cpp     |  5 +-
 libyul/backends/evm/EthAssemblyAdapter.cpp    | 11 ++-
 libyul/backends/evm/NoOutputAssembly.cpp      |  7 +-
 .../evm/OptimizedEVMCodeTransform.cpp         | 33 +++++----
 libyul/backends/evm/StackLayoutGenerator.cpp  | 69 +++++++++----------
 scripts/check_style.sh                        |  1 +
 12 files changed, 152 insertions(+), 161 deletions(-)

diff --git a/libyul/backends/evm/AsmCodeGen.cpp b/libyul/backends/evm/AsmCodeGen.cpp
index c4d276fa12..645d1fd87b 100644
--- a/libyul/backends/evm/AsmCodeGen.cpp
+++ b/libyul/backends/evm/AsmCodeGen.cpp
@@ -28,7 +28,6 @@
 
 #include <libsolutil/StackTooDeepString.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
diff --git a/libyul/backends/evm/ConstantOptimiser.cpp b/libyul/backends/evm/ConstantOptimiser.cpp
index 59e987b693..c5a33e52f4 100644
--- a/libyul/backends/evm/ConstantOptimiser.cpp
+++ b/libyul/backends/evm/ConstantOptimiser.cpp
@@ -30,7 +30,6 @@
 
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -48,9 +47,9 @@ struct MiniEVMInterpreter
 		return std::visit(*this, _expr);
 	}
 
-	u256 eval(evmasm::Instruction _instr, vector<Expression> const& _arguments)
+	u256 eval(evmasm::Instruction _instr, std::vector<Expression> const& _arguments)
 	{
-		vector<u256> args;
+		std::vector<u256> args;
 		for (auto const& arg: _arguments)
 			args.emplace_back(eval(arg));
 		switch (_instr)
@@ -92,7 +91,7 @@ struct MiniEVMInterpreter
 
 void ConstantOptimiser::visit(Expression& _e)
 {
-	if (holds_alternative<Literal>(_e))
+	if (std::holds_alternative<Literal>(_e))
 	{
 		Literal const& literal = std::get<Literal>(_e);
 		if (literal.kind != LiteralKind::Number)
@@ -115,7 +114,7 @@ Expression const* RepresentationFinder::tryFindRepresentation(u256 const& _value
 		return nullptr;
 
 	Representation const& repr = findRepresentation(_value);
-	if (holds_alternative<Literal>(*repr.expression))
+	if (std::holds_alternative<Literal>(*repr.expression))
 		return nullptr;
 	else
 		return repr.expression.get();
@@ -180,7 +179,7 @@ Representation const& RepresentationFinder::findRepresentation(u256 const& _valu
 Representation RepresentationFinder::represent(u256 const& _value) const
 {
 	Representation repr;
-	repr.expression = make_unique<Expression>(Literal{m_debugData, LiteralKind::Number, YulString{formatNumber(_value)}, {}});
+	repr.expression = std::make_unique<Expression>(Literal{m_debugData, LiteralKind::Number, YulString{formatNumber(_value)}, {}});
 	repr.cost = m_meter.costs(*repr.expression);
 	return repr;
 }
@@ -191,7 +190,7 @@ Representation RepresentationFinder::represent(
 ) const
 {
 	Representation repr;
-	repr.expression = make_unique<Expression>(FunctionCall{
+	repr.expression = std::make_unique<Expression>(FunctionCall{
 		m_debugData,
 		Identifier{m_debugData, _instruction},
 		{ASTCopier{}.translate(*_argument.expression)}
@@ -207,7 +206,7 @@ Representation RepresentationFinder::represent(
 ) const
 {
 	Representation repr;
-	repr.expression = make_unique<Expression>(FunctionCall{
+	repr.expression = std::make_unique<Expression>(FunctionCall{
 		m_debugData,
 		Identifier{m_debugData, _instruction},
 		{ASTCopier{}.translate(*_arg1.expression), ASTCopier{}.translate(*_arg2.expression)}
diff --git a/libyul/backends/evm/ControlFlowGraphBuilder.cpp b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
index d08dcf16c2..9a0a73b35f 100644
--- a/libyul/backends/evm/ControlFlowGraphBuilder.cpp
+++ b/libyul/backends/evm/ControlFlowGraphBuilder.cpp
@@ -45,7 +45,6 @@
 
 using namespace solidity;
 using namespace solidity::yul;
-using namespace std;
 
 namespace
 {
@@ -82,15 +81,15 @@ void cleanUnreachable(CFG& _cfg)
 /// Sets the ``recursive`` member to ``true`` for all recursive function calls.
 void markRecursiveCalls(CFG& _cfg)
 {
-	map<CFG::BasicBlock*, vector<CFG::FunctionCall*>> callsPerBlock;
+	std::map<CFG::BasicBlock*, std::vector<CFG::FunctionCall*>> callsPerBlock;
 	auto const& findCalls = [&](CFG::BasicBlock* _block)
 	{
 		if (auto* calls = util::valueOrNullptr(callsPerBlock, _block))
 			return *calls;
-		vector<CFG::FunctionCall*>& calls = callsPerBlock[_block];
+		std::vector<CFG::FunctionCall*>& calls = callsPerBlock[_block];
 		util::BreadthFirstSearch<CFG::BasicBlock*>{{_block}}.run([&](CFG::BasicBlock* _block, auto _addChild) {
 			for (auto& operation: _block->operations)
-				if (auto* functionCall = get_if<CFG::FunctionCall>(&operation.operation))
+				if (auto* functionCall = std::get_if<CFG::FunctionCall>(&operation.operation))
 					calls.emplace_back(functionCall);
 			std::visit(util::GenericVisitor{
 				[&](CFG::BasicBlock::MainExit const&) {},
@@ -131,7 +130,7 @@ void markRecursiveCalls(CFG& _cfg)
 /// Entering such a block means that control flow will never return to a previously visited block.
 void markStartsOfSubGraphs(CFG& _cfg)
 {
-	vector<CFG::BasicBlock*> entries;
+	std::vector<CFG::BasicBlock*> entries;
 	entries.emplace_back(_cfg.entry);
 	for (auto&& functionInfo: _cfg.functionInfo | ranges::views::values)
 		entries.emplace_back(functionInfo.entry);
@@ -141,17 +140,17 @@ void markStartsOfSubGraphs(CFG& _cfg)
 		 * Detect bridges following Algorithm 1 in https://arxiv.org/pdf/2108.07346.pdf
 		 * and mark the bridge targets as starts of sub-graphs.
 		 */
-		set<CFG::BasicBlock*> visited;
-		map<CFG::BasicBlock*, size_t> disc;
-		map<CFG::BasicBlock*, size_t> low;
-		map<CFG::BasicBlock*, CFG::BasicBlock*> parent;
+		std::set<CFG::BasicBlock*> visited;
+		std::map<CFG::BasicBlock*, size_t> disc;
+		std::map<CFG::BasicBlock*, size_t> low;
+		std::map<CFG::BasicBlock*, CFG::BasicBlock*> parent;
 		size_t time = 0;
 		auto dfs = [&](CFG::BasicBlock* _u, auto _recurse) -> void {
 			visited.insert(_u);
 			disc[_u] = low[_u] = time;
 			time++;
 
-			vector<CFG::BasicBlock*> children = _u->entries;
+			std::vector<CFG::BasicBlock*> children = _u->entries;
 			visit(util::GenericVisitor{
 				[&](CFG::BasicBlock::Jump const& _jump) {
 					children.emplace_back(_jump.target);
@@ -171,7 +170,7 @@ void markStartsOfSubGraphs(CFG& _cfg)
 				{
 					parent[v] = _u;
 					_recurse(v, _recurse);
-					low[_u] = min(low[_u], low[v]);
+					low[_u] = std::min(low[_u], low[v]);
 					if (low[v] > disc[_u])
 					{
 						// _u <-> v is a cut edge in the undirected graph
@@ -186,7 +185,7 @@ void markStartsOfSubGraphs(CFG& _cfg)
 					}
 				}
 				else if (v != parent[_u])
-					low[_u] = min(low[_u], disc[v]);
+					low[_u] = std::min(low[_u], disc[v]);
 		};
 		dfs(entry, dfs);
 	}
@@ -234,7 +233,7 @@ std::unique_ptr<CFG> ControlFlowGraphBuilder::build(
 ControlFlowGraphBuilder::ControlFlowGraphBuilder(
 	CFG& _graph,
 	AsmAnalysisInfo const& _analysisInfo,
-	map<FunctionDefinition const*, ControlFlowSideEffects> const& _functionSideEffects,
+	std::map<FunctionDefinition const*, ControlFlowSideEffects> const& _functionSideEffects,
 	Dialect const& _dialect
 ):
 	m_graph(_graph),
@@ -271,7 +270,7 @@ void ControlFlowGraphBuilder::operator()(VariableDeclaration const& _varDecl)
 	yulAssert(m_currentBlock, "");
 	auto declaredVariables = _varDecl.variables | ranges::views::transform([&](TypedName const& _var) {
 		return VariableSlot{lookupVariable(_var.name), _var.debugData};
-	}) | ranges::to<vector<VariableSlot>>;
+	}) | ranges::to<std::vector<VariableSlot>>;
 	Stack input;
 	if (_varDecl.value)
 		input = visitAssignmentRightHandSide(*_varDecl.value, declaredVariables.size());
@@ -287,7 +286,7 @@ void ControlFlowGraphBuilder::operator()(Assignment const& _assignment)
 {
 	auto assignedVariables = _assignment.variableNames | ranges::views::transform([&](Identifier const& _var) {
 		return VariableSlot{lookupVariable(_var.name), _var.debugData};
-	}) | ranges::to<vector<VariableSlot>>;
+	}) | ranges::to<std::vector<VariableSlot>>;
 
 	Stack input = visitAssignmentRightHandSide(*_assignment.value, assignedVariables.size());
 	yulAssert(m_currentBlock);
@@ -314,7 +313,7 @@ void ControlFlowGraphBuilder::operator()(Block const& _block)
 {
 	ScopedSaveAndRestore saveScope(m_scope, m_info.scopes.at(&_block).get());
 	for (auto const& statement: _block.statements)
-		if (auto const* function = get_if<FunctionDefinition>(&statement))
+		if (auto const* function = std::get_if<FunctionDefinition>(&statement))
 			registerFunction(*function);
 	for (auto const& statement: _block.statements)
 		std::visit(*this, statement);
@@ -334,10 +333,10 @@ void ControlFlowGraphBuilder::operator()(If const& _if)
 void ControlFlowGraphBuilder::operator()(Switch const& _switch)
 {
 	yulAssert(m_currentBlock, "");
-	shared_ptr<DebugData const> preSwitchDebugData = debugDataOf(_switch);
+	std::shared_ptr<DebugData const> preSwitchDebugData = debugDataOf(_switch);
 
 	auto ghostVariableId = m_graph.ghostVariables.size();
-	YulString ghostVariableName("GHOST[" + to_string(ghostVariableId) + "]");
+	YulString ghostVariableName("GHOST[" + std::to_string(ghostVariableId) + "]");
 	auto& ghostVar = m_graph.ghostVariables.emplace_back(Scope::Variable{""_yulstring, ghostVariableName});
 
 	// Artificially generate:
@@ -394,12 +393,12 @@ void ControlFlowGraphBuilder::operator()(Switch const& _switch)
 
 void ControlFlowGraphBuilder::operator()(ForLoop const& _loop)
 {
-	shared_ptr<DebugData const> preLoopDebugData = debugDataOf(_loop);
+	std::shared_ptr<DebugData const> preLoopDebugData = debugDataOf(_loop);
 	ScopedSaveAndRestore scopeRestore(m_scope, m_info.scopes.at(&_loop.pre).get());
 	(*this)(_loop.pre);
 
 	std::optional<bool> constantCondition;
-	if (auto const* literalCondition = get_if<yul::Literal>(_loop.condition.get()))
+	if (auto const* literalCondition = std::get_if<yul::Literal>(_loop.condition.get()))
 		constantCondition = valueOfLiteral(*literalCondition) != 0;
 
 	CFG::BasicBlock& loopCondition = m_graph.makeBlock(debugDataOf(*_loop.condition));
@@ -497,13 +496,13 @@ void ControlFlowGraphBuilder::registerFunction(FunctionDefinition const& _functi
 				std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_param.name)),
 				_param.debugData
 			};
-		}) | ranges::to<vector>,
+		}) | ranges::to<std::vector>,
 		_functionDefinition.returnVariables | ranges::views::transform([&](auto const& _retVar) {
 			return VariableSlot{
 				std::get<Scope::Variable>(virtualFunctionScope->identifiers.at(_retVar.name)),
 				_retVar.debugData
 			};
-		}) | ranges::to<vector>,
+		}) | ranges::to<std::vector>,
 		{},
 		m_functionSideEffects.at(&_functionDefinition).canContinue
 	})).second;
@@ -609,7 +608,7 @@ Scope::Variable const& ControlFlowGraphBuilder::lookupVariable(YulString _name)
 }
 
 void ControlFlowGraphBuilder::makeConditionalJump(
-	shared_ptr<DebugData const> _debugData,
+	std::shared_ptr<DebugData const> _debugData,
 	StackSlot _condition,
 	CFG::BasicBlock& _nonZero,
 	CFG::BasicBlock& _zero
@@ -628,7 +627,7 @@ void ControlFlowGraphBuilder::makeConditionalJump(
 }
 
 void ControlFlowGraphBuilder::jump(
-	shared_ptr<DebugData const> _debugData,
+	std::shared_ptr<DebugData const> _debugData,
 	CFG::BasicBlock& _target,
 	bool backwards
 )
diff --git a/libyul/backends/evm/EVMCodeTransform.cpp b/libyul/backends/evm/EVMCodeTransform.cpp
index 8a268675c7..50e48f7681 100644
--- a/libyul/backends/evm/EVMCodeTransform.cpp
+++ b/libyul/backends/evm/EVMCodeTransform.cpp
@@ -42,7 +42,6 @@
 #include <utility>
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -56,9 +55,9 @@ CodeTransform::CodeTransform(
 	BuiltinContext& _builtinContext,
 	ExternalIdentifierAccess::CodeGenerator _identifierAccessCodeGen,
 	UseNamedLabels _useNamedLabelsForFunctions,
-	shared_ptr<Context> _context,
-	vector<TypedName> _delayedReturnVariables,
-	optional<AbstractAssembly::LabelID> _functionExitLabel
+	std::shared_ptr<Context> _context,
+	std::vector<TypedName> _delayedReturnVariables,
+	std::optional<AbstractAssembly::LabelID> _functionExitLabel
 ):
 	m_assembly(_assembly),
 	m_info(_analysisInfo),
@@ -74,7 +73,7 @@ CodeTransform::CodeTransform(
 	if (!m_context)
 	{
 		// initialize
-		m_context = make_shared<Context>();
+		m_context = std::make_shared<Context>();
 		if (m_allowStackOpt)
 			m_context->variableReferences = VariableReferenceCounter::run(m_info, _block);
 	}
@@ -103,7 +102,7 @@ void CodeTransform::freeUnusedVariables(bool _popUnusedSlotsAtStackTop)
 		return;
 
 	for (auto const& identifier: m_scope->identifiers)
-		if (Scope::Variable const* var = get_if<Scope::Variable>(&identifier.second))
+		if (Scope::Variable const* var = std::get_if<Scope::Variable>(&identifier.second))
 			if (m_variablesScheduledForDeletion.count(var))
 				deleteVariable(*var);
 	// Directly in a function body block, we can also delete the function arguments,
@@ -112,7 +111,7 @@ void CodeTransform::freeUnusedVariables(bool _popUnusedSlotsAtStackTop)
 	// effect, so we only do it before that.
 	if (!returnVariablesAndFunctionExitAreSetup() && !m_scope->functionScope && m_scope->superScope && m_scope->superScope->functionScope)
 		for (auto const& identifier: m_scope->superScope->identifiers)
-			if (Scope::Variable const* var = get_if<Scope::Variable>(&identifier.second))
+			if (Scope::Variable const* var = std::get_if<Scope::Variable>(&identifier.second))
 				if (m_variablesScheduledForDeletion.count(var))
 					deleteVariable(*var);
 
@@ -317,7 +316,7 @@ void CodeTransform::operator()(Switch const& _switch)
 {
 	visitExpression(*_switch.expression);
 	int expressionHeight = m_assembly.stackHeight();
-	map<Case const*, AbstractAssembly::LabelID> caseBodies;
+	std::map<Case const*, AbstractAssembly::LabelID> caseBodies;
 	AbstractAssembly::LabelID end = m_assembly.newLabelId();
 	for (Case const& c: _switch.cases)
 	{
@@ -447,7 +446,7 @@ void CodeTransform::operator()(FunctionDefinition const& _function)
 
 		// This vector holds the desired target positions of all stack slots and is
 		// modified parallel to the actual stack.
-		vector<int> stackLayout(static_cast<size_t>(m_assembly.stackHeight()), -1);
+		std::vector<int> stackLayout(static_cast<size_t>(m_assembly.stackHeight()), -1);
 		stackLayout[0] = static_cast<int>(_function.returnVariables.size()); // Move return label to the top
 		for (auto&& [n, returnVariable]: ranges::views::enumerate(_function.returnVariables))
 			stackLayout.at(m_context->variableStackHeights.at(
@@ -463,7 +462,7 @@ void CodeTransform::operator()(FunctionDefinition const& _function)
 				"The function " +
 				_function.name.str() +
 				" has " +
-				to_string(stackLayout.size() - 17) +
+				std::to_string(stackLayout.size() - 17) +
 				" parameters or return variables too many to fit the stack size."
 			);
 			stackError(std::move(error), m_assembly.stackHeight() - static_cast<int>(_function.parameters.size()));
@@ -479,7 +478,7 @@ void CodeTransform::operator()(FunctionDefinition const& _function)
 				else
 				{
 					m_assembly.appendInstruction(evmasm::swapInstruction(static_cast<unsigned>(stackLayout.size()) - static_cast<unsigned>(stackLayout.back()) - 1u));
-					swap(stackLayout[static_cast<size_t>(stackLayout.back())], stackLayout.back());
+					std::swap(stackLayout[static_cast<size_t>(stackLayout.back())], stackLayout.back());
 				}
 			for (size_t i = 0; i < stackLayout.size(); ++i)
 				yulAssert(i == static_cast<size_t>(stackLayout[i]), "Error reshuffling stack.");
@@ -571,7 +570,7 @@ void CodeTransform::operator()(Block const& _block)
 	m_scope = m_info.scopes.at(&_block).get();
 
 	for (auto const& statement: _block.statements)
-		if (auto function = get_if<FunctionDefinition>(&statement))
+		if (auto function = std::get_if<FunctionDefinition>(&statement))
 			createFunctionEntryID(*function);
 
 	int blockStartStackHeight = m_assembly.stackHeight();
@@ -579,7 +578,7 @@ void CodeTransform::operator()(Block const& _block)
 
 	bool isOutermostFunctionBodyBlock = m_scope && m_scope->superScope && m_scope->superScope->functionScope;
 	bool performValidation = !m_allowStackOpt || !isOutermostFunctionBodyBlock;
-	finalizeBlock(_block, performValidation ? make_optional(blockStartStackHeight) : nullopt);
+	finalizeBlock(_block, performValidation ? std::make_optional(blockStartStackHeight) : std::nullopt);
 	m_scope = originalScope;
 }
 
@@ -588,7 +587,7 @@ void CodeTransform::createFunctionEntryID(FunctionDefinition const& _function)
 	Scope::Function& scopeFunction = std::get<Scope::Function>(m_scope->identifiers.at(_function.name));
 	yulAssert(!m_context->functionEntryIDs.count(&scopeFunction), "");
 
-	optional<size_t> astID;
+	std::optional<size_t> astID;
 	if (_function.debugData)
 		astID = _function.debugData->astID;
 
@@ -659,16 +658,16 @@ void CodeTransform::setupReturnVariablesAndFunctionExit()
 namespace
 {
 
-bool statementNeedsReturnVariableSetup(Statement const& _statement, vector<TypedName> const& _returnVariables)
+bool statementNeedsReturnVariableSetup(Statement const& _statement, std::vector<TypedName> const& _returnVariables)
 {
-	if (holds_alternative<FunctionDefinition>(_statement))
+	if (std::holds_alternative<FunctionDefinition>(_statement))
 		return true;
 	if (
-		holds_alternative<ExpressionStatement>(_statement) ||
-		holds_alternative<Assignment>(_statement)
+		std::holds_alternative<ExpressionStatement>(_statement) ||
+		std::holds_alternative<Assignment>(_statement)
 	)
 	{
-		map<YulString, size_t> references = VariableReferencesCounter::countReferences(_statement);
+		std::map<YulString, size_t> references = VariableReferencesCounter::countReferences(_statement);
 		auto isReferenced = [&references](TypedName const& _returnVariable) {
 			return references.count(_returnVariable.name);
 		};
@@ -680,7 +679,7 @@ bool statementNeedsReturnVariableSetup(Statement const& _statement, vector<Typed
 
 }
 
-void CodeTransform::visitStatements(vector<Statement> const& _statements)
+void CodeTransform::visitStatements(std::vector<Statement> const& _statements)
 {
 	std::optional<AbstractAssembly::LabelID> jumpTarget = std::nullopt;
 
@@ -716,7 +715,7 @@ void CodeTransform::visitStatements(vector<Statement> const& _statements)
 	freeUnusedVariables();
 }
 
-void CodeTransform::finalizeBlock(Block const& _block, optional<int> blockStartStackHeight)
+void CodeTransform::finalizeBlock(Block const& _block, std::optional<int> blockStartStackHeight)
 {
 	m_assembly.setSourceLocation(originLocationOf(_block));
 
@@ -725,7 +724,7 @@ void CodeTransform::finalizeBlock(Block const& _block, optional<int> blockStartS
 	// pop variables
 	yulAssert(m_info.scopes.at(&_block).get() == m_scope, "");
 	for (auto const& id: m_scope->identifiers)
-		if (holds_alternative<Scope::Variable>(id.second))
+		if (std::holds_alternative<Scope::Variable>(id.second))
 		{
 			Scope::Variable const& var = std::get<Scope::Variable>(id.second);
 			if (m_allowStackOpt)
@@ -740,11 +739,11 @@ void CodeTransform::finalizeBlock(Block const& _block, optional<int> blockStartS
 	if (blockStartStackHeight)
 	{
 		int deposit = m_assembly.stackHeight() - *blockStartStackHeight;
-		yulAssert(deposit == 0, "Invalid stack height at end of block: " + to_string(deposit));
+		yulAssert(deposit == 0, "Invalid stack height at end of block: " + std::to_string(deposit));
 	}
 }
 
-void CodeTransform::generateMultiAssignment(vector<Identifier> const& _variableNames)
+void CodeTransform::generateMultiAssignment(std::vector<Identifier> const& _variableNames)
 {
 	yulAssert(m_scope, "");
 	for (auto const& variableName: _variableNames | ranges::views::reverse)
@@ -786,7 +785,7 @@ size_t CodeTransform::variableHeightDiff(Scope::Variable const& _var, YulString
 			"Variable " +
 			_varName.str() +
 			" is " +
-			to_string(heightDiff - limit) +
+			std::to_string(heightDiff - limit) +
 			" slot(s) too deep inside the stack. " +
 			stackTooDeepString
 		);
@@ -798,7 +797,7 @@ size_t CodeTransform::variableHeightDiff(Scope::Variable const& _var, YulString
 
 int CodeTransform::variableStackHeight(YulString _name) const
 {
-	Scope::Variable const* var = get_if<Scope::Variable>(m_scope->lookup(_name));
+	Scope::Variable const* var = std::get_if<Scope::Variable>(m_scope->lookup(_name));
 	yulAssert(var, "");
 	return static_cast<int>(m_context->variableStackHeights.at(var));
 }
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index b66738b9db..47130fd6c4 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -38,7 +38,7 @@
 
 #include <regex>
 
-using namespace std;
+using namespace std::string_literals;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -46,9 +46,9 @@ using namespace solidity::util;
 namespace
 {
 
-pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
+std::pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
 	langutil::EVMVersion _evmVersion,
-	string const& _name,
+	std::string const& _name,
 	evmasm::Instruction _instruction
 )
 {
@@ -87,12 +87,12 @@ pair<YulString, BuiltinFunctionForEVM> createEVMFunction(
 	return {name, std::move(f)};
 }
 
-pair<YulString, BuiltinFunctionForEVM> createFunction(
-	string _name,
+std::pair<YulString, BuiltinFunctionForEVM> createFunction(
+	std::string _name,
 	size_t _params,
 	size_t _returns,
 	SideEffects _sideEffects,
-	vector<optional<LiteralKind>> _literalArguments,
+	std::vector<std::optional<LiteralKind>> _literalArguments,
 	std::function<void(FunctionCall const&, AbstractAssembly&, BuiltinContext&)> _generateCode
 )
 {
@@ -111,7 +111,7 @@ pair<YulString, BuiltinFunctionForEVM> createFunction(
 	return {name, f};
 }
 
-set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
+std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 {
 	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
 	// basefee for VMs before london.
@@ -122,20 +122,20 @@ set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 
 	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
 	// prevrandao for VMs before paris.
-	auto prevRandaoException = [&](string const& _instrName) -> bool
+	auto prevRandaoException = [&](std::string const& _instrName) -> bool
 	{
 		// Using string comparison as the opcode is the same as for "difficulty"
 		return _instrName == "prevrandao" && _evmVersion < langutil::EVMVersion::paris();
 	};
 
-	set<YulString> reserved;
+	std::set<YulString> reserved;
 	for (auto const& instr: evmasm::c_instructions)
 	{
-		string name = toLower(instr.first);
+		std::string name = toLower(instr.first);
 		if (!baseFeeException(instr.second) && !prevRandaoException(name))
 			reserved.emplace(name);
 	}
-	reserved += vector<YulString>{
+	reserved += std::vector<YulString>{
 		"linkersymbol"_yulstring,
 		"datasize"_yulstring,
 		"dataoffset"_yulstring,
@@ -146,19 +146,19 @@ set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 	return reserved;
 }
 
-map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVersion, bool _objectAccess)
+std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVersion, bool _objectAccess)
 {
 
 	// Exclude prevrandao as builtin for VMs before paris and difficulty for VMs after paris.
-	auto prevRandaoException = [&](string const& _instrName) -> bool
+	auto prevRandaoException = [&](std::string const& _instrName) -> bool
 	{
 		return (_instrName == "prevrandao" && _evmVersion < langutil::EVMVersion::paris()) || (_instrName == "difficulty" && _evmVersion >= langutil::EVMVersion::paris());
 	};
 
-	map<YulString, BuiltinFunctionForEVM> builtins;
+	std::map<YulString, BuiltinFunctionForEVM> builtins;
 	for (auto const& instr: evmasm::c_instructions)
 	{
-		string name = toLower(instr.first);
+		std::string name = toLower(instr.first);
 		auto const opcode = instr.second;
 
 		if (
@@ -198,7 +198,7 @@ map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVe
 				BuiltinContext&
 			) {
 				yulAssert(_call.arguments.size() == 1, "");
-				Literal const* literal = get_if<Literal>(&_call.arguments.front());
+				Literal const* literal = std::get_if<Literal>(&_call.arguments.front());
 				yulAssert(literal, "");
 				_assembly.appendConstant(valueOfLiteral(*literal));
 			})
@@ -217,10 +217,10 @@ map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVe
 				_assembly.appendAssemblySize();
 			else
 			{
-				vector<size_t> subIdPath =
+			std::vector<size_t> subIdPath =
 					_context.subIDs.count(dataName) == 0 ?
 						_context.currentObject->pathToSubObject(dataName) :
-						vector<size_t>{_context.subIDs.at(dataName)};
+						std::vector<size_t>{_context.subIDs.at(dataName)};
 				yulAssert(!subIdPath.empty(), "Could not find assembly object <" + dataName.str() + ">.");
 				_assembly.appendDataSize(subIdPath);
 			}
@@ -238,10 +238,10 @@ map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVe
 				_assembly.appendConstant(0);
 			else
 			{
-				vector<size_t> subIdPath =
+			std::vector<size_t> subIdPath =
 					_context.subIDs.count(dataName) == 0 ?
 						_context.currentObject->pathToSubObject(dataName) :
-						vector<size_t>{_context.subIDs.at(dataName)};
+						std::vector<size_t>{_context.subIDs.at(dataName)};
 				yulAssert(!subIdPath.empty(), "Could not find assembly object <" + dataName.str() + ">.");
 				_assembly.appendDataOffset(subIdPath);
 			}
@@ -295,9 +295,9 @@ map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _evmVe
 	return builtins;
 }
 
-regex const& verbatimPattern()
+std::regex const& verbatimPattern()
 {
-	regex static const pattern{"verbatim_([1-9]?[0-9])i_([1-9]?[0-9])o"};
+	std::regex static const pattern{"verbatim_([1-9]?[0-9])i_([1-9]?[0-9])o"};
 	return pattern;
 }
 
@@ -316,7 +316,7 @@ BuiltinFunctionForEVM const* EVMDialect::builtin(YulString _name) const
 {
 	if (m_objectAccess)
 	{
-		smatch match;
+		std::smatch match;
 		if (regex_match(_name.str(), match, verbatimPattern()))
 			return verbatimFunction(stoul(match[1]), stoul(match[2]));
 	}
@@ -337,19 +337,19 @@ bool EVMDialect::reservedIdentifier(YulString _name) const
 
 EVMDialect const& EVMDialect::strictAssemblyForEVM(langutil::EVMVersion _version)
 {
-	static map<langutil::EVMVersion, unique_ptr<EVMDialect const>> dialects;
+	static std::map<langutil::EVMVersion, std::unique_ptr<EVMDialect const>> dialects;
 	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
 	if (!dialects[_version])
-		dialects[_version] = make_unique<EVMDialect>(_version, false);
+		dialects[_version] = std::make_unique<EVMDialect>(_version, false);
 	return *dialects[_version];
 }
 
 EVMDialect const& EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion _version)
 {
-	static map<langutil::EVMVersion, unique_ptr<EVMDialect const>> dialects;
+	static std::map<langutil::EVMVersion, std::unique_ptr<EVMDialect const>> dialects;
 	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
 	if (!dialects[_version])
-		dialects[_version] = make_unique<EVMDialect>(_version, true);
+		dialects[_version] = std::make_unique<EVMDialect>(_version, true);
 	return *dialects[_version];
 }
 
@@ -374,16 +374,16 @@ SideEffects EVMDialect::sideEffectsOfInstruction(evmasm::Instruction _instructio
 
 BuiltinFunctionForEVM const* EVMDialect::verbatimFunction(size_t _arguments, size_t _returnVariables) const
 {
-	pair<size_t, size_t> key{_arguments, _returnVariables};
-	shared_ptr<BuiltinFunctionForEVM const>& function = m_verbatimFunctions[key];
+	std::pair<size_t, size_t> key{_arguments, _returnVariables};
+	std::shared_ptr<BuiltinFunctionForEVM const>& function = m_verbatimFunctions[key];
 	if (!function)
 	{
 		BuiltinFunctionForEVM builtinFunction = createFunction(
-			"verbatim_" + to_string(_arguments) + "i_" + to_string(_returnVariables) + "o",
+			"verbatim_" + std::to_string(_arguments) + "i_" + std::to_string(_returnVariables) + "o",
 			1 + _arguments,
 			_returnVariables,
 			SideEffects::worst(),
-			vector<optional<LiteralKind>>{LiteralKind::String} + vector<optional<LiteralKind>>(_arguments),
+			std::vector<std::optional<LiteralKind>>{LiteralKind::String} + std::vector<std::optional<LiteralKind>>(_arguments),
 			[=](
 				FunctionCall const& _call,
 				AbstractAssembly& _assembly,
@@ -400,7 +400,7 @@ BuiltinFunctionForEVM const* EVMDialect::verbatimFunction(size_t _arguments, siz
 			}
 		).second;
 		builtinFunction.isMSize = true;
-		function = make_shared<BuiltinFunctionForEVM const>(std::move(builtinFunction));
+		function = std::make_shared<BuiltinFunctionForEVM const>(std::move(builtinFunction));
 	}
 	return function.get();
 }
@@ -501,9 +501,9 @@ BuiltinFunctionForEVM const* EVMDialectTyped::equalityFunction(YulString _type)
 
 EVMDialectTyped const& EVMDialectTyped::instance(langutil::EVMVersion _version)
 {
-	static map<langutil::EVMVersion, unique_ptr<EVMDialectTyped const>> dialects;
+	static std::map<langutil::EVMVersion, std::unique_ptr<EVMDialectTyped const>> dialects;
 	static YulStringRepository::ResetCallback callback{[&] { dialects.clear(); }};
 	if (!dialects[_version])
-		dialects[_version] = make_unique<EVMDialectTyped>(_version, true);
+		dialects[_version] = std::make_unique<EVMDialectTyped>(_version, true);
 	return *dialects[_version];
 }
diff --git a/libyul/backends/evm/EVMMetrics.cpp b/libyul/backends/evm/EVMMetrics.cpp
index 0959698389..09c6abdd14 100644
--- a/libyul/backends/evm/EVMMetrics.cpp
+++ b/libyul/backends/evm/EVMMetrics.cpp
@@ -31,7 +31,6 @@
 
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -52,7 +51,7 @@ bigint GasMeter::combineCosts(std::pair<bigint, bigint> _costs) const
 }
 
 
-pair<bigint, bigint> GasMeterVisitor::costs(
+std::pair<bigint, bigint> GasMeterVisitor::costs(
 	Expression const& _expression,
 	EVMDialect const& _dialect,
 	bool _isCreation
@@ -63,7 +62,7 @@ pair<bigint, bigint> GasMeterVisitor::costs(
 	return {gmv.m_runGas, gmv.m_dataGas};
 }
 
-pair<bigint, bigint> GasMeterVisitor::instructionCosts(
+std::pair<bigint, bigint> GasMeterVisitor::instructionCosts(
 	evmasm::Instruction _instruction,
 	EVMDialect const& _dialect,
 	bool _isCreation
diff --git a/libyul/backends/evm/EVMObjectCompiler.cpp b/libyul/backends/evm/EVMObjectCompiler.cpp
index e7eae69ba6..28b72c0871 100644
--- a/libyul/backends/evm/EVMObjectCompiler.cpp
+++ b/libyul/backends/evm/EVMObjectCompiler.cpp
@@ -33,7 +33,6 @@
 #include <boost/algorithm/string.hpp>
 
 using namespace solidity::yul;
-using namespace std;
 
 void EVMObjectCompiler::compile(
 	Object& _object,
@@ -91,12 +90,12 @@ void EVMObjectCompiler::run(Object& _object, bool _optimize)
 		);
 		if (!stackErrors.empty())
 		{
-			vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
+			std::vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
 				*_object.code,
 				"memoryguard"_yulstring
 			);
 			auto stackError = stackErrors.front();
-			string msg = stackError.comment() ? *stackError.comment() : "";
+			std::string msg = stackError.comment() ? *stackError.comment() : "";
 			if (memoryGuardCalls.empty())
 				msg += "\nNo memoryguard was present. "
 					"Consider using memory-safe assembly only and annotating it via "
diff --git a/libyul/backends/evm/EthAssemblyAdapter.cpp b/libyul/backends/evm/EthAssemblyAdapter.cpp
index 9cbd6e00d9..79146f859c 100644
--- a/libyul/backends/evm/EthAssemblyAdapter.cpp
+++ b/libyul/backends/evm/EthAssemblyAdapter.cpp
@@ -33,7 +33,6 @@
 #include <memory>
 #include <functional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -122,14 +121,14 @@ void EthAssemblyAdapter::appendAssemblySize()
 	m_assembly.appendProgramSize();
 }
 
-pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> EthAssemblyAdapter::createSubAssembly(bool _creation, string _name)
+std::pair<std::shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> EthAssemblyAdapter::createSubAssembly(bool _creation, std::string _name)
 {
-	shared_ptr<evmasm::Assembly> assembly{make_shared<evmasm::Assembly>(m_assembly.evmVersion(), _creation, std::move(_name))};
+	std::shared_ptr<evmasm::Assembly> assembly{std::make_shared<evmasm::Assembly>(m_assembly.evmVersion(), _creation, std::move(_name))};
 	auto sub = m_assembly.newSub(assembly);
-	return {make_shared<EthAssemblyAdapter>(*assembly), static_cast<size_t>(sub.data())};
+	return {std::make_shared<EthAssemblyAdapter>(*assembly), static_cast<size_t>(sub.data())};
 }
 
-void EthAssemblyAdapter::appendDataOffset(vector<AbstractAssembly::SubID> const& _subPath)
+void EthAssemblyAdapter::appendDataOffset(std::vector<AbstractAssembly::SubID> const& _subPath)
 {
 	if (auto it = m_dataHashBySubId.find(_subPath[0]); it != m_dataHashBySubId.end())
 	{
@@ -141,7 +140,7 @@ void EthAssemblyAdapter::appendDataOffset(vector<AbstractAssembly::SubID> const&
 	m_assembly.pushSubroutineOffset(m_assembly.encodeSubPath(_subPath));
 }
 
-void EthAssemblyAdapter::appendDataSize(vector<AbstractAssembly::SubID> const& _subPath)
+void EthAssemblyAdapter::appendDataSize(std::vector<AbstractAssembly::SubID> const& _subPath)
 {
 	if (auto it = m_dataHashBySubId.find(_subPath[0]); it != m_dataHashBySubId.end())
 	{
diff --git a/libyul/backends/evm/NoOutputAssembly.cpp b/libyul/backends/evm/NoOutputAssembly.cpp
index ac64418ad8..2a3cca52cc 100644
--- a/libyul/backends/evm/NoOutputAssembly.cpp
+++ b/libyul/backends/evm/NoOutputAssembly.cpp
@@ -28,7 +28,6 @@
 
 #include <range/v3/view/iota.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -60,12 +59,12 @@ NoOutputAssembly::LabelID NoOutputAssembly::newLabelId()
 	return 1;
 }
 
-AbstractAssembly::LabelID NoOutputAssembly::namedLabel(string const&, size_t, size_t, optional<size_t>)
+AbstractAssembly::LabelID NoOutputAssembly::namedLabel(std::string const&, size_t, size_t, std::optional<size_t>)
 {
 	return 1;
 }
 
-void NoOutputAssembly::appendLinkerSymbol(string const&)
+void NoOutputAssembly::appendLinkerSymbol(std::string const&)
 {
 	yulAssert(false, "Linker symbols not yet implemented.");
 }
@@ -98,7 +97,7 @@ void NoOutputAssembly::appendAssemblySize()
 	appendInstruction(evmasm::Instruction::PUSH1);
 }
 
-pair<shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> NoOutputAssembly::createSubAssembly(bool, std::string)
+std::pair<std::shared_ptr<AbstractAssembly>, AbstractAssembly::SubID> NoOutputAssembly::createSubAssembly(bool, std::string)
 {
 	yulAssert(false, "Sub assemblies not implemented.");
 	return {};
diff --git a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
index 8e126a49a8..3df75bb88f 100644
--- a/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
+++ b/libyul/backends/evm/OptimizedEVMCodeTransform.cpp
@@ -38,9 +38,8 @@
 
 using namespace solidity;
 using namespace solidity::yul;
-using namespace std;
 
-vector<StackTooDeepError> OptimizedEVMCodeTransform::run(
+std::vector<StackTooDeepError> OptimizedEVMCodeTransform::run(
 	AbstractAssembly& _assembly,
 	AsmAnalysisInfo& _analysisInfo,
 	Block const& _block,
@@ -81,7 +80,7 @@ void OptimizedEVMCodeTransform::operator()(CFG::FunctionCall const& _call)
 		// Assert that we got the correct return label on stack.
 		if (_call.canContinue)
 		{
-			auto const* returnLabelSlot = get_if<FunctionCallReturnLabelSlot>(
+			auto const* returnLabelSlot = std::get_if<FunctionCallReturnLabelSlot>(
 				&m_stack.at(m_stack.size() - _call.functionCall.get().arguments.size() - 1)
 			);
 			yulAssert(returnLabelSlot && &returnLabelSlot->call.get() == &_call.functionCall.get(), "");
@@ -160,7 +159,7 @@ void OptimizedEVMCodeTransform::operator()(CFG::Assignment const& _assignment)
 
 	// Invalidate occurrences of the assigned variables.
 	for (auto& currentSlot: m_stack)
-		if (VariableSlot const* varSlot = get_if<VariableSlot>(&currentSlot))
+		if (VariableSlot const* varSlot = std::get_if<VariableSlot>(&currentSlot))
 			if (util::contains(_assignment.variables, *varSlot))
 				currentSlot = JunkSlot{};
 
@@ -185,8 +184,8 @@ OptimizedEVMCodeTransform::OptimizedEVMCodeTransform(
 	m_dfg(_dfg),
 	m_stackLayout(_stackLayout),
 	m_functionLabels([&](){
-		map<CFG::FunctionInfo const*, AbstractAssembly::LabelID> functionLabels;
-		set<YulString> assignedFunctionNames;
+		std::map<CFG::FunctionInfo const*, AbstractAssembly::LabelID> functionLabels;
+		std::set<YulString> assignedFunctionNames;
 		for (Scope::Function const* function: m_dfg.functions)
 		{
 			CFG::FunctionInfo const& functionInfo = m_dfg.functionInfo.at(function);
@@ -199,7 +198,7 @@ OptimizedEVMCodeTransform::OptimizedEVMCodeTransform(
 					function->name.str(),
 					function->arguments.size(),
 					function->returns.size(),
-					functionInfo.debugData ? functionInfo.debugData->astID : nullopt
+					functionInfo.debugData ? functionInfo.debugData->astID : std::nullopt
 				) :
 				m_assembly.newLabelId();
 		}
@@ -212,7 +211,7 @@ void OptimizedEVMCodeTransform::assertLayoutCompatibility(Stack const& _currentS
 {
 	yulAssert(_currentStack.size() == _desiredStack.size(), "");
 	for (auto&& [currentSlot, desiredSlot]: ranges::zip_view(_currentStack, _desiredStack))
-		yulAssert(holds_alternative<JunkSlot>(desiredSlot) || currentSlot == desiredSlot, "");
+		yulAssert(std::holds_alternative<JunkSlot>(desiredSlot) || currentSlot == desiredSlot, "");
 }
 
 AbstractAssembly::LabelID OptimizedEVMCodeTransform::getFunctionLabel(Scope::Function const& _function)
@@ -224,15 +223,15 @@ void OptimizedEVMCodeTransform::validateSlot(StackSlot const& _slot, Expression
 {
 	std::visit(util::GenericVisitor{
 		[&](yul::Literal const& _literal) {
-			auto* literalSlot = get_if<LiteralSlot>(&_slot);
+			auto* literalSlot = std::get_if<LiteralSlot>(&_slot);
 			yulAssert(literalSlot && valueOfLiteral(_literal) == literalSlot->value, "");
 		},
 		[&](yul::Identifier const& _identifier) {
-			auto* variableSlot = get_if<VariableSlot>(&_slot);
+			auto* variableSlot = std::get_if<VariableSlot>(&_slot);
 			yulAssert(variableSlot && variableSlot->variable.get().name == _identifier.name, "");
 		},
 		[&](yul::FunctionCall const& _call) {
-			auto* temporarySlot = get_if<TemporarySlot>(&_slot);
+			auto* temporarySlot = std::get_if<TemporarySlot>(&_slot);
 			yulAssert(temporarySlot && &temporarySlot->call.get() == &_call && temporarySlot->index == 0, "");
 		}
 	}, _expression);
@@ -267,10 +266,10 @@ void OptimizedEVMCodeTransform::createStackLayout(std::shared_ptr<DebugData cons
 				StackSlot const& deepSlot = m_stack.at(m_stack.size() - _i - 1);
 				YulString varNameDeep = slotVariableName(deepSlot);
 				YulString varNameTop = slotVariableName(m_stack.back());
-				string msg =
+				std::string msg =
 					"Cannot swap " + (varNameDeep.empty() ? "Slot " + stackSlotToString(deepSlot) : "Variable " + varNameDeep.str()) +
 					" with " + (varNameTop.empty() ? "Slot " + stackSlotToString(m_stack.back()) : "Variable " + varNameTop.str()) +
-					": too deep in the stack by " + to_string(deficit) + " slots in " + stackToString(m_stack);
+					": too deep in the stack by " + std::to_string(deficit) + " slots in " + stackToString(m_stack);
 				m_stackErrors.emplace_back(StackTooDeepError(
 					m_currentFunctionInfo ? m_currentFunctionInfo->function.name : YulString{},
 					varNameDeep.empty() ? varNameTop : varNameDeep,
@@ -297,9 +296,9 @@ void OptimizedEVMCodeTransform::createStackLayout(std::shared_ptr<DebugData cons
 				{
 					int deficit = static_cast<int>(*depth - 15);
 					YulString varName = slotVariableName(_slot);
-					string msg =
+					std::string msg =
 						(varName.empty() ? "Slot " + stackSlotToString(_slot) : "Variable " + varName.str())
-						+ " is " + to_string(*depth - 15) + " too deep in the stack " + stackToString(m_stack);
+						+ " is " + std::to_string(*depth - 15) + " too deep in the stack " + stackToString(m_stack);
 					m_stackErrors.emplace_back(StackTooDeepError(
 						m_currentFunctionInfo ? m_currentFunctionInfo->function.name : YulString{},
 						varName,
@@ -503,9 +502,9 @@ void OptimizedEVMCodeTransform::operator()(CFG::BasicBlock const& _block)
 		[&](CFG::BasicBlock::Terminated const&)
 		{
 			yulAssert(!_block.operations.empty());
-			if (CFG::BuiltinCall const* builtinCall = get_if<CFG::BuiltinCall>(&_block.operations.back().operation))
+			if (CFG::BuiltinCall const* builtinCall = std::get_if<CFG::BuiltinCall>(&_block.operations.back().operation))
 				yulAssert(builtinCall->builtin.get().controlFlowSideEffects.terminatesOrReverts(), "");
-			else if (CFG::FunctionCall const* functionCall = get_if<CFG::FunctionCall>(&_block.operations.back().operation))
+			else if (CFG::FunctionCall const* functionCall = std::get_if<CFG::FunctionCall>(&_block.operations.back().operation))
 				yulAssert(!functionCall->canContinue);
 			else
 				yulAssert(false);
diff --git a/libyul/backends/evm/StackLayoutGenerator.cpp b/libyul/backends/evm/StackLayoutGenerator.cpp
index 71bf19458b..88190b45b3 100644
--- a/libyul/backends/evm/StackLayoutGenerator.cpp
+++ b/libyul/backends/evm/StackLayoutGenerator.cpp
@@ -46,7 +46,6 @@
 
 using namespace solidity;
 using namespace solidity::yul;
-using namespace std;
 
 StackLayout StackLayoutGenerator::run(CFG const& _cfg)
 {
@@ -59,9 +58,9 @@ StackLayout StackLayoutGenerator::run(CFG const& _cfg)
 	return stackLayout;
 }
 
-map<YulString, vector<StackLayoutGenerator::StackTooDeep>> StackLayoutGenerator::reportStackTooDeep(CFG const& _cfg)
+std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> StackLayoutGenerator::reportStackTooDeep(CFG const& _cfg)
 {
-	map<YulString, vector<StackLayoutGenerator::StackTooDeep>> stackTooDeepErrors;
+	std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> stackTooDeepErrors;
 	stackTooDeepErrors[YulString{}] = reportStackTooDeep(_cfg, YulString{});
 	for (auto const& function: _cfg.functions)
 		if (auto errors = reportStackTooDeep(_cfg, function->name); !errors.empty())
@@ -69,7 +68,7 @@ map<YulString, vector<StackLayoutGenerator::StackTooDeep>> StackLayoutGenerator:
 	return stackTooDeepErrors;
 }
 
-vector<StackLayoutGenerator::StackTooDeep> StackLayoutGenerator::reportStackTooDeep(CFG const& _cfg, YulString _functionName)
+std::vector<StackLayoutGenerator::StackTooDeep> StackLayoutGenerator::reportStackTooDeep(CFG const& _cfg, YulString _functionName)
 {
 	StackLayout stackLayout;
 	CFG::FunctionInfo const* functionInfo = nullptr;
@@ -98,14 +97,14 @@ StackLayoutGenerator::StackLayoutGenerator(StackLayout& _layout, CFG::FunctionIn
 namespace
 {
 /// @returns all stack too deep errors that would occur when shuffling @a _source to @a _target.
-vector<StackLayoutGenerator::StackTooDeep> findStackTooDeep(Stack const& _source, Stack const& _target)
+std::vector<StackLayoutGenerator::StackTooDeep> findStackTooDeep(Stack const& _source, Stack const& _target)
 {
 	Stack currentStack = _source;
-	vector<StackLayoutGenerator::StackTooDeep> stackTooDeepErrors;
+	std::vector<StackLayoutGenerator::StackTooDeep> stackTooDeepErrors;
 	auto getVariableChoices = [](auto&& _range) {
-		vector<YulString> result;
+		std::vector<YulString> result;
 		for (auto const& slot: _range)
-			if (auto const* variableSlot = get_if<VariableSlot>(&slot))
+			if (auto const* variableSlot = std::get_if<VariableSlot>(&slot))
 				if (!util::contains(result, variableSlot->variable.get().name))
 					result.push_back(variableSlot->variable.get().name);
 		return result;
@@ -160,7 +159,7 @@ Stack createIdealLayout(Stack const& _operationOutput, Stack const& _post, Calla
 	// PreviousSlot{0}, ..., PreviousSlot{n}, [output<0>], ..., [output<m>]
 	auto layout = ranges::views::iota(0u, preOperationLayoutSize) |
 		ranges::views::transform([](size_t _index) { return PreviousSlot{_index}; }) |
-		ranges::to<vector<variant<PreviousSlot, StackSlot>>>;
+		ranges::to<std::vector<std::variant<PreviousSlot, StackSlot>>>;
 	layout += _operationOutput;
 
 	// Shortcut for trivial case.
@@ -171,23 +170,23 @@ Stack createIdealLayout(Stack const& _operationOutput, Stack const& _post, Calla
 	// that are aware of PreviousSlot's.
 	struct ShuffleOperations
 	{
-		vector<variant<PreviousSlot, StackSlot>>& layout;
+		std::vector<std::variant<PreviousSlot, StackSlot>>& layout;
 		Stack const& post;
 		std::set<StackSlot> outputs;
 		Multiplicity multiplicity;
 		Callable generateSlotOnTheFly;
 		ShuffleOperations(
-			vector<variant<PreviousSlot, StackSlot>>& _layout,
+			std::vector<std::variant<PreviousSlot, StackSlot>>& _layout,
 			Stack const& _post,
 			Callable _generateSlotOnTheFly
 		): layout(_layout), post(_post), generateSlotOnTheFly(_generateSlotOnTheFly)
 		{
 			for (auto const& layoutSlot: layout)
-				if (StackSlot const* slot = get_if<StackSlot>(&layoutSlot))
+				if (StackSlot const* slot = std::get_if<StackSlot>(&layoutSlot))
 					outputs.insert(*slot);
 
 			for (auto const& layoutSlot: layout)
-				if (StackSlot const* slot = get_if<StackSlot>(&layoutSlot))
+				if (StackSlot const* slot = std::get_if<StackSlot>(&layoutSlot))
 					--multiplicity[*slot];
 			for (auto&& slot: post)
 				if (outputs.count(slot) || generateSlotOnTheFly(slot))
@@ -235,7 +234,7 @@ Stack createIdealLayout(Stack const& _operationOutput, Stack const& _post, Calla
 		}
 		void swap(size_t _i)
 		{
-			yulAssert(!holds_alternative<PreviousSlot>(layout.at(layout.size() - _i - 1)) || !holds_alternative<PreviousSlot>(layout.back()), "");
+			yulAssert(!std::holds_alternative<PreviousSlot>(layout.at(layout.size() - _i - 1)) || !std::holds_alternative<PreviousSlot>(layout.back()), "");
 			std::swap(layout.at(layout.size() -  _i - 1), layout.back());
 		}
 		size_t sourceSize() { return layout.size(); }
@@ -250,7 +249,7 @@ Stack createIdealLayout(Stack const& _operationOutput, Stack const& _post, Calla
 	// output in place. The resulting permutation of the PreviousSlot yields the ideal positions of slots
 	// before the operation, i.e. if PreviousSlot{2} is at a position at which _post contains VariableSlot{"tmp"},
 	// then we want the variable tmp in the slot at offset 2 in the layout before the operation.
-	vector<optional<StackSlot>> idealLayout(_post.size(), nullopt);
+	std::vector<std::optional<StackSlot>> idealLayout(_post.size(), std::nullopt);
 	for (auto&& [slot, idealPosition]: ranges::zip_view(_post, layout))
 		if (PreviousSlot* previousSlot = std::get_if<PreviousSlot>(&idealPosition))
 			idealLayout.at(previousSlot->slot) = slot;
@@ -261,7 +260,7 @@ Stack createIdealLayout(Stack const& _operationOutput, Stack const& _post, Calla
 
 	yulAssert(idealLayout.size() == preOperationLayoutSize, "");
 
-	return idealLayout | ranges::views::transform([](optional<StackSlot> s) {
+	return idealLayout | ranges::views::transform([](std::optional<StackSlot> s) {
 		yulAssert(s, "");
 		return *s;
 	}) | ranges::to<Stack>;
@@ -271,7 +270,7 @@ Stack createIdealLayout(Stack const& _operationOutput, Stack const& _post, Calla
 Stack StackLayoutGenerator::propagateStackThroughOperation(Stack _exitStack, CFG::Operation const& _operation, bool _aggressiveStackCompression)
 {
 	// Enable aggressive stack compression for recursive calls.
-	if (auto const* functionCall = get_if<CFG::FunctionCall>(&_operation.operation))
+	if (auto const* functionCall = std::get_if<CFG::FunctionCall>(&_operation.operation))
 		if (functionCall->recursive)
 			_aggressiveStackCompression = true;
 
@@ -285,9 +284,9 @@ Stack StackLayoutGenerator::propagateStackThroughOperation(Stack _exitStack, CFG
 	Stack stack = createIdealLayout(_operation.output, _exitStack, generateSlotOnTheFly);
 
 	// Make sure the resulting previous slots do not overlap with any assignmed variables.
-	if (auto const* assignment = get_if<CFG::Assignment>(&_operation.operation))
+	if (auto const* assignment = std::get_if<CFG::Assignment>(&_operation.operation))
 		for (auto& stackSlot: stack)
-			if (auto const* varSlot = get_if<VariableSlot>(&stackSlot))
+			if (auto const* varSlot = std::get_if<VariableSlot>(&stackSlot))
 				yulAssert(!util::contains(assignment->variables, *varSlot), "");
 
 	// Since stack+_operation.output can be easily shuffled to _exitLayout, the desired layout before the operation
@@ -335,11 +334,11 @@ Stack StackLayoutGenerator::propagateStackThroughBlock(Stack _exitStack, CFG::Ba
 
 void StackLayoutGenerator::processEntryPoint(CFG::BasicBlock const& _entry, CFG::FunctionInfo const* _functionInfo)
 {
-	list<CFG::BasicBlock const*> toVisit{&_entry};
-	set<CFG::BasicBlock const*> visited;
+	std::list<CFG::BasicBlock const*> toVisit{&_entry};
+	std::set<CFG::BasicBlock const*> visited;
 
 	// TODO: check whether visiting only a subset of these in the outer iteration below is enough.
-	list<pair<CFG::BasicBlock const*, CFG::BasicBlock const*>> backwardsJumps = collectBackwardsJumps(_entry);
+	std::list<std::pair<CFG::BasicBlock const*, CFG::BasicBlock const*>> backwardsJumps = collectBackwardsJumps(_entry);
 
 	while (!toVisit.empty())
 	{
@@ -407,10 +406,10 @@ void StackLayoutGenerator::processEntryPoint(CFG::BasicBlock const& _entry, CFG:
 	fillInJunk(_entry, _functionInfo);
 }
 
-optional<Stack> StackLayoutGenerator::getExitLayoutOrStageDependencies(
+std::optional<Stack> StackLayoutGenerator::getExitLayoutOrStageDependencies(
 	CFG::BasicBlock const& _block,
-	set<CFG::BasicBlock const*> const& _visited,
-	list<CFG::BasicBlock const*>& _toVisit
+	std::set<CFG::BasicBlock const*> const& _visited,
+	std::list<CFG::BasicBlock const*>& _toVisit
 ) const
 {
 	return std::visit(util::GenericVisitor{
@@ -434,7 +433,7 @@ optional<Stack> StackLayoutGenerator::getExitLayoutOrStageDependencies(
 				return m_layout.blockInfos.at(_jump.target).entryLayout;
 			// Otherwise stage the jump target for visit and defer the current block.
 			_toVisit.emplace_front(_jump.target);
-			return nullopt;
+			return std::nullopt;
 		},
 		[&](CFG::BasicBlock::ConditionalJump const& _conditionalJump) -> std::optional<Stack>
 		{
@@ -456,7 +455,7 @@ optional<Stack> StackLayoutGenerator::getExitLayoutOrStageDependencies(
 				_toVisit.emplace_front(_conditionalJump.zero);
 			if (!nonZeroVisited)
 				_toVisit.emplace_front(_conditionalJump.nonZero);
-			return nullopt;
+			return std::nullopt;
 		},
 		[&](CFG::BasicBlock::FunctionReturn const& _functionReturn) -> std::optional<Stack>
 		{
@@ -476,9 +475,9 @@ optional<Stack> StackLayoutGenerator::getExitLayoutOrStageDependencies(
 	}, _block.exit);
 }
 
-list<pair<CFG::BasicBlock const*, CFG::BasicBlock const*>> StackLayoutGenerator::collectBackwardsJumps(CFG::BasicBlock const& _entry) const
+std::list<std::pair<CFG::BasicBlock const*, CFG::BasicBlock const*>> StackLayoutGenerator::collectBackwardsJumps(CFG::BasicBlock const& _entry) const
 {
-	list<pair<CFG::BasicBlock const*, CFG::BasicBlock const*>> backwardsJumps;
+	std::list<std::pair<CFG::BasicBlock const*, CFG::BasicBlock const*>> backwardsJumps;
 	util::BreadthFirstSearch<CFG::BasicBlock const*>{{&_entry}}.run([&](CFG::BasicBlock const* _block, auto _addChild) {
 		std::visit(util::GenericVisitor{
 			[&](CFG::BasicBlock::MainExit const&) {},
@@ -576,7 +575,7 @@ Stack StackLayoutGenerator::combineStack(Stack const& _stack1, Stack const& _sta
 		if (!util::contains(candidate, slot))
 			candidate.emplace_back(slot);
 	cxx20::erase_if(candidate, [](StackSlot const& slot) {
-		return holds_alternative<LiteralSlot>(slot) || holds_alternative<FunctionCallReturnLabelSlot>(slot);
+		return std::holds_alternative<LiteralSlot>(slot) || std::holds_alternative<FunctionCallReturnLabelSlot>(slot);
 	});
 
 	auto evaluate = [&](Stack const& _candidate) -> size_t {
@@ -633,9 +632,9 @@ Stack StackLayoutGenerator::combineStack(Stack const& _stack1, Stack const& _sta
 	return commonPrefix + bestCandidate;
 }
 
-vector<StackLayoutGenerator::StackTooDeep> StackLayoutGenerator::reportStackTooDeep(CFG::BasicBlock const& _entry) const
+std::vector<StackLayoutGenerator::StackTooDeep> StackLayoutGenerator::reportStackTooDeep(CFG::BasicBlock const& _entry) const
 {
-	vector<StackTooDeep> stackTooDeepErrors;
+	std::vector<StackTooDeep> stackTooDeepErrors;
 	util::BreadthFirstSearch<CFG::BasicBlock const*> breadthFirstSearch{{&_entry}};
 	breadthFirstSearch.run([&](CFG::BasicBlock const* _block, auto _addChild) {
 		Stack currentStack = m_layout.blockInfos.at(_block).entryLayout;
@@ -683,7 +682,7 @@ vector<StackLayoutGenerator::StackTooDeep> StackLayoutGenerator::reportStackTooD
 
 Stack StackLayoutGenerator::compressStack(Stack _stack)
 {
-	optional<size_t> firstDupOffset;
+	std::optional<size_t> firstDupOffset;
 	do
 	{
 		if (firstDupOffset)
@@ -768,8 +767,8 @@ void StackLayoutGenerator::fillInJunk(CFG::BasicBlock const& _block, CFG::Functi
 				{
 					// This has to be a previously unassigned return variable.
 					// We at least sanity-check that it is among the return variables at all.
-					yulAssert(m_currentFunctionInfo && holds_alternative<VariableSlot>(_slot));
-					yulAssert(util::contains(m_currentFunctionInfo->returnVariables, get<VariableSlot>(_slot)));
+					yulAssert(m_currentFunctionInfo && std::holds_alternative<VariableSlot>(_slot));
+					yulAssert(util::contains(m_currentFunctionInfo->returnVariables, std::get<VariableSlot>(_slot)));
 					// Strictly speaking the cost of the PUSH0 depends on the targeted EVM version, but the difference
 					// will not matter here.
 					opGas += evmasm::GasMeter::runGas(evmasm::pushInstruction(0), langutil::EVMVersion());;
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index f12fcc8e65..69955f7174 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -34,6 +34,7 @@ NAMESPACE_STD_FREE_FILES=(
     libsolidity/lsp/*
     libsolidity/parsing/*
     libsolutil/*
+    libyul/backends/evm/*
     solc/*
 )
 

From 2cf23e15d867f702c9e85864aa68935af9f7c606 Mon Sep 17 00:00:00 2001
From: Jun Zhang <jun@junz.org>
Date: Thu, 24 Aug 2023 09:54:58 +0800
Subject: [PATCH 1583/1748] Bump fmtlib to 9.1.0

In our downstream project, we have two dependencies: solidity and spdlog.
Both of them depend on fmtlib. Unfortunately, the versions of fmtlib they
use do not match, which leads to compilation failure.

The issue arises because spdlog attempts to use solidity's fmtlib, but the
specific version (v8.0.1) has a bug. Ref: https://github.com/gabime/spdlog/issues/2142

While we could keep this change in our own fork, we believe it would
be worthwhile to contribute it back to the upstream since spdlog is a
very popular logging library.

Signed-off-by: Jun Zhang <jun@junz.org>
---
 cmake/fmtlib.cmake                        | 6 +++---
 libsolidity/lsp/SemanticTokensBuilder.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cmake/fmtlib.cmake b/cmake/fmtlib.cmake
index 792bf3b027..032a68cd52 100644
--- a/cmake/fmtlib.cmake
+++ b/cmake/fmtlib.cmake
@@ -4,9 +4,9 @@ FetchContent_Declare(
 	fmtlib
 	PREFIX "${PROJECT_BINARY_DIR}/deps"
 	DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
-	DOWNLOAD_NAME fmt-8.0.1.tar.gz
-	URL https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz
-	URL_HASH SHA256=b06ca3130158c625848f3fb7418f235155a4d389b2abc3a6245fb01cb0eb1e01
+	DOWNLOAD_NAME fmt-9.1.0.tar.gz
+	URL https://github.com/fmtlib/fmt/archive/9.1.0.tar.gz
+	URL_HASH SHA256=5dea48d1fcddc3ec571ce2058e13910a0d4a6bab4cc09a809d8b1dd1c88ae6f2
 )
 
 if (CMAKE_VERSION VERSION_LESS "3.14.0")
diff --git a/libsolidity/lsp/SemanticTokensBuilder.cpp b/libsolidity/lsp/SemanticTokensBuilder.cpp
index ac52954738..2f44354184 100644
--- a/libsolidity/lsp/SemanticTokensBuilder.cpp
+++ b/libsolidity/lsp/SemanticTokensBuilder.cpp
@@ -118,7 +118,7 @@ void SemanticTokensBuilder::encode(
 	auto const [line, startChar] = m_charStream->translatePositionToLineColumn(_sourceLocation.start);
 	auto const length = _sourceLocation.end - _sourceLocation.start;
 
-	lspDebug(fmt::format("encode [{}:{}..{}] {}", line, startChar, length, _tokenType));
+	lspDebug(fmt::format("encode [{}:{}..{}] {}", line, startChar, length, static_cast<int>(_tokenType)));
 
 	m_encodedTokens.append(line - m_lastLine);
 	if (line == m_lastLine)

From c2362c3362fdc9d2fe695f6f7e1581123dff9ec6 Mon Sep 17 00:00:00 2001
From: Jun Zhang <jun@junz.org>
Date: Wed, 23 Aug 2023 10:03:44 +0800
Subject: [PATCH 1584/1748] Purge using namespace std from libyul/optimiser

Signed-off-by: Jun Zhang <jun@junz.org>
---
 libyul/optimiser/ASTCopier.cpp                |  1 -
 libyul/optimiser/ASTWalker.cpp                |  1 -
 libyul/optimiser/BlockFlattener.cpp           |  9 +-
 libyul/optimiser/BlockHasher.cpp              |  1 -
 libyul/optimiser/CallGraphGenerator.cpp       |  9 +-
 libyul/optimiser/CircularReferencesPruner.cpp |  9 +-
 .../CommonSubexpressionEliminator.cpp         | 13 ++-
 libyul/optimiser/ConditionalSimplifier.cpp    | 13 ++-
 libyul/optimiser/ConditionalUnsimplifier.cpp  | 17 ++--
 libyul/optimiser/ControlFlowSimplifier.cpp    | 13 ++-
 libyul/optimiser/DataFlowAnalyzer.cpp         | 53 ++++++------
 libyul/optimiser/DeadCodeEliminator.cpp       |  5 +-
 libyul/optimiser/Disambiguator.cpp            |  1 -
 libyul/optimiser/EqualStoreEliminator.cpp     |  7 +-
 .../optimiser/EquivalentFunctionCombiner.cpp  |  1 -
 .../optimiser/EquivalentFunctionDetector.cpp  |  1 -
 libyul/optimiser/ExpressionInliner.cpp        |  5 +-
 libyul/optimiser/ExpressionJoiner.cpp         | 11 ++-
 libyul/optimiser/ExpressionSimplifier.cpp     | 11 ++-
 libyul/optimiser/ExpressionSplitter.cpp       | 13 ++-
 libyul/optimiser/ForLoopConditionIntoBody.cpp | 11 ++-
 .../optimiser/ForLoopConditionOutOfBody.cpp   | 15 ++--
 libyul/optimiser/ForLoopInitRewriter.cpp      |  7 +-
 libyul/optimiser/FullInliner.cpp              | 49 ++++++-----
 libyul/optimiser/FunctionCallFinder.cpp       |  3 +-
 libyul/optimiser/FunctionGrouper.cpp          |  9 +-
 libyul/optimiser/FunctionHoister.cpp          |  3 +-
 libyul/optimiser/FunctionSpecializer.cpp      | 35 ++++----
 .../InlinableExpressionFunctionFinder.cpp     |  5 +-
 libyul/optimiser/KnowledgeBase.cpp            | 43 +++++-----
 libyul/optimiser/LoadResolver.cpp             | 17 ++--
 libyul/optimiser/LoopInvariantCodeMotion.cpp  | 25 +++---
 libyul/optimiser/Metrics.cpp                  | 31 ++++---
 libyul/optimiser/NameCollector.cpp            | 17 ++--
 libyul/optimiser/NameDispenser.cpp            |  7 +-
 libyul/optimiser/NameDisplacer.cpp            |  3 +-
 libyul/optimiser/NameSimplifier.cpp           | 45 +++++-----
 libyul/optimiser/OptimizerUtilities.cpp       | 13 ++-
 libyul/optimiser/Rematerialiser.cpp           | 11 ++-
 libyul/optimiser/SSAReverser.cpp              |  3 +-
 libyul/optimiser/SSATransform.cpp             | 67 ++++++++-------
 libyul/optimiser/SSAValueTracker.cpp          |  5 +-
 libyul/optimiser/Semantics.cpp                | 31 ++++---
 libyul/optimiser/SimplificationRules.cpp      | 33 ++++----
 libyul/optimiser/StackCompressor.cpp          | 43 +++++-----
 libyul/optimiser/StackLimitEvader.cpp         | 23 +++---
 libyul/optimiser/StackToMemoryMover.cpp       | 71 ++++++++--------
 libyul/optimiser/StructuralSimplifier.cpp     | 11 ++-
 libyul/optimiser/Substitution.cpp             |  3 +-
 libyul/optimiser/Suite.cpp                    | 82 +++++++++----------
 libyul/optimiser/SyntacticalEquality.cpp      |  1 -
 libyul/optimiser/TypeInfo.cpp                 |  3 +-
 libyul/optimiser/UnusedAssignEliminator.cpp   |  7 +-
 .../UnusedFunctionParameterPruner.cpp         | 19 ++---
 libyul/optimiser/UnusedPruner.cpp             | 25 +++---
 libyul/optimiser/UnusedStoreBase.cpp          |  9 +-
 libyul/optimiser/UnusedStoreEliminator.cpp    | 81 +++++++++---------
 libyul/optimiser/VarDeclInitializer.cpp       |  9 +-
 libyul/optimiser/VarNameCleaner.cpp           | 19 ++---
 scripts/check_style.sh                        |  1 +
 60 files changed, 516 insertions(+), 573 deletions(-)

diff --git a/libyul/optimiser/ASTCopier.cpp b/libyul/optimiser/ASTCopier.cpp
index 79dc82efa7..9f41079418 100644
--- a/libyul/optimiser/ASTCopier.cpp
+++ b/libyul/optimiser/ASTCopier.cpp
@@ -25,7 +25,6 @@
 
 #include <libsolutil/Common.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
diff --git a/libyul/optimiser/ASTWalker.cpp b/libyul/optimiser/ASTWalker.cpp
index cdcfaa635f..cd8732cd08 100644
--- a/libyul/optimiser/ASTWalker.cpp
+++ b/libyul/optimiser/ASTWalker.cpp
@@ -25,7 +25,6 @@
 
 #include <range/v3/view/reverse.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
diff --git a/libyul/optimiser/BlockFlattener.cpp b/libyul/optimiser/BlockFlattener.cpp
index 0bb828ee5a..f7dc19f96c 100644
--- a/libyul/optimiser/BlockFlattener.cpp
+++ b/libyul/optimiser/BlockFlattener.cpp
@@ -23,7 +23,6 @@
 
 #include <functional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -34,9 +33,9 @@ void BlockFlattener::operator()(Block& _block)
 
 	iterateReplacing(
 		_block.statements,
-		[](Statement& _s) -> std::optional<vector<Statement>>
+		[](Statement& _s) -> std::optional<std::vector<Statement>>
 		{
-			if (holds_alternative<Block>(_s))
+			if (std::holds_alternative<Block>(_s))
 				return std::move(std::get<Block>(_s).statements);
 			else
 				return {};
@@ -48,9 +47,9 @@ void BlockFlattener::run(OptimiserStepContext&, Block& _ast)
 {
 	BlockFlattener flattener;
 	for (auto& statement: _ast.statements)
-		if (auto* block = get_if<Block>(&statement))
+		if (auto* block = std::get_if<Block>(&statement))
 			flattener(*block);
-		else if (auto* function = get_if<FunctionDefinition>(&statement))
+		else if (auto* function = std::get_if<FunctionDefinition>(&statement))
 			flattener(function->body);
 		else
 			yulAssert(false, "BlockFlattener requires the FunctionGrouper.");
diff --git a/libyul/optimiser/BlockHasher.cpp b/libyul/optimiser/BlockHasher.cpp
index ce07ac9f76..380cc15fb3 100644
--- a/libyul/optimiser/BlockHasher.cpp
+++ b/libyul/optimiser/BlockHasher.cpp
@@ -23,7 +23,6 @@
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
diff --git a/libyul/optimiser/CallGraphGenerator.cpp b/libyul/optimiser/CallGraphGenerator.cpp
index 66f740391d..87035e68a0 100644
--- a/libyul/optimiser/CallGraphGenerator.cpp
+++ b/libyul/optimiser/CallGraphGenerator.cpp
@@ -25,7 +25,6 @@
 #include <libsolutil/CommonData.h>
 #include <stack>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -36,9 +35,9 @@ namespace
 struct CallGraphCycleFinder
 {
 	CallGraph const& callGraph;
-	set<YulString> containedInCycle{};
-	set<YulString> visited{};
-	vector<YulString> currentPath{};
+	std::set<YulString> containedInCycle{};
+	std::set<YulString> visited{};
+	std::vector<YulString> currentPath{};
 
 	void visit(YulString _function)
 	{
@@ -62,7 +61,7 @@ struct CallGraphCycleFinder
 };
 }
 
-set<YulString> CallGraph::recursiveFunctions() const
+std::set<YulString> CallGraph::recursiveFunctions() const
 {
 	CallGraphCycleFinder cycleFinder{*this};
 	// Visiting the root only is not enough, since there may be disconnected recursive functions.
diff --git a/libyul/optimiser/CircularReferencesPruner.cpp b/libyul/optimiser/CircularReferencesPruner.cpp
index ba1fbf11da..824d2be39f 100644
--- a/libyul/optimiser/CircularReferencesPruner.cpp
+++ b/libyul/optimiser/CircularReferencesPruner.cpp
@@ -24,7 +24,6 @@
 
 #include <libsolutil/Algorithms.h>
 
-using namespace std;
 using namespace solidity::yul;
 
 void CircularReferencesPruner::run(OptimiserStepContext& _context, Block& _ast)
@@ -35,11 +34,11 @@ void CircularReferencesPruner::run(OptimiserStepContext& _context, Block& _ast)
 
 void CircularReferencesPruner::operator()(Block& _block)
 {
-	set<YulString> functionsToKeep =
+	std::set<YulString> functionsToKeep =
 		functionsCalledFromOutermostContext(CallGraphGenerator::callGraph(_block));
 
 	for (auto&& statement: _block.statements)
-		if (holds_alternative<FunctionDefinition>(statement))
+		if (std::holds_alternative<FunctionDefinition>(statement))
 		{
 			FunctionDefinition const& funDef = std::get<FunctionDefinition>(statement);
 			if (!functionsToKeep.count(funDef.name))
@@ -49,9 +48,9 @@ void CircularReferencesPruner::operator()(Block& _block)
 	removeEmptyBlocks(_block);
 }
 
-set<YulString> CircularReferencesPruner::functionsCalledFromOutermostContext(CallGraph const& _callGraph)
+std::set<YulString> CircularReferencesPruner::functionsCalledFromOutermostContext(CallGraph const& _callGraph)
 {
-	set<YulString> verticesToTraverse = m_reservedIdentifiers;
+	std::set<YulString> verticesToTraverse = m_reservedIdentifiers;
 	verticesToTraverse.insert(YulString(""));
 
 	return util::BreadthFirstSearch<YulString>{{verticesToTraverse.begin(), verticesToTraverse.end()}}.run(
diff --git a/libyul/optimiser/CommonSubexpressionEliminator.cpp b/libyul/optimiser/CommonSubexpressionEliminator.cpp
index 5d085cdd41..ae55f75e98 100644
--- a/libyul/optimiser/CommonSubexpressionEliminator.cpp
+++ b/libyul/optimiser/CommonSubexpressionEliminator.cpp
@@ -31,7 +31,6 @@
 #include <libyul/Dialect.h>
 #include <libyul/Utilities.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -47,7 +46,7 @@ void CommonSubexpressionEliminator::run(OptimiserStepContext& _context, Block& _
 
 CommonSubexpressionEliminator::CommonSubexpressionEliminator(
 	Dialect const& _dialect,
-	map<YulString, SideEffects> _functionSideEffects
+	std::map<YulString, SideEffects> _functionSideEffects
 ):
 	DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore, std::move(_functionSideEffects))
 {
@@ -69,7 +68,7 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
 	bool descend = true;
 	// If this is a function call to a function that requires literal arguments,
 	// do not try to simplify there.
-	if (holds_alternative<FunctionCall>(_e))
+	if (std::holds_alternative<FunctionCall>(_e))
 	{
 		FunctionCall& funCall = std::get<FunctionCall>(_e);
 
@@ -94,13 +93,13 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
 	if (descend)
 		DataFlowAnalyzer::visit(_e);
 
-	if (Identifier const* identifier = get_if<Identifier>(&_e))
+	if (Identifier const* identifier = std::get_if<Identifier>(&_e))
 	{
 		YulString identifierName = identifier->name;
 		if (AssignedValue const* assignedValue = variableValue(identifierName))
 		{
 			assertThrow(assignedValue->value, OptimizerException, "");
-			if (Identifier const* value = get_if<Identifier>(assignedValue->value))
+			if (Identifier const* value = std::get_if<Identifier>(assignedValue->value))
 				if (inScope(value->name))
 					_e = Identifier{debugDataOf(_e), value->name};
 		}
@@ -114,8 +113,8 @@ void CommonSubexpressionEliminator::visit(Expression& _e)
 				// instead of literal zeros.
 				if (
 					m_returnVariables.count(variable) &&
-					holds_alternative<Literal>(*value->value) &&
-					valueOfLiteral(get<Literal>(*value->value)) == 0
+					std::holds_alternative<Literal>(*value->value) &&
+					valueOfLiteral(std::get<Literal>(*value->value)) == 0
 				)
 					continue;
 				// We check for syntactic equality again because the value might have changed.
diff --git a/libyul/optimiser/ConditionalSimplifier.cpp b/libyul/optimiser/ConditionalSimplifier.cpp
index 62d36520a2..b08b113de0 100644
--- a/libyul/optimiser/ConditionalSimplifier.cpp
+++ b/libyul/optimiser/ConditionalSimplifier.cpp
@@ -22,7 +22,6 @@
 #include <libyul/ControlFlowSideEffectsCollector.h>
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -38,7 +37,7 @@ void ConditionalSimplifier::run(OptimiserStepContext& _context, Block& _ast)
 void ConditionalSimplifier::operator()(Switch& _switch)
 {
 	visit(*_switch.expression);
-	if (!holds_alternative<Identifier>(*_switch.expression))
+	if (!std::holds_alternative<Identifier>(*_switch.expression))
 	{
 		ASTModifier::operator()(_switch);
 		return;
@@ -53,7 +52,7 @@ void ConditionalSimplifier::operator()(Switch& _switch)
 				Assignment{
 					_case.body.debugData,
 					{Identifier{_case.body.debugData, expr}},
-					make_unique<Expression>(*_case.value)
+					std::make_unique<Expression>(*_case.value)
 				}
 			);
 		}
@@ -65,14 +64,14 @@ void ConditionalSimplifier::operator()(Block& _block)
 {
 	iterateReplacing(
 		_block.statements,
-		[&](Statement& _s) -> std::optional<vector<Statement>>
+		[&](Statement& _s) -> std::optional<std::vector<Statement>>
 		{
 			visit(_s);
-			if (holds_alternative<If>(_s))
+			if (std::holds_alternative<If>(_s))
 			{
 				If& _if = std::get<If>(_s);
 				if (
-					holds_alternative<Identifier>(*_if.condition) &&
+					std::holds_alternative<Identifier>(*_if.condition) &&
 					!_if.body.statements.empty() &&
 					TerminationFinder(m_dialect, &m_functionSideEffects).controlFlowKind(_if.body.statements.back()) !=
 						TerminationFinder::ControlFlow::FlowOut
@@ -85,7 +84,7 @@ void ConditionalSimplifier::operator()(Block& _block)
 						Assignment{
 							debugData,
 							{Identifier{debugData, condition}},
-							make_unique<Expression>(m_dialect.zeroLiteralForType(m_dialect.boolType))
+							std::make_unique<Expression>(m_dialect.zeroLiteralForType(m_dialect.boolType))
 						}
 					);
 				}
diff --git a/libyul/optimiser/ConditionalUnsimplifier.cpp b/libyul/optimiser/ConditionalUnsimplifier.cpp
index ef640ed7c9..2af09af04b 100644
--- a/libyul/optimiser/ConditionalUnsimplifier.cpp
+++ b/libyul/optimiser/ConditionalUnsimplifier.cpp
@@ -23,7 +23,6 @@
 #include <libyul/ControlFlowSideEffectsCollector.h>
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -39,7 +38,7 @@ void ConditionalUnsimplifier::run(OptimiserStepContext& _context, Block& _ast)
 void ConditionalUnsimplifier::operator()(Switch& _switch)
 {
 	visit(*_switch.expression);
-	if (!holds_alternative<Identifier>(*_switch.expression))
+	if (!std::holds_alternative<Identifier>(*_switch.expression))
 	{
 		ASTModifier::operator()(_switch);
 		return;
@@ -52,14 +51,14 @@ void ConditionalUnsimplifier::operator()(Switch& _switch)
 			(*this)(*_case.value);
 			if (
 				!_case.body.statements.empty() &&
-				holds_alternative<Assignment>(_case.body.statements.front())
+				std::holds_alternative<Assignment>(_case.body.statements.front())
 			)
 			{
 				Assignment const& assignment = std::get<Assignment>(_case.body.statements.front());
 				if (
 					assignment.variableNames.size() == 1 &&
 					assignment.variableNames.front().name == expr &&
-					holds_alternative<Literal>(*assignment.value) &&
+					std::holds_alternative<Literal>(*assignment.value) &&
 					valueOfLiteral(std::get<Literal>(*assignment.value)) == valueOfLiteral(*_case.value)
 				)
 					_case.body.statements.erase(_case.body.statements.begin());
@@ -74,19 +73,19 @@ void ConditionalUnsimplifier::operator()(Block& _block)
 	walkVector(_block.statements);
 	iterateReplacingWindow<2>(
 		_block.statements,
-		[&](Statement& _stmt1, Statement& _stmt2) -> std::optional<vector<Statement>>
+		[&](Statement& _stmt1, Statement& _stmt2) -> std::optional<std::vector<Statement>>
 		{
-			if (holds_alternative<If>(_stmt1))
+			if (std::holds_alternative<If>(_stmt1))
 			{
 				If& _if = std::get<If>(_stmt1);
 				if (
-					holds_alternative<Identifier>(*_if.condition) &&
+					std::holds_alternative<Identifier>(*_if.condition) &&
 					!_if.body.statements.empty()
 				)
 				{
 					YulString condition = std::get<Identifier>(*_if.condition).name;
 					if (
-						holds_alternative<Assignment>(_stmt2) &&
+						std::holds_alternative<Assignment>(_stmt2) &&
 						TerminationFinder(m_dialect, &m_functionSideEffects).controlFlowKind(_if.body.statements.back()) !=
 							TerminationFinder::ControlFlow::FlowOut
 					)
@@ -95,7 +94,7 @@ void ConditionalUnsimplifier::operator()(Block& _block)
 						if (
 							assignment.variableNames.size() == 1 &&
 							assignment.variableNames.front().name == condition &&
-							holds_alternative<Literal>(*assignment.value) &&
+							std::holds_alternative<Literal>(*assignment.value) &&
 							valueOfLiteral(std::get<Literal>(*assignment.value)) == 0
 						)
 							return {make_vector<Statement>(std::move(_stmt1))};
diff --git a/libyul/optimiser/ControlFlowSimplifier.cpp b/libyul/optimiser/ControlFlowSimplifier.cpp
index cfd59d09ae..771b4e86bf 100644
--- a/libyul/optimiser/ControlFlowSimplifier.cpp
+++ b/libyul/optimiser/ControlFlowSimplifier.cpp
@@ -27,12 +27,11 @@
 
 #include <range/v3/action/remove_if.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::yul;
 
-using OptionalStatements = std::optional<vector<Statement>>;
+using OptionalStatements = std::optional<std::vector<Statement>>;
 
 namespace
 {
@@ -85,13 +84,13 @@ void ControlFlowSimplifier::operator()(Block& _block)
 void ControlFlowSimplifier::operator()(FunctionDefinition& _funDef)
 {
 	ASTModifier::operator()(_funDef);
-	if (!_funDef.body.statements.empty() && holds_alternative<Leave>(_funDef.body.statements.back()))
+	if (!_funDef.body.statements.empty() && std::holds_alternative<Leave>(_funDef.body.statements.back()))
 		_funDef.body.statements.pop_back();
 }
 
 void ControlFlowSimplifier::visit(Statement& _st)
 {
-	if (holds_alternative<ForLoop>(_st))
+	if (std::holds_alternative<ForLoop>(_st))
 	{
 		ForLoop& forLoop = std::get<ForLoop>(_st);
 		yulAssert(forLoop.pre.statements.empty(), "");
@@ -141,7 +140,7 @@ void ControlFlowSimplifier::simplify(std::vector<yul::Statement>& _statements)
 		[&](If& _ifStmt) -> OptionalStatements {
 			if (_ifStmt.body.statements.empty() && m_dialect.discardFunction(m_dialect.boolType))
 			{
-				OptionalStatements s = vector<Statement>{};
+				OptionalStatements s = std::vector<Statement>{};
 				s->emplace_back(makeDiscardCall(
 					_ifStmt.debugData,
 					*m_dialect.discardFunction(m_dialect.boolType),
@@ -197,7 +196,7 @@ OptionalStatements ControlFlowSimplifier::reduceSingleCaseSwitch(Switch& _switch
 	yulAssert(_switchStmt.cases.size() == 1, "Expected only one case!");
 
 	auto& switchCase = _switchStmt.cases.front();
-	shared_ptr<DebugData const> debugData = debugDataOf(*_switchStmt.expression);
+	std::shared_ptr<DebugData const> debugData = debugDataOf(*_switchStmt.expression);
 	YulString type = m_typeInfo.typeOf(*_switchStmt.expression);
 	if (switchCase.value)
 	{
@@ -205,7 +204,7 @@ OptionalStatements ControlFlowSimplifier::reduceSingleCaseSwitch(Switch& _switch
 			return {};
 		return make_vector<Statement>(If{
 			std::move(_switchStmt.debugData),
-			make_unique<Expression>(FunctionCall{
+			std::make_unique<Expression>(FunctionCall{
 				debugData,
 				Identifier{debugData, m_dialect.equalityFunction(type)->name},
 				{std::move(*switchCase.value), std::move(*_switchStmt.expression)}
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 81028e3007..958e70a838 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -38,7 +38,6 @@
 
 #include <range/v3/view/reverse.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::yul;
@@ -46,7 +45,7 @@ using namespace solidity::yul;
 DataFlowAnalyzer::DataFlowAnalyzer(
 	Dialect const& _dialect,
 	MemoryAndStorage _analyzeStores,
-	map<YulString, SideEffects> _functionSideEffects
+	std::map<YulString, SideEffects> _functionSideEffects
 ):
 	m_dialect(_dialect),
 	m_functionSideEffects(std::move(_functionSideEffects)),
@@ -99,7 +98,7 @@ void DataFlowAnalyzer::operator()(ExpressionStatement& _statement)
 
 void DataFlowAnalyzer::operator()(Assignment& _assignment)
 {
-	set<YulString> names;
+	std::set<YulString> names;
 	for (auto const& var: _assignment.variableNames)
 		names.emplace(var.name);
 	assertThrow(_assignment.value, OptimizerException, "");
@@ -110,7 +109,7 @@ void DataFlowAnalyzer::operator()(Assignment& _assignment)
 
 void DataFlowAnalyzer::operator()(VariableDeclaration& _varDecl)
 {
-	set<YulString> names;
+	std::set<YulString> names;
 	for (auto const& var: _varDecl.variables)
 		names.emplace(var.name);
 	m_variableScopes.back().variables += names;
@@ -139,14 +138,14 @@ void DataFlowAnalyzer::operator()(Switch& _switch)
 {
 	clearKnowledgeIfInvalidated(*_switch.expression);
 	visit(*_switch.expression);
-	set<YulString> assignedVariables;
+	std::set<YulString> assignedVariables;
 	for (auto& _case: _switch.cases)
 	{
 		Environment preEnvironment = m_state.environment;
 		(*this)(_case.body);
 		joinKnowledge(preEnvironment);
 
-		set<YulString> variables = assignedVariableNames(_case.body);
+		std::set<YulString> variables = assignedVariableNames(_case.body);
 		assignedVariables += variables;
 		// This is a little too destructive, we could retain the old values.
 		clearValues(variables);
@@ -192,7 +191,7 @@ void DataFlowAnalyzer::operator()(ForLoop& _for)
 	AssignmentsSinceContinue assignmentsSinceCont;
 	assignmentsSinceCont(_for.body);
 
-	set<YulString> assignedVariables =
+	std::set<YulString> assignedVariables =
 		assignedVariableNames(_for.body) + assignedVariableNames(_for.post);
 	clearValues(assignedVariables);
 
@@ -223,31 +222,31 @@ void DataFlowAnalyzer::operator()(Block& _block)
 	assertThrow(numScopes == m_variableScopes.size(), OptimizerException, "");
 }
 
-optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
+std::optional<YulString> DataFlowAnalyzer::storageValue(YulString _key) const
 {
 	if (YulString const* value = valueOrNullptr(m_state.environment.storage, _key))
 		return *value;
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
-optional<YulString> DataFlowAnalyzer::memoryValue(YulString _key) const
+std::optional<YulString> DataFlowAnalyzer::memoryValue(YulString _key) const
 {
 	if (YulString const* value = valueOrNullptr(m_state.environment.memory, _key))
 		return *value;
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
-optional<YulString> DataFlowAnalyzer::keccakValue(YulString _start, YulString _length) const
+std::optional<YulString> DataFlowAnalyzer::keccakValue(YulString _start, YulString _length) const
 {
-	if (YulString const* value = valueOrNullptr(m_state.environment.keccak, make_pair(_start, _length)))
+	if (YulString const* value = valueOrNullptr(m_state.environment.keccak, std::make_pair(_start, _length)))
 		return *value;
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
-void DataFlowAnalyzer::handleAssignment(set<YulString> const& _variables, Expression* _value, bool _isDeclaration)
+void DataFlowAnalyzer::handleAssignment(std::set<YulString> const& _variables, Expression* _value, bool _isDeclaration)
 {
 	if (!_isDeclaration)
 		clearValues(_variables);
@@ -321,7 +320,7 @@ void DataFlowAnalyzer::popScope()
 	m_variableScopes.pop_back();
 }
 
-void DataFlowAnalyzer::clearValues(set<YulString> _variables)
+void DataFlowAnalyzer::clearValues(std::set<YulString> _variables)
 {
 	// All variables that reference variables to be cleared also have to be
 	// cleared, but not recursively, since only the value of the original
@@ -410,24 +409,24 @@ bool DataFlowAnalyzer::inScope(YulString _variableName) const
 	return false;
 }
 
-optional<u256> DataFlowAnalyzer::valueOfIdentifier(YulString const& _name) const
+std::optional<u256> DataFlowAnalyzer::valueOfIdentifier(YulString const& _name) const
 {
 	if (AssignedValue const* value = variableValue(_name))
-		if (Literal const* literal = get_if<Literal>(value->value))
+		if (Literal const* literal = std::get_if<Literal>(value->value))
 			return valueOfLiteral(*literal);
-	return nullopt;
+	return std::nullopt;
 }
 
-std::optional<pair<YulString, YulString>> DataFlowAnalyzer::isSimpleStore(
+std::optional<std::pair<YulString, YulString>> DataFlowAnalyzer::isSimpleStore(
 	StoreLoadLocation _location,
 	ExpressionStatement const& _statement
 ) const
 {
-	if (FunctionCall const* funCall = get_if<FunctionCall>(&_statement.expression))
+	if (FunctionCall const* funCall = std::get_if<FunctionCall>(&_statement.expression))
 		if (funCall->functionName.name == m_storeFunctionName[static_cast<unsigned>(_location)])
 			if (Identifier const* key = std::get_if<Identifier>(&funCall->arguments.front()))
 				if (Identifier const* value = std::get_if<Identifier>(&funCall->arguments.back()))
-					return make_pair(key->name, value->name);
+					return std::make_pair(key->name, value->name);
 	return {};
 }
 
@@ -436,21 +435,21 @@ std::optional<YulString> DataFlowAnalyzer::isSimpleLoad(
 	Expression const& _expression
 ) const
 {
-	if (FunctionCall const* funCall = get_if<FunctionCall>(&_expression))
+	if (FunctionCall const* funCall = std::get_if<FunctionCall>(&_expression))
 		if (funCall->functionName.name == m_loadFunctionName[static_cast<unsigned>(_location)])
 			if (Identifier const* key = std::get_if<Identifier>(&funCall->arguments.front()))
 				return key->name;
 	return {};
 }
 
-optional<pair<YulString, YulString>> DataFlowAnalyzer::isKeccak(Expression const& _expression) const
+std::optional<std::pair<YulString, YulString>> DataFlowAnalyzer::isKeccak(Expression const& _expression) const
 {
-	if (FunctionCall const* funCall = get_if<FunctionCall>(&_expression))
+	if (FunctionCall const* funCall = std::get_if<FunctionCall>(&_expression))
 		if (funCall->functionName.name == m_dialect.hashFunction({}))
 			if (Identifier const* start = std::get_if<Identifier>(&funCall->arguments.at(0)))
 				if (Identifier const* length = std::get_if<Identifier>(&funCall->arguments.at(1)))
-					return make_pair(start->name, length->name);
-	return nullopt;
+					return std::make_pair(start->name, length->name);
+	return std::nullopt;
 }
 
 void DataFlowAnalyzer::joinKnowledge(Environment const& _olderEnvironment)
diff --git a/libyul/optimiser/DeadCodeEliminator.cpp b/libyul/optimiser/DeadCodeEliminator.cpp
index af84546843..71682584a2 100644
--- a/libyul/optimiser/DeadCodeEliminator.cpp
+++ b/libyul/optimiser/DeadCodeEliminator.cpp
@@ -30,7 +30,6 @@
 #include <algorithm>
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::yul;
@@ -54,7 +53,7 @@ void DeadCodeEliminator::operator()(Block& _block)
 {
 	TerminationFinder::ControlFlow controlFlowChange;
 	size_t index;
-	tie(controlFlowChange, index) = TerminationFinder{m_dialect, &m_functionSideEffects}.firstUnconditionalControlFlowChange(_block.statements);
+	std::tie(controlFlowChange, index) = TerminationFinder{m_dialect, &m_functionSideEffects}.firstUnconditionalControlFlowChange(_block.statements);
 
 	// Erase everything after the terminating statement that is not a function definition.
 	if (controlFlowChange != TerminationFinder::ControlFlow::FlowOut && index != std::numeric_limits<size_t>::max())
@@ -62,7 +61,7 @@ void DeadCodeEliminator::operator()(Block& _block)
 			remove_if(
 				_block.statements.begin() + static_cast<ptrdiff_t>(index) + 1,
 				_block.statements.end(),
-				[] (Statement const& _s) { return !holds_alternative<yul::FunctionDefinition>(_s); }
+				[] (Statement const& _s) { return !std::holds_alternative<yul::FunctionDefinition>(_s); }
 			),
 			_block.statements.end()
 		);
diff --git a/libyul/optimiser/Disambiguator.cpp b/libyul/optimiser/Disambiguator.cpp
index 6fa4b55223..34e6bc7e6a 100644
--- a/libyul/optimiser/Disambiguator.cpp
+++ b/libyul/optimiser/Disambiguator.cpp
@@ -26,7 +26,6 @@
 #include <libyul/Exceptions.h>
 #include <libyul/Scope.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
diff --git a/libyul/optimiser/EqualStoreEliminator.cpp b/libyul/optimiser/EqualStoreEliminator.cpp
index 542d8d50b3..1e894608e9 100644
--- a/libyul/optimiser/EqualStoreEliminator.cpp
+++ b/libyul/optimiser/EqualStoreEliminator.cpp
@@ -28,7 +28,6 @@
 #include <libyul/AST.h>
 #include <libyul/Utilities.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::evmasm;
@@ -50,17 +49,17 @@ void EqualStoreEliminator::visit(Statement& _statement)
 {
 	// No need to consider potential changes through complex arguments since
 	// isSimpleStore only returns something if the arguments are identifiers.
-	if (ExpressionStatement const* expression = get_if<ExpressionStatement>(&_statement))
+	if (ExpressionStatement const* expression = std::get_if<ExpressionStatement>(&_statement))
 	{
 		if (auto vars = isSimpleStore(StoreLoadLocation::Storage, *expression))
 		{
-			if (optional<YulString> currentValue = storageValue(vars->first))
+			if (std::optional<YulString> currentValue = storageValue(vars->first))
 				if (*currentValue == vars->second)
 					m_pendingRemovals.insert(&_statement);
 		}
 		else if (auto vars = isSimpleStore(StoreLoadLocation::Memory, *expression))
 		{
-			if (optional<YulString> currentValue = memoryValue(vars->first))
+			if (std::optional<YulString> currentValue = memoryValue(vars->first))
 				if (*currentValue == vars->second)
 					m_pendingRemovals.insert(&_statement);
 		}
diff --git a/libyul/optimiser/EquivalentFunctionCombiner.cpp b/libyul/optimiser/EquivalentFunctionCombiner.cpp
index 90091f6ae6..10d15126e6 100644
--- a/libyul/optimiser/EquivalentFunctionCombiner.cpp
+++ b/libyul/optimiser/EquivalentFunctionCombiner.cpp
@@ -23,7 +23,6 @@
 #include <libyul/AST.h>
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
diff --git a/libyul/optimiser/EquivalentFunctionDetector.cpp b/libyul/optimiser/EquivalentFunctionDetector.cpp
index b25600c21c..de19887d86 100644
--- a/libyul/optimiser/EquivalentFunctionDetector.cpp
+++ b/libyul/optimiser/EquivalentFunctionDetector.cpp
@@ -25,7 +25,6 @@
 #include <libyul/AST.h>
 #include <libyul/optimiser/Metrics.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
diff --git a/libyul/optimiser/ExpressionInliner.cpp b/libyul/optimiser/ExpressionInliner.cpp
index ce0d1c7391..cacf5843d6 100644
--- a/libyul/optimiser/ExpressionInliner.cpp
+++ b/libyul/optimiser/ExpressionInliner.cpp
@@ -30,7 +30,6 @@
 
 #include <libyul/AST.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -50,14 +49,14 @@ void ExpressionInliner::operator()(FunctionDefinition& _fun)
 void ExpressionInliner::visit(Expression& _expression)
 {
 	ASTModifier::visit(_expression);
-	if (holds_alternative<FunctionCall>(_expression))
+	if (std::holds_alternative<FunctionCall>(_expression))
 	{
 		FunctionCall& funCall = std::get<FunctionCall>(_expression);
 		if (!m_inlinableFunctions.count(funCall.functionName.name))
 			return;
 		FunctionDefinition const& fun = *m_inlinableFunctions.at(funCall.functionName.name);
 
-		map<YulString, Expression const*> substitutions;
+		std::map<YulString, Expression const*> substitutions;
 		for (size_t i = 0; i < funCall.arguments.size(); i++)
 		{
 			Expression const& arg = funCall.arguments[i];
diff --git a/libyul/optimiser/ExpressionJoiner.cpp b/libyul/optimiser/ExpressionJoiner.cpp
index 645bb6c3ed..ee8d12b8b9 100644
--- a/libyul/optimiser/ExpressionJoiner.cpp
+++ b/libyul/optimiser/ExpressionJoiner.cpp
@@ -34,7 +34,6 @@
 
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -66,7 +65,7 @@ void ExpressionJoiner::operator()(Block& _block)
 
 void ExpressionJoiner::visit(Expression& _e)
 {
-	if (holds_alternative<Identifier>(_e))
+	if (std::holds_alternative<Identifier>(_e))
 	{
 		Identifier const& identifier = std::get<Identifier>(_e);
 		if (isLatestStatementVarDeclJoinable(identifier))
@@ -89,7 +88,7 @@ ExpressionJoiner::ExpressionJoiner(Block& _ast)
 	m_references = VariableReferencesCounter::countReferences(_ast);
 }
 
-void ExpressionJoiner::handleArguments(vector<Expression>& _arguments)
+void ExpressionJoiner::handleArguments(std::vector<Expression>& _arguments)
 {
 	// We have to fill from left to right, but we can only
 	// fill if everything to the right is just an identifier
@@ -101,7 +100,7 @@ void ExpressionJoiner::handleArguments(vector<Expression>& _arguments)
 	for (Expression const& arg: _arguments | ranges::views::reverse)
 	{
 		--i;
-		if (!holds_alternative<Identifier>(arg) && !holds_alternative<Literal>(arg))
+		if (!std::holds_alternative<Identifier>(arg) && !std::holds_alternative<Literal>(arg))
 			break;
 	}
 	// i points to the last element that is neither an identifier nor a literal,
@@ -124,7 +123,7 @@ void ExpressionJoiner::decrementLatestStatementPointer()
 void ExpressionJoiner::resetLatestStatementPointer()
 {
 	m_currentBlock = nullptr;
-	m_latestStatementInBlock = numeric_limits<size_t>::max();
+	m_latestStatementInBlock = std::numeric_limits<size_t>::max();
 }
 
 Statement* ExpressionJoiner::latestStatement()
@@ -138,7 +137,7 @@ Statement* ExpressionJoiner::latestStatement()
 bool ExpressionJoiner::isLatestStatementVarDeclJoinable(Identifier const& _identifier)
 {
 	Statement const* statement = latestStatement();
-	if (!statement || !holds_alternative<VariableDeclaration>(*statement))
+	if (!statement || !std::holds_alternative<VariableDeclaration>(*statement))
 		return false;
 	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(*statement);
 	if (varDecl.variables.size() != 1 || !varDecl.value)
diff --git a/libyul/optimiser/ExpressionSimplifier.cpp b/libyul/optimiser/ExpressionSimplifier.cpp
index 4a423fe465..c87c5df23f 100644
--- a/libyul/optimiser/ExpressionSimplifier.cpp
+++ b/libyul/optimiser/ExpressionSimplifier.cpp
@@ -29,7 +29,6 @@
 
 #include <libevmasm/SemanticInformation.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -49,8 +48,8 @@ void ExpressionSimplifier::visit(Expression& _expression)
 	))
 		_expression = match->action().toExpression(debugDataOf(_expression), evmVersionFromDialect(m_dialect));
 
-	if (auto* functionCall = get_if<FunctionCall>(&_expression))
-		if (optional<evmasm::Instruction> instruction = toEVMInstruction(m_dialect, functionCall->functionName.name))
+	if (auto* functionCall = std::get_if<FunctionCall>(&_expression))
+		if (std::optional<evmasm::Instruction> instruction = toEVMInstruction(m_dialect, functionCall->functionName.name))
 			for (auto op: evmasm::SemanticInformation::readWriteOperations(*instruction))
 				if (op.startParameter && op.lengthParameter)
 				{
@@ -59,7 +58,7 @@ void ExpressionSimplifier::visit(Expression& _expression)
 					if (
 						knownToBeZero(lengthArgument) &&
 						!knownToBeZero(startArgument) &&
-						!holds_alternative<FunctionCall>(startArgument)
+						!std::holds_alternative<FunctionCall>(startArgument)
 					)
 						startArgument = Literal{debugDataOf(startArgument), LiteralKind::Number, "0"_yulstring, {}};
 				}
@@ -67,9 +66,9 @@ void ExpressionSimplifier::visit(Expression& _expression)
 
 bool ExpressionSimplifier::knownToBeZero(Expression const& _expression) const
 {
-	if (auto const* literal = get_if<Literal>(&_expression))
+	if (auto const* literal = std::get_if<Literal>(&_expression))
 		return valueOfLiteral(*literal) == 0;
-	else if (auto const* identifier = get_if<Identifier>(&_expression))
+	else if (auto const* identifier = std::get_if<Identifier>(&_expression))
 		return valueOfIdentifier(identifier->name) == 0;
 	else
 		return false;
diff --git a/libyul/optimiser/ExpressionSplitter.cpp b/libyul/optimiser/ExpressionSplitter.cpp
index 713e0e8049..986bcb097f 100644
--- a/libyul/optimiser/ExpressionSplitter.cpp
+++ b/libyul/optimiser/ExpressionSplitter.cpp
@@ -30,7 +30,6 @@
 
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -75,11 +74,11 @@ void ExpressionSplitter::operator()(ForLoop& _loop)
 
 void ExpressionSplitter::operator()(Block& _block)
 {
-	vector<Statement> saved;
+	std::vector<Statement> saved;
 	swap(saved, m_statementsToPrefix);
 
-	function<std::optional<vector<Statement>>(Statement&)> f =
-			[&](Statement& _statement) -> std::optional<vector<Statement>> {
+	std::function<std::optional<std::vector<Statement>>(Statement&)> f =
+			[&](Statement& _statement) -> std::optional<std::vector<Statement>> {
 		m_statementsToPrefix.clear();
 		visit(_statement);
 		if (m_statementsToPrefix.empty())
@@ -94,18 +93,18 @@ void ExpressionSplitter::operator()(Block& _block)
 
 void ExpressionSplitter::outlineExpression(Expression& _expr)
 {
-	if (holds_alternative<Identifier>(_expr))
+	if (std::holds_alternative<Identifier>(_expr))
 		return;
 
 	visit(_expr);
 
-	shared_ptr<DebugData const> debugData = debugDataOf(_expr);
+	std::shared_ptr<DebugData const> debugData = debugDataOf(_expr);
 	YulString var = m_nameDispenser.newName({});
 	YulString type = m_typeInfo.typeOf(_expr);
 	m_statementsToPrefix.emplace_back(VariableDeclaration{
 		debugData,
 		{{TypedName{debugData, var, type}}},
-		make_unique<Expression>(std::move(_expr))
+		std::make_unique<Expression>(std::move(_expr))
 	});
 	_expr = Identifier{debugData, var};
 	m_typeInfo.setVariableType(var, type);
diff --git a/libyul/optimiser/ForLoopConditionIntoBody.cpp b/libyul/optimiser/ForLoopConditionIntoBody.cpp
index cf7c6814e4..2dd0832c42 100644
--- a/libyul/optimiser/ForLoopConditionIntoBody.cpp
+++ b/libyul/optimiser/ForLoopConditionIntoBody.cpp
@@ -22,7 +22,6 @@
 
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -35,17 +34,17 @@ void ForLoopConditionIntoBody::operator()(ForLoop& _forLoop)
 {
 	if (
 		m_dialect.booleanNegationFunction() &&
-		!holds_alternative<Literal>(*_forLoop.condition) &&
-		!holds_alternative<Identifier>(*_forLoop.condition)
+		!std::holds_alternative<Literal>(*_forLoop.condition) &&
+		!std::holds_alternative<Identifier>(*_forLoop.condition)
 	)
 	{
-		shared_ptr<DebugData const> debugData = debugDataOf(*_forLoop.condition);
+		std::shared_ptr<DebugData const> debugData = debugDataOf(*_forLoop.condition);
 
 		_forLoop.body.statements.emplace(
 			begin(_forLoop.body.statements),
 			If {
 				debugData,
-				make_unique<Expression>(
+				std::make_unique<Expression>(
 					FunctionCall {
 						debugData,
 						{debugData, m_dialect.booleanNegationFunction()->name},
@@ -55,7 +54,7 @@ void ForLoopConditionIntoBody::operator()(ForLoop& _forLoop)
 				Block {debugData, util::make_vector<Statement>(Break{{}})}
 			}
 		);
-		_forLoop.condition = make_unique<Expression>(
+		_forLoop.condition = std::make_unique<Expression>(
 			Literal {
 				debugData,
 				LiteralKind::Boolean,
diff --git a/libyul/optimiser/ForLoopConditionOutOfBody.cpp b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
index 98a37d9fc1..363ecdf0c0 100644
--- a/libyul/optimiser/ForLoopConditionOutOfBody.cpp
+++ b/libyul/optimiser/ForLoopConditionOutOfBody.cpp
@@ -23,7 +23,6 @@
 
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -38,32 +37,32 @@ void ForLoopConditionOutOfBody::operator()(ForLoop& _forLoop)
 
 	if (
 		!m_dialect.booleanNegationFunction() ||
-		!holds_alternative<Literal>(*_forLoop.condition) ||
+		!std::holds_alternative<Literal>(*_forLoop.condition) ||
 		valueOfLiteral(std::get<Literal>(*_forLoop.condition)) == u256(0) ||
 		_forLoop.body.statements.empty() ||
-		!holds_alternative<If>(_forLoop.body.statements.front())
+		!std::holds_alternative<If>(_forLoop.body.statements.front())
 	)
 		return;
 
 	If& firstStatement = std::get<If>(_forLoop.body.statements.front());
 	if (
 		firstStatement.body.statements.empty() ||
-		!holds_alternative<Break>(firstStatement.body.statements.front())
+		!std::holds_alternative<Break>(firstStatement.body.statements.front())
 	)
 		return;
 	if (!SideEffectsCollector(m_dialect, *firstStatement.condition).movable())
 		return;
 
 	YulString iszero = m_dialect.booleanNegationFunction()->name;
-	shared_ptr<DebugData const> debugData = debugDataOf(*firstStatement.condition);
+	std::shared_ptr<DebugData const> debugData = debugDataOf(*firstStatement.condition);
 
 	if (
-		holds_alternative<FunctionCall>(*firstStatement.condition) &&
+		std::holds_alternative<FunctionCall>(*firstStatement.condition) &&
 		std::get<FunctionCall>(*firstStatement.condition).functionName.name == iszero
 	)
-		_forLoop.condition = make_unique<Expression>(std::move(std::get<FunctionCall>(*firstStatement.condition).arguments.front()));
+		_forLoop.condition = std::make_unique<Expression>(std::move(std::get<FunctionCall>(*firstStatement.condition).arguments.front()));
 	else
-		_forLoop.condition = make_unique<Expression>(FunctionCall{
+		_forLoop.condition = std::make_unique<Expression>(FunctionCall{
 			debugData,
 			Identifier{debugData, iszero},
 			util::make_vector<Expression>(
diff --git a/libyul/optimiser/ForLoopInitRewriter.cpp b/libyul/optimiser/ForLoopInitRewriter.cpp
index 7cfa16b4f7..b0696f3b25 100644
--- a/libyul/optimiser/ForLoopInitRewriter.cpp
+++ b/libyul/optimiser/ForLoopInitRewriter.cpp
@@ -22,7 +22,6 @@
 
 #include <functional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -30,15 +29,15 @@ void ForLoopInitRewriter::operator()(Block& _block)
 {
 	util::iterateReplacing(
 		_block.statements,
-		[&](Statement& _stmt) -> std::optional<vector<Statement>>
+		[&](Statement& _stmt) -> std::optional<std::vector<Statement>>
 		{
-			if (holds_alternative<ForLoop>(_stmt))
+			if (std::holds_alternative<ForLoop>(_stmt))
 			{
 				auto& forLoop = std::get<ForLoop>(_stmt);
 				(*this)(forLoop.pre);
 				(*this)(forLoop.body);
 				(*this)(forLoop.post);
-				vector<Statement> rewrite;
+				std::vector<Statement> rewrite;
 				swap(rewrite, forLoop.pre.statements);
 				rewrite.emplace_back(std::move(forLoop));
 				return { std::move(rewrite) };
diff --git a/libyul/optimiser/FullInliner.cpp b/libyul/optimiser/FullInliner.cpp
index ebf82e763d..6e4d849719 100644
--- a/libyul/optimiser/FullInliner.cpp
+++ b/libyul/optimiser/FullInliner.cpp
@@ -41,7 +41,6 @@
 #include <range/v3/view/reverse.hpp>
 #include <range/v3/view/zip.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -63,15 +62,15 @@ FullInliner::FullInliner(Block& _ast, NameDispenser& _dispenser, Dialect const&
 	SSAValueTracker tracker;
 	tracker(m_ast);
 	for (auto const& ssaValue: tracker.values())
-		if (ssaValue.second && holds_alternative<Literal>(*ssaValue.second))
+		if (ssaValue.second && std::holds_alternative<Literal>(*ssaValue.second))
 			m_constants.emplace(ssaValue.first);
 
 	// Store size of global statements.
 	m_functionSizes[YulString{}] = CodeSize::codeSize(_ast);
-	map<YulString, size_t> references = ReferencesCounter::countReferences(m_ast);
+	std::map<YulString, size_t> references = ReferencesCounter::countReferences(m_ast);
 	for (auto& statement: m_ast.statements)
 	{
-		if (!holds_alternative<FunctionDefinition>(statement))
+		if (!std::holds_alternative<FunctionDefinition>(statement))
 			continue;
 		FunctionDefinition& fun = std::get<FunctionDefinition>(statement);
 		m_functions[fun.name] = &fun;
@@ -84,7 +83,7 @@ FullInliner::FullInliner(Block& _ast, NameDispenser& _dispenser, Dialect const&
 	}
 
 	// Check for memory guard.
-	vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
+	std::vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
 		_ast,
 		"memoryguard"_yulstring
 	);
@@ -105,10 +104,10 @@ void FullInliner::run(Pass _pass)
 	// function name) order.
 	// We use stable_sort below to keep the inlining order of two functions
 	// with the same depth.
-	map<YulString, size_t> depths = callDepths();
-	vector<FunctionDefinition*> functions;
+	std::map<YulString, size_t> depths = callDepths();
+	std::vector<FunctionDefinition*> functions;
 	for (auto& statement: m_ast.statements)
-		if (holds_alternative<FunctionDefinition>(statement))
+		if (std::holds_alternative<FunctionDefinition>(statement))
 			functions.emplace_back(&std::get<FunctionDefinition>(statement));
 	std::stable_sort(functions.begin(), functions.end(), [depths](
 		FunctionDefinition const* _a,
@@ -123,11 +122,11 @@ void FullInliner::run(Pass _pass)
 	}
 
 	for (auto& statement: m_ast.statements)
-		if (holds_alternative<Block>(statement))
+		if (std::holds_alternative<Block>(statement))
 			handleBlock({}, std::get<Block>(statement));
 }
 
-map<YulString, size_t> FullInliner::callDepths() const
+std::map<YulString, size_t> FullInliner::callDepths() const
 {
 	CallGraph cg = CallGraphGenerator::callGraph(m_ast);
 	cg.functionCalls.erase(""_yulstring);
@@ -140,12 +139,12 @@ map<YulString, size_t> FullInliner::callDepths() const
 			else
 				++it;
 
-	map<YulString, size_t> depths;
+	std::map<YulString, size_t> depths;
 	size_t currentDepth = 0;
 
 	while (true)
 	{
-		vector<YulString> removed;
+		std::vector<YulString> removed;
 		for (auto it = cg.functionCalls.begin(); it != cg.functionCalls.end();)
 		{
 			auto const& [fun, callees] = *it;
@@ -192,7 +191,7 @@ bool FullInliner::shallInline(FunctionCall const& _funCall, YulString _callSite)
 	// No inlining of calls where argument expressions may have side-effects.
 	// To avoid running into this, make sure that ExpressionSplitter runs before FullInliner.
 	for (auto const& argument: _funCall.arguments)
-		if (!holds_alternative<Literal>(argument) && !holds_alternative<Identifier>(argument))
+		if (!std::holds_alternative<Literal>(argument) && !std::holds_alternative<Identifier>(argument))
 			return false;
 
 	// Inline really, really tiny functions
@@ -226,8 +225,8 @@ bool FullInliner::shallInline(FunctionCall const& _funCall, YulString _callSite)
 	// Constant arguments might provide a means for further optimization, so they cause a bonus.
 	bool constantArg = false;
 	for (auto const& argument: _funCall.arguments)
-		if (holds_alternative<Literal>(argument) || (
-			holds_alternative<Identifier>(argument) &&
+		if (std::holds_alternative<Literal>(argument) || (
+			std::holds_alternative<Identifier>(argument) &&
 			m_constants.count(std::get<Identifier>(argument).name)
 		))
 		{
@@ -255,20 +254,20 @@ void FullInliner::handleBlock(YulString _currentFunctionName, Block& _block)
 
 bool FullInliner::recursive(FunctionDefinition const& _fun) const
 {
-	map<YulString, size_t> references = ReferencesCounter::countReferences(_fun);
+	std::map<YulString, size_t> references = ReferencesCounter::countReferences(_fun);
 	return references[_fun.name] > 0;
 }
 
 void InlineModifier::operator()(Block& _block)
 {
-	function<std::optional<vector<Statement>>(Statement&)> f = [&](Statement& _statement) -> std::optional<vector<Statement>> {
+	std::function<std::optional<std::vector<Statement>>(Statement&)> f = [&](Statement& _statement) -> std::optional<std::vector<Statement>> {
 		visit(_statement);
 		return tryInlineStatement(_statement);
 	};
 	util::iterateReplacing(_block.statements, f);
 }
 
-std::optional<vector<Statement>> InlineModifier::tryInlineStatement(Statement& _statement)
+std::optional<std::vector<Statement>> InlineModifier::tryInlineStatement(Statement& _statement)
 {
 	// Only inline for expression statements, assignments and variable declarations.
 	Expression* e = std::visit(util::GenericVisitor{
@@ -290,10 +289,10 @@ std::optional<vector<Statement>> InlineModifier::tryInlineStatement(Statement& _
 	return {};
 }
 
-vector<Statement> InlineModifier::performInline(Statement& _statement, FunctionCall& _funCall)
+std::vector<Statement> InlineModifier::performInline(Statement& _statement, FunctionCall& _funCall)
 {
-	vector<Statement> newStatements;
-	map<YulString, YulString> variableReplacements;
+	std::vector<Statement> newStatements;
+	std::map<YulString, YulString> variableReplacements;
 
 	FunctionDefinition* function = m_driver.function(_funCall.functionName.name);
 	assertThrow(!!function, OptimizerException, "Attempt to inline invalid function.");
@@ -307,9 +306,9 @@ vector<Statement> InlineModifier::performInline(Statement& _statement, FunctionC
 		variableReplacements[_existingVariable.name] = newName;
 		VariableDeclaration varDecl{_funCall.debugData, {{_funCall.debugData, newName, _existingVariable.type}}, {}};
 		if (_value)
-			varDecl.value = make_unique<Expression>(std::move(*_value));
+			varDecl.value = std::make_unique<Expression>(std::move(*_value));
 		else
-			varDecl.value = make_unique<Expression>(m_dialect.zeroLiteralForType(varDecl.variables.front().type));
+			varDecl.value = std::make_unique<Expression>(m_dialect.zeroLiteralForType(varDecl.variables.front().type));
 		newStatements.emplace_back(std::move(varDecl));
 	};
 
@@ -329,7 +328,7 @@ vector<Statement> InlineModifier::performInline(Statement& _statement, FunctionC
 				newStatements.emplace_back(Assignment{
 					_assignment.debugData,
 					{_assignment.variableNames[i]},
-					make_unique<Expression>(Identifier{
+					std::make_unique<Expression>(Identifier{
 						_assignment.debugData,
 						variableReplacements.at(function->returnVariables[i].name)
 					})
@@ -341,7 +340,7 @@ vector<Statement> InlineModifier::performInline(Statement& _statement, FunctionC
 				newStatements.emplace_back(VariableDeclaration{
 					_varDecl.debugData,
 					{std::move(_varDecl.variables[i])},
-					make_unique<Expression>(Identifier{
+					std::make_unique<Expression>(Identifier{
 						_varDecl.debugData,
 						variableReplacements.at(function->returnVariables[i].name)
 					})
diff --git a/libyul/optimiser/FunctionCallFinder.cpp b/libyul/optimiser/FunctionCallFinder.cpp
index b8f2064404..9d94dc5f9c 100644
--- a/libyul/optimiser/FunctionCallFinder.cpp
+++ b/libyul/optimiser/FunctionCallFinder.cpp
@@ -18,11 +18,10 @@
 #include <libyul/optimiser/FunctionCallFinder.h>
 #include <libyul/AST.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
-vector<FunctionCall*> FunctionCallFinder::run(Block& _block, YulString _functionName)
+std::vector<FunctionCall*> FunctionCallFinder::run(Block& _block, YulString _functionName)
 {
 	FunctionCallFinder functionCallFinder(_functionName);
 	functionCallFinder(_block);
diff --git a/libyul/optimiser/FunctionGrouper.cpp b/libyul/optimiser/FunctionGrouper.cpp
index 41fb755543..5f649d1891 100644
--- a/libyul/optimiser/FunctionGrouper.cpp
+++ b/libyul/optimiser/FunctionGrouper.cpp
@@ -24,7 +24,6 @@
 
 #include <libyul/AST.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -34,12 +33,12 @@ void FunctionGrouper::operator()(Block& _block)
 	if (alreadyGrouped(_block))
 		return;
 
-	vector<Statement> reordered;
+	std::vector<Statement> reordered;
 	reordered.emplace_back(Block{_block.debugData, {}});
 
 	for (auto&& statement: _block.statements)
 	{
-		if (holds_alternative<FunctionDefinition>(statement))
+		if (std::holds_alternative<FunctionDefinition>(statement))
 			reordered.emplace_back(std::move(statement));
 		else
 			std::get<Block>(reordered.front()).statements.emplace_back(std::move(statement));
@@ -51,10 +50,10 @@ bool FunctionGrouper::alreadyGrouped(Block const& _block)
 {
 	if (_block.statements.empty())
 		return false;
-	if (!holds_alternative<Block>(_block.statements.front()))
+	if (!std::holds_alternative<Block>(_block.statements.front()))
 		return false;
 	for (size_t i = 1; i < _block.statements.size(); ++i)
-		if (!holds_alternative<FunctionDefinition>(_block.statements.at(i)))
+		if (!std::holds_alternative<FunctionDefinition>(_block.statements.at(i)))
 			return false;
 	return true;
 }
diff --git a/libyul/optimiser/FunctionHoister.cpp b/libyul/optimiser/FunctionHoister.cpp
index 5d5cf7d12d..32df3b121a 100644
--- a/libyul/optimiser/FunctionHoister.cpp
+++ b/libyul/optimiser/FunctionHoister.cpp
@@ -27,7 +27,6 @@
 
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -38,7 +37,7 @@ void FunctionHoister::operator()(Block& _block)
 	for (auto&& statement: _block.statements)
 	{
 		std::visit(*this, statement);
-		if (holds_alternative<FunctionDefinition>(statement))
+		if (std::holds_alternative<FunctionDefinition>(statement))
 		{
 			m_functions.emplace_back(std::move(statement));
 			statement = Block{_block.debugData, {}};
diff --git a/libyul/optimiser/FunctionSpecializer.cpp b/libyul/optimiser/FunctionSpecializer.cpp
index 4555e2f8fc..7e6d486327 100644
--- a/libyul/optimiser/FunctionSpecializer.cpp
+++ b/libyul/optimiser/FunctionSpecializer.cpp
@@ -32,7 +32,6 @@
 
 #include <variant>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::yul;
 
@@ -40,11 +39,11 @@ FunctionSpecializer::LiteralArguments FunctionSpecializer::specializableArgument
 	FunctionCall const& _f
 )
 {
-	auto heuristic = [&](Expression const& _e) -> optional<Expression>
+	auto heuristic = [&](Expression const& _e) -> std::optional<Expression>
 	{
-		if (holds_alternative<Literal>(_e))
+		if (std::holds_alternative<Literal>(_e))
 			return ASTCopier{}.translate(_e);
-		return nullopt;
+		return std::nullopt;
 	};
 
 	return applyMap(_f.arguments, heuristic);
@@ -68,7 +67,7 @@ void FunctionSpecializer::operator()(FunctionCall& _f)
 		YulString oldName = std::move(_f.functionName.name);
 		auto newName = m_nameDispenser.newName(oldName);
 
-		m_oldToNewMap[oldName].emplace_back(make_pair(newName, arguments));
+		m_oldToNewMap[oldName].emplace_back(std::make_pair(newName, arguments));
 
 		_f.functionName.name = newName;
 		_f.arguments = util::filter(
@@ -86,27 +85,27 @@ FunctionDefinition FunctionSpecializer::specialize(
 {
 	yulAssert(_arguments.size() == _f.parameters.size(), "");
 
-	map<YulString, YulString> translatedNames = applyMap(
+	std::map<YulString, YulString> translatedNames = applyMap(
 		NameCollector{_f, NameCollector::OnlyVariables}.names(),
-		[&](auto& _name) -> pair<YulString, YulString>
+		[&](auto& _name) -> std::pair<YulString, YulString>
 		{
-			return make_pair(_name, m_nameDispenser.newName(_name));
+			return std::make_pair(_name, m_nameDispenser.newName(_name));
 		},
-		map<YulString, YulString>{}
+		std::map<YulString, YulString>{}
 	);
 
-	FunctionDefinition newFunction = get<FunctionDefinition>(FunctionCopier{translatedNames}(_f));
+	FunctionDefinition newFunction = std::get<FunctionDefinition>(FunctionCopier{translatedNames}(_f));
 
 	// Function parameters that will be specialized inside the body are converted into variable
 	// declarations.
-	vector<Statement> missingVariableDeclarations;
+	std::vector<Statement> missingVariableDeclarations;
 	for (auto&& [index, argument]: _arguments | ranges::views::enumerate)
 		if (argument)
 			missingVariableDeclarations.emplace_back(
 				VariableDeclaration{
 					_f.debugData,
-					vector<TypedName>{newFunction.parameters[index]},
-					make_unique<Expression>(std::move(*argument))
+					std::vector<TypedName>{newFunction.parameters[index]},
+					std::make_unique<Expression>(std::move(*argument))
 				}
 			);
 
@@ -134,15 +133,15 @@ void FunctionSpecializer::run(OptimiserStepContext& _context, Block& _ast)
 	};
 	f(_ast);
 
-	iterateReplacing(_ast.statements, [&](Statement& _s) -> optional<vector<Statement>>
+	iterateReplacing(_ast.statements, [&](Statement& _s) -> std::optional<std::vector<Statement>>
 	{
-		if (holds_alternative<FunctionDefinition>(_s))
+		if (std::holds_alternative<FunctionDefinition>(_s))
 		{
-			auto& functionDefinition = get<FunctionDefinition>(_s);
+			auto& functionDefinition = std::get<FunctionDefinition>(_s);
 
 			if (f.m_oldToNewMap.count(functionDefinition.name))
 			{
-				vector<Statement> out = applyMap(
+				std::vector<Statement> out = applyMap(
 					f.m_oldToNewMap.at(functionDefinition.name),
 					[&](auto& _p) -> Statement
 					{
@@ -153,6 +152,6 @@ void FunctionSpecializer::run(OptimiserStepContext& _context, Block& _ast)
 			}
 		}
 
-		return nullopt;
+		return std::nullopt;
 	});
 }
diff --git a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
index 8c9b80265a..0bb4d368d8 100644
--- a/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
+++ b/libyul/optimiser/InlinableExpressionFunctionFinder.cpp
@@ -24,7 +24,6 @@
 #include <libyul/optimiser/OptimizerUtilities.h>
 #include <libyul/AST.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -46,7 +45,7 @@ void InlinableExpressionFunctionFinder::operator()(FunctionDefinition const& _fu
 	{
 		YulString retVariable = _function.returnVariables.front().name;
 		Statement const& bodyStatement = _function.body.statements.front();
-		if (holds_alternative<Assignment>(bodyStatement))
+		if (std::holds_alternative<Assignment>(bodyStatement))
 		{
 			Assignment const& assignment = std::get<Assignment>(bodyStatement);
 			if (assignment.variableNames.size() == 1 && assignment.variableNames.front().name == retVariable)
@@ -57,7 +56,7 @@ void InlinableExpressionFunctionFinder::operator()(FunctionDefinition const& _fu
 				// would not be valid here if we were searching inside a functionally inlinable
 				// function body.
 				assertThrow(m_disallowedIdentifiers.empty() && !m_foundDisallowedIdentifier, OptimizerException, "");
-				m_disallowedIdentifiers = set<YulString>{retVariable, _function.name};
+				m_disallowedIdentifiers = std::set<YulString>{retVariable, _function.name};
 				std::visit(*this, *assignment.value);
 				if (!m_foundDisallowedIdentifier)
 					m_inlinableFunctions[_function.name] = &_function;
diff --git a/libyul/optimiser/KnowledgeBase.cpp b/libyul/optimiser/KnowledgeBase.cpp
index e01090146d..c280ecf14e 100644
--- a/libyul/optimiser/KnowledgeBase.cpp
+++ b/libyul/optimiser/KnowledgeBase.cpp
@@ -29,36 +29,35 @@
 
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
-KnowledgeBase::KnowledgeBase(map<YulString, AssignedValue> const& _ssaValues):
+KnowledgeBase::KnowledgeBase(std::map<YulString, AssignedValue> const& _ssaValues):
 	m_valuesAreSSA(true),
 	m_variableValues([_ssaValues](YulString _var) { return util::valueOrNullptr(_ssaValues, _var); })
 {}
 
 bool KnowledgeBase::knownToBeDifferent(YulString _a, YulString _b)
 {
-	if (optional<u256> difference = differenceIfKnownConstant(_a, _b))
+	if (std::optional<u256> difference = differenceIfKnownConstant(_a, _b))
 		return difference != 0;
 	return false;
 }
 
-optional<u256> KnowledgeBase::differenceIfKnownConstant(YulString _a, YulString _b)
+std::optional<u256> KnowledgeBase::differenceIfKnownConstant(YulString _a, YulString _b)
 {
 	VariableOffset offA = explore(_a);
 	VariableOffset offB = explore(_b);
 	if (offA.reference == offB.reference)
 		return offA.offset - offB.offset;
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
 
 bool KnowledgeBase::knownToBeDifferentByAtLeast32(YulString _a, YulString _b)
 {
-	if (optional<u256> difference = differenceIfKnownConstant(_a, _b))
+	if (std::optional<u256> difference = differenceIfKnownConstant(_a, _b))
 		return difference >= 32 && difference <= u256(0) - 32;
 
 	return false;
@@ -69,19 +68,19 @@ bool KnowledgeBase::knownToBeZero(YulString _a)
 	return valueIfKnownConstant(_a) == 0;
 }
 
-optional<u256> KnowledgeBase::valueIfKnownConstant(YulString _a)
+std::optional<u256> KnowledgeBase::valueIfKnownConstant(YulString _a)
 {
 	return explore(_a).absoluteValue();
 }
 
-optional<u256> KnowledgeBase::valueIfKnownConstant(Expression const& _expression)
+std::optional<u256> KnowledgeBase::valueIfKnownConstant(Expression const& _expression)
 {
-	if (Identifier const* ident = get_if<Identifier>(&_expression))
+	if (Identifier const* ident = std::get_if<Identifier>(&_expression))
 		return valueIfKnownConstant(ident->name);
-	else if (Literal const* lit = get_if<Literal>(&_expression))
+	else if (Literal const* lit = std::get_if<Literal>(&_expression))
 		return valueOfLiteral(*lit);
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
 KnowledgeBase::VariableOffset KnowledgeBase::explore(YulString _var)
@@ -105,24 +104,24 @@ KnowledgeBase::VariableOffset KnowledgeBase::explore(YulString _var)
 	}
 
 	if (value)
-		if (optional<VariableOffset> offset = explore(*value))
+		if (std::optional<VariableOffset> offset = explore(*value))
 			return setOffset(_var, *offset);
 	return setOffset(_var, VariableOffset{_var, 0});
 
 }
 
-optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const& _value)
+std::optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const& _value)
 {
-	if (Literal const* literal = get_if<Literal>(&_value))
+	if (Literal const* literal = std::get_if<Literal>(&_value))
 		return VariableOffset{YulString{}, valueOfLiteral(*literal)};
-	else if (Identifier const* identifier = get_if<Identifier>(&_value))
+	else if (Identifier const* identifier = std::get_if<Identifier>(&_value))
 		return explore(identifier->name);
-	else if (FunctionCall const* f = get_if<FunctionCall>(&_value))
+	else if (FunctionCall const* f = std::get_if<FunctionCall>(&_value))
 	{
 		if (f->functionName.name == "add"_yulstring)
 		{
-			if (optional<VariableOffset> a = explore(f->arguments[0]))
-				if (optional<VariableOffset> b = explore(f->arguments[1]))
+			if (std::optional<VariableOffset> a = explore(f->arguments[0]))
+				if (std::optional<VariableOffset> b = explore(f->arguments[1]))
 				{
 					u256 offset = a->offset + b->offset;
 					if (a->isAbsolute())
@@ -134,8 +133,8 @@ optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const&
 				}
 		}
 		else if (f->functionName.name == "sub"_yulstring)
-			if (optional<VariableOffset> a = explore(f->arguments[0]))
-				if (optional<VariableOffset> b = explore(f->arguments[1]))
+			if (std::optional<VariableOffset> a = explore(f->arguments[0]))
+				if (std::optional<VariableOffset> b = explore(f->arguments[1]))
 				{
 					u256 offset = a->offset - b->offset;
 					if (a->reference == b->reference)
@@ -146,7 +145,7 @@ optional<KnowledgeBase::VariableOffset> KnowledgeBase::explore(Expression const&
 				}
 	}
 
-	return nullopt;
+	return std::nullopt;
 }
 
 Expression const* KnowledgeBase::valueOf(YulString _var)
@@ -175,7 +174,7 @@ void KnowledgeBase::reset(YulString _var)
 			m_groupMembers[offset->reference].erase(_var);
 		m_offsets.erase(_var);
 	}
-	if (set<YulString>* group = util::valueOrNullptr(m_groupMembers, _var))
+	if (std::set<YulString>* group = util::valueOrNullptr(m_groupMembers, _var))
 	{
 		// _var was a representative, we might have to find a new one.
 		if (!group->empty())
diff --git a/libyul/optimiser/LoadResolver.cpp b/libyul/optimiser/LoadResolver.cpp
index ce0ce730e7..84094c33e0 100644
--- a/libyul/optimiser/LoadResolver.cpp
+++ b/libyul/optimiser/LoadResolver.cpp
@@ -36,7 +36,6 @@
 
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::evmasm;
@@ -65,8 +64,8 @@ void LoadResolver::visit(Expression& _e)
 			tryResolve(_e, StoreLoadLocation::Storage, funCall->arguments);
 		else if (!m_containsMSize && funCall->functionName.name == m_dialect.hashFunction({}))
 		{
-			Identifier const* start = get_if<Identifier>(&funCall->arguments.at(0));
-			Identifier const* length = get_if<Identifier>(&funCall->arguments.at(1));
+			Identifier const* start = std::get_if<Identifier>(&funCall->arguments.at(0));
+			Identifier const* length = std::get_if<Identifier>(&funCall->arguments.at(1));
 			if (start && length)
 				if (auto const& value = keccakValue(start->name, length->name))
 					if (inScope(*value))
@@ -82,10 +81,10 @@ void LoadResolver::visit(Expression& _e)
 void LoadResolver::tryResolve(
 	Expression& _e,
 	StoreLoadLocation _location,
-	vector<Expression> const& _arguments
+	std::vector<Expression> const& _arguments
 )
 {
-	if (_arguments.empty() || !holds_alternative<Identifier>(_arguments.at(0)))
+	if (_arguments.empty() || !std::holds_alternative<Identifier>(_arguments.at(0)))
 		return;
 
 	YulString key = std::get<Identifier>(_arguments.at(0)).name;
@@ -126,7 +125,7 @@ void LoadResolver::tryEvaluateKeccak(
 			{},
 			LiteralKind::Number,
 			// a dummy 256-bit number to represent the Keccak256 hash.
-			YulString{numeric_limits<u256>::max().str()},
+			YulString{std::numeric_limits<u256>::max().str()},
 			{}
 		}
 	);
@@ -138,11 +137,11 @@ void LoadResolver::tryEvaluateKeccak(
 	if (costOfLiteral > costOfKeccak)
 		return;
 
-	optional<YulString> value = memoryValue(memoryKey->name);
+	std::optional<YulString> value = memoryValue(memoryKey->name);
 	if (value && inScope(*value))
 	{
-		optional<u256> memoryContent = valueOfIdentifier(*value);
-		optional<u256> byteLength = valueOfIdentifier(length->name);
+		std::optional<u256> memoryContent = valueOfIdentifier(*value);
+		std::optional<u256> byteLength = valueOfIdentifier(length->name);
 		if (memoryContent && byteLength && *byteLength <= 32)
 		{
 			bytes contentAsBytes = toBigEndian(*memoryContent);
diff --git a/libyul/optimiser/LoopInvariantCodeMotion.cpp b/libyul/optimiser/LoopInvariantCodeMotion.cpp
index 87454dc96d..da3c5e3e0a 100644
--- a/libyul/optimiser/LoopInvariantCodeMotion.cpp
+++ b/libyul/optimiser/LoopInvariantCodeMotion.cpp
@@ -27,16 +27,15 @@
 
 #include <utility>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
 void LoopInvariantCodeMotion::run(OptimiserStepContext& _context, Block& _ast)
 {
-	map<YulString, SideEffects> functionSideEffects =
+	std::map<YulString, SideEffects> functionSideEffects =
 		SideEffectsPropagator::sideEffects(_context.dialect, CallGraphGenerator::callGraph(_ast));
 	bool containsMSize = MSizeFinder::containsMSize(_context.dialect, _ast);
-	set<YulString> ssaVars = SSAValueTracker::ssaVariables(_ast);
+	std::set<YulString> ssaVars = SSAValueTracker::ssaVariables(_ast);
 	LoopInvariantCodeMotion{_context.dialect, ssaVars, functionSideEffects, containsMSize}(_ast);
 }
 
@@ -44,11 +43,11 @@ void LoopInvariantCodeMotion::operator()(Block& _block)
 {
 	util::iterateReplacing(
 		_block.statements,
-		[&](Statement& _s) -> optional<vector<Statement>>
+		[&](Statement& _s) -> std::optional<std::vector<Statement>>
 		{
 			visit(_s);
-			if (holds_alternative<ForLoop>(_s))
-				return rewriteLoop(get<ForLoop>(_s));
+			if (std::holds_alternative<ForLoop>(_s))
+				return rewriteLoop(std::get<ForLoop>(_s));
 			else
 				return {};
 		}
@@ -57,7 +56,7 @@ void LoopInvariantCodeMotion::operator()(Block& _block)
 
 bool LoopInvariantCodeMotion::canBePromoted(
 	VariableDeclaration const& _varDecl,
-	set<YulString> const& _varsDefinedInCurrentScope,
+	std::set<YulString> const& _varsDefinedInCurrentScope,
 	SideEffects const& _forLoopSideEffects
 ) const
 {
@@ -81,29 +80,29 @@ bool LoopInvariantCodeMotion::canBePromoted(
 	return true;
 }
 
-optional<vector<Statement>> LoopInvariantCodeMotion::rewriteLoop(ForLoop& _for)
+std::optional<std::vector<Statement>> LoopInvariantCodeMotion::rewriteLoop(ForLoop& _for)
 {
 	assertThrow(_for.pre.statements.empty(), OptimizerException, "");
 
 	auto forLoopSideEffects =
 		SideEffectsCollector{m_dialect, _for, &m_functionSideEffects}.sideEffects();
 
-	vector<Statement> replacement;
+	std::vector<Statement> replacement;
 	for (Block* block: {&_for.post, &_for.body})
 	{
-		set<YulString> varsDefinedInScope;
+		std::set<YulString> varsDefinedInScope;
 		util::iterateReplacing(
 			block->statements,
-			[&](Statement& _s) -> optional<vector<Statement>>
+			[&](Statement& _s) -> std::optional<std::vector<Statement>>
 			{
-				if (holds_alternative<VariableDeclaration>(_s))
+				if (std::holds_alternative<VariableDeclaration>(_s))
 				{
 					VariableDeclaration const& varDecl = std::get<VariableDeclaration>(_s);
 					if (canBePromoted(varDecl, varsDefinedInScope, forLoopSideEffects))
 					{
 						replacement.emplace_back(std::move(_s));
 						// Do not add the variables declared here to varsDefinedInScope because we are moving them.
-						return vector<Statement>{};
+						return std::vector<Statement>{};
 					}
 					for (auto const& var: varDecl.variables)
 						varsDefinedInScope.insert(var.name);
diff --git a/libyul/optimiser/Metrics.cpp b/libyul/optimiser/Metrics.cpp
index a48cbf91b1..42845f3b66 100644
--- a/libyul/optimiser/Metrics.cpp
+++ b/libyul/optimiser/Metrics.cpp
@@ -30,34 +30,33 @@
 
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
 
 size_t CodeWeights::costOf(Statement const& _statement) const
 {
-	if (holds_alternative<ExpressionStatement>(_statement))
+	if (std::holds_alternative<ExpressionStatement>(_statement))
 		return expressionStatementCost;
-	else if (holds_alternative<Assignment>(_statement))
+	else if (std::holds_alternative<Assignment>(_statement))
 		return assignmentCost;
-	else if (holds_alternative<VariableDeclaration>(_statement))
+	else if (std::holds_alternative<VariableDeclaration>(_statement))
 		return variableDeclarationCost;
-	else if (holds_alternative<FunctionDefinition>(_statement))
+	else if (std::holds_alternative<FunctionDefinition>(_statement))
 		return functionDefinitionCost;
-	else if (holds_alternative<If>(_statement))
+	else if (std::holds_alternative<If>(_statement))
 		return ifCost;
-	else if (holds_alternative<Switch>(_statement))
+	else if (std::holds_alternative<Switch>(_statement))
 		return switchCost + caseCost * std::get<Switch>(_statement).cases.size();
-	else if (holds_alternative<ForLoop>(_statement))
+	else if (std::holds_alternative<ForLoop>(_statement))
 		return forLoopCost;
-	else if (holds_alternative<Break>(_statement))
+	else if (std::holds_alternative<Break>(_statement))
 		return breakCost;
-	else if (holds_alternative<Continue>(_statement))
+	else if (std::holds_alternative<Continue>(_statement))
 		return continueCost;
-	else if (holds_alternative<Leave>(_statement))
+	else if (std::holds_alternative<Leave>(_statement))
 		return leaveCost;
-	else if (holds_alternative<Block>(_statement))
+	else if (std::holds_alternative<Block>(_statement))
 		return blockCost;
 	else
 		yulAssert(false, "If you add a new statement type, you must update CodeWeights.");
@@ -65,11 +64,11 @@ size_t CodeWeights::costOf(Statement const& _statement) const
 
 size_t CodeWeights::costOf(Expression const& _expression) const
 {
-	if (holds_alternative<FunctionCall>(_expression))
+	if (std::holds_alternative<FunctionCall>(_expression))
 		return functionCallCost;
-	else if (holds_alternative<Identifier>(_expression))
+	else if (std::holds_alternative<Identifier>(_expression))
 		return identifierCost;
-	else if (Literal const* literal = get_if<Literal>(&_expression))
+	else if (Literal const* literal = std::get_if<Literal>(&_expression))
 	{
 		// Avoid strings because they could be longer than 32 bytes.
 		if (literal->kind != LiteralKind::String && valueOfLiteral(*literal) == 0)
@@ -112,7 +111,7 @@ size_t CodeSize::codeSizeIncludingFunctions(Block const& _block, CodeWeights con
 
 void CodeSize::visit(Statement const& _statement)
 {
-	if (holds_alternative<FunctionDefinition>(_statement) && m_ignoreFunctions)
+	if (std::holds_alternative<FunctionDefinition>(_statement) && m_ignoreFunctions)
 		return;
 
 	m_size += m_weights.costOf(_statement);
diff --git a/libyul/optimiser/NameCollector.cpp b/libyul/optimiser/NameCollector.cpp
index 2664b8f6dd..7fb0c7ed28 100644
--- a/libyul/optimiser/NameCollector.cpp
+++ b/libyul/optimiser/NameCollector.cpp
@@ -23,7 +23,6 @@
 
 #include <libyul/AST.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -60,21 +59,21 @@ void ReferencesCounter::operator()(FunctionCall const& _funCall)
 	ASTWalker::operator()(_funCall);
 }
 
-map<YulString, size_t> ReferencesCounter::countReferences(Block const& _block)
+std::map<YulString, size_t> ReferencesCounter::countReferences(Block const& _block)
 {
 	ReferencesCounter counter;
 	counter(_block);
 	return std::move(counter.m_references);
 }
 
-map<YulString, size_t> ReferencesCounter::countReferences(FunctionDefinition const& _function)
+std::map<YulString, size_t> ReferencesCounter::countReferences(FunctionDefinition const& _function)
 {
 	ReferencesCounter counter;
 	counter(_function);
 	return std::move(counter.m_references);
 }
 
-map<YulString, size_t> ReferencesCounter::countReferences(Expression const& _expression)
+std::map<YulString, size_t> ReferencesCounter::countReferences(Expression const& _expression)
 {
 	ReferencesCounter counter;
 	counter.visit(_expression);
@@ -86,28 +85,28 @@ void VariableReferencesCounter::operator()(Identifier const& _identifier)
 	++m_references[_identifier.name];
 }
 
-map<YulString, size_t> VariableReferencesCounter::countReferences(Block const& _block)
+std::map<YulString, size_t> VariableReferencesCounter::countReferences(Block const& _block)
 {
 	VariableReferencesCounter counter;
 	counter(_block);
 	return std::move(counter.m_references);
 }
 
-map<YulString, size_t> VariableReferencesCounter::countReferences(FunctionDefinition const& _function)
+std::map<YulString, size_t> VariableReferencesCounter::countReferences(FunctionDefinition const& _function)
 {
 	VariableReferencesCounter counter;
 	counter(_function);
 	return std::move(counter.m_references);
 }
 
-map<YulString, size_t> VariableReferencesCounter::countReferences(Expression const& _expression)
+std::map<YulString, size_t> VariableReferencesCounter::countReferences(Expression const& _expression)
 {
 	VariableReferencesCounter counter;
 	counter.visit(_expression);
 	return std::move(counter.m_references);
 }
 
-map<YulString, size_t> VariableReferencesCounter::countReferences(Statement const& _statement)
+std::map<YulString, size_t> VariableReferencesCounter::countReferences(Statement const& _statement)
 {
 	VariableReferencesCounter counter;
 	counter.visit(_statement);
@@ -149,7 +148,7 @@ std::set<YulString> solidity::yul::assignedVariableNames(Block const& _code)
 	return names;
 }
 
-map<YulString, FunctionDefinition const*> solidity::yul::allFunctionDefinitions(Block const& _block)
+std::map<YulString, FunctionDefinition const*> solidity::yul::allFunctionDefinitions(Block const& _block)
 {
 	std::map<YulString, FunctionDefinition const*> result;
 	forEach<FunctionDefinition const>(_block, [&](FunctionDefinition const& _function) {
diff --git a/libyul/optimiser/NameDispenser.cpp b/libyul/optimiser/NameDispenser.cpp
index d43b6802fe..3a8db5ee44 100644
--- a/libyul/optimiser/NameDispenser.cpp
+++ b/libyul/optimiser/NameDispenser.cpp
@@ -29,18 +29,17 @@
 
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
 
-NameDispenser::NameDispenser(Dialect const& _dialect, Block const& _ast, set<YulString> _reservedNames):
+NameDispenser::NameDispenser(Dialect const& _dialect, Block const& _ast, std::set<YulString> _reservedNames):
 	NameDispenser(_dialect, NameCollector(_ast).names() + _reservedNames)
 {
 	m_reservedNames = std::move(_reservedNames);
 }
 
-NameDispenser::NameDispenser(Dialect const& _dialect, set<YulString> _usedNames):
+NameDispenser::NameDispenser(Dialect const& _dialect, std::set<YulString> _usedNames):
 	m_dialect(_dialect),
 	m_usedNames(std::move(_usedNames))
 {
@@ -52,7 +51,7 @@ YulString NameDispenser::newName(YulString _nameHint)
 	while (illegalName(name))
 	{
 		m_counter++;
-		name = YulString(_nameHint.str() + "_" + to_string(m_counter));
+		name = YulString(_nameHint.str() + "_" + std::to_string(m_counter));
 	}
 	m_usedNames.emplace(name);
 	return name;
diff --git a/libyul/optimiser/NameDisplacer.cpp b/libyul/optimiser/NameDisplacer.cpp
index 4d1a61a8ef..4d0d217d86 100644
--- a/libyul/optimiser/NameDisplacer.cpp
+++ b/libyul/optimiser/NameDisplacer.cpp
@@ -23,7 +23,6 @@
 
 #include <libyul/AST.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -64,7 +63,7 @@ void NameDisplacer::operator()(Block& _block)
 	// First replace all the names of function definitions
 	// because of scoping.
 	for (auto& st: _block.statements)
-		if (holds_alternative<FunctionDefinition>(st))
+		if (std::holds_alternative<FunctionDefinition>(st))
 			checkAndReplaceNew(std::get<FunctionDefinition>(st).name);
 
 	ASTModifier::operator()(_block);
diff --git a/libyul/optimiser/NameSimplifier.cpp b/libyul/optimiser/NameSimplifier.cpp
index 0eb568beb2..f7d7325477 100644
--- a/libyul/optimiser/NameSimplifier.cpp
+++ b/libyul/optimiser/NameSimplifier.cpp
@@ -28,7 +28,6 @@
 #include <regex>
 
 using namespace solidity::yul;
-using namespace std;
 
 NameSimplifier::NameSimplifier(OptimiserStepContext& _context, Block const& _ast):
 	m_context(_context)
@@ -54,7 +53,7 @@ void NameSimplifier::operator()(VariableDeclaration& _varDecl)
 	ASTModifier::operator()(_varDecl);
 }
 
-void NameSimplifier::renameVariables(vector<TypedName>& _variables)
+void NameSimplifier::renameVariables(std::vector<TypedName>& _variables)
 {
 	for (TypedName& typedName: _variables)
 		translate(typedName.name);
@@ -78,31 +77,31 @@ void NameSimplifier::findSimplification(YulString const& _name)
 	if (m_translations.count(_name))
 		return;
 
-	string name = _name.str();
-
-	static auto replacements = vector<pair<regex, string>>{
-		{regex("_\\$|\\$_"), "_"}, // remove type mangling delimiters
-		{regex("_[0-9]+([^0-9a-fA-Fx])"), "$1"}, // removes AST IDs that are not hex.
-		{regex("_[0-9]+$"), ""}, // removes AST IDs that are not hex.
-		{regex("_t_"), "_"}, // remove type prefixes
-		{regex("__"), "_"},
-		{regex("(abi_..code.*)_to_.*"), "$1"}, // removes _to... for abi functions
-		{regex("(stringliteral_?[0-9a-f][0-9a-f][0-9a-f][0-9a-f])[0-9a-f]*"), "$1"}, // shorten string literal
-		{regex("tuple_"), ""},
-		{regex("_memory_ptr"), ""},
-		{regex("_calldata_ptr"), "_calldata"},
-		{regex("_fromStack"), ""},
-		{regex("_storage_storage"), "_storage"},
-		{regex("(storage.*)_?storage"), "$1"},
-		{regex("_memory_memory"), "_memory"},
-		{regex("_contract\\$_([^_]*)_?"), "$1_"},
-		{regex("index_access_(t_)?array"), "index_access"},
-		{regex("[0-9]*_$"), ""}
+	std::string name = _name.str();
+
+	static auto replacements = std::vector<std::pair<std::regex, std::string>>{
+		{std::regex("_\\$|\\$_"), "_"}, // remove type mangling delimiters
+		{std::regex("_[0-9]+([^0-9a-fA-Fx])"), "$1"}, // removes AST IDs that are not hex.
+		{std::regex("_[0-9]+$"), ""}, // removes AST IDs that are not hex.
+		{std::regex("_t_"), "_"}, // remove type prefixes
+		{std::regex("__"), "_"},
+		{std::regex("(abi_..code.*)_to_.*"), "$1"}, // removes _to... for abi functions
+		{std::regex("(stringliteral_?[0-9a-f][0-9a-f][0-9a-f][0-9a-f])[0-9a-f]*"), "$1"}, // shorten string literal
+		{std::regex("tuple_"), ""},
+		{std::regex("_memory_ptr"), ""},
+		{std::regex("_calldata_ptr"), "_calldata"},
+		{std::regex("_fromStack"), ""},
+		{std::regex("_storage_storage"), "_storage"},
+		{std::regex("(storage.*)_?storage"), "$1"},
+		{std::regex("_memory_memory"), "_memory"},
+		{std::regex("_contract\\$_([^_]*)_?"), "$1_"},
+		{std::regex("index_access_(t_)?array"), "index_access"},
+		{std::regex("[0-9]*_$"), ""}
 	};
 
 	for (auto const& [pattern, substitute]: replacements)
 	{
-		string candidate = regex_replace(name, pattern, substitute);
+		std::string candidate = regex_replace(name, pattern, substitute);
 		if (!candidate.empty() && !m_context.dispenser.illegalName(YulString(candidate)))
 			name = candidate;
 	}
diff --git a/libyul/optimiser/OptimizerUtilities.cpp b/libyul/optimiser/OptimizerUtilities.cpp
index bd474f7482..17f912762b 100644
--- a/libyul/optimiser/OptimizerUtilities.cpp
+++ b/libyul/optimiser/OptimizerUtilities.cpp
@@ -31,7 +31,6 @@
 
 #include <range/v3/action/remove_if.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::util;
@@ -40,7 +39,7 @@ using namespace solidity::yul;
 void yul::removeEmptyBlocks(Block& _block)
 {
 	auto isEmptyBlock = [](Statement const& _st) -> bool {
-		return holds_alternative<Block>(_st) && std::get<Block>(_st).statements.empty();
+		return std::holds_alternative<Block>(_st) && std::get<Block>(_st).statements.empty();
 	};
 	ranges::actions::remove_if(_block.statements, isEmptyBlock);
 }
@@ -50,12 +49,12 @@ bool yul::isRestrictedIdentifier(Dialect const& _dialect, YulString const& _iden
 	return _identifier.empty() || TokenTraits::isYulKeyword(_identifier.str()) || _dialect.reservedIdentifier(_identifier);
 }
 
-optional<evmasm::Instruction> yul::toEVMInstruction(Dialect const& _dialect, YulString const& _name)
+std::optional<evmasm::Instruction> yul::toEVMInstruction(Dialect const& _dialect, YulString const& _name)
 {
 	if (auto const* dialect = dynamic_cast<EVMDialect const*>(&_dialect))
 		if (BuiltinFunctionForEVM const* builtin = dialect->builtin(_name))
 			return builtin->instruction;
-	return nullopt;
+	return std::nullopt;
 }
 
 langutil::EVMVersion const yul::evmVersionFromDialect(Dialect const& _dialect)
@@ -69,12 +68,12 @@ void StatementRemover::operator()(Block& _block)
 {
 	util::iterateReplacing(
 		_block.statements,
-		[&](Statement& _statement) -> std::optional<vector<Statement>>
+		[&](Statement& _statement) -> std::optional<std::vector<Statement>>
 		{
 			if (m_toRemove.count(&_statement))
-				return {vector<Statement>{}};
+				return {std::vector<Statement>{}};
 			else
-				return nullopt;
+				return std::nullopt;
 		}
 	);
 	ASTModifier::operator()(_block);
diff --git a/libyul/optimiser/Rematerialiser.cpp b/libyul/optimiser/Rematerialiser.cpp
index 02221a17d6..db6920f243 100644
--- a/libyul/optimiser/Rematerialiser.cpp
+++ b/libyul/optimiser/Rematerialiser.cpp
@@ -28,11 +28,10 @@
 
 #include <range/v3/algorithm/all_of.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
-void Rematerialiser::run(Dialect const& _dialect, Block& _ast, set<YulString> _varsToAlwaysRematerialize, bool _onlySelectedVariables)
+void Rematerialiser::run(Dialect const& _dialect, Block& _ast, std::set<YulString> _varsToAlwaysRematerialize, bool _onlySelectedVariables)
 {
 	Rematerialiser{_dialect, _ast, std::move(_varsToAlwaysRematerialize), _onlySelectedVariables}(_ast);
 }
@@ -40,7 +39,7 @@ void Rematerialiser::run(Dialect const& _dialect, Block& _ast, set<YulString> _v
 Rematerialiser::Rematerialiser(
 	Dialect const& _dialect,
 	Block& _ast,
-	set<YulString> _varsToAlwaysRematerialize,
+	std::set<YulString> _varsToAlwaysRematerialize,
 	bool _onlySelectedVariables
 ):
 	DataFlowAnalyzer(_dialect, MemoryAndStorage::Ignore),
@@ -52,7 +51,7 @@ Rematerialiser::Rematerialiser(
 
 void Rematerialiser::visit(Expression& _e)
 {
-	if (holds_alternative<Identifier>(_e))
+	if (std::holds_alternative<Identifier>(_e))
 	{
 		Identifier& identifier = std::get<Identifier>(_e);
 		YulString name = identifier.name;
@@ -91,14 +90,14 @@ void Rematerialiser::visit(Expression& _e)
 
 void LiteralRematerialiser::visit(Expression& _e)
 {
-	if (holds_alternative<Identifier>(_e))
+	if (std::holds_alternative<Identifier>(_e))
 	{
 		Identifier& identifier = std::get<Identifier>(_e);
 		YulString name = identifier.name;
 		if (AssignedValue const* value = variableValue(name))
 		{
 			assertThrow(value->value, OptimizerException, "");
-			if (holds_alternative<Literal>(*value->value))
+			if (std::holds_alternative<Literal>(*value->value))
 				_e = *value->value;
 		}
 	}
diff --git a/libyul/optimiser/SSAReverser.cpp b/libyul/optimiser/SSAReverser.cpp
index d6bf7138a1..d47c390333 100644
--- a/libyul/optimiser/SSAReverser.cpp
+++ b/libyul/optimiser/SSAReverser.cpp
@@ -22,7 +22,6 @@
 
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -38,7 +37,7 @@ void SSAReverser::operator()(Block& _block)
 	walkVector(_block.statements);
 	util::iterateReplacingWindow<2>(
 		_block.statements,
-		[&](Statement& _stmt1, Statement& _stmt2) -> std::optional<vector<Statement>>
+		[&](Statement& _stmt1, Statement& _stmt2) -> std::optional<std::vector<Statement>>
 		{
 			auto* varDecl = std::get_if<VariableDeclaration>(&_stmt1);
 
diff --git a/libyul/optimiser/SSATransform.cpp b/libyul/optimiser/SSATransform.cpp
index d86e6fbee1..74a7701494 100644
--- a/libyul/optimiser/SSATransform.cpp
+++ b/libyul/optimiser/SSATransform.cpp
@@ -30,7 +30,6 @@
 
 #include <libyul/optimiser/TypeInfo.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::langutil;
@@ -47,7 +46,7 @@ class IntroduceSSA: public ASTModifier
 public:
 	explicit IntroduceSSA(
 		NameDispenser& _nameDispenser,
-		set<YulString> const& _variablesToReplace,
+		std::set<YulString> const& _variablesToReplace,
 		TypeInfo& _typeInfo
 	):
 		m_nameDispenser(_nameDispenser),
@@ -59,7 +58,7 @@ class IntroduceSSA: public ASTModifier
 
 private:
 	NameDispenser& m_nameDispenser;
-	set<YulString> const& m_variablesToReplace;
+	std::set<YulString> const& m_variablesToReplace;
 	TypeInfo const& m_typeInfo;
 };
 
@@ -68,9 +67,9 @@ void IntroduceSSA::operator()(Block& _block)
 {
 	util::iterateReplacing(
 		_block.statements,
-		[&](Statement& _s) -> std::optional<vector<Statement>>
+		[&](Statement& _s) -> std::optional<std::vector<Statement>>
 		{
-			if (holds_alternative<VariableDeclaration>(_s))
+			if (std::holds_alternative<VariableDeclaration>(_s))
 			{
 				VariableDeclaration& varDecl = std::get<VariableDeclaration>(_s);
 				if (varDecl.value)
@@ -85,8 +84,8 @@ void IntroduceSSA::operator()(Block& _block)
 
 				// Replace "let a := v" by "let a_1 := v  let a := a_1"
 				// Replace "let a, b := v" by "let a_1, b_1 := v  let a := a_1 let b := b_2"
-				shared_ptr<DebugData const> debugData = varDecl.debugData;
-				vector<Statement> statements;
+				std::shared_ptr<DebugData const> debugData = varDecl.debugData;
+				std::vector<Statement> statements;
 				statements.emplace_back(VariableDeclaration{debugData, {}, std::move(varDecl.value)});
 				TypedNameList newVariables;
 				for (auto const& var: varDecl.variables)
@@ -97,13 +96,13 @@ void IntroduceSSA::operator()(Block& _block)
 					statements.emplace_back(VariableDeclaration{
 						debugData,
 						{TypedName{debugData, oldName, var.type}},
-						make_unique<Expression>(Identifier{debugData, newName})
+						std::make_unique<Expression>(Identifier{debugData, newName})
 					});
 				}
 				std::get<VariableDeclaration>(statements.front()).variables = std::move(newVariables);
 				return { std::move(statements) };
 			}
-			else if (holds_alternative<Assignment>(_s))
+			else if (std::holds_alternative<Assignment>(_s))
 			{
 				Assignment& assignment = std::get<Assignment>(_s);
 				visit(*assignment.value);
@@ -113,7 +112,7 @@ void IntroduceSSA::operator()(Block& _block)
 				// Replace "a := v" by "let a_1 := v  a := v"
 				// Replace "a, b := v" by "let a_1, b_1 := v  a := a_1 b := b_2"
 				std::shared_ptr<DebugData const> debugData = assignment.debugData;
-				vector<Statement> statements;
+				std::vector<Statement> statements;
 				statements.emplace_back(VariableDeclaration{debugData, {}, std::move(assignment.value)});
 				TypedNameList newVariables;
 				for (auto const& var: assignment.variableNames)
@@ -127,7 +126,7 @@ void IntroduceSSA::operator()(Block& _block)
 					statements.emplace_back(Assignment{
 						debugData,
 						{Identifier{debugData, oldName}},
-						make_unique<Expression>(Identifier{debugData, newName})
+						std::make_unique<Expression>(Identifier{debugData, newName})
 					});
 				}
 				std::get<VariableDeclaration>(statements.front()).variables = std::move(newVariables);
@@ -149,7 +148,7 @@ class IntroduceControlFlowSSA: public ASTModifier
 public:
 	explicit IntroduceControlFlowSSA(
 		NameDispenser& _nameDispenser,
-		set<YulString> const& _variablesToReplace,
+		std::set<YulString> const& _variablesToReplace,
 		TypeInfo const& _typeInfo
 	):
 		m_nameDispenser(_nameDispenser),
@@ -164,19 +163,19 @@ class IntroduceControlFlowSSA: public ASTModifier
 
 private:
 	NameDispenser& m_nameDispenser;
-	set<YulString> const& m_variablesToReplace;
+	std::set<YulString> const& m_variablesToReplace;
 	/// Variables (that are to be replaced) currently in scope.
-	set<YulString> m_variablesInScope;
+	std::set<YulString> m_variablesInScope;
 	/// Set of variables that do not have a specific value.
-	set<YulString> m_variablesToReassign;
+	std::set<YulString> m_variablesToReassign;
 	TypeInfo const& m_typeInfo;
 };
 
 void IntroduceControlFlowSSA::operator()(FunctionDefinition& _function)
 {
-	set<YulString> varsInScope;
+	std::set<YulString> varsInScope;
 	std::swap(varsInScope, m_variablesInScope);
-	set<YulString> toReassign;
+	std::set<YulString> toReassign;
 	std::swap(toReassign, m_variablesToReassign);
 
 	for (auto const& param: _function.parameters)
@@ -208,7 +207,7 @@ void IntroduceControlFlowSSA::operator()(Switch& _switch)
 {
 	yulAssert(m_variablesToReassign.empty(), "");
 
-	set<YulString> toReassign;
+	std::set<YulString> toReassign;
 	for (auto& c: _switch.cases)
 	{
 		(*this)(c.body);
@@ -220,27 +219,27 @@ void IntroduceControlFlowSSA::operator()(Switch& _switch)
 
 void IntroduceControlFlowSSA::operator()(Block& _block)
 {
-	set<YulString> variablesDeclaredHere;
-	set<YulString> assignedVariables;
+	std::set<YulString> variablesDeclaredHere;
+	std::set<YulString> assignedVariables;
 
 	util::iterateReplacing(
 		_block.statements,
-		[&](Statement& _s) -> std::optional<vector<Statement>>
+		[&](Statement& _s) -> std::optional<std::vector<Statement>>
 		{
-			vector<Statement> toPrepend;
+		std::vector<Statement> toPrepend;
 			for (YulString toReassign: m_variablesToReassign)
 			{
 				YulString newName = m_nameDispenser.newName(toReassign);
 				toPrepend.emplace_back(VariableDeclaration{
 					debugDataOf(_s),
 					{TypedName{debugDataOf(_s), newName, m_typeInfo.typeOfVariable(toReassign)}},
-					make_unique<Expression>(Identifier{debugDataOf(_s), toReassign})
+					std::make_unique<Expression>(Identifier{debugDataOf(_s), toReassign})
 				});
 				assignedVariables.insert(toReassign);
 			}
 			m_variablesToReassign.clear();
 
-			if (holds_alternative<VariableDeclaration>(_s))
+			if (std::holds_alternative<VariableDeclaration>(_s))
 			{
 				VariableDeclaration& varDecl = std::get<VariableDeclaration>(_s);
 				for (auto const& var: varDecl.variables)
@@ -250,7 +249,7 @@ void IntroduceControlFlowSSA::operator()(Block& _block)
 						m_variablesInScope.insert(var.name);
 					}
 			}
-			else if (holds_alternative<Assignment>(_s))
+			else if (std::holds_alternative<Assignment>(_s))
 			{
 				Assignment& assignment = std::get<Assignment>(_s);
 				for (auto const& var: assignment.variableNames)
@@ -281,7 +280,7 @@ void IntroduceControlFlowSSA::operator()(Block& _block)
 class PropagateValues: public ASTModifier
 {
 public:
-	explicit PropagateValues(set<YulString> const& _variablesToReplace):
+	explicit PropagateValues(std::set<YulString> const& _variablesToReplace):
 		m_variablesToReplace(_variablesToReplace)
 	{ }
 
@@ -294,9 +293,9 @@ class PropagateValues: public ASTModifier
 private:
 	/// This is a set of all variables that are assigned to anywhere in the code.
 	/// Variables that are only declared but never re-assigned are not touched.
-	set<YulString> const& m_variablesToReplace;
-	map<YulString, YulString> m_currentVariableValues;
-	set<YulString> m_clearAtEndOfBlock;
+	std::set<YulString> const& m_variablesToReplace;
+	std::map<YulString, YulString> m_currentVariableValues;
+	std::set<YulString> m_clearAtEndOfBlock;
 };
 
 void PropagateValues::operator()(Identifier& _identifier)
@@ -316,11 +315,11 @@ void PropagateValues::operator()(VariableDeclaration& _varDecl)
 	if (m_variablesToReplace.count(variable))
 	{
 		// `let a := a_1` - regular declaration of non-SSA variable
-		yulAssert(holds_alternative<Identifier>(*_varDecl.value), "");
+		yulAssert(std::holds_alternative<Identifier>(*_varDecl.value), "");
 		m_currentVariableValues[variable] = std::get<Identifier>(*_varDecl.value).name;
 		m_clearAtEndOfBlock.insert(variable);
 	}
-	else if (_varDecl.value && holds_alternative<Identifier>(*_varDecl.value))
+	else if (_varDecl.value && std::holds_alternative<Identifier>(*_varDecl.value))
 	{
 		// `let a_1 := a` - assignment to SSA variable after a branch.
 		YulString value = std::get<Identifier>(*_varDecl.value).name;
@@ -345,7 +344,7 @@ void PropagateValues::operator()(Assignment& _assignment)
 	if (!m_variablesToReplace.count(name))
 		return;
 
-	yulAssert(_assignment.value && holds_alternative<Identifier>(*_assignment.value), "");
+	yulAssert(_assignment.value && std::holds_alternative<Identifier>(*_assignment.value), "");
 	m_currentVariableValues[name] = std::get<Identifier>(*_assignment.value).name;
 	m_clearAtEndOfBlock.insert(name);
 }
@@ -364,7 +363,7 @@ void PropagateValues::operator()(ForLoop& _for)
 
 void PropagateValues::operator()(Block& _block)
 {
-	set<YulString> clearAtParentBlock = std::move(m_clearAtEndOfBlock);
+	std::set<YulString> clearAtParentBlock = std::move(m_clearAtEndOfBlock);
 	m_clearAtEndOfBlock.clear();
 
 	ASTModifier::operator()(_block);
@@ -380,7 +379,7 @@ void PropagateValues::operator()(Block& _block)
 void SSATransform::run(OptimiserStepContext& _context, Block& _ast)
 {
 	TypeInfo typeInfo(_context.dialect, _ast);
-	set<YulString> assignedVariables = assignedVariableNames(_ast);
+	std::set<YulString> assignedVariables = assignedVariableNames(_ast);
 	IntroduceSSA{_context.dispenser, assignedVariables, typeInfo}(_ast);
 	IntroduceControlFlowSSA{_context.dispenser, assignedVariables, typeInfo}(_ast);
 	PropagateValues{assignedVariables}(_ast);
diff --git a/libyul/optimiser/SSAValueTracker.cpp b/libyul/optimiser/SSAValueTracker.cpp
index df3c5adce1..1d25cb54b5 100644
--- a/libyul/optimiser/SSAValueTracker.cpp
+++ b/libyul/optimiser/SSAValueTracker.cpp
@@ -24,7 +24,6 @@
 
 #include <libyul/AST.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -50,11 +49,11 @@ void SSAValueTracker::operator()(VariableDeclaration const& _varDecl)
 		setValue(_varDecl.variables.front().name, _varDecl.value.get());
 }
 
-set<YulString> SSAValueTracker::ssaVariables(Block const& _ast)
+std::set<YulString> SSAValueTracker::ssaVariables(Block const& _ast)
 {
 	SSAValueTracker t;
 	t(_ast);
-	set<YulString> ssaVars;
+	std::set<YulString> ssaVars;
 	for (auto const& value: t.values())
 		ssaVars.insert(value.first);
 	return ssaVars;
diff --git a/libyul/optimiser/Semantics.cpp b/libyul/optimiser/Semantics.cpp
index d87c205743..5d375b1454 100644
--- a/libyul/optimiser/Semantics.cpp
+++ b/libyul/optimiser/Semantics.cpp
@@ -33,7 +33,6 @@
 
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -41,7 +40,7 @@ using namespace solidity::yul;
 SideEffectsCollector::SideEffectsCollector(
 		Dialect const& _dialect,
 		Expression const& _expression,
-		map<YulString, SideEffects> const* _functionSideEffects
+		std::map<YulString, SideEffects> const* _functionSideEffects
 ):
 	SideEffectsCollector(_dialect, _functionSideEffects)
 {
@@ -57,7 +56,7 @@ SideEffectsCollector::SideEffectsCollector(Dialect const& _dialect, Statement co
 SideEffectsCollector::SideEffectsCollector(
 	Dialect const& _dialect,
 	Block const& _ast,
-	map<YulString, SideEffects> const* _functionSideEffects
+	std::map<YulString, SideEffects> const* _functionSideEffects
 ):
 	SideEffectsCollector(_dialect, _functionSideEffects)
 {
@@ -67,7 +66,7 @@ SideEffectsCollector::SideEffectsCollector(
 SideEffectsCollector::SideEffectsCollector(
 	Dialect const& _dialect,
 	ForLoop const& _ast,
-	map<YulString, SideEffects> const* _functionSideEffects
+	std::map<YulString, SideEffects> const* _functionSideEffects
 ):
 	SideEffectsCollector(_dialect, _functionSideEffects)
 {
@@ -99,7 +98,7 @@ bool MSizeFinder::containsMSize(Dialect const& _dialect, Object const& _object)
 	if (containsMSize(_dialect, *_object.code))
 		return true;
 
-	for (shared_ptr<ObjectNode> const& node: _object.subObjects)
+	for (std::shared_ptr<ObjectNode> const& node: _object.subObjects)
 		if (auto const* object = dynamic_cast<Object const*>(node.get()))
 			if (containsMSize(_dialect, *object))
 				return true;
@@ -116,7 +115,7 @@ void MSizeFinder::operator()(FunctionCall const& _functionCall)
 			m_msizeFound = true;
 }
 
-map<YulString, SideEffects> SideEffectsPropagator::sideEffects(
+std::map<YulString, SideEffects> SideEffectsPropagator::sideEffects(
 	Dialect const& _dialect,
 	CallGraph const& _directCallGraph
 )
@@ -127,7 +126,7 @@ map<YulString, SideEffects> SideEffectsPropagator::sideEffects(
 	// In the future, we should refine that, because the property
 	// is actually a bit different from "not movable".
 
-	map<YulString, SideEffects> ret;
+	std::map<YulString, SideEffects> ret;
 	for (auto const& function: _directCallGraph.functionsWithLoops + _directCallGraph.recursiveFunctions())
 	{
 		ret[function].movable = false;
@@ -179,8 +178,8 @@ void MovableChecker::visit(Statement const&)
 	assertThrow(false, OptimizerException, "Movability for statement requested.");
 }
 
-pair<TerminationFinder::ControlFlow, size_t> TerminationFinder::firstUnconditionalControlFlowChange(
-	vector<Statement> const& _statements
+std::pair<TerminationFinder::ControlFlow, size_t> TerminationFinder::firstUnconditionalControlFlowChange(
+	std::vector<Statement> const& _statements
 )
 {
 	for (size_t i = 0; i < _statements.size(); ++i)
@@ -189,32 +188,32 @@ pair<TerminationFinder::ControlFlow, size_t> TerminationFinder::firstUncondition
 		if (controlFlow != ControlFlow::FlowOut)
 			return {controlFlow, i};
 	}
-	return {ControlFlow::FlowOut, numeric_limits<size_t>::max()};
+	return {ControlFlow::FlowOut, std::numeric_limits<size_t>::max()};
 }
 
 TerminationFinder::ControlFlow TerminationFinder::controlFlowKind(Statement const& _statement)
 {
 	if (
-		holds_alternative<VariableDeclaration>(_statement) &&
+		std::holds_alternative<VariableDeclaration>(_statement) &&
 		std::get<VariableDeclaration>(_statement).value &&
 		containsNonContinuingFunctionCall(*std::get<VariableDeclaration>(_statement).value)
 	)
 		return ControlFlow::Terminate;
 	else if (
-		holds_alternative<Assignment>(_statement) &&
+		std::holds_alternative<Assignment>(_statement) &&
 		containsNonContinuingFunctionCall(*std::get<Assignment>(_statement).value)
 	)
 		return ControlFlow::Terminate;
 	else if (
-		holds_alternative<ExpressionStatement>(_statement) &&
+		std::holds_alternative<ExpressionStatement>(_statement) &&
 		containsNonContinuingFunctionCall(std::get<ExpressionStatement>(_statement).expression)
 	)
 		return ControlFlow::Terminate;
-	else if (holds_alternative<Break>(_statement))
+	else if (std::holds_alternative<Break>(_statement))
 		return ControlFlow::Break;
-	else if (holds_alternative<Continue>(_statement))
+	else if (std::holds_alternative<Continue>(_statement))
 		return ControlFlow::Continue;
-	else if (holds_alternative<Leave>(_statement))
+	else if (std::holds_alternative<Leave>(_statement))
 		return ControlFlow::Leave;
 	else
 		return ControlFlow::FlowOut;
diff --git a/libyul/optimiser/SimplificationRules.cpp b/libyul/optimiser/SimplificationRules.cpp
index c3c4d5a533..f8bbcf678a 100644
--- a/libyul/optimiser/SimplificationRules.cpp
+++ b/libyul/optimiser/SimplificationRules.cpp
@@ -32,7 +32,6 @@
 #include <libevmasm/RuleList.h>
 #include <libsolutil/StringUtils.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
@@ -41,7 +40,7 @@ using namespace solidity::yul;
 SimplificationRules::Rule const* SimplificationRules::findFirstMatch(
 	Expression const& _expr,
 	Dialect const& _dialect,
-	function<AssignedValue const*(YulString)> const& _ssaValues
+	std::function<AssignedValue const*(YulString)> const& _ssaValues
 )
 {
 	auto instruction = instructionAndArguments(_dialect, _expr);
@@ -75,14 +74,14 @@ bool SimplificationRules::isInitialized() const
 	return !m_rules[uint8_t(evmasm::Instruction::ADD)].empty();
 }
 
-std::optional<std::pair<evmasm::Instruction, vector<Expression> const*>>
+std::optional<std::pair<evmasm::Instruction, std::vector<Expression> const*>>
 	SimplificationRules::instructionAndArguments(Dialect const& _dialect, Expression const& _expr)
 {
-	if (holds_alternative<FunctionCall>(_expr))
+	if (std::holds_alternative<FunctionCall>(_expr))
 		if (auto const* dialect = dynamic_cast<EVMDialect const*>(&_dialect))
 			if (auto const* builtin = dialect->builtin(std::get<FunctionCall>(_expr).functionName.name))
 				if (builtin->instruction)
-					return make_pair(*builtin->instruction, &std::get<FunctionCall>(_expr).arguments);
+					return std::make_pair(*builtin->instruction, &std::get<FunctionCall>(_expr).arguments);
 
 	return {};
 }
@@ -122,14 +121,14 @@ SimplificationRules::SimplificationRules(std::optional<langutil::EVMVersion> _ev
 	assertThrow(isInitialized(), OptimizerException, "Rule list not properly initialized.");
 }
 
-yul::Pattern::Pattern(evmasm::Instruction _instruction, initializer_list<Pattern> _arguments):
+yul::Pattern::Pattern(evmasm::Instruction _instruction, std::initializer_list<Pattern> _arguments):
 	m_kind(PatternKind::Operation),
 	m_instruction(_instruction),
 	m_arguments(_arguments)
 {
 }
 
-void Pattern::setMatchGroup(unsigned _group, map<unsigned, Expression const*>& _matchGroups)
+void Pattern::setMatchGroup(unsigned _group, std::map<unsigned, Expression const*>& _matchGroups)
 {
 	m_matchGroup = _group;
 	m_matchGroups = &_matchGroups;
@@ -138,14 +137,14 @@ void Pattern::setMatchGroup(unsigned _group, map<unsigned, Expression const*>& _
 bool Pattern::matches(
 	Expression const& _expr,
 	Dialect const& _dialect,
-	function<AssignedValue const*(YulString)> const& _ssaValues
+	std::function<AssignedValue const*(YulString)> const& _ssaValues
 ) const
 {
 	Expression const* expr = &_expr;
 
 	// Resolve the variable if possible.
 	// Do not do it for "Any" because we can check identity better for variables.
-	if (m_kind != PatternKind::Any && holds_alternative<Identifier>(_expr))
+	if (m_kind != PatternKind::Any && std::holds_alternative<Identifier>(_expr))
 	{
 		YulString varName = std::get<Identifier>(_expr).name;
 		if (AssignedValue const* value = _ssaValues(varName))
@@ -156,7 +155,7 @@ bool Pattern::matches(
 
 	if (m_kind == PatternKind::Constant)
 	{
-		if (!holds_alternative<Literal>(*expr))
+		if (!std::holds_alternative<Literal>(*expr))
 			return false;
 		Literal const& literal = std::get<Literal>(*expr);
 		if (literal.kind != LiteralKind::Number)
@@ -178,7 +177,7 @@ bool Pattern::matches(
 			// we reject the match because side-effects could prevent us from
 			// arbitrarily modifying the code.
 			if (
-				holds_alternative<FunctionCall>(arg) ||
+				std::holds_alternative<FunctionCall>(arg) ||
 				!m_arguments[i].matches(arg, _dialect, _ssaValues)
 			)
 				return false;
@@ -187,7 +186,7 @@ bool Pattern::matches(
 	else
 	{
 		assertThrow(m_arguments.empty(), OptimizerException, "\"Any\" should not have arguments.");
-		assertThrow(!holds_alternative<FunctionCall>(*expr), OptimizerException, "\"Any\" at top-level.");
+		assertThrow(!std::holds_alternative<FunctionCall>(*expr), OptimizerException, "\"Any\" at top-level.");
 	}
 
 	if (m_matchGroup)
@@ -209,8 +208,8 @@ bool Pattern::matches(
 			Expression const* firstMatch = (*m_matchGroups)[m_matchGroup];
 			assertThrow(firstMatch, OptimizerException, "Match set but to null.");
 			assertThrow(
-				!holds_alternative<FunctionCall>(_expr) &&
-				!holds_alternative<FunctionCall>(*firstMatch),
+				!std::holds_alternative<FunctionCall>(_expr) &&
+				!std::holds_alternative<FunctionCall>(*firstMatch),
 				OptimizerException,
 				"Group matches have to be literals or variables."
 			);
@@ -235,7 +234,7 @@ evmasm::Instruction Pattern::instruction() const
 	return m_instruction;
 }
 
-Expression Pattern::toExpression(shared_ptr<DebugData const> const& _debugData, langutil::EVMVersion _evmVersion) const
+Expression Pattern::toExpression(std::shared_ptr<DebugData const> const& _debugData, langutil::EVMVersion _evmVersion) const
 {
 	if (matchGroup())
 		return ASTCopier().translate(matchGroupValue());
@@ -246,11 +245,11 @@ Expression Pattern::toExpression(shared_ptr<DebugData const> const& _debugData,
 	}
 	else if (m_kind == PatternKind::Operation)
 	{
-		vector<Expression> arguments;
+		std::vector<Expression> arguments;
 		for (auto const& arg: m_arguments)
 			arguments.emplace_back(arg.toExpression(_debugData, _evmVersion));
 
-		string name = util::toLower(instructionInfo(m_instruction, _evmVersion).name);
+		std::string name = util::toLower(instructionInfo(m_instruction, _evmVersion).name);
 
 		return FunctionCall{_debugData,
 			Identifier{_debugData, YulString{name}},
diff --git a/libyul/optimiser/StackCompressor.cpp b/libyul/optimiser/StackCompressor.cpp
index a6173996f2..87a5e411c5 100644
--- a/libyul/optimiser/StackCompressor.cpp
+++ b/libyul/optimiser/StackCompressor.cpp
@@ -40,7 +40,6 @@
 
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -61,9 +60,9 @@ class RematCandidateSelector: public DataFlowAnalyzer
 	/// @returns a map from function name to rematerialisation costs to a vector of variables to rematerialise
 	/// and variables that occur in their expression.
 	/// While the map is sorted by cost, the contained vectors are sorted by the order of occurrence.
-	map<YulString, map<size_t, vector<YulString>>> candidates()
+	std::map<YulString, std::map<size_t, std::vector<YulString>>> candidates()
 	{
-		map<YulString, map<size_t, vector<YulString>>> cand;
+		std::map<YulString, std::map<size_t, std::vector<YulString>>> cand;
 		for (auto const& [functionName, candidate]: m_candidates)
 		{
 			if (size_t const* cost = util::valueOrNullptr(m_expressionCodeCost, candidate))
@@ -110,7 +109,7 @@ class RematCandidateSelector: public DataFlowAnalyzer
 	// get called on left-hand-sides of assignments.
 	void visit(Expression& _e) override
 	{
-		if (holds_alternative<Identifier>(_e))
+		if (std::holds_alternative<Identifier>(_e))
 		{
 			YulString name = std::get<Identifier>(_e).name;
 			if (m_expressionCodeCost.count(name))
@@ -134,20 +133,20 @@ class RematCandidateSelector: public DataFlowAnalyzer
 	YulString m_currentFunctionName = {};
 
 	/// All candidate variables by function name, in order of occurrence.
-	vector<pair<YulString, YulString>> m_candidates;
+	std::vector<std::pair<YulString, YulString>> m_candidates;
 	/// Candidate variables and the code cost of their value.
-	map<YulString, size_t> m_expressionCodeCost;
+	std::map<YulString, size_t> m_expressionCodeCost;
 	/// Number of references to each candidate variable.
-	map<YulString, size_t> m_numReferences;
+	std::map<YulString, size_t> m_numReferences;
 };
 
 /// Selects at most @a _numVariables among @a _candidates.
-set<YulString> chooseVarsToEliminate(
-	map<size_t, vector<YulString>> const& _candidates,
+std::set<YulString> chooseVarsToEliminate(
+	std::map<size_t, std::vector<YulString>> const& _candidates,
 	size_t _numVariables
 )
 {
-	set<YulString> varsToEliminate;
+	std::set<YulString> varsToEliminate;
 	for (auto&& [cost, candidates]: _candidates)
 		for (auto&& candidate: candidates)
 		{
@@ -161,15 +160,15 @@ set<YulString> chooseVarsToEliminate(
 void eliminateVariables(
 	Dialect const& _dialect,
 	Block& _ast,
-	map<YulString, int> const& _numVariables,
+	std::map<YulString, int> const& _numVariables,
 	bool _allowMSizeOptimization
 )
 {
 	RematCandidateSelector selector{_dialect};
 	selector(_ast);
-	map<YulString, map<size_t, vector<YulString>>> candidates = selector.candidates();
+	std::map<YulString, std::map<size_t, std::vector<YulString>>> candidates = selector.candidates();
 
-	set<YulString> varsToEliminate;
+	std::set<YulString> varsToEliminate;
 	for (auto const& [functionName, numVariables]: _numVariables)
 	{
 		yulAssert(numVariables > 0);
@@ -178,14 +177,14 @@ void eliminateVariables(
 
 	Rematerialiser::run(_dialect, _ast, std::move(varsToEliminate));
 	// Do not remove functions.
-	set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
+	std::set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
 	UnusedPruner::runUntilStabilised(_dialect, _ast, _allowMSizeOptimization, nullptr, allFunctions);
 }
 
 void eliminateVariablesOptimizedCodegen(
 	Dialect const& _dialect,
 	Block& _ast,
-	map<YulString, vector<StackLayoutGenerator::StackTooDeep>> const& _unreachables,
+	std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> const& _unreachables,
 	bool _allowMSizeOptimization
 )
 {
@@ -195,19 +194,19 @@ void eliminateVariablesOptimizedCodegen(
 	RematCandidateSelector selector{_dialect};
 	selector(_ast);
 
-	map<YulString, size_t> candidates;
+	std::map<YulString, size_t> candidates;
 	for (auto const& [functionName, candidatesInFunction]: selector.candidates())
 		for (auto [cost, candidatesWithCost]: candidatesInFunction)
 			for (auto candidate: candidatesWithCost)
 				candidates[candidate] = cost;
 
-	set<YulString> varsToEliminate;
+	std::set<YulString> varsToEliminate;
 
 	// TODO: this currently ignores the fact that variables may reference other variables we want to eliminate.
 	for (auto const& [functionName, unreachables]: _unreachables)
 		for (auto const& unreachable: unreachables)
 		{
-			map<size_t, vector<YulString>> suitableCandidates;
+			std::map<size_t, std::vector<YulString>> suitableCandidates;
 			size_t neededSlots = unreachable.deficit;
 			for (auto varName: unreachable.variableChoices)
 			{
@@ -230,7 +229,7 @@ void eliminateVariablesOptimizedCodegen(
 		}
 	Rematerialiser::run(_dialect, _ast, std::move(varsToEliminate), true);
 	// Do not remove functions.
-	set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
+	std::set<YulString> allFunctions = NameCollector{_ast, NameCollector::OnlyFunctions}.names();
 	UnusedPruner::runUntilStabilised(_dialect, _ast, _allowMSizeOptimization, nullptr, allFunctions);
 }
 
@@ -245,7 +244,7 @@ bool StackCompressor::run(
 {
 	yulAssert(
 		_object.code &&
-		_object.code->statements.size() > 0 && holds_alternative<Block>(_object.code->statements.at(0)),
+		_object.code->statements.size() > 0 && std::holds_alternative<Block>(_object.code->statements.at(0)),
 		"Need to run the function grouper before the stack compressor."
 	);
 	bool usesOptimizedCodeGenerator = false;
@@ -258,7 +257,7 @@ bool StackCompressor::run(
 	if (usesOptimizedCodeGenerator)
 	{
 		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(_dialect, _object);
-		unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, _dialect, *_object.code);
+		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, _dialect, *_object.code);
 		eliminateVariablesOptimizedCodegen(
 			_dialect,
 			*_object.code,
@@ -269,7 +268,7 @@ bool StackCompressor::run(
 	else
 		for (size_t iterations = 0; iterations < _maxIterations; iterations++)
 		{
-			map<YulString, int> stackSurplus = CompilabilityChecker(_dialect, _object, _optimizeStackAllocation).stackDeficit;
+			std::map<YulString, int> stackSurplus = CompilabilityChecker(_dialect, _object, _optimizeStackAllocation).stackDeficit;
 			if (stackSurplus.empty())
 				return true;
 			eliminateVariables(
diff --git a/libyul/optimiser/StackLimitEvader.cpp b/libyul/optimiser/StackLimitEvader.cpp
index 4c84f5155d..5d7f7fe5d4 100644
--- a/libyul/optimiser/StackLimitEvader.cpp
+++ b/libyul/optimiser/StackLimitEvader.cpp
@@ -36,7 +36,6 @@
 #include <range/v3/view/concat.hpp>
 #include <range/v3/view/take.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -97,16 +96,16 @@ struct MemoryOffsetAllocator
 
 	/// Maps function names to the set of unreachable variables in that function.
 	/// An empty variable name means that the function has too many arguments or return variables.
-	map<YulString, vector<YulString>> const& unreachableVariables;
+	std::map<YulString, std::vector<YulString>> const& unreachableVariables;
 	/// The graph of immediate function calls of all functions.
-	map<YulString, vector<YulString>> const& callGraph;
+	std::map<YulString, std::vector<YulString>> const& callGraph;
 	/// Maps the name of each user-defined function to its definition.
-	map<YulString, FunctionDefinition const*> const& functionDefinitions;
+	std::map<YulString, FunctionDefinition const*> const& functionDefinitions;
 
 	/// Maps variable names to the memory slot the respective variable is assigned.
-	map<YulString, uint64_t> slotAllocations{};
+	std::map<YulString, uint64_t> slotAllocations{};
 	/// Maps function names to the number of memory slots the respective function requires.
-	map<YulString, uint64_t> slotsRequiredForFunction{};
+	std::map<YulString, uint64_t> slotsRequiredForFunction{};
 };
 
 u256 literalArgumentValue(FunctionCall const& _call)
@@ -131,7 +130,7 @@ void StackLimitEvader::run(
 	if (evmDialect && evmDialect->evmVersion().canOverchargeGasForCall())
 	{
 		yul::AsmAnalysisInfo analysisInfo = yul::AsmAnalyzer::analyzeStrictAssertCorrect(*evmDialect, _object);
-		unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, *evmDialect, *_object.code);
+		std::unique_ptr<CFG> cfg = ControlFlowGraphBuilder::build(analysisInfo, *evmDialect, *_object.code);
 		run(_context, _object, StackLayoutGenerator::reportStackTooDeep(*cfg));
 	}
 	else
@@ -146,10 +145,10 @@ void StackLimitEvader::run(
 void StackLimitEvader::run(
 	OptimiserStepContext& _context,
 	Object& _object,
-	map<YulString, vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
+	std::map<YulString, std::vector<StackLayoutGenerator::StackTooDeep>> const& _stackTooDeepErrors
 )
 {
-	map<YulString, vector<YulString>> unreachableVariables;
+	std::map<YulString, std::vector<YulString>> unreachableVariables;
 	for (auto&& [function, stackTooDeepErrors]: _stackTooDeepErrors)
 	{
 		auto& unreachables = unreachableVariables[function];
@@ -165,7 +164,7 @@ void StackLimitEvader::run(
 void StackLimitEvader::run(
 	OptimiserStepContext& _context,
 	Object& _object,
-	map<YulString, vector<YulString>> const& _unreachableVariables
+	std::map<YulString, std::vector<YulString>> const& _unreachableVariables
 )
 {
 	yulAssert(_object.code, "");
@@ -175,7 +174,7 @@ void StackLimitEvader::run(
 		"StackLimitEvader can only be run on objects using the EVMDialect with object access."
 	);
 
-	vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
+	std::vector<FunctionCall*> memoryGuardCalls = FunctionCallFinder::run(
 		*_object.code,
 		"memoryguard"_yulstring
 	);
@@ -198,7 +197,7 @@ void StackLimitEvader::run(
 		if (_unreachableVariables.count(function))
 			return;
 
-	map<YulString, FunctionDefinition const*> functionDefinitions = allFunctionDefinitions(*_object.code);
+	std::map<YulString, FunctionDefinition const*> functionDefinitions = allFunctionDefinitions(*_object.code);
 
 	MemoryOffsetAllocator memoryOffsetAllocator{_unreachableVariables, callGraph.functionCalls, functionDefinitions};
 	uint64_t requiredSlots = memoryOffsetAllocator.run();
diff --git a/libyul/optimiser/StackToMemoryMover.cpp b/libyul/optimiser/StackToMemoryMover.cpp
index 74d05635e3..ab39669b2d 100644
--- a/libyul/optimiser/StackToMemoryMover.cpp
+++ b/libyul/optimiser/StackToMemoryMover.cpp
@@ -29,22 +29,21 @@
 #include <range/v3/view/zip.hpp>
 #include <range/v3/range/conversion.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
 namespace
 {
-vector<Statement> generateMemoryStore(
+std::vector<Statement> generateMemoryStore(
 	Dialect const& _dialect,
-	shared_ptr<DebugData const> const& _debugData,
+	std::shared_ptr<DebugData const> const& _debugData,
 	YulString _mpos,
 	Expression _value
 )
 {
 	BuiltinFunction const* memoryStoreFunction = _dialect.memoryStoreFunction(_dialect.defaultType);
 	yulAssert(memoryStoreFunction, "");
-	vector<Statement> result;
+	std::vector<Statement> result;
 	result.emplace_back(ExpressionStatement{_debugData, FunctionCall{
 		_debugData,
 		Identifier{_debugData, memoryStoreFunction->name},
@@ -77,7 +76,7 @@ FunctionCall generateMemoryLoad(Dialect const& _dialect, std::shared_ptr<DebugDa
 void StackToMemoryMover::run(
 	OptimiserStepContext& _context,
 	u256 _reservedMemory,
-	map<YulString, uint64_t> const& _memorySlots,
+	std::map<YulString, uint64_t> const& _memorySlots,
 	uint64_t _numRequiredSlots,
 	Block& _block
 )
@@ -91,7 +90,7 @@ void StackToMemoryMover::run(
 			util::mapTuple([](YulString _name, FunctionDefinition const* _funDef) {
 				return make_pair(_name, _funDef->returnVariables);
 			}),
-			map<YulString, TypedNameList>{}
+			std::map<YulString, TypedNameList>{}
 		)
 	);
 	stackToMemoryMover(_block);
@@ -101,7 +100,7 @@ void StackToMemoryMover::run(
 StackToMemoryMover::StackToMemoryMover(
 	OptimiserStepContext& _context,
 	VariableMemoryOffsetTracker const& _memoryOffsetTracker,
-	map<YulString, TypedNameList> _functionReturnVariables
+	std::map<YulString, TypedNameList> _functionReturnVariables
 ):
 m_context(_context),
 m_memoryOffsetTracker(_memoryOffsetTracker),
@@ -121,7 +120,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 	// variable arguments we might generate below.
 	ASTModifier::operator()(_functionDefinition);
 
-	vector<Statement> memoryVariableInits;
+	std::vector<Statement> memoryVariableInits;
 
 	// All function parameters with a memory slot are moved at the beginning of the function body.
 	for (TypedName const& param: _functionDefinition.parameters)
@@ -147,7 +146,7 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 	if (_functionDefinition.returnVariables.size() == 1 && m_memoryOffsetTracker(_functionDefinition.returnVariables.front().name))
 	{
 		TypedNameList stackParameters = _functionDefinition.parameters | ranges::views::filter(
-			not_fn(m_memoryOffsetTracker)
+			std::not_fn(m_memoryOffsetTracker)
 		) | ranges::to<TypedNameList>;
 		// Generate new function without return variable and with only the non-moved parameters.
 		YulString newFunctionName = m_context.dispenser.newName(_functionDefinition.name);
@@ -173,13 +172,13 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 				Identifier{_functionDefinition.debugData, newFunctionName},
 				stackParameters | ranges::views::transform([&](TypedName const& _arg) {
 					return Expression{Identifier{_arg.debugData, newArgumentNames.at(_arg.name)}};
-				}) | ranges::to<vector<Expression>>
+				}) | ranges::to<std::vector<Expression>>
 			}
 		});
 		_functionDefinition.body.statements.emplace_back(Assignment{
 			_functionDefinition.debugData,
 			{Identifier{_functionDefinition.debugData, _functionDefinition.returnVariables.front().name}},
-			make_unique<Expression>(generateMemoryLoad(
+			std::make_unique<Expression>(generateMemoryLoad(
 				m_context.dialect,
 				_functionDefinition.debugData,
 				*m_memoryOffsetTracker(_functionDefinition.returnVariables.front().name)
@@ -192,24 +191,24 @@ void StackToMemoryMover::operator()(FunctionDefinition& _functionDefinition)
 		_functionDefinition.body.statements = std::move(memoryVariableInits) + std::move(_functionDefinition.body.statements);
 
 	_functionDefinition.returnVariables = _functionDefinition.returnVariables | ranges::views::filter(
-		not_fn(m_memoryOffsetTracker)
+		std::not_fn(m_memoryOffsetTracker)
 	) | ranges::to<TypedNameList>;
 }
 
 void StackToMemoryMover::operator()(Block& _block)
 {
-	using OptionalStatements = optional<vector<Statement>>;
+	using OptionalStatements = std::optional<std::vector<Statement>>;
 
 	auto rewriteAssignmentOrVariableDeclarationLeftHandSide = [this](
 		auto& _stmt,
 		auto& _lhsVars
 	) -> OptionalStatements {
-		using StatementType = decay_t<decltype(_stmt)>;
+		using StatementType = std::decay_t<decltype(_stmt)>;
 
 		auto debugData = _stmt.debugData;
 		if (_lhsVars.size() == 1)
 		{
-			if (optional<YulString> offset = m_memoryOffsetTracker(_lhsVars.front().name))
+			if (std::optional<YulString> offset = m_memoryOffsetTracker(_lhsVars.front().name))
 				return generateMemoryStore(
 					m_context.dialect,
 					debugData,
@@ -219,48 +218,48 @@ void StackToMemoryMover::operator()(Block& _block)
 			else
 				return {};
 		}
-		vector<optional<YulString>> rhsMemorySlots;
+		std::vector<std::optional<YulString>> rhsMemorySlots;
 		if (_stmt.value)
 		{
-			FunctionCall const* functionCall = get_if<FunctionCall>(_stmt.value.get());
+			FunctionCall const* functionCall = std::get_if<FunctionCall>(_stmt.value.get());
 			yulAssert(functionCall, "");
 			if (m_context.dialect.builtin(functionCall->functionName.name))
-				rhsMemorySlots = vector<optional<YulString>>(_lhsVars.size(), nullopt);
+				rhsMemorySlots = std::vector<std::optional<YulString>>(_lhsVars.size(), std::nullopt);
 			else
 				rhsMemorySlots =
 					m_functionReturnVariables.at(functionCall->functionName.name) |
 					ranges::views::transform(m_memoryOffsetTracker) |
-					ranges::to<vector<optional<YulString>>>;
+					ranges::to<std::vector<std::optional<YulString>>>;
 		}
 		else
-			rhsMemorySlots = vector<optional<YulString>>(_lhsVars.size(), nullopt);
+			rhsMemorySlots = std::vector<std::optional<YulString>>(_lhsVars.size(), std::nullopt);
 
 		// Nothing to do, if the right-hand-side remains entirely on the stack and
 		// none of the variables in the left-hand-side are moved.
 		if (
-			ranges::none_of(rhsMemorySlots, [](optional<YulString> const& _slot) { return _slot.has_value(); }) &&
+			ranges::none_of(rhsMemorySlots, [](std::optional<YulString> const& _slot) { return _slot.has_value(); }) &&
 			!util::contains_if(_lhsVars, m_memoryOffsetTracker)
 		)
 			return {};
 
-		vector<Statement> memoryAssignments;
-		vector<Statement> variableAssignments;
+		std::vector<Statement> memoryAssignments;
+		std::vector<Statement> variableAssignments;
 		VariableDeclaration tempDecl{debugData, {}, std::move(_stmt.value)};
 
 		yulAssert(rhsMemorySlots.size() == _lhsVars.size(), "");
 		for (auto&& [lhsVar, rhsSlot]: ranges::views::zip(_lhsVars, rhsMemorySlots))
 		{
-			unique_ptr<Expression> rhs;
+			std::unique_ptr<Expression> rhs;
 			if (rhsSlot)
-				rhs = make_unique<Expression>(generateMemoryLoad(m_context.dialect, debugData, *rhsSlot));
+				rhs = std::make_unique<Expression>(generateMemoryLoad(m_context.dialect, debugData, *rhsSlot));
 			else
 			{
 				YulString tempVarName = m_nameDispenser.newName(lhsVar.name);
 				tempDecl.variables.emplace_back(TypedName{lhsVar.debugData, tempVarName, {}});
-				rhs = make_unique<Expression>(Identifier{debugData, tempVarName});
+				rhs = std::make_unique<Expression>(Identifier{debugData, tempVarName});
 			}
 
-			if (optional<YulString> offset = m_memoryOffsetTracker(lhsVar.name))
+			if (std::optional<YulString> offset = m_memoryOffsetTracker(lhsVar.name))
 				memoryAssignments += generateMemoryStore(
 					m_context.dialect,
 					_stmt.debugData,
@@ -275,7 +274,7 @@ void StackToMemoryMover::operator()(Block& _block)
 				});
 		}
 
-		vector<Statement> result;
+		std::vector<Statement> result;
 		if (tempDecl.variables.empty())
 			result.emplace_back(ExpressionStatement{debugData, *std::move(tempDecl.value)});
 		else
@@ -292,9 +291,9 @@ void StackToMemoryMover::operator()(Block& _block)
 		[&](Statement& _statement) -> OptionalStatements
 		{
 			visit(_statement);
-			if (auto* assignment = get_if<Assignment>(&_statement))
+			if (auto* assignment = std::get_if<Assignment>(&_statement))
 				return rewriteAssignmentOrVariableDeclarationLeftHandSide(*assignment, assignment->variableNames);
-			else if (auto* varDecl = get_if<VariableDeclaration>(&_statement))
+			else if (auto* varDecl = std::get_if<VariableDeclaration>(&_statement))
 				return rewriteAssignmentOrVariableDeclarationLeftHandSide(*varDecl, varDecl->variables);
 			return {};
 		}
@@ -304,12 +303,12 @@ void StackToMemoryMover::operator()(Block& _block)
 void StackToMemoryMover::visit(Expression& _expression)
 {
 	ASTModifier::visit(_expression);
-	if (Identifier* identifier = get_if<Identifier>(&_expression))
-		if (optional<YulString> offset = m_memoryOffsetTracker(identifier->name))
+	if (Identifier* identifier = std::get_if<Identifier>(&_expression))
+		if (std::optional<YulString> offset = m_memoryOffsetTracker(identifier->name))
 			_expression = generateMemoryLoad(m_context.dialect, identifier->debugData, *offset);
 }
 
-optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(YulString _variable) const
+std::optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(YulString _variable) const
 {
 	if (m_memorySlots.count(_variable))
 	{
@@ -318,15 +317,15 @@ optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(
 		return YulString{toCompactHexWithPrefix(m_reservedMemory + 32 * (m_numRequiredSlots - slot - 1))};
 	}
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
-optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(TypedName const& _variable) const
+std::optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(TypedName const& _variable) const
 {
 	return (*this)(_variable.name);
 }
 
-optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(Identifier const& _variable) const
+std::optional<YulString> StackToMemoryMover::VariableMemoryOffsetTracker::operator()(Identifier const& _variable) const
 {
 	return (*this)(_variable.name);
 }
diff --git a/libyul/optimiser/StructuralSimplifier.cpp b/libyul/optimiser/StructuralSimplifier.cpp
index ca8f942392..2af0f7bac0 100644
--- a/libyul/optimiser/StructuralSimplifier.cpp
+++ b/libyul/optimiser/StructuralSimplifier.cpp
@@ -21,11 +21,10 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/Visitor.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
-using OptionalStatements = std::optional<vector<Statement>>;
+using OptionalStatements = std::optional<std::vector<Statement>>;
 
 namespace
 {
@@ -52,12 +51,12 @@ OptionalStatements replaceConstArgSwitch(Switch& _switchStmt, u256 const& _const
 	if (matchingCaseBlock)
 		return util::make_vector<Statement>(std::move(*matchingCaseBlock));
 	else
-		return optional<vector<Statement>>{vector<Statement>{}};
+		return std::optional<std::vector<Statement>>{std::vector<Statement>{}};
 }
 
-optional<u256> hasLiteralValue(Expression const& _expression)
+std::optional<u256> hasLiteralValue(Expression const& _expression)
 {
-	if (holds_alternative<Literal>(_expression))
+	if (std::holds_alternative<Literal>(_expression))
 		return valueOfLiteral(std::get<Literal>(_expression));
 	else
 		return std::optional<u256>();
@@ -99,7 +98,7 @@ void StructuralSimplifier::simplify(std::vector<yul::Statement>& _statements)
 			if (expressionAlwaysTrue(*_ifStmt.condition))
 				return {std::move(_ifStmt.body.statements)};
 			else if (expressionAlwaysFalse(*_ifStmt.condition))
-				return {vector<Statement>{}};
+				return {std::vector<Statement>{}};
 			return {};
 		},
 		[&](Switch& _switchStmt) -> OptionalStatements {
diff --git a/libyul/optimiser/Substitution.cpp b/libyul/optimiser/Substitution.cpp
index e0557ad74d..b2d4d469e1 100644
--- a/libyul/optimiser/Substitution.cpp
+++ b/libyul/optimiser/Substitution.cpp
@@ -23,13 +23,12 @@
 
 #include <libyul/AST.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
 Expression Substitution::translate(Expression const& _expression)
 {
-	if (holds_alternative<Identifier>(_expression))
+	if (std::holds_alternative<Identifier>(_expression))
 	{
 		YulString name = std::get<Identifier>(_expression).name;
 		if (m_substitutions.count(name))
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index bd966e5d30..58561ee10a 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -86,12 +86,12 @@
 #include <fmt/format.h>
 #endif
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 #ifdef PROFILE_OPTIMIZER_STEPS
 using namespace std::chrono;
 #endif
+using namespace std::string_literals;
 
 namespace
 {
@@ -136,10 +136,10 @@ void OptimiserSuite::run(
 	GasMeter const* _meter,
 	Object& _object,
 	bool _optimizeStackAllocation,
-	string_view _optimisationSequence,
-	string_view _optimisationCleanupSequence,
-	optional<size_t> _expectedExecutionsPerDeployment,
-	set<YulString> const& _externallyUsedIdentifiers
+	std::string_view _optimisationSequence,
+	std::string_view _optimisationCleanupSequence,
+	std::optional<size_t> _expectedExecutionsPerDeployment,
+	std::set<YulString> const& _externallyUsedIdentifiers
 )
 {
 	EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&_dialect);
@@ -148,7 +148,7 @@ void OptimiserSuite::run(
 		evmDialect &&
 		evmDialect->evmVersion().canOverchargeGasForCall() &&
 		evmDialect->providesObjectAccess();
-	set<YulString> reservedIdentifiers = _externallyUsedIdentifiers;
+	std::set<YulString> reservedIdentifiers = _externallyUsedIdentifiers;
 	reservedIdentifiers += _dialect.fixedFunctionNames();
 
 	*_object.code = std::get<Block>(Disambiguator(
@@ -226,11 +226,11 @@ namespace
 {
 
 template <class... Step>
-map<string, unique_ptr<OptimiserStep>> optimiserStepCollection()
+std::map<std::string, std::unique_ptr<OptimiserStep>> optimiserStepCollection()
 {
-	map<string, unique_ptr<OptimiserStep>> ret;
-	for (unique_ptr<OptimiserStep>& s: util::make_vector<unique_ptr<OptimiserStep>>(
-		(make_unique<OptimiserStepInstance<Step>>())...
+	std::map<std::string, std::unique_ptr<OptimiserStep>> ret;
+	for (std::unique_ptr<OptimiserStep>& s: util::make_vector<std::unique_ptr<OptimiserStep>>(
+		(std::make_unique<OptimiserStepInstance<Step>>())...
 	))
 	{
 		yulAssert(!ret.count(s->name), "");
@@ -241,9 +241,9 @@ map<string, unique_ptr<OptimiserStep>> optimiserStepCollection()
 
 }
 
-map<string, unique_ptr<OptimiserStep>> const& OptimiserSuite::allSteps()
+std::map<std::string, std::unique_ptr<OptimiserStep>> const& OptimiserSuite::allSteps()
 {
-	static map<string, unique_ptr<OptimiserStep>> instance;
+	static std::map<std::string, std::unique_ptr<OptimiserStep>> instance;
 	if (instance.empty())
 		instance = optimiserStepCollection<
 			BlockFlattener,
@@ -284,9 +284,9 @@ map<string, unique_ptr<OptimiserStep>> const& OptimiserSuite::allSteps()
 	return instance;
 }
 
-map<string, char> const& OptimiserSuite::stepNameToAbbreviationMap()
+std::map<std::string, char> const& OptimiserSuite::stepNameToAbbreviationMap()
 {
-	static map<string, char> lookupTable{
+	static std::map<std::string, char> lookupTable{
 		{BlockFlattener::name,                'f'},
 		{CircularReferencesPruner::name,      'l'},
 		{CommonSubexpressionEliminator::name, 'c'},
@@ -322,23 +322,23 @@ map<string, char> const& OptimiserSuite::stepNameToAbbreviationMap()
 	};
 	yulAssert(lookupTable.size() == allSteps().size(), "");
 	yulAssert((
-			util::convertContainer<set<char>>(string(NonStepAbbreviations)) -
-			util::convertContainer<set<char>>(lookupTable | ranges::views::values)
-		).size() == string(NonStepAbbreviations).size(),
+			util::convertContainer<std::set<char>>(std::string(NonStepAbbreviations)) -
+			util::convertContainer<std::set<char>>(lookupTable | ranges::views::values)
+		).size() == std::string(NonStepAbbreviations).size(),
 		"Step abbreviation conflicts with a character reserved for another syntactic element"
 	);
 
 	return lookupTable;
 }
 
-map<char, string> const& OptimiserSuite::stepAbbreviationToNameMap()
+std::map<char, std::string> const& OptimiserSuite::stepAbbreviationToNameMap()
 {
-	static map<char, string> lookupTable = util::invertMap(stepNameToAbbreviationMap());
+	static std::map<char, std::string> lookupTable = util::invertMap(stepNameToAbbreviationMap());
 
 	return lookupTable;
 }
 
-void OptimiserSuite::validateSequence(string_view _stepAbbreviations)
+void OptimiserSuite::validateSequence(std::string_view _stepAbbreviations)
 {
 	int8_t nestingLevel = 0;
 	int8_t colonDelimiters = 0;
@@ -349,7 +349,7 @@ void OptimiserSuite::validateSequence(string_view _stepAbbreviations)
 		case '\n':
 			break;
 		case '[':
-			assertThrow(nestingLevel < numeric_limits<int8_t>::max(), OptimizerException, "Brackets nested too deep");
+			assertThrow(nestingLevel < std::numeric_limits<int8_t>::max(), OptimizerException, "Brackets nested too deep");
 			nestingLevel++;
 			break;
 		case ']':
@@ -364,7 +364,7 @@ void OptimiserSuite::validateSequence(string_view _stepAbbreviations)
 		default:
 		{
 			yulAssert(
-				string(NonStepAbbreviations).find(abbreviation) == string::npos,
+				std::string(NonStepAbbreviations).find(abbreviation) == std::string::npos,
 				"Unhandled syntactic element in the abbreviation sequence"
 			);
 			assertThrow(
@@ -372,7 +372,7 @@ void OptimiserSuite::validateSequence(string_view _stepAbbreviations)
 				OptimizerException,
 				"'"s + abbreviation + "' is not a valid step abbreviation"
 			);
-			optional<string> invalid = allSteps().at(stepAbbreviationToNameMap().at(abbreviation))->invalidInCurrentEnvironment();
+			std::optional<std::string> invalid = allSteps().at(stepAbbreviationToNameMap().at(abbreviation))->invalidInCurrentEnvironment();
 			assertThrow(
 				!invalid.has_value(),
 				OptimizerException,
@@ -383,12 +383,12 @@ void OptimiserSuite::validateSequence(string_view _stepAbbreviations)
 	assertThrow(nestingLevel == 0, OptimizerException, "Unbalanced brackets");
 }
 
-void OptimiserSuite::runSequence(string_view _stepAbbreviations, Block& _ast, bool _repeatUntilStable)
+void OptimiserSuite::runSequence(std::string_view _stepAbbreviations, Block& _ast, bool _repeatUntilStable)
 {
 	validateSequence(_stepAbbreviations);
 
 	// This splits 'aaa[bbb]ccc...' into 'aaa' and '[bbb]ccc...'.
-	auto extractNonNestedPrefix = [](string_view _tail) -> tuple<string_view, string_view>
+	auto extractNonNestedPrefix = [](std::string_view _tail) -> std::tuple<std::string_view, std::string_view>
 	{
 		for (size_t i = 0; i < _tail.size(); ++i)
 		{
@@ -400,7 +400,7 @@ void OptimiserSuite::runSequence(string_view _stepAbbreviations, Block& _ast, bo
 	};
 
 	// This splits '[bbb]ccc...' into 'bbb' and 'ccc...'.
-	auto extractBracketContent = [](string_view _tail) -> tuple<string_view, string_view>
+	auto extractBracketContent = [](std::string_view _tail) -> std::tuple<std::string_view, std::string_view>
 	{
 		yulAssert(!_tail.empty() && _tail[0] == '[');
 
@@ -410,7 +410,7 @@ void OptimiserSuite::runSequence(string_view _stepAbbreviations, Block& _ast, bo
 		{
 			if (abbreviation == '[')
 			{
-				yulAssert(nestingLevel < numeric_limits<int8_t>::max());
+				yulAssert(nestingLevel < std::numeric_limits<int8_t>::max());
 				++nestingLevel;
 			}
 			else if (abbreviation == ']')
@@ -427,20 +427,20 @@ void OptimiserSuite::runSequence(string_view _stepAbbreviations, Block& _ast, bo
 		return {_tail.substr(1, contentLength), _tail.substr(contentLength + 2)};
 	};
 
-	auto abbreviationsToSteps = [](string_view _sequence) -> vector<string>
+	auto abbreviationsToSteps = [](std::string_view _sequence) -> std::vector<std::string>
 	{
-		vector<string> steps;
+		std::vector<std::string> steps;
 		for (char abbreviation: _sequence)
 			if (abbreviation != ' ' && abbreviation != '\n')
 				steps.emplace_back(stepAbbreviationToNameMap().at(abbreviation));
 		return steps;
 	};
 
-	vector<tuple<string_view, bool>> subsequences;
-	string_view tail = _stepAbbreviations;
+	std::vector<std::tuple<std::string_view, bool>> subsequences;
+	std::string_view tail = _stepAbbreviations;
 	while (!tail.empty())
 	{
-		string_view subsequence;
+		std::string_view subsequence;
 		tie(subsequence, tail) = extractNonNestedPrefix(tail);
 		if (subsequence.size() > 0)
 			subsequences.push_back({subsequence, false});
@@ -474,15 +474,15 @@ void OptimiserSuite::runSequence(string_view _stepAbbreviations, Block& _ast, bo
 	}
 }
 
-void OptimiserSuite::runSequence(std::vector<string> const& _steps, Block& _ast)
+void OptimiserSuite::runSequence(std::vector<std::string> const& _steps, Block& _ast)
 {
-	unique_ptr<Block> copy;
+	std::unique_ptr<Block> copy;
 	if (m_debug == Debug::PrintChanges)
-		copy = make_unique<Block>(std::get<Block>(ASTCopier{}(_ast)));
-	for (string const& step: _steps)
+		copy = std::make_unique<Block>(std::get<Block>(ASTCopier{}(_ast)));
+	for (std::string const& step: _steps)
 	{
 		if (m_debug == Debug::PrintStep)
-			cout << "Running " << step << endl;
+			std::cout << "Running " << step << std::endl;
 #ifdef PROFILE_OPTIMIZER_STEPS
 		steady_clock::time_point startTime = steady_clock::now();
 #endif
@@ -495,12 +495,12 @@ void OptimiserSuite::runSequence(std::vector<string> const& _steps, Block& _ast)
 		{
 			// TODO should add switch to also compare variable names!
 			if (SyntacticallyEqual{}.statementEqual(_ast, *copy))
-				cout << "== Running " << step << " did not cause changes." << endl;
+				std::cout << "== Running " << step << " did not cause changes." << std::endl;
 			else
 			{
-				cout << "== Running " << step << " changed the AST." << endl;
-				cout << AsmPrinter{}(_ast) << endl;
-				copy = make_unique<Block>(std::get<Block>(ASTCopier{}(_ast)));
+				std::cout << "== Running " << step << " changed the AST." << std::endl;
+				std::cout << AsmPrinter{}(_ast) << std::endl;
+				copy = std::make_unique<Block>(std::get<Block>(ASTCopier{}(_ast)));
 			}
 		}
 	}
diff --git a/libyul/optimiser/SyntacticalEquality.cpp b/libyul/optimiser/SyntacticalEquality.cpp
index dccdf62a52..6f7753827d 100644
--- a/libyul/optimiser/SyntacticalEquality.cpp
+++ b/libyul/optimiser/SyntacticalEquality.cpp
@@ -25,7 +25,6 @@
 
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
diff --git a/libyul/optimiser/TypeInfo.cpp b/libyul/optimiser/TypeInfo.cpp
index 81bc7ac0b0..16ce654968 100644
--- a/libyul/optimiser/TypeInfo.cpp
+++ b/libyul/optimiser/TypeInfo.cpp
@@ -28,7 +28,6 @@
 
 #include <libsolutil/Visitor.h>
 
-using namespace std;
 using namespace solidity::yul;
 using namespace solidity::util;
 
@@ -81,7 +80,7 @@ YulString TypeInfo::typeOf(Expression const& _expression) const
 	return std::visit(GenericVisitor{
 		[&](FunctionCall const& _funCall) {
 			YulString name = _funCall.functionName.name;
-			vector<YulString> const* retTypes = nullptr;
+			std::vector<YulString> const* retTypes = nullptr;
 			if (BuiltinFunction const* fun = m_dialect.builtin(name))
 				retTypes = &fun->returns;
 			else
diff --git a/libyul/optimiser/UnusedAssignEliminator.cpp b/libyul/optimiser/UnusedAssignEliminator.cpp
index 60021d4a9d..f3d78288f3 100644
--- a/libyul/optimiser/UnusedAssignEliminator.cpp
+++ b/libyul/optimiser/UnusedAssignEliminator.cpp
@@ -34,7 +34,6 @@
 
 #include <iostream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -48,7 +47,7 @@ void UnusedAssignEliminator::run(OptimiserStepContext& _context, Block& _ast)
 
 	uae.m_storesToRemove += uae.m_allStores - uae.m_usedStores;
 
-	set<Statement const*> toRemove{uae.m_storesToRemove.begin(), uae.m_storesToRemove.end()};
+	std::set<Statement const*> toRemove{uae.m_storesToRemove.begin(), uae.m_storesToRemove.end()};
 	StatementRemover remover{toRemove};
 	remover(_ast);
 }
@@ -103,7 +102,7 @@ void UnusedAssignEliminator::operator()(Block const& _block)
 	UnusedStoreBase::operator()(_block);
 
 	for (auto const& statement: _block.statements)
-		if (auto const* varDecl = get_if<VariableDeclaration>(&statement))
+		if (auto const* varDecl = std::get_if<VariableDeclaration>(&statement))
 			for (auto const& var: varDecl->variables)
 				m_activeStores.erase(var.name);
 }
@@ -112,7 +111,7 @@ void UnusedAssignEliminator::visit(Statement const& _statement)
 {
 	UnusedStoreBase::visit(_statement);
 
-	if (auto const* assignment = get_if<Assignment>(&_statement))
+	if (auto const* assignment = std::get_if<Assignment>(&_statement))
 	{
 		// We do not remove assignments whose values might have side-effects,
 		// but clear the active stores to the assigned variables in any case.
diff --git a/libyul/optimiser/UnusedFunctionParameterPruner.cpp b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
index 1ada8224f9..40c2fe80c6 100644
--- a/libyul/optimiser/UnusedFunctionParameterPruner.cpp
+++ b/libyul/optimiser/UnusedFunctionParameterPruner.cpp
@@ -36,14 +36,13 @@
 #include <optional>
 #include <variant>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::yul;
 using namespace solidity::yul::unusedFunctionsCommon;
 
 void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _ast)
 {
-	map<YulString, size_t> references = VariableReferencesCounter::countReferences(_ast);
+	std::map<YulString, size_t> references = VariableReferencesCounter::countReferences(_ast);
 	auto used = [&](auto v) -> bool { return references.count(v.name); };
 
 	// Function name and a pair of boolean masks, the first corresponds to parameters and the second
@@ -55,12 +54,12 @@ void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _
 	// Similarly for the second vector in the pair, a value `false` at index `i` indicates that the
 	// return parameter at index `i` in `FunctionDefinition::returnVariables` is unused inside
 	// function body.
-	map<YulString, pair<vector<bool>, vector<bool>>> usedParametersAndReturnVariables;
+	std::map<YulString, std::pair<std::vector<bool>, std::vector<bool>>> usedParametersAndReturnVariables;
 
 	// Step 1 of UnusedFunctionParameterPruner: Find functions whose parameters (both arguments and
 	// return-parameters) are not used in its body.
 	for (auto const& statement: _ast.statements)
-		if (holds_alternative<FunctionDefinition>(statement))
+		if (std::holds_alternative<FunctionDefinition>(statement))
 		{
 			FunctionDefinition const& f = std::get<FunctionDefinition>(statement);
 
@@ -73,7 +72,7 @@ void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _
 			};
 		}
 
-	set<YulString> functionNamesToFree = util::keys(usedParametersAndReturnVariables);
+	std::set<YulString> functionNamesToFree = util::keys(usedParametersAndReturnVariables);
 
 	// Step 2 of UnusedFunctionParameterPruner: Renames the function and replaces all references to
 	// the function, say `f`, by its new name, say `f_1`.
@@ -91,17 +90,17 @@ void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _
 	// For example: introduce a new 'linking' function `f` with the same the body as `f_1`, but with
 	// reduced parameters, i.e., `function f() -> y { y := 1 }`. Now replace the body of `f_1` with
 	// a call to `f`, i.e., `f_1(x) -> y { y := f() }`.
-	iterateReplacing(_ast.statements, [&](Statement& _s) -> optional<vector<Statement>> {
-		if (holds_alternative<FunctionDefinition>(_s))
+	iterateReplacing(_ast.statements, [&](Statement& _s) -> std::optional<std::vector<Statement>> {
+		if (std::holds_alternative<FunctionDefinition>(_s))
 		{
 			// The original function except that it has a new name (e.g., `f_1`)
-			FunctionDefinition& originalFunction = get<FunctionDefinition>(_s);
+			FunctionDefinition& originalFunction = std::get<FunctionDefinition>(_s);
 			if (newToOriginalNames.count(originalFunction.name))
 			{
 
 				YulString linkingFunctionName = originalFunction.name;
 				YulString originalFunctionName = newToOriginalNames.at(linkingFunctionName);
-				pair<vector<bool>, vector<bool>> used =
+				std::pair<std::vector<bool>, std::vector<bool>> used =
 					usedParametersAndReturnVariables.at(originalFunctionName);
 
 				FunctionDefinition linkingFunction = createLinkingFunction(
@@ -122,6 +121,6 @@ void UnusedFunctionParameterPruner::run(OptimiserStepContext& _context, Block& _
 			}
 		}
 
-		return nullopt;
+		return std::nullopt;
 	});
 }
diff --git a/libyul/optimiser/UnusedPruner.cpp b/libyul/optimiser/UnusedPruner.cpp
index cb60f9da89..a64f37ebed 100644
--- a/libyul/optimiser/UnusedPruner.cpp
+++ b/libyul/optimiser/UnusedPruner.cpp
@@ -30,7 +30,6 @@
 #include <libyul/Dialect.h>
 #include <libyul/SideEffects.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -44,8 +43,8 @@ UnusedPruner::UnusedPruner(
 	Dialect const& _dialect,
 	Block& _ast,
 	bool _allowMSizeOptimization,
-	map<YulString, SideEffects> const* _functionSideEffects,
-	set<YulString> const& _externallyUsedFunctions
+	std::map<YulString, SideEffects> const* _functionSideEffects,
+	std::set<YulString> const& _externallyUsedFunctions
 ):
 	m_dialect(_dialect),
 	m_allowMSizeOptimization(_allowMSizeOptimization),
@@ -60,7 +59,7 @@ UnusedPruner::UnusedPruner(
 	Dialect const& _dialect,
 	FunctionDefinition& _function,
 	bool _allowMSizeOptimization,
-	set<YulString> const& _externallyUsedFunctions
+	std::set<YulString> const& _externallyUsedFunctions
 ):
 	m_dialect(_dialect),
 	m_allowMSizeOptimization(_allowMSizeOptimization)
@@ -73,7 +72,7 @@ UnusedPruner::UnusedPruner(
 void UnusedPruner::operator()(Block& _block)
 {
 	for (auto&& statement: _block.statements)
-		if (holds_alternative<FunctionDefinition>(statement))
+		if (std::holds_alternative<FunctionDefinition>(statement))
 		{
 			FunctionDefinition& funDef = std::get<FunctionDefinition>(statement);
 			if (!used(funDef.name))
@@ -82,7 +81,7 @@ void UnusedPruner::operator()(Block& _block)
 				statement = Block{std::move(funDef.debugData), {}};
 			}
 		}
-		else if (holds_alternative<VariableDeclaration>(statement))
+		else if (std::holds_alternative<VariableDeclaration>(statement))
 		{
 			VariableDeclaration& varDecl = std::get<VariableDeclaration>(statement);
 			// Multi-variable declarations are special. We can only remove it
@@ -114,7 +113,7 @@ void UnusedPruner::operator()(Block& _block)
 					}};
 			}
 		}
-		else if (holds_alternative<ExpressionStatement>(statement))
+		else if (std::holds_alternative<ExpressionStatement>(statement))
 		{
 			ExpressionStatement& exprStmt = std::get<ExpressionStatement>(statement);
 			if (
@@ -136,8 +135,8 @@ void UnusedPruner::runUntilStabilised(
 	Dialect const& _dialect,
 	Block& _ast,
 	bool _allowMSizeOptimization,
-	map<YulString, SideEffects> const* _functionSideEffects,
-	set<YulString> const& _externallyUsedFunctions
+	std::map<YulString, SideEffects> const* _functionSideEffects,
+	std::set<YulString> const& _externallyUsedFunctions
 )
 {
 	while (true)
@@ -154,10 +153,10 @@ void UnusedPruner::runUntilStabilised(
 void UnusedPruner::runUntilStabilisedOnFullAST(
 	Dialect const& _dialect,
 	Block& _ast,
-	set<YulString> const& _externallyUsedFunctions
+	std::set<YulString> const& _externallyUsedFunctions
 )
 {
-	map<YulString, SideEffects> functionSideEffects =
+	std::map<YulString, SideEffects> functionSideEffects =
 		SideEffectsPropagator::sideEffects(_dialect, CallGraphGenerator::callGraph(_ast));
 	bool allowMSizeOptimization = !MSizeFinder::containsMSize(_dialect, _ast);
 	runUntilStabilised(_dialect, _ast, allowMSizeOptimization, &functionSideEffects, _externallyUsedFunctions);
@@ -167,7 +166,7 @@ void UnusedPruner::runUntilStabilised(
 	Dialect const& _dialect,
 	FunctionDefinition& _function,
 	bool _allowMSizeOptimization,
-	set<YulString> const& _externallyUsedFunctions
+	std::set<YulString> const& _externallyUsedFunctions
 )
 {
 	while (true)
@@ -184,7 +183,7 @@ bool UnusedPruner::used(YulString _name) const
 	return m_references.count(_name) && m_references.at(_name) > 0;
 }
 
-void UnusedPruner::subtractReferences(map<YulString, size_t> const& _subtrahend)
+void UnusedPruner::subtractReferences(std::map<YulString, size_t> const& _subtrahend)
 {
 	for (auto const& ref: _subtrahend)
 	{
diff --git a/libyul/optimiser/UnusedStoreBase.cpp b/libyul/optimiser/UnusedStoreBase.cpp
index c31fda89c6..977db11c4c 100644
--- a/libyul/optimiser/UnusedStoreBase.cpp
+++ b/libyul/optimiser/UnusedStoreBase.cpp
@@ -29,7 +29,6 @@
 
 #include <range/v3/action/remove_if.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -50,7 +49,7 @@ void UnusedStoreBase::operator()(Switch const& _switch)
 	ActiveStores const preState{m_activeStores};
 
 	bool hasDefault = false;
-	vector<ActiveStores> branches;
+	std::vector<ActiveStores> branches;
 	for (auto const& c: _switch.cases)
 	{
 		if (!c.value)
@@ -146,15 +145,15 @@ void UnusedStoreBase::operator()(Continue const&)
 void UnusedStoreBase::merge(ActiveStores& _target, ActiveStores&& _other)
 {
 	util::joinMap(_target, std::move(_other), [](
-		set<Statement const*>& _storesHere,
-		set<Statement const*>&& _storesThere
+		std::set<Statement const*>& _storesHere,
+		std::set<Statement const*>&& _storesThere
 	)
 	{
 		_storesHere += _storesThere;
 	});
 }
 
-void UnusedStoreBase::merge(ActiveStores& _target, vector<ActiveStores>&& _source)
+void UnusedStoreBase::merge(ActiveStores& _target, std::vector<ActiveStores>&& _source)
 {
 	for (ActiveStores& ts: _source)
 		merge(_target, std::move(ts));
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index 2c3d03e4ed..d88b07f6b1 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -40,26 +40,25 @@
 
 #include <range/v3/algorithm/all_of.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
 /// Variable names for special constants that can never appear in actual Yul code.
-static string const zero{"@ 0"};
-static string const one{"@ 1"};
-static string const thirtyTwo{"@ 32"};
+static std::string const zero{"@ 0"};
+static std::string const one{"@ 1"};
+static std::string const thirtyTwo{"@ 32"};
 
 
 void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
 {
-	map<YulString, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
+	std::map<YulString, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
 		_context.dialect,
 		CallGraphGenerator::callGraph(_ast)
 	);
 
 	SSAValueTracker ssaValues;
 	ssaValues(_ast);
-	map<YulString, AssignedValue> values;
+	std::map<YulString, AssignedValue> values;
 	for (auto const& [name, expression]: ssaValues.values())
 		values[name] = AssignedValue{expression, {}};
 	Expression const zeroLiteral{Literal{{}, LiteralKind::Number, YulString{"0"}, {}}};
@@ -87,16 +86,16 @@ void UnusedStoreEliminator::run(OptimiserStepContext& _context, Block& _ast)
 	rse.markActiveAsUsed(Location::Storage);
 	rse.m_storesToRemove += rse.m_allStores - rse.m_usedStores;
 
-	set<Statement const*> toRemove{rse.m_storesToRemove.begin(), rse.m_storesToRemove.end()};
+	std::set<Statement const*> toRemove{rse.m_storesToRemove.begin(), rse.m_storesToRemove.end()};
 	StatementRemover remover{toRemove};
 	remover(_ast);
 }
 
 UnusedStoreEliminator::UnusedStoreEliminator(
 	Dialect const& _dialect,
-	map<YulString, SideEffects> const& _functionSideEffects,
-	map<YulString, ControlFlowSideEffects> _controlFlowSideEffects,
-	map<YulString, AssignedValue> const& _ssaValues,
+	std::map<YulString, SideEffects> const& _functionSideEffects,
+	std::map<YulString, ControlFlowSideEffects> _controlFlowSideEffects,
+	std::map<YulString, AssignedValue> const& _ssaValues,
 	bool _ignoreMemory
 ):
 	UnusedStoreBase(_dialect),
@@ -148,18 +147,18 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 
 	UnusedStoreBase::visit(_statement);
 
-	auto const* exprStatement = get_if<ExpressionStatement>(&_statement);
+	auto const* exprStatement = std::get_if<ExpressionStatement>(&_statement);
 	if (!exprStatement)
 		return;
 
-	FunctionCall const* funCall = get_if<FunctionCall>(&exprStatement->expression);
+	FunctionCall const* funCall = std::get_if<FunctionCall>(&exprStatement->expression);
 	yulAssert(funCall);
-	optional<Instruction> instruction = toEVMInstruction(m_dialect, funCall->functionName.name);
+	std::optional<Instruction> instruction = toEVMInstruction(m_dialect, funCall->functionName.name);
 	if (!instruction)
 		return;
 
 	if (!ranges::all_of(funCall->arguments, [](Expression const& _expr) -> bool {
-		return get_if<Identifier>(&_expr) || get_if<Literal>(&_expr);
+		return std::get_if<Identifier>(&_expr) || std::get_if<Literal>(&_expr);
 	}))
 		return;
 
@@ -195,7 +194,7 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 			auto length = identifierNameIfSSA(funCall->arguments.at(2));
 			if (length && startOffset)
 			{
-				FunctionCall const* lengthCall = get_if<FunctionCall>(m_ssaValues.at(*length).value);
+				FunctionCall const* lengthCall = std::get_if<FunctionCall>(m_ssaValues.at(*length).value);
 				if (
 					m_knowledgeBase.knownToBeZero(*startOffset) &&
 					lengthCall &&
@@ -207,7 +206,7 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 				return;
 		}
 		m_allStores.insert(&_statement);
-		vector<Operation> operations = operationsFromFunctionCall(*funCall);
+		std::vector<Operation> operations = operationsFromFunctionCall(*funCall);
 		yulAssert(operations.size() == 1, "");
 		if (operations.front().location == Location::Storage)
 			activeStorageStores().insert(&_statement);
@@ -217,7 +216,7 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 	}
 }
 
-vector<UnusedStoreEliminator::Operation> UnusedStoreEliminator::operationsFromFunctionCall(
+std::vector<UnusedStoreEliminator::Operation> UnusedStoreEliminator::operationsFromFunctionCall(
 	FunctionCall const& _functionCall
 ) const
 {
@@ -230,10 +229,10 @@ vector<UnusedStoreEliminator::Operation> UnusedStoreEliminator::operationsFromFu
 	else
 		sideEffects = m_functionSideEffects.at(functionName);
 
-	optional<Instruction> instruction = toEVMInstruction(m_dialect, functionName);
+	std::optional<Instruction> instruction = toEVMInstruction(m_dialect, functionName);
 	if (!instruction)
 	{
-		vector<Operation> result;
+		std::vector<Operation> result;
 		// Unknown read is worse than unknown write.
 		if (sideEffects.memory != SideEffects::Effect::None)
 			result.emplace_back(Operation{Location::Memory, Effect::Read, {}, {}});
@@ -269,7 +268,7 @@ vector<UnusedStoreEliminator::Operation> UnusedStoreEliminator::operationsFromFu
 
 void UnusedStoreEliminator::applyOperation(UnusedStoreEliminator::Operation const& _operation)
 {
-	set<Statement const*>& active =
+	std::set<Statement const*>& active =
 		_operation.location == Location::Storage ?
 		activeStorageStores() :
 		activeMemoryStores();
@@ -324,9 +323,9 @@ bool UnusedStoreEliminator::knownUnrelated(
 
 		if (_op1.start && _op1.length && _op2.start)
 		{
-			optional<u256> length1 = m_knowledgeBase.valueIfKnownConstant(*_op1.length);
-			optional<u256> start1 = m_knowledgeBase.valueIfKnownConstant(*_op1.start);
-			optional<u256> start2 = m_knowledgeBase.valueIfKnownConstant(*_op2.start);
+			std::optional<u256> length1 = m_knowledgeBase.valueIfKnownConstant(*_op1.length);
+			std::optional<u256> start1 = m_knowledgeBase.valueIfKnownConstant(*_op1.start);
+			std::optional<u256> start2 = m_knowledgeBase.valueIfKnownConstant(*_op2.start);
 			if (
 				(length1 && start1 && start2) &&
 				*start1 + *length1 >= *start1 && // no overflow
@@ -336,9 +335,9 @@ bool UnusedStoreEliminator::knownUnrelated(
 		}
 		if (_op2.start && _op2.length && _op1.start)
 		{
-			optional<u256> length2 = m_knowledgeBase.valueIfKnownConstant(*_op2.length);
-			optional<u256> start2 = m_knowledgeBase.valueIfKnownConstant(*_op2.start);
-			optional<u256> start1 = m_knowledgeBase.valueIfKnownConstant(*_op1.start);
+			std::optional<u256> length2 = m_knowledgeBase.valueIfKnownConstant(*_op2.length);
+			std::optional<u256> start2 = m_knowledgeBase.valueIfKnownConstant(*_op2.start);
+			std::optional<u256> start1 = m_knowledgeBase.valueIfKnownConstant(*_op1.start);
 			if (
 				(length2 && start2 && start1) &&
 				*start2 + *length2 >= *start2 && // no overflow
@@ -349,8 +348,8 @@ bool UnusedStoreEliminator::knownUnrelated(
 
 		if (_op1.start && _op1.length && _op2.start && _op2.length)
 		{
-			optional<u256> length1 = m_knowledgeBase.valueIfKnownConstant(*_op1.length);
-			optional<u256> length2 = m_knowledgeBase.valueIfKnownConstant(*_op2.length);
+			std::optional<u256> length1 = m_knowledgeBase.valueIfKnownConstant(*_op1.length);
+			std::optional<u256> length2 = m_knowledgeBase.valueIfKnownConstant(*_op2.length);
 			if (
 				(length1 && *length1 <= 32) &&
 				(length2 && *length2 <= 32) &&
@@ -384,13 +383,13 @@ bool UnusedStoreEliminator::knownCovered(
 		// i.start <= e.start && e.start + e.length <= i.start + i.length
 		if (!_covered.start || !_covering.start || !_covered.length || !_covering.length)
 			return false;
-		optional<u256> coveredLength = m_knowledgeBase.valueIfKnownConstant(*_covered.length);
-		optional<u256> coveringLength = m_knowledgeBase.valueIfKnownConstant(*_covering.length);
+		std::optional<u256> coveredLength = m_knowledgeBase.valueIfKnownConstant(*_covered.length);
+		std::optional<u256> coveringLength = m_knowledgeBase.valueIfKnownConstant(*_covering.length);
 		if (*_covered.start == *_covering.start)
 			if (coveredLength && coveringLength && *coveredLength <= *coveringLength)
 				return true;
-		optional<u256> coveredStart = m_knowledgeBase.valueIfKnownConstant(*_covered.start);
-		optional<u256> coveringStart = m_knowledgeBase.valueIfKnownConstant(*_covering.start);
+		std::optional<u256> coveredStart = m_knowledgeBase.valueIfKnownConstant(*_covered.start);
+		std::optional<u256> coveringStart = m_knowledgeBase.valueIfKnownConstant(*_covering.start);
 		if (coveredStart && coveringStart && coveredLength && coveringLength)
 			if (
 				*coveringStart <= *coveredStart &&
@@ -408,32 +407,32 @@ bool UnusedStoreEliminator::knownCovered(
 }
 
 void UnusedStoreEliminator::markActiveAsUsed(
-	optional<UnusedStoreEliminator::Location> _onlyLocation
+	std::optional<UnusedStoreEliminator::Location> _onlyLocation
 )
 {
-	if (_onlyLocation == nullopt || _onlyLocation == Location::Memory)
+	if (_onlyLocation == std::nullopt || _onlyLocation == Location::Memory)
 		for (Statement const* statement: activeMemoryStores())
 			m_usedStores.insert(statement);
-	if (_onlyLocation == nullopt || _onlyLocation == Location::Storage)
+	if (_onlyLocation == std::nullopt || _onlyLocation == Location::Storage)
 		for (Statement const* statement: activeStorageStores())
 			m_usedStores.insert(statement);
 	clearActive(_onlyLocation);
 }
 
 void UnusedStoreEliminator::clearActive(
-	optional<UnusedStoreEliminator::Location> _onlyLocation
+	std::optional<UnusedStoreEliminator::Location> _onlyLocation
 )
 {
-	if (_onlyLocation == nullopt || _onlyLocation == Location::Memory)
+	if (_onlyLocation == std::nullopt || _onlyLocation == Location::Memory)
 		activeMemoryStores() = {};
-	if (_onlyLocation == nullopt || _onlyLocation == Location::Storage)
+	if (_onlyLocation == std::nullopt || _onlyLocation == Location::Storage)
 		activeStorageStores() = {};
 }
 
-optional<YulString> UnusedStoreEliminator::identifierNameIfSSA(Expression const& _expression) const
+std::optional<YulString> UnusedStoreEliminator::identifierNameIfSSA(Expression const& _expression) const
 {
-	if (Identifier const* identifier = get_if<Identifier>(&_expression))
+	if (Identifier const* identifier = std::get_if<Identifier>(&_expression))
 		if (m_ssaValues.count(identifier->name))
 			return {identifier->name};
-	return nullopt;
+	return std::nullopt;
 }
diff --git a/libyul/optimiser/VarDeclInitializer.cpp b/libyul/optimiser/VarDeclInitializer.cpp
index 9b96bef3bd..845c7cc41c 100644
--- a/libyul/optimiser/VarDeclInitializer.cpp
+++ b/libyul/optimiser/VarDeclInitializer.cpp
@@ -23,7 +23,6 @@
 #include <libsolutil/Visitor.h>
 #include <libyul/Dialect.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 
@@ -31,7 +30,7 @@ void VarDeclInitializer::operator()(Block& _block)
 {
 	ASTModifier::operator()(_block);
 
-	using OptionalStatements = std::optional<vector<Statement>>;
+	using OptionalStatements = std::optional<std::vector<Statement>>;
 	util::GenericVisitor visitor{
 		util::VisitorFallback<OptionalStatements>{},
 		[this](VariableDeclaration& _varDecl) -> OptionalStatements
@@ -41,15 +40,15 @@ void VarDeclInitializer::operator()(Block& _block)
 
 			if (_varDecl.variables.size() == 1)
 			{
-				_varDecl.value = make_unique<Expression>(m_dialect.zeroLiteralForType(_varDecl.variables.front().type));
+				_varDecl.value = std::make_unique<Expression>(m_dialect.zeroLiteralForType(_varDecl.variables.front().type));
 				return {};
 			}
 			else
 			{
-				OptionalStatements ret{vector<Statement>{}};
+				OptionalStatements ret{std::vector<Statement>{}};
 				for (auto& var: _varDecl.variables)
 				{
-					unique_ptr<Expression> expr = make_unique<Expression >(m_dialect.zeroLiteralForType(var.type));
+					std::unique_ptr<Expression> expr = std::make_unique<Expression >(m_dialect.zeroLiteralForType(var.type));
 					ret->emplace_back(VariableDeclaration{std::move(_varDecl.debugData), {std::move(var)}, std::move(expr)});
 				}
 				return ret;
diff --git a/libyul/optimiser/VarNameCleaner.cpp b/libyul/optimiser/VarNameCleaner.cpp
index 09093f5aaf..b13dc8e6b4 100644
--- a/libyul/optimiser/VarNameCleaner.cpp
+++ b/libyul/optimiser/VarNameCleaner.cpp
@@ -29,20 +29,19 @@
 #include <regex>
 #include <limits>
 
-using namespace std;
 using namespace solidity::yul;
 
 VarNameCleaner::VarNameCleaner(
 	Block const& _ast,
 	Dialect const& _dialect,
-	set<YulString> _namesToKeep
+	std::set<YulString> _namesToKeep
 ):
 	m_dialect{_dialect},
 	m_namesToKeep{std::move(_namesToKeep)},
 	m_translatedNames{}
 {
 	for (auto const& statement: _ast.statements)
-		if (holds_alternative<FunctionDefinition>(statement))
+		if (std::holds_alternative<FunctionDefinition>(statement))
 			m_namesToKeep.insert(std::get<FunctionDefinition>(statement).name);
 	m_usedNames = m_namesToKeep;
 }
@@ -52,9 +51,9 @@ void VarNameCleaner::operator()(FunctionDefinition& _funDef)
 	yulAssert(!m_insideFunction, "");
 	m_insideFunction = true;
 
-	set<YulString> globalUsedNames = std::move(m_usedNames);
+	std::set<YulString> globalUsedNames = std::move(m_usedNames);
 	m_usedNames = m_namesToKeep;
-	map<YulString, YulString> globalTranslatedNames;
+	std::map<YulString, YulString> globalTranslatedNames;
 	swap(globalTranslatedNames, m_translatedNames);
 
 	renameVariables(_funDef.parameters);
@@ -73,7 +72,7 @@ void VarNameCleaner::operator()(VariableDeclaration& _varDecl)
 	ASTModifier::operator()(_varDecl);
 }
 
-void VarNameCleaner::renameVariables(vector<TypedName>& _variables)
+void VarNameCleaner::renameVariables(std::vector<TypedName>& _variables)
 {
 	for (TypedName& typedName: _variables)
 	{
@@ -101,9 +100,9 @@ YulString VarNameCleaner::findCleanName(YulString const& _name) const
 		return newName;
 
 	// create new name with suffix (by finding a free identifier)
-	for (size_t i = 1; i < numeric_limits<decltype(i)>::max(); ++i)
+	for (size_t i = 1; i < std::numeric_limits<decltype(i)>::max(); ++i)
 	{
-		YulString newNameSuffixed = YulString{newName.str() + "_" + to_string(i)};
+		YulString newNameSuffixed = YulString{newName.str() + "_" + std::to_string(i)};
 		if (!isUsedName(newNameSuffixed))
 			return newNameSuffixed;
 	}
@@ -117,9 +116,9 @@ bool VarNameCleaner::isUsedName(YulString const& _name) const
 
 YulString VarNameCleaner::stripSuffix(YulString const& _name) const
 {
-	static regex const suffixRegex("(_+[0-9]+)+$");
+	static std::regex const suffixRegex("(_+[0-9]+)+$");
 
-	smatch suffixMatch;
+	std::smatch suffixMatch;
 	if (regex_search(_name.str(), suffixMatch, suffixRegex))
 		return {YulString{suffixMatch.prefix().str()}};
 	return _name;
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 69955f7174..09b17ce7d6 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -35,6 +35,7 @@ NAMESPACE_STD_FREE_FILES=(
     libsolidity/parsing/*
     libsolutil/*
     libyul/backends/evm/*
+    libyul/optimiser/*
     solc/*
 )
 

From eff410eb746f202fe756a2473fd0c8a718348457 Mon Sep 17 00:00:00 2001
From: Jun Zhang <jun@junz.org>
Date: Mon, 28 Aug 2023 16:22:05 +0800
Subject: [PATCH 1585/1748] Purge using namespace std in libyul

Signed-off-by: Jun Zhang <jun@junz.org>
---
 libyul/AsmAnalysis.cpp                     |  66 ++++++-------
 libyul/AsmJsonConverter.cpp                |  10 +-
 libyul/AsmJsonImporter.cpp                 |  33 ++++---
 libyul/AsmParser.cpp                       | 105 ++++++++++-----------
 libyul/AsmPrinter.cpp                      |  99 ++++++++++---------
 libyul/CompilabilityChecker.cpp            |   1 -
 libyul/ControlFlowSideEffectsCollector.cpp |   7 +-
 libyul/Dialect.cpp                         |   5 +-
 libyul/FunctionReferenceResolver.cpp       |   3 +-
 libyul/Object.cpp                          |  35 ++++---
 libyul/ObjectParser.cpp                    |  33 ++++---
 libyul/Scope.cpp                           |   5 +-
 libyul/ScopeFiller.cpp                     |  11 +--
 libyul/Utilities.cpp                       |  17 ++--
 libyul/YulStack.cpp                        |  37 ++++----
 scripts/check_style.sh                     |   1 +
 16 files changed, 227 insertions(+), 241 deletions(-)

diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index b8baec9988..ed4187540e 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -44,7 +44,7 @@
 #include <memory>
 #include <functional>
 
-using namespace std;
+using namespace std::string_literals;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -52,7 +52,7 @@ using namespace solidity::langutil;
 
 namespace
 {
-inline string to_string(LiteralKind _kind)
+inline std::string to_string(LiteralKind _kind)
 {
 	switch (_kind)
 	{
@@ -98,14 +98,14 @@ AsmAnalysisInfo AsmAnalyzer::analyzeStrictAssertCorrect(Dialect const& _dialect,
 	return analysisInfo;
 }
 
-vector<YulString> AsmAnalyzer::operator()(Literal const& _literal)
+std::vector<YulString> AsmAnalyzer::operator()(Literal const& _literal)
 {
 	expectValidType(_literal.type, nativeLocationOf(_literal));
 	if (_literal.kind == LiteralKind::String && _literal.value.str().size() > 32)
 		m_errorReporter.typeError(
 			3069_error,
 			nativeLocationOf(_literal),
-			"String literal too long (" + to_string(_literal.value.str().size()) + " > 32)"
+			"String literal too long (" + std::to_string(_literal.value.str().size()) + " > 32)"
 		);
 	else if (_literal.kind == LiteralKind::Number && bigint(_literal.value.str()) > u256(-1))
 		m_errorReporter.typeError(6708_error, nativeLocationOf(_literal), "Number literal too large (> 256 bits)");
@@ -122,7 +122,7 @@ vector<YulString> AsmAnalyzer::operator()(Literal const& _literal)
 	return {_literal.type};
 }
 
-vector<YulString> AsmAnalyzer::operator()(Identifier const& _identifier)
+std::vector<YulString> AsmAnalyzer::operator()(Identifier const& _identifier)
 {
 	yulAssert(!_identifier.name.empty(), "");
 	auto watcher = m_errorReporter.errorWatcher();
@@ -180,13 +180,13 @@ vector<YulString> AsmAnalyzer::operator()(Identifier const& _identifier)
 void AsmAnalyzer::operator()(ExpressionStatement const& _statement)
 {
 	auto watcher = m_errorReporter.errorWatcher();
-	vector<YulString> types = std::visit(*this, _statement.expression);
+	std::vector<YulString> types = std::visit(*this, _statement.expression);
 	if (watcher.ok() && !types.empty())
 		m_errorReporter.typeError(
 			3083_error,
 			nativeLocationOf(_statement),
 			"Top-level expressions are not supposed to return values (this expression returns " +
-			to_string(types.size()) +
+			std::to_string(types.size()) +
 			" value" +
 			(types.size() == 1 ? "" : "s") +
 			"). Use ``pop()`` or assign them."
@@ -199,7 +199,7 @@ void AsmAnalyzer::operator()(Assignment const& _assignment)
 	size_t const numVariables = _assignment.variableNames.size();
 	yulAssert(numVariables >= 1, "");
 
-	set<YulString> variables;
+	std::set<YulString> variables;
 	for (auto const& _variableName: _assignment.variableNames)
 		if (!variables.insert(_variableName.name).second)
 			m_errorReporter.declarationError(
@@ -210,7 +210,7 @@ void AsmAnalyzer::operator()(Assignment const& _assignment)
 				" occurs multiple times on the left-hand side of the assignment."
 			);
 
-	vector<YulString> types = std::visit(*this, *_assignment.value);
+	std::vector<YulString> types = std::visit(*this, *_assignment.value);
 
 	if (types.size() != numVariables)
 		m_errorReporter.declarationError(
@@ -219,9 +219,9 @@ void AsmAnalyzer::operator()(Assignment const& _assignment)
 			"Variable count for assignment to \"" +
 			joinHumanReadable(applyMap(_assignment.variableNames, [](auto const& _identifier){ return _identifier.name.str(); })) +
 			"\" does not match number of values (" +
-			to_string(numVariables) +
+			std::to_string(numVariables) +
 			" vs. " +
-			to_string(types.size()) +
+			std::to_string(types.size()) +
 			")"
 		);
 
@@ -249,7 +249,7 @@ void AsmAnalyzer::operator()(VariableDeclaration const& _varDecl)
 
 	if (_varDecl.value)
 	{
-		vector<YulString> types = std::visit(*this, *_varDecl.value);
+		std::vector<YulString> types = std::visit(*this, *_varDecl.value);
 		if (types.size() != numVariables)
 			m_errorReporter.declarationError(
 				3812_error,
@@ -257,9 +257,9 @@ void AsmAnalyzer::operator()(VariableDeclaration const& _varDecl)
 				"Variable count mismatch for declaration of \"" +
 				joinHumanReadable(applyMap(_varDecl.variables, [](auto const& _identifier){ return _identifier.name.str(); })) +
 				+ "\": " +
-				to_string(numVariables) +
+				std::to_string(numVariables) +
 				" variables and " +
-				to_string(types.size()) +
+				std::to_string(types.size()) +
 				" values."
 			);
 
@@ -301,13 +301,13 @@ void AsmAnalyzer::operator()(FunctionDefinition const& _funDef)
 	(*this)(_funDef.body);
 }
 
-vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
+std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 {
 	yulAssert(!_funCall.functionName.name.empty(), "");
 	auto watcher = m_errorReporter.errorWatcher();
-	vector<YulString> const* parameterTypes = nullptr;
-	vector<YulString> const* returnTypes = nullptr;
-	vector<optional<LiteralKind>> const* literalArguments = nullptr;
+	std::vector<YulString> const* parameterTypes = nullptr;
+	std::vector<YulString> const* returnTypes = nullptr;
+	std::vector<std::optional<LiteralKind>> const* literalArguments = nullptr;
 
 	if (BuiltinFunction const* f = m_dialect.builtin(_funCall.functionName.name))
 	{
@@ -367,12 +367,12 @@ vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 			7000_error,
 			nativeLocationOf(_funCall.functionName),
 			"Function \"" + _funCall.functionName.name.str() + "\" expects " +
-			to_string(parameterTypes->size()) +
+			std::to_string(parameterTypes->size()) +
 			" arguments but got " +
-			to_string(_funCall.arguments.size()) + "."
+			std::to_string(_funCall.arguments.size()) + "."
 		);
 
-	vector<YulString> argTypes;
+	std::vector<YulString> argTypes;
 	for (size_t i = _funCall.arguments.size(); i > 0; i--)
 	{
 		Expression const& arg = _funCall.arguments[i - 1];
@@ -382,13 +382,13 @@ vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 				std::nullopt
 		)
 		{
-			if (!holds_alternative<Literal>(arg))
+			if (!std::holds_alternative<Literal>(arg))
 				m_errorReporter.typeError(
 					9114_error,
 					nativeLocationOf(_funCall.functionName),
 					"Function expects direct literals as arguments."
 				);
-			else if (*literalArgumentKind != get<Literal>(arg).kind)
+			else if (*literalArgumentKind != std::get<Literal>(arg).kind)
 				m_errorReporter.typeError(
 					5859_error,
 					nativeLocationOf(arg),
@@ -396,10 +396,10 @@ vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 				);
 			else if (*literalArgumentKind == LiteralKind::String)
 			{
-				string functionName = _funCall.functionName.name.str();
+				std::string functionName = _funCall.functionName.name.str();
 				if (functionName == "datasize" || functionName == "dataoffset")
 				{
-					if (!m_dataNames.count(get<Literal>(arg).value))
+					if (!m_dataNames.count(std::get<Literal>(arg).value))
 						m_errorReporter.typeError(
 							3517_error,
 							nativeLocationOf(arg),
@@ -408,7 +408,7 @@ vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 				}
 				else if (functionName.substr(0, "verbatim_"s.size()) == "verbatim_")
 				{
-					if (get<Literal>(arg).value.empty())
+					if (std::get<Literal>(arg).value.empty())
 						m_errorReporter.typeError(
 							1844_error,
 							nativeLocationOf(arg),
@@ -416,7 +416,7 @@ vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 						);
 				}
 
-				argTypes.emplace_back(expectUnlimitedStringLiteral(get<Literal>(arg)));
+				argTypes.emplace_back(expectUnlimitedStringLiteral(std::get<Literal>(arg)));
 				continue;
 			}
 		}
@@ -435,7 +435,7 @@ vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 		return *returnTypes;
 	}
 	else if (returnTypes)
-		return vector<YulString>(returnTypes->size(), m_dialect.defaultType);
+		return std::vector<YulString>(returnTypes->size(), m_dialect.defaultType);
 	else
 		return {};
 }
@@ -460,7 +460,7 @@ void AsmAnalyzer::operator()(Switch const& _switch)
 
 	YulString valueType = expectExpression(*_switch.expression);
 
-	set<u256> cases;
+	std::set<u256> cases;
 	for (auto const& _case: _switch.cases)
 	{
 		if (_case.value)
@@ -525,13 +525,13 @@ void AsmAnalyzer::operator()(Block const& _block)
 
 YulString AsmAnalyzer::expectExpression(Expression const& _expr)
 {
-	vector<YulString> types = std::visit(*this, _expr);
+	std::vector<YulString> types = std::visit(*this, _expr);
 	if (types.size() != 1)
 		m_errorReporter.typeError(
 			3950_error,
 			nativeLocationOf(_expr),
 			"Expected expression to evaluate to one value, but got " +
-			to_string(types.size()) +
+			std::to_string(types.size()) +
 			" values instead."
 		);
 	return types.empty() ? m_dialect.defaultType : types.front();
@@ -576,7 +576,7 @@ void AsmAnalyzer::checkAssignment(Identifier const& _variable, YulString _valueT
 				m_currentScope->insideFunction()
 			);
 
-		if (!holds_alternative<Scope::Variable>(*var))
+		if (!std::holds_alternative<Scope::Variable>(*var))
 			m_errorReporter.typeError(2657_error, nativeLocationOf(_variable), "Assignment requires variable.");
 		else if (!m_activeVariables.count(&std::get<Scope::Variable>(*var)))
 			m_errorReporter.declarationError(
@@ -692,7 +692,7 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 		_instr != evmasm::Instruction::JUMPDEST,
 	"");
 
-	auto errorForVM = [&](ErrorId _errorId, string const& vmKindMessage) {
+	auto errorForVM = [&](ErrorId _errorId, std::string const& vmKindMessage) {
 		m_errorReporter.typeError(
 			_errorId,
 			_location,
diff --git a/libyul/AsmJsonConverter.cpp b/libyul/AsmJsonConverter.cpp
index 0a800c2bad..bf2468b4e4 100644
--- a/libyul/AsmJsonConverter.cpp
+++ b/libyul/AsmJsonConverter.cpp
@@ -26,8 +26,6 @@
 #include <libsolutil/CommonData.h>
 #include <libsolutil/UTF8.h>
 
-using namespace std;
-
 namespace solidity::yul
 {
 
@@ -183,14 +181,14 @@ Json::Value AsmJsonConverter::operator()(Leave const& _node) const
 	return createAstNode(originLocationOf(_node), nativeLocationOf(_node), "YulLeave");
 }
 
-Json::Value AsmJsonConverter::createAstNode(langutil::SourceLocation const& _originLocation, langutil::SourceLocation const& _nativeLocation, string _nodeType) const
+Json::Value AsmJsonConverter::createAstNode(langutil::SourceLocation const& _originLocation, langutil::SourceLocation const& _nativeLocation, std::string _nodeType) const
 {
 	Json::Value ret{Json::objectValue};
 	ret["nodeType"] = std::move(_nodeType);
-	auto srcLocation = [&](int start, int end) -> string
+	auto srcLocation = [&](int start, int end) -> std::string
 	{
 		int length = (start >= 0 && end >= 0 && end >= start) ? end - start : -1;
-		return to_string(start) + ":" + to_string(length) + ":" + (m_sourceIndex.has_value() ? to_string(m_sourceIndex.value()) : "-1");
+		return std::to_string(start) + ":" + std::to_string(length) + ":" + (m_sourceIndex.has_value() ? std::to_string(m_sourceIndex.value()) : "-1");
 	};
 	ret["src"] = srcLocation(_originLocation.start, _originLocation.end);
 	ret["nativeSrc"] = srcLocation(_nativeLocation.start, _nativeLocation.end);
@@ -198,7 +196,7 @@ Json::Value AsmJsonConverter::createAstNode(langutil::SourceLocation const& _ori
 }
 
 template <class T>
-Json::Value AsmJsonConverter::vectorOfVariantsToJson(vector<T> const& _vec) const
+Json::Value AsmJsonConverter::vectorOfVariantsToJson(std::vector<T> const& _vec) const
 {
 	Json::Value ret{Json::arrayValue};
 	for (auto const& var: _vec)
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index 0a88cacf8d..ea8faa8792 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -34,7 +34,6 @@
 
 #include <vector>
 
-using namespace std;
 using namespace solidity::langutil;
 
 namespace solidity::yul
@@ -62,7 +61,7 @@ T AsmJsonImporter::createAsmNode(Json::Value const& _node)
 	return r;
 }
 
-Json::Value AsmJsonImporter::member(Json::Value const& _node, string const& _name)
+Json::Value AsmJsonImporter::member(Json::Value const& _node, std::string const& _name)
 {
 	if (!_node.isMember(_name))
 		return Json::nullValue;
@@ -81,7 +80,7 @@ Statement AsmJsonImporter::createStatement(Json::Value const& _node)
 {
 	Json::Value jsonNodeType = member(_node, "nodeType");
 	yulAssert(jsonNodeType.isString(), "Expected \"nodeType\" to be of type string!");
-	string nodeType = jsonNodeType.asString();
+	std::string nodeType = jsonNodeType.asString();
 
 	yulAssert(nodeType.substr(0, 3) == "Yul", "Invalid nodeType prefix");
 	nodeType = nodeType.substr(3);
@@ -119,7 +118,7 @@ Expression AsmJsonImporter::createExpression(Json::Value const& _node)
 {
 	Json::Value jsonNodeType = member(_node, "nodeType");
 	yulAssert(jsonNodeType.isString(), "Expected \"nodeType\" to be of type string!");
-	string nodeType = jsonNodeType.asString();
+	std::string nodeType = jsonNodeType.asString();
 
 	yulAssert(nodeType.substr(0, 3) == "Yul", "Invalid nodeType prefix");
 	nodeType = nodeType.substr(3);
@@ -137,17 +136,17 @@ Expression AsmJsonImporter::createExpression(Json::Value const& _node)
 	util::unreachable();
 }
 
-vector<Expression> AsmJsonImporter::createExpressionVector(Json::Value const& _array)
+std::vector<Expression> AsmJsonImporter::createExpressionVector(Json::Value const& _array)
 {
-	vector<Expression> ret;
+	std::vector<Expression> ret;
 	for (auto& var: _array)
 		ret.emplace_back(createExpression(var));
 	return ret;
 }
 
-vector<Statement> AsmJsonImporter::createStatementVector(Json::Value const& _array)
+std::vector<Statement> AsmJsonImporter::createStatementVector(Json::Value const& _array)
 {
-	vector<Statement> ret;
+	std::vector<Statement> ret;
 	for (auto& var: _array)
 		ret.emplace_back(createStatement(var));
 	return ret;
@@ -163,7 +162,7 @@ Block AsmJsonImporter::createBlock(Json::Value const& _node)
 Literal AsmJsonImporter::createLiteral(Json::Value const& _node)
 {
 	auto lit = createAsmNode<Literal>(_node);
-	string kind = member(_node, "kind").asString();
+	std::string kind = member(_node, "kind").asString();
 
 	solAssert(member(_node, "hexValue").isString() || member(_node, "value").isString(), "");
 	if (_node.isMember("hexValue"))
@@ -180,7 +179,7 @@ Literal AsmJsonImporter::createLiteral(Json::Value const& _node)
 		lit.kind = LiteralKind::Number;
 		yulAssert(
 			scanner.currentToken() == Token::Number,
-			"Expected number but got " + langutil::TokenTraits::friendlyName(scanner.currentToken()) + string(" while scanning ") + lit.value.str()
+			"Expected number but got " + langutil::TokenTraits::friendlyName(scanner.currentToken()) + std::string(" while scanning ") + lit.value.str()
 		);
 	}
 	else if (kind == "bool")
@@ -199,7 +198,7 @@ Literal AsmJsonImporter::createLiteral(Json::Value const& _node)
 		lit.kind = LiteralKind::String;
 		yulAssert(
 			lit.value.str().size() <= 32,
-			"String literal too long (" + to_string(lit.value.str().size()) + " > 32)"
+			"String literal too long (" + std::to_string(lit.value.str().size()) + " > 32)"
 		);
 	}
 	else
@@ -228,7 +227,7 @@ Assignment AsmJsonImporter::createAssignment(Json::Value const& _node)
 		for (auto const& var: member(_node, "variableNames"))
 			assignment.variableNames.emplace_back(createIdentifier(var));
 
-	assignment.value = make_unique<Expression>(createExpression(member(_node, "value")));
+	assignment.value = std::make_unique<Expression>(createExpression(member(_node, "value")));
 	return assignment;
 }
 
@@ -256,7 +255,7 @@ VariableDeclaration AsmJsonImporter::createVariableDeclaration(Json::Value const
 	auto varDec = createAsmNode<VariableDeclaration>(_node);
 	for (auto const& var: member(_node, "variables"))
 		varDec.variables.emplace_back(createTypedName(var));
-	varDec.value = make_unique<Expression>(createExpression(member(_node, "value")));
+	varDec.value = std::make_unique<Expression>(createExpression(member(_node, "value")));
 	return varDec;
 }
 
@@ -280,7 +279,7 @@ FunctionDefinition AsmJsonImporter::createFunctionDefinition(Json::Value const&
 If AsmJsonImporter::createIf(Json::Value const& _node)
 {
 	auto ifStatement = createAsmNode<If>(_node);
-	ifStatement.condition = make_unique<Expression>(createExpression(member(_node, "condition")));
+	ifStatement.condition = std::make_unique<Expression>(createExpression(member(_node, "condition")));
 	ifStatement.body = createBlock(member(_node, "body"));
 	return ifStatement;
 }
@@ -292,7 +291,7 @@ Case AsmJsonImporter::createCase(Json::Value const& _node)
 	if (value.isString())
 		yulAssert(value.asString() == "default", "Expected default case");
 	else
-		caseStatement.value = make_unique<Literal>(createLiteral(value));
+		caseStatement.value = std::make_unique<Literal>(createLiteral(value));
 	caseStatement.body = createBlock(member(_node, "body"));
 	return caseStatement;
 }
@@ -300,7 +299,7 @@ Case AsmJsonImporter::createCase(Json::Value const& _node)
 Switch AsmJsonImporter::createSwitch(Json::Value const& _node)
 {
 	auto switchStatement = createAsmNode<Switch>(_node);
-	switchStatement.expression = make_unique<Expression>(createExpression(member(_node, "expression")));
+	switchStatement.expression = std::make_unique<Expression>(createExpression(member(_node, "expression")));
 	for (auto const& var: member(_node, "cases"))
 		switchStatement.cases.emplace_back(createCase(var));
 	return switchStatement;
@@ -310,7 +309,7 @@ ForLoop AsmJsonImporter::createForLoop(Json::Value const& _node)
 {
 	auto forLoop = createAsmNode<ForLoop>(_node);
 	forLoop.pre = createBlock(member(_node, "pre"));
-	forLoop.condition = make_unique<Expression>(createExpression(member(_node, "condition")));
+	forLoop.condition = std::make_unique<Expression>(createExpression(member(_node, "condition")));
 	forLoop.post = createBlock(member(_node, "post"));
 	forLoop.body = createBlock(member(_node, "body"));
 	return forLoop;
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index 8043c758a2..b31e105724 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -37,7 +37,6 @@
 #include <algorithm>
 #include <regex>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -46,7 +45,7 @@ using namespace solidity::yul;
 namespace
 {
 
-optional<int> toInt(string const& _value)
+std::optional<int> toInt(std::string const& _value)
 {
 	try
 	{
@@ -54,7 +53,7 @@ optional<int> toInt(string const& _value)
 	}
 	catch (...)
 	{
-		return nullopt;
+		return std::nullopt;
 	}
 }
 
@@ -75,7 +74,7 @@ std::shared_ptr<DebugData const> Parser::createDebugData() const
 }
 
 void Parser::updateLocationEndFrom(
-	shared_ptr<DebugData const>& _debugData,
+	std::shared_ptr<DebugData const>& _debugData,
 	SourceLocation const& _location
 ) const
 {
@@ -88,7 +87,7 @@ void Parser::updateLocationEndFrom(
 			DebugData updatedDebugData = *_debugData;
 			updatedDebugData.nativeLocation.end = _location.end;
 			updatedDebugData.originLocation.end = _location.end;
-			_debugData = make_shared<DebugData const>(std::move(updatedDebugData));
+			_debugData = std::make_shared<DebugData const>(std::move(updatedDebugData));
 			break;
 		}
 		case UseSourceLocationFrom::LocationOverride:
@@ -98,21 +97,21 @@ void Parser::updateLocationEndFrom(
 		{
 			DebugData updatedDebugData = *_debugData;
 			updatedDebugData.nativeLocation.end = _location.end;
-			_debugData = make_shared<DebugData const>(std::move(updatedDebugData));
+			_debugData = std::make_shared<DebugData const>(std::move(updatedDebugData));
 			break;
 		}
 	}
 }
 
-unique_ptr<Block> Parser::parse(CharStream& _charStream)
+std::unique_ptr<Block> Parser::parse(CharStream& _charStream)
 {
-	m_scanner = make_shared<Scanner>(_charStream);
-	unique_ptr<Block> block = parseInline(m_scanner);
+	m_scanner = std::make_shared<Scanner>(_charStream);
+	std::unique_ptr<Block> block = parseInline(m_scanner);
 	expectToken(Token::EOS);
 	return block;
 }
 
-unique_ptr<Block> Parser::parseInline(std::shared_ptr<Scanner> const& _scanner)
+std::unique_ptr<Block> Parser::parseInline(std::shared_ptr<Scanner> const& _scanner)
 {
 	m_recursionDepth = 0;
 
@@ -124,7 +123,7 @@ unique_ptr<Block> Parser::parseInline(std::shared_ptr<Scanner> const& _scanner)
 		m_scanner = _scanner;
 		if (m_useSourceLocationFrom == UseSourceLocationFrom::Comments)
 			fetchDebugDataFromComment();
-		return make_unique<Block>(parseBlock());
+		return std::make_unique<Block>(parseBlock());
 	}
 	catch (FatalError const&)
 	{
@@ -146,17 +145,17 @@ void Parser::fetchDebugDataFromComment()
 {
 	solAssert(m_sourceNames.has_value(), "");
 
-	static regex const tagRegex = regex(
+	static std::regex const tagRegex = std::regex(
 		R"~~((?:^|\s+)(@[a-zA-Z0-9\-_]+)(?:\s+|$))~~", // tag, e.g: @src
-		regex_constants::ECMAScript | regex_constants::optimize
+		std::regex_constants::ECMAScript | std::regex_constants::optimize
 	);
 
-	string_view commentLiteral = m_scanner->currentCommentLiteral();
-	match_results<string_view::const_iterator> match;
+	std::string_view commentLiteral = m_scanner->currentCommentLiteral();
+	std::match_results<std::string_view::const_iterator> match;
 
 	langutil::SourceLocation originLocation = m_locationFromComment;
 	// Empty for each new node.
-	optional<int> astID;
+	std::optional<int> astID;
 
 	while (regex_search(commentLiteral.cbegin(), commentLiteral.cend(), match, tagRegex))
 	{
@@ -186,17 +185,17 @@ void Parser::fetchDebugDataFromComment()
 	m_astIDFromComment = astID;
 }
 
-optional<pair<string_view, SourceLocation>> Parser::parseSrcComment(
-	string_view const _arguments,
+std::optional<std::pair<std::string_view, SourceLocation>> Parser::parseSrcComment(
+	std::string_view const _arguments,
 	langutil::SourceLocation const& _commentLocation
 )
 {
-	static regex const argsRegex = regex(
+	static std::regex const argsRegex = std::regex(
 		R"~~(^(-1|\d+):(-1|\d+):(-1|\d+)(?:\s+|$))~~"  // index and location, e.g.: 1:234:-1
 		R"~~(("(?:[^"\\]|\\.)*"?)?)~~",                // optional code snippet, e.g.: "string memory s = \"abc\";..."
-		regex_constants::ECMAScript | regex_constants::optimize
+		std::regex_constants::ECMAScript | std::regex_constants::optimize
 	);
-	match_results<string_view::const_iterator> match;
+	std::match_results<std::string_view::const_iterator> match;
 	if (!regex_search(_arguments.cbegin(), _arguments.cend(), match, argsRegex))
 	{
 		m_errorReporter.syntaxError(
@@ -204,11 +203,11 @@ optional<pair<string_view, SourceLocation>> Parser::parseSrcComment(
 			_commentLocation,
 			"Invalid values in source location mapping. Could not parse location specification."
 		);
-		return nullopt;
+		return std::nullopt;
 	}
 
 	solAssert(match.size() == 5, "");
-	string_view tail = _arguments.substr(static_cast<size_t>(match.position() + match.length()));
+	std::string_view tail = _arguments.substr(static_cast<size_t>(match.position() + match.length()));
 
 	if (match[4].matched && (
 		!boost::algorithm::ends_with(match[4].str(), "\"") ||
@@ -223,9 +222,9 @@ optional<pair<string_view, SourceLocation>> Parser::parseSrcComment(
 		return {{tail, SourceLocation{}}};
 	}
 
-	optional<int> const sourceIndex = toInt(match[1].str());
-	optional<int> const start = toInt(match[2].str());
-	optional<int> const end = toInt(match[3].str());
+	std::optional<int> const sourceIndex = toInt(match[1].str());
+	std::optional<int> const start = toInt(match[2].str());
+	std::optional<int> const end = toInt(match[3].str());
 
 	if (!sourceIndex.has_value() || !start.has_value() || !end.has_value())
 		m_errorReporter.syntaxError(
@@ -244,26 +243,26 @@ optional<pair<string_view, SourceLocation>> Parser::parseSrcComment(
 		);
 	else
 	{
-		shared_ptr<string const> sourceName = m_sourceNames->at(static_cast<unsigned>(sourceIndex.value()));
+		std::shared_ptr<std::string const> sourceName = m_sourceNames->at(static_cast<unsigned>(sourceIndex.value()));
 		solAssert(sourceName, "");
 		return {{tail, SourceLocation{start.value(), end.value(), std::move(sourceName)}}};
 	}
 	return {{tail, SourceLocation{}}};
 }
 
-optional<pair<string_view, optional<int>>> Parser::parseASTIDComment(
-	string_view _arguments,
+std::optional<std::pair<std::string_view, std::optional<int>>> Parser::parseASTIDComment(
+	std::string_view _arguments,
 	langutil::SourceLocation const& _commentLocation
 )
 {
-	static regex const argRegex = regex(
+	static std::regex const argRegex = std::regex(
 		R"~~(^(\d+)(?:\s|$))~~",
-		regex_constants::ECMAScript | regex_constants::optimize
+		std::regex_constants::ECMAScript | std::regex_constants::optimize
 	);
-	match_results<string_view::const_iterator> match;
-	optional<int> astID;
+	std::match_results<std::string_view::const_iterator> match;
+	std::optional<int> astID;
 	bool matched = regex_search(_arguments.cbegin(), _arguments.cend(), match, argRegex);
-	string_view tail = _arguments;
+	std::string_view tail = _arguments;
 	if (matched)
 	{
 		solAssert(match.size() == 2, "");
@@ -275,12 +274,12 @@ optional<pair<string_view, optional<int>>> Parser::parseASTIDComment(
 	if (!matched || !astID || *astID < 0 || static_cast<int64_t>(*astID) != *astID)
 	{
 		m_errorReporter.syntaxError(1749_error, _commentLocation, "Invalid argument for @ast-id.");
-		astID = nullopt;
+		astID = std::nullopt;
 	}
 	if (matched)
 		return {{_arguments, astID}};
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
 Block Parser::parseBlock()
@@ -310,7 +309,7 @@ Statement Parser::parseStatement()
 	{
 		If _if = createWithLocation<If>();
 		advance();
-		_if.condition = make_unique<Expression>(parseExpression());
+		_if.condition = std::make_unique<Expression>(parseExpression());
 		_if.body = parseBlock();
 		updateLocationEndFrom(_if.debugData, nativeLocationOf(_if.body));
 		return Statement{std::move(_if)};
@@ -319,7 +318,7 @@ Statement Parser::parseStatement()
 	{
 		Switch _switch = createWithLocation<Switch>();
 		advance();
-		_switch.expression = make_unique<Expression>(parseExpression());
+		_switch.expression = std::make_unique<Expression>(parseExpression());
 		while (currentToken() == Token::Case)
 			_switch.cases.emplace_back(parseCase());
 		if (currentToken() == Token::Default)
@@ -364,7 +363,7 @@ Statement Parser::parseStatement()
 	// Options left:
 	// Expression/FunctionCall
 	// Assignment
-	variant<Literal, Identifier> elementary(parseLiteralOrIdentifier());
+	std::variant<Literal, Identifier> elementary(parseLiteralOrIdentifier());
 
 	switch (currentToken())
 	{
@@ -381,7 +380,7 @@ Statement Parser::parseStatement()
 
 		while (true)
 		{
-			if (!holds_alternative<Identifier>(elementary))
+			if (!std::holds_alternative<Identifier>(elementary))
 			{
 				auto const token = currentToken() == Token::Comma ? "," : ":=";
 
@@ -411,7 +410,7 @@ Statement Parser::parseStatement()
 
 		expectToken(Token::AssemblyAssign);
 
-		assignment.value = make_unique<Expression>(parseExpression());
+		assignment.value = std::make_unique<Expression>(parseExpression());
 		updateLocationEndFrom(assignment.debugData, nativeLocationOf(*assignment.value));
 
 		return Statement{std::move(assignment)};
@@ -434,10 +433,10 @@ Case Parser::parseCase()
 	else if (currentToken() == Token::Case)
 	{
 		advance();
-		variant<Literal, Identifier> literal = parseLiteralOrIdentifier();
-		if (!holds_alternative<Literal>(literal))
+		std::variant<Literal, Identifier> literal = parseLiteralOrIdentifier();
+		if (!std::holds_alternative<Literal>(literal))
 			fatalParserError(4805_error, "Literal expected.");
-		_case.value = make_unique<Literal>(std::get<Literal>(std::move(literal)));
+		_case.value = std::make_unique<Literal>(std::get<Literal>(std::move(literal)));
 	}
 	else
 		yulAssert(false, "Case or default case expected.");
@@ -457,7 +456,7 @@ ForLoop Parser::parseForLoop()
 	m_currentForLoopComponent = ForLoopComponent::ForLoopPre;
 	forLoop.pre = parseBlock();
 	m_currentForLoopComponent = ForLoopComponent::None;
-	forLoop.condition = make_unique<Expression>(parseExpression());
+	forLoop.condition = std::make_unique<Expression>(parseExpression());
 	m_currentForLoopComponent = ForLoopComponent::ForLoopPost;
 	forLoop.post = parseBlock();
 	m_currentForLoopComponent = ForLoopComponent::ForLoopBody;
@@ -473,7 +472,7 @@ Expression Parser::parseExpression()
 {
 	RecursionGuard recursionGuard(*this);
 
-	variant<Literal, Identifier> operation = parseLiteralOrIdentifier();
+	std::variant<Literal, Identifier> operation = parseLiteralOrIdentifier();
 	return visit(GenericVisitor{
 		[&](Identifier& _identifier) -> Expression
 		{
@@ -494,7 +493,7 @@ Expression Parser::parseExpression()
 	}, operation);
 }
 
-variant<Literal, Identifier> Parser::parseLiteralOrIdentifier()
+std::variant<Literal, Identifier> Parser::parseLiteralOrIdentifier()
 {
 	RecursionGuard recursionGuard(*this);
 	switch (currentToken())
@@ -572,7 +571,7 @@ VariableDeclaration Parser::parseVariableDeclaration()
 	if (currentToken() == Token::AssemblyAssign)
 	{
 		expectToken(Token::AssemblyAssign);
-		varDecl.value = make_unique<Expression>(parseExpression());
+		varDecl.value = std::make_unique<Expression>(parseExpression());
 		updateLocationEndFrom(varDecl.debugData, nativeLocationOf(*varDecl.value));
 	}
 	else
@@ -628,11 +627,11 @@ FunctionDefinition Parser::parseFunctionDefinition()
 	return funDef;
 }
 
-FunctionCall Parser::parseCall(variant<Literal, Identifier>&& _initialOp)
+FunctionCall Parser::parseCall(std::variant<Literal, Identifier>&& _initialOp)
 {
 	RecursionGuard recursionGuard(*this);
 
-	if (!holds_alternative<Identifier>(_initialOp))
+	if (!std::holds_alternative<Identifier>(_initialOp))
 		fatalParserError(9980_error, "Function name expected.");
 
 	FunctionCall ret;
@@ -681,7 +680,7 @@ YulString Parser::expectAsmIdentifier()
 	return name;
 }
 
-void Parser::checkBreakContinuePosition(string const& _which)
+void Parser::checkBreakContinuePosition(std::string const& _which)
 {
 	switch (m_currentForLoopComponent)
 	{
@@ -699,7 +698,7 @@ void Parser::checkBreakContinuePosition(string const& _which)
 	}
 }
 
-bool Parser::isValidNumberLiteral(string const& _literal)
+bool Parser::isValidNumberLiteral(std::string const& _literal)
 {
 	try
 	{
@@ -713,5 +712,5 @@ bool Parser::isValidNumberLiteral(string const& _literal)
 	if (boost::starts_with(_literal, "0x"))
 		return true;
 	else
-		return _literal.find_first_not_of("0123456789") == string::npos;
+		return _literal.find_first_not_of("0123456789") == std::string::npos;
 }
diff --git a/libyul/AsmPrinter.cpp b/libyul/AsmPrinter.cpp
index 54733cc435..bee213f8ca 100644
--- a/libyul/AsmPrinter.cpp
+++ b/libyul/AsmPrinter.cpp
@@ -37,15 +37,14 @@
 #include <memory>
 #include <functional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::util;
 using namespace solidity::yul;
 
-string AsmPrinter::operator()(Literal const& _literal)
+std::string AsmPrinter::operator()(Literal const& _literal)
 {
-	string const locationComment = formatDebugData(_literal);
+	std::string const locationComment = formatDebugData(_literal);
 
 	switch (_literal.kind)
 	{
@@ -62,34 +61,34 @@ string AsmPrinter::operator()(Literal const& _literal)
 	return locationComment + escapeAndQuoteString(_literal.value.str()) + appendTypeName(_literal.type);
 }
 
-string AsmPrinter::operator()(Identifier const& _identifier)
+std::string AsmPrinter::operator()(Identifier const& _identifier)
 {
 	yulAssert(!_identifier.name.empty(), "Invalid identifier.");
 	return formatDebugData(_identifier) + _identifier.name.str();
 }
 
-string AsmPrinter::operator()(ExpressionStatement const& _statement)
+std::string AsmPrinter::operator()(ExpressionStatement const& _statement)
 {
-	string const locationComment = formatDebugData(_statement);
+	std::string const locationComment = formatDebugData(_statement);
 
 	return locationComment + std::visit(*this, _statement.expression);
 }
 
-string AsmPrinter::operator()(Assignment const& _assignment)
+std::string AsmPrinter::operator()(Assignment const& _assignment)
 {
-	string const locationComment = formatDebugData(_assignment);
+	std::string const locationComment = formatDebugData(_assignment);
 
 	yulAssert(_assignment.variableNames.size() >= 1, "");
-	string variables = (*this)(_assignment.variableNames.front());
+	std::string variables = (*this)(_assignment.variableNames.front());
 	for (size_t i = 1; i < _assignment.variableNames.size(); ++i)
 		variables += ", " + (*this)(_assignment.variableNames[i]);
 
 	return locationComment + variables + " := " + std::visit(*this, *_assignment.value);
 }
 
-string AsmPrinter::operator()(VariableDeclaration const& _variableDeclaration)
+std::string AsmPrinter::operator()(VariableDeclaration const& _variableDeclaration)
 {
-	string out = formatDebugData(_variableDeclaration);
+	std::string out = formatDebugData(_variableDeclaration);
 
 	out += "let ";
 	out += boost::algorithm::join(
@@ -106,11 +105,11 @@ string AsmPrinter::operator()(VariableDeclaration const& _variableDeclaration)
 	return out;
 }
 
-string AsmPrinter::operator()(FunctionDefinition const& _functionDefinition)
+std::string AsmPrinter::operator()(FunctionDefinition const& _functionDefinition)
 {
 	yulAssert(!_functionDefinition.name.empty(), "Invalid function name.");
 
-	string out = formatDebugData(_functionDefinition);
+	std::string out = formatDebugData(_functionDefinition);
 	out += "function " + _functionDefinition.name.str() + "(";
 	out += boost::algorithm::join(
 		_functionDefinition.parameters | ranges::views::transform(
@@ -133,10 +132,10 @@ string AsmPrinter::operator()(FunctionDefinition const& _functionDefinition)
 	return out + "\n" + (*this)(_functionDefinition.body);
 }
 
-string AsmPrinter::operator()(FunctionCall const& _functionCall)
+std::string AsmPrinter::operator()(FunctionCall const& _functionCall)
 {
-	string const locationComment = formatDebugData(_functionCall);
-	string const functionName = (*this)(_functionCall.functionName);
+	std::string const locationComment = formatDebugData(_functionCall);
+	std::string const functionName = (*this)(_functionCall.functionName);
 	return
 		locationComment +
 		functionName + "(" +
@@ -146,26 +145,26 @@ string AsmPrinter::operator()(FunctionCall const& _functionCall)
 		")";
 }
 
-string AsmPrinter::operator()(If const& _if)
+std::string AsmPrinter::operator()(If const& _if)
 {
 	yulAssert(_if.condition, "Invalid if condition.");
 
-	string out = formatDebugData(_if);
+	std::string out = formatDebugData(_if);
 	out += "if " + std::visit(*this, *_if.condition);
 
-	string body = (*this)(_if.body);
+	std::string body = (*this)(_if.body);
 	char delim = '\n';
-	if (body.find('\n') == string::npos)
+	if (body.find('\n') == std::string::npos)
 		delim = ' ';
 
 	return out + delim + body;
 }
 
-string AsmPrinter::operator()(Switch const& _switch)
+std::string AsmPrinter::operator()(Switch const& _switch)
 {
 	yulAssert(_switch.expression, "Invalid expression pointer.");
 
-	string out = formatDebugData(_switch);
+	std::string out = formatDebugData(_switch);
 	out += "switch " + std::visit(*this, *_switch.expression);
 
 	for (auto const& _case: _switch.cases)
@@ -179,20 +178,20 @@ string AsmPrinter::operator()(Switch const& _switch)
 	return out;
 }
 
-string AsmPrinter::operator()(ForLoop const& _forLoop)
+std::string AsmPrinter::operator()(ForLoop const& _forLoop)
 {
 	yulAssert(_forLoop.condition, "Invalid for loop condition.");
-	string const locationComment = formatDebugData(_forLoop);
+	std::string const locationComment = formatDebugData(_forLoop);
 
-	string pre = (*this)(_forLoop.pre);
-	string condition = std::visit(*this, *_forLoop.condition);
-	string post = (*this)(_forLoop.post);
+	std::string pre = (*this)(_forLoop.pre);
+	std::string condition = std::visit(*this, *_forLoop.condition);
+	std::string post = (*this)(_forLoop.post);
 
 	char delim = '\n';
 	if (
 		pre.size() + condition.size() + post.size() < 60 &&
-		pre.find('\n') == string::npos &&
-		post.find('\n') == string::npos
+		pre.find('\n') == std::string::npos &&
+		post.find('\n') == std::string::npos
 	)
 		delim = ' ';
 	return
@@ -201,33 +200,33 @@ string AsmPrinter::operator()(ForLoop const& _forLoop)
 		(*this)(_forLoop.body);
 }
 
-string AsmPrinter::operator()(Break const& _break)
+std::string AsmPrinter::operator()(Break const& _break)
 {
 	return formatDebugData(_break) + "break";
 }
 
-string AsmPrinter::operator()(Continue const& _continue)
+std::string AsmPrinter::operator()(Continue const& _continue)
 {
 	return formatDebugData(_continue) + "continue";
 }
 
 // '_leave' and '__leave' is reserved in VisualStudio
-string AsmPrinter::operator()(Leave const& leave_)
+std::string AsmPrinter::operator()(Leave const& leave_)
 {
 	return formatDebugData(leave_) + "leave";
 }
 
-string AsmPrinter::operator()(Block const& _block)
+std::string AsmPrinter::operator()(Block const& _block)
 {
-	string const locationComment = formatDebugData(_block);
+	std::string const locationComment = formatDebugData(_block);
 
 	if (_block.statements.empty())
 		return locationComment + "{ }";
-	string body = boost::algorithm::join(
+	std::string body = boost::algorithm::join(
 		_block.statements | ranges::views::transform([&](auto&& _node) { return std::visit(*this, _node); }),
 		"\n"
 	);
-	if (body.size() < 30 && body.find('\n') == string::npos)
+	if (body.size() < 30 && body.find('\n') == std::string::npos)
 		return locationComment + "{ " + body + " }";
 	else
 	{
@@ -236,13 +235,13 @@ string AsmPrinter::operator()(Block const& _block)
 	}
 }
 
-string AsmPrinter::formatTypedName(TypedName _variable)
+std::string AsmPrinter::formatTypedName(TypedName _variable)
 {
 	yulAssert(!_variable.name.empty(), "Invalid variable name.");
 	return formatDebugData(_variable) + _variable.name.str() + appendTypeName(_variable.type);
 }
 
-string AsmPrinter::appendTypeName(YulString _type, bool _isBoolLiteral) const
+std::string AsmPrinter::appendTypeName(YulString _type, bool _isBoolLiteral) const
 {
 	if (m_dialect && !_type.empty())
 	{
@@ -258,9 +257,9 @@ string AsmPrinter::appendTypeName(YulString _type, bool _isBoolLiteral) const
 		return ":" + _type.str();
 }
 
-string AsmPrinter::formatSourceLocation(
+std::string AsmPrinter::formatSourceLocation(
 	SourceLocation const& _location,
-	map<string, unsigned> const& _nameToSourceIndex,
+	std::map<std::string, unsigned> const& _nameToSourceIndex,
 	DebugInfoSelection const& _debugInfoSelection,
 	CharStreamProvider const* _soliditySourceProvider
 )
@@ -272,11 +271,11 @@ string AsmPrinter::formatSourceLocation(
 	if (_debugInfoSelection.none())
 		return "";
 
-	string sourceIndex = "-1";
-	string solidityCodeSnippet = "";
+	std::string sourceIndex = "-1";
+	std::string solidityCodeSnippet = "";
 	if (_location.sourceName)
 	{
-		sourceIndex = to_string(_nameToSourceIndex.at(*_location.sourceName));
+		sourceIndex = std::to_string(_nameToSourceIndex.at(*_location.sourceName));
 
 		if (
 			_debugInfoSelection.snippet &&
@@ -295,26 +294,26 @@ string AsmPrinter::formatSourceLocation(
 		}
 	}
 
-	string sourceLocation =
+	std::string sourceLocation =
 		"@src " +
 		sourceIndex +
 		":" +
-		to_string(_location.start) +
+		std::to_string(_location.start) +
 		":" +
-		to_string(_location.end);
+		std::to_string(_location.end);
 
 	return sourceLocation + (solidityCodeSnippet.empty() ? "" : "  ") + solidityCodeSnippet;
 }
 
-string AsmPrinter::formatDebugData(shared_ptr<DebugData const> const& _debugData, bool _statement)
+std::string AsmPrinter::formatDebugData(std::shared_ptr<DebugData const> const& _debugData, bool _statement)
 {
 	if (!_debugData || m_debugInfoSelection.none())
 		return "";
 
-	vector<string> items;
+	std::vector<std::string> items;
 	if (auto id = _debugData->astID)
 		if (m_debugInfoSelection.astID)
-			items.emplace_back("@ast-id " + to_string(*id));
+			items.emplace_back("@ast-id " + std::to_string(*id));
 
 	if (
 		m_lastLocation != _debugData->originLocation &&
@@ -331,7 +330,7 @@ string AsmPrinter::formatDebugData(shared_ptr<DebugData const> const& _debugData
 		));
 	}
 
-	string commentBody = joinHumanReadable(items, " ");
+	std::string commentBody = joinHumanReadable(items, " ");
 	if (commentBody.empty())
 		return "";
 	else
diff --git a/libyul/CompilabilityChecker.cpp b/libyul/CompilabilityChecker.cpp
index b9b51731b1..9e18f48d82 100644
--- a/libyul/CompilabilityChecker.cpp
+++ b/libyul/CompilabilityChecker.cpp
@@ -26,7 +26,6 @@
 #include <libyul/backends/evm/EVMCodeTransform.h>
 #include <libyul/backends/evm/NoOutputAssembly.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
diff --git a/libyul/ControlFlowSideEffectsCollector.cpp b/libyul/ControlFlowSideEffectsCollector.cpp
index ddf53743a2..c657fa17cb 100644
--- a/libyul/ControlFlowSideEffectsCollector.cpp
+++ b/libyul/ControlFlowSideEffectsCollector.cpp
@@ -30,7 +30,6 @@
 #include <range/v3/view/reverse.hpp>
 #include <range/v3/algorithm/find_if.hpp>
 
-using namespace std;
 using namespace solidity::yul;
 
 
@@ -162,7 +161,7 @@ void ControlFlowBuilder::newConnectedNode()
 
 ControlFlowNode* ControlFlowBuilder::newNode()
 {
-	m_nodes.emplace_back(make_shared<ControlFlowNode>());
+	m_nodes.emplace_back(std::make_shared<ControlFlowNode>());
 	return m_nodes.back().get();
 }
 
@@ -230,9 +229,9 @@ ControlFlowSideEffectsCollector::ControlFlowSideEffectsCollector(
 	}
 }
 
-map<YulString, ControlFlowSideEffects> ControlFlowSideEffectsCollector::functionSideEffectsNamed() const
+std::map<YulString, ControlFlowSideEffects> ControlFlowSideEffectsCollector::functionSideEffectsNamed() const
 {
-	map<YulString, ControlFlowSideEffects> result;
+	std::map<YulString, ControlFlowSideEffects> result;
 	for (auto&& [function, sideEffects]: m_functionSideEffects)
 		yulAssert(result.insert({function->name, sideEffects}).second);
 	return result;
diff --git a/libyul/Dialect.cpp b/libyul/Dialect.cpp
index 9ed18a21e0..8440698f13 100644
--- a/libyul/Dialect.cpp
+++ b/libyul/Dialect.cpp
@@ -23,7 +23,6 @@
 #include <libyul/AST.h>
 
 using namespace solidity::yul;
-using namespace std;
 using namespace solidity::langutil;
 
 Literal Dialect::zeroLiteralForType(solidity::yul::YulString _type) const
@@ -52,13 +51,13 @@ bool Dialect::validTypeForLiteral(LiteralKind _kind, YulString, YulString _type)
 
 Dialect const& Dialect::yulDeprecated()
 {
-	static unique_ptr<Dialect> dialect;
+	static std::unique_ptr<Dialect> dialect;
 	static YulStringRepository::ResetCallback callback{[&] { dialect.reset(); }};
 
 	if (!dialect)
 	{
 		// TODO will probably change, especially the list of types.
-		dialect = make_unique<Dialect>();
+		dialect = std::make_unique<Dialect>();
 		dialect->defaultType = "u256"_yulstring;
 		dialect->boolType = "bool"_yulstring;
 		dialect->types = {
diff --git a/libyul/FunctionReferenceResolver.cpp b/libyul/FunctionReferenceResolver.cpp
index 5df94237a3..99e83c2130 100644
--- a/libyul/FunctionReferenceResolver.cpp
+++ b/libyul/FunctionReferenceResolver.cpp
@@ -23,7 +23,6 @@
 
 #include <range/v3/view/reverse.hpp>
 
-using namespace std;
 using namespace solidity::yul;
 using namespace solidity::util;
 
@@ -51,7 +50,7 @@ void FunctionReferenceResolver::operator()(Block const& _block)
 {
 	m_scopes.emplace_back();
 	for (auto const& statement: _block.statements)
-		if (auto const* function = get_if<FunctionDefinition>(&statement))
+		if (auto const* function = std::get_if<FunctionDefinition>(&statement))
 			m_scopes.back()[function->name] = function;
 
 	ASTWalker::operator()(_block);
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 97857aa4ba..83ee66a3b2 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -35,7 +35,6 @@
 
 #include <range/v3/view/transform.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::util;
@@ -44,7 +43,7 @@ using namespace solidity::yul;
 namespace
 {
 
-string indent(std::string const& _input)
+std::string indent(std::string const& _input)
 {
 	if (_input.empty())
 		return _input;
@@ -53,12 +52,12 @@ string indent(std::string const& _input)
 
 }
 
-string Data::toString(Dialect const*, DebugInfoSelection const&, CharStreamProvider const*) const
+std::string Data::toString(Dialect const*, DebugInfoSelection const&, CharStreamProvider const*) const
 {
 	return "data \"" + name.str() + "\" hex\"" + util::toHex(data) + "\"";
 }
 
-string Object::toString(
+std::string Object::toString(
 	Dialect const* _dialect,
 	DebugInfoSelection const& _debugInfoSelection,
 	CharStreamProvider const* _soliditySourceProvider
@@ -67,17 +66,17 @@ string Object::toString(
 	yulAssert(code, "No code");
 	yulAssert(debugData, "No debug data");
 
-	string useSrcComment;
+	std::string useSrcComment;
 
 	if (debugData->sourceNames)
 		useSrcComment =
 			"/// @use-src " +
 			joinHumanReadable(ranges::views::transform(*debugData->sourceNames, [](auto&& _pair) {
-				return to_string(_pair.first) + ":" + util::escapeAndQuoteString(*_pair.second);
+				return std::to_string(_pair.first) + ":" + util::escapeAndQuoteString(*_pair.second);
 			})) +
 			"\n";
 
-	string inner = "code " + AsmPrinter(
+	std::string inner = "code " + AsmPrinter(
 		_dialect,
 		debugData->sourceNames,
 		_debugInfoSelection,
@@ -107,7 +106,7 @@ Json::Value Object::toJson() const
 	codeJson["block"] = AsmJsonConverter(0 /* sourceIndex */)(*code);
 
 	Json::Value subObjectsJson{Json::arrayValue};
-	for (shared_ptr<ObjectNode> const& subObject: subObjects)
+	for (std::shared_ptr<ObjectNode> const& subObject: subObjects)
 		subObjectsJson.append(subObject->toJson());
 
 	Json::Value ret{Json::objectValue};
@@ -118,13 +117,13 @@ Json::Value Object::toJson() const
 	return ret;
 }
 
-set<YulString> Object::qualifiedDataNames() const
+std::set<YulString> Object::qualifiedDataNames() const
 {
-	set<YulString> qualifiedNames =
+	std::set<YulString> qualifiedNames =
 		name.empty() || util::contains(name.str(), '.') ?
-		set<YulString>{} :
-		set<YulString>{name};
-	for (shared_ptr<ObjectNode> const& subObjectNode: subObjects)
+		std::set<YulString>{} :
+		std::set<YulString>{name};
+	for (std::shared_ptr<ObjectNode> const& subObjectNode: subObjects)
 	{
 		yulAssert(qualifiedNames.count(subObjectNode->name) == 0, "");
 		if (util::contains(subObjectNode->name.str(), '.'))
@@ -144,7 +143,7 @@ set<YulString> Object::qualifiedDataNames() const
 	return qualifiedNames;
 }
 
-vector<size_t> Object::pathToSubObject(YulString _qualifiedName) const
+std::vector<size_t> Object::pathToSubObject(YulString _qualifiedName) const
 {
 	yulAssert(_qualifiedName != name, "");
 	yulAssert(subIndexByName.count(name) == 0, "");
@@ -153,12 +152,12 @@ vector<size_t> Object::pathToSubObject(YulString _qualifiedName) const
 		_qualifiedName = YulString{_qualifiedName.str().substr(name.str().length() + 1)};
 	yulAssert(!_qualifiedName.empty(), "");
 
-	vector<string> subObjectPathComponents;
+	std::vector<std::string> subObjectPathComponents;
 	boost::algorithm::split(subObjectPathComponents, _qualifiedName.str(), boost::is_any_of("."));
 
-	vector<size_t> path;
+	std::vector<size_t> path;
 	Object const* object = this;
-	for (string const& currentSubObjectName: subObjectPathComponents)
+	for (std::string const& currentSubObjectName: subObjectPathComponents)
 	{
 		yulAssert(!currentSubObjectName.empty(), "");
 		auto subIndexIt = object->subIndexByName.find(YulString{currentSubObjectName});
@@ -168,7 +167,7 @@ vector<size_t> Object::pathToSubObject(YulString _qualifiedName) const
 		);
 		object = dynamic_cast<Object const*>(object->subObjects[subIndexIt->second].get());
 		yulAssert(object, "Assembly object <" + _qualifiedName.str() + "> not found or does not contain code.");
-		yulAssert(object->subId != numeric_limits<size_t>::max(), "");
+		yulAssert(object->subId != std::numeric_limits<size_t>::max(), "");
 		path.push_back({object->subId});
 	}
 
diff --git a/libyul/ObjectParser.cpp b/libyul/ObjectParser.cpp
index 1a2d8b33a4..2038959de4 100644
--- a/libyul/ObjectParser.cpp
+++ b/libyul/ObjectParser.cpp
@@ -32,27 +32,26 @@
 
 #include <regex>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
 using namespace solidity::langutil;
 
-shared_ptr<Object> ObjectParser::parse(shared_ptr<Scanner> const& _scanner, bool _reuseScanner)
+std::shared_ptr<Object> ObjectParser::parse(std::shared_ptr<Scanner> const& _scanner, bool _reuseScanner)
 {
 	m_recursionDepth = 0;
 	try
 	{
-		shared_ptr<Object> object;
+		std::shared_ptr<Object> object;
 		m_scanner = _scanner;
 
 		if (currentToken() == Token::LBrace)
 		{
 			// Special case: Code-only form.
-			object = make_shared<Object>();
+			object = std::make_shared<Object>();
 			object->name = "object"_yulstring;
 			auto sourceNameMapping = tryParseSourceNameMapping();
-			object->debugData = make_shared<ObjectDebugData>(ObjectDebugData{sourceNameMapping});
+			object->debugData = std::make_shared<ObjectDebugData>(ObjectDebugData{sourceNameMapping});
 			object->code = parseBlock(sourceNameMapping);
 			if (!object->code)
 				return nullptr;
@@ -71,14 +70,14 @@ shared_ptr<Object> ObjectParser::parse(shared_ptr<Scanner> const& _scanner, bool
 	return nullptr;
 }
 
-shared_ptr<Object> ObjectParser::parseObject(Object* _containingObject)
+std::shared_ptr<Object> ObjectParser::parseObject(Object* _containingObject)
 {
 	RecursionGuard guard(*this);
 
-	shared_ptr<Object> ret = make_shared<Object>();
+	std::shared_ptr<Object> ret = std::make_shared<Object>();
 
 	auto sourceNameMapping = tryParseSourceNameMapping();
-	ret->debugData = make_shared<ObjectDebugData>(ObjectDebugData{sourceNameMapping});
+	ret->debugData = std::make_shared<ObjectDebugData>(ObjectDebugData{sourceNameMapping});
 
 	if (currentToken() != Token::Identifier || currentLiteral() != "object")
 		fatalParserError(4294_error, "Expected keyword \"object\".");
@@ -107,7 +106,7 @@ shared_ptr<Object> ObjectParser::parseObject(Object* _containingObject)
 	return ret;
 }
 
-shared_ptr<Block> ObjectParser::parseCode(optional<SourceNameMap> _sourceNames)
+std::shared_ptr<Block> ObjectParser::parseCode(std::optional<SourceNameMap> _sourceNames)
 {
 	if (currentToken() != Token::Identifier || currentLiteral() != "code")
 		fatalParserError(4846_error, "Expected keyword \"code\".");
@@ -116,7 +115,7 @@ shared_ptr<Block> ObjectParser::parseCode(optional<SourceNameMap> _sourceNames)
 	return parseBlock(std::move(_sourceNames));
 }
 
-optional<SourceNameMap> ObjectParser::tryParseSourceNameMapping() const
+std::optional<SourceNameMap> ObjectParser::tryParseSourceNameMapping() const
 {
 	// @use-src 0:"abc.sol", 1:"foo.sol", 2:"bar.sol"
 	//
@@ -131,7 +130,7 @@ optional<SourceNameMap> ObjectParser::tryParseSourceNameMapping() const
 	);
 	std::smatch sm;
 	if (!std::regex_search(m_scanner->currentCommentLiteral(), sm, lineRE))
-		return nullopt;
+		return std::nullopt;
 
 	solAssert(sm.size() == 2, "");
 	auto text = m_scanner->currentCommentLiteral().substr(static_cast<size_t>(sm.position() + sm.length()));
@@ -152,7 +151,7 @@ optional<SourceNameMap> ObjectParser::tryParseSourceNameMapping() const
 			break;
 		if (scanner.next() != Token::StringLiteral)
 			break;
-		sourceNames[*sourceIndex] = make_shared<string const>(scanner.currentLiteral());
+		sourceNames[*sourceIndex] = std::make_shared<std::string const>(scanner.currentLiteral());
 
 		Token const next = scanner.next();
 		if (next == Token::EOS)
@@ -167,13 +166,13 @@ optional<SourceNameMap> ObjectParser::tryParseSourceNameMapping() const
 		m_scanner->currentCommentLocation(),
 		"Error parsing arguments to @use-src. Expected: <number> \":\" \"<filename>\", ..."
 	);
-	return nullopt;
+	return std::nullopt;
 }
 
-shared_ptr<Block> ObjectParser::parseBlock(optional<SourceNameMap> _sourceNames)
+std::shared_ptr<Block> ObjectParser::parseBlock(std::optional<SourceNameMap> _sourceNames)
 {
 	Parser parser(m_errorReporter, m_dialect, std::move(_sourceNames));
-	shared_ptr<Block> block = parser.parseInline(m_scanner);
+	std::shared_ptr<Block> block = parser.parseInline(m_scanner);
 	yulAssert(block || m_errorReporter.hasErrors(), "Invalid block but no error!");
 	return block;
 }
@@ -192,7 +191,7 @@ void ObjectParser::parseData(Object& _containingObject)
 		expectToken(Token::HexStringLiteral, false);
 	else
 		expectToken(Token::StringLiteral, false);
-	addNamedSubObject(_containingObject, name, make_shared<Data>(name, asBytes(currentLiteral())));
+	addNamedSubObject(_containingObject, name, std::make_shared<Data>(name, asBytes(currentLiteral())));
 	advance();
 }
 
@@ -210,7 +209,7 @@ YulString ObjectParser::parseUniqueName(Object const* _containingObject)
 	return name;
 }
 
-void ObjectParser::addNamedSubObject(Object& _container, YulString _name, shared_ptr<ObjectNode> _subObject)
+void ObjectParser::addNamedSubObject(Object& _container, YulString _name, std::shared_ptr<ObjectNode> _subObject)
 {
 	_container.subIndexByName[_name] = _container.subObjects.size();
 	_container.subObjects.emplace_back(std::move(_subObject));
diff --git a/libyul/Scope.cpp b/libyul/Scope.cpp
index 4a9520f985..4471aa5313 100644
--- a/libyul/Scope.cpp
+++ b/libyul/Scope.cpp
@@ -21,7 +21,6 @@
 
 #include <libyul/Scope.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -53,7 +52,7 @@ Scope::Identifier* Scope::lookup(YulString _name)
 		auto id = s->identifiers.find(_name);
 		if (id != s->identifiers.end())
 		{
-			if (crossedFunctionBoundary && holds_alternative<Scope::Variable>(id->second))
+			if (crossedFunctionBoundary && std::holds_alternative<Scope::Variable>(id->second))
 				return nullptr;
 			else
 				return &id->second;
@@ -79,7 +78,7 @@ size_t Scope::numberOfVariables() const
 {
 	size_t count = 0;
 	for (auto const& identifier: identifiers)
-		if (holds_alternative<Scope::Variable>(identifier.second))
+		if (std::holds_alternative<Scope::Variable>(identifier.second))
 			count++;
 	return count;
 }
diff --git a/libyul/ScopeFiller.cpp b/libyul/ScopeFiller.cpp
index 8672d898f2..22c0d17e32 100644
--- a/libyul/ScopeFiller.cpp
+++ b/libyul/ScopeFiller.cpp
@@ -33,7 +33,6 @@
 #include <memory>
 #include <functional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
@@ -60,7 +59,7 @@ bool ScopeFiller::operator()(VariableDeclaration const& _varDecl)
 
 bool ScopeFiller::operator()(FunctionDefinition const& _funDef)
 {
-	auto virtualBlock = m_info.virtualBlocks[&_funDef] = make_shared<Block>();
+	auto virtualBlock = m_info.virtualBlocks[&_funDef] = std::make_shared<Block>();
 	Scope& varScope = scope(virtualBlock.get());
 	varScope.superScope = m_currentScope;
 	m_currentScope = &varScope;
@@ -123,7 +122,7 @@ bool ScopeFiller::operator()(Block const& _block)
 	// First visit all functions to make them create
 	// an entry in the scope according to their visibility.
 	for (auto const& s: _block.statements)
-		if (holds_alternative<FunctionDefinition>(s))
+		if (std::holds_alternative<FunctionDefinition>(s))
 			if (!registerFunction(std::get<FunctionDefinition>(s)))
 				success = false;
 	for (auto const& s: _block.statements)
@@ -151,10 +150,10 @@ bool ScopeFiller::registerVariable(TypedName const& _name, SourceLocation const&
 
 bool ScopeFiller::registerFunction(FunctionDefinition const& _funDef)
 {
-	vector<Scope::YulType> parameters;
+	std::vector<Scope::YulType> parameters;
 	for (auto const& parameter: _funDef.parameters)
 		parameters.emplace_back(parameter.type);
-	vector<Scope::YulType> returns;
+	std::vector<Scope::YulType> returns;
 	for (auto const& returnVariable: _funDef.returnVariables)
 		returns.emplace_back(returnVariable.type);
 	if (!m_currentScope->registerFunction(_funDef.name, std::move(parameters), std::move(returns)))
@@ -174,6 +173,6 @@ Scope& ScopeFiller::scope(Block const* _block)
 {
 	auto& scope = m_info.scopes[_block];
 	if (!scope)
-		scope = make_shared<Scope>();
+		scope = std::make_shared<Scope>();
 	return *scope;
 }
diff --git a/libyul/Utilities.cpp b/libyul/Utilities.cpp
index b458210661..8242553d37 100644
--- a/libyul/Utilities.cpp
+++ b/libyul/Utilities.cpp
@@ -33,16 +33,15 @@
 #include <sstream>
 #include <vector>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::util;
 
-string solidity::yul::reindent(string const& _code)
+std::string solidity::yul::reindent(std::string const& _code)
 {
 	int constexpr indentationWidth = 4;
 
-	auto constexpr static countBraces = [](string const& _s) noexcept -> int
+	auto constexpr static countBraces = [](std::string const& _s) noexcept -> int
 	{
 		auto const i = _s.find("//");
 		auto const e = i == _s.npos ? end(_s) : next(begin(_s), static_cast<ptrdiff_t>(i));
@@ -51,22 +50,22 @@ string solidity::yul::reindent(string const& _code)
 		return int(opening - closing);
 	};
 
-	vector<string> lines;
+	std::vector<std::string> lines;
 	boost::split(lines, _code, boost::is_any_of("\n"));
-	for (string& line: lines)
+	for (std::string& line: lines)
 		boost::trim(line);
 
 	// Reduce multiple consecutive empty lines.
-	lines = fold(lines, vector<string>{}, [](auto&& _lines, auto&& _line) {
+	lines = fold(lines, std::vector<std::string>{}, [](auto&& _lines, auto&& _line) {
 		if (!(_line.empty() && !_lines.empty() && _lines.back().empty()))
 			_lines.emplace_back(std::move(_line));
 		return std::move(_lines);
 	});
 
-	stringstream out;
+	std::stringstream out;
 	int depth = 0;
 
-	for (string const& line: lines)
+	for (std::string const& line: lines)
 	{
 		int const diff = countBraces(line);
 		if (diff < 0)
@@ -91,7 +90,7 @@ u256 solidity::yul::valueOfNumberLiteral(Literal const& _literal)
 {
 	yulAssert(_literal.kind == LiteralKind::Number, "Expected number literal!");
 
-	static map<YulString, u256> numberCache;
+	static std::map<YulString, u256> numberCache;
 	static YulStringRepository::ResetCallback callback{[&] { numberCache.clear(); }};
 
 	auto&& [it, isNew] = numberCache.try_emplace(_literal.value, 0);
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index 66acc3f60e..a5d72c7bb5 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -39,7 +39,6 @@
 
 #include <optional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::langutil;
@@ -63,7 +62,7 @@ Dialect const& languageToDialect(YulStack::Language _language, EVMVersion _versi
 }
 
 
-CharStream const& YulStack::charStream(string const& _sourceName) const
+CharStream const& YulStack::charStream(std::string const& _sourceName) const
 {
 	yulAssert(m_charStream, "");
 	yulAssert(m_charStream->name() == _sourceName, "");
@@ -74,8 +73,8 @@ bool YulStack::parseAndAnalyze(std::string const& _sourceName, std::string const
 {
 	m_errors.clear();
 	m_analysisSuccessful = false;
-	m_charStream = make_unique<CharStream>(_source, _sourceName);
-	shared_ptr<Scanner> scanner = make_shared<Scanner>(*m_charStream);
+	m_charStream = std::make_unique<CharStream>(_source, _sourceName);
+	std::shared_ptr<Scanner> scanner = std::make_shared<Scanner>(*m_charStream);
 	m_parserResult = ObjectParser(m_errorReporter, languageToDialect(m_language, m_evmVersion)).parse(scanner, false);
 	if (!m_errorReporter.errors().empty())
 		return false;
@@ -112,7 +111,7 @@ bool YulStack::analyzeParsed()
 bool YulStack::analyzeParsed(Object& _object)
 {
 	yulAssert(_object.code, "");
-	_object.analysisInfo = make_shared<AsmAnalysisInfo>();
+	_object.analysisInfo = std::make_shared<AsmAnalysisInfo>();
 
 	AsmAnalyzer analyzer(
 		*_object.analysisInfo,
@@ -161,9 +160,9 @@ void YulStack::optimize(Object& _object, bool _isCreation)
 		}
 
 	Dialect const& dialect = languageToDialect(m_language, m_evmVersion);
-	unique_ptr<GasMeter> meter;
+	std::unique_ptr<GasMeter> meter;
 	if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&dialect))
-		meter = make_unique<GasMeter>(*evmDialect, _isCreation, m_optimiserSettings.expectedExecutionsPerDeployment);
+		meter = std::make_unique<GasMeter>(*evmDialect, _isCreation, m_optimiserSettings.expectedExecutionsPerDeployment);
 
 	OptimiserSuite::run(
 		dialect,
@@ -173,7 +172,7 @@ void YulStack::optimize(Object& _object, bool _isCreation)
 		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.optimizeStackAllocation : true,
 		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.yulOptimiserSteps : "u",
 		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.yulOptimiserCleanupSteps : "",
-		_isCreation ? nullopt : make_optional(m_optimiserSettings.expectedExecutionsPerDeployment),
+		_isCreation ? std::nullopt : std::make_optional(m_optimiserSettings.expectedExecutionsPerDeployment),
 		{}
 	);
 }
@@ -195,17 +194,17 @@ MachineAssemblyObject YulStack::assemble(Machine _machine) const
 }
 
 std::pair<MachineAssemblyObject, MachineAssemblyObject>
-YulStack::assembleWithDeployed(optional<string_view> _deployName) const
+YulStack::assembleWithDeployed(std::optional<std::string_view> _deployName) const
 {
 	auto [creationAssembly, deployedAssembly] = assembleEVMWithDeployed(_deployName);
 	yulAssert(creationAssembly, "");
 	yulAssert(m_charStream, "");
 
 	MachineAssemblyObject creationObject;
-	creationObject.bytecode = make_shared<evmasm::LinkerObject>(creationAssembly->assemble());
+	creationObject.bytecode = std::make_shared<evmasm::LinkerObject>(creationAssembly->assemble());
 	yulAssert(creationObject.bytecode->immutableReferences.empty(), "Leftover immutables.");
 	creationObject.assembly = creationAssembly->assemblyString(m_debugInfoSelection);
-	creationObject.sourceMappings = make_unique<string>(
+	creationObject.sourceMappings = std::make_unique<std::string>(
 		evmasm::AssemblyItem::computeSourceMapping(
 			creationAssembly->items(),
 			{{m_charStream->name(), 0}}
@@ -215,9 +214,9 @@ YulStack::assembleWithDeployed(optional<string_view> _deployName) const
 	MachineAssemblyObject deployedObject;
 	if (deployedAssembly)
 	{
-		deployedObject.bytecode = make_shared<evmasm::LinkerObject>(deployedAssembly->assemble());
+		deployedObject.bytecode = std::make_shared<evmasm::LinkerObject>(deployedAssembly->assemble());
 		deployedObject.assembly = deployedAssembly->assemblyString(m_debugInfoSelection);
-		deployedObject.sourceMappings = make_unique<string>(
+		deployedObject.sourceMappings = std::make_unique<std::string>(
 			evmasm::AssemblyItem::computeSourceMapping(
 				deployedAssembly->items(),
 				{{m_charStream->name(), 0}}
@@ -229,7 +228,7 @@ YulStack::assembleWithDeployed(optional<string_view> _deployName) const
 }
 
 std::pair<std::shared_ptr<evmasm::Assembly>, std::shared_ptr<evmasm::Assembly>>
-YulStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
+YulStack::assembleEVMWithDeployed(std::optional<std::string_view> _deployName) const
 {
 	yulAssert(m_analysisSuccessful, "");
 	yulAssert(m_parserResult, "");
@@ -250,7 +249,7 @@ YulStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
 
 	assembly.optimise(evmasm::Assembly::OptimiserSettings::translateSettings(m_optimiserSettings, m_evmVersion));
 
-	optional<size_t> subIndex;
+	std::optional<size_t> subIndex;
 
 	// Pick matching assembly if name was given
 	if (_deployName.has_value())
@@ -271,13 +270,13 @@ YulStack::assembleEVMWithDeployed(optional<string_view> _deployName) const
 	if (subIndex.has_value())
 	{
 		evmasm::Assembly& runtimeAssembly = assembly.sub(*subIndex);
-		return {make_shared<evmasm::Assembly>(assembly), make_shared<evmasm::Assembly>(runtimeAssembly)};
+		return {std::make_shared<evmasm::Assembly>(assembly), std::make_shared<evmasm::Assembly>(runtimeAssembly)};
 	}
 
-	return {make_shared<evmasm::Assembly>(assembly), {}};
+	return {std::make_shared<evmasm::Assembly>(assembly), {}};
 }
 
-string YulStack::print(
+std::string YulStack::print(
 	CharStreamProvider const* _soliditySourceProvider
 ) const
 {
@@ -293,7 +292,7 @@ Json::Value YulStack::astJson() const
 	return  m_parserResult->toJson();
 }
 
-shared_ptr<Object> YulStack::parserResult() const
+std::shared_ptr<Object> YulStack::parserResult() const
 {
 	yulAssert(m_analysisSuccessful, "Analysis was not successful.");
 	yulAssert(m_parserResult, "");
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 09b17ce7d6..d5aa66e202 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -34,6 +34,7 @@ NAMESPACE_STD_FREE_FILES=(
     libsolidity/lsp/*
     libsolidity/parsing/*
     libsolutil/*
+    libyul/*
     libyul/backends/evm/*
     libyul/optimiser/*
     solc/*

From b3230b0bdc4f06cb73d5e6b556fcbf29a84e370a Mon Sep 17 00:00:00 2001
From: Paul <41552663+molecula451@users.noreply.github.com>
Date: Wed, 30 Aug 2023 00:08:06 +0000
Subject: [PATCH 1586/1748] deprecate using namespace std
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

test: updat filereader test

deprecate namespace std

deprecate namespace std

deprecate namespace std

deprecate namespace std

deprecate namespace std

deprecate namespace std

deprecate namespace std

deprecate namespace std

deprecated std namespace

deprecated std namespace

deprecated std namespace

deprecated std namespace

deprecated std namespace

deprecated std namespace

deprecated std namespace

deprecated std namespace

deprecated std namespace

depecrate namespace std

deprecated namespace std

check ci

clean line

Co-authored-by: Nikola Matić <nikola.matic@ethereum.org>

purge line

pure line

deprecate std

deprecate std

deprecate std

deprecate std

deprecate std

deprecate

deprecate std

bye namespace
---
 scripts/check_style.sh                        |   7 +
 test/contracts/AuctionRegistrar.cpp           |  39 +-
 test/contracts/Wallet.cpp                     |   5 +-
 test/libevmasm/Assembler.cpp                  |  76 +--
 test/libevmasm/Optimiser.cpp                  |  17 +-
 test/liblangutil/CharStream.cpp               |  35 +-
 test/liblangutil/Scanner.cpp                  |  42 +-
 test/libsolidity/ABIDecoderTests.cpp          |  43 +-
 test/libsolidity/ABIEncoderTests.cpp          |  95 ++--
 test/libsolidity/ABIJsonTest.cpp              |   9 +-
 test/libsolidity/ABITestsCommon.h             |   4 +-
 test/libsolidity/ASTJSONTest.cpp              | 112 ++---
 test/libsolidity/ASTPropertyTest.cpp          |  38 +-
 test/libsolidity/AnalysisFramework.cpp        |  21 +-
 test/libsolidity/Assembly.cpp                 |  49 +-
 test/libsolidity/ErrorCheck.cpp               |  15 +-
 test/libsolidity/GasCosts.cpp                 |   3 +-
 test/libsolidity/GasMeter.cpp                 |  35 +-
 test/libsolidity/GasTest.cpp                  |  27 +-
 test/libsolidity/Imports.cpp                  |  11 +-
 test/libsolidity/InlineAssembly.cpp           |  21 +-
 test/libsolidity/LibSolc.cpp                  |  25 +-
 test/libsolidity/MemoryGuardTest.cpp          |   7 +-
 test/libsolidity/Metadata.cpp                 |  55 ++-
 test/libsolidity/SMTCheckerTest.cpp           |  31 +-
 test/libsolidity/SemVerMatcher.cpp            |  13 +-
 test/libsolidity/SemanticTest.cpp             | 146 +++---
 test/libsolidity/SolidityCompiler.cpp         |   1 -
 test/libsolidity/SolidityEndToEndTest.cpp     | 155 +++---
 .../SolidityExecutionFramework.cpp            |  21 +-
 .../SolidityExpressionCompiler.cpp            |  21 +-
 .../SolidityNameAndTypeResolution.cpp         |   1 -
 test/libsolidity/SolidityOptimizer.cpp        |   7 +-
 test/libsolidity/ViewPureChecker.cpp          |  13 +-
 .../analysis/FunctionCallGraph.cpp            | 454 +++++++++---------
 test/libsolidity/interface/FileReader.cpp     |   7 +-
 test/libsolutil/Checksum.cpp                  |   7 +-
 test/libsolutil/CommonData.cpp                |   1 -
 test/libsolutil/CommonIO.cpp                  |  11 +-
 test/libsolutil/FixedHash.cpp                 |   1 -
 test/libsolutil/FunctionSelector.cpp          |   1 -
 test/libsolutil/IndentedWriter.cpp            |   1 -
 test/libsolutil/IpfsHash.cpp                  |  23 +-
 test/libsolutil/IterateReplacing.cpp          |  37 +-
 test/libsolutil/JSON.cpp                      |   3 +-
 test/libsolutil/Keccak256.cpp                 |   1 -
 test/libsolutil/LEB128.cpp                    |   1 -
 test/libsolutil/StringUtils.cpp               |  31 +-
 test/libsolutil/SwarmHash.cpp                 |  27 +-
 test/libsolutil/TemporaryDirectoryTest.cpp    |   5 +-
 test/libsolutil/UTF8.cpp                      |   7 +-
 test/libsolutil/Whiskers.cpp                  |  71 ++-
 52 files changed, 926 insertions(+), 963 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index d5aa66e202..dd1f583489 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -38,6 +38,13 @@ NAMESPACE_STD_FREE_FILES=(
     libyul/backends/evm/*
     libyul/optimiser/*
     solc/*
+    test/contracts/*
+    test/libevmasm/*
+    test/liblangutil/*
+    test/libsolutil/*
+    test/libsolidity/*
+    test/libsolidity/analysis/*
+    test/libsolidity/interface/*
 )
 
 (
diff --git a/test/contracts/AuctionRegistrar.cpp b/test/contracts/AuctionRegistrar.cpp
index dba13ee6d4..8d0b1ccb64 100644
--- a/test/contracts/AuctionRegistrar.cpp
+++ b/test/contracts/AuctionRegistrar.cpp
@@ -32,7 +32,6 @@
 #include <string>
 #include <optional>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::test;
@@ -235,47 +234,47 @@ class AuctionRegistrarTestFramework: public SolidityExecutionFramework
 	{
 	public:
 		RegistrarInterface(SolidityExecutionFramework& _framework): ContractInterface(_framework) {}
-		void reserve(string const& _name)
+		void reserve(std::string const& _name)
 		{
 			callString("reserve", _name);
 		}
-		h160 owner(string const& _name)
+		h160 owner(std::string const& _name)
 		{
 			return callStringReturnsAddress("owner", _name);
 		}
-		void setAddress(string const& _name, h160 const& _address, bool _primary)
+		void setAddress(std::string const& _name, h160 const& _address, bool _primary)
 		{
 			callStringAddressBool("setAddress", _name, _address, _primary);
 		}
-		h160 addr(string const& _name)
+		h160 addr(std::string const& _name)
 		{
 			return callStringReturnsAddress("addr", _name);
 		}
-		string name(h160 const& _addr)
+		std::string name(h160 const& _addr)
 		{
 			return callAddressReturnsString("name", _addr);
 		}
-		void setSubRegistrar(string const& _name, h160 const& _address)
+		void setSubRegistrar(std::string const& _name, h160 const& _address)
 		{
 			callStringAddress("setSubRegistrar", _name, _address);
 		}
-		h160 subRegistrar(string const& _name)
+		h160 subRegistrar(std::string const& _name)
 		{
 			return callStringReturnsAddress("subRegistrar", _name);
 		}
-		void setContent(string const& _name, h256 const& _content)
+		void setContent(std::string const& _name, h256 const& _content)
 		{
 			callStringBytes32("setContent", _name, _content);
 		}
-		h256 content(string const& _name)
+		h256 content(std::string const& _name)
 		{
 			return callStringReturnsBytes32("content", _name);
 		}
-		void transfer(string const& _name, h160 const& _target)
+		void transfer(std::string const& _name, h160 const& _target)
 		{
 			return callStringAddress("transfer", _name, _target);
 		}
-		void disown(string const& _name)
+		void disown(std::string const& _name)
 		{
 			return callString("disown", _name);
 		}
@@ -298,7 +297,7 @@ BOOST_AUTO_TEST_CASE(reserve)
 {
 	// Test that reserving works for long strings
 	deployRegistrar();
-	vector<string> names{"abcabcabcabcabc", "defdefdefdefdef", "ghighighighighighighighighighighighighighighi"};
+	std::vector<std::string> names{"abcabcabcabcabc", "defdefdefdefdef", "ghighighighighighighighighighighighighighighi"};
 
 	RegistrarInterface registrar(*this);
 
@@ -317,7 +316,7 @@ BOOST_AUTO_TEST_CASE(double_reserve_long)
 {
 	// Test that it is not possible to re-reserve from a different address.
 	deployRegistrar();
-	string name = "abcabcabcabcabcabcabcabcabcabca";
+	std::string name = "abcabcabcabcabcabcabcabcabcabca";
 	RegistrarInterface registrar(*this);
 	registrar.reserve(name);
 	BOOST_CHECK_EQUAL(registrar.owner(name), m_sender);
@@ -333,10 +332,10 @@ BOOST_AUTO_TEST_CASE(properties)
 	// Test setting and retrieving  the various properties works.
 	deployRegistrar();
 	RegistrarInterface registrar(*this);
-	string names[] = {"abcaeouoeuaoeuaoeu", "defncboagufra,fui", "ghagpyajfbcuajouhaeoi"};
+	std::string names[] = {"abcaeouoeuaoeuaoeu", "defncboagufra,fui", "ghagpyajfbcuajouhaeoi"};
 	size_t addr = 0x9872543;
 	size_t count = 1;
-	for (string const& name: names)
+	for (std::string const& name: names)
 	{
 		m_sender = account(0);
 		sendEther(account(count), u256(20) * ether);
@@ -369,7 +368,7 @@ BOOST_AUTO_TEST_CASE(properties)
 BOOST_AUTO_TEST_CASE(transfer)
 {
 	deployRegistrar();
-	string name = "abcaoeguaoucaeoduceo";
+	std::string name = "abcaoeguaoucaeoduceo";
 	RegistrarInterface registrar(*this);
 	registrar.reserve(name);
 	registrar.setContent(name, h256(u256(123)));
@@ -381,7 +380,7 @@ BOOST_AUTO_TEST_CASE(transfer)
 BOOST_AUTO_TEST_CASE(disown)
 {
 	deployRegistrar();
-	string name = "abcaoeguaoucaeoduceo";
+	std::string name = "abcaoeguaoucaeoduceo";
 
 	RegistrarInterface registrar(*this);
 	registrar.reserve(name);
@@ -408,7 +407,7 @@ BOOST_AUTO_TEST_CASE(disown)
 BOOST_AUTO_TEST_CASE(auction_simple)
 {
 	deployRegistrar();
-	string name = "x";
+	std::string name = "x";
 
 	RegistrarInterface registrar(*this);
 	// initiate auction
@@ -426,7 +425,7 @@ BOOST_AUTO_TEST_CASE(auction_simple)
 BOOST_AUTO_TEST_CASE(auction_bidding)
 {
 	deployRegistrar();
-	string name = "x";
+	std::string name = "x";
 
 	unsigned startTime = 0x776347e2;
 	m_evmcHost->tx_context.block_timestamp = startTime;
diff --git a/test/contracts/Wallet.cpp b/test/contracts/Wallet.cpp
index 63a4bfc31e..db9119deeb 100644
--- a/test/contracts/Wallet.cpp
+++ b/test/contracts/Wallet.cpp
@@ -38,7 +38,6 @@
 
 #include <test/libsolidity/SolidityExecutionFramework.h>
 
-using namespace std;
 using namespace solidity::test;
 using namespace solidity::util;
 
@@ -445,7 +444,7 @@ class WalletTestFramework: public SolidityExecutionFramework
 protected:
 	void deployWallet(
 		u256 const& _value = 0,
-		vector<h160> const& _owners = vector<h160>{},
+		std::vector<h160> const& _owners = std::vector<h160>{},
 		u256 _required = 1,
 		u256 _dailyLimit = 0
 	)
@@ -535,7 +534,7 @@ BOOST_AUTO_TEST_CASE(remove_owner)
 
 BOOST_AUTO_TEST_CASE(initial_owners)
 {
-	vector<h160> owners{
+	std::vector<h160> owners{
 		h160("0x42c56279432962a17176998a4747d1b4d6ed4367"),
 		h160("0xd4d4669f5ba9f4c27d38ef02a358c339b5560c47"),
 		h160("0xe6716f9544a56c530d868e4bfbacb172315bdead"),
diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index febe4a59b7..512a7bb924 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -34,9 +34,9 @@
 #include <string>
 #include <tuple>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::evmasm;
+using namespace std::string_literals;
 
 namespace solidity::frontend::test
 {
@@ -55,34 +55,34 @@ BOOST_AUTO_TEST_SUITE(Assembler)
 
 BOOST_AUTO_TEST_CASE(all_assembly_items)
 {
-	map<string, unsigned> indices = {
+	std::map<std::string, unsigned> indices = {
 		{ "root.asm", 0 },
 		{ "sub.asm", 1 },
 		{ "verbatim.asm", 2 }
 	};
 	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
 	Assembly _assembly{evmVersion, false, {}};
-	auto root_asm = make_shared<string>("root.asm");
+	auto root_asm = std::make_shared<std::string>("root.asm");
 	_assembly.setSourceLocation({1, 3, root_asm});
 
 	Assembly _subAsm{evmVersion, false, {}};
-	auto sub_asm = make_shared<string>("sub.asm");
+	auto sub_asm = std::make_shared<std::string>("sub.asm");
 	_subAsm.setSourceLocation({6, 8, sub_asm});
 
 	Assembly _verbatimAsm(evmVersion, true, "");
-	auto verbatim_asm = make_shared<string>("verbatim.asm");
+	auto verbatim_asm = std::make_shared<std::string>("verbatim.asm");
 	_verbatimAsm.setSourceLocation({8, 18, verbatim_asm});
 
 	// PushImmutable
 	_subAsm.appendImmutable("someImmutable");
 	_subAsm.append(AssemblyItem(PushTag, 0));
 	_subAsm.append(Instruction::INVALID);
-	shared_ptr<Assembly> _subAsmPtr = make_shared<Assembly>(_subAsm);
+	std::shared_ptr<Assembly> _subAsmPtr = std::make_shared<Assembly>(_subAsm);
 
 	_verbatimAsm.appendVerbatim({0xff,0xff}, 0, 0);
 	_verbatimAsm.appendVerbatim({0x74, 0x65, 0x73, 0x74}, 0, 1);
 	_verbatimAsm.append(Instruction::MSTORE);
-	shared_ptr<Assembly> _verbatimAsmPtr = make_shared<Assembly>(_verbatimAsm);
+	std::shared_ptr<Assembly> _verbatimAsmPtr = std::make_shared<Assembly>(_verbatimAsm);
 
 	// Tag
 	auto tag = _assembly.newTag();
@@ -177,7 +177,7 @@ BOOST_AUTO_TEST_CASE(all_assembly_items)
 		"\n"
 		"auxdata: 0x4266eeaa\n"
 	);
-	string json{
+	std::string json{
 		"{\".auxdata\":\"4266eeaa\",\".code\":["
 		"{\"begin\":1,\"end\":3,\"name\":\"tag\",\"source\":0,\"value\":\"1\"},"
 		"{\"begin\":1,\"end\":3,\"name\":\"JUMPDEST\",\"source\":0},"
@@ -221,11 +221,11 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 	// Tests for 1, 2, 3 number of immutables.
 	for (int numImmutables = 1; numImmutables <= 3; ++numImmutables)
 	{
-		BOOST_TEST_MESSAGE("NumImmutables: "s + to_string(numImmutables));
+		BOOST_TEST_MESSAGE("NumImmutables: "s + std::to_string(numImmutables));
 		// Tests for the cases 1, 2, 3 occurrences of an immutable reference.
 		for (int numActualRefs = 1; numActualRefs <= 3; ++numActualRefs)
 		{
-			BOOST_TEST_MESSAGE("NumActualRefs: "s + to_string(numActualRefs));
+			BOOST_TEST_MESSAGE("NumActualRefs: "s + std::to_string(numActualRefs));
 			auto const NumExpectedMappings =
 				(
 					2 +                        // PUSH <a> PUSH <b>
@@ -238,21 +238,21 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 				NumSubs +                  // PUSH <addr> for every sub assembly
 				1;                         // INVALID
 
-			auto assemblyName = make_shared<string>("root.asm");
-			auto subName = make_shared<string>("sub.asm");
+			auto assemblyName = std::make_shared<std::string>("root.asm");
+			auto subName = std::make_shared<std::string>("sub.asm");
 
-			map<string, unsigned> indices = {
+			std::map<std::string, unsigned> indices = {
 				{ *assemblyName, 0 },
 				{ *subName, 1 }
 			};
 
-			auto subAsm = make_shared<Assembly>(evmVersion, false, string{});
+			auto subAsm = std::make_shared<Assembly>(evmVersion, false, std::string{});
 			for (char i = 0; i < numImmutables; ++i)
 			{
 				for (int r = 0; r < numActualRefs; ++r)
 				{
 					subAsm->setSourceLocation(SourceLocation{10*i, 10*i + 6 + r, subName});
-					subAsm->appendImmutable(string(1, char('a' + i))); // "a", "b", ...
+					subAsm->appendImmutable(std::string(1, char('a' + i))); // "a", "b", ...
 				}
 			}
 
@@ -262,34 +262,34 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 				assembly.setSourceLocation({10*i, 10*i + 3+i, assemblyName});
 				assembly.append(u256(0x71));              // immutble value
 				assembly.append(u256(0));                 // target... modules?
-				assembly.appendImmutableAssignment(string(1, char('a' + i - 1)));
+				assembly.appendImmutableAssignment(std::string(1, char('a' + i - 1)));
 			}
 
 			assembly.appendSubroutine(subAsm);
 
 			checkCompilation(assembly);
 
-			string const sourceMappings = AssemblyItem::computeSourceMapping(assembly.items(), indices);
+			std::string const sourceMappings = AssemblyItem::computeSourceMapping(assembly.items(), indices);
 			auto const numberOfMappings = std::count(sourceMappings.begin(), sourceMappings.end(), ';');
 
 			LinkerObject const& obj = assembly.assemble();
-			string const disassembly = disassemble(obj.bytecode, evmVersion, "\n");
+			std::string const disassembly = disassemble(obj.bytecode, evmVersion, "\n");
 			auto const numberOfOpcodes = std::count(disassembly.begin(), disassembly.end(), '\n');
 
 			#if 0 // {{{ debug prints
 			{
 				LinkerObject const& subObj = assembly.sub(0).assemble();
-				string const subDisassembly = disassemble(subObj.bytecode, "\n");
-				cout << '\n';
-				cout << "### immutables: " << numImmutables << ", refs: " << numActualRefs << '\n';
-				cout << " - srcmap: \"" << sourceMappings << "\"\n";
-				cout << " - src mappings: " << numberOfMappings << '\n';
-				cout << " - opcodes: " << numberOfOpcodes << '\n';
-				cout << " - subs: " << assembly.numSubs() << '\n';
-				cout << " - sub opcodes " << std::count(subDisassembly.begin(), subDisassembly.end(), '\n') << '\n';
-				cout << " - sub srcmaps " << AssemblyItem::computeSourceMapping(subAsm->items(), indices) << '\n';
-				cout << " - main bytecode:\n\t" << disassemble(obj.bytecode, "\n\t");
-				cout << "\r - sub bytecode:\n\t" << disassemble(subObj.bytecode, "\n\t");
+				std::string const subDisassembly = disassemble(subObj.bytecode, "\n");
+				std::cout << '\n';
+				std::cout << "### immutables: " << numImmutables << ", refs: " << numActualRefs << '\n';
+				std::cout << " - srcmap: \"" << sourceMappings << "\"\n";
+				std::cout << " - src mappings: " << numberOfMappings << '\n';
+				std::cout << " - opcodes: " << numberOfOpcodes << '\n';
+				std::cout << " - subs: " << assembly.numSubs() << '\n';
+				std::cout << " - sub opcodes " << std::count(subDisassembly.begin(), subDisassembly.end(), '\n') << '\n';
+				std::cout << " - sub srcmaps " << AssemblyItem::computeSourceMapping(subAsm->items(), indices) << '\n';
+				std::cout << " - main bytecode:\n\t" << disassemble(obj.bytecode, "\n\t");
+				std::cout << "\r - sub bytecode:\n\t" << disassemble(subObj.bytecode, "\n\t");
 			}
 			#endif // }}}
 
@@ -301,22 +301,22 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 
 BOOST_AUTO_TEST_CASE(immutable)
 {
-	map<string, unsigned> indices = {
+	std::map<std::string, unsigned> indices = {
 		{ "root.asm", 0 },
 		{ "sub.asm", 1 }
 	};
 	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
 	Assembly _assembly{evmVersion, true, {}};
-	auto root_asm = make_shared<string>("root.asm");
+	auto root_asm = std::make_shared<std::string>("root.asm");
 	_assembly.setSourceLocation({1, 3, root_asm});
 
 	Assembly _subAsm{evmVersion, false, {}};
-	auto sub_asm = make_shared<string>("sub.asm");
+	auto sub_asm = std::make_shared<std::string>("sub.asm");
 	_subAsm.setSourceLocation({6, 8, sub_asm});
 	_subAsm.appendImmutable("someImmutable");
 	_subAsm.appendImmutable("someOtherImmutable");
 	_subAsm.appendImmutable("someImmutable");
-	shared_ptr<Assembly> _subAsmPtr = make_shared<Assembly>(_subAsm);
+	std::shared_ptr<Assembly> _subAsmPtr = std::make_shared<Assembly>(_subAsm);
 
 	_assembly.append(u256(42));
 	_assembly.append(u256(0));
@@ -330,9 +330,9 @@ BOOST_AUTO_TEST_CASE(immutable)
 
 	checkCompilation(_assembly);
 
-	string genericPush0 = evmVersion.hasPush0() ? "5f" : "6000";
+	std::string genericPush0 = evmVersion.hasPush0() ? "5f" : "6000";
 	// PUSH1 0x1b v/s PUSH1 0x19
-	string dataOffset = evmVersion.hasPush0() ? "6019" : "601b" ;
+	std::string dataOffset = evmVersion.hasPush0() ? "6019" : "601b" ;
 
 	BOOST_CHECK_EQUAL(
 		_assembly.assemble().toHex(),
@@ -406,8 +406,8 @@ BOOST_AUTO_TEST_CASE(subobject_encode_decode)
 	EVMVersion evmVersion = solidity::test::CommonOptions::get().evmVersion();
 	Assembly assembly{evmVersion, true, {}};
 
-	shared_ptr<Assembly> subAsmPtr = make_shared<Assembly>(evmVersion, false, string{});
-	shared_ptr<Assembly> subSubAsmPtr = make_shared<Assembly>(evmVersion, false, string{});
+	std::shared_ptr<Assembly> subAsmPtr = std::make_shared<Assembly>(evmVersion, false, std::string{});
+	std::shared_ptr<Assembly> subSubAsmPtr = std::make_shared<Assembly>(evmVersion, false, std::string{});
 
 	assembly.appendSubroutine(subAsmPtr);
 	subAsmPtr->appendSubroutine(subSubAsmPtr);
@@ -416,7 +416,7 @@ BOOST_AUTO_TEST_CASE(subobject_encode_decode)
 	BOOST_REQUIRE_THROW(assembly.encodeSubPath({1}), solidity::evmasm::AssemblyException);
 	BOOST_REQUIRE_THROW(assembly.decodeSubPath(1), solidity::evmasm::AssemblyException);
 
-	vector<size_t> subPath{0, 0};
+	std::vector<size_t> subPath{0, 0};
 	BOOST_CHECK(assembly.decodeSubPath(assembly.encodeSubPath(subPath)) == subPath);
 }
 
diff --git a/test/libevmasm/Optimiser.cpp b/test/libevmasm/Optimiser.cpp
index 6f1a137599..e1795d391c 100644
--- a/test/libevmasm/Optimiser.cpp
+++ b/test/libevmasm/Optimiser.cpp
@@ -39,7 +39,6 @@
 #include <tuple>
 #include <memory>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::evmasm;
 
@@ -874,7 +873,7 @@ BOOST_AUTO_TEST_CASE(block_deduplicator)
 	BlockDeduplicator deduplicator(input);
 	deduplicator.deduplicate();
 
-	set<u256> pushTags;
+	std::set<u256> pushTags;
 	for (AssemblyItem const& item: input)
 		if (item.type() == PushTag)
 			pushTags.insert(item.data());
@@ -968,7 +967,7 @@ BOOST_AUTO_TEST_CASE(block_deduplicator_loops)
 	BlockDeduplicator deduplicator(input);
 	deduplicator.deduplicate();
 
-	set<u256> pushTags;
+	std::set<u256> pushTags;
 	for (AssemblyItem const& item: input)
 		if (item.type() == PushTag)
 			pushTags.insert(item.data());
@@ -1051,7 +1050,7 @@ BOOST_AUTO_TEST_CASE(peephole_pop_calldatasize)
 
 BOOST_AUTO_TEST_CASE(peephole_commutative_swap1)
 {
-	vector<Instruction> ops{
+	std::vector<Instruction> ops{
 		Instruction::ADD,
 		Instruction::MUL,
 		Instruction::EQ,
@@ -1088,7 +1087,7 @@ BOOST_AUTO_TEST_CASE(peephole_commutative_swap1)
 BOOST_AUTO_TEST_CASE(peephole_noncommutative_swap1)
 {
 	// NOTE: not comprehensive
-	vector<Instruction> ops{
+	std::vector<Instruction> ops{
 		Instruction::SUB,
 		Instruction::DIV,
 		Instruction::SDIV,
@@ -1125,7 +1124,7 @@ BOOST_AUTO_TEST_CASE(peephole_noncommutative_swap1)
 
 BOOST_AUTO_TEST_CASE(peephole_swap_comparison)
 {
-	map<Instruction, Instruction> swappableOps{
+	std::map<Instruction, Instruction> swappableOps{
 		{ Instruction::LT, Instruction::GT },
 		{ Instruction::GT, Instruction::LT },
 		{ Instruction::SLT, Instruction::SGT },
@@ -1261,7 +1260,7 @@ BOOST_AUTO_TEST_CASE(jumpdest_removal_subassemblies)
 	settings.expectedExecutionsPerDeployment = OptimiserSettings{}.expectedExecutionsPerDeployment;
 
 	Assembly main{settings.evmVersion, false, {}};
-	AssemblyPointer sub = make_shared<Assembly>(settings.evmVersion, true, string{});
+	AssemblyPointer sub = std::make_shared<Assembly>(settings.evmVersion, true, std::string{});
 
 	sub->append(u256(1));
 	auto t1 = sub->newTag();
@@ -1428,7 +1427,7 @@ BOOST_AUTO_TEST_CASE(verbatim_knownstate)
 			Instruction::DUP3,
 			Instruction::DUP4
 		});
-	map<int, unsigned> const& stackElements = state.stackElements();
+	std::map<int, unsigned> const& stackElements = state.stackElements();
 
 	BOOST_CHECK(state.stackHeight() == 4);
 	// One more than stack height because of the initial unknown element.
@@ -1540,7 +1539,7 @@ BOOST_AUTO_TEST_CASE(cse_remove_redundant_shift_masking)
 
 BOOST_AUTO_TEST_CASE(cse_remove_unwanted_masking_of_address)
 {
-	vector<Instruction> ops{
+	std::vector<Instruction> ops{
 		Instruction::ADDRESS,
 		Instruction::CALLER,
 		Instruction::ORIGIN,
diff --git a/test/liblangutil/CharStream.cpp b/test/liblangutil/CharStream.cpp
index 766a700986..07df23ab6e 100644
--- a/test/liblangutil/CharStream.cpp
+++ b/test/liblangutil/CharStream.cpp
@@ -28,7 +28,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::test;
 
 namespace boost::test_tools::tt_detail
@@ -39,16 +38,16 @@ struct print_log_value<std::optional<int>>
 {
 	void operator()(std::ostream& _out, std::optional<int> const& _value) const
 	{
-		_out << (_value ? to_string(*_value) : "[nullopt]");
+		_out << (_value ? to_string(*_value) : "[std::nullopt]");
 	}
 };
 
 template<>
-struct print_log_value<nullopt_t>
+struct print_log_value<std::nullopt_t>
 {
-	void operator()(std::ostream& _out, nullopt_t const&) const
+	void operator()(std::ostream& _out, std::nullopt_t const&) const
 	{
-		_out << "[nullopt]";
+		_out << "[std::nullopt]";
 	}
 };
 
@@ -77,7 +76,7 @@ BOOST_AUTO_TEST_CASE(test_fail)
 
 namespace
 {
-std::optional<int> toPosition(int _line, int _column, string const& _text)
+std::optional<int> toPosition(int _line, int _column, std::string const& _text)
 {
 	return CharStream{_text, "source"}.translateLineColumnToPosition(
 		LineColumn{_line, _column}
@@ -88,30 +87,30 @@ std::optional<int> toPosition(int _line, int _column, string const& _text)
 
 BOOST_AUTO_TEST_CASE(translateLineColumnToPosition)
 {
-	BOOST_CHECK_EQUAL(toPosition(-1, 0, "ABC"), nullopt);
-	BOOST_CHECK_EQUAL(toPosition(0, -1, "ABC"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(-1, 0, "ABC"), std::nullopt);
+	BOOST_CHECK_EQUAL(toPosition(0, -1, "ABC"), std::nullopt);
 
 	BOOST_CHECK_EQUAL(toPosition(0, 0, ""), 0);
-	BOOST_CHECK_EQUAL(toPosition(1, 0, ""), nullopt);
-	BOOST_CHECK_EQUAL(toPosition(0, 1, ""), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(1, 0, ""), std::nullopt);
+	BOOST_CHECK_EQUAL(toPosition(0, 1, ""), std::nullopt);
 
 	// With last line containing no LF
 	BOOST_CHECK_EQUAL(toPosition(0, 0, "ABC"), 0);
 	BOOST_CHECK_EQUAL(toPosition(0, 1, "ABC"), 1);
 	BOOST_CHECK_EQUAL(toPosition(0, 2, "ABC"), 2);
 	BOOST_CHECK_EQUAL(toPosition(0, 3, "ABC"), 3);
-	BOOST_CHECK_EQUAL(toPosition(0, 4, "ABC"), nullopt);
-	BOOST_CHECK_EQUAL(toPosition(1, 0, "ABC"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(0, 4, "ABC"), std::nullopt);
+	BOOST_CHECK_EQUAL(toPosition(1, 0, "ABC"), std::nullopt);
 
 	BOOST_CHECK_EQUAL(toPosition(0, 3, "ABC\nDEF"), 3);
-	BOOST_CHECK_EQUAL(toPosition(0, 4, "ABC\nDEF"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(0, 4, "ABC\nDEF"), std::nullopt);
 	BOOST_CHECK_EQUAL(toPosition(1, 0, "ABC\nDEF"), 4);
 	BOOST_CHECK_EQUAL(toPosition(1, 1, "ABC\nDEF"), 5);
 	BOOST_CHECK_EQUAL(toPosition(1, 2, "ABC\nDEF"), 6);
 	BOOST_CHECK_EQUAL(toPosition(1, 3, "ABC\nDEF"), 7);
-	BOOST_CHECK_EQUAL(toPosition(1, 4, "ABC\nDEF"), nullopt);
-	BOOST_CHECK_EQUAL(toPosition(2, 0, "ABC\nDEF"), nullopt);
-	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(1, 4, "ABC\nDEF"), std::nullopt);
+	BOOST_CHECK_EQUAL(toPosition(2, 0, "ABC\nDEF"), std::nullopt);
+	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF"), std::nullopt);
 
 	// With last line containing LF
 	BOOST_CHECK_EQUAL(toPosition(0, 0, "ABC\nDEF\n"), 0);
@@ -122,9 +121,9 @@ BOOST_AUTO_TEST_CASE(translateLineColumnToPosition)
 	BOOST_CHECK_EQUAL(toPosition(1, 1, "ABC\nDEF\n"), 5);
 	BOOST_CHECK_EQUAL(toPosition(1, 2, "ABC\nDEF\n"), 6);
 	BOOST_CHECK_EQUAL(toPosition(1, 3, "ABC\nDEF\n"), 7);
-	BOOST_CHECK_EQUAL(toPosition(1, 4, "ABC\nDEF\n"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(1, 4, "ABC\nDEF\n"), std::nullopt);
 	BOOST_CHECK_EQUAL(toPosition(2, 0, "ABC\nDEF\n"), 8);
-	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF\n"), nullopt);
+	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF\n"), std::nullopt);
 
 	BOOST_CHECK_EQUAL(toPosition(2, 0, "ABC\nDEF\nGHI\n"), 8);
 	BOOST_CHECK_EQUAL(toPosition(2, 1, "ABC\nDEF\nGHI\n"), 9);
diff --git a/test/liblangutil/Scanner.cpp b/test/liblangutil/Scanner.cpp
index 9e196b0f54..8c961a3bab 100644
--- a/test/liblangutil/Scanner.cpp
+++ b/test/liblangutil/Scanner.cpp
@@ -24,8 +24,8 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::langutil;
+using namespace std::string_literals;
 
 namespace solidity::langutil::test
 {
@@ -89,15 +89,15 @@ BOOST_AUTO_TEST_CASE(assembly_multiple_assign)
 BOOST_AUTO_TEST_CASE(string_printable)
 {
 	for (unsigned v = 0x20; v < 0x7e; v++) {
-		string lit{static_cast<char>(v)};
+		std::string lit{static_cast<char>(v)};
 		// Escape \ and " (since we are quoting with ")
 		if (v == '\\' || v == '"')
-			lit = string{'\\'} + lit;
+			lit = std::string{'\\'} + lit;
 		CharStream stream("  { \"" + lit + "\"", "");
 		Scanner scanner(stream);
 		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
 		BOOST_CHECK_EQUAL(scanner.next(), Token::StringLiteral);
-		BOOST_CHECK_EQUAL(scanner.currentLiteral(), string{static_cast<char>(v)});
+		BOOST_CHECK_EQUAL(scanner.currentLiteral(), std::string{static_cast<char>(v)});
 		BOOST_CHECK_EQUAL(scanner.next(), Token::EOS);
 	}
 	// Special case of unescaped " for strings quoted with '
@@ -115,7 +115,7 @@ BOOST_AUTO_TEST_CASE(string_nonprintable)
 		// Skip the valid ones
 		if (v >= 0x20 && v <= 0x7e)
 			continue;
-		string lit{static_cast<char>(v)};
+		std::string lit{static_cast<char>(v)};
 		CharStream stream("  { \"" + lit + "\"", "");
 		Scanner scanner(stream);
 		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::LBrace);
@@ -148,14 +148,14 @@ BOOST_AUTO_TEST_CASE(string_escapes_all)
 
 struct TestScanner
 {
-	unique_ptr<CharStream> stream;
-	unique_ptr<Scanner> scanner;
-	explicit TestScanner(string _text) { reset(std::move(_text)); }
+	std::unique_ptr<CharStream> stream;
+	std::unique_ptr<Scanner> scanner;
+	explicit TestScanner(std::string _text) { reset(std::move(_text)); }
 
 	void reset(std::string _text)
 	{
-		stream = make_unique<CharStream>(std::move(_text), "");
-		scanner = make_unique<Scanner>(*stream);
+		stream = std::make_unique<CharStream>(std::move(_text), "");
+		scanner = std::make_unique<Scanner>(*stream);
 	}
 
 	decltype(auto) currentToken() { return scanner->currentToken(); }
@@ -801,7 +801,7 @@ BOOST_AUTO_TEST_CASE(regular_line_break_in_single_line_comment)
 {
 	for (auto const& nl: {"\r", "\n", "\r\n"})
 	{
-		TestScanner scanner("// abc " + string(nl) + " def ");
+		TestScanner scanner("// abc " + std::string(nl) + " def ");
 		BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "");
 		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
 		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
@@ -813,10 +813,10 @@ BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_single_line_comment)
 {
 	for (auto const& nl: {"\v", "\f", "\xE2\x80\xA8", "\xE2\x80\xA9"})
 	{
-		TestScanner scanner("// abc " + string(nl) + " def ");
+		TestScanner scanner("// abc " + std::string(nl) + " def ");
 		BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "");
 		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-		for (size_t i = 0; i < string(nl).size() - 1; i++)
+		for (size_t i = 0; i < std::string(nl).size() - 1; i++)
 			BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
 		BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
 		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
@@ -828,7 +828,7 @@ BOOST_AUTO_TEST_CASE(regular_line_breaks_in_single_line_doc_comment)
 {
 	for (auto const& nl: {"\r", "\n", "\r\n"})
 	{
-		TestScanner scanner("/// abc " + string(nl) + " def ");
+		TestScanner scanner("/// abc " + std::string(nl) + " def ");
 		BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "abc ");
 		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Identifier);
 		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
@@ -856,10 +856,10 @@ BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_single_line_doc_comment)
 {
 	for (auto const& nl: {"\v", "\f", "\xE2\x80\xA8", "\xE2\x80\xA9"})
 	{
-		TestScanner scanner("/// abc " + string(nl) + " def ");
+		TestScanner scanner("/// abc " + std::string(nl) + " def ");
 		BOOST_CHECK_EQUAL(scanner.currentCommentLiteral(), "abc ");
 		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-		for (size_t i = 0; i < string(nl).size() - 1; i++)
+		for (size_t i = 0; i < std::string(nl).size() - 1; i++)
 			BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
 		BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
 		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
@@ -884,9 +884,9 @@ BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_strings)
 {
 	for (auto const& nl: {"\v", "\f", "\xE2\x80\xA8", "\xE2\x80\xA9"})
 	{
-		TestScanner scanner("\"abc " + string(nl) + " def\"");
+		TestScanner scanner("\"abc " + std::string(nl) + " def\"");
 		BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Illegal);
-		for (size_t i = 0; i < string(nl).size(); i++)
+		for (size_t i = 0; i < std::string(nl).size(); i++)
 			BOOST_CHECK_EQUAL(scanner.next(), Token::Illegal);
 		BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
 		BOOST_CHECK_EQUAL(scanner.currentLiteral(), "def");
@@ -898,7 +898,7 @@ BOOST_AUTO_TEST_CASE(irregular_line_breaks_in_strings)
 BOOST_AUTO_TEST_CASE(solidity_keywords)
 {
 	// These are tokens which have a different meaning in Yul.
-	string keywords = "return byte bool address var in true false leave switch case default";
+	std::string keywords = "return byte bool address var in true false leave switch case default";
 	TestScanner scanner(keywords);
 	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Return);
 	BOOST_CHECK_EQUAL(scanner.next(), Token::Byte);
@@ -962,7 +962,7 @@ BOOST_AUTO_TEST_CASE(yul_identifier_with_dots)
 
 BOOST_AUTO_TEST_CASE(yul_function)
 {
-	string sig = "function f(a, b) -> x, y";
+	std::string sig = "function f(a, b) -> x, y";
 	TestScanner scanner(sig);
 	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
 	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
@@ -994,7 +994,7 @@ BOOST_AUTO_TEST_CASE(yul_function)
 
 BOOST_AUTO_TEST_CASE(yul_function_with_whitespace)
 {
-	string sig = "function f (a, b) - > x, y";
+	std::string sig = "function f (a, b) - > x, y";
 	TestScanner scanner(sig);
 	BOOST_CHECK_EQUAL(scanner.currentToken(), Token::Function);
 	BOOST_CHECK_EQUAL(scanner.next(), Token::Identifier);
diff --git a/test/libsolidity/ABIDecoderTests.cpp b/test/libsolidity/ABIDecoderTests.cpp
index b910949d85..e8ffcad27e 100644
--- a/test/libsolidity/ABIDecoderTests.cpp
+++ b/test/libsolidity/ABIDecoderTests.cpp
@@ -28,7 +28,6 @@
 
 #include <test/libsolidity/ABITestsCommon.h>
 
-using namespace std;
 using namespace std::placeholders;
 using namespace solidity::test;
 
@@ -39,7 +38,7 @@ BOOST_FIXTURE_TEST_SUITE(ABIDecoderTest, SolidityExecutionFramework)
 
 BOOST_AUTO_TEST_CASE(value_types)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			function f(uint a, uint16 b, uint24 c, int24 d, bytes3 x, bool e, C g) public returns (uint) {
 				if (a != 1) return 1;
@@ -57,14 +56,14 @@ BOOST_AUTO_TEST_CASE(value_types)
 		compileAndRun(sourceCode);
 		ABI_CHECK(callContractFunction(
 			"f(uint256,uint16,uint24,int24,bytes3,bool,address)",
-			1, 2, 3, 4, string("abc"), true, m_contractAddress
+			1, 2, 3, 4, std::string("abc"), true, m_contractAddress
 		), encodeArgs(u256(20)));
 	)
 }
 
 BOOST_AUTO_TEST_CASE(decode_from_memory_simple)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			uint public _a;
 			uint[] public _b;
@@ -90,7 +89,7 @@ BOOST_AUTO_TEST_CASE(decode_from_memory_simple)
 
 BOOST_AUTO_TEST_CASE(decode_function_type)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract D {
 			function () external returns (uint) public _a;
 			constructor(function () external returns (uint) a) {
@@ -124,7 +123,7 @@ BOOST_AUTO_TEST_CASE(decode_function_type)
 
 BOOST_AUTO_TEST_CASE(decode_function_type_array)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract D {
 			function () external returns (uint)[] public _a;
 			constructor(function () external returns (uint)[] memory a) {
@@ -190,7 +189,7 @@ BOOST_AUTO_TEST_CASE(decode_function_type_array)
 
 BOOST_AUTO_TEST_CASE(decode_from_memory_complex)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			uint public _a;
 			uint[] public _b;
@@ -209,23 +208,23 @@ BOOST_AUTO_TEST_CASE(decode_from_memory_complex)
 			3, 0x21, 0x22, 0x23,
 			// c
 			0x40, 0x80,
-			8, string("abcdefgh"),
-			52, string("ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ")
+			8, std::string("abcdefgh"),
+			52, std::string("ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ")
 		));
 		ABI_CHECK(callContractFunction("_a()"), encodeArgs(7));
 		ABI_CHECK(callContractFunction("_b(uint256)", 0), encodeArgs(0x21));
 		ABI_CHECK(callContractFunction("_b(uint256)", 1), encodeArgs(0x22));
 		ABI_CHECK(callContractFunction("_b(uint256)", 2), encodeArgs(0x23));
 		ABI_CHECK(callContractFunction("_b(uint256)", 3), encodeArgs());
-		ABI_CHECK(callContractFunction("_c(uint256)", 0), encodeArgs(0x20, 8, string("abcdefgh")));
-		ABI_CHECK(callContractFunction("_c(uint256)", 1), encodeArgs(0x20, 52, string("ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ")));
+		ABI_CHECK(callContractFunction("_c(uint256)", 0), encodeArgs(0x20, 8, std::string("abcdefgh")));
+		ABI_CHECK(callContractFunction("_c(uint256)", 1), encodeArgs(0x20, 52, std::string("ABCDEFGHIJKLMNOPQRSTUVWXYZABCDEFGHIJKLMNOPQRSTUVWXYZ")));
 		ABI_CHECK(callContractFunction("_c(uint256)", 2), encodeArgs());
 	)
 }
 
 BOOST_AUTO_TEST_CASE(short_input_value_type)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			function f(uint a, uint b) public pure returns (uint) { return a; }
 		}
@@ -240,7 +239,7 @@ BOOST_AUTO_TEST_CASE(short_input_value_type)
 
 BOOST_AUTO_TEST_CASE(short_input_array)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			function f(uint[] memory a) public pure returns (uint) { return 7; }
 		}
@@ -257,7 +256,7 @@ BOOST_AUTO_TEST_CASE(short_input_array)
 
 BOOST_AUTO_TEST_CASE(short_dynamic_input_array)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			function f(bytes[1] memory a) public pure returns (uint) { return 7; }
 		}
@@ -270,7 +269,7 @@ BOOST_AUTO_TEST_CASE(short_dynamic_input_array)
 
 BOOST_AUTO_TEST_CASE(short_input_bytes)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			function e(bytes memory a) public pure returns (uint) { return 7; }
 			function f(bytes[] memory a) public pure returns (uint) { return 7; }
@@ -291,7 +290,7 @@ BOOST_AUTO_TEST_CASE(short_input_bytes)
 
 BOOST_AUTO_TEST_CASE(validation_int_inside_arrays)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			enum E { A, B }
 			function f(uint16[] memory a) public pure returns (uint r) { assembly { r := mload(add(a, 0x20)) } }
@@ -315,7 +314,7 @@ BOOST_AUTO_TEST_CASE(validation_int_inside_arrays)
 
 BOOST_AUTO_TEST_CASE(validation_function_type)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			function f(function () external) public pure returns (uint r) { r = 1; }
 			function g(function () external[] memory) public pure returns (uint r) { r = 2; }
@@ -324,8 +323,8 @@ BOOST_AUTO_TEST_CASE(validation_function_type)
 		}
 	)";
 	bool newDecoder = false;
-	string validFun{"01234567890123456789abcd"};
-	string invalidFun{"01234567890123456789abcdX"};
+	std::string validFun{"01234567890123456789abcd"};
+	std::string invalidFun{"01234567890123456789abcdX"};
 	BOTH_ENCODERS(
 		compileAndRun(sourceCode);
 		ABI_CHECK(callContractFunction("f(function)", validFun), encodeArgs(1));
@@ -343,7 +342,7 @@ BOOST_AUTO_TEST_CASE(validation_function_type)
 
 BOOST_AUTO_TEST_CASE(struct_short)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			struct S { int a; uint b; bytes16 c; }
 			function f(S memory s) public pure returns (S memory q) {
@@ -370,7 +369,7 @@ BOOST_AUTO_TEST_CASE(struct_short)
 
 BOOST_AUTO_TEST_CASE(complex_struct)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			enum E {A, B, C}
 			struct T { uint x; E e; uint8 y; }
@@ -390,7 +389,7 @@ BOOST_AUTO_TEST_CASE(complex_struct)
 	)";
 	NEW_ENCODER(
 		compileAndRun(sourceCode, 0, "C");
-		string sig = "f(uint256,(address,(uint256,uint8,uint8)[])[2],(address,(uint256,uint8,uint8)[])[],uint256)";
+		std::string sig = "f(uint256,(address,(uint256,uint8,uint8)[])[2],(address,(uint256,uint8,uint8)[])[],uint256)";
 		bytes args = encodeArgs(
 			7, 0x80, 0x1e0, 8,
 			// S[2] s1
diff --git a/test/libsolidity/ABIEncoderTests.cpp b/test/libsolidity/ABIEncoderTests.cpp
index 970bf1b3e0..a56d9e5c75 100644
--- a/test/libsolidity/ABIEncoderTests.cpp
+++ b/test/libsolidity/ABIEncoderTests.cpp
@@ -32,7 +32,6 @@
 #include <string>
 #include <tuple>
 
-using namespace std;
 using namespace std::placeholders;
 using namespace solidity::util;
 using namespace solidity::test;
@@ -50,7 +49,7 @@ BOOST_FIXTURE_TEST_SUITE(ABIEncoderTest, SolidityExecutionFramework)
 
 BOOST_AUTO_TEST_CASE(value_types)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			event E(uint a, uint16 b, uint24 c, int24 d, bytes3 x, bool, C);
 			function f() public {
@@ -67,14 +66,14 @@ BOOST_AUTO_TEST_CASE(value_types)
 		compileAndRun(sourceCode);
 		callContractFunction("f()");
 		REQUIRE_LOG_DATA(encodeArgs(
-			10, u256(65534), u256(0x121212), u256(-1), string("\x1b\xab\xab"), true, h160("fffffffffffffffffffffffffffffffffffffffb")
+			10, u256(65534), u256(0x121212), u256(-1), std::string("\x1b\xab\xab"), true, h160("fffffffffffffffffffffffffffffffffffffffb")
 		));
 	)
 }
 
 BOOST_AUTO_TEST_CASE(string_literal)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			event E(string, bytes20, string);
 			function f() public {
@@ -86,9 +85,9 @@ BOOST_AUTO_TEST_CASE(string_literal)
 		compileAndRun(sourceCode);
 		callContractFunction("f()");
 		REQUIRE_LOG_DATA(encodeArgs(
-			0x60, string("abcde"), 0xa0,
-			6, string("abcdef"),
-			0x8b, string("abcdefabcdefgehabcabcasdfjklabcdefabcedefghabcabcasdfjklabcdefabcdefghabcabcasdfjklabcdeefabcdefghabcabcasdefjklabcdefabcdefghabcabcasdfjkl")
+			0x60, std::string("abcde"), 0xa0,
+			6, std::string("abcdef"),
+			0x8b, std::string("abcdefabcdefgehabcabcasdfjklabcdefabcedefghabcabcasdfjklabcdefabcdefghabcabcasdfjklabcdeefabcdefghabcabcasdefjklabcdefabcdefghabcabcasdfjkl")
 		));
 	)
 }
@@ -96,7 +95,7 @@ BOOST_AUTO_TEST_CASE(string_literal)
 
 BOOST_AUTO_TEST_CASE(enum_type_cleanup)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			enum E { A, B }
 			function f(uint x) public returns (E en) {
@@ -114,7 +113,7 @@ BOOST_AUTO_TEST_CASE(enum_type_cleanup)
 
 BOOST_AUTO_TEST_CASE(conversion)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			event E(bytes4, bytes4, uint16, uint8, int16, int8);
 			function f() public {
@@ -132,7 +131,7 @@ BOOST_AUTO_TEST_CASE(conversion)
 		compileAndRun(sourceCode);
 		callContractFunction("f()");
 		REQUIRE_LOG_DATA(encodeArgs(
-			string(3, 0) + string("\x0a"), string("\xf1\xf2"),
+			std::string(3, 0) + std::string("\x0a"), std::string("\xf1\xf2"),
 			0xff, 0xff, u256(-1), u256(1)
 		));
 	)
@@ -140,7 +139,7 @@ BOOST_AUTO_TEST_CASE(conversion)
 
 BOOST_AUTO_TEST_CASE(memory_array_one_dim)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			event E(uint a, int16[] b, uint c);
 			function f() public {
@@ -172,7 +171,7 @@ BOOST_AUTO_TEST_CASE(memory_array_one_dim)
 
 BOOST_AUTO_TEST_CASE(memory_array_two_dim)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			event E(uint a, int16[][2] b, uint c);
 			function f() public {
@@ -197,7 +196,7 @@ BOOST_AUTO_TEST_CASE(memory_array_two_dim)
 
 BOOST_AUTO_TEST_CASE(memory_byte_array)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			event E(uint a, bytes[] b, uint c);
 			function f() public {
@@ -214,15 +213,15 @@ BOOST_AUTO_TEST_CASE(memory_byte_array)
 		REQUIRE_LOG_DATA(encodeArgs(
 			10, 0x60, 11,
 			2, 0x40, 0xc0,
-			66, string("abcabcdefghjklmnopqrsuvwabcdefgijklmnopqrstuwabcdefgijklmnoprstuvw"),
-			63, string("abcdefghijklmnopqrtuvwabcfghijklmnopqstuvwabcdeghijklmopqrstuvw")
+			66, std::string("abcabcdefghjklmnopqrsuvwabcdefgijklmnopqrstuwabcdefgijklmnoprstuvw"),
+			63, std::string("abcdefghijklmnopqrtuvwabcfghijklmnopqstuvwabcdeghijklmopqrstuvw")
 		));
 	)
 }
 
 BOOST_AUTO_TEST_CASE(storage_byte_array)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			bytes short;
 			bytes long;
@@ -239,15 +238,15 @@ BOOST_AUTO_TEST_CASE(storage_byte_array)
 		callContractFunction("f()");
 		REQUIRE_LOG_DATA(encodeArgs(
 			0x40, 0x80,
-			31, string("123456789012345678901234567890a"),
-			75, string("ffff123456789012345678901234567890afffffffff123456789012345678901234567890a")
+			31, std::string("123456789012345678901234567890a"),
+			75, std::string("ffff123456789012345678901234567890afffffffff123456789012345678901234567890a")
 		));
 	)
 }
 
 BOOST_AUTO_TEST_CASE(storage_array)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			address[3] addr;
 			event E(address[3] a);
@@ -274,7 +273,7 @@ BOOST_AUTO_TEST_CASE(storage_array)
 
 BOOST_AUTO_TEST_CASE(storage_array_dyn)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			address[] addr;
 			event E(address[] a);
@@ -301,7 +300,7 @@ BOOST_AUTO_TEST_CASE(storage_array_dyn)
 
 BOOST_AUTO_TEST_CASE(storage_array_compact)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			int72[] x;
 			event E(int72[]);
@@ -329,7 +328,7 @@ BOOST_AUTO_TEST_CASE(storage_array_compact)
 
 BOOST_AUTO_TEST_CASE(external_function)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			event E(function(uint) external returns (uint), function(uint) external returns (uint));
 			function(uint) external returns (uint) g;
@@ -342,14 +341,14 @@ BOOST_AUTO_TEST_CASE(external_function)
 	BOTH_ENCODERS(
 		compileAndRun(sourceCode);
 		callContractFunction("f(uint256)", u256(0));
-		string functionIdF = asString(m_contractAddress.ref()) + asString(util::selectorFromSignatureH32("f(uint256)").ref());
+		std::string functionIdF = asString(m_contractAddress.ref()) + asString(util::selectorFromSignatureH32("f(uint256)").ref());
 		REQUIRE_LOG_DATA(encodeArgs(functionIdF, functionIdF));
 	)
 }
 
 BOOST_AUTO_TEST_CASE(external_function_cleanup)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			event E(function(uint) external returns (uint), function(uint) external returns (uint));
 			// This test relies on the fact that g is stored in slot zero.
@@ -364,13 +363,13 @@ BOOST_AUTO_TEST_CASE(external_function_cleanup)
 	BOTH_ENCODERS(
 		compileAndRun(sourceCode);
 		callContractFunction("f(uint256)", u256(0));
-		REQUIRE_LOG_DATA(encodeArgs(string(24, char(-1)), string(24, char(-1))));
+		REQUIRE_LOG_DATA(encodeArgs(std::string(24, char(-1)), std::string(24, char(-1))));
 	)
 }
 
 BOOST_AUTO_TEST_CASE(calldata)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			event E(bytes);
 			function f(bytes calldata a) external {
@@ -378,8 +377,8 @@ BOOST_AUTO_TEST_CASE(calldata)
 			}
 		}
 	)";
-	string s("abcdef");
-	string t("abcdefgggggggggggggggggggggggggggggggggggggggghhheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeggg");
+	std::string s("abcdef");
+	std::string t("abcdefgggggggggggggggggggggggggggggggggggggggghhheeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeggg");
 	BOTH_ENCODERS(
 		compileAndRun(sourceCode);
 		callContractFunction("f(bytes)", 0x20, s.size(), s);
@@ -393,7 +392,7 @@ BOOST_AUTO_TEST_CASE(function_name_collision)
 {
 	// This tests a collision between a function name used by inline assembly
 	// and by the ABI encoder
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			function f(uint x) public returns (uint) {
 				assembly {
@@ -417,7 +416,7 @@ BOOST_AUTO_TEST_CASE(function_name_collision)
 
 BOOST_AUTO_TEST_CASE(structs)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			struct S { uint16 a; uint16 b; T[] sub; uint16 c; }
 			struct T { uint64[2] x; }
@@ -452,13 +451,13 @@ BOOST_AUTO_TEST_CASE(structs)
 		);
 		BOOST_CHECK(callContractFunction("f()") == encoded);
 		REQUIRE_LOG_DATA(encoded);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), keccak256(string("e(uint16,(uint16,uint16,(uint64[2])[],uint16))")));
+		BOOST_CHECK_EQUAL(logTopic(0, 0), keccak256(std::string("e(uint16,(uint16,uint16,(uint64[2])[],uint16))")));
 	)
 }
 
 BOOST_AUTO_TEST_CASE(structs2)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			enum E {A, B, C}
 			struct T { uint x; E e; uint8 y; }
@@ -517,7 +516,7 @@ BOOST_AUTO_TEST_CASE(structs2)
 
 BOOST_AUTO_TEST_CASE(bool_arrays)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			bool[] x;
 			bool[4] y;
@@ -550,7 +549,7 @@ BOOST_AUTO_TEST_CASE(bool_arrays)
 
 BOOST_AUTO_TEST_CASE(bool_arrays_split)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			bool[] x;
 			bool[4] y;
@@ -587,7 +586,7 @@ BOOST_AUTO_TEST_CASE(bool_arrays_split)
 BOOST_AUTO_TEST_CASE(bytesNN_arrays)
 {
 	// This tests that encoding packed arrays from storage work correctly.
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			bytes8[] x;
 			bytesWIDTH[SIZE] y;
@@ -610,12 +609,12 @@ BOOST_AUTO_TEST_CASE(bytesNN_arrays)
 		{
 			for (size_t width: {1u, 2u, 4u, 5u, 7u, 15u, 16u, 17u, 31u, 32u})
 			{
-				string source = boost::algorithm::replace_all_copy(sourceCode, "SIZE", to_string(size));
-				source = boost::algorithm::replace_all_copy(source, "UINTWIDTH", to_string(width * 8));
-				source = boost::algorithm::replace_all_copy(source, "WIDTH", to_string(width));
+				std::string source = boost::algorithm::replace_all_copy(sourceCode, "SIZE", std::to_string(size));
+				source = boost::algorithm::replace_all_copy(source, "UINTWIDTH", std::to_string(width * 8));
+				source = boost::algorithm::replace_all_copy(source, "WIDTH", std::to_string(width));
 				compileAndRun(source, 0, "C");
 				ABI_CHECK(callContractFunction("store()"), bytes{});
-				vector<u256> arr;
+				std::vector<u256> arr;
 				for (size_t i = 0; i < size; i ++)
 					arr.emplace_back(u256(i + 1) << (8 * (32 - width)));
 				bytes encoded = encodeArgs(
@@ -632,7 +631,7 @@ BOOST_AUTO_TEST_CASE(bytesNN_arrays)
 BOOST_AUTO_TEST_CASE(bytesNN_arrays_dyn)
 {
 	// This tests that encoding packed arrays from storage work correctly.
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			bytes8[] x;
 			bytesWIDTH[] y;
@@ -655,12 +654,12 @@ BOOST_AUTO_TEST_CASE(bytesNN_arrays_dyn)
 		{
 			for (size_t width: {1u, 2u, 4u, 5u, 7u, 15u, 16u, 17u, 31u, 32u})
 			{
-				string source = boost::algorithm::replace_all_copy(sourceCode, "SIZE", to_string(size));
-				source = boost::algorithm::replace_all_copy(source, "UINTWIDTH", to_string(width * 8));
-				source = boost::algorithm::replace_all_copy(source, "WIDTH", to_string(width));
+				std::string source = boost::algorithm::replace_all_copy(sourceCode, "SIZE", std::to_string(size));
+				source = boost::algorithm::replace_all_copy(source, "UINTWIDTH", std::to_string(width * 8));
+				source = boost::algorithm::replace_all_copy(source, "WIDTH", std::to_string(width));
 				compileAndRun(source, 0, "C");
 				ABI_CHECK(callContractFunction("store()"), bytes{});
-				vector<u256> arr;
+				std::vector<u256> arr;
 				for (size_t i = 0; i < size; i ++)
 					arr.emplace_back(u256(i + 1) << (8 * (32 - width)));
 				bytes encoded = encodeArgs(
@@ -677,7 +676,7 @@ BOOST_AUTO_TEST_CASE(bytesNN_arrays_dyn)
 
 BOOST_AUTO_TEST_CASE(packed_structs)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			struct S { bool a; int8 b; function() external g; bytes3 d; int8 e; }
 			S s;
@@ -712,7 +711,7 @@ BOOST_AUTO_TEST_CASE(packed_structs)
 
 BOOST_AUTO_TEST_CASE(struct_in_constructor)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			struct S {
 				string a;
@@ -732,7 +731,7 @@ BOOST_AUTO_TEST_CASE(struct_in_constructor)
 
 BOOST_AUTO_TEST_CASE(struct_in_constructor_indirect)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			struct S {
 				string a;
@@ -765,7 +764,7 @@ BOOST_AUTO_TEST_CASE(struct_in_constructor_indirect)
 
 BOOST_AUTO_TEST_CASE(struct_in_constructor_data_short)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		contract C {
 			struct S {
 				string a;
diff --git a/test/libsolidity/ABIJsonTest.cpp b/test/libsolidity/ABIJsonTest.cpp
index aa8153454d..803445b96e 100644
--- a/test/libsolidity/ABIJsonTest.cpp
+++ b/test/libsolidity/ABIJsonTest.cpp
@@ -28,20 +28,19 @@
 
 #include <fstream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 
-ABIJsonTest::ABIJsonTest(string const& _filename):
+ABIJsonTest::ABIJsonTest(std::string const& _filename):
 	TestCase(_filename)
 {
 	m_source = m_reader.source();
 	m_expectation = m_reader.simpleExpectations();
 }
 
-TestCase::TestResult ABIJsonTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+TestCase::TestResult ABIJsonTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	CompilerStack compiler;
 
@@ -52,11 +51,11 @@ TestCase::TestResult ABIJsonTest::run(ostream& _stream, string const& _linePrefi
 	compiler.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 	compiler.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 	if (!compiler.parseAndAnalyze())
-		BOOST_THROW_EXCEPTION(runtime_error("Parsing contract failed"));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing contract failed"));
 
 	m_obtainedResult.clear();
 	bool first = true;
-	for (string const& contractName: compiler.contractNames())
+	for (std::string const& contractName: compiler.contractNames())
 	{
 		if (!first)
 			m_obtainedResult += "\n\n";
diff --git a/test/libsolidity/ABITestsCommon.h b/test/libsolidity/ABITestsCommon.h
index 11ee83998a..67c344985e 100644
--- a/test/libsolidity/ABITestsCommon.h
+++ b/test/libsolidity/ABITestsCommon.h
@@ -23,7 +23,7 @@ namespace solidity::frontend::test
 
 #define NEW_ENCODER(CODE) \
 { \
-	string sourceCodeTmp = sourceCode; \
+	std::string sourceCodeTmp = sourceCode; \
 	sourceCode = "pragma abicoder v2;\n" + sourceCode; \
 	{ CODE } \
 	sourceCode = sourceCodeTmp; \
@@ -31,7 +31,7 @@ namespace solidity::frontend::test
 
 #define OLD_ENCODER(CODE) \
 { \
-	string sourceCodeTmp = sourceCode; \
+	std::string sourceCodeTmp = sourceCode; \
 	sourceCode = "pragma abicoder v1;\n" + sourceCode; \
 	{ CODE } \
 	sourceCode = sourceCodeTmp; \
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index 8018d71b36..a318eacee6 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -36,22 +36,22 @@
 #include <memory>
 #include <stdexcept>
 
+using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 using namespace solidity::util::formatting;
 using namespace solidity::util;
-using namespace solidity;
-using namespace std;
 namespace fs = boost::filesystem;
 using namespace boost::unit_test;
+using namespace std::string_literals;
 
 namespace
 {
 
-string const sourceDelimiter("==== Source: ");
+std::string const sourceDelimiter("==== Source: ");
 
-string compilerStateToString(CompilerStack::State _state)
+std::string compilerStateToString(CompilerStack::State _state)
 {
 	switch (_state)
 	{
@@ -65,17 +65,17 @@ string compilerStateToString(CompilerStack::State _state)
 	soltestAssert(false, "Unexpected value of state parameter");
 }
 
-CompilerStack::State stringToCompilerState(const string& _state)
+CompilerStack::State stringToCompilerState(const std::string& _state)
 {
 	for (unsigned int i = CompilerStack::State::Empty; i <= CompilerStack::State::CompilationSuccessful; ++i)
 	{
 		if (_state == compilerStateToString(CompilerStack::State(i)))
 			return CompilerStack::State(i);
 	}
-	BOOST_THROW_EXCEPTION(runtime_error("Unsupported compiler state (" + _state + ") in test contract file"));
+	BOOST_THROW_EXCEPTION(std::runtime_error("Unsupported compiler state (" + _state + ") in test contract file"));
 }
 
-void replaceVersionWithTag(string& _input)
+void replaceVersionWithTag(std::string& _input)
 {
 	boost::algorithm::replace_all(
 		_input,
@@ -84,7 +84,7 @@ void replaceVersionWithTag(string& _input)
 	);
 }
 
-void replaceTagWithVersion(string& _input)
+void replaceTagWithVersion(std::string& _input)
 {
 	boost::algorithm::replace_all(
 		_input,
@@ -95,9 +95,9 @@ void replaceTagWithVersion(string& _input)
 
 }
 
-void ASTJSONTest::generateTestVariants(string const& _filename)
+void ASTJSONTest::generateTestVariants(std::string const& _filename)
 {
-	string_view baseName = _filename;
+	std::string_view baseName = _filename;
 	baseName.remove_suffix(4);
 
 	const std::vector<CompilerStack::State> variantCompileStates = {
@@ -117,18 +117,18 @@ void ASTJSONTest::generateTestVariants(string const& _filename)
 	}
 }
 
-void ASTJSONTest::fillSources(string const& _filename)
+void ASTJSONTest::fillSources(std::string const& _filename)
 {
-	ifstream file(_filename);
+	std::ifstream file(_filename);
 	if (!file)
-		BOOST_THROW_EXCEPTION(runtime_error("Cannot open test contract: \"" + _filename + "\"."));
-	file.exceptions(ios::badbit);
-
-	string sourceName;
-	string source;
-	string line;
-	string const delimiter("// ----");
-	string const failMarker("// failAfter:");
+		BOOST_THROW_EXCEPTION(std::runtime_error("Cannot open test contract: \"" + _filename + "\"."));
+	file.exceptions(std::ios::badbit);
+
+	std::string sourceName;
+	std::string source;
+	std::string line;
+	std::string const delimiter("// ----");
+	std::string const failMarker("// failAfter:");
 	while (getline(file, line))
 	{
 		if (boost::algorithm::starts_with(line, sourceDelimiter))
@@ -140,14 +140,14 @@ void ASTJSONTest::fillSources(string const& _filename)
 				sourceDelimiter.size(),
 				line.size() - " ===="s.size() - sourceDelimiter.size()
 			);
-			source = string();
+			source = std::string();
 		}
 		else if (boost::algorithm::starts_with(line, failMarker))
 		{
-			string state = line.substr(failMarker.size());
+			std::string state = line.substr(failMarker.size());
 			boost::algorithm::trim(state);
 			if (m_expectedFailAfter.has_value())
-				BOOST_THROW_EXCEPTION(runtime_error("Duplicated \"failAfter\" directive"));
+				BOOST_THROW_EXCEPTION(std::runtime_error("Duplicated \"failAfter\" directive"));
 			m_expectedFailAfter = stringToCompilerState(state);
 
 		}
@@ -161,7 +161,7 @@ void ASTJSONTest::fillSources(string const& _filename)
 void ASTJSONTest::validateTestConfiguration() const
 {
 	if (m_variants.empty())
-		BOOST_THROW_EXCEPTION(runtime_error("No file with expected result found."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("No file with expected result found."));
 
 	if (m_expectedFailAfter.has_value())
 	{
@@ -172,8 +172,8 @@ void ASTJSONTest::validateTestConfiguration() const
 
 		if (unexpectedTestVariant != m_variants.end())
 			BOOST_THROW_EXCEPTION(
-				runtime_error(
-					string("Unexpected JSON file: ") + unexpectedTestVariant->astFilename() +
+				std::runtime_error(
+					std::string("Unexpected JSON file: ") + unexpectedTestVariant->astFilename() +
 					" in \"failAfter: " +
 					compilerStateToString(m_expectedFailAfter.value()) + "\" scenario."
 				)
@@ -181,23 +181,23 @@ void ASTJSONTest::validateTestConfiguration() const
 	}
 }
 
-ASTJSONTest::ASTJSONTest(string const& _filename):
+ASTJSONTest::ASTJSONTest(std::string const& _filename):
 	EVMVersionRestrictedTestCase(_filename)
 {
 	if (!boost::algorithm::ends_with(_filename, ".sol"))
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid test contract file name: \"" + _filename + "\"."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid test contract file name: \"" + _filename + "\"."));
 
 	generateTestVariants(_filename);
 	fillSources(_filename);
 	validateTestConfiguration();
 }
 
-TestCase::TestResult ASTJSONTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
+TestCase::TestResult ASTJSONTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	CompilerStack c;
 
 	StringMap sources;
-	map<string, unsigned> sourceIndices;
+	std::map<std::string, unsigned> sourceIndices;
 	for (size_t i = 0; i < m_sources.size(); i++)
 	{
 		sources[m_sources[i].first] = m_sources[i].second;
@@ -237,10 +237,10 @@ TestCase::TestResult ASTJSONTest::run(ostream& _stream, string const& _linePrefi
 
 bool ASTJSONTest::runTest(
 	TestVariant& _variant,
-	map<string, unsigned> const& _sourceIndices,
+	std::map<std::string, unsigned> const& _sourceIndices,
 	CompilerStack& _compiler,
-	ostream& _stream,
-	string const& _linePrefix,
+	std::ostream& _stream,
+	std::string const& _linePrefix,
 	bool const _formatted
 )
 {
@@ -249,7 +249,7 @@ bool ASTJSONTest::runTest(
 
 	for (size_t i = 0; i < m_sources.size(); i++)
 	{
-		ostringstream result;
+		std::ostringstream result;
 		ASTJsonExporter(_compiler.state(), _sourceIndices).print(result, _compiler.ast(m_sources[i].first), JsonFormat{ JsonFormat::Pretty });
 		_variant.result += result.str();
 		if (i != m_sources.size() - 1)
@@ -264,49 +264,49 @@ bool ASTJSONTest::runTest(
 
 	if (_variant.expectation != _variant.result)
 	{
-		string nextIndentLevel = _linePrefix + "  ";
+		std::string nextIndentLevel = _linePrefix + "  ";
 		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) <<
 			_linePrefix <<
 			"Expected result" <<
 			(!_variant.name().empty() ? " (" + _variant.name() + "):" : ":") <<
-			endl;
+			std::endl;
 		{
-			istringstream stream(_variant.expectation);
-			string line;
+			std::istringstream stream(_variant.expectation);
+			std::string line;
 			while (getline(stream, line))
-				_stream << nextIndentLevel << line << endl;
+				_stream << nextIndentLevel << line << std::endl;
 		}
-		_stream << endl;
+		_stream << std::endl;
 
 		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) <<
 			_linePrefix <<
 			"Obtained result" <<
 			(!_variant.name().empty() ? " (" + _variant.name() + "):" : ":") <<
-			endl;
+			std::endl;
 		{
-			istringstream stream(_variant.result);
-			string line;
+			std::istringstream stream(_variant.result);
+			std::string line;
 			while (getline(stream, line))
-				_stream << nextIndentLevel << line << endl;
+				_stream << nextIndentLevel << line << std::endl;
 		}
-		_stream << endl;
+		_stream << std::endl;
 		return false;
 	}
 
 	return true;
 }
 
-void ASTJSONTest::printSource(ostream& _stream, string const& _linePrefix, bool const) const
+void ASTJSONTest::printSource(std::ostream& _stream, std::string const& _linePrefix, bool const) const
 {
 	for (auto const& source: m_sources)
 	{
 		if (m_sources.size() > 1 || source.first != "a")
-			_stream << _linePrefix << sourceDelimiter << source.first << " ====" << endl << endl;
-		stringstream stream(source.second);
-		string line;
+			_stream << _linePrefix << sourceDelimiter << source.first << " ====" << std::endl << std::endl;
+		std::stringstream stream(source.second);
+		std::string line;
 		while (getline(stream, line))
-			_stream << _linePrefix << line << endl;
-		_stream << endl;
+			_stream << _linePrefix << line << std::endl;
+		_stream << std::endl;
 	}
 }
 
@@ -320,13 +320,13 @@ void ASTJSONTest::printUpdatedExpectations(std::ostream&, std::string const&) co
 		);
 }
 
-void ASTJSONTest::updateExpectation(string const& _filename, string const& _expectation, string const& _variant) const
+void ASTJSONTest::updateExpectation(std::string const& _filename, std::string const& _expectation, std::string const& _variant) const
 {
-	ofstream file(_filename.c_str());
-	if (!file) BOOST_THROW_EXCEPTION(runtime_error("Cannot write " + _variant + "AST expectation to \"" + _filename + "\"."));
-	file.exceptions(ios::badbit);
+	std::ofstream file(_filename.c_str());
+	if (!file) BOOST_THROW_EXCEPTION(std::runtime_error("Cannot write " + _variant + "AST expectation to \"" + _filename + "\"."));
+	file.exceptions(std::ios::badbit);
 
-	string replacedResult = _expectation;
+	std::string replacedResult = _expectation;
 	replaceVersionWithTag(replacedResult);
 
 	file << replacedResult;
diff --git a/test/libsolidity/ASTPropertyTest.cpp b/test/libsolidity/ASTPropertyTest.cpp
index 194b2c92b2..8dc2c2930b 100644
--- a/test/libsolidity/ASTPropertyTest.cpp
+++ b/test/libsolidity/ASTPropertyTest.cpp
@@ -40,23 +40,23 @@ using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 using namespace solidity;
-using namespace std;
+using namespace std::string_literals;
 
-ASTPropertyTest::ASTPropertyTest(string const& _filename):
+ASTPropertyTest::ASTPropertyTest(std::string const& _filename):
 	TestCase(_filename)
 {
 	if (!boost::algorithm::ends_with(_filename, ".sol"))
-		BOOST_THROW_EXCEPTION(runtime_error("Not a Solidity file: \"" + _filename + "\"."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Not a Solidity file: \"" + _filename + "\"."));
 
 	m_source = m_reader.source();
 	readExpectations();
 	soltestAssert(m_tests.size() > 0, "No tests specified in " + _filename);
 }
 
-string ASTPropertyTest::formatExpectations(bool _obtainedResult)
+std::string ASTPropertyTest::formatExpectations(bool _obtainedResult)
 {
-	string expectations;
-	for (string const& testId: m_testOrder)
+	std::string expectations;
+	for (std::string const& testId: m_testOrder)
 	{
 		soltestAssert(m_tests.count(testId) > 0);
 		expectations +=
@@ -68,10 +68,10 @@ string ASTPropertyTest::formatExpectations(bool _obtainedResult)
 	return expectations;
 }
 
-vector<StringPair> ASTPropertyTest::readKeyValuePairs(string const& _input)
+std::vector<StringPair> ASTPropertyTest::readKeyValuePairs(std::string const& _input)
 {
-	vector<StringPair> result;
-	for (string line: _input | ranges::views::split('\n') | ranges::to<vector<string>>)
+	std::vector<StringPair> result;
+	for (std::string line: _input | ranges::views::split('\n') | ranges::to<std::vector<std::string>>)
 	{
 		boost::trim(line);
 		if (line.empty())
@@ -83,14 +83,14 @@ vector<StringPair> ASTPropertyTest::readKeyValuePairs(string const& _input)
 		);
 
 		auto colonPosition = line.find_first_of(':');
-		soltestAssert(colonPosition != string::npos, "Property test is missing a colon: " + line);
+		soltestAssert(colonPosition != std::string::npos, "Property test is missing a colon: " + line);
 
 		StringPair pair{
 			boost::trim_copy(line.substr(0, colonPosition)),
 			boost::trim_copy(line.substr(colonPosition + 1))
 		};
-		soltestAssert(!get<0>(pair).empty() != false, "Empty key in property test: " + line);
-		soltestAssert(!get<1>(pair).empty() != false, "Empty value in property test: " + line);
+		soltestAssert(!std::get<0>(pair).empty() != false, "Empty key in property test: " + line);
+		soltestAssert(!std::get<1>(pair).empty() != false, "Empty value in property test: " + line);
 
 		result.push_back(pair);
 	}
@@ -110,7 +110,7 @@ void ASTPropertyTest::readExpectations()
 
 void ASTPropertyTest::extractTestsFromAST(Json::Value const& _astJson)
 {
-	queue<Json::Value> nodesToVisit;
+	std::queue<Json::Value> nodesToVisit;
 	nodesToVisit.push(_astJson);
 
 	while (!nodesToVisit.empty())
@@ -121,7 +121,7 @@ void ASTPropertyTest::extractTestsFromAST(Json::Value const& _astJson)
 			for (auto&& member: node)
 				nodesToVisit.push(member);
 		else if (node.isObject())
-			for (string const& memberName: node.getMemberNames())
+			for (std::string const& memberName: node.getMemberNames())
 			{
 				if (memberName != "documentation")
 				{
@@ -129,12 +129,12 @@ void ASTPropertyTest::extractTestsFromAST(Json::Value const& _astJson)
 					continue;
 				}
 
-				string nodeDocstring = node["documentation"].isObject() ?
+				std::string nodeDocstring = node["documentation"].isObject() ?
 					node["documentation"]["text"].asString() :
 					node["documentation"].asString();
 				soltestAssert(!nodeDocstring.empty());
 
-				vector<StringPair> pairs = readKeyValuePairs(nodeDocstring);
+				std::vector<StringPair> pairs = readKeyValuePairs(nodeDocstring);
 				if (pairs.empty())
 					continue;
 
@@ -151,7 +151,7 @@ void ASTPropertyTest::extractTestsFromAST(Json::Value const& _astJson)
 					m_tests[testId].property = testedProperty;
 
 					soltestAssert(node.isMember("nodeType"));
-					optional<Json::Value> propertyNode = jsonValueByPath(node, testedProperty);
+					std::optional<Json::Value> propertyNode = jsonValueByPath(node, testedProperty);
 					soltestAssert(
 						propertyNode.has_value(),
 						node["nodeType"].asString() + " node does not have a property named \""s + testedProperty + "\""
@@ -179,7 +179,7 @@ void ASTPropertyTest::extractTestsFromAST(Json::Value const& _astJson)
 	m_obtainedResult = formatExpectations(true /* _obtainedResult */);
 }
 
-TestCase::TestResult ASTPropertyTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
+TestCase::TestResult ASTPropertyTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	CompilerStack compiler;
 
@@ -190,7 +190,7 @@ TestCase::TestResult ASTPropertyTest::run(ostream& _stream, string const& _lineP
 	compiler.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
 	compiler.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 	if (!compiler.parseAndAnalyze())
-		BOOST_THROW_EXCEPTION(runtime_error(
+		BOOST_THROW_EXCEPTION(std::runtime_error(
 			"Parsing contract failed" +
 			SourceReferenceFormatter::formatErrorInformation(compiler.errors(), compiler, _formatted)
 		));
diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 199afe95af..7e4c32eaed 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -35,16 +35,15 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 
-pair<SourceUnit const*, ErrorList>
+std::pair<SourceUnit const*, ErrorList>
 AnalysisFramework::parseAnalyseAndReturnError(
-	string const& _source,
+	std::string const& _source,
 	bool _reportWarnings,
 	bool _insertLicenseAndVersionPragma,
 	bool _allowMultipleErrors
@@ -99,7 +98,7 @@ ErrorList AnalysisFramework::filterErrors(ErrorList const& _errorList, bool _inc
 			{
 				SourceLocation const* location = currentError->sourceLocation();
 				// sufficient for now, but in future we might clone the error completely, including the secondary location
-				newError = make_shared<Error>(
+				newError = std::make_shared<Error>(
 					currentError->errorId(),
 					currentError->type(),
 					messagePrefix + " ....",
@@ -114,18 +113,18 @@ ErrorList AnalysisFramework::filterErrors(ErrorList const& _errorList, bool _inc
 	return errors;
 }
 
-SourceUnit const* AnalysisFramework::parseAndAnalyse(string const& _source)
+SourceUnit const* AnalysisFramework::parseAndAnalyse(std::string const& _source)
 {
 	auto sourceAndError = parseAnalyseAndReturnError(_source);
 	BOOST_REQUIRE(!!sourceAndError.first);
-	string message;
+	std::string message;
 	if (!sourceAndError.second.empty())
 		message = "Unexpected error: " + formatErrors(compiler().errors());
 	BOOST_REQUIRE_MESSAGE(sourceAndError.second.empty(), message);
 	return sourceAndError.first;
 }
 
-bool AnalysisFramework::success(string const& _source)
+bool AnalysisFramework::success(std::string const& _source)
 {
 	return parseAnalyseAndReturnError(_source).second.empty();
 }
@@ -138,7 +137,7 @@ ErrorList AnalysisFramework::expectError(std::string const& _source, bool _warni
 	return sourceAndErrors.second;
 }
 
-string AnalysisFramework::formatErrors(
+std::string AnalysisFramework::formatErrors(
 	langutil::ErrorList const& _errors,
 	bool _colored,
 	bool _withErrorIds
@@ -152,7 +151,7 @@ string AnalysisFramework::formatErrors(
 	);
 }
 
-string AnalysisFramework::formatError(
+std::string AnalysisFramework::formatError(
 	Error const& _error,
 	bool _colored,
 	bool _withErrorIds
@@ -166,11 +165,11 @@ string AnalysisFramework::formatError(
 	);
 }
 
-ContractDefinition const* AnalysisFramework::retrieveContractByName(SourceUnit const& _source, string const& _name)
+ContractDefinition const* AnalysisFramework::retrieveContractByName(SourceUnit const& _source, std::string const& _name)
 {
 	ContractDefinition* contract = nullptr;
 
-	for (shared_ptr<ASTNode> const& node: _source.nodes())
+	for (std::shared_ptr<ASTNode> const& node: _source.nodes())
 		if ((contract = dynamic_cast<ContractDefinition*>(node.get())) && contract->name() == _name)
 			return contract;
 
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index f12c12ca96..dcfe49ab48 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -43,7 +43,6 @@
 #include <string>
 #include <iostream>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::evmasm;
 
@@ -90,7 +89,7 @@ evmasm::AssemblyItems compileContract(std::shared_ptr<CharStream> _sourceCode)
 				RevertStrings::Default,
 				solidity::test::CommonOptions::get().optimize ? OptimiserSettings::standard() : OptimiserSettings::minimal()
 			);
-			compiler.compileContract(*contract, map<ContractDefinition const*, shared_ptr<Compiler const>>{}, bytes());
+			compiler.compileContract(*contract, std::map<ContractDefinition const*, std::shared_ptr<Compiler const>>{}, bytes());
 
 			return compiler.runtimeAssembly().items();
 		}
@@ -102,7 +101,7 @@ void printAssemblyLocations(AssemblyItems const& _items)
 {
 	auto printRepeated = [](SourceLocation const& _loc, size_t _repetitions)
 	{
-		cout <<
+		std::cout <<
 			"\t\tvector<SourceLocation>(" <<
 			_repetitions <<
 			", SourceLocation{" <<
@@ -111,10 +110,10 @@ void printAssemblyLocations(AssemblyItems const& _items)
 			_loc.end <<
 			", make_shared<string>(\"" <<
 			*_loc.sourceName <<
-			"\")}) +" << endl;
+			"\")}) +" << std::endl;
 	};
 
-	vector<SourceLocation> locations;
+	std::vector<SourceLocation> locations;
 	for (auto const& item: _items)
 		locations.push_back(item.location());
 	size_t repetitions = 0;
@@ -136,15 +135,15 @@ void printAssemblyLocations(AssemblyItems const& _items)
 		printRepeated(*previousLoc, repetitions);
 }
 
-void checkAssemblyLocations(AssemblyItems const& _items, vector<SourceLocation> const& _locations)
+void checkAssemblyLocations(AssemblyItems const& _items, std::vector<SourceLocation> const& _locations)
 {
 	BOOST_CHECK_EQUAL(_items.size(), _locations.size());
-	for (size_t i = 0; i < min(_items.size(), _locations.size()); ++i)
+	for (size_t i = 0; i < std::min(_items.size(), _locations.size()); ++i)
 	{
 		if (_items[i].location().start != _locations[i].start ||
 			_items[i].location().end != _locations[i].end)
 		{
-			BOOST_CHECK_MESSAGE(false, "Location mismatch for item " + to_string(i) + ". Found the following locations:");
+			BOOST_CHECK_MESSAGE(false, "Location mismatch for item " + std::to_string(i) + ". Found the following locations:");
 			printAssemblyLocations(_items);
 			return;
 		}
@@ -158,7 +157,7 @@ BOOST_AUTO_TEST_SUITE(Assembly)
 
 BOOST_AUTO_TEST_CASE(location_test)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 	pragma abicoder v1;
 	contract test {
 		function f() public returns (uint256 a) {
@@ -166,34 +165,34 @@ BOOST_AUTO_TEST_CASE(location_test)
 		}
 	}
 	)";
-	AssemblyItems items = compileContract(make_shared<CharStream>(sourceCode, ""));
-	shared_ptr<string> sourceName = make_shared<string>();
+	AssemblyItems items = compileContract(std::make_shared<CharStream>(sourceCode, ""));
+	std::shared_ptr<std::string> sourceName = std::make_shared<std::string>();
 	bool hasShifts = solidity::test::CommonOptions::get().evmVersion().hasBitwiseShifting();
 
-	auto codegenCharStream = make_shared<CharStream>("", "--CODEGEN--");
+	auto codegenCharStream = std::make_shared<CharStream>("", "--CODEGEN--");
 
-	vector<SourceLocation> locations;
+	std::vector<SourceLocation> locations;
 	if (solidity::test::CommonOptions::get().optimize)
 		locations =
-			vector<SourceLocation>(31, SourceLocation{23, 103, sourceName}) +
-			vector<SourceLocation>(1, SourceLocation{41, 100, sourceName}) +
-			vector<SourceLocation>(1, SourceLocation{93, 95, sourceName}) +
-			vector<SourceLocation>(15, SourceLocation{41, 100, sourceName});
+			std::vector<SourceLocation>(31, SourceLocation{23, 103, sourceName}) +
+			std::vector<SourceLocation>(1, SourceLocation{41, 100, sourceName}) +
+			std::vector<SourceLocation>(1, SourceLocation{93, 95, sourceName}) +
+			std::vector<SourceLocation>(15, SourceLocation{41, 100, sourceName});
 	else
 		locations =
-			vector<SourceLocation>(hasShifts ? 31 : 32, SourceLocation{23, 103, sourceName}) +
-			vector<SourceLocation>(24, SourceLocation{41, 100, sourceName}) +
-			vector<SourceLocation>(1, SourceLocation{70, 79, sourceName}) +
-			vector<SourceLocation>(1, SourceLocation{93, 95, sourceName}) +
-			vector<SourceLocation>(2, SourceLocation{86, 95, sourceName}) +
-			vector<SourceLocation>(2, SourceLocation{41, 100, sourceName});
+			std::vector<SourceLocation>(hasShifts ? 31 : 32, SourceLocation{23, 103, sourceName}) +
+			std::vector<SourceLocation>(24, SourceLocation{41, 100, sourceName}) +
+			std::vector<SourceLocation>(1, SourceLocation{70, 79, sourceName}) +
+			std::vector<SourceLocation>(1, SourceLocation{93, 95, sourceName}) +
+			std::vector<SourceLocation>(2, SourceLocation{86, 95, sourceName}) +
+			std::vector<SourceLocation>(2, SourceLocation{41, 100, sourceName});
 	checkAssemblyLocations(items, locations);
 }
 
 
 BOOST_AUTO_TEST_CASE(jump_type)
 {
-	auto sourceCode = make_shared<CharStream>(R"(
+	auto sourceCode = std::make_shared<CharStream>(R"(
 	pragma abicoder v1;
 	contract C {
 		function f(uint a) public pure returns (uint t) {
@@ -206,7 +205,7 @@ BOOST_AUTO_TEST_CASE(jump_type)
 	)", "");
 	AssemblyItems items = compileContract(sourceCode);
 
-	string jumpTypes;
+	std::string jumpTypes;
 	for (AssemblyItem const& item: items)
 		if (item.getJumpType() != AssemblyItem::JumpType::Ordinary)
 			jumpTypes += item.getJumpTypeAsString() + "\n";
diff --git a/test/libsolidity/ErrorCheck.cpp b/test/libsolidity/ErrorCheck.cpp
index 8a8b2166ce..8f1f054390 100644
--- a/test/libsolidity/ErrorCheck.cpp
+++ b/test/libsolidity/ErrorCheck.cpp
@@ -27,7 +27,6 @@
 #include <set>
 #include <iostream>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
@@ -42,29 +41,29 @@ std::string errorMessage(Error const& _e)
 
 bool solidity::frontend::test::searchErrorMessage(Error const& _err, std::string const& _substr)
 {
-	if (string const* errorMessage = _err.comment())
+	if (std::string const* errorMessage = _err.comment())
 	{
 		if (errorMessage->find(_substr) == std::string::npos)
 		{
-			cout << "Expected message \"" << _substr << "\" but found \"" << *errorMessage << "\".\n";
+			std::cout << "Expected message \"" << _substr << "\" but found \"" << *errorMessage << "\".\n";
 			return false;
 		}
 		return true;
 	}
 	else
-		cout << "Expected error message but found none." << endl;
+		std::cout << "Expected error message but found none." << std::endl;
 	return _substr.empty();
 }
 
-string solidity::frontend::test::searchErrors(ErrorList const& _errors, vector<pair<Error::Type, string>> const& _expectations)
+std::string solidity::frontend::test::searchErrors(ErrorList const& _errors, std::vector<std::pair<Error::Type, std::string>> const& _expectations)
 {
 	auto expectations = _expectations;
 	for (auto const& error: _errors)
 	{
-		string msg = errorMessage(*error);
+		std::string msg = errorMessage(*error);
 		bool found = false;
 		for (auto it = expectations.begin(); it != expectations.end(); ++it)
-			if (msg.find(it->second) != string::npos && error->type() == it->first)
+			if (msg.find(it->second) != std::string::npos && error->type() == it->first)
 			{
 				found = true;
 				expectations.erase(it);
@@ -75,7 +74,7 @@ string solidity::frontend::test::searchErrors(ErrorList const& _errors, vector<p
 	}
 	if (!expectations.empty())
 	{
-		string msg = "Expected error(s) not present:\n";
+		std::string msg = "Expected error(s) not present:\n";
 		for (auto const& expectation: expectations)
 			msg += expectation.second + "\n";
 		return msg;
diff --git a/test/libsolidity/GasCosts.cpp b/test/libsolidity/GasCosts.cpp
index 0f280c9a09..5207328101 100644
--- a/test/libsolidity/GasCosts.cpp
+++ b/test/libsolidity/GasCosts.cpp
@@ -26,7 +26,6 @@
 
 #include <cmath>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::langutil;
 using namespace solidity::evmasm;
@@ -168,7 +167,7 @@ BOOST_AUTO_TEST_CASE(string_storage)
 
 BOOST_AUTO_TEST_CASE(single_callvaluecheck)
 {
-	string sourceCode = R"(
+	std::string sourceCode = R"(
 		// All functions nonpayable, we can check callvalue at the beginning
 		contract Nonpayable {
 			address a;
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index 0cb81ecb65..be222c4008 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -28,7 +28,6 @@
 #include <libsolidity/ast/AST.h>
 #include <libsolidity/interface/GasEstimator.h>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::evmasm;
 using namespace solidity::frontend;
@@ -40,7 +39,7 @@ namespace solidity::frontend::test
 class GasMeterTestFramework: public SolidityExecutionFramework
 {
 public:
-	void compile(string const& _sourceCode)
+	void compile(std::string const& _sourceCode)
 	{
 		m_compiler.reset();
 		m_compiler.setSources({{"", "pragma solidity >=0.0;\n"
@@ -50,10 +49,10 @@ class GasMeterTestFramework: public SolidityExecutionFramework
 		BOOST_REQUIRE_MESSAGE(m_compiler.compile(), "Compiling contract failed");
 	}
 
-	void testCreationTimeGas(string const& _sourceCode, u256 const& _tolerance = u256(0))
+	void testCreationTimeGas(std::string const& _sourceCode, u256 const& _tolerance = u256(0))
 	{
 		compileAndRun(_sourceCode);
-		auto state = make_shared<KnownState>();
+		auto state = std::make_shared<KnownState>();
 		PathGasMeter meter(*m_compiler.assemblyItems(m_compiler.lastContractName()), solidity::test::CommonOptions::get().evmVersion());
 		GasMeter::GasConsumption gas = meter.estimateMax(0, state);
 		u256 bytecodeSize(m_compiler.runtimeObject(m_compiler.lastContractName()).bytecode.size());
@@ -74,7 +73,7 @@ class GasMeterTestFramework: public SolidityExecutionFramework
 
 	/// Compares the gas computed by PathGasMeter for the given signature (but unknown arguments)
 	/// against the actual gas usage computed by the VM on the given set of argument variants.
-	void testRunTimeGas(string const& _sig, vector<bytes> _argumentVariants, u256 const& _tolerance = u256(0))
+	void testRunTimeGas(std::string const& _sig, std::vector<bytes> _argumentVariants, u256 const& _tolerance = u256(0))
 	{
 		u256 gasUsed = 0;
 		GasMeter::GasConsumption gas;
@@ -83,8 +82,8 @@ class GasMeterTestFramework: public SolidityExecutionFramework
 		{
 			sendMessage(hash.asBytes() + arguments, false, 0);
 			BOOST_CHECK(m_transactionSuccessful);
-			gasUsed = max(gasUsed, m_gasUsed);
-			gas = max(gas, gasForTransaction(hash.asBytes() + arguments, false));
+			gasUsed = std::max(gasUsed, m_gasUsed);
+			gas = std::max(gas, gasForTransaction(hash.asBytes() + arguments, false));
 		}
 
 		gas += GasEstimator(solidity::test::CommonOptions::get().evmVersion()).functionalEstimation(
@@ -171,7 +170,7 @@ BOOST_AUTO_TEST_CASE(branches)
 		}
 	)";
 	testCreationTimeGas(sourceCode, 1);
-	testRunTimeGas("f(uint256)", vector<bytes>{encodeArgs(2), encodeArgs(8)}, 1);
+	testRunTimeGas("f(uint256)", std::vector<bytes>{encodeArgs(2), encodeArgs(8)}, 1);
 }
 
 BOOST_AUTO_TEST_CASE(function_calls)
@@ -196,7 +195,7 @@ BOOST_AUTO_TEST_CASE(function_calls)
 	// However, GasMeter always assumes cold costs.
 	testRunTimeGas(
 		"f(uint256)",
-		vector<bytes>{encodeArgs(2), encodeArgs(8)},
+		std::vector<bytes>{encodeArgs(2), encodeArgs(8)},
 		m_evmVersion < EVMVersion::berlin() ?
 		u256(0) :
 		u256(2100)
@@ -225,13 +224,13 @@ BOOST_AUTO_TEST_CASE(multiple_external_functions)
 	// However, GasMeter always assumes cold costs.
 	testRunTimeGas(
 		"f(uint256)",
-		vector<bytes>{encodeArgs(2), encodeArgs(8)},
+		std::vector<bytes>{encodeArgs(2), encodeArgs(8)},
 		m_evmVersion < EVMVersion::berlin() ?
 		u256(0) :
 		u256(2100)
 	);
 
-	testRunTimeGas("g(uint256)", vector<bytes>{encodeArgs(2)});
+	testRunTimeGas("g(uint256)", std::vector<bytes>{encodeArgs(2)});
 }
 
 BOOST_AUTO_TEST_CASE(exponent_size)
@@ -250,9 +249,9 @@ BOOST_AUTO_TEST_CASE(exponent_size)
 		}
 	)";
 	testCreationTimeGas(sourceCode);
-	testRunTimeGas("f(uint256)", vector<bytes>{encodeArgs(2)});
-	testRunTimeGas("g(uint256)", vector<bytes>{encodeArgs(2)});
-	testRunTimeGas("h(uint256)", vector<bytes>{encodeArgs(2)});
+	testRunTimeGas("f(uint256)", std::vector<bytes>{encodeArgs(2)});
+	testRunTimeGas("g(uint256)", std::vector<bytes>{encodeArgs(2)});
+	testRunTimeGas("h(uint256)", std::vector<bytes>{encodeArgs(2)});
 }
 
 BOOST_AUTO_TEST_CASE(balance_gas)
@@ -265,7 +264,7 @@ BOOST_AUTO_TEST_CASE(balance_gas)
 		}
 	)";
 	testCreationTimeGas(sourceCode);
-	testRunTimeGas("lookup_balance(address)", vector<bytes>{encodeArgs(2), encodeArgs(100)});
+	testRunTimeGas("lookup_balance(address)", std::vector<bytes>{encodeArgs(2), encodeArgs(100)});
 }
 
 BOOST_AUTO_TEST_CASE(extcodesize_gas)
@@ -280,7 +279,7 @@ BOOST_AUTO_TEST_CASE(extcodesize_gas)
 		}
 	)";
 	testCreationTimeGas(sourceCode);
-	testRunTimeGas("f()", vector<bytes>{encodeArgs()});
+	testRunTimeGas("f()", std::vector<bytes>{encodeArgs()});
 }
 
 BOOST_AUTO_TEST_CASE(regular_functions_exclude_fallback)
@@ -294,7 +293,7 @@ BOOST_AUTO_TEST_CASE(regular_functions_exclude_fallback)
 		}
 	)";
 	testCreationTimeGas(sourceCode);
-	testRunTimeGas("x()", vector<bytes>{encodeArgs()});
+	testRunTimeGas("x()", std::vector<bytes>{encodeArgs()});
 }
 
 BOOST_AUTO_TEST_CASE(complex_control_flow)
@@ -335,7 +334,7 @@ BOOST_AUTO_TEST_CASE(complex_control_flow)
 	)";
 	testCreationTimeGas(sourceCode);
 	// max gas is used for small x
-	testRunTimeGas("ln(int128)", vector<bytes>{encodeArgs(0), encodeArgs(10), encodeArgs(105), encodeArgs(30000)});
+	testRunTimeGas("ln(int128)", std::vector<bytes>{encodeArgs(0), encodeArgs(10), encodeArgs(105), encodeArgs(30000)});
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index 936c1b891f..086060588a 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -33,10 +33,9 @@ using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 using namespace solidity;
-using namespace std;
 using namespace boost::unit_test;
 
-GasTest::GasTest(string const& _filename):
+GasTest::GasTest(std::string const& _filename):
 	TestCase(_filename)
 {
 	m_source = m_reader.source();
@@ -48,20 +47,20 @@ GasTest::GasTest(string const& _filename):
 
 void GasTest::parseExpectations(std::istream& _stream)
 {
-	map<std::string, std::string>* currentKind = nullptr;
-	string line;
+	std::map<std::string, std::string>* currentKind = nullptr;
+	std::string line;
 
 	while (getline(_stream, line))
 		if (!boost::starts_with(line, "// "))
-			BOOST_THROW_EXCEPTION(runtime_error("Invalid expectation: expected \"// \"."));
+			BOOST_THROW_EXCEPTION(std::runtime_error("Invalid expectation: expected \"// \"."));
 		else if (boost::ends_with(line, ":"))
 		{
-			string kind = line.substr(3, line.length() - 4);
+			std::string kind = line.substr(3, line.length() - 4);
 			boost::trim(kind);
 			currentKind = &m_expectations[std::move(kind)];
 		}
 		else if (!currentKind)
-			BOOST_THROW_EXCEPTION(runtime_error("No function kind specified. Expected \"creation:\", \"external:\" or \"internal:\"."));
+			BOOST_THROW_EXCEPTION(std::runtime_error("No function kind specified. Expected \"creation:\", \"external:\" or \"internal:\"."));
 		else
 		{
 			auto it = line.begin() + 3;
@@ -69,18 +68,18 @@ void GasTest::parseExpectations(std::istream& _stream)
 			auto functionNameBegin = it;
 			while (it != line.end() && *it != ':')
 				++it;
-			string functionName(functionNameBegin, it);
+			std::string functionName(functionNameBegin, it);
 			if (functionName == "fallback")
 				functionName.clear();
 			expect(it, line.end(), ':');
 			skipWhitespace(it, line.end());
 			if (it == line.end())
-				BOOST_THROW_EXCEPTION(runtime_error("Invalid expectation: expected gas cost."));
+				BOOST_THROW_EXCEPTION(std::runtime_error("Invalid expectation: expected gas cost."));
 			(*currentKind)[functionName] = std::string(it, line.end());
 		}
 }
 
-void GasTest::printUpdatedExpectations(ostream& _stream, string const& _linePrefix) const
+void GasTest::printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const
 {
 	Json::Value estimates = compiler().gasEstimates(compiler().lastContractName());
 	for (auto groupIt = estimates.begin(); groupIt != estimates.end(); ++groupIt)
@@ -98,7 +97,7 @@ void GasTest::printUpdatedExpectations(ostream& _stream, string const& _linePref
 	}
 }
 
-TestCase::TestResult GasTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+TestCase::TestResult GasTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	compiler().reset();
 	// Prerelease CBOR metadata varies in size due to changing version numbers and build dates.
@@ -153,10 +152,10 @@ TestCase::TestResult GasTest::run(ostream& _stream, string const& _linePrefix, b
 	}
 }
 
-void GasTest::printSource(ostream& _stream, string const& _linePrefix, bool) const
+void GasTest::printSource(std::ostream& _stream, std::string const& _linePrefix, bool) const
 {
-	string line;
-	istringstream input(m_source);
+	std::string line;
+	std::istringstream input(m_source);
 	while (getline(input, line))
 		_stream << _linePrefix << line << std::endl;
 }
diff --git a/test/libsolidity/Imports.cpp b/test/libsolidity/Imports.cpp
index cf5aca85cb..5f094d1579 100644
--- a/test/libsolidity/Imports.cpp
+++ b/test/libsolidity/Imports.cpp
@@ -32,7 +32,6 @@
 
 #include <string>
 
-using namespace std;
 
 namespace solidity::frontend::test
 {
@@ -42,7 +41,7 @@ BOOST_AUTO_TEST_SUITE(SolidityImports)
 BOOST_AUTO_TEST_CASE(remappings)
 {
 	CompilerStack c;
-	c.setRemappings(vector<ImportRemapper::Remapping>{{"", "s", "s_1.4.6"},{"", "t", "Tee"}});
+	c.setRemappings(std::vector<ImportRemapper::Remapping>{{"", "s", "s_1.4.6"},{"", "t", "Tee"}});
 	c.setSources({
 		{"a", "import \"s/s.sol\"; contract A is S {} pragma solidity >=0.0;"},
 		{"b", "import \"t/tee.sol\"; contract A is Tee {} pragma solidity >=0.0;"},
@@ -56,7 +55,7 @@ BOOST_AUTO_TEST_CASE(remappings)
 BOOST_AUTO_TEST_CASE(context_dependent_remappings)
 {
 	CompilerStack c;
-	c.setRemappings(vector<ImportRemapper::Remapping>{{"a", "s", "s_1.4.6"}, {"b", "s", "s_1.4.7"}});
+	c.setRemappings(std::vector<ImportRemapper::Remapping>{{"a", "s", "s_1.4.6"}, {"b", "s", "s_1.4.7"}});
 	c.setSources({
 		{"a/a.sol", "import \"s/s.sol\"; contract A is SSix {} pragma solidity >=0.0;"},
 		{"b/b.sol", "import \"s/s.sol\"; contract B is SSeven {} pragma solidity >=0.0;"},
@@ -70,7 +69,7 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings)
 BOOST_AUTO_TEST_CASE(context_dependent_remappings_ensure_default_and_module_preserved)
 {
 	CompilerStack c;
-	c.setRemappings(vector<ImportRemapper::Remapping>{
+	c.setRemappings(std::vector<ImportRemapper::Remapping>{
 		{"", "foo", "vendor/foo_2.0.0"},
 		{"vendor/bar", "foo", "vendor/foo_1.0.0"},
 		{"", "bar", "vendor/bar"}
@@ -88,7 +87,7 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_ensure_default_and_module_pres
 BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent_1)
 {
 	CompilerStack c;
-	c.setRemappings(vector<ImportRemapper::Remapping>{{"a", "x/y/z", "d"}, {"a/b", "x", "e"}});
+	c.setRemappings(std::vector<ImportRemapper::Remapping>{{"a", "x/y/z", "d"}, {"a/b", "x", "e"}});
 	c.setSources({
 		{"a/main.sol", "import \"x/y/z/z.sol\"; contract Main is D {} pragma solidity >=0.0;"},
 		{"a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;"},
@@ -102,7 +101,7 @@ BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent_1)
 BOOST_AUTO_TEST_CASE(context_dependent_remappings_order_independent_2)
 {
 	CompilerStack c;
-	c.setRemappings(vector<ImportRemapper::Remapping>{{"a/b", "x", "e"}, {"a", "x/y/z", "d"}});
+	c.setRemappings(std::vector<ImportRemapper::Remapping>{{"a/b", "x", "e"}, {"a", "x/y/z", "d"}});
 	c.setSources({
 		{"a/main.sol", "import \"x/y/z/z.sol\"; contract Main is D {} pragma solidity >=0.0;"},
 		{"a/b/main.sol", "import \"x/y/z/z.sol\"; contract Main is E {} pragma solidity >=0.0;"},
diff --git a/test/libsolidity/InlineAssembly.cpp b/test/libsolidity/InlineAssembly.cpp
index d59b843ddb..1c848d600d 100644
--- a/test/libsolidity/InlineAssembly.cpp
+++ b/test/libsolidity/InlineAssembly.cpp
@@ -42,7 +42,6 @@
 #include <optional>
 #include <string>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::yul;
 
@@ -53,7 +52,7 @@ namespace
 {
 
 std::optional<Error> parseAndReturnFirstError(
-	string const& _source,
+	std::string const& _source,
 	bool _assemble = false,
 	bool _allowWarnings = true,
 	YulStack::Language _language = YulStack::Language::Assembly,
@@ -79,7 +78,7 @@ std::optional<Error> parseAndReturnFirstError(
 		BOOST_FAIL("Fatal error leaked.");
 		success = false;
 	}
-	shared_ptr<Error const> error;
+	std::shared_ptr<Error const> error;
 	for (auto const& e: stack.errors())
 	{
 		if (_allowWarnings && e->type() == Error::Type::Warning)
@@ -99,7 +98,7 @@ std::optional<Error> parseAndReturnFirstError(
 }
 
 bool successParse(
-	string const& _source,
+	std::string const& _source,
 	bool _assemble = false,
 	bool _allowWarnings = true,
 	YulStack::Language _language = YulStack::Language::Assembly,
@@ -109,7 +108,7 @@ bool successParse(
 	return !parseAndReturnFirstError(_source, _assemble, _allowWarnings, _language, _machine);
 }
 
-bool successAssemble(string const& _source, bool _allowWarnings = true, YulStack::Language _language = YulStack::Language::Assembly)
+bool successAssemble(std::string const& _source, bool _allowWarnings = true, YulStack::Language _language = YulStack::Language::Assembly)
 {
 	return
 		successParse(_source, true, _allowWarnings, _language, YulStack::Machine::EVM);
@@ -128,7 +127,7 @@ Error expectError(
 	return *error;
 }
 
-void parsePrintCompare(string const& _source, bool _canWarn = false)
+void parsePrintCompare(std::string const& _source, bool _canWarn = false)
 {
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
@@ -142,7 +141,7 @@ void parsePrintCompare(string const& _source, bool _canWarn = false)
 		BOOST_REQUIRE(!Error::containsErrors(stack.errors()));
 	else
 		BOOST_REQUIRE(stack.errors().empty());
-	string expectation = "object \"object\" {\n    code " + boost::replace_all_copy(_source, "\n", "\n    ") + "\n}\n";
+	std::string expectation = "object \"object\" {\n    code " + boost::replace_all_copy(_source, "\n", "\n    ") + "\n}\n";
 	BOOST_CHECK_EQUAL(stack.print(), expectation);
 }
 
@@ -219,8 +218,8 @@ BOOST_AUTO_TEST_CASE(print_string_literals)
 
 BOOST_AUTO_TEST_CASE(print_string_literal_unicode)
 {
-	string source = "{ let x := \"\\u1bac\" }";
-	string parsed = "object \"object\" {\n    code { let x := \"\\xe1\\xae\\xac\" }\n}\n";
+	std::string source = "{ let x := \"\\u1bac\" }";
+	std::string parsed = "object \"object\" {\n    code { let x := \"\\xe1\\xae\\xac\" }\n}\n";
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
 		solidity::test::CommonOptions::get().eofVersion(),
@@ -232,7 +231,7 @@ BOOST_AUTO_TEST_CASE(print_string_literal_unicode)
 	BOOST_REQUIRE(stack.errors().empty());
 	BOOST_CHECK_EQUAL(stack.print(), parsed);
 
-	string parsedInner = "{ let x := \"\\xe1\\xae\\xac\" }";
+	std::string parsedInner = "{ let x := \"\\xe1\\xae\\xac\" }";
 	parsePrintCompare(parsedInner);
 }
 
@@ -258,7 +257,7 @@ BOOST_AUTO_TEST_CASE(function_definitions_multiple_args)
 
 BOOST_AUTO_TEST_CASE(function_calls)
 {
-	string source = R"({
+	std::string source = R"({
 	function y()
 	{ }
 	function f(a) -> b
diff --git a/test/libsolidity/LibSolc.cpp b/test/libsolidity/LibSolc.cpp
index 3375f8f92d..1a7a6ba696 100644
--- a/test/libsolidity/LibSolc.cpp
+++ b/test/libsolidity/LibSolc.cpp
@@ -27,7 +27,6 @@
 #include <libsolidity/interface/Version.h>
 #include <libsolc/libsolc.h>
 
-using namespace std;
 
 namespace solidity::frontend::test
 {
@@ -37,7 +36,7 @@ namespace
 
 /// TODO: share this between StandardCompiler.cpp
 /// Helper to match a specific error type and message
-bool containsError(Json::Value const& _compilerResult, string const& _type, string const& _message)
+bool containsError(Json::Value const& _compilerResult, std::string const& _type, std::string const& _message)
 {
 	if (!_compilerResult.isMember("errors"))
 		return false;
@@ -54,10 +53,10 @@ bool containsError(Json::Value const& _compilerResult, string const& _type, stri
 	return false;
 }
 
-Json::Value compile(string const& _input, CStyleReadFileCallback _callback = nullptr)
+Json::Value compile(std::string const& _input, CStyleReadFileCallback _callback = nullptr)
 {
 	char* output_ptr = solidity_compile(_input.c_str(), _callback, nullptr);
-	string output(output_ptr);
+	std::string output(output_ptr);
 	solidity_free(output_ptr);
 	solidity_reset();
 	Json::Value ret;
@@ -65,7 +64,7 @@ Json::Value compile(string const& _input, CStyleReadFileCallback _callback = nul
 	return ret;
 }
 
-char* stringToSolidity(string const& _input)
+char* stringToSolidity(std::string const& _input)
 {
 	char* ptr = solidity_alloc(_input.length());
 	BOOST_REQUIRE(ptr != nullptr);
@@ -79,14 +78,14 @@ BOOST_AUTO_TEST_SUITE(LibSolc)
 
 BOOST_AUTO_TEST_CASE(read_version)
 {
-	string output(solidity_version());
+	std::string output(solidity_version());
 	BOOST_CHECK(output.find(VersionString) == 0);
 }
 
 BOOST_AUTO_TEST_CASE(read_license)
 {
-	string output(solidity_license());
-	BOOST_CHECK(output.find("GNU GENERAL PUBLIC LICENSE") != string::npos);
+	std::string output(solidity_license());
+	BOOST_CHECK(output.find("GNU GENERAL PUBLIC LICENSE") != std::string::npos);
 }
 
 BOOST_AUTO_TEST_CASE(standard_compilation)
@@ -148,16 +147,16 @@ BOOST_AUTO_TEST_CASE(with_callback)
 			// Passed in a nullptr in the compile() helper above.
 			BOOST_REQUIRE(_context == nullptr);
 			// Caller frees the pointers.
-			BOOST_REQUIRE(string(_kind) == ReadCallback::kindString(ReadCallback::Kind::ReadFile));
-			if (string(_path) == "found.sol")
+			BOOST_REQUIRE(std::string(_kind) == ReadCallback::kindString(ReadCallback::Kind::ReadFile));
+			if (std::string(_path) == "found.sol")
 			{
-				static string content{"import \"missing.sol\"; contract B {}"};
+				static std::string content{"import \"missing.sol\"; contract B {}"};
 				*o_contents = stringToSolidity(content);
 				*o_error = nullptr;
 			}
-			else if (string(_path) == "missing.sol")
+			else if (std::string(_path) == "missing.sol")
 			{
-				static string errorMsg{"Missing file."};
+				static std::string errorMsg{"Missing file."};
 				*o_error = stringToSolidity(errorMsg);
 				*o_contents = nullptr;
 			}
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index 06d6723f08..c8475469d5 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -28,7 +28,6 @@
 #include <memory>
 #include <stdexcept>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::util::formatting;
@@ -37,7 +36,7 @@ using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 using namespace yul;
 
-TestCase::TestResult MemoryGuardTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	compiler().reset();
 	compiler().setSources(StringMap{{"", m_source}});
@@ -50,7 +49,7 @@ TestCase::TestResult MemoryGuardTest::run(ostream& _stream, string const& _lineP
 	}
 
 	m_obtainedResult.clear();
-	for (string contractName: compiler().contractNames())
+	for (std::string contractName: compiler().contractNames())
 	{
 		ErrorList errors;
 		auto [object, analysisInfo] = yul::test::parse(
@@ -61,7 +60,7 @@ TestCase::TestResult MemoryGuardTest::run(ostream& _stream, string const& _lineP
 
 		if (!object || !analysisInfo || Error::containsErrors(errors))
 		{
-			AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing IR." << endl;
+			AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing IR." << std::endl;
 			return TestResult::FatalError;
 		}
 
diff --git a/test/libsolidity/Metadata.cpp b/test/libsolidity/Metadata.cpp
index 1dc3dfd268..029419af11 100644
--- a/test/libsolidity/Metadata.cpp
+++ b/test/libsolidity/Metadata.cpp
@@ -29,7 +29,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::frontend::test
 {
@@ -37,13 +36,13 @@ namespace solidity::frontend::test
 namespace
 {
 
-map<string, string> requireParsedCBORMetadata(bytes const& _bytecode, CompilerStack::MetadataFormat _metadataFormat)
+std::map<std::string, std::string> requireParsedCBORMetadata(bytes const& _bytecode, CompilerStack::MetadataFormat _metadataFormat)
 {
 	bytes cborMetadata = solidity::test::onlyMetadata(_bytecode);
 	if (_metadataFormat != CompilerStack::MetadataFormat::NoMetadata)
 	{
 		BOOST_REQUIRE(!cborMetadata.empty());
-		std::optional<map<string, string>> tmp = solidity::test::parseCBORMetadata(cborMetadata);
+		std::optional<std::map<std::string, std::string>> tmp = solidity::test::parseCBORMetadata(cborMetadata);
 		BOOST_REQUIRE(tmp);
 		return *tmp;
 	}
@@ -51,13 +50,13 @@ map<string, string> requireParsedCBORMetadata(bytes const& _bytecode, CompilerSt
 	return {};
 }
 
-optional<string> compileAndCheckLicenseMetadata(string const& _contractName, char const* _sourceCode)
+std::optional<std::string> compileAndCheckLicenseMetadata(std::string const& _contractName, char const* _sourceCode)
 {
 	CompilerStack compilerStack;
 	compilerStack.setSources({{"A.sol", _sourceCode}});
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-	string const& serialisedMetadata = compilerStack.metadata(_contractName);
+	std::string const& serialisedMetadata = compilerStack.metadata(_contractName);
 	Json::Value metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -71,7 +70,7 @@ optional<string> compileAndCheckLicenseMetadata(string const& _contractName, cha
 		return metadata["sources"]["A.sol"]["license"].asString();
 	}
 	else
-		return nullopt;
+		return std::nullopt;
 }
 
 }
@@ -93,7 +92,7 @@ BOOST_AUTO_TEST_CASE(metadata_stamp)
 		CompilerStack::MetadataFormat::WithReleaseVersionTag,
 		CompilerStack::MetadataFormat::WithPrereleaseVersionTag
 	})
-		for (auto metadataHash: set<CompilerStack::MetadataHash>{
+		for (auto metadataHash: std::set<CompilerStack::MetadataHash>{
 			CompilerStack::MetadataHash::IPFS,
 			CompilerStack::MetadataHash::Bzzr1,
 			CompilerStack::MetadataHash::None
@@ -107,7 +106,7 @@ BOOST_AUTO_TEST_CASE(metadata_stamp)
 			compilerStack.setMetadataHash(metadataHash);
 			BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 			bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
-			string const& metadata = compilerStack.metadata("test");
+			std::string const& metadata = compilerStack.metadata("test");
 			BOOST_CHECK(solidity::test::isValidMetadata(metadata));
 
 			auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
@@ -116,7 +115,7 @@ BOOST_AUTO_TEST_CASE(metadata_stamp)
 			else
 			{
 				bytes hash;
-				string hashMethod;
+				std::string hashMethod;
 				if (metadataHash == CompilerStack::MetadataHash::IPFS)
 				{
 					hash = util::ipfsHash(metadata);
@@ -166,7 +165,7 @@ BOOST_AUTO_TEST_CASE(metadata_stamp_experimental)
 			CompilerStack::MetadataFormat::WithReleaseVersionTag,
 			CompilerStack::MetadataFormat::WithPrereleaseVersionTag
 	})
-		for (auto metadataHash: set<CompilerStack::MetadataHash>{
+		for (auto metadataHash: std::set<CompilerStack::MetadataHash>{
 			CompilerStack::MetadataHash::IPFS,
 			CompilerStack::MetadataHash::Bzzr1,
 			CompilerStack::MetadataHash::None
@@ -180,7 +179,7 @@ BOOST_AUTO_TEST_CASE(metadata_stamp_experimental)
 			compilerStack.setMetadataHash(metadataHash);
 			BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 			bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
-			string const& metadata = compilerStack.metadata("test");
+			std::string const& metadata = compilerStack.metadata("test");
 			BOOST_CHECK(solidity::test::isValidMetadata(metadata));
 
 			auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
@@ -189,7 +188,7 @@ BOOST_AUTO_TEST_CASE(metadata_stamp_experimental)
 			else
 			{
 				bytes hash;
-				string hashMethod;
+				std::string hashMethod;
 				if (metadataHash == CompilerStack::MetadataHash::IPFS)
 				{
 					hash = util::ipfsHash(metadata);
@@ -250,7 +249,7 @@ BOOST_AUTO_TEST_CASE(metadata_eof_experimental)
 		compilerStack.setOptimiserSettings(true);
 		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 		bytes const& bytecode = compilerStack.runtimeObject("test").bytecode;
-		string const& metadata = compilerStack.metadata("test");
+		std::string const& metadata = compilerStack.metadata("test");
 		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
 
 		auto const cborMetadata = requireParsedCBORMetadata(bytecode, metadataFormat);
@@ -288,7 +287,7 @@ BOOST_AUTO_TEST_CASE(metadata_relevant_sources)
 	compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-	string const& serialisedMetadata = compilerStack.metadata("A");
+	std::string const& serialisedMetadata = compilerStack.metadata("A");
 	Json::Value metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -329,7 +328,7 @@ BOOST_AUTO_TEST_CASE(metadata_relevant_sources_imports)
 	compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-	string const& serialisedMetadata = compilerStack.metadata("C");
+	std::string const& serialisedMetadata = compilerStack.metadata("C");
 	Json::Value metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -357,7 +356,7 @@ BOOST_AUTO_TEST_CASE(metadata_useLiteralContent)
 		compilerStack.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 		compilerStack.useMetadataLiteralSources(_literal);
 		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
-		string metadata_str = compilerStack.metadata("test");
+		std::string metadata_str = compilerStack.metadata("test");
 		Json::Value metadata;
 		BOOST_REQUIRE(util::jsonParseStrict(metadata_str, metadata));
 		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -407,7 +406,7 @@ BOOST_AUTO_TEST_CASE(metadata_viair)
 		BOOST_CHECK(compilerStack.cborMetadata("test") == compilerStack.cborMetadata("test", _viaIR));
 		BOOST_CHECK(compilerStack.cborMetadata("test") != compilerStack.cborMetadata("test", !_viaIR));
 
-		map<string, string> const parsedCBORMetadata = requireParsedCBORMetadata(
+		std::map<std::string, std::string> const parsedCBORMetadata = requireParsedCBORMetadata(
 			compilerStack.runtimeObject("test").bytecode,
 			CompilerStack::MetadataFormat::WithReleaseVersionTag
 		);
@@ -431,7 +430,7 @@ BOOST_AUTO_TEST_CASE(metadata_revert_strings)
 	compilerStack.setRevertStringBehaviour(RevertStrings::Strip);
 	BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-	string const& serialisedMetadata = compilerStack.metadata("A");
+	std::string const& serialisedMetadata = compilerStack.metadata("A");
 	Json::Value metadata;
 	BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 	BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -447,7 +446,7 @@ BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
 		}
 	)";
 
-	vector<tuple<string, string>> sequences =
+	std::vector<std::tuple<std::string, std::string>> sequences =
 	{
 		// {"<optimizer sequence>", "<optimizer cleanup sequence>"}
 		{"", ""},
@@ -456,7 +455,7 @@ BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
 		{"dhfoDgvulfnTUtnIf", "fDn"}
 	};
 
-	auto check = [sourceCode](string const& _optimizerSequence, string const& _optimizerCleanupSequence)
+	auto check = [sourceCode](std::string const& _optimizerSequence, std::string const& _optimizerCleanupSequence)
 	{
 		OptimiserSettings optimizerSettings = OptimiserSettings::minimal();
 		optimizerSettings.runYulOptimiser = true;
@@ -469,7 +468,7 @@ BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
 
 		BOOST_REQUIRE_MESSAGE(compilerStack.compile(), "Compiling contract failed");
 
-		string const& serialisedMetadata = compilerStack.metadata("C");
+		std::string const& serialisedMetadata = compilerStack.metadata("C");
 		Json::Value metadata;
 		BOOST_REQUIRE(util::jsonParseStrict(serialisedMetadata, metadata));
 		BOOST_CHECK(solidity::test::isValidMetadata(metadata));
@@ -477,8 +476,8 @@ BOOST_AUTO_TEST_CASE(metadata_optimiser_sequence)
 		BOOST_CHECK(metadata["settings"]["optimizer"]["details"].isMember("yulDetails"));
 		BOOST_CHECK(metadata["settings"]["optimizer"]["details"]["yulDetails"].isMember("optimizerSteps"));
 
-		string const metadataOptimizerSteps = metadata["settings"]["optimizer"]["details"]["yulDetails"]["optimizerSteps"].asString();
-		string const expectedMetadataOptimiserSteps = _optimizerSequence + ":" + _optimizerCleanupSequence;
+		std::string const metadataOptimizerSteps = metadata["settings"]["optimizer"]["details"]["yulDetails"]["optimizerSteps"].asString();
+		std::string const expectedMetadataOptimiserSteps = _optimizerSequence + ":" + _optimizerCleanupSequence;
 		BOOST_CHECK_EQUAL(metadataOptimizerSteps, expectedMetadataOptimiserSteps);
 	};
 
@@ -493,7 +492,7 @@ BOOST_AUTO_TEST_CASE(metadata_license_missing)
 		contract C {
 		}
 	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == nullopt);
+	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == std::nullopt);
 }
 
 BOOST_AUTO_TEST_CASE(metadata_license_gpl3)
@@ -544,7 +543,7 @@ BOOST_AUTO_TEST_CASE(metadata_license_bidi_marks)
 		"// NOTE: The text above is reversed using Unicode directional marks. In raw form it would look like this:\n"
 		"// <LRO>0.3-LPG :reifitnedI-esneciL-XDPS<PDF>\n"
 		"contract C {}\n";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == nullopt);
+	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == std::nullopt);
 }
 
 BOOST_AUTO_TEST_CASE(metadata_license_bottom)
@@ -579,7 +578,7 @@ BOOST_AUTO_TEST_CASE(metadata_license_in_string)
 			bytes license = "// SPDX-License-Identifier: GPL-3.0";
 		}
 	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == nullopt);
+	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == std::nullopt);
 }
 
 BOOST_AUTO_TEST_CASE(metadata_license_in_contract)
@@ -589,7 +588,7 @@ BOOST_AUTO_TEST_CASE(metadata_license_in_contract)
 		// SPDX-License-Identifier: GPL-3.0
 		}
 	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == nullopt);
+	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == std::nullopt);
 }
 
 BOOST_AUTO_TEST_CASE(metadata_license_missing_colon)
@@ -598,7 +597,7 @@ BOOST_AUTO_TEST_CASE(metadata_license_missing_colon)
 		// SPDX-License-Identifier GPL-3.0
 		contract C {}
 	)";
-	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == nullopt);
+	BOOST_CHECK(compileAndCheckLicenseMetadata("C", sourceCode) == std::nullopt);
 }
 
 BOOST_AUTO_TEST_CASE(metadata_license_multiline)
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 366f0f9f47..6368bfa4f1 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -21,13 +21,12 @@
 
 #include <range/v3/action/remove_if.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 
-SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, EVMVersion{})
+SMTCheckerTest::SMTCheckerTest(std::string const& _filename): SyntaxTest(_filename, EVMVersion{})
 {
 	auto contract = m_reader.stringSetting("SMTContract", "");
 	if (!contract.empty())
@@ -37,7 +36,7 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	if (extCallsMode)
 		m_modelCheckerSettings.externalCalls = *extCallsMode;
 	else
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT external calls mode."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT external calls mode."));
 
 	auto const& showUnproved = m_reader.stringSetting("SMTShowUnproved", "yes");
 	if (showUnproved == "no")
@@ -45,7 +44,7 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	else if (showUnproved == "yes")
 		m_modelCheckerSettings.showUnproved = true;
 	else
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT \"show unproved\" choice."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT \"show unproved\" choice."));
 
 	auto const& showUnsupported = m_reader.stringSetting("SMTShowUnsupported", "yes");
 	if (showUnsupported == "no")
@@ -53,14 +52,14 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	else if (showUnsupported == "yes")
 		m_modelCheckerSettings.showUnsupported = true;
 	else
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT \"show unsupported\" choice."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT \"show unsupported\" choice."));
 
 	m_modelCheckerSettings.solvers = smtutil::SMTSolverChoice::None();
 	auto const& choice = m_reader.stringSetting("SMTSolvers", "z3");
 	if (choice == "none")
 		m_modelCheckerSettings.solvers = smtutil::SMTSolverChoice::None();
 	else if (!m_modelCheckerSettings.solvers.setSolver(choice))
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT solver choice."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT solver choice."));
 
 	m_modelCheckerSettings.solvers &= ModelChecker::availableSolvers();
 
@@ -71,13 +70,13 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	if (targets)
 		m_modelCheckerSettings.targets = *targets;
 	else
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT targets."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT targets."));
 
 	auto engine = ModelCheckerEngine::fromString(m_reader.stringSetting("SMTEngine", "all"));
 	if (engine)
 		m_modelCheckerSettings.engine = *engine;
 	else
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT engine choice."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT engine choice."));
 
 	if (m_modelCheckerSettings.solvers.none() || m_modelCheckerSettings.engine.none())
 		m_shouldRun = false;
@@ -88,10 +87,10 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	else if (ignoreCex == "yes")
 		m_ignoreCex = true;
 	else
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT counterexample choice."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT counterexample choice."));
 
-	static auto removeInv = [](vector<SyntaxTestError>&& errors) {
-		vector<SyntaxTestError> filtered;
+	static auto removeInv = [](std::vector<SyntaxTestError>&& errors) {
+		std::vector<SyntaxTestError> filtered;
 		for (auto&& e: errors)
 			if (e.errorId != 1180_error)
 				filtered.emplace_back(e);
@@ -106,10 +105,10 @@ SMTCheckerTest::SMTCheckerTest(string const& _filename): SyntaxTest(_filename, E
 	else if (ignoreInv == "yes")
 		m_modelCheckerSettings.invariants = ModelCheckerInvariants::None();
 	else
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid SMT invariant choice."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid SMT invariant choice."));
 
 	auto const& ignoreOSSetting = m_reader.stringSetting("SMTIgnoreOS", "none");
-	for (string const& os: ignoreOSSetting | ranges::views::split(',') | ranges::to<vector<string>>())
+	for (std::string const& os: ignoreOSSetting | ranges::views::split(',') | ranges::to<std::vector<std::string>>())
 	{
 #ifdef __APPLE__
 		if (os == "macos")
@@ -139,11 +138,11 @@ void SMTCheckerTest::filterObtainedErrors()
 	SyntaxTest::filterObtainedErrors();
 	m_unfilteredErrorList = m_errorList;
 
-	static auto removeCex = [](vector<SyntaxTestError>& errors) {
+	static auto removeCex = [](std::vector<SyntaxTestError>& errors) {
 		for (auto& e: errors)
 			if (
 				auto cexPos = e.message.find("\\nCounterexample");
-				cexPos != string::npos
+				cexPos != std::string::npos
 			)
 				e.message = e.message.substr(0, cexPos);
 	};
@@ -155,7 +154,7 @@ void SMTCheckerTest::filterObtainedErrors()
 	}
 }
 
-void SMTCheckerTest::printUpdatedExpectations(ostream &_stream, const string &_linePrefix) const {
+void SMTCheckerTest::printUpdatedExpectations(std::ostream &_stream, const std::string &_linePrefix) const {
 	if (!m_unfilteredErrorList.empty())
 		printErrorList(_stream, m_unfilteredErrorList, _linePrefix, false);
 	else
diff --git a/test/libsolidity/SemVerMatcher.cpp b/test/libsolidity/SemVerMatcher.cpp
index fe82854e69..c2fedc2d4a 100644
--- a/test/libsolidity/SemVerMatcher.cpp
+++ b/test/libsolidity/SemVerMatcher.cpp
@@ -31,7 +31,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::langutil;
 
 namespace solidity::frontend::test
@@ -42,16 +41,16 @@ BOOST_AUTO_TEST_SUITE(SemVerMatcher)
 namespace
 {
 
-SemVerMatchExpression parseExpression(string const& _input)
+SemVerMatchExpression parseExpression(std::string const& _input)
 {
 	CharStream stream(_input, "");
 	Scanner scanner{stream};
-	vector<string> literals;
-	vector<Token> tokens;
+	std::vector<std::string> literals;
+	std::vector<Token> tokens;
 	while (scanner.currentToken() != Token::EOS)
 	{
 		auto token = scanner.currentToken();
-		string literal = scanner.currentLiteral();
+		std::string literal = scanner.currentLiteral();
 		if (literal.empty() && TokenTraits::toString(token))
 			literal = TokenTraits::toString(token);
 		literals.push_back(literal);
@@ -100,7 +99,7 @@ BOOST_AUTO_TEST_CASE(exception_on_invalid_version_in_semverversion_constructor)
 BOOST_AUTO_TEST_CASE(positive_range)
 {
 	// Positive range tests
-	vector<pair<string, string>> tests = {
+	std::vector<std::pair<std::string, std::string>> tests = {
 		{"*", "1.2.3-foo"},
 		{"1.0.0 - 2.0.0", "1.2.3"},
 		{"1.0.0", "1.0.0"},
@@ -198,7 +197,7 @@ BOOST_AUTO_TEST_CASE(positive_range)
 BOOST_AUTO_TEST_CASE(negative_range)
 {
 	// Negative range tests
-	vector<pair<string, string>> tests = {
+	std::vector<std::pair<std::string, std::string>> tests = {
 		{"^0^1", "0.0.0"},
 		{"^0^1", "1.0.0"},
 		{"1.0.0 - 2.0.0", "2.2.3"},
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index 0997a6625f..e576ae69d1 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -34,7 +34,6 @@
 #include <string>
 #include <utility>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::langutil;
@@ -43,9 +42,10 @@ using namespace solidity::util::formatting;
 using namespace solidity::frontend::test;
 using namespace boost::algorithm;
 using namespace boost::unit_test;
+using namespace std::string_literals;
 namespace fs = boost::filesystem;
 
-ostream& solidity::frontend::test::operator<<(ostream& _output, RequiresYulOptimizer _requiresYulOptimizer)
+std::ostream& solidity::frontend::test::operator<<(std::ostream& _output, RequiresYulOptimizer _requiresYulOptimizer)
 {
 	switch (_requiresYulOptimizer)
 	{
@@ -57,10 +57,10 @@ ostream& solidity::frontend::test::operator<<(ostream& _output, RequiresYulOptim
 }
 
 SemanticTest::SemanticTest(
-	string const& _filename,
+	std::string const& _filename,
 	langutil::EVMVersion _evmVersion,
-	optional<uint8_t> _eofVersion,
-	vector<boost::filesystem::path> const& _vmPaths,
+	std::optional<uint8_t> _eofVersion,
+	std::vector<boost::filesystem::path> const& _vmPaths,
 	bool _enforceGasCost,
 	u256 _enforceGasCostMinValue
 ):
@@ -73,9 +73,9 @@ SemanticTest::SemanticTest(
 	m_enforceGasCost(_enforceGasCost),
 	m_enforceGasCostMinValue(std::move(_enforceGasCostMinValue))
 {
-	static set<string> const compileViaYulAllowedValues{"also", "true", "false"};
-	static set<string> const yulRunTriggers{"also", "true"};
-	static set<string> const legacyRunTriggers{"also", "false", "default"};
+	static std::set<std::string> const compileViaYulAllowedValues{"also", "true", "false"};
+	static std::set<std::string> const yulRunTriggers{"also", "true"};
+	static std::set<std::string> const legacyRunTriggers{"also", "false", "default"};
 
 	m_requiresYulOptimizer = m_reader.enumSetting<RequiresYulOptimizer>(
 		"requiresYulOptimizer",
@@ -91,14 +91,14 @@ SemanticTest::SemanticTest(
 	if (m_runWithABIEncoderV1Only && !solidity::test::CommonOptions::get().useABIEncoderV1)
 		m_shouldRun = false;
 
-	string compileViaYul = m_reader.stringSetting("compileViaYul", "also");
+	std::string compileViaYul = m_reader.stringSetting("compileViaYul", "also");
 	if (m_runWithABIEncoderV1Only && compileViaYul != "false")
-		BOOST_THROW_EXCEPTION(runtime_error(
+		BOOST_THROW_EXCEPTION(std::runtime_error(
 			"ABIEncoderV1Only tests cannot be run via yul, "
 			"so they need to also specify ``compileViaYul: false``"
 		));
 	if (!util::contains(compileViaYulAllowedValues, compileViaYul))
-		BOOST_THROW_EXCEPTION(runtime_error("Invalid compileViaYul value: " + compileViaYul + "."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid compileViaYul value: " + compileViaYul + "."));
 	m_testCaseWantsYulRun = util::contains(yulRunTriggers, compileViaYul);
 	m_testCaseWantsLegacyRun = util::contains(legacyRunTriggers, compileViaYul);
 
@@ -118,19 +118,19 @@ SemanticTest::SemanticTest(
 	}
 }
 
-map<string, Builtin> SemanticTest::makeBuiltins()
+std::map<std::string, Builtin> SemanticTest::makeBuiltins()
 {
 	return {
 		{
 			"isoltest_builtin_test",
-			[](FunctionCall const&) -> optional<bytes>
+			[](FunctionCall const&) -> std::optional<bytes>
 			{
 				return toBigEndian(u256(0x1234));
 			}
 		},
 		{
 			"isoltest_side_effects_test",
-			[](FunctionCall const& _call) -> optional<bytes>
+			[](FunctionCall const& _call) -> std::optional<bytes>
 			{
 				if (_call.arguments.parameters.empty())
 					return toBigEndian(0);
@@ -140,7 +140,7 @@ map<string, Builtin> SemanticTest::makeBuiltins()
 		},
 		{
 			"balance",
-			[this](FunctionCall const& _call) -> optional<bytes>
+			[this](FunctionCall const& _call) -> std::optional<bytes>
 			{
 				soltestAssert(_call.arguments.parameters.size() <= 1, "Account address expected.");
 				h160 address;
@@ -153,7 +153,7 @@ map<string, Builtin> SemanticTest::makeBuiltins()
 		},
 		{
 			"storageEmpty",
-			[this](FunctionCall const& _call) -> optional<bytes>
+			[this](FunctionCall const& _call) -> std::optional<bytes>
 			{
 				soltestAssert(_call.arguments.parameters.empty(), "No arguments expected.");
 				return toBigEndian(u256(storageEmpty(m_contractAddress) ? 1 : 0));
@@ -161,7 +161,7 @@ map<string, Builtin> SemanticTest::makeBuiltins()
 		},
 		{
 			"account",
-			[this](FunctionCall const& _call) -> optional<bytes>
+			[this](FunctionCall const& _call) -> std::optional<bytes>
 			{
 				soltestAssert(_call.arguments.parameters.size() == 1, "Account number expected.");
 				size_t accountNumber = static_cast<size_t>(stoi(_call.arguments.parameters.at(0).rawString));
@@ -172,15 +172,15 @@ map<string, Builtin> SemanticTest::makeBuiltins()
 	};
 }
 
-vector<SideEffectHook> SemanticTest::makeSideEffectHooks() const
+std::vector<SideEffectHook> SemanticTest::makeSideEffectHooks() const
 {
 	using namespace std::placeholders;
 	return {
-		[](FunctionCall const& _call) -> vector<string>
+		[](FunctionCall const& _call) -> std::vector<std::string>
 		{
 			if (_call.signature == "isoltest_side_effects_test")
 			{
-				vector<string> result;
+				std::vector<std::string> result;
 				for (auto const& argument: _call.arguments.parameters)
 					result.emplace_back(util::toHex(argument.rawBytes));
 				return result;
@@ -191,7 +191,7 @@ vector<SideEffectHook> SemanticTest::makeSideEffectHooks() const
 	};
 }
 
-string SemanticTest::formatEventParameter(optional<AnnotatedEventSignature> _signature, bool _indexed, size_t _index, bytes const& _data)
+std::string SemanticTest::formatEventParameter(std::optional<AnnotatedEventSignature> _signature, bool _indexed, size_t _index, bytes const& _data)
 {
 	auto isPrintableASCII = [](bytes const& s)
 	{
@@ -214,7 +214,7 @@ string SemanticTest::formatEventParameter(optional<AnnotatedEventSignature> _sig
 		abiType = ABIType(ABIType::Type::String);
 	if (_signature.has_value())
 	{
-		vector<string> const& types = _indexed ? _signature->indexedTypes : _signature->nonIndexedTypes;
+		std::vector<std::string> const& types = _indexed ? _signature->indexedTypes : _signature->nonIndexedTypes;
 		if (_index < types.size())
 		{
 			if (types.at(_index) == "bool")
@@ -224,16 +224,16 @@ string SemanticTest::formatEventParameter(optional<AnnotatedEventSignature> _sig
 	return BytesUtils::formatBytes(_data, abiType);
 }
 
-vector<string> SemanticTest::eventSideEffectHook(FunctionCall const&) const
+std::vector<std::string> SemanticTest::eventSideEffectHook(FunctionCall const&) const
 {
-	vector<string> sideEffects;
-	vector<LogRecord> recordedLogs = ExecutionFramework::recordedLogs();
+	std::vector<std::string> sideEffects;
+	std::vector<LogRecord> recordedLogs = ExecutionFramework::recordedLogs();
 	for (LogRecord const& log: recordedLogs)
 	{
-		optional<AnnotatedEventSignature> eventSignature;
+		std::optional<AnnotatedEventSignature> eventSignature;
 		if (!log.topics.empty())
 			eventSignature = matchEvent(log.topics[0]);
-		stringstream sideEffect;
+		std::stringstream sideEffect;
 		sideEffect << "emit ";
 		if (eventSignature.has_value())
 			sideEffect << eventSignature.value().signature;
@@ -243,7 +243,7 @@ vector<string> SemanticTest::eventSideEffectHook(FunctionCall const&) const
 		if (m_contractAddress != log.creator)
 			sideEffect << " from 0x" << log.creator;
 
-		vector<string> eventStrings;
+		std::vector<std::string> eventStrings;
 		size_t index{0};
 		for (h256 const& topic: log.topics)
 		{
@@ -268,10 +268,10 @@ vector<string> SemanticTest::eventSideEffectHook(FunctionCall const&) const
 	return sideEffects;
 }
 
-optional<AnnotatedEventSignature> SemanticTest::matchEvent(util::h256 const& hash) const
+std::optional<AnnotatedEventSignature> SemanticTest::matchEvent(util::h256 const& hash) const
 {
-	optional<AnnotatedEventSignature> result;
-	for (string& contractName: m_compiler.contractNames())
+	std::optional<AnnotatedEventSignature> result;
+	for (std::string& contractName: m_compiler.contractNames())
 	{
 		ContractDefinition const& contract = m_compiler.contractDefinition(contractName);
 		for (EventDefinition const* event: contract.events())
@@ -312,7 +312,7 @@ frontend::OptimiserSettings SemanticTest::optimizerSettingsFor(RequiresYulOptimi
 	unreachable();
 }
 
-TestCase::TestResult SemanticTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+TestCase::TestResult SemanticTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	TestResult result = TestResult::Success;
 
@@ -338,8 +338,8 @@ TestCase::TestResult SemanticTest::run(ostream& _stream, string const& _linePref
 }
 
 TestCase::TestResult SemanticTest::runTest(
-	ostream& _stream,
-	string const& _linePrefix,
+	std::ostream& _stream,
+	std::string const& _linePrefix,
 	bool _formatted,
 	bool _isYulRun
 )
@@ -354,12 +354,12 @@ TestCase::TestResult SemanticTest::runTest(
 	m_compileViaYul = _isYulRun;
 
 	if (_isYulRun)
-		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Running via Yul: " << endl;
+		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Running via Yul: " << std::endl;
 
 	for (TestFunctionCall& test: m_tests)
 		test.reset();
 
-	map<string, solidity::test::Address> libraries;
+	std::map<std::string, solidity::test::Address> libraries;
 
 	bool constructed = false;
 
@@ -416,7 +416,7 @@ TestCase::TestResult SemanticTest::runTest(
 				output = callLowLevel(test.call().arguments.rawBytes(), test.call().value.value);
 			else if (test.call().kind == FunctionCall::Kind::Builtin)
 			{
-				optional<bytes> builtinOutput = m_builtins.at(test.call().signature)(test.call());
+				std::optional<bytes> builtinOutput = m_builtins.at(test.call().signature)(test.call());
 				if (builtinOutput.has_value())
 				{
 					m_transactionSuccessful = true;
@@ -460,7 +460,7 @@ TestCase::TestResult SemanticTest::runTest(
 				test.setContractABI(m_compiler.contractABI(m_compiler.lastContractName(m_sources.mainSourceFile)));
 		}
 
-		vector<string> effects;
+		std::vector<std::string> effects;
 		for (SideEffectHook const& hook: m_sideEffectHooks)
 			effects += hook(test.call());
 		test.setSideEffects(std::move(effects));
@@ -470,7 +470,7 @@ TestCase::TestResult SemanticTest::runTest(
 
 	if (!success)
 	{
-		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << endl;
+		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Expected result:" << std::endl;
 		for (TestFunctionCall const& test: m_tests)
 		{
 			ErrorReporter errorReporter;
@@ -480,11 +480,11 @@ TestCase::TestResult SemanticTest::runTest(
 				TestFunctionCall::RenderMode::ExpectedValuesExpectedGas,
 				_formatted,
 				/* _interactivePrint */ true
-			) << endl;
+			) << std::endl;
 			_stream << errorReporter.format(_linePrefix, _formatted);
 		}
-		_stream << endl;
-		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << endl;
+		_stream << std::endl;
+		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) << _linePrefix << "Obtained result:" << std::endl;
 		for (TestFunctionCall const& test: m_tests)
 		{
 			ErrorReporter errorReporter;
@@ -494,22 +494,22 @@ TestCase::TestResult SemanticTest::runTest(
 				m_gasCostFailure ? TestFunctionCall::RenderMode::ExpectedValuesActualGas : TestFunctionCall::RenderMode::ActualValuesExpectedGas,
 				_formatted,
 				/* _interactivePrint */ true
-			) << endl;
+			) << std::endl;
 			_stream << errorReporter.format(_linePrefix, _formatted);
 		}
 		AnsiColorized(_stream, _formatted, {BOLD, RED})
-			<< _linePrefix << endl
-			<< _linePrefix << "Attention: Updates on the test will apply the detected format displayed." << endl;
+			<< _linePrefix << std::endl
+			<< _linePrefix << "Attention: Updates on the test will apply the detected format displayed." << std::endl;
 		if (_isYulRun && m_testCaseWantsLegacyRun)
 		{
-			_stream << _linePrefix << endl << _linePrefix;
+			_stream << _linePrefix << std::endl << _linePrefix;
 			AnsiColorized(_stream, _formatted, {RED_BACKGROUND}) << "Note that the test passed without Yul.";
-			_stream << endl;
+			_stream << std::endl;
 		}
 		else if (!_isYulRun && m_testCaseWantsYulRun)
 			AnsiColorized(_stream, _formatted, {BOLD, YELLOW})
-				<< _linePrefix << endl
-				<< _linePrefix << "Note that the test also has to pass via Yul." << endl;
+				<< _linePrefix << std::endl
+				<< _linePrefix << "Note that the test also has to pass via Yul." << std::endl;
 		return TestResult::Failure;
 	}
 
@@ -551,9 +551,9 @@ TestCase::TestResult SemanticTest::tryRunTestWithYulOptimizer(
 			soltestAssert(result == TestResult::Success || result == TestResult::Failure);
 
 			AnsiColorized(_stream, _formatted, {BOLD, YELLOW})
-				<< _linePrefix << endl
+				<< _linePrefix << std::endl
 				<< _linePrefix << "requiresYulOptimizer is set to " << m_requiresYulOptimizer
-				<< " but should be " << requiresYulOptimizer << endl;
+				<< " but should be " << requiresYulOptimizer << std::endl;
 			m_requiresYulOptimizer = requiresYulOptimizer;
 			return TestResult::Failure;
 		}
@@ -565,7 +565,7 @@ TestCase::TestResult SemanticTest::tryRunTestWithYulOptimizer(
 
 bool SemanticTest::checkGasCostExpectation(TestFunctionCall& io_test, bool _compileViaYul) const
 {
-	string setting =
+	std::string setting =
 		(_compileViaYul ? "ir"s : "legacy"s) +
 		(m_optimiserSettings == OptimiserSettings::full() ? "Optimized" : "");
 
@@ -592,27 +592,27 @@ bool SemanticTest::checkGasCostExpectation(TestFunctionCall& io_test, bool _comp
 		m_gasUsed == io_test.call().expectations.gasUsed.at(setting);
 }
 
-void SemanticTest::printSource(ostream& _stream, string const& _linePrefix, bool _formatted) const
+void SemanticTest::printSource(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
 {
 	if (m_sources.sources.empty())
 		return;
 
 	bool outputNames = (m_sources.sources.size() - m_sources.externalSources.size() != 1 || !m_sources.sources.begin()->first.empty());
 
-	set<string> externals;
+	std::set<std::string> externals;
 	for (auto const& [name, path]: m_sources.externalSources)
 	{
 		externals.insert(name);
-		string externalSource;
+		std::string externalSource;
 		if (name == path)
 			externalSource = name;
 		else
 			externalSource = name + "=" + path.generic_string();
 
 		if (_formatted)
-			_stream << _linePrefix  << formatting::CYAN << "==== ExternalSource: " << externalSource << " ===="s << formatting::RESET << endl;
+			_stream << _linePrefix  << formatting::CYAN << "==== ExternalSource: " << externalSource << " ===="s << formatting::RESET << std::endl;
 		else
-			_stream << _linePrefix << "==== ExternalSource: " << externalSource << " ===="s << endl;
+			_stream << _linePrefix << "==== ExternalSource: " << externalSource << " ===="s << std::endl;
 	}
 
 	for (auto const& [name, source]: m_sources.sources)
@@ -625,9 +625,9 @@ void SemanticTest::printSource(ostream& _stream, string const& _linePrefix, bool
 
 				if (outputNames)
 					_stream << _linePrefix << formatting::CYAN << "==== Source: " << name
-							<< " ====" << formatting::RESET << endl;
+							<< " ====" << formatting::RESET << std::endl;
 
-				vector<char const*> sourceFormatting(source.length(), formatting::RESET);
+				std::vector<char const*> sourceFormatting(source.length(), formatting::RESET);
 				_stream << _linePrefix << sourceFormatting.front() << source.front();
 				for (size_t i = 1; i < source.length(); i++)
 				{
@@ -637,7 +637,7 @@ void SemanticTest::printSource(ostream& _stream, string const& _linePrefix, bool
 						_stream << source[i];
 					else
 					{
-						_stream << formatting::RESET << endl;
+						_stream << formatting::RESET << std::endl;
 						if (i + 1 < source.length())
 							_stream << _linePrefix << sourceFormatting[i];
 					}
@@ -647,50 +647,50 @@ void SemanticTest::printSource(ostream& _stream, string const& _linePrefix, bool
 			else
 			{
 				if (outputNames)
-					_stream << _linePrefix << "==== Source: " + name << " ====" << endl;
-				stringstream stream(source);
-				string line;
+					_stream << _linePrefix << "==== Source: " + name << " ====" << std::endl;
+				std::stringstream stream(source);
+				std::string line;
 				while (getline(stream, line))
-					_stream << _linePrefix << line << endl;
+					_stream << _linePrefix << line << std::endl;
 			}
 		}
 }
 
-void SemanticTest::printUpdatedExpectations(ostream& _stream, string const&) const
+void SemanticTest::printUpdatedExpectations(std::ostream& _stream, std::string const&) const
 {
 	for (TestFunctionCall const& test: m_tests)
 		_stream << test.format(
 			"",
 			m_gasCostFailure ? TestFunctionCall::RenderMode::ExpectedValuesActualGas : TestFunctionCall::RenderMode::ActualValuesExpectedGas,
 			/* _highlight = */ false
-		) << endl;
+		) << std::endl;
 }
 
-void SemanticTest::printUpdatedSettings(ostream& _stream, string const& _linePrefix)
+void SemanticTest::printUpdatedSettings(std::ostream& _stream, std::string const& _linePrefix)
 {
 	auto& settings = m_reader.settings();
 	if (settings.empty() && m_requiresYulOptimizer == RequiresYulOptimizer::False)
 		return;
 
-	_stream << _linePrefix << "// ====" << endl;
+	_stream << _linePrefix << "// ====" << std::endl;
 	if (m_requiresYulOptimizer != RequiresYulOptimizer::False)
-		_stream << _linePrefix << "// requiresYulOptimizer: " << m_requiresYulOptimizer << endl;
+		_stream << _linePrefix << "// requiresYulOptimizer: " << m_requiresYulOptimizer << std::endl;
 
 	for (auto const& [settingName, settingValue]: settings)
 		if (settingName != "requiresYulOptimizer")
-			_stream << _linePrefix << "// " << settingName << ": " << settingValue<< endl;
+			_stream << _linePrefix << "// " << settingName << ": " << settingValue<< std::endl;
 }
 
-void SemanticTest::parseExpectations(istream& _stream)
+void SemanticTest::parseExpectations(std::istream& _stream)
 {
 	m_tests += TestFileParser{_stream, m_builtins}.parseFunctionCalls(m_lineOffset);
 }
 
 bool SemanticTest::deploy(
-	string const& _contractName,
+	std::string const& _contractName,
 	u256 const& _value,
 	bytes const& _arguments,
-	map<string, solidity::test::Address> const& _libraries
+	std::map<std::string, solidity::test::Address> const& _libraries
 )
 {
 	auto output = compileAndRunWithoutCheck(m_sources.sources, _value, _contractName, _arguments, _libraries, m_sources.mainSourceFile);
diff --git a/test/libsolidity/SolidityCompiler.cpp b/test/libsolidity/SolidityCompiler.cpp
index 71c19e596e..9252cac16f 100644
--- a/test/libsolidity/SolidityCompiler.cpp
+++ b/test/libsolidity/SolidityCompiler.cpp
@@ -24,7 +24,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::frontend::test
 {
diff --git a/test/libsolidity/SolidityEndToEndTest.cpp b/test/libsolidity/SolidityEndToEndTest.cpp
index c6304b727d..e34df0307c 100644
--- a/test/libsolidity/SolidityEndToEndTest.cpp
+++ b/test/libsolidity/SolidityEndToEndTest.cpp
@@ -46,7 +46,6 @@
 #include <string>
 #include <tuple>
 
-using namespace std;
 using namespace std::placeholders;
 using namespace solidity;
 using namespace solidity::util;
@@ -90,7 +89,7 @@ BOOST_FIXTURE_TEST_SUITE(SolidityEndToEndTest, SolidityEndToEndTestExecutionFram
 
 BOOST_AUTO_TEST_CASE(creation_code_optimizer)
 {
-	string codeC = R"(
+	std::string codeC = R"(
 		contract C {
 			constructor(uint x) {
 			if (x == 0xFFFFFFFFFFFFFFFF42)
@@ -98,7 +97,7 @@ BOOST_AUTO_TEST_CASE(creation_code_optimizer)
 			}
 		}
 	)";
-	string codeD = R"(
+	std::string codeD = R"(
 		contract D {
 			function f() public pure returns (bytes memory) {
 				return type(C).creationCode;
@@ -170,7 +169,7 @@ BOOST_AUTO_TEST_CASE(recursive_calls)
 	)";
 	ALSO_VIA_YUL(
 		compileAndRun(sourceCode);
-		function<u256(u256)> recursive_calls_cpp = [&recursive_calls_cpp](u256 const& n) -> u256
+		std::function<u256(u256)> recursive_calls_cpp = [&recursive_calls_cpp](u256 const& n) -> u256
 		{
 			if (n <= 1)
 				return 1;
@@ -742,7 +741,7 @@ BOOST_AUTO_TEST_CASE(mapping_state_inc_dec)
 	)";
 
 	u256 value;
-	map<u256, u256> table;
+	std::map<u256, u256> table;
 	auto f = [&](u256 const& _x) -> u256
 	{
 		value = _x;
@@ -775,7 +774,7 @@ BOOST_AUTO_TEST_CASE(multi_level_mapping)
 			}
 		}
 	)";
-	map<u256, map<u256, u256>> table;
+	std::map<u256, std::map<u256, u256>> table;
 	auto f = [&](u256 const& _x, u256 const& _y, u256 const& _z) -> u256
 	{
 		if (_z == 0) return table[_x][_y];
@@ -810,7 +809,7 @@ BOOST_AUTO_TEST_CASE(constructor)
 		}
 	)";
 
-	map<u256, uint8_t> data;
+	std::map<u256, uint8_t> data;
 	data[7] = 8;
 	auto get = [&](u256 const& _x) -> u256
 	{
@@ -1069,7 +1068,7 @@ BOOST_AUTO_TEST_CASE(fixed_bytes_in_calls)
 	compileAndRun(sourceCode, 0, "Main");
 	BOOST_REQUIRE(callContractFunction("setHelper(address)", c_helperAddress) == bytes());
 	BOOST_REQUIRE(callContractFunction("getHelper()", c_helperAddress) == encodeArgs(c_helperAddress));
-	ABI_CHECK(callContractFunction("callHelper(bytes2,bool)", string("\0a", 2), true), encodeArgs(string("\0a\0\0\0", 5)));
+	ABI_CHECK(callContractFunction("callHelper(bytes2,bool)", std::string("\0a", 2), true), encodeArgs(std::string("\0a\0\0\0", 5)));
 }
 
 BOOST_AUTO_TEST_CASE(constructor_with_long_arguments)
@@ -1085,8 +1084,8 @@ BOOST_AUTO_TEST_CASE(constructor_with_long_arguments)
 			}
 		}
 	)";
-	string a = "01234567890123gabddunaouhdaoneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi45678907890123456789abcd123456787890123456789abcd90123456789012345678901234567890123456789aboneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi45678907890123456789abcd123456787890123456789abcd90123456789012345678901234567890123456789aboneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi45678907890123456789abcd123456787890123456789abcd90123456789012345678901234567890123456789aboneudapcgadi4567890789012cdef";
-	string b = "AUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PY";
+	std::string a = "01234567890123gabddunaouhdaoneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi45678907890123456789abcd123456787890123456789abcd90123456789012345678901234567890123456789aboneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi45678907890123456789abcd123456787890123456789abcd90123456789012345678901234567890123456789aboneudapcgadi4567890789012oneudapcgadi4567890789012oneudapcgadi45678907890123456789abcd123456787890123456789abcd90123456789012345678901234567890123456789aboneudapcgadi4567890789012cdef";
+	std::string b = "AUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PYAUTAHIACIANOTUHAOCUHAOEUNAOEHUNTHDYDHPYDRCPYDRSTITOEUBXHUDGO>PY";
 
 	compileAndRun(sourceCode, 0, "Main", encodeArgs(
 		u256(0x40),
@@ -1141,7 +1140,7 @@ BOOST_AUTO_TEST_CASE(blockhash)
 	while (blockNumber() < u256(255))
 		ABI_CHECK(callContractFunction("g()"), encodeArgs(true));
 
-	vector<u256> hashes;
+	std::vector<u256> hashes;
 	// ``blockhash()`` is only valid for the last 256 blocks, otherwise zero
 	hashes.emplace_back(0);
 	for (u256 i = blockNumber() - u256(255); i <= blockNumber(); i++)
@@ -1263,7 +1262,7 @@ BOOST_AUTO_TEST_CASE(generic_delegatecall)
 
 	for (auto v2: {false, true})
 	{
-		string source = "pragma abicoder " + string(v2 ? "v2" : "v1") + ";\n" + string(sourceCode);
+		std::string source = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n" + std::string(sourceCode);
 
 		compileAndRun(source, 0, "Receiver");
 		h160 const c_receiverAddress = m_contractAddress;
@@ -1354,7 +1353,7 @@ BOOST_AUTO_TEST_CASE(library_call_protection)
 		ABI_CHECK(callContractFunction("np(Lib.S storage)", 0), encodeArgs());
 		ABI_CHECK(callContractFunction("v(Lib.S storage)", 0), encodeArgs(m_sender));
 		ABI_CHECK(callContractFunction("pu()"), encodeArgs(2));
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
+		compileAndRun(sourceCode, 0, "Test", bytes(), std::map<std::string, h160>{{":Lib", m_contractAddress}});
 		ABI_CHECK(callContractFunction("s()"), encodeArgs(0));
 		ABI_CHECK(callContractFunction("np()"), encodeArgs(m_sender));
 		ABI_CHECK(callContractFunction("s()"), encodeArgs(3));
@@ -1420,7 +1419,7 @@ BOOST_AUTO_TEST_CASE(call_forward_bytes_length)
 		ABI_CHECK(callContractFunction("viaStorage()"), encodeArgs(4));
 
 		// Some additional unpadded data
-		bytes unpadded = asBytes(string("abc"));
+		bytes unpadded = asBytes(std::string("abc"));
 		ABI_CHECK(callContractFunctionNoEncoding("viaCalldata()", unpadded), encodeArgs(7));
 		ABI_CHECK(callContractFunctionNoEncoding("viaMemory()", unpadded), encodeArgs(7));
 		ABI_CHECK(callContractFunctionNoEncoding("viaStorage()", unpadded), encodeArgs(7));
@@ -1535,7 +1534,7 @@ BOOST_AUTO_TEST_CASE(struct_referencing)
 		compileAndRun(sourceCode, 0, "L");
 		ABI_CHECK(callContractFunction("f()"), encodeArgs(0, 3));
 		ABI_CHECK(callContractFunction("g()"), encodeArgs(4));
-		compileAndRun(sourceCode, 0, "C", bytes(), map<string, h160>{ {":L", m_contractAddress}});
+		compileAndRun(sourceCode, 0, "C", bytes(), std::map<std::string, h160>{ {":L", m_contractAddress}});
 		ABI_CHECK(callContractFunction("f()"), encodeArgs(1));
 		ABI_CHECK(callContractFunction("g()"), encodeArgs(2));
 		ABI_CHECK(callContractFunction("h()"), encodeArgs(0, 5));
@@ -1583,7 +1582,7 @@ BOOST_AUTO_TEST_CASE(enum_referencing)
 		compileAndRun(sourceCode, 0, "L");
 		ABI_CHECK(callContractFunction("f()"), encodeArgs(1));
 		ABI_CHECK(callContractFunction("g()"), encodeArgs(3));
-		compileAndRun(sourceCode, 0, "C", bytes(), map<string, h160>{{":L", m_contractAddress}});
+		compileAndRun(sourceCode, 0, "C", bytes(), std::map<std::string, h160>{{":L", m_contractAddress}});
 		ABI_CHECK(callContractFunction("f()"), encodeArgs(3));
 		ABI_CHECK(callContractFunction("g()"), encodeArgs(3));
 		ABI_CHECK(callContractFunction("h()"), encodeArgs(1));
@@ -1612,8 +1611,8 @@ BOOST_AUTO_TEST_CASE(bytes_in_arguments)
 	ALSO_VIA_YUL(
 		compileAndRun(sourceCode);
 
-		string innercalldata1 = asString(util::selectorFromSignatureH32("f(uint256,uint256)").asBytes() + encodeArgs(8, 9));
-		string innercalldata2 = asString(util::selectorFromSignatureH32("g(uint256)").asBytes() + encodeArgs(3));
+		std::string innercalldata1 = asString(util::selectorFromSignatureH32("f(uint256,uint256)").asBytes() + encodeArgs(8, 9));
+		std::string innercalldata2 = asString(util::selectorFromSignatureH32("g(uint256)").asBytes() + encodeArgs(3));
 		bytes calldata = encodeArgs(
 			12, 32 * 4, u256(32 * 4 + 32 + (innercalldata1.length() + 31) / 32 * 32), 13,
 			u256(innercalldata1.length()), innercalldata1,
@@ -1765,20 +1764,20 @@ BOOST_AUTO_TEST_CASE(return_multiple_strings_of_various_sizes)
 		}
 	)";
 	compileAndRun(sourceCode, 0, "Main");
-	string s1(
+	std::string s1(
 		"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
 		"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
 		"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
 		"abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz"
 	);
-	string s2(
+	std::string s2(
 		"ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ"
 		"ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ"
 		"ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ"
 		"ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ"
 		"ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ"
 	);
-	vector<size_t> lengths{0, 30, 32, 63, 64, 65, 210, 300};
+	std::vector<size_t> lengths{0, 30, 32, 63, 64, 65, 210, 300};
 	for (auto l1: lengths)
 		for (auto l2: lengths)
 		{
@@ -1813,8 +1812,8 @@ BOOST_AUTO_TEST_CASE(accessor_involving_strings)
 		}
 	)";
 	compileAndRun(sourceCode, 0, "Main");
-	string s1("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
-	string s2("ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ");
+	std::string s1("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
+	std::string s2("ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ");
 	bytes s1Data = encodeArgs(u256(s1.length()), s1);
 	bytes s2Data = encodeArgs(u256(s2.length()), s2);
 	u256 b = 765;
@@ -1846,9 +1845,9 @@ BOOST_AUTO_TEST_CASE(bytes_in_function_calls)
 		}
 	)";
 	compileAndRun(sourceCode, 0, "Main");
-	string s1("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
-	string s2("ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ");
-	vector<size_t> lengths{0, 31, 64, 65};
+	std::string s1("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
+	std::string s2("ABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZABCDEFGHIJKLMNOPQRSTUVXYZ");
+	std::vector<size_t> lengths{0, 31, 64, 65};
 	for (auto l1: lengths)
 		for (auto l2: lengths)
 		{
@@ -1888,8 +1887,8 @@ BOOST_AUTO_TEST_CASE(return_bytes_internal)
 		}
 	)";
 	compileAndRun(sourceCode, 0, "Main");
-	string s1("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
-	vector<size_t> lengths{0, 31, 64, 65};
+	std::string s1("abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz");
+	std::vector<size_t> lengths{0, 31, 64, 65};
 	for (auto l1: lengths)
 	{
 		bytes dyn1 = encodeArgs(u256(l1), s1.substr(0, l1));
@@ -1951,7 +1950,7 @@ BOOST_AUTO_TEST_CASE(calldata_struct_function_type)
 
 BOOST_AUTO_TEST_CASE(calldata_array_dynamic_three_dimensional)
 {
-	vector<vector<vector<u256>>> data {
+	std::vector<std::vector<std::vector<u256>>> data {
 		{
 			{ 0x010A01, 0x010A02, 0x010A03 },
 			{ 0x010B01, 0x010B02, 0x010B03 }
@@ -1970,12 +1969,12 @@ BOOST_AUTO_TEST_CASE(calldata_array_dynamic_three_dimensional)
 		if (!outerDynamicallySized && !middleDynamicallySized && !innerDynamicallySized)
 			continue;
 
-		string arrayType = "uint256";
+		std::string arrayType = "uint256";
 		arrayType += innerDynamicallySized ? "[]" : "[3]";
 		arrayType += middleDynamicallySized ? "[]" : "[2]";
 		arrayType += outerDynamicallySized ? "[]" : "[2]";
 
-		string sourceCode = R"(
+		std::string sourceCode = R"(
 			pragma abicoder v2;
 			contract C {
 				function test()" + arrayType + R"( calldata a) external returns (uint256) {
@@ -2049,16 +2048,16 @@ BOOST_AUTO_TEST_CASE(literal_strings)
 		}
 	)";
 	compileAndRun(sourceCode, 0, "Test");
-	string longStr = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
-	string medium = "01234567890123456789012345678901234567890123456789012345678901234567890123456789";
-	string shortStr = "123";
-	string hello = "Hello, World!";
+	std::string longStr = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
+	std::string medium = "01234567890123456789012345678901234567890123456789012345678901234567890123456789";
+	std::string shortStr = "123";
+	std::string hello = "Hello, World!";
 
 	ABI_CHECK(callContractFunction("f()"), encodeDyn(hello));
 	ABI_CHECK(callContractFunction("long()"), encodeDyn(longStr));
 	ABI_CHECK(callContractFunction("medium()"), encodeDyn(medium));
 	ABI_CHECK(callContractFunction("short()"), encodeDyn(shortStr));
-	ABI_CHECK(callContractFunction("empty()"), encodeDyn(string()));
+	ABI_CHECK(callContractFunction("empty()"), encodeDyn(std::string()));
 }
 
 BOOST_AUTO_TEST_CASE(initialise_string_constant)
@@ -2070,8 +2069,8 @@ BOOST_AUTO_TEST_CASE(initialise_string_constant)
 		}
 	)";
 	compileAndRun(sourceCode, 0, "Test");
-	string longStr = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
-	string shortStr = "abcdef";
+	std::string longStr = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
+	std::string shortStr = "abcdef";
 
 	ABI_CHECK(callContractFunction("long()"), encodeDyn(longStr));
 	ABI_CHECK(callContractFunction("short()"), encodeDyn(shortStr));
@@ -2087,7 +2086,7 @@ BOOST_AUTO_TEST_CASE(string_as_mapping_key)
 		}
 	)";
 
-	vector<string> strings{
+	std::vector<std::string> strings{
 		"Hello, World!",
 		"Hello,                            World!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1111",
 		"",
@@ -2123,7 +2122,7 @@ BOOST_AUTO_TEST_CASE(string_as_public_mapping_key)
 		}
 	)";
 	compileAndRun(sourceCode, 0, "Test");
-	vector<string> strings{
+	std::vector<std::string> strings{
 		"Hello, World!",
 		"Hello,                            World!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1111",
 		"",
@@ -2156,7 +2155,7 @@ BOOST_AUTO_TEST_CASE(nested_string_as_public_mapping_key)
 		}
 	)";
 	compileAndRun(sourceCode, 0, "Test");
-	vector<string> strings{
+	std::vector<std::string> strings{
 		"Hello, World!",
 		"Hello,                            World!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!1111",
 		"",
@@ -2211,13 +2210,13 @@ BOOST_AUTO_TEST_CASE(nested_mixed_string_as_public_mapping_key)
 
 	struct Index
 	{
-		string s1;
+		std::string s1;
 		int s2;
 		int s3;
-		string s4;
+		std::string s4;
 	};
 
-	vector<Index> data{
+	std::vector<Index> data{
 		{ "aabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcabcbc", 4, 23, "efg" },
 		{ "tiaron", 456, 63245, "908apzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapzapz" },
 		{ "", 2345, 12934, "665i65i65i65i65i65i65i65i65i65i65i65i65i65i65i65i65i65i5iart" },
@@ -2264,7 +2263,7 @@ BOOST_AUTO_TEST_CASE(library_call)
 	)";
 	ALSO_VIA_YUL(
 		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
+		compileAndRun(sourceCode, 0, "Test", bytes(), std::map<std::string, h160>{{":Lib", m_contractAddress}});
 		ABI_CHECK(callContractFunction("f(uint256)", u256(33)), encodeArgs(u256(33) * 9));
 	)
 }
@@ -2281,7 +2280,7 @@ BOOST_AUTO_TEST_CASE(library_function_external)
 	)";
 	ALSO_VIA_YUL(
 		compileAndRun(sourceCode, 0, "Lib");
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
+		compileAndRun(sourceCode, 0, "Test", bytes(), std::map<std::string, h160>{{":Lib", m_contractAddress}});
 		ABI_CHECK(callContractFunction("f(bytes)", u256(0x20), u256(5), "abcde"), encodeArgs("c"));
 	)
 }
@@ -2315,9 +2314,9 @@ BOOST_AUTO_TEST_CASE(using_library_mappings_external)
 		)";
 	for (auto v2: {false, true})
 	{
-		string prefix = "pragma abicoder " + string(v2 ? "v2" : "v1") + ";\n";
+		std::string prefix = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n";
 		compileAndRun(prefix + libSourceCode, 0, "Lib");
-		compileAndRun(prefix + sourceCode, 0, "Test", bytes(), map<string, h160>{{":Lib", m_contractAddress}});
+		compileAndRun(prefix + sourceCode, 0, "Test", bytes(), std::map<std::string, h160>{{":Lib", m_contractAddress}});
 		ABI_CHECK(callContractFunction("f()"), encodeArgs(u256(2), u256(0), u256(84), u256(46), u256(0), u256(198)));
 	}
 }
@@ -2432,7 +2431,7 @@ BOOST_AUTO_TEST_CASE(short_strings)
 	)";
 	ALSO_VIA_YUL(
 		compileAndRun(sourceCode, 0, "A");
-		ABI_CHECK(callContractFunction("data1()"), encodeDyn(string("123")));
+		ABI_CHECK(callContractFunction("data1()"), encodeDyn(std::string("123")));
 		ABI_CHECK(callContractFunction("lengthChange()"), encodeArgs(u256(0)));
 		BOOST_CHECK(storageEmpty(m_contractAddress));
 		ABI_CHECK(callContractFunction("deleteElements()"), encodeArgs(u256(0)));
@@ -2458,7 +2457,7 @@ BOOST_AUTO_TEST_CASE(calldata_offset)
 		}
 	)";
 	compileAndRun(sourceCode, 0, "CB", encodeArgs(u256(0x20), u256(0x00)));
-	ABI_CHECK(callContractFunction("last()", encodeArgs()), encodeDyn(string("nd")));
+	ABI_CHECK(callContractFunction("last()", encodeArgs()), encodeDyn(std::string("nd")));
 }
 
 BOOST_AUTO_TEST_CASE(reject_ether_sent_to_library)
@@ -2525,7 +2524,7 @@ BOOST_AUTO_TEST_CASE(inline_long_string_return)
 		}
 	)";
 
-	string strLong = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
+	std::string strLong = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678900123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789001234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890";
 	compileAndRun(sourceCode, 0, "C");
 	ABI_CHECK(callContractFunction("f()"), encodeDyn(strLong));
 }
@@ -2775,8 +2774,8 @@ BOOST_AUTO_TEST_CASE(shift_bytes)
 		}
 	)";
 	compileAndRun(sourceCode, 0, "C");
-	ABI_CHECK(callContractFunction("left(bytes20,uint8)", "12345678901234567890", 8 * 8), encodeArgs("901234567890" + string(8, 0)));
-	ABI_CHECK(callContractFunction("right(bytes20,uint8)", "12345678901234567890", 8 * 8), encodeArgs(string(8, 0) + "123456789012"));
+	ABI_CHECK(callContractFunction("left(bytes20,uint8)", "12345678901234567890", 8 * 8), encodeArgs("901234567890" + std::string(8, 0)));
+	ABI_CHECK(callContractFunction("right(bytes20,uint8)", "12345678901234567890", 8 * 8), encodeArgs(std::string(8, 0) + "123456789012"));
 }
 
 BOOST_AUTO_TEST_CASE(contracts_separated_with_comment)
@@ -3152,12 +3151,12 @@ BOOST_AUTO_TEST_CASE(bare_call_return_data)
 {
 	if (solidity::test::CommonOptions::get().evmVersion().supportsReturndata())
 	{
-		vector<string> calltypes = {"call", "delegatecall"};
+		std::vector<std::string> calltypes = {"call", "delegatecall"};
 		if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
 			calltypes.emplace_back("staticcall");
-		for (string const& calltype: calltypes)
+		for (std::string const& calltype: calltypes)
 		{
-			string sourceCode = R"DELIMITER(
+			std::string sourceCode = R"DELIMITER(
 				contract A {
 					constructor() {
 					}
@@ -3256,14 +3255,14 @@ BOOST_AUTO_TEST_CASE(bare_call_return_data)
 			)DELIMITER";
 			ALSO_VIA_YUL(
 				compileAndRun(sourceCode, 0, "C");
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(string("return_bool()"))), encodeArgs(true, 0x40, 0x20, true));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(string("return_int32()"))), encodeArgs(true, 0x40, 0x20, u256(-32)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(string("return_uint32()"))), encodeArgs(true, 0x40, 0x20, u256(0x3232)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(string("return_int256()"))), encodeArgs(true, 0x40, 0x20, u256(-256)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(string("return_uint256()"))), encodeArgs(true, 0x40, 0x20, u256(0x256256)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(string("return_bytes4()"))), encodeArgs(true, 0x40, 0x20, u256(0xabcd0012) << (28*8)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(string("return_multi()"))), encodeArgs(true, 0x40, 0x60, false, u256(0x3232), u256(0xabcd0012) << (28*8)));
-				ABI_CHECK(callContractFunction("f(string)", encodeDyn(string("return_bytes()"))), encodeArgs(true, 0x40, 0x60, 0x20, 0x02, encode(bytes{0x42,0x21}, false)));
+				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_bool()"))), encodeArgs(true, 0x40, 0x20, true));
+				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_int32()"))), encodeArgs(true, 0x40, 0x20, u256(-32)));
+				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_uint32()"))), encodeArgs(true, 0x40, 0x20, u256(0x3232)));
+				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_int256()"))), encodeArgs(true, 0x40, 0x20, u256(-256)));
+				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_uint256()"))), encodeArgs(true, 0x40, 0x20, u256(0x256256)));
+				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_bytes4()"))), encodeArgs(true, 0x40, 0x20, u256(0xabcd0012) << (28*8)));
+				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_multi()"))), encodeArgs(true, 0x40, 0x60, false, u256(0x3232), u256(0xabcd0012) << (28*8)));
+				ABI_CHECK(callContractFunction("f(string)", encodeDyn(std::string("return_bytes()"))), encodeArgs(true, 0x40, 0x60, 0x20, 0x02, encode(bytes{0x42,0x21}, false)));
 				ABI_CHECK(callContractFunction("check_bool()"), encodeArgs(true));
 				ABI_CHECK(callContractFunction("check_int32()"), encodeArgs(true));
 				ABI_CHECK(callContractFunction("check_uint32()"), encodeArgs(true));
@@ -3315,7 +3314,7 @@ BOOST_AUTO_TEST_CASE(abi_encodePacked)
 	for (auto v2: {false, true})
 	{
 		ALSO_VIA_YUL(
-			string prefix = "pragma abicoder " + string(v2 ? "v2" : "v1") + ";\n";
+			std::string prefix = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n";
 			compileAndRun(prefix + sourceCode, 0, "C");
 			ABI_CHECK(callContractFunction("f0()"), encodeArgs(0x20, 0));
 			ABI_CHECK(callContractFunction("f1()"), encodeArgs(0x20, 2, "\x01\x02"));
@@ -3392,7 +3391,7 @@ BOOST_AUTO_TEST_CASE(abi_encodePacked_from_storage)
 	for (auto v2: {false, true})
 	{
 		ALSO_VIA_YUL(
-			string prefix = "pragma abicoder " + string(v2 ? "v2" : "v1") + ";\n";
+			std::string prefix = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n";
 			compileAndRun(prefix + sourceCode, 0, "C");
 			bytes payload = encodeArgs(0xfffff1, 0, 0xfffff2, 0, 0, 0xfffff3, 0, 0, 0xfffff4);
 			bytes encoded = encodeArgs(0x20, 0x122, "\x01" + asString(payload) + "\x02");
@@ -3465,7 +3464,7 @@ BOOST_AUTO_TEST_CASE(abi_encodePacked_from_memory)
 	for (auto v2: {false, true})
 	{
 		ALSO_VIA_YUL(
-			string prefix = "pragma abicoder " + string(v2 ? "v2" : "v1") + ";\n";
+			std::string prefix = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n";
 			compileAndRun(prefix + sourceCode, 0, "C");
 			bytes payload = encodeArgs(0xfffff1, 0, 0xfffff2, 0, 0, 0xfffff3, 0, 0, 0xfffff4);
 			bytes encoded = encodeArgs(0x20, 0x122, "\x01" + asString(payload) + "\x02");
@@ -3511,11 +3510,11 @@ BOOST_AUTO_TEST_CASE(abi_encodePacked_functionPtr)
 	for (auto v2: {false, true})
 	{
 		ALSO_VIA_YUL(
-			string prefix = "pragma abicoder " + string(v2 ? "v2" : "v1") + ";\n";
+			std::string prefix = "pragma abicoder " + std::string(v2 ? "v2" : "v1") + ";\n";
 			compileAndRun(prefix + sourceCode, 0, "C");
-			string directEncoding = asString(fromHex("08" "1112131400000000000011121314000000000087" "26121ff0" "02"));
+			std::string directEncoding = asString(fromHex("08" "1112131400000000000011121314000000000087" "26121ff0" "02"));
 			ABI_CHECK(callContractFunction("testDirect()"), encodeArgs(0x20, directEncoding.size(), directEncoding));
-			string arrayEncoding = asString(fromHex("08" "1112131400000000000011121314000000000087" "26121ff0" "0000000000000000" "02"));
+			std::string arrayEncoding = asString(fromHex("08" "1112131400000000000011121314000000000087" "26121ff0" "0000000000000000" "02"));
 			ABI_CHECK(callContractFunction("testFixedArray()"), encodeArgs(0x20, arrayEncoding.size(), arrayEncoding));
 			ABI_CHECK(callContractFunction("testDynamicArray()"), encodeArgs(0x20, arrayEncoding.size(), arrayEncoding));
 		)
@@ -3557,11 +3556,11 @@ BOOST_AUTO_TEST_CASE(abi_encodePackedV2_structs)
 		bytes structEnc = encodeArgs(int(0x12), u256(-7), int(2), int(3), u256(-7), u256(-8));
 		ABI_CHECK(callContractFunction("testStorage()"), encodeArgs());
 		BOOST_REQUIRE_EQUAL(numLogTopics(0), 2);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(string("E((uint8,int16,uint8[2],int16[]))")));
+		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("E((uint8,int16,uint8[2],int16[]))")));
 		BOOST_CHECK_EQUAL(logTopic(0, 1), util::keccak256(asString(structEnc)));
 		ABI_CHECK(callContractFunction("testMemory()"), encodeArgs());
 		BOOST_REQUIRE_EQUAL(numLogTopics(0), 2);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(string("E((uint8,int16,uint8[2],int16[]))")));
+		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("E((uint8,int16,uint8[2],int16[]))")));
 		BOOST_CHECK_EQUAL(logTopic(0, 1), util::keccak256(asString(structEnc)));
 	)
 }
@@ -3592,7 +3591,7 @@ BOOST_AUTO_TEST_CASE(abi_encodePackedV2_nestedArray)
 		bytes structEnc = encodeArgs(1, 2, 3, 0, 0, 0, 0, 4);
 		ABI_CHECK(callContractFunction("testNestedArrays()"), encodeArgs());
 		BOOST_REQUIRE_EQUAL(numLogTopics(0), 2);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(string("E((uint8,int16)[2][][3])")));
+		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("E((uint8,int16)[2][][3])")));
 		BOOST_CHECK_EQUAL(logTopic(0, 1), util::keccak256(asString(structEnc)));
 	)
 }
@@ -3622,11 +3621,11 @@ BOOST_AUTO_TEST_CASE(abi_encodePackedV2_arrayOfStrings)
 		bytes arrayEncoding = encodeArgs("abc", "0123456789012345678901234567890123456789");
 		ABI_CHECK(callContractFunction("testStorage()"), encodeArgs());
 		BOOST_REQUIRE_EQUAL(numLogTopics(0), 2);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(string("E(string[])")));
+		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("E(string[])")));
 		BOOST_CHECK_EQUAL(logTopic(0, 1), util::keccak256(asString(arrayEncoding)));
 		ABI_CHECK(callContractFunction("testMemory()"), encodeArgs());
 		BOOST_REQUIRE_EQUAL(numLogTopics(0), 2);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(string("E(string[])")));
+		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("E(string[])")));
 		BOOST_CHECK_EQUAL(logTopic(0, 1), util::keccak256(asString(arrayEncoding)));
 	)
 }
@@ -3712,7 +3711,7 @@ BOOST_AUTO_TEST_CASE(contract_name)
 	ABI_CHECK(callContractFunction("name()"), argsD);
 	ABI_CHECK(callContractFunction("name2()"), argsC);
 
-	string longName = "ThisIsAVeryLongContractNameExceeding256bits";
+	std::string longName = "ThisIsAVeryLongContractNameExceeding256bits";
 	compileAndRun(sourceCode, 0, longName);
 	bytes argsLong = encodeArgs(u256(0x20), u256(longName.length()), longName);
 	ABI_CHECK(callContractFunction("name()"), argsLong);
@@ -3738,13 +3737,13 @@ BOOST_AUTO_TEST_CASE(event_wrong_abi_name)
 	)";
 	ALSO_VIA_YUL(
 		compileAndRun(sourceCode, 0, "ClientReceipt", bytes());
-		compileAndRun(sourceCode, 0, "Test", bytes(), map<string, h160>{{":ClientReceipt", m_contractAddress}});
+		compileAndRun(sourceCode, 0, "Test", bytes(), std::map<std::string, h160>{{":ClientReceipt", m_contractAddress}});
 
 		callContractFunction("f()");
 		BOOST_REQUIRE_EQUAL(numLogs(), 1);
 		BOOST_CHECK_EQUAL(logAddress(0), m_contractAddress);
 		BOOST_REQUIRE_EQUAL(numLogTopics(0), 3);
-		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(string("Deposit(address,bytes32,uint256)")));
+		BOOST_CHECK_EQUAL(logTopic(0, 0), util::keccak256(std::string("Deposit(address,bytes32,uint256)")));
 	)
 }
 
diff --git a/test/libsolidity/SolidityExecutionFramework.cpp b/test/libsolidity/SolidityExecutionFramework.cpp
index c8ec180884..27fb39c121 100644
--- a/test/libsolidity/SolidityExecutionFramework.cpp
+++ b/test/libsolidity/SolidityExecutionFramework.cpp
@@ -39,13 +39,12 @@ using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 using namespace solidity::langutil;
 using namespace solidity::test;
-using namespace std;
 
 bytes SolidityExecutionFramework::multiSourceCompileContract(
-	map<string, string> const& _sourceCode,
-	optional<string> const& _mainSourceName,
-	string const& _contractName,
-	map<string, Address> const& _libraryAddresses
+	std::map<std::string, std::string> const& _sourceCode,
+	std::optional<std::string> const& _mainSourceName,
+	std::string const& _contractName,
+	std::map<std::string, Address> const& _libraryAddresses
 )
 {
 	if (_mainSourceName.has_value())
@@ -81,23 +80,23 @@ bytes SolidityExecutionFramework::multiSourceCompileContract(
 			.printErrorInformation(m_compiler.errors());
 		BOOST_ERROR("Compiling contract failed");
 	}
-	string contractName(_contractName.empty() ? m_compiler.lastContractName(_mainSourceName) : _contractName);
+	std::string contractName(_contractName.empty() ? m_compiler.lastContractName(_mainSourceName) : _contractName);
 	evmasm::LinkerObject obj = m_compiler.object(contractName);
 	BOOST_REQUIRE(obj.linkReferences.empty());
 	if (m_showMetadata)
-		cout << "metadata: " << m_compiler.metadata(contractName) << endl;
+		std::cout << "metadata: " << m_compiler.metadata(contractName) << std::endl;
 	return obj.bytecode;
 }
 
 bytes SolidityExecutionFramework::compileContract(
-	string const& _sourceCode,
-	string const& _contractName,
-	map<string, Address> const& _libraryAddresses
+	std::string const& _sourceCode,
+	std::string const& _contractName,
+	std::map<std::string, Address> const& _libraryAddresses
 )
 {
 	return multiSourceCompileContract(
 		{{"", _sourceCode}},
-		nullopt,
+		std::nullopt,
 		_contractName,
 		_libraryAddresses
 	);
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
index 1d9e03c9b9..b05d28a840 100644
--- a/test/libsolidity/SolidityExpressionCompiler.cpp
+++ b/test/libsolidity/SolidityExpressionCompiler.cpp
@@ -40,7 +40,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
 
@@ -78,13 +77,13 @@ class FirstExpressionExtractor: private ASTVisitor
 
 Declaration const& resolveDeclaration(
 	SourceUnit const& _sourceUnit,
-	vector<string> const& _namespacedName,
+	std::vector<std::string> const& _namespacedName,
 	NameAndTypeResolver const& _resolver
 )
 {
 	ASTNode const* scope = &_sourceUnit;
 	// bracers are required, cause msvc couldn't handle this macro in for statement
-	for (string const& namePart: _namespacedName)
+	for (std::string const& namePart: _namespacedName)
 	{
 		auto declarations = _resolver.resolveName(namePart, scope);
 		BOOST_REQUIRE(!declarations.empty());
@@ -95,12 +94,12 @@ Declaration const& resolveDeclaration(
 }
 
 bytes compileFirstExpression(
-	string const& _sourceCode,
-	vector<vector<string>> _functions = {},
-	vector<vector<string>> _localVariables = {}
+	std::string const& _sourceCode,
+	std::vector<std::vector<std::string>> _functions = {},
+	std::vector<std::vector<std::string>> _localVariables = {}
 )
 {
-	string sourceCode = "pragma solidity >=0.0; // SPDX-License-Identifier: GPL-3\n" + _sourceCode;
+	std::string sourceCode = "pragma solidity >=0.0; // SPDX-License-Identifier: GPL-3\n" + _sourceCode;
 	CharStream stream(sourceCode, "");
 
 	ASTPointer<SourceUnit> sourceUnit;
@@ -114,12 +113,12 @@ bytes compileFirstExpression(
 	}
 	catch (boost::exception const& _e)
 	{
-		string msg = "Parsing source code failed with:\n" + boost::diagnostic_information(_e);
+		std::string msg = "Parsing source code failed with:\n" + boost::diagnostic_information(_e);
 		BOOST_FAIL(msg);
 	}
 	catch (...)
 	{
-		string msg = "Parsing source code failed with:\n" + boost::current_exception_diagnostic_information();
+		std::string msg = "Parsing source code failed with:\n" + boost::current_exception_diagnostic_information();
 		BOOST_FAIL(msg);
 	}
 
@@ -151,7 +150,7 @@ bytes compileFirstExpression(
 			context.setArithmetic(Arithmetic::Wrapping);
 			size_t parametersSize = _localVariables.size(); // assume they are all one slot on the stack
 			context.adjustStackOffset(static_cast<int>(parametersSize));
-			for (vector<string> const& variable: _localVariables)
+			for (std::vector<std::string> const& variable: _localVariables)
 				context.addVariable(
 					dynamic_cast<VariableDeclaration const&>(resolveDeclaration(*sourceUnit, variable, resolver)),
 					static_cast<unsigned>(parametersSize--)
@@ -162,7 +161,7 @@ bytes compileFirstExpression(
 				solidity::test::CommonOptions::get().optimize
 			).compile(*extractor.expression());
 
-			for (vector<string> const& function: _functions)
+			for (std::vector<std::string> const& function: _functions)
 				context << context.functionEntryLabel(dynamic_cast<FunctionDefinition const&>(
 					resolveDeclaration(*sourceUnit, function, resolver)
 				));
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index cf5a7b88d4..02f140357b 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -32,7 +32,6 @@
 
 #include <string>
 
-using namespace std;
 using namespace solidity::langutil;
 
 namespace solidity::frontend::test
diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index e775bb6d0e..fbda3a686b 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -35,7 +35,6 @@
 #include <memory>
 #include <limits>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::evmasm;
 using namespace solidity::test;
@@ -79,9 +78,9 @@ class OptimizerTestFramework: public SolidityExecutionFramework
 		size_t optimizedSize = numInstructions(m_optimizedBytecode);
 		BOOST_CHECK_MESSAGE(
 			_optimizeRuns < 50 || optimizedSize < nonOptimizedSize,
-			string("Optimizer did not reduce bytecode size. Non-optimized size: ") +
-			to_string(nonOptimizedSize) + " - optimized size: " +
-			to_string(optimizedSize)
+			std::string("Optimizer did not reduce bytecode size. Non-optimized size: ") +
+			std::to_string(nonOptimizedSize) + " - optimized size: " +
+			std::to_string(optimizedSize)
 		);
 		m_optimizedContract = m_contractAddress;
 	}
diff --git a/test/libsolidity/ViewPureChecker.cpp b/test/libsolidity/ViewPureChecker.cpp
index 050fa573d5..03b2b421b4 100644
--- a/test/libsolidity/ViewPureChecker.cpp
+++ b/test/libsolidity/ViewPureChecker.cpp
@@ -27,7 +27,6 @@
 #include <string>
 #include <tuple>
 
-using namespace std;
 using namespace solidity::langutil;
 
 namespace solidity::frontend::test
@@ -37,7 +36,7 @@ BOOST_FIXTURE_TEST_SUITE(ViewPureChecker, AnalysisFramework)
 
 BOOST_AUTO_TEST_CASE(environment_access)
 {
-	vector<string> view{
+	std::vector<std::string> view{
 		"block.coinbase",
 		"block.timestamp",
 		"block.difficulty",
@@ -57,7 +56,7 @@ BOOST_AUTO_TEST_CASE(environment_access)
 
 	// ``block.blockhash`` and ``blockhash`` are tested separately below because their usage will
 	// produce warnings that can't be handled in a generic way.
-	vector<string> pure{
+	std::vector<std::string> pure{
 		"msg.data",
 		"msg.data[0]",
 		"msg.sig",
@@ -65,7 +64,7 @@ BOOST_AUTO_TEST_CASE(environment_access)
 		"block",
 		"tx"
 	};
-	for (string const& x: view)
+	for (std::string const& x: view)
 	{
 		CHECK_ERROR(
 			"contract C { function f() pure public { " + x + "; } }",
@@ -73,7 +72,7 @@ BOOST_AUTO_TEST_CASE(environment_access)
 			"Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires \"view\""
 		);
 	}
-	for (string const& x: pure)
+	for (std::string const& x: pure)
 	{
 		CHECK_WARNING(
 			"contract C { function f() view public { " + x + "; } }",
@@ -97,7 +96,7 @@ BOOST_AUTO_TEST_CASE(environment_access)
 
 BOOST_AUTO_TEST_CASE(address_staticcall)
 {
-	string text = R"(
+	std::string text = R"(
 		contract C {
 			function i() view public returns (bool) {
 				(bool success,) = address(0x4242).staticcall("");
@@ -114,7 +113,7 @@ BOOST_AUTO_TEST_CASE(address_staticcall)
 
 BOOST_AUTO_TEST_CASE(assembly_staticcall)
 {
-	string text = R"(
+	std::string text = R"(
 		contract C {
 			function i() view public {
 				assembly { pop(staticcall(gas(), 1, 2, 3, 4, 5)) }
diff --git a/test/libsolidity/analysis/FunctionCallGraph.cpp b/test/libsolidity/analysis/FunctionCallGraph.cpp
index 9de3441e6c..d91932767b 100644
--- a/test/libsolidity/analysis/FunctionCallGraph.cpp
+++ b/test/libsolidity/analysis/FunctionCallGraph.cpp
@@ -46,31 +46,31 @@
 #include <tuple>
 #include <vector>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
+using namespace std::string_literals;
 
-using EdgeMap = map<
+using EdgeMap = std::map<
 	CallGraph::Node,
-	set<CallGraph::Node, CallGraph::CompareByID>,
+	std::set<CallGraph::Node, CallGraph::CompareByID>,
 	CallGraph::CompareByID
 >;
-using EdgeNames = set<tuple<string, string>>;
-using CallGraphMap = map<string, CallGraph const*>;
+using EdgeNames = std::set<std::tuple<std::string, std::string>>;
+using CallGraphMap = std::map<std::string, CallGraph const*>;
 
 namespace
 {
 
-unique_ptr<CompilerStack> parseAndAnalyzeContracts(string _sourceCode)
+std::unique_ptr<CompilerStack> parseAndAnalyzeContracts(std::string _sourceCode)
 {
-	ReadCallback::Callback fileReader = [](string const&, string const&)
+	ReadCallback::Callback fileReader = [](std::string const&, std::string const&)
 	{
 		soltestAssert(false, "For simplicity this test suite supports only files without imports.");
 		return ReadCallback::Result{true, ""};
 	};
 
-	auto compilerStack = make_unique<CompilerStack>(fileReader);
+	auto compilerStack = std::make_unique<CompilerStack>(fileReader);
 	compilerStack->setSources({{"", _sourceCode}});
 
 	// NOTE: The code in test cases is expected to be correct so we can keep error handling simple
@@ -100,23 +100,23 @@ EdgeNames edgeNames(EdgeMap const& _edgeMap)
 	return names;
 }
 
-tuple<CallGraphMap, CallGraphMap> collectGraphs(CompilerStack const& _compilerStack)
+std::tuple<CallGraphMap, CallGraphMap> collectGraphs(CompilerStack const& _compilerStack)
 {
 	soltestAssert(_compilerStack.state() >= CompilerStack::State::AnalysisSuccessful);
 
-	tuple<CallGraphMap, CallGraphMap> graphs;
+	std::tuple<CallGraphMap, CallGraphMap> graphs;
 
-	for (string const& fullyQualifiedContractName: _compilerStack.contractNames())
+	for (std::string const& fullyQualifiedContractName: _compilerStack.contractNames())
 	{
-		soltestAssert(get<0>(graphs).count(fullyQualifiedContractName) == 0 && get<1>(graphs).count(fullyQualifiedContractName) == 0, "");
+		soltestAssert(std::get<0>(graphs).count(fullyQualifiedContractName) == 0 && std::get<1>(graphs).count(fullyQualifiedContractName) == 0, "");
 
 		// This relies on two assumptions: (1) CompilerStack received an empty string as a path for
 		// the contract and (2) contracts used in test cases have no imports.
 		soltestAssert(fullyQualifiedContractName.size() > 0 && fullyQualifiedContractName[0] == ':', "");
-		string contractName = fullyQualifiedContractName.substr(1);
+		std::string contractName = fullyQualifiedContractName.substr(1);
 
-		get<0>(graphs).emplace(contractName, _compilerStack.contractDefinition(fullyQualifiedContractName).annotation().creationCallGraph->get());
-		get<1>(graphs).emplace(contractName, _compilerStack.contractDefinition(fullyQualifiedContractName).annotation().deployedCallGraph->get());
+		std::get<0>(graphs).emplace(contractName, _compilerStack.contractDefinition(fullyQualifiedContractName).annotation().creationCallGraph->get());
+		std::get<1>(graphs).emplace(contractName, _compilerStack.contractDefinition(fullyQualifiedContractName).annotation().deployedCallGraph->get());
 	}
 
 	return graphs;
@@ -124,25 +124,25 @@ tuple<CallGraphMap, CallGraphMap> collectGraphs(CompilerStack const& _compilerSt
 
 void checkCallGraphExpectations(
 	CallGraphMap const& _callGraphs,
-	map<string, EdgeNames> const& _expectedEdges,
-	map<string, set<string>> const& _expectedCreatedContractSets = {},
-	map<string, set<string>> const& _expectedEmittedEventSets = {}
+	std::map<std::string, EdgeNames> const& _expectedEdges,
+	std::map<std::string, std::set<std::string>> const& _expectedCreatedContractSets = {},
+	std::map<std::string, std::set<std::string>> const& _expectedEmittedEventSets = {}
 )
 {
 	auto getContractName = [](ContractDefinition const* _contract){ return _contract->name(); };
 	auto eventToString = [](EventDefinition const* _event){ return toString(CallGraph::Node(_event)); };
-	auto notEmpty = [](set<string> const& _set){ return !_set.empty(); };
+	auto notEmpty = [](std::set<std::string> const& _set){ return !_set.empty(); };
 
 	soltestAssert(
 		(_expectedCreatedContractSets | ranges::views::values | ranges::views::remove_if(notEmpty)).empty(),
 		"Contracts that are not expected to create other contracts should not be included in _expectedCreatedContractSets."
 	);
 	soltestAssert(
-		(_expectedEdges | ranges::views::keys | ranges::to<set>()) == (_callGraphs | ranges::views::keys | ranges::to<set>()) &&
+		(_expectedEdges | ranges::views::keys | ranges::to<std::set>()) == (_callGraphs | ranges::views::keys | ranges::to<std::set>()) &&
 		(ranges::views::set_difference(_expectedCreatedContractSets | ranges::views::keys, _expectedEdges | ranges::views::keys)).empty(),
 		"Contracts listed in expectations do not match contracts actually found in the source file or in other expectations."
 	);
-	for (string const& contractName: _expectedEdges | ranges::views::keys)
+	for (std::string const& contractName: _expectedEdges | ranges::views::keys)
 	{
 		soltestAssert(
 			(ranges::views::set_difference(valueOrDefault(_expectedCreatedContractSets, contractName, {}), _expectedEdges | ranges::views::keys)).empty(),
@@ -150,10 +150,10 @@ void checkCallGraphExpectations(
 		);
 	}
 
-	map<string, EdgeNames> edges;
-	map<string, set<string>> createdContractSets;
-	map<string, set<string>> emittedEventSets;
-	for (string const& contractName: _expectedEdges | ranges::views::keys)
+	std::map<std::string, EdgeNames> edges;
+	std::map<std::string, std::set<std::string>> createdContractSets;
+	std::map<std::string, std::set<std::string>> emittedEventSets;
+	for (std::string const& contractName: _expectedEdges | ranges::views::keys)
 	{
 		soltestAssert(_callGraphs.at(contractName) != nullptr, "");
 		CallGraph const& callGraph = *_callGraphs.at(contractName);
@@ -163,11 +163,11 @@ void checkCallGraphExpectations(
 			createdContractSets[contractName] = callGraph.bytecodeDependency |
 				ranges::views::keys |
 				ranges::views::transform(getContractName) |
-				ranges::to<set<string>>();
+				ranges::to<std::set<std::string>>();
 		if (!callGraph.emittedEvents.empty())
 			emittedEventSets[contractName] = callGraph.emittedEvents |
 				 ranges::views::transform(eventToString) |
-				 ranges::to<set<string>>();
+				 ranges::to<std::set<std::string>>();
 	}
 
 	BOOST_CHECK_EQUAL(edges, _expectedEdges);
@@ -175,39 +175,39 @@ void checkCallGraphExpectations(
 	BOOST_CHECK_EQUAL(emittedEventSets, _expectedEmittedEventSets);
 }
 
-ostream& operator<<(ostream& _out, EdgeNames const& _edgeNames)
+std::ostream& operator<<(std::ostream& _out, EdgeNames const& _edgeNames)
 {
 	for (auto const& [from, to]: _edgeNames)
-		_out << "    " << from << " -> " << to << endl;
+		_out << "    " << from << " -> " << to << std::endl;
 	return _out;
 }
 
-ostream& operator<<(ostream& _out, set<string> const& _set)
+std::ostream& operator<<(std::ostream& _out, std::set<std::string> const& _set)
 {
-	_out << "{" << (_set | ranges::views::join(", ") | ranges::to<string>()) << "}";
+	_out << "{" << (_set | ranges::views::join(", ") | ranges::to<std::string>()) << "}";
 	return _out;
 }
 
-ostream& operator<<(ostream& _out, map<string, EdgeNames> const& _edgeSets)
+std::ostream& operator<<(std::ostream& _out, std::map<std::string, EdgeNames> const& _edgeSets)
 {
 	// Extra newline for error report readability. Otherwise the first line does not start at the first column.
-	_out << endl;
+	_out << std::endl;
 
 	for (auto const &[contractName, edges]: _edgeSets)
 	{
-		_out << contractName << ":" << endl;
+		_out << contractName << ":" << std::endl;
 		_out << edges;
 	}
 	return _out;
 }
 
-ostream& operator<<(ostream& _out, map<string, set<string>> const& _map)
+std::ostream& operator<<(std::ostream& _out, std::map<std::string, std::set<std::string>> const& _map)
 {
 	// Extra newline for error report readability. Otherwise the first line does not start at the first column.
-	_out << endl;
+	_out << std::endl;
 
 	for (auto const &[key, value]: _map)
-		_out << key << ": " << value << endl;
+		_out << key << ": " << value << std::endl;
 	return _out;
 }
 
@@ -226,21 +226,21 @@ struct print_log_value<EdgeNames>
 };
 
 template<>
-struct print_log_value<set<string>>
+struct print_log_value<std::set<std::string>>
 {
-	void operator()(std::ostream& _output, set<string> const& _set) { ::operator<<(_output, _set); }
+	void operator()(std::ostream& _output, std::set<std::string> const& _set) { ::operator<<(_output, _set); }
 };
 
 template<>
-struct print_log_value<map<string, EdgeNames>>
+struct print_log_value<std::map<std::string, EdgeNames>>
 {
-	void operator()(std::ostream& _output, map<string, EdgeNames> const& _edgeSets) { ::operator<<(_output, _edgeSets); }
+	void operator()(std::ostream& _output, std::map<std::string, EdgeNames> const& _edgeSets) { ::operator<<(_output, _edgeSets); }
 };
 
 template<>
-struct print_log_value<map<string, set<string>>>
+struct print_log_value<std::map<std::string, std::set<std::string>>>
 {
-	void operator()(std::ostream& _output, map<string, set<string>> const& _map) { ::operator<<(_output, _map); }
+	void operator()(std::ostream& _output, std::map<std::string, std::set<std::string>> const& _map) { ::operator<<(_output, _map); }
 };
 
 } // namespace boost::test_tools::tt_detail
@@ -252,7 +252,7 @@ BOOST_AUTO_TEST_SUITE(FunctionCallGraphTest)
 
 BOOST_AUTO_TEST_CASE(only_definitions)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free() {}
 
 		library L {
@@ -269,14 +269,14 @@ BOOST_AUTO_TEST_CASE(only_definitions)
 			function prv() private {}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 		{"L", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.ext()"},
 			{"Entry", "function C.pub()"},
@@ -287,13 +287,13 @@ BOOST_AUTO_TEST_CASE(only_definitions)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(ordinary_calls)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free() {}
 
 		library L {
@@ -310,14 +310,14 @@ BOOST_AUTO_TEST_CASE(ordinary_calls)
 			function prv() private { free(); free(); }
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 		{"L", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.ext()"},
 			{"Entry", "function C.pub()"},
@@ -342,13 +342,13 @@ BOOST_AUTO_TEST_CASE(ordinary_calls)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(call_chains_through_externals)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		library L {
 			function ext() external { C(address(0x0)).ext(); }
 			function pub() public {}
@@ -367,14 +367,14 @@ BOOST_AUTO_TEST_CASE(call_chains_through_externals)
 			function pub3() public { C(address(0x0)).ext(); }
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 		{"L", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.ext()"},
 			{"Entry", "function C.ext2()"},
@@ -388,13 +388,13 @@ BOOST_AUTO_TEST_CASE(call_chains_through_externals)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(calls_from_constructors)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free() returns (uint) {}
 
 		library L {
@@ -417,9 +417,9 @@ BOOST_AUTO_TEST_CASE(calls_from_constructors)
 			function inr() internal returns (uint) {}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {
 			{"Entry", "constructor of C"},
 			{"constructor of C", "function C.inr()"},
@@ -432,7 +432,7 @@ BOOST_AUTO_TEST_CASE(calls_from_constructors)
 		{"L", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.ext()"},
 		}},
@@ -444,13 +444,13 @@ BOOST_AUTO_TEST_CASE(calls_from_constructors)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(calls_to_constructors)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free() { new D(); }
 
 		library L {
@@ -467,9 +467,9 @@ BOOST_AUTO_TEST_CASE(calls_to_constructors)
 
 		contract D {}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {
 			{"Entry", "constructor of C"},
 		}},
@@ -477,7 +477,7 @@ BOOST_AUTO_TEST_CASE(calls_to_constructors)
 		{"L", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.ext()"},
 			{"function C.ext()", "function C.inr()"},
@@ -491,21 +491,21 @@ BOOST_AUTO_TEST_CASE(calls_to_constructors)
 		}},
 	};
 
-	map<string, set<string>> expectedCreatedContractsAtCreation = {
+	std::map<std::string, std::set<std::string>> expectedCreatedContractsAtCreation = {
 		{"C", {"D"}},
 	};
-	map<string, set<string>> expectedCreatedContractsAfterDeployment = {
+	std::map<std::string, std::set<std::string>> expectedCreatedContractsAfterDeployment = {
 		{"C", {"D"}},
 		{"L", {"C", "D"}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges, expectedCreatedContractsAtCreation);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges, expectedCreatedContractsAfterDeployment);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges, expectedCreatedContractsAtCreation);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges, expectedCreatedContractsAfterDeployment);
 }
 
 BOOST_AUTO_TEST_CASE(inherited_constructors)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free() {}
 
 		library L {
@@ -546,9 +546,9 @@ BOOST_AUTO_TEST_CASE(inherited_constructors)
 			function extG() external returns (uint) { new F(); }
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {
 			{"Entry", "constructor of C"},
 			{"constructor of C", "function C.inrC()"},
@@ -589,7 +589,7 @@ BOOST_AUTO_TEST_CASE(inherited_constructors)
 		{"L", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.extC()"},
 			{"function C.extC()", "function C.inrC()"},
@@ -631,18 +631,18 @@ BOOST_AUTO_TEST_CASE(inherited_constructors)
 		}},
 	};
 
-	map<string, set<string>> expectedCreatedContractsAtCreation = {};
-	map<string, set<string>> expectedCreatedContractsAfterDeployment = {
+	std::map<std::string, std::set<std::string>> expectedCreatedContractsAtCreation = {};
+	std::map<std::string, std::set<std::string>> expectedCreatedContractsAfterDeployment = {
 		{"G", {"F"}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges, expectedCreatedContractsAtCreation);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges, expectedCreatedContractsAfterDeployment);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges, expectedCreatedContractsAtCreation);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges, expectedCreatedContractsAfterDeployment);
 }
 
 BOOST_AUTO_TEST_CASE(inheritance_specifiers)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function fD() returns (uint) {}
 		function fE() returns (uint) {}
 		function fFD() returns (uint) {}
@@ -680,9 +680,9 @@ BOOST_AUTO_TEST_CASE(inheritance_specifiers)
 
 		contract G is D(fG()), E(fG()) {}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {
 			{"Entry", "constructor of C"},
 			{"Entry", "function fVarC()"},
@@ -726,7 +726,7 @@ BOOST_AUTO_TEST_CASE(inheritance_specifiers)
 		}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {}},
 		{"D", {}},
 		{"E", {}},
@@ -734,13 +734,13 @@ BOOST_AUTO_TEST_CASE(inheritance_specifiers)
 		{"G", {}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(inherited_functions_virtual_and_super)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		contract C {
 			function f() internal {}
 			function g() internal virtual {}
@@ -776,15 +776,15 @@ BOOST_AUTO_TEST_CASE(inherited_functions_virtual_and_super)
 			function callSuperH() external { super.h(); }
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 		{"D", {}},
 		{"E", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.ext()"},
 		}},
@@ -820,13 +820,13 @@ BOOST_AUTO_TEST_CASE(inherited_functions_virtual_and_super)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(overloaded_functions)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		enum E {E1, E2, E3}
 
 		function free() {}
@@ -850,14 +850,14 @@ BOOST_AUTO_TEST_CASE(overloaded_functions)
 			function f(bytes memory) internal {}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 		{"D", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.f(bool)"},
 		}},
@@ -878,13 +878,13 @@ BOOST_AUTO_TEST_CASE(overloaded_functions)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(modifiers)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		library L {
 			modifier m() { g(); _; }
 
@@ -916,9 +916,9 @@ BOOST_AUTO_TEST_CASE(modifiers)
 			function q() internal override {}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 		{"D", {}},
 		{"L", {}},
@@ -937,7 +937,7 @@ BOOST_AUTO_TEST_CASE(modifiers)
 		}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {}},
 		{"D", {}},
 		{"L", {}},
@@ -960,16 +960,16 @@ BOOST_AUTO_TEST_CASE(modifiers)
 		}},
 	};
 
-	map<string, set<string>> expectedCreatedContractsAtCreation = {{"E", {"C"}}};
-	map<string, set<string>> expectedCreatedContractsAfterDeployment = {{"E", {"C"}}};
+	std::map<std::string, std::set<std::string>> expectedCreatedContractsAtCreation = {{"E", {"C"}}};
+	std::map<std::string, std::set<std::string>> expectedCreatedContractsAfterDeployment = {{"E", {"C"}}};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges, expectedCreatedContractsAtCreation);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges, expectedCreatedContractsAfterDeployment);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges, expectedCreatedContractsAtCreation);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges, expectedCreatedContractsAfterDeployment);
 }
 
 BOOST_AUTO_TEST_CASE(events)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free() { emit L.Ev(); }
 
 		library L {
@@ -996,15 +996,15 @@ BOOST_AUTO_TEST_CASE(events)
 			function f() internal returns (uint) {}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 		{"D", {}},
 		{"L", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {}},
 		{"D", {
 			{"Entry", "function D.ext()"},
@@ -1021,8 +1021,8 @@ BOOST_AUTO_TEST_CASE(events)
 		}},
 	};
 
-	map<string, set<string>> expectedCreationEvents = {};
-	map<string, set<string>> expectedDeployedEvents = {
+	std::map<std::string, std::set<std::string>> expectedCreationEvents = {};
+	std::map<std::string, std::set<std::string>> expectedDeployedEvents = {
 		{"D", {
 			"event D.EvD1(uint256)",
 			"event C.EvC(uint256)",
@@ -1034,13 +1034,13 @@ BOOST_AUTO_TEST_CASE(events)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges, {}, expectedCreationEvents);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges, {}, expectedDeployedEvents);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges, {}, expectedCreationEvents);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges, {}, expectedDeployedEvents);
 }
 
 BOOST_AUTO_TEST_CASE(cycles)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free1() { free1(); }
 		function free2() { free3(); }
 		function free3() { free2(); }
@@ -1069,15 +1069,15 @@ BOOST_AUTO_TEST_CASE(cycles)
 			function virt() internal override { C.virt(); }
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"L", {}},
 		{"C", {}},
 		{"D", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"L", {}},
 		{"C", {}},
 		{"D", {
@@ -1106,13 +1106,13 @@ BOOST_AUTO_TEST_CASE(cycles)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(interfaces_and_abstract_contracts)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		interface I {
 			event Ev(uint);
 
@@ -1143,16 +1143,16 @@ BOOST_AUTO_TEST_CASE(interfaces_and_abstract_contracts)
 			modifier m() override { _; }
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"I", {}},
 		{"J", {}},
 		{"C", {}},
 		{"D", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"I", {
 			{"Entry", "function I.ext1()"},
 			{"Entry", "function I.ext2()"},
@@ -1184,21 +1184,21 @@ BOOST_AUTO_TEST_CASE(interfaces_and_abstract_contracts)
 		}},
 	};
 
-	map<string, set<string>> expectedCreationEvents = {};
-	map<string, set<string>> expectedDeployedEvents = {
+	std::map<std::string, std::set<std::string>> expectedCreationEvents = {};
+	std::map<std::string, std::set<std::string>> expectedDeployedEvents = {
 		{"D", {
 			"event I.Ev(uint256)",
 		}},
 	};
 
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges, {}, expectedCreationEvents);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges, {}, expectedDeployedEvents);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges, {}, expectedCreationEvents);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges, {}, expectedDeployedEvents);
 }
 
 BOOST_AUTO_TEST_CASE(indirect_calls)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free1() {}
 		function free2() {}
 		function free3() {}
@@ -1253,9 +1253,9 @@ BOOST_AUTO_TEST_CASE(indirect_calls)
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"L", {}},
 		{"C", {}},
 		{"D", {
@@ -1273,7 +1273,7 @@ BOOST_AUTO_TEST_CASE(indirect_calls)
 		}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"L", {
 			{"InternalDispatch", "function L.inr1()"},
 			{"InternalDispatch", "function L.inr2()"},
@@ -1315,13 +1315,13 @@ BOOST_AUTO_TEST_CASE(indirect_calls)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(calls_via_pointers)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free1() {}
 		function free2() {}
 		function free3() {}
@@ -1412,9 +1412,9 @@ BOOST_AUTO_TEST_CASE(calls_via_pointers)
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"L", {}},
 		{"C", {}},
 		{"D", {
@@ -1437,7 +1437,7 @@ BOOST_AUTO_TEST_CASE(calls_via_pointers)
 		}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"L", {}},
 		{"C", {
 			{"InternalDispatch", "function C.inr2()"},
@@ -1475,13 +1475,13 @@ BOOST_AUTO_TEST_CASE(calls_via_pointers)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(pointer_to_overridden_function)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		contract C {
 			function f() internal virtual {}
 		}
@@ -1506,14 +1506,14 @@ BOOST_AUTO_TEST_CASE(pointer_to_overridden_function)
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 		{"D", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {}},
 		{"D", {
 			{"InternalDispatch", "function C.f()"},
@@ -1526,13 +1526,13 @@ BOOST_AUTO_TEST_CASE(pointer_to_overridden_function)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(pointer_to_nonexistent_function)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		interface I {
 			function f() external;
 		}
@@ -1559,15 +1559,15 @@ BOOST_AUTO_TEST_CASE(pointer_to_nonexistent_function)
 			function g() internal override {}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"I", {}},
 		{"C", {}},
 		{"D", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"I", {
 			{"Entry", "function I.f()"},
 			  }},
@@ -1593,39 +1593,39 @@ BOOST_AUTO_TEST_CASE(pointer_to_nonexistent_function)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(function_self_reference)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		contract C {
 			function f() public returns (bool ret) {
 				return f == f;
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.f()"},
 			{"InternalDispatch", "function C.f()"},
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(pointer_cycle)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		contract C {
 			function () ptr = f;
 
@@ -1637,14 +1637,14 @@ BOOST_AUTO_TEST_CASE(pointer_cycle)
 		}
 	)"s);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {
 			{"InternalDispatch", "function C.f()"},
 			{"function C.f()", "InternalDispatch"},
 		}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"InternalDispatch", "function C.f()"},
 			{"Entry", "function C.test()"},
@@ -1652,15 +1652,15 @@ BOOST_AUTO_TEST_CASE(pointer_cycle)
 			{"function C.f()", "InternalDispatch"},
 		}},
 	};
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(using_for)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		struct S {
 			uint x;
 		}
@@ -1681,14 +1681,14 @@ BOOST_AUTO_TEST_CASE(using_for)
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"L", {}},
 		{"C", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"L", {
 			{"Entry", "function L.ext(struct S)"},
 		}},
@@ -1698,13 +1698,13 @@ BOOST_AUTO_TEST_CASE(using_for)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(user_defined_binary_operator)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		type Int is int128;
 		using {add as +} for Int global;
 
@@ -1718,26 +1718,26 @@ BOOST_AUTO_TEST_CASE(user_defined_binary_operator)
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.pub()"},
 			{"function C.pub()", "function add(Int,Int)"},
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(user_defined_unary_operator)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		type Int is int128;
 		using {sub as -} for Int global;
 
@@ -1751,26 +1751,26 @@ BOOST_AUTO_TEST_CASE(user_defined_unary_operator)
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.pub()"},
 			{"function C.pub()", "function sub(Int)"},
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(getters)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		contract C {
 			uint public variable;
 			uint[][] public array;
@@ -1783,23 +1783,23 @@ BOOST_AUTO_TEST_CASE(getters)
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {{"Entry", "function C.test()"}}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(fallback_and_receive)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		contract C {
 			function ext() external {}
 			function inr() internal {}
@@ -1825,15 +1825,15 @@ BOOST_AUTO_TEST_CASE(fallback_and_receive)
 
 		contract E is C {}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 		{"D", {}},
 		{"E", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "function C.ext()"},
 			{"Entry", "receive of C"},
@@ -1854,13 +1854,13 @@ BOOST_AUTO_TEST_CASE(fallback_and_receive)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(virtual_fallback_and_receive)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		contract C {
 			fallback() external virtual {}
 			receive() external payable virtual {}
@@ -1878,16 +1878,16 @@ BOOST_AUTO_TEST_CASE(virtual_fallback_and_receive)
 			receive() external payable override {}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"C", {}},
 		{"D", {}},
 		{"E", {}},
 		{"F", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"C", {
 			{"Entry", "receive of C"},
 			{"Entry", "fallback of C"},
@@ -1906,13 +1906,13 @@ BOOST_AUTO_TEST_CASE(virtual_fallback_and_receive)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(builtins)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		interface I {}
 
 		contract C {
@@ -1989,14 +1989,14 @@ BOOST_AUTO_TEST_CASE(builtins)
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"I", {}},
 		{"C", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"I", {}},
 		{"C", {
 			{"Entry", "function C.accessBuiltin()"},
@@ -2004,13 +2004,13 @@ BOOST_AUTO_TEST_CASE(builtins)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(conversions_and_struct_array_constructors)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		interface I {}
 
 		enum E {A, B, C}
@@ -2053,14 +2053,14 @@ BOOST_AUTO_TEST_CASE(conversions_and_struct_array_constructors)
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"I", {}},
 		{"C", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"I", {}},
 		{"C", {
 			{"Entry", "function C.convert()"},
@@ -2069,13 +2069,13 @@ BOOST_AUTO_TEST_CASE(conversions_and_struct_array_constructors)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(immutable_initialization)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free() pure returns (uint) { return 42; }
 
 		contract Base {
@@ -2098,9 +2098,9 @@ BOOST_AUTO_TEST_CASE(immutable_initialization)
 			}
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"Base", {}},
 		{"C", {
 			{"Entry", "function Base.inr()"},
@@ -2113,7 +2113,7 @@ BOOST_AUTO_TEST_CASE(immutable_initialization)
 		}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"Base", {
 			{"Entry", "function Base.ext()"},
 			{"function Base.ext()", "function free()"},
@@ -2128,13 +2128,13 @@ BOOST_AUTO_TEST_CASE(immutable_initialization)
 		}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_CASE(function_selector_access)
 {
-	unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
+	std::unique_ptr<CompilerStack> compilerStack = parseAndAnalyzeContracts(R"(
 		function free() pure {}
 
 		bytes4 constant extFreeConst = Base.ext.selector;
@@ -2171,9 +2171,9 @@ BOOST_AUTO_TEST_CASE(function_selector_access)
 			bytes4 constant pubConst = Base.pub.selector;
 		}
 	)"s);
-	tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
+	std::tuple<CallGraphMap, CallGraphMap> graphs = collectGraphs(*compilerStack);
 
-	map<string, EdgeNames> expectedCreationEdges = {
+	std::map<std::string, EdgeNames> expectedCreationEdges = {
 		{"Base", {}},
 		{"C", {}},
 		{"D", {
@@ -2188,7 +2188,7 @@ BOOST_AUTO_TEST_CASE(function_selector_access)
 		{"L", {}},
 	};
 
-	map<string, EdgeNames> expectedDeployedEdges = {
+	std::map<std::string, EdgeNames> expectedDeployedEdges = {
 		{"Base", {
 			{"Entry", "function Base.ext()"},
 			{"Entry", "function Base.pub()"},
@@ -2226,8 +2226,8 @@ BOOST_AUTO_TEST_CASE(function_selector_access)
 		{"L", {}},
 	};
 
-	checkCallGraphExpectations(get<0>(graphs), expectedCreationEdges);
-	checkCallGraphExpectations(get<1>(graphs), expectedDeployedEdges);
+	checkCallGraphExpectations(std::get<0>(graphs), expectedCreationEdges);
+	checkCallGraphExpectations(std::get<1>(graphs), expectedDeployedEdges);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/libsolidity/interface/FileReader.cpp b/test/libsolidity/interface/FileReader.cpp
index 58ab9bfe9d..dbb03c23f2 100644
--- a/test/libsolidity/interface/FileReader.cpp
+++ b/test/libsolidity/interface/FileReader.cpp
@@ -30,7 +30,6 @@
 #include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::test;
 
@@ -226,12 +225,12 @@ BOOST_AUTO_TEST_CASE(normalizeCLIPathForVFS_stripping_root_name)
 		BOOST_CHECK_EQUAL(normalizedPath.root_directory(), "/");
 
 #if defined(_WIN32)
-		string root = workDir.root_path().string();
+		std::string root = workDir.root_path().string();
 		soltestAssert(root.length() == 3 && root[1] == ':' && root[2] == '\\', "");
 
-		for (auto convert: {boost::to_lower_copy<string>, boost::to_upper_copy<string>})
+		for (auto convert: {boost::to_lower_copy<std::string>, boost::to_upper_copy<std::string>})
 		{
-			boost::filesystem::path workDirWin = convert(root, locale()) / workDir.relative_path();
+			boost::filesystem::path workDirWin = convert(root, std::locale()) / workDir.relative_path();
 			normalizedPath = FileReader::normalizeCLIPathForVFS(
 				workDirWin,
 				resolveSymlinks
diff --git a/test/libsolutil/Checksum.cpp b/test/libsolutil/Checksum.cpp
index ab7ccf631a..c9987a8b18 100644
--- a/test/libsolutil/Checksum.cpp
+++ b/test/libsolutil/Checksum.cpp
@@ -26,7 +26,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
@@ -47,7 +46,7 @@ BOOST_AUTO_TEST_CASE(calculate)
 	BOOST_CHECK_THROW(getChecksummedAddress("0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaeK"), InvalidAddress);
 
 	// the official test suite from EIP-55
-	vector<string> cases {
+	std::vector<std::string> cases {
 		// all upper case
 		"0x52908400098527886E0F7030069857D2E4169EE7",
 		"0x8617E340B3D01FA5F11F306F4090FD50E238070D",
@@ -103,10 +102,10 @@ BOOST_AUTO_TEST_CASE(homocaps_valid)
 
 BOOST_AUTO_TEST_CASE(homocaps_invalid)
 {
-	string upper = "0x00AA0000000012400000000DDEEFF000000000BB";
+	std::string upper = "0x00AA0000000012400000000DDEEFF000000000BB";
 	BOOST_CHECK(passesAddressChecksum(upper, false));
 	BOOST_CHECK(!passesAddressChecksum(upper, true));
-	string lower = "0x11aa000000000000000d00cc00000000000000bb";
+	std::string lower = "0x11aa000000000000000d00cc00000000000000bb";
 	BOOST_CHECK(passesAddressChecksum(lower, false));
 	BOOST_CHECK(!passesAddressChecksum(lower, true));
 }
diff --git a/test/libsolutil/CommonData.cpp b/test/libsolutil/CommonData.cpp
index 8be8cc3b00..b4b0351bcd 100644
--- a/test/libsolutil/CommonData.cpp
+++ b/test/libsolutil/CommonData.cpp
@@ -28,7 +28,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::frontend;
 
 // TODO: Fix Boost...
diff --git a/test/libsolutil/CommonIO.cpp b/test/libsolutil/CommonIO.cpp
index 93637fb9b7..d31c9a560d 100644
--- a/test/libsolutil/CommonIO.cpp
+++ b/test/libsolutil/CommonIO.cpp
@@ -31,7 +31,6 @@
 #include <fstream>
 #include <string>
 
-using namespace std;
 using namespace solidity::test;
 
 #define TEST_CASE_NAME (boost::unit_test::framework::current_test_case().p_name)
@@ -68,31 +67,31 @@ BOOST_AUTO_TEST_CASE(readFileAsString_symlink)
 
 BOOST_AUTO_TEST_CASE(readUntilEnd_no_ending_newline)
 {
-	istringstream inputStream("ABC\ndef");
+	std::istringstream inputStream("ABC\ndef");
 	BOOST_TEST(readUntilEnd(inputStream) == "ABC\ndef");
 }
 
 BOOST_AUTO_TEST_CASE(readUntilEnd_with_ending_newline)
 {
-	istringstream inputStream("ABC\ndef\n");
+	std::istringstream inputStream("ABC\ndef\n");
 	BOOST_TEST(readUntilEnd(inputStream) == "ABC\ndef\n");
 }
 
 BOOST_AUTO_TEST_CASE(readUntilEnd_cr_lf_newline)
 {
-	istringstream inputStream("ABC\r\ndef");
+	std::istringstream inputStream("ABC\r\ndef");
 	BOOST_TEST(readUntilEnd(inputStream) == "ABC\r\ndef");
 }
 
 BOOST_AUTO_TEST_CASE(readUntilEnd_empty)
 {
-	istringstream inputStream("");
+	std::istringstream inputStream("");
 	BOOST_TEST(readUntilEnd(inputStream) == "");
 }
 
 BOOST_AUTO_TEST_CASE(readBytes_past_end)
 {
-	istringstream inputStream("abc");
+	std::istringstream inputStream("abc");
 	BOOST_CHECK_EQUAL(readBytes(inputStream, 0), "");
 	BOOST_CHECK_EQUAL(readBytes(inputStream, 1), "a");
 	BOOST_CHECK_EQUAL(readBytes(inputStream, 20), "bc");
diff --git a/test/libsolutil/FixedHash.cpp b/test/libsolutil/FixedHash.cpp
index 279f4246a2..3b20a5054a 100644
--- a/test/libsolutil/FixedHash.cpp
+++ b/test/libsolutil/FixedHash.cpp
@@ -25,7 +25,6 @@
 #include <cstdint>
 #include <sstream>
 
-using namespace std;
 
 namespace solidity::util::test
 {
diff --git a/test/libsolutil/FunctionSelector.cpp b/test/libsolutil/FunctionSelector.cpp
index 2ddfe94000..e8080df49b 100644
--- a/test/libsolutil/FunctionSelector.cpp
+++ b/test/libsolutil/FunctionSelector.cpp
@@ -25,7 +25,6 @@
 #include <cstdint>
 #include <sstream>
 
-using namespace std;
 
 namespace solidity::util::test
 {
diff --git a/test/libsolutil/IndentedWriter.cpp b/test/libsolutil/IndentedWriter.cpp
index 0938f96175..94997c842c 100644
--- a/test/libsolutil/IndentedWriter.cpp
+++ b/test/libsolutil/IndentedWriter.cpp
@@ -25,7 +25,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
diff --git a/test/libsolutil/IpfsHash.cpp b/test/libsolutil/IpfsHash.cpp
index c99650a4b0..47fa120ecd 100644
--- a/test/libsolutil/IpfsHash.cpp
+++ b/test/libsolutil/IpfsHash.cpp
@@ -25,7 +25,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
@@ -37,16 +36,16 @@ BOOST_AUTO_TEST_CASE(test_small)
 	BOOST_CHECK_EQUAL(ipfsHashBase58({}), "QmbFMke1KXqnYyBBWxB74N4c5SBnJMVAiMNRcGu6x1AwQH");
 	BOOST_CHECK_EQUAL(ipfsHashBase58("x"), "QmULKig5Fxrs2sC4qt9nNduucXfb92AFYQ6Hi3YRqDmrYC");
 	BOOST_CHECK_EQUAL(ipfsHashBase58("Solidity\n"), "QmSsm9M7PQRBnyiz1smizk8hZw3URfk8fSeHzeTo3oZidS");
-	BOOST_CHECK_EQUAL(ipfsHashBase58(string(200ul, char(0))), "QmSXR1N23uWzsANi8wpxMPw5dmmhqBVUAb4hUrHVLpNaMr");
-	BOOST_CHECK_EQUAL(ipfsHashBase58(string(10250ul, char(0))), "QmVJJBB3gKKBWYC9QTywpH8ZL1bDeTDJ17B63Af5kino9i");
-	BOOST_CHECK_EQUAL(ipfsHashBase58(string(100000ul, char(0))), "QmYgKa25YqEGpQmmZtPPFMNK3kpqqneHk6nMSEUYryEX1C");
-	BOOST_CHECK_EQUAL(ipfsHashBase58(string(121071ul, char(0))), "QmdMdRshQmqvyc92N82r7AKYdUF5FRh4DJo6GtrmEk3wgj");
+	BOOST_CHECK_EQUAL(ipfsHashBase58(std::string(200ul, char(0))), "QmSXR1N23uWzsANi8wpxMPw5dmmhqBVUAb4hUrHVLpNaMr");
+	BOOST_CHECK_EQUAL(ipfsHashBase58(std::string(10250ul, char(0))), "QmVJJBB3gKKBWYC9QTywpH8ZL1bDeTDJ17B63Af5kino9i");
+	BOOST_CHECK_EQUAL(ipfsHashBase58(std::string(100000ul, char(0))), "QmYgKa25YqEGpQmmZtPPFMNK3kpqqneHk6nMSEUYryEX1C");
+	BOOST_CHECK_EQUAL(ipfsHashBase58(std::string(121071ul, char(0))), "QmdMdRshQmqvyc92N82r7AKYdUF5FRh4DJo6GtrmEk3wgj");
 }
 
 BOOST_AUTO_TEST_CASE(test_medium)
 {
 	size_t length = 131071;
-	string data;
+	std::string data;
 	data.resize(length, 0);
 	BOOST_REQUIRE_EQUAL(data.size(), length);
 	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmSxYSToKHsPqqRdRnsM9gmr3EYS6dakhVaHgbFdgYQWi6");
@@ -55,7 +54,7 @@ BOOST_AUTO_TEST_CASE(test_medium)
 BOOST_AUTO_TEST_CASE(test_largest_unchunked)
 {
 	size_t length = 1024 * 256 - 1;
-	string data;
+	std::string data;
 	data.resize(length, 0);
 	BOOST_REQUIRE_EQUAL(data.size(), length);
 	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmbNDspMkzkMFKyS3eCJGedG7GWRQHSCzJCZLjxP7wyVAx");
@@ -64,7 +63,7 @@ BOOST_AUTO_TEST_CASE(test_largest_unchunked)
 BOOST_AUTO_TEST_CASE(test_smallest_chunked)
 {
 	size_t length = 1024 * 256 + 1;
-	string data;
+	std::string data;
 	data.resize(length, 0);
 	BOOST_REQUIRE_EQUAL(data.size(), length);
 	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmbVuw4C4vcmVKqxoWtgDVobvcHrSn51qsmQmyxjk4sB2Q");
@@ -73,7 +72,7 @@ BOOST_AUTO_TEST_CASE(test_smallest_chunked)
 BOOST_AUTO_TEST_CASE(test_large)
 {
 	size_t length = 1310710;
-	string data;
+	std::string data;
 	data.resize(length, 0);
 	BOOST_REQUIRE_EQUAL(data.size(), length);
 	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmNg7BJo8gEMDK8yGQbHEwPtycesnE6FUULX5iVd5TAL9f");
@@ -82,7 +81,7 @@ BOOST_AUTO_TEST_CASE(test_large)
 BOOST_AUTO_TEST_CASE(test_largest_one_level)
 {
 	size_t length = 45613056; // 1024 * 256 * 174;
-	string data;
+	std::string data;
 	data.resize(length, 0);
 	BOOST_REQUIRE_EQUAL(data.size(), length);
 	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmY4HSz1oVGdUzb8poVYPLsoqBZjH6LZrtgnme9wWn2Qko");
@@ -91,7 +90,7 @@ BOOST_AUTO_TEST_CASE(test_largest_one_level)
 BOOST_AUTO_TEST_CASE(test_smallest_multi_level)
 {
 	size_t length = 45613057; // 1024 * 256 * 174 + 1;
-	string data;
+	std::string data;
 	data.resize(length, 0);
 	BOOST_REQUIRE_EQUAL(data.size(), length);
 	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmehMASWcBsX7VcEQqs6rpR5AHoBfKyBVEgmkJHjpPg8jq");
@@ -100,7 +99,7 @@ BOOST_AUTO_TEST_CASE(test_smallest_multi_level)
 BOOST_AUTO_TEST_CASE(test_multi_level_tree)
 {
 	size_t length = 46661632;
-	string data;
+	std::string data;
 	data.resize(length, 0);
 	BOOST_REQUIRE_EQUAL(data.size(), length);
 	BOOST_CHECK_EQUAL(ipfsHashBase58(data), "QmaTb1sT9hrSXJLmf8bxJ9NuwndiHuMLsgNLgkS2eXu3Xj");
diff --git a/test/libsolutil/IterateReplacing.cpp b/test/libsolutil/IterateReplacing.cpp
index a548415609..7b70f155f2 100644
--- a/test/libsolutil/IterateReplacing.cpp
+++ b/test/libsolutil/IterateReplacing.cpp
@@ -25,7 +25,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
@@ -34,61 +33,61 @@ BOOST_AUTO_TEST_SUITE(IterateReplacing, *boost::unit_test::label("nooptions"))
 
 BOOST_AUTO_TEST_CASE(no_replacement)
 {
-	vector<string> v{"abc", "def", "ghi"};
-	function<std::optional<vector<string>>(string&)> f = [](string&) -> std::optional<vector<string>> { return {}; };
+	std::vector<std::string> v{"abc", "def", "ghi"};
+	std::function<std::optional<std::vector<std::string>>(std::string&)> f = [](std::string&) -> std::optional<std::vector<std::string>> { return {}; };
 	iterateReplacing(v, f);
-	vector<string> expectation{"abc", "def", "ghi"};
+	std::vector<std::string> expectation{"abc", "def", "ghi"};
 	BOOST_CHECK(v == expectation);
 }
 
 BOOST_AUTO_TEST_CASE(empty_input)
 {
-	vector<string> v;
-	function<std::optional<vector<string>>(string&)> f = [](string&) -> std::optional<vector<string>> { return {}; };
+	std::vector<std::string> v;
+	std::function<std::optional<std::vector<std::string>>(std::string&)> f = [](std::string&) -> std::optional<std::vector<std::string>> { return {}; };
 	iterateReplacing(v, f);
-	vector<string> expectation;
+	std::vector<std::string> expectation;
 	BOOST_CHECK(v == expectation);
 }
 
 BOOST_AUTO_TEST_CASE(delete_some)
 {
-	vector<string> v{"abc", "def", "ghi"};
-	function<std::optional<vector<string>>(string&)> f = [](string& _s) -> std::optional<vector<string>> {
+	std::vector<std::string> v{"abc", "def", "ghi"};
+	std::function<std::optional<std::vector<std::string>>(std::string&)> f = [](std::string& _s) -> std::optional<std::vector<std::string>> {
 		if (_s == "def")
-			return vector<string>();
+			return std::vector<std::string>();
 		else
 			return {};
 	};
 	iterateReplacing(v, f);
-	vector<string> expectation{"abc", "ghi"};
+	std::vector<std::string> expectation{"abc", "ghi"};
 	BOOST_CHECK(v == expectation);
 }
 
 BOOST_AUTO_TEST_CASE(inject_some_start)
 {
-	vector<string> v{"abc", "def", "ghi"};
-	function<std::optional<vector<string>>(string&)> f = [](string& _s) -> std::optional<vector<string>> {
+	std::vector<std::string> v{"abc", "def", "ghi"};
+	std::function<std::optional<std::vector<std::string>>(std::string&)> f = [](std::string& _s) -> std::optional<std::vector<std::string>> {
 		if (_s == "abc")
-			return vector<string>{"x", "y"};
+			return std::vector<std::string>{"x", "y"};
 		else
 			return {};
 	};
 	iterateReplacing(v, f);
-	vector<string> expectation{"x", "y", "def", "ghi"};
+	std::vector<std::string> expectation{"x", "y", "def", "ghi"};
 	BOOST_CHECK(v == expectation);
 }
 
 BOOST_AUTO_TEST_CASE(inject_some_end)
 {
-	vector<string> v{"abc", "def", "ghi"};
-	function<std::optional<vector<string>>(string&)> f = [](string& _s) -> std::optional<vector<string>> {
+	std::vector<std::string> v{"abc", "def", "ghi"};
+	std::function<std::optional<std::vector<std::string>>(std::string&)> f = [](std::string& _s) -> std::optional<std::vector<std::string>> {
 		if (_s == "ghi")
-			return vector<string>{"x", "y"};
+			return std::vector<std::string>{"x", "y"};
 		else
 			return {};
 	};
 	iterateReplacing(v, f);
-	vector<string> expectation{"abc", "def", "x", "y"};
+	std::vector<std::string> expectation{"abc", "def", "x", "y"};
 	BOOST_CHECK(v == expectation);
 }
 
diff --git a/test/libsolutil/JSON.cpp b/test/libsolutil/JSON.cpp
index 3679fbe7c1..da10c0b3c6 100644
--- a/test/libsolutil/JSON.cpp
+++ b/test/libsolutil/JSON.cpp
@@ -26,7 +26,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
@@ -35,7 +34,7 @@ BOOST_AUTO_TEST_SUITE(JsonTest, *boost::unit_test::label("nooptions"))
 
 BOOST_AUTO_TEST_CASE(json_types)
 {
-	auto check = [](Json::Value value, string const& expectation) {
+	auto check = [](Json::Value value, std::string const& expectation) {
 		BOOST_CHECK(jsonCompactPrint(value) == expectation);
 	};
 
diff --git a/test/libsolutil/Keccak256.cpp b/test/libsolutil/Keccak256.cpp
index 17de6c8852..066e909f78 100644
--- a/test/libsolutil/Keccak256.cpp
+++ b/test/libsolutil/Keccak256.cpp
@@ -22,7 +22,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
diff --git a/test/libsolutil/LEB128.cpp b/test/libsolutil/LEB128.cpp
index 96ce11c7a5..ccbacf13d6 100644
--- a/test/libsolutil/LEB128.cpp
+++ b/test/libsolutil/LEB128.cpp
@@ -23,7 +23,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
diff --git a/test/libsolutil/StringUtils.cpp b/test/libsolutil/StringUtils.cpp
index 8dd81d34e5..589efa9060 100644
--- a/test/libsolutil/StringUtils.cpp
+++ b/test/libsolutil/StringUtils.cpp
@@ -29,7 +29,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
@@ -75,7 +74,7 @@ BOOST_AUTO_TEST_CASE(test_dldistance)
 
 BOOST_AUTO_TEST_CASE(test_alternatives_list)
 {
-	vector<string> strings;
+	std::vector<std::string> strings;
 	BOOST_CHECK_EQUAL(quotedAlternativesList(strings), "");
 	strings.emplace_back("a");
 	BOOST_CHECK_EQUAL(quotedAlternativesList(strings), "\"a\"");
@@ -89,20 +88,20 @@ BOOST_AUTO_TEST_CASE(test_alternatives_list)
 
 BOOST_AUTO_TEST_CASE(test_human_readable_join)
 {
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({})), "");
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({"a"})), "a");
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({"a", "b"})), "a, b");
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({"a", "b", "c"})), "a, b, c");
-
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({}), "; "), "");
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({"a"}), "; "), "a");
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({"a", "b"}), "; "), "a; b");
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({"a", "b", "c"}), "; "), "a; b; c");
-
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({}), "; ", " or "), "");
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({"a"}), "; ", " or "), "a");
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({"a", "b"}), "; ", " or "), "a or b");
-	BOOST_CHECK_EQUAL(joinHumanReadable(vector<string>({"a", "b", "c"}), "; ", " or "), "a; b or c");
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({})), "");
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a"})), "a");
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b"})), "a, b");
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b", "c"})), "a, b, c");
+
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({}), "; "), "");
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a"}), "; "), "a");
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b"}), "; "), "a; b");
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b", "c"}), "; "), "a; b; c");
+
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({}), "; ", " or "), "");
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a"}), "; ", " or "), "a");
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b"}), "; ", " or "), "a or b");
+	BOOST_CHECK_EQUAL(joinHumanReadable(std::vector<std::string>({"a", "b", "c"}), "; ", " or "), "a; b or c");
 }
 
 BOOST_AUTO_TEST_CASE(test_format_number_readable)
diff --git a/test/libsolutil/SwarmHash.cpp b/test/libsolutil/SwarmHash.cpp
index 5d0c22a801..25c6b77cd3 100644
--- a/test/libsolutil/SwarmHash.cpp
+++ b/test/libsolutil/SwarmHash.cpp
@@ -27,7 +27,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
@@ -37,12 +36,12 @@ BOOST_AUTO_TEST_SUITE(SwarmHash, *boost::unit_test::label("nooptions"))
 namespace
 {
 
-string bzzr0HashHex(string const& _input)
+std::string bzzr0HashHex(std::string const& _input)
 {
 	return toHex(bzzr0Hash(_input).asBytes());
 }
 
-string bzzr1HashHex(bytes const& _input)
+std::string bzzr1HashHex(bytes const& _input)
 {
 	return toHex(bzzr1Hash(_input).asBytes());
 }
@@ -59,17 +58,17 @@ bytes sequence(size_t _length)
 
 BOOST_AUTO_TEST_CASE(test_zeros)
 {
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string()), string("011b4d03dd8c01f1049143cf9c4c817e4b167f1d1b83e5c6f0f10d89ba1e7bce"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string(0x1000 - 1, 0)), string("32f0faabc4265ac238cd945087133ce3d7e9bb2e536053a812b5373c54043adb"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string(0x1000, 0)), string("411dd45de7246e94589ff5888362c41e85bd3e582a92d0fda8f0e90b76439bec"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string(0x1000 + 1, 0)), string("69754a0098432bbc2e84fe1205276870748a61a065ab6ef44d6a2e7b13ce044d"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string(0x2000 - 1, 0)), string("69ad3c581043404f775ffa8d6f1b25ad4a9ee812971190e90209c0966116a321"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string(0x2000, 0)), string("f00222373ff82d0a178dc6271c78953e9c88f74130a52d401f5ec51475f63c43"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string(0x2000 + 1, 0)), string("86d6773e79e02fd8145ee1aedba89ace0c15f2566db1249654000039a9a134bf"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string(0x80000, 0)), string("cc0854fe2c6b98e920d5c14b1a88e6d4223e55b8f78883f60939aa2485e361bf"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string(0x80020, 0)), string("ee9ffca246e70d3704740ba4df450fa6988d14a1c2439c7e734c7a77a4eb6fd3"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string(0x800020, 0)), string("78b90b20c90559fb904535181a7c28929ea2f30a2329dbc25232de579709f12f"));
-	BOOST_CHECK_EQUAL(bzzr0HashHex(string(2095104, 0)), string("a9958184589fc11b4027a4c233e777ebe2e99c66f96b74aef2a0638a94dd5439"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string()), std::string("011b4d03dd8c01f1049143cf9c4c817e4b167f1d1b83e5c6f0f10d89ba1e7bce"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x1000 - 1, 0)), std::string("32f0faabc4265ac238cd945087133ce3d7e9bb2e536053a812b5373c54043adb"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x1000, 0)), std::string("411dd45de7246e94589ff5888362c41e85bd3e582a92d0fda8f0e90b76439bec"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x1000 + 1, 0)), std::string("69754a0098432bbc2e84fe1205276870748a61a065ab6ef44d6a2e7b13ce044d"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x2000 - 1, 0)), std::string("69ad3c581043404f775ffa8d6f1b25ad4a9ee812971190e90209c0966116a321"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x2000, 0)), std::string("f00222373ff82d0a178dc6271c78953e9c88f74130a52d401f5ec51475f63c43"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x2000 + 1, 0)), std::string("86d6773e79e02fd8145ee1aedba89ace0c15f2566db1249654000039a9a134bf"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x80000, 0)), std::string("cc0854fe2c6b98e920d5c14b1a88e6d4223e55b8f78883f60939aa2485e361bf"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x80020, 0)), std::string("ee9ffca246e70d3704740ba4df450fa6988d14a1c2439c7e734c7a77a4eb6fd3"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(0x800020, 0)), std::string("78b90b20c90559fb904535181a7c28929ea2f30a2329dbc25232de579709f12f"));
+	BOOST_CHECK_EQUAL(bzzr0HashHex(std::string(2095104, 0)), std::string("a9958184589fc11b4027a4c233e777ebe2e99c66f96b74aef2a0638a94dd5439"));
 }
 
 BOOST_AUTO_TEST_CASE(bzz_hash_short)
diff --git a/test/libsolutil/TemporaryDirectoryTest.cpp b/test/libsolutil/TemporaryDirectoryTest.cpp
index 35c3c28b48..b5e6edee2d 100644
--- a/test/libsolutil/TemporaryDirectoryTest.cpp
+++ b/test/libsolutil/TemporaryDirectoryTest.cpp
@@ -25,7 +25,6 @@
 
 #include <fstream>
 
-using namespace std;
 using namespace boost::test_tools;
 
 namespace solidity::util::test
@@ -58,8 +57,8 @@ BOOST_AUTO_TEST_CASE(TemporaryDirectory_should_delete_its_directory_even_if_not_
 		BOOST_TEST(boost::filesystem::is_directory(dirPath));
 
 		{
-			ofstream tmpFile((dirPath / "test-file.txt").string());
-			tmpFile << "Delete me!" << endl;
+			std::ofstream tmpFile((dirPath / "test-file.txt").string());
+			tmpFile << "Delete me!" << std::endl;
 		}
 		soltestAssert(boost::filesystem::is_regular_file(dirPath / "test-file.txt"), "");
 	}
diff --git a/test/libsolutil/UTF8.cpp b/test/libsolutil/UTF8.cpp
index d6a14bcff8..449f221995 100644
--- a/test/libsolutil/UTF8.cpp
+++ b/test/libsolutil/UTF8.cpp
@@ -26,7 +26,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
@@ -35,13 +34,13 @@ BOOST_AUTO_TEST_SUITE(UTF8, *boost::unit_test::label("nooptions"))
 
 namespace {
 
-bool isValidUTF8(string const& _value)
+bool isValidUTF8(std::string const& _value)
 {
 	size_t pos;
 	return validateUTF8(asString(fromHex(_value)), pos);
 }
 
-bool isInvalidUTF8(string const& _value, size_t _expectedPos)
+bool isInvalidUTF8(std::string const& _value, size_t _expectedPos)
 {
 	size_t pos;
 	if (validateUTF8(asString(fromHex(_value)), pos))
@@ -94,7 +93,7 @@ BOOST_AUTO_TEST_CASE(invalid)
 
 BOOST_AUTO_TEST_CASE(corpus)
 {
-	string source = R"(
+	std::string source = R"(
 κόσμε
 
 hélló
diff --git a/test/libsolutil/Whiskers.cpp b/test/libsolutil/Whiskers.cpp
index 5b43d8d543..5bb4e3ad9f 100644
--- a/test/libsolutil/Whiskers.cpp
+++ b/test/libsolutil/Whiskers.cpp
@@ -25,7 +25,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 
 namespace solidity::util::test
 {
@@ -34,14 +33,14 @@ BOOST_AUTO_TEST_SUITE(WhiskersTest, *boost::unit_test::label("nooptions"))
 
 BOOST_AUTO_TEST_CASE(no_templates)
 {
-	string templ = "this text does not contain templates";
+	std::string templ = "this text does not contain templates";
 	BOOST_CHECK_EQUAL(Whiskers(templ).render(), templ);
 }
 
 BOOST_AUTO_TEST_CASE(basic_replacement)
 {
-	string templ = "a <b> x <c> -> <d>.";
-	string result = Whiskers(templ)
+	std::string templ = "a <b> x <c> -> <d>.";
+	std::string result = Whiskers(templ)
 		("b", "BE")
 		("c", "CE")
 		("d", "DE")
@@ -51,43 +50,43 @@ BOOST_AUTO_TEST_CASE(basic_replacement)
 
 BOOST_AUTO_TEST_CASE(tag_unavailable)
 {
-	string templ = "<b>";
+	std::string templ = "<b>";
 	Whiskers m(templ);
 	BOOST_CHECK_THROW(m.render(), WhiskersError);
 }
 
 BOOST_AUTO_TEST_CASE(list_unavailable)
 {
-	string templ = "<#b></b>";
+	std::string templ = "<#b></b>";
 	Whiskers m(templ);
 	BOOST_CHECK_THROW(m.render(), WhiskersError);
 }
 
 BOOST_AUTO_TEST_CASE(name_type_collision)
 {
-	string templ = "<b><#b></b>";
+	std::string templ = "<b><#b></b>";
 	Whiskers m(templ);
 	m("b", "x");
-	BOOST_CHECK_THROW(m("b", vector<map<string, string>>{}), WhiskersError);
+	BOOST_CHECK_THROW(m("b", std::vector<std::map<std::string, std::string>>{}), WhiskersError);
 }
 
 BOOST_AUTO_TEST_CASE(conditional)
 {
-	string templ = "<?b>X</b>";
+	std::string templ = "<?b>X</b>";
 	BOOST_CHECK_EQUAL(Whiskers(templ)("b", true).render(), "X");
 	BOOST_CHECK_EQUAL(Whiskers(templ)("b", false).render(), "");
 }
 
 BOOST_AUTO_TEST_CASE(conditional_with_else)
 {
-	string templ = "<?b>X<!b>Y</b>";
+	std::string templ = "<?b>X<!b>Y</b>";
 	BOOST_CHECK_EQUAL(Whiskers(templ)("b", true).render(), "X");
 	BOOST_CHECK_EQUAL(Whiskers(templ)("b", false).render(), "Y");
 }
 
 BOOST_AUTO_TEST_CASE(broken_conditional_with_else)
 {
-	string templ = "<?b>X<!bY</b>";
+	std::string templ = "<?b>X<!bY</b>";
 	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
 
 	templ = "<?bX<!b>Y</b>";
@@ -99,7 +98,7 @@ BOOST_AUTO_TEST_CASE(broken_conditional_with_else)
 
 BOOST_AUTO_TEST_CASE(broken_conditional_value_with_else)
 {
-	string templ = "<?+b>X<!+bY</+b>";
+	std::string templ = "<?+b>X<!+bY</+b>";
 	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
 
 	templ = "<?+bX<!+b>Y</+b>";
@@ -111,7 +110,7 @@ BOOST_AUTO_TEST_CASE(broken_conditional_value_with_else)
 
 BOOST_AUTO_TEST_CASE(broken_list_parameter)
 {
-	string templ = "<#b><a></b";
+	std::string templ = "<#b><a></b";
 	BOOST_CHECK_THROW(Whiskers{templ}, WhiskersError);
 
 	templ = "<#b<a></b>";
@@ -120,7 +119,7 @@ BOOST_AUTO_TEST_CASE(broken_list_parameter)
 
 BOOST_AUTO_TEST_CASE(conditional_plus_params)
 {
-	string templ = " - <?b>_<r><!b>^<t></b> - ";
+	std::string templ = " - <?b>_<r><!b>^<t></b> - ";
 	Whiskers m1(templ);
 	m1("b", true);
 	m1("r", "R");
@@ -136,10 +135,10 @@ BOOST_AUTO_TEST_CASE(conditional_plus_params)
 
 BOOST_AUTO_TEST_CASE(conditional_plus_list)
 {
-	string templ = " - <?b>_<#l><x></l><!b><#l><y></l></b> - ";
+	std::string templ = " - <?b>_<#l><x></l><!b><#l><y></l></b> - ";
 	Whiskers m(templ);
 	m("b", false);
-	vector<map<string, string>> list(2);
+	std::vector<std::map<std::string, std::string>> list(2);
 	list[0]["x"] = "1";
 	list[0]["y"] = "a";
 	list[1]["x"] = "2";
@@ -150,21 +149,21 @@ BOOST_AUTO_TEST_CASE(conditional_plus_list)
 
 BOOST_AUTO_TEST_CASE(string_as_conditional)
 {
-	string templ = "<?+b>+<b><!+b>-</+b>";
+	std::string templ = "<?+b>+<b><!+b>-</+b>";
 	BOOST_CHECK_EQUAL(Whiskers(templ)("b", "abc").render(), "+abc");
 	BOOST_CHECK_EQUAL(Whiskers(templ)("b", "").render(), "-");
 }
 
 BOOST_AUTO_TEST_CASE(string_as_conditional_wrong)
 {
-	string templ = "<?+b>+<b></b>";
+	std::string templ = "<?+b>+<b></b>";
 	BOOST_CHECK_EQUAL(Whiskers(templ)("b", "abc").render(), "<?+b>+abc</b>");
 }
 
 BOOST_AUTO_TEST_CASE(complicated_replacement)
 {
-	string templ = "a <b> x <complicated> \n <nested>>.";
-	string result = Whiskers(templ)
+	std::string templ = "a <b> x <complicated> \n <nested>>.";
+	std::string result = Whiskers(templ)
 		("b", "BE")
 		("complicated", "CO<M>PL")
 		("nested", "NEST")
@@ -174,53 +173,53 @@ BOOST_AUTO_TEST_CASE(complicated_replacement)
 
 BOOST_AUTO_TEST_CASE(non_existing_list)
 {
-	string templ = "a <#b></b>";
+	std::string templ = "a <#b></b>";
 	Whiskers m(templ);
 	BOOST_CHECK_THROW(m.render(), WhiskersError);
 }
 
 BOOST_AUTO_TEST_CASE(empty_list)
 {
-	string templ = "a <#b></b>x";
-	string result = Whiskers(templ)("b", vector<Whiskers::StringMap>{}).render();
+	std::string templ = "a <#b></b>x";
+	std::string result = Whiskers(templ)("b", std::vector<Whiskers::StringMap>{}).render();
 	BOOST_CHECK_EQUAL(result, "a x");
 }
 
 BOOST_AUTO_TEST_CASE(list)
 {
-	string templ = "a<#b>( <g> - <h> )</b>x";
-	vector<map<string, string>> list(2);
+	std::string templ = "a<#b>( <g> - <h> )</b>x";
+	std::vector<std::map<std::string, std::string>> list(2);
 	list[0]["g"] = "GE";
 	list[0]["h"] = "H";
 	list[1]["g"] = "2GE";
 	list[1]["h"] = "2H";
-	string result = Whiskers(templ)("b", list).render();
+	std::string result = Whiskers(templ)("b", list).render();
 	BOOST_CHECK_EQUAL(result, "a( GE - H )( 2GE - 2H )x");
 }
 
 BOOST_AUTO_TEST_CASE(recursive_list)
 {
 	// Check that templates resulting from lists are not expanded again
-	string templ = "a<#b> 1<g>3 </b><x>";
-	vector<map<string, string>> list(1);
+	std::string templ = "a<#b> 1<g>3 </b><x>";
+	std::vector<std::map<std::string, std::string>> list(1);
 	list[0]["g"] = "<x>";
-	string result = Whiskers(templ)("x", "X")("b", list).render();
+	std::string result = Whiskers(templ)("x", "X")("b", list).render();
 	BOOST_CHECK_EQUAL(result, "a 1<x>3 X");
 }
 
 BOOST_AUTO_TEST_CASE(list_can_access_upper)
 {
-	string templ = "<#b>(<a>)</b>";
-	vector<map<string, string>> list(2);
+	std::string templ = "<#b>(<a>)</b>";
+	std::vector<std::map<std::string, std::string>> list(2);
 	Whiskers m(templ);
-	string result = m("a", "A")("b", list).render();
+	std::string result = m("a", "A")("b", list).render();
 	BOOST_CHECK_EQUAL(result, "(A)(A)");
 }
 
 BOOST_AUTO_TEST_CASE(parameter_collision)
 {
-	string templ = "a <#b></b>";
-	vector<map<string, string>> list(1);
+	std::string templ = "a <#b></b>";
+	std::vector<std::map<std::string, std::string>> list(1);
 	list[0]["a"] = "x";
 	Whiskers m(templ);
 	BOOST_CHECK_THROW(m("a", "X")("b", list), WhiskersError);
@@ -229,14 +228,14 @@ BOOST_AUTO_TEST_CASE(parameter_collision)
 
 BOOST_AUTO_TEST_CASE(invalid_param)
 {
-	string templ = "a <b >";
+	std::string templ = "a <b >";
 	Whiskers m(templ);
 	BOOST_CHECK_THROW(m("b ", "X"), WhiskersError);
 }
 
 BOOST_AUTO_TEST_CASE(invalid_param_rendered)
 {
-	string templ = "a <b >";
+	std::string templ = "a <b >";
 	Whiskers m(templ);
 	BOOST_CHECK_EQUAL(m.render(), templ);
 }

From 76e0d8135426be4694fd0ecf70aa47fa26c2ad6d Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 4 Sep 2023 12:22:18 +0200
Subject: [PATCH 1587/1748] Fix failing OZ test

---
 test/externalTests/zeppelin.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index f0570bf468..54d7533475 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -85,7 +85,7 @@ function zeppelin_test
     sed -i "s|it(\('guards transfer against invalid user'\)|it.skip(\1|g" test/access/Ownable2Step.test.js
     sed -i "s|it(\('reverting initialization function'\)|it.skip(\1|g" test/proxy/beacon/BeaconProxy.test.js
     sed -i "s|describe(\('reverting initialization'\)|describe.skip(\1|g" test/proxy/Proxy.behaviour.js
-    sed -i "s|it(\('does not allow remote callback'\)|it.skip(\1|g" test/security/ReentrancyGuard.test.js
+    sed -i "s|it(\('does not allow remote callback'\)|it.skip(\1|g" test/utils/ReentrancyGuard.test.js
 
     # TODO: Remove when hardhat properly handle reverts of custom errors with via-ir enabled
     # and/or open-zeppelin fix https://github.com/OpenZeppelin/openzeppelin-contracts/issues/4349

From fdc6699159acac61333a43f8cb68b092509ec7e3 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 4 Aug 2023 17:31:39 +0200
Subject: [PATCH 1588/1748] Rematerialize zero literals with default cleanup
 sequence

Add unused pruner step to the end of the default cleanup sequence
---
 Changelog.md                                  |   1 +
 docs/internals/optimizer.rst                  |   2 +-
 libsolidity/interface/OptimiserSettings.h     |   2 +-
 test/cmdlineTests/name_simplifier/output      |   6 +-
 .../cmdlineTests/optimizer_array_sload/output |   6 +-
 .../output.json                               | 156 ++++----
 .../output.json                               |  16 +-
 .../output.json                               |   5 -
 .../strict_asm_optimizer_steps/output         |   1 -
 .../viair_subobject_optimization/output       |  76 ++--
 .../output                                    | 347 ------------------
 .../yul_optimizer_steps_short_sequence/output |   3 +-
 test/libsolidity/gasTests/abiv2_optimised.sol |   4 +-
 .../abi_encode_calldata_slice.sol             |   6 +-
 .../struct/struct_storage_ptr.sol             |   2 +-
 .../abi_encode_calldata_slice.sol             |   6 +-
 ...2_in_function_inherited_in_v1_contract.sol |   4 +-
 .../abiEncoderV2/calldata_array.sol           |   2 +-
 .../abiEncoderV2/storage_array_encoding.sol   |   2 +-
 .../abi_decode_simple_storage.sol             |   2 +-
 .../array/array_memory_index_access.sol       |   2 +-
 .../array/array_storage_index_zeroed_test.sol |   8 +-
 .../arrays_complex_from_and_to_storage.sol    |   2 +-
 .../array/bytes_length_member.sol             |   4 +-
 .../copying/array_copy_calldata_storage.sol   |   2 +-
 .../copying/array_copy_cleanup_uint40.sol     |   2 +-
 .../copying/array_copy_different_packing.sol  |   2 +-
 .../array/copying/array_copy_nested_array.sol |   2 +-
 ...ay_copy_storage_storage_different_base.sol |   2 +-
 ..._storage_storage_different_base_nested.sol |   2 +-
 ...ay_copy_storage_storage_static_dynamic.sol |   2 +-
 .../copying/array_copy_target_leftover.sol    |   2 +-
 .../copying/array_copy_target_simple.sol      |   2 +-
 .../copying/array_copy_target_simple_2.sol    |   2 +-
 .../array_nested_calldata_to_storage.sol      |   2 +-
 .../array_nested_memory_to_storage.sol        |   2 +-
 .../array_of_struct_calldata_to_storage.sol   |   2 +-
 .../array_of_struct_memory_to_storage.sol     |   2 +-
 ...ts_containing_arrays_memory_to_storage.sol |   2 +-
 .../array/copying/bytes_inside_mappings.sol   |   4 +-
 .../copying/bytes_storage_to_storage.sol      |  18 +-
 .../calldata_array_dynamic_to_storage.sol     |   2 +-
 .../copying/calldata_array_to_mapping.sol     |   2 +-
 .../copy_byte_array_in_struct_to_storage.sol  |   4 +-
 .../copy_function_internal_storage_array.sol  |   2 +-
 .../array/copying/copy_removes_bytes_data.sol |   4 +-
 .../copying/copying_bytes_multiassign.sol     |   2 +-
 ...d_array_of_structs_calldata_to_storage.sol |   6 +-
 ...ted_array_of_structs_memory_to_storage.sol |   6 +-
 .../function_type_array_to_storage.sol        |   4 +-
 .../memory_dyn_2d_bytes_to_storage.sol        |   2 +-
 ...ested_array_element_storage_to_storage.sol |   2 +-
 ...d_array_of_structs_calldata_to_storage.sol |   6 +-
 ...ted_array_of_structs_memory_to_storage.sol |   6 +-
 ...amic_array_element_calldata_to_storage.sol |   2 +-
 .../array/copying/storage_memory_nested.sol   |   2 +-
 .../copying/storage_memory_nested_bytes.sol   |   2 +-
 .../storage_memory_nested_from_pointer.sol    |   2 +-
 .../copying/storage_memory_packed_dyn.sol     |   2 +-
 .../array/create_memory_array.sol             |   2 +-
 .../array/delete/bytes_delete_element.sol     |   2 +-
 .../array/fixed_arrays_as_return_type.sol     |   2 +-
 .../array/function_array_cross_calls.sol      |   2 +-
 ...nvalid_encoding_for_storage_byte_array.sol |   4 +-
 .../array/pop/array_pop_uint16_transition.sol |   2 +-
 .../array/pop/array_pop_uint24_transition.sol |   2 +-
 .../array/pop/byte_array_pop_masking_long.sol |   2 +-
 .../push/array_push_nested_from_calldata.sol  |   2 +-
 .../array/push/array_push_struct.sol          |   2 +-
 .../push/array_push_struct_from_calldata.sol  |   4 +-
 .../array/push/nested_bytes_push.sol          |   2 +-
 .../array/push/push_no_args_bytes.sol         |   2 +-
 .../byte_array_to_storage_cleanup.sol         |   4 +-
 .../copy_from_calldata_removes_bytes_data.sol |   4 +-
 .../constructor/arrays_in_constructors.sol    |   4 +-
 .../bytes_in_constructors_packer.sol          |   4 +-
 .../bytes_in_constructors_unpacker.sol        |   4 +-
 .../constructor_static_array_argument.sol     |   4 +-
 .../events/event_emit_from_other_contract.sol |   2 +-
 .../events/event_indexed_string.sol           |   2 +-
 .../externalContracts/base64.sol              |   6 +-
 .../externalContracts/deposit_contract.sol    |  10 +-
 .../externalContracts/prbmath_signed.sol      |   2 +-
 .../externalContracts/prbmath_unsigned.sol    |   2 +-
 .../externalContracts/strings.sol             |   4 +-
 .../creation_function_call_with_args.sol      |   2 +-
 .../creation_function_call_with_salt.sol      |   2 +-
 .../external_call_to_nonexisting.sol          |   2 +-
 .../functionCall/failed_create.sol            |   2 +-
 .../functionCall/gas_and_value_basic.sol      |   2 +-
 .../gas_and_value_brace_syntax.sol            |   2 +-
 .../immutable/multi_creation.sol              |   2 +-
 .../inheritance/value_for_constructor.sol     |   2 +-
 .../libraries/internal_types_in_library.sol   |   2 +-
 .../using_library_mappings_public.sol         |   2 +-
 .../using_library_mappings_return.sol         |   2 +-
 .../salted_create_with_value.sol              |   2 +-
 .../structs/copy_from_mapping.sol             |   4 +-
 .../copy_substructures_from_mapping.sol       |   2 +-
 .../structs/copy_substructures_to_mapping.sol |  10 +-
 .../semanticTests/structs/copy_to_mapping.sol |  12 +-
 ...truct_containing_bytes_copy_and_delete.sol |   8 +-
 .../userDefinedValueType/calldata.sol         |   2 +-
 .../semanticTests/various/address_code.sol    |   4 +-
 .../semanticTests/various/create_calldata.sol |   4 +-
 .../various/destructuring_assignment.sol      |   2 +-
 .../semanticTests/various/selfdestruct.sol    |   2 +-
 .../semanticTests/various/senders_balance.sol |   2 +-
 .../skip_dynamic_types_for_structs.sol        |   2 +-
 .../semanticTests/various/value_complex.sol   |   2 +-
 .../semanticTests/various/value_insane.sol    |   2 +-
 .../viaYul/copy_struct_invalid_ir_bug.sol     |   2 +-
 .../sizeLimits/bytecode_too_large.sol         |   2 +-
 .../bytecode_too_large_byzantium.sol          |   2 +-
 .../sizeLimits/combined_too_large_paris.sol   |   6 +-
 .../combined_too_large_shanghai.sol           |   8 +-
 .../initcode_too_large_shanghai.sol           |   2 +-
 .../fullSuite/abi_example1.yul                |   2 +-
 .../fullSuite/devcon_example.yul              |   2 +-
 .../fullSuite/loopInvariantCodeMotion.yul     |   2 +-
 .../fullSuite/name_cleaner_reserved.yul       |   2 +-
 121 files changed, 306 insertions(+), 663 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index eb2f99fd87..cdabe189b2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,6 +6,7 @@ Language Features:
 Compiler Features:
  * Parser: Remove the experimental error recovery mode (``--error-recovery`` / ``settings.parserErrorRecovery``).
  * Yul Optimizer: If ``PUSH0`` is supported, favor zero literals over storing zero values in variables.
+ * Yul Optimizer: Run the ``Rematerializer`` and ``UnusedPruner`` steps at the end of the default clean-up sequence.
 
 
 Bugfixes:
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index ab37872ffb..b3e144e947 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -338,7 +338,7 @@ You can override this sequence and supply your own using the ``--yul-optimizatio
 
 .. code-block:: bash
 
-    solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul:fDnTOc'
+    solc --optimize --ir-optimized --yul-optimizations 'dhfoD[xarrscLMcCTU]uljmul:fDnTOcmu'
 
 The order of steps is significant and affects the quality of the output.
 Moreover, applying a step may uncover new optimization opportunities for others that were already applied,
diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h
index 8b0299c47d..9f2197d424 100644
--- a/libsolidity/interface/OptimiserSettings.h
+++ b/libsolidity/interface/OptimiserSettings.h
@@ -59,7 +59,7 @@ struct OptimiserSettings
 		"]"
 		"jmul[jul] VcTOcul jmul";      // Make source short and pretty
 
-	static char constexpr DefaultYulOptimiserCleanupSteps[] = "fDnTOc";
+	static char constexpr DefaultYulOptimiserCleanupSteps[] = "fDnTOcmu";
 
 	/// No optimisations at all - not recommended.
 	static OptimiserSettings none()
diff --git a/test/cmdlineTests/name_simplifier/output b/test/cmdlineTests/name_simplifier/output
index 936378bd33..ed4c6e5c02 100644
--- a/test/cmdlineTests/name_simplifier/output
+++ b/test/cmdlineTests/name_simplifier/output
@@ -101,7 +101,7 @@ object "C_59" {
                         mstore(add(memPtr_1, _3), "longstringlongstringlongstringlo")
                         mstore(add(memPtr_1, _9), "ngstringlongstringlongstringlong")
                         let _11 := 96
-                        mstore(add(memPtr_1, _11), "stringlongstringlongstringlongst")
+                        mstore(add(memPtr_1, 96), "stringlongstringlongstringlongst")
                         mstore(add(memPtr_1, 128), "ring")
                         let memPos := mload(_9)
                         mstore(memPos, _10)
@@ -113,8 +113,8 @@ object "C_59" {
                         {
                             mstore(add(add(memPos, i), _11), mload(add(add(memPtr_1, i), _3)))
                         }
-                        mstore(add(add(memPos, length), _11), 0)
-                        return(memPos, add(sub(add(memPos, and(add(length, 31), _8)), memPos), _11))
+                        mstore(add(add(memPos, length), 96), 0)
+                        return(memPos, add(sub(add(memPos, and(add(length, 31), _8)), memPos), 96))
                     }
                 }
                 revert(0, 0)
diff --git a/test/cmdlineTests/optimizer_array_sload/output b/test/cmdlineTests/optimizer_array_sload/output
index f2f95f15d1..2698a60cf0 100644
--- a/test/cmdlineTests/optimizer_array_sload/output
+++ b/test/cmdlineTests/optimizer_array_sload/output
@@ -19,7 +19,7 @@ object "Arraysum_34" {
                 /// @src 0:80:429  "contract Arraysum {..."
                 mstore(64, memoryguard(0x80))
                 let _1 := 4
-                if iszero(lt(calldatasize(), _1))
+                if iszero(lt(calldatasize(), 4))
                 {
                     if eq(0x81d73423, shr(224, calldataload(0)))
                     {
@@ -27,8 +27,8 @@ object "Arraysum_34" {
                         if slt(add(calldatasize(), not(3)), 0) { revert(0, 0) }
                         let var_sum := 0
                         /// @src 0:368:378  "uint i = 0"
-                        let var_i := /** @src 0:80:429  "contract Arraysum {..." */ var_sum
-                        let _2 := sload(var_sum)
+                        let var_i := /** @src 0:80:429  "contract Arraysum {..." */ 0
+                        let _2 := sload(0)
                         /// @src 0:364:423  "for(uint i = 0; i < values.length; i++)..."
                         for { }
                         /** @src 0:380:397  "i < values.length" */ lt(var_i, _2)
diff --git a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
index 339df2093e..143ad92c30 100644
--- a/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_evm_asm_via_ir_location/output.json
@@ -112,8 +112,8 @@ sub_0: assembly {
       dup1
       revert
     tag_8:
-      jumpi(tag_12, callvalue)
-      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
+      jumpi(tag_26, callvalue)
+      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
       sload(0x00)
       sub(shl(0xff, 0x01), 0x01)
       dup2
@@ -122,36 +122,39 @@ sub_0: assembly {
       jumpi
       0x01
       add
-      swap1
-      dup2
       0x00
+      dup2
+      swap1
       sstore
-      dup1
+      dup2
       mload
       shl(0xe4, 0x026121ff)
         /* \"C\":403:411  this.f() */
       dup2
       mstore
+        /* \"C\":79:428  contract C... */
+      swap2
+      swap1
+        /* \"C\":403:411  this.f() */
       0x20
-        /* \"C\":403:407  this */
-      dup2
         /* \"C\":79:428  contract C... */
+      dup4
       0x04
-        /* \"C\":403:407  this */
       dup2
+        /* \"C\":403:407  this */
       address
         /* \"C\":403:411  this.f() */
       gas
       staticcall
-      swap1
-      dup2
+      swap3
+      dup4
       iszero
       tag_16
       jumpi
         /* \"C\":79:428  contract C... */
       0x00
         /* \"C\":403:411  this.f() */
-      swap2
+      swap4
       tag_18
       jumpi
         /* \"C\":79:428  contract C... */
@@ -159,14 +162,14 @@ sub_0: assembly {
         /* \"C\":392:411  stateVar + this.f() */
       pop
       tag_20
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_21
-        /* \"C\":392:411  stateVar + this.f() */
-      swap2
         /* \"C\":403:411  this.f() */
       0x20
         /* \"C\":392:411  stateVar + this.f() */
-      swap5
+      swap4
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      tag_21
+        /* \"C\":392:411  stateVar + this.f() */
+      swap3
       tag_1
       jump\t// in
     tag_20:
@@ -186,13 +189,10 @@ sub_0: assembly {
       return
         /* \"C\":403:411  this.f() */
     tag_18:
-      swap1
+      swap3
+      pop
       0x20
-      returndatasize
-      dup2
-      gt
-      tag_22
-      jumpi
+      jumpi(tag_22, gt(0x20, returndatasize))
     tag_23:
         /* \"C\":79:428  contract C... */
       0x1f
@@ -200,12 +200,12 @@ sub_0: assembly {
       add
       not(0x1f)
       and
-      dup4
+      dup5
       add
       0xffffffffffffffff
       dup2
       gt
-      dup5
+      dup6
       dup3
       lt
       or
@@ -215,9 +215,9 @@ sub_0: assembly {
       0x20
         /* \"C\":79:428  contract C... */
       swap2
-      dup5
+      dup6
       swap2
-      dup7
+      dup6
       mstore
         /* \"C\":403:411  this.f() */
       dup2
@@ -227,26 +227,26 @@ sub_0: assembly {
       slt
       tag_26
       jumpi
-      pop
+      swap2
       mload
+      swap2
         /* \"C\":392:411  stateVar + this.f() */
       tag_20
         /* \"C\":403:411  this.f() */
       jump(tag_19)
         /* \"C\":79:428  contract C... */
     tag_26:
+      0x00
       dup1
       revert
     tag_24:
+        /* \"C\":117:119  41 */
       shl(0xe0, 0x4e487b71)
-      dup4
+        /* \"C\":79:428  contract C... */
+      0x00
       mstore
       mstore(0x04, 0x41)
-      0x24
-        /* \"C\":117:119  41 */
-      dup4
-        /* \"C\":79:428  contract C... */
-      revert
+      revert(0x00, 0x24)
         /* \"C\":403:411  this.f() */
     tag_22:
       pop
@@ -281,14 +281,10 @@ sub_0: assembly {
         /* \"C\":117:119  41 */
       revert
         /* \"C\":79:428  contract C... */
-    tag_12:
-      0x00
-      dup1
-      revert
     tag_6:
       pop
-      jumpi(tag_12, callvalue)
-      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
+      jumpi(tag_26, callvalue)
+      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
       0x20
       swap1
       sload(0x00)
@@ -299,8 +295,8 @@ sub_0: assembly {
       mstore
       return
     tag_4:
-      jumpi(tag_12, callvalue)
-      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
+      jumpi(tag_26, callvalue)
+      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
         /* \"C\":290:298  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":117:119  41 */
@@ -481,8 +477,8 @@ sub_0: assembly {
       dup1
       revert
     tag_8:
-      jumpi(tag_12, callvalue)
-      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
+      jumpi(tag_26, callvalue)
+      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
       sload(0x00)
       sub(shl(0xff, 0x01), 0x01)
       dup2
@@ -491,36 +487,39 @@ sub_0: assembly {
       jumpi
       0x01
       add
-      swap1
-      dup2
       0x00
+      dup2
+      swap1
       sstore
-      dup1
+      dup2
       mload
       shl(0xe4, 0x026121ff)
         /* \"C\":403:411  this.f() */
       dup2
       mstore
+        /* \"D\":91:166  contract D is C(3)... */
+      swap2
+      swap1
+        /* \"C\":403:411  this.f() */
       0x20
-        /* \"C\":403:407  this */
-      dup2
         /* \"D\":91:166  contract D is C(3)... */
+      dup4
       0x04
-        /* \"C\":403:407  this */
       dup2
+        /* \"C\":403:407  this */
       address
         /* \"C\":403:411  this.f() */
       gas
       staticcall
-      swap1
-      dup2
+      swap3
+      dup4
       iszero
       tag_16
       jumpi
         /* \"D\":91:166  contract D is C(3)... */
       0x00
         /* \"C\":403:411  this.f() */
-      swap2
+      swap4
       tag_18
       jumpi
         /* \"D\":91:166  contract D is C(3)... */
@@ -528,14 +527,14 @@ sub_0: assembly {
         /* \"C\":392:411  stateVar + this.f() */
       pop
       tag_20
-        /* \"C\":392:422  stateVar + this.f() + immutVar */
-      tag_21
-        /* \"C\":392:411  stateVar + this.f() */
-      swap2
         /* \"C\":403:411  this.f() */
       0x20
         /* \"C\":392:411  stateVar + this.f() */
-      swap5
+      swap4
+        /* \"C\":392:422  stateVar + this.f() + immutVar */
+      tag_21
+        /* \"C\":392:411  stateVar + this.f() */
+      swap3
       tag_1
       jump\t// in
     tag_20:
@@ -555,13 +554,10 @@ sub_0: assembly {
       return
         /* \"C\":403:411  this.f() */
     tag_18:
-      swap1
+      swap3
+      pop
       0x20
-      returndatasize
-      dup2
-      gt
-      tag_22
-      jumpi
+      jumpi(tag_22, gt(0x20, returndatasize))
     tag_23:
         /* \"D\":91:166  contract D is C(3)... */
       0x1f
@@ -569,12 +565,12 @@ sub_0: assembly {
       add
       not(0x1f)
       and
-      dup4
+      dup5
       add
       0xffffffffffffffff
       dup2
       gt
-      dup5
+      dup6
       dup3
       lt
       or
@@ -584,9 +580,9 @@ sub_0: assembly {
       0x20
         /* \"D\":91:166  contract D is C(3)... */
       swap2
-      dup5
+      dup6
       swap2
-      dup7
+      dup6
       mstore
         /* \"C\":403:411  this.f() */
       dup2
@@ -596,26 +592,26 @@ sub_0: assembly {
       slt
       tag_26
       jumpi
-      pop
+      swap2
       mload
+      swap2
         /* \"C\":392:411  stateVar + this.f() */
       tag_20
         /* \"C\":403:411  this.f() */
       jump(tag_19)
         /* \"D\":91:166  contract D is C(3)... */
     tag_26:
+      0x00
       dup1
       revert
     tag_24:
+        /* \"C\":117:119  41 */
       shl(0xe0, 0x4e487b71)
-      dup4
+        /* \"D\":91:166  contract D is C(3)... */
+      0x00
       mstore
       mstore(0x04, 0x41)
-      0x24
-        /* \"C\":117:119  41 */
-      dup4
-        /* \"D\":91:166  contract D is C(3)... */
-      revert
+      revert(0x00, 0x24)
         /* \"C\":403:411  this.f() */
     tag_22:
       pop
@@ -650,14 +646,10 @@ sub_0: assembly {
         /* \"C\":117:119  41 */
       revert
         /* \"D\":91:166  contract D is C(3)... */
-    tag_12:
-      0x00
-      dup1
-      revert
     tag_6:
       pop
-      jumpi(tag_12, callvalue)
-      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
+      jumpi(tag_26, callvalue)
+      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
       0x20
       swap1
       sload(0x00)
@@ -668,8 +660,8 @@ sub_0: assembly {
       mstore
       return
     tag_4:
-      jumpi(tag_12, callvalue)
-      jumpi(tag_12, slt(add(not(0x03), calldatasize), 0x00))
+      jumpi(tag_26, callvalue)
+      jumpi(tag_26, slt(add(not(0x03), calldatasize), 0x00))
         /* \"C\":290:298  immutVar */
       immutable(\"0xe4b1702d9298fee62dfeccc57d322a463ad55ca201256d01f62b45b2e1c21c10\")
         /* \"C\":117:119  41 */
diff --git a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
index c563f88052..2671162722 100644
--- a/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
+++ b/test/cmdlineTests/standard_debug_info_in_yul_location/output.json
@@ -714,19 +714,19 @@ object \"C_54\" {
                         if _7
                         {
                             let _8 := 32
-                            if gt(_8, returndatasize()) { _8 := returndatasize() }
+                            if gt(32, returndatasize()) { _8 := returndatasize() }
                             /// @src 0:79:435  \"contract C...\"
                             let newFreePtr := add(_6, and(add(_8, 31), not(31)))
                             if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _6))
                             {
-                                mstore(expr, shl(224, 0x4e487b71))
+                                mstore(0, shl(224, 0x4e487b71))
                                 mstore(4, 0x41)
-                                revert(expr, 0x24)
+                                revert(0, 0x24)
                             }
                             mstore(_2, newFreePtr)
                             if slt(sub(/** @src 0:410:418  \"this.f()\" */ add(_6, _8), /** @src 0:79:435  \"contract C...\" */ _6), /** @src 0:410:418  \"this.f()\" */ 32)
                             /// @src 0:79:435  \"contract C...\"
-                            { revert(expr, expr) }
+                            { revert(0, 0) }
                             /// @src 0:410:418  \"this.f()\"
                             expr := /** @src 0:79:435  \"contract C...\" */ mload(_6)
                         }
@@ -1559,19 +1559,19 @@ object \"D_72\" {
                         if _7
                         {
                             let _8 := 32
-                            if gt(_8, returndatasize()) { _8 := returndatasize() }
+                            if gt(32, returndatasize()) { _8 := returndatasize() }
                             /// @src 1:91:166  \"contract D is C(3)...\"
                             let newFreePtr := add(_6, and(add(_8, 31), not(31)))
                             if or(gt(newFreePtr, 0xffffffffffffffff), lt(newFreePtr, _6))
                             {
-                                mstore(expr, shl(224, 0x4e487b71))
+                                mstore(0, shl(224, 0x4e487b71))
                                 mstore(4, 0x41)
-                                revert(expr, 0x24)
+                                revert(0, 0x24)
                             }
                             mstore(_2, newFreePtr)
                             if slt(sub(/** @src 0:410:418  \"this.f()\" */ add(_6, _8), /** @src 1:91:166  \"contract D is C(3)...\" */ _6), /** @src 0:410:418  \"this.f()\" */ 32)
                             /// @src 1:91:166  \"contract D is C(3)...\"
-                            { revert(expr, expr) }
+                            { revert(0, 0) }
                             /// @src 0:410:418  \"this.f()\"
                             expr := /** @src 1:91:166  \"contract D is C(3)...\" */ mload(_6)
                         }
diff --git a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
index c381936ef6..8d58cf3204 100644
--- a/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
+++ b/test/cmdlineTests/standard_yul_stack_opt_disabled/output.json
@@ -9,21 +9,16 @@
                 {
                     "assembly": "    /* \"A\":16:17   */
   0x01
-  dup1
     /* \"A\":27:28   */
   0x00
     /* \"A\":20:32   */
   sstore
     /* \"A\":50:51   */
   0x02
-  dup1
     /* \"A\":61:63   */
   0x20
     /* \"A\":54:67   */
   sstore
-    /* \"A\":0:72   */
-  pop
-  pop
 "
                 }
             }
diff --git a/test/cmdlineTests/strict_asm_optimizer_steps/output b/test/cmdlineTests/strict_asm_optimizer_steps/output
index 8fb291b868..c10fb02fb9 100644
--- a/test/cmdlineTests/strict_asm_optimizer_steps/output
+++ b/test/cmdlineTests/strict_asm_optimizer_steps/output
@@ -15,7 +15,6 @@ object "C_6" {
         code {
             {
                 mstore(64, 128)
-                pop(iszero(lt(calldatasize(), 4)))
                 sstore(0, iszero(calldatasize()))
                 revert(0, 0)
             }
diff --git a/test/cmdlineTests/viair_subobject_optimization/output b/test/cmdlineTests/viair_subobject_optimization/output
index c9fefe0518..4804d13843 100644
--- a/test/cmdlineTests/viair_subobject_optimization/output
+++ b/test/cmdlineTests/viair_subobject_optimization/output
@@ -117,24 +117,23 @@ sub_0: assembly {
     tag_3:
       jumpi(tag_7, callvalue)
       jumpi(tag_7, slt(add(not(0x03), calldatasize), 0x00))
+      not(0x1f)
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
       dataSize(sub_0)
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      swap1
-      not(0x1f)
-      dup1
       0x3f
-      dup5
+      dup2
       add
-      and
       dup3
+      and
+      dup4
       add
-      swap2
-      dup1
+      swap1
       dup4
+      dup3
       lt
       0xffffffffffffffff
-      dup5
+      dup4
       gt
       or
       tag_9
@@ -142,55 +141,60 @@ sub_0: assembly {
       swap3
       swap1
       0x40
-      swap3
-      dup4
+      swap1
+      0x40
       mstore
         /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
-      dup2
-      dup5
+      dup4
+      dup3
       mstore
       0x20
-      swap2
+      swap4
       dataOffset(sub_0)
-      dup4
-      dup7
+      0x20
+      dup5
       add
       codecopy
         /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
-      dup3
-      mload
-      swap4
-      dup3
-      dup6
+      mload(0x40)
       swap4
       dup5
+      swap3
+        /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
+      0x20
+        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
+      dup5
       mstore
-      dup2
+      dup1
       mload
-      swap2
-      dup3
-      dup3
+      swap3
+      dup4
+        /* "viair_subobject_optimization/input.sol":745:765  type(C).creationCode */
+      0x20
+        /* "viair_subobject_optimization/input.sol":669:772  contract D {... */
       dup7
       add
       mstore
       0x00
     tag_11:
-      dup4
+      dup5
       dup2
       lt
       tag_12
       jumpi
-      pop
-      pop
+      dup6
+      0x40
+      dup2
+      dup10
+      0x1f
+      dup10
       0x00
-      dup5
-      dup4
-      add
+      dup6
+      dup3
       dup7
       add
+      add
       mstore
-      pop
-      0x1f
       add
       and
       dup2
@@ -200,22 +204,22 @@ sub_0: assembly {
       swap1
       return
     tag_12:
-      dup2
+      dup3
       dup2
       add
-      dup4
+      dup5
       add
       mload
       dup9
       dup3
       add
-      dup9
+      dup4
       add
       mstore
       dup8
       swap6
       pop
-      dup3
+      dup4
       add
       jump(tag_11)
     tag_9:
diff --git a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
index 1e19c3a5c8..9687abf643 100644
--- a/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
+++ b/test/cmdlineTests/yul_optimizer_steps_nested_brackets/output
@@ -9,7 +9,6 @@ object "C_6" {
             {
                 revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
             }
-            constructor_C()
             let _1 := allocate_unbounded()
             codecopy(_1, dataoffset("C_6_deployed"), datasize("C_6_deployed"))
             return(_1, datasize("C_6_deployed"))
@@ -17,97 +16,10 @@ object "C_6" {
         function allocate_unbounded() -> memPtr
         {
             let memPtr_1 := mload(64)
-            let memPtr_2 := memPtr_1
-            let memPtr_3 := memPtr_1
-            let memPtr_4 := memPtr_1
-            let memPtr_5 := memPtr_1
-            let memPtr_6 := memPtr_1
-            let memPtr_7 := memPtr_1
-            let memPtr_8 := memPtr_1
-            let memPtr_9 := memPtr_1
-            let memPtr_10 := memPtr_1
-            let memPtr_11 := memPtr_1
-            let memPtr_12 := memPtr_1
-            let memPtr_13 := memPtr_1
-            let memPtr_14 := memPtr_1
-            let memPtr_15 := memPtr_1
-            let memPtr_16 := memPtr_1
-            let memPtr_17 := memPtr_1
-            let memPtr_18 := memPtr_1
-            let memPtr_19 := memPtr_1
-            let memPtr_20 := memPtr_1
-            let memPtr_21 := memPtr_1
-            let memPtr_22 := memPtr_1
-            let memPtr_23 := memPtr_1
-            let memPtr_24 := memPtr_1
-            let memPtr_25 := memPtr_1
-            let memPtr_26 := memPtr_1
-            let memPtr_27 := memPtr_1
-            let memPtr_28 := memPtr_1
-            let memPtr_29 := memPtr_1
-            let memPtr_30 := memPtr_1
-            let memPtr_31 := memPtr_1
-            let memPtr_32 := memPtr_1
-            let memPtr_33 := memPtr_1
-            let memPtr_34 := memPtr_1
-            let memPtr_35 := memPtr_1
-            let memPtr_36 := memPtr_1
-            let memPtr_37 := memPtr_1
-            let memPtr_38 := memPtr_1
-            let memPtr_39 := memPtr_1
-            let memPtr_40 := memPtr_1
-            let memPtr_41 := memPtr_1
-            let memPtr_42 := memPtr_1
-            let memPtr_43 := memPtr_1
-            let memPtr_44 := memPtr_1
-            let memPtr_45 := memPtr_1
-            let memPtr_46 := memPtr_1
-            let memPtr_47 := memPtr_1
-            let memPtr_48 := memPtr_1
-            let memPtr_49 := memPtr_1
-            let memPtr_50 := memPtr_1
-            let memPtr_51 := memPtr_1
-            let memPtr_52 := memPtr_1
-            let memPtr_53 := memPtr_1
-            let memPtr_54 := memPtr_1
-            let memPtr_55 := memPtr_1
-            let memPtr_56 := memPtr_1
-            let memPtr_57 := memPtr_1
-            let memPtr_58 := memPtr_1
-            let memPtr_59 := memPtr_1
-            let memPtr_60 := memPtr_1
-            let memPtr_61 := memPtr_1
-            let memPtr_62 := memPtr_1
-            let memPtr_63 := memPtr_1
-            let memPtr_64 := memPtr_1
-            let memPtr_65 := memPtr_1
-            let memPtr_66 := memPtr_1
-            let memPtr_67 := memPtr_1
-            let memPtr_68 := memPtr_1
-            let memPtr_69 := memPtr_1
-            let memPtr_70 := memPtr_1
-            let memPtr_71 := memPtr_1
-            let memPtr_72 := memPtr_1
-            let memPtr_73 := memPtr_1
-            let memPtr_74 := memPtr_1
-            let memPtr_75 := memPtr_1
-            let memPtr_76 := memPtr_1
-            let memPtr_77 := memPtr_1
-            let memPtr_78 := memPtr_1
-            let memPtr_79 := memPtr_1
-            let memPtr_80 := memPtr_1
-            let memPtr_81 := memPtr_1
-            let memPtr_82 := memPtr_1
-            let memPtr_83 := memPtr_1
-            let memPtr_84 := memPtr_1
-            let memPtr_85 := memPtr_1
-            let memPtr_86 := memPtr_1
             memPtr := memPtr_1
         }
         function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
         { revert(0, 0) }
-        function constructor_C()
-        { }
     }
     /// @use-src 0:"yul_optimizer_steps_nested_brackets/input.sol"
     object "C_6_deployed" {
@@ -125,181 +37,11 @@ object "C_6" {
             function shift_right_unsigned(value) -> newValue
             {
                 let newValue_1 := shr(224, value)
-                let newValue_2 := newValue_1
-                let newValue_3 := newValue_1
-                let newValue_4 := newValue_1
-                let newValue_5 := newValue_1
-                let newValue_6 := newValue_1
-                let newValue_7 := newValue_1
-                let newValue_8 := newValue_1
-                let newValue_9 := newValue_1
-                let newValue_10 := newValue_1
-                let newValue_11 := newValue_1
-                let newValue_12 := newValue_1
-                let newValue_13 := newValue_1
-                let newValue_14 := newValue_1
-                let newValue_15 := newValue_1
-                let newValue_16 := newValue_1
-                let newValue_17 := newValue_1
-                let newValue_18 := newValue_1
-                let newValue_19 := newValue_1
-                let newValue_20 := newValue_1
-                let newValue_21 := newValue_1
-                let newValue_22 := newValue_1
-                let newValue_23 := newValue_1
-                let newValue_24 := newValue_1
-                let newValue_25 := newValue_1
-                let newValue_26 := newValue_1
-                let newValue_27 := newValue_1
-                let newValue_28 := newValue_1
-                let newValue_29 := newValue_1
-                let newValue_30 := newValue_1
-                let newValue_31 := newValue_1
-                let newValue_32 := newValue_1
-                let newValue_33 := newValue_1
-                let newValue_34 := newValue_1
-                let newValue_35 := newValue_1
-                let newValue_36 := newValue_1
-                let newValue_37 := newValue_1
-                let newValue_38 := newValue_1
-                let newValue_39 := newValue_1
-                let newValue_40 := newValue_1
-                let newValue_41 := newValue_1
-                let newValue_42 := newValue_1
-                let newValue_43 := newValue_1
-                let newValue_44 := newValue_1
-                let newValue_45 := newValue_1
-                let newValue_46 := newValue_1
-                let newValue_47 := newValue_1
-                let newValue_48 := newValue_1
-                let newValue_49 := newValue_1
-                let newValue_50 := newValue_1
-                let newValue_51 := newValue_1
-                let newValue_52 := newValue_1
-                let newValue_53 := newValue_1
-                let newValue_54 := newValue_1
-                let newValue_55 := newValue_1
-                let newValue_56 := newValue_1
-                let newValue_57 := newValue_1
-                let newValue_58 := newValue_1
-                let newValue_59 := newValue_1
-                let newValue_60 := newValue_1
-                let newValue_61 := newValue_1
-                let newValue_62 := newValue_1
-                let newValue_63 := newValue_1
-                let newValue_64 := newValue_1
-                let newValue_65 := newValue_1
-                let newValue_66 := newValue_1
-                let newValue_67 := newValue_1
-                let newValue_68 := newValue_1
-                let newValue_69 := newValue_1
-                let newValue_70 := newValue_1
-                let newValue_71 := newValue_1
-                let newValue_72 := newValue_1
-                let newValue_73 := newValue_1
-                let newValue_74 := newValue_1
-                let newValue_75 := newValue_1
-                let newValue_76 := newValue_1
-                let newValue_77 := newValue_1
-                let newValue_78 := newValue_1
-                let newValue_79 := newValue_1
-                let newValue_80 := newValue_1
-                let newValue_81 := newValue_1
-                let newValue_82 := newValue_1
-                let newValue_83 := newValue_1
-                let newValue_84 := newValue_1
-                let newValue_85 := newValue_1
-                let newValue_86 := newValue_1
                 newValue := newValue_1
             }
             function allocate_unbounded() -> memPtr
             {
                 let memPtr_1 := mload(64)
-                let memPtr_2 := memPtr_1
-                let memPtr_3 := memPtr_1
-                let memPtr_4 := memPtr_1
-                let memPtr_5 := memPtr_1
-                let memPtr_6 := memPtr_1
-                let memPtr_7 := memPtr_1
-                let memPtr_8 := memPtr_1
-                let memPtr_9 := memPtr_1
-                let memPtr_10 := memPtr_1
-                let memPtr_11 := memPtr_1
-                let memPtr_12 := memPtr_1
-                let memPtr_13 := memPtr_1
-                let memPtr_14 := memPtr_1
-                let memPtr_15 := memPtr_1
-                let memPtr_16 := memPtr_1
-                let memPtr_17 := memPtr_1
-                let memPtr_18 := memPtr_1
-                let memPtr_19 := memPtr_1
-                let memPtr_20 := memPtr_1
-                let memPtr_21 := memPtr_1
-                let memPtr_22 := memPtr_1
-                let memPtr_23 := memPtr_1
-                let memPtr_24 := memPtr_1
-                let memPtr_25 := memPtr_1
-                let memPtr_26 := memPtr_1
-                let memPtr_27 := memPtr_1
-                let memPtr_28 := memPtr_1
-                let memPtr_29 := memPtr_1
-                let memPtr_30 := memPtr_1
-                let memPtr_31 := memPtr_1
-                let memPtr_32 := memPtr_1
-                let memPtr_33 := memPtr_1
-                let memPtr_34 := memPtr_1
-                let memPtr_35 := memPtr_1
-                let memPtr_36 := memPtr_1
-                let memPtr_37 := memPtr_1
-                let memPtr_38 := memPtr_1
-                let memPtr_39 := memPtr_1
-                let memPtr_40 := memPtr_1
-                let memPtr_41 := memPtr_1
-                let memPtr_42 := memPtr_1
-                let memPtr_43 := memPtr_1
-                let memPtr_44 := memPtr_1
-                let memPtr_45 := memPtr_1
-                let memPtr_46 := memPtr_1
-                let memPtr_47 := memPtr_1
-                let memPtr_48 := memPtr_1
-                let memPtr_49 := memPtr_1
-                let memPtr_50 := memPtr_1
-                let memPtr_51 := memPtr_1
-                let memPtr_52 := memPtr_1
-                let memPtr_53 := memPtr_1
-                let memPtr_54 := memPtr_1
-                let memPtr_55 := memPtr_1
-                let memPtr_56 := memPtr_1
-                let memPtr_57 := memPtr_1
-                let memPtr_58 := memPtr_1
-                let memPtr_59 := memPtr_1
-                let memPtr_60 := memPtr_1
-                let memPtr_61 := memPtr_1
-                let memPtr_62 := memPtr_1
-                let memPtr_63 := memPtr_1
-                let memPtr_64 := memPtr_1
-                let memPtr_65 := memPtr_1
-                let memPtr_66 := memPtr_1
-                let memPtr_67 := memPtr_1
-                let memPtr_68 := memPtr_1
-                let memPtr_69 := memPtr_1
-                let memPtr_70 := memPtr_1
-                let memPtr_71 := memPtr_1
-                let memPtr_72 := memPtr_1
-                let memPtr_73 := memPtr_1
-                let memPtr_74 := memPtr_1
-                let memPtr_75 := memPtr_1
-                let memPtr_76 := memPtr_1
-                let memPtr_77 := memPtr_1
-                let memPtr_78 := memPtr_1
-                let memPtr_79 := memPtr_1
-                let memPtr_80 := memPtr_1
-                let memPtr_81 := memPtr_1
-                let memPtr_82 := memPtr_1
-                let memPtr_83 := memPtr_1
-                let memPtr_84 := memPtr_1
-                let memPtr_85 := memPtr_1
-                let memPtr_86 := memPtr_1
                 memPtr := memPtr_1
             }
             function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
@@ -316,91 +58,6 @@ object "C_6" {
             function abi_encode_tuple(headStart) -> tail
             {
                 let tail_1 := add(headStart, 0)
-                let tail_2 := tail_1
-                let tail_3 := tail_1
-                let tail_4 := tail_1
-                let tail_5 := tail_1
-                let tail_6 := tail_1
-                let tail_7 := tail_1
-                let tail_8 := tail_1
-                let tail_9 := tail_1
-                let tail_10 := tail_1
-                let tail_11 := tail_1
-                let tail_12 := tail_1
-                let tail_13 := tail_1
-                let tail_14 := tail_1
-                let tail_15 := tail_1
-                let tail_16 := tail_1
-                let tail_17 := tail_1
-                let tail_18 := tail_1
-                let tail_19 := tail_1
-                let tail_20 := tail_1
-                let tail_21 := tail_1
-                let tail_22 := tail_1
-                let tail_23 := tail_1
-                let tail_24 := tail_1
-                let tail_25 := tail_1
-                let tail_26 := tail_1
-                let tail_27 := tail_1
-                let tail_28 := tail_1
-                let tail_29 := tail_1
-                let tail_30 := tail_1
-                let tail_31 := tail_1
-                let tail_32 := tail_1
-                let tail_33 := tail_1
-                let tail_34 := tail_1
-                let tail_35 := tail_1
-                let tail_36 := tail_1
-                let tail_37 := tail_1
-                let tail_38 := tail_1
-                let tail_39 := tail_1
-                let tail_40 := tail_1
-                let tail_41 := tail_1
-                let tail_42 := tail_1
-                let tail_43 := tail_1
-                let tail_44 := tail_1
-                let tail_45 := tail_1
-                let tail_46 := tail_1
-                let tail_47 := tail_1
-                let tail_48 := tail_1
-                let tail_49 := tail_1
-                let tail_50 := tail_1
-                let tail_51 := tail_1
-                let tail_52 := tail_1
-                let tail_53 := tail_1
-                let tail_54 := tail_1
-                let tail_55 := tail_1
-                let tail_56 := tail_1
-                let tail_57 := tail_1
-                let tail_58 := tail_1
-                let tail_59 := tail_1
-                let tail_60 := tail_1
-                let tail_61 := tail_1
-                let tail_62 := tail_1
-                let tail_63 := tail_1
-                let tail_64 := tail_1
-                let tail_65 := tail_1
-                let tail_66 := tail_1
-                let tail_67 := tail_1
-                let tail_68 := tail_1
-                let tail_69 := tail_1
-                let tail_70 := tail_1
-                let tail_71 := tail_1
-                let tail_72 := tail_1
-                let tail_73 := tail_1
-                let tail_74 := tail_1
-                let tail_75 := tail_1
-                let tail_76 := tail_1
-                let tail_77 := tail_1
-                let tail_78 := tail_1
-                let tail_79 := tail_1
-                let tail_80 := tail_1
-                let tail_81 := tail_1
-                let tail_82 := tail_1
-                let tail_83 := tail_1
-                let tail_84 := tail_1
-                let tail_85 := tail_1
-                let tail_86 := tail_1
                 tail := tail_1
             }
             function external_fun_f()
@@ -410,16 +67,12 @@ object "C_6" {
                     revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
                 }
                 abi_decode(4, calldatasize())
-                fun_f()
                 let memPos := allocate_unbounded()
                 let memEnd := abi_encode_tuple(memPos)
                 return(memPos, sub(memEnd, memPos))
             }
             function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
             { revert(0, 0) }
-            /// @ast-id 5 @src 0:74:101  "function f() public pure {}"
-            function fun_f()
-            { }
         }
         data ".metadata" hex"<BYTECODE REMOVED>"
     }
diff --git a/test/cmdlineTests/yul_optimizer_steps_short_sequence/output b/test/cmdlineTests/yul_optimizer_steps_short_sequence/output
index 0a4a2c5a2a..dc77ce3c53 100644
--- a/test/cmdlineTests/yul_optimizer_steps_short_sequence/output
+++ b/test/cmdlineTests/yul_optimizer_steps_short_sequence/output
@@ -6,8 +6,7 @@ object "C_8" {
             /// @src 0:80:221  "contract C {..."
             mstore(64, memoryguard(0x80))
             /// @src 0:129:213  "assembly (\"memory-safe\") {..."
-            let usr$a := 0
-            revert(usr$a, usr$a)
+            revert(0, 0)
         }
     }
     /// @use-src 0:"yul_optimizer_steps_short_sequence/input.sol"
diff --git a/test/libsolidity/gasTests/abiv2_optimised.sol b/test/libsolidity/gasTests/abiv2_optimised.sol
index 608d1c8ba3..1ab8803d28 100644
--- a/test/libsolidity/gasTests/abiv2_optimised.sol
+++ b/test/libsolidity/gasTests/abiv2_optimised.sol
@@ -17,9 +17,9 @@ contract C {
 // optimize-yul: true
 // ----
 // creation:
-//   codeDepositCost: 638600
+//   codeDepositCost: 639000
 //   executionCost: 668
-//   totalCost: 639268
+//   totalCost: 639668
 // external:
 //   a(): 2283
 //   b(uint256): 4649
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index fe38d8078a..53bc3faba6 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -59,10 +59,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 360827
+// gas irOptimized: 360863
 // gas legacy: 411269
 // gas legacyOptimized: 317754
 // test_uint256() ->
-// gas irOptimized: 509533
+// gas irOptimized: 509677
 // gas legacy: 577469
-// gas legacyOptimized: 440931
+// gas legacyOptimized: 441003
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
index 9edb07a18c..efffab86c1 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/struct/struct_storage_ptr.sol
@@ -24,6 +24,6 @@ contract C {
 // ----
 // library: L
 // f() -> 8, 7, 1, 2, 7, 12
-// gas irOptimized: 166467
+// gas irOptimized: 166475
 // gas legacy: 169283
 // gas legacyOptimized: 167248
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index beb283664e..975e9f4770 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 360827
+// gas irOptimized: 360863
 // gas legacy: 411269
 // gas legacyOptimized: 317754
 // test_uint256() ->
-// gas irOptimized: 509533
+// gas irOptimized: 509677
 // gas legacy: 577469
-// gas legacyOptimized: 440931
+// gas legacyOptimized: 441003
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
index 07e517b2d1..55f7991def 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_v2_in_function_inherited_in_v1_contract.sol
@@ -30,6 +30,6 @@ contract C is B {
 }
 // ----
 // test() -> 77
-// gas irOptimized: 110325
+// gas irOptimized: 110348
 // gas legacy: 151866
-// gas legacyOptimized: 110359
+// gas legacyOptimized: 110373
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index bd8517a959..12920a70a4 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -20,6 +20,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 126849
+// gas irOptimized: 126851
 // gas legacy: 139800
 // gas legacyOptimized: 119092
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
index 6685776d06..3307567535 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/storage_array_encoding.sol
@@ -18,7 +18,7 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // h(uint256[2][]): 0x20, 3, 123, 124, 223, 224, 323, 324 -> 32, 256, 0x20, 3, 123, 124, 223, 224, 323, 324
-// gas irOptimized: 180808
+// gas irOptimized: 180720
 // gas legacy: 184830
 // gas legacyOptimized: 181493
 // i(uint256[2][2]): 123, 124, 223, 224 -> 32, 128, 123, 124, 223, 224
diff --git a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
index c0c2fbfe38..c06d2b24c4 100644
--- a/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
+++ b/test/libsolidity/semanticTests/abiencodedecode/abi_decode_simple_storage.sol
@@ -8,6 +8,6 @@ contract C {
 }
 // ----
 // f(bytes): 0x20, 0x80, 0x21, 0x40, 0x7, "abcdefg" -> 0x21, 0x40, 0x7, "abcdefg"
-// gas irOptimized: 135662
+// gas irOptimized: 135661
 // gas legacy: 137278
 // gas legacyOptimized: 136048
diff --git a/test/libsolidity/semanticTests/array/array_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
index 1e75afeffc..e8b6cd48f9 100644
--- a/test/libsolidity/semanticTests/array/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
@@ -26,7 +26,7 @@ contract C {
 // index(uint256): 10 -> true
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
-// gas irOptimized: 135060
+// gas irOptimized: 135066
 // gas legacy: 241703
 // gas legacyOptimized: 151613
 // accessIndex(uint256,int256): 10, 1 -> 2
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
index 836901963e..8a8c9a7c28 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131804
+// gas irOptimized: 131809
 // gas legacy: 132804
 // gas legacyOptimized: 130649
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 225692
+// gas irOptimized: 225696
 // gas legacy: 227786
 // gas legacyOptimized: 223830
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 323700
+// gas irOptimized: 323704
 // gas legacy: 326902
 // gas legacyOptimized: 321206
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 5112496
+// gas irOptimized: 5112500
 // gas legacy: 5165874
 // gas legacyOptimized: 5062182
diff --git a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
index 715e8a589c..95280054aa 100644
--- a/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/arrays_complex_from_and_to_storage.sol
@@ -12,7 +12,7 @@ contract Test {
 }
 // ----
 // set(uint24[3][]): 0x20, 0x06, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12 -> 0x06
-// gas irOptimized: 186554
+// gas irOptimized: 186557
 // gas legacy: 211054
 // gas legacyOptimized: 206042
 // data(uint256,uint256): 0x02, 0x02 -> 0x09
diff --git a/test/libsolidity/semanticTests/array/bytes_length_member.sol b/test/libsolidity/semanticTests/array/bytes_length_member.sol
index 750467a212..0a3c58b3ac 100644
--- a/test/libsolidity/semanticTests/array/bytes_length_member.sol
+++ b/test/libsolidity/semanticTests/array/bytes_length_member.sol
@@ -13,7 +13,7 @@ contract c {
 // ----
 // getLength() -> 0
 // set(): 1, 2 -> true
-// gas irOptimized: 110392
+// gas irOptimized: 110393
 // gas legacy: 110952
-// gas legacyOptimized: 110579
+// gas legacyOptimized: 110576
 // getLength() -> 68
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
index 7d52198784..80ecd3e1ce 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_calldata_storage.sol
@@ -20,7 +20,7 @@ contract c {
 }
 // ----
 // store(uint256[9],uint8[3][]): 21, 22, 23, 24, 25, 26, 27, 28, 29, 0x140, 4, 1, 2, 3, 11, 12, 13, 21, 22, 23, 31, 32, 33 -> 32
-// gas irOptimized: 648319
+// gas irOptimized: 648315
 // gas legacy: 694356
 // gas legacyOptimized: 693864
 // retrieve() -> 9, 28, 9, 28, 4, 3, 32
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
index a06ee7f89a..600f00a981 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_cleanup_uint40.sol
@@ -46,6 +46,6 @@ contract C {
 }
 // ----
 // f() -> true
-// gas irOptimized: 117261
+// gas irOptimized: 117264
 // gas legacy: 124660
 // gas legacyOptimized: 122801
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index f039ce0be3..2d6198006b 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -18,6 +18,6 @@ contract c {
 }
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 208053
+// gas irOptimized: 208074
 // gas legacy: 221769
 // gas legacyOptimized: 220611
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
index 5e4adaa496..737e4b32bc 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_nested_array.sol
@@ -12,6 +12,6 @@ contract c {
 }
 // ----
 // test(uint256[2][]): 32, 3, 7, 8, 9, 10, 11, 12 -> 10
-// gas irOptimized: 689654
+// gas irOptimized: 689656
 // gas legacy: 686178
 // gas legacyOptimized: 685628
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
index 911653b374..d477dc6cf9 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 5, 4
-// gas irOptimized: 205045
+// gas irOptimized: 205044
 // gas legacy: 213863
 // gas legacyOptimized: 212902
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
index f75338bb74..0571195861 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_different_base_nested.sol
@@ -21,6 +21,6 @@ contract c {
 }
 // ----
 // test() -> 3, 4
-// gas irOptimized: 169586
+// gas irOptimized: 169565
 // gas legacy: 175424
 // gas legacyOptimized: 172535
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
index 13cd7ed0ce..971469dec6 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_storage_storage_static_dynamic.sol
@@ -11,6 +11,6 @@ contract c {
 }
 // ----
 // test() -> 9, 4
-// gas irOptimized: 123136
+// gas irOptimized: 123135
 // gas legacy: 123567
 // gas legacyOptimized: 123202
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index 74d2ab9096..b2af9191de 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 104534
+// gas irOptimized: 104526
 // gas legacy: 166874
 // gas legacyOptimized: 145474
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index b229059898..db66a55083 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -18,6 +18,6 @@ contract c {
 }
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
-// gas irOptimized: 273564
+// gas irOptimized: 273563
 // gas legacy: 283666
 // gas legacyOptimized: 282023
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index ad4c5818b6..bf1e1bc1b5 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -18,6 +18,6 @@ contract c {
 }
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
-// gas irOptimized: 233271
+// gas irOptimized: 233255
 // gas legacy: 236523
 // gas legacyOptimized: 235592
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
index ad79a5ec53..919e832986 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_calldata_to_storage.sol
@@ -42,6 +42,6 @@ contract c {
 // test2(uint256[][2]): 0x20, 0x40, 0x40, 2, 23, 42 -> 2, 65
 // gas irOptimized: 157544
 // test3(uint256[2][]): 0x20, 2, 23, 42, 23, 42 -> 2, 65
-// gas irOptimized: 134629
+// gas irOptimized: 134634
 // test4(uint256[2][2]): 23, 42, 23, 42 -> 65
 // gas irOptimized: 111252
diff --git a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
index 1bc50ab80a..eb4b1bbb9a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_nested_memory_to_storage.sol
@@ -44,6 +44,6 @@ contract Test {
 // test1() -> 3
 // test2() -> 6
 // test3() -> 24
-// gas irOptimized: 141223
+// gas irOptimized: 141225
 // gas legacy: 142238
 // gas legacyOptimized: 141365
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
index b908649a23..546a6e49e4 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_calldata_to_storage.sol
@@ -17,4 +17,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint128,uint64,uint128)[]): 0x20, 3, 0, 0, 12, 0, 11, 0, 10, 0, 0 -> 10, 11, 12
-// gas irOptimized: 119691
+// gas irOptimized: 119704
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
index 32deb9e06e..38e26e480a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_struct_memory_to_storage.sol
@@ -19,4 +19,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 10, 11, 12
-// gas irOptimized: 118360
+// gas irOptimized: 118362
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
index a388482943..510e7c9a4a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_memory_to_storage.sol
@@ -26,4 +26,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f() -> 3, 3, 3, 1
-// gas irOptimized: 181894
+// gas irOptimized: 181890
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
index c20d536e23..19e5ddebd4 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_inside_mappings.sol
@@ -7,11 +7,11 @@ contract c {
 // set(uint256): 1, 2 -> true
 // gas irOptimized: 110558
 // gas legacy: 111312
-// gas legacyOptimized: 110744
+// gas legacyOptimized: 110741
 // set(uint256): 2, 2, 3, 4, 5 -> true
 // gas irOptimized: 177509
 // gas legacy: 178314
-// gas legacyOptimized: 177719
+// gas legacyOptimized: 177716
 // storageEmpty -> 0
 // copy(uint256,uint256): 1, 2 -> true
 // storageEmpty -> 0
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 4b91f666c3..968f637a4a 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -17,25 +17,25 @@ contract c {
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 109839
+// gas irOptimized: 109219
 // gas legacy: 123948
 // gas legacyOptimized: 118948
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 124049
+// gas irOptimized: 123858
 // gas legacy: 140362
-// gas legacyOptimized: 135386
+// gas legacyOptimized: 135384
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 130665
+// gas irOptimized: 130468
 // gas legacy: 147916
-// gas legacyOptimized: 142278
+// gas legacyOptimized: 142276
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 139545
+// gas irOptimized: 139168
 // gas legacy: 171136
-// gas legacyOptimized: 161538
+// gas legacyOptimized: 161536
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 442421
+// gas irOptimized: 441648
 // gas legacy: 505021
-// gas legacyOptimized: 486997
+// gas legacyOptimized: 486995
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
index 2dfde7afa7..706232d589 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_dynamic_to_storage.sol
@@ -9,6 +9,6 @@ contract C {
 }
 // ----
 // f(uint256[]): 0x20, 0x03, 0x1, 0x2, 0x3 -> 0x1
-// gas irOptimized: 110962
+// gas irOptimized: 110968
 // gas legacy: 111551
 // gas legacyOptimized: 111339
diff --git a/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
index 64b8cd9308..e6bf7671a1 100644
--- a/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
+++ b/test/libsolidity/semanticTests/array/copying/calldata_array_to_mapping.sol
@@ -14,4 +14,4 @@ contract C {
 // compileViaYul: true
 // ----
 // from_calldata(uint8[][]): 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14 -> 0x20, 2, 0x40, 0xa0, 2, 10, 11, 3, 12, 13, 14
-// gas irOptimized: 139685
+// gas irOptimized: 139683
diff --git a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
index fdcc188353..5482f615f2 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_byte_array_in_struct_to_storage.sol
@@ -35,11 +35,11 @@ contract C {
 }
 // ----
 // f() -> 0x40, 0x80, 6, 0x6162636465660000000000000000000000000000000000000000000000000000, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000
-// gas irOptimized: 179734
+// gas irOptimized: 179750
 // gas legacy: 181001
 // gas legacyOptimized: 180018
 // g() -> 0x40, 0xc0, 0x49, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738393031323334353637383930313233343536373839303120, 0x3132333435363738390000000000000000000000000000000000000000000000, 0x11, 0x3132333435363738393233343536373839000000000000000000000000000000
-// gas irOptimized: 106663
+// gas irOptimized: 106679
 // gas legacy: 109720
 // gas legacyOptimized: 106932
 // h() -> 0x40, 0x60, 0x00, 0x00
diff --git a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
index 8ee78ab9bc..fb21779012 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_function_internal_storage_array.sol
@@ -15,6 +15,6 @@ contract C {
 }
 // ----
 // test() -> 7
-// gas irOptimized: 122456
+// gas irOptimized: 122455
 // gas legacy: 205176
 // gas legacyOptimized: 204971
diff --git a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
index 752dd6494f..85c396fb4e 100644
--- a/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/array/copying/copy_removes_bytes_data.sol
@@ -7,9 +7,9 @@ contract c {
 }
 // ----
 // set(): 1, 2, 3, 4, 5 -> true
-// gas irOptimized: 177375
+// gas irOptimized: 177376
 // gas legacy: 177954
-// gas legacyOptimized: 177553
+// gas legacyOptimized: 177550
 // storageEmpty -> 0
 // reset() -> true
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
index 4bf021094e..58b5dd0454 100644
--- a/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
+++ b/test/libsolidity/semanticTests/array/copying/copying_bytes_multiassign.sol
@@ -20,7 +20,7 @@ contract sender {
 // (): 7 ->
 // gas irOptimized: 110831
 // gas legacy: 111388
-// gas legacyOptimized: 111070
+// gas legacyOptimized: 111065
 // val() -> 0
 // forward(bool): true -> true
 // val() -> 0x80
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
index 0562be2e27..ea5625f21d 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_calldata_to_storage.sol
@@ -31,8 +31,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 327847
+// gas irOptimized: 327874
 // test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 140870
+// gas irOptimized: 140879
 // test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 188517
+// gas irOptimized: 188535
diff --git a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
index 74dfa2d7a4..96f24f77da 100644
--- a/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/elements_of_nested_array_of_structs_memory_to_storage.sol
@@ -31,8 +31,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][][]): 0x20, 1, 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 332666
+// gas irOptimized: 332660
 // test2((uint8[],uint8[2])[][1][]): 0x20, 2, 0x40, 0x0160, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13, 0x20, 1, 0x20, 0x60, 31, 37, 2, 23, 29 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 145152
+// gas irOptimized: 145150
 // test3((uint8[],uint8[2])[1][][2]): 0x20, 0x40, 0x60, 0, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 288, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 192602
+// gas irOptimized: 192598
diff --git a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
index a357147c56..275a0fca1b 100644
--- a/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/function_type_array_to_storage.sol
@@ -46,11 +46,11 @@ contract C {
 }
 // ----
 // test() -> 0x20, 0x14, "[a called][b called]"
-// gas irOptimized: 116633
+// gas irOptimized: 116645
 // gas legacy: 118936
 // gas legacyOptimized: 116975
 // test2() -> 0x20, 0x14, "[b called][a called]"
 // test3() -> 0x20, 0x14, "[b called][a called]"
-// gas irOptimized: 103243
+// gas irOptimized: 103246
 // gas legacy: 102745
 // gas legacyOptimized: 101669
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index 1dd321d45f..599d23c807 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 3
-// gas irOptimized: 128264
+// gas irOptimized: 128094
 // gas legacy: 130584
 // gas legacyOptimized: 129028
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
index ad8cbbb2a7..f85b8eb9f3 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_element_storage_to_storage.sol
@@ -70,7 +70,7 @@ contract C {
 }
 // ----
 // test1() ->
-// gas irOptimized: 150460
+// gas irOptimized: 150468
 // gas legacy: 150949
 // gas legacyOptimized: 150906
 // test2() -> FAILURE
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
index 27046de2bf..844a86304e 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_calldata_to_storage.sol
@@ -29,8 +29,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 304720
+// gas irOptimized: 304747
 // test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 116455
+// gas irOptimized: 116464
 // test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 188006
+// gas irOptimized: 188024
diff --git a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
index 2ebf292215..209a6ee696 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_array_of_structs_memory_to_storage.sol
@@ -29,8 +29,8 @@ contract C {
 // compileViaYul: true
 // ----
 // test1((uint8[],uint8[2])[][]): 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29 -> 0x20, 2, 0x40, 0x0140, 1, 0x20, 0x60, 3, 7, 2, 1, 2, 2, 0x40, 0x0100, 0x60, 17, 19, 2, 11, 13, 0x60, 31, 37, 2, 23, 29
-// gas irOptimized: 309077
+// gas irOptimized: 309074
 // test2((uint8[],uint8[2])[][1]): 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 0x20, 1, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 118258
+// gas irOptimized: 118256
 // test3((uint8[],uint8[2])[1][]): 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13 -> 0x20, 2, 0x40, 0x0120, 0x20, 0x60, 3, 7, 2, 1, 2, 0x20, 0x60, 17, 19, 2, 11, 13
-// gas irOptimized: 190997
+// gas irOptimized: 190993
diff --git a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
index c32f7bf6b0..dfb7c27aca 100644
--- a/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/nested_dynamic_array_element_calldata_to_storage.sol
@@ -32,5 +32,5 @@ contract C {
 // test(uint8[][][]): 0x20, 2, 0x40, 0x60, 0, 2, 0x40, 0x80, 1, 7, 2, 8, 9
 // gas irOptimized: 138040
 // test2(uint8[][]): 0x20, 2, 0x40, 0x80, 1, 7, 2, 8, 9
-// gas irOptimized: 164248
+// gas irOptimized: 164246
 // gas legacyOptimized: 120228
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
index f6079f1a83..7c2f0e55e8 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -17,6 +17,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 205881
+// gas irOptimized: 205879
 // gas legacy: 212237
 // gas legacyOptimized: 211425
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
index d394b65829..211477c553 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_bytes.sol
@@ -11,6 +11,6 @@ contract C {
 }
 // ----
 // f() -> 0x20, 0x02, 0x40, 0x80, 3, 0x6162630000000000000000000000000000000000000000000000000000000000, 0x99, 44048183304486788312148433451363384677562265908331949128489393215789685032262, 32241931068525137014058842823026578386641954854143559838526554899205067598957, 49951309422467613961193228765530489307475214998374779756599339590522149884499, 0x54555658595a6162636465666768696a6b6c6d6e6f707172737475767778797a, 0x4142434445464748494a4b4c4d4e4f5051525354555658595a00000000000000
-// gas irOptimized: 202735
+// gas irOptimized: 202731
 // gas legacy: 204798
 // gas legacyOptimized: 203357
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
index ce4e31769d..cda6d129a3 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 205881
+// gas irOptimized: 205879
 // gas legacy: 212242
 // gas legacyOptimized: 211430
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index bfda8d7aff..5617e2fcce 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 2, 3, 4
-// gas irOptimized: 109698
+// gas irOptimized: 109702
 // gas legacy: 126129
 // gas legacyOptimized: 120622
diff --git a/test/libsolidity/semanticTests/array/create_memory_array.sol b/test/libsolidity/semanticTests/array/create_memory_array.sol
index ecfecb9c0c..d507f080f3 100644
--- a/test/libsolidity/semanticTests/array/create_memory_array.sol
+++ b/test/libsolidity/semanticTests/array/create_memory_array.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> "A", 8, 4, "B"
-// gas irOptimized: 125819
+// gas irOptimized: 125822
 // gas legacy: 121382
 // gas legacyOptimized: 115488
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index 4992898204..146206ae06 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test1() -> true
-// gas irOptimized: 206386
+// gas irOptimized: 206388
 // gas legacy: 254056
 // gas legacyOptimized: 246892
diff --git a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
index 79c0f8fbfd..dd90985735 100644
--- a/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
+++ b/test/libsolidity/semanticTests/array/fixed_arrays_as_return_type.sol
@@ -18,6 +18,6 @@ contract B {
 }
 // ----
 // f() -> 2, 3, 4, 5, 6, 1000, 1001, 1002, 1003, 1004
-// gas irOptimized: 114204
+// gas irOptimized: 114404
 // gas legacy: 230001
 // gas legacyOptimized: 130637
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index e91608966a..fe72091af1 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -42,6 +42,6 @@ contract C {
 }
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 256077
+// gas irOptimized: 256288
 // gas legacy: 441556
 // gas legacyOptimized: 279321
diff --git a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
index 4d8422ecdf..ddf67aa90f 100644
--- a/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
+++ b/test/libsolidity/semanticTests/array/invalid_encoding_for_storage_byte_array.sol
@@ -40,9 +40,9 @@ contract C {
 // copyFromStorageShort()
 // x() -> 0x20, 3, 0x6162630000000000000000000000000000000000000000000000000000000000
 // copyFromStorageLong()
-// gas irOptimized: 121104
+// gas irOptimized: 121106
 // gas legacy: 121904
-// gas legacyOptimized: 121400
+// gas legacyOptimized: 121398
 // x() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
 // copyToStorage()
 // x() -> 0x20, 0x25, 0x3132333435363738393031323334353637383930313233343536373839303132, 0x3334353637000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
index a999ba5132..1b69ab336b 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint16_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 38, 28, 18
-// gas irOptimized: 148543
+// gas irOptimized: 148538
 // gas legacy: 151184
 // gas legacyOptimized: 142418
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
index c28e1b91c5..d2e5995c00 100644
--- a/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
+++ b/test/libsolidity/semanticTests/array/pop/array_pop_uint24_transition.sol
@@ -18,7 +18,7 @@ contract c {
 }
 // ----
 // test() -> 20, 10
-// gas irOptimized: 126072
+// gas irOptimized: 126068
 // gas legacy: 127216
 // gas legacyOptimized: 122224
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index 07bad3a26d..95156f5c69 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -9,6 +9,6 @@ contract c {
 }
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 107976
+// gas irOptimized: 107962
 // gas legacy: 125420
 // gas legacyOptimized: 122472
diff --git a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
index 66af798b9c..a010a9938a 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_nested_from_calldata.sol
@@ -12,6 +12,6 @@ contract C {
 }
 // ----
 // f(uint120[]): 0x20, 3, 1, 2, 3 -> 1
-// gas irOptimized: 112813
+// gas irOptimized: 112812
 // gas legacy: 113659
 // gas legacyOptimized: 113482
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct.sol b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
index bc09edeb5f..06c5db88b7 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct.sol
@@ -20,6 +20,6 @@ contract c {
 }
 // ----
 // test() -> 2, 3, 4, 5
-// gas irOptimized: 135082
+// gas irOptimized: 135103
 // gas legacy: 147443
 // gas legacyOptimized: 146434
diff --git a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
index bce81a8680..4a33f816d7 100644
--- a/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
+++ b/test/libsolidity/semanticTests/array/push/array_push_struct_from_calldata.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test((uint16,uint16,uint16[3],uint16[])): 0x20, 2, 3, 0, 0, 4, 0xC0, 4, 0, 0, 5, 0, 0 -> 2, 3, 4, 5
-// gas irOptimized: 137031
+// gas irOptimized: 137061
 // gas legacy: 142423
-// gas legacyOptimized: 137993
+// gas legacyOptimized: 137991
diff --git a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
index a21e1ba21f..30ed47920d 100644
--- a/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
+++ b/test/libsolidity/semanticTests/array/push/nested_bytes_push.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 179110
+// gas irOptimized: 179112
 // gas legacy: 181014
 // gas legacyOptimized: 180422
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 162f498173..860c743379 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -21,7 +21,7 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 182707
+// gas irOptimized: 182328
 // gas legacy: 183445
 // gas legacyOptimized: 178995
 // l() -> 70
diff --git a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
index 95d3b916f6..dc77f0dff8 100644
--- a/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
+++ b/test/libsolidity/semanticTests/byte_array_to_storage_cleanup.sol
@@ -28,9 +28,9 @@ contract C {
 // compileViaYul: also
 // ----
 // constructor() ->
-// gas irOptimized: 442530
+// gas irOptimized: 443406
 // gas legacy: 711299
-// gas legacyOptimized: 481296
+// gas legacyOptimized: 482382
 // h() -> 0x20, 0x40, 0x00, 0
 // ~ emit ev(uint256[],uint256): 0x40, 0x21, 0x02, 0x00, 0x00
 // g() -> 0x20, 0x40, 0, 0x00
diff --git a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
index c87f6bfcff..aedf5ada4f 100644
--- a/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
+++ b/test/libsolidity/semanticTests/calldata/copy_from_calldata_removes_bytes_data.sol
@@ -9,9 +9,9 @@ contract c {
 // EVMVersion: >=byzantium
 // ----
 // (): 1, 2, 3, 4, 5 ->
-// gas irOptimized: 155131
+// gas irOptimized: 155130
 // gas legacy: 155473
-// gas legacyOptimized: 155298
+// gas legacyOptimized: 155295
 // checkIfDataIsEmpty() -> false
 // sendMessage() -> true, 0x40, 0
 // checkIfDataIsEmpty() -> true
diff --git a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
index f9038fb762..3d9c1ffece 100644
--- a/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
+++ b/test/libsolidity/semanticTests/constructor/arrays_in_constructors.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,address[]): 7, 0x40, 10, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 -> 7, 8
-// gas irOptimized: 424508
+// gas irOptimized: 424526
 // gas legacy: 581443
-// gas legacyOptimized: 444588
+// gas legacyOptimized: 444599
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
index 3361fa310b..067a64e0e5 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_packer.sol
@@ -24,6 +24,6 @@ contract Creator {
 }
 // ----
 // f(uint256,bytes): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" -> 7, "h"
-// gas irOptimized: 275487
+// gas irOptimized: 275102
 // gas legacy: 418462
-// gas legacyOptimized: 291760
+// gas legacyOptimized: 291960
diff --git a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
index b77793c0f1..0665cb807a 100644
--- a/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
+++ b/test/libsolidity/semanticTests/constructor/bytes_in_constructors_unpacker.sol
@@ -8,8 +8,8 @@ contract Test {
 }
 // ----
 // constructor(): 7, 0x40, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz" ->
-// gas irOptimized: 268145
+// gas irOptimized: 269225
 // gas legacy: 311324
-// gas legacyOptimized: 258388
+// gas legacyOptimized: 258604
 // m_x() -> 7
 // m_s() -> 0x20, 78, "abcdefghijklmnopqrstuvwxyzabcdef", "ghijklmnopqrstuvwxyzabcdefghijkl", "mnopqrstuvwxyz"
diff --git a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
index 4698d26ee6..22acd1cc3f 100644
--- a/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
+++ b/test/libsolidity/semanticTests/constructor/constructor_static_array_argument.sol
@@ -9,9 +9,9 @@ contract C {
 }
 // ----
 // constructor(): 1, 2, 3, 4 ->
-// gas irOptimized: 170999
+// gas irOptimized: 171015
 // gas legacy: 218378
-// gas legacyOptimized: 176195
+// gas legacyOptimized: 176211
 // a() -> 1
 // b(uint256): 0 -> 2
 // b(uint256): 1 -> 3
diff --git a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
index 5b8827ce7e..f8b5141b97 100644
--- a/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
+++ b/test/libsolidity/semanticTests/events/event_emit_from_other_contract.sol
@@ -15,7 +15,7 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 165398
+// gas irOptimized: 165386
 // gas legacy: 244800
 // gas legacyOptimized: 171615
 // deposit(bytes32), 18 wei: 0x1234 ->
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index dfd9dd3993..a503d44f51 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -19,4 +19,4 @@ contract C {
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
 // gas irOptimized: 330920
 // gas legacy: 387608
-// gas legacyOptimized: 373772
+// gas legacyOptimized: 373771
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index fd7288c8ff..1e366f75f1 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,9 +33,9 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 406907
+// gas irOptimized: 406679
 // gas legacy: 737652
-// gas legacyOptimized: 526820
+// gas legacyOptimized: 527036
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
 // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
 // encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
@@ -55,6 +55,6 @@ contract test {
 // gas legacy: 1672031
 // gas legacyOptimized: 1199031
 // encode_no_asm_large()
-// gas irOptimized: 3276081
+// gas irOptimized: 3257081
 // gas legacy: 4705075
 // gas legacyOptimized: 2890075
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index 5e815fad49..e51eb414ac 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,7 +176,7 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 1391860
+// gas irOptimized: 1397699
 // gas legacy: 2391952
 // gas legacyOptimized: 1752320
 // supportsInterface(bytes4): 0x0 -> 0
@@ -184,27 +184,27 @@ contract DepositContract is IDepositContract, ERC165 {
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 116864
+// gas irOptimized: 116863
 // gas legacy: 151981
 // gas legacyOptimized: 124447
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 116864
+// gas irOptimized: 116863
 // gas legacy: 151981
 // gas legacyOptimized: 124447
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 116849
+// gas irOptimized: 116848
 // gas legacy: 151990
 // gas legacyOptimized: 124459
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 116849
+// gas irOptimized: 116848
 // gas legacy: 151990
 // gas legacyOptimized: 124459
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index 8bb2b37c47..8d0a99382e 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -48,7 +48,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1849535
+// gas irOptimized: 1847920
 // gas legacy: 2430726
 // gas legacyOptimized: 1854979
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 1ecfc154a1..2442493d74 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,7 +48,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1723666
+// gas irOptimized: 1722598
 // gas legacy: 2210160
 // gas legacyOptimized: 1734152
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 41820c8a45..817f6702e9 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,9 +49,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 633020
+// gas irOptimized: 634316
 // gas legacy: 1065857
-// gas legacyOptimized: 725207
+// gas legacyOptimized: 725423
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
 // gas irOptimized: 22660
 // gas legacy: 23190
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
index cbbded9d5a..39592f4a48 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_args.sol
@@ -15,7 +15,7 @@ contract D {
 }
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 193567
+// gas irOptimized: 192703
 // gas legacy: 241234
 // gas legacyOptimized: 192961
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
index e6b4ae90b2..3850a0be7f 100644
--- a/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
+++ b/test/libsolidity/semanticTests/functionCall/creation_function_call_with_salt.sol
@@ -17,7 +17,7 @@ contract D {
 // EVMVersion: >=constantinople
 // ----
 // constructor(): 2 ->
-// gas irOptimized: 193730
+// gas irOptimized: 192866
 // gas legacy: 241606
 // gas legacyOptimized: 193193
 // f() -> 2
diff --git a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
index 86d3dcc8f2..a1c74cf898 100644
--- a/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
+++ b/test/libsolidity/semanticTests/functionCall/external_call_to_nonexisting.sol
@@ -22,7 +22,7 @@ contract C {
 }
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 265110
+// gas irOptimized: 262355
 // gas legacy: 441442
 // gas legacyOptimized: 292862
 // f(uint256): 0 -> FAILURE
diff --git a/test/libsolidity/semanticTests/functionCall/failed_create.sol b/test/libsolidity/semanticTests/functionCall/failed_create.sol
index 6460794adc..091e5a77a6 100644
--- a/test/libsolidity/semanticTests/functionCall/failed_create.sol
+++ b/test/libsolidity/semanticTests/functionCall/failed_create.sol
@@ -17,7 +17,7 @@ contract C {
 // EVMVersion: >=byzantium
 // ----
 // constructor(), 20 wei
-// gas irOptimized: 171806
+// gas irOptimized: 166148
 // gas legacy: 285547
 // gas legacyOptimized: 168515
 // f(uint256): 20 -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
index 6ebab90fff..79a829aa77 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_basic.sol
@@ -38,7 +38,7 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 253950
+// gas irOptimized: 252642
 // gas legacy: 391588
 // gas legacyOptimized: 268089
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
index 1cb5e0d548..71b6ebb2c7 100644
--- a/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
+++ b/test/libsolidity/semanticTests/functionCall/gas_and_value_brace_syntax.sol
@@ -37,7 +37,7 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 253950
+// gas irOptimized: 252642
 // gas legacy: 391588
 // gas legacyOptimized: 268089
 // sendAmount(uint256): 5 -> 5
diff --git a/test/libsolidity/semanticTests/immutable/multi_creation.sol b/test/libsolidity/semanticTests/immutable/multi_creation.sol
index 4302b42e1b..145c32add6 100644
--- a/test/libsolidity/semanticTests/immutable/multi_creation.sol
+++ b/test/libsolidity/semanticTests/immutable/multi_creation.sol
@@ -27,7 +27,7 @@ contract C {
 }
 // ----
 // f() -> 3, 7, 5
-// gas irOptimized: 124024
+// gas irOptimized: 124021
 // gas legacy: 148528
 // gas legacyOptimized: 123971
 // x() -> 7
diff --git a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
index 3866d3be0a..d8fd8766fe 100644
--- a/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
+++ b/test/libsolidity/semanticTests/inheritance/value_for_constructor.sol
@@ -39,7 +39,7 @@ contract Main {
 }
 // ----
 // constructor(), 22 wei ->
-// gas irOptimized: 262320
+// gas irOptimized: 261888
 // gas legacy: 392786
 // gas legacyOptimized: 261633
 // getFlag() -> true
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index 3da10930c5..5aeff319c9 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -22,6 +22,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 4, 0x11
-// gas irOptimized: 112046
+// gas irOptimized: 112064
 // gas legacy: 135413
 // gas legacyOptimized: 119325
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
index 1f06908e2c..b3e06c5bcf 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_public.sol
@@ -19,6 +19,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 119642
+// gas irOptimized: 119635
 // gas legacy: 124674
 // gas legacyOptimized: 119669
diff --git a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
index e26ccacb9c..e9d855969a 100644
--- a/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
+++ b/test/libsolidity/semanticTests/libraries/using_library_mappings_return.sol
@@ -17,6 +17,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 1, 0, 0x2a, 0x17, 0, 0x63
-// gas irOptimized: 120200
+// gas irOptimized: 120194
 // gas legacy: 125109
 // gas legacyOptimized: 120128
diff --git a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
index 34180fa697..c4db174742 100644
--- a/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
+++ b/test/libsolidity/semanticTests/salted_create/salted_create_with_value.sol
@@ -21,6 +21,6 @@ contract A {
 // EVMVersion: >=constantinople
 // ----
 // f(), 10 ether -> 3007, 3008, 3009
-// gas irOptimized: 253035
+// gas irOptimized: 253005
 // gas legacy: 381063
 // gas legacyOptimized: 279694
diff --git a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
index 75898d3162..1d1783a162 100644
--- a/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_from_mapping.sol
@@ -36,8 +36,8 @@ contract C {
 }
 // ----
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 121487
+// gas irOptimized: 121481
 // gas legacy: 123069
-// gas legacyOptimized: 121759
+// gas legacyOptimized: 121756
 // to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
index 902cc80e5a..a1b0999ff5 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_from_mapping.sol
@@ -46,6 +46,6 @@ contract C {
 // to_state() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121598
 // gas legacy: 123208
-// gas legacyOptimized: 121766
+// gas legacyOptimized: 121763
 // to_storage() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // to_memory() -> 0x20, 0x60, 0xa0, 7, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
diff --git a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
index 66716e4002..b884661134 100644
--- a/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_substructures_to_mapping.sol
@@ -52,14 +52,14 @@ contract C {
 }
 // ----
 // from_memory() -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 123034
+// gas irOptimized: 123039
 // gas legacy: 130227
-// gas legacyOptimized: 128761
+// gas legacyOptimized: 128758
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121709
 // gas legacy: 123282
-// gas legacyOptimized: 121871
+// gas legacyOptimized: 121868
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 0x15, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115131
+// gas irOptimized: 115130
 // gas legacy: 122516
-// gas legacyOptimized: 120807
+// gas legacyOptimized: 120804
diff --git a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
index 30df195d8e..e6b569922c 100644
--- a/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
+++ b/test/libsolidity/semanticTests/structs/copy_to_mapping.sol
@@ -47,16 +47,16 @@ contract C {
 // from_state() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121686
 // gas legacy: 123144
-// gas legacyOptimized: 121811
+// gas legacyOptimized: 121808
 // from_storage() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
 // gas irOptimized: 121731
 // gas legacy: 123193
-// gas legacyOptimized: 121863
+// gas legacyOptimized: 121860
 // from_memory() -> 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 122942
+// gas irOptimized: 122947
 // gas legacy: 130088
-// gas legacyOptimized: 128757
+// gas legacyOptimized: 128754
 // from_calldata((bytes,uint16[],uint16)): 0x20, 0x60, 0xa0, 21, 3, 0x666F6F0000000000000000000000000000000000000000000000000000000000, 2, 13, 14 -> 0x20, 0x60, 0xa0, 21, 3, 0x666f6f0000000000000000000000000000000000000000000000000000000000, 2, 13, 14
-// gas irOptimized: 115046
+// gas irOptimized: 115045
 // gas legacy: 118301
-// gas legacyOptimized: 115435
+// gas legacyOptimized: 115432
diff --git a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
index c8437300d5..856edc27be 100644
--- a/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
+++ b/test/libsolidity/semanticTests/structs/struct_containing_bytes_copy_and_delete.sol
@@ -23,17 +23,17 @@ contract c {
 // ----
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133582
+// gas irOptimized: 133592
 // gas legacy: 134628
-// gas legacyOptimized: 133874
+// gas legacyOptimized: 133871
 // test(uint256): 32 -> "3"
 // storageEmpty -> 0
 // copy() -> true
 // storageEmpty -> 1
 // set(uint256,bytes,uint256): 12, 0x60, 13, 33, "12345678901234567890123456789012", "3" -> true
-// gas irOptimized: 133582
+// gas irOptimized: 133592
 // gas legacy: 134628
-// gas legacyOptimized: 133874
+// gas legacyOptimized: 133871
 // storageEmpty -> 0
 // del() -> true
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index 2e85c34637..f9c2d333a2 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -49,7 +49,7 @@ contract C {
 }
 // ----
 // test_f() -> true
-// gas irOptimized: 122388
+// gas irOptimized: 122393
 // gas legacy: 126030
 // gas legacyOptimized: 123120
 // test_g() -> true
diff --git a/test/libsolidity/semanticTests/various/address_code.sol b/test/libsolidity/semanticTests/various/address_code.sol
index 6067377466..80daf116cd 100644
--- a/test/libsolidity/semanticTests/various/address_code.sol
+++ b/test/libsolidity/semanticTests/various/address_code.sol
@@ -14,9 +14,9 @@ contract C {
 }
 // ----
 // constructor() ->
-// gas irOptimized: 172853
+// gas irOptimized: 173273
 // gas legacy: 241796
-// gas legacyOptimized: 153454
+// gas legacyOptimized: 153670
 // initCode() -> 0x20, 0
 // f() -> true
 // g() -> 0
diff --git a/test/libsolidity/semanticTests/various/create_calldata.sol b/test/libsolidity/semanticTests/various/create_calldata.sol
index b40b0eab41..c3d038136f 100644
--- a/test/libsolidity/semanticTests/various/create_calldata.sol
+++ b/test/libsolidity/semanticTests/various/create_calldata.sol
@@ -8,7 +8,7 @@ contract C {
 }
 // ----
 // constructor(): 42 ->
-// gas irOptimized: 144924
+// gas irOptimized: 145578
 // gas legacy: 173845
-// gas legacyOptimized: 137677
+// gas legacyOptimized: 137877
 // s() -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/various/destructuring_assignment.sol b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
index 9fe9a8a74a..b8236e2cd5 100644
--- a/test/libsolidity/semanticTests/various/destructuring_assignment.sol
+++ b/test/libsolidity/semanticTests/various/destructuring_assignment.sol
@@ -33,6 +33,6 @@ contract C {
 }
 // ----
 // f(bytes): 0x20, 0x5, "abcde" -> 0
-// gas irOptimized: 241841
+// gas irOptimized: 241837
 // gas legacy: 243284
 // gas legacyOptimized: 242420
diff --git a/test/libsolidity/semanticTests/various/selfdestruct.sol b/test/libsolidity/semanticTests/various/selfdestruct.sol
index 366bac41de..6aa42cb144 100644
--- a/test/libsolidity/semanticTests/various/selfdestruct.sol
+++ b/test/libsolidity/semanticTests/various/selfdestruct.sol
@@ -30,7 +30,7 @@ contract D {
 }
 // ----
 // constructor(), 1 ether ->
-// gas irOptimized: 186970
+// gas irOptimized: 186958
 // gas legacy: 255973
 // gas legacyOptimized: 178919
 // c() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
diff --git a/test/libsolidity/semanticTests/various/senders_balance.sol b/test/libsolidity/semanticTests/various/senders_balance.sol
index 37d6919db3..6628454db9 100644
--- a/test/libsolidity/semanticTests/various/senders_balance.sol
+++ b/test/libsolidity/semanticTests/various/senders_balance.sol
@@ -16,7 +16,7 @@ contract D {
 }
 // ----
 // constructor(), 27 wei ->
-// gas irOptimized: 168729
+// gas irOptimized: 167865
 // gas legacy: 218459
 // gas legacyOptimized: 167292
 // f() -> 27
diff --git a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
index e6b9a6aae7..ce8946c55c 100644
--- a/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
+++ b/test/libsolidity/semanticTests/various/skip_dynamic_types_for_structs.sol
@@ -19,6 +19,6 @@ contract C {
 }
 // ----
 // g() -> 2, 6
-// gas irOptimized: 178487
+// gas irOptimized: 178475
 // gas legacy: 180839
 // gas legacyOptimized: 179374
diff --git a/test/libsolidity/semanticTests/various/value_complex.sol b/test/libsolidity/semanticTests/various/value_complex.sol
index 880dfbc208..9f262fbdeb 100644
--- a/test/libsolidity/semanticTests/various/value_complex.sol
+++ b/test/libsolidity/semanticTests/various/value_complex.sol
@@ -19,7 +19,7 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 173055
+// gas irOptimized: 172407
 // gas legacy: 252296
 // gas legacyOptimized: 180352
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/various/value_insane.sol b/test/libsolidity/semanticTests/various/value_insane.sol
index 897b9faba4..1e591050c3 100644
--- a/test/libsolidity/semanticTests/various/value_insane.sol
+++ b/test/libsolidity/semanticTests/various/value_insane.sol
@@ -18,7 +18,7 @@ contract test {
 }
 // ----
 // constructor(), 20 wei ->
-// gas irOptimized: 173919
+// gas irOptimized: 173271
 // gas legacy: 253820
 // gas legacyOptimized: 180784
 // sendAmount(uint256): 5 -> 8
diff --git a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
index ed5ecf3ed1..5a85ba0759 100644
--- a/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
+++ b/test/libsolidity/semanticTests/viaYul/copy_struct_invalid_ir_bug.sol
@@ -21,6 +21,6 @@ contract C {
 }
 // ----
 // f() ->
-// gas irOptimized: 112980
+// gas irOptimized: 112969
 // gas legacy: 112890
 // gas legacyOptimized: 112580
diff --git a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol
index 36aa0c0760..21c48cc433 100644
--- a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol
+++ b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large.sol
@@ -9,4 +9,4 @@ contract test {
 // ====
 // EVMVersion: >=shanghai
 // ----
-// Warning 5574: (21-27154): Contract code size is 27186 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (21-27154): Contract code size is 27187 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol
index 4f3239c227..67dee4cad6 100644
--- a/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol
+++ b/test/libsolidity/syntaxTests/sizeLimits/bytecode_too_large_byzantium.sol
@@ -7,4 +7,4 @@ contract test {
 // ====
 // EVMVersion: =byzantium
 // ----
-// Warning 5574: (0-27133): Contract code size is 27220 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (0-27133): Contract code size is 27221 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol
index 82a3415d0c..0a97c87dfa 100644
--- a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol
+++ b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_paris.sol
@@ -26,6 +26,6 @@ contract test {
 // ====
 // EVMVersion: =paris
 // ----
-// Warning 5574: (0-27130): Contract code size is 27192 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
-// Warning 5574: (27132-27224): Contract code size is 27218 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
-// Warning 5574: (27226-27319): Contract code size is 27218 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (0-27130): Contract code size is 27193 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (27132-27224): Contract code size is 27219 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (27226-27319): Contract code size is 27219 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
index 4854b0a64a..3fc466db39 100644
--- a/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
+++ b/test/libsolidity/syntaxTests/sizeLimits/combined_too_large_shanghai.sol
@@ -26,7 +26,7 @@ contract test {
 // ====
 // EVMVersion: =shanghai
 // ----
-// Warning 5574: (0-27130): Contract code size is 27186 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
-// Warning 5574: (27132-27224): Contract code size is 27212 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
-// Warning 5574: (27226-27319): Contract code size is 27211 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
-// Warning 3860: (27321-27398): Contract initcode size is 54626 bytes and exceeds 49152 bytes (a limit introduced in Shanghai). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (0-27130): Contract code size is 27187 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (27132-27224): Contract code size is 27213 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 5574: (27226-27319): Contract code size is 27212 bytes and exceeds 24576 bytes (a limit introduced in Spurious Dragon). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 3860: (27321-27398): Contract initcode size is 54628 bytes and exceeds 49152 bytes (a limit introduced in Shanghai). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol b/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol
index 1f648c630e..f82434d5d6 100644
--- a/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol
+++ b/test/libsolidity/syntaxTests/sizeLimits/initcode_too_large_shanghai.sol
@@ -27,4 +27,4 @@ contract test {
 // ====
 // EVMVersion: =shanghai
 // ----
-// Warning 3860: (20321-20415): Contract initcode size is 60893 bytes and exceeds 49152 bytes (a limit introduced in Shanghai). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
+// Warning 3860: (20321-20415): Contract initcode size is 60896 bytes and exceeds 49152 bytes (a limit introduced in Shanghai). This contract may not be deployable on Mainnet. Consider enabling the optimizer (with a low "runs" value!), turning off revert strings, or using libraries.
diff --git a/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul b/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
index 8a453e0040..2abdf6d9c2 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/abi_example1.yul
@@ -493,7 +493,7 @@
 //     function abi_decode_array_array_uint256_memory_dyn(offset, end) -> array
 //     {
 //         let _1 := 0x1f
-//         if iszero(slt(add(offset, _1), end)) { revert(0, 0) }
+//         if iszero(slt(add(offset, 0x1f), end)) { revert(0, 0) }
 //         let length := calldataload(offset)
 //         array := allocateMemory(array_allocation_size_array_address_dyn_memory(length))
 //         let dst := array
diff --git a/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul b/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
index 9cdf20193c..fe06f1629b 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/devcon_example.yul
@@ -24,7 +24,7 @@
 //         let _1 := calldataload(0)
 //         let sum := 0
 //         let length := calldataload(_1)
-//         let i := sum
+//         let i := 0
 //         for { } lt(i, length) { i := add(i, 1) }
 //         {
 //             sum := add(sum, calldataload(add(add(_1, shl(5, i)), 0x20)))
diff --git a/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul b/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
index 5bd34186ec..86329c3275 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/loopInvariantCodeMotion.yul
@@ -27,7 +27,7 @@
 //         let _1 := calldataload(0)
 //         let sum := 0
 //         let length := calldataload(_1)
-//         let i := sum
+//         let i := 0
 //         let _2 := calldataload(7)
 //         for { } lt(i, length) { i := add(i, 1) }
 //         {
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul b/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul
index 851ccbce2a..05cf04a710 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/name_cleaner_reserved.yul
@@ -29,6 +29,6 @@
 //     {
 //         if calldataload(0) { pop(mstore_(x)) }
 //         y := 8
-//         sstore(y, calldataload(y))
+//         sstore(8, calldataload(8))
 //     }
 // }

From ae36323edbeb0bcb4f87d3faa28e2e3b3993b6c0 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 5 Sep 2023 08:49:23 +0200
Subject: [PATCH 1589/1748] Fix missing std qualifier for ASAN

---
 test/libsolidity/SolidityOptimizer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/libsolidity/SolidityOptimizer.cpp b/test/libsolidity/SolidityOptimizer.cpp
index fbda3a686b..27f1a7e847 100644
--- a/test/libsolidity/SolidityOptimizer.cpp
+++ b/test/libsolidity/SolidityOptimizer.cpp
@@ -493,7 +493,7 @@ BOOST_AUTO_TEST_CASE(constant_optimization_early_exit)
 #endif
 #endif
 #if __SANITIZE_ADDRESS__
-	maxDuration = numeric_limits<size_t>::max();
+	maxDuration = std::numeric_limits<size_t>::max();
 	BOOST_TEST_MESSAGE("Disabled constant optimizer run time check for address sanitizer build.");
 #endif
 	BOOST_CHECK_MESSAGE(duration <= double(maxDuration), "Compilation of constants took longer than 20 seconds.");

From 1cb04e84d9aae0269038827cc821186bbae1b2f9 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 11 Sep 2023 12:31:42 +0200
Subject: [PATCH 1590/1748] Upgrade homebrew packages
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 .circleci/osx_install_dependencies.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 5e779700c9..8e795b1dc8 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -52,6 +52,8 @@ function validate_checksum {
 
 if [ ! -f /usr/local/lib/libz3.a ] # if this file does not exists (cache was not restored), rebuild dependencies
 then
+  brew update
+  brew upgrade
   brew install boost
   brew install cmake
   brew install wget

From 14aed392614673505fe302fe1ac88bb351464217 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 5 Sep 2023 21:29:11 -0300
Subject: [PATCH 1591/1748] Introduce experimental analysis basic
 infrastructure

---
 liblangutil/Scanner.cpp                       |  15 +-
 liblangutil/Scanner.h                         |   3 +-
 liblangutil/Token.h                           |  35 +++
 libsolidity/CMakeLists.txt                    |   3 +-
 .../experimental/analysis/Analysis.cpp        |  34 +++
 libsolidity/experimental/analysis/Analysis.h  |  49 +++
 libsolidity/interface/CompilerStack.cpp       | 286 ++++++++++--------
 libsolidity/interface/CompilerStack.h         |  13 +
 libyul/AsmParser.cpp                          |   3 +-
 .../ASTJSON/pragma_experimental_solidity.json |  21 --
 .../ASTJSON/pragma_experimental_solidity.sol  |   1 +
 .../experimental/parsing_stdlib_import_1.sol  |   1 +
 .../experimental/parsing_stdlib_import_2.sol  |   1 +
 .../experimental/parsing_stdlib_import_3.sol  |   1 +
 .../experimental/parsing_stdlib_import_4.sol  |   1 +
 .../pragma/experimental_solidity.sol          |   1 +
 16 files changed, 320 insertions(+), 148 deletions(-)
 create mode 100644 libsolidity/experimental/analysis/Analysis.cpp
 create mode 100644 libsolidity/experimental/analysis/Analysis.h
 delete mode 100644 test/libsolidity/ASTJSON/pragma_experimental_solidity.json

diff --git a/liblangutil/Scanner.cpp b/liblangutil/Scanner.cpp
index 2d5607607a..3db3f29d5d 100644
--- a/liblangutil/Scanner.cpp
+++ b/liblangutil/Scanner.cpp
@@ -1019,15 +1019,28 @@ std::tuple<Token, unsigned, unsigned> Scanner::scanIdentifierOrKeyword()
 	while (isIdentifierPart(m_char) || (m_char == '.' && m_kind == ScannerKind::Yul))
 		addLiteralCharAndAdvance();
 	literal.complete();
+
 	auto const token = TokenTraits::fromIdentifierOrKeyword(m_tokens[NextNext].literal);
-	if (m_kind == ScannerKind::Yul)
+	switch (m_kind)
 	{
+	case ScannerKind::Solidity:
+		// Turn experimental Solidity keywords that are not keywords in legacy Solidity into identifiers.
+		if (TokenTraits::isExperimentalSolidityOnlyKeyword(std::get<0>(token)))
+			return std::make_tuple(Token::Identifier, 0, 0);
+		break;
+	case ScannerKind::Yul:
 		// Turn Solidity identifier into a Yul keyword
 		if (m_tokens[NextNext].literal == "leave")
 			return std::make_tuple(Token::Leave, 0, 0);
 		// Turn non-Yul keywords into identifiers.
 		if (!TokenTraits::isYulKeyword(std::get<0>(token)))
 			return std::make_tuple(Token::Identifier, 0, 0);
+		break;
+	case ScannerKind::ExperimentalSolidity:
+		// Turn legacy Solidity keywords that are not keywords in experimental Solidity into identifiers.
+		if (!TokenTraits::isExperimentalSolidityKeyword(std::get<0>(token)))
+			return std::make_tuple(Token::Identifier, 0, 0);
+		break;
 	}
 	return token;
 }
diff --git a/liblangutil/Scanner.h b/liblangutil/Scanner.h
index c45a2ec243..eaa2b3b54d 100644
--- a/liblangutil/Scanner.h
+++ b/liblangutil/Scanner.h
@@ -69,7 +69,8 @@ class ParserRecorder;
 enum class ScannerKind
 {
 	Solidity,
-	Yul
+	Yul,
+	ExperimentalSolidity
 };
 
 enum class ScannerError
diff --git a/liblangutil/Token.h b/liblangutil/Token.h
index ef0c7f6af0..d79c7f193e 100644
--- a/liblangutil/Token.h
+++ b/liblangutil/Token.h
@@ -268,6 +268,8 @@ namespace solidity::langutil
 	/* Yul-specific tokens, but not keywords. */                       \
 	T(Leave, "leave", 0)                                               \
 	\
+	T(NonExperimentalEnd, nullptr, 0) /* used as non-experimental enum end marker */ \
+	T(ExperimentalEnd, nullptr, 0) /* used as experimental enum end marker */ \
 	/* Illegal token - not able to scan. */                            \
 	T(Illegal, "ILLEGAL", 0)                                           \
 	\
@@ -323,6 +325,39 @@ namespace TokenTraits
 			tok == Token::TrueLiteral || tok == Token::FalseLiteral || tok == Token::HexStringLiteral || tok == Token::Hex;
 	}
 
+	constexpr bool isExperimentalSolidityKeyword(Token token)
+	{
+		return
+			token == Token::Assembly ||
+			token == Token::Contract ||
+			token == Token::External ||
+			token == Token::Fallback ||
+			token == Token::Pragma ||
+			token == Token::Import ||
+			token == Token::As ||
+			token == Token::Function ||
+			token == Token::Let ||
+			token == Token::Return ||
+			token == Token::Type ||
+			token == Token::If ||
+			token == Token::Else ||
+			token == Token::Do ||
+			token == Token::While ||
+			token == Token::For ||
+			token == Token::Continue ||
+			token == Token::Break;
+			// TODO: see isExperimentalSolidityKeyword below
+			// || (token > Token::NonExperimentalEnd && token < Token::ExperimentalEnd);
+	}
+
+	constexpr bool isExperimentalSolidityOnlyKeyword(Token)
+	{
+		// TODO: use token > Token::NonExperimentalEnd && token < Token::ExperimentalEnd
+		// as soon as other experimental tokens are added. For now the comparison generates
+		// a warning from clang because it is always false.
+		return false;
+	}
+
 	bool isYulKeyword(std::string const& _literal);
 
 	Token AssignmentToBinaryOp(Token op);
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 32869ba130..0a8c90f36b 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -101,6 +101,8 @@ set(sources
 	codegen/ir/IRLValue.h
 	codegen/ir/IRVariable.cpp
 	codegen/ir/IRVariable.h
+	experimental/analysis/Analysis.cpp
+	experimental/analysis/Analysis.h
 	formal/ArraySlicePredicate.cpp
 	formal/ArraySlicePredicate.h
 	formal/BMC.cpp
@@ -186,4 +188,3 @@ set(sources
 
 add_library(solidity ${sources})
 target_link_libraries(solidity PUBLIC yul evmasm langutil smtutil solutil Boost::boost fmt::fmt-header-only Threads::Threads)
-
diff --git a/libsolidity/experimental/analysis/Analysis.cpp b/libsolidity/experimental/analysis/Analysis.cpp
new file mode 100644
index 0000000000..672aa4f879
--- /dev/null
+++ b/libsolidity/experimental/analysis/Analysis.cpp
@@ -0,0 +1,34 @@
+/*
+	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 <libsolidity/experimental/analysis/Analysis.h>
+
+#include <liblangutil/ErrorReporter.h>
+
+using namespace solidity::langutil;
+using namespace solidity::frontend::experimental;
+
+bool Analysis::check(std::vector<std::shared_ptr<SourceUnit const>> const&)
+{
+	m_errorReporter.error(
+		6547_error,
+		Error::Type::UnimplementedFeatureError,
+		SourceLocation{},
+		"Experimental Analysis is not implemented yet."
+	);
+	return false;
+}
diff --git a/libsolidity/experimental/analysis/Analysis.h b/libsolidity/experimental/analysis/Analysis.h
new file mode 100644
index 0000000000..729ff2b93d
--- /dev/null
+++ b/libsolidity/experimental/analysis/Analysis.h
@@ -0,0 +1,49 @@
+/*
+	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
+#pragma once
+
+#include <vector>
+#include <memory>
+
+namespace solidity::frontend
+{
+class SourceUnit;
+}
+
+namespace solidity::langutil
+{
+class ErrorReporter;
+}
+
+namespace solidity::frontend::experimental
+{
+
+class Analysis
+{
+public:
+	Analysis(langutil::ErrorReporter& _errorReporter):
+		m_errorReporter(_errorReporter)
+	{}
+
+	bool check(std::vector<std::shared_ptr<SourceUnit const>> const& _sourceUnits);
+
+private:
+	langutil::ErrorReporter& m_errorReporter;
+};
+
+}
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index f646ff0146..44413afdf5 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -56,6 +56,8 @@
 #include <libsolidity/interface/Version.h>
 #include <libsolidity/parsing/Parser.h>
 
+#include <libsolidity/experimental/analysis/Analysis.h>
+
 #include <libsolidity/codegen/ir/Common.h>
 #include <libsolidity/codegen/ir/IRGenerator.h>
 
@@ -325,6 +327,7 @@ void CompilerStack::reset(bool _keepSettings)
 		m_metadataHash = MetadataHash::IPFS;
 		m_stopAfter = State::CompilationSuccessful;
 	}
+	m_experimentalAnalysis.reset();
 	m_globalContext.reset();
 	m_sourceOrder.clear();
 	m_contracts.clear();
@@ -449,6 +452,8 @@ bool CompilerStack::analyze()
 
 	try
 	{
+		bool experimentalSolidity = !m_sourceOrder.empty() && m_sourceOrder.front()->ast->experimentalSolidity();
+
 		SyntaxChecker syntaxChecker(m_errorReporter, m_optimiserSettings.runYulOptimiser);
 		for (Source const* source: m_sourceOrder)
 			if (source->ast && !syntaxChecker.checkSyntax(*source->ast))
@@ -480,154 +485,182 @@ bool CompilerStack::analyze()
 			if (source->ast && !resolver.resolveNamesAndTypes(*source->ast))
 				return false;
 
-		DeclarationTypeChecker declarationTypeChecker(m_errorReporter, m_evmVersion);
+		if (experimentalSolidity)
+		{
+			if (!analyzeExperimental())
+				noErrors = false;
+		}
+		else if (!analyzeLegacy(noErrors))
+			noErrors = false;
+	}
+	catch (FatalError const&)
+	{
+		if (m_errorReporter.errors().empty())
+			throw; // Something is weird here, rather throw again.
+		noErrors = false;
+	}
+
+	if (!noErrors)
+		return false;
+
+	m_stackState = AnalysisSuccessful;
+	return true;
+}
+
+
+bool CompilerStack::analyzeLegacy(bool _noErrorsSoFar)
+{
+	bool noErrors = _noErrorsSoFar;
+
+	DeclarationTypeChecker declarationTypeChecker(m_errorReporter, m_evmVersion);
+	for (Source const* source: m_sourceOrder)
+		if (source->ast && !declarationTypeChecker.check(*source->ast))
+			return false;
+
+	// Requires DeclarationTypeChecker to have run
+	DocStringTagParser docStringTagParser(m_errorReporter);
+	for (Source const* source: m_sourceOrder)
+		if (source->ast && !docStringTagParser.validateDocStringsUsingTypes(*source->ast))
+			noErrors = false;
+
+	// Next, we check inheritance, overrides, function collisions and other things at
+	// contract or function level.
+	// This also calculates whether a contract is abstract, which is needed by the
+	// type checker.
+	ContractLevelChecker contractLevelChecker(m_errorReporter);
+
+	for (Source const* source: m_sourceOrder)
+		if (auto sourceAst = source->ast)
+			noErrors = contractLevelChecker.check(*sourceAst);
+
+	// Now we run full type checks that go down to the expression level. This
+	// cannot be done earlier, because we need cross-contract types and information
+	// about whether a contract is abstract for the `new` expression.
+	// This populates the `type` annotation for all expressions.
+	//
+	// Note: this does not resolve overloaded functions. In order to do that, types of arguments are needed,
+	// which is only done one step later.
+	TypeChecker typeChecker(m_evmVersion, m_errorReporter);
+	for (Source const* source: m_sourceOrder)
+		if (source->ast && !typeChecker.checkTypeRequirements(*source->ast))
+			noErrors = false;
+
+	if (noErrors)
+	{
+		// Requires ContractLevelChecker and TypeChecker
+		DocStringAnalyser docStringAnalyser(m_errorReporter);
 		for (Source const* source: m_sourceOrder)
-			if (source->ast && !declarationTypeChecker.check(*source->ast))
-				return false;
+			if (source->ast && !docStringAnalyser.analyseDocStrings(*source->ast))
+				noErrors = false;
+	}
 
-		// Requires DeclarationTypeChecker to have run
+	if (noErrors)
+	{
+		// Checks that can only be done when all types of all AST nodes are known.
+		PostTypeChecker postTypeChecker(m_errorReporter);
 		for (Source const* source: m_sourceOrder)
-			if (source->ast && !docStringTagParser.validateDocStringsUsingTypes(*source->ast))
+			if (source->ast && !postTypeChecker.check(*source->ast))
 				noErrors = false;
+		if (!postTypeChecker.finalize())
+			noErrors = false;
+	}
 
-		// Next, we check inheritance, overrides, function collisions and other things at
-		// contract or function level.
-		// This also calculates whether a contract is abstract, which is needed by the
-		// type checker.
-		ContractLevelChecker contractLevelChecker(m_errorReporter);
+	// Create & assign callgraphs and check for contract dependency cycles
+	if (noErrors)
+	{
+		createAndAssignCallGraphs();
+		annotateInternalFunctionIDs();
+		findAndReportCyclicContractDependencies();
+	}
 
+	if (noErrors)
 		for (Source const* source: m_sourceOrder)
-			if (auto sourceAst = source->ast)
-				noErrors = contractLevelChecker.check(*sourceAst);
-
-		// Now we run full type checks that go down to the expression level. This
-		// cannot be done earlier, because we need cross-contract types and information
-		// about whether a contract is abstract for the `new` expression.
-		// This populates the `type` annotation for all expressions.
-		//
-		// Note: this does not resolve overloaded functions. In order to do that, types of arguments are needed,
-		// which is only done one step later.
-		TypeChecker typeChecker(m_evmVersion, m_errorReporter);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !typeChecker.checkTypeRequirements(*source->ast))
+			if (source->ast && !PostTypeContractLevelChecker{m_errorReporter}.check(*source->ast))
 				noErrors = false;
 
-		if (noErrors)
-		{
-			// Requires ContractLevelChecker and TypeChecker
-			DocStringAnalyser docStringAnalyser(m_errorReporter);
-			for (Source const* source: m_sourceOrder)
-				if (source->ast && !docStringAnalyser.analyseDocStrings(*source->ast))
-					noErrors = false;
-		}
+	// Check that immutable variables are never read in c'tors and assigned
+	// exactly once
+	if (noErrors)
+		for (Source const* source: m_sourceOrder)
+			if (source->ast)
+				for (ASTPointer<ASTNode> const& node: source->ast->nodes())
+					if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
+						ImmutableValidator(m_errorReporter, *contract).analyze();
 
-		if (noErrors)
-		{
-			// Checks that can only be done when all types of all AST nodes are known.
-			PostTypeChecker postTypeChecker(m_errorReporter);
-			for (Source const* source: m_sourceOrder)
-				if (source->ast && !postTypeChecker.check(*source->ast))
-					noErrors = false;
-			if (!postTypeChecker.finalize())
+	if (noErrors)
+	{
+		// Control flow graph generator and analyzer. It can check for issues such as
+		// variable is used before it is assigned to.
+		CFG cfg(m_errorReporter);
+		for (Source const* source: m_sourceOrder)
+			if (source->ast && !cfg.constructFlow(*source->ast))
 				noErrors = false;
-		}
 
-		// Create & assign callgraphs and check for contract dependency cycles
 		if (noErrors)
 		{
-			createAndAssignCallGraphs();
-			annotateInternalFunctionIDs();
-			findAndReportCyclicContractDependencies();
+			ControlFlowRevertPruner pruner(cfg);
+			pruner.run();
+
+			ControlFlowAnalyzer controlFlowAnalyzer(cfg, m_errorReporter);
+			if (!controlFlowAnalyzer.run())
+				noErrors = false;
 		}
+	}
 
-		if (noErrors)
-			for (Source const* source: m_sourceOrder)
-				if (source->ast && !PostTypeContractLevelChecker{m_errorReporter}.check(*source->ast))
-					noErrors = false;
+	if (noErrors)
+	{
+		// Checks for common mistakes. Only generates warnings.
+		StaticAnalyzer staticAnalyzer(m_errorReporter);
+		for (Source const* source: m_sourceOrder)
+			if (source->ast && !staticAnalyzer.analyze(*source->ast))
+				noErrors = false;
+	}
 
-		// Check that immutable variables are never read in c'tors and assigned
-		// exactly once
-		if (noErrors)
-			for (Source const* source: m_sourceOrder)
-				if (source->ast)
-					for (ASTPointer<ASTNode> const& node: source->ast->nodes())
-						if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
-							ImmutableValidator(m_errorReporter, *contract).analyze();
+	if (noErrors)
+	{
+		// Check for state mutability in every function.
+		std::vector<ASTPointer<ASTNode>> ast;
+		for (Source const* source: m_sourceOrder)
+			if (source->ast)
+				ast.push_back(source->ast);
 
-		if (noErrors)
-		{
-			// Control flow graph generator and analyzer. It can check for issues such as
-			// variable is used before it is assigned to.
-			CFG cfg(m_errorReporter);
-			for (Source const* source: m_sourceOrder)
-				if (source->ast && !cfg.constructFlow(*source->ast))
-					noErrors = false;
-
-			if (noErrors)
-			{
-				ControlFlowRevertPruner pruner(cfg);
-				pruner.run();
+		if (!ViewPureChecker(ast, m_errorReporter).check())
+			noErrors = false;
+	}
 
-				ControlFlowAnalyzer controlFlowAnalyzer(cfg, m_errorReporter);
-				if (!controlFlowAnalyzer.run())
-					noErrors = false;
-			}
-		}
+	if (noErrors)
+	{
+		// Run SMTChecker
 
-		if (noErrors)
-		{
-			// Checks for common mistakes. Only generates warnings.
-			StaticAnalyzer staticAnalyzer(m_errorReporter);
-			for (Source const* source: m_sourceOrder)
-				if (source->ast && !staticAnalyzer.analyze(*source->ast))
-					noErrors = false;
-		}
+		auto allSources = util::applyMap(m_sourceOrder, [](Source const* _source) { return _source->ast; });
+		if (ModelChecker::isPragmaPresent(allSources))
+			m_modelCheckerSettings.engine = ModelCheckerEngine::All();
 
-		if (noErrors)
-		{
-			// Check for state mutability in every function.
-			std::vector<ASTPointer<ASTNode>> ast;
-			for (Source const* source: m_sourceOrder)
-				if (source->ast)
-					ast.push_back(source->ast);
-
-			if (!ViewPureChecker(ast, m_errorReporter).check())
-				noErrors = false;
-		}
+		// m_modelCheckerSettings is spread to engines and solver interfaces,
+		// so we need to check whether the enabled ones are available before building the classes.
+		if (m_modelCheckerSettings.engine.any())
+			m_modelCheckerSettings.solvers = ModelChecker::checkRequestedSolvers(m_modelCheckerSettings.solvers, m_errorReporter);
 
-		if (noErrors)
-		{
-			// Run SMTChecker
-
-			auto allSources = util::applyMap(m_sourceOrder, [](Source const* _source) { return _source->ast; });
-			if (ModelChecker::isPragmaPresent(allSources))
-				m_modelCheckerSettings.engine = ModelCheckerEngine::All();
-
-			// m_modelCheckerSettings is spread to engines and solver interfaces,
-			// so we need to check whether the enabled ones are available before building the classes.
-			if (m_modelCheckerSettings.engine.any())
-				m_modelCheckerSettings.solvers = ModelChecker::checkRequestedSolvers(m_modelCheckerSettings.solvers, m_errorReporter);
-
-			ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile);
-			modelChecker.checkRequestedSourcesAndContracts(allSources);
-			for (Source const* source: m_sourceOrder)
-				if (source->ast)
-					modelChecker.analyze(*source->ast);
-			m_unhandledSMTLib2Queries += modelChecker.unhandledQueries();
-		}
-	}
-	catch (FatalError const&)
-	{
-		if (m_errorReporter.errors().empty())
-			throw; // Something is weird here, rather throw again.
-		noErrors = false;
+		ModelChecker modelChecker(m_errorReporter, *this, m_smtlib2Responses, m_modelCheckerSettings, m_readFile);
+		modelChecker.checkRequestedSourcesAndContracts(allSources);
+		for (Source const* source: m_sourceOrder)
+			if (source->ast)
+				modelChecker.analyze(*source->ast);
+		m_unhandledSMTLib2Queries += modelChecker.unhandledQueries();
 	}
 
-	if (!noErrors)
-		return false;
+	return noErrors;
+}
 
-	m_stackState = AnalysisSuccessful;
-	return true;
+bool CompilerStack::analyzeExperimental()
+{
+	solAssert(!m_experimentalAnalysis);
+	m_experimentalAnalysis = std::make_unique<experimental::Analysis>(m_errorReporter);
+	std::vector<std::shared_ptr<SourceUnit const>> sourceAsts;
+	for (Source const* source: m_sourceOrder)
+		if (source->ast)
+			sourceAsts.emplace_back(source->ast);
+	return m_experimentalAnalysis->check(sourceAsts);
 }
 
 bool CompilerStack::parseAndAnalyze(State _stopAfter)
@@ -694,7 +727,11 @@ bool CompilerStack::compile(State _stopAfter)
 							if (m_viaIR)
 								generateEVMFromIR(*contract);
 							else
+							{
+								if (m_experimentalAnalysis)
+									solThrow(CompilerError, "Legacy codegen after experimental analysis is unsupported.");
 								compileContract(*contract, otherCompilers);
+							}
 						}
 					}
 					catch (Error const& _error)
@@ -1429,6 +1466,9 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 {
 	solAssert(m_stackState >= AnalysisSuccessful, "");
 
+	if (m_experimentalAnalysis)
+		solThrow(CompilerError, "IR codegen after experimental analysis is unsupported.");
+
 	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
 	if (!compiledContract.yulIR.empty())
 		return;
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 0227896ae0..06c78b6860 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -81,6 +81,10 @@ class Compiler;
 class GlobalContext;
 class Natspec;
 class DeclarationContainer;
+namespace experimental
+{
+class Analysis;
+}
 
 /**
  * Easy to use and self-contained Solidity compiler with as few header dependencies as possible.
@@ -407,6 +411,14 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// @returns true if the contract is requested to be compiled.
 	bool isRequestedContract(ContractDefinition const& _contract) const;
 
+	/// Perform the analysis steps of legacy language mode.
+	/// @returns false on error.
+	bool analyzeLegacy(bool _noErrorsSoFar);
+
+	/// Perform the analysis steps of experimental language mode.
+	/// @returns false on error.
+	bool analyzeExperimental();
+
 	/// Assembles the contract.
 	/// This function should only be internally called by compileContract and generateEVMFromIR.
 	void assembleYul(
@@ -500,6 +512,7 @@ class CompilerStack: public langutil::CharStreamProvider
 
 	langutil::ErrorList m_errorList;
 	langutil::ErrorReporter m_errorReporter;
+	std::unique_ptr<experimental::Analysis> m_experimentalAnalysis;
 	bool m_metadataLiteralSources = false;
 	MetadataHash m_metadataHash = MetadataHash::IPFS;
 	langutil::DebugInfoSelection m_debugInfoSelection = langutil::DebugInfoSelection::Default();
diff --git a/libyul/AsmParser.cpp b/libyul/AsmParser.cpp
index b31e105724..5d3ec84a4b 100644
--- a/libyul/AsmParser.cpp
+++ b/libyul/AsmParser.cpp
@@ -115,8 +115,9 @@ std::unique_ptr<Block> Parser::parseInline(std::shared_ptr<Scanner> const& _scan
 {
 	m_recursionDepth = 0;
 
+	auto previousScannerKind = _scanner->scannerKind();
 	_scanner->setScannerMode(ScannerKind::Yul);
-	ScopeGuard resetScanner([&]{ _scanner->setScannerMode(ScannerKind::Solidity); });
+	ScopeGuard resetScanner([&]{ _scanner->setScannerMode(previousScannerKind); });
 
 	try
 	{
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity.json b/test/libsolidity/ASTJSON/pragma_experimental_solidity.json
deleted file mode 100644
index 66ece94e08..0000000000
--- a/test/libsolidity/ASTJSON/pragma_experimental_solidity.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "absolutePath": "a",
-  "experimentalSolidity": true,
-  "exportedSymbols": {},
-  "id": 2,
-  "nodeType": "SourceUnit",
-  "nodes":
-  [
-    {
-      "id": 1,
-      "literals":
-      [
-        "experimental",
-        "solidity"
-      ],
-      "nodeType": "PragmaDirective",
-      "src": "0:29:1"
-    }
-  ],
-  "src": "0:70:1"
-}
diff --git a/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol b/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
index b902bb061d..bb5b771a6c 100644
--- a/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
+++ b/test/libsolidity/ASTJSON/pragma_experimental_solidity.sol
@@ -2,3 +2,4 @@ pragma experimental solidity;
 // ====
 // EVMVersion: >=constantinople
 // ----
+// failAfter: Parsed
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
index beec24c1e4..7a6f791516 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
@@ -6,3 +6,4 @@ import std.stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
index 85d3a4ac7b..d6662a14a0 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
@@ -6,3 +6,4 @@ import std.stub as stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
index 7e51a73b10..c5f6550aab 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
@@ -6,3 +6,4 @@ import { identity } from std.stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
index 3c4ff41d6c..5aa043746d 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
@@ -6,3 +6,4 @@ import * as stub from std.stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol b/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
index b6f871d87f..285c76ed30 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
+++ b/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
@@ -3,3 +3,4 @@ pragma experimental solidity;
 // EVMVersion: >=constantinople
 // ----
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.

From 91cc72bcd457646253ac859a882f1fae699d053a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 31 Jul 2023 19:52:27 +0200
Subject: [PATCH 1592/1748] NatspecJSONTest based on SyntaxTest

---
 test/CMakeLists.txt                  |   2 +
 test/InteractiveTests.h              |   2 +
 test/libsolidity/NatspecJSONTest.cpp | 210 +++++++++++++++++++++++++++
 test/libsolidity/NatspecJSONTest.h   |  82 +++++++++++
 test/tools/CMakeLists.txt            |   1 +
 5 files changed, 297 insertions(+)
 create mode 100644 test/libsolidity/NatspecJSONTest.cpp
 create mode 100644 test/libsolidity/NatspecJSONTest.h

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 119104aca6..b3b6789831 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -84,6 +84,8 @@ set(libsolidity_sources
     libsolidity/Metadata.cpp
     libsolidity/MemoryGuardTest.cpp
     libsolidity/MemoryGuardTest.h
+    libsolidity/NatspecJSONTest.cpp
+    libsolidity/NatspecJSONTest.h
     libsolidity/SemanticTest.cpp
     libsolidity/SemanticTest.h
     libsolidity/SemVerMatcher.cpp
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
index 01e47afe00..5021d801b3 100644
--- a/test/InteractiveTests.h
+++ b/test/InteractiveTests.h
@@ -24,6 +24,7 @@
 #include <test/libsolidity/ASTPropertyTest.h>
 #include <test/libsolidity/GasTest.h>
 #include <test/libsolidity/MemoryGuardTest.h>
+#include <test/libsolidity/NatspecJSONTest.h>
 #include <test/libsolidity/SyntaxTest.h>
 #include <test/libsolidity/SemanticTest.h>
 #include <test/libsolidity/SMTCheckerTest.h>
@@ -74,6 +75,7 @@ Testsuite const g_interactiveTestsuites[] = {
 	{"Semantic",               "libsolidity", "semanticTests",         false, true,  &SemanticTest::create},
 	{"JSON AST",               "libsolidity", "ASTJSON",               false, false, &ASTJSONTest::create},
 	{"JSON ABI",               "libsolidity", "ABIJson",               false, false, &ABIJsonTest::create},
+	{"JSON Natspec",           "libsolidity", "natspecJSON",           false, false, &NatspecJSONTest::create},
 	{"SMT Checker",            "libsolidity", "smtCheckerTests",       true,  false, &SMTCheckerTest::create},
 	{"Gas Estimates",          "libsolidity", "gasTests",              false, false, &GasTest::create},
 	{"Memory Guard",           "libsolidity", "memoryGuardTests",      false, false, &MemoryGuardTest::create},
diff --git a/test/libsolidity/NatspecJSONTest.cpp b/test/libsolidity/NatspecJSONTest.cpp
new file mode 100644
index 0000000000..434d5b392b
--- /dev/null
+++ b/test/libsolidity/NatspecJSONTest.cpp
@@ -0,0 +1,210 @@
+/*
+	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/>.
+ */
+/**
+ * Unit tests for the solidity compiler ABI JSON Interface output.
+ */
+
+#include <test/libsolidity/NatspecJSONTest.h>
+
+#include <libsolutil/CommonIO.h>
+#include <libsolutil/StringUtils.h>
+
+#include <boost/algorithm/string/predicate.hpp>
+
+#include <fmt/format.h>
+
+#include <vector>
+
+using namespace std;
+using namespace solidity::frontend::test;
+using namespace solidity::util;
+
+ostream& solidity::frontend::test::operator<<(ostream& _output, NatspecJSONKind _kind)
+{
+	switch (_kind) {
+	case NatspecJSONKind::Devdoc: _output << "devdoc"; break;
+	case NatspecJSONKind::Userdoc: _output << "userdoc"; break;
+	}
+	return _output;
+}
+
+unique_ptr<TestCase> NatspecJSONTest::create(Config const& _config)
+{
+	return make_unique<NatspecJSONTest>(_config.filename, _config.evmVersion);
+}
+
+void NatspecJSONTest::parseCustomExpectations(istream& _stream)
+{
+	soltestAssert(m_expectedNatspecJSON.empty());
+
+	// We expect a series of expectations in the following format:
+	//
+	//     // <qualified contract name> <devdoc|userdoc>
+	//     // <json>
+
+	string line;
+	while (getline(_stream, line))
+	{
+		string_view strippedLine = expectLinePrefix(line);
+		if (strippedLine.empty())
+			continue;
+
+		auto [contractName, kind] = parseExpectationHeader(strippedLine);
+
+		string rawJSON = extractExpectationJSON(_stream);
+		string jsonErrors;
+		Json::Value parsedJSON;
+		bool jsonParsingSuccessful = jsonParseStrict(rawJSON, parsedJSON, &jsonErrors);
+		if (!jsonParsingSuccessful)
+			BOOST_THROW_EXCEPTION(runtime_error(fmt::format(
+				"Malformed JSON in {} expectation for contract {}.\n"
+				"Note that JSON expectations must be pretty-printed to be split correctly. "
+				"The object is assumed to and at the first unindented closing brace.\n"
+				"{}",
+				toString(kind),
+				contractName,
+				rawJSON
+			)));
+
+		m_expectedNatspecJSON[string(contractName)][kind] = parsedJSON;
+	}
+}
+
+bool NatspecJSONTest::expectationsMatch()
+{
+	// NOTE: Comparing pretty printed Json::Values to avoid using its operator==, which fails to
+	// compare equal numbers as equal. For example, for 'version' field the value is sometimes int,
+	// sometimes uint and they compare as different even when both are 1.
+	return
+		SyntaxTest::expectationsMatch() &&
+		prettyPrinted(obtainedNatspec()) == prettyPrinted(m_expectedNatspecJSON);
+}
+
+void NatspecJSONTest::printExpectedResult(ostream& _stream, string const& _linePrefix, bool _formatted) const
+{
+	SyntaxTest::printExpectedResult(_stream, _linePrefix, _formatted);
+	if (!m_expectedNatspecJSON.empty())
+	{
+		_stream << _linePrefix << "----" << endl;
+		printIndented(_stream, formatNatspecExpectations(m_expectedNatspecJSON), _linePrefix);
+	}
+}
+
+void NatspecJSONTest::printObtainedResult(ostream& _stream, string const& _linePrefix, bool _formatted) const
+{
+	SyntaxTest::printObtainedResult(_stream, _linePrefix, _formatted);
+
+	NatspecMap natspecJSON = obtainedNatspec();
+	if (!natspecJSON.empty())
+	{
+		_stream << _linePrefix << "----" << endl;
+		// TODO: Diff both versions and highlight differences.
+		// We should have a helper for doing that in newly defined test cases without much effort.
+		printIndented(_stream, formatNatspecExpectations(natspecJSON), _linePrefix);
+	}
+}
+
+tuple<string_view, NatspecJSONKind> NatspecJSONTest::parseExpectationHeader(string_view _line)
+{
+	for (NatspecJSONKind kind: {NatspecJSONKind::Devdoc, NatspecJSONKind::Userdoc})
+	{
+		string kindSuffix = " " + toString(kind);
+		if (boost::algorithm::ends_with(_line, kindSuffix))
+			return {_line.substr(0, _line.size() - kindSuffix.size()), kind};
+	}
+
+	BOOST_THROW_EXCEPTION(runtime_error(
+		"Natspec kind (devdoc/userdoc) not present in the expectation: "s.append(_line)
+	));
+}
+
+string NatspecJSONTest::extractExpectationJSON(istream& _stream)
+{
+	string rawJSON;
+	string line;
+	while (getline(_stream, line))
+	{
+		string_view strippedLine = expectLinePrefix(line);
+		rawJSON += strippedLine;
+		rawJSON += "\n";
+
+		if (boost::algorithm::starts_with(strippedLine, "}"))
+			break;
+	}
+
+	return rawJSON;
+}
+
+string_view NatspecJSONTest::expectLinePrefix(string_view _line)
+{
+	size_t startPosition = 0;
+	if (!boost::algorithm::starts_with(_line, "//"))
+		BOOST_THROW_EXCEPTION(runtime_error(
+			"Expectation line is not a comment: "s.append(_line)
+		));
+
+	startPosition += 2;
+	if (startPosition < _line.size() && _line[startPosition] == ' ')
+		++startPosition;
+
+	return _line.substr(startPosition, _line.size() - startPosition);
+}
+
+string NatspecJSONTest::formatNatspecExpectations(NatspecMap const& _expectations) const
+{
+	string output;
+	bool first = true;
+	// NOTE: Not sorting explicitly because CompilerStack seems to put contracts roughly in the
+	// order in which they appear in the source, which is much better than alphabetical order.
+	for (auto const& [contractName, expectationsForAllKinds]: _expectations)
+		for (auto const& [jsonKind, natspecJSON]: expectationsForAllKinds)
+		{
+			if (!first)
+				output += "\n\n";
+			first = false;
+
+			output += contractName + " " + toString(jsonKind) + "\n";
+			output += jsonPrint(natspecJSON, {JsonFormat::Pretty, 4});
+		}
+
+	return output;
+}
+
+NatspecMap NatspecJSONTest::obtainedNatspec() const
+{
+	if (compiler().state() < CompilerStack::AnalysisSuccessful)
+		return {};
+
+	NatspecMap result;
+	for (string contractName: compiler().contractNames())
+	{
+		result[contractName][NatspecJSONKind::Devdoc]  = compiler().natspecDev(contractName);
+		result[contractName][NatspecJSONKind::Userdoc] = compiler().natspecUser(contractName);
+	}
+
+	return result;
+}
+
+SerializedNatspecMap NatspecJSONTest::prettyPrinted(NatspecMap const& _expectations) const
+{
+	SerializedNatspecMap result;
+	for (auto const& [contractName, expectationsForAllKinds]: _expectations)
+		for (auto const& [jsonKind, natspecJSON]: expectationsForAllKinds)
+			result[contractName][jsonKind] = jsonPrint(natspecJSON, {JsonFormat::Pretty, 4});
+
+	return result;
+}
diff --git a/test/libsolidity/NatspecJSONTest.h b/test/libsolidity/NatspecJSONTest.h
new file mode 100644
index 0000000000..762b88d106
--- /dev/null
+++ b/test/libsolidity/NatspecJSONTest.h
@@ -0,0 +1,82 @@
+/*
+	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
+/**
+ * Unit tests for the Natspec userdoc and devdoc JSON output.
+ */
+
+#pragma once
+
+#include <test/libsolidity/SyntaxTest.h>
+
+#include <libsolutil/JSON.h>
+
+#include <istream>
+#include <map>
+#include <memory>
+#include <ostream>
+#include <string>
+#include <string_view>
+#include <tuple>
+
+namespace solidity::frontend::test
+{
+
+enum class NatspecJSONKind
+{
+	Devdoc,
+	Userdoc,
+};
+
+std::ostream& operator<<(std::ostream& _output, NatspecJSONKind _kind);
+
+using NatspecMap = std::map<std::string, std::map<NatspecJSONKind, Json::Value>>;
+using SerializedNatspecMap = std::map<std::string, std::map<NatspecJSONKind, std::string>>;
+
+class NatspecJSONTest: public SyntaxTest
+{
+public:
+
+	static std::unique_ptr<TestCase> create(Config const& _config);
+
+	NatspecJSONTest(std::string const& _filename, langutil::EVMVersion _evmVersion):
+		SyntaxTest(
+			_filename,
+			_evmVersion,
+			langutil::Error::Severity::Error // _minSeverity
+		)
+	{}
+
+protected:
+	void parseCustomExpectations(std::istream& _stream) override;
+	bool expectationsMatch() override;
+	void printExpectedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const override;
+	void printObtainedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const override;
+
+	NatspecMap m_expectedNatspecJSON;
+
+private:
+	static std::tuple<std::string_view, NatspecJSONKind> parseExpectationHeader(std::string_view _line);
+	static std::string extractExpectationJSON(std::istream& _stream);
+	static std::string_view expectLinePrefix(std::string_view _line);
+
+	std::string formatNatspecExpectations(NatspecMap const& _expectations) const;
+	SerializedNatspecMap prettyPrinted(NatspecMap const& _expectations) const;
+	NatspecMap obtainedNatspec() const;
+};
+
+}
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index 2e57718bda..a86e6382df 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -25,6 +25,7 @@ add_executable(isoltest
 	../libsolidity/util/TestFunctionCall.cpp
 	../libsolidity/GasTest.cpp
 	../libsolidity/MemoryGuardTest.cpp
+	../libsolidity/NatspecJSONTest.cpp
 	../libsolidity/SyntaxTest.cpp
 	../libsolidity/SemanticTest.cpp
 	../libsolidity/AnalysisFramework.cpp

From 1041f071f0f0709b93360b40e636c222e6289f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 9 Aug 2023 17:42:41 +0200
Subject: [PATCH 1593/1748] SolidityNatspecJSON: A few tweaks and small fixes
 before automatic conversion

- Expectation order matching the order of contracts in the source
- Typos in test names
- Redundant prefixes in test names
- Wrong 'king' in some expectations (it's not checked by the test suite)
---
 test/libsolidity/SolidityNatspecJSON.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index 9ecd35aeff..eaf707f31b 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -788,7 +788,7 @@ BOOST_AUTO_TEST_CASE(emit_same_signature_event_different_libraries)
 				"details": "This should not appear in Contract C dev doc"
 			}
 		},
-		"kind": "user",
+		"kind": "dev",
 		"methods": {},
 		"version": 1
 	}
@@ -1042,9 +1042,9 @@ BOOST_AUTO_TEST_CASE(event_inheritance_interface)
 		"methods": {}
 	}
 	)ABCDEF";
-	checkNatspec(sourceCode, "ERC20", devDoc, false);
 	checkNatspec(sourceCode, "A", devDoc, false);
 	checkNatspec(sourceCode, "B", devDoc, false);
+	checkNatspec(sourceCode, "ERC20", devDoc, false);
 
 	char const* userDoc = R"ABCDEF(
 	{
@@ -1058,9 +1058,9 @@ BOOST_AUTO_TEST_CASE(event_inheritance_interface)
 		"methods": {}
 	}
 	)ABCDEF";
-	checkNatspec(sourceCode, "ERC20", userDoc, true);
 	checkNatspec(sourceCode, "A", userDoc, true);
 	checkNatspec(sourceCode, "B", userDoc, true);
+	checkNatspec(sourceCode, "ERC20", userDoc, true);
 }
 
 BOOST_AUTO_TEST_CASE(event_inheritance)
@@ -1098,9 +1098,9 @@ BOOST_AUTO_TEST_CASE(event_inheritance)
 		"methods": {}
 	}
 	)ABCDEF";
-	checkNatspec(sourceCode, "ERC20", devDoc, false);
 	checkNatspec(sourceCode, "A", devDoc, false);
 	checkNatspec(sourceCode, "B", devDoc, false);
+	checkNatspec(sourceCode, "ERC20", devDoc, false);
 
 	char const* userDoc = R"ABCDEF(
 	{
@@ -1114,9 +1114,9 @@ BOOST_AUTO_TEST_CASE(event_inheritance)
 		"methods": {}
 	}
 	)ABCDEF";
-	checkNatspec(sourceCode, "ERC20", userDoc, true);
 	checkNatspec(sourceCode, "A", userDoc, true);
 	checkNatspec(sourceCode, "B", userDoc, true);
+	checkNatspec(sourceCode, "ERC20", userDoc, true);
 }
 
 BOOST_AUTO_TEST_CASE(dev_desc_after_nl)
@@ -1578,7 +1578,7 @@ BOOST_AUTO_TEST_CASE(dev_multiline_comment)
 	checkNatspec(sourceCode, "test", natspec, false);
 }
 
-BOOST_AUTO_TEST_CASE(dev_documenting_no_return_paramname)
+BOOST_AUTO_TEST_CASE(dev_documenting_no_return_param_name)
 {
 	char const* sourceCode = R"(
 		contract test {
@@ -1721,7 +1721,7 @@ BOOST_AUTO_TEST_CASE(enum_no_docs)
 	checkNatspec(sourceCode, "C", userDoc, true);
 }
 
-BOOST_AUTO_TEST_CASE(natspec_notice_without_tag)
+BOOST_AUTO_TEST_CASE(notice_without_tag)
 {
 	char const* sourceCode = R"(
 		contract test {
@@ -1745,7 +1745,7 @@ BOOST_AUTO_TEST_CASE(natspec_notice_without_tag)
 	checkNatspec(sourceCode, "test", natspec, true);
 }
 
-BOOST_AUTO_TEST_CASE(natspec_multiline_notice_without_tag)
+BOOST_AUTO_TEST_CASE(multiline_notice_without_tag)
 {
 	char const* sourceCode = R"(
 		contract test {
@@ -1815,7 +1815,7 @@ BOOST_AUTO_TEST_CASE(dev_documenting_nonexistent_param)
 	expectNatspecError(sourceCode);
 }
 
-BOOST_AUTO_TEST_CASE(dev_documenting_no_paramname)
+BOOST_AUTO_TEST_CASE(dev_documenting_no_param_name)
 {
 	char const* sourceCode = R"(
 		contract test {
@@ -1829,7 +1829,7 @@ BOOST_AUTO_TEST_CASE(dev_documenting_no_paramname)
 	expectNatspecError(sourceCode);
 }
 
-BOOST_AUTO_TEST_CASE(dev_documenting_no_paramname_end)
+BOOST_AUTO_TEST_CASE(dev_documenting_no_param_name_end)
 {
 	char const* sourceCode = R"(
 		contract test {
@@ -2771,7 +2771,7 @@ BOOST_AUTO_TEST_CASE(user_inherit_parameter_mismatch)
 	checkNatspec(sourceCode, "Token", natspec2, true);
 }
 
-BOOST_AUTO_TEST_CASE(dev_explicit_inehrit_complex)
+BOOST_AUTO_TEST_CASE(dev_explicit_inherit_complex)
 {
 	char const *sourceCode1 = R"(
 		interface ERC20 {

From ba019e5a0106702050e149d3042353b4736ae836 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 10 Aug 2023 16:43:18 +0200
Subject: [PATCH 1594/1748] SolidityNatspecJSON: Manual conversion of two test
 cases that would not be handled correctly by the script

- dev_multiple_params_mixed_whitespace has whitespace that is not completely preserved
- dev_explicit_inherit_complex is a multi-file test
---
 test/libsolidity/SolidityNatspecJSON.cpp      | 94 -------------------
 .../dev_explicit_inherit_complex.sol          | 45 +++++++++
 .../dev_multiple_params_mixed_whitespace.sol  | 24 +++++
 3 files changed, 69 insertions(+), 94 deletions(-)
 create mode 100644 test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol

diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
index eaf707f31b..fd0ffd0fda 100644
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ b/test/libsolidity/SolidityNatspecJSON.cpp
@@ -1170,29 +1170,6 @@ BOOST_AUTO_TEST_CASE(dev_multiple_params)
 	checkNatspec(sourceCode, "test", natspec, false);
 }
 
-BOOST_AUTO_TEST_CASE(dev_multiple_params_mixed_whitespace)
-{
-	char const* sourceCode = "contract test {\n"
-	"  /// @dev	 Multiplies a number by 7 and adds second parameter\n"
-	"  /// @param 	 a Documentation for the first parameter\n"
-	"  /// @param	 second			 Documentation for the second parameter\n"
-	"  function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }\n"
-	"}\n";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
 BOOST_AUTO_TEST_CASE(dev_mutiline_param_description)
 {
 	char const* sourceCode = R"(
@@ -2771,77 +2748,6 @@ BOOST_AUTO_TEST_CASE(user_inherit_parameter_mismatch)
 	checkNatspec(sourceCode, "Token", natspec2, true);
 }
 
-BOOST_AUTO_TEST_CASE(dev_explicit_inherit_complex)
-{
-	char const *sourceCode1 = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		interface ERC21 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test2
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-	)";
-
-	char const *sourceCode2 = R"(
-		import "Interfaces.sol" as myInterfaces;
-
-		contract Token is myInterfaces.ERC20, myInterfaces.ERC21 {
-			/// @inheritdoc myInterfaces.ERC20
-			function transfer(address too, uint amount)
-				override(myInterfaces.ERC20, myInterfaces.ERC21) external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"details": "test",
-				"params":
-				{
-					"amount": "amount to transfer",
-					"to": "address to transfer to"
-				}
-			}
-		}
-	})ABCDEF";
-
-	m_compilerStack.reset();
-	m_compilerStack.setSources({
-		{"Interfaces.sol", "pragma solidity >=0.0;\n" + std::string(sourceCode1)},
-		{"Testfile.sol", "pragma solidity >=0.0;\n" + std::string(sourceCode2)}
-	});
-
-	m_compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-
-	BOOST_REQUIRE_MESSAGE(m_compilerStack.parseAndAnalyze(), "Parsing contract failed");
-
-	Json::Value generatedDocumentation = m_compilerStack.natspecDev("Token");
-	Json::Value expectedDocumentation;
-	util::jsonParseStrict(natspec, expectedDocumentation);
-
-	expectedDocumentation["version"] = Json::Value(Natspec::c_natspecVersion);
-	expectedDocumentation["kind"] = Json::Value("dev");
-
-	BOOST_CHECK_MESSAGE(
-		expectedDocumentation == generatedDocumentation,
-		"Expected:\n" << util::jsonPrettyPrint(expectedDocumentation) <<
-		"\n but got:\n" << util::jsonPrettyPrint(generatedDocumentation)
-	);
-}
-
 BOOST_AUTO_TEST_CASE(dev_different_return_name)
 {
 	char const *sourceCode = R"(
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
new file mode 100644
index 0000000000..02a0f2cc72
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
@@ -0,0 +1,45 @@
+==== Source: Interfaces.sol ====
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+interface ERC21 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test2
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+==== Source: Testfile.sol ====
+import "Interfaces.sol" as myInterfaces;
+
+contract Token is myInterfaces.ERC20, myInterfaces.ERC21 {
+    /// @inheritdoc myInterfaces.ERC20
+    function transfer(address too, uint amount)
+        override(myInterfaces.ERC20, myInterfaces.ERC21) external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// Testfile.sol:Token devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
new file mode 100644
index 0000000000..50fb4d53b9
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
@@ -0,0 +1,24 @@
+contract test {
+  /// @dev	 Multiplies a number by 7 and adds second parameter
+  /// @param 	 a Documentation for the first parameter
+  /// @param	 second			 Documentation for the second parameter
+  function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter",
+//                 "second": "Documentation for the second parameter"
+//             }
+//         }
+//     }
+// }

From 99bfdf930a8ae7900f0f7d04a01aee1dd9e1774c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 9 Aug 2023 18:16:14 +0200
Subject: [PATCH 1595/1748] SolidityNatspecJSON: Convert Boost-based test cases
 into natspectJSON/*.sol tests

---
 test/CMakeLists.txt                           |    1 -
 test/libsolidity/SolidityNatspecJSON.cpp      | 3297 -----------------
 test/libsolidity/natspecJSON/custom.sol       |   34 +
 .../natspecJSON/custom_inheritance.sol        |   25 +
 .../natspecJSON/dev_and_user_basic_test.sol   |   29 +
 .../natspecJSON/dev_and_user_no_doc.sol       |   20 +
 .../natspecJSON/dev_author_at_function.sol    |    9 +
 .../natspecJSON/dev_constructor.sol           |   22 +
 .../dev_constructor_and_function.sol          |   44 +
 .../natspecJSON/dev_constructor_return.sol    |    8 +
 .../natspecJSON/dev_contract_doc.sol          |   21 +
 .../natspecJSON/dev_contract_no_doc.sol       |   17 +
 .../natspecJSON/dev_default_inherit.sol       |   72 +
 .../dev_default_inherit_variable.sol          |   36 +
 .../natspecJSON/dev_desc_after_nl.sol         |   25 +
 .../natspecJSON/dev_different_return_name.sol |   38 +
 .../dev_different_return_name_multiple.sol    |   41 +
 ...nt_return_name_multiple_partly_unnamed.sol |   41 +
 ...different_return_name_multiple_unnamed.sol |   41 +
 .../dev_documenting_no_param_description.sol  |    8 +
 .../dev_documenting_no_param_name.sol         |    8 +
 .../dev_documenting_no_param_name_end.sol     |    8 +
 .../dev_documenting_no_return_param_name.sol  |    9 +
 .../dev_documenting_nonexistent_param.sol     |    8 +
 .../natspecJSON/dev_explicit_inherit.sol      |   54 +
 .../natspecJSON/dev_explicit_inherit2.sol     |   70 +
 .../dev_explicit_inherit_partial.sol          |   56 +
 .../dev_explicit_inherit_partial2.sol         |   56 +
 .../dev_explicit_inherit_variable.sol         |   43 +
 .../dev_inherit_parameter_mismatch.sol        |   58 +
 .../natspecJSON/dev_multiline_comment.sol     |   35 +
 .../natspecJSON/dev_multiline_return.sol      |   33 +
 .../natspecJSON/dev_multiple_functions.sol    |   54 +
 .../natspecJSON/dev_multiple_params.sol       |   24 +
 .../dev_mutiline_param_description.sol        |   25 +
 test/libsolidity/natspecJSON/dev_return.sol   |   30 +
 .../natspecJSON/dev_return_desc_after_nl.sol  |   33 +
 .../natspecJSON/dev_return_desc_multiple.sol  |   35 +
 .../dev_return_desc_multiple_unamed.sol       |   35 +
 .../dev_return_desc_multiple_unamed_mixed.sol |   35 +
 ...ev_return_desc_multiple_unamed_mixed_2.sol |   38 +
 .../dev_return_name_no_description.sol        |   38 +
 .../natspecJSON/dev_return_no_params.sol      |   20 +
 .../dev_struct_getter_override.sol            |   47 +
 ...rride_different_return_parameter_names.sol |   47 +
 ..._struct_getter_override_no_return_name.sol |   44 +
 .../dev_title_at_function_error.sol           |    9 +
 .../emit_event_from_foreign_contract.sol      |   41 +
 ...t_from_foreign_contract_no_inheritance.sol |   31 +
 ...m_foreign_contract_with_same_signature.sol |   74 +
 ...me_signature_event_different_libraries.sol |   66 +
 ...nt_different_libraries_missing_natspec.sol |   34 +
 ..._same_signature_event_library_contract.sol |   68 +
 ...event_library_contract_missing_natspec.sol |   53 +
 ...same_signature_event_library_inherited.sol |   46 +
 ...vent_library_inherited_missing_natspec.sol |   30 +
 .../libsolidity/natspecJSON/empty_comment.sol |   10 +
 test/libsolidity/natspecJSON/enum_no_docs.sol |   26 +
 test/libsolidity/natspecJSON/error.sol        |   42 +
 .../natspecJSON/error_multiple.sol            |   66 +
 test/libsolidity/natspecJSON/event.sol        |   40 +
 .../natspecJSON/event_inheritance.sol         |  104 +
 .../event_inheritance_interface.sol           |  104 +
 .../multiline_notice_without_tag.sol          |   18 +
 .../natspecJSON/notice_without_tag.sol        |   17 +
 .../natspecJSON/private_state_variable.sol    |   23 +
 .../natspecJSON/public_state_variable.sol     |   36 +
 .../public_state_variable_struct.sol          |   40 +
 .../public_state_variable_struct_repeated.sol |   13 +
 .../libsolidity/natspecJSON/slash3_slash3.sol |   18 +
 .../libsolidity/natspecJSON/slash3_slash4.sol |   18 +
 test/libsolidity/natspecJSON/slash4.sol       |   11 +
 test/libsolidity/natspecJSON/star3.sol        |   13 +
 .../natspecJSON/struct_no_docs.sol            |   27 +
 .../natspecJSON/user_basic_test.sol           |   17 +
 .../natspecJSON/user_constructor.sol          |   17 +
 .../user_constructor_and_function.sol         |   23 +
 .../natspecJSON/user_default_inherit.sol      |   57 +
 .../user_default_inherit_variable.sol         |   35 +
 .../natspecJSON/user_empty_contract.sol       |    8 +
 .../natspecJSON/user_empty_natspec_test.sol   |   13 +
 .../natspecJSON/user_explicit_inherit.sol     |   44 +
 .../natspecJSON/user_explicit_inherit2.sol    |   55 +
 .../user_explicit_inherit_partial.sol         |   46 +
 .../user_explicit_inherit_partial2.sol        |   46 +
 .../user_explicit_inherit_variable.sol        |   42 +
 .../user_inherit_parameter_mismatch.sol       |   48 +
 .../natspecJSON/user_multiline_comment.sol    |   20 +
 .../user_multiline_empty_lines.sol            |   22 +
 .../natspecJSON/user_multiple_functions.sol   |   37 +
 .../natspecJSON/user_newline_break.sol        |   21 +
 91 files changed, 3103 insertions(+), 3298 deletions(-)
 delete mode 100644 test/libsolidity/SolidityNatspecJSON.cpp
 create mode 100644 test/libsolidity/natspecJSON/custom.sol
 create mode 100644 test/libsolidity/natspecJSON/custom_inheritance.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_and_user_basic_test.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_and_user_no_doc.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_author_at_function.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_constructor.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_constructor_and_function.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_constructor_return.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_contract_doc.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_contract_no_doc.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_default_inherit.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_desc_after_nl.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_different_return_name.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_explicit_inherit.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_multiline_comment.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_multiline_return.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_multiple_functions.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_multiple_params.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_return.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_return_name_no_description.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_return_no_params.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_struct_getter_override.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
 create mode 100644 test/libsolidity/natspecJSON/dev_title_at_function_error.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_event_from_foreign_contract_with_same_signature.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol
 create mode 100644 test/libsolidity/natspecJSON/empty_comment.sol
 create mode 100644 test/libsolidity/natspecJSON/enum_no_docs.sol
 create mode 100644 test/libsolidity/natspecJSON/error.sol
 create mode 100644 test/libsolidity/natspecJSON/error_multiple.sol
 create mode 100644 test/libsolidity/natspecJSON/event.sol
 create mode 100644 test/libsolidity/natspecJSON/event_inheritance.sol
 create mode 100644 test/libsolidity/natspecJSON/event_inheritance_interface.sol
 create mode 100644 test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
 create mode 100644 test/libsolidity/natspecJSON/notice_without_tag.sol
 create mode 100644 test/libsolidity/natspecJSON/private_state_variable.sol
 create mode 100644 test/libsolidity/natspecJSON/public_state_variable.sol
 create mode 100644 test/libsolidity/natspecJSON/public_state_variable_struct.sol
 create mode 100644 test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol
 create mode 100644 test/libsolidity/natspecJSON/slash3_slash3.sol
 create mode 100644 test/libsolidity/natspecJSON/slash3_slash4.sol
 create mode 100644 test/libsolidity/natspecJSON/slash4.sol
 create mode 100644 test/libsolidity/natspecJSON/star3.sol
 create mode 100644 test/libsolidity/natspecJSON/struct_no_docs.sol
 create mode 100644 test/libsolidity/natspecJSON/user_basic_test.sol
 create mode 100644 test/libsolidity/natspecJSON/user_constructor.sol
 create mode 100644 test/libsolidity/natspecJSON/user_constructor_and_function.sol
 create mode 100644 test/libsolidity/natspecJSON/user_default_inherit.sol
 create mode 100644 test/libsolidity/natspecJSON/user_default_inherit_variable.sol
 create mode 100644 test/libsolidity/natspecJSON/user_empty_contract.sol
 create mode 100644 test/libsolidity/natspecJSON/user_empty_natspec_test.sol
 create mode 100644 test/libsolidity/natspecJSON/user_explicit_inherit.sol
 create mode 100644 test/libsolidity/natspecJSON/user_explicit_inherit2.sol
 create mode 100644 test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
 create mode 100644 test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
 create mode 100644 test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
 create mode 100644 test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
 create mode 100644 test/libsolidity/natspecJSON/user_multiline_comment.sol
 create mode 100644 test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
 create mode 100644 test/libsolidity/natspecJSON/user_multiple_functions.sol
 create mode 100644 test/libsolidity/natspecJSON/user_newline_break.sol

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index b3b6789831..f8242db7a2 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -97,7 +97,6 @@ set(libsolidity_sources
     libsolidity/SolidityExecutionFramework.h
     libsolidity/SolidityExpressionCompiler.cpp
     libsolidity/SolidityNameAndTypeResolution.cpp
-    libsolidity/SolidityNatspecJSON.cpp
     libsolidity/SolidityOptimizer.cpp
     libsolidity/SolidityParser.cpp
     libsolidity/SolidityTypes.cpp
diff --git a/test/libsolidity/SolidityNatspecJSON.cpp b/test/libsolidity/SolidityNatspecJSON.cpp
deleted file mode 100644
index fd0ffd0fda..0000000000
--- a/test/libsolidity/SolidityNatspecJSON.cpp
+++ /dev/null
@@ -1,3297 +0,0 @@
-/*
-	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/>.
- */
-/**
- * @author Lefteris Karapetsas <lefteris@ethdev.com>
- * @date 2014
- * Unit tests for the solidity compiler JSON Interface output.
- */
-
-#include <test/Common.h>
-#include <string>
-#include <libsolutil/JSON.h>
-#include <libsolidity/interface/CompilerStack.h>
-#include <liblangutil/Exceptions.h>
-#include <libsolutil/Exceptions.h>
-#include <libsolidity/interface/Natspec.h>
-
-#include <boost/test/unit_test.hpp>
-
-using namespace solidity::langutil;
-
-namespace solidity::frontend::test
-{
-
-class DocumentationChecker
-{
-public:
-	void checkNatspec(
-		std::string const& _code,
-		std::string const& _contractName,
-		std::string const& _expectedDocumentationString,
-		bool _userDocumentation
-	)
-	{
-		m_compilerStack.reset();
-		m_compilerStack.setSources({{"", "pragma solidity >=0.0;\n" + _code}});
-		m_compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-		BOOST_REQUIRE_MESSAGE(m_compilerStack.parseAndAnalyze(), "Parsing contract failed");
-
-		Json::Value generatedDocumentation;
-		if (_userDocumentation)
-			generatedDocumentation = m_compilerStack.natspecUser(_contractName);
-		else
-			generatedDocumentation = m_compilerStack.natspecDev(_contractName);
-		Json::Value expectedDocumentation;
-		std::string parseError;
-		BOOST_REQUIRE_MESSAGE(util::jsonParseStrict(_expectedDocumentationString, expectedDocumentation, &parseError), parseError);
-
-		expectedDocumentation["version"] = Json::Value(Natspec::c_natspecVersion);
-		expectedDocumentation["kind"] = Json::Value(_userDocumentation ? "user" : "dev");
-
-		BOOST_CHECK_MESSAGE(
-			expectedDocumentation == generatedDocumentation,
-			"Expected:\n" << util::jsonPrettyPrint(expectedDocumentation) <<
-			"\n but got:\n" << util::jsonPrettyPrint(generatedDocumentation)
-		);
-	}
-
-	void expectNatspecError(std::string const& _code)
-	{
-		m_compilerStack.reset();
-		m_compilerStack.setSources({{"", "pragma solidity >=0.0;\n" + _code}});
-		m_compilerStack.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-		BOOST_CHECK(!m_compilerStack.parseAndAnalyze());
-		BOOST_REQUIRE(Error::containsErrorOfType(m_compilerStack.errors(), Error::Type::DocstringParsingError));
-	}
-
-protected:
-	CompilerStack m_compilerStack;
-};
-
-BOOST_FIXTURE_TEST_SUITE(SolidityNatspecJSON, DocumentationChecker)
-
-BOOST_AUTO_TEST_CASE(user_empty_natspec_test)
-{
-	char const* sourceCode = R"(
-		contract test {
-			///
-			///
-			function f() public {
-			}
-		}
-	)";
-
-	char const* natspec = R"(
-	{
-		"methods": {}
-	}
-	)";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(user_newline_break)
-{
-	char const* sourceCode = R"(
-		contract test {
-			///
-			/// @notice hello
-
-			/// @notice world
-			function f() public {
-			}
-		}
-	)";
-
-	char const* natspec = R"ABCDEF(
-	{
-		"methods":
-		{
-			"f()":
-			{
-			"notice": "world"
-			}
-		}
-	}
-	)ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(user_multiline_empty_lines)
-{
-	char const* sourceCode = R"(
-	contract test {
-		/**
-		 *
-		 *
-		 * @notice hello world
-		 */
-		function f() public {
-		}
-	}
-	)";
-
-	char const* natspec = R"ABCDEF(
-	{
-		"methods":
-		{
-			"f()":
-			{
-				"notice": "hello world"
-			}
-		}
-	}
-	)ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-
-BOOST_AUTO_TEST_CASE(user_basic_test)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @notice Multiplies `a` by 7
-			function mul(uint a) public returns(uint d) { return a * 7; }
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256)\":{ \"notice\": \"Multiplies `a` by 7\"}"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_and_user_basic_test)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @notice Multiplies `a` by 7
-			/// @dev Multiplies a number by 7
-			function mul(uint a) public returns (uint d) { return a * 7; }
-		}
-	)";
-
-	char const* devNatspec = R"R(
-	{
-		"methods":
-		{
-			"mul(uint256)":
-			{
-				"details": "Multiplies a number by 7"
-			}
-		}
-	})R";
-
-	char const* userNatspec = R"R(
-	{
-		"methods":
-		{
-			"mul(uint256)":
-			{
-				"notice": "Multiplies `a` by 7"
-			}
-		}
-	})R";
-
-	checkNatspec(sourceCode, "test", devNatspec, false);
-	checkNatspec(sourceCode, "test", userNatspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(user_multiline_comment)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @notice Multiplies `a` by 7
-			/// and then adds `b`
-			function mul_and_add(uint a, uint256 b) public returns (uint256 d) {
-				return (a * 7) + b;
-			}
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul_and_add(uint256,uint256)\":{ \"notice\": \"Multiplies `a` by 7 and then adds `b`\"}"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(user_multiple_functions)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @notice Multiplies `a` by 7 and then adds `b`
-			function mul_and_add(uint a, uint256 b) public returns (uint256 d) {
-				return (a * 7) + b;
-			}
-
-			/// @notice Divides `input` by `div`
-			function divide(uint input, uint div) public returns (uint d) {
-				return input / div;
-			}
-
-			/// @notice Subtracts 3 from `input`
-			function sub(int input) public returns (int d) {
-				return input - 3;
-			}
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul_and_add(uint256,uint256)\":{ \"notice\": \"Multiplies `a` by 7 and then adds `b`\"},"
-	"    \"divide(uint256,uint256)\":{ \"notice\": \"Divides `input` by `div`\"},"
-	"    \"sub(int256)\":{ \"notice\": \"Subtracts 3 from `input`\"}"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(user_empty_contract)
-{
-	char const* sourceCode = R"(
-		contract test { }
-	)";
-
-	char const* natspec = "{\"methods\":{} }";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_and_user_no_doc)
-{
-	char const* sourceCode = R"(
-		contract test {
-			function mul(uint a) public returns (uint d) {
-				return a * 7;
-			}
-			function sub(int input) public returns (int d) {
-				return input - 3;
-			}
-		}
-	)";
-
-	char const* devNatspec = "{\"methods\":{}}";
-	char const* userNatspec = "{\"methods\":{}}";
-
-	checkNatspec(sourceCode, "test", devNatspec, false);
-	checkNatspec(sourceCode, "test", userNatspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(public_state_variable)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @notice example of notice
-			/// @dev example of dev
-			/// @return returns state
-			uint public state;
-		}
-	)";
-
-	char const* devDoc = R"R(
-	{
-		"methods": {},
-		"stateVariables":
-		{
-			"state":
-			{
-				"details": "example of dev",
-				"return": "returns state",
-				"returns":
-				{
-					"_0": "returns state"
-				}
-			}
-		}
-	}
-	)R";
-	checkNatspec(sourceCode, "test", devDoc, false);
-
-	char const* userDoc = R"R(
-	{
-		"methods":
-		{
-			"state()":
-			{
-				"notice": "example of notice"
-			}
-		}
-	}
-	)R";
-	checkNatspec(sourceCode, "test", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(public_state_variable_struct)
-{
-	char const* sourceCode = R"(
-		contract Bank {
-			struct Coin {
-				string observeGraphicURL;
-				string reverseGraphicURL;
-			}
-
-			/// @notice Get the n-th coin I own
-			/// @return observeGraphicURL Front pic
-			/// @return reverseGraphicURL Back pic
-			Coin[] public coinStack;
-		}
-	)";
-
-	char const* devDoc = R"R(
-	{
-		"methods": {},
-		"stateVariables":
-		{
-			"coinStack":
-			{
-				"returns":
-				{
-					"observeGraphicURL": "Front pic",
-					"reverseGraphicURL": "Back pic"
-				}
-			}
-		}
-	}
-	)R";
-	checkNatspec(sourceCode, "Bank", devDoc, false);
-
-	char const* userDoc = R"R(
-	{
-		"methods":
-		{
-			"coinStack(uint256)":
-			{
-				"notice": "Get the n-th coin I own"
-			}
-		}
-	}
-	)R";
-	checkNatspec(sourceCode, "Bank", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(public_state_variable_struct_repeated)
-{
-	char const* sourceCode = R"(
-		contract Bank {
-			struct Coin {
-				string obverseGraphicURL;
-				string reverseGraphicURL;
-			}
-
-			/// @notice Get the n-th coin I own
-			/// @return obverseGraphicURL Front pic
-			/// @return obverseGraphicURL Front pic
-			Coin[] public coinStack;
-		}
-	)";
-
-	expectNatspecError(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(private_state_variable)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev example of dev
-			uint private state;
-		}
-	)";
-
-	char const* devDoc = R"(
-	{
-		"methods": {},
-		"stateVariables":
-		{
-			"state":
-			{
-				"details": "example of dev"
-			}
-		}
-	}
-	)";
-	checkNatspec(sourceCode, "test", devDoc, false);
-
-	char const* userDoc = R"(
-	{
-		"methods":{}
-	}
-	)";
-	checkNatspec(sourceCode, "test", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(event)
-{
-	char const* sourceCode = R"(
-		contract ERC20 {
-			/// @notice This event is emitted when a transfer occurs.
-			/// @param from The source account.
-			/// @param to The destination account.
-			/// @param amount The amount.
-			/// @dev A test case!
-			event Transfer(address indexed from, address indexed to, uint amount);
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"Transfer(address,address,uint256)":
-			{
-				"details": "A test case!",
-				"params":
-				{
-					"amount": "The amount.", "from": "The source account.", "to": "The destination account."
-				}
-			}
-		},
-		"methods": {}
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "ERC20", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"Transfer(address,address,uint256)":
-			{
-				"notice": "This event is emitted when a transfer occurs."
-			}
-		},
-		"methods": {}
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "ERC20", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(emit_event_from_foreign_contract)
-{
-	char const* sourceCode = R"(
-		contract X {
-			/// @notice Userdoc for event E.
-			/// @dev Devdoc for event E.
-			event E();
-		}
-
-		contract C {
-			function g() public {
-				emit X.E();
-			}
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"E()":
-			{
-				"details": "Devdoc for event E."
-			}
-		},
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"E()":
-			{
-				"notice": "Userdoc for event E."
-			}
-		},
-		"kind": "user",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(emit_event_from_foreign_contract_with_same_signature)
-{
-	char const* sourceCode = R"(
-		contract C {
-			/// @notice C.E event
-			/// @dev C.E event
-			event E(uint256 value);
-		}
-
-		contract D {
-			/// @notice D.E event
-			/// @dev D.E event
-			event E(uint256 value);
-
-			function test() public {
-				emit C.E(1);
-				emit E(2);
-			}
-		}
-	)";
-
-	char const* devDocC = R"ABCDEF(
-	{
-		"events":
-		{
-			"E(uint256)":
-			{
-				"details": "C.E event"
-			}
-		},
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", devDocC, false);
-
-	char const* devDocD = R"ABCDEF(
-	{
-		"events":
-		{
-			"E(uint256)":
-			{
-				"details": "D.E event"
-			}
-		},
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "D", devDocD, false);
-
-	char const* userDocC = R"ABCDEF(
-	{
-		"events":
-		{
-			"E(uint256)":
-			{
-				"notice": "C.E event"
-			}
-		},
-		"kind": "user",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", userDocC, true);
-
-	char const* userDocD = R"ABCDEF(
-	{
-		"events":
-		{
-			"E(uint256)":
-			{
-				"notice": "D.E event"
-			}
-		},
-		"kind": "user",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "D", userDocD, true);
-}
-
-// Tests that emitting an event from contract C in contract D does not inherit natspec from C.E
-BOOST_AUTO_TEST_CASE(emit_event_from_foreign_contract_no_inheritance)
-{
-	char const* sourceCode = R"(
-		contract C {
-			/// @notice C.E event
-			/// @dev C.E event
-			event E();
-		}
-
-		contract D {
-			event E();
-
-			function test() public {
-				emit C.E();
-			}
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "D", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-		"kind": "user",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "D", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(emit_same_signature_event_library_contract)
-{
-	char const* sourceCode = R"(
-		library L {
-		    /// @notice This event is defined in Library L
-		    /// @dev This should not appear in Contract C dev doc
-		    event SameSignatureEvent(uint16);
-		    /// @notice This event is defined in Library L
-		    /// @dev This should appear in Contract C dev doc
-		    event LibraryEvent(uint32);
-		}
-		contract C {
-		    /// @notice This event is defined in Contract C
-			/// @dev This should appear in Contract C dev doc
-		    event SameSignatureEvent(uint16);
-		    /// @notice This event is defined in Contract C
-			/// @dev This should appear in contract C dev doc
-		    event ContractEvent(uint32);
-		    function f() public {
-		        emit L.SameSignatureEvent(0);
-		        emit SameSignatureEvent(1);
-		        emit L.LibraryEvent(2);
-		        emit ContractEvent(3);
-		    }
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-	    "events":
-	    {
-	        "ContractEvent(uint32)":
-	        {
-	            "details": "This should appear in contract C dev doc"
-	        },
-			"LibraryEvent(uint32)":
-			{
-				"details": "This should appear in Contract C dev doc"
-			},
-	        "SameSignatureEvent(uint16)":
-	        {
-	            "details": "This should appear in Contract C dev doc"
-	        }
-	    },
-	    "kind": "dev",
-	    "methods": {},
-	    "version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"ContractEvent(uint32)":
-			{
-				"notice": "This event is defined in Contract C"
-			},
-			"LibraryEvent(uint32)":
-			{
-				"notice": "This event is defined in Library L"
-			},
-			"SameSignatureEvent(uint16)":
-			{
-				"notice": "This event is defined in Contract C"
-			}
-		},
-		"kind": "user",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(emit_same_signature_event_different_libraries)
-{
-	char const* sourceCode = R"(
-		library L1 {
-		    /// @notice This event is defined in Library L1
-		    /// @dev This should not appear in Contract C dev doc
-		    event SameSignatureEvent(uint16);
-		}
-		library L2 {
-		    /// @notice This event is defined in Library L2
-		    /// @dev This should not appear in Contract C dev doc
-		    event SameSignatureEvent(uint16);
-		}
-		library L3 {
-		    /// @notice This event is defined in Library L3
-		    /// @dev This should not appear in Contract C dev doc
-		    event SameSignatureEvent(uint16);
-		}
-		contract C {
-		    function f() public {
-		        emit L1.SameSignatureEvent(0);
-		        emit L2.SameSignatureEvent(1);
-		        emit L3.SameSignatureEvent(2);
-		    }
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-		"kind": "user",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", userDoc, true);
-
-	char const* libraryDevDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"SameSignatureEvent(uint16)":
-			{
-				"details": "This should not appear in Contract C dev doc"
-			}
-		},
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "L1", libraryDevDoc, false);
-
-	char const* libraryUserDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"SameSignatureEvent(uint16)":
-			{
-				"notice": "This event is defined in Library L1"
-			}
-		},
-		"kind": "user",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "L1", libraryUserDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(emit_same_signature_event_library_inherited)
-{
-	char const* sourceCode = R"(
-		contract D {
-			/// @notice This event is defined in contract D
-			/// @dev This should appear in Contract C dev doc
-			event SameSignatureEvent(uint16);
-		}
-		library L {
-		    /// @notice This event is defined in Library L
-		    /// @dev This should not appear in Contract C
-		    event SameSignatureEvent(uint16);
-		}
-		contract C is D {
-		    function f() public {
-		        emit L.SameSignatureEvent(0);
-		        emit D.SameSignatureEvent(1);
-		    }
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"SameSignatureEvent(uint16)":
-			{
-				"details": "This should appear in Contract C dev doc"
-			}
-		},
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"SameSignatureEvent(uint16)":
-			{
-				"notice": "This event is defined in contract D"
-			}
-		},
-		"kind": "user",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(emit_same_signature_event_library_contract_missing_natspec)
-{
-	char const* sourceCode = R"(
-		library L {
-		    /// @notice This event is defined in library L
-		    /// @dev This should not appear in contract C devdoc
-		    event SameSignatureEvent(uint16);
-		    /// @notice This event is defined in library L
-			/// @dev This should appear in contract C devdoc
-		    event LibraryEvent(uint32);
-		}
-		contract C {
-			event SameSignatureEvent(uint16);
-		    /// @notice This event is defined in contract C
-		    event ContractEvent(uint32);
-		    function f() public {
-		        emit L.SameSignatureEvent(0);
-		        emit SameSignatureEvent(1);
-		        emit L.LibraryEvent(2);
-		        emit ContractEvent(3);
-		    }
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-	    "events":
-	    {
-	        "LibraryEvent(uint32)":
-	        {
-	            "details": "This should appear in contract C devdoc"
-	        }
-	    },
-	    "kind": "dev",
-	    "methods": {},
-	    "version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"ContractEvent(uint32)":
-			{
-				"notice": "This event is defined in contract C"
-			},
-			"LibraryEvent(uint32)":
-			{
-				"notice": "This event is defined in library L"
-			}
-		},
-		"kind": "user",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(emit_same_signature_event_different_libraries_missing_natspec)
-{
-	char const* sourceCode = R"(
-		library L1 {
-		    event SameSignatureEvent(uint16);
-		}
-		library L2 {
-		    /// @notice This event is defined in library L2
-		    /// @dev This should not appear in Contract C devdoc
-		    event SameSignatureEvent(uint16);
-		}
-		library L3 {
-		    event SameSignatureEvent(uint16);
-		}
-		contract C {
-		    function f() public {
-		        emit L1.SameSignatureEvent(0);
-		        emit L2.SameSignatureEvent(1);
-		        emit L3.SameSignatureEvent(2);
-		    }
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-	    "kind": "user",
-	    "methods": {},
-	    "version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(emit_same_signature_event_library_inherited_missing_natspec)
-{
-	char const* sourceCode = R"(
-		contract D {
-			event SameSignatureEvent(uint16);
-		}
-		library L {
-		    /// @notice This event is defined in library L
-		    /// @dev This should not appear in contract C devdoc
-		    event SameSignatureEvent(uint16);
-		}
-		contract C is D {
-		    function f() public {
-		        emit L.SameSignatureEvent(0);
-		        emit D.SameSignatureEvent(1);
-		    }
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-   {
-     "kind": "user",
-     "methods": {},
-     "version": 1
-   }
-	)ABCDEF";
-	checkNatspec(sourceCode, "C", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(event_inheritance_interface)
-{
-	char const* sourceCode = R"(
-		interface ERC20 {
-			/// @notice This event is emitted when a transfer occurs.
-			/// @param from The source account.
-			/// @param to The destination account.
-			/// @param amount The amount.
-			/// @dev A test case!
-			event Transfer(address indexed from, address indexed to, uint amount);
-		}
-		contract A is ERC20 {
-		}
-		contract B is A {
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"Transfer(address,address,uint256)":
-			{
-				"details": "A test case!",
-				"params":
-				{
-					"amount": "The amount.",
-					"from": "The source account.",
-					"to": "The destination account."
-				}
-			}
-		},
-		"methods": {}
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "A", devDoc, false);
-	checkNatspec(sourceCode, "B", devDoc, false);
-	checkNatspec(sourceCode, "ERC20", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"Transfer(address,address,uint256)":
-			{
-				"notice": "This event is emitted when a transfer occurs."
-			}
-		},
-		"methods": {}
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "A", userDoc, true);
-	checkNatspec(sourceCode, "B", userDoc, true);
-	checkNatspec(sourceCode, "ERC20", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(event_inheritance)
-{
-	char const* sourceCode = R"(
-		contract ERC20 {
-			/// @notice This event is emitted when a transfer occurs.
-			/// @param from The source account.
-			/// @param to The destination account.
-			/// @param amount The amount.
-			/// @dev A test case!
-			event Transfer(address indexed from, address indexed to, uint amount);
-		}
-		contract A is ERC20 {
-		}
-		contract B is A {
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"Transfer(address,address,uint256)":
-			{
-				"details": "A test case!",
-				"params":
-				{
-					"amount": "The amount.",
-					"from": "The source account.",
-					"to": "The destination account."
-				}
-			}
-		},
-		"methods": {}
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "A", devDoc, false);
-	checkNatspec(sourceCode, "B", devDoc, false);
-	checkNatspec(sourceCode, "ERC20", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-		"events":
-		{
-			"Transfer(address,address,uint256)":
-			{
-				"notice": "This event is emitted when a transfer occurs."
-			}
-		},
-		"methods": {}
-	}
-	)ABCDEF";
-	checkNatspec(sourceCode, "A", userDoc, true);
-	checkNatspec(sourceCode, "B", userDoc, true);
-	checkNatspec(sourceCode, "ERC20", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_desc_after_nl)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev
-			/// Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter
-			/// @param second Documentation for the second parameter
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_multiple_params)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter
-			/// @param second Documentation for the second parameter
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_mutiline_param_description)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter starts here.
-			/// Since it's a really complicated parameter we need 2 lines
-			/// @param second Documentation for the second parameter
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_multiple_functions)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter
-			/// @param second Documentation for the second parameter
-			function mul(uint a, uint second) public returns (uint d) {
-				return a * 7 + second;
-			}
-			/// @dev Divides 2 numbers
-			/// @param input Documentation for the input parameter
-			/// @param div Documentation for the div parameter
-			function divide(uint input, uint div) public returns (uint d) {
-				return input / div;
-			}
-			/// @dev Subtracts 3 from `input`
-			/// @param input Documentation for the input parameter
-			function sub(int input) public returns (int d) {
-				return input - 3;
-			}
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        }\n"
-	"    },\n"
-	"    \"divide(uint256,uint256)\":{ \n"
-	"        \"details\": \"Divides 2 numbers\",\n"
-	"        \"params\": {\n"
-	"            \"input\": \"Documentation for the input parameter\",\n"
-	"            \"div\": \"Documentation for the div parameter\"\n"
-	"        }\n"
-	"    },\n"
-	"    \"sub(int256)\":{ \n"
-	"        \"details\": \"Subtracts 3 from `input`\",\n"
-	"        \"params\": {\n"
-	"            \"input\": \"Documentation for the input parameter\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_return_no_params)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @return d The result of the multiplication
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	char const* natspec = R"ABCDEF(
-	{
-		"methods":
-		{
-			"mul(uint256,uint256)":
-			{
-				"returns": { "d": "The result of the multiplication" }
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_return)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter starts here.
-			/// Since it's a really complicated parameter we need 2 lines
-			/// @param second Documentation for the second parameter
-			/// @return d The result of the multiplication
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        },\n"
-	"        \"returns\": {\n"
-	"            \"d\": \"The result of the multiplication\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_return_desc_after_nl)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter starts here.
-			/// Since it's a really complicated parameter we need 2 lines
-			/// @param second Documentation for the second parameter
-			/// @return
-			/// d The result of the multiplication
-			function mul(uint a, uint second) public returns (uint d) {
-				return a * 7 + second;
-			}
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        },\n"
-	"        \"returns\": {\n"
-	"            \"d\": \"The result of the multiplication\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_return_desc_multiple_unamed_mixed)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter starts here.
-			/// Since it's a really complicated parameter we need 2 lines
-			/// @param second Documentation for the second parameter
-			/// @return The result of the multiplication
-			/// @return _cookies And cookies with nutella
-			function mul(uint a, uint second) public returns (uint, uint _cookies) {
-				uint mul = a * 7;
-				return (mul, second);
-			}
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        },\n"
-	"        \"returns\": {\n"
-	"            \"_0\": \"The result of the multiplication\",\n"
-	"            \"_cookies\": \"And cookies with nutella\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_return_desc_multiple_unamed_mixed_2)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter starts here.
-			/// Since it's a really complicated parameter we need 2 lines
-			/// @param second Documentation for the second parameter
-			/// @return _cookies And cookies with nutella
-			/// @return The result of the multiplication
-			/// @return _milk And milk with nutella
-			function mul(uint a, uint second) public returns (uint _cookies, uint, uint _milk) {
-				uint mul = a * 7;
-				uint milk = 4;
-				return (mul, second, milk);
-			}
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        },\n"
-	"        \"returns\": {\n"
-	"            \"_cookies\": \"And cookies with nutella\",\n"
-	"            \"_1\": \"The result of the multiplication\",\n"
-	"            \"_milk\": \"And milk with nutella\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_return_desc_multiple_unamed)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter starts here.
-			/// Since it's a really complicated parameter we need 2 lines
-			/// @param second Documentation for the second parameter
-			/// @return The result of the multiplication
-			/// @return And cookies with nutella
-			function mul(uint a, uint second) public returns (uint, uint) {
-				uint mul = a * 7;
-				return (mul, second);
-			}
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        },\n"
-	"        \"returns\": {\n"
-	"            \"_0\": \"The result of the multiplication\",\n"
-	"            \"_1\": \"And cookies with nutella\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_return_desc_multiple)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter starts here.
-			/// Since it's a really complicated parameter we need 2 lines
-			/// @param second Documentation for the second parameter
-			/// @return d The result of the multiplication
-			/// @return f And cookies with nutella
-			function mul(uint a, uint second) public returns (uint d, uint f) {
-				uint mul = a * 7;
-				return (mul, second);
-			}
-		}
-	)";
-
-	char const* natspec = "{"
-	"\"methods\":{"
-	"    \"mul(uint256,uint256)\":{ \n"
-	"        \"details\": \"Multiplies a number by 7 and adds second parameter\",\n"
-	"        \"params\": {\n"
-	"            \"a\": \"Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines\",\n"
-	"            \"second\": \"Documentation for the second parameter\"\n"
-	"        },\n"
-	"        \"returns\": {\n"
-	"            \"d\": \"The result of the multiplication\",\n"
-	"            \"f\": \"And cookies with nutella\"\n"
-	"        }\n"
-	"    }\n"
-	"}}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_multiline_return)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter starts here.
-			/// Since it's a really complicated parameter we need 2 lines
-			/// @param second Documentation for the second parameter
-			/// @return d The result of the multiplication
-			/// and cookies with nutella
-			function mul(uint a, uint second) public returns (uint d) {
-				return a * 7 + second;
-			}
-		}
-	)";
-
-	char const* natspec = R"R({
-		"methods":
-		{
-			"mul(uint256,uint256)":
-			{
-				"details": "Multiplies a number by 7 and adds second parameter",
-				"params":
-				{
-					"a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-					"second": "Documentation for the second parameter"
-				},
-				"returns":
-				{
-					"d": "The result of the multiplication and cookies with nutella"
-				}
-			}
-		}
-	})R";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_multiline_comment)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/**
-			 * @dev Multiplies a number by 7 and adds second parameter
-			 * @param a Documentation for the first parameter starts here.
-			 * Since it's a really complicated parameter we need 2 lines
-			 * @param second Documentation for the second parameter
-			 * @return d The result of the multiplication
-			 * and cookies with nutella
-			 */
-			function mul(uint a, uint second) public returns (uint d) {
-				return a * 7 + second;
-			}
-		}
-	)";
-
-	char const* natspec = R"R(
-	{
-		"methods":
-		{
-			"mul(uint256,uint256)":
-			{
-				"details": "Multiplies a number by 7 and adds second parameter",
-				"params":
-				{
-					"a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-					"second": "Documentation for the second parameter"
-				},
-				"returns":
-				{
-					"d": "The result of the multiplication and cookies with nutella"
-				}
-			}
-		}
-	})R";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_documenting_no_return_param_name)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter
-			/// @param second Documentation for the second parameter
-			/// @return
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	expectNatspecError(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(dev_contract_no_doc)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Mul function
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	char const* natspec = "{"
-	"    \"methods\":{"
-	"        \"mul(uint256,uint256)\":{ \n"
-	"            \"details\": \"Mul function\"\n"
-	"        }\n"
-	"    }\n"
-	"}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_contract_doc)
-{
-	char const* sourceCode = R"(
-		/// @author Lefteris
-		/// @title Just a test contract
-		contract test {
-			/// @dev Mul function
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	char const* natspec = "{"
-	"    \"author\": \"Lefteris\","
-	"    \"title\": \"Just a test contract\","
-	"    \"methods\":{"
-	"        \"mul(uint256,uint256)\":{ \n"
-	"            \"details\": \"Mul function\"\n"
-	"        }\n"
-	"    }\n"
-	"}";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_author_at_function)
-{
-	char const* sourceCode = R"(
-		/// @author Lefteris
-		/// @title Just a test contract
-		contract test {
-			/// @dev Mul function
-			/// @author John Doe
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	expectNatspecError(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(struct_no_docs)
-{
-	char const* sourceCode = R"(
-		contract C {
-			/// @title example of title
-			/// @author example of author
-			/// @notice example of notice
-			/// @dev example of dev
-			struct Example {
-				string text;
-				bool valid;
-				uint256 value;
-			}
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "C", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-		"kind": "user",
-		"methods": {},
-		"version": 1
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "C", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(enum_no_docs)
-{
-	char const* sourceCode = R"(
-		contract C {
-			/// @title example of title
-			/// @author example of author
-			/// @notice example of notice
-			/// @dev example of dev
-			enum Color {
-				Red,
-				Green
-			}
-		}
-	)";
-
-	char const* devDoc = R"ABCDEF(
-	{
-		"kind": "dev",
-		"methods": {},
-		"version": 1
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "C", devDoc, false);
-
-	char const* userDoc = R"ABCDEF(
-	{
-	  "kind": "user",
-	  "methods": {},
-	  "version": 1
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "C", userDoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(notice_without_tag)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// I do something awesome
-			function mul(uint a) public returns (uint d) { return a * 7; }
-		}
-	)";
-
-
-	char const* natspec = R"ABCDEF(
-	{
-		"methods":
-		{
-			"mul(uint256)":
-			{
-				"notice": "I do something awesome"
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(multiline_notice_without_tag)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// I do something awesome
-			/// which requires two lines to explain
-			function mul(uint a) public returns (uint d) { return a * 7; }
-		}
-	)";
-
-	char const* natspec = R"ABCDEF(
-	{
-		"methods":
-		{
-			"mul(uint256)":
-			{
-			"notice": "I do something awesome which requires two lines to explain"
-		}
-	}
-	}
-	)ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(empty_comment)
-{
-	char const* sourceCode = R"(
-		//
-		contract test
-		{}
-	)";
-	char const* natspec = R"ABCDEF(
-	{
-		"methods": {}
-	}
-	)ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_title_at_function_error)
-{
-	char const* sourceCode = R"(
-		/// @author Lefteris
-		/// @title Just a test contract
-		contract test {
-			/// @dev Mul function
-			/// @title I really should not be here
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	expectNatspecError(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(dev_documenting_nonexistent_param)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter
-			/// @param not_existing Documentation for the second parameter
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	expectNatspecError(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(dev_documenting_no_param_name)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter
-			/// @param
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	expectNatspecError(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(dev_documenting_no_param_name_end)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter
-			/// @param se
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	expectNatspecError(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(dev_documenting_no_param_description)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter
-			/// @param second
-			function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
-		}
-	)";
-
-	expectNatspecError(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(user_constructor)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @notice this is a really nice constructor
-			constructor(uint a, uint second) { }
-		}
-	)";
-
-	char const* natspec = R"ABCDEF({
-	"methods":
-	{
-		"constructor":
-		{
-			"notice": "this is a really nice constructor"
-		}
-	}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(user_constructor_and_function)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @notice this is a really nice constructor
-			constructor(uint a, uint second) { }
-			/// another multiplier
-			function mul(uint a, uint second) public returns(uint d) { return a * 7 + second; }
-		}
-	)";
-
-	char const* natspec = R"ABCDEF({
-	"methods":
-	{
-		"mul(uint256,uint256)":
-		{
-			"notice": "another multiplier"
-		},
-		"constructor":
-		{
-			"notice": "this is a really nice constructor"
-		}
-	}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_constructor)
-{
-	char const *sourceCode = R"(
-		contract test {
-			/// @param a the parameter a is really nice and very useful
-			/// @param second the second parameter is not very useful, it just provides additional confusion
-			constructor(uint a, uint second) { }
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-	"methods":
-	{
-		"constructor":
-		{
-			"params":
-			{
-				"a": "the parameter a is really nice and very useful",
-				"second": "the second parameter is not very useful, it just provides additional confusion"
-			}
-		}
-	}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_constructor_return)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @param a the parameter a is really nice and very useful
-			/// @param second the second parameter is not very useful, it just provides additional confusion
-			/// @return return should not work within constructors
-			constructor(uint a, uint second) { }
-		}
-	)";
-
-	expectNatspecError(sourceCode);
-}
-
-BOOST_AUTO_TEST_CASE(dev_constructor_and_function)
-{
-	char const *sourceCode = R"(
-		contract test {
-			/// @param a the parameter a is really nice and very useful
-			/// @param second the second parameter is not very useful, it just provides additional confusion
-			constructor(uint a, uint second) { }
-			/// @dev Multiplies a number by 7 and adds second parameter
-			/// @param a Documentation for the first parameter starts here.
-			/// Since it's a really complicated parameter we need 2 lines
-			/// @param second Documentation for the second parameter
-			/// @return d The result of the multiplication
-			/// and cookies with nutella
-			function mul(uint a, uint second) public returns(uint d) {
-				return a * 7 + second;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-	"methods":
-	{
-		"mul(uint256,uint256)":
-		{
-			"details": "Multiplies a number by 7 and adds second parameter",
-			"params":
-			{
-				"a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
-				"second": "Documentation for the second parameter"
-			},
-			"returns":
-			{
-				"d": "The result of the multiplication and cookies with nutella"
-			}
-		},
-		"constructor":
-		{
-			"params":
-			{
-				"a": "the parameter a is really nice and very useful",
-				"second": "the second parameter is not very useful, it just provides additional confusion"
-			}
-		}
-	}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(slash4)
-{
-	char const* sourceCode = R"(
-		contract test {
-			//// @notice lorem ipsum
-			function f() public { }
-		}
-	)";
-
-	char const* natspec = R"( { "methods": {} } )";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(star3)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/***
-			 * @notice lorem ipsum
-			 */
-			function f() public { }
-		}
-	)";
-
-	char const* natspec = R"( { "methods": {} } )";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(slash3_slash3)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @notice lorem
-			/// ipsum
-			function f() public { }
-		}
-	)";
-
-	char const* natspec = R"ABCDEF({
-		"methods":
-		{
-			"f()": { "notice": "lorem ipsum" }
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(slash3_slash4)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// @notice lorem
-			//// ipsum
-			function f() public { }
-		}
-	)";
-
-	char const* natspec = R"ABCDEF({
-		"methods":
-		{
-			"f()": { "notice": "lorem" }
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "test", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_default_inherit_variable)
-{
-	char const *sourceCode = R"(
-		contract C {
-			/// @notice Hello world
-			/// @dev test
-			function x() virtual external returns (uint) {
-				return 1;
-			}
-		}
-
-		contract D is C {
-			uint public override x;
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods": { "x()": { "details": "test" } }
-	})ABCDEF";
-
-	char const *natspec1 = R"ABCDEF({
-		"methods": {},
-		"stateVariables":
-		{
-			"x":
-			{
-				"details": "test"
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "C", natspec, false);
-	checkNatspec(sourceCode, "D", natspec1, false);
-}
-
-BOOST_AUTO_TEST_CASE(user_default_inherit_variable)
-{
-	char const *sourceCode = R"(
-		contract C {
-			/// @notice Hello world
-			/// @dev test
-			function x() virtual external returns (uint) {
-				return 1;
-			}
-		}
-
-		contract D is C {
-			uint public override x;
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods": { "x()": { "notice": "Hello world" } }
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "C", natspec, true);
-	checkNatspec(sourceCode, "D", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_explicit_inherit_variable)
-{
-	char const *sourceCode = R"(
-		contract B {
-			function x() virtual external returns (uint) {
-				return 1;
-			}
-		}
-
-		contract C {
-			/// @notice Hello world
-			/// @dev test
-			function x() virtual external returns (uint) {
-				return 1;
-			}
-		}
-
-		contract D is C, B {
-			/// @inheritdoc C
-			uint public override(C, B) x;
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods": { "x()": { "details": "test" } }
-	})ABCDEF";
-
-	char const *natspec1 = R"ABCDEF({
-		"methods": {},
-		"stateVariables":
-		{
-			"x":
-			{
-				"details": "test"
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "C", natspec, false);
-	checkNatspec(sourceCode, "D", natspec1, false);
-}
-
-BOOST_AUTO_TEST_CASE(user_explicit_inherit_variable)
-{
-	char const *sourceCode = R"(
-		contract B {
-			function x() virtual external returns (uint) {
-				return 1;
-			}
-		}
-
-		contract C {
-			/// @notice Hello world
-			/// @dev test
-			function x() virtual external returns (uint) {
-				return 1;
-			}
-		}
-
-		contract D is C, B {
-			/// @inheritdoc C
-			uint public override(C, B) x;
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods": { "x()": { "notice": "Hello world" } }
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "C", natspec, true);
-	checkNatspec(sourceCode, "D", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_default_inherit)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// Second line.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract Middle is ERC20 {
-			function transfer(address to, uint amount) virtual override external returns (bool)
-			{
-			return false;
-			}
-		}
-
-		contract Token is Middle {
-			function transfer(address to, uint amount) override external returns (bool)
-			{
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"details": "test",
-				"params":
-				{
-					"amount": "amount to transfer",
-					"to": "address to transfer to"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, false);
-	checkNatspec(sourceCode, "Middle", natspec, false);
-	checkNatspec(sourceCode, "Token", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(user_default_inherit)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// Second line.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract Middle is ERC20 {
-			function transfer(address to, uint amount) virtual override external returns (bool)
-			{
-				return false;
-			}
-		}
-
-		contract Token is Middle {
-			function transfer(address to, uint amount) override external returns (bool)
-			{
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, true);
-	checkNatspec(sourceCode, "Middle", natspec, true);
-	checkNatspec(sourceCode, "Token", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_explicit_inherit)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract ERC21 {
-			function transfer(address to, uint amount) virtual external returns (bool) {
-				return false;
-			}
-		}
-
-		contract Token is ERC21, ERC20 {
-			/// @inheritdoc ERC20
-			function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"details": "test",
-				"params":
-				{
-					"amount": "amount to transfer",
-					"to": "address to transfer to"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, false);
-	checkNatspec(sourceCode, "Token", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(user_explicit_inherit)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract ERC21 {
-			function transfer(address to, uint amount) virtual external returns (bool) {
-				return false;
-			}
-		}
-
-		contract Token is ERC21, ERC20 {
-			/// @inheritdoc ERC20
-			function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, true);
-	checkNatspec(sourceCode, "Token", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_explicit_inherit2)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract ERC21 is ERC20 {
-			function transfer(address to, uint amount) virtual override external returns (bool) {
-				return false;
-			}
-		}
-
-		contract Token is ERC20 {
-			/// @inheritdoc ERC20
-			function transfer(address to, uint amount) override external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"details": "test",
-				"params":
-				{
-					"amount": "amount to transfer",
-					"to": "address to transfer to"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, false);
-	checkNatspec(sourceCode, "ERC21", natspec, false);
-	checkNatspec(sourceCode, "Token", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(user_explicit_inherit2)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract ERC21 is ERC20 {
-			function transfer(address to, uint amount) virtual override external returns (bool) {
-				return false;
-			}
-		}
-
-		contract Token is ERC20 {
-			/// @inheritdoc ERC20
-			function transfer(address to, uint amount) override external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, true);
-	checkNatspec(sourceCode, "ERC21", natspec, true);
-	checkNatspec(sourceCode, "Token", natspec, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_explicit_inherit_partial2)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract ERC21 is ERC20 {
-			/// @inheritdoc ERC20
-			/// @dev override dev comment
-			/// @notice override notice
-			function transfer(address to, uint amount) virtual override external returns (bool) {
-				return false;
-			}
-		}
-
-		contract Token is ERC21 {
-			function transfer(address to, uint amount) override external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"details": "test",
-				"params":
-				{
-					"amount": "amount to transfer",
-					"to": "address to transfer to"
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"details": "override dev comment",
-				"params":
-				{
-					"amount": "amount to transfer",
-					"to": "address to transfer to"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, false);
-	checkNatspec(sourceCode, "Token", natspec2, false);
-}
-
-BOOST_AUTO_TEST_CASE(user_explicit_inherit_partial2)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract ERC21 is ERC20 {
-			/// @inheritdoc ERC20
-			/// @dev override dev comment
-			/// @notice override notice
-			function transfer(address to, uint amount) virtual override external returns (bool) {
-				return false;
-			}
-		}
-
-		contract Token is ERC21 {
-			function transfer(address to, uint amount) override external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"notice": "override notice"
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, true);
-	checkNatspec(sourceCode, "Token", natspec2, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_explicit_inherit_partial)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract ERC21 {
-			function transfer(address to, uint amount) virtual external returns (bool) {
-				return false;
-			}
-		}
-
-		contract Token is ERC21, ERC20 {
-			/// @inheritdoc ERC20
-			/// @dev override dev comment
-			/// @notice override notice
-			function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"details": "test",
-				"params":
-				{
-					"amount": "amount to transfer",
-					"to": "address to transfer to"
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"details": "override dev comment",
-				"params":
-				{
-					"amount": "amount to transfer",
-					"to": "address to transfer to"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, false);
-	checkNatspec(sourceCode, "Token", natspec2, false);
-}
-
-BOOST_AUTO_TEST_CASE(user_explicit_inherit_partial)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract ERC21 {
-			function transfer(address to, uint amount) virtual external returns (bool) {
-				return false;
-			}
-		}
-
-		contract Token is ERC21, ERC20 {
-			/// @inheritdoc ERC20
-			/// @dev override dev comment
-			/// @notice override notice
-			function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"notice": "override notice"
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, true);
-	checkNatspec(sourceCode, "Token", natspec2, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_inherit_parameter_mismatch)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract Middle is ERC20 {
-			function transfer(address to, uint amount) override virtual external returns (bool) {
-				return false;
-			}
-		}
-
-		contract Token is Middle {
-			function transfer(address too, uint amount) override external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"details": "test",
-				"params":
-				{
-					"amount": "amount to transfer",
-					"to": "address to transfer to"
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods": { }
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, false);
-	checkNatspec(sourceCode, "Middle", natspec, false);
-	checkNatspec(sourceCode, "Token", natspec2, false);
-}
-
-BOOST_AUTO_TEST_CASE(user_inherit_parameter_mismatch)
-{
-	char const *sourceCode = R"(
-		interface ERC20 {
-			/// Transfer ``amount`` from ``msg.sender`` to ``to``.
-			/// @dev test
-			/// @param to address to transfer to
-			/// @param amount amount to transfer
-			function transfer(address to, uint amount) external returns (bool);
-		}
-
-		contract Middle is ERC20 {
-			function transfer(address to, uint amount) override virtual external returns (bool) {
-				return false;
-			}
-		}
-
-		contract Token is Middle {
-			function transfer(address too, uint amount) override external returns (bool) {
-				return false;
-			}
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"transfer(address,uint256)":
-			{
-				"notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods": { }
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "ERC20", natspec, true);
-	checkNatspec(sourceCode, "Middle", natspec, true);
-	checkNatspec(sourceCode, "Token", natspec2, true);
-}
-
-BOOST_AUTO_TEST_CASE(dev_different_return_name)
-{
-	char const *sourceCode = R"(
-		contract A {
-			/// @return y value
-			function g(int x) public pure virtual returns (int y) { return x; }
-		}
-
-		contract B is A {
-			function g(int x) public pure override returns (int z) { return x; }
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"g(int256)":
-			{
-				"returns":
-				{
-					"y": "value"
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods":
-		{
-			"g(int256)":
-			{
-				"returns":
-				{
-					"z": "value"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "A", natspec, false);
-	checkNatspec(sourceCode, "B", natspec2, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_different_return_name_multiple)
-{
-	char const *sourceCode = R"(
-		contract A {
-			/// @return a value A
-			/// @return b value B
-			function g(int x) public pure virtual returns (int a, int b) { return (1, 2); }
-		}
-
-		contract B is A {
-			function g(int x) public pure override returns (int z, int y) { return (1, 2); }
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"g(int256)":
-			{
-				"returns":
-				{
-					"a": "value A",
-					"b": "value B"
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods":
-		{
-			"g(int256)":
-			{
-				"returns":
-				{
-					"z": "value A",
-					"y": "value B"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "A", natspec, false);
-	checkNatspec(sourceCode, "B", natspec2, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_different_return_name_multiple_partly_unnamed)
-{
-	char const *sourceCode = R"(
-		contract A {
-			/// @return value A
-			/// @return b value B
-			function g(int x) public pure virtual returns (int, int b) { return (1, 2); }
-		}
-
-		contract B is A {
-			function g(int x) public pure override returns (int z, int) { return (1, 2); }
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"g(int256)":
-			{
-				"returns":
-				{
-					"_0": "value A",
-					"b": "value B"
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods":
-		{
-			"g(int256)":
-			{
-				"returns":
-				{
-					"z": "value A",
-					"_1": "value B"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "A", natspec, false);
-	checkNatspec(sourceCode, "B", natspec2, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_different_return_name_multiple_unnamed)
-{
-	char const *sourceCode = R"(
-		contract A {
-			/// @return value A
-			/// @return value B
-			function g(int x) public pure virtual returns (int, int) { return (1, 2); }
-		}
-
-		contract B is A {
-			function g(int x) public pure override returns (int z, int y) { return (1, 2); }
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"g(int256)":
-			{
-				"returns":
-				{
-					"_0": "value A",
-					"_1": "value B"
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods":
-		{
-			"g(int256)":
-			{
-				"returns":
-				{
-					"z": "value A",
-					"y": "value B"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "A", natspec, false);
-	checkNatspec(sourceCode, "B", natspec2, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_return_name_no_description)
-{
-	char const *sourceCode = R"(
-		contract A {
-			/// @return a
-			function g(int x) public pure virtual returns (int a) { return 2; }
-		}
-
-		contract B is A {
-			function g(int x) public pure override returns (int b) { return 2; }
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"g(int256)":
-			{
-				"returns":
-				{
-					"a": "a"
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods":
-		{
-			"g(int256)":
-			{
-				"returns":
-				{
-					"b": "a"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "A", natspec, false);
-	checkNatspec(sourceCode, "B", natspec2, false);
-}
-
-BOOST_AUTO_TEST_CASE(error)
-{
-	char const* sourceCode = R"(
-		contract test {
-			/// Something failed.
-			/// @dev an error.
-			/// @param a first parameter
-			/// @param b second parameter
-			error E(uint a, uint b);
-		}
-	)";
-
-	char const* devdoc = R"X({
-		"errors":{
-			"E(uint256,uint256)": [{
-				"details": "an error.",
-				"params":
-				{
-					"a": "first parameter",
-					"b": "second parameter"
-				}
-			}]
-		},
-		"methods": {}
-	})X";
-
-	checkNatspec(sourceCode, "test", devdoc, false);
-
-	char const* userdoc = R"X({
-		"errors":{
-			"E(uint256,uint256)": [{
-				"notice": "Something failed."
-			}]
-		},
-		"methods": {}
-	})X";
-	checkNatspec(sourceCode, "test", userdoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(error_multiple)
-{
-	char const* sourceCode = R"(
-		contract A {
-			/// Something failed.
-			/// @dev an error.
-			/// @param x first parameter
-			/// @param y second parameter
-			error E(uint x, uint y);
-		}
-		contract test {
-			/// X Something failed.
-			/// @dev X an error.
-			/// @param a X first parameter
-			/// @param b X second parameter
-			error E(uint a, uint b);
-			function f(bool a) public pure {
-				if (a)
-					revert E(1, 2);
-				else
-					revert A.E(5, 6);
-			}
-		}
-	)";
-
-	char const* devdoc = R"X({
-		"methods": {},
-		"errors":
-		{
-			"E(uint256,uint256)": [
-				{
-					"details": "an error.",
-					"params":
-					{
-						"x": "first parameter",
-						"y": "second parameter"
-					}
-				},
-				{
-					"details": "X an error.",
-					"params":
-					{
-						"a": "X first parameter",
-						"b": "X second parameter"
-					}
-				}
-			]
-		}
-	})X";
-
-	checkNatspec(sourceCode, "test", devdoc, false);
-
-	char const* userdoc = R"X({
-		"errors":{
-			"E(uint256,uint256)": [
-				{ "notice": "Something failed." },
-				{ "notice": "X Something failed." }
-			]
-		},
-		"methods": {}
-	})X";
-	checkNatspec(sourceCode, "test", userdoc, true);
-}
-
-BOOST_AUTO_TEST_CASE(custom)
-{
-	char const* sourceCode = R"(
-		/// @custom:x one two three
-		/// @custom:y line
-		/// break
-		/// @custom:t one
-		/// @custom:t two
-		contract A {
-			/// @custom:note statevar
-			uint x;
-			/// @custom:since 2014
-			function g(int x) public pure virtual returns (int, int) { return (1, 2); }
-		}
-	)";
-
-	char const* natspec = R"ABCDEF({
-		"custom:t": "onetwo",
-		"custom:x": "one two three",
-		"custom:y": "line break",
-		"methods":
-		{
-			"g(int256)":
-			{
-				"custom:since": "2014"
-			}
-		},
-		"stateVariables": { "x": { "custom:note": "statevar" } }
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "A", natspec, false);
-}
-
-BOOST_AUTO_TEST_CASE(custom_inheritance)
-{
-	char const *sourceCode = R"(
-		contract A {
-			/// @custom:since 2014
-			function g(uint x) public pure virtual {}
-		}
-		contract B is A {
-			function g(uint x) public pure override {}
-		}
-	)";
-
-	char const* natspecA = R"ABCDEF(
-	{
-		"methods":
-		{
-			"g(uint256)":
-			{
-				"custom:since": "2014"
-			}
-		}
-	})ABCDEF";
-	char const* natspecB = R"ABCDEF(
-	{
-		"methods": {}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "A", natspecA, false);
-	checkNatspec(sourceCode, "B", natspecB, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_struct_getter_override)
-{
-	char const *sourceCode = R"(
-		interface IThing {
-			/// @return x a number
-			/// @return y another number
-			function value() external view returns (uint128 x, uint128 y);
-		}
-
-		contract Thing is IThing {
-			struct Value {
-				uint128 x;
-				uint128 y;
-			}
-
-			Value public override value;
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"value()":
-			{
-				"returns":
-				{
-					"x": "a number",
-					"y": "another number"
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods": {},
-		"stateVariables":
-		{
-			"value":
-			{
-				"returns":
-				{
-					"x": "a number",
-					"y": "another number"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "IThing", natspec, false);
-	checkNatspec(sourceCode, "Thing", natspec2, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_struct_getter_override_no_return_name)
-{
-	char const *sourceCode = R"(
-		interface IThing {
-			///@return
-			function value(uint) external returns (uint128,uint128);
-		}
-
-		contract Thing is IThing {
-			struct Value {
-				uint128 x;
-				uint128 A;
-			}
-			mapping(uint=>Value) public override value;
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"value(uint256)":
-			{
-				"returns":
-				{
-					"_0": ""
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods": {},
-		"stateVariables":
-		{
-			"value":
-			{
-				"return": "x ",
-				"returns":
-				{
-					"x": ""
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "IThing", natspec, false);
-	checkNatspec(sourceCode, "Thing", natspec2, false);
-}
-
-BOOST_AUTO_TEST_CASE(dev_struct_getter_override_different_return_parameter_names)
-{
-	char const *sourceCode = R"(
-		interface IThing {
-			/// @return x a number
-			/// @return y another number
-			function value() external view returns (uint128 x, uint128 y);
-		}
-
-		contract Thing is IThing {
-			struct Value {
-				uint128 a;
-				uint128 b;
-			}
-
-			Value public override value;
-		}
-	)";
-
-	char const *natspec = R"ABCDEF({
-		"methods":
-		{
-			"value()":
-			{
-				"returns":
-				{
-					"x": "a number",
-					"y": "another number"
-				}
-			}
-		}
-	})ABCDEF";
-
-	char const *natspec2 = R"ABCDEF({
-		"methods": {},
-		"stateVariables":
-		{
-			"value":
-			{
-				"returns":
-				{
-					"a": "a number",
-					"b": "another number"
-				}
-			}
-		}
-	})ABCDEF";
-
-	checkNatspec(sourceCode, "IThing", natspec, false);
-	checkNatspec(sourceCode, "Thing", natspec2, false);
-}
-
-}
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/libsolidity/natspecJSON/custom.sol b/test/libsolidity/natspecJSON/custom.sol
new file mode 100644
index 0000000000..8aa780e75e
--- /dev/null
+++ b/test/libsolidity/natspecJSON/custom.sol
@@ -0,0 +1,34 @@
+/// @custom:x one two three
+/// @custom:y line
+/// break
+/// @custom:t one
+/// @custom:t two
+contract A {
+    /// @custom:note statevar
+    uint x;
+    /// @custom:since 2014
+    function g(int x) public pure virtual returns (int, int) { return (1, 2); }
+}
+
+// ----
+// ----
+// :A devdoc
+// {
+//     "custom:t": "onetwo",
+//     "custom:x": "one two three",
+//     "custom:y": "line break",
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "custom:since": "2014"
+//         }
+//     },
+//     "stateVariables":
+//     {
+//         "x":
+//         {
+//             "custom:note": "statevar"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/custom_inheritance.sol b/test/libsolidity/natspecJSON/custom_inheritance.sol
new file mode 100644
index 0000000000..815e4deeb5
--- /dev/null
+++ b/test/libsolidity/natspecJSON/custom_inheritance.sol
@@ -0,0 +1,25 @@
+contract A {
+    /// @custom:since 2014
+    function g(uint x) public pure virtual {}
+}
+contract B is A {
+    function g(uint x) public pure override {}
+}
+
+// ----
+// ----
+// :A devdoc
+// {
+//     "methods":
+//     {
+//         "g(uint256)":
+//         {
+//             "custom:since": "2014"
+//         }
+//     }
+// }
+//
+// :B devdoc
+// {
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol b/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol
new file mode 100644
index 0000000000..6b9d75ba7f
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol
@@ -0,0 +1,29 @@
+contract test {
+    /// @notice Multiplies `a` by 7
+    /// @dev Multiplies a number by 7
+    function mul(uint a) public returns (uint d) { return a * 7; }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256)":
+//         {
+//             "details": "Multiplies a number by 7"
+//         }
+//     }
+// }
+//
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256)":
+//         {
+//             "notice": "Multiplies `a` by 7"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol b/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol
new file mode 100644
index 0000000000..aaf9ec315f
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol
@@ -0,0 +1,20 @@
+contract test {
+    function mul(uint a) public returns (uint d) {
+        return a * 7;
+    }
+    function sub(int input) public returns (int d) {
+        return input - 3;
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods": {}
+// }
+//
+// :test userdoc
+// {
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/dev_author_at_function.sol b/test/libsolidity/natspecJSON/dev_author_at_function.sol
new file mode 100644
index 0000000000..7ea25a3e5b
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_author_at_function.sol
@@ -0,0 +1,9 @@
+/// @author Lefteris
+/// @title Just a test contract
+contract test {
+    /// @dev Mul function
+    /// @author John Doe
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
diff --git a/test/libsolidity/natspecJSON/dev_constructor.sol b/test/libsolidity/natspecJSON/dev_constructor.sol
new file mode 100644
index 0000000000..01fa9cb41b
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_constructor.sol
@@ -0,0 +1,22 @@
+contract test {
+    /// @param a the parameter a is really nice and very useful
+    /// @param second the second parameter is not very useful, it just provides additional confusion
+    constructor(uint a, uint second) { }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "constructor":
+//         {
+//             "params":
+//             {
+//                 "a": "the parameter a is really nice and very useful",
+//                 "second": "the second parameter is not very useful, it just provides additional confusion"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_constructor_and_function.sol b/test/libsolidity/natspecJSON/dev_constructor_and_function.sol
new file mode 100644
index 0000000000..ea954827a8
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_constructor_and_function.sol
@@ -0,0 +1,44 @@
+contract test {
+    /// @param a the parameter a is really nice and very useful
+    /// @param second the second parameter is not very useful, it just provides additional confusion
+    constructor(uint a, uint second) { }
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter starts here.
+    /// Since it's a really complicated parameter we need 2 lines
+    /// @param second Documentation for the second parameter
+    /// @return d The result of the multiplication
+    /// and cookies with nutella
+    function mul(uint a, uint second) public returns(uint d) {
+        return a * 7 + second;
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "constructor":
+//         {
+//             "params":
+//             {
+//                 "a": "the parameter a is really nice and very useful",
+//                 "second": "the second parameter is not very useful, it just provides additional confusion"
+//             }
+//         },
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+//                 "second": "Documentation for the second parameter"
+//             },
+//             "returns":
+//             {
+//                 "d": "The result of the multiplication and cookies with nutella"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_constructor_return.sol b/test/libsolidity/natspecJSON/dev_constructor_return.sol
new file mode 100644
index 0000000000..bee9a9d6e9
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_constructor_return.sol
@@ -0,0 +1,8 @@
+contract test {
+    /// @param a the parameter a is really nice and very useful
+    /// @param second the second parameter is not very useful, it just provides additional confusion
+    /// @return return should not work within constructors
+    constructor(uint a, uint second) { }
+}
+
+// ----
diff --git a/test/libsolidity/natspecJSON/dev_contract_doc.sol b/test/libsolidity/natspecJSON/dev_contract_doc.sol
new file mode 100644
index 0000000000..22c45dfb8b
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_contract_doc.sol
@@ -0,0 +1,21 @@
+/// @author Lefteris
+/// @title Just a test contract
+contract test {
+    /// @dev Mul function
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "author": "Lefteris",
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Mul function"
+//         }
+//     },
+//     "title": "Just a test contract"
+// }
diff --git a/test/libsolidity/natspecJSON/dev_contract_no_doc.sol b/test/libsolidity/natspecJSON/dev_contract_no_doc.sol
new file mode 100644
index 0000000000..6e7d587d19
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_contract_no_doc.sol
@@ -0,0 +1,17 @@
+contract test {
+    /// @dev Mul function
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Mul function"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_default_inherit.sol b/test/libsolidity/natspecJSON/dev_default_inherit.sol
new file mode 100644
index 0000000000..6a106fbf0e
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_default_inherit.sol
@@ -0,0 +1,72 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// Second line.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract Middle is ERC20 {
+    function transfer(address to, uint amount) virtual override external returns (bool)
+    {
+    return false;
+    }
+}
+
+contract Token is Middle {
+    function transfer(address to, uint amount) override external returns (bool)
+    {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
+//
+// :Middle devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
+//
+// :Token devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol b/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
new file mode 100644
index 0000000000..7e75d30f81
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
@@ -0,0 +1,36 @@
+contract C {
+    /// @notice Hello world
+    /// @dev test
+    function x() virtual external returns (uint) {
+        return 1;
+    }
+}
+
+contract D is C {
+    uint public override x;
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "details": "test"
+//         }
+//     }
+// }
+//
+// :D devdoc
+// {
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "x":
+//         {
+//             "details": "test"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_desc_after_nl.sol b/test/libsolidity/natspecJSON/dev_desc_after_nl.sol
new file mode 100644
index 0000000000..745ab190bd
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_desc_after_nl.sol
@@ -0,0 +1,25 @@
+contract test {
+    /// @dev
+    /// Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter
+    /// @param second Documentation for the second parameter
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter",
+//                 "second": "Documentation for the second parameter"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name.sol b/test/libsolidity/natspecJSON/dev_different_return_name.sol
new file mode 100644
index 0000000000..3a1606dc53
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_different_return_name.sol
@@ -0,0 +1,38 @@
+contract A {
+    /// @return y value
+    function g(int x) public pure virtual returns (int y) { return x; }
+}
+
+contract B is A {
+    function g(int x) public pure override returns (int z) { return x; }
+}
+
+// ----
+// ----
+// :A devdoc
+// {
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "returns":
+//             {
+//                 "y": "value"
+//             }
+//         }
+//     }
+// }
+//
+// :B devdoc
+// {
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "returns":
+//             {
+//                 "z": "value"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
new file mode 100644
index 0000000000..8dc76fb701
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
@@ -0,0 +1,41 @@
+contract A {
+    /// @return a value A
+    /// @return b value B
+    function g(int x) public pure virtual returns (int a, int b) { return (1, 2); }
+}
+
+contract B is A {
+    function g(int x) public pure override returns (int z, int y) { return (1, 2); }
+}
+
+// ----
+// ----
+// :A devdoc
+// {
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "returns":
+//             {
+//                 "a": "value A",
+//                 "b": "value B"
+//             }
+//         }
+//     }
+// }
+//
+// :B devdoc
+// {
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "returns":
+//             {
+//                 "y": "value B",
+//                 "z": "value A"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
new file mode 100644
index 0000000000..1fa8eb9fb6
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
@@ -0,0 +1,41 @@
+contract A {
+    /// @return value A
+    /// @return b value B
+    function g(int x) public pure virtual returns (int, int b) { return (1, 2); }
+}
+
+contract B is A {
+    function g(int x) public pure override returns (int z, int) { return (1, 2); }
+}
+
+// ----
+// ----
+// :A devdoc
+// {
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "returns":
+//             {
+//                 "_0": "value A",
+//                 "b": "value B"
+//             }
+//         }
+//     }
+// }
+//
+// :B devdoc
+// {
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "returns":
+//             {
+//                 "_1": "value B",
+//                 "z": "value A"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
new file mode 100644
index 0000000000..c0ce38726b
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
@@ -0,0 +1,41 @@
+contract A {
+    /// @return value A
+    /// @return value B
+    function g(int x) public pure virtual returns (int, int) { return (1, 2); }
+}
+
+contract B is A {
+    function g(int x) public pure override returns (int z, int y) { return (1, 2); }
+}
+
+// ----
+// ----
+// :A devdoc
+// {
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "returns":
+//             {
+//                 "_0": "value A",
+//                 "_1": "value B"
+//             }
+//         }
+//     }
+// }
+//
+// :B devdoc
+// {
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "returns":
+//             {
+//                 "y": "value B",
+//                 "z": "value A"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol b/test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol
new file mode 100644
index 0000000000..84a2f532da
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol
@@ -0,0 +1,8 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter
+    /// @param second
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol b/test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol
new file mode 100644
index 0000000000..75b4fe5c0b
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol
@@ -0,0 +1,8 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter
+    /// @param
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol b/test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol
new file mode 100644
index 0000000000..4ddeb7f9b9
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol
@@ -0,0 +1,8 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter
+    /// @param se
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol b/test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol
new file mode 100644
index 0000000000..e0b90bed07
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol
@@ -0,0 +1,9 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter
+    /// @param second Documentation for the second parameter
+    /// @return
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
diff --git a/test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol b/test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol
new file mode 100644
index 0000000000..977833e006
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol
@@ -0,0 +1,8 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter
+    /// @param not_existing Documentation for the second parameter
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit.sol
new file mode 100644
index 0000000000..f665035b92
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit.sol
@@ -0,0 +1,54 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract ERC21 {
+    function transfer(address to, uint amount) virtual external returns (bool) {
+        return false;
+    }
+}
+
+contract Token is ERC21, ERC20 {
+    /// @inheritdoc ERC20
+    function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
+//
+// :Token devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
new file mode 100644
index 0000000000..c251f678e4
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
@@ -0,0 +1,70 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract ERC21 is ERC20 {
+    function transfer(address to, uint amount) virtual override external returns (bool) {
+        return false;
+    }
+}
+
+contract Token is ERC20 {
+    /// @inheritdoc ERC20
+    function transfer(address to, uint amount) override external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
+//
+// :ERC21 devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
+//
+// :Token devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
new file mode 100644
index 0000000000..bbe44ad7d5
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
@@ -0,0 +1,56 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract ERC21 {
+    function transfer(address to, uint amount) virtual external returns (bool) {
+        return false;
+    }
+}
+
+contract Token is ERC21, ERC20 {
+    /// @inheritdoc ERC20
+    /// @dev override dev comment
+    /// @notice override notice
+    function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
+//
+// :Token devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "override dev comment",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
new file mode 100644
index 0000000000..40a852a1e9
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
@@ -0,0 +1,56 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract ERC21 is ERC20 {
+    /// @inheritdoc ERC20
+    /// @dev override dev comment
+    /// @notice override notice
+    function transfer(address to, uint amount) virtual override external returns (bool) {
+        return false;
+    }
+}
+
+contract Token is ERC21 {
+    function transfer(address to, uint amount) override external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
+//
+// :Token devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "override dev comment",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
new file mode 100644
index 0000000000..f868453d0d
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
@@ -0,0 +1,43 @@
+contract B {
+    function x() virtual external returns (uint) {
+        return 1;
+    }
+}
+
+contract C {
+    /// @notice Hello world
+    /// @dev test
+    function x() virtual external returns (uint) {
+        return 1;
+    }
+}
+
+contract D is C, B {
+    /// @inheritdoc C
+    uint public override(C, B) x;
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "details": "test"
+//         }
+//     }
+// }
+//
+// :D devdoc
+// {
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "x":
+//         {
+//             "details": "test"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol b/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
new file mode 100644
index 0000000000..a395fc051c
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
@@ -0,0 +1,58 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract Middle is ERC20 {
+    function transfer(address to, uint amount) override virtual external returns (bool) {
+        return false;
+    }
+}
+
+contract Token is Middle {
+    function transfer(address too, uint amount) override external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
+//
+// :Middle devdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     }
+// }
+//
+// :Token devdoc
+// {
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/dev_multiline_comment.sol b/test/libsolidity/natspecJSON/dev_multiline_comment.sol
new file mode 100644
index 0000000000..9eb06e5c97
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_multiline_comment.sol
@@ -0,0 +1,35 @@
+contract test {
+    /**
+     * @dev Multiplies a number by 7 and adds second parameter
+     * @param a Documentation for the first parameter starts here.
+     * Since it's a really complicated parameter we need 2 lines
+     * @param second Documentation for the second parameter
+     * @return d The result of the multiplication
+     * and cookies with nutella
+     */
+    function mul(uint a, uint second) public returns (uint d) {
+        return a * 7 + second;
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+//                 "second": "Documentation for the second parameter"
+//             },
+//             "returns":
+//             {
+//                 "d": "The result of the multiplication and cookies with nutella"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_multiline_return.sol b/test/libsolidity/natspecJSON/dev_multiline_return.sol
new file mode 100644
index 0000000000..88169fbf10
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_multiline_return.sol
@@ -0,0 +1,33 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter starts here.
+    /// Since it's a really complicated parameter we need 2 lines
+    /// @param second Documentation for the second parameter
+    /// @return d The result of the multiplication
+    /// and cookies with nutella
+    function mul(uint a, uint second) public returns (uint d) {
+        return a * 7 + second;
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+//                 "second": "Documentation for the second parameter"
+//             },
+//             "returns":
+//             {
+//                 "d": "The result of the multiplication and cookies with nutella"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_functions.sol b/test/libsolidity/natspecJSON/dev_multiple_functions.sol
new file mode 100644
index 0000000000..2be5dae5a5
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_multiple_functions.sol
@@ -0,0 +1,54 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter
+    /// @param second Documentation for the second parameter
+    function mul(uint a, uint second) public returns (uint d) {
+        return a * 7 + second;
+    }
+    /// @dev Divides 2 numbers
+    /// @param input Documentation for the input parameter
+    /// @param div Documentation for the div parameter
+    function divide(uint input, uint div) public returns (uint d) {
+        return input / div;
+    }
+    /// @dev Subtracts 3 from `input`
+    /// @param input Documentation for the input parameter
+    function sub(int input) public returns (int d) {
+        return input - 3;
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "divide(uint256,uint256)":
+//         {
+//             "details": "Divides 2 numbers",
+//             "params":
+//             {
+//                 "div": "Documentation for the div parameter",
+//                 "input": "Documentation for the input parameter"
+//             }
+//         },
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter",
+//                 "second": "Documentation for the second parameter"
+//             }
+//         },
+//         "sub(int256)":
+//         {
+//             "details": "Subtracts 3 from `input`",
+//             "params":
+//             {
+//                 "input": "Documentation for the input parameter"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_params.sol b/test/libsolidity/natspecJSON/dev_multiple_params.sol
new file mode 100644
index 0000000000..de3c57cf5a
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_multiple_params.sol
@@ -0,0 +1,24 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter
+    /// @param second Documentation for the second parameter
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter",
+//                 "second": "Documentation for the second parameter"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol b/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
new file mode 100644
index 0000000000..0ed4d08cb7
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
@@ -0,0 +1,25 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter starts here.
+    /// Since it's a really complicated parameter we need 2 lines
+    /// @param second Documentation for the second parameter
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+//                 "second": "Documentation for the second parameter"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return.sol b/test/libsolidity/natspecJSON/dev_return.sol
new file mode 100644
index 0000000000..ffe36c8636
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_return.sol
@@ -0,0 +1,30 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter starts here.
+    /// Since it's a really complicated parameter we need 2 lines
+    /// @param second Documentation for the second parameter
+    /// @return d The result of the multiplication
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+//                 "second": "Documentation for the second parameter"
+//             },
+//             "returns":
+//             {
+//                 "d": "The result of the multiplication"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol b/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
new file mode 100644
index 0000000000..0ef9043473
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
@@ -0,0 +1,33 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter starts here.
+    /// Since it's a really complicated parameter we need 2 lines
+    /// @param second Documentation for the second parameter
+    /// @return
+    /// d The result of the multiplication
+    function mul(uint a, uint second) public returns (uint d) {
+        return a * 7 + second;
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+//                 "second": "Documentation for the second parameter"
+//             },
+//             "returns":
+//             {
+//                 "d": "The result of the multiplication"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
new file mode 100644
index 0000000000..b8d167d2c6
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
@@ -0,0 +1,35 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter starts here.
+    /// Since it's a really complicated parameter we need 2 lines
+    /// @param second Documentation for the second parameter
+    /// @return d The result of the multiplication
+    /// @return f And cookies with nutella
+    function mul(uint a, uint second) public returns (uint d, uint f) {
+        uint mul = a * 7;
+        return (mul, second);
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+//                 "second": "Documentation for the second parameter"
+//             },
+//             "returns":
+//             {
+//                 "d": "The result of the multiplication",
+//                 "f": "And cookies with nutella"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
new file mode 100644
index 0000000000..fc48d1f663
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
@@ -0,0 +1,35 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter starts here.
+    /// Since it's a really complicated parameter we need 2 lines
+    /// @param second Documentation for the second parameter
+    /// @return The result of the multiplication
+    /// @return And cookies with nutella
+    function mul(uint a, uint second) public returns (uint, uint) {
+        uint mul = a * 7;
+        return (mul, second);
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+//                 "second": "Documentation for the second parameter"
+//             },
+//             "returns":
+//             {
+//                 "_0": "The result of the multiplication",
+//                 "_1": "And cookies with nutella"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
new file mode 100644
index 0000000000..84d55a1f50
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
@@ -0,0 +1,35 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter starts here.
+    /// Since it's a really complicated parameter we need 2 lines
+    /// @param second Documentation for the second parameter
+    /// @return The result of the multiplication
+    /// @return _cookies And cookies with nutella
+    function mul(uint a, uint second) public returns (uint, uint _cookies) {
+        uint mul = a * 7;
+        return (mul, second);
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+//                 "second": "Documentation for the second parameter"
+//             },
+//             "returns":
+//             {
+//                 "_0": "The result of the multiplication",
+//                 "_cookies": "And cookies with nutella"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
new file mode 100644
index 0000000000..9847c3ac24
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
@@ -0,0 +1,38 @@
+contract test {
+    /// @dev Multiplies a number by 7 and adds second parameter
+    /// @param a Documentation for the first parameter starts here.
+    /// Since it's a really complicated parameter we need 2 lines
+    /// @param second Documentation for the second parameter
+    /// @return _cookies And cookies with nutella
+    /// @return The result of the multiplication
+    /// @return _milk And milk with nutella
+    function mul(uint a, uint second) public returns (uint _cookies, uint, uint _milk) {
+        uint mul = a * 7;
+        uint milk = 4;
+        return (mul, second, milk);
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "details": "Multiplies a number by 7 and adds second parameter",
+//             "params":
+//             {
+//                 "a": "Documentation for the first parameter starts here. Since it's a really complicated parameter we need 2 lines",
+//                 "second": "Documentation for the second parameter"
+//             },
+//             "returns":
+//             {
+//                 "_1": "The result of the multiplication",
+//                 "_cookies": "And cookies with nutella",
+//                 "_milk": "And milk with nutella"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_name_no_description.sol b/test/libsolidity/natspecJSON/dev_return_name_no_description.sol
new file mode 100644
index 0000000000..555c7f9256
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_return_name_no_description.sol
@@ -0,0 +1,38 @@
+contract A {
+    /// @return a
+    function g(int x) public pure virtual returns (int a) { return 2; }
+}
+
+contract B is A {
+    function g(int x) public pure override returns (int b) { return 2; }
+}
+
+// ----
+// ----
+// :A devdoc
+// {
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "returns":
+//             {
+//                 "a": "a"
+//             }
+//         }
+//     }
+// }
+//
+// :B devdoc
+// {
+//     "methods":
+//     {
+//         "g(int256)":
+//         {
+//             "returns":
+//             {
+//                 "b": "a"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_no_params.sol b/test/libsolidity/natspecJSON/dev_return_no_params.sol
new file mode 100644
index 0000000000..870058b076
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_return_no_params.sol
@@ -0,0 +1,20 @@
+contract test {
+    /// @return d The result of the multiplication
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256,uint256)":
+//         {
+//             "returns":
+//             {
+//                 "d": "The result of the multiplication"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override.sol
new file mode 100644
index 0000000000..7cc09a183a
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_struct_getter_override.sol
@@ -0,0 +1,47 @@
+interface IThing {
+    /// @return x a number
+    /// @return y another number
+    function value() external view returns (uint128 x, uint128 y);
+}
+
+contract Thing is IThing {
+    struct Value {
+        uint128 x;
+        uint128 y;
+    }
+
+    Value public override value;
+}
+
+// ----
+// ----
+// :IThing devdoc
+// {
+//     "methods":
+//     {
+//         "value()":
+//         {
+//             "returns":
+//             {
+//                 "x": "a number",
+//                 "y": "another number"
+//             }
+//         }
+//     }
+// }
+//
+// :Thing devdoc
+// {
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "value":
+//         {
+//             "returns":
+//             {
+//                 "x": "a number",
+//                 "y": "another number"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
new file mode 100644
index 0000000000..050abfd7f7
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
@@ -0,0 +1,47 @@
+interface IThing {
+    /// @return x a number
+    /// @return y another number
+    function value() external view returns (uint128 x, uint128 y);
+}
+
+contract Thing is IThing {
+    struct Value {
+        uint128 a;
+        uint128 b;
+    }
+
+    Value public override value;
+}
+
+// ----
+// ----
+// :IThing devdoc
+// {
+//     "methods":
+//     {
+//         "value()":
+//         {
+//             "returns":
+//             {
+//                 "x": "a number",
+//                 "y": "another number"
+//             }
+//         }
+//     }
+// }
+//
+// :Thing devdoc
+// {
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "value":
+//         {
+//             "returns":
+//             {
+//                 "a": "a number",
+//                 "b": "another number"
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
new file mode 100644
index 0000000000..927037f12b
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
@@ -0,0 +1,44 @@
+interface IThing {
+    ///@return
+    function value(uint) external returns (uint128,uint128);
+}
+
+contract Thing is IThing {
+    struct Value {
+        uint128 x;
+        uint128 A;
+    }
+    mapping(uint=>Value) public override value;
+}
+
+// ----
+// ----
+// :IThing devdoc
+// {
+//     "methods":
+//     {
+//         "value(uint256)":
+//         {
+//             "returns":
+//             {
+//                 "_0": ""
+//             }
+//         }
+//     }
+// }
+//
+// :Thing devdoc
+// {
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "value":
+//         {
+//             "return": "x ",
+//             "returns":
+//             {
+//                 "x": ""
+//             }
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/dev_title_at_function_error.sol b/test/libsolidity/natspecJSON/dev_title_at_function_error.sol
new file mode 100644
index 0000000000..8c9ed7bb93
--- /dev/null
+++ b/test/libsolidity/natspecJSON/dev_title_at_function_error.sol
@@ -0,0 +1,9 @@
+/// @author Lefteris
+/// @title Just a test contract
+contract test {
+    /// @dev Mul function
+    /// @title I really should not be here
+    function mul(uint a, uint second) public returns (uint d) { return a * 7 + second; }
+}
+
+// ----
diff --git a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol
new file mode 100644
index 0000000000..7733fd432a
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol
@@ -0,0 +1,41 @@
+contract X {
+    /// @notice Userdoc for event E.
+    /// @dev Devdoc for event E.
+    event E();
+}
+
+contract C {
+    function g() public {
+        emit X.E();
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "details": "Devdoc for event E."
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "notice": "Userdoc for event E."
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol
new file mode 100644
index 0000000000..ea1d669564
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol
@@ -0,0 +1,31 @@
+// Tests that emitting an event from contract C in contract D does not inherit natspec from C.E
+
+contract C {
+    /// @notice C.E event
+    /// @dev C.E event
+    event E();
+}
+
+contract D {
+    event E();
+
+    function test() public {
+        emit C.E();
+    }
+}
+
+// ----
+// ----
+// :D devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :D userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_with_same_signature.sol b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_with_same_signature.sol
new file mode 100644
index 0000000000..6030c27d96
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_with_same_signature.sol
@@ -0,0 +1,74 @@
+contract C {
+    /// @notice C.E event
+    /// @dev C.E event
+    event E(uint256 value);
+}
+
+contract D {
+    /// @notice D.E event
+    /// @dev D.E event
+    event E(uint256 value);
+
+    function test() public {
+        emit C.E(1);
+        emit E(2);
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "events":
+//     {
+//         "E(uint256)":
+//         {
+//             "details": "C.E event"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "events":
+//     {
+//         "E(uint256)":
+//         {
+//             "notice": "C.E event"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :D devdoc
+// {
+//     "events":
+//     {
+//         "E(uint256)":
+//         {
+//             "details": "D.E event"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :D userdoc
+// {
+//     "events":
+//     {
+//         "E(uint256)":
+//         {
+//             "notice": "D.E event"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol
new file mode 100644
index 0000000000..a017849c9e
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol
@@ -0,0 +1,66 @@
+library L1 {
+    /// @notice This event is defined in Library L1
+    /// @dev This should not appear in Contract C dev doc
+    event SameSignatureEvent(uint16);
+}
+library L2 {
+    /// @notice This event is defined in Library L2
+    /// @dev This should not appear in Contract C dev doc
+    event SameSignatureEvent(uint16);
+}
+library L3 {
+    /// @notice This event is defined in Library L3
+    /// @dev This should not appear in Contract C dev doc
+    event SameSignatureEvent(uint16);
+}
+contract C {
+    function f() public {
+        emit L1.SameSignatureEvent(0);
+        emit L2.SameSignatureEvent(1);
+        emit L3.SameSignatureEvent(2);
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L1 devdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should not appear in Contract C dev doc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L1 userdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in Library L1"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol
new file mode 100644
index 0000000000..06b739039b
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol
@@ -0,0 +1,34 @@
+library L1 {
+    event SameSignatureEvent(uint16);
+}
+library L2 {
+    /// @notice This event is defined in library L2
+    /// @dev This should not appear in Contract C devdoc
+    event SameSignatureEvent(uint16);
+}
+library L3 {
+    event SameSignatureEvent(uint16);
+}
+contract C {
+    function f() public {
+        emit L1.SameSignatureEvent(0);
+        emit L2.SameSignatureEvent(1);
+        emit L3.SameSignatureEvent(2);
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol
new file mode 100644
index 0000000000..d5b3d91fd8
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol
@@ -0,0 +1,68 @@
+library L {
+    /// @notice This event is defined in Library L
+    /// @dev This should not appear in Contract C dev doc
+    event SameSignatureEvent(uint16);
+    /// @notice This event is defined in Library L
+    /// @dev This should appear in Contract C dev doc
+    event LibraryEvent(uint32);
+}
+contract C {
+    /// @notice This event is defined in Contract C
+    /// @dev This should appear in Contract C dev doc
+    event SameSignatureEvent(uint16);
+    /// @notice This event is defined in Contract C
+    /// @dev This should appear in contract C dev doc
+    event ContractEvent(uint32);
+    function f() public {
+    emit L.SameSignatureEvent(0);
+    emit SameSignatureEvent(1);
+    emit L.LibraryEvent(2);
+    emit ContractEvent(3);
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "events":
+//     {
+//         "ContractEvent(uint32)":
+//         {
+//             "details": "This should appear in contract C dev doc"
+//         },
+//         "LibraryEvent(uint32)":
+//         {
+//             "details": "This should appear in Contract C dev doc"
+//         },
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should appear in Contract C dev doc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "events":
+//     {
+//         "ContractEvent(uint32)":
+//         {
+//             "notice": "This event is defined in Contract C"
+//         },
+//         "LibraryEvent(uint32)":
+//         {
+//             "notice": "This event is defined in Library L"
+//         },
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in Contract C"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol
new file mode 100644
index 0000000000..5da7a6c1ca
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol
@@ -0,0 +1,53 @@
+library L {
+    /// @notice This event is defined in library L
+    /// @dev This should not appear in contract C devdoc
+    event SameSignatureEvent(uint16);
+    /// @notice This event is defined in library L
+    /// @dev This should appear in contract C devdoc
+    event LibraryEvent(uint32);
+}
+contract C {
+    event SameSignatureEvent(uint16);
+    /// @notice This event is defined in contract C
+    event ContractEvent(uint32);
+    function f() public {
+        emit L.SameSignatureEvent(0);
+        emit SameSignatureEvent(1);
+        emit L.LibraryEvent(2);
+        emit ContractEvent(3);
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "events":
+//     {
+//         "LibraryEvent(uint32)":
+//         {
+//             "details": "This should appear in contract C devdoc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "events":
+//     {
+//         "ContractEvent(uint32)":
+//         {
+//             "notice": "This event is defined in contract C"
+//         },
+//         "LibraryEvent(uint32)":
+//         {
+//             "notice": "This event is defined in library L"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol
new file mode 100644
index 0000000000..9f2ed1ce37
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol
@@ -0,0 +1,46 @@
+contract D {
+    /// @notice This event is defined in contract D
+    /// @dev This should appear in Contract C dev doc
+    event SameSignatureEvent(uint16);
+}
+library L {
+    /// @notice This event is defined in Library L
+    /// @dev This should not appear in Contract C
+    event SameSignatureEvent(uint16);
+}
+contract C is D {
+    function f() public {
+        emit L.SameSignatureEvent(0);
+        emit D.SameSignatureEvent(1);
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should appear in Contract C dev doc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in contract D"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol
new file mode 100644
index 0000000000..106110a0f4
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol
@@ -0,0 +1,30 @@
+contract D {
+    event SameSignatureEvent(uint16);
+}
+library L {
+    /// @notice This event is defined in library L
+    /// @dev This should not appear in contract C devdoc
+    event SameSignatureEvent(uint16);
+}
+contract C is D {
+    function f() public {
+        emit L.SameSignatureEvent(0);
+        emit D.SameSignatureEvent(1);
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/empty_comment.sol b/test/libsolidity/natspecJSON/empty_comment.sol
new file mode 100644
index 0000000000..0f7d691a22
--- /dev/null
+++ b/test/libsolidity/natspecJSON/empty_comment.sol
@@ -0,0 +1,10 @@
+//
+contract test
+{}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/enum_no_docs.sol b/test/libsolidity/natspecJSON/enum_no_docs.sol
new file mode 100644
index 0000000000..021f7c6b2e
--- /dev/null
+++ b/test/libsolidity/natspecJSON/enum_no_docs.sol
@@ -0,0 +1,26 @@
+contract C {
+    /// @title example of title
+    /// @author example of author
+    /// @notice example of notice
+    /// @dev example of dev
+    enum Color {
+        Red,
+        Green
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/error.sol b/test/libsolidity/natspecJSON/error.sol
new file mode 100644
index 0000000000..71b6e9a62b
--- /dev/null
+++ b/test/libsolidity/natspecJSON/error.sol
@@ -0,0 +1,42 @@
+contract test {
+    /// Something failed.
+    /// @dev an error.
+    /// @param a first parameter
+    /// @param b second parameter
+    error E(uint a, uint b);
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "errors":
+//     {
+//         "E(uint256,uint256)":
+//         [
+//             {
+//                 "details": "an error.",
+//                 "params":
+//                 {
+//                     "a": "first parameter",
+//                     "b": "second parameter"
+//                 }
+//             }
+//         ]
+//     },
+//     "methods": {}
+// }
+//
+// :test userdoc
+// {
+//     "errors":
+//     {
+//         "E(uint256,uint256)":
+//         [
+//             {
+//                 "notice": "Something failed."
+//             }
+//         ]
+//     },
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/error_multiple.sol b/test/libsolidity/natspecJSON/error_multiple.sol
new file mode 100644
index 0000000000..cb47cfa6d6
--- /dev/null
+++ b/test/libsolidity/natspecJSON/error_multiple.sol
@@ -0,0 +1,66 @@
+contract A {
+    /// Something failed.
+    /// @dev an error.
+    /// @param x first parameter
+    /// @param y second parameter
+    error E(uint x, uint y);
+}
+contract test {
+    /// X Something failed.
+    /// @dev X an error.
+    /// @param a X first parameter
+    /// @param b X second parameter
+    error E(uint a, uint b);
+    function f(bool a) public pure {
+        if (a)
+            revert E(1, 2);
+        else
+            revert A.E(5, 6);
+    }
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "errors":
+//     {
+//         "E(uint256,uint256)":
+//         [
+//             {
+//                 "details": "an error.",
+//                 "params":
+//                 {
+//                     "x": "first parameter",
+//                     "y": "second parameter"
+//                 }
+//             },
+//             {
+//                 "details": "X an error.",
+//                 "params":
+//                 {
+//                     "a": "X first parameter",
+//                     "b": "X second parameter"
+//                 }
+//             }
+//         ]
+//     },
+//     "methods": {}
+// }
+//
+// :test userdoc
+// {
+//     "errors":
+//     {
+//         "E(uint256,uint256)":
+//         [
+//             {
+//                 "notice": "Something failed."
+//             },
+//             {
+//                 "notice": "X Something failed."
+//             }
+//         ]
+//     },
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/event.sol b/test/libsolidity/natspecJSON/event.sol
new file mode 100644
index 0000000000..bf719b709c
--- /dev/null
+++ b/test/libsolidity/natspecJSON/event.sol
@@ -0,0 +1,40 @@
+contract ERC20 {
+    /// @notice This event is emitted when a transfer occurs.
+    /// @param from The source account.
+    /// @param to The destination account.
+    /// @param amount The amount.
+    /// @dev A test case!
+    event Transfer(address indexed from, address indexed to, uint amount);
+}
+
+// ----
+// ----
+// :ERC20 devdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "details": "A test case!",
+//             "params":
+//             {
+//                 "amount": "The amount.",
+//                 "from": "The source account.",
+//                 "to": "The destination account."
+//             }
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :ERC20 userdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "notice": "This event is emitted when a transfer occurs."
+//         }
+//     },
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/event_inheritance.sol b/test/libsolidity/natspecJSON/event_inheritance.sol
new file mode 100644
index 0000000000..e747b7175f
--- /dev/null
+++ b/test/libsolidity/natspecJSON/event_inheritance.sol
@@ -0,0 +1,104 @@
+contract ERC20 {
+    /// @notice This event is emitted when a transfer occurs.
+    /// @param from The source account.
+    /// @param to The destination account.
+    /// @param amount The amount.
+    /// @dev A test case!
+    event Transfer(address indexed from, address indexed to, uint amount);
+}
+contract A is ERC20 {
+}
+contract B is A {
+}
+
+// ----
+// ----
+// :A devdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "details": "A test case!",
+//             "params":
+//             {
+//                 "amount": "The amount.",
+//                 "from": "The source account.",
+//                 "to": "The destination account."
+//             }
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :A userdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "notice": "This event is emitted when a transfer occurs."
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :B devdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "details": "A test case!",
+//             "params":
+//             {
+//                 "amount": "The amount.",
+//                 "from": "The source account.",
+//                 "to": "The destination account."
+//             }
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :B userdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "notice": "This event is emitted when a transfer occurs."
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :ERC20 devdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "details": "A test case!",
+//             "params":
+//             {
+//                 "amount": "The amount.",
+//                 "from": "The source account.",
+//                 "to": "The destination account."
+//             }
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :ERC20 userdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "notice": "This event is emitted when a transfer occurs."
+//         }
+//     },
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/event_inheritance_interface.sol b/test/libsolidity/natspecJSON/event_inheritance_interface.sol
new file mode 100644
index 0000000000..be93f99373
--- /dev/null
+++ b/test/libsolidity/natspecJSON/event_inheritance_interface.sol
@@ -0,0 +1,104 @@
+interface ERC20 {
+    /// @notice This event is emitted when a transfer occurs.
+    /// @param from The source account.
+    /// @param to The destination account.
+    /// @param amount The amount.
+    /// @dev A test case!
+    event Transfer(address indexed from, address indexed to, uint amount);
+}
+contract A is ERC20 {
+}
+contract B is A {
+}
+
+// ----
+// ----
+// :A devdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "details": "A test case!",
+//             "params":
+//             {
+//                 "amount": "The amount.",
+//                 "from": "The source account.",
+//                 "to": "The destination account."
+//             }
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :A userdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "notice": "This event is emitted when a transfer occurs."
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :B devdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "details": "A test case!",
+//             "params":
+//             {
+//                 "amount": "The amount.",
+//                 "from": "The source account.",
+//                 "to": "The destination account."
+//             }
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :B userdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "notice": "This event is emitted when a transfer occurs."
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :ERC20 devdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "details": "A test case!",
+//             "params":
+//             {
+//                 "amount": "The amount.",
+//                 "from": "The source account.",
+//                 "to": "The destination account."
+//             }
+//         }
+//     },
+//     "methods": {}
+// }
+//
+// :ERC20 userdoc
+// {
+//     "events":
+//     {
+//         "Transfer(address,address,uint256)":
+//         {
+//             "notice": "This event is emitted when a transfer occurs."
+//         }
+//     },
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol b/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
new file mode 100644
index 0000000000..da28d3cd70
--- /dev/null
+++ b/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
@@ -0,0 +1,18 @@
+contract test {
+    /// I do something awesome
+    /// which requires two lines to explain
+    function mul(uint a) public returns (uint d) { return a * 7; }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256)":
+//         {
+//             "notice": "I do something awesome which requires two lines to explain"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/notice_without_tag.sol b/test/libsolidity/natspecJSON/notice_without_tag.sol
new file mode 100644
index 0000000000..658f5316a9
--- /dev/null
+++ b/test/libsolidity/natspecJSON/notice_without_tag.sol
@@ -0,0 +1,17 @@
+contract test {
+    /// I do something awesome
+    function mul(uint a) public returns (uint d) { return a * 7; }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256)":
+//         {
+//             "notice": "I do something awesome"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/private_state_variable.sol b/test/libsolidity/natspecJSON/private_state_variable.sol
new file mode 100644
index 0000000000..ed4bd56cc8
--- /dev/null
+++ b/test/libsolidity/natspecJSON/private_state_variable.sol
@@ -0,0 +1,23 @@
+contract test {
+    /// @dev example of dev
+    uint private state;
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "state":
+//         {
+//             "details": "example of dev"
+//         }
+//     }
+// }
+//
+// :test userdoc
+// {
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/public_state_variable.sol b/test/libsolidity/natspecJSON/public_state_variable.sol
new file mode 100644
index 0000000000..5170806027
--- /dev/null
+++ b/test/libsolidity/natspecJSON/public_state_variable.sol
@@ -0,0 +1,36 @@
+contract test {
+    /// @notice example of notice
+    /// @dev example of dev
+    /// @return returns state
+    uint public state;
+}
+
+// ----
+// ----
+// :test devdoc
+// {
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "state":
+//         {
+//             "details": "example of dev",
+//             "return": "returns state",
+//             "returns":
+//             {
+//                 "_0": "returns state"
+//             }
+//         }
+//     }
+// }
+//
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "state()":
+//         {
+//             "notice": "example of notice"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/public_state_variable_struct.sol b/test/libsolidity/natspecJSON/public_state_variable_struct.sol
new file mode 100644
index 0000000000..a8dff229de
--- /dev/null
+++ b/test/libsolidity/natspecJSON/public_state_variable_struct.sol
@@ -0,0 +1,40 @@
+contract Bank {
+    struct Coin {
+        string observeGraphicURL;
+        string reverseGraphicURL;
+    }
+
+    /// @notice Get the n-th coin I own
+    /// @return observeGraphicURL Front pic
+    /// @return reverseGraphicURL Back pic
+    Coin[] public coinStack;
+}
+
+// ----
+// ----
+// :Bank devdoc
+// {
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "coinStack":
+//         {
+//             "returns":
+//             {
+//                 "observeGraphicURL": "Front pic",
+//                 "reverseGraphicURL": "Back pic"
+//             }
+//         }
+//     }
+// }
+//
+// :Bank userdoc
+// {
+//     "methods":
+//     {
+//         "coinStack(uint256)":
+//         {
+//             "notice": "Get the n-th coin I own"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol b/test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol
new file mode 100644
index 0000000000..a6b4f7f843
--- /dev/null
+++ b/test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol
@@ -0,0 +1,13 @@
+contract Bank {
+    struct Coin {
+        string obverseGraphicURL;
+        string reverseGraphicURL;
+    }
+
+    /// @notice Get the n-th coin I own
+    /// @return obverseGraphicURL Front pic
+    /// @return obverseGraphicURL Front pic
+    Coin[] public coinStack;
+}
+
+// ----
diff --git a/test/libsolidity/natspecJSON/slash3_slash3.sol b/test/libsolidity/natspecJSON/slash3_slash3.sol
new file mode 100644
index 0000000000..ea40cdaa9b
--- /dev/null
+++ b/test/libsolidity/natspecJSON/slash3_slash3.sol
@@ -0,0 +1,18 @@
+contract test {
+    /// @notice lorem
+    /// ipsum
+    function f() public { }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "f()":
+//         {
+//             "notice": "lorem ipsum"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/slash3_slash4.sol b/test/libsolidity/natspecJSON/slash3_slash4.sol
new file mode 100644
index 0000000000..b8b5dc33eb
--- /dev/null
+++ b/test/libsolidity/natspecJSON/slash3_slash4.sol
@@ -0,0 +1,18 @@
+contract test {
+    /// @notice lorem
+    //// ipsum
+    function f() public { }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "f()":
+//         {
+//             "notice": "lorem"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/slash4.sol b/test/libsolidity/natspecJSON/slash4.sol
new file mode 100644
index 0000000000..1016d6204a
--- /dev/null
+++ b/test/libsolidity/natspecJSON/slash4.sol
@@ -0,0 +1,11 @@
+contract test {
+    //// @notice lorem ipsum
+    function f() public { }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/star3.sol b/test/libsolidity/natspecJSON/star3.sol
new file mode 100644
index 0000000000..965ce1e66c
--- /dev/null
+++ b/test/libsolidity/natspecJSON/star3.sol
@@ -0,0 +1,13 @@
+contract test {
+    /***
+     * @notice lorem ipsum
+     */
+    function f() public { }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/struct_no_docs.sol b/test/libsolidity/natspecJSON/struct_no_docs.sol
new file mode 100644
index 0000000000..e29a4b8e9d
--- /dev/null
+++ b/test/libsolidity/natspecJSON/struct_no_docs.sol
@@ -0,0 +1,27 @@
+contract C {
+    /// @title example of title
+    /// @author example of author
+    /// @notice example of notice
+    /// @dev example of dev
+    struct Example {
+        string text;
+        bool valid;
+        uint256 value;
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/user_basic_test.sol b/test/libsolidity/natspecJSON/user_basic_test.sol
new file mode 100644
index 0000000000..27df4c616a
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_basic_test.sol
@@ -0,0 +1,17 @@
+contract test {
+    /// @notice Multiplies `a` by 7
+    function mul(uint a) public returns(uint d) { return a * 7; }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "mul(uint256)":
+//         {
+//             "notice": "Multiplies `a` by 7"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_constructor.sol b/test/libsolidity/natspecJSON/user_constructor.sol
new file mode 100644
index 0000000000..bd49a376c5
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_constructor.sol
@@ -0,0 +1,17 @@
+contract test {
+    /// @notice this is a really nice constructor
+    constructor(uint a, uint second) { }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "constructor":
+//         {
+//             "notice": "this is a really nice constructor"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_constructor_and_function.sol b/test/libsolidity/natspecJSON/user_constructor_and_function.sol
new file mode 100644
index 0000000000..0dd1b33fb5
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_constructor_and_function.sol
@@ -0,0 +1,23 @@
+contract test {
+    /// @notice this is a really nice constructor
+    constructor(uint a, uint second) { }
+    /// another multiplier
+    function mul(uint a, uint second) public returns(uint d) { return a * 7 + second; }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "constructor":
+//         {
+//             "notice": "this is a really nice constructor"
+//         },
+//         "mul(uint256,uint256)":
+//         {
+//             "notice": "another multiplier"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_default_inherit.sol b/test/libsolidity/natspecJSON/user_default_inherit.sol
new file mode 100644
index 0000000000..ab92e6bc6a
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_default_inherit.sol
@@ -0,0 +1,57 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// Second line.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract Middle is ERC20 {
+    function transfer(address to, uint amount) virtual override external returns (bool)
+    {
+        return false;
+    }
+}
+
+contract Token is Middle {
+    function transfer(address to, uint amount) override external returns (bool)
+    {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
+//         }
+//     }
+// }
+//
+// :Middle userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
+//         }
+//     }
+// }
+//
+// :Token userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_default_inherit_variable.sol b/test/libsolidity/natspecJSON/user_default_inherit_variable.sol
new file mode 100644
index 0000000000..eee21cd911
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_default_inherit_variable.sol
@@ -0,0 +1,35 @@
+contract C {
+    /// @notice Hello world
+    /// @dev test
+    function x() virtual external returns (uint) {
+        return 1;
+    }
+}
+
+contract D is C {
+    uint public override x;
+}
+
+// ----
+// ----
+// :C userdoc
+// {
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "notice": "Hello world"
+//         }
+//     }
+// }
+//
+// :D userdoc
+// {
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "notice": "Hello world"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_empty_contract.sol b/test/libsolidity/natspecJSON/user_empty_contract.sol
new file mode 100644
index 0000000000..be7bc2a2f3
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_empty_contract.sol
@@ -0,0 +1,8 @@
+contract test { }
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/user_empty_natspec_test.sol b/test/libsolidity/natspecJSON/user_empty_natspec_test.sol
new file mode 100644
index 0000000000..08c4389528
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_empty_natspec_test.sol
@@ -0,0 +1,13 @@
+contract test {
+    ///
+    ///
+    function f() public {
+    }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit.sol b/test/libsolidity/natspecJSON/user_explicit_inherit.sol
new file mode 100644
index 0000000000..96ab8effed
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit.sol
@@ -0,0 +1,44 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract ERC21 {
+    function transfer(address to, uint amount) virtual external returns (bool) {
+        return false;
+    }
+}
+
+contract Token is ERC21, ERC20 {
+    /// @inheritdoc ERC20
+    function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     }
+// }
+//
+// :Token userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit2.sol b/test/libsolidity/natspecJSON/user_explicit_inherit2.sol
new file mode 100644
index 0000000000..5be6140f00
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit2.sol
@@ -0,0 +1,55 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract ERC21 is ERC20 {
+    function transfer(address to, uint amount) virtual override external returns (bool) {
+        return false;
+    }
+}
+
+contract Token is ERC20 {
+    /// @inheritdoc ERC20
+    function transfer(address to, uint amount) override external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     }
+// }
+//
+// :ERC21 userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     }
+// }
+//
+// :Token userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
new file mode 100644
index 0000000000..5a865d8228
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
@@ -0,0 +1,46 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract ERC21 {
+    function transfer(address to, uint amount) virtual external returns (bool) {
+        return false;
+    }
+}
+
+contract Token is ERC21, ERC20 {
+    /// @inheritdoc ERC20
+    /// @dev override dev comment
+    /// @notice override notice
+    function transfer(address to, uint amount) override(ERC21, ERC20) external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     }
+// }
+//
+// :Token userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "override notice"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
new file mode 100644
index 0000000000..460c90dd90
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
@@ -0,0 +1,46 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract ERC21 is ERC20 {
+    /// @inheritdoc ERC20
+    /// @dev override dev comment
+    /// @notice override notice
+    function transfer(address to, uint amount) virtual override external returns (bool) {
+        return false;
+    }
+}
+
+contract Token is ERC21 {
+    function transfer(address to, uint amount) override external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     }
+// }
+//
+// :Token userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "override notice"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
new file mode 100644
index 0000000000..9e6e96bf6e
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
@@ -0,0 +1,42 @@
+contract B {
+    function x() virtual external returns (uint) {
+        return 1;
+    }
+}
+
+contract C {
+    /// @notice Hello world
+    /// @dev test
+    function x() virtual external returns (uint) {
+        return 1;
+    }
+}
+
+contract D is C, B {
+    /// @inheritdoc C
+    uint public override(C, B) x;
+}
+
+// ----
+// ----
+// :C userdoc
+// {
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "notice": "Hello world"
+//         }
+//     }
+// }
+//
+// :D userdoc
+// {
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "notice": "Hello world"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol b/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
new file mode 100644
index 0000000000..a427f16af1
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
@@ -0,0 +1,48 @@
+interface ERC20 {
+    /// Transfer ``amount`` from ``msg.sender`` to ``to``.
+    /// @dev test
+    /// @param to address to transfer to
+    /// @param amount amount to transfer
+    function transfer(address to, uint amount) external returns (bool);
+}
+
+contract Middle is ERC20 {
+    function transfer(address to, uint amount) override virtual external returns (bool) {
+        return false;
+    }
+}
+
+contract Token is Middle {
+    function transfer(address too, uint amount) override external returns (bool) {
+        return false;
+    }
+}
+
+// ----
+// ----
+// :ERC20 userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     }
+// }
+//
+// :Middle userdoc
+// {
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     }
+// }
+//
+// :Token userdoc
+// {
+//     "methods": {}
+// }
diff --git a/test/libsolidity/natspecJSON/user_multiline_comment.sol b/test/libsolidity/natspecJSON/user_multiline_comment.sol
new file mode 100644
index 0000000000..e8c7f61ded
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_multiline_comment.sol
@@ -0,0 +1,20 @@
+contract test {
+    /// @notice Multiplies `a` by 7
+    /// and then adds `b`
+    function mul_and_add(uint a, uint256 b) public returns (uint256 d) {
+        return (a * 7) + b;
+    }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "mul_and_add(uint256,uint256)":
+//         {
+//             "notice": "Multiplies `a` by 7 and then adds `b`"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol b/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
new file mode 100644
index 0000000000..93f20a1954
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
@@ -0,0 +1,22 @@
+contract test {
+    /**
+     *
+     *
+     * @notice hello world
+     */
+    function f() public {
+    }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "f()":
+//         {
+//             "notice": "hello world"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_multiple_functions.sol b/test/libsolidity/natspecJSON/user_multiple_functions.sol
new file mode 100644
index 0000000000..a2ae7f0587
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_multiple_functions.sol
@@ -0,0 +1,37 @@
+contract test {
+    /// @notice Multiplies `a` by 7 and then adds `b`
+    function mul_and_add(uint a, uint256 b) public returns (uint256 d) {
+        return (a * 7) + b;
+    }
+
+    /// @notice Divides `input` by `div`
+    function divide(uint input, uint div) public returns (uint d) {
+        return input / div;
+    }
+
+    /// @notice Subtracts 3 from `input`
+    function sub(int input) public returns (int d) {
+        return input - 3;
+    }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "divide(uint256,uint256)":
+//         {
+//             "notice": "Divides `input` by `div`"
+//         },
+//         "mul_and_add(uint256,uint256)":
+//         {
+//             "notice": "Multiplies `a` by 7 and then adds `b`"
+//         },
+//         "sub(int256)":
+//         {
+//             "notice": "Subtracts 3 from `input`"
+//         }
+//     }
+// }
diff --git a/test/libsolidity/natspecJSON/user_newline_break.sol b/test/libsolidity/natspecJSON/user_newline_break.sol
new file mode 100644
index 0000000000..97744a74f9
--- /dev/null
+++ b/test/libsolidity/natspecJSON/user_newline_break.sol
@@ -0,0 +1,21 @@
+contract test {
+    ///
+    /// @notice hello
+
+    /// @notice world
+    function f() public {
+    }
+}
+
+// ----
+// ----
+// :test userdoc
+// {
+//     "methods":
+//     {
+//         "f()":
+//         {
+//             "notice": "world"
+//         }
+//     }
+// }

From 481c7256cb222fc2792302f7c88a4c41e6bea125 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 9 Aug 2023 19:33:35 +0200
Subject: [PATCH 1596/1748] natspecJSON: Include `version` and `kind` fields in
 expectations where missing

---
 test/libsolidity/natspecJSON/custom.sol       |  4 +++-
 .../natspecJSON/custom_inheritance.sol        |  8 +++++--
 .../natspecJSON/dev_and_user_basic_test.sol   |  8 +++++--
 .../natspecJSON/dev_and_user_no_doc.sol       |  8 +++++--
 .../natspecJSON/dev_constructor.sol           |  4 +++-
 .../dev_constructor_and_function.sol          |  4 +++-
 .../natspecJSON/dev_contract_doc.sol          |  4 +++-
 .../natspecJSON/dev_contract_no_doc.sol       |  4 +++-
 .../natspecJSON/dev_default_inherit.sol       | 12 +++++++---
 .../dev_default_inherit_variable.sol          |  8 +++++--
 .../natspecJSON/dev_desc_after_nl.sol         |  4 +++-
 .../natspecJSON/dev_different_return_name.sol |  8 +++++--
 .../dev_different_return_name_multiple.sol    |  8 +++++--
 ...nt_return_name_multiple_partly_unnamed.sol |  8 +++++--
 ...different_return_name_multiple_unnamed.sol |  8 +++++--
 .../natspecJSON/dev_explicit_inherit.sol      |  8 +++++--
 .../natspecJSON/dev_explicit_inherit2.sol     | 12 +++++++---
 .../dev_explicit_inherit_complex.sol          |  4 +++-
 .../dev_explicit_inherit_partial.sol          |  8 +++++--
 .../dev_explicit_inherit_partial2.sol         |  8 +++++--
 .../dev_explicit_inherit_variable.sol         |  8 +++++--
 .../dev_inherit_parameter_mismatch.sol        | 12 +++++++---
 .../natspecJSON/dev_multiline_comment.sol     |  4 +++-
 .../natspecJSON/dev_multiline_return.sol      |  4 +++-
 .../natspecJSON/dev_multiple_functions.sol    |  4 +++-
 .../natspecJSON/dev_multiple_params.sol       |  4 +++-
 .../dev_multiple_params_mixed_whitespace.sol  |  4 +++-
 .../dev_mutiline_param_description.sol        |  4 +++-
 test/libsolidity/natspecJSON/dev_return.sol   |  4 +++-
 .../natspecJSON/dev_return_desc_after_nl.sol  |  4 +++-
 .../natspecJSON/dev_return_desc_multiple.sol  |  4 +++-
 .../dev_return_desc_multiple_unamed.sol       |  4 +++-
 .../dev_return_desc_multiple_unamed_mixed.sol |  4 +++-
 ...ev_return_desc_multiple_unamed_mixed_2.sol |  4 +++-
 .../dev_return_name_no_description.sol        |  8 +++++--
 .../natspecJSON/dev_return_no_params.sol      |  4 +++-
 .../dev_struct_getter_override.sol            |  8 +++++--
 ...rride_different_return_parameter_names.sol |  8 +++++--
 ..._struct_getter_override_no_return_name.sol |  8 +++++--
 .../libsolidity/natspecJSON/empty_comment.sol |  4 +++-
 test/libsolidity/natspecJSON/error.sol        |  8 +++++--
 .../natspecJSON/error_multiple.sol            |  8 +++++--
 test/libsolidity/natspecJSON/event.sol        |  8 +++++--
 .../natspecJSON/event_inheritance.sol         | 24 ++++++++++++++-----
 .../event_inheritance_interface.sol           | 24 ++++++++++++++-----
 .../multiline_notice_without_tag.sol          |  4 +++-
 .../natspecJSON/notice_without_tag.sol        |  4 +++-
 .../natspecJSON/private_state_variable.sol    |  8 +++++--
 .../natspecJSON/public_state_variable.sol     |  8 +++++--
 .../public_state_variable_struct.sol          |  8 +++++--
 .../libsolidity/natspecJSON/slash3_slash3.sol |  4 +++-
 .../libsolidity/natspecJSON/slash3_slash4.sol |  4 +++-
 test/libsolidity/natspecJSON/slash4.sol       |  4 +++-
 test/libsolidity/natspecJSON/star3.sol        |  4 +++-
 .../natspecJSON/user_basic_test.sol           |  4 +++-
 .../natspecJSON/user_constructor.sol          |  4 +++-
 .../user_constructor_and_function.sol         |  4 +++-
 .../natspecJSON/user_default_inherit.sol      | 12 +++++++---
 .../user_default_inherit_variable.sol         |  8 +++++--
 .../natspecJSON/user_empty_contract.sol       |  4 +++-
 .../natspecJSON/user_empty_natspec_test.sol   |  4 +++-
 .../natspecJSON/user_explicit_inherit.sol     |  8 +++++--
 .../natspecJSON/user_explicit_inherit2.sol    | 12 +++++++---
 .../user_explicit_inherit_partial.sol         |  8 +++++--
 .../user_explicit_inherit_partial2.sol        |  8 +++++--
 .../user_explicit_inherit_variable.sol        |  8 +++++--
 .../user_inherit_parameter_mismatch.sol       | 12 +++++++---
 .../natspecJSON/user_multiline_comment.sol    |  4 +++-
 .../user_multiline_empty_lines.sol            |  4 +++-
 .../natspecJSON/user_multiple_functions.sol   |  4 +++-
 .../natspecJSON/user_newline_break.sol        |  4 +++-
 71 files changed, 360 insertions(+), 120 deletions(-)

diff --git a/test/libsolidity/natspecJSON/custom.sol b/test/libsolidity/natspecJSON/custom.sol
index 8aa780e75e..43fd7283e8 100644
--- a/test/libsolidity/natspecJSON/custom.sol
+++ b/test/libsolidity/natspecJSON/custom.sol
@@ -17,6 +17,7 @@ contract A {
 //     "custom:t": "onetwo",
 //     "custom:x": "one two three",
 //     "custom:y": "line break",
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -30,5 +31,6 @@ contract A {
 //         {
 //             "custom:note": "statevar"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/custom_inheritance.sol b/test/libsolidity/natspecJSON/custom_inheritance.sol
index 815e4deeb5..f4fb80b553 100644
--- a/test/libsolidity/natspecJSON/custom_inheritance.sol
+++ b/test/libsolidity/natspecJSON/custom_inheritance.sol
@@ -10,16 +10,20 @@ contract B is A {
 // ----
 // :A devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(uint256)":
 //         {
 //             "custom:since": "2014"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :B devdoc
 // {
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol b/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol
index 6b9d75ba7f..4225223544 100644
--- a/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol
+++ b/test/libsolidity/natspecJSON/dev_and_user_basic_test.sol
@@ -8,22 +8,26 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256)":
 //         {
 //             "details": "Multiplies a number by 7"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "mul(uint256)":
 //         {
 //             "notice": "Multiplies `a` by 7"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol b/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol
index aaf9ec315f..db7447914b 100644
--- a/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol
+++ b/test/libsolidity/natspecJSON/dev_and_user_no_doc.sol
@@ -11,10 +11,14 @@ contract test {
 // ----
 // :test devdoc
 // {
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :test userdoc
 // {
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_constructor.sol b/test/libsolidity/natspecJSON/dev_constructor.sol
index 01fa9cb41b..ffdcfea941 100644
--- a/test/libsolidity/natspecJSON/dev_constructor.sol
+++ b/test/libsolidity/natspecJSON/dev_constructor.sol
@@ -8,6 +8,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "constructor":
@@ -18,5 +19,6 @@ contract test {
 //                 "second": "the second parameter is not very useful, it just provides additional confusion"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_constructor_and_function.sol b/test/libsolidity/natspecJSON/dev_constructor_and_function.sol
index ea954827a8..e15f03f031 100644
--- a/test/libsolidity/natspecJSON/dev_constructor_and_function.sol
+++ b/test/libsolidity/natspecJSON/dev_constructor_and_function.sol
@@ -17,6 +17,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "constructor":
@@ -40,5 +41,6 @@ contract test {
 //                 "d": "The result of the multiplication and cookies with nutella"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_contract_doc.sol b/test/libsolidity/natspecJSON/dev_contract_doc.sol
index 22c45dfb8b..5acc2d1989 100644
--- a/test/libsolidity/natspecJSON/dev_contract_doc.sol
+++ b/test/libsolidity/natspecJSON/dev_contract_doc.sol
@@ -10,6 +10,7 @@ contract test {
 // :test devdoc
 // {
 //     "author": "Lefteris",
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -17,5 +18,6 @@ contract test {
 //             "details": "Mul function"
 //         }
 //     },
-//     "title": "Just a test contract"
+//     "title": "Just a test contract",
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_contract_no_doc.sol b/test/libsolidity/natspecJSON/dev_contract_no_doc.sol
index 6e7d587d19..aa8a86a0e1 100644
--- a/test/libsolidity/natspecJSON/dev_contract_no_doc.sol
+++ b/test/libsolidity/natspecJSON/dev_contract_no_doc.sol
@@ -7,11 +7,13 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
 //         {
 //             "details": "Mul function"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_default_inherit.sol b/test/libsolidity/natspecJSON/dev_default_inherit.sol
index 6a106fbf0e..d144b3840d 100644
--- a/test/libsolidity/natspecJSON/dev_default_inherit.sol
+++ b/test/libsolidity/natspecJSON/dev_default_inherit.sol
@@ -25,6 +25,7 @@ contract Token is Middle {
 // ----
 // :ERC20 devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -36,11 +37,13 @@ contract Token is Middle {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Middle devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -52,11 +55,13 @@ contract Token is Middle {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -68,5 +73,6 @@ contract Token is Middle {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol b/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
index 7e75d30f81..1974bd6514 100644
--- a/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
+++ b/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
@@ -14,17 +14,20 @@ contract D is C {
 // ----
 // :C devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "x()":
 //         {
 //             "details": "test"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :D devdoc
 // {
+//     "kind": "dev",
 //     "methods": {},
 //     "stateVariables":
 //     {
@@ -32,5 +35,6 @@ contract D is C {
 //         {
 //             "details": "test"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_desc_after_nl.sol b/test/libsolidity/natspecJSON/dev_desc_after_nl.sol
index 745ab190bd..f7e892ae8a 100644
--- a/test/libsolidity/natspecJSON/dev_desc_after_nl.sol
+++ b/test/libsolidity/natspecJSON/dev_desc_after_nl.sol
@@ -10,6 +10,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -21,5 +22,6 @@ contract test {
 //                 "second": "Documentation for the second parameter"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name.sol b/test/libsolidity/natspecJSON/dev_different_return_name.sol
index 3a1606dc53..2b7160be19 100644
--- a/test/libsolidity/natspecJSON/dev_different_return_name.sol
+++ b/test/libsolidity/natspecJSON/dev_different_return_name.sol
@@ -11,6 +11,7 @@ contract B is A {
 // ----
 // :A devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -20,11 +21,13 @@ contract B is A {
 //                 "y": "value"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :B devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -34,5 +37,6 @@ contract B is A {
 //                 "z": "value"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
index 8dc76fb701..90e21462ca 100644
--- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
+++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
@@ -12,6 +12,7 @@ contract B is A {
 // ----
 // :A devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -22,11 +23,13 @@ contract B is A {
 //                 "b": "value B"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :B devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -37,5 +40,6 @@ contract B is A {
 //                 "z": "value A"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
index 1fa8eb9fb6..1ddf47aeef 100644
--- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
+++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
@@ -12,6 +12,7 @@ contract B is A {
 // ----
 // :A devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -22,11 +23,13 @@ contract B is A {
 //                 "b": "value B"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :B devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -37,5 +40,6 @@ contract B is A {
 //                 "z": "value A"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
index c0ce38726b..cc172a8c84 100644
--- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
+++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
@@ -12,6 +12,7 @@ contract B is A {
 // ----
 // :A devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -22,11 +23,13 @@ contract B is A {
 //                 "_1": "value B"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :B devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -37,5 +40,6 @@ contract B is A {
 //                 "z": "value A"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit.sol
index f665035b92..5efae37f2a 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit.sol
@@ -23,6 +23,7 @@ contract Token is ERC21, ERC20 {
 // ----
 // :ERC20 devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -34,11 +35,13 @@ contract Token is ERC21, ERC20 {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -50,5 +53,6 @@ contract Token is ERC21, ERC20 {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
index c251f678e4..2f1f8f17f9 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
@@ -23,6 +23,7 @@ contract Token is ERC20 {
 // ----
 // :ERC20 devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -34,11 +35,13 @@ contract Token is ERC20 {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :ERC21 devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -50,11 +53,13 @@ contract Token is ERC20 {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -66,5 +71,6 @@ contract Token is ERC20 {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
index 02a0f2cc72..c87f6c30f7 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
@@ -30,6 +30,7 @@ contract Token is myInterfaces.ERC20, myInterfaces.ERC21 {
 // ----
 // Testfile.sol:Token devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -41,5 +42,6 @@ contract Token is myInterfaces.ERC20, myInterfaces.ERC21 {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
index bbe44ad7d5..0dce69ccb2 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
@@ -25,6 +25,7 @@ contract Token is ERC21, ERC20 {
 // ----
 // :ERC20 devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -36,11 +37,13 @@ contract Token is ERC21, ERC20 {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -52,5 +55,6 @@ contract Token is ERC21, ERC20 {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
index 40a852a1e9..e9590d9cee 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
@@ -25,6 +25,7 @@ contract Token is ERC21 {
 // ----
 // :ERC20 devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -36,11 +37,13 @@ contract Token is ERC21 {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -52,5 +55,6 @@ contract Token is ERC21 {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
index f868453d0d..cf3b1aba37 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
@@ -21,17 +21,20 @@ contract D is C, B {
 // ----
 // :C devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "x()":
 //         {
 //             "details": "test"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :D devdoc
 // {
+//     "kind": "dev",
 //     "methods": {},
 //     "stateVariables":
 //     {
@@ -39,5 +42,6 @@ contract D is C, B {
 //         {
 //             "details": "test"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol b/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
index a395fc051c..579660f2f9 100644
--- a/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
+++ b/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
@@ -22,6 +22,7 @@ contract Token is Middle {
 // ----
 // :ERC20 devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -33,11 +34,13 @@ contract Token is Middle {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Middle devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
@@ -49,10 +52,13 @@ contract Token is Middle {
 //                 "to": "address to transfer to"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token devdoc
 // {
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_multiline_comment.sol b/test/libsolidity/natspecJSON/dev_multiline_comment.sol
index 9eb06e5c97..7757636c93 100644
--- a/test/libsolidity/natspecJSON/dev_multiline_comment.sol
+++ b/test/libsolidity/natspecJSON/dev_multiline_comment.sol
@@ -16,6 +16,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -31,5 +32,6 @@ contract test {
 //                 "d": "The result of the multiplication and cookies with nutella"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_multiline_return.sol b/test/libsolidity/natspecJSON/dev_multiline_return.sol
index 88169fbf10..792cf11cea 100644
--- a/test/libsolidity/natspecJSON/dev_multiline_return.sol
+++ b/test/libsolidity/natspecJSON/dev_multiline_return.sol
@@ -14,6 +14,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -29,5 +30,6 @@ contract test {
 //                 "d": "The result of the multiplication and cookies with nutella"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_functions.sol b/test/libsolidity/natspecJSON/dev_multiple_functions.sol
index 2be5dae5a5..f3fb5876a3 100644
--- a/test/libsolidity/natspecJSON/dev_multiple_functions.sol
+++ b/test/libsolidity/natspecJSON/dev_multiple_functions.sol
@@ -22,6 +22,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "divide(uint256,uint256)":
@@ -50,5 +51,6 @@ contract test {
 //                 "input": "Documentation for the input parameter"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_params.sol b/test/libsolidity/natspecJSON/dev_multiple_params.sol
index de3c57cf5a..909452ee87 100644
--- a/test/libsolidity/natspecJSON/dev_multiple_params.sol
+++ b/test/libsolidity/natspecJSON/dev_multiple_params.sol
@@ -9,6 +9,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -20,5 +21,6 @@ contract test {
 //                 "second": "Documentation for the second parameter"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
index 50fb4d53b9..f9dfa0b528 100644
--- a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
+++ b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
@@ -9,6 +9,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -20,5 +21,6 @@ contract test {
 //                 "second": "Documentation for the second parameter"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol b/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
index 0ed4d08cb7..8c5092534a 100644
--- a/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
+++ b/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
@@ -10,6 +10,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -21,5 +22,6 @@ contract test {
 //                 "second": "Documentation for the second parameter"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_return.sol b/test/libsolidity/natspecJSON/dev_return.sol
index ffe36c8636..e17c6466c6 100644
--- a/test/libsolidity/natspecJSON/dev_return.sol
+++ b/test/libsolidity/natspecJSON/dev_return.sol
@@ -11,6 +11,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -26,5 +27,6 @@ contract test {
 //                 "d": "The result of the multiplication"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol b/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
index 0ef9043473..4c17105fcf 100644
--- a/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
+++ b/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
@@ -14,6 +14,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -29,5 +30,6 @@ contract test {
 //                 "d": "The result of the multiplication"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
index b8d167d2c6..d902983a0f 100644
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
@@ -15,6 +15,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -31,5 +32,6 @@ contract test {
 //                 "f": "And cookies with nutella"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
index fc48d1f663..877e149273 100644
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
@@ -15,6 +15,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -31,5 +32,6 @@ contract test {
 //                 "_1": "And cookies with nutella"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
index 84d55a1f50..2b8c1771a7 100644
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
@@ -15,6 +15,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -31,5 +32,6 @@ contract test {
 //                 "_cookies": "And cookies with nutella"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
index 9847c3ac24..208a950953 100644
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
@@ -17,6 +17,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -34,5 +35,6 @@ contract test {
 //                 "_milk": "And milk with nutella"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_return_name_no_description.sol b/test/libsolidity/natspecJSON/dev_return_name_no_description.sol
index 555c7f9256..a96535a615 100644
--- a/test/libsolidity/natspecJSON/dev_return_name_no_description.sol
+++ b/test/libsolidity/natspecJSON/dev_return_name_no_description.sol
@@ -11,6 +11,7 @@ contract B is A {
 // ----
 // :A devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -20,11 +21,13 @@ contract B is A {
 //                 "a": "a"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :B devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "g(int256)":
@@ -34,5 +37,6 @@ contract B is A {
 //                 "b": "a"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_return_no_params.sol b/test/libsolidity/natspecJSON/dev_return_no_params.sol
index 870058b076..e7e9e8cbb7 100644
--- a/test/libsolidity/natspecJSON/dev_return_no_params.sol
+++ b/test/libsolidity/natspecJSON/dev_return_no_params.sol
@@ -7,6 +7,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "mul(uint256,uint256)":
@@ -16,5 +17,6 @@ contract test {
 //                 "d": "The result of the multiplication"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override.sol
index 7cc09a183a..5d9ce6e803 100644
--- a/test/libsolidity/natspecJSON/dev_struct_getter_override.sol
+++ b/test/libsolidity/natspecJSON/dev_struct_getter_override.sol
@@ -17,6 +17,7 @@ contract Thing is IThing {
 // ----
 // :IThing devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "value()":
@@ -27,11 +28,13 @@ contract Thing is IThing {
 //                 "y": "another number"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Thing devdoc
 // {
+//     "kind": "dev",
 //     "methods": {},
 //     "stateVariables":
 //     {
@@ -43,5 +46,6 @@ contract Thing is IThing {
 //                 "y": "another number"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
index 050abfd7f7..dcc86ed93d 100644
--- a/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
+++ b/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
@@ -17,6 +17,7 @@ contract Thing is IThing {
 // ----
 // :IThing devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "value()":
@@ -27,11 +28,13 @@ contract Thing is IThing {
 //                 "y": "another number"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Thing devdoc
 // {
+//     "kind": "dev",
 //     "methods": {},
 //     "stateVariables":
 //     {
@@ -43,5 +46,6 @@ contract Thing is IThing {
 //                 "b": "another number"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
index 927037f12b..dc97cb8a98 100644
--- a/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
+++ b/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
@@ -15,6 +15,7 @@ contract Thing is IThing {
 // ----
 // :IThing devdoc
 // {
+//     "kind": "dev",
 //     "methods":
 //     {
 //         "value(uint256)":
@@ -24,11 +25,13 @@ contract Thing is IThing {
 //                 "_0": ""
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Thing devdoc
 // {
+//     "kind": "dev",
 //     "methods": {},
 //     "stateVariables":
 //     {
@@ -40,5 +43,6 @@ contract Thing is IThing {
 //                 "x": ""
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/empty_comment.sol b/test/libsolidity/natspecJSON/empty_comment.sol
index 0f7d691a22..db0f9e533f 100644
--- a/test/libsolidity/natspecJSON/empty_comment.sol
+++ b/test/libsolidity/natspecJSON/empty_comment.sol
@@ -6,5 +6,7 @@ contract test
 // ----
 // :test userdoc
 // {
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/error.sol b/test/libsolidity/natspecJSON/error.sol
index 71b6e9a62b..c82412fec4 100644
--- a/test/libsolidity/natspecJSON/error.sol
+++ b/test/libsolidity/natspecJSON/error.sol
@@ -24,7 +24,9 @@ contract test {
 //             }
 //         ]
 //     },
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :test userdoc
@@ -38,5 +40,7 @@ contract test {
 //             }
 //         ]
 //     },
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/error_multiple.sol b/test/libsolidity/natspecJSON/error_multiple.sol
index cb47cfa6d6..336710ec3c 100644
--- a/test/libsolidity/natspecJSON/error_multiple.sol
+++ b/test/libsolidity/natspecJSON/error_multiple.sol
@@ -45,7 +45,9 @@ contract test {
 //             }
 //         ]
 //     },
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :test userdoc
@@ -62,5 +64,7 @@ contract test {
 //             }
 //         ]
 //     },
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/event.sol b/test/libsolidity/natspecJSON/event.sol
index bf719b709c..9887b021df 100644
--- a/test/libsolidity/natspecJSON/event.sol
+++ b/test/libsolidity/natspecJSON/event.sol
@@ -24,7 +24,9 @@ contract ERC20 {
 //             }
 //         }
 //     },
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :ERC20 userdoc
@@ -36,5 +38,7 @@ contract ERC20 {
 //             "notice": "This event is emitted when a transfer occurs."
 //         }
 //     },
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/event_inheritance.sol b/test/libsolidity/natspecJSON/event_inheritance.sol
index e747b7175f..7912bd1b51 100644
--- a/test/libsolidity/natspecJSON/event_inheritance.sol
+++ b/test/libsolidity/natspecJSON/event_inheritance.sol
@@ -28,7 +28,9 @@ contract B is A {
 //             }
 //         }
 //     },
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :A userdoc
@@ -40,7 +42,9 @@ contract B is A {
 //             "notice": "This event is emitted when a transfer occurs."
 //         }
 //     },
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :B devdoc
@@ -58,7 +62,9 @@ contract B is A {
 //             }
 //         }
 //     },
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :B userdoc
@@ -70,7 +76,9 @@ contract B is A {
 //             "notice": "This event is emitted when a transfer occurs."
 //         }
 //     },
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :ERC20 devdoc
@@ -88,7 +96,9 @@ contract B is A {
 //             }
 //         }
 //     },
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :ERC20 userdoc
@@ -100,5 +110,7 @@ contract B is A {
 //             "notice": "This event is emitted when a transfer occurs."
 //         }
 //     },
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/event_inheritance_interface.sol b/test/libsolidity/natspecJSON/event_inheritance_interface.sol
index be93f99373..8b4137fcc7 100644
--- a/test/libsolidity/natspecJSON/event_inheritance_interface.sol
+++ b/test/libsolidity/natspecJSON/event_inheritance_interface.sol
@@ -28,7 +28,9 @@ contract B is A {
 //             }
 //         }
 //     },
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :A userdoc
@@ -40,7 +42,9 @@ contract B is A {
 //             "notice": "This event is emitted when a transfer occurs."
 //         }
 //     },
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :B devdoc
@@ -58,7 +62,9 @@ contract B is A {
 //             }
 //         }
 //     },
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :B userdoc
@@ -70,7 +76,9 @@ contract B is A {
 //             "notice": "This event is emitted when a transfer occurs."
 //         }
 //     },
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :ERC20 devdoc
@@ -88,7 +96,9 @@ contract B is A {
 //             }
 //         }
 //     },
-//     "methods": {}
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
 // }
 //
 // :ERC20 userdoc
@@ -100,5 +110,7 @@ contract B is A {
 //             "notice": "This event is emitted when a transfer occurs."
 //         }
 //     },
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol b/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
index da28d3cd70..b29ccab0b1 100644
--- a/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
+++ b/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
@@ -8,11 +8,13 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "mul(uint256)":
 //         {
 //             "notice": "I do something awesome which requires two lines to explain"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/notice_without_tag.sol b/test/libsolidity/natspecJSON/notice_without_tag.sol
index 658f5316a9..215393244d 100644
--- a/test/libsolidity/natspecJSON/notice_without_tag.sol
+++ b/test/libsolidity/natspecJSON/notice_without_tag.sol
@@ -7,11 +7,13 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "mul(uint256)":
 //         {
 //             "notice": "I do something awesome"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/private_state_variable.sol b/test/libsolidity/natspecJSON/private_state_variable.sol
index ed4bd56cc8..7d7707a8de 100644
--- a/test/libsolidity/natspecJSON/private_state_variable.sol
+++ b/test/libsolidity/natspecJSON/private_state_variable.sol
@@ -7,6 +7,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods": {},
 //     "stateVariables":
 //     {
@@ -14,10 +15,13 @@ contract test {
 //         {
 //             "details": "example of dev"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :test userdoc
 // {
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/public_state_variable.sol b/test/libsolidity/natspecJSON/public_state_variable.sol
index 5170806027..5fda30cecc 100644
--- a/test/libsolidity/natspecJSON/public_state_variable.sol
+++ b/test/libsolidity/natspecJSON/public_state_variable.sol
@@ -9,6 +9,7 @@ contract test {
 // ----
 // :test devdoc
 // {
+//     "kind": "dev",
 //     "methods": {},
 //     "stateVariables":
 //     {
@@ -21,16 +22,19 @@ contract test {
 //                 "_0": "returns state"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "state()":
 //         {
 //             "notice": "example of notice"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/public_state_variable_struct.sol b/test/libsolidity/natspecJSON/public_state_variable_struct.sol
index a8dff229de..4382472434 100644
--- a/test/libsolidity/natspecJSON/public_state_variable_struct.sol
+++ b/test/libsolidity/natspecJSON/public_state_variable_struct.sol
@@ -14,6 +14,7 @@ contract Bank {
 // ----
 // :Bank devdoc
 // {
+//     "kind": "dev",
 //     "methods": {},
 //     "stateVariables":
 //     {
@@ -25,16 +26,19 @@ contract Bank {
 //                 "reverseGraphicURL": "Back pic"
 //             }
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Bank userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "coinStack(uint256)":
 //         {
 //             "notice": "Get the n-th coin I own"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/slash3_slash3.sol b/test/libsolidity/natspecJSON/slash3_slash3.sol
index ea40cdaa9b..9c131ccc1c 100644
--- a/test/libsolidity/natspecJSON/slash3_slash3.sol
+++ b/test/libsolidity/natspecJSON/slash3_slash3.sol
@@ -8,11 +8,13 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "f()":
 //         {
 //             "notice": "lorem ipsum"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/slash3_slash4.sol b/test/libsolidity/natspecJSON/slash3_slash4.sol
index b8b5dc33eb..4bdf5ba1aa 100644
--- a/test/libsolidity/natspecJSON/slash3_slash4.sol
+++ b/test/libsolidity/natspecJSON/slash3_slash4.sol
@@ -8,11 +8,13 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "f()":
 //         {
 //             "notice": "lorem"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/slash4.sol b/test/libsolidity/natspecJSON/slash4.sol
index 1016d6204a..3acaea1f04 100644
--- a/test/libsolidity/natspecJSON/slash4.sol
+++ b/test/libsolidity/natspecJSON/slash4.sol
@@ -7,5 +7,7 @@ contract test {
 // ----
 // :test userdoc
 // {
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/star3.sol b/test/libsolidity/natspecJSON/star3.sol
index 965ce1e66c..c71fecad81 100644
--- a/test/libsolidity/natspecJSON/star3.sol
+++ b/test/libsolidity/natspecJSON/star3.sol
@@ -9,5 +9,7 @@ contract test {
 // ----
 // :test userdoc
 // {
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_basic_test.sol b/test/libsolidity/natspecJSON/user_basic_test.sol
index 27df4c616a..02d339e37f 100644
--- a/test/libsolidity/natspecJSON/user_basic_test.sol
+++ b/test/libsolidity/natspecJSON/user_basic_test.sol
@@ -7,11 +7,13 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "mul(uint256)":
 //         {
 //             "notice": "Multiplies `a` by 7"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_constructor.sol b/test/libsolidity/natspecJSON/user_constructor.sol
index bd49a376c5..a3570f71d5 100644
--- a/test/libsolidity/natspecJSON/user_constructor.sol
+++ b/test/libsolidity/natspecJSON/user_constructor.sol
@@ -7,11 +7,13 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "constructor":
 //         {
 //             "notice": "this is a really nice constructor"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_constructor_and_function.sol b/test/libsolidity/natspecJSON/user_constructor_and_function.sol
index 0dd1b33fb5..a6ace5f4a1 100644
--- a/test/libsolidity/natspecJSON/user_constructor_and_function.sol
+++ b/test/libsolidity/natspecJSON/user_constructor_and_function.sol
@@ -9,6 +9,7 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "constructor":
@@ -19,5 +20,6 @@ contract test {
 //         {
 //             "notice": "another multiplier"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_default_inherit.sol b/test/libsolidity/natspecJSON/user_default_inherit.sol
index ab92e6bc6a..4598662477 100644
--- a/test/libsolidity/natspecJSON/user_default_inherit.sol
+++ b/test/libsolidity/natspecJSON/user_default_inherit.sol
@@ -25,33 +25,39 @@ contract Token is Middle {
 // ----
 // :ERC20 userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Middle userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_default_inherit_variable.sol b/test/libsolidity/natspecJSON/user_default_inherit_variable.sol
index eee21cd911..c470d0ba60 100644
--- a/test/libsolidity/natspecJSON/user_default_inherit_variable.sol
+++ b/test/libsolidity/natspecJSON/user_default_inherit_variable.sol
@@ -14,22 +14,26 @@ contract D is C {
 // ----
 // :C userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "x()":
 //         {
 //             "notice": "Hello world"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :D userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "x()":
 //         {
 //             "notice": "Hello world"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_empty_contract.sol b/test/libsolidity/natspecJSON/user_empty_contract.sol
index be7bc2a2f3..afb1df7cb8 100644
--- a/test/libsolidity/natspecJSON/user_empty_contract.sol
+++ b/test/libsolidity/natspecJSON/user_empty_contract.sol
@@ -4,5 +4,7 @@ contract test { }
 // ----
 // :test userdoc
 // {
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_empty_natspec_test.sol b/test/libsolidity/natspecJSON/user_empty_natspec_test.sol
index 08c4389528..9c553e9a5f 100644
--- a/test/libsolidity/natspecJSON/user_empty_natspec_test.sol
+++ b/test/libsolidity/natspecJSON/user_empty_natspec_test.sol
@@ -9,5 +9,7 @@ contract test {
 // ----
 // :test userdoc
 // {
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit.sol b/test/libsolidity/natspecJSON/user_explicit_inherit.sol
index 96ab8effed..2f02f415fb 100644
--- a/test/libsolidity/natspecJSON/user_explicit_inherit.sol
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit.sol
@@ -23,22 +23,26 @@ contract Token is ERC21, ERC20 {
 // ----
 // :ERC20 userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit2.sol b/test/libsolidity/natspecJSON/user_explicit_inherit2.sol
index 5be6140f00..74d76cd9e3 100644
--- a/test/libsolidity/natspecJSON/user_explicit_inherit2.sol
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit2.sol
@@ -23,33 +23,39 @@ contract Token is ERC20 {
 // ----
 // :ERC20 userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :ERC21 userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
index 5a865d8228..7e85aae869 100644
--- a/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
@@ -25,22 +25,26 @@ contract Token is ERC21, ERC20 {
 // ----
 // :ERC20 userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "override notice"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
index 460c90dd90..6f9fa996ec 100644
--- a/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
@@ -25,22 +25,26 @@ contract Token is ERC21 {
 // ----
 // :ERC20 userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "override notice"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
index 9e6e96bf6e..f5171f4dbd 100644
--- a/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
@@ -21,22 +21,26 @@ contract D is C, B {
 // ----
 // :C userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "x()":
 //         {
 //             "notice": "Hello world"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :D userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "x()":
 //         {
 //             "notice": "Hello world"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol b/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
index a427f16af1..2311106e36 100644
--- a/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
+++ b/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
@@ -22,27 +22,33 @@ contract Token is Middle {
 // ----
 // :ERC20 userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Middle userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "transfer(address,uint256)":
 //         {
 //             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
 //         }
-//     }
+//     },
+//     "version": 1
 // }
 //
 // :Token userdoc
 // {
-//     "methods": {}
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_multiline_comment.sol b/test/libsolidity/natspecJSON/user_multiline_comment.sol
index e8c7f61ded..a656bc6368 100644
--- a/test/libsolidity/natspecJSON/user_multiline_comment.sol
+++ b/test/libsolidity/natspecJSON/user_multiline_comment.sol
@@ -10,11 +10,13 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "mul_and_add(uint256,uint256)":
 //         {
 //             "notice": "Multiplies `a` by 7 and then adds `b`"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol b/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
index 93f20a1954..edd01f549b 100644
--- a/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
+++ b/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
@@ -12,11 +12,13 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "f()":
 //         {
 //             "notice": "hello world"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_multiple_functions.sol b/test/libsolidity/natspecJSON/user_multiple_functions.sol
index a2ae7f0587..2a78e14cc6 100644
--- a/test/libsolidity/natspecJSON/user_multiple_functions.sol
+++ b/test/libsolidity/natspecJSON/user_multiple_functions.sol
@@ -19,6 +19,7 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "divide(uint256,uint256)":
@@ -33,5 +34,6 @@ contract test {
 //         {
 //             "notice": "Subtracts 3 from `input`"
 //         }
-//     }
+//     },
+//     "version": 1
 // }
diff --git a/test/libsolidity/natspecJSON/user_newline_break.sol b/test/libsolidity/natspecJSON/user_newline_break.sol
index 97744a74f9..64625864dd 100644
--- a/test/libsolidity/natspecJSON/user_newline_break.sol
+++ b/test/libsolidity/natspecJSON/user_newline_break.sol
@@ -11,11 +11,13 @@ contract test {
 // ----
 // :test userdoc
 // {
+//     "kind": "user",
 //     "methods":
 //     {
 //         "f()":
 //         {
 //             "notice": "world"
 //         }
-//     }
+//     },
+//     "version": 1
 // }

From d083925bed298a58f164d78d938bc30bc3c28609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 21 Aug 2023 12:32:33 +0200
Subject: [PATCH 1597/1748] natspecJSON: Generate missing expectations
 (including errors)

---
 test/libsolidity/natspecJSON/custom.sol       |  7 ++
 .../natspecJSON/custom_inheritance.sol        | 14 ++++
 .../natspecJSON/dev_author_at_function.sol    |  1 +
 .../natspecJSON/dev_constructor.sol           |  7 ++
 .../dev_constructor_and_function.sol          |  7 ++
 .../natspecJSON/dev_constructor_return.sol    |  2 +
 .../natspecJSON/dev_contract_doc.sol          |  7 ++
 .../natspecJSON/dev_contract_no_doc.sol       |  7 ++
 .../natspecJSON/dev_default_inherit.sol       | 39 ++++++++++
 .../dev_default_inherit_variable.sol          | 26 +++++++
 .../natspecJSON/dev_desc_after_nl.sol         |  7 ++
 .../natspecJSON/dev_different_return_name.sol | 14 ++++
 .../dev_different_return_name_multiple.sol    | 14 ++++
 ...nt_return_name_multiple_partly_unnamed.sol | 14 ++++
 ...different_return_name_multiple_unnamed.sol | 14 ++++
 .../dev_documenting_no_param_description.sol  |  1 +
 .../dev_documenting_no_param_name.sol         |  1 +
 .../dev_documenting_no_param_name_end.sol     |  1 +
 .../dev_documenting_no_return_param_name.sol  |  1 +
 .../dev_documenting_nonexistent_param.sol     |  1 +
 .../natspecJSON/dev_explicit_inherit.sol      | 40 ++++++++++
 .../natspecJSON/dev_explicit_inherit2.sol     | 39 ++++++++++
 .../dev_explicit_inherit_complex.sol          | 75 +++++++++++++++++++
 .../dev_explicit_inherit_partial.sol          | 40 ++++++++++
 .../dev_explicit_inherit_partial2.sol         | 57 ++++++++++++++
 .../dev_explicit_inherit_variable.sol         | 40 ++++++++++
 .../dev_inherit_parameter_mismatch.sol        | 33 ++++++++
 .../natspecJSON/dev_multiline_comment.sol     |  7 ++
 .../natspecJSON/dev_multiline_return.sol      |  7 ++
 .../natspecJSON/dev_multiple_functions.sol    |  7 ++
 .../natspecJSON/dev_multiple_params.sol       |  7 ++
 .../dev_multiple_params_mixed_whitespace.sol  |  7 ++
 .../dev_mutiline_param_description.sol        |  7 ++
 test/libsolidity/natspecJSON/dev_return.sol   |  7 ++
 .../natspecJSON/dev_return_desc_after_nl.sol  |  7 ++
 .../natspecJSON/dev_return_desc_multiple.sol  |  7 ++
 .../dev_return_desc_multiple_unamed.sol       |  7 ++
 .../dev_return_desc_multiple_unamed_mixed.sol |  7 ++
 ...ev_return_desc_multiple_unamed_mixed_2.sol |  7 ++
 .../dev_return_name_no_description.sol        | 14 ++++
 .../natspecJSON/dev_return_no_params.sol      |  7 ++
 .../dev_struct_getter_override.sol            | 14 ++++
 ...rride_different_return_parameter_names.sol | 14 ++++
 ..._struct_getter_override_no_return_name.sol | 14 ++++
 .../dev_title_at_function_error.sol           |  1 +
 .../emit_event_from_foreign_contract.sol      | 28 +++++++
 ...t_from_foreign_contract_no_inheritance.sol | 28 +++++++
 ...me_signature_event_different_libraries.sol | 56 ++++++++++++++
 ...nt_different_libraries_missing_natspec.sol | 56 ++++++++++++++
 ..._same_signature_event_library_contract.sol | 36 +++++++++
 ...event_library_contract_missing_natspec.sol | 36 +++++++++
 ...same_signature_event_library_inherited.sol | 56 ++++++++++++++
 ...vent_library_inherited_missing_natspec.sol | 42 +++++++++++
 .../libsolidity/natspecJSON/empty_comment.sol |  7 ++
 .../natspecJSON/error_multiple.sol            | 37 +++++++++
 .../multiline_notice_without_tag.sol          |  7 ++
 .../natspecJSON/notice_without_tag.sol        |  7 ++
 .../public_state_variable_struct_repeated.sol |  1 +
 .../libsolidity/natspecJSON/slash3_slash3.sol |  7 ++
 .../libsolidity/natspecJSON/slash3_slash4.sol |  7 ++
 test/libsolidity/natspecJSON/slash4.sol       |  7 ++
 test/libsolidity/natspecJSON/star3.sol        |  7 ++
 .../natspecJSON/user_basic_test.sol           |  7 ++
 .../natspecJSON/user_constructor.sol          |  7 ++
 .../user_constructor_and_function.sol         |  7 ++
 .../natspecJSON/user_default_inherit.sol      | 54 +++++++++++++
 .../user_default_inherit_variable.sol         | 27 +++++++
 .../natspecJSON/user_empty_contract.sol       |  7 ++
 .../natspecJSON/user_empty_natspec_test.sol   |  7 ++
 .../natspecJSON/user_explicit_inherit.sol     | 50 +++++++++++++
 .../natspecJSON/user_explicit_inherit2.sol    | 54 +++++++++++++
 .../user_explicit_inherit_partial.sol         | 50 +++++++++++++
 .../user_explicit_inherit_partial2.sol        | 67 +++++++++++++++++
 .../user_explicit_inherit_variable.sol        | 41 ++++++++++
 .../user_inherit_parameter_mismatch.sol       | 43 +++++++++++
 .../natspecJSON/user_multiline_comment.sol    |  7 ++
 .../user_multiline_empty_lines.sol            |  7 ++
 .../natspecJSON/user_multiple_functions.sol   |  7 ++
 .../natspecJSON/user_newline_break.sol        |  7 ++
 79 files changed, 1531 insertions(+)

diff --git a/test/libsolidity/natspecJSON/custom.sol b/test/libsolidity/natspecJSON/custom.sol
index 43fd7283e8..28073c0bf6 100644
--- a/test/libsolidity/natspecJSON/custom.sol
+++ b/test/libsolidity/natspecJSON/custom.sol
@@ -34,3 +34,10 @@ contract A {
 //     },
 //     "version": 1
 // }
+//
+// :A userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/custom_inheritance.sol b/test/libsolidity/natspecJSON/custom_inheritance.sol
index f4fb80b553..c4a1360fbb 100644
--- a/test/libsolidity/natspecJSON/custom_inheritance.sol
+++ b/test/libsolidity/natspecJSON/custom_inheritance.sol
@@ -21,9 +21,23 @@ contract B is A {
 //     "version": 1
 // }
 //
+// :A userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :B devdoc
 // {
 //     "kind": "dev",
 //     "methods": {},
 //     "version": 1
 // }
+//
+// :B userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_author_at_function.sol b/test/libsolidity/natspecJSON/dev_author_at_function.sol
index 7ea25a3e5b..10a21f753d 100644
--- a/test/libsolidity/natspecJSON/dev_author_at_function.sol
+++ b/test/libsolidity/natspecJSON/dev_author_at_function.sol
@@ -7,3 +7,4 @@ contract test {
 }
 
 // ----
+// DocstringParsingError 6546: (73-119): Documentation tag @author not valid for functions.
diff --git a/test/libsolidity/natspecJSON/dev_constructor.sol b/test/libsolidity/natspecJSON/dev_constructor.sol
index ffdcfea941..9cb1e05aff 100644
--- a/test/libsolidity/natspecJSON/dev_constructor.sol
+++ b/test/libsolidity/natspecJSON/dev_constructor.sol
@@ -22,3 +22,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_constructor_and_function.sol b/test/libsolidity/natspecJSON/dev_constructor_and_function.sol
index e15f03f031..0954009f98 100644
--- a/test/libsolidity/natspecJSON/dev_constructor_and_function.sol
+++ b/test/libsolidity/natspecJSON/dev_constructor_and_function.sol
@@ -44,3 +44,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_constructor_return.sol b/test/libsolidity/natspecJSON/dev_constructor_return.sol
index bee9a9d6e9..4695806d26 100644
--- a/test/libsolidity/natspecJSON/dev_constructor_return.sol
+++ b/test/libsolidity/natspecJSON/dev_constructor_return.sol
@@ -6,3 +6,5 @@ contract test {
 }
 
 // ----
+// DocstringParsingError 6546: (20-239): Documentation tag @return not valid for constructor.
+// DocstringParsingError 2604: (20-239): Documentation tag "@return return should not work within constructors" exceeds the number of return parameters.
diff --git a/test/libsolidity/natspecJSON/dev_contract_doc.sol b/test/libsolidity/natspecJSON/dev_contract_doc.sol
index 5acc2d1989..3958a01edd 100644
--- a/test/libsolidity/natspecJSON/dev_contract_doc.sol
+++ b/test/libsolidity/natspecJSON/dev_contract_doc.sol
@@ -21,3 +21,10 @@ contract test {
 //     "title": "Just a test contract",
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_contract_no_doc.sol b/test/libsolidity/natspecJSON/dev_contract_no_doc.sol
index aa8a86a0e1..a60847d7e2 100644
--- a/test/libsolidity/natspecJSON/dev_contract_no_doc.sol
+++ b/test/libsolidity/natspecJSON/dev_contract_no_doc.sol
@@ -17,3 +17,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_default_inherit.sol b/test/libsolidity/natspecJSON/dev_default_inherit.sol
index d144b3840d..dd65ddfbeb 100644
--- a/test/libsolidity/natspecJSON/dev_default_inherit.sol
+++ b/test/libsolidity/natspecJSON/dev_default_inherit.sol
@@ -41,6 +41,19 @@ contract Token is Middle {
 //     "version": 1
 // }
 //
+// :ERC20 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Middle devdoc
 // {
 //     "kind": "dev",
@@ -59,6 +72,19 @@ contract Token is Middle {
 //     "version": 1
 // }
 //
+// :Middle userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Token devdoc
 // {
 //     "kind": "dev",
@@ -76,3 +102,16 @@ contract Token is Middle {
 //     },
 //     "version": 1
 // }
+//
+// :Token userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``. Second line."
+//         }
+//     },
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol b/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
index 1974bd6514..89d57d011c 100644
--- a/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
+++ b/test/libsolidity/natspecJSON/dev_default_inherit_variable.sol
@@ -25,6 +25,19 @@ contract D is C {
 //     "version": 1
 // }
 //
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "notice": "Hello world"
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :D devdoc
 // {
 //     "kind": "dev",
@@ -38,3 +51,16 @@ contract D is C {
 //     },
 //     "version": 1
 // }
+//
+// :D userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "notice": "Hello world"
+//         }
+//     },
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_desc_after_nl.sol b/test/libsolidity/natspecJSON/dev_desc_after_nl.sol
index f7e892ae8a..fd83ff1b97 100644
--- a/test/libsolidity/natspecJSON/dev_desc_after_nl.sol
+++ b/test/libsolidity/natspecJSON/dev_desc_after_nl.sol
@@ -25,3 +25,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name.sol b/test/libsolidity/natspecJSON/dev_different_return_name.sol
index 2b7160be19..7d74cc2945 100644
--- a/test/libsolidity/natspecJSON/dev_different_return_name.sol
+++ b/test/libsolidity/natspecJSON/dev_different_return_name.sol
@@ -25,6 +25,13 @@ contract B is A {
 //     "version": 1
 // }
 //
+// :A userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :B devdoc
 // {
 //     "kind": "dev",
@@ -40,3 +47,10 @@ contract B is A {
 //     },
 //     "version": 1
 // }
+//
+// :B userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
index 90e21462ca..2a8ba399f4 100644
--- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
+++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple.sol
@@ -27,6 +27,13 @@ contract B is A {
 //     "version": 1
 // }
 //
+// :A userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :B devdoc
 // {
 //     "kind": "dev",
@@ -43,3 +50,10 @@ contract B is A {
 //     },
 //     "version": 1
 // }
+//
+// :B userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
index 1ddf47aeef..c41336d8f4 100644
--- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
+++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_partly_unnamed.sol
@@ -27,6 +27,13 @@ contract B is A {
 //     "version": 1
 // }
 //
+// :A userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :B devdoc
 // {
 //     "kind": "dev",
@@ -43,3 +50,10 @@ contract B is A {
 //     },
 //     "version": 1
 // }
+//
+// :B userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
index cc172a8c84..3bf40011fa 100644
--- a/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
+++ b/test/libsolidity/natspecJSON/dev_different_return_name_multiple_unnamed.sol
@@ -27,6 +27,13 @@ contract B is A {
 //     "version": 1
 // }
 //
+// :A userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :B devdoc
 // {
 //     "kind": "dev",
@@ -43,3 +50,10 @@ contract B is A {
 //     },
 //     "version": 1
 // }
+//
+// :B userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol b/test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol
index 84a2f532da..e02437aced 100644
--- a/test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol
+++ b/test/libsolidity/natspecJSON/dev_documenting_no_param_description.sol
@@ -6,3 +6,4 @@ contract test {
 }
 
 // ----
+// DocstringParsingError 9942: (20-156): No description given for param second
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol b/test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol
index 75b4fe5c0b..c8da55d75e 100644
--- a/test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol
+++ b/test/libsolidity/natspecJSON/dev_documenting_no_param_name.sol
@@ -6,3 +6,4 @@ contract test {
 }
 
 // ----
+// DocstringParsingError 3335: (20-149): No param name given
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol b/test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol
index 4ddeb7f9b9..500092e1d1 100644
--- a/test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol
+++ b/test/libsolidity/natspecJSON/dev_documenting_no_param_name_end.sol
@@ -6,3 +6,4 @@ contract test {
 }
 
 // ----
+// DocstringParsingError 9942: (20-152): No description given for param se
diff --git a/test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol b/test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol
index e0b90bed07..2a99c78a81 100644
--- a/test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol
+++ b/test/libsolidity/natspecJSON/dev_documenting_no_return_param_name.sol
@@ -7,3 +7,4 @@ contract test {
 }
 
 // ----
+// DocstringParsingError 5856: (20-211): Documentation tag "@return " does not contain the name of its return parameter.
diff --git a/test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol b/test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol
index 977833e006..a2ebc26525 100644
--- a/test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol
+++ b/test/libsolidity/natspecJSON/dev_documenting_nonexistent_param.sol
@@ -6,3 +6,4 @@ contract test {
 }
 
 // ----
+// DocstringParsingError 3881: (20-201): Documented parameter "not_existing" not found in the parameter list of the function.
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit.sol
index 5efae37f2a..a8ddb31331 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit.sol
@@ -39,6 +39,33 @@ contract Token is ERC21, ERC20 {
 //     "version": 1
 // }
 //
+// :ERC20 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :ERC21 devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :ERC21 userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :Token devdoc
 // {
 //     "kind": "dev",
@@ -56,3 +83,16 @@ contract Token is ERC21, ERC20 {
 //     },
 //     "version": 1
 // }
+//
+// :Token userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
index 2f1f8f17f9..4c726f552f 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit2.sol
@@ -39,6 +39,19 @@ contract Token is ERC20 {
 //     "version": 1
 // }
 //
+// :ERC20 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :ERC21 devdoc
 // {
 //     "kind": "dev",
@@ -57,6 +70,19 @@ contract Token is ERC20 {
 //     "version": 1
 // }
 //
+// :ERC21 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Token devdoc
 // {
 //     "kind": "dev",
@@ -74,3 +100,16 @@ contract Token is ERC20 {
 //     },
 //     "version": 1
 // }
+//
+// :Token userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
index c87f6c30f7..38726c7786 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_complex.sol
@@ -28,6 +28,68 @@ contract Token is myInterfaces.ERC20, myInterfaces.ERC21 {
 
 // ----
 // ----
+// Interfaces.sol:ERC20 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
+// Interfaces.sol:ERC20 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
+//
+// Interfaces.sol:ERC21 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test2",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
+// Interfaces.sol:ERC21 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
+//
 // Testfile.sol:Token devdoc
 // {
 //     "kind": "dev",
@@ -45,3 +107,16 @@ contract Token is myInterfaces.ERC20, myInterfaces.ERC21 {
 //     },
 //     "version": 1
 // }
+//
+// Testfile.sol:Token userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
index 0dce69ccb2..c69bd41217 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial.sol
@@ -41,6 +41,33 @@ contract Token is ERC21, ERC20 {
 //     "version": 1
 // }
 //
+// :ERC20 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :ERC21 devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :ERC21 userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :Token devdoc
 // {
 //     "kind": "dev",
@@ -58,3 +85,16 @@ contract Token is ERC21, ERC20 {
 //     },
 //     "version": 1
 // }
+//
+// :Token userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "override notice"
+//         }
+//     },
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
index e9590d9cee..6bb49e887a 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_partial2.sol
@@ -41,6 +41,50 @@ contract Token is ERC21 {
 //     "version": 1
 // }
 //
+// :ERC20 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :ERC21 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "override dev comment",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :ERC21 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "override notice"
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Token devdoc
 // {
 //     "kind": "dev",
@@ -58,3 +102,16 @@ contract Token is ERC21 {
 //     },
 //     "version": 1
 // }
+//
+// :Token userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "override notice"
+//         }
+//     },
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol b/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
index cf3b1aba37..b35a92873a 100644
--- a/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
+++ b/test/libsolidity/natspecJSON/dev_explicit_inherit_variable.sol
@@ -19,6 +19,20 @@ contract D is C, B {
 
 // ----
 // ----
+// :B devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :B userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :C devdoc
 // {
 //     "kind": "dev",
@@ -32,6 +46,19 @@ contract D is C, B {
 //     "version": 1
 // }
 //
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "notice": "Hello world"
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :D devdoc
 // {
 //     "kind": "dev",
@@ -45,3 +72,16 @@ contract D is C, B {
 //     },
 //     "version": 1
 // }
+//
+// :D userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "notice": "Hello world"
+//         }
+//     },
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol b/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
index 579660f2f9..a8ab60bd12 100644
--- a/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
+++ b/test/libsolidity/natspecJSON/dev_inherit_parameter_mismatch.sol
@@ -38,6 +38,19 @@ contract Token is Middle {
 //     "version": 1
 // }
 //
+// :ERC20 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Middle devdoc
 // {
 //     "kind": "dev",
@@ -56,9 +69,29 @@ contract Token is Middle {
 //     "version": 1
 // }
 //
+// :Middle userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "Transfer ``amount`` from ``msg.sender`` to ``to``."
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Token devdoc
 // {
 //     "kind": "dev",
 //     "methods": {},
 //     "version": 1
 // }
+//
+// :Token userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_multiline_comment.sol b/test/libsolidity/natspecJSON/dev_multiline_comment.sol
index 7757636c93..b86bcff92d 100644
--- a/test/libsolidity/natspecJSON/dev_multiline_comment.sol
+++ b/test/libsolidity/natspecJSON/dev_multiline_comment.sol
@@ -35,3 +35,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_multiline_return.sol b/test/libsolidity/natspecJSON/dev_multiline_return.sol
index 792cf11cea..cd3c1df98e 100644
--- a/test/libsolidity/natspecJSON/dev_multiline_return.sol
+++ b/test/libsolidity/natspecJSON/dev_multiline_return.sol
@@ -33,3 +33,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_functions.sol b/test/libsolidity/natspecJSON/dev_multiple_functions.sol
index f3fb5876a3..899fb5e261 100644
--- a/test/libsolidity/natspecJSON/dev_multiple_functions.sol
+++ b/test/libsolidity/natspecJSON/dev_multiple_functions.sol
@@ -54,3 +54,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_params.sol b/test/libsolidity/natspecJSON/dev_multiple_params.sol
index 909452ee87..424f368d1d 100644
--- a/test/libsolidity/natspecJSON/dev_multiple_params.sol
+++ b/test/libsolidity/natspecJSON/dev_multiple_params.sol
@@ -24,3 +24,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
index f9dfa0b528..61f45aa620 100644
--- a/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
+++ b/test/libsolidity/natspecJSON/dev_multiple_params_mixed_whitespace.sol
@@ -24,3 +24,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol b/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
index 8c5092534a..9bdfd0504b 100644
--- a/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
+++ b/test/libsolidity/natspecJSON/dev_mutiline_param_description.sol
@@ -25,3 +25,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return.sol b/test/libsolidity/natspecJSON/dev_return.sol
index e17c6466c6..c978970479 100644
--- a/test/libsolidity/natspecJSON/dev_return.sol
+++ b/test/libsolidity/natspecJSON/dev_return.sol
@@ -30,3 +30,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol b/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
index 4c17105fcf..b6ae9f2f6e 100644
--- a/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
+++ b/test/libsolidity/natspecJSON/dev_return_desc_after_nl.sol
@@ -33,3 +33,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
index d902983a0f..0c93dfdd9f 100644
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple.sol
@@ -35,3 +35,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
index 877e149273..1d93b4abab 100644
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed.sol
@@ -35,3 +35,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
index 2b8c1771a7..6147aace7c 100644
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed.sol
@@ -35,3 +35,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
index 208a950953..824671ee49 100644
--- a/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
+++ b/test/libsolidity/natspecJSON/dev_return_desc_multiple_unamed_mixed_2.sol
@@ -38,3 +38,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_name_no_description.sol b/test/libsolidity/natspecJSON/dev_return_name_no_description.sol
index a96535a615..1e65a235a4 100644
--- a/test/libsolidity/natspecJSON/dev_return_name_no_description.sol
+++ b/test/libsolidity/natspecJSON/dev_return_name_no_description.sol
@@ -25,6 +25,13 @@ contract B is A {
 //     "version": 1
 // }
 //
+// :A userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :B devdoc
 // {
 //     "kind": "dev",
@@ -40,3 +47,10 @@ contract B is A {
 //     },
 //     "version": 1
 // }
+//
+// :B userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_return_no_params.sol b/test/libsolidity/natspecJSON/dev_return_no_params.sol
index e7e9e8cbb7..37442f10a8 100644
--- a/test/libsolidity/natspecJSON/dev_return_no_params.sol
+++ b/test/libsolidity/natspecJSON/dev_return_no_params.sol
@@ -20,3 +20,10 @@ contract test {
 //     },
 //     "version": 1
 // }
+//
+// :test userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override.sol
index 5d9ce6e803..019e1a3353 100644
--- a/test/libsolidity/natspecJSON/dev_struct_getter_override.sol
+++ b/test/libsolidity/natspecJSON/dev_struct_getter_override.sol
@@ -32,6 +32,13 @@ contract Thing is IThing {
 //     "version": 1
 // }
 //
+// :IThing userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :Thing devdoc
 // {
 //     "kind": "dev",
@@ -49,3 +56,10 @@ contract Thing is IThing {
 //     },
 //     "version": 1
 // }
+//
+// :Thing userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
index dcc86ed93d..0acfa70fc6 100644
--- a/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
+++ b/test/libsolidity/natspecJSON/dev_struct_getter_override_different_return_parameter_names.sol
@@ -32,6 +32,13 @@ contract Thing is IThing {
 //     "version": 1
 // }
 //
+// :IThing userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :Thing devdoc
 // {
 //     "kind": "dev",
@@ -49,3 +56,10 @@ contract Thing is IThing {
 //     },
 //     "version": 1
 // }
+//
+// :Thing userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol b/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
index dc97cb8a98..06810957ad 100644
--- a/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
+++ b/test/libsolidity/natspecJSON/dev_struct_getter_override_no_return_name.sol
@@ -29,6 +29,13 @@ contract Thing is IThing {
 //     "version": 1
 // }
 //
+// :IThing userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :Thing devdoc
 // {
 //     "kind": "dev",
@@ -46,3 +53,10 @@ contract Thing is IThing {
 //     },
 //     "version": 1
 // }
+//
+// :Thing userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/dev_title_at_function_error.sol b/test/libsolidity/natspecJSON/dev_title_at_function_error.sol
index 8c9ed7bb93..2b18e80768 100644
--- a/test/libsolidity/natspecJSON/dev_title_at_function_error.sol
+++ b/test/libsolidity/natspecJSON/dev_title_at_function_error.sol
@@ -7,3 +7,4 @@ contract test {
 }
 
 // ----
+// DocstringParsingError 6546: (73-137): Documentation tag @title not valid for functions.
diff --git a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol
index 7733fd432a..669775131b 100644
--- a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol
+++ b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract.sol
@@ -39,3 +39,31 @@ contract C {
 //     "methods": {},
 //     "version": 1
 // }
+//
+// :X devdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "details": "Devdoc for event E."
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :X userdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "notice": "Userdoc for event E."
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol
index ea1d669564..c890913914 100644
--- a/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol
+++ b/test/libsolidity/natspecJSON/emit_event_from_foreign_contract_no_inheritance.sol
@@ -16,6 +16,34 @@ contract D {
 
 // ----
 // ----
+// :C devdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "details": "C.E event"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "notice": "C.E event"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :D devdoc
 // {
 //     "kind": "dev",
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol
index a017849c9e..46c8cadf5d 100644
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries.sol
@@ -64,3 +64,59 @@ contract C {
 //     "methods": {},
 //     "version": 1
 // }
+//
+// :L2 devdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should not appear in Contract C dev doc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L2 userdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in Library L2"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L3 devdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should not appear in Contract C dev doc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L3 userdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in Library L3"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol
index 06b739039b..ba51b10c6c 100644
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_different_libraries_missing_natspec.sol
@@ -32,3 +32,59 @@ contract C {
 //     "methods": {},
 //     "version": 1
 // }
+//
+// :L1 devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L1 userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L2 devdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should not appear in Contract C devdoc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L2 userdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in library L2"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L3 devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L3 userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol
index d5b3d91fd8..9b198afde6 100644
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract.sol
@@ -66,3 +66,39 @@ contract C {
 //     "methods": {},
 //     "version": 1
 // }
+//
+// :L devdoc
+// {
+//     "events":
+//     {
+//         "LibraryEvent(uint32)":
+//         {
+//             "details": "This should appear in Contract C dev doc"
+//         },
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should not appear in Contract C dev doc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L userdoc
+// {
+//     "events":
+//     {
+//         "LibraryEvent(uint32)":
+//         {
+//             "notice": "This event is defined in Library L"
+//         },
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in Library L"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol
index 5da7a6c1ca..9bc2f57f30 100644
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_library_contract_missing_natspec.sol
@@ -51,3 +51,39 @@ contract C {
 //     "methods": {},
 //     "version": 1
 // }
+//
+// :L devdoc
+// {
+//     "events":
+//     {
+//         "LibraryEvent(uint32)":
+//         {
+//             "details": "This should appear in contract C devdoc"
+//         },
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should not appear in contract C devdoc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L userdoc
+// {
+//     "events":
+//     {
+//         "LibraryEvent(uint32)":
+//         {
+//             "notice": "This event is defined in library L"
+//         },
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in library L"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol
index 9f2ed1ce37..ecc7ee6279 100644
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited.sol
@@ -44,3 +44,59 @@ contract C is D {
 //     "methods": {},
 //     "version": 1
 // }
+//
+// :D devdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should appear in Contract C dev doc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :D userdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in contract D"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L devdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should not appear in Contract C"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L userdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in Library L"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol b/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol
index 106110a0f4..a3a6286c55 100644
--- a/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol
+++ b/test/libsolidity/natspecJSON/emit_same_signature_event_library_inherited_missing_natspec.sol
@@ -28,3 +28,45 @@ contract C is D {
 //     "methods": {},
 //     "version": 1
 // }
+//
+// :D devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :D userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L devdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "details": "This should not appear in contract C devdoc"
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :L userdoc
+// {
+//     "events":
+//     {
+//         "SameSignatureEvent(uint16)":
+//         {
+//             "notice": "This event is defined in library L"
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/empty_comment.sol b/test/libsolidity/natspecJSON/empty_comment.sol
index db0f9e533f..4310c26d25 100644
--- a/test/libsolidity/natspecJSON/empty_comment.sol
+++ b/test/libsolidity/natspecJSON/empty_comment.sol
@@ -4,6 +4,13 @@ contract test
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/error_multiple.sol b/test/libsolidity/natspecJSON/error_multiple.sol
index 336710ec3c..205e79a99f 100644
--- a/test/libsolidity/natspecJSON/error_multiple.sol
+++ b/test/libsolidity/natspecJSON/error_multiple.sol
@@ -21,6 +21,43 @@ contract test {
 
 // ----
 // ----
+// :A devdoc
+// {
+//     "errors":
+//     {
+//         "E(uint256,uint256)":
+//         [
+//             {
+//                 "details": "an error.",
+//                 "params":
+//                 {
+//                     "x": "first parameter",
+//                     "y": "second parameter"
+//                 }
+//             }
+//         ]
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :A userdoc
+// {
+//     "errors":
+//     {
+//         "E(uint256,uint256)":
+//         [
+//             {
+//                 "notice": "Something failed."
+//             }
+//         ]
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test devdoc
 // {
 //     "errors":
diff --git a/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol b/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
index b29ccab0b1..4f055b2f04 100644
--- a/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
+++ b/test/libsolidity/natspecJSON/multiline_notice_without_tag.sol
@@ -6,6 +6,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/notice_without_tag.sol b/test/libsolidity/natspecJSON/notice_without_tag.sol
index 215393244d..d562993392 100644
--- a/test/libsolidity/natspecJSON/notice_without_tag.sol
+++ b/test/libsolidity/natspecJSON/notice_without_tag.sol
@@ -5,6 +5,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol b/test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol
index a6b4f7f843..78a6f9eedf 100644
--- a/test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol
+++ b/test/libsolidity/natspecJSON/public_state_variable_struct_repeated.sol
@@ -11,3 +11,4 @@ contract Bank {
 }
 
 // ----
+// DocstringParsingError 5856: (113-236): Documentation tag "@return obverseGraphicURL Front pic" does not contain the name of its return parameter.
diff --git a/test/libsolidity/natspecJSON/slash3_slash3.sol b/test/libsolidity/natspecJSON/slash3_slash3.sol
index 9c131ccc1c..fc8e47f962 100644
--- a/test/libsolidity/natspecJSON/slash3_slash3.sol
+++ b/test/libsolidity/natspecJSON/slash3_slash3.sol
@@ -6,6 +6,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/slash3_slash4.sol b/test/libsolidity/natspecJSON/slash3_slash4.sol
index 4bdf5ba1aa..c428f5e19a 100644
--- a/test/libsolidity/natspecJSON/slash3_slash4.sol
+++ b/test/libsolidity/natspecJSON/slash3_slash4.sol
@@ -6,6 +6,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/slash4.sol b/test/libsolidity/natspecJSON/slash4.sol
index 3acaea1f04..74997524ee 100644
--- a/test/libsolidity/natspecJSON/slash4.sol
+++ b/test/libsolidity/natspecJSON/slash4.sol
@@ -5,6 +5,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/star3.sol b/test/libsolidity/natspecJSON/star3.sol
index c71fecad81..24e742f8aa 100644
--- a/test/libsolidity/natspecJSON/star3.sol
+++ b/test/libsolidity/natspecJSON/star3.sol
@@ -7,6 +7,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_basic_test.sol b/test/libsolidity/natspecJSON/user_basic_test.sol
index 02d339e37f..0ec21750d7 100644
--- a/test/libsolidity/natspecJSON/user_basic_test.sol
+++ b/test/libsolidity/natspecJSON/user_basic_test.sol
@@ -5,6 +5,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_constructor.sol b/test/libsolidity/natspecJSON/user_constructor.sol
index a3570f71d5..0dedd30a69 100644
--- a/test/libsolidity/natspecJSON/user_constructor.sol
+++ b/test/libsolidity/natspecJSON/user_constructor.sol
@@ -5,6 +5,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_constructor_and_function.sol b/test/libsolidity/natspecJSON/user_constructor_and_function.sol
index a6ace5f4a1..5e8cfd04a3 100644
--- a/test/libsolidity/natspecJSON/user_constructor_and_function.sol
+++ b/test/libsolidity/natspecJSON/user_constructor_and_function.sol
@@ -7,6 +7,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_default_inherit.sol b/test/libsolidity/natspecJSON/user_default_inherit.sol
index 4598662477..b4f97cfa3f 100644
--- a/test/libsolidity/natspecJSON/user_default_inherit.sol
+++ b/test/libsolidity/natspecJSON/user_default_inherit.sol
@@ -23,6 +23,24 @@ contract Token is Middle {
 
 // ----
 // ----
+// :ERC20 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :ERC20 userdoc
 // {
 //     "kind": "user",
@@ -36,6 +54,24 @@ contract Token is Middle {
 //     "version": 1
 // }
 //
+// :Middle devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Middle userdoc
 // {
 //     "kind": "user",
@@ -49,6 +85,24 @@ contract Token is Middle {
 //     "version": 1
 // }
 //
+// :Token devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Token userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_default_inherit_variable.sol b/test/libsolidity/natspecJSON/user_default_inherit_variable.sol
index c470d0ba60..89d57d011c 100644
--- a/test/libsolidity/natspecJSON/user_default_inherit_variable.sol
+++ b/test/libsolidity/natspecJSON/user_default_inherit_variable.sol
@@ -12,6 +12,19 @@ contract D is C {
 
 // ----
 // ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "details": "test"
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :C userdoc
 // {
 //     "kind": "user",
@@ -25,6 +38,20 @@ contract D is C {
 //     "version": 1
 // }
 //
+// :D devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "x":
+//         {
+//             "details": "test"
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :D userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_empty_contract.sol b/test/libsolidity/natspecJSON/user_empty_contract.sol
index afb1df7cb8..09f178606b 100644
--- a/test/libsolidity/natspecJSON/user_empty_contract.sol
+++ b/test/libsolidity/natspecJSON/user_empty_contract.sol
@@ -2,6 +2,13 @@ contract test { }
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_empty_natspec_test.sol b/test/libsolidity/natspecJSON/user_empty_natspec_test.sol
index 9c553e9a5f..aa19fac3af 100644
--- a/test/libsolidity/natspecJSON/user_empty_natspec_test.sol
+++ b/test/libsolidity/natspecJSON/user_empty_natspec_test.sol
@@ -7,6 +7,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit.sol b/test/libsolidity/natspecJSON/user_explicit_inherit.sol
index 2f02f415fb..a8ddb31331 100644
--- a/test/libsolidity/natspecJSON/user_explicit_inherit.sol
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit.sol
@@ -21,6 +21,24 @@ contract Token is ERC21, ERC20 {
 
 // ----
 // ----
+// :ERC20 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :ERC20 userdoc
 // {
 //     "kind": "user",
@@ -34,6 +52,38 @@ contract Token is ERC21, ERC20 {
 //     "version": 1
 // }
 //
+// :ERC21 devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :ERC21 userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :Token devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Token userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit2.sol b/test/libsolidity/natspecJSON/user_explicit_inherit2.sol
index 74d76cd9e3..4c726f552f 100644
--- a/test/libsolidity/natspecJSON/user_explicit_inherit2.sol
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit2.sol
@@ -21,6 +21,24 @@ contract Token is ERC20 {
 
 // ----
 // ----
+// :ERC20 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :ERC20 userdoc
 // {
 //     "kind": "user",
@@ -34,6 +52,24 @@ contract Token is ERC20 {
 //     "version": 1
 // }
 //
+// :ERC21 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :ERC21 userdoc
 // {
 //     "kind": "user",
@@ -47,6 +83,24 @@ contract Token is ERC20 {
 //     "version": 1
 // }
 //
+// :Token devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Token userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
index 7e85aae869..c69bd41217 100644
--- a/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit_partial.sol
@@ -23,6 +23,24 @@ contract Token is ERC21, ERC20 {
 
 // ----
 // ----
+// :ERC20 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :ERC20 userdoc
 // {
 //     "kind": "user",
@@ -36,6 +54,38 @@ contract Token is ERC21, ERC20 {
 //     "version": 1
 // }
 //
+// :ERC21 devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :ERC21 userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :Token devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "override dev comment",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Token userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
index 6f9fa996ec..6bb49e887a 100644
--- a/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit_partial2.sol
@@ -23,6 +23,24 @@ contract Token is ERC21 {
 
 // ----
 // ----
+// :ERC20 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :ERC20 userdoc
 // {
 //     "kind": "user",
@@ -36,6 +54,55 @@ contract Token is ERC21 {
 //     "version": 1
 // }
 //
+// :ERC21 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "override dev comment",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :ERC21 userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "notice": "override notice"
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :Token devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "override dev comment",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Token userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol b/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
index f5171f4dbd..b35a92873a 100644
--- a/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
+++ b/test/libsolidity/natspecJSON/user_explicit_inherit_variable.sol
@@ -19,6 +19,33 @@ contract D is C, B {
 
 // ----
 // ----
+// :B devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :B userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "x()":
+//         {
+//             "details": "test"
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :C userdoc
 // {
 //     "kind": "user",
@@ -32,6 +59,20 @@ contract D is C, B {
 //     "version": 1
 // }
 //
+// :D devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "x":
+//         {
+//             "details": "test"
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :D userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol b/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
index 2311106e36..a8ab60bd12 100644
--- a/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
+++ b/test/libsolidity/natspecJSON/user_inherit_parameter_mismatch.sol
@@ -20,6 +20,24 @@ contract Token is Middle {
 
 // ----
 // ----
+// :ERC20 devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :ERC20 userdoc
 // {
 //     "kind": "user",
@@ -33,6 +51,24 @@ contract Token is Middle {
 //     "version": 1
 // }
 //
+// :Middle devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "transfer(address,uint256)":
+//         {
+//             "details": "test",
+//             "params":
+//             {
+//                 "amount": "amount to transfer",
+//                 "to": "address to transfer to"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
 // :Middle userdoc
 // {
 //     "kind": "user",
@@ -46,6 +82,13 @@ contract Token is Middle {
 //     "version": 1
 // }
 //
+// :Token devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :Token userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_multiline_comment.sol b/test/libsolidity/natspecJSON/user_multiline_comment.sol
index a656bc6368..5407c7fe88 100644
--- a/test/libsolidity/natspecJSON/user_multiline_comment.sol
+++ b/test/libsolidity/natspecJSON/user_multiline_comment.sol
@@ -8,6 +8,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol b/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
index edd01f549b..12bc050e7b 100644
--- a/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
+++ b/test/libsolidity/natspecJSON/user_multiline_empty_lines.sol
@@ -10,6 +10,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_multiple_functions.sol b/test/libsolidity/natspecJSON/user_multiple_functions.sol
index 2a78e14cc6..3c6759bd28 100644
--- a/test/libsolidity/natspecJSON/user_multiple_functions.sol
+++ b/test/libsolidity/natspecJSON/user_multiple_functions.sol
@@ -17,6 +17,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",
diff --git a/test/libsolidity/natspecJSON/user_newline_break.sol b/test/libsolidity/natspecJSON/user_newline_break.sol
index 64625864dd..7284c88081 100644
--- a/test/libsolidity/natspecJSON/user_newline_break.sol
+++ b/test/libsolidity/natspecJSON/user_newline_break.sol
@@ -9,6 +9,13 @@ contract test {
 
 // ----
 // ----
+// :test devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
 // :test userdoc
 // {
 //     "kind": "user",

From dc68480f72cb7321be3e228877ceb70ed7678f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 21 Aug 2023 11:28:03 +0200
Subject: [PATCH 1598/1748] Move Natspec syntax tests to natspecJSON

---
 scripts/error_codes.py                                           | 1 +
 .../natspec => natspecJSON}/docstring_double_empty.sol           | 0
 .../{syntaxTests/natspec => natspecJSON}/docstring_enum.sol      | 0
 .../natspec => natspecJSON}/docstring_named_return_parameter.sol | 0
 .../{syntaxTests/natspec => natspecJSON}/docstring_parameter.sol | 0
 .../natspec => natspecJSON}/docstring_private_state_variable.sol | 0
 .../natspec => natspecJSON}/docstring_state_variable.sol         | 0
 .../{syntaxTests/natspec => natspecJSON}/docstring_struct.sol    | 0
 .../{syntaxTests/natspec => natspecJSON}/docstring_variable.sol  | 0
 .../invalid/docstring_author_function.sol                        | 0
 .../invalid/docstring_author_title_state_variable.sol            | 0
 .../invalid/docstring_empty_description.sol                      | 0
 .../natspec => natspecJSON}/invalid/docstring_empty_tag.sol      | 0
 .../invalid/docstring_inherit_modifier_no_return.sol             | 0
 .../invalid/docstring_inherit_modifier_no_return2.sol            | 0
 .../natspec => natspecJSON}/invalid/docstring_inheritdoc.sol     | 0
 .../natspec => natspecJSON}/invalid/docstring_inheritdoc2.sol    | 0
 .../natspec => natspecJSON}/invalid/docstring_inheritdoc3.sol    | 0
 .../invalid/docstring_inheritdoc_emptys.sol                      | 0
 .../invalid/docstring_inheritdoc_twice.sol                       | 0
 .../invalid/docstring_inheritdoc_wrong_type.sol                  | 0
 .../invalid/docstring_named_return_param_mismatch.sol            | 0
 .../invalid/docstring_non_public_state_variable_with_return.sol  | 0
 .../natspec => natspecJSON}/invalid/docstring_parameter.sol      | 0
 .../invalid/docstring_return_size_mismatch.sol                   | 0
 .../invalid/docstring_state_variable_too_many_return_tags.sol    | 0
 .../invalid/docstring_too_many_return_tags.sol                   | 0
 .../natspec => natspecJSON}/invalid/inherit_doc_events.sol       | 0
 .../{syntaxTests/natspec => natspecJSON}/invalid/invalid_tag.sol | 0
 .../invalid => natspecJSON}/return_param_amount_differs.sol      | 0
 .../invalid => natspecJSON}/return_param_amount_differs2.sol     | 0
 31 files changed, 1 insertion(+)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_double_empty.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_enum.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_named_return_parameter.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_parameter.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_private_state_variable.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_state_variable.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_struct.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/docstring_variable.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_author_function.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_author_title_state_variable.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_empty_description.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_empty_tag.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inherit_modifier_no_return.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inherit_modifier_no_return2.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc2.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc3.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc_emptys.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc_twice.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_inheritdoc_wrong_type.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_named_return_param_mismatch.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_non_public_state_variable_with_return.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_parameter.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_return_size_mismatch.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_state_variable_too_many_return_tags.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/docstring_too_many_return_tags.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/inherit_doc_events.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec => natspecJSON}/invalid/invalid_tag.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec/invalid => natspecJSON}/return_param_amount_differs.sol (100%)
 rename test/libsolidity/{syntaxTests/natspec/invalid => natspecJSON}/return_param_amount_differs2.sol (100%)

diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 33a475214b..8fe2c4c1be 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -171,6 +171,7 @@ def print_ids_per_file(ids, id_to_file_names, top_dir):
 
 def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
     test_sub_dirs = [
+        path.join("test", "libsolidity", "natspecJSON"),
         path.join("test", "libsolidity", "smtCheckerTests"),
         path.join("test", "libsolidity", "syntaxTests"),
         path.join("test", "libyul", "yulSyntaxTests")
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_double_empty.sol b/test/libsolidity/natspecJSON/docstring_double_empty.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_double_empty.sol
rename to test/libsolidity/natspecJSON/docstring_double_empty.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_enum.sol b/test/libsolidity/natspecJSON/docstring_enum.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_enum.sol
rename to test/libsolidity/natspecJSON/docstring_enum.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_named_return_parameter.sol b/test/libsolidity/natspecJSON/docstring_named_return_parameter.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_named_return_parameter.sol
rename to test/libsolidity/natspecJSON/docstring_named_return_parameter.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_parameter.sol b/test/libsolidity/natspecJSON/docstring_parameter.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_parameter.sol
rename to test/libsolidity/natspecJSON/docstring_parameter.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_private_state_variable.sol b/test/libsolidity/natspecJSON/docstring_private_state_variable.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_private_state_variable.sol
rename to test/libsolidity/natspecJSON/docstring_private_state_variable.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_state_variable.sol b/test/libsolidity/natspecJSON/docstring_state_variable.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_state_variable.sol
rename to test/libsolidity/natspecJSON/docstring_state_variable.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_struct.sol b/test/libsolidity/natspecJSON/docstring_struct.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_struct.sol
rename to test/libsolidity/natspecJSON/docstring_struct.sol
diff --git a/test/libsolidity/syntaxTests/natspec/docstring_variable.sol b/test/libsolidity/natspecJSON/docstring_variable.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/docstring_variable.sol
rename to test/libsolidity/natspecJSON/docstring_variable.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_author_function.sol b/test/libsolidity/natspecJSON/invalid/docstring_author_function.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_author_function.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_author_function.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_author_title_state_variable.sol b/test/libsolidity/natspecJSON/invalid/docstring_author_title_state_variable.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_author_title_state_variable.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_author_title_state_variable.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_description.sol b/test/libsolidity/natspecJSON/invalid/docstring_empty_description.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_description.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_empty_description.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_tag.sol b/test/libsolidity/natspecJSON/invalid/docstring_empty_tag.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_empty_tag.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_empty_tag.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return.sol b/test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return2.sol b/test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return2.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inherit_modifier_no_return2.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inherit_modifier_no_return2.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc2.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc2.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc2.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc2.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc3.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc3.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc3.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc3.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_emptys.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_emptys.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_emptys.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_emptys.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_twice.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_twice.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_twice.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_twice.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_wrong_type.sol b/test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_wrong_type.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_inheritdoc_wrong_type.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_inheritdoc_wrong_type.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_named_return_param_mismatch.sol b/test/libsolidity/natspecJSON/invalid/docstring_named_return_param_mismatch.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_named_return_param_mismatch.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_named_return_param_mismatch.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_non_public_state_variable_with_return.sol b/test/libsolidity/natspecJSON/invalid/docstring_non_public_state_variable_with_return.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_non_public_state_variable_with_return.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_non_public_state_variable_with_return.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_parameter.sol b/test/libsolidity/natspecJSON/invalid/docstring_parameter.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_parameter.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_parameter.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_return_size_mismatch.sol b/test/libsolidity/natspecJSON/invalid/docstring_return_size_mismatch.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_return_size_mismatch.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_return_size_mismatch.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_state_variable_too_many_return_tags.sol b/test/libsolidity/natspecJSON/invalid/docstring_state_variable_too_many_return_tags.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_state_variable_too_many_return_tags.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_state_variable_too_many_return_tags.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/docstring_too_many_return_tags.sol b/test/libsolidity/natspecJSON/invalid/docstring_too_many_return_tags.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/docstring_too_many_return_tags.sol
rename to test/libsolidity/natspecJSON/invalid/docstring_too_many_return_tags.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/inherit_doc_events.sol b/test/libsolidity/natspecJSON/invalid/inherit_doc_events.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/inherit_doc_events.sol
rename to test/libsolidity/natspecJSON/invalid/inherit_doc_events.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/invalid_tag.sol b/test/libsolidity/natspecJSON/invalid/invalid_tag.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/invalid_tag.sol
rename to test/libsolidity/natspecJSON/invalid/invalid_tag.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs.sol b/test/libsolidity/natspecJSON/return_param_amount_differs.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs.sol
rename to test/libsolidity/natspecJSON/return_param_amount_differs.sol
diff --git a/test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs2.sol b/test/libsolidity/natspecJSON/return_param_amount_differs2.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/natspec/invalid/return_param_amount_differs2.sol
rename to test/libsolidity/natspecJSON/return_param_amount_differs2.sol

From b63a94031f424e0ca7ddb737430bf4930cb991c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 21 Aug 2023 11:29:36 +0200
Subject: [PATCH 1599/1748] Generate expectations for moved Natspec syntax
 tests

---
 .../natspecJSON/docstring_double_empty.sol    | 14 +++++
 .../natspecJSON/docstring_enum.sol            | 14 +++++
 .../docstring_named_return_parameter.sol      | 23 ++++++++
 .../natspecJSON/docstring_parameter.sol       | 14 +++++
 .../docstring_private_state_variable.sol      | 21 +++++++
 .../natspecJSON/docstring_state_variable.sol  | 27 +++++++++
 .../natspecJSON/docstring_struct.sol          | 14 +++++
 .../natspecJSON/docstring_variable.sol        | 14 +++++
 .../return_param_amount_differs.sol           | 50 ++++++++++++++++
 .../return_param_amount_differs2.sol          | 57 +++++++++++++++++++
 10 files changed, 248 insertions(+)

diff --git a/test/libsolidity/natspecJSON/docstring_double_empty.sol b/test/libsolidity/natspecJSON/docstring_double_empty.sol
index a84d5d9283..16222d0ac7 100644
--- a/test/libsolidity/natspecJSON/docstring_double_empty.sol
+++ b/test/libsolidity/natspecJSON/docstring_double_empty.sol
@@ -5,3 +5,17 @@ contract C {
   }
 }
 // ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/docstring_enum.sol b/test/libsolidity/natspecJSON/docstring_enum.sol
index d80484446b..d5ace6b141 100644
--- a/test/libsolidity/natspecJSON/docstring_enum.sol
+++ b/test/libsolidity/natspecJSON/docstring_enum.sol
@@ -9,3 +9,17 @@ contract C {
     }
 }
 // ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/docstring_named_return_parameter.sol b/test/libsolidity/natspecJSON/docstring_named_return_parameter.sol
index b7cbad6771..01e0368d49 100644
--- a/test/libsolidity/natspecJSON/docstring_named_return_parameter.sol
+++ b/test/libsolidity/natspecJSON/docstring_named_return_parameter.sol
@@ -3,3 +3,26 @@ abstract contract C {
     function vote() public virtual returns (uint value);
 }
 // ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "vote()":
+//         {
+//             "returns":
+//             {
+//                 "value": "The value returned by this function."
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/docstring_parameter.sol b/test/libsolidity/natspecJSON/docstring_parameter.sol
index 84a2c2ae0d..deacbbcaa5 100644
--- a/test/libsolidity/natspecJSON/docstring_parameter.sol
+++ b/test/libsolidity/natspecJSON/docstring_parameter.sol
@@ -10,3 +10,17 @@ contract C {
     }
 }
 // ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/docstring_private_state_variable.sol b/test/libsolidity/natspecJSON/docstring_private_state_variable.sol
index 5b6cfcce4e..2ea1747e02 100644
--- a/test/libsolidity/natspecJSON/docstring_private_state_variable.sol
+++ b/test/libsolidity/natspecJSON/docstring_private_state_variable.sol
@@ -4,3 +4,24 @@ contract C {
     uint private state;
 }
 // ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "state":
+//         {
+//             "details": "example of dev"
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/docstring_state_variable.sol b/test/libsolidity/natspecJSON/docstring_state_variable.sol
index deb7bf22cf..5627c20602 100644
--- a/test/libsolidity/natspecJSON/docstring_state_variable.sol
+++ b/test/libsolidity/natspecJSON/docstring_state_variable.sol
@@ -4,3 +4,30 @@ contract C {
     uint public state;
 }
 // ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "state":
+//         {
+//             "details": "example of dev"
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods":
+//     {
+//         "state()":
+//         {
+//             "notice": "example of notice"
+//         }
+//     },
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/docstring_struct.sol b/test/libsolidity/natspecJSON/docstring_struct.sol
index 621a88a539..91e5802dd2 100644
--- a/test/libsolidity/natspecJSON/docstring_struct.sol
+++ b/test/libsolidity/natspecJSON/docstring_struct.sol
@@ -10,3 +10,17 @@ contract C {
     }
 }
 // ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/docstring_variable.sol b/test/libsolidity/natspecJSON/docstring_variable.sol
index ccbd4c8a58..66a143ff86 100644
--- a/test/libsolidity/natspecJSON/docstring_variable.sol
+++ b/test/libsolidity/natspecJSON/docstring_variable.sol
@@ -11,3 +11,17 @@ contract C {
     }
 }
 // ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/return_param_amount_differs.sol b/test/libsolidity/natspecJSON/return_param_amount_differs.sol
index 7e40b10b9c..2d18ce8a1b 100644
--- a/test/libsolidity/natspecJSON/return_param_amount_differs.sol
+++ b/test/libsolidity/natspecJSON/return_param_amount_differs.sol
@@ -12,3 +12,53 @@ contract Thing is IThing {
 
     Value public override value;
 }
+// ----
+// ----
+// :IThing devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "value()":
+//         {
+//             "returns":
+//             {
+//                 "x": "a number",
+//                 "y": "another number"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :IThing userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :Thing devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "value":
+//         {
+//             "returns":
+//             {
+//                 "x": "a number",
+//                 "y": "another number"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :Thing userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/return_param_amount_differs2.sol b/test/libsolidity/natspecJSON/return_param_amount_differs2.sol
index cffe2b390f..e10802c100 100644
--- a/test/libsolidity/natspecJSON/return_param_amount_differs2.sol
+++ b/test/libsolidity/natspecJSON/return_param_amount_differs2.sol
@@ -14,3 +14,60 @@ contract Thing is IThing {
     mapping(uint256=>Value) public override value;
 }
 // ----
+// ----
+// :IThing devdoc
+// {
+//     "kind": "dev",
+//     "methods":
+//     {
+//         "value(uint256)":
+//         {
+//             "params":
+//             {
+//                 "v": "value to search for"
+//             },
+//             "returns":
+//             {
+//                 "x": "a number",
+//                 "y": "another number"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :IThing userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :Thing devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "stateVariables":
+//     {
+//         "value":
+//         {
+//             "params":
+//             {
+//                 "v": "value to search for"
+//             },
+//             "returns":
+//             {
+//                 "x": "a number",
+//                 "y": "another number"
+//             }
+//         }
+//     },
+//     "version": 1
+// }
+//
+// :Thing userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }

From 73d582d4b3c89fa5799e9825f9363c6daddcb3f3 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 25 Aug 2022 14:25:54 +0200
Subject: [PATCH 1600/1748] Bump cmake to 3.27.4 and boost to 1.83 on Windows
 to work with Visual Studio 2022

---
 scripts/install_deps.ps1 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/install_deps.ps1 b/scripts/install_deps.ps1
index e7726993ce..dd9ef8c521 100644
--- a/scripts/install_deps.ps1
+++ b/scripts/install_deps.ps1
@@ -6,21 +6,21 @@ $progressPreference = "silentlyContinue"
 if ( -not (Test-Path "$PSScriptRoot\..\deps\boost") ) {
   New-Item -ItemType Directory -Force -Path "$PSScriptRoot\..\deps"
 
-  Invoke-WebRequest -URI "https://github.com/Kitware/CMake/releases/download/v3.18.2/cmake-3.18.2-win64-x64.zip" -OutFile cmake.zip
-  if ((Get-FileHash cmake.zip).Hash -ne "5f4ec834fbd9b62fbf73bc48ed459fa2ea6a86c403106c90fedc2ac76d51612d") {
+  Invoke-WebRequest -URI "https://github.com/Kitware/CMake/releases/download/v3.27.4/cmake-3.27.4-windows-x86_64.zip" -OutFile cmake.zip
+  if ((Get-FileHash cmake.zip).Hash -ne "e5e060756444d0b2070328a8821c1ceb62bd6d267aae61bfff06f96c7ec943a6") {
     throw 'Downloaded CMake source package has wrong checksum.'
   }
   tar -xf cmake.zip
-  mv cmake-3.18.2-win64-x64 "$PSScriptRoot\..\deps\cmake"
+  mv cmake-3.27.4-windows-x86_64 "$PSScriptRoot\..\deps\cmake"
 
   # FIXME: The default user agent results in Artifactory treating Invoke-WebRequest as a browser
   # and serving it a page that requires JavaScript.
-  Invoke-WebRequest -URI "https://boostorg.jfrog.io/artifactory/main/release/1.77.0/source/boost_1_77_0.zip" -OutFile boost.zip -UserAgent ""
-  if ((Get-FileHash boost.zip).Hash -ne "d2886ceff60c35fc6dc9120e8faa960c1e9535f2d7ce447469eae9836110ea77") {
+  Invoke-WebRequest -URI "https://boostorg.jfrog.io/artifactory/main/release/1.83.0/source/boost_1_83_0.zip" -OutFile boost.zip -UserAgent ""
+  if ((Get-FileHash boost.zip).Hash -ne "c86bd9d9eef795b4b0d3802279419fde5221922805b073b9bd822edecb1ca28e") {
     throw 'Downloaded Boost source package has wrong checksum.'
   }
   tar -xf boost.zip
-  cd boost_1_77_0
+  cd boost_1_83_0
   .\bootstrap.bat
   .\b2 -j4 -d0 link=static runtime-link=static variant=release threading=multi address-model=64 --with-filesystem --with-system --with-program_options --with-test --prefix="$PSScriptRoot\..\deps\boost" install
   if ( -not $? ) { throw "Error building boost." }

From 5d88b747469531cf728dda4e9fbec73180e732d3 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 25 Aug 2022 14:25:54 +0200
Subject: [PATCH 1601/1748] install_deps.ps1: Remove downloaded packages and
 sources after installation

---
 scripts/install_deps.ps1 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/scripts/install_deps.ps1 b/scripts/install_deps.ps1
index dd9ef8c521..26a9e116f0 100644
--- a/scripts/install_deps.ps1
+++ b/scripts/install_deps.ps1
@@ -12,6 +12,7 @@ if ( -not (Test-Path "$PSScriptRoot\..\deps\boost") ) {
   }
   tar -xf cmake.zip
   mv cmake-3.27.4-windows-x86_64 "$PSScriptRoot\..\deps\cmake"
+  Remove-Item cmake.zip
 
   # FIXME: The default user agent results in Artifactory treating Invoke-WebRequest as a browser
   # and serving it a page that requires JavaScript.
@@ -20,9 +21,11 @@ if ( -not (Test-Path "$PSScriptRoot\..\deps\boost") ) {
     throw 'Downloaded Boost source package has wrong checksum.'
   }
   tar -xf boost.zip
+  Remove-Item boost.zip
   cd boost_1_83_0
   .\bootstrap.bat
   .\b2 -j4 -d0 link=static runtime-link=static variant=release threading=multi address-model=64 --with-filesystem --with-system --with-program_options --with-test --prefix="$PSScriptRoot\..\deps\boost" install
   if ( -not $? ) { throw "Error building boost." }
   cd ..
+  Remove-Item -LiteralPath .\boost_1_83_0 -Force -Recurse
 }

From 0a69758468a103bf3804a626341602146966c985 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 8 Sep 2023 17:28:12 +0200
Subject: [PATCH 1602/1748] FileReader::isPathPrefix(): Work around
 lexically_normal() no longer preserving UNC slashes on Boost 1.78+ on Windows

---
 libsolidity/interface/FileReader.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libsolidity/interface/FileReader.cpp b/libsolidity/interface/FileReader.cpp
index 7eda870810..4197780e65 100644
--- a/libsolidity/interface/FileReader.cpp
+++ b/libsolidity/interface/FileReader.cpp
@@ -325,7 +325,10 @@ bool FileReader::isPathPrefix(boost::filesystem::path const& _prefix, boost::fil
 	// NOTE: On Windows paths starting with a slash (rather than a drive letter) are considered relative by boost.
 	solAssert(_prefix.is_absolute() || isUNCPath(_prefix) || _prefix.root_path() == "/", "");
 	solAssert(_path.is_absolute() || isUNCPath(_path) || _path.root_path() == "/", "");
-	solAssert(_prefix == _prefix.lexically_normal() && _path == _path.lexically_normal(), "");
+	// NOTE: On Windows before Boost 1.78 lexically_normal() would not replace the `//` UNC prefix with `\\\\`.
+	// Later versions do. Use generic_path() to normalize all slashes to `/` and ignore that difference.
+	// This does not make the assert weaker because == ignores slash type anyway.
+	solAssert(_prefix == _prefix.lexically_normal().generic_string() && _path == _path.lexically_normal().generic_string(), "");
 	solAssert(!hasDotDotSegments(_prefix) && !hasDotDotSegments(_path), "");
 
 	boost::filesystem::path strippedPath = _path.lexically_relative(

From 85b1cb90134e89d6832605526b263d968d513134 Mon Sep 17 00:00:00 2001
From: Saw-mon & Natalie <3140080+Saw-mon-and-Natalie@users.noreply.github.com>
Date: Sat, 19 Aug 2023 16:15:08 -0700
Subject: [PATCH 1603/1748] fixed MSTORE typo

---
 test/libevmasm/Assembler.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/libevmasm/Assembler.cpp b/test/libevmasm/Assembler.cpp
index 512a7bb924..2b01ae03c7 100644
--- a/test/libevmasm/Assembler.cpp
+++ b/test/libevmasm/Assembler.cpp
@@ -229,8 +229,8 @@ BOOST_AUTO_TEST_CASE(immutables_and_its_source_maps)
 			auto const NumExpectedMappings =
 				(
 					2 +                        // PUSH <a> PUSH <b>
-					(numActualRefs - 1) * 5 +  // DUP DUP PUSH <n> ADD MTOSRE
-					3                          // PUSH <n> ADD MSTORkhbE
+					(numActualRefs - 1) * 5 +  // DUP DUP PUSH <n> ADD MSTORE
+					3                          // PUSH <n> ADD MSTORE
 				) * numImmutables;
 
 			auto constexpr NumSubs = 1;

From 70cf104f199e7b44090b9a2732daee4002af226f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 14 Sep 2023 17:44:08 +0200
Subject: [PATCH 1604/1748] fixup! Bump cmake to 3.27.4 and boost to 1.83 on
 Windows to work with Visual Studio 2022

---
 docs/installing-solidity.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index c46767366b..abafd0ad38 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -323,7 +323,7 @@ The following are dependencies for all builds of Solidity:
 | `CMake`_ (version 3.21.3+ on      | Cross-platform build file generator.                  |
 | Windows, 3.13+ otherwise)         |                                                       |
 +-----------------------------------+-------------------------------------------------------+
-| `Boost`_ (version 1.77 on         | C++ libraries.                                        |
+| `Boost`_ (version 1.77+ on        | C++ libraries.                                        |
 | Windows, 1.65+ otherwise)         |                                                       |
 +-----------------------------------+-------------------------------------------------------+
 | `Git`_                            | Command-line tool for retrieving source code.         |
@@ -410,7 +410,7 @@ You need to install the following dependencies for Windows builds of Solidity:
 +-----------------------------------+-------------------------------------------------------+
 | `Visual Studio 2019`_  (Optional) | C++ compiler and dev environment.                     |
 +-----------------------------------+-------------------------------------------------------+
-| `Boost`_ (version 1.77)           | C++ libraries.                                        |
+| `Boost`_ (version 1.77+)          | C++ libraries.                                        |
 +-----------------------------------+-------------------------------------------------------+
 
 If you already have one IDE and only need the compiler and libraries,

From 6e8b9dff5106e14a9d155b2fdb4545fa9633e5db Mon Sep 17 00:00:00 2001
From: Zach Obront <zobront@gmail.com>
Date: Thu, 7 Sep 2023 16:08:46 -0500
Subject: [PATCH 1605/1748] docs: add clarification about post execution
 modifier behavior

---
 docs/contracts/function-modifiers.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contracts/function-modifiers.rst b/docs/contracts/function-modifiers.rst
index 0d597c0b65..454e12ab65 100644
--- a/docs/contracts/function-modifiers.rst
+++ b/docs/contracts/function-modifiers.rst
@@ -132,7 +132,7 @@ variables are set to their :ref:`default values<default-value>` just as if the f
 body.
 
 The ``_`` symbol can appear in the modifier multiple times. Each occurrence is replaced with
-the function body.
+the function body, and the function returns the return value of the final occurrence.
 
 Arbitrary expressions are allowed for modifier arguments and in this context,
 all symbols visible from the function are visible in the modifier. Symbols

From b0a986ffff0f077181e927d2e9f129c304b62828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 7 Sep 2023 16:13:10 +0200
Subject: [PATCH 1606/1748] Allow event definitions at file level

---
 Changelog.md                                  |   1 +
 docs/contracts/events.rst                     |   5 +-
 docs/grammar/SolidityParser.g4                |   1 +
 docs/structure-of-a-contract.rst              |   6 +-
 libsolidity/parsing/Parser.cpp                |   3 +
 test/libsolidity/ABIJson/event_file_level.sol | 107 ++++++++++++++++++
 test/libsolidity/SemanticTest.cpp             |   2 +-
 .../natspecJSON/emit_file_level_event.sol     |  39 +++++++
 .../emit_file_level_event_inheritance.sol     |  69 +++++++++++
 ...t_with_same_signature_as_foreign_event.sol |  60 ++++++++++
 .../natspecJSON/unused_file_level_event.sol   |  21 ++++
 .../events/event_emit_file_level.sol          |  10 ++
 .../events/event_selector_file_level.sol      |  15 +++
 .../events/event_shadowing_file_level.sol     |  38 +++++++
 .../events_with_same_name_file_level.sol      |  32 ++++++
 .../event_emit_qualified_file_level.sol       |   8 ++
 .../events/event_emit_simple_file_level.sol   |   7 ++
 .../event_selector_access_file_level.sol      |   7 ++
 .../syntaxTests/events/file_level_event.sol   |  11 ++
 .../file_level_event_duplicate_definition.sol |   4 +
 ..._event_duplicate_definition_via_import.sol |   8 ++
 .../events/file_level_event_import.sol        |  12 ++
 .../events/file_level_event_overloading.sol   |  11 ++
 ...e_level_event_overloading_vs_shadowing.sol |  13 +++
 ...e_level_event_shadowed_inside_contract.sol |  17 +++
 ...hadowed_inside_contract_adds_anonymous.sol |  17 +++
 .../file_level_event_shadowing_contract.sol   |   4 +
 .../file_level_event_shadowing_error.sol      |   4 +
 .../events/file_level_event_using.sol         |   6 +
 .../illegal_names_exception_file_level.sol    |   4 +
 30 files changed, 536 insertions(+), 6 deletions(-)
 create mode 100644 test/libsolidity/ABIJson/event_file_level.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_file_level_event.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_file_level_event_inheritance.sol
 create mode 100644 test/libsolidity/natspecJSON/emit_file_level_event_with_same_signature_as_foreign_event.sol
 create mode 100644 test/libsolidity/natspecJSON/unused_file_level_event.sol
 create mode 100644 test/libsolidity/semanticTests/events/event_emit_file_level.sol
 create mode 100644 test/libsolidity/semanticTests/events/event_selector_file_level.sol
 create mode 100644 test/libsolidity/semanticTests/events/event_shadowing_file_level.sol
 create mode 100644 test/libsolidity/semanticTests/events/events_with_same_name_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_emit_qualified_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_emit_simple_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/events/event_selector_access_file_level.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition_via_import.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event_import.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event_overloading.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event_overloading_vs_shadowing.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract_adds_anonymous.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event_shadowing_contract.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event_shadowing_error.sol
 create mode 100644 test/libsolidity/syntaxTests/events/file_level_event_using.sol
 create mode 100644 test/libsolidity/syntaxTests/events/illegal_names_exception_file_level.sol

diff --git a/Changelog.md b/Changelog.md
index cdabe189b2..5fdd6b78ea 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
 ### 0.8.22 (unreleased)
 
 Language Features:
+ * Allow defining events at file level.
 
 
 Compiler Features:
diff --git a/docs/contracts/events.rst b/docs/contracts/events.rst
index ca992e6ca2..84b5293c0d 100644
--- a/docs/contracts/events.rst
+++ b/docs/contracts/events.rst
@@ -9,9 +9,10 @@ Events
 Solidity events give an abstraction on top of the EVM's logging functionality.
 Applications can subscribe and listen to these events through the RPC interface of an Ethereum client.
 
-Events are inheritable members of contracts. When you call them, they cause the
+Events can be defined at file level or as inheritable members of contracts (including interfaces and libraries).
+When you call them, they cause the
 arguments to be stored in the transaction's log - a special data structure
-in the blockchain. These logs are associated with the address of the contract,
+in the blockchain. These logs are associated with the address of the contract that emitted them,
 are incorporated into the blockchain, and stay there as long as a block is
 accessible (forever as of now, but this might
 change with Serenity). The Log and its event data is not accessible from within
diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index b8744673d6..4a756029c2 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -22,6 +22,7 @@ sourceUnit: (
 	| enumDefinition
 	| userDefinedValueTypeDefinition
 	| errorDefinition
+	| eventDefinition
 )* EOF;
 
 //@doc: inline
diff --git a/docs/structure-of-a-contract.rst b/docs/structure-of-a-contract.rst
index 740cce861a..51d99a8036 100644
--- a/docs/structure-of-a-contract.rst
+++ b/docs/structure-of-a-contract.rst
@@ -112,11 +112,11 @@ Events are convenience interfaces with the EVM logging facilities.
 .. code-block:: solidity
 
     // SPDX-License-Identifier: GPL-3.0
-    pragma solidity >=0.4.21 <0.9.0;
+    pragma solidity ^0.8.22;
 
-    contract SimpleAuction {
-        event HighestBidIncreased(address bidder, uint amount); // Event
+    event HighestBidIncreased(address bidder, uint amount); // Event
 
+    contract SimpleAuction {
         function bid() public payable {
             // ...
             emit HighestBidIncreased(msg.sender, msg.value); // Triggering event
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 1f5611a2f3..76b5d23d31 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -131,6 +131,9 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 			case Token::Function:
 				nodes.push_back(parseFunctionDefinition(true));
 				break;
+			case Token::Event:
+				nodes.push_back(parseEventDefinition());
+				break;
 			default:
 				if (
 					// Workaround because `error` is not a keyword.
diff --git a/test/libsolidity/ABIJson/event_file_level.sol b/test/libsolidity/ABIJson/event_file_level.sol
new file mode 100644
index 0000000000..5b5c39a82c
--- /dev/null
+++ b/test/libsolidity/ABIJson/event_file_level.sol
@@ -0,0 +1,107 @@
+event Event();
+event Event(uint);
+
+event UnusedEvent();
+
+function f() {
+    emit Event();
+}
+
+contract C {
+    function c_main() public {
+        emit Event(42);
+        f();
+    }
+}
+
+contract D is C {
+    event Event(string);
+
+    function d_main() public {
+        emit Event("abc");
+    }
+}
+// ----
+//     :C
+// [
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "Event",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "uint256",
+//         "name": "",
+//         "type": "uint256"
+//       }
+//     ],
+//     "name": "Event",
+//     "type": "event"
+//   },
+//   {
+//     "inputs": [],
+//     "name": "c_main",
+//     "outputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "function"
+//   }
+// ]
+//
+//
+//     :D
+// [
+//   {
+//     "anonymous": false,
+//     "inputs": [],
+//     "name": "Event",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "uint256",
+//         "name": "",
+//         "type": "uint256"
+//       }
+//     ],
+//     "name": "Event",
+//     "type": "event"
+//   },
+//   {
+//     "anonymous": false,
+//     "inputs":
+//     [
+//       {
+//         "indexed": false,
+//         "internalType": "string",
+//         "name": "",
+//         "type": "string"
+//       }
+//     ],
+//     "name": "Event",
+//     "type": "event"
+//   },
+//   {
+//     "inputs": [],
+//     "name": "c_main",
+//     "outputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "function"
+//   },
+//   {
+//     "inputs": [],
+//     "name": "d_main",
+//     "outputs": [],
+//     "stateMutability": "nonpayable",
+//     "type": "function"
+//   }
+// ]
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index e576ae69d1..f59c61ad80 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -274,7 +274,7 @@ std::optional<AnnotatedEventSignature> SemanticTest::matchEvent(util::h256 const
 	for (std::string& contractName: m_compiler.contractNames())
 	{
 		ContractDefinition const& contract = m_compiler.contractDefinition(contractName);
-		for (EventDefinition const* event: contract.events())
+		for (EventDefinition const* event: contract.events() + contract.usedInterfaceEvents())
 		{
 			FunctionTypePointer eventFunctionType = event->functionType(true);
 			if (!event->isAnonymous() && keccak256(eventFunctionType->externalSignature()) == hash)
diff --git a/test/libsolidity/natspecJSON/emit_file_level_event.sol b/test/libsolidity/natspecJSON/emit_file_level_event.sol
new file mode 100644
index 0000000000..42c028ec9d
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_file_level_event.sol
@@ -0,0 +1,39 @@
+/// @notice Userdoc for file-level event E.
+/// @dev Devdoc for file-level E.
+event E();
+
+contract C {
+    function f() public {
+        emit E();
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "details": "Devdoc for file-level E."
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "notice": "Userdoc for file-level event E."
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_file_level_event_inheritance.sol b/test/libsolidity/natspecJSON/emit_file_level_event_inheritance.sol
new file mode 100644
index 0000000000..f8660a2741
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_file_level_event_inheritance.sol
@@ -0,0 +1,69 @@
+/// @notice Userdoc for file-level event E.
+/// @dev Devdoc for file-level E.
+event E();
+
+contract C {
+    function f() public {
+        emit E();
+    }
+}
+
+contract D is C {}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "details": "Devdoc for file-level E."
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "notice": "Userdoc for file-level event E."
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :D devdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "details": "Devdoc for file-level E."
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :D userdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "notice": "Userdoc for file-level event E."
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/emit_file_level_event_with_same_signature_as_foreign_event.sol b/test/libsolidity/natspecJSON/emit_file_level_event_with_same_signature_as_foreign_event.sol
new file mode 100644
index 0000000000..0e0844349a
--- /dev/null
+++ b/test/libsolidity/natspecJSON/emit_file_level_event_with_same_signature_as_foreign_event.sol
@@ -0,0 +1,60 @@
+/// @notice Userdoc for file-level event E.
+/// @dev Devdoc for file-level E.
+event E();
+
+contract F {
+    /// @notice Userdoc for event F.E.
+    /// @dev Devdoc for event F.E.
+    event E();
+}
+
+contract C {
+    function f() public {
+        emit E();
+        emit F.E();
+    }
+}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :F devdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "details": "Devdoc for event F.E."
+//         }
+//     },
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :F userdoc
+// {
+//     "events":
+//     {
+//         "E()":
+//         {
+//             "notice": "Userdoc for event F.E."
+//         }
+//     },
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/natspecJSON/unused_file_level_event.sol b/test/libsolidity/natspecJSON/unused_file_level_event.sol
new file mode 100644
index 0000000000..4a621f383b
--- /dev/null
+++ b/test/libsolidity/natspecJSON/unused_file_level_event.sol
@@ -0,0 +1,21 @@
+/// @notice Userdoc for file-level event E.
+/// @dev Devdoc for file-level E.
+event E();
+
+contract C {}
+
+// ----
+// ----
+// :C devdoc
+// {
+//     "kind": "dev",
+//     "methods": {},
+//     "version": 1
+// }
+//
+// :C userdoc
+// {
+//     "kind": "user",
+//     "methods": {},
+//     "version": 1
+// }
diff --git a/test/libsolidity/semanticTests/events/event_emit_file_level.sol b/test/libsolidity/semanticTests/events/event_emit_file_level.sol
new file mode 100644
index 0000000000..b698bb80bd
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/event_emit_file_level.sol
@@ -0,0 +1,10 @@
+event Deposit(address indexed _from, bytes32 indexed _id, uint _value);
+
+contract ClientReceipt {
+    function deposit(bytes32 _id) public payable {
+        emit Deposit(msg.sender, _id, msg.value);
+    }
+}
+// ----
+// deposit(bytes32), 18 wei: 0x1234 ->
+// ~ emit Deposit(address,bytes32,uint256): #0x1212121212121212121212121212120000000012, #0x1234, 0x12
diff --git a/test/libsolidity/semanticTests/events/event_selector_file_level.sol b/test/libsolidity/semanticTests/events/event_selector_file_level.sol
new file mode 100644
index 0000000000..8c5b6c95be
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/event_selector_file_level.sol
@@ -0,0 +1,15 @@
+event E();
+
+library L {
+    event E();
+}
+
+contract C {
+    function main() external pure returns (bytes32, bytes32) {
+        assert(E.selector == L.E.selector);
+
+        return (E.selector, L.E.selector);
+    }
+}
+// ----
+// main() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
diff --git a/test/libsolidity/semanticTests/events/event_shadowing_file_level.sol b/test/libsolidity/semanticTests/events/event_shadowing_file_level.sol
new file mode 100644
index 0000000000..01c7d85aeb
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/event_shadowing_file_level.sol
@@ -0,0 +1,38 @@
+event E();
+
+library L1 {
+    event E(string);
+}
+
+library L2 {
+    event E();
+}
+
+library K {
+    function main() internal pure returns (bytes32, bytes32, bytes32) {
+        // Here E is the global event.
+        assert(E.selector != L1.E.selector);
+        assert(E.selector == L2.E.selector);
+
+        return (E.selector, L1.E.selector, L2.E.selector);
+    }
+}
+
+contract C {
+    event E(string);
+
+    function main() external pure returns (bytes32, bytes32, bytes32) {
+        // Here E is the local event.
+        assert(E.selector == L1.E.selector);
+        assert(E.selector != L2.E.selector);
+
+        return (E.selector, L1.E.selector, L2.E.selector);
+    }
+
+    function k_main() external pure returns (bytes32, bytes32, bytes32) {
+        return K.main();
+    }
+}
+// ----
+// main() -> 0x3e9992c940c54ea252d3a34557cc3d3014281525c43d694f89d5f3dfd820b07d, 0x3e9992c940c54ea252d3a34557cc3d3014281525c43d694f89d5f3dfd820b07d, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
+// k_main() -> 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028, 0x3e9992c940c54ea252d3a34557cc3d3014281525c43d694f89d5f3dfd820b07d, 0x92bbf6e823a631f3c8e09b1c8df90f378fb56f7fbc9701827e1ff8aad7f6a028
diff --git a/test/libsolidity/semanticTests/events/events_with_same_name_file_level.sol b/test/libsolidity/semanticTests/events/events_with_same_name_file_level.sol
new file mode 100644
index 0000000000..222e0b0cea
--- /dev/null
+++ b/test/libsolidity/semanticTests/events/events_with_same_name_file_level.sol
@@ -0,0 +1,32 @@
+event Deposit();
+event Deposit(address _addr);
+event Deposit(address _addr, uint _amount);
+event Deposit(address _addr, bool _flag);
+
+contract ClientReceipt {
+    function deposit() public returns (uint) {
+        emit Deposit();
+        return 1;
+    }
+    function deposit(address _addr) public returns (uint) {
+        emit Deposit(_addr);
+        return 2;
+    }
+    function deposit(address _addr, uint _amount) public returns (uint) {
+        emit Deposit(_addr, _amount);
+        return 3;
+    }
+    function deposit(address _addr, bool _flag) public returns (uint) {
+        emit Deposit(_addr, _flag);
+        return 4;
+    }
+}
+// ----
+// deposit() -> 1
+// ~ emit Deposit()
+// deposit(address): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988 -> 2
+// ~ emit Deposit(address): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988
+// deposit(address,uint256): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, 100 -> 3
+// ~ emit Deposit(address,uint256): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, 0x64
+// deposit(address,bool): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, false -> 4
+// ~ emit Deposit(address,bool): 0x5082a85c489be6aa0f2e6693bf09cc1bbd35e988, false
diff --git a/test/libsolidity/syntaxTests/events/event_emit_qualified_file_level.sol b/test/libsolidity/syntaxTests/events/event_emit_qualified_file_level.sol
new file mode 100644
index 0000000000..6d1cc65de7
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_emit_qualified_file_level.sol
@@ -0,0 +1,8 @@
+==== Source: M.sol ====
+event E();
+==== Source: A.sol ====
+import "M.sol" as M;
+
+function f() {
+    emit M.E();
+}
diff --git a/test/libsolidity/syntaxTests/events/event_emit_simple_file_level.sol b/test/libsolidity/syntaxTests/events/event_emit_simple_file_level.sol
new file mode 100644
index 0000000000..46fda33bc4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_emit_simple_file_level.sol
@@ -0,0 +1,7 @@
+event E();
+
+contract C {
+    function f() public {
+        emit E();
+    }
+}
diff --git a/test/libsolidity/syntaxTests/events/event_selector_access_file_level.sol b/test/libsolidity/syntaxTests/events/event_selector_access_file_level.sol
new file mode 100644
index 0000000000..1131e00b6e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/event_selector_access_file_level.sol
@@ -0,0 +1,7 @@
+event E();
+
+contract C {
+    function f() external pure returns (bytes32) {
+        return E.selector;
+    }
+}
diff --git a/test/libsolidity/syntaxTests/events/file_level_event.sol b/test/libsolidity/syntaxTests/events/file_level_event.sol
new file mode 100644
index 0000000000..33d4378fdc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event.sol
@@ -0,0 +1,11 @@
+event E1();
+event E2(uint);
+event E3(uint, string indexed, bytes, bool);
+event E4(int, int, int) anonymous;
+
+function f() {
+    emit E1();
+    emit E2(1);
+    emit E3(1, "abc", "abc", true);
+    emit E4(1, 2, 3);
+}
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition.sol b/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition.sol
new file mode 100644
index 0000000000..30d3594eaf
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition.sol
@@ -0,0 +1,4 @@
+event E();
+event E();
+// ----
+// DeclarationError 5883: (0-10): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition_via_import.sol b/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition_via_import.sol
new file mode 100644
index 0000000000..0cd9c8c2aa
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event_duplicate_definition_via_import.sol
@@ -0,0 +1,8 @@
+==== Source: A.sol ====
+event E();
+==== Source: B.sol ====
+import "A.sol";
+
+event E();
+// ----
+// DeclarationError 5883: (B.sol:17-27): Event with same name and parameter types defined twice.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_import.sol b/test/libsolidity/syntaxTests/events/file_level_event_import.sol
new file mode 100644
index 0000000000..c2591a18f2
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event_import.sol
@@ -0,0 +1,12 @@
+==== Source: A.sol ====
+event EA();
+==== Source: B.sol ====
+event EB();
+==== Source: C.sol ====
+import "A.sol";
+import {EB} from "B.sol";
+
+function f() {
+    emit EA();
+    emit EB();
+}
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_overloading.sol b/test/libsolidity/syntaxTests/events/file_level_event_overloading.sol
new file mode 100644
index 0000000000..1f4ac33823
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event_overloading.sol
@@ -0,0 +1,11 @@
+event E();
+event E(uint);
+event E(uint, string indexed, bytes, bool);
+event E(int, int, int) anonymous;
+
+function f() {
+    emit E();
+    emit E(1);
+    emit E(1, "abc", "abc", true);
+    emit E(1, 2, 3);
+}
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_overloading_vs_shadowing.sol b/test/libsolidity/syntaxTests/events/file_level_event_overloading_vs_shadowing.sol
new file mode 100644
index 0000000000..f6268b2864
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event_overloading_vs_shadowing.sol
@@ -0,0 +1,13 @@
+event E();
+
+contract C {
+    event E(uint);
+
+    function f() public {
+        emit E();
+        emit E(1);
+    }
+}
+// ----
+// Warning 2519: (29-43): This declaration shadows an existing declaration.
+// TypeError 6160: (84-87): Wrong argument count for function call: 0 arguments given but expected 1.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract.sol b/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract.sol
new file mode 100644
index 0000000000..1408e54346
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract.sol
@@ -0,0 +1,17 @@
+event E();
+
+contract C {
+    event E();
+}
+
+library L {
+    event E();
+}
+
+interface I {
+    event E();
+}
+// ----
+// Warning 2519: (29-39): This declaration shadows an existing declaration.
+// Warning 2519: (59-69): This declaration shadows an existing declaration.
+// Warning 2519: (91-101): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract_adds_anonymous.sol b/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract_adds_anonymous.sol
new file mode 100644
index 0000000000..1b95ac7d1e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event_shadowed_inside_contract_adds_anonymous.sol
@@ -0,0 +1,17 @@
+event E();
+
+contract C {
+    event E() anonymous;
+}
+
+library L {
+    event E() anonymous;
+}
+
+interface I {
+    event E() anonymous;
+}
+// ----
+// Warning 2519: (29-49): This declaration shadows an existing declaration.
+// Warning 2519: (69-89): This declaration shadows an existing declaration.
+// Warning 2519: (111-131): This declaration shadows an existing declaration.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_shadowing_contract.sol b/test/libsolidity/syntaxTests/events/file_level_event_shadowing_contract.sol
new file mode 100644
index 0000000000..1ebe600e5d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event_shadowing_contract.sol
@@ -0,0 +1,4 @@
+event E();
+contract E {}
+// ----
+// DeclarationError 2333: (11-24): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_shadowing_error.sol b/test/libsolidity/syntaxTests/events/file_level_event_shadowing_error.sol
new file mode 100644
index 0000000000..c6ba8e9c7a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event_shadowing_error.sol
@@ -0,0 +1,4 @@
+event E();
+error E();
+// ----
+// DeclarationError 2333: (11-21): Identifier already declared.
diff --git a/test/libsolidity/syntaxTests/events/file_level_event_using.sol b/test/libsolidity/syntaxTests/events/file_level_event_using.sol
new file mode 100644
index 0000000000..99827d0b87
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/file_level_event_using.sol
@@ -0,0 +1,6 @@
+event E();
+
+type T is uint;
+using {E} for T;
+// ----
+// TypeError 8187: (35-36): Expected function name.
diff --git a/test/libsolidity/syntaxTests/events/illegal_names_exception_file_level.sol b/test/libsolidity/syntaxTests/events/illegal_names_exception_file_level.sol
new file mode 100644
index 0000000000..48b23dc38f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/events/illegal_names_exception_file_level.sol
@@ -0,0 +1,4 @@
+// Exception for the illegal name list. External interface events
+event this();
+event super();
+event _();

From 309a8de53048cb5ea26185ba4af79dfd22496e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 7 Aug 2023 13:00:08 +0200
Subject: [PATCH 1607/1748] Refactor AnalysisFramework to share more features
 between test cases that depend on it

---
 test/libsolidity/AnalysisFramework.cpp | 60 ++++++++++++++++++++++
 test/libsolidity/AnalysisFramework.h   | 41 +++++++++++++--
 test/libsolidity/GasTest.cpp           | 14 +++---
 test/libsolidity/GasTest.h             |  3 ++
 test/libsolidity/MemoryGuardTest.cpp   | 12 +++--
 test/libsolidity/MemoryGuardTest.h     |  3 ++
 test/libsolidity/SMTCheckerTest.cpp    |  6 +--
 test/libsolidity/SMTCheckerTest.h      |  2 +-
 test/libsolidity/SolidityCompiler.cpp  | 19 +++++--
 test/libsolidity/SyntaxTest.cpp        | 69 ++++++++++++--------------
 test/libsolidity/SyntaxTest.h          |  2 +-
 11 files changed, 172 insertions(+), 59 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 7e4c32eaed..6839efe1fe 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -22,6 +22,7 @@
 #include <test/libsolidity/AnalysisFramework.h>
 
 #include <test/libsolidity/util/Common.h>
+#include <test/libsolidity/util/SoltestErrors.h>
 #include <test/Common.h>
 
 #include <libsolidity/interface/CompilerStack.h>
@@ -66,11 +67,60 @@ AnalysisFramework::parseAnalyseAndReturnError(
 	return make_pair(&compiler().ast(""), std::move(errors));
 }
 
+bool AnalysisFramework::runFramework(StringMap _sources, PipelineStage _targetStage)
+{
+	resetFramework();
+	m_targetStage = _targetStage;
+	soltestAssert(m_compiler);
+
+	m_compiler->setSources(std::move(_sources));
+	setupCompiler(*m_compiler);
+	executeCompilationPipeline();
+	return pipelineSuccessful();
+}
+
+void AnalysisFramework::resetFramework()
+{
+	compiler().reset();
+	m_targetStage = PipelineStage::Compilation;
+}
+
 std::unique_ptr<CompilerStack> AnalysisFramework::createStack() const
 {
 	return std::make_unique<CompilerStack>();
 }
 
+void AnalysisFramework::setupCompiler(CompilerStack& _compiler)
+{
+	_compiler.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
+}
+
+void AnalysisFramework::executeCompilationPipeline()
+{
+	soltestAssert(m_compiler);
+
+	// If you add a new stage, remember to handle it below.
+	soltestAssert(
+		m_targetStage == PipelineStage::Parsing ||
+		m_targetStage == PipelineStage::Analysis ||
+		m_targetStage == PipelineStage::Compilation
+	);
+
+	bool parsingSuccessful = m_compiler->parse();
+	soltestAssert(parsingSuccessful || !filteredErrors(false /* _includeWarningsAndInfos */).empty());
+	if (!parsingSuccessful || stageSuccessful(m_targetStage))
+		return;
+
+	bool analysisSuccessful = m_compiler->analyze();
+	soltestAssert(analysisSuccessful || !filteredErrors(false /* _includeWarningsAndInfos */).empty());
+	if (!analysisSuccessful || stageSuccessful(m_targetStage))
+		return;
+
+	bool compilationSuccessful = m_compiler->compile();
+	soltestAssert(compilationSuccessful || !filteredErrors(false /* _includeWarningsAndInfos */).empty());
+	soltestAssert(stageSuccessful(m_targetStage) == compilationSuccessful);
+}
+
 ErrorList AnalysisFramework::filterErrors(ErrorList const& _errorList, bool _includeWarningsAndInfos) const
 {
 	ErrorList errors;
@@ -113,6 +163,16 @@ ErrorList AnalysisFramework::filterErrors(ErrorList const& _errorList, bool _inc
 	return errors;
 }
 
+bool AnalysisFramework::stageSuccessful(PipelineStage _stage) const
+{
+	switch (_stage) {
+		case PipelineStage::Parsing: return compiler().state() >= CompilerStack::Parsed;
+		case PipelineStage::Analysis: return compiler().state() >= CompilerStack::AnalysisSuccessful;
+		case PipelineStage::Compilation: return compiler().state() >= CompilerStack::CompilationSuccessful;
+	}
+	unreachable();
+}
+
 SourceUnit const* AnalysisFramework::parseAndAnalyse(std::string const& _source)
 {
 	auto sourceAndError = parseAnalyseAndReturnError(_source);
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index 65b6940f65..902f4369f8 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -39,6 +39,12 @@ using FunctionTypePointer = FunctionType const*;
 namespace solidity::frontend::test
 {
 
+enum class PipelineStage {
+	Parsing,
+	Analysis,
+	Compilation,
+};
+
 class AnalysisFramework
 {
 
@@ -56,6 +62,25 @@ class AnalysisFramework
 	bool success(std::string const& _source);
 	langutil::ErrorList expectError(std::string const& _source, bool _warning = false, bool _allowMultiple = false);
 
+public:
+	/// Runs the full compiler pipeline on specified sources. This is the main function of the
+	/// framework. Resets the stack, configures it and runs either until the first failed stage or
+	/// until the @p _targetStage is reached.
+	/// Afterwards the caller can inspect the stack via @p compiler(). The framework provides a few
+	/// convenience helpers to check the state and error list, in general the caller can freely
+	/// access the stack, including generating outputs if the compilation succeeded.
+	bool runFramework(StringMap _sources, PipelineStage _targetStage = PipelineStage::Compilation);
+	bool runFramework(std::string _source, PipelineStage _targetStage = PipelineStage::Compilation)
+	{
+		return runFramework({{"", std::move(_source)}}, _targetStage);
+	}
+
+	void resetFramework();
+
+	PipelineStage targetStage() const { return m_targetStage; }
+	bool pipelineSuccessful() const { return stageSuccessful(m_targetStage); }
+	bool stageSuccessful(PipelineStage _stage) const;
+
 	std::string formatErrors(
 		langutil::ErrorList const& _errors,
 		bool _colored = false,
@@ -80,9 +105,6 @@ class AnalysisFramework
 		return filterErrors(compiler().errors(), _includeWarningsAndInfos);
 	}
 
-	std::vector<std::string> m_warningsToFilter = {"This is a pre-release compiler version"};
-	std::vector<std::string> m_messagesToCut = {"Source file requires different compiler version (current compiler is"};
-
 	/// @returns reference to lazy-instantiated CompilerStack.
 	solidity::frontend::CompilerStack& compiler()
 	{
@@ -99,12 +121,25 @@ class AnalysisFramework
 		return *m_compiler;
 	}
 
+protected:
 	/// Creates a new instance of @p CompilerStack. Override if your test case needs to pass in
 	/// custom constructor arguments.
 	virtual std::unique_ptr<CompilerStack> createStack() const;
 
+	/// Configures @p CompilerStack. The default implementation sets basic parameters based on
+	/// CLI options. Override if your test case needs extra configuration.
+	virtual void setupCompiler(CompilerStack& _compiler);
+
+	/// Executes the requested pipeline stages until @p m_targetStage is reached.
+	/// Stops at the first failed stage.
+	void executeCompilationPipeline();
+
+	std::vector<std::string> m_warningsToFilter = {"This is a pre-release compiler version"};
+	std::vector<std::string> m_messagesToCut = {"Source file requires different compiler version (current compiler is"};
+
 private:
 	mutable std::unique_ptr<solidity::frontend::CompilerStack> m_compiler;
+	PipelineStage m_targetStage = PipelineStage::Compilation;
 };
 
 // Asserts that the compilation down to typechecking
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index 086060588a..87f67dcff5 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -97,13 +97,13 @@ void GasTest::printUpdatedExpectations(std::ostream& _stream, std::string const&
 	}
 }
 
-TestCase::TestResult GasTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
+void GasTest::setupCompiler(CompilerStack& _compiler)
 {
-	compiler().reset();
+
 	// Prerelease CBOR metadata varies in size due to changing version numbers and build dates.
 	// This leads to volatile creation cost estimates. Therefore we force the compiler to
 	// release mode for testing gas estimates.
-	compiler().setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
+	_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
 	OptimiserSettings settings = m_optimise ? OptimiserSettings::standard() : OptimiserSettings::minimal();
 	if (m_optimiseYul)
 	{
@@ -111,10 +111,12 @@ TestCase::TestResult GasTest::run(std::ostream& _stream, std::string const& _lin
 		settings.optimizeStackAllocation = m_optimise;
 	}
 	settings.expectedExecutionsPerDeployment = m_optimiseRuns;
-	compiler().setOptimiserSettings(settings);
-	compiler().setSources({{"", withPreamble(m_source)}});
+	_compiler.setOptimiserSettings(settings);
+}
 
-	if (!compiler().parseAndAnalyze() || !compiler().compile())
+TestCase::TestResult GasTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
+{
+	if (!runFramework(withPreamble(m_source), PipelineStage::Compilation))
 	{
 		_stream << formatErrors(filteredErrors(), _formatted);
 		return TestResult::FatalError;
diff --git a/test/libsolidity/GasTest.h b/test/libsolidity/GasTest.h
index 46619c4719..a04976cd53 100644
--- a/test/libsolidity/GasTest.h
+++ b/test/libsolidity/GasTest.h
@@ -44,6 +44,9 @@ class GasTest: AnalysisFramework, public TestCase
 	void printSource(std::ostream &_stream, std::string const &_linePrefix = "", bool _formatted = false) const override;
 	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
 
+protected:
+	void setupCompiler(CompilerStack& _compiler) override;
+
 private:
 	void parseExpectations(std::istream& _stream);
 
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index c8475469d5..d2e5d3d099 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -36,13 +36,15 @@ using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 using namespace yul;
 
+void MemoryGuardTest::setupCompiler(CompilerStack& _compiler)
+{
+	_compiler.setViaIR(true);
+	_compiler.setOptimiserSettings(OptimiserSettings::none());
+}
+
 TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
-	compiler().reset();
-	compiler().setSources(StringMap{{"", m_source}});
-	compiler().setViaIR(true);
-	compiler().setOptimiserSettings(OptimiserSettings::none());
-	if (!compiler().compile())
+	if (!runFramework(m_source, PipelineStage::Compilation))
 	{
 		_stream << formatErrors(filteredErrors(), _formatted);
 		return TestResult::FatalError;
diff --git a/test/libsolidity/MemoryGuardTest.h b/test/libsolidity/MemoryGuardTest.h
index e2ca8a6e53..ec6fe5e5b9 100644
--- a/test/libsolidity/MemoryGuardTest.h
+++ b/test/libsolidity/MemoryGuardTest.h
@@ -48,6 +48,9 @@ class MemoryGuardTest: public AnalysisFramework, public TestCase
 	}
 
 	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
+
+protected:
+	void setupCompiler(CompilerStack& _compiler) override;
 };
 
 }
diff --git a/test/libsolidity/SMTCheckerTest.cpp b/test/libsolidity/SMTCheckerTest.cpp
index 6368bfa4f1..893ccb0f15 100644
--- a/test/libsolidity/SMTCheckerTest.cpp
+++ b/test/libsolidity/SMTCheckerTest.cpp
@@ -126,11 +126,11 @@ SMTCheckerTest::SMTCheckerTest(std::string const& _filename): SyntaxTest(_filena
 	m_modelCheckerSettings.bmcLoopIterations = std::optional<unsigned>{bmcLoopIterations};
 }
 
-void SMTCheckerTest::setupCompiler()
+void SMTCheckerTest::setupCompiler(CompilerStack& _compiler)
 {
-	SyntaxTest::setupCompiler();
+	SyntaxTest::setupCompiler(_compiler);
 
-	compiler().setModelCheckerSettings(m_modelCheckerSettings);
+	_compiler.setModelCheckerSettings(m_modelCheckerSettings);
 }
 
 void SMTCheckerTest::filterObtainedErrors()
diff --git a/test/libsolidity/SMTCheckerTest.h b/test/libsolidity/SMTCheckerTest.h
index 3e8d8238bb..d42572dc5b 100644
--- a/test/libsolidity/SMTCheckerTest.h
+++ b/test/libsolidity/SMTCheckerTest.h
@@ -38,7 +38,7 @@ class SMTCheckerTest: public SyntaxTest
 	}
 	SMTCheckerTest(std::string const& _filename);
 
-	void setupCompiler() override;
+	void setupCompiler(CompilerStack& _compiler) override;
 	void filterObtainedErrors() override;
 
 	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
diff --git a/test/libsolidity/SolidityCompiler.cpp b/test/libsolidity/SolidityCompiler.cpp
index 9252cac16f..1d4f6851a0 100644
--- a/test/libsolidity/SolidityCompiler.cpp
+++ b/test/libsolidity/SolidityCompiler.cpp
@@ -28,7 +28,17 @@
 namespace solidity::frontend::test
 {
 
-BOOST_FIXTURE_TEST_SUITE(SolidityCompiler, AnalysisFramework)
+class SolidityCompilerFixture: protected AnalysisFramework
+{
+	void setupCompiler(CompilerStack& _compiler) override
+	{
+		// FIXME: This test was probably supposed to respect CommonOptions::get().optimize but
+		// due to a bug it was always running with optimizer disabled and it does not pass with it.
+		_compiler.setOptimiserSettings(false);
+	}
+};
+
+BOOST_FIXTURE_TEST_SUITE(SolidityCompiler, SolidityCompilerFixture)
 
 BOOST_AUTO_TEST_CASE(does_not_include_creation_time_only_internal_functions)
 {
@@ -39,12 +49,13 @@ BOOST_AUTO_TEST_CASE(does_not_include_creation_time_only_internal_functions)
 			function f() internal { unchecked { for (uint i = 0; i < 10; ++i) x += 3 + i; } }
 		}
 	)";
-	compiler().setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
-	BOOST_REQUIRE(success(sourceCode));
+
+	runFramework(sourceCode, PipelineStage::Compilation);
 	BOOST_REQUIRE_MESSAGE(
-		compiler().compile(),
+		pipelineSuccessful(),
 		"Contract compilation failed:\n" + formatErrors(filteredErrors(), true /* _colored */)
 	);
+
 	bytes const& creationBytecode = solidity::test::bytecodeSansMetadata(compiler().object("C").bytecode);
 	bytes const& runtimeBytecode = solidity::test::bytecodeSansMetadata(compiler().runtimeObject("C").bytecode);
 	BOOST_CHECK(creationBytecode.size() >= 90);
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index ad53c2b265..906391e01c 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -49,53 +49,51 @@ SyntaxTest::SyntaxTest(
 	m_optimiseYul = m_reader.boolSetting("optimize-yul", true);
 }
 
-void SyntaxTest::setupCompiler()
+void SyntaxTest::setupCompiler(CompilerStack& _compiler)
 {
-	compiler().reset();
-	compiler().setSources(withPreamble(m_sources.sources));
-	compiler().setEVMVersion(m_evmVersion);
-	compiler().setOptimiserSettings(
+	AnalysisFramework::setupCompiler(_compiler);
+
+	_compiler.setEVMVersion(m_evmVersion);
+	_compiler.setOptimiserSettings(
 		m_optimiseYul ?
 		OptimiserSettings::full() :
 		OptimiserSettings::minimal()
 	);
-	compiler().setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
-	compiler().setMetadataHash(CompilerStack::MetadataHash::None);
+	_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
+	_compiler.setMetadataHash(CompilerStack::MetadataHash::None);
 }
 
 void SyntaxTest::parseAndAnalyze()
 {
-	setupCompiler();
-
-	if (compiler().parse() && compiler().analyze())
-		try
-		{
-			if (!compiler().compile())
-			{
-				ErrorList const& errors = compiler().errors();
-				auto codeGeneretionErrorCount = count_if(errors.cbegin(), errors.cend(), [](auto const& error) {
-					return error->type() == Error::Type::CodeGenerationError;
-				});
-				auto errorCount = count_if(errors.cbegin(), errors.cend(), [](auto const& error) {
-					return Error::isError(error->type());
-				});
-				// failing compilation after successful analysis is a rare case,
-				// it assumes that errors contain exactly one error, and the error is of type Error::Type::CodeGenerationError
-				if (codeGeneretionErrorCount != 1 || errorCount != 1)
-					BOOST_THROW_EXCEPTION(runtime_error("Compilation failed even though analysis was successful."));
-			}
-		}
-		catch (UnimplementedFeatureError const& _e)
+	try
+	{
+		runFramework(withPreamble(m_sources.sources), PipelineStage::Compilation);
+		if (!pipelineSuccessful() && stageSuccessful(PipelineStage::Analysis))
 		{
-			m_errorList.emplace_back(SyntaxTestError{
-				"UnimplementedFeatureError",
-				nullopt,
-				errorMessage(_e),
-				"",
-				-1,
-				-1
+			ErrorList const& errors = compiler().errors();
+			auto codeGeneretionErrorCount = count_if(errors.cbegin(), errors.cend(), [](auto const& error) {
+				return error->type() == Error::Type::CodeGenerationError;
 			});
+			auto errorCount = count_if(errors.cbegin(), errors.cend(), [](auto const& error) {
+				return Error::isError(error->type());
+			});
+			// failing compilation after successful analysis is a rare case,
+			// it assumes that errors contain exactly one error, and the error is of type Error::Type::CodeGenerationError
+			if (codeGeneretionErrorCount != 1 || errorCount != 1)
+				BOOST_THROW_EXCEPTION(runtime_error("Compilation failed even though analysis was successful."));
 		}
+	}
+	catch (UnimplementedFeatureError const& _e)
+	{
+		m_errorList.emplace_back(SyntaxTestError{
+			"UnimplementedFeatureError",
+			nullopt,
+			errorMessage(_e),
+			"",
+			-1,
+			-1
+		});
+	}
 
 	filterObtainedErrors();
 }
@@ -146,4 +144,3 @@ void SyntaxTest::filterObtainedErrors()
 		});
 	}
 }
-
diff --git a/test/libsolidity/SyntaxTest.h b/test/libsolidity/SyntaxTest.h
index a85e1f53fe..a3f8f4e5d2 100644
--- a/test/libsolidity/SyntaxTest.h
+++ b/test/libsolidity/SyntaxTest.h
@@ -48,7 +48,7 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
 	);
 
 protected:
-	virtual void setupCompiler();
+	void setupCompiler(CompilerStack& _compiler) override;
 	void parseAndAnalyze() override;
 	virtual void filterObtainedErrors();
 

From b766268ff3e0de91c59a73a013df3ff5f509715b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 19:41:49 +0200
Subject: [PATCH 1608/1748] AnalysisFramework: Get rid of parseAndAnalyse() and
 success()

- There are too many badly named functions doing different things. E.g. SyntaxTest has both this and parseAndAnalyze().
---
 test/libsolidity/AnalysisFramework.cpp        | 16 -----
 test/libsolidity/AnalysisFramework.h          | 15 ++--
 .../SolidityNameAndTypeResolution.cpp         | 71 +++++++++++++------
 3 files changed, 56 insertions(+), 46 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 6839efe1fe..6c4e21a6d0 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -173,22 +173,6 @@ bool AnalysisFramework::stageSuccessful(PipelineStage _stage) const
 	unreachable();
 }
 
-SourceUnit const* AnalysisFramework::parseAndAnalyse(std::string const& _source)
-{
-	auto sourceAndError = parseAnalyseAndReturnError(_source);
-	BOOST_REQUIRE(!!sourceAndError.first);
-	std::string message;
-	if (!sourceAndError.second.empty())
-		message = "Unexpected error: " + formatErrors(compiler().errors());
-	BOOST_REQUIRE_MESSAGE(sourceAndError.second.empty(), message);
-	return sourceAndError.first;
-}
-
-bool AnalysisFramework::success(std::string const& _source)
-{
-	return parseAnalyseAndReturnError(_source).second.empty();
-}
-
 ErrorList AnalysisFramework::expectError(std::string const& _source, bool _warning, bool _allowMultiple)
 {
 	auto sourceAndErrors = parseAnalyseAndReturnError(_source, _warning, true, _allowMultiple);
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index 902f4369f8..e1750e1eab 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -58,8 +58,6 @@ class AnalysisFramework
 	);
 	virtual ~AnalysisFramework() = default;
 
-	SourceUnit const* parseAndAnalyse(std::string const& _source);
-	bool success(std::string const& _source);
 	langutil::ErrorList expectError(std::string const& _source, bool _warning = false, bool _allowMultiple = false);
 
 public:
@@ -189,16 +187,19 @@ CHECK_ERROR_OR_WARNING(text, Warning, std::vector<std::string>{(substring)}, tru
 CHECK_ERROR_OR_WARNING(text, Warning, substrings, true, true)
 
 // [checkSuccess(text)] asserts that the compilation down to typechecking succeeds.
-#define CHECK_SUCCESS(text) do { BOOST_CHECK(success((text))); } while(0)
+#define CHECK_SUCCESS(text) do { \
+	auto [ast, errors] = parseAnalyseAndReturnError((text)); \
+	BOOST_CHECK(errors.empty()); \
+} while(0)
 
 #define CHECK_SUCCESS_NO_WARNINGS(text) \
 do \
 { \
-	auto sourceAndError = parseAnalyseAndReturnError((text), true); \
+	auto [ast, errors] = parseAnalyseAndReturnError((text), true); \
 	std::string message; \
-	if (!sourceAndError.second.empty()) \
-		message = formatErrors(compiler().errors());\
-	BOOST_CHECK_MESSAGE(sourceAndError.second.empty(), message); \
+	if (!errors.empty()) \
+		message = formatErrors(errors);\
+	BOOST_CHECK_MESSAGE(errors.empty(), message); \
 } \
 while(0)
 
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index 02f140357b..90461dc79e 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -21,6 +21,7 @@
  */
 
 #include <test/libsolidity/AnalysisFramework.h>
+#include <test/libsolidity/util/SoltestErrors.h>
 
 #include <test/Common.h>
 
@@ -41,13 +42,15 @@ BOOST_FIXTURE_TEST_SUITE(SolidityNameAndTypeResolution, AnalysisFramework)
 
 BOOST_AUTO_TEST_CASE(function_no_implementation)
 {
-	SourceUnit const* sourceUnit = nullptr;
 	char const* text = R"(
 		abstract contract test {
 			function functionName(bytes32 input) public virtual returns (bytes32 out);
 		}
 	)";
-	sourceUnit = parseAndAnalyse(text);
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
 	ContractDefinition* contract = dynamic_cast<ContractDefinition*>(nodes[1].get());
 	BOOST_REQUIRE(contract);
@@ -57,12 +60,14 @@ BOOST_AUTO_TEST_CASE(function_no_implementation)
 
 BOOST_AUTO_TEST_CASE(abstract_contract)
 {
-	SourceUnit const* sourceUnit = nullptr;
 	char const* text = R"(
 		abstract contract base { function foo() public virtual; }
 		contract derived is base { function foo() public override {} }
 	)";
-	sourceUnit = parseAndAnalyse(text);
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
 	ContractDefinition* base = dynamic_cast<ContractDefinition*>(nodes[1].get());
 	ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[2].get());
@@ -76,12 +81,14 @@ BOOST_AUTO_TEST_CASE(abstract_contract)
 
 BOOST_AUTO_TEST_CASE(abstract_contract_with_overload)
 {
-	SourceUnit const* sourceUnit = nullptr;
 	char const* text = R"(
 		abstract contract base { function foo(bool) public virtual; }
 		abstract contract derived is base { function foo(uint) public {} }
 	)";
-	sourceUnit = parseAndAnalyse(text);
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
 	ContractDefinition* base = dynamic_cast<ContractDefinition*>(nodes[1].get());
 	ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[2].get());
@@ -93,12 +100,14 @@ BOOST_AUTO_TEST_CASE(abstract_contract_with_overload)
 
 BOOST_AUTO_TEST_CASE(implement_abstract_via_constructor)
 {
-	SourceUnit const* sourceUnit = nullptr;
 	char const* text = R"(
 		abstract contract base { function foo() public virtual; }
 		abstract contract foo is base { constructor() {} }
 	)";
-	sourceUnit = parseAndAnalyse(text);
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	std::vector<ASTPointer<ASTNode>> nodes = sourceUnit->nodes();
 	BOOST_CHECK_EQUAL(nodes.size(), 3);
 	ContractDefinition* derived = dynamic_cast<ContractDefinition*>(nodes[2].get());
@@ -108,7 +117,6 @@ BOOST_AUTO_TEST_CASE(implement_abstract_via_constructor)
 
 BOOST_AUTO_TEST_CASE(function_canonical_signature)
 {
-	SourceUnit const* sourceUnit = nullptr;
 	char const* text = R"(
 		contract Test {
 			function foo(uint256 arg1, uint64 arg2, bool arg3) public returns (uint256 ret) {
@@ -116,7 +124,10 @@ BOOST_AUTO_TEST_CASE(function_canonical_signature)
 			}
 		}
 	)";
-	sourceUnit = parseAndAnalyse(text);
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
 		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
 		{
@@ -127,7 +138,6 @@ BOOST_AUTO_TEST_CASE(function_canonical_signature)
 
 BOOST_AUTO_TEST_CASE(function_canonical_signature_type_aliases)
 {
-	SourceUnit const* sourceUnit = nullptr;
 	char const* text = R"(
 		contract Test {
 			function boo(uint, bytes32, address) public returns (uint ret) {
@@ -135,7 +145,10 @@ BOOST_AUTO_TEST_CASE(function_canonical_signature_type_aliases)
 			}
 		}
 	)";
-	sourceUnit = parseAndAnalyse(text);
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
 		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
 		{
@@ -148,7 +161,6 @@ BOOST_AUTO_TEST_CASE(function_canonical_signature_type_aliases)
 
 BOOST_AUTO_TEST_CASE(function_external_types)
 {
-	SourceUnit const* sourceUnit = nullptr;
 	char const* text = R"(
 		contract C {
 			uint a;
@@ -159,7 +171,10 @@ BOOST_AUTO_TEST_CASE(function_external_types)
 			}
 		}
 	)";
-	sourceUnit = parseAndAnalyse(text);
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
 		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
 		{
@@ -172,7 +187,6 @@ BOOST_AUTO_TEST_CASE(function_external_types)
 
 BOOST_AUTO_TEST_CASE(enum_external_type)
 {
-	SourceUnit const* sourceUnit = nullptr;
 	char const* text = R"(
 		// test for bug #1801
 		contract Test {
@@ -182,7 +196,10 @@ BOOST_AUTO_TEST_CASE(enum_external_type)
 			}
 		}
 	)";
-	sourceUnit = parseAndAnalyse(text);
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
 		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
 		{
@@ -264,7 +281,10 @@ BOOST_AUTO_TEST_CASE(struct_with_mapping_in_library)
 			function f(X storage x) external {}
 		}
 	)";
-	SourceUnit const* sourceUnit = parseAndAnalyse(text);
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
 		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
 		{
@@ -287,10 +307,12 @@ BOOST_AUTO_TEST_CASE(state_variable_accessors)
 		}
 	)";
 
-	SourceUnit const* source;
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	ContractDefinition const* contract;
-	source = parseAndAnalyse(text);
-	BOOST_REQUIRE((contract = retrieveContractByName(*source, "test")) != nullptr);
+	BOOST_REQUIRE((contract = retrieveContractByName(*sourceUnit, "test")) != nullptr);
 	FunctionTypePointer function = retrieveFunctionBySignature(*contract, "foo()");
 	BOOST_REQUIRE(function && function->hasDeclaration());
 	auto returnParams = function->returnParameterTypes();
@@ -327,9 +349,12 @@ BOOST_AUTO_TEST_CASE(private_state_variable)
 		}
 	)";
 
+	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	soltestAssert(sourceUnit);
+	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
+
 	ContractDefinition const* contract;
-	SourceUnit const* source = parseAndAnalyse(text);
-	BOOST_CHECK((contract = retrieveContractByName(*source, "test")) != nullptr);
+	BOOST_CHECK((contract = retrieveContractByName(*sourceUnit, "test")) != nullptr);
 	FunctionTypePointer function;
 	function = retrieveFunctionBySignature(*contract, "foo()");
 	BOOST_CHECK_MESSAGE(function == nullptr, "Accessor function of a private variable should not exist");
@@ -345,7 +370,7 @@ BOOST_AUTO_TEST_CASE(string)
 			function f(string calldata x) external { s = x; }
 		}
 	)";
-	BOOST_CHECK_NO_THROW(parseAndAnalyse(sourceCode));
+	CHECK_SUCCESS(sourceCode);
 }
 
 BOOST_AUTO_TEST_CASE(dynamic_return_types_not_possible)

From d2bfb2f7373a1b9fbe812352ab5db99246bbf6d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 4 Aug 2023 19:44:59 +0200
Subject: [PATCH 1609/1748] AnalysisFramework: Reimplement
 parseAnalyseAndReturnError() with runFramework()

---
 test/libsolidity/AnalysisFramework.cpp        | 38 ++++++++--------
 test/libsolidity/AnalysisFramework.h          | 45 ++++++++++++++-----
 .../SolidityNameAndTypeResolution.cpp         | 28 ++++++------
 3 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 6c4e21a6d0..6f9e53e2c3 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -42,26 +42,20 @@ using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
 
-std::pair<SourceUnit const*, ErrorList>
-AnalysisFramework::parseAnalyseAndReturnError(
+std::pair<SourceUnit const*, ErrorList> AnalysisFramework::runAnalysisAndExpectNoParsingErrors(
 	std::string const& _source,
-	bool _reportWarnings,
-	bool _insertLicenseAndVersionPragma,
-	bool _allowMultipleErrors
+	bool _includeWarningsAndInfos,
+	bool _addPreamble,
+	bool _allowMultiple
 )
 {
-	compiler().reset();
-	compiler().setSources({{"", _insertLicenseAndVersionPragma ? withPreamble(_source) : _source}});
-	compiler().setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
-	if (!compiler().parse())
-	{
-		BOOST_FAIL("Parsing contract failed in analysis test suite:" + formatErrors(compiler().errors()));
-	}
+	runFramework(_addPreamble ? withPreamble(_source) : _source, PipelineStage::Analysis);
 
-	compiler().analyze();
+	if (!stageSuccessful(PipelineStage::Parsing))
+		BOOST_FAIL("Parsing contract failed in analysis test suite:" + formatErrors(m_compiler->errors()));
 
-	ErrorList errors = filteredErrors(_reportWarnings);
-	if (errors.size() > 1 && !_allowMultipleErrors)
+	ErrorList errors = filteredErrors(_includeWarningsAndInfos);
+	if (errors.size() > 1 && !_allowMultiple)
 		BOOST_FAIL("Multiple errors found: " + formatErrors(errors));
 
 	return make_pair(&compiler().ast(""), std::move(errors));
@@ -173,12 +167,16 @@ bool AnalysisFramework::stageSuccessful(PipelineStage _stage) const
 	unreachable();
 }
 
-ErrorList AnalysisFramework::expectError(std::string const& _source, bool _warning, bool _allowMultiple)
+ErrorList AnalysisFramework::runAnalysisAndExpectError(
+	std::string const& _source,
+	bool _includeWarningsAndInfos,
+	bool _allowMultiple
+)
 {
-	auto sourceAndErrors = parseAnalyseAndReturnError(_source, _warning, true, _allowMultiple);
-	BOOST_REQUIRE(!sourceAndErrors.second.empty());
-	BOOST_REQUIRE_MESSAGE(!!sourceAndErrors.first, "Expected error, but no error happened.");
-	return sourceAndErrors.second;
+	auto [ast, errors] = runAnalysisAndExpectNoParsingErrors(_source, _includeWarningsAndInfos, true, _allowMultiple);
+	BOOST_REQUIRE(!errors.empty());
+	BOOST_REQUIRE_MESSAGE(ast, "Expected error, but no error happened.");
+	return errors;
 }
 
 std::string AnalysisFramework::formatErrors(
diff --git a/test/libsolidity/AnalysisFramework.h b/test/libsolidity/AnalysisFramework.h
index e1750e1eab..e7b2c03ec2 100644
--- a/test/libsolidity/AnalysisFramework.h
+++ b/test/libsolidity/AnalysisFramework.h
@@ -49,16 +49,37 @@ class AnalysisFramework
 {
 
 protected:
-	virtual std::pair<SourceUnit const*, langutil::ErrorList>
-	parseAnalyseAndReturnError(
+	virtual ~AnalysisFramework() = default;
+
+	/// Runs analysis via runFramework() and returns either an AST or a filtered list of errors.
+	/// Uses Boost test macros to fail if errors do not occur specifically at the analysis stage.
+	///
+	/// @deprecated This is a legacy helper. Use runFramework() directly in new tests.
+	///
+	/// @param _includeWarningsAndInfos Do not remove warning and info messages from the error list.
+	/// @param _addPreamble Apply withPreamble() to @p _source.
+	/// @param _allowMultiple When false, use Boost test macros to fail when there's more
+	///        than one item on the error list.
+	std::pair<SourceUnit const*, langutil::ErrorList> runAnalysisAndExpectNoParsingErrors(
 		std::string const& _source,
-		bool _reportWarnings = false,
-		bool _insertLicenseAndVersionPragma = true,
-		bool _allowMultipleErrors = false
+		bool _includeWarningsAndInfos = false,
+		bool _addPreamble = true,
+		bool _allowMultiple = false
 	);
-	virtual ~AnalysisFramework() = default;
 
-	langutil::ErrorList expectError(std::string const& _source, bool _warning = false, bool _allowMultiple = false);
+	/// Runs analysis via runAnalysisAndExpectNoParsingErrors() and returns the list of errors.
+	/// Uses Boost test macros to fail if there are no errors.
+	///
+	/// @deprecated This is a legacy helper. Use runFramework() directly in new tests.
+	///
+	/// @param _includeWarningsAndInfos Do not remove warning and info messages from the error list.
+	/// @param _allowMultiple When false, use Boost test macros to fail when there's more
+	///        than one item on the error list.
+	langutil::ErrorList runAnalysisAndExpectError(
+		std::string const& _source,
+		bool _includeWarningsAndInfos = false,
+		bool _allowMultiple = false
+	);
 
 public:
 	/// Runs the full compiler pipeline on specified sources. This is the main function of the
@@ -145,15 +166,15 @@ class AnalysisFramework
 #define CHECK_ALLOW_MULTI(text, expectations) \
 do \
 { \
-	ErrorList errors = expectError((text), true, true); \
+	ErrorList errors = runAnalysisAndExpectError((text), true, true); \
 	auto message = searchErrors(errors, (expectations)); \
 	BOOST_CHECK_MESSAGE(message.empty(), message); \
 } while(0)
 
-#define CHECK_ERROR_OR_WARNING(text, typ, substrings, warning, allowMulti) \
+#define CHECK_ERROR_OR_WARNING(text, typ, substrings, includeWarningsAndInfos, allowMulti) \
 do \
 { \
-	ErrorList errors = expectError((text), (warning), (allowMulti)); \
+	ErrorList errors = runAnalysisAndExpectError((text), (includeWarningsAndInfos), (allowMulti)); \
 	std::vector<std::pair<Error::Type, std::string>> expectations; \
 	for (auto const& str: substrings) \
 		expectations.emplace_back((Error::Type::typ), str); \
@@ -188,14 +209,14 @@ CHECK_ERROR_OR_WARNING(text, Warning, substrings, true, true)
 
 // [checkSuccess(text)] asserts that the compilation down to typechecking succeeds.
 #define CHECK_SUCCESS(text) do { \
-	auto [ast, errors] = parseAnalyseAndReturnError((text)); \
+	auto [ast, errors] = runAnalysisAndExpectNoParsingErrors((text)); \
 	BOOST_CHECK(errors.empty()); \
 } while(0)
 
 #define CHECK_SUCCESS_NO_WARNINGS(text) \
 do \
 { \
-	auto [ast, errors] = parseAnalyseAndReturnError((text), true); \
+	auto [ast, errors] = runAnalysisAndExpectNoParsingErrors((text), true); \
 	std::string message; \
 	if (!errors.empty()) \
 		message = formatErrors(errors);\
diff --git a/test/libsolidity/SolidityNameAndTypeResolution.cpp b/test/libsolidity/SolidityNameAndTypeResolution.cpp
index 90461dc79e..4104d70c87 100644
--- a/test/libsolidity/SolidityNameAndTypeResolution.cpp
+++ b/test/libsolidity/SolidityNameAndTypeResolution.cpp
@@ -47,7 +47,7 @@ BOOST_AUTO_TEST_CASE(function_no_implementation)
 			function functionName(bytes32 input) public virtual returns (bytes32 out);
 		}
 	)";
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(abstract_contract)
 		abstract contract base { function foo() public virtual; }
 		contract derived is base { function foo() public override {} }
 	)";
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(abstract_contract_with_overload)
 		abstract contract base { function foo(bool) public virtual; }
 		abstract contract derived is base { function foo(uint) public {} }
 	)";
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -104,7 +104,7 @@ BOOST_AUTO_TEST_CASE(implement_abstract_via_constructor)
 		abstract contract base { function foo() public virtual; }
 		abstract contract foo is base { constructor() {} }
 	)";
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -124,7 +124,7 @@ BOOST_AUTO_TEST_CASE(function_canonical_signature)
 			}
 		}
 	)";
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(function_canonical_signature_type_aliases)
 			}
 		}
 	)";
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -171,7 +171,7 @@ BOOST_AUTO_TEST_CASE(function_external_types)
 			}
 		}
 	)";
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -196,7 +196,7 @@ BOOST_AUTO_TEST_CASE(enum_external_type)
 			}
 		}
 	)";
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -228,7 +228,7 @@ BOOST_AUTO_TEST_CASE(external_struct_signatures)
 	// Ignore analysis errors. This test only checks that correct signatures
 	// are generated for external structs, but they are not yet supported
 	// in code generation and therefore cause an error in the TypeChecker.
-	SourceUnit const* sourceUnit = parseAnalyseAndReturnError(text, false, true, true).first;
+	SourceUnit const* sourceUnit = runAnalysisAndExpectNoParsingErrors(text, false, true, true).first;
 	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
 		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
 		{
@@ -259,7 +259,7 @@ BOOST_AUTO_TEST_CASE(external_struct_signatures_in_libraries)
 	// Ignore analysis errors. This test only checks that correct signatures
 	// are generated for external structs, but calldata structs are not yet supported
 	// in code generation and therefore cause an error in the TypeChecker.
-	SourceUnit const* sourceUnit = parseAnalyseAndReturnError(text, false, true, true).first;
+	SourceUnit const* sourceUnit = runAnalysisAndExpectNoParsingErrors(text, false, true, true).first;
 	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
 		if (ContractDefinition* contract = dynamic_cast<ContractDefinition*>(node.get()))
 		{
@@ -281,7 +281,7 @@ BOOST_AUTO_TEST_CASE(struct_with_mapping_in_library)
 			function f(X storage x) external {}
 		}
 	)";
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -307,7 +307,7 @@ BOOST_AUTO_TEST_CASE(state_variable_accessors)
 		}
 	)";
 
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -349,7 +349,7 @@ BOOST_AUTO_TEST_CASE(private_state_variable)
 		}
 	)";
 
-	auto [sourceUnit, errors] = parseAnalyseAndReturnError(text);
+	auto [sourceUnit, errors] = runAnalysisAndExpectNoParsingErrors(text);
 	soltestAssert(sourceUnit);
 	soltestAssert(errors.empty(), "Unexpected error: " + formatErrors(errors));
 
@@ -397,7 +397,7 @@ BOOST_AUTO_TEST_CASE(warn_nonpresent_pragma)
 		// SPDX-License-Identifier: GPL-3.0
 		contract C {}
 	)";
-	auto sourceAndError = parseAnalyseAndReturnError(text, true, false);
+	auto sourceAndError = runAnalysisAndExpectNoParsingErrors(text, true, false);
 	BOOST_REQUIRE(!sourceAndError.second.empty());
 	BOOST_REQUIRE(!!sourceAndError.first);
 	BOOST_CHECK(searchErrorMessage(*sourceAndError.second.front(), "Source file does not specify required compiler version!"));

From 3fb2f1db8876a6890139f450db0b8661dcf10c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 7 Aug 2023 12:26:44 +0200
Subject: [PATCH 1610/1748] AnalysisFramework: Move common setup to the
 framework

---
 test/libsolidity/AnalysisFramework.cpp | 5 +++++
 test/libsolidity/GasTest.cpp           | 5 +++++
 test/libsolidity/MemoryGuardTest.cpp   | 2 ++
 test/libsolidity/SolidityCompiler.cpp  | 2 ++
 4 files changed, 14 insertions(+)

diff --git a/test/libsolidity/AnalysisFramework.cpp b/test/libsolidity/AnalysisFramework.cpp
index 6f9e53e2c3..dc52ffc1c6 100644
--- a/test/libsolidity/AnalysisFramework.cpp
+++ b/test/libsolidity/AnalysisFramework.cpp
@@ -86,7 +86,12 @@ std::unique_ptr<CompilerStack> AnalysisFramework::createStack() const
 
 void AnalysisFramework::setupCompiler(CompilerStack& _compiler)
 {
+	// These are just defaults based on the (global) CLI options.
+	// Technically, every TestCase should override these with values passed to it in TestCase::Config.
+	// In practice TestCase::Config always matches global config so most test cases don't care.
 	_compiler.setEVMVersion(solidity::test::CommonOptions::get().evmVersion());
+	_compiler.setEOFVersion(solidity::test::CommonOptions::get().eofVersion());
+	_compiler.setOptimiserSettings(solidity::test::CommonOptions::get().optimize);
 }
 
 void AnalysisFramework::executeCompilationPipeline()
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index 87f67dcff5..5d8a694976 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -99,6 +99,7 @@ void GasTest::printUpdatedExpectations(std::ostream& _stream, std::string const&
 
 void GasTest::setupCompiler(CompilerStack& _compiler)
 {
+	AnalysisFramework::setupCompiler(_compiler);
 
 	// Prerelease CBOR metadata varies in size due to changing version numbers and build dates.
 	// This leads to volatile creation cost estimates. Therefore we force the compiler to
@@ -112,6 +113,10 @@ void GasTest::setupCompiler(CompilerStack& _compiler)
 	}
 	settings.expectedExecutionsPerDeployment = m_optimiseRuns;
 	_compiler.setOptimiserSettings(settings);
+
+	// Intentionally ignoring EVM version specified on the command line.
+	// Gas expectations are only valid for the default version.
+	_compiler.setEVMVersion(EVMVersion{});
 }
 
 TestCase::TestResult GasTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index d2e5d3d099..2d8cc564bd 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -38,6 +38,8 @@ using namespace yul;
 
 void MemoryGuardTest::setupCompiler(CompilerStack& _compiler)
 {
+	AnalysisFramework::setupCompiler(_compiler);
+
 	_compiler.setViaIR(true);
 	_compiler.setOptimiserSettings(OptimiserSettings::none());
 }
diff --git a/test/libsolidity/SolidityCompiler.cpp b/test/libsolidity/SolidityCompiler.cpp
index 1d4f6851a0..7cb95a99d0 100644
--- a/test/libsolidity/SolidityCompiler.cpp
+++ b/test/libsolidity/SolidityCompiler.cpp
@@ -32,6 +32,8 @@ class SolidityCompilerFixture: protected AnalysisFramework
 {
 	void setupCompiler(CompilerStack& _compiler) override
 	{
+		AnalysisFramework::setupCompiler(_compiler);
+
 		// FIXME: This test was probably supposed to respect CommonOptions::get().optimize but
 		// due to a bug it was always running with optimizer disabled and it does not pass with it.
 		_compiler.setOptimiserSettings(false);

From e3b36f736df1a130dde417df97038f346e484b31 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 12 Sep 2023 15:17:27 +0200
Subject: [PATCH 1611/1748] Avoid sorting FunctionDefinitions by AST ID during
 codegen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 Changelog.md                                  |  1 +
 .../codegen/ir/IRGenerationContext.cpp        | 24 +++++++++----------
 libsolidity/codegen/ir/IRGenerationContext.h  | 24 ++++---------------
 libsolidity/codegen/ir/IRGenerator.cpp        |  3 +++
 .../abi_encode_calldata_slice.sol             |  2 +-
 .../abi_encode_calldata_slice.sol             |  2 +-
 .../externalContracts/base64.sol              |  2 +-
 .../externalContracts/prbmath_unsigned.sol    |  2 +-
 .../externalContracts/strings.sol             |  2 +-
 ...on_with_same_id_in_internal_dispatcher.sol |  9 +++++++
 10 files changed, 35 insertions(+), 36 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/functionTypes/duplicated_function_definition_with_same_id_in_internal_dispatcher.sol

diff --git a/Changelog.md b/Changelog.md
index 5fdd6b78ea..c14af77389 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ Compiler Features:
 
 Bugfixes:
  * AST: Fix wrong initial ID for Yul nodes in the AST.
+ * Code Generator: Fix output from via-IR code generator being dependent on which files were discovered by import callback. In some cases, a different AST ID assignment would alter the order of functions in internal dispatch, resulting in superficially different but semantically equivalent bytecode.
  * NatSpec: Fix internal error when requesting userdoc or devdoc for a contract that emits an event defined in a foreign contract or interface.
  * SMTChecker: Fix encoding error that causes loops to unroll after completion.
  * SMTChecker: Fix inconsistency on constant condition checks when ``while`` or ``for`` loops are unrolled before the condition check.
diff --git a/libsolidity/codegen/ir/IRGenerationContext.cpp b/libsolidity/codegen/ir/IRGenerationContext.cpp
index 668056cf52..e087dc69a5 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.cpp
+++ b/libsolidity/codegen/ir/IRGenerationContext.cpp
@@ -31,6 +31,7 @@
 #include <libsolutil/StringUtils.h>
 
 #include <range/v3/view/map.hpp>
+#include <range/v3/algorithm/find.hpp>
 
 using namespace solidity;
 using namespace solidity::util;
@@ -41,7 +42,7 @@ std::string IRGenerationContext::enqueueFunctionForCodeGeneration(FunctionDefini
 	std::string name = IRNames::function(_function);
 
 	if (!m_functions.contains(name))
-		m_functionGenerationQueue.insert(&_function);
+		m_functionGenerationQueue.push_back(&_function);
 
 	return name;
 }
@@ -50,8 +51,8 @@ FunctionDefinition const* IRGenerationContext::dequeueFunctionForCodeGeneration(
 {
 	solAssert(!m_functionGenerationQueue.empty(), "");
 
-	FunctionDefinition const* result = *m_functionGenerationQueue.begin();
-	m_functionGenerationQueue.erase(m_functionGenerationQueue.begin());
+	FunctionDefinition const* result = m_functionGenerationQueue.front();
+	m_functionGenerationQueue.pop_front();
 	return result;
 }
 
@@ -132,7 +133,7 @@ void IRGenerationContext::initializeInternalDispatch(InternalDispatchMap _intern
 {
 	solAssert(internalDispatchClean(), "");
 
-	for (DispatchSet const& functions: _internalDispatch | ranges::views::values)
+	for (DispatchQueue const& functions: _internalDispatch | ranges::views::values)
 		for (auto function: functions)
 			enqueueFunctionForCodeGeneration(*function);
 
@@ -149,16 +150,15 @@ InternalDispatchMap IRGenerationContext::consumeInternalDispatchMap()
 void IRGenerationContext::addToInternalDispatch(FunctionDefinition const& _function)
 {
 	FunctionType const* functionType = TypeProvider::function(_function, FunctionType::Kind::Internal);
-	solAssert(functionType, "");
+	solAssert(functionType);
 
 	YulArity arity = YulArity::fromType(*functionType);
-
-	if (m_internalDispatchMap.count(arity) != 0 && m_internalDispatchMap[arity].count(&_function) != 0)
-		// Note that m_internalDispatchMap[arity] is a set with a custom comparator, which looks at function IDs not definitions
-		solAssert(*m_internalDispatchMap[arity].find(&_function) == &_function, "Different definitions with the same function ID");
-
-	m_internalDispatchMap[arity].insert(&_function);
-	enqueueFunctionForCodeGeneration(_function);
+	DispatchQueue& dispatchQueue = m_internalDispatchMap[arity];
+	if (ranges::find(dispatchQueue, &_function) == ranges::end(dispatchQueue))
+	{
+		dispatchQueue.push_back(&_function);
+		enqueueFunctionForCodeGeneration(_function);
+	}
 }
 
 
diff --git a/libsolidity/codegen/ir/IRGenerationContext.h b/libsolidity/codegen/ir/IRGenerationContext.h
index 833b768a31..a80a18a62a 100644
--- a/libsolidity/codegen/ir/IRGenerationContext.h
+++ b/libsolidity/codegen/ir/IRGenerationContext.h
@@ -37,7 +37,6 @@
 #include <set>
 #include <string>
 #include <memory>
-#include <vector>
 
 namespace solidity::frontend
 {
@@ -45,20 +44,8 @@ namespace solidity::frontend
 class YulUtilFunctions;
 class ABIFunctions;
 
-struct AscendingFunctionIDCompare
-{
-	bool operator()(FunctionDefinition const* _f1, FunctionDefinition const* _f2) const
-	{
-		// NULLs always first.
-		if (_f1 != nullptr && _f2 != nullptr)
-			return _f1->id() < _f2->id();
-		else
-			return _f1 == nullptr;
-	}
-};
-
-using DispatchSet = std::set<FunctionDefinition const*, AscendingFunctionIDCompare>;
-using InternalDispatchMap = std::map<YulArity, DispatchSet>;
+using DispatchQueue = std::deque<FunctionDefinition const*>;
+using InternalDispatchMap = std::map<YulArity, DispatchQueue>;
 
 /**
  * Class that contains contextual information during IR generation.
@@ -197,10 +184,9 @@ class IRGenerationContext
 	/// were discovered by the IR generator during AST traversal.
 	/// Note that the queue gets filled in a lazy way - new definitions can be added while the
 	/// collected ones get removed and traversed.
-	/// The order and duplicates are irrelevant here (hence std::set rather than std::queue) as
-	/// long as the order of Yul functions in the generated code is deterministic and the same on
-	/// all platforms - which is a property guaranteed by MultiUseYulFunctionCollector.
-	DispatchSet m_functionGenerationQueue;
+	/// The order and duplicates are relevant here
+	/// (see: IRGenerationContext::[enqueue|dequeue]FunctionForCodeGeneration)
+	DispatchQueue m_functionGenerationQueue;
 
 	/// Collection of functions that need to be callable via internal dispatch.
 	/// Note that having a key with an empty set of functions is a valid situation. It means that
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index e3375c692e..4ea5f6c169 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -279,6 +279,7 @@ InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefin
 			templ("out", suffixedVariableNameList("out_", 0, arity.out));
 
 			std::vector<std::map<std::string, std::string>> cases;
+			std::set<int64_t> caseValues;
 			for (FunctionDefinition const* function: internalDispatchMap.at(arity))
 			{
 				solAssert(function, "");
@@ -289,12 +290,14 @@ InternalDispatchMap IRGenerator::generateInternalDispatchFunctions(ContractDefin
 				solAssert(!function->isConstructor(), "");
 				// 0 is reserved for uninitialized function pointers
 				solAssert(function->id() != 0, "Unexpected function ID: 0");
+				solAssert(caseValues.count(function->id()) == 0, "Duplicate function ID");
 				solAssert(m_context.functionCollector().contains(IRNames::function(*function)), "");
 
 				cases.emplace_back(std::map<std::string, std::string>{
 					{"funID", std::to_string(m_context.mostDerivedContract().annotation().internalFunctionIDs.at(function))},
 					{"name", IRNames::function(*function)}
 				});
+				caseValues.insert(function->id());
 			}
 
 			templ("cases", std::move(cases));
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 53bc3faba6..6f5eca3048 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -63,6 +63,6 @@ contract C {
 // gas legacy: 411269
 // gas legacyOptimized: 317754
 // test_uint256() ->
-// gas irOptimized: 509677
+// gas irOptimized: 509479
 // gas legacy: 577469
 // gas legacyOptimized: 441003
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index 975e9f4770..a028cbaf9b 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -64,6 +64,6 @@ contract C {
 // gas legacy: 411269
 // gas legacyOptimized: 317754
 // test_uint256() ->
-// gas irOptimized: 509677
+// gas irOptimized: 509479
 // gas legacy: 577469
 // gas legacyOptimized: 441003
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index 1e366f75f1..133574a141 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,7 +33,7 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 406679
+// gas irOptimized: 406691
 // gas legacy: 737652
 // gas legacyOptimized: 527036
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 2442493d74..77a1e2ca62 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,7 +48,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1722598
+// gas irOptimized: 1722610
 // gas legacy: 2210160
 // gas legacyOptimized: 1734152
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 817f6702e9..226bf5947d 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,7 +49,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 634316
+// gas irOptimized: 634328
 // gas legacy: 1065857
 // gas legacyOptimized: 725423
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
diff --git a/test/libsolidity/semanticTests/functionTypes/duplicated_function_definition_with_same_id_in_internal_dispatcher.sol b/test/libsolidity/semanticTests/functionTypes/duplicated_function_definition_with_same_id_in_internal_dispatcher.sol
new file mode 100644
index 0000000000..c15007c59e
--- /dev/null
+++ b/test/libsolidity/semanticTests/functionTypes/duplicated_function_definition_with_same_id_in_internal_dispatcher.sol
@@ -0,0 +1,9 @@
+contract C {
+    function a() internal {}
+    function f() public {
+        function() ptr1 = a;
+        function() ptr2 = a;
+    }
+}
+// ----
+// f()

From ab2d3957cb110fb6ef7138368c01d416b5b83183 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Sun, 17 Sep 2023 17:34:22 +0200
Subject: [PATCH 1612/1748] Add bytecode test for multiple sources compiler at
 same time
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 scripts/common/cmdline_helpers.py             | 67 +++++++++++++++++++
 scripts/common/git_helpers.py                 | 20 ++++++
 scripts/splitSources.py                       | 31 ++++-----
 .../inputs.sol                                | 29 ++++++++
 .../test.py                                   | 43 ++++++++++++
 5 files changed, 172 insertions(+), 18 deletions(-)
 create mode 100644 scripts/common/cmdline_helpers.py
 create mode 100644 test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/inputs.sol
 create mode 100755 test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/test.py

diff --git a/scripts/common/cmdline_helpers.py b/scripts/common/cmdline_helpers.py
new file mode 100644
index 0000000000..1f322be1fc
--- /dev/null
+++ b/scripts/common/cmdline_helpers.py
@@ -0,0 +1,67 @@
+import os
+import subprocess
+from pathlib import Path
+from shutil import rmtree
+from tempfile import mkdtemp
+from textwrap import dedent
+from typing import List
+from typing import Optional
+
+from bytecodecompare.prepare_report import FileReport
+from bytecodecompare.prepare_report import parse_cli_output
+
+
+DEFAULT_PREAMBLE = dedent("""
+    // SPDX-License-Identifier: UNLICENSED
+    pragma solidity >=0.0;
+""")
+
+
+def inside_temporary_dir(prefix):
+    """
+    Creates a temporary directory, enters the directory and executes the function inside it.
+    Restores the previous working directory after executing the function.
+    """
+    def tmp_dir_decorator(fn):
+        previous_dir = os.getcwd()
+        def f(*args, **kwargs):
+            try:
+                tmp_dir = mkdtemp(prefix=prefix)
+                os.chdir(tmp_dir)
+                result = fn(*args, **kwargs)
+                rmtree(tmp_dir)
+                return result
+            finally:
+                os.chdir(previous_dir)
+        return f
+    return tmp_dir_decorator
+
+
+def solc_bin_report(solc_binary: str, input_files: List[Path], via_ir: bool) -> FileReport:
+    """
+    Runs the solidity compiler binary
+    """
+
+    output = subprocess.check_output(
+        [solc_binary, '--bin'] +
+        input_files +
+        (['--via-ir'] if via_ir else []),
+        encoding='utf8',
+    )
+    return parse_cli_output('', output)
+
+
+def save_bytecode(bytecode_path: Path, reports: FileReport, contract: Optional[str] = None):
+    with open(bytecode_path, 'w', encoding='utf8') as f:
+        for report in reports.contract_reports:
+            if contract is None or report.contract_name == contract:
+                bytecode = report.bytecode if report.bytecode is not None else '<NO BYTECODE>'
+                f.write(f'{report.contract_name}: {bytecode}\n')
+
+
+def add_preamble(source_path: Path, preamble: str = DEFAULT_PREAMBLE):
+    for source in source_path.glob('**/*.sol'):
+        with open(source, 'r+', encoding='utf8') as f:
+            content = f.read()
+            f.seek(0, 0)
+            f.write(preamble + content)
diff --git a/scripts/common/git_helpers.py b/scripts/common/git_helpers.py
index bb5b1f6134..f43a8619fe 100644
--- a/scripts/common/git_helpers.py
+++ b/scripts/common/git_helpers.py
@@ -1,4 +1,6 @@
 import subprocess
+from pathlib import Path
+from shutil import which
 
 
 def run_git_command(command):
@@ -17,3 +19,21 @@ def git_current_branch():
 
 def git_commit_hash(ref: str = 'HEAD'):
     return run_git_command(['git', 'rev-parse', '--verify', ref])
+
+
+def git_diff(file_a: Path, file_b: Path) -> int:
+    if which('git') is None:
+        raise RuntimeError('git not found.')
+
+    return subprocess.run([
+        'git',
+        'diff',
+        '--color',
+        '--word-diff=plain',
+        '--word-diff-regex=.',
+        '--ignore-space-change',
+        '--ignore-blank-lines',
+        '--exit-code',
+        file_a,
+        file_b,
+    ], encoding='utf8', check=False).returncode
diff --git a/scripts/splitSources.py b/scripts/splitSources.py
index 7dc91acceb..5e783b2d5a 100755
--- a/scripts/splitSources.py
+++ b/scripts/splitSources.py
@@ -13,9 +13,6 @@
 import os
 import traceback
 
-hasMultipleSources = False
-createdSources = []
-
 
 def uncaught_exception_hook(exc_type, exc_value, exc_traceback):
     # The script `scripts/ASTImportTest.sh` will interpret return code 3
@@ -43,7 +40,6 @@ def writeSourceToFile(lines):
     if filePath:
         os.system("mkdir -p " + filePath)
     with open(srcName, mode='a+', encoding='utf8', newline='') as f:
-        createdSources.append(srcName)
         for idx, line in enumerate(lines[1:]):
             # write to file
             if line[:12] != "==== Source:":
@@ -51,12 +47,11 @@ def writeSourceToFile(lines):
 
             # recursive call if there is another source
             else:
-                writeSourceToFile(lines[1+idx:])
-                break
+                return [srcName] + writeSourceToFile(lines[1+idx:])
 
+    return [srcName]
 
-if __name__ == '__main__':
-    filePath = sys.argv[1]
+def split_sources(filePath, suppress_output = False):
     sys.excepthook = uncaught_exception_hook
 
     try:
@@ -64,20 +59,20 @@ def writeSourceToFile(lines):
         with open(filePath, mode='r', encoding='utf8', newline='') as f:
             lines = f.read().splitlines()
         if len(lines) >= 1 and lines[0][:12] == "==== Source:":
-            hasMultipleSources = True
-            writeSourceToFile(lines)
-
-        if hasMultipleSources:
             srcString = ""
-            for src in createdSources:
+            for src in writeSourceToFile(lines):
                 srcString += src + ' '
-            print(srcString)
-            sys.exit(0)
-        else:
-            sys.exit(1)
+            if not suppress_output:
+                print(srcString)
+            return 0
+        return 1
 
     except UnicodeDecodeError as ude:
         print("UnicodeDecodeError in '" + filePath + "': " + str(ude))
         print("This is expected for some tests containing invalid utf8 sequences. "
               "Exception will be ignored.")
-        sys.exit(2)
+        return 2
+
+
+if __name__ == '__main__':
+    sys.exit(split_sources(sys.argv[1]))
diff --git a/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/inputs.sol b/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/inputs.sol
new file mode 100644
index 0000000000..43099c7a36
--- /dev/null
+++ b/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/inputs.sol
@@ -0,0 +1,29 @@
+==== Source: A.sol ====
+import "@/D.sol";
+import "B.sol";
+
+contract A is B {
+    function a() public pure {
+        e();
+    }
+}
+
+==== Source: B.sol ====
+import "C.sol";
+
+abstract contract B is C {}
+
+==== Source: C.sol ====
+abstract contract C {
+    function c() public pure returns (uint) {
+        return 0;
+    }
+}
+
+==== Source: @/D.sol ====
+import "@/E.sol";
+
+==== Source: @/E.sol ====
+function e() pure returns (bytes memory returndata) {
+    return "";
+}
diff --git a/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/test.py b/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/test.py
new file mode 100755
index 0000000000..32be181e5a
--- /dev/null
+++ b/test/cmdlineTests/~bytecode_equivalence_independent_of_import_discovery_order/test.py
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+
+import os
+import sys
+from pathlib import Path
+from textwrap import dedent
+
+# pylint: disable=wrong-import-position
+PROJECT_ROOT = Path(__file__).parents[3]
+sys.path.insert(0, str(PROJECT_ROOT / 'scripts'))
+
+from common.cmdline_helpers import add_preamble
+from common.cmdline_helpers import inside_temporary_dir
+from common.cmdline_helpers import save_bytecode
+from common.cmdline_helpers import solc_bin_report
+from common.git_helpers import git_diff
+from splitSources import split_sources
+
+
+@inside_temporary_dir(Path(__file__).parent.name)
+def test_bytecode_equivalence():
+    source_file_path = Path(__file__).parent / 'inputs.sol'
+    split_sources(source_file_path, suppress_output=True)
+    add_preamble(Path.cwd())
+
+    solc_binary = os.environ.get('SOLC')
+    if solc_binary is None:
+        raise RuntimeError(dedent("""\
+            `solc` compiler not found.
+            Please ensure you set the SOLC environment variable
+            with the correct path to the compiler's binary.
+        """))
+
+    # Whether a file is passed to the compiler explicitly or only discovered when traversing imports
+    # may affect the order in which files are processed and result in different AST IDs.
+    # This, however, must not result in different bytecode being generated.
+    save_bytecode(Path('A.bin'), solc_bin_report(solc_binary, [Path('A.sol')], via_ir=True))
+    save_bytecode(Path('AB.bin'), solc_bin_report(solc_binary, [Path('A.sol'), Path('B.sol')], via_ir=True))
+    return git_diff(Path('A.bin'), Path('AB.bin'))
+
+
+if __name__ == '__main__':
+    sys.exit(test_bytecode_equivalence())

From fa394018c35ef4a728ad87b5241ecf2d5930bdbb Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 2 Oct 2023 13:25:16 +0200
Subject: [PATCH 1613/1748] Purge using namespace std from
 test/libsolidity/util

---
 scripts/check_style.sh                        |  1 +
 test/libsolidity/util/BytesUtils.cpp          | 65 +++++++------
 test/libsolidity/util/BytesUtilsTests.cpp     |  1 -
 test/libsolidity/util/Common.cpp              | 25 +++--
 test/libsolidity/util/ContractABIUtils.cpp    | 85 +++++++++--------
 test/libsolidity/util/TestFileParser.cpp      | 93 +++++++++----------
 test/libsolidity/util/TestFileParserTests.cpp | 25 +++--
 test/libsolidity/util/TestFunctionCall.cpp    | 67 +++++++------
 .../util/TestFunctionCallTests.cpp            | 53 ++++++-----
 9 files changed, 204 insertions(+), 211 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index dd1f583489..7e2820e8de 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -45,6 +45,7 @@ NAMESPACE_STD_FREE_FILES=(
     test/libsolidity/*
     test/libsolidity/analysis/*
     test/libsolidity/interface/*
+    test/libsolidity/util/*
 )
 
 (
diff --git a/test/libsolidity/util/BytesUtils.cpp b/test/libsolidity/util/BytesUtils.cpp
index 58d1baacd6..fe519bf5b0 100644
--- a/test/libsolidity/util/BytesUtils.cpp
+++ b/test/libsolidity/util/BytesUtils.cpp
@@ -37,7 +37,6 @@ using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
-using namespace std;
 
 bytes BytesUtils::alignLeft(bytes _bytes)
 {
@@ -73,7 +72,7 @@ bytes BytesUtils::applyAlign(
 	}
 }
 
-bytes BytesUtils::convertBoolean(string const& _literal)
+bytes BytesUtils::convertBoolean(std::string const& _literal)
 {
 	if (_literal == "true")
 		return bytes{true};
@@ -83,7 +82,7 @@ bytes BytesUtils::convertBoolean(string const& _literal)
 		BOOST_THROW_EXCEPTION(TestParserError("Boolean literal invalid."));
 }
 
-bytes BytesUtils::convertNumber(string const& _literal)
+bytes BytesUtils::convertNumber(std::string const& _literal)
 {
 	try
 	{
@@ -95,13 +94,13 @@ bytes BytesUtils::convertNumber(string const& _literal)
 	}
 }
 
-bytes BytesUtils::convertFixedPoint(string const& _literal, size_t& o_fractionalDigits)
+bytes BytesUtils::convertFixedPoint(std::string const& _literal, size_t& o_fractionalDigits)
 {
 	size_t dotPos = _literal.find('.');
 	o_fractionalDigits = dotPos < _literal.size() ? _literal.size() - dotPos : 0;
 	bool negative = !_literal.empty() && _literal.at(0) == '-';
 	// remove decimal point
-	string valueInteger = _literal.substr(0, dotPos) + _literal.substr(dotPos + 1);
+	std::string valueInteger = _literal.substr(0, dotPos) + _literal.substr(dotPos + 1);
 	// erase leading zeros to avoid parsing as octal.
 	while (!valueInteger.empty() && (valueInteger.at(0) == '0' || valueInteger.at(0) == '-'))
 		valueInteger.erase(valueInteger.begin());
@@ -120,7 +119,7 @@ bytes BytesUtils::convertFixedPoint(string const& _literal, size_t& o_fractional
 	}
 }
 
-bytes BytesUtils::convertHexNumber(string const& _literal)
+bytes BytesUtils::convertHexNumber(std::string const& _literal)
 {
 	try
 	{
@@ -132,7 +131,7 @@ bytes BytesUtils::convertHexNumber(string const& _literal)
 	}
 }
 
-bytes BytesUtils::convertString(string const& _literal)
+bytes BytesUtils::convertString(std::string const& _literal)
 {
 	try
 	{
@@ -144,18 +143,18 @@ bytes BytesUtils::convertString(string const& _literal)
 	}
 }
 
-string BytesUtils::formatUnsigned(bytes const& _bytes)
+std::string BytesUtils::formatUnsigned(bytes const& _bytes)
 {
-	stringstream os;
+	std::stringstream os;
 
 	soltestAssert(!_bytes.empty() && _bytes.size() <= 32, "");
 
 	return fromBigEndian<u256>(_bytes).str();
 }
 
-string BytesUtils::formatSigned(bytes const& _bytes)
+std::string BytesUtils::formatSigned(bytes const& _bytes)
 {
-	stringstream os;
+	std::stringstream os;
 
 	soltestAssert(!_bytes.empty() && _bytes.size() <= 32, "");
 
@@ -167,9 +166,9 @@ string BytesUtils::formatSigned(bytes const& _bytes)
 	return os.str();
 }
 
-string BytesUtils::formatBoolean(bytes const& _bytes)
+std::string BytesUtils::formatBoolean(bytes const& _bytes)
 {
-	stringstream os;
+	std::stringstream os;
 	u256 result = fromBigEndian<u256>(_bytes);
 
 	if (result == 0)
@@ -182,32 +181,32 @@ string BytesUtils::formatBoolean(bytes const& _bytes)
 	return os.str();
 }
 
-string BytesUtils::formatHex(bytes const& _bytes, bool _shorten)
+std::string BytesUtils::formatHex(bytes const& _bytes, bool _shorten)
 {
 	soltestAssert(!_bytes.empty() && _bytes.size() <= 32, "");
 	u256 value = fromBigEndian<u256>(_bytes);
-	string output = toCompactHexWithPrefix(value);
+	std::string output = toCompactHexWithPrefix(value);
 
 	if (_shorten)
 		return output.substr(0, output.size() - countRightPaddedZeros(_bytes) * 2);
 	return output;
 }
 
-string BytesUtils::formatHexString(bytes const& _bytes)
+std::string BytesUtils::formatHexString(bytes const& _bytes)
 {
-	stringstream os;
+	std::stringstream os;
 
 	os << "hex\"" << util::toHex(_bytes) << "\"";
 
 	return os.str();
 }
 
-string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff)
+std::string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff)
 {
-	stringstream os;
+	std::stringstream os;
 
 	os << "\"";
-	for (size_t i = 0; i < min(_cutOff, _bytes.size()); ++i)
+	for (size_t i = 0; i < std::min(_cutOff, _bytes.size()); ++i)
 	{
 		auto const v = _bytes[i];
 		switch (v)
@@ -232,7 +231,7 @@ string BytesUtils::formatString(bytes const& _bytes, size_t _cutOff)
 
 std::string BytesUtils::formatFixedPoint(bytes const& _bytes, bool _signed, size_t _fractionalDigits)
 {
-	string decimal;
+	std::string decimal;
 	bool negative = false;
 	if (_signed)
 	{
@@ -246,19 +245,19 @@ std::string BytesUtils::formatFixedPoint(bytes const& _bytes, bool _signed, size
 	{
 		size_t numDigits = decimal.length() - (negative ? 1 : 0);
 		if (_fractionalDigits >= numDigits)
-			decimal.insert(negative ? 1 : 0, string(_fractionalDigits + 1 - numDigits, '0'));
+			decimal.insert(negative ? 1 : 0, std::string(_fractionalDigits + 1 - numDigits, '0'));
 		decimal.insert(decimal.length() - _fractionalDigits, ".");
 	}
 	return decimal;
 }
 
-string BytesUtils::formatRawBytes(
+std::string BytesUtils::formatRawBytes(
 	bytes const& _bytes,
 	solidity::frontend::test::ParameterList const& _parameters,
-	string _linePrefix
+	std::string _linePrefix
 )
 {
-	stringstream os;
+	std::stringstream os;
 	ParameterList parameters;
 	auto it = _bytes.begin();
 
@@ -283,7 +282,7 @@ string BytesUtils::formatRawBytes(
 
 	for (auto const& parameter: parameters)
 	{
-		long actualSize = min(
+		long actualSize = std::min(
 			distance(it, _bytes.end()),
 			static_cast<ParameterList::difference_type>(parameter.abiType.size)
 		);
@@ -292,7 +291,7 @@ string BytesUtils::formatRawBytes(
 
 		os << _linePrefix << byteRange;
 		if (&parameter != &parameters.back())
-			os << endl;
+			os << std::endl;
 
 		it += actualSize;
 	}
@@ -300,12 +299,12 @@ string BytesUtils::formatRawBytes(
 	return os.str();
 }
 
-string BytesUtils::formatBytes(
+std::string BytesUtils::formatBytes(
 	bytes const& _bytes,
 	ABIType const& _abiType
 )
 {
-	stringstream os;
+	std::stringstream os;
 
 	switch (_abiType.type)
 	{
@@ -330,7 +329,7 @@ string BytesUtils::formatBytes(
 			{
 				auto entropy = [](std::string const& str) -> double {
 					double result = 0;
-					map<char, double> frequencies;
+					std::map<char, double> frequencies;
 					for (char c: str)
 						frequencies[c]++;
 					for (auto p: frequencies)
@@ -376,13 +375,13 @@ string BytesUtils::formatBytes(
 	return os.str();
 }
 
-string BytesUtils::formatBytesRange(
+std::string BytesUtils::formatBytesRange(
 	bytes _bytes,
 	solidity::frontend::test::ParameterList const& _parameters,
 	bool _highlight
 )
 {
-	stringstream os;
+	std::stringstream os;
 	ParameterList parameters;
 	auto it = _bytes.begin();
 
@@ -407,7 +406,7 @@ string BytesUtils::formatBytesRange(
 
 	for (auto const& parameter: parameters)
 	{
-		long actualSize = min(
+		long actualSize = std::min(
 			distance(it, _bytes.end()),
 			static_cast<ParameterList::difference_type>(parameter.abiType.size)
 		);
diff --git a/test/libsolidity/util/BytesUtilsTests.cpp b/test/libsolidity/util/BytesUtilsTests.cpp
index f05430bfbd..f5a15db338 100644
--- a/test/libsolidity/util/BytesUtilsTests.cpp
+++ b/test/libsolidity/util/BytesUtilsTests.cpp
@@ -22,7 +22,6 @@
 
 #include <libsolutil/CommonData.h>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::test;
 
diff --git a/test/libsolidity/util/Common.cpp b/test/libsolidity/util/Common.cpp
index e5dddb721d..6f96b7f6e5 100644
--- a/test/libsolidity/util/Common.cpp
+++ b/test/libsolidity/util/Common.cpp
@@ -20,22 +20,21 @@
 
 #include <regex>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 
-string test::withPreamble(string const& _sourceCode, bool _addAbicoderV1Pragma)
+std::string test::withPreamble(std::string const& _sourceCode, bool _addAbicoderV1Pragma)
 {
-	static string const versionPragma = "pragma solidity >=0.0;\n";
-	static string const licenseComment = "// SPDX-License-Identifier: GPL-3.0\n";
-	static string const abicoderPragma = "pragma abicoder v1;\n";
+	static std::string const versionPragma = "pragma solidity >=0.0;\n";
+	static std::string const licenseComment = "// SPDX-License-Identifier: GPL-3.0\n";
+	static std::string const abicoderPragma = "pragma abicoder v1;\n";
 
 	// NOTE: These checks are intentionally loose to match weird cases.
 	// We can manually adjust a test case where this causes problem.
-	bool licenseMissing = _sourceCode.find("SPDX-License-Identifier:") == string::npos;
+	bool licenseMissing = _sourceCode.find("SPDX-License-Identifier:") == std::string::npos;
 	bool abicoderMissing =
-		_sourceCode.find("pragma experimental ABIEncoderV2;") == string::npos &&
-		_sourceCode.find("pragma abicoder") == string::npos;
+		_sourceCode.find("pragma experimental ABIEncoderV2;") == std::string::npos &&
+		_sourceCode.find("pragma abicoder") == std::string::npos;
 
 	return
 		versionPragma +
@@ -52,16 +51,16 @@ StringMap test::withPreamble(StringMap _sources, bool _addAbicoderV1Pragma)
 	return _sources;
 }
 
-string test::stripPreReleaseWarning(string const& _stderrContent)
+std::string test::stripPreReleaseWarning(std::string const& _stderrContent)
 {
-	static regex const preReleaseWarningRegex{
+	static std::regex const preReleaseWarningRegex{
 		R"(Warning( \(3805\))?: This is a pre-release compiler version, please do not use it in production\.\n)"
 		R"((\n)?)"
 	};
-	static regex const noOutputRegex{
+	static std::regex const noOutputRegex{
 		R"(Compiler run successful, no output requested\.\n)"
 	};
 
-	string output = regex_replace(_stderrContent, preReleaseWarningRegex, "");
-	return regex_replace(std::move(output), noOutputRegex, "");
+	std::string output = std::regex_replace(_stderrContent, preReleaseWarningRegex, "");
+	return std::regex_replace(std::move(output), noOutputRegex, "");
 }
diff --git a/test/libsolidity/util/ContractABIUtils.cpp b/test/libsolidity/util/ContractABIUtils.cpp
index 10363551bc..641c9107d6 100644
--- a/test/libsolidity/util/ContractABIUtils.cpp
+++ b/test/libsolidity/util/ContractABIUtils.cpp
@@ -41,96 +41,95 @@ using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::frontend::test;
-using namespace std;
 
 namespace
 {
 
 using ParameterList = solidity::frontend::test::ParameterList;
 
-size_t arraySize(string const& _arrayType)
+size_t arraySize(std::string const& _arrayType)
 {
 	auto leftBrack = _arrayType.find("[");
 	auto rightBrack = _arrayType.rfind("]");
 
 	soltestAssert(
-		leftBrack != string::npos &&
-		rightBrack != string::npos &&
+		leftBrack != std::string::npos &&
+		rightBrack != std::string::npos &&
 		rightBrack == _arrayType.size() - 1 &&
 		leftBrack < rightBrack,
 		""
 	);
 
-	string size = _arrayType.substr(leftBrack + 1, rightBrack - leftBrack - 1);
+	std::string size = _arrayType.substr(leftBrack + 1, rightBrack - leftBrack - 1);
 
 	return static_cast<size_t>(stoi(size));
 }
 
-bool isBool(string const& _type)
+bool isBool(std::string const& _type)
 {
 	return _type == "bool";
 }
 
-bool isUint(string const& _type)
+bool isUint(std::string const& _type)
 {
-	return regex_match(_type, regex{"uint\\d*"});
+	return regex_match(_type, std::regex{"uint\\d*"});
 }
 
-bool isInt(string const& _type)
+bool isInt(std::string const& _type)
 {
-	return regex_match(_type, regex{"int\\d*"});
+	return regex_match(_type, std::regex{"int\\d*"});
 }
 
-bool isFixedBytes(string const& _type)
+bool isFixedBytes(std::string const& _type)
 {
-	return regex_match(_type, regex{"bytes\\d+"});
+	return regex_match(_type, std::regex{"bytes\\d+"});
 }
 
-bool isBytes(string const& _type)
+bool isBytes(std::string const& _type)
 {
-	return regex_match(_type, regex{"\\bbytes\\b"});
+	return regex_match(_type, std::regex{"\\bbytes\\b"});
 }
 
-bool isString(string const& _type)
+bool isString(std::string const& _type)
 {
 	return _type == "string";
 }
 
-bool isFixedBoolArray(string const& _type)
+bool isFixedBoolArray(std::string const& _type)
 {
-	return regex_match(_type, regex{"bool\\[\\d+\\]"});
+	return regex_match(_type, std::regex{"bool\\[\\d+\\]"});
 }
 
-bool isFixedUintArray(string const& _type)
+bool isFixedUintArray(std::string const& _type)
 {
-	return regex_match(_type, regex{"uint\\d*\\[\\d+\\]"});
+	return regex_match(_type, std::regex{"uint\\d*\\[\\d+\\]"});
 }
 
-bool isFixedIntArray(string const& _type)
+bool isFixedIntArray(std::string const& _type)
 {
-	return regex_match(_type, regex{"int\\d*\\[\\d+\\]"});
+	return regex_match(_type, std::regex{"int\\d*\\[\\d+\\]"});
 }
 
-bool isFixedStringArray(string const& _type)
+bool isFixedStringArray(std::string const& _type)
 {
-	return regex_match(_type, regex{"string\\[\\d+\\]"});
+	return regex_match(_type, std::regex{"string\\[\\d+\\]"});
 }
 
-bool isTuple(string const& _type)
+bool isTuple(std::string const& _type)
 {
 	return _type == "tuple";
 }
 
-bool isFixedTupleArray(string const& _type)
+bool isFixedTupleArray(std::string const& _type)
 {
-	return regex_match(_type, regex{"tuple\\[\\d+\\]"});
+	return regex_match(_type, std::regex{"tuple\\[\\d+\\]"});
 }
 
-optional<ABIType> isFixedPoint(string const& type)
+std::optional<ABIType> isFixedPoint(std::string const& type)
 {
-	optional<ABIType> fixedPointType;
-	smatch matches;
-	if (regex_match(type, matches, regex{"(u?)fixed(\\d+)x(\\d+)"}))
+	std::optional<ABIType> fixedPointType;
+	std::smatch matches;
+	if (regex_match(type, matches, std::regex{"(u?)fixed(\\d+)x(\\d+)"}))
 	{
 		ABIType abiType(ABIType::SignedFixedPoint);
 		if (matches[1].str() == "u")
@@ -141,10 +140,10 @@ optional<ABIType> isFixedPoint(string const& type)
 	return fixedPointType;
 }
 
-string functionSignatureFromABI(Json::Value const& _functionABI)
+std::string functionSignatureFromABI(Json::Value const& _functionABI)
 {
 	auto inputs = _functionABI["inputs"];
-	string signature = {_functionABI["name"].asString() + "("};
+	std::string signature = {_functionABI["name"].asString() + "("};
 	size_t parameterCount = 0;
 
 	for (auto const& input: inputs)
@@ -163,7 +162,7 @@ string functionSignatureFromABI(Json::Value const& _functionABI)
 std::optional<solidity::frontend::test::ParameterList> ContractABIUtils::parametersFromJsonOutputs(
 	ErrorReporter& _errorReporter,
 	Json::Value const& _contractABI,
-	string const& _functionSignature
+	std::string const& _functionSignature
 )
 {
 	if (!_contractABI)
@@ -178,7 +177,7 @@ std::optional<solidity::frontend::test::ParameterList> ContractABIUtils::paramet
 
 			for (auto const& output: function["outputs"])
 			{
-				string type = output["type"].asString();
+				std::string type = output["type"].asString();
 
 				ABITypes inplaceTypes;
 				ABITypes dynamicTypes;
@@ -216,7 +215,7 @@ bool ContractABIUtils::appendTypesFromName(
 	bool _isCompoundType
 )
 {
-	string type = _functionOutput["type"].asString();
+	std::string type = _functionOutput["type"].asString();
 	if (isBool(type))
 		_inplaceTypes.push_back(ABIType{ABIType::Boolean});
 	else if (isUint(type))
@@ -245,16 +244,16 @@ bool ContractABIUtils::appendTypesFromName(
 		_dynamicTypes += inplaceTypes + dynamicTypes;
 	}
 	else if (isFixedBoolArray(type))
-		_inplaceTypes += vector<ABIType>(arraySize(type), ABIType{ABIType::Boolean});
+		_inplaceTypes += std::vector<ABIType>(arraySize(type), ABIType{ABIType::Boolean});
 	else if (isFixedUintArray(type))
-		_inplaceTypes += vector<ABIType>(arraySize(type), ABIType{ABIType::UnsignedDec});
+		_inplaceTypes += std::vector<ABIType>(arraySize(type), ABIType{ABIType::UnsignedDec});
 	else if (isFixedIntArray(type))
-		_inplaceTypes += vector<ABIType>(arraySize(type), ABIType{ABIType::SignedDec});
+		_inplaceTypes += std::vector<ABIType>(arraySize(type), ABIType{ABIType::SignedDec});
 	else if (isFixedStringArray(type))
 	{
 		_inplaceTypes.push_back(ABIType{ABIType::Hex});
 
-		_dynamicTypes += vector<ABIType>(arraySize(type), ABIType{ABIType::Hex});
+		_dynamicTypes += std::vector<ABIType>(arraySize(type), ABIType{ABIType::Hex});
 
 		for (size_t i = 0; i < arraySize(type); i++)
 		{
@@ -262,7 +261,7 @@ bool ContractABIUtils::appendTypesFromName(
 			_dynamicTypes.push_back(ABIType{ABIType::String, ABIType::AlignLeft});
 		}
 	}
-	else if (optional<ABIType> fixedPointType = isFixedPoint(type))
+	else if (std::optional<ABIType> fixedPointType = isFixedPoint(type))
 		_inplaceTypes.push_back(*fixedPointType);
 	else if (isBytes(type))
 		return false;
@@ -280,7 +279,7 @@ void ContractABIUtils::overwriteParameters(
 	solidity::frontend::test::ParameterList const& _sourceParameters
 )
 {
-	using namespace placeholders;
+	using namespace std::placeholders;
 	for (auto&& [source, target]: ranges::views::zip(_sourceParameters, _targetParameters))
 		if (
 				source.abiType.size != target.abiType.size ||
@@ -304,8 +303,8 @@ solidity::frontend::test::ParameterList ContractABIUtils::preferredParameters(
 	{
 		_errorReporter.warning(
 			"Encoding does not match byte range. The call returned " +
-			to_string(_bytes.size()) + " bytes, but " +
-			to_string(encodingSize(_targetParameters)) + " bytes were expected."
+			std::to_string(_bytes.size()) + " bytes, but " +
+			std::to_string(encodingSize(_targetParameters)) + " bytes were expected."
 		);
 		return _sourceParameters;
 	}
diff --git a/test/libsolidity/util/TestFileParser.cpp b/test/libsolidity/util/TestFileParser.cpp
index 915586ad2d..3fba998a07 100644
--- a/test/libsolidity/util/TestFileParser.cpp
+++ b/test/libsolidity/util/TestFileParser.cpp
@@ -40,7 +40,6 @@ using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
-using namespace std;
 
 using Token = soltest::Token;
 
@@ -54,9 +53,9 @@ char TestFileParser::Scanner::peek() const noexcept
 	return *next;
 }
 
-vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctionCalls(size_t _lineOffset)
+std::vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctionCalls(size_t _lineOffset)
 {
-	vector<FunctionCall> calls;
+	std::vector<FunctionCall> calls;
 	if (!accept(Token::EOS))
 	{
 		soltestAssert(m_scanner.currentToken() == Token::Unknown, "");
@@ -84,8 +83,8 @@ vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctionCall
 						if (calls.empty())
 							BOOST_THROW_EXCEPTION(TestParserError("Expected function call before gas usage filter."));
 
-						string runType = m_scanner.currentLiteral();
-						if (set<string>{"ir", "irOptimized", "legacy", "legacyOptimized"}.count(runType) > 0)
+						std::string runType = m_scanner.currentLiteral();
+						if (std::set<std::string>{"ir", "irOptimized", "legacy", "legacyOptimized"}.count(runType) > 0)
 						{
 							m_scanner.scanNextToken();
 							expect(Token::Colon);
@@ -104,7 +103,7 @@ vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctionCall
 						if (accept(Token::Library, true))
 						{
 							expect(Token::Colon);
-							string libraryName;
+							std::string libraryName;
 							if (accept(Token::String))
 							{
 								call.libraryFile = m_scanner.currentLiteral();
@@ -184,7 +183,7 @@ vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctionCall
 				catch (TestParserError const& _e)
 				{
 					BOOST_THROW_EXCEPTION(
-						TestParserError("Line " + to_string(_lineOffset + m_lineNumber) + ": " + _e.what())
+						TestParserError("Line " + std::to_string(_lineOffset + m_lineNumber) + ": " + _e.what())
 					);
 				}
 			}
@@ -193,12 +192,12 @@ vector<solidity::frontend::test::FunctionCall> TestFileParser::parseFunctionCall
 	return calls;
 }
 
-vector<string> TestFileParser::parseFunctionCallSideEffects()
+std::vector<std::string> TestFileParser::parseFunctionCallSideEffects()
 {
-	vector<string> result;
+	std::vector<std::string> result;
 	while (accept(Token::Tilde, false))
 	{
-		string effect = m_scanner.currentLiteral();
+		std::string effect = m_scanner.currentLiteral();
 		result.emplace_back(effect);
 		soltestAssert(m_scanner.currentToken() == Token::Tilde, "");
 		m_scanner.scanNextToken();
@@ -232,9 +231,9 @@ bool TestFileParser::expect(Token _token, bool const _advance)
 	return true;
 }
 
-pair<string, bool> TestFileParser::parseFunctionSignature()
+std::pair<std::string, bool> TestFileParser::parseFunctionSignature()
 {
-	string signature;
+	std::string signature;
 	bool hasName = false;
 
 	if (accept(Token::Identifier, false))
@@ -250,7 +249,7 @@ pair<string, bool> TestFileParser::parseFunctionSignature()
 	signature += formatToken(Token::LParen);
 	expect(Token::LParen);
 
-	string parameters;
+	std::string parameters;
 	if (!accept(Token::RParen, false))
 		parameters = parseIdentifierOrTuple();
 
@@ -367,7 +366,7 @@ Parameter TestFileParser::parseParameter()
 			BOOST_THROW_EXCEPTION(TestParserError("Invalid boolean literal."));
 
 		parameter.abiType = ABIType{ABIType::Boolean, ABIType::AlignRight, 32};
-		string parsed = parseBoolean();
+		std::string parsed = parseBoolean();
 		parameter.rawString += parsed;
 		parameter.rawBytes = BytesUtils::applyAlign(
 			parameter.alignment,
@@ -381,7 +380,7 @@ Parameter TestFileParser::parseParameter()
 			BOOST_THROW_EXCEPTION(TestParserError("Invalid hex number literal."));
 
 		parameter.abiType = ABIType{ABIType::Hex, ABIType::AlignRight, 32};
-		string parsed = parseHexNumber();
+		std::string parsed = parseHexNumber();
 		parameter.rawString += parsed;
 		parameter.rawBytes = BytesUtils::applyAlign(
 			parameter.alignment,
@@ -396,7 +395,7 @@ Parameter TestFileParser::parseParameter()
 		if (parameter.alignment != Parameter::Alignment::None)
 			BOOST_THROW_EXCEPTION(TestParserError("Hex string literals cannot be aligned or padded."));
 
-		string parsed = parseString();
+		std::string parsed = parseString();
 		parameter.rawString += "hex\"" + parsed + "\"";
 		parameter.rawBytes = BytesUtils::convertHexNumber(parsed);
 		parameter.abiType = ABIType{
@@ -410,7 +409,7 @@ Parameter TestFileParser::parseParameter()
 		if (parameter.alignment != Parameter::Alignment::None)
 			BOOST_THROW_EXCEPTION(TestParserError("String literals cannot be aligned or padded."));
 
-		string parsed = parseString();
+		std::string parsed = parseString();
 		parameter.abiType = ABIType{ABIType::String, ABIType::AlignLeft, parsed.size()};
 		parameter.rawString += "\"" + parsed + "\"";
 		parameter.rawBytes = BytesUtils::applyAlign(
@@ -424,12 +423,12 @@ Parameter TestFileParser::parseParameter()
 		auto type = isSigned ? ABIType::SignedDec : ABIType::UnsignedDec;
 
 		parameter.abiType = ABIType{type, ABIType::AlignRight, 32};
-		string parsed = parseDecimalNumber();
+		std::string parsed = parseDecimalNumber();
 		parameter.rawString += parsed;
 		if (isSigned)
 			parsed = "-" + parsed;
 
-		if (parsed.find('.') == string::npos)
+		if (parsed.find('.') == std::string::npos)
 			parameter.rawBytes = BytesUtils::applyAlign(
 				parameter.alignment,
 				parameter.abiType,
@@ -458,9 +457,9 @@ Parameter TestFileParser::parseParameter()
 	return parameter;
 }
 
-string TestFileParser::parseIdentifierOrTuple()
+std::string TestFileParser::parseIdentifierOrTuple()
 {
-	string identOrTuple;
+	std::string identOrTuple;
 
 	auto parseArrayDimensions = [&]()
 	{
@@ -499,43 +498,43 @@ string TestFileParser::parseIdentifierOrTuple()
 	return identOrTuple;
 }
 
-string TestFileParser::parseBoolean()
+std::string TestFileParser::parseBoolean()
 {
-	string literal = m_scanner.currentLiteral();
+	std::string literal = m_scanner.currentLiteral();
 	expect(Token::Boolean);
 	return literal;
 }
 
-string TestFileParser::parseComment()
+std::string TestFileParser::parseComment()
 {
-	string comment = m_scanner.currentLiteral();
+	std::string comment = m_scanner.currentLiteral();
 	if (accept(Token::Comment, true))
 		return comment;
-	return string{};
+	return std::string{};
 }
 
-string TestFileParser::parseDecimalNumber()
+std::string TestFileParser::parseDecimalNumber()
 {
-	string literal = m_scanner.currentLiteral();
+	std::string literal = m_scanner.currentLiteral();
 	expect(Token::Number);
 	return literal;
 }
 
-string TestFileParser::parseHexNumber()
+std::string TestFileParser::parseHexNumber()
 {
-	string literal = m_scanner.currentLiteral();
+	std::string literal = m_scanner.currentLiteral();
 	expect(Token::HexNumber);
 	return literal;
 }
 
-string TestFileParser::parseString()
+std::string TestFileParser::parseString()
 {
-	string literal = m_scanner.currentLiteral();
+	std::string literal = m_scanner.currentLiteral();
 	expect(Token::String);
 	return literal;
 }
 
-void TestFileParser::Scanner::readStream(istream& _stream)
+void TestFileParser::Scanner::readStream(std::istream& _stream)
 {
 	std::string line;
 	// TODO: std::getline(..) removes newlines '\n', if present. This could be improved.
@@ -644,16 +643,16 @@ void TestFileParser::Scanner::scanNextToken()
 				m_currentLiteral = "";
 			}
 			else
-				BOOST_THROW_EXCEPTION(TestParserError("Unexpected character: '" + string{current()} + "'"));
+				BOOST_THROW_EXCEPTION(TestParserError("Unexpected character: '" + std::string{current()} + "'"));
 			break;
 		}
 	}
 	while (m_currentToken == Token::Whitespace);
 }
 
-string TestFileParser::Scanner::readLine()
+std::string TestFileParser::Scanner::readLine()
 {
-	string line;
+	std::string line;
 	// Right now the scanner discards all (real) new-lines '\n' in TestFileParser::Scanner::readStream(..).
 	// Token::NewLine is defined as `//`, and NOT '\n'. We are just searching here for the next `/`.
 	// Note that `/` anywhere else than at the beginning of a line is currently forbidden (TODO: until we fix newline handling).
@@ -666,9 +665,9 @@ string TestFileParser::Scanner::readLine()
 	return line;
 }
 
-string TestFileParser::Scanner::scanComment()
+std::string TestFileParser::Scanner::scanComment()
 {
-	string comment;
+	std::string comment;
 	advance();
 
 	while (current() != '#')
@@ -679,9 +678,9 @@ string TestFileParser::Scanner::scanComment()
 	return comment;
 }
 
-string TestFileParser::Scanner::scanIdentifierOrKeyword()
+std::string TestFileParser::Scanner::scanIdentifierOrKeyword()
 {
-	string identifier;
+	std::string identifier;
 	identifier += current();
 	while (langutil::isIdentifierPart(peek()))
 	{
@@ -691,9 +690,9 @@ string TestFileParser::Scanner::scanIdentifierOrKeyword()
 	return identifier;
 }
 
-string TestFileParser::Scanner::scanDecimalNumber()
+std::string TestFileParser::Scanner::scanDecimalNumber()
 {
-	string number;
+	std::string number;
 	number += current();
 	while (langutil::isDecimalDigit(peek()) || '.' == peek())
 	{
@@ -703,9 +702,9 @@ string TestFileParser::Scanner::scanDecimalNumber()
 	return number;
 }
 
-string TestFileParser::Scanner::scanHexNumber()
+std::string TestFileParser::Scanner::scanHexNumber()
 {
-	string number;
+	std::string number;
 	number += current();
 	while (langutil::isHexDigit(peek()))
 	{
@@ -715,9 +714,9 @@ string TestFileParser::Scanner::scanHexNumber()
 	return number;
 }
 
-string TestFileParser::Scanner::scanString()
+std::string TestFileParser::Scanner::scanString()
 {
-	string str;
+	std::string str;
 	advance();
 
 	while (current() != '\"')
@@ -766,7 +765,7 @@ string TestFileParser::Scanner::scanString()
 // TODO: use fromHex() from CommonData
 char TestFileParser::Scanner::scanHexPart()
 {
-	auto toLower = [](char _c) -> char { return tolower(_c, locale::classic()); };
+	auto toLower = [](char _c) -> char { return tolower(_c, std::locale::classic()); };
 
 	advance(); // skip 'x'
 
diff --git a/test/libsolidity/util/TestFileParserTests.cpp b/test/libsolidity/util/TestFileParserTests.cpp
index 6f9aec64dc..59934fdb25 100644
--- a/test/libsolidity/util/TestFileParserTests.cpp
+++ b/test/libsolidity/util/TestFileParserTests.cpp
@@ -30,7 +30,6 @@
 #include <test/libsolidity/util/SoltestErrors.h>
 #include <test/libsolidity/util/TestFileParser.h>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::test;
 
@@ -43,23 +42,23 @@ using Mode = FunctionCall::DisplayMode;
 namespace
 {
 
-vector<FunctionCall> parse(string const& _source, std::map<std::string, Builtin> const& _builtins = {})
+std::vector<FunctionCall> parse(std::string const& _source, std::map<std::string, Builtin> const& _builtins = {})
 {
-	istringstream stream{_source, ios_base::out};
+	std::istringstream stream{_source, std::ios_base::out};
 	return TestFileParser{stream, _builtins}.parseFunctionCalls(0);
 }
 
 void testFunctionCall(
 		FunctionCall const& _call,
 		FunctionCall::DisplayMode _mode,
-		string _signature = "",
+		std::string _signature = "",
 		bool _failure = true,
 		bytes _arguments = bytes{},
 		bytes _expectations = bytes{},
 		FunctionValue _value = { 0 },
-		string _argumentComment = "",
-		string _expectationComment = "",
-		vector<string> _rawArguments = vector<string>{},
+		std::string _argumentComment = "",
+		std::string _expectationComment = "",
+		std::vector<std::string> _rawArguments = std::vector<std::string>{},
 		bool _isConstructor = false,
 		bool _isLibrary = false
 )
@@ -242,7 +241,7 @@ BOOST_AUTO_TEST_CASE(call_revert_message)
 		"f()",
 		true,
 		fmt::encodeArgs(),
-		fromHex("08c379a0") + fmt::encodeDyn(string{"Revert"})
+		fromHex("08c379a0") + fmt::encodeDyn(std::string{"Revert"})
 	);
 }
 
@@ -364,7 +363,7 @@ BOOST_AUTO_TEST_CASE(scanner_hex_values)
 	)";
 	auto const calls = parse(source);
 	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "f(uint256)", false, fmt::encodeArgs(string("\x20\x00\xff", 3)));
+	testFunctionCall(calls.at(0), Mode::SingleLine, "f(uint256)", false, fmt::encodeArgs(std::string("\x20\x00\xff", 3)));
 }
 
 BOOST_AUTO_TEST_CASE(scanner_hex_values_invalid1)
@@ -382,7 +381,7 @@ BOOST_AUTO_TEST_CASE(scanner_hex_values_invalid2)
 	)";
 	auto const calls = parse(source);
 	BOOST_REQUIRE_EQUAL(calls.size(), 1);
-	testFunctionCall(calls.at(0), Mode::SingleLine, "f(uint256)", false, fmt::encodeArgs(string("\x1", 1)));
+	testFunctionCall(calls.at(0), Mode::SingleLine, "f(uint256)", false, fmt::encodeArgs(std::string("\x1", 1)));
 }
 
 BOOST_AUTO_TEST_CASE(scanner_hex_values_invalid3)
@@ -447,7 +446,7 @@ BOOST_AUTO_TEST_CASE(call_arguments_string)
 		Mode::SingleLine,
 		"f(string)",
 		false,
-		fmt::encodeDyn(string{"any"})
+		fmt::encodeDyn(std::string{"any"})
 	);
 }
 
@@ -485,7 +484,7 @@ BOOST_AUTO_TEST_CASE(call_return_string)
 		"f()",
 		false,
 		fmt::encodeArgs(),
-		fmt::encodeDyn(string{"any"})
+		fmt::encodeDyn(std::string{"any"})
 	);
 }
 
@@ -976,7 +975,7 @@ BOOST_AUTO_TEST_CASE(call_effects)
 		// ~ bla bla
 		// ~ bla bla bla
 	)";
-	vector<FunctionCall> calls = parse(source, builtins);
+	std::vector<FunctionCall> calls = parse(source, builtins);
 	BOOST_REQUIRE_EQUAL(calls.size(), 1);
 	BOOST_REQUIRE_EQUAL(calls[0].expectedSideEffects.size(), 3);
 	BOOST_REQUIRE_EQUAL(boost::trim_copy(calls[0].expectedSideEffects[0]), "bla");
diff --git a/test/libsolidity/util/TestFunctionCall.cpp b/test/libsolidity/util/TestFunctionCall.cpp
index a50b3caf02..64dfbd9825 100644
--- a/test/libsolidity/util/TestFunctionCall.cpp
+++ b/test/libsolidity/util/TestFunctionCall.cpp
@@ -28,33 +28,32 @@
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::frontend::test;
-using namespace std;
 
 using Token = soltest::Token;
 
-string TestFunctionCall::format(
+std::string TestFunctionCall::format(
 	ErrorReporter& _errorReporter,
-	string const& _linePrefix,
+	std::string const& _linePrefix,
 	RenderMode _renderMode,
 	bool const _highlight,
 	bool const _interactivePrint
 ) const
 {
-	stringstream stream;
+	std::stringstream stream;
 
 	bool highlight = !matchesExpectation() && _highlight;
 
 	auto formatOutput = [&](bool const _singleLine)
 	{
-		string ws = " ";
-		string arrow = formatToken(Token::Arrow);
-		string colon = formatToken(Token::Colon);
-		string comma = formatToken(Token::Comma);
-		string comment = formatToken(Token::Comment);
-		string ether = formatToken(Token::Ether);
-		string wei = formatToken(Token::Wei);
-		string newline = formatToken(Token::Newline);
-		string failure = formatToken(Token::Failure);
+		std::string ws = " ";
+		std::string arrow = formatToken(Token::Arrow);
+		std::string colon = formatToken(Token::Colon);
+		std::string comma = formatToken(Token::Comma);
+		std::string comment = formatToken(Token::Comment);
+		std::string ether = formatToken(Token::Ether);
+		std::string wei = formatToken(Token::Wei);
+		std::string newline = formatToken(Token::Newline);
+		std::string failure = formatToken(Token::Failure);
 
 		if (m_call.kind == FunctionCall::Kind::Library)
 		{
@@ -83,7 +82,7 @@ string TestFunctionCall::format(
 		}
 		if (!m_call.arguments.rawBytes().empty())
 		{
-			string output = formatRawParameters(m_call.arguments.parameters, _linePrefix);
+			std::string output = formatRawParameters(m_call.arguments.parameters, _linePrefix);
 			stream << colon;
 			if (!m_call.arguments.parameters.at(0).format.newline)
 				stream << ws;
@@ -107,17 +106,17 @@ string TestFunctionCall::format(
 		}
 		else
 		{
-			stream << endl << _linePrefix << newline << ws;
+			stream << std::endl << _linePrefix << newline << ws;
 			if (!m_call.arguments.comment.empty())
 			{
 				 stream << comment << m_call.arguments.comment << comment;
-				 stream << endl << _linePrefix << newline << ws;
+				 stream << std::endl << _linePrefix << newline << ws;
 			}
 			stream << arrow;
 		}
 
 		/// Format either the expected output or the actual result output
-		string result;
+		std::string result;
 		if (_renderMode != RenderMode::ActualValuesExpectedGas)
 		{
 			bool const isFailure = m_call.expectations.failure;
@@ -162,7 +161,7 @@ string TestFunctionCall::format(
 						m_call.signature
 					);
 
-				string bytesOutput = abiParams ?
+				std::string bytesOutput = abiParams ?
 					BytesUtils::formatRawBytes(output, abiParams.value(), _linePrefix) :
 					BytesUtils::formatRawBytes(
 						output,
@@ -194,12 +193,12 @@ string TestFunctionCall::format(
 		{
 			if (!m_call.expectations.comment.empty())
 			{
-				stream << endl << _linePrefix << newline << ws;
+				stream << std::endl << _linePrefix << newline << ws;
 				stream << comment << m_call.expectations.comment << comment;
 			}
 		}
 
-		vector<string> sideEffects;
+		std::vector<std::string> sideEffects;
 		if (_renderMode == RenderMode::ExpectedValuesExpectedGas || _renderMode == RenderMode::ExpectedValuesActualGas)
 			sideEffects = m_call.expectedSideEffects;
 		else
@@ -221,10 +220,10 @@ string TestFunctionCall::format(
 	return stream.str();
 }
 
-string TestFunctionCall::formatBytesParameters(
+std::string TestFunctionCall::formatBytesParameters(
 	ErrorReporter& _errorReporter,
 	bytes const& _bytes,
-	string const& _signature,
+	std::string const& _signature,
 	solidity::frontend::test::ParameterList const& _parameters,
 	bool _highlight,
 	bool _failure
@@ -232,7 +231,7 @@ string TestFunctionCall::formatBytesParameters(
 {
 	using ParameterList = solidity::frontend::test::ParameterList;
 
-	stringstream os;
+	std::stringstream os;
 
 	if (_bytes.empty())
 		return {};
@@ -281,7 +280,7 @@ string TestFunctionCall::formatBytesParameters(
 	}
 }
 
-string TestFunctionCall::formatFailure(
+std::string TestFunctionCall::formatFailure(
 	ErrorReporter& _errorReporter,
 	solidity::frontend::test::FunctionCall const& _call,
 	bytes const& _output,
@@ -289,7 +288,7 @@ string TestFunctionCall::formatFailure(
 	bool _highlight
 ) const
 {
-	stringstream os;
+	std::stringstream os;
 
 	os << formatToken(Token::Failure);
 
@@ -311,34 +310,34 @@ string TestFunctionCall::formatFailure(
 	return os.str();
 }
 
-string TestFunctionCall::formatRawParameters(
+std::string TestFunctionCall::formatRawParameters(
 	solidity::frontend::test::ParameterList const& _params,
 	std::string const& _linePrefix
 ) const
 {
-	stringstream os;
+	std::stringstream os;
 	for (auto const& param: _params)
 		if (!param.rawString.empty())
 		{
 			if (param.format.newline)
-				os << endl << _linePrefix << "// ";
+				os << std::endl << _linePrefix << "// ";
 			for (auto const c: param.rawString)
 				// NOTE: Even though we have a toHex() overload specifically for uint8_t, the compiler
 				// chooses the one for bytes if the second argument is omitted.
-				os << (c >= ' ' ? string(1, c) : "\\x" + util::toHex(static_cast<uint8_t>(c), HexCase::Lower));
+				os << (c >= ' ' ? std::string(1, c) : "\\x" + util::toHex(static_cast<uint8_t>(c), HexCase::Lower));
 			if (&param != &_params.back())
 				os << ", ";
 		}
 	return os.str();
 }
 
-string TestFunctionCall::formatGasExpectations(
-	string const& _linePrefix,
+std::string TestFunctionCall::formatGasExpectations(
+	std::string const& _linePrefix,
 	bool _useActualCost,
 	bool _showDifference
 ) const
 {
-	stringstream os;
+	std::stringstream os;
 	for (auto const& [runType, gasUsed]: (_useActualCost ? m_gasCosts : m_call.expectations.gasUsed))
 		if (!runType.empty())
 		{
@@ -357,9 +356,9 @@ string TestFunctionCall::formatGasExpectations(
 				percent = static_cast<int>(
 					100.0 * (static_cast<double>(difference) / static_cast<double>(m_call.expectations.gasUsed.at(runType)))
 				);
-			os << endl << _linePrefix << "// gas " << runType << ": " << (gasUsed.str());
+			os << std::endl << _linePrefix << "// gas " << runType << ": " << (gasUsed.str());
 			if (_showDifference && differentResults && _useActualCost)
-				os << " [" << showpos << difference << " (" << percent << "%)]";
+				os << " [" << std::showpos << difference << " (" << percent << "%)]";
 		}
 	return os.str();
 }
diff --git a/test/libsolidity/util/TestFunctionCallTests.cpp b/test/libsolidity/util/TestFunctionCallTests.cpp
index e321ac6761..fa3fe995ca 100644
--- a/test/libsolidity/util/TestFunctionCallTests.cpp
+++ b/test/libsolidity/util/TestFunctionCallTests.cpp
@@ -25,7 +25,6 @@
 
 #include <test/libsolidity/util/TestFunctionCall.h>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::test;
 
@@ -39,8 +38,8 @@ BOOST_AUTO_TEST_CASE(format_unsigned_singleline)
 	bytes expectedBytes = toBigEndian(u256{1});
 	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
 	Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
 	FunctionCall call{"f(uint8)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 
@@ -59,8 +58,8 @@ BOOST_AUTO_TEST_CASE(format_unsigned_singleline_signed_encoding)
 	bytes expectedBytes = toBigEndian(u256{1});
 	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
 	Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
 	FunctionCall call{"f(uint8)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 
@@ -79,8 +78,8 @@ BOOST_AUTO_TEST_CASE(format_unsigned_multiline)
 	bytes expectedBytes = toBigEndian(u256{1});
 	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
 	Parameter result{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{result}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{result}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{}, std::string{}};
 	FunctionCall call{"f(uint8)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	call.displayMode = FunctionCall::DisplayMode::MultiLine;
@@ -94,8 +93,8 @@ BOOST_AUTO_TEST_CASE(format_multiple_unsigned_singleline)
 	bytes expectedBytes = toBigEndian(u256{1});
 	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
 	Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param, param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param, param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param, param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param, param}, std::string{}};
 	FunctionCall call{"f(uint8, uint8)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	TestFunctionCall test{call};
@@ -108,8 +107,8 @@ BOOST_AUTO_TEST_CASE(format_signed_singleline)
 	bytes expectedBytes = toBigEndian(u256{-1});
 	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
 	Parameter param{expectedBytes, "-1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
 	FunctionCall call{"f(int8)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	TestFunctionCall test{call};
@@ -128,8 +127,8 @@ BOOST_AUTO_TEST_CASE(format_hex_singleline)
 	bytes expectedBytes = result + bytes(32 - result.size(), 0);
 	ABIType abiType{ABIType::Hex, ABIType::AlignRight, 32};
 	Parameter param{expectedBytes, "0x31", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
 	FunctionCall call{"f(bytes32)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	TestFunctionCall test{call};
@@ -150,8 +149,8 @@ BOOST_AUTO_TEST_CASE(format_hex_string_singleline)
 	bytes expectedBytes = fromHex("4200ef");
 	ABIType abiType{ABIType::HexString, ABIType::AlignLeft, 3};
 	Parameter param{expectedBytes, "hex\"4200ef\"", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
 	FunctionCall call{"f(string)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	TestFunctionCall test{call};
@@ -164,8 +163,8 @@ BOOST_AUTO_TEST_CASE(format_bool_true_singleline)
 	bytes expectedBytes = toBigEndian(u256{true});
 	ABIType abiType{ABIType::Boolean, ABIType::AlignRight, 32};
 	Parameter param{expectedBytes, "true", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
 	FunctionCall call{"f(bool)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	TestFunctionCall test{call};
@@ -185,8 +184,8 @@ BOOST_AUTO_TEST_CASE(format_bool_false_singleline)
 	bytes expectedBytes = toBigEndian(u256{false});
 	ABIType abiType{ABIType::Boolean, ABIType::AlignRight, 32};
 	Parameter param{expectedBytes, "false", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
 	FunctionCall call{"f(bool)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	TestFunctionCall test{call};
@@ -199,8 +198,8 @@ BOOST_AUTO_TEST_CASE(format_bool_left_singleline)
 	bytes expectedBytes = toBigEndian(u256{false});
 	ABIType abiType{ABIType::Boolean, ABIType::AlignLeft, 32};
 	Parameter param{expectedBytes, "left(false)", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
 	FunctionCall call{"f(bool)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	TestFunctionCall test{call};
@@ -214,8 +213,8 @@ BOOST_AUTO_TEST_CASE(format_hex_number_right_singleline)
 	bytes expectedBytes = result + bytes(32 - result.size(), 0);
 	ABIType abiType{ABIType::Hex, ABIType::AlignRight, 32};
 	Parameter param{expectedBytes, "right(0x42)", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
 	FunctionCall call{"f(bool)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	TestFunctionCall test{call};
@@ -228,8 +227,8 @@ BOOST_AUTO_TEST_CASE(format_empty_byte_range)
 	bytes expectedBytes;
 	ABIType abiType{ABIType::None, ABIType::AlignNone, 0};
 	Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{param}, false, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{param}, false, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{}, std::string{}};
 	FunctionCall call{"f()", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	TestFunctionCall test{call};
@@ -242,8 +241,8 @@ BOOST_AUTO_TEST_CASE(format_failure_singleline)
 	bytes expectedBytes = toBigEndian(u256{1});
 	ABIType abiType{ABIType::UnsignedDec, ABIType::AlignRight, 32};
 	Parameter param{expectedBytes, "1", abiType, FormatInfo{}};
-	FunctionCallExpectations expectations{vector<Parameter>{}, true, string{}, {}};
-	FunctionCallArgs arguments{vector<Parameter>{param}, string{}};
+	FunctionCallExpectations expectations{std::vector<Parameter>{}, true, std::string{}, {}};
+	FunctionCallArgs arguments{std::vector<Parameter>{param}, std::string{}};
 	FunctionCall call{"f(uint8)", {0}, arguments, expectations};
 	call.omitsArrow = false;
 	TestFunctionCall test{call};

From 77912ab35d55d5080a8aa05b6d111435535d1ce9 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 2 Oct 2023 14:07:50 +0200
Subject: [PATCH 1614/1748] Fix check_style for using namespace std exclusing
 in test/*

---
 scripts/check_style.sh | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index dd1f583489..6a1b2c15ea 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -85,16 +85,27 @@ FORMATERROR=$(
     # unqualified move()/forward() checks, i.e. make sure that std::move() and std::forward() are used instead of move() and forward()
     preparedGrep "move\(.+\)" | grep -v "std::move" | grep -E "[^a-z]move"
     preparedGrep "forward\(.+\)" | grep -v "std::forward" | grep -E "[^a-z]forward"
+) | grep -E -v -e "^[a-zA-Z\./]*:[0-9]*:\s*\/(\/|\*)" -e "^test/" || true
+)
+
+# Special error handling for `using namespace std;` exclusion, since said statement can be present in the test directory
+# and its subdirectories, but is excluded in the above ruleset. In order to have consistent codestyle with regards to
+# std namespace usage, test directory must also be covered.
+FORMATSTDERROR=$(
+(
     # make sure `using namespace std` is not used in INCLUDE_DIRECTORIES
     # shellcheck disable=SC2068,SC2068
     grep -nIE -d skip "using namespace std;" ${NAMESPACE_STD_FREE_FILES[@]}
-) | grep -E -v -e "^[a-zA-Z\./]*:[0-9]*:\s*\/(\/|\*)" -e "^test/" || true
+) || true
 )
 
-if [[ "$FORMATERROR" != "" ]]
+# Merge errors into single string
+FORMATEDERRORS="$FORMATERROR$FORMATSTDERROR"
+
+if [[ "$FORMATEDERRORS" != "" ]]
 then
     echo "Coding style error:" | tee -a "$ERROR_LOG"
-    echo "$FORMATERROR" | tee -a "$ERROR_LOG"
+    echo "$FORMATEDERRORS" | tee -a "$ERROR_LOG"
     scripts/ci/post_style_errors_on_github.sh "$ERROR_LOG"
     exit 1
 fi

From 0d0a7fc1f5c0b22628c032aedb1df9b2cc586d09 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 2 Oct 2023 14:37:55 +0200
Subject: [PATCH 1615/1748] Purge using namespace std from previously missed
 files

---
 test/libsolidity/NatspecJSONTest.cpp  | 54 +++++++++---------
 test/libsolidity/SolidityParser.cpp   |  9 ++-
 test/libsolidity/SolidityTypes.cpp    | 39 +++++++------
 test/libsolidity/StandardCompiler.cpp | 80 +++++++++++++--------------
 test/libsolidity/SyntaxTest.cpp       |  9 ++-
 5 files changed, 94 insertions(+), 97 deletions(-)

diff --git a/test/libsolidity/NatspecJSONTest.cpp b/test/libsolidity/NatspecJSONTest.cpp
index 434d5b392b..c8b9369ca9 100644
--- a/test/libsolidity/NatspecJSONTest.cpp
+++ b/test/libsolidity/NatspecJSONTest.cpp
@@ -29,11 +29,11 @@
 
 #include <vector>
 
-using namespace std;
 using namespace solidity::frontend::test;
 using namespace solidity::util;
+using namespace std::string_literals;
 
-ostream& solidity::frontend::test::operator<<(ostream& _output, NatspecJSONKind _kind)
+std::ostream& solidity::frontend::test::operator<<(std::ostream& _output, NatspecJSONKind _kind)
 {
 	switch (_kind) {
 	case NatspecJSONKind::Devdoc: _output << "devdoc"; break;
@@ -42,12 +42,12 @@ ostream& solidity::frontend::test::operator<<(ostream& _output, NatspecJSONKind
 	return _output;
 }
 
-unique_ptr<TestCase> NatspecJSONTest::create(Config const& _config)
+std::unique_ptr<TestCase> NatspecJSONTest::create(Config const& _config)
 {
-	return make_unique<NatspecJSONTest>(_config.filename, _config.evmVersion);
+	return std::make_unique<NatspecJSONTest>(_config.filename, _config.evmVersion);
 }
 
-void NatspecJSONTest::parseCustomExpectations(istream& _stream)
+void NatspecJSONTest::parseCustomExpectations(std::istream& _stream)
 {
 	soltestAssert(m_expectedNatspecJSON.empty());
 
@@ -56,21 +56,21 @@ void NatspecJSONTest::parseCustomExpectations(istream& _stream)
 	//     // <qualified contract name> <devdoc|userdoc>
 	//     // <json>
 
-	string line;
+	std::string line;
 	while (getline(_stream, line))
 	{
-		string_view strippedLine = expectLinePrefix(line);
+		std::string_view strippedLine = expectLinePrefix(line);
 		if (strippedLine.empty())
 			continue;
 
 		auto [contractName, kind] = parseExpectationHeader(strippedLine);
 
-		string rawJSON = extractExpectationJSON(_stream);
-		string jsonErrors;
+		std::string rawJSON = extractExpectationJSON(_stream);
+		std::string jsonErrors;
 		Json::Value parsedJSON;
 		bool jsonParsingSuccessful = jsonParseStrict(rawJSON, parsedJSON, &jsonErrors);
 		if (!jsonParsingSuccessful)
-			BOOST_THROW_EXCEPTION(runtime_error(fmt::format(
+			BOOST_THROW_EXCEPTION(std::runtime_error(fmt::format(
 				"Malformed JSON in {} expectation for contract {}.\n"
 				"Note that JSON expectations must be pretty-printed to be split correctly. "
 				"The object is assumed to and at the first unindented closing brace.\n"
@@ -80,7 +80,7 @@ void NatspecJSONTest::parseCustomExpectations(istream& _stream)
 				rawJSON
 			)));
 
-		m_expectedNatspecJSON[string(contractName)][kind] = parsedJSON;
+		m_expectedNatspecJSON[std::string(contractName)][kind] = parsedJSON;
 	}
 }
 
@@ -94,51 +94,51 @@ bool NatspecJSONTest::expectationsMatch()
 		prettyPrinted(obtainedNatspec()) == prettyPrinted(m_expectedNatspecJSON);
 }
 
-void NatspecJSONTest::printExpectedResult(ostream& _stream, string const& _linePrefix, bool _formatted) const
+void NatspecJSONTest::printExpectedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
 {
 	SyntaxTest::printExpectedResult(_stream, _linePrefix, _formatted);
 	if (!m_expectedNatspecJSON.empty())
 	{
-		_stream << _linePrefix << "----" << endl;
+		_stream << _linePrefix << "----" << std::endl;
 		printIndented(_stream, formatNatspecExpectations(m_expectedNatspecJSON), _linePrefix);
 	}
 }
 
-void NatspecJSONTest::printObtainedResult(ostream& _stream, string const& _linePrefix, bool _formatted) const
+void NatspecJSONTest::printObtainedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
 {
 	SyntaxTest::printObtainedResult(_stream, _linePrefix, _formatted);
 
 	NatspecMap natspecJSON = obtainedNatspec();
 	if (!natspecJSON.empty())
 	{
-		_stream << _linePrefix << "----" << endl;
+		_stream << _linePrefix << "----" << std::endl;
 		// TODO: Diff both versions and highlight differences.
 		// We should have a helper for doing that in newly defined test cases without much effort.
 		printIndented(_stream, formatNatspecExpectations(natspecJSON), _linePrefix);
 	}
 }
 
-tuple<string_view, NatspecJSONKind> NatspecJSONTest::parseExpectationHeader(string_view _line)
+std::tuple<std::string_view, NatspecJSONKind> NatspecJSONTest::parseExpectationHeader(std::string_view _line)
 {
 	for (NatspecJSONKind kind: {NatspecJSONKind::Devdoc, NatspecJSONKind::Userdoc})
 	{
-		string kindSuffix = " " + toString(kind);
+		std::string kindSuffix = " " + toString(kind);
 		if (boost::algorithm::ends_with(_line, kindSuffix))
 			return {_line.substr(0, _line.size() - kindSuffix.size()), kind};
 	}
 
-	BOOST_THROW_EXCEPTION(runtime_error(
+	BOOST_THROW_EXCEPTION(std::runtime_error(
 		"Natspec kind (devdoc/userdoc) not present in the expectation: "s.append(_line)
 	));
 }
 
-string NatspecJSONTest::extractExpectationJSON(istream& _stream)
+std::string NatspecJSONTest::extractExpectationJSON(std::istream& _stream)
 {
-	string rawJSON;
-	string line;
+	std::string rawJSON;
+	std::string line;
 	while (getline(_stream, line))
 	{
-		string_view strippedLine = expectLinePrefix(line);
+		std::string_view strippedLine = expectLinePrefix(line);
 		rawJSON += strippedLine;
 		rawJSON += "\n";
 
@@ -149,11 +149,11 @@ string NatspecJSONTest::extractExpectationJSON(istream& _stream)
 	return rawJSON;
 }
 
-string_view NatspecJSONTest::expectLinePrefix(string_view _line)
+std::string_view NatspecJSONTest::expectLinePrefix(std::string_view _line)
 {
 	size_t startPosition = 0;
 	if (!boost::algorithm::starts_with(_line, "//"))
-		BOOST_THROW_EXCEPTION(runtime_error(
+		BOOST_THROW_EXCEPTION(std::runtime_error(
 			"Expectation line is not a comment: "s.append(_line)
 		));
 
@@ -164,9 +164,9 @@ string_view NatspecJSONTest::expectLinePrefix(string_view _line)
 	return _line.substr(startPosition, _line.size() - startPosition);
 }
 
-string NatspecJSONTest::formatNatspecExpectations(NatspecMap const& _expectations) const
+std::string NatspecJSONTest::formatNatspecExpectations(NatspecMap const& _expectations) const
 {
-	string output;
+	std::string output;
 	bool first = true;
 	// NOTE: Not sorting explicitly because CompilerStack seems to put contracts roughly in the
 	// order in which they appear in the source, which is much better than alphabetical order.
@@ -190,7 +190,7 @@ NatspecMap NatspecJSONTest::obtainedNatspec() const
 		return {};
 
 	NatspecMap result;
-	for (string contractName: compiler().contractNames())
+	for (std::string contractName: compiler().contractNames())
 	{
 		result[contractName][NatspecJSONKind::Devdoc]  = compiler().natspecDev(contractName);
 		result[contractName][NatspecJSONKind::Userdoc] = compiler().natspecUser(contractName);
diff --git a/test/libsolidity/SolidityParser.cpp b/test/libsolidity/SolidityParser.cpp
index 14ccbba46d..e0f010c49e 100644
--- a/test/libsolidity/SolidityParser.cpp
+++ b/test/libsolidity/SolidityParser.cpp
@@ -31,7 +31,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::langutil;
 
 namespace solidity::frontend::test
@@ -50,7 +49,7 @@ ASTPointer<ContractDefinition> parseText(std::string const& _source, ErrorList&
 	if (!sourceUnit)
 		return ASTPointer<ContractDefinition>();
 	for (ASTPointer<ASTNode> const& node: sourceUnit->nodes())
-		if (ASTPointer<ContractDefinition> contract = dynamic_pointer_cast<ContractDefinition>(node))
+		if (ASTPointer<ContractDefinition> contract = std::dynamic_pointer_cast<ContractDefinition>(node))
 			return contract;
 	BOOST_FAIL("No contract found in source.");
 	return ASTPointer<ContractDefinition>();
@@ -525,7 +524,7 @@ BOOST_AUTO_TEST_CASE(keyword_is_reserved)
 	for (auto const& keyword: keywords)
 	{
 		auto text = std::string("contract ") + keyword + " {}";
-		CHECK_PARSE_ERROR(text.c_str(), string("Expected identifier but got reserved keyword '") + keyword + "'");
+		CHECK_PARSE_ERROR(text.c_str(), std::string("Expected identifier but got reserved keyword '") + keyword + "'");
 	}
 }
 
@@ -591,7 +590,7 @@ BOOST_AUTO_TEST_CASE(inline_asm_end_location)
 	class CheckInlineAsmLocation: public ASTConstVisitor
 	{
 	public:
-		explicit CheckInlineAsmLocation(string _sourceCode): m_sourceCode(_sourceCode) {}
+		explicit CheckInlineAsmLocation(std::string _sourceCode): m_sourceCode(_sourceCode) {}
 		bool visited = false;
 		bool visit(InlineAssembly const& _inlineAsm) override
 		{
@@ -602,7 +601,7 @@ BOOST_AUTO_TEST_CASE(inline_asm_end_location)
 
 			return false;
 		}
-		string m_sourceCode;
+		std::string m_sourceCode;
 	};
 
 	CheckInlineAsmLocation visitor{sourceCode};
diff --git a/test/libsolidity/SolidityTypes.cpp b/test/libsolidity/SolidityTypes.cpp
index db43f49c03..e4523292f6 100644
--- a/test/libsolidity/SolidityTypes.cpp
+++ b/test/libsolidity/SolidityTypes.cpp
@@ -27,7 +27,6 @@
 #include <libsolutil/Keccak256.h>
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::langutil;
 
 namespace solidity::frontend::test
@@ -86,9 +85,9 @@ BOOST_AUTO_TEST_CASE(storage_layout_simple)
 	BOOST_REQUIRE(members.memberStorageOffset("first") != nullptr);
 	BOOST_REQUIRE(members.memberStorageOffset("second") != nullptr);
 	BOOST_REQUIRE(members.memberStorageOffset("wraps") != nullptr);
-	BOOST_CHECK(*members.memberStorageOffset("first") == make_pair(u256(0), unsigned(0)));
-	BOOST_CHECK(*members.memberStorageOffset("second") == make_pair(u256(0), unsigned(16)));
-	BOOST_CHECK(*members.memberStorageOffset("wraps") == make_pair(u256(1), unsigned(0)));
+	BOOST_CHECK(*members.memberStorageOffset("first") == std::make_pair(u256(0), unsigned(0)));
+	BOOST_CHECK(*members.memberStorageOffset("second") == std::make_pair(u256(0), unsigned(16)));
+	BOOST_CHECK(*members.memberStorageOffset("wraps") == std::make_pair(u256(1), unsigned(0)));
 }
 
 BOOST_AUTO_TEST_CASE(storage_layout_mapping)
@@ -114,10 +113,10 @@ BOOST_AUTO_TEST_CASE(storage_layout_mapping)
 	BOOST_REQUIRE(members.memberStorageOffset("second") != nullptr);
 	BOOST_REQUIRE(members.memberStorageOffset("third") != nullptr);
 	BOOST_REQUIRE(members.memberStorageOffset("final") != nullptr);
-	BOOST_CHECK(*members.memberStorageOffset("first") == make_pair(u256(0), unsigned(0)));
-	BOOST_CHECK(*members.memberStorageOffset("second") == make_pair(u256(1), unsigned(0)));
-	BOOST_CHECK(*members.memberStorageOffset("third") == make_pair(u256(2), unsigned(0)));
-	BOOST_CHECK(*members.memberStorageOffset("final") == make_pair(u256(3), unsigned(0)));
+	BOOST_CHECK(*members.memberStorageOffset("first") == std::make_pair(u256(0), unsigned(0)));
+	BOOST_CHECK(*members.memberStorageOffset("second") == std::make_pair(u256(1), unsigned(0)));
+	BOOST_CHECK(*members.memberStorageOffset("third") == std::make_pair(u256(2), unsigned(0)));
+	BOOST_CHECK(*members.memberStorageOffset("final") == std::make_pair(u256(3), unsigned(0)));
 }
 
 BOOST_AUTO_TEST_CASE(storage_layout_arrays)
@@ -162,7 +161,7 @@ BOOST_AUTO_TEST_CASE(type_identifiers)
 	BOOST_CHECK_EQUAL(RationalNumberType(rational(2 * 200, 2 * 77)).identifier(), "t_rational_200_by_77");
 	BOOST_CHECK_EQUAL(RationalNumberType(rational(-2 * 200, 2 * 77)).identifier(), "t_rational_minus_200_by_77");
 	BOOST_CHECK_EQUAL(
-		StringLiteralType(Literal(++id, SourceLocation{}, Token::StringLiteral, make_shared<string>("abc - def"))).identifier(),
+		StringLiteralType(Literal(++id, SourceLocation{}, Token::StringLiteral, std::make_shared<std::string>("abc - def"))).identifier(),
 		 "t_stringliteral_196a9142ee0d40e274a6482393c762b16dd8315713207365e1e13d8d85b74fc4"
 	);
 	BOOST_CHECK_EQUAL(TypeProvider::fromElementaryTypeName("bytes1")->identifier(), "t_bytes1");
@@ -183,15 +182,15 @@ BOOST_AUTO_TEST_CASE(type_identifiers)
 	Type const* multiArray = TypeProvider::array(DataLocation::Storage, stringArray);
 	BOOST_CHECK_EQUAL(multiArray->identifier(), "t_array$_t_array$_t_string_storage_$20_storage_$dyn_storage_ptr");
 
-	ContractDefinition c(++id, SourceLocation{}, make_shared<string>("MyContract$"), SourceLocation{}, {}, {}, {}, ContractKind::Contract);
+	ContractDefinition c(++id, SourceLocation{}, std::make_shared<std::string>("MyContract$"), SourceLocation{}, {}, {}, {}, ContractKind::Contract);
 	BOOST_CHECK_EQUAL(c.type()->identifier(), "t_type$_t_contract$_MyContract$$$_$2_$");
 	BOOST_CHECK_EQUAL(ContractType(c, true).identifier(), "t_super$_MyContract$$$_$2");
 
-	StructDefinition s(++id, {}, make_shared<string>("Struct"), {}, {}, {});
+	StructDefinition s(++id, {}, std::make_shared<std::string>("Struct"), {}, {}, {});
 	s.annotation().recursive = false;
 	BOOST_CHECK_EQUAL(s.type()->identifier(), "t_type$_t_struct$_Struct_$3_storage_ptr_$");
 
-	EnumDefinition e(++id, {}, make_shared<string>("Enum"), {}, {}, {});
+	EnumDefinition e(++id, {}, std::make_shared<std::string>("Enum"), {}, {}, {});
 	BOOST_CHECK_EQUAL(e.type()->identifier(), "t_type$_t_enum$_Enum_$4_$");
 
 	TupleType t({e.type(), s.type(), stringArray, nullptr});
@@ -209,8 +208,8 @@ BOOST_AUTO_TEST_CASE(type_identifiers)
 
 	// TypeType is tested with contract
 
-	auto emptyParams = make_shared<ParameterList>(++id, SourceLocation(), std::vector<ASTPointer<VariableDeclaration>>());
-	ModifierDefinition mod(++id, SourceLocation{}, make_shared<string>("modif"), SourceLocation{}, {}, emptyParams, {}, {}, {});
+	auto emptyParams = std::make_shared<ParameterList>(++id, SourceLocation(), std::vector<ASTPointer<VariableDeclaration>>());
+	ModifierDefinition mod(++id, SourceLocation{}, std::make_shared<std::string>("modif"), SourceLocation{}, {}, emptyParams, {}, {}, {});
 	BOOST_CHECK_EQUAL(ModifierType(mod).identifier(), "t_modifier$__$");
 
 	SourceUnit su(++id, {}, {}, {}, {});
@@ -250,34 +249,34 @@ BOOST_AUTO_TEST_CASE(helper_bool_result)
 {
 	BoolResult r1{true};
 	BoolResult r2 = BoolResult::err("Failure.");
-	r1.merge(r2, logical_and<bool>());
+	r1.merge(r2, std::logical_and<bool>());
 	BOOST_REQUIRE_EQUAL(r1.get(), false);
 	BOOST_REQUIRE_EQUAL(r1.message(), "Failure.");
 
 	BoolResult r3{false};
 	BoolResult r4{true};
-	r3.merge(r4, logical_and<bool>());
+	r3.merge(r4, std::logical_and<bool>());
 	BOOST_REQUIRE_EQUAL(r3.get(), false);
 	BOOST_REQUIRE_EQUAL(r3.message(), "");
 
 	BoolResult r5{true};
 	BoolResult r6{true};
-	r5.merge(r6, logical_and<bool>());
+	r5.merge(r6, std::logical_and<bool>());
 	BOOST_REQUIRE_EQUAL(r5.get(), true);
 	BOOST_REQUIRE_EQUAL(r5.message(), "");
 }
 
 BOOST_AUTO_TEST_CASE(helper_string_result)
 {
-	using StringResult = util::Result<string>;
+	using StringResult = util::Result<std::string>;
 
-	StringResult r1{string{"Success"}};
+	StringResult r1{std::string{"Success"}};
 	StringResult r2 = StringResult::err("Failure");
 
 	BOOST_REQUIRE_EQUAL(r1.get(), "Success");
 	BOOST_REQUIRE_EQUAL(r2.get(), "");
 
-	r1.merge(r2, [](string const&, string const& _rhs) { return _rhs; });
+	r1.merge(r2, [](std::string const&, std::string const& _rhs) { return _rhs; });
 
 	BOOST_REQUIRE_EQUAL(r1.get(), "");
 	BOOST_REQUIRE_EQUAL(r1.message(), "Failure");
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 7d02e0a9e5..df5a2137bf 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -32,8 +32,8 @@
 #include <algorithm>
 #include <set>
 
-using namespace std;
 using namespace solidity::evmasm;
+using namespace std::string_literals;
 
 namespace solidity::frontend::test
 {
@@ -41,9 +41,9 @@ namespace solidity::frontend::test
 namespace
 {
 
-langutil::Error::Severity str2Severity(string const& _cat)
+langutil::Error::Severity str2Severity(std::string const& _cat)
 {
-	map<string, langutil::Error::Severity> cats{
+	std::map<std::string, langutil::Error::Severity> cats{
 		{"info", langutil::Error::Severity::Info},
 		{"Info", langutil::Error::Severity::Info},
 		{"warning", langutil::Error::Severity::Warning},
@@ -55,7 +55,7 @@ langutil::Error::Severity str2Severity(string const& _cat)
 }
 
 /// Helper to match a specific error type and message
-bool containsError(Json::Value const& _compilerResult, string const& _type, string const& _message)
+bool containsError(Json::Value const& _compilerResult, std::string const& _type, std::string const& _message)
 {
 	if (!_compilerResult.isMember("errors"))
 		return false;
@@ -88,7 +88,7 @@ bool containsAtMostWarnings(Json::Value const& _compilerResult)
 	return true;
 }
 
-Json::Value getContractResult(Json::Value const& _compilerResult, string const& _file, string const& _name)
+Json::Value getContractResult(Json::Value const& _compilerResult, std::string const& _file, std::string const& _name)
 {
 	if (
 		!_compilerResult["contracts"].isObject() ||
@@ -107,10 +107,10 @@ void checkLinkReferencesSchema(Json::Value const& _contractResult)
 	Json::Value const& linkReferenceResult = _contractResult["evm"]["bytecode"]["linkReferences"];
 	BOOST_TEST_REQUIRE(linkReferenceResult.isObject());
 
-	for (string const& fileName: linkReferenceResult.getMemberNames())
+	for (std::string const& fileName: linkReferenceResult.getMemberNames())
 	{
 		BOOST_TEST_REQUIRE(linkReferenceResult[fileName].isObject());
-		for (string const& libraryName: linkReferenceResult[fileName].getMemberNames())
+		for (std::string const& libraryName: linkReferenceResult[fileName].getMemberNames())
 		{
 			BOOST_TEST_REQUIRE(linkReferenceResult[fileName][libraryName].isArray());
 			BOOST_TEST_REQUIRE(!linkReferenceResult[fileName][libraryName].empty());
@@ -125,7 +125,7 @@ void checkLinkReferencesSchema(Json::Value const& _contractResult)
 	}
 }
 
-void expectLinkReferences(Json::Value const& _contractResult, map<string, set<string>> const& _expectedLinkReferences)
+void expectLinkReferences(Json::Value const& _contractResult, std::map<std::string, std::set<std::string>> const& _expectedLinkReferences)
 {
 	checkLinkReferencesSchema(_contractResult);
 
@@ -136,15 +136,15 @@ void expectLinkReferences(Json::Value const& _contractResult, map<string, set<st
 	{
 		BOOST_TEST(linkReferenceResult.isMember(fileName));
 		BOOST_TEST(linkReferenceResult[fileName].size() == libraries.size());
-		for (string const& libraryName: libraries)
+		for (std::string const& libraryName: libraries)
 			BOOST_TEST(linkReferenceResult[fileName].isMember(libraryName));
 	}
 }
 
-Json::Value compile(string _input)
+Json::Value compile(std::string _input)
 {
 	StandardCompiler compiler;
-	string output = compiler.compile(std::move(_input));
+	std::string output = compiler.compile(std::move(_input));
 	Json::Value ret;
 	BOOST_REQUIRE(util::jsonParseStrict(output, ret));
 	return ret;
@@ -383,7 +383,7 @@ BOOST_AUTO_TEST_CASE(basic_compilation)
 	BOOST_CHECK(contract["evm"]["bytecode"]["object"].isString());
 	BOOST_CHECK_EQUAL(
 		solidity::test::bytecodeSansMetadata(contract["evm"]["bytecode"]["object"].asString()),
-		string("6080604052348015600e575f80fd5b5060") +
+		std::string("6080604052348015600e575f80fd5b5060") +
 		(VersionIsRelease ? "3e" : util::toHex(bytes{uint8_t(60 + VersionStringStrict.size())})) +
 		"80601a5f395ff3fe60806040525f80fdfe"
 	);
@@ -483,7 +483,7 @@ BOOST_AUTO_TEST_CASE(compilation_error)
 	{
 		BOOST_REQUIRE(error.isObject());
 		BOOST_REQUIRE(error["message"].isString());
-		if (error["message"].asString().find("pre-release compiler") == string::npos)
+		if (error["message"].asString().find("pre-release compiler") == std::string::npos)
 		{
 			BOOST_CHECK_EQUAL(
 				util::jsonCompactPrint(error),
@@ -1010,7 +1010,7 @@ BOOST_AUTO_TEST_CASE(linking_yul_same_library_name_different_files)
 
 BOOST_AUTO_TEST_CASE(evm_version)
 {
-	auto inputForVersion = [](string const& _version)
+	auto inputForVersion = [](std::string const& _version)
 	{
 		return R"(
 			{
@@ -1029,30 +1029,30 @@ BOOST_AUTO_TEST_CASE(evm_version)
 	};
 	Json::Value result;
 	result = compile(inputForVersion("\"evmVersion\": \"homestead\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"homestead\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"homestead\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"tangerineWhistle\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"tangerineWhistle\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"tangerineWhistle\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"spuriousDragon\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"spuriousDragon\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"spuriousDragon\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"byzantium\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"byzantium\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"byzantium\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"constantinople\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"constantinople\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"constantinople\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"petersburg\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"petersburg\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"petersburg\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"istanbul\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"istanbul\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"istanbul\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"berlin\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"berlin\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"berlin\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"london\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"london\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"london\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"paris\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"paris\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"paris\"") != std::string::npos);
 	result = compile(inputForVersion("\"evmVersion\": \"shanghai\","));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"shanghai\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"shanghai\"") != std::string::npos);
 	// test default
 	result = compile(inputForVersion(""));
-	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"shanghai\"") != string::npos);
+	BOOST_CHECK(result["contracts"]["fileA"]["A"]["metadata"].asString().find("\"evmVersion\":\"shanghai\"") != std::string::npos);
 	// test invalid
 	result = compile(inputForVersion("\"evmVersion\": \"invalid\","));
 	BOOST_CHECK(result["errors"][0]["message"].asString() == "Invalid EVM version requested.");
@@ -1211,8 +1211,8 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_details_different)
 	BOOST_CHECK(optimizer["details"]["yul"].asBool() == true);
 	BOOST_CHECK(optimizer["details"]["yulDetails"].isObject());
 	BOOST_CHECK(
-		util::convertContainer<set<string>>(optimizer["details"]["yulDetails"].getMemberNames()) ==
-		(set<string>{"stackAllocation", "optimizerSteps"})
+		util::convertContainer<std::set<std::string>>(optimizer["details"]["yulDetails"].getMemberNames()) ==
+		(std::set<std::string>{"stackAllocation", "optimizerSteps"})
 	);
 	BOOST_CHECK(optimizer["details"]["yulDetails"]["stackAllocation"].asBool() == true);
 	BOOST_CHECK(
@@ -1259,7 +1259,7 @@ BOOST_AUTO_TEST_CASE(metadata_without_compilation)
 
 BOOST_AUTO_TEST_CASE(license_in_metadata)
 {
-	string const input = R"(
+	std::string const input = R"(
 			{
 				"language": "Solidity",
 				"sources": {
@@ -1387,7 +1387,7 @@ BOOST_AUTO_TEST_CASE(use_stack_optimization)
 
 	// Now disable stack optimizations and UnusedFunctionParameterPruner (p)
 	// results in "stack too deep"
-	string optimiserSteps = OptimiserSettings::DefaultYulOptimiserSteps;
+	std::string optimiserSteps = OptimiserSettings::DefaultYulOptimiserSteps;
 	optimiserSteps.erase(
 		remove_if(optimiserSteps.begin(), optimiserSteps.end(), [](char ch) { return ch == 'p'; }),
 		optimiserSteps.end()
@@ -1728,16 +1728,16 @@ BOOST_AUTO_TEST_CASE(dependency_tracking_of_abstract_contract_yul)
 	BOOST_REQUIRE(result["contracts"]["A.sol"]["C"].isObject());
 	BOOST_REQUIRE(result["contracts"]["A.sol"]["C"]["ir"].isString());
 
-	const string& irCode = result["contracts"]["A.sol"]["C"]["ir"].asString();
+	const std::string& irCode = result["contracts"]["A.sol"]["C"]["ir"].asString();
 
 	// Make sure C and B contracts are deployed
-	BOOST_REQUIRE(irCode.find("object \"C") != string::npos);
-	BOOST_REQUIRE(irCode.find("object \"B") != string::npos);
+	BOOST_REQUIRE(irCode.find("object \"C") != std::string::npos);
+	BOOST_REQUIRE(irCode.find("object \"B") != std::string::npos);
 
 	// Make sure A and D are NOT deployed as they were not requested and are not
 	// in any dependency
-	BOOST_REQUIRE(irCode.find("object \"A") == string::npos);
-	BOOST_REQUIRE(irCode.find("object \"D") == string::npos);
+	BOOST_REQUIRE(irCode.find("object \"A") == std::string::npos);
+	BOOST_REQUIRE(irCode.find("object \"D") == std::string::npos);
 
 
 	BOOST_REQUIRE(result["sources"].isObject());
@@ -1770,15 +1770,15 @@ BOOST_AUTO_TEST_CASE(source_location_of_bare_block)
 	solidity::frontend::StandardCompiler compiler;
 	Json::Value result = compiler.compile(parsedInput);
 
-	string sourceMap = result["contracts"]["A.sol"]["A"]["evm"]["bytecode"]["sourceMap"].asString();
+	std::string sourceMap = result["contracts"]["A.sol"]["A"]["evm"]["bytecode"]["sourceMap"].asString();
 
 	// Check that the bare block's source location is referenced.
-	string sourceRef =
+	std::string sourceRef =
 		";" +
-		to_string(string{"contract A { constructor() { uint x = 2; "}.size()) +
+		std::to_string(std::string{"contract A { constructor() { uint x = 2; "}.size()) +
 		":" +
-		to_string(string{"{ uint y = 3; }"}.size());
-	BOOST_REQUIRE(sourceMap.find(sourceRef) != string::npos);
+		std::to_string(std::string{"{ uint y = 3; }"}.size());
+	BOOST_REQUIRE(sourceMap.find(sourceRef) != std::string::npos);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 906391e01c..5cdd22b422 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -28,7 +28,6 @@
 #include <memory>
 #include <stdexcept>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::util::formatting;
@@ -39,7 +38,7 @@ using namespace boost::unit_test;
 namespace fs = boost::filesystem;
 
 SyntaxTest::SyntaxTest(
-	string const& _filename,
+	std::string const& _filename,
 	langutil::EVMVersion _evmVersion,
 	Error::Severity _minSeverity
 ):
@@ -80,14 +79,14 @@ void SyntaxTest::parseAndAnalyze()
 			// failing compilation after successful analysis is a rare case,
 			// it assumes that errors contain exactly one error, and the error is of type Error::Type::CodeGenerationError
 			if (codeGeneretionErrorCount != 1 || errorCount != 1)
-				BOOST_THROW_EXCEPTION(runtime_error("Compilation failed even though analysis was successful."));
+				BOOST_THROW_EXCEPTION(std::runtime_error("Compilation failed even though analysis was successful."));
 		}
 	}
 	catch (UnimplementedFeatureError const& _e)
 	{
 		m_errorList.emplace_back(SyntaxTestError{
 			"UnimplementedFeatureError",
-			nullopt,
+			std::nullopt,
 			errorMessage(_e),
 			"",
 			-1,
@@ -107,7 +106,7 @@ void SyntaxTest::filterObtainedErrors()
 
 		int locationStart = -1;
 		int locationEnd = -1;
-		string sourceName;
+		std::string sourceName;
 		if (SourceLocation const* location = currentError->sourceLocation())
 		{
 			locationStart = location->start;

From 93ea88850d60bd424555871b155891ffbb0fa127 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 4 Oct 2023 13:38:43 +0200
Subject: [PATCH 1616/1748] CI: Stop using the deprecated `large` class for
 macOS jobs

---
 .circleci/config.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ae05a7aa3..70c508d6d1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -448,14 +448,6 @@ defaults:
         MAKEFLAGS: -j5
         CPUs: 5
 
-  - base_osx_large: &base_osx_large
-      <<: *base_osx
-      resource_class: large
-      environment: &base_osx_large_env
-        <<: *base_osx_env
-        MAKEFLAGS: -j10
-        CPUs: 10
-
   - base_python_small: &base_python_small
       docker:
         - image: cimg/python:3.6
@@ -1099,9 +1091,9 @@ jobs:
       - matrix_notify_failure_unless_pr
 
   b_osx:
-    <<: *base_osx_large
+    <<: *base_osx
     environment:
-      <<: *base_osx_large_env
+      <<: *base_osx_env
       CMAKE_BUILD_TYPE: Release
     steps:
       - checkout

From ab9729bc52dd718af322233b0bc3f483127afe44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 25 Sep 2023 18:07:39 +0200
Subject: [PATCH 1617/1748] Repro for variable names affecting CSE

---
 .../name_dependent_cse_bug_part_1.yul         | 46 ++++++++++++++++++
 ..._dependent_cse_bug_part_1_pre_shanghai.yul | 47 +++++++++++++++++++
 .../name_dependent_cse_bug_part_2.yul         | 45 ++++++++++++++++++
 ..._dependent_cse_bug_part_2_pre_shanghai.yul | 46 ++++++++++++++++++
 4 files changed, 184 insertions(+)
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2.yul
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2_pre_shanghai.yul

diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul
new file mode 100644
index 0000000000..2f76b3857f
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul
@@ -0,0 +1,46 @@
+{
+    main(0, 0)
+
+    function main(a, b) {
+        for {} 1 {}
+        {
+            if iszero(a) { break }
+
+            let mid := avg(a, a)
+            switch a
+            case 0 {
+                a := mid
+            }
+            default {
+                sstore(0, mid)
+            }
+        }
+    }
+
+    function avg(x, y) -> var {
+        // NOTE: Variable names should not affect CSE.
+        // This should not be optimized differently than name_dependent_cse_bug_part_2.yul.
+        // `let mid := var` should be present in both or missing in both.
+        let _1 := add(x, y)
+        var := add(_1, _1)
+    }
+}
+// ====
+// EVMVersion: >=shanghai
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         let a := 0
+//         for { } a { }
+//         {
+//             let _1 := add(a, a)
+//             let var := add(_1, _1)
+//             let mid := var
+//             switch a
+//             case 0 { a := var }
+//             default { sstore(0, mid) }
+//         }
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul
new file mode 100644
index 0000000000..6489eac0e5
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul
@@ -0,0 +1,47 @@
+{
+    main(0, 0)
+
+    function main(a, b) {
+        for {} 1 {}
+        {
+            if iszero(a) { break }
+
+            let mid := avg(a, a)
+            switch a
+            case 0 {
+                a := mid
+            }
+            default {
+                sstore(0, mid)
+            }
+        }
+    }
+
+    function avg(x, y) -> var {
+        // NOTE: Variable names should not affect CSE.
+        // This should not be optimized differently than name_dependent_cse_bug_part_2_pre_shanghai.yul.
+        // `let mid := var` should be present in both or missing in both.
+        let _1 := add(x, y)
+        var := add(_1, _1)
+    }
+}
+// ====
+// EVMVersion: <shanghai
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         let a := 0
+//         let a_1 := 0
+//         for { } a_1 { }
+//         {
+//             let _1 := add(a_1, a_1)
+//             let var := add(_1, _1)
+//             let mid := var
+//             switch a_1
+//             case 0 { a_1 := var }
+//             default { sstore(a, mid) }
+//         }
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2.yul b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2.yul
new file mode 100644
index 0000000000..879f84834e
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2.yul
@@ -0,0 +1,45 @@
+{
+    main(0, 0)
+
+    function main(a, b) {
+        for {} 1 {}
+        {
+            if iszero(a) { break }
+
+            let mid := avg(a, a)
+            switch a
+            case 0 {
+                a := mid
+            }
+            default {
+                sstore(0, mid)
+            }
+        }
+    }
+
+    function avg(x, y) -> var {
+        // NOTE: Variable names should not affect CSE.
+        // This should not be optimized differently than name_dependent_cse_bug_part_1.yul.
+        // `let mid := var` should be present in both or missing in both.
+        let _2 := add(x, y)
+        var := add(_2, _2)
+    }
+}
+// ====
+// EVMVersion: >=shanghai
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         let a := 0
+//         for { } a { }
+//         {
+//             let _1 := add(a, a)
+//             let var := add(_1, _1)
+//             switch a
+//             case 0 { a := var }
+//             default { sstore(0, var) }
+//         }
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2_pre_shanghai.yul b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2_pre_shanghai.yul
new file mode 100644
index 0000000000..06965e3ca6
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_2_pre_shanghai.yul
@@ -0,0 +1,46 @@
+{
+    main(0, 0)
+
+    function main(a, b) {
+        for {} 1 {}
+        {
+            if iszero(a) { break }
+
+            let mid := avg(a, a)
+            switch a
+            case 0 {
+                a := mid
+            }
+            default {
+                sstore(0, mid)
+            }
+        }
+    }
+
+    function avg(x, y) -> var {
+        // NOTE: Variable names should not affect CSE.
+        // This should not be optimized differently than name_dependent_cse_bug_part_1_pre_shanghai.yul.
+        // `let mid := var` should be present in both or missing in both.
+        let _2 := add(x, y)
+        var := add(_2, _2)
+    }
+}
+// ====
+// EVMVersion: <shanghai
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         let a := 0
+//         let a_1 := 0
+//         for { } a_1 { }
+//         {
+//             let _1 := add(a_1, a_1)
+//             let var := add(_1, _1)
+//             switch a_1
+//             case 0 { a_1 := var }
+//             default { sstore(a, var) }
+//         }
+//     }
+// }

From 7c36f23a905444ef0f1589440bbfa001a7814a57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 22 Sep 2023 11:24:03 +0200
Subject: [PATCH 1618/1748] DataFlowAnalyzer: Fix variable clearing
 nondeterminism (affecting CSE and bytecode reproducibility) due to set
 insertions during iteration

---
 Changelog.md                                  |  1 +
 libyul/optimiser/DataFlowAnalyzer.cpp         |  5 ++--
 .../~name_dependent_cse_bug/cse_bug.yul       | 30 +++++++++++++++++++
 .../~name_dependent_cse_bug/test.sh           | 28 +++++++++++++++++
 .../externalContracts/prbmath_unsigned.sol    |  2 +-
 .../externalContracts/ramanujan_pi.sol        |  2 +-
 .../externalContracts/strings.sol             |  4 +--
 .../name_dependent_cse_bug_part_1.yul         |  3 +-
 ..._dependent_cse_bug_part_1_pre_shanghai.yul |  3 +-
 9 files changed, 68 insertions(+), 10 deletions(-)
 create mode 100644 test/cmdlineTests/~name_dependent_cse_bug/cse_bug.yul
 create mode 100755 test/cmdlineTests/~name_dependent_cse_bug/test.sh

diff --git a/Changelog.md b/Changelog.md
index c14af77389..1031a5a4c6 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -16,6 +16,7 @@ Bugfixes:
  * NatSpec: Fix internal error when requesting userdoc or devdoc for a contract that emits an event defined in a foreign contract or interface.
  * SMTChecker: Fix encoding error that causes loops to unroll after completion.
  * SMTChecker: Fix inconsistency on constant condition checks when ``while`` or ``for`` loops are unrolled before the condition check.
+ * Yul Optimizer: Fix replacement decisions during CSE being affected by Yul variable names generated by the compiler, resulting in different (but equivalent) bytecode in some situations.
 
 
 ### 0.8.21 (2023-07-19)
diff --git a/libyul/optimiser/DataFlowAnalyzer.cpp b/libyul/optimiser/DataFlowAnalyzer.cpp
index 958e70a838..5992c9b985 100644
--- a/libyul/optimiser/DataFlowAnalyzer.cpp
+++ b/libyul/optimiser/DataFlowAnalyzer.cpp
@@ -351,13 +351,14 @@ void DataFlowAnalyzer::clearValues(std::set<YulString> _variables)
 	});
 
 	// Also clear variables that reference variables to be cleared.
+	std::set<YulString> referencingVariables;
 	for (auto const& variableToClear: _variables)
 		for (auto const& [ref, names]: m_state.references)
 			if (names.count(variableToClear))
-				_variables.emplace(ref);
+				referencingVariables.emplace(ref);
 
 	// Clear the value and update the reference relation.
-	for (auto const& name: _variables)
+	for (auto const& name: _variables + referencingVariables)
 	{
 		m_state.value.erase(name);
 		m_state.references.erase(name);
diff --git a/test/cmdlineTests/~name_dependent_cse_bug/cse_bug.yul b/test/cmdlineTests/~name_dependent_cse_bug/cse_bug.yul
new file mode 100644
index 0000000000..2ed2f27ff0
--- /dev/null
+++ b/test/cmdlineTests/~name_dependent_cse_bug/cse_bug.yul
@@ -0,0 +1,30 @@
+object "C" {
+    code {}
+
+    object "C_deployed" {
+        code {
+            main(0, 0)
+
+            function main(a, b) {
+                for {} 1 {}
+                {
+                    if iszero(a) { break }
+
+                    let mid := avg(a, a)
+                    switch a
+                    case 0 {
+                        a := mid
+                    }
+                    default {
+                        sstore(0, mid)
+                    }
+                }
+            }
+
+            function avg(x, y) -> var {
+                let __placeholder__ := add(x, y)
+                var := add(__placeholder__, __placeholder__)
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/~name_dependent_cse_bug/test.sh b/test/cmdlineTests/~name_dependent_cse_bug/test.sh
new file mode 100755
index 0000000000..96c3ac23ed
--- /dev/null
+++ b/test/cmdlineTests/~name_dependent_cse_bug/test.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+# This is a regression test against https://github.com/ethereum/solidity/issues/14494
+# Due to the bug, a decision about which variable to use to replace a subexpression in CSE would
+# depend on sorting order of variable names. A variable not being used as a replacement could lead
+# to it being unused in general and removed by Unused Pruner. This would show up as a difference
+# in the bytecode.
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+# shellcheck source=scripts/common_cmdline.sh
+source "${REPO_ROOT}/scripts/common_cmdline.sh"
+
+SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
+
+function assemble_with_variable_name {
+    local input_file="$1"
+    local variable_name="$2"
+
+    sed -e "s|__placeholder__|${variable_name}|g" "$input_file" | msg_on_error --no-stderr \
+        "$SOLC" --strict-assembly - --optimize --debug-info none |
+            stripCLIDecorations
+}
+
+diff_values \
+    "$(assemble_with_variable_name "${SCRIPT_DIR}/cse_bug.yul" _1)" \
+    "$(assemble_with_variable_name "${SCRIPT_DIR}/cse_bug.yul" _2)"
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 77a1e2ca62..9efc71108a 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,7 +48,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1722610
+// gas irOptimized: 1722166
 // gas legacy: 2210160
 // gas legacyOptimized: 1734152
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index a1f1d63952..45fb4486d7 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -33,7 +33,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 407075
+// gas irOptimized: 406595
 // gas legacy: 631753
 // gas legacyOptimized: 459425
 // prb_pi() -> 3141592656369545286
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index 226bf5947d..a90b3e83bd 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,7 +49,7 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 634328
+// gas irOptimized: 633680
 // gas legacy: 1065857
 // gas legacyOptimized: 725423
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
@@ -69,6 +69,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 1981677
+// gas irOptimized: 1981664
 // gas legacy: 4235651
 // gas legacyOptimized: 2319622
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul
index 2f76b3857f..f0d4b49b1d 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1.yul
@@ -37,10 +37,9 @@
 //         {
 //             let _1 := add(a, a)
 //             let var := add(_1, _1)
-//             let mid := var
 //             switch a
 //             case 0 { a := var }
-//             default { sstore(0, mid) }
+//             default { sstore(0, var) }
 //         }
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul
index 6489eac0e5..d041cff104 100644
--- a/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul
+++ b/test/libyul/yulOptimizerTests/fullSuite/name_dependent_cse_bug_part_1_pre_shanghai.yul
@@ -38,10 +38,9 @@
 //         {
 //             let _1 := add(a_1, a_1)
 //             let var := add(_1, _1)
-//             let mid := var
 //             switch a_1
 //             case 0 { a_1 := var }
-//             default { sstore(a, mid) }
+//             default { sstore(a, var) }
 //         }
 //     }
 // }

From 7b12d414c937bcc400c405fb9cc4e9bb6b54d468 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 10 Oct 2023 15:48:43 +0200
Subject: [PATCH 1619/1748] Fix brink external test

---
 test/externalTests/brink.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
index 06e2207bd0..44ea1a511a 100755
--- a/test/externalTests/brink.sh
+++ b/test/externalTests/brink.sh
@@ -31,7 +31,7 @@ BINARY_TYPE="$1"
 BINARY_PATH="$(realpath "$2")"
 SELECTED_PRESETS="$3"
 
-function compile_fn { yarn compile; }
+function compile_fn { yarn hardhat-compile; }
 function test_fn { SNAPSHOT_UPDATE=1 npx --no hardhat test; }
 
 function brink_test
@@ -63,7 +63,7 @@ function brink_test
     download_project "$repo" "$ref_type" "$ref" "$DIR"
 
     # TODO: Remove this when Brink merges https://github.com/brinktrade/brink-core/pull/52
-    sed -i "s|\(function isValidSignature(bytes \)calldata\( _data, bytes \)calldata\( _signature)\)|\1memory\2memory\3|g" contracts/Test/MockEIP1271Validator.sol
+    sed -i "s|\(function isValidSignature(bytes \)calldata\( _data, bytes \)calldata\( _signature)\)|\1memory\2memory\3|g" src/Test/MockEIP1271Validator.sol
 
     neutralize_package_lock
     neutralize_package_json_hooks

From 74381a5fb286a2065a1398abd540b69fe5c96c1d Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 13 Oct 2023 13:09:05 +0200
Subject: [PATCH 1620/1748] Disable the Gnosis test suite

---
 .circleci/config.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 70c508d6d1..9165e7ad8c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1750,7 +1750,9 @@ workflows:
 
       - t_ext: *job_ems_compile_ext_colony
 
-      - t_ext: *job_native_test_ext_gnosis
+      # NOTE: We are disabling the gnosis test suite due to version discrepancies that are difficult to fix.
+      #       Check again after (and if) https://github.com/safe-global/safe-contracts/pull/644 is merged.
+      #- t_ext: *job_native_test_ext_gnosis
       - t_ext: *job_native_test_ext_zeppelin
       - t_ext: *job_native_test_ext_ens
       - t_ext: *job_native_test_ext_yield_liquidator
@@ -1773,7 +1775,9 @@ workflows:
           <<: *requires_nothing
           requires:
             - t_ems_compile_ext_colony
-            - t_native_test_ext_gnosis
+            # NOTE: We are disabling the gnosis test suite due to version discrepancies that are difficult to fix.
+            #       Check again after (and if) https://github.com/safe-global/safe-contracts/pull/644 is merged.
+            #- t_native_test_ext_gnosis
             - t_native_test_ext_zeppelin
             - t_native_test_ext_ens
             - t_native_test_ext_yield_liquidator

From 3e660d452a2f17813d536182f183473c7d05433d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 15 Sep 2023 14:52:28 +0200
Subject: [PATCH 1621/1748] docs: Remove an outdated reference to Serenity

---
 docs/contracts/events.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contracts/events.rst b/docs/contracts/events.rst
index 84b5293c0d..8c73c31603 100644
--- a/docs/contracts/events.rst
+++ b/docs/contracts/events.rst
@@ -15,7 +15,7 @@ arguments to be stored in the transaction's log - a special data structure
 in the blockchain. These logs are associated with the address of the contract that emitted them,
 are incorporated into the blockchain, and stay there as long as a block is
 accessible (forever as of now, but this might
-change with Serenity). The Log and its event data is not accessible from within
+change in the future). The Log and its event data is not accessible from within
 contracts (not even from the contract that created them).
 
 It is possible to request a Merkle proof for logs, so if

From 0196a9a5725bc63955b815e7479cacc0c63463f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 15 Sep 2023 14:53:47 +0200
Subject: [PATCH 1622/1748] docs: Update the list of definitions in a contract
 whose names do not clash when inherited

---
 docs/contracts/inheritance.rst | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/docs/contracts/inheritance.rst b/docs/contracts/inheritance.rst
index 7756ce93d2..c787c5af6a 100644
--- a/docs/contracts/inheritance.rst
+++ b/docs/contracts/inheritance.rst
@@ -590,9 +590,11 @@ One area where inheritance linearization is especially important and perhaps not
 Inheriting Different Kinds of Members of the Same Name
 ======================================================
 
-It is an error when any of the following pairs in a contract have the same name due to inheritance:
-  - a function and a modifier
-  - a function and an event
-  - an event and a modifier
-
-As an exception, a state variable getter can override an external function.
+The only situations where, due to inheritance, a contract may contain multiple definitions sharing
+the same name are:
+
+- Overloading of functions.
+- Overriding of virtual functions.
+- Overriding of external virtual functions by state variable getters.
+- Overriding of virtual modifiers.
+- Overloading of events.

From 77cf95042c756a342da66ccf4c788192cd10128e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 15 Sep 2023 14:54:07 +0200
Subject: [PATCH 1623/1748] style guide: Use emit keyword when emitting events

---
 docs/style-guide.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 266c1817f4..4e42ea5757 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -233,7 +233,7 @@ Yes:
         bytes32[] options
     );
 
-    LongAndLotsOfArgs(
+    emit LongAndLotsOfArgs(
         sender,
         recipient,
         publicKey,
@@ -251,7 +251,7 @@ No:
                             uint256 amount,
                             bytes32[] options);
 
-    LongAndLotsOfArgs(sender,
+    emit LongAndLotsOfArgs(sender,
                       recipient,
                       publicKey,
                       amount,

From 70870a6e96987889b935f1454d722b7f80669e6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 15 Sep 2023 14:54:38 +0200
Subject: [PATCH 1624/1748] style guide: Add events and errors to the order of
 definitions at file level

---
 docs/style-guide.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/style-guide.rst b/docs/style-guide.rst
index 4e42ea5757..427ede5ee3 100644
--- a/docs/style-guide.rst
+++ b/docs/style-guide.rst
@@ -1045,13 +1045,15 @@ No:
 Order of Layout
 ***************
 
-Layout contract elements in the following order:
+Contract elements should be laid out in the following order:
 
 1. Pragma statements
 2. Import statements
-3. Interfaces
-4. Libraries
-5. Contracts
+3. Events
+4. Errors
+5. Interfaces
+6. Libraries
+7. Contracts
 
 Inside each contract, library or interface, use the following order:
 

From eab92f93a35b672e242e29ae85bc36d8c660359e Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Thu, 12 Oct 2023 13:43:22 +0200
Subject: [PATCH 1625/1748] Make Yul proto mutator mutations deterministic.

---
 .../ossfuzz/protomutators/YulProtoMutator.cpp | 28 +++++++++----------
 .../ossfuzz/protomutators/YulProtoMutator.h   |  6 ++--
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp b/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
index 09001217d7..9b0c97a22d 100644
--- a/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
+++ b/test/tools/ossfuzz/protomutators/YulProtoMutator.cpp
@@ -26,20 +26,18 @@ void MutationInfo::exitInfo()
 	writeLine(SaveMessageAsText(*m_protobufMsg));
 }
 
-/// Initialize deterministic PRNG.
-static YulRandomNumGenerator s_rand(1337);
-
 /// Add m/sstore(0, variable)
 static LPMPostProcessor<Block> addStoreToZero(
 	[](Block* _message, unsigned _seed)
 	{
 		if (_seed % YPM::s_highIP == 0)
 		{
+			YulRandomNumGenerator yrand(_seed);
 			MutationInfo m{_message, "Added store to zero"};
 			auto storeStmt = new StoreFunc();
-			storeStmt->set_st(YPM::EnumTypeConverter<StoreFunc_Storage>{}.enumFromSeed(s_rand()));
+			storeStmt->set_st(YPM::EnumTypeConverter<StoreFunc_Storage>{}.enumFromSeed(yrand()));
 			storeStmt->set_allocated_loc(YPM::litExpression(0));
-			storeStmt->set_allocated_val(YPM::refExpression(s_rand));
+			storeStmt->set_allocated_val(YPM::refExpression(yrand));
 			auto stmt = _message->add_statements();
 			stmt->set_allocated_storage_func(storeStmt);
 		}
@@ -54,10 +52,10 @@ struct addControlFlow
 {
 	addControlFlow()
 	{
-		function = [](T* _message, unsigned)
+		function = [](T* _message, unsigned _seed)
 		{
 			MutationInfo m{_message, "Added control flow."};
-			YPM::addControlFlow(_message);
+			YPM::addControlFlow(_message, _seed);
 		};
 		/// Unused variable registers callback.
 		LPMPostProcessor<T> callback(function);
@@ -170,7 +168,7 @@ unsigned YPM::EnumTypeConverter<T>::enumMin()
 }
 
 template <typename T>
-void YPM::addControlFlow(T* _msg)
+void YPM::addControlFlow(T* _msg, unsigned _seed)
 {
 	enum class ControlFlowStmt: unsigned
 	{
@@ -188,8 +186,9 @@ void YPM::addControlFlow(T* _msg)
 		static_cast<unsigned>(ControlFlowStmt::For),
 		static_cast<unsigned>(ControlFlowStmt::Termination)
 	);
-	auto random = static_cast<ControlFlowStmt>(d(s_rand.m_random));
-	Statement* s = basicBlock(_msg)->add_statements();
+	YulRandomNumGenerator yrand(_seed);
+	auto random = static_cast<ControlFlowStmt>(d(yrand.m_random));
+	Statement* s = basicBlock(_msg, _seed)->add_statements();
 	switch (random)
 	{
 	case ControlFlowStmt::For:
@@ -222,7 +221,7 @@ void YPM::addControlFlow(T* _msg)
 	}
 }
 
-Block* YPM::randomBlock(ForStmt* _stmt)
+Block* YPM::randomBlock(ForStmt* _stmt, unsigned _seed)
 {
 	enum class ForBlocks: unsigned
 	{
@@ -234,7 +233,8 @@ Block* YPM::randomBlock(ForStmt* _stmt)
 		static_cast<unsigned>(ForBlocks::Init),
 		static_cast<unsigned>(ForBlocks::Body)
 	);
-	switch (static_cast<ForBlocks>(d(s_rand.m_random)))
+	YulRandomNumGenerator yrand(_seed);
+	switch (static_cast<ForBlocks>(d(yrand.m_random)))
 	{
 	case ForBlocks::Init:
 		return _stmt->mutable_for_init();
@@ -246,10 +246,10 @@ Block* YPM::randomBlock(ForStmt* _stmt)
 }
 
 template <typename T>
-Block* YPM::basicBlock(T* _msg)
+Block* YPM::basicBlock(T* _msg, unsigned _seed)
 {
 	if constexpr (std::is_same_v<T, ForStmt>)
-		return randomBlock(_msg);
+		return randomBlock(_msg, _seed);
 	else if constexpr (std::is_same_v<T, BoundedForStmt>)
 		return _msg->mutable_for_body();
 	else if constexpr (std::is_same_v<T, SwitchStmt>)
diff --git a/test/tools/ossfuzz/protomutators/YulProtoMutator.h b/test/tools/ossfuzz/protomutators/YulProtoMutator.h
index c6fd010ba8..0d68b95c50 100644
--- a/test/tools/ossfuzz/protomutators/YulProtoMutator.h
+++ b/test/tools/ossfuzz/protomutators/YulProtoMutator.h
@@ -96,13 +96,13 @@ struct YulProtoMutator
 	static constexpr unsigned s_highIP = 23;
 	/// Add control-flow statement to basic block.
 	template <typename T>
-	static void addControlFlow(T* _msg);
+	static void addControlFlow(T* _msg, unsigned _seed);
 	/// Obtain basic block for statement type.
 	template <typename T>
-	static Block* basicBlock(T* _msg);
+	static Block* basicBlock(T* _msg, unsigned _seed);
 	/// Obtain a basic block in a for stmt uniformly
 	/// at random
-	static Block* randomBlock(ForStmt* _msg);
+	static Block* randomBlock(ForStmt* _msg, unsigned _seed);
 	/// Obtain a basic block in global scope.
 	static Block* globalBlock(Program* _program);
 };

From 09ea29b27d9632133c1c539fad9fd645e991a1d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 1 Aug 2023 15:23:14 +0200
Subject: [PATCH 1626/1748] Remove unused IndentedWriter

---
 libsolutil/CMakeLists.txt          |  2 -
 libsolutil/IndentedWriter.cpp      | 65 --------------------------
 libsolutil/IndentedWriter.h        | 66 --------------------------
 test/CMakeLists.txt                |  1 -
 test/libsolutil/IndentedWriter.cpp | 74 ------------------------------
 5 files changed, 208 deletions(-)
 delete mode 100644 libsolutil/IndentedWriter.cpp
 delete mode 100644 libsolutil/IndentedWriter.h
 delete mode 100644 test/libsolutil/IndentedWriter.cpp

diff --git a/libsolutil/CMakeLists.txt b/libsolutil/CMakeLists.txt
index 201429bb75..f97d61b671 100644
--- a/libsolutil/CMakeLists.txt
+++ b/libsolutil/CMakeLists.txt
@@ -13,8 +13,6 @@ set(sources
 	ErrorCodes.h
 	FixedHash.h
 	FunctionSelector.h
-	IndentedWriter.cpp
-	IndentedWriter.h
 	IpfsHash.cpp
 	IpfsHash.h
 	JSON.cpp
diff --git a/libsolutil/IndentedWriter.cpp b/libsolutil/IndentedWriter.cpp
deleted file mode 100644
index b2a3c06c93..0000000000
--- a/libsolutil/IndentedWriter.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-	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
-/**
- * @date 2017
- * Indented text writer.
- */
-
-#include <libsolutil/IndentedWriter.h>
-#include <libsolutil/Assertions.h>
-
-using namespace solidity::util;
-
-std::string IndentedWriter::format() const
-{
-	std::string result;
-	for (auto const& line: m_lines)
-		result += std::string(line.indentation * 4, ' ') + line.contents + "\n";
-	return result;
-}
-
-void IndentedWriter::newLine()
-{
-	if (!m_lines.back().contents.empty())
-		m_lines.emplace_back(Line{std::string(), m_lines.back().indentation});
-}
-
-void IndentedWriter::indent()
-{
-	newLine();
-	m_lines.back().indentation++;
-}
-
-void IndentedWriter::unindent()
-{
-	newLine();
-	assertThrow(m_lines.back().indentation > 0, IndentedWriterError, "Negative indentation.");
-	m_lines.back().indentation--;
-}
-
-void IndentedWriter::add(std::string const& _str)
-{
-	m_lines.back().contents += _str;
-}
-
-void IndentedWriter::addLine(std::string const& _line)
-{
-	newLine();
-	add(_line);
-	newLine();
-}
diff --git a/libsolutil/IndentedWriter.h b/libsolutil/IndentedWriter.h
deleted file mode 100644
index 47e2817fa9..0000000000
--- a/libsolutil/IndentedWriter.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-	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
-/**
- * @date 2017
- * Indented text writer.
- */
-
-#pragma once
-
-#include <vector>
-#include <string>
-
-#include <libsolutil/Exceptions.h>
-
-namespace solidity::util
-{
-
-DEV_SIMPLE_EXCEPTION(IndentedWriterError);
-
-class IndentedWriter
-{
-public:
-	// Returns the formatted output.
-	std::string format() const;
-
-	// Go one indentation level in.
-	void indent();
-
-	// Go one indentation level out.
-	void unindent();
-
-	// Add text.
-	void add(std::string const& _str);
-
-	// Add text with new line.
-	void addLine(std::string const& _line);
-
-	// Add new line.
-	void newLine();
-
-private:
-	struct Line
-	{
-		std::string contents;
-		unsigned indentation;
-	};
-
-	std::vector<Line> m_lines{{std::string(), 0}};
-};
-
-}
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f8242db7a2..f32a14d918 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -33,7 +33,6 @@ set(libsolutil_sources
     libsolutil/CommonIO.cpp
     libsolutil/FixedHash.cpp
     libsolutil/FunctionSelector.cpp
-    libsolutil/IndentedWriter.cpp
     libsolutil/IpfsHash.cpp
     libsolutil/IterateReplacing.cpp
     libsolutil/JSON.cpp
diff --git a/test/libsolutil/IndentedWriter.cpp b/test/libsolutil/IndentedWriter.cpp
deleted file mode 100644
index 94997c842c..0000000000
--- a/test/libsolutil/IndentedWriter.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-	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
-/**
- * Unit tests for IndentedWriter.
- */
-
-#include <libsolutil/IndentedWriter.h>
-
-#include <test/Common.h>
-
-#include <boost/test/unit_test.hpp>
-
-
-namespace solidity::util::test
-{
-
-BOOST_AUTO_TEST_SUITE(IndentedWriterTest)
-
-BOOST_AUTO_TEST_CASE(empty)
-{
-	IndentedWriter iw;
-	BOOST_CHECK_EQUAL(iw.format(), "\n");
-}
-
-BOOST_AUTO_TEST_CASE(new_lines)
-{
-	IndentedWriter iw;
-	iw.newLine();
-	BOOST_CHECK_EQUAL(iw.format(), "\n");
-}
-
-BOOST_AUTO_TEST_CASE(text_without_newline)
-{
-	IndentedWriter iw;
-	iw.add("Hello World");
-	BOOST_CHECK_EQUAL(iw.format(), "Hello World\n");
-}
-
-BOOST_AUTO_TEST_CASE(text_with_newline)
-{
-	IndentedWriter iw;
-	iw.addLine("Hello World");
-	BOOST_CHECK_EQUAL(iw.format(), "Hello World\n\n");
-}
-
-BOOST_AUTO_TEST_CASE(indent)
-{
-	IndentedWriter iw;
-	iw.addLine("Hello");
-	iw.indent();
-	iw.addLine("World");
-	iw.unindent();
-	iw.addLine("and everyone else");
-	BOOST_CHECK_EQUAL(iw.format(), "Hello\n    World\nand everyone else\n\n");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}

From 8c619dd9c7e1fd5d8bd4b89025212d29450a818b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 1 Aug 2023 13:46:58 +0200
Subject: [PATCH 1627/1748] Generalize existing functions for indenting and
 prefixing

---
 libsolutil/StringUtils.cpp           | 35 ++++++++++++++++++++++++++++
 libsolutil/StringUtils.h             | 34 ++++++++++++++++++++++++++-
 libyul/Object.cpp                    | 16 +------------
 test/CommonSyntaxTest.cpp            |  8 +++----
 test/TestCase.cpp                    | 23 +++++-------------
 test/TestCase.h                      |  1 -
 test/libsolidity/ASTJSONTest.cpp     | 21 ++++-------------
 test/libsolidity/GasTest.cpp         |  8 -------
 test/libsolidity/GasTest.h           |  1 -
 test/libsolidity/NatspecJSONTest.cpp |  5 ++--
 test/libsolidity/SemanticTest.cpp    |  7 ++----
 test/libyul/YulOptimizerTest.cpp     |  3 ++-
 12 files changed, 89 insertions(+), 73 deletions(-)

diff --git a/libsolutil/StringUtils.cpp b/libsolutil/StringUtils.cpp
index 1dc86714d8..f5d2bbfb37 100644
--- a/libsolutil/StringUtils.cpp
+++ b/libsolutil/StringUtils.cpp
@@ -23,6 +23,10 @@
  */
 
 #include <libsolutil/StringUtils.h>
+
+#include <boost/algorithm/string/trim.hpp>
+
+#include <sstream>
 #include <string>
 #include <vector>
 
@@ -190,3 +194,34 @@ std::string solidity::util::formatNumberReadable(bigint const& _value, bool _use
 	return sign + str;
 }
 
+std::string solidity::util::prefixLines(
+	std::string const& _input,
+	std::string const& _prefix,
+	bool _trimPrefix
+)
+{
+	std::ostringstream output;
+	printPrefixed(output, _input, _prefix, _trimPrefix, false /* _ensureFinalNewline */);
+	return output.str();
+}
+
+void solidity::util::printPrefixed(
+	std::ostream& _output,
+	std::string const& _input,
+	std::string const& _prefix,
+	bool _trimPrefix,
+	bool _ensureFinalNewline
+)
+{
+	std::istringstream input(_input);
+	std::string line;
+	while (std::getline(input, line))
+	{
+		if (line.empty() && _trimPrefix)
+			_output << boost::trim_right_copy(_prefix);
+		else
+			_output << _prefix << line;
+		if (!input.eof() || _ensureFinalNewline)
+			_output << '\n';
+	}
+}
diff --git a/libsolutil/StringUtils.h b/libsolutil/StringUtils.h
index 0d5bc7839b..77ffe67354 100644
--- a/libsolutil/StringUtils.h
+++ b/libsolutil/StringUtils.h
@@ -168,7 +168,7 @@ inline bool isDigit(char _c)
 	return isdigit(_c, std::locale::classic());
 }
 
-// Checks if character is printable using classic "C" locale
+/// Checks if character is printable using classic "C" locale
 /// @param _c character to be checked
 /// @return true if _c is a printable character, false otherwise.
 inline bool isPrint(char _c)
@@ -176,4 +176,36 @@ inline bool isPrint(char _c)
 	return isprint(_c, std::locale::classic());
 }
 
+/// Adds a prefix to every line in the input.
+/// @see printPrefixed()
+std::string prefixLines(
+	std::string const& _input,
+	std::string const& _prefix,
+	bool _trimPrefix = true
+);
+
+/// Prints to a stream, adding a prefix to every line in the input.
+/// Assumes \n as the line separator.
+/// @param _trimPrefix If true, the function avoids introducing trailing whitespace on empty lines.
+///     This is achieved by removing trailing spaces from the prefix on such lines.
+///     Note that tabs and newlines are not removed, only spaces are.
+/// @param _finalNewline If true, an extra \n will be printed at the end of @a _input if it does
+///     not already end with one.
+void printPrefixed(
+	std::ostream& _output,
+	std::string const& _input,
+	std::string const& _prefix,
+	bool _trimPrefix = true,
+	bool _ensureFinalNewline = true
+);
+
+/// Adds a standard indent of 4 spaces to every line in the input.
+/// Assumes \n as the line separator.
+/// @param _indentEmptyLines If true, the indent will be applied to empty lines as well, resulting
+///     such lines containing trailing whitespace.
+inline std::string indent(std::string const& _input, bool _indentEmptyLines = false)
+{
+	return prefixLines(_input, "    ", !_indentEmptyLines);
+}
+
 }
diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 83ee66a3b2..96d60fc77e 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -30,8 +30,6 @@
 #include <libsolutil/StringUtils.h>
 
 #include <boost/algorithm/string.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/replace.hpp>
 
 #include <range/v3/view/transform.hpp>
 
@@ -40,18 +38,6 @@ using namespace solidity::langutil;
 using namespace solidity::util;
 using namespace solidity::yul;
 
-namespace
-{
-
-std::string indent(std::string const& _input)
-{
-	if (_input.empty())
-		return _input;
-	return boost::replace_all_copy("    " + _input, "\n", "\n    ");
-}
-
-}
-
 std::string Data::toString(Dialect const*, DebugInfoSelection const&, CharStreamProvider const*) const
 {
 	return "data \"" + name.str() + "\" hex\"" + util::toHex(data) + "\"";
@@ -86,7 +72,7 @@ std::string Object::toString(
 	for (auto const& obj: subObjects)
 		inner += "\n" + obj->toString(_dialect, _debugInfoSelection, _soliditySourceProvider);
 
-	return useSrcComment + "object \"" + name.str() + "\" {\n" + indent(inner) + "\n}";
+	return useSrcComment + "object \"" + name.str() + "\" {\n" + indent(inner, true /* _indentEmptyLines */) + "\n}";
 }
 
 Json::Value Data::toJson() const
diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index 79b5978041..8e546017ff 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -20,6 +20,7 @@
 #include <test/Common.h>
 #include <test/TestCase.h>
 #include <libsolutil/CommonIO.h>
+#include <libsolutil/StringUtils.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/test/unit_test.hpp>
@@ -144,11 +145,8 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 		else
 		{
 			if (outputSourceNames)
-				_stream << _linePrefix << "==== Source: " + name << " ====" << endl;
-			stringstream stream(source);
-			string line;
-			while (getline(stream, line))
-				_stream << _linePrefix << line << endl;
+				printPrefixed(_stream, "==== Source: " + name + " ====", _linePrefix);
+			printPrefixed(_stream, source, _linePrefix);
 		}
 }
 
diff --git a/test/TestCase.cpp b/test/TestCase.cpp
index 059d2ab70c..51608bd4a3 100644
--- a/test/TestCase.cpp
+++ b/test/TestCase.cpp
@@ -20,8 +20,8 @@
 #include <test/TestCase.h>
 
 #include <libsolutil/AnsiColorized.h>
+#include <libsolutil/StringUtils.h>
 
-#include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 
 #include <iostream>
@@ -31,6 +31,7 @@ using namespace std;
 using namespace solidity;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
+using namespace solidity::util;
 
 void TestCase::printSettings(ostream& _stream, const string& _linePrefix, const bool)
 {
@@ -69,26 +70,14 @@ void TestCase::expect(string::iterator& _it, string::iterator _end, string::valu
 	++_it;
 }
 
-void TestCase::printIndented(ostream& _stream, string const& _output, string const& _linePrefix) const
-{
-	stringstream output(_output);
-	string line;
-	while (getline(output, line))
-		if (line.empty())
-			// Avoid trailing spaces.
-			_stream << boost::trim_right_copy(_linePrefix) << endl;
-		else
-			_stream << _linePrefix << line << endl;
-}
-
 void TestCase::printSource(ostream& _stream, string const& _linePrefix, bool const) const
 {
-	printIndented(_stream, m_source, _linePrefix);
+	printPrefixed(_stream, m_source, _linePrefix);
 }
 
 void TestCase::printUpdatedExpectations(ostream& _stream, string const& _linePrefix) const
 {
-	printIndented(_stream, m_obtainedResult, _linePrefix);
+	printPrefixed(_stream, m_obtainedResult, _linePrefix);
 }
 
 TestCase::TestResult TestCase::checkResult(std::ostream& _stream, const std::string& _linePrefix, bool const _formatted)
@@ -99,10 +88,10 @@ TestCase::TestResult TestCase::checkResult(std::ostream& _stream, const std::str
 		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
 			<< _linePrefix << "Expected result:" << endl;
 		// TODO could compute a simple diff with highlighted lines
-		printIndented(_stream, m_expectation, nextIndentLevel);
+		printPrefixed(_stream, m_expectation, nextIndentLevel);
 		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
 			<< _linePrefix << "Obtained result:" << endl;
-		printIndented(_stream, m_obtainedResult, nextIndentLevel);
+		printPrefixed(_stream, m_obtainedResult, nextIndentLevel);
 		return TestResult::Failure;
 	}
 	return TestResult::Success;
diff --git a/test/TestCase.h b/test/TestCase.h
index f631bea8dc..301dbfb658 100644
--- a/test/TestCase.h
+++ b/test/TestCase.h
@@ -100,7 +100,6 @@ class TestCase
 			++_it;
 	}
 
-	void printIndented(std::ostream& _stream, std::string const& _output, std::string const& _linePrefix = "") const;
 	TestCase::TestResult checkResult(std::ostream& _stream, const std::string& _linePrefix, bool const _formatted);
 
 	std::string m_source;
diff --git a/test/libsolidity/ASTJSONTest.cpp b/test/libsolidity/ASTJSONTest.cpp
index a318eacee6..daf4a9ea44 100644
--- a/test/libsolidity/ASTJSONTest.cpp
+++ b/test/libsolidity/ASTJSONTest.cpp
@@ -270,12 +270,7 @@ bool ASTJSONTest::runTest(
 			"Expected result" <<
 			(!_variant.name().empty() ? " (" + _variant.name() + "):" : ":") <<
 			std::endl;
-		{
-			std::istringstream stream(_variant.expectation);
-			std::string line;
-			while (getline(stream, line))
-				_stream << nextIndentLevel << line << std::endl;
-		}
+		printPrefixed(_stream, _variant.expectation, nextIndentLevel);
 		_stream << std::endl;
 
 		AnsiColorized(_stream, _formatted, {BOLD, CYAN}) <<
@@ -283,12 +278,7 @@ bool ASTJSONTest::runTest(
 			"Obtained result" <<
 			(!_variant.name().empty() ? " (" + _variant.name() + "):" : ":") <<
 			std::endl;
-		{
-			std::istringstream stream(_variant.result);
-			std::string line;
-			while (getline(stream, line))
-				_stream << nextIndentLevel << line << std::endl;
-		}
+		printPrefixed(_stream, _variant.result, nextIndentLevel);
 		_stream << std::endl;
 		return false;
 	}
@@ -301,11 +291,8 @@ void ASTJSONTest::printSource(std::ostream& _stream, std::string const& _linePre
 	for (auto const& source: m_sources)
 	{
 		if (m_sources.size() > 1 || source.first != "a")
-			_stream << _linePrefix << sourceDelimiter << source.first << " ====" << std::endl << std::endl;
-		std::stringstream stream(source.second);
-		std::string line;
-		while (getline(stream, line))
-			_stream << _linePrefix << line << std::endl;
+			printPrefixed(_stream, sourceDelimiter + source.first + " ====\n", _linePrefix);
+		printPrefixed(_stream, source.second, _linePrefix);
 		_stream << std::endl;
 	}
 }
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index 5d8a694976..73aa780e4d 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -158,11 +158,3 @@ TestCase::TestResult GasTest::run(std::ostream& _stream, std::string const& _lin
 		return TestResult::Failure;
 	}
 }
-
-void GasTest::printSource(std::ostream& _stream, std::string const& _linePrefix, bool) const
-{
-	std::string line;
-	std::istringstream input(m_source);
-	while (getline(input, line))
-		_stream << _linePrefix << line << std::endl;
-}
diff --git a/test/libsolidity/GasTest.h b/test/libsolidity/GasTest.h
index a04976cd53..1337ae3f6f 100644
--- a/test/libsolidity/GasTest.h
+++ b/test/libsolidity/GasTest.h
@@ -41,7 +41,6 @@ class GasTest: AnalysisFramework, public TestCase
 
 	TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
 
-	void printSource(std::ostream &_stream, std::string const &_linePrefix = "", bool _formatted = false) const override;
 	void printUpdatedExpectations(std::ostream& _stream, std::string const& _linePrefix) const override;
 
 protected:
diff --git a/test/libsolidity/NatspecJSONTest.cpp b/test/libsolidity/NatspecJSONTest.cpp
index c8b9369ca9..9f1ba1d7de 100644
--- a/test/libsolidity/NatspecJSONTest.cpp
+++ b/test/libsolidity/NatspecJSONTest.cpp
@@ -100,8 +100,9 @@ void NatspecJSONTest::printExpectedResult(std::ostream& _stream, std::string con
 	if (!m_expectedNatspecJSON.empty())
 	{
 		_stream << _linePrefix << "----" << std::endl;
-		printIndented(_stream, formatNatspecExpectations(m_expectedNatspecJSON), _linePrefix);
+		printPrefixed(_stream, formatNatspecExpectations(m_expectedNatspecJSON), _linePrefix);
 	}
+
 }
 
 void NatspecJSONTest::printObtainedResult(std::ostream& _stream, std::string const& _linePrefix, bool _formatted) const
@@ -114,7 +115,7 @@ void NatspecJSONTest::printObtainedResult(std::ostream& _stream, std::string con
 		_stream << _linePrefix << "----" << std::endl;
 		// TODO: Diff both versions and highlight differences.
 		// We should have a helper for doing that in newly defined test cases without much effort.
-		printIndented(_stream, formatNatspecExpectations(natspecJSON), _linePrefix);
+		printPrefixed(_stream, formatNatspecExpectations(natspecJSON), _linePrefix);
 	}
 }
 
diff --git a/test/libsolidity/SemanticTest.cpp b/test/libsolidity/SemanticTest.cpp
index f59c61ad80..25113b689d 100644
--- a/test/libsolidity/SemanticTest.cpp
+++ b/test/libsolidity/SemanticTest.cpp
@@ -647,11 +647,8 @@ void SemanticTest::printSource(std::ostream& _stream, std::string const& _linePr
 			else
 			{
 				if (outputNames)
-					_stream << _linePrefix << "==== Source: " + name << " ====" << std::endl;
-				std::stringstream stream(source);
-				std::string line;
-				while (getline(stream, line))
-					_stream << _linePrefix << line << std::endl;
+					printPrefixed(_stream, "==== Source: " + name + " ====", _linePrefix);
+				printPrefixed(_stream, source, _linePrefix);
 			}
 		}
 }
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index b50bcb38e5..6d7297c2c7 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -31,6 +31,7 @@
 #include <liblangutil/Scanner.h>
 
 #include <libsolutil/AnsiColorized.h>
+#include <libsolutil/StringUtils.h>
 
 #include <fstream>
 
@@ -86,7 +87,7 @@ TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _line
 	{
 		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
 			<< _linePrefix << "Result after the optimiser:" << endl;
-		printIndented(_stream, printed, _linePrefix + "  ");
+		printPrefixed(_stream, printed, _linePrefix + "  ");
 		return TestResult::FatalError;
 	}
 

From b56e26a50e648388c91f38772ac1c24c17fd02ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 1 Aug 2023 14:53:55 +0200
Subject: [PATCH 1628/1748] Do not leave trailing whitespace on empty lines
 when printing objects

---
 libyul/Object.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libyul/Object.cpp b/libyul/Object.cpp
index 96d60fc77e..0d3d66c8e5 100644
--- a/libyul/Object.cpp
+++ b/libyul/Object.cpp
@@ -72,7 +72,7 @@ std::string Object::toString(
 	for (auto const& obj: subObjects)
 		inner += "\n" + obj->toString(_dialect, _debugInfoSelection, _soliditySourceProvider);
 
-	return useSrcComment + "object \"" + name.str() + "\" {\n" + indent(inner, true /* _indentEmptyLines */) + "\n}";
+	return useSrcComment + "object \"" + name.str() + "\" {\n" + indent(inner) + "\n}";
 }
 
 Json::Value Data::toJson() const

From 211cd24ea8df17578eb06b471eda84147a85d1fc Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 10 Oct 2023 15:26:03 +0200
Subject: [PATCH 1629/1748] Introduce compileViaYul syntax test option

---
 test/libsolidity/SyntaxTest.cpp                             | 6 ++++++
 test/libsolidity/SyntaxTest.h                               | 1 +
 .../syntaxTests/experimental/parsing_stdlib_import_1.sol    | 1 +
 .../syntaxTests/experimental/parsing_stdlib_import_2.sol    | 1 +
 .../syntaxTests/experimental/parsing_stdlib_import_3.sol    | 1 +
 .../syntaxTests/experimental/parsing_stdlib_import_4.sol    | 1 +
 6 files changed, 11 insertions(+)

diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 5cdd22b422..49608244f3 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -45,6 +45,11 @@ SyntaxTest::SyntaxTest(
 	CommonSyntaxTest(_filename, _evmVersion),
 	m_minSeverity(_minSeverity)
 {
+	static std::set<std::string> const compileViaYulAllowedValues{"true", "false"};
+
+	m_compileViaYul = m_reader.stringSetting("compileViaYul", "false");
+	if (!util::contains(compileViaYulAllowedValues, m_compileViaYul))
+		BOOST_THROW_EXCEPTION(std::runtime_error("Invalid compileViaYul value: " + m_compileViaYul + "."));
 	m_optimiseYul = m_reader.boolSetting("optimize-yul", true);
 }
 
@@ -58,6 +63,7 @@ void SyntaxTest::setupCompiler(CompilerStack& _compiler)
 		OptimiserSettings::full() :
 		OptimiserSettings::minimal()
 	);
+	_compiler.setViaIR(m_compileViaYul == "true");
 	_compiler.setMetadataFormat(CompilerStack::MetadataFormat::NoMetadata);
 	_compiler.setMetadataHash(CompilerStack::MetadataHash::None);
 }
diff --git a/test/libsolidity/SyntaxTest.h b/test/libsolidity/SyntaxTest.h
index a3f8f4e5d2..95df3c6cd8 100644
--- a/test/libsolidity/SyntaxTest.h
+++ b/test/libsolidity/SyntaxTest.h
@@ -53,6 +53,7 @@ class SyntaxTest: public AnalysisFramework, public solidity::test::CommonSyntaxT
 	virtual void filterObtainedErrors();
 
 	bool m_optimiseYul{};
+	std::string m_compileViaYul{};
 	langutil::Error::Severity m_minSeverity{};
 };
 
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
index 7a6f791516..f8799de42b 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
@@ -3,6 +3,7 @@ pragma experimental solidity;
 import std.stub;
 // ====
 // EVMVersion: >=constantinople
+// compileViaYul: true
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
index d6662a14a0..f5bcf8efcd 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
@@ -3,6 +3,7 @@ pragma experimental solidity;
 import std.stub as stub;
 // ====
 // EVMVersion: >=constantinople
+// compileViaYul: true
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
index c5f6550aab..4b325ea4ed 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
@@ -3,6 +3,7 @@ pragma experimental solidity;
 import { identity } from std.stub;
 // ====
 // EVMVersion: >=constantinople
+// compileViaYul: true
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
index 5aa043746d..865e59b554 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
+++ b/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
@@ -3,6 +3,7 @@ pragma experimental solidity;
 import * as stub from std.stub;
 // ====
 // EVMVersion: >=constantinople
+// compileViaYul: true
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.

From 963eb1544f757ba84a57debf7e7663402547a210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 6 Oct 2023 17:10:12 +0200
Subject: [PATCH 1630/1748] SourceReferenceFormatter: Expose a function for
 formatting just a message, without other details

---
 liblangutil/SourceReferenceFormatter.cpp | 30 +++++++++++++++++-------
 liblangutil/SourceReferenceFormatter.h   | 16 +++++++++++--
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/liblangutil/SourceReferenceFormatter.cpp b/liblangutil/SourceReferenceFormatter.cpp
index 76cb1df61a..4ce898b6f6 100644
--- a/liblangutil/SourceReferenceFormatter.cpp
+++ b/liblangutil/SourceReferenceFormatter.cpp
@@ -65,7 +65,7 @@ AnsiColorized SourceReferenceFormatter::frameColored() const
 	return AnsiColorized(m_stream, m_colored, {BOLD, BLUE});
 }
 
-AnsiColorized SourceReferenceFormatter::errorColored(Error::Severity _severity) const
+AnsiColorized SourceReferenceFormatter::errorColored(std::ostream& _stream, bool _colored, Error::Severity _severity)
 {
 	// We used to color messages of any severity as errors so this seems like a good default
 	// for cases where severity cannot be determined.
@@ -78,12 +78,12 @@ AnsiColorized SourceReferenceFormatter::errorColored(Error::Severity _severity)
 	case Error::Severity::Info: textColor = WHITE; break;
 	}
 
-	return AnsiColorized(m_stream, m_colored, {BOLD, textColor});
+	return AnsiColorized(_stream, _colored, {BOLD, textColor});
 }
 
-AnsiColorized SourceReferenceFormatter::messageColored() const
+AnsiColorized SourceReferenceFormatter::messageColored(std::ostream& _stream, bool _colored)
 {
-	return AnsiColorized(m_stream, m_colored, {BOLD, WHITE});
+	return AnsiColorized(_stream, _colored, {BOLD, WHITE});
 }
 
 AnsiColorized SourceReferenceFormatter::secondaryColored() const
@@ -175,14 +175,26 @@ void SourceReferenceFormatter::printSourceLocation(SourceReference const& _ref)
 	}
 }
 
-void SourceReferenceFormatter::printExceptionInformation(SourceReferenceExtractor::Message const& _msg)
+void SourceReferenceFormatter::printPrimaryMessage(
+	std::ostream& _stream,
+	std::string _message,
+	std::variant<Error::Type, Error::Severity> _typeOrSeverity,
+	std::optional<ErrorId> _errorId,
+	bool _colored,
+	bool _withErrorIds
+)
 {
-	errorColored(Error::errorSeverityOrType(_msg._typeOrSeverity)) << Error::formatTypeOrSeverity(_msg._typeOrSeverity);
+	errorColored(_stream, _colored, Error::errorSeverityOrType(_typeOrSeverity)) << Error::formatTypeOrSeverity(_typeOrSeverity);
+
+	if (_withErrorIds && _errorId.has_value())
+		errorColored(_stream, _colored, Error::errorSeverityOrType(_typeOrSeverity)) << " (" << _errorId.value().error << ")";
 
-	if (m_withErrorIds && _msg.errorId.has_value())
-		errorColored(Error::errorSeverityOrType(_msg._typeOrSeverity)) << " (" << _msg.errorId.value().error << ")";
+	messageColored(_stream, _colored) << ": " << _message << '\n';
+}
 
-	messageColored() << ": " << _msg.primary.message << '\n';
+void SourceReferenceFormatter::printExceptionInformation(SourceReferenceExtractor::Message const& _msg)
+{
+	printPrimaryMessage(m_stream, _msg.primary.message, _msg._typeOrSeverity, _msg.errorId, m_colored, m_withErrorIds);
 	printSourceLocation(_msg.primary);
 
 	for (auto const& secondary: _msg.secondary)
diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
index 91f1d7ddd0..358a473854 100644
--- a/liblangutil/SourceReferenceFormatter.h
+++ b/liblangutil/SourceReferenceFormatter.h
@@ -118,15 +118,27 @@ class SourceReferenceFormatter
 
 	static std::string formatErrorInformation(Error const& _error, CharStream const& _charStream);
 
+	static void printPrimaryMessage(
+		std::ostream& _stream,
+		std::string _message,
+		std::variant<Error::Type, Error::Severity> _typeOrSeverity,
+		std::optional<ErrorId> _errorId = std::nullopt,
+		bool _colored = false,
+		bool _withErrorIds = false
+	);
+
 private:
 	util::AnsiColorized normalColored() const;
 	util::AnsiColorized frameColored() const;
-	util::AnsiColorized errorColored(langutil::Error::Severity _severity) const;
-	util::AnsiColorized messageColored() const;
+	util::AnsiColorized errorColored(Error::Severity _severity) const { return errorColored(m_stream, m_colored, _severity); }
+	util::AnsiColorized messageColored() const { return messageColored(m_stream, m_colored); }
 	util::AnsiColorized secondaryColored() const;
 	util::AnsiColorized highlightColored() const;
 	util::AnsiColorized diagColored() const;
 
+	static util::AnsiColorized errorColored(std::ostream& _stream, bool _colored, langutil::Error::Severity _severity);
+	static util::AnsiColorized messageColored(std::ostream& _stream, bool _colored);
+
 private:
 	std::ostream& m_stream;
 	CharStreamProvider const& m_charStreamProvider;

From 79af55e04682582c06ce3a24a3f8077ab8db341f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 6 Oct 2023 17:13:44 +0200
Subject: [PATCH 1631/1748] CommandLineInterface: Report all
 errors/infos/warnings with proper severity and coloring

---
 Changelog.md                                  |  1 +
 solc/CommandLineInterface.cpp                 | 29 ++++++++++++++-----
 solc/CommandLineInterface.h                   |  2 ++
 test/cmdlineTests.sh                          |  8 ++---
 .../ast_json_import_wrong_evmVersion/err      |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../linker_mode_invalid_option_optimize/err   |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../linker_mode_output_selection_invalid/err  |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../model_checker_contracts_empty_source/err  |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../model_checker_ext_calls_empty_arg/err     |  2 +-
 .../model_checker_ext_calls_wrong_arg/err     |  2 +-
 .../model_checker_invariants_wrong/err        |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 .../model_checker_solvers_wrong/err           |  2 +-
 .../model_checker_solvers_wrong2/err          |  2 +-
 .../model_checker_targets_error/err           |  2 +-
 .../no_cbor_metadata_with_metadata_hash/err   |  2 +-
 .../err                                       |  2 +-
 .../standard_cli_output_selection_invalid/err |  2 +-
 test/cmdlineTests/standard_file_not_found/err |  2 +-
 .../err                                       |  2 +-
 .../standard_invalid_option_optimize/err      |  2 +-
 .../standard_invalid_option_optimize_runs/err |  2 +-
 .../standard_invalid_option_optimize_yul/err  |  2 +-
 .../err                                       |  2 +-
 test/cmdlineTests/stop_after_parsing_abi/err  |  2 +-
 .../err                                       |  2 +-
 .../strict_asm_invalid_option_output_dir/err  |  2 +-
 .../err                                       |  2 +-
 .../strict_asm_options_in_non_asm_mode/err    |  2 +-
 .../strict_asm_output_selection_invalid/err   |  2 +-
 .../yul_optimizer_steps_disabled/err          |  2 +-
 .../err                                       |  2 +-
 .../yul_optimizer_steps_nesting_too_deep/err  |  2 +-
 .../err                                       |  2 +-
 .../err                                       |  2 +-
 test/cmdlineTests/~unknown_options/test.sh    |  2 +-
 test/solc/CommandLineInterface.cpp            | 10 ++++---
 52 files changed, 82 insertions(+), 62 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 1031a5a4c6..2f58f42ef7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ Language Features:
 
 
 Compiler Features:
+ * Commandline Interface: Use proper severity and coloring also for error messages produced outside of the compilation pipeline.
  * Parser: Remove the experimental error recovery mode (``--error-recovery`` / ``settings.parserErrorRecovery``).
  * Yul Optimizer: If ``PUSH0`` is supported, favor zero literals over storing zero values in variables.
  * Yul Optimizer: Run the ``Rematerializer`` and ``UnusedPruner`` steps at the end of the default clean-up sequence.
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index c729e45916..97bb4f88c2 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -517,7 +517,7 @@ void CommandLineInterface::readInputFiles()
 			if (!m_options.input.ignoreMissingFiles)
 				solThrow(CommandLineValidationError, '"' + infile.string() + "\" is not found.");
 			else
-				serr() << infile << " is not found. Skipping." << std::endl;
+				report(Error::Severity::Info, fmt::format("\"{}\" is not found. Skipping.", infile.string()));
 
 			continue;
 		}
@@ -527,7 +527,7 @@ void CommandLineInterface::readInputFiles()
 			if (!m_options.input.ignoreMissingFiles)
 				solThrow(CommandLineValidationError, '"' + infile.string() + "\" is not a valid file.");
 			else
-				serr() << infile << " is not a valid file. Skipping." << std::endl;
+				report(Error::Severity::Info, fmt::format("\"{}\" is not a valid file. Skipping.", infile.string()));
 
 			continue;
 		}
@@ -639,7 +639,7 @@ bool CommandLineInterface::run(int _argc, char const* const* _argv)
 		// There might be no message in the exception itself if the error output is bulky and has
 		// already been printed to stderr (this happens e.g. for compiler errors).
 		if (_exception.what() != ""s)
-			serr() << _exception.what() << std::endl;
+			report(Error::Severity::Error, _exception.what());
 
 		return false;
 	}
@@ -817,7 +817,7 @@ void CommandLineInterface::compile()
 	{
 		if (_error.type() == Error::Type::DocstringParsingError)
 		{
-			serr() << *boost::get_error_info<errinfo_comment>(_error);
+			report(Error::Severity::Error, *boost::get_error_info<errinfo_comment>(_error));
 			solThrow(CommandLineExecutionError, "Documentation parsing failed.");
 		}
 		else
@@ -1020,7 +1020,10 @@ void CommandLineInterface::link()
 				copy(hexStr.begin(), hexStr.end(), it);
 			}
 			else
-				serr() << "Reference \"" << foundPlaceholder << "\" in file \"" << src.first << "\" still unresolved." << std::endl;
+				report(
+					Error::Severity::Warning,
+					fmt::format("Reference \"{}\" in file \"{}\" still unresolved.", foundPlaceholder, src.first)
+				);
 			it += placeholderSize;
 		}
 		// Remove hints for resolved libraries.
@@ -1136,7 +1139,7 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 			if (object.bytecode)
 				sout() << object.bytecode->toHex() << std::endl;
 			else
-				serr() << "No binary representation found." << std::endl;
+				report(Error::Severity::Info, "No binary representation found.");
 		}
 		if (m_options.compiler.outputs.astCompactJson)
 		{
@@ -1150,7 +1153,7 @@ void CommandLineInterface::assembleYul(yul::YulStack::Language _language, yul::Y
 			if (!object.assembly.empty())
 				sout() << object.assembly << std::endl;
 			else
-				serr() << "No text representation found." << std::endl;
+				report(Error::Severity::Info, "No text representation found.");
 		}
 	}
 }
@@ -1220,4 +1223,16 @@ void CommandLineInterface::outputCompilationResults()
 	}
 }
 
+void CommandLineInterface::report(langutil::Error::Severity _severity, std::string _message)
+{
+	SourceReferenceFormatter::printPrimaryMessage(
+		serr(),
+		_message,
+		_severity,
+		std::nullopt,
+		coloredOutput(m_options),
+		m_options.formatting.withErrorIds
+	);
+}
+
 }
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 5de69270b7..32cc8bbefd 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -136,6 +136,8 @@ class CommandLineInterface
 	/// stream has ever been used unless @arg _markAsUsed is set to false.
 	std::ostream& serr(bool _markAsUsed = true);
 
+	void report(langutil::Error::Severity _severity, std::string _message);
+
 	std::istream& m_sin;
 	std::ostream& m_sout;
 	std::ostream& m_serr;
diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index b02880557c..6e14ac2dfc 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -318,14 +318,14 @@ EOF
 ## RUN
 
 printTask "Testing passing files that are not found..."
-test_solc_behaviour "file_not_found.sol" "" "" "" 1 "" "\"file_not_found.sol\" is not found." "" ""
+test_solc_behaviour "file_not_found.sol" "" "" "" 1 "" "Error: \"file_not_found.sol\" is not found." "" ""
 
 printTask "Testing passing files that are not files..."
-test_solc_behaviour "." "" "" "" 1 "" "\".\" is not a valid file." "" ""
+test_solc_behaviour "." "" "" "" 1 "" "Error: \".\" is not a valid file." "" ""
 
 printTask "Testing passing empty remappings..."
-test_solc_behaviour "${0}" "=/some/remapping/target" "" "" 1 "" "Invalid remapping: \"=/some/remapping/target\"." "" ""
-test_solc_behaviour "${0}" "ctx:=/some/remapping/target" "" "" 1 "" "Invalid remapping: \"ctx:=/some/remapping/target\"." "" ""
+test_solc_behaviour "${0}" "=/some/remapping/target" "" "" 1 "" "Error: Invalid remapping: \"=/some/remapping/target\"." "" ""
+test_solc_behaviour "${0}" "ctx:=/some/remapping/target" "" "" 1 "" "Error: Invalid remapping: \"ctx:=/some/remapping/target\"." "" ""
 
 printTask "Running general commandline tests..."
 (
diff --git a/test/cmdlineTests/ast_json_import_wrong_evmVersion/err b/test/cmdlineTests/ast_json_import_wrong_evmVersion/err
index 1b86e4997d..8fbb021336 100644
--- a/test/cmdlineTests/ast_json_import_wrong_evmVersion/err
+++ b/test/cmdlineTests/ast_json_import_wrong_evmVersion/err
@@ -1 +1 @@
-Failed to import AST: Imported tree evm version differs from configured evm version!
+Error: Failed to import AST: Imported tree evm version differs from configured evm version!
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/err b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/err
index 99ed59cc09..ce13452cc8 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/err
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_all_and_none/err
@@ -1 +1 @@
-Invalid value for --debug-info option: location,all,none
+Error: Invalid value for --debug-info option: location,all,none
diff --git a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/err b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/err
index 4cd94075af..e4abc6129d 100644
--- a/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/err
+++ b/test/cmdlineTests/debug_info_in_yul_and_evm_asm_print_snippet_only/err
@@ -1 +1 @@
-To use 'snippet' with --debug-info you must select also 'location'.
+Error: To use 'snippet' with --debug-info you must select also 'location'.
diff --git a/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/err b/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/err
index 7493f59260..1205089d41 100644
--- a/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/err
+++ b/test/cmdlineTests/linker_mode_invalid_option_no_optimize_yul/err
@@ -1 +1 @@
-Option --no-optimize-yul is only valid in compiler and assembler modes.
+Error: Option --no-optimize-yul is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize/err b/test/cmdlineTests/linker_mode_invalid_option_optimize/err
index 4b86fcfcd7..da724d56a5 100644
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize/err
+++ b/test/cmdlineTests/linker_mode_invalid_option_optimize/err
@@ -1 +1 @@
-Option --optimize is only valid in compiler and assembler modes.
+Error: Option --optimize is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/err b/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/err
index 624b8f62e0..a625ad4989 100644
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/err
+++ b/test/cmdlineTests/linker_mode_invalid_option_optimize_runs/err
@@ -1 +1 @@
-Option --optimize-runs is only valid in compiler and assembler modes.
+Error: Option --optimize-runs is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/err b/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/err
index 5efb6abf8e..6d3a930664 100644
--- a/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/err
+++ b/test/cmdlineTests/linker_mode_invalid_option_optimize_yul/err
@@ -1 +1 @@
-Option --optimize-yul is only valid in compiler and assembler modes.
+Error: Option --optimize-yul is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/err b/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/err
index 779736122c..f0db47ef9d 100644
--- a/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/err
+++ b/test/cmdlineTests/linker_mode_invalid_option_yul_optimizations/err
@@ -1 +1 @@
-Option --yul-optimizations is only valid in compiler and assembler modes.
+Error: Option --yul-optimizations is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/linker_mode_output_selection_invalid/err b/test/cmdlineTests/linker_mode_output_selection_invalid/err
index 614ade61f2..5ca7497883 100644
--- a/test/cmdlineTests/linker_mode_output_selection_invalid/err
+++ b/test/cmdlineTests/linker_mode_output_selection_invalid/err
@@ -1 +1 @@
-The following outputs are not supported in linker mode: --abi, --asm, --asm-json, --bin, --bin-runtime, --devdoc, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
+Error: The following outputs are not supported in linker mode: --abi, --asm, --asm-json, --bin, --bin-runtime, --devdoc, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/err b/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/err
index 973e9e06ee..9d4ca2c185 100644
--- a/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/err
+++ b/test/cmdlineTests/linking_strict_assembly_duplicate_library_name/err
@@ -1 +1 @@
-Address specified more than once for library "library.sol:L".
+Error: Address specified more than once for library "library.sol:L".
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err
index 0f0fbaf8b2..fb8800438a 100644
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations_invalid_arg/err
@@ -1 +1 @@
-the argument ('bmc') for option '--model-checker-bmc-loop-iterations' is invalid
\ No newline at end of file
+Error: the argument ('bmc') for option '--model-checker-bmc-loop-iterations' is invalid
diff --git a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err
index 9b59a4eb87..1bd45b6c6f 100644
--- a/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err
+++ b/test/cmdlineTests/model_checker_bmc_loop_iterations_no_argument/err
@@ -1 +1 @@
-the argument ('model_checker_bmc_loop_iterations_no_argument/input.sol') for option '--model-checker-bmc-loop-iterations' is invalid
+Error: the argument ('model_checker_bmc_loop_iterations_no_argument/input.sol') for option '--model-checker-bmc-loop-iterations' is invalid
diff --git a/test/cmdlineTests/model_checker_contracts_contract_missing/err b/test/cmdlineTests/model_checker_contracts_contract_missing/err
index 6180662712..08587a8121 100644
--- a/test/cmdlineTests/model_checker_contracts_contract_missing/err
+++ b/test/cmdlineTests/model_checker_contracts_contract_missing/err
@@ -1 +1 @@
-Invalid option for --model-checker-contracts: model_checker_contracts_inexistent_contract/input.sol:
+Error: Invalid option for --model-checker-contracts: model_checker_contracts_inexistent_contract/input.sol:
diff --git a/test/cmdlineTests/model_checker_contracts_empty_contract/err b/test/cmdlineTests/model_checker_contracts_empty_contract/err
index c60f5a3960..2d6a65028e 100644
--- a/test/cmdlineTests/model_checker_contracts_empty_contract/err
+++ b/test/cmdlineTests/model_checker_contracts_empty_contract/err
@@ -1 +1 @@
-Invalid option for --model-checker-contracts: a.sol:
+Error: Invalid option for --model-checker-contracts: a.sol:
diff --git a/test/cmdlineTests/model_checker_contracts_empty_source/err b/test/cmdlineTests/model_checker_contracts_empty_source/err
index 33a1b92985..8357fbd89d 100644
--- a/test/cmdlineTests/model_checker_contracts_empty_source/err
+++ b/test/cmdlineTests/model_checker_contracts_empty_source/err
@@ -1 +1 @@
-Invalid option for --model-checker-contracts: :A
+Error: Invalid option for --model-checker-contracts: :A
diff --git a/test/cmdlineTests/model_checker_contracts_one_contract_missing/err b/test/cmdlineTests/model_checker_contracts_one_contract_missing/err
index 545f74d7de..d4e93bcd70 100644
--- a/test/cmdlineTests/model_checker_contracts_one_contract_missing/err
+++ b/test/cmdlineTests/model_checker_contracts_one_contract_missing/err
@@ -1 +1 @@
-Invalid option for --model-checker-contracts: model_checker_contracts_all_explicit/input.sol:,model_checker_contracts_all_explicit/input.sol:A
+Error: Invalid option for --model-checker-contracts: model_checker_contracts_all_explicit/input.sol:,model_checker_contracts_all_explicit/input.sol:A
diff --git a/test/cmdlineTests/model_checker_contracts_source_missing/err b/test/cmdlineTests/model_checker_contracts_source_missing/err
index ee3d70c505..a6baa3efd1 100644
--- a/test/cmdlineTests/model_checker_contracts_source_missing/err
+++ b/test/cmdlineTests/model_checker_contracts_source_missing/err
@@ -1 +1 @@
-Invalid option for --model-checker-contracts: :C
+Error: Invalid option for --model-checker-contracts: :C
diff --git a/test/cmdlineTests/model_checker_ext_calls_empty_arg/err b/test/cmdlineTests/model_checker_ext_calls_empty_arg/err
index 7d7481c80e..e530a206ac 100644
--- a/test/cmdlineTests/model_checker_ext_calls_empty_arg/err
+++ b/test/cmdlineTests/model_checker_ext_calls_empty_arg/err
@@ -1 +1 @@
-No input files given. If you wish to use the standard input please specify "-" explicitly.
+Error: No input files given. If you wish to use the standard input please specify "-" explicitly.
diff --git a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/err b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/err
index 746a0b5252..ec664c2843 100644
--- a/test/cmdlineTests/model_checker_ext_calls_wrong_arg/err
+++ b/test/cmdlineTests/model_checker_ext_calls_wrong_arg/err
@@ -1 +1 @@
-Invalid option for --model-checker-ext-calls: what
+Error: Invalid option for --model-checker-ext-calls: what
diff --git a/test/cmdlineTests/model_checker_invariants_wrong/err b/test/cmdlineTests/model_checker_invariants_wrong/err
index 1dc94780db..a9ed1d3751 100644
--- a/test/cmdlineTests/model_checker_invariants_wrong/err
+++ b/test/cmdlineTests/model_checker_invariants_wrong/err
@@ -1 +1 @@
-Invalid option for --model-checker-invariants: what
+Error: Invalid option for --model-checker-invariants: what
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err
index db94bc9ba5..1e22964461 100644
--- a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err
+++ b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_bmc/err
@@ -1 +1 @@
-Only SMTLib2 solver can be enabled to print queries
+Error: Only SMTLib2 solver can be enabled to print queries
diff --git a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err
index db94bc9ba5..1e22964461 100644
--- a/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err
+++ b/test/cmdlineTests/model_checker_print_query_no_smtlib2_solver_chc/err
@@ -1 +1 @@
-Only SMTLib2 solver can be enabled to print queries
+Error: Only SMTLib2 solver can be enabled to print queries
diff --git a/test/cmdlineTests/model_checker_print_query_superflous_solver/err b/test/cmdlineTests/model_checker_print_query_superflous_solver/err
index db94bc9ba5..1e22964461 100644
--- a/test/cmdlineTests/model_checker_print_query_superflous_solver/err
+++ b/test/cmdlineTests/model_checker_print_query_superflous_solver/err
@@ -1 +1 @@
-Only SMTLib2 solver can be enabled to print queries
+Error: Only SMTLib2 solver can be enabled to print queries
diff --git a/test/cmdlineTests/model_checker_solvers_wrong/err b/test/cmdlineTests/model_checker_solvers_wrong/err
index bf2df0a704..3493055ac8 100644
--- a/test/cmdlineTests/model_checker_solvers_wrong/err
+++ b/test/cmdlineTests/model_checker_solvers_wrong/err
@@ -1 +1 @@
-Invalid option for --model-checker-solvers: ultraSolver
+Error: Invalid option for --model-checker-solvers: ultraSolver
diff --git a/test/cmdlineTests/model_checker_solvers_wrong2/err b/test/cmdlineTests/model_checker_solvers_wrong2/err
index 1bdd530688..a3f1210853 100644
--- a/test/cmdlineTests/model_checker_solvers_wrong2/err
+++ b/test/cmdlineTests/model_checker_solvers_wrong2/err
@@ -1 +1 @@
-"smtlib2" is not found.
+Error: "smtlib2" is not found.
diff --git a/test/cmdlineTests/model_checker_targets_error/err b/test/cmdlineTests/model_checker_targets_error/err
index 3663543f23..63fa000a7d 100644
--- a/test/cmdlineTests/model_checker_targets_error/err
+++ b/test/cmdlineTests/model_checker_targets_error/err
@@ -1 +1 @@
-Invalid option for --model-checker-targets: aaa,bbb
+Error: Invalid option for --model-checker-targets: aaa,bbb
diff --git a/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/err b/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/err
index e1b8c7d356..fc5787c562 100644
--- a/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/err
+++ b/test/cmdlineTests/no_cbor_metadata_with_metadata_hash/err
@@ -1 +1 @@
-Cannot specify a metadata hashing method when --no-cbor-metadata is set.
+Error: Cannot specify a metadata hashing method when --no-cbor-metadata is set.
diff --git a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err
index 43c54c2f39..b8fc39145e 100644
--- a/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err
+++ b/test/cmdlineTests/optimizer_enabled_invalid_yul_optimizer_enabled_and_disabled/err
@@ -1 +1 @@
-Options --optimize-yul and --no-optimize-yul cannot be used together.
+Error: Options --optimize-yul and --no-optimize-yul cannot be used together.
diff --git a/test/cmdlineTests/standard_cli_output_selection_invalid/err b/test/cmdlineTests/standard_cli_output_selection_invalid/err
index ead9822556..cdbcdd1585 100644
--- a/test/cmdlineTests/standard_cli_output_selection_invalid/err
+++ b/test/cmdlineTests/standard_cli_output_selection_invalid/err
@@ -1 +1 @@
-The following outputs are not supported in standard JSON mode: --abi, --asm, --asm-json, --ast-compact-json, --bin, --bin-runtime, --devdoc, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
+Error: The following outputs are not supported in standard JSON mode: --abi, --asm, --asm-json, --ast-compact-json, --bin, --bin-runtime, --devdoc, --hashes, --ir, --ir-optimized, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/standard_file_not_found/err b/test/cmdlineTests/standard_file_not_found/err
index db5590ed97..2ae0ecf4b2 100644
--- a/test/cmdlineTests/standard_file_not_found/err
+++ b/test/cmdlineTests/standard_file_not_found/err
@@ -1 +1 @@
-"input.sol" is not found.
+Error: "input.sol" is not found.
diff --git a/test/cmdlineTests/standard_invalid_option_no_optimize_yul/err b/test/cmdlineTests/standard_invalid_option_no_optimize_yul/err
index 7493f59260..1205089d41 100644
--- a/test/cmdlineTests/standard_invalid_option_no_optimize_yul/err
+++ b/test/cmdlineTests/standard_invalid_option_no_optimize_yul/err
@@ -1 +1 @@
-Option --no-optimize-yul is only valid in compiler and assembler modes.
+Error: Option --no-optimize-yul is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/standard_invalid_option_optimize/err b/test/cmdlineTests/standard_invalid_option_optimize/err
index 4b86fcfcd7..da724d56a5 100644
--- a/test/cmdlineTests/standard_invalid_option_optimize/err
+++ b/test/cmdlineTests/standard_invalid_option_optimize/err
@@ -1 +1 @@
-Option --optimize is only valid in compiler and assembler modes.
+Error: Option --optimize is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/standard_invalid_option_optimize_runs/err b/test/cmdlineTests/standard_invalid_option_optimize_runs/err
index 624b8f62e0..a625ad4989 100644
--- a/test/cmdlineTests/standard_invalid_option_optimize_runs/err
+++ b/test/cmdlineTests/standard_invalid_option_optimize_runs/err
@@ -1 +1 @@
-Option --optimize-runs is only valid in compiler and assembler modes.
+Error: Option --optimize-runs is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/standard_invalid_option_optimize_yul/err b/test/cmdlineTests/standard_invalid_option_optimize_yul/err
index 5efb6abf8e..6d3a930664 100644
--- a/test/cmdlineTests/standard_invalid_option_optimize_yul/err
+++ b/test/cmdlineTests/standard_invalid_option_optimize_yul/err
@@ -1 +1 @@
-Option --optimize-yul is only valid in compiler and assembler modes.
+Error: Option --optimize-yul is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/standard_invalid_option_yul_optimizations/err b/test/cmdlineTests/standard_invalid_option_yul_optimizations/err
index 779736122c..f0db47ef9d 100644
--- a/test/cmdlineTests/standard_invalid_option_yul_optimizations/err
+++ b/test/cmdlineTests/standard_invalid_option_yul_optimizations/err
@@ -1 +1 @@
-Option --yul-optimizations is only valid in compiler and assembler modes.
+Error: Option --yul-optimizations is only valid in compiler and assembler modes.
diff --git a/test/cmdlineTests/stop_after_parsing_abi/err b/test/cmdlineTests/stop_after_parsing_abi/err
index 9beceafe7b..ae3fb5d0ac 100644
--- a/test/cmdlineTests/stop_after_parsing_abi/err
+++ b/test/cmdlineTests/stop_after_parsing_abi/err
@@ -1 +1 @@
-The following options are mutually exclusive: --stop-after, --abi. Select at most one.
+Error: The following options are mutually exclusive: --stop-after, --abi. Select at most one.
diff --git a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/err b/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/err
index 4cd94075af..e4abc6129d 100644
--- a/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/err
+++ b/test/cmdlineTests/strict_asm_debug_info_print_snippet_only/err
@@ -1 +1 @@
-To use 'snippet' with --debug-info you must select also 'location'.
+Error: To use 'snippet' with --debug-info you must select also 'location'.
diff --git a/test/cmdlineTests/strict_asm_invalid_option_output_dir/err b/test/cmdlineTests/strict_asm_invalid_option_output_dir/err
index 738a37b295..2aa3fd766d 100644
--- a/test/cmdlineTests/strict_asm_invalid_option_output_dir/err
+++ b/test/cmdlineTests/strict_asm_invalid_option_output_dir/err
@@ -1 +1 @@
-The following options are invalid in assembly mode: --output-dir.
+Error: The following options are invalid in assembly mode: --output-dir.
diff --git a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
index 43c54c2f39..b8fc39145e 100644
--- a/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
+++ b/test/cmdlineTests/strict_asm_optimizer_invalid_yul_optimizer_enabled_and_disabled/err
@@ -1 +1 @@
-Options --optimize-yul and --no-optimize-yul cannot be used together.
+Error: Options --optimize-yul and --no-optimize-yul cannot be used together.
diff --git a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/err b/test/cmdlineTests/strict_asm_options_in_non_asm_mode/err
index 6d67f2b5bf..dd58c6e869 100644
--- a/test/cmdlineTests/strict_asm_options_in_non_asm_mode/err
+++ b/test/cmdlineTests/strict_asm_options_in_non_asm_mode/err
@@ -1 +1 @@
---yul-dialect and --machine are only valid in assembly mode.
+Error: --yul-dialect and --machine are only valid in assembly mode.
diff --git a/test/cmdlineTests/strict_asm_output_selection_invalid/err b/test/cmdlineTests/strict_asm_output_selection_invalid/err
index 9c91044829..81d6eff8ae 100644
--- a/test/cmdlineTests/strict_asm_output_selection_invalid/err
+++ b/test/cmdlineTests/strict_asm_output_selection_invalid/err
@@ -1 +1 @@
-The following outputs are not supported in assembler mode: --abi, --asm-json, --bin-runtime, --devdoc, --hashes, --ir, --metadata, --opcodes, --storage-layout, --userdoc.
+Error: The following outputs are not supported in assembler mode: --abi, --asm-json, --bin-runtime, --devdoc, --hashes, --ir, --metadata, --opcodes, --storage-layout, --userdoc.
diff --git a/test/cmdlineTests/yul_optimizer_steps_disabled/err b/test/cmdlineTests/yul_optimizer_steps_disabled/err
index ab77d4e1c1..a557351ea2 100644
--- a/test/cmdlineTests/yul_optimizer_steps_disabled/err
+++ b/test/cmdlineTests/yul_optimizer_steps_disabled/err
@@ -1 +1 @@
---yul-optimizations is invalid if Yul optimizer is disabled
+Error: --yul-optimizations is invalid if Yul optimizer is disabled
diff --git a/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/err b/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/err
index b66c6c60f8..49669b1f67 100644
--- a/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/err
+++ b/test/cmdlineTests/yul_optimizer_steps_invalid_abbreviation/err
@@ -1 +1 @@
-Invalid optimizer step sequence in --yul-optimizations: 'b' is not a valid step abbreviation
+Error: Invalid optimizer step sequence in --yul-optimizations: 'b' is not a valid step abbreviation
diff --git a/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/err b/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/err
index c8dc9697e5..a28e8cff18 100644
--- a/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/err
+++ b/test/cmdlineTests/yul_optimizer_steps_nesting_too_deep/err
@@ -1 +1 @@
-Invalid optimizer step sequence in --yul-optimizations: Brackets nested too deep
+Error: Invalid optimizer step sequence in --yul-optimizations: Brackets nested too deep
diff --git a/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/err b/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/err
index 1da42b7430..dda1e8c144 100644
--- a/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/err
+++ b/test/cmdlineTests/yul_optimizer_steps_unbalanced_closing_bracket/err
@@ -1 +1 @@
-Invalid optimizer step sequence in --yul-optimizations: Unbalanced brackets
+Error: Invalid optimizer step sequence in --yul-optimizations: Unbalanced brackets
diff --git a/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/err b/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/err
index 1da42b7430..dda1e8c144 100644
--- a/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/err
+++ b/test/cmdlineTests/yul_optimizer_steps_unbalanced_opening_bracket/err
@@ -1 +1 @@
-Invalid optimizer step sequence in --yul-optimizations: Unbalanced brackets
+Error: Invalid optimizer step sequence in --yul-optimizations: Unbalanced brackets
diff --git a/test/cmdlineTests/~unknown_options/test.sh b/test/cmdlineTests/~unknown_options/test.sh
index 923a36be60..373a849d28 100755
--- a/test/cmdlineTests/~unknown_options/test.sh
+++ b/test/cmdlineTests/~unknown_options/test.sh
@@ -9,7 +9,7 @@ output=$("$SOLC" --allow=test 2>&1)
 failed=$?
 set -e
 
-if [[ $output != "unrecognised option '--allow=test'" ]] || (( failed == 0 ))
+if [[ $output != "Error: unrecognised option '--allow=test'" ]] || (( failed == 0 ))
 then
     fail "Incorrect response to unknown options: $output"
 fi
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 7732faf380..9116f7ae66 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -241,9 +241,10 @@ BOOST_AUTO_TEST_CASE(cli_ignore_missing_some_files_exist)
 		(tempDir1.path() / "input1.sol").string(),
 		(tempDir2.path() / "input2.sol").string(),
 		"--ignore-missing",
+		"--no-color",
 	});
 	BOOST_TEST(result.success);
-	BOOST_TEST(result.stderrContent == "\"" + (tempDir2.path() / "input2.sol").string() + "\" is not found. Skipping.\n");
+	BOOST_TEST(result.stderrContent == "Info: \"" + (tempDir2.path() / "input2.sol").string() + "\" is not found. Skipping.\n");
 	BOOST_TEST(result.options.input.mode == InputMode::Compiler);
 	BOOST_TEST(!result.options.input.addStdin);
 	BOOST_CHECK_EQUAL(result.reader.sourceUnits(), expectedSources);
@@ -255,15 +256,16 @@ BOOST_AUTO_TEST_CASE(cli_ignore_missing_no_files_exist)
 	TemporaryDirectory tempDir(TEST_CASE_NAME);
 
 	string expectedMessage =
-		"\"" + (tempDir.path() / "input1.sol").string() + "\" is not found. Skipping.\n"
-		"\"" + (tempDir.path() / "input2.sol").string() + "\" is not found. Skipping.\n"
-		"All specified input files either do not exist or are not regular files.\n";
+		"Info: \"" + (tempDir.path() / "input1.sol").string() + "\" is not found. Skipping.\n"
+		"Info: \"" + (tempDir.path() / "input2.sol").string() + "\" is not found. Skipping.\n"
+		"Error: All specified input files either do not exist or are not regular files.\n";
 
 	OptionsReaderAndMessages result = runCLI({
 		"solc",
 		(tempDir.path() / "input1.sol").string(),
 		(tempDir.path() / "input2.sol").string(),
 		"--ignore-missing",
+		"--no-color",
 	});
 	BOOST_TEST(!result.success);
 	BOOST_TEST(result.stderrContent == expectedMessage);

From 42770fca1685ed6e884c1d5377c7f677a7f789e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 10 Oct 2023 13:08:42 +0200
Subject: [PATCH 1632/1748] CommandLineParser: Don't assume clear internal
 state before parsing

---
 solc/CommandLineParser.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 53f481ae84..ee0f1c98da 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -896,6 +896,9 @@ void CommandLineParser::parseArgs(int _argc, char const* const* _argv)
 	po::options_description allOptions = optionsDescription();
 	po::positional_options_description filesPositions = positionalOptionsDescription();
 
+	m_options = {};
+	m_args = {};
+
 	// parse the compiler arguments
 	try
 	{

From fa43d1e4e5e70f94742fcca7bf2d4a9e0d88da8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 10 Oct 2023 13:48:09 +0200
Subject: [PATCH 1633/1748] Try harder to respect --color/--no-color in
 presence of errors and assume --no-color when in doubt

---
 solc/CommandLineInterface.cpp | 14 +++++++++++++-
 solc/CommandLineParser.cpp    | 10 +++++-----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 97bb4f88c2..7b8763c5a4 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -658,7 +658,19 @@ bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
 		return false;
 	}
 
-	parser.parse(_argc, _argv);
+	try
+	{
+		parser.parse(_argc, _argv);
+	}
+	catch (...)
+	{
+		// Even if the overall CLI parsing fails, the --color/--no-color options may have been
+		// successfully parsed, and if so, should be taken into account when printing errors.
+		// If no value is present, it's possible that --no-color is still there but parsing failed
+		// due to other, unrecognized options so play it safe and disable color in that case.
+		m_options.formatting.coloredOutput = parser.options().formatting.coloredOutput.value_or(false);
+		throw;
+	}
 	m_options = parser.options();
 
 	return true;
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index ee0f1c98da..2ab0f45b21 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -917,6 +917,11 @@ void CommandLineParser::parseArgs(int _argc, char const* const* _argv)
 
 void CommandLineParser::processArgs()
 {
+	if (m_args.count(g_strColor) > 0)
+		m_options.formatting.coloredOutput = true;
+	else if (m_args.count(g_strNoColor) > 0)
+		m_options.formatting.coloredOutput = false;
+
 	checkMutuallyExclusive({
 		g_strHelp,
 		g_strLicense,
@@ -1031,11 +1036,6 @@ void CommandLineParser::processArgs()
 			);
 	}
 
-	if (m_args.count(g_strColor) > 0)
-		m_options.formatting.coloredOutput = true;
-	else if (m_args.count(g_strNoColor) > 0)
-		m_options.formatting.coloredOutput = false;
-
 	m_options.formatting.withErrorIds = m_args.count(g_strErrorIds);
 
 	if (m_args.count(g_strRevertStrings))

From 23b7505afd8dbb6b68da8a1db46fb24d1b973b45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 10 Oct 2023 13:49:44 +0200
Subject: [PATCH 1634/1748] CommandLineParser: Don't color the error message
 printed when --color and --no-color are used at the same time

---
 solc/CommandLineParser.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 2ab0f45b21..23ceb001cc 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -917,10 +917,10 @@ void CommandLineParser::parseArgs(int _argc, char const* const* _argv)
 
 void CommandLineParser::processArgs()
 {
-	if (m_args.count(g_strColor) > 0)
-		m_options.formatting.coloredOutput = true;
-	else if (m_args.count(g_strNoColor) > 0)
+	if (m_args.count(g_strNoColor) > 0)
 		m_options.formatting.coloredOutput = false;
+	else if (m_args.count(g_strColor) > 0)
+		m_options.formatting.coloredOutput = true;
 
 	checkMutuallyExclusive({
 		g_strHelp,

From db98eed5c2079d240100093c9da8c0c7f2442113 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 13 Oct 2023 10:07:43 +0200
Subject: [PATCH 1635/1748] Introduce --no-import-callback CLI option

Add tests

Add docs
---
 Changelog.md                                  |  1 +
 docs/path-resolution.rst                      |  5 ++--
 libsolidity/interface/UniversalCallback.h     | 11 +++++---
 solc/CommandLineInterface.cpp                 |  3 +++
 solc/CommandLineInterface.h                   |  2 +-
 solc/CommandLineParser.cpp                    | 12 +++++++++
 solc/CommandLineParser.h                      |  1 +
 test/cmdlineTests/no_import_callback/args     |  1 +
 .../no_import_callback/contract_1.sol         |  4 +++
 .../no_import_callback/contract_2.sol         |  0
 test/cmdlineTests/no_import_callback/err      |  5 ++++
 test/cmdlineTests/no_import_callback/exit     |  1 +
 .../standard_no_import_callback/B.sol         |  2 ++
 .../standard_no_import_callback/args          |  1 +
 .../standard_no_import_callback/input.json    |  8 ++++++
 .../standard_no_import_callback/output.json   | 26 +++++++++++++++++++
 test/solc/CommandLineInterface.cpp            | 19 ++++++++++++++
 test/solc/CommandLineParser.cpp               | 19 ++++++++++++++
 18 files changed, 115 insertions(+), 6 deletions(-)
 create mode 100644 test/cmdlineTests/no_import_callback/args
 create mode 100644 test/cmdlineTests/no_import_callback/contract_1.sol
 create mode 100644 test/cmdlineTests/no_import_callback/contract_2.sol
 create mode 100644 test/cmdlineTests/no_import_callback/err
 create mode 100644 test/cmdlineTests/no_import_callback/exit
 create mode 100644 test/cmdlineTests/standard_no_import_callback/B.sol
 create mode 100644 test/cmdlineTests/standard_no_import_callback/args
 create mode 100644 test/cmdlineTests/standard_no_import_callback/input.json
 create mode 100644 test/cmdlineTests/standard_no_import_callback/output.json

diff --git a/Changelog.md b/Changelog.md
index 2f58f42ef7..57175dcc79 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ Language Features:
 
 
 Compiler Features:
+ * Commandline Interface: Add ``--no-import-callback`` option that prevents the compiler from loading source files not given explicitly on the CLI or in Standard JSON input.
  * Commandline Interface: Use proper severity and coloring also for error messages produced outside of the compilation pipeline.
  * Parser: Remove the experimental error recovery mode (``--error-recovery`` / ``settings.parserErrorRecovery``).
  * Yul Optimizer: If ``PUSH0`` is supported, favor zero literals over storing zero values in variables.
diff --git a/docs/path-resolution.rst b/docs/path-resolution.rst
index 1c5a39516f..666d9b8dc9 100644
--- a/docs/path-resolution.rst
+++ b/docs/path-resolution.rst
@@ -21,7 +21,7 @@ source unit is assigned a unique *source unit name* which is an opaque and unstr
 When you use the :ref:`import statement <import>`, you specify an *import path* that references a
 source unit name.
 
-.. index:: ! import callback, ! Host Filesystem Loader
+.. index:: ! import callback, ! Host Filesystem Loader, ! --no-import-callback
 .. _import-callback:
 
 Import Callback
@@ -36,8 +36,9 @@ An import callback is free to interpret source unit names in an arbitrary way, n
 If there is no callback available when one is needed or if it fails to locate the source code,
 compilation fails.
 
-The command-line compiler provides the *Host Filesystem Loader* - a rudimentary callback
+By default, the command-line compiler provides the *Host Filesystem Loader* - a rudimentary callback
 that interprets a source unit name as a path in the local filesystem.
+This callback can be disabled using the ``--no-import-callback`` command-line option.
 The `JavaScript interface <https://github.com/ethereum/solc-js>`_ does not provide any by default,
 but one can be provided by the user.
 This mechanism can be used to obtain source code from locations other then the local filesystem
diff --git a/libsolidity/interface/UniversalCallback.h b/libsolidity/interface/UniversalCallback.h
index 1c7888f397..3fe74c65e4 100644
--- a/libsolidity/interface/UniversalCallback.h
+++ b/libsolidity/interface/UniversalCallback.h
@@ -29,7 +29,7 @@ namespace solidity::frontend
 class UniversalCallback
 {
 public:
-	UniversalCallback(FileReader&  _fileReader, SMTSolverCommand& _solver) :
+	UniversalCallback(FileReader* _fileReader, SMTSolverCommand& _solver) :
 		m_fileReader{_fileReader},
 		m_solver{_solver}
 	{}
@@ -38,15 +38,20 @@ class UniversalCallback
 	{
 		return [this](std::string const& _kind, std::string const& _data) -> ReadCallback::Result {
 			if (_kind == ReadCallback::kindString(ReadCallback::Kind::ReadFile))
-				return m_fileReader.readFile(_kind, _data);
+				if (!m_fileReader)
+					return ReadCallback::Result{false, "No import callback."};
+				else
+					return m_fileReader->readFile(_kind, _data);
 			else if (_kind == ReadCallback::kindString(ReadCallback::Kind::SMTQuery))
 				return m_solver.solve(_kind, _data);
 			solAssert(false, "Unknown callback kind.");
 		};
 	}
 
+	void resetImportCallback() { m_fileReader = nullptr; }
+
 private:
-	FileReader& m_fileReader;
+	FileReader* m_fileReader;
 	SMTSolverCommand& m_solver;
 };
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 7b8763c5a4..218f89f02e 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -464,6 +464,9 @@ void CommandLineInterface::readInputFiles()
 {
 	solAssert(!m_standardJsonInput.has_value());
 
+	if (m_options.input.noImportCallback)
+		m_universalCallback.resetImportCallback();
+
 	static std::set<frontend::InputMode> const noInputFiles{
 		frontend::InputMode::Help,
 		frontend::InputMode::License,
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 32cc8bbefd..f08eea662a 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -144,7 +144,7 @@ class CommandLineInterface
 	bool m_hasOutput = false;
 	FileReader m_fileReader;
 	SMTSolverCommand m_solverCommand{"eld"};
-	UniversalCallback m_universalCallback{m_fileReader, m_solverCommand};
+	UniversalCallback m_universalCallback{&m_fileReader, m_solverCommand};
 	std::optional<std::string> m_standardJsonInput;
 	std::unique_ptr<frontend::CompilerStack> m_compiler;
 	CommandLineOptions m_options;
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 23ceb001cc..c21659a9bc 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -78,6 +78,7 @@ static std::string const g_strModelCheckerTimeout = "model-checker-timeout";
 static std::string const g_strModelCheckerBMCLoopIterations = "model-checker-bmc-loop-iterations";
 static std::string const g_strNone = "none";
 static std::string const g_strNoOptimizeYul = "no-optimize-yul";
+static std::string const g_strNoImportCallback = "no-import-callback";
 static std::string const g_strOptimize = "optimize";
 static std::string const g_strOptimizeRuns = "optimize-runs";
 static std::string const g_strOptimizeYul = "optimize-yul";
@@ -224,6 +225,7 @@ bool CommandLineOptions::operator==(CommandLineOptions const& _other) const noex
 		input.includePaths == _other.input.includePaths &&
 		input.allowedDirectories == _other.input.allowedDirectories &&
 		input.ignoreMissingFiles == _other.input.ignoreMissingFiles &&
+		input.noImportCallback == _other.input.noImportCallback &&
 		output.dir == _other.output.dir &&
 		output.overwriteFiles == _other.output.overwriteFiles &&
 		output.evmVersion == _other.output.evmVersion &&
@@ -567,6 +569,11 @@ General Information)").c_str(),
 			g_strIgnoreMissingFiles.c_str(),
 			"Ignore missing files."
 		)
+		(
+			g_strNoImportCallback.c_str(),
+			"Disable the default import callback to prevent the compiler from loading any source "
+			"files not listed on the command line or given in the Standard JSON input."
+		)
 	;
 	desc.add(inputOptions);
 
@@ -1104,6 +1111,11 @@ void CommandLineParser::processArgs()
 		}
 	}
 
+	checkMutuallyExclusive({g_strNoImportCallback, g_strAllowPaths});
+
+	if (m_args.count(g_strNoImportCallback))
+		m_options.input.noImportCallback = true;
+
 	if (m_args.count(g_strAllowPaths))
 	{
 		std::vector<std::string> paths;
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index 33cb7bb094..cad84871e0 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -174,6 +174,7 @@ struct CommandLineOptions
 		std::vector<boost::filesystem::path> includePaths;
 		FileReader::FileSystemPathSet allowedDirectories;
 		bool ignoreMissingFiles = false;
+		bool noImportCallback = false;
 	} input;
 
 	struct
diff --git a/test/cmdlineTests/no_import_callback/args b/test/cmdlineTests/no_import_callback/args
new file mode 100644
index 0000000000..e816120d0d
--- /dev/null
+++ b/test/cmdlineTests/no_import_callback/args
@@ -0,0 +1 @@
+--no-import-callback no_import_callback/contract_1.sol
diff --git a/test/cmdlineTests/no_import_callback/contract_1.sol b/test/cmdlineTests/no_import_callback/contract_1.sol
new file mode 100644
index 0000000000..36b2470cd3
--- /dev/null
+++ b/test/cmdlineTests/no_import_callback/contract_1.sol
@@ -0,0 +1,4 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+import "contract_2.sol";
diff --git a/test/cmdlineTests/no_import_callback/contract_2.sol b/test/cmdlineTests/no_import_callback/contract_2.sol
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/test/cmdlineTests/no_import_callback/err b/test/cmdlineTests/no_import_callback/err
new file mode 100644
index 0000000000..45690e34c8
--- /dev/null
+++ b/test/cmdlineTests/no_import_callback/err
@@ -0,0 +1,5 @@
+Error: Source "contract_2.sol" not found: No import callback.
+ --> no_import_callback/contract_1.sol:4:1:
+  |
+4 | import "contract_2.sol";
+  | ^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/test/cmdlineTests/no_import_callback/exit b/test/cmdlineTests/no_import_callback/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/no_import_callback/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/standard_no_import_callback/B.sol b/test/cmdlineTests/standard_no_import_callback/B.sol
new file mode 100644
index 0000000000..4bf9ea143b
--- /dev/null
+++ b/test/cmdlineTests/standard_no_import_callback/B.sol
@@ -0,0 +1,2 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
diff --git a/test/cmdlineTests/standard_no_import_callback/args b/test/cmdlineTests/standard_no_import_callback/args
new file mode 100644
index 0000000000..b8edaa4247
--- /dev/null
+++ b/test/cmdlineTests/standard_no_import_callback/args
@@ -0,0 +1 @@
+--no-import-callback
diff --git a/test/cmdlineTests/standard_no_import_callback/input.json b/test/cmdlineTests/standard_no_import_callback/input.json
new file mode 100644
index 0000000000..229b5fb379
--- /dev/null
+++ b/test/cmdlineTests/standard_no_import_callback/input.json
@@ -0,0 +1,8 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {
+            "content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity >=0.0; import 'standard_no_import_callback/B.sol';"
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_no_import_callback/output.json b/test/cmdlineTests/standard_no_import_callback/output.json
new file mode 100644
index 0000000000..a4e2d8d3a2
--- /dev/null
+++ b/test/cmdlineTests/standard_no_import_callback/output.json
@@ -0,0 +1,26 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "errorCode": "6275",
+            "formattedMessage": "ParserError: Source \"standard_no_import_callback/B.sol\" not found: No import callback.
+ --> A:2:24:
+  |
+2 | pragma solidity >=0.0; import 'standard_no_import_callback/B.sol';
+  |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+",
+            "message": "Source \"standard_no_import_callback/B.sol\" not found: No import callback.",
+            "severity": "error",
+            "sourceLocation":
+            {
+                "end": 102,
+                "file": "A",
+                "start": 59
+            },
+            "type": "ParserError"
+        }
+    ],
+    "sources": {}
+}
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 9116f7ae66..6a976df42a 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -175,6 +175,25 @@ BOOST_AUTO_TEST_CASE(multiple_input_modes)
 				);
 }
 
+BOOST_AUTO_TEST_CASE(no_import_callback_allowed_paths)
+{
+	array<string, 2> options = {
+		"--no-import-callback",
+		"--allow-paths"
+	};
+
+	string expectedMessage =
+		"The following options are mutually exclusive: "
+		"--no-import-callback, --allow-paths. "
+		"Select at most one.";
+
+	BOOST_CHECK_EXCEPTION(
+		parseCommandLineAndReadInputFiles({"solc", options[0], options[1], "."}),
+		CommandLineValidationError,
+		[&](auto const& _exception) { BOOST_TEST(_exception.what() == expectedMessage); return true; }
+	);
+}
+
 BOOST_AUTO_TEST_CASE(cli_input)
 {
 	TemporaryDirectory tempDir1(TEST_CASE_NAME);
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 43cef9d27a..caad98f999 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -241,6 +241,25 @@ BOOST_AUTO_TEST_CASE(no_cbor_metadata)
 	BOOST_TEST(assert);
 }
 
+BOOST_AUTO_TEST_CASE(no_import_callback)
+{
+	std::vector<std::vector<std::string>> commandLinePerInputMode = {
+		{"solc", "--no-import-callback", "contract.sol"},
+		{"solc", "--standard-json", "--no-import-callback", "input.json"},
+		{"solc", "--assemble", "--no-import-callback", "input.yul"},
+		{"solc", "--strict-assembly", "--no-import-callback", "input.yul"},
+		{"solc", "--import-ast", "--no-import-callback", "ast.json"},
+		{"solc", "--link", "--no-import-callback", "input.bin"},
+		{"solc", "--yul", "--no-import-callback", "input.yul"},
+	};
+
+	for (auto const& commandLine: commandLinePerInputMode)
+	{
+		CommandLineOptions parsedOptions = parseCommandLine(commandLine);
+		BOOST_TEST(parsedOptions.input.noImportCallback);
+	}
+}
+
 BOOST_AUTO_TEST_CASE(via_ir_options)
 {
 	BOOST_TEST(!parseCommandLine({"solc", "contract.sol"}).output.viaIR);

From 0e51e57971ea5c3980184a0ee41f2ad58a66c0b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 29 Sep 2023 22:07:44 +0200
Subject: [PATCH 1636/1748] Add Error::parseErrorType()

---
 liblangutil/Exceptions.cpp | 20 ++++++++++++++++++++
 liblangutil/Exceptions.h   | 38 +++++++++++++++-----------------------
 2 files changed, 35 insertions(+), 23 deletions(-)

diff --git a/liblangutil/Exceptions.cpp b/liblangutil/Exceptions.cpp
index 118720b745..108acd1216 100644
--- a/liblangutil/Exceptions.cpp
+++ b/liblangutil/Exceptions.cpp
@@ -29,6 +29,26 @@
 using namespace solidity;
 using namespace solidity::langutil;
 
+std::map<Error::Type, std::string> const Error::m_errorTypeNames = {
+	{Error::Type::IOError, "IOError"},
+	{Error::Type::FatalError, "FatalError"},
+	{Error::Type::JSONError, "JSONError"},
+	{Error::Type::InternalCompilerError, "InternalCompilerError"},
+	{Error::Type::CompilerError, "CompilerError"},
+	{Error::Type::Exception, "Exception"},
+	{Error::Type::CodeGenerationError, "CodeGenerationError"},
+	{Error::Type::DeclarationError, "DeclarationError"},
+	{Error::Type::DocstringParsingError, "DocstringParsingError"},
+	{Error::Type::ParserError, "ParserError"},
+	{Error::Type::SyntaxError, "SyntaxError"},
+	{Error::Type::TypeError, "TypeError"},
+	{Error::Type::UnimplementedFeatureError, "UnimplementedFeatureError"},
+	{Error::Type::YulException, "YulException"},
+	{Error::Type::SMTLogicException, "SMTLogicException"},
+	{Error::Type::Warning, "Warning"},
+	{Error::Type::Info, "Info"},
+};
+
 Error::Error(
 	ErrorId _errorId, Error::Type _type,
 	std::string const& _description,
diff --git a/liblangutil/Exceptions.h b/liblangutil/Exceptions.h
index 65362df31d..b0701f9993 100644
--- a/liblangutil/Exceptions.h
+++ b/liblangutil/Exceptions.h
@@ -33,11 +33,11 @@
 #include <boost/preprocessor/facilities/overload.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 
+#include <optional>
 #include <string>
 #include <utility>
-#include <vector>
-#include <memory>
 #include <variant>
+#include <vector>
 
 namespace solidity::langutil
 {
@@ -269,27 +269,17 @@ class Error: virtual public util::Exception
 
 	static std::string formatErrorType(Type _type)
 	{
-		switch (_type)
-		{
-		case Type::IOError: return "IOError";
-		case Type::FatalError: return "FatalError";
-		case Type::JSONError: return "JSONError";
-		case Type::InternalCompilerError: return "InternalCompilerError";
-		case Type::CompilerError: return "CompilerError";
-		case Type::Exception: return "Exception";
-		case Type::CodeGenerationError: return "CodeGenerationError";
-		case Type::DeclarationError: return "DeclarationError";
-		case Type::DocstringParsingError: return "DocstringParsingError";
-		case Type::ParserError: return "ParserError";
-		case Type::SyntaxError: return "SyntaxError";
-		case Type::TypeError: return "TypeError";
-		case Type::UnimplementedFeatureError: return "UnimplementedFeatureError";
-		case Type::YulException: return "YulException";
-		case Type::SMTLogicException: return "SMTLogicException";
-		case Type::Warning: return "Warning";
-		case Type::Info: return "Info";
-		}
-		util::unreachable();
+		return m_errorTypeNames.at(_type);
+	}
+
+	static std::optional<Type> parseErrorType(std::string _name)
+	{
+		static std::map<std::string, Error::Type> const m_errorTypesByName = util::invertMap(m_errorTypeNames);
+
+		if (m_errorTypesByName.count(_name) == 0)
+			return std::nullopt;
+
+		return m_errorTypesByName.at(_name);
 	}
 
 	static std::string formatTypeOrSeverity(std::variant<Error::Type, Error::Severity> _typeOrSeverity)
@@ -309,6 +299,8 @@ class Error: virtual public util::Exception
 private:
 	ErrorId m_errorId;
 	Type m_type;
+
+	static std::map<Type, std::string> const m_errorTypeNames;
 };
 
 }

From 2e8e1f3a12fe94675d354b0e4eca1aedb28e4374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 29 Sep 2023 22:08:10 +0200
Subject: [PATCH 1637/1748] Store Error::Type rather than a string in
 SyntaxTestError

---
 test/CommonSyntaxTest.cpp       | 14 +++++++++-----
 test/CommonSyntaxTest.h         |  2 +-
 test/libsolidity/SyntaxTest.cpp |  4 ++--
 test/libyul/SyntaxTest.cpp      |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index 8e546017ff..78bb949363 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -115,7 +115,7 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 				{
 					assert(static_cast<size_t>(error.locationStart) <= source.length());
 					assert(static_cast<size_t>(error.locationEnd) <= source.length());
-					bool isWarning = error.type == "Warning";
+					bool isWarning = (error.type == Error::Type::Warning);
 					for (int i = error.locationStart; i < error.locationEnd; i++)
 						if (isWarning)
 						{
@@ -190,8 +190,8 @@ void CommonSyntaxTest::printErrorList(
 		for (auto const& error: _errorList)
 		{
 			{
-				util::AnsiColorized scope(_stream, _formatted, {BOLD, (error.type == "Warning") ? YELLOW : RED});
-				_stream << _linePrefix << error.type;
+				util::AnsiColorized scope(_stream, _formatted, {BOLD, (error.type == Error::Type::Warning) ? YELLOW : RED});
+				_stream << _linePrefix << Error::formatErrorType(error.type);
 				if (error.errorId.has_value())
 					_stream << ' ' << error.errorId->error;
 				_stream << ": ";
@@ -244,7 +244,11 @@ vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 		auto typeBegin = it;
 		while (it != line.end() && isalpha(*it, locale::classic()))
 			++it;
-		string errorType(typeBegin, it);
+
+		string errorTypeStr(typeBegin, it);
+		optional<Error::Type> errorType = Error::parseErrorType(errorTypeStr);
+		if (!errorType.has_value())
+			BOOST_THROW_EXCEPTION(runtime_error("Invalid error type: " + errorTypeStr));
 
 		skipWhitespace(it, line.end());
 
@@ -281,7 +285,7 @@ vector<SyntaxTestError> CommonSyntaxTest::parseExpectations(istream& _stream)
 
 		string errorMessage(it, line.end());
 		expectations.emplace_back(SyntaxTestError{
-			std::move(errorType),
+			errorType.value(),
 			std::move(errorId),
 			std::move(errorMessage),
 			std::move(sourceName),
diff --git a/test/CommonSyntaxTest.h b/test/CommonSyntaxTest.h
index 606f61a88d..fb46c37a64 100644
--- a/test/CommonSyntaxTest.h
+++ b/test/CommonSyntaxTest.h
@@ -34,7 +34,7 @@ namespace solidity::test
 
 struct SyntaxTestError
 {
-	std::string type;
+	langutil::Error::Type type;
 	std::optional<langutil::ErrorId> errorId;
 	std::string message;
 	std::string sourceName;
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 49608244f3..7c4fa8da1e 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -91,7 +91,7 @@ void SyntaxTest::parseAndAnalyze()
 	catch (UnimplementedFeatureError const& _e)
 	{
 		m_errorList.emplace_back(SyntaxTestError{
-			"UnimplementedFeatureError",
+			Error::Type::UnimplementedFeatureError,
 			std::nullopt,
 			errorMessage(_e),
 			"",
@@ -140,7 +140,7 @@ void SyntaxTest::filterObtainedErrors()
 			}
 		}
 		m_errorList.emplace_back(SyntaxTestError{
-			Error::formatErrorType(currentError->type()),
+			currentError->type(),
 			currentError->errorId(),
 			errorMessage(*currentError),
 			sourceName,
diff --git a/test/libyul/SyntaxTest.cpp b/test/libyul/SyntaxTest.cpp
index cea1d57450..20aadcf19a 100644
--- a/test/libyul/SyntaxTest.cpp
+++ b/test/libyul/SyntaxTest.cpp
@@ -61,7 +61,7 @@ void SyntaxTest::parseAndAnalyze()
 		}
 
 		m_errorList.emplace_back(SyntaxTestError{
-			Error::formatErrorType(error->type()),
+			error->type(),
 			error->errorId(),
 			errorMessage(*error),
 			name,

From d4f55030c4c8b541a25bfb712c291512ae7cd2d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 28 Sep 2023 18:30:26 +0200
Subject: [PATCH 1638/1748] CommonSyntaxTest: Fix info messages being colored
 as errors

---
 libsolutil/AnsiColorized.h |  1 +
 test/CommonSyntaxTest.cpp  | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/libsolutil/AnsiColorized.h b/libsolutil/AnsiColorized.h
index 69d10d7276..08b4a4d228 100644
--- a/libsolutil/AnsiColorized.h
+++ b/libsolutil/AnsiColorized.h
@@ -52,6 +52,7 @@ static constexpr char const* BLUE_BACKGROUND = "\033[44m";
 static constexpr char const* MAGENTA_BACKGROUND = "\033[45m";
 static constexpr char const* CYAN_BACKGROUND = "\033[46m";
 static constexpr char const* WHITE_BACKGROUND = "\033[47m";
+static constexpr char const* GRAY_BACKGROUND = "\033[100m";
 
 // 256-bit-colors (incomplete set)
 static constexpr char const* RED_BACKGROUND_256 = "\033[48;5;160m";
diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index 78bb949363..93a8cef213 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -115,11 +115,18 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 				{
 					assert(static_cast<size_t>(error.locationStart) <= source.length());
 					assert(static_cast<size_t>(error.locationEnd) <= source.length());
-					bool isWarning = (error.type == Error::Type::Warning);
 					for (int i = error.locationStart; i < error.locationEnd; i++)
-						if (isWarning)
+						if (error.type == Error::Type::Info)
 						{
 							if (sourceFormatting[static_cast<size_t>(i)] == util::formatting::RESET)
+								sourceFormatting[static_cast<size_t>(i)] = util::formatting::GRAY_BACKGROUND;
+						}
+						else if (error.type == Error::Type::Warning)
+						{
+							if (
+								sourceFormatting[static_cast<size_t>(i)] == util::formatting::RESET ||
+								sourceFormatting[static_cast<size_t>(i)] == util::formatting::GRAY_BACKGROUND
+							)
 								sourceFormatting[static_cast<size_t>(i)] = util::formatting::ORANGE_BACKGROUND_256;
 						}
 						else
@@ -190,7 +197,11 @@ void CommonSyntaxTest::printErrorList(
 		for (auto const& error: _errorList)
 		{
 			{
-				util::AnsiColorized scope(_stream, _formatted, {BOLD, (error.type == Error::Type::Warning) ? YELLOW : RED});
+				util::AnsiColorized scope(
+					_stream,
+					_formatted,
+					{BOLD, error.type == Error::Type::Info ? WHITE : (error.type == Error::Type::Warning ? YELLOW : RED)}
+				);
 				_stream << _linePrefix << Error::formatErrorType(error.type);
 				if (error.errorId.has_value())
 					_stream << ' ' << error.errorId->error;

From 0da44caa06f005b688dcf4f01b962d5862b9805c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 29 Sep 2023 22:43:49 +0200
Subject: [PATCH 1639/1748] Reuse color definitions between
 SourceReferenceFormatter and CommonSyntaxTest

---
 liblangutil/SourceReferenceFormatter.cpp | 35 ++++++++++++++++--------
 liblangutil/SourceReferenceFormatter.h   | 10 +++++++
 test/CommonSyntaxTest.cpp                | 33 +++++++++++-----------
 3 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/liblangutil/SourceReferenceFormatter.cpp b/liblangutil/SourceReferenceFormatter.cpp
index 4ce898b6f6..c48cb328d5 100644
--- a/liblangutil/SourceReferenceFormatter.cpp
+++ b/liblangutil/SourceReferenceFormatter.cpp
@@ -55,6 +55,28 @@ std::string SourceReferenceFormatter::formatErrorInformation(Error const& _error
 	);
 }
 
+char const* SourceReferenceFormatter::errorTextColor(Error::Severity _severity)
+{
+	switch (_severity)
+	{
+	case Error::Severity::Error: return RED;
+	case Error::Severity::Warning: return YELLOW;
+	case Error::Severity::Info: return WHITE;
+	}
+	util::unreachable();
+}
+
+char const* SourceReferenceFormatter::errorHighlightColor(Error::Severity _severity)
+{
+	switch (_severity)
+	{
+	case Error::Severity::Error: return RED_BACKGROUND;
+	case Error::Severity::Warning: return ORANGE_BACKGROUND_256;
+	case Error::Severity::Info: return GRAY_BACKGROUND;
+	}
+	util::unreachable();
+}
+
 AnsiColorized SourceReferenceFormatter::normalColored() const
 {
 	return AnsiColorized(m_stream, m_colored, {WHITE});
@@ -67,18 +89,7 @@ AnsiColorized SourceReferenceFormatter::frameColored() const
 
 AnsiColorized SourceReferenceFormatter::errorColored(std::ostream& _stream, bool _colored, Error::Severity _severity)
 {
-	// We used to color messages of any severity as errors so this seems like a good default
-	// for cases where severity cannot be determined.
-	char const* textColor = RED;
-
-	switch (_severity)
-	{
-	case Error::Severity::Error: textColor = RED; break;
-	case Error::Severity::Warning: textColor = YELLOW; break;
-	case Error::Severity::Info: textColor = WHITE; break;
-	}
-
-	return AnsiColorized(_stream, _colored, {BOLD, textColor});
+	return AnsiColorized(_stream, _colored, {BOLD, errorTextColor(_severity)});
 }
 
 AnsiColorized SourceReferenceFormatter::messageColored(std::ostream& _stream, bool _colored)
diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
index 358a473854..7163199dee 100644
--- a/liblangutil/SourceReferenceFormatter.h
+++ b/liblangutil/SourceReferenceFormatter.h
@@ -127,6 +127,16 @@ class SourceReferenceFormatter
 		bool _withErrorIds = false
 	);
 
+	/// The default text color for printing error messages of a given severity in the terminal.
+	/// Assumes a dark background color.
+	static char const* errorTextColor(Error::Severity _severity);
+
+	/// The default background color for highlighting source fragments corresponding to an error
+	/// of a given severity in the terminal. Assumes a light text color.
+	/// @note This is *not* meant to be used for the same text in combination with @a errorTextColor().
+	///       It's an alternative way to highlight it, while preserving the original text color.
+	static char const* errorHighlightColor(Error::Severity _severity);
+
 private:
 	util::AnsiColorized normalColored() const;
 	util::AnsiColorized frameColored() const;
diff --git a/test/CommonSyntaxTest.cpp b/test/CommonSyntaxTest.cpp
index 93a8cef213..0dedd1fb04 100644
--- a/test/CommonSyntaxTest.cpp
+++ b/test/CommonSyntaxTest.cpp
@@ -19,12 +19,17 @@
 #include <test/CommonSyntaxTest.h>
 #include <test/Common.h>
 #include <test/TestCase.h>
+
+#include <liblangutil/SourceReferenceFormatter.h>
+
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/StringUtils.h>
+
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/throw_exception.hpp>
+
 #include <fstream>
 #include <memory>
 #include <stdexcept>
@@ -116,21 +121,17 @@ void CommonSyntaxTest::printSource(ostream& _stream, string const& _linePrefix,
 					assert(static_cast<size_t>(error.locationStart) <= source.length());
 					assert(static_cast<size_t>(error.locationEnd) <= source.length());
 					for (int i = error.locationStart; i < error.locationEnd; i++)
-						if (error.type == Error::Type::Info)
-						{
-							if (sourceFormatting[static_cast<size_t>(i)] == util::formatting::RESET)
-								sourceFormatting[static_cast<size_t>(i)] = util::formatting::GRAY_BACKGROUND;
-						}
-						else if (error.type == Error::Type::Warning)
-						{
-							if (
-								sourceFormatting[static_cast<size_t>(i)] == util::formatting::RESET ||
-								sourceFormatting[static_cast<size_t>(i)] == util::formatting::GRAY_BACKGROUND
-							)
-								sourceFormatting[static_cast<size_t>(i)] = util::formatting::ORANGE_BACKGROUND_256;
-						}
-						else
-							sourceFormatting[static_cast<size_t>(i)] = util::formatting::RED_BACKGROUND;
+					{
+						char const*& cellFormat = sourceFormatting[static_cast<size_t>(i)];
+						char const* infoBgColor = SourceReferenceFormatter::errorHighlightColor(Error::Severity::Info);
+
+						if (
+							(error.type != Error::Type::Warning && error.type != Error::Type::Info) ||
+							(error.type == Error::Type::Warning && (cellFormat == RESET || cellFormat == infoBgColor)) ||
+							(error.type == Error::Type::Info && cellFormat == RESET)
+						)
+							cellFormat = SourceReferenceFormatter::errorHighlightColor(Error::errorSeverity(error.type));
+					}
 				}
 
 			_stream << _linePrefix << sourceFormatting.front() << source.front();
@@ -200,7 +201,7 @@ void CommonSyntaxTest::printErrorList(
 				util::AnsiColorized scope(
 					_stream,
 					_formatted,
-					{BOLD, error.type == Error::Type::Info ? WHITE : (error.type == Error::Type::Warning ? YELLOW : RED)}
+					{BOLD, SourceReferenceFormatter::errorTextColor(Error::errorSeverity(error.type))}
 				);
 				_stream << _linePrefix << Error::formatErrorType(error.type);
 				if (error.errorId.has_value())

From 78eb37d2596c9416b3fac9881414bf7e9c524de8 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Tue, 8 Aug 2023 17:48:38 +0200
Subject: [PATCH 1640/1748] Support user defined operators in SMT

---
 Changelog.md                                  |   1 +
 libsolidity/ast/AST.h                         |   3 +
 libsolidity/formal/BMC.cpp                    |  62 ++++++--
 libsolidity/formal/BMC.h                      |   8 ++
 libsolidity/formal/CHC.cpp                    | 136 +++++++++++++-----
 libsolidity/formal/CHC.h                      |  18 ++-
 libsolidity/formal/SMTEncoder.cpp             |  58 +++-----
 libsolidity/formal/SMTEncoder.h               |   9 +-
 .../user_defined_division_same_as_builtin.sol |   6 +-
 ...ed_division_with_safe_division_by_zero.sol |   2 +-
 .../user_defined_operations_on_constants.sol  |  76 +++-------
 ...r_defined_operations_on_constants_fail.sol |  27 +---
 ...rator_matches_equivalent_function_call.sol |  98 +++++--------
 .../userDefined/user_defined_overflow.sol     |   8 +-
 14 files changed, 267 insertions(+), 245 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 57175dcc79..9c64ba690e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -8,6 +8,7 @@ Compiler Features:
  * Commandline Interface: Add ``--no-import-callback`` option that prevents the compiler from loading source files not given explicitly on the CLI or in Standard JSON input.
  * Commandline Interface: Use proper severity and coloring also for error messages produced outside of the compilation pipeline.
  * Parser: Remove the experimental error recovery mode (``--error-recovery`` / ``settings.parserErrorRecovery``).
+ * SMTChecker: Support user-defined operators.
  * Yul Optimizer: If ``PUSH0`` is supported, favor zero literals over storing zero values in variables.
  * Yul Optimizer: Run the ``Rematerializer`` and ``UnusedPruner`` steps at the end of the default clean-up sequence.
 
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index ca23b0d619..d651df33be 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -2111,6 +2111,7 @@ class UnaryOperation: public Expression
 	Token getOperator() const { return m_operator; }
 	bool isPrefixOperation() const { return m_isPrefix; }
 	Expression const& subExpression() const { return *m_subExpression; }
+	ASTPointer<Expression> const& argument() const { return m_subExpression; }
 
 	FunctionType const* userDefinedFunctionType() const;
 
@@ -2145,6 +2146,8 @@ class BinaryOperation: public Expression
 
 	Expression const& leftExpression() const { return *m_left; }
 	Expression const& rightExpression() const { return *m_right; }
+	ASTPointer<Expression> leftArgument() const { return m_left; }
+	ASTPointer<Expression> rightArgument() const { return m_right; }
 	Token getOperator() const { return m_operator; }
 
 	FunctionType const* userDefinedFunctionType() const;
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index dede97cc03..d8f3036881 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -551,6 +551,15 @@ void BMC::endVisit(UnaryOperation const& _op)
 {
 	SMTEncoder::endVisit(_op);
 
+	// User-defined operators are essentially function calls.
+	if (auto funDef = *_op.annotation().userDefinedFunction)
+	{
+		std::vector<ASTPointer<Expression const>> arguments;
+		arguments.push_back(_op.argument());
+		inlineFunctionCall(funDef, _op, &_op, _op.userDefinedFunctionType(), arguments);
+		return;
+	}
+
 	if (
 		_op.annotation().type->category() == Type::Category::RationalNumber ||
 		_op.annotation().type->category() == Type::Category::FixedPoint
@@ -565,6 +574,19 @@ void BMC::endVisit(UnaryOperation const& _op)
 		);
 }
 
+void BMC::endVisit(BinaryOperation const& _op)
+{
+	SMTEncoder::endVisit(_op);
+
+	if (auto funDef = *_op.annotation().userDefinedFunction)
+	{
+		std::vector<ASTPointer<Expression const>> arguments;
+		arguments.push_back(_op.leftArgument());
+		arguments.push_back(_op.rightArgument());
+		inlineFunctionCall(funDef, _op, &_op, _op.userDefinedFunctionType(), arguments);
+	}
+}
+
 void BMC::endVisit(FunctionCall const& _funCall)
 {
 	auto functionCallKind = *_funCall.annotation().kind;
@@ -674,15 +696,21 @@ void BMC::visitAddMulMod(FunctionCall const& _funCall)
 	SMTEncoder::visitAddMulMod(_funCall);
 }
 
-void BMC::inlineFunctionCall(FunctionCall const& _funCall)
+void BMC::inlineFunctionCall(
+	FunctionDefinition const* _funDef,
+	Expression const& _callStackExpr,
+	Expression const* _calledExpr,
+	FunctionType const* _funType,
+	std::vector<ASTPointer<Expression const>> const& _arguments
+)
 {
-	solAssert(shouldInlineFunctionCall(_funCall, currentScopeContract(), m_currentContract), "");
-	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
-	solAssert(funDef, "");
+	solAssert(_funDef, "");
+	solAssert(_funType, "");
+	solAssert(_calledExpr, "");
 
-	if (visitedFunction(funDef))
+	if (visitedFunction(_funDef))
 	{
-		auto const& returnParams = funDef->returnParameters();
+		auto const& returnParams = _funDef->returnParameters();
 		for (auto param: returnParams)
 		{
 			m_context.newValue(*param);
@@ -691,19 +719,31 @@ void BMC::inlineFunctionCall(FunctionCall const& _funCall)
 	}
 	else
 	{
-		initializeFunctionCallParameters(*funDef, symbolicArguments(_funCall, m_currentContract));
+		initializeFunctionCallParameters(*_funDef, symbolicArguments(_funDef, _calledExpr, _funType, _arguments));
 
 		// The reason why we need to pushCallStack here instead of visit(FunctionDefinition)
-		// is that there we don't have `_funCall`.
-		pushCallStack({funDef, &_funCall});
+		// is that there we don't have `_callStackExpr`.
+		pushCallStack({_funDef, &_callStackExpr});
 		pushPathCondition(currentPathConditions());
 		auto oldChecked = std::exchange(m_checked, true);
-		funDef->accept(*this);
+		_funDef->accept(*this);
 		m_checked = oldChecked;
 		popPathCondition();
 	}
 
-	createReturnedExpressions(_funCall, m_currentContract);
+	createReturnedExpressions(_funDef, _callStackExpr);
+}
+
+void BMC::inlineFunctionCall(FunctionCall const& _funCall)
+{
+	solAssert(shouldInlineFunctionCall(_funCall, currentScopeContract(), m_currentContract), "");
+
+	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
+	Expression const* calledExpr = &_funCall.expression();
+	auto funType = dynamic_cast<FunctionType const*>(calledExpr->annotation().type);
+	std::vector<ASTPointer<Expression const>> arguments = _funCall.sortedArguments();
+
+	inlineFunctionCall(funDef, _funCall, calledExpr, funType, arguments);
 }
 
 void BMC::internalOrExternalFunctionCall(FunctionCall const& _funCall)
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index dfd4169e29..4aceadeea6 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -97,6 +97,7 @@ class BMC: public SMTEncoder
 	bool visit(WhileStatement const& _node) override;
 	bool visit(ForStatement const& _node) override;
 	void endVisit(UnaryOperation const& _node) override;
+	void endVisit(BinaryOperation const& _node) override;
 	void endVisit(FunctionCall const& _node) override;
 	void endVisit(Return const& _node) override;
 	bool visit(TryStatement const& _node) override;
@@ -113,6 +114,13 @@ class BMC: public SMTEncoder
 	/// Visits the FunctionDefinition of the called function
 	/// if available and inlines the return value.
 	void inlineFunctionCall(FunctionCall const& _funCall);
+	void inlineFunctionCall(
+		FunctionDefinition const* _funDef,
+		Expression const& _callStackExpr,
+		Expression const* _calledExpr,
+		FunctionType const* _funType,
+		std::vector<ASTPointer<Expression const>> const& _arguments
+	);
 	/// Inlines if the function call is internal or external to `this`.
 	/// Erases knowledge about state variables if external.
 	void internalOrExternalFunctionCall(FunctionCall const& _funCall);
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index a803f87d0a..bf19090f56 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -543,6 +543,35 @@ void CHC::endVisit(ForStatement const& _for)
 	m_scopes.pop_back();
 }
 
+void CHC::endVisit(UnaryOperation const& _op)
+{
+	SMTEncoder::endVisit(_op);
+
+	if (auto funDef = *_op.annotation().userDefinedFunction)
+	{
+		std::vector<ASTPointer<Expression const>> arguments;
+		arguments.push_back(_op.argument());
+		internalFunctionCall(funDef, &_op, _op.userDefinedFunctionType(), arguments, state().thisAddress());
+
+		createReturnedExpressions(funDef, _op);
+	}
+}
+
+void CHC::endVisit(BinaryOperation const& _op)
+{
+	SMTEncoder::endVisit(_op);
+
+	if (auto funDef = *_op.annotation().userDefinedFunction)
+	{
+		std::vector<ASTPointer<Expression const>> arguments;
+		arguments.push_back(_op.leftArgument());
+		arguments.push_back(_op.rightArgument());
+		internalFunctionCall(funDef, &_op, _op.userDefinedFunctionType(), arguments, state().thisAddress());
+
+		createReturnedExpressions(funDef, _op);
+	}
+}
+
 void CHC::endVisit(FunctionCall const& _funCall)
 {
 	auto functionCallKind = *_funCall.annotation().kind;
@@ -593,8 +622,8 @@ void CHC::endVisit(FunctionCall const& _funCall)
 		break;
 	}
 
-
-	createReturnedExpressions(_funCall, m_currentContract);
+	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
+	createReturnedExpressions(funDef, _funCall);
 }
 
 void CHC::endVisit(Break const& _break)
@@ -820,20 +849,27 @@ void CHC::visitDeployment(FunctionCall const& _funCall)
 	defineExpr(_funCall, newAddr);
 }
 
-void CHC::internalFunctionCall(FunctionCall const& _funCall)
+void CHC::internalFunctionCall(
+	FunctionDefinition const* _funDef,
+	Expression const* _calledExpr,
+	FunctionType const* _funType,
+	std::vector<ASTPointer<Expression const>> const& _arguments,
+	smtutil::Expression _contractAddressValue
+)
 {
 	solAssert(m_currentContract, "");
+	solAssert(_calledExpr, "");
+	solAssert(_funType, "");
 
-	auto function = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
-	if (function)
+	if (_funDef)
 	{
 		if (m_currentFunction && !m_currentFunction->isConstructor())
-			m_callGraph[m_currentFunction].insert(function);
+			m_callGraph[m_currentFunction].insert(_funDef);
 		else
-			m_callGraph[m_currentContract].insert(function);
+			m_callGraph[m_currentContract].insert(_funDef);
 	}
 
-	m_context.addAssertion(predicate(_funCall));
+	m_context.addAssertion(predicate(_funDef, _calledExpr, _funType, _arguments, _contractAddressValue));
 
 	solAssert(m_errorDest, "");
 	connectBlocks(
@@ -845,6 +881,37 @@ void CHC::internalFunctionCall(FunctionCall const& _funCall)
 	m_context.addAssertion(errorFlag().increaseIndex() == 0);
 }
 
+void CHC::internalFunctionCall(FunctionCall const& _funCall)
+{
+	solAssert(m_currentContract, "");
+
+	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
+	if (funDef)
+	{
+		if (m_currentFunction && !m_currentFunction->isConstructor())
+			m_callGraph[m_currentFunction].insert(funDef);
+		else
+			m_callGraph[m_currentContract].insert(funDef);
+	}
+
+	Expression const* calledExpr = &_funCall.expression();
+	auto funType = dynamic_cast<FunctionType const*>(calledExpr->annotation().type);
+	std::vector<ASTPointer<Expression const>> arguments = _funCall.sortedArguments();
+
+	auto contractAddressValue = [this](FunctionCall const& _f) {
+		auto [callExpr, callOptions] = functionCallExpression(_f);
+
+		FunctionType const& funType = dynamic_cast<FunctionType const&>(*callExpr->annotation().type);
+		if (funType.kind() == FunctionType::Kind::Internal)
+			return state().thisAddress();
+		if (MemberAccess const* callBase = dynamic_cast<MemberAccess const*>(callExpr))
+			return expr(callBase->expression());
+		solAssert(false, "Unreachable!");
+	};
+
+	internalFunctionCall(funDef, calledExpr, funType, arguments, contractAddressValue(_funCall));
+}
+
 void CHC::addNondetCalls(ContractDefinition const& _contract)
 {
 	for (auto var: _contract.stateVariables())
@@ -1028,7 +1095,7 @@ void CHC::externalFunctionCallToTrustedCode(FunctionCall const& _funCall)
 		state().readStateVars(*function->annotation().contract, contractAddressValue(_funCall));
 	}
 
-	smtutil::Expression pred = predicate(_funCall);
+	smtutil::Expression pred = predicate(function, callExpr, &funType, _funCall.sortedArguments(), calledAddress);
 
 	auto txConstraints = state().txTypeConstraints() && state().txFunctionConstraints(*function);
 	m_context.addAssertion(pred && txConstraints);
@@ -1264,6 +1331,12 @@ std::set<unsigned> CHC::transactionVerificationTargetsIds(ASTNode const* _txRoot
 	return verificationTargetsIds;
 }
 
+bool CHC::usesStaticCall(FunctionDefinition const* _funDef, FunctionType const* _funType)
+{
+	auto kind = _funType->kind();
+	return (_funDef && (_funDef->stateMutability() == StateMutability::Pure || _funDef->stateMutability() == StateMutability::View)) || kind == FunctionType::Kind::BareStaticCall;
+}
+
 bool CHC::usesStaticCall(FunctionCall const& _funCall)
 {
 	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
@@ -1733,40 +1806,35 @@ smtutil::Expression CHC::predicate(Predicate const& _block)
 	solAssert(false, "");
 }
 
-smtutil::Expression CHC::predicate(FunctionCall const& _funCall)
+smtutil::Expression CHC::predicate(
+	FunctionDefinition const* _funDef,
+	Expression const* _calledExpr,
+	FunctionType const* _funType,
+	std::vector<ASTPointer<Expression const>> _arguments,
+	smtutil::Expression _contractAddressValue
+)
 {
-	FunctionType const& funType = dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type);
-	auto kind = funType.kind();
+	solAssert(_calledExpr, "");
+	solAssert(_funType, "");
+	auto kind = _funType->kind();
 	solAssert(kind == FunctionType::Kind::Internal || kind == FunctionType::Kind::External || kind == FunctionType::Kind::BareStaticCall, "");
-
-	solAssert(m_currentContract, "");
-	auto function = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
-	if (!function)
+	if (!_funDef)
 		return smtutil::Expression(true);
 
-	auto contractAddressValue = [this](FunctionCall const& _f) {
-		auto [callExpr, callOptions] = functionCallExpression(_f);
-
-		FunctionType const& funType = dynamic_cast<FunctionType const&>(*callExpr->annotation().type);
-		if (funType.kind() == FunctionType::Kind::Internal)
-			return state().thisAddress();
-		if (MemberAccess const* callBase = dynamic_cast<MemberAccess const*>(callExpr))
-			return expr(callBase->expression());
-		solAssert(false, "Unreachable!");
-	};
 	errorFlag().increaseIndex();
-	std::vector<smtutil::Expression> args{errorFlag().currentValue(), contractAddressValue(_funCall), state().abi(), state().crypto(), state().tx(), state().state()};
 
-	auto const* contract = function->annotation().contract;
+	std::vector<smtutil::Expression> args{errorFlag().currentValue(), _contractAddressValue, state().abi(), state().crypto(), state().tx(), state().state()};
+
+	auto const* contract = _funDef->annotation().contract;
 	auto const& hierarchy = m_currentContract->annotation().linearizedBaseContracts;
-	solAssert(kind != FunctionType::Kind::Internal || function->isFree() || (contract && contract->isLibrary()) || util::contains(hierarchy, contract), "");
+	solAssert(kind != FunctionType::Kind::Internal || _funDef->isFree() || (contract && contract->isLibrary()) || util::contains(hierarchy, contract), "");
 
 	if (kind == FunctionType::Kind::Internal)
 		contract = m_currentContract;
 
 	args += currentStateVariables(*contract);
-	args += symbolicArguments(_funCall, contract);
-	if (!usesStaticCall(_funCall))
+	args += symbolicArguments(_funDef, _calledExpr, _funType, _arguments);
+	if (!usesStaticCall(_funDef, _funType))
 	{
 		state().newState();
 		for (auto const& var: stateVariablesIncludingInheritedAndPrivate(*contract))
@@ -1775,7 +1843,7 @@ smtutil::Expression CHC::predicate(FunctionCall const& _funCall)
 	args += std::vector<smtutil::Expression>{state().state()};
 	args += currentStateVariables(*contract);
 
-	for (auto var: function->parameters() + function->returnParameters())
+	for (auto var: _funDef->parameters() + _funDef->returnParameters())
 	{
 		if (m_context.knownVariable(*var))
 			m_context.variable(*var)->increaseIndex();
@@ -1784,10 +1852,10 @@ smtutil::Expression CHC::predicate(FunctionCall const& _funCall)
 		args.push_back(currentValue(*var));
 	}
 
-	Predicate const& summary = *m_summaries.at(contract).at(function);
+	Predicate const& summary = *m_summaries.at(contract).at(_funDef);
 	auto from = smt::function(summary, contract, m_context);
 	Predicate const& callPredicate = *createSummaryBlock(
-		*function,
+		*_funDef,
 		*contract,
 		kind == FunctionType::Kind::Internal ? PredicateType::InternalCall : PredicateType::ExternalCallTrusted
 	);
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index 27bdaebf22..57bf807384 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -111,6 +111,8 @@ class CHC: public SMTEncoder
 	bool visit(ForStatement const&) override;
 	void endVisit(ForStatement const&) override;
 	void endVisit(FunctionCall const& _node) override;
+	void endVisit(BinaryOperation const& _op) override;
+	void endVisit(UnaryOperation const& _op) override;
 	void endVisit(Break const& _node) override;
 	void endVisit(Continue const& _node) override;
 	void endVisit(IndexRangeAccess const& _node) override;
@@ -127,6 +129,13 @@ class CHC: public SMTEncoder
 	void visitAddMulMod(FunctionCall const& _funCall) override;
 	void visitDeployment(FunctionCall const& _funCall);
 	void internalFunctionCall(FunctionCall const& _funCall);
+	void internalFunctionCall(
+		FunctionDefinition const* _funDef,
+		Expression const* _calledExpr,
+		FunctionType const* _funType,
+		std::vector<ASTPointer<Expression const>> const& _arguments,
+		smtutil::Expression _contractAddressValue
+	);
 	void externalFunctionCall(FunctionCall const& _funCall);
 	void externalFunctionCallToTrustedCode(FunctionCall const& _funCall);
 	void addNondetCalls(ContractDefinition const& _contract);
@@ -152,6 +161,7 @@ class CHC: public SMTEncoder
 	void clearIndices(ContractDefinition const* _contract, FunctionDefinition const* _function = nullptr) override;
 	void setCurrentBlock(Predicate const& _block);
 	std::set<unsigned> transactionVerificationTargetsIds(ASTNode const* _txRoot);
+	bool usesStaticCall(FunctionDefinition const* _funDef, FunctionType const* _funType);
 	bool usesStaticCall(FunctionCall const& _funCall);
 	//@}
 
@@ -246,7 +256,13 @@ class CHC: public SMTEncoder
 	/// @returns a predicate application after checking the predicate's type.
 	smtutil::Expression predicate(Predicate const& _block);
 	/// @returns the summary predicate for the called function.
-	smtutil::Expression predicate(FunctionCall const& _funCall);
+	smtutil::Expression predicate(
+		FunctionDefinition const* _funDef,
+		Expression const* _calledExpr,
+		FunctionType const* _funType,
+		std::vector<ASTPointer<Expression const>> _arguments,
+		smtutil::Expression _contractAddressValue
+	);
 	/// @returns a predicate that defines a contract initializer for _contract in the context of _contractContext.
 	smtutil::Expression initializer(ContractDefinition const& _contract, ContractDefinition const& _contractContext);
 	/// @returns a predicate that defines a constructor summary.
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index d985e359ef..abb47fdd3b 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -459,17 +459,7 @@ void SMTEncoder::endVisit(UnaryOperation const& _op)
 
 	// User-defined operators are essentially function calls.
 	if (*_op.annotation().userDefinedFunction)
-	{
-		// TODO: Implement user-defined operators properly.
-		m_unsupportedErrors.warning(
-			6156_error,
-			_op.location(),
-			"User-defined operators are not yet supported by SMTChecker. "s +
-			"This invocation of operator " + TokenTraits::friendlyName(_op.getOperator()) +
-			" has been ignored, which may lead to incorrect results."
-		);
 		return;
-	}
 
 	auto const* subExpr = innermostTuple(_op.subExpression());
 	auto type = _op.annotation().type;
@@ -561,17 +551,7 @@ void SMTEncoder::endVisit(BinaryOperation const& _op)
 
 	// User-defined operators are essentially function calls.
 	if (*_op.annotation().userDefinedFunction)
-	{
-		// TODO: Implement user-defined operators properly.
-		m_unsupportedErrors.warning(
-			6756_error,
-			_op.location(),
-			"User-defined operators are not yet supported by SMTChecker. "s +
-			"This invocation of operator " + TokenTraits::friendlyName(_op.getOperator()) +
-			" has been ignored, which may lead to incorrect results."
-		);
 		return;
-	}
 
 	if (TokenTraits::isArithmeticOp(_op.getOperator()))
 		arithmeticOperation(_op);
@@ -3141,47 +3121,45 @@ std::set<SourceUnit const*, ASTNode::CompareByID> SMTEncoder::sourceDependencies
 	return sources;
 }
 
-void SMTEncoder::createReturnedExpressions(FunctionCall const& _funCall, ContractDefinition const* _contextContract)
+void SMTEncoder::createReturnedExpressions(FunctionDefinition const* _funDef, Expression const& _callStackExpr)
 {
-	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), _contextContract);
-	if (!funDef)
+	if (!_funDef)
 		return;
 
-	auto const& returnParams = funDef->returnParameters();
+	auto const& returnParams = _funDef->returnParameters();
 	for (auto param: returnParams)
 		createVariable(*param);
 	auto returnValues = applyMap(returnParams, [this](auto const& param) -> std::optional<smtutil::Expression> {
 		solAssert(param && m_context.knownVariable(*param), "");
 		return currentValue(*param);
 	});
-	defineExpr(_funCall, returnValues);
+	defineExpr(_callStackExpr, returnValues);
 }
 
-std::vector<smtutil::Expression> SMTEncoder::symbolicArguments(FunctionCall const& _funCall, ContractDefinition const* _contextContract)
+std::vector<smtutil::Expression> SMTEncoder::symbolicArguments(
+	FunctionDefinition const* _funDef,
+	Expression const* _calledExpr,
+	FunctionType const* _funType,
+	std::vector<ASTPointer<Expression const>> const& _arguments)
 {
-	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), _contextContract);
-	solAssert(funDef, "");
+	solAssert(_funDef, "");
+	solAssert(_funType, "");
 
 	std::vector<smtutil::Expression> args;
-	Expression const* calledExpr = &_funCall.expression();
-	auto funType = dynamic_cast<FunctionType const*>(calledExpr->annotation().type);
-	solAssert(funType, "");
-
-	std::vector<ASTPointer<Expression const>> arguments = _funCall.sortedArguments();
-	auto functionParams = funDef->parameters();
+	auto functionParams = _funDef->parameters();
 	unsigned firstParam = 0;
-	if (funType->hasBoundFirstArgument())
+	if (_funType->hasBoundFirstArgument())
 	{
-		calledExpr = innermostTuple(*calledExpr);
-		auto const& attachedFunction = dynamic_cast<MemberAccess const*>(calledExpr);
+		_calledExpr = innermostTuple(*_calledExpr);
+		auto const& attachedFunction = dynamic_cast<MemberAccess const*>(_calledExpr);
 		solAssert(attachedFunction, "");
 		args.push_back(expr(attachedFunction->expression(), functionParams.front()->type()));
 		firstParam = 1;
 	}
 
-	solAssert((arguments.size() + firstParam) == functionParams.size(), "");
-	for (unsigned i = 0; i < arguments.size(); ++i)
-		args.push_back(expr(*arguments.at(i), functionParams.at(i + firstParam)->type()));
+	solAssert((_arguments.size() + firstParam) == functionParams.size(), "");
+	for (unsigned i = 0; i < _arguments.size(); ++i)
+		args.push_back(expr(*_arguments.at(i), functionParams.at(i + firstParam)->type()));
 
 	return args;
 }
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 726f16ef6b..e88a2400e6 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -403,12 +403,17 @@ class SMTEncoder: public ASTConstVisitor
 
 	/// Creates symbolic expressions for the returned values
 	/// and set them as the components of the symbolic tuple.
-	void createReturnedExpressions(FunctionCall const& _funCall, ContractDefinition const* _contextContract);
+	void createReturnedExpressions(FunctionDefinition const* _funDef, Expression const& _calledExpr);
 
 	/// @returns the symbolic arguments for a function call,
 	/// taking into account attached functions and
 	/// type conversion.
-	std::vector<smtutil::Expression> symbolicArguments(FunctionCall const& _funCall, ContractDefinition const* _contextContract);
+	std::vector<smtutil::Expression> symbolicArguments(
+		FunctionDefinition const* _funDef,
+		Expression const* _calledExpr,
+		FunctionType const* _funType,
+		std::vector<ASTPointer<Expression const>> const& _arguments
+	);
 
 	smtutil::Expression constantExpr(Expression const& _expr, VariableDeclaration const& _var);
 
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol
index 20889af057..1e94e41d4a 100644
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_same_as_builtin.sol
@@ -2,15 +2,15 @@ type U is uint;
 using {div as /} for U global;
 
 function div(U x, U y) pure returns (U) {
-    return U.wrap(U.unwrap(x) / U.unwrap(y));
+    return U.wrap(U.unwrap(x) / U.unwrap(y)); // detects division by zero
 }
 
 contract C {
     function f(U x, U y) public pure returns (U) {
-        return x / y; // FIXME: should detect div by zero
+        return x / y; // reports division by zero in the implementation
     }
 }
 // ====
 // SMTEngine: all
 // ----
-// Warning 6756: (218-223): User-defined operators are not yet supported by SMTChecker. This invocation of operator / has been ignored, which may lead to incorrect results.
+// Warning 4281: (108-133): CHC: Division by zero happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol
index edc4d2a979..8f8e6c53c4 100644
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_division_with_safe_division_by_zero.sol
@@ -16,4 +16,4 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6756: (271-276): User-defined operators are not yet supported by SMTChecker. This invocation of operator / has been ignored, which may lead to incorrect results.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
index 10ec6a1993..c39360b656 100644
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants.sol
@@ -33,72 +33,32 @@ contract C {
     I16 constant FOUR = I16.wrap(4);
 
     function testBitwise() public pure {
-        assert(ONE | TWO == THREE); // FIXME: should hold
-        assert(ONE & THREE == ZERO); // FIXME: should hold
-        assert(TWO ^ TWO == ZERO); // FIXME: should hold
-        assert(~ONE == MINUS_TWO); // FIXME: should hold
+        assert(ONE | TWO == THREE);
+        assert(ONE & THREE == ONE);
+        assert(TWO ^ TWO == ZERO);
+        assert(~ONE == MINUS_TWO);
     }
 
     function testArithmetic() public pure {
-        assert(TWO + TWO == FOUR); // FIXME: should hold
-        assert(TWO - TWO == ZERO); // FIXME: should hold
-        assert(-TWO == MINUS_TWO); // FIXME: should hold
-        assert(TWO * TWO == FOUR); // FIXME: should hold
-        assert(TWO / TWO == ONE); // FIXME: should hold
-        assert(TWO % TWO == ZERO); // FIXME: should hold
+        assert(TWO + TWO == FOUR);
+        assert(TWO - TWO == ZERO);
+        assert(-TWO == MINUS_TWO);
+        assert(TWO * TWO == FOUR);
+        assert(TWO / TWO == ONE);
+        assert(TWO % TWO == ZERO);
     }
 
     function testComparison() public pure {
-        assert(TWO == TWO); // FIXME: should hold
-        assert(!(TWO != TWO)); // FIXME: should hold
-        assert(!(TWO < TWO)); // FIXME: should hold
-        assert(!(TWO > TWO)); // FIXME: should hold
-        assert(TWO <= TWO); // FIXME: should hold
-        assert(TWO >= TWO); // FIXME: should hold
+        assert(TWO == TWO);
+        assert(!(TWO != TWO));
+        assert(!(TWO < TWO));
+        assert(!(TWO > TWO));
+        assert(TWO <= TWO);
+        assert(TWO >= TWO);
     }
 }
 // ====
 // SMTEngine: all
 // ----
-// Warning 6756: (2019-2028): User-defined operators are not yet supported by SMTChecker. This invocation of operator | has been ignored, which may lead to incorrect results.
-// Warning 6756: (2019-2037): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2077-2088): User-defined operators are not yet supported by SMTChecker. This invocation of operator & has been ignored, which may lead to incorrect results.
-// Warning 6756: (2077-2096): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2136-2145): User-defined operators are not yet supported by SMTChecker. This invocation of operator ^ has been ignored, which may lead to incorrect results.
-// Warning 6756: (2136-2153): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6156: (2193-2197): User-defined operators are not yet supported by SMTChecker. This invocation of operator ~ has been ignored, which may lead to incorrect results.
-// Warning 6756: (2193-2210): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2301-2310): User-defined operators are not yet supported by SMTChecker. This invocation of operator + has been ignored, which may lead to incorrect results.
-// Warning 6756: (2301-2318): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2358-2367): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
-// Warning 6756: (2358-2375): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6156: (2415-2419): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
-// Warning 6756: (2415-2432): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2472-2481): User-defined operators are not yet supported by SMTChecker. This invocation of operator * has been ignored, which may lead to incorrect results.
-// Warning 6756: (2472-2489): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2529-2538): User-defined operators are not yet supported by SMTChecker. This invocation of operator / has been ignored, which may lead to incorrect results.
-// Warning 6756: (2529-2545): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2585-2594): User-defined operators are not yet supported by SMTChecker. This invocation of operator % has been ignored, which may lead to incorrect results.
-// Warning 6756: (2585-2602): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2693-2703): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2745-2755): User-defined operators are not yet supported by SMTChecker. This invocation of operator != has been ignored, which may lead to incorrect results.
-// Warning 6756: (2798-2807): User-defined operators are not yet supported by SMTChecker. This invocation of operator < has been ignored, which may lead to incorrect results.
-// Warning 6756: (2850-2859): User-defined operators are not yet supported by SMTChecker. This invocation of operator > has been ignored, which may lead to incorrect results.
-// Warning 6756: (2900-2910): User-defined operators are not yet supported by SMTChecker. This invocation of operator <= has been ignored, which may lead to incorrect results.
-// Warning 6756: (2950-2960): User-defined operators are not yet supported by SMTChecker. This invocation of operator >= has been ignored, which may lead to incorrect results.
-// Warning 6328: (2012-2038): CHC: Assertion violation happens here.
-// Warning 6328: (2070-2097): CHC: Assertion violation happens here.
-// Warning 6328: (2129-2154): CHC: Assertion violation happens here.
-// Warning 6328: (2186-2211): CHC: Assertion violation happens here.
-// Warning 6328: (2294-2319): CHC: Assertion violation happens here.
-// Warning 6328: (2351-2376): CHC: Assertion violation happens here.
-// Warning 6328: (2408-2433): CHC: Assertion violation happens here.
-// Warning 6328: (2465-2490): CHC: Assertion violation happens here.
-// Warning 6328: (2522-2546): CHC: Assertion violation happens here.
-// Warning 6328: (2578-2603): CHC: Assertion violation happens here.
-// Warning 6328: (2686-2704): CHC: Assertion violation happens here.
-// Warning 6328: (2736-2757): CHC: Assertion violation happens here.
-// Warning 6328: (2789-2809): CHC: Assertion violation happens here.
-// Warning 6328: (2841-2861): CHC: Assertion violation happens here.
-// Warning 6328: (2893-2911): CHC: Assertion violation happens here.
-// Warning 6328: (2943-2961): CHC: Assertion violation happens here.
+// Info 1391: CHC: 21 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol
index c30bb21c1d..25674513c0 100644
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operations_on_constants_fail.sol
@@ -60,32 +60,6 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6756: (2019-2028): User-defined operators are not yet supported by SMTChecker. This invocation of operator | has been ignored, which may lead to incorrect results.
-// Warning 6756: (2019-2036): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2069-2080): User-defined operators are not yet supported by SMTChecker. This invocation of operator & has been ignored, which may lead to incorrect results.
-// Warning 6756: (2069-2088): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2121-2130): User-defined operators are not yet supported by SMTChecker. This invocation of operator ^ has been ignored, which may lead to incorrect results.
-// Warning 6756: (2121-2138): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6156: (2171-2175): User-defined operators are not yet supported by SMTChecker. This invocation of operator ~ has been ignored, which may lead to incorrect results.
-// Warning 6756: (2171-2183): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2267-2278): User-defined operators are not yet supported by SMTChecker. This invocation of operator + has been ignored, which may lead to incorrect results.
-// Warning 6756: (2267-2286): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2319-2328): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
-// Warning 6756: (2319-2336): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6156: (2369-2373): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
-// Warning 6756: (2369-2381): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2414-2425): User-defined operators are not yet supported by SMTChecker. This invocation of operator * has been ignored, which may lead to incorrect results.
-// Warning 6756: (2414-2433): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2466-2475): User-defined operators are not yet supported by SMTChecker. This invocation of operator / has been ignored, which may lead to incorrect results.
-// Warning 6756: (2466-2483): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2516-2525): User-defined operators are not yet supported by SMTChecker. This invocation of operator % has been ignored, which may lead to incorrect results.
-// Warning 6756: (2516-2533): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2619-2629): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2663-2673): User-defined operators are not yet supported by SMTChecker. This invocation of operator != has been ignored, which may lead to incorrect results.
-// Warning 6756: (2706-2715): User-defined operators are not yet supported by SMTChecker. This invocation of operator < has been ignored, which may lead to incorrect results.
-// Warning 6756: (2748-2757): User-defined operators are not yet supported by SMTChecker. This invocation of operator > has been ignored, which may lead to incorrect results.
-// Warning 6756: (2792-2802): User-defined operators are not yet supported by SMTChecker. This invocation of operator <= has been ignored, which may lead to incorrect results.
-// Warning 6756: (2838-2848): User-defined operators are not yet supported by SMTChecker. This invocation of operator >= has been ignored, which may lead to incorrect results.
 // Warning 6328: (2012-2037): CHC: Assertion violation happens here.
 // Warning 6328: (2062-2089): CHC: Assertion violation happens here.
 // Warning 6328: (2114-2139): CHC: Assertion violation happens here.
@@ -102,3 +76,4 @@ contract C {
 // Warning 6328: (2741-2758): CHC: Assertion violation happens here.
 // Warning 6328: (2783-2804): CHC: Assertion violation happens here.
 // Warning 6328: (2829-2850): CHC: Assertion violation happens here.
+// Info 1391: CHC: 5 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
index 9d09e2f296..a6cad9580f 100644
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
@@ -17,6 +17,7 @@ function mul(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) *
 function div(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) / I16.unwrap(y)); }
 function mod(I16 x, I16 y) pure returns (I16) { return I16.wrap(I16.unwrap(x) % I16.unwrap(y)); }
 
+
 function eq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) == I16.unwrap(y); }
 function noteq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) != I16.unwrap(y); }
 function lt(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) < I16.unwrap(y); }
@@ -26,81 +27,48 @@ function geq(I16 x, I16 y) pure returns (bool) { return I16.unwrap(x) >= I16.unw
 
 contract C {
     function testBitwise(I16 x, I16 y) public pure {
-        assert(x | y == bitor(x, y)); // FIXME: should hold
-        assert(x & y == bitand(x, y)); // FIXME: should hold
-        assert(x ^ y == bitxor(x, y)); // FIXME: should hold
-        assert(~x == bitnot(x)); // FIXME: should hold
+        assert(x | y == bitor(x, y)); // should hold
+        assert(x & y == bitand(x, y)); // should hold
+        assert(x ^ y == bitxor(x, y)); // should hold
+        assert(~x == bitnot(x)); // should hold
     }
 
     function testArithmetic(I16 x, I16 y) public pure {
-        assert(x + y == add(x, y)); // FIXME: should hold
-        assert(x - y == sub(x, y)); // FIXME: should hold
-        assert(-x == unsub(x)); // FIXME: should hold
-        assert(x * y == mul(x, y)); // FIXME: should hold
-        assert(x / y == div(x, y)); // FIXME: should hold
-        assert(x % y == mod(x, y)); // FIXME: should hold
+        assert(x + y == add(x, y));
+        assert(x - y == sub(x, y));
+        assert(-x == unsub(x));
+        assert(x * y == mul(x, y));
+        assert(x / y == div(x, y));
+        assert(x % y == mod(x, y));
     }
 
     function testComparison(I16 x, I16 y) public pure {
-        assert((x == y) == eq(x, y)); // FIXME: should hold
-        assert((x != y) == noteq(x, y)); // FIXME: should hold
-        assert((x < y) == lt(x, y)); // FIXME: should hold
-        assert((x > y) == gt(x, y)); // FIXME: should hold
-        assert((x <= y) == leq(x, y)); // FIXME: should hold
-        assert((x >= y) == geq(x, y)); // FIXME: should hold
+        assert((x == y) == eq(x, y)); // should hold
+        assert((x != y) == noteq(x, y)); // should hold
+        assert((x < y) == lt(x, y)); // should hold
+        assert((x > y) == gt(x, y)); // should hold
+        assert((x <= y) == leq(x, y)); // should hold
+        assert((x >= y) == geq(x, y)); // should hold
     }
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreOS: macos
 // ----
-// Warning 6756: (1803-1808): User-defined operators are not yet supported by SMTChecker. This invocation of operator | has been ignored, which may lead to incorrect results.
-// Warning 6756: (1803-1823): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (1863-1868): User-defined operators are not yet supported by SMTChecker. This invocation of operator & has been ignored, which may lead to incorrect results.
-// Warning 6756: (1863-1884): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (1924-1929): User-defined operators are not yet supported by SMTChecker. This invocation of operator ^ has been ignored, which may lead to incorrect results.
-// Warning 6756: (1924-1945): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6156: (1985-1987): User-defined operators are not yet supported by SMTChecker. This invocation of operator ~ has been ignored, which may lead to incorrect results.
-// Warning 6756: (1985-2000): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2103-2108): User-defined operators are not yet supported by SMTChecker. This invocation of operator + has been ignored, which may lead to incorrect results.
-// Warning 6756: (2103-2121): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2161-2166): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
-// Warning 6756: (2161-2179): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6156: (2219-2221): User-defined operators are not yet supported by SMTChecker. This invocation of operator - has been ignored, which may lead to incorrect results.
-// Warning 6756: (2219-2233): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2273-2278): User-defined operators are not yet supported by SMTChecker. This invocation of operator * has been ignored, which may lead to incorrect results.
-// Warning 6756: (2273-2291): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2331-2336): User-defined operators are not yet supported by SMTChecker. This invocation of operator / has been ignored, which may lead to incorrect results.
-// Warning 6756: (2331-2349): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2389-2394): User-defined operators are not yet supported by SMTChecker. This invocation of operator % has been ignored, which may lead to incorrect results.
-// Warning 6756: (2389-2407): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2511-2517): User-defined operators are not yet supported by SMTChecker. This invocation of operator == has been ignored, which may lead to incorrect results.
-// Warning 6756: (2571-2577): User-defined operators are not yet supported by SMTChecker. This invocation of operator != has been ignored, which may lead to incorrect results.
-// Warning 6756: (2634-2639): User-defined operators are not yet supported by SMTChecker. This invocation of operator < has been ignored, which may lead to incorrect results.
-// Warning 6756: (2693-2698): User-defined operators are not yet supported by SMTChecker. This invocation of operator > has been ignored, which may lead to incorrect results.
-// Warning 6756: (2752-2758): User-defined operators are not yet supported by SMTChecker. This invocation of operator <= has been ignored, which may lead to incorrect results.
-// Warning 6756: (2813-2819): User-defined operators are not yet supported by SMTChecker. This invocation of operator >= has been ignored, which may lead to incorrect results.
-// Warning 3944: (679-708): CHC: Underflow (resulting value less than -32768) happens here.
-// Warning 4984: (679-708): CHC: Overflow (resulting value larger than 32767) happens here.
+// Warning 3944: (679-708): CHC: Underflow (resulting value less than -32768) might happen here.
+// Warning 4984: (679-708): CHC: Overflow (resulting value larger than 32767) might happen here.
 // Warning 3944: (777-806): CHC: Underflow (resulting value less than -32768) happens here.
-// Warning 4984: (777-806): CHC: Overflow (resulting value larger than 32767) happens here.
-// Warning 3944: (953-982): CHC: Underflow (resulting value less than -32768) happens here.
-// Warning 4984: (953-982): CHC: Overflow (resulting value larger than 32767) happens here.
-// Warning 4281: (1051-1080): CHC: Division by zero happens here.
+// Warning 4984: (777-806): CHC: Overflow (resulting value larger than 32767) might happen here.
+// Warning 3944: (953-982): CHC: Underflow (resulting value less than -32768) might happen here.
+// Warning 4984: (953-982): CHC: Overflow (resulting value larger than 32767) might happen here.
+// Warning 4984: (1051-1080): CHC: Overflow (resulting value larger than 32767) might happen here.
+// Warning 4281: (1051-1080): CHC: Division by zero might happen here.
 // Warning 4281: (1149-1178): CHC: Division by zero happens here.
-// Warning 6328: (1796-1824): CHC: Assertion violation happens here.
-// Warning 6328: (1856-1885): CHC: Assertion violation happens here.
-// Warning 6328: (1917-1946): CHC: Assertion violation happens here.
-// Warning 6328: (1978-2001): CHC: Assertion violation happens here.
-// Warning 6328: (2096-2122): CHC: Assertion violation happens here.
-// Warning 6328: (2154-2180): CHC: Assertion violation happens here.
-// Warning 6328: (2212-2234): CHC: Assertion violation happens here.
-// Warning 6328: (2266-2292): CHC: Assertion violation happens here.
-// Warning 6328: (2324-2350): CHC: Assertion violation happens here.
-// Warning 6328: (2382-2408): CHC: Assertion violation happens here.
-// Warning 6328: (2503-2531): CHC: Assertion violation happens here.
-// Warning 6328: (2563-2594): CHC: Assertion violation happens here.
-// Warning 6328: (2626-2653): CHC: Assertion violation happens here.
-// Warning 6328: (2685-2712): CHC: Assertion violation happens here.
-// Warning 6328: (2744-2773): CHC: Assertion violation happens here.
-// Warning 6328: (2805-2834): CHC: Assertion violation happens here.
-// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Warning 6328: (2105-2131): CHC: Assertion violation might happen here.
+// Warning 6328: (2141-2163): CHC: Assertion violation might happen here.
+// Warning 6328: (2209-2235): CHC: Assertion violation might happen here.
+// Warning 6328: (2245-2271): CHC: Assertion violation might happen here.
+// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Warning 3046: (1051-1080): BMC: Division by zero happens here.
+// Warning 7812: (2245-2271): BMC: Assertion violation might happen here.
+// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
index 21ed55c1c2..8211325276 100644
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_overflow.sol
@@ -2,14 +2,14 @@ type U8 is uint8;
 using {add as +} for U8 global;
 
 function add(U8 x, U8 y) pure returns (U8) {
-    return U8.wrap(U8.unwrap(x) + U8.unwrap(y)); // FIXME: should detect possible overflow here
+    return U8.wrap(U8.unwrap(x) + U8.unwrap(y)); // overflow detected
 }
 
 contract C {
-    U8 x = U8.wrap(254);
+    U8 x = U8.wrap(255);
 
     function inc() public {
-        x = x + U8.wrap(1); // FIXME: should detect possible overflow here
+        x = x + U8.wrap(1);
     }
 
     function check() view public {
@@ -20,5 +20,5 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 6756: (274-288): User-defined operators are not yet supported by SMTChecker. This invocation of operator + has been ignored, which may lead to incorrect results.
+// Warning 4984: (115-142): CHC: Overflow (resulting value larger than 255) happens here.
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 13c2d62146ba7330cce6146c3029d06f6f5c0dee Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Fri, 6 Oct 2023 12:16:02 +0200
Subject: [PATCH 1641/1748] apply CR changes

---
 libsolidity/ast/AST.h             |  3 ---
 libsolidity/formal/BMC.cpp        | 45 ++++++++++++++++++-------------
 libsolidity/formal/BMC.h          |  5 ++--
 libsolidity/formal/CHC.cpp        | 28 ++++++++++++-------
 libsolidity/formal/CHC.h          |  4 +--
 libsolidity/formal/SMTEncoder.cpp | 24 +++++++----------
 libsolidity/formal/SMTEncoder.h   |  7 +++--
 7 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index d651df33be..ca23b0d619 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -2111,7 +2111,6 @@ class UnaryOperation: public Expression
 	Token getOperator() const { return m_operator; }
 	bool isPrefixOperation() const { return m_isPrefix; }
 	Expression const& subExpression() const { return *m_subExpression; }
-	ASTPointer<Expression> const& argument() const { return m_subExpression; }
 
 	FunctionType const* userDefinedFunctionType() const;
 
@@ -2146,8 +2145,6 @@ class BinaryOperation: public Expression
 
 	Expression const& leftExpression() const { return *m_left; }
 	Expression const& rightExpression() const { return *m_right; }
-	ASTPointer<Expression> leftArgument() const { return m_left; }
-	ASTPointer<Expression> rightArgument() const { return m_right; }
 	Token getOperator() const { return m_operator; }
 
 	FunctionType const* userDefinedFunctionType() const;
diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index d8f3036881..87c8199879 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -554,9 +554,11 @@ void BMC::endVisit(UnaryOperation const& _op)
 	// User-defined operators are essentially function calls.
 	if (auto funDef = *_op.annotation().userDefinedFunction)
 	{
-		std::vector<ASTPointer<Expression const>> arguments;
-		arguments.push_back(_op.argument());
-		inlineFunctionCall(funDef, _op, &_op, _op.userDefinedFunctionType(), arguments);
+		std::vector<Expression const*> arguments;
+		arguments.push_back(&_op.subExpression());
+		// pushCallStack and defineExpr inside createReturnedExpression should be called on the expression
+		// in case of a user-defined operator call
+		inlineFunctionCall(funDef, _op, std::nullopt, arguments);
 		return;
 	}
 
@@ -580,10 +582,13 @@ void BMC::endVisit(BinaryOperation const& _op)
 
 	if (auto funDef = *_op.annotation().userDefinedFunction)
 	{
-		std::vector<ASTPointer<Expression const>> arguments;
-		arguments.push_back(_op.leftArgument());
-		arguments.push_back(_op.rightArgument());
-		inlineFunctionCall(funDef, _op, &_op, _op.userDefinedFunctionType(), arguments);
+		std::vector<Expression const*> arguments;
+		arguments.push_back(&_op.leftExpression());
+		arguments.push_back(&_op.rightExpression());
+
+		// pushCallStack and defineExpr inside createReturnedExpression should be called on the expression
+		// in case of a user-defined operator call
+		inlineFunctionCall(funDef, _op, std::nullopt, arguments);
 	}
 }
 
@@ -699,14 +704,11 @@ void BMC::visitAddMulMod(FunctionCall const& _funCall)
 void BMC::inlineFunctionCall(
 	FunctionDefinition const* _funDef,
 	Expression const& _callStackExpr,
-	Expression const* _calledExpr,
-	FunctionType const* _funType,
-	std::vector<ASTPointer<Expression const>> const& _arguments
+	std::optional<Expression const*> _calledExpr,
+	std::vector<Expression const*> const& _arguments
 )
 {
 	solAssert(_funDef, "");
-	solAssert(_funType, "");
-	solAssert(_calledExpr, "");
 
 	if (visitedFunction(_funDef))
 	{
@@ -719,7 +721,7 @@ void BMC::inlineFunctionCall(
 	}
 	else
 	{
-		initializeFunctionCallParameters(*_funDef, symbolicArguments(_funDef, _calledExpr, _funType, _arguments));
+		initializeFunctionCallParameters(*_funDef, symbolicArguments(_funDef->parameters(), _calledExpr, _arguments));
 
 		// The reason why we need to pushCallStack here instead of visit(FunctionDefinition)
 		// is that there we don't have `_callStackExpr`.
@@ -739,11 +741,18 @@ void BMC::inlineFunctionCall(FunctionCall const& _funCall)
 	solAssert(shouldInlineFunctionCall(_funCall, currentScopeContract(), m_currentContract), "");
 
 	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
-	Expression const* calledExpr = &_funCall.expression();
-	auto funType = dynamic_cast<FunctionType const*>(calledExpr->annotation().type);
-	std::vector<ASTPointer<Expression const>> arguments = _funCall.sortedArguments();
-
-	inlineFunctionCall(funDef, _funCall, calledExpr, funType, arguments);
+	Expression const* expr = &_funCall.expression();
+	auto funType = dynamic_cast<FunctionType const*>(expr->annotation().type);
+	std::optional<Expression const*> calledExpr =
+		funType->hasBoundFirstArgument() ? std::make_optional(expr) : std::nullopt;
+
+	std::vector<Expression const*> arguments;
+	for (auto& arg: _funCall.sortedArguments())
+		arguments.push_back(&(*arg));
+
+	// pushCallStack and defineExpr inside createReturnedExpression should be called
+	// on the FunctionCall object for the normal function call case
+	inlineFunctionCall(funDef, _funCall, calledExpr, arguments);
 }
 
 void BMC::internalOrExternalFunctionCall(FunctionCall const& _funCall)
diff --git a/libsolidity/formal/BMC.h b/libsolidity/formal/BMC.h
index 4aceadeea6..9daa168372 100644
--- a/libsolidity/formal/BMC.h
+++ b/libsolidity/formal/BMC.h
@@ -117,9 +117,8 @@ class BMC: public SMTEncoder
 	void inlineFunctionCall(
 		FunctionDefinition const* _funDef,
 		Expression const& _callStackExpr,
-		Expression const* _calledExpr,
-		FunctionType const* _funType,
-		std::vector<ASTPointer<Expression const>> const& _arguments
+		std::optional<Expression const*> _calledExpr,
+		std::vector<Expression const*> const& _arguments
 	);
 	/// Inlines if the function call is internal or external to `this`.
 	/// Erases knowledge about state variables if external.
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index bf19090f56..930ca9b675 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -549,8 +549,8 @@ void CHC::endVisit(UnaryOperation const& _op)
 
 	if (auto funDef = *_op.annotation().userDefinedFunction)
 	{
-		std::vector<ASTPointer<Expression const>> arguments;
-		arguments.push_back(_op.argument());
+		std::vector<Expression const*> arguments;
+		arguments.push_back(&_op.subExpression());
 		internalFunctionCall(funDef, &_op, _op.userDefinedFunctionType(), arguments, state().thisAddress());
 
 		createReturnedExpressions(funDef, _op);
@@ -563,9 +563,9 @@ void CHC::endVisit(BinaryOperation const& _op)
 
 	if (auto funDef = *_op.annotation().userDefinedFunction)
 	{
-		std::vector<ASTPointer<Expression const>> arguments;
-		arguments.push_back(_op.leftArgument());
-		arguments.push_back(_op.rightArgument());
+		std::vector<Expression const*> arguments;
+		arguments.push_back(&_op.leftExpression());
+		arguments.push_back(&_op.rightExpression());
 		internalFunctionCall(funDef, &_op, _op.userDefinedFunctionType(), arguments, state().thisAddress());
 
 		createReturnedExpressions(funDef, _op);
@@ -853,7 +853,7 @@ void CHC::internalFunctionCall(
 	FunctionDefinition const* _funDef,
 	Expression const* _calledExpr,
 	FunctionType const* _funType,
-	std::vector<ASTPointer<Expression const>> const& _arguments,
+	std::vector<Expression const*> const& _arguments,
 	smtutil::Expression _contractAddressValue
 )
 {
@@ -896,7 +896,6 @@ void CHC::internalFunctionCall(FunctionCall const& _funCall)
 
 	Expression const* calledExpr = &_funCall.expression();
 	auto funType = dynamic_cast<FunctionType const*>(calledExpr->annotation().type);
-	std::vector<ASTPointer<Expression const>> arguments = _funCall.sortedArguments();
 
 	auto contractAddressValue = [this](FunctionCall const& _f) {
 		auto [callExpr, callOptions] = functionCallExpression(_f);
@@ -909,6 +908,9 @@ void CHC::internalFunctionCall(FunctionCall const& _funCall)
 		solAssert(false, "Unreachable!");
 	};
 
+	std::vector<Expression const*> arguments;
+	for (auto& arg: _funCall.sortedArguments())
+		arguments.push_back(&(*arg));
 	internalFunctionCall(funDef, calledExpr, funType, arguments, contractAddressValue(_funCall));
 }
 
@@ -1095,7 +1097,10 @@ void CHC::externalFunctionCallToTrustedCode(FunctionCall const& _funCall)
 		state().readStateVars(*function->annotation().contract, contractAddressValue(_funCall));
 	}
 
-	smtutil::Expression pred = predicate(function, callExpr, &funType, _funCall.sortedArguments(), calledAddress);
+	std::vector<Expression const*> arguments;
+	for (auto& arg: _funCall.sortedArguments())
+		arguments.push_back(&(*arg));
+	smtutil::Expression pred = predicate(function, callExpr, &funType, arguments, calledAddress);
 
 	auto txConstraints = state().txTypeConstraints() && state().txFunctionConstraints(*function);
 	m_context.addAssertion(pred && txConstraints);
@@ -1810,7 +1815,7 @@ smtutil::Expression CHC::predicate(
 	FunctionDefinition const* _funDef,
 	Expression const* _calledExpr,
 	FunctionType const* _funType,
-	std::vector<ASTPointer<Expression const>> _arguments,
+	std::vector<Expression const*> _arguments,
 	smtutil::Expression _contractAddressValue
 )
 {
@@ -1833,7 +1838,10 @@ smtutil::Expression CHC::predicate(
 		contract = m_currentContract;
 
 	args += currentStateVariables(*contract);
-	args += symbolicArguments(_funDef, _calledExpr, _funType, _arguments);
+
+	std::optional<Expression const*> calledExpr =
+		_funType->hasBoundFirstArgument() ? std::make_optional(_calledExpr) : std::nullopt;
+	args += symbolicArguments(_funDef->parameters(), calledExpr, _arguments);
 	if (!usesStaticCall(_funDef, _funType))
 	{
 		state().newState();
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index 57bf807384..7f25d8a19e 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -133,7 +133,7 @@ class CHC: public SMTEncoder
 		FunctionDefinition const* _funDef,
 		Expression const* _calledExpr,
 		FunctionType const* _funType,
-		std::vector<ASTPointer<Expression const>> const& _arguments,
+		std::vector<Expression const*> const& _arguments,
 		smtutil::Expression _contractAddressValue
 	);
 	void externalFunctionCall(FunctionCall const& _funCall);
@@ -260,7 +260,7 @@ class CHC: public SMTEncoder
 		FunctionDefinition const* _funDef,
 		Expression const* _calledExpr,
 		FunctionType const* _funType,
-		std::vector<ASTPointer<Expression const>> _arguments,
+		std::vector<Expression const*> _arguments,
 		smtutil::Expression _contractAddressValue
 	);
 	/// @returns a predicate that defines a contract initializer for _contract in the context of _contractContext.
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index abb47fdd3b..34258397b8 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -3137,29 +3137,25 @@ void SMTEncoder::createReturnedExpressions(FunctionDefinition const* _funDef, Ex
 }
 
 std::vector<smtutil::Expression> SMTEncoder::symbolicArguments(
-	FunctionDefinition const* _funDef,
-	Expression const* _calledExpr,
-	FunctionType const* _funType,
-	std::vector<ASTPointer<Expression const>> const& _arguments)
+	std::vector<ASTPointer<VariableDeclaration>> const& _funParameters,
+	std::optional<Expression const*> _calledExpr,
+	std::vector<Expression const*> const& _arguments)
 {
-	solAssert(_funDef, "");
-	solAssert(_funType, "");
-
 	std::vector<smtutil::Expression> args;
-	auto functionParams = _funDef->parameters();
 	unsigned firstParam = 0;
-	if (_funType->hasBoundFirstArgument())
+	if (_calledExpr)
 	{
-		_calledExpr = innermostTuple(*_calledExpr);
-		auto const& attachedFunction = dynamic_cast<MemberAccess const*>(_calledExpr);
+		Expression const* calledExpr = innermostTuple(*_calledExpr.value());
+		auto const& attachedFunction = dynamic_cast<MemberAccess const*>(calledExpr);
 		solAssert(attachedFunction, "");
-		args.push_back(expr(attachedFunction->expression(), functionParams.front()->type()));
+		args.push_back(expr(attachedFunction->expression(), _funParameters.front()->type()));
 		firstParam = 1;
 	}
 
-	solAssert((_arguments.size() + firstParam) == functionParams.size(), "");
+	solAssert((_arguments.size() + firstParam) == _funParameters.size(), "");
+
 	for (unsigned i = 0; i < _arguments.size(); ++i)
-		args.push_back(expr(*_arguments.at(i), functionParams.at(i + firstParam)->type()));
+		args.push_back(expr(*_arguments.at(i), _funParameters.at(i + firstParam)->type()));
 
 	return args;
 }
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index e88a2400e6..4e2b8112ba 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -409,10 +409,9 @@ class SMTEncoder: public ASTConstVisitor
 	/// taking into account attached functions and
 	/// type conversion.
 	std::vector<smtutil::Expression> symbolicArguments(
-		FunctionDefinition const* _funDef,
-		Expression const* _calledExpr,
-		FunctionType const* _funType,
-		std::vector<ASTPointer<Expression const>> const& _arguments
+		std::vector<ASTPointer<VariableDeclaration>> const& _funParameters,
+		std::optional<Expression const*> _calledExpr,
+		std::vector<Expression const*> const& _arguments
 	);
 
 	smtutil::Expression constantExpr(Expression const& _expr, VariableDeclaration const& _var);

From 353dbdde8a31c7a1d1dc35ff1bbf310707251fa2 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Thu, 19 Oct 2023 16:26:30 +0200
Subject: [PATCH 1642/1748] refactor: rename calledExpr to boundArgumentCall

---
 libsolidity/formal/BMC.cpp        |  8 ++++----
 libsolidity/formal/CHC.cpp        | 22 ++++++++++------------
 libsolidity/formal/CHC.h          |  4 ++--
 libsolidity/formal/SMTEncoder.cpp |  9 +++++----
 libsolidity/formal/SMTEncoder.h   |  4 ++--
 5 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/libsolidity/formal/BMC.cpp b/libsolidity/formal/BMC.cpp
index 87c8199879..b16182af8c 100644
--- a/libsolidity/formal/BMC.cpp
+++ b/libsolidity/formal/BMC.cpp
@@ -704,7 +704,7 @@ void BMC::visitAddMulMod(FunctionCall const& _funCall)
 void BMC::inlineFunctionCall(
 	FunctionDefinition const* _funDef,
 	Expression const& _callStackExpr,
-	std::optional<Expression const*> _calledExpr,
+	std::optional<Expression const*> _boundArgumentCall,
 	std::vector<Expression const*> const& _arguments
 )
 {
@@ -721,7 +721,7 @@ void BMC::inlineFunctionCall(
 	}
 	else
 	{
-		initializeFunctionCallParameters(*_funDef, symbolicArguments(_funDef->parameters(), _calledExpr, _arguments));
+		initializeFunctionCallParameters(*_funDef, symbolicArguments(_funDef->parameters(), _arguments, _boundArgumentCall));
 
 		// The reason why we need to pushCallStack here instead of visit(FunctionDefinition)
 		// is that there we don't have `_callStackExpr`.
@@ -743,7 +743,7 @@ void BMC::inlineFunctionCall(FunctionCall const& _funCall)
 	auto funDef = functionCallToDefinition(_funCall, currentScopeContract(), m_currentContract);
 	Expression const* expr = &_funCall.expression();
 	auto funType = dynamic_cast<FunctionType const*>(expr->annotation().type);
-	std::optional<Expression const*> calledExpr =
+	std::optional<Expression const*> boundArgumentCall =
 		funType->hasBoundFirstArgument() ? std::make_optional(expr) : std::nullopt;
 
 	std::vector<Expression const*> arguments;
@@ -752,7 +752,7 @@ void BMC::inlineFunctionCall(FunctionCall const& _funCall)
 
 	// pushCallStack and defineExpr inside createReturnedExpression should be called
 	// on the FunctionCall object for the normal function call case
-	inlineFunctionCall(funDef, _funCall, calledExpr, arguments);
+	inlineFunctionCall(funDef, _funCall, boundArgumentCall, arguments);
 }
 
 void BMC::internalOrExternalFunctionCall(FunctionCall const& _funCall)
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 930ca9b675..09a9af8ffe 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -551,7 +551,7 @@ void CHC::endVisit(UnaryOperation const& _op)
 	{
 		std::vector<Expression const*> arguments;
 		arguments.push_back(&_op.subExpression());
-		internalFunctionCall(funDef, &_op, _op.userDefinedFunctionType(), arguments, state().thisAddress());
+		internalFunctionCall(funDef, std::nullopt, _op.userDefinedFunctionType(), arguments, state().thisAddress());
 
 		createReturnedExpressions(funDef, _op);
 	}
@@ -566,7 +566,7 @@ void CHC::endVisit(BinaryOperation const& _op)
 		std::vector<Expression const*> arguments;
 		arguments.push_back(&_op.leftExpression());
 		arguments.push_back(&_op.rightExpression());
-		internalFunctionCall(funDef, &_op, _op.userDefinedFunctionType(), arguments, state().thisAddress());
+		internalFunctionCall(funDef, std::nullopt, _op.userDefinedFunctionType(), arguments, state().thisAddress());
 
 		createReturnedExpressions(funDef, _op);
 	}
@@ -851,14 +851,13 @@ void CHC::visitDeployment(FunctionCall const& _funCall)
 
 void CHC::internalFunctionCall(
 	FunctionDefinition const* _funDef,
-	Expression const* _calledExpr,
+	std::optional<Expression const*> _boundArgumentCall,
 	FunctionType const* _funType,
 	std::vector<Expression const*> const& _arguments,
 	smtutil::Expression _contractAddressValue
 )
 {
 	solAssert(m_currentContract, "");
-	solAssert(_calledExpr, "");
 	solAssert(_funType, "");
 
 	if (_funDef)
@@ -869,7 +868,7 @@ void CHC::internalFunctionCall(
 			m_callGraph[m_currentContract].insert(_funDef);
 	}
 
-	m_context.addAssertion(predicate(_funDef, _calledExpr, _funType, _arguments, _contractAddressValue));
+	m_context.addAssertion(predicate(_funDef, _boundArgumentCall, _funType, _arguments, _contractAddressValue));
 
 	solAssert(m_errorDest, "");
 	connectBlocks(
@@ -911,7 +910,10 @@ void CHC::internalFunctionCall(FunctionCall const& _funCall)
 	std::vector<Expression const*> arguments;
 	for (auto& arg: _funCall.sortedArguments())
 		arguments.push_back(&(*arg));
-	internalFunctionCall(funDef, calledExpr, funType, arguments, contractAddressValue(_funCall));
+
+	std::optional<Expression const*> boundArgumentCall =
+		funType->hasBoundFirstArgument() ? std::make_optional(calledExpr) : std::nullopt;
+	internalFunctionCall(funDef, boundArgumentCall, funType, arguments, contractAddressValue(_funCall));
 }
 
 void CHC::addNondetCalls(ContractDefinition const& _contract)
@@ -1813,13 +1815,12 @@ smtutil::Expression CHC::predicate(Predicate const& _block)
 
 smtutil::Expression CHC::predicate(
 	FunctionDefinition const* _funDef,
-	Expression const* _calledExpr,
+	std::optional<Expression const*> _boundArgumentCall,
 	FunctionType const* _funType,
 	std::vector<Expression const*> _arguments,
 	smtutil::Expression _contractAddressValue
 )
 {
-	solAssert(_calledExpr, "");
 	solAssert(_funType, "");
 	auto kind = _funType->kind();
 	solAssert(kind == FunctionType::Kind::Internal || kind == FunctionType::Kind::External || kind == FunctionType::Kind::BareStaticCall, "");
@@ -1838,10 +1839,7 @@ smtutil::Expression CHC::predicate(
 		contract = m_currentContract;
 
 	args += currentStateVariables(*contract);
-
-	std::optional<Expression const*> calledExpr =
-		_funType->hasBoundFirstArgument() ? std::make_optional(_calledExpr) : std::nullopt;
-	args += symbolicArguments(_funDef->parameters(), calledExpr, _arguments);
+	args += symbolicArguments(_funDef->parameters(), _arguments, _boundArgumentCall);
 	if (!usesStaticCall(_funDef, _funType))
 	{
 		state().newState();
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index 7f25d8a19e..fe7387bd35 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -131,7 +131,7 @@ class CHC: public SMTEncoder
 	void internalFunctionCall(FunctionCall const& _funCall);
 	void internalFunctionCall(
 		FunctionDefinition const* _funDef,
-		Expression const* _calledExpr,
+		std::optional<Expression const*> _boundArgumentCall,
 		FunctionType const* _funType,
 		std::vector<Expression const*> const& _arguments,
 		smtutil::Expression _contractAddressValue
@@ -258,7 +258,7 @@ class CHC: public SMTEncoder
 	/// @returns the summary predicate for the called function.
 	smtutil::Expression predicate(
 		FunctionDefinition const* _funDef,
-		Expression const* _calledExpr,
+		std::optional<Expression const*> _boundArgumentCall,
 		FunctionType const* _funType,
 		std::vector<Expression const*> _arguments,
 		smtutil::Expression _contractAddressValue
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index 34258397b8..ae3a06869d 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -3138,14 +3138,15 @@ void SMTEncoder::createReturnedExpressions(FunctionDefinition const* _funDef, Ex
 
 std::vector<smtutil::Expression> SMTEncoder::symbolicArguments(
 	std::vector<ASTPointer<VariableDeclaration>> const& _funParameters,
-	std::optional<Expression const*> _calledExpr,
-	std::vector<Expression const*> const& _arguments)
+	std::vector<Expression const*> const& _arguments,
+	std::optional<Expression const*> _boundArgumentCall
+)
 {
 	std::vector<smtutil::Expression> args;
 	unsigned firstParam = 0;
-	if (_calledExpr)
+	if (_boundArgumentCall)
 	{
-		Expression const* calledExpr = innermostTuple(*_calledExpr.value());
+		Expression const* calledExpr = innermostTuple(*_boundArgumentCall.value());
 		auto const& attachedFunction = dynamic_cast<MemberAccess const*>(calledExpr);
 		solAssert(attachedFunction, "");
 		args.push_back(expr(attachedFunction->expression(), _funParameters.front()->type()));
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 4e2b8112ba..69010fb1cf 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -410,8 +410,8 @@ class SMTEncoder: public ASTConstVisitor
 	/// type conversion.
 	std::vector<smtutil::Expression> symbolicArguments(
 		std::vector<ASTPointer<VariableDeclaration>> const& _funParameters,
-		std::optional<Expression const*> _calledExpr,
-		std::vector<Expression const*> const& _arguments
+		std::vector<Expression const*> const& _arguments,
+		std::optional<Expression const*> _calledExpr
 	);
 
 	smtutil::Expression constantExpr(Expression const& _expr, VariableDeclaration const& _var);

From da7c00e1e5f64293d5283cd5fe1a39391ad17966 Mon Sep 17 00:00:00 2001
From: Pawel Gebal <pawel.gebal@imapp.pl>
Date: Fri, 20 Oct 2023 16:39:51 +0200
Subject: [PATCH 1643/1748] fix test error

---
 libsolidity/formal/CHC.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 09a9af8ffe..3cd1524599 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -1102,7 +1102,7 @@ void CHC::externalFunctionCallToTrustedCode(FunctionCall const& _funCall)
 	std::vector<Expression const*> arguments;
 	for (auto& arg: _funCall.sortedArguments())
 		arguments.push_back(&(*arg));
-	smtutil::Expression pred = predicate(function, callExpr, &funType, arguments, calledAddress);
+	smtutil::Expression pred = predicate(function, std::nullopt, &funType, arguments, calledAddress);
 
 	auto txConstraints = state().txTypeConstraints() && state().txFunctionConstraints(*function);
 	m_context.addAssertion(pred && txConstraints);

From f8282a6ab31fe023c0c781f970a68407d94b72f0 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Mon, 9 Oct 2023 13:36:11 +0200
Subject: [PATCH 1644/1748] Add tests that fail.

---
 .../scoped_var_ref_in_function_call.yul       | 23 +++++++++++++++++++
 .../loadResolver/scoped_var_ref_in_keccak.yul | 22 ++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul
 create mode 100644 test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul

diff --git a/test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul b/test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul
new file mode 100644
index 0000000000..a71be79e14
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul
@@ -0,0 +1,23 @@
+{
+    function f(x) {}
+    let x
+    {
+        x := add(1, calldataload(0))
+    }
+    f(call(2, 0, 1, mod(x, 8), 1, 1, 1))
+}
+// ----
+// step: fullSimplify
+//
+// {
+//     {
+//         let x_1
+//         {
+//             let _2 := calldataload(x_1)
+//             let _3 := 1
+//             x_1 := add(_3, _2)
+//         }
+//         let _4 := 1
+//         pop(call(2, 0, _4, addmod(_3, _2, 8), _4, _4, _4))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul b/test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul
new file mode 100644
index 0000000000..d61f5d3152
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul
@@ -0,0 +1,22 @@
+{
+    let x
+    {
+        let y := msize()
+        x := add(4, y)
+    }
+    x := keccak256(0, mod(x, 2))
+}
+// ----
+// step: loadResolver
+//
+// {
+//     {
+//         let x
+//         {
+//             let y := msize()
+//             let _1 := 4
+//             x := add(_1, y)
+//         }
+//         x := keccak256(0, addmod(_1, y, 2))
+//     }
+// }

From a3ad63eff49276f9b4c0884b55cfeb0d22d96281 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Wed, 18 Oct 2023 11:45:03 +0200
Subject: [PATCH 1645/1748] Add missing optimizer dependencies for fullSimplify
 and loadResolver tests and update tests.

---
 test/libyul/YulOptimizerTestCommon.cpp                |  4 ++++
 .../fullSimplify/scoped_var_ref_in_function_call.yul  | 11 ++++-------
 .../loadResolver/scoped_var_ref_in_keccak.yul         |  8 +++-----
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index bcf180add5..31ab55e964 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -194,6 +194,8 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 		}},
 		{"fullSimplify", [&]() {
 			disambiguate();
+			FunctionGrouper::run(*m_context, *m_ast);
+			BlockFlattener::run(*m_context, *m_ast);
 			ExpressionSplitter::run(*m_context, *m_ast);
 			ForLoopInitRewriter::run(*m_context, *m_ast);
 			FunctionHoister::run(*m_context, *m_ast);
@@ -259,6 +261,8 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 		}},
 		{"loadResolver", [&]() {
 			disambiguate();
+			FunctionGrouper::run(*m_context, *m_ast);
+			BlockFlattener::run(*m_context, *m_ast);
 			ForLoopInitRewriter::run(*m_context, *m_ast);
 			FunctionHoister::run(*m_context, *m_ast);
 			ExpressionSplitter::run(*m_context, *m_ast);
diff --git a/test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul b/test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul
index a71be79e14..38e5ab2108 100644
--- a/test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul
+++ b/test/libyul/yulOptimizerTests/fullSimplify/scoped_var_ref_in_function_call.yul
@@ -12,12 +12,9 @@
 // {
 //     {
 //         let x_1
-//         {
-//             let _2 := calldataload(x_1)
-//             let _3 := 1
-//             x_1 := add(_3, _2)
-//         }
-//         let _4 := 1
-//         pop(call(2, 0, _4, addmod(_3, _2, 8), _4, _4, _4))
+//         let _2 := calldataload(x_1)
+//         let _3 := 1
+//         x_1 := add(_3, _2)
+//         pop(call(2, 0, _3, addmod(_3, _2, 8), _3, _3, _3))
 //     }
 // }
diff --git a/test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul b/test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul
index d61f5d3152..7466013381 100644
--- a/test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul
+++ b/test/libyul/yulOptimizerTests/loadResolver/scoped_var_ref_in_keccak.yul
@@ -12,11 +12,9 @@
 // {
 //     {
 //         let x
-//         {
-//             let y := msize()
-//             let _1 := 4
-//             x := add(_1, y)
-//         }
+//         let y := msize()
+//         let _1 := 4
+//         x := add(_1, y)
 //         x := keccak256(0, addmod(_1, y, 2))
 //     }
 // }

From f0f23931816a1d65875d8a96923a554380fc1042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 10 Oct 2023 15:34:16 +0200
Subject: [PATCH 1646/1748] cmdlineTests.sh: Remove the empty line after the
 pre-release warning as well

- Until now it was being removed along with the leading/trailing whitespace that we strip so it did not matter. Now the EVM deprecation warning can get before this warning, preserving the whitespace and making CLI tests fail.
---
 test/cmdlineTests.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cmdlineTests.sh b/test/cmdlineTests.sh
index 6e14ac2dfc..3166cd6b5d 100755
--- a/test/cmdlineTests.sh
+++ b/test/cmdlineTests.sh
@@ -240,9 +240,9 @@ EOF
         sed -i.bak -e 's/\(\\"version\\":[ ]*\\"\)[^"\\]*\(\\"\)/\1<VERSION REMOVED>\2/' "$stdout_path"
         rm "$stdout_path.bak"
     else
-        sed -i.bak -e '/^Warning: This is a pre-release compiler version, please do not use it in production./d' "$stderr_path"
+        sed -i.bak -e '/^Warning: This is a pre-release compiler version, please do not use it in production./,+1d' "$stderr_path"
         sed -i.bak -e '/^Compiler run successful, no output requested\.$/d' "$stderr_path"
-        sed -i.bak -e '/^Warning (3805): This is a pre-release compiler version, please do not use it in production./d' "$stderr_path"
+        sed -i.bak -e '/^Warning (3805): This is a pre-release compiler version, please do not use it in production./,+1d' "$stderr_path"
         sed -i.bak -e 's/\(^[ ]*auxdata: \)0x[0-9a-f]*$/\1<AUXDATA REMOVED>/' "$stdout_path"
         sed -i.bak -e 's/ Consider adding "pragma .*$//' "$stderr_path"
         sed -i.bak -e 's/\(Unimplemented feature error.* in \).*$/\1<FILENAME REMOVED>/' "$stderr_path"

From 2f01aa3365ac054cac0994dc5f6a15c64c562ba7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 6 Oct 2023 17:42:11 +0200
Subject: [PATCH 1647/1748] Issue a deprecation warning for byzantium and older
 EVM versions

---
 Changelog.md                                  |  1 +
 docs/using-the-compiler.rst                   | 10 +++++-----
 libsolidity/interface/StandardCompiler.cpp    |  6 ++++++
 solc/CommandLineInterface.cpp                 |  6 ++++++
 .../ast_json_import_wrong_evmVersion/err      |  1 +
 test/cmdlineTests/evm_version_byzantium/args  |  1 +
 test/cmdlineTests/evm_version_byzantium/err   |  3 +++
 .../evm_version_byzantium/input.sol           |  1 +
 .../evm_version_constantinople/args           |  1 +
 .../evm_version_constantinople/err            |  2 ++
 .../evm_version_constantinople/input.sol      |  1 +
 .../standard_evm_version_byzantium/input.json |  9 +++++++++
 .../output.json                               | 19 +++++++++++++++++++
 .../input.json                                |  9 +++++++++
 .../output.json                               |  9 +++++++++
 .../output.json                               | 10 ++++++++++
 .../input.json                                |  9 +++++++++
 .../output.json                               | 12 ++++++++++++
 .../input.json                                |  9 +++++++++
 .../output.json                               |  2 ++
 .../strict_asm_evm_version_byzantium/args     |  1 +
 .../strict_asm_evm_version_byzantium/err      |  1 +
 .../input.yul                                 |  1 +
 .../strict_asm_evm_version_byzantium/output   | 15 +++++++++++++++
 .../args                                      |  1 +
 .../input.yul                                 |  1 +
 .../output                                    | 15 +++++++++++++++
 27 files changed, 151 insertions(+), 5 deletions(-)
 create mode 100644 test/cmdlineTests/evm_version_byzantium/args
 create mode 100644 test/cmdlineTests/evm_version_byzantium/err
 create mode 100644 test/cmdlineTests/evm_version_byzantium/input.sol
 create mode 100644 test/cmdlineTests/evm_version_constantinople/args
 create mode 100644 test/cmdlineTests/evm_version_constantinople/err
 create mode 100644 test/cmdlineTests/evm_version_constantinople/input.sol
 create mode 100644 test/cmdlineTests/standard_evm_version_byzantium/input.json
 create mode 100644 test/cmdlineTests/standard_evm_version_byzantium/output.json
 create mode 100644 test/cmdlineTests/standard_evm_version_constantinople/input.json
 create mode 100644 test/cmdlineTests/standard_evm_version_constantinople/output.json
 create mode 100644 test/cmdlineTests/standard_yul_evm_version_byzantium/input.json
 create mode 100644 test/cmdlineTests/standard_yul_evm_version_byzantium/output.json
 create mode 100644 test/cmdlineTests/standard_yul_evm_version_constantinople/input.json
 create mode 100644 test/cmdlineTests/standard_yul_evm_version_constantinople/output.json
 create mode 100644 test/cmdlineTests/strict_asm_evm_version_byzantium/args
 create mode 100644 test/cmdlineTests/strict_asm_evm_version_byzantium/err
 create mode 100644 test/cmdlineTests/strict_asm_evm_version_byzantium/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_evm_version_byzantium/output
 create mode 100644 test/cmdlineTests/strict_asm_evm_version_constantinople/args
 create mode 100644 test/cmdlineTests/strict_asm_evm_version_constantinople/input.yul
 create mode 100644 test/cmdlineTests/strict_asm_evm_version_constantinople/output

diff --git a/Changelog.md b/Changelog.md
index 9c64ba690e..ad4e9495be 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Language Features:
 Compiler Features:
  * Commandline Interface: Add ``--no-import-callback`` option that prevents the compiler from loading source files not given explicitly on the CLI or in Standard JSON input.
  * Commandline Interface: Use proper severity and coloring also for error messages produced outside of the compilation pipeline.
+ * EVM: Deprecate support for "homestead", "tangerineWhistle", "spuriousDragon" and "byzantium" EVM versions.
  * Parser: Remove the experimental error recovery mode (``--error-recovery`` / ``settings.parserErrorRecovery``).
  * SMTChecker: Support user-defined operators.
  * Yul Optimizer: If ``PUSH0`` is supported, favor zero literals over storing zero values in variables.
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 4df00d975a..f985ad1375 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -147,14 +147,14 @@ Target Options
 Below is a list of target EVM versions and the compiler-relevant changes introduced
 at each version. Backward compatibility is not guaranteed between each version.
 
-- ``homestead``
+- ``homestead`` (*support deprecated*)
    - (oldest version)
-- ``tangerineWhistle``
+- ``tangerineWhistle`` (*support deprecated*)
    - Gas cost for access to other accounts increased, relevant for gas estimation and the optimizer.
    - All gas sent by default for external calls, previously a certain amount had to be retained.
-- ``spuriousDragon``
+- ``spuriousDragon`` (*support deprecated*)
    - Gas cost for the ``exp`` opcode increased, relevant for gas estimation and the optimizer.
-- ``byzantium``
+- ``byzantium`` (*support deprecated*)
    - Opcodes ``returndatacopy``, ``returndatasize`` and ``staticcall`` are available in assembly.
    - The ``staticcall`` opcode is used when calling non-library view or pure functions, which prevents the functions from modifying state at the EVM level, i.e., even applies when you use invalid type conversions.
    - It is possible to access dynamic data returned from function calls.
@@ -318,7 +318,7 @@ Input Description
         // Affects type checking and code generation. Can be homestead,
         // tangerineWhistle, spuriousDragon, byzantium, constantinople,
         // petersburg, istanbul, berlin, london, paris or shanghai (default)
-        "evmVersion": "byzantium",
+        "evmVersion": "shanghai",
         // Optional: Change compilation pipeline to go through the Yul intermediate representation.
         // This is false by default.
         "viaIR": true,
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index c46be3b22a..d80713a800 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -787,6 +787,12 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		std::optional<langutil::EVMVersion> version = langutil::EVMVersion::fromString(settings["evmVersion"].asString());
 		if (!version)
 			return formatFatalError(Error::Type::JSONError, "Invalid EVM version requested.");
+		if (version < EVMVersion::constantinople())
+			ret.errors.append(formatError(
+				Error::Type::Warning,
+				"general",
+				"Support for EVM versions older than constantinople is deprecated and will be removed in the future."
+			));
 		ret.evmVersion = *version;
 	}
 
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 218f89f02e..1dc2a59f06 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -681,6 +681,12 @@ bool CommandLineInterface::parseArguments(int _argc, char const* const* _argv)
 
 void CommandLineInterface::processInput()
 {
+	if (m_options.output.evmVersion < EVMVersion::constantinople())
+		report(
+			Error::Severity::Warning,
+			"Support for EVM versions older than constantinople is deprecated and will be removed in the future."
+		);
+
 	switch (m_options.input.mode)
 	{
 	case InputMode::Help:
diff --git a/test/cmdlineTests/ast_json_import_wrong_evmVersion/err b/test/cmdlineTests/ast_json_import_wrong_evmVersion/err
index 8fbb021336..b969e349df 100644
--- a/test/cmdlineTests/ast_json_import_wrong_evmVersion/err
+++ b/test/cmdlineTests/ast_json_import_wrong_evmVersion/err
@@ -1 +1,2 @@
+Warning: Support for EVM versions older than constantinople is deprecated and will be removed in the future.
 Error: Failed to import AST: Imported tree evm version differs from configured evm version!
diff --git a/test/cmdlineTests/evm_version_byzantium/args b/test/cmdlineTests/evm_version_byzantium/args
new file mode 100644
index 0000000000..3a732cc015
--- /dev/null
+++ b/test/cmdlineTests/evm_version_byzantium/args
@@ -0,0 +1 @@
+--evm-version byzantium
diff --git a/test/cmdlineTests/evm_version_byzantium/err b/test/cmdlineTests/evm_version_byzantium/err
new file mode 100644
index 0000000000..accbb596cb
--- /dev/null
+++ b/test/cmdlineTests/evm_version_byzantium/err
@@ -0,0 +1,3 @@
+Warning: Support for EVM versions older than constantinople is deprecated and will be removed in the future.
+Warning: Source file does not specify required compiler version!
+--> evm_version_byzantium/input.sol
diff --git a/test/cmdlineTests/evm_version_byzantium/input.sol b/test/cmdlineTests/evm_version_byzantium/input.sol
new file mode 100644
index 0000000000..ea448e2899
--- /dev/null
+++ b/test/cmdlineTests/evm_version_byzantium/input.sol
@@ -0,0 +1 @@
+// SPDX-License-Identifier: GPL-3.0
diff --git a/test/cmdlineTests/evm_version_constantinople/args b/test/cmdlineTests/evm_version_constantinople/args
new file mode 100644
index 0000000000..fa2c596e37
--- /dev/null
+++ b/test/cmdlineTests/evm_version_constantinople/args
@@ -0,0 +1 @@
+--evm-version constantinople
diff --git a/test/cmdlineTests/evm_version_constantinople/err b/test/cmdlineTests/evm_version_constantinople/err
new file mode 100644
index 0000000000..69f328f54e
--- /dev/null
+++ b/test/cmdlineTests/evm_version_constantinople/err
@@ -0,0 +1,2 @@
+Warning: Source file does not specify required compiler version!
+--> evm_version_constantinople/input.sol
diff --git a/test/cmdlineTests/evm_version_constantinople/input.sol b/test/cmdlineTests/evm_version_constantinople/input.sol
new file mode 100644
index 0000000000..ea448e2899
--- /dev/null
+++ b/test/cmdlineTests/evm_version_constantinople/input.sol
@@ -0,0 +1 @@
+// SPDX-License-Identifier: GPL-3.0
diff --git a/test/cmdlineTests/standard_evm_version_byzantium/input.json b/test/cmdlineTests/standard_evm_version_byzantium/input.json
new file mode 100644
index 0000000000..9f9c06f8f7
--- /dev/null
+++ b/test/cmdlineTests/standard_evm_version_byzantium/input.json
@@ -0,0 +1,9 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"input.sol": {"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+	},
+	"settings": {
+		"evmVersion": "byzantium"
+	}
+}
diff --git a/test/cmdlineTests/standard_evm_version_byzantium/output.json b/test/cmdlineTests/standard_evm_version_byzantium/output.json
new file mode 100644
index 0000000000..b2428b1050
--- /dev/null
+++ b/test/cmdlineTests/standard_evm_version_byzantium/output.json
@@ -0,0 +1,19 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
+            "message": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
+    "sources":
+    {
+        "input.sol":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_evm_version_constantinople/input.json b/test/cmdlineTests/standard_evm_version_constantinople/input.json
new file mode 100644
index 0000000000..965c389793
--- /dev/null
+++ b/test/cmdlineTests/standard_evm_version_constantinople/input.json
@@ -0,0 +1,9 @@
+{
+	"language": "Solidity",
+	"sources": {
+		"input.sol": {"content": "// SPDX-License-Identifier: GPL-3.0\npragma solidity *;"}
+	},
+	"settings": {
+		"evmVersion": "constantinople"
+	}
+}
diff --git a/test/cmdlineTests/standard_evm_version_constantinople/output.json b/test/cmdlineTests/standard_evm_version_constantinople/output.json
new file mode 100644
index 0000000000..1ce414a4cc
--- /dev/null
+++ b/test/cmdlineTests/standard_evm_version_constantinople/output.json
@@ -0,0 +1,9 @@
+{
+    "sources":
+    {
+        "input.sol":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json b/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json
index acf3b74ef1..f3a09c9e7b 100644
--- a/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json
+++ b/test/cmdlineTests/standard_missing_key_useLiteralContent/output.json
@@ -1,4 +1,14 @@
 {
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
+            "message": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ],
     "sources":
     {
         "A":
diff --git a/test/cmdlineTests/standard_yul_evm_version_byzantium/input.json b/test/cmdlineTests/standard_yul_evm_version_byzantium/input.json
new file mode 100644
index 0000000000..f51ffed84c
--- /dev/null
+++ b/test/cmdlineTests/standard_yul_evm_version_byzantium/input.json
@@ -0,0 +1,9 @@
+{
+	"language": "Yul",
+	"sources": {
+		"input.yul": {"content": "{}"}
+	},
+	"settings": {
+		"evmVersion": "byzantium"
+	}
+}
diff --git a/test/cmdlineTests/standard_yul_evm_version_byzantium/output.json b/test/cmdlineTests/standard_yul_evm_version_byzantium/output.json
new file mode 100644
index 0000000000..9fff562796
--- /dev/null
+++ b/test/cmdlineTests/standard_yul_evm_version_byzantium/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
+            "message": "Support for EVM versions older than constantinople is deprecated and will be removed in the future.",
+            "severity": "warning",
+            "type": "Warning"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_yul_evm_version_constantinople/input.json b/test/cmdlineTests/standard_yul_evm_version_constantinople/input.json
new file mode 100644
index 0000000000..9b0043cfe7
--- /dev/null
+++ b/test/cmdlineTests/standard_yul_evm_version_constantinople/input.json
@@ -0,0 +1,9 @@
+{
+	"language": "Yul",
+	"sources": {
+		"input.yul": {"content": "{}"}
+	},
+	"settings": {
+		"evmVersion": "constantinople"
+	}
+}
diff --git a/test/cmdlineTests/standard_yul_evm_version_constantinople/output.json b/test/cmdlineTests/standard_yul_evm_version_constantinople/output.json
new file mode 100644
index 0000000000..2c63c08510
--- /dev/null
+++ b/test/cmdlineTests/standard_yul_evm_version_constantinople/output.json
@@ -0,0 +1,2 @@
+{
+}
diff --git a/test/cmdlineTests/strict_asm_evm_version_byzantium/args b/test/cmdlineTests/strict_asm_evm_version_byzantium/args
new file mode 100644
index 0000000000..468f02fa77
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_evm_version_byzantium/args
@@ -0,0 +1 @@
+--strict-assembly --evm-version byzantium
diff --git a/test/cmdlineTests/strict_asm_evm_version_byzantium/err b/test/cmdlineTests/strict_asm_evm_version_byzantium/err
new file mode 100644
index 0000000000..603b329dc2
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_evm_version_byzantium/err
@@ -0,0 +1 @@
+Warning: Support for EVM versions older than constantinople is deprecated and will be removed in the future.
diff --git a/test/cmdlineTests/strict_asm_evm_version_byzantium/input.yul b/test/cmdlineTests/strict_asm_evm_version_byzantium/input.yul
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_evm_version_byzantium/input.yul
@@ -0,0 +1 @@
+{}
diff --git a/test/cmdlineTests/strict_asm_evm_version_byzantium/output b/test/cmdlineTests/strict_asm_evm_version_byzantium/output
new file mode 100644
index 0000000000..3a23390a40
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_evm_version_byzantium/output
@@ -0,0 +1,15 @@
+
+======= strict_asm_evm_version_byzantium/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code { { } }
+}
+
+
+Binary representation:
+00
+
+Text representation:
+    /* "strict_asm_evm_version_byzantium/input.yul":0:2   */
+  stop
diff --git a/test/cmdlineTests/strict_asm_evm_version_constantinople/args b/test/cmdlineTests/strict_asm_evm_version_constantinople/args
new file mode 100644
index 0000000000..a59b0eb0b3
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_evm_version_constantinople/args
@@ -0,0 +1 @@
+--strict-assembly --evm-version constantinople
diff --git a/test/cmdlineTests/strict_asm_evm_version_constantinople/input.yul b/test/cmdlineTests/strict_asm_evm_version_constantinople/input.yul
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_evm_version_constantinople/input.yul
@@ -0,0 +1 @@
+{}
diff --git a/test/cmdlineTests/strict_asm_evm_version_constantinople/output b/test/cmdlineTests/strict_asm_evm_version_constantinople/output
new file mode 100644
index 0000000000..c8febd6f17
--- /dev/null
+++ b/test/cmdlineTests/strict_asm_evm_version_constantinople/output
@@ -0,0 +1,15 @@
+
+======= strict_asm_evm_version_constantinople/input.yul (EVM) =======
+
+Pretty printed source:
+object "object" {
+    code { { } }
+}
+
+
+Binary representation:
+00
+
+Text representation:
+    /* "strict_asm_evm_version_constantinople/input.yul":0:2   */
+  stop

From 127a390066825e65e7cd7b88971d58e6a09d1752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 10 Oct 2023 15:15:16 +0200
Subject: [PATCH 1648/1748] docs: Fix broken style in the description of
 shanghai EVM features

---
 docs/using-the-compiler.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index f985ad1375..fb15f9b882 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -175,7 +175,7 @@ at each version. Backward compatibility is not guaranteed between each version.
 - ``paris``
    - Introduces ``prevrandao()`` and ``block.prevrandao``, and changes the semantics of the now deprecated ``block.difficulty``, disallowing ``difficulty()`` in inline assembly (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
 - ``shanghai`` (**default**)
-  - Smaller code size and gas savings due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
+   - Smaller code size and gas savings due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:

From 2b8c9975b7118aaaf553f0db6e75377f48c36bd7 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 10 Aug 2022 15:48:06 +0200
Subject: [PATCH 1649/1748] Special case code generation for for loops.

---
 Changelog.md                                  |   1 +
 docs/using-the-compiler.rst                   |   3 +
 libsolidity/analysis/PostTypeChecker.cpp      | 126 +++++++++++++
 libsolidity/analysis/PostTypeChecker.h        |   3 +
 libsolidity/ast/ASTAnnotations.h              |   1 +
 libsolidity/ast/ASTJsonExporter.cpp           |  10 +-
 libsolidity/codegen/ContractCompiler.cpp      |   9 +
 libsolidity/codegen/ir/IRGenerator.cpp        |  14 +-
 libsolidity/codegen/ir/IRGenerator.h          |   8 +-
 .../codegen/ir/IRGeneratorForStatements.cpp   |  15 +-
 .../codegen/ir/IRGeneratorForStatements.h     |   9 +-
 libsolidity/interface/CompilerStack.cpp       |   4 +-
 libsolidity/interface/OptimiserSettings.h     |  12 +-
 libsolidity/interface/StandardCompiler.cpp    |   4 +-
 .../cmdlineTests/optimizer_array_sload/output |   9 +-
 .../ASTJSON/documentation_local_variable.json |   1 +
 .../ASTJSON/documentation_local_variable.sol  |   1 +
 .../ASTJSON/documentation_on_statements.json  |   1 +
 .../ASTJSON/documentation_on_statements.sol   |   1 +
 .../ASTJSON/documentation_triple.json         |   1 +
 .../ASTJSON/documentation_triple.sol          |   1 +
 test/libsolidity/StandardCompiler.cpp         |   2 +-
 .../isSimpleCounterLoop_negative_cases.sol    | 166 ++++++++++++++++++
 .../isSimpleCounterLoop_positive_cases.sol    |  72 ++++++++
 .../abi_encode_calldata_slice.sol             |  12 +-
 .../abi_encode_calldata_slice.sol             |  12 +-
 .../abiEncoderV2/calldata_array.sol           |   4 +-
 .../array/array_memory_index_access.sol       |   6 +-
 .../array/array_storage_index_access.sol      |  54 +++---
 .../array/array_storage_index_zeroed_test.sol |  24 +--
 .../array/array_storage_push_empty.sol        |  12 +-
 .../array/byte_array_storage_layout.sol       |   4 +-
 .../array/byte_array_transitional_2.sol       |   6 +-
 .../copying/array_copy_different_packing.sol  |   6 +-
 .../copying/array_copy_including_array.sol    |  12 +-
 .../copying/array_copy_target_leftover.sol    |   6 +-
 .../copying/array_copy_target_simple.sol      |   6 +-
 .../copying/array_copy_target_simple_2.sol    |   6 +-
 ..._containing_arrays_calldata_to_storage.sol |   2 +-
 .../copying/bytes_storage_to_storage.sol      |  30 ++--
 .../memory_dyn_2d_bytes_to_storage.sol        |   6 +-
 .../array/copying/storage_memory_nested.sol   |   6 +-
 .../storage_memory_nested_from_pointer.sol    |   6 +-
 .../copying/storage_memory_packed_dyn.sol     |   6 +-
 .../array/delete/bytes_delete_element.sol     |   6 +-
 .../array/dynamic_array_cleanup.sol           |   6 +-
 .../array/fixed_array_cleanup.sol             |   6 +-
 .../array/function_array_cross_calls.sol      |   6 +-
 .../array/pop/byte_array_pop_masking_long.sol |   6 +-
 .../array/push/byte_array_push_transition.sol |   6 +-
 .../array/push/push_no_args_bytes.sol         |   6 +-
 .../events/event_indexed_string.sol           |   6 +-
 .../externalContracts/base64.sol              |  18 +-
 .../externalContracts/deposit_contract.sol    |  30 ++--
 .../externalContracts/prbmath_signed.sol      |   6 +-
 .../externalContracts/prbmath_unsigned.sol    |   6 +-
 .../externalContracts/ramanujan_pi.sol        |   8 +-
 .../semanticTests/externalContracts/snark.sol |  12 +-
 .../externalContracts/strings.sol             |  12 +-
 .../libraries/internal_types_in_library.sol   |   6 +-
 .../userDefinedValueType/calldata.sol         |  12 +-
 61 files changed, 638 insertions(+), 220 deletions(-)
 create mode 100644 test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol
 create mode 100644 test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_positive_cases.sol

diff --git a/Changelog.md b/Changelog.md
index ad4e9495be..005e3aac55 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ Language Features:
 
 
 Compiler Features:
+ * Code Generator: Remove redundant overflow checks of certain ``for`` loops when the counter variable cannot overflow.
  * Commandline Interface: Add ``--no-import-callback`` option that prevents the compiler from loading source files not given explicitly on the CLI or in Standard JSON input.
  * Commandline Interface: Use proper severity and coloring also for error messages produced outside of the compilation pipeline.
  * EVM: Deprecate support for "homestead", "tangerineWhistle", "spuriousDragon" and "byzantium" EVM versions.
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index fb15f9b882..0adcbf4132 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -287,6 +287,9 @@ Input Description
             "cse": false,
             // Optimize representation of literal numbers and strings in code.
             "constantOptimizer": false,
+            // Use unchecked arithmetic when incrementing the counter of for loops
+            // under certain circumstances. It is always on if no details are given.
+            "simpleCounterForLoopUncheckedIncrement": true,
             // The new Yul optimizer. Mostly operates on the code of ABI coder v2
             // and inline assembly.
             // It is activated together with the global optimizer setting
diff --git a/libsolidity/analysis/PostTypeChecker.cpp b/libsolidity/analysis/PostTypeChecker.cpp
index bc9df3dc4c..fe3a59d0cc 100644
--- a/libsolidity/analysis/PostTypeChecker.cpp
+++ b/libsolidity/analysis/PostTypeChecker.cpp
@@ -24,6 +24,10 @@
 #include <liblangutil/SemVerHandler.h>
 #include <libsolutil/Algorithms.h>
 #include <libsolutil/FunctionSelector.h>
+#include <libyul/optimiser/ASTWalker.h>
+#include <libyul/AST.h>
+
+#include <range/v3/algorithm/any_of.hpp>
 
 #include <memory>
 
@@ -129,6 +133,17 @@ void PostTypeChecker::endVisit(ModifierInvocation const& _modifierInvocation)
 	callEndVisit(_modifierInvocation);
 }
 
+
+bool PostTypeChecker::visit(ForStatement const& _forStatement)
+{
+	return callVisit(_forStatement);
+}
+
+void PostTypeChecker::endVisit(ForStatement const& _forStatement)
+{
+	callEndVisit(_forStatement);
+}
+
 namespace
 {
 struct ConstStateVarCircularReferenceChecker: public PostTypeChecker::Checker
@@ -421,6 +436,116 @@ struct ReservedErrorSelector: public PostTypeChecker::Checker
 	}
 };
 
+class YulLValueChecker : public solidity::yul::ASTWalker
+{
+public:
+	YulLValueChecker(ASTString const& _identifierName): m_identifierName(_identifierName) {}
+	bool willBeWrittenTo() const { return m_willBeWrittenTo; }
+	using solidity::yul::ASTWalker::operator();
+	void operator()(solidity::yul::Assignment const& _assignment) override
+	{
+		if (m_willBeWrittenTo)
+			return;
+
+		if (ranges::any_of(
+			_assignment.variableNames,
+			[&](auto const& yulIdentifier) { return yulIdentifier.name.str() == m_identifierName; }
+		))
+			m_willBeWrittenTo = true;
+	}
+private:
+	ASTString const& m_identifierName;
+	bool m_willBeWrittenTo = false;
+};
+
+class LValueChecker: public ASTConstVisitor
+{
+public:
+	LValueChecker(Identifier const& _identifier):
+		m_declaration(_identifier.annotation().referencedDeclaration)
+	{}
+	bool willBeWrittenTo() const { return m_willBeWrittenTo; }
+	void endVisit(Identifier const& _identifier) override
+	{
+		if (m_willBeWrittenTo)
+			return;
+
+		solAssert(_identifier.annotation().referencedDeclaration);
+		if (
+			*_identifier.annotation().referencedDeclaration == *m_declaration &&
+			_identifier.annotation().willBeWrittenTo
+		)
+			m_willBeWrittenTo = true;
+	}
+	void endVisit(InlineAssembly const& _inlineAssembly) override
+	{
+		if (m_willBeWrittenTo)
+			return;
+
+		YulLValueChecker yulChecker{m_declaration->name()};
+		yulChecker(_inlineAssembly.operations());
+		m_willBeWrittenTo = yulChecker.willBeWrittenTo();
+	}
+private:
+	Declaration const* m_declaration{};
+	bool m_willBeWrittenTo = false;
+};
+
+struct SimpleCounterForLoopChecker: public PostTypeChecker::Checker
+{
+	SimpleCounterForLoopChecker(ErrorReporter& _errorReporter): Checker(_errorReporter) {}
+	bool visit(ForStatement const& _forStatement) override
+	{
+		_forStatement.annotation().isSimpleCounterLoop = isSimpleCounterLoop(_forStatement);
+		return true;
+	}
+	bool isSimpleCounterLoop(ForStatement const& _forStatement) const
+	{
+		auto const* simpleCondition = dynamic_cast<BinaryOperation const*>(_forStatement.condition());
+		if (!simpleCondition || simpleCondition->getOperator() != Token::LessThan || simpleCondition->userDefinedFunctionType())
+			return false;
+		if (!_forStatement.loopExpression())
+			return false;
+
+		auto const* simplePostExpression = dynamic_cast<UnaryOperation const*>(&_forStatement.loopExpression()->expression());
+		// This matches both operators ++i and i++
+		if (!simplePostExpression || simplePostExpression->getOperator() != Token::Inc || simplePostExpression->userDefinedFunctionType())
+			return false;
+
+		auto const* lhsIdentifier = dynamic_cast<Identifier const*>(&simpleCondition->leftExpression());
+		auto const* lhsIntegerType = dynamic_cast<IntegerType const*>(simpleCondition->leftExpression().annotation().type);
+		auto const* commonIntegerType = dynamic_cast<IntegerType const*>(simpleCondition->annotation().commonType);
+
+		if (!lhsIdentifier || !lhsIntegerType || !commonIntegerType || *lhsIntegerType != *commonIntegerType)
+			return false;
+
+		auto const* incExpressionIdentifier = dynamic_cast<Identifier const*>(&simplePostExpression->subExpression());
+		if (
+			!incExpressionIdentifier ||
+			incExpressionIdentifier->annotation().referencedDeclaration != lhsIdentifier->annotation().referencedDeclaration
+		)
+			return false;
+
+		solAssert(incExpressionIdentifier->annotation().referencedDeclaration);
+		if (
+			auto const* incVariableDeclaration = dynamic_cast<VariableDeclaration const*>(
+				incExpressionIdentifier->annotation().referencedDeclaration
+			);
+			incVariableDeclaration &&
+			!incVariableDeclaration->isLocalVariable()
+		)
+			return false;
+
+		solAssert(lhsIdentifier);
+		LValueChecker lValueChecker{*lhsIdentifier};
+		simpleCondition->rightExpression().accept(lValueChecker);
+		if (!lValueChecker.willBeWrittenTo())
+			_forStatement.body().accept(lValueChecker);
+
+		return !lValueChecker.willBeWrittenTo();
+	}
+};
+
 }
 
 
@@ -432,4 +557,5 @@ PostTypeChecker::PostTypeChecker(langutil::ErrorReporter& _errorReporter): m_err
 	m_checkers.push_back(std::make_shared<EventOutsideEmitErrorOutsideRevertChecker>(_errorReporter));
 	m_checkers.push_back(std::make_shared<NoVariablesInInterfaceChecker>(_errorReporter));
 	m_checkers.push_back(std::make_shared<ReservedErrorSelector>(_errorReporter));
+	m_checkers.push_back(std::make_shared<SimpleCounterForLoopChecker>(_errorReporter));
 }
diff --git a/libsolidity/analysis/PostTypeChecker.h b/libsolidity/analysis/PostTypeChecker.h
index 04b4fbe7a2..178130a356 100644
--- a/libsolidity/analysis/PostTypeChecker.h
+++ b/libsolidity/analysis/PostTypeChecker.h
@@ -97,6 +97,9 @@ class PostTypeChecker: private ASTConstVisitor
 	bool visit(ModifierInvocation const& _modifierInvocation) override;
 	void endVisit(ModifierInvocation const& _modifierInvocation) override;
 
+	bool visit(ForStatement const& _forStatement) override;
+	void endVisit(ForStatement const& _forStatement) override;
+
 	template <class T>
 	bool callVisit(T const& _node)
 	{
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index 2573015c27..9a19907117 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -238,6 +238,7 @@ struct TryCatchClauseAnnotation: ASTAnnotation, ScopableAnnotation
 
 struct ForStatementAnnotation: StatementAnnotation, ScopableAnnotation
 {
+	util::SetOnce<bool> isSimpleCounterLoop;
 };
 
 struct ReturnAnnotation: StatementAnnotation
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index b159178095..98a368d195 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -742,12 +742,18 @@ bool ASTJsonExporter::visit(WhileStatement const& _node)
 
 bool ASTJsonExporter::visit(ForStatement const& _node)
 {
-	setJsonNode(_node, "ForStatement", {
+
+	std::vector<std::pair<std::string, Json::Value>> attributes = {
 		std::make_pair("initializationExpression", toJsonOrNull(_node.initializationExpression())),
 		std::make_pair("condition", toJsonOrNull(_node.condition())),
 		std::make_pair("loopExpression", toJsonOrNull(_node.loopExpression())),
 		std::make_pair("body", toJson(_node.body()))
-	});
+	};
+
+	if (_node.annotation().isSimpleCounterLoop.set())
+		attributes.emplace_back("isSimpleCounterLoop", *_node.annotation().isSimpleCounterLoop);
+
+	setJsonNode(_node, "ForStatement", std::move(attributes));
 	return false;
 }
 
diff --git a/libsolidity/codegen/ContractCompiler.cpp b/libsolidity/codegen/ContractCompiler.cpp
index 3dfdf76d87..186cebc787 100644
--- a/libsolidity/codegen/ContractCompiler.cpp
+++ b/libsolidity/codegen/ContractCompiler.cpp
@@ -1245,7 +1245,16 @@ bool ContractCompiler::visit(ForStatement const& _forStatement)
 
 	// for's loop expression if existing
 	if (_forStatement.loopExpression())
+	{
+		Arithmetic previousArithmetic = m_context.arithmetic();
+		if (
+			*_forStatement.annotation().isSimpleCounterLoop &&
+			m_optimiserSettings.simpleCounterForLoopUncheckedIncrement
+		)
+			m_context.setArithmetic(Arithmetic::Wrapping);
 		_forStatement.loopExpression()->accept(*this);
+		m_context.setArithmetic(previousArithmetic);
+	}
 
 	m_context.appendJumpTo(loopStart);
 
diff --git a/libsolidity/codegen/ir/IRGenerator.cpp b/libsolidity/codegen/ir/IRGenerator.cpp
index 4ea5f6c169..b84fbc3573 100644
--- a/libsolidity/codegen/ir/IRGenerator.cpp
+++ b/libsolidity/codegen/ir/IRGenerator.cpp
@@ -224,7 +224,7 @@ std::string IRGenerator::generate(
 
 std::string IRGenerator::generate(Block const& _block)
 {
-	IRGeneratorForStatements generator(m_context, m_utils);
+	IRGeneratorForStatements generator(m_context, m_utils, m_optimiserSettings);
 	generator.generate(_block);
 	return generator.code();
 }
@@ -450,7 +450,7 @@ std::string IRGenerator::generateModifier(
 			(!_modifierInvocation.arguments() || _modifierInvocation.arguments()->empty()),
 			""
 		);
-		IRGeneratorForStatements expressionEvaluator(m_context, m_utils);
+		IRGeneratorForStatements expressionEvaluator(m_context, m_utils, m_optimiserSettings);
 		if (_modifierInvocation.arguments())
 			for (size_t i = 0; i < _modifierInvocation.arguments()->size(); i++)
 			{
@@ -465,7 +465,7 @@ std::string IRGenerator::generateModifier(
 			}
 
 		t("evalArgs", expressionEvaluator.code());
-		IRGeneratorForStatements generator(m_context, m_utils, [&]() {
+		IRGeneratorForStatements generator(m_context, m_utils, m_optimiserSettings, [&]() {
 			std::string ret = joinHumanReadable(retParams);
 			return
 				(ret.empty() ? "" : ret + " := ") +
@@ -575,7 +575,7 @@ std::string IRGenerator::generateGetter(VariableDeclaration const& _varDecl)
 				dispenseLocationComment(m_context.mostDerivedContract())
 			)
 			("functionName", functionName)
-			("constantValueFunction", IRGeneratorForStatements(m_context, m_utils).constantValueFunction(_varDecl))
+			("constantValueFunction", IRGeneratorForStatements(m_context, m_utils, m_optimiserSettings).constantValueFunction(_varDecl))
 			("ret", suffixedVariableNameList("ret_", 0, _varDecl.type()->sizeOnStack()))
 			.render();
 		}
@@ -750,7 +750,7 @@ std::string IRGenerator::generateExternalFunction(ContractDefinition const& _con
 
 std::string IRGenerator::generateInitialAssignment(VariableDeclaration const& _varDecl)
 {
-	IRGeneratorForStatements generator(m_context, m_utils);
+	IRGeneratorForStatements generator(m_context, m_utils, m_optimiserSettings);
 	generator.initializeLocalVar(_varDecl);
 	return generator.code();
 }
@@ -799,7 +799,7 @@ std::pair<std::string, std::map<ContractDefinition const*, std::vector<std::stri
 						modifier->arguments()
 					).second, "");
 
-	IRGeneratorForStatements generator{m_context, m_utils};
+	IRGeneratorForStatements generator{m_context, m_utils, m_optimiserSettings};
 	for (auto&& [baseContract, arguments]: baseConstructorArguments)
 	{
 		solAssert(baseContract && arguments, "");
@@ -820,7 +820,7 @@ std::pair<std::string, std::map<ContractDefinition const*, std::vector<std::stri
 
 std::string IRGenerator::initStateVariables(ContractDefinition const& _contract)
 {
-	IRGeneratorForStatements generator{m_context, m_utils};
+	IRGeneratorForStatements generator{m_context, m_utils, m_optimiserSettings};
 	for (VariableDeclaration const* variable: _contract.stateVariables())
 		if (!variable->isConstant())
 			generator.initializeStateVar(*variable);
diff --git a/libsolidity/codegen/ir/IRGenerator.h b/libsolidity/codegen/ir/IRGenerator.h
index fafe471280..9026954d61 100644
--- a/libsolidity/codegen/ir/IRGenerator.h
+++ b/libsolidity/codegen/ir/IRGenerator.h
@@ -27,6 +27,7 @@
 #include <libsolidity/ast/CallGraph.h>
 #include <libsolidity/codegen/ir/IRGenerationContext.h>
 #include <libsolidity/codegen/YulUtilFunctions.h>
+#include <libsolidity/interface/OptimiserSettings.h>
 
 #include <liblangutil/CharStreamProvider.h>
 #include <liblangutil/EVMVersion.h>
@@ -51,7 +52,8 @@ class IRGenerator
 		RevertStrings _revertStrings,
 		std::map<std::string, unsigned> _sourceIndices,
 		langutil::DebugInfoSelection const& _debugInfoSelection,
-		langutil::CharStreamProvider const* _soliditySourceProvider
+		langutil::CharStreamProvider const* _soliditySourceProvider,
+		OptimiserSettings& _optimiserSettings
 	):
 		m_evmVersion(_evmVersion),
 		m_eofVersion(_eofVersion),
@@ -63,7 +65,8 @@ class IRGenerator
 			_debugInfoSelection,
 			_soliditySourceProvider
 		),
-		m_utils(_evmVersion, m_context.revertStrings(), m_context.functionCollector())
+		m_utils(_evmVersion, m_context.revertStrings(), m_context.functionCollector()),
+		m_optimiserSettings(_optimiserSettings)
 	{}
 
 	/// Generates and returns (unoptimized) IR code.
@@ -141,6 +144,7 @@ class IRGenerator
 
 	IRGenerationContext m_context;
 	YulUtilFunctions m_utils;
+	OptimiserSettings m_optimiserSettings;
 };
 
 }
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index c05fffbffb..a5196366fd 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -352,7 +352,7 @@ std::string IRGeneratorForStatements::constantValueFunction(VariableDeclaration
 			)");
 			templ("sourceLocationComment", dispenseLocationComment(_constant, m_context));
 			templ("functionName", functionName);
-			IRGeneratorForStatements generator(m_context, m_utils);
+			IRGeneratorForStatements generator(m_context, m_utils, m_optimiserSettings);
 			solAssert(_constant.value());
 			Type const& constantType = *_constant.type();
 			templ("value", generator.evaluateExpression(*_constant.value(), constantType).commaSeparatedList());
@@ -617,7 +617,9 @@ bool IRGeneratorForStatements::visit(ForStatement const& _forStatement)
 		_forStatement.body(),
 		_forStatement.condition(),
 		_forStatement.initializationExpression(),
-		_forStatement.loopExpression()
+		_forStatement.loopExpression(),
+		false, // _isDoWhile
+		*_forStatement.annotation().isSimpleCounterLoop
 	);
 
 	return false;
@@ -3192,7 +3194,8 @@ void IRGeneratorForStatements::generateLoop(
 	Expression const* _conditionExpression,
 	Statement const*  _initExpression,
 	ExpressionStatement const* _loopExpression,
-	bool _isDoWhile
+	bool _isDoWhile,
+	bool _isSimpleCounterLoop
 )
 {
 	std::string firstRun;
@@ -3209,7 +3212,13 @@ void IRGeneratorForStatements::generateLoop(
 		_initExpression->accept(*this);
 	appendCode() << "} 1 {\n";
 	if (_loopExpression)
+	{
+		Arithmetic previousArithmetic = m_context.arithmetic();
+		if (m_optimiserSettings.simpleCounterForLoopUncheckedIncrement && _isSimpleCounterLoop)
+			m_context.setArithmetic(Arithmetic::Wrapping);
 		_loopExpression->accept(*this);
+		m_context.setArithmetic(previousArithmetic);
+	}
 	appendCode() << "}\n";
 	appendCode() << "{\n";
 
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.h b/libsolidity/codegen/ir/IRGeneratorForStatements.h
index 11f8b3c846..f4ce2a7d00 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.h
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.h
@@ -24,6 +24,7 @@
 #include <libsolidity/ast/ASTVisitor.h>
 #include <libsolidity/codegen/ir/IRLValue.h>
 #include <libsolidity/codegen/ir/IRVariable.h>
+#include <libsolidity/interface/OptimiserSettings.h>
 
 #include <functional>
 
@@ -65,11 +66,13 @@ class IRGeneratorForStatements: public IRGeneratorForStatementsBase
 	IRGeneratorForStatements(
 		IRGenerationContext& _context,
 		YulUtilFunctions& _utils,
+		OptimiserSettings& _optimiserSettings,
 		std::function<std::string()> _placeholderCallback = {}
 	):
 		IRGeneratorForStatementsBase(_context),
 		m_placeholderCallback(std::move(_placeholderCallback)),
-		m_utils(_utils)
+		m_utils(_utils),
+		m_optimiserSettings(_optimiserSettings)
 	{}
 
 	std::string code() const override;
@@ -235,7 +238,8 @@ class IRGeneratorForStatements: public IRGeneratorForStatementsBase
 		Expression const* _conditionExpression,
 		Statement const*  _initExpression = nullptr,
 		ExpressionStatement const* _loopExpression = nullptr,
-		bool _isDoWhile = false
+		bool _isDoWhile = false,
+		bool _isSimpleCounterLoop = false
 	);
 
 	static Type const& type(Expression const& _expression);
@@ -245,6 +249,7 @@ class IRGeneratorForStatements: public IRGeneratorForStatementsBase
 	std::function<std::string()> m_placeholderCallback;
 	YulUtilFunctions& m_utils;
 	std::optional<IRLValue> m_currentLValue;
+	OptimiserSettings m_optimiserSettings;
 };
 
 }
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 44413afdf5..3afe11fa82 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1498,7 +1498,8 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 		m_revertStrings,
 		sourceIndices(),
 		m_debugInfoSelection,
-		this
+		this,
+		m_optimiserSettings
 	);
 	compiledContract.yulIR = generator.run(
 		_contract,
@@ -1664,6 +1665,7 @@ std::string CompilerStack::createMetadata(Contract const& _contract, bool _forIR
 		details["deduplicate"] = m_optimiserSettings.runDeduplicate;
 		details["cse"] = m_optimiserSettings.runCSE;
 		details["constantOptimizer"] = m_optimiserSettings.runConstantOptimiser;
+		details["simpleCounterForLoopUncheckedIncrement"] = m_optimiserSettings.simpleCounterForLoopUncheckedIncrement;
 		details["yul"] = m_optimiserSettings.runYulOptimiser;
 		if (m_optimiserSettings.runYulOptimiser)
 		{
diff --git a/libsolidity/interface/OptimiserSettings.h b/libsolidity/interface/OptimiserSettings.h
index 9f2197d424..46683088a0 100644
--- a/libsolidity/interface/OptimiserSettings.h
+++ b/libsolidity/interface/OptimiserSettings.h
@@ -72,6 +72,7 @@ struct OptimiserSettings
 		OptimiserSettings s = none();
 		s.runJumpdestRemover = true;
 		s.runPeephole = true;
+		s.simpleCounterForLoopUncheckedIncrement = true;
 		return s;
 	}
 	/// Standard optimisations.
@@ -85,6 +86,7 @@ struct OptimiserSettings
 		s.runDeduplicate = true;
 		s.runCSE = true;
 		s.runConstantOptimiser = true;
+		s.simpleCounterForLoopUncheckedIncrement = true;
 		s.runYulOptimiser = true;
 		s.optimizeStackAllocation = true;
 		return s;
@@ -117,12 +119,18 @@ struct OptimiserSettings
 			runDeduplicate == _other.runDeduplicate &&
 			runCSE == _other.runCSE &&
 			runConstantOptimiser == _other.runConstantOptimiser &&
+			simpleCounterForLoopUncheckedIncrement == _other.simpleCounterForLoopUncheckedIncrement &&
 			optimizeStackAllocation == _other.optimizeStackAllocation &&
 			runYulOptimiser == _other.runYulOptimiser &&
 			yulOptimiserSteps == _other.yulOptimiserSteps &&
 			expectedExecutionsPerDeployment == _other.expectedExecutionsPerDeployment;
 	}
 
+	bool operator!=(OptimiserSettings const& _other) const
+	{
+		return !(*this == _other);
+	}
+
 	/// Move literals to the right of commutative binary operators during code generation.
 	/// This helps exploiting associativity.
 	bool runOrderLiterals = false;
@@ -140,8 +148,10 @@ struct OptimiserSettings
 	/// size/cost-trade-off.
 	bool runConstantOptimiser = false;
 	/// Perform more efficient stack allocation for variables during code generation from Yul to bytecode.
-	bool optimizeStackAllocation = false;
+	bool simpleCounterForLoopUncheckedIncrement = false;
 	/// Yul optimiser with default settings. Will only run on certain parts of the code for now.
+	bool optimizeStackAllocation = false;
+	/// Allow unchecked arithmetic when incrementing the counter of certain kinds of 'for' loop
 	bool runYulOptimiser = false;
 	/// Sequence of optimisation steps to be performed by Yul optimiser.
 	/// Note that there are some hard-coded steps in the optimiser and you cannot disable
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index d80713a800..91a7480531 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -441,7 +441,7 @@ std::optional<Json::Value> checkOptimizerKeys(Json::Value const& _input)
 
 std::optional<Json::Value> checkOptimizerDetailsKeys(Json::Value const& _input)
 {
-	static std::set<std::string> keys{"peephole", "inliner", "jumpdestRemover", "orderLiterals", "deduplicate", "cse", "constantOptimizer", "yul", "yulDetails"};
+	static std::set<std::string> keys{"peephole", "inliner", "jumpdestRemover", "orderLiterals", "deduplicate", "cse", "constantOptimizer", "yul", "yulDetails", "simpleCounterForLoopUncheckedIncrement"};
 	return checkKeys(_input, keys, "settings.optimizer.details");
 }
 
@@ -599,6 +599,8 @@ std::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Value
 			return *error;
 		if (auto error = checkOptimizerDetail(details, "yul", settings.runYulOptimiser))
 			return *error;
+		if (auto error = checkOptimizerDetail(details, "simpleCounterForLoopUncheckedIncrement", settings.simpleCounterForLoopUncheckedIncrement))
+			return *error;
 		settings.optimizeStackAllocation = settings.runYulOptimiser;
 		if (details.isMember("yulDetails"))
 		{
diff --git a/test/cmdlineTests/optimizer_array_sload/output b/test/cmdlineTests/optimizer_array_sload/output
index 2698a60cf0..b32d421d07 100644
--- a/test/cmdlineTests/optimizer_array_sload/output
+++ b/test/cmdlineTests/optimizer_array_sload/output
@@ -34,15 +34,8 @@ object "Arraysum_34" {
                         /** @src 0:380:397  "i < values.length" */ lt(var_i, _2)
                         /// @src 0:368:378  "uint i = 0"
                         {
-                            /// @src 0:80:429  "contract Arraysum {..."
-                            if eq(var_i, not(0))
-                            {
-                                mstore(0, shl(224, 0x4e487b71))
-                                mstore(_1, 0x11)
-                                revert(0, 0x24)
-                            }
                             /// @src 0:399:402  "i++"
-                            var_i := /** @src 0:80:429  "contract Arraysum {..." */ add(var_i, 1)
+                            var_i := /** @src 0:80:429  "contract Arraysum {..." */ add(/** @src 0:399:402  "i++" */ var_i, /** @src 0:80:429  "contract Arraysum {..." */ 1)
                         }
                         /// @src 0:399:402  "i++"
                         {
diff --git a/test/libsolidity/ASTJSON/documentation_local_variable.json b/test/libsolidity/ASTJSON/documentation_local_variable.json
index edaa89c18a..62d76e782c 100644
--- a/test/libsolidity/ASTJSON/documentation_local_variable.json
+++ b/test/libsolidity/ASTJSON/documentation_local_variable.json
@@ -283,6 +283,7 @@
                   "nodeType": "VariableDeclarationStatement",
                   "src": "212:10:1"
                 },
+                "isSimpleCounterLoop": true,
                 "loopExpression":
                 {
                   "expression":
diff --git a/test/libsolidity/ASTJSON/documentation_local_variable.sol b/test/libsolidity/ASTJSON/documentation_local_variable.sol
index a593e0194a..b21602d928 100644
--- a/test/libsolidity/ASTJSON/documentation_local_variable.sol
+++ b/test/libsolidity/ASTJSON/documentation_local_variable.sol
@@ -21,4 +21,5 @@ contract C {
         uint param3
     ) public {}
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/documentation_on_statements.json b/test/libsolidity/ASTJSON/documentation_on_statements.json
index f7b424ea60..cc4a1ef3c1 100644
--- a/test/libsolidity/ASTJSON/documentation_on_statements.json
+++ b/test/libsolidity/ASTJSON/documentation_on_statements.json
@@ -244,6 +244,7 @@
                   "nodeType": "VariableDeclarationStatement",
                   "src": "131:10:1"
                 },
+                "isSimpleCounterLoop": true,
                 "loopExpression":
                 {
                   "expression":
diff --git a/test/libsolidity/ASTJSON/documentation_on_statements.sol b/test/libsolidity/ASTJSON/documentation_on_statements.sol
index 9506bb05c1..235fa3d20b 100644
--- a/test/libsolidity/ASTJSON/documentation_on_statements.sol
+++ b/test/libsolidity/ASTJSON/documentation_on_statements.sol
@@ -12,4 +12,5 @@ contract C {
         return x;
     }
 }
+
 // ----
diff --git a/test/libsolidity/ASTJSON/documentation_triple.json b/test/libsolidity/ASTJSON/documentation_triple.json
index bd6f483b5a..cd44bd4eb6 100644
--- a/test/libsolidity/ASTJSON/documentation_triple.json
+++ b/test/libsolidity/ASTJSON/documentation_triple.json
@@ -253,6 +253,7 @@
                   "nodeType": "VariableDeclarationStatement",
                   "src": "117:10:1"
                 },
+                "isSimpleCounterLoop": true,
                 "loopExpression":
                 {
                   "expression":
diff --git a/test/libsolidity/ASTJSON/documentation_triple.sol b/test/libsolidity/ASTJSON/documentation_triple.sol
index 5b14e58f6f..578933d9c7 100644
--- a/test/libsolidity/ASTJSON/documentation_triple.sol
+++ b/test/libsolidity/ASTJSON/documentation_triple.sol
@@ -12,4 +12,5 @@ contract C {
         return x;
     }
 }
+
 // ----
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index df5a2137bf..4971ce3cd1 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -1219,7 +1219,7 @@ BOOST_AUTO_TEST_CASE(optimizer_settings_details_different)
 		optimizer["details"]["yulDetails"]["optimizerSteps"].asString() ==
 		OptimiserSettings::DefaultYulOptimiserSteps + ":"s + OptimiserSettings::DefaultYulOptimiserCleanupSteps
  	);
-	BOOST_CHECK_EQUAL(optimizer["details"].getMemberNames().size(), 9);
+	BOOST_CHECK_EQUAL(optimizer["details"].getMemberNames().size(), 10);
 	BOOST_CHECK(optimizer["runs"].asUInt() == 600);
 }
 
diff --git a/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol b/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol
new file mode 100644
index 0000000000..cfdda3813c
--- /dev/null
+++ b/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_negative_cases.sol
@@ -0,0 +1,166 @@
+type UINT is uint;
+
+function add(UINT x, UINT y) pure returns (UINT) {
+    return UINT.wrap(UINT.unwrap(x) + UINT.unwrap(y));
+}
+
+function lt(UINT x, UINT y) pure returns (bool) {
+    return UINT.unwrap(x) < UINT.unwrap(y);
+}
+
+using {lt as <, add as +} for UINT global;
+
+function g() pure returns (bool) {
+    return false;
+}
+
+function h() pure returns (uint) {
+    return 13;
+}
+
+contract C {
+    uint z = 0;
+
+    function modifyStateVarZ() public returns (uint) {
+        z = type(uint).max;
+        return z;
+    }
+
+    struct S {
+        uint x;
+    }
+
+    function f() public {
+        /// AdditionLoopExpression: isSimpleCounterLoop
+        for(uint i = 0; i < 42; i = i + 1) {
+        }
+        /// ShortHandAdditionLoopExpression: isSimpleCounterLoop
+        for(uint i = 0; i < 42; i += 1) {
+        }
+        /// SimplePreDecrement: isSimpleCounterLoop
+        for(uint i = 42; i > 0; --i) {
+        }
+        /// SimplePosDecrement: isSimpleCounterLoop
+        for(uint i = 42; i > 0; i--) {
+        }
+        /// MultiplicationLoopExpression: isSimpleCounterLoop
+        for(uint i = 1; i < 42; i = i * 2) {
+        }
+        /// CounterIncrementLoopBody: isSimpleCounterLoop
+        for(uint i = 0; i < 42; ++i) {
+            i++;
+        }
+        /// CounterAssignmentLoopBody: isSimpleCounterLoop
+        for(uint i = 0; i < 42; ++i) {
+            i = 43;
+        }
+        /// CounterAssignmentInlineAssemblyLoopBody: isSimpleCounterLoop
+        for(uint i = 0; i < 42; ++i) {
+            assembly {
+                i := add(i, 1)
+            }
+        }
+        uint j = type(uint).max;
+        /// ExternalCounterLoopExpression: isSimpleCounterLoop
+        for (uint i = 0; i < 10; ++j) {
+        }
+        uint x;
+        /// CounterIncrementRHSAssignment: isSimpleCounterLoop
+        for(uint i = 0; i < 10; ++i) {
+            x = i++;
+        }
+        /// NoEffectLoopExpression: isSimpleCounterLoop
+        for(uint i = 0; i < 42; i) {
+        }
+        /// EmptyLoopExpression: isSimpleCounterLoop
+        for(uint i = 0; i < 10; ) {
+        }
+        j = 0;
+        /// EmptyConditionExpression: isSimpleCounterLoop
+        for(uint i = 0; ; ++i) {
+        }
+        uint y = type(uint8).max + 1;
+        /// DifferentCommonTypeCondition: isSimpleCounterLoop
+        for(uint8 i = 0; i < y; ++i) {
+        }
+        /// LessThanOrEqualCondition: isSimpleCounterLoop
+        for(uint i = 0; i <= 10; ++i) {
+        }
+        /// ComplexExpressionCondition: isSimpleCounterLoop
+        for(uint i = 0; (i < 10 || g()); ++i) {
+        }
+        /// FreeFunctionConditionLHS: isSimpleCounterLoop
+        for(uint i = 0; h() < 100; ++i) {
+        }
+        /// FreeFunctionConditionDifferentCommonTypeLHS: isSimpleCounterLoop
+        for(uint8 i = 0; i < h(); ++i) {
+        }
+        /// NonIntegerTypeCondition: isSimpleCounterLoop
+        for(uint i = 0; address(this) < msg.sender; ++i) {
+        }
+        UINT ZERO = UINT.wrap(0);
+        UINT ONE = UINT.wrap(1);
+        UINT TEN = UINT.wrap(10);
+        /// UDVTOperators: isSimpleCounterLoop
+        for(UINT i = ZERO; i < TEN; i = i + ONE) {
+        }
+        /// CounterAssignmentConditionRHS: isSimpleCounterLoop
+        for(uint i = 0; i < (i = i + 1); ++i) {
+        }
+        /// LiteralDifferentCommonTypeConditionRHS: isSimpleCounterLoop
+        for(uint8 i = 0; i < 257 ; ++i) {
+        }
+        /// StateVarCounterModifiedFunctionConditionRHS: isSimpleCounterLoop
+        for (z = 1; z < modifyStateVarZ(); ++z) {
+        }
+        /// StateVarCounterModifiedFunctionLoopBody: isSimpleCounterLoop
+        for (z = 1; z < 2048; ++z) {
+            modifyStateVarZ();
+        }
+        /// NonIntegerCounter: isSimpleCounterLoop
+        for (address i = address(0x123); i < address(this); i = address(0x123 + 1)) {
+        }
+        /// AssemblyAfterAssignmentToCounter: isSimpleCounterLoop
+        for (uint i = 0; i < 42; ++i) {
+            i = type(uint).max;
+            assembly {}
+        }
+        uint k = type(uint).max;
+        /// ExpressionIncrement: isSimpleCounterLoop
+        for (uint i = 0; i < 10; ++(k)) {
+        }
+        S memory s = S(type(uint).max);
+        /// StructMemberAccessIncrement: isSimpleCounterLoop
+        for (uint i = 0; i < 10; ++s.x) {
+        }
+    }
+}
+// ----
+// AdditionLoopExpression: false
+// ShortHandAdditionLoopExpression: false
+// SimplePreDecrement: false
+// SimplePosDecrement: false
+// MultiplicationLoopExpression: false
+// CounterIncrementLoopBody: false
+// CounterAssignmentLoopBody: false
+// CounterAssignmentInlineAssemblyLoopBody: false
+// ExternalCounterLoopExpression: false
+// CounterIncrementRHSAssignment: false
+// NoEffectLoopExpression: false
+// DifferentCommonTypeCondition: false
+// EmptyLoopExpression: false
+// EmptyConditionExpression: false
+// LessThanOrEqualCondition: false
+// ComplexExpressionCondition: false
+// FreeFunctionConditionLHS: false
+// FreeFunctionConditionDifferentCommonTypeLHS: false
+// NonIntegerTypeCondition: false
+// UDVTOperators: false
+// CounterAssignmentConditionRHS: false
+// LiteralDifferentCommonTypeConditionRHS: false
+// StateVarCounterModifiedFunctionConditionRHS: false
+// StateVarCounterModifiedFunctionLoopBody: false
+// NonIntegerCounter: false
+// AssemblyAfterAssignmentToCounter: false
+// ExpressionIncrement: false
+// StructMemberAccessIncrement: false
diff --git a/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_positive_cases.sol b/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_positive_cases.sol
new file mode 100644
index 0000000000..c7ab53d2c9
--- /dev/null
+++ b/test/libsolidity/astPropertyTests/forLoop/isSimpleCounterLoop_positive_cases.sol
@@ -0,0 +1,72 @@
+function h() pure returns (uint) {
+    return 13;
+}
+
+contract C {
+    uint[] dynArray;
+
+    function f() public {
+        /// SimplePreIncrement: isSimpleCounterLoop
+        for(uint i = 0; i < 42; ++i) {
+        }
+        /// SimplePosIncrement: isSimpleCounterLoop
+        for(int i = 0; i < 42; i++) {
+        }
+        uint x;
+        /// CounterReadLoopBody: isSimpleCounterLoop
+        for(uint i = 0; i < 42; i++) {
+            x = i;
+        }
+        /// LocalVarConditionRHS: isSimpleCounterLoop
+        for(uint i = 0; i < x; i++) {
+        }
+        x = 0;
+        /// EmptyInitExpression: isSimpleCounterLoop
+        for(; x < 10; ++x) {
+        }
+        uint[8] memory array;
+        /// StaticArrayLengthConditionRHS: isSimpleCounterLoop
+        for(uint i = 0; i < array.length; i++) {
+        }
+        dynArray.push();
+        /// DynamicArrayLengthConditionRHS: isSimpleCounterLoop
+        for(uint i = 0; i < dynArray.length; i++) {
+            dynArray.push(i);
+        }
+        /// CounterReadInlineAssembly: isSimpleCounterLoop
+        for(uint i = 0; i < 42; ++i) {
+            assembly {
+                x := i
+            }
+        }
+        /// BinaryOperationConditionRHS: isSimpleCounterLoop
+        for(uint i = 0; i < i + 1; i++) {
+        }
+        /// FreeFunctionConditionRHS: isSimpleCounterLoop
+        for(uint i = 0; i < h(); ++i) {
+        }
+    }
+    function functionParamLoopCounter(uint i) public pure {
+        /// FunctionParameterLoopCounter: isSimpleCounterLoop
+        for (i = 0; i < 42; ++i){
+        }
+    }
+    function functionReturnLoopCounter() public pure returns (uint i) {
+        /// FunctionReturnLoopCounter: isSimpleCounterLoop
+        for (i = 0; i < 42; ++i){
+        }
+    }
+}
+// ----
+// SimplePreIncrement: true
+// SimplePosIncrement: true
+// CounterReadLoopBody: true
+// LocalVarConditionRHS: true
+// EmptyInitExpression: true
+// StaticArrayLengthConditionRHS: true
+// DynamicArrayLengthConditionRHS: true
+// CounterReadInlineAssembly: true
+// BinaryOperationConditionRHS: true
+// FreeFunctionConditionRHS: true
+// FunctionParameterLoopCounter: true
+// FunctionReturnLoopCounter: true
diff --git a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
index 6f5eca3048..f548c50bcf 100644
--- a/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV1/abi_encode_calldata_slice.sol
@@ -59,10 +59,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 360863
-// gas legacy: 411269
-// gas legacyOptimized: 317754
+// gas irOptimized: 321332
+// gas legacy: 319111
+// gas legacyOptimized: 269317
 // test_uint256() ->
-// gas irOptimized: 509479
-// gas legacy: 577469
-// gas legacyOptimized: 441003
+// gas irOptimized: 447646
+// gas legacy: 433627
+// gas legacyOptimized: 365410
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
index a028cbaf9b..686164de85 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/abi_encode_calldata_slice.sol
@@ -60,10 +60,10 @@ contract C {
 // EVMVersion: >homestead
 // ----
 // test_bytes() ->
-// gas irOptimized: 360863
-// gas legacy: 411269
-// gas legacyOptimized: 317754
+// gas irOptimized: 321332
+// gas legacy: 319111
+// gas legacyOptimized: 269317
 // test_uint256() ->
-// gas irOptimized: 509479
-// gas legacy: 577469
-// gas legacyOptimized: 441003
+// gas irOptimized: 447646
+// gas legacy: 433627
+// gas legacyOptimized: 365410
diff --git a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
index 12920a70a4..22aad67492 100644
--- a/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
+++ b/test/libsolidity/semanticTests/abiEncoderV2/calldata_array.sol
@@ -20,6 +20,6 @@ contract C {
 // f(uint256[][1]): 32, 32, 0 -> true
 // f(uint256[][1]): 32, 32, 1, 42 -> true
 // f(uint256[][1]): 32, 32, 8, 421, 422, 423, 424, 425, 426, 427, 428 -> true
-// gas irOptimized: 126851
-// gas legacy: 139800
+// gas irOptimized: 120043
+// gas legacy: 101568
 // gas legacyOptimized: 119092
diff --git a/test/libsolidity/semanticTests/array/array_memory_index_access.sol b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
index e8b6cd48f9..d313e7acb2 100644
--- a/test/libsolidity/semanticTests/array/array_memory_index_access.sol
+++ b/test/libsolidity/semanticTests/array/array_memory_index_access.sol
@@ -26,9 +26,9 @@ contract C {
 // index(uint256): 10 -> true
 // index(uint256): 20 -> true
 // index(uint256): 0xFF -> true
-// gas irOptimized: 135066
-// gas legacy: 241703
-// gas legacyOptimized: 151613
+// gas irOptimized: 108291
+// gas legacy: 181523
+// gas legacyOptimized: 117443
 // accessIndex(uint256,int256): 10, 1 -> 2
 // accessIndex(uint256,int256): 10, 0 -> 1
 // accessIndex(uint256,int256): 10, 11 -> FAILURE, hex"4e487b71", 0x32
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_access.sol b/test/libsolidity/semanticTests/array/array_storage_index_access.sol
index 1ea50824fd..2589e4709d 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_access.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_access.sol
@@ -16,38 +16,38 @@ contract C {
 // ----
 // test_indices(uint256): 1 ->
 // test_indices(uint256): 129 ->
-// gas irOptimized: 3016570
-// gas legacy: 3069098
-// gas legacyOptimized: 3013250
+// gas irOptimized: 3003025
+// gas legacy: 3038654
+// gas legacyOptimized: 2995964
 // test_indices(uint256): 5 ->
-// gas irOptimized: 576716
-// gas legacy: 574754
-// gas legacyOptimized: 572383
+// gas irOptimized: 576296
+// gas legacy: 573810
+// gas legacyOptimized: 571847
 // test_indices(uint256): 10 ->
-// gas irOptimized: 158059
-// gas legacy: 162468
-// gas legacyOptimized: 158336
+// gas irOptimized: 157009
+// gas legacy: 160108
+// gas legacyOptimized: 156996
 // test_indices(uint256): 15 ->
-// gas irOptimized: 172984
-// gas legacy: 179513
-// gas legacyOptimized: 173606
+// gas irOptimized: 171409
+// gas legacy: 175973
+// gas legacyOptimized: 171596
 // test_indices(uint256): 0xFF ->
-// gas irOptimized: 5672104
-// gas legacy: 5775928
-// gas legacyOptimized: 5666726
+// gas irOptimized: 5645329
+// gas legacy: 5715748
+// gas legacyOptimized: 5632556
 // test_indices(uint256): 1000 ->
-// gas irOptimized: 18173701
-// gas legacy: 18583810
-// gas legacyOptimized: 18171248
+// gas irOptimized: 18068701
+// gas legacy: 18347810
+// gas legacyOptimized: 18037248
 // test_indices(uint256): 129 ->
-// gas irOptimized: 4147676
-// gas legacy: 4164468
-// gas legacyOptimized: 4122100
+// gas irOptimized: 4136840
+// gas legacy: 4140113
+// gas legacyOptimized: 4108272
 // test_indices(uint256): 128 ->
-// gas irOptimized: 409209
-// gas legacy: 463706
-// gas legacyOptimized: 418061
+// gas irOptimized: 395769
+// gas legacy: 433498
+// gas legacyOptimized: 400909
 // test_indices(uint256): 1 ->
-// gas irOptimized: 580316
-// gas legacy: 576904
-// gas legacyOptimized: 575649
+// gas irOptimized: 580232
+// gas legacy: 576715
+// gas legacyOptimized: 575542
diff --git a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
index 8a8c9a7c28..5933586593 100644
--- a/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_index_zeroed_test.sol
@@ -52,18 +52,18 @@ contract C {
 // ----
 // test_zeroed_indicies(uint256): 1 ->
 // test_zeroed_indicies(uint256): 5 ->
-// gas irOptimized: 131809
-// gas legacy: 132804
-// gas legacyOptimized: 130649
+// gas irOptimized: 131315
+// gas legacy: 131671
+// gas legacyOptimized: 129994
 // test_zeroed_indicies(uint256): 10 ->
-// gas irOptimized: 225696
-// gas legacy: 227786
-// gas legacyOptimized: 223830
+// gas irOptimized: 224578
+// gas legacy: 225237
+// gas legacyOptimized: 222359
 // test_zeroed_indicies(uint256): 15 ->
-// gas irOptimized: 323704
-// gas legacy: 326902
-// gas legacyOptimized: 321206
+// gas irOptimized: 321962
+// gas legacy: 322937
+// gas legacyOptimized: 318919
 // test_zeroed_indicies(uint256): 0xFF ->
-// gas irOptimized: 5112500
-// gas legacy: 5165874
-// gas legacyOptimized: 5062182
+// gas irOptimized: 5080806
+// gas legacy: 5093941
+// gas legacyOptimized: 5020727
diff --git a/test/libsolidity/semanticTests/array/array_storage_push_empty.sol b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
index 9949b59ea4..80376b423f 100644
--- a/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
+++ b/test/libsolidity/semanticTests/array/array_storage_push_empty.sol
@@ -12,13 +12,13 @@ contract C {
 // EVMVersion: >=petersburg
 // ----
 // pushEmpty(uint256): 128
-// gas irOptimized: 404095
-// gas legacy: 415744
-// gas legacyOptimized: 397380
+// gas irOptimized: 401024
+// gas legacy: 400640
+// gas legacyOptimized: 388804
 // pushEmpty(uint256): 256
-// gas irOptimized: 689843
-// gas legacy: 715316
-// gas legacyOptimized: 688632
+// gas irOptimized: 683700
+// gas legacy: 685108
+// gas legacyOptimized: 671480
 // pushEmpty(uint256): 38869 -> FAILURE # out-of-gas #
 // gas irOptimized: 100000000
 // gas legacy: 100000000
diff --git a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
index e5fd0a2d70..942c7337aa 100644
--- a/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_storage_layout.sol
@@ -46,8 +46,8 @@ contract c {
 // storageEmpty -> 0
 // test_long() -> 67
 // gas irOptimized: 89148
-// gas legacy: 105693
-// gas legacyOptimized: 103216
+// gas legacy: 101601
+// gas legacyOptimized: 100477
 // storageEmpty -> 0
 // test_pop() -> 1780731860627700044960722568376592200742329637303199754547598369979433020
 // gas legacy: 61930
diff --git a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
index ae3d23a63b..3e0f02225b 100644
--- a/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
+++ b/test/libsolidity/semanticTests/array/byte_array_transitional_2.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 125058
-// gas legacy: 150372
-// gas legacyOptimized: 146391
+// gas irOptimized: 123560
+// gas legacy: 147098
+// gas legacyOptimized: 144200
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
index 2d6198006b..6e81269d8a 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_different_packing.sol
@@ -18,6 +18,6 @@ contract c {
 }
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x05000000000000000000000000000000000000000000000000
-// gas irOptimized: 208074
-// gas legacy: 221769
-// gas legacyOptimized: 220611
+// gas irOptimized: 207889
+// gas legacy: 220707
+// gas legacyOptimized: 220098
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
index d28090277a..385f2ecfbf 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_including_array.sol
@@ -35,12 +35,12 @@ contract c {
 }
 // ----
 // test() -> 0x02000202
-// gas irOptimized: 4548150
-// gas legacy: 4476222
-// gas legacyOptimized: 4448113
+// gas irOptimized: 4547793
+// gas legacy: 4475396
+// gas legacyOptimized: 4447665
 // storageEmpty -> 1
 // clear() -> 0, 0
-// gas irOptimized: 4475134
-// gas legacy: 4408014
-// gas legacyOptimized: 4381784
+// gas irOptimized: 4474777
+// gas legacy: 4407188
+// gas legacyOptimized: 4381336
 // storageEmpty -> 1
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
index b2af9191de..10a48a18c5 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_leftover.sol
@@ -17,6 +17,6 @@ contract c {
 }
 // ----
 // test() -> 0xffffffff, 0x0000000000000000000000000a00090008000700060005000400030002000100, 0x0000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 104526
-// gas legacy: 166874
-// gas legacyOptimized: 145474
+// gas irOptimized: 100980
+// gas legacy: 158142
+// gas legacyOptimized: 141096
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
index db66a55083..a839e3bb44 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple.sol
@@ -18,6 +18,6 @@ contract c {
 }
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x0
-// gas irOptimized: 273563
-// gas legacy: 283666
-// gas legacyOptimized: 282023
+// gas irOptimized: 273372
+// gas legacy: 282604
+// gas legacyOptimized: 281510
diff --git a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
index bf1e1bc1b5..f9e1cbd27e 100644
--- a/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_copy_target_simple_2.sol
@@ -18,6 +18,6 @@ contract c {
 }
 // ----
 // test() -> 0x01000000000000000000000000000000000000000000000000, 0x02000000000000000000000000000000000000000000000000, 0x03000000000000000000000000000000000000000000000000, 0x04000000000000000000000000000000000000000000000000, 0x00
-// gas irOptimized: 233255
-// gas legacy: 236523
-// gas legacyOptimized: 235592
+// gas irOptimized: 233118
+// gas legacy: 235697
+// gas legacyOptimized: 235193
diff --git a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
index e3998e9551..c6e6c58765 100644
--- a/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/array_of_structs_containing_arrays_calldata_to_storage.sol
@@ -23,4 +23,4 @@ contract C {
 // compileViaYul: true
 // ----
 // f((uint256[])[]): 0x20, 3, 0x60, 0x60, 0x60, 0x20, 3, 1, 2, 3 -> 3, 1
-// gas irOptimized: 327383
+// gas irOptimized: 326771
diff --git a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
index 968f637a4a..38dbe52bcc 100644
--- a/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/bytes_storage_to_storage.sol
@@ -17,25 +17,25 @@ contract c {
 // ----
 // f(uint256): 0 -> 0x20, 0x00
 // f(uint256): 31 -> 0x20, 0x1f, 0x0102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e00
-// gas irOptimized: 109219
-// gas legacy: 123948
-// gas legacyOptimized: 118948
+// gas irOptimized: 104476
+// gas legacy: 112974
+// gas legacyOptimized: 112717
 // f(uint256): 32 -> 0x20, 0x20, 1780731860627700044960722568376592200742329637303199754547598369979440671
-// gas irOptimized: 123858
-// gas legacy: 140362
-// gas legacyOptimized: 135384
+// gas irOptimized: 118962
+// gas legacy: 129034
+// gas legacyOptimized: 128952
 // f(uint256): 33 -> 0x20, 33, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x2000000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 130468
-// gas legacy: 147916
-// gas legacyOptimized: 142276
+// gas irOptimized: 125419
+// gas legacy: 136234
+// gas legacyOptimized: 135643
 // f(uint256): 63 -> 0x20, 0x3f, 1780731860627700044960722568376592200742329637303199754547598369979440671, 14532552714582660066924456880521368950258152170031413196862950297402215316992
-// gas irOptimized: 139168
-// gas legacy: 171136
-// gas legacyOptimized: 161536
+// gas irOptimized: 129529
+// gas legacy: 148834
+// gas legacyOptimized: 148873
 // f(uint256): 12 -> 0x20, 0x0c, 0x0102030405060708090a0b0000000000000000000000000000000000000000
 // gas legacy: 59345
 // gas legacyOptimized: 57279
 // f(uint256): 129 -> 0x20, 0x81, 1780731860627700044960722568376592200742329637303199754547598369979440671, 0x202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f, 29063324697304692433803953038474361308315562010425523193971352996434451193439, 0x606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f, -57896044618658097711785492504343953926634992332820282019728792003956564819968
-// gas irOptimized: 441648
-// gas legacy: 505021
-// gas legacyOptimized: 486995
+// gas irOptimized: 421911
+// gas legacy: 459355
+// gas legacyOptimized: 461066
diff --git a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
index 599d23c807..79882a74b2 100644
--- a/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
+++ b/test/libsolidity/semanticTests/array/copying/memory_dyn_2d_bytes_to_storage.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 3
-// gas irOptimized: 128094
-// gas legacy: 130584
-// gas legacyOptimized: 129028
+// gas irOptimized: 127422
+// gas legacy: 129050
+// gas legacyOptimized: 128222
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
index 7c2f0e55e8..9a2fbb4d9d 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested.sol
@@ -17,6 +17,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 205879
-// gas legacy: 212237
-// gas legacyOptimized: 211425
+// gas irOptimized: 205783
+// gas legacy: 211765
+// gas legacyOptimized: 211181
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
index cda6d129a3..3606d7d601 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_nested_from_pointer.sol
@@ -18,6 +18,6 @@ contract C {
 }
 // ----
 // f() -> 1, 2, 3, 4, 5, 6, 7
-// gas irOptimized: 205879
-// gas legacy: 212242
-// gas legacyOptimized: 211430
+// gas irOptimized: 205783
+// gas legacy: 211770
+// gas legacyOptimized: 211186
diff --git a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
index 5617e2fcce..3ba5604a79 100644
--- a/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
+++ b/test/libsolidity/semanticTests/array/copying/storage_memory_packed_dyn.sol
@@ -13,6 +13,6 @@ contract C {
 }
 // ----
 // f() -> 2, 3, 4
-// gas irOptimized: 109702
-// gas legacy: 126129
-// gas legacyOptimized: 120622
+// gas irOptimized: 109108
+// gas legacy: 122235
+// gas legacyOptimized: 118411
diff --git a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
index 146206ae06..fffea685a8 100644
--- a/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
+++ b/test/libsolidity/semanticTests/array/delete/bytes_delete_element.sol
@@ -16,6 +16,6 @@ contract c {
 }
 // ----
 // test1() -> true
-// gas irOptimized: 206388
-// gas legacy: 254056
-// gas legacyOptimized: 246892
+// gas irOptimized: 204782
+// gas legacy: 242256
+// gas legacyOptimized: 241192
diff --git a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
index a04ea013a8..eb950d1834 100644
--- a/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/dynamic_array_cleanup.sol
@@ -14,9 +14,9 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 519266
-// gas legacy: 521414
-// gas legacyOptimized: 516983
+// gas irOptimized: 519017
+// gas legacy: 518936
+// gas legacyOptimized: 515555
 // storageEmpty -> 0
 // halfClear() ->
 // gas irOptimized: 113961
diff --git a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
index a354cf8042..b4d9a30ec0 100644
--- a/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
+++ b/test/libsolidity/semanticTests/array/fixed_array_cleanup.sol
@@ -10,9 +10,9 @@ contract c {
 // ----
 // storageEmpty -> 1
 // fill() ->
-// gas irOptimized: 465314
-// gas legacy: 471178
-// gas legacyOptimized: 467478
+// gas irOptimized: 464834
+// gas legacy: 468818
+// gas legacyOptimized: 466238
 // storageEmpty -> 0
 // clear() ->
 // gas irOptimized: 122148
diff --git a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
index fe72091af1..773e904cc0 100644
--- a/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
+++ b/test/libsolidity/semanticTests/array/function_array_cross_calls.sol
@@ -42,6 +42,6 @@ contract C {
 }
 // ----
 // test() -> 5, 6, 7
-// gas irOptimized: 256288
-// gas legacy: 441556
-// gas legacyOptimized: 279321
+// gas irOptimized: 255728
+// gas legacy: 440376
+// gas legacyOptimized: 278651
diff --git a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
index 95156f5c69..5b1a618391 100644
--- a/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
+++ b/test/libsolidity/semanticTests/array/pop/byte_array_pop_masking_long.sol
@@ -9,6 +9,6 @@ contract c {
 }
 // ----
 // test() -> 0x20, 33, 0x303030303030303030303030303030303030303030303030303030303030303, 0x0300000000000000000000000000000000000000000000000000000000000000
-// gas irOptimized: 107962
-// gas legacy: 125420
-// gas legacyOptimized: 122472
+// gas irOptimized: 107343
+// gas legacy: 121408
+// gas legacyOptimized: 120534
diff --git a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
index 808d0d8661..5f1fe0fac7 100644
--- a/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
+++ b/test/libsolidity/semanticTests/array/push/byte_array_push_transition.sol
@@ -15,6 +15,6 @@ contract c {
 }
 // ----
 // test() -> 0
-// gas irOptimized: 171996
-// gas legacy: 215891
-// gas legacyOptimized: 203615
+// gas irOptimized: 167700
+// gas legacy: 206219
+// gas legacyOptimized: 197297
diff --git a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
index 860c743379..b19ebcc736 100644
--- a/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
+++ b/test/libsolidity/semanticTests/array/push/push_no_args_bytes.sol
@@ -21,9 +21,9 @@ contract C {
 // ----
 // l() -> 0
 // g(uint256): 70 ->
-// gas irOptimized: 182328
-// gas legacy: 183445
-// gas legacyOptimized: 178995
+// gas irOptimized: 180849
+// gas legacy: 175185
+// gas legacyOptimized: 175005
 // l() -> 70
 // a(uint256): 69 -> left(69)
 // f() ->
diff --git a/test/libsolidity/semanticTests/events/event_indexed_string.sol b/test/libsolidity/semanticTests/events/event_indexed_string.sol
index a503d44f51..739619066a 100644
--- a/test/libsolidity/semanticTests/events/event_indexed_string.sol
+++ b/test/libsolidity/semanticTests/events/event_indexed_string.sol
@@ -17,6 +17,6 @@ contract C {
 // ----
 // deposit() ->
 // ~ emit E(string,uint256[4]): #0xa7fb06bb999a5eb9aff9e0779953f4e1e4ce58044936c2f51c7fb879b85c08bd, #0xe755d8cc1a8cde16a2a31160dcd8017ac32d7e2f13215b29a23cdae40a78aa81
-// gas irOptimized: 330920
-// gas legacy: 387608
-// gas legacyOptimized: 373771
+// gas irOptimized: 328856
+// gas legacy: 365828
+// gas legacyOptimized: 362251
diff --git a/test/libsolidity/semanticTests/externalContracts/base64.sol b/test/libsolidity/semanticTests/externalContracts/base64.sol
index 133574a141..646601e6fb 100644
--- a/test/libsolidity/semanticTests/externalContracts/base64.sol
+++ b/test/libsolidity/semanticTests/externalContracts/base64.sol
@@ -33,9 +33,9 @@ contract test {
 // EVMVersion: >=constantinople
 // ----
 // constructor()
-// gas irOptimized: 406691
-// gas legacy: 737652
-// gas legacyOptimized: 527036
+// gas irOptimized: 405832
+// gas legacy: 735054
+// gas legacyOptimized: 522722
 // encode_inline_asm(bytes): 0x20, 0 -> 0x20, 0
 // encode_inline_asm(bytes): 0x20, 1, "f" -> 0x20, 4, "Zg=="
 // encode_inline_asm(bytes): 0x20, 2, "fo" -> 0x20, 4, "Zm8="
@@ -51,10 +51,10 @@ contract test {
 // encode_no_asm(bytes): 0x20, 5, "fooba" -> 0x20, 8, "Zm9vYmE="
 // encode_no_asm(bytes): 0x20, 6, "foobar" -> 0x20, 8, "Zm9vYmFy"
 // encode_inline_asm_large()
-// gas irOptimized: 1373025
-// gas legacy: 1672031
-// gas legacyOptimized: 1199031
+// gas irOptimized: 1322025
+// gas legacy: 1554031
+// gas legacyOptimized: 1132031
 // encode_no_asm_large()
-// gas irOptimized: 3257081
-// gas legacy: 4705075
-// gas legacyOptimized: 2890075
+// gas irOptimized: 3206081
+// gas legacy: 4587075
+// gas legacyOptimized: 2823075
diff --git a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
index e51eb414ac..4f3342dea7 100644
--- a/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
+++ b/test/libsolidity/semanticTests/externalContracts/deposit_contract.sol
@@ -176,35 +176,35 @@ contract DepositContract is IDepositContract, ERC165 {
 }
 // ----
 // constructor()
-// gas irOptimized: 1397699
-// gas legacy: 2391952
-// gas legacyOptimized: 1752320
+// gas irOptimized: 1386886
+// gas legacy: 2369061
+// gas legacyOptimized: 1740144
 // supportsInterface(bytes4): 0x0 -> 0
 // supportsInterface(bytes4): 0xffffffff00000000000000000000000000000000000000000000000000000000 -> false # defined to be false by ERC-165 #
 // supportsInterface(bytes4): 0x01ffc9a700000000000000000000000000000000000000000000000000000000 -> true # ERC-165 id #
 // supportsInterface(bytes4): 0x8564090700000000000000000000000000000000000000000000000000000000 -> true # the deposit interface id #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 116863
-// gas legacy: 151981
-// gas legacyOptimized: 124447
+// gas irOptimized: 115231
+// gas legacy: 148205
+// gas legacyOptimized: 122303
 // get_deposit_count() -> 0x20, 8, 0 # TODO: check balance and logs after each deposit #
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0 -> FAILURE # Empty input #
 // get_deposit_root() -> 0xd70a234731285c6804c2a4f56711ddb8c82c99740f207854891028af34e27e5e
-// gas irOptimized: 116863
-// gas legacy: 151981
-// gas legacyOptimized: 124447
+// gas irOptimized: 115231
+// gas legacy: 148205
+// gas legacyOptimized: 122303
 // get_deposit_count() -> 0x20, 8, 0
 // deposit(bytes,bytes,bytes,bytes32), 1 ether: 0x80, 0xe0, 0x120, 0xaa4a8d0b7d9077248630f1a4701ae9764e42271d7f22b7838778411857fd349e, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0x00f50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8 -> # txhash: 0x7085c586686d666e8bb6e9477a0f0b09565b2060a11f1c4209d3a52295033832 #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0x933ad9491b62059dd065b560d256d8957a8c402cc6e8d8ee7290ae11e8f73292, 0x67a8811c397529dac52ae1342ba58c9500000000000000000000000000000000, 0x20, 0xf50428677c60f997aadeab24aabf7fceaef491c96a52b463ae91f95611cf71, 0x08, 0xca9a3b00000000000000000000000000000000000000000000000000000000, 0x60, 0xa29d01cc8c6296a8150e515b5995390ef841dc18948aa3e79be6d7c1851b4cbb, 0x5d6ff49fa70b9c782399506a22a85193151b9b691245cebafd2063012443c132, 0x4b6c36debaedefb7b2d71b0503ffdc00150aaffd42e63358238ec888901738b8, 0x08, 0x00
 // get_deposit_root() -> 0x2089653123d9c721215120b6db6738ba273bbc5228ac093b1f983badcdc8a438
-// gas irOptimized: 116848
-// gas legacy: 151990
-// gas legacyOptimized: 124459
+// gas irOptimized: 115216
+// gas legacy: 148214
+// gas legacyOptimized: 122315
 // get_deposit_count() -> 0x20, 8, 0x0100000000000000000000000000000000000000000000000000000000000000
 // deposit(bytes,bytes,bytes,bytes32), 32 ether: 0x80, 0xe0, 0x120, 0xdbd986dc85ceb382708cf90a3500f500f0a393c5ece76963ac3ed72eccd2c301, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x00344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d -> # txhash: 0x404d8e109822ce448e68f45216c12cb051b784d068fbe98317ab8e50c58304ac #
 // ~ emit DepositEvent(bytes,bytes,bytes,bytes,bytes): 0xa0, 0x0100, 0x0140, 0x0180, 0x0200, 0x30, 0xb2ce0f79f90e7b3a113ca5783c65756f96c4b4673c2b5c1eb4efc22280259441, 0x06d601211e8866dc5b50dc48a244dd7c00000000000000000000000000000000, 0x20, 0x344b6c73f71b11c56aba0d01b7d8ad83559f209d0a4101a515f6ad54c89771, 0x08, 0x40597307000000000000000000000000000000000000000000000000000000, 0x60, 0x945caaf82d18e78c033927d51f452ebcd76524497b91d7a11219cb3db6a1d369, 0x7595fc095ce489e46b2ef129591f2f6d079be4faaf345a02c5eb133c072e7c56, 0x0c6c3617eee66b4b878165c502357d49485326bc6b31bc96873f308c8f19c09d, 0x08, 0x0100000000000000000000000000000000000000000000000000000000000000
 // get_deposit_root() -> 0x40255975859377d912c53aa853245ebd939bdd2b33a28e084babdcc1ed8238ee
-// gas irOptimized: 116848
-// gas legacy: 151990
-// gas legacyOptimized: 124459
+// gas irOptimized: 115216
+// gas legacy: 148214
+// gas legacyOptimized: 122315
 // get_deposit_count() -> 0x20, 8, 0x0200000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
index 8d0a99382e..3311a8dcf4 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_signed.sol
@@ -48,9 +48,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1847920
-// gas legacy: 2430726
-// gas legacyOptimized: 1854979
+// gas irOptimized: 1841740
+// gas legacy: 2414091
+// gas legacyOptimized: 1847616
 // div(int256,int256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
 // gas irOptimized: 22137
 // gas legacy: 22767
diff --git a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
index 9efc71108a..fb1d1a4352 100644
--- a/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
+++ b/test/libsolidity/semanticTests/externalContracts/prbmath_unsigned.sol
@@ -48,9 +48,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 1722166
-// gas legacy: 2210160
-// gas legacyOptimized: 1734152
+// gas irOptimized: 1716327
+// gas legacy: 2193550
+// gas legacyOptimized: 1725061
 // div(uint256,uint256): 3141592653589793238, 88714123 -> 35412542528203691288251815328
 // gas irOptimized: 22004
 // gas legacy: 22497
diff --git a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
index 45fb4486d7..3f555405dd 100644
--- a/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
+++ b/test/libsolidity/semanticTests/externalContracts/ramanujan_pi.sol
@@ -33,10 +33,10 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 406595
-// gas legacy: 631753
-// gas legacyOptimized: 459425
+// gas irOptimized: 407507
+// gas legacy: 615090
+// gas legacyOptimized: 451871
 // prb_pi() -> 3141592656369545286
 // gas irOptimized: 57478
-// gas legacy: 101655
+// gas legacy: 100947
 // gas legacyOptimized: 75735
diff --git a/test/libsolidity/semanticTests/externalContracts/snark.sol b/test/libsolidity/semanticTests/externalContracts/snark.sol
index e92f95b4ad..d3492a5c6b 100644
--- a/test/libsolidity/semanticTests/externalContracts/snark.sol
+++ b/test/libsolidity/semanticTests/externalContracts/snark.sol
@@ -294,11 +294,11 @@ contract Test {
 // f() -> true
 // g() -> true
 // pair() -> true
-// gas irOptimized: 269901
-// gas legacy: 275678
-// gas legacyOptimized: 267193
+// gas irOptimized: 269697
+// gas legacy: 275206
+// gas legacyOptimized: 266925
 // verifyTx() -> true
 // ~ emit Verified(string): 0x20, 0x16, "Successfully verified."
-// gas irOptimized: 783281
-// gas legacy: 804346
-// gas legacyOptimized: 772349
+// gas irOptimized: 782210
+// gas legacy: 801868
+// gas legacyOptimized: 770942
diff --git a/test/libsolidity/semanticTests/externalContracts/strings.sol b/test/libsolidity/semanticTests/externalContracts/strings.sol
index a90b3e83bd..18d6db37df 100644
--- a/test/libsolidity/semanticTests/externalContracts/strings.sol
+++ b/test/libsolidity/semanticTests/externalContracts/strings.sol
@@ -49,9 +49,9 @@ contract test {
 }
 // ----
 // constructor()
-// gas irOptimized: 633680
-// gas legacy: 1065857
-// gas legacyOptimized: 725423
+// gas irOptimized: 630224
+// gas legacy: 1061957
+// gas legacyOptimized: 718937
 // toSlice(string): 0x20, 11, "hello world" -> 11, 0xa0
 // gas irOptimized: 22660
 // gas legacy: 23190
@@ -69,6 +69,6 @@ contract test {
 // gas legacy: 31621
 // gas legacyOptimized: 27914
 // benchmark(string,bytes32): 0x40, 0x0842021, 8, "solidity" -> 0x2020
-// gas irOptimized: 1981664
-// gas legacy: 4235651
-// gas legacyOptimized: 2319622
+// gas irOptimized: 1980944
+// gas legacy: 4233999
+// gas legacyOptimized: 2318684
diff --git a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
index 5aeff319c9..79d53273ba 100644
--- a/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
+++ b/test/libsolidity/semanticTests/libraries/internal_types_in_library.sol
@@ -22,6 +22,6 @@ contract Test {
 // ----
 // library: Lib
 // f() -> 4, 0x11
-// gas irOptimized: 112064
-// gas legacy: 135413
-// gas legacyOptimized: 119325
+// gas irOptimized: 111560
+// gas legacy: 132935
+// gas legacyOptimized: 118023
diff --git a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
index f9c2d333a2..9ed64be08b 100644
--- a/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
+++ b/test/libsolidity/semanticTests/userDefinedValueType/calldata.sol
@@ -49,13 +49,13 @@ contract C {
 }
 // ----
 // test_f() -> true
-// gas irOptimized: 122393
-// gas legacy: 126030
-// gas legacyOptimized: 123120
+// gas irOptimized: 122078
+// gas legacy: 125322
+// gas legacyOptimized: 122709
 // test_g() -> true
-// gas irOptimized: 106740
-// gas legacy: 112300
-// gas legacyOptimized: 107649
+// gas irOptimized: 106215
+// gas legacy: 111120
+// gas legacyOptimized: 106964
 // addresses(uint256): 0 -> 0x18
 // addresses(uint256): 1 -> 0x19
 // addresses(uint256): 3 -> 0x1b

From f294988d564a91f8aef76d57d35baf7359b52c1d Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 24 Oct 2023 10:07:49 +0200
Subject: [PATCH 1650/1748] Fix broken docs link for 0.8.22

---
 docs/layout-of-source-files.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/layout-of-source-files.rst b/docs/layout-of-source-files.rst
index a5c7164bcc..600f2ed0f4 100644
--- a/docs/layout-of-source-files.rst
+++ b/docs/layout-of-source-files.rst
@@ -40,7 +40,7 @@ The comment is recognized by the compiler anywhere in the file at the
 file level, but it is recommended to put it at the top of the file.
 
 More information about how to use SPDX license identifiers
-can be found at the `SPDX website <https://spdx.org/ids-how>`_.
+can be found at the `SPDX website <https://spdx.dev/learn/handling-license-info/#how>`_.
 
 
 .. index:: ! pragma

From e8b898ce8cd85b4d02f79b4819e5398750dbf304 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 Oct 2023 16:40:39 +0200
Subject: [PATCH 1651/1748] ASTImportTest.sh: Keep temporary files in subdirs
 of a single, properly named dir

---
 scripts/ASTImportTest.sh | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripts/ASTImportTest.sh b/scripts/ASTImportTest.sh
index c245261951..251001ce37 100755
--- a/scripts/ASTImportTest.sh
+++ b/scripts/ASTImportTest.sh
@@ -196,8 +196,6 @@ function test_import_export_equivalence {
     fi
 }
 
-WORKINGDIR=$PWD
-
 command_available "$SOLC" --version
 command_available jq --version
 
@@ -214,12 +212,17 @@ IMPORT_TEST_FILES=$(find "${TEST_DIRS[@]}" -name "*.sol" -and -not -name "boost_
 NSOURCES="$(echo "${IMPORT_TEST_FILES}" | wc -l)"
 echo "Looking at ${NSOURCES} .sol files..."
 
+COUNTER=0
+TEST_DIR=$(mktemp -d -t "import-export-test-XXXXXX")
+pushd "$TEST_DIR" > /dev/null
+
 for solfile in $IMPORT_TEST_FILES
 do
     echo -n "·"
-    # create a temporary sub-directory
-    FILETMP=$(mktemp -d)
-    cd "$FILETMP"
+
+    TEST_SUBDIR="$(printf "%05d" "$COUNTER")-$(basename "$solfile")"
+    mkdir "$TEST_SUBDIR"
+    pushd "$TEST_SUBDIR" > /dev/null
 
     set +e
     OUTPUT=$("$SPLITSOURCES" "$solfile")
@@ -244,19 +247,16 @@ do
         # All other return codes will be treated as critical errors. The script will exit.
         printError "\n\nGot unexpected return code ${SPLITSOURCES_RC} from '${SPLITSOURCES} ${solfile}'. Aborting."
         printError "\n\n${OUTPUT}\n\n"
-
-        cd "$WORKINGDIR"
-        # Delete temporary files
-        rm -rf "$FILETMP"
-
         exit 1
     fi
 
-    cd "$WORKINGDIR"
-    # Delete temporary files
-    rm -rf "$FILETMP"
+    popd > /dev/null
+    ((++COUNTER))
 done
 
+popd > /dev/null
+rm -r "$TEST_DIR"
+
 echo
 
 if (( FAILED == 0 ))

From 3e823e01a5a295a90b861fc99345c2cd09121e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 24 Oct 2023 16:40:39 +0200
Subject: [PATCH 1652/1748] Introduce AbstractAssemblyStack interface

Co-authored-by: Alexander Arlt <alexander.arlt@arlt-labs.com>
Co-authored-by: r0qs <rodrigo.saramago@ethereum.org>
---
 libevmasm/AbstractAssemblyStack.h       |  54 ++++++++
 libevmasm/CMakeLists.txt                |   1 +
 libsolidity/interface/CompilerStack.cpp |   1 -
 libsolidity/interface/CompilerStack.h   |  25 ++--
 solc/CommandLineInterface.cpp           | 163 ++++++++++++++----------
 solc/CommandLineInterface.h             |   3 +
 6 files changed, 171 insertions(+), 76 deletions(-)
 create mode 100644 libevmasm/AbstractAssemblyStack.h

diff --git a/libevmasm/AbstractAssemblyStack.h b/libevmasm/AbstractAssemblyStack.h
new file mode 100644
index 0000000000..6be78cbc7c
--- /dev/null
+++ b/libevmasm/AbstractAssemblyStack.h
@@ -0,0 +1,54 @@
+/*
+	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
+
+#pragma once
+
+#include <libevmasm/LinkerObject.h>
+
+#include <libsolutil/Common.h>
+#include <libsolutil/JSON.h>
+
+#include <string>
+#include <vector>
+
+namespace solidity::evmasm
+{
+
+class AbstractAssemblyStack
+{
+public:
+	virtual ~AbstractAssemblyStack() {}
+
+	virtual LinkerObject const& object(std::string const& _contractName) const = 0;
+	virtual LinkerObject const& runtimeObject(std::string const& _contractName) const = 0;
+
+	virtual std::string const* sourceMapping(std::string const& _contractName) const = 0;
+	virtual std::string const* runtimeSourceMapping(std::string const& _contractName) const = 0;
+
+	virtual Json::Value assemblyJSON(std::string const& _contractName) const = 0;
+	virtual std::string assemblyString(std::string const& _contractName, StringMap const& _sourceCodes) const = 0;
+
+	virtual std::string const filesystemFriendlyName(std::string const& _contractName) const = 0;
+
+	virtual std::vector<std::string> contractNames() const = 0;
+	virtual std::vector<std::string> sourceNames() const = 0;
+
+	virtual bool compilationSuccessful() const = 0;
+};
+
+} // namespace solidity::evmasm
diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
index 6563b2c0fa..d73495ac93 100644
--- a/libevmasm/CMakeLists.txt
+++ b/libevmasm/CMakeLists.txt
@@ -1,4 +1,5 @@
 set(sources
+	AbstractAssemblyStack.h
 	Assembly.cpp
 	Assembly.h
 	AssemblyItem.cpp
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 3afe11fa82..14b3350163 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -74,7 +74,6 @@
 #include <liblangutil/SemVerHandler.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 
-#include <libevmasm/Exceptions.h>
 
 #include <libsolutil/SwarmHash.h>
 #include <libsolutil/IpfsHash.h>
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 06c78b6860..929e7e54f4 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -41,6 +41,7 @@
 #include <liblangutil/EVMVersion.h>
 #include <liblangutil/SourceLocation.h>
 
+#include <libevmasm/AbstractAssemblyStack.h>
 #include <libevmasm/LinkerObject.h>
 
 #include <libsolutil/Common.h>
@@ -91,7 +92,7 @@ class Analysis;
  * It holds state and can be used to either step through the compilation stages (and abort e.g.
  * before compilation to bytecode) or run the whole compilation in one call.
  */
-class CompilerStack: public langutil::CharStreamProvider
+class CompilerStack: public langutil::CharStreamProvider, public evmasm::AbstractAssemblyStack
 {
 public:
 	/// Noncopyable.
@@ -123,7 +124,7 @@ class CompilerStack: public langutil::CharStreamProvider
 		/// Regular compilation from Solidity source files.
 		Solidity,
 		/// Compilation from an imported Solidity AST.
-		SolidityAST
+		SolidityAST,
 	};
 
 	/// Creates a new compiler stack.
@@ -139,6 +140,8 @@ class CompilerStack: public langutil::CharStreamProvider
 	/// @returns the current state.
 	State state() const { return m_stackState; }
 
+	virtual bool compilationSuccessful() const override { return m_stackState >= CompilationSuccessful; }
+
 	/// Resets the compiler to an empty state. Unless @a _keepSettings is set to true,
 	/// all settings are reset as well.
 	void reset(bool _keepSettings = false);
@@ -234,7 +237,7 @@ class CompilerStack: public langutil::CharStreamProvider
 	bool compile(State _stopAfter = State::CompilationSuccessful);
 
 	/// @returns the list of sources (paths) used
-	std::vector<std::string> sourceNames() const;
+	virtual std::vector<std::string> sourceNames() const override;
 
 	/// @returns a mapping assigning each source name its index inside the vector returned
 	/// by sourceNames().
@@ -255,13 +258,13 @@ class CompilerStack: public langutil::CharStreamProvider
 	std::vector<std::string> const& unhandledSMTLib2Queries() const { return m_unhandledSMTLib2Queries; }
 
 	/// @returns a list of the contract names in the sources.
-	std::vector<std::string> contractNames() const;
+	virtual std::vector<std::string> contractNames() const override;
 
 	/// @returns the name of the last contract. If _sourceName is defined the last contract of that source will be returned.
 	std::string const lastContractName(std::optional<std::string> const& _sourceName = std::nullopt) const;
 
 	/// @returns either the contract's name or a mixture of its name and source file, sanitized for filesystem use
-	std::string const filesystemFriendlyName(std::string const& _contractName) const;
+	virtual std::string const filesystemFriendlyName(std::string const& _contractName) const override;
 
 	/// @returns the IR representation of a contract.
 	std::string const& yulIR(std::string const& _contractName) const;
@@ -276,10 +279,10 @@ class CompilerStack: public langutil::CharStreamProvider
 	Json::Value const& yulIROptimizedAst(std::string const& _contractName) const;
 
 	/// @returns the assembled object for a contract.
-	evmasm::LinkerObject const& object(std::string const& _contractName) const;
+	virtual evmasm::LinkerObject const& object(std::string const& _contractName) const override;
 
 	/// @returns the runtime object for the contract.
-	evmasm::LinkerObject const& runtimeObject(std::string const& _contractName) const;
+	virtual evmasm::LinkerObject const& runtimeObject(std::string const& _contractName) const override;
 
 	/// @returns normal contract assembly items
 	evmasm::AssemblyItems const* assemblyItems(std::string const& _contractName) const;
@@ -293,21 +296,21 @@ class CompilerStack: public langutil::CharStreamProvider
 
 	/// @returns the string that provides a mapping between bytecode and sourcecode or a nullptr
 	/// if the contract does not (yet) have bytecode.
-	std::string const* sourceMapping(std::string const& _contractName) const;
+	virtual std::string const* sourceMapping(std::string const& _contractName) const override;
 
 	/// @returns the string that provides a mapping between runtime bytecode and sourcecode.
 	/// if the contract does not (yet) have bytecode.
-	std::string const* runtimeSourceMapping(std::string const& _contractName) const;
+	virtual std::string const* runtimeSourceMapping(std::string const& _contractName) const override;
 
 	/// @return a verbose text representation of the assembly.
 	/// @arg _sourceCodes is the map of input files to source code strings
 	/// Prerequisite: Successful compilation.
-	std::string assemblyString(std::string const& _contractName, StringMap const& _sourceCodes = StringMap()) const;
+	virtual std::string assemblyString(std::string const& _contractName, StringMap const& _sourceCodes = StringMap()) const override;
 
 	/// @returns a JSON representation of the assembly.
 	/// @arg _sourceCodes is the map of input files to source code strings
 	/// Prerequisite: Successful compilation.
-	Json::Value assemblyJSON(std::string const& _contractName) const;
+	virtual Json::Value assemblyJSON(std::string const& _contractName) const override;
 
 	/// @returns a JSON representing the contract ABI.
 	/// Prerequisite: Successful call to parse or compile.
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 1dc2a59f06..13760adbeb 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -166,28 +166,62 @@ static bool coloredOutput(CommandLineOptions const& _options)
 		(_options.formatting.coloredOutput.has_value() && _options.formatting.coloredOutput.value());
 }
 
+void CommandLineInterface::handleEVMAssembly(std::string const& _contract)
+{
+	solAssert(m_assemblyStack);
+	solAssert(
+		CompilerInputModes.count(m_options.input.mode) == 1
+	);
+
+	if (!m_options.compiler.outputs.asm_ && !m_options.compiler.outputs.asmJson)
+		return;
+
+	std::string assembly;
+	if (m_options.compiler.outputs.asmJson)
+		assembly = util::jsonPrint(removeNullMembers(m_assemblyStack->assemblyJSON(_contract)), m_options.formatting.json);
+	else
+		assembly = m_assemblyStack->assemblyString(_contract, m_fileReader.sourceUnits());
+
+	if (!m_options.output.dir.empty())
+		createFile(
+			m_compiler->filesystemFriendlyName(_contract) +
+			(m_options.compiler.outputs.asmJson ? "_evm.json" : ".evm"),
+			assembly
+		);
+	else
+		sout() << "EVM assembly:" << std::endl << assembly << std::endl;
+}
+
 void CommandLineInterface::handleBinary(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
+	solAssert(m_assemblyStack);
+
+	std::string binary;
+	std::string binaryRuntime;
+	if (m_options.compiler.outputs.binary)
+		binary = objectWithLinkRefsHex(m_assemblyStack->object(_contract));
+	if (m_options.compiler.outputs.binaryRuntime)
+		binaryRuntime = objectWithLinkRefsHex(m_assemblyStack->runtimeObject(_contract));
 
 	if (m_options.compiler.outputs.binary)
 	{
 		if (!m_options.output.dir.empty())
-			createFile(m_compiler->filesystemFriendlyName(_contract) + ".bin", objectWithLinkRefsHex(m_compiler->object(_contract)));
+			createFile(m_assemblyStack->filesystemFriendlyName(_contract) + ".bin", binary);
 		else
 		{
 			sout() << "Binary:" << std::endl;
-			sout() << objectWithLinkRefsHex(m_compiler->object(_contract)) << std::endl;
+			sout() << binary << std::endl;
 		}
 	}
 	if (m_options.compiler.outputs.binaryRuntime)
 	{
 		if (!m_options.output.dir.empty())
-			createFile(m_compiler->filesystemFriendlyName(_contract) + ".bin-runtime", objectWithLinkRefsHex(m_compiler->runtimeObject(_contract)));
+			createFile(m_assemblyStack->filesystemFriendlyName(_contract) + ".bin-runtime", binaryRuntime);
 		else
 		{
 			sout() << "Binary of the runtime part:" << std::endl;
-			sout() << objectWithLinkRefsHex(m_compiler->runtimeObject(_contract)) << std::endl;
+			sout() << binaryRuntime << std::endl;
 		}
 	}
 }
@@ -195,13 +229,16 @@ void CommandLineInterface::handleBinary(std::string const& _contract)
 void CommandLineInterface::handleOpcode(std::string const& _contract)
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
+	solAssert(m_assemblyStack);
+
+	std::string opcodes{evmasm::disassemble(m_assemblyStack->object(_contract).bytecode, m_options.output.evmVersion)};
 
 	if (!m_options.output.dir.empty())
-		createFile(m_compiler->filesystemFriendlyName(_contract) + ".opcode", evmasm::disassemble(m_compiler->object(_contract).bytecode, m_options.output.evmVersion));
+		createFile(m_assemblyStack->filesystemFriendlyName(_contract) + ".opcode", opcodes);
 	else
 	{
 		sout() << "Opcodes:" << std::endl;
-		sout() << std::uppercase << evmasm::disassemble(m_compiler->object(_contract).bytecode, m_options.output.evmVersion);
+		sout() << std::uppercase << opcodes;
 		sout() << std::endl;
 	}
 }
@@ -741,8 +778,11 @@ void CommandLineInterface::printLicense()
 void CommandLineInterface::compile()
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
+	solAssert(!m_assemblyStack);
+	solAssert(!m_compiler);
 
 	m_compiler = std::make_unique<CompilerStack>(m_universalCallback.callback());
+	m_assemblyStack = m_compiler.get();
 
 	SourceReferenceFormatter formatter(serr(false), *m_compiler, coloredOutput(m_options), m_options.formatting.withErrorIds);
 
@@ -853,6 +893,7 @@ void CommandLineInterface::compile()
 void CommandLineInterface::handleCombinedJSON()
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
+	solAssert(m_assemblyStack);
 
 	if (!m_options.compiler.combinedJsonRequests.has_value())
 		return;
@@ -860,59 +901,65 @@ void CommandLineInterface::handleCombinedJSON()
 	Json::Value output(Json::objectValue);
 
 	output[g_strVersion] = frontend::VersionString;
-	std::vector<std::string> contracts = m_compiler->contractNames();
-
-	// NOTE: The state checks here are more strict that in Standard JSON. There we allow
-	// requesting certain outputs even if compilation fails as long as analysis went ok.
-	bool compilationSuccess = m_compiler->state() >= CompilerStack::State::CompilationSuccessful;
+	std::vector<std::string> contracts = m_assemblyStack->contractNames();
 
 	if (!contracts.empty())
 		output[g_strContracts] = Json::Value(Json::objectValue);
 	for (std::string const& contractName: contracts)
 	{
 		Json::Value& contractData = output[g_strContracts][contractName] = Json::objectValue;
-		if (m_options.compiler.combinedJsonRequests->abi && compilationSuccess)
-			contractData[g_strAbi] = m_compiler->contractABI(contractName);
-		if (m_options.compiler.combinedJsonRequests->metadata && compilationSuccess)
-			contractData["metadata"] = m_compiler->metadata(contractName);
-		if (m_options.compiler.combinedJsonRequests->binary && compilationSuccess)
-			contractData[g_strBinary] = m_compiler->object(contractName).toHex();
-		if (m_options.compiler.combinedJsonRequests->binaryRuntime && compilationSuccess)
-			contractData[g_strBinaryRuntime] = m_compiler->runtimeObject(contractName).toHex();
-		if (m_options.compiler.combinedJsonRequests->opcodes && compilationSuccess)
-			contractData[g_strOpcodes] = evmasm::disassemble(m_compiler->object(contractName).bytecode, m_options.output.evmVersion);
-		if (m_options.compiler.combinedJsonRequests->asm_ && compilationSuccess)
-			contractData[g_strAsm] = m_compiler->assemblyJSON(contractName);
-		if (m_options.compiler.combinedJsonRequests->storageLayout && compilationSuccess)
-			contractData[g_strStorageLayout] = m_compiler->storageLayout(contractName);
-		if (m_options.compiler.combinedJsonRequests->generatedSources && compilationSuccess)
-			contractData[g_strGeneratedSources] = m_compiler->generatedSources(contractName, false);
-		if (m_options.compiler.combinedJsonRequests->generatedSourcesRuntime && compilationSuccess)
-			contractData[g_strGeneratedSourcesRuntime] = m_compiler->generatedSources(contractName, true);
-		if (m_options.compiler.combinedJsonRequests->srcMap && compilationSuccess)
+
+		// NOTE: The state checks here are more strict that in Standard JSON. There we allow
+		// requesting certain outputs even if compilation fails as long as analysis went ok.
+		if (m_compiler && m_compiler->compilationSuccessful())
 		{
-			auto map = m_compiler->sourceMapping(contractName);
-			contractData[g_strSrcMap] = map ? *map : "";
+			if (m_options.compiler.combinedJsonRequests->abi)
+				contractData[g_strAbi] = m_compiler->contractABI(contractName);
+			if (m_options.compiler.combinedJsonRequests->metadata)
+				contractData["metadata"] = m_compiler->metadata(contractName);
+			if (m_options.compiler.combinedJsonRequests->storageLayout)
+				contractData[g_strStorageLayout] = m_compiler->storageLayout(contractName);
+			if (m_options.compiler.combinedJsonRequests->generatedSources)
+				contractData[g_strGeneratedSources] = m_compiler->generatedSources(contractName, false);
+			if (m_options.compiler.combinedJsonRequests->generatedSourcesRuntime)
+				contractData[g_strGeneratedSourcesRuntime] = m_compiler->generatedSources(contractName, true);
+			if (m_options.compiler.combinedJsonRequests->signatureHashes)
+				contractData[g_strSignatureHashes] = m_compiler->interfaceSymbols(contractName)["methods"];
+			if (m_options.compiler.combinedJsonRequests->natspecDev)
+				contractData[g_strNatspecDev] = m_compiler->natspecDev(contractName);
+			if (m_options.compiler.combinedJsonRequests->natspecUser)
+				contractData[g_strNatspecUser] = m_compiler->natspecUser(contractName);
 		}
-		if (m_options.compiler.combinedJsonRequests->srcMapRuntime && compilationSuccess)
+
+		if (m_assemblyStack->compilationSuccessful())
 		{
-			auto map = m_compiler->runtimeSourceMapping(contractName);
-			contractData[g_strSrcMapRuntime] = map ? *map : "";
+			if (m_options.compiler.combinedJsonRequests->binary)
+				contractData[g_strBinary] = m_assemblyStack->object(contractName).toHex();
+			if (m_options.compiler.combinedJsonRequests->binaryRuntime)
+				contractData[g_strBinaryRuntime] = m_assemblyStack->runtimeObject(contractName).toHex();
+			if (m_options.compiler.combinedJsonRequests->opcodes)
+				contractData[g_strOpcodes] = evmasm::disassemble(m_assemblyStack->object(contractName).bytecode, m_options.output.evmVersion);
+			if (m_options.compiler.combinedJsonRequests->asm_)
+				contractData[g_strAsm] = m_assemblyStack->assemblyJSON(contractName);
+			if (m_options.compiler.combinedJsonRequests->srcMap)
+			{
+				auto map = m_assemblyStack->sourceMapping(contractName);
+				contractData[g_strSrcMap] = map ? *map : "";
+			}
+			if (m_options.compiler.combinedJsonRequests->srcMapRuntime)
+			{
+				auto map = m_assemblyStack->runtimeSourceMapping(contractName);
+				contractData[g_strSrcMapRuntime] = map ? *map : "";
+			}
+			if (m_options.compiler.combinedJsonRequests->funDebug)
+				contractData[g_strFunDebug] = StandardCompiler::formatFunctionDebugData(
+					m_assemblyStack->object(contractName).functionDebugData
+				);
+			if (m_options.compiler.combinedJsonRequests->funDebugRuntime)
+				contractData[g_strFunDebugRuntime] = StandardCompiler::formatFunctionDebugData(
+					m_assemblyStack->runtimeObject(contractName).functionDebugData
+				);
 		}
-		if (m_options.compiler.combinedJsonRequests->funDebug && compilationSuccess)
-			contractData[g_strFunDebug] = StandardCompiler::formatFunctionDebugData(
-				m_compiler->object(contractName).functionDebugData
-			);
-		if (m_options.compiler.combinedJsonRequests->funDebugRuntime && compilationSuccess)
-			contractData[g_strFunDebugRuntime] = StandardCompiler::formatFunctionDebugData(
-				m_compiler->runtimeObject(contractName).functionDebugData
-			);
-		if (m_options.compiler.combinedJsonRequests->signatureHashes && compilationSuccess)
-			contractData[g_strSignatureHashes] = m_compiler->interfaceSymbols(contractName)["methods"];
-		if (m_options.compiler.combinedJsonRequests->natspecDev && compilationSuccess)
-			contractData[g_strNatspecDev] = m_compiler->natspecDev(contractName);
-		if (m_options.compiler.combinedJsonRequests->natspecUser && compilationSuccess)
-			contractData[g_strNatspecUser] = m_compiler->natspecUser(contractName);
 	}
 
 	bool needsSourceList =
@@ -924,12 +971,13 @@ void CommandLineInterface::handleCombinedJSON()
 		// Indices into this array are used to abbreviate source names in source locations.
 		output[g_strSourceList] = Json::Value(Json::arrayValue);
 
-		for (auto const& source: m_compiler->sourceNames())
+		for (auto const& source: m_assemblyStack->sourceNames())
 			output[g_strSourceList].append(source);
 	}
 
 	if (m_options.compiler.combinedJsonRequests->ast)
 	{
+		solAssert(m_compiler);
 		output[g_strSources] = Json::Value(Json::objectValue);
 		for (auto const& sourceCode: m_fileReader.sourceUnits())
 		{
@@ -1201,20 +1249,7 @@ void CommandLineInterface::outputCompilationResults()
 			if (needsHumanTargetedStdout(m_options))
 				sout() << std::endl << "======= " << contract << " =======" << std::endl;
 
-			// do we need EVM assembly?
-			if (m_options.compiler.outputs.asm_ || m_options.compiler.outputs.asmJson)
-			{
-				std::string ret;
-				if (m_options.compiler.outputs.asmJson)
-					ret = util::jsonPrint(removeNullMembers(m_compiler->assemblyJSON(contract)), m_options.formatting.json);
-				else
-					ret = m_compiler->assemblyString(contract, m_fileReader.sourceUnits());
-
-				if (!m_options.output.dir.empty())
-					createFile(m_compiler->filesystemFriendlyName(contract) + (m_options.compiler.outputs.asmJson ? "_evm.json" : ".evm"), ret);
-				else
-					sout() << "EVM assembly:" << std::endl << ret << std::endl;
-			}
+			handleEVMAssembly(contract);
 
 			if (m_options.compiler.estimateGas)
 				handleGasEstimation(contract);
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index f08eea662a..2d3cd07f2a 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -24,6 +24,7 @@
 
 #include <solc/CommandLineParser.h>
 
+#include <libevmasm/AbstractAssemblyStack.h>
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/DebugSettings.h>
 #include <libsolidity/interface/FileReader.h>
@@ -98,6 +99,7 @@ class CommandLineInterface
 
 	void handleCombinedJSON();
 	void handleAst();
+	void handleEVMAssembly(std::string const& _contract);
 	void handleBinary(std::string const& _contract);
 	void handleOpcode(std::string const& _contract);
 	void handleIR(std::string const& _contract);
@@ -147,6 +149,7 @@ class CommandLineInterface
 	UniversalCallback m_universalCallback{&m_fileReader, m_solverCommand};
 	std::optional<std::string> m_standardJsonInput;
 	std::unique_ptr<frontend::CompilerStack> m_compiler;
+	evmasm::AbstractAssemblyStack* m_assemblyStack = nullptr;
 	CommandLineOptions m_options;
 };
 

From 67e11fc477a1c361ea04751772b1d490361b6b93 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 1 Nov 2022 23:58:45 -0500
Subject: [PATCH 1653/1748] EVM assembly import via --import-asm-json
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
Co-authored-by: r0qs <rodrigo.saramago@ethereum.org>
---
 Changelog.md                                  |   1 +
 libevmasm/Assembly.cpp                        | 357 +++++++++++++++-
 libevmasm/Assembly.h                          |  41 +-
 libevmasm/AssemblyItem.cpp                    |  12 +
 libevmasm/AssemblyItem.h                      |   1 +
 libevmasm/CMakeLists.txt                      |   2 +
 libevmasm/EVMAssemblyStack.cpp                | 122 ++++++
 libevmasm/EVMAssemblyStack.h                  |  85 ++++
 libevmasm/Exceptions.h                        |   1 +
 solc/CommandLineInterface.cpp                 |  58 ++-
 solc/CommandLineInterface.h                   |   3 +
 solc/CommandLineParser.cpp                    |  85 +++-
 solc/CommandLineParser.h                      |   1 +
 .../asm_json_import_all_valid_flags/args      |   1 +
 .../asm_json_import_all_valid_flags/output    |  91 ++++
 .../asm_json_import_all_valid_flags/stdin     |  22 +
 .../args                                      |   1 +
 .../output                                    |   6 +
 .../stdin                                     |   6 +
 .../args                                      |   1 +
 .../output                                    |  57 +++
 .../stdin                                     |  27 ++
 .../asm_json_import_invalid_data_not_hex/args |   1 +
 .../asm_json_import_invalid_data_not_hex/err  |   1 +
 .../asm_json_import_invalid_data_not_hex/exit |   1 +
 .../stdin                                     |  11 +
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../stdin                                     |  11 +
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../stdin                                     |   9 +
 .../asm_json_import_invalid_value/args        |   1 +
 .../asm_json_import_invalid_value/err         |   1 +
 .../asm_json_import_invalid_value/exit        |   1 +
 .../asm_json_import_invalid_value/stdin       |   8 +
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../stdin                                     |  19 +
 .../asm_json_import_no_value/args             |   1 +
 .../cmdlineTests/asm_json_import_no_value/err |   1 +
 .../asm_json_import_no_value/exit             |   1 +
 .../asm_json_import_no_value/stdin            |   5 +
 .../asm_json_import_non_unique_sources/args   |   1 +
 .../asm_json_import_non_unique_sources/err    |   1 +
 .../asm_json_import_non_unique_sources/exit   |   1 +
 .../asm_json_import_non_unique_sources/stdin  |  23 +
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../stdin                                     |   6 +
 .../args                                      |   1 +
 .../err                                       |   1 +
 .../exit                                      |   1 +
 .../stdin                                     |  13 +
 .../args                                      |   1 +
 .../output                                    |  35 ++
 .../stdin                                     |  27 ++
 .../asm_json_import_unrecognized_field/args   |   1 +
 .../asm_json_import_unrecognized_field/err    |   1 +
 .../asm_json_import_unrecognized_field/exit   |   1 +
 .../asm_json_import_unrecognized_field/stdin  |   5 +
 .../asm_json_import_untagged_jumpdest/args    |   1 +
 .../asm_json_import_untagged_jumpdest/err     |   1 +
 .../asm_json_import_untagged_jumpdest/exit    |   1 +
 .../asm_json_import_untagged_jumpdest/stdin   |  10 +
 .../asm_json_import_verbatim/args             |   1 +
 .../asm_json_import_verbatim/output           |  58 +++
 .../asm_json_import_verbatim/stdin            | 196 +++++++++
 .../asm_json_import_yul_more_subobjects/args  |   1 +
 .../output                                    |   2 +
 .../asm_json_import_yul_more_subobjects/stdin | 348 +++++++++++++++
 .../asm_json_import_yul_subobjects/args       |   1 +
 .../asm_json_import_yul_subobjects/output     |   2 +
 .../asm_json_import_yul_subobjects/stdin      | 400 ++++++++++++++++++
 test/solc/CommandLineInterface.cpp            |   5 +-
 79 files changed, 2195 insertions(+), 16 deletions(-)
 create mode 100644 libevmasm/EVMAssemblyStack.cpp
 create mode 100644 libevmasm/EVMAssemblyStack.h
 create mode 100644 test/cmdlineTests/asm_json_import_all_valid_flags/args
 create mode 100644 test/cmdlineTests/asm_json_import_all_valid_flags/output
 create mode 100644 test/cmdlineTests/asm_json_import_all_valid_flags/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_difficulty_prevrandao/args
 create mode 100644 test/cmdlineTests/asm_json_import_difficulty_prevrandao/output
 create mode 100644 test/cmdlineTests/asm_json_import_difficulty_prevrandao/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_hex_subassembly_indices/args
 create mode 100644 test/cmdlineTests/asm_json_import_hex_subassembly_indices/output
 create mode 100644 test/cmdlineTests/asm_json_import_hex_subassembly_indices/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_data_not_hex/args
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_data_not_hex/err
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_data_not_hex/exit
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_data_not_hex/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_data_not_object/args
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_data_not_object/err
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_data_not_object/exit
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_data_not_object/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/args
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/err
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/exit
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_value/args
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_value/err
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_value/exit
 create mode 100644 test/cmdlineTests/asm_json_import_invalid_value/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_missing_subobject_indices/args
 create mode 100644 test/cmdlineTests/asm_json_import_missing_subobject_indices/err
 create mode 100644 test/cmdlineTests/asm_json_import_missing_subobject_indices/exit
 create mode 100644 test/cmdlineTests/asm_json_import_missing_subobject_indices/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_no_value/args
 create mode 100644 test/cmdlineTests/asm_json_import_no_value/err
 create mode 100644 test/cmdlineTests/asm_json_import_no_value/exit
 create mode 100644 test/cmdlineTests/asm_json_import_no_value/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_non_unique_sources/args
 create mode 100644 test/cmdlineTests/asm_json_import_non_unique_sources/err
 create mode 100644 test/cmdlineTests/asm_json_import_non_unique_sources/exit
 create mode 100644 test/cmdlineTests/asm_json_import_non_unique_sources/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_optimize_not_supported/args
 create mode 100644 test/cmdlineTests/asm_json_import_optimize_not_supported/err
 create mode 100644 test/cmdlineTests/asm_json_import_optimize_not_supported/exit
 create mode 100644 test/cmdlineTests/asm_json_import_optimize_not_supported/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_out_of_range_data_index/args
 create mode 100644 test/cmdlineTests/asm_json_import_out_of_range_data_index/err
 create mode 100644 test/cmdlineTests/asm_json_import_out_of_range_data_index/exit
 create mode 100644 test/cmdlineTests/asm_json_import_out_of_range_data_index/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_random_order_data_index/args
 create mode 100644 test/cmdlineTests/asm_json_import_random_order_data_index/output
 create mode 100644 test/cmdlineTests/asm_json_import_random_order_data_index/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_unrecognized_field/args
 create mode 100644 test/cmdlineTests/asm_json_import_unrecognized_field/err
 create mode 100644 test/cmdlineTests/asm_json_import_unrecognized_field/exit
 create mode 100644 test/cmdlineTests/asm_json_import_unrecognized_field/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_untagged_jumpdest/args
 create mode 100644 test/cmdlineTests/asm_json_import_untagged_jumpdest/err
 create mode 100644 test/cmdlineTests/asm_json_import_untagged_jumpdest/exit
 create mode 100644 test/cmdlineTests/asm_json_import_untagged_jumpdest/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_verbatim/args
 create mode 100644 test/cmdlineTests/asm_json_import_verbatim/output
 create mode 100644 test/cmdlineTests/asm_json_import_verbatim/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_yul_more_subobjects/args
 create mode 100644 test/cmdlineTests/asm_json_import_yul_more_subobjects/output
 create mode 100644 test/cmdlineTests/asm_json_import_yul_more_subobjects/stdin
 create mode 100644 test/cmdlineTests/asm_json_import_yul_subobjects/args
 create mode 100644 test/cmdlineTests/asm_json_import_yul_subobjects/output
 create mode 100644 test/cmdlineTests/asm_json_import_yul_subobjects/stdin

diff --git a/Changelog.md b/Changelog.md
index 005e3aac55..279fbec634 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Language Features:
 Compiler Features:
  * Code Generator: Remove redundant overflow checks of certain ``for`` loops when the counter variable cannot overflow.
  * Commandline Interface: Add ``--no-import-callback`` option that prevents the compiler from loading source files not given explicitly on the CLI or in Standard JSON input.
+ * Commandline Interface: Add an experimental ``--import-asm-json`` option that can import EVM assembly in the format used by ``--asm-json``.
  * Commandline Interface: Use proper severity and coloring also for error messages produced outside of the compilation pipeline.
  * EVM: Deprecate support for "homestead", "tangerineWhistle", "spuriousDragon" and "byzantium" EVM versions.
  * Parser: Remove the experimental error recovery mode (``--error-recovery`` / ``settings.parserErrorRecovery``).
diff --git a/libevmasm/Assembly.cpp b/libevmasm/Assembly.cpp
index f524aad66b..b6e4d0006c 100644
--- a/libevmasm/Assembly.cpp
+++ b/libevmasm/Assembly.cpp
@@ -34,19 +34,27 @@
 #include <liblangutil/CharStream.h>
 #include <liblangutil/Exceptions.h>
 
-#include <json/json.h>
+#include <libsolutil/JSON.h>
+#include <libsolutil/StringUtils.h>
+
+#include <fmt/format.h>
 
 #include <range/v3/algorithm/any_of.hpp>
+#include <range/v3/view/drop_exactly.hpp>
 #include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/map.hpp>
 
 #include <fstream>
 #include <limits>
+#include <iterator>
 
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
 using namespace solidity::util;
 
+std::map<std::string, std::shared_ptr<std::string const>> Assembly::s_sharedSourceNames;
+
 AssemblyItem const& Assembly::append(AssemblyItem _i)
 {
 	assertThrow(m_deposit >= 0, AssemblyException, "Stack underflow.");
@@ -73,6 +81,205 @@ unsigned Assembly::codeSize(unsigned subTagSize) const
 	}
 }
 
+void Assembly::importAssemblyItemsFromJSON(Json::Value const& _code, std::vector<std::string> const& _sourceList)
+{
+	solAssert(m_items.empty());
+	solRequire(_code.isArray(), AssemblyImportException, "Supplied JSON is not an array.");
+	for (auto jsonItemIter = std::begin(_code); jsonItemIter != std::end(_code); ++jsonItemIter)
+	{
+		AssemblyItem const& newItem = m_items.emplace_back(createAssemblyItemFromJSON(*jsonItemIter, _sourceList));
+		if (newItem == Instruction::JUMPDEST)
+			solThrow(AssemblyImportException, "JUMPDEST instruction without a tag");
+		else if (newItem.type() == AssemblyItemType::Tag)
+		{
+			++jsonItemIter;
+			if (jsonItemIter != std::end(_code) && createAssemblyItemFromJSON(*jsonItemIter, _sourceList) != Instruction::JUMPDEST)
+				solThrow(AssemblyImportException, "JUMPDEST expected after tag.");
+		}
+	}
+}
+
+AssemblyItem Assembly::createAssemblyItemFromJSON(Json::Value const& _json, std::vector<std::string> const& _sourceList)
+{
+	solRequire(_json.isObject(), AssemblyImportException, "Supplied JSON is not an object.");
+	static std::set<std::string> const validMembers{"name", "begin", "end", "source", "value", "modifierDepth", "jumpType"};
+	for (std::string const& member: _json.getMemberNames())
+		solRequire(
+			validMembers.count(member),
+			AssemblyImportException,
+			fmt::format(
+				"Unknown member '{}'. Valid members are: {}.",
+				member,
+				solidity::util::joinHumanReadable(validMembers, ", ")
+			)
+		);
+	solRequire(isOfType<std::string>(_json["name"]), AssemblyImportException, "Member 'name' missing or not of type string.");
+	solRequire(isOfTypeIfExists<int>(_json, "begin"), AssemblyImportException, "Optional member 'begin' not of type int.");
+	solRequire(isOfTypeIfExists<int>(_json, "end"), AssemblyImportException, "Optional member 'end' not of type int.");
+	solRequire(isOfTypeIfExists<int>(_json, "source"), AssemblyImportException, "Optional member 'source' not of type int.");
+	solRequire(isOfTypeIfExists<std::string>(_json, "value"), AssemblyImportException, "Optional member 'value' not of type string.");
+	solRequire(isOfTypeIfExists<int>(_json, "modifierDepth"), AssemblyImportException, "Optional member 'modifierDepth' not of type int.");
+	solRequire(isOfTypeIfExists<std::string>(_json, "jumpType"), AssemblyImportException, "Optional member 'jumpType' not of type string.");
+
+	std::string name = get<std::string>(_json["name"]);
+	solRequire(!name.empty(), AssemblyImportException, "Member 'name' is empty.");
+
+	SourceLocation location;
+	location.start = get<int>(_json["begin"]);
+	location.end = get<int>(_json["end"]);
+	int srcIndex = getOrDefault<int>(_json["source"], -1);
+	size_t modifierDepth = static_cast<size_t>(getOrDefault<int>(_json["modifierDepth"], 0));
+	std::string value = getOrDefault<std::string>(_json["value"], "");
+	std::string jumpType = getOrDefault<std::string>(_json["jumpType"], "");
+
+	auto updateUsedTags = [&](u256 const& data)
+	{
+		m_usedTags = std::max(m_usedTags, static_cast<unsigned>(data) + 1);
+		return data;
+	};
+
+	auto storeImmutableHash = [&](std::string const& _immutableName) -> h256
+	{
+		h256 hash(util::keccak256(_immutableName));
+		solAssert(m_immutables.count(hash) == 0 || m_immutables[hash] == _immutableName);
+		m_immutables[hash] = _immutableName;
+		return hash;
+	};
+
+	auto storeLibraryHash = [&](std::string const& _libraryName) -> h256
+	{
+		h256 hash(util::keccak256(_libraryName));
+		solAssert(m_libraries.count(hash) == 0 || m_libraries[hash] == _libraryName);
+		m_libraries[hash] = _libraryName;
+		return hash;
+	};
+
+	auto requireValueDefinedForInstruction = [&](std::string const& _name, std::string const& _value)
+	{
+		solRequire(
+			!_value.empty(),
+			AssemblyImportException,
+			"Member 'value' is missing for instruction '" + _name + "', but the instruction needs a value."
+		);
+	};
+
+	auto requireValueUndefinedForInstruction = [&](std::string const& _name, std::string const& _value)
+	{
+		solRequire(
+			_value.empty(),
+			AssemblyImportException,
+			"Member 'value' defined for instruction '" + _name + "', but the instruction does not need a value."
+		);
+	};
+
+	solRequire(srcIndex >= -1 && srcIndex < static_cast<int>(_sourceList.size()), AssemblyImportException, "Source index out of bounds.");
+	if (srcIndex != -1)
+		location.sourceName = sharedSourceName(_sourceList[static_cast<size_t>(srcIndex)]);
+
+	AssemblyItem result(0);
+
+	if (c_instructions.count(name))
+	{
+		AssemblyItem item{c_instructions.at(name), location};
+		if (!jumpType.empty())
+		{
+			if (item.instruction() == Instruction::JUMP || item.instruction() == Instruction::JUMPI)
+			{
+				std::optional<AssemblyItem::JumpType> parsedJumpType = AssemblyItem::parseJumpType(jumpType);
+				if (!parsedJumpType.has_value())
+					solThrow(AssemblyImportException, "Invalid jump type.");
+				item.setJumpType(parsedJumpType.value());
+			}
+			else
+				solThrow(
+					AssemblyImportException,
+					"Member 'jumpType' set on instruction different from JUMP or JUMPI (was set on instruction '" + name + "')"
+				);
+		}
+		requireValueUndefinedForInstruction(name, value);
+		result = item;
+	}
+	else
+	{
+		solRequire(
+			jumpType.empty(),
+			AssemblyImportException,
+			"Member 'jumpType' set on instruction different from JUMP or JUMPI (was set on instruction '" + name + "')"
+		);
+		if (name == "PUSH")
+		{
+			requireValueDefinedForInstruction(name, value);
+			result = {AssemblyItemType::Push, u256("0x" + value)};
+		}
+		else if (name == "PUSH [ErrorTag]")
+		{
+			requireValueUndefinedForInstruction(name, value);
+			result = {AssemblyItemType::PushTag, 0};
+		}
+		else if (name == "PUSH [tag]")
+		{
+			requireValueDefinedForInstruction(name, value);
+			result = {AssemblyItemType::PushTag, updateUsedTags(u256(value))};
+		}
+		else if (name == "PUSH [$]")
+		{
+			requireValueDefinedForInstruction(name, value);
+			result = {AssemblyItemType::PushSub, u256("0x" + value)};
+		}
+		else if (name == "PUSH #[$]")
+		{
+			requireValueDefinedForInstruction(name, value);
+			result = {AssemblyItemType::PushSubSize, u256("0x" + value)};
+		}
+		else if (name == "PUSHSIZE")
+		{
+			requireValueUndefinedForInstruction(name, value);
+			result = {AssemblyItemType::PushProgramSize, 0};
+		}
+		else if (name == "PUSHLIB")
+		{
+			requireValueDefinedForInstruction(name, value);
+			result = {AssemblyItemType::PushLibraryAddress, storeLibraryHash(value)};
+		}
+		else if (name == "PUSHDEPLOYADDRESS")
+		{
+			requireValueUndefinedForInstruction(name, value);
+			result = {AssemblyItemType::PushDeployTimeAddress, 0};
+		}
+		else if (name == "PUSHIMMUTABLE")
+		{
+			requireValueDefinedForInstruction(name, value);
+			result = {AssemblyItemType::PushImmutable, storeImmutableHash(value)};
+		}
+		else if (name == "ASSIGNIMMUTABLE")
+		{
+			requireValueDefinedForInstruction(name, value);
+			result = {AssemblyItemType::AssignImmutable, storeImmutableHash(value)};
+		}
+		else if (name == "tag")
+		{
+			requireValueDefinedForInstruction(name, value);
+			result = {AssemblyItemType::Tag, updateUsedTags(u256(value))};
+		}
+		else if (name == "PUSH data")
+		{
+			requireValueDefinedForInstruction(name, value);
+			result = {AssemblyItemType::PushData, u256("0x" + value)};
+		}
+		else if (name == "VERBATIM")
+		{
+			requireValueDefinedForInstruction(name, value);
+			AssemblyItem item(fromHex(value), 0, 0);
+			result = item;
+		}
+		else
+			solThrow(InvalidOpcode, "Invalid opcode: " + name);
+	}
+	result.setLocation(location);
+	result.m_modifierDepth = modifierDepth;
+	return result;
+}
+
 namespace
 {
 
@@ -297,6 +504,154 @@ Json::Value Assembly::assemblyJSON(std::map<std::string, unsigned> const& _sourc
 	return root;
 }
 
+std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> Assembly::fromJSON(
+	Json::Value const& _json,
+	std::vector<std::string> const& _sourceList,
+	size_t _level
+)
+{
+	solRequire(_json.isObject(), AssemblyImportException, "Supplied JSON is not an object.");
+	static std::set<std::string> const validMembers{".code", ".data", ".auxdata", "sourceList"};
+	for (std::string const& attribute: _json.getMemberNames())
+		solRequire(validMembers.count(attribute), AssemblyImportException, "Unknown attribute '" + attribute + "'.");
+
+	if (_level == 0)
+	{
+		if (_json.isMember("sourceList"))
+		{
+			solRequire(_json["sourceList"].isArray(), AssemblyImportException, "Optional member 'sourceList' is not an array.");
+			for (Json::Value const& sourceName: _json["sourceList"])
+				solRequire(sourceName.isString(), AssemblyImportException, "The 'sourceList' array contains an item that is not a string.");
+		}
+	}
+	else
+		solRequire(
+			!_json.isMember("sourceList"),
+			AssemblyImportException,
+			"Member 'sourceList' may only be present in the root JSON object."
+		);
+
+	auto result = std::make_shared<Assembly>(EVMVersion{}, _level == 0 /* _creation */, "" /* _name */);
+	std::vector<std::string> parsedSourceList;
+	if (_json.isMember("sourceList"))
+	{
+		solAssert(_level == 0);
+		solAssert(_sourceList.empty());
+		for (Json::Value const& sourceName: _json["sourceList"])
+		{
+			solRequire(
+				std::find(parsedSourceList.begin(), parsedSourceList.end(), sourceName.asString()) == parsedSourceList.end(),
+				AssemblyImportException,
+				"Items in 'sourceList' array are not unique."
+			);
+			parsedSourceList.emplace_back(sourceName.asString());
+		}
+	}
+
+	solRequire(_json.isMember(".code"), AssemblyImportException, "Member '.code' is missing.");
+	solRequire(_json[".code"].isArray(), AssemblyImportException, "Member '.code' is not an array.");
+	for (Json::Value const& codeItem: _json[".code"])
+		solRequire(codeItem.isObject(), AssemblyImportException, "The '.code' array contains an item that is not an object.");
+
+	result->importAssemblyItemsFromJSON(_json[".code"], _level == 0 ? parsedSourceList : _sourceList);
+
+	if (_json[".auxdata"])
+	{
+		solRequire(_json[".auxdata"].isString(), AssemblyImportException, "Optional member '.auxdata' is not a string.");
+		result->m_auxiliaryData = fromHex(_json[".auxdata"].asString());
+		solRequire(!result->m_auxiliaryData.empty(), AssemblyImportException, "Optional member '.auxdata' is not a valid hexadecimal string.");
+	}
+
+	if (_json.isMember(".data"))
+	{
+		solRequire(_json[".data"].isObject(), AssemblyImportException, "Optional member '.data' is not an object.");
+		Json::Value const& data = _json[".data"];
+		std::map<size_t, std::shared_ptr<Assembly>> subAssemblies;
+		for (Json::ValueConstIterator dataIter = data.begin(); dataIter != data.end(); dataIter++)
+		{
+			solAssert(dataIter.key().isString());
+			std::string dataItemID = dataIter.key().asString();
+			Json::Value const& dataItem = data[dataItemID];
+			if (dataItem.isString())
+			{
+				solRequire(
+					dataItem.asString().empty() || !fromHex(dataItem.asString()).empty(),
+					AssemblyImportException,
+					"The value for key '" + dataItemID + "' inside '.data' is not a valid hexadecimal string."
+				);
+				result->m_data[h256(fromHex(dataItemID))] = fromHex(dataItem.asString());
+			}
+			else if (dataItem.isObject())
+			{
+				size_t index{};
+				try
+				{
+					// Using signed variant because stoul() still accepts negative numbers and
+					// just lets them wrap around.
+					int parsedDataItemID = std::stoi(dataItemID, nullptr, 16);
+					solRequire(parsedDataItemID >= 0, AssemblyImportException, "The key '" + dataItemID + "' inside '.data' is out of the supported integer range.");
+					index = static_cast<size_t>(parsedDataItemID);
+				}
+				catch (std::invalid_argument const&)
+				{
+					solThrow(AssemblyImportException, "The key '" + dataItemID + "' inside '.data' is not an integer.");
+				}
+				catch (std::out_of_range const&)
+				{
+					solThrow(AssemblyImportException, "The key '" + dataItemID + "' inside '.data' is out of the supported integer range.");
+				}
+
+				auto [subAssembly, emptySourceList] = Assembly::fromJSON(dataItem, _level == 0 ? parsedSourceList : _sourceList, _level + 1);
+				solAssert(subAssembly);
+				solAssert(emptySourceList.empty());
+				solAssert(subAssemblies.count(index) == 0);
+				subAssemblies[index] = subAssembly;
+			}
+			else
+				solThrow(AssemblyImportException, "The value of key '" + dataItemID + "' inside '.data' is neither a hex string nor an object.");
+		}
+
+		if (!subAssemblies.empty())
+			solRequire(
+				ranges::max(subAssemblies | ranges::views::keys) == subAssemblies.size() - 1,
+				AssemblyImportException,
+				fmt::format(
+					"Invalid subassembly indices in '.data'. Not all numbers between 0 and {} are present.",
+					subAssemblies.size() - 1
+				)
+			);
+
+		result->m_subs = subAssemblies | ranges::views::values | ranges::to<std::vector>;
+	}
+
+	if (_level == 0)
+		result->encodeAllPossibleSubPathsInAssemblyTree();
+
+	return std::make_pair(result, _level == 0 ? parsedSourceList : std::vector<std::string>{});
+}
+
+void Assembly::encodeAllPossibleSubPathsInAssemblyTree(std::vector<size_t> _pathFromRoot, std::vector<Assembly*> _assembliesOnPath)
+{
+	_assembliesOnPath.push_back(this);
+	for (_pathFromRoot.push_back(0); _pathFromRoot.back() < m_subs.size(); ++_pathFromRoot.back())
+	{
+		for (size_t distanceFromRoot = 0; distanceFromRoot < _assembliesOnPath.size(); ++distanceFromRoot)
+			_assembliesOnPath[distanceFromRoot]->encodeSubPath(
+				_pathFromRoot | ranges::views::drop_exactly(distanceFromRoot) | ranges::to<std::vector>
+			);
+
+		m_subs[_pathFromRoot.back()]->encodeAllPossibleSubPathsInAssemblyTree(_pathFromRoot, _assembliesOnPath);
+	}
+}
+
+std::shared_ptr<std::string const> Assembly::sharedSourceName(std::string const& _name) const
+{
+	if (s_sharedSourceNames.find(_name) == s_sharedSourceNames.end())
+		s_sharedSourceNames[_name] = std::make_shared<std::string>(_name);
+
+	return s_sharedSourceNames[_name];
+}
+
 AssemblyItem Assembly::namedTag(std::string const& _name, size_t _params, size_t _returns, std::optional<uint64_t> _sourceID)
 {
 	assertThrow(!_name.empty(), AssemblyException, "Empty named tag.");
diff --git a/libevmasm/Assembly.h b/libevmasm/Assembly.h
index bd37b3a7fd..6e90028256 100644
--- a/libevmasm/Assembly.h
+++ b/libevmasm/Assembly.h
@@ -150,10 +150,23 @@ class Assembly
 	) const;
 
 	/// Create a JSON representation of the assembly.
-	Json::Value assemblyJSON(
-		std::map<std::string, unsigned> const& _sourceIndices = std::map<std::string, unsigned>(),
-		bool _includeSourceList = true
-	) const;
+	Json::Value assemblyJSON(std::map<std::string, unsigned> const& _sourceIndices, bool _includeSourceList = true) const;
+
+	/// Constructs an @a Assembly from the serialized JSON representation.
+	/// @param _json JSON object containing assembly in the format produced by assemblyJSON().
+	/// @param _sourceList List of source files the assembly was built from. When the JSON represents
+	///     the root assembly, the function will read it from the 'sourceList' field and the parameter
+	///     must be empty. It is only used to pass the list down to recursive calls.
+	/// @param _level Nesting level of the current assembly in the assembly tree. The root is
+	///     at level 0 and the value increases down the tree. Necessary to distinguish between creation
+	///     and deployed objects.
+	/// @returns Created @a Assembly and the source list read from the 'sourceList' field of the root
+	///     assembly or an empty list (in recursive calls).
+	static std::pair<std::shared_ptr<Assembly>, std::vector<std::string>> fromJSON(
+		Json::Value const& _json,
+		std::vector<std::string> const& _sourceList = {},
+		size_t _level = 0
+	);
 
 	/// Mark this assembly as invalid. Calling ``assemble`` on it will throw.
 	void markAsInvalid() { m_invalid = true; }
@@ -171,11 +184,27 @@ class Assembly
 
 	unsigned codeSize(unsigned subTagSize) const;
 
+	/// Add all assembly items from given JSON array. This function imports the items by iterating through
+	/// the code array. This method only works on clean Assembly objects that don't have any items defined yet.
+	/// @param _json JSON array that contains assembly items (e.g. json['.code'])
+	/// @param _sourceList List of source names.
+	void importAssemblyItemsFromJSON(Json::Value const& _code, std::vector<std::string> const& _sourceList);
+
+	/// Creates an AssemblyItem from a given JSON representation.
+	/// @param _json JSON object that consists a single assembly item
+	/// @param _sourceList List of source names.
+	/// @returns AssemblyItem of _json argument.
+	AssemblyItem createAssemblyItemFromJSON(Json::Value const& _json, std::vector<std::string> const& _sourceList);
+
 private:
 	bool m_invalid = false;
 
 	Assembly const* subAssemblyById(size_t _subId) const;
 
+	void encodeAllPossibleSubPathsInAssemblyTree(std::vector<size_t> _pathFromRoot = {}, std::vector<Assembly*> _assembliesOnPath = {});
+
+	std::shared_ptr<std::string const> sharedSourceName(std::string const& _name) const;
+
 protected:
 	/// 0 is reserved for exception
 	unsigned m_usedTags = 1;
@@ -217,9 +246,11 @@ class Assembly
 	/// Internal name of the assembly object, only used with the Yul backend
 	/// currently
 	std::string m_name;
-
 	langutil::SourceLocation m_currentSourceLocation;
 
+	// FIXME: This being static means that the strings won't be freed when they're no longer needed
+	static std::map<std::string, std::shared_ptr<std::string const>> s_sharedSourceNames;
+
 public:
 	size_t m_currentModifierDepth = 0;
 };
diff --git a/libevmasm/AssemblyItem.cpp b/libevmasm/AssemblyItem.cpp
index 6c2b673c69..2adaa023a1 100644
--- a/libevmasm/AssemblyItem.cpp
+++ b/libevmasm/AssemblyItem.cpp
@@ -247,6 +247,18 @@ std::string AssemblyItem::getJumpTypeAsString() const
 	}
 }
 
+std::optional<AssemblyItem::JumpType> AssemblyItem::parseJumpType(std::string const& _jumpType)
+{
+	if (_jumpType == "[in]")
+		return JumpType::IntoFunction;
+	else if (_jumpType == "[out]")
+		return JumpType::OutOfFunction;
+	else if (_jumpType.empty())
+		return JumpType::Ordinary;
+
+	return std::nullopt;
+}
+
 std::string AssemblyItem::toAssemblyText(Assembly const& _assembly) const
 {
 	std::string text;
diff --git a/libevmasm/AssemblyItem.h b/libevmasm/AssemblyItem.h
index 077c1912d2..40f98dae87 100644
--- a/libevmasm/AssemblyItem.h
+++ b/libevmasm/AssemblyItem.h
@@ -174,6 +174,7 @@ class AssemblyItem
 	langutil::SourceLocation const& location() const { return m_location; }
 
 	void setJumpType(JumpType _jumpType) { m_jumpType = _jumpType; }
+	static std::optional<JumpType> parseJumpType(std::string const& _jumpType);
 	JumpType getJumpType() const { return m_jumpType; }
 	std::string getJumpTypeAsString() const;
 
diff --git a/libevmasm/CMakeLists.txt b/libevmasm/CMakeLists.txt
index d73495ac93..c1918540e6 100644
--- a/libevmasm/CMakeLists.txt
+++ b/libevmasm/CMakeLists.txt
@@ -4,6 +4,8 @@ set(sources
 	Assembly.h
 	AssemblyItem.cpp
 	AssemblyItem.h
+	EVMAssemblyStack.cpp
+	EVMAssemblyStack.h
 	BlockDeduplicator.cpp
 	BlockDeduplicator.h
 	CommonSubexpressionEliminator.cpp
diff --git a/libevmasm/EVMAssemblyStack.cpp b/libevmasm/EVMAssemblyStack.cpp
new file mode 100644
index 0000000000..68f60808c9
--- /dev/null
+++ b/libevmasm/EVMAssemblyStack.cpp
@@ -0,0 +1,122 @@
+/*
+	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 <libevmasm/EVMAssemblyStack.h>
+
+#include <libsolutil/JSON.h>
+#include <liblangutil/Exceptions.h>
+#include <libsolidity/codegen/CompilerContext.h>
+
+#include <range/v3/view/enumerate.hpp>
+#include <range/v3/view/transform.hpp>
+
+#include <tuple>
+
+using namespace solidity::util;
+using namespace solidity::langutil;
+using namespace solidity::frontend;
+
+namespace solidity::evmasm
+{
+
+void EVMAssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string const& _source)
+{
+	solAssert(!m_evmAssembly);
+	m_name = _sourceName;
+	Json::Value assemblyJson;
+	solRequire(jsonParseStrict(_source, assemblyJson), AssemblyImportException, "Could not parse JSON file.");
+	std::tie(m_evmAssembly, m_sourceList) = evmasm::Assembly::fromJSON(assemblyJson);
+	solRequire(m_evmAssembly != nullptr, AssemblyImportException, "Could not create evm assembly object.");
+}
+
+void EVMAssemblyStack::assemble()
+{
+	solAssert(m_evmAssembly);
+	solAssert(m_evmAssembly->isCreation());
+	solAssert(!m_evmRuntimeAssembly);
+
+	m_object = m_evmAssembly->assemble();
+	m_sourceMapping = AssemblyItem::computeSourceMapping(m_evmAssembly->items(), sourceIndices());
+	if (m_evmAssembly->numSubs() > 0)
+	{
+		m_evmRuntimeAssembly = std::make_shared<evmasm::Assembly>(m_evmAssembly->sub(0));
+		solAssert(m_evmRuntimeAssembly && !m_evmRuntimeAssembly->isCreation());
+		m_runtimeSourceMapping = AssemblyItem::computeSourceMapping(m_evmRuntimeAssembly->items(), sourceIndices());
+		m_runtimeObject = m_evmRuntimeAssembly->assemble();
+	}
+}
+
+LinkerObject const& EVMAssemblyStack::object(std::string const& _contractName) const
+{
+	solAssert(_contractName == m_name);
+	return m_object;
+}
+
+LinkerObject const& EVMAssemblyStack::runtimeObject(std::string const& _contractName) const
+{
+	solAssert(_contractName == m_name);
+	return m_runtimeObject;
+}
+
+std::map<std::string, unsigned> EVMAssemblyStack::sourceIndices() const
+{
+	solAssert(m_evmAssembly);
+	return m_sourceList
+		| ranges::views::enumerate
+		| ranges::views::transform([](auto const& _source) { return std::make_pair(_source.second, _source.first); })
+		| ranges::to<std::map<std::string, unsigned>>;
+}
+
+std::string const* EVMAssemblyStack::sourceMapping(std::string const& _contractName) const
+{
+	solAssert(_contractName == m_name);
+	return &m_sourceMapping;
+}
+
+std::string const* EVMAssemblyStack::runtimeSourceMapping(std::string const& _contractName) const
+{
+	solAssert(_contractName == m_name);
+	return &m_runtimeSourceMapping;
+}
+
+Json::Value EVMAssemblyStack::assemblyJSON(std::string const& _contractName) const
+{
+	solAssert(_contractName == m_name);
+	solAssert(m_evmAssembly);
+	return m_evmAssembly->assemblyJSON(sourceIndices());
+}
+
+std::string EVMAssemblyStack::assemblyString(std::string const& _contractName, StringMap const& _sourceCodes) const
+{
+	solAssert(_contractName == m_name);
+	solAssert(m_evmAssembly);
+	return m_evmAssembly->assemblyString(m_debugInfoSelection, _sourceCodes);
+}
+
+std::string const EVMAssemblyStack::filesystemFriendlyName(std::string const& _contractName) const
+{
+	solAssert(_contractName == m_name);
+	return m_name;
+}
+
+std::vector<std::string> EVMAssemblyStack::sourceNames() const
+{
+	return m_sourceList;
+}
+
+} // namespace solidity::evmasm
diff --git a/libevmasm/EVMAssemblyStack.h b/libevmasm/EVMAssemblyStack.h
new file mode 100644
index 0000000000..cf02cec52f
--- /dev/null
+++ b/libevmasm/EVMAssemblyStack.h
@@ -0,0 +1,85 @@
+/*
+	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
+
+#pragma once
+
+#include <libevmasm/AbstractAssemblyStack.h>
+#include <libevmasm/Assembly.h>
+#include <libevmasm/LinkerObject.h>
+
+#include <libsolutil/JSON.h>
+
+#include <map>
+#include <string>
+
+namespace solidity::evmasm
+{
+
+class EVMAssemblyStack: public AbstractAssemblyStack
+{
+public:
+	explicit EVMAssemblyStack(langutil::EVMVersion _evmVersion): m_evmVersion(_evmVersion) {}
+
+	/// Runs parsing and analysis steps.
+	/// Multiple calls overwrite the previous state.
+	/// @throws AssemblyImportException, if JSON could not be validated.
+	void parseAndAnalyze(std::string const& _sourceName, std::string const& _source);
+
+	void assemble();
+
+	std::string const& name() const { return m_name; }
+
+	virtual LinkerObject const& object(std::string const& _contractName) const override;
+	virtual LinkerObject const& runtimeObject(std::string const& _contractName) const override;
+
+	std::shared_ptr<evmasm::Assembly> const& evmAssembly() const { return m_evmAssembly; }
+	std::shared_ptr<evmasm::Assembly> const& evmRuntimeAssembly() const { return m_evmRuntimeAssembly; }
+
+	virtual std::string const* sourceMapping(std::string const& _contractName) const override;
+	virtual std::string const* runtimeSourceMapping(std::string const& _contractName) const override;
+
+	virtual Json::Value assemblyJSON(std::string const& _contractName) const override;
+	virtual std::string assemblyString(std::string const& _contractName, StringMap const& _sourceCodes) const override;
+
+	virtual std::string const filesystemFriendlyName(std::string const& _contractName) const override;
+
+	virtual std::vector<std::string> contractNames() const override { return {m_name}; }
+	virtual std::vector<std::string> sourceNames() const override;
+	std::map<std::string, unsigned> sourceIndices() const;
+
+	virtual bool compilationSuccessful() const override { return m_evmAssembly != nullptr; }
+
+	void selectDebugInfo(langutil::DebugInfoSelection _debugInfoSelection)
+	{
+		m_debugInfoSelection = _debugInfoSelection;
+	}
+
+private:
+	langutil::EVMVersion m_evmVersion;
+	std::string m_name;
+	std::shared_ptr<evmasm::Assembly> m_evmAssembly;
+	std::shared_ptr<evmasm::Assembly> m_evmRuntimeAssembly;
+	evmasm::LinkerObject m_object; ///< Deployment object (includes the runtime sub-object).
+	evmasm::LinkerObject m_runtimeObject; ///< Runtime object.
+	std::vector<std::string> m_sourceList;
+	langutil::DebugInfoSelection m_debugInfoSelection = langutil::DebugInfoSelection::Default();
+	std::string m_sourceMapping;
+	std::string m_runtimeSourceMapping;
+};
+
+} // namespace solidity::evmasm
diff --git a/libevmasm/Exceptions.h b/libevmasm/Exceptions.h
index 0275775760..ae6d1bf9c6 100644
--- a/libevmasm/Exceptions.h
+++ b/libevmasm/Exceptions.h
@@ -28,6 +28,7 @@ namespace solidity::evmasm
 {
 
 struct AssemblyException: virtual util::Exception {};
+struct AssemblyImportException: virtual AssemblyException {};
 struct OptimizerException: virtual AssemblyException {};
 struct StackTooDeepException: virtual OptimizerException {};
 struct ItemNotAvailableException: virtual OptimizerException {};
diff --git a/solc/CommandLineInterface.cpp b/solc/CommandLineInterface.cpp
index 13760adbeb..7181bfd4cc 100644
--- a/solc/CommandLineInterface.cpp
+++ b/solc/CommandLineInterface.cpp
@@ -170,7 +170,8 @@ void CommandLineInterface::handleEVMAssembly(std::string const& _contract)
 {
 	solAssert(m_assemblyStack);
 	solAssert(
-		CompilerInputModes.count(m_options.input.mode) == 1
+		CompilerInputModes.count(m_options.input.mode) == 1 ||
+		m_options.input.mode == frontend::InputMode::EVMAssemblerJSON
 	);
 
 	if (!m_options.compiler.outputs.asm_ && !m_options.compiler.outputs.asmJson)
@@ -194,8 +195,11 @@ void CommandLineInterface::handleEVMAssembly(std::string const& _contract)
 
 void CommandLineInterface::handleBinary(std::string const& _contract)
 {
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 	solAssert(m_assemblyStack);
+	solAssert(
+		CompilerInputModes.count(m_options.input.mode) == 1 ||
+		m_options.input.mode == frontend::InputMode::EVMAssemblerJSON
+	);
 
 	std::string binary;
 	std::string binaryRuntime;
@@ -228,8 +232,11 @@ void CommandLineInterface::handleBinary(std::string const& _contract)
 
 void CommandLineInterface::handleOpcode(std::string const& _contract)
 {
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 	solAssert(m_assemblyStack);
+	solAssert(
+		CompilerInputModes.count(m_options.input.mode) == 1 ||
+		m_options.input.mode == frontend::InputMode::EVMAssemblerJSON
+	);
 
 	std::string opcodes{evmasm::disassemble(m_assemblyStack->object(_contract).bytecode, m_options.output.evmVersion)};
 
@@ -330,7 +337,10 @@ void CommandLineInterface::handleIROptimizedAst(std::string const& _contractName
 
 void CommandLineInterface::handleBytecode(std::string const& _contract)
 {
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
+	solAssert(
+		CompilerInputModes.count(m_options.input.mode) == 1 ||
+		m_options.input.mode == frontend::InputMode::EVMAssemblerJSON
+	);
 
 	if (m_options.compiler.outputs.opcodes)
 		handleOpcode(_contract);
@@ -759,6 +769,12 @@ void CommandLineInterface::processInput()
 		compile();
 		outputCompilationResults();
 		break;
+	case InputMode::EVMAssemblerJSON:
+		assembleFromEVMAssemblyJSON();
+		handleCombinedJSON();
+		handleBytecode(m_assemblyStack->contractNames().front());
+		handleEVMAssembly(m_assemblyStack->contractNames().front());
+		break;
 	}
 }
 
@@ -775,11 +791,38 @@ void CommandLineInterface::printLicense()
 	sout() << licenseText << std::endl;
 }
 
+void CommandLineInterface::assembleFromEVMAssemblyJSON()
+{
+	solAssert(m_options.input.mode == InputMode::EVMAssemblerJSON);
+	solAssert(!m_assemblyStack);
+	solAssert(!m_evmAssemblyStack && !m_compiler);
+
+	solAssert(m_fileReader.sourceUnits().size() == 1);
+	auto&& [sourceUnitName, source] = *m_fileReader.sourceUnits().begin();
+
+	auto evmAssemblyStack = std::make_unique<evmasm::EVMAssemblyStack>(m_options.output.evmVersion);
+	try
+	{
+		evmAssemblyStack->parseAndAnalyze(sourceUnitName, source);
+	}
+	catch (evmasm::AssemblyImportException const& _exception)
+	{
+		solThrow(CommandLineExecutionError, "Assembly Import Error: "s + _exception.what());
+	}
+
+	if (m_options.output.debugInfoSelection.has_value())
+		evmAssemblyStack->selectDebugInfo(m_options.output.debugInfoSelection.value());
+	evmAssemblyStack->assemble();
+
+	m_evmAssemblyStack = std::move(evmAssemblyStack);
+	m_assemblyStack = m_evmAssemblyStack.get();
+}
+
 void CommandLineInterface::compile()
 {
 	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 	solAssert(!m_assemblyStack);
-	solAssert(!m_compiler);
+	solAssert(!m_evmAssemblyStack && !m_compiler);
 
 	m_compiler = std::make_unique<CompilerStack>(m_universalCallback.callback());
 	m_assemblyStack = m_compiler.get();
@@ -892,8 +935,11 @@ void CommandLineInterface::compile()
 
 void CommandLineInterface::handleCombinedJSON()
 {
-	solAssert(CompilerInputModes.count(m_options.input.mode) == 1);
 	solAssert(m_assemblyStack);
+	solAssert(
+		CompilerInputModes.count(m_options.input.mode) == 1 ||
+		m_options.input.mode == frontend::InputMode::EVMAssemblerJSON
+	);
 
 	if (!m_options.compiler.combinedJsonRequests.has_value())
 		return;
diff --git a/solc/CommandLineInterface.h b/solc/CommandLineInterface.h
index 2d3cd07f2a..906b34d62b 100644
--- a/solc/CommandLineInterface.h
+++ b/solc/CommandLineInterface.h
@@ -25,6 +25,7 @@
 #include <solc/CommandLineParser.h>
 
 #include <libevmasm/AbstractAssemblyStack.h>
+#include <libevmasm/EVMAssemblyStack.h>
 #include <libsolidity/interface/CompilerStack.h>
 #include <libsolidity/interface/DebugSettings.h>
 #include <libsolidity/interface/FileReader.h>
@@ -85,6 +86,7 @@ class CommandLineInterface
 	void printVersion();
 	void printLicense();
 	void compile();
+	void assembleFromEVMAssemblyJSON();
 	void serveLSP();
 	void link();
 	void writeLinkedFiles();
@@ -149,6 +151,7 @@ class CommandLineInterface
 	UniversalCallback m_universalCallback{&m_fileReader, m_solverCommand};
 	std::optional<std::string> m_standardJsonInput;
 	std::unique_ptr<frontend::CompilerStack> m_compiler;
+	std::unique_ptr<evmasm::EVMAssemblyStack> m_evmAssemblyStack;
 	evmasm::AbstractAssemblyStack* m_assemblyStack = nullptr;
 	CommandLineOptions m_options;
 };
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index c21659a9bc..0c7484fd40 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -30,6 +30,8 @@
 #include <range/v3/view/filter.hpp>
 #include <range/v3/range/conversion.hpp>
 
+#include <fmt/format.h>
+
 using namespace solidity::langutil;
 
 namespace po = boost::program_options;
@@ -50,6 +52,7 @@ static std::string const g_strExperimentalViaIR = "experimental-via-ir";
 static std::string const g_strGas = "gas";
 static std::string const g_strHelp = "help";
 static std::string const g_strImportAst = "import-ast";
+static std::string const g_strImportEvmAssemblerJson = "import-asm-json";
 static std::string const g_strInputFile = "input-file";
 static std::string const g_strYul = "yul";
 static std::string const g_strYulDialect = "yul-dialect";
@@ -141,6 +144,7 @@ static std::map<InputMode, std::string> const g_inputModeName = {
 	{InputMode::StandardJson, "standard JSON"},
 	{InputMode::Linker, "linker"},
 	{InputMode::LanguageServer, "language server (LSP)"},
+	{InputMode::EVMAssemblerJSON, "EVM assembler (JSON format)"},
 };
 
 void CommandLineParser::checkMutuallyExclusive(std::vector<std::string> const& _optionNames)
@@ -468,7 +472,13 @@ void CommandLineParser::parseOutputSelection()
 			CompilerOutputs::componentName(&CompilerOutputs::irOptimized),
 			CompilerOutputs::componentName(&CompilerOutputs::astCompactJson),
 		};
-
+		static std::set<std::string> const evmAssemblyJsonImportModeOutputs = {
+			CompilerOutputs::componentName(&CompilerOutputs::asm_),
+			CompilerOutputs::componentName(&CompilerOutputs::binary),
+			CompilerOutputs::componentName(&CompilerOutputs::binaryRuntime),
+			CompilerOutputs::componentName(&CompilerOutputs::opcodes),
+			CompilerOutputs::componentName(&CompilerOutputs::asmJson),
+		};
 		switch (_mode)
 		{
 		case InputMode::Help:
@@ -479,6 +489,8 @@ void CommandLineParser::parseOutputSelection()
 		case InputMode::Compiler:
 		case InputMode::CompilerWithASTImport:
 			return util::contains(compilerModeOutputs, _outputName);
+		case InputMode::EVMAssemblerJSON:
+			return util::contains(evmAssemblyJsonImportModeOutputs, _outputName);
 		case InputMode::Assembler:
 			return util::contains(assemblerModeOutputs, _outputName);
 		case InputMode::StandardJson:
@@ -664,6 +676,10 @@ General Information)").c_str(),
 			"Supported Inputs is the output of the --" + g_strStandardJSON + " or the one produced by "
 			"--" + g_strCombinedJson + " " + CombinedJsonRequests::componentName(&CombinedJsonRequests::ast)).c_str()
 		)
+		(
+			g_strImportEvmAssemblerJson.c_str(),
+			"Import EVM assembly from JSON. Assumes input is in the format used by --asm-json."
+		)
 		(
 			g_strLSP.c_str(),
 			"Switch to language server mode (\"LSP\"). Allows the compiler to be used as an analysis backend "
@@ -940,6 +956,7 @@ void CommandLineParser::processArgs()
 		g_strYul,
 		g_strImportAst,
 		g_strLSP,
+		g_strImportEvmAssemblerJson,
 	});
 
 	if (m_args.count(g_strHelp) > 0)
@@ -958,6 +975,8 @@ void CommandLineParser::processArgs()
 		m_options.input.mode = InputMode::Linker;
 	else if (m_args.count(g_strImportAst) > 0)
 		m_options.input.mode = InputMode::CompilerWithASTImport;
+	else if (m_args.count(g_strImportEvmAssemblerJson) > 0)
+		m_options.input.mode = InputMode::EVMAssemblerJSON;
 	else
 		m_options.input.mode = InputMode::Compiler;
 
@@ -1017,9 +1036,39 @@ void CommandLineParser::processArgs()
 		if (option != CompilerOutputs::componentName(&CompilerOutputs::astCompactJson))
 			checkMutuallyExclusive({g_strStopAfter, option});
 
+	if (m_options.input.mode == InputMode::EVMAssemblerJSON)
+	{
+		static std::set<std::string> const supportedByEvmAsmJsonImport{
+			g_strImportEvmAssemblerJson,
+			CompilerOutputs::componentName(&CompilerOutputs::asm_),
+			CompilerOutputs::componentName(&CompilerOutputs::binary),
+			CompilerOutputs::componentName(&CompilerOutputs::binaryRuntime),
+			CompilerOutputs::componentName(&CompilerOutputs::asmJson),
+			CompilerOutputs::componentName(&CompilerOutputs::opcodes),
+			g_strCombinedJson,
+			g_strInputFile,
+			g_strJsonIndent,
+			g_strPrettyJson,
+			"srcmap",
+			"srcmap-runtime",
+		};
+
+		for (auto const& [optionName, optionValue]: m_args)
+			if (!optionValue.defaulted() && !supportedByEvmAsmJsonImport.count(optionName))
+				solThrow(
+					CommandLineValidationError,
+					fmt::format(
+						"Option --{} is not supported with --{}.",
+						optionName,
+						g_strImportEvmAssemblerJson
+					)
+				);
+	}
+
 	if (
 		m_options.input.mode != InputMode::Compiler &&
 		m_options.input.mode != InputMode::CompilerWithASTImport &&
+		m_options.input.mode != InputMode::EVMAssemblerJSON &&
 		m_options.input.mode != InputMode::Assembler
 	)
 	{
@@ -1377,7 +1426,11 @@ void CommandLineParser::processArgs()
 		m_args.count(g_strModelCheckerTimeout);
 	m_options.output.viaIR = (m_args.count(g_strExperimentalViaIR) > 0 || m_args.count(g_strViaIR) > 0);
 
-	solAssert(m_options.input.mode == InputMode::Compiler || m_options.input.mode == InputMode::CompilerWithASTImport);
+	solAssert(
+		m_options.input.mode == InputMode::Compiler ||
+		m_options.input.mode == InputMode::CompilerWithASTImport ||
+		m_options.input.mode == InputMode::EVMAssemblerJSON
+	);
 }
 
 void CommandLineParser::parseCombinedJsonOption()
@@ -1393,6 +1446,34 @@ void CommandLineParser::parseCombinedJsonOption()
 	m_options.compiler.combinedJsonRequests = CombinedJsonRequests{};
 	for (auto&& [componentName, component]: CombinedJsonRequests::componentMap())
 		m_options.compiler.combinedJsonRequests.value().*component = (requests.count(componentName) > 0);
+
+	if (m_options.input.mode == InputMode::EVMAssemblerJSON && m_options.compiler.combinedJsonRequests.has_value())
+	{
+		static bool CombinedJsonRequests::* invalidOptions[]{
+			&CombinedJsonRequests::abi,
+			&CombinedJsonRequests::ast,
+			&CombinedJsonRequests::funDebug,
+			&CombinedJsonRequests::funDebugRuntime,
+			&CombinedJsonRequests::generatedSources,
+			&CombinedJsonRequests::generatedSourcesRuntime,
+			&CombinedJsonRequests::metadata,
+			&CombinedJsonRequests::natspecDev,
+			&CombinedJsonRequests::natspecUser,
+			&CombinedJsonRequests::signatureHashes,
+			&CombinedJsonRequests::storageLayout
+		};
+
+		for (auto const invalidOption: invalidOptions)
+			if (m_options.compiler.combinedJsonRequests.value().*invalidOption)
+				solThrow(
+					CommandLineValidationError,
+					fmt::format(
+						"The --{} {} output is not available in EVM assembly import mode.",
+						g_strCombinedJson,
+						CombinedJsonRequests::componentName(invalidOption)
+					)
+				);
+	}
 }
 
 size_t CommandLineParser::countEnabledOptions(std::vector<std::string> const& _optionNames) const
diff --git a/solc/CommandLineParser.h b/solc/CommandLineParser.h
index cad84871e0..b95973562e 100644
--- a/solc/CommandLineParser.h
+++ b/solc/CommandLineParser.h
@@ -57,6 +57,7 @@ enum class InputMode
 	Linker,
 	Assembler,
 	LanguageServer,
+	EVMAssemblerJSON
 };
 
 struct CompilerOutputs
diff --git a/test/cmdlineTests/asm_json_import_all_valid_flags/args b/test/cmdlineTests/asm_json_import_all_valid_flags/args
new file mode 100644
index 0000000000..e6010eac3b
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_all_valid_flags/args
@@ -0,0 +1 @@
+--pretty-json --json-indent 4 --combined-json bin,bin-runtime,opcodes,asm,srcmap,srcmap-runtime --asm --bin --bin-runtime --asm-json --import-asm-json -
diff --git a/test/cmdlineTests/asm_json_import_all_valid_flags/output b/test/cmdlineTests/asm_json_import_all_valid_flags/output
new file mode 100644
index 0000000000..7b8aa02979
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_all_valid_flags/output
@@ -0,0 +1,91 @@
+{
+    "contracts":
+    {
+        "<stdin>":
+        {
+            "asm":
+            {
+                ".code":
+                [
+                    {
+                        "begin": 0,
+                        "end": 0,
+                        "name": "PUSH",
+                        "source": -1,
+                        "value": "0"
+                    }
+                ],
+                ".data":
+                {
+                    "0":
+                    {
+                        ".code":
+                        [
+                            {
+                                "begin": 0,
+                                "end": 0,
+                                "name": "PUSH",
+                                "source": -1,
+                                "value": "1"
+                            }
+                        ]
+                    }
+                },
+                "sourceList":
+                [
+                    "contract.sol",
+                    "#utility.yul"
+                ]
+            },
+            "bin": "5ffe",
+            "bin-runtime": "6001",
+            "opcodes": "PUSH0 INVALID ",
+            "srcmap": "0:0::-:0",
+            "srcmap-runtime": "0:0::-:0"
+        }
+    },
+    "sourceList":
+    [
+        "contract.sol",
+        "#utility.yul"
+    ],
+    "version": "<VERSION REMOVED>"
+}
+Binary:
+5ffe
+Binary of the runtime part:
+6001
+EVM assembly:
+{
+    ".code":
+    [
+        {
+            "begin": 0,
+            "end": 0,
+            "name": "PUSH",
+            "source": -1,
+            "value": "0"
+        }
+    ],
+    ".data":
+    {
+        "0":
+        {
+            ".code":
+            [
+                {
+                    "begin": 0,
+                    "end": 0,
+                    "name": "PUSH",
+                    "source": -1,
+                    "value": "1"
+                }
+            ]
+        }
+    },
+    "sourceList":
+    [
+        "contract.sol",
+        "#utility.yul"
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_all_valid_flags/stdin b/test/cmdlineTests/asm_json_import_all_valid_flags/stdin
new file mode 100644
index 0000000000..1a707b7867
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_all_valid_flags/stdin
@@ -0,0 +1,22 @@
+{
+    ".code": [
+        {
+            "name": "PUSH",
+            "value": "0"
+        }
+    ],
+    ".data": {
+        "0": {
+            ".code": [
+                {
+                    "name": "PUSH",
+                    "value": "1"
+                }
+            ]
+        }
+    },
+    "sourceList": [
+        "contract.sol",
+        "#utility.yul"
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/args b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output
new file mode 100644
index 0000000000..3d19f83d66
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/output
@@ -0,0 +1,6 @@
+Opcodes:
+PREVRANDAO PREVRANDAO 
+EVM assembly:
+    /*   */
+  prevrandao
+  prevrandao
diff --git a/test/cmdlineTests/asm_json_import_difficulty_prevrandao/stdin b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/stdin
new file mode 100644
index 0000000000..f6cc546647
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_difficulty_prevrandao/stdin
@@ -0,0 +1,6 @@
+{
+    ".code": [
+        {"name": "DIFFICULTY"},
+        {"name": "PREVRANDAO"}
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/args b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output
new file mode 100644
index 0000000000..873465aa1f
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/output
@@ -0,0 +1,57 @@
+Opcodes:
+PUSH0 INVALID 
+EVM assembly:
+    /*   */
+  0x00
+stop
+
+sub_0: assembly {
+}
+
+sub_1: assembly {
+}
+
+sub_2: assembly {
+}
+
+sub_3: assembly {
+}
+
+sub_4: assembly {
+}
+
+sub_5: assembly {
+}
+
+sub_6: assembly {
+}
+
+sub_7: assembly {
+}
+
+sub_8: assembly {
+}
+
+sub_9: assembly {
+}
+
+sub_10: assembly {
+}
+
+sub_11: assembly {
+}
+
+sub_12: assembly {
+}
+
+sub_13: assembly {
+}
+
+sub_14: assembly {
+}
+
+sub_15: assembly {
+}
+
+sub_16: assembly {
+}
diff --git a/test/cmdlineTests/asm_json_import_hex_subassembly_indices/stdin b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/stdin
new file mode 100644
index 0000000000..70c89a2347
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_hex_subassembly_indices/stdin
@@ -0,0 +1,27 @@
+{
+    ".code": [
+        {
+            "name": "PUSH",
+            "value": "0"
+        }
+    ],
+    ".data": {
+        "0": {".code": []},
+        "1": {".code": []},
+        "2": {".code": []},
+        "3": {".code": []},
+        "4": {".code": []},
+        "5": {".code": []},
+        "6": {".code": []},
+        "7": {".code": []},
+        "8": {".code": []},
+        "9": {".code": []},
+        "a": {".code": []},
+        "b": {".code": []},
+        "c": {".code": []},
+        "d": {".code": []},
+        "e": {".code": []},
+        "f": {".code": []},
+        "10": {".code": []}
+    }
+}
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/args b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/err b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/err
new file mode 100644
index 0000000000..8e3458bd6b
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: The value for key '0' inside '.data' is not a valid hexadecimal string.
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/exit b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_hex/stdin b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/stdin
new file mode 100644
index 0000000000..6c16736943
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_data_not_hex/stdin
@@ -0,0 +1,11 @@
+{
+    ".code": [
+        {
+            "name": "PUSH",
+            "value": "0"
+        }
+    ],
+    ".data": {
+        "0": "no-hex-string"
+    }
+}
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/args b/test/cmdlineTests/asm_json_import_invalid_data_not_object/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_data_not_object/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/err b/test/cmdlineTests/asm_json_import_invalid_data_not_object/err
new file mode 100644
index 0000000000..ddcfeca7d4
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_data_not_object/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: The value of key '0' inside '.data' is neither a hex string nor an object.
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/exit b/test/cmdlineTests/asm_json_import_invalid_data_not_object/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_data_not_object/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_invalid_data_not_object/stdin b/test/cmdlineTests/asm_json_import_invalid_data_not_object/stdin
new file mode 100644
index 0000000000..29cc24aada
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_data_not_object/stdin
@@ -0,0 +1,11 @@
+{
+    ".code": [
+        {
+          "name": "PUSH",
+          "value": "0"
+        }
+    ],
+    ".data": {
+        "0": [0, 1, 2, 3]
+    }
+}
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/args b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/err b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/err
new file mode 100644
index 0000000000..e553029e60
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: Member 'jumpType' set on instruction different from JUMP or JUMPI (was set on instruction 'PUSH')
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/exit b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/stdin b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/stdin
new file mode 100644
index 0000000000..2df5445d63
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_jumptype_instruction/stdin
@@ -0,0 +1,9 @@
+{
+    ".code": [
+        {
+            "name": "PUSH",
+            "value": "0",
+            "jumpType": "[in]"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/args b/test/cmdlineTests/asm_json_import_invalid_value/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_value/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/err b/test/cmdlineTests/asm_json_import_invalid_value/err
new file mode 100644
index 0000000000..67723f82d2
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_value/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: Member 'value' defined for instruction 'DIFFICULTY', but the instruction does not need a value.
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/exit b/test/cmdlineTests/asm_json_import_invalid_value/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_value/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_invalid_value/stdin b/test/cmdlineTests/asm_json_import_invalid_value/stdin
new file mode 100644
index 0000000000..6252ff695c
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_invalid_value/stdin
@@ -0,0 +1,8 @@
+{
+    ".code": [
+        {
+            "name": "DIFFICULTY",
+            "value": "0"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/args b/test/cmdlineTests/asm_json_import_missing_subobject_indices/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_missing_subobject_indices/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/err b/test/cmdlineTests/asm_json_import_missing_subobject_indices/err
new file mode 100644
index 0000000000..1decd6dda6
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_missing_subobject_indices/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: Invalid subassembly indices in '.data'. Not all numbers between 0 and 8 are present.
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/exit b/test/cmdlineTests/asm_json_import_missing_subobject_indices/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_missing_subobject_indices/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_missing_subobject_indices/stdin b/test/cmdlineTests/asm_json_import_missing_subobject_indices/stdin
new file mode 100644
index 0000000000..6832823ebd
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_missing_subobject_indices/stdin
@@ -0,0 +1,19 @@
+{
+    ".code": [
+        {
+            "name": "PUSH",
+            "value": "0"
+        }
+    ],
+    ".data": {
+        "2": {".code": []},
+        "0": {".code": []},
+        "4": {".code": []},
+        "5": {".code": []},
+        "7": {".code": []},
+        "6": {".code": []},
+        "9": {".code": []},
+        "1": {".code": []},
+        "8": {".code": []}
+    }
+}
diff --git a/test/cmdlineTests/asm_json_import_no_value/args b/test/cmdlineTests/asm_json_import_no_value/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_no_value/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_no_value/err b/test/cmdlineTests/asm_json_import_no_value/err
new file mode 100644
index 0000000000..02428d99a8
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_no_value/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: Member 'value' is missing for instruction 'PUSH', but the instruction needs a value.
diff --git a/test/cmdlineTests/asm_json_import_no_value/exit b/test/cmdlineTests/asm_json_import_no_value/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_no_value/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_no_value/stdin b/test/cmdlineTests/asm_json_import_no_value/stdin
new file mode 100644
index 0000000000..99ab122c90
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_no_value/stdin
@@ -0,0 +1,5 @@
+{
+    ".code": [
+        {"name": "PUSH"}
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/args b/test/cmdlineTests/asm_json_import_non_unique_sources/args
new file mode 100644
index 0000000000..d27cc7bb21
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_non_unique_sources/args
@@ -0,0 +1 @@
+--asm-json --import-asm-json -
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/err b/test/cmdlineTests/asm_json_import_non_unique_sources/err
new file mode 100644
index 0000000000..78eadfc0b5
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_non_unique_sources/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: Items in 'sourceList' array are not unique.
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/exit b/test/cmdlineTests/asm_json_import_non_unique_sources/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_non_unique_sources/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_non_unique_sources/stdin b/test/cmdlineTests/asm_json_import_non_unique_sources/stdin
new file mode 100644
index 0000000000..431d5a6468
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_non_unique_sources/stdin
@@ -0,0 +1,23 @@
+{
+    ".code": [
+        {
+            "name": "PUSH",
+            "value": "0"
+        }
+    ],
+    ".data": {
+        "0": {
+          ".code": [
+              {
+                  "name": "PUSH",
+                  "value": "1"
+              }
+          ]
+        }
+    },
+    "sourceList": [
+        "contract.sol",
+        "contract.sol",
+        "#utility.yul"
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/args b/test/cmdlineTests/asm_json_import_optimize_not_supported/args
new file mode 100644
index 0000000000..f649e97408
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_optimize_not_supported/args
@@ -0,0 +1 @@
+--optimize --import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/err b/test/cmdlineTests/asm_json_import_optimize_not_supported/err
new file mode 100644
index 0000000000..8f42dca786
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_optimize_not_supported/err
@@ -0,0 +1 @@
+Error: Option --optimize is not supported with --import-asm-json.
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/exit b/test/cmdlineTests/asm_json_import_optimize_not_supported/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_optimize_not_supported/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_optimize_not_supported/stdin b/test/cmdlineTests/asm_json_import_optimize_not_supported/stdin
new file mode 100644
index 0000000000..f6cc546647
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_optimize_not_supported/stdin
@@ -0,0 +1,6 @@
+{
+    ".code": [
+        {"name": "DIFFICULTY"},
+        {"name": "PREVRANDAO"}
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/args b/test/cmdlineTests/asm_json_import_out_of_range_data_index/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_out_of_range_data_index/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/err b/test/cmdlineTests/asm_json_import_out_of_range_data_index/err
new file mode 100644
index 0000000000..08c766c3a8
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_out_of_range_data_index/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: The key '18446744073709551615' inside '.data' is out of the supported integer range.
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/exit b/test/cmdlineTests/asm_json_import_out_of_range_data_index/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_out_of_range_data_index/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_out_of_range_data_index/stdin b/test/cmdlineTests/asm_json_import_out_of_range_data_index/stdin
new file mode 100644
index 0000000000..3e8f88970e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_out_of_range_data_index/stdin
@@ -0,0 +1,13 @@
+{
+    ".code": [
+        {
+            "name": "PUSH",
+            "value": "0"
+        }
+    ],
+    ".data": {
+        "18446744073709551615": {
+            ".code": []
+        }
+    }
+}
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/args b/test/cmdlineTests/asm_json_import_random_order_data_index/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_random_order_data_index/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/output b/test/cmdlineTests/asm_json_import_random_order_data_index/output
new file mode 100644
index 0000000000..b23848e5dd
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_random_order_data_index/output
@@ -0,0 +1,35 @@
+Opcodes:
+PUSH0 INVALID 
+EVM assembly:
+    /*   */
+  0x00
+stop
+
+sub_0: assembly {
+}
+
+sub_1: assembly {
+    stop
+
+    sub_0: assembly {
+    }
+
+    sub_1: assembly {
+    }
+
+    sub_2: assembly {
+    }
+}
+
+sub_2: assembly {
+    stop
+
+    sub_0: assembly {
+    }
+
+    sub_1: assembly {
+    }
+}
+
+sub_3: assembly {
+}
diff --git a/test/cmdlineTests/asm_json_import_random_order_data_index/stdin b/test/cmdlineTests/asm_json_import_random_order_data_index/stdin
new file mode 100644
index 0000000000..c695de5cd4
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_random_order_data_index/stdin
@@ -0,0 +1,27 @@
+{
+    ".code": [
+        {
+            "name": "PUSH",
+            "value": "0"
+        }
+    ],
+    ".data": {
+        "2": {
+            ".code": [],
+            ".data": {
+                "1": {".code": []},
+                "0": {".code": []}
+            }
+        },
+        "0": {".code": []},
+        "1": {
+            ".code": [],
+            ".data": {
+                "1": {".code": []},
+                "2": {".code": []},
+                "0": {".code": []}
+            }
+        },
+        "3": {".code": []}
+    }
+}
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/args b/test/cmdlineTests/asm_json_import_unrecognized_field/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_unrecognized_field/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/err b/test/cmdlineTests/asm_json_import_unrecognized_field/err
new file mode 100644
index 0000000000..35b7fc9f6f
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_unrecognized_field/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: Unknown member '_name'. Valid members are: begin, end, jumpType, modifierDepth, name, source, value.
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/exit b/test/cmdlineTests/asm_json_import_unrecognized_field/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_unrecognized_field/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_unrecognized_field/stdin b/test/cmdlineTests/asm_json_import_unrecognized_field/stdin
new file mode 100644
index 0000000000..c1dc7cd84d
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_unrecognized_field/stdin
@@ -0,0 +1,5 @@
+{
+    ".code": [
+        {"_name": "DIFFICULTY"}
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/args b/test/cmdlineTests/asm_json_import_untagged_jumpdest/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_untagged_jumpdest/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/err b/test/cmdlineTests/asm_json_import_untagged_jumpdest/err
new file mode 100644
index 0000000000..f31c32fef8
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_untagged_jumpdest/err
@@ -0,0 +1 @@
+Error: Assembly Import Error: JUMPDEST instruction without a tag
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/exit b/test/cmdlineTests/asm_json_import_untagged_jumpdest/exit
new file mode 100644
index 0000000000..d00491fd7e
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_untagged_jumpdest/exit
@@ -0,0 +1 @@
+1
diff --git a/test/cmdlineTests/asm_json_import_untagged_jumpdest/stdin b/test/cmdlineTests/asm_json_import_untagged_jumpdest/stdin
new file mode 100644
index 0000000000..beaa19be55
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_untagged_jumpdest/stdin
@@ -0,0 +1,10 @@
+{
+    ".code": [
+        {
+            "name": "tag",
+            "value": "0x00"
+        },
+        {"name": "JUMPDEST"},
+        {"name": "JUMPDEST"}
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_verbatim/args b/test/cmdlineTests/asm_json_import_verbatim/args
new file mode 100644
index 0000000000..2b4b3a1534
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_verbatim/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes --asm
diff --git a/test/cmdlineTests/asm_json_import_verbatim/output b/test/cmdlineTests/asm_json_import_verbatim/output
new file mode 100644
index 0000000000..50b8a4ce94
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_verbatim/output
@@ -0,0 +1,58 @@
+Opcodes:
+PUSH0 CALLDATALOAD PUSH1 0x14 DUP1 DUP3 SSTORE PUSH1 0x20 CALLDATALOAD ISZERO PUSH1 0x1C JUMPI DUP1 DUP3 SSTORE PUSH0 DUP1 PUSH0 DUP1 PUSH0 DUP1 STATICCALL POP PUSH25 0x797A5B80825550500000000000000000000000000000000000 
+EVM assembly:
+    /* "<stdin>":28:29    */
+  0x00
+    /* "<stdin>":15:30  [... */
+  calldataload
+    /* "<stdin>":44:46  n" */
+  0x14
+    /* "<stdin>":61:62    */
+  dup1
+    /* "<stdin>":58:59    */
+  dup3
+    /* "<stdin>":51:63  ... */
+  sstore
+    /* "<stdin>":84:86     */
+  0x20
+    /* "<stdin>":71:87  29,... */
+  calldataload
+    /* "<stdin>":68:188  ": 29,... */
+  iszero
+  tag_1
+  jumpi
+    /* "<stdin>":108:109    */
+  dup1
+    /* "<stdin>":105:106    */
+  dup3
+    /* "<stdin>":98:110  SH",... */
+  sstore
+    /* "<stdin>":149:150  " */
+  0x00
+    /* "<stdin>":146:147  " */
+  dup1
+    /* "<stdin>":143:144  l */
+  0x00
+    /* "<stdin>":140:141  " */
+  dup1
+    /* "<stdin>":137:138    */
+  0x00
+    /* "<stdin>":134:135    */
+  dup1
+    /* "<stdin>":123:151  : 0,... */
+  staticcall
+    /* "<stdin>":119:152  rce": 0,... */
+  pop
+    /* "<stdin>":161:182  },... */
+  verbatimbytecode_78797a
+    /* "<stdin>":68:188  ": 29,... */
+tag_1:
+    /* "<stdin>":203:204    */
+  dup1
+    /* "<stdin>":200:201    */
+  dup3
+    /* "<stdin>":193:205  : 15,... */
+  sstore
+    /* "<stdin>":0:207  {... */
+  pop
+  pop
diff --git a/test/cmdlineTests/asm_json_import_verbatim/stdin b/test/cmdlineTests/asm_json_import_verbatim/stdin
new file mode 100644
index 0000000000..df4b0ce082
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_verbatim/stdin
@@ -0,0 +1,196 @@
+{
+    ".code": [
+        {
+            "begin": 28,
+            "end": 29,
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
+        },
+        {
+            "begin": 15,
+            "end": 30,
+            "name": "CALLDATALOAD",
+            "source": 0
+        },
+        {
+            "begin": 44,
+            "end": 46,
+            "name": "PUSH",
+            "source": 0,
+            "value": "14"
+        },
+        {
+            "begin": 61,
+            "end": 62,
+            "name": "DUP1",
+            "source": 0
+        },
+        {
+            "begin": 58,
+            "end": 59,
+            "name": "DUP3",
+            "source": 0
+        },
+        {
+            "begin": 51,
+            "end": 63,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 84,
+            "end": 86,
+            "name": "PUSH",
+            "source": 0,
+            "value": "20"
+        },
+        {
+            "begin": 71,
+            "end": 87,
+            "name": "CALLDATALOAD",
+            "source": 0
+        },
+        {
+            "begin": 68,
+            "end": 188,
+            "name": "ISZERO",
+            "source": 0
+        },
+        {
+            "begin": 68,
+            "end": 188,
+            "name": "PUSH [tag]",
+            "source": 0,
+            "value": "1"
+        },
+        {
+            "begin": 68,
+            "end": 188,
+            "name": "JUMPI",
+            "source": 0
+        },
+        {
+            "begin": 108,
+            "end": 109,
+            "name": "DUP1",
+            "source": 0
+        },
+        {
+            "begin": 105,
+            "end": 106,
+            "name": "DUP3",
+            "source": 0
+        },
+        {
+            "begin": 98,
+            "end": 110,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 149,
+            "end": 150,
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
+        },
+        {
+            "begin": 146,
+            "end": 147,
+            "name": "DUP1",
+            "source": 0
+        },
+        {
+            "begin": 143,
+            "end": 144,
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
+        },
+        {
+            "begin": 140,
+            "end": 141,
+            "name": "DUP1",
+            "source": 0
+        },
+        {
+            "begin": 137,
+            "end": 138,
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
+        },
+        {
+            "begin": 134,
+            "end": 135,
+            "name": "DUP1",
+            "source": 0
+        },
+        {
+            "begin": 123,
+            "end": 151,
+            "name": "STATICCALL",
+            "source": 0
+        },
+        {
+            "begin": 119,
+            "end": 152,
+            "name": "POP",
+            "source": 0
+        },
+        {
+            "begin": 161,
+            "end": 182,
+            "name": "VERBATIM",
+            "source": 0,
+            "value": "78797a"
+        },
+        {
+            "begin": 68,
+            "end": 188,
+            "name": "tag",
+            "source": 0,
+            "value": "1"
+        },
+        {
+            "begin": 68,
+            "end": 188,
+            "name": "JUMPDEST",
+            "source": 0
+        },
+        {
+            "begin": 203,
+            "end": 204,
+            "name": "DUP1",
+            "source": 0
+        },
+        {
+            "begin": 200,
+            "end": 201,
+            "name": "DUP3",
+            "source": 0
+        },
+        {
+            "begin": 193,
+            "end": 205,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 207,
+            "name": "POP",
+            "source": 0
+        },
+        {
+            "begin": 0,
+            "end": 207,
+            "name": "POP",
+            "source": 0
+        }
+    ],
+    "sourceList": [
+        "<stdin>"
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_yul_more_subobjects/args b/test/cmdlineTests/asm_json_import_yul_more_subobjects/args
new file mode 100644
index 0000000000..58dfc8cc73
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_yul_more_subobjects/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes
diff --git a/test/cmdlineTests/asm_json_import_yul_more_subobjects/output b/test/cmdlineTests/asm_json_import_yul_more_subobjects/output
new file mode 100644
index 0000000000..81aa5b9387
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_yul_more_subobjects/output
@@ -0,0 +1,2 @@
+Opcodes:
+PUSH1 0x1E PUSH0 SSTORE PUSH1 0x1A PUSH1 0x1 SSTORE PUSH1 0x15 PUSH1 0x2 SSTORE PUSH1 0x1 PUSH1 0x3 SSTORE PUSH1 0x1 PUSH1 0x4 SSTORE PUSH1 0x1 PUSH1 0x5 SSTORE INVALID 
diff --git a/test/cmdlineTests/asm_json_import_yul_more_subobjects/stdin b/test/cmdlineTests/asm_json_import_yul_more_subobjects/stdin
new file mode 100644
index 0000000000..1820bcf522
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_yul_more_subobjects/stdin
@@ -0,0 +1,348 @@
+{
+    ".code": [
+        {
+            "begin": 37,
+            "end": 51,
+            "name": "PUSHSIZE",
+            "source": 0
+        },
+        {
+            "begin": 34,
+            "end": 35,
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
+        },
+        {
+            "begin": 27,
+            "end": 52,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 67,
+            "end": 81,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+        },
+        {
+            "begin": 64,
+            "end": 65,
+            "name": "PUSH",
+            "source": 0,
+            "value": "1"
+        },
+        {
+            "begin": 57,
+            "end": 82,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 97,
+            "end": 114,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+        },
+        {
+            "begin": 94,
+            "end": 95,
+            "name": "PUSH",
+            "source": 0,
+            "value": "2"
+        },
+        {
+            "begin": 87,
+            "end": 115,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 130,
+            "end": 152,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffe"
+        },
+        {
+            "begin": 127,
+            "end": 128,
+            "name": "PUSH",
+            "source": 0,
+            "value": "3"
+        },
+        {
+            "begin": 120,
+            "end": 153,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 168,
+            "end": 190,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffd"
+        },
+        {
+            "begin": 165,
+            "end": 166,
+            "name": "PUSH",
+            "source": 0,
+            "value": "4"
+        },
+        {
+            "begin": 158,
+            "end": 191,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 206,
+            "end": 228,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffc"
+        },
+        {
+            "begin": 203,
+            "end": 204,
+            "name": "PUSH",
+            "source": 0,
+            "value": "5"
+        },
+        {
+            "begin": 196,
+            "end": 229,
+            "name": "SSTORE",
+            "source": 0
+        }
+    ],
+    ".data": {
+        "0": {
+            ".code": [
+                {
+                    "begin": 278,
+                    "end": 292,
+                    "name": "PUSHSIZE",
+                    "source": 0
+                },
+                {
+                    "begin": 275,
+                    "end": 276,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "6"
+                },
+                {
+                    "begin": 268,
+                    "end": 293,
+                    "name": "SSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 310,
+                    "end": 324,
+                    "name": "PUSH #[$]",
+                    "source": 0,
+                    "value": "0000000000000000000000000000000000000000000000000000000000000000"
+                },
+                {
+                    "begin": 307,
+                    "end": 308,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "7"
+                },
+                {
+                    "begin": 300,
+                    "end": 325,
+                    "name": "SSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 342,
+                    "end": 361,
+                    "name": "PUSH #[$]",
+                    "source": 0,
+                    "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+                },
+                {
+                    "begin": 339,
+                    "end": 340,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "8"
+                },
+                {
+                    "begin": 332,
+                    "end": 362,
+                    "name": "SSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 379,
+                    "end": 398,
+                    "name": "PUSH #[$]",
+                    "source": 0,
+                    "value": "000000000000000000000000000000000000000000000000fffffffffffffffe"
+                },
+                {
+                    "begin": 376,
+                    "end": 377,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "9"
+                },
+                {
+                    "begin": 369,
+                    "end": 399,
+                    "name": "SSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 417,
+                    "end": 436,
+                    "name": "PUSH #[$]",
+                    "source": 0,
+                    "value": "000000000000000000000000000000000000000000000000fffffffffffffffd"
+                },
+                {
+                    "begin": 413,
+                    "end": 415,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "A"
+                },
+                {
+                    "begin": 406,
+                    "end": 437,
+                    "name": "SSTORE",
+                    "source": 0
+                }
+            ],
+            ".data": {
+                "0": {
+                    ".code": [
+                        {
+                            "begin": 494,
+                            "end": 508,
+                            "name": "PUSHSIZE",
+                            "source": 0
+                        },
+                        {
+                            "begin": 490,
+                            "end": 492,
+                            "name": "PUSH",
+                            "source": 0,
+                            "value": "B"
+                        },
+                        {
+                            "begin": 483,
+                            "end": 509,
+                            "name": "SSTORE",
+                            "source": 0
+                        },
+                        {
+                            "begin": 529,
+                            "end": 545,
+                            "name": "PUSH #[$]",
+                            "source": 0,
+                            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+                        },
+                        {
+                            "begin": 525,
+                            "end": 527,
+                            "name": "PUSH",
+                            "source": 0,
+                            "value": "C"
+                        },
+                        {
+                            "begin": 518,
+                            "end": 546,
+                            "name": "SSTORE",
+                            "source": 0
+                        },
+                        {
+                            "begin": 566,
+                            "end": 582,
+                            "name": "PUSH #[$]",
+                            "source": 0,
+                            "value": "0000000000000000000000000000000000000000000000000000000000000001"
+                        },
+                        {
+                            "begin": 562,
+                            "end": 564,
+                            "name": "PUSH",
+                            "source": 0,
+                            "value": "D"
+                        },
+                        {
+                            "begin": 555,
+                            "end": 583,
+                            "name": "SSTORE",
+                            "source": 0
+                        },
+                        {
+                            "begin": 603,
+                            "end": 619,
+                            "name": "PUSH #[$]",
+                            "source": 0,
+                            "value": "0000000000000000000000000000000000000000000000000000000000000002"
+                        },
+                        {
+                            "begin": 599,
+                            "end": 601,
+                            "name": "PUSH",
+                            "source": 0,
+                            "value": "E"
+                        },
+                        {
+                            "begin": 592,
+                            "end": 620,
+                            "name": "SSTORE",
+                            "source": 0
+                        }
+                    ],
+                    ".data": {
+                        "0": {
+                            ".code": [
+                                {
+                                    "begin": 676,
+                                    "end": 685,
+                                    "name": "INVALID",
+                                    "source": 0
+                                }
+                            ]
+                        },
+                        "1": {
+                            ".code": [
+                                {
+                                    "begin": 751,
+                                    "end": 760,
+                                    "name": "INVALID",
+                                    "source": 0
+                                }
+                            ]
+                        },
+                        "2": {
+                            ".code": [
+                                {
+                                    "begin": 826,
+                                    "end": 835,
+                                    "name": "INVALID",
+                                    "source": 0
+                                }
+                            ]
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "sourceList": [
+        "<stdin>"
+    ]
+}
diff --git a/test/cmdlineTests/asm_json_import_yul_subobjects/args b/test/cmdlineTests/asm_json_import_yul_subobjects/args
new file mode 100644
index 0000000000..58dfc8cc73
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_yul_subobjects/args
@@ -0,0 +1 @@
+--import-asm-json - --opcodes
diff --git a/test/cmdlineTests/asm_json_import_yul_subobjects/output b/test/cmdlineTests/asm_json_import_yul_subobjects/output
new file mode 100644
index 0000000000..6aa2d0f64d
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_yul_subobjects/output
@@ -0,0 +1,2 @@
+Opcodes:
+PUSH0 DUP1 SSTORE PUSH1 0x6A PUSH1 0x1 SSTORE PUSH1 0x31 PUSH1 0x2 SSTORE PUSH1 0x2C PUSH1 0x3 SSTORE PUSH1 0x5E PUSH1 0x4 SSTORE PUSH1 0xC PUSH1 0x5 SSTORE PUSH1 0x5D PUSH1 0x6 SSTORE PUSH1 0x1 PUSH1 0x7 SSTORE PUSH1 0x5D PUSH1 0x8 SSTORE PUSH1 0x1 PUSH1 0x9 SSTORE INVALID PUSH1 0x1F PUSH1 0xA SSTORE PUSH1 0xC PUSH1 0xB SSTORE PUSH1 0x2B PUSH1 0xC SSTORE PUSH1 0x1 PUSH1 0xD SSTORE PUSH1 0x2B PUSH1 0xE SSTORE PUSH1 0x1 PUSH1 0xF SSTORE INVALID PUSH1 0xB PUSH1 0x10 SSTORE PUSH1 0x1 PUSH1 0x11 SSTORE INVALID INVALID INVALID INVALID PUSH1 0xB PUSH1 0x10 SSTORE PUSH1 0x1 PUSH1 0x11 SSTORE INVALID INVALID 
diff --git a/test/cmdlineTests/asm_json_import_yul_subobjects/stdin b/test/cmdlineTests/asm_json_import_yul_subobjects/stdin
new file mode 100644
index 0000000000..0c8cdcf41f
--- /dev/null
+++ b/test/cmdlineTests/asm_json_import_yul_subobjects/stdin
@@ -0,0 +1,400 @@
+{
+    ".code": [
+        {
+            "begin": 36,
+            "end": 51,
+            "name": "PUSH",
+            "source": 0,
+            "value": "0"
+        },
+        {
+            "begin": 33,
+            "end": 34,
+            "name": "DUP1",
+            "source": 0
+        },
+        {
+            "begin": 26,
+            "end": 52,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 67,
+            "end": 80,
+            "name": "PUSHSIZE",
+            "source": 0
+        },
+        {
+            "begin": 64,
+            "end": 65,
+            "name": "PUSH",
+            "source": 0,
+            "value": "1"
+        },
+        {
+            "begin": 57,
+            "end": 81,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 96,
+            "end": 111,
+            "name": "PUSH [$]",
+            "source": 0,
+            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+        },
+        {
+            "begin": 93,
+            "end": 94,
+            "name": "PUSH",
+            "source": 0,
+            "value": "2"
+        },
+        {
+            "begin": 86,
+            "end": 112,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 127,
+            "end": 140,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+        },
+        {
+            "begin": 124,
+            "end": 125,
+            "name": "PUSH",
+            "source": 0,
+            "value": "3"
+        },
+        {
+            "begin": 117,
+            "end": 141,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 156,
+            "end": 173,
+            "name": "PUSH [$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+        },
+        {
+            "begin": 153,
+            "end": 154,
+            "name": "PUSH",
+            "source": 0,
+            "value": "4"
+        },
+        {
+            "begin": 146,
+            "end": 174,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 189,
+            "end": 204,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+        },
+        {
+            "begin": 186,
+            "end": 187,
+            "name": "PUSH",
+            "source": 0,
+            "value": "5"
+        },
+        {
+            "begin": 179,
+            "end": 205,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 220,
+            "end": 237,
+            "name": "PUSH [$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffe"
+        },
+        {
+            "begin": 217,
+            "end": 218,
+            "name": "PUSH",
+            "source": 0,
+            "value": "6"
+        },
+        {
+            "begin": 210,
+            "end": 238,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 253,
+            "end": 268,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffe"
+        },
+        {
+            "begin": 250,
+            "end": 251,
+            "name": "PUSH",
+            "source": 0,
+            "value": "7"
+        },
+        {
+            "begin": 243,
+            "end": 269,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 284,
+            "end": 303,
+            "name": "PUSH [$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffd"
+        },
+        {
+            "begin": 281,
+            "end": 282,
+            "name": "PUSH",
+            "source": 0,
+            "value": "8"
+        },
+        {
+            "begin": 274,
+            "end": 304,
+            "name": "SSTORE",
+            "source": 0
+        },
+        {
+            "begin": 319,
+            "end": 336,
+            "name": "PUSH #[$]",
+            "source": 0,
+            "value": "000000000000000000000000000000000000000000000000fffffffffffffffd"
+        },
+        {
+            "begin": 316,
+            "end": 317,
+            "name": "PUSH",
+            "source": 0,
+            "value": "9"
+        },
+        {
+            "begin": 309,
+            "end": 337,
+            "name": "SSTORE",
+            "source": 0
+        }
+    ],
+    ".data": {
+        "0": {
+            ".code": [
+                {
+                    "begin": 418,
+                    "end": 433,
+                    "name": "PUSH [$]",
+                    "source": 0,
+                    "value": "0000000000000000000000000000000000000000000000000000000000000000"
+                },
+                {
+                    "begin": 414,
+                    "end": 416,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "A"
+                },
+                {
+                    "begin": 407,
+                    "end": 434,
+                    "name": "SSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 452,
+                    "end": 465,
+                    "name": "PUSH #[$]",
+                    "source": 0,
+                    "value": "0000000000000000000000000000000000000000000000000000000000000000"
+                },
+                {
+                    "begin": 448,
+                    "end": 450,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "B"
+                },
+                {
+                    "begin": 441,
+                    "end": 466,
+                    "name": "SSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 484,
+                    "end": 499,
+                    "name": "PUSH [$]",
+                    "source": 0,
+                    "value": "0000000000000000000000000000000000000000000000000000000000000001"
+                },
+                {
+                    "begin": 480,
+                    "end": 482,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "C"
+                },
+                {
+                    "begin": 473,
+                    "end": 500,
+                    "name": "SSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 518,
+                    "end": 531,
+                    "name": "PUSH #[$]",
+                    "source": 0,
+                    "value": "0000000000000000000000000000000000000000000000000000000000000001"
+                },
+                {
+                    "begin": 514,
+                    "end": 516,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "D"
+                },
+                {
+                    "begin": 507,
+                    "end": 532,
+                    "name": "SSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 550,
+                    "end": 567,
+                    "name": "PUSH [$]",
+                    "source": 0,
+                    "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+                },
+                {
+                    "begin": 546,
+                    "end": 548,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "E"
+                },
+                {
+                    "begin": 539,
+                    "end": 568,
+                    "name": "SSTORE",
+                    "source": 0
+                },
+                {
+                    "begin": 586,
+                    "end": 601,
+                    "name": "PUSH #[$]",
+                    "source": 0,
+                    "value": "000000000000000000000000000000000000000000000000ffffffffffffffff"
+                },
+                {
+                    "begin": 582,
+                    "end": 584,
+                    "name": "PUSH",
+                    "source": 0,
+                    "value": "F"
+                },
+                {
+                    "begin": 575,
+                    "end": 602,
+                    "name": "SSTORE",
+                    "source": 0
+                }
+            ],
+            ".data": {
+                "0": {
+                    ".code": [
+                        {
+                            "begin": 658,
+                            "end": 673,
+                            "name": "PUSH [$]",
+                            "source": 0,
+                            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+                        },
+                        {
+                            "begin": 654,
+                            "end": 656,
+                            "name": "PUSH",
+                            "source": 0,
+                            "value": "10"
+                        },
+                        {
+                            "begin": 647,
+                            "end": 674,
+                            "name": "SSTORE",
+                            "source": 0
+                        },
+                        {
+                            "begin": 694,
+                            "end": 707,
+                            "name": "PUSH #[$]",
+                            "source": 0,
+                            "value": "0000000000000000000000000000000000000000000000000000000000000000"
+                        },
+                        {
+                            "begin": 690,
+                            "end": 692,
+                            "name": "PUSH",
+                            "source": 0,
+                            "value": "11"
+                        },
+                        {
+                            "begin": 683,
+                            "end": 708,
+                            "name": "SSTORE",
+                            "source": 0
+                        }
+                    ],
+                    ".data": {
+                        "0": {
+                            ".code": [
+                                {
+                                    "begin": 761,
+                                    "end": 770,
+                                    "name": "INVALID",
+                                    "source": 0
+                                }
+                            ]
+                        }
+                    }
+                },
+                "1": {
+                    ".code": [
+                        {
+                            "begin": 833,
+                            "end": 842,
+                            "name": "INVALID",
+                            "source": 0
+                        }
+                    ]
+                }
+            }
+        },
+        "ACAF3289D7B601CBD114FB36C4D29C85BBFD5E133F14CB355C3FD8D99367964F": "48656c6c6f2c20576f726c6421"
+    },
+    "sourceList": [
+        "<stdin>"
+    ]
+}
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index 6a976df42a..df57572a53 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -149,7 +149,7 @@ BOOST_AUTO_TEST_CASE(version)
 
 BOOST_AUTO_TEST_CASE(multiple_input_modes)
 {
-	array<string, 9> inputModeOptions = {
+	array<string, 10> inputModeOptions = {
 		"--help",
 		"--license",
 		"--version",
@@ -159,10 +159,11 @@ BOOST_AUTO_TEST_CASE(multiple_input_modes)
 		"--strict-assembly",
 		"--yul",
 		"--import-ast",
+		"--import-asm-json",
 	};
 	string expectedMessage =
 		"The following options are mutually exclusive: "
-		"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast, --lsp. "
+		"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast, --lsp, --import-asm-json. "
 		"Select at most one.";
 
 	for (string const& mode1: inputModeOptions)

From 91c7b32d60813a7a9456e858a40be256cd3ec21a Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Tue, 1 Nov 2022 23:58:45 -0500
Subject: [PATCH 1654/1748] CLI test for mass EVM assembly import/export
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
Co-authored-by: r0qs <rodrigo.saramago@ethereum.org>
---
 .circleci/config.yml                          |   8 +-
 .circleci/parallel_cli_tests.py               |   1 +
 scripts/ASTImportTest.sh                      | 127 ++++-
 .../~evmasm_import_export/test.sh             |  14 +
 .../module_from_ternary_expression.sol        |   4 +-
 .../various/many_subassemblies.sol            |  35 ++
 test/libyul/objectCompiler/manySubObjects.yul | 475 ++++++++++++++++++
 7 files changed, 654 insertions(+), 10 deletions(-)
 create mode 100755 test/cmdlineTests/~evmasm_import_export/test.sh
 create mode 100644 test/libsolidity/semanticTests/various/many_subassemblies.sol
 create mode 100644 test/libyul/objectCompiler/manySubObjects.yul

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9165e7ad8c..7ec500e2e8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1123,7 +1123,7 @@ jobs:
 
   t_osx_cli:
     <<: *base_osx
-    parallelism: 7 # Should match number of tests in .circleci/cli.sh
+    parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
     steps:
       - checkout
       - install_dependencies_osx
@@ -1218,7 +1218,7 @@ jobs:
 
   t_ubu_cli: &t_ubu_cli
     <<: *base_ubuntu2204_small
-    parallelism: 7 # Should match number of tests in .circleci/cli.sh
+    parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
     steps:
       - cmdline_tests
 
@@ -1237,7 +1237,7 @@ jobs:
   t_ubu_asan_cli:
     # Runs slightly faster on medium but we only run it nightly so efficiency matters more.
     <<: *base_ubuntu2204
-    parallelism: 7 # Should match number of tests in .circleci/cli.sh
+    parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
     environment:
       <<: *base_ubuntu2204_env
       ASAN_OPTIONS: check_initialization_order=true:detect_stack_use_after_return=true:strict_init_order=true:strict_string_checks=true:detect_invalid_pointer_pairs=2
@@ -1286,7 +1286,7 @@ jobs:
 
   t_ubu_ubsan_clang_cli:
     <<: *base_ubuntu2204_clang
-    parallelism: 7 # Should match number of tests in .circleci/cli.sh
+    parallelism: 8 # Should match number of tests in .circleci/parallel_cli_tests.py
     steps:
       - cmdline_tests
 
diff --git a/.circleci/parallel_cli_tests.py b/.circleci/parallel_cli_tests.py
index ef78921806..45cc83aec3 100755
--- a/.circleci/parallel_cli_tests.py
+++ b/.circleci/parallel_cli_tests.py
@@ -8,6 +8,7 @@
 # TODO: We should switch to time-based splitting but that requires JUnit XML report support in cmdlineTests.sh.
 tests_to_run_in_parallel = [
     '~ast_import_export',                   # ~7 min
+    '~evmasm_import_export',                # ~5 min
     '~ast_export_with_stop_after_parsing',  # ~4 min
     '~soljson_via_fuzzer',                  # ~3 min
     '~via_ir_equivalence',                  # ~1 min
diff --git a/scripts/ASTImportTest.sh b/scripts/ASTImportTest.sh
index 251001ce37..5c3f04d8e0 100755
--- a/scripts/ASTImportTest.sh
+++ b/scripts/ASTImportTest.sh
@@ -23,6 +23,13 @@
 # ast import/export tests:
 #   - first exporting a .sol file to JSON, then loading it into the compiler
 #     and exporting it again. The second JSON should be identical to the first.
+#
+# evm-assembly import/export tests:
+#   - first a .sol file will be compiled and the EVM Assembly will be exported
+#     to JSON format using --asm-json command-line option.
+#     The EVM Assembly JSON output is then imported with --import-asm-json
+#     and compiled again. The binary generated initially and after the import
+#     should be identical.
 
 set -euo pipefail
 
@@ -30,6 +37,11 @@ READLINK=readlink
 if [[ "$OSTYPE" == "darwin"* ]]; then
     READLINK=greadlink
 fi
+EXPR="expr"
+if [[ "$OSTYPE" == "darwin"* ]]; then
+    EXPR="gexpr"
+fi
+
 REPO_ROOT=$(${READLINK} -f "$(dirname "$0")"/..)
 SOLIDITY_BUILD_DIR=${SOLIDITY_BUILD_DIR:-${REPO_ROOT}/build}
 SOLC="${SOLIDITY_BUILD_DIR}/solc/solc"
@@ -37,10 +49,12 @@ SPLITSOURCES="${REPO_ROOT}/scripts/splitSources.py"
 
 # shellcheck source=scripts/common.sh
 source "${REPO_ROOT}/scripts/common.sh"
+# shellcheck source=scripts/common_cmdline.sh
+source "${REPO_ROOT}/scripts/common_cmdline.sh"
 
 function print_usage
 {
-    echo "Usage: ${0} ast [--exit-on-error|--help]."
+    echo "Usage: ${0} ast|evm-assembly [--exit-on-error|--help]."
 }
 
 function print_used_commands
@@ -48,8 +62,9 @@ function print_used_commands
     local test_directory="$1"
     local export_command="$2"
     local import_command="$3"
-    printError "You can find the files used for this test here: ${test_directory}"
-    printError "Used commands for test:"
+    echo
+    printError "You can find the files used for this test in ${test_directory}"
+    printError "Commands used in the test:"
     printError "# export"
     echo "$ ${export_command}" >&2
     printError "# import"
@@ -81,6 +96,7 @@ for PARAM in "$@"
 do
     case "$PARAM" in
         ast) check_import_test_type_unset ; IMPORT_TEST_TYPE="ast" ;;
+        evm-assembly) check_import_test_type_unset ; IMPORT_TEST_TYPE="evm-assembly" ;;
         --help) print_usage ; exit 0 ;;
         --exit-on-error) EXIT_ON_ERROR=1 ;;
         *) fail "Unknown option '$PARAM'. Aborting. $(print_usage)" ;;
@@ -89,6 +105,7 @@ done
 
 SYNTAXTESTS_DIR="${REPO_ROOT}/test/libsolidity/syntaxTests"
 ASTJSONTESTS_DIR="${REPO_ROOT}/test/libsolidity/ASTJSON"
+SEMANTICTESTS_DIR="${REPO_ROOT}/test/libsolidity/semanticTests"
 
 FAILED=0
 UNCOMPILABLE=0
@@ -153,6 +170,92 @@ function test_ast_import_export_equivalence
     TESTED=$((TESTED + 1))
 }
 
+function run_solc
+{
+    local parameters=( "${@}" )
+
+    if ! "${SOLC}" "${parameters[@]}" > /dev/null 2> solc_stderr
+    then
+        printError "ERROR: ${parameters[*]}"
+        printError "${PWD}"
+        # FIXME: EXIT_ON_ERROR seems to be ignored here and in some other places.
+        # We just exit unconditionally instead.
+        fail "$(cat solc_stderr)"
+    fi
+    rm solc_stderr
+}
+
+function run_solc_store_stdout
+{
+    local output_file=$1
+    local parameters=( "${@:2}" )
+
+    if ! "${SOLC}" "${parameters[@]}" > "${output_file}" 2> "${output_file}.error"
+    then
+        printError "ERROR: ${parameters[*]}"
+        printError "${PWD}"
+        fail "$(cat "${output_file}.error")"
+    fi
+    rm "${output_file}.error"
+}
+
+function test_evmjson_import_export_equivalence
+{
+    local sol_file="$1"
+    local input_files=( "${@:2}" )
+
+    # Generate bytecode and EVM assembly JSON through normal complication
+    mkdir -p export/
+    local export_options=(--bin --asm-json "${input_files[@]}" --output-dir export/)
+    run_solc "${export_options[@]}"
+
+    # NOTE: If there is no bytecode, the compiler produces a JSON file that contains just 'null'.
+    # This is not accepted by assembly import though so we must skip such contracts.
+    echo -n null > null
+    find export/ -name '*.json' -exec cmp --quiet --bytes=4 {} null \; -delete
+
+    find export/ -name '*.bin' -size 0 -delete
+
+    for asm_json_file in export/*.json
+    do
+        mv "${asm_json_file}" "${asm_json_file/_evm/}"
+    done
+
+    # Import EVM assembly JSON
+    mkdir -p import/
+    for asm_json_file in export/*.json
+    do
+        local bin_file_from_asm_import
+        bin_file_from_asm_import="import/$(basename "${asm_json_file}" .json).bin"
+
+        local import_options=(--bin --import-asm-json "${asm_json_file}")
+        run_solc_store_stdout "${bin_file_from_asm_import}" "${import_options[@]}"
+
+        stripCLIDecorations < "$bin_file_from_asm_import" > tmpfile
+        mv tmpfile "$bin_file_from_asm_import"
+    done
+
+    # Compare bytecode from compilation with bytecode from import
+    for bin_file in export/*.bin
+    do
+        local bin_file_from_asm_import=${bin_file/export/import}
+        if ! diff --strip-trailing-cr --ignore-all-space "${bin_file}" "${bin_file_from_asm_import}" > diff_error
+        then
+            printError "ERROR: Bytecode from compilation (${bin_file}) differs from bytecode from EVM asm import (${bin_file_from_asm_import}):"
+            printError "    $(cat diff_error)"
+            if (( EXIT_ON_ERROR == 1 ))
+            then
+                # NOTE: The import_options we print here refers to the wrong file (the last one
+                # processed by the previous loop) - but it's still a good starting point for debugging ;)
+                print_used_commands "${PWD}" "${SOLC} ${export_options[*]}" "${SOLC} ${import_options[*]}"
+                return 1
+            fi
+            FAILED=$((FAILED + 1))
+        fi
+    done
+    TESTED=$((TESTED + 1))
+}
+
 # function tests whether exporting and importing again is equivalent.
 # Results are recorded by incrementing the FAILED or UNCOMPILABLE global variable.
 # Also, in case of a mismatch a diff is printed
@@ -168,6 +271,7 @@ function test_import_export_equivalence {
 
     case "$IMPORT_TEST_TYPE" in
         ast) compile_test="--ast-compact-json" ;;
+        evm-assembly) compile_test="--bin" ;;
         *) assertFail "Unknown import test type '${IMPORT_TEST_TYPE}'. Aborting." ;;
     esac
 
@@ -181,6 +285,7 @@ function test_import_export_equivalence {
     then
         case "$IMPORT_TEST_TYPE" in
             ast) test_ast_import_export_equivalence "${sol_file}" "${input_files[@]}" ;;
+            evm-assembly) test_evmjson_import_export_equivalence "${sol_file}" "${input_files[@]}" ;;
             *) assertFail "Unknown import test type '${IMPORT_TEST_TYPE}'. Aborting." ;;
         esac
     else
@@ -191,16 +296,30 @@ function test_import_export_equivalence {
         # and print some details about the corresponding solc invocation.
         if (( solc_return_code == 2 ))
         then
-            fail "\n\nERROR: Uncaught Exception while executing '$SOLC ${compile_test} ${input_files[*]}':\n${output}\n"
+            # For the evm-assembly import/export tests, this script uses only the old code generator.
+            # Some semantic tests can only be compiled with --via-ir (some need to be additionally
+            # compiled with --optimize). The tests that are meant to be compiled with --via-ir are
+            # throwing an UnimplementedFeatureError exception, e.g.:
+            # "Copying of type struct C.S memory[] memory to storage not yet supported",
+            # "Copying nested calldata dynamic arrays to storage is not implemented in the old code generator".
+            # We will just ignore these kind of exceptions for now. However, any other exception
+            # will be treated as a fatal error and the script execution will be terminated with an error.
+            if [[ "${output}" != *"UnimplementedFeatureError"* ]]
+            then
+                fail "\n\nERROR: Uncaught exception while executing '${SOLC} ${compile_test} ${input_files[*]}':\n${output}\n"
+            fi
         fi
     fi
 }
 
 command_available "$SOLC" --version
 command_available jq --version
+command_available "$EXPR" --version
+command_available "$READLINK" --version
 
 case "$IMPORT_TEST_TYPE" in
     ast) TEST_DIRS=("${SYNTAXTESTS_DIR}" "${ASTJSONTESTS_DIR}") ;;
+    evm-assembly) TEST_DIRS=("${SEMANTICTESTS_DIR}") ;;
     *) assertFail "Import test type not defined. $(print_usage)" ;;
 esac
 
diff --git a/test/cmdlineTests/~evmasm_import_export/test.sh b/test/cmdlineTests/~evmasm_import_export/test.sh
new file mode 100755
index 0000000000..f1ef07af8d
--- /dev/null
+++ b/test/cmdlineTests/~evmasm_import_export/test.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+
+SOLTMPDIR=$(mktemp -d -t "cmdline-test-evmasm-import-export-XXXXXX")
+cd "$SOLTMPDIR"
+if ! "$REPO_ROOT/scripts/ASTImportTest.sh" evm-assembly
+then
+    rm -r "$SOLTMPDIR"
+    fail
+fi
+rm -r "$SOLTMPDIR"
diff --git a/test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol b/test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol
index 7aa8a5caa8..937d06c187 100644
--- a/test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol
+++ b/test/libsolidity/semanticTests/expressions/module_from_ternary_expression.sol
@@ -1,5 +1,5 @@
 ==== Source: A ====
-contract C {
+contract D {
 }
 ==== Source: B ====
 import "A" as M;
@@ -7,7 +7,7 @@ import "A" as M;
 contract C {
     function f() public pure returns (bool) {
         bool flag;
-        ((flag = true) ? M : M).C;
+        ((flag = true) ? M : M).D;
         return flag;
     }
 }
diff --git a/test/libsolidity/semanticTests/various/many_subassemblies.sol b/test/libsolidity/semanticTests/various/many_subassemblies.sol
new file mode 100644
index 0000000000..26c3a1bbff
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/many_subassemblies.sol
@@ -0,0 +1,35 @@
+contract C0 {}
+contract C1 {}
+contract C2 {}
+contract C3 {}
+contract C4 {}
+contract C5 {}
+contract C6 {}
+contract C7 {}
+contract C8 {}
+contract C9 {}
+contract C10 {}
+
+contract D {
+    function run() public {
+        // This is primarily meant to test assembly import via --import-asm-json.
+        // The exported JSON will fail the reimport unless the subassembly indices are parsed
+        // correctly - as hex numbers.
+        new C0();
+        new C1();
+        new C2();
+        new C3();
+        new C4();
+        new C5();
+        new C6();
+        new C7();
+        new C8();
+        new C9();
+        new C10();
+    }
+}
+// ----
+// run() ->
+// gas irOptimized: 381615
+// gas legacy: 392719
+// gas legacyOptimized: 392719
diff --git a/test/libyul/objectCompiler/manySubObjects.yul b/test/libyul/objectCompiler/manySubObjects.yul
new file mode 100644
index 0000000000..2f4b163876
--- /dev/null
+++ b/test/libyul/objectCompiler/manySubObjects.yul
@@ -0,0 +1,475 @@
+object "root" {
+    code {
+        sstore(0, datasize("root"))
+        sstore(1, datasize("0"))
+        sstore(2, datasize("1"))
+        sstore(3, datasize("2"))
+        sstore(4, datasize("3"))
+        sstore(5, datasize("4"))
+        sstore(6, datasize("5"))
+        sstore(7, datasize("6"))
+        sstore(8, datasize("7"))
+        sstore(9, datasize("8"))
+        sstore(10, datasize("9"))
+        sstore(11, datasize("a"))
+        sstore(12, datasize("b"))
+        sstore(13, datasize("c"))
+        sstore(14, datasize("d"))
+        sstore(15, datasize("e"))
+        sstore(16, datasize("f"))
+        sstore(17, datasize("10"))
+    }
+
+    object "0" {
+        code {
+            sstore(100, 0)
+            sstore(200, datasize("sub0"))
+        }
+        object "sub0" {
+            code {
+                sstore(300, 0)
+            }
+        }
+    }
+
+    object "1" {
+        code {
+            sstore(100, 1)
+        }
+    }
+
+    object "2" {
+        code {
+            sstore(101, 2)
+        }
+    }
+
+    object "3" {
+        code {
+            sstore(102, 3)
+        }
+    }
+
+    object "4" {
+        code {
+            sstore(103, 4)
+        }
+    }
+
+    object "5" {
+        code {
+            sstore(104, 5)
+        }
+    }
+
+    object "6" {
+        code {
+            sstore(105, 6)
+        }
+    }
+
+    object "7" {
+        code {
+            sstore(106, 7)
+        }
+    }
+
+    object "8" {
+        code {
+            sstore(107, 8)
+        }
+    }
+
+    object "9" {
+        code {
+            sstore(108, 9)
+        }
+    }
+
+    object "a" {
+        code {
+            sstore(109, 10)
+        }
+    }
+
+    object "b" {
+        code {
+            sstore(110, 11)
+        }
+    }
+
+    object "c" {
+        code {
+            sstore(111, 12)
+        }
+    }
+
+    object "d" {
+        code {
+            sstore(112, 13)
+        }
+    }
+
+    object "e" {
+        code {
+            sstore(113, 14)
+        }
+    }
+
+    object "f" {
+        code {
+            sstore(114, 15)
+        }
+    }
+
+    object "10" {
+        code {
+            sstore(115, 16)
+            sstore(201, datasize("sub10"))
+        }
+        object "sub10" {
+            code {
+                sstore(300, 16)
+            }
+        }
+    }
+}
+// ----
+// Assembly:
+//     /* "source":45:61   */
+//   bytecodeSize
+//     /* "source":42:43   */
+//   0x00
+//     /* "source":35:62   */
+//   sstore
+//     /* "source":81:94   */
+//   dataSize(sub_0)
+//     /* "source":78:79   */
+//   0x01
+//     /* "source":71:95   */
+//   sstore
+//     /* "source":114:127   */
+//   dataSize(sub_1)
+//     /* "source":111:112   */
+//   0x02
+//     /* "source":104:128   */
+//   sstore
+//     /* "source":147:160   */
+//   dataSize(sub_2)
+//     /* "source":144:145   */
+//   0x03
+//     /* "source":137:161   */
+//   sstore
+//     /* "source":180:193   */
+//   dataSize(sub_3)
+//     /* "source":177:178   */
+//   0x04
+//     /* "source":170:194   */
+//   sstore
+//     /* "source":213:226   */
+//   dataSize(sub_4)
+//     /* "source":210:211   */
+//   0x05
+//     /* "source":203:227   */
+//   sstore
+//     /* "source":246:259   */
+//   dataSize(sub_5)
+//     /* "source":243:244   */
+//   0x06
+//     /* "source":236:260   */
+//   sstore
+//     /* "source":279:292   */
+//   dataSize(sub_6)
+//     /* "source":276:277   */
+//   0x07
+//     /* "source":269:293   */
+//   sstore
+//     /* "source":312:325   */
+//   dataSize(sub_7)
+//     /* "source":309:310   */
+//   0x08
+//     /* "source":302:326   */
+//   sstore
+//     /* "source":345:358   */
+//   dataSize(sub_8)
+//     /* "source":342:343   */
+//   0x09
+//     /* "source":335:359   */
+//   sstore
+//     /* "source":379:392   */
+//   dataSize(sub_9)
+//     /* "source":375:377   */
+//   0x0a
+//     /* "source":368:393   */
+//   sstore
+//     /* "source":413:426   */
+//   dataSize(sub_10)
+//     /* "source":409:411   */
+//   0x0b
+//     /* "source":402:427   */
+//   sstore
+//     /* "source":447:460   */
+//   dataSize(sub_11)
+//     /* "source":443:445   */
+//   0x0c
+//     /* "source":436:461   */
+//   sstore
+//     /* "source":481:494   */
+//   dataSize(sub_12)
+//     /* "source":477:479   */
+//   0x0d
+//     /* "source":470:495   */
+//   sstore
+//     /* "source":515:528   */
+//   dataSize(sub_13)
+//     /* "source":511:513   */
+//   0x0e
+//     /* "source":504:529   */
+//   sstore
+//     /* "source":549:562   */
+//   dataSize(sub_14)
+//     /* "source":545:547   */
+//   0x0f
+//     /* "source":538:563   */
+//   sstore
+//     /* "source":583:596   */
+//   dataSize(sub_15)
+//     /* "source":579:581   */
+//   0x10
+//     /* "source":572:597   */
+//   sstore
+//     /* "source":617:631   */
+//   dataSize(sub_16)
+//     /* "source":613:615   */
+//   0x11
+//     /* "source":606:632   */
+//   sstore
+//     /* "source":25:638   */
+//   stop
+// stop
+//
+// sub_0: assembly {
+//         /* "source":696:697   */
+//       0x00
+//         /* "source":691:694   */
+//       0x64
+//         /* "source":684:698   */
+//       sstore
+//         /* "source":723:739   */
+//       dataSize(sub_0)
+//         /* "source":718:721   */
+//       0xc8
+//         /* "source":711:740   */
+//       sstore
+//         /* "source":670:750   */
+//       stop
+//     stop
+//
+//     sub_0: assembly {
+//             /* "source":822:823   */
+//           0x00
+//             /* "source":817:820   */
+//           0x012c
+//             /* "source":810:824   */
+//           sstore
+//             /* "source":792:838   */
+//           stop
+//     }
+// }
+//
+// sub_1: assembly {
+//         /* "source":912:913   */
+//       0x01
+//         /* "source":907:910   */
+//       0x64
+//         /* "source":900:914   */
+//       sstore
+//         /* "source":886:924   */
+//       stop
+// }
+//
+// sub_2: assembly {
+//         /* "source":988:989   */
+//       0x02
+//         /* "source":983:986   */
+//       0x65
+//         /* "source":976:990   */
+//       sstore
+//         /* "source":962:1000   */
+//       stop
+// }
+//
+// sub_3: assembly {
+//         /* "source":1064:1065   */
+//       0x03
+//         /* "source":1059:1062   */
+//       0x66
+//         /* "source":1052:1066   */
+//       sstore
+//         /* "source":1038:1076   */
+//       stop
+// }
+//
+// sub_4: assembly {
+//         /* "source":1140:1141   */
+//       0x04
+//         /* "source":1135:1138   */
+//       0x67
+//         /* "source":1128:1142   */
+//       sstore
+//         /* "source":1114:1152   */
+//       stop
+// }
+//
+// sub_5: assembly {
+//         /* "source":1216:1217   */
+//       0x05
+//         /* "source":1211:1214   */
+//       0x68
+//         /* "source":1204:1218   */
+//       sstore
+//         /* "source":1190:1228   */
+//       stop
+// }
+//
+// sub_6: assembly {
+//         /* "source":1292:1293   */
+//       0x06
+//         /* "source":1287:1290   */
+//       0x69
+//         /* "source":1280:1294   */
+//       sstore
+//         /* "source":1266:1304   */
+//       stop
+// }
+//
+// sub_7: assembly {
+//         /* "source":1368:1369   */
+//       0x07
+//         /* "source":1363:1366   */
+//       0x6a
+//         /* "source":1356:1370   */
+//       sstore
+//         /* "source":1342:1380   */
+//       stop
+// }
+//
+// sub_8: assembly {
+//         /* "source":1444:1445   */
+//       0x08
+//         /* "source":1439:1442   */
+//       0x6b
+//         /* "source":1432:1446   */
+//       sstore
+//         /* "source":1418:1456   */
+//       stop
+// }
+//
+// sub_9: assembly {
+//         /* "source":1520:1521   */
+//       0x09
+//         /* "source":1515:1518   */
+//       0x6c
+//         /* "source":1508:1522   */
+//       sstore
+//         /* "source":1494:1532   */
+//       stop
+// }
+//
+// sub_10: assembly {
+//         /* "source":1596:1598   */
+//       0x0a
+//         /* "source":1591:1594   */
+//       0x6d
+//         /* "source":1584:1599   */
+//       sstore
+//         /* "source":1570:1609   */
+//       stop
+// }
+//
+// sub_11: assembly {
+//         /* "source":1673:1675   */
+//       0x0b
+//         /* "source":1668:1671   */
+//       0x6e
+//         /* "source":1661:1676   */
+//       sstore
+//         /* "source":1647:1686   */
+//       stop
+// }
+//
+// sub_12: assembly {
+//         /* "source":1750:1752   */
+//       0x0c
+//         /* "source":1745:1748   */
+//       0x6f
+//         /* "source":1738:1753   */
+//       sstore
+//         /* "source":1724:1763   */
+//       stop
+// }
+//
+// sub_13: assembly {
+//         /* "source":1827:1829   */
+//       0x0d
+//         /* "source":1822:1825   */
+//       0x70
+//         /* "source":1815:1830   */
+//       sstore
+//         /* "source":1801:1840   */
+//       stop
+// }
+//
+// sub_14: assembly {
+//         /* "source":1904:1906   */
+//       0x0e
+//         /* "source":1899:1902   */
+//       0x71
+//         /* "source":1892:1907   */
+//       sstore
+//         /* "source":1878:1917   */
+//       stop
+// }
+//
+// sub_15: assembly {
+//         /* "source":1981:1983   */
+//       0x0f
+//         /* "source":1976:1979   */
+//       0x72
+//         /* "source":1969:1984   */
+//       sstore
+//         /* "source":1955:1994   */
+//       stop
+// }
+//
+// sub_16: assembly {
+//         /* "source":2059:2061   */
+//       0x10
+//         /* "source":2054:2057   */
+//       0x73
+//         /* "source":2047:2062   */
+//       sstore
+//         /* "source":2087:2104   */
+//       dataSize(sub_0)
+//         /* "source":2082:2085   */
+//       0xc9
+//         /* "source":2075:2105   */
+//       sstore
+//         /* "source":2033:2115   */
+//       stop
+//     stop
+//
+//     sub_0: assembly {
+//             /* "source":2188:2190   */
+//           0x10
+//             /* "source":2183:2186   */
+//           0x012c
+//             /* "source":2176:2191   */
+//           sstore
+//             /* "source":2158:2205   */
+//           stop
+//     }
+// }
+// Bytecode: 61005c5f55600b600155600660025560066003556006600455600660055560066006556006600755600660085560066009556006600a556006600b556006600c556006600d556006600e556006600f556006601055600c60115500fe
+// Opcodes: PUSH2 0x5C PUSH0 SSTORE PUSH1 0xB PUSH1 0x1 SSTORE PUSH1 0x6 PUSH1 0x2 SSTORE PUSH1 0x6 PUSH1 0x3 SSTORE PUSH1 0x6 PUSH1 0x4 SSTORE PUSH1 0x6 PUSH1 0x5 SSTORE PUSH1 0x6 PUSH1 0x6 SSTORE PUSH1 0x6 PUSH1 0x7 SSTORE PUSH1 0x6 PUSH1 0x8 SSTORE PUSH1 0x6 PUSH1 0x9 SSTORE PUSH1 0x6 PUSH1 0xA SSTORE PUSH1 0x6 PUSH1 0xB SSTORE PUSH1 0x6 PUSH1 0xC SSTORE PUSH1 0x6 PUSH1 0xD SSTORE PUSH1 0x6 PUSH1 0xE SSTORE PUSH1 0x6 PUSH1 0xF SSTORE PUSH1 0x6 PUSH1 0x10 SSTORE PUSH1 0xC PUSH1 0x11 SSTORE STOP INVALID
+// SourceMappings: 45:16:0:-:0;42:1;35:27;81:13;78:1;71:24;114:13;111:1;104:24;147:13;144:1;137:24;180:13;177:1;170:24;213:13;210:1;203:24;246:13;243:1;236:24;279:13;276:1;269:24;312:13;309:1;302:24;345:13;342:1;335:24;379:13;375:2;368:25;413:13;409:2;402:25;447:13;443:2;436:25;481:13;477:2;470:25;515:13;511:2;504:25;549:13;545:2;538:25;583:13;579:2;572:25;617:14;613:2;606:26;25:613

From a582684d328100da20491c592544a55eeaa562ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 25 Oct 2023 11:02:47 +0200
Subject: [PATCH 1655/1748] Set release date for 0.8.21 and update the bug list

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 279fbec634..8c74b49cf7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.22 (unreleased)
+### 0.8.22 (2023-10-25)
 
 Language Features:
  * Allow defining events at file level.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index d15c72a654..982444b103 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1863,6 +1863,10 @@
         "bugs": [],
         "released": "2023-07-19"
     },
+    "0.8.22": {
+        "bugs": [],
+        "released": "2023-10-25"
+    },
     "0.8.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",

From 609ef154d08d1e947097ff6343dd7511813db8ea Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 25 Oct 2023 14:00:37 +0200
Subject: [PATCH 1656/1748] Set version to 0.8.23

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73e7930b72..298df418cd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.22")
+set(PROJECT_VERSION "0.8.23")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index 8c74b49cf7..4e48228d3f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.23 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.22 (2023-10-25)
 
 Language Features:

From 23bcc69478ae5d9b2759bedb2ede47ea7f1ff78d Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 26 Oct 2023 16:34:49 +0200
Subject: [PATCH 1657/1748] Fix wrong file path in standard json tests

---
 .../input.json                                                  | 2 +-
 .../input.json                                                  | 2 +-
 .../input.json                                                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json
index 0903ccfebd..7d2f529ccf 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/input.json
@@ -1,7 +1,7 @@
 {
     "language": "Solidity",
     "sources": {
-        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_empty_cleanup_sequence/in.sol"]}
     },
     "settings": {
         "optimizer": {
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json
index 4086aff9fb..9c603d6f7f 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/input.json
@@ -1,7 +1,7 @@
 {
     "language": "Solidity",
     "sources": {
-        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_empty_optimisation_sequence/in.sol"]}
     },
     "settings": {
         "optimizer": {
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json
index 4f66682223..5780bea83a 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/input.json
@@ -1,7 +1,7 @@
 {
     "language": "Solidity",
     "sources": {
-        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_cleanup_sequence/in.sol"]}
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence/in.sol"]}
     },
     "settings": {
         "optimizer": {

From 74c2440416f9dcd2472d4d19203bae6ac359b8a7 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 25 Oct 2023 12:45:23 +0200
Subject: [PATCH 1658/1748] Update the release checklist

---
 ReleaseChecklist.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index db07fb8885..505852496f 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -58,6 +58,7 @@ At least a day before the release:
        Remove different variants of the same name manually before using the output.
  - [ ] Check that all tests on the latest commit in ``develop`` are green.
  - [ ] Click the ``Publish release`` button on the release page, creating the tag.
+       **Important: Must not be done before all the PRs, including changelog cleanup and date, are merged.**
  - [ ] Wait for the CI runs on the tag itself.
 
 ### Upload Release Artifacts and Publish Binaries

From 79b1f55cc51334cee7a38364bdcb0599702dd598 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 26 Oct 2023 13:42:55 +0200
Subject: [PATCH 1659/1748] Remove references to homebrew-ethereum

---
 ReleaseChecklist.md | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index 505852496f..db8bd426b6 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -2,8 +2,7 @@
 
 ### Requirements
  - [ ] GitHub account with access to [solidity](https://github.com/ethereum/solidity), [solc-js](https://github.com/ethereum/solc-js),
-       [solc-bin](https://github.com/ethereum/solc-bin), [homebrew-ethereum](https://github.com/ethereum/homebrew-ethereum),
-       [solidity-website](https://github.com/ethereum/solidity-website).
+       [solc-bin](https://github.com/ethereum/solc-bin), [solidity-website](https://github.com/ethereum/solidity-website).
  - [ ] DockerHub account with push rights to the [``solc`` image](https://hub.docker.com/r/ethereum/solc).
  - [ ] Launchpad (Ubuntu One) account with a membership in the ["Ethereum" team](https://launchpad.net/~ethereum) and
        a gnupg key for your email in the ``ethereum.org`` domain (has to be version 1, gpg2 won't work).
@@ -21,7 +20,6 @@ At least a day before the release:
  - [ ] Rerun CI on the top commits of main branches in all repositories that do not have daily activity by creating a test branch or PR:
       - [ ] ``solc-js``
       - [ ] ``solc-bin`` (make sure the bytecode comparison check did run)
-      - [ ] ``homebrew-ethereum``
  - [ ] (Optional) Create a prerelease in our Ubuntu PPA by following the steps in the PPA section below on ``develop`` rather than on a tag.
        This is recommended especially when dealing with PPA for the first time, when we add a new Ubuntu version or when the PPA scripts were modified in this release cycle.
  - [ ] Verify that the release tarball of ``solc-js`` works.
@@ -74,7 +72,6 @@ At least a day before the release:
 
 ### Homebrew and MacOS
  - [ ] Update the version and the hash (``sha256sum solidity_$VERSION.tar.gz``) in the [``solidity`` formula in Homebrew core repository](https://github.com/Homebrew/homebrew-core/blob/master/Formula/solidity.rb).
- - [ ] Update the version and the hash (``sha256sum solidity_$VERSION.tar.gz``) in [our custom ``solidity`` Homebrew formula](https://github.com/ethereum/homebrew-ethereum/blob/master/solidity.rb).
 
 ### Docker
  - [ ] Run ``./scripts/docker_deploy_manual.sh v$VERSION``.

From 7bf058b0c53a30b5040cb8905fdf7313f25bd42b Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 25 Oct 2023 14:26:22 +0200
Subject: [PATCH 1660/1748] Update ubuntu versions in PPA scripts.

---
 scripts/deps-ppa/static_z3.sh | 2 +-
 scripts/release_ppa.sh        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/deps-ppa/static_z3.sh b/scripts/deps-ppa/static_z3.sh
index 5ee6623a69..67cb15ce8a 100755
--- a/scripts/deps-ppa/static_z3.sh
+++ b/scripts/deps-ppa/static_z3.sh
@@ -41,7 +41,7 @@ sourcePPAConfig
 # Sanity check
 checkDputEntries "\[cpp-build-deps\]"
 
-DISTRIBUTIONS="focal jammy kinetic lunar"
+DISTRIBUTIONS="focal jammy lunar mantic"
 
 for distribution in $DISTRIBUTIONS
 do
diff --git a/scripts/release_ppa.sh b/scripts/release_ppa.sh
index bd98865d6e..252fd4c49c 100755
--- a/scripts/release_ppa.sh
+++ b/scripts/release_ppa.sh
@@ -68,7 +68,7 @@ packagename=solc
 # This needs to be a still active release
 static_build_distribution=focal
 
-DISTRIBUTIONS="focal jammy kinetic lunar"
+DISTRIBUTIONS="focal jammy lunar mantic"
 
 if is_release
 then
@@ -127,7 +127,7 @@ mv solidity solc
 mkdir -p ./solc/deps/downloads/ 2>/dev/null || true
 wget -O ./solc/deps/downloads/jsoncpp-1.9.3.tar.gz https://github.com/open-source-parsers/jsoncpp/archive/1.9.3.tar.gz
 wget -O ./solc/deps/downloads/range-v3-0.12.0.tar.gz https://github.com/ericniebler/range-v3/archive/0.12.0.tar.gz
-wget -O ./solc/deps/downloads/fmt-8.0.1.tar.gz https://github.com/fmtlib/fmt/archive/8.0.1.tar.gz
+wget -O ./solc/deps/downloads/fmt-9.1.0.tar.gz https://github.com/fmtlib/fmt/archive/9.1.0.tar.gz
 
 # Determine version
 cd solc

From 4d10cb57241f35a0b5e500c46476e183a113de08 Mon Sep 17 00:00:00 2001
From: Nuzair <nuzer501@gmail.com>
Date: Tue, 7 Nov 2023 20:02:48 +0900
Subject: [PATCH 1661/1748] Update README.md for X (Twitter) new brand
 guidelines (#14665)

* Update README.md for X (Twitter) new brand guidelines
* suggested changes
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6242a69f0b..e64f8cbfd3 100644
--- a/README.md
+++ b/README.md
@@ -3,10 +3,10 @@
 [![Matrix Chat](https://img.shields.io/badge/Matrix%20-chat-brightgreen?style=plastic&logo=matrix)](https://matrix.to/#/#ethereum_solidity:gitter.im)
 [![Gitter Chat](https://img.shields.io/badge/Gitter%20-chat-brightgreen?style=plastic&logo=gitter)](https://gitter.im/ethereum/solidity)
 [![Solidity Forum](https://img.shields.io/badge/Solidity_Forum%20-discuss-brightgreen?style=plastic&logo=discourse)](https://forum.soliditylang.org/)
-[![Twitter Follow](https://img.shields.io/twitter/follow/solidity_lang?style=plastic&logo=twitter)](https://twitter.com/solidity_lang)
+[![X Follow](https://img.shields.io/twitter/follow/solidity_lang?style=plastic&logo=x)](https://X.com/solidity_lang)
 [![Mastodon Follow](https://img.shields.io/mastodon/follow/000335908?domain=https%3A%2F%2Ffosstodon.org%2F&logo=mastodon&style=plastic)](https://fosstodon.org/@solidity)
 
-You can talk to us on Gitter and Matrix, tweet at us on Twitter or create a new topic in the Solidity forum. Questions, feedback, and suggestions are welcome!
+You can talk to us on Gitter and Matrix, tweet at us on X (previously Twitter) or create a new topic in the Solidity forum. Questions, feedback, and suggestions are welcome!
 
 Solidity is a statically typed, contract-oriented, high-level language for implementing smart contracts on the Ethereum platform.
 

From d899d9c2c1095efe958c64c260c3b0a3fad726f0 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 30 Oct 2023 11:44:00 +0100
Subject: [PATCH 1662/1748] Accept empty optimizer sequence with Yul optimizer
 disabled

Whitespace and newline validation for empty sequence

Changelog and docs

Kamil

Revert "fixup! Accept empty optimizer sequence with Yul optimizer disabled"

This reverts commit 1cbcc8e6b1edb0859876a8781f7b5ceb1722c154.
---
 Changelog.md                                  |   3 +-
 docs/internals/optimizer.rst                  |   6 +
 libsolidity/interface/CompilerStack.cpp       |  17 +++
 libsolidity/interface/StandardCompiler.cpp    |  20 ++-
 libyul/YulStack.cpp                           |  33 ++++-
 libyul/optimiser/Suite.cpp                    |  19 +++
 libyul/optimiser/Suite.h                      |   4 +
 solc/CommandLineParser.cpp                    |   5 +-
 .../in.sol                                    |   6 +
 .../input.json                                |  16 +++
 .../output.json                               |  12 ++
 .../in.sol                                    |   6 +
 .../input.json                                |  16 +++
 .../output.json                               |   9 ++
 .../in.sol                                    |   6 +
 .../input.json                                |  16 +++
 .../output.json                               |   9 ++
 .../output.json                               |   4 +-
 .../yul_optimizer_steps_disabled/err          |   2 +-
 .../args                                      |   1 +
 .../err                                       |  11 ++
 .../input.sol                                 |  18 +++
 .../output                                    | 133 ++++++++++++++++++
 test/solc/CommandLineParser.cpp               |  36 +++++
 24 files changed, 393 insertions(+), 15 deletions(-)
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/in.sol
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/in.sol
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/output.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/in.sol
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/input.json
 create mode 100644 test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/output.json
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/args
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/err
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/input.sol
 create mode 100644 test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/output

diff --git a/Changelog.md b/Changelog.md
index 4e48228d3f..d096eeddd1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,7 +4,8 @@ Language Features:
 
 
 Compiler Features:
-
+ * Commandline Interface: An empty ``--yul-optimizations`` sequence can now be always provided.
+ * Standard JSON Interface: An empty ``optimizerSteps`` sequence can now always be provided.
 
 Bugfixes:
 
diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index b3e144e947..15a25f9600 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -30,6 +30,11 @@ for a stand-alone Yul mode.
     The `peephole optimizer <https://en.wikipedia.org/wiki/Peephole_optimization>`_ is always
     enabled by default and can only be turned off via the :ref:`Standard JSON <compiler-api>`.
 
+.. note::
+    An empty optimizer sequence is accepted even without ``--optimize`` in order to fully disable
+    the user-supplied portion of the Yul :ref:`optimizer sequence <selecting-optimizations>`, as by default,
+    even when the optimizer is not turned on, the :ref:`unused pruner <unused-pruner>` step will be run.
+
 You can find more details on both optimizer modules and their optimization steps below.
 
 Benefits of Optimizing Solidity Code
@@ -329,6 +334,7 @@ Abbreviation Full name
 Some steps depend on properties ensured by ``BlockFlattener``, ``FunctionGrouper``, ``ForLoopInitRewriter``.
 For this reason the Yul optimizer always applies them before applying any steps supplied by the user.
 
+.. _selecting-optimizations:
 
 Selecting Optimizations
 -----------------------
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 14b3350163..eb0ed35500 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -69,6 +69,7 @@
 #include <libyul/YulStack.h>
 #include <libyul/AST.h>
 #include <libyul/AsmParser.h>
+#include <libyul/optimiser/Suite.h>
 
 #include <liblangutil/Scanner.h>
 #include <liblangutil/SemVerHandler.h>
@@ -99,6 +100,7 @@ using namespace solidity;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::stdlib;
+using namespace solidity::yul;
 using namespace std::string_literals;
 
 using solidity::util::errinfo_comment;
@@ -1672,6 +1674,21 @@ std::string CompilerStack::createMetadata(Contract const& _contract, bool _forIR
 			details["yulDetails"]["stackAllocation"] = m_optimiserSettings.optimizeStackAllocation;
 			details["yulDetails"]["optimizerSteps"] = m_optimiserSettings.yulOptimiserSteps + ":" + m_optimiserSettings.yulOptimiserCleanupSteps;
 		}
+		else if (
+			OptimiserSuite::isEmptyOptimizerSequence(m_optimiserSettings.yulOptimiserSteps) &&
+			OptimiserSuite::isEmptyOptimizerSequence(m_optimiserSettings.yulOptimiserCleanupSteps)
+		)
+		{
+			solAssert(m_optimiserSettings.optimizeStackAllocation == false);
+			details["yulDetails"] = Json::objectValue;
+			details["yulDetails"]["optimizerSteps"] = ":";
+		}
+		else
+		{
+			solAssert(m_optimiserSettings.optimizeStackAllocation == false);
+			solAssert(m_optimiserSettings.yulOptimiserSteps == OptimiserSettings::DefaultYulOptimiserSteps);
+			solAssert(m_optimiserSettings.yulOptimiserCleanupSteps == OptimiserSettings::DefaultYulOptimiserCleanupSteps);
+		}
 
 		meta["settings"]["optimizer"]["details"] = std::move(details);
 	}
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index 91a7480531..b74f764c55 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -456,12 +456,16 @@ std::optional<Json::Value> checkOptimizerDetail(Json::Value const& _details, std
 	return {};
 }
 
-std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details, std::string const& _name, std::string& _optimiserSetting, std::string& _cleanupSetting)
+std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details, std::string const& _name, std::string& _optimiserSetting, std::string& _cleanupSetting, bool _runYulOptimizer)
 {
 	if (_details.isMember(_name))
 	{
 		if (_details[_name].isString())
 		{
+			std::string const fullSequence = _details[_name].asString();
+			if (!_runYulOptimizer && !OptimiserSuite::isEmptyOptimizerSequence(fullSequence))
+				return formatFatalError(Error::Type::JSONError, "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted.");
+
 			try
 			{
 				yul::OptimiserSuite::validateSequence(_details[_name].asString());
@@ -474,7 +478,6 @@ std::optional<Json::Value> checkOptimizerDetailSteps(Json::Value const& _details
 				);
 			}
 
-			std::string const fullSequence = _details[_name].asString();
 			auto const delimiterPos = fullSequence.find(":");
 			_optimiserSetting = fullSequence.substr(0, delimiterPos);
 
@@ -605,22 +608,27 @@ std::variant<OptimiserSettings, Json::Value> parseOptimizerSettings(Json::Value
 		if (details.isMember("yulDetails"))
 		{
 			if (!settings.runYulOptimiser)
-				return formatFatalError(Error::Type::JSONError, "\"Providing yulDetails requires Yul optimizer to be enabled.");
+			{
+				if (checkKeys(details["yulDetails"], {"optimizerSteps"}, "settings.optimizer.details.yulDetails"))
+					return formatFatalError(Error::Type::JSONError, "Only optimizerSteps can be set in yulDetails when Yul optimizer is disabled.");
+				if (auto error = checkOptimizerDetailSteps(details["yulDetails"], "optimizerSteps", settings.yulOptimiserSteps, settings.yulOptimiserCleanupSteps, settings.runYulOptimiser))
+					return *error;
+				return {std::move(settings)};
+			}
 
 			if (auto result = checkKeys(details["yulDetails"], {"stackAllocation", "optimizerSteps"}, "settings.optimizer.details.yulDetails"))
 				return *result;
 			if (auto error = checkOptimizerDetail(details["yulDetails"], "stackAllocation", settings.optimizeStackAllocation))
 				return *error;
-			if (auto error = checkOptimizerDetailSteps(details["yulDetails"], "optimizerSteps", settings.yulOptimiserSteps, settings.yulOptimiserCleanupSteps))
+			if (auto error = checkOptimizerDetailSteps(details["yulDetails"], "optimizerSteps", settings.yulOptimiserSteps, settings.yulOptimiserCleanupSteps, settings.runYulOptimiser))
 				return *error;
 		}
 	}
-	return { std::move(settings) };
+	return {std::move(settings)};
 }
 
 }
 
-
 std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler::parseInput(Json::Value const& _input)
 {
 	InputsAndSettings ret;
diff --git a/libyul/YulStack.cpp b/libyul/YulStack.cpp
index a5d72c7bb5..6c89cadbdf 100644
--- a/libyul/YulStack.cpp
+++ b/libyul/YulStack.cpp
@@ -34,12 +34,14 @@
 #include <libyul/optimiser/Suite.h>
 #include <libevmasm/Assembly.h>
 #include <liblangutil/Scanner.h>
+#include <libsolidity/interface/OptimiserSettings.h>
 
 #include <boost/algorithm/string.hpp>
 
 #include <optional>
 
 using namespace solidity;
+using namespace solidity::frontend;
 using namespace solidity::yul;
 using namespace solidity::langutil;
 
@@ -164,14 +166,39 @@ void YulStack::optimize(Object& _object, bool _isCreation)
 	if (EVMDialect const* evmDialect = dynamic_cast<EVMDialect const*>(&dialect))
 		meter = std::make_unique<GasMeter>(*evmDialect, _isCreation, m_optimiserSettings.expectedExecutionsPerDeployment);
 
+	auto [optimizeStackAllocation, yulOptimiserSteps, yulOptimiserCleanupSteps] = [&]() -> std::tuple<bool, std::string, std::string>
+	{
+		if (!m_optimiserSettings.runYulOptimiser)
+		{
+			// Yul optimizer disabled, but empty sequence (:) explicitly provided
+			if (OptimiserSuite::isEmptyOptimizerSequence(m_optimiserSettings.yulOptimiserSteps + ":" + m_optimiserSettings.yulOptimiserCleanupSteps))
+				return std::make_tuple(true, "", "");
+			// Yul optimizer disabled, and no sequence explicitly provided (assumes default sequence)
+			else
+			{
+				yulAssert(
+					m_optimiserSettings.yulOptimiserSteps == OptimiserSettings::DefaultYulOptimiserSteps &&
+					m_optimiserSettings.yulOptimiserCleanupSteps == OptimiserSettings::DefaultYulOptimiserCleanupSteps
+				);
+				return std::make_tuple(true, "u", "");
+			}
+
+		}
+		return std::make_tuple(
+			m_optimiserSettings.optimizeStackAllocation,
+			m_optimiserSettings.yulOptimiserSteps,
+			m_optimiserSettings.yulOptimiserCleanupSteps
+		);
+	}();
+
 	OptimiserSuite::run(
 		dialect,
 		meter.get(),
 		_object,
 		// Defaults are the minimum necessary to avoid running into "Stack too deep" constantly.
-		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.optimizeStackAllocation : true,
-		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.yulOptimiserSteps : "u",
-		m_optimiserSettings.runYulOptimiser ? m_optimiserSettings.yulOptimiserCleanupSteps : "",
+		optimizeStackAllocation,
+		yulOptimiserSteps,
+		yulOptimiserCleanupSteps,
 		_isCreation ? std::nullopt : std::make_optional(m_optimiserSettings.expectedExecutionsPerDeployment),
 		{}
 	);
diff --git a/libyul/optimiser/Suite.cpp b/libyul/optimiser/Suite.cpp
index 58561ee10a..545ae4de06 100644
--- a/libyul/optimiser/Suite.cpp
+++ b/libyul/optimiser/Suite.cpp
@@ -383,6 +383,25 @@ void OptimiserSuite::validateSequence(std::string_view _stepAbbreviations)
 	assertThrow(nestingLevel == 0, OptimizerException, "Unbalanced brackets");
 }
 
+bool OptimiserSuite::isEmptyOptimizerSequence(std::string const& _sequence)
+{
+	size_t delimiterCount{0};
+	for (char const step: _sequence)
+		switch (step)
+		{
+		case ':':
+			if (++delimiterCount > 1)
+				return false;
+			break;
+		case ' ':
+		case '\n':
+			break;
+		default:
+			return false;
+		}
+	return true;
+}
+
 void OptimiserSuite::runSequence(std::string_view _stepAbbreviations, Block& _ast, bool _repeatUntilStable)
 {
 	validateSequence(_stepAbbreviations);
diff --git a/libyul/optimiser/Suite.h b/libyul/optimiser/Suite.h
index abed2720e2..6e3886da3b 100644
--- a/libyul/optimiser/Suite.h
+++ b/libyul/optimiser/Suite.h
@@ -76,6 +76,10 @@ class OptimiserSuite
 	/// Ensures that specified sequence of step abbreviations is well-formed and can be executed.
 	/// @throw OptimizerException if the sequence is invalid
 	static void validateSequence(std::string_view _stepAbbreviations);
+	/// Check whether the provided sequence is empty provided that the allowed characters are
+	/// whitespace, newline and :
+	static bool isEmptyOptimizerSequence(std::string const& _sequence);
+
 
 	void runSequence(std::vector<std::string> const& _steps, Block& _ast);
 	void runSequence(std::string_view _stepAbbreviations, Block& _ast, bool _repeatUntilStable = false);
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 0c7484fd40..3ed1b7b634 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -33,6 +33,7 @@
 #include <fmt/format.h>
 
 using namespace solidity::langutil;
+using namespace solidity::yul;
 
 namespace po = boost::program_options;
 
@@ -1228,8 +1229,8 @@ void CommandLineParser::processArgs()
 	if (m_args.count(g_strYulOptimizations))
 	{
 		OptimiserSettings optimiserSettings = m_options.optimiserSettings();
-		if (!optimiserSettings.runYulOptimiser)
-			solThrow(CommandLineValidationError, "--" + g_strYulOptimizations + " is invalid if Yul optimizer is disabled");
+		if (!optimiserSettings.runYulOptimiser && !OptimiserSuite::isEmptyOptimizerSequence(m_args[g_strYulOptimizations].as<std::string>()))
+			solThrow(CommandLineValidationError, "--" + g_strYulOptimizations + " is invalid with a non-empty sequence if Yul optimizer is disabled.");
 
 		try
 		{
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/in.sol
new file mode 100644
index 0000000000..9e5350072a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/input.json
new file mode 100644
index 0000000000..5118602504
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/input.json
@@ -0,0 +1,16 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_no_yul/in.sol"]}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": false,
+                    "yulDetails": {
+                        "optimizerSteps": "u:fdntOc"
+                    }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json
new file mode 100644
index 0000000000..fa3c9d93ed
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_no_yul/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted.",
+            "message": "If Yul optimizer is disabled, only an empty optimizerSteps sequence is accepted.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/in.sol
new file mode 100644
index 0000000000..9e5350072a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/input.json
new file mode 100644
index 0000000000..9de7beea91
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/input.json
@@ -0,0 +1,16 @@
+{
+  	"language": "Solidity",
+  	"sources": {
+		"A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/in.sol"]}
+  	},
+  	"settings": {
+		"optimizer": {
+	  		"details": {
+				"yul": false,
+				"yulDetails": {
+		  			"optimizerSteps": ":"
+				}
+	  		}
+		}
+  	}
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/output.json
new file mode 100644
index 0000000000..acf3b74ef1
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_empty_sequence_no_yul/output.json
@@ -0,0 +1,9 @@
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/in.sol b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/in.sol
new file mode 100644
index 0000000000..9e5350072a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/in.sol
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C {
+    function f() public pure {}
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/input.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/input.json
new file mode 100644
index 0000000000..321ac8e99a
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/input.json
@@ -0,0 +1,16 @@
+{
+    "language": "Solidity",
+    "sources": {
+        "A": {"urls": ["standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/in.sol"]}
+    },
+    "settings": {
+        "optimizer": {
+            "details": {
+                "yul": false,
+                "yulDetails": {
+                    "optimizerSteps": "\n  : "
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/output.json
new file mode 100644
index 0000000000..acf3b74ef1
--- /dev/null
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_optimiserSteps_with_whitespace_newline_sequence_no_yul/output.json
@@ -0,0 +1,9 @@
+{
+    "sources":
+    {
+        "A":
+        {
+            "id": 0
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/output.json b/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/output.json
index 4e6d7b6f4d..2470015e1f 100644
--- a/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/output.json
+++ b/test/cmdlineTests/standard_optimizer_yulDetails_without_yul/output.json
@@ -3,8 +3,8 @@
     [
         {
             "component": "general",
-            "formattedMessage": "\"Providing yulDetails requires Yul optimizer to be enabled.",
-            "message": "\"Providing yulDetails requires Yul optimizer to be enabled.",
+            "formattedMessage": "Only optimizerSteps can be set in yulDetails when Yul optimizer is disabled.",
+            "message": "Only optimizerSteps can be set in yulDetails when Yul optimizer is disabled.",
             "severity": "error",
             "type": "JSONError"
         }
diff --git a/test/cmdlineTests/yul_optimizer_steps_disabled/err b/test/cmdlineTests/yul_optimizer_steps_disabled/err
index a557351ea2..1abbab8bde 100644
--- a/test/cmdlineTests/yul_optimizer_steps_disabled/err
+++ b/test/cmdlineTests/yul_optimizer_steps_disabled/err
@@ -1 +1 @@
-Error: --yul-optimizations is invalid if Yul optimizer is disabled
+Error: --yul-optimizations is invalid with a non-empty sequence if Yul optimizer is disabled.
diff --git a/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/args b/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/args
new file mode 100644
index 0000000000..fef6c6531e
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/args
@@ -0,0 +1 @@
+--ir-optimized --metadata --yul-optimizations :
diff --git a/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/err b/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/err
new file mode 100644
index 0000000000..95e30df2e8
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/err
@@ -0,0 +1,11 @@
+Warning: Unused local variable.
+  --> yul_optimizer_steps_without_optimize_empty_sequence/input.sol:13:9:
+   |
+13 |         uint b = a;
+   |         ^^^^^^
+
+Warning: Unused local variable.
+  --> yul_optimizer_steps_without_optimize_empty_sequence/input.sol:14:9:
+   |
+14 |         uint c = a;
+   |         ^^^^^^
diff --git a/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/input.sol b/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/input.sol
new file mode 100644
index 0000000000..9e1b04ab1c
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/input.sol
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0;
+
+contract C
+{
+    constructor() {}
+
+    function foo() public pure returns (bool)
+    {
+        // given the empty optimizer sequence ``:``, ``b`` and ``c`` should not be removed in the
+        // optimized IR as the ``UnusedPruner`` step will not be run.
+        uint a = 100;
+        uint b = a;
+        uint c = a;
+
+        return a == 100;
+    }
+}
diff --git a/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/output b/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/output
new file mode 100644
index 0000000000..9ee6810792
--- /dev/null
+++ b/test/cmdlineTests/yul_optimizer_steps_without_optimize_empty_sequence/output
@@ -0,0 +1,133 @@
+
+======= yul_optimizer_steps_without_optimize_empty_sequence/input.sol:C =======
+Optimized IR:
+/// @use-src 0:"yul_optimizer_steps_without_optimize_empty_sequence/input.sol"
+object "C_28" {
+    code {
+        {
+            /// @src 0:60:410  "contract C..."
+            mstore(64, memoryguard(0x80))
+            if callvalue()
+            {
+                revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+            }
+            constructor_C()
+            let _1 := allocate_unbounded()
+            codecopy(_1, dataoffset("C_28_deployed"), datasize("C_28_deployed"))
+            return(_1, datasize("C_28_deployed"))
+        }
+        function allocate_unbounded() -> memPtr
+        { memPtr := mload(64) }
+        function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+        { revert(0, 0) }
+        /// @ast-id 5 @src 0:77:93  "constructor() {}"
+        function constructor_C()
+        { }
+    }
+    /// @use-src 0:"yul_optimizer_steps_without_optimize_empty_sequence/input.sol"
+    object "C_28_deployed" {
+        code {
+            {
+                /// @src 0:60:410  "contract C..."
+                mstore(64, memoryguard(0x80))
+                if iszero(lt(calldatasize(), 4))
+                {
+                    let selector := shift_right_unsigned(calldataload(0))
+                    switch selector
+                    case 0xc2985578 { external_fun_foo() }
+                    default { }
+                }
+                revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+            }
+            function shift_right_unsigned(value) -> newValue
+            { newValue := shr(224, value) }
+            function allocate_unbounded() -> memPtr
+            { memPtr := mload(64) }
+            function revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+            { revert(0, 0) }
+            function revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
+            { revert(0, 0) }
+            function abi_decode(headStart, dataEnd)
+            {
+                if slt(sub(dataEnd, headStart), 0)
+                {
+                    revert_error_dbdddcbe895c83990c08b3492a0e83918d802a52331272ac6fdb6a7c4aea3b1b()
+                }
+            }
+            function cleanup_bool(value) -> cleaned
+            {
+                cleaned := iszero(iszero(value))
+            }
+            function abi_encode_bool_to_bool(value, pos)
+            {
+                mstore(pos, cleanup_bool(value))
+            }
+            function abi_encode_bool(headStart, value0) -> tail
+            {
+                tail := add(headStart, 32)
+                abi_encode_bool_to_bool(value0, add(headStart, 0))
+            }
+            function external_fun_foo()
+            {
+                if callvalue()
+                {
+                    revert_error_ca66f745a3ce8ff40e2ccaf1ad45db7774001b90d25810abd9040049be7bf4bb()
+                }
+                abi_decode(4, calldatasize())
+                let ret := fun_foo()
+                let memPos := allocate_unbounded()
+                let memEnd := abi_encode_bool(memPos, ret)
+                return(memPos, sub(memEnd, memPos))
+            }
+            function revert_error_42b3090547df1d2001c96683413b8cf91c1b902ef5e3cb8d9f6f304cf7446f74()
+            { revert(0, 0) }
+            function zero_value_for_split_bool() -> ret
+            { ret := 0 }
+            function cleanup_rational_by(value) -> cleaned
+            { cleaned := value }
+            function cleanup_uint256(value) -> cleaned
+            { cleaned := value }
+            function identity(value) -> ret
+            { ret := value }
+            function convert_rational_by_to_uint256(value) -> converted
+            {
+                converted := cleanup_uint256(identity(cleanup_rational_by(value)))
+            }
+            /// @ast-id 27 @src 0:99:408  "function foo() public pure returns (bool)..."
+            function fun_foo() -> var
+            {
+                /// @src 0:135:139  "bool"
+                let zero_bool := zero_value_for_split_bool()
+                var := zero_bool
+                /// @src 0:332:335  "100"
+                let expr := 0x64
+                /// @src 0:323:335  "uint a = 100"
+                let var_a := convert_rational_by_to_uint256(expr)
+                /// @src 0:354:355  "a"
+                let _1 := var_a
+                let expr_1 := _1
+                /// @src 0:345:355  "uint b = a"
+                let var_b := expr_1
+                /// @src 0:374:375  "a"
+                let _2 := var_a
+                let expr_2 := _2
+                /// @src 0:365:375  "uint c = a"
+                let var_c := expr_2
+                /// @src 0:393:394  "a"
+                let _3 := var_a
+                let expr_3 := _3
+                /// @src 0:398:401  "100"
+                let expr_4 := 0x64
+                /// @src 0:393:401  "a == 100"
+                let expr_5 := eq(cleanup_uint256(expr_3), convert_rational_by_to_uint256(expr_4))
+                /// @src 0:386:401  "return a == 100"
+                var := expr_5
+                leave
+            }
+        }
+        data ".metadata" hex"<BYTECODE REMOVED>"
+    }
+}
+
+Metadata:
+{"compiler":{"version": "<VERSION REMOVED>"},"language":"Solidity","output":{"abi":[{"inputs":[],"stateMutability":"nonpayable","type":"constructor"},{"inputs":[],"name":"foo","outputs":[{"internalType":"bool","name":"","type":"bool"}],"stateMutability":"pure","type":"function"}],"devdoc":{"kind":"dev","methods":{},"version":1},"userdoc":{"kind":"user","methods":{},"version":1}},"settings":{"compilationTarget":{"yul_optimizer_steps_without_optimize_empty_sequence/input.sol":"C"},"evmVersion":"shanghai","libraries":{},"metadata":{"bytecodeHash":"ipfs"},"optimizer":{"details":{"constantOptimizer":false,"cse":false,"deduplicate":false,"inliner":false,"jumpdestRemover":true,"orderLiterals":false,"peephole":true,"simpleCounterForLoopUncheckedIncrement":true,"yul":false,"yulDetails":{"optimizerSteps":":"}},"runs":200},"remappings":[]},"sources":{"yul_optimizer_steps_without_optimize_empty_sequence/input.sol":{"keccak256":"0x3fc910e345ce1ee62bfa6b0f66931ee632c08265b25b6139cfbbfe4d2f8d5dd8","license":"GPL-3.0","urls":["bzz-raw://e557e9ad2c2e420a669c06ae456b0b790d77d2d6d492cd8540e6b244388a5140","dweb:/ipfs/QmaNiZmC2Mo3YxGiehs1n3dVTjZwD7FguX7EUtpeshMVuR"]}},"version":1}
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index caad98f999..28ca2c48a1 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -572,6 +572,42 @@ BOOST_AUTO_TEST_CASE(invalid_optimiser_sequences)
 	}
 }
 
+BOOST_AUTO_TEST_CASE(valid_empty_optimizer_sequences_without_optimize)
+{
+	vector<string> const validSequenceInputs {
+		"   :",
+		": ",
+		"\n : \n",
+		":"
+	};
+
+	vector<tuple<string, string>> const expectedParsedSequences {
+		{"   ", ""},
+		{"", " "},
+		{"\n ", " \n"},
+		{"", ""}
+	};
+
+	BOOST_CHECK_EQUAL(validSequenceInputs.size(), expectedParsedSequences.size());
+
+	for (size_t i = 0; i < validSequenceInputs.size(); ++i)
+	{
+		CommandLineOptions const& commandLineOptions = parseCommandLine({"solc", "contract.sol", "--yul-optimizations=" + validSequenceInputs[i]});
+		auto const& [expectedYulOptimiserSteps, expectedYulCleanupSteps] = expectedParsedSequences[i];
+		BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserSteps, expectedYulOptimiserSteps);
+		BOOST_CHECK_EQUAL(commandLineOptions.optimiserSettings().yulOptimiserCleanupSteps, expectedYulCleanupSteps);
+	}
+}
+
+BOOST_AUTO_TEST_CASE(invalid_optimizer_sequence_without_optimize)
+{
+	string const invalidSequence{"u: "};
+	string const expectedErrorMessage{"--yul-optimizations is invalid with a non-empty sequence if Yul optimizer is disabled."};
+	vector<string> commandLineOptions{"solc", "contract.sol", "--yul-optimizations=" + invalidSequence};
+	auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedErrorMessage; };
+	BOOST_CHECK_EXCEPTION(parseCommandLine(commandLineOptions), CommandLineValidationError, hasCorrectMessage);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 } // namespace solidity::frontend::test

From cc56cb5921e28b3a80b8120702cde92f773f4ad9 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Wed, 8 Nov 2023 00:45:37 +0100
Subject: [PATCH 1663/1748] Add verbatim bug test case.

---
 test/libyul/objectCompiler/verbatim_bug.yul | 109 ++++++++++++++++++++
 1 file changed, 109 insertions(+)
 create mode 100644 test/libyul/objectCompiler/verbatim_bug.yul

diff --git a/test/libyul/objectCompiler/verbatim_bug.yul b/test/libyul/objectCompiler/verbatim_bug.yul
new file mode 100644
index 0000000000..dcd39af8d5
--- /dev/null
+++ b/test/libyul/objectCompiler/verbatim_bug.yul
@@ -0,0 +1,109 @@
+object "a" {
+    code {
+        let dummy := 0xAABBCCDDEEFF
+        let input := sload(0)
+        let output
+
+        switch input
+        case 0x00 {
+            // Note that due to a bug the following disappeared from the assembly output.
+            output := verbatim_1i_1o(hex"506000", dummy)
+        }
+        case 0x01 {
+            output := 1
+        }
+        case 0x02 {
+            output := verbatim_1i_1o(hex"506002", dummy)
+        }
+        case 0x03 {
+            output := 3
+        }
+
+        sstore(0, output)
+    }
+}
+// ====
+// optimizationPreset: full
+// ----
+// Assembly:
+//     /* "source":87:88   */
+//   0x00
+//     /* "source":81:89   */
+//   dup1
+//   sload
+//     /* "source":139:307   */
+//   dup1
+//   iszero
+//   tag_5
+//   jumpi
+//     /* "source":316:361   */
+//   dup1
+//     /* "source":321:325   */
+//   0x01
+//     /* "source":316:361   */
+//   eq
+//   tag_3
+//   jumpi
+//     /* "source":370:448   */
+//   dup1
+//     /* "source":375:379   */
+//   0x02
+//     /* "source":370:448   */
+//   eq
+//   tag_5
+//   jumpi
+//     /* "source":462:466   */
+//   0x03
+//     /* "source":457:502   */
+//   eq
+//   tag_7
+//   jumpi
+//     /* "source":87:88   */
+//   0x00
+//     /* "source":512:529   */
+//   sstore
+//     /* "source":118:502   */
+//   stop
+//     /* "source":467:502   */
+// tag_7:
+//     /* "source":481:492   */
+//   pop
+//     /* "source":491:492   */
+//   0x03
+//     /* "source":87:88   */
+//   0x00
+//     /* "source":512:529   */
+//   sstore
+//     /* "source":118:502   */
+//   stop
+//     /* "source":380:448   */
+// tag_5:
+//     /* "source":404:438   */
+//   pop
+//   pop
+//     /* "source":45:59   */
+//   0xaabbccddeeff
+//     /* "source":404:438   */
+//   verbatimbytecode_506002
+//     /* "source":87:88   */
+//   0x00
+//     /* "source":512:529   */
+//   sstore
+//     /* "source":118:502   */
+//   stop
+//     /* "source":326:361   */
+// tag_3:
+//     /* "source":340:351   */
+//   pop
+//   pop
+//     /* "source":350:351   */
+//   0x01
+//     /* "source":87:88   */
+//   0x00
+//     /* "source":512:529   */
+//   sstore
+//     /* "source":118:502   */
+//   stop
+// Bytecode: 5f805480156026578060011460365780600214602657600314601f575f55005b5060035f55005b505065aabbccddeeff5060025f55005b505060015f5500
+// Opcodes: PUSH0 DUP1 SLOAD DUP1 ISZERO PUSH1 0x26 JUMPI DUP1 PUSH1 0x1 EQ PUSH1 0x36 JUMPI DUP1 PUSH1 0x2 EQ PUSH1 0x26 JUMPI PUSH1 0x3 EQ PUSH1 0x1F JUMPI PUSH0 SSTORE STOP JUMPDEST POP PUSH1 0x3 PUSH0 SSTORE STOP JUMPDEST POP POP PUSH6 0xAABBCCDDEEFF POP PUSH1 0x2 PUSH0 SSTORE STOP JUMPDEST POP POP PUSH1 0x1 PUSH0 SSTORE STOP
+// SourceMappings: 87:1:0:-:0;81:8;;139:168;;;;316:45;321:4;316:45;;;370:78;375:4;370:78;;;462:4;457:45;;;87:1;512:17;118:384;467:35;481:11;491:1;87;512:17;118:384;380:68;404:34;;45:14;404:34;87:1;512:17;118:384;326:35;340:11;;350:1;87;512:17;118:384

From 48fdbd39b3db163ee563222d15b15c79fcd3cc95 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Thu, 26 Oct 2023 01:11:00 +0200
Subject: [PATCH 1664/1748] Fix assembly item comparison for verbatim.

Co-authored-by: Matheus Aguiar <matheus.pit@gmail.com>
---
 Changelog.md                                |  4 ++++
 docs/bugs.json                              | 10 +++++++++
 docs/bugs_by_version.json                   | 24 +++++++++++++++++++--
 libevmasm/AssemblyItem.h                    |  2 +-
 test/libyul/objectCompiler/verbatim_bug.yul | 23 ++++++++++++++++----
 5 files changed, 56 insertions(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index d096eeddd1..c72aea22c1 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,5 +1,9 @@
 ### 0.8.23 (unreleased)
 
+Important Bugfixes:
+ * Optimizer: Fix block deduplicator bug which led to blocks which are identical apart from the contents of ``verbatim`` instructions to be treated as equivalent and thus collapsed into a single one.
+
+
 Language Features:
 
 
diff --git a/docs/bugs.json b/docs/bugs.json
index 6245bdeda5..6e24686005 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -1,4 +1,14 @@
 [
+    {
+        "uid": "SOL-2023-3",
+        "name": "VerbatimInvalidDeduplication",
+        "summary": "All ``verbatim`` blocks are considered identical by deduplicator and can incorrectly be unified when surrounded by identical opcodes.",
+        "description": "The block deduplicator is a step of the opcode-based optimizer which identifies equivalent assembly blocks and merges them into a single one. However, when blocks contained ``verbatim``, their comparison was performed incorrectly, leading to the collapse of assembly blocks which are identical except for the contents of the ``verbatim`` items. Since ``verbatim`` is only available in Yul, compilation of Solidity sources is not affected.",
+        "link": "https://blog.soliditylang.org/2023/X/Y/Z/",
+        "introduced": "0.8.5",
+        "fixed": "0.8.23",
+        "severity": "low"
+    },
     {
         "uid": "SOL-2023-2",
         "name": "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 982444b103..50132d0ed9 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1743,6 +1743,7 @@
     },
     "0.8.10": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1754,6 +1755,7 @@
     },
     "0.8.11": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1766,6 +1768,7 @@
     },
     "0.8.12": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1778,6 +1781,7 @@
     },
     "0.8.13": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination",
@@ -1791,6 +1795,7 @@
     },
     "0.8.14": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination",
@@ -1802,6 +1807,7 @@
     },
     "0.8.15": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination",
@@ -1811,6 +1817,7 @@
     },
     "0.8.16": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "StorageWriteRemovalBeforeConditionalTermination"
@@ -1819,6 +1826,7 @@
     },
     "0.8.17": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess"
         ],
@@ -1826,6 +1834,7 @@
     },
     "0.8.18": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess"
         ],
@@ -1833,6 +1842,7 @@
     },
     "0.8.19": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess"
         ],
@@ -1854,17 +1864,22 @@
     },
     "0.8.20": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess"
         ],
         "released": "2023-05-10"
     },
     "0.8.21": {
-        "bugs": [],
+        "bugs": [
+            "VerbatimInvalidDeduplication"
+        ],
         "released": "2023-07-19"
     },
     "0.8.22": {
-        "bugs": [],
+        "bugs": [
+            "VerbatimInvalidDeduplication"
+        ],
         "released": "2023-10-25"
     },
     "0.8.3": {
@@ -1894,6 +1909,7 @@
     },
     "0.8.5": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1906,6 +1922,7 @@
     },
     "0.8.6": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1918,6 +1935,7 @@
     },
     "0.8.7": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1930,6 +1948,7 @@
     },
     "0.8.8": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
@@ -1943,6 +1962,7 @@
     },
     "0.8.9": {
         "bugs": [
+            "VerbatimInvalidDeduplication",
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",
             "MissingSideEffectsOnSelectorAccess",
             "AbiReencodingHeadOverflowWithStaticArrayCleanup",
diff --git a/libevmasm/AssemblyItem.h b/libevmasm/AssemblyItem.h
index 40f98dae87..93be394733 100644
--- a/libevmasm/AssemblyItem.h
+++ b/libevmasm/AssemblyItem.h
@@ -140,7 +140,7 @@ class AssemblyItem
 		else if (type() == Operation)
 			return instruction() < _other.instruction();
 		else if (type() == VerbatimBytecode)
-			return *m_verbatimBytecode == *_other.m_verbatimBytecode;
+			return *m_verbatimBytecode < *_other.m_verbatimBytecode;
 		else
 			return data() < _other.data();
 	}
diff --git a/test/libyul/objectCompiler/verbatim_bug.yul b/test/libyul/objectCompiler/verbatim_bug.yul
index dcd39af8d5..778494f0b3 100644
--- a/test/libyul/objectCompiler/verbatim_bug.yul
+++ b/test/libyul/objectCompiler/verbatim_bug.yul
@@ -34,7 +34,7 @@ object "a" {
 //     /* "source":139:307   */
 //   dup1
 //   iszero
-//   tag_5
+//   tag_1
 //   jumpi
 //     /* "source":316:361   */
 //   dup1
@@ -104,6 +104,21 @@ object "a" {
 //   sstore
 //     /* "source":118:502   */
 //   stop
-// Bytecode: 5f805480156026578060011460365780600214602657600314601f575f55005b5060035f55005b505065aabbccddeeff5060025f55005b505060015f5500
-// Opcodes: PUSH0 DUP1 SLOAD DUP1 ISZERO PUSH1 0x26 JUMPI DUP1 PUSH1 0x1 EQ PUSH1 0x36 JUMPI DUP1 PUSH1 0x2 EQ PUSH1 0x26 JUMPI PUSH1 0x3 EQ PUSH1 0x1F JUMPI PUSH0 SSTORE STOP JUMPDEST POP PUSH1 0x3 PUSH0 SSTORE STOP JUMPDEST POP POP PUSH6 0xAABBCCDDEEFF POP PUSH1 0x2 PUSH0 SSTORE STOP JUMPDEST POP POP PUSH1 0x1 PUSH0 SSTORE STOP
-// SourceMappings: 87:1:0:-:0;81:8;;139:168;;;;316:45;321:4;316:45;;;370:78;375:4;370:78;;;462:4;457:45;;;87:1;512:17;118:384;467:35;481:11;491:1;87;512:17;118:384;380:68;404:34;;45:14;404:34;87:1;512:17;118:384;326:35;340:11;;350:1;87;512:17;118:384
+//     /* "source":149:307   */
+// tag_1:
+//     /* "source":263:297   */
+//   pop
+//   pop
+//     /* "source":45:59   */
+//   0xaabbccddeeff
+//     /* "source":263:297   */
+//   verbatimbytecode_506000
+//     /* "source":87:88   */
+//   0x00
+//     /* "source":512:529   */
+//   sstore
+//     /* "source":118:502   */
+//   stop
+// Bytecode: 5f80548015603e578060011460365780600214602657600314601f575f55005b5060035f55005b505065aabbccddeeff5060025f55005b505060015f55005b505065aabbccddeeff5060005f5500
+// Opcodes: PUSH0 DUP1 SLOAD DUP1 ISZERO PUSH1 0x3E JUMPI DUP1 PUSH1 0x1 EQ PUSH1 0x36 JUMPI DUP1 PUSH1 0x2 EQ PUSH1 0x26 JUMPI PUSH1 0x3 EQ PUSH1 0x1F JUMPI PUSH0 SSTORE STOP JUMPDEST POP PUSH1 0x3 PUSH0 SSTORE STOP JUMPDEST POP POP PUSH6 0xAABBCCDDEEFF POP PUSH1 0x2 PUSH0 SSTORE STOP JUMPDEST POP POP PUSH1 0x1 PUSH0 SSTORE STOP JUMPDEST POP POP PUSH6 0xAABBCCDDEEFF POP PUSH1 0x0 PUSH0 SSTORE STOP
+// SourceMappings: 87:1:0:-:0;81:8;;139:168;;;;316:45;321:4;316:45;;;370:78;375:4;370:78;;;462:4;457:45;;;87:1;512:17;118:384;467:35;481:11;491:1;87;512:17;118:384;380:68;404:34;;45:14;404:34;87:1;512:17;118:384;326:35;340:11;;350:1;87;512:17;118:384;149:158;263:34;;45:14;263:34;87:1;512:17;118:384

From 41ceb483fafb550ae9dd121f322cfc1f2e32cd91 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Tue, 7 Nov 2023 23:00:23 -0300
Subject: [PATCH 1665/1748] Add cmdline test

---
 .../~deduplicator-verbatim-bug/test.sh        | 19 +++++++++++++++++
 .../verbatim_inside_identical_blocks.yul      | 21 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100755 test/cmdlineTests/~deduplicator-verbatim-bug/test.sh
 create mode 100644 test/cmdlineTests/~deduplicator-verbatim-bug/verbatim_inside_identical_blocks.yul

diff --git a/test/cmdlineTests/~deduplicator-verbatim-bug/test.sh b/test/cmdlineTests/~deduplicator-verbatim-bug/test.sh
new file mode 100755
index 0000000000..19b57e8caa
--- /dev/null
+++ b/test/cmdlineTests/~deduplicator-verbatim-bug/test.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+set -eo pipefail
+
+# This is a regression test against https://github.com/ethereum/solidity/issues/14640
+# The bug caused the block deduplicator to incorrectly merge two blocks which have
+# verbatim items surrounded by identical opcodes. Due to the bug, the contents of
+# the verbatim were ignored and the blocks merged into a single one.
+
+# shellcheck source=scripts/common.sh
+source "${REPO_ROOT}/scripts/common.sh"
+# shellcheck source=scripts/common_cmdline.sh
+source "${REPO_ROOT}/scripts/common_cmdline.sh"
+
+SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
+YUL_SOURCE="${SCRIPT_DIR}/verbatim_inside_identical_blocks.yul"
+
+VERBATIM_OCCURRENCES=$(< "$YUL_SOURCE" "$SOLC" --strict-assembly - --optimize --asm | grep -e "verbatim" -c)
+
+[[ $VERBATIM_OCCURRENCES == 2 ]] || assertFail "Incorrect number of verbatim items in assembly."
diff --git a/test/cmdlineTests/~deduplicator-verbatim-bug/verbatim_inside_identical_blocks.yul b/test/cmdlineTests/~deduplicator-verbatim-bug/verbatim_inside_identical_blocks.yul
new file mode 100644
index 0000000000..1dc9a4615e
--- /dev/null
+++ b/test/cmdlineTests/~deduplicator-verbatim-bug/verbatim_inside_identical_blocks.yul
@@ -0,0 +1,21 @@
+{
+  let special := 0xFFFFFFFFFFFF
+  let input := sload(0)
+  let output
+
+  switch input
+  case 0x00 {
+      output := verbatim_1i_1o(hex"506000", special)
+  }
+  case 0x01 {
+      output := 1
+  }
+  case 0x02 {
+      output := verbatim_1i_1o(hex"506002", special)
+  }
+  case 0x03 {
+      output := 3
+  }
+
+  sstore(0, output)
+}

From 8292d7b53a1572dad7d4b422497078d42d17c273 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 8 Nov 2023 09:17:49 +0100
Subject: [PATCH 1666/1748] Remove superflous language features category from
 Changelog

---
 Changelog.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index c72aea22c1..03bfd2ce49 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,15 +4,10 @@ Important Bugfixes:
  * Optimizer: Fix block deduplicator bug which led to blocks which are identical apart from the contents of ``verbatim`` instructions to be treated as equivalent and thus collapsed into a single one.
 
 
-Language Features:
-
-
 Compiler Features:
  * Commandline Interface: An empty ``--yul-optimizations`` sequence can now be always provided.
  * Standard JSON Interface: An empty ``optimizerSteps`` sequence can now always be provided.
 
-Bugfixes:
-
 
 ### 0.8.22 (2023-10-25)
 

From 7e84be61e31bab9a7d9a6659ff4cf95417c13bbc Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 8 Nov 2023 10:05:42 +0100
Subject: [PATCH 1667/1748] Set date for 0.8.23 release

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 03bfd2ce49..ef5416fb3d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.23 (unreleased)
+### 0.8.23 (2023-11-08)
 
 Important Bugfixes:
  * Optimizer: Fix block deduplicator bug which led to blocks which are identical apart from the contents of ``verbatim`` instructions to be treated as equivalent and thus collapsed into a single one.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 50132d0ed9..152e8d97a4 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1882,6 +1882,10 @@
         ],
         "released": "2023-10-25"
     },
+    "0.8.23": {
+        "bugs": [],
+        "released": "2023-11-08"
+    },
     "0.8.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",

From 5cafa8c82618db013546755864412a3db8074641 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 8 Nov 2023 12:25:03 +0100
Subject: [PATCH 1668/1748] Fix link in bugs.json for 0.8.23

---
 docs/bugs.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/bugs.json b/docs/bugs.json
index 6e24686005..c853f95edd 100644
--- a/docs/bugs.json
+++ b/docs/bugs.json
@@ -4,7 +4,7 @@
         "name": "VerbatimInvalidDeduplication",
         "summary": "All ``verbatim`` blocks are considered identical by deduplicator and can incorrectly be unified when surrounded by identical opcodes.",
         "description": "The block deduplicator is a step of the opcode-based optimizer which identifies equivalent assembly blocks and merges them into a single one. However, when blocks contained ``verbatim``, their comparison was performed incorrectly, leading to the collapse of assembly blocks which are identical except for the contents of the ``verbatim`` items. Since ``verbatim`` is only available in Yul, compilation of Solidity sources is not affected.",
-        "link": "https://blog.soliditylang.org/2023/X/Y/Z/",
+        "link": "https://blog.soliditylang.org/2023/11/08/verbatim-invalid-deduplication-bug/",
         "introduced": "0.8.5",
         "fixed": "0.8.23",
         "severity": "low"

From 4fd869e92c241cf99e64c6acf6de9bded299efa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 8 Nov 2023 11:48:55 +0100
Subject: [PATCH 1669/1748] Set version to 0.8.24

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 298df418cd..f6a905e39a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.23")
+set(PROJECT_VERSION "0.8.24")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index ef5416fb3d..01a77ce17f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.24 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.23 (2023-11-08)
 
 Important Bugfixes:

From 35b5ebd2109ad0068a1c8c6c7f599e5c999c9800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 9 Nov 2023 17:03:03 +0100
Subject: [PATCH 1670/1748] prepare_report.js: Add the --report-file option to
 avoid printing the report to stdout

---
 .circleci/parallel_bytecode_report.sh         |  2 +-
 scripts/bytecodecompare/prepare_report.js     | 23 ++++++++++++++++---
 .../bytecode_reports_for_modified_binaries.sh |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.circleci/parallel_bytecode_report.sh b/.circleci/parallel_bytecode_report.sh
index 4a19015ce6..9b316266a2 100755
--- a/.circleci/parallel_bytecode_report.sh
+++ b/.circleci/parallel_bytecode_report.sh
@@ -75,5 +75,5 @@ else
     # shellcheck disable=SC2035
     ./prepare_report.js \
         --preset "$preset" \
-        *.sol > "../bytecode-report-${label}-${preset}.txt"
+        *.sol --report-file "../bytecode-report-${label}-${preset}.txt"
 fi
diff --git a/scripts/bytecodecompare/prepare_report.js b/scripts/bytecodecompare/prepare_report.js
index cba7a08001..f1db9f93fb 100755
--- a/scripts/bytecodecompare/prepare_report.js
+++ b/scripts/bytecodecompare/prepare_report.js
@@ -32,6 +32,7 @@ function cleanString(string)
 let inputFiles = []
 let stripSMTPragmas = false
 let presets = []
+let reportFilePath = undefined
 
 for (let i = 2; i < process.argv.length; ++i)
 {
@@ -45,10 +46,26 @@ for (let i = 2; i < process.argv.length; ++i)
         presets.push(process.argv[i + 1])
         ++i;
     }
+    else if (process.argv[i] === '--report-file')
+    {
+        if (reportFilePath !== undefined)
+            throw Error("Option --report-file was specified multiple times.")
+
+        if (i + 1 === process.argv.length)
+            throw Error("Option --report-file was used, but no file name given.")
+
+        reportFilePath = process.argv[i + 1]
+        ++i;
+    }
     else
         inputFiles.push(process.argv[i])
 }
 
+if (reportFilePath === undefined)
+    throw Error("Use --report-file option to specify the report file path.")
+
+let reportFile = fs.createWriteStream(reportFilePath, {flags : 'w'});
+
 if (presets.length === 0)
     presets = ['legacy-no-optimize', 'legacy-optimize']
 
@@ -114,7 +131,7 @@ for (const preset of presets)
             Object.keys(result['contracts']).every(file => Object.keys(result['contracts'][file]).length === 0)
         )
             // NOTE: do not exit here because this may be run on source which cannot be compiled
-            console.log(filename + ': <ERROR>')
+            reportFile.write(filename + ': <ERROR>\n')
         else
             for (const contractFile in result['contracts'])
                 for (const contractName in result['contracts'][contractFile])
@@ -135,8 +152,8 @@ for (const preset of presets)
                     if ('metadata' in contractResults && cleanString(contractResults.metadata) !== undefined)
                         metadata = contractResults.metadata
 
-                    console.log(filename + ':' + contractName + ' ' + bytecode)
-                    console.log(filename + ':' + contractName + ' ' + metadata)
+                    reportFile.write(filename + ':' + contractName + ' ' + bytecode + '\n')
+                    reportFile.write(filename + ':' + contractName + ' ' + metadata + '\n')
                 }
     }
 }
diff --git a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
index 92c522f8f5..bd62519132 100755
--- a/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
+++ b/scripts/solc-bin/bytecode_reports_for_modified_binaries.sh
@@ -160,7 +160,7 @@ for binary_name in $platform_binaries; do
                 "$solidity_version_and_commit"
 
             # shellcheck disable=SC2035
-            ./prepare_report.js --strip-smt-pragmas *.sol > "${report_dir}/report-${binary_name}.txt"
+            ./prepare_report.js --strip-smt-pragmas *.sol --report-file "${report_dir}/report-${binary_name}.txt"
         else
             yul_optimizer_flags=()
             if [[ $solidity_version == 0.6.0 ]] || [[ $solidity_version == 0.6.1 ]]; then

From d668330f9768afc69b1067b3a7115af338835047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 9 Nov 2023 19:22:38 +0100
Subject: [PATCH 1671/1748] prepare_report.js: Show script progress on stdout
 with dots

---
 .circleci/config.yml                      |  1 -
 scripts/bytecodecompare/prepare_report.js | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 7ec500e2e8..4b793865d3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -88,7 +88,6 @@ commands:
     steps:
       - run:
           name: Generate bytecode reports for the selected preset
-          no_output_timeout: 30m
           command: |
             .circleci/parallel_bytecode_report.sh \
                 "<< parameters.label >>" \
diff --git a/scripts/bytecodecompare/prepare_report.js b/scripts/bytecodecompare/prepare_report.js
index f1db9f93fb..821b5cb750 100755
--- a/scripts/bytecodecompare/prepare_report.js
+++ b/scripts/bytecodecompare/prepare_report.js
@@ -130,8 +130,11 @@ for (const preset of presets)
             Object.keys(result['contracts']).length === 0 ||
             Object.keys(result['contracts']).every(file => Object.keys(result['contracts'][file]).length === 0)
         )
+        {
             // NOTE: do not exit here because this may be run on source which cannot be compiled
             reportFile.write(filename + ': <ERROR>\n')
+            process.stdout.write('E')
+        }
         else
             for (const contractFile in result['contracts'])
                 for (const contractName in result['contracts'][contractFile])
@@ -140,6 +143,12 @@ for (const preset of presets)
 
                     let bytecode = '<NO BYTECODE>'
                     let metadata = '<NO METADATA>'
+                    let progressIndicator = '.'
+
+                    if ('metadata' in contractResults && cleanString(contractResults.metadata) !== undefined)
+                        metadata = contractResults.metadata
+                    else
+                        progressIndicator = 'M'
 
                     if (
                         'evm' in contractResults &&
@@ -148,12 +157,12 @@ for (const preset of presets)
                         cleanString(contractResults.evm.bytecode.object) !== undefined
                     )
                         bytecode = cleanString(contractResults.evm.bytecode.object)
-
-                    if ('metadata' in contractResults && cleanString(contractResults.metadata) !== undefined)
-                        metadata = contractResults.metadata
+                    else
+                        progressIndicator = 'B'
 
                     reportFile.write(filename + ':' + contractName + ' ' + bytecode + '\n')
                     reportFile.write(filename + ':' + contractName + ' ' + metadata + '\n')
+                    process.stdout.write(progressIndicator)
                 }
     }
 }

From 103e39706aeaed3fcd27e8fef0ce5d73e612e52e Mon Sep 17 00:00:00 2001
From: Jitendra Kumar <76531339+jitendragangwar123@users.noreply.github.com>
Date: Thu, 23 Nov 2023 17:35:11 +0530
Subject: [PATCH 1672/1748] fix:typo errors

---
 docs/yul.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/yul.rst b/docs/yul.rst
index cf47c1e877..0e50d13776 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -1258,7 +1258,7 @@ In Solidity mode, the Yul optimizer is activated together with the regular optim
 Optimization Step Sequence
 --------------------------
 
-Detailed information regrading the optimization sequence as well a list of abbreviations is
+Detailed information regarding the optimization sequence as well as a list of abbreviations is
 available in the :ref:`optimizer docs <optimizer-steps>`.
 
 .. _erc20yul:

From 158330ba8ce64054d1bb14eb6f731fef7c30ca1c Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Thu, 26 Oct 2023 00:27:28 -0300
Subject: [PATCH 1673/1748] Update optimizer docs to include codegen-based
 optimizer section

---
 docs/internals/optimizer.rst | 81 ++++++++++++++++++++++++++++++++++--
 1 file changed, 78 insertions(+), 3 deletions(-)

diff --git a/docs/internals/optimizer.rst b/docs/internals/optimizer.rst
index 15a25f9600..70896333c2 100644
--- a/docs/internals/optimizer.rst
+++ b/docs/internals/optimizer.rst
@@ -5,8 +5,11 @@
 The Optimizer
 *************
 
-The Solidity compiler uses two different optimizer modules: The "old" optimizer
-that operates at the opcode level and the "new" optimizer that operates on Yul IR code.
+The Solidity compiler involves optimizations at three different levels (in order of execution):
+
+- Optimizations during code generation based on a direct analysis of Solidity code.
+- Optimizing transformations on the Yul IR code.
+- Optimizations at the opcode level.
 
 The opcode-based optimizer applies a set of `simplification rules <https://github.com/ethereum/solidity/blob/develop/libevmasm/RuleList.h>`_
 to opcodes. It also combines equal code sets and removes unused code.
@@ -20,6 +23,17 @@ the function calls. Similarly, if a function is
 side-effect free and its result is multiplied by zero, you can remove the function
 call completely.
 
+The codegen-based optimizer affects the initial low-level code produced from the Solidity input.
+In the legacy pipeline, the bytecode is generated immediately and most of the optimizations of this
+kind are implicit and not configurable, the only exception being an optimization which changes the
+order of literals in binary operations.
+The IR-based pipeline takes a different approach and produces Yul IR closely matching the structure
+of the Solidity code, with nearly all optimizations deferred to the Yul optimizer module.
+In that case codegen-level optimization is done only in very limited cases which are difficult to
+handle in Yul IR, but are straightforward with the high-level information from analysis phase at hand.
+An example of such an optimization is the bypass of checked arithmetic when incrementing the counter
+in certain idiomatic ``for`` loops.
+
 Currently, the parameter ``--optimize`` activates the opcode-based optimizer for the
 generated bytecode and the Yul optimizer for the Yul code generated internally, for example for ABI coder v2.
 One can use ``solc --ir-optimized --optimize`` to produce an
@@ -27,7 +41,8 @@ optimized Yul IR for a Solidity source. Similarly, one can use ``solc --strict-a
 for a stand-alone Yul mode.
 
 .. note::
-    The `peephole optimizer <https://en.wikipedia.org/wiki/Peephole_optimization>`_ is always
+    Some optimizer steps, such as, for example, the `peephole optimizer <https://en.wikipedia.org/wiki/Peephole_optimization>`_
+    and the :ref:`unchecked loop increment optimizer <unchecked-loop-optimizer>` are always
     enabled by default and can only be turned off via the :ref:`Standard JSON <compiler-api>`.
 
 .. note::
@@ -1388,3 +1403,63 @@ into
     }
 
 The LiteralRematerialiser should be run before this step.
+
+Codegen-Based Optimizer Module
+==============================
+
+Currently, the codegen-based optimizer module provides two optimizations.
+
+The first one, available in the legacy code generator, moves literals to the right side of
+commutative binary operators, which helps exploit their associativity.
+
+The other one, available in the IR-based code generator, enables the use of unchecked arithmetic
+when generating code for incrementing the counter variable of certain idiomatic ``for`` loops.
+This avoids wasting gas by identifying some conditions that guarantee that the counter variable
+cannot overflow.
+This eliminates the need to use a verbose unchecked arithmetic block inside the loop body to
+increment the counter variable.
+
+.. _unchecked-loop-optimizer:
+
+Unchecked Loop Increment
+------------------------
+
+Introduced in Solidity ``0.8.22``, the overflow check optimization step is concerned with identifying
+the conditions under which the ``for`` loop counter can be safely incremented
+without overflow checks.
+
+This optimization is **only** applied to ``for`` loops of the general form:
+
+.. code-block:: solidity
+
+    for (uint i = X; i < Y; ++i) {
+        // variable i is not modified in the loop body
+    }
+
+The condition and the fact that the counter variable is only ever incremented
+guarantee that it never overflows.
+The precise requirements for the loop to be eligible for the optimization are as follows:
+
+- The loop condition is a comparison of the form ``i < Y``, for a local counter variable ``i``
+  (called the "loop counter" hereon) and an expression ``Y``.
+- The built-in operator ``<`` is necessarily used in the loop condition and is the only operator
+  that triggers the optimization. ``<=`` and the like are intentionally excluded. Additionally,
+  user-defined operators are **not** eligible.
+- The loop expression is a prefix or postfix increment of the counter variable, i.e, ``i++`` or ``++i``.
+- The loop counter is a local variable of a built-in integer type.
+- The loop counter is **not** modified by the loop body or by the expression used as the loop condition.
+- The comparison is performed on the same type as the loop counter, meaning that the type of the
+  right-hand-side expression is implicitly convertible to the type of the counter, such that the latter
+  is not implicitly widened before the comparison.
+
+To clarify the last condition, consider the following example:
+
+.. code-block:: solidity
+
+    for (uint8 i = 0; i < uint16(1000); i++) {
+        // ...
+    }
+
+In this case, the counter ``i`` has its type implicitly converted from ``uint8``
+to ``uint16`` before the comparison and the condition is in fact never false, so
+the overflow check for the increment cannot be removed.

From 15afdc38aef5853e2ce1cda72371baeb12bad19f Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 27 Nov 2023 14:30:45 -0300
Subject: [PATCH 1674/1748] Switch from yarn to pnpm for hardhat external tests

---
 .circleci/config.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4b793865d3..1570704bdc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1326,16 +1326,16 @@ jobs:
           name: Install dependencies
           command: |
             cd hardhat
-            yarn
+            pnpm install
       - run:
           name: Run hardhat-core test suite
           command: |
             HARDHAT_TESTS_SOLC_VERSION=$(scripts/get_version.sh)
             export HARDHAT_TESTS_SOLC_VERSION
 
-            # NOTE: This is expected to work without running `yarn build` first.
+            # NOTE: This is expected to work without running `pnpm build` first.
             cd hardhat/packages/hardhat-core
-            yarn test
+            pnpm test
       - matrix_notify_failure_unless_pr
 
   t_ext:

From 435f38942192d077fd3b2666714590e9d2152fe2 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 28 Nov 2023 14:43:47 +0100
Subject: [PATCH 1675/1748] Fix docutils deprecated set_class method

---
 docs/ext/remix_code_links.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/ext/remix_code_links.py b/docs/ext/remix_code_links.py
index 31a5667689..55fc0ef5c2 100644
--- a/docs/ext/remix_code_links.py
+++ b/docs/ext/remix_code_links.py
@@ -27,10 +27,10 @@ def remix_code_url(source_code, language, solidity_version):
 
 def build_remix_link_node(url):
     reference_node = docutils.nodes.reference('', 'open in Remix', internal=False, refuri=url, target='_blank')
-    reference_node.set_class('remix-link')
+    reference_node['classes'].append('remix-link')
 
     paragraph_node = docutils.nodes.paragraph()
-    paragraph_node.set_class('remix-link-container')
+    paragraph_node['classes'].append('remix-link-container')
     paragraph_node.append(reference_node)
     return paragraph_node
 

From 1ad3890e64d6055fbcbaa4fc4ec15c198008d518 Mon Sep 17 00:00:00 2001
From: xiaolou86 <lzw19860818@aliyun.com>
Date: Wed, 11 Oct 2023 17:09:58 +0800
Subject: [PATCH 1676/1748] Fix typos

---
 test/compilationTests/corion/premium.sol | 6 +++---
 test/compilationTests/corion/token.sol   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/compilationTests/corion/premium.sol b/test/compilationTests/corion/premium.sol
index 8603b95900..8dbe76212b 100644
--- a/test/compilationTests/corion/premium.sol
+++ b/test/compilationTests/corion/premium.sol
@@ -202,11 +202,11 @@ contract premium is module, safeMath {
             @success    If the function was successful.
         */
         if ( from != msg.sender ) {
-            (bool _success, uint256 _reamining, uint256 _nonce) = db.getAllowance(from, msg.sender);
+            (bool _success, uint256 _remaining, uint256 _nonce) = db.getAllowance(from, msg.sender);
             require( _success );
-            _reamining = safeSub(_reamining, amount);
+            _remaining = safeSub(_remaining, amount);
             _nonce = safeAdd(_nonce, 1);
-            require( db.setAllowance(from, msg.sender, _reamining, _nonce) );
+            require( db.setAllowance(from, msg.sender, _remaining, _nonce) );
             emit AllowanceUsed(msg.sender, from, amount);
         }
         bytes memory _data;
diff --git a/test/compilationTests/corion/token.sol b/test/compilationTests/corion/token.sol
index 58c3e8cb40..51c93f120b 100644
--- a/test/compilationTests/corion/token.sol
+++ b/test/compilationTests/corion/token.sol
@@ -218,11 +218,11 @@ contract token is safeMath, module, announcementTypes {
             @success    Was the Function successful?
         */
         if ( from != msg.sender ) {
-            (bool _success, uint256 _reamining, uint256 _nonce) = db.getAllowance(from, msg.sender);
+            (bool _success, uint256 _remaining, uint256 _nonce) = db.getAllowance(from, msg.sender);
             require( _success );
-            _reamining = safeSub(_reamining, amount);
+            _remaining = safeSub(_remaining, amount);
             _nonce = safeAdd(_nonce, 1);
-            require( db.setAllowance(from, msg.sender, _reamining, _nonce) );
+            require( db.setAllowance(from, msg.sender, _remaining, _nonce) );
             emit AllowanceUsed(msg.sender, from, amount);
         }
         bytes memory _data;

From 4c628294b4dc935d43c093eecf09f423f54ed714 Mon Sep 17 00:00:00 2001
From: Vishwa Mehta <vishwa.mehta@ethereum.org>
Date: Wed, 29 Nov 2023 19:53:07 +0530
Subject: [PATCH 1677/1748] Update contributing.rst

Updated breaking link to the team call on Jitsi.
---
 docs/contributing.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/contributing.rst b/docs/contributing.rst
index 7f444871d5..ac4e2375eb 100644
--- a/docs/contributing.rst
+++ b/docs/contributing.rst
@@ -32,7 +32,7 @@ the team and contributors are working on, you can join our public team call:
 
 - Wednesdays at 3PM CET/CEST.
 
-The call takes place on `Jitsi <https://meet.soliditylang.org/>`_.
+The call takes place on `Jitsi <https://meet.ethereum.org/solidity>`_.
 
 How to Report Issues
 ====================

From 1247ff490b71fdbbc7503fba47536a1e5bc0f239 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Sat, 28 Oct 2023 18:31:49 -0300
Subject: [PATCH 1678/1748] Assert compiler outputs not generated when
 experimental Solidity is used

---
 libsolidity/interface/CompilerStack.cpp | 42 ++++++++++++++++++++++++-
 libsolidity/interface/CompilerStack.h   |  2 ++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index eb0ed35500..49e02c5ec7 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -86,6 +86,7 @@
 
 #include <boost/algorithm/string/replace.hpp>
 
+#include <range/v3/algorithm/all_of.hpp>
 #include <range/v3/view/concat.hpp>
 #include <range/v3/view/map.hpp>
 
@@ -453,7 +454,7 @@ bool CompilerStack::analyze()
 
 	try
 	{
-		bool experimentalSolidity = !m_sourceOrder.empty() && m_sourceOrder.front()->ast->experimentalSolidity();
+		bool experimentalSolidity = isExperimentalSolidity();
 
 		SyntaxChecker syntaxChecker(m_errorReporter, m_optimiserSettings.runYulOptimiser);
 		for (Source const* source: m_sourceOrder)
@@ -923,6 +924,8 @@ std::string const& CompilerStack::yulIR(std::string const& _contractName) const
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	return contract(_contractName).yulIR;
 }
 
@@ -931,6 +934,8 @@ Json::Value const& CompilerStack::yulIRAst(std::string const& _contractName) con
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	return contract(_contractName).yulIRAst;
 }
 
@@ -939,6 +944,8 @@ std::string const& CompilerStack::yulIROptimized(std::string const& _contractNam
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	return contract(_contractName).yulIROptimized;
 }
 
@@ -947,6 +954,8 @@ Json::Value const& CompilerStack::yulIROptimizedAst(std::string const& _contract
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	return contract(_contractName).yulIROptimizedAst;
 }
 
@@ -955,6 +964,8 @@ evmasm::LinkerObject const& CompilerStack::object(std::string const& _contractNa
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	return contract(_contractName).object;
 }
 
@@ -963,6 +974,8 @@ evmasm::LinkerObject const& CompilerStack::runtimeObject(std::string const& _con
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	return contract(_contractName).runtimeObject;
 }
 
@@ -972,6 +985,8 @@ std::string CompilerStack::assemblyString(std::string const& _contractName, Stri
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	Contract const& currentContract = contract(_contractName);
 	if (currentContract.evmAssembly)
 		return currentContract.evmAssembly->assemblyString(m_debugInfoSelection, _sourceCodes);
@@ -985,6 +1000,8 @@ Json::Value CompilerStack::assemblyJSON(std::string const& _contractName) const
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	Contract const& currentContract = contract(_contractName);
 	if (currentContract.evmAssembly)
 		return currentContract.evmAssembly->assemblyJSON(sourceIndices());
@@ -1022,6 +1039,7 @@ Json::Value const& CompilerStack::contractABI(Contract const& _contract) const
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
+	solAssert(!isExperimentalSolidity());
 
 	return _contract.abi.init([&]{ return ABI::generate(*_contract.contract); });
 }
@@ -1040,6 +1058,7 @@ Json::Value const& CompilerStack::storageLayout(Contract const& _contract) const
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
+	solAssert(!isExperimentalSolidity());
 
 	return _contract.storageLayout.init([&]{ return StorageLayout().generate(*_contract.contract); });
 }
@@ -1058,6 +1077,7 @@ Json::Value const& CompilerStack::natspecUser(Contract const& _contract) const
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
+	solAssert(!isExperimentalSolidity());
 
 	return _contract.userDocumentation.init([&]{ return Natspec::userDocumentation(*_contract.contract); });
 }
@@ -1077,6 +1097,8 @@ Json::Value const& CompilerStack::natspecDev(Contract const& _contract) const
 
 	solAssert(_contract.contract, "");
 
+	solAssert(!isExperimentalSolidity());
+
 	return _contract.devDocumentation.init([&]{ return Natspec::devDocumentation(*_contract.contract); });
 }
 
@@ -1085,6 +1107,8 @@ Json::Value CompilerStack::interfaceSymbols(std::string const& _contractName) co
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	Json::Value interfaceSymbols(Json::objectValue);
 	// Always have a methods object
 	interfaceSymbols["methods"] = Json::objectValue;
@@ -1125,6 +1149,8 @@ std::string const& CompilerStack::metadata(Contract const& _contract) const
 
 	solAssert(_contract.contract, "");
 
+	solAssert(!isExperimentalSolidity());
+
 	return _contract.metadata.init([&]{ return createMetadata(_contract, m_viaIR); });
 }
 
@@ -1145,6 +1171,8 @@ SourceUnit const& CompilerStack::ast(std::string const& _sourceName) const
 	if (!source(_sourceName).ast)
 		solThrow(CompilerError, "Parsing was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	return *source(_sourceName).ast;
 }
 
@@ -1867,6 +1895,8 @@ Json::Value CompilerStack::gasEstimates(std::string const& _contractName) const
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
+	solAssert(!isExperimentalSolidity());
+
 	if (!assemblyItems(_contractName) && !runtimeAssemblyItems(_contractName))
 		return Json::Value();
 
@@ -1938,3 +1968,13 @@ Json::Value CompilerStack::gasEstimates(std::string const& _contractName) const
 
 	return output;
 }
+
+bool CompilerStack::isExperimentalSolidity() const
+{
+	return
+		!m_sourceOrder.empty() &&
+		// TODO: Does it make sense to check for any source or just the front?
+		//m_sourceOrder.front()->ast->experimentalSolidity()
+		ranges::all_of(m_sourceOrder, [](auto const* _source) { return _source->ast->experimentalSolidity(); } )
+	;
+}
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 929e7e54f4..0ccb33219e 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -348,6 +348,8 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// Changes the format of the metadata appended at the end of the bytecode.
 	void setMetadataFormat(MetadataFormat _metadataFormat) { m_metadataFormat = _metadataFormat; }
 
+	bool isExperimentalSolidity() const;
+
 	static MetadataFormat defaultMetadataFormat()
 	{
 		return VersionIsRelease ? MetadataFormat::WithReleaseVersionTag : MetadataFormat::WithPrereleaseVersionTag;

From 7006535c0d20116524808f0112bf13d7917f1536 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Wed, 29 Nov 2023 19:18:44 -0300
Subject: [PATCH 1679/1748] [FIXUP] Remove TODO comment

---
 libsolidity/interface/CompilerStack.cpp | 2 --
 1 file changed, 2 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 49e02c5ec7..7a52a240d9 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -1973,8 +1973,6 @@ bool CompilerStack::isExperimentalSolidity() const
 {
 	return
 		!m_sourceOrder.empty() &&
-		// TODO: Does it make sense to check for any source or just the front?
-		//m_sourceOrder.front()->ast->experimentalSolidity()
 		ranges::all_of(m_sourceOrder, [](auto const* _source) { return _source->ast->experimentalSolidity(); } )
 	;
 }

From 9b09afefeaaf85f8277ec971ee54d2e4d7ebddc9 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Wed, 29 Nov 2023 18:10:09 -0300
Subject: [PATCH 1680/1748] [REFACTOR] Use solUnimplementedAssert instead of
 solAssert

---
 libsolidity/interface/CompilerStack.cpp | 32 ++++++++++++-------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 7a52a240d9..d0c9587a5f 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -924,7 +924,7 @@ std::string const& CompilerStack::yulIR(std::string const& _contractName) const
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return contract(_contractName).yulIR;
 }
@@ -934,7 +934,7 @@ Json::Value const& CompilerStack::yulIRAst(std::string const& _contractName) con
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return contract(_contractName).yulIRAst;
 }
@@ -944,7 +944,7 @@ std::string const& CompilerStack::yulIROptimized(std::string const& _contractNam
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return contract(_contractName).yulIROptimized;
 }
@@ -954,7 +954,7 @@ Json::Value const& CompilerStack::yulIROptimizedAst(std::string const& _contract
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return contract(_contractName).yulIROptimizedAst;
 }
@@ -964,7 +964,7 @@ evmasm::LinkerObject const& CompilerStack::object(std::string const& _contractNa
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return contract(_contractName).object;
 }
@@ -974,7 +974,7 @@ evmasm::LinkerObject const& CompilerStack::runtimeObject(std::string const& _con
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return contract(_contractName).runtimeObject;
 }
@@ -985,7 +985,7 @@ std::string CompilerStack::assemblyString(std::string const& _contractName, Stri
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	Contract const& currentContract = contract(_contractName);
 	if (currentContract.evmAssembly)
@@ -1000,7 +1000,7 @@ Json::Value CompilerStack::assemblyJSON(std::string const& _contractName) const
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	Contract const& currentContract = contract(_contractName);
 	if (currentContract.evmAssembly)
@@ -1039,7 +1039,7 @@ Json::Value const& CompilerStack::contractABI(Contract const& _contract) const
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return _contract.abi.init([&]{ return ABI::generate(*_contract.contract); });
 }
@@ -1058,7 +1058,7 @@ Json::Value const& CompilerStack::storageLayout(Contract const& _contract) const
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return _contract.storageLayout.init([&]{ return StorageLayout().generate(*_contract.contract); });
 }
@@ -1077,7 +1077,7 @@ Json::Value const& CompilerStack::natspecUser(Contract const& _contract) const
 		solThrow(CompilerError, "Analysis was not successful.");
 
 	solAssert(_contract.contract, "");
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return _contract.userDocumentation.init([&]{ return Natspec::userDocumentation(*_contract.contract); });
 }
@@ -1097,7 +1097,7 @@ Json::Value const& CompilerStack::natspecDev(Contract const& _contract) const
 
 	solAssert(_contract.contract, "");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return _contract.devDocumentation.init([&]{ return Natspec::devDocumentation(*_contract.contract); });
 }
@@ -1107,7 +1107,7 @@ Json::Value CompilerStack::interfaceSymbols(std::string const& _contractName) co
 	if (m_stackState < AnalysisSuccessful)
 		solThrow(CompilerError, "Analysis was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	Json::Value interfaceSymbols(Json::objectValue);
 	// Always have a methods object
@@ -1149,7 +1149,7 @@ std::string const& CompilerStack::metadata(Contract const& _contract) const
 
 	solAssert(_contract.contract, "");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return _contract.metadata.init([&]{ return createMetadata(_contract, m_viaIR); });
 }
@@ -1171,7 +1171,7 @@ SourceUnit const& CompilerStack::ast(std::string const& _sourceName) const
 	if (!source(_sourceName).ast)
 		solThrow(CompilerError, "Parsing was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	return *source(_sourceName).ast;
 }
@@ -1895,7 +1895,7 @@ Json::Value CompilerStack::gasEstimates(std::string const& _contractName) const
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solAssert(!isExperimentalSolidity());
+	solUnimplementedAssert(!isExperimentalSolidity());
 
 	if (!assemblyItems(_contractName) && !runtimeAssemblyItems(_contractName))
 		return Json::Value();

From fc65c0c6087dbc3564b8a11800140b56b4b3b593 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Wed, 29 Nov 2023 19:16:56 -0300
Subject: [PATCH 1681/1748] Assert import AST

---
 libsolidity/interface/CompilerStack.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index d0c9587a5f..058151928b 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -422,6 +422,7 @@ void CompilerStack::importASTs(std::map<std::string, Json::Value> const& _source
 	std::map<std::string, ASTPointer<SourceUnit>> reconstructedSources = ASTJsonImporter(m_evmVersion).jsonToSourceUnit(_sources);
 	for (auto& src: reconstructedSources)
 	{
+		solUnimplementedAssert(!src.second->experimentalSolidity());
 		std::string const& path = src.first;
 		Source source;
 		source.ast = src.second;

From e43d1052df1046d545bfe934dc3e9cf80ec81f49 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 30 Nov 2023 15:15:30 +0100
Subject: [PATCH 1682/1748] Purge using namespace from test/libyul

---
 scripts/check_style.sh                     |   1 +
 test/libyul/Common.cpp                     |  27 ++-
 test/libyul/CompilabilityChecker.cpp       |  32 ++--
 test/libyul/ControlFlowGraphTest.cpp       |   7 +-
 test/libyul/ControlFlowSideEffectsTest.cpp |  13 +-
 test/libyul/EVMCodeTransformTest.cpp       |  11 +-
 test/libyul/FunctionSideEffects.cpp        |  13 +-
 test/libyul/Inliner.cpp                    |   5 +-
 test/libyul/KnowledgeBaseTest.cpp          |   9 +-
 test/libyul/Metrics.cpp                    |   5 +-
 test/libyul/ObjectCompilerTest.cpp         |   9 +-
 test/libyul/ObjectParser.cpp               |  26 +--
 test/libyul/Parser.cpp                     | 183 ++++++++++-----------
 test/libyul/StackLayoutGeneratorTest.cpp   |   7 +-
 test/libyul/StackShufflingTest.cpp         |  41 +++--
 test/libyul/SyntaxTest.cpp                 |  11 +-
 test/libyul/YulInterpreterTest.cpp         |  13 +-
 test/libyul/YulOptimizerTest.cpp           |  23 ++-
 test/libyul/YulOptimizerTestCommon.cpp     |  17 +-
 19 files changed, 218 insertions(+), 235 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 22ad325368..8ade99148f 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -46,6 +46,7 @@ NAMESPACE_STD_FREE_FILES=(
     test/libsolidity/analysis/*
     test/libsolidity/interface/*
     test/libsolidity/util/*
+    test/libyul/*
 )
 
 (
diff --git a/test/libyul/Common.cpp b/test/libyul/Common.cpp
index f10414a9f7..10d7d12add 100644
--- a/test/libyul/Common.cpp
+++ b/test/libyul/Common.cpp
@@ -38,7 +38,6 @@
 
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::langutil;
@@ -51,7 +50,7 @@ Dialect const& defaultDialect(bool _yul)
 }
 }
 
-pair<shared_ptr<Block>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(string const& _source, bool _yul)
+std::pair<std::shared_ptr<Block>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(std::string const& _source, bool _yul)
 {
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
@@ -67,21 +66,21 @@ pair<shared_ptr<Block>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(strin
 	return make_pair(stack.parserResult()->code, stack.parserResult()->analysisInfo);
 }
 
-pair<shared_ptr<Object>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(
-	string const& _source,
+std::pair<std::shared_ptr<Object>, std::shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(
+	std::string const& _source,
 	Dialect const& _dialect,
 	ErrorList& _errors
 )
 {
 	ErrorReporter errorReporter(_errors);
 	CharStream stream(_source, "");
-	shared_ptr<Scanner> scanner = make_shared<Scanner>(stream);
-	shared_ptr<Object> parserResult = yul::ObjectParser(errorReporter, _dialect).parse(scanner, false);
+	std::shared_ptr<Scanner> scanner = std::make_shared<Scanner>(stream);
+	std::shared_ptr<Object> parserResult = yul::ObjectParser(errorReporter, _dialect).parse(scanner, false);
 	if (!parserResult)
 		return {};
 	if (!parserResult->code || errorReporter.hasErrors())
 		return {};
-	shared_ptr<AsmAnalysisInfo> analysisInfo = make_shared<AsmAnalysisInfo>();
+	std::shared_ptr<AsmAnalysisInfo> analysisInfo = std::make_shared<AsmAnalysisInfo>();
 	AsmAnalyzer analyzer(*analysisInfo, errorReporter, _dialect, {}, parserResult->qualifiedDataNames());
 	// TODO this should be done recursively.
 	if (!analyzer.analyze(*parserResult->code) || errorReporter.hasErrors())
@@ -89,20 +88,20 @@ pair<shared_ptr<Object>, shared_ptr<yul::AsmAnalysisInfo>> yul::test::parse(
 	return {std::move(parserResult), std::move(analysisInfo)};
 }
 
-yul::Block yul::test::disambiguate(string const& _source, bool _yul)
+yul::Block yul::test::disambiguate(std::string const& _source, bool _yul)
 {
 	auto result = parse(_source, _yul);
 	return std::get<Block>(Disambiguator(defaultDialect(_yul), *result.second, {})(*result.first));
 }
 
-string yul::test::format(string const& _source, bool _yul)
+std::string yul::test::format(std::string const& _source, bool _yul)
 {
 	return yul::AsmPrinter()(*parse(_source, _yul).first);
 }
 
 namespace
 {
-std::map<string const, yul::Dialect const& (*)(langutil::EVMVersion)> const validDialects = {
+std::map<std::string const, yul::Dialect const& (*)(langutil::EVMVersion)> const validDialects = {
 	{
 		"evm",
 		[](langutil::EVMVersion _evmVersion) -> yul::Dialect const&
@@ -120,10 +119,10 @@ std::map<string const, yul::Dialect const& (*)(langutil::EVMVersion)> const vali
 	}
 };
 
-vector<string> validDialectNames()
+	std::vector<std::string> validDialectNames()
 {
-	vector<string> names{size(validDialects), ""};
-	transform(begin(validDialects), end(validDialects), names.begin(), [](auto const& dialect) { return dialect.first; });
+	std::vector<std::string> names{size(validDialects), ""};
+	std::transform(begin(validDialects), end(validDialects), names.begin(), [](auto const& dialect) { return dialect.first; });
 
 	return names;
 }
@@ -132,7 +131,7 @@ vector<string> validDialectNames()
 yul::Dialect const& yul::test::dialect(std::string const& _name, langutil::EVMVersion _evmVersion)
 {
 	if (!validDialects.count(_name))
-		BOOST_THROW_EXCEPTION(runtime_error{
+		BOOST_THROW_EXCEPTION(std::runtime_error{
 			"Invalid Dialect \"" +
 			_name +
 			"\". Valid dialects are " +
diff --git a/test/libyul/CompilabilityChecker.cpp b/test/libyul/CompilabilityChecker.cpp
index b27f7ab547..27310cd898 100644
--- a/test/libyul/CompilabilityChecker.cpp
+++ b/test/libyul/CompilabilityChecker.cpp
@@ -27,22 +27,20 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
-
 namespace solidity::yul::test
 {
 
 namespace
 {
-string check(string const& _input)
+std::string check(std::string const& _input)
 {
 	Object obj;
 	std::tie(obj.code, obj.analysisInfo) = yul::test::parse(_input, false);
 	BOOST_REQUIRE(obj.code);
 	auto functions = CompilabilityChecker(EVMDialect::strictAssemblyForEVM(solidity::test::CommonOptions::get().evmVersion()), obj, true).stackDeficit;
-	string out;
+	std::string out;
 	for (auto const& function: functions)
-		out += function.first.str() + ": " + to_string(function.second) + " ";
+		out += function.first.str() + ": " + std::to_string(function.second) + " ";
 	return out;
 }
 }
@@ -51,19 +49,19 @@ BOOST_AUTO_TEST_SUITE(CompilabilityChecker)
 
 BOOST_AUTO_TEST_CASE(smoke_test)
 {
-	string out = check("{}");
+	std::string out = check("{}");
 	BOOST_CHECK_EQUAL(out, "");
 }
 
 BOOST_AUTO_TEST_CASE(simple_function)
 {
-	string out = check("{ function f(a, b) -> x, y { x := a y := b } }");
+	std::string out = check("{ function f(a, b) -> x, y { x := a y := b } }");
 	BOOST_CHECK_EQUAL(out, "");
 }
 
 BOOST_AUTO_TEST_CASE(many_variables_few_uses)
 {
-	string out = check(R"({
+	std::string out = check(R"({
 		function f(a, b) -> x, y {
 			let r1 := 0
 			let r2 := 0
@@ -91,7 +89,7 @@ BOOST_AUTO_TEST_CASE(many_variables_few_uses)
 
 BOOST_AUTO_TEST_CASE(many_variables_many_uses)
 {
-	string out = check(R"({
+	std::string out = check(R"({
 		function f(a, b) -> x, y {
 			let r1 := 0
 			let r2 := 0
@@ -119,7 +117,7 @@ BOOST_AUTO_TEST_CASE(many_variables_many_uses)
 
 BOOST_AUTO_TEST_CASE(many_return_variables_unused_arguments)
 {
-	string out = check(R"({
+	std::string out = check(R"({
 		function f(a, b) -> r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19 {
 		}
 	})");
@@ -128,7 +126,7 @@ BOOST_AUTO_TEST_CASE(many_return_variables_unused_arguments)
 
 BOOST_AUTO_TEST_CASE(many_return_variables_used_arguments)
 {
-	string out = check(R"({
+	std::string out = check(R"({
 		function f(a, b) -> r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19 {
 			r1 := 0
 			sstore(a, b)
@@ -139,7 +137,7 @@ BOOST_AUTO_TEST_CASE(many_return_variables_used_arguments)
 
 BOOST_AUTO_TEST_CASE(multiple_functions_used_arguments)
 {
-	string out = check(R"({
+	std::string out = check(R"({
 		function f(a, b) -> r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19 {
 			r1 := 0
 			sstore(a, b)
@@ -175,7 +173,7 @@ BOOST_AUTO_TEST_CASE(multiple_functions_used_arguments)
 
 BOOST_AUTO_TEST_CASE(multiple_functions_unused_arguments)
 {
-	string out = check(R"({
+	std::string out = check(R"({
 		function f(a, b) -> r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19 {
 		}
 		function g(r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16, r17, r18, r19) -> x, y {
@@ -207,7 +205,7 @@ BOOST_AUTO_TEST_CASE(multiple_functions_unused_arguments)
 
 BOOST_AUTO_TEST_CASE(nested_used_arguments)
 {
-	string out = check(R"({
+	std::string out = check(R"({
 		function h(x) {
 			let r1 := 0
 			let r2 := 0
@@ -244,7 +242,7 @@ BOOST_AUTO_TEST_CASE(nested_used_arguments)
 
 BOOST_AUTO_TEST_CASE(nested_unused_arguments)
 {
-	string out = check(R"({
+	std::string out = check(R"({
 		function h(x) {
 			let r1 := 0
 			let r2 := 0
@@ -277,7 +275,7 @@ BOOST_AUTO_TEST_CASE(nested_unused_arguments)
 
 BOOST_AUTO_TEST_CASE(also_in_outer_block_used_arguments)
 {
-	string out = check(R"({
+	std::string out = check(R"({
 			let x := 0
 			let r1 := 0
 			let r2 := 0
@@ -308,7 +306,7 @@ BOOST_AUTO_TEST_CASE(also_in_outer_block_used_arguments)
 
 BOOST_AUTO_TEST_CASE(also_in_outer_block_unused_arguments)
 {
-	string out = check(R"({
+	std::string out = check(R"({
 			let x := 0
 			let r1 := 0
 			let r2 := 0
diff --git a/test/libyul/ControlFlowGraphTest.cpp b/test/libyul/ControlFlowGraphTest.cpp
index 44fff4219f..9a0e6f092f 100644
--- a/test/libyul/ControlFlowGraphTest.cpp
+++ b/test/libyul/ControlFlowGraphTest.cpp
@@ -39,9 +39,8 @@ using namespace solidity::yul;
 using namespace solidity::yul::test;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
-using namespace std;
 
-ControlFlowGraphTest::ControlFlowGraphTest(string const& _filename):
+ControlFlowGraphTest::ControlFlowGraphTest(std::string const& _filename):
 	TestCase(_filename)
 {
 	m_source = m_reader.source();
@@ -195,13 +194,13 @@ class ControlFlowGraphPrinter
 	std::list<CFG::BasicBlock const*> m_blocksToPrint;
 };
 
-TestCase::TestResult ControlFlowGraphTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
+TestCase::TestResult ControlFlowGraphTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	ErrorList errors;
 	auto [object, analysisInfo] = parse(m_source, *m_dialect, errors);
 	if (!object || !analysisInfo || Error::containsErrors(errors))
 	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
+		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << std::endl;
 		return TestResult::FatalError;
 	}
 
diff --git a/test/libyul/ControlFlowSideEffectsTest.cpp b/test/libyul/ControlFlowSideEffectsTest.cpp
index ce6c18c358..6ac5a7b0ad 100644
--- a/test/libyul/ControlFlowSideEffectsTest.cpp
+++ b/test/libyul/ControlFlowSideEffectsTest.cpp
@@ -27,7 +27,6 @@
 #include <libyul/ControlFlowSideEffectsCollector.h>
 #include <libyul/backends/evm/EVMDialect.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::yul::test;
@@ -35,9 +34,9 @@ using namespace solidity::frontend::test;
 
 namespace
 {
-string toString(ControlFlowSideEffects const& _sideEffects)
+std::string toString(ControlFlowSideEffects const& _sideEffects)
 {
-	vector<string> r;
+	std::vector<std::string> r;
 	if (_sideEffects.canTerminate)
 		r.emplace_back("can terminate");
 	if (_sideEffects.canRevert)
@@ -48,19 +47,19 @@ string toString(ControlFlowSideEffects const& _sideEffects)
 }
 }
 
-ControlFlowSideEffectsTest::ControlFlowSideEffectsTest(string const& _filename):
+ControlFlowSideEffectsTest::ControlFlowSideEffectsTest(std::string const& _filename):
 	TestCase(_filename)
 {
 	m_source = m_reader.source();
 	m_expectation = m_reader.simpleExpectations();
 }
 
-TestCase::TestResult ControlFlowSideEffectsTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+TestCase::TestResult ControlFlowSideEffectsTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	Object obj;
 	std::tie(obj.code, obj.analysisInfo) = yul::test::parse(m_source, false);
 	if (!obj.code)
-		BOOST_THROW_EXCEPTION(runtime_error("Parsing input failed."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
 	ControlFlowSideEffectsCollector sideEffects(
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
@@ -68,7 +67,7 @@ TestCase::TestResult ControlFlowSideEffectsTest::run(ostream& _stream, string co
 	);
 	m_obtainedResult.clear();
 	forEach<FunctionDefinition const>(*obj.code, [&](FunctionDefinition const& _fun) {
-		string effectStr = toString(sideEffects.functionSideEffects().at(&_fun));
+		std::string effectStr = toString(sideEffects.functionSideEffects().at(&_fun));
 		m_obtainedResult += _fun.name.str() + (effectStr.empty() ? ":" : ": " + effectStr) + "\n";
 	});
 
diff --git a/test/libyul/EVMCodeTransformTest.cpp b/test/libyul/EVMCodeTransformTest.cpp
index 257893ad5f..4c2eecab05 100644
--- a/test/libyul/EVMCodeTransformTest.cpp
+++ b/test/libyul/EVMCodeTransformTest.cpp
@@ -38,9 +38,8 @@ using namespace solidity::yul;
 using namespace solidity::yul::test;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
-using namespace std;
 
-EVMCodeTransformTest::EVMCodeTransformTest(string const& _filename):
+EVMCodeTransformTest::EVMCodeTransformTest(std::string const& _filename):
 	EVMVersionRestrictedTestCase(_filename)
 {
 	m_source = m_reader.source();
@@ -48,21 +47,21 @@ EVMCodeTransformTest::EVMCodeTransformTest(string const& _filename):
 	m_expectation = m_reader.simpleExpectations();
 }
 
-TestCase::TestResult EVMCodeTransformTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
+TestCase::TestResult EVMCodeTransformTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	solidity::frontend::OptimiserSettings settings = solidity::frontend::OptimiserSettings::none();
 	settings.runYulOptimiser = false;
 	settings.optimizeStackAllocation = m_stackOpt;
 	YulStack stack(
 		EVMVersion{},
-		nullopt,
+		std::nullopt,
 		YulStack::Language::StrictAssembly,
 		settings,
 		DebugInfoSelection::All()
 	);
 	if (!stack.parseAndAnalyze("", m_source))
 	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
+		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << std::endl;
 		SourceReferenceFormatter{_stream, stack, true, false}
 			.printErrorInformation(stack.errors());
 		return TestResult::FatalError;
@@ -75,7 +74,7 @@ TestCase::TestResult EVMCodeTransformTest::run(ostream& _stream, string const& _
 		adapter,
 		EVMDialect::strictAssemblyForEVMObjects(EVMVersion{}),
 		m_stackOpt,
-		nullopt
+		std::nullopt
 	);
 
 	std::ostringstream output;
diff --git a/test/libyul/FunctionSideEffects.cpp b/test/libyul/FunctionSideEffects.cpp
index dd96044820..a57ec98078 100644
--- a/test/libyul/FunctionSideEffects.cpp
+++ b/test/libyul/FunctionSideEffects.cpp
@@ -40,13 +40,12 @@ using namespace solidity::yul;
 using namespace solidity::yul::test;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
-using namespace std;
 
 namespace
 {
-string toString(SideEffects const& _sideEffects)
+std::string toString(SideEffects const& _sideEffects)
 {
-	vector<string> ret;
+	std::vector<std::string> ret;
 	if (_sideEffects.movable)
 		ret.emplace_back("movable");
 	if (_sideEffects.movableApartFromEffects)
@@ -74,21 +73,21 @@ string toString(SideEffects const& _sideEffects)
 }
 }
 
-FunctionSideEffects::FunctionSideEffects(string const& _filename):
+FunctionSideEffects::FunctionSideEffects(std::string const& _filename):
 	TestCase(_filename)
 {
 	m_source = m_reader.source();
 	m_expectation = m_reader.simpleExpectations();
 }
 
-TestCase::TestResult FunctionSideEffects::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+TestCase::TestResult FunctionSideEffects::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	Object obj;
 	std::tie(obj.code, obj.analysisInfo) = yul::test::parse(m_source, false);
 	if (!obj.code)
-		BOOST_THROW_EXCEPTION(runtime_error("Parsing input failed."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Parsing input failed."));
 
-	map<YulString, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
+	std::map<YulString, SideEffects> functionSideEffects = SideEffectsPropagator::sideEffects(
 		EVMDialect::strictAssemblyForEVMObjects(langutil::EVMVersion()),
 		CallGraphGenerator::callGraph(*obj.code)
 	);
diff --git a/test/libyul/Inliner.cpp b/test/libyul/Inliner.cpp
index 75ae064e54..6f622b41a4 100644
--- a/test/libyul/Inliner.cpp
+++ b/test/libyul/Inliner.cpp
@@ -33,7 +33,6 @@
 
 #include <boost/algorithm/string/join.hpp>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::yul;
@@ -41,14 +40,14 @@ using namespace solidity::yul::test;
 
 namespace
 {
-string inlinableFunctions(string const& _source)
+std::string inlinableFunctions(std::string const& _source)
 {
 	auto ast = disambiguate(_source);
 
 	InlinableExpressionFunctionFinder funFinder;
 	funFinder(ast);
 
-	vector<string> functionNames;
+	std::vector<std::string> functionNames;
 	for (auto const& f: funFinder.inlinableFunctions())
 		functionNames.emplace_back(f.first.str());
 	return boost::algorithm::join(functionNames, ",");
diff --git a/test/libyul/KnowledgeBaseTest.cpp b/test/libyul/KnowledgeBaseTest.cpp
index 7cb5a8ae3c..b1dd0e6d19 100644
--- a/test/libyul/KnowledgeBaseTest.cpp
+++ b/test/libyul/KnowledgeBaseTest.cpp
@@ -33,7 +33,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::langutil;
 
 namespace solidity::yul::test
@@ -42,10 +41,10 @@ namespace solidity::yul::test
 class KnowledgeBaseTest
 {
 protected:
-	KnowledgeBase constructKnowledgeBase(string const& _source)
+	KnowledgeBase constructKnowledgeBase(std::string const& _source)
 	{
 		ErrorList errorList;
-		shared_ptr<AsmAnalysisInfo> analysisInfo;
+		std::shared_ptr<AsmAnalysisInfo> analysisInfo;
 		std::tie(m_object, analysisInfo) = yul::test::parse(_source, m_dialect, errorList);
 		BOOST_REQUIRE(m_object && errorList.empty() && m_object->code);
 
@@ -62,9 +61,9 @@ class KnowledgeBaseTest
 	}
 
 	EVMDialect m_dialect{EVMVersion{}, true};
-	shared_ptr<Object> m_object;
+	std::shared_ptr<Object> m_object;
 	SSAValueTracker m_ssaValues;
-	map<YulString, AssignedValue> m_values;
+	std::map<YulString, AssignedValue> m_values;
 };
 
 BOOST_FIXTURE_TEST_SUITE(KnowledgeBase, KnowledgeBaseTest)
diff --git a/test/libyul/Metrics.cpp b/test/libyul/Metrics.cpp
index f8c5920f2a..ac3153433f 100644
--- a/test/libyul/Metrics.cpp
+++ b/test/libyul/Metrics.cpp
@@ -27,7 +27,6 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::langutil;
 
 namespace solidity::yul::test
@@ -36,9 +35,9 @@ namespace solidity::yul::test
 namespace
 {
 
-size_t codeSize(string const& _source, CodeWeights const _weights = {})
+size_t codeSize(std::string const& _source, CodeWeights const _weights = {})
 {
-	shared_ptr<Block> ast = parse(_source, false).first;
+	std::shared_ptr<Block> ast = parse(_source, false).first;
 	BOOST_REQUIRE(ast);
 	return CodeSize::codeSize(*ast, _weights);
 }
diff --git a/test/libyul/ObjectCompilerTest.cpp b/test/libyul/ObjectCompilerTest.cpp
index 74a680b9b7..65ff18a768 100644
--- a/test/libyul/ObjectCompilerTest.cpp
+++ b/test/libyul/ObjectCompilerTest.cpp
@@ -43,9 +43,8 @@ using namespace solidity::yul;
 using namespace solidity::yul::test;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
-using namespace std;
 
-ObjectCompilerTest::ObjectCompilerTest(string const& _filename):
+ObjectCompilerTest::ObjectCompilerTest(std::string const& _filename):
 	TestCase(_filename)
 {
 	m_source = m_reader.source();
@@ -62,18 +61,18 @@ ObjectCompilerTest::ObjectCompilerTest(string const& _filename):
 	m_expectation = m_reader.simpleExpectations();
 }
 
-TestCase::TestResult ObjectCompilerTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
+TestCase::TestResult ObjectCompilerTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	YulStack stack(
 		EVMVersion(),
-		nullopt,
+		std::nullopt,
 		YulStack::Language::StrictAssembly,
 		OptimiserSettings::preset(m_optimisationPreset),
 		DebugInfoSelection::All()
 	);
 	if (!stack.parseAndAnalyze("source", m_source))
 	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
+		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << std::endl;
 		SourceReferenceFormatter{_stream, stack, true, false}
 			.printErrorInformation(stack.errors());
 		return TestResult::FatalError;
diff --git a/test/libyul/ObjectParser.cpp b/test/libyul/ObjectParser.cpp
index e78a8b0eb6..d9623384a0 100644
--- a/test/libyul/ObjectParser.cpp
+++ b/test/libyul/ObjectParser.cpp
@@ -43,9 +43,9 @@
 #include <string>
 #include <sstream>
 
-using namespace std;
 using namespace solidity::frontend;
 using namespace solidity::langutil;
+using namespace std::string_literals;
 
 namespace solidity::yul::test
 {
@@ -53,7 +53,7 @@ namespace solidity::yul::test
 namespace
 {
 
-pair<bool, ErrorList> parse(string const& _source)
+std::pair<bool, ErrorList> parse(std::string const& _source)
 {
 	try
 	{
@@ -74,7 +74,7 @@ pair<bool, ErrorList> parse(string const& _source)
 	return {false, {}};
 }
 
-optional<Error> parseAndReturnFirstError(string const& _source, bool _allowWarningsAndInfos = true)
+std::optional<Error> parseAndReturnFirstError(std::string const& _source, bool _allowWarningsAndInfos = true)
 {
 	bool success;
 	ErrorList errors;
@@ -99,12 +99,12 @@ optional<Error> parseAndReturnFirstError(string const& _source, bool _allowWarni
 	return {};
 }
 
-bool successParse(string const& _source, bool _allowWarningsAndInfos = true)
+bool successParse(std::string const& _source, bool _allowWarningsAndInfos = true)
 {
 	return !parseAndReturnFirstError(_source, _allowWarningsAndInfos);
 }
 
-Error expectError(string const& _source, bool _allowWarningsAndInfos = false)
+Error expectError(std::string const& _source, bool _allowWarningsAndInfos = false)
 {
 
 	auto error = parseAndReturnFirstError(_source, _allowWarningsAndInfos);
@@ -112,18 +112,18 @@ Error expectError(string const& _source, bool _allowWarningsAndInfos = false)
 	return *error;
 }
 
-tuple<optional<SourceNameMap>, ErrorList> tryGetSourceLocationMapping(string _source)
+std::tuple<std::optional<SourceNameMap>, ErrorList> tryGetSourceLocationMapping(std::string _source)
 {
-	vector<string> lines;
+	std::vector<std::string> lines;
 	boost::split(lines, _source, boost::is_any_of("\n"));
-	string source = util::joinHumanReadablePrefixed(lines, "\n///") + "\n{}\n";
+	std::string source = util::joinHumanReadablePrefixed(lines, "\n///") + "\n{}\n";
 
 	ErrorList errors;
 	ErrorReporter reporter(errors);
 	Dialect const& dialect = yul::EVMDialect::strictAssemblyForEVM(EVMVersion::berlin());
 	ObjectParser objectParser{reporter, dialect};
 	CharStream stream(std::move(source), "");
-	auto object = objectParser.parse(make_shared<Scanner>(stream), false);
+	auto object = objectParser.parse(std::make_shared<Scanner>(stream), false);
 	BOOST_REQUIRE(object && object->debugData);
 	return {object->debugData->sourceNames, std::move(errors)};
 }
@@ -147,9 +147,9 @@ BOOST_AUTO_TEST_CASE(empty_code)
 
 BOOST_AUTO_TEST_CASE(recursion_depth)
 {
-	string input;
+	std::string input;
 	for (size_t i = 0; i < 20000; i++)
-		input += "object \"a" + to_string(i) + "\" { code {} ";
+		input += "object \"a" + std::to_string(i) + "\" { code {} ";
 	for (size_t i = 0; i < 20000; i++)
 		input += "}";
 
@@ -158,7 +158,7 @@ BOOST_AUTO_TEST_CASE(recursion_depth)
 
 BOOST_AUTO_TEST_CASE(to_string)
 {
-	string code = R"(
+	std::string code = R"(
 		object "O" {
 			code { let x := mload(0) if x { sstore(0, 1) } }
 			object "i" { code {} data "j" "def" }
@@ -166,7 +166,7 @@ BOOST_AUTO_TEST_CASE(to_string)
 			data "k" hex"010203"
 		}
 	)";
-	string expectation = R"(object "O" {
+	std::string expectation = R"(object "O" {
 	code {
 		let x := mload(0)
 		if x { sstore(0, 1) }
diff --git a/test/libyul/Parser.cpp b/test/libyul/Parser.cpp
index 511ed6c190..c9b9ec0727 100644
--- a/test/libyul/Parser.cpp
+++ b/test/libyul/Parser.cpp
@@ -39,7 +39,6 @@
 #include <optional>
 #include <string>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -53,14 +52,14 @@ namespace solidity::yul::test
 namespace
 {
 
-shared_ptr<Block> parse(string const& _source, Dialect const& _dialect, ErrorReporter& errorReporter)
+std::shared_ptr<Block> parse(std::string const& _source, Dialect const& _dialect, ErrorReporter& errorReporter)
 {
 	try
 	{
 		auto stream = CharStream(_source, "");
-		map<unsigned, shared_ptr<string const>> indicesToSourceNames;
-		indicesToSourceNames[0] = make_shared<string const>("source0");
-		indicesToSourceNames[1] = make_shared<string const>("source1");
+		std::map<unsigned, std::shared_ptr<std::string const>> indicesToSourceNames;
+		indicesToSourceNames[0] = std::make_shared<std::string const>("source0");
+		indicesToSourceNames[1] = std::make_shared<std::string const>("source1");
 
 		auto parserResult = yul::Parser(
 			errorReporter,
@@ -85,7 +84,7 @@ shared_ptr<Block> parse(string const& _source, Dialect const& _dialect, ErrorRep
 	return {};
 }
 
-std::optional<Error> parseAndReturnFirstError(string const& _source, Dialect const& _dialect, bool _allowWarningsAndInfos = true)
+std::optional<Error> parseAndReturnFirstError(std::string const& _source, Dialect const& _dialect, bool _allowWarningsAndInfos = true)
 {
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
@@ -145,7 +144,7 @@ BOOST_AUTO_TEST_CASE(builtins_analysis)
 		{
 			return _name == "builtin"_yulstring ? &f : nullptr;
 		}
-		BuiltinFunction f{"builtin"_yulstring, vector<Type>(2), vector<Type>(3), {}, {}, false, {}};
+		BuiltinFunction f{"builtin"_yulstring, std::vector<Type>(2), std::vector<Type>(3), {}, {}, false, {}};
 	};
 
 	SimpleDialect dialect;
@@ -158,7 +157,7 @@ BOOST_AUTO_TEST_CASE(default_types_set)
 {
 	ErrorList errorList;
 	ErrorReporter reporter(errorList);
-	shared_ptr<Block> result = parse(
+	std::shared_ptr<Block> result = parse(
 		"{"
 			"let x:bool := true:bool "
 			"let z:bool := true "
@@ -212,7 +211,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_empty_block)
 		"/// @src 0:234:543\n"
 		"{}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
 }
@@ -230,7 +229,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_with_children)
 			"let y := add(1, 2)\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
 	BOOST_REQUIRE_EQUAL(3, result->statements.size());
@@ -253,7 +252,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_different_sources)
 			"let y := add(1, 2)\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
 	BOOST_REQUIRE_EQUAL(3, result->statements.size());
@@ -275,7 +274,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_nested)
 			"switch y case 0 {} default {}\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
 	BOOST_REQUIRE_EQUAL(2, result->statements.size());
@@ -299,13 +298,13 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_block_switch_case)
 			"}\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "source0", 234, 543);
 
 	BOOST_REQUIRE_EQUAL(2, result->statements.size());
-	BOOST_REQUIRE(holds_alternative<Switch>(result->statements.at(1)));
-	auto const& switchStmt = get<Switch>(result->statements.at(1));
+	BOOST_REQUIRE(std::holds_alternative<Switch>(result->statements.at(1)));
+	auto const& switchStmt = std::get<Switch>(result->statements.at(1));
 
 	CHECK_LOCATION(switchStmt.debugData->originLocation, "source0", 343, 434);
 	BOOST_REQUIRE_EQUAL(1, switchStmt.cases.size());
@@ -331,7 +330,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_inherit_into_outer_scope)
 			"let y := add(1, 2)\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
 	CHECK_LOCATION(result->debugData->originLocation, "source0", 1, 100);
@@ -340,9 +339,9 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_inherit_into_outer_scope)
 	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 1, 100);
 
 	// First child element must be a block itself with one statement.
-	BOOST_REQUIRE(holds_alternative<Block>(result->statements.at(0)));
-	BOOST_REQUIRE_EQUAL(get<Block>(result->statements.at(0)).statements.size(), 1);
-	CHECK_LOCATION(originLocationOf(get<Block>(result->statements.at(0)).statements.at(0)), "source0", 123, 432);
+	BOOST_REQUIRE(std::holds_alternative<Block>(result->statements.at(0)));
+	BOOST_REQUIRE_EQUAL(std::get<Block>(result->statements.at(0)).statements.size(), 1);
+	CHECK_LOCATION(originLocationOf(std::get<Block>(result->statements.at(0)).statements.at(0)), "source0", 123, 432);
 
 	// The next two elements have an inherited source location from the prior inner scope.
 	CHECK_LOCATION(originLocationOf(result->statements.at(1)), "source0", 123, 432);
@@ -362,7 +361,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_assign_empty)
 			"a := true:bool\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0); // should still parse
 	BOOST_REQUIRE_EQUAL(2, result->statements.size());
 	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 123, 432);
@@ -383,7 +382,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_source_index)
 			"\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result); // should still parse
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -403,13 +402,13 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_1)
 			":= true:bool\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 
 	BOOST_REQUIRE_EQUAL(1, result->statements.size());
 	CHECK_LOCATION(originLocationOf(result->statements.at(0)), "source0", 123, 432);
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
+	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->statements.at(0));
 	CHECK_LOCATION(originLocationOf(*varDecl.value), "source0", 234, 2026);
 }
 
@@ -426,18 +425,18 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_2)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(1, result->statements.size());
 	CHECK_LOCATION(result->debugData->originLocation, "source0", 0, 5);
 
 	// `let x := add(1, `
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
+	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->statements.at(0));
 	CHECK_LOCATION(varDecl.debugData->originLocation, "source0", 0, 5);
 	BOOST_REQUIRE(!!varDecl.value);
-	BOOST_REQUIRE(holds_alternative<FunctionCall>(*varDecl.value));
-	FunctionCall const& call = get<FunctionCall>(*varDecl.value);
+	BOOST_REQUIRE(std::holds_alternative<FunctionCall>(*varDecl.value));
+	FunctionCall const& call = std::get<FunctionCall>(*varDecl.value);
 	CHECK_LOCATION(call.debugData->originLocation, "source1", 2, 3);
 
 	// `2`
@@ -460,26 +459,26 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_mixed_locations_3)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(2, result->statements.size());
 	CHECK_LOCATION(result->debugData->originLocation, "source1", 23, 45);
 
-	BOOST_REQUIRE(holds_alternative<Block>(result->statements.at(0)));
-	Block const& innerBlock = get<Block>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<Block>(result->statements.at(0)));
+	Block const& innerBlock = std::get<Block>(result->statements.at(0));
 	CHECK_LOCATION(innerBlock.debugData->originLocation, "source1", 23, 45);
 
 	BOOST_REQUIRE_EQUAL(1, innerBlock.statements.size());
-	BOOST_REQUIRE(holds_alternative<ExpressionStatement>(result->statements.at(1)));
-	ExpressionStatement const& sstoreStmt = get<ExpressionStatement>(innerBlock.statements.at(0));
-	BOOST_REQUIRE(holds_alternative<FunctionCall>(sstoreStmt.expression));
-	FunctionCall const& sstoreCall = get<FunctionCall>(sstoreStmt.expression);
+	BOOST_REQUIRE(std::holds_alternative<ExpressionStatement>(result->statements.at(1)));
+	ExpressionStatement const& sstoreStmt = std::get<ExpressionStatement>(innerBlock.statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<FunctionCall>(sstoreStmt.expression));
+	FunctionCall const& sstoreCall = std::get<FunctionCall>(sstoreStmt.expression);
 	CHECK_LOCATION(sstoreCall.debugData->originLocation, "source1", 23, 45);
 
-	BOOST_REQUIRE(holds_alternative<ExpressionStatement>(result->statements.at(1)));
-	ExpressionStatement mstoreStmt = get<ExpressionStatement>(result->statements.at(1));
-	BOOST_REQUIRE(holds_alternative<FunctionCall>(mstoreStmt.expression));
-	FunctionCall const& mstoreCall = get<FunctionCall>(mstoreStmt.expression);
+	BOOST_REQUIRE(std::holds_alternative<ExpressionStatement>(result->statements.at(1)));
+	ExpressionStatement mstoreStmt = std::get<ExpressionStatement>(result->statements.at(1));
+	BOOST_REQUIRE(std::holds_alternative<FunctionCall>(mstoreStmt.expression));
+	FunctionCall const& mstoreCall = std::get<FunctionCall>(mstoreStmt.expression);
 	CHECK_LOCATION(mstoreCall.debugData->originLocation, "source0", 420, 680);
 }
 
@@ -496,13 +495,13 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_comments_after_valid)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(1, result->statements.size());
 	CHECK_LOCATION(result->debugData->originLocation, "source1", 23, 45);
 
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
+	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->statements.at(0));
 	CHECK_LOCATION(varDecl.debugData->originLocation, "source0", 420, 680);
 }
 
@@ -515,7 +514,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_suffix)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -532,7 +531,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_invalid_prefix)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
 }
@@ -546,7 +545,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_unspecified)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "", -1, -1);
 }
@@ -560,7 +559,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_non_integer)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -577,7 +576,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_bad_integer)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -598,10 +597,10 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_ensure_last_match)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
+	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->statements.at(0));
 
 	// Ensure the latest @src per documentation-comment is used (0:30:40).
 	CHECK_LOCATION(varDecl.debugData->originLocation, "source0", 30, 40);
@@ -616,7 +615,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_no_whitespace)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -633,7 +632,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_separated_with_single_s
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "source1", 333, 444);
 }
@@ -644,7 +643,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_leading_trailing_whitespace)
 	ErrorReporter reporter(errorList);
 	auto const sourceText = "///     @src 0:111:222    \n{}";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
 }
@@ -661,10 +660,10 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_reference_original_sloc)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varDecl = get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
+	VariableDeclaration const& varDecl = std::get<VariableDeclaration>(result->statements.at(0));
 
 	// -1 points to original source code, which in this case is `"source0"` (which is also
 	CHECK_LOCATION(varDecl.debugData->originLocation, "", 10, 20);
@@ -683,19 +682,19 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets)
 		}
 	)~~~";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->statements.size(), 2);
 
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varX = get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
+	VariableDeclaration const& varX = std::get<VariableDeclaration>(result->statements.at(0));
 	CHECK_LOCATION(varX.debugData->originLocation, "source0", 149, 156);
 
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(1)));
-	VariableDeclaration const& varY = get<VariableDeclaration>(result->statements.at(1));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(1)));
+	VariableDeclaration const& varY = std::get<VariableDeclaration>(result->statements.at(1));
 	BOOST_REQUIRE(!!varY.value);
-	BOOST_REQUIRE(holds_alternative<Literal>(*varY.value));
-	Literal const& literal128 = get<Literal>(*varY.value);
+	BOOST_REQUIRE(std::holds_alternative<Literal>(*varY.value));
+	Literal const& literal128 = std::get<Literal>(*varY.value);
 	CHECK_LOCATION(literal128.debugData->originLocation, "source1", 96, 165);
 }
 
@@ -708,7 +707,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_empty_snippet)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
 }
@@ -722,7 +721,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_befo
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -739,7 +738,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_no_whitespace_afte
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "source0", 111, 222);
 }
@@ -753,7 +752,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_no_whites
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	CHECK_LOCATION(result->debugData->originLocation, "source1", 333, 444);
 }
@@ -767,7 +766,7 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_two_locations_with_snippets_untermina
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -788,19 +787,19 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_with_code_snippets_with_nested_locati
 		}
 	)~~~";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->statements.size(), 2);
 
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varX = get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
+	VariableDeclaration const& varX = std::get<VariableDeclaration>(result->statements.at(0));
 	CHECK_LOCATION(varX.debugData->originLocation, "source0", 149, 156);
 
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(1)));
-	VariableDeclaration const& varY = get<VariableDeclaration>(result->statements.at(1));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(1)));
+	VariableDeclaration const& varY = std::get<VariableDeclaration>(result->statements.at(1));
 	BOOST_REQUIRE(!!varY.value);
-	BOOST_REQUIRE(holds_alternative<Literal>(*varY.value));
-	Literal const& literal128 = get<Literal>(*varY.value);
+	BOOST_REQUIRE(std::holds_alternative<Literal>(*varY.value));
+	Literal const& literal128 = std::get<Literal>(*varY.value);
 	CHECK_LOCATION(literal128.debugData->originLocation, "source1", 96, 165);
 }
 
@@ -817,13 +816,13 @@ BOOST_AUTO_TEST_CASE(astid)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->debugData->astID == int64_t(7));
-	auto const& funDef = get<FunctionDefinition>(result->statements.at(0));
+	auto const& funDef = std::get<FunctionDefinition>(result->statements.at(0));
 	BOOST_CHECK(funDef.debugData->astID == int64_t(2));
-	BOOST_CHECK(funDef.parameters.at(0).debugData->astID == nullopt);
-	BOOST_CHECK(debugDataOf(result->statements.at(1))->astID == nullopt);
+	BOOST_CHECK(funDef.parameters.at(0).debugData->astID == std::nullopt);
+	BOOST_CHECK(debugDataOf(result->statements.at(1))->astID == std::nullopt);
 }
 
 BOOST_AUTO_TEST_CASE(astid_reset)
@@ -839,13 +838,13 @@ BOOST_AUTO_TEST_CASE(astid_reset)
 		}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->debugData->astID == int64_t(7));
-	auto const& funDef = get<FunctionDefinition>(result->statements.at(0));
+	auto const& funDef = std::get<FunctionDefinition>(result->statements.at(0));
 	BOOST_CHECK(funDef.debugData->astID == int64_t(2));
-	BOOST_CHECK(funDef.parameters.at(0).debugData->astID == nullopt);
-	BOOST_CHECK(debugDataOf(result->statements.at(1))->astID == nullopt);
+	BOOST_CHECK(funDef.parameters.at(0).debugData->astID == std::nullopt);
+	BOOST_CHECK(debugDataOf(result->statements.at(1))->astID == std::nullopt);
 }
 
 BOOST_AUTO_TEST_CASE(astid_multi)
@@ -857,7 +856,7 @@ BOOST_AUTO_TEST_CASE(astid_multi)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_CHECK(result->debugData->astID == int64_t(8));
 }
@@ -871,7 +870,7 @@ BOOST_AUTO_TEST_CASE(astid_invalid)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -888,7 +887,7 @@ BOOST_AUTO_TEST_CASE(astid_too_large)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -904,7 +903,7 @@ BOOST_AUTO_TEST_CASE(astid_way_too_large)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -920,7 +919,7 @@ BOOST_AUTO_TEST_CASE(astid_not_fully_numeric)
 		{}
 	)";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result);
 	BOOST_REQUIRE(errorList.size() == 1);
 	BOOST_TEST(errorList[0]->type() == Error::Type::SyntaxError);
@@ -942,12 +941,12 @@ BOOST_AUTO_TEST_CASE(customSourceLocations_multiple_src_tags_on_one_line)
 		"    let x := 123\n"
 		"}\n";
 	EVMDialectTyped const& dialect = EVMDialectTyped::instance(EVMVersion{});
-	shared_ptr<Block> result = parse(sourceText, dialect, reporter);
+	std::shared_ptr<Block> result = parse(sourceText, dialect, reporter);
 	BOOST_REQUIRE(!!result && errorList.size() == 0);
 	BOOST_REQUIRE_EQUAL(result->statements.size(), 1);
 
-	BOOST_REQUIRE(holds_alternative<VariableDeclaration>(result->statements.at(0)));
-	VariableDeclaration const& varX = get<VariableDeclaration>(result->statements.at(0));
+	BOOST_REQUIRE(std::holds_alternative<VariableDeclaration>(result->statements.at(0)));
+	VariableDeclaration const& varX = std::get<VariableDeclaration>(result->statements.at(0));
 	CHECK_LOCATION(varX.debugData->originLocation, "source1", 4, 5);
 }
 
diff --git a/test/libyul/StackLayoutGeneratorTest.cpp b/test/libyul/StackLayoutGeneratorTest.cpp
index 70fda680e3..02b03ccea7 100644
--- a/test/libyul/StackLayoutGeneratorTest.cpp
+++ b/test/libyul/StackLayoutGeneratorTest.cpp
@@ -43,9 +43,8 @@ using namespace solidity::yul;
 using namespace solidity::yul::test;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
-using namespace std;
 
-StackLayoutGeneratorTest::StackLayoutGeneratorTest(string const& _filename):
+StackLayoutGeneratorTest::StackLayoutGeneratorTest(std::string const& _filename):
 	TestCase(_filename)
 {
 	m_source = m_reader.source();
@@ -213,13 +212,13 @@ class StackLayoutPrinter
 	std::list<CFG::BasicBlock const*> m_blocksToPrint;
 };
 
-TestCase::TestResult StackLayoutGeneratorTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
+TestCase::TestResult StackLayoutGeneratorTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	ErrorList errors;
 	auto [object, analysisInfo] = parse(m_source, *m_dialect, errors);
 	if (!object || !analysisInfo || Error::containsErrors(errors))
 	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
+		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << std::endl;
 		return TestResult::FatalError;
 	}
 
diff --git a/test/libyul/StackShufflingTest.cpp b/test/libyul/StackShufflingTest.cpp
index 35130c11b1..7c85a931e2 100644
--- a/test/libyul/StackShufflingTest.cpp
+++ b/test/libyul/StackShufflingTest.cpp
@@ -25,9 +25,8 @@ using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::yul;
 using namespace solidity::yul::test;
-using namespace std;
 
-bool StackShufflingTest::parse(string const& _source)
+bool StackShufflingTest::parse(std::string const& _source)
 {
 	CharStream stream(_source, "");
 	Scanner scanner(stream);
@@ -48,14 +47,14 @@ bool StackShufflingTest::parse(string const& _source)
 		while (scanner.currentToken() != Token::RBrack &&
 			   scanner.currentToken() != Token::EOS)
 		{
-			string literal = scanner.currentLiteral();
+			std::string literal = scanner.currentLiteral();
 			if (literal == "RET")
 			{
 				scanner.next();
 				if (scanner.currentToken() == Token::LBrack)
 				{
 					scanner.next();
-					string functionName = scanner.currentLiteral();
+					std::string functionName = scanner.currentLiteral();
 					auto call = yul::FunctionCall{
 						{},	yul::Identifier{{}, YulString(functionName)}, {}
 					};
@@ -77,7 +76,7 @@ bool StackShufflingTest::parse(string const& _source)
 			{
 				expectToken(Token::LBrack);
 				scanner.next();
-				string functionName = scanner.currentLiteral();
+				std::string functionName = scanner.currentLiteral();
 				auto call = yul::FunctionCall{
 				    {},	yul::Identifier{{}, YulString(functionName)}, {}
 			    };
@@ -90,7 +89,7 @@ bool StackShufflingTest::parse(string const& _source)
 				});
 				expectToken(Token::RBrack);
 			}
-			else if (literal.find("0x") != string::npos || scanner.currentToken() == Token::Number)
+			else if (literal.find("0x") != std::string::npos || scanner.currentToken() == Token::Number)
 			{
 				stack.emplace_back(LiteralSlot{u256(literal)});
 			}
@@ -102,10 +101,10 @@ bool StackShufflingTest::parse(string const& _source)
 			{
 				expectToken(Token::LBrack);
 				scanner.next(); // read number of ghost variables as ghostVariableId
-				string ghostVariableId = scanner.currentLiteral();
+				std::string ghostVariableId = scanner.currentLiteral();
 				Scope::Variable ghostVar = Scope::Variable{""_yulstring, YulString(literal + "[" + ghostVariableId + "]")};
 				stack.emplace_back(VariableSlot{
-						m_variables.insert(make_pair(ghostVar.name, ghostVar)).first->second
+						m_variables.insert(std::make_pair(ghostVar.name, ghostVar)).first->second
 				});
 				expectToken(Token::RBrack);
 			}
@@ -129,50 +128,50 @@ bool StackShufflingTest::parse(string const& _source)
 	return parseStack(m_targetStack);
 }
 
-StackShufflingTest::StackShufflingTest(string const& _filename):
+StackShufflingTest::StackShufflingTest(std::string const& _filename):
 	TestCase(_filename)
 {
 	m_source = m_reader.source();
 	m_expectation = m_reader.simpleExpectations();
 }
 
-TestCase::TestResult StackShufflingTest::run(ostream& _stream, string const& _linePrefix, bool _formatted)
+TestCase::TestResult StackShufflingTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
 {
 	if (!parse(m_source))
 	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
+		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << std::endl;
 		return TestResult::FatalError;
 	}
 
-	ostringstream output;
+	std::ostringstream output;
 	createStackLayout(
 		m_sourceStack,
 		m_targetStack,
 		[&](unsigned _swapDepth) // swap
 		{
-			output << stackToString(m_sourceStack) << endl;
-			output << "SWAP" << _swapDepth << endl;
+			output << stackToString(m_sourceStack) << std::endl;
+			output << "SWAP" << _swapDepth << std::endl;
 		},
 		[&](StackSlot const& _slot) // dupOrPush
 		{
-			output << stackToString(m_sourceStack) << endl;
+			output << stackToString(m_sourceStack) << std::endl;
 			if (canBeFreelyGenerated(_slot))
-				output << "PUSH " << stackSlotToString(_slot) << endl;
+				output << "PUSH " << stackSlotToString(_slot) << std::endl;
 			else
 			{
 				if (auto depth = util::findOffset(m_sourceStack | ranges::views::reverse, _slot))
-					output << "DUP" << *depth + 1 << endl;
+					output << "DUP" << *depth + 1 << std::endl;
 				else
-					BOOST_THROW_EXCEPTION(runtime_error("Invalid DUP operation."));
+					BOOST_THROW_EXCEPTION(std::runtime_error("Invalid DUP operation."));
 			}
 		},
 		[&](){ // pop
-			output << stackToString(m_sourceStack) << endl;
-			output << "POP" << endl;
+			output << stackToString(m_sourceStack) << std::endl;
+			output << "POP" << std::endl;
 		}
     );
 
-	output << stackToString(m_sourceStack) << endl;
+	output << stackToString(m_sourceStack) << std::endl;
 	m_obtainedResult = output.str();
 
 	return checkResult(_stream, _linePrefix, _formatted);
diff --git a/test/libyul/SyntaxTest.cpp b/test/libyul/SyntaxTest.cpp
index 20aadcf19a..0201e047d8 100644
--- a/test/libyul/SyntaxTest.cpp
+++ b/test/libyul/SyntaxTest.cpp
@@ -30,7 +30,6 @@
 
 #include <test/Common.h>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::util;
 using namespace solidity::langutil;
@@ -40,10 +39,10 @@ using namespace solidity::frontend::test;
 void SyntaxTest::parseAndAnalyze()
 {
 	if (m_sources.sources.size() != 1)
-		BOOST_THROW_EXCEPTION(runtime_error{"Expected only one source for yul test."});
+		BOOST_THROW_EXCEPTION(std::runtime_error{"Expected only one source for yul test."});
 
-	string const& name = m_sources.sources.begin()->first;
-	string const& source = m_sources.sources.begin()->second;
+	std::string const& name = m_sources.sources.begin()->first;
+	std::string const& source = m_sources.sources.begin()->second;
 
 	ErrorList errorList{};
 	soltestAssert(m_dialect, "");
@@ -72,9 +71,9 @@ void SyntaxTest::parseAndAnalyze()
 
 }
 
-SyntaxTest::SyntaxTest(string const& _filename, langutil::EVMVersion _evmVersion):
+SyntaxTest::SyntaxTest(std::string const& _filename, langutil::EVMVersion _evmVersion):
 	CommonSyntaxTest(_filename, _evmVersion)
 {
-	string dialectName = m_reader.stringSetting("dialect", "evmTyped");
+	std::string dialectName = m_reader.stringSetting("dialect", "evmTyped");
 	m_dialect = &dialect(dialectName, solidity::test::CommonOptions::get().evmVersion());
 }
diff --git a/test/libyul/YulInterpreterTest.cpp b/test/libyul/YulInterpreterTest.cpp
index a1ada928b8..eb6a447d12 100644
--- a/test/libyul/YulInterpreterTest.cpp
+++ b/test/libyul/YulInterpreterTest.cpp
@@ -44,9 +44,8 @@ using namespace solidity::yul;
 using namespace solidity::yul::test;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
-using namespace std;
 
-YulInterpreterTest::YulInterpreterTest(string const& _filename):
+YulInterpreterTest::YulInterpreterTest(std::string const& _filename):
 	EVMVersionRestrictedTestCase(_filename)
 {
 	m_source = m_reader.source();
@@ -54,7 +53,7 @@ YulInterpreterTest::YulInterpreterTest(string const& _filename):
 	m_simulateExternalCallsToSelf = m_reader.boolSetting("simulateExternalCall", false);
 }
 
-TestCase::TestResult YulInterpreterTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
+TestCase::TestResult YulInterpreterTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	if (!parse(_stream, _linePrefix, _formatted))
 		return TestResult::FatalError;
@@ -64,7 +63,7 @@ TestCase::TestResult YulInterpreterTest::run(ostream& _stream, string const& _li
 	return checkResult(_stream, _linePrefix, _formatted);
 }
 
-bool YulInterpreterTest::parse(ostream& _stream, string const& _linePrefix, bool const _formatted)
+bool YulInterpreterTest::parse(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	YulStack stack(
 		solidity::test::CommonOptions::get().evmVersion(),
@@ -81,14 +80,14 @@ bool YulInterpreterTest::parse(ostream& _stream, string const& _linePrefix, bool
 	}
 	else
 	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
+		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << std::endl;
 		SourceReferenceFormatter{_stream, stack, true, false}
 			.printErrorInformation(stack.errors());
 		return false;
 	}
 }
 
-string YulInterpreterTest::interpret()
+std::string YulInterpreterTest::interpret()
 {
 	InterpreterState state;
 	state.maxTraceSize = 32;
@@ -108,7 +107,7 @@ string YulInterpreterTest::interpret()
 	{
 	}
 
-	stringstream result;
+	std::stringstream result;
 	state.dumpTraceAndState(result, false);
 	return result.str();
 }
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 6d7297c2c7..9fc6712db3 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -42,15 +42,14 @@ using namespace solidity::yul;
 using namespace solidity::yul::test;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
-using namespace std;
 
-YulOptimizerTest::YulOptimizerTest(string const& _filename):
+YulOptimizerTest::YulOptimizerTest(std::string const& _filename):
 	EVMVersionRestrictedTestCase(_filename)
 {
 	boost::filesystem::path path(_filename);
 
 	if (path.empty() || std::next(path.begin()) == path.end() || std::next(std::next(path.begin())) == path.end())
-		BOOST_THROW_EXCEPTION(runtime_error("Filename path has to contain a directory: \"" + _filename + "\"."));
+		BOOST_THROW_EXCEPTION(std::runtime_error("Filename path has to contain a directory: \"" + _filename + "\"."));
 	m_optimizerStep = std::prev(std::prev(path.end()))->string();
 
 	m_source = m_reader.source();
@@ -61,7 +60,7 @@ YulOptimizerTest::YulOptimizerTest(string const& _filename):
 	m_expectation = m_reader.simpleExpectations();
 }
 
-TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _linePrefix, bool const _formatted)
+TestCase::TestResult YulOptimizerTest::run(std::ostream& _stream, std::string const& _linePrefix, bool const _formatted)
 {
 	std::tie(m_object, m_analysisInfo) = parse(_stream, _linePrefix, _formatted, m_source);
 	if (!m_object)
@@ -75,7 +74,7 @@ TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _line
 
 	if (!tester.runStep())
 	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << endl;
+		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Invalid optimizer step: " << m_optimizerStep << std::endl;
 		return TestResult::FatalError;
 	}
 
@@ -86,7 +85,7 @@ TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _line
 	if (m_optimizerStep != "wordSizeTransform" && !std::get<0>(parse(_stream, _linePrefix, _formatted, printed)))
 	{
 		util::AnsiColorized(_stream, _formatted, {util::formatting::BOLD, util::formatting::CYAN})
-			<< _linePrefix << "Result after the optimiser:" << endl;
+			<< _linePrefix << "Result after the optimiser:" << std::endl;
 		printPrefixed(_stream, printed, _linePrefix + "  ");
 		return TestResult::FatalError;
 	}
@@ -97,20 +96,20 @@ TestCase::TestResult YulOptimizerTest::run(ostream& _stream, string const& _line
 }
 
 std::pair<std::shared_ptr<Object>, std::shared_ptr<AsmAnalysisInfo>> YulOptimizerTest::parse(
-	ostream& _stream,
-	string const& _linePrefix,
+	std::ostream& _stream,
+	std::string const& _linePrefix,
 	bool const _formatted,
-	string const& _source
+	std::string const& _source
 )
 {
 	ErrorList errors;
 	soltestAssert(m_dialect, "");
-	shared_ptr<Object> object;
-	shared_ptr<AsmAnalysisInfo> analysisInfo;
+	std::shared_ptr<Object> object;
+	std::shared_ptr<AsmAnalysisInfo> analysisInfo;
 	std::tie(object, analysisInfo) = yul::test::parse(_source, *m_dialect, errors);
 	if (!object || !analysisInfo || Error::containsErrors(errors))
 	{
-		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << endl;
+		AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing source." << std::endl;
 		CharStream charStream(_source, "");
 		SourceReferenceFormatter{_stream, SingletonCharStreamProvider(charStream), true, false}
 			.printErrorInformation(errors);
diff --git a/test/libyul/YulOptimizerTestCommon.cpp b/test/libyul/YulOptimizerTestCommon.cpp
index 31ab55e964..e529f1d95d 100644
--- a/test/libyul/YulOptimizerTestCommon.cpp
+++ b/test/libyul/YulOptimizerTestCommon.cpp
@@ -72,10 +72,9 @@ using namespace solidity::langutil;
 using namespace solidity::yul;
 using namespace solidity::yul::test;
 using namespace solidity::frontend;
-using namespace std;
 
 YulOptimizerTestCommon::YulOptimizerTestCommon(
-	shared_ptr<Object> _obj,
+	std::shared_ptr<Object> _obj,
 	Dialect const& _dialect
 )
 {
@@ -349,7 +348,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 			// Mark all variables with a name starting with "$" for escalation to memory.
 			struct FakeUnreachableGenerator: ASTWalker
 			{
-				map<YulString, vector<YulString>> fakeUnreachables;
+				std::map<YulString, std::vector<YulString>> fakeUnreachables;
 				using ASTWalker::operator();
 				void operator()(FunctionDefinition const& _function) override
 				{
@@ -388,7 +387,7 @@ YulOptimizerTestCommon::YulOptimizerTestCommon(
 	};
 }
 
-void YulOptimizerTestCommon::setStep(string const& _optimizerStep)
+void YulOptimizerTestCommon::setStep(std::string const& _optimizerStep)
 {
 	m_optimizerStep = _optimizerStep;
 }
@@ -407,7 +406,7 @@ bool YulOptimizerTestCommon::runStep()
 	return true;
 }
 
-string YulOptimizerTestCommon::randomOptimiserStep(unsigned _seed)
+std::string YulOptimizerTestCommon::randomOptimiserStep(unsigned _seed)
 {
 	std::mt19937 prng(_seed);
 	std::uniform_int_distribution<size_t> dist(1, m_namedSteps.size());
@@ -417,7 +416,7 @@ string YulOptimizerTestCommon::randomOptimiserStep(unsigned _seed)
 	{
 		if (count == idx)
 		{
-			string optimiserStep = step.first;
+			std::string optimiserStep = step.first;
 			// Do not fuzz mainFunction and wordSizeTransform
 			// because they do not preserve yul code semantics.
 			// Do not fuzz reasoning based simplifier because
@@ -437,7 +436,7 @@ string YulOptimizerTestCommon::randomOptimiserStep(unsigned _seed)
 	yulAssert(false, "Optimiser step selection failed.");
 }
 
-shared_ptr<Block> YulOptimizerTestCommon::run()
+std::shared_ptr<Block> YulOptimizerTestCommon::run()
 {
 	return runStep() ? m_ast : nullptr;
 }
@@ -451,8 +450,8 @@ void YulOptimizerTestCommon::disambiguate()
 
 void YulOptimizerTestCommon::updateContext()
 {
-	m_nameDispenser = make_unique<NameDispenser>(*m_dialect, *m_object->code, m_reservedIdentifiers);
-	m_context = make_unique<OptimiserStepContext>(OptimiserStepContext{
+	m_nameDispenser = std::make_unique<NameDispenser>(*m_dialect, *m_object->code, m_reservedIdentifiers);
+	m_context = std::make_unique<OptimiserStepContext>(OptimiserStepContext{
 		*m_dialect,
 		*m_nameDispenser,
 		m_reservedIdentifiers,

From 0022089d61479ec041ec329564b5dc12a5d9eaff Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 27 Nov 2023 14:53:59 -0300
Subject: [PATCH 1683/1748] Introduce `Cancun` EVM version

---
 .circleci/soltest_all.sh   | 2 +-
 Changelog.md               | 2 +-
 liblangutil/EVMVersion.h   | 6 ++++--
 scripts/tests.sh           | 2 +-
 solc/CommandLineParser.cpp | 2 +-
 test/EVMHost.cpp           | 2 ++
 6 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.circleci/soltest_all.sh b/.circleci/soltest_all.sh
index 4be427f192..1e941731da 100755
--- a/.circleci/soltest_all.sh
+++ b/.circleci/soltest_all.sh
@@ -31,7 +31,7 @@ REPODIR="$(realpath "$(dirname "$0")"/..)"
 # shellcheck source=scripts/common.sh
 source "${REPODIR}/scripts/common.sh"
 
-EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris shanghai)
+EVM_VALUES=(homestead byzantium constantinople petersburg istanbul berlin london paris shanghai cancun)
 DEFAULT_EVM=shanghai
 [[ " ${EVM_VALUES[*]} " =~ $DEFAULT_EVM ]]
 OPTIMIZE_VALUES=(0 1)
diff --git a/Changelog.md b/Changelog.md
index 01a77ce17f..23515d4444 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,7 +4,7 @@ Language Features:
 
 
 Compiler Features:
-
+ * EVM: Support for the EVM Version "Cancun".
 
 Bugfixes:
 
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index 9f0239624d..b68e9546a1 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -59,10 +59,11 @@ class EVMVersion:
 	static EVMVersion london() { return {Version::London}; }
 	static EVMVersion paris() { return {Version::Paris}; }
 	static EVMVersion shanghai() { return {Version::Shanghai}; }
+	static EVMVersion cancun() { return {Version::Cancun}; }
 
 	static std::optional<EVMVersion> fromString(std::string const& _version)
 	{
-		for (auto const& v: {homestead(), tangerineWhistle(), spuriousDragon(), byzantium(), constantinople(), petersburg(), istanbul(), berlin(), london(), paris(), shanghai()})
+		for (auto const& v: {homestead(), tangerineWhistle(), spuriousDragon(), byzantium(), constantinople(), petersburg(), istanbul(), berlin(), london(), paris(), shanghai(), cancun()})
 			if (_version == v.name())
 				return v;
 		return std::nullopt;
@@ -86,6 +87,7 @@ class EVMVersion:
 		case Version::London: return "london";
 		case Version::Paris: return "paris";
 		case Version::Shanghai: return "shanghai";
+		case Version::Cancun: return "cancun";
 		}
 		return "INVALID";
 	}
@@ -109,7 +111,7 @@ class EVMVersion:
 	bool canOverchargeGasForCall() const { return *this >= tangerineWhistle(); }
 
 private:
-	enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London, Paris, Shanghai };
+	enum class Version { Homestead, TangerineWhistle, SpuriousDragon, Byzantium, Constantinople, Petersburg, Istanbul, Berlin, London, Paris, Shanghai, Cancun };
 
 	EVMVersion(Version _version): m_version(_version) {}
 
diff --git a/scripts/tests.sh b/scripts/tests.sh
index cb1766d9a1..9df40e385c 100755
--- a/scripts/tests.sh
+++ b/scripts/tests.sh
@@ -105,7 +105,7 @@ EVM_VERSIONS="homestead byzantium"
 
 if [ -z "$CI" ]
 then
-    EVM_VERSIONS+=" constantinople petersburg istanbul berlin london paris shanghai"
+    EVM_VERSIONS+=" constantinople petersburg istanbul berlin london paris shanghai cancun"
 fi
 
 # And then run the Solidity unit-tests in the matrix combination of optimizer / no optimizer
diff --git a/solc/CommandLineParser.cpp b/solc/CommandLineParser.cpp
index 3ed1b7b634..6216af4a01 100644
--- a/solc/CommandLineParser.cpp
+++ b/solc/CommandLineParser.cpp
@@ -605,7 +605,7 @@ General Information)").c_str(),
 			g_strEVMVersion.c_str(),
 			po::value<std::string>()->value_name("version")->default_value(EVMVersion{}.name()),
 			"Select desired EVM version. Either homestead, tangerineWhistle, spuriousDragon, "
-			"byzantium, constantinople, petersburg, istanbul, berlin, london, paris or shanghai."
+			"byzantium, constantinople, petersburg, istanbul, berlin, london, paris, shanghai or cancun."
 		)
 	;
 	if (!_forHelp) // Note: We intentionally keep this undocumented for now.
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 81005547d2..2bc1da9652 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -118,6 +118,8 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 		m_evmRevision = EVMC_PARIS;
 	else if (_evmVersion == langutil::EVMVersion::shanghai())
 		m_evmRevision = EVMC_SHANGHAI;
+	else if (_evmVersion == langutil::EVMVersion::cancun())
+		m_evmRevision = EVMC_CANCUN;
 	else
 		assertThrow(false, Exception, "Unsupported EVM version");
 

From 5fcc8c7e3f0702e03f646c8c5b6c72a3d0006aaf Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 1 Dec 2023 13:17:20 +0100
Subject: [PATCH 1684/1748] Purge using namespace from test/solc

---
 scripts/check_style.sh                       |   1 +
 test/solc/CommandLineInterface.cpp           | 147 +++++++++----------
 test/solc/CommandLineInterfaceAllowPaths.cpp |  33 ++---
 test/solc/CommandLineParser.cpp              |  67 +++++----
 test/solc/Common.cpp                         |  21 ++-
 5 files changed, 133 insertions(+), 136 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 8ade99148f..78b5a6efd1 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -47,6 +47,7 @@ NAMESPACE_STD_FREE_FILES=(
     test/libsolidity/interface/*
     test/libsolidity/util/*
     test/libyul/*
+    test/solc/*
 )
 
 (
diff --git a/test/solc/CommandLineInterface.cpp b/test/solc/CommandLineInterface.cpp
index df57572a53..7a4f625c15 100644
--- a/test/solc/CommandLineInterface.cpp
+++ b/test/solc/CommandLineInterface.cpp
@@ -42,20 +42,19 @@
 #include <string>
 #include <vector>
 
-using namespace std;
 using namespace solidity::frontend;
 using namespace solidity::test;
 using namespace solidity::util;
 using namespace solidity::langutil;
 
-using PathSet = set<boost::filesystem::path>;
+using PathSet = std::set<boost::filesystem::path>;
 
 #define TEST_CASE_NAME (boost::unit_test::framework::current_test_case().p_name)
 
 namespace
 {
 
-ostream& operator<<(ostream& _out, vector<ImportRemapper::Remapping> const& _remappings)
+std::ostream& operator<<(std::ostream& _out, std::vector<ImportRemapper::Remapping> const& _remappings)
 {
 	static auto remappingToString = [](auto const& _remapping)
 	{
@@ -66,17 +65,17 @@ ostream& operator<<(ostream& _out, vector<ImportRemapper::Remapping> const& _rem
 	return _out;
 }
 
-ostream& operator<<(ostream& _out, map<string, string> const& _map)
+std::ostream& operator<<(std::ostream& _out, std::map<std::string, std::string> const& _map)
 {
-	_out << "{" << endl;
+	_out << "{" << std::endl;
 	for (auto const& [key, value]: _map)
-		_out << "" << key << ": " << value << "," << endl;
+		_out << "" << key << ": " << value << "," << std::endl;
 	_out << "}";
 
 	return _out;
 }
 
-ostream& operator<<(ostream& _out, PathSet const& _paths)
+std::ostream& operator<<(std::ostream& _out, PathSet const& _paths)
 {
 	static auto pathString = [](auto const& _path) { return _path.string(); };
 
@@ -93,15 +92,15 @@ namespace boost::test_tools::tt_detail
 // The recommended solution is to overload print_log_value<> struct and make it use our operator.
 
 template<>
-struct print_log_value<vector<ImportRemapper::Remapping>>
+struct print_log_value<std::vector<ImportRemapper::Remapping>>
 {
-	void operator()(std::ostream& _out, vector<ImportRemapper::Remapping> const& _value) { ::operator<<(_out, _value); }
+	void operator()(std::ostream& _out, std::vector<ImportRemapper::Remapping> const& _value) { ::operator<<(_out, _value); }
 };
 
 template<>
-struct print_log_value<map<string, string>>
+struct print_log_value<std::map<std::string, std::string>>
 {
-	void operator()(std::ostream& _out, map<string, string> const& _value) { ::operator<<(_out, _value); }
+	void operator()(std::ostream& _out, std::map<std::string, std::string> const& _value) { ::operator<<(_out, _value); }
 };
 
 template<>
@@ -149,7 +148,7 @@ BOOST_AUTO_TEST_CASE(version)
 
 BOOST_AUTO_TEST_CASE(multiple_input_modes)
 {
-	array<string, 10> inputModeOptions = {
+	std::array<std::string, 10> inputModeOptions = {
 		"--help",
 		"--license",
 		"--version",
@@ -161,13 +160,13 @@ BOOST_AUTO_TEST_CASE(multiple_input_modes)
 		"--import-ast",
 		"--import-asm-json",
 	};
-	string expectedMessage =
+	std::string expectedMessage =
 		"The following options are mutually exclusive: "
 		"--help, --license, --version, --standard-json, --link, --assemble, --strict-assembly, --yul, --import-ast, --lsp, --import-asm-json. "
 		"Select at most one.";
 
-	for (string const& mode1: inputModeOptions)
-		for (string const& mode2: inputModeOptions)
+	for (std::string const& mode1: inputModeOptions)
+		for (std::string const& mode2: inputModeOptions)
 			if (mode1 != mode2)
 				BOOST_CHECK_EXCEPTION(
 					parseCommandLineAndReadInputFiles({"solc", mode1, mode2}),
@@ -178,12 +177,12 @@ BOOST_AUTO_TEST_CASE(multiple_input_modes)
 
 BOOST_AUTO_TEST_CASE(no_import_callback_allowed_paths)
 {
-	array<string, 2> options = {
+	std::array<std::string, 2> options = {
 		"--no-import-callback",
 		"--allow-paths"
 	};
 
-	string expectedMessage =
+	std::string expectedMessage =
 		"The following options are mutually exclusive: "
 		"--no-import-callback, --allow-paths. "
 		"Select at most one.";
@@ -208,11 +207,11 @@ BOOST_AUTO_TEST_CASE(cli_input)
 	soltestAssert(expectedDir1.is_absolute() || expectedDir1.root_path() == "/", "");
 	soltestAssert(expectedDir2.is_absolute() || expectedDir2.root_path() == "/", "");
 
-	vector<ImportRemapper::Remapping> expectedRemappings = {
+	std::vector<ImportRemapper::Remapping> expectedRemappings = {
 		{"", "a", "b/c/d"},
 		{"a", "b", "c/d/e/"},
 	};
-	map<string, string> expectedSources = {
+	std::map<std::string, std::string> expectedSources = {
 		{"<stdin>", ""},
 		{(expectedDir1 / "input1.sol").generic_string(), ""},
 		{(expectedDir2 / "input2.sol").generic_string(), ""},
@@ -253,7 +252,7 @@ BOOST_AUTO_TEST_CASE(cli_ignore_missing_some_files_exist)
 	soltestAssert(expectedDir1.is_absolute() || expectedDir1.root_path() == "/", "");
 
 	// NOTE: Allowed paths should not be added for skipped files.
-	map<string, string> expectedSources = {{(expectedDir1 / "input1.sol").generic_string(), ""}};
+	std::map<std::string, std::string> expectedSources = {{(expectedDir1 / "input1.sol").generic_string(), ""}};
 	PathSet expectedAllowedPaths = {boost::filesystem::canonical(tempDir1)};
 
 	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles({
@@ -275,7 +274,7 @@ BOOST_AUTO_TEST_CASE(cli_ignore_missing_no_files_exist)
 {
 	TemporaryDirectory tempDir(TEST_CASE_NAME);
 
-	string expectedMessage =
+	std::string expectedMessage =
 		"Info: \"" + (tempDir.path() / "input1.sol").string() + "\" is not found. Skipping.\n"
 		"Info: \"" + (tempDir.path() / "input2.sol").string() + "\" is not found. Skipping.\n"
 		"Error: All specified input files either do not exist or are not regular files.\n";
@@ -295,7 +294,7 @@ BOOST_AUTO_TEST_CASE(cli_not_a_file)
 {
 	TemporaryDirectory tempDir(TEST_CASE_NAME);
 
-	string expectedMessage = "\"" + tempDir.path().string() + "\" is not a valid file.";
+	std::string expectedMessage = "\"" + tempDir.path().string() + "\" is not a valid file.";
 
 	BOOST_CHECK_EXCEPTION(
 		parseCommandLineAndReadInputFiles({"solc", tempDir.path().string()}),
@@ -352,7 +351,7 @@ BOOST_AUTO_TEST_CASE(standard_json_one_input_file)
 	TemporaryDirectory tempDir(TEST_CASE_NAME);
 	createFilesWithParentDirs({tempDir.path() / "input.json"});
 
-	vector<string> commandLine = {"solc", "--standard-json", (tempDir.path() / "input.json").string()};
+	std::vector<std::string> commandLine = {"solc", "--standard-json", (tempDir.path() / "input.json").string()};
 	OptionsReaderAndMessages result = parseCommandLineAndReadInputFiles(commandLine);
 	BOOST_TEST(result.success);
 	BOOST_TEST(result.stderrContent == "");
@@ -364,7 +363,7 @@ BOOST_AUTO_TEST_CASE(standard_json_one_input_file)
 
 BOOST_AUTO_TEST_CASE(standard_json_two_input_files)
 {
-	string expectedMessage =
+	std::string expectedMessage =
 		"Too many input files for --standard-json.\n"
 		"Please either specify a single file name or provide its content on standard input.";
 
@@ -377,7 +376,7 @@ BOOST_AUTO_TEST_CASE(standard_json_two_input_files)
 
 BOOST_AUTO_TEST_CASE(standard_json_one_input_file_and_stdin)
 {
-	string expectedMessage =
+	std::string expectedMessage =
 		"Too many input files for --standard-json.\n"
 		"Please either specify a single file name or provide its content on standard input.";
 
@@ -393,7 +392,7 @@ BOOST_AUTO_TEST_CASE(standard_json_ignore_missing)
 	TemporaryDirectory tempDir(TEST_CASE_NAME);
 
 	// This option is pretty much useless Standard JSON mode.
-	string expectedMessage =
+	std::string expectedMessage =
 		"All specified input files either do not exist or are not regular files.";
 
 	BOOST_CHECK_EXCEPTION(
@@ -410,7 +409,7 @@ BOOST_AUTO_TEST_CASE(standard_json_ignore_missing)
 
 BOOST_AUTO_TEST_CASE(standard_json_remapping)
 {
-	string expectedMessage =
+	std::string expectedMessage =
 		"Import remappings are not accepted on the command line in Standard JSON mode.\n"
 		"Please put them under 'settings.remappings' in the JSON input.";
 
@@ -437,7 +436,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_no_base_path)
 	boost::filesystem::path expectedOtherDir = "/" / otherDirNoSymlinks.relative_path();
 	soltestAssert(expectedOtherDir.is_absolute() || expectedOtherDir.root_path() == "/", "");
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 		"contract1.sol",                                   // Relative path
 		"c/d/contract2.sol",                               // Relative path with subdirectories
@@ -454,7 +453,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_no_base_path)
 	};
 	expectedOptions.modelChecker.initialize = true;
 
-	map<string, string> expectedSources = {
+	std::map<std::string, std::string> expectedSources = {
 		{"contract1.sol", ""},
 		{"c/d/contract2.sol", ""},
 		{"contract3.sol", ""},
@@ -497,7 +496,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_same_as_work_dir)
 	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
 	soltestAssert(expectedOtherDir.is_absolute() || expectedOtherDir.root_path() == "/", "");
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 		"--base-path=" + currentDirNoSymlinks.string(),
 		"contract1.sol",                                   // Relative path
@@ -516,7 +515,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_same_as_work_dir)
 	expectedOptions.input.basePath = currentDirNoSymlinks;
 	expectedOptions.modelChecker.initialize = true;
 
-	map<string, string> expectedSources = {
+	std::map<std::string, std::string> expectedSources = {
 		{"contract1.sol", ""},
 		{"c/d/contract2.sol", ""},
 		{"contract3.sol", ""},
@@ -566,7 +565,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_different_from_wor
 	soltestAssert(expectedOtherDir.is_absolute() || expectedOtherDir.root_path() == "/", "");
 	soltestAssert(expectedBaseDir.is_absolute() || expectedBaseDir.root_path() == "/", "");
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 		"--base-path=" + baseDirNoSymlinks.string(),
 		"contract1.sol",                                   // Relative path
@@ -587,7 +586,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_different_from_wor
 	expectedOptions.input.basePath = baseDirNoSymlinks;
 	expectedOptions.modelChecker.initialize = true;
 
-	map<string, string> expectedSources = {
+	std::map<std::string, std::string> expectedSources = {
 		{expectedWorkDir.generic_string() + "/contract1.sol", ""},
 		{expectedWorkDir.generic_string() + "/c/d/contract2.sol", ""},
 		{expectedCurrentDir.generic_string() + "/contract3.sol", ""},
@@ -632,7 +631,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_relative_base_path)
 	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
 	soltestAssert(expectedOtherDir.is_absolute() || expectedOtherDir.root_path() == "/", "");
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 		"--base-path=base",
 		"contract1.sol",                                       // Relative path outside of base path
@@ -655,7 +654,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_relative_base_path)
 	expectedOptions.input.basePath = "base";
 	expectedOptions.modelChecker.initialize = true;
 
-	map<string, string> expectedSources = {
+	std::map<std::string, std::string> expectedSources = {
 		{expectedWorkDir.generic_string() + "/contract1.sol", ""},
 		{"contract2.sol", ""},
 		{expectedWorkDir.generic_string() + "/contract3.sol", ""},
@@ -689,7 +688,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_normalization_and_weird_name
 	TemporaryWorkingDirectory tempWorkDir(tempDir.path() / "x/y/z");
 	soltestAssert(tempDir.path().is_absolute(), "");
 
-	string uncPath = "//" + tempDir.path().relative_path().generic_string();
+	std::string uncPath = "//" + tempDir.path().relative_path().generic_string();
 	soltestAssert(FileReader::isUNCPath(uncPath), "");
 
 	boost::filesystem::path tempDirNoSymlinks = boost::filesystem::canonical(tempDir);
@@ -697,7 +696,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_normalization_and_weird_name
 	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
 	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 
 #if !defined(_WIN32)
@@ -785,7 +784,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_normalization_and_weird_name
 	};
 	expectedOptions.modelChecker.initialize = true;
 
-	map<string, string> expectedSources = {
+	std::map<std::string, std::string> expectedSources = {
 #if !defined(_WIN32)
 		{"file:/c/d/contract1.sol", ""},
 		{"file:/c/d/contract2.sol", ""},
@@ -865,7 +864,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_symlinks)
 	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
 	soltestAssert(expectedWorkDir.is_absolute() || expectedWorkDir.root_path() == "/", "");
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 
 		"--base-path=../r/sym/z/",
@@ -885,7 +884,7 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_symlinks)
 	expectedOptions.input.basePath = "../r/sym/z/";
 	expectedOptions.modelChecker.initialize = true;
 
-	map<string, string> expectedSources = {
+	std::map<std::string, std::string> expectedSources = {
 		{"contract.sol", ""},
 		{(expectedWorkDir.parent_path() / "x/y/z/contract.sol").generic_string(), ""},
 		{"contract_symlink.sol", ""},
@@ -915,14 +914,14 @@ BOOST_AUTO_TEST_CASE(cli_paths_to_source_unit_names_base_path_and_stdin)
 
 	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::current_path().relative_path();
 
-	vector<string> commandLine = {"solc", "--base-path=base", "-"};
+	std::vector<std::string> commandLine = {"solc", "--base-path=base", "-"};
 
 	CommandLineOptions expectedOptions;
 	expectedOptions.input.addStdin = true;
 	expectedOptions.input.basePath = "base";
 	expectedOptions.modelChecker.initialize = true;
 
-	map<string, string> expectedSources = {
+	std::map<std::string, std::string> expectedSources = {
 		{"<stdin>", ""},
 	};
 	FileReader::FileSystemPathSet expectedAllowedDirectories = {};
@@ -944,7 +943,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 	TemporaryDirectory tempDir({"base/", "include/", "lib/nested/"}, TEST_CASE_NAME);
 	TemporaryWorkingDirectory tempWorkDir(tempDir);
 
-	string const mainContractSource = withPreamble(
+	std::string const mainContractSource = withPreamble(
 		"import \"contract.sol\";\n"
 		"import \"contract_via_callback.sol\";\n"
 		"import \"include.sol\";\n"
@@ -955,7 +954,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 		"import \"lib_via_callback.sol\";\n"
 	);
 
-	string const onlyPreamble = withPreamble("");
+	std::string const onlyPreamble = withPreamble("");
 	createFilesWithParentDirs(
 		{
 			tempDir.path() / "base/contract.sol",
@@ -974,7 +973,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 	boost::filesystem::path canonicalWorkDir = boost::filesystem::canonical(tempDir);
 	boost::filesystem::path expectedWorkDir = "/" / canonicalWorkDir.relative_path();
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 		"--no-color",
 		"--base-path=base/",
@@ -1005,7 +1004,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 	expectedOptions.formatting.coloredOutput = false;
 	expectedOptions.modelChecker.initialize = true;
 
-	map<string, string> expectedSources = {
+	std::map<std::string, std::string> expectedSources = {
 		{"main.sol", mainContractSource},
 		{"contract.sol", onlyPreamble},
 		{"contract_via_callback.sol", onlyPreamble},
@@ -1017,7 +1016,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 		{"lib_via_callback.sol", onlyPreamble},
 	};
 
-	vector<boost::filesystem::path> expectedIncludePaths = {
+	std::vector<boost::filesystem::path> expectedIncludePaths = {
 		expectedWorkDir / "include/",
 		expectedWorkDir / "lib/nested",
 		expectedWorkDir / "lib/",
@@ -1030,11 +1029,11 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 		canonicalWorkDir / "lib",
 	};
 
-	string const expectedStdoutContent = "Compiler run successful. No contracts to compile.\n";
+	std::string const expectedStdoutContent = "Compiler run successful. No contracts to compile.\n";
 	OptionsReaderAndMessages result = runCLI(commandLine, "");
 
 	BOOST_TEST(result.stderrContent == "");
-	if (SemVerVersion{string(VersionString)}.isPrerelease())
+	if (SemVerVersion{std::string(VersionString)}.isPrerelease())
 		BOOST_TEST(result.stdoutContent == "");
 	else
 		BOOST_TEST(result.stdoutContent == expectedStdoutContent);
@@ -1048,16 +1047,16 @@ BOOST_AUTO_TEST_CASE(cli_include_paths)
 
 BOOST_AUTO_TEST_CASE(cli_no_contracts_to_compile)
 {
-	string const contractSource = R"(
+	std::string const contractSource = R"(
 		// SPDX-License-Identifier: GPL-3.0
 		pragma solidity >=0.0;
 		enum Status { test }
 	)";
 
-	string const expectedStdoutContent = "Compiler run successful. No contracts to compile.\n";
+	std::string const expectedStdoutContent = "Compiler run successful. No contracts to compile.\n";
 	OptionsReaderAndMessages result = runCLI({"solc", "-"}, contractSource);
 
-	if (SemVerVersion{string(VersionString)}.isPrerelease())
+	if (SemVerVersion{std::string(VersionString)}.isPrerelease())
 		BOOST_TEST(result.stdoutContent == "");
 	else
 		BOOST_TEST(result.stdoutContent == expectedStdoutContent);
@@ -1066,17 +1065,17 @@ BOOST_AUTO_TEST_CASE(cli_no_contracts_to_compile)
 
 BOOST_AUTO_TEST_CASE(cli_no_output)
 {
-	string const contractSource = R"(
+	std::string const contractSource = R"(
 		// SPDX-License-Identifier: GPL-3.0
 		pragma solidity >=0.0;
 		abstract contract A {
 			function B() public virtual returns(uint);
 		})";
 
-	string const expectedStdoutContent = "Compiler run successful. No output generated.\n";
+	std::string const expectedStdoutContent = "Compiler run successful. No output generated.\n";
 	OptionsReaderAndMessages result = runCLI({"solc", "-"}, contractSource);
 
-	if (SemVerVersion{string(VersionString)}.isPrerelease())
+	if (SemVerVersion{std::string(VersionString)}.isPrerelease())
 		BOOST_TEST(result.stdoutContent == "");
 	else
 		BOOST_TEST(result.stdoutContent == expectedStdoutContent);
@@ -1088,14 +1087,14 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 	TemporaryDirectory tempDir({"base/", "include/", "lib/nested/"}, TEST_CASE_NAME);
 	TemporaryWorkingDirectory tempWorkDir(tempDir);
 
-	string const mainContractSource = withPreamble(
+	std::string const mainContractSource = withPreamble(
 		"import 'contract_via_callback.sol';\n"
 		"import 'include_via_callback.sol';\n"
 		"import 'nested_via_callback.sol';\n"
 		"import 'lib_via_callback.sol';\n"
 	);
 
-	string const standardJsonInput = R"(
+	std::string const standardJsonInput = R"(
 		{
 			"language": "Solidity",
 			"sources": {
@@ -1104,7 +1103,7 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 		}
 	)";
 
-	string const onlyPreamble = withPreamble("");
+	std::string const onlyPreamble = withPreamble("");
 	createFilesWithParentDirs(
 		{
 			tempDir.path() / "base/contract_via_callback.sol",
@@ -1117,7 +1116,7 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 
 	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::canonical(tempDir).relative_path();
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 		"--base-path=base/",
 		"--include-path=include/",
@@ -1141,14 +1140,14 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 	// NOTE: Source code from Standard JSON does not end up in FileReader. This is not a problem
 	// because FileReader is only used once to initialize the compiler stack and after that
 	// its sources are irrelevant (even though the callback still stores everything it loads).
-	map<string, string> expectedSources = {
+	std::map<std::string, std::string> expectedSources = {
 		{"contract_via_callback.sol", onlyPreamble},
 		{"include_via_callback.sol", onlyPreamble},
 		{"nested_via_callback.sol", onlyPreamble},
 		{"lib_via_callback.sol", onlyPreamble},
 	};
 
-	vector<boost::filesystem::path> expectedIncludePaths = {
+	std::vector<boost::filesystem::path> expectedIncludePaths = {
 		expectedWorkDir / "include/",
 		expectedWorkDir / "lib/nested",
 		expectedWorkDir / "lib/",
@@ -1159,15 +1158,15 @@ BOOST_AUTO_TEST_CASE(standard_json_include_paths)
 	OptionsReaderAndMessages result = runCLI(commandLine, standardJsonInput);
 
 	Json::Value parsedStdout;
-	string jsonParsingErrors;
+	std::string jsonParsingErrors;
 	BOOST_TEST(util::jsonParseStrict(result.stdoutContent, parsedStdout, &jsonParsingErrors));
 	BOOST_TEST(jsonParsingErrors == "");
 	for (Json::Value const& errorDict: parsedStdout["errors"])
 		// The error list might contain pre-release compiler warning
 		BOOST_TEST(errorDict["severity"] != "error");
 	BOOST_TEST(
-		(parsedStdout["sources"].getMemberNames() | ranges::to<set>) ==
-		(expectedSources | ranges::views::keys | ranges::to<set>) + set<string>{"main.sol"}
+		(parsedStdout["sources"].getMemberNames() | ranges::to<std::set>) ==
+		(expectedSources | ranges::views::keys | ranges::to<std::set>) + std::set<std::string>{"main.sol"}
 	);
 
 	BOOST_REQUIRE(result.success);
@@ -1184,7 +1183,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_empty_path)
 	TemporaryWorkingDirectory tempWorkDir(tempDir);
 	createFilesWithParentDirs({tempDir.path() / "base/main.sol"});
 
-	string expectedMessage = "Empty values are not allowed in --include-path.";
+	std::string expectedMessage = "Empty values are not allowed in --include-path.";
 
 	BOOST_CHECK_EXCEPTION(
 		parseCommandLineAndReadInputFiles({
@@ -1205,7 +1204,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_without_base_path)
 	TemporaryWorkingDirectory tempWorkDir(tempDir);
 	createFilesWithParentDirs({tempDir.path() / "contract.sol"});
 
-	string expectedMessage = "--include-path option requires a non-empty base path.";
+	std::string expectedMessage = "--include-path option requires a non-empty base path.";
 
 	BOOST_CHECK_EXCEPTION(
 		parseCommandLineAndReadInputFiles({"solc", "--include-path", "include/", "contract.sol"}),
@@ -1227,7 +1226,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_should_detect_source_unit_name_collisions
 
 	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::canonical(tempDir).relative_path();
 
-	string expectedMessage =
+	std::string expectedMessage =
 		"Source unit name collision detected. "
 		"The specified values of base path and/or include paths would result in multiple "
 		"input files being assigned the same source unit name:\n"
@@ -1275,7 +1274,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_should_detect_source_unit_name_collisions
 
 	{
 		// No conflict if files with the same name exist but only one is given to the compiler.
-		vector<string> commandLine = {
+		std::vector<std::string> commandLine = {
 			"solc",
 			"--base-path=dir3/",
 			"--include-path=dir1/",
@@ -1290,7 +1289,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_should_detect_source_unit_name_collisions
 
 	{
 		// The same file specified multiple times is not a conflict.
-		vector<string> commandLine = {
+		std::vector<std::string> commandLine = {
 			"solc",
 			"--base-path=dir3/",
 			"--include-path=dir1/",
@@ -1314,7 +1313,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_should_allow_duplicate_paths)
 	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::canonical(tempDir).relative_path();
 	boost::filesystem::path expectedTempDir = "/" / tempDir.path().relative_path();
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 		"--base-path=dir1/",
 		"--include-path", "dir1",
@@ -1330,7 +1329,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_should_allow_duplicate_paths)
 	};
 
 	// Duplicates do not affect the result but are not removed from the include path list.
-	vector<boost::filesystem::path> expectedIncludePaths = {
+	std::vector<boost::filesystem::path> expectedIncludePaths = {
 		expectedWorkDir / "dir1",
 		expectedWorkDir / "dir1",
 		expectedWorkDir / "dir1/",
@@ -1357,13 +1356,13 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_ambiguous_import)
 	TemporaryWorkingDirectory tempWorkDir(tempDir);
 
 	// Ambiguous: both base/contract.sol and include/contract.sol match the import.
-	string const mainContractSource = withPreamble("import \"contract.sol\";");
+	std::string const mainContractSource = withPreamble("import \"contract.sol\";");
 
 	createFilesWithParentDirs({"base/contract.sol", "include/contract.sol"}, withPreamble(""));
 
 	boost::filesystem::path expectedWorkDir = "/" / boost::filesystem::canonical(tempDir).relative_path();
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 		"--no-color",
 		"--base-path=base/",
@@ -1371,7 +1370,7 @@ BOOST_AUTO_TEST_CASE(cli_include_paths_ambiguous_import)
 		"-",
 	};
 
-	string expectedMessage =
+	std::string expectedMessage =
 		"Error: Source \"contract.sol\" not found: Ambiguous import. "
 		"Multiple matching files found inside base path and/or include paths: \"" +
 		(expectedWorkDir / "base/contract.sol").generic_string() + "\", \"" +
diff --git a/test/solc/CommandLineInterfaceAllowPaths.cpp b/test/solc/CommandLineInterfaceAllowPaths.cpp
index cd301819de..4fe603a4f1 100644
--- a/test/solc/CommandLineInterfaceAllowPaths.cpp
+++ b/test/solc/CommandLineInterfaceAllowPaths.cpp
@@ -35,7 +35,6 @@
 #include <string>
 #include <vector>
 
-using namespace std;
 using namespace solidity::frontend;
 using namespace solidity::util;
 using namespace solidity::test;
@@ -63,19 +62,19 @@ struct ImportCheck
 	static ImportCheck const OK() { return {Result::OK, ""}; }
 	static ImportCheck const FileNotFound() { return {Result::FileNotFound, ""}; }
 	static ImportCheck const PathDisallowed() { return {Result::PathDisallowed, ""}; }
-	static ImportCheck const Unknown(const string& _message) { return {Result::Unknown, _message}; }
+	static ImportCheck const Unknown(const std::string& _message) { return {Result::Unknown, _message}; }
 
 	Result result;
 	std::string message;
 };
 
 ImportCheck checkImport(
-	string const& _import,
-	vector<string> const& _cliOptions
+	std::string const& _import,
+	std::vector<std::string> const& _cliOptions
 )
 {
-	soltestAssert(regex_match(_import, regex{R"(import '[^']*')"}), "");
-	for (string const& option: _cliOptions)
+	soltestAssert(regex_match(_import, std::regex{R"(import '[^']*')"}), "");
+	for (std::string const& option: _cliOptions)
 		soltestAssert(
 			boost::starts_with(option, "--base-path") ||
 			boost::starts_with(option, "--include-path") ||
@@ -84,7 +83,7 @@ ImportCheck checkImport(
 			""
 		);
 
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 		"-",
 		"--no-color",
@@ -92,7 +91,7 @@ ImportCheck checkImport(
 	};
 	commandLine += _cliOptions;
 
-	string standardInputContent =
+	std::string standardInputContent =
 		"// SPDX-License-Identifier: GPL-3.0\n"
 		"pragma solidity >=0.0;\n" +
 		_import + ";";
@@ -101,7 +100,7 @@ ImportCheck checkImport(
 	if (cliResult.success)
 		return ImportCheck::OK();
 
-	static regex const sourceNotFoundErrorRegex{
+	static std::regex const sourceNotFoundErrorRegex{
 		R"(^Error \(6275\): Source "[^"]+" not found: (.*)\.\n)"
 		R"(\s*--> .*<stdin>:\d+:\d+:\n)"
 		R"(\s*\|\n)"
@@ -109,15 +108,15 @@ ImportCheck checkImport(
 		R"(\s*\| \^+\n\s*$)"
 	};
 
-	smatch submatches;
+	std::smatch submatches;
 	if (!regex_match(cliResult.stderrContent, submatches, sourceNotFoundErrorRegex))
 		return ImportCheck::Unknown("Unexpected stderr content: '" + cliResult.stderrContent + "'");
-	if (submatches[1] != "File not found" && !boost::starts_with(string(submatches[1]), "File outside of allowed directories"))
+	if (submatches[1] != "File not found" && !boost::starts_with(std::string(submatches[1]), "File outside of allowed directories"))
 		return ImportCheck::Unknown("Unexpected error message: '" + cliResult.stderrContent + "'");
 
 	if (submatches[1] == "File not found")
 		return ImportCheck::FileNotFound();
-	else if (boost::starts_with(string(submatches[1]), "File outside of allowed directories"))
+	else if (boost::starts_with(std::string(submatches[1]), "File outside of allowed directories"))
 		return ImportCheck::PathDisallowed();
 	else
 		return ImportCheck::Unknown("Unexpected error message '" + submatches[1].str() + "'");
@@ -175,11 +174,11 @@ class AllowPathsFixture
 	TemporaryWorkingDirectory m_tempWorkDir;
 	boost::filesystem::path const m_codeDir;
 	boost::filesystem::path const m_workDir;
-	string m_portablePrefix;
+	std::string m_portablePrefix;
 	bool m_caseSensitiveFilesystem = true;
 };
 
-ostream& operator<<(ostream& _out, ImportCheck const& _value)
+std::ostream& operator<<(std::ostream& _out, ImportCheck const& _value)
 {
 	switch (_value.result)
 	{
@@ -216,7 +215,7 @@ BOOST_AUTO_TEST_SUITE(CommandLineInterfaceAllowPathsTest)
 
 BOOST_FIXTURE_TEST_CASE(allow_path_multiple_paths, AllowPathsFixture)
 {
-	string allowedPaths =
+	std::string allowedPaths =
 		m_codeDir.generic_string() + "/a/b/X.sol," +
 		m_codeDir.generic_string() + "/X/," +
 		m_codeDir.generic_string() + "/z," +
@@ -230,7 +229,7 @@ BOOST_FIXTURE_TEST_CASE(allow_path_multiple_paths, AllowPathsFixture)
 
 BOOST_FIXTURE_TEST_CASE(allow_path_should_work_with_various_path_forms, AllowPathsFixture)
 {
-	string import = "import '" + m_portablePrefix + "/a/b/c.sol'";
+	std::string import = "import '" + m_portablePrefix + "/a/b/c.sol'";
 
 	// Without --allow-path
 	BOOST_TEST(checkImport(import, {}) == ImportCheck::PathDisallowed());
@@ -343,7 +342,7 @@ BOOST_FIXTURE_TEST_CASE(allow_path_should_work_with_various_import_forms, AllowP
 	// UNC paths in imports.
 	// Unfortunately can't test it on Windows without having an existing UNC path. On Linux we can
 	// at least rely on the fact that `//` works like `/`.
-	string uncImportPath = "/" + m_portablePrefix + "/a/b/c.sol";
+	std::string uncImportPath = "/" + m_portablePrefix + "/a/b/c.sol";
 	soltestAssert(FileReader::isUNCPath(uncImportPath), "");
 	BOOST_TEST(checkImport("import '" + uncImportPath + "'", {"--allow-paths", "../code/a/b/c.sol"}) == ImportCheck::PathDisallowed());
 #endif
diff --git a/test/solc/CommandLineParser.cpp b/test/solc/CommandLineParser.cpp
index 28ca2c48a1..e0592da5d1 100644
--- a/test/solc/CommandLineParser.cpp
+++ b/test/solc/CommandLineParser.cpp
@@ -38,7 +38,6 @@
 #include <string>
 #include <vector>
 
-using namespace std;
 using namespace solidity::frontend;
 using namespace solidity::langutil;
 using namespace solidity::util;
@@ -47,9 +46,9 @@ using namespace solidity::yul;
 namespace
 {
 
-CommandLineOptions parseCommandLine(vector<string> const& _commandLine)
+CommandLineOptions parseCommandLine(std::vector<std::string> const& _commandLine)
 {
-	vector<char const*> argv = test::makeArgv(_commandLine);
+	std::vector<char const*> argv = test::makeArgv(_commandLine);
 
 	CommandLineParser cliParser;
 	cliParser.parse(static_cast<int>(_commandLine.size()), argv.data());
@@ -65,7 +64,7 @@ BOOST_AUTO_TEST_SUITE(CommandLineParserTest)
 
 BOOST_AUTO_TEST_CASE(no_options)
 {
-	vector<string> commandLine = {"solc", "contract.sol"};
+	std::vector<std::string> commandLine = {"solc", "contract.sol"};
 
 	CommandLineOptions expectedOptions;
 	expectedOptions.input.paths = {"contract.sol"};
@@ -79,7 +78,7 @@ BOOST_AUTO_TEST_CASE(no_options)
 
 BOOST_AUTO_TEST_CASE(help_license_version)
 {
-	map<string, InputMode> expectedModePerOption = {
+	std::map<std::string, InputMode> expectedModePerOption = {
 		{"--help", InputMode::Help},
 		{"--license", InputMode::License},
 		{"--version", InputMode::Version},
@@ -100,7 +99,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 {
 	for (InputMode inputMode: {InputMode::Compiler, InputMode::CompilerWithASTImport})
 	{
-		vector<string> commandLine = {
+		std::vector<std::string> commandLine = {
 			"solc",
 			"contract.sol",             // Both modes do not care about file names, just about
 			"/tmp/projects/token.sol",  // their content. They also both support stdin.
@@ -157,7 +156,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 		};
 
 		if (inputMode == InputMode::CompilerWithASTImport)
-			commandLine += vector<string>{
+			commandLine += std::vector<std::string>{
 				"--import-ast",
 			};
 
@@ -234,7 +233,7 @@ BOOST_AUTO_TEST_CASE(cli_mode_options)
 
 BOOST_AUTO_TEST_CASE(no_cbor_metadata)
 {
-	vector<string> commandLine = {"solc", "--no-cbor-metadata", "contract.sol"};
+	std::vector<std::string> commandLine = {"solc", "--no-cbor-metadata", "contract.sol"};
 	CommandLineOptions parsedOptions = parseCommandLine(commandLine);
 	bool assert = parsedOptions.metadata.format == CompilerStack::MetadataFormat::NoMetadata;
 
@@ -263,13 +262,13 @@ BOOST_AUTO_TEST_CASE(no_import_callback)
 BOOST_AUTO_TEST_CASE(via_ir_options)
 {
 	BOOST_TEST(!parseCommandLine({"solc", "contract.sol"}).output.viaIR);
-	for (string viaIrOption: {"--via-ir", "--experimental-via-ir"})
+	for (std::string viaIrOption: {"--via-ir", "--experimental-via-ir"})
 		BOOST_TEST(parseCommandLine({"solc", viaIrOption, "contract.sol"}).output.viaIR);
 }
 
 BOOST_AUTO_TEST_CASE(assembly_mode_options)
 {
-	static vector<tuple<vector<string>, YulStack::Machine, YulStack::Language>> const allowedCombinations = {
+	static std::vector<std::tuple<std::vector<std::string>, YulStack::Machine, YulStack::Language>> const allowedCombinations = {
 		{{"--machine=evm", "--yul-dialect=evm", "--assemble"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
 		{{"--machine=evm", "--yul-dialect=evm", "--yul"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
 		{{"--machine=evm", "--yul-dialect=evm", "--strict-assembly"}, YulStack::Machine::EVM, YulStack::Language::StrictAssembly},
@@ -283,7 +282,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 
 	for (auto const& [assemblyOptions, expectedMachine, expectedLanguage]: allowedCombinations)
 	{
-		vector<string> commandLine = {
+		std::vector<std::string> commandLine = {
 			"solc",
 			"contract.yul",
 			"/tmp/projects/token.yul",
@@ -317,7 +316,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 		};
 		commandLine += assemblyOptions;
 		if (expectedLanguage == YulStack::Language::StrictAssembly)
-			commandLine += vector<string>{
+			commandLine += std::vector<std::string>{
 				"--optimize",
 				"--optimize-runs=1000",
 				"--yul-optimizations=agf",
@@ -370,7 +369,7 @@ BOOST_AUTO_TEST_CASE(assembly_mode_options)
 
 BOOST_AUTO_TEST_CASE(standard_json_mode_options)
 {
-	vector<string> commandLine = {
+	std::vector<std::string> commandLine = {
 		"solc",
 		"input.json",
 		"--standard-json",
@@ -420,7 +419,7 @@ BOOST_AUTO_TEST_CASE(standard_json_mode_options)
 
 BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 {
-	map<string, vector<string>> invalidOptionInputModeCombinations = {
+	std::map<std::string, std::vector<std::string>> invalidOptionInputModeCombinations = {
 		// TODO: This should eventually contain all options.
 		{"--experimental-via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
 		{"--via-ir", {"--assemble", "--yul", "--strict-assembly", "--standard-json", "--link"}},
@@ -439,16 +438,16 @@ BOOST_AUTO_TEST_CASE(invalid_options_input_modes_combinations)
 	};
 
 	for (auto const& [optionName, inputModes]: invalidOptionInputModeCombinations)
-		for (string const& inputMode: inputModes)
+		for (std::string const& inputMode: inputModes)
 		{
-			stringstream serr;
+			std::stringstream serr;
 			size_t separatorPosition = optionName.find("=");
-			string optionNameWithoutValue = optionName.substr(0, separatorPosition);
+			std::string optionNameWithoutValue = optionName.substr(0, separatorPosition);
 			soltestAssert(!optionNameWithoutValue.empty());
 
-			vector<string> commandLine = {"solc", optionName, "file", inputMode};
+			std::vector<std::string> commandLine = {"solc", optionName, "file", inputMode};
 
-			string expectedMessage = "The following options are not supported in the current input mode: " + optionNameWithoutValue;
+			std::string expectedMessage = "The following options are not supported in the current input mode: " + optionNameWithoutValue;
 			auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedMessage; };
 
 			BOOST_CHECK_EXCEPTION(parseCommandLine(commandLine), CommandLineValidationError, hasCorrectMessage);
@@ -464,7 +463,7 @@ BOOST_AUTO_TEST_CASE(optimizer_flags)
 	OptimiserSettings evmasmOnly = OptimiserSettings::standard();
 	evmasmOnly.runYulOptimiser = false;
 
-	map<vector<string>, OptimiserSettings> settingsMap = {
+	std::map<std::vector<std::string>, OptimiserSettings> settingsMap = {
 		{{}, OptimiserSettings::minimal()},
 		{{"--optimize"}, OptimiserSettings::standard()},
 		{{"--no-optimize-yul"}, OptimiserSettings::minimal()},
@@ -473,7 +472,7 @@ BOOST_AUTO_TEST_CASE(optimizer_flags)
 		{{"--optimize", "--optimize-yul"}, OptimiserSettings::standard()},
 	};
 
-	map<InputMode, string> inputModeFlagMap = {
+	std::map<InputMode, std::string> inputModeFlagMap = {
 		{InputMode::Compiler, ""},
 		{InputMode::CompilerWithASTImport, "--import-ast"},
 		{InputMode::Assembler, "--strict-assembly"},
@@ -482,7 +481,7 @@ BOOST_AUTO_TEST_CASE(optimizer_flags)
 	for (auto const& [inputMode, inputModeFlag]: inputModeFlagMap)
 		for (auto const& [optimizerFlags, expectedOptimizerSettings]: settingsMap)
 		{
-			vector<string> commandLine = {"solc", inputModeFlag, "file"};
+			std::vector<std::string> commandLine = {"solc", inputModeFlag, "file"};
 			commandLine += optimizerFlags;
 			BOOST_CHECK(parseCommandLine(commandLine).optimiserSettings() == expectedOptimizerSettings);
 		}
@@ -497,7 +496,7 @@ BOOST_AUTO_TEST_CASE(default_optimiser_sequence)
 
 BOOST_AUTO_TEST_CASE(valid_optimiser_sequences)
 {
-	vector<string> validSequenceInputs {
+	std::vector<std::string> validSequenceInputs {
 		":",                         // Empty optimization sequence and empty cleanup sequence
 		":fDn",                      // Empty optimization sequence and specified cleanup sequence
 		"dhfoDgvulfnTUtnIf:",        // Specified optimization sequence and empty cleanup sequence
@@ -508,7 +507,7 @@ BOOST_AUTO_TEST_CASE(valid_optimiser_sequences)
 		"a[[a][[aa]aa[aa]][]]aaa[aa[aa[aa]]]a[a][a][a]a[a]" // Nested brackets
 	};
 
-	vector<tuple<string, string>> const expectedParsedSequences {
+	std::vector<std::tuple<std::string, std::string>> const expectedParsedSequences {
 		{"", ""},
 		{"", "fDn"},
 		{"dhfoDgvulfnTUtnIf", ""},
@@ -532,7 +531,7 @@ BOOST_AUTO_TEST_CASE(valid_optimiser_sequences)
 
 BOOST_AUTO_TEST_CASE(invalid_optimiser_sequences)
 {
-	vector<string> const invalidSequenceInputs {
+	std::vector<std::string> const invalidSequenceInputs {
 		"abcdefg{hijklmno}pqr[st]uvwxyz", // Invalid abbreviation
 		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
 		"[[[[[[[[[[[[[[[[[[[[[[[[[[[[[["
@@ -550,7 +549,7 @@ BOOST_AUTO_TEST_CASE(invalid_optimiser_sequences)
 		"dhfoDgvulfnTU:tnIf:fdN"          // Too many cleanup sequence delimiters
 	};
 
-	vector<string> const expectedErrorMessages {
+	std::vector<std::string> const expectedErrorMessages {
 		"'b' is not a valid step abbreviation",
 		"Brackets nested too deep",
 		"Unbalanced brackets",
@@ -561,12 +560,12 @@ BOOST_AUTO_TEST_CASE(invalid_optimiser_sequences)
 
 	BOOST_CHECK_EQUAL(invalidSequenceInputs.size(), expectedErrorMessages.size());
 
-	string const baseExpectedErrorMessage = "Invalid optimizer step sequence in --yul-optimizations: ";
+	std::string const baseExpectedErrorMessage = "Invalid optimizer step sequence in --yul-optimizations: ";
 
 	for (size_t i = 0; i < invalidSequenceInputs.size(); ++i)
 	{
-		vector<string> const commandLineOptions = {"solc", "contract.sol", "--optimize", "--yul-optimizations=" + invalidSequenceInputs[i]};
-		string const expectedErrorMessage = baseExpectedErrorMessage + expectedErrorMessages[i];
+		std::vector<std::string> const commandLineOptions = {"solc", "contract.sol", "--optimize", "--yul-optimizations=" + invalidSequenceInputs[i]};
+		std::string const expectedErrorMessage = baseExpectedErrorMessage + expectedErrorMessages[i];
 		auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedErrorMessage; };
 		BOOST_CHECK_EXCEPTION(parseCommandLine(commandLineOptions), CommandLineValidationError, hasCorrectMessage);
 	}
@@ -574,14 +573,14 @@ BOOST_AUTO_TEST_CASE(invalid_optimiser_sequences)
 
 BOOST_AUTO_TEST_CASE(valid_empty_optimizer_sequences_without_optimize)
 {
-	vector<string> const validSequenceInputs {
+	std::vector<std::string> const validSequenceInputs {
 		"   :",
 		": ",
 		"\n : \n",
 		":"
 	};
 
-	vector<tuple<string, string>> const expectedParsedSequences {
+	std::vector<std::tuple<std::string, std::string>> const expectedParsedSequences {
 		{"   ", ""},
 		{"", " "},
 		{"\n ", " \n"},
@@ -601,9 +600,9 @@ BOOST_AUTO_TEST_CASE(valid_empty_optimizer_sequences_without_optimize)
 
 BOOST_AUTO_TEST_CASE(invalid_optimizer_sequence_without_optimize)
 {
-	string const invalidSequence{"u: "};
-	string const expectedErrorMessage{"--yul-optimizations is invalid with a non-empty sequence if Yul optimizer is disabled."};
-	vector<string> commandLineOptions{"solc", "contract.sol", "--yul-optimizations=" + invalidSequence};
+	std::string const invalidSequence{"u: "};
+	std::string const expectedErrorMessage{"--yul-optimizations is invalid with a non-empty sequence if Yul optimizer is disabled."};
+	std::vector<std::string> commandLineOptions{"solc", "contract.sol", "--yul-optimizations=" + invalidSequence};
 	auto hasCorrectMessage = [&](CommandLineValidationError const& _exception) { return _exception.what() == expectedErrorMessage; };
 	BOOST_CHECK_EXCEPTION(parseCommandLine(commandLineOptions), CommandLineValidationError, hasCorrectMessage);
 }
diff --git a/test/solc/Common.cpp b/test/solc/Common.cpp
index 24acd6b6c8..6b6b69956f 100644
--- a/test/solc/Common.cpp
+++ b/test/solc/Common.cpp
@@ -23,13 +23,12 @@
 
 #include <sstream>
 
-using namespace std;
 using namespace solidity::frontend;
 
-vector<char const*> test::makeArgv(vector<string> const& _commandLine)
+std::vector<char const*> test::makeArgv(std::vector<std::string> const& _commandLine)
 {
 	size_t argc = _commandLine.size();
-	vector<char const*> argv(_commandLine.size() + 1);
+	std::vector<char const*> argv(_commandLine.size() + 1);
 
 	// C++ standard mandates argv[argc] to be NULL
 	argv[argc] = nullptr;
@@ -41,12 +40,12 @@ vector<char const*> test::makeArgv(vector<string> const& _commandLine)
 }
 
 test::OptionsReaderAndMessages test::parseCommandLineAndReadInputFiles(
-	vector<string> const& _commandLine,
-	string const& _standardInputContent
+	std::vector<std::string> const& _commandLine,
+	std::string const& _standardInputContent
 )
 {
-	vector<char const*> argv = makeArgv(_commandLine);
-	stringstream sin(_standardInputContent), sout, serr;
+	std::vector<char const*> argv = makeArgv(_commandLine);
+	std::stringstream sin(_standardInputContent), sout, serr;
 	CommandLineInterface cli(sin, sout, serr);
 	bool success = cli.parseArguments(static_cast<int>(_commandLine.size()), argv.data());
 	cli.readInputFiles();
@@ -62,12 +61,12 @@ test::OptionsReaderAndMessages test::parseCommandLineAndReadInputFiles(
 }
 
 test::OptionsReaderAndMessages test::runCLI(
-	vector<string> const& _commandLine,
-	string const& _standardInputContent
+	std::vector<std::string> const& _commandLine,
+	std::string const& _standardInputContent
 )
 {
-	vector<char const*> argv = makeArgv(_commandLine);
-	stringstream sin(_standardInputContent), sout, serr;
+	std::vector<char const*> argv = makeArgv(_commandLine);
+	std::stringstream sin(_standardInputContent), sout, serr;
 	CommandLineInterface cli(sin, sout, serr);
 	bool success = cli.run(static_cast<int>(_commandLine.size()), argv.data());
 

From abb0f081dc33eac65ee05ce6216f21ddcdc4e7da Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 1 Dec 2023 14:21:03 +0100
Subject: [PATCH 1685/1748] Purge using namespace from tools/yulInterpreter

---
 scripts/check_style.sh                        |  1 +
 .../EVMInstructionInterpreter.cpp             | 21 ++++-----
 test/tools/yulInterpreter/Inspector.cpp       | 38 +++++++--------
 test/tools/yulInterpreter/Interpreter.cpp     | 47 +++++++++----------
 4 files changed, 52 insertions(+), 55 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 78b5a6efd1..00230c4a4a 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -48,6 +48,7 @@ NAMESPACE_STD_FREE_FILES=(
     test/libsolidity/util/*
     test/libyul/*
     test/solc/*
+    test/tools/yulInterpreter/*
 )
 
 (
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 132066f4ad..79dbc554a2 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -34,7 +34,6 @@
 
 #include <limits>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::evmasm;
 using namespace solidity::yul;
@@ -78,7 +77,7 @@ namespace solidity::yul::test
 /// @a _target at offset @a _targetOffset. Behaves as if @a _source would
 /// continue with an infinite sequence of zero bytes beyond its end.
 void copyZeroExtended(
-	map<u256, uint8_t>& _target, bytes const& _source,
+	std::map<u256, uint8_t>& _target, bytes const& _source,
 	size_t _targetOffset, size_t _sourceOffset, size_t _size
 )
 {
@@ -92,7 +91,7 @@ using u512 = boost::multiprecision::number<boost::multiprecision::cpp_int_backen
 
 u256 EVMInstructionInterpreter::eval(
 	evmasm::Instruction _instruction,
-	vector<u256> const& _arguments
+	std::vector<u256> const& _arguments
 )
 {
 	using namespace solidity::evmasm;
@@ -457,18 +456,18 @@ u256 EVMInstructionInterpreter::eval(
 
 u256 EVMInstructionInterpreter::evalBuiltin(
 	BuiltinFunctionForEVM const& _fun,
-	vector<Expression> const& _arguments,
-	vector<u256> const& _evaluatedArguments
+	std::vector<Expression> const& _arguments,
+	std::vector<u256> const& _evaluatedArguments
 )
 {
 	if (_fun.instruction)
 		return eval(*_fun.instruction, _evaluatedArguments);
 
-	string fun = _fun.name.str();
+	std::string fun = _fun.name.str();
 	// Evaluate datasize/offset/copy instructions
 	if (fun == "datasize" || fun == "dataoffset")
 	{
-		string arg = std::get<Literal>(_arguments.at(0)).value.str();
+		std::string arg = std::get<Literal>(_arguments.at(0)).value.str();
 		if (arg.length() < 32)
 			arg.resize(32, 0);
 		if (fun == "datasize")
@@ -492,7 +491,7 @@ u256 EVMInstructionInterpreter::evalBuiltin(
 				m_state.memory,
 				m_state.code,
 				size_t(_evaluatedArguments.at(0)),
-				size_t(_evaluatedArguments.at(1) & numeric_limits<size_t>::max()),
+				size_t(_evaluatedArguments.at(1) & std::numeric_limits<size_t>::max()),
 				size_t(_evaluatedArguments.at(2))
 			);
 		return 0;
@@ -512,10 +511,10 @@ bool EVMInstructionInterpreter::accessMemory(u256 const& _offset, u256 const& _s
 	else if (((_offset + _size) >= _offset) && ((_offset + _size + 0x1f) >= (_offset + _size)))
 	{
 		u256 newSize = (_offset + _size + 0x1f) & ~u256(0x1f);
-		m_state.msize = max(m_state.msize, newSize);
+		m_state.msize = std::max(m_state.msize, newSize);
 		// We only record accesses to contiguous memory chunks that are at most s_maxRangeSize bytes
 		// in size and at an offset of at most numeric_limits<size_t>::max() - s_maxRangeSize
-		return _size <= s_maxRangeSize && _offset <= u256(numeric_limits<size_t>::max() - s_maxRangeSize);
+		return _size <= s_maxRangeSize && _offset <= u256(std::numeric_limits<size_t>::max() - s_maxRangeSize);
 	}
 	else
 		m_state.msize = u256(-1);
@@ -567,7 +566,7 @@ void EVMInstructionInterpreter::logTrace(
 {
 	if (!(_writesToMemory && memWriteTracingDisabled()))
 	{
-		string message = _pseudoInstruction + "(";
+		std::string message = _pseudoInstruction + "(";
 		std::pair<bool, size_t> inputMemoryPtrModified = isInputMemoryPtrModified(_pseudoInstruction, _arguments);
 		for (size_t i = 0; i < _arguments.size(); ++i)
 		{
diff --git a/test/tools/yulInterpreter/Inspector.cpp b/test/tools/yulInterpreter/Inspector.cpp
index 3ded7367f6..9c4701d00a 100644
--- a/test/tools/yulInterpreter/Inspector.cpp
+++ b/test/tools/yulInterpreter/Inspector.cpp
@@ -28,19 +28,17 @@ using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::yul::test;
 
-using namespace std;
-
 namespace
 {
 
 void printVariable(YulString const& _name, u256 const& _value)
 {
-	cout << "\t" << _name.str() << " = " << _value.str();
+	std::cout << "\t" << _name.str() << " = " << _value.str();
 
 	if (_value != 0)
-		cout << " (" << toCompactHexWithPrefix(_value) << ")";
+		std::cout << " (" << toCompactHexWithPrefix(_value) << ")";
 
-	cout << endl;
+	std::cout << std::endl;
 }
 
 }
@@ -58,32 +56,32 @@ void InspectedInterpreter::run(
 	InspectedInterpreter{_inspector, _state, _dialect, scope, _disableExternalCalls, _disableMemoryTrace}(_ast);
 }
 
-Inspector::NodeAction Inspector::queryUser(DebugData const& _data, map<YulString, u256> const& _variables)
+Inspector::NodeAction Inspector::queryUser(DebugData const& _data, std::map<YulString, u256> const& _variables)
 {
 	if (m_stepMode == NodeAction::RunNode)
 	{
 		// Output instructions that are being skipped/run
-		cout << "Running " << currentSource(_data) << endl;
+		std::cout << "Running " << currentSource(_data) << std::endl;
 
 		return NodeAction::StepThroughNode;
 	}
 
-	string input;
+	std::string input;
 
 	while (true)
 	{
 		// Output sourcecode about to run.
-		cout << "> " << currentSource(_data) << endl;
+		std::cout << "> " << currentSource(_data) << std::endl;
 
 		// Ask user for action
-		cout << endl
+		std::cout << std::endl
 			<< "(s)tep/(n)ext/(i)nspect/(p)rint/all (v)ariables?"
-			<< endl
+			<< std::endl
 			<< "# ";
 
-		cout.flush();
+		std::cout.flush();
 
-		getline(cin, input);
+		std::getline(std::cin, input);
 		boost::algorithm::trim(input);
 
 		// Imitate GDB and repeat last cmd for empty string input.
@@ -97,12 +95,12 @@ Inspector::NodeAction Inspector::queryUser(DebugData const& _data, map<YulString
 		else if (input == "step" || input == "s")
 			return NodeAction::StepThroughNode;
 		else if (input == "inspect" || input == "i")
-			m_state.dumpTraceAndState(cout, false);
+			m_state.dumpTraceAndState(std::cout, false);
 		else if (input == "variables" || input == "v")
 		{
 			for (auto &&[yulStr, val]: _variables)
 				printVariable(yulStr, val);
-			cout << endl;
+			std::cout << std::endl;
 		}
 		else if (
 			boost::starts_with(input, "print") ||
@@ -111,12 +109,12 @@ Inspector::NodeAction Inspector::queryUser(DebugData const& _data, map<YulString
 		{
 			size_t whitespacePos = input.find(' ');
 
-			if (whitespacePos == string::npos)
-				cout << "Error parsing command! Expected variable name." << endl;
+			if (whitespacePos == std::string::npos)
+				std::cout << "Error parsing command! Expected variable name." << std::endl;
 
-			string const varname = input.substr(whitespacePos + 1);
+			std::string const varname = input.substr(whitespacePos + 1);
 
-			vector<string> candidates;
+			std::vector<std::string> candidates;
 
 			bool found = false;
 			for (auto &&[yulStr, val]: _variables)
@@ -128,7 +126,7 @@ Inspector::NodeAction Inspector::queryUser(DebugData const& _data, map<YulString
 				}
 
 			if (!found)
-				cout << varname << " not found." << endl;
+				std::cout << varname << " not found." << std::endl;
 		}
 	}
 }
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index aadd22b4db..fced2670ca 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -37,36 +37,35 @@
 #include <ostream>
 #include <variant>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::yul::test;
 
 using solidity::util::h256;
 
-void InterpreterState::dumpStorage(ostream& _out) const
+void InterpreterState::dumpStorage(std::ostream& _out) const
 {
 	for (auto const& slot: storage)
 		if (slot.second != h256{})
-			_out << "  " << slot.first.hex() << ": " << slot.second.hex() << endl;
+			_out << "  " << slot.first.hex() << ": " << slot.second.hex() << std::endl;
 }
 
-void InterpreterState::dumpTraceAndState(ostream& _out, bool _disableMemoryTrace) const
+void InterpreterState::dumpTraceAndState(std::ostream& _out, bool _disableMemoryTrace) const
 {
-	_out << "Trace:" << endl;
+	_out << "Trace:" << std::endl;
 	for (auto const& line: trace)
-		_out << "  " << line << endl;
+		_out << "  " << line << std::endl;
 	if (!_disableMemoryTrace)
 	{
 		_out << "Memory dump:\n";
-		map<u256, u256> words;
+		std::map<u256, u256> words;
 		for (auto const& [offset, value]: memory)
 			words[(offset / 0x20) * 0x20] |= u256(uint32_t(value)) << (256 - 8 - 8 * static_cast<size_t>(offset % 0x20));
 		for (auto const& [offset, value]: words)
 			if (value != 0)
-				_out << "  " << std::uppercase << std::hex << std::setw(4) << offset << ": " << h256(value).hex() << endl;
+				_out << "  " << std::uppercase << std::hex << std::setw(4) << offset << ": " << h256(value).hex() << std::endl;
 	}
-	_out << "Storage dump:" << endl;
+	_out << "Storage dump:" << std::endl;
 	dumpStorage(_out);
 
 	if (!calldata.empty())
@@ -94,7 +93,7 @@ void InterpreterState::dumpTraceAndState(ostream& _out, bool _disableMemoryTrace
 					static_cast<int>(calldata[offset]);
 			}
 
-		_out << endl;
+		_out << std::endl;
 	}
 }
 
@@ -118,7 +117,7 @@ void Interpreter::operator()(ExpressionStatement const& _expressionStatement)
 void Interpreter::operator()(Assignment const& _assignment)
 {
 	solAssert(_assignment.value, "");
-	vector<u256> values = evaluateMulti(*_assignment.value);
+	std::vector<u256> values = evaluateMulti(*_assignment.value);
 	solAssert(values.size() == _assignment.variableNames.size(), "");
 	for (size_t i = 0; i < values.size(); ++i)
 	{
@@ -130,7 +129,7 @@ void Interpreter::operator()(Assignment const& _assignment)
 
 void Interpreter::operator()(VariableDeclaration const& _declaration)
 {
-	vector<u256> values(_declaration.variables.size(), 0);
+	std::vector<u256> values(_declaration.variables.size(), 0);
 	if (_declaration.value)
 		values = evaluateMulti(*_declaration.value);
 
@@ -223,7 +222,7 @@ void Interpreter::operator()(Block const& _block)
 	enterScope(_block);
 	// Register functions.
 	for (auto const& statement: _block.statements)
-		if (holds_alternative<FunctionDefinition>(statement))
+		if (std::holds_alternative<FunctionDefinition>(statement))
 		{
 			FunctionDefinition const& funDef = std::get<FunctionDefinition>(statement);
 			m_scope->names.emplace(funDef.name, &funDef);
@@ -247,7 +246,7 @@ u256 Interpreter::evaluate(Expression const& _expression)
 	return ev.value();
 }
 
-vector<u256> Interpreter::evaluateMulti(Expression const& _expression)
+std::vector<u256> Interpreter::evaluateMulti(Expression const& _expression)
 {
 	ExpressionEvaluator ev(m_state, m_dialect, *m_scope, m_variables, m_disableExternalCalls, m_disableMemoryTrace);
 	ev.visit(_expression);
@@ -257,7 +256,7 @@ vector<u256> Interpreter::evaluateMulti(Expression const& _expression)
 void Interpreter::enterScope(Block const& _block)
 {
 	if (!m_scope->subScopes.count(&_block))
-		m_scope->subScopes[&_block] = make_unique<Scope>(Scope{
+		m_scope->subScopes[&_block] = std::make_unique<Scope>(Scope{
 			{},
 			{},
 			m_scope
@@ -302,7 +301,7 @@ void ExpressionEvaluator::operator()(Identifier const& _identifier)
 
 void ExpressionEvaluator::operator()(FunctionCall const& _funCall)
 {
-	vector<optional<LiteralKind>> const* literalArguments = nullptr;
+	std::vector<std::optional<LiteralKind>> const* literalArguments = nullptr;
 	if (BuiltinFunction const* builtin = m_dialect.builtin(_funCall.functionName.name))
 		if (!builtin->literalArguments.empty())
 			literalArguments = &builtin->literalArguments;
@@ -337,14 +336,14 @@ void ExpressionEvaluator::operator()(FunctionCall const& _funCall)
 	FunctionDefinition const* fun = scope->names.at(_funCall.functionName.name);
 	yulAssert(fun, "Function not found.");
 	yulAssert(m_values.size() == fun->parameters.size(), "");
-	map<YulString, u256> variables;
+	std::map<YulString, u256> variables;
 	for (size_t i = 0; i < fun->parameters.size(); ++i)
 		variables[fun->parameters.at(i).name] = m_values.at(i);
 	for (size_t i = 0; i < fun->returnVariables.size(); ++i)
 		variables[fun->returnVariables.at(i).name] = 0;
 
 	m_state.controlFlowState = ControlFlowState::Default;
-	unique_ptr<Interpreter> interpreter = makeInterpreterCopy(std::move(variables));
+	std::unique_ptr<Interpreter> interpreter = makeInterpreterCopy(std::move(variables));
 	(*interpreter)(fun->body);
 	m_state.controlFlowState = ControlFlowState::Default;
 
@@ -366,12 +365,12 @@ void ExpressionEvaluator::setValue(u256 _value)
 }
 
 void ExpressionEvaluator::evaluateArgs(
-	vector<Expression> const& _expr,
-	vector<optional<LiteralKind>> const* _literalArguments
+	std::vector<Expression> const& _expr,
+	std::vector<std::optional<LiteralKind>> const* _literalArguments
 )
 {
 	incrementStep();
-	vector<u256> values;
+	std::vector<u256> values;
 	size_t i = 0;
 	/// Function arguments are evaluated in reverse.
 	for (auto const& expr: _expr | ranges::views::reverse)
@@ -380,13 +379,13 @@ void ExpressionEvaluator::evaluateArgs(
 			visit(expr);
 		else
 		{
-			string literal = std::get<Literal>(expr).value.str();
+			std::string literal = std::get<Literal>(expr).value.str();
 
 			try
 			{
 				m_values = {u256(literal)};
 			}
-			catch (exception&)
+			catch (std::exception&)
 			{
 				m_values = {u256(0)};
 			}
@@ -455,7 +454,7 @@ void ExpressionEvaluator::runExternalCall(evmasm::Instruction _instruction)
 	yulAssert(tmpState.numInstance < 1024, "Detected more than 1024 recursive calls, aborting...");
 
 	// Create new interpreter for the called contract
-	unique_ptr<Interpreter> newInterpreter = makeInterpreterNew(tmpState, tmpScope);
+	std::unique_ptr<Interpreter> newInterpreter = makeInterpreterNew(tmpState, tmpScope);
 
 	Scope* abstractRootScope = &m_scope;
 	Scope* fileScope = nullptr;

From 502f978f6cc4875fe0a42cfc7e167a78b85d0c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 10 Nov 2023 20:54:22 +0100
Subject: [PATCH 1686/1748] ReleaseChecklist: New solc-js publication process
 using a CI-built tarball

---
 ReleaseChecklist.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ReleaseChecklist.md b/ReleaseChecklist.md
index db8bd426b6..167417a95d 100644
--- a/ReleaseChecklist.md
+++ b/ReleaseChecklist.md
@@ -29,6 +29,7 @@ At least a day before the release:
 At least a day before the release:
  - [ ] Create a draft PR to sort the changelog.
  - [ ] Create draft PRs to bump version in ``solidity`` and ``solc-js``.
+       **Note**: The ``solc-js`` PR won't pass CI checks yet because it depends on the soljson binary from ``solc-bin``.
  - [ ] Create a draft of the release on github.
  - [ ] Create a draft PR to update soliditylang.org.
  - [ ] Create drafts of blog posts.
@@ -94,9 +95,11 @@ At least a day before the release:
 ### Release solc-js
  - [ ] Wait until solc-bin was properly deployed. You can test this via remix - a test run through remix is advisable anyway.
  - [ ] Increment the version number, create a pull request for that, merge it after tests succeeded.
- - [ ] Run ``npm run build:tarball`` in the updated ``solc-js`` repository to create ``solc-<version>.tgz``. Inspect the tarball to ensure that it contains an up to date compiler binary.
- - [ ] Run ``npm run publish:tarball`` to publish the newly created tarball.
  - [ ] Create a tag using ``git tag --annotate v$VERSION`` and push it with ``git push --tags``.
+ - [ ] Wait for the CI runs on the tag itself.
+ - [ ] Take the ``solc-x.y.z.tgz`` artifact from ``build-package`` run on the tagged commit in circle-ci.
+       Inspect the tarball to ensure that it contains an up-to-date compiler binary (``soljson.js``).
+ - [ ] Run ``npm publish solc-x.y.z.tgz`` to publish the newly created tarball.
 
 ### Post-release
  - [ ] Make sure the documentation for the new release has been published successfully.

From 787a5c22857001e59e9589714a3597048f737a01 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 4 Dec 2023 18:20:34 -0300
Subject: [PATCH 1687/1748] Use pnpm instead of forge install for prb-math
 external test

---
 .circleci/config.yml                     |  8 +++++++-
 scripts/externalTests/runners/foundry.py |  7 +++++--
 test/externalTests/prb-math.py           | 18 +++++++++++++++++-
 3 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1570704bdc..db505fc4a5 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -737,7 +737,7 @@ defaults:
       name: t_native_test_ext_prb_math
       project: prb-math
       binary_type: native
-      image: cimg/rust:1.70
+      image: cimg/rust:1.74.0-node
 
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
       <<: *requires_b_ubu_static
@@ -1373,6 +1373,12 @@ jobs:
       - attach_workspace:
           at: /tmp/workspace
       - install_foundry
+      - run:
+          name: Ensure pnpm is installed if npm is present
+          command: |
+            if command -v npm &> /dev/null; then
+              sudo npm install -g pnpm
+            fi
       - install_python3:
           packages: requests
       - run:
diff --git a/scripts/externalTests/runners/foundry.py b/scripts/externalTests/runners/foundry.py
index 0b171250f7..3d35f1ac1d 100644
--- a/scripts/externalTests/runners/foundry.py
+++ b/scripts/externalTests/runners/foundry.py
@@ -69,8 +69,7 @@ def profile_section(profile_fields: dict) -> str:
             yul = {yul}
         """).format(**profile_fields)
 
-    @BaseRunner.enter_test_dir
-    def configure(self):
+    def setup_presets_profiles(self):
         """Configure forge tests profiles"""
 
         profiles = []
@@ -93,6 +92,10 @@ def configure(self):
             for profile in profiles:
                 f.write(profile)
 
+    @BaseRunner.enter_test_dir
+    def configure(self):
+        """Install project dependencies"""
+        self.setup_presets_profiles()
         run_forge_command("forge install", self.env)
 
     @BaseRunner.enter_test_dir
diff --git a/test/externalTests/prb-math.py b/test/externalTests/prb-math.py
index 0a4ce8ff95..e57688ec2e 100755
--- a/test/externalTests/prb-math.py
+++ b/test/externalTests/prb-math.py
@@ -20,7 +20,9 @@
 # ------------------------------------------------------------------------------
 
 import sys
+import subprocess
 from pathlib import Path
+from shutil import which
 
 # Our scripts/ is not a proper Python package so we need to modify PYTHONPATH to import from it
 # pragma pylint: disable=import-error,wrong-import-position
@@ -32,6 +34,20 @@
 from runners.foundry import FoundryRunner
 from test_helpers import SettingsPreset
 
+class PRBMathRunner(FoundryRunner):
+    def configure(self):
+        if which("pnpm") is None:
+            raise RuntimeError("pnpm not found.")
+
+        self.setup_presets_profiles()
+        # Starting from version v4.0.2, the default installation method for PRBMath dependencies
+        # has transitioned from Foundry to Node.js.
+        subprocess.run(
+            ["pnpm", "install"],
+            env=self.env,
+            check=True
+        )
+
 test_config = TestConfig(
     name="PRBMath",
     repo_url="https://github.com/PaulRBerg/prb-math.git",
@@ -50,4 +66,4 @@
     ],
 )
 
-sys.exit(run_test(FoundryRunner(argv=sys.argv[1:], config=test_config)))
+sys.exit(run_test(PRBMathRunner(argv=sys.argv[1:], config=test_config)))

From 8f051dd1d998056a524eefa11f8505b6fc510c2b Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Fri, 8 Dec 2023 12:58:17 -0300
Subject: [PATCH 1688/1748] Fix import-ast bug when inline assembly had empty
 let var declaration.

---
 Changelog.md                                  |   1 +
 libyul/AsmJsonImporter.cpp                    |   5 +-
 .../empty_let_variable_declaration.json       | 108 ++++++++++++++++++
 .../empty_let_variable_declaration.sol        |   8 ++
 ...ty_let_variable_declaration_parseOnly.json |  92 +++++++++++++++
 5 files changed, 213 insertions(+), 1 deletion(-)
 create mode 100644 test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.json
 create mode 100644 test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.sol
 create mode 100644 test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration_parseOnly.json

diff --git a/Changelog.md b/Changelog.md
index 01a77ce17f..ef08d1f177 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@ Compiler Features:
 
 
 Bugfixes:
+ * AST import: Fix bug when importing inline assembly with empty ``let`` variable declaration.
 
 
 ### 0.8.23 (2023-11-08)
diff --git a/libyul/AsmJsonImporter.cpp b/libyul/AsmJsonImporter.cpp
index ea8faa8792..190dcda21d 100644
--- a/libyul/AsmJsonImporter.cpp
+++ b/libyul/AsmJsonImporter.cpp
@@ -255,7 +255,10 @@ VariableDeclaration AsmJsonImporter::createVariableDeclaration(Json::Value const
 	auto varDec = createAsmNode<VariableDeclaration>(_node);
 	for (auto const& var: member(_node, "variables"))
 		varDec.variables.emplace_back(createTypedName(var));
-	varDec.value = std::make_unique<Expression>(createExpression(member(_node, "value")));
+
+	if (_node.isMember("value"))
+		varDec.value = std::make_unique<Expression>(createExpression(member(_node, "value")));
+
 	return varDec;
 }
 
diff --git a/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.json b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.json
new file mode 100644
index 0000000000..9d64279da8
--- /dev/null
+++ b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.json
@@ -0,0 +1,108 @@
+{
+  "absolutePath": "a",
+  "exportedSymbols":
+  {
+    "C":
+    [
+      6
+    ]
+  },
+  "id": 7,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "canonicalName": "C",
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "fullyImplemented": true,
+      "id": 6,
+      "linearizedBaseContracts":
+      [
+        6
+      ],
+      "name": "C",
+      "nameLocation": "9:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 4,
+            "nodeType": "Block",
+            "src": "39:30:1",
+            "statements":
+            [
+              {
+                "AST":
+                {
+                  "nativeSrc": "52:14:1",
+                  "nodeType": "YulBlock",
+                  "src": "52:14:1",
+                  "statements":
+                  [
+                    {
+                      "nativeSrc": "57:5:1",
+                      "nodeType": "YulVariableDeclaration",
+                      "src": "57:5:1",
+                      "variables":
+                      [
+                        {
+                          "name": "x",
+                          "nativeSrc": "61:1:1",
+                          "nodeType": "YulTypedName",
+                          "src": "61:1:1",
+                          "type": ""
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "evmVersion": %EVMVERSION%,
+                "externalReferences": [],
+                "id": 3,
+                "nodeType": "InlineAssembly",
+                "src": "43:23:1"
+              }
+            ]
+          },
+          "functionSelector": "26121ff0",
+          "id": 5,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "23:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 1,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "24:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 2,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "39:0:1"
+          },
+          "scope": 6,
+          "src": "14:55:1",
+          "stateMutability": "pure",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "scope": 7,
+      "src": "0:71:1",
+      "usedErrors": [],
+      "usedEvents": []
+    }
+  ],
+  "src": "0:72:1"
+}
diff --git a/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.sol b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.sol
new file mode 100644
index 0000000000..5b396dd441
--- /dev/null
+++ b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration.sol
@@ -0,0 +1,8 @@
+contract C {
+	function f() public pure {
+		assembly {
+			let x
+		}
+	}
+}
+// ----
diff --git a/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration_parseOnly.json b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration_parseOnly.json
new file mode 100644
index 0000000000..5f12f280ba
--- /dev/null
+++ b/test/libsolidity/ASTJSON/assembly/empty_let_variable_declaration_parseOnly.json
@@ -0,0 +1,92 @@
+{
+  "absolutePath": "a",
+  "id": 7,
+  "nodeType": "SourceUnit",
+  "nodes":
+  [
+    {
+      "abstract": false,
+      "baseContracts": [],
+      "contractDependencies": [],
+      "contractKind": "contract",
+      "id": 6,
+      "name": "C",
+      "nameLocation": "9:1:1",
+      "nodeType": "ContractDefinition",
+      "nodes":
+      [
+        {
+          "body":
+          {
+            "id": 4,
+            "nodeType": "Block",
+            "src": "39:30:1",
+            "statements":
+            [
+              {
+                "AST":
+                {
+                  "nativeSrc": "52:14:1",
+                  "nodeType": "YulBlock",
+                  "src": "52:14:1",
+                  "statements":
+                  [
+                    {
+                      "nativeSrc": "57:5:1",
+                      "nodeType": "YulVariableDeclaration",
+                      "src": "57:5:1",
+                      "variables":
+                      [
+                        {
+                          "name": "x",
+                          "nativeSrc": "61:1:1",
+                          "nodeType": "YulTypedName",
+                          "src": "61:1:1",
+                          "type": ""
+                        }
+                      ]
+                    }
+                  ]
+                },
+                "evmVersion": %EVMVERSION%,
+                "externalReferences": [],
+                "id": 3,
+                "nodeType": "InlineAssembly",
+                "src": "43:23:1"
+              }
+            ]
+          },
+          "id": 5,
+          "implemented": true,
+          "kind": "function",
+          "modifiers": [],
+          "name": "f",
+          "nameLocation": "23:1:1",
+          "nodeType": "FunctionDefinition",
+          "parameters":
+          {
+            "id": 1,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "24:2:1"
+          },
+          "returnParameters":
+          {
+            "id": 2,
+            "nodeType": "ParameterList",
+            "parameters": [],
+            "src": "39:0:1"
+          },
+          "src": "14:55:1",
+          "stateMutability": "pure",
+          "virtual": false,
+          "visibility": "public"
+        }
+      ],
+      "src": "0:71:1",
+      "usedErrors": [],
+      "usedEvents": []
+    }
+  ],
+  "src": "0:72:1"
+}

From 66cb0aee9d43d78f53020d78e23a9e06d2759540 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 11 Dec 2023 14:14:11 +0100
Subject: [PATCH 1689/1748] Fix argument expansion in command_available

---
 scripts/common.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/common.sh b/scripts/common.sh
index da8726f3fa..39c1226d11 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -307,9 +307,9 @@ function split_on_empty_lines_into_numbered_files
 function command_available
 {
     local program="$1"
-    local parameters=${*:2}
-    if ! "${program}" "${parameters}" > /dev/null 2>&1
+    local parameters=( "${@:2}" )
+    if ! "${program}" "${parameters[@]}" > /dev/null 2>&1
     then
-        fail "'${program}' not found or not executed successfully with parameter(s) '${parameters}'. aborting."
+        fail "'${program}' not found or not executed successfully with parameter(s) '${parameters[*]}'. aborting."
     fi
 }

From 38d992a1535ca9b179c38fadb6be31fd08ab0dad Mon Sep 17 00:00:00 2001
From: Qi He <heqi@hyperchain.cn>
Date: Tue, 1 Aug 2023 16:32:50 +0800
Subject: [PATCH 1690/1748] docs: fix incomplete member of address in
 cheatsheet.rst

---
 docs/cheatsheet.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index a60d3b50f5..2f0c1a251f 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -46,6 +46,12 @@ Members of ``address``
 - ``<address>.balance`` (``uint256``): balance of the :ref:`address` in Wei
 - ``<address>.code`` (``bytes memory``): code at the :ref:`address` (can be empty)
 - ``<address>.codehash`` (``bytes32``): the codehash of the :ref:`address`
+- ``<address>.call(bytes memory) returns (bool, bytes memory)``: issue low-level ``CALL`` with the given payload,
+  returns success condition and return data
+- ``<address>.delegatecall(bytes memory) returns (bool, bytes memory)``: issue low-level ``DELEGATECALL`` with the given payload,
+  returns success condition and return data
+- ``<address>.staticcall(bytes memory) returns (bool, bytes memory)``: issue low-level ``STATICCALL`` with the given payload,
+  returns success condition and return data
 - ``<address payable>.send(uint256 amount) returns (bool)``: send given amount of Wei to :ref:`address`,
   returns ``false`` on failure
 - ``<address payable>.transfer(uint256 amount)``: send given amount of Wei to :ref:`address`, throws on failure

From 7d6e6ee6209f9fae8eecddb21707ba677e18cedc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 13 Dec 2023 16:30:37 +0100
Subject: [PATCH 1691/1748] prepare_report.py: Don't ignore CLI exit code

---
 scripts/bytecodecompare/prepare_report.py     |  7 +++--
 scripts/common/cmdline_helpers.py             |  2 +-
 .../test_bytecodecompare_prepare_report.py    | 27 ++++++++++---------
 3 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
index 4cf24bb8aa..f286a5d060 100755
--- a/scripts/bytecodecompare/prepare_report.py
+++ b/scripts/bytecodecompare/prepare_report.py
@@ -183,7 +183,10 @@ def parse_standard_json_output(source_file_name: Path, standard_json_output: str
     return file_report
 
 
-def parse_cli_output(source_file_name: Path, cli_output: str) -> FileReport:
+def parse_cli_output(source_file_name: Path, cli_output: str, exit_code: int) -> FileReport:
+    if exit_code != 0:
+        return FileReport(file_name=source_file_name, contract_reports=None)
+
     # re.split() returns a list containing the text between pattern occurrences but also inserts the
     # content of matched groups in between. It also never omits the empty elements so the number of
     # list items is predictable (3 per match + the text before the first match)
@@ -345,7 +348,7 @@ def run_compiler(
             check=exit_on_error,
         )
 
-        return parse_cli_output(Path(source_file_name), process.stdout)
+        return parse_cli_output(Path(source_file_name), process.stdout, process.returncode)
 
 
 def generate_report(
diff --git a/scripts/common/cmdline_helpers.py b/scripts/common/cmdline_helpers.py
index 1f322be1fc..ede9f93855 100644
--- a/scripts/common/cmdline_helpers.py
+++ b/scripts/common/cmdline_helpers.py
@@ -48,7 +48,7 @@ def solc_bin_report(solc_binary: str, input_files: List[Path], via_ir: bool) ->
         (['--via-ir'] if via_ir else []),
         encoding='utf8',
     )
-    return parse_cli_output('', output)
+    return parse_cli_output('', output, 0)
 
 
 def save_bytecode(bytecode_path: Path, reports: FileReport, contract: Optional[str] = None):
diff --git a/test/scripts/test_bytecodecompare_prepare_report.py b/test/scripts/test_bytecodecompare_prepare_report.py
index b8a1791d65..d73b1f7141 100644
--- a/test/scripts/test_bytecodecompare_prepare_report.py
+++ b/test/scripts/test_bytecodecompare_prepare_report.py
@@ -487,19 +487,19 @@ def test_parse_cli_output(self):
             ]
         )
 
-        report = parse_cli_output(Path('syntaxTests/scoping/library_inherited2.sol'), LIBRARY_INHERITED2_SOL_CLI_OUTPUT)
+        report = parse_cli_output(Path('syntaxTests/scoping/library_inherited2.sol'), LIBRARY_INHERITED2_SOL_CLI_OUTPUT, 0)
         self.assertEqual(report, expected_report)
 
     def test_parse_cli_output_should_report_error_on_compiler_errors(self):
         expected_report = FileReport(file_name=Path('syntaxTests/pragma/unknown_pragma.sol'), contract_reports=None)
 
-        report = parse_cli_output(Path('syntaxTests/pragma/unknown_pragma.sol'), UNKNOWN_PRAGMA_SOL_CLI_OUTPUT)
+        report = parse_cli_output(Path('syntaxTests/pragma/unknown_pragma.sol'), UNKNOWN_PRAGMA_SOL_CLI_OUTPUT, 0)
         self.assertEqual(report, expected_report)
 
     def test_parse_cli_output_should_report_error_on_empty_output(self):
         expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
 
-        self.assertEqual(parse_cli_output(Path('file.sol'), ''), expected_report)
+        self.assertEqual(parse_cli_output(Path('file.sol'), '', 0), expected_report)
 
     def test_parse_cli_output_should_report_missing_bytecode_and_metadata(self):
         compiler_output = dedent("""\
@@ -541,22 +541,25 @@ def test_parse_cli_output_should_report_missing_bytecode_and_metadata(self):
             ]
         )
 
-        self.assertEqual(parse_cli_output(Path('syntaxTests/scoping/library_inherited2.sol'), compiler_output), expected_report)
+        self.assertEqual(
+            parse_cli_output(Path('syntaxTests/scoping/library_inherited2.sol'), compiler_output, 0),
+            expected_report
+        )
 
     def test_parse_cli_output_should_report_error_on_unimplemented_feature_error(self):
         expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
 
-        self.assertEqual(parse_cli_output(Path('file.sol'), UNIMPLEMENTED_FEATURE_CLI_OUTPUT), expected_report)
+        self.assertEqual(parse_cli_output(Path('file.sol'), UNIMPLEMENTED_FEATURE_CLI_OUTPUT, 0), expected_report)
 
     def test_parse_cli_output_should_report_error_on_stack_too_deep_error(self):
         expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
 
-        self.assertEqual(parse_cli_output(Path('file.sol'), STACK_TOO_DEEP_CLI_OUTPUT), expected_report)
+        self.assertEqual(parse_cli_output(Path('file.sol'), STACK_TOO_DEEP_CLI_OUTPUT, 0), expected_report)
 
     def test_parse_cli_output_should_report_error_on_code_generation_error(self):
         expected_report = FileReport(file_name=Path('file.sol'), contract_reports=None)
 
-        self.assertEqual(parse_cli_output(Path('file.sol'), CODE_GENERATION_ERROR_CLI_OUTPUT), expected_report)
+        self.assertEqual(parse_cli_output(Path('file.sol'), CODE_GENERATION_ERROR_CLI_OUTPUT, 0), expected_report)
 
     def test_parse_cli_output_should_handle_output_from_solc_0_4_0(self):
         expected_report = FileReport(
@@ -571,7 +574,7 @@ def test_parse_cli_output_should_handle_output_from_solc_0_4_0(self):
             ]
         )
 
-        self.assertEqual(parse_cli_output(Path('contract.sol'), SOLC_0_4_0_CLI_OUTPUT), expected_report)
+        self.assertEqual(parse_cli_output(Path('contract.sol'), SOLC_0_4_0_CLI_OUTPUT, 0), expected_report)
 
     def test_parse_cli_output_should_handle_output_from_solc_0_4_8(self):
         expected_report = FileReport(
@@ -588,7 +591,7 @@ def test_parse_cli_output_should_handle_output_from_solc_0_4_8(self):
             ]
         )
 
-        self.assertEqual(parse_cli_output(Path('contract.sol'), SOLC_0_4_8_CLI_OUTPUT), expected_report)
+        self.assertEqual(parse_cli_output(Path('contract.sol'), SOLC_0_4_8_CLI_OUTPUT, 0), expected_report)
 
     def test_parse_cli_output_should_handle_leading_and_trailing_spaces(self):
         compiler_output = (
@@ -606,7 +609,7 @@ def test_parse_cli_output_should_handle_leading_and_trailing_spaces(self):
             ]
         )
 
-        self.assertEqual(parse_cli_output(Path('contract.sol'), compiler_output), expected_report)
+        self.assertEqual(parse_cli_output(Path('contract.sol'), compiler_output, 0), expected_report)
 
     def test_parse_cli_output_should_handle_empty_bytecode_and_metadata_lines(self):
         compiler_output = dedent("""\
@@ -640,7 +643,7 @@ def test_parse_cli_output_should_handle_empty_bytecode_and_metadata_lines(self):
             ]
         )
 
-        self.assertEqual(parse_cli_output(Path('contract.sol'), compiler_output), expected_report)
+        self.assertEqual(parse_cli_output(Path('contract.sol'), compiler_output, 0), expected_report)
 
     def test_parse_cli_output_should_handle_link_references_in_bytecode(self):
         compiler_output = dedent("""\
@@ -662,4 +665,4 @@ def test_parse_cli_output_should_handle_link_references_in_bytecode(self):
         )
         # pragma pylint: enable=line-too-long
 
-        self.assertEqual(parse_cli_output(Path('contract.sol'), compiler_output), expected_report)
+        self.assertEqual(parse_cli_output(Path('contract.sol'), compiler_output, 0), expected_report)

From 646b34250b3c56cee792be2deec18ba1e8b952dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 13 Dec 2023 16:51:35 +0100
Subject: [PATCH 1692/1748] prepare_report.py: Always exit on error from
 Standard JSON interface

---
 scripts/bytecodecompare/prepare_report.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
index f286a5d060..8be9ae045c 100755
--- a/scripts/bytecodecompare/prepare_report.py
+++ b/scripts/bytecodecompare/prepare_report.py
@@ -315,7 +315,7 @@ def run_compiler(
             input=compiler_input,
             encoding='utf8',
             capture_output=True,
-            check=exit_on_error,
+            check=True,
         )
 
         return parse_standard_json_output(Path(source_file_name), process.stdout)

From 194b114664c7daebc2ff68af3c573272f5d28913 Mon Sep 17 00:00:00 2001
From: Daniel Kirchner <daniel@ekpyron.org>
Date: Tue, 6 Jun 2023 11:18:46 +0200
Subject: [PATCH 1693/1748] Add basic type inference infrastructure for
 experimental Solidity
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
Co-authored-by: Matheus Aguiar <matheus.pit@gmail.com>
Co-authored-by: Nikola Matic <nikola.matic@ethereum.org>
---
 .circleci/osx_install_dependencies.sh         |    1 +
 liblangutil/Scanner.cpp                       |    2 +-
 liblangutil/Token.h                           |   29 +-
 libsolidity/CMakeLists.txt                    |   28 +
 libsolidity/analysis/NameAndTypeResolver.cpp  |    6 +-
 libsolidity/analysis/NameAndTypeResolver.h    |    5 +-
 libsolidity/analysis/ReferencesResolver.cpp   |   93 +-
 libsolidity/analysis/ReferencesResolver.h     |    6 +-
 libsolidity/analysis/SyntaxChecker.cpp        |   14 +-
 libsolidity/analysis/SyntaxChecker.h          |    2 +
 libsolidity/ast/AST.cpp                       |   12 +
 libsolidity/ast/AST.h                         |  190 ++-
 libsolidity/ast/ASTAnnotations.h              |   10 +
 libsolidity/ast/ASTForward.h                  |    9 +
 libsolidity/ast/ASTJsonExporter.cpp           |    9 +
 libsolidity/ast/ASTJsonExporter.h             |    1 +
 libsolidity/ast/ASTVisitor.h                  |   32 +
 libsolidity/ast/AST_accept.h                  |  118 ++
 .../experimental/analysis/Analysis.cpp        |  190 ++-
 libsolidity/experimental/analysis/Analysis.h  |   76 +-
 .../experimental/analysis/DebugWarner.cpp     |   50 +
 .../experimental/analysis/DebugWarner.h       |   42 +
 .../analysis/FunctionDependencyAnalysis.cpp   |   72 +
 .../analysis/FunctionDependencyAnalysis.h     |   57 +
 .../analysis/SyntaxRestrictor.cpp             |  113 ++
 .../experimental/analysis/SyntaxRestrictor.h  |   67 +
 .../analysis/TypeClassRegistration.cpp        |   62 +
 .../analysis/TypeClassRegistration.h          |   58 +
 .../experimental/analysis/TypeInference.cpp   | 1211 +++++++++++++++++
 .../experimental/analysis/TypeInference.h     |  124 ++
 .../analysis/TypeRegistration.cpp             |  211 +++
 .../experimental/analysis/TypeRegistration.h  |   67 +
 .../experimental/ast/FunctionCallGraph.h      |   40 +
 libsolidity/experimental/ast/Type.cpp         |   62 +
 libsolidity/experimental/ast/Type.h           |  154 +++
 libsolidity/experimental/ast/TypeSystem.cpp   |  347 +++++
 libsolidity/experimental/ast/TypeSystem.h     |  184 +++
 .../experimental/ast/TypeSystemHelper.cpp     |  404 ++++++
 .../experimental/ast/TypeSystemHelper.h       |   60 +
 libsolidity/experimental/codegen/Common.cpp   |   73 +
 libsolidity/experimental/codegen/Common.h     |   41 +
 .../codegen/IRGenerationContext.h             |   55 +
 .../experimental/codegen/IRGenerator.cpp      |  160 +++
 .../experimental/codegen/IRGenerator.h        |   72 +
 .../codegen/IRGeneratorForStatements.cpp      |  393 ++++++
 .../codegen/IRGeneratorForStatements.h        |   71 +
 libsolidity/interface/CompilerStack.cpp       |   89 +-
 libsolidity/interface/CompilerStack.h         |   10 +
 libsolidity/parsing/Parser.cpp                |  317 ++++-
 libsolidity/parsing/Parser.h                  |   19 +-
 libstdlib/src/stub.sol                        |    3 +-
 scripts/ASTImportTest.sh                      |    9 +-
 scripts/check_style.sh                        |    1 +
 scripts/common.sh                             |   11 +
 scripts/error_codes.py                        |  109 +-
 test/CMakeLists.txt                           |    2 +
 test/InteractiveTests.h                       |   42 +-
 test/cmdlineTests/~soljson_via_fuzzer/test.sh |    4 +-
 test/libsolidity/Assembly.cpp                 |    2 +-
 .../FunctionDependencyGraphTest.cpp           |   59 +
 .../libsolidity/FunctionDependencyGraphTest.h |   50 +
 .../SolidityExpressionCompiler.cpp            |    2 +-
 test/libsolidity/SyntaxTest.cpp               |    2 +-
 .../callgraph.sol                             |   60 +
 .../callgraph_no_leaves.sol                   |   66 +
 .../semanticTests/experimental/stub.sol       |   97 ++
 .../semanticTests/experimental/type_class.sol |   67 +
 .../builtin/builtin_type_definition.sol       |   92 ++
 .../builtin_type_definition_duplicate.sol     |   17 +
 .../builtin_type_definition_unknown.sol       |    8 +
 .../import}/experimental_solidity.sol         |    2 +-
 ...al_solidity_multisource_not_all_enable.sol |    0
 .../experimental_solidity_out_of_order_1.sol  |    0
 .../experimental_solidity_out_of_order_2.sol  |    0
 ...xperimental_solidity_wrong_evm_version.sol |    0
 .../{ => import}/parsing_stdlib_import_1.sol  |    3 +-
 .../{ => import}/parsing_stdlib_import_2.sol  |    3 +-
 .../{ => import}/parsing_stdlib_import_3.sol  |    4 +-
 .../{ => import}/parsing_stdlib_import_4.sol  |    3 +-
 ...parsing_stdlib_import_without_pragma_1.sol |    0
 ...parsing_stdlib_import_without_pragma_2.sol |    0
 .../inference/experimental_keywords.sol       |    4 +
 .../import_and_call_stdlib_function.sol       |   25 +
 .../inference/invalid_type_referenced.sol     |   13 +
 ...onomorphic_function_call_type_mismatch.sol |   16 +
 .../inference/polymorphic_function_call.sol   |   53 +
 ...morphic_function_call_let_polymorphism.sol |   19 +
 ...olymorphic_function_call_type_mismatch.sol |   16 +
 .../inference/polymorphic_type.sol            |   47 +
 .../polymorphic_type_abs_and_rep.sol          |   69 +
 ...rphic_type_instantiation_and_operators.sol |  168 +++
 test/stopAfterParseTests.sh                   |    2 +-
 test/tools/CMakeLists.txt                     |    1 +
 93 files changed, 6536 insertions(+), 133 deletions(-)
 create mode 100644 libsolidity/experimental/analysis/DebugWarner.cpp
 create mode 100644 libsolidity/experimental/analysis/DebugWarner.h
 create mode 100644 libsolidity/experimental/analysis/FunctionDependencyAnalysis.cpp
 create mode 100644 libsolidity/experimental/analysis/FunctionDependencyAnalysis.h
 create mode 100644 libsolidity/experimental/analysis/SyntaxRestrictor.cpp
 create mode 100644 libsolidity/experimental/analysis/SyntaxRestrictor.h
 create mode 100644 libsolidity/experimental/analysis/TypeClassRegistration.cpp
 create mode 100644 libsolidity/experimental/analysis/TypeClassRegistration.h
 create mode 100644 libsolidity/experimental/analysis/TypeInference.cpp
 create mode 100644 libsolidity/experimental/analysis/TypeInference.h
 create mode 100644 libsolidity/experimental/analysis/TypeRegistration.cpp
 create mode 100644 libsolidity/experimental/analysis/TypeRegistration.h
 create mode 100644 libsolidity/experimental/ast/FunctionCallGraph.h
 create mode 100644 libsolidity/experimental/ast/Type.cpp
 create mode 100644 libsolidity/experimental/ast/Type.h
 create mode 100644 libsolidity/experimental/ast/TypeSystem.cpp
 create mode 100644 libsolidity/experimental/ast/TypeSystem.h
 create mode 100644 libsolidity/experimental/ast/TypeSystemHelper.cpp
 create mode 100644 libsolidity/experimental/ast/TypeSystemHelper.h
 create mode 100644 libsolidity/experimental/codegen/Common.cpp
 create mode 100644 libsolidity/experimental/codegen/Common.h
 create mode 100644 libsolidity/experimental/codegen/IRGenerationContext.h
 create mode 100644 libsolidity/experimental/codegen/IRGenerator.cpp
 create mode 100644 libsolidity/experimental/codegen/IRGenerator.h
 create mode 100644 libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
 create mode 100644 libsolidity/experimental/codegen/IRGeneratorForStatements.h
 create mode 100644 test/libsolidity/FunctionDependencyGraphTest.cpp
 create mode 100644 test/libsolidity/FunctionDependencyGraphTest.h
 create mode 100644 test/libsolidity/functionDependencyGraphTests/callgraph.sol
 create mode 100644 test/libsolidity/functionDependencyGraphTests/callgraph_no_leaves.sol
 create mode 100644 test/libsolidity/semanticTests/experimental/stub.sol
 create mode 100644 test/libsolidity/semanticTests/experimental/type_class.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition_duplicate.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition_unknown.sol
 rename test/libsolidity/syntaxTests/{pragma => experimental/import}/experimental_solidity.sol (70%)
 rename test/libsolidity/syntaxTests/{pragma => experimental/import}/experimental_solidity_multisource_not_all_enable.sol (100%)
 rename test/libsolidity/syntaxTests/{pragma => experimental/import}/experimental_solidity_out_of_order_1.sol (100%)
 rename test/libsolidity/syntaxTests/{pragma => experimental/import}/experimental_solidity_out_of_order_2.sol (100%)
 rename test/libsolidity/syntaxTests/{pragma => experimental/import}/experimental_solidity_wrong_evm_version.sol (100%)
 rename test/libsolidity/syntaxTests/experimental/{ => import}/parsing_stdlib_import_1.sol (76%)
 rename test/libsolidity/syntaxTests/experimental/{ => import}/parsing_stdlib_import_2.sol (77%)
 rename test/libsolidity/syntaxTests/experimental/{ => import}/parsing_stdlib_import_3.sol (70%)
 rename test/libsolidity/syntaxTests/experimental/{ => import}/parsing_stdlib_import_4.sol (77%)
 rename test/libsolidity/syntaxTests/experimental/{ => import}/parsing_stdlib_import_without_pragma_1.sol (100%)
 rename test/libsolidity/syntaxTests/experimental/{ => import}/parsing_stdlib_import_without_pragma_2.sol (100%)
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/experimental_keywords.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/import_and_call_stdlib_function.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/invalid_type_referenced.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/monomorphic_function_call_type_mismatch.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call_let_polymorphism.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call_type_mismatch.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 8e795b1dc8..61ac4a1066 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -59,6 +59,7 @@ then
   brew install wget
   brew install coreutils
   brew install diffutils
+  brew install grep
   ./scripts/install_obsolete_jsoncpp_1_7_4.sh
 
   # z3
diff --git a/liblangutil/Scanner.cpp b/liblangutil/Scanner.cpp
index 3db3f29d5d..806efa3116 100644
--- a/liblangutil/Scanner.cpp
+++ b/liblangutil/Scanner.cpp
@@ -665,7 +665,7 @@ void Scanner::scanToken()
 		case '.':
 			// . Number
 			advance();
-			if (isDecimalDigit(m_char))
+			if (m_kind != ScannerKind::ExperimentalSolidity && isDecimalDigit(m_char))
 				token = scanNumber('.');
 			else
 				token = Token::Period;
diff --git a/liblangutil/Token.h b/liblangutil/Token.h
index d79c7f193e..98de0b228d 100644
--- a/liblangutil/Token.h
+++ b/liblangutil/Token.h
@@ -269,7 +269,15 @@ namespace solidity::langutil
 	T(Leave, "leave", 0)                                               \
 	\
 	T(NonExperimentalEnd, nullptr, 0) /* used as non-experimental enum end marker */ \
+	/* Experimental Solidity specific keywords. */                     \
+	K(Class, "class", 0)                                               \
+	K(Instantiation, "instantiation", 0)                               \
+	K(Integer, "Integer", 0)                                           \
+	K(Itself, "itself", 0)                                             \
+	K(StaticAssert, "static_assert", 0)                                \
+	K(Builtin, "__builtin", 0)                                         \
 	T(ExperimentalEnd, nullptr, 0) /* used as experimental enum end marker */ \
+	\
 	/* Illegal token - not able to scan. */                            \
 	T(Illegal, "ILLEGAL", 0)                                           \
 	\
@@ -292,7 +300,7 @@ namespace TokenTraits
 	constexpr size_t count() { return static_cast<size_t>(Token::NUM_TOKENS); }
 
 	// Predicates
-	constexpr bool isElementaryTypeName(Token tok) { return Token::Int <= tok && tok < Token::TypesEnd; }
+	constexpr bool isElementaryTypeName(Token _token) { return Token::Int <= _token && _token < Token::TypesEnd; }
 	constexpr bool isAssignmentOp(Token tok) { return Token::Assign <= tok && tok <= Token::AssignMod; }
 	constexpr bool isBinaryOp(Token op) { return Token::Comma <= op && op <= Token::Exp; }
 	constexpr bool isCommutativeOp(Token op) { return op == Token::BitOr || op == Token::BitXor || op == Token::BitAnd ||
@@ -325,6 +333,16 @@ namespace TokenTraits
 			tok == Token::TrueLiteral || tok == Token::FalseLiteral || tok == Token::HexStringLiteral || tok == Token::Hex;
 	}
 
+	constexpr bool isBuiltinTypeClassName(Token _token)
+	{
+		return
+			_token == Token::Integer ||
+			(isBinaryOp(_token) && _token != Token::Comma) ||
+			isCompareOp(_token) ||
+			isUnaryOp(_token) ||
+			(isAssignmentOp(_token) && _token != Token::Assign);
+	}
+
 	constexpr bool isExperimentalSolidityKeyword(Token token)
 	{
 		return
@@ -345,17 +363,16 @@ namespace TokenTraits
 			token == Token::While ||
 			token == Token::For ||
 			token == Token::Continue ||
-			token == Token::Break;
-			// TODO: see isExperimentalSolidityKeyword below
-			// || (token > Token::NonExperimentalEnd && token < Token::ExperimentalEnd);
+			token == Token::Break ||
+			(token > Token::NonExperimentalEnd && token< Token::ExperimentalEnd);
 	}
 
-	constexpr bool isExperimentalSolidityOnlyKeyword(Token)
+	constexpr bool isExperimentalSolidityOnlyKeyword(Token _token)
 	{
 		// TODO: use token > Token::NonExperimentalEnd && token < Token::ExperimentalEnd
 		// as soon as other experimental tokens are added. For now the comparison generates
 		// a warning from clang because it is always false.
-		return false;
+		return _token > Token::NonExperimentalEnd && _token < Token::ExperimentalEnd;
 	}
 
 	bool isYulKeyword(std::string const& _literal);
diff --git a/libsolidity/CMakeLists.txt b/libsolidity/CMakeLists.txt
index 0a8c90f36b..3db857241f 100644
--- a/libsolidity/CMakeLists.txt
+++ b/libsolidity/CMakeLists.txt
@@ -184,6 +184,34 @@ set(sources
 	parsing/Parser.cpp
 	parsing/Parser.h
 	parsing/Token.h
+	experimental/analysis/Analysis.cpp
+	experimental/analysis/Analysis.h
+	experimental/analysis/DebugWarner.cpp
+	experimental/analysis/DebugWarner.h
+	experimental/analysis/FunctionDependencyAnalysis.cpp
+	experimental/analysis/FunctionDependencyAnalysis.h
+	experimental/analysis/TypeClassRegistration.cpp
+	experimental/analysis/TypeClassRegistration.h
+	experimental/analysis/TypeInference.cpp
+	experimental/analysis/TypeInference.h
+	experimental/analysis/TypeRegistration.cpp
+	experimental/analysis/TypeRegistration.h
+	experimental/analysis/SyntaxRestrictor.cpp
+	experimental/analysis/SyntaxRestrictor.h
+	experimental/ast/FunctionCallGraph.h
+	experimental/ast/Type.cpp
+	experimental/ast/Type.h
+	experimental/ast/TypeSystem.cpp
+	experimental/ast/TypeSystem.h
+	experimental/ast/TypeSystemHelper.cpp
+	experimental/ast/TypeSystemHelper.h
+	experimental/codegen/Common.h
+	experimental/codegen/Common.cpp
+	experimental/codegen/IRGenerationContext.h
+	experimental/codegen/IRGenerator.cpp
+	experimental/codegen/IRGenerator.h
+	experimental/codegen/IRGeneratorForStatements.cpp
+	experimental/codegen/IRGeneratorForStatements.h
 )
 
 add_library(solidity ${sources})
diff --git a/libsolidity/analysis/NameAndTypeResolver.cpp b/libsolidity/analysis/NameAndTypeResolver.cpp
index d6ff63dbf3..94d0568118 100644
--- a/libsolidity/analysis/NameAndTypeResolver.cpp
+++ b/libsolidity/analysis/NameAndTypeResolver.cpp
@@ -38,11 +38,13 @@ namespace solidity::frontend
 NameAndTypeResolver::NameAndTypeResolver(
 	GlobalContext& _globalContext,
 	langutil::EVMVersion _evmVersion,
-	ErrorReporter& _errorReporter
+	ErrorReporter& _errorReporter,
+	bool _experimentalSolidity
 ):
 	m_evmVersion(_evmVersion),
 	m_errorReporter(_errorReporter),
-	m_globalContext(_globalContext)
+	m_globalContext(_globalContext),
+	m_experimentalSolidity(_experimentalSolidity)
 {
 	m_scopes[nullptr] = std::make_shared<DeclarationContainer>();
 	for (Declaration const* declaration: _globalContext.declarations())
diff --git a/libsolidity/analysis/NameAndTypeResolver.h b/libsolidity/analysis/NameAndTypeResolver.h
index 6ba591e8ad..a6cf5ed760 100644
--- a/libsolidity/analysis/NameAndTypeResolver.h
+++ b/libsolidity/analysis/NameAndTypeResolver.h
@@ -59,7 +59,8 @@ class NameAndTypeResolver
 	NameAndTypeResolver(
 		GlobalContext& _globalContext,
 		langutil::EVMVersion _evmVersion,
-		langutil::ErrorReporter& _errorReporter
+		langutil::ErrorReporter& _errorReporter,
+		bool _experimentalSolidity
 	);
 	/// Registers all declarations found in the AST node, usually a source unit.
 	/// @returns false in case of error.
@@ -107,6 +108,7 @@ class NameAndTypeResolver
 	/// Sets the current scope.
 	void setScope(ASTNode const* _node);
 
+	bool experimentalSolidity() const { return m_experimentalSolidity; }
 private:
 	/// Internal version of @a resolveNamesAndTypes (called from there) throws exceptions on fatal errors.
 	bool resolveNamesAndTypesInternal(ASTNode& _node, bool _resolveInsideCode = true);
@@ -132,6 +134,7 @@ class NameAndTypeResolver
 	DeclarationContainer* m_currentScope = nullptr;
 	langutil::ErrorReporter& m_errorReporter;
 	GlobalContext& m_globalContext;
+	bool m_experimentalSolidity = false;
 };
 
 /**
diff --git a/libsolidity/analysis/ReferencesResolver.cpp b/libsolidity/analysis/ReferencesResolver.cpp
index e680021331..fd7def7145 100644
--- a/libsolidity/analysis/ReferencesResolver.cpp
+++ b/libsolidity/analysis/ReferencesResolver.cpp
@@ -112,6 +112,21 @@ bool ReferencesResolver::visit(VariableDeclaration const& _varDecl)
 	if (_varDecl.documentation())
 		resolveInheritDoc(*_varDecl.documentation(), _varDecl.annotation());
 
+	if (m_resolver.experimentalSolidity())
+	{
+		solAssert(!_varDecl.hasTypeName());
+		if (_varDecl.typeExpression())
+		{
+			ScopedSaveAndRestore typeContext{m_typeContext, true};
+			_varDecl.typeExpression()->accept(*this);
+		}
+		if (_varDecl.overrides())
+			_varDecl.overrides()->accept(*this);
+		if (_varDecl.value())
+			_varDecl.value()->accept(*this);
+		return false;
+	}
+
 	return true;
 }
 
@@ -120,6 +135,8 @@ bool ReferencesResolver::visit(Identifier const& _identifier)
 	auto declarations = m_resolver.nameFromCurrentScope(_identifier.name());
 	if (declarations.empty())
 	{
+		if (m_resolver.experimentalSolidity() && m_typeContext)
+			return false;
 		std::string suggestions = m_resolver.similarNameSuggestions(_identifier.name());
 		std::string errorMessage = "Undeclared identifier.";
 		if (!suggestions.empty())
@@ -140,7 +157,7 @@ bool ReferencesResolver::visit(Identifier const& _identifier)
 
 bool ReferencesResolver::visit(FunctionDefinition const& _functionDefinition)
 {
-	m_returnParameters.push_back(_functionDefinition.returnParameterList().get());
+	m_functionDefinitions.push_back(&_functionDefinition);
 
 	if (_functionDefinition.documentation())
 		resolveInheritDoc(*_functionDefinition.documentation(), _functionDefinition.annotation());
@@ -150,13 +167,13 @@ bool ReferencesResolver::visit(FunctionDefinition const& _functionDefinition)
 
 void ReferencesResolver::endVisit(FunctionDefinition const&)
 {
-	solAssert(!m_returnParameters.empty(), "");
-	m_returnParameters.pop_back();
+	solAssert(!m_functionDefinitions.empty(), "");
+	m_functionDefinitions.pop_back();
 }
 
 bool ReferencesResolver::visit(ModifierDefinition const& _modifierDefinition)
 {
-	m_returnParameters.push_back(nullptr);
+	m_functionDefinitions.push_back(nullptr);
 
 	if (_modifierDefinition.documentation())
 		resolveInheritDoc(*_modifierDefinition.documentation(), _modifierDefinition.annotation());
@@ -166,8 +183,8 @@ bool ReferencesResolver::visit(ModifierDefinition const& _modifierDefinition)
 
 void ReferencesResolver::endVisit(ModifierDefinition const&)
 {
-	solAssert(!m_returnParameters.empty(), "");
-	m_returnParameters.pop_back();
+	solAssert(!m_functionDefinitions.empty(), "");
+	m_functionDefinitions.pop_back();
 }
 
 void ReferencesResolver::endVisit(IdentifierPath const& _path)
@@ -227,11 +244,30 @@ bool ReferencesResolver::visit(InlineAssembly const& _inlineAssembly)
 
 bool ReferencesResolver::visit(Return const& _return)
 {
-	solAssert(!m_returnParameters.empty(), "");
-	_return.annotation().functionReturnParameters = m_returnParameters.back();
+	solAssert(!m_functionDefinitions.empty(), "");
+	_return.annotation().function = m_functionDefinitions.back();
+	_return.annotation().functionReturnParameters = m_functionDefinitions.back() ? m_functionDefinitions.back()->returnParameterList().get() : nullptr;
 	return true;
 }
 
+bool ReferencesResolver::visit(BinaryOperation const& _binaryOperation)
+{
+	if (m_resolver.experimentalSolidity())
+	{
+		_binaryOperation.leftExpression().accept(*this);
+		if (_binaryOperation.getOperator() == Token::Colon)
+		{
+			ScopedSaveAndRestore typeContext(m_typeContext, !m_typeContext);
+			_binaryOperation.rightExpression().accept(*this);
+		}
+		else
+			_binaryOperation.rightExpression().accept(*this);
+		return false;
+	}
+	else
+		return ASTConstVisitor::visit(_binaryOperation);
+}
+
 void ReferencesResolver::operator()(yul::FunctionDefinition const& _function)
 {
 	solAssert(nativeLocationOf(_function) == originLocationOf(_function), "");
@@ -252,6 +288,47 @@ void ReferencesResolver::operator()(yul::Identifier const& _identifier)
 {
 	solAssert(nativeLocationOf(_identifier) == originLocationOf(_identifier), "");
 
+	if (m_resolver.experimentalSolidity())
+	{
+		std::vector<std::string> splitName;
+		boost::split(splitName, _identifier.name.str(), boost::is_any_of("."));
+		solAssert(!splitName.empty());
+		if (splitName.size() > 2)
+		{
+			m_errorReporter.declarationError(
+				4955_error,
+				nativeLocationOf(_identifier),
+				"Unsupported identifier in inline assembly."
+			);
+			return;
+		}
+		std::string name = splitName.front();
+		auto declarations = m_resolver.nameFromCurrentScope(name);
+		switch (declarations.size())
+		{
+		case 0:
+			if (splitName.size() > 1)
+				m_errorReporter.declarationError(
+					7531_error,
+					nativeLocationOf(_identifier),
+					"Unsupported identifier in inline assembly."
+				);
+			break;
+		case 1:
+			m_yulAnnotation->externalReferences[&_identifier].declaration = declarations.front();
+			m_yulAnnotation->externalReferences[&_identifier].suffix = splitName.size() > 1 ? splitName.back() : "";
+			break;
+		default:
+			m_errorReporter.declarationError(
+				5387_error,
+				nativeLocationOf(_identifier),
+				"Multiple matching identifiers. Resolving overloaded identifiers is not supported."
+			);
+			break;
+		}
+		return;
+	}
+
 	static std::set<std::string> suffixes{"slot", "offset", "length", "address", "selector"};
 	std::string suffix;
 	for (std::string const& s: suffixes)
diff --git a/libsolidity/analysis/ReferencesResolver.h b/libsolidity/analysis/ReferencesResolver.h
index 512a681b45..13752e9c93 100644
--- a/libsolidity/analysis/ReferencesResolver.h
+++ b/libsolidity/analysis/ReferencesResolver.h
@@ -85,6 +85,7 @@ class ReferencesResolver: private ASTConstVisitor, private yul::ASTWalker
 	bool visit(InlineAssembly const& _inlineAssembly) override;
 	bool visit(Return const& _return) override;
 	bool visit(UsingForDirective const& _usingFor) override;
+	bool visit(BinaryOperation const& _binaryOperation) override;
 
 	void operator()(yul::FunctionDefinition const& _function) override;
 	void operator()(yul::Identifier const& _identifier) override;
@@ -98,12 +99,13 @@ class ReferencesResolver: private ASTConstVisitor, private yul::ASTWalker
 	langutil::ErrorReporter& m_errorReporter;
 	NameAndTypeResolver& m_resolver;
 	langutil::EVMVersion m_evmVersion;
-	/// Stack of return parameters.
-	std::vector<ParameterList const*> m_returnParameters;
+	/// Stack of function definitions.
+	std::vector<FunctionDefinition const*> m_functionDefinitions;
 	bool const m_resolveInsideCode;
 
 	InlineAssemblyAnnotation* m_yulAnnotation = nullptr;
 	bool m_yulInsideFunction = false;
+	bool m_typeContext = false;
 };
 
 }
diff --git a/libsolidity/analysis/SyntaxChecker.cpp b/libsolidity/analysis/SyntaxChecker.cpp
index b2dd73cc24..ac23ca36a8 100644
--- a/libsolidity/analysis/SyntaxChecker.cpp
+++ b/libsolidity/analysis/SyntaxChecker.cpp
@@ -443,7 +443,9 @@ bool SyntaxChecker::visit(UsingForDirective const& _usingFor)
 
 bool SyntaxChecker::visit(FunctionDefinition const& _function)
 {
-	solAssert(_function.isFree() == (m_currentContractKind == std::nullopt), "");
+	if (m_sourceUnit && m_sourceUnit->experimentalSolidity())
+		// Handled in experimental::SyntaxRestrictor instead.
+		return true;
 
 	if (!_function.isFree() && !_function.isConstructor() && _function.noVisibilitySpecified())
 	{
@@ -498,3 +500,13 @@ bool SyntaxChecker::visit(StructDefinition const& _struct)
 
 	return true;
 }
+
+bool SyntaxChecker::visitNode(ASTNode const& _node)
+{
+	if (_node.experimentalSolidityOnly())
+	{
+		solAssert(m_sourceUnit);
+		solAssert(m_sourceUnit->experimentalSolidity());
+	}
+	return ASTConstVisitor::visitNode(_node);
+}
diff --git a/libsolidity/analysis/SyntaxChecker.h b/libsolidity/analysis/SyntaxChecker.h
index f221df09fc..69bda229f7 100644
--- a/libsolidity/analysis/SyntaxChecker.h
+++ b/libsolidity/analysis/SyntaxChecker.h
@@ -97,6 +97,8 @@ class SyntaxChecker: private ASTConstVisitor
 	bool visit(StructDefinition const& _struct) override;
 	bool visit(Literal const& _literal) override;
 
+	bool visitNode(ASTNode const&) override;
+
 	langutil::ErrorReporter& m_errorReporter;
 
 	bool m_useYulOptimizer = false;
diff --git a/libsolidity/ast/AST.cpp b/libsolidity/ast/AST.cpp
index c0bf900918..bae1696759 100644
--- a/libsolidity/ast/AST.cpp
+++ b/libsolidity/ast/AST.cpp
@@ -1057,3 +1057,15 @@ TryCatchClause const* TryStatement::errorClause() const {
 TryCatchClause const* TryStatement::fallbackClause() const {
 	return findClause(m_clauses);
 }
+
+/// Experimental Solidity nodes
+/// @{
+TypeClassDefinitionAnnotation& TypeClassDefinition::annotation() const
+{
+	return initAnnotation<TypeClassDefinitionAnnotation>();
+}
+TypeDeclarationAnnotation& TypeDefinition::annotation() const
+{
+	return initAnnotation<TypeDeclarationAnnotation>();
+}
+/// @}
diff --git a/libsolidity/ast/AST.h b/libsolidity/ast/AST.h
index ca23b0d619..b9cc2118ef 100644
--- a/libsolidity/ast/AST.h
+++ b/libsolidity/ast/AST.h
@@ -125,6 +125,8 @@ class ASTNode
 	bool operator!=(ASTNode const& _other) const { return !operator==(_other); }
 	///@}
 
+	virtual bool experimentalSolidityOnly() const { return false; }
+
 protected:
 	size_t const m_id = 0;
 
@@ -960,7 +962,8 @@ class FunctionDefinition: public CallableDeclaration, public StructurallyDocumen
 		ASTPointer<ParameterList> const& _parameters,
 		std::vector<ASTPointer<ModifierInvocation>> _modifiers,
 		ASTPointer<ParameterList> const& _returnParameters,
-		ASTPointer<Block> const& _body
+		ASTPointer<Block> const& _body,
+		ASTPointer<Expression> const& _experimentalReturnExpression = {}
 	):
 		CallableDeclaration(_id, _location, _name, _nameLocation, _visibility, _parameters, _isVirtual, _overrides, _returnParameters),
 		StructurallyDocumented(_documentation),
@@ -969,10 +972,12 @@ class FunctionDefinition: public CallableDeclaration, public StructurallyDocumen
 		m_free(_free),
 		m_kind(_kind),
 		m_functionModifiers(std::move(_modifiers)),
-		m_body(_body)
+		m_body(_body),
+		m_experimentalReturnExpression(_experimentalReturnExpression)
 	{
 		solAssert(_kind == Token::Constructor || _kind == Token::Function || _kind == Token::Fallback || _kind == Token::Receive, "");
 		solAssert(isOrdinary() == !name().empty(), "");
+		// TODO: assert _returnParameters implies non-experimental _experimentalReturnExpression implies experimental
 	}
 
 	void accept(ASTVisitor& _visitor) override;
@@ -1030,12 +1035,15 @@ class FunctionDefinition: public CallableDeclaration, public StructurallyDocumen
 		ContractDefinition const* _searchStart = nullptr
 	) const override;
 
+	Expression const* experimentalReturnExpression() const { return m_experimentalReturnExpression.get(); }
+
 private:
 	StateMutability m_stateMutability;
 	bool m_free;
 	Token const m_kind;
 	std::vector<ASTPointer<ModifierInvocation>> m_functionModifiers;
 	ASTPointer<Block> m_body;
+	ASTPointer<Expression> m_experimentalReturnExpression;
 };
 
 /**
@@ -1070,7 +1078,8 @@ class VariableDeclaration: public Declaration, public StructurallyDocumented
 		bool _isIndexed = false,
 		Mutability _mutability = Mutability::Mutable,
 		ASTPointer<OverrideSpecifier> _overrides = nullptr,
-		Location _referenceLocation = Location::Unspecified
+		Location _referenceLocation = Location::Unspecified,
+		ASTPointer<Expression> _typeExpression = {}
 	):
 		Declaration(_id, _location, _name, std::move(_nameLocation), _visibility),
 		StructurallyDocumented(std::move(_documentation)),
@@ -1079,15 +1088,18 @@ class VariableDeclaration: public Declaration, public StructurallyDocumented
 		m_isIndexed(_isIndexed),
 		m_mutability(_mutability),
 		m_overrides(std::move(_overrides)),
-		m_location(_referenceLocation)
+		m_location(_referenceLocation),
+		m_typeExpression(std::move(_typeExpression))
 	{
-		solAssert(m_typeName, "");
+		// TODO: consider still asserting unless we are in experimental solidity.
+		// solAssert(m_typeName, ""); solAssert(!m_typeExpression, "");
 	}
 
 
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
 
+	bool hasTypeName() const { return m_typeName != nullptr; }
 	TypeName const& typeName() const { return *m_typeName; }
 	ASTPointer<Expression> const& value() const { return m_value; }
 
@@ -1142,6 +1154,7 @@ class VariableDeclaration: public Declaration, public StructurallyDocumented
 	/// @returns null when it is not accessible as a function.
 	FunctionTypePointer functionType(bool /*_internal*/) const override;
 
+	ASTPointer<Expression> const& typeExpression() const { return m_typeExpression; }
 	VariableDeclarationAnnotation& annotation() const override;
 
 protected:
@@ -1157,6 +1170,7 @@ class VariableDeclaration: public Declaration, public StructurallyDocumented
 	Mutability m_mutability = Mutability::Mutable;
 	ASTPointer<OverrideSpecifier> m_overrides; ///< Contains the override specifier node
 	Location m_location = Location::Unspecified; ///< Location of the variable if it is of reference type.
+	ASTPointer<Expression> m_typeExpression;
 };
 
 /**
@@ -2138,7 +2152,8 @@ class BinaryOperation: public Expression
 	):
 		Expression(_id, _location), m_left(std::move(_left)), m_operator(_operator), m_right(std::move(_right))
 	{
-		solAssert(TokenTraits::isBinaryOp(_operator) || TokenTraits::isCompareOp(_operator), "");
+		// TODO: assert against colon for non-experimental solidity
+		solAssert(TokenTraits::isBinaryOp(_operator) || TokenTraits::isCompareOp(_operator) || _operator == Token::Colon || _operator == Token::RightArrow, "");
 	}
 	void accept(ASTVisitor& _visitor) override;
 	void accept(ASTConstVisitor& _visitor) const override;
@@ -2449,4 +2464,167 @@ class Literal: public PrimaryExpression
 
 /// @}
 
+/// Experimental Solidity nodes
+/// @{
+class TypeClassDefinition: public Declaration, public StructurallyDocumented, public ScopeOpener
+{
+public:
+	TypeClassDefinition(
+		int64_t _id,
+		SourceLocation const& _location,
+		ASTPointer<VariableDeclaration> _typeVariable,
+		ASTPointer<ASTString> const& _name,
+		SourceLocation _nameLocation,
+		ASTPointer<StructuredDocumentation> const& _documentation,
+		std::vector<ASTPointer<ASTNode>> _subNodes
+	):
+		Declaration(_id, _location, _name, std::move(_nameLocation)),
+		StructurallyDocumented(_documentation),
+		m_typeVariable(std::move(_typeVariable)),
+		m_subNodes(std::move(_subNodes))
+	{}
+
+	void accept(ASTVisitor& _visitor) override;
+	void accept(ASTConstVisitor& _visitor) const override;
+
+	VariableDeclaration const& typeVariable() const { return *m_typeVariable; }
+	std::vector<ASTPointer<ASTNode>> const& subNodes() const { return m_subNodes; }
+
+	TypeClassDefinitionAnnotation& annotation() const override;
+
+	Type const* type() const override { solAssert(false, "Requested type of experimental solidity node."); }
+
+	bool experimentalSolidityOnly() const override { return true; }
+
+private:
+	ASTPointer<VariableDeclaration> m_typeVariable;
+	std::vector<ASTPointer<ASTNode>> m_subNodes;
+};
+
+class TypeClassInstantiation: public ASTNode, public ScopeOpener
+{
+public:
+	TypeClassInstantiation(
+		int64_t _id,
+		SourceLocation const& _location,
+		ASTPointer<TypeName> _typeConstructor,
+		ASTPointer<ParameterList> _argumentSorts,
+		ASTPointer<TypeClassName> _class,
+		std::vector<ASTPointer<ASTNode>> _subNodes
+	):
+		ASTNode(_id, _location),
+		m_typeConstructor(std::move(_typeConstructor)),
+		m_argumentSorts(std::move(_argumentSorts)),
+		m_class(std::move(_class)),
+		m_subNodes(std::move(_subNodes))
+	{}
+
+	void accept(ASTVisitor& _visitor) override;
+	void accept(ASTConstVisitor& _visitor) const override;
+
+	TypeName const& typeConstructor() const { return *m_typeConstructor; }
+	ParameterList const* argumentSorts() const { return m_argumentSorts.get(); }
+	TypeClassName const& typeClass() const { return *m_class; }
+	std::vector<ASTPointer<ASTNode>> const& subNodes() const { return m_subNodes; }
+
+	bool experimentalSolidityOnly() const override { return true; }
+
+private:
+	ASTPointer<TypeName> m_typeConstructor;
+	ASTPointer<ParameterList> m_argumentSorts;
+	ASTPointer<TypeClassName> m_class;
+	std::vector<ASTPointer<ASTNode>> m_subNodes;
+};
+
+class TypeDefinition: public Declaration, public ScopeOpener
+{
+public:
+	TypeDefinition(
+		int64_t _id,
+		SourceLocation const& _location,
+		ASTPointer<ASTString> _name,
+		SourceLocation _nameLocation,
+		ASTPointer<ParameterList> _arguments,
+		ASTPointer<Expression> _typeExpression
+	):
+		Declaration(_id, _location, _name, std::move(_nameLocation), Visibility::Default),
+		m_arguments(std::move(_arguments)),
+		m_typeExpression(std::move(_typeExpression))
+	{
+	}
+
+	void accept(ASTVisitor& _visitor) override;
+	void accept(ASTConstVisitor& _visitor) const override;
+
+	Type const* type() const override { return nullptr; }
+
+	TypeDeclarationAnnotation& annotation() const override;
+
+	ParameterList const* arguments() const { return m_arguments.get(); }
+	Expression const* typeExpression() const { return m_typeExpression.get(); }
+
+	bool experimentalSolidityOnly() const override { return true; }
+
+private:
+	ASTPointer<ParameterList> m_arguments;
+	ASTPointer<Expression> m_typeExpression;
+};
+
+class TypeClassName: public ASTNode
+{
+public:
+	TypeClassName(
+		int64_t _id,
+		SourceLocation const& _location,
+		std::variant<Token, ASTPointer<IdentifierPath>> _name
+	):
+		ASTNode(_id, _location),
+		m_name(std::move(_name))
+	{
+		if (Token const* token = std::get_if<Token>(&_name))
+			solAssert(TokenTraits::isBuiltinTypeClassName(*token));
+	}
+
+	void accept(ASTVisitor& _visitor) override;
+	void accept(ASTConstVisitor& _visitor) const override;
+
+	bool experimentalSolidityOnly() const override { return true; }
+
+	std::variant<Token, ASTPointer<IdentifierPath>> name() const { return m_name; }
+
+private:
+	std::variant<Token, ASTPointer<IdentifierPath>> m_name;
+};
+
+class Builtin: public Expression
+{
+public:
+	Builtin(
+		int64_t _id,
+		SourceLocation _location,
+		ASTPointer<ASTString> _nameParameter,
+		SourceLocation _nameParameterLocation
+	):
+		Expression(_id, std::move(_location)),
+		m_nameParameter(std::move(_nameParameter)),
+		m_nameParameterLocation(std::move(_nameParameterLocation))
+	{
+		solAssert(m_nameParameter);
+	}
+
+	void accept(ASTVisitor& _visitor) override;
+	void accept(ASTConstVisitor& _visitor) const override;
+
+	bool experimentalSolidityOnly() const override { return true; }
+
+	ASTString const& nameParameter() const { return *m_nameParameter; }
+	SourceLocation const& nameParameterLocation() const { return m_nameParameterLocation; }
+
+private:
+	ASTPointer<ASTString> m_nameParameter;
+	SourceLocation m_nameParameterLocation;
+};
+
+/// @}
+
 }
diff --git a/libsolidity/ast/ASTAnnotations.h b/libsolidity/ast/ASTAnnotations.h
index 9a19907117..e68614f464 100644
--- a/libsolidity/ast/ASTAnnotations.h
+++ b/libsolidity/ast/ASTAnnotations.h
@@ -245,6 +245,8 @@ struct ReturnAnnotation: StatementAnnotation
 {
 	/// Reference to the return parameters of the function.
 	ParameterList const* functionReturnParameters = nullptr;
+	/// Reference to the function containing the return statement.
+	FunctionDefinition const* function = nullptr;
 };
 
 struct TypeNameAnnotation: ASTAnnotation
@@ -342,4 +344,12 @@ struct FunctionCallAnnotation: ExpressionAnnotation
 	bool tryCall = false;
 };
 
+/// Experimental Solidity annotations.
+/// Used to integrate with name and type resolution.
+/// @{
+struct TypeClassDefinitionAnnotation: TypeDeclarationAnnotation, StructurallyDocumentedAnnotation
+{
+};
+/// @}
+
 }
diff --git a/libsolidity/ast/ASTForward.h b/libsolidity/ast/ASTForward.h
index 79e6a4ecf2..f7c3d60237 100644
--- a/libsolidity/ast/ASTForward.h
+++ b/libsolidity/ast/ASTForward.h
@@ -99,6 +99,15 @@ class ElementaryTypeNameExpression;
 class Literal;
 class StructuredDocumentation;
 
+/// Experimental Solidity nodes
+/// @{
+class TypeClassDefinition;
+class TypeClassInstantiation;
+class TypeClassName;
+class TypeDefinition;
+class Builtin;
+/// @}
+
 class VariableScope;
 
 template <class T>
diff --git a/libsolidity/ast/ASTJsonExporter.cpp b/libsolidity/ast/ASTJsonExporter.cpp
index 98a368d195..c54a2d013a 100644
--- a/libsolidity/ast/ASTJsonExporter.cpp
+++ b/libsolidity/ast/ASTJsonExporter.cpp
@@ -1038,6 +1038,15 @@ void ASTJsonExporter::endVisit(EventDefinition const&)
 	m_inEvent = false;
 }
 
+bool ASTJsonExporter::visitNode(ASTNode const& _node)
+{
+	solAssert(false, _node.experimentalSolidityOnly() ?
+		"Attempt to export an AST of experimental solidity." :
+		"Attempt to export an AST that contains unexpected nodes."
+	);
+	return false;
+}
+
 std::string ASTJsonExporter::location(VariableDeclaration::Location _location)
 {
 	switch (_location)
diff --git a/libsolidity/ast/ASTJsonExporter.h b/libsolidity/ast/ASTJsonExporter.h
index 71d15ce0a5..ff3b94fa28 100644
--- a/libsolidity/ast/ASTJsonExporter.h
+++ b/libsolidity/ast/ASTJsonExporter.h
@@ -130,6 +130,7 @@ class ASTJsonExporter: public ASTConstVisitor
 
 	void endVisit(EventDefinition const&) override;
 
+	bool visitNode(ASTNode const& _node) override;
 private:
 	void setJsonNode(
 		ASTNode const& _node,
diff --git a/libsolidity/ast/ASTVisitor.h b/libsolidity/ast/ASTVisitor.h
index ef03e63393..f9196d6b95 100644
--- a/libsolidity/ast/ASTVisitor.h
+++ b/libsolidity/ast/ASTVisitor.h
@@ -109,6 +109,14 @@ class ASTVisitor
 	virtual bool visit(ElementaryTypeNameExpression& _node) { return visitNode(_node); }
 	virtual bool visit(Literal& _node) { return visitNode(_node); }
 	virtual bool visit(StructuredDocumentation& _node) { return visitNode(_node); }
+	/// Experimental Solidity nodes
+	/// @{
+	virtual bool visit(TypeClassDefinition& _node) { return visitNode(_node); }
+	virtual bool visit(TypeClassInstantiation& _node) { return visitNode(_node); }
+	virtual bool visit(TypeDefinition& _node) { return visitNode(_node); }
+	virtual bool visit(TypeClassName& _node) { return visitNode(_node); }
+	virtual bool visit(Builtin& _node) { return visitNode(_node); }
+	///  @}
 
 	virtual void endVisit(SourceUnit& _node) { endVisitNode(_node); }
 	virtual void endVisit(PragmaDirective& _node) { endVisitNode(_node); }
@@ -165,6 +173,14 @@ class ASTVisitor
 	virtual void endVisit(ElementaryTypeNameExpression& _node) { endVisitNode(_node); }
 	virtual void endVisit(Literal& _node) { endVisitNode(_node); }
 	virtual void endVisit(StructuredDocumentation& _node) { endVisitNode(_node); }
+	/// Experimental Solidity nodes
+	/// @{
+	virtual void endVisit(TypeClassDefinition& _node) { endVisitNode(_node); }
+	virtual void endVisit(TypeClassInstantiation& _node) { endVisitNode(_node); }
+	virtual void endVisit(TypeDefinition& _node) { endVisitNode(_node); }
+	virtual void endVisit(TypeClassName& _node) { endVisitNode(_node); }
+	virtual void endVisit(Builtin& _node) { endVisitNode(_node); }
+	///  @}
 
 protected:
 	/// Generic function called by default for each node, to be overridden by derived classes
@@ -243,6 +259,14 @@ class ASTConstVisitor
 	virtual bool visit(ElementaryTypeNameExpression const& _node) { return visitNode(_node); }
 	virtual bool visit(Literal const& _node) { return visitNode(_node); }
 	virtual bool visit(StructuredDocumentation const& _node) { return visitNode(_node); }
+	/// Experimental Solidity nodes
+	/// @{
+	virtual bool visit(TypeClassDefinition const& _node) { return visitNode(_node); }
+	virtual bool visit(TypeClassInstantiation const& _node) { return visitNode(_node); }
+	virtual bool visit(TypeDefinition const& _node) { return visitNode(_node); }
+	virtual bool visit(TypeClassName const& _node) { return visitNode(_node); }
+	virtual bool visit(Builtin const& _node) { return visitNode(_node); }
+	///  @}
 
 	virtual void endVisit(SourceUnit const& _node) { endVisitNode(_node); }
 	virtual void endVisit(PragmaDirective const& _node) { endVisitNode(_node); }
@@ -299,6 +323,14 @@ class ASTConstVisitor
 	virtual void endVisit(ElementaryTypeNameExpression const& _node) { endVisitNode(_node); }
 	virtual void endVisit(Literal const& _node) { endVisitNode(_node); }
 	virtual void endVisit(StructuredDocumentation const& _node) { endVisitNode(_node); }
+	/// Experimental Solidity nodes
+	/// @{
+	virtual void endVisit(TypeClassDefinition const& _node) { endVisitNode(_node); }
+	virtual void endVisit(TypeClassInstantiation const& _node) { endVisitNode(_node); }
+	virtual void endVisit(TypeDefinition const& _node) { endVisitNode(_node); }
+	virtual void endVisit(TypeClassName const& _node) { endVisitNode(_node); }
+	virtual void endVisit(Builtin const& _node) { endVisitNode(_node); }
+	///  @}
 
 protected:
 	/// Generic function called by default for each node, to be overridden by derived classes
diff --git a/libsolidity/ast/AST_accept.h b/libsolidity/ast/AST_accept.h
index 78dc0e5ddd..be9de64db7 100644
--- a/libsolidity/ast/AST_accept.h
+++ b/libsolidity/ast/AST_accept.h
@@ -265,6 +265,8 @@ void FunctionDefinition::accept(ASTVisitor& _visitor)
 		m_parameters->accept(_visitor);
 		if (m_returnParameters)
 			m_returnParameters->accept(_visitor);
+		if (m_experimentalReturnExpression)
+			m_experimentalReturnExpression->accept(_visitor);
 		listAccept(m_functionModifiers, _visitor);
 		if (m_body)
 			m_body->accept(_visitor);
@@ -283,6 +285,8 @@ void FunctionDefinition::accept(ASTConstVisitor& _visitor) const
 		m_parameters->accept(_visitor);
 		if (m_returnParameters)
 			m_returnParameters->accept(_visitor);
+		if (m_experimentalReturnExpression)
+			m_experimentalReturnExpression->accept(_visitor);
 		listAccept(m_functionModifiers, _visitor);
 		if (m_body)
 			m_body->accept(_visitor);
@@ -296,6 +300,8 @@ void VariableDeclaration::accept(ASTVisitor& _visitor)
 	{
 		if (m_typeName)
 			m_typeName->accept(_visitor);
+		if (m_typeExpression)
+			m_typeExpression->accept(_visitor);
 		if (m_overrides)
 			m_overrides->accept(_visitor);
 		if (m_value)
@@ -310,6 +316,8 @@ void VariableDeclaration::accept(ASTConstVisitor& _visitor) const
 	{
 		if (m_typeName)
 			m_typeName->accept(_visitor);
+		if (m_typeExpression)
+			m_typeExpression->accept(_visitor);
 		if (m_overrides)
 			m_overrides->accept(_visitor);
 		if (m_value)
@@ -1024,4 +1032,114 @@ void Literal::accept(ASTConstVisitor& _visitor) const
 	_visitor.endVisit(*this);
 }
 
+/// Experimental Solidity nodes
+/// @{
+void TypeClassDefinition::accept(ASTVisitor& _visitor)
+{
+	if (_visitor.visit(*this))
+	{
+		m_typeVariable->accept(_visitor);
+		if (m_documentation)
+			m_documentation->accept(_visitor);
+		listAccept(m_subNodes, _visitor);
+	}
+	_visitor.endVisit(*this);
+}
+
+void TypeClassDefinition::accept(ASTConstVisitor& _visitor) const
+{
+	if (_visitor.visit(*this))
+	{
+		m_typeVariable->accept(_visitor);
+		if (m_documentation)
+			m_documentation->accept(_visitor);
+		listAccept(m_subNodes, _visitor);
+	}
+	_visitor.endVisit(*this);
+}
+
+void TypeClassInstantiation::accept(ASTVisitor& _visitor)
+{
+	if (_visitor.visit(*this))
+	{
+		m_typeConstructor->accept(_visitor);
+		if (m_argumentSorts)
+			m_argumentSorts->accept(_visitor);
+		m_class->accept(_visitor);
+		listAccept(m_subNodes, _visitor);
+	}
+	_visitor.endVisit(*this);
+}
+
+void TypeClassInstantiation::accept(ASTConstVisitor& _visitor) const
+{
+	if (_visitor.visit(*this))
+	{
+		m_typeConstructor->accept(_visitor);
+		if (m_argumentSorts)
+			m_argumentSorts->accept(_visitor);
+		m_class->accept(_visitor);
+		listAccept(m_subNodes, _visitor);
+	}
+	_visitor.endVisit(*this);
+}
+
+void TypeDefinition::accept(ASTVisitor& _visitor)
+{
+	if (_visitor.visit(*this))
+	{
+		if (m_arguments)
+			m_arguments->accept(_visitor);
+		if (m_typeExpression)
+			m_typeExpression->accept(_visitor);
+	}
+	_visitor.endVisit(*this);
+}
+
+void TypeDefinition::accept(ASTConstVisitor& _visitor) const
+{
+	if (_visitor.visit(*this))
+	{
+		if (m_arguments)
+			m_arguments->accept(_visitor);
+		if (m_typeExpression)
+			m_typeExpression->accept(_visitor);
+	}
+	_visitor.endVisit(*this);
+}
+
+
+void TypeClassName::accept(ASTVisitor& _visitor)
+{
+	if (_visitor.visit(*this))
+	{
+		if (auto* path = std::get_if<ASTPointer<IdentifierPath>>(&m_name))
+			(*path)->accept(_visitor);
+	}
+	_visitor.endVisit(*this);
+}
+
+void TypeClassName::accept(ASTConstVisitor& _visitor) const
+{
+	if (_visitor.visit(*this))
+	{
+		if (auto* path = std::get_if<ASTPointer<IdentifierPath>>(&m_name))
+			(*path)->accept(_visitor);
+	}
+	_visitor.endVisit(*this);
+}
+
+void Builtin::accept(ASTVisitor& _visitor)
+{
+	_visitor.visit(*this);
+	_visitor.endVisit(*this);
+}
+
+void Builtin::accept(ASTConstVisitor& _visitor) const
+{
+	_visitor.visit(*this);
+	_visitor.endVisit(*this);
+}
+/// @}
+
 }
diff --git a/libsolidity/experimental/analysis/Analysis.cpp b/libsolidity/experimental/analysis/Analysis.cpp
index 672aa4f879..441700675f 100644
--- a/libsolidity/experimental/analysis/Analysis.cpp
+++ b/libsolidity/experimental/analysis/Analysis.cpp
@@ -16,19 +16,189 @@
 */
 // SPDX-License-Identifier: GPL-3.0
 #include <libsolidity/experimental/analysis/Analysis.h>
-
-#include <liblangutil/ErrorReporter.h>
+#include <libsolidity/experimental/analysis/DebugWarner.h>
+#include <libsolidity/experimental/analysis/FunctionDependencyAnalysis.h>
+#include <libsolidity/experimental/analysis/SyntaxRestrictor.h>
+#include <libsolidity/experimental/analysis/TypeClassRegistration.h>
+#include <libsolidity/experimental/analysis/TypeInference.h>
+#include <libsolidity/experimental/analysis/TypeRegistration.h>
 
 using namespace solidity::langutil;
 using namespace solidity::frontend::experimental;
 
-bool Analysis::check(std::vector<std::shared_ptr<SourceUnit const>> const&)
+// TODO: creating all of them for all nodes up front may be wasteful, we should improve the mechanism.
+struct Analysis::AnnotationContainer
+{
+	TypeClassRegistration::Annotation typeClassRegistrationAnnotation;
+	TypeRegistration::Annotation typeRegistrationAnnotation;
+	TypeInference::Annotation typeInferenceAnnotation;
+};
+
+struct Analysis::GlobalAnnotationContainer
+{
+	FunctionDependencyAnalysis::GlobalAnnotation functionDependencyGraphAnnotation;
+	TypeClassRegistration::GlobalAnnotation typeClassRegistrationAnnotation;
+	TypeRegistration::GlobalAnnotation typeRegistrationAnnotation;
+	TypeInference::GlobalAnnotation typeInferenceAnnotation;
+};
+
+template<>
+TypeClassRegistration::Annotation& solidity::frontend::experimental::detail::AnnotationFetcher<TypeClassRegistration>::get(ASTNode const& _node)
+{
+	return analysis.annotationContainer(_node).typeClassRegistrationAnnotation;
+}
+
+template<>
+TypeClassRegistration::GlobalAnnotation const& solidity::frontend::experimental::detail::ConstAnnotationFetcher<TypeClassRegistration>::get() const
+{
+	return analysis.annotationContainer().typeClassRegistrationAnnotation;
+}
+
+template<>
+TypeClassRegistration::GlobalAnnotation& solidity::frontend::experimental::detail::AnnotationFetcher<TypeClassRegistration>::get()
+{
+	return analysis.annotationContainer().typeClassRegistrationAnnotation;
+}
+
+template<>
+TypeClassRegistration::Annotation const& solidity::frontend::experimental::detail::ConstAnnotationFetcher<TypeClassRegistration>::get(ASTNode const& _node) const
+{
+	return analysis.annotationContainer(_node).typeClassRegistrationAnnotation;
+}
+
+template<>
+FunctionDependencyAnalysis::GlobalAnnotation const& solidity::frontend::experimental::detail::ConstAnnotationFetcher<FunctionDependencyAnalysis>::get() const
+{
+	return analysis.annotationContainer().functionDependencyGraphAnnotation;
+}
+
+template<>
+FunctionDependencyAnalysis::GlobalAnnotation& solidity::frontend::experimental::detail::AnnotationFetcher<FunctionDependencyAnalysis>::get()
+{
+	return analysis.annotationContainer().functionDependencyGraphAnnotation;
+}
+
+template<>
+TypeRegistration::Annotation& solidity::frontend::experimental::detail::AnnotationFetcher<TypeRegistration>::get(ASTNode const& _node)
+{
+	return analysis.annotationContainer(_node).typeRegistrationAnnotation;
+}
+
+template<>
+TypeRegistration::GlobalAnnotation const& solidity::frontend::experimental::detail::ConstAnnotationFetcher<TypeRegistration>::get() const
+{
+	return analysis.annotationContainer().typeRegistrationAnnotation;
+}
+
+template<>
+TypeRegistration::GlobalAnnotation& solidity::frontend::experimental::detail::AnnotationFetcher<TypeRegistration>::get()
+{
+	return analysis.annotationContainer().typeRegistrationAnnotation;
+}
+
+template<>
+TypeRegistration::Annotation const& solidity::frontend::experimental::detail::ConstAnnotationFetcher<TypeRegistration>::get(ASTNode const& _node) const
 {
-	m_errorReporter.error(
-		6547_error,
-		Error::Type::UnimplementedFeatureError,
-		SourceLocation{},
-		"Experimental Analysis is not implemented yet."
-	);
-	return false;
+	return analysis.annotationContainer(_node).typeRegistrationAnnotation;
+}
+
+template<>
+TypeInference::Annotation& solidity::frontend::experimental::detail::AnnotationFetcher<TypeInference>::get(ASTNode const& _node)
+{
+	return analysis.annotationContainer(_node).typeInferenceAnnotation;
+}
+
+template<>
+TypeInference::Annotation const& solidity::frontend::experimental::detail::ConstAnnotationFetcher<TypeInference>::get(ASTNode const& _node) const
+{
+	return analysis.annotationContainer(_node).typeInferenceAnnotation;
+}
+
+template<>
+TypeInference::GlobalAnnotation const& solidity::frontend::experimental::detail::ConstAnnotationFetcher<TypeInference>::get() const
+{
+	return analysis.annotationContainer().typeInferenceAnnotation;
+}
+
+template<>
+TypeInference::GlobalAnnotation& solidity::frontend::experimental::detail::AnnotationFetcher<TypeInference>::get()
+{
+	return analysis.annotationContainer().typeInferenceAnnotation;
+}
+
+Analysis::AnnotationContainer& Analysis::annotationContainer(ASTNode const& _node)
+{
+	solAssert(_node.id() > 0);
+	size_t id = static_cast<size_t>(_node.id());
+	solAssert(id <= m_maxAstId);
+	return m_annotations[id];
+}
+
+Analysis::AnnotationContainer const& Analysis::annotationContainer(ASTNode const& _node) const
+{
+	solAssert(_node.id() > 0);
+	size_t id = static_cast<size_t>(_node.id());
+	solAssert(id <= m_maxAstId);
+	return m_annotations[id];
+}
+
+Analysis::Analysis(langutil::ErrorReporter& _errorReporter, uint64_t _maxAstId):
+	m_errorReporter(_errorReporter),
+	m_maxAstId(_maxAstId),
+	m_annotations(std::make_unique<AnnotationContainer[]>(static_cast<size_t>(_maxAstId + 1))),
+	m_globalAnnotation(std::make_unique<GlobalAnnotationContainer>())
+{
+}
+
+Analysis::~Analysis()
+{}
+
+template<size_t... Is>
+std::tuple<std::integral_constant<size_t, Is>...> makeIndexTuple(std::index_sequence<Is...>) {
+	return std::make_tuple( std::integral_constant<size_t, Is>{}...);
+}
+
+bool Analysis::check(std::vector<std::shared_ptr<SourceUnit const>> const& _sourceUnits)
+{
+	using AnalysisSteps = std::tuple<
+		SyntaxRestrictor,
+		TypeClassRegistration,
+		TypeRegistration,
+		// TODO move after step introduced in https://github.com/ethereum/solidity/pull/14578, but before TypeInference
+		FunctionDependencyAnalysis,
+		TypeInference,
+		DebugWarner
+	>;
+
+	return std::apply([&](auto... _indexTuple) {
+		return ([&](auto&& _step) {
+			for (auto source: _sourceUnits)
+				if (!_step.analyze(*source))
+					return false;
+			return true;
+		}(std::tuple_element_t<decltype(_indexTuple)::value, AnalysisSteps>{*this}) && ...);
+	}, makeIndexTuple(std::make_index_sequence<std::tuple_size_v<AnalysisSteps>>{}));
+
+/*
+	{
+		SyntaxRestrictor syntaxRestrictor{*this};
+		for (auto source: _sourceUnits)
+			if (!syntaxRestrictor.analyze(*source))
+				return false;
+	}
+
+	{
+		TypeRegistration typeRegistration{*this};
+		for (auto source: _sourceUnits)
+			if (!typeRegistration.analyze(*source))
+				return false;
+	}
+	{
+		TypeInference typeInference{*this};
+		for (auto source: _sourceUnits)
+			if (!typeInference.analyze(*source))
+				return false;
+	}
+	return true;
+ */
 }
diff --git a/libsolidity/experimental/analysis/Analysis.h b/libsolidity/experimental/analysis/Analysis.h
index 729ff2b93d..dde3a24efb 100644
--- a/libsolidity/experimental/analysis/Analysis.h
+++ b/libsolidity/experimental/analysis/Analysis.h
@@ -17,12 +17,16 @@
 // SPDX-License-Identifier: GPL-3.0
 #pragma once
 
-#include <vector>
+#include <libsolidity/experimental/ast/TypeSystem.h>
+
+#include <cstdint>
 #include <memory>
+#include <vector>
 
 namespace solidity::frontend
 {
 class SourceUnit;
+class ASTNode;
 }
 
 namespace solidity::langutil
@@ -33,17 +37,79 @@ class ErrorReporter;
 namespace solidity::frontend::experimental
 {
 
+class TypeSystem;
+
+class Analysis;
+
+namespace detail
+{
+template<typename Step>
+struct AnnotationFetcher
+{
+	Analysis& analysis;
+	typename Step::Annotation& get(ASTNode const& _node);
+	typename Step::GlobalAnnotation& get();
+};
+template<typename Step>
+struct ConstAnnotationFetcher
+{
+	Analysis const& analysis;
+	typename Step::Annotation const& get(ASTNode const& _node) const;
+	typename Step::GlobalAnnotation const& get() const;
+};
+}
+
 class Analysis
 {
-public:
-	Analysis(langutil::ErrorReporter& _errorReporter):
-		m_errorReporter(_errorReporter)
-	{}
+	struct AnnotationContainer;
+	struct GlobalAnnotationContainer;
 
+public:
+	Analysis(langutil::ErrorReporter& _errorReporter, uint64_t _maxAstId);
+	Analysis(Analysis const&) = delete;
+	~Analysis();
+	Analysis const& operator=(Analysis const&) = delete;
 	bool check(std::vector<std::shared_ptr<SourceUnit const>> const& _sourceUnits);
+	langutil::ErrorReporter& errorReporter() { return m_errorReporter; }
+	uint64_t maxAstId() const { return m_maxAstId; }
+	TypeSystem& typeSystem() { return m_typeSystem; }
+	TypeSystem const& typeSystem() const { return m_typeSystem; }
+
+	template<typename Step>
+	typename Step::Annotation& annotation(ASTNode const& _node)
+	{
+		return detail::AnnotationFetcher<Step>{*this}.get(_node);
+	}
+
+	template<typename Step>
+	typename Step::Annotation const& annotation(ASTNode const& _node) const
+	{
+		return detail::ConstAnnotationFetcher<Step>{*this}.get(_node);
+	}
+
+	template<typename Step>
+	typename Step::GlobalAnnotation& annotation()
+	{
+		return detail::AnnotationFetcher<Step>{*this}.get();
+	}
+
+	template<typename Step>
+	typename Step::GlobalAnnotation const& annotation() const
+	{
+		return detail::ConstAnnotationFetcher<Step>{*this}.get();
+	}
+
+	AnnotationContainer& annotationContainer(ASTNode const& _node);
+	AnnotationContainer const& annotationContainer(ASTNode const& _node) const;
+	GlobalAnnotationContainer& annotationContainer() { return *m_globalAnnotation; }
+	GlobalAnnotationContainer const& annotationContainer() const { return *m_globalAnnotation; }
 
 private:
 	langutil::ErrorReporter& m_errorReporter;
+	TypeSystem m_typeSystem;
+	uint64_t m_maxAstId = 0;
+	std::unique_ptr<AnnotationContainer[]> m_annotations;
+	std::unique_ptr<GlobalAnnotationContainer> m_globalAnnotation;
 };
 
 }
diff --git a/libsolidity/experimental/analysis/DebugWarner.cpp b/libsolidity/experimental/analysis/DebugWarner.cpp
new file mode 100644
index 0000000000..2b5c23b9be
--- /dev/null
+++ b/libsolidity/experimental/analysis/DebugWarner.cpp
@@ -0,0 +1,50 @@
+/*
+	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 <libsolidity/experimental/analysis/DebugWarner.h>
+
+#include <libsolidity/experimental/analysis/Analysis.h>
+#include <libsolidity/experimental/analysis/TypeInference.h>
+#include <libsolidity/experimental/ast/TypeSystemHelper.h>
+
+#include <liblangutil/Exceptions.h>
+
+using namespace solidity::frontend;
+using namespace solidity::frontend::experimental;
+using namespace solidity::langutil;
+
+DebugWarner::DebugWarner(Analysis& _analysis): m_analysis(_analysis), m_errorReporter(_analysis.errorReporter())
+{}
+
+bool DebugWarner::analyze(ASTNode const& _astRoot)
+{
+	_astRoot.accept(*this);
+	return !Error::containsErrors(m_errorReporter.errors());
+}
+
+bool DebugWarner::visitNode(ASTNode const& _node)
+{
+	std::optional<Type> const& inferredType = m_analysis.annotation<TypeInference>(_node).type;
+	if (inferredType.has_value())
+		m_errorReporter.info(
+			4164_error,
+			_node.location(),
+			"Inferred type: " + TypeEnvironmentHelpers{m_analysis.typeSystem().env()}.typeToString(*inferredType)
+		);
+	return true;
+}
diff --git a/libsolidity/experimental/analysis/DebugWarner.h b/libsolidity/experimental/analysis/DebugWarner.h
new file mode 100644
index 0000000000..a7b5ac6d01
--- /dev/null
+++ b/libsolidity/experimental/analysis/DebugWarner.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
+#pragma once
+
+#include <libsolidity/ast/ASTVisitor.h>
+
+#include <liblangutil/ErrorReporter.h>
+
+namespace solidity::frontend::experimental
+{
+class Analysis;
+
+class DebugWarner: public ASTConstVisitor
+{
+public:
+	DebugWarner(Analysis& _analysis);
+
+	bool analyze(ASTNode const& _astRoot);
+
+private:
+	bool visitNode(ASTNode const& _node) override;
+
+	Analysis& m_analysis;
+	langutil::ErrorReporter& m_errorReporter;
+};
+
+}
diff --git a/libsolidity/experimental/analysis/FunctionDependencyAnalysis.cpp b/libsolidity/experimental/analysis/FunctionDependencyAnalysis.cpp
new file mode 100644
index 0000000000..332f7620c9
--- /dev/null
+++ b/libsolidity/experimental/analysis/FunctionDependencyAnalysis.cpp
@@ -0,0 +1,72 @@
+/*
+	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 <libsolidity/experimental/analysis/Analysis.h>
+#include <libsolidity/experimental/analysis/FunctionDependencyAnalysis.h>
+
+using namespace solidity::frontend::experimental;
+using namespace solidity::util;
+
+FunctionDependencyAnalysis::FunctionDependencyAnalysis(Analysis& _analysis):
+	m_analysis(_analysis),
+	m_errorReporter(_analysis.errorReporter())
+{
+}
+
+bool FunctionDependencyAnalysis::analyze(SourceUnit const& _sourceUnit)
+{
+	_sourceUnit.accept(*this);
+	return !m_errorReporter.hasErrors();
+}
+
+bool FunctionDependencyAnalysis::visit(FunctionDefinition const& _functionDefinition)
+{
+	solAssert(!m_currentFunction);
+	m_currentFunction = &_functionDefinition;
+	// Insert a function definition pointer that maps to an empty set; the pointed to set will later be
+	// populated in ``endVisit(Identifier const& _identifier)`` if ``m_currentFunction`` references another.
+	auto [_, inserted] = annotation().functionCallGraph.edges.try_emplace(
+		m_currentFunction, std::set<FunctionDefinition const*, ASTCompareByID<FunctionDefinition>>{}
+	);
+	solAssert(inserted);
+	return true;
+}
+
+void FunctionDependencyAnalysis::endVisit(FunctionDefinition const&)
+{
+	m_currentFunction = nullptr;
+}
+
+void FunctionDependencyAnalysis::endVisit(Identifier const& _identifier)
+{
+	auto const* callee = dynamic_cast<FunctionDefinition const*>(_identifier.annotation().referencedDeclaration);
+	// Check that the identifier is within a function body and is a function, and add it to the graph
+	// as an ``m_currentFunction`` -> ``callee`` edge.
+	if (m_currentFunction && callee)
+		addEdge(m_currentFunction, callee);
+}
+
+void FunctionDependencyAnalysis::addEdge(FunctionDefinition const* _caller, FunctionDefinition const* _callee)
+{
+	annotation().functionCallGraph.edges[_caller].insert(_callee);
+}
+
+FunctionDependencyAnalysis::GlobalAnnotation& FunctionDependencyAnalysis::annotation()
+{
+	return m_analysis.annotation<FunctionDependencyAnalysis>();
+}
diff --git a/libsolidity/experimental/analysis/FunctionDependencyAnalysis.h b/libsolidity/experimental/analysis/FunctionDependencyAnalysis.h
new file mode 100644
index 0000000000..acd3f1b213
--- /dev/null
+++ b/libsolidity/experimental/analysis/FunctionDependencyAnalysis.h
@@ -0,0 +1,57 @@
+/*
+	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
+
+#pragma once
+
+#include <liblangutil/ErrorReporter.h>
+#include <libsolidity/ast/ASTForward.h>
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/experimental/ast/FunctionCallGraph.h>
+
+#include <memory>
+
+namespace solidity::frontend::experimental
+{
+
+class Analysis;
+
+class FunctionDependencyAnalysis: private ASTConstVisitor
+{
+public:
+	FunctionDependencyAnalysis(Analysis& _analysis);
+	bool analyze(SourceUnit const& _sourceUnit);
+
+	struct Annotation {};
+	struct GlobalAnnotation
+	{
+		FunctionDependencyGraph functionCallGraph;
+	};
+
+private:
+	bool visit(FunctionDefinition const& _functionDefinition) override;
+	void endVisit(FunctionDefinition const&) override;
+	void endVisit(Identifier const& _identifier) override;
+	void addEdge(FunctionDefinition const* _caller, FunctionDefinition const* _callee);
+	GlobalAnnotation& annotation();
+
+	Analysis& m_analysis;
+	langutil::ErrorReporter& m_errorReporter;
+	FunctionDefinition const* m_currentFunction = nullptr;
+};
+
+}
diff --git a/libsolidity/experimental/analysis/SyntaxRestrictor.cpp b/libsolidity/experimental/analysis/SyntaxRestrictor.cpp
new file mode 100644
index 0000000000..e93fddcf50
--- /dev/null
+++ b/libsolidity/experimental/analysis/SyntaxRestrictor.cpp
@@ -0,0 +1,113 @@
+/*
+	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 <libsolidity/experimental/analysis/SyntaxRestrictor.h>
+
+#include <libsolidity/experimental/analysis/Analysis.h>
+
+#include <liblangutil/Exceptions.h>
+
+using namespace solidity::frontend;
+using namespace solidity::frontend::experimental;
+using namespace solidity::langutil;
+
+SyntaxRestrictor::SyntaxRestrictor(Analysis& _analysis): m_errorReporter(_analysis.errorReporter())
+{}
+
+bool SyntaxRestrictor::analyze(ASTNode const& _astRoot)
+{
+	_astRoot.accept(*this);
+	return !Error::containsErrors(m_errorReporter.errors());
+}
+
+bool SyntaxRestrictor::visitNode(ASTNode const& _node)
+{
+	if (!_node.experimentalSolidityOnly())
+		m_errorReporter.syntaxError(9282_error, _node.location(), "Unsupported AST node.");
+	return false;
+}
+
+bool SyntaxRestrictor::visit(ContractDefinition const& _contractDefinition)
+{
+	if (_contractDefinition.contractKind() != ContractKind::Contract)
+		m_errorReporter.syntaxError(9159_error, _contractDefinition.location(), "Only contracts are supported.");
+	if (!_contractDefinition.baseContracts().empty())
+		m_errorReporter.syntaxError(5731_error, _contractDefinition.location(), "Inheritance unsupported.");
+	return true;
+}
+
+bool SyntaxRestrictor::visit(FunctionDefinition const& _functionDefinition)
+{
+	if (!_functionDefinition.isImplemented())
+		m_errorReporter.syntaxError(1741_error, _functionDefinition.location(), "Functions must be implemented.");
+	if (!_functionDefinition.modifiers().empty())
+		m_errorReporter.syntaxError(9988_error, _functionDefinition.location(), "Function may not have modifiers.");
+	if (_functionDefinition.overrides())
+		m_errorReporter.syntaxError(5044_error, _functionDefinition.location(), "Function may not have override specifiers.");
+	solAssert(!_functionDefinition.returnParameterList());
+	if (_functionDefinition.isFree())
+	{
+		if (_functionDefinition.stateMutability() != StateMutability::NonPayable)
+			m_errorReporter.syntaxError(5714_error, _functionDefinition.location(), "Free functions may not have a mutability.");
+	}
+	else
+	{
+		if (_functionDefinition.isFallback())
+		{
+			if (_functionDefinition.visibility() != Visibility::External)
+				m_errorReporter.syntaxError(7341_error, _functionDefinition.location(), "Fallback function must be external.");
+		}
+		else
+			m_errorReporter.syntaxError(4496_error, _functionDefinition.location(), "Only fallback functions are supported in contracts.");
+	}
+
+	return true;
+}
+
+bool SyntaxRestrictor::visit(VariableDeclarationStatement const& _variableDeclarationStatement)
+{
+	if (_variableDeclarationStatement.declarations().size() == 1)
+	{
+		if (!_variableDeclarationStatement.declarations().front())
+			m_errorReporter.syntaxError(9658_error, _variableDeclarationStatement.initialValue()->location(), "Variable declaration has to declare a single variable.");
+	}
+	else
+		m_errorReporter.syntaxError(3520_error, _variableDeclarationStatement.initialValue()->location(), "Variable declarations can only declare a single variable.");
+	return true;
+}
+
+bool SyntaxRestrictor::visit(VariableDeclaration const& _variableDeclaration)
+{
+	if (_variableDeclaration.value())
+		m_errorReporter.syntaxError(1801_error, _variableDeclaration.value()->location(), "Variable declarations with initial value not supported.");
+	if (_variableDeclaration.isStateVariable())
+		m_errorReporter.syntaxError(6388_error, _variableDeclaration.location(), "State variables are not supported.");
+	if (!_variableDeclaration.isLocalVariable())
+		m_errorReporter.syntaxError(8953_error, _variableDeclaration.location(), "Only local variables are supported.");
+	if (_variableDeclaration.mutability() != VariableDeclaration::Mutability::Mutable)
+		m_errorReporter.syntaxError(2934_error, _variableDeclaration.location(), "Only mutable variables are supported.");
+	if (_variableDeclaration.isIndexed())
+		m_errorReporter.syntaxError(9603_error, _variableDeclaration.location(), "Indexed variables are not supported.");
+	if (!_variableDeclaration.noVisibilitySpecified())
+		m_errorReporter.syntaxError(8809_error, _variableDeclaration.location(), "Variables with visibility not supported.");
+	if (_variableDeclaration.overrides())
+		m_errorReporter.syntaxError(6175_error, _variableDeclaration.location(), "Variables with override specifier not supported.");
+	if (_variableDeclaration.referenceLocation() != VariableDeclaration::Location::Unspecified)
+		m_errorReporter.syntaxError(5360_error, _variableDeclaration.location(), "Variables with reference location not supported.");
+	return true;
+}
diff --git a/libsolidity/experimental/analysis/SyntaxRestrictor.h b/libsolidity/experimental/analysis/SyntaxRestrictor.h
new file mode 100644
index 0000000000..86d2d1b496
--- /dev/null
+++ b/libsolidity/experimental/analysis/SyntaxRestrictor.h
@@ -0,0 +1,67 @@
+/*
+	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
+#pragma once
+
+#include <libsolidity/ast/ASTVisitor.h>
+
+#include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Exceptions.h>
+
+namespace solidity::frontend::experimental
+{
+class Analysis;
+
+class SyntaxRestrictor: public ASTConstVisitor
+{
+public:
+	SyntaxRestrictor(Analysis& _analysis);
+
+	bool analyze(ASTNode const& _astRoot);
+
+private:
+	/// Default visit will reject all AST nodes that are not explicitly allowed.
+	bool visitNode(ASTNode const& _node) override;
+
+	bool visit(SourceUnit const&) override { return true; }
+	bool visit(PragmaDirective const&) override { return true; }
+	bool visit(ImportDirective const&) override { return true; }
+	bool visit(ContractDefinition const& _contractDefinition) override;
+	bool visit(FunctionDefinition const& _functionDefinition) override;
+	bool visit(ExpressionStatement const&) override { return true; }
+	bool visit(FunctionCall const&) override { return true; }
+	bool visit(Assignment const&) override { return true; }
+	bool visit(Block const&) override { return true; }
+	bool visit(InlineAssembly const&) override { return true; }
+	bool visit(Identifier const&) override { return true; }
+	bool visit(IdentifierPath const&) override { return true; }
+	bool visit(IfStatement const&) override { return true; }
+	bool visit(VariableDeclarationStatement const&) override;
+	bool visit(VariableDeclaration const&) override;
+	bool visit(ElementaryTypeName const&) override { return true; }
+	bool visit(ParameterList const&) override { return true; }
+	bool visit(Return const&) override { return true; }
+	bool visit(MemberAccess const&) override { return true; }
+	bool visit(BinaryOperation const&) override { return true; }
+	bool visit(ElementaryTypeNameExpression const&) override { return true; }
+	bool visit(TupleExpression const&) override { return true; }
+	bool visit(Literal const&) override { return true; }
+
+	langutil::ErrorReporter& m_errorReporter;
+};
+
+}
diff --git a/libsolidity/experimental/analysis/TypeClassRegistration.cpp b/libsolidity/experimental/analysis/TypeClassRegistration.cpp
new file mode 100644
index 0000000000..fe70a44d1e
--- /dev/null
+++ b/libsolidity/experimental/analysis/TypeClassRegistration.cpp
@@ -0,0 +1,62 @@
+/*
+	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 <libsolidity/experimental/analysis/TypeClassRegistration.h>
+
+#include <libsolidity/experimental/analysis/Analysis.h>
+
+#include <liblangutil/ErrorReporter.h>
+#include <liblangutil/Exceptions.h>
+
+using namespace solidity::frontend::experimental;
+using namespace solidity::langutil;
+
+TypeClassRegistration::TypeClassRegistration(Analysis& _analysis):
+	m_analysis(_analysis),
+	m_errorReporter(_analysis.errorReporter()),
+	m_typeSystem(_analysis.typeSystem())
+{
+}
+
+bool TypeClassRegistration::analyze(SourceUnit const& _sourceUnit)
+{
+	_sourceUnit.accept(*this);
+	return !m_errorReporter.hasErrors();
+}
+
+bool TypeClassRegistration::visit(TypeClassDefinition const& _typeClassDefinition)
+{
+	std::variant<TypeClass, std::string> typeClassOrError = m_typeSystem.declareTypeClass(
+		_typeClassDefinition.name(),
+		&_typeClassDefinition
+	);
+
+	m_analysis.annotation<TypeClassRegistration>(_typeClassDefinition).typeClass = std::visit(
+		util::GenericVisitor{
+			[](TypeClass _class) -> TypeClass { return _class; },
+			[&](std::string _error) -> TypeClass {
+				m_errorReporter.fatalTypeError(4767_error, _typeClassDefinition.location(), _error);
+				util::unreachable();
+			}
+		},
+		typeClassOrError
+	);
+
+	return true;
+}
diff --git a/libsolidity/experimental/analysis/TypeClassRegistration.h b/libsolidity/experimental/analysis/TypeClassRegistration.h
new file mode 100644
index 0000000000..c0c1c3549b
--- /dev/null
+++ b/libsolidity/experimental/analysis/TypeClassRegistration.h
@@ -0,0 +1,58 @@
+/*
+	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
+#pragma once
+
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/experimental/ast/TypeSystem.h>
+
+namespace solidity::langutil
+{
+class ErrorReporter;
+}
+
+namespace solidity::frontend::experimental
+{
+
+class Analysis;
+class TypeSystem;
+
+class TypeClassRegistration: public ASTConstVisitor
+{
+public:
+	struct Annotation
+	{
+		// Type classes.
+		std::optional<TypeClass> typeClass;
+	};
+	struct GlobalAnnotation
+	{
+	};
+
+	TypeClassRegistration(Analysis& _analysis);
+
+	bool analyze(SourceUnit const& _sourceUnit);
+
+private:
+	bool visit(TypeClassDefinition const& _typeClassDefinition) override;
+
+	Analysis& m_analysis;
+	langutil::ErrorReporter& m_errorReporter;
+	TypeSystem& m_typeSystem;
+};
+
+}
diff --git a/libsolidity/experimental/analysis/TypeInference.cpp b/libsolidity/experimental/analysis/TypeInference.cpp
new file mode 100644
index 0000000000..a13d6ebc94
--- /dev/null
+++ b/libsolidity/experimental/analysis/TypeInference.cpp
@@ -0,0 +1,1211 @@
+/*
+	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 <libsolidity/experimental/analysis/TypeInference.h>
+
+#include <libsolidity/experimental/analysis/TypeClassRegistration.h>
+#include <libsolidity/experimental/analysis/TypeRegistration.h>
+#include <libsolidity/experimental/analysis/Analysis.h>
+#include <libsolidity/experimental/ast/TypeSystemHelper.h>
+
+#include <libsolutil/Numeric.h>
+#include <libsolutil/StringUtils.h>
+#include <liblangutil/Exceptions.h>
+
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
+
+#include <boost/algorithm/string.hpp>
+#include <range/v3/view/transform.hpp>
+
+using namespace solidity;
+using namespace solidity::frontend;
+using namespace solidity::frontend::experimental;
+using namespace solidity::langutil;
+
+TypeInference::TypeInference(Analysis& _analysis):
+	m_analysis(_analysis),
+	m_errorReporter(_analysis.errorReporter()),
+	m_typeSystem(_analysis.typeSystem()),
+	m_env(&m_typeSystem.env()),
+	m_voidType(m_typeSystem.type(PrimitiveType::Void, {})),
+	m_wordType(m_typeSystem.type(PrimitiveType::Word, {})),
+	m_integerType(m_typeSystem.type(PrimitiveType::Integer, {})),
+	m_unitType(m_typeSystem.type(PrimitiveType::Unit, {})),
+	m_boolType(m_typeSystem.type(PrimitiveType::Bool, {}))
+{
+	TypeSystemHelpers helper{m_typeSystem};
+
+	auto declareBuiltinClass = [&](std::string _name, BuiltinClass _class) -> TypeClass {
+		auto result = m_typeSystem.declareTypeClass(_name, nullptr);
+		if (auto error = std::get_if<std::string>(&result))
+			solAssert(!error, *error);
+		TypeClass declaredClass = std::get<TypeClass>(result);
+		// TODO: validation?
+		solAssert(annotation().builtinClassesByName.emplace(_name, _class).second);
+		return annotation().builtinClasses.emplace(_class, declaredClass).first->second;
+	};
+
+	auto registeredTypeClass = [&](BuiltinClass _builtinClass) -> TypeClass {
+		return annotation().builtinClasses.at(_builtinClass);
+	};
+
+	auto defineConversion = [&](BuiltinClass _builtinClass, PrimitiveType _fromType, std::string _functionName) {
+		annotation().typeClassFunctions[registeredTypeClass(_builtinClass)] = {{
+			std::move(_functionName),
+			helper.functionType(
+				m_typeSystem.type(_fromType, {}),
+				m_typeSystem.typeClassInfo(registeredTypeClass(_builtinClass)).typeVariable
+			),
+		}};
+	};
+
+	auto defineBinaryMonoidalOperator = [&](BuiltinClass _builtinClass, Token _token, std::string _functionName) {
+		Type typeVar = m_typeSystem.typeClassInfo(registeredTypeClass(_builtinClass)).typeVariable;
+		annotation().operators.emplace(_token, std::make_tuple(registeredTypeClass(_builtinClass), _functionName));
+		annotation().typeClassFunctions[registeredTypeClass(_builtinClass)] = {{
+			std::move(_functionName),
+			helper.functionType(
+				helper.tupleType({typeVar, typeVar}),
+				typeVar
+			)
+		}};
+	};
+
+	auto defineBinaryCompareOperator = [&](BuiltinClass _builtinClass, Token _token, std::string _functionName) {
+		Type typeVar = m_typeSystem.typeClassInfo(registeredTypeClass(_builtinClass)).typeVariable;
+		annotation().operators.emplace(_token, std::make_tuple(registeredTypeClass(_builtinClass), _functionName));
+		annotation().typeClassFunctions[registeredTypeClass(_builtinClass)] = {{
+			std::move(_functionName),
+			helper.functionType(
+				helper.tupleType({typeVar, typeVar}),
+				m_typeSystem.type(PrimitiveType::Bool, {})
+			)
+		}};
+	};
+
+	declareBuiltinClass("integer", BuiltinClass::Integer);
+	declareBuiltinClass("*", BuiltinClass::Mul);
+	declareBuiltinClass("+", BuiltinClass::Add);
+	declareBuiltinClass("==", BuiltinClass::Equal);
+	declareBuiltinClass("<", BuiltinClass::Less);
+	declareBuiltinClass("<=", BuiltinClass::LessOrEqual);
+	declareBuiltinClass(">", BuiltinClass::Greater);
+	declareBuiltinClass(">=", BuiltinClass::GreaterOrEqual);
+
+	defineConversion(BuiltinClass::Integer, PrimitiveType::Integer, "fromInteger");
+
+	defineBinaryMonoidalOperator(BuiltinClass::Mul, Token::Mul, "mul");
+	defineBinaryMonoidalOperator(BuiltinClass::Add, Token::Add, "add");
+
+	defineBinaryCompareOperator(BuiltinClass::Equal, Token::Equal, "eq");
+	defineBinaryCompareOperator(BuiltinClass::Less, Token::LessThan, "lt");
+	defineBinaryCompareOperator(BuiltinClass::LessOrEqual, Token::LessThanOrEqual, "leq");
+	defineBinaryCompareOperator(BuiltinClass::Greater, Token::GreaterThan, "gt");
+	defineBinaryCompareOperator(BuiltinClass::GreaterOrEqual, Token::GreaterThanOrEqual, "geq");
+}
+
+bool TypeInference::analyze(SourceUnit const& _sourceUnit)
+{
+	_sourceUnit.accept(*this);
+	return !m_errorReporter.hasErrors();
+}
+
+bool TypeInference::visit(FunctionDefinition const& _functionDefinition)
+{
+	solAssert(m_expressionContext == ExpressionContext::Term);
+	auto& functionAnnotation = annotation(_functionDefinition);
+	if (functionAnnotation.type)
+		return false;
+
+	ScopedSaveAndRestore signatureRestore(m_currentFunctionType, std::nullopt);
+
+	Type argumentsType = m_typeSystem.freshTypeVariable({});
+	Type returnType = m_typeSystem.freshTypeVariable({});
+	Type functionType = TypeSystemHelpers{m_typeSystem}.functionType(argumentsType, returnType);
+
+	m_currentFunctionType = functionType;
+	functionAnnotation.type = functionType;
+
+
+	_functionDefinition.parameterList().accept(*this);
+	unify(argumentsType, type(_functionDefinition.parameterList()), _functionDefinition.parameterList().location());
+	if (_functionDefinition.experimentalReturnExpression())
+	{
+		ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Type};
+		_functionDefinition.experimentalReturnExpression()->accept(*this);
+		unify(
+			returnType,
+			type(*_functionDefinition.experimentalReturnExpression()),
+			_functionDefinition.experimentalReturnExpression()->location()
+		);
+	}
+	else
+		unify(returnType, m_unitType, _functionDefinition.location());
+
+	if (_functionDefinition.isImplemented())
+		_functionDefinition.body().accept(*this);
+
+	return false;
+}
+
+void TypeInference::endVisit(Return const& _return)
+{
+	solAssert(m_currentFunctionType);
+	Type functionReturnType = std::get<1>(TypeSystemHelpers{m_typeSystem}.destFunctionType(*m_currentFunctionType));
+	if (_return.expression())
+		unify(functionReturnType, type(*_return.expression()), _return.location());
+	else
+		unify(functionReturnType, m_unitType, _return.location());
+}
+
+void TypeInference::endVisit(ParameterList const& _parameterList)
+{
+	auto& listAnnotation = annotation(_parameterList);
+	solAssert(!listAnnotation.type);
+	listAnnotation.type = TypeSystemHelpers{m_typeSystem}.tupleType(
+		_parameterList.parameters() | ranges::views::transform([&](auto _arg) { return type(*_arg); }) | ranges::to<std::vector<Type>>
+	);
+}
+
+bool TypeInference::visit(TypeClassDefinition const& _typeClassDefinition)
+{
+	solAssert(m_expressionContext == ExpressionContext::Term);
+	auto& typeClassDefinitionAnnotation = annotation(_typeClassDefinition);
+	if (typeClassDefinitionAnnotation.type)
+		return false;
+
+	typeClassDefinitionAnnotation.type = type(&_typeClassDefinition, {});
+
+	{
+		ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Type};
+		_typeClassDefinition.typeVariable().accept(*this);
+	}
+
+	std::map<std::string, Type> functionTypes;
+
+	solAssert(m_analysis.annotation<TypeClassRegistration>(_typeClassDefinition).typeClass.has_value());
+	TypeClass typeClass = m_analysis.annotation<TypeClassRegistration>(_typeClassDefinition).typeClass.value();
+	Type typeVar = m_typeSystem.typeClassVariable(typeClass);
+	auto& typeMembersAnnotation = annotation().members[typeConstructor(&_typeClassDefinition)];
+
+	for (auto subNode: _typeClassDefinition.subNodes())
+	{
+		subNode->accept(*this);
+		auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(subNode.get());
+		solAssert(functionDefinition);
+		auto functionType = type(*functionDefinition);
+		if (!functionTypes.emplace(functionDefinition->name(), functionType).second)
+			m_errorReporter.fatalTypeError(3195_error, functionDefinition->location(), "Function in type class declared multiple times.");
+		auto typeVars = TypeEnvironmentHelpers{*m_env}.typeVars(functionType);
+		if (typeVars.size() != 1)
+			m_errorReporter.fatalTypeError(8379_error, functionDefinition->location(), "Function in type class may only depend on the type class variable.");
+		unify(typeVars.front(), typeVar, functionDefinition->location());
+		typeMembersAnnotation[functionDefinition->name()] = TypeMember{functionType};
+	}
+
+	annotation().typeClassFunctions[typeClass] = std::move(functionTypes);
+
+	for (auto [functionName, functionType]: functionTypes)
+	{
+		TypeEnvironmentHelpers helper{*m_env};
+		auto typeVars = helper.typeVars(functionType);
+		if (typeVars.empty())
+			m_errorReporter.typeError(1723_error, _typeClassDefinition.location(), "Function " + functionName + " does not depend on class variable.");
+		if (typeVars.size() > 2)
+			m_errorReporter.typeError(6387_error, _typeClassDefinition.location(), "Function " + functionName + " depends on multiple type variables.");
+		if (!m_env->typeEquals(typeVars.front(), typeVar))
+			m_errorReporter.typeError(1807_error, _typeClassDefinition.location(), "Function " + functionName + " depends on invalid type variable.");
+	}
+
+	unify(type(_typeClassDefinition.typeVariable()), m_typeSystem.freshTypeVariable({{typeClass}}), _typeClassDefinition.location());
+	for (auto instantiation: m_analysis.annotation<TypeRegistration>(_typeClassDefinition).instantiations | ranges::views::values)
+		// TODO: recursion-safety? Order of instantiation?
+		instantiation->accept(*this);
+
+	return false;
+}
+
+bool TypeInference::visit(InlineAssembly const& _inlineAssembly)
+{
+	// External references have already been resolved in a prior stage and stored in the annotation.
+	// We run the resolve step again regardless.
+	yul::ExternalIdentifierAccess::Resolver identifierAccess = [&](
+		yul::Identifier const& _identifier,
+		yul::IdentifierContext _context,
+		bool
+	) -> bool
+	{
+		if (_context == yul::IdentifierContext::NonExternal)
+		{
+			// TODO: do we need this?
+			// Hack until we can disallow any shadowing: If we found an internal reference,
+			// clear the external references, so that codegen does not use it.
+			_inlineAssembly.annotation().externalReferences.erase(& _identifier);
+			return false;
+		}
+		InlineAssemblyAnnotation::ExternalIdentifierInfo* identifierInfo = util::valueOrNullptr(_inlineAssembly.annotation().externalReferences, &_identifier);
+		if (!identifierInfo)
+			return false;
+		Declaration const* declaration = identifierInfo->declaration;
+		solAssert(!!declaration, "");
+		solAssert(identifierInfo->suffix == "", "");
+
+		unify(type(*declaration), m_wordType, originLocationOf(_identifier));
+		identifierInfo->valueSize = 1;
+		return true;
+	};
+	solAssert(!_inlineAssembly.annotation().analysisInfo, "");
+	_inlineAssembly.annotation().analysisInfo = std::make_shared<yul::AsmAnalysisInfo>();
+	yul::AsmAnalyzer analyzer(
+		*_inlineAssembly.annotation().analysisInfo,
+		m_errorReporter,
+		_inlineAssembly.dialect(),
+		identifierAccess
+	);
+	if (!analyzer.analyze(_inlineAssembly.operations()))
+		solAssert(m_errorReporter.hasErrors());
+	return false;
+}
+
+bool TypeInference::visit(BinaryOperation const& _binaryOperation)
+{
+	auto& operationAnnotation = annotation(_binaryOperation);
+	solAssert(!operationAnnotation.type);
+	TypeSystemHelpers helper{m_typeSystem};
+	switch (m_expressionContext)
+	{
+	case ExpressionContext::Term:
+		if (auto* operatorInfo = util::valueOrNullptr(annotation().operators, _binaryOperation.getOperator()))
+		{
+			auto [typeClass, functionName] = *operatorInfo;
+			// TODO: error robustness?
+			Type functionType = m_env->fresh(annotation().typeClassFunctions.at(typeClass).at(functionName));
+
+			_binaryOperation.leftExpression().accept(*this);
+			_binaryOperation.rightExpression().accept(*this);
+
+			Type argTuple = helper.tupleType({type(_binaryOperation.leftExpression()), type(_binaryOperation.rightExpression())});
+			Type resultType = m_typeSystem.freshTypeVariable({});
+			Type genericFunctionType = helper.functionType(argTuple, resultType);
+			unify(functionType, genericFunctionType, _binaryOperation.location());
+
+			operationAnnotation.type = resultType;
+		}
+		else if (_binaryOperation.getOperator() == Token::Colon)
+		{
+			_binaryOperation.leftExpression().accept(*this);
+			{
+				ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Type};
+				_binaryOperation.rightExpression().accept(*this);
+			}
+			Type leftType = type(_binaryOperation.leftExpression());
+			unify(leftType, type(_binaryOperation.rightExpression()), _binaryOperation.location());
+			operationAnnotation.type = leftType;
+		}
+		else
+		{
+			m_errorReporter.typeError(4504_error, _binaryOperation.location(), "Binary operation in term context not yet supported.");
+			operationAnnotation.type = m_typeSystem.freshTypeVariable({});
+		}
+		return false;
+	case ExpressionContext::Type:
+		if (_binaryOperation.getOperator() == Token::Colon)
+		{
+			_binaryOperation.leftExpression().accept(*this);
+			{
+				ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Sort};
+				_binaryOperation.rightExpression().accept(*this);
+			}
+			Type leftType = type(_binaryOperation.leftExpression());
+			unify(leftType, type(_binaryOperation.rightExpression()), _binaryOperation.location());
+			operationAnnotation.type = leftType;
+		}
+		else if (_binaryOperation.getOperator() == Token::RightArrow)
+		{
+			_binaryOperation.leftExpression().accept(*this);
+			_binaryOperation.rightExpression().accept(*this);
+			operationAnnotation.type = helper.functionType(type(_binaryOperation.leftExpression()), type(_binaryOperation.rightExpression()));
+		}
+		else if (_binaryOperation.getOperator() == Token::BitOr)
+		{
+			_binaryOperation.leftExpression().accept(*this);
+			_binaryOperation.rightExpression().accept(*this);
+			operationAnnotation.type = helper.sumType({type(_binaryOperation.leftExpression()), type(_binaryOperation.rightExpression())});
+		}
+		else
+		{
+			m_errorReporter.typeError(1439_error, _binaryOperation.location(), "Invalid binary operations in type context.");
+			operationAnnotation.type = m_typeSystem.freshTypeVariable({});
+		}
+		return false;
+	case ExpressionContext::Sort:
+		m_errorReporter.typeError(1017_error, _binaryOperation.location(), "Invalid binary operation in sort context.");
+		operationAnnotation.type = m_typeSystem.freshTypeVariable({});
+		return false;
+	}
+	return false;
+}
+
+void TypeInference::endVisit(VariableDeclarationStatement const& _variableDeclarationStatement)
+{
+	solAssert(m_expressionContext == ExpressionContext::Term);
+	if (_variableDeclarationStatement.declarations().size () != 1)
+	{
+		m_errorReporter.typeError(2655_error, _variableDeclarationStatement.location(), "Multi variable declaration not supported.");
+		return;
+	}
+	Type variableType = type(*_variableDeclarationStatement.declarations().front());
+	if (_variableDeclarationStatement.initialValue())
+		unify(variableType, type(*_variableDeclarationStatement.initialValue()), _variableDeclarationStatement.location());
+}
+
+bool TypeInference::visit(VariableDeclaration const& _variableDeclaration)
+{
+	solAssert(!_variableDeclaration.value());
+	auto& variableAnnotation = annotation(_variableDeclaration);
+	solAssert(!variableAnnotation.type);
+
+	switch (m_expressionContext)
+	{
+	case ExpressionContext::Term:
+		if (_variableDeclaration.typeExpression())
+		{
+			ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Type};
+			_variableDeclaration.typeExpression()->accept(*this);
+			variableAnnotation.type = type(*_variableDeclaration.typeExpression());
+			return false;
+		}
+		variableAnnotation.type = m_typeSystem.freshTypeVariable({});
+		return false;
+	case ExpressionContext::Type:
+		variableAnnotation.type = m_typeSystem.freshTypeVariable({});
+		if (_variableDeclaration.typeExpression())
+		{
+			ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Sort};
+			_variableDeclaration.typeExpression()->accept(*this);
+			unify(*variableAnnotation.type, type(*_variableDeclaration.typeExpression()), _variableDeclaration.typeExpression()->location());
+		}
+		return false;
+	case ExpressionContext::Sort:
+		m_errorReporter.typeError(2399_error, _variableDeclaration.location(), "Variable declaration in sort context.");
+		variableAnnotation.type = m_typeSystem.freshTypeVariable({});
+		return false;
+	}
+	util::unreachable();
+}
+
+void TypeInference::endVisit(IfStatement const& _ifStatement)
+{
+	auto& ifAnnotation = annotation(_ifStatement);
+	solAssert(!ifAnnotation.type);
+
+	if (m_expressionContext != ExpressionContext::Term)
+	{
+		m_errorReporter.typeError(2015_error, _ifStatement.location(), "If statement outside term context.");
+		ifAnnotation.type = m_typeSystem.freshTypeVariable({});
+		return;
+	}
+
+	unify(type(_ifStatement.condition()), m_boolType, _ifStatement.condition().location());
+
+	ifAnnotation.type = m_unitType;
+}
+
+void TypeInference::endVisit(Assignment const& _assignment)
+{
+	auto& assignmentAnnotation = annotation(_assignment);
+	solAssert(!assignmentAnnotation.type);
+
+	if (m_expressionContext != ExpressionContext::Term)
+	{
+		m_errorReporter.typeError(4337_error, _assignment.location(), "Assignment outside term context.");
+		assignmentAnnotation.type = m_typeSystem.freshTypeVariable({});
+		return;
+	}
+
+	Type leftType = type(_assignment.leftHandSide());
+	unify(leftType, type(_assignment.rightHandSide()), _assignment.location());
+	assignmentAnnotation.type = leftType;
+}
+
+experimental::Type TypeInference::handleIdentifierByReferencedDeclaration(langutil::SourceLocation _location, Declaration const& _declaration)
+{
+	switch (m_expressionContext)
+	{
+	case ExpressionContext::Term:
+	{
+		if (
+			!dynamic_cast<FunctionDefinition const*>(&_declaration) &&
+			!dynamic_cast<VariableDeclaration const*>(&_declaration) &&
+			!dynamic_cast<TypeClassDefinition const*>(&_declaration) &&
+			!dynamic_cast<TypeDefinition const*>(&_declaration)
+		)
+		{
+			SecondarySourceLocation ssl;
+			ssl.append("Referenced node.", _declaration.location());
+			m_errorReporter.fatalTypeError(3101_error, _location, ssl, "Attempt to type identifier referring to unexpected node.");
+		}
+
+		auto& declarationAnnotation = annotation(_declaration);
+		if (!declarationAnnotation.type)
+			_declaration.accept(*this);
+
+		solAssert(declarationAnnotation.type);
+
+		if (dynamic_cast<VariableDeclaration const*>(&_declaration))
+			return *declarationAnnotation.type;
+		else if (dynamic_cast<FunctionDefinition const*>(&_declaration))
+			return polymorphicInstance(*declarationAnnotation.type);
+		else if (dynamic_cast<TypeClassDefinition const*>(&_declaration))
+		{
+			solAssert(TypeEnvironmentHelpers{*m_env}.typeVars(*declarationAnnotation.type).empty());
+			return *declarationAnnotation.type;
+		}
+		else if (dynamic_cast<TypeDefinition const*>(&_declaration))
+		{
+			// TODO: can we avoid this?
+			Type type = *declarationAnnotation.type;
+			if (TypeSystemHelpers{m_typeSystem}.isTypeFunctionType(type))
+				type = std::get<1>(TypeSystemHelpers{m_typeSystem}.destTypeFunctionType(type));
+			return polymorphicInstance(type);
+		}
+		else
+			solAssert(false);
+		break;
+	}
+	case ExpressionContext::Type:
+	{
+		if (
+			!dynamic_cast<VariableDeclaration const*>(&_declaration) &&
+			!dynamic_cast<TypeDefinition const*>(&_declaration)
+		)
+		{
+			SecondarySourceLocation ssl;
+			ssl.append("Referenced node.", _declaration.location());
+			m_errorReporter.fatalTypeError(2217_error, _location, ssl, "Attempt to type identifier referring to unexpected node.");
+		}
+
+		// TODO: Assert that this is a type class variable declaration?
+		auto& declarationAnnotation = annotation(_declaration);
+		if (!declarationAnnotation.type)
+			_declaration.accept(*this);
+
+		solAssert(declarationAnnotation.type);
+
+		if (dynamic_cast<VariableDeclaration const*>(&_declaration))
+			return *declarationAnnotation.type;
+		else if (dynamic_cast<TypeDefinition const*>(&_declaration))
+			return polymorphicInstance(*declarationAnnotation.type);
+		else
+			solAssert(false);
+		break;
+	}
+	case ExpressionContext::Sort:
+	{
+		if (auto const* typeClassDefinition = dynamic_cast<TypeClassDefinition const*>(&_declaration))
+		{
+			ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Term};
+			typeClassDefinition->accept(*this);
+
+			solAssert(m_analysis.annotation<TypeClassRegistration>(*typeClassDefinition).typeClass.has_value());
+			TypeClass typeClass = m_analysis.annotation<TypeClassRegistration>(*typeClassDefinition).typeClass.value();
+			return m_typeSystem.freshTypeVariable(Sort{{typeClass}});
+		}
+		else
+		{
+			m_errorReporter.typeError(2599_error, _location, "Expected type class.");
+			return m_typeSystem.freshTypeVariable({});
+		}
+		break;
+	}
+	}
+	util::unreachable();
+}
+
+bool TypeInference::visit(Identifier const& _identifier)
+{
+	auto& identifierAnnotation = annotation(_identifier);
+	solAssert(!identifierAnnotation.type);
+
+	if (auto const* referencedDeclaration = _identifier.annotation().referencedDeclaration)
+	{
+		identifierAnnotation.type = handleIdentifierByReferencedDeclaration(_identifier.location(), *referencedDeclaration);
+		return false;
+	}
+
+	switch (m_expressionContext)
+	{
+	case ExpressionContext::Term:
+		// TODO: error handling
+		solAssert(false);
+		break;
+	case ExpressionContext::Type:
+		// TODO: register free type variable name!
+		identifierAnnotation.type = m_typeSystem.freshTypeVariable({});
+		return false;
+	case ExpressionContext::Sort:
+		// TODO: error handling
+		solAssert(false);
+		break;
+	}
+
+	return false;
+}
+
+void TypeInference::endVisit(TupleExpression const& _tupleExpression)
+{
+	auto& expressionAnnotation = annotation(_tupleExpression);
+	solAssert(!expressionAnnotation.type);
+
+	TypeSystemHelpers helper{m_typeSystem};
+	auto componentTypes = _tupleExpression.components() | ranges::views::transform([&](auto _expr) -> Type {
+		auto& componentAnnotation = annotation(*_expr);
+		solAssert(componentAnnotation.type);
+		return *componentAnnotation.type;
+	}) | ranges::to<std::vector<Type>>;
+	switch (m_expressionContext)
+	{
+	case ExpressionContext::Term:
+	case ExpressionContext::Type:
+		expressionAnnotation.type = helper.tupleType(componentTypes);
+		break;
+	case ExpressionContext::Sort:
+	{
+		Type type = m_typeSystem.freshTypeVariable({});
+		for (auto componentType: componentTypes)
+			unify(type, componentType, _tupleExpression.location());
+		expressionAnnotation.type = type;
+		break;
+	}
+	}
+}
+
+bool TypeInference::visit(IdentifierPath const& _identifierPath)
+{
+	auto& identifierAnnotation = annotation(_identifierPath);
+	solAssert(!identifierAnnotation.type);
+
+	if (auto const* referencedDeclaration = _identifierPath.annotation().referencedDeclaration)
+	{
+		identifierAnnotation.type = handleIdentifierByReferencedDeclaration(_identifierPath.location(), *referencedDeclaration);
+		return false;
+	}
+
+	// TODO: error handling
+	solAssert(false);
+}
+
+bool TypeInference::visit(TypeClassInstantiation const& _typeClassInstantiation)
+{
+	ScopedSaveAndRestore activeInstantiations{m_activeInstantiations, m_activeInstantiations + std::set<TypeClassInstantiation const*>{&_typeClassInstantiation}};
+	// Note: recursion is resolved due to special handling during unification.
+	auto& instantiationAnnotation = annotation(_typeClassInstantiation);
+	if (instantiationAnnotation.type)
+		return false;
+	instantiationAnnotation.type = m_voidType;
+	std::optional<TypeClass> typeClass = std::visit(util::GenericVisitor{
+		[&](ASTPointer<IdentifierPath> _typeClassName) -> std::optional<TypeClass> {
+			if (auto const* typeClassDefinition = dynamic_cast<TypeClassDefinition const*>(_typeClassName->annotation().referencedDeclaration))
+			{
+				// visiting the type class will re-visit this instantiation
+				typeClassDefinition->accept(*this);
+				// TODO: more error handling? Should be covered by the visit above.
+				solAssert(m_analysis.annotation<TypeClassRegistration>(*typeClassDefinition).typeClass.has_value());
+				return m_analysis.annotation<TypeClassRegistration>(*typeClassDefinition).typeClass.value();
+			}
+			else
+			{
+				m_errorReporter.typeError(9817_error, _typeClassInstantiation.typeClass().location(), "Expected type class.");
+				return std::nullopt;
+			}
+		},
+		[&](Token _token) -> std::optional<TypeClass> {
+			if (auto builtinClass = builtinClassFromToken(_token))
+				if (auto typeClass = util::valueOrNullptr(annotation().builtinClasses, *builtinClass))
+					return *typeClass;
+			m_errorReporter.typeError(2658_error, _typeClassInstantiation.location(), "Invalid type class name.");
+			return std::nullopt;
+		}
+	}, _typeClassInstantiation.typeClass().name());
+	if (!typeClass)
+		return false;
+
+	// TODO: _typeClassInstantiation.typeConstructor().accept(*this); ?
+	auto typeConstructor = m_analysis.annotation<TypeRegistration>(_typeClassInstantiation.typeConstructor()).typeConstructor;
+	if (!typeConstructor)
+	{
+		m_errorReporter.typeError(2138_error, _typeClassInstantiation.typeConstructor().location(), "Invalid type constructor.");
+		return false;
+	}
+
+	std::vector<Type> arguments;
+	Arity arity{
+		{},
+		*typeClass
+	};
+
+	{
+		ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Type};
+		if (_typeClassInstantiation.argumentSorts())
+		{
+			_typeClassInstantiation.argumentSorts()->accept(*this);
+			auto& argumentSortAnnotation = annotation(*_typeClassInstantiation.argumentSorts());
+			solAssert(argumentSortAnnotation.type);
+			arguments = TypeSystemHelpers{m_typeSystem}.destTupleType(*argumentSortAnnotation.type);
+			arity.argumentSorts = arguments | ranges::views::transform([&](Type _type) {
+				return m_env->sort(_type);
+			}) | ranges::to<std::vector<Sort>>;
+		}
+	}
+
+	Type instanceType{TypeConstant{*typeConstructor, arguments}};
+
+	std::map<std::string, Type> functionTypes;
+
+	for (auto subNode: _typeClassInstantiation.subNodes())
+	{
+		auto const* functionDefinition = dynamic_cast<FunctionDefinition const*>(subNode.get());
+		solAssert(functionDefinition);
+		subNode->accept(*this);
+		if (!functionTypes.emplace(functionDefinition->name(), type(*functionDefinition)).second)
+			m_errorReporter.typeError(3654_error, subNode->location(), "Duplicate definition of function " + functionDefinition->name() + " during type class instantiation.");
+	}
+
+	if (auto error = m_typeSystem.instantiateClass(instanceType, arity))
+		m_errorReporter.typeError(5094_error, _typeClassInstantiation.location(), *error);
+
+	auto const& classFunctions = annotation().typeClassFunctions.at(*typeClass);
+
+	TypeEnvironment newEnv = m_env->clone();
+	if (!newEnv.unify(m_typeSystem.typeClassVariable(*typeClass), instanceType).empty())
+	{
+		m_errorReporter.typeError(4686_error, _typeClassInstantiation.location(), "Unification of class and instance variable failed.");
+		return false;
+	}
+
+	for (auto [name, classFunctionType]: classFunctions)
+	{
+		if (!functionTypes.count(name))
+		{
+			m_errorReporter.typeError(6948_error, _typeClassInstantiation.location(), "Missing function: " + name);
+			continue;
+		}
+		Type instanceFunctionType = functionTypes.at(name);
+		functionTypes.erase(name);
+
+		if (!newEnv.typeEquals(instanceFunctionType, classFunctionType))
+			m_errorReporter.typeError(7428_error, _typeClassInstantiation.location(), "Type mismatch for function " + name + " " + TypeEnvironmentHelpers{newEnv}.typeToString(instanceFunctionType) + " != " + TypeEnvironmentHelpers{newEnv}.typeToString(classFunctionType));
+	}
+
+	if (!functionTypes.empty())
+		m_errorReporter.typeError(4873_error, _typeClassInstantiation.location(), "Additional functions in class instantiation.");
+
+	return false;
+}
+
+bool TypeInference::visit(MemberAccess const& _memberAccess)
+{
+	if (m_expressionContext != ExpressionContext::Term)
+	{
+		m_errorReporter.typeError(5195_error, _memberAccess.location(), "Member access outside term context.");
+		annotation(_memberAccess).type = m_typeSystem.freshTypeVariable({});
+		return false;
+	}
+	return true;
+}
+
+experimental::Type TypeInference::memberType(Type _type, std::string _memberName, langutil::SourceLocation _location)
+{
+	Type resolvedType = m_env->resolve(_type);
+	TypeSystemHelpers helper{m_typeSystem};
+	if (helper.isTypeConstant(resolvedType))
+	{
+		auto constructor = std::get<0>(helper.destTypeConstant(resolvedType));
+		if (auto* typeMember = util::valueOrNullptr(annotation().members.at(constructor), _memberName))
+			return polymorphicInstance(typeMember->type);
+		else
+		{
+			m_errorReporter.typeError(5755_error, _location, fmt::format("Member {} not found in type {}.", _memberName, TypeEnvironmentHelpers{*m_env}.typeToString(_type)));
+			return m_typeSystem.freshTypeVariable({});
+		}
+	}
+	else
+	{
+		m_errorReporter.typeError(5104_error, _location, "Unsupported member access expression.");
+		return m_typeSystem.freshTypeVariable({});
+	}
+}
+
+void TypeInference::endVisit(MemberAccess const& _memberAccess)
+{
+	auto& memberAccessAnnotation = annotation(_memberAccess);
+	solAssert(!memberAccessAnnotation.type);
+	Type expressionType = type(_memberAccess.expression());
+	memberAccessAnnotation.type = memberType(expressionType, _memberAccess.memberName(), _memberAccess.location());
+}
+
+bool TypeInference::visit(TypeDefinition const& _typeDefinition)
+{
+	bool isBuiltIn = dynamic_cast<Builtin const*>(_typeDefinition.typeExpression());
+
+	TypeSystemHelpers helper{m_typeSystem};
+	auto& typeDefinitionAnnotation = annotation(_typeDefinition);
+	if (typeDefinitionAnnotation.type)
+		return false;
+
+	if (_typeDefinition.arguments())
+		_typeDefinition.arguments()->accept(*this);
+
+	std::vector<Type> arguments;
+	if (_typeDefinition.arguments())
+		for (size_t i = 0; i < _typeDefinition.arguments()->parameters().size(); ++i)
+			arguments.emplace_back(m_typeSystem.freshTypeVariable({}));
+
+	Type definedType = type(&_typeDefinition, arguments);
+	if (arguments.empty())
+		typeDefinitionAnnotation.type = definedType;
+	else
+		typeDefinitionAnnotation.type = helper.typeFunctionType(helper.tupleType(arguments), definedType);
+
+	std::optional<Type> underlyingType;
+
+	if (isBuiltIn)
+		// TODO: This special case should eventually become user-definable.
+		underlyingType = m_wordType;
+	else if (_typeDefinition.typeExpression())
+	{
+		ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Type};
+		_typeDefinition.typeExpression()->accept(*this);
+
+		underlyingType = annotation(*_typeDefinition.typeExpression()).type;
+	}
+
+	TypeConstructor constructor = typeConstructor(&_typeDefinition);
+	auto [members, newlyInserted] = annotation().members.emplace(constructor, std::map<std::string, TypeMember>{});
+	solAssert(newlyInserted, fmt::format("Members of type '{}' are already defined.", m_typeSystem.constructorInfo(constructor).name));
+	if (underlyingType)
+	{
+		members->second.emplace("abs", TypeMember{helper.functionType(*underlyingType, definedType)});
+		members->second.emplace("rep", TypeMember{helper.functionType(definedType, *underlyingType)});
+	}
+
+	if (helper.isPrimitiveType(definedType, PrimitiveType::Pair))
+	{
+		solAssert(isBuiltIn);
+		solAssert(arguments.size() == 2);
+		members->second.emplace("first", TypeMember{helper.functionType(definedType, arguments[0])});
+		members->second.emplace("second", TypeMember{helper.functionType(definedType, arguments[1])});
+	}
+
+	return false;
+}
+
+bool TypeInference::visit(FunctionCall const&) { return true; }
+void TypeInference::endVisit(FunctionCall const& _functionCall)
+{
+	auto& functionCallAnnotation = annotation(_functionCall);
+	solAssert(!functionCallAnnotation.type);
+
+	Type functionType = type(_functionCall.expression());
+
+	TypeSystemHelpers helper{m_typeSystem};
+	std::vector<Type> argTypes;
+	for (auto arg: _functionCall.arguments())
+	{
+		switch (m_expressionContext)
+		{
+		case ExpressionContext::Term:
+		case ExpressionContext::Type:
+			argTypes.emplace_back(type(*arg));
+			break;
+		case ExpressionContext::Sort:
+			m_errorReporter.typeError(9173_error, _functionCall.location(), "Function call in sort context.");
+			functionCallAnnotation.type = m_typeSystem.freshTypeVariable({});
+			break;
+		}
+	}
+
+	switch (m_expressionContext)
+	{
+	case ExpressionContext::Term:
+	{
+		Type argTuple = helper.tupleType(argTypes);
+		Type resultType = m_typeSystem.freshTypeVariable({});
+		Type genericFunctionType = helper.functionType(argTuple, resultType);
+		unify(functionType, genericFunctionType, _functionCall.location());
+		functionCallAnnotation.type = resultType;
+		break;
+	}
+	case ExpressionContext::Type:
+	{
+		Type argTuple = helper.tupleType(argTypes);
+		Type resultType = m_typeSystem.freshTypeVariable({});
+		Type genericFunctionType = helper.typeFunctionType(argTuple, resultType);
+		unify(functionType, genericFunctionType, _functionCall.location());
+		functionCallAnnotation.type = resultType;
+		break;
+	}
+	case ExpressionContext::Sort:
+		solAssert(false);
+	}
+}
+
+// TODO: clean up rational parsing
+namespace
+{
+
+std::optional<rational> parseRational(std::string const& _value)
+{
+	rational value;
+	try
+	{
+		auto radixPoint = find(_value.begin(), _value.end(), '.');
+
+		if (radixPoint != _value.end())
+		{
+			if (
+				!all_of(radixPoint + 1, _value.end(), util::isDigit) ||
+				!all_of(_value.begin(), radixPoint, util::isDigit)
+			)
+				return std::nullopt;
+
+			// Only decimal notation allowed here, leading zeros would switch to octal.
+			auto fractionalBegin = find_if_not(
+				radixPoint + 1,
+				_value.end(),
+				[](char const& a) { return a == '0'; }
+			);
+
+			rational numerator;
+			rational denominator(1);
+
+			denominator = bigint(std::string(fractionalBegin, _value.end()));
+			denominator /= boost::multiprecision::pow(
+				bigint(10),
+				static_cast<unsigned>(distance(radixPoint + 1, _value.end()))
+			);
+			numerator = bigint(std::string(_value.begin(), radixPoint));
+			value = numerator + denominator;
+		}
+		else
+			value = bigint(_value);
+		return value;
+	}
+	catch (...)
+	{
+		return std::nullopt;
+	}
+}
+
+/// Checks whether _mantissa * (10 ** _expBase10) fits into 4096 bits.
+bool fitsPrecisionBase10(bigint const& _mantissa, uint32_t _expBase10)
+{
+	double const log2Of10AwayFromZero = 3.3219280948873624;
+	return fitsPrecisionBaseX(_mantissa, log2Of10AwayFromZero, _expBase10);
+}
+
+std::optional<rational> rationalValue(Literal const& _literal)
+{
+	rational value;
+	try
+	{
+		ASTString valueString = _literal.valueWithoutUnderscores();
+
+		auto expPoint = find(valueString.begin(), valueString.end(), 'e');
+		if (expPoint == valueString.end())
+			expPoint = find(valueString.begin(), valueString.end(), 'E');
+
+		if (boost::starts_with(valueString, "0x"))
+		{
+			// process as hex
+			value = bigint(valueString);
+		}
+		else if (expPoint != valueString.end())
+		{
+			// Parse mantissa and exponent. Checks numeric limit.
+			std::optional<rational> mantissa = parseRational(std::string(valueString.begin(), expPoint));
+
+			if (!mantissa)
+				return std::nullopt;
+			value = *mantissa;
+
+			// 0E... is always zero.
+			if (value == 0)
+				return std::nullopt;
+
+			bigint exp = bigint(std::string(expPoint + 1, valueString.end()));
+
+			if (exp > std::numeric_limits<int32_t>::max() || exp < std::numeric_limits<int32_t>::min())
+				return std::nullopt;
+
+			uint32_t expAbs = bigint(abs(exp)).convert_to<uint32_t>();
+
+			if (exp < 0)
+			{
+				if (!fitsPrecisionBase10(abs(value.denominator()), expAbs))
+					return std::nullopt;
+				value /= boost::multiprecision::pow(
+					bigint(10),
+					expAbs
+				);
+			}
+			else if (exp > 0)
+			{
+				if (!fitsPrecisionBase10(abs(value.numerator()), expAbs))
+					return std::nullopt;
+				value *= boost::multiprecision::pow(
+					bigint(10),
+					expAbs
+				);
+			}
+		}
+		else
+		{
+			// parse as rational number
+			std::optional<rational> tmp = parseRational(valueString);
+			if (!tmp)
+				return std::nullopt;
+			value = *tmp;
+		}
+	}
+	catch (...)
+	{
+		return std::nullopt;
+	}
+	switch (_literal.subDenomination())
+	{
+	case Literal::SubDenomination::None:
+	case Literal::SubDenomination::Wei:
+	case Literal::SubDenomination::Second:
+		break;
+	case Literal::SubDenomination::Gwei:
+		value *= bigint("1000000000");
+		break;
+	case Literal::SubDenomination::Ether:
+		value *= bigint("1000000000000000000");
+		break;
+	case Literal::SubDenomination::Minute:
+		value *= bigint("60");
+		break;
+	case Literal::SubDenomination::Hour:
+		value *= bigint("3600");
+		break;
+	case Literal::SubDenomination::Day:
+		value *= bigint("86400");
+		break;
+	case Literal::SubDenomination::Week:
+		value *= bigint("604800");
+		break;
+	case Literal::SubDenomination::Year:
+		value *= bigint("31536000");
+		break;
+	}
+
+	return value;
+}
+}
+
+bool TypeInference::visit(Literal const& _literal)
+{
+	auto& literalAnnotation = annotation(_literal);
+	if (_literal.token() != Token::Number)
+	{
+		m_errorReporter.typeError(4316_error, _literal.location(), "Only number literals are supported.");
+		return false;
+	}
+	std::optional<rational> value = rationalValue(_literal);
+	if (!value)
+	{
+		m_errorReporter.typeError(6739_error, _literal.location(), "Invalid number literals.");
+		return false;
+	}
+	if (value->denominator() != 1)
+	{
+		m_errorReporter.typeError(2345_error, _literal.location(), "Only integers are supported.");
+		return false;
+	}
+	literalAnnotation.type = m_typeSystem.freshTypeVariable(Sort{{annotation().builtinClasses.at(BuiltinClass::Integer)}});
+	return false;
+}
+
+
+namespace
+{
+// TODO: put at a nice place to deduplicate.
+TypeRegistration::TypeClassInstantiations const& typeClassInstantiations(Analysis const& _analysis, TypeClass _class)
+{
+	auto const* typeClassDeclaration = _analysis.typeSystem().typeClassDeclaration(_class);
+	if (typeClassDeclaration)
+		return _analysis.annotation<TypeRegistration>(*typeClassDeclaration).instantiations;
+	// TODO: better mechanism than fetching by name.
+	auto const& annotation = _analysis.annotation<TypeRegistration>();
+	auto const& inferenceAnnotation = _analysis.annotation<TypeInference>();
+	return annotation.builtinClassInstantiations.at(
+		inferenceAnnotation.builtinClassesByName.at(
+			_analysis.typeSystem().typeClassName(_class)
+		)
+	);
+}
+}
+
+experimental::Type TypeInference::polymorphicInstance(Type const& _scheme)
+{
+	return m_env->fresh(_scheme);
+}
+
+void TypeInference::unify(Type _a, Type _b, langutil::SourceLocation _location)
+{
+	TypeSystemHelpers helper{m_typeSystem};
+	auto unificationFailures = m_env->unify(_a, _b);
+
+	if (!m_activeInstantiations.empty())
+	{
+		// TODO: This entire logic is superfluous - I thought mutually recursive dependencies between
+		// class instantiations are a problem, but in fact they're not, they just resolve to mutually recursive
+		// functions that are fine. So instead, all instantiations can be registered with the type system directly
+		// when visiting the type class (assuming that they all work out) - and then all instantiations can be checked
+		// individually, which should still catch all actual issues (while allowing recursions).
+		// Original comment: Attempt to resolve interdependencies between type class instantiations.
+		std::vector<TypeClassInstantiation const*> missingInstantiations;
+		bool recursion = false;
+		bool onlyMissingInstantiations = [&]() {
+			for (auto failure: unificationFailures)
+			{
+				if (auto* sortMismatch = std::get_if<TypeEnvironment::SortMismatch>(&failure))
+					if (helper.isTypeConstant(sortMismatch->type))
+					{
+						TypeConstructor constructor = std::get<0>(helper.destTypeConstant(sortMismatch->type));
+						for (auto typeClass: sortMismatch->sort.classes)
+						{
+							if (auto const* instantiation = util::valueOrDefault(typeClassInstantiations(m_analysis, typeClass), constructor, nullptr))
+							{
+								if (m_activeInstantiations.count(instantiation))
+								{
+									langutil::SecondarySourceLocation ssl;
+									for (auto activeInstantiation: m_activeInstantiations)
+										ssl.append("Involved instantiation", activeInstantiation->location());
+									m_errorReporter.typeError(
+										3573_error,
+										_location,
+										ssl,
+										"Recursion during type class instantiation."
+									);
+									recursion = true;
+									return false;
+								}
+								missingInstantiations.emplace_back(instantiation);
+							}
+							else
+								return false;
+						}
+						continue;
+					}
+				return false;
+			}
+			return true;
+		}();
+
+		if (recursion)
+			return;
+
+		if (onlyMissingInstantiations)
+		{
+			for (auto instantiation: missingInstantiations)
+				instantiation->accept(*this);
+			unificationFailures = m_env->unify(_a, _b);
+		}
+	}
+
+	for (auto failure: unificationFailures)
+	{
+		TypeEnvironmentHelpers envHelper{*m_env};
+		std::visit(util::GenericVisitor{
+			[&](TypeEnvironment::TypeMismatch _typeMismatch) {
+				m_errorReporter.typeError(
+					8456_error,
+					_location,
+					fmt::format(
+						"Cannot unify {} and {}.",
+						envHelper.typeToString(_typeMismatch.a),
+						envHelper.typeToString(_typeMismatch.b)
+					)
+				);
+			},
+			[&](TypeEnvironment::SortMismatch _sortMismatch) {
+				m_errorReporter.typeError(3111_error, _location, fmt::format(
+					"{} does not have sort {}",
+					envHelper.typeToString(_sortMismatch.type),
+					TypeSystemHelpers{m_typeSystem}.sortToString(_sortMismatch.sort)
+				));
+			},
+			[&](TypeEnvironment::RecursiveUnification _recursiveUnification) {
+				m_errorReporter.typeError(
+					6460_error,
+					_location,
+					fmt::format(
+						"Recursive unification: {} occurs in {}.",
+						envHelper.typeToString(_recursiveUnification.var),
+						envHelper.typeToString(_recursiveUnification.type)
+					)
+				);
+			}
+		}, failure);
+	}
+}
+
+experimental::Type TypeInference::type(ASTNode const& _node) const
+{
+	auto result = annotation(_node).type;
+	solAssert(result);
+	return *result;
+}
+TypeConstructor TypeInference::typeConstructor(Declaration const* _type) const
+{
+	if (auto const& constructor = m_analysis.annotation<TypeRegistration>(*_type).typeConstructor)
+		return *constructor;
+	m_errorReporter.fatalTypeError(5904_error, _type->location(), "Unregistered type.");
+	util::unreachable();
+}
+experimental::Type TypeInference::type(Declaration const* _type, std::vector<Type> _arguments) const
+{
+	return m_typeSystem.type(typeConstructor(_type), std::move(_arguments));
+}
+
+bool TypeInference::visitNode(ASTNode const& _node)
+{
+	m_errorReporter.fatalTypeError(5348_error, _node.location(), "Unsupported AST node during type inference.");
+	return false;
+}
+
+TypeInference::Annotation& TypeInference::annotation(ASTNode const& _node)
+{
+	return m_analysis.annotation<TypeInference>(_node);
+}
+
+TypeInference::Annotation const& TypeInference::annotation(ASTNode const& _node) const
+{
+	return m_analysis.annotation<TypeInference>(_node);
+}
+
+TypeInference::GlobalAnnotation& TypeInference::annotation()
+{
+	return m_analysis.annotation<TypeInference>();
+}
diff --git a/libsolidity/experimental/analysis/TypeInference.h b/libsolidity/experimental/analysis/TypeInference.h
new file mode 100644
index 0000000000..df9d0610a9
--- /dev/null
+++ b/libsolidity/experimental/analysis/TypeInference.h
@@ -0,0 +1,124 @@
+/*
+	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
+#pragma once
+
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/experimental/ast/TypeSystem.h>
+
+#include <liblangutil/ErrorReporter.h>
+
+namespace solidity::frontend::experimental
+{
+
+class Analysis;
+
+class TypeInference: public ASTConstVisitor
+{
+public:
+	TypeInference(Analysis& _analysis);
+
+	bool analyze(SourceUnit const& _sourceUnit);
+
+	struct Annotation
+	{
+		/// Expressions, variable declarations, function declarations.
+		std::optional<Type> type;
+	};
+	struct TypeMember
+	{
+		Type type;
+	};
+	struct GlobalAnnotation
+	{
+		std::map<BuiltinClass, TypeClass> builtinClasses;
+		std::map<std::string, BuiltinClass> builtinClassesByName;
+		std::map<TypeClass, std::map<std::string, Type>> typeClassFunctions;
+		std::map<Token, std::tuple<TypeClass, std::string>> operators;
+		std::map<TypeConstructor, std::map<std::string, TypeMember>> members;
+	};
+	bool visit(Block const&) override { return true; }
+	bool visit(VariableDeclarationStatement const&) override { return true; }
+	void endVisit(VariableDeclarationStatement const& _variableDeclarationStatement) override;
+	bool visit(VariableDeclaration const& _variableDeclaration) override;
+
+	bool visit(FunctionDefinition const& _functionDefinition) override;
+	bool visit(ParameterList const&) override { return true; }
+	void endVisit(ParameterList const& _parameterList) override;
+	bool visit(SourceUnit const&) override { return true; }
+	bool visit(ContractDefinition const&) override { return true; }
+	bool visit(InlineAssembly const& _inlineAssembly) override;
+	bool visit(ImportDirective const&) override { return true; }
+	bool visit(PragmaDirective const&) override { return false; }
+
+	bool visit(IfStatement const&) override { return true; }
+	void endVisit(IfStatement const& _ifStatement) override;
+	bool visit(ExpressionStatement const&) override { return true; }
+	bool visit(Assignment const&) override { return true; }
+	void endVisit(Assignment const& _assignment) override;
+	bool visit(Identifier const&) override;
+	bool visit(IdentifierPath const&) override;
+	bool visit(FunctionCall const& _functionCall) override;
+	void endVisit(FunctionCall const& _functionCall) override;
+	bool visit(Return const&) override { return true; }
+	void endVisit(Return const& _return) override;
+
+	bool visit(MemberAccess const& _memberAccess) override;
+	void endVisit(MemberAccess const& _memberAccess) override;
+
+	bool visit(TypeClassDefinition const& _typeClassDefinition) override;
+	bool visit(TypeClassInstantiation const& _typeClassInstantiation) override;
+	bool visit(TupleExpression const&) override { return true; }
+	void endVisit(TupleExpression const& _tupleExpression) override;
+	bool visit(TypeDefinition const& _typeDefinition) override;
+
+	bool visitNode(ASTNode const& _node) override;
+
+	bool visit(BinaryOperation const& _operation) override;
+
+	bool visit(Literal const& _literal) override;
+private:
+	Analysis& m_analysis;
+	langutil::ErrorReporter& m_errorReporter;
+	TypeSystem& m_typeSystem;
+	TypeEnvironment* m_env = nullptr;
+	Type m_voidType;
+	Type m_wordType;
+	Type m_integerType;
+	Type m_unitType;
+	Type m_boolType;
+	std::optional<Type> m_currentFunctionType;
+
+	Type type(ASTNode const& _node) const;
+
+	Annotation& annotation(ASTNode const& _node);
+	Annotation const& annotation(ASTNode const& _node) const;
+	GlobalAnnotation& annotation();
+
+	void unify(Type _a, Type _b, langutil::SourceLocation _location = {});
+	/// Creates a polymorphic instance of a global type scheme
+	Type polymorphicInstance(Type const& _scheme);
+	Type memberType(Type _type, std::string _memberName, langutil::SourceLocation _location = {});
+	enum class ExpressionContext { Term, Type, Sort };
+	Type handleIdentifierByReferencedDeclaration(langutil::SourceLocation _location, Declaration const& _declaration);
+	TypeConstructor typeConstructor(Declaration const* _type) const;
+	Type type(Declaration const* _type, std::vector<Type> _arguments) const;
+	ExpressionContext m_expressionContext = ExpressionContext::Term;
+	std::set<TypeClassInstantiation const*, ASTCompareByID<TypeClassInstantiation>> m_activeInstantiations;
+};
+
+}
diff --git a/libsolidity/experimental/analysis/TypeRegistration.cpp b/libsolidity/experimental/analysis/TypeRegistration.cpp
new file mode 100644
index 0000000000..43fd8d1175
--- /dev/null
+++ b/libsolidity/experimental/analysis/TypeRegistration.cpp
@@ -0,0 +1,211 @@
+/*
+	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 <libsolidity/experimental/analysis/TypeRegistration.h>
+#include <libsolidity/experimental/analysis/Analysis.h>
+#include <libsolidity/experimental/ast/TypeSystemHelper.h>
+#include <liblangutil/Exceptions.h>
+
+#include <libyul/AsmAnalysis.h>
+#include <libyul/AsmAnalysisInfo.h>
+#include <libyul/AST.h>
+
+using namespace solidity::frontend;
+using namespace solidity::frontend::experimental;
+using namespace solidity::langutil;
+
+TypeRegistration::TypeRegistration(Analysis& _analysis):
+	m_analysis(_analysis),
+	m_errorReporter(_analysis.errorReporter()),
+	m_typeSystem(_analysis.typeSystem())
+{
+}
+
+bool TypeRegistration::analyze(SourceUnit const& _sourceUnit)
+{
+	_sourceUnit.accept(*this);
+	return !m_errorReporter.hasErrors();
+}
+
+bool TypeRegistration::visit(TypeClassDefinition const& _typeClassDefinition)
+{
+	if (annotation(_typeClassDefinition).typeConstructor)
+		return false;
+	annotation(_typeClassDefinition).typeConstructor = m_typeSystem.declareTypeConstructor(
+		_typeClassDefinition.name(),
+		"t_" + *_typeClassDefinition.annotation().canonicalName + "_" + util::toString(_typeClassDefinition.id()),
+		0,
+		&_typeClassDefinition
+	);
+	return true;
+}
+
+bool TypeRegistration::visit(Builtin const& _builtin)
+{
+	if (annotation(_builtin).typeConstructor)
+		return false;
+
+	auto primitiveType = [&](std::string _name) -> std::optional<PrimitiveType> {
+		if (_name == "void") return PrimitiveType::Void;
+		if (_name == "fun") return PrimitiveType::Function;
+		if (_name == "unit") return PrimitiveType::Unit;
+		if (_name == "pair") return PrimitiveType::Pair;
+		if (_name == "word") return PrimitiveType::Word;
+		if (_name == "integer") return PrimitiveType::Integer;
+		if (_name == "bool") return PrimitiveType::Bool;
+		return std::nullopt;
+	}(_builtin.nameParameter());
+
+	if (!primitiveType.has_value())
+		m_errorReporter.fatalTypeError(
+			7758_error,
+			_builtin.location(),
+			"Expected the name of a built-in primitive type."
+		);
+
+	annotation(_builtin).typeConstructor = m_typeSystem.constructor(primitiveType.value());
+	return true;
+}
+
+void TypeRegistration::endVisit(ElementaryTypeNameExpression const & _typeNameExpression)
+{
+	if (annotation(_typeNameExpression).typeConstructor)
+		return;
+
+	// TODO: this is not visited in the ElementaryTypeNameExpression visit - is that intentional?
+	_typeNameExpression.type().accept(*this);
+	if (auto constructor = annotation(_typeNameExpression.type()).typeConstructor)
+		annotation(_typeNameExpression).typeConstructor = constructor;
+	else
+		solAssert(m_errorReporter.hasErrors());
+}
+
+bool TypeRegistration::visit(UserDefinedTypeName const& _userDefinedTypeName)
+{
+	if (annotation(_userDefinedTypeName).typeConstructor)
+		return false;
+	auto const* declaration = _userDefinedTypeName.pathNode().annotation().referencedDeclaration;
+	if (!declaration)
+	{
+		// TODO: fatal/non-fatal
+		m_errorReporter.fatalTypeError(5096_error, _userDefinedTypeName.pathNode().location(), "Expected declaration.");
+		return false;
+	}
+	declaration->accept(*this);
+	if (!(annotation(_userDefinedTypeName).typeConstructor = annotation(*declaration).typeConstructor))
+	{
+		// TODO: fatal/non-fatal
+		m_errorReporter.fatalTypeError(9831_error, _userDefinedTypeName.pathNode().location(), "Expected type declaration.");
+		return false;
+	}
+	return true;
+}
+
+bool TypeRegistration::visit(TypeClassInstantiation const& _typeClassInstantiation)
+{
+	if (annotation(_typeClassInstantiation).typeConstructor)
+		return false;
+	_typeClassInstantiation.typeConstructor().accept(*this);
+	auto typeConstructor = annotation(_typeClassInstantiation.typeConstructor()).typeConstructor;
+	if (!typeConstructor)
+	{
+		m_errorReporter.typeError(5577_error, _typeClassInstantiation.typeConstructor().location(), "Invalid type name.");
+		return false;
+	}
+	auto* instantiations = std::visit(util::GenericVisitor{
+		[&](ASTPointer<IdentifierPath> _path) -> TypeClassInstantiations*
+		{
+			if (TypeClassDefinition const* classDefinition = dynamic_cast<TypeClassDefinition const*>(_path->annotation().referencedDeclaration))
+				return &annotation(*classDefinition).instantiations;
+			m_errorReporter.typeError(3570_error, _typeClassInstantiation.typeClass().location(), "Expected a type class.");
+			return nullptr;
+		},
+		[&](Token _token) -> TypeClassInstantiations*
+		{
+			if (auto typeClass = builtinClassFromToken(_token))
+				return &annotation().builtinClassInstantiations[*typeClass];
+			m_errorReporter.typeError(5262_error, _typeClassInstantiation.typeClass().location(), "Expected a type class.");
+			return nullptr;
+		}
+	}, _typeClassInstantiation.typeClass().name());
+
+	if (!instantiations)
+		return false;
+
+	if (
+		auto [instantiation, newlyInserted] = instantiations->emplace(*typeConstructor, &_typeClassInstantiation);
+		!newlyInserted
+	)
+	{
+		SecondarySourceLocation ssl;
+		ssl.append("Previous instantiation.", instantiation->second->location());
+		m_errorReporter.typeError(6620_error, _typeClassInstantiation.location(), ssl, "Duplicate type class instantiation.");
+	}
+
+	return true;
+}
+
+bool TypeRegistration::visit(TypeDefinition const& _typeDefinition)
+{
+	return !annotation(_typeDefinition).typeConstructor.has_value();
+}
+
+void TypeRegistration::endVisit(TypeDefinition const& _typeDefinition)
+{
+	if (annotation(_typeDefinition).typeConstructor.has_value())
+		return;
+
+	if (auto const* builtin = dynamic_cast<Builtin const*>(_typeDefinition.typeExpression()))
+	{
+		auto [previousDefinitionIt, inserted] = annotation().builtinTypeDefinitions.try_emplace(
+			builtin->nameParameter(),
+			&_typeDefinition
+		);
+
+		if (inserted)
+			annotation(_typeDefinition).typeConstructor = annotation(*builtin).typeConstructor;
+		else
+		{
+			auto const& [builtinName, previousDefinition] = *previousDefinitionIt;
+			m_errorReporter.typeError(
+				9609_error,
+				_typeDefinition.location(),
+				SecondarySourceLocation{}.append("Previous definition:", previousDefinition->location()),
+				"Duplicate builtin type definition."
+			);
+		}
+	}
+	else
+		annotation(_typeDefinition).typeConstructor = m_typeSystem.declareTypeConstructor(
+			_typeDefinition.name(),
+			"t_" + *_typeDefinition.annotation().canonicalName + "_" + util::toString(_typeDefinition.id()),
+			_typeDefinition.arguments() ? _typeDefinition.arguments()->parameters().size() : 0,
+			&_typeDefinition
+		);
+}
+
+TypeRegistration::Annotation& TypeRegistration::annotation(ASTNode const& _node)
+{
+	return m_analysis.annotation<TypeRegistration>(_node);
+}
+
+TypeRegistration::GlobalAnnotation& TypeRegistration::annotation()
+{
+	return m_analysis.annotation<TypeRegistration>();
+}
diff --git a/libsolidity/experimental/analysis/TypeRegistration.h b/libsolidity/experimental/analysis/TypeRegistration.h
new file mode 100644
index 0000000000..9bc49a29cf
--- /dev/null
+++ b/libsolidity/experimental/analysis/TypeRegistration.h
@@ -0,0 +1,67 @@
+/*
+	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
+#pragma once
+
+#include <libsolidity/ast/ASTVisitor.h>
+#include <libsolidity/experimental/ast/TypeSystem.h>
+
+#include <liblangutil/ErrorReporter.h>
+
+namespace solidity::frontend::experimental
+{
+
+class Analysis;
+
+class TypeRegistration: public ASTConstVisitor
+{
+public:
+	using TypeClassInstantiations = std::map<TypeConstructor, TypeClassInstantiation const*>;
+	struct Annotation
+	{
+		// For type class definitions.
+		TypeClassInstantiations instantiations;
+		// For builtins, type definitions, type class definitions, type names and type name expressions.
+		std::optional<TypeConstructor> typeConstructor;
+	};
+	struct GlobalAnnotation
+	{
+		std::map<PrimitiveClass, TypeClassInstantiations> primitiveClassInstantiations;
+		std::map<BuiltinClass, TypeClassInstantiations> builtinClassInstantiations;
+		std::map<std::string, TypeDefinition const*> builtinTypeDefinitions;
+	};
+	TypeRegistration(Analysis& _analysis);
+
+	bool analyze(SourceUnit const& _sourceUnit);
+private:
+	bool visit(TypeClassDefinition const& _typeClassDefinition) override;
+	bool visit(TypeClassInstantiation const& _typeClassInstantiation) override;
+	bool visit(TypeDefinition const& _typeDefinition) override;
+	void endVisit(TypeDefinition const& _typeDefinition) override;
+	bool visit(UserDefinedTypeName const& _typeName) override;
+	void endVisit(ElementaryTypeNameExpression const& _typeName) override;
+	bool visit(Builtin const& _builtin) override;
+	Annotation& annotation(ASTNode const& _node);
+	GlobalAnnotation& annotation();
+
+	Analysis& m_analysis;
+	langutil::ErrorReporter& m_errorReporter;
+	TypeSystem& m_typeSystem;
+	std::set<int64_t> m_visitedClasses;
+};
+
+}
diff --git a/libsolidity/experimental/ast/FunctionCallGraph.h b/libsolidity/experimental/ast/FunctionCallGraph.h
new file mode 100644
index 0000000000..0a1db84551
--- /dev/null
+++ b/libsolidity/experimental/ast/FunctionCallGraph.h
@@ -0,0 +1,40 @@
+/*
+	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
+
+/// Data structure representing a function dependency graph.
+
+#pragma once
+
+#include <libsolidity/ast/AST.h>
+
+#include <map>
+#include <set>
+#include <ostream>
+
+namespace solidity::frontend::experimental
+{
+
+struct FunctionDependencyGraph
+{
+	/// Graph edges. Edges are directed and lead from the caller to the callee.
+	/// The map contains a key for every function, even if does not actually perform
+	/// any calls.
+	std::map<FunctionDefinition const*, std::set<FunctionDefinition const*, ASTCompareByID<FunctionDefinition>>, ASTCompareByID<FunctionDefinition>> edges;
+};
+
+}
diff --git a/libsolidity/experimental/ast/Type.cpp b/libsolidity/experimental/ast/Type.cpp
new file mode 100644
index 0000000000..ec822dc64c
--- /dev/null
+++ b/libsolidity/experimental/ast/Type.cpp
@@ -0,0 +1,62 @@
+/*
+	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 <libsolidity/experimental/ast/Type.h>
+#include <libsolidity/ast/AST.h>
+#include <libsolutil/Visitor.h>
+
+#include <range/v3/view/drop_last.hpp>
+#include <range/v3/view/zip.hpp>
+
+#include <sstream>
+
+using namespace solidity;
+using namespace solidity::frontend::experimental;
+
+bool Sort::operator==(Sort const& _rhs) const
+{
+	if (classes.size() != _rhs.classes.size())
+		return false;
+	for (auto [lhs, rhs]: ranges::zip_view(classes, _rhs.classes))
+		if (lhs != rhs)
+			return false;
+	return true;
+}
+
+bool Sort::operator<=(Sort const& _rhs) const
+{
+	for (auto c: classes)
+		if (!_rhs.classes.count(c))
+			return false;
+	return true;
+}
+
+Sort Sort::operator+(Sort const& _rhs) const
+{
+	Sort result { classes };
+	result.classes += _rhs.classes;
+	return result;
+}
+
+
+Sort Sort::operator-(Sort const& _rhs) const
+{
+	Sort result { classes };
+	result.classes -= _rhs.classes;
+	return result;
+}
diff --git a/libsolidity/experimental/ast/Type.h b/libsolidity/experimental/ast/Type.h
new file mode 100644
index 0000000000..dde41b1df8
--- /dev/null
+++ b/libsolidity/experimental/ast/Type.h
@@ -0,0 +1,154 @@
+/*
+	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
+#pragma once
+
+#include <cstddef>
+#include <set>
+#include <variant>
+#include <vector>
+
+namespace solidity::frontend::experimental
+{
+
+class TypeSystem;
+
+struct TypeConstant;
+struct TypeVariable;
+
+using Type = std::variant<std::monostate, TypeConstant, TypeVariable>;
+
+enum class PrimitiveType
+{
+	Void,
+	Function,
+	TypeFunction,
+	Itself,
+	Unit,
+	Pair,
+	Sum,
+	Word,
+	Bool,
+	Integer
+};
+
+enum class PrimitiveClass
+{
+	Type
+};
+
+// TODO: move elsewhere?
+enum class BuiltinClass
+{
+	Integer,
+	Mul,
+	Add,
+	Equal,
+	Less,
+	LessOrEqual,
+	Greater,
+	GreaterOrEqual
+};
+
+struct TypeConstructor
+{
+public:
+	TypeConstructor(TypeConstructor const& _typeConstructor): m_index(_typeConstructor.m_index) {}
+	TypeConstructor& operator=(TypeConstructor const& _typeConstructor)
+	{
+		m_index = _typeConstructor.m_index;
+		return *this;
+	}
+	bool operator<(TypeConstructor const& _rhs) const
+	{
+		return m_index < _rhs.m_index;
+	}
+	bool operator==(TypeConstructor const& _rhs) const
+	{
+		return m_index == _rhs.m_index;
+	}
+	bool operator!=(TypeConstructor const& _rhs) const
+	{
+		return m_index != _rhs.m_index;
+	}
+private:
+	friend class TypeSystem;
+	TypeConstructor(std::size_t _index): m_index(_index) {}
+	std::size_t m_index = 0;
+};
+
+struct TypeConstant
+{
+	TypeConstructor constructor;
+	std::vector<Type> arguments;
+};
+
+struct TypeClass
+{
+public:
+	TypeClass(TypeClass const& _typeClass): m_index(_typeClass.m_index) {}
+	TypeClass& operator=(TypeClass const& _typeConstructor)
+	{
+		m_index = _typeConstructor.m_index;
+		return *this;
+	}
+	bool operator<(TypeClass const& _rhs) const
+	{
+		return m_index < _rhs.m_index;
+	}
+	bool operator==(TypeClass const& _rhs) const
+	{
+		return m_index == _rhs.m_index;
+	}
+	bool operator!=(TypeClass const& _rhs) const
+	{
+		return m_index != _rhs.m_index;
+	}
+private:
+	friend class TypeSystem;
+	TypeClass(std::size_t _index): m_index(_index) {}
+	std::size_t m_index = 0;
+};
+
+struct Sort
+{
+	std::set<TypeClass> classes;
+	bool operator==(Sort const& _rhs) const;
+	bool operator!=(Sort const& _rhs) const { return !operator==(_rhs); }
+	bool operator<=(Sort const& _rhs) const;
+	Sort operator+(Sort const& _rhs) const;
+	Sort operator-(Sort const& _rhs) const;
+};
+
+struct Arity
+{
+	std::vector<Sort> argumentSorts;
+	TypeClass typeClass;
+};
+
+struct TypeVariable
+{
+	std::size_t index() const { return m_index; }
+	Sort const& sort() const { return m_sort; }
+private:
+	friend class TypeSystem;
+	std::size_t m_index = 0;
+	Sort m_sort;
+	TypeVariable(std::size_t _index, Sort _sort): m_index(_index), m_sort(std::move(_sort)) {}
+};
+
+}
diff --git a/libsolidity/experimental/ast/TypeSystem.cpp b/libsolidity/experimental/ast/TypeSystem.cpp
new file mode 100644
index 0000000000..680edce845
--- /dev/null
+++ b/libsolidity/experimental/ast/TypeSystem.cpp
@@ -0,0 +1,347 @@
+/*
+	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 <libsolidity/experimental/ast/TypeSystem.h>
+#include <libsolidity/experimental/ast/TypeSystemHelper.h>
+#include <libsolidity/ast/AST.h>
+#include <liblangutil/Exceptions.h>
+
+#include <libsolutil/Visitor.h>
+
+#include <range/v3/to_container.hpp>
+#include <range/v3/view/drop_exactly.hpp>
+#include <range/v3/view/drop_last.hpp>
+#include <range/v3/view/reverse.hpp>
+#include <range/v3/view/zip.hpp>
+
+#include <fmt/format.h>
+
+#include <unordered_map>
+
+using namespace solidity;
+using namespace solidity::frontend;
+using namespace solidity::frontend::experimental;
+
+std::vector<TypeEnvironment::UnificationFailure> TypeEnvironment::unify(Type _a, Type _b)
+{
+	std::vector<UnificationFailure> failures;
+	auto unificationFailure = [&]() {
+		failures.emplace_back(UnificationFailure{TypeMismatch{_a, _b}});
+	};
+	_a = resolve(_a);
+	_b = resolve(_b);
+	std::visit(util::GenericVisitor{
+		[&](TypeVariable _left, TypeVariable _right) {
+			if (_left.index() == _right.index())
+				solAssert(_left.sort() == _right.sort());
+			else
+			{
+				if (_left.sort() <= _right.sort())
+					failures += instantiate(_left, _right);
+				else if (_right.sort() <= _left.sort())
+					failures += instantiate(_right, _left);
+				else
+				{
+					Type newVar = m_typeSystem.freshVariable(_left.sort() + _right.sort());
+					failures += instantiate(_left, newVar);
+					failures += instantiate(_right, newVar);
+				}
+			}
+		},
+		[&](TypeVariable _var, auto) {
+			failures += instantiate(_var, _b);
+		},
+		[&](auto, TypeVariable _var) {
+			failures += instantiate(_var, _a);
+		},
+		[&](TypeConstant _left, TypeConstant _right) {
+			if (_left.constructor != _right.constructor)
+				return unificationFailure();
+			if (_left.arguments.size() != _right.arguments.size())
+				return unificationFailure();
+			for (auto&& [left, right]: ranges::zip_view(_left.arguments, _right.arguments))
+				failures += unify(left, right);
+		},
+		[&](auto, auto) {
+			unificationFailure();
+		}
+	}, _a, _b);
+	return failures;
+}
+
+bool TypeEnvironment::typeEquals(Type _lhs, Type _rhs) const
+{
+	return std::visit(util::GenericVisitor{
+		[&](TypeVariable _left, TypeVariable _right) {
+			if (_left.index() == _right.index())
+			{
+				solAssert(_left.sort() == _right.sort());
+				return true;
+			}
+			return false;
+		},
+		[&](TypeConstant _left, TypeConstant _right) {
+			if (_left.constructor != _right.constructor)
+				return false;
+			if (_left.arguments.size() != _right.arguments.size())
+				return false;
+			for (auto&& [left, right]: ranges::zip_view(_left.arguments, _right.arguments))
+				if (!typeEquals(left, right))
+					return false;
+			return true;
+		},
+		[&](auto, auto) {
+			return false;
+		}
+	}, resolve(_lhs), resolve(_rhs));
+}
+
+TypeEnvironment TypeEnvironment::clone() const
+{
+	TypeEnvironment result{m_typeSystem};
+	result.m_typeVariables = m_typeVariables;
+	return result;
+}
+
+TypeSystem::TypeSystem()
+{
+	auto declarePrimitiveClass = [&](std::string _name) {
+		return std::visit(util::GenericVisitor{
+			[](std::string _error) -> TypeClass {
+				solAssert(false, _error);
+			},
+			[](TypeClass _class) -> TypeClass { return _class; }
+		}, declareTypeClass(_name, nullptr, true /* _primitive */));
+	};
+
+	m_primitiveTypeClasses.emplace(PrimitiveClass::Type, declarePrimitiveClass("type"));
+
+	for (auto [type, name, arity]: std::initializer_list<std::tuple<PrimitiveType, char const*, size_t>>{
+		{PrimitiveType::TypeFunction, "tfun", 2},
+		{PrimitiveType::Function, "fun", 2},
+		{PrimitiveType::Itself, "itself", 1},
+		{PrimitiveType::Void, "void", 0},
+		{PrimitiveType::Unit, "unit", 0},
+		{PrimitiveType::Pair, "pair", 2},
+		{PrimitiveType::Sum, "sum", 2},
+		{PrimitiveType::Word, "word", 0},
+		{PrimitiveType::Integer, "integer", 0},
+		{PrimitiveType::Bool, "bool", 0},
+	})
+		m_primitiveTypeConstructors.emplace(type, declareTypeConstructor(name, name, arity, nullptr));
+
+	TypeClass classType = primitiveClass(PrimitiveClass::Type);
+	//TypeClass classKind = primitiveClass(PrimitiveClass::Kind);
+	Sort typeSort{{classType}};
+	m_typeConstructors.at(m_primitiveTypeConstructors.at(PrimitiveType::TypeFunction).m_index).arities = {Arity{std::vector<Sort>{{typeSort},{typeSort}}, classType}};
+	m_typeConstructors.at(m_primitiveTypeConstructors.at(PrimitiveType::Function).m_index).arities = {Arity{std::vector<Sort>{{typeSort, typeSort}}, classType}};
+	m_typeConstructors.at(m_primitiveTypeConstructors.at(PrimitiveType::Itself).m_index).arities = {Arity{std::vector<Sort>{{typeSort, typeSort}}, classType}};
+}
+
+experimental::Type TypeSystem::freshVariable(Sort _sort)
+{
+	size_t index = m_numTypeVariables++;
+	return TypeVariable(index, std::move(_sort));
+}
+
+experimental::Type TypeSystem::freshTypeVariable(Sort _sort)
+{
+	_sort.classes.emplace(primitiveClass(PrimitiveClass::Type));
+	return freshVariable(_sort);
+}
+
+std::vector<TypeEnvironment::UnificationFailure> TypeEnvironment::instantiate(TypeVariable _variable, Type _type)
+{
+	for (auto const& maybeTypeVar: TypeEnvironmentHelpers{*this}.typeVars(_type))
+		if (auto const* typeVar = std::get_if<TypeVariable>(&maybeTypeVar))
+			if (typeVar->index() == _variable.index())
+				return {UnificationFailure{RecursiveUnification{_variable, _type}}};
+	Sort typeSort = sort(_type);
+	if (!(_variable.sort() <= typeSort))
+	{
+		return {UnificationFailure{SortMismatch{_type, _variable.sort() - typeSort}}};
+	}
+	solAssert(m_typeVariables.emplace(_variable.index(), _type).second);
+	return {};
+}
+
+experimental::Type TypeEnvironment::resolve(Type _type) const
+{
+	Type result = _type;
+	while (auto const* var = std::get_if<TypeVariable>(&result))
+		if (Type const* resolvedType = util::valueOrNullptr(m_typeVariables, var->index()))
+			result = *resolvedType;
+		else
+			break;
+	return result;
+}
+
+experimental::Type TypeEnvironment::resolveRecursive(Type _type) const
+{
+	return std::visit(util::GenericVisitor{
+		[&](TypeConstant const& _typeConstant) -> Type {
+			return TypeConstant{
+				_typeConstant.constructor,
+				_typeConstant.arguments | ranges::views::transform([&](Type const& _argType) {
+					return resolveRecursive(_argType);
+				}) | ranges::to<std::vector<Type>>
+			};
+		},
+		[](TypeVariable const& _typeVar) -> Type {
+			return _typeVar;
+		},
+		[](std::monostate _nothing) -> Type {
+			return _nothing;
+		}
+	}, resolve(_type));
+}
+
+Sort TypeEnvironment::sort(Type _type) const
+{
+	return std::visit(util::GenericVisitor{
+		[&](TypeConstant const& _expression) -> Sort
+		{
+			auto const& constructorInfo = m_typeSystem.constructorInfo(_expression.constructor);
+			auto argumentSorts = _expression.arguments | ranges::views::transform([&](Type _argumentType) {
+				return sort(resolve(_argumentType));
+			}) | ranges::to<std::vector<Sort>>;
+			Sort sort;
+			for (auto const& arity: constructorInfo.arities)
+			{
+				solAssert(arity.argumentSorts.size() == argumentSorts.size());
+				bool hasArity = true;
+				for (auto&& [argumentSort, arityArgumentSort]: ranges::zip_view(argumentSorts, arity.argumentSorts))
+				{
+					if (!(arityArgumentSort <= argumentSort))
+					{
+						hasArity = false;
+						break;
+					}
+				}
+
+				if (hasArity)
+					sort.classes.insert(arity.typeClass);
+			}
+			return sort;
+		},
+		[](TypeVariable const& _variable) -> Sort { return _variable.sort(); },
+		[](std::monostate) -> Sort { solAssert(false); }
+	}, _type);
+}
+
+TypeConstructor TypeSystem::declareTypeConstructor(std::string _name, std::string _canonicalName, size_t _arguments, Declaration const* _declaration)
+{
+	solAssert(m_canonicalTypeNames.insert(_canonicalName).second, "Duplicate canonical type name.");
+	Sort baseSort{{primitiveClass(PrimitiveClass::Type)}};
+	size_t index = m_typeConstructors.size();
+	m_typeConstructors.emplace_back(TypeConstructorInfo{
+		_name,
+		_canonicalName,
+		{Arity{std::vector<Sort>{_arguments, baseSort}, primitiveClass(PrimitiveClass::Type)}},
+		_declaration
+	});
+	TypeConstructor constructor{index};
+	if (_arguments)
+	{
+		std::vector<Sort> argumentSorts;
+		std::generate_n(std::back_inserter(argumentSorts), _arguments, [&](){ return Sort{{primitiveClass(PrimitiveClass::Type)}}; });
+		std::vector<Type> argumentTypes;
+		std::generate_n(std::back_inserter(argumentTypes), _arguments, [&](){ return freshVariable({}); });
+		auto error = instantiateClass(type(constructor, argumentTypes), Arity{argumentSorts, primitiveClass(PrimitiveClass::Type)});
+		solAssert(!error, *error);
+	}
+	else
+	{
+		auto error = instantiateClass(type(constructor, {}), Arity{{}, primitiveClass(PrimitiveClass::Type)});
+		solAssert(!error, *error);
+	}
+	return constructor;
+}
+
+std::variant<TypeClass, std::string> TypeSystem::declareTypeClass(std::string _name, Declaration const* _declaration, bool _primitive)
+{
+	TypeClass typeClass{m_typeClasses.size()};
+
+	Type typeVariable = (_primitive ? freshVariable({{typeClass}}) : freshTypeVariable({{typeClass}}));
+	solAssert(std::holds_alternative<TypeVariable>(typeVariable));
+
+	m_typeClasses.emplace_back(TypeClassInfo{
+		typeVariable,
+		_name,
+		_declaration
+	});
+	return typeClass;
+}
+
+experimental::Type TypeSystem::type(TypeConstructor _constructor, std::vector<Type> _arguments) const
+{
+	// TODO: proper error handling
+	auto const& info = m_typeConstructors.at(_constructor.m_index);
+	solAssert(
+		info.arguments() == _arguments.size(),
+		fmt::format("Type constructor '{}' accepts {} type arguments (got {}).", constructorInfo(_constructor).name, info.arguments(), _arguments.size())
+	);
+	return TypeConstant{_constructor, _arguments};
+}
+
+experimental::Type TypeEnvironment::fresh(Type _type)
+{
+	std::unordered_map<size_t, Type> mapping;
+	auto freshImpl = [&](Type _type, auto _recurse) -> Type {
+		return std::visit(util::GenericVisitor{
+			[&](TypeConstant const& _type) -> Type {
+				return TypeConstant{
+					_type.constructor,
+					_type.arguments | ranges::views::transform([&](Type _argType) {
+						return _recurse(_argType, _recurse);
+					}) | ranges::to<std::vector<Type>>
+				};
+			},
+			[&](TypeVariable const& _var) -> Type {
+				if (auto* mapped = util::valueOrNullptr(mapping, _var.index()))
+				{
+					auto* typeVariable = std::get_if<TypeVariable>(mapped);
+					solAssert(typeVariable);
+					// TODO: can there be a mismatch?
+					solAssert(typeVariable->sort() == _var.sort());
+					return *mapped;
+				}
+				return mapping[_var.index()] = m_typeSystem.freshTypeVariable(_var.sort());
+			},
+			[](std::monostate) -> Type { solAssert(false); }
+		}, resolve(_type));
+	};
+	return freshImpl(_type, freshImpl);
+}
+
+std::optional<std::string> TypeSystem::instantiateClass(Type _instanceVariable, Arity _arity)
+{
+	if (!TypeSystemHelpers{*this}.isTypeConstant(_instanceVariable))
+		return "Invalid instance variable.";
+	auto [typeConstructor, typeArguments] = TypeSystemHelpers{*this}.destTypeConstant(_instanceVariable);
+	auto& typeConstructorInfo = m_typeConstructors.at(typeConstructor.m_index);
+	if (_arity.argumentSorts.size() != typeConstructorInfo.arguments())
+		return "Invalid arity.";
+	if (typeArguments.size() != typeConstructorInfo.arguments())
+		return "Invalid arity.";
+
+	typeConstructorInfo.arities.emplace_back(_arity);
+
+	return std::nullopt;
+}
diff --git a/libsolidity/experimental/ast/TypeSystem.h b/libsolidity/experimental/ast/TypeSystem.h
new file mode 100644
index 0000000000..cac0feb81f
--- /dev/null
+++ b/libsolidity/experimental/ast/TypeSystem.h
@@ -0,0 +1,184 @@
+/*
+	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
+#pragma once
+
+#include <libsolidity/experimental/ast/Type.h>
+#include <liblangutil/Exceptions.h>
+
+#include <optional>
+#include <string>
+#include <variant>
+#include <vector>
+
+namespace solidity::frontend
+{
+class Declaration;
+}
+
+namespace solidity::frontend::experimental
+{
+
+class TypeEnvironment
+{
+public:
+	struct TypeMismatch
+	{
+		Type a;
+		Type b;
+	};
+
+	struct SortMismatch {
+		Type type;
+		Sort sort;
+	};
+
+	struct RecursiveUnification
+	{
+		Type var;
+		Type type;
+	};
+
+	using UnificationFailure = std::variant<
+		TypeMismatch,
+		SortMismatch,
+		RecursiveUnification
+	>;
+
+	TypeEnvironment(TypeSystem& _typeSystem): m_typeSystem(_typeSystem) {}
+	TypeEnvironment(TypeEnvironment const&) = delete;
+	TypeEnvironment& operator=(TypeEnvironment const&) = delete;
+	TypeEnvironment clone() const;
+
+	Type resolve(Type _type) const;
+	Type resolveRecursive(Type _type) const;
+	Type fresh(Type _type);
+	[[nodiscard]] std::vector<UnificationFailure> unify(Type _a, Type _b);
+	Sort sort(Type _type) const;
+	bool typeEquals(Type _lhs, Type _rhs) const;
+
+	TypeSystem& typeSystem() { return m_typeSystem; }
+	TypeSystem const& typeSystem() const { return m_typeSystem; }
+
+private:
+	TypeEnvironment(TypeEnvironment&& _env):
+		m_typeSystem(_env.m_typeSystem),
+		m_typeVariables(std::move(_env.m_typeVariables))
+	{}
+
+	[[nodiscard]] std::vector<TypeEnvironment::UnificationFailure> instantiate(TypeVariable _variable, Type _type);
+
+	TypeSystem& m_typeSystem;
+	std::map<size_t, Type> m_typeVariables;
+};
+
+class TypeSystem
+{
+public:
+	struct TypeConstructorInfo
+	{
+		std::string name;
+		std::string canonicalName;
+		std::vector<Arity> arities;
+		Declaration const* typeDeclaration = nullptr;
+		size_t arguments() const
+		{
+			solAssert(!arities.empty());
+			return arities.front().argumentSorts.size();
+		}
+	};
+	struct TypeClassInfo
+	{
+		Type typeVariable;
+		std::string name;
+		Declaration const* classDeclaration = nullptr;
+	};
+	TypeSystem();
+	TypeSystem(TypeSystem const&) = delete;
+	TypeSystem const& operator=(TypeSystem const&) = delete;
+	Type type(PrimitiveType _typeConstructor, std::vector<Type> _arguments) const
+	{
+		return type(m_primitiveTypeConstructors.at(_typeConstructor), std::move(_arguments));
+	}
+	Type type(TypeConstructor _typeConstructor, std::vector<Type> _arguments) const;
+	std::string typeName(TypeConstructor _typeConstructor) const
+	{
+		// TODO: proper error handling
+		return m_typeConstructors.at(_typeConstructor.m_index).name;
+	}
+	std::string canonicalName(TypeConstructor _typeConstructor) const
+	{
+		// TODO: proper error handling
+		return m_typeConstructors.at(_typeConstructor.m_index).canonicalName;
+	}
+	TypeConstructor declareTypeConstructor(std::string _name, std::string _canonicalName, size_t _arguments, Declaration const* _declaration);
+	TypeConstructor constructor(PrimitiveType _type) const
+	{
+		return m_primitiveTypeConstructors.at(_type);
+	}
+	TypeClass primitiveClass(PrimitiveClass _class) const
+	{
+		return m_primitiveTypeClasses.at(_class);
+	}
+	size_t constructorArguments(TypeConstructor _typeConstructor) const
+	{
+		// TODO: error handling
+		return m_typeConstructors.at(_typeConstructor.m_index).arguments();
+	}
+	TypeConstructorInfo const& constructorInfo(TypeConstructor _typeConstructor) const
+	{
+		// TODO: error handling
+		return m_typeConstructors.at(_typeConstructor.m_index);
+	}
+	TypeConstructorInfo const& constructorInfo(PrimitiveType _typeConstructor) const
+	{
+		return constructorInfo(constructor(_typeConstructor));
+	}
+
+	std::variant<TypeClass, std::string> declareTypeClass(std::string _name, Declaration const* _declaration, bool _primitive = false);
+	[[nodiscard]] std::optional<std::string> instantiateClass(Type _instanceVariable, Arity _arity);
+
+	Type freshTypeVariable(Sort _sort);
+
+	TypeEnvironment const& env() const { return m_globalTypeEnvironment; }
+	TypeEnvironment& env() { return m_globalTypeEnvironment; }
+
+	Type freshVariable(Sort _sort);
+	std::string typeClassName(TypeClass _class) const { return m_typeClasses.at(_class.m_index).name; }
+	Declaration const* typeClassDeclaration(TypeClass _class) const { return m_typeClasses.at(_class.m_index).classDeclaration; }
+	Type typeClassVariable(TypeClass _class) const
+	{
+		return m_typeClasses.at(_class.m_index).typeVariable;
+	}
+
+	TypeClassInfo const& typeClassInfo(TypeClass _class) const
+	{
+		return m_typeClasses.at(_class.m_index);
+	}
+
+private:
+	friend class TypeEnvironment;
+	size_t m_numTypeVariables = 0;
+	std::map<PrimitiveType, TypeConstructor> m_primitiveTypeConstructors;
+	std::map<PrimitiveClass, TypeClass> m_primitiveTypeClasses;
+	std::set<std::string> m_canonicalTypeNames;
+	std::vector<TypeConstructorInfo> m_typeConstructors;
+	std::vector<TypeClassInfo> m_typeClasses;
+	TypeEnvironment m_globalTypeEnvironment{*this};
+};
+
+}
diff --git a/libsolidity/experimental/ast/TypeSystemHelper.cpp b/libsolidity/experimental/ast/TypeSystemHelper.cpp
new file mode 100644
index 0000000000..bc7dd4fcc3
--- /dev/null
+++ b/libsolidity/experimental/ast/TypeSystemHelper.cpp
@@ -0,0 +1,404 @@
+/*
+	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 <libsolidity/experimental/ast/TypeSystemHelper.h>
+#include <libsolidity/ast/AST.h>
+
+#include <libsolidity/experimental/analysis/Analysis.h>
+#include <libsolidity/experimental/analysis/TypeRegistration.h>
+
+#include <libsolutil/Visitor.h>
+
+#include <range/v3/to_container.hpp>
+#include <range/v3/view/drop_exactly.hpp>
+#include <range/v3/view/drop_last.hpp>
+#include <range/v3/view/reverse.hpp>
+
+#include <fmt/format.h>
+
+using namespace solidity::langutil;
+using namespace solidity::frontend;
+using namespace solidity::frontend::experimental;
+
+/*std::optional<TypeConstructor> experimental::typeConstructorFromTypeName(Analysis const& _analysis, TypeName const& _typeName)
+{
+	if (auto const* elementaryTypeName = dynamic_cast<ElementaryTypeName const*>(&_typeName))
+	{
+		if (auto constructor = typeConstructorFromToken(_analysis, elementaryTypeName->typeName().token()))
+			return *constructor;
+	}
+	else if (auto const* userDefinedType = dynamic_cast<UserDefinedTypeName const*>(&_typeName))
+	{
+		if (auto const* referencedDeclaration = userDefinedType->pathNode().annotation().referencedDeclaration)
+			return _analysis.annotation<TypeRegistration>(*referencedDeclaration).typeConstructor;
+	}
+	return nullopt;
+}*/
+/*
+std::optional<TypeConstructor> experimental::typeConstructorFromToken(Analysis const& _analysis, langutil::Token _token)
+{
+	TypeSystem const& typeSystem = _analysis.typeSystem();
+	switch (_token)
+	{
+	case Token::Void:
+		return typeSystem.builtinConstructor(BuiltinType::Void);
+	case Token::Fun:
+		return typeSystem.builtinConstructor(BuiltinType::Function);
+	case Token::Unit:
+		return typeSystem.builtinConstructor(BuiltinType::Unit);
+	case Token::Pair:
+		return typeSystem.builtinConstructor(BuiltinType::Pair);
+	case Token::Word:
+		return typeSystem.builtinConstructor(BuiltinType::Word);
+	case Token::IntegerType:
+		return typeSystem.builtinConstructor(BuiltinType::Integer);
+	case Token::Bool:
+		return typeSystem.builtinConstructor(BuiltinType::Bool);
+	default:
+		return nullopt;
+	}
+}*/
+
+std::optional<BuiltinClass> experimental::builtinClassFromToken(langutil::Token _token)
+{
+	switch (_token)
+	{
+	case Token::Integer:
+		return BuiltinClass::Integer;
+	case Token::Mul:
+		return BuiltinClass::Mul;
+	case Token::Add:
+		return BuiltinClass::Add;
+	case Token::Equal:
+		return BuiltinClass::Equal;
+	case Token::LessThan:
+		return BuiltinClass::Less;
+	case Token::LessThanOrEqual:
+		return BuiltinClass::LessOrEqual;
+	case Token::GreaterThan:
+		return BuiltinClass::Greater;
+	case Token::GreaterThanOrEqual:
+		return BuiltinClass::GreaterOrEqual;
+	default:
+		return std::nullopt;
+	}
+}
+/*
+std::optional<TypeClass> experimental::typeClassFromTypeClassName(TypeClassName const& _typeClass)
+{
+	return std::visit(util::GenericVisitor{
+		[&](ASTPointer<IdentifierPath> _path) -> optional<TypeClass> {
+			auto classDefinition = dynamic_cast<TypeClassDefinition const*>(_path->annotation().referencedDeclaration);
+			if (!classDefinition)
+				return nullopt;
+			return TypeClass{classDefinition};
+		},
+		[&](Token _token) -> optional<TypeClass> {
+			return typeClassFromToken(_token);
+		}
+	}, _typeClass.name());
+}
+*/
+experimental::Type TypeSystemHelpers::tupleType(std::vector<Type> _elements) const
+{
+	if (_elements.empty())
+		return typeSystem.type(PrimitiveType::Unit, {});
+	if (_elements.size() == 1)
+		return _elements.front();
+	Type result = _elements.back();
+	for (Type type: _elements | ranges::views::reverse | ranges::views::drop_exactly(1))
+		result = typeSystem.type(PrimitiveType::Pair, {type, result});
+	return result;
+}
+
+std::vector<experimental::Type> TypeSystemHelpers::destTupleType(Type _tupleType) const
+{
+	if (!isTypeConstant(_tupleType))
+		return {_tupleType};
+	TypeConstructor pairConstructor = typeSystem.constructor(PrimitiveType::Pair);
+	auto [constructor, arguments] = destTypeConstant(_tupleType);
+	if (constructor == typeSystem.constructor(PrimitiveType::Unit))
+		return {};
+	if (constructor != pairConstructor)
+		return {_tupleType};
+	solAssert(arguments.size() == 2);
+
+	std::vector<Type> result;
+	result.emplace_back(arguments.front());
+	Type tail = arguments.back();
+	while (true)
+	{
+		if (!isTypeConstant(tail))
+			break;
+		auto [tailConstructor, tailArguments] = destTypeConstant(tail);
+		if (tailConstructor != pairConstructor)
+			break;
+		solAssert(tailArguments.size() == 2);
+		result.emplace_back(tailArguments.front());
+		tail = tailArguments.back();
+	}
+	result.emplace_back(tail);
+	return result;
+}
+
+experimental::Type TypeSystemHelpers::sumType(std::vector<Type> _elements) const
+{
+	if (_elements.empty())
+		return typeSystem.type(PrimitiveType::Void, {});
+	if (_elements.size() == 1)
+		return _elements.front();
+	Type result = _elements.back();
+	for (Type type: _elements | ranges::views::reverse | ranges::views::drop_exactly(1))
+		result = typeSystem.type(PrimitiveType::Sum, {type, result});
+	return result;
+}
+
+std::vector<experimental::Type> TypeSystemHelpers::destSumType(Type _tupleType) const
+{
+	if (!isTypeConstant(_tupleType))
+		return {_tupleType};
+	TypeConstructor sumConstructor = typeSystem.constructor(PrimitiveType::Sum);
+	auto [constructor, arguments] = destTypeConstant(_tupleType);
+	if (constructor == typeSystem.constructor(PrimitiveType::Void))
+		return {};
+	if (constructor != sumConstructor)
+		return {_tupleType};
+	solAssert(arguments.size() == 2);
+
+	std::vector<Type> result;
+	result.emplace_back(arguments.front());
+	Type tail = arguments.back();
+	while (true)
+	{
+		if (!isTypeConstant(tail))
+			break;
+		auto [tailConstructor, tailArguments] = destTypeConstant(tail);
+		if (tailConstructor != sumConstructor)
+			break;
+		solAssert(tailArguments.size() == 2);
+		result.emplace_back(tailArguments.front());
+		tail = tailArguments.back();
+	}
+	result.emplace_back(tail);
+	return result;
+}
+
+std::tuple<TypeConstructor, std::vector<experimental::Type>> TypeSystemHelpers::destTypeConstant(Type _type) const
+{
+	using ResultType = std::tuple<TypeConstructor, std::vector<Type>>;
+	return std::visit(util::GenericVisitor{
+		[&](TypeConstant const& _type) -> ResultType {
+			return std::make_tuple(_type.constructor, _type.arguments);
+		},
+		[](auto const&) -> ResultType {
+			solAssert(false);
+		}
+	}, _type);
+}
+
+bool TypeSystemHelpers::isTypeConstant(Type _type) const
+{
+	return std::visit(util::GenericVisitor{
+		[&](TypeConstant const&) -> bool {
+			return true;
+		},
+		[](auto const&) -> bool {
+			return false;
+		}
+	}, _type);
+}
+
+bool TypeSystemHelpers::isPrimitiveType(Type _type, PrimitiveType _primitiveType) const
+{
+	if (!isTypeConstant(_type))
+		return false;
+	auto constructor = std::get<0>(destTypeConstant(_type));
+	return constructor == typeSystem.constructor(_primitiveType);
+}
+
+experimental::Type TypeSystemHelpers::functionType(experimental::Type _argType, experimental::Type _resultType) const
+{
+	return typeSystem.type(PrimitiveType::Function, {_argType, _resultType});
+}
+
+std::tuple<experimental::Type, experimental::Type> TypeSystemHelpers::destFunctionType(Type _functionType) const
+{
+	auto [constructor, arguments] = destTypeConstant(_functionType);
+	solAssert(constructor == typeSystem.constructor(PrimitiveType::Function));
+	solAssert(arguments.size() == 2);
+	return std::make_tuple(arguments.front(), arguments.back());
+}
+
+bool TypeSystemHelpers::isFunctionType(Type _type) const
+{
+	return isPrimitiveType(_type, PrimitiveType::Function);
+}
+
+experimental::Type TypeSystemHelpers::typeFunctionType(experimental::Type _argType, experimental::Type _resultType) const
+{
+	return typeSystem.type(PrimitiveType::TypeFunction, {_argType, _resultType});
+}
+
+std::tuple<experimental::Type, experimental::Type> TypeSystemHelpers::destTypeFunctionType(Type _functionType) const
+{
+	auto [constructor, arguments] = destTypeConstant(_functionType);
+	solAssert(constructor == typeSystem.constructor(PrimitiveType::TypeFunction));
+	solAssert(arguments.size() == 2);
+	return std::make_tuple(arguments.front(), arguments.back());
+}
+
+bool TypeSystemHelpers::isTypeFunctionType(Type _type) const
+{
+	return isPrimitiveType(_type, PrimitiveType::TypeFunction);
+}
+
+std::vector<experimental::Type> TypeEnvironmentHelpers::typeVars(Type _type) const
+{
+	std::set<size_t> indices;
+	std::vector<Type> typeVars;
+	auto typeVarsImpl = [&](Type _type, auto _recurse) -> void {
+		std::visit(util::GenericVisitor{
+			[&](TypeConstant const& _type) {
+				for (auto arg: _type.arguments)
+					_recurse(arg, _recurse);
+			},
+			[&](TypeVariable const& _var) {
+				if (indices.emplace(_var.index()).second)
+					typeVars.emplace_back(_var);
+			},
+			[](std::monostate) { solAssert(false); }
+		}, env.resolve(_type));
+	};
+	typeVarsImpl(_type, typeVarsImpl);
+	return typeVars;
+
+}
+
+
+std::string TypeSystemHelpers::sortToString(Sort _sort) const
+{
+	switch (_sort.classes.size())
+	{
+	case 0:
+		return "()";
+	case 1:
+		return typeSystem.typeClassName(*_sort.classes.begin());
+	default:
+	{
+		std::stringstream stream;
+		stream << "(";
+		for (auto typeClass: _sort.classes | ranges::views::drop_last(1))
+			stream << typeSystem.typeClassName(typeClass) << ", ";
+		stream << typeSystem.typeClassName(*_sort.classes.rbegin()) << ")";
+		return stream.str();
+	}
+	}
+}
+
+std::string TypeEnvironmentHelpers::canonicalTypeName(Type _type) const
+{
+	return visit(util::GenericVisitor{
+		[&](TypeConstant _type) -> std::string {
+			std::stringstream stream;
+			stream << env.typeSystem().constructorInfo(_type.constructor).canonicalName;
+			if (!_type.arguments.empty())
+			{
+				stream << "$";
+				for (auto type: _type.arguments | ranges::views::drop_last(1))
+					stream << canonicalTypeName(type) << "$";
+				stream << canonicalTypeName(_type.arguments.back());
+				stream << "$";
+			}
+			return stream.str();
+		},
+		[](TypeVariable) -> std::string {
+			solAssert(false);
+		},
+		[](std::monostate) -> std::string {
+			solAssert(false);
+		},
+	}, env.resolve(_type));
+}
+
+std::string TypeEnvironmentHelpers::typeToString(Type const& _type) const
+{
+	std::map<TypeConstructor, std::function<std::string(std::vector<Type>)>> formatters{
+		{env.typeSystem().constructor(PrimitiveType::Function), [&](auto const& _args) {
+			solAssert(_args.size() == 2);
+			return fmt::format("{} -> {}", typeToString(_args.front()), typeToString(_args.back()));
+		}},
+		{env.typeSystem().constructor(PrimitiveType::Unit), [&](auto const& _args) {
+			solAssert(_args.size() == 0);
+			return "()";
+		}},
+		{env.typeSystem().constructor(PrimitiveType::Pair), [&](auto const& _arguments) {
+			auto tupleTypes = TypeSystemHelpers{env.typeSystem()}.destTupleType(_arguments.back());
+			std::string result = "(";
+			result += typeToString(_arguments.front());
+			for (auto type: tupleTypes)
+				result += ", " + typeToString(type);
+			result += ")";
+			return result;
+		}},
+	};
+	return std::visit(util::GenericVisitor{
+		[&](TypeConstant const& _type) {
+			if (auto* formatter = util::valueOrNullptr(formatters, _type.constructor))
+				return (*formatter)(_type.arguments);
+			std::stringstream stream;
+			stream << env.typeSystem().constructorInfo(_type.constructor).name;
+			if (!_type.arguments.empty())
+			{
+				stream << "(";
+				for (auto type: _type.arguments | ranges::views::drop_last(1))
+					stream << typeToString(type) << ", ";
+				stream << typeToString(_type.arguments.back());
+				stream << ")";
+			}
+			return stream.str();
+		},
+		[&](TypeVariable const& _type) {
+			std::stringstream stream;
+			std::string varName;
+			size_t index = _type.index();
+			varName += static_cast<char>('a' + (index%26));
+			while (index /= 26)
+				varName += static_cast<char>('a' + (index%26));
+			reverse(varName.begin(), varName.end());
+			stream << '\'' << varName;
+			switch (_type.sort().classes.size())
+			{
+			case 0:
+				break;
+			case 1:
+				stream << ":" << env.typeSystem().typeClassName(*_type.sort().classes.begin());
+				break;
+			default:
+				stream << ":(";
+				for (auto typeClass: _type.sort().classes | ranges::views::drop_last(1))
+					stream << env.typeSystem().typeClassName(typeClass) << ", ";
+				stream << env.typeSystem().typeClassName(*_type.sort().classes.rbegin());
+				stream << ")";
+				break;
+			}
+			return stream.str();
+		},
+		[](std::monostate) -> std::string { solAssert(false); }
+	}, env.resolve(_type));
+}
diff --git a/libsolidity/experimental/ast/TypeSystemHelper.h b/libsolidity/experimental/ast/TypeSystemHelper.h
new file mode 100644
index 0000000000..fd55c1bf84
--- /dev/null
+++ b/libsolidity/experimental/ast/TypeSystemHelper.h
@@ -0,0 +1,60 @@
+/*
+	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
+#pragma once
+
+#include <libsolidity/experimental/ast/TypeSystem.h>
+#include <libsolidity/ast/ASTForward.h>
+#include <liblangutil/Token.h>
+
+namespace solidity::frontend::experimental
+{
+class Analysis;
+enum class BuiltinClass;
+//std::optional<TypeConstructor> typeConstructorFromTypeName(Analysis const& _analysis, TypeName const& _typeName);
+//std::optional<TypeConstructor> typeConstructorFromToken(Analysis const& _analysis, langutil::Token _token);
+//std::optional<TypeClass> typeClassFromTypeClassName(TypeClassName const& _typeClass);
+std::optional<BuiltinClass> builtinClassFromToken(langutil::Token _token);
+
+struct TypeSystemHelpers
+{
+	TypeSystem const& typeSystem;
+	std::tuple<TypeConstructor, std::vector<Type>> destTypeConstant(Type _type) const;
+	bool isTypeConstant(Type _type) const;
+	bool isPrimitiveType(Type _type, PrimitiveType _primitiveType) const;
+	Type tupleType(std::vector<Type> _elements) const;
+	std::vector<Type> destTupleType(Type _tupleType) const;
+	Type sumType(std::vector<Type> _elements) const;
+	std::vector<Type> destSumType(Type _tupleType) const;
+	Type functionType(Type _argType, Type _resultType) const;
+	std::tuple<Type, Type> destFunctionType(Type _functionType) const;
+	bool isFunctionType(Type _type) const;
+	Type typeFunctionType(Type _argType, Type _resultType) const;
+	std::tuple<Type, Type> destTypeFunctionType(Type _functionType) const;
+	bool isTypeFunctionType(Type _type) const;
+	std::string sortToString(Sort _sort) const;
+};
+
+struct TypeEnvironmentHelpers
+{
+	TypeEnvironment const& env;
+	std::string typeToString(Type const& _type) const;
+	std::string canonicalTypeName(Type _type) const;
+	std::vector<Type> typeVars(Type _type) const;
+};
+
+}
diff --git a/libsolidity/experimental/codegen/Common.cpp b/libsolidity/experimental/codegen/Common.cpp
new file mode 100644
index 0000000000..de50fd47c6
--- /dev/null
+++ b/libsolidity/experimental/codegen/Common.cpp
@@ -0,0 +1,73 @@
+/*
+	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 <libsolidity/experimental/codegen/Common.h>
+#include <libsolidity/experimental/ast/TypeSystem.h>
+#include <libsolidity/experimental/ast/TypeSystemHelper.h>
+
+#include <libsolutil/CommonIO.h>
+
+#include <libyul/AsmPrinter.h>
+
+using namespace solidity::langutil;
+using namespace solidity::frontend;
+using namespace solidity::util;
+using namespace solidity::yul;
+
+namespace solidity::frontend::experimental
+{
+
+std::string IRNames::function(TypeEnvironment const& _env, FunctionDefinition const& _function, Type _type)
+{
+	if (_function.isConstructor())
+		return constructor(*_function.annotation().contract);
+
+	return "fun_" + _function.name() + "_" + std::to_string(_function.id()) + "$" + TypeEnvironmentHelpers{_env}.canonicalTypeName(_type) + "$";
+}
+
+std::string IRNames::function(VariableDeclaration const& _varDecl)
+{
+	return "getter_fun_" + _varDecl.name() + "_" + std::to_string(_varDecl.id());
+}
+
+std::string IRNames::creationObject(ContractDefinition const& _contract)
+{
+	return _contract.name() + "_" + toString(_contract.id());
+}
+
+std::string IRNames::deployedObject(ContractDefinition const& _contract)
+{
+	return _contract.name() + "_" + toString(_contract.id()) + "_deployed";
+}
+
+std::string IRNames::constructor(ContractDefinition const& _contract)
+{
+	return "constructor_" + _contract.name() + "_" + std::to_string(_contract.id());
+}
+
+std::string IRNames::localVariable(VariableDeclaration const& _declaration)
+{
+	return "var_" + _declaration.name() + '_' + std::to_string(_declaration.id());
+}
+
+std::string IRNames::localVariable(Expression const& _expression)
+{
+	return "expr_" + std::to_string(_expression.id());
+}
+
+}
diff --git a/libsolidity/experimental/codegen/Common.h b/libsolidity/experimental/codegen/Common.h
new file mode 100644
index 0000000000..25f05efcbf
--- /dev/null
+++ b/libsolidity/experimental/codegen/Common.h
@@ -0,0 +1,41 @@
+/*
+	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
+
+#pragma once
+
+#include <libsolidity/ast/AST.h>
+#include <libsolidity/experimental/ast/TypeSystem.h>
+
+#include <algorithm>
+#include <string>
+
+namespace solidity::frontend::experimental
+{
+
+struct IRNames
+{
+	static std::string function(TypeEnvironment const& _env, FunctionDefinition const& _function, Type _type);
+	static std::string function(VariableDeclaration const& _varDecl);
+	static std::string creationObject(ContractDefinition const& _contract);
+	static std::string deployedObject(ContractDefinition const& _contract);
+	static std::string constructor(ContractDefinition const& _contract);
+	static std::string localVariable(VariableDeclaration const& _declaration);
+	static std::string localVariable(Expression const& _expression);
+};
+
+}
diff --git a/libsolidity/experimental/codegen/IRGenerationContext.h b/libsolidity/experimental/codegen/IRGenerationContext.h
new file mode 100644
index 0000000000..b0958cf678
--- /dev/null
+++ b/libsolidity/experimental/codegen/IRGenerationContext.h
@@ -0,0 +1,55 @@
+/*
+	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
+
+#pragma once
+
+#include <libsolidity/ast/ASTForward.h>
+
+#include <libsolidity/experimental/analysis/Analysis.h>
+#include <libsolidity/experimental/ast/TypeSystem.h>
+
+#include <list>
+#include <set>
+
+namespace solidity::frontend::experimental
+{
+
+class Analysis;
+
+struct IRGenerationContext
+{
+	Analysis const& analysis;
+	TypeEnvironment const* env = nullptr;
+	void enqueueFunctionDefinition(FunctionDefinition const* _functionDefinition, Type _type)
+	{
+		QueuedFunction queue{_functionDefinition, env->resolve(_type)};
+		for (auto type: generatedFunctions[_functionDefinition])
+			if (env->typeEquals(type, _type))
+				return;
+		functionQueue.emplace_back(queue);
+	}
+	struct QueuedFunction
+	{
+		FunctionDefinition const* function = nullptr;
+		Type type = std::monostate{};
+	};
+	std::list<QueuedFunction> functionQueue;
+	std::map<FunctionDefinition const*, std::vector<Type>> generatedFunctions;
+};
+
+}
diff --git a/libsolidity/experimental/codegen/IRGenerator.cpp b/libsolidity/experimental/codegen/IRGenerator.cpp
new file mode 100644
index 0000000000..257bd2be16
--- /dev/null
+++ b/libsolidity/experimental/codegen/IRGenerator.cpp
@@ -0,0 +1,160 @@
+/*
+	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 <libsolidity/experimental/codegen/IRGenerator.h>
+#include <libsolidity/experimental/codegen/IRGenerationContext.h>
+#include <libsolidity/experimental/codegen/IRGeneratorForStatements.h>
+
+#include <libsolidity/experimental/codegen/Common.h>
+
+#include <libsolidity/experimental/analysis/Analysis.h>
+#include <libsolidity/experimental/analysis/TypeInference.h>
+
+#include <libsolidity/experimental/ast/TypeSystemHelper.h>
+
+#include <libyul/YulStack.h>
+#include <libyul/AsmPrinter.h>
+#include <libyul/AST.h>
+#include <libyul/optimiser/ASTCopier.h>
+
+#include <liblangutil/SourceReferenceFormatter.h>
+
+#include <libsolutil/Whiskers.h>
+
+#include <range/v3/view/drop_last.hpp>
+
+#include <variant>
+
+using namespace solidity;
+using namespace solidity::frontend::experimental;
+using namespace solidity::langutil;
+using namespace solidity::util;
+
+IRGenerator::IRGenerator(
+	EVMVersion _evmVersion,
+	std::optional<uint8_t> _eofVersion,
+	frontend::RevertStrings, std::map<std::string, unsigned int>,
+	DebugInfoSelection const&,
+	CharStreamProvider const*,
+	Analysis const& _analysis
+)
+:
+m_evmVersion(_evmVersion),
+m_eofVersion(_eofVersion),
+//		m_debugInfoSelection(_debugInfoSelection),
+//		m_soliditySourceProvider(_soliditySourceProvider),
+m_env(_analysis.typeSystem().env().clone()),
+m_context{_analysis, &m_env, {}, {}}
+{
+}
+
+std::string IRGenerator::run(
+	ContractDefinition const& _contract,
+	bytes const& /*_cborMetadata*/,
+	std::map<ContractDefinition const*, std::string_view const> const& /*_otherYulSources*/
+)
+{
+
+	Whiskers t(R"(
+		object "<CreationObject>" {
+			code {
+				codecopy(0, dataoffset("<DeployedObject>"), datasize("<DeployedObject>"))
+				return(0, datasize("<DeployedObject>"))
+			}
+			object "<DeployedObject>" {
+				code {
+					<code>
+				}
+			}
+		}
+	)");
+	t("CreationObject", IRNames::creationObject(_contract));
+	t("DeployedObject", IRNames::deployedObject(_contract));
+	t("code", generate(_contract));
+
+	return t.render();
+}
+
+std::string IRGenerator::generate(ContractDefinition const& _contract)
+{
+	std::stringstream code;
+	code << "{\n";
+	if (_contract.fallbackFunction())
+	{
+		auto type = m_context.analysis.annotation<TypeInference>(*_contract.fallbackFunction()).type;
+		solAssert(type);
+		type = m_context.env->resolve(*type);
+		code << IRNames::function(*m_context.env, *_contract.fallbackFunction(), *type) << "()\n";
+		m_context.enqueueFunctionDefinition(_contract.fallbackFunction(), *type);
+	}
+	code << "revert(0,0)\n";
+	code << "}\n";
+
+	while (!m_context.functionQueue.empty())
+	{
+		auto queueEntry = m_context.functionQueue.front();
+		m_context.functionQueue.pop_front();
+		auto& generatedTypes = m_context.generatedFunctions.insert(std::make_pair(queueEntry.function, std::vector<Type>{})).first->second;
+		if (!util::contains_if(generatedTypes, [&](auto const& _generatedType) { return m_context.env->typeEquals(_generatedType, queueEntry.type); }))
+		{
+			generatedTypes.emplace_back(queueEntry.type);
+			code << generate(*queueEntry.function, queueEntry.type);
+		}
+	}
+
+	return code.str();
+}
+
+std::string IRGenerator::generate(FunctionDefinition const& _function, Type _type)
+{
+	TypeEnvironment newEnv = m_context.env->clone();
+	ScopedSaveAndRestore envRestore{m_context.env, &newEnv};
+	auto type = m_context.analysis.annotation<TypeInference>(_function).type;
+	solAssert(type);
+	for (auto err: newEnv.unify(*type, _type))
+	{
+		TypeEnvironmentHelpers helper{newEnv};
+		solAssert(false, helper.typeToString(*type) + " <-> " + helper.typeToString(_type));
+	}
+	std::stringstream code;
+	code << "function " << IRNames::function(newEnv, _function, _type) << "(";
+	if (_function.parameters().size() > 1)
+		for (auto const& arg: _function.parameters() | ranges::views::drop_last(1))
+			code << IRNames::localVariable(*arg) << ", ";
+	if (!_function.parameters().empty())
+		code << IRNames::localVariable(*_function.parameters().back());
+	code << ")";
+	if (_function.experimentalReturnExpression())
+	{
+		auto returnType = m_context.analysis.annotation<TypeInference>(*_function.experimentalReturnExpression()).type;
+		solAssert(returnType);
+		if (!m_env.typeEquals(*returnType, m_context.analysis.typeSystem().type(PrimitiveType::Unit, {})))
+		{
+			// TODO: destructure tuples.
+			code << " -> " << IRNames::localVariable(*_function.experimentalReturnExpression()) << " ";
+		}
+	}
+	code << "{\n";
+	for (auto _statement: _function.body().statements())
+	{
+		IRGeneratorForStatements statementGenerator{m_context};
+		code << statementGenerator.generate(*_statement);
+	}
+	code << "}\n";
+	return code.str();
+}
diff --git a/libsolidity/experimental/codegen/IRGenerator.h b/libsolidity/experimental/codegen/IRGenerator.h
new file mode 100644
index 0000000000..cce8c73057
--- /dev/null
+++ b/libsolidity/experimental/codegen/IRGenerator.h
@@ -0,0 +1,72 @@
+/*
+	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
+
+#pragma once
+
+#include <libsolidity/experimental/codegen/IRGenerationContext.h>
+#include <libsolidity/interface/DebugSettings.h>
+#include <libsolidity/interface/OptimiserSettings.h>
+#include <libsolidity/ast/ASTForward.h>
+#include <libsolidity/ast/CallGraph.h>
+#include <libsolidity/experimental/ast/TypeSystem.h>
+
+#include <liblangutil/CharStreamProvider.h>
+#include <liblangutil/DebugInfoSelection.h>
+#include <liblangutil/EVMVersion.h>
+
+#include <json/json.h>
+
+#include <string>
+
+namespace solidity::frontend::experimental
+{
+
+class Analysis;
+
+class IRGenerator
+{
+public:
+	IRGenerator(
+		langutil::EVMVersion _evmVersion,
+		std::optional<uint8_t> _eofVersion,
+		RevertStrings /*_revertStrings*/,
+		std::map<std::string, unsigned> /*_sourceIndices*/,
+		langutil::DebugInfoSelection const& /*_debugInfoSelection*/,
+		langutil::CharStreamProvider const* /*_soliditySourceProvider*/,
+		Analysis const& _analysis
+	);
+
+	std::string run(
+		ContractDefinition const& _contract,
+		bytes const& _cborMetadata,
+		std::map<ContractDefinition const*, std::string_view const> const& _otherYulSources
+	);
+
+	std::string generate(ContractDefinition const& _contract);
+	std::string generate(FunctionDefinition const& _function, Type _type);
+private:
+	langutil::EVMVersion const m_evmVersion;
+	std::optional<uint8_t> const m_eofVersion;
+	OptimiserSettings const m_optimiserSettings;
+//	langutil::DebugInfoSelection m_debugInfoSelection = {};
+//	langutil::CharStreamProvider const* m_soliditySourceProvider = nullptr;
+	TypeEnvironment m_env;
+	IRGenerationContext m_context;
+};
+
+}
diff --git a/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
new file mode 100644
index 0000000000..cb4705f0d1
--- /dev/null
+++ b/libsolidity/experimental/codegen/IRGeneratorForStatements.cpp
@@ -0,0 +1,393 @@
+/*
+	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 <libsolidity/experimental/codegen/IRGeneratorForStatements.h>
+
+#include <libsolidity/experimental/analysis/Analysis.h>
+#include <libsolidity/experimental/analysis/TypeClassRegistration.h>
+#include <libsolidity/experimental/analysis/TypeInference.h>
+#include <libsolidity/experimental/analysis/TypeRegistration.h>
+
+#include <libsolidity/experimental/ast/TypeSystemHelper.h>
+
+#include <libyul/YulStack.h>
+#include <libyul/AsmPrinter.h>
+#include <libyul/AST.h>
+#include <libyul/optimiser/ASTCopier.h>
+
+#include <libsolidity/experimental/codegen/Common.h>
+
+#include <range/v3/view/drop_last.hpp>
+
+using namespace solidity;
+using namespace solidity::util;
+using namespace solidity::frontend;
+using namespace solidity::frontend::experimental;
+using namespace std::string_literals;
+
+std::string IRGeneratorForStatements::generate(ASTNode const& _node)
+{
+	_node.accept(*this);
+	return m_code.str();
+}
+
+
+namespace
+{
+
+struct CopyTranslate: public yul::ASTCopier
+{
+	CopyTranslate(
+		IRGenerationContext const& _context,
+		yul::Dialect const& _dialect,
+		std::map<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> _references
+	): m_context(_context), m_dialect(_dialect), m_references(std::move(_references)) {}
+
+	using ASTCopier::operator();
+
+	yul::Expression operator()(yul::Identifier const& _identifier) override
+	{
+		// The operator() function is only called in lvalue context. In rvalue context,
+		// only translate(yul::Identifier) is called.
+		if (m_references.count(&_identifier))
+			return translateReference(_identifier);
+		else
+			return ASTCopier::operator()(_identifier);
+	}
+
+	yul::YulString translateIdentifier(yul::YulString _name) override
+	{
+		if (m_dialect.builtin(_name))
+			return _name;
+		else
+			return yul::YulString{"usr$" + _name.str()};
+	}
+
+	yul::Identifier translate(yul::Identifier const& _identifier) override
+	{
+		if (!m_references.count(&_identifier))
+			return ASTCopier::translate(_identifier);
+
+		yul::Expression translated = translateReference(_identifier);
+		solAssert(std::holds_alternative<yul::Identifier>(translated));
+		return std::get<yul::Identifier>(std::move(translated));
+	}
+
+private:
+
+	/// Translates a reference to a local variable, potentially including
+	/// a suffix. Might return a literal, which causes this to be invalid in
+	/// lvalue-context.
+	yul::Expression translateReference(yul::Identifier const& _identifier)
+	{
+		auto const& reference = m_references.at(&_identifier);
+		auto const varDecl = dynamic_cast<VariableDeclaration const*>(reference.declaration);
+		solAssert(varDecl, "External reference in inline assembly to something that is not a variable declaration.");
+		auto type = m_context.analysis.annotation<TypeInference>(*varDecl).type;
+		solAssert(type);
+		solAssert(m_context.env->typeEquals(*type, m_context.analysis.typeSystem().type(PrimitiveType::Word, {})));
+		std::string value = IRNames::localVariable(*varDecl);
+		return yul::Identifier{_identifier.debugData, yul::YulString{value}};
+	}
+
+	IRGenerationContext const& m_context;
+	yul::Dialect const& m_dialect;
+	std::map<yul::Identifier const*, InlineAssemblyAnnotation::ExternalIdentifierInfo> m_references;
+};
+
+}
+
+bool IRGeneratorForStatements::visit(TupleExpression const& _tupleExpression)
+{
+	std::vector<std::string> components;
+	for (auto const& component: _tupleExpression.components())
+	{
+		solUnimplementedAssert(component);
+		component->accept(*this);
+		components.emplace_back(IRNames::localVariable(*component));
+	}
+
+	solUnimplementedAssert(false, "No support for tuples.");
+
+	return false;
+}
+
+bool IRGeneratorForStatements::visit(InlineAssembly const& _assembly)
+{
+	CopyTranslate bodyCopier{m_context, _assembly.dialect(), _assembly.annotation().externalReferences};
+	yul::Statement modified = bodyCopier(_assembly.operations());
+	solAssert(std::holds_alternative<yul::Block>(modified));
+	m_code << yul::AsmPrinter()(std::get<yul::Block>(modified)) << "\n";
+	return false;
+}
+
+bool IRGeneratorForStatements::visit(VariableDeclarationStatement const& _variableDeclarationStatement)
+{
+	if (_variableDeclarationStatement.initialValue())
+		_variableDeclarationStatement.initialValue()->accept(*this);
+	solAssert(_variableDeclarationStatement.declarations().size() == 1, "multi variable declarations not supported");
+	VariableDeclaration const* variableDeclaration = _variableDeclarationStatement.declarations().front().get();
+	solAssert(variableDeclaration);
+	// TODO: check the type of the variable; register local variable; initialize
+	m_code << "let " << IRNames::localVariable(*variableDeclaration);
+	if (_variableDeclarationStatement.initialValue())
+		m_code << " := " << IRNames::localVariable(*_variableDeclarationStatement.initialValue());
+	m_code << "\n";
+	return false;
+}
+
+bool IRGeneratorForStatements::visit(ExpressionStatement const&)
+{
+	return true;
+}
+
+bool IRGeneratorForStatements::visit(Identifier const& _identifier)
+{
+	if (auto const* var = dynamic_cast<VariableDeclaration const*>(_identifier.annotation().referencedDeclaration))
+	{
+		m_code << "let " << IRNames::localVariable(_identifier) << " := " << IRNames::localVariable(*var) << "\n";
+	}
+	else if (auto const* function = dynamic_cast<FunctionDefinition const*>(_identifier.annotation().referencedDeclaration))
+		solAssert(m_expressionDeclaration.emplace(&_identifier, function).second);
+	else if (auto const* typeClass = dynamic_cast<TypeClassDefinition const*>(_identifier.annotation().referencedDeclaration))
+		solAssert(m_expressionDeclaration.emplace(&_identifier, typeClass).second);
+	else if (auto const* typeDefinition = dynamic_cast<TypeDefinition const*>(_identifier.annotation().referencedDeclaration))
+		solAssert(m_expressionDeclaration.emplace(&_identifier, typeDefinition).second);
+	else
+		solAssert(false, "Unsupported Identifier");
+	return false;
+}
+
+void IRGeneratorForStatements::endVisit(Return const& _return)
+{
+	if (Expression const* value = _return.expression())
+	{
+		solAssert(_return.annotation().function, "Invalid return.");
+		solAssert(_return.annotation().function->experimentalReturnExpression(), "Invalid return.");
+		m_code << IRNames::localVariable(*_return.annotation().function->experimentalReturnExpression()) << " := " << IRNames::localVariable(*value) << "\n";
+	}
+
+	m_code << "leave\n";
+}
+
+experimental::Type IRGeneratorForStatements::type(ASTNode const& _node) const
+{
+	auto type = m_context.analysis.annotation<TypeInference>(_node).type;
+	solAssert(type);
+	return *type;
+}
+
+void IRGeneratorForStatements::endVisit(BinaryOperation const& _binaryOperation)
+{
+	TypeSystemHelpers helper{m_context.analysis.typeSystem()};
+	Type leftType = type(_binaryOperation.leftExpression());
+	Type rightType = type(_binaryOperation.rightExpression());
+	Type resultType = type(_binaryOperation);
+	Type functionType = helper.functionType(helper.tupleType({leftType, rightType}), resultType);
+	auto [typeClass, memberName] = m_context.analysis.annotation<TypeInference>().operators.at(_binaryOperation.getOperator());
+	auto const& functionDefinition = resolveTypeClassFunction(typeClass, memberName, functionType);
+	// TODO: deduplicate with FunctionCall
+	// TODO: get around resolveRecursive by passing the environment further down?
+	functionType = m_context.env->resolveRecursive(functionType);
+	m_context.enqueueFunctionDefinition(&functionDefinition, functionType);
+	// TODO: account for return stack size
+	m_code << "let " << IRNames::localVariable(_binaryOperation) << " := " << IRNames::function(*m_context.env, functionDefinition, functionType) << "("
+		<< IRNames::localVariable(_binaryOperation.leftExpression()) << ", " << IRNames::localVariable(_binaryOperation.rightExpression()) << ")\n";
+}
+
+namespace
+{
+TypeRegistration::TypeClassInstantiations const& typeClassInstantiations(IRGenerationContext const& _context, TypeClass _class)
+{
+	auto const* typeClassDeclaration = _context.analysis.typeSystem().typeClassDeclaration(_class);
+	if (typeClassDeclaration)
+		return _context.analysis.annotation<TypeRegistration>(*typeClassDeclaration).instantiations;
+	// TODO: better mechanism than fetching by name.
+	auto& instantiations = _context.analysis.annotation<TypeRegistration>().builtinClassInstantiations;
+	auto& builtinClassesByName = _context.analysis.annotation<TypeInference>().builtinClassesByName;
+	return instantiations.at(builtinClassesByName.at(_context.analysis.typeSystem().typeClassName(_class)));
+}
+}
+
+FunctionDefinition const& IRGeneratorForStatements::resolveTypeClassFunction(TypeClass _class, std::string _name, Type _type)
+{
+	TypeSystemHelpers helper{m_context.analysis.typeSystem()};
+
+	TypeEnvironment env = m_context.env->clone();
+	Type genericFunctionType = env.fresh(m_context.analysis.annotation<TypeInference>().typeClassFunctions.at(_class).at(_name));
+	auto typeVars = TypeEnvironmentHelpers{env}.typeVars(genericFunctionType);
+	solAssert(typeVars.size() == 1);
+	solAssert(env.unify(genericFunctionType, _type).empty());
+	auto typeClassInstantiation = std::get<0>(helper.destTypeConstant(env.resolve(typeVars.front())));
+
+	auto const& instantiations = typeClassInstantiations(m_context, _class);
+	TypeClassInstantiation const* instantiation = instantiations.at(typeClassInstantiation);
+	FunctionDefinition const* functionDefinition = nullptr;
+	for (auto const& node: instantiation->subNodes())
+	{
+		auto const* def = dynamic_cast<FunctionDefinition const*>(node.get());
+		solAssert(def);
+		if (def->name() == _name)
+		{
+			functionDefinition = def;
+			break;
+		}
+	}
+	solAssert(functionDefinition);
+	return *functionDefinition;
+}
+
+void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
+{
+	TypeSystemHelpers helper{m_context.analysis.typeSystem()};
+	// TODO: avoid resolve?
+	auto expressionType = m_context.env->resolve(type(_memberAccess.expression()));
+	auto constructor = std::get<0>(helper.destTypeConstant(expressionType));
+	auto memberAccessType = type(_memberAccess);
+	// TODO: better mechanism
+	if (constructor == m_context.analysis.typeSystem().constructor(PrimitiveType::Bool))
+	{
+		if (_memberAccess.memberName() == "abs")
+			solAssert(m_expressionDeclaration.emplace(&_memberAccess, Builtins::ToBool).second);
+		else if (_memberAccess.memberName() == "rep")
+			solAssert(m_expressionDeclaration.emplace(&_memberAccess, Builtins::FromBool).second);
+		return;
+	}
+	auto const* declaration = m_context.analysis.typeSystem().constructorInfo(constructor).typeDeclaration;
+	solAssert(declaration);
+	if (auto const* typeClassDefinition = dynamic_cast<TypeClassDefinition const*>(declaration))
+	{
+		solAssert(m_context.analysis.annotation<TypeClassRegistration>(*typeClassDefinition).typeClass.has_value());
+		TypeClass typeClass = m_context.analysis.annotation<TypeClassRegistration>(*typeClassDefinition).typeClass.value();
+		solAssert(m_expressionDeclaration.emplace(
+			&_memberAccess,
+			&resolveTypeClassFunction(typeClass, _memberAccess.memberName(), memberAccessType)
+		).second);
+	}
+	else if (dynamic_cast<TypeDefinition const*>(declaration))
+	{
+		if (_memberAccess.memberName() == "abs" || _memberAccess.memberName() == "rep")
+			solAssert(m_expressionDeclaration.emplace(&_memberAccess, Builtins::Identity).second);
+		else
+			solAssert(false);
+	}
+	else
+		solAssert(false);
+}
+
+bool IRGeneratorForStatements::visit(ElementaryTypeNameExpression const&)
+{
+	// TODO: is this always a no-op?
+	return false;
+}
+
+void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
+{
+	Type functionType = type(_functionCall.expression());
+	solUnimplementedAssert(m_expressionDeclaration.count(&_functionCall.expression()) != 0, "No support for calling functions pointers yet.");
+	auto declaration = m_expressionDeclaration.at(&_functionCall.expression());
+	if (auto builtin = std::get_if<Builtins>(&declaration))
+	{
+		switch (*builtin)
+		{
+		case Builtins::FromBool:
+		case Builtins::Identity:
+			solAssert(_functionCall.arguments().size() == 1);
+			m_code << "let " << IRNames::localVariable(_functionCall) << " := " << IRNames::localVariable(*_functionCall.arguments().front()) << "\n";
+			return;
+		case Builtins::ToBool:
+			solAssert(_functionCall.arguments().size() == 1);
+			m_code << "let " << IRNames::localVariable(_functionCall) << " := iszero(iszero(" << IRNames::localVariable(*_functionCall.arguments().front()) << "))\n";
+			return;
+		}
+		solAssert(false);
+	}
+	FunctionDefinition const* functionDefinition = dynamic_cast<FunctionDefinition const*>(std::get<Declaration const*>(declaration));
+	solAssert(functionDefinition);
+	// TODO: get around resolveRecursive by passing the environment further down?
+	functionType = m_context.env->resolveRecursive(functionType);
+	m_context.enqueueFunctionDefinition(functionDefinition, functionType);
+	// TODO: account for return stack size
+	solAssert(!functionDefinition->returnParameterList());
+	if (functionDefinition->experimentalReturnExpression())
+		m_code << "let " << IRNames::localVariable(_functionCall) << " := ";
+	m_code << IRNames::function(*m_context.env, *functionDefinition, functionType) << "(";
+	auto const& arguments = _functionCall.arguments();
+	if (arguments.size() > 1)
+		for (auto arg: arguments | ranges::views::drop_last(1))
+			m_code << IRNames::localVariable(*arg) << ", ";
+	if (!arguments.empty())
+		m_code << IRNames::localVariable(*arguments.back());
+	m_code << ")\n";
+}
+
+bool IRGeneratorForStatements::visit(FunctionCall const&)
+{
+	return true;
+}
+
+bool IRGeneratorForStatements::visit(Block const& _block)
+{
+	m_code << "{\n";
+	solAssert(!_block.unchecked());
+	for (auto const& statement: _block.statements())
+		statement->accept(*this);
+	m_code << "}\n";
+	return false;
+}
+
+bool IRGeneratorForStatements::visit(IfStatement const& _ifStatement)
+{
+	_ifStatement.condition().accept(*this);
+	if (_ifStatement.falseStatement())
+	{
+		m_code << "switch " << IRNames::localVariable(_ifStatement.condition()) << " {\n";
+		m_code << "case 0 {\n";
+		_ifStatement.falseStatement()->accept(*this);
+		m_code << "}\n";
+		m_code << "default {\n";
+		_ifStatement.trueStatement().accept(*this);
+		m_code << "}\n";
+	}
+	else
+	{
+		m_code << "if " << IRNames::localVariable(_ifStatement.condition()) << " {\n";
+		_ifStatement.trueStatement().accept(*this);
+		m_code << "}\n";
+	}
+	return false;
+}
+
+bool IRGeneratorForStatements::visit(Assignment const& _assignment)
+{
+	_assignment.rightHandSide().accept(*this);
+	auto const* lhs = dynamic_cast<Identifier const*>(&_assignment.leftHandSide());
+	solAssert(lhs, "Can only assign to identifiers.");
+	auto const* lhsVar = dynamic_cast<VariableDeclaration const*>(lhs->annotation().referencedDeclaration);
+	solAssert(lhsVar, "Can only assign to identifiers referring to variables.");
+	m_code << IRNames::localVariable(*lhsVar) << " := " << IRNames::localVariable(_assignment.rightHandSide()) << "\n";
+
+	m_code << "let " << IRNames::localVariable(_assignment) << " := " << IRNames::localVariable(*lhsVar) << "\n";
+	return false;
+}
+
+
+bool IRGeneratorForStatements::visitNode(ASTNode const&)
+{
+	solAssert(false, "Unsupported AST node during statement code generation.");
+}
diff --git a/libsolidity/experimental/codegen/IRGeneratorForStatements.h b/libsolidity/experimental/codegen/IRGeneratorForStatements.h
new file mode 100644
index 0000000000..527a6abe85
--- /dev/null
+++ b/libsolidity/experimental/codegen/IRGeneratorForStatements.h
@@ -0,0 +1,71 @@
+/*
+	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
+
+#pragma once
+
+#include <libsolidity/experimental/codegen/IRGenerationContext.h>
+#include <libsolidity/ast/ASTVisitor.h>
+
+#include <functional>
+#include <sstream>
+
+namespace solidity::frontend::experimental
+{
+class Analysis;
+
+class IRGeneratorForStatements: public ASTConstVisitor
+{
+public:
+	IRGeneratorForStatements(IRGenerationContext& _context): m_context(_context) {}
+
+	std::string generate(ASTNode const& _node);
+private:
+	bool visit(ExpressionStatement const& _expressionStatement) override;
+	bool visit(Block const& _block) override;
+	bool visit(IfStatement const& _ifStatement) override;
+	bool visit(Assignment const& _assignment) override;
+	bool visit(Identifier const& _identifier) override;
+	bool visit(FunctionCall const& _functionCall) override;
+	void endVisit(FunctionCall const& _functionCall) override;
+	bool visit(ElementaryTypeNameExpression const& _elementaryTypeNameExpression) override;
+	bool visit(MemberAccess const&) override { return true; }
+	bool visit(TupleExpression const&) override;
+	void endVisit(MemberAccess const& _memberAccess) override;
+	bool visit(InlineAssembly const& _inlineAssembly) override;
+	bool visit(BinaryOperation const&) override { return true; }
+	void endVisit(BinaryOperation const& _binaryOperation) override;
+	bool visit(VariableDeclarationStatement const& _variableDeclarationStatement) override;
+	bool visit(Return const&) override { return true; }
+	void endVisit(Return const& _return) override;
+	/// Default visit will reject all AST nodes that are not explicitly supported.
+	bool visitNode(ASTNode const& _node) override;
+	IRGenerationContext& m_context;
+	std::stringstream m_code;
+	enum class Builtins
+	{
+		Identity,
+		FromBool,
+		ToBool
+	};
+	std::map<Expression const*, std::variant<Declaration const*, Builtins>> m_expressionDeclaration;
+	Type type(ASTNode const& _node) const;
+
+	FunctionDefinition const& resolveTypeClassFunction(TypeClass _class, std::string _name, Type _type);
+};
+
+}
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index 058151928b..b4e3cf7f38 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -57,6 +57,8 @@
 #include <libsolidity/parsing/Parser.h>
 
 #include <libsolidity/experimental/analysis/Analysis.h>
+#include <libsolidity/experimental/analysis/FunctionDependencyAnalysis.h>
+#include <libsolidity/experimental/codegen/IRGenerator.h>
 
 #include <libsolidity/codegen/ir/Common.h>
 #include <libsolidity/codegen/ir/IRGenerator.h>
@@ -312,6 +314,7 @@ void CompilerStack::reset(bool _keepSettings)
 {
 	m_stackState = Empty;
 	m_sources.clear();
+	m_maxAstId.reset();
 	m_smtlib2Responses.clear();
 	m_unhandledSMTLib2Queries.clear();
 	if (!_keepSettings)
@@ -412,6 +415,10 @@ bool CompilerStack::parse()
 
 	m_stackState = (m_stopAfter <= Parsed ? Parsed : ParsedAndImported);
 	storeContractDefinitions();
+
+	solAssert(!m_maxAstId.has_value());
+	m_maxAstId = parser.maxID();
+
 	return true;
 }
 
@@ -464,7 +471,7 @@ bool CompilerStack::analyze()
 
 		m_globalContext = std::make_shared<GlobalContext>();
 		// We need to keep the same resolver during the whole process.
-		NameAndTypeResolver resolver(*m_globalContext, m_evmVersion, m_errorReporter);
+		NameAndTypeResolver resolver(*m_globalContext, m_evmVersion, m_errorReporter, experimentalSolidity);
 		for (Source const* source: m_sourceOrder)
 			if (source->ast && !resolver.registerDeclarations(*source->ast))
 				return false;
@@ -478,10 +485,12 @@ bool CompilerStack::analyze()
 
 		resolver.warnHomonymDeclarations();
 
-		DocStringTagParser docStringTagParser(m_errorReporter);
-		for (Source const* source: m_sourceOrder)
-			if (source->ast && !docStringTagParser.parseDocStrings(*source->ast))
-				noErrors = false;
+		{
+			DocStringTagParser docStringTagParser(m_errorReporter);
+			for (Source const* source: m_sourceOrder)
+				if (source->ast && !docStringTagParser.parseDocStrings(*source->ast))
+					noErrors = false;
+		}
 
 		// Requires DocStringTagParser
 		for (Source const* source: m_sourceOrder)
@@ -658,7 +667,8 @@ bool CompilerStack::analyzeLegacy(bool _noErrorsSoFar)
 bool CompilerStack::analyzeExperimental()
 {
 	solAssert(!m_experimentalAnalysis);
-	m_experimentalAnalysis = std::make_unique<experimental::Analysis>(m_errorReporter);
+	solAssert(m_maxAstId && *m_maxAstId >= 0);
+	m_experimentalAnalysis = std::make_unique<experimental::Analysis>(m_errorReporter, static_cast<std::uint64_t>(*m_maxAstId));
 	std::vector<std::shared_ptr<SourceUnit const>> sourceAsts;
 	for (Source const* source: m_sourceOrder)
 		if (source->ast)
@@ -925,8 +935,6 @@ std::string const& CompilerStack::yulIR(std::string const& _contractName) const
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return contract(_contractName).yulIR;
 }
 
@@ -945,8 +953,6 @@ std::string const& CompilerStack::yulIROptimized(std::string const& _contractNam
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return contract(_contractName).yulIROptimized;
 }
 
@@ -965,8 +971,6 @@ evmasm::LinkerObject const& CompilerStack::object(std::string const& _contractNa
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return contract(_contractName).object;
 }
 
@@ -975,8 +979,6 @@ evmasm::LinkerObject const& CompilerStack::runtimeObject(std::string const& _con
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solUnimplementedAssert(!isExperimentalSolidity());
-
 	return contract(_contractName).runtimeObject;
 }
 
@@ -986,8 +988,6 @@ std::string CompilerStack::assemblyString(std::string const& _contractName, Stri
 	if (m_stackState != CompilationSuccessful)
 		solThrow(CompilerError, "Compilation was not successful.");
 
-	solUnimplementedAssert(!isExperimentalSolidity());
-
 	Contract const& currentContract = contract(_contractName);
 	if (currentContract.evmAssembly)
 		return currentContract.evmAssembly->assemblyString(m_debugInfoSelection, _sourceCodes);
@@ -1496,9 +1496,6 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 {
 	solAssert(m_stackState >= AnalysisSuccessful, "");
 
-	if (m_experimentalAnalysis)
-		solThrow(CompilerError, "IR codegen after experimental analysis is unsupported.");
-
 	Contract& compiledContract = m_contracts.at(_contract.fullyQualifiedName());
 	if (!compiledContract.yulIR.empty())
 		return;
@@ -1522,20 +1519,40 @@ void CompilerStack::generateIR(ContractDefinition const& _contract)
 	for (auto const& pair: m_contracts)
 		otherYulSources.emplace(pair.second.contract, pair.second.yulIR);
 
-	IRGenerator generator(
-		m_evmVersion,
-		m_eofVersion,
-		m_revertStrings,
-		sourceIndices(),
-		m_debugInfoSelection,
-		this,
-		m_optimiserSettings
-	);
-	compiledContract.yulIR = generator.run(
-		_contract,
-		createCBORMetadata(compiledContract, /* _forIR */ true),
-		otherYulSources
-	);
+	if (m_experimentalAnalysis)
+	{
+		experimental::IRGenerator generator(
+			m_evmVersion,
+			m_eofVersion,
+			m_revertStrings,
+			sourceIndices(),
+			m_debugInfoSelection,
+			this,
+			*m_experimentalAnalysis
+		);
+		compiledContract.yulIR = generator.run(
+			_contract,
+			{}, // TODO: createCBORMetadata(compiledContract, /* _forIR */ true),
+			otherYulSources
+		);
+	}
+	else
+	{
+		IRGenerator generator(
+			m_evmVersion,
+			m_eofVersion,
+			m_revertStrings,
+			sourceIndices(),
+			m_debugInfoSelection,
+			this,
+			m_optimiserSettings
+		);
+		compiledContract.yulIR = generator.run(
+			_contract,
+			createCBORMetadata(compiledContract, /* _forIR */ true),
+			otherYulSources
+		);
+	}
 
 	yul::YulStack stack(
 		m_evmVersion,
@@ -1977,3 +1994,9 @@ bool CompilerStack::isExperimentalSolidity() const
 		ranges::all_of(m_sourceOrder, [](auto const* _source) { return _source->ast->experimentalSolidity(); } )
 	;
 }
+
+experimental::Analysis const& CompilerStack::experimentalAnalysis() const
+{
+	solAssert(!!m_experimentalAnalysis);
+	return *m_experimentalAnalysis;
+}
diff --git a/libsolidity/interface/CompilerStack.h b/libsolidity/interface/CompilerStack.h
index 0ccb33219e..57d30e602d 100644
--- a/libsolidity/interface/CompilerStack.h
+++ b/libsolidity/interface/CompilerStack.h
@@ -236,6 +236,13 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	/// @returns false on error.
 	bool compile(State _stopAfter = State::CompilationSuccessful);
 
+	/// Checks whether experimental analysis is on; used in SyntaxTests to skip compilation in case it's ``true``.
+	/// @returns true if experimental analysis is set
+	bool isExperimentalAnalysis() const
+	{
+		return !!m_experimentalAnalysis;
+	}
+
 	/// @returns the list of sources (paths) used
 	virtual std::vector<std::string> sourceNames() const override;
 
@@ -350,6 +357,8 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 
 	bool isExperimentalSolidity() const;
 
+	experimental::Analysis const& experimentalAnalysis() const;
+
 	static MetadataFormat defaultMetadataFormat()
 	{
 		return VersionIsRelease ? MetadataFormat::WithReleaseVersionTag : MetadataFormat::WithPrereleaseVersionTag;
@@ -509,6 +518,7 @@ class CompilerStack: public langutil::CharStreamProvider, public evmasm::Abstrac
 	std::map<std::string, util::h160> m_libraries;
 	ImportRemapper m_importRemapper;
 	std::map<std::string const, Source> m_sources;
+	std::optional<int64_t> m_maxAstId;
 	std::vector<std::string> m_unhandledSMTLib2Queries;
 	std::map<util::h256, std::string> m_smtlib2Responses;
 	std::shared_ptr<GlobalContext> m_globalContext;
diff --git a/libsolidity/parsing/Parser.cpp b/libsolidity/parsing/Parser.cpp
index 76b5d23d31..42be1ab9ee 100644
--- a/libsolidity/parsing/Parser.cpp
+++ b/libsolidity/parsing/Parser.cpp
@@ -100,6 +100,9 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 		while (m_scanner->currentToken() == Token::Pragma)
 			nodes.push_back(parsePragmaDirective(false));
 
+		if (m_experimentalSolidityEnabledInCurrentSourceUnit)
+			m_scanner->setScannerMode(ScannerKind::ExperimentalSolidity);
+
 		while (m_scanner->currentToken() != Token::EOS)
 		{
 			switch (m_scanner->currentToken())
@@ -123,7 +126,10 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 				nodes.push_back(parseEnumDefinition());
 				break;
 			case Token::Type:
-				nodes.push_back(parseUserDefinedValueTypeDefinition());
+				if (m_experimentalSolidityEnabledInCurrentSourceUnit)
+					nodes.push_back(parseTypeDefinition());
+				else
+					nodes.push_back(parseUserDefinedValueTypeDefinition());
 				break;
 			case Token::Using:
 				nodes.push_back(parseUsingDirective());
@@ -134,6 +140,14 @@ ASTPointer<SourceUnit> Parser::parse(CharStream& _charStream)
 			case Token::Event:
 				nodes.push_back(parseEventDefinition());
 				break;
+			case Token::Class:
+				solAssert(m_experimentalSolidityEnabledInCurrentSourceUnit);
+				nodes.push_back(parseTypeClassDefinition());
+				break;
+			case Token::Instantiation:
+				solAssert(m_experimentalSolidityEnabledInCurrentSourceUnit);
+				nodes.push_back(parseTypeClassInstantiation());
+				break;
 			default:
 				if (
 					// Workaround because `error` is not a keyword.
@@ -591,18 +605,29 @@ Parser::FunctionHeaderParserResult Parser::parseFunctionHeader(bool _isStateVari
 		else
 			break;
 	}
-	if (m_scanner->currentToken() == Token::Returns)
+	if (m_experimentalSolidityEnabledInCurrentSourceUnit)
 	{
-		bool const permitEmptyParameterList = false;
-		advance();
-		result.returnParameters = parseParameterList(options, permitEmptyParameterList);
+		if (m_scanner->currentToken() == Token::RightArrow)
+		{
+			advance();
+			result.experimentalReturnExpression = parseBinaryExpression();
+		}
 	}
 	else
-		result.returnParameters = createEmptyParameterList();
+	{
+		if (m_scanner->currentToken() == Token::Returns)
+		{
+			bool const permitEmptyParameterList = m_experimentalSolidityEnabledInCurrentSourceUnit;
+			advance();
+			result.returnParameters = parseParameterList(options, permitEmptyParameterList);
+		}
+		else
+			result.returnParameters = createEmptyParameterList();
+	}
 	return result;
 }
 
-ASTPointer<ASTNode> Parser::parseFunctionDefinition(bool _freeFunction)
+ASTPointer<ASTNode> Parser::parseFunctionDefinition(bool _freeFunction, bool _allowBody)
 {
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
@@ -650,9 +675,16 @@ ASTPointer<ASTNode> Parser::parseFunctionDefinition(bool _freeFunction)
 
 	FunctionHeaderParserResult header = parseFunctionHeader(false);
 
+	if (m_experimentalSolidityEnabledInCurrentSourceUnit)
+		solAssert(!header.returnParameters);
+	else
+		solAssert(!header.experimentalReturnExpression);
+
 	ASTPointer<Block> block;
 	nodeFactory.markEndPosition();
-	if (m_scanner->currentToken() == Token::Semicolon)
+	if (!_allowBody)
+		expectToken(Token::Semicolon);
+	else if (m_scanner->currentToken() == Token::Semicolon)
 		advance();
 	else
 	{
@@ -672,7 +704,8 @@ ASTPointer<ASTNode> Parser::parseFunctionDefinition(bool _freeFunction)
 		header.parameters,
 		header.modifiers,
 		header.returnParameters,
-		block
+		block,
+		header.experimentalReturnExpression
 	);
 }
 
@@ -1190,10 +1223,12 @@ ASTPointer<TypeName> Parser::parseTypeName()
 
 ASTPointer<FunctionTypeName> Parser::parseFunctionType()
 {
+	solAssert(!m_experimentalSolidityEnabledInCurrentSourceUnit);
 	RecursionGuard recursionGuard(*this);
 	ASTNodeFactory nodeFactory(*this);
 	expectToken(Token::Function);
 	FunctionHeaderParserResult header = parseFunctionHeader(true);
+	solAssert(!header.experimentalReturnExpression);
 	return nodeFactory.createNode<FunctionTypeName>(
 		header.parameters,
 		header.returnParameters,
@@ -1249,16 +1284,29 @@ ASTPointer<ParameterList> Parser::parseParameterList(
 	std::vector<ASTPointer<VariableDeclaration>> parameters;
 	VarDeclParserOptions options(_options);
 	options.allowEmptyName = true;
+	if (m_experimentalSolidityEnabledInCurrentSourceUnit && m_scanner->currentToken() == Token::Identifier)
+	{
+		// Parses unary parameter lists without parentheses. TODO: is this a good idea in all cases? Including arguments?
+		parameters = {parsePostfixVariableDeclaration()};
+		nodeFactory.setEndPositionFromNode(parameters.front());
+		return nodeFactory.createNode<ParameterList>(parameters);
+	}
 	expectToken(Token::LParen);
+	auto parseSingleVariableDeclaration = [&]() {
+		if (m_experimentalSolidityEnabledInCurrentSourceUnit)
+			return parsePostfixVariableDeclaration();
+		else
+			return parseVariableDeclaration(options);
+	};
 	if (!_allowEmpty || m_scanner->currentToken() != Token::RParen)
 	{
-		parameters.push_back(parseVariableDeclaration(options));
+		parameters.push_back(parseSingleVariableDeclaration());
 		while (m_scanner->currentToken() != Token::RParen)
 		{
 			if (m_scanner->currentToken() == Token::Comma && m_scanner->peekNextToken() == Token::RParen)
 				fatalParserError(7591_error, "Unexpected trailing comma in parameter list.");
 			expectToken(Token::Comma);
-			parameters.push_back(parseVariableDeclaration(options));
+			parameters.push_back(parseSingleVariableDeclaration());
 		}
 	}
 	nodeFactory.markEndPosition();
@@ -1607,12 +1655,221 @@ ASTPointer<RevertStatement> Parser::parseRevertStatement(ASTPointer<ASTString> c
 	return nodeFactory.createNode<RevertStatement>(_docString, errorCall);
 }
 
+ASTPointer<VariableDeclarationStatement> Parser::parsePostfixVariableDeclarationStatement(
+	ASTPointer<ASTString> const& _docString
+)
+{
+	RecursionGuard recursionGuard(*this);
+	ASTNodeFactory nodeFactory(*this);
+
+	expectToken(Token::Let);
+
+	std::vector<ASTPointer<VariableDeclaration>> variables;
+	variables.emplace_back(parsePostfixVariableDeclaration());
+	nodeFactory.setEndPositionFromNode(variables.back());
+
+	ASTPointer<Expression> value;
+	if (m_scanner->currentToken() == Token::Assign)
+	{
+		advance();
+		value = parseExpression();
+		nodeFactory.setEndPositionFromNode(value);
+	}
+	return nodeFactory.createNode<VariableDeclarationStatement>(_docString, variables, value);
+}
+
+ASTPointer<VariableDeclaration> Parser::parsePostfixVariableDeclaration()
+{
+	RecursionGuard recursionGuard(*this);
+	ASTNodeFactory nodeFactory(*this);
+
+	ASTPointer<StructuredDocumentation> const documentation = parseStructuredDocumentation();
+
+	nodeFactory.markEndPosition();
+	auto [identifier, nameLocation] = expectIdentifierWithLocation();
+
+	ASTPointer<Expression> type;
+	if (m_scanner->currentToken() == Token::Colon)
+	{
+		advance();
+		type = parseBinaryExpression();
+		nodeFactory.setEndPositionFromNode(type);
+	}
+
+	return nodeFactory.createNode<VariableDeclaration>(
+		nullptr,
+		identifier,
+		nameLocation,
+		nullptr,
+		Visibility::Default,
+		documentation,
+		false,
+		VariableDeclaration::Mutability::Mutable,
+		nullptr,
+		VariableDeclaration::Location::Unspecified,
+		type
+	);
+}
+
+ASTPointer<TypeClassDefinition> Parser::parseTypeClassDefinition()
+{
+	solAssert(m_experimentalSolidityEnabledInCurrentSourceUnit);
+	RecursionGuard recursionGuard(*this);
+	ASTNodeFactory nodeFactory(*this);
+
+	std::vector<ASTPointer<ASTNode>> subNodes;
+
+	ASTPointer<StructuredDocumentation> const documentation = parseStructuredDocumentation();
+
+	expectToken(Token::Class);
+	// TODO: parseTypeVariable()? parseTypeVariableDeclaration()?
+	ASTPointer<VariableDeclaration> typeVariable;
+	{
+		ASTNodeFactory nodeFactory(*this);
+		nodeFactory.markEndPosition();
+		auto [identifier, nameLocation] = expectIdentifierWithLocation();
+		typeVariable = nodeFactory.createNode<VariableDeclaration>(
+			nullptr,
+			identifier,
+			nameLocation,
+			nullptr,
+			Visibility::Default,
+			nullptr
+		);
+	}
+	expectToken(Token::Colon);
+	auto [name, nameLocation] = expectIdentifierWithLocation();
+	expectToken(Token::LBrace);
+	while (true)
+	{
+		Token currentTokenValue = m_scanner->currentToken();
+		if (currentTokenValue == Token::RBrace)
+			break;
+		expectToken(Token::Function, false);
+		subNodes.push_back(parseFunctionDefinition(false, false));
+	}
+	nodeFactory.markEndPosition();
+	expectToken(Token::RBrace);
+
+	return nodeFactory.createNode<TypeClassDefinition>(
+		typeVariable,
+		name,
+		nameLocation,
+		documentation,
+		subNodes
+	);
+}
+
+ASTPointer<TypeClassName> Parser::parseTypeClassName()
+{
+	RecursionGuard recursionGuard(*this);
+	ASTNodeFactory nodeFactory(*this);
+	std::variant<Token, ASTPointer<IdentifierPath>> name;
+	if (TokenTraits::isBuiltinTypeClassName(m_scanner->currentToken()))
+	{
+		nodeFactory.markEndPosition();
+		name = m_scanner->currentToken();
+		advance();
+	}
+	else
+	{
+		auto identifierPath = parseIdentifierPath();
+		name = identifierPath;
+		nodeFactory.setEndPositionFromNode(identifierPath);
+	}
+	return nodeFactory.createNode<TypeClassName>(name);
+}
+
+ASTPointer<TypeClassInstantiation> Parser::parseTypeClassInstantiation()
+{
+	solAssert(m_experimentalSolidityEnabledInCurrentSourceUnit);
+	RecursionGuard recursionGuard(*this);
+	ASTNodeFactory nodeFactory(*this);
+
+	std::vector<ASTPointer<ASTNode>> subNodes;
+
+	expectToken(Token::Instantiation);
+	// TODO: parseTypeConstructor()
+	ASTPointer<TypeName> typeConstructor = parseTypeName();
+	ASTPointer<ParameterList> argumentSorts;
+	if (m_scanner->currentToken() == Token::LParen)
+	{
+		argumentSorts = parseParameterList();
+	}
+	expectToken(Token::Colon);
+	ASTPointer<TypeClassName> typeClassName = parseTypeClassName();
+	expectToken(Token::LBrace);
+	while (true)
+	{
+		Token currentTokenValue = m_scanner->currentToken();
+		if (currentTokenValue == Token::RBrace)
+			break;
+		expectToken(Token::Function, false);
+		// TODO: require body already during parsing?
+		subNodes.push_back(parseFunctionDefinition(false, true));
+	}
+	nodeFactory.markEndPosition();
+	expectToken(Token::RBrace);
+
+	return nodeFactory.createNode<TypeClassInstantiation>(
+		typeConstructor,
+		argumentSorts,
+		typeClassName,
+		subNodes
+	);
+}
+
+ASTPointer<TypeDefinition> Parser::parseTypeDefinition()
+{
+	solAssert(m_experimentalSolidityEnabledInCurrentSourceUnit);
+	ASTNodeFactory nodeFactory(*this);
+	expectToken(Token::Type);
+	auto&& [name, nameLocation] = expectIdentifierWithLocation();
+
+	ASTPointer<ParameterList> arguments;
+	if (m_scanner->currentToken() == Token::LParen)
+		arguments = parseParameterList();
+
+	ASTPointer<Expression> expression;
+	if (m_scanner->currentToken() == Token::Assign)
+	{
+		expectToken(Token::Assign);
+
+		if (m_scanner->currentToken() != Token::Builtin)
+			expression = parseExpression();
+		else
+		{
+			expectToken(Token::Builtin);
+			expectToken(Token::LParen);
+
+			expression = nodeFactory.createNode<Builtin>(
+				std::make_shared<std::string>(m_scanner->currentLiteral()),
+				m_scanner->currentLocation()
+			);
+
+			expectToken(Token::StringLiteral);
+			expectToken(Token::RParen);
+		}
+	}
+	nodeFactory.markEndPosition();
+	expectToken(Token::Semicolon);
+	return nodeFactory.createNode<TypeDefinition>(
+		std::move(name),
+		std::move(nameLocation),
+		std::move(arguments),
+		std::move(expression)
+	);
+}
+
 ASTPointer<Statement> Parser::parseSimpleStatement(ASTPointer<ASTString> const& _docString)
 {
 	RecursionGuard recursionGuard(*this);
 	LookAheadInfo statementType;
 	IndexAccessedPath iap;
 
+	if (m_experimentalSolidityEnabledInCurrentSourceUnit && m_scanner->currentToken() == Token::Let)
+		return parsePostfixVariableDeclarationStatement(_docString);
+
 	if (m_scanner->currentToken() == Token::LParen)
 	{
 		ASTNodeFactory nodeFactory(*this);
@@ -1715,7 +1972,10 @@ std::pair<Parser::LookAheadInfo, Parser::IndexAccessedPath> Parser::tryParseInde
 	{
 	case LookAheadInfo::VariableDeclaration:
 	case LookAheadInfo::Expression:
-		return std::make_pair(statementType, IndexAccessedPath());
+		return std::make_pair(
+			m_experimentalSolidityEnabledInCurrentSourceUnit ? LookAheadInfo::Expression : statementType,
+			IndexAccessedPath()
+		);
 	default:
 		break;
 	}
@@ -1726,6 +1986,9 @@ std::pair<Parser::LookAheadInfo, Parser::IndexAccessedPath> Parser::tryParseInde
 	// VariableDeclarationStatement out of it.
 	IndexAccessedPath iap = parseIndexAccessedPath();
 
+	if (m_experimentalSolidityEnabledInCurrentSourceUnit)
+		return std::make_pair(LookAheadInfo::Expression, std::move(iap));
+
 	if (m_scanner->currentToken() == Token::Identifier || TokenTraits::isLocationSpecifier(m_scanner->currentToken()))
 		return std::make_pair(LookAheadInfo::VariableDeclaration, std::move(iap));
 	else
@@ -1808,9 +2071,9 @@ ASTPointer<Expression> Parser::parseBinaryExpression(
 	RecursionGuard recursionGuard(*this);
 	ASTPointer<Expression> expression = parseUnaryExpression(_partiallyParsedExpression);
 	ASTNodeFactory nodeFactory(*this, expression);
-	int precedence = TokenTraits::precedence(m_scanner->currentToken());
+	int precedence = tokenPrecedence(m_scanner->currentToken());
 	for (; precedence >= _minPrecedence; --precedence)
-		while (TokenTraits::precedence(m_scanner->currentToken()) == precedence)
+		while (tokenPrecedence(m_scanner->currentToken()) == precedence)
 		{
 			Token op = m_scanner->currentToken();
 			advance();
@@ -1827,6 +2090,23 @@ ASTPointer<Expression> Parser::parseBinaryExpression(
 	return expression;
 }
 
+int Parser::tokenPrecedence(Token _token) const
+{
+	if (m_experimentalSolidityEnabledInCurrentSourceUnit)
+	{
+		switch (_token)
+		{
+		case Token::Colon:
+			return 1000;
+		case Token::RightArrow:
+			return 999;
+		default:
+			break;
+		}
+	}
+	return TokenTraits::precedence(m_scanner->currentToken());
+}
+
 ASTPointer<Expression> Parser::parseUnaryExpression(
 	ASTPointer<Expression> const& _partiallyParsedExpression
 )
@@ -2285,7 +2565,14 @@ Parser::IndexAccessedPath Parser::parseIndexAccessedPath()
 		while (m_scanner->currentToken() == Token::Period)
 		{
 			advance();
-			iap.path.push_back(parseIdentifierOrAddress());
+			if (m_experimentalSolidityEnabledInCurrentSourceUnit && m_scanner->currentToken() == Token::Number)
+			{
+				ASTNodeFactory nodeFactory(*this);
+				nodeFactory.markEndPosition();
+				iap.path.push_back(nodeFactory.createNode<Identifier>(getLiteralAndAdvance()));
+			}
+			else
+				iap.path.push_back(parseIdentifierOrAddress());
 		}
 	}
 	else
diff --git a/libsolidity/parsing/Parser.h b/libsolidity/parsing/Parser.h
index 5f2a1213d5..d4c48c7a63 100644
--- a/libsolidity/parsing/Parser.h
+++ b/libsolidity/parsing/Parser.h
@@ -48,6 +48,8 @@ class Parser: public langutil::ParserBase
 
 	ASTPointer<SourceUnit> parse(langutil::CharStream& _charStream);
 
+	/// Returns the maximal AST node ID assigned so far
+	int64_t maxID() const { return m_currentNodeID; }
 private:
 	class ASTNodeFactory;
 
@@ -74,6 +76,7 @@ class Parser: public langutil::ParserBase
 		Visibility visibility = Visibility::Default;
 		StateMutability stateMutability = StateMutability::NonPayable;
 		std::vector<ASTPointer<ModifierInvocation>> modifiers;
+		ASTPointer<Expression> experimentalReturnExpression;
 	};
 
 	/// Struct to share parsed function call arguments.
@@ -99,7 +102,7 @@ class Parser: public langutil::ParserBase
 	ASTPointer<OverrideSpecifier> parseOverrideSpecifier();
 	StateMutability parseStateMutability();
 	FunctionHeaderParserResult parseFunctionHeader(bool _isStateVariable);
-	ASTPointer<ASTNode> parseFunctionDefinition(bool _freeFunction = false);
+	ASTPointer<ASTNode> parseFunctionDefinition(bool _freeFunction = false, bool _allowBody = true);
 	ASTPointer<StructDefinition> parseStructDefinition();
 	ASTPointer<EnumDefinition> parseEnumDefinition();
 	ASTPointer<UserDefinedValueTypeDefinition> parseUserDefinedValueTypeDefinition();
@@ -167,6 +170,18 @@ class Parser: public langutil::ParserBase
 	std::pair<ASTPointer<ASTString>, langutil::SourceLocation> expectIdentifierWithLocation();
 	///@}
 
+	///@{
+	///@name Specialized parsing functions for the AST nodes of experimental solidity.
+	ASTPointer<VariableDeclarationStatement> parsePostfixVariableDeclarationStatement(
+		ASTPointer<ASTString> const& _docString
+	);
+	ASTPointer<VariableDeclaration> parsePostfixVariableDeclaration();
+	ASTPointer<TypeClassDefinition> parseTypeClassDefinition();
+	ASTPointer<TypeClassInstantiation> parseTypeClassInstantiation();
+	ASTPointer<TypeDefinition> parseTypeDefinition();
+	ASTPointer<TypeClassName> parseTypeClassName();
+	///@}
+
 	///@{
 	///@name Helper functions
 
@@ -221,6 +236,8 @@ class Parser: public langutil::ParserBase
 	bool isQuotedPath() const;
 	bool isStdlibPath() const;
 
+	int tokenPrecedence(Token _token) const;
+
 	ASTPointer<ASTString> getStdlibImportPathAndAdvance();
 
 	/// Creates an empty ParameterList at the current location (used if parameters can be omitted).
diff --git a/libstdlib/src/stub.sol b/libstdlib/src/stub.sol
index 46ae21dcf5..bd34e0475a 100644
--- a/libstdlib/src/stub.sol
+++ b/libstdlib/src/stub.sol
@@ -3,7 +3,6 @@ pragma solidity >=0.0;
 
 pragma experimental solidity;
 
-function identity(uint256 x) pure returns (uint256)
+function identity()
 {
-  return x;
 }
diff --git a/scripts/ASTImportTest.sh b/scripts/ASTImportTest.sh
index 5c3f04d8e0..c7f504087c 100755
--- a/scripts/ASTImportTest.sh
+++ b/scripts/ASTImportTest.sh
@@ -326,7 +326,14 @@ esac
 # boost_filesystem_bug specifically tests a local fix for a boost::filesystem
 # bug. Since the test involves a malformed path, there is no point in running
 # tests on it. See https://github.com/boostorg/filesystem/issues/176
-IMPORT_TEST_FILES=$(find "${TEST_DIRS[@]}" -name "*.sol" -and -not -name "boost_filesystem_bug.sol" -not -path "*/experimental/*")
+# In addition, exclude all experimental Solidity tests (new type inference system)
+EXCLUDE_FILES=(
+  boost_filesystem_bug.sol
+  pragma_experimental_solidity.sol
+)
+EXCLUDE_FILES_JOINED=$(printf "! -name %s " "${EXCLUDE_FILES[@]}")
+# shellcheck disable=SC2086
+IMPORT_TEST_FILES=$(find "${TEST_DIRS[@]}" -name "*.sol" -and $EXCLUDE_FILES_JOINED -not -path "*/experimental/*")
 
 NSOURCES="$(echo "${IMPORT_TEST_FILES}" | wc -l)"
 echo "Looking at ${NSOURCES} .sol files..."
diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 00230c4a4a..7bcd8cca36 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -29,6 +29,7 @@ NAMESPACE_STD_FREE_FILES=(
     libsolidity/ast/*
     libsolidity/codegen/ir/*
     libsolidity/codegen/*
+    libsolidity/experimental/*
     libsolidity/formal/*
     libsolidity/interface/*
     libsolidity/lsp/*
diff --git a/scripts/common.sh b/scripts/common.sh
index 39c1226d11..d149253bf7 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -313,3 +313,14 @@ function command_available
         fail "'${program}' not found or not executed successfully with parameter(s) '${parameters[*]}'. aborting."
     fi
 }
+
+function gnu_grep
+{
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        command_available ggrep --version
+        ggrep "$@"
+    else
+        command_available grep --version
+        grep "$@"
+    fi
+}
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 8fe2c4c1be..4aff6b85e8 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -232,16 +232,109 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
             return False
 
     old_source_only_ids = {
-        "1218", "1584", "1823",
-        "1988", "2066", "2833", "3356",
-        "3893", "3996", "4010", "4458", "4802",
-        "4902", "5272", "5622", "5798", "5840", "7128", "7400",
-        "7589", "7593", "7649", "7710",
-        "8065", "8084", "8140", "8158",
-        "8312", "8592", "9134", "9609",
+        "1218",
+        "1584",
+        "1823",
+        "1988",
+        "2066",
+        "2833",
+        "3356",
+        "3893",
+        "3996",
+        "4010",
+        "4458",
+        "4802",
+        "4902",
+        "5272",
+        "5622",
+        "5798",
+        "5840",
+        "7128",
+        "7400",
+        "7589",
+        "7593",
+        "7649",
+        "7710",
+        "8065",
+        "8084",
+        "8140",
+        "8158",
+        "8312",
+        "8592",
+        "9134",
+        "9609",
     }
 
-    new_source_only_ids = source_only_ids - old_source_only_ids
+    # TODO Cover these with tests and remove from this list as the development of experimental
+    # TODO Solidity progresses. The aim should be to completely get rid of `experimental_source_only_ids`.
+    experimental_source_only_ids = {
+        "1017",
+        "1439",
+        "1723",
+        "1741",
+        "1801",
+        "1807",
+        "2015",
+        "2138",
+        "2345",
+        "2399",
+        "2599",
+        "2655",
+        "2658",
+        "2934",
+        "3101",
+        "3111",
+        "3195",
+        "3520",
+        "3570",
+        "3573",
+        "3654",
+        "4316",
+        "4337",
+        "4496",
+        "4504",
+        "4686",
+        "4767",
+        "4873",
+        "4955",
+        "5044",
+        "5094",
+        "5096",
+        "5104",
+        "5195",
+        "5262",
+        "5348",
+        "5360",
+        "5387",
+        "5577",
+        "5714",
+        "5731",
+        "5755",
+        "5904",
+        "6175",
+        "6387",
+        "6388",
+        "6460",
+        "6620",
+        "6739",
+        "6948",
+        "7341",
+        "7428",
+        "7531",
+        "8379",
+        "8809",
+        "8953",
+        "9159",
+        "9173",
+        "9282",
+        "9603",
+        "9658",
+        "9817",
+        "9831",
+        "9988",
+    }
+
+    new_source_only_ids = source_only_ids - old_source_only_ids - experimental_source_only_ids
     if len(new_source_only_ids) != 0:
         print("The following new error code(s), not covered by tests, found:")
         print_ids(new_source_only_ids)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index f32a14d918..d5435237ec 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -73,6 +73,8 @@ set(libsolidity_sources
     libsolidity/ASTJSONTest.h
     libsolidity/ErrorCheck.cpp
     libsolidity/ErrorCheck.h
+    libsolidity/FunctionDependencyGraphTest.cpp
+    libsolidity/FunctionDependencyGraphTest.h
     libsolidity/GasCosts.cpp
     libsolidity/GasMeter.cpp
     libsolidity/GasTest.cpp
diff --git a/test/InteractiveTests.h b/test/InteractiveTests.h
index 5021d801b3..2519fa86f4 100644
--- a/test/InteractiveTests.h
+++ b/test/InteractiveTests.h
@@ -22,6 +22,7 @@
 #include <test/libsolidity/ABIJsonTest.h>
 #include <test/libsolidity/ASTJSONTest.h>
 #include <test/libsolidity/ASTPropertyTest.h>
+#include <libsolidity/FunctionDependencyGraphTest.h>
 #include <test/libsolidity/GasTest.h>
 #include <test/libsolidity/MemoryGuardTest.h>
 #include <test/libsolidity/NatspecJSONTest.h>
@@ -60,26 +61,27 @@ struct Testsuite
 /// Array of testsuits that can be run interactively as well as automatically
 Testsuite const g_interactiveTestsuites[] = {
 /*
-	Title                   Path           Subpath                SMT   NeedsVM Creator function */
-	{"Yul Optimizer",          "libyul",      "yulOptimizerTests",     false, false, &yul::test::YulOptimizerTest::create},
-	{"Yul Interpreter",        "libyul",      "yulInterpreterTests",   false, false, &yul::test::YulInterpreterTest::create},
-	{"Yul Object Compiler",    "libyul",      "objectCompiler",        false, false, &yul::test::ObjectCompilerTest::create},
-	{"Yul Control Flow Graph", "libyul",      "yulControlFlowGraph",   false, false, &yul::test::ControlFlowGraphTest::create},
-	{"Yul Stack Layout",       "libyul",      "yulStackLayout",        false, false, &yul::test::StackLayoutGeneratorTest::create},
-	{"Yul Stack Shuffling",    "libyul",      "yulStackShuffling",     false, false, &yul::test::StackShufflingTest::create},
-	{"Control Flow Side Effects","libyul",    "controlFlowSideEffects",false, false, &yul::test::ControlFlowSideEffectsTest::create},
-	{"Function Side Effects",  "libyul",      "functionSideEffects",   false, false, &yul::test::FunctionSideEffects::create},
-	{"Yul Syntax",             "libyul",      "yulSyntaxTests",        false, false, &yul::test::SyntaxTest::create},
-	{"EVM Code Transform",     "libyul",      "evmCodeTransform",      false, false, &yul::test::EVMCodeTransformTest::create, {"nooptions"}},
-	{"Syntax",                 "libsolidity", "syntaxTests",           false, false, &SyntaxTest::create},
-	{"Semantic",               "libsolidity", "semanticTests",         false, true,  &SemanticTest::create},
-	{"JSON AST",               "libsolidity", "ASTJSON",               false, false, &ASTJSONTest::create},
-	{"JSON ABI",               "libsolidity", "ABIJson",               false, false, &ABIJsonTest::create},
-	{"JSON Natspec",           "libsolidity", "natspecJSON",           false, false, &NatspecJSONTest::create},
-	{"SMT Checker",            "libsolidity", "smtCheckerTests",       true,  false, &SMTCheckerTest::create},
-	{"Gas Estimates",          "libsolidity", "gasTests",              false, false, &GasTest::create},
-	{"Memory Guard",           "libsolidity", "memoryGuardTests",      false, false, &MemoryGuardTest::create},
-	{"AST Properties",         "libsolidity", "astPropertyTests",      false, false, &ASTPropertyTest::create},
+	Title                   		Path           Subpath                			SMT   NeedsVM Creator function */
+	{"Yul Optimizer",          		"libyul",      "yulOptimizerTests",     		false, false, &yul::test::YulOptimizerTest::create},
+	{"Yul Interpreter",        		"libyul",      "yulInterpreterTests",   		false, false, &yul::test::YulInterpreterTest::create},
+	{"Yul Object Compiler",    		"libyul",      "objectCompiler",        		false, false, &yul::test::ObjectCompilerTest::create},
+	{"Yul Control Flow Graph", 		"libyul",      "yulControlFlowGraph",   		false, false, &yul::test::ControlFlowGraphTest::create},
+	{"Yul Stack Layout",       		"libyul",      "yulStackLayout",        		false, false, &yul::test::StackLayoutGeneratorTest::create},
+	{"Yul Stack Shuffling",    		"libyul",      "yulStackShuffling",     		false, false, &yul::test::StackShufflingTest::create},
+	{"Control Flow Side Effects",	"libyul",      "controlFlowSideEffects",		false, false, &yul::test::ControlFlowSideEffectsTest::create},
+	{"Function Side Effects",  		"libyul",      "functionSideEffects",   		false, false, &yul::test::FunctionSideEffects::create},
+	{"Yul Syntax",             		"libyul",      "yulSyntaxTests",        		false, false, &yul::test::SyntaxTest::create},
+	{"EVM Code Transform",     		"libyul",      "evmCodeTransform",      		false, false, &yul::test::EVMCodeTransformTest::create, {"nooptions"}},
+	{"Syntax",                 		"libsolidity", "syntaxTests",           		false, false, &SyntaxTest::create},
+	{"Semantic",               		"libsolidity", "semanticTests",         		false, true,  &SemanticTest::create},
+	{"JSON AST",               		"libsolidity", "ASTJSON",               		false, false, &ASTJSONTest::create},
+	{"JSON ABI",               		"libsolidity", "ABIJson",               		false, false, &ABIJsonTest::create},
+	{"JSON Natspec",           		"libsolidity", "natspecJSON",           		false, false, &NatspecJSONTest::create},
+	{"SMT Checker",            		"libsolidity", "smtCheckerTests",       		true,  false, &SMTCheckerTest::create},
+	{"Gas Estimates",          		"libsolidity", "gasTests",              		false, false, &GasTest::create},
+	{"Memory Guard",           		"libsolidity", "memoryGuardTests",      		false, false, &MemoryGuardTest::create},
+	{"AST Properties",         		"libsolidity", "astPropertyTests",      		false, false, &ASTPropertyTest::create},
+	{"Function Dependency Graph",   "libsolidity", "functionDependencyGraphTests",	false, false, &FunctionDependencyGraphTest::create},
 };
 
 }
diff --git a/test/cmdlineTests/~soljson_via_fuzzer/test.sh b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
index 2d2312fd15..9c1d338c01 100755
--- a/test/cmdlineTests/~soljson_via_fuzzer/test.sh
+++ b/test/cmdlineTests/~soljson_via_fuzzer/test.sh
@@ -10,7 +10,7 @@ cd "$SOLTMPDIR"
 "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/test/
 "$REPO_ROOT"/scripts/isolate_tests.py "$REPO_ROOT"/docs/
 
-echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --quiet --input-files
-echo ./*.sol | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --without-optimizer --quiet --input-files
+gnu_grep -L --include="*.sol" "^pragma experimental solidity;$" ./* | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --quiet --input-files
+gnu_grep -L --include="*.sol" "^pragma experimental solidity;$" ./* | xargs -P 4 -n 50 "${SOLIDITY_BUILD_DIR}/test/tools/solfuzzer" --without-optimizer --quiet --input-files
 
 rm -r "$SOLTMPDIR"
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index dcfe49ab48..ccad7d49d1 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -64,7 +64,7 @@ evmasm::AssemblyItems compileContract(std::shared_ptr<CharStream> _sourceCode)
 	Scoper::assignScopes(*sourceUnit);
 	BOOST_REQUIRE(SyntaxChecker(errorReporter, false).checkSyntax(*sourceUnit));
 	GlobalContext globalContext;
-	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter);
+	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter, false);
 	DeclarationTypeChecker declarationTypeChecker(errorReporter, solidity::test::CommonOptions::get().evmVersion());
 	solAssert(!Error::containsErrors(errorReporter.errors()), "");
 	resolver.registerDeclarations(*sourceUnit);
diff --git a/test/libsolidity/FunctionDependencyGraphTest.cpp b/test/libsolidity/FunctionDependencyGraphTest.cpp
new file mode 100644
index 0000000000..914fae06f0
--- /dev/null
+++ b/test/libsolidity/FunctionDependencyGraphTest.cpp
@@ -0,0 +1,59 @@
+/*
+	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/libsolidity/FunctionDependencyGraphTest.h>
+
+#include <libsolidity/experimental/analysis/Analysis.h>
+#include <libsolidity/experimental/analysis/FunctionDependencyAnalysis.h>
+#include <libyul/backends/evm/EVMDialect.h>
+#include <libyul/optimiser/FunctionCallFinder.h>
+
+#include <fstream>
+#include <stdexcept>
+
+using namespace solidity;
+using namespace solidity::util;
+using namespace solidity::util::formatting;
+using namespace solidity::langutil;
+using namespace solidity::frontend;
+using namespace solidity::frontend::test;
+
+TestCase::TestResult FunctionDependencyGraphTest::run(std::ostream& _stream, std::string const& _linePrefix, bool _formatted)
+{
+	compiler().reset();
+	compiler().setSources(StringMap{{"", m_source}});
+	compiler().setViaIR(true);
+	compiler().setOptimiserSettings(OptimiserSettings::none());
+	if (!compiler().compile(CompilerStack::AnalysisSuccessful))
+	{
+		_stream << formatErrors(filteredErrors(), _formatted);
+		return TestResult::FatalError;
+	}
+
+	m_obtainedResult.clear();
+	for (auto [top, subs]: compiler().experimentalAnalysis().annotation<experimental::FunctionDependencyAnalysis>().functionCallGraph.edges)
+	{
+		std::string topName = top->name().empty() ? "fallback" : top->name();
+		m_obtainedResult += "(" + topName + ") --> {";
+		for (auto sub: subs)
+			m_obtainedResult += sub->name() + ",";
+		m_obtainedResult += "}\n";
+	}
+
+	return checkResult(_stream, _linePrefix, _formatted);
+}
diff --git a/test/libsolidity/FunctionDependencyGraphTest.h b/test/libsolidity/FunctionDependencyGraphTest.h
new file mode 100644
index 0000000000..83f3eb0ab3
--- /dev/null
+++ b/test/libsolidity/FunctionDependencyGraphTest.h
@@ -0,0 +1,50 @@
+/*
+	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
+
+#pragma once
+
+#include <test/libsolidity/AnalysisFramework.h>
+#include <test/TestCase.h>
+#include <test/CommonSyntaxTest.h>
+
+#include <iosfwd>
+#include <string>
+#include <vector>
+#include <utility>
+
+namespace solidity::frontend::test
+{
+	using solidity::test::SyntaxTestError;
+
+	class FunctionDependencyGraphTest: public AnalysisFramework, public TestCase
+	{
+	public:
+		static std::unique_ptr<TestCase> create(Config const& _config)
+		{
+			return std::make_unique<FunctionDependencyGraphTest>(_config.filename);
+		}
+
+		FunctionDependencyGraphTest(std::string const& _filename): TestCase(_filename)
+		{
+			m_source = m_reader.source();
+			m_expectation = m_reader.simpleExpectations();
+		}
+
+		TestResult run(std::ostream& _stream, std::string const& _linePrefix = "", bool _formatted = false) override;
+	};
+}
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
index b05d28a840..a171a5be05 100644
--- a/test/libsolidity/SolidityExpressionCompiler.cpp
+++ b/test/libsolidity/SolidityExpressionCompiler.cpp
@@ -127,7 +127,7 @@ bytes compileFirstExpression(
 	GlobalContext globalContext;
 	Scoper::assignScopes(*sourceUnit);
 	BOOST_REQUIRE(SyntaxChecker(errorReporter, false).checkSyntax(*sourceUnit));
-	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter);
+	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter, false);
 	resolver.registerDeclarations(*sourceUnit);
 	BOOST_REQUIRE_MESSAGE(resolver.resolveNamesAndTypes(*sourceUnit), "Resolving names failed");
 	DeclarationTypeChecker declarationTypeChecker(errorReporter, solidity::test::CommonOptions::get().evmVersion());
diff --git a/test/libsolidity/SyntaxTest.cpp b/test/libsolidity/SyntaxTest.cpp
index 7c4fa8da1e..f17898c042 100644
--- a/test/libsolidity/SyntaxTest.cpp
+++ b/test/libsolidity/SyntaxTest.cpp
@@ -73,7 +73,7 @@ void SyntaxTest::parseAndAnalyze()
 	try
 	{
 		runFramework(withPreamble(m_sources.sources), PipelineStage::Compilation);
-		if (!pipelineSuccessful() && stageSuccessful(PipelineStage::Analysis))
+		if (!pipelineSuccessful() && stageSuccessful(PipelineStage::Analysis) && !compiler().isExperimentalAnalysis())
 		{
 			ErrorList const& errors = compiler().errors();
 			auto codeGeneretionErrorCount = count_if(errors.cbegin(), errors.cend(), [](auto const& error) {
diff --git a/test/libsolidity/functionDependencyGraphTests/callgraph.sol b/test/libsolidity/functionDependencyGraphTests/callgraph.sol
new file mode 100644
index 0000000000..21f0e7e5f6
--- /dev/null
+++ b/test/libsolidity/functionDependencyGraphTests/callgraph.sol
@@ -0,0 +1,60 @@
+// fallback---------->f----------+
+//                    |          |
+//                    |          |
+//                    |          |
+//                    |          |
+//                    v          v
+//                    g          h
+//
+//
+// add
+//
+// unreferenced
+
+pragma experimental solidity;
+
+type uint256 = __builtin("word");
+
+instantiation uint256: + {
+    function add(x, y) -> uint256 {
+        let a = uint256.rep(x);
+        let b = uint256.rep(y);
+        assembly {
+            a := add(a,b)
+        }
+        return uint256.abs(a);
+    }
+}
+
+function unreferenced(x:uint256) -> uint256
+{
+    return x;
+}
+
+function f(x:uint256) -> uint256
+{
+    return g(h(x));
+}
+
+function g(x:uint256) -> uint256
+{
+    return x;
+}
+
+function h(x:uint256) -> uint256
+{
+    return x;
+}
+
+contract C {
+    fallback() external {
+        let a: uint256->uint256 = f;
+    }
+}
+// ----
+// (add) --> {}
+// (unreferenced) --> {}
+// (f) --> {g,h,}
+// (g) --> {}
+// (h) --> {}
+// (fallback) --> {f,}
diff --git a/test/libsolidity/functionDependencyGraphTests/callgraph_no_leaves.sol b/test/libsolidity/functionDependencyGraphTests/callgraph_no_leaves.sol
new file mode 100644
index 0000000000..5fe1a75fed
--- /dev/null
+++ b/test/libsolidity/functionDependencyGraphTests/callgraph_no_leaves.sol
@@ -0,0 +1,66 @@
+// a<------b
+// |       ^
+// |       |
+// |       |
+// |       |
+// |       |
+// +------>c------->d-------->e------->f
+//                            ^        |
+//                            |        |
+//                            |        |
+//                            |        |
+//                            |        v
+//                            h<-------g
+
+pragma experimental solidity;
+
+function a()
+{
+    c();
+}
+
+function b()
+{
+    a();
+}
+
+function c()
+{
+    b();
+    d();
+}
+
+function d()
+{
+    e();
+}
+
+function e()
+{
+    f();
+}
+
+function f()
+{
+    g();
+}
+
+function g()
+{
+    h();
+}
+
+function h()
+{
+    e();
+}
+
+// ----
+// (a) --> {c,}
+// (b) --> {a,}
+// (c) --> {b,d,}
+// (d) --> {e,}
+// (e) --> {f,}
+// (f) --> {g,}
+// (g) --> {h,}
+// (h) --> {e,}
diff --git a/test/libsolidity/semanticTests/experimental/stub.sol b/test/libsolidity/semanticTests/experimental/stub.sol
new file mode 100644
index 0000000000..6e7a750fe9
--- /dev/null
+++ b/test/libsolidity/semanticTests/experimental/stub.sol
@@ -0,0 +1,97 @@
+pragma experimental solidity;
+
+type word = __builtin("word");
+type bool = __builtin("bool");
+type integer = __builtin("integer");
+
+type uint256 = word;
+
+instantiation uint256: + {
+    function add(x, y) -> uint256 {
+        let a = uint256.rep(x);
+        let b = uint256.rep(y);
+        assembly {
+            a := add(a,b)
+        }
+        return uint256.abs(a);
+    }
+}
+
+
+instantiation uint256: * {
+    function mul(x, y) -> uint256 {
+        let a = uint256.rep(x);
+        let b = uint256.rep(y);
+        assembly {
+            a := mul(a,b)
+        }
+        return uint256.abs(a);
+    }
+}
+instantiation word: * {
+    function mul(x, y) -> word {
+        let z: word;
+        assembly {
+            z := mul(x,y)
+        }
+        return z;
+    }
+}
+
+instantiation word: Integer {
+    function fromInteger(x:integer) -> word {
+        //x + x;
+    }
+}
+
+instantiation word: == {
+    function eq(x, y) -> bool {
+        assembly {
+            x := eq(x, y)
+        }
+    }
+}
+
+
+function f(x:uint256->uint256,y:uint256) -> uint256
+{
+    return x(y);
+}
+
+function g(x:uint256) -> uint256
+{
+    return x;
+}
+
+contract C {
+    fallback() external {
+        let arg;
+        assembly {
+            arg := calldataload(0)
+        }
+        let x : word;
+        if (bool.abs(arg)) {
+            assembly {
+                x := 0x10
+            }
+        }
+        let w = uint256.abs(x);
+//        w = f(g, w);
+        w = w * w + w;
+        let y : word;
+        let z : (uint256,uint256);
+        assembly { y := 2 }
+        y = uint256.rep(w) * y;
+        assembly {
+            mstore(0, y)
+            return(0, 32)
+        }
+    }
+}
+// ====
+// EVMVersion: >=constantinople
+// ====
+// compileViaYul: true
+// ----
+// (): 0 -> 0
+// (): 1 -> 544
diff --git a/test/libsolidity/semanticTests/experimental/type_class.sol b/test/libsolidity/semanticTests/experimental/type_class.sol
new file mode 100644
index 0000000000..69fa568dfd
--- /dev/null
+++ b/test/libsolidity/semanticTests/experimental/type_class.sol
@@ -0,0 +1,67 @@
+pragma experimental solidity;
+
+type word = __builtin("word");
+type bool = __builtin("bool");
+
+type Cat = word;
+type Dog = word;
+
+class Self: Animal {
+    function new() -> Self;
+    function alive(self: Self) -> bool;
+}
+
+instantiation Cat: Animal {
+    function new() -> Cat {
+        let c;
+        return c;
+    }
+
+    function alive(self: Cat) -> bool {
+        // TODO: Boolean literals or operators not implemented.
+        let w;
+        assembly {
+            w := 1
+        }
+        return bool.abs(w);
+    }
+}
+
+instantiation Dog: Animal {
+    function new() -> Dog {
+        let d: Dog;
+        return d;
+    }
+
+    function alive(self: Dog) -> bool {
+        let b: bool;
+        return b;
+    }
+}
+
+contract C {
+    fallback() external {
+        let boolResult1: bool;
+        let boolResult2: bool;
+
+        let c: Cat = Animal.new();
+        boolResult1 = Animal.alive(c);
+
+        let d: Dog = Animal.new();
+        boolResult2 = Animal.alive(d);
+
+        let wordResult1 = bool.rep(boolResult1);
+        let wordResult2 = bool.rep(boolResult2);
+        assembly {
+            mstore(0, wordResult1)
+            mstore(32, wordResult2)
+            return(0, 64)
+        }
+    }
+}
+
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// () -> 1, 0
diff --git a/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
new file mode 100644
index 0000000000..fc4783ceba
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
@@ -0,0 +1,92 @@
+pragma experimental solidity;
+
+type void = __builtin("void");
+
+type bool = __builtin("bool");
+type word = __builtin("word");
+type integer = __builtin("integer");
+type unit = __builtin("unit");
+
+type fun(T, U) = __builtin("fun");
+type pair(T, U) = __builtin("pair");
+
+contract C {
+    fallback() external {
+        let v: void;
+
+        let b: bool;
+        bool.abs(bool.rep(b));
+
+        let w: word;
+        let i: integer;
+        let u: unit;
+
+        let f: fun(word, bool);
+        b = f(w);
+
+        let p: pair(bool, word);
+        pair.first(p);
+        pair.second(p);
+    }
+}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// UnimplementedFeatureError: No support for calling functions pointers yet.
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (31-61): Inferred type: void
+// Info 4164: (63-93): Inferred type: bool
+// Info 4164: (94-124): Inferred type: word
+// Info 4164: (125-161): Inferred type: integer
+// Info 4164: (162-192): Inferred type: ()
+// Info 4164: (194-228): Inferred type: tfun(('u:type, 'v:type), 'u:type -> 'v:type)
+// Info 4164: (202-208): Inferred type: ('s:type, 't:type)
+// Info 4164: (203-204): Inferred type: 's:type
+// Info 4164: (206-207): Inferred type: 't:type
+// Info 4164: (229-265): Inferred type: tfun(('y:type, 'z:type), ('y:type, 'z:type))
+// Info 4164: (238-244): Inferred type: ('w:type, 'x:type)
+// Info 4164: (239-240): Inferred type: 'w:type
+// Info 4164: (242-243): Inferred type: 'x:type
+// Info 4164: (284-584): Inferred type: () -> ()
+// Info 4164: (292-294): Inferred type: ()
+// Info 4164: (318-325): Inferred type: void
+// Info 4164: (321-325): Inferred type: void
+// Info 4164: (340-347): Inferred type: bool
+// Info 4164: (343-347): Inferred type: bool
+// Info 4164: (357-378): Inferred type: bool
+// Info 4164: (357-365): Inferred type: word -> bool
+// Info 4164: (357-361): Inferred type: bool
+// Info 4164: (366-377): Inferred type: word
+// Info 4164: (366-374): Inferred type: bool -> word
+// Info 4164: (366-370): Inferred type: bool
+// Info 4164: (375-376): Inferred type: bool
+// Info 4164: (393-400): Inferred type: word
+// Info 4164: (396-400): Inferred type: word
+// Info 4164: (414-424): Inferred type: integer
+// Info 4164: (417-424): Inferred type: integer
+// Info 4164: (438-445): Inferred type: ()
+// Info 4164: (441-445): Inferred type: ()
+// Info 4164: (460-478): Inferred type: word -> bool
+// Info 4164: (463-478): Inferred type: word -> bool
+// Info 4164: (463-466): Inferred type: tfun((word, bool), word -> bool)
+// Info 4164: (467-471): Inferred type: word
+// Info 4164: (473-477): Inferred type: bool
+// Info 4164: (488-496): Inferred type: bool
+// Info 4164: (488-489): Inferred type: bool
+// Info 4164: (492-496): Inferred type: bool
+// Info 4164: (492-493): Inferred type: word -> bool
+// Info 4164: (494-495): Inferred type: word
+// Info 4164: (511-530): Inferred type: (bool, word)
+// Info 4164: (514-530): Inferred type: (bool, word)
+// Info 4164: (514-518): Inferred type: tfun((bool, word), (bool, word))
+// Info 4164: (519-523): Inferred type: bool
+// Info 4164: (525-529): Inferred type: word
+// Info 4164: (540-553): Inferred type: bool
+// Info 4164: (540-550): Inferred type: (bool, word) -> bool
+// Info 4164: (540-544): Inferred type: ('bl:type, 'bm:type)
+// Info 4164: (551-552): Inferred type: (bool, word)
+// Info 4164: (563-577): Inferred type: word
+// Info 4164: (563-574): Inferred type: (bool, word) -> word
+// Info 4164: (563-567): Inferred type: ('bq:type, 'br:type)
+// Info 4164: (575-576): Inferred type: (bool, word)
diff --git a/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition_duplicate.sol b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition_duplicate.sol
new file mode 100644
index 0000000000..28f6c39fd7
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition_duplicate.sol
@@ -0,0 +1,17 @@
+pragma experimental solidity;
+
+type void1 = __builtin("void");
+type void2 = __builtin("void");
+
+type word1 = __builtin("word");
+type word2 = __builtin("word");
+
+type fun1(T, U) = __builtin("fun");
+type fun2(T, U) = __builtin("fun");
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 9609: (63-94): Duplicate builtin type definition.
+// TypeError 9609: (128-159): Duplicate builtin type definition.
+// TypeError 9609: (197-232): Duplicate builtin type definition.
diff --git a/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition_unknown.sol b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition_unknown.sol
new file mode 100644
index 0000000000..90072f1983
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition_unknown.sol
@@ -0,0 +1,8 @@
+pragma experimental solidity;
+
+type someUnknownType = __builtin("someUnknownType");
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 7758: (31-81): Expected the name of a built-in primitive type.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol b/test/libsolidity/syntaxTests/experimental/import/experimental_solidity.sol
similarity index 70%
rename from test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
rename to test/libsolidity/syntaxTests/experimental/import/experimental_solidity.sol
index 285c76ed30..a84ac0e759 100644
--- a/test/libsolidity/syntaxTests/pragma/experimental_solidity.sol
+++ b/test/libsolidity/syntaxTests/experimental/import/experimental_solidity.sol
@@ -1,6 +1,6 @@
 pragma experimental solidity;
 // ====
 // EVMVersion: >=constantinople
+// compileViaYul: true
 // ----
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol b/test/libsolidity/syntaxTests/experimental/import/experimental_solidity_multisource_not_all_enable.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/pragma/experimental_solidity_multisource_not_all_enable.sol
rename to test/libsolidity/syntaxTests/experimental/import/experimental_solidity_multisource_not_all_enable.sol
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol b/test/libsolidity/syntaxTests/experimental/import/experimental_solidity_out_of_order_1.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_1.sol
rename to test/libsolidity/syntaxTests/experimental/import/experimental_solidity_out_of_order_1.sol
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol b/test/libsolidity/syntaxTests/experimental/import/experimental_solidity_out_of_order_2.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/pragma/experimental_solidity_out_of_order_2.sol
rename to test/libsolidity/syntaxTests/experimental/import/experimental_solidity_out_of_order_2.sol
diff --git a/test/libsolidity/syntaxTests/pragma/experimental_solidity_wrong_evm_version.sol b/test/libsolidity/syntaxTests/experimental/import/experimental_solidity_wrong_evm_version.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/pragma/experimental_solidity_wrong_evm_version.sol
rename to test/libsolidity/syntaxTests/experimental/import/experimental_solidity_wrong_evm_version.sol
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol b/test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_1.sol
similarity index 76%
rename from test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
rename to test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_1.sol
index f8799de42b..5628a588f8 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_1.sol
+++ b/test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_1.sol
@@ -7,4 +7,5 @@ import std.stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
+// Info 4164: (std.stub:94-117): Inferred type: () -> ()
+// Info 4164: (std.stub:111-113): Inferred type: ()
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol b/test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_2.sol
similarity index 77%
rename from test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
rename to test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_2.sol
index f5bcf8efcd..bdc66e4ad3 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_2.sol
+++ b/test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_2.sol
@@ -7,4 +7,5 @@ import std.stub as stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
+// Info 4164: (std.stub:94-117): Inferred type: () -> ()
+// Info 4164: (std.stub:111-113): Inferred type: ()
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol b/test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_3.sol
similarity index 70%
rename from test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
rename to test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_3.sol
index 4b325ea4ed..1bb340536c 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_3.sol
+++ b/test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_3.sol
@@ -7,4 +7,6 @@ import { identity } from std.stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
+// Info 4164: (std.stub:94-117): Inferred type: () -> ()
+// Info 4164: (std.stub:111-113): Inferred type: ()
+// Info 4164: (40-48): Inferred type: () -> ()
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol b/test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_4.sol
similarity index 77%
rename from test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
rename to test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_4.sol
index 865e59b554..64a67fe6c9 100644
--- a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_4.sol
+++ b/test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_4.sol
@@ -7,4 +7,5 @@ import * as stub from std.stub;
 // ----
 // Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// UnimplementedFeatureError 6547: Experimental Analysis is not implemented yet.
+// Info 4164: (std.stub:94-117): Inferred type: () -> ()
+// Info 4164: (std.stub:111-113): Inferred type: ()
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_1.sol b/test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_without_pragma_1.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_1.sol
rename to test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_without_pragma_1.sol
diff --git a/test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_2.sol b/test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_without_pragma_2.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/experimental/parsing_stdlib_import_without_pragma_2.sol
rename to test/libsolidity/syntaxTests/experimental/import/parsing_stdlib_import_without_pragma_2.sol
diff --git a/test/libsolidity/syntaxTests/experimental/inference/experimental_keywords.sol b/test/libsolidity/syntaxTests/experimental/inference/experimental_keywords.sol
new file mode 100644
index 0000000000..b5920aed07
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/experimental_keywords.sol
@@ -0,0 +1,4 @@
+function f() pure {
+	uint word; word;
+	uint static_assert; static_assert;
+}
\ No newline at end of file
diff --git a/test/libsolidity/syntaxTests/experimental/inference/import_and_call_stdlib_function.sol b/test/libsolidity/syntaxTests/experimental/inference/import_and_call_stdlib_function.sol
new file mode 100644
index 0000000000..fc75e85947
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/import_and_call_stdlib_function.sol
@@ -0,0 +1,25 @@
+pragma experimental solidity;
+
+import { identity as id } from std.stub;
+
+contract C
+{
+    fallback() external
+    {
+        id();
+    }
+}
+
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// Warning 2264: (std.stub:63-92): Experimental features are turned on. Do not use experimental features on live deployments.
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (std.stub:94-117): Inferred type: () -> ()
+// Info 4164: (std.stub:111-113): Inferred type: ()
+// Info 4164: (40-48): Inferred type: () -> ()
+// Info 4164: (90-135): Inferred type: () -> ()
+// Info 4164: (98-100): Inferred type: ()
+// Info 4164: (124-128): Inferred type: ()
+// Info 4164: (124-126): Inferred type: () -> ()
diff --git a/test/libsolidity/syntaxTests/experimental/inference/invalid_type_referenced.sol b/test/libsolidity/syntaxTests/experimental/inference/invalid_type_referenced.sol
new file mode 100644
index 0000000000..ac097bf392
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/invalid_type_referenced.sol
@@ -0,0 +1,13 @@
+pragma experimental solidity;
+
+function f() {}
+
+class Self: C
+{
+    function g(self: Self, x: f);
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 2217: (94-95): Attempt to type identifier referring to unexpected node.
diff --git a/test/libsolidity/syntaxTests/experimental/inference/monomorphic_function_call_type_mismatch.sol b/test/libsolidity/syntaxTests/experimental/inference/monomorphic_function_call_type_mismatch.sol
new file mode 100644
index 0000000000..e7af573aee
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/monomorphic_function_call_type_mismatch.sol
@@ -0,0 +1,16 @@
+pragma experimental solidity;
+
+type T;
+type U;
+
+function f(x: T, y: U) {}
+
+function run(a: U, b: T) {
+    f(a, b);
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 8456: (106-113): Cannot unify T and U.
+// TypeError 8456: (106-113): Cannot unify U and T.
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
new file mode 100644
index 0000000000..eacc895202
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
@@ -0,0 +1,53 @@
+pragma experimental solidity;
+
+type T;
+type U(A);
+
+function f(x, y: X, z: U(Y)) {}
+
+function run(a: T, b: U(T), c: U(U(T))) {
+    f(a, a, b);
+    f(b, b, c);
+}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (31-38): Inferred type: T
+// Info 4164: (39-49): Inferred type: tfun('u:type, U('u:type))
+// Info 4164: (45-48): Inferred type: 't:type
+// Info 4164: (46-47): Inferred type: 't:type
+// Info 4164: (51-82): Inferred type: ('x:type, 'y:type, U('ba:type)) -> ()
+// Info 4164: (61-79): Inferred type: ('x:type, 'y:type, U('ba:type))
+// Info 4164: (62-63): Inferred type: 'x:type
+// Info 4164: (65-69): Inferred type: 'y:type
+// Info 4164: (68-69): Inferred type: 'y:type
+// Info 4164: (71-78): Inferred type: U('ba:type)
+// Info 4164: (74-78): Inferred type: U('ba:type)
+// Info 4164: (74-75): Inferred type: tfun('ba:type, U('ba:type))
+// Info 4164: (76-77): Inferred type: 'ba:type
+// Info 4164: (84-159): Inferred type: (T, U(T), U(U(T))) -> ()
+// Info 4164: (96-123): Inferred type: (T, U(T), U(U(T)))
+// Info 4164: (97-101): Inferred type: T
+// Info 4164: (100-101): Inferred type: T
+// Info 4164: (103-110): Inferred type: U(T)
+// Info 4164: (106-110): Inferred type: U(T)
+// Info 4164: (106-107): Inferred type: tfun(T, U(T))
+// Info 4164: (108-109): Inferred type: T
+// Info 4164: (112-122): Inferred type: U(U(T))
+// Info 4164: (115-122): Inferred type: U(U(T))
+// Info 4164: (115-116): Inferred type: tfun(U(T), U(U(T)))
+// Info 4164: (117-121): Inferred type: U(T)
+// Info 4164: (117-118): Inferred type: tfun(T, U(T))
+// Info 4164: (119-120): Inferred type: T
+// Info 4164: (130-140): Inferred type: ()
+// Info 4164: (130-131): Inferred type: (T, T, U(T)) -> ()
+// Info 4164: (132-133): Inferred type: T
+// Info 4164: (135-136): Inferred type: T
+// Info 4164: (138-139): Inferred type: U(T)
+// Info 4164: (146-156): Inferred type: ()
+// Info 4164: (146-147): Inferred type: (U(T), U(T), U(U(T))) -> ()
+// Info 4164: (148-149): Inferred type: U(T)
+// Info 4164: (151-152): Inferred type: U(T)
+// Info 4164: (154-155): Inferred type: U(U(T))
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call_let_polymorphism.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call_let_polymorphism.sol
new file mode 100644
index 0000000000..1a43d0807a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call_let_polymorphism.sol
@@ -0,0 +1,19 @@
+pragma experimental solidity;
+
+type T;
+type U;
+
+function f(x) {}
+
+function run(a: T, b: U) {
+    // NOTE: The type of f is polymorphic but the inferred type of g is not - this would be
+    // let-polymorphism, which we decided not to support.
+    let g = f;
+    g(a);
+    g(b);
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 8456: (272-276): Cannot unify T and U.
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call_type_mismatch.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call_type_mismatch.sol
new file mode 100644
index 0000000000..74f102a881
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call_type_mismatch.sol
@@ -0,0 +1,16 @@
+pragma experimental solidity;
+
+type T(A);
+type U;
+type V;
+
+function f(x: T(U)) {}
+
+function run(a: T(V)) {
+    f(a);
+}
+// ====
+// EVMVersion: >=constantinople
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 8456: (111-115): Cannot unify U and V.
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
new file mode 100644
index 0000000000..b597a5b252
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
@@ -0,0 +1,47 @@
+pragma experimental solidity;
+
+type T(P, Q, R);
+type U;
+type V;
+
+class Self: C {}
+class Self: D {}
+
+function run() {
+    let x: T(U, X, Z: C);
+    let y: T(V, Y, Z: D);
+}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (31-47): Inferred type: tfun(('ba:type, 'bb:type, 'bc:type), T('ba:type, 'bb:type, 'bc:type))
+// Info 4164: (37-46): Inferred type: ('x:type, 'y:type, 'z:type)
+// Info 4164: (38-39): Inferred type: 'x:type
+// Info 4164: (41-42): Inferred type: 'y:type
+// Info 4164: (44-45): Inferred type: 'z:type
+// Info 4164: (48-55): Inferred type: U
+// Info 4164: (56-63): Inferred type: V
+// Info 4164: (65-81): Inferred type: C
+// Info 4164: (71-75): Inferred type: 'be:(type, C)
+// Info 4164: (82-98): Inferred type: D
+// Info 4164: (88-92): Inferred type: 'bg:(type, D)
+// Info 4164: (100-170): Inferred type: () -> ()
+// Info 4164: (112-114): Inferred type: ()
+// Info 4164: (125-141): Inferred type: T(U, 'bm:type, 'bo:(type, C))
+// Info 4164: (128-141): Inferred type: T(U, 'bm:type, 'bo:(type, C))
+// Info 4164: (128-129): Inferred type: tfun((U, 'bm:type, 'bo:(type, C)), T(U, 'bm:type, 'bo:(type, C)))
+// Info 4164: (130-131): Inferred type: U
+// Info 4164: (133-134): Inferred type: 'bm:type
+// Info 4164: (136-140): Inferred type: 'bo:(type, C)
+// Info 4164: (136-137): Inferred type: 'bo:(type, C)
+// Info 4164: (139-140): Inferred type: 'bo:(type, C)
+// Info 4164: (151-167): Inferred type: T(V, 'bt:type, 'bv:(type, D))
+// Info 4164: (154-167): Inferred type: T(V, 'bt:type, 'bv:(type, D))
+// Info 4164: (154-155): Inferred type: tfun((V, 'bt:type, 'bv:(type, D)), T(V, 'bt:type, 'bv:(type, D)))
+// Info 4164: (156-157): Inferred type: V
+// Info 4164: (159-160): Inferred type: 'bt:type
+// Info 4164: (162-166): Inferred type: 'bv:(type, D)
+// Info 4164: (162-163): Inferred type: 'bv:(type, D)
+// Info 4164: (165-166): Inferred type: 'bv:(type, D)
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol
new file mode 100644
index 0000000000..89f3f5f1a8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol
@@ -0,0 +1,69 @@
+pragma experimental solidity;
+
+type uint;
+type string;
+
+type T(A);
+type U(B) = T(B);
+
+function fun() {
+    let w: U(uint);
+    let v: T(uint);
+    U.rep(w);
+    U.abs(v);
+
+    let s: U(string);
+    let t: T(string);
+    U.rep(s);
+    U.abs(t);
+}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (31-41): Inferred type: uint
+// Info 4164: (42-54): Inferred type: string
+// Info 4164: (56-66): Inferred type: tfun('v:type, T('v:type))
+// Info 4164: (62-65): Inferred type: 'u:type
+// Info 4164: (63-64): Inferred type: 'u:type
+// Info 4164: (67-84): Inferred type: tfun('x:type, U('x:type))
+// Info 4164: (73-76): Inferred type: 'w:type
+// Info 4164: (74-75): Inferred type: 'w:type
+// Info 4164: (79-83): Inferred type: T('w:type)
+// Info 4164: (79-80): Inferred type: tfun('w:type, T('w:type))
+// Info 4164: (81-82): Inferred type: 'w:type
+// Info 4164: (86-245): Inferred type: () -> ()
+// Info 4164: (98-100): Inferred type: ()
+// Info 4164: (111-121): Inferred type: U(uint)
+// Info 4164: (114-121): Inferred type: U(uint)
+// Info 4164: (114-115): Inferred type: tfun(uint, U(uint))
+// Info 4164: (116-120): Inferred type: uint
+// Info 4164: (131-141): Inferred type: T(uint)
+// Info 4164: (134-141): Inferred type: T(uint)
+// Info 4164: (134-135): Inferred type: tfun(uint, T(uint))
+// Info 4164: (136-140): Inferred type: uint
+// Info 4164: (147-155): Inferred type: T('bi:type)
+// Info 4164: (147-152): Inferred type: U(uint) -> T('bi:type)
+// Info 4164: (147-148): Inferred type: U('bg:type)
+// Info 4164: (153-154): Inferred type: U(uint)
+// Info 4164: (161-169): Inferred type: U('bm:type)
+// Info 4164: (161-166): Inferred type: T(uint) -> U('bm:type)
+// Info 4164: (161-162): Inferred type: U('bk:type)
+// Info 4164: (167-168): Inferred type: T(uint)
+// Info 4164: (180-192): Inferred type: U(string)
+// Info 4164: (183-192): Inferred type: U(string)
+// Info 4164: (183-184): Inferred type: tfun(string, U(string))
+// Info 4164: (185-191): Inferred type: string
+// Info 4164: (202-214): Inferred type: T(string)
+// Info 4164: (205-214): Inferred type: T(string)
+// Info 4164: (205-206): Inferred type: tfun(string, T(string))
+// Info 4164: (207-213): Inferred type: string
+// Info 4164: (220-228): Inferred type: T('bu:type)
+// Info 4164: (220-225): Inferred type: U(string) -> T('bu:type)
+// Info 4164: (220-221): Inferred type: U('bs:type)
+// Info 4164: (226-227): Inferred type: U(string)
+// Info 4164: (234-242): Inferred type: U('by:type)
+// Info 4164: (234-239): Inferred type: T(string) -> U('by:type)
+// Info 4164: (234-235): Inferred type: U('bw:type)
+// Info 4164: (240-241): Inferred type: T(string)
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
new file mode 100644
index 0000000000..25ab330f3b
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
@@ -0,0 +1,168 @@
+pragma experimental solidity;
+
+type bool = __builtin("bool");
+
+type T(A);
+type int;
+type str;
+
+class Self: C {
+    function foo(a: Self, b: Self) -> Self;
+}
+
+class Self: P1 {}
+class Self: P2 {}
+class Self: P3 {}
+class Self: P4 {}
+
+instantiation int: P1 {}
+instantiation int: P2 {}
+instantiation int: P3 {}
+
+instantiation str: P1 {}
+instantiation str: P2 {}
+instantiation str: P4 {}
+
+instantiation T(A: P1): + {
+    function add(x: T(A), y: T(A)) -> T(A) {}
+}
+
+instantiation T(A: P2): == {
+    function eq(x: T(A), y: T(A)) -> bool {}
+}
+
+instantiation T(A: (P1, P2)): C {
+    function foo(x: T(A), y: T(A)) -> T(A) {}
+}
+
+function fun(a: T(int: P3), b: T(str: P4)) {
+    a + a;
+    b + b;
+
+    a == a;
+    b == b;
+
+    C.foo(a, a);
+    C.foo(b, b);
+}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// Info 4164: (31-61): Inferred type: bool
+// Info 4164: (63-73): Inferred type: tfun('z:type, T('z:type))
+// Info 4164: (69-72): Inferred type: 'y:type
+// Info 4164: (70-71): Inferred type: 'y:type
+// Info 4164: (74-83): Inferred type: int
+// Info 4164: (84-93): Inferred type: str
+// Info 4164: (95-156): Inferred type: C
+// Info 4164: (101-105): Inferred type: 'bd:(type, C)
+// Info 4164: (115-154): Inferred type: ('bd:(type, C), 'bd:(type, C)) -> 'bd:(type, C)
+// Info 4164: (127-145): Inferred type: ('bd:(type, C), 'bd:(type, C))
+// Info 4164: (128-135): Inferred type: 'bd:(type, C)
+// Info 4164: (131-135): Inferred type: 'bd:(type, C)
+// Info 4164: (137-144): Inferred type: 'bd:(type, C)
+// Info 4164: (140-144): Inferred type: 'bd:(type, C)
+// Info 4164: (149-153): Inferred type: 'bd:(type, C)
+// Info 4164: (158-175): Inferred type: P1
+// Info 4164: (164-168): Inferred type: 'bg:(type, P1)
+// Info 4164: (176-193): Inferred type: P2
+// Info 4164: (182-186): Inferred type: 'bj:(type, P2)
+// Info 4164: (194-211): Inferred type: P3
+// Info 4164: (200-204): Inferred type: 'bw:(type, P3)
+// Info 4164: (212-229): Inferred type: P4
+// Info 4164: (218-222): Inferred type: 'by:(type, P4)
+// Info 4164: (231-255): Inferred type: void
+// Info 4164: (256-280): Inferred type: void
+// Info 4164: (281-305): Inferred type: void
+// Info 4164: (307-331): Inferred type: void
+// Info 4164: (332-356): Inferred type: void
+// Info 4164: (357-381): Inferred type: void
+// Info 4164: (383-458): Inferred type: void
+// Info 4164: (398-405): Inferred type: 'ca:(type, P1)
+// Info 4164: (399-404): Inferred type: 'ca:(type, P1)
+// Info 4164: (402-404): Inferred type: 'ca:(type, P1)
+// Info 4164: (415-456): Inferred type: (T('ca:(type, P1)), T('ca:(type, P1))) -> T('ca:(type, P1))
+// Info 4164: (427-445): Inferred type: (T('ca:(type, P1)), T('ca:(type, P1)))
+// Info 4164: (428-435): Inferred type: T('ca:(type, P1))
+// Info 4164: (431-435): Inferred type: T('ca:(type, P1))
+// Info 4164: (431-432): Inferred type: tfun('ca:(type, P1), T('ca:(type, P1)))
+// Info 4164: (433-434): Inferred type: 'ca:(type, P1)
+// Info 4164: (437-444): Inferred type: T('ca:(type, P1))
+// Info 4164: (440-444): Inferred type: T('ca:(type, P1))
+// Info 4164: (440-441): Inferred type: tfun('ca:(type, P1), T('ca:(type, P1)))
+// Info 4164: (442-443): Inferred type: 'ca:(type, P1)
+// Info 4164: (449-453): Inferred type: T('ca:(type, P1))
+// Info 4164: (449-450): Inferred type: tfun('ca:(type, P1), T('ca:(type, P1)))
+// Info 4164: (451-452): Inferred type: 'ca:(type, P1)
+// Info 4164: (460-535): Inferred type: void
+// Info 4164: (475-482): Inferred type: 'ck:(type, P2)
+// Info 4164: (476-481): Inferred type: 'ck:(type, P2)
+// Info 4164: (479-481): Inferred type: 'ck:(type, P2)
+// Info 4164: (493-533): Inferred type: (T('ck:(type, P2)), T('ck:(type, P2))) -> bool
+// Info 4164: (504-522): Inferred type: (T('ck:(type, P2)), T('ck:(type, P2)))
+// Info 4164: (505-512): Inferred type: T('ck:(type, P2))
+// Info 4164: (508-512): Inferred type: T('ck:(type, P2))
+// Info 4164: (508-509): Inferred type: tfun('ck:(type, P2), T('ck:(type, P2)))
+// Info 4164: (510-511): Inferred type: 'ck:(type, P2)
+// Info 4164: (514-521): Inferred type: T('ck:(type, P2))
+// Info 4164: (517-521): Inferred type: T('ck:(type, P2))
+// Info 4164: (517-518): Inferred type: tfun('ck:(type, P2), T('ck:(type, P2)))
+// Info 4164: (519-520): Inferred type: 'ck:(type, P2)
+// Info 4164: (526-530): Inferred type: bool
+// Info 4164: (537-618): Inferred type: void
+// Info 4164: (552-565): Inferred type: 'bm:(type, P1, P2)
+// Info 4164: (553-564): Inferred type: 'bm:(type, P1, P2)
+// Info 4164: (556-564): Inferred type: 'bm:(type, P1, P2)
+// Info 4164: (557-559): Inferred type: 'bm:(type, P1, P2)
+// Info 4164: (561-563): Inferred type: 'bm:(type, P1, P2)
+// Info 4164: (575-616): Inferred type: (T('bm:(type, P1, P2)), T('bm:(type, P1, P2))) -> T('bm:(type, P1, P2))
+// Info 4164: (587-605): Inferred type: (T('bm:(type, P1, P2)), T('bm:(type, P1, P2)))
+// Info 4164: (588-595): Inferred type: T('bm:(type, P1, P2))
+// Info 4164: (591-595): Inferred type: T('bm:(type, P1, P2))
+// Info 4164: (591-592): Inferred type: tfun('bm:(type, P1, P2), T('bm:(type, P1, P2)))
+// Info 4164: (593-594): Inferred type: 'bm:(type, P1, P2)
+// Info 4164: (597-604): Inferred type: T('bm:(type, P1, P2))
+// Info 4164: (600-604): Inferred type: T('bm:(type, P1, P2))
+// Info 4164: (600-601): Inferred type: tfun('bm:(type, P1, P2), T('bm:(type, P1, P2)))
+// Info 4164: (602-603): Inferred type: 'bm:(type, P1, P2)
+// Info 4164: (609-613): Inferred type: T('bm:(type, P1, P2))
+// Info 4164: (609-610): Inferred type: tfun('bm:(type, P1, P2), T('bm:(type, P1, P2)))
+// Info 4164: (611-612): Inferred type: 'bm:(type, P1, P2)
+// Info 4164: (620-748): Inferred type: (T(int), T(str)) -> ()
+// Info 4164: (632-662): Inferred type: (T(int), T(str))
+// Info 4164: (633-646): Inferred type: T(int)
+// Info 4164: (636-646): Inferred type: T(int)
+// Info 4164: (636-637): Inferred type: tfun(int, T(int))
+// Info 4164: (638-645): Inferred type: int
+// Info 4164: (638-641): Inferred type: int
+// Info 4164: (643-645): Inferred type: int
+// Info 4164: (648-661): Inferred type: T(str)
+// Info 4164: (651-661): Inferred type: T(str)
+// Info 4164: (651-652): Inferred type: tfun(str, T(str))
+// Info 4164: (653-660): Inferred type: str
+// Info 4164: (653-656): Inferred type: str
+// Info 4164: (658-660): Inferred type: str
+// Info 4164: (669-674): Inferred type: T(int)
+// Info 4164: (669-670): Inferred type: T(int)
+// Info 4164: (673-674): Inferred type: T(int)
+// Info 4164: (680-685): Inferred type: T(str)
+// Info 4164: (680-681): Inferred type: T(str)
+// Info 4164: (684-685): Inferred type: T(str)
+// Info 4164: (692-698): Inferred type: bool
+// Info 4164: (692-693): Inferred type: T(int)
+// Info 4164: (697-698): Inferred type: T(int)
+// Info 4164: (704-710): Inferred type: bool
+// Info 4164: (704-705): Inferred type: T(str)
+// Info 4164: (709-710): Inferred type: T(str)
+// Info 4164: (717-728): Inferred type: T(int)
+// Info 4164: (717-722): Inferred type: (T(int), T(int)) -> T(int)
+// Info 4164: (717-718): Inferred type: C
+// Info 4164: (723-724): Inferred type: T(int)
+// Info 4164: (726-727): Inferred type: T(int)
+// Info 4164: (734-745): Inferred type: T(str)
+// Info 4164: (734-739): Inferred type: (T(str), T(str)) -> T(str)
+// Info 4164: (734-735): Inferred type: C
+// Info 4164: (740-741): Inferred type: T(str)
+// Info 4164: (743-744): Inferred type: T(str)
diff --git a/test/stopAfterParseTests.sh b/test/stopAfterParseTests.sh
index 7d74704c5e..cb15603e23 100755
--- a/test/stopAfterParseTests.sh
+++ b/test/stopAfterParseTests.sh
@@ -70,5 +70,5 @@ while read -r file; do
 		echo "$file"
 		exit 1
 	fi
-done < <(find "${REPO_ROOT}/test" -iname "*.sol" -and -not -name "documentation.sol" -and -not -name "boost_filesystem_bug.sol")
+done < <(find "${REPO_ROOT}/test" -iname "*.sol" -and -not -name "documentation.sol" -and -not -name "boost_filesystem_bug.sol" -not -path "*/experimental/*" -not -path "*/functionDependencyGraphTests/*")
 echo
diff --git a/test/tools/CMakeLists.txt b/test/tools/CMakeLists.txt
index a86e6382df..532a08d9fc 100644
--- a/test/tools/CMakeLists.txt
+++ b/test/tools/CMakeLists.txt
@@ -34,6 +34,7 @@ add_executable(isoltest
 	../libsolidity/ABIJsonTest.cpp
 	../libsolidity/ASTJSONTest.cpp
 	../libsolidity/ASTPropertyTest.cpp
+	../libsolidity/FunctionDependencyGraphTest.cpp
 	../libsolidity/SMTCheckerTest.cpp
 	../libyul/Common.cpp
 	../libyul/ControlFlowGraphTest.cpp

From e6555d8080ba25f069021abb9bf79b0267c7b0e9 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 18 Dec 2023 14:47:26 -0300
Subject: [PATCH 1694/1748] Increase resource_class of prb-math external test

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index db505fc4a5..d69f3b38e0 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -738,6 +738,7 @@ defaults:
       project: prb-math
       binary_type: native
       image: cimg/rust:1.74.0-node
+      resource_class: medium
 
   - job_native_test_ext_elementfi: &job_native_test_ext_elementfi
       <<: *requires_b_ubu_static

From 5fd52f32e7dfdbafbe5cc13b0e86d0cda8e3f088 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Tue, 26 Dec 2023 12:28:44 +0100
Subject: [PATCH 1695/1748] Switch to building GMP from an unofficial git
 mirror

---
 .../Dockerfile.ubuntu.clang.ossfuzz           | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index d5e6599ea7..b6121f659d 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
@@ -22,12 +22,13 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="2"
+LABEL version="3"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get update; \
 	apt-get -qqy install --no-install-recommends \
+		automake libtool bison texinfo \
 		build-essential sudo \
 		software-properties-common \
 		ninja-build git wget \
@@ -108,18 +109,22 @@ RUN set -ex; \
     # with sanitized version. Do not perform apt
     # remove because it removes mlton as well that
     # we need for building libabicoder
+    cd /usr/src/; \
+    git clone --depth 1 --branch gmp-6.2.1 https://github.com/gmp-mirror/gmp-6.2 gmp/; \
+    rm -r gmp/.git/; \
+    test \
+        "$(tar --create gmp/ --sort=name --mtime=1970-01-01Z --owner=0 --group=0 --numeric-owner | sha256sum)" = \
+        "d606ff6a4ce98692f9920031e85ea8fcf4a65ce1426f6f0048b8794aefed174b  -"; \
+    # NOTE: This removes also libgmp.so, which git depends on
     rm -f /usr/lib/x86_64-linux-gnu/libgmp.*; \
     rm -f /usr/include/x86_64-linux-gnu/gmp.h; \
-    cd /usr/src; \
-    wget -q 'https://gmplib.org/download/gmp/gmp-6.2.1.tar.xz' -O gmp.tar.xz; \
-    test "$(sha256sum gmp.tar.xz)" = "fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2  gmp.tar.xz"; \
-    tar -xf gmp.tar.xz; \
-    cd gmp-6.2.1; \
-    ./configure --prefix=/usr --enable-static=yes; \
+    cd gmp/; \
+    autoreconf -i; \
+    ./configure --prefix=/usr --enable-static=yes --enable-maintainer-mode; \
     make -j; \
+    make check; \
     make install; \
-    rm -rf /usr/src/gmp-6.2.1; \
-    rm -f /usr/src/gmp.tar.xz
+    rm -rf /usr/src/gmp/
 
 # libabicoder
 RUN set -ex; \

From 5c79d5e49b067d138ca1707f148f26ddffc13395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 5 Jan 2024 13:18:36 +0100
Subject: [PATCH 1696/1748] CI: Update ossfuzz docker image hash

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index d69f3b38e0..e2e10267a7 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,8 +21,8 @@ parameters:
     default: "solbuildpackpusher/solidity-buildpack-deps@sha256:538596bf55961197f8b5670d8a6742d9bcd502b6a1045ae9d372cdf35ce69d93"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-2
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:a4fc3a41240c3bc58882d3f504e446c6931b547119012f5c45f79b0df91dbdd1"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-3
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:46a6df64a21dc8914a8e4d43f50a1f56a942b01cbc1c30741ca28239e4ae081a"
   emscripten-docker-image:
     type: string
     # NOTE: Please remember to update the `build_emscripten.sh` whenever the hash of this image changes.

From d5119f7247dc2def7b6ab0ddcbd01904776f6b3e Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 22 Dec 2023 09:49:39 +0100
Subject: [PATCH 1697/1748] Bump evmone to 11 in Docker images

---
 .../docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz   | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2004         | 6 +++---
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204         | 4 ++--
 scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang   | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
index b6121f659d..fd98de73e0 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu.clang.ossfuzz
@@ -22,7 +22,7 @@
 # (c) 2016-2021 solidity contributors.
 #------------------------------------------------------------------------------
 FROM gcr.io/oss-fuzz-base/base-clang:latest as base
-LABEL version="3"
+LABEL version="4"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -94,7 +94,7 @@ RUN set -ex; \
 # EVMONE
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	git clone --branch="v0.11.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
 	cd evmone; \
 	mkdir build; \
 	cd build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
index dbd1990023..6ff8d1bd43 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2004
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:focal AS base
-LABEL version="20"
+LABEL version="21"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -47,8 +47,8 @@ FROM base AS libraries
 
 # EVMONE
 RUN set -ex; \
-	wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-linux-x86_64.tar.gz; \
-	test "$(sha256sum /usr/src/evmone.tar.gz)" = "6052b6a4eba6e81bb1bccfa9fec2caf220a25f5ff5c32c544984883ed95e6552  /usr/src/evmone.tar.gz"; \
+	wget -O /usr/src/evmone.tar.gz https://github.com/ethereum/evmone/releases/download/v0.11.0/evmone-0.11.0-linux-x86_64.tar.gz; \
+	test "$(sha256sum /usr/src/evmone.tar.gz)" = "051dbe523da165658ced63619ea2c05925516aac3061951da96d3f0962560719  /usr/src/evmone.tar.gz"; \
 	cd /usr; \
 	tar -xf /usr/src/evmone.tar.gz; \
 	rm -rf /usr/src/evmone.tar.gz
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204 b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
index d5cfae9249..6908811f92 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="5"
+LABEL version="6"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -48,7 +48,7 @@ FROM base AS libraries
 # EVMONE
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	git clone --branch="v0.11.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
 	cd evmone; \
 	mkdir build; \
 	cd build; \
diff --git a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
index 3e23cd055f..a14bdc1138 100644
--- a/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
+++ b/scripts/docker/buildpack-deps/Dockerfile.ubuntu2204.clang
@@ -22,7 +22,7 @@
 # (c) 2016-2019 solidity contributors.
 #------------------------------------------------------------------------------
 FROM buildpack-deps:jammy AS base
-LABEL version="4"
+LABEL version="5"
 
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -50,7 +50,7 @@ ENV CXX clang++
 # EVMONE
 RUN set -ex; \
 	cd /usr/src; \
-	git clone --branch="v0.10.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
+	git clone --branch="v0.11.0" --recurse-submodules https://github.com/ethereum/evmone.git; \
 	cd evmone; \
 	mkdir build; \
 	cd build; \

From 567e8ccc446cd18af5f4f0b1b65cf2d2cc0de03f Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 20 Dec 2023 13:33:32 +0100
Subject: [PATCH 1698/1748] Bump evmc to v11.0.0

---
 test/evmc/README.md       |  9 ++++--
 test/evmc/evmc.h          | 46 +++++++++++++++++++++++++++++-
 test/evmc/evmc.hpp        | 59 ++++++++++++++++++++++++++++++++++-----
 test/evmc/mocked_host.hpp | 38 +++++++++++++++++++++++--
 4 files changed, 140 insertions(+), 12 deletions(-)

diff --git a/test/evmc/README.md b/test/evmc/README.md
index cdddb34440..9381b4f53e 100644
--- a/test/evmc/README.md
+++ b/test/evmc/README.md
@@ -1,5 +1,10 @@
 # EVMC
 
-This is an import of [EVMC](https://github.com/ethereum/evmc) version [10.1.0](https://github.com/ethereum/evmc/releases/tag/v10.1.0).
+This is an import of [EVMC](https://github.com/ethereum/evmc) version [11.0.0](https://github.com/ethereum/evmc/releases/tag/v11.0.0).
 
-Important: The `MockedAccount.storage` is changed to a `map` from `unordered_map` as ordering is important for fuzzing.
+Steps when upgrading:
+- Copy all from [include/evmc](https://github.com/ethereum/evmc/tree/master/include/evmc) to [test/evmc](https://github.com/ethereum/solidity/tree/develop/test/evmc)
+    - Note that you should delete (or not copy in the first place) `tooling.hpp` and `instructions.h`.
+- Copy [`loader.c`](https://github.com/ethereum/evmc/blob/master/lib/loader/loader.c) to [test/evmc](https://github.com/ethereum/solidity/tree/develop/test/evmc)
+- `MockedAccount.storage` in `mocked_host.hpp` should be changed to a `map` from `unordered_map` as ordering is important for fuzzing. You'll also need to include `<map>`.
+    See [PR #11094](https://github.com/ethereum/solidity/pull/11094) for more details.
diff --git a/test/evmc/evmc.h b/test/evmc/evmc.h
index 60c3aeecc9..48b03e5545 100644
--- a/test/evmc/evmc.h
+++ b/test/evmc/evmc.h
@@ -44,7 +44,7 @@ enum
      *
      * @see @ref versioning
      */
-    EVMC_ABI_VERSION = 10
+    EVMC_ABI_VERSION = 11
 };
 
 
@@ -202,6 +202,9 @@ struct evmc_tx_context
     evmc_uint256be block_prev_randao; /**< The block previous RANDAO (EIP-4399). */
     evmc_uint256be chain_id;          /**< The blockchain's ChainID. */
     evmc_uint256be block_base_fee;    /**< The block base fee per gas (EIP-1559, EIP-3198). */
+    evmc_uint256be blob_base_fee;     /**< The blob base fee (EIP-7516). */
+    const evmc_bytes32* blob_hashes;  /**< The array of blob hashes (EIP-4844). */
+    size_t blob_hashes_count;         /**< The number of blob hashes (EIP-4844). */
 };
 
 /**
@@ -503,6 +506,22 @@ typedef evmc_bytes32 (*evmc_get_storage_fn)(struct evmc_host_context* context,
                                             const evmc_address* address,
                                             const evmc_bytes32* key);
 
+/**
+ * Get transient storage callback function.
+ *
+ * This callback function is used by a VM to query
+ * the given account transient storage (EIP-1153) entry.
+ *
+ * @param context  The Host execution context.
+ * @param address  The address of the account.
+ * @param key      The index of the account's transient storage entry.
+ * @return         The transient storage value at the given storage key or null bytes
+ *                 if the account does not exist.
+ */
+typedef evmc_bytes32 (*evmc_get_transient_storage_fn)(struct evmc_host_context* context,
+                                                      const evmc_address* address,
+                                                      const evmc_bytes32* key);
+
 
 /**
  * The effect of an attempt to modify a contract storage item.
@@ -620,6 +639,25 @@ typedef enum evmc_storage_status (*evmc_set_storage_fn)(struct evmc_host_context
                                                         const evmc_bytes32* key,
                                                         const evmc_bytes32* value);
 
+/**
+ * Set transient storage callback function.
+ *
+ * This callback function is used by a VM to update
+ * the given account's transient storage (EIP-1153) entry.
+ * The VM MUST make sure that the account exists. This requirement is only a formality because
+ * VM implementations only modify storage of the account of the current execution context
+ * (i.e. referenced by evmc_message::recipient).
+ *
+ * @param context  The pointer to the Host execution context.
+ * @param address  The address of the account.
+ * @param key      The index of the transient storage entry.
+ * @param value    The value to be stored.
+ */
+typedef void (*evmc_set_transient_storage_fn)(struct evmc_host_context* context,
+                                              const evmc_address* address,
+                                              const evmc_bytes32* key,
+                                              const evmc_bytes32* value);
+
 /**
  * Get balance callback function.
  *
@@ -825,6 +863,12 @@ struct evmc_host_interface
 
     /** Access storage callback function. */
     evmc_access_storage_fn access_storage;
+
+    /** Get transient storage callback function. */
+    evmc_get_transient_storage_fn get_transient_storage;
+
+    /** Set transient storage callback function. */
+    evmc_set_transient_storage_fn set_transient_storage;
 };
 
 
diff --git a/test/evmc/evmc.hpp b/test/evmc/evmc.hpp
index a29f802d27..91386c46f8 100644
--- a/test/evmc/evmc.hpp
+++ b/test/evmc/evmc.hpp
@@ -493,6 +493,15 @@ class HostInterface
 
     /// @copydoc evmc_host_interface::access_storage
     virtual evmc_access_status access_storage(const address& addr, const bytes32& key) noexcept = 0;
+
+    /// @copydoc evmc_host_interface::get_transient_storage
+    virtual bytes32 get_transient_storage(const address& addr,
+                                          const bytes32& key) const noexcept = 0;
+
+    /// @copydoc evmc_host_interface::set_transient_storage
+    virtual void set_transient_storage(const address& addr,
+                                       const bytes32& key,
+                                       const bytes32& value) noexcept = 0;
 };
 
 
@@ -591,6 +600,18 @@ class HostContext : public HostInterface
     {
         return host->access_storage(context, &address, &key);
     }
+
+    bytes32 get_transient_storage(const address& address, const bytes32& key) const noexcept final
+    {
+        return host->get_transient_storage(context, &address, &key);
+    }
+
+    void set_transient_storage(const address& address,
+                               const bytes32& key,
+                               const bytes32& value) noexcept final
+    {
+        host->set_transient_storage(context, &address, &key, &value);
+    }
 };
 
 
@@ -844,18 +865,42 @@ inline evmc_access_status access_storage(evmc_host_context* h,
 {
     return Host::from_context(h)->access_storage(*addr, *key);
 }
+
+inline evmc_bytes32 get_transient_storage(evmc_host_context* h,
+                                          const evmc_address* addr,
+                                          const evmc_bytes32* key) noexcept
+{
+    return Host::from_context(h)->get_transient_storage(*addr, *key);
+}
+
+inline void set_transient_storage(evmc_host_context* h,
+                                  const evmc_address* addr,
+                                  const evmc_bytes32* key,
+                                  const evmc_bytes32* value) noexcept
+{
+    Host::from_context(h)->set_transient_storage(*addr, *key, *value);
+}
 }  // namespace internal
 
 inline const evmc_host_interface& Host::get_interface() noexcept
 {
     static constexpr evmc_host_interface interface = {
-        ::evmc::internal::account_exists, ::evmc::internal::get_storage,
-        ::evmc::internal::set_storage,    ::evmc::internal::get_balance,
-        ::evmc::internal::get_code_size,  ::evmc::internal::get_code_hash,
-        ::evmc::internal::copy_code,      ::evmc::internal::selfdestruct,
-        ::evmc::internal::call,           ::evmc::internal::get_tx_context,
-        ::evmc::internal::get_block_hash, ::evmc::internal::emit_log,
-        ::evmc::internal::access_account, ::evmc::internal::access_storage,
+        ::evmc::internal::account_exists,
+        ::evmc::internal::get_storage,
+        ::evmc::internal::set_storage,
+        ::evmc::internal::get_balance,
+        ::evmc::internal::get_code_size,
+        ::evmc::internal::get_code_hash,
+        ::evmc::internal::copy_code,
+        ::evmc::internal::selfdestruct,
+        ::evmc::internal::call,
+        ::evmc::internal::get_tx_context,
+        ::evmc::internal::get_block_hash,
+        ::evmc::internal::emit_log,
+        ::evmc::internal::access_account,
+        ::evmc::internal::access_storage,
+        ::evmc::internal::get_transient_storage,
+        ::evmc::internal::set_transient_storage,
     };
     return interface;
 }
diff --git a/test/evmc/mocked_host.hpp b/test/evmc/mocked_host.hpp
index 173b793ac7..205a136b38 100644
--- a/test/evmc/mocked_host.hpp
+++ b/test/evmc/mocked_host.hpp
@@ -63,6 +63,9 @@ struct MockedAccount
     /// The account storage map.
     std::map<bytes32, StorageValue> storage;
 
+    /// The account transient storage.
+    std::unordered_map<bytes32, bytes32> transient_storage;
+
     /// Helper method for setting balance by numeric type.
     void set_balance(uint64_t x) noexcept
     {
@@ -467,8 +470,7 @@ class MockedHost : public Host
     ///
     /// @param addr  The account address.
     /// @param key   The account's storage key.
-    /// @return      The ::EVMC_ACCESS_WARM if the storage key has been accessed
-    /// before,
+    /// @return      The ::EVMC_ACCESS_WARM if the storage key has been accessed before,
     ///              the ::EVMC_ACCESS_COLD otherwise.
     evmc_access_status access_storage(const address& addr, const bytes32& key) noexcept override
     {
@@ -477,5 +479,37 @@ class MockedHost : public Host
         value.access_status = EVMC_ACCESS_WARM;
         return access_status;
     }
+
+    /// Get account's transient storage.
+    ///
+    /// @param addr  The account address.
+    /// @param key   The account's transient storage key.
+    /// @return      The transient storage value. Null value in case the account does not exist.
+    bytes32 get_transient_storage(const address& addr, const bytes32& key) const noexcept override
+    {
+        record_account_access(addr);
+
+        const auto account_iter = accounts.find(addr);
+        if (account_iter == accounts.end())
+            return {};
+
+        const auto storage_iter = account_iter->second.transient_storage.find(key);
+        if (storage_iter != account_iter->second.transient_storage.end())
+            return storage_iter->second;
+        return {};
+    }
+
+    /// Set account's transient storage.
+    ///
+    /// @param addr   The account address.
+    /// @param key    The account's transient storage key.
+    /// @param value  The value to be stored.
+    void set_transient_storage(const address& addr,
+                               const bytes32& key,
+                               const bytes32& value) noexcept override
+    {
+        record_account_access(addr);
+        accounts[addr].transient_storage[key] = value;
+    }
 };
 }  // namespace evmc

From 8fb37d4bdff44f73ebb024bf31dac5f57ceb5f3f Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 22 Dec 2023 09:49:39 +0100
Subject: [PATCH 1699/1748] Bump evmone to 11 in CI

---
 .circleci/osx_install_dependencies.sh | 4 ++--
 scripts/install_evmone.ps1            | 2 +-
 test/Common.h                         | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 61ac4a1066..3e3f3b1bbd 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -76,10 +76,10 @@ then
   rm -r "$z3_dir"
 
   # evmone
-  evmone_version="0.10.0"
+  evmone_version="0.11.0"
   evmone_package="evmone-${evmone_version}-darwin-x86_64.tar.gz"
   wget "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/${evmone_package}"
-  validate_checksum "$evmone_package" 1b7773779287d7908baca6b8d556a98800cbd7d6e5c910b55fa507642bc0a15c
+  validate_checksum "$evmone_package" 83ed20676681d9a31bd30cac399ab7c615ccab8adb8087cc2c7e9cd22b4d2efc
   tar xzpf "$evmone_package" -C /usr/local
   rm "$evmone_package"
 
diff --git a/scripts/install_evmone.ps1 b/scripts/install_evmone.ps1
index 0bf2fa1de3..acbacdafbd 100644
--- a/scripts/install_evmone.ps1
+++ b/scripts/install_evmone.ps1
@@ -3,7 +3,7 @@ $ErrorActionPreference = "Stop"
 # Needed for Invoke-WebRequest to work via CI.
 $progressPreference = "silentlyContinue"
 
-Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-windows-amd64.zip" -OutFile "evmone.zip"
+Invoke-WebRequest -URI "https://github.com/ethereum/evmone/releases/download/v0.11.0/evmone-0.11.0-windows-amd64.zip" -OutFile "evmone.zip"
 tar -xf evmone.zip "bin/evmone.dll"
 mkdir deps
 mv bin/evmone.dll deps
diff --git a/test/Common.h b/test/Common.h
index d82ff9c6b7..28ec4e2199 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -33,13 +33,13 @@ namespace solidity::test
 
 #ifdef _WIN32
 static constexpr auto evmoneFilename = "evmone.dll";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-windows-amd64.zip";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.11.0/evmone-0.11.0-windows-amd64.zip";
 #elif defined(__APPLE__)
 static constexpr auto evmoneFilename = "libevmone.dylib";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-darwin-x86_64.tar.gz";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.11.0/evmone-0.11.0-darwin-x86_64.tar.gz";
 #else
 static constexpr auto evmoneFilename = "libevmone.so";
-static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.10.0/evmone-0.10.0-linux-x86_64.tar.gz";
+static constexpr auto evmoneDownloadLink = "https://github.com/ethereum/evmone/releases/download/v0.11.0/evmone-0.11.0-linux-x86_64.tar.gz";
 #endif
 
 struct ConfigException: public util::Exception {};

From 4e7bb4eaa42509870cfc21ff753d9cf10ccca6ab Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Sat, 23 Dec 2023 10:55:09 +0100
Subject: [PATCH 1700/1748] Bump evmc and evmone images to v11 in CI

---
 .circleci/config.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index e2e10267a7..8a771e6959 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -9,20 +9,20 @@ version: 2.1
 parameters:
   ubuntu-2004-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-20
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:7a1e1b01eda0d1e20704279672bcfd53dbbc481898ff960958a225dea76345bd"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2004-21
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:6f64c7b35aabddb416d28f621a3c4bbae768c257d6866f6a7f05f8225acc94f0"
   ubuntu-2204-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-5
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:4df420b7ccd96f540a4300a4fae0fcac2f4d3f23ffff9e3777c1f2d7c37ef901"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204-6
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:6eee10420382588b274374c6a18cb2e5d4f8a9fef5cf440b3a1acfc32bf52837"
   ubuntu-2204-clang-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-4
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:538596bf55961197f8b5670d8a6742d9bcd502b6a1045ae9d372cdf35ce69d93"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu2204.clang-5
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:e991421ce9f44d6476b29588fc355da1c3b3fedcc424fd12d844bbe310ad7851"
   ubuntu-clang-ossfuzz-docker-image:
     type: string
-    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-3
-    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:46a6df64a21dc8914a8e4d43f50a1f56a942b01cbc1c30741ca28239e4ae081a"
+    # solbuildpackpusher/solidity-buildpack-deps:ubuntu.clang.ossfuzz-4
+    default: "solbuildpackpusher/solidity-buildpack-deps@sha256:b122ef9dca71a8f90b74f3ba13cda4453681506e4a4ff047e7bc2130c76b0d1e"
   emscripten-docker-image:
     type: string
     # NOTE: Please remember to update the `build_emscripten.sh` whenever the hash of this image changes.

From 373bc2bb5ccbc4c7522ad86f87b25a610c7f752a Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 9 Jan 2024 15:30:01 -0300
Subject: [PATCH 1701/1748] Fix chai to version 4.4.0 in Brink external test

---
 test/externalTests/brink.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/externalTests/brink.sh b/test/externalTests/brink.sh
index 44ea1a511a..1c3ad2e19a 100755
--- a/test/externalTests/brink.sh
+++ b/test/externalTests/brink.sh
@@ -73,7 +73,9 @@ function brink_test
     yarn add hardhat-gas-reporter
 
     # TODO: Remove when https://github.com/brinktrade/brink-core/issues/48 is fixed.
-    yarn add chai
+    # TODO: Chai is ESM-only since version 5.x (see: https://github.com/chaijs/chai/issues/1561#issuecomment-1871134261),
+    # thus, we should stick to version 4.x until Brink and other dependencies also migrate to ESM.
+    yarn add chai@4.4.0
 
     replace_version_pragmas
 

From fbbac9c1969c054071d9d6456e5151cb4ae53c19 Mon Sep 17 00:00:00 2001
From: Sukey <35202440+sukey2008@users.noreply.github.com>
Date: Wed, 10 Jan 2024 10:39:25 +0100
Subject: [PATCH 1702/1748] Fix several minor typo (#14629)

* fix minor typo

* fix minor typo

* Change to suggested correct wording

Update installing-solidity.rst
---
 docs/installing-solidity.rst | 2 +-
 docs/path-resolution.rst     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/installing-solidity.rst b/docs/installing-solidity.rst
index abafd0ad38..2f048fe3c1 100644
--- a/docs/installing-solidity.rst
+++ b/docs/installing-solidity.rst
@@ -73,7 +73,7 @@ Docker
 ======
 
 Docker images of Solidity builds are available using the ``solc`` image from the ``ethereum`` organization.
-Use the ``stable`` tag for the latest released version, and ``nightly`` for potentially unstable changes in the develop branch.
+Use the ``stable`` tag for the latest released version, and ``nightly`` for potentially unstable changes in the ``develop`` branch.
 
 The Docker image runs the compiler executable so that you can pass all compiler arguments to it.
 For example, the command below pulls the stable version of the ``solc`` image (if you do not have it already),
diff --git a/docs/path-resolution.rst b/docs/path-resolution.rst
index 666d9b8dc9..ff4930bc9d 100644
--- a/docs/path-resolution.rst
+++ b/docs/path-resolution.rst
@@ -41,7 +41,7 @@ that interprets a source unit name as a path in the local filesystem.
 This callback can be disabled using the ``--no-import-callback`` command-line option.
 The `JavaScript interface <https://github.com/ethereum/solc-js>`_ does not provide any by default,
 but one can be provided by the user.
-This mechanism can be used to obtain source code from locations other then the local filesystem
+This mechanism can be used to obtain source code from locations other than the local filesystem
 (which may not even be accessible, e.g. when the compiler is running in a browser).
 For example the `Remix IDE <https://remix.ethereum.org/>`_ provides a versatile callback that
 lets you `import files from HTTP, IPFS and Swarm URLs or refer directly to packages in NPM registry

From 47fc4f948d851e0357cf294ac80bd4a2c6a3ff12 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Fri, 12 Jan 2024 07:31:54 +0100
Subject: [PATCH 1703/1748] Yul fuzzer: Add Shanghai EVM version

---
 test/tools/ossfuzz/protoToYul.cpp | 2 ++
 test/tools/ossfuzz/yulProto.proto | 1 +
 2 files changed, 3 insertions(+)

diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 8076857893..9b487daf5d 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -116,6 +116,8 @@ EVMVersion ProtoConverter::evmVersionMapping(Program_Version const& _ver)
 		return EVMVersion::london();
 	case Program::PARIS:
 		return EVMVersion::paris();
+	case Program::SHANGHAI:
+		return EVMVersion::shanghai();
 	}
 }
 
diff --git a/test/tools/ossfuzz/yulProto.proto b/test/tools/ossfuzz/yulProto.proto
index 76d85068d3..e78080058c 100644
--- a/test/tools/ossfuzz/yulProto.proto
+++ b/test/tools/ossfuzz/yulProto.proto
@@ -398,6 +398,7 @@ message Program {
     BERLIN = 7;
     LONDON = 8;
     PARIS = 9;
+    SHANGHAI = 10;
   }
   oneof program_oneof {
     Block block = 1;

From bf59ff8bdf4fe104e558cb697abfc8f3b33daaba Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Mon, 25 Dec 2023 12:50:16 +0100
Subject: [PATCH 1704/1748] Introduce block.blobbasefee in Solidity and
 blobbasefee in Yul

---
 Changelog.md                                  |  2 ++
 docs/cheatsheet.rst                           |  3 ++-
 docs/grammar/SolidityLexer.g4                 |  2 +-
 docs/units-and-global-variables.rst           |  3 ++-
 docs/using-the-compiler.rst                   |  2 ++
 docs/yul.rst                                  |  6 ++++--
 libevmasm/Instruction.cpp                     |  2 ++
 libevmasm/Instruction.h                       |  1 +
 libevmasm/SemanticInformation.cpp             |  1 +
 libevmasm/SimplificationRule.h                |  1 +
 liblangutil/EVMVersion.cpp                    |  2 ++
 liblangutil/EVMVersion.h                      |  1 +
 libsolidity/analysis/TypeChecker.cpp          |  6 ++++++
 libsolidity/ast/Types.cpp                     |  3 ++-
 libsolidity/codegen/ExpressionCompiler.cpp    |  2 ++
 .../codegen/ir/IRGeneratorForStatements.cpp   |  2 ++
 libyul/AsmAnalysis.cpp                        |  2 ++
 libyul/backends/evm/EVMDialect.cpp            | 13 +++++++++++-
 scripts/error_codes.py                        |  2 +-
 scripts/test_antlr_grammar.sh                 |  2 ++
 test/EVMHost.cpp                              |  2 ++
 test/libsolidity/ViewPureChecker.cpp          | 20 ++++++++++++++++++
 .../blobbasefee_shanghai_function.sol         | 21 +++++++++++++++++++
 .../semanticTests/state/block_blobbasefee.sol | 17 +++++++++++++++
 .../blobbasefee_reserved_cancun.sol           | 12 +++++++++++
 .../types/magic_block_basefee_error.sol       |  9 +++++++-
 .../types/magic_block_blobbasefee_cancun.sol  | 13 ++++++++++++
 .../types/magic_block_blobbasefee_error.sol   | 16 ++++++++++++++
 .../viewPureChecker/blobbasefee_not_pure.sol  | 13 ++++++++++++
 ...embly_instructions_allowed_view_cancun.sol | 10 +++++++++
 ...ly_instructions_disallowed_pure_cancun.sol | 11 ++++++++++
 .../yulInterpreterTests/blobbasefee.yul       | 10 +++++++++
 .../blobbasefee_identifier_pre_cancun.yul     |  6 ++++++
 ...asefee_reserved_identifier_post_cancun.yul |  7 +++++++
 .../EVMInstructionInterpreter.cpp             |  2 ++
 test/tools/yulInterpreter/Interpreter.h       |  2 ++
 36 files changed, 220 insertions(+), 9 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/blobbasefee_shanghai_function.sol
 create mode 100644 test/libsolidity/semanticTests/state/block_blobbasefee.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/blobbasefee_reserved_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/types/magic_block_blobbasefee_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/types/magic_block_blobbasefee_error.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/blobbasefee_not_pure.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_cancun.sol
 create mode 100644 test/libyul/yulInterpreterTests/blobbasefee.yul
 create mode 100644 test/libyul/yulSyntaxTests/blobbasefee_identifier_pre_cancun.yul
 create mode 100644 test/libyul/yulSyntaxTests/blobbasefee_reserved_identifier_post_cancun.yul

diff --git a/Changelog.md b/Changelog.md
index f42e948ebb..bfd04e7f77 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,8 @@
 ### 0.8.24 (unreleased)
 
 Language Features:
+ * Introduce global ``block.blobbasefee`` for retrieving the blob base fee of the current block.
+ * Yul: Introduce builtin ``blobbasefee()`` for retrieving the blob base fee of the current block.
 
 
 Compiler Features:
diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index 2f0c1a251f..e6b632dae4 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -56,7 +56,7 @@ Members of ``address``
   returns ``false`` on failure
 - ``<address payable>.transfer(uint256 amount)``: send given amount of Wei to :ref:`address`, throws on failure
 
-.. index:: blockhash, block, block;basefree, block;chainid, block;coinbase, block;difficulty, block;gaslimit, block;number, block;prevrandao, block;timestamp
+.. index:: blockhash, block, block;basefee, block;blobbasefee, block;chainid, block;coinbase, block;difficulty, block;gaslimit, block;number, block;prevrandao, block;timestamp
 .. index:: gasleft, msg;data, msg;sender, msg;sig, msg;value, tx;gasprice, tx;origin
 
 Block and Transaction Properties
@@ -64,6 +64,7 @@ Block and Transaction Properties
 
 - ``blockhash(uint blockNumber) returns (bytes32)``: hash of the given block - only works for 256 most recent blocks
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)
+- ``block.blobbasefee`` (``uint``): current block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_)
 - ``block.chainid`` (``uint``): current chain id
 - ``block.coinbase`` (``address payable``): current block miner's address
 - ``block.difficulty`` (``uint``): current block difficulty (``EVM < Paris``). For other EVM versions it behaves as a deprecated alias for ``block.prevrandao`` that will be removed in the next breaking release
diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index 0452f9fa0b..b46af90616 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -305,7 +305,7 @@ YulEVMBuiltin:
 	| 'delegatecall' | 'staticcall' | 'return' | 'revert' | 'selfdestruct' | 'invalid'
 	| 'log0' | 'log1' | 'log2' | 'log3' | 'log4' | 'chainid' | 'origin' | 'gasprice'
 	| 'blockhash' | 'coinbase' | 'timestamp' | 'number' | 'difficulty' | 'prevrandao'
-	| 'gaslimit' | 'basefee';
+	| 'gaslimit' | 'basefee' | 'blobbasefee';
 
 YulLBrace: '{' -> pushMode(YulMode);
 YulRBrace: '}' -> popMode;
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index d2256884eb..f95c9c5290 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -67,7 +67,7 @@ There are special variables and functions which always exist in the global
 namespace and are mainly used to provide information about the blockchain
 or are general-use utility functions.
 
-.. index:: abi, block, coinbase, difficulty, prevrandao, encode, number, block;number, timestamp, block;timestamp, msg, data, gas, sender, value, gas price, origin
+.. index:: abi, block, coinbase, difficulty, prevrandao, encode, number, block;number, timestamp, block;timestamp, block;basefee, block;blobbasefee, msg, data, gas, sender, value, gas price, origin
 
 
 Block and Transaction Properties
@@ -75,6 +75,7 @@ Block and Transaction Properties
 
 - ``blockhash(uint blockNumber) returns (bytes32)``: hash of the given block when ``blocknumber`` is one of the 256 most recent blocks; otherwise returns zero
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)
+- ``block.blobbasefee`` (``uint``): current block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_)
 - ``block.chainid`` (``uint``): current chain id
 - ``block.coinbase`` (``address payable``): current block miner's address
 - ``block.difficulty`` (``uint``): current block difficulty (``EVM < Paris``). For other EVM versions it behaves as a deprecated alias for ``block.prevrandao`` (`EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_ )
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 0adcbf4132..60fbd0884a 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -176,6 +176,8 @@ at each version. Backward compatibility is not guaranteed between each version.
    - Introduces ``prevrandao()`` and ``block.prevrandao``, and changes the semantics of the now deprecated ``block.difficulty``, disallowing ``difficulty()`` in inline assembly (see `EIP-4399 <https://eips.ethereum.org/EIPS/eip-4399>`_).
 - ``shanghai`` (**default**)
    - Smaller code size and gas savings due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
+- ``cancun``
+   - The block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_) can be accessed via the global ``block.blobbasefee`` or ``blobbasefee()`` in inline assembly.
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
diff --git a/docs/yul.rst b/docs/yul.rst
index 0e50d13776..fd792999a9 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -752,8 +752,8 @@ This document does not want to be a full description of the Ethereum virtual mac
 Please refer to a different document if you are interested in the precise semantics.
 
 Opcodes marked with ``-`` do not return a result and all others return exactly one value.
-Opcodes marked with ``F``, ``H``, ``B``, ``C``, ``I``, ``L`` and ``P`` are present since Frontier,
-Homestead, Byzantium, Constantinople, Istanbul, London or Paris respectively.
+Opcodes marked with ``F``, ``H``, ``B``, ``C``, ``I``, ``L``, ``P`` and ``N`` are present since Frontier,
+Homestead, Byzantium, Constantinople, Istanbul, London, Paris or Cancun respectively.
 
 In the following, ``mem[a...b)`` signifies the bytes of memory starting at position ``a`` up to
 but not including position ``b`` and ``storage[p]`` signifies the storage contents at slot ``p``.
@@ -919,6 +919,8 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | basefee()               |     | L | current block's base fee (EIP-3198 and EIP-1559)                |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+| blobbasefee()           |     | N | current block's blob base fee (EIP-7516 and EIP-4844)           |
++-------------------------+-----+---+-----------------------------------------------------------------+
 | origin()                |     | F | transaction sender                                              |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | gasprice()              |     | F | gas price of the transaction                                    |
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index 174d12b5e3..23d2667318 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -81,6 +81,7 @@ std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
 	{ "CHAINID", Instruction::CHAINID },
 	{ "SELFBALANCE", Instruction::SELFBALANCE },
 	{ "BASEFEE", Instruction::BASEFEE },
+	{ "BLOBBASEFEE", Instruction::BLOBBASEFEE },
 	{ "POP", Instruction::POP },
 	{ "MLOAD", Instruction::MLOAD },
 	{ "MSTORE", Instruction::MSTORE },
@@ -230,6 +231,7 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::CHAINID,		{ "CHAINID",		0, 0, 1, false, Tier::Base } },
 	{ Instruction::SELFBALANCE,	{ "SELFBALANCE",	0, 0, 1, false, Tier::Low } },
 	{ Instruction::BASEFEE,     { "BASEFEE",        0, 0, 1, false, Tier::Base } },
+	{ Instruction::BLOBBASEFEE, { "BLOBBASEFEE",    0, 0, 1, false, Tier::Base } },
 	{ Instruction::POP,			{ "POP",			0, 1, 0, false, Tier::Base } },
 	{ Instruction::MLOAD,		{ "MLOAD",			0, 1, 1, true, Tier::VeryLow } },
 	{ Instruction::MSTORE,		{ "MSTORE",			0, 2, 0, true, Tier::VeryLow } },
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index 2fddb11d80..cf4f3df144 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -89,6 +89,7 @@ enum class Instruction: uint8_t
 	CHAINID,			///< get the config's chainid param
 	SELFBALANCE,		///< get balance of the current account
 	BASEFEE,            ///< get the block's basefee
+	BLOBBASEFEE = 0x4a, ///< get the block's blob basefee
 
 	POP = 0x50,			///< remove item from stack
 	MLOAD,				///< load word from memory
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index 1971d9d45b..fcd948e8b6 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -473,6 +473,7 @@ bool SemanticInformation::invalidInPureFunctions(Instruction _instruction)
 	case Instruction::CALLVALUE:
 	case Instruction::CHAINID:
 	case Instruction::BASEFEE:
+	case Instruction::BLOBBASEFEE:
 	case Instruction::GAS:
 	case Instruction::GASPRICE:
 	case Instruction::EXTCODESIZE:
diff --git a/libevmasm/SimplificationRule.h b/libevmasm/SimplificationRule.h
index e970068fbd..50b69d69ab 100644
--- a/libevmasm/SimplificationRule.h
+++ b/libevmasm/SimplificationRule.h
@@ -127,6 +127,7 @@ struct EVMBuiltins
 	static auto constexpr CHAINID = PatternGenerator<Instruction::CHAINID>{};
 	static auto constexpr SELFBALANCE = PatternGenerator<Instruction::SELFBALANCE>{};
 	static auto constexpr BASEFEE = PatternGenerator<Instruction::BASEFEE>{};
+	static auto constexpr BLOBBASEFEE = PatternGenerator<Instruction::BLOBBASEFEE>{};
 	static auto constexpr POP = PatternGenerator<Instruction::POP>{};
 	static auto constexpr MLOAD = PatternGenerator<Instruction::MLOAD>{};
 	static auto constexpr MSTORE = PatternGenerator<Instruction::MSTORE>{};
diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
index 24ef0673d8..78a98d2669 100644
--- a/liblangutil/EVMVersion.cpp
+++ b/liblangutil/EVMVersion.cpp
@@ -49,6 +49,8 @@ bool EVMVersion::hasOpcode(Instruction _opcode) const
 		return hasSelfBalance();
 	case Instruction::BASEFEE:
 		return hasBaseFee();
+	case Instruction::BLOBBASEFEE:
+		return hasBlobBaseFee();
 	default:
 		return true;
 	}
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index b68e9546a1..02e4e34f38 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -101,6 +101,7 @@ class EVMVersion:
 	bool hasChainID() const { return *this >= istanbul(); }
 	bool hasSelfBalance() const { return *this >= istanbul(); }
 	bool hasBaseFee() const { return *this >= london(); }
+	bool hasBlobBaseFee() const { return *this >= cancun(); }
 	bool hasPrevRandao() const { return *this >= paris(); }
 	bool hasPush0() const { return *this >= shanghai(); }
 
diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 5c28d3cd2a..11812878a5 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3409,6 +3409,12 @@ bool TypeChecker::visit(MemberAccess const& _memberAccess)
 					_memberAccess.location(),
 					"\"basefee\" is not supported by the VM version."
 				);
+			else if (memberName == "blobbasefee" && !m_evmVersion.hasBlobBaseFee())
+				m_errorReporter.typeError(
+					1006_error,
+					_memberAccess.location(),
+					"\"blobbasefee\" is not supported by the VM version."
+				);
 			else if (memberName == "prevrandao" && !m_evmVersion.hasPrevRandao())
 				m_errorReporter.warning(
 					9432_error,
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 7b3e421438..77538f485b 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -4116,7 +4116,8 @@ MemberList::MemberMap MagicType::nativeMembers(ASTNode const*) const
 			{"number", TypeProvider::uint256()},
 			{"gaslimit", TypeProvider::uint256()},
 			{"chainid", TypeProvider::uint256()},
-			{"basefee", TypeProvider::uint256()}
+			{"basefee", TypeProvider::uint256()},
+			{"blobbasefee", TypeProvider::uint256()}
 		});
 	case Kind::Message:
 		return MemberList::MemberMap({
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index 517f49c353..c96d8bdea6 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1886,6 +1886,8 @@ bool ExpressionCompiler::visit(MemberAccess const& _memberAccess)
 			m_context << Instruction::CHAINID;
 		else if (member == "basefee")
 			m_context << Instruction::BASEFEE;
+		else if (member == "blobbasefee")
+			m_context << Instruction::BLOBBASEFEE;
 		else if (member == "data")
 			m_context << u256(0) << Instruction::CALLDATASIZE;
 		else if (member == "sig")
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index a5196366fd..deed7f80c1 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1895,6 +1895,8 @@ void IRGeneratorForStatements::endVisit(MemberAccess const& _memberAccess)
 			define(_memberAccess) << "chainid()\n";
 		else if (member == "basefee")
 			define(_memberAccess) << "basefee()\n";
+		else if (member == "blobbasefee")
+			define(_memberAccess) << "blobbasefee()\n";
 		else if (member == "data")
 		{
 			IRVariable var(_memberAccess);
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index ed4187540e..5fc5c55c85 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -727,6 +727,8 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 		errorForVM(7721_error, "only available for Istanbul-compatible");
 	else if (_instr == evmasm::Instruction::BASEFEE && !m_evmVersion.hasBaseFee())
 		errorForVM(5430_error, "only available for London-compatible");
+	else if (_instr == evmasm::Instruction::BLOBBASEFEE && !m_evmVersion.hasBlobBaseFee())
+		errorForVM(6679_error, "only available for Cancun-compatible");
 	else if (_instr == evmasm::Instruction::PC)
 		m_errorReporter.error(
 			2450_error,
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 47130fd6c4..12ffb0f649 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -120,6 +120,13 @@ std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 		return _instr == evmasm::Instruction::BASEFEE && _evmVersion < langutil::EVMVersion::london();
 	};
 
+	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
+	// blobbasefee for VMs before cancun.
+	auto blobBaseFeeException = [&](evmasm::Instruction _instr) -> bool
+	{
+		return _instr == evmasm::Instruction::BLOBBASEFEE && _evmVersion < langutil::EVMVersion::cancun();
+	};
+
 	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
 	// prevrandao for VMs before paris.
 	auto prevRandaoException = [&](std::string const& _instrName) -> bool
@@ -132,7 +139,11 @@ std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 	for (auto const& instr: evmasm::c_instructions)
 	{
 		std::string name = toLower(instr.first);
-		if (!baseFeeException(instr.second) && !prevRandaoException(name))
+		if (
+			!baseFeeException(instr.second) &&
+			!blobBaseFeeException(instr.second) &&
+			!prevRandaoException(name)
+		)
 			reserved.emplace(name);
 	}
 	reserved += std::vector<YulString>{
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index 4aff6b85e8..d4e9e54866 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -202,7 +202,7 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "4591", # "There are more than 256 warnings. Ignoring the rest."
                 # Due to 3805, the warning lists look different for different compiler builds.
         "1834", # Unimplemented feature error, as we do not test it anymore via cmdLineTests
-        "5430", # basefee being used in inline assembly for EVMVersion < london
+        "6679", # blobbasefee being used in inline assembly for EVMVersion < cancun
         "1180", # SMTChecker, covered by CL tests
         "2339", # SMTChecker, covered by CL tests
         "2961", # SMTChecker, covered by CL tests
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
index 4dde11bf7d..290a044eb8 100755
--- a/scripts/test_antlr_grammar.sh
+++ b/scripts/test_antlr_grammar.sh
@@ -121,6 +121,8 @@ done < <(
       grep -v -E 'revertStatement/non_called.sol' |
       # Skipping a test with "let basefee := ..."
       grep -v -E 'inlineAssembly/basefee_berlin_function.sol' |
+      # Skipping a test with "let blobbasefee := ..."
+      grep -v -E 'inlineAssembly/blobbasefee_shanghai_function.sol' |
       # Skipping tests with "let prevrandao := ..."
       grep -v -E 'inlineAssembly/prevrandao_allowed_function_pre_paris.sol' |
       grep -v -E 'inlineAssembly/prevrandao_disallowed_function_post_paris.sol' |
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 2bc1da9652..813d28fdbf 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -136,6 +136,8 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 	tx_context.chain_id = evmc::uint256be{1};
 	// The minimum value of basefee
 	tx_context.block_base_fee = evmc::bytes32{7};
+	// The minimum value of blobbasefee
+	tx_context.blob_base_fee = evmc::bytes32{1};
 
 	// Reserve space for recording calls.
 	if (!recorded_calls.capacity())
diff --git a/test/libsolidity/ViewPureChecker.cpp b/test/libsolidity/ViewPureChecker.cpp
index 03b2b421b4..a26511a0c9 100644
--- a/test/libsolidity/ViewPureChecker.cpp
+++ b/test/libsolidity/ViewPureChecker.cpp
@@ -92,6 +92,26 @@ BOOST_AUTO_TEST_CASE(environment_access)
 		TypeError,
 		"\"block.blockhash()\" has been deprecated in favor of \"blockhash()\""
 	);
+
+	std::string baseFeeContract = "contract C { function f() view public { block.basefee; } }";
+	if (!solidity::test::CommonOptions::get().evmVersion().hasBaseFee())
+		CHECK_ERROR(
+			baseFeeContract,
+			TypeError,
+			"\"basefee\" is not supported by the VM version."
+		);
+	else
+		CHECK_SUCCESS_NO_WARNINGS(baseFeeContract);
+
+	std::string blobBaseFeeContract = "contract C { function f() view public { block.blobbasefee; } }";
+	if (!solidity::test::CommonOptions::get().evmVersion().hasBlobBaseFee())
+		CHECK_ERROR(
+			blobBaseFeeContract,
+			TypeError,
+			"\"blobbasefee\" is not supported by the VM version."
+		);
+	else
+		CHECK_SUCCESS_NO_WARNINGS(blobBaseFeeContract);
 }
 
 BOOST_AUTO_TEST_CASE(address_staticcall)
diff --git a/test/libsolidity/semanticTests/inlineAssembly/blobbasefee_shanghai_function.sol b/test/libsolidity/semanticTests/inlineAssembly/blobbasefee_shanghai_function.sol
new file mode 100644
index 0000000000..d06457133e
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/blobbasefee_shanghai_function.sol
@@ -0,0 +1,21 @@
+contract C {
+    function f() public view returns (uint ret) {
+        assembly {
+            let blobbasefee := 999
+            ret := blobbasefee
+        }
+    }
+    function g() public pure returns (uint ret) {
+        assembly {
+            function blobbasefee() -> r {
+                r := 1000
+            }
+            ret := blobbasefee()
+        }
+    }
+}
+// ====
+// EVMVersion: <=shanghai
+// ----
+// f() -> 999
+// g() -> 1000
diff --git a/test/libsolidity/semanticTests/state/block_blobbasefee.sol b/test/libsolidity/semanticTests/state/block_blobbasefee.sol
new file mode 100644
index 0000000000..23da779e40
--- /dev/null
+++ b/test/libsolidity/semanticTests/state/block_blobbasefee.sol
@@ -0,0 +1,17 @@
+contract C {
+    function f() public view returns (uint) {
+        return block.blobbasefee;
+    }
+    function g() public view returns (uint ret) {
+        assembly {
+            ret := blobbasefee()
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 1
+// g() -> 1
+// f() -> 1
+// g() -> 1
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/blobbasefee_reserved_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/blobbasefee_reserved_cancun.sol
new file mode 100644
index 0000000000..0bab7e36c7
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/blobbasefee_reserved_cancun.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() public view returns (uint ret) {
+        assembly {
+            let blobbasefee := sload(0)
+            ret := blobbasefee
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// ParserError 5568: (98-109): Cannot use builtin function name "blobbasefee" as identifier name.
diff --git a/test/libsolidity/syntaxTests/types/magic_block_basefee_error.sol b/test/libsolidity/syntaxTests/types/magic_block_basefee_error.sol
index b723d0aeeb..3e1650ad88 100644
--- a/test/libsolidity/syntaxTests/types/magic_block_basefee_error.sol
+++ b/test/libsolidity/syntaxTests/types/magic_block_basefee_error.sol
@@ -2,8 +2,15 @@ contract C {
     function f() public view returns (uint) {
         return block.basefee;
     }
+    function g() public view returns (uint ret) {
+        assembly {
+            ret := basefee()
+        }
+    }
 }
 // ====
-// EVMVersion: <=berlin
+// EVMVersion: =berlin
 // ----
 // TypeError 5921: (74-87): "basefee" is not supported by the VM version.
+// TypeError 5430: (183-190): The "basefee" instruction is only available for London-compatible VMs (you are currently compiling for "berlin").
+// DeclarationError 8678: (176-192): Variable count for assignment to "ret" does not match number of values (1 vs. 0)
diff --git a/test/libsolidity/syntaxTests/types/magic_block_blobbasefee_cancun.sol b/test/libsolidity/syntaxTests/types/magic_block_blobbasefee_cancun.sol
new file mode 100644
index 0000000000..a639abda71
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/magic_block_blobbasefee_cancun.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public view returns (uint) {
+        return block.blobbasefee;
+    }
+    function g() public view returns (uint ret) {
+        assembly {
+            ret := blobbasefee()
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
diff --git a/test/libsolidity/syntaxTests/types/magic_block_blobbasefee_error.sol b/test/libsolidity/syntaxTests/types/magic_block_blobbasefee_error.sol
new file mode 100644
index 0000000000..11a5bd991a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/types/magic_block_blobbasefee_error.sol
@@ -0,0 +1,16 @@
+contract C {
+    function f() public view returns (uint) {
+        return block.blobbasefee;
+    }
+    function g() public view returns (uint ret) {
+        assembly {
+            ret := blobbasefee()
+        }
+    }
+}
+// ====
+// EVMVersion: =shanghai
+// ----
+// TypeError 1006: (74-91): "blobbasefee" is not supported by the VM version.
+// DeclarationError 4619: (187-198): Function "blobbasefee" not found.
+// DeclarationError 8678: (180-200): Variable count for assignment to "ret" does not match number of values (1 vs. 0)
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/blobbasefee_not_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/blobbasefee_not_pure.sol
new file mode 100644
index 0000000000..3bace4285c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/blobbasefee_not_pure.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public pure {
+        assembly { pop(blobbasefee()) }
+    }
+    function g() public pure returns (uint) {
+        return block.blobbasefee;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// TypeError 2527: (67-80): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (151-168): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
new file mode 100644
index 0000000000..37380b965d
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public view {
+        assembly {
+            pop(blobbasefee())
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_cancun.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_cancun.sol
new file mode 100644
index 0000000000..5e2265f162
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_cancun.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public pure {
+        assembly {
+            pop(blobbasefee())
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// TypeError 2527: (79-92): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libyul/yulInterpreterTests/blobbasefee.yul b/test/libyul/yulInterpreterTests/blobbasefee.yul
new file mode 100644
index 0000000000..d863b1d826
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/blobbasefee.yul
@@ -0,0 +1,10 @@
+{
+	sstore(0, blobbasefee())
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Trace:
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libyul/yulSyntaxTests/blobbasefee_identifier_pre_cancun.yul b/test/libyul/yulSyntaxTests/blobbasefee_identifier_pre_cancun.yul
new file mode 100644
index 0000000000..42c1f2c0a6
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/blobbasefee_identifier_pre_cancun.yul
@@ -0,0 +1,6 @@
+{
+    function blobbasefee() {}
+}
+// ====
+// EVMVersion: <=shanghai
+// ----
diff --git a/test/libyul/yulSyntaxTests/blobbasefee_reserved_identifier_post_cancun.yul b/test/libyul/yulSyntaxTests/blobbasefee_reserved_identifier_post_cancun.yul
new file mode 100644
index 0000000000..61fa7d7e42
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/blobbasefee_reserved_identifier_post_cancun.yul
@@ -0,0 +1,7 @@
+{
+    function blobbasefee() {}
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// ParserError 5568: (15-26): Cannot use builtin function name "blobbasefee" as identifier name.
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 79dbc554a2..015924a3b6 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -233,6 +233,8 @@ u256 EVMInstructionInterpreter::eval(
 		return m_state.chainid;
 	case Instruction::BASEFEE:
 		return m_state.basefee;
+	case Instruction::BLOBBASEFEE:
+		return m_state.blobbasefee;
 	case Instruction::EXTCODESIZE:
 		return u256(keccak256(h256(arg[0]))) & 0xffffff;
 	case Instruction::EXTCODEHASH:
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index 26a8b27012..66082b5b30 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -99,6 +99,8 @@ struct InterpreterState
 	u256 chainid = 0x01;
 	/// The minimum value of basefee: 7 wei.
 	u256 basefee = 0x07;
+	/// The minimum value of blobbasefee: 1 wei.
+	u256 blobbasefee = 0x01;
 	/// Log of changes / effects. Sholud be structured data in the future.
 	std::vector<std::string> trace;
 	/// This is actually an input parameter that more or less limits the runtime.

From b8d0077ac2337db7e3799c40dbfa8d0ee7e8a1db Mon Sep 17 00:00:00 2001
From: GoodDaisy <90915921+GoodDaisy@users.noreply.github.com>
Date: Tue, 9 Jan 2024 23:46:32 +0800
Subject: [PATCH 1705/1748] Fix typos

---
 libsolidity/codegen/ArrayUtils.cpp                              | 2 +-
 libsolidity/codegen/ArrayUtils.h                                | 2 +-
 .../semanticTests/externalContracts/_prbmath/PRBMathCommon.sol  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libsolidity/codegen/ArrayUtils.cpp b/libsolidity/codegen/ArrayUtils.cpp
index afcc38fe8a..e73ddfbae8 100644
--- a/libsolidity/codegen/ArrayUtils.cpp
+++ b/libsolidity/codegen/ArrayUtils.cpp
@@ -524,7 +524,7 @@ void ArrayUtils::copyArrayToMemory(ArrayType const& _sourceType, bool _padToWord
 		{
 			// memory_end_offset - start is the actual length (we want to compute the ceil of).
 			// memory_offset - start is its next multiple of 32, but it might be off by 32.
-			// so we compute: memory_end_offset += (memory_offset - memory_end_offest) & 31
+			// so we compute: memory_end_offset += (memory_offset - memory_end_offset) & 31
 			m_context << Instruction::DUP3 << Instruction::SWAP1 << Instruction::SUB;
 			m_context << u256(31) << Instruction::AND;
 			m_context << Instruction::DUP3 << Instruction::ADD;
diff --git a/libsolidity/codegen/ArrayUtils.h b/libsolidity/codegen/ArrayUtils.h
index 7a47efad7b..326084cb63 100644
--- a/libsolidity/codegen/ArrayUtils.h
+++ b/libsolidity/codegen/ArrayUtils.h
@@ -51,7 +51,7 @@ class ArrayUtils
 	/// place as required by the ABI encoding). Use CompilerUtils::convertType if you want real
 	/// memory copies of nested arrays.
 	/// Stack pre: memory_offset source_item
-	/// Stack post: memory_offest + length(padded)
+	/// Stack post: memory_offset + length(padded)
 	void copyArrayToMemory(ArrayType const& _sourceType, bool _padToWordBoundaries = true) const;
 	/// Clears the given dynamic or static array.
 	/// Stack pre: storage_ref storage_byte_offset
diff --git a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol b/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol
index 9ec351b6c4..a3b49f8d3c 100644
--- a/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol
+++ b/test/libsolidity/semanticTests/externalContracts/_prbmath/PRBMathCommon.sol
@@ -255,7 +255,7 @@ library PRBMathCommon {
     ///
     /// Caveats:
     /// - The body is purposely left uncommented; see the NatSpec comments in "PRBMathCommon.mulDiv" to understand how this works.
-    /// - It is assumed that the result can never be type(uint256).max when x and y solve the following two queations:
+    /// - It is assumed that the result can never be type(uint256).max when x and y solve the following two equations:
     ///     1. x * y = type(uint256).max * SCALE
     ///     2. (x * y) % SCALE >= SCALE / 2
     ///

From 269951ee69e91cf2556f5057cc621053b9631fad Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Thu, 21 Dec 2023 19:19:01 -0300
Subject: [PATCH 1706/1748] Add blobhash opcode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Kamil Śliwak <kamil.sliwak@codepoets.it>
---
 Changelog.md                                  |  2 +-
 docs/grammar/SolidityLexer.g4                 |  4 ++--
 docs/yul.rst                                  |  2 ++
 libevmasm/Instruction.cpp                     |  2 ++
 libevmasm/Instruction.h                       |  1 +
 libevmasm/SemanticInformation.cpp             |  1 +
 libevmasm/SimplificationRule.h                |  1 +
 liblangutil/EVMVersion.cpp                    |  2 ++
 liblangutil/EVMVersion.h                      |  1 +
 libyul/AsmAnalysis.cpp                        |  7 +++++++
 libyul/backends/evm/EVMDialect.cpp            | 12 +++++++++--
 scripts/test_antlr_grammar.sh                 |  2 ++
 test/EVMHost.cpp                              |  7 +++++++
 .../semanticTests/inlineAssembly/blobhash.sol | 11 ++++++++++
 .../blobhash_index_exceeding_blob_count.sol   | 14 +++++++++++++
 .../inlineAssembly/blobhash_pre_cancun.sol    | 21 +++++++++++++++++++
 .../syntaxTests/inlineAssembly/blobhash.sol   | 10 +++++++++
 .../inlineAssembly/blobhash_pre_cancun.sol    | 12 +++++++++++
 .../blobhash_reserved_cancun.sol              | 14 +++++++++++++
 .../viewPureChecker/blobhash_not_pure.sol     |  9 ++++++++
 ...embly_instructions_allowed_view_cancun.sol |  1 +
 ...ly_instructions_disallowed_pure_cancun.sol |  4 +++-
 test/libyul/yulInterpreterTests/blobhash.yul  | 13 ++++++++++++
 test/libyul/yulSyntaxTests/blobhash.yul       | 15 +++++++++++++
 .../yulSyntaxTests/blobhash_pre_cancun.yul    | 13 ++++++++++++
 .../EVMInstructionInterpreter.cpp             | 16 ++++++++++++++
 .../EVMInstructionInterpreter.h               |  4 ++++
 test/tools/yulInterpreter/Interpreter.h       |  5 +++++
 28 files changed, 200 insertions(+), 6 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/blobhash.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/blobhash_index_exceeding_blob_count.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/blobhash_pre_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/blobhash.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/blobhash_reserved_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/blobhash_not_pure.sol
 create mode 100644 test/libyul/yulInterpreterTests/blobhash.yul
 create mode 100644 test/libyul/yulSyntaxTests/blobhash.yul
 create mode 100644 test/libyul/yulSyntaxTests/blobhash_pre_cancun.yul

diff --git a/Changelog.md b/Changelog.md
index bfd04e7f77..741e64f3e2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,7 +3,7 @@
 Language Features:
  * Introduce global ``block.blobbasefee`` for retrieving the blob base fee of the current block.
  * Yul: Introduce builtin ``blobbasefee()`` for retrieving the blob base fee of the current block.
-
+ * Yul: Introduce builtin ``blobhash()`` for retrieving versioned hashes of blobs associated with the transaction.
 
 Compiler Features:
  * EVM: Support for the EVM Version "Cancun".
diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index b46af90616..b553c3b79c 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -304,8 +304,8 @@ YulEVMBuiltin:
 	| 'returndatacopy' | 'extcodehash' | 'create' | 'create2' | 'call' | 'callcode'
 	| 'delegatecall' | 'staticcall' | 'return' | 'revert' | 'selfdestruct' | 'invalid'
 	| 'log0' | 'log1' | 'log2' | 'log3' | 'log4' | 'chainid' | 'origin' | 'gasprice'
-	| 'blockhash' | 'coinbase' | 'timestamp' | 'number' | 'difficulty' | 'prevrandao'
-	| 'gaslimit' | 'basefee' | 'blobbasefee';
+	| 'blockhash' | 'blobhash' | 'coinbase' | 'timestamp' | 'number' | 'difficulty'
+	| 'prevrandao' | 'gaslimit' | 'basefee' | 'blobbasefee';
 
 YulLBrace: '{' -> pushMode(YulMode);
 YulRBrace: '}' -> popMode;
diff --git a/docs/yul.rst b/docs/yul.rst
index fd792999a9..2f0dc19dc8 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -927,6 +927,8 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | blockhash(b)            |     | F | hash of block nr b - only for last 256 blocks excluding current |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+| blobhash(i)             |     | N | versioned hash of transaction's i-th blob                       |
++-------------------------+-----+---+-----------------------------------------------------------------+
 | coinbase()              |     | F | current mining beneficiary                                      |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | timestamp()             |     | F | timestamp of the current block in seconds since the epoch       |
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index 23d2667318..611b17647e 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -72,6 +72,7 @@ std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
 	{ "RETURNDATACOPY", Instruction::RETURNDATACOPY },
 	{ "EXTCODEHASH", Instruction::EXTCODEHASH },
 	{ "BLOCKHASH", Instruction::BLOCKHASH },
+	{ "BLOBHASH", Instruction::BLOBHASH },
 	{ "COINBASE", Instruction::COINBASE },
 	{ "TIMESTAMP", Instruction::TIMESTAMP },
 	{ "NUMBER", Instruction::NUMBER },
@@ -223,6 +224,7 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::RETURNDATACOPY,	{"RETURNDATACOPY",	0, 3, 0, true, Tier::VeryLow } },
 	{ Instruction::EXTCODEHASH,	{ "EXTCODEHASH",	0, 1, 1, false, Tier::Balance } },
 	{ Instruction::BLOCKHASH,	{ "BLOCKHASH",		0, 1, 1, false, Tier::Ext } },
+	{ Instruction::BLOBHASH,    { "BLOBHASH",       0, 1, 1, false, Tier::VeryLow } },
 	{ Instruction::COINBASE,	{ "COINBASE",		0, 0, 1, false, Tier::Base } },
 	{ Instruction::TIMESTAMP,	{ "TIMESTAMP",		0, 0, 1, false, Tier::Base } },
 	{ Instruction::NUMBER,		{ "NUMBER",			0, 0, 1, false, Tier::Base } },
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index cf4f3df144..f05dcb9f63 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -89,6 +89,7 @@ enum class Instruction: uint8_t
 	CHAINID,			///< get the config's chainid param
 	SELFBALANCE,		///< get balance of the current account
 	BASEFEE,            ///< get the block's basefee
+	BLOBHASH = 0x49,    ///< get a versioned hash of one of the blobs associated with the transaction
 	BLOBBASEFEE = 0x4a, ///< get the block's blob basefee
 
 	POP = 0x50,			///< remove item from stack
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index fcd948e8b6..346dcb0d4d 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -480,6 +480,7 @@ bool SemanticInformation::invalidInPureFunctions(Instruction _instruction)
 	case Instruction::EXTCODECOPY:
 	case Instruction::EXTCODEHASH:
 	case Instruction::BLOCKHASH:
+	case Instruction::BLOBHASH:
 	case Instruction::COINBASE:
 	case Instruction::TIMESTAMP:
 	case Instruction::NUMBER:
diff --git a/libevmasm/SimplificationRule.h b/libevmasm/SimplificationRule.h
index 50b69d69ab..b6d906bc14 100644
--- a/libevmasm/SimplificationRule.h
+++ b/libevmasm/SimplificationRule.h
@@ -119,6 +119,7 @@ struct EVMBuiltins
 	static auto constexpr RETURNDATACOPY = PatternGenerator<Instruction::RETURNDATACOPY>{};
 	static auto constexpr EXTCODEHASH = PatternGenerator<Instruction::EXTCODEHASH>{};
 	static auto constexpr BLOCKHASH = PatternGenerator<Instruction::BLOCKHASH>{};
+	static auto constexpr BLOBHASH = PatternGenerator<Instruction::BLOBHASH>{};
 	static auto constexpr COINBASE = PatternGenerator<Instruction::COINBASE>{};
 	static auto constexpr TIMESTAMP = PatternGenerator<Instruction::TIMESTAMP>{};
 	static auto constexpr NUMBER = PatternGenerator<Instruction::NUMBER>{};
diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
index 78a98d2669..6fe2bbb1f4 100644
--- a/liblangutil/EVMVersion.cpp
+++ b/liblangutil/EVMVersion.cpp
@@ -49,6 +49,8 @@ bool EVMVersion::hasOpcode(Instruction _opcode) const
 		return hasSelfBalance();
 	case Instruction::BASEFEE:
 		return hasBaseFee();
+	case Instruction::BLOBHASH:
+		return hasBlobHash();
 	case Instruction::BLOBBASEFEE:
 		return hasBlobBaseFee();
 	default:
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index 02e4e34f38..e59c5d3aa1 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -104,6 +104,7 @@ class EVMVersion:
 	bool hasBlobBaseFee() const { return *this >= cancun(); }
 	bool hasPrevRandao() const { return *this >= paris(); }
 	bool hasPush0() const { return *this >= shanghai(); }
+	bool hasBlobHash() const { return *this >= cancun(); }
 
 	bool hasOpcode(evmasm::Instruction _opcode) const;
 
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 5fc5c55c85..834a7549a5 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -670,6 +670,7 @@ void AsmAnalyzer::expectType(YulString _expectedType, YulString _givenType, Sour
 
 bool AsmAnalyzer::validateInstructions(std::string const& _instructionIdentifier, langutil::SourceLocation const& _location)
 {
+	// NOTE: This function uses the default EVM version instead of the currently selected one.
 	auto const builtin = EVMDialect::strictAssemblyForEVM(EVMVersion{}).builtin(YulString(_instructionIdentifier));
 	if (builtin && builtin->instruction.has_value())
 		return validateInstructions(builtin->instruction.value(), _location);
@@ -705,6 +706,9 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 		);
 	};
 
+	// The errors below are meant to be issued when processing an undeclared identifier matching a builtin name
+	// present on the default EVM version but not on the currently selected one,
+	// since the other `validateInstructions()` overload uses the default EVM version.
 	if (_instr == evmasm::Instruction::RETURNDATACOPY && !m_evmVersion.supportsReturndata())
 		errorForVM(7756_error, "only available for Byzantium-compatible");
 	else if (_instr == evmasm::Instruction::RETURNDATASIZE && !m_evmVersion.supportsReturndata())
@@ -729,6 +733,9 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 		errorForVM(5430_error, "only available for London-compatible");
 	else if (_instr == evmasm::Instruction::BLOBBASEFEE && !m_evmVersion.hasBlobBaseFee())
 		errorForVM(6679_error, "only available for Cancun-compatible");
+	else if (_instr == evmasm::Instruction::BLOBHASH && !m_evmVersion.hasBlobHash())
+		// TODO: Change this assertion to an error, similar to the ones above, when Cancun becomes the default EVM version.
+		yulAssert(false);
 	else if (_instr == evmasm::Instruction::PC)
 		m_errorReporter.error(
 			2450_error,
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 12ffb0f649..6b34f60c74 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -135,14 +135,22 @@ std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 		return _instrName == "prevrandao" && _evmVersion < langutil::EVMVersion::paris();
 	};
 
+	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
+	// blobhash for VMs before cancun.
+	auto blobHashException = [&](evmasm::Instruction _instr) -> bool
+	{
+		return _instr == evmasm::Instruction::BLOBHASH && _evmVersion < langutil::EVMVersion::cancun();
+	};
+
 	std::set<YulString> reserved;
 	for (auto const& instr: evmasm::c_instructions)
 	{
 		std::string name = toLower(instr.first);
 		if (
 			!baseFeeException(instr.second) &&
-			!blobBaseFeeException(instr.second) &&
-			!prevRandaoException(name)
+			!prevRandaoException(name) &&
+			!blobHashException(instr.second) &&
+			!blobBaseFeeException(instr.second)
 		)
 			reserved.emplace(name);
 	}
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
index 290a044eb8..6ed57f2db9 100755
--- a/scripts/test_antlr_grammar.sh
+++ b/scripts/test_antlr_grammar.sh
@@ -126,6 +126,8 @@ done < <(
       # Skipping tests with "let prevrandao := ..."
       grep -v -E 'inlineAssembly/prevrandao_allowed_function_pre_paris.sol' |
       grep -v -E 'inlineAssembly/prevrandao_disallowed_function_post_paris.sol' |
+      # Skipping a test with "let blobhash := ..."
+      grep -v -E 'inlineAssembly/blobhash_pre_cancun.sol' |
       # Skipping license error, unrelated to the grammar
       grep -v -E 'license/license_double5.sol' |
       grep -v -E 'license/license_hidden_unicode.sol' |
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 813d28fdbf..84327a5b97 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -139,6 +139,13 @@ EVMHost::EVMHost(langutil::EVMVersion _evmVersion, evmc::VM& _vm):
 	// The minimum value of blobbasefee
 	tx_context.blob_base_fee = evmc::bytes32{1};
 
+	static evmc_bytes32 const blob_hashes_array[] = {
+		0x0100000000000000000000000000000000000000000000000000000000000001_bytes32,
+		0x0100000000000000000000000000000000000000000000000000000000000002_bytes32
+	};
+	tx_context.blob_hashes = blob_hashes_array;
+	tx_context.blob_hashes_count = sizeof(blob_hashes_array) / sizeof(blob_hashes_array[0]);
+
 	// Reserve space for recording calls.
 	if (!recorded_calls.capacity())
 		recorded_calls.reserve(max_recorded_calls);
diff --git a/test/libsolidity/semanticTests/inlineAssembly/blobhash.sol b/test/libsolidity/semanticTests/inlineAssembly/blobhash.sol
new file mode 100644
index 0000000000..3beac1d26f
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/blobhash.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public view returns (bytes32 ret) {
+        assembly {
+            ret := blobhash(0)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 0x0100000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libsolidity/semanticTests/inlineAssembly/blobhash_index_exceeding_blob_count.sol b/test/libsolidity/semanticTests/inlineAssembly/blobhash_index_exceeding_blob_count.sol
new file mode 100644
index 0000000000..7063978c5c
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/blobhash_index_exceeding_blob_count.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f() public view returns (bytes32 ret) {
+        assembly {
+            // EIP-4844 specifies that if `index < len(tx.blob_versioned_hashes)`, `blobhash(index)` should return 0.
+            // Thus, as we injected only two blob hashes in the transaction context in EVMHost,
+            // the return value of the function below MUST be zero.
+            ret := blobhash(2)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 0x00
diff --git a/test/libsolidity/semanticTests/inlineAssembly/blobhash_pre_cancun.sol b/test/libsolidity/semanticTests/inlineAssembly/blobhash_pre_cancun.sol
new file mode 100644
index 0000000000..8972958e1f
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/blobhash_pre_cancun.sol
@@ -0,0 +1,21 @@
+contract C {
+    function f() public pure returns (uint ret) {
+        assembly {
+            let blobhash := 1
+            ret := blobhash
+        }
+    }
+    function g() public pure returns (uint ret) {
+        assembly {
+            function blobhash() -> r {
+                r := 1000
+            }
+            ret := blobhash()
+        }
+    }
+}
+// ====
+// EVMVersion: <=shanghai
+// ----
+// f() -> 1
+// g() -> 1000
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/blobhash.sol b/test/libsolidity/syntaxTests/inlineAssembly/blobhash.sol
new file mode 100644
index 0000000000..06eefc8aa9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/blobhash.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public view returns (bytes32 ret) {
+        assembly {
+            ret := blobhash(1)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun.sol
new file mode 100644
index 0000000000..c0284b330e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() pure external returns (bytes32 ret) {
+        assembly {
+            ret := blobhash()
+        }
+    }
+}
+// ====
+// EVMVersion: <=shanghai
+// ----
+// DeclarationError 4619: (106-114): Function "blobhash" not found.
+// DeclarationError 8678: (99-116): Variable count for assignment to "ret" does not match number of values (1 vs. 0)
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/blobhash_reserved_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/blobhash_reserved_cancun.sol
new file mode 100644
index 0000000000..39bd68e14e
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/blobhash_reserved_cancun.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f() public pure returns (uint ret) {
+        assembly {
+            function blobhash() -> r {
+                r := 1000
+            }
+            ret := blobhash()
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// ParserError 5568: (103-111): Cannot use builtin function name "blobhash" as identifier name.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/blobhash_not_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/blobhash_not_pure.sol
new file mode 100644
index 0000000000..2e38ddedb8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/blobhash_not_pure.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() public pure {
+        assembly { pop(blobhash(0)) }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// TypeError 2527: (67-78): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
index 37380b965d..f68c313286 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
@@ -1,6 +1,7 @@
 contract C {
     function f() public view {
         assembly {
+            pop(blobhash(0))
             pop(blobbasefee())
         }
     }
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_cancun.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_cancun.sol
index 5e2265f162..b3d429f069 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_cancun.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure_cancun.sol
@@ -1,6 +1,7 @@
 contract C {
     function f() public pure {
         assembly {
+            pop(blobhash(0))
             pop(blobbasefee())
         }
     }
@@ -8,4 +9,5 @@ contract C {
 // ====
 // EVMVersion: >=cancun
 // ----
-// TypeError 2527: (79-92): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (79-90): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (108-121): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libyul/yulInterpreterTests/blobhash.yul b/test/libyul/yulInterpreterTests/blobhash.yul
new file mode 100644
index 0000000000..2d5ff80f03
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/blobhash.yul
@@ -0,0 +1,13 @@
+{
+    sstore(0, blobhash(0))
+    sstore(1, blobhash(1))
+    sstore(2, blobhash(2)) // should store 0 since EVMHost has only two blob hashes injected in the block the transaction is being executed.
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Trace:
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000000: 014916dd28fc4c10d78e287ca5d9cc51ee1ae73cbfde08c6b37324cbfaac8bc5
+//   0000000000000000000000000000000000000000000000000000000000000001: 0167d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed2
diff --git a/test/libyul/yulSyntaxTests/blobhash.yul b/test/libyul/yulSyntaxTests/blobhash.yul
new file mode 100644
index 0000000000..6337f22c1b
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/blobhash.yul
@@ -0,0 +1,15 @@
+{
+    {
+        let blobhash := 1
+    }
+
+    {
+        function blobhash() {}
+        blobhash()
+    }
+}
+
+// ====
+// EVMVersion: >=cancun
+// ----
+// ParserError 5568: (20-28): Cannot use builtin function name "blobhash" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/blobhash_pre_cancun.yul b/test/libyul/yulSyntaxTests/blobhash_pre_cancun.yul
new file mode 100644
index 0000000000..777024cda0
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/blobhash_pre_cancun.yul
@@ -0,0 +1,13 @@
+{
+    {
+        let blobhash := 1
+    }
+
+    {
+        function blobhash() {}
+        blobhash()
+    }
+}
+// ====
+// EVMVersion: <=shanghai
+// ----
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 015924a3b6..3b0867f51d 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -31,6 +31,7 @@
 
 #include <libsolutil/Keccak256.h>
 #include <libsolutil/Numeric.h>
+#include <libsolutil/picosha2.h>
 
 #include <limits>
 
@@ -233,6 +234,8 @@ u256 EVMInstructionInterpreter::eval(
 		return m_state.chainid;
 	case Instruction::BASEFEE:
 		return m_state.basefee;
+	case Instruction::BLOBHASH:
+		return blobHash(arg[0]);
 	case Instruction::BLOBBASEFEE:
 		return m_state.blobbasefee;
 	case Instruction::EXTCODESIZE:
@@ -649,3 +652,16 @@ std::pair<bool, size_t> EVMInstructionInterpreter::isInputMemoryPtrModified(
 	else
 		return {false, 0};
 }
+
+h256 EVMInstructionInterpreter::blobHash(u256 const& _index)
+{
+	yulAssert(m_evmVersion.hasBlobHash());
+	if (_index >= m_state.blobCommitments.size())
+		return util::FixedHash<32>{};
+
+	h256 hashedCommitment = h256(picosha2::hash256(toBigEndian(m_state.blobCommitments[static_cast<size_t>(_index)])));
+	yulAssert(m_state.blobHashVersion.size == 1);
+	hashedCommitment[0] = *m_state.blobHashVersion.data();
+	yulAssert(hashedCommitment.size == 32);
+	return hashedCommitment;
+}
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
index d37cae542f..bd56a0220a 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -24,6 +24,7 @@
 #include <libyul/ASTForward.h>
 
 #include <libsolutil/CommonData.h>
+#include <libsolutil/FixedHash.h>
 #include <libsolutil/Numeric.h>
 
 #include <liblangutil/EVMVersion.h>
@@ -90,6 +91,9 @@ class EVMInstructionInterpreter
 		std::vector<u256> const& _evaluatedArguments
 	);
 
+	/// @returns the blob versioned hash
+	util::h256 blobHash(u256 const& _index);
+
 private:
 	/// Checks if the memory access is valid and adjusts msize accordingly.
 	/// @returns true if memory access is valid, false otherwise
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index 66082b5b30..6a71d48a12 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -113,6 +113,11 @@ struct InterpreterState
 	/// Number of the current state instance, used for recursion protection
 	size_t numInstance = 0;
 
+	// Blob commitment hash version
+	util::FixedHash<1> const blobHashVersion = util::FixedHash<1>(1);
+	// Blob commitments
+	std::array<u256, 2> const blobCommitments = {0x01, 0x02};
+
 	/// Prints execution trace and non-zero storage to @param _out.
 	/// Flag @param _disableMemoryTrace, if set, does not produce a memory dump. This
 	/// avoids false positives reports by the fuzzer when certain optimizer steps are

From 9af30b56eb24c7239b5f9f2a2b92cea152db6160 Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Fri, 12 Jan 2024 07:22:11 +0100
Subject: [PATCH 1707/1748] Yul fuzzer: Introduce basefee() and blobbasefee()
 builtins

---
 test/tools/ossfuzz/protoToYul.cpp | 18 ++++++++++++++++++
 test/tools/ossfuzz/yulProto.proto |  3 +++
 2 files changed, 21 insertions(+)

diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 9b487daf5d..6c8f291d29 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -118,6 +118,8 @@ EVMVersion ProtoConverter::evmVersionMapping(Program_Version const& _ver)
 		return EVMVersion::paris();
 	case Program::SHANGHAI:
 		return EVMVersion::shanghai();
+	case Program::CANCUN:
+		return EVMVersion::cancun();
 	}
 }
 
@@ -761,6 +763,22 @@ void ProtoConverter::visit(NullaryOp const& _x)
 		else
 			m_output << dictionaryToken();
 		break;
+	case NullaryOp::BASEFEE:
+		// Replace calls to basefee() on unsupported EVMs with a dictionary
+		// token.
+		if (m_evmVersion.hasBaseFee())
+			m_output << "basefee()";
+		else
+			m_output << dictionaryToken();
+		break;
+	case NullaryOp::BLOBBASEFEE:
+		// Replace calls to blobbasefee() on unsupported EVMs with a dictionary
+		// token.
+		if (m_evmVersion.hasBlobBaseFee())
+			m_output << "blobbasefee()";
+		else
+			m_output << dictionaryToken();
+		break;
 	}
 }
 
diff --git a/test/tools/ossfuzz/yulProto.proto b/test/tools/ossfuzz/yulProto.proto
index e78080058c..7552fb23ad 100644
--- a/test/tools/ossfuzz/yulProto.proto
+++ b/test/tools/ossfuzz/yulProto.proto
@@ -219,6 +219,8 @@ message NullaryOp {
     GASLIMIT = 15;
     SELFBALANCE = 16;
     CHAINID = 17;
+    BASEFEE = 18;
+    BLOBBASEFEE = 19;
   }
   required NOp op = 1;
 }
@@ -399,6 +401,7 @@ message Program {
     LONDON = 8;
     PARIS = 9;
     SHANGHAI = 10;
+    CANCUN = 11;
   }
   oneof program_oneof {
     Block block = 1;

From 0da0bffb9e22261baadce454159efa390914e448 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 11 Jan 2024 12:18:26 +0100
Subject: [PATCH 1708/1748] EVMInstructionInterpreter: Readability/style tweaks

---
 .../EVMInstructionInterpreter.cpp             | 27 ++++++++++---------
 .../EVMInstructionInterpreter.h               |  7 +++--
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 3b0867f51d..0466d6f669 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -74,16 +74,17 @@ u256 readZeroExtended(bytes const& _data, u256 const& _offset)
 
 namespace solidity::yul::test
 {
-/// Copy @a _size bytes of @a _source at offset @a _sourceOffset to
-/// @a _target at offset @a _targetOffset. Behaves as if @a _source would
-/// continue with an infinite sequence of zero bytes beyond its end.
+
 void copyZeroExtended(
-	std::map<u256, uint8_t>& _target, bytes const& _source,
-	size_t _targetOffset, size_t _sourceOffset, size_t _size
+	std::map<u256, uint8_t>& _target,
+	bytes const& _source,
+	size_t _targetOffset,
+	size_t _sourceOffset,
+	size_t _size
 )
 {
 	for (size_t i = 0; i < _size; ++i)
-		_target[_targetOffset + i] = _sourceOffset + i < _source.size() ? _source[_sourceOffset + i] : 0;
+		_target[_targetOffset + i] = (_sourceOffset + i < _source.size() ? _source[_sourceOffset + i] : 0);
 }
 
 }
@@ -489,8 +490,8 @@ u256 EVMInstructionInterpreter::evalBuiltin(
 	{
 		// This is identical to codecopy.
 		if (
-				_evaluatedArguments.at(2) != 0 &&
-				accessMemory(_evaluatedArguments.at(0), _evaluatedArguments.at(2))
+			_evaluatedArguments.at(2) != 0 &&
+			accessMemory(_evaluatedArguments.at(0), _evaluatedArguments.at(2))
 		)
 			copyZeroExtended(
 				m_state.memory,
@@ -513,17 +514,17 @@ bool EVMInstructionInterpreter::accessMemory(u256 const& _offset, u256 const& _s
 {
 	if (_size == 0)
 		return true;
-	else if (((_offset + _size) >= _offset) && ((_offset + _size + 0x1f) >= (_offset + _size)))
+
+	if (_offset <= (_offset + _size) && (_offset + _size) <= (_offset + _size + 0x1f))
 	{
-		u256 newSize = (_offset + _size + 0x1f) & ~u256(0x1f);
-		m_state.msize = std::max(m_state.msize, newSize);
+		u256 newMSize = (_offset + _size + 0x1f) & ~u256(0x1f);
+		m_state.msize = std::max(m_state.msize, newMSize);
 		// We only record accesses to contiguous memory chunks that are at most s_maxRangeSize bytes
 		// in size and at an offset of at most numeric_limits<size_t>::max() - s_maxRangeSize
 		return _size <= s_maxRangeSize && _offset <= u256(std::numeric_limits<size_t>::max() - s_maxRangeSize);
 	}
-	else
-		m_state.msize = u256(-1);
 
+	m_state.msize = u256(-1);
 	return false;
 }
 
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
index bd56a0220a..2f50217ed1 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -49,8 +49,11 @@ namespace solidity::yul::test
 /// @a _target at offset @a _targetOffset. Behaves as if @a _source would
 /// continue with an infinite sequence of zero bytes beyond its end.
 void copyZeroExtended(
-	std::map<u256, uint8_t>& _target, bytes const& _source,
-	size_t _targetOffset, size_t _sourceOffset, size_t _size
+	std::map<u256, uint8_t>& _target,
+	bytes const& _source,
+	size_t _targetOffset,
+	size_t _sourceOffset,
+	size_t _size
 );
 
 struct InterpreterState;

From 492c0eb00fdc2d6f96fda198323a3c473ec5abae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 19 Jan 2024 20:30:27 +0100
Subject: [PATCH 1709/1748] GasMeter tests: Skip tests with abicoder v2 only if
 they actually don't pass

---
 test/libsolidity/GasMeter.cpp | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index be222c4008..a0599f552a 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -61,14 +61,9 @@ class GasMeterTestFramework: public SolidityExecutionFramework
 		// costs for transaction
 		gas += gasForTransaction(m_compiler.object(m_compiler.lastContractName()).bytecode, true);
 
-		// Skip the tests when we use ABIEncoderV2.
-		// TODO: We should enable this again once the yul optimizer is activated.
-		if (solidity::test::CommonOptions::get().useABIEncoderV1)
-		{
-			BOOST_REQUIRE(!gas.isInfinite);
-			BOOST_CHECK_LE(m_gasUsed, gas.value);
-			BOOST_CHECK_LE(gas.value - _tolerance, m_gasUsed);
-		}
+		BOOST_REQUIRE(!gas.isInfinite);
+		BOOST_CHECK_LE(m_gasUsed, gas.value);
+		BOOST_CHECK_LE(gas.value - _tolerance, m_gasUsed);
 	}
 
 	/// Compares the gas computed by PathGasMeter for the given signature (but unknown arguments)
@@ -90,14 +85,9 @@ class GasMeterTestFramework: public SolidityExecutionFramework
 			*m_compiler.runtimeAssemblyItems(m_compiler.lastContractName()),
 			_sig
 		);
-		// Skip the tests when we use ABIEncoderV2.
-		// TODO: We should enable this again once the yul optimizer is activated.
-		if (solidity::test::CommonOptions::get().useABIEncoderV1)
-		{
-			BOOST_REQUIRE(!gas.isInfinite);
-			BOOST_CHECK_LE(m_gasUsed, gas.value);
-			BOOST_CHECK_LE(gas.value - _tolerance, m_gasUsed);
-		}
+		BOOST_REQUIRE(!gas.isInfinite);
+		BOOST_CHECK_LE(m_gasUsed, gas.value);
+		BOOST_CHECK_LE(gas.value - _tolerance, m_gasUsed);
 	}
 
 	static GasMeter::GasConsumption gasForTransaction(bytes const& _data, bool _isCreation)
@@ -129,6 +119,9 @@ BOOST_AUTO_TEST_CASE(simple_contract)
 BOOST_AUTO_TEST_CASE(store_keccak256)
 {
 	char const* sourceCode = R"(
+		// TODO: We should enable v2 again once the yul optimizer is activated.
+		pragma abicoder v1;
+
 		contract test {
 			bytes32 public shaValue;
 			constructor() {
@@ -205,6 +198,9 @@ BOOST_AUTO_TEST_CASE(function_calls)
 BOOST_AUTO_TEST_CASE(multiple_external_functions)
 {
 	char const* sourceCode = R"(
+		// TODO: We should enable v2 again once the yul optimizer is activated.
+		pragma abicoder v1;
+
 		contract test {
 			uint data;
 			uint data2;
@@ -236,6 +232,9 @@ BOOST_AUTO_TEST_CASE(multiple_external_functions)
 BOOST_AUTO_TEST_CASE(exponent_size)
 {
 	char const* sourceCode = R"(
+		// TODO: We should enable v2 again once the yul optimizer is activated.
+		pragma abicoder v1;
+
 		contract A {
 			function f(uint x) public returns (uint) {
 				unchecked { return x ** 0; }
@@ -302,6 +301,9 @@ BOOST_AUTO_TEST_CASE(complex_control_flow)
 	// Now we do not follow branches if they start out with lower gas costs than the ones
 	// we previously considered. This of course reduces accuracy.
 	char const* sourceCode = R"(
+		// TODO: We should enable v2 again once the yul optimizer is activated.
+		pragma abicoder v1;
+
 		contract log {
 			function ln(int128 x) public pure returns (int128 result) {
 				unchecked {

From 387671795b6716ae6057eec9d07e5bff1aa43462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 19 Jan 2024 21:33:06 +0100
Subject: [PATCH 1710/1748] test/Common: minEVMVersionCheck() predicate for
 skipping boost tests

---
 test/Common.cpp | 7 +++++++
 test/Common.h   | 6 ++++++
 2 files changed, 13 insertions(+)

diff --git a/test/Common.cpp b/test/Common.cpp
index 72e4d13e8f..6a3c5a2a00 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -289,6 +289,13 @@ bool isValidSemanticTestPath(boost::filesystem::path const& _testPath)
 	return true;
 }
 
+boost::unit_test::precondition::predicate_t minEVMVersionCheck(langutil::EVMVersion _minEVMVersion)
+{
+	return [_minEVMVersion](boost::unit_test::test_unit_id) {
+		return test::CommonOptions::get().evmVersion() >= _minEVMVersion;
+	};
+}
+
 bool loadVMs(CommonOptions const& _options)
 {
 	if (_options.disableSemanticTests)
diff --git a/test/Common.h b/test/Common.h
index 28ec4e2199..b5963c8875 100644
--- a/test/Common.h
+++ b/test/Common.h
@@ -27,6 +27,7 @@
 
 #include <boost/filesystem/path.hpp>
 #include <boost/program_options.hpp>
+#include <boost/test/unit_test.hpp>
 
 namespace solidity::test
 {
@@ -100,6 +101,11 @@ struct CommonOptions
 /// Note: @p _testPath can be relative but must include at least the `/test/libsolidity/semanticTests/` part
 bool isValidSemanticTestPath(boost::filesystem::path const& _testPath);
 
+/// Helper that can be used to skip tests when the EVM version selected on the command line
+/// is older than @p _minEVMVersion.
+/// @return A predicate (function) that can be passed into @a boost::unit_test::precondition().
+boost::unit_test::precondition::predicate_t minEVMVersionCheck(langutil::EVMVersion _minEVMVersion);
+
 bool loadVMs(CommonOptions const& _options);
 
 /**

From 9512f417c3cf4a569a7d37e6417f95d32fd871f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 19 Jan 2024 23:52:10 +0100
Subject: [PATCH 1711/1748] Make tests based on Analysis Framework properly use
 line prefix also when printing errors

---
 test/libsolidity/FunctionDependencyGraphTest.cpp | 5 ++++-
 test/libsolidity/GasTest.cpp                     | 3 ++-
 test/libsolidity/MemoryGuardTest.cpp             | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/test/libsolidity/FunctionDependencyGraphTest.cpp b/test/libsolidity/FunctionDependencyGraphTest.cpp
index 914fae06f0..c7992d2a2c 100644
--- a/test/libsolidity/FunctionDependencyGraphTest.cpp
+++ b/test/libsolidity/FunctionDependencyGraphTest.cpp
@@ -20,9 +20,12 @@
 
 #include <libsolidity/experimental/analysis/Analysis.h>
 #include <libsolidity/experimental/analysis/FunctionDependencyAnalysis.h>
+
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/FunctionCallFinder.h>
 
+#include <libsolutil/StringUtils.h>
+
 #include <fstream>
 #include <stdexcept>
 
@@ -41,7 +44,7 @@ TestCase::TestResult FunctionDependencyGraphTest::run(std::ostream& _stream, std
 	compiler().setOptimiserSettings(OptimiserSettings::none());
 	if (!compiler().compile(CompilerStack::AnalysisSuccessful))
 	{
-		_stream << formatErrors(filteredErrors(), _formatted);
+		printPrefixed(_stream, formatErrors(filteredErrors(), _formatted), _linePrefix);
 		return TestResult::FatalError;
 	}
 
diff --git a/test/libsolidity/GasTest.cpp b/test/libsolidity/GasTest.cpp
index 73aa780e4d..4786a2a863 100644
--- a/test/libsolidity/GasTest.cpp
+++ b/test/libsolidity/GasTest.cpp
@@ -21,6 +21,7 @@
 #include <test/Common.h>
 #include <libsolutil/CommonIO.h>
 #include <libsolutil/JSON.h>
+#include <libsolutil/StringUtils.h>
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
@@ -123,7 +124,7 @@ TestCase::TestResult GasTest::run(std::ostream& _stream, std::string const& _lin
 {
 	if (!runFramework(withPreamble(m_source), PipelineStage::Compilation))
 	{
-		_stream << formatErrors(filteredErrors(), _formatted);
+		util::printPrefixed(_stream, formatErrors(filteredErrors(), _formatted), _linePrefix);
 		return TestResult::FatalError;
 	}
 
diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index 2d8cc564bd..3e399dc043 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -21,6 +21,7 @@
 #include <test/libyul/Common.h>
 #include <libsolidity/codegen/ir/Common.h>
 #include <libsolutil/Algorithms.h>
+#include <libsolutil/StringUtils.h>
 #include <libyul/Object.h>
 #include <libyul/backends/evm/EVMDialect.h>
 #include <libyul/optimiser/FunctionCallFinder.h>
@@ -48,7 +49,7 @@ TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string con
 {
 	if (!runFramework(m_source, PipelineStage::Compilation))
 	{
-		_stream << formatErrors(filteredErrors(), _formatted);
+		printPrefixed(_stream, formatErrors(filteredErrors(), _formatted), _linePrefix);
 		return TestResult::FatalError;
 	}
 

From d1447c06235f9d1555b17567b09c20f03df2509c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 19 Jan 2024 23:53:26 +0100
Subject: [PATCH 1712/1748] MemoryGuardTest: Don't hide errors that occur at
 the IR parsing stage

---
 test/libsolidity/MemoryGuardTest.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index 3e399dc043..e5eb7752f2 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -65,7 +65,8 @@ TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string con
 
 		if (!object || !analysisInfo || Error::containsErrors(errors))
 		{
-			AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing IR." << std::endl;
+			AnsiColorized(_stream, _formatted, {formatting::BOLD, formatting::RED}) << _linePrefix << "Error parsing IR:" << std::endl;
+			printPrefixed(_stream, formatErrors(filterErrors(errors), _formatted), _linePrefix);
 			return TestResult::FatalError;
 		}
 

From 7f79cd87a1e14a9ee9ba4553ef8666c7d9b61acc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 19 Jan 2024 23:58:14 +0100
Subject: [PATCH 1713/1748] MemoryGuardTest: Respect EVM version selected on
 the command line

---
 test/libsolidity/MemoryGuardTest.cpp | 4 +++-
 test/libsolidity/MemoryGuardTest.h   | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/libsolidity/MemoryGuardTest.cpp b/test/libsolidity/MemoryGuardTest.cpp
index e5eb7752f2..7f0914cc4e 100644
--- a/test/libsolidity/MemoryGuardTest.cpp
+++ b/test/libsolidity/MemoryGuardTest.cpp
@@ -18,6 +18,7 @@
 
 #include <test/libsolidity/MemoryGuardTest.h>
 
+#include <test/Common.h>
 #include <test/libyul/Common.h>
 #include <libsolidity/codegen/ir/Common.h>
 #include <libsolutil/Algorithms.h>
@@ -35,6 +36,7 @@ using namespace solidity::util::formatting;
 using namespace solidity::langutil;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
+using namespace solidity::test;
 using namespace yul;
 
 void MemoryGuardTest::setupCompiler(CompilerStack& _compiler)
@@ -59,7 +61,7 @@ TestCase::TestResult MemoryGuardTest::run(std::ostream& _stream, std::string con
 		ErrorList errors;
 		auto [object, analysisInfo] = yul::test::parse(
 			compiler().yulIR(contractName),
-			EVMDialect::strictAssemblyForEVMObjects({}),
+			EVMDialect::strictAssemblyForEVMObjects(CommonOptions::get().evmVersion()),
 			errors
 		);
 
diff --git a/test/libsolidity/MemoryGuardTest.h b/test/libsolidity/MemoryGuardTest.h
index ec6fe5e5b9..e8e5f0ea4e 100644
--- a/test/libsolidity/MemoryGuardTest.h
+++ b/test/libsolidity/MemoryGuardTest.h
@@ -34,14 +34,14 @@ namespace solidity::frontend::test
 
 using solidity::test::SyntaxTestError;
 
-class MemoryGuardTest: public AnalysisFramework, public TestCase
+class MemoryGuardTest: public AnalysisFramework, public EVMVersionRestrictedTestCase
 {
 public:
 	static std::unique_ptr<TestCase> create(Config const& _config)
 	{
 		return std::make_unique<MemoryGuardTest>(_config.filename);
 	}
-	MemoryGuardTest(std::string const& _filename): TestCase(_filename)
+	MemoryGuardTest(std::string const& _filename): EVMVersionRestrictedTestCase(_filename)
 	{
 		m_source = m_reader.source();
 		m_expectation = m_reader.simpleExpectations();

From 81268e336573721819e39fbb3fefbc9344ad176c Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Wed, 27 Dec 2023 17:50:28 -0300
Subject: [PATCH 1714/1748] Add blobhash high-level global function.

---
 Changelog.md                                  |  1 +
 docs/cheatsheet.rst                           |  5 +++-
 docs/units-and-global-variables.rst           |  3 +++
 docs/using-the-compiler.rst                   |  1 +
 libsolidity/analysis/GlobalContext.cpp        | 15 ++++++++---
 libsolidity/analysis/GlobalContext.h          |  3 ++-
 libsolidity/ast/Types.cpp                     |  1 +
 libsolidity/ast/Types.h                       |  1 +
 libsolidity/codegen/ExpressionCompiler.cpp    |  6 ++++-
 .../codegen/ir/IRGeneratorForStatements.cpp   |  2 ++
 libsolidity/interface/CompilerStack.cpp       |  5 +++-
 scripts/test_antlr_grammar.sh                 |  1 +
 test/libsolidity/Assembly.cpp                 |  2 +-
 .../SolidityExpressionCompiler.cpp            | 25 ++++++++++++++++++-
 test/libsolidity/ViewPureChecker.cpp          |  2 ++
 .../builtinFunctions/blobhash.sol             | 18 +++++++++++++
 .../blobhash_shadow_resolution.sol            | 12 +++++++++
 .../semanticTests/state/blobhash.sol          | 14 +++++++++++
 .../semanticTests/state/uncalled_blobhash.sol | 12 +++++++++
 .../blobhash_function_pre_cancun.sol          | 11 ++++++++
 .../blobhash_function_shadow_warning.sol      | 12 +++++++++
 .../globalFunctions/blobhash_no_call.sol      | 10 ++++++++
 .../blobhash_not_declared_pre_cancun.sol      | 10 ++++++++
 .../blobhash_var_pre_cancun.sol               |  9 +++++++
 .../blobhash_var_shadow_warning.sol           | 11 ++++++++
 ...l => blobhash_pre_cancun_not_declared.sol} |  0
 .../blobhash_pre_cancun_not_reserved.sol      | 19 ++++++++++++++
 .../syntaxTests/viewPureChecker/blobhash.sol  | 13 ++++++++++
 .../viewPureChecker/blobhash_not_pure.sol     | 12 ++++++---
 .../builtin_blobhash_restrict_warning.sol     | 10 ++++++++
 30 files changed, 234 insertions(+), 12 deletions(-)
 create mode 100644 test/libsolidity/semanticTests/builtinFunctions/blobhash.sol
 create mode 100644 test/libsolidity/semanticTests/builtinFunctions/blobhash_shadow_resolution.sol
 create mode 100644 test/libsolidity/semanticTests/state/blobhash.sol
 create mode 100644 test/libsolidity/semanticTests/state/uncalled_blobhash.sol
 create mode 100644 test/libsolidity/syntaxTests/globalFunctions/blobhash_function_pre_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/globalFunctions/blobhash_function_shadow_warning.sol
 create mode 100644 test/libsolidity/syntaxTests/globalFunctions/blobhash_no_call.sol
 create mode 100644 test/libsolidity/syntaxTests/globalFunctions/blobhash_not_declared_pre_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/globalFunctions/blobhash_var_pre_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/globalFunctions/blobhash_var_shadow_warning.sol
 rename test/libsolidity/syntaxTests/inlineAssembly/{blobhash_pre_cancun.sol => blobhash_pre_cancun_not_declared.sol} (100%)
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun_not_reserved.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/blobhash.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/builtin_blobhash_restrict_warning.sol

diff --git a/Changelog.md b/Changelog.md
index 741e64f3e2..0cfa621e80 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,7 @@
 
 Language Features:
  * Introduce global ``block.blobbasefee`` for retrieving the blob base fee of the current block.
+ * Introduce global function ``blobhash(uint)`` for retrieving versioned hashes of blobs, akin to the homonymous Yul builtin.
  * Yul: Introduce builtin ``blobbasefee()`` for retrieving the blob base fee of the current block.
  * Yul: Introduce builtin ``blobhash()`` for retrieving versioned hashes of blobs associated with the transaction.
 
diff --git a/docs/cheatsheet.rst b/docs/cheatsheet.rst
index e6b632dae4..2b68d73119 100644
--- a/docs/cheatsheet.rst
+++ b/docs/cheatsheet.rst
@@ -56,13 +56,16 @@ Members of ``address``
   returns ``false`` on failure
 - ``<address payable>.transfer(uint256 amount)``: send given amount of Wei to :ref:`address`, throws on failure
 
-.. index:: blockhash, block, block;basefee, block;blobbasefee, block;chainid, block;coinbase, block;difficulty, block;gaslimit, block;number, block;prevrandao, block;timestamp
+.. index:: blockhash, blobhash, block, block;basefee, block;blobbasefee, block;chainid, block;coinbase, block;difficulty, block;gaslimit, block;number, block;prevrandao, block;timestamp
 .. index:: gasleft, msg;data, msg;sender, msg;sig, msg;value, tx;gasprice, tx;origin
 
 Block and Transaction Properties
 ================================
 
 - ``blockhash(uint blockNumber) returns (bytes32)``: hash of the given block - only works for 256 most recent blocks
+- ``blobhash(uint index) returns (bytes32)``: versioned hash of the ``index``-th blob associated with the current transaction.
+  A versioned hash consists of a single byte representing the version (currently ``0x01``), followed by the last 31 bytes
+  of the SHA256 hash of the KZG commitment (`EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_).
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)
 - ``block.blobbasefee`` (``uint``): current block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_)
 - ``block.chainid`` (``uint``): current chain id
diff --git a/docs/units-and-global-variables.rst b/docs/units-and-global-variables.rst
index f95c9c5290..a0422c32df 100644
--- a/docs/units-and-global-variables.rst
+++ b/docs/units-and-global-variables.rst
@@ -74,6 +74,9 @@ Block and Transaction Properties
 --------------------------------
 
 - ``blockhash(uint blockNumber) returns (bytes32)``: hash of the given block when ``blocknumber`` is one of the 256 most recent blocks; otherwise returns zero
+- ``blobhash(uint index) returns (bytes32)``: versioned hash of the ``index``-th blob associated with the current transaction.
+  A versioned hash consists of a single byte representing the version (currently ``0x01``), followed by the last 31 bytes
+  of the SHA256 hash of the KZG commitment (`EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_).
 - ``block.basefee`` (``uint``): current block's base fee (`EIP-3198 <https://eips.ethereum.org/EIPS/eip-3198>`_ and `EIP-1559 <https://eips.ethereum.org/EIPS/eip-1559>`_)
 - ``block.blobbasefee`` (``uint``): current block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_)
 - ``block.chainid`` (``uint``): current chain id
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 60fbd0884a..93bdff8661 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -178,6 +178,7 @@ at each version. Backward compatibility is not guaranteed between each version.
    - Smaller code size and gas savings due to the introduction of ``push0`` (see `EIP-3855 <https://eips.ethereum.org/EIPS/eip-3855>`_).
 - ``cancun``
    - The block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_) can be accessed via the global ``block.blobbasefee`` or ``blobbasefee()`` in inline assembly.
+   - Introduces ``blobhash()`` in inline assembly and a corresponding global function to retrieve versioned hashes of blobs associated with the transaction (see `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_).
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
diff --git a/libsolidity/analysis/GlobalContext.cpp b/libsolidity/analysis/GlobalContext.cpp
index 8f0ce96349..628b903617 100644
--- a/libsolidity/analysis/GlobalContext.cpp
+++ b/libsolidity/analysis/GlobalContext.cpp
@@ -59,17 +59,18 @@ int magicVariableToID(std::string const& _name)
 	else if (_name == "tx") return -26;
 	else if (_name == "type") return -27;
 	else if (_name == "this") return -28;
+	else if (_name == "blobhash") return -29;
 	else
 		solAssert(false, "Unknown magic variable: \"" + _name + "\".");
 }
 
-inline std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMagicVariables()
+inline std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMagicVariables(langutil::EVMVersion _evmVersion)
 {
 	static auto const magicVarDecl = [](std::string const& _name, Type const* _type) {
 		return std::make_shared<MagicVariableDeclaration>(magicVariableToID(_name), _name, _type);
 	};
 
-	return {
+	std::vector<std::shared_ptr<MagicVariableDeclaration const>> magicVariableDeclarations = {
 		magicVarDecl("abi", TypeProvider::magic(MagicType::Kind::ABI)),
 		magicVarDecl("addmod", TypeProvider::function(strings{"uint256", "uint256", "uint256"}, strings{"uint256"}, FunctionType::Kind::AddMod, StateMutability::Pure)),
 		magicVarDecl("assert", TypeProvider::function(strings{"bool"}, strings{}, FunctionType::Kind::Assert, StateMutability::Pure)),
@@ -101,11 +102,19 @@ inline std::vector<std::shared_ptr<MagicVariableDeclaration const>> constructMag
 			FunctionType::Options::withArbitraryParameters()
 		)),
 	};
+
+	if (_evmVersion >= langutil::EVMVersion::cancun())
+		magicVariableDeclarations.push_back(
+			magicVarDecl("blobhash", TypeProvider::function(strings{"uint256"}, strings{"bytes32"}, FunctionType::Kind::BlobHash, StateMutability::View))
+		);
+
+	return magicVariableDeclarations;
 }
 
 }
 
-GlobalContext::GlobalContext(): m_magicVariables{constructMagicVariables()}
+GlobalContext::GlobalContext(langutil::EVMVersion _evmVersion):
+	m_magicVariables{constructMagicVariables(_evmVersion)}
 {
 }
 
diff --git a/libsolidity/analysis/GlobalContext.h b/libsolidity/analysis/GlobalContext.h
index 69344537ca..3aa5e76e89 100644
--- a/libsolidity/analysis/GlobalContext.h
+++ b/libsolidity/analysis/GlobalContext.h
@@ -23,6 +23,7 @@
 
 #pragma once
 
+#include <liblangutil/EVMVersion.h>
 #include <libsolidity/ast/ASTForward.h>
 #include <map>
 #include <memory>
@@ -47,7 +48,7 @@ class GlobalContext
 	GlobalContext(GlobalContext const&) = delete;
 	GlobalContext& operator=(GlobalContext const&) = delete;
 
-	GlobalContext();
+	GlobalContext(langutil::EVMVersion _evmVersion);
 	void setCurrentContract(ContractDefinition const& _contract);
 	void resetCurrentContract() { m_currentContract = nullptr; }
 	MagicVariableDeclaration const* currentThis() const;
diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp
index 77538f485b..0af9f105fb 100644
--- a/libsolidity/ast/Types.cpp
+++ b/libsolidity/ast/Types.cpp
@@ -3075,6 +3075,7 @@ std::string FunctionType::richIdentifier() const
 	case Kind::ABIEncodeCall: id += "abiencodecall"; break;
 	case Kind::ABIEncodeWithSignature: id += "abiencodewithsignature"; break;
 	case Kind::ABIDecode: id += "abidecode"; break;
+	case Kind::BlobHash: id += "blobhash"; break;
 	case Kind::MetaType: id += "metatype"; break;
 	}
 	id += "_" + stateMutabilityToString(m_stateMutability);
diff --git a/libsolidity/ast/Types.h b/libsolidity/ast/Types.h
index fd1b6a7d3d..7bbd2f0758 100644
--- a/libsolidity/ast/Types.h
+++ b/libsolidity/ast/Types.h
@@ -1270,6 +1270,7 @@ class FunctionType: public Type
 		SetGas, ///< modify the default gas value for the function call
 		SetValue, ///< modify the default value transfer for the function call
 		BlockHash, ///< BLOCKHASH
+		BlobHash, ///< BLOBHASH
 		AddMod, ///< ADDMOD
 		MulMod, ///< MULMOD
 		ArrayPush, ///< .push() to a dynamically sized array in storage
diff --git a/libsolidity/codegen/ExpressionCompiler.cpp b/libsolidity/codegen/ExpressionCompiler.cpp
index c96d8bdea6..494d106c83 100644
--- a/libsolidity/codegen/ExpressionCompiler.cpp
+++ b/libsolidity/codegen/ExpressionCompiler.cpp
@@ -1035,9 +1035,13 @@ bool ExpressionCompiler::visit(FunctionCall const& _functionCall)
 			break;
 		}
 		case FunctionType::Kind::BlockHash:
+		case FunctionType::Kind::BlobHash:
 		{
 			acceptAndConvert(*arguments[0], *function.parameterTypes()[0], true);
-			m_context << Instruction::BLOCKHASH;
+			if (function.kind() == FunctionType::Kind::BlockHash)
+				m_context << Instruction::BLOCKHASH;
+			else
+				m_context << Instruction::BLOBHASH;
 			break;
 		}
 		case FunctionType::Kind::AddMod:
diff --git a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
index deed7f80c1..57414da93b 100644
--- a/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
+++ b/libsolidity/codegen/ir/IRGeneratorForStatements.cpp
@@ -1498,11 +1498,13 @@ void IRGeneratorForStatements::endVisit(FunctionCall const& _functionCall)
 	case FunctionType::Kind::GasLeft:
 	case FunctionType::Kind::Selfdestruct:
 	case FunctionType::Kind::BlockHash:
+	case FunctionType::Kind::BlobHash:
 	{
 		static std::map<FunctionType::Kind, std::string> functions = {
 			{FunctionType::Kind::GasLeft, "gas"},
 			{FunctionType::Kind::Selfdestruct, "selfdestruct"},
 			{FunctionType::Kind::BlockHash, "blockhash"},
+			{FunctionType::Kind::BlobHash, "blobhash"},
 		};
 		solAssert(functions.find(functionType->kind()) != functions.end());
 
diff --git a/libsolidity/interface/CompilerStack.cpp b/libsolidity/interface/CompilerStack.cpp
index b4e3cf7f38..9b5c87818b 100644
--- a/libsolidity/interface/CompilerStack.cpp
+++ b/libsolidity/interface/CompilerStack.cpp
@@ -235,6 +235,9 @@ void CompilerStack::setEVMVersion(langutil::EVMVersion _version)
 	if (m_stackState >= ParsedAndImported)
 		solThrow(CompilerError, "Must set EVM version before parsing.");
 	m_evmVersion = _version;
+	// GlobalContext depends on evmVersion since the Cancun hardfork.
+	// Therefore, we reset it whenever we set a new EVM version, ensuring that the context is never reused with a mismatched version.
+	m_globalContext.reset();
 }
 
 void CompilerStack::setEOFVersion(std::optional<uint8_t> _version)
@@ -469,7 +472,7 @@ bool CompilerStack::analyze()
 			if (source->ast && !syntaxChecker.checkSyntax(*source->ast))
 				noErrors = false;
 
-		m_globalContext = std::make_shared<GlobalContext>();
+		m_globalContext = std::make_shared<GlobalContext>(m_evmVersion);
 		// We need to keep the same resolver during the whole process.
 		NameAndTypeResolver resolver(*m_globalContext, m_evmVersion, m_errorReporter, experimentalSolidity);
 		for (Source const* source: m_sourceOrder)
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
index 6ed57f2db9..ea00cc0f6e 100755
--- a/scripts/test_antlr_grammar.sh
+++ b/scripts/test_antlr_grammar.sh
@@ -128,6 +128,7 @@ done < <(
       grep -v -E 'inlineAssembly/prevrandao_disallowed_function_post_paris.sol' |
       # Skipping a test with "let blobhash := ..."
       grep -v -E 'inlineAssembly/blobhash_pre_cancun.sol' |
+      grep -v -E 'inlineAssembly/blobhash_pre_cancun_not_reserved.sol' |
       # Skipping license error, unrelated to the grammar
       grep -v -E 'license/license_double5.sol' |
       grep -v -E 'license/license_hidden_unicode.sol' |
diff --git a/test/libsolidity/Assembly.cpp b/test/libsolidity/Assembly.cpp
index ccad7d49d1..7def76e69f 100644
--- a/test/libsolidity/Assembly.cpp
+++ b/test/libsolidity/Assembly.cpp
@@ -63,7 +63,7 @@ evmasm::AssemblyItems compileContract(std::shared_ptr<CharStream> _sourceCode)
 
 	Scoper::assignScopes(*sourceUnit);
 	BOOST_REQUIRE(SyntaxChecker(errorReporter, false).checkSyntax(*sourceUnit));
-	GlobalContext globalContext;
+	GlobalContext globalContext(solidity::test::CommonOptions::get().evmVersion());
 	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter, false);
 	DeclarationTypeChecker declarationTypeChecker(errorReporter, solidity::test::CommonOptions::get().evmVersion());
 	solAssert(!Error::containsErrors(errorReporter.errors()), "");
diff --git a/test/libsolidity/SolidityExpressionCompiler.cpp b/test/libsolidity/SolidityExpressionCompiler.cpp
index a171a5be05..1df1d94300 100644
--- a/test/libsolidity/SolidityExpressionCompiler.cpp
+++ b/test/libsolidity/SolidityExpressionCompiler.cpp
@@ -42,6 +42,7 @@
 
 using namespace solidity::evmasm;
 using namespace solidity::langutil;
+using namespace solidity::test;
 
 namespace solidity::frontend::test
 {
@@ -124,7 +125,7 @@ bytes compileFirstExpression(
 
 	ErrorList errors;
 	ErrorReporter errorReporter(errors);
-	GlobalContext globalContext;
+	GlobalContext globalContext(solidity::test::CommonOptions::get().evmVersion());
 	Scoper::assignScopes(*sourceUnit);
 	BOOST_REQUIRE(SyntaxChecker(errorReporter, false).checkSyntax(*sourceUnit));
 	NameAndTypeResolver resolver(globalContext, solidity::test::CommonOptions::get().evmVersion(), errorReporter, false);
@@ -656,6 +657,28 @@ BOOST_AUTO_TEST_CASE(blockhash)
 	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
 }
 
+BOOST_AUTO_TEST_CASE(
+	blobhash,
+	*boost::unit_test::precondition(minEVMVersionCheck(EVMVersion::cancun()))
+)
+{
+	char const* sourceCode = R"(
+		contract test {
+			function f() public {
+				blobhash(3);
+			}
+		}
+	)";
+
+	bytes code = compileFirstExpression(sourceCode, {}, {});
+
+	bytes expectation({
+		uint8_t(Instruction::PUSH1), 0x03,
+		uint8_t(Instruction::BLOBHASH)
+	});
+	BOOST_CHECK_EQUAL_COLLECTIONS(code.begin(), code.end(), expectation.begin(), expectation.end());
+}
+
 BOOST_AUTO_TEST_CASE(gas_left)
 {
 	char const* sourceCode = R"(
diff --git a/test/libsolidity/ViewPureChecker.cpp b/test/libsolidity/ViewPureChecker.cpp
index a26511a0c9..3d0e024da8 100644
--- a/test/libsolidity/ViewPureChecker.cpp
+++ b/test/libsolidity/ViewPureChecker.cpp
@@ -53,6 +53,8 @@ BOOST_AUTO_TEST_CASE(environment_access)
 	};
 	if (solidity::test::CommonOptions::get().evmVersion().hasStaticCall())
 		view.emplace_back("address(0x4242).staticcall(\"\")");
+	if (solidity::test::CommonOptions::get().evmVersion().hasBlobHash())
+		view.emplace_back("blobhash(7)");
 
 	// ``block.blockhash`` and ``blockhash`` are tested separately below because their usage will
 	// produce warnings that can't be handled in a generic way.
diff --git a/test/libsolidity/semanticTests/builtinFunctions/blobhash.sol b/test/libsolidity/semanticTests/builtinFunctions/blobhash.sol
new file mode 100644
index 0000000000..445a011bda
--- /dev/null
+++ b/test/libsolidity/semanticTests/builtinFunctions/blobhash.sol
@@ -0,0 +1,18 @@
+contract C {
+    function f() public view returns(bytes32) {
+        return blobhash(0);
+    }
+    function g() public view returns(bytes32) {
+        return blobhash(1);
+    }
+    function h() public view returns(bytes32) {
+        // NOTE: blobhash(2) should return 0 since EVMHost has only two blob hashes injected in the block the transaction is being executed.
+        return blobhash(2);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 0x0100000000000000000000000000000000000000000000000000000000000001
+// g() -> 0x0100000000000000000000000000000000000000000000000000000000000002
+// h() -> 0x00
diff --git a/test/libsolidity/semanticTests/builtinFunctions/blobhash_shadow_resolution.sol b/test/libsolidity/semanticTests/builtinFunctions/blobhash_shadow_resolution.sol
new file mode 100644
index 0000000000..6a141cb970
--- /dev/null
+++ b/test/libsolidity/semanticTests/builtinFunctions/blobhash_shadow_resolution.sol
@@ -0,0 +1,12 @@
+contract C {
+    function blobhash(uint256 index) public pure returns(bytes32) {
+        return bytes32(index);
+    }
+    function f() public pure returns(bytes32) {
+        return blobhash(3);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 0x03
diff --git a/test/libsolidity/semanticTests/state/blobhash.sol b/test/libsolidity/semanticTests/state/blobhash.sol
new file mode 100644
index 0000000000..f27b4072be
--- /dev/null
+++ b/test/libsolidity/semanticTests/state/blobhash.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f(uint _index) public returns (bytes32) {
+        return blobhash(_index);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f(uint256): 0 -> 0x0100000000000000000000000000000000000000000000000000000000000001
+// f(uint256): 1 -> 0x0100000000000000000000000000000000000000000000000000000000000002
+// f(uint256): 2 -> 0x00
+// f(uint256): 255 -> 0x00
+// f(uint256): 256 -> 0x00
+// f(uint256): 257 -> 0x00
diff --git a/test/libsolidity/semanticTests/state/uncalled_blobhash.sol b/test/libsolidity/semanticTests/state/uncalled_blobhash.sol
new file mode 100644
index 0000000000..df81a46918
--- /dev/null
+++ b/test/libsolidity/semanticTests/state/uncalled_blobhash.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() public returns (bytes32) {
+        // NOTE: The `tx_context.blob_hashes` is injected into EVMHost with the following hashes, indexed accordingly:
+        // 0 -> 0x0100000000000000000000000000000000000000000000000000000000000001
+        // 1 -> 0x0100000000000000000000000000000000000000000000000000000000000002
+        return (blobhash)(0);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() -> 0x0100000000000000000000000000000000000000000000000000000000000001
diff --git a/test/libsolidity/syntaxTests/globalFunctions/blobhash_function_pre_cancun.sol b/test/libsolidity/syntaxTests/globalFunctions/blobhash_function_pre_cancun.sol
new file mode 100644
index 0000000000..e5904f4e67
--- /dev/null
+++ b/test/libsolidity/syntaxTests/globalFunctions/blobhash_function_pre_cancun.sol
@@ -0,0 +1,11 @@
+contract C {
+    function blobhash(uint256 index) public pure returns(bytes32) {
+        return bytes32(index);
+    }
+    function f() public pure returns(bytes32) {
+        return blobhash(2);
+    }
+}
+// ====
+// EVMVersion: <=shanghai
+// ----
diff --git a/test/libsolidity/syntaxTests/globalFunctions/blobhash_function_shadow_warning.sol b/test/libsolidity/syntaxTests/globalFunctions/blobhash_function_shadow_warning.sol
new file mode 100644
index 0000000000..5469df9e6a
--- /dev/null
+++ b/test/libsolidity/syntaxTests/globalFunctions/blobhash_function_shadow_warning.sol
@@ -0,0 +1,12 @@
+contract C {
+    function blobhash(uint256 index) public pure returns(bytes32) {
+        return bytes32(index);
+    }
+    function f() public pure returns(bytes32) {
+        return blobhash(2);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 2319: (17-117): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/blobhash_no_call.sol b/test/libsolidity/syntaxTests/globalFunctions/blobhash_no_call.sol
new file mode 100644
index 0000000000..369ea04780
--- /dev/null
+++ b/test/libsolidity/syntaxTests/globalFunctions/blobhash_no_call.sol
@@ -0,0 +1,10 @@
+contract C
+{
+    function f() public pure {
+        blobhash;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 6133: (52-60): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/globalFunctions/blobhash_not_declared_pre_cancun.sol b/test/libsolidity/syntaxTests/globalFunctions/blobhash_not_declared_pre_cancun.sol
new file mode 100644
index 0000000000..a62f830150
--- /dev/null
+++ b/test/libsolidity/syntaxTests/globalFunctions/blobhash_not_declared_pre_cancun.sol
@@ -0,0 +1,10 @@
+contract C
+{
+    function f() public pure {
+        blobhash;
+    }
+}
+// ====
+// EVMVersion: <=shanghai
+// ----
+// DeclarationError 7576: (52-60): Undeclared identifier. Did you mean "blockhash"?
diff --git a/test/libsolidity/syntaxTests/globalFunctions/blobhash_var_pre_cancun.sol b/test/libsolidity/syntaxTests/globalFunctions/blobhash_var_pre_cancun.sol
new file mode 100644
index 0000000000..42b54dc666
--- /dev/null
+++ b/test/libsolidity/syntaxTests/globalFunctions/blobhash_var_pre_cancun.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() public pure returns (bool) {
+        bool blobhash = true;
+        return blobhash;
+    }
+}
+// ====
+// EVMVersion: <=shanghai
+// ----
diff --git a/test/libsolidity/syntaxTests/globalFunctions/blobhash_var_shadow_warning.sol b/test/libsolidity/syntaxTests/globalFunctions/blobhash_var_shadow_warning.sol
new file mode 100644
index 0000000000..f60378e8df
--- /dev/null
+++ b/test/libsolidity/syntaxTests/globalFunctions/blobhash_var_shadow_warning.sol
@@ -0,0 +1,11 @@
+contract C
+{
+    function f() public pure returns (bool) {
+        bool blobhash = true;
+        return blobhash;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 2319: (67-80): This declaration shadows a builtin symbol.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun_not_declared.sol
similarity index 100%
rename from test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun.sol
rename to test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun_not_declared.sol
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun_not_reserved.sol b/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun_not_reserved.sol
new file mode 100644
index 0000000000..1ac24cc649
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/blobhash_pre_cancun_not_reserved.sol
@@ -0,0 +1,19 @@
+contract C {
+    function f() public pure returns (uint ret) {
+        assembly {
+            let blobhash := 1
+            ret := blobhash
+        }
+    }
+    function g() public pure returns (uint ret) {
+        assembly {
+            function blobhash() -> r {
+                r := 1000
+            }
+            ret := blobhash()
+        }
+    }
+}
+// ====
+// EVMVersion: <=shanghai
+// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/blobhash.sol b/test/libsolidity/syntaxTests/viewPureChecker/blobhash.sol
new file mode 100644
index 0000000000..4de6929aa8
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/blobhash.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public view returns (bytes32 ret){
+        assembly {
+            ret := blobhash(0)
+        }
+    }
+    function g() public view returns (bytes32) {
+        return blobhash(0);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/blobhash_not_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/blobhash_not_pure.sol
index 2e38ddedb8..d03e336a60 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/blobhash_not_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/blobhash_not_pure.sol
@@ -1,9 +1,15 @@
 contract C {
-    function f() public pure {
-        assembly { pop(blobhash(0)) }
+    function f() public pure returns (bytes32 ret){
+        assembly {
+            ret := blobhash(0)
+        }
+    }
+    function g() public pure returns (bytes32) {
+        return blobhash(0);
     }
 }
 // ====
 // EVMVersion: >=cancun
 // ----
-// TypeError 2527: (67-78): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (103-114): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
+// TypeError 2527: (195-206): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/builtin_blobhash_restrict_warning.sol b/test/libsolidity/syntaxTests/viewPureChecker/builtin_blobhash_restrict_warning.sol
new file mode 100644
index 0000000000..18a0f58641
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/builtin_blobhash_restrict_warning.sol
@@ -0,0 +1,10 @@
+contract C {
+    function g() public {
+        bytes32 w = blobhash(0);
+        w;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 2018: (17-88): Function state mutability can be restricted to view

From ce98680ee3bd5d906a0837e4769165493f8f60d7 Mon Sep 17 00:00:00 2001
From: pgebal <pawel.gebal@imapp.pl>
Date: Wed, 24 Jan 2024 08:50:28 +0100
Subject: [PATCH 1715/1748] Support bytes concat in formal verification
 (#14685)

---
 Changelog.md                                  |  3 +-
 libsolidity/formal/CHC.cpp                    | 24 +++--
 libsolidity/formal/CHC.h                      |  2 +
 libsolidity/formal/Predicate.cpp              | 42 ++++----
 libsolidity/formal/Predicate.h                | 13 ++-
 libsolidity/formal/PredicateInstance.cpp      | 62 ++++++++++--
 libsolidity/formal/PredicateInstance.h        |  7 ++
 libsolidity/formal/PredicateSort.cpp          | 23 ++++-
 libsolidity/formal/PredicateSort.h            |  4 +-
 libsolidity/formal/SMTEncoder.cpp             | 99 +++++++++++++++----
 libsolidity/formal/SMTEncoder.h               | 10 ++
 libsolidity/formal/SymbolicState.cpp          | 89 ++++++++++++++++-
 libsolidity/formal/SymbolicState.h            | 25 ++++-
 .../smtCheckerTests/bytes_concat/equals.sol   | 52 ++++++++++
 .../bytes_concat/one_arg_call.sol             | 10 ++
 .../smtCheckerTests/bytes_concat/simple.sol   | 35 +++++++
 .../deployment/deploy_trusted_flow.sol        |  4 +-
 .../operators/index_access_side_effect.sol    |  4 +-
 ...rator_matches_equivalent_function_call.sol |  9 +-
 ...unction_type_to_function_type_internal.sol | 20 ++--
 .../types/array_mapping_aliasing_2.sol        |  3 +-
 21 files changed, 460 insertions(+), 80 deletions(-)
 create mode 100644 test/libsolidity/smtCheckerTests/bytes_concat/equals.sol
 create mode 100644 test/libsolidity/smtCheckerTests/bytes_concat/one_arg_call.sol
 create mode 100644 test/libsolidity/smtCheckerTests/bytes_concat/simple.sol

diff --git a/Changelog.md b/Changelog.md
index 0cfa621e80..19b71804a2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,7 +7,8 @@ Language Features:
  * Yul: Introduce builtin ``blobhash()`` for retrieving versioned hashes of blobs associated with the transaction.
 
 Compiler Features:
- * EVM: Support for the EVM Version "Cancun".
+* EVM: Support for the EVM Version "Cancun".
+* SMTChecker: Support `bytes.concat` except when string literals are passed as arguments.
 
 Bugfixes:
  * AST import: Fix bug when importing inline assembly with empty ``let`` variable declaration.
diff --git a/libsolidity/formal/CHC.cpp b/libsolidity/formal/CHC.cpp
index 3cd1524599..2c9075abcc 100644
--- a/libsolidity/formal/CHC.cpp
+++ b/libsolidity/formal/CHC.cpp
@@ -940,8 +940,6 @@ void CHC::nondetCall(ContractDefinition const& _contract, VariableDeclaration co
 	for (auto const* var: _contract.stateVariables())
 		m_context.variable(*var)->increaseIndex();
 
-	auto error = errorFlag().increaseIndex();
-
 	Predicate const& callPredicate = *createSymbolicBlock(
 		nondetInterfaceSort(_contract, state()),
 		"nondet_call_" + uniquePrefix(),
@@ -950,7 +948,7 @@ void CHC::nondetCall(ContractDefinition const& _contract, VariableDeclaration co
 		m_currentContract
 	);
 	auto postCallState = std::vector<smtutil::Expression>{state().state()} + currentStateVariables(_contract);
-	std::vector<smtutil::Expression> stateExprs{error, address, state().abi(), state().crypto()};
+	std::vector<smtutil::Expression> stateExprs = commonStateExpressions(errorFlag().increaseIndex(), address);
 
 	auto nondet = (*m_nondetInterfaces.at(&_contract))(stateExprs + preCallState + postCallState);
 	auto nondetCall = callPredicate(stateExprs + preCallState + postCallState);
@@ -1024,8 +1022,6 @@ void CHC::externalFunctionCall(FunctionCall const& _funCall)
 			m_context.variable(*var)->increaseIndex();
 	}
 
-	auto error = errorFlag().increaseIndex();
-
 	Predicate const& callPredicate = *createSymbolicBlock(
 		nondetInterfaceSort(*m_currentContract, state()),
 		"nondet_call_" + uniquePrefix(),
@@ -1033,7 +1029,7 @@ void CHC::externalFunctionCall(FunctionCall const& _funCall)
 		&_funCall
 	);
 	auto postCallState = std::vector<smtutil::Expression>{state().state()} + currentStateVariables();
-	std::vector<smtutil::Expression> stateExprs{error, state().thisAddress(), state().abi(), state().crypto()};
+	std::vector<smtutil::Expression> stateExprs = commonStateExpressions(errorFlag().increaseIndex(), state().thisAddress());
 
 	auto nondet = (*m_nondetInterfaces.at(m_currentContract))(stateExprs + preCallState + postCallState);
 	auto nondetCall = callPredicate(stateExprs + preCallState + postCallState);
@@ -1464,7 +1460,9 @@ void CHC::defineInterfacesAndSummaries(SourceUnit const& _source)
 					auto errorPost = errorFlag().increaseIndex();
 					auto nondetPost = smt::nondetInterface(iface, *contract, m_context, 0, 2);
 
-					std::vector<smtutil::Expression> args{errorPost, state().thisAddress(), state().abi(), state().crypto(), state().tx(), state().state(1)};
+					std::vector<smtutil::Expression> args =
+						commonStateExpressions(errorPost, state().thisAddress()) +
+						std::vector<smtutil::Expression>{state().tx(), state().state(1)};
 					args += state1 +
 						applyMap(function->parameters(), [this](auto _var) { return valueAtIndex(*_var, 0); }) +
 						std::vector<smtutil::Expression>{state().state(2)} +
@@ -1829,7 +1827,9 @@ smtutil::Expression CHC::predicate(
 
 	errorFlag().increaseIndex();
 
-	std::vector<smtutil::Expression> args{errorFlag().currentValue(), _contractAddressValue, state().abi(), state().crypto(), state().tx(), state().state()};
+	std::vector<smtutil::Expression> args =
+		commonStateExpressions(errorFlag().currentValue(), _contractAddressValue) +
+		std::vector<smtutil::Expression>{state().tx(), state().state()};
 
 	auto const* contract = _funDef->annotation().contract;
 	auto const& hierarchy = m_currentContract->annotation().linearizedBaseContracts;
@@ -2311,7 +2311,6 @@ std::optional<std::string> CHC::generateCounterexample(CHCSolverInterface::CexGr
 					path.emplace_back("State: " + modelMsg);
 			}
 		}
-
 		std::string txCex = summaryPredicate->formatSummaryCall(summaryArgs, m_charStreamProvider);
 
 		std::list<std::string> calls;
@@ -2486,3 +2485,10 @@ void CHC::decreaseBalanceFromOptionsValue(Expression const& _value)
 {
 	state().addBalance(state().thisAddress(), 0 - expr(_value));
 }
+
+std::vector<smtutil::Expression> CHC::commonStateExpressions(smtutil::Expression const& error, smtutil::Expression const& address)
+{
+	if (state().hasBytesConcatFunction())
+		return {error, address, state().abi(), state().bytesConcat(), state().crypto()};
+	return {error, address, state().abi(), state().crypto()};
+}
diff --git a/libsolidity/formal/CHC.h b/libsolidity/formal/CHC.h
index fe7387bd35..be150baf1b 100644
--- a/libsolidity/formal/CHC.h
+++ b/libsolidity/formal/CHC.h
@@ -362,6 +362,8 @@ class CHC: public SMTEncoder
 
 	/// Adds constraints that decrease the balance of the caller by _value.
 	void decreaseBalanceFromOptionsValue(Expression const& _value);
+
+	std::vector<smtutil::Expression> commonStateExpressions(smtutil::Expression const& error, smtutil::Expression const& address);
 	//@}
 
 	/// Predicates.
diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
index 2ab494fc4d..58a5a5a3e7 100644
--- a/libsolidity/formal/Predicate.cpp
+++ b/libsolidity/formal/Predicate.cpp
@@ -55,13 +55,15 @@ Predicate const* Predicate::create(
 	return &m_predicates.emplace(
 		std::piecewise_construct,
 		std::forward_as_tuple(functorName),
-		std::forward_as_tuple(std::move(predicate), _type, _node, _contractContext, std::move(_scopeStack))
+		std::forward_as_tuple(std::move(predicate), _type, _context.state().hasBytesConcatFunction(),
+			_node, _contractContext, std::move(_scopeStack))
 	).first->second;
 }
 
 Predicate::Predicate(
 	smt::SymbolicFunctionVariable&& _predicate,
 	PredicateType _type,
+	bool _bytesConcatFunctionInContext,
 	ASTNode const* _node,
 	ContractDefinition const* _contractContext,
 	std::vector<ScopeOpener const*> _scopeStack
@@ -70,7 +72,8 @@ Predicate::Predicate(
 	m_type(_type),
 	m_node(_node),
 	m_contractContext(_contractContext),
-	m_scopeStack(_scopeStack)
+	m_scopeStack(_scopeStack),
+	m_bytesConcatFunctionInContext(_bytesConcatFunctionInContext)
 {
 }
 
@@ -229,7 +232,7 @@ std::string Predicate::formatSummaryCall(
 			return {};
 	}
 
-	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockChainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
+	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, (optionally) bytesConcatFunctions, cryptoFunctions, txData, preBlockChainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
 	/// Here we are interested in preInputVars to format the function call.
 
 	std::string txModel;
@@ -285,7 +288,7 @@ std::string Predicate::formatSummaryCall(
 		}
 
 		// Here we are interested in txData from the summary predicate.
-		auto txValues = readTxVars(_args.at(4));
+		auto txValues = readTxVars(_args.at(txValuesIndex()));
 		std::vector<std::string> values;
 		for (auto const& _var: txVars)
 			if (auto v = txValues.at(_var))
@@ -303,7 +306,7 @@ std::string Predicate::formatSummaryCall(
 	auto const* fun = programFunction();
 	solAssert(fun, "");
 
-	auto first = _args.begin() + 6 + static_cast<int>(stateVars->size());
+	auto first = _args.begin() + static_cast<int>(firstArgIndex()) + static_cast<int>(stateVars->size());
 	auto last = first + static_cast<int>(fun->parameters().size());
 	solAssert(first >= _args.begin() && first <= _args.end(), "");
 	solAssert(last >= _args.begin() && last <= _args.end(), "");
@@ -337,8 +340,8 @@ std::string Predicate::formatSummaryCall(
 
 std::vector<std::optional<std::string>> Predicate::summaryStateValues(std::vector<smtutil::Expression> const& _args) const
 {
-	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
-	/// The signature of the summary predicate of a contract without constructor is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, postBlockchainState, preStateVars, postStateVars).
+	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, (optionally) bytesConcatFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
+	/// The signature of the summary predicate of a contract without constructor is: summary(error, this, abiFunctions, (optionally) bytesConcatFunctions, cryptoFunctions, txData, preBlockchainState, postBlockchainState, preStateVars, postStateVars).
 	/// Here we are interested in postStateVars.
 	auto stateVars = stateVariables();
 	solAssert(stateVars.has_value(), "");
@@ -347,12 +350,12 @@ std::vector<std::optional<std::string>> Predicate::summaryStateValues(std::vecto
 	std::vector<smtutil::Expression>::const_iterator stateLast;
 	if (auto const* function = programFunction())
 	{
-		stateFirst = _args.begin() + 6 + static_cast<int>(stateVars->size()) + static_cast<int>(function->parameters().size()) + 1;
+		stateFirst = _args.begin() + static_cast<int>(firstArgIndex()) + static_cast<int>(stateVars->size()) + static_cast<int>(function->parameters().size()) + 1;
 		stateLast = stateFirst + static_cast<int>(stateVars->size());
 	}
 	else if (programContract())
 	{
-		stateFirst = _args.begin() + 7 + static_cast<int>(stateVars->size());
+		stateFirst = _args.begin() + static_cast<int>(firstStateVarIndex()) + static_cast<int>(stateVars->size());
 		stateLast = stateFirst + static_cast<int>(stateVars->size());
 	}
 	else if (programVariable())
@@ -371,7 +374,7 @@ std::vector<std::optional<std::string>> Predicate::summaryStateValues(std::vecto
 
 std::vector<std::optional<std::string>> Predicate::summaryPostInputValues(std::vector<smtutil::Expression> const& _args) const
 {
-	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
+	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, (optionally) bytesConcatFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
 	/// Here we are interested in postInputVars.
 	auto const* function = programFunction();
 	solAssert(function, "");
@@ -381,7 +384,7 @@ std::vector<std::optional<std::string>> Predicate::summaryPostInputValues(std::v
 
 	auto const& inParams = function->parameters();
 
-	auto first = _args.begin() + 6 + static_cast<int>(stateVars->size()) * 2 + static_cast<int>(inParams.size()) + 1;
+	auto first = _args.begin() + static_cast<int>(firstArgIndex()) + static_cast<int>(stateVars->size()) * 2 + static_cast<int>(inParams.size()) + 1;
 	auto last = first + static_cast<int>(inParams.size());
 
 	solAssert(first >= _args.begin() && first <= _args.end(), "");
@@ -395,7 +398,7 @@ std::vector<std::optional<std::string>> Predicate::summaryPostInputValues(std::v
 
 std::vector<std::optional<std::string>> Predicate::summaryPostOutputValues(std::vector<smtutil::Expression> const& _args) const
 {
-	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
+	/// The signature of a function summary predicate is: summary(error, this, abiFunctions, (optionally) bytesConcatFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars).
 	/// Here we are interested in outputVars.
 	auto const* function = programFunction();
 	solAssert(function, "");
@@ -405,7 +408,7 @@ std::vector<std::optional<std::string>> Predicate::summaryPostOutputValues(std::
 
 	auto const& inParams = function->parameters();
 
-	auto first = _args.begin() + 6 + static_cast<int>(stateVars->size()) * 2 + static_cast<int>(inParams.size()) * 2 + 1;
+	auto first = _args.begin() + static_cast<int>(firstArgIndex()) + static_cast<int>(stateVars->size()) * 2 + static_cast<int>(inParams.size()) * 2 + 1;
 
 	solAssert(first >= _args.begin() && first <= _args.end(), "");
 
@@ -418,7 +421,7 @@ std::vector<std::optional<std::string>> Predicate::summaryPostOutputValues(std::
 std::pair<std::vector<std::optional<std::string>>, std::vector<VariableDeclaration const*>> Predicate::localVariableValues(std::vector<smtutil::Expression> const& _args) const
 {
 	/// The signature of a local block predicate is:
-	/// block(error, this, abiFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars, localVars).
+	/// block(error, this, abiFunctions, (optionally) bytesConcatFunctions, cryptoFunctions, txData, preBlockchainState, preStateVars, preInputVars, postBlockchainState, postStateVars, postInputVars, outputVars, localVars).
 	/// Here we are interested in localVars.
 	auto const* function = programFunction();
 	solAssert(function, "");
@@ -452,19 +455,20 @@ std::map<std::string, std::string> Predicate::expressionSubstitution(smtutil::Ex
 	auto nArgs = _predExpr.arguments.size();
 
 	// The signature of an interface predicate is
-	// interface(this, abiFunctions, cryptoFunctions, blockchainState, stateVariables).
+	// interface(this, abiFunctions, (optionally) bytesConcatFunctions, cryptoFunctions, blockchainState, stateVariables).
 	// An invariant for an interface predicate is a contract
 	// invariant over its state, for example `x <= 0`.
 	if (isInterface())
 	{
+		size_t shift = txValuesIndex();
 		solAssert(starts_with(predName, "interface"), "");
 		subst[_predExpr.arguments.at(0).name] = "address(this)";
-		solAssert(nArgs == stateVars.size() + 4, "");
+		solAssert(nArgs == stateVars.size() + shift, "");
 		for (size_t i = nArgs - stateVars.size(); i < nArgs; ++i)
-			subst[_predExpr.arguments.at(i).name] = stateVars.at(i - 4)->name();
+			subst[_predExpr.arguments.at(i).name] = stateVars.at(i - shift)->name();
 	}
 	// The signature of a nondet interface predicate is
-	// nondet_interface(error, this, abiFunctions, cryptoFunctions, blockchainState, stateVariables, blockchainState', stateVariables').
+	// nondet_interface(error, this, abiFunctions, (optionally) bytesConcatFunctions, cryptoFunctions, blockchainState, stateVariables, blockchainState', stateVariables').
 	// An invariant for a nondet interface predicate is a reentrancy property
 	// over the pre and post state variables of a contract, where pre state vars
 	// are represented by the variable's name and post state vars are represented
@@ -475,7 +479,7 @@ std::map<std::string, std::string> Predicate::expressionSubstitution(smtutil::Ex
 		solAssert(starts_with(predName, "nondet_interface"), "");
 		subst[_predExpr.arguments.at(0).name] = "<errorCode>";
 		subst[_predExpr.arguments.at(1).name] = "address(this)";
-		solAssert(nArgs == stateVars.size() * 2 + 6, "");
+		solAssert(nArgs == stateVars.size() * 2 + firstArgIndex(), "");
 		for (size_t i = nArgs - stateVars.size(), s = 0; i < nArgs; ++i, ++s)
 			subst[_predExpr.arguments.at(i).name] = stateVars.at(s)->name() + "'";
 		for (size_t i = nArgs - (stateVars.size() * 2 + 1), s = 0; i < nArgs - (stateVars.size() + 1); ++i, ++s)
diff --git a/libsolidity/formal/Predicate.h b/libsolidity/formal/Predicate.h
index d7ac0da352..638354f921 100644
--- a/libsolidity/formal/Predicate.h
+++ b/libsolidity/formal/Predicate.h
@@ -71,6 +71,7 @@ class Predicate
 	Predicate(
 		smt::SymbolicFunctionVariable&& _predicate,
 		PredicateType _type,
+		bool _bytesConcatFunctionInContext,
 		ASTNode const* _node = nullptr,
 		ContractDefinition const* _contractContext = nullptr,
 		std::vector<ScopeOpener const*> _scopeStack = {}
@@ -179,7 +180,7 @@ class Predicate
 
 	/// @returns a substitution map from the arguments of _predExpr
 	/// to a Solidity-like expression.
-	std::map<std::string, std::string> expressionSubstitution(smtutil::Expression const& _predExpr) const;
+	std::map<std::string, std::string> expressionSubstitution(smtutil::Expression const& _predExprs) const;
 
 private:
 	/// @returns the formatted version of the given SMT expressions. Those expressions must be SMT constants.
@@ -196,6 +197,13 @@ class Predicate
 
 	std::map<std::string, std::optional<std::string>> readTxVars(smtutil::Expression const& _tx) const;
 
+	/// @returns index at which transaction values start in args list
+	size_t txValuesIndex() const { return m_bytesConcatFunctionInContext ? 5 : 4; }
+	/// @returns index at which function arguments start in args list
+	size_t firstArgIndex() const { return m_bytesConcatFunctionInContext ? 7 : 6; }
+	/// @returns index at which state variables values start in args list
+	size_t firstStateVarIndex() const { return m_bytesConcatFunctionInContext ? 8 : 7; }
+
 	/// The actual SMT expression.
 	smt::SymbolicFunctionVariable m_predicate;
 
@@ -219,6 +227,9 @@ class Predicate
 	/// The scope stack when the predicate was created.
 	/// Used to identify the subset of variables in scope.
 	std::vector<ScopeOpener const*> const m_scopeStack;
+
+	/// True iff there is a bytes concat function in contract scope
+	bool m_bytesConcatFunctionInContext;
 };
 
 struct PredicateCompare
diff --git a/libsolidity/formal/PredicateInstance.cpp b/libsolidity/formal/PredicateInstance.cpp
index 0bf352dd47..b5b148cd48 100644
--- a/libsolidity/formal/PredicateInstance.cpp
+++ b/libsolidity/formal/PredicateInstance.cpp
@@ -29,14 +29,14 @@ namespace solidity::frontend::smt
 smtutil::Expression interfacePre(Predicate const& _pred, ContractDefinition const& _contract, EncodingContext& _context)
 {
 	auto& state = _context.state();
-	std::vector<smtutil::Expression> stateExprs{state.thisAddress(0), state.abi(0), state.crypto(0), state.state(0)};
+	std::vector<smtutil::Expression> stateExprs = getStateExpressionsForInterfacePre(state);
 	return _pred(stateExprs + initialStateVariables(_contract, _context));
 }
 
 smtutil::Expression interface(Predicate const& _pred, ContractDefinition const& _contract, EncodingContext& _context)
 {
 	auto const& state = _context.state();
-	std::vector<smtutil::Expression> stateExprs{state.thisAddress(0), state.abi(0), state.crypto(0), state.state()};
+	std::vector<smtutil::Expression> stateExprs = getStateExpressionsForInterface(state);
 	return _pred(stateExprs + currentStateVariables(_contract, _context));
 }
 
@@ -48,7 +48,7 @@ smtutil::Expression nondetInterface(
 	unsigned _postIdx)
 {
 	auto const& state = _context.state();
-	std::vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), state.thisAddress(), state.abi(), state.crypto()};
+	std::vector<smtutil::Expression> stateExprs = getStateExpressionsForNondetInterface(state);
 	return _pred(
 		stateExprs +
 		std::vector<smtutil::Expression>{_context.state().state(_preIdx)} +
@@ -65,7 +65,7 @@ smtutil::Expression constructor(Predicate const& _pred, EncodingContext& _contex
 		return _pred(currentFunctionVariablesForDefinition(*constructor, &contract, _context));
 
 	auto& state = _context.state();
-	std::vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), state.thisAddress(0), state.abi(0), state.crypto(0), state.tx(0), state.state(0), state.state()};
+	std::vector<smtutil::Expression> stateExprs = getStateExpressionsForConstructor(state);
 	return _pred(stateExprs + initialStateVariables(contract, _context) + currentStateVariables(contract, _context));
 }
 
@@ -76,7 +76,7 @@ smtutil::Expression constructorCall(Predicate const& _pred, EncodingContext& _co
 		return _pred(currentFunctionVariablesForCall(*constructor, &contract, _context, _internal));
 
 	auto& state = _context.state();
-	std::vector<smtutil::Expression> stateExprs{state.errorFlag().currentValue(), _internal ? state.thisAddress(0) : state.thisAddress(), state.abi(0), state.crypto(0), _internal ? state.tx(0) : state.tx(), state.state()};
+	std::vector<smtutil::Expression> stateExprs = getStateExpressionsForCall(state, _internal);
 	state.newState();
 	stateExprs += std::vector<smtutil::Expression>{state.state()};
 	stateExprs += currentStateVariables(contract, _context);
@@ -152,7 +152,7 @@ std::vector<smtutil::Expression> currentFunctionVariablesForDefinition(
 )
 {
 	auto& state = _context.state();
-	std::vector<smtutil::Expression> exprs{state.errorFlag().currentValue(), state.thisAddress(0), state.abi(0), state.crypto(0), state.tx(0), state.state(0)};
+	std::vector<smtutil::Expression> exprs = getStateExpressionsForDefinition(state);
 	exprs += _contract ? initialStateVariables(*_contract, _context) : std::vector<smtutil::Expression>{};
 	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->valueAtIndex(0); });
 	exprs += std::vector<smtutil::Expression>{state.state()};
@@ -170,7 +170,7 @@ std::vector<smtutil::Expression> currentFunctionVariablesForCall(
 )
 {
 	auto& state = _context.state();
-	std::vector<smtutil::Expression> exprs{state.errorFlag().currentValue(), _internal ? state.thisAddress(0) : state.thisAddress(), state.abi(0), state.crypto(0), _internal ? state.tx(0) : state.tx(), state.state()};
+	std::vector<smtutil::Expression> exprs = getStateExpressionsForCall(state, _internal);
 	exprs += _contract ? currentStateVariables(*_contract, _context) : std::vector<smtutil::Expression>{};
 	exprs += applyMap(_function.parameters(), [&](auto _var) { return _context.variable(*_var)->currentValue(); });
 
@@ -192,4 +192,52 @@ std::vector<smtutil::Expression> currentBlockVariables(FunctionDefinition const&
 		);
 }
 
+std::vector<smtutil::Expression> getStateExpressionsForInterfacePre(SymbolicState const& _state)
+{
+	if (_state.hasBytesConcatFunction())
+		return {_state.thisAddress(0),
+			_state.abi(0), _state.bytesConcat(0), _state.crypto(0), _state.state(0)};
+return {_state.thisAddress(0), _state.abi(0),  _state.crypto(0), _state.state(0)};
+}
+
+std::vector<smtutil::Expression> getStateExpressionsForInterface(SymbolicState const& _state)
+{
+	if (_state.hasBytesConcatFunction())
+		return {_state.thisAddress(0), _state.abi(0), _state.bytesConcat(0), _state.crypto(0), _state.state()};
+	return {_state.thisAddress(0), _state.abi(0), _state.crypto(0), _state.state()};
+}
+
+std::vector<smtutil::Expression> getStateExpressionsForNondetInterface(SymbolicState const& _state)
+{
+	if (_state.hasBytesConcatFunction())
+		return {_state.errorFlag().currentValue(), _state.thisAddress(), _state.abi(), _state.bytesConcat(), _state.crypto()};
+	return {_state.errorFlag().currentValue(), _state.thisAddress(), _state.abi(), _state.crypto()};
+}
+
+std::vector<smtutil::Expression> getStateExpressionsForConstructor(SymbolicState const& _state)
+{
+	if (_state.hasBytesConcatFunction())
+		return {_state.errorFlag().currentValue(), _state.thisAddress(0), _state.abi(0),
+			_state.bytesConcat(0), _state.crypto(0), _state.tx(0), _state.state(0), _state.state()};
+	return {_state.errorFlag().currentValue(), _state.thisAddress(0), _state.abi(0),
+		_state.crypto(0), _state.tx(0), _state.state(0), _state.state()};
+}
+
+std::vector<smtutil::Expression> getStateExpressionsForCall(SymbolicState const& _state, bool _internal)
+{
+	if (_state.hasBytesConcatFunction())
+		return {_state.errorFlag().currentValue(), _internal ? _state.thisAddress(0) : _state.thisAddress(),
+			_state.abi(0), _state.bytesConcat(0), _state.crypto(0), _internal ? _state.tx(0) : _state.tx(), _state.state()};
+	return {_state.errorFlag().currentValue(), _internal ? _state.thisAddress(0) : _state.thisAddress(),
+			_state.abi(0), _state.crypto(0), _internal ? _state.tx(0) : _state.tx(), _state.state()};
+}
+
+std::vector<smtutil::Expression> getStateExpressionsForDefinition(SymbolicState const& _state)
+{
+	if (_state.hasBytesConcatFunction())
+		return {_state.errorFlag().currentValue(), _state.thisAddress(0), _state.abi(0),
+			_state.bytesConcat(0), _state.crypto(0), _state.tx(0), _state.state(0)};
+	return {_state.errorFlag().currentValue(), _state.thisAddress(0), _state.abi(0),
+		_state.crypto(0), _state.tx(0), _state.state(0)};
+}
 }
diff --git a/libsolidity/formal/PredicateInstance.h b/libsolidity/formal/PredicateInstance.h
index 42a9e2040b..33c8a8a0dd 100644
--- a/libsolidity/formal/PredicateInstance.h
+++ b/libsolidity/formal/PredicateInstance.h
@@ -19,6 +19,7 @@
 #pragma once
 
 #include <libsolidity/formal/Predicate.h>
+#include <libsolidity/formal/SymbolicState.h>
 
 namespace solidity::frontend::smt
 {
@@ -94,4 +95,10 @@ std::vector<smtutil::Expression> currentBlockVariables(
 	EncodingContext& _context
 );
 
+std::vector<smtutil::Expression> getStateExpressionsForInterfacePre(SymbolicState const& _state);
+std::vector<smtutil::Expression> getStateExpressionsForInterface(SymbolicState  const& _state);
+std::vector<smtutil::Expression> getStateExpressionsForNondetInterface(SymbolicState  const& _state);
+std::vector<smtutil::Expression> getStateExpressionsForConstructor(SymbolicState  const& _state);
+std::vector<smtutil::Expression> getStateExpressionsForCall(SymbolicState  const& _state, bool _internal);
+std::vector<smtutil::Expression> getStateExpressionsForDefinition(SymbolicState  const& _state);
 }
diff --git a/libsolidity/formal/PredicateSort.cpp b/libsolidity/formal/PredicateSort.cpp
index 2e95a29a53..0f9eae82c4 100644
--- a/libsolidity/formal/PredicateSort.cpp
+++ b/libsolidity/formal/PredicateSort.cpp
@@ -30,7 +30,10 @@ namespace solidity::frontend::smt
 SortPointer interfaceSort(ContractDefinition const& _contract, SymbolicState& _state)
 {
 	return std::make_shared<FunctionSort>(
-		std::vector<SortPointer>{_state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.stateSort()} + stateSorts(_contract),
+		std::vector<SortPointer>{_state.thisAddressSort()} +
+			getBuiltInFunctionsSorts(_state) +
+			std::vector<SortPointer>{_state.stateSort()} +
+			stateSorts(_contract),
 		SortProvider::boolSort
 	);
 }
@@ -40,7 +43,8 @@ SortPointer nondetInterfaceSort(ContractDefinition const& _contract, SymbolicSta
 	auto varSorts = stateSorts(_contract);
 	std::vector<SortPointer> stateSort{_state.stateSort()};
 	return std::make_shared<FunctionSort>(
-		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort()} +
+		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort()} +
+			getBuiltInFunctionsSorts(_state) +
 			stateSort +
 			varSorts +
 			stateSort +
@@ -57,7 +61,10 @@ SortPointer constructorSort(ContractDefinition const& _contract, SymbolicState&
 	auto varSorts = stateSorts(_contract);
 	std::vector<SortPointer> stateSort{_state.stateSort()};
 	return std::make_shared<FunctionSort>(
-		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.txSort(), _state.stateSort(), _state.stateSort()} + varSorts + varSorts,
+		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort()} +
+			getBuiltInFunctionsSorts(_state) +
+			std::vector<SortPointer>{_state.txSort(), _state.stateSort(), _state.stateSort()} +
+			varSorts + varSorts,
 		SortProvider::boolSort
 	);
 }
@@ -69,7 +76,9 @@ SortPointer functionSort(FunctionDefinition const& _function, ContractDefinition
 	auto inputSorts = applyMap(_function.parameters(), smtSort);
 	auto outputSorts = applyMap(_function.returnParameters(), smtSort);
 	return std::make_shared<FunctionSort>(
-		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort(), _state.abiSort(), _state.cryptoSort(), _state.txSort(), _state.stateSort()} +
+		std::vector<SortPointer>{_state.errorFlagSort(), _state.thisAddressSort()} +
+			getBuiltInFunctionsSorts(_state) +
+			std::vector<SortPointer>{_state.txSort(), _state.stateSort()} +
 			varSorts +
 			inputSorts +
 			std::vector<SortPointer>{_state.stateSort()} +
@@ -110,4 +119,10 @@ std::vector<SortPointer> stateSorts(ContractDefinition const& _contract)
 	);
 }
 
+std::vector<SortPointer> getBuiltInFunctionsSorts(SymbolicState& _state)
+{
+	if (_state.hasBytesConcatFunction())
+		return {_state.abiSort(), _state.bytesConcatSort(), _state.cryptoSort()};
+	return {_state.abiSort(), _state.cryptoSort()};
+}
 }
diff --git a/libsolidity/formal/PredicateSort.h b/libsolidity/formal/PredicateSort.h
index 5638582546..c5f63f2a69 100644
--- a/libsolidity/formal/PredicateSort.h
+++ b/libsolidity/formal/PredicateSort.h
@@ -74,6 +74,8 @@ smtutil::SortPointer arity0FunctionSort();
 
 /// Helpers
 
-std::vector<smtutil::SortPointer> stateSorts(ContractDefinition const& _contract) ;
+std::vector<smtutil::SortPointer> stateSorts(ContractDefinition const& _contract);
+
+std::vector<smtutil::SortPointer> getBuiltInFunctionsSorts(SymbolicState& _state);
 
 }
diff --git a/libsolidity/formal/SMTEncoder.cpp b/libsolidity/formal/SMTEncoder.cpp
index ae3a06869d..61aad0e8f5 100644
--- a/libsolidity/formal/SMTEncoder.cpp
+++ b/libsolidity/formal/SMTEncoder.cpp
@@ -651,6 +651,9 @@ void SMTEncoder::endVisit(FunctionCall const& _funCall)
 		if (publicGetter(_funCall.expression()))
 			visitPublicGetter(_funCall);
 		break;
+	case FunctionType::Kind::BytesConcat:
+		visitBytesConcat(_funCall);
+		break;
 	case FunctionType::Kind::ABIDecode:
 	case FunctionType::Kind::ABIEncode:
 	case FunctionType::Kind::ABIEncodePacked:
@@ -780,6 +783,33 @@ void SMTEncoder::visitRequire(FunctionCall const& _funCall)
 	addPathImpliedExpression(expr(*args.front()));
 }
 
+void SMTEncoder::visitBytesConcat(FunctionCall const& _funCall)
+{
+	auto const& args = _funCall.sortedArguments();
+
+	// bytes.concat call with no arguments returns an empty array
+	if (args.size() == 0)
+	{
+		defineExpr(_funCall, smt::zeroValue(TypeProvider::bytesMemory()));
+		return;
+	}
+
+	// bytes.concat with single argument of type bytes memory
+	if (args.size() == 1 && args.front()->annotation().type->category() == frontend::Type::Category::Array)
+	{
+		defineExpr(_funCall, expr(*args.front(), TypeProvider::bytesMemory()));
+		return;
+	}
+
+	auto const& [name, inTypes, outType] = state().bytesConcatFunctionTypes(&_funCall);
+	solAssert(inTypes.size() == args.size(), "");
+
+	auto symbFunction = state().bytesConcatFunction(&_funCall);
+	auto out = createSelectExpressionForFunction(symbFunction, args, inTypes, args.size());
+
+	defineExpr(_funCall, out);
+}
+
 void SMTEncoder::visitABIFunction(FunctionCall const& _funCall)
 {
 	auto symbFunction = state().abiFunction(&_funCall);
@@ -796,24 +826,8 @@ void SMTEncoder::visitABIFunction(FunctionCall const& _funCall)
 		defineExpr(_funCall, smt::zeroValue(TypeProvider::bytesMemory()));
 		return;
 	}
-	std::vector<smtutil::Expression> symbArgs;
-	for (unsigned i = 0; i < argsActualLength; ++i)
-		if (args.at(i))
-			symbArgs.emplace_back(expr(*args.at(i), inTypes.at(i)));
 
-	std::optional<smtutil::Expression> arg;
-	if (inTypes.size() == 1)
-		arg = expr(*args.at(0), inTypes.at(0));
-	else
-	{
-		auto inputSort = dynamic_cast<smtutil::ArraySort&>(*symbFunction.sort).domain;
-		arg = smtutil::Expression::tuple_constructor(
-			smtutil::Expression(std::make_shared<smtutil::SortSort>(inputSort), ""),
-			symbArgs
-		);
-	}
-
-	auto out = smtutil::Expression::select(symbFunction, *arg);
+	auto out = createSelectExpressionForFunction(symbFunction, args, inTypes, argsActualLength);
 	if (outTypes.size() == 1)
 		defineExpr(_funCall, out);
 	else
@@ -909,7 +923,6 @@ void SMTEncoder::visitObjectCreation(FunctionCall const& _funCall)
 
 	smtutil::Expression arraySize = expr(*args.front());
 	setSymbolicUnknownValue(arraySize, TypeProvider::uint256(), m_context);
-
 	auto symbArray = std::dynamic_pointer_cast<smt::SymbolicArrayVariable>(m_context.expression(_funCall));
 	solAssert(symbArray, "");
 	smt::setSymbolicZeroValue(*symbArray, m_context);
@@ -3112,6 +3125,29 @@ std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> SMTEncoder::collectA
 	return ABIFunctions(_node).abiCalls;
 }
 
+std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> SMTEncoder::collectBytesConcatCalls(ASTNode const* _node)
+{
+	struct BytesConcatFunctions: public ASTConstVisitor
+	{
+		BytesConcatFunctions(ASTNode const* _node) { _node->accept(*this); }
+		void endVisit(FunctionCall const& _funCall)
+		{
+			if (*_funCall.annotation().kind == FunctionCallKind::FunctionCall)
+				switch (dynamic_cast<FunctionType const&>(*_funCall.expression().annotation().type).kind())
+				{
+				case FunctionType::Kind::BytesConcat:
+					bytesConcatCalls.insert(&_funCall);
+					break;
+				default: {}
+				}
+		}
+
+		std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> bytesConcatCalls;
+	};
+
+	return BytesConcatFunctions(_node).bytesConcatCalls;
+}
+
 std::set<SourceUnit const*, ASTNode::CompareByID> SMTEncoder::sourceDependencies(SourceUnit const& _source)
 {
 	std::set<SourceUnit const*, ASTNode::CompareByID> sources;
@@ -3216,3 +3252,30 @@ smt::SymbolicState& SMTEncoder::state()
 {
 	return m_context.state();
 }
+
+smtutil::Expression SMTEncoder::createSelectExpressionForFunction(
+	smtutil::Expression symbFunction,
+	std::vector<frontend::ASTPointer<frontend::Expression const>> const& args,
+	frontend::TypePointers const& inTypes,
+	unsigned long argsActualLength
+)
+{
+	solAssert(argsActualLength <= args.size() && inTypes.size() == argsActualLength);
+	if (inTypes.size() == 1)
+	{
+		smtutil::Expression arg = expr(*args.at(0), inTypes.at(0));
+		return smtutil::Expression::select(symbFunction, arg);
+	}
+
+	std::vector<smtutil::Expression> symbArgs;
+	for (unsigned i = 0; i < argsActualLength; ++i)
+		if (args.at(i))
+			symbArgs.emplace_back(expr(*args.at(i), inTypes.at(i)));
+
+	auto inputSort = dynamic_cast<smtutil::ArraySort&>(*symbFunction.sort).domain;
+	smtutil::Expression arg = smtutil::Expression::tuple_constructor(
+		smtutil::Expression(std::make_shared<smtutil::SortSort>(inputSort), ""),
+		symbArgs
+	);
+	return smtutil::Expression::select(symbFunction, arg);
+}
diff --git a/libsolidity/formal/SMTEncoder.h b/libsolidity/formal/SMTEncoder.h
index 69010fb1cf..be676930ca 100644
--- a/libsolidity/formal/SMTEncoder.h
+++ b/libsolidity/formal/SMTEncoder.h
@@ -122,6 +122,7 @@ class SMTEncoder: public ASTConstVisitor
 	static RationalNumberType const* isConstant(Expression const& _expr);
 
 	static std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> collectABICalls(ASTNode const* _node);
+	static std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> collectBytesConcatCalls(ASTNode const* _node);
 
 	/// @returns all the sources that @param _source depends on,
 	/// including itself.
@@ -211,6 +212,7 @@ class SMTEncoder: public ASTConstVisitor
 	void visitAssert(FunctionCall const& _funCall);
 	void visitRequire(FunctionCall const& _funCall);
 	void visitABIFunction(FunctionCall const& _funCall);
+	void visitBytesConcat(FunctionCall const& _funCall);
 	void visitCryptoFunction(FunctionCall const& _funCall);
 	void visitGasLeft(FunctionCall const& _funCall);
 	virtual void visitAddMulMod(FunctionCall const& _funCall);
@@ -500,6 +502,14 @@ class SMTEncoder: public ASTConstVisitor
 	langutil::CharStreamProvider const& m_charStreamProvider;
 
 	smt::SymbolicState& state();
+
+private:
+	smtutil::Expression createSelectExpressionForFunction(
+		smtutil::Expression symbFunction,
+		std::vector<frontend::ASTPointer<frontend::Expression const>> const& args,
+		frontend::TypePointers const& inTypes,
+		unsigned long argsActualLength
+	);
 };
 
 }
diff --git a/libsolidity/formal/SymbolicState.cpp b/libsolidity/formal/SymbolicState.cpp
index 3859e99c62..bf835b801d 100644
--- a/libsolidity/formal/SymbolicState.cpp
+++ b/libsolidity/formal/SymbolicState.cpp
@@ -268,16 +268,19 @@ void SymbolicState::prepareForSourceUnit(SourceUnit const& _source, bool _storag
 	auto allSources = _source.referencedSourceUnits(true);
 	allSources.insert(&_source);
 	std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> abiCalls;
+	std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> bytesConcatCalls;
 	std::set<ContractDefinition const*, ASTCompareByID<ContractDefinition>> contracts;
 	for (auto const& source: allSources)
 	{
 		abiCalls += SMTEncoder::collectABICalls(source);
+		bytesConcatCalls += SMTEncoder::collectBytesConcatCalls(source);
 		for (auto node: source->nodes())
 			if (auto contract = dynamic_cast<ContractDefinition const*>(node.get()))
 				contracts.insert(contract);
 	}
 	buildState(contracts, _storage);
 	buildABIFunctions(abiCalls);
+	buildBytesConcatFunctions(bytesConcatCalls);
 }
 
 /// Private helpers.
@@ -355,6 +358,80 @@ void SymbolicState::buildState(std::set<ContractDefinition const*, ASTCompareByI
 	);
 }
 
+void SymbolicState::buildBytesConcatFunctions(std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> const& _bytesConcatCalls)
+{
+	std::map<std::string, SortPointer> functions;
+
+	for (auto const* funCall: _bytesConcatCalls)
+	{
+		auto t = dynamic_cast<FunctionType const*>(funCall->expression().annotation().type);
+		solAssert(t->kind() == FunctionType::Kind::BytesConcat, "Expected bytes.concat function");
+
+		auto const& args = funCall->sortedArguments();
+
+		auto argTypes = [](auto const& _args) {
+			return util::applyMap(_args, [](auto arg) { return arg->annotation().type; });
+		};
+
+		// bytes.concat : (bytes/literal/fixed bytes, ... ) -> bytes
+		std::vector<frontend::Type const*> inTypes = argTypes(args);
+
+		auto replaceUserDefinedValueTypes = [](auto& _types) {
+			for (auto& t: _types)
+				if (auto userType = dynamic_cast<UserDefinedValueType const*>(t))
+					t = &userType->underlyingType();
+		};
+		auto replaceStringLiteralTypes = [](auto& _types) {
+			for (auto& t: _types)
+				if (t->category() == frontend::Type::Category::StringLiteral)
+					t = TypeProvider::bytesMemory();
+		};
+		replaceUserDefinedValueTypes(inTypes);
+		replaceStringLiteralTypes(inTypes);
+
+		auto name = t->richIdentifier();
+		for (auto paramType: inTypes)
+			name += "_" + paramType->richIdentifier();
+
+		frontend::Type const* outType = TypeProvider::bytesMemory();
+		name += "_" + outType->richIdentifier();
+
+		m_bytesConcatMembers[funCall] = {name, inTypes, outType};
+
+		if (functions.count(name))
+			continue;
+
+		/// If there is only one parameter, we use that type directly.
+		/// Otherwise we create a tuple wrapping the necessary types.
+		auto typesToSort = [](auto const& _types, std::string const& _name) -> std::shared_ptr<Sort> {
+			if (_types.size() == 1)
+				return smtSortAbstractFunction(*_types.front());
+
+			std::vector<std::string> inNames;
+			std::vector<SortPointer> sorts;
+			for (unsigned i = 0; i < _types.size(); ++i)
+			{
+				inNames.emplace_back(_name + "_input_" + std::to_string(i));
+				sorts.emplace_back(smtSortAbstractFunction(*_types.at(i)));
+			}
+			return std::make_shared<smtutil::TupleSort>(
+				_name + "_input",
+				inNames,
+				sorts
+			);
+		};
+
+		auto functionSort = std::make_shared<smtutil::ArraySort>(
+			typesToSort(inTypes, name),
+			smtSortAbstractFunction(*outType)
+		);
+
+		functions[name] = functionSort;
+	}
+
+	m_bytesConcat = std::make_unique<BlockchainVariable>("bytesConcat", std::move(functions), m_context);
+}
+
 void SymbolicState::buildABIFunctions(std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> const& _abiFunctions)
 {
 	std::map<std::string, SortPointer> functions;
@@ -367,7 +444,6 @@ void SymbolicState::buildABIFunctions(std::set<FunctionCall const*, ASTCompareBy
 		auto const& paramTypes = t->parameterTypes();
 		auto const& returnTypes = t->returnParameterTypes();
 
-
 		auto argTypes = [](auto const& _args) {
 			return util::applyMap(_args, [](auto arg) { return arg->annotation().type; });
 		};
@@ -493,3 +569,14 @@ SymbolicState::SymbolicABIFunction const& SymbolicState::abiFunctionTypes(Functi
 {
 	return m_abiMembers.at(_funCall);
 }
+
+smtutil::Expression SymbolicState::bytesConcatFunction(frontend::FunctionCall const* _funCall)
+{
+	solAssert(m_bytesConcat, "");
+	return m_bytesConcat->member(std::get<0>(m_bytesConcatMembers.at(_funCall)));
+}
+
+SymbolicState::SymbolicBytesConcatFunction const& SymbolicState::bytesConcatFunctionTypes(FunctionCall const* _funCall) const
+{
+	return m_bytesConcatMembers.at(_funCall);
+}
diff --git a/libsolidity/formal/SymbolicState.h b/libsolidity/formal/SymbolicState.h
index 7fe5b028d6..ac018df1ac 100644
--- a/libsolidity/formal/SymbolicState.h
+++ b/libsolidity/formal/SymbolicState.h
@@ -182,7 +182,21 @@ class SymbolicState
 	smtutil::Expression abi() const { solAssert(m_abi, ""); return m_abi->value(); }
 	smtutil::Expression abi(unsigned _idx) const { solAssert(m_abi, ""); return m_abi->value(_idx); }
 	smtutil::SortPointer const& abiSort() const { solAssert(m_abi, ""); return m_abi->sort(); }
-	void newABI() { solAssert(m_abi, ""); m_abi->newVar(); }
+	//@}
+
+	/// bytes.concat functions.
+	//@{
+	smtutil::Expression bytesConcatFunction(FunctionCall const* _funCall);
+	using SymbolicBytesConcatFunction = std::tuple<
+		std::string,
+		std::vector<frontend::Type const*>,
+		frontend::Type const*
+	>;
+	SymbolicBytesConcatFunction const& bytesConcatFunctionTypes(FunctionCall const* _funCall) const;
+	smtutil::Expression bytesConcat() const { solAssert(m_bytesConcat, ""); return m_bytesConcat->value(); }
+	smtutil::Expression bytesConcat(unsigned _idx) const { solAssert(m_bytesConcat, ""); return m_bytesConcat->value(_idx); }
+	smtutil::SortPointer const& bytesConcatSort() const { solAssert(m_bytesConcat, ""); return m_bytesConcat->sort(); }
+	bool hasBytesConcatFunction() const {solAssert(m_bytesConcat, ""); return !m_bytesConcatMembers.empty(); }
 	//@}
 
 private:
@@ -196,6 +210,9 @@ class SymbolicState
 	/// Builds m_abi based on the abi.* calls _abiFunctions.
 	void buildABIFunctions(std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> const& _abiFunctions);
 
+	/// Builds m_bytesConcat based on the bytes.concat calls
+	void buildBytesConcatFunctions(std::set<FunctionCall const*, ASTCompareByID<FunctionCall>> const& _bytesConcatCalls);
+
 	EncodingContext& m_context;
 
 	SymbolicIntVariable m_error{
@@ -278,6 +295,12 @@ class SymbolicState
 	/// Maps ABI functions calls to their tuple names generated by
 	/// `buildABIFunctions`.
 	std::map<FunctionCall const*, SymbolicABIFunction> m_abiMembers;
+
+	/// Tuple containing all used bytes.concat functions.
+	std::unique_ptr<BlockchainVariable> m_bytesConcat;
+	/// Maps bytes.concat functions calls to their tuple names generated by
+	/// `buildBytesConcatFunctions`.
+	std::map<FunctionCall const*, SymbolicBytesConcatFunction> m_bytesConcatMembers;
 };
 
 }
diff --git a/test/libsolidity/smtCheckerTests/bytes_concat/equals.sol b/test/libsolidity/smtCheckerTests/bytes_concat/equals.sol
new file mode 100644
index 0000000000..334a2e0c5f
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/bytes_concat/equals.sol
@@ -0,0 +1,52 @@
+contract C {
+
+	function concatCall(bytes8 a) public pure returns (bytes memory) {
+		return bytes.concat(a, a);
+	}
+
+	function equalArguments1(bytes8 a, bytes8 b, bytes8 c, bytes8 d) public pure {
+		require(a == c);
+		require(b == d);
+		bytes memory concat1 = bytes.concat(a, b);
+		bytes memory concat2 = bytes.concat(c, d);
+		assert(keccak256(concat1) == keccak256(concat2));
+	}
+
+	function equalArguments2(bytes8 a, bytes8 c) public pure {
+		require(a == c);
+		bytes memory concat1 = bytes.concat(a, concatCall(a));
+		bytes memory concat2 = bytes.concat(c, concatCall(c));
+		assert(keccak256(concat1) == keccak256(concat2));
+	}
+
+	function equalLengthFixedBytes(bytes8 a, bytes8 b) public pure {
+		bytes memory concat1 = bytes.concat(a, b);
+		bytes memory concat2 = bytes.concat(a, b);
+		assert(concat1.length == concat2.length);
+	}
+
+	function equalLengthMemoryBytes(bytes memory a, bytes memory b) public pure {
+		bytes memory concat1 = bytes.concat(a, b);
+		bytes memory concat2 = bytes.concat(a, b);
+		assert(concat1.length == concat2.length);
+	}
+
+	function equalLengthMixed(bytes memory a, bytes2 b) public pure {
+		bytes memory concat1 = bytes.concat(a, b);
+		bytes memory concat2 = bytes.concat(a, b);
+		assert(concat1.length == concat2.length);
+	}
+
+	function equalLengthLiterals() public pure {
+		bytes memory a = hex"aa";
+		bytes1 b = bytes1(0xbb);
+		bytes memory c = "c";
+		bytes memory concat1 = bytes.concat(a, b, c);
+		bytes memory concat2 = bytes.concat(a, b, c);
+		assert(concat1.length == concat2.length);
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Info 1391: CHC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bytes_concat/one_arg_call.sol b/test/libsolidity/smtCheckerTests/bytes_concat/one_arg_call.sol
new file mode 100644
index 0000000000..4f539f3184
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/bytes_concat/one_arg_call.sol
@@ -0,0 +1,10 @@
+contract C {
+	function oneArg(bytes memory a) public pure {
+		bytes memory concat = bytes.concat(a);
+		assert(keccak256(a) == keccak256(concat));
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/bytes_concat/simple.sol b/test/libsolidity/smtCheckerTests/bytes_concat/simple.sol
new file mode 100644
index 0000000000..834d89ee9b
--- /dev/null
+++ b/test/libsolidity/smtCheckerTests/bytes_concat/simple.sol
@@ -0,0 +1,35 @@
+contract C {
+	function zeroArgs() public pure returns(bytes memory) {
+		bytes memory a = bytes.concat();
+		assert(a.length == 0); // zero args call is an empty bytes array
+		return bytes.concat();
+	}
+
+	function oneArg(bytes memory a) public pure returns(bytes memory) {
+		return bytes.concat(a);
+	}
+
+	function oneArgFixedBytes(bytes8 a) public pure returns(bytes memory) {
+		return bytes.concat(a);
+	}
+
+	function fixedBytes(bytes8 a, bytes8 b) public pure returns(bytes memory) {
+		return bytes.concat(a, b);
+	}
+
+	function memoryBytes(bytes memory a, bytes memory b) public pure returns(bytes memory) {
+		return bytes.concat(a, b);
+	}
+
+	function mixed(bytes memory a, bytes2 b) public pure returns(bytes memory) {
+		return bytes.concat(a, b, "StringLiteral");
+	}
+
+	function functionCallAsArg(bytes memory a) public pure returns(bytes memory) {
+		return bytes.concat(oneArg(a), zeroArgs());
+	}
+}
+// ====
+// SMTEngine: all
+// ----
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
index eb0a0c0498..09f001719f 100644
--- a/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
+++ b/test/libsolidity/smtCheckerTests/deployment/deploy_trusted_flow.sol
@@ -21,8 +21,10 @@ contract C {
 // SMTIgnoreOS: macos
 // ----
 // Warning 4984: (47-50): CHC: Overflow (resulting value larger than 2**256 - 1) might happen here.
+// Warning 6328: (167-185): CHC: Assertion violation might happen here.
 // Warning 6328: (215-233): CHC: Assertion violation might happen here.
 // Warning 6328: (304-322): CHC: Assertion violation happens here.
-// Info 1391: CHC: 2 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 2661: (47-50): BMC: Overflow (resulting value larger than 2**256 - 1) happens here.
+// Warning 4661: (167-185): BMC: Assertion violation happens here.
 // Warning 4661: (215-233): BMC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
index d18f605f7c..32c9780d11 100644
--- a/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
+++ b/test/libsolidity/smtCheckerTests/operators/index_access_side_effect.sol
@@ -23,6 +23,4 @@ contract C {
 // SMTIgnoreCex: yes
 // SMTIgnoreOS: macos
 // ----
-// Warning 6328: (335-354): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
-// Warning 4661: (335-354): BMC: Assertion violation happens here.
+// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
index a6cad9580f..b734079c7d 100644
--- a/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
+++ b/test/libsolidity/smtCheckerTests/operators/userDefined/user_defined_operator_matches_equivalent_function_call.sol
@@ -63,12 +63,15 @@ contract C {
 // Warning 4984: (953-982): CHC: Overflow (resulting value larger than 32767) might happen here.
 // Warning 4984: (1051-1080): CHC: Overflow (resulting value larger than 32767) might happen here.
 // Warning 4281: (1051-1080): CHC: Division by zero might happen here.
-// Warning 4281: (1149-1178): CHC: Division by zero happens here.
+// Warning 4281: (1149-1178): CHC: Division by zero might happen here.
+// Warning 6328: (2069-2095): CHC: Assertion violation might happen here.
 // Warning 6328: (2105-2131): CHC: Assertion violation might happen here.
 // Warning 6328: (2141-2163): CHC: Assertion violation might happen here.
+// Warning 6328: (2173-2199): CHC: Assertion violation might happen here.
 // Warning 6328: (2209-2235): CHC: Assertion violation might happen here.
 // Warning 6328: (2245-2271): CHC: Assertion violation might happen here.
-// Info 1391: CHC: 12 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 1391: CHC: 10 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
 // Warning 3046: (1051-1080): BMC: Division by zero happens here.
+// Warning 3046: (1149-1178): BMC: Division by zero happens here.
 // Warning 7812: (2245-2271): BMC: Assertion violation might happen here.
-// Info 6002: BMC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Info 6002: BMC: 6 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
index 2d3448ee7b..368e9c922f 100644
--- a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
@@ -1,10 +1,10 @@
 contract C {
 	function(uint) returns (uint) a;
 	function(uint) returns (uint) b;
-    function f(function(uint) returns (uint) g, function(uint) returns (uint) h) internal {
+	function f(function(uint) returns (uint) g, function(uint) returns (uint) h) internal {
 		assert(g(2) == h(2));
 		assert(g == h);
-    }
+	}
 	function g() public {
 		f(a, b);
 	}
@@ -12,11 +12,11 @@ contract C {
 // ====
 // SMTEngine: all
 // ----
-// Warning 2519: (96-127): This declaration shadows an existing declaration.
-// Warning 6031: (182-186): Internal error: Expression undefined for SMT solver.
-// Warning 6031: (190-194): Internal error: Expression undefined for SMT solver.
-// Warning 7229: (206-212): Assertion checker does not yet implement the type function (uint256) returns (uint256) for comparisons
-// Warning 5729: (182-186): BMC does not yet implement this type of function call.
-// Warning 5729: (190-194): BMC does not yet implement this type of function call.
-// Warning 6328: (175-195): CHC: Assertion violation happens here.
-// Warning 6328: (199-213): CHC: Assertion violation happens here.
+// Warning 2519: (93-124): This declaration shadows an existing declaration.
+// Warning 6031: (179-183): Internal error: Expression undefined for SMT solver.
+// Warning 6031: (187-191): Internal error: Expression undefined for SMT solver.
+// Warning 7229: (203-209): Assertion checker does not yet implement the type function (uint256) returns (uint256) for comparisons
+// Warning 5729: (179-183): BMC does not yet implement this type of function call.
+// Warning 5729: (187-191): BMC does not yet implement this type of function call.
+// Warning 6328: (172-192): CHC: Assertion violation happens here.
+// Warning 6328: (196-210): CHC: Assertion violation happens here.
diff --git a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
index 5ac20c96f8..fce5869877 100644
--- a/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
+++ b/test/libsolidity/smtCheckerTests/types/array_mapping_aliasing_2.sol
@@ -45,4 +45,5 @@ contract C
 // Warning 6368: (850-866): CHC: Out of bounds access happens here.
 // Warning 6368: (850-869): CHC: Out of bounds access happens here.
 // Warning 6328: (936-956): CHC: Assertion violation happens here.
-// Info 1391: CHC: 4 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
+// Warning 6368: (1029-1043): CHC: Out of bounds access might happen here.
+// Info 1391: CHC: 3 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.

From 1b75d489c56ace26ccc18d2208ba1b881cb1e6dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 23 Jan 2024 16:39:18 +0100
Subject: [PATCH 1716/1748] More basic tests for memory guard

---
 .../memoryGuardTests/marked_empty.sol            | 12 ++++++++++++
 .../marked_with_memory_access.sol                | 16 ++++++++++++++++
 .../memoryGuardTests/unmarked_empty.sol          | 12 ++++++++++++
 .../unmarked_with_memory_access.sol              |  8 --------
 .../unmarked_with_memory_access_mstore.sol       | 16 ++++++++++++++++
 5 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 test/libsolidity/memoryGuardTests/marked_empty.sol
 create mode 100644 test/libsolidity/memoryGuardTests/marked_with_memory_access.sol
 create mode 100644 test/libsolidity/memoryGuardTests/unmarked_empty.sol
 delete mode 100644 test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol
 create mode 100644 test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mstore.sol

diff --git a/test/libsolidity/memoryGuardTests/marked_empty.sol b/test/libsolidity/memoryGuardTests/marked_empty.sol
new file mode 100644
index 0000000000..faae617a25
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/marked_empty.sol
@@ -0,0 +1,12 @@
+contract C {
+    constructor() {
+        assembly ("memory-safe") {}
+    }
+
+    function f() public {
+        assembly ("memory-safe") {}
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/marked_with_memory_access.sol b/test/libsolidity/memoryGuardTests/marked_with_memory_access.sol
new file mode 100644
index 0000000000..8ceb0b1a1f
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/marked_with_memory_access.sol
@@ -0,0 +1,16 @@
+contract C {
+    constructor() {
+        assembly ("memory-safe") {
+            mstore(0, 1)
+        }
+    }
+
+    function store() public {
+        assembly ("memory-safe") {
+            mstore(0, 1)
+        }
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/unmarked_empty.sol b/test/libsolidity/memoryGuardTests/unmarked_empty.sol
new file mode 100644
index 0000000000..c87e88936a
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/unmarked_empty.sol
@@ -0,0 +1,12 @@
+contract C {
+    constructor() {
+        assembly {}
+    }
+
+    function f() public {
+        assembly {}
+    }
+}
+// ----
+// :C(creation) true
+// :C(runtime) true
diff --git a/test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol b/test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol
deleted file mode 100644
index 88f826fdb9..0000000000
--- a/test/libsolidity/memoryGuardTests/unmarked_with_memory_access.sol
+++ /dev/null
@@ -1,8 +0,0 @@
-contract C {
-    function f() public pure {
-        assembly { mstore(0,0) }
-    }
-}
-// ----
-// :C(creation) true
-// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mstore.sol b/test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mstore.sol
new file mode 100644
index 0000000000..3cf05a7916
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mstore.sol
@@ -0,0 +1,16 @@
+contract C {
+    constructor() {
+        assembly {
+            mstore(0, 1)
+        }
+    }
+
+    function store() public {
+        assembly {
+            mstore(0, 1)
+        }
+    }
+}
+// ----
+// :C(creation) false
+// :C(runtime) false

From 1a8020260d3598e525ae9c0640648f4fc506f024 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 23 Jan 2024 16:39:13 +0100
Subject: [PATCH 1717/1748] A few extra optimizer tests for MSTORE

---
 .../equalStoreEliminator/mstore8_mstore8.yul  | 21 ++++++++++++++
 .../equalStoreEliminator/mstore_mstore.yul    | 20 +++++++++++++
 .../mstore_overwriting_mstore.yul             | 28 +++++++++++++++++++
 3 files changed, 69 insertions(+)
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mstore8_mstore8.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_mstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mstore_overwriting_mstore.yul

diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore8_mstore8.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore8_mstore8.yul
new file mode 100644
index 0000000000..e907a30170
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore8_mstore8.yul
@@ -0,0 +1,21 @@
+{
+    let _0 := 0
+    let _31 := 31
+
+    calldatacopy(0, 0, 0x40)
+    let mem31 := mload(_31)
+
+    mstore8(_0, mem31)
+    mstore8(_0, mem31) // Redundant with previous MSTORE8.
+}
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _31 := 31
+//     calldatacopy(0, 0, 0x40)
+//     let mem31 := mload(_31)
+//     mstore8(_0, mem31)
+//     mstore8(_0, mem31)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_mstore.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_mstore.yul
new file mode 100644
index 0000000000..b133a68f66
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_mstore.yul
@@ -0,0 +1,20 @@
+{
+    let _0 := 0
+    let _32 := 32
+
+    calldatacopy(0, 0, 0x40)
+    let mem32 := mload(_32)
+
+    mstore(_0, mem32)  // Redundant. Overwritten by MSTORE.
+    mstore(_0, mem32)
+}
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _32 := 32
+//     calldatacopy(0, 0, 0x40)
+//     let mem32 := mload(_32)
+//     mstore(_0, mem32)
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mstore_overwriting_mstore.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mstore_overwriting_mstore.yul
new file mode 100644
index 0000000000..83208b8eed
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mstore_overwriting_mstore.yul
@@ -0,0 +1,28 @@
+{
+    calldatacopy(0, 0, 0x20)
+
+    let _0 := 0
+    let _42 := 42
+    let _123 := 123
+
+    mstore(_0, _42) // Redundant. MSTORE overwrites it.
+    mstore(_0, _123)
+
+    return(0, 0x20)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let _1 := 0x20
+//         let _2 := 0
+//         let _3 := 0
+//         let _0 := 0
+//         let _42 := 42
+//         mstore(_0, 123)
+//         return(0, 0x20)
+//     }
+// }

From bd762785eb568d533bfc0a8d898e4bc2b95486b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Jan 2024 19:02:04 +0100
Subject: [PATCH 1718/1748] Yul builtin for MCOPY

---
 Changelog.md                                  |   1 +
 docs/grammar/SolidityLexer.g4                 |   2 +-
 docs/using-the-compiler.rst                   |   1 +
 docs/yul.rst                                  |   2 +
 libevmasm/GasMeter.cpp                        |  10 ++
 libevmasm/Instruction.cpp                     |   2 +
 libevmasm/Instruction.h                       |   1 +
 libevmasm/SemanticInformation.cpp             |  22 +++-
 libevmasm/SimplificationRule.h                |   1 +
 liblangutil/EVMVersion.cpp                    |   2 +
 liblangutil/EVMVersion.h                      |   1 +
 libyul/AsmAnalysis.cpp                        |   3 +
 libyul/backends/evm/EVMDialect.cpp            |  10 +-
 libyul/optimiser/UnusedStoreEliminator.cpp    |   3 +
 scripts/test_antlr_grammar.sh                 |   2 +
 test/libsolidity/GasMeter.cpp                 | 108 ++++++++++++++++++
 .../unmarked_with_memory_access_mcopy.sol     |  18 +++
 ...ked_with_memory_access_mcopy_zero_size.sol |  18 +++
 .../semanticTests/inlineAssembly/mcopy.sol    |  14 +++
 .../mcopy_as_identifier_pre_cancun.sol        |  22 ++++
 .../inlineAssembly/mcopy_empty.sol            |  18 +++
 .../inlineAssembly/mcopy_overlap.sol          |  39 +++++++
 .../syntaxTests/inlineAssembly/mcopy.sol      |  10 ++
 .../inlineAssembly/mcopy_pre_cancun.sol       |  11 ++
 .../inlineAssembly/mcopy_reserved_cancun.sol  |  21 ++++
 ...embly_instructions_allowed_pure_cancun.sol |   9 ++
 ...embly_instructions_allowed_view_cancun.sol |   1 +
 .../viewPureChecker/mcopy_pure.sol            |   9 ++
 test/libyul/yulInterpreterTests/mcopy.yul     |  34 ++++++
 .../mcopy_memory_access_out_of_range.yul      |  21 ++++
 .../mcopy_memory_expansion_on_read.yul        |  12 ++
 .../mcopy_memory_expansion_on_write.yul       |  13 +++
 .../mcopy_memory_expansion_zero_size.yul      |  13 +++
 .../yulInterpreterTests/mcopy_overlap.yul     |  21 ++++
 .../equalStoreEliminator/mcopy.yul            |  19 +++
 .../equalStoreEliminator/mcopy_mstore.yul     |  23 ++++
 .../mcopy_mstore_overlap.yul                  |  29 +++++
 .../equalStoreEliminator/mcopy_same_area.yul  |  19 +++
 .../mcopy_same_area_mcopy.yul                 |  21 ++++
 .../mcopy_same_read_area_mcopy.yul            |  23 ++++
 .../mcopy_same_read_area_mstore.yul           |  23 ++++
 .../mcopy_same_read_area_mstore8_mstore8.yul  |  27 +++++
 .../mcopy_same_read_area_mstore_mstore.yul    |  25 ++++
 ...y_same_read_area_mstore_mstore_overlap.yul |  27 +++++
 .../mcopy_same_write_area_mcopy.yul           |  23 ++++
 .../equalStoreEliminator/mstore_mcopy.yul     |  23 ++++
 .../mcopy_non_zero_size.sol                   |  22 ++++
 .../expressionSimplifier/mcopy_zero_size.sol  |  21 ++++
 .../yulOptimizerTests/fullSuite/mcopy.sol     |  23 ++++
 .../fullSuite/mcopy_redundant_overwritten.sol |  21 ++++
 .../fullSuite/mcopy_redundant_same_area.sol   |  19 +++
 .../fullSuite/mcopy_redundant_zero_size.sol   |  19 +++
 .../mcopy_mcopy_no_overlap.yul                |  31 +++++
 .../mcopy_mstore_no_overlap.yul               |  31 +++++
 .../mcopy_non_overlapping_areas.yul           |  24 ++++
 .../mcopy_overlapping_areas.yul               |  25 ++++
 .../mcopy_overwriting_mcopy.yul               |  26 +++++
 .../mcopy_overwriting_mstore.yul              |  27 +++++
 .../mcopy_overwriting_mstore_overlap.yul      |  32 ++++++
 .../mcopy_reading_mcopy.yul                   |  31 +++++
 .../mcopy_reading_mstore.yul                  |  32 ++++++
 .../mcopy_reading_mstore8.yul                 |  34 ++++++
 .../mcopy_reading_mstore_overhang.yul         |  34 ++++++
 .../mcopy_reading_mstore_overlap.yul          |  36 ++++++
 .../mcopy_reading_mstore_underhang.yul        |  36 ++++++
 ...ading_writing_overlapping_areas_mstore.yul |  34 ++++++
 .../mcopy_reading_writing_same_area_mcopy.yul |  30 +++++
 ...mcopy_reading_writing_same_area_mstore.yul |  34 ++++++
 ...copy_reading_writing_same_area_mstore8.yul |  32 ++++++
 ...ading_writing_same_area_mstore_overlap.yul |  34 ++++++
 .../unusedStoreEliminator/mcopy_same_area.yul |  23 ++++
 ...copy_same_write_area_overwriting_mcopy.yul |  28 +++++
 .../unusedStoreEliminator/mcopy_sstore.yul    |  32 ++++++
 .../mload_reading_mcopy.yul                   |  32 ++++++
 .../mstore_overwriting_mcopy.yul              |  28 +++++
 test/libyul/yulSyntaxTests/mcopy.yul          |   5 +
 .../yulSyntaxTests/mcopy_as_identifier.yul    |  14 +++
 .../mcopy_as_identifier_pre_cancun.yul        |  12 ++
 .../yulSyntaxTests/mcopy_pre_cancun.yul       |  12 ++
 .../yulSyntaxTests/mcopy_wrong_args.yul       |  13 +++
 .../EVMInstructionInterpreter.cpp             |  27 +++++
 .../EVMInstructionInterpreter.h               |  13 +++
 82 files changed, 1681 insertions(+), 3 deletions(-)
 create mode 100644 test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mcopy.sol
 create mode 100644 test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mcopy_zero_size.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/mcopy.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/mcopy_as_identifier_pre_cancun.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/mcopy_empty.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/mcopy_overlap.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/mcopy.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/mcopy_pre_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/mcopy_reserved_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/mcopy_pure.sol
 create mode 100644 test/libyul/yulInterpreterTests/mcopy.yul
 create mode 100644 test/libyul/yulInterpreterTests/mcopy_memory_access_out_of_range.yul
 create mode 100644 test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_read.yul
 create mode 100644 test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_write.yul
 create mode 100644 test/libyul/yulInterpreterTests/mcopy_memory_expansion_zero_size.yul
 create mode 100644 test/libyul/yulInterpreterTests/mcopy_overlap.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_mstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_mstore_overlap.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_area.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_area_mcopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mcopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore8_mstore8.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore_mstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore_mstore_overlap.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_write_area_mcopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_mcopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/expressionSimplifier/mcopy_non_zero_size.sol
 create mode 100644 test/libyul/yulOptimizerTests/expressionSimplifier/mcopy_zero_size.sol
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/mcopy.sol
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_overwritten.sol
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_same_area.sol
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_zero_size.sol
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_mcopy_no_overlap.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_mstore_no_overlap.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_non_overlapping_areas.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overlapping_areas.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mcopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mstore_overlap.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mcopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore8.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_overhang.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_overlap.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_underhang.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_overlapping_areas_mstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mcopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore8.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore_overlap.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_same_area.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_same_write_area_overwriting_mcopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_sstore.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mload_reading_mcopy.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/mstore_overwriting_mcopy.yul
 create mode 100644 test/libyul/yulSyntaxTests/mcopy.yul
 create mode 100644 test/libyul/yulSyntaxTests/mcopy_as_identifier.yul
 create mode 100644 test/libyul/yulSyntaxTests/mcopy_as_identifier_pre_cancun.yul
 create mode 100644 test/libyul/yulSyntaxTests/mcopy_pre_cancun.yul
 create mode 100644 test/libyul/yulSyntaxTests/mcopy_wrong_args.yul

diff --git a/Changelog.md b/Changelog.md
index 19b71804a2..ea9cd13676 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -5,6 +5,7 @@ Language Features:
  * Introduce global function ``blobhash(uint)`` for retrieving versioned hashes of blobs, akin to the homonymous Yul builtin.
  * Yul: Introduce builtin ``blobbasefee()`` for retrieving the blob base fee of the current block.
  * Yul: Introduce builtin ``blobhash()`` for retrieving versioned hashes of blobs associated with the transaction.
+ * Yul: Introduce builtin ``mcopy()`` for cheaply copying data between memory areas.
 
 Compiler Features:
 * EVM: Support for the EVM Version "Cancun".
diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index b553c3b79c..91d6b41774 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -301,7 +301,7 @@ YulEVMBuiltin:
 	| 'pop' | 'mload' | 'mstore' | 'mstore8' | 'sload' | 'sstore' | 'msize' | 'gas'
 	| 'address' | 'balance' | 'selfbalance' | 'caller' | 'callvalue' | 'calldataload'
 	| 'calldatasize' | 'calldatacopy' | 'extcodesize' | 'extcodecopy' | 'returndatasize'
-	| 'returndatacopy' | 'extcodehash' | 'create' | 'create2' | 'call' | 'callcode'
+	| 'returndatacopy' | 'mcopy' | 'extcodehash' | 'create' | 'create2' | 'call' | 'callcode'
 	| 'delegatecall' | 'staticcall' | 'return' | 'revert' | 'selfdestruct' | 'invalid'
 	| 'log0' | 'log1' | 'log2' | 'log3' | 'log4' | 'chainid' | 'origin' | 'gasprice'
 	| 'blockhash' | 'blobhash' | 'coinbase' | 'timestamp' | 'number' | 'difficulty'
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 93bdff8661..bb495c8155 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -179,6 +179,7 @@ at each version. Backward compatibility is not guaranteed between each version.
 - ``cancun``
    - The block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_) can be accessed via the global ``block.blobbasefee`` or ``blobbasefee()`` in inline assembly.
    - Introduces ``blobhash()`` in inline assembly and a corresponding global function to retrieve versioned hashes of blobs associated with the transaction (see `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_).
+   - Opcode ``mcopy`` is available in assembly (see `EIP-5656 <https://eips.ethereum.org/EIPS/eip-5656>`_).
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
diff --git a/docs/yul.rst b/docs/yul.rst
index 2f0dc19dc8..482e80ea13 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -865,6 +865,8 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | returndatacopy(t, f, s) | `-` | B | copy s bytes from returndata at position f to mem at position t |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+| mcopy(t, f, s)          | `-` | N | copy s bytes from mem at position f to mem at position t        |
++-------------------------+-----+---+-----------------------------------------------------------------+
 | extcodehash(a)          |     | C | code hash of address a                                          |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | create(v, p, n)         |     | F | create new contract with code mem[p...(p+n)) and send v wei     |
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
index 271a6ce2de..6594d1ff6c 100644
--- a/libevmasm/GasMeter.cpp
+++ b/libevmasm/GasMeter.cpp
@@ -115,6 +115,16 @@ GasMeter::GasConsumption GasMeter::estimateMax(AssemblyItem const& _item, bool _
 			gas += memoryGas(0, -2);
 			gas += wordGas(GasCosts::copyGas, m_state->relativeStackElement(-2));
 			break;
+		case Instruction::MCOPY:
+		{
+			GasConsumption memoryGasFromRead = memoryGas(-1, -2);
+			GasConsumption memoryGasFromWrite = memoryGas(0, -2);
+
+			gas = runGas(_item.instruction(), m_evmVersion);
+			gas += (memoryGasFromRead < memoryGasFromWrite ? memoryGasFromWrite : memoryGasFromRead);
+			gas += wordGas(GasCosts::copyGas, m_state->relativeStackElement(-2));
+			break;
+		}
 		case Instruction::EXTCODESIZE:
 			gas = GasCosts::extCodeGas(m_evmVersion);
 			break;
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index 611b17647e..c00bc35421 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -70,6 +70,7 @@ std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
 	{ "EXTCODECOPY", Instruction::EXTCODECOPY },
 	{ "RETURNDATASIZE", Instruction::RETURNDATASIZE },
 	{ "RETURNDATACOPY", Instruction::RETURNDATACOPY },
+	{ "MCOPY", Instruction::MCOPY },
 	{ "EXTCODEHASH", Instruction::EXTCODEHASH },
 	{ "BLOCKHASH", Instruction::BLOCKHASH },
 	{ "BLOBHASH", Instruction::BLOBHASH },
@@ -222,6 +223,7 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::EXTCODECOPY,	{ "EXTCODECOPY",	0, 4, 0, true, Tier::ExtCode } },
 	{ Instruction::RETURNDATASIZE,	{"RETURNDATASIZE",	0, 0, 1, false, Tier::Base } },
 	{ Instruction::RETURNDATACOPY,	{"RETURNDATACOPY",	0, 3, 0, true, Tier::VeryLow } },
+	{ Instruction::MCOPY,       { "MCOPY",          0, 3, 0, true, Tier::VeryLow } },
 	{ Instruction::EXTCODEHASH,	{ "EXTCODEHASH",	0, 1, 1, false, Tier::Balance } },
 	{ Instruction::BLOCKHASH,	{ "BLOCKHASH",		0, 1, 1, false, Tier::Ext } },
 	{ Instruction::BLOBHASH,    { "BLOBHASH",       0, 1, 1, false, Tier::VeryLow } },
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index f05dcb9f63..4e7ac8b97f 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -104,6 +104,7 @@ enum class Instruction: uint8_t
 	MSIZE,				///< get the size of active memory
 	GAS,				///< get the amount of available gas
 	JUMPDEST,			///< set a potential jump destination
+	MCOPY = 0x5e,       ///< copy between memory areas
 
 	PUSH0 = 0x5f,       ///< place the value 0 on stack
 	PUSH1 = 0x60,		///< place 1 byte item on stack
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index 346dcb0d4d..5c8b986be9 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -104,6 +104,25 @@ std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperat
 		op.lengthParameter = 2;
 		return {op};
 	}
+	case Instruction::MCOPY:
+	{
+		assertThrow(memory(_instruction) != Effect::None, OptimizerException, "");
+		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
+
+		Operation readOperation;
+		readOperation.effect = Read;
+		readOperation.location = Location::Memory;
+		readOperation.startParameter = 1;
+		readOperation.lengthParameter = 2;
+
+		Operation writeOperation;
+		writeOperation.effect = Write;
+		writeOperation.location = Location::Memory;
+		writeOperation.startParameter = 0;
+		writeOperation.lengthParameter = 2;
+
+		return {readOperation, writeOperation};
+	}
 	case Instruction::STATICCALL:
 	case Instruction::CALL:
 	case Instruction::CALLCODE:
@@ -188,7 +207,7 @@ bool SemanticInformation::breaksCSEAnalysisBlock(AssemblyItem const& _item, bool
 		))
 			return false;
 		//@todo: We do not handle the following memory instructions for now:
-		// calldatacopy, codecopy, extcodecopy, mstore8,
+		// calldatacopy, codecopy, extcodecopy, mcopy, mstore8,
 		// msize (note that msize also depends on memory read access)
 
 		// the second requirement will be lifted once it is implemented
@@ -363,6 +382,7 @@ SemanticInformation::Effect SemanticInformation::memory(Instruction _instruction
 	case Instruction::CODECOPY:
 	case Instruction::EXTCODECOPY:
 	case Instruction::RETURNDATACOPY:
+	case Instruction::MCOPY:
 	case Instruction::MSTORE:
 	case Instruction::MSTORE8:
 	case Instruction::CALL:
diff --git a/libevmasm/SimplificationRule.h b/libevmasm/SimplificationRule.h
index b6d906bc14..746dfa4c67 100644
--- a/libevmasm/SimplificationRule.h
+++ b/libevmasm/SimplificationRule.h
@@ -117,6 +117,7 @@ struct EVMBuiltins
 	static auto constexpr EXTCODECOPY = PatternGenerator<Instruction::EXTCODECOPY>{};
 	static auto constexpr RETURNDATASIZE = PatternGenerator<Instruction::RETURNDATASIZE>{};
 	static auto constexpr RETURNDATACOPY = PatternGenerator<Instruction::RETURNDATACOPY>{};
+	static auto constexpr MCOPY = PatternGenerator<Instruction::MCOPY>{};
 	static auto constexpr EXTCODEHASH = PatternGenerator<Instruction::EXTCODEHASH>{};
 	static auto constexpr BLOCKHASH = PatternGenerator<Instruction::BLOCKHASH>{};
 	static auto constexpr BLOBHASH = PatternGenerator<Instruction::BLOBHASH>{};
diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
index 6fe2bbb1f4..34996dc6b9 100644
--- a/liblangutil/EVMVersion.cpp
+++ b/liblangutil/EVMVersion.cpp
@@ -53,6 +53,8 @@ bool EVMVersion::hasOpcode(Instruction _opcode) const
 		return hasBlobHash();
 	case Instruction::BLOBBASEFEE:
 		return hasBlobBaseFee();
+	case Instruction::MCOPY:
+		return hasMcopy();
 	default:
 		return true;
 	}
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index e59c5d3aa1..5b4e73b15e 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -105,6 +105,7 @@ class EVMVersion:
 	bool hasPrevRandao() const { return *this >= paris(); }
 	bool hasPush0() const { return *this >= shanghai(); }
 	bool hasBlobHash() const { return *this >= cancun(); }
+	bool hasMcopy() const { return *this >= cancun(); }
 
 	bool hasOpcode(evmasm::Instruction _opcode) const;
 
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index 834a7549a5..c4dade6898 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -736,6 +736,9 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 	else if (_instr == evmasm::Instruction::BLOBHASH && !m_evmVersion.hasBlobHash())
 		// TODO: Change this assertion to an error, similar to the ones above, when Cancun becomes the default EVM version.
 		yulAssert(false);
+	else if (_instr == evmasm::Instruction::MCOPY && !m_evmVersion.hasMcopy())
+		// TODO: Change this assertion to an error, similar to the ones above, when Cancun becomes the default EVM version.
+		yulAssert(false);
 	else if (_instr == evmasm::Instruction::PC)
 		m_errorReporter.error(
 			2450_error,
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 6b34f60c74..36e6f1d007 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -127,6 +127,13 @@ std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 		return _instr == evmasm::Instruction::BLOBBASEFEE && _evmVersion < langutil::EVMVersion::cancun();
 	};
 
+	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
+	// mcopy for VMs before london.
+	auto mcopyException = [&](evmasm::Instruction _instr) -> bool
+	{
+		return _instr == evmasm::Instruction::MCOPY && _evmVersion < langutil::EVMVersion::cancun();
+	};
+
 	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the name
 	// prevrandao for VMs before paris.
 	auto prevRandaoException = [&](std::string const& _instrName) -> bool
@@ -150,7 +157,8 @@ std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 			!baseFeeException(instr.second) &&
 			!prevRandaoException(name) &&
 			!blobHashException(instr.second) &&
-			!blobBaseFeeException(instr.second)
+			!blobBaseFeeException(instr.second) &&
+			!mcopyException(instr.second)
 		)
 			reserved.emplace(name);
 	}
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index d88b07f6b1..95296369b7 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -172,9 +172,12 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 		*instruction == Instruction::CODECOPY ||
 		*instruction == Instruction::CALLDATACOPY ||
 		*instruction == Instruction::RETURNDATACOPY ||
+		// TODO: Removing MCOPY is complicated because it's not just a store but also a load.
+		//*instruction == Instruction::MCOPY ||
 		*instruction == Instruction::MSTORE ||
 		*instruction == Instruction::MSTORE8;
 	bool isCandidateForRemoval =
+		*instruction != Instruction::MCOPY &&
 		SemanticInformation::otherState(*instruction) != SemanticInformation::Write && (
 			SemanticInformation::storage(*instruction) == SemanticInformation::Write ||
 			(!m_ignoreMemory && SemanticInformation::memory(*instruction) == SemanticInformation::Write)
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
index ea00cc0f6e..d21228c5be 100755
--- a/scripts/test_antlr_grammar.sh
+++ b/scripts/test_antlr_grammar.sh
@@ -123,6 +123,8 @@ done < <(
       grep -v -E 'inlineAssembly/basefee_berlin_function.sol' |
       # Skipping a test with "let blobbasefee := ..."
       grep -v -E 'inlineAssembly/blobbasefee_shanghai_function.sol' |
+      # Skipping a test with "let mcopy := ..."
+      grep -v -E 'inlineAssembly/mcopy_as_identifier_pre_cancun.sol' |
       # Skipping tests with "let prevrandao := ..."
       grep -v -E 'inlineAssembly/prevrandao_allowed_function_pre_paris.sol' |
       grep -v -E 'inlineAssembly/prevrandao_disallowed_function_post_paris.sol' |
diff --git a/test/libsolidity/GasMeter.cpp b/test/libsolidity/GasMeter.cpp
index a0599f552a..1afebac5c5 100644
--- a/test/libsolidity/GasMeter.cpp
+++ b/test/libsolidity/GasMeter.cpp
@@ -32,6 +32,7 @@ using namespace solidity::langutil;
 using namespace solidity::evmasm;
 using namespace solidity::frontend;
 using namespace solidity::frontend::test;
+using namespace solidity::test;
 
 namespace solidity::frontend::test
 {
@@ -339,6 +340,113 @@ BOOST_AUTO_TEST_CASE(complex_control_flow)
 	testRunTimeGas("ln(int128)", std::vector<bytes>{encodeArgs(0), encodeArgs(10), encodeArgs(105), encodeArgs(30000)});
 }
 
+BOOST_AUTO_TEST_CASE(
+	mcopy_memory_expansion_gas,
+	*boost::unit_test::precondition(minEVMVersionCheck(EVMVersion::cancun()))
+)
+{
+	char const* sourceCode = R"(
+		contract C {
+			function no_expansion() public {
+				assembly {
+					mstore(0xffe0, 1) // expand memory before using mcopy
+					mcopy(0, 0xffff, 1)
+					return(0, 1)
+				}
+			}
+
+			function expansion_on_write() public {
+				assembly {
+					mcopy(0xffff, 0, 1)
+					return(0xffff, 1)
+				}
+			}
+
+			function expansion_on_read() public {
+				assembly {
+					mcopy(0, 0xffff, 1)
+					return(0, 1)
+				}
+			}
+
+			function expansion_on_read_write() public {
+				assembly {
+					mcopy(0xffff, 0xffff, 1)
+					return(0, 1)
+				}
+			}
+
+			function expansion_on_zero_size() public {
+				assembly {
+					mcopy(0xffff, 0xffff, 0)
+					return(0, 1)
+				}
+			}
+
+			function expansion_on_0_0_0() public {
+				assembly {
+					mcopy(0, 0, 0)
+					return(0, 1)
+				}
+			}
+		}
+	)";
+	testCreationTimeGas(sourceCode);
+	testRunTimeGas("no_expansion()", {encodeArgs()});
+	testRunTimeGas("expansion_on_write()", {encodeArgs()});
+	testRunTimeGas("expansion_on_read()", {encodeArgs()});
+	testRunTimeGas("expansion_on_read_write()", {encodeArgs()});
+	testRunTimeGas("expansion_on_zero_size()", {encodeArgs()});
+	testRunTimeGas("expansion_on_0_0_0()", {encodeArgs()});
+}
+
+BOOST_AUTO_TEST_CASE(
+	mcopy_word_gas,
+	*boost::unit_test::precondition(minEVMVersionCheck(EVMVersion::cancun()))
+)
+{
+	char const* sourceCode = R"(
+		contract C {
+			function no_overlap() public {
+				assembly {
+					mstore(0xffe0, 1) // expand memory before using mcopy
+					mcopy(0x4000, 0x2000, 0x2000)
+					return(0, 0x10000)
+				}
+			}
+
+			function overlap_right() public {
+				assembly {
+					mstore(0xffe0, 1) // expand memory before using mcopy
+					mcopy(0x3000, 0x2000, 0x2000)
+					return(0, 0x10000)
+				}
+			}
+
+			function overlap_left() public {
+				assembly {
+					mstore(0xffe0, 1) // expand memory before using mcopy
+					mcopy(0x1000, 0x2000, 0x2000)
+					return(0, 0x10000)
+				}
+			}
+
+			function overlap_full() public {
+				assembly {
+					mstore(0xffe0, 1) // expand memory before using mcopy
+					mcopy(0x2000, 0x2000, 0x2000)
+					return(0, 0x10000)
+				}
+			}
+		}
+	)";
+	testCreationTimeGas(sourceCode);
+	testRunTimeGas("no_overlap()", {encodeArgs()});
+	testRunTimeGas("overlap_right()", {encodeArgs()});
+	testRunTimeGas("overlap_left()", {encodeArgs()});
+	testRunTimeGas("overlap_full()", {encodeArgs()});
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }
diff --git a/test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mcopy.sol b/test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mcopy.sol
new file mode 100644
index 0000000000..075cfb6ff5
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mcopy.sol
@@ -0,0 +1,18 @@
+contract C {
+    constructor() {
+        assembly {
+            mcopy(1000, 2000, 1000)
+        }
+    }
+
+    function copy() public {
+        assembly {
+            mcopy(1000, 2000, 1000)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// :C(creation) false
+// :C(runtime) false
diff --git a/test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mcopy_zero_size.sol b/test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mcopy_zero_size.sol
new file mode 100644
index 0000000000..5ef77fcc69
--- /dev/null
+++ b/test/libsolidity/memoryGuardTests/unmarked_with_memory_access_mcopy_zero_size.sol
@@ -0,0 +1,18 @@
+contract C {
+    constructor() {
+        assembly {
+            mcopy(1000, 2000, 0)
+        }
+    }
+
+    function copy() public {
+        assembly {
+            mcopy(1000, 2000, 0)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// :C(creation) false
+// :C(runtime) false
diff --git a/test/libsolidity/semanticTests/inlineAssembly/mcopy.sol b/test/libsolidity/semanticTests/inlineAssembly/mcopy.sol
new file mode 100644
index 0000000000..e98409f3d4
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/mcopy.sol
@@ -0,0 +1,14 @@
+contract C {
+    function f(bytes memory src) public pure returns (bytes memory dst) {
+        assembly {
+            mcopy(add(dst, 0x1f), add(src, 0x1f), 0x01) // Copy over src length byte to dst
+            mcopy(add(dst, 0x20), add(src, 0x00), 0x08) // Copy 8 zero bytes to dst
+            mcopy(add(dst, 0x28), add(src, 0x28), 0x10) // Copy 16 bytes from the middle of src to dst
+            mcopy(add(dst, 0x38), add(src, 0x00), 0x08) // Copy 8 zero bytes to dst
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f(bytes): 0x20, 0x20, 0xffeeddccbbaa9988776655443322110000112233445566778899aabbccddeeff -> 0x20, 0x20, 0x0000000000000000776655443322110000112233445566770000000000000000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/mcopy_as_identifier_pre_cancun.sol b/test/libsolidity/semanticTests/inlineAssembly/mcopy_as_identifier_pre_cancun.sol
new file mode 100644
index 0000000000..4f50d1ddc2
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/mcopy_as_identifier_pre_cancun.sol
@@ -0,0 +1,22 @@
+contract C {
+    function f() public pure returns (uint result) {
+        assembly {
+            let mcopy := 1
+            result := mcopy
+        }
+    }
+
+    function g() public pure returns (uint result) {
+        assembly {
+            function mcopy() -> r {
+                r := 1000
+            }
+            result := mcopy()
+        }
+    }
+}
+// ====
+// EVMVersion: <cancun
+// ----
+// f() -> 1
+// g() -> 1000
diff --git a/test/libsolidity/semanticTests/inlineAssembly/mcopy_empty.sol b/test/libsolidity/semanticTests/inlineAssembly/mcopy_empty.sol
new file mode 100644
index 0000000000..e34e443b34
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/mcopy_empty.sol
@@ -0,0 +1,18 @@
+contract C {
+    function mcopy_zero(bytes memory pattern) public pure returns (bytes memory out) {
+        out = pattern;
+
+        // This should have no effect on output
+        assembly {
+            mcopy(add(out, 0x20), add(out, 0x30), 0)
+            mcopy(add(out, 0x30), add(out, 0x30), 0)
+            mcopy(add(out, 0x40), add(out, 0x30), 0)
+
+            mcopy(add(out, 0x21), 0, 0)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// mcopy_zero(bytes): 0x20, 0x20, 0xffeeddccbbaa9988776655443322110000112233445566778899aabbccddeeff -> 0x20, 0x20, 0xffeeddccbbaa9988776655443322110000112233445566778899aabbccddeeff
diff --git a/test/libsolidity/semanticTests/inlineAssembly/mcopy_overlap.sol b/test/libsolidity/semanticTests/inlineAssembly/mcopy_overlap.sol
new file mode 100644
index 0000000000..95f517daa9
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/mcopy_overlap.sol
@@ -0,0 +1,39 @@
+function copy(uint dstOffset, uint srcOffset, uint length) pure returns (bytes memory out) {
+    out =
+        hex"2222222222222222333333333333333344444444444444445555555555555555"
+        hex"6666666666666666777777777777777788888888888888889999999999999999"
+        hex"aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccccccccccccccccdddddddddddddddd";
+    assembly {
+        mcopy(add(add(out, 0x20), dstOffset), add(add(out, 0x20), srcOffset), length)
+    }
+}
+
+contract C {
+    function mcopy_to_right_overlap() public pure returns (bytes memory) {
+        return copy(0x20, 0x10, 0x30);
+    }
+
+    function mcopy_to_left_overlap() public pure returns (bytes memory) {
+        return copy(0x10, 0x20, 0x30);
+    }
+
+    function mcopy_in_place() public pure returns (bytes memory) {
+        return copy(0x10, 0x10, 0x40);
+    }
+
+    function mcopy_to_right_no_overlap() public pure returns (bytes memory) {
+        return copy(0x30, 0x10, 0x20);
+    }
+
+    function mcopy_to_left_no_overlap() public pure returns (bytes memory) {
+        return copy(0x10, 0x30, 0x20);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// mcopy_to_right_overlap()    -> 0x20, 0x60, 0x2222222222222222333333333333333344444444444444445555555555555555, 0x4444444444444444555555555555555566666666666666667777777777777777, 0x88888888888888889999999999999999ccccccccccccccccdddddddddddddddd
+// mcopy_to_left_overlap()     -> 0x20, 0x60, 0x2222222222222222333333333333333366666666666666667777777777777777, 0x88888888888888889999999999999999aaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb, 0xaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccccccccccccccccdddddddddddddddd
+// mcopy_in_place()            -> 0x20, 0x60, 0x2222222222222222333333333333333344444444444444445555555555555555, 0x6666666666666666777777777777777788888888888888889999999999999999, 0xaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccccccccccccccccdddddddddddddddd
+// mcopy_to_right_no_overlap() -> 0x20, 0x60, 0x2222222222222222333333333333333344444444444444445555555555555555, 0x6666666666666666777777777777777744444444444444445555555555555555, 0x66666666666666667777777777777777ccccccccccccccccdddddddddddddddd
+// mcopy_to_left_no_overlap()  -> 0x20, 0x60, 0x2222222222222222333333333333333388888888888888889999999999999999, 0xaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb88888888888888889999999999999999, 0xaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbccccccccccccccccdddddddddddddddd
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/mcopy.sol b/test/libsolidity/syntaxTests/inlineAssembly/mcopy.sol
new file mode 100644
index 0000000000..c300160ed3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/mcopy.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() public pure {
+        assembly {
+            mcopy(0, 0, 0)
+            mcopy(0x1000, 0x2000, 100)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/mcopy_pre_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/mcopy_pre_cancun.sol
new file mode 100644
index 0000000000..090e2f6286
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/mcopy_pre_cancun.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public pure {
+        assembly {
+            mcopy()
+        }
+    }
+}
+// ====
+// EVMVersion: <cancun
+// ----
+// DeclarationError 4619: (75-80): Function "mcopy" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/mcopy_reserved_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/mcopy_reserved_cancun.sol
new file mode 100644
index 0000000000..b31bbffd85
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/mcopy_reserved_cancun.sol
@@ -0,0 +1,21 @@
+contract C {
+    function f() public pure returns (uint result) {
+        assembly {
+            let mcopy := 1
+            result := mcopy
+        }
+    }
+
+    function g() public pure returns (uint result) {
+        assembly {
+            function mcopy() -> r {
+                r := 1000
+            }
+            result := mcopy()
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// ParserError 5568: (101-106): Cannot use builtin function name "mcopy" as identifier name.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure_cancun.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure_cancun.sol
new file mode 100644
index 0000000000..23a7f4c459
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_pure_cancun.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() public pure {
+        assembly {
+            mcopy(1, 2, 3)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
index f68c313286..8aacecdec7 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
@@ -3,6 +3,7 @@ contract C {
         assembly {
             pop(blobhash(0))
             pop(blobbasefee())
+            mcopy(1, 2, 3)
         }
     }
 }
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/mcopy_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/mcopy_pure.sol
new file mode 100644
index 0000000000..e89209dcbc
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/mcopy_pure.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() public pure {
+        assembly {
+            mcopy(0x1000, 0x2000, 100)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
diff --git a/test/libyul/yulInterpreterTests/mcopy.yul b/test/libyul/yulInterpreterTests/mcopy.yul
new file mode 100644
index 0000000000..7331544b8b
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/mcopy.yul
@@ -0,0 +1,34 @@
+{
+    mstore(0x00, 0x1111111111111111111111111111111122222222222222222222222222222222)
+    mstore(0x20, 0x3333333333333333333333333333333344444444444444444444444444444444)
+    mstore(0x40, 0x5555555555555555555555555555555566666666666666666666666666666666)
+
+    mcopy(0, 0, 32)      // No-op
+    mcopy(0x60, 0, 32)   // Append a duplicate of the first word past msize
+    mcopy(0x90, 0x30, 1) // Copy the 0x44 byte from the middle of second word past msize
+    mcopy(0, 0, 0)       // No-op
+    mcopy(0x2f, 0x90, 2) // Copy the 0x4400 straddling msize back into the the middle of second word
+    mcopy(0xa0, 0, 160)  // Duplicate the whole thing
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Trace:
+//   MCOPY(0, 0, 32)
+//   MCOPY(96, 0, 32)
+//   MCOPY(144, 48, 1)
+//   MCOPY(0, 0, 0)
+//   MCOPY(47, 144, 2)
+//   MCOPY(160, 0, 160)
+// Memory dump:
+//      0: 1111111111111111111111111111111122222222222222222222222222222222
+//     20: 3333333333333333333333333333334400444444444444444444444444444444
+//     40: 5555555555555555555555555555555566666666666666666666666666666666
+//     60: 1111111111111111111111111111111122222222222222222222222222222222
+//     80: 0000000000000000000000000000000044000000000000000000000000000000
+//     A0: 1111111111111111111111111111111122222222222222222222222222222222
+//     C0: 3333333333333333333333333333334400444444444444444444444444444444
+//     E0: 5555555555555555555555555555555566666666666666666666666666666666
+//    100: 1111111111111111111111111111111122222222222222222222222222222222
+//    120: 0000000000000000000000000000000044000000000000000000000000000000
+// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/mcopy_memory_access_out_of_range.yul b/test/libyul/yulInterpreterTests/mcopy_memory_access_out_of_range.yul
new file mode 100644
index 0000000000..45599109b5
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/mcopy_memory_access_out_of_range.yul
@@ -0,0 +1,21 @@
+{
+    mstore8(0xffffffffffffffff, 1)
+
+    // Interpreter ignores memory copies with very large offset and/or size.
+    // None of these will show up in memory dump.
+    mcopy(0, 0xffffffffffffffff, 1)
+    mcopy(0xffffffffffffffff, 0, 1)
+    mcopy(0, 1, 0xffffffffffffffff)
+    mcopy(0xffffffff00000000, 0xffffffffffffffff, 0xffffffffffffffff)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Trace:
+//   MCOPY(0, 0xffffffffffffffff, 1)
+//   MCOPY(0xffffffffffffffff, 0, 1)
+//   MCOPY(0, 1, 0xffffffffffffffff)
+//   MCOPY(0xffffffff00000000, 0xffffffffffffffff, 0xffffffffffffffff)
+// Memory dump:
+//   FFFFFFFFFFFFFFE0: 0000000000000000000000000000000000000000000000000000000000000001
+// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_read.yul b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_read.yul
new file mode 100644
index 0000000000..b0b2b561e7
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_read.yul
@@ -0,0 +1,12 @@
+{
+    // Should not affect msize
+    mcopy(0x30, 0x30, 0)
+    sstore(0, msize())
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Trace:
+//   MCOPY(48, 48, 0)
+// Memory dump:
+// Storage dump:
diff --git a/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_write.yul b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_write.yul
new file mode 100644
index 0000000000..0448b20c06
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_write.yul
@@ -0,0 +1,13 @@
+{
+    // Should expand memory to two full words (0x40 bytes)
+    mcopy(0x30, 0, 1)
+    sstore(0, msize())
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Trace:
+//   MCOPY(48, 0, 1)
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000040
diff --git a/test/libyul/yulInterpreterTests/mcopy_memory_expansion_zero_size.yul b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_zero_size.yul
new file mode 100644
index 0000000000..0448b20c06
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_zero_size.yul
@@ -0,0 +1,13 @@
+{
+    // Should expand memory to two full words (0x40 bytes)
+    mcopy(0x30, 0, 1)
+    sstore(0, msize())
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Trace:
+//   MCOPY(48, 0, 1)
+// Memory dump:
+// Storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000040
diff --git a/test/libyul/yulInterpreterTests/mcopy_overlap.yul b/test/libyul/yulInterpreterTests/mcopy_overlap.yul
new file mode 100644
index 0000000000..2ac2460d7f
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/mcopy_overlap.yul
@@ -0,0 +1,21 @@
+{
+    mstore(0x00, 0x0000000000000000000000000000000000000000000000000000000000000000)
+    mstore(0x20, 0x1111111122222222333333334444444455555555666666667777777788888888)
+    mstore(0x40, 0x1111111122222222333333334444444455555555666666667777777788888888)
+    mstore(0x60, 0x0000000000000000000000000000000000000000000000000000000000000000)
+
+    mcopy(0x08, 0x20, 0x20)
+    mcopy(0x58, 0x40, 0x20)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Trace:
+//   MCOPY(8, 32, 32)
+//   MCOPY(88, 64, 32)
+// Memory dump:
+//      0: 0000000000000000111111112222222233333333444444445555555566666666
+//     20: 7777777788888888333333334444444455555555666666667777777788888888
+//     40: 1111111122222222333333334444444455555555666666661111111122222222
+//     60: 3333333344444444555555556666666677777777888888880000000000000000
+// Storage dump:
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy.yul
new file mode 100644
index 0000000000..aaa36047a4
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy.yul
@@ -0,0 +1,19 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _32 := 32
+
+    mcopy(_0, _32, _32) // Not redundant. Read/write between different areas.
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     calldatacopy(0, 0, 0x40)
+//     let _0 := 0
+//     let _32 := 32
+//     mcopy(_0, _32, _32)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_mstore.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_mstore.yul
new file mode 100644
index 0000000000..cb6364b83b
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_mstore.yul
@@ -0,0 +1,23 @@
+{
+    let _0 := 0
+    let _32 := 32
+
+    calldatacopy(0, 0, 0x40)
+    let mem32 := mload(_32)
+
+    mstore(_0, mem32)
+    mcopy(_0, _32, _32) // Redundant with MSTORE.
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _32 := 32
+//     calldatacopy(0, 0, 0x40)
+//     let mem32 := mload(_32)
+//     mstore(_0, mem32)
+//     mcopy(_0, _32, _32)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_mstore_overlap.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_mstore_overlap.yul
new file mode 100644
index 0000000000..4dbe80fe7d
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_mstore_overlap.yul
@@ -0,0 +1,29 @@
+{
+    let _0 := 0
+    let _1 := 1
+    let _31 := 31
+    let _32 := 32
+    let _33 := 33
+
+    calldatacopy(0, 0, 0x40)
+    let mem32 := mload(_32)
+
+    mstore(_0, mem32)
+    mcopy(_1, _33, _31) // Not redundant. MCOPY does not copy all of it.
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _1 := 1
+//     let _31 := 31
+//     let _32 := 32
+//     let _33 := 33
+//     calldatacopy(0, 0, 0x40)
+//     let mem32 := mload(_32)
+//     mstore(_0, mem32)
+//     mcopy(_1, _33, _31)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_area.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_area.yul
new file mode 100644
index 0000000000..d7e672f190
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_area.yul
@@ -0,0 +1,19 @@
+{
+    let _0 := 0
+    let _32 := 32
+
+    calldatacopy(0, 0, 0x20)
+
+    mcopy(_0, _0, _32) // Redundant (no-op)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _32 := 32
+//     calldatacopy(0, 0, 0x20)
+//     mcopy(_0, _0, _32)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_area_mcopy.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_area_mcopy.yul
new file mode 100644
index 0000000000..2b11528fba
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_area_mcopy.yul
@@ -0,0 +1,21 @@
+{
+    let _0 := 0
+    let _32 := 32
+
+    calldatacopy(0, 0, 0x40)
+
+    mcopy(_0, _32, _32)
+    mcopy(_0, _32, _32) // Redundant with previous MCOPY.
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _32 := 32
+//     calldatacopy(0, 0, 0x40)
+//     mcopy(_0, _32, _32)
+//     mcopy(_0, _32, _32)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mcopy.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mcopy.yul
new file mode 100644
index 0000000000..12cf27c866
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mcopy.yul
@@ -0,0 +1,23 @@
+{
+    let _0 := 0
+    let _32 := 32
+    let _64 := 64
+
+    calldatacopy(0, 0, 0x60)
+
+    mcopy(_0, _64, _32)
+    mcopy(_32, _64, _32) // Not redundant. Writing to a different area.
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _32 := 32
+//     let _64 := 64
+//     calldatacopy(0, 0, 0x60)
+//     mcopy(_0, _64, _32)
+//     mcopy(_32, _64, _32)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore.yul
new file mode 100644
index 0000000000..9802bfb517
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore.yul
@@ -0,0 +1,23 @@
+{
+    let _0 := 0
+    let _32 := 32
+
+    calldatacopy(0, 0, 0x40)
+    let mem32 := mload(_32)
+
+    mstore(_0, mem32)
+    mcopy(_0, _0, _32) // Redundant (no-op)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _32 := 32
+//     calldatacopy(0, 0, 0x40)
+//     let mem32 := mload(_32)
+//     mstore(_0, mem32)
+//     mcopy(_0, _0, _32)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore8_mstore8.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore8_mstore8.yul
new file mode 100644
index 0000000000..8db2b800ce
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore8_mstore8.yul
@@ -0,0 +1,27 @@
+{
+    let _0 := 0
+    let _1 := 1
+    let _31 := 31
+
+    calldatacopy(0, 0, 0x40)
+    let mem31 := mload(_31)
+
+    mstore8(_0, mem31)  // Redundant. Overwritten by MSTORE.
+    mcopy(_0, _0, _1)   // Redundant (no-op)
+    mstore8(_0, mem31)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _1 := 1
+//     let _31 := 31
+//     calldatacopy(0, 0, 0x40)
+//     let mem31 := mload(_31)
+//     mstore8(_0, mem31)
+//     mcopy(_0, _0, _1)
+//     mstore8(_0, mem31)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore_mstore.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore_mstore.yul
new file mode 100644
index 0000000000..cc080803f1
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore_mstore.yul
@@ -0,0 +1,25 @@
+{
+    let _0 := 0
+    let _32 := 32
+
+    calldatacopy(0, 0, 0x40)
+    let mem32 := mload(_32)
+
+    mstore(_0, mem32)
+    mcopy(_0, _0, _32) // Redundant (no-op)
+    mstore(_0, mem32)  // Redundant with previous MSTORE.
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _32 := 32
+//     calldatacopy(0, 0, 0x40)
+//     let mem32 := mload(_32)
+//     mstore(_0, mem32)
+//     mcopy(_0, _0, _32)
+//     mstore(_0, mem32)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore_mstore_overlap.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore_mstore_overlap.yul
new file mode 100644
index 0000000000..639d026604
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_read_area_mstore_mstore_overlap.yul
@@ -0,0 +1,27 @@
+{
+    let _0 := 0
+    let _1 := 1
+    let _32 := 32
+
+    calldatacopy(0, 0, 0x20)
+    let mem32 := mload(_32)
+
+    mstore(_0, mem32)
+    mcopy(_1, _1, _32) // Redundant (no-op)
+    mstore(_0, mem32)  // Redundant with previous MSTORE.
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _1 := 1
+//     let _32 := 32
+//     calldatacopy(0, 0, 0x20)
+//     let mem32 := mload(_32)
+//     mstore(_0, mem32)
+//     mcopy(_1, _1, _32)
+//     mstore(_0, mem32)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_write_area_mcopy.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_write_area_mcopy.yul
new file mode 100644
index 0000000000..e083572b47
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mcopy_same_write_area_mcopy.yul
@@ -0,0 +1,23 @@
+{
+    let _0 := 0
+    let _32 := 32
+    let _64 := 64
+
+    calldatacopy(0, 0, 0x60)
+
+    mcopy(_0, _32, _32)
+    mcopy(_0, _64, _32) // Not redundant. Copying from a different spot.
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _32 := 32
+//     let _64 := 64
+//     calldatacopy(0, 0, 0x60)
+//     mcopy(_0, _32, _32)
+//     mcopy(_0, _64, _32)
+// }
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_mcopy.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_mcopy.yul
new file mode 100644
index 0000000000..fd35befcc8
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/mstore_mcopy.yul
@@ -0,0 +1,23 @@
+{
+    let _0 := 0
+    let _32 := 32
+
+    calldatacopy(0, 0, 0x40)
+    let mem32 := mload(_32)
+
+    mcopy(_0, _32, _32)
+    mstore(_0, mem32) // Redundant with MCOPY.
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     let _0 := 0
+//     let _32 := 32
+//     calldatacopy(0, 0, 0x40)
+//     let mem32 := mload(_32)
+//     mcopy(_0, _32, _32)
+//     mstore(_0, mem32)
+// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/mcopy_non_zero_size.sol b/test/libyul/yulOptimizerTests/expressionSimplifier/mcopy_non_zero_size.sol
new file mode 100644
index 0000000000..410b7df536
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/mcopy_non_zero_size.sol
@@ -0,0 +1,22 @@
+{
+    calldatacopy(0, 0, 0x60)
+
+    mcopy(0x20, 0x40, 0x20)
+
+    return(0, 0x60)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: expressionSimplifier
+//
+// {
+//     {
+//         let _1 := 0x60
+//         let _2 := 0
+//         calldatacopy(_2, _2, _1)
+//         let _4 := 0x20
+//         mcopy(_4, 0x40, _4)
+//         return(_2, _1)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/expressionSimplifier/mcopy_zero_size.sol b/test/libyul/yulOptimizerTests/expressionSimplifier/mcopy_zero_size.sol
new file mode 100644
index 0000000000..fe44201105
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/expressionSimplifier/mcopy_zero_size.sol
@@ -0,0 +1,21 @@
+{
+    calldatacopy(0, 0, 0x60)
+
+    mcopy(0x20, 0x40, 0) // Equivalent to mcopy(0, 0, 0)
+
+    return(0, 0x60)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: expressionSimplifier
+//
+// {
+//     {
+//         let _1 := 0x60
+//         let _2 := 0
+//         calldatacopy(_2, _2, _1)
+//         mcopy(0, 0, _2)
+//         return(_2, _1)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/mcopy.sol b/test/libyul/yulOptimizerTests/fullSuite/mcopy.sol
new file mode 100644
index 0000000000..b04852429f
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/mcopy.sol
@@ -0,0 +1,23 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    mcopy(0x20, 0, 0x20)    // Not redundant. MCOPY reads it.
+    mcopy(0x40, 0x10, 0x30)
+    mstore(0x20, 42)
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         mcopy(0x20, 0, 0x20)
+//         mcopy(0x40, 0x10, 0x30)
+//         mstore(0x20, 42)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_overwritten.sol b/test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_overwritten.sol
new file mode 100644
index 0000000000..252363de0e
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_overwritten.sol
@@ -0,0 +1,21 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    mcopy(0, 0x20, 0x20) // Redundant. Overwritten by MSTORE.
+    mstore(0, 42)
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         mcopy(0, 0x20, 0x20)
+//         mstore(0, 42)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_same_area.sol b/test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_same_area.sol
new file mode 100644
index 0000000000..a39f5b689b
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_same_area.sol
@@ -0,0 +1,19 @@
+{
+    calldatacopy(0, 0, 0x20)
+
+    mcopy(0, 0, 0x20) // Redundant. Does not change any values.
+
+    return(0, 0x20)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x20)
+//         mcopy(0, 0, 0x20)
+//         return(0, 0x20)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_zero_size.sol b/test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_zero_size.sol
new file mode 100644
index 0000000000..3ae7c2c313
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/mcopy_redundant_zero_size.sol
@@ -0,0 +1,19 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    mcopy(0, 0x20, 0) // Redundant. Does not copy anything.
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         mcopy(0, 0, 0)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_mcopy_no_overlap.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_mcopy_no_overlap.yul
new file mode 100644
index 0000000000..51b6da83fa
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_mcopy_no_overlap.yul
@@ -0,0 +1,31 @@
+{
+    calldatacopy(0, 0, 0x80)
+
+    let _0 := 0
+    let _32 := 32
+    let _64 := 64
+    let _96 := 96
+
+    // Sanity check: independent MCOPY is not affected
+    mcopy(_0, _32, _32)  // Not redundant. Not being overwritten.
+    mcopy(_64, _96, _32)
+
+    return(0, 0x80)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x80)
+//         let _0 := 0
+//         let _32 := 32
+//         let _64 := 64
+//         let _96 := 96
+//         mcopy(_0, _32, _32)
+//         mcopy(_64, _96, _32)
+//         return(0, 0x80)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_mstore_no_overlap.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_mstore_no_overlap.yul
new file mode 100644
index 0000000000..0ff179d4a4
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_mstore_no_overlap.yul
@@ -0,0 +1,31 @@
+{
+    calldatacopy(0, 0, 0x60)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+    let _64 := 64
+
+    // Sanity check: independent MCOPY and MSTORE are not affected
+    mcopy(_0, _32, _32) // Not redundant. Not being overwritten.
+    mstore(_64, _42)
+
+    return(0, 0x60)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x60)
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         let _64 := 64
+//         mcopy(_0, _32, _32)
+//         mstore(_64, _42)
+//         return(0, 0x60)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_non_overlapping_areas.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_non_overlapping_areas.yul
new file mode 100644
index 0000000000..48e1a4ec1e
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_non_overlapping_areas.yul
@@ -0,0 +1,24 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _32 := 32
+
+    mcopy(_0, _32, _32) // Not redundant. Not being overwritten.
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         let _0 := 0
+//         let _32 := 32
+//         mcopy(_0, _32, _32)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overlapping_areas.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overlapping_areas.yul
new file mode 100644
index 0000000000..70d67640a9
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overlapping_areas.yul
@@ -0,0 +1,25 @@
+{
+    calldatacopy(0, 0, 0x60)
+
+    let _0 := 0
+    let _32 := 32
+    let _64 := 64
+
+    mcopy(_0, _32, _64) // Not redundant. Not being overwritten.
+
+    return(0, 0x60)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x60)
+//         let _0 := 0
+//         let _32 := 32
+//         mcopy(_0, _32, 64)
+//         return(0, 0x60)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mcopy.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mcopy.yul
new file mode 100644
index 0000000000..3334580fcf
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mcopy.yul
@@ -0,0 +1,26 @@
+{
+    calldatacopy(0, 0, 0x80)
+
+    let _0 := 0
+    let _64 := 64
+
+    mcopy(_0, _64, _64) // Redundant. MCOPY overwrites it.
+    mcopy(_0, _64, _64)
+
+    return(0, 0x80)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x80)
+//         let _0 := 0
+//         let _64 := 64
+//         mcopy(_0, _64, _64)
+//         mcopy(_0, _64, _64)
+//         return(0, 0x80)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mstore.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mstore.yul
new file mode 100644
index 0000000000..0c4490a44f
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mstore.yul
@@ -0,0 +1,27 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+
+    mstore(_0, _42) // Redundant. MCOPY overwrites it.
+    mcopy(_0, _32, _32)
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         mcopy(_0, _32, _32)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mstore_overlap.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mstore_overlap.yul
new file mode 100644
index 0000000000..1c99063f5c
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_overwriting_mstore_overlap.yul
@@ -0,0 +1,32 @@
+{
+    calldatacopy(0, 0, 0x60)
+
+    let _0 := 0
+    let _1 := 1
+    let _32 := 32
+    let _42 := 42
+    let _64 := 64
+
+    mstore(_0, _42) // Not redundant. MCOPY does not overwrite all of it.
+    mcopy(_1, _64, _32)
+
+    return(0, 0x60)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x60)
+//         let _0 := 0
+//         let _1 := 1
+//         let _32 := 32
+//         let _42 := 42
+//         let _64 := 64
+//         mstore(_0, _42)
+//         mcopy(_1, _64, _32)
+//         return(0, 0x60)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mcopy.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mcopy.yul
new file mode 100644
index 0000000000..96d69ffbba
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mcopy.yul
@@ -0,0 +1,31 @@
+{
+    calldatacopy(0, 0, 0x60)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+    let _64 := 64
+
+    mcopy(_32, _64, _32) // Not redundant. MCOPY reads it.
+    mcopy(_0, _32, _32)
+    mstore(_32, _42)
+
+    return(0, 0x60)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x60)
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         mcopy(_32, 64, _32)
+//         mcopy(_0, _32, _32)
+//         mstore(_32, _42)
+//         return(0, 0x60)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore.yul
new file mode 100644
index 0000000000..d0c50bfbf1
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore.yul
@@ -0,0 +1,32 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+    let _123 := 123
+
+    mstore(_0, _42) // Not redundant. MCOPY reads it.
+    mcopy(_32, _0, _32)
+    mstore(_0, _123)
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         let _123 := 123
+//         mstore(_0, _42)
+//         mcopy(_32, _0, _32)
+//         mstore(_0, _123)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore8.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore8.yul
new file mode 100644
index 0000000000..c6dcbc188c
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore8.yul
@@ -0,0 +1,34 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _1 := 1
+    let _32 := 32
+    let _42 := 42
+    let _123 := 123
+
+    mstore8(_0, _42) // Not redundant. MCOPY reads it.
+    mcopy(_32, _0, _1)
+    mstore8(_0, _123)
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         let _0 := 0
+//         let _1 := 1
+//         let _32 := 32
+//         let _42 := 42
+//         let _123 := 123
+//         mstore8(_0, _42)
+//         mcopy(_32, _0, _1)
+//         mstore8(_0, _123)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_overhang.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_overhang.yul
new file mode 100644
index 0000000000..98a77592ea
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_overhang.yul
@@ -0,0 +1,34 @@
+{
+    calldatacopy(0, 0, 0x120)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+    let _96 := 96
+    let _123 := 123
+
+    mstore(_32, _42) // Not redundant. MCOPY reads it.
+    mcopy(_96, _0, _96)
+    mstore(_32, _123)
+
+    return(0, 0x120)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x120)
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         let _96 := 96
+//         let _123 := 123
+//         mstore(_32, _42)
+//         mcopy(_96, _0, _96)
+//         mstore(_32, _123)
+//         return(0, 0x120)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_overlap.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_overlap.yul
new file mode 100644
index 0000000000..32a1fbf4e1
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_overlap.yul
@@ -0,0 +1,36 @@
+{
+    calldatacopy(0, 0, 0x60)
+
+    let _0 := 0
+    let _31 := 31
+    let _32 := 32
+    let _42 := 42
+    let _64 := 64
+    let _123 := 123
+
+    mstore(_0, _42) // Not redundant. MCOPY reads part of it.
+    mcopy(_64, _31, _32)
+    mstore(_0, _123)
+
+    return(0, 0x60)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x60)
+//         let _0 := 0
+//         let _31 := 31
+//         let _32 := 32
+//         let _42 := 42
+//         let _64 := 64
+//         let _123 := 123
+//         mstore(_0, _42)
+//         mcopy(_64, _31, _32)
+//         mstore(_0, _123)
+//         return(0, 0x60)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_underhang.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_underhang.yul
new file mode 100644
index 0000000000..b339d28434
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_mstore_underhang.yul
@@ -0,0 +1,36 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _1 := 1
+    let _16 := 16
+    let _32 := 32
+    let _42 := 42
+    let _123 := 123
+
+    mstore(_0, _42) // Not redundant. MCOPY reads part of it.
+    mcopy(_32, _16, _1)
+    mstore(_0, _123)
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         let _0 := 0
+//         let _1 := 1
+//         let _16 := 16
+//         let _32 := 32
+//         let _42 := 42
+//         let _123 := 123
+//         mstore(_0, _42)
+//         mcopy(_32, _16, _1)
+//         mstore(_0, _123)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_overlapping_areas_mstore.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_overlapping_areas_mstore.yul
new file mode 100644
index 0000000000..fa73f0171a
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_overlapping_areas_mstore.yul
@@ -0,0 +1,34 @@
+{
+    calldatacopy(0, 0, 0x60)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+    let _64 := 64
+    let _123 := 123
+
+    mstore(_32, _42) // Redundant. MCOPY overwrites it.
+    mcopy(_0, _32, _64)
+    mstore(_32, _123)
+
+    return(0, 0x60)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x60)
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         let _64 := 64
+//         let _123 := 123
+//         mstore(_32, _42)
+//         mcopy(_0, _32, _64)
+//         mstore(_32, _123)
+//         return(0, 0x60)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mcopy.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mcopy.yul
new file mode 100644
index 0000000000..b7227913c1
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mcopy.yul
@@ -0,0 +1,30 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+
+    mcopy(_0, _32, _32) // Redundant. MSTORE overwrites it.
+    mcopy(_0, _0, _32)  // Redundant (no-op)
+    mstore(_32, _42)
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         mcopy(_0, _32, _32)
+//         mcopy(_0, _0, _32)
+//         mstore(_32, _42)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore.yul
new file mode 100644
index 0000000000..5edbc22b5f
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore.yul
@@ -0,0 +1,34 @@
+{
+    calldatacopy(0, 0, 0x20)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+    let _123 := 123
+
+    mstore(_0, _42)    // Redundant. MSTORE overwrites it.
+    mcopy(_0, _0, _32) // Redundant (no-op)
+    mstore(_0, _123)
+
+    return(0, 0x20)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let _1 := 0x20
+//         let _2 := 0
+//         let _3 := 0
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         let _123 := 123
+//         mstore(_0, _42)
+//         mcopy(_0, _0, _32)
+//         mstore(_0, _123)
+//         return(0, 0x20)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore8.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore8.yul
new file mode 100644
index 0000000000..aab661f62b
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore8.yul
@@ -0,0 +1,32 @@
+{
+    calldatacopy(0, 0, 0x20)
+
+    let _0 := 0
+    let _1 := 1
+    let _42 := 42
+    let _123 := 123
+
+    mstore8(_0, _42)  // Redundant. MSTORE8 overwrites it.
+    mcopy(_0, _0, _1) // Redundant (no-op)
+    mstore8(_0, _123)
+
+    return(0, 0x20)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x20)
+//         let _0 := 0
+//         let _1 := 1
+//         let _42 := 42
+//         let _123 := 123
+//         mstore8(_0, _42)
+//         mcopy(_0, _0, _1)
+//         mstore8(_0, _123)
+//         return(0, 0x20)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore_overlap.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore_overlap.yul
new file mode 100644
index 0000000000..36b4fc489f
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_reading_writing_same_area_mstore_overlap.yul
@@ -0,0 +1,34 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _1 := 1
+    let _32 := 32
+    let _42 := 42
+    let _123 := 123
+
+    mstore(_0, _42)    // Redundant. MSTORE overwrites it.
+    mcopy(_1, _1, _32) // Redundant (no-op)
+    mstore(_0, _123)
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         let _0 := 0
+//         let _1 := 1
+//         let _32 := 32
+//         let _42 := 42
+//         let _123 := 123
+//         mstore(_0, _42)
+//         mcopy(_1, _1, _32)
+//         mstore(_0, _123)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_same_area.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_same_area.yul
new file mode 100644
index 0000000000..1d0f86b86a
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_same_area.yul
@@ -0,0 +1,23 @@
+{
+    calldatacopy(0, 0, 0x20)
+
+    let _0 := 0
+    let _32 := 32
+
+    mcopy(_0, _0, _32) // Redundant (no-op)
+
+    return(0, 0x20)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x20)
+//         let _0 := 0
+//         mcopy(_0, _0, 32)
+//         return(0, 0x20)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_same_write_area_overwriting_mcopy.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_same_write_area_overwriting_mcopy.yul
new file mode 100644
index 0000000000..0e473a3599
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_same_write_area_overwriting_mcopy.yul
@@ -0,0 +1,28 @@
+{
+    calldatacopy(0, 0, 0x60)
+
+    let _0 := 0
+    let _32 := 32
+    let _64 := 64
+
+    mcopy(_0, _32, _32) // Redundant. MCOPY overwrites it.
+    mcopy(_0, _64, _32)
+
+    return(0, 0x60)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x60)
+//         let _0 := 0
+//         let _32 := 32
+//         let _64 := 64
+//         mcopy(_0, _32, _32)
+//         mcopy(_0, _64, _32)
+//         return(0, 0x60)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_sstore.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_sstore.yul
new file mode 100644
index 0000000000..87fd89d3a7
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mcopy_sstore.yul
@@ -0,0 +1,32 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+    let _123 := 123
+
+    // Sanity check: MCOPY does not affect storage
+    sstore(_0, _42) // Redundant. SSTORE overwrites it.
+    mcopy(_32, _0, _32)
+    sstore(_0, _123)
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         let _123 := 123
+//         mcopy(_32, _0, _32)
+//         sstore(_0, _123)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload_reading_mcopy.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload_reading_mcopy.yul
new file mode 100644
index 0000000000..759e631f60
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mload_reading_mcopy.yul
@@ -0,0 +1,32 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+
+    mcopy(_0, _32, _32) // Not redundant. MLOAD reads it.
+    let mem0 := mload(_0)
+    mstore(_0, _42)
+
+    sstore(_0, mem0)
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         mcopy(_0, _32, _32)
+//         let mem0 := mload(_0)
+//         mstore(_0, _42)
+//         sstore(_0, mem0)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/mstore_overwriting_mcopy.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mstore_overwriting_mcopy.yul
new file mode 100644
index 0000000000..f32267a30c
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/mstore_overwriting_mcopy.yul
@@ -0,0 +1,28 @@
+{
+    calldatacopy(0, 0, 0x40)
+
+    let _0 := 0
+    let _32 := 32
+    let _42 := 42
+
+    mcopy(_0, _32, _32) // Redundant. MSTORE overwrites it.
+    mstore(_0, _42)
+
+    return(0, 0x40)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         calldatacopy(0, 0, 0x40)
+//         let _0 := 0
+//         let _32 := 32
+//         let _42 := 42
+//         mcopy(_0, _32, _32)
+//         mstore(_0, _42)
+//         return(0, 0x40)
+//     }
+// }
diff --git a/test/libyul/yulSyntaxTests/mcopy.yul b/test/libyul/yulSyntaxTests/mcopy.yul
new file mode 100644
index 0000000000..1f5d042fed
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/mcopy.yul
@@ -0,0 +1,5 @@
+{
+    mcopy(0x100, 0x200, 0x300)
+}
+// ====
+// EVMVersion: >=cancun
diff --git a/test/libyul/yulSyntaxTests/mcopy_as_identifier.yul b/test/libyul/yulSyntaxTests/mcopy_as_identifier.yul
new file mode 100644
index 0000000000..e48c27d06d
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/mcopy_as_identifier.yul
@@ -0,0 +1,14 @@
+{
+    {
+        let mcopy := 1
+    }
+
+    {
+        function mcopy() {}
+        mcopy()
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// ParserError 5568: (20-25): Cannot use builtin function name "mcopy" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/mcopy_as_identifier_pre_cancun.yul b/test/libyul/yulSyntaxTests/mcopy_as_identifier_pre_cancun.yul
new file mode 100644
index 0000000000..096fce4ed3
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/mcopy_as_identifier_pre_cancun.yul
@@ -0,0 +1,12 @@
+{
+    {
+        let mcopy := 1
+    }
+
+    {
+        function mcopy() {}
+        mcopy()
+    }
+}
+// ====
+// EVMVersion: <cancun
diff --git a/test/libyul/yulSyntaxTests/mcopy_pre_cancun.yul b/test/libyul/yulSyntaxTests/mcopy_pre_cancun.yul
new file mode 100644
index 0000000000..096fce4ed3
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/mcopy_pre_cancun.yul
@@ -0,0 +1,12 @@
+{
+    {
+        let mcopy := 1
+    }
+
+    {
+        function mcopy() {}
+        mcopy()
+    }
+}
+// ====
+// EVMVersion: <cancun
diff --git a/test/libyul/yulSyntaxTests/mcopy_wrong_args.yul b/test/libyul/yulSyntaxTests/mcopy_wrong_args.yul
new file mode 100644
index 0000000000..87203a65b8
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/mcopy_wrong_args.yul
@@ -0,0 +1,13 @@
+{
+    mcopy(0x100, 0x200, 0x300, 0x400)
+    mcopy(0x100, 0x200)
+    mcopy(0x100)
+    mcopy()
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// TypeError 7000: (6-11): Function "mcopy" expects 3 arguments but got 4.
+// TypeError 7000: (44-49): Function "mcopy" expects 3 arguments but got 2.
+// TypeError 7000: (68-73): Function "mcopy" expects 3 arguments but got 1.
+// TypeError 7000: (85-90): Function "mcopy" expects 3 arguments but got 0.
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 0466d6f669..12a046d70e 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -87,6 +87,22 @@ void copyZeroExtended(
 		_target[_targetOffset + i] = (_sourceOffset + i < _source.size() ? _source[_sourceOffset + i] : 0);
 }
 
+void copyZeroExtendedWithOverlap(
+	std::map<u256, uint8_t>& _target,
+	std::map<u256, uint8_t> const& _source,
+	size_t _targetOffset,
+	size_t _sourceOffset,
+	size_t _size
+)
+{
+	if (_targetOffset >= _sourceOffset)
+		for (size_t i = _size; i > 0; --i)
+			_target[_targetOffset + i - 1] = (_source.count(_sourceOffset + i - 1) != 0 ? _source.at(_sourceOffset + i - 1) : 0);
+	else
+		for (size_t i = 0; i < _size; ++i)
+			_target[_targetOffset + i] = (_source.count(_sourceOffset + i) != 0 ? _source.at(_sourceOffset + i) : 0);
+}
+
 }
 
 using u512 = boost::multiprecision::number<boost::multiprecision::cpp_int_backend<512, 256, boost::multiprecision::unsigned_magnitude, boost::multiprecision::unchecked, void>>;
@@ -262,6 +278,17 @@ u256 EVMInstructionInterpreter::eval(
 			);
 		logTrace(_instruction, arg);
 		return 0;
+	case Instruction::MCOPY:
+		if (accessMemory(arg[1], arg[2]) && accessMemory(arg[0], arg[2]))
+			copyZeroExtendedWithOverlap(
+				m_state.memory,
+				m_state.memory,
+				static_cast<size_t>(arg[0]),
+				static_cast<size_t>(arg[1]),
+				static_cast<size_t>(arg[2])
+			);
+		logTrace(_instruction, arg);
+		return 0;
 	case Instruction::BLOCKHASH:
 		if (arg[0] >= m_state.blockNumber || arg[0] + 256 < m_state.blockNumber)
 			return 0;
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.h b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
index 2f50217ed1..d3d2211129 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.h
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.h
@@ -56,6 +56,19 @@ void copyZeroExtended(
 	size_t _size
 );
 
+/// Copy @a _size bytes of @a _source at offset @a _sourceOffset to
+/// @a _target at offset @a _targetOffset. Behaves as if @a _source would
+/// continue with an infinite sequence of zero bytes beyond its end.
+/// When target and source areas overlap, behaves as if the data was copied
+/// using an intermediate buffer.
+void copyZeroExtendedWithOverlap(
+	std::map<u256, uint8_t>& _target,
+	std::map<u256, uint8_t> const& _source,
+	size_t _targetOffset,
+	size_t _sourceOffset,
+	size_t _size
+);
+
 struct InterpreterState;
 
 /**

From ba95a29744e8ad66a3d0afdfe119a7c03b3df68c Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 22 Jan 2024 15:27:58 +0100
Subject: [PATCH 1719/1748] Fix macOS dependency cache.

---
 .circleci/config.yml                  | 55 ++++++++++++++++++++++++++-
 .circleci/osx_install_dependencies.sh |  8 +---
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8a771e6959..9a967febaa 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -363,12 +363,63 @@ commands:
       - matrix_notify_failure_unless_pr
 
   install_dependencies_osx:
+    # An extra cache key is used to only save the flag that communicates whether the cache exists.
+    # if this flag was set (the cache exist) we remove all files located in /usr/local & /opt/homebrew.
+    # With this simple trick restoring the cache is much faster. Otherwise CircleCI is generating
+    # warning messages if a file from the cache is overwriting an already existing file on disk.
+    # Restoring the cache is much faster if we remove all potentially conflicting files beforehand.
     steps:
-      # FIXME: We used to cache dependencies on macOS but now it takes longer than just installing
-      # them each time. See https://github.com/ethereum/solidity/issues/12925.
+      - restore_cache:
+          keys:
+            - osx-dependencies-cached-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
+      - run:
+          name: Installing dependencies / Restoring dependency cache
+          command: |
+            if [[ -f ~/osx-dependencies-cached ]]; then
+              echo "Dependency flag exists. Removing /usr/local/ and /opt/homebrew/. These directories will be restored from cache."
+
+              # CircleCI is providing the circleci cli tools via some kind of symlink magic.
+              # So we just save the original symlinks and restore them later.
+              circleci_binary_path=$(command -v circleci)
+              circleci_agent_binary_path=$(command -v circleci-agent)
+              cp "${circleci_binary_path}" /tmp/circleci
+              cp "${circleci_agent_binary_path}" /tmp/circleci-agent
+
+              # Homebrew is installed in /usr/local on intel macs, but in /opt/homebrew on apple silicon.
+              if [[ -d /opt/homebrew ]]; then
+                sudo rm -rf /opt/homebrew
+                sudo mkdir -p /opt/homebrew/bin
+                sudo chmod 777 /opt/{homebrew,homebrew/bin}
+              fi
+              # under macos /usr/local itself is read-only, so we just remove its sub-directories.
+              sudo rm -rf /usr/local/*
+              sudo mkdir -p /usr/local/bin
+              sudo chmod 777 /usr/{local,local/bin}
+
+              mv /tmp/circleci "${circleci_binary_path}"
+              mv /tmp/circleci-agent "${circleci_agent_binary_path}"
+            fi
+      - restore_cache:
+          keys:
+            - osx-dependencies-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
+      # DO NOT EDIT between here and save_cache, but rather edit ./circleci/osx_install_dependencies.sh
+      # WARNING! If you do edit anything here instead, remember to invalidate the cache manually.
       - run:
           name: Install build dependencies
           command: .circleci/osx_install_dependencies.sh
+      - run:
+          name: Mark dependencies as cached
+          command: touch ~/osx-dependencies-cached
+      - save_cache:
+          key: osx-dependencies-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
+          paths:
+            # Homebrew is installed in /usr/local on intel macs, but in /opt/homebrew on apple silicon.
+            - /usr/local
+            - /opt/homebrew
+      - save_cache:
+          key: osx-dependencies-cached-{{ arch }}-{{ checksum ".circleci/osx_install_dependencies.sh" }}
+          paths:
+            - ~/osx-dependencies-cached
 
 defaults:
 
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 3e3f3b1bbd..8b8656abd7 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -26,12 +26,8 @@
 # ------------------------------------------------------------------------------
 
 # note that the following directories may be cached by circleci:
-# - /usr/local/bin
-# - /usr/local/sbin
-# - /usr/local/lib
-# - /usr/local/include
-# - /usr/local/Cellar
-# - /usr/local/Homebrew
+# - /usr/local
+# - /opt/homebrew
 
 set -eu
 

From 89b73b61fe7fcc1de88f2f094908255f24fd9848 Mon Sep 17 00:00:00 2001
From: Matheus Aguiar <matheus.pit@gmail.com>
Date: Fri, 12 Jan 2024 18:25:43 -0300
Subject: [PATCH 1720/1748] Introduce transient storage support for Yul and
 inline assembly.

---
 Changelog.md                                  |  3 +
 docs/grammar/SolidityLexer.g4                 |  2 +-
 docs/using-the-compiler.rst                   |  1 +
 docs/yul.rst                                  |  7 +-
 libevmasm/GasMeter.cpp                        | 15 ++--
 libevmasm/Instruction.cpp                     |  4 ++
 libevmasm/Instruction.h                       |  4 ++
 libevmasm/SemanticInformation.cpp             | 55 ++++++++++++++-
 libevmasm/SemanticInformation.h               | 11 +--
 libevmasm/SimplificationRule.h                |  2 +
 liblangutil/EVMVersion.cpp                    |  3 +
 liblangutil/EVMVersion.h                      |  1 +
 libyul/AsmAnalysis.cpp                        | 17 +++++
 libyul/SideEffects.h                          | 14 ++--
 libyul/backends/evm/EVMDialect.cpp            | 36 +++++++++-
 libyul/optimiser/Semantics.h                  |  7 +-
 libyul/optimiser/UnusedStoreEliminator.cpp    |  3 +
 scripts/test_antlr_grammar.sh                 |  2 +
 test/EVMHost.cpp                              |  5 ++
 .../evmasm_transient_storage_opcodes/args     |  1 +
 .../evmasm_transient_storage_opcodes/err      |  5 ++
 .../input.sol                                 | 11 +++
 .../evmasm_transient_storage_opcodes/output   | 36 ++++++++++
 ...load_tstore_not_reserved_before_cancun.sol | 25 +++++++
 .../transient_storage_creation.sol            | 14 ++++
 .../transient_storage_low_level_calls.sol     | 70 +++++++++++++++++++
 ..._multiple_calls_different_transactions.sol | 24 +++++++
 ...ransient_storage_multiple_transactions.sol | 38 ++++++++++
 ...storage_reset_between_creation_runtime.sol | 24 +++++++
 .../transient_storage_sanity_checks.sol       | 24 +++++++
 .../transient_storage_selfdestruct.sol        | 44 ++++++++++++
 ...ansient_storage_simple_reentrancy_lock.sol | 22 ++++++
 .../tstore_hidden_staticcall.sol              | 20 ++++++
 .../inlineAssembly/tload_reserved_cancun.sol  | 12 ++++
 .../transient_storage_invalid_pre_cancun.sol  | 13 ++++
 .../transient_storage_opcodes.sol             | 12 ++++
 .../inlineAssembly/tstore_reserved_cancun.sol | 12 ++++
 ...embly_instructions_allowed_view_cancun.sol |  1 +
 .../viewPureChecker/tload_not_pure.sol        | 11 +++
 .../viewPureChecker/tload_view.sol            | 10 +++
 .../viewPureChecker/tstore_not_pure.sol       | 12 ++++
 .../viewPureChecker/tstore_not_view.sol       | 12 ++++
 .../access_large_memory_offsets.yul           |  1 +
 .../yulInterpreterTests/ambiguous_vars.yul    |  1 +
 .../libyul/yulInterpreterTests/and_create.yul |  1 +
 .../yulInterpreterTests/and_create2.yul       |  1 +
 .../yulInterpreterTests/blobbasefee.yul       |  1 +
 test/libyul/yulInterpreterTests/blobhash.yul  |  1 +
 .../yulInterpreterTests/bounded_recursion.yul |  1 +
 test/libyul/yulInterpreterTests/create2.yul   |  1 +
 test/libyul/yulInterpreterTests/datacopy.yul  |  1 +
 .../libyul/yulInterpreterTests/dataoffset.yul |  1 +
 test/libyul/yulInterpreterTests/datasize.yul  |  1 +
 .../libyul/yulInterpreterTests/difficulty.yul |  1 +
 test/libyul/yulInterpreterTests/exp.yul       |  1 +
 .../expr_nesting_depth_exceeded.yul           |  1 +
 .../expr_nesting_depth_not_exceeded.yul       |  1 +
 .../external_call_to_self.yul                 |  1 +
 .../external_call_unexecuted.yul              |  1 +
 .../external_callcode_unexecuted.yul          |  1 +
 .../external_delegatecall_unexecuted.yul      |  1 +
 .../external_staticcall_unexecuted.yul        |  1 +
 .../yulInterpreterTests/function_calls.yul    |  1 +
 .../yulInterpreterTests/function_scopes.yul   |  1 +
 .../yulInterpreterTests/hex_literals.yul      |  1 +
 .../infinite_recursion.yul                    |  1 +
 .../infinite_recursion_tracelimit.yul         |  1 +
 test/libyul/yulInterpreterTests/leave.yul     |  1 +
 .../yulInterpreterTests/leave_for_init.yul    |  1 +
 .../yulInterpreterTests/long_obect_name.yul   |  1 +
 test/libyul/yulInterpreterTests/loop.yul      |  1 +
 test/libyul/yulInterpreterTests/mcopy.yul     |  1 +
 .../mcopy_memory_access_out_of_range.yul      |  1 +
 .../mcopy_memory_expansion_on_read.yul        |  1 +
 .../mcopy_memory_expansion_on_write.yul       |  1 +
 .../mcopy_memory_expansion_zero_size.yul      |  1 +
 .../yulInterpreterTests/mcopy_overlap.yul     |  1 +
 .../yulInterpreterTests/pop_byte_shr_call.yul |  1 +
 .../yulInterpreterTests/pop_byte_shr_func.yul |  1 +
 .../libyul/yulInterpreterTests/prevrandao.yul |  1 +
 test/libyul/yulInterpreterTests/recursion.yul |  1 +
 .../recursive_function_for_loop.yul           |  1 +
 .../yulInterpreterTests/self_balance.yul      |  1 +
 .../yulInterpreterTests/shadowed_symbol.yul   |  1 +
 .../yulInterpreterTests/side_effect_free.yul  |  1 +
 .../yulInterpreterTests/simple_mstore.yul     |  1 +
 test/libyul/yulInterpreterTests/smoke.yul     |  1 +
 .../yulInterpreterTests/switch_statement.yul  |  1 +
 .../yulInterpreterTests/transient_storage.yul | 13 ++++
 .../yulInterpreterTests/zero_length_reads.yul |  1 +
 .../zero_length_reads_and_revert.yul          |  1 +
 .../libyul/yulInterpreterTests/zero_range.yul |  1 +
 .../transient_storage.yul                     | 25 +++++++
 .../fullSuite/transient_storage.yul           | 21 ++++++
 .../no_move_transient_storage.yul             | 20 ++++++
 .../unusedPruner/transient_storage.yul        | 20 ++++++
 .../unusedStoreEliminator/tload.yul           | 22 ++++++
 .../unusedStoreEliminator/tstore.yul          | 23 ++++++
 .../tload_as_identifier_post_cancun.yul       |  9 +++
 .../tstore_as_identifier_post_cancun.yul      |  7 ++
 test/libyul/yulSyntaxTests/tstore_tload.yul   | 11 +++
 ...tstore_tload_as_identifiers_pre_cancun.yul |  6 ++
 .../EVMInstructionInterpreter.cpp             |  8 +++
 test/tools/yulInterpreter/Interpreter.cpp     | 16 ++++-
 test/tools/yulInterpreter/Interpreter.h       |  3 +
 105 files changed, 870 insertions(+), 28 deletions(-)
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_opcodes/args
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_opcodes/err
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_opcodes/input.sol
 create mode 100644 test/cmdlineTests/evmasm_transient_storage_opcodes/output
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/tload_tstore_not_reserved_before_cancun.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/transient_storage_creation.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/transient_storage_low_level_calls.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/transient_storage_multiple_calls_different_transactions.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/transient_storage_multiple_transactions.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/transient_storage_reset_between_creation_runtime.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/transient_storage_sanity_checks.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/transient_storage_simple_reentrancy_lock.sol
 create mode 100644 test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/tload_reserved_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/transient_storage_invalid_pre_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/transient_storage_opcodes.sol
 create mode 100644 test/libsolidity/syntaxTests/inlineAssembly/tstore_reserved_cancun.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/tload_not_pure.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/tload_view.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/tstore_not_pure.sol
 create mode 100644 test/libsolidity/syntaxTests/viewPureChecker/tstore_not_view.sol
 create mode 100644 test/libyul/yulInterpreterTests/transient_storage.yul
 create mode 100644 test/libyul/yulOptimizerTests/equalStoreEliminator/transient_storage.yul
 create mode 100644 test/libyul/yulOptimizerTests/fullSuite/transient_storage.yul
 create mode 100644 test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_transient_storage.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedPruner/transient_storage.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/tload.yul
 create mode 100644 test/libyul/yulOptimizerTests/unusedStoreEliminator/tstore.yul
 create mode 100644 test/libyul/yulSyntaxTests/tload_as_identifier_post_cancun.yul
 create mode 100644 test/libyul/yulSyntaxTests/tstore_as_identifier_post_cancun.yul
 create mode 100644 test/libyul/yulSyntaxTests/tstore_tload.yul
 create mode 100644 test/libyul/yulSyntaxTests/tstore_tload_as_identifiers_pre_cancun.yul

diff --git a/Changelog.md b/Changelog.md
index ea9cd13676..c876aa7bc8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -6,11 +6,14 @@ Language Features:
  * Yul: Introduce builtin ``blobbasefee()`` for retrieving the blob base fee of the current block.
  * Yul: Introduce builtin ``blobhash()`` for retrieving versioned hashes of blobs associated with the transaction.
  * Yul: Introduce builtin ``mcopy()`` for cheaply copying data between memory areas.
+ * Yul: Introduce builtins ``tload()`` and ``tstore()`` for transient storage access.
+
 
 Compiler Features:
 * EVM: Support for the EVM Version "Cancun".
 * SMTChecker: Support `bytes.concat` except when string literals are passed as arguments.
 
+
 Bugfixes:
  * AST import: Fix bug when importing inline assembly with empty ``let`` variable declaration.
 
diff --git a/docs/grammar/SolidityLexer.g4 b/docs/grammar/SolidityLexer.g4
index 91d6b41774..43648ceb5d 100644
--- a/docs/grammar/SolidityLexer.g4
+++ b/docs/grammar/SolidityLexer.g4
@@ -298,7 +298,7 @@ YulEVMBuiltin:
 	'stop' | 'add' | 'sub' | 'mul' | 'div' | 'sdiv' | 'mod' | 'smod' | 'exp' | 'not'
 	| 'lt' | 'gt' | 'slt' | 'sgt' | 'eq' | 'iszero' | 'and' | 'or' | 'xor' | 'byte'
 	| 'shl' | 'shr' | 'sar' | 'addmod' | 'mulmod' | 'signextend' | 'keccak256'
-	| 'pop' | 'mload' | 'mstore' | 'mstore8' | 'sload' | 'sstore' | 'msize' | 'gas'
+	| 'pop' | 'mload' | 'mstore' | 'mstore8' | 'sload' | 'sstore' | 'tload' | 'tstore'| 'msize' | 'gas'
 	| 'address' | 'balance' | 'selfbalance' | 'caller' | 'callvalue' | 'calldataload'
 	| 'calldatasize' | 'calldatacopy' | 'extcodesize' | 'extcodecopy' | 'returndatasize'
 	| 'returndatacopy' | 'mcopy' | 'extcodehash' | 'create' | 'create2' | 'call' | 'callcode'
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index bb495c8155..bbeb116c9e 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -180,6 +180,7 @@ at each version. Backward compatibility is not guaranteed between each version.
    - The block's blob base fee (`EIP-7516 <https://eips.ethereum.org/EIPS/eip-7516>`_ and `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_) can be accessed via the global ``block.blobbasefee`` or ``blobbasefee()`` in inline assembly.
    - Introduces ``blobhash()`` in inline assembly and a corresponding global function to retrieve versioned hashes of blobs associated with the transaction (see `EIP-4844 <https://eips.ethereum.org/EIPS/eip-4844>`_).
    - Opcode ``mcopy`` is available in assembly (see `EIP-5656 <https://eips.ethereum.org/EIPS/eip-5656>`_).
+   - Opcodes ``tstore`` and ``tload`` are available in assembly (see `EIP-1153 <https://eips.ethereum.org/EIPS/eip-1153>`_).
 
 .. index:: ! standard JSON, ! --standard-json
 .. _compiler-api:
diff --git a/docs/yul.rst b/docs/yul.rst
index 482e80ea13..3cf2785fc4 100644
--- a/docs/yul.rst
+++ b/docs/yul.rst
@@ -756,7 +756,8 @@ Opcodes marked with ``F``, ``H``, ``B``, ``C``, ``I``, ``L``, ``P`` and ``N`` ar
 Homestead, Byzantium, Constantinople, Istanbul, London, Paris or Cancun respectively.
 
 In the following, ``mem[a...b)`` signifies the bytes of memory starting at position ``a`` up to
-but not including position ``b`` and ``storage[p]`` signifies the storage contents at slot ``p``.
+but not including position ``b``, ``storage[p]`` signifies the storage contents at slot ``p``, and
+similarly, ``transientStorage[p]`` signifies the transient storage contents at slot ``p``.
 
 Since Yul manages local variables and control-flow,
 opcodes that interfere with these features are not available. This includes
@@ -833,6 +834,10 @@ the ``dup`` and ``swap`` instructions as well as ``jump`` instructions, labels a
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | sstore(p, v)            | `-` | F | storage[p] := v                                                 |
 +-------------------------+-----+---+-----------------------------------------------------------------+
+| tload(p)                |     | N | transientStorage[p]                                             |
++-------------------------+-----+---+-----------------------------------------------------------------+
+| tstore(p, v)            | `-` | N | transientStorage[p] := v                                        |
++-------------------------+-----+---+-----------------------------------------------------------------+
 | msize()                 |     | F | size of memory, i.e. largest accessed memory index              |
 +-------------------------+-----+---+-----------------------------------------------------------------+
 | gas()                   |     | F | gas still available to execution                                |
diff --git a/libevmasm/GasMeter.cpp b/libevmasm/GasMeter.cpp
index 6594d1ff6c..5982b8a080 100644
--- a/libevmasm/GasMeter.cpp
+++ b/libevmasm/GasMeter.cpp
@@ -274,13 +274,14 @@ unsigned GasMeter::runGas(Instruction _instruction, langutil::EVMVersion _evmVer
 
 	switch (instructionInfo(_instruction, _evmVersion).gasPriceTier)
 	{
-	case Tier::Zero:    return GasCosts::tier0Gas;
-	case Tier::Base:    return GasCosts::tier1Gas;
-	case Tier::VeryLow: return GasCosts::tier2Gas;
-	case Tier::Low:     return GasCosts::tier3Gas;
-	case Tier::Mid:     return GasCosts::tier4Gas;
-	case Tier::High:    return GasCosts::tier5Gas;
-	case Tier::Ext:     return GasCosts::tier6Gas;
+	case Tier::Zero:		return GasCosts::tier0Gas;
+	case Tier::Base:		return GasCosts::tier1Gas;
+	case Tier::VeryLow:		return GasCosts::tier2Gas;
+	case Tier::Low:			return GasCosts::tier3Gas;
+	case Tier::Mid:			return GasCosts::tier4Gas;
+	case Tier::High:		return GasCosts::tier5Gas;
+	case Tier::Ext:			return GasCosts::tier6Gas;
+	case Tier::WarmAccess:	return GasCosts::warmStorageReadCost;
 	default: break;
 	}
 	assertThrow(false, OptimizerException, "Invalid gas tier for instruction " + instructionInfo(_instruction, _evmVersion).name);
diff --git a/libevmasm/Instruction.cpp b/libevmasm/Instruction.cpp
index c00bc35421..a21f33e183 100644
--- a/libevmasm/Instruction.cpp
+++ b/libevmasm/Instruction.cpp
@@ -90,6 +90,8 @@ std::map<std::string, Instruction> const solidity::evmasm::c_instructions =
 	{ "MSTORE8", Instruction::MSTORE8 },
 	{ "SLOAD", Instruction::SLOAD },
 	{ "SSTORE", Instruction::SSTORE },
+	{ "TLOAD", Instruction::TLOAD },
+	{ "TSTORE", Instruction::TSTORE },
 	{ "JUMP", Instruction::JUMP },
 	{ "JUMPI", Instruction::JUMPI },
 	{ "PC", Instruction::PC },
@@ -242,6 +244,8 @@ static std::map<Instruction, InstructionInfo> const c_instructionInfo =
 	{ Instruction::MSTORE8,		{ "MSTORE8",		0, 2, 0, true, Tier::VeryLow } },
 	{ Instruction::SLOAD,		{ "SLOAD",			0, 1, 1, false, Tier::Special } },
 	{ Instruction::SSTORE,		{ "SSTORE",			0, 2, 0, true, Tier::Special } },
+	{ Instruction::TLOAD,       { "TLOAD",          0, 1, 1, false, Tier::WarmAccess} },
+	{ Instruction::TSTORE,      { "TSTORE",         0, 2, 0, true, Tier::WarmAccess} },
 	{ Instruction::JUMP,		{ "JUMP",			0, 1, 0, true, Tier::Mid } },
 	{ Instruction::JUMPI,		{ "JUMPI",			0, 2, 0, true, Tier::High } },
 	{ Instruction::PC,			{ "PC",				0, 0, 1, false, Tier::Base } },
diff --git a/libevmasm/Instruction.h b/libevmasm/Instruction.h
index 4e7ac8b97f..1733863aa5 100644
--- a/libevmasm/Instruction.h
+++ b/libevmasm/Instruction.h
@@ -106,6 +106,9 @@ enum class Instruction: uint8_t
 	JUMPDEST,			///< set a potential jump destination
 	MCOPY = 0x5e,       ///< copy between memory areas
 
+	TLOAD = 0x5c,       ///< load word from transient storage
+	TSTORE = 0x5d,      ///< save word to transient storage
+
 	PUSH0 = 0x5f,       ///< place the value 0 on stack
 	PUSH1 = 0x60,		///< place 1 byte item on stack
 	PUSH2,				///< place 2 byte item on stack
@@ -293,6 +296,7 @@ enum class Tier
 	Mid,		// 8, Mid
 	High,		// 10, Slow
 	Ext,		// 20, Ext
+	WarmAccess,	// 100, Warm Access
 	ExtCode,	// 700, Extcode
 	Balance,	// 400, Balance
 	Special,	// multiparam or otherwise special
diff --git a/libevmasm/SemanticInformation.cpp b/libevmasm/SemanticInformation.cpp
index 5c8b986be9..c5e14d5f4b 100644
--- a/libevmasm/SemanticInformation.cpp
+++ b/libevmasm/SemanticInformation.cpp
@@ -37,6 +37,7 @@ std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperat
 	{
 		assertThrow(memory(_instruction) == Effect::None, OptimizerException, "");
 		assertThrow(storage(_instruction) != Effect::None, OptimizerException, "");
+		assertThrow(transientStorage(_instruction) == Effect::None, OptimizerException, "");
 		Operation op;
 		op.effect = storage(_instruction);
 		op.location = Location::Storage;
@@ -51,6 +52,7 @@ std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperat
 	{
 		assertThrow(memory(_instruction) != Effect::None, OptimizerException, "");
 		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
+		assertThrow(transientStorage(_instruction) == Effect::None, OptimizerException, "");
 		Operation op;
 		op.effect = memory(_instruction);
 		op.location = Location::Memory;
@@ -62,6 +64,19 @@ std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperat
 
 		return {op};
 	}
+	case Instruction::TSTORE:
+	case Instruction::TLOAD:
+	{
+		assertThrow(memory(_instruction) == Effect::None, OptimizerException, "");
+		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
+		assertThrow(transientStorage(_instruction) != Effect::None, OptimizerException, "");
+		Operation op;
+		op.effect = transientStorage(_instruction);
+		op.location = Location::TransientStorage;
+		op.startParameter = 0;
+		op.lengthConstant = 1;
+		return {op};
+	}
 	case Instruction::REVERT:
 	case Instruction::RETURN:
 	case Instruction::KECCAK256:
@@ -72,6 +87,7 @@ std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperat
 	case Instruction::LOG4:
 	{
 		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
+		assertThrow(transientStorage(_instruction) == Effect::None, OptimizerException, "");
 		assertThrow(memory(_instruction) == Effect::Read, OptimizerException, "");
 		Operation op;
 		op.effect = memory(_instruction);
@@ -84,6 +100,7 @@ std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperat
 	{
 		assertThrow(memory(_instruction) == Effect::Write, OptimizerException, "");
 		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
+		assertThrow(transientStorage(_instruction) == Effect::None, OptimizerException, "");
 		Operation op;
 		op.effect = memory(_instruction);
 		op.location = Location::Memory;
@@ -97,6 +114,7 @@ std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperat
 	{
 		assertThrow(memory(_instruction) == Effect::Write, OptimizerException, "");
 		assertThrow(storage(_instruction) == Effect::None, OptimizerException, "");
+		assertThrow(transientStorage(_instruction) == Effect::None, OptimizerException, "");
 		Operation op;
 		op.effect = memory(_instruction);
 		op.location = Location::Memory;
@@ -131,10 +149,14 @@ std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperat
 		size_t paramCount = static_cast<size_t>(instructionInfo(_instruction, langutil::EVMVersion()).args);
 		std::vector<Operation> operations{
 			Operation{Location::Memory, Effect::Read, paramCount - 4, paramCount - 3, {}},
-			Operation{Location::Storage, Effect::Read, {}, {}, {}}
+			Operation{Location::Storage, Effect::Read, {}, {}, {}},
+			Operation{Location::TransientStorage, Effect::Read, {}, {}, {}}
 		};
 		if (_instruction != Instruction::STATICCALL)
+		{
 			operations.emplace_back(Operation{Location::Storage, Effect::Write, {}, {}, {}});
+			operations.emplace_back(Operation{Location::TransientStorage, Effect::Write, {}, {}, {}});
+		}
 		operations.emplace_back(Operation{
 			Location::Memory,
 			Effect::Write,
@@ -157,13 +179,15 @@ std::vector<SemanticInformation::Operation> SemanticInformation::readWriteOperat
 				{}
 			},
 			Operation{Location::Storage, Effect::Read, {}, {}, {}},
-			Operation{Location::Storage, Effect::Write, {}, {}, {}}
+			Operation{Location::Storage, Effect::Write, {}, {}, {}},
+			Operation{Location::TransientStorage, Effect::Read, {}, {}, {}},
+			Operation{Location::TransientStorage, Effect::Write, {}, {}, {}}
 		};
 	case Instruction::MSIZE:
 		// This is just to satisfy the assert below.
 		return std::vector<Operation>{};
 	default:
-		assertThrow(storage(_instruction) == None && memory(_instruction) == None, AssemblyException, "");
+		assertThrow(storage(_instruction) == None && memory(_instruction) == None && transientStorage(_instruction) == None, AssemblyException, "");
 	}
 	return {};
 }
@@ -348,6 +372,7 @@ bool SemanticInformation::movable(Instruction _instruction)
 	case Instruction::EXTCODEHASH:
 	case Instruction::RETURNDATASIZE:
 	case Instruction::SLOAD:
+	case Instruction::TLOAD:
 	case Instruction::PC:
 	case Instruction::MSIZE:
 	case Instruction::GAS:
@@ -420,6 +445,7 @@ bool SemanticInformation::movableApartFromEffects(Instruction _instruction)
 	case Instruction::BALANCE:
 	case Instruction::SELFBALANCE:
 	case Instruction::SLOAD:
+	case Instruction::TLOAD:
 	case Instruction::KECCAK256:
 	case Instruction::MLOAD:
 		return true;
@@ -450,6 +476,27 @@ SemanticInformation::Effect SemanticInformation::storage(Instruction _instructio
 	}
 }
 
+SemanticInformation::Effect SemanticInformation::transientStorage(Instruction _instruction)
+{
+	switch (_instruction)
+	{
+	case Instruction::CALL:
+	case Instruction::CALLCODE:
+	case Instruction::DELEGATECALL:
+	case Instruction::CREATE:
+	case Instruction::CREATE2:
+	case Instruction::TSTORE:
+		return SemanticInformation::Write;
+
+	case Instruction::TLOAD:
+	case Instruction::STATICCALL:
+		return SemanticInformation::Read;
+
+	default:
+		return SemanticInformation::None;
+	}
+}
+
 SemanticInformation::Effect SemanticInformation::otherState(Instruction _instruction)
 {
 	switch (_instruction)
@@ -508,6 +555,7 @@ bool SemanticInformation::invalidInPureFunctions(Instruction _instruction)
 	case Instruction::GASLIMIT:
 	case Instruction::STATICCALL:
 	case Instruction::SLOAD:
+	case Instruction::TLOAD:
 		return true;
 	default:
 		break;
@@ -520,6 +568,7 @@ bool SemanticInformation::invalidInViewFunctions(Instruction _instruction)
 	switch (_instruction)
 	{
 	case Instruction::SSTORE:
+	case Instruction::TSTORE:
 	case Instruction::JUMP:
 	case Instruction::JUMPI:
 	case Instruction::LOG0:
diff --git a/libevmasm/SemanticInformation.h b/libevmasm/SemanticInformation.h
index 36aabd55f9..c3491cda8b 100644
--- a/libevmasm/SemanticInformation.h
+++ b/libevmasm/SemanticInformation.h
@@ -39,8 +39,8 @@ class AssemblyItem;
  */
 struct SemanticInformation
 {
-	/// Corresponds to the effect that a YUL-builtin has on a generic data location (storage, memory
-	/// and other blockchain state).
+	/// Corresponds to the effect that a YUL-builtin has on a generic data location (storage, memory,
+	/// transient storage and other blockchain state).
 	enum Effect
 	{
 		None,
@@ -48,7 +48,7 @@ struct SemanticInformation
 		Write
 	};
 
-	enum class Location { Storage, Memory };
+	enum class Location { Storage, Memory, TransientStorage };
 
 	/**
 	 * Represents a read or write operation from or to one of the data locations.
@@ -87,10 +87,10 @@ struct SemanticInformation
 	static bool terminatesControlFlow(Instruction _instruction);
 	static bool reverts(Instruction _instruction);
 	/// @returns false if the value put on the stack by _item depends on anything else than
-	/// the information in the current block header, memory, storage or stack.
+	/// the information in the current block header, memory, storage, transient storage or stack.
 	static bool isDeterministic(AssemblyItem const& _item);
 	/// @returns true if the instruction can be moved or copied (together with its arguments)
-	/// without altering the semantics. This means it cannot depend on storage or memory,
+	/// without altering the semantics. This means it cannot depend on storage, transient storage or memory,
 	/// cannot have any side-effects, but it can depend on a call-constant state of the blockchain.
 	static bool movable(Instruction _instruction);
 	/// If true, the expressions in this code can be moved or copied (together with their arguments)
@@ -109,6 +109,7 @@ struct SemanticInformation
 	static bool canBeRemovedIfNoMSize(Instruction _instruction);
 	static Effect memory(Instruction _instruction);
 	static Effect storage(Instruction _instruction);
+	static Effect transientStorage(Instruction _instruction);
 	static Effect otherState(Instruction _instruction);
 	static bool invalidInPureFunctions(Instruction _instruction);
 	static bool invalidInViewFunctions(Instruction _instruction);
diff --git a/libevmasm/SimplificationRule.h b/libevmasm/SimplificationRule.h
index 746dfa4c67..6d34a50410 100644
--- a/libevmasm/SimplificationRule.h
+++ b/libevmasm/SimplificationRule.h
@@ -136,6 +136,8 @@ struct EVMBuiltins
 	static auto constexpr MSTORE8 = PatternGenerator<Instruction::MSTORE8>{};
 	static auto constexpr SLOAD = PatternGenerator<Instruction::SLOAD>{};
 	static auto constexpr SSTORE = PatternGenerator<Instruction::SSTORE>{};
+	static auto constexpr TLOAD = PatternGenerator<Instruction::TLOAD>{};
+	static auto constexpr TSTORE = PatternGenerator<Instruction::TSTORE>{};
 	static auto constexpr PC = PatternGenerator<Instruction::PC>{};
 	static auto constexpr MSIZE = PatternGenerator<Instruction::MSIZE>{};
 	static auto constexpr GAS = PatternGenerator<Instruction::GAS>{};
diff --git a/liblangutil/EVMVersion.cpp b/liblangutil/EVMVersion.cpp
index 34996dc6b9..438932a1cd 100644
--- a/liblangutil/EVMVersion.cpp
+++ b/liblangutil/EVMVersion.cpp
@@ -55,6 +55,9 @@ bool EVMVersion::hasOpcode(Instruction _opcode) const
 		return hasBlobBaseFee();
 	case Instruction::MCOPY:
 		return hasMcopy();
+	case Instruction::TSTORE:
+	case Instruction::TLOAD:
+		return supportsTransientStorage();
 	default:
 		return true;
 	}
diff --git a/liblangutil/EVMVersion.h b/liblangutil/EVMVersion.h
index 5b4e73b15e..992933a898 100644
--- a/liblangutil/EVMVersion.h
+++ b/liblangutil/EVMVersion.h
@@ -106,6 +106,7 @@ class EVMVersion:
 	bool hasPush0() const { return *this >= shanghai(); }
 	bool hasBlobHash() const { return *this >= cancun(); }
 	bool hasMcopy() const { return *this >= cancun(); }
+	bool supportsTransientStorage() const { return *this >= cancun(); }
 
 	bool hasOpcode(evmasm::Instruction _opcode) const;
 
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index c4dade6898..97f3d6eeb5 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -319,6 +319,20 @@ std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 				"The underlying opcode will eventually undergo breaking changes, "
 				"and its use is not recommended."
 			);
+		else if (
+			m_evmVersion.supportsTransientStorage() &&
+			_funCall.functionName.name == "tstore"_yulstring
+		)
+			m_errorReporter.warning(
+				2394_error,
+				nativeLocationOf(_funCall.functionName),
+				"Transient storage as defined by EIP-1153 can break the composability of smart contracts: "
+				"Since transient storage is cleared only at the end of the transaction and not at the end of the outermost call frame to the contract within a transaction, "
+				"your contract may unintentionally misbehave when invoked multiple times in a complex transaction. "
+				"To avoid this, be sure to clear all transient storage at the end of any call to your contract. "
+				"The use of transient storage for reentrancy guards that are cleared at the end of the call is safe."
+			);
+
 		parameterTypes = &f->parameters;
 		returnTypes = &f->returns;
 		if (!f->literalArguments.empty())
@@ -739,6 +753,9 @@ bool AsmAnalyzer::validateInstructions(evmasm::Instruction _instr, SourceLocatio
 	else if (_instr == evmasm::Instruction::MCOPY && !m_evmVersion.hasMcopy())
 		// TODO: Change this assertion to an error, similar to the ones above, when Cancun becomes the default EVM version.
 		yulAssert(false);
+	else if ((_instr == evmasm::Instruction::TSTORE || _instr == evmasm::Instruction::TLOAD) && !m_evmVersion.supportsTransientStorage())
+		// TODO: Change this assertion to an error, similar to the ones above, when Cancun becomes the default EVM version.
+		yulAssert(false);
 	else if (_instr == evmasm::Instruction::PC)
 		m_errorReporter.error(
 			2450_error,
diff --git a/libyul/SideEffects.h b/libyul/SideEffects.h
index b6df8df83f..eb3fe9b55a 100644
--- a/libyul/SideEffects.h
+++ b/libyul/SideEffects.h
@@ -50,7 +50,7 @@ struct SideEffects
 	/// At statement level, it means that functions containing this code can be
 	/// called multiple times, their calls can be rearranged and calls can also be
 	/// deleted without changing the semantics.
-	/// This means it cannot depend on storage or memory, cannot have any side-effects,
+	/// This means it cannot depend on storage, memory or transient storage, cannot have any side-effects,
 	/// but it can depend on state that is constant across an EVM-call.
 	bool movable = true;
 	/// If true, the expressions in this code can be moved or copied (together with their arguments)
@@ -76,11 +76,15 @@ struct SideEffects
 	/// or `None` respectively. Note that, when the value is `Read`, the expression can have an
 	/// effect on `msize()`.
 	Effect memory = None;
+	/// Can write, read or have no effect on transient storage, when the value of `transientStorage` is `Write`, `Read`
+	/// or `None` respectively.  When the value is `Write`, the expression can invalidate transient storage,
+	/// potentially indirectly through external calls.
+	Effect transientStorage = None;
 
 	/// @returns the worst-case side effects.
 	static SideEffects worst()
 	{
-		return SideEffects{false, false, false, false, false, Write, Write, Write};
+		return SideEffects{false, false, false, false, false, Write, Write, Write, Write};
 	}
 
 	/// @returns the combined side effects of two pieces of code.
@@ -94,7 +98,8 @@ struct SideEffects
 			cannotLoop && _other.cannotLoop,
 			otherState + _other.otherState,
 			storage + _other.storage,
-			memory + _other.memory
+			memory + _other.memory,
+			transientStorage + _other.transientStorage
 		};
 	}
 
@@ -115,7 +120,8 @@ struct SideEffects
 			cannotLoop == _other.cannotLoop &&
 			otherState == _other.otherState &&
 			storage == _other.storage &&
-			memory == _other.memory;
+			memory == _other.memory &&
+			transientStorage == _other.transientStorage;
 	}
 };
 
diff --git a/libyul/backends/evm/EVMDialect.cpp b/libyul/backends/evm/EVMDialect.cpp
index 36e6f1d007..f3c529bb1a 100644
--- a/libyul/backends/evm/EVMDialect.cpp
+++ b/libyul/backends/evm/EVMDialect.cpp
@@ -148,6 +148,14 @@ std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 	{
 		return _instr == evmasm::Instruction::BLOBHASH && _evmVersion < langutil::EVMVersion::cancun();
 	};
+	// TODO remove this in 0.9.0. We allow creating functions or identifiers in Yul with the names
+	// tstore or tload for VMs before cancun.
+	auto transientStorageException = [&](evmasm::Instruction _instr) -> bool
+	{
+		return
+			_evmVersion < langutil::EVMVersion::cancun() &&
+			(_instr == evmasm::Instruction::TSTORE || _instr == evmasm::Instruction::TLOAD);
+	};
 
 	std::set<YulString> reserved;
 	for (auto const& instr: evmasm::c_instructions)
@@ -158,7 +166,8 @@ std::set<YulString> createReservedIdentifiers(langutil::EVMVersion _evmVersion)
 			!prevRandaoException(name) &&
 			!blobHashException(instr.second) &&
 			!blobBaseFeeException(instr.second) &&
-			!mcopyException(instr.second)
+			!mcopyException(instr.second) &&
+			!transientStorageException(instr.second)
 		)
 			reserved.emplace(name);
 	}
@@ -277,7 +286,17 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 			"datacopy",
 			3,
 			0,
-			SideEffects{false, true, false, false, true, SideEffects::None, SideEffects::None, SideEffects::Write},
+			SideEffects{
+				false,				// movable
+				true,				// movableApartFromEffects
+				false,				// canBeRemoved
+				false,				// canBeRemovedIfNotMSize
+				true,				// cannotLoop
+				SideEffects::None,	// otherState
+				SideEffects::None,	// storage
+				SideEffects::Write,	// memory
+				SideEffects::None	// transientStorage
+			},
 			{},
 			[](
 				FunctionCall const&,
@@ -291,7 +310,17 @@ std::map<YulString, BuiltinFunctionForEVM> createBuiltins(langutil::EVMVersion _
 			"setimmutable",
 			3,
 			0,
-			SideEffects{false, false, false, false, true, SideEffects::None, SideEffects::None, SideEffects::Write},
+			SideEffects{
+				false,				// movable
+				false,				// movableApartFromEffects
+				false,				// canBeRemoved
+				false,				// canBeRemovedIfNotMSize
+				true,				// cannotLoop
+				SideEffects::None,	// otherState
+				SideEffects::None,	// storage
+				SideEffects::Write,	// memory
+				SideEffects::None	// transientStorage
+			},
 			{std::nullopt, LiteralKind::String, std::nullopt},
 			[](
 				FunctionCall const& _call,
@@ -396,6 +425,7 @@ SideEffects EVMDialect::sideEffectsOfInstruction(evmasm::Instruction _instructio
 		translate(evmasm::SemanticInformation::otherState(_instruction)),
 		translate(evmasm::SemanticInformation::storage(_instruction)),
 		translate(evmasm::SemanticInformation::memory(_instruction)),
+		translate(evmasm::SemanticInformation::transientStorage(_instruction)),
 	};
 }
 
diff --git a/libyul/optimiser/Semantics.h b/libyul/optimiser/Semantics.h
index 762c801106..df8ae17a58 100644
--- a/libyul/optimiser/Semantics.h
+++ b/libyul/optimiser/Semantics.h
@@ -78,7 +78,8 @@ class SideEffectsCollector: public ASTWalker
 			!m_sideEffects.movableApartFromEffects ||
 			m_sideEffects.storage == SideEffects::Write ||
 			m_sideEffects.otherState == SideEffects::Write ||
-			m_sideEffects.memory == SideEffects::Write
+			m_sideEffects.memory == SideEffects::Write ||
+			m_sideEffects.transientStorage == SideEffects::Write
 		)
 			return false;
 
@@ -94,6 +95,10 @@ class SideEffectsCollector: public ASTWalker
 			if (_codeContainsMSize || _other.memory == SideEffects::Write)
 				return false;
 
+		if (m_sideEffects.transientStorage == SideEffects::Read)
+			if (_other.transientStorage == SideEffects::Write)
+				return false;
+
 		return true;
 	}
 
diff --git a/libyul/optimiser/UnusedStoreEliminator.cpp b/libyul/optimiser/UnusedStoreEliminator.cpp
index 95296369b7..ed3394847c 100644
--- a/libyul/optimiser/UnusedStoreEliminator.cpp
+++ b/libyul/optimiser/UnusedStoreEliminator.cpp
@@ -214,7 +214,10 @@ void UnusedStoreEliminator::visit(Statement const& _statement)
 		if (operations.front().location == Location::Storage)
 			activeStorageStores().insert(&_statement);
 		else
+		{
+			yulAssert(operations.front().location == Location::Memory, "");
 			activeMemoryStores().insert(&_statement);
+		}
 		m_storeOperations[&_statement] = std::move(operations.front());
 	}
 }
diff --git a/scripts/test_antlr_grammar.sh b/scripts/test_antlr_grammar.sh
index d21228c5be..5256b81286 100755
--- a/scripts/test_antlr_grammar.sh
+++ b/scripts/test_antlr_grammar.sh
@@ -131,6 +131,8 @@ done < <(
       # Skipping a test with "let blobhash := ..."
       grep -v -E 'inlineAssembly/blobhash_pre_cancun.sol' |
       grep -v -E 'inlineAssembly/blobhash_pre_cancun_not_reserved.sol' |
+      # Skipping tests with "let tstore/tload := ..."
+      grep -v -E 'inlineAssembly/tload_tstore_not_reserved_before_cancun.sol' |
       # Skipping license error, unrelated to the grammar
       grep -v -E 'license/license_double5.sol' |
       grep -v -E 'license/license_hidden_unicode.sol' |
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 84327a5b97..5b4776273c 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -186,11 +186,16 @@ void EVMHost::newTransactionFrame()
 	recorded_account_accesses.clear();
 
 	for (auto& [address, account]: accounts)
+	{
 		for (auto& [slot, value]: account.storage)
 		{
 			value.access_status = EVMC_ACCESS_COLD; // Clear EIP-2929 storage access indicator
 			value.original = value.current;			// Clear EIP-2200 dirty slot
 		}
+
+		// Clear transient storage according to EIP 1153
+		account.transient_storage.clear();
+	}
 	// Process selfdestruct list
 	for (auto& [address, _]: recorded_selfdestructs)
 		accounts.erase(address);
diff --git a/test/cmdlineTests/evmasm_transient_storage_opcodes/args b/test/cmdlineTests/evmasm_transient_storage_opcodes/args
new file mode 100644
index 0000000000..552cea1ca1
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_opcodes/args
@@ -0,0 +1 @@
+--evm-version cancun --no-cbor-metadata --via-ir --optimize --opcodes --asm --debug-info none
diff --git a/test/cmdlineTests/evmasm_transient_storage_opcodes/err b/test/cmdlineTests/evmasm_transient_storage_opcodes/err
new file mode 100644
index 0000000000..a6cd56261e
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_opcodes/err
@@ -0,0 +1,5 @@
+Warning: Transient storage as defined by EIP-1153 can break the composability of smart contracts: Since transient storage is cleared only at the end of the transaction and not at the end of the outermost call frame to the contract within a transaction, your contract may unintentionally misbehave when invoked multiple times in a complex transaction. To avoid this, be sure to clear all transient storage at the end of any call to your contract. The use of transient storage for reentrancy guards that are cleared at the end of the call is safe.
+ --> evmasm_transient_storage_opcodes/input.sol:7:13:
+  |
+7 |             tstore(0, 0)
+  |             ^^^^^^
diff --git a/test/cmdlineTests/evmasm_transient_storage_opcodes/input.sol b/test/cmdlineTests/evmasm_transient_storage_opcodes/input.sol
new file mode 100644
index 0000000000..94914ac4ee
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_opcodes/input.sol
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.0.0;
+
+contract C {
+    fallback() external {
+        assembly {
+            tstore(0, 0)
+            sstore(0, tload(0))
+        }
+    }
+}
diff --git a/test/cmdlineTests/evmasm_transient_storage_opcodes/output b/test/cmdlineTests/evmasm_transient_storage_opcodes/output
new file mode 100644
index 0000000000..3d1eddc9ad
--- /dev/null
+++ b/test/cmdlineTests/evmasm_transient_storage_opcodes/output
@@ -0,0 +1,36 @@
+
+======= evmasm_transient_storage_opcodes/input.sol:C =======
+EVM assembly:
+  0x80
+  dup1
+  0x40
+  mstore
+  jumpi(tag_1, callvalue)
+  dataSize(sub_0)
+  swap1
+  dup2
+  dataOffset(sub_0)
+  dup3
+  codecopy
+  return
+tag_1:
+  0x00
+  dup1
+  revert
+stop
+
+sub_0: assembly {
+      jumpi(tag_1, callvalue)
+      0x00
+      dup1
+      tstore
+      sstore(0x00, tload(0x00))
+      stop
+    tag_1:
+      0x00
+      dup1
+      revert
+}
+
+Opcodes:
+PUSH1 0x80 DUP1 PUSH1 0x40 MSTORE CALLVALUE PUSH1 0x13 JUMPI PUSH1 0x10 SWAP1 DUP2 PUSH1 0x18 DUP3 CODECOPY RETURN JUMPDEST PUSH0 DUP1 REVERT INVALID CALLVALUE PUSH1 0xC JUMPI PUSH0 DUP1 TSTORE PUSH0 TLOAD PUSH0 SSTORE STOP JUMPDEST PUSH0 DUP1 REVERT 
diff --git a/test/libsolidity/semanticTests/inlineAssembly/tload_tstore_not_reserved_before_cancun.sol b/test/libsolidity/semanticTests/inlineAssembly/tload_tstore_not_reserved_before_cancun.sol
new file mode 100644
index 0000000000..930c531eaa
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/tload_tstore_not_reserved_before_cancun.sol
@@ -0,0 +1,25 @@
+contract C {
+    function f() public view returns (uint ret) {
+        assembly {
+            let tload := sload(0)
+            let tstore := add(tload, 1)
+            ret := tstore
+        }
+    }
+    function g() public view returns (uint ret) {
+        assembly {
+            function tstore() -> a {
+                a := 2
+            }
+            function tload() -> b {
+                b := 3
+            }
+            ret := add(tstore(), tload())
+        }
+    }
+}
+// ====
+// EVMVersion: <cancun
+// ----
+// f() -> 1
+// g() -> 5
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_creation.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_creation.sol
new file mode 100644
index 0000000000..5a97dc84ac
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_creation.sol
@@ -0,0 +1,14 @@
+contract C {
+    constructor() {
+        uint x;
+        assembly {
+            tstore(0, 42)
+            x := tload(0)
+        }
+        assert(x == 42);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// constructor() ->
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_low_level_calls.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_low_level_calls.sol
new file mode 100644
index 0000000000..f3fe038447
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_low_level_calls.sol
@@ -0,0 +1,70 @@
+contract D {
+    function addOne() external {
+        assembly {
+            let x := tload(0)
+            tstore(0, add(x, 1))
+        }
+    }
+    function get() external returns (uint x) {
+        assembly {
+            x := tload(0)
+        }
+    }
+}
+
+contract C {
+    function set(uint x) external {
+        assembly {
+            tstore(0, x)
+        }
+    }
+
+    function get() external view returns (uint x) {
+        assembly {
+            x := tload(0)
+        }
+    }
+
+    function testDelegateCall() external returns (bool) {
+        this.set(5);
+        D d = new D();
+        // Caller contract is the owner of the transient storage
+        (bool success, ) = address(d).delegatecall(abi.encodeCall(d.addOne, ()));
+        require(success);
+        require(this.get() == 6);
+        return true;
+    }
+
+    function testCall() external returns (bool) {
+        this.set(5);
+        D d = new D();
+        // Callee/Target contract is the owner of the transient storage
+        (bool success, ) = address(d).call(abi.encodeCall(d.addOne, ()));
+        require(success);
+        require(d.get() == 1);
+        return true;
+    }
+
+    function tloadAllowedStaticCall() external returns (bool) {
+        this.set(5);
+        D d = new D();
+        (bool success, bytes memory result) = address(d).staticcall(abi.encodeCall(d.get, ()));
+        require(success);
+        require(abi.decode(result, (uint)) == 0);
+        return true;
+    }
+
+    function tstoreNotAllowedStaticCall() external returns (bool) {
+        D d = new D();
+        (bool success, ) = address(d).staticcall(abi.encodeCall(d.addOne, ()));
+        require(!success);
+        return true;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// testDelegateCall() -> true
+// testCall() -> true
+// tloadAllowedStaticCall() -> true
+// tstoreNotAllowedStaticCall() -> true
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_multiple_calls_different_transactions.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_multiple_calls_different_transactions.sol
new file mode 100644
index 0000000000..c82286550e
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_multiple_calls_different_transactions.sol
@@ -0,0 +1,24 @@
+contract C {
+    function get(uint256 addr) external view returns (uint256 x) {
+        assembly {
+            x := tload(addr)
+        }
+    }
+    function set(uint256 addr, uint256 x) external {
+        assembly {
+            tstore(addr, x)
+        }
+    }
+    function test() public {
+        assert(this.get(0) == 0 && this.get(42) == 0);
+        this.set(0, 21);
+        assert(this.get(0) == 21 && this.get(42) == 0);
+        this.set(42, 131);
+        assert(this.get(0) == 21 && this.get(42) == 131);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// test() ->
+// test() ->
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_multiple_transactions.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_multiple_transactions.sol
new file mode 100644
index 0000000000..931f34ded5
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_multiple_transactions.sol
@@ -0,0 +1,38 @@
+contract C {
+    function set(uint value) private {
+        assembly {
+            tstore(0, value)
+        }
+    }
+
+    function get() private view returns (uint value) {
+        assembly {
+            value := tload(0)
+        }
+    }
+
+    function f() external {
+        assembly {
+            tstore(0, 42)
+        }
+    }
+
+    function g() external view returns(uint r) {
+        assembly {
+            r := tload(0)
+        }
+    }
+
+    function h() external returns (uint x) {
+        set(99);
+        x = get();
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// g() -> 0
+// f() ->
+// g() -> 0
+// h() -> 0x63
+// g() -> 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_reset_between_creation_runtime.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_reset_between_creation_runtime.sol
new file mode 100644
index 0000000000..e41fcb6003
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_reset_between_creation_runtime.sol
@@ -0,0 +1,24 @@
+contract C {
+    constructor() {
+        uint x;
+        assembly {
+            tstore(0, 42)
+            x := tload(0)
+        }
+        assert(x == 42);
+    }
+
+    function f() public returns (uint x) {
+        assembly {
+            x := tload(0)
+            if eq(x, 42) {
+                revert(0, 0)
+            }
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// constructor() ->
+// f() -> 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_sanity_checks.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_sanity_checks.sol
new file mode 100644
index 0000000000..101c3c103d
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_sanity_checks.sol
@@ -0,0 +1,24 @@
+contract C {
+    function f() external {
+        assembly {
+            tstore(0, 21)
+            mstore(0, 42)
+            sstore(0, 42)
+            if iszero(eq(tload(0), 21)) {
+                revert(0, 0)
+            }
+        }
+    }
+    function g() external view returns (uint s, uint m, uint t) {
+        assembly {
+            s := sload(0)
+            m := mload(0)
+            t := tload(0)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f() ->
+// g() -> 0x2a, 0, 0
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
new file mode 100644
index 0000000000..935435420e
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_selfdestruct.sol
@@ -0,0 +1,44 @@
+contract C {
+    function set(uint value) external {
+        assembly {
+            tstore(0, value)
+        }
+    }
+
+    function get() external view returns (uint value) {
+        assembly {
+            value := tload(0)
+        }
+    }
+
+    function terminate(address payable a) external {
+        selfdestruct(a);
+    }
+}
+
+contract D {
+    C public c;
+
+    constructor() {
+        c = new C();
+    }
+
+    function destroy() external {
+        c.set(42);
+        c.terminate(payable(address(this)));
+        assert(c.get() == 42);
+    }
+
+    function createAndDestroy() external {
+        c = new C();
+        c.set(42);
+        c.terminate(payable(address(this)));
+        assert(c.get() == 42);
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// constructor() ->
+// destroy() ->
+// createAndDestroy() ->
diff --git a/test/libsolidity/semanticTests/inlineAssembly/transient_storage_simple_reentrancy_lock.sol b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_simple_reentrancy_lock.sol
new file mode 100644
index 0000000000..0d05c926ce
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/transient_storage_simple_reentrancy_lock.sol
@@ -0,0 +1,22 @@
+contract C {
+    modifier nonreentrant {
+        assembly {
+            if tload(0) { revert(0, 0) }
+            tstore(0, 1)
+        }
+        _;
+        assembly {
+            tstore(0, 0)
+        }
+    }
+    function f(bool simulateReentrancy) nonreentrant public {
+        if (simulateReentrancy) {
+            f(false);
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// f(bool): false ->
+// f(bool): true -> FAILURE
diff --git a/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol b/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol
new file mode 100644
index 0000000000..bdd9401ee5
--- /dev/null
+++ b/test/libsolidity/semanticTests/inlineAssembly/tstore_hidden_staticcall.sol
@@ -0,0 +1,20 @@
+contract C {
+    function f() internal {
+        assembly {
+            tstore(0, 0)
+        }
+    }
+    function g() public view {
+        function() internal ptr = f;
+        function() internal view ptr2;
+        assembly { ptr2 := ptr }
+        ptr2(); // we force calling the non-view function, which should result in a revert during the staticcall
+    }
+    function test() public {
+        this.g(); // an external call to a view function should use static call
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// test() -> FAILURE
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/tload_reserved_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/tload_reserved_cancun.sol
new file mode 100644
index 0000000000..77c9885776
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/tload_reserved_cancun.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() public view returns (uint ret) {
+        assembly {
+            let tload := sload(0)
+            ret := tload
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// ParserError 5568: (98-103): Cannot use builtin function name "tload" as identifier name.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_invalid_pre_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_invalid_pre_cancun.sol
new file mode 100644
index 0000000000..25ae9e9d17
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_invalid_pre_cancun.sol
@@ -0,0 +1,13 @@
+contract C {
+    function f() public {
+        assembly {
+            tstore(0, 13)
+            tload(0)
+        }
+    }
+}
+// ====
+// EVMVersion: <cancun
+// ----
+// DeclarationError 4619: (70-76): Function "tstore" not found.
+// DeclarationError 4619: (96-101): Function "tload" not found.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_opcodes.sol b/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_opcodes.sol
new file mode 100644
index 0000000000..2009cdcaa0
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/transient_storage_opcodes.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() external returns(uint a) {
+        assembly {
+            tstore(0, 13)
+            a := tload(0)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 2394: (88-94): Transient storage as defined by EIP-1153 can break the composability of smart contracts: Since transient storage is cleared only at the end of the transaction and not at the end of the outermost call frame to the contract within a transaction, your contract may unintentionally misbehave when invoked multiple times in a complex transaction. To avoid this, be sure to clear all transient storage at the end of any call to your contract. The use of transient storage for reentrancy guards that are cleared at the end of the call is safe.
diff --git a/test/libsolidity/syntaxTests/inlineAssembly/tstore_reserved_cancun.sol b/test/libsolidity/syntaxTests/inlineAssembly/tstore_reserved_cancun.sol
new file mode 100644
index 0000000000..9f08d985aa
--- /dev/null
+++ b/test/libsolidity/syntaxTests/inlineAssembly/tstore_reserved_cancun.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() public view returns (uint ret) {
+        assembly {
+            let tstore := sload(0)
+            ret := tstore
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// ParserError 5568: (98-104): Cannot use builtin function name "tstore" as identifier name.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
index 8aacecdec7..dcf6d6c6fc 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed_view_cancun.sol
@@ -4,6 +4,7 @@ contract C {
             pop(blobhash(0))
             pop(blobbasefee())
             mcopy(1, 2, 3)
+            pop(tload(0))
         }
     }
 }
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/tload_not_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/tload_not_pure.sol
new file mode 100644
index 0000000000..13b44f197f
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/tload_not_pure.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() external pure {
+        assembly {
+            pop(tload(0))
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// TypeError 2527: (81-89): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/tload_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/tload_view.sol
new file mode 100644
index 0000000000..c94bd86702
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/tload_view.sol
@@ -0,0 +1,10 @@
+contract C {
+    function f() external view returns (uint a) {
+        assembly {
+            a := tload(0)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/tstore_not_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/tstore_not_pure.sol
new file mode 100644
index 0000000000..3cda8d08e9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/tstore_not_pure.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() external pure {
+        assembly {
+            tstore(0, 0)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 2394: (77-83): Transient storage as defined by EIP-1153 can break the composability of smart contracts: Since transient storage is cleared only at the end of the transaction and not at the end of the outermost call frame to the contract within a transaction, your contract may unintentionally misbehave when invoked multiple times in a complex transaction. To avoid this, be sure to clear all transient storage at the end of any call to your contract. The use of transient storage for reentrancy guards that are cleared at the end of the call is safe.
+// TypeError 8961: (77-89): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/tstore_not_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/tstore_not_view.sol
new file mode 100644
index 0000000000..5e02ef910c
--- /dev/null
+++ b/test/libsolidity/syntaxTests/viewPureChecker/tstore_not_view.sol
@@ -0,0 +1,12 @@
+contract C {
+    function f() external view {
+        assembly {
+            tstore(0, 0)
+        }
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 2394: (77-83): Transient storage as defined by EIP-1153 can break the composability of smart contracts: Since transient storage is cleared only at the end of the transaction and not at the end of the outermost call frame to the contract within a transaction, your contract may unintentionally misbehave when invoked multiple times in a complex transaction. To avoid this, be sure to clear all transient storage at the end of any call to your contract. The use of transient storage for reentrancy guards that are cleared at the end of the call is safe.
+// TypeError 8961: (77-89): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libyul/yulInterpreterTests/access_large_memory_offsets.yul b/test/libyul/yulInterpreterTests/access_large_memory_offsets.yul
index 483220bc13..ce108ddf7d 100644
--- a/test/libyul/yulInterpreterTests/access_large_memory_offsets.yul
+++ b/test/libyul/yulInterpreterTests/access_large_memory_offsets.yul
@@ -12,3 +12,4 @@
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000007
 //   0000000000000000000000000000000000000000000000000000000000000001: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/ambiguous_vars.yul b/test/libyul/yulInterpreterTests/ambiguous_vars.yul
index 25e0928ae6..2fca766ea1 100644
--- a/test/libyul/yulInterpreterTests/ambiguous_vars.yul
+++ b/test/libyul/yulInterpreterTests/ambiguous_vars.yul
@@ -12,3 +12,4 @@
 //      0: 0000000000000000000000000000000000000000000000000000000000000003
 //     20: 0000000000000000000000000000000000000000000000000000000000000002
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/and_create.yul b/test/libyul/yulInterpreterTests/and_create.yul
index cf32c4658e..da962c3c0b 100644
--- a/test/libyul/yulInterpreterTests/and_create.yul
+++ b/test/libyul/yulInterpreterTests/and_create.yul
@@ -11,3 +11,4 @@
 // Memory dump:
 //      0: 0000000000000000000000000000000000000000000000000000000000000001
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/and_create2.yul b/test/libyul/yulInterpreterTests/and_create2.yul
index 5201b0188a..0b83d818f0 100644
--- a/test/libyul/yulInterpreterTests/and_create2.yul
+++ b/test/libyul/yulInterpreterTests/and_create2.yul
@@ -13,3 +13,4 @@
 // Memory dump:
 //      0: 0000000000000000000000000000000000000000000000000000000000000001
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/blobbasefee.yul b/test/libyul/yulInterpreterTests/blobbasefee.yul
index d863b1d826..5dd9095e76 100644
--- a/test/libyul/yulInterpreterTests/blobbasefee.yul
+++ b/test/libyul/yulInterpreterTests/blobbasefee.yul
@@ -8,3 +8,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000001
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/blobhash.yul b/test/libyul/yulInterpreterTests/blobhash.yul
index 2d5ff80f03..48ed47c685 100644
--- a/test/libyul/yulInterpreterTests/blobhash.yul
+++ b/test/libyul/yulInterpreterTests/blobhash.yul
@@ -11,3 +11,4 @@
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 014916dd28fc4c10d78e287ca5d9cc51ee1ae73cbfde08c6b37324cbfaac8bc5
 //   0000000000000000000000000000000000000000000000000000000000000001: 0167d3dbed802941483f1afa2a6bc68de5f653128aca9bf1461c5d0a3ad36ed2
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/bounded_recursion.yul b/test/libyul/yulInterpreterTests/bounded_recursion.yul
index ce22638ca1..48d133409e 100644
--- a/test/libyul/yulInterpreterTests/bounded_recursion.yul
+++ b/test/libyul/yulInterpreterTests/bounded_recursion.yul
@@ -14,3 +14,4 @@
 // Memory dump:
 //      0: 0000000000000000000000000000000000000000000000000000000000000096
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/create2.yul b/test/libyul/yulInterpreterTests/create2.yul
index 928a163046..b7484f5db8 100644
--- a/test/libyul/yulInterpreterTests/create2.yul
+++ b/test/libyul/yulInterpreterTests/create2.yul
@@ -11,3 +11,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000020
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/datacopy.yul b/test/libyul/yulInterpreterTests/datacopy.yul
index fb8998c8bc..ce5b6ce5c5 100644
--- a/test/libyul/yulInterpreterTests/datacopy.yul
+++ b/test/libyul/yulInterpreterTests/datacopy.yul
@@ -16,3 +16,4 @@ object "main"
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 6465636f00000000000000000000000000000000000000000000000000000000
 //   0000000000000000000000000000000000000000000000000000000000000001: 636f6465636f6465000000000000000000000000000000000000000000000000
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/dataoffset.yul b/test/libyul/yulInterpreterTests/dataoffset.yul
index 399a8c95ce..f5a9aeb12f 100644
--- a/test/libyul/yulInterpreterTests/dataoffset.yul
+++ b/test/libyul/yulInterpreterTests/dataoffset.yul
@@ -12,3 +12,4 @@ object "main"
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 000000000000000000000000000000000000000000000000000000000000006e
 //   0000000000000000000000000000000000000000000000000000000000000001: 000000000000000000000000000000000000000000000000000000000000070c
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/datasize.yul b/test/libyul/yulInterpreterTests/datasize.yul
index 6e38e93211..ff80edee7c 100644
--- a/test/libyul/yulInterpreterTests/datasize.yul
+++ b/test/libyul/yulInterpreterTests/datasize.yul
@@ -12,3 +12,4 @@ object "main"
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000b64
 //   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000109
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/difficulty.yul b/test/libyul/yulInterpreterTests/difficulty.yul
index 7a59bade2a..bea70cb44d 100644
--- a/test/libyul/yulInterpreterTests/difficulty.yul
+++ b/test/libyul/yulInterpreterTests/difficulty.yul
@@ -8,3 +8,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000009999999
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/exp.yul b/test/libyul/yulInterpreterTests/exp.yul
index 07e7d7f723..15825b8a75 100644
--- a/test/libyul/yulInterpreterTests/exp.yul
+++ b/test/libyul/yulInterpreterTests/exp.yul
@@ -6,3 +6,4 @@
 // Memory dump:
 //      0: 8e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e38e39
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/expr_nesting_depth_exceeded.yul b/test/libyul/yulInterpreterTests/expr_nesting_depth_exceeded.yul
index c1456b00f3..5447dcb91c 100644
--- a/test/libyul/yulInterpreterTests/expr_nesting_depth_exceeded.yul
+++ b/test/libyul/yulInterpreterTests/expr_nesting_depth_exceeded.yul
@@ -12,3 +12,4 @@
 //   Maximum expression nesting level reached.
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/expr_nesting_depth_not_exceeded.yul b/test/libyul/yulInterpreterTests/expr_nesting_depth_not_exceeded.yul
index 0a34705712..19aa3677f0 100644
--- a/test/libyul/yulInterpreterTests/expr_nesting_depth_not_exceeded.yul
+++ b/test/libyul/yulInterpreterTests/expr_nesting_depth_not_exceeded.yul
@@ -12,3 +12,4 @@
 // Memory dump:
 //      0: 000000000000000000000000000000000000000000000000000000000000001f
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/external_call_to_self.yul b/test/libyul/yulInterpreterTests/external_call_to_self.yul
index ad2d2bb77f..3f5c887b4a 100644
--- a/test/libyul/yulInterpreterTests/external_call_to_self.yul
+++ b/test/libyul/yulInterpreterTests/external_call_to_self.yul
@@ -20,3 +20,4 @@
 //    100: 0000000000000000000000000000000000000000000000000000000000000042
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000100: 0000000000000000000000000000000000000000000000000000000000000001
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/external_call_unexecuted.yul b/test/libyul/yulInterpreterTests/external_call_unexecuted.yul
index 5edfe600d2..0a5458b47e 100644
--- a/test/libyul/yulInterpreterTests/external_call_unexecuted.yul
+++ b/test/libyul/yulInterpreterTests/external_call_unexecuted.yul
@@ -8,3 +8,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul b/test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul
index 427d5604b3..5245d7443a 100644
--- a/test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul
+++ b/test/libyul/yulInterpreterTests/external_callcode_unexecuted.yul
@@ -8,3 +8,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul b/test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul
index 6617825894..a827181fca 100644
--- a/test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul
+++ b/test/libyul/yulInterpreterTests/external_delegatecall_unexecuted.yul
@@ -8,3 +8,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul b/test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul
index 32b50270da..66ea146a06 100644
--- a/test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul
+++ b/test/libyul/yulInterpreterTests/external_staticcall_unexecuted.yul
@@ -10,3 +10,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000064: 0000000000000000000000000000000000000000000000000000000000000001
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/function_calls.yul b/test/libyul/yulInterpreterTests/function_calls.yul
index 2abc26380a..69a351ae3f 100644
--- a/test/libyul/yulInterpreterTests/function_calls.yul
+++ b/test/libyul/yulInterpreterTests/function_calls.yul
@@ -11,3 +11,4 @@
 // Memory dump:
 // Storage dump:
 //   000000000000000000000000000000000000000000000000000000000000000d: 000000000000000000000000000000000000000000000000000000000000002a
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/function_scopes.yul b/test/libyul/yulInterpreterTests/function_scopes.yul
index 0150fa990b..48e29a40e4 100644
--- a/test/libyul/yulInterpreterTests/function_scopes.yul
+++ b/test/libyul/yulInterpreterTests/function_scopes.yul
@@ -18,3 +18,4 @@
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000007
 //   0000000000000000000000000000000000000000000000000000000000000001: 0000000000000000000000000000000000000000000000000000000000000008
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/hex_literals.yul b/test/libyul/yulInterpreterTests/hex_literals.yul
index 60e59b2193..a0710de4e3 100644
--- a/test/libyul/yulInterpreterTests/hex_literals.yul
+++ b/test/libyul/yulInterpreterTests/hex_literals.yul
@@ -10,3 +10,4 @@
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 112233445566778899aabbccddeeff6677889900000000000000000000000000
 //   0000000000000000000000000000000000000000000000000000000000000001: 1234abcd00000000000000000000000000000000000000000000000000000000
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/infinite_recursion.yul b/test/libyul/yulInterpreterTests/infinite_recursion.yul
index 0e3109ab5e..91d1773f17 100644
--- a/test/libyul/yulInterpreterTests/infinite_recursion.yul
+++ b/test/libyul/yulInterpreterTests/infinite_recursion.yul
@@ -9,3 +9,4 @@
 //   Interpreter execution step limit reached.
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul b/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
index 45d3cc781c..207d004e34 100644
--- a/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
+++ b/test/libyul/yulInterpreterTests/infinite_recursion_tracelimit.yul
@@ -42,3 +42,4 @@
 //   Trace size limit reached.
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/leave.yul b/test/libyul/yulInterpreterTests/leave.yul
index 6f082ee33e..b127f31298 100644
--- a/test/libyul/yulInterpreterTests/leave.yul
+++ b/test/libyul/yulInterpreterTests/leave.yul
@@ -18,3 +18,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000005: 0000000000000000000000000000000000000000000000000000000000000001
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/leave_for_init.yul b/test/libyul/yulInterpreterTests/leave_for_init.yul
index cd0557e71b..ad4965e4fe 100644
--- a/test/libyul/yulInterpreterTests/leave_for_init.yul
+++ b/test/libyul/yulInterpreterTests/leave_for_init.yul
@@ -16,3 +16,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000007
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/long_obect_name.yul b/test/libyul/yulInterpreterTests/long_obect_name.yul
index 4105c6e42d..ede3040299 100644
--- a/test/libyul/yulInterpreterTests/long_obect_name.yul
+++ b/test/libyul/yulInterpreterTests/long_obect_name.yul
@@ -17,3 +17,4 @@ object "t" {
 // Trace:
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/loop.yul b/test/libyul/yulInterpreterTests/loop.yul
index 08ed090c33..cccbdc0c94 100644
--- a/test/libyul/yulInterpreterTests/loop.yul
+++ b/test/libyul/yulInterpreterTests/loop.yul
@@ -8,3 +8,4 @@
 // Memory dump:
 //     40: 0000000000000000000000900000000000000000000000000000000000000000
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/mcopy.yul b/test/libyul/yulInterpreterTests/mcopy.yul
index 7331544b8b..6483239cb1 100644
--- a/test/libyul/yulInterpreterTests/mcopy.yul
+++ b/test/libyul/yulInterpreterTests/mcopy.yul
@@ -32,3 +32,4 @@
 //    100: 1111111111111111111111111111111122222222222222222222222222222222
 //    120: 0000000000000000000000000000000044000000000000000000000000000000
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/mcopy_memory_access_out_of_range.yul b/test/libyul/yulInterpreterTests/mcopy_memory_access_out_of_range.yul
index 45599109b5..d45163b8ff 100644
--- a/test/libyul/yulInterpreterTests/mcopy_memory_access_out_of_range.yul
+++ b/test/libyul/yulInterpreterTests/mcopy_memory_access_out_of_range.yul
@@ -19,3 +19,4 @@
 // Memory dump:
 //   FFFFFFFFFFFFFFE0: 0000000000000000000000000000000000000000000000000000000000000001
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_read.yul b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_read.yul
index b0b2b561e7..a20dc7b072 100644
--- a/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_read.yul
+++ b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_read.yul
@@ -10,3 +10,4 @@
 //   MCOPY(48, 48, 0)
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_write.yul b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_write.yul
index 0448b20c06..69c4fedf83 100644
--- a/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_write.yul
+++ b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_on_write.yul
@@ -11,3 +11,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000040
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/mcopy_memory_expansion_zero_size.yul b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_zero_size.yul
index 0448b20c06..69c4fedf83 100644
--- a/test/libyul/yulInterpreterTests/mcopy_memory_expansion_zero_size.yul
+++ b/test/libyul/yulInterpreterTests/mcopy_memory_expansion_zero_size.yul
@@ -11,3 +11,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000040
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/mcopy_overlap.yul b/test/libyul/yulInterpreterTests/mcopy_overlap.yul
index 2ac2460d7f..aefb84bead 100644
--- a/test/libyul/yulInterpreterTests/mcopy_overlap.yul
+++ b/test/libyul/yulInterpreterTests/mcopy_overlap.yul
@@ -19,3 +19,4 @@
 //     40: 1111111122222222333333334444444455555555666666661111111122222222
 //     60: 3333333344444444555555556666666677777777888888880000000000000000
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul b/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
index 4e431a6b18..ec9ca2fe64 100644
--- a/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
+++ b/test/libyul/yulInterpreterTests/pop_byte_shr_call.yul
@@ -8,3 +8,4 @@
 //   CALL(0, 0, 0, 0, 0, 0, 0)
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/pop_byte_shr_func.yul b/test/libyul/yulInterpreterTests/pop_byte_shr_func.yul
index b520b9181c..e9a63dcb5a 100644
--- a/test/libyul/yulInterpreterTests/pop_byte_shr_func.yul
+++ b/test/libyul/yulInterpreterTests/pop_byte_shr_func.yul
@@ -9,3 +9,4 @@
 // Memory dump:
 //      0: 0000000000000000000000000000000000000000000000000000000000001337
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/prevrandao.yul b/test/libyul/yulInterpreterTests/prevrandao.yul
index 809506c9fe..29a5c114ea 100644
--- a/test/libyul/yulInterpreterTests/prevrandao.yul
+++ b/test/libyul/yulInterpreterTests/prevrandao.yul
@@ -8,3 +8,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000010000000000000001
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/recursion.yul b/test/libyul/yulInterpreterTests/recursion.yul
index 0d80faf30d..777e01857d 100644
--- a/test/libyul/yulInterpreterTests/recursion.yul
+++ b/test/libyul/yulInterpreterTests/recursion.yul
@@ -12,3 +12,4 @@
 // Memory dump:
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000015
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul b/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul
index b3cd4b48c0..9d2c08ffeb 100644
--- a/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul
+++ b/test/libyul/yulInterpreterTests/recursive_function_for_loop.yul
@@ -20,3 +20,4 @@
 //      0: 0001000000000000000000000000000000000000000000000000000000000000
 // Storage dump:
 //   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000002
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/self_balance.yul b/test/libyul/yulInterpreterTests/self_balance.yul
index 99b1f960c2..b61f470c86 100644
--- a/test/libyul/yulInterpreterTests/self_balance.yul
+++ b/test/libyul/yulInterpreterTests/self_balance.yul
@@ -14,3 +14,4 @@
 //     40: 0000000000000000000000000000000000000000000000000000000022223333
 //     60: 0000000000000000000000000000000000000000000000000000000022222222
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/shadowed_symbol.yul b/test/libyul/yulInterpreterTests/shadowed_symbol.yul
index 335f98a02c..b6443f51f6 100644
--- a/test/libyul/yulInterpreterTests/shadowed_symbol.yul
+++ b/test/libyul/yulInterpreterTests/shadowed_symbol.yul
@@ -17,3 +17,4 @@
 // Trace:
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/side_effect_free.yul b/test/libyul/yulInterpreterTests/side_effect_free.yul
index 1b8107646f..adedd299f5 100644
--- a/test/libyul/yulInterpreterTests/side_effect_free.yul
+++ b/test/libyul/yulInterpreterTests/side_effect_free.yul
@@ -18,3 +18,4 @@
 // Trace:
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/simple_mstore.yul b/test/libyul/yulInterpreterTests/simple_mstore.yul
index 3beef347db..82b088e91f 100644
--- a/test/libyul/yulInterpreterTests/simple_mstore.yul
+++ b/test/libyul/yulInterpreterTests/simple_mstore.yul
@@ -6,3 +6,4 @@
 // Memory dump:
 //     20: 0000000000000000000b00000000000000000000000000000000000000000000
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/smoke.yul b/test/libyul/yulInterpreterTests/smoke.yul
index f7f1a1aefb..f1d3564c06 100644
--- a/test/libyul/yulInterpreterTests/smoke.yul
+++ b/test/libyul/yulInterpreterTests/smoke.yul
@@ -3,3 +3,4 @@
 // Trace:
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/switch_statement.yul b/test/libyul/yulInterpreterTests/switch_statement.yul
index 1a067ee1bd..52b4319df7 100644
--- a/test/libyul/yulInterpreterTests/switch_statement.yul
+++ b/test/libyul/yulInterpreterTests/switch_statement.yul
@@ -9,3 +9,4 @@
 // Memory dump:
 //     20: 0200000000000000000000000000000000000000000000000000000000000000
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/transient_storage.yul b/test/libyul/yulInterpreterTests/transient_storage.yul
new file mode 100644
index 0000000000..3e9466f8e4
--- /dev/null
+++ b/test/libyul/yulInterpreterTests/transient_storage.yul
@@ -0,0 +1,13 @@
+{
+    tstore(0, 8)
+    mstore(0, tload(0))
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Trace:
+// Memory dump:
+//      0: 0000000000000000000000000000000000000000000000000000000000000008
+// Storage dump:
+// Transient storage dump:
+//   0000000000000000000000000000000000000000000000000000000000000000: 0000000000000000000000000000000000000000000000000000000000000008
diff --git a/test/libyul/yulInterpreterTests/zero_length_reads.yul b/test/libyul/yulInterpreterTests/zero_length_reads.yul
index 6c1f38d1e9..661db49ffb 100644
--- a/test/libyul/yulInterpreterTests/zero_length_reads.yul
+++ b/test/libyul/yulInterpreterTests/zero_length_reads.yul
@@ -38,3 +38,4 @@
 //   RETURN(0, 0)
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul b/test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul
index 4be49eeb09..0d0f92420e 100644
--- a/test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul
+++ b/test/libyul/yulInterpreterTests/zero_length_reads_and_revert.yul
@@ -38,3 +38,4 @@
 //   REVERT(0, 0)
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulInterpreterTests/zero_range.yul b/test/libyul/yulInterpreterTests/zero_range.yul
index 1ad25ed37b..50b6043588 100644
--- a/test/libyul/yulInterpreterTests/zero_range.yul
+++ b/test/libyul/yulInterpreterTests/zero_range.yul
@@ -8,3 +8,4 @@
 //   CALLDATACOPY(0, 0, 0)
 // Memory dump:
 // Storage dump:
+// Transient storage dump:
diff --git a/test/libyul/yulOptimizerTests/equalStoreEliminator/transient_storage.yul b/test/libyul/yulOptimizerTests/equalStoreEliminator/transient_storage.yul
new file mode 100644
index 0000000000..f50e1ba06a
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/equalStoreEliminator/transient_storage.yul
@@ -0,0 +1,25 @@
+{
+    tstore(0, 42)
+    tstore(0, 42)
+    let x := tload(0)
+    tstore(0, 42)
+    x := tload(0)
+    tstore(0, 24)
+    x := tload(0)
+    tstore(0, 24)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: equalStoreEliminator
+//
+// {
+//     tstore(0, 42)
+//     tstore(0, 42)
+//     let x := tload(0)
+//     tstore(0, 42)
+//     x := tload(0)
+//     tstore(0, 24)
+//     x := tload(0)
+//     tstore(0, 24)
+// }
diff --git a/test/libyul/yulOptimizerTests/fullSuite/transient_storage.yul b/test/libyul/yulOptimizerTests/fullSuite/transient_storage.yul
new file mode 100644
index 0000000000..44cd0a7f55
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/fullSuite/transient_storage.yul
@@ -0,0 +1,21 @@
+{
+    tstore(0, 13)
+    tstore(0, 42)
+    tstore(0x20, tload(0))
+    let x:= tload(0x20)
+    tstore(0, x)
+    pop(tload(0x20))
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: fullSuite
+//
+// {
+//     {
+//         tstore(0, 13)
+//         tstore(0, 42)
+//         tstore(0x20, tload(0))
+//         tstore(0, tload(0x20))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_transient_storage.yul b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_transient_storage.yul
new file mode 100644
index 0000000000..4c766c0bc8
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/loopInvariantCodeMotion/no_move_transient_storage.yul
@@ -0,0 +1,20 @@
+{
+    for { let i := 1 } iszero(eq(i, 10)) { i := add(i, 1) }
+    {
+        tstore(0, i)
+        sstore(i, tload(0))
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: loopInvariantCodeMotion
+//
+// {
+//     let i := 1
+//     for { } iszero(eq(i, 10)) { i := add(i, 1) }
+//     {
+//         tstore(0, i)
+//         sstore(i, tload(0))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedPruner/transient_storage.yul b/test/libyul/yulOptimizerTests/unusedPruner/transient_storage.yul
new file mode 100644
index 0000000000..de0832053b
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedPruner/transient_storage.yul
@@ -0,0 +1,20 @@
+{
+    tstore(0, 5)
+    let x:= tload(0)
+    tstore(0, 8)
+    let y := tload(0)
+    tstore(0, y)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedPruner
+//
+// {
+//     {
+//         tstore(0, 5)
+//         tstore(0, 8)
+//         let y := tload(0)
+//         tstore(0, y)
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/tload.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/tload.yul
new file mode 100644
index 0000000000..43b96f0e92
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/tload.yul
@@ -0,0 +1,22 @@
+{
+    let zero := 0
+    tstore(zero, 5)
+    let x := tload(zero)
+    tstore(zero, 8)
+    let y := tload(zero)
+    tstore(zero, y)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let zero := 0
+//         tstore(zero, 5)
+//         let x := tload(zero)
+//         tstore(zero, 8)
+//         tstore(zero, tload(zero))
+//     }
+// }
diff --git a/test/libyul/yulOptimizerTests/unusedStoreEliminator/tstore.yul b/test/libyul/yulOptimizerTests/unusedStoreEliminator/tstore.yul
new file mode 100644
index 0000000000..f3befb79d0
--- /dev/null
+++ b/test/libyul/yulOptimizerTests/unusedStoreEliminator/tstore.yul
@@ -0,0 +1,23 @@
+{
+    let x := 5
+    tstore(x, 10)
+    sstore(x, 10)
+    pop(mload(0))
+    tstore(x, 10)
+    sstore(x, 20)
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// step: unusedStoreEliminator
+//
+// {
+//     {
+//         let x := 5
+//         tstore(x, 10)
+//         let _2 := 10
+//         pop(mload(0))
+//         tstore(x, 10)
+//         sstore(x, 20)
+//     }
+// }
diff --git a/test/libyul/yulSyntaxTests/tload_as_identifier_post_cancun.yul b/test/libyul/yulSyntaxTests/tload_as_identifier_post_cancun.yul
new file mode 100644
index 0000000000..2c1dcb0d92
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/tload_as_identifier_post_cancun.yul
@@ -0,0 +1,9 @@
+{
+    function f() {
+        let tload := 0
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// ParserError 5568: (33-38): Cannot use builtin function name "tload" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/tstore_as_identifier_post_cancun.yul b/test/libyul/yulSyntaxTests/tstore_as_identifier_post_cancun.yul
new file mode 100644
index 0000000000..d810ed2b38
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/tstore_as_identifier_post_cancun.yul
@@ -0,0 +1,7 @@
+{
+    function tstore() {}
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// ParserError 5568: (15-21): Cannot use builtin function name "tstore" as identifier name.
diff --git a/test/libyul/yulSyntaxTests/tstore_tload.yul b/test/libyul/yulSyntaxTests/tstore_tload.yul
new file mode 100644
index 0000000000..e73429351d
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/tstore_tload.yul
@@ -0,0 +1,11 @@
+{
+    function f() {
+        let x := tload(0)
+        let y := add(x, 1)
+        tstore(0, y)
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// Warning 2394: (82-88): Transient storage as defined by EIP-1153 can break the composability of smart contracts: Since transient storage is cleared only at the end of the transaction and not at the end of the outermost call frame to the contract within a transaction, your contract may unintentionally misbehave when invoked multiple times in a complex transaction. To avoid this, be sure to clear all transient storage at the end of any call to your contract. The use of transient storage for reentrancy guards that are cleared at the end of the call is safe.
diff --git a/test/libyul/yulSyntaxTests/tstore_tload_as_identifiers_pre_cancun.yul b/test/libyul/yulSyntaxTests/tstore_tload_as_identifiers_pre_cancun.yul
new file mode 100644
index 0000000000..19e9d2f528
--- /dev/null
+++ b/test/libyul/yulSyntaxTests/tstore_tload_as_identifiers_pre_cancun.yul
@@ -0,0 +1,6 @@
+{
+    function tstore() {}
+    function tload() {}
+}
+// ====
+// EVMVersion: <cancun
diff --git a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
index 12a046d70e..2fe2b21847 100644
--- a/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
+++ b/test/tools/yulInterpreter/EVMInstructionInterpreter.cpp
@@ -347,6 +347,11 @@ u256 EVMInstructionInterpreter::eval(
 		accessMemory(arg[0], arg[1]);
 		logTrace(_instruction, arg);
 		return 0;
+	case Instruction::TLOAD:
+		return m_state.transientStorage[h256(arg[0])];
+	case Instruction::TSTORE:
+		m_state.transientStorage[h256(arg[0])] = h256(arg[1]);
+		return 0;
 	// --------------- calls ---------------
 	case Instruction::CREATE:
 		accessMemory(arg[1], arg[2]);
@@ -396,15 +401,18 @@ u256 EVMInstructionInterpreter::eval(
 		accessMemory(arg[0], arg[1]);
 		logTrace(_instruction, arg);
 		m_state.storage.clear();
+		m_state.transientStorage.clear();
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
 	case Instruction::INVALID:
 		logTrace(_instruction);
 		m_state.storage.clear();
+		m_state.transientStorage.clear();
 		m_state.trace.clear();
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
 	case Instruction::SELFDESTRUCT:
 		logTrace(_instruction, arg);
 		m_state.storage.clear();
+		m_state.transientStorage.clear();
 		m_state.trace.clear();
 		BOOST_THROW_EXCEPTION(ExplicitlyTerminated());
 	case Instruction::POP:
diff --git a/test/tools/yulInterpreter/Interpreter.cpp b/test/tools/yulInterpreter/Interpreter.cpp
index fced2670ca..a8658e9211 100644
--- a/test/tools/yulInterpreter/Interpreter.cpp
+++ b/test/tools/yulInterpreter/Interpreter.cpp
@@ -45,9 +45,16 @@ using solidity::util::h256;
 
 void InterpreterState::dumpStorage(std::ostream& _out) const
 {
-	for (auto const& slot: storage)
-		if (slot.second != h256{})
-			_out << "  " << slot.first.hex() << ": " << slot.second.hex() << std::endl;
+	for (auto const& [slot, value]: storage)
+		if (value != h256{})
+			_out << "  " << slot.hex() << ": " << value.hex() << std::endl;
+}
+
+void InterpreterState::dumpTransientStorage(std::ostream& _out) const
+{
+	for (auto const& [slot, value]: transientStorage)
+		if (value != h256{})
+			_out << "  " << slot.hex() << ": " << value.hex() << std::endl;
 }
 
 void InterpreterState::dumpTraceAndState(std::ostream& _out, bool _disableMemoryTrace) const
@@ -68,6 +75,9 @@ void InterpreterState::dumpTraceAndState(std::ostream& _out, bool _disableMemory
 	_out << "Storage dump:" << std::endl;
 	dumpStorage(_out);
 
+	_out << "Transient storage dump:" << std::endl;
+	dumpTransientStorage(_out);
+
 	if (!calldata.empty())
 	{
 		_out << "Calldata dump:";
diff --git a/test/tools/yulInterpreter/Interpreter.h b/test/tools/yulInterpreter/Interpreter.h
index 6a71d48a12..23a98ca5c3 100644
--- a/test/tools/yulInterpreter/Interpreter.h
+++ b/test/tools/yulInterpreter/Interpreter.h
@@ -81,6 +81,7 @@ struct InterpreterState
 	/// This is different than memory.size() because we ignore gas.
 	u256 msize;
 	std::map<util::h256, util::h256> storage;
+	std::map<util::h256, util::h256> transientStorage;
 	util::h160 address = util::h160("0x0000000000000000000000000000000011111111");
 	u256 balance = 0x22222222;
 	u256 selfbalance = 0x22223333;
@@ -125,6 +126,8 @@ struct InterpreterState
 	void dumpTraceAndState(std::ostream& _out, bool _disableMemoryTrace) const;
 	/// Prints non-zero storage to @param _out.
 	void dumpStorage(std::ostream& _out) const;
+	/// Prints non-zero transient storage to @param _out.
+	void dumpTransientStorage(std::ostream& _out) const;
 
 	bytes readMemory(u256 const& _offset, u256 const& _size)
 	{

From 261e8b9f7d63c2b0cfe0c7d45d1857d264ff3610 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Tue, 16 Jan 2024 17:17:28 -0300
Subject: [PATCH 1721/1748] Test new semantic of selfdestruct added by EIP-6780

---
 libsolidity/analysis/TypeChecker.cpp          |   7 +-
 libyul/AsmAnalysis.cpp                        |   7 +-
 test/EVMHost.cpp                              |  12 ++-
 test/EVMHost.h                                |   5 +
 .../semanticTests/various/selfdestruct.sol    |  46 --------
 .../various/selfdestruct_post_cancun.sol      |  88 +++++++++++++++
 ...uct_post_cancun_multiple_beneficiaries.sol |  56 ++++++++++
 .../selfdestruct_post_cancun_redeploy.sol     | 101 ++++++++++++++++++
 .../various/selfdestruct_pre_cancun.sol       |  86 +++++++++++++++
 ...ruct_pre_cancun_multiple_beneficiaries.sol |  67 ++++++++++++
 .../selfdestruct_pre_cancun_redeploy.sol      | 100 +++++++++++++++++
 .../globalFunctions/selfdestruct_no_call.sol  |   6 ++
 .../430_bare_selfdestruct.sol                 |   6 --
 .../address_nonpayable_selfdestruct.sol       |   2 +-
 .../address/address_payable_selfdestruct.sol  |   2 +-
 .../viewPureChecker/builtin_functions.sol     |   2 +-
 .../builtin_functions_view_fail.sol           |   2 +-
 .../inline_assembly_instructions_allowed.sol  |   2 +-
 ..._assembly_instructions_disallowed_pure.sol |   2 +-
 ..._assembly_instructions_disallowed_view.sol |   2 +-
 test/libyul/yulSyntaxTests/selfdestruct.yul   |   2 +-
 21 files changed, 538 insertions(+), 65 deletions(-)
 delete mode 100644 test/libsolidity/semanticTests/various/selfdestruct.sol
 create mode 100644 test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol
 create mode 100644 test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
 create mode 100644 test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
 create mode 100644 test/libsolidity/semanticTests/various/selfdestruct_pre_cancun.sol
 create mode 100644 test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
 create mode 100644 test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
 create mode 100644 test/libsolidity/syntaxTests/globalFunctions/selfdestruct_no_call.sol
 delete mode 100644 test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 11812878a5..91224610f5 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -3767,8 +3767,11 @@ bool TypeChecker::visit(Identifier const& _identifier)
 				5159_error,
 				_identifier.location(),
 				"\"selfdestruct\" has been deprecated. "
-				"The underlying opcode will eventually undergo breaking changes, "
-				"and its use is not recommended."
+				"Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and "
+				"data associated with an account and only transfers its Ether to the beneficiary, "
+				"unless executed in the same transaction in which the contract was created (see EIP-6780). "
+				"Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. "
+				"Future changes to the EVM might further reduce the functionality of the opcode."
 			);
 	}
 
diff --git a/libyul/AsmAnalysis.cpp b/libyul/AsmAnalysis.cpp
index c4dade6898..c73cab74fe 100644
--- a/libyul/AsmAnalysis.cpp
+++ b/libyul/AsmAnalysis.cpp
@@ -316,8 +316,11 @@ std::vector<YulString> AsmAnalyzer::operator()(FunctionCall const& _funCall)
 				1699_error,
 				nativeLocationOf(_funCall.functionName),
 				"\"selfdestruct\" has been deprecated. "
-				"The underlying opcode will eventually undergo breaking changes, "
-				"and its use is not recommended."
+				"Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and "
+				"data associated with an account and only transfers its Ether to the beneficiary, "
+				"unless executed in the same transaction in which the contract was created (see EIP-6780). "
+				"Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. "
+				"Future changes to the EVM might further reduce the functionality of the opcode."
 			);
 		parameterTypes = &f->parameters;
 		returnTypes = &f->returns;
diff --git a/test/EVMHost.cpp b/test/EVMHost.cpp
index 84327a5b97..66c3fdf19d 100644
--- a/test/EVMHost.cpp
+++ b/test/EVMHost.cpp
@@ -193,7 +193,12 @@ void EVMHost::newTransactionFrame()
 		}
 	// Process selfdestruct list
 	for (auto& [address, _]: recorded_selfdestructs)
-		accounts.erase(address);
+		if (m_evmVersion < langutil::EVMVersion::cancun() || newlyCreatedAccounts.count(address))
+			// EIP-6780: If SELFDESTRUCT is executed in a transaction different from the one
+			// in which it was created, we do NOT record it or clear any data.
+			// Otherwise, the previous behavior (pre-Cancun) is maintained.
+			accounts.erase(address);
+	newlyCreatedAccounts.clear();
 	recorded_selfdestructs.clear();
 }
 
@@ -208,6 +213,8 @@ bool EVMHost::selfdestruct(const evmc::address& _addr, const evmc::address& _ben
 {
 	// TODO actual selfdestruct is even more complicated.
 
+	// NOTE: EIP-6780: The transfer of the entire account balance to the beneficiary should still happen
+	// after cancun.
 	transfer(accounts[_addr], accounts[_beneficiary], convertFromEVMC(accounts[_addr].balance));
 
 	// Record self destructs. Clearing will be done in newTransactionFrame().
@@ -343,6 +350,9 @@ evmc::Result EVMHost::call(evmc_message const& _message) noexcept
 		code = accounts[message.code_address].code;
 
 	auto& destination = accounts[message.recipient];
+	if (message.kind == EVMC_CREATE || message.kind == EVMC_CREATE2)
+		// Mark account as created if it is a CREATE or CREATE2 call
+		newlyCreatedAccounts.emplace(message.recipient);
 
 	if (value != 0 && message.kind != EVMC_DELEGATECALL && message.kind != EVMC_CALLCODE)
 	{
diff --git a/test/EVMHost.h b/test/EVMHost.h
index 967adc2486..144596e05e 100644
--- a/test/EVMHost.h
+++ b/test/EVMHost.h
@@ -32,6 +32,8 @@
 
 #include <boost/filesystem.hpp>
 
+#include<unordered_set>
+
 namespace solidity::test
 {
 using Address = util::h160;
@@ -127,6 +129,9 @@ class EVMHost: public evmc::MockedHost
 	static evmc::Result resultWithGas(int64_t gas_limit, int64_t gas_required, bytes const& _data) noexcept;
 	static evmc::Result resultWithFailure() noexcept;
 
+	/// Store the accounts that have been created in the current transaction.
+	std::unordered_set<evmc::address> newlyCreatedAccounts;
+
 	evmc::VM& m_vm;
 	/// EVM version requested by the testing tool
 	langutil::EVMVersion m_evmVersion;
diff --git a/test/libsolidity/semanticTests/various/selfdestruct.sol b/test/libsolidity/semanticTests/various/selfdestruct.sol
deleted file mode 100644
index 6aa42cb144..0000000000
--- a/test/libsolidity/semanticTests/various/selfdestruct.sol
+++ /dev/null
@@ -1,46 +0,0 @@
-contract C {
-  event Terminated();
-
-  constructor() payable {
-  }
-
-  function terminate() external {
-    emit Terminated();
-    selfdestruct(payable(msg.sender));
-    // Execution stops here, so the second one is not executed.
-    selfdestruct(payable(msg.sender));
-    emit Terminated();
-  }
-}
-
-contract D {
-  C public c;
-
-  constructor() payable {
-      c = new C{value: 1 ether}();
-  }
-
-  function f() external {
-      c.terminate();
-  }
-
-  function exists() external returns (bool) {
-      return address(c).code.length != 0;
-  }
-}
-// ----
-// constructor(), 1 ether ->
-// gas irOptimized: 186958
-// gas legacy: 255973
-// gas legacyOptimized: 178919
-// c() -> 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
-// balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 1000000000000000000
-// balance -> 0
-// exists() -> true
-// f() ->
-// ~ emit Terminated() from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
-// balance: 0x137aa4dfc0911524504fcd4d98501f179bc13b4a -> 0
-// ~ emit Terminated() from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
-// balance -> 1000000000000000000
-// ~ emit Terminated() from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a
-// exists() -> false
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol
new file mode 100644
index 0000000000..85c95be447
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun.sol
@@ -0,0 +1,88 @@
+contract C {
+    constructor() payable {}
+
+    function terminate() external {
+        // NOTE: The contract `c` should still exist in the test below
+        // when the call to selfdestruct is executed in a transaction
+        // different from the one in which the contract was created.
+        // However, it should still send all Ether in `c` to the beneficiary.
+        selfdestruct(payable(msg.sender));
+        assert(false);
+    }
+}
+
+contract D {
+    C public c;
+
+    constructor() payable {}
+
+    function deploy_create() public payable {
+        c = new C{value: 1 ether}();
+    }
+
+    function deploy_create2() public payable {
+        c = new C{value: 1 ether, salt: hex"1234"}();
+    }
+
+    function terminate() public {
+        // NOTE: A second call to `c.terminate()` or any other function of the contract `c` will succeed if the
+        // previous selfdestruct was performed in a different transaction, since the contract will still exists.
+        c.terminate();
+    }
+
+    function test_create_and_terminate() public {
+        deploy_create();
+        assert(exists());
+        test_balance_after_create();
+        terminate();
+        test_balance_after_selfdestruct();
+    }
+
+    function test_create2_and_terminate() public {
+        deploy_create2();
+        assert(exists());
+        test_balance_after_create();
+        terminate();
+        test_balance_after_selfdestruct();
+    }
+
+    function test_balance_after_create() public view {
+        assert(address(this).balance == 0);
+        assert(address(c).balance == 1 ether);
+    }
+
+    function test_balance_after_selfdestruct() public view {
+        assert(address(this).balance == 1 ether);
+        assert(address(c).balance == 0);
+    }
+
+    function exists() public view returns (bool) {
+        return address(c).code.length != 0;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// constructor(), 1 ether ->
+// gas irOptimized: 455954
+// gas legacy: 375495
+// gas legacyOptimized: 507630
+// exists() -> false
+// test_create_and_terminate() ->
+// exists() -> false
+// terminate() -> FAILURE
+// deploy_create() ->
+// test_balance_after_create() ->
+// exists() -> true
+// terminate() ->
+// test_balance_after_selfdestruct() ->
+// exists() -> true
+// test_create2_and_terminate() ->
+// exists() -> false
+// deploy_create2() ->
+// test_balance_after_create() ->
+// exists() -> true
+// terminate() ->
+// test_balance_after_selfdestruct() ->
+// exists() -> true
+// terminate() ->
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
new file mode 100644
index 0000000000..4bc65b7608
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_multiple_beneficiaries.sol
@@ -0,0 +1,56 @@
+contract C {
+    constructor() payable {}
+    function terminate(address _beneficiary) public {
+        selfdestruct(payable(_beneficiary));
+        assert(false);
+    }
+}
+
+contract D {
+    address account1 = payable(0x1111111111111111111111111111111111111111);
+    address account2 = payable(0x2222222222222222222222222222222222222222);
+    C public c;
+
+    constructor() payable {}
+
+    function deploy() public payable {
+        c = new C{value: 1 ether}();
+    }
+
+    function terminate(address _beneficiary) public {
+        c.terminate(_beneficiary);
+    }
+
+    function test_deploy_and_terminate_twice() public {
+        deploy();
+        terminate(account1);
+        terminate(account2);
+    }
+
+    function exists() public view returns (bool) {
+        return address(c).code.length != 0;
+    }
+}
+// ====
+// EVMVersion: >=cancun
+// ----
+// constructor(), 2 ether ->
+// balance: 0x1111111111111111111111111111111111111111 -> 0
+// balance: 0x2222222222222222222222222222222222222222 -> 0
+// balance -> 2000000000000000000
+// exists() -> false
+// test_deploy_and_terminate_twice() ->
+// exists() -> false
+// balance: 0x1111111111111111111111111111111111111111 -> 1000000000000000000
+// balance: 0x2222222222222222222222222222222222222222 -> 0
+// balance -> 1000000000000000000
+// deploy() ->
+// exists() -> true
+// balance: 0x1111111111111111111111111111111111111111 -> 1000000000000000000
+// balance: 0x2222222222222222222222222222222222222222 -> 0
+// balance -> 0
+// terminate(address): 0x1111111111111111111111111111111111111111 ->
+// balance: 0x1111111111111111111111111111111111111111 -> 2000000000000000000
+// balance: 0x2222222222222222222222222222222222222222 -> 0
+// balance -> 0
+// exists() -> true
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
new file mode 100644
index 0000000000..473571bf13
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/selfdestruct_post_cancun_redeploy.sol
@@ -0,0 +1,101 @@
+contract Factory {
+    event Deployed(address, bytes32);
+
+    function deploy(bytes32 _salt) external payable returns (address implAddr) {
+        // NOTE: The bytecode of contract C is used here instead of `type(C).creationCode` since the address calculation depends on the precise init code
+        // and that will change in our test framework between legacy and via-IR codegen and via optimized vs non-optimized.
+        //contract C {
+        //    constructor() payable {}
+        //    function terminate() external {
+        //        selfdestruct(payable(msg.sender));
+        //    }
+        //}
+        bytes memory initCode =
+            hex"6080806040526068908160108239f3fe6004361015600b575f80fd5b5f3560e0"
+            hex"1c630c08bf8814601d575f80fd5b34602e575f366003190112602e5733ff5b5f"
+            hex"80fdfea2646970667358221220fe3c4fe66c1838016e2efdc5b65538e5ff3dbf"
+            hex"ced7eff135da3556db4bd841aa64736f6c63430008180033";
+
+        address target = address(uint160(uint256(keccak256(abi.encodePacked(
+            bytes1(0xff),
+            address(this),
+            _salt,
+            keccak256(abi.encodePacked(initCode))
+        )))));
+
+        assembly {
+            implAddr := create2(callvalue(), add(initCode, 0x20), mload(initCode), _salt)
+            if iszero(extcodesize(implAddr)) {
+                revert(0, 0)
+            }
+        }
+        assert(address(implAddr) == target);
+        emit Deployed(implAddr, _salt);
+    }
+}
+
+interface IC {
+    function terminate() external;
+}
+
+contract D {
+    Factory public factory = new Factory();
+    IC public c;
+
+    constructor() payable {}
+
+    function deploy_create2() public payable {
+        // NOTE: `create2` cannot be used anymore to redeploy a contract in the same place to make it upgradable
+        // if not performed in the same transaction.
+        // Therefore, an attempt to redeploy using `create2` in a different transaction must revert for EVM >= Cancun.
+        c = IC(factory.deploy{value: 1 ether}(hex"1234"));
+    }
+
+    function terminate() public {
+        c.terminate();
+    }
+
+    function test_deploy_and_terminate() public {
+        deploy_create2();
+        assert(exists());
+        test_balance_after_create();
+        terminate();
+        test_balance_after_selfdestruct();
+    }
+
+    function test_balance_after_create() public view {
+        assert(address(this).balance == 0);
+        assert(address(c).balance == 1 ether);
+    }
+
+    function test_balance_after_selfdestruct() public view {
+        assert(address(this).balance == 1 ether);
+        assert(address(c).balance == 0);
+    }
+
+    function exists() public view returns (bool) {
+        return address(c).code.length != 0;
+    }
+}
+
+// ====
+// EVMVersion: >=cancun
+// ----
+// constructor(), 1 ether ->
+// gas irOptimized: 562058
+// gas legacy: 633310
+// gas legacyOptimized: 590051
+// exists() -> false
+// test_deploy_and_terminate() ->
+// ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
+// gas irOptimized: 118541
+// gas legacyOptimized: 118305
+// exists() -> false
+// deploy_create2() ->
+// ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
+// test_balance_after_create() ->
+// exists() -> true
+// terminate() ->
+// test_balance_after_selfdestruct() ->
+// exists() -> true
+// deploy_create2() -> FAILURE
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun.sol b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun.sol
new file mode 100644
index 0000000000..4142eb25cf
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun.sol
@@ -0,0 +1,86 @@
+contract C {
+    constructor() payable {}
+
+    function terminate() external {
+        // NOTE: The contract `c` should still exists in the test below,
+        // since the call to the selfdestruct method was done in a tx that is
+        // not the same tx that the contract was created.
+        // However, it should send all Ether in `c` to the beneficiary.
+        selfdestruct(payable(msg.sender));
+        assert(false);
+    }
+}
+
+contract D {
+    C public c;
+
+    constructor() payable {}
+
+    function deploy_create() public payable {
+        c = new C{value: 1 ether}();
+    }
+
+    function deploy_create2() public payable {
+        c = new C{value: 1 ether, salt: hex"1234"}();
+    }
+
+    function terminate() public {
+        c.terminate();
+    }
+
+    function test_create_and_terminate() public {
+        deploy_create();
+        assert(exists());
+        test_balance_after_create();
+        terminate();
+        test_balance_after_selfdestruct();
+    }
+
+    function test_create2_and_terminate() public {
+        deploy_create2();
+        assert(exists());
+        test_balance_after_create();
+        terminate();
+        test_balance_after_selfdestruct();
+    }
+
+    function test_balance_after_create() public view {
+        assert(address(this).balance == 0);
+        assert(address(c).balance == 1 ether);
+    }
+
+    function test_balance_after_selfdestruct() public view {
+        assert(address(this).balance == 1 ether);
+        assert(address(c).balance == 0);
+    }
+
+    function exists() public view returns (bool) {
+        return address(c).code.length != 0;
+    }
+}
+// ====
+// EVMVersion: =shanghai
+// ----
+// constructor(), 1 ether ->
+// gas irOptimized: 242428
+// gas legacy: 373563
+// gas legacyOptimized: 234516
+// exists() -> false
+// test_create_and_terminate() ->
+// exists() -> false
+// terminate() -> FAILURE
+// deploy_create() ->
+// test_balance_after_create() ->
+// exists() -> true
+// terminate() ->
+// test_balance_after_selfdestruct() ->
+// exists() -> false
+// test_create2_and_terminate() ->
+// exists() -> false
+// deploy_create2() ->
+// test_balance_after_create() ->
+// exists() -> true
+// terminate() ->
+// test_balance_after_selfdestruct() ->
+// exists() -> false
+// terminate() -> FAILURE
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
new file mode 100644
index 0000000000..57b2d5c66a
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_multiple_beneficiaries.sol
@@ -0,0 +1,67 @@
+contract C {
+    constructor() payable {}
+    function terminate(address _beneficiary) public {
+        selfdestruct(payable(_beneficiary));
+        assert(false);
+    }
+}
+
+contract D {
+    address account1 = payable(0x1111111111111111111111111111111111111111);
+    address account2 = payable(0x2222222222222222222222222222222222222222);
+    C public c;
+
+    constructor() payable {}
+
+    function deploy() public payable {
+        c = new C{value: 1 ether}();
+    }
+
+    function terminate(address _beneficiary) public {
+        c.terminate(_beneficiary);
+    }
+
+    function test_deploy_and_terminate_twice() public {
+        deploy();
+        terminate(account1);
+        terminate(account2);
+    }
+
+    function exists() public view returns (bool) {
+        return address(c).code.length != 0;
+    }
+}
+// ====
+// EVMVersion: <=shanghai
+// ----
+// constructor(), 2 ether ->
+// gas irOptimized: 223918
+// gas legacy: 374228
+// gas legacyOptimized: 239815
+// balance: 0x1111111111111111111111111111111111111111 -> 0
+// balance: 0x2222222222222222222222222222222222222222 -> 0
+// balance -> 2000000000000000000
+// exists() -> false
+// test_deploy_and_terminate_twice() ->
+// gas irOptimized: 135350
+// gas legacy: 165584
+// gas legacyOptimized: 144396
+// exists() -> false
+// balance: 0x1111111111111111111111111111111111111111 -> 1000000000000000000
+// balance: 0x2222222222222222222222222222222222222222 -> 0
+// balance -> 1000000000000000000
+// deploy() ->
+// gas legacy: 101691
+// exists() -> true
+// balance: 0x1111111111111111111111111111111111111111 -> 1000000000000000000
+// balance: 0x2222222222222222222222222222222222222222 -> 0
+// balance -> 0
+// terminate(address): 0x1111111111111111111111111111111111111111 ->
+// balance: 0x1111111111111111111111111111111111111111 -> 2000000000000000000
+// balance: 0x2222222222222222222222222222222222222222 -> 0
+// balance -> 0
+// terminate(address): 0x2222222222222222222222222222222222222222 -> FAILURE
+// balance: 0x1111111111111111111111111111111111111111 -> 2000000000000000000
+// balance: 0x2222222222222222222222222222222222222222 -> 0
+// balance -> 0
+// exists() -> false
diff --git a/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
new file mode 100644
index 0000000000..9c9949854a
--- /dev/null
+++ b/test/libsolidity/semanticTests/various/selfdestruct_pre_cancun_redeploy.sol
@@ -0,0 +1,100 @@
+contract Factory {
+    event Deployed(address, bytes32);
+
+    function deploy(bytes32 _salt) external payable returns (address implAddr) {
+        // NOTE: The bytecode of contract C is used here instead of `type(C).creationCode` since the address calculation depends on the precise init code
+        // and that will change in our test framework between legacy and via-IR codegen and via optimized vs non-optimized.
+        //contract C {
+        //    constructor() payable {}
+        //    function terminate() external {
+        //        selfdestruct(payable(msg.sender));
+        //    }
+        //}
+        bytes memory initCode =
+            hex"6080806040526068908160108239f3fe6004361015600b575f80fd5b5f3560e0"
+            hex"1c630c08bf8814601d575f80fd5b34602e575f366003190112602e5733ff5b5f"
+            hex"80fdfea2646970667358221220fe3c4fe66c1838016e2efdc5b65538e5ff3dbf"
+            hex"ced7eff135da3556db4bd841aa64736f6c63430008180033";
+
+        address target = address(uint160(uint256(keccak256(abi.encodePacked(
+            bytes1(0xff),
+            address(this),
+            _salt,
+            keccak256(abi.encodePacked(initCode))
+        )))));
+
+        assembly {
+            implAddr := create2(callvalue(), add(initCode, 0x20), mload(initCode), _salt)
+            if iszero(extcodesize(implAddr)) {
+                revert(0, 0)
+            }
+        }
+        assert(address(implAddr) == target);
+        emit Deployed(implAddr, _salt);
+    }
+}
+
+interface IC {
+    function terminate() external;
+}
+
+contract D {
+    Factory public factory = new Factory();
+    IC public c;
+
+    constructor() payable {}
+
+    function deploy_create2() public payable {
+        c = IC(factory.deploy{value: 1 ether}(hex"1234"));
+    }
+
+    function terminate() public {
+        c.terminate();
+    }
+
+    function test_deploy_and_terminate() public {
+        deploy_create2();
+        assert(exists());
+        test_balance_after_create();
+        terminate();
+        test_balance_after_selfdestruct();
+    }
+
+    function test_balance_after_create() public view {
+        assert(address(this).balance == 0);
+        assert(address(c).balance == 1 ether);
+    }
+
+    function test_balance_after_selfdestruct() public view {
+        assert(address(this).balance == 1 ether);
+        assert(address(c).balance == 0);
+    }
+
+    function exists() public view returns (bool) {
+        return address(c).code.length != 0;
+    }
+}
+
+// ====
+// EVMVersion: =shanghai
+// ----
+// constructor(), 1 ether ->
+// gas irOptimized: 430265
+// gas legacy: 690264
+// gas legacyOptimized: 412819
+// exists() -> false
+// test_deploy_and_terminate() ->
+// ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
+// gas irOptimized: 117489
+// gas legacy: 118895
+// gas legacyOptimized: 117137
+// exists() -> false
+// deploy_create2() ->
+// ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
+// test_balance_after_create() ->
+// exists() -> true
+// terminate() ->
+// test_balance_after_selfdestruct() ->
+// exists() -> false
+// deploy_create2() ->
+// ~ emit Deployed(address,bytes32) from 0x137aa4dfc0911524504fcd4d98501f179bc13b4a: 0x7e6580007e709ac52945fae182c61131d42634e8, 0x1234000000000000000000000000000000000000000000000000000000000000
diff --git a/test/libsolidity/syntaxTests/globalFunctions/selfdestruct_no_call.sol b/test/libsolidity/syntaxTests/globalFunctions/selfdestruct_no_call.sol
new file mode 100644
index 0000000000..e8a657bdf3
--- /dev/null
+++ b/test/libsolidity/syntaxTests/globalFunctions/selfdestruct_no_call.sol
@@ -0,0 +1,6 @@
+contract C {
+    function f() pure public { selfdestruct; }
+}
+// ----
+// Warning 5159: (44-56): "selfdestruct" has been deprecated. Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and data associated with an account and only transfers its Ether to the beneficiary, unless executed in the same transaction in which the contract was created (see EIP-6780). Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. Future changes to the EVM might further reduce the functionality of the opcode.
+// Warning 6133: (44-56): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol b/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol
deleted file mode 100644
index 6662d7b299..0000000000
--- a/test/libsolidity/syntaxTests/nameAndTypeResolution/430_bare_selfdestruct.sol
+++ /dev/null
@@ -1,6 +0,0 @@
-contract C {
-    function f() pure public { selfdestruct; }
-}
-// ----
-// Warning 5159: (44-56): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
-// Warning 6133: (44-56): Statement has no effect.
diff --git a/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol b/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
index 9122d2a894..0a46775702 100644
--- a/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_nonpayable_selfdestruct.sol
@@ -4,5 +4,5 @@ contract C {
     }
 }
 // ----
-// Warning 5159: (56-68): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
+// Warning 5159: (56-68): "selfdestruct" has been deprecated. Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and data associated with an account and only transfers its Ether to the beneficiary, unless executed in the same transaction in which the contract was created (see EIP-6780). Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. Future changes to the EVM might further reduce the functionality of the opcode.
 // TypeError 9553: (69-70): Invalid type for argument in function call. Invalid implicit conversion from address to address payable requested.
diff --git a/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol b/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol
index bd1aff7952..754ff2c674 100644
--- a/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol
+++ b/test/libsolidity/syntaxTests/types/address/address_payable_selfdestruct.sol
@@ -4,4 +4,4 @@ contract C {
     }
 }
 // ----
-// Warning 5159: (64-76): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
+// Warning 5159: (64-76): "selfdestruct" has been deprecated. Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and data associated with an account and only transfers its Ether to the beneficiary, unless executed in the same transaction in which the contract was created (see EIP-6780). Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. Future changes to the EVM might further reduce the functionality of the opcode.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol
index 3ee9406798..4d1710a3a1 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions.sol
@@ -19,4 +19,4 @@ contract C {
     receive() payable external {}
 }
 // ----
-// Warning 5159: (122-134): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
+// Warning 5159: (122-134): "selfdestruct" has been deprecated. Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and data associated with an account and only transfers its Ether to the beneficiary, unless executed in the same transaction in which the contract was created (see EIP-6780). Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. Future changes to the EVM might further reduce the functionality of the opcode.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
index f458aaad5d..4f9efcdb5d 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/builtin_functions_view_fail.sol
@@ -20,7 +20,7 @@ contract C {
     }
 }
 // ----
-// Warning 5159: (201-213): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
+// Warning 5159: (201-213): "selfdestruct" has been deprecated. Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and data associated with an account and only transfers its Ether to the beneficiary, unless executed in the same transaction in which the contract was created (see EIP-6780). Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. Future changes to the EVM might further reduce the functionality of the opcode.
 // TypeError 8961: (52-77): Function cannot be declared as view because this expression (potentially) modifies the state.
 // TypeError 8961: (132-153): Function cannot be declared as view because this expression (potentially) modifies the state.
 // TypeError 8961: (201-228): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
index b3753706cf..886d6de0ce 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_allowed.sol
@@ -85,7 +85,7 @@ contract C {
 // ====
 // EVMVersion: >=paris
 // ----
-// Warning 1699: (1754-1766): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
+// Warning 1699: (1754-1766): "selfdestruct" has been deprecated. Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and data associated with an account and only transfers its Ether to the beneficiary, unless executed in the same transaction in which the contract was created (see EIP-6780). Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. Future changes to the EVM might further reduce the functionality of the opcode.
 // Warning 5740: (89-1716): Unreachable code.
 // Warning 5740: (1729-1741): Unreachable code.
 // Warning 5740: (1754-1769): Unreachable code.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
index be84b801f2..665a17eebf 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_pure.sol
@@ -35,7 +35,7 @@ contract C {
     }
 }
 // ----
-// Warning 1699: (498-510): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
+// Warning 1699: (498-510): "selfdestruct" has been deprecated. Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and data associated with an account and only transfers its Ether to the beneficiary, unless executed in the same transaction in which the contract was created (see EIP-6780). Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. Future changes to the EVM might further reduce the functionality of the opcode.
 // Warning 5740: (526-853): Unreachable code.
 // TypeError 2527: (79-87): Function declared as pure, but this expression (potentially) reads from the environment or state and thus requires "view".
 // TypeError 8961: (101-113): Function cannot be declared as pure because this expression (potentially) modifies the state.
diff --git a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol
index cd69bed793..b2f241ff08 100644
--- a/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol
+++ b/test/libsolidity/syntaxTests/viewPureChecker/inline_assembly_instructions_disallowed_view.sol
@@ -23,7 +23,7 @@ contract C {
 // ====
 // EVMVersion: >=london
 // ----
-// Warning 1699: (308-320): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
+// Warning 1699: (308-320): "selfdestruct" has been deprecated. Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and data associated with an account and only transfers its Ether to the beneficiary, unless executed in the same transaction in which the contract was created (see EIP-6780). Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. Future changes to the EVM might further reduce the functionality of the opcode.
 // Warning 5740: (336-468): Unreachable code.
 // TypeError 8961: (75-87): Function cannot be declared as view because this expression (potentially) modifies the state.
 // TypeError 8961: (104-119): Function cannot be declared as view because this expression (potentially) modifies the state.
diff --git a/test/libyul/yulSyntaxTests/selfdestruct.yul b/test/libyul/yulSyntaxTests/selfdestruct.yul
index 745fdc5c5a..faecf92c38 100644
--- a/test/libyul/yulSyntaxTests/selfdestruct.yul
+++ b/test/libyul/yulSyntaxTests/selfdestruct.yul
@@ -2,4 +2,4 @@
 	selfdestruct(0x02)
 }
 // ----
-// Warning 1699: (3-15): "selfdestruct" has been deprecated. The underlying opcode will eventually undergo breaking changes, and its use is not recommended.
+// Warning 1699: (3-15): "selfdestruct" has been deprecated. Note that, starting from the Cancun hard fork, the underlying opcode no longer deletes the code and data associated with an account and only transfers its Ether to the beneficiary, unless executed in the same transaction in which the contract was created (see EIP-6780). Any use in newly deployed contracts is strongly discouraged even if the new behavior is taken into account. Future changes to the EVM might further reduce the functionality of the opcode.

From ea0b75089bc999604b541eb042e39a8ac3648484 Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Mon, 11 Dec 2023 15:52:47 +0100
Subject: [PATCH 1722/1748] Add support for apple silicon.

---
 .circleci/compare_bytecode_reports.sh         |  1 +
 .circleci/config.yml                          | 29 +++++++-
 .circleci/osx_install_dependencies.sh         | 68 ++++++++++++++-----
 .circleci/parallel_bytecode_report.sh         |  5 +-
 cmake/jsoncpp.cmake                           |  2 +
 scripts/bytecodecompare/prepare_report.py     | 30 +++++++-
 scripts/install_obsolete_jsoncpp_1_7_4.sh     |  2 +-
 .../test_bytecodecompare_prepare_report.py    |  9 ++-
 8 files changed, 120 insertions(+), 26 deletions(-)

diff --git a/.circleci/compare_bytecode_reports.sh b/.circleci/compare_bytecode_reports.sh
index 7b62656bf2..7574b0656c 100755
--- a/.circleci/compare_bytecode_reports.sh
+++ b/.circleci/compare_bytecode_reports.sh
@@ -30,6 +30,7 @@ native_platforms=(
     ubuntu2004-static
     ubuntu
     osx
+    osx_intel
     windows
 )
 interfaces=(
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9a967febaa..02c15e691b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -81,6 +81,7 @@ commands:
         enum:
           - solcjs
           - native
+          - osx_intel
       binary_path:
         type: string
       preset:
@@ -491,12 +492,13 @@ defaults:
 
   - base_osx: &base_osx
       macos:
-        xcode: "14.2.0"
-      resource_class: macos.x86.medium.gen2
+        xcode: "15.0.0"
+      resource_class: macos.m1.medium.gen1
       environment: &base_osx_env
         TERM: xterm
         MAKEFLAGS: -j5
         CPUs: 5
+        ETH_EVMONE: /usr/local/lib/libevmone.dylib
 
   - base_python_small: &base_python_small
       docker:
@@ -1146,6 +1148,7 @@ jobs:
     environment:
       <<: *base_osx_env
       CMAKE_BUILD_TYPE: Release
+      CMAKE_OPTIONS: -DCMAKE_OSX_ARCHITECTURES:STRING=x86_64;arm64
     steps:
       - checkout
       - install_dependencies_osx
@@ -1657,6 +1660,22 @@ jobs:
           binary_path: "build/solc/solc"
           preset: "<< parameters.preset >>"
 
+  b_bytecode_osx_intel:
+    parameters:
+      preset:
+        type: string
+    <<: *base_osx
+    parallelism: 2 # For prepare_bytecode_report
+    steps:
+      - checkout
+      - attach_workspace:
+          at: .
+      - prepare_bytecode_report:
+          label: "osx_intel"
+          binary_type: osx_intel
+          binary_path: "build/solc/solc"
+          preset: "<< parameters.preset >>"
+
   b_bytecode_win:
     parameters:
       preset:
@@ -1880,6 +1899,11 @@ workflows:
           matrix: *bytecode_compare_preset_matrix
           requires:
             - b_osx
+      - b_bytecode_osx_intel:
+          <<: *on_all_tags_and_branches
+          matrix: *bytecode_compare_preset_matrix
+          requires:
+            - b_osx
       - b_bytecode_ems:
           <<: *on_all_tags_and_branches
           matrix: *bytecode_compare_preset_matrix
@@ -1892,6 +1916,7 @@ workflows:
             - b_bytecode_ubu
             - b_bytecode_win
             - b_bytecode_osx
+            - b_bytecode_osx_intel
             - b_bytecode_ems
 
       # Final artifacts
diff --git a/.circleci/osx_install_dependencies.sh b/.circleci/osx_install_dependencies.sh
index 8b8656abd7..4ca4a31d50 100755
--- a/.circleci/osx_install_dependencies.sh
+++ b/.circleci/osx_install_dependencies.sh
@@ -50,33 +50,67 @@ if [ ! -f /usr/local/lib/libz3.a ] # if this file does not exists (cache was not
 then
   brew update
   brew upgrade
-  brew install boost
   brew install cmake
   brew install wget
   brew install coreutils
   brew install diffutils
   brew install grep
-  ./scripts/install_obsolete_jsoncpp_1_7_4.sh
+
+  # writing to /usr/local/lib need administrative privileges.
+  sudo ./scripts/install_obsolete_jsoncpp_1_7_4.sh
+
+  # boost
+  boost_version="1.84.0"
+  boost_package="boost_${boost_version//./_}.tar.bz2"
+  boost_dir="boost_${boost_version//./_}"
+  wget "https://boostorg.jfrog.io/artifactory/main/release/$boost_version/source/$boost_package"
+  tar xf "$boost_package"
+  rm "$boost_package"
+  cd "$boost_dir"
+  ./bootstrap.sh --with-toolset=clang --with-libraries=thread,system,filesystem,program_options,serialization,test
+  # the default number of jobs that b2 is taking, is the number of detected available CPU threads.
+  sudo ./b2 -a address-model=64 architecture=arm+x86 install
+  cd ..
+  sudo rm -rf "$boost_dir"
 
   # z3
   z3_version="4.12.1"
-  z3_dir="z3-${z3_version}-x64-osx-10.16"
-  z3_package="${z3_dir}.zip"
-  wget "https://github.com/Z3Prover/z3/releases/download/z3-${z3_version}/${z3_package}"
-  validate_checksum "$z3_package" 7601f844de6d906235140d0f76cca58be7ac716f3e2c29c35845aa24b24f73b9
-  unzip "$z3_package"
+  z3_dir="z3-z3-$z3_version"
+  z3_package="z3-$z3_version.tar.gz"
+  wget "https://github.com/Z3Prover/z3/archive/refs/tags/$z3_package"
+  validate_checksum "$z3_package" a3735fabf00e1341adcc70394993c05fd3e2ae167a3e9bb46045e33084eb64a3
+  tar xf "$z3_package"
   rm "$z3_package"
-  cp "${z3_dir}/bin/libz3.a" /usr/local/lib
-  cp "${z3_dir}/bin/z3" /usr/local/bin
-  cp "${z3_dir}/include/"* /usr/local/include
-  rm -r "$z3_dir"
+  cd "$z3_dir"
+  mkdir build
+  cd build
+  cmake -DCMAKE_OSX_ARCHITECTURES:STRING="x86_64;arm64" -DZ3_BUILD_LIBZ3_SHARED=false ..
+  make -j
+  sudo make install
+  cd ../..
+  rm -rf "$z3_dir"
 
   # evmone
   evmone_version="0.11.0"
-  evmone_package="evmone-${evmone_version}-darwin-x86_64.tar.gz"
-  wget "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/${evmone_package}"
-  validate_checksum "$evmone_package" 83ed20676681d9a31bd30cac399ab7c615ccab8adb8087cc2c7e9cd22b4d2efc
-  tar xzpf "$evmone_package" -C /usr/local
-  rm "$evmone_package"
-
+  if [[ $(uname -m) == 'arm64' ]]
+  then
+    # evmone does not provide any builds for apple silicon yet. so lets just build it locally.
+    # be aware that we are only building the arm version here, we don't build a universal binary.
+    git clone https://github.com/ethereum/evmone.git
+    cd evmone
+    git checkout "v${evmone_version}"
+    git submodule update --init
+    cmake -S . -B build
+    cmake --build build
+    cd build
+    sudo make install
+    cd ../..
+    rm -rf evmone
+  else
+    evmone_package="evmone-${evmone_version}-darwin-x86_64.tar.gz"
+    wget "https://github.com/ethereum/evmone/releases/download/v${evmone_version}/${evmone_package}"
+    validate_checksum "$evmone_package" 83ed20676681d9a31bd30cac399ab7c615ccab8adb8087cc2c7e9cd22b4d2efc
+    tar xzpf "$evmone_package" -C /usr/local
+    rm "$evmone_package"
+  fi
 fi
diff --git a/.circleci/parallel_bytecode_report.sh b/.circleci/parallel_bytecode_report.sh
index 9b316266a2..7fe22c3432 100755
--- a/.circleci/parallel_bytecode_report.sh
+++ b/.circleci/parallel_bytecode_report.sh
@@ -33,7 +33,7 @@ binary_type="$2"
 binary_path="$3" # This path must be absolute
 preset="$4"
 
-[[ $binary_type == native || $binary_type == solcjs ]] || { >&2 echo "Invalid binary type: ${binary_type}"; exit 1; }
+[[ $binary_type == native || $binary_type == "osx_intel" || $binary_type == solcjs ]] || { >&2 echo "Invalid binary type: ${binary_type}"; exit 1; }
 
 # NOTE: Locale affects the order of the globbed files.
 export LC_ALL=C
@@ -47,7 +47,7 @@ python3 ../scripts/isolate_tests.py ../test/
 # FIXME: These cases crash because of https://github.com/ethereum/solidity/issues/13583
 rm ./*_bytecode_too_large_*.sol ./*_combined_too_large_*.sol
 
-if [[ $binary_type == native ]]; then
+if [[ $binary_type == native || $binary_type == "osx_intel" ]]; then
     interface=$(echo -e "standard-json\ncli" | circleci tests split)
     echo "Selected interface: ${interface}"
 
@@ -56,6 +56,7 @@ if [[ $binary_type == native ]]; then
         "$binary_path" \
         --interface "$interface" \
         --preset "$preset" \
+        --execution-arch "$binary_type" \
         --report-file "../bytecode-report-${label}-${interface}-${preset}.txt"
 else
     echo "Installing solc-js"
diff --git a/cmake/jsoncpp.cmake b/cmake/jsoncpp.cmake
index cf1cc656b3..c47c2697a3 100644
--- a/cmake/jsoncpp.cmake
+++ b/cmake/jsoncpp.cmake
@@ -40,6 +40,7 @@ if (WIN32 AND POLICY CMP0091 AND CMAKE_MSVC_RUNTIME_LIBRARY)
     list(APPEND JSONCPP_CMAKE_ARGS "-DCMAKE_MSVC_RUNTIME_LIBRARY=${CMAKE_MSVC_RUNTIME_LIBRARY}")
 endif()
 
+string(REPLACE ";" "$<SEMICOLON>" CMAKE_OSX_ARCHITECTURES_ "${CMAKE_OSX_ARCHITECTURES}")
 ExternalProject_Add(jsoncpp-project
     PREFIX "${prefix}"
     DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/deps/downloads"
@@ -57,6 +58,7 @@ ExternalProject_Add(jsoncpp-project
                -DJSONCPP_WITH_PKGCONFIG_SUPPORT=OFF
                -DCMAKE_CXX_FLAGS=${JSONCPP_CXX_FLAGS}
                -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+               -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES_}
                ${JSONCPP_CMAKE_ARGS}
     ${byproducts}
 )
diff --git a/scripts/bytecodecompare/prepare_report.py b/scripts/bytecodecompare/prepare_report.py
index 8be9ae045c..938f5171f1 100755
--- a/scripts/bytecodecompare/prepare_report.py
+++ b/scripts/bytecodecompare/prepare_report.py
@@ -26,6 +26,11 @@ class CompilerInterface(Enum):
     STANDARD_JSON = 'standard-json'
 
 
+class ExecutionArchitecture(Enum):
+    NATIVE = 'native'
+    OSX_INTEL = 'osx_intel'
+
+
 class SettingsPreset(Enum):
     LEGACY_OPTIMIZE = 'legacy-optimize'
     LEGACY_NO_OPTIMIZE = 'legacy-no-optimize'
@@ -214,6 +219,7 @@ def parse_cli_output(source_file_name: Path, cli_output: str, exit_code: int) ->
 
 def prepare_compiler_input(
     compiler_path: Path,
+    execution_arch: ExecutionArchitecture,
     source_file_name: Path,
     force_no_optimize_yul: bool,
     interface: CompilerInterface,
@@ -224,6 +230,12 @@ def prepare_compiler_input(
 
     settings = CompilerSettings.from_preset(preset)
 
+    command_line = []
+    if execution_arch == ExecutionArchitecture.OSX_INTEL:
+        command_line = ["/usr/bin/arch", "-64", "-x86_64"]
+    else:
+        assert execution_arch == ExecutionArchitecture.NATIVE
+
     if interface == CompilerInterface.STANDARD_JSON:
         json_input: dict = {
             'language': 'Solidity',
@@ -241,7 +253,7 @@ def prepare_compiler_input(
         if smt_use == SMTUse.DISABLE:
             json_input['settings']['modelChecker'] = {'engine': 'none'}
 
-        command_line = [str(compiler_path), '--standard-json']
+        command_line += [str(compiler_path), '--standard-json']
         compiler_input = json.dumps(json_input)
     else:
         assert interface == CompilerInterface.CLI
@@ -258,7 +270,7 @@ def prepare_compiler_input(
         if smt_use == SMTUse.DISABLE:
             compiler_options += ['--model-checker-engine', 'none']
 
-        command_line = [str(compiler_path)] + compiler_options
+        command_line += [str(compiler_path)] + compiler_options
         compiler_input = load_source(source_file_name, smt_use)
 
     return (command_line, compiler_input)
@@ -289,6 +301,7 @@ def detect_metadata_cli_option_support(compiler_path: Path):
 
 def run_compiler(
     compiler_path: Path,
+    execution_arch: ExecutionArchitecture,
     source_file_name: Path,
     force_no_optimize_yul: bool,
     interface: CompilerInterface,
@@ -298,10 +311,10 @@ def run_compiler(
     tmp_dir: Path,
     exit_on_error: bool,
 ) -> FileReport:
-
     if interface == CompilerInterface.STANDARD_JSON:
         (command_line, compiler_input) = prepare_compiler_input(
             compiler_path,
+            execution_arch,
             Path(source_file_name.name),
             force_no_optimize_yul,
             interface,
@@ -325,6 +338,7 @@ def run_compiler(
 
         (command_line, compiler_input) = prepare_compiler_input(
             compiler_path.absolute(),
+            execution_arch,
             Path(source_file_name.name),
             force_no_optimize_yul,
             interface,
@@ -354,6 +368,7 @@ def run_compiler(
 def generate_report(
     source_file_names: List[str],
     compiler_path: Path,
+    execution_arch: ExecutionArchitecture,
     interface: CompilerInterface,
     presets: List[SettingsPreset],
     smt_use: SMTUse,
@@ -373,6 +388,7 @@ def generate_report(
                         try:
                             report = run_compiler(
                                 compiler_path,
+                                execution_arch,
                                 Path(source_file_name),
                                 force_no_optimize_yul,
                                 interface,
@@ -422,6 +438,13 @@ def commandline_parser() -> ArgumentParser:
         choices=[c.value for c in CompilerInterface],
         help="Compiler interface to use.",
     )
+    parser.add_argument(
+        '--execution-arch',
+        dest='execution_arch',
+        default=ExecutionArchitecture.NATIVE.value,
+        choices=[c.value for c in ExecutionArchitecture],
+        help="Select the architecture of the universal binary that should be executed. (Only relevant for macOS)",
+    )
     parser.add_argument(
         '--preset',
         dest='presets',
@@ -470,6 +493,7 @@ def commandline_parser() -> ArgumentParser:
     generate_report(
         glob("*.sol"),
         Path(options.compiler_path),
+        ExecutionArchitecture(options.execution_arch),
         CompilerInterface(options.interface),
         [SettingsPreset(p) for preset_group in presets for p in preset_group],
         SMTUse(options.smt_use),
diff --git a/scripts/install_obsolete_jsoncpp_1_7_4.sh b/scripts/install_obsolete_jsoncpp_1_7_4.sh
index 825d1a58a2..f9de0245d7 100755
--- a/scripts/install_obsolete_jsoncpp_1_7_4.sh
+++ b/scripts/install_obsolete_jsoncpp_1_7_4.sh
@@ -17,7 +17,7 @@ TEMPDIR=$(mktemp -d)
     cd "jsoncpp-${jsoncpp_version}"
     mkdir -p build
     cd build
-    cmake -DARCHIVE_INSTALL_DIR=. -G "Unix Makefiles" ..
+    cmake -DCMAKE_OSX_ARCHITECTURES:STRING="x86_64;arm64" -DARCHIVE_INSTALL_DIR=. -G "Unix Makefiles" ..
     make
     make install
 )
diff --git a/test/scripts/test_bytecodecompare_prepare_report.py b/test/scripts/test_bytecodecompare_prepare_report.py
index d73b1f7141..28a89ec315 100644
--- a/test/scripts/test_bytecodecompare_prepare_report.py
+++ b/test/scripts/test_bytecodecompare_prepare_report.py
@@ -9,7 +9,8 @@
 
 # NOTE: This test file file only works with scripts/ added to PYTHONPATH so pylint can't find the imports
 # pragma pylint: disable=import-error
-from bytecodecompare.prepare_report import CompilerInterface, FileReport, ContractReport, SettingsPreset, SMTUse, Statistics
+from bytecodecompare.prepare_report import ExecutionArchitecture, CompilerInterface, FileReport, ContractReport
+from bytecodecompare.prepare_report import SettingsPreset, SMTUse, Statistics
 from bytecodecompare.prepare_report import load_source, parse_cli_output, parse_standard_json_output, prepare_compiler_input
 # pragma pylint: enable=import-error
 
@@ -223,6 +224,7 @@ def test_prepare_compiler_input_should_work_with_standard_json_interface(self):
 
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
+            ExecutionArchitecture.NATIVE,
             SMT_SMOKE_TEST_SOL_PATH,
             preset=SettingsPreset.LEGACY_OPTIMIZE,
             force_no_optimize_yul=False,
@@ -237,6 +239,7 @@ def test_prepare_compiler_input_should_work_with_standard_json_interface(self):
     def test_prepare_compiler_input_should_work_with_cli_interface(self):
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
+            ExecutionArchitecture.NATIVE,
             SMT_SMOKE_TEST_SOL_PATH,
             preset=SettingsPreset.LEGACY_OPTIMIZE,
             force_no_optimize_yul=False,
@@ -273,6 +276,7 @@ def test_prepare_compiler_input_for_json_preserves_newlines(self):
 
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
+            ExecutionArchitecture.NATIVE,
             SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH,
             preset=SettingsPreset.VIA_IR_OPTIMIZE,
             force_no_optimize_yul=False,
@@ -287,6 +291,7 @@ def test_prepare_compiler_input_for_json_preserves_newlines(self):
     def test_prepare_compiler_input_for_cli_preserves_newlines(self):
         (_command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
+            ExecutionArchitecture.NATIVE,
             SMT_CONTRACT_WITH_MIXED_NEWLINES_SOL_PATH,
             preset=SettingsPreset.LEGACY_OPTIMIZE,
             force_no_optimize_yul=True,
@@ -300,6 +305,7 @@ def test_prepare_compiler_input_for_cli_preserves_newlines(self):
     def test_prepare_compiler_input_for_cli_should_handle_force_no_optimize_yul_flag(self):
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
+            ExecutionArchitecture.NATIVE,
             SMT_SMOKE_TEST_SOL_PATH,
             preset=SettingsPreset.LEGACY_NO_OPTIMIZE,
             force_no_optimize_yul=True,
@@ -317,6 +323,7 @@ def test_prepare_compiler_input_for_cli_should_handle_force_no_optimize_yul_flag
     def test_prepare_compiler_input_for_cli_should_not_use_metadata_option_if_not_supported(self):
         (command_line, compiler_input) = prepare_compiler_input(
             Path('solc'),
+            ExecutionArchitecture.NATIVE,
             SMT_SMOKE_TEST_SOL_PATH,
             preset=SettingsPreset.VIA_IR_OPTIMIZE,
             force_no_optimize_yul=False,

From 631fd9daaad4e142e15c0fd87dddf3b44219e07a Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 17 Jan 2024 15:20:50 +0100
Subject: [PATCH 1723/1748] Issue a warning when comparing internal function
 pointers

---
 libsolidity/analysis/TypeChecker.cpp          | 21 +++++++++++++++++++
 .../operators/delete_function_type_1.sol      |  8 +++----
 .../operators/delete_function_type_2.sol      |  8 +++----
 .../operators/delete_function_type_3.sol      | 16 +++++++-------
 ...unction_type_to_function_type_internal.sol |  5 +++--
 .../comparison_of_function_types_eq.sol       | 11 ----------
 ...mparison_of_function_types_external_eq.sol |  9 ++++++++
 ...arison_of_function_types_internal_eq_1.sol | 11 ++++++++++
 ...arison_of_function_types_internal_eq_2.sol | 11 ++++++++++
 ...nternal_and_external_function_pointers.sol |  1 +
 10 files changed, 72 insertions(+), 29 deletions(-)
 delete mode 100644 test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_eq.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_external_eq.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_internal_eq_1.sol
 create mode 100644 test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_internal_eq_2.sol

diff --git a/libsolidity/analysis/TypeChecker.cpp b/libsolidity/analysis/TypeChecker.cpp
index 91224610f5..5bef2803ac 100644
--- a/libsolidity/analysis/TypeChecker.cpp
+++ b/libsolidity/analysis/TypeChecker.cpp
@@ -1890,6 +1890,27 @@ void TypeChecker::endVisit(BinaryOperation const& _operation)
 	_operation.annotation().isLValue = false;
 	_operation.annotation().isConstant = false;
 
+	if (_operation.getOperator() == Token::Equal || _operation.getOperator() == Token::NotEqual)
+	{
+		auto const* leftFunction = dynamic_cast<FunctionType const*>(leftType);
+		auto const* rightFunction = dynamic_cast<FunctionType const*>(rightType);
+		if (
+			leftFunction &&
+			rightFunction &&
+			leftFunction->kind() == FunctionType::Kind::Internal &&
+			rightFunction->kind() == FunctionType::Kind::Internal
+		)
+		{
+			m_errorReporter.warning(
+				3075_error,
+				_operation.location(),
+				"Comparison of internal function pointers can yield unexpected results "
+				"in the legacy pipeline with the optimizer enabled, and will be disallowed entirely "
+				"in the next breaking release."
+			);
+		}
+	}
+
 	if (_operation.getOperator() == Token::Exp || _operation.getOperator() == Token::SHL)
 	{
 		std::string operation = _operation.getOperator() == Token::Exp ? "exponentiation" : "shift";
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol b/test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol
index b6bc1f6a04..7df2b127cc 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_function_type_1.sol
@@ -1,10 +1,10 @@
 struct S {
-    function() e;
+    function() external e;
 }
 
 contract C {
     S s;
-    function() f;
+    function() external f;
 
     constructor() {
         delete s.e;
@@ -12,5 +12,5 @@ contract C {
     }
 }
 // ----
-// Warning 7229: (128-136): Assertion checker does not yet implement the type function () for comparisons
-// Warning 6328: (121-137): CHC: Assertion violation happens here.
+// Warning 7229: (146-154): Assertion checker does not yet implement the type function () external for comparisons
+// Warning 6328: (139-155): CHC: Assertion violation happens here.\nCounterexample:\ns = {e: 0}, f = 0\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol b/test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol
index ee7497aca0..a2168a7c7b 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_function_type_2.sol
@@ -1,6 +1,6 @@
 contract C {
-    mapping (uint => function()) m;
-    function() f;
+    mapping (uint => function() external) m;
+    function() external f;
 
     constructor() {
         m[2] = f;
@@ -9,5 +9,5 @@ contract C {
     }
 }
 // ----
-// Warning 7229: (142-151): Assertion checker does not yet implement the type function () for comparisons
-// Warning 6328: (135-152): CHC: Assertion violation happens here.
+// Warning 7229: (160-169): Assertion checker does not yet implement the type function () external for comparisons
+// Warning 6328: (153-170): CHC: Assertion violation happens here.\nCounterexample:\nf = 0\n\nTransaction trace:\nC.constructor()
diff --git a/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol b/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol
index 33a31d6c48..06fd29ccaf 100644
--- a/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol
+++ b/test/libsolidity/smtCheckerTests/operators/delete_function_type_3.sol
@@ -1,6 +1,6 @@
 contract C {
-    function()[] arr;
-    function() f;
+    function() external[] arr;
+    function() external f;
 
     constructor() {
         arr.push();
@@ -11,10 +11,10 @@ contract C {
     }
 }
 // ----
-// Warning 8364: (82-90): Assertion checker does not yet implement type function (function ()[] storage pointer) returns (function ())
-// Warning 8364: (102-110): Assertion checker does not yet implement type function (function ()[] storage pointer) returns (function ())
-// Warning 7229: (172-183): Assertion checker does not yet implement the type function () for comparisons
-// Warning 6368: (149-155): CHC: Out of bounds access happens here.
-// Warning 6368: (172-178): CHC: Out of bounds access happens here.
-// Warning 6328: (165-184): CHC: Assertion violation happens here.
+// Warning 8364: (100-108): Assertion checker does not yet implement type function (function () external[] storage pointer) returns (function () external)
+// Warning 8364: (120-128): Assertion checker does not yet implement type function (function () external[] storage pointer) returns (function () external)
+// Warning 7229: (190-201): Assertion checker does not yet implement the type function () external for comparisons
+// Warning 6368: (167-173): CHC: Out of bounds access happens here.\nCounterexample:\nf = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6368: (190-196): CHC: Out of bounds access happens here.\nCounterexample:\nf = 0\n\nTransaction trace:\nC.constructor()
+// Warning 6328: (183-202): CHC: Assertion violation happens here.\nCounterexample:\narr = [14, 0], f = 0\n\nTransaction trace:\nC.constructor()
 // Info 1391: CHC: 1 verification condition(s) proved safe! Enable the model checker option "show proved safe" to see all of them.
diff --git a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
index 368e9c922f..2aba4b283e 100644
--- a/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
+++ b/test/libsolidity/smtCheckerTests/typecast/function_type_to_function_type_internal.sol
@@ -13,10 +13,11 @@ contract C {
 // SMTEngine: all
 // ----
 // Warning 2519: (93-124): This declaration shadows an existing declaration.
+// Warning 3075: (203-209): Comparison of internal function pointers can yield unexpected results in the legacy pipeline with the optimizer enabled, and will be disallowed entirely in the next breaking release.
 // Warning 6031: (179-183): Internal error: Expression undefined for SMT solver.
 // Warning 6031: (187-191): Internal error: Expression undefined for SMT solver.
 // Warning 7229: (203-209): Assertion checker does not yet implement the type function (uint256) returns (uint256) for comparisons
 // Warning 5729: (179-183): BMC does not yet implement this type of function call.
 // Warning 5729: (187-191): BMC does not yet implement this type of function call.
-// Warning 6328: (172-192): CHC: Assertion violation happens here.
-// Warning 6328: (196-210): CHC: Assertion violation happens here.
+// Warning 6328: (172-192): CHC: Assertion violation happens here.\nCounterexample:\na = 0, b = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0, b = 0\nC.g()\n    C.f(0, 0) -- internal call
+// Warning 6328: (196-210): CHC: Assertion violation happens here.\nCounterexample:\na = 0, b = 0\n\nTransaction trace:\nC.constructor()\nState: a = 0, b = 0\nC.g()\n    C.f(0, 0) -- internal call
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_eq.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_eq.sol
deleted file mode 100644
index 026f0343be..0000000000
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_eq.sol
+++ /dev/null
@@ -1,11 +0,0 @@
-contract C {
-    function f() public returns (bool ret) {
-        return f == f;
-    }
-    function g() public returns (bool ret) {
-        return f != f;
-    }
-}
-// ----
-// Warning 2018: (17-86): Function state mutability can be restricted to pure
-// Warning 2018: (91-160): Function state mutability can be restricted to pure
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_external_eq.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_external_eq.sol
new file mode 100644
index 0000000000..2181fa99cf
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_external_eq.sol
@@ -0,0 +1,9 @@
+contract C {
+    function f() public view returns (bool ret) {
+        return this.f == this.f;
+    }
+    function g() public view returns (bool ret) {
+        return this.f != this.f;
+    }
+}
+// ----
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_internal_eq_1.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_internal_eq_1.sol
new file mode 100644
index 0000000000..44da7f0d18
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_internal_eq_1.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() public pure returns (bool ret) {
+        return f == f;
+    }
+    function g() public pure returns (bool ret) {
+        return f != f;
+    }
+}
+// ----
+// Warning 3075: (78-84): Comparison of internal function pointers can yield unexpected results in the legacy pipeline with the optimizer enabled, and will be disallowed entirely in the next breaking release.
+// Warning 3075: (157-163): Comparison of internal function pointers can yield unexpected results in the legacy pipeline with the optimizer enabled, and will be disallowed entirely in the next breaking release.
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_internal_eq_2.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_internal_eq_2.sol
new file mode 100644
index 0000000000..4be35a2396
--- /dev/null
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_of_function_types_internal_eq_2.sol
@@ -0,0 +1,11 @@
+contract C {
+    function f() internal {}
+    function g() internal {}
+
+    function test() public pure returns (bool) {
+        function () internal ptr = C.f;
+        return ptr == C.g;
+    }
+}
+// ----
+// Warning 3075: (176-186): Comparison of internal function pointers can yield unexpected results in the legacy pipeline with the optimizer enabled, and will be disallowed entirely in the next breaking release.
diff --git a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
index 7c0bf09606..358b9c621f 100644
--- a/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
+++ b/test/libsolidity/syntaxTests/functionTypes/comparison_operators_between_internal_and_external_function_pointers.sol
@@ -19,5 +19,6 @@ contract C {
     }
 }
 // ----
+// Warning 3075: (509-566): Comparison of internal function pointers can yield unexpected results in the legacy pipeline with the optimizer enabled, and will be disallowed entirely in the next breaking release.
 // TypeError 2271: (606-672): Built-in binary operator != cannot be applied to types function () and function () external.
 // TypeError 2271: (688-741): Built-in binary operator != cannot be applied to types function () and function () external.

From ef663c25a6c9d65fd101434fcfe3e3dcad3b9dcd Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 18 Jan 2024 12:57:15 +0100
Subject: [PATCH 1724/1748] Changelog and docs

---
 Changelog.md               | 1 +
 docs/types/value-types.rst | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index c876aa7bc8..7a5fe390c9 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,6 +12,7 @@ Language Features:
 Compiler Features:
 * EVM: Support for the EVM Version "Cancun".
 * SMTChecker: Support `bytes.concat` except when string literals are passed as arguments.
+* TypeChecker: Comparison of internal function pointers now yields a warning, as it can produce unexpected results with the legacy pipeline enabled.
 
 
 Bugfixes:
diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index 9fcb49b213..d44d2fd70a 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -813,6 +813,12 @@ functions.
     Marking the parameters as ``calldata`` only affects the implementation of the external function and is
     meaningless in a function pointer on the caller's side.
 
+.. warning::
+    Comparison of internal function pointers can have unexpected results in the legacy pipeline with the optimizer enabled,
+    as it can collapse identical functions into one, which will then lead to said function pointers comparing as equal instead of not.
+    Such comparisons are not advised, and will lead to the compiler issuing a warning, until the next breaking release (0.9.0),
+    when the warning will be upgraded to an error, thereby making such comparisons disallowed.
+
 Libraries are excluded because they require a ``delegatecall`` and use :ref:`a different ABI
 convention for their selectors <library-selectors>`.
 Functions declared in interfaces do not have definitions so pointing at them does not make sense either.

From ac3703a1abbb7310c9addddf0e69c93943752fab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Thu, 25 Jan 2024 04:39:41 +0100
Subject: [PATCH 1725/1748] using-the-compiler.rst: Adjust SolidityAST docs to
 match the pre-existing JSON structure

---
 docs/using-the-compiler.rst | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index bbeb116c9e..7643e31a74 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -235,14 +235,6 @@ Input Description
             // If files are used, their directories should be added to the command-line via
             // `--allow-paths <path>`.
           ]
-          // If language is set to "SolidityAST", an AST needs to be supplied under the "ast" key.
-          // Note that importing ASTs is experimental and in particular that:
-          // - importing invalid ASTs can produce undefined results and
-          // - no proper error reporting is available on invalid ASTs.
-          // Furthermore, note that the AST import only consumes the fields of the AST as
-          // produced by the compiler in "stopAfter": "parsing" mode and then re-performs
-          // analysis, so any analysis-based annotations of the AST are ignored upon import.
-          "ast": { ... } // formatted as the json ast requested with the ``ast`` output selection.
         },
         "destructible":
         {
@@ -250,6 +242,20 @@ Input Description
           "keccak256": "0x234...",
           // Required (unless "urls" is used): literal contents of the source file
           "content": "contract destructible is owned { function shutdown() { if (msg.sender == owner) selfdestruct(owner); } }"
+        },
+        "myFile.sol_json.ast":
+        {
+          // If language is set to "SolidityAST", an AST needs to be supplied under the "ast" key
+          // and there can be only one source file present.
+          // The format is the same as used by the `ast` output.
+          // Note that importing ASTs is experimental and in particular that:
+          // - importing invalid ASTs can produce undefined results and
+          // - no proper error reporting is available on invalid ASTs.
+          // Furthermore, note that the AST import only consumes the fields of the AST as
+          // produced by the compiler in "stopAfter": "parsing" mode and then re-performs
+          // analysis, so any analysis-based annotations of the AST are ignored upon import.
+          "ast": { ... }
+          }
         }
       },
       // Optional

From 4ed238035721f62ecb95355c15aa855498a1664d Mon Sep 17 00:00:00 2001
From: Alexander Arlt <alexander.arlt@arlt-labs.com>
Date: Wed, 31 May 2023 23:22:23 +0200
Subject: [PATCH 1726/1748] Add support to import EVM assembly via Standard
 JSON.

---
 Changelog.md                                  |   1 +
 docs/using-the-compiler.rst                   |  15 +-
 libevmasm/EVMAssemblyStack.cpp                |  11 +-
 libevmasm/EVMAssemblyStack.h                  |   5 +
 libsolidity/interface/StandardCompiler.cpp    | 134 +++++++++++++++++-
 libsolidity/interface/StandardCompiler.h      |   2 +
 .../standard_import_evmasm/input.json         |  28 ++++
 .../standard_import_evmasm/output.json        |  51 +++++++
 .../input.json                                |  46 ++++++
 .../output.json                               |  40 ++++++
 .../input.json                                |  15 ++
 .../output.json                               |  12 ++
 .../input.json                                |  28 ++++
 .../output.json                               |  12 ++
 .../input.json                                |  29 ++++
 .../output.json                               |  12 ++
 .../input.json                                |  12 ++
 .../output.json                               |  12 ++
 .../input.json                                |  28 ++++
 .../output.json                               |  12 ++
 .../input.json                                |  20 +++
 .../output.json                               |  12 ++
 .../input.json                                |  38 +++++
 .../output.json                               |  43 ++++++
 .../input.json                                |  32 +++++
 .../output.json                               |  12 ++
 .../input.json                                |  29 ++++
 .../output.json                               |   1 +
 test/libsolidity/StandardCompiler.cpp         |   2 +-
 29 files changed, 688 insertions(+), 6 deletions(-)
 create mode 100644 test/cmdlineTests/standard_import_evmasm/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm/output.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_immutable_references/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_immutable_references/output.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_input_array/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_input_array/output.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/output.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/output.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_no_source/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_no_source/output.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_opcode/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_opcode/output.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_two_sources/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_invalid_two_sources/output.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_link_references/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_link_references/output.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/output.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_no_output_selection/input.json
 create mode 100644 test/cmdlineTests/standard_import_evmasm_no_output_selection/output.json

diff --git a/Changelog.md b/Changelog.md
index 7a5fe390c9..db488b183a 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@ Compiler Features:
 * EVM: Support for the EVM Version "Cancun".
 * SMTChecker: Support `bytes.concat` except when string literals are passed as arguments.
 * TypeChecker: Comparison of internal function pointers now yields a warning, as it can produce unexpected results with the legacy pipeline enabled.
+* Standard JSON Interface: Add experimental support to import EVM assembly in the format used by ``--asm-json``.
 
 
 Bugfixes:
diff --git a/docs/using-the-compiler.rst b/docs/using-the-compiler.rst
index 7643e31a74..97abbdba9d 100644
--- a/docs/using-the-compiler.rst
+++ b/docs/using-the-compiler.rst
@@ -208,7 +208,7 @@ Input Description
 .. code-block:: javascript
 
     {
-      // Required: Source code language. Currently supported are "Solidity", "Yul" and "SolidityAST" (experimental).
+      // Required: Source code language. Currently supported are "Solidity", "Yul", "SolidityAST" (experimental), "EVMAssembly" (experimental).
       "language": "Solidity",
       // Required
       "sources":
@@ -255,6 +255,19 @@ Input Description
           // produced by the compiler in "stopAfter": "parsing" mode and then re-performs
           // analysis, so any analysis-based annotations of the AST are ignored upon import.
           "ast": { ... }
+        },
+        "myFile_evm.json":
+        {
+          // If language is set to "EVMAssembly", an EVM Assembly JSON object needs to be supplied
+          // under the "assemblyJson" key and there can be only one source file present.
+          // The format is the same as used by the `evm.legacyAssembly` output or `--asm-json`
+          // output on the command line.
+          // Note that importing EVM assembly is experimental.
+          "assemblyJson":
+          {
+            ".code": [ ... ],
+            ".data": { ... }, // optional
+            "sourceList": [ ... ] // optional (if no `source` node was defined in any `.code` object)
           }
         }
       },
diff --git a/libevmasm/EVMAssemblyStack.cpp b/libevmasm/EVMAssemblyStack.cpp
index 68f60808c9..a06044256f 100644
--- a/libevmasm/EVMAssemblyStack.cpp
+++ b/libevmasm/EVMAssemblyStack.cpp
@@ -36,11 +36,16 @@ namespace solidity::evmasm
 
 void EVMAssemblyStack::parseAndAnalyze(std::string const& _sourceName, std::string const& _source)
 {
-	solAssert(!m_evmAssembly);
-	m_name = _sourceName;
 	Json::Value assemblyJson;
 	solRequire(jsonParseStrict(_source, assemblyJson), AssemblyImportException, "Could not parse JSON file.");
-	std::tie(m_evmAssembly, m_sourceList) = evmasm::Assembly::fromJSON(assemblyJson);
+	analyze(_sourceName, assemblyJson);
+}
+
+void EVMAssemblyStack::analyze(std::string const& _sourceName, Json::Value const& _assemblyJson)
+{
+	solAssert(!m_evmAssembly);
+	m_name = _sourceName;
+	std::tie(m_evmAssembly, m_sourceList) = evmasm::Assembly::fromJSON(_assemblyJson);
 	solRequire(m_evmAssembly != nullptr, AssemblyImportException, "Could not create evm assembly object.");
 }
 
diff --git a/libevmasm/EVMAssemblyStack.h b/libevmasm/EVMAssemblyStack.h
index cf02cec52f..7fe77e7d20 100644
--- a/libevmasm/EVMAssemblyStack.h
+++ b/libevmasm/EVMAssemblyStack.h
@@ -40,6 +40,11 @@ class EVMAssemblyStack: public AbstractAssemblyStack
 	/// @throws AssemblyImportException, if JSON could not be validated.
 	void parseAndAnalyze(std::string const& _sourceName, std::string const& _source);
 
+	/// Runs analysis steps.
+	/// Multiple calls overwrite the previous state.
+	/// @throws AssemblyImportException, if JSON could not be validated.
+	void analyze(std::string const& _sourceName, Json::Value const& _assemblyJson);
+
 	void assemble();
 
 	std::string const& name() const { return m_name; }
diff --git a/libsolidity/interface/StandardCompiler.cpp b/libsolidity/interface/StandardCompiler.cpp
index b74f764c55..85a5a5d232 100644
--- a/libsolidity/interface/StandardCompiler.cpp
+++ b/libsolidity/interface/StandardCompiler.cpp
@@ -30,6 +30,7 @@
 #include <libyul/optimiser/Suite.h>
 
 #include <libevmasm/Disassemble.h>
+#include <libevmasm/EVMAssemblyStack.h>
 
 #include <libsmtutil/Exceptions.h>
 
@@ -730,7 +731,29 @@ std::variant<StandardCompiler::InputsAndSettings, Json::Value> StandardCompiler:
 		for (auto const& sourceName: sources.getMemberNames())
 			ret.sources[sourceName] = util::jsonCompactPrint(sources[sourceName]);
 	}
+	else if (ret.language == "EVMAssembly")
+	{
+		for (std::string const& sourceName: sources.getMemberNames())
+		{
+			solAssert(sources.isMember(sourceName));
+			if (
+				!sources[sourceName].isMember("assemblyJson") ||
+				!sources[sourceName]["assemblyJson"].isObject() ||
+				sources[sourceName].size() != 1
+			)
+				return formatFatalError(
+					Error::Type::JSONError,
+					"Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources." + sourceName
+				);
 
+			ret.jsonSources[sourceName] = sources[sourceName]["assemblyJson"];
+		}
+		if (ret.jsonSources.size() != 1)
+			return formatFatalError(
+				Error::Type::JSONError,
+				"EVMAssembly import only supports exactly one input file."
+			);
+	}
 	Json::Value const& auxInputs = _input["auxiliaryInput"];
 
 	if (auto result = checkAuxiliaryInputKeys(auxInputs))
@@ -1164,8 +1187,113 @@ std::map<std::string, Json::Value> StandardCompiler::parseAstFromInput(StringMap
 	return sourceJsons;
 }
 
+Json::Value StandardCompiler::importEVMAssembly(StandardCompiler::InputsAndSettings _inputsAndSettings)
+{
+	solAssert(_inputsAndSettings.language == "EVMAssembly");
+	solAssert(_inputsAndSettings.sources.empty());
+	solAssert(_inputsAndSettings.jsonSources.size() == 1);
+
+	if (!isBinaryRequested(_inputsAndSettings.outputSelection))
+		return Json::objectValue;
+
+	evmasm::EVMAssemblyStack stack(_inputsAndSettings.evmVersion);
+	std::string const& sourceName = _inputsAndSettings.jsonSources.begin()->first; // result of structured binding can only be used within lambda from C++20 on.
+	Json::Value const& sourceJson = _inputsAndSettings.jsonSources.begin()->second;
+	try
+	{
+		stack.analyze(sourceName, sourceJson);
+		stack.assemble();
+	}
+	catch (evmasm::AssemblyImportException const& e)
+	{
+		return formatFatalError(Error::Type::Exception, "Assembly import error: " + std::string(e.what()));
+	}
+	catch (evmasm::InvalidOpcode const& e)
+	{
+		return formatFatalError(Error::Type::Exception, "Assembly import error: " + std::string(e.what()));
+	}
+	catch (...)
+	{
+		return formatError(
+			Error::Type::Exception,
+			"general",
+			"Unknown exception during assembly import: " + boost::current_exception_diagnostic_information()
+		);
+	}
+	if (!stack.compilationSuccessful())
+		return Json::objectValue;
+
+	// EVM
+	bool const wildcardMatchesExperimental = false;
+	Json::Value evmData = Json::objectValue;
+	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, "", "evm.assembly", wildcardMatchesExperimental))
+		evmData["assembly"] = stack.assemblyString(sourceName, {});
+	if (isArtifactRequested(_inputsAndSettings.outputSelection, sourceName, "", "evm.legacyAssembly", wildcardMatchesExperimental))
+		evmData["legacyAssembly"] = stack.assemblyJSON(sourceName);
+
+	if (isArtifactRequested(
+		_inputsAndSettings.outputSelection,
+		sourceName,
+		"",
+		evmObjectComponents("bytecode"),
+		wildcardMatchesExperimental
+	))
+		evmData["bytecode"] = collectEVMObject(
+			_inputsAndSettings.evmVersion,
+			stack.object(sourceName),
+			stack.sourceMapping(sourceName),
+			{},
+			false, // _runtimeObject
+			[&](std::string const& _element) {
+				return isArtifactRequested(
+					_inputsAndSettings.outputSelection,
+					sourceName,
+					"",
+					"evm.bytecode." + _element,
+					wildcardMatchesExperimental
+				);
+			}
+		);
+
+	if (isArtifactRequested(
+		_inputsAndSettings.outputSelection,
+		sourceName,
+		"",
+		evmObjectComponents("deployedBytecode"),
+		wildcardMatchesExperimental
+	))
+		evmData["deployedBytecode"] = collectEVMObject(
+			_inputsAndSettings.evmVersion,
+			stack.runtimeObject(sourceName),
+			stack.runtimeSourceMapping(sourceName),
+			{},
+			true, // _runtimeObject
+			[&](std::string const& _element) {
+				return isArtifactRequested(
+					_inputsAndSettings.outputSelection,
+					sourceName,
+					"",
+					"evm.deployedBytecode." + _element,
+					wildcardMatchesExperimental
+				);
+			}
+		);
+
+	Json::Value contractData = Json::objectValue;
+	if (!evmData.empty())
+		contractData["evm"] = evmData;
+
+	Json::Value contractsOutput = Json::objectValue;
+	contractsOutput[sourceName][""] = contractData;
+	Json::Value output = Json::objectValue;
+	output["contracts"] = contractsOutput;
+	return util::removeNullMembers(output);
+}
+
 Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSettings _inputsAndSettings)
 {
+	solAssert(_inputsAndSettings.jsonSources.empty());
+
 	CompilerStack compilerStack(m_readFile);
 
 	StringMap sourceList = std::move(_inputsAndSettings.sources);
@@ -1470,6 +1598,8 @@ Json::Value StandardCompiler::compileSolidity(StandardCompiler::InputsAndSetting
 
 Json::Value StandardCompiler::compileYul(InputsAndSettings _inputsAndSettings)
 {
+	solAssert(_inputsAndSettings.jsonSources.empty());
+
 	Json::Value output = Json::objectValue;
 	output["errors"] = std::move(_inputsAndSettings.errors);
 
@@ -1627,8 +1757,10 @@ Json::Value StandardCompiler::compile(Json::Value const& _input) noexcept
 			return compileYul(std::move(settings));
 		else if (settings.language == "SolidityAST")
 			return compileSolidity(std::move(settings));
+		else if (settings.language == "EVMAssembly")
+			return importEVMAssembly(std::move(settings));
 		else
-			return formatFatalError(Error::Type::JSONError, "Only \"Solidity\", \"Yul\" or \"SolidityAST\" is supported as a language.");
+			return formatFatalError(Error::Type::JSONError, "Only \"Solidity\", \"Yul\", \"SolidityAST\" or \"EVMAssembly\" is supported as a language.");
 	}
 	catch (Json::LogicError const& _exception)
 	{
diff --git a/libsolidity/interface/StandardCompiler.h b/libsolidity/interface/StandardCompiler.h
index 523c09d94e..93cc73f3a7 100644
--- a/libsolidity/interface/StandardCompiler.h
+++ b/libsolidity/interface/StandardCompiler.h
@@ -74,6 +74,7 @@ class StandardCompiler
 		Json::Value errors;
 		CompilerStack::State stopAfter = CompilerStack::State::CompilationSuccessful;
 		std::map<std::string, std::string> sources;
+		std::map<std::string, Json::Value> jsonSources;
 		std::map<util::h256, std::string> smtLib2Responses;
 		langutil::EVMVersion evmVersion;
 		std::optional<uint8_t> eofVersion;
@@ -95,6 +96,7 @@ class StandardCompiler
 	std::variant<InputsAndSettings, Json::Value> parseInput(Json::Value const& _input);
 
 	std::map<std::string, Json::Value> parseAstFromInput(StringMap const& _sources);
+	Json::Value importEVMAssembly(InputsAndSettings _inputsAndSettings);
 	Json::Value compileSolidity(InputsAndSettings _inputsAndSettings);
 	Json::Value compileYul(InputsAndSettings _inputsAndSettings);
 
diff --git a/test/cmdlineTests/standard_import_evmasm/input.json b/test/cmdlineTests/standard_import_evmasm/input.json
new file mode 100644
index 0000000000..112f480459
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm/input.json
@@ -0,0 +1,28 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+        "A": {
+            "assemblyJson": {
+                ".code": [
+                    {
+                        "begin": 36,
+                        "end": 51,
+                        "name": "PUSH",
+                        "source": 0,
+                        "value": "0"
+                    }
+                ],
+                "sourceList": [
+                    "<stdin>"
+                ]
+            }
+        }
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": ["*"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm/output.json b/test/cmdlineTests/standard_import_evmasm/output.json
new file mode 100644
index 0000000000..5b7cdf3bb9
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm/output.json
@@ -0,0 +1,51 @@
+{
+    "contracts":
+    {
+        "A":
+        {
+            "":
+            {
+                "evm":
+                {
+                    "assembly": "    /* \"<stdin>\":36:51   */
+  0x00
+",
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    },
+                    "deployedBytecode":
+                    {
+                        "functionDebugData": {},
+                        "immutableReferences": {},
+                        "linkReferences": {},
+                        "object": "",
+                        "opcodes": "",
+                        "sourceMap": ""
+                    },
+                    "legacyAssembly":
+                    {
+                        ".code":
+                        [
+                            {
+                                "begin": 36,
+                                "end": 51,
+                                "name": "PUSH",
+                                "source": 0,
+                                "value": "0"
+                            }
+                        ],
+                        "sourceList":
+                        [
+                            "<stdin>"
+                        ]
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_immutable_references/input.json b/test/cmdlineTests/standard_import_evmasm_immutable_references/input.json
new file mode 100644
index 0000000000..0619f8d03d
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_immutable_references/input.json
@@ -0,0 +1,46 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+        "A": {
+            "assemblyJson": {
+                ".code": [
+                    {
+                        "begin": 59,
+                        "end": 159,
+                        "name": "ASSIGNIMMUTABLE",
+                        "source": 0,
+                        "value": "6"
+                    }
+                ],
+                ".data": {
+                    "0": {
+                        ".auxdata": "a2646970667358221220762f49087b0990aeaac25050c4a08d9057732db3cac345579ad648d92458e09e64736f6c63430008170033",
+                        ".code": [
+                            {
+                                "begin": 153,
+                                "end": 154,
+                                "name": "PUSHIMMUTABLE",
+                                "source": 0,
+                                "value": "6"
+                            }
+                        ]
+                    }
+                },
+                "sourceList": [
+                    "test.sol",
+                    "#utility.yul"
+                ]
+            }
+        }
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": [
+                    "evm.bytecode",
+                    "evm.deployedBytecode"
+                ]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_immutable_references/output.json b/test/cmdlineTests/standard_import_evmasm_immutable_references/output.json
new file mode 100644
index 0000000000..05a6ff7d5e
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_immutable_references/output.json
@@ -0,0 +1,40 @@
+{
+    "contracts":
+    {
+        "A":
+        {
+            "":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    },
+                    "deployedBytecode":
+                    {
+                        "functionDebugData": {},
+                        "immutableReferences":
+                        {
+                            "6":
+                            [
+                                {
+                                    "length": 32,
+                                    "start": 1
+                                }
+                            ]
+                        },
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_input_array/input.json b/test/cmdlineTests/standard_import_evmasm_invalid_input_array/input.json
new file mode 100644
index 0000000000..7da583b81f
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_input_array/input.json
@@ -0,0 +1,15 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+        "A": {
+            "assemblyJson": []
+        }
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": ["evm.bytecode"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_input_array/output.json b/test/cmdlineTests/standard_import_evmasm_invalid_input_array/output.json
new file mode 100644
index 0000000000..2a075efd02
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_input_array/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
+            "message": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/input.json b/test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/input.json
new file mode 100644
index 0000000000..e697565d10
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/input.json
@@ -0,0 +1,28 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+        "A": {
+            "invalidAssemblyJsonObject": {
+                ".code": [
+                    {
+                        "begin": 36,
+                        "end": 51,
+                        "name": "PUSH",
+                        "source": 0,
+                        "value": "0"
+                    }
+                ],
+                "sourceList": [
+                    "<stdin>"
+                ]
+            }
+        }
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": ["evm.bytecode"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/output.json b/test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/output.json
new file mode 100644
index 0000000000..2a075efd02
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_key_inside_source/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
+            "message": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/input.json b/test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/input.json
new file mode 100644
index 0000000000..c627b34c37
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/input.json
@@ -0,0 +1,29 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+        "A": {
+            "keccak256": "0x1234",
+            "assemblyJson": {
+                ".code": [
+                    {
+                        "begin": 36,
+                        "end": 51,
+                        "name": "PUSH",
+                        "source": 0,
+                        "value": "0"
+                    }
+                ],
+                "sourceList": [
+                    "<stdin>"
+                ]
+            }
+        }
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": ["evm.bytecode"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/output.json b/test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/output.json
new file mode 100644
index 0000000000..2a075efd02
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_key_other_source/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
+            "message": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_no_source/input.json b/test/cmdlineTests/standard_import_evmasm_invalid_no_source/input.json
new file mode 100644
index 0000000000..01cfc88a27
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_no_source/input.json
@@ -0,0 +1,12 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": ["evm.bytecode"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_no_source/output.json b/test/cmdlineTests/standard_import_evmasm_invalid_no_source/output.json
new file mode 100644
index 0000000000..3495a7411d
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_no_source/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "No input sources specified.",
+            "message": "No input sources specified.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_opcode/input.json b/test/cmdlineTests/standard_import_evmasm_invalid_opcode/input.json
new file mode 100644
index 0000000000..2e3e22cc41
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_opcode/input.json
@@ -0,0 +1,28 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+        "A": {
+            "assemblyJson": {
+                ".code": [
+                    {
+                        "begin": 36,
+                        "end": 51,
+                        "name": "INVALID_OPCODE",
+                        "source": 0,
+                        "value": "0"
+                    }
+                ],
+                "sourceList": [
+                    "<stdin>"
+                ]
+            }
+        }
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": ["evm.bytecode"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_opcode/output.json b/test/cmdlineTests/standard_import_evmasm_invalid_opcode/output.json
new file mode 100644
index 0000000000..6314f8b056
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_opcode/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Assembly import error: InvalidOpcode",
+            "message": "Assembly import error: InvalidOpcode",
+            "severity": "error",
+            "type": "Exception"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_two_sources/input.json b/test/cmdlineTests/standard_import_evmasm_invalid_two_sources/input.json
new file mode 100644
index 0000000000..b5a668c0c1
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_two_sources/input.json
@@ -0,0 +1,20 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+        "A": {
+            "assemblyJson": {}
+        },
+        "B": {
+            "assemblyJson": {}
+        }
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": [
+                    "evm.bytecode"
+                ]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_invalid_two_sources/output.json b/test/cmdlineTests/standard_import_evmasm_invalid_two_sources/output.json
new file mode 100644
index 0000000000..affe4c34e6
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_invalid_two_sources/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "EVMAssembly import only supports exactly one input file.",
+            "message": "EVMAssembly import only supports exactly one input file.",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_link_references/input.json b/test/cmdlineTests/standard_import_evmasm_link_references/input.json
new file mode 100644
index 0000000000..47693fa148
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_link_references/input.json
@@ -0,0 +1,38 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+        "A": {
+            "assemblyJson": {
+                ".code": [],
+                ".data": {
+                    "0": {
+                        ".auxdata": "a264697066735822122049fc8a5c547ec9ab3b6a5804732f6ef55e87fdb28a3a8826c23cdeb89c034e3d64736f6c63430008170033",
+                        ".code": [
+                            {
+                                "begin": 133,
+                                "end": 134,
+                                "name": "PUSHLIB",
+                                "source": 0,
+                                "value": "test.sol:L"
+                            }
+                        ]
+                    }
+                },
+                "sourceList": [
+                    "test.sol",
+                    "#utility.yul"
+                ]
+            }
+        }
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": [
+                    "evm.bytecode",
+                    "evm.deployedBytecode"
+                ]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_link_references/output.json b/test/cmdlineTests/standard_import_evmasm_link_references/output.json
new file mode 100644
index 0000000000..864f65a53f
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_link_references/output.json
@@ -0,0 +1,43 @@
+{
+    "contracts":
+    {
+        "A":
+        {
+            "":
+            {
+                "evm":
+                {
+                    "bytecode":
+                    {
+                        "functionDebugData": {},
+                        "linkReferences": {},
+                        "object": "<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap": ""
+                    },
+                    "deployedBytecode":
+                    {
+                        "functionDebugData": {},
+                        "immutableReferences": {},
+                        "linkReferences":
+                        {
+                            "test.sol":
+                            {
+                                "L":
+                                [
+                                    {
+                                        "length": 20,
+                                        "start": 1
+                                    }
+                                ]
+                            }
+                        },
+                        "object": "<BYTECODE REMOVED>__$d553ddd21b3d8da0d69a6510c170f4a77b$__<BYTECODE REMOVED>",
+                        "opcodes":"<OPCODES REMOVED>",
+                        "sourceMap":"<SOURCEMAP REMOVED>"
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/input.json b/test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/input.json
new file mode 100644
index 0000000000..0a8a5988ce
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/input.json
@@ -0,0 +1,32 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+        "A": {
+            "assemblyJson": {
+                ".code": [
+                    {
+                        "begin": 36,
+                        "end": 51,
+                        "name": "PUSH",
+                        "source": 0,
+                        "value": "0"
+                    }
+                ],
+                "sourceList": [
+                    "<stdin>"
+                ]
+            },
+            "urls":
+            [
+                "bzzr://56ab..."
+            ]
+        }
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": ["evm.bytecode"]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/output.json b/test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/output.json
new file mode 100644
index 0000000000..2a075efd02
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_multiple_keys_inside_source/output.json
@@ -0,0 +1,12 @@
+{
+    "errors":
+    [
+        {
+            "component": "general",
+            "formattedMessage": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
+            "message": "Invalid input source specified. Expected exactly one object, named 'assemblyJson', inside $.sources.A",
+            "severity": "error",
+            "type": "JSONError"
+        }
+    ]
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_no_output_selection/input.json b/test/cmdlineTests/standard_import_evmasm_no_output_selection/input.json
new file mode 100644
index 0000000000..1cd9c3c7d5
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_no_output_selection/input.json
@@ -0,0 +1,29 @@
+{
+    "language": "EVMAssembly",
+    "sources": {
+        "A": {
+            "assemblyJson": {
+                ".code": [
+                    {
+                        "begin": 36,
+                        "end": 51,
+                        "name": "PUSH",
+                        "source": 0,
+                        "value": "0"
+                    }
+                ],
+                "sourceList": [
+                    "<stdin>"
+                ]
+            }
+        }
+    },
+    "settings": {
+        "outputSelection": {
+            "*": {
+                "": [
+                ]
+            }
+        }
+    }
+}
diff --git a/test/cmdlineTests/standard_import_evmasm_no_output_selection/output.json b/test/cmdlineTests/standard_import_evmasm_no_output_selection/output.json
new file mode 100644
index 0000000000..0967ef424b
--- /dev/null
+++ b/test/cmdlineTests/standard_import_evmasm_no_output_selection/output.json
@@ -0,0 +1 @@
+{}
diff --git a/test/libsolidity/StandardCompiler.cpp b/test/libsolidity/StandardCompiler.cpp
index 4971ce3cd1..ab013692d5 100644
--- a/test/libsolidity/StandardCompiler.cpp
+++ b/test/libsolidity/StandardCompiler.cpp
@@ -187,7 +187,7 @@ BOOST_AUTO_TEST_CASE(invalid_language)
 	}
 	)";
 	Json::Value result = compile(input);
-	BOOST_CHECK(containsError(result, "JSONError", "Only \"Solidity\", \"Yul\" or \"SolidityAST\" is supported as a language."));
+	BOOST_CHECK(containsError(result, "JSONError", "Only \"Solidity\", \"Yul\", \"SolidityAST\" or \"EVMAssembly\" is supported as a language."));
 }
 
 BOOST_AUTO_TEST_CASE(valid_language)

From 6d7fc69f6de12d2671ec45df3a0458637ca10a60 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 25 Jan 2024 08:05:27 +0100
Subject: [PATCH 1727/1748] Fix broken link in docs

---
 docs/resources.rst | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/docs/resources.rst b/docs/resources.rst
index 84df74fb73..85b3cf9a39 100644
--- a/docs/resources.rst
+++ b/docs/resources.rst
@@ -25,9 +25,6 @@ Integrated (Ethereum) Development Environments
     * `Dapp <https://dapp.tools/>`_
         Tool for building, testing and deploying smart contracts from the command-line.
 
-    * `Embark <https://framework.embarklabs.io/>`_
-        Developer platform for building and deploying decentralized applications.
-
     * `Foundry <https://github.com/foundry-rs/foundry>`_
         Fast, portable and modular toolkit for Ethereum application development written in Rust.
 

From fe3b94de66f950e41856b9053ecd186d5804aba9 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 25 Jan 2024 08:29:03 +0100
Subject: [PATCH 1728/1748] Order changelog

---
 Changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index db488b183a..8195a2c61d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -12,8 +12,8 @@ Language Features:
 Compiler Features:
 * EVM: Support for the EVM Version "Cancun".
 * SMTChecker: Support `bytes.concat` except when string literals are passed as arguments.
-* TypeChecker: Comparison of internal function pointers now yields a warning, as it can produce unexpected results with the legacy pipeline enabled.
 * Standard JSON Interface: Add experimental support to import EVM assembly in the format used by ``--asm-json``.
+* TypeChecker: Comparison of internal function pointers now yields a warning, as it can produce unexpected results with the legacy pipeline enabled.
 
 
 Bugfixes:

From 0da45273674ff2e4c33f60bd83d1622110cbfc19 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 25 Jan 2024 09:19:23 +0100
Subject: [PATCH 1729/1748] Update changelog for 0.8.24 release

---
 Changelog.md              | 2 +-
 docs/bugs_by_version.json | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index 8195a2c61d..d36470b016 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,4 +1,4 @@
-### 0.8.24 (unreleased)
+### 0.8.24 (2024-01-25)
 
 Language Features:
  * Introduce global ``block.blobbasefee`` for retrieving the blob base fee of the current block.
diff --git a/docs/bugs_by_version.json b/docs/bugs_by_version.json
index 152e8d97a4..156b846d01 100644
--- a/docs/bugs_by_version.json
+++ b/docs/bugs_by_version.json
@@ -1886,6 +1886,10 @@
         "bugs": [],
         "released": "2023-11-08"
     },
+    "0.8.24": {
+        "bugs": [],
+        "released": "2024-01-25"
+    },
     "0.8.3": {
         "bugs": [
             "FullInlinerNonExpressionSplitArgumentEvaluationOrder",

From 0e03deca512098460d8fcba52bc5e0cb003e90e5 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 25 Jan 2024 09:36:37 +0100
Subject: [PATCH 1730/1748] Set version to 0.8.25

---
 CMakeLists.txt |  2 +-
 Changelog.md   | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6a905e39a..18af34d26b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ include(EthPolicy)
 eth_policy()
 
 # project name and version should be set after cmake_policy CMP0048
-set(PROJECT_VERSION "0.8.24")
+set(PROJECT_VERSION "0.8.25")
 # OSX target needed in order to support std::visit
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
 project(solidity VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
diff --git a/Changelog.md b/Changelog.md
index d36470b016..171dce2ef7 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,14 @@
+### 0.8.25 (unreleased)
+
+Language Features:
+
+
+Compiler Features:
+
+
+Bugfixes:
+
+
 ### 0.8.24 (2024-01-25)
 
 Language Features:

From a70cae9c9b6a7b6e2fe6556694adebe320d698f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Fri, 26 Jan 2024 17:01:56 +0100
Subject: [PATCH 1731/1748] Fix 0.8.23 changelog formatting

---
 Changelog.md | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 171dce2ef7..7ab13de8fe 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -21,10 +21,10 @@ Language Features:
 
 
 Compiler Features:
-* EVM: Support for the EVM Version "Cancun".
-* SMTChecker: Support `bytes.concat` except when string literals are passed as arguments.
-* Standard JSON Interface: Add experimental support to import EVM assembly in the format used by ``--asm-json``.
-* TypeChecker: Comparison of internal function pointers now yields a warning, as it can produce unexpected results with the legacy pipeline enabled.
+ * EVM: Support for the EVM Version "Cancun".
+ * SMTChecker: Support `bytes.concat` except when string literals are passed as arguments.
+ * Standard JSON Interface: Add experimental support to import EVM assembly in the format used by ``--asm-json``.
+ * TypeChecker: Comparison of internal function pointers now yields a warning, as it can produce unexpected results with the legacy pipeline enabled.
 
 
 Bugfixes:

From 6d5aa393b9261d98f2ef2b4526425a073be36423 Mon Sep 17 00:00:00 2001
From: Dimitris Apostolou <dimitris.apostolou@icloud.com>
Date: Fri, 26 Jan 2024 18:25:37 +0200
Subject: [PATCH 1732/1748] Fix typos

---
 libevmasm/ConstantOptimiser.h            | 2 +-
 libsolidity/codegen/YulUtilFunctions.cpp | 2 +-
 libsolidity/interface/StandardCompiler.h | 2 +-
 libsolidity/lsp/Transport.h              | 2 +-
 test/evmc/evmc.h                         | 2 +-
 test/tools/ossfuzz/README.md             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libevmasm/ConstantOptimiser.h b/libevmasm/ConstantOptimiser.h
index b491fb0042..139e263ba3 100644
--- a/libevmasm/ConstantOptimiser.h
+++ b/libevmasm/ConstantOptimiser.h
@@ -70,7 +70,7 @@ class ConstantOptimisationMethod
 	virtual ~ConstantOptimisationMethod() = default;
 	virtual bigint gasNeeded() const = 0;
 	/// Executes the method, potentially appending to the assembly and returns a vector of
-	/// assembly items the constant should be relpaced with in one sweep.
+	/// assembly items the constant should be replaced with in one sweep.
 	/// If the vector is empty, the constants will not be deleted.
 	virtual AssemblyItems execute(Assembly& _assembly) const = 0;
 
diff --git a/libsolidity/codegen/YulUtilFunctions.cpp b/libsolidity/codegen/YulUtilFunctions.cpp
index 5ff5ac4f3b..35fea8ac4b 100644
--- a/libsolidity/codegen/YulUtilFunctions.cpp
+++ b/libsolidity/codegen/YulUtilFunctions.cpp
@@ -3866,7 +3866,7 @@ std::string YulUtilFunctions::cleanupFunction(Type const& _type)
 		}
 		case Type::Category::Enum:
 		{
-			// Out of range enums cannot be truncated unambigiously and therefore it should be an error.
+			// Out of range enums cannot be truncated unambiguously and therefore it should be an error.
 			templ("body", "cleaned := value " + validatorFunction(_type, false) + "(value)");
 			break;
 		}
diff --git a/libsolidity/interface/StandardCompiler.h b/libsolidity/interface/StandardCompiler.h
index 93cc73f3a7..03bdc7f12b 100644
--- a/libsolidity/interface/StandardCompiler.h
+++ b/libsolidity/interface/StandardCompiler.h
@@ -59,7 +59,7 @@ class StandardCompiler
 	/// Sets all input parameters according to @a _input which conforms to the standardized input
 	/// format, performs compilation and returns a standardized output.
 	Json::Value compile(Json::Value const& _input) noexcept;
-	/// Parses input as JSON and peforms the above processing steps, returning a serialized JSON
+	/// Parses input as JSON and performs the above processing steps, returning a serialized JSON
 	/// output. Parsing errors are returned as regular errors.
 	std::string compile(std::string const& _input) noexcept;
 
diff --git a/libsolidity/lsp/Transport.h b/libsolidity/lsp/Transport.h
index 3e94e03981..e3b03bcc7f 100644
--- a/libsolidity/lsp/Transport.h
+++ b/libsolidity/lsp/Transport.h
@@ -122,7 +122,7 @@ class Transport
 	/// the message body from the transport line.
 	virtual std::string readBytes(size_t _byteCount) = 0;
 
-	// Mimmicks std::getline() on this Transport API.
+	// Mimics std::getline() on this Transport API.
 	virtual std::string getline() = 0;
 
 	/// Writes the given payload @p _data to transport.
diff --git a/test/evmc/evmc.h b/test/evmc/evmc.h
index 48b03e5545..571c97f474 100644
--- a/test/evmc/evmc.h
+++ b/test/evmc/evmc.h
@@ -1181,7 +1181,7 @@ struct evmc_vm
  *
  * @par Binaries naming convention
  * For VMs distributed as shared libraries, the name of the library SHOULD match the VM name.
- * The convetional library filename prefixes and extensions SHOULD be ignored by the Client.
+ * The conventional library filename prefixes and extensions SHOULD be ignored by the Client.
  * For example, the shared library with the "beta-interpreter" implementation may be named
  * `libbeta-interpreter.so`.
  *
diff --git a/test/tools/ossfuzz/README.md b/test/tools/ossfuzz/README.md
index 9343602d44..dae3386489 100644
--- a/test/tools/ossfuzz/README.md
+++ b/test/tools/ossfuzz/README.md
@@ -69,7 +69,7 @@ To help oss-fuzz do this, we (as project maintainers) need to provide the follow
 
 To be consistent and aid better evaluation of the utility of the fuzzing dictionary, we stick to the following rules-of-thumb:
   - Full tokens such as `block.number` are preceded and followed by a whitespace
-  - Incomplete tokens including function calls such as `msg.sender.send()` are abbreviated `.send(` to provide some leeway to the fuzzer to sythesize variants such as `address(this).send()`
+  - Incomplete tokens including function calls such as `msg.sender.send()` are abbreviated `.send(` to provide some leeway to the fuzzer to synthesize variants such as `address(this).send()`
   - Language keywords are suffixed by a whitespace with the exception of those that end a line of code such as `break;` and `continue;`
 
 [1]: https://github.com/google/oss-fuzz

From fb99132474c177fc861305feeafd43b9cbb93b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Wed, 13 Dec 2023 19:21:58 +0100
Subject: [PATCH 1733/1748] TypeInference: Remove unreachable errors on missing
 instantiation annotations guaranteed by previous passes

---
 .../experimental/analysis/TypeInference.cpp   | 50 +++++++------------
 scripts/error_codes.py                        |  5 --
 ...instantiation_invalid_type_constructor.sol | 13 +++++
 .../inference/instantiation_not_for_class.sol | 12 +++++
 4 files changed, 44 insertions(+), 36 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/instantiation_invalid_type_constructor.sol
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/instantiation_not_for_class.sol

diff --git a/libsolidity/experimental/analysis/TypeInference.cpp b/libsolidity/experimental/analysis/TypeInference.cpp
index a13d6ebc94..9ec7c97867 100644
--- a/libsolidity/experimental/analysis/TypeInference.cpp
+++ b/libsolidity/experimental/analysis/TypeInference.cpp
@@ -621,45 +621,33 @@ bool TypeInference::visit(TypeClassInstantiation const& _typeClassInstantiation)
 	if (instantiationAnnotation.type)
 		return false;
 	instantiationAnnotation.type = m_voidType;
-	std::optional<TypeClass> typeClass = std::visit(util::GenericVisitor{
-		[&](ASTPointer<IdentifierPath> _typeClassName) -> std::optional<TypeClass> {
-			if (auto const* typeClassDefinition = dynamic_cast<TypeClassDefinition const*>(_typeClassName->annotation().referencedDeclaration))
-			{
-				// visiting the type class will re-visit this instantiation
-				typeClassDefinition->accept(*this);
-				// TODO: more error handling? Should be covered by the visit above.
-				solAssert(m_analysis.annotation<TypeClassRegistration>(*typeClassDefinition).typeClass.has_value());
-				return m_analysis.annotation<TypeClassRegistration>(*typeClassDefinition).typeClass.value();
-			}
-			else
-			{
-				m_errorReporter.typeError(9817_error, _typeClassInstantiation.typeClass().location(), "Expected type class.");
-				return std::nullopt;
-			}
+	TypeClass typeClass = std::visit(util::GenericVisitor{
+		[&](ASTPointer<IdentifierPath> _typeClassName) -> TypeClass {
+			auto const* typeClassDefinition = dynamic_cast<TypeClassDefinition const*>(_typeClassName->annotation().referencedDeclaration);
+			solAssert(typeClassDefinition);
+
+			// visiting the type class will re-visit this instantiation
+			typeClassDefinition->accept(*this);
+			// TODO: more error handling? Should be covered by the visit above.
+			solAssert(m_analysis.annotation<TypeClassRegistration>(*typeClassDefinition).typeClass.has_value());
+			return m_analysis.annotation<TypeClassRegistration>(*typeClassDefinition).typeClass.value();
 		},
-		[&](Token _token) -> std::optional<TypeClass> {
-			if (auto builtinClass = builtinClassFromToken(_token))
-				if (auto typeClass = util::valueOrNullptr(annotation().builtinClasses, *builtinClass))
-					return *typeClass;
-			m_errorReporter.typeError(2658_error, _typeClassInstantiation.location(), "Invalid type class name.");
-			return std::nullopt;
+		[&](Token _token) -> TypeClass {
+			std::optional<BuiltinClass> builtinClass = builtinClassFromToken(_token);
+			solAssert(builtinClass.has_value());
+			solAssert(annotation().builtinClasses.count(*builtinClass) != 0);
+			return annotation().builtinClasses.at(*builtinClass);
 		}
 	}, _typeClassInstantiation.typeClass().name());
-	if (!typeClass)
-		return false;
 
 	// TODO: _typeClassInstantiation.typeConstructor().accept(*this); ?
 	auto typeConstructor = m_analysis.annotation<TypeRegistration>(_typeClassInstantiation.typeConstructor()).typeConstructor;
-	if (!typeConstructor)
-	{
-		m_errorReporter.typeError(2138_error, _typeClassInstantiation.typeConstructor().location(), "Invalid type constructor.");
-		return false;
-	}
+	solAssert(typeConstructor);
 
 	std::vector<Type> arguments;
 	Arity arity{
 		{},
-		*typeClass
+		typeClass
 	};
 
 	{
@@ -692,10 +680,10 @@ bool TypeInference::visit(TypeClassInstantiation const& _typeClassInstantiation)
 	if (auto error = m_typeSystem.instantiateClass(instanceType, arity))
 		m_errorReporter.typeError(5094_error, _typeClassInstantiation.location(), *error);
 
-	auto const& classFunctions = annotation().typeClassFunctions.at(*typeClass);
+	auto const& classFunctions = annotation().typeClassFunctions.at(typeClass);
 
 	TypeEnvironment newEnv = m_env->clone();
-	if (!newEnv.unify(m_typeSystem.typeClassVariable(*typeClass), instanceType).empty())
+	if (!newEnv.unify(m_typeSystem.typeClassVariable(typeClass), instanceType).empty())
 	{
 		m_errorReporter.typeError(4686_error, _typeClassInstantiation.location(), "Unification of class and instance variable failed.");
 		return false;
diff --git a/scripts/error_codes.py b/scripts/error_codes.py
index d4e9e54866..8ffb7f2160 100755
--- a/scripts/error_codes.py
+++ b/scripts/error_codes.py
@@ -275,18 +275,15 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "1801",
         "1807",
         "2015",
-        "2138",
         "2345",
         "2399",
         "2599",
         "2655",
-        "2658",
         "2934",
         "3101",
         "3111",
         "3195",
         "3520",
-        "3570",
         "3573",
         "3654",
         "4316",
@@ -329,8 +326,6 @@ def examine_id_coverage(top_dir, source_id_to_file_names, new_ids_only=False):
         "9282",
         "9603",
         "9658",
-        "9817",
-        "9831",
         "9988",
     }
 
diff --git a/test/libsolidity/syntaxTests/experimental/inference/instantiation_invalid_type_constructor.sol b/test/libsolidity/syntaxTests/experimental/inference/instantiation_invalid_type_constructor.sol
new file mode 100644
index 0000000000..0245deb1f4
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/instantiation_invalid_type_constructor.sol
@@ -0,0 +1,13 @@
+pragma experimental solidity;
+
+class Self: C {}
+
+function f() {}
+
+instantiation f: C {}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 9831: (80-81): Expected type declaration.
diff --git a/test/libsolidity/syntaxTests/experimental/inference/instantiation_not_for_class.sol b/test/libsolidity/syntaxTests/experimental/inference/instantiation_not_for_class.sol
new file mode 100644
index 0000000000..c48fff74f9
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/instantiation_not_for_class.sol
@@ -0,0 +1,12 @@
+pragma experimental solidity;
+
+type T;
+type U;
+
+instantiation T: U {}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 3570: (65-66): Expected a type class.

From 9d80e0e3ee42acfcef6926fefc64ccd21afbce2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 8 Jan 2024 19:02:04 +0100
Subject: [PATCH 1734/1748] Yul proto fuzzer: Add mcopy builtin to generator.

---
 test/tools/ossfuzz/protoToYul.cpp | 15 ++++++++++++++-
 test/tools/ossfuzz/protoToYul.h   |  4 +++-
 test/tools/ossfuzz/yulProto.proto |  1 +
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 6c8f291d29..75074db3b0 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -796,6 +796,10 @@ void ProtoConverter::visit(CopyFunc const& _x)
 	if (type == CopyFunc::RETURNDATA && !m_evmVersion.supportsReturndata())
 		return;
 
+	// Bail out if MCOPY is not supported for fuzzed EVM version
+	if (type == CopyFunc::MEMORY && !m_evmVersion.hasMcopy())
+		return;
+
 	// Code copy may change state if e.g., some byte of code
 	// is stored to storage via a sequence of mload and sstore.
 	if (m_filterStatefulInstructions && type == CopyFunc::CODE)
@@ -816,13 +820,22 @@ void ProtoConverter::visit(CopyFunc const& _x)
 	case CopyFunc::DATA:
 		m_output << "datacopy";
 		break;
+	case CopyFunc::MEMORY:
+		m_output << "mcopy";
 	}
 	m_output << "(";
 	m_output << "mod(";
 	visit(_x.target());
 	m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
 	m_output << ", ";
-	visit(_x.source());
+	if (type == CopyFunc::MEMORY)
+	{
+		m_output << "mod(";
+		visit(_x.source());
+		m_output << ", " << to_string(s_maxMemory - s_maxSize) << ")";
+	}
+	else
+		visit(_x.source());
 	m_output << ", ";
 	m_output << "mod(";
 	visit(_x.size());
diff --git a/test/tools/ossfuzz/protoToYul.h b/test/tools/ossfuzz/protoToYul.h
index b7f7c72e5a..c264dd51af 100644
--- a/test/tools/ossfuzz/protoToYul.h
+++ b/test/tools/ossfuzz/protoToYul.h
@@ -346,7 +346,9 @@ class ProtoConverter
 	static auto constexpr s_dataIdentifier = "datablock";
 	/// Upper bound on memory writes is 64KB in order to
 	/// preserve semantic equivalence in the presence of
-	/// memory guard
+	/// memory guard. Note that s_maxMemory must be much larger
+	/// than s_maxSize to create tests without significant overlap
+	/// of I/O memory regions.
 	static unsigned constexpr s_maxMemory = 65536;
 	/// Upper bound on size for range copy functions
 	static unsigned constexpr s_maxSize = 32768;
diff --git a/test/tools/ossfuzz/yulProto.proto b/test/tools/ossfuzz/yulProto.proto
index 7552fb23ad..afe70363ae 100644
--- a/test/tools/ossfuzz/yulProto.proto
+++ b/test/tools/ossfuzz/yulProto.proto
@@ -186,6 +186,7 @@ message CopyFunc {
     CODE = 1;
     RETURNDATA = 2;
     DATA = 3;
+    MEMORY = 4;
   }
   required CopyType ct = 1;
   required Expression target = 2;

From fb7c2b4b9083a041e4ec3ab13265eed3015d6b7b Mon Sep 17 00:00:00 2001
From: Bhargava Shastry <bhargava.shastry@ethereum.org>
Date: Thu, 25 Jan 2024 06:54:08 +0100
Subject: [PATCH 1735/1748] Yul fuzzer: Support transient storage.

---
 test/tools/ossfuzz/protoToYul.cpp | 35 +++++++++++++++++++++++++------
 test/tools/ossfuzz/yulProto.proto | 14 +++++++------
 2 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/test/tools/ossfuzz/protoToYul.cpp b/test/tools/ossfuzz/protoToYul.cpp
index 6c8f291d29..7ad35d66d3 100644
--- a/test/tools/ossfuzz/protoToYul.cpp
+++ b/test/tools/ossfuzz/protoToYul.cpp
@@ -593,6 +593,12 @@ void ProtoConverter::visit(UnaryOp const& _x)
 		return;
 	}
 
+	if (op == UnaryOp::TLOAD && !m_evmVersion.supportsTransientStorage())
+	{
+		m_output << dictionaryToken();
+		return;
+	}
+
 	// The following instructions may lead to change of EVM state and are hence
 	// excluded to avoid false positives.
 	if (
@@ -620,6 +626,9 @@ void ProtoConverter::visit(UnaryOp const& _x)
 	case UnaryOp::SLOAD:
 		m_output << "sload";
 		break;
+	case UnaryOp::TLOAD:
+		m_output << "tload";
+		break;
 	case UnaryOp::ISZERO:
 		m_output << "iszero";
 		break;
@@ -1141,9 +1150,12 @@ void ProtoConverter::visit(StoreFunc const& _x)
 	case StoreFunc::MSTORE8:
 		m_output << "mstore8(";
 		break;
+	case StoreFunc::TSTORE:
+		m_output << "tstore(";
+		break;
 	}
 	// Write to memory within bounds, storage is unbounded
-	if (storeType == StoreFunc::SSTORE)
+	if (storeType == StoreFunc::SSTORE || storeType == StoreFunc::TSTORE)
 		visit(_x.loc());
 	else if (storeType == StoreFunc::MSTORE8)
 	{
@@ -1755,18 +1767,29 @@ void ProtoConverter::fillFunctionCallInput(unsigned _numInParams)
 
 void ProtoConverter::saveFunctionCallOutput(vector<string> const& _varsVec)
 {
-	for (auto const& var: _varsVec)
+	constexpr auto numSlots = 10;
+	constexpr auto slotSize = 32;
+
+	for (string const& var: _varsVec)
 	{
 		// Flip a dice to choose whether to save output values
 		// in storage or memory.
-		bool coinFlip = counter() % 2 == 0;
+		unsigned diceThrow = counter() % (m_evmVersion.supportsTransientStorage() ? 3 : 2);
 		// Pseudo-randomly choose one of the first ten 32-byte
 		// aligned slots.
-		string slot = to_string((counter() % 10) * 32);
-		if (coinFlip)
+		string slot = std::to_string((counter() % numSlots) * slotSize);
+		if (diceThrow == 0)
 			m_output << "sstore(" << slot << ", " << var << ")\n";
-		else
+		else if (diceThrow == 1)
 			m_output << "mstore(" << slot << ", " << var << ")\n";
+		else
+		{
+			yulAssert(
+				m_evmVersion.supportsTransientStorage(),
+				"Proto fuzzer: Invalid evm version"
+			);
+			m_output << "tstore(" << slot << ", " << var << ")\n";
+		}
 	}
 }
 
diff --git a/test/tools/ossfuzz/yulProto.proto b/test/tools/ossfuzz/yulProto.proto
index 7552fb23ad..f4eabab64a 100644
--- a/test/tools/ossfuzz/yulProto.proto
+++ b/test/tools/ossfuzz/yulProto.proto
@@ -149,12 +149,13 @@ message UnaryOp {
     NOT = 0;
     MLOAD = 1;
     SLOAD = 2;
-    ISZERO = 3;
-    CALLDATALOAD = 4;
-    EXTCODESIZE = 5;
-    EXTCODEHASH = 6;
-    BALANCE = 7;
-    BLOCKHASH = 8;
+    TLOAD = 3;
+    ISZERO = 4;
+    CALLDATALOAD = 5;
+    EXTCODESIZE = 6;
+    EXTCODEHASH = 7;
+    BALANCE = 8;
+    BLOCKHASH = 9;
   }
   required UOp op = 1;
   required Expression operand = 2;
@@ -230,6 +231,7 @@ message StoreFunc {
     MSTORE = 0;
     SSTORE = 1;
     MSTORE8 = 2;
+    TSTORE = 3;
   }
   required Expression loc = 1;
   required Expression val = 2;

From e545e936d20375757ef25d473c113616bccaae0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 30 Oct 2023 10:41:11 +0100
Subject: [PATCH 1736/1748] TypeSystemHelper: substitute()

---
 .../experimental/ast/TypeSystemHelper.cpp     | 27 ++++++++++++++++++-
 .../experimental/ast/TypeSystemHelper.h       |  2 ++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/libsolidity/experimental/ast/TypeSystemHelper.cpp b/libsolidity/experimental/ast/TypeSystemHelper.cpp
index bc7dd4fcc3..36576d9cd8 100644
--- a/libsolidity/experimental/ast/TypeSystemHelper.cpp
+++ b/libsolidity/experimental/ast/TypeSystemHelper.cpp
@@ -287,9 +287,34 @@ std::vector<experimental::Type> TypeEnvironmentHelpers::typeVars(Type _type) con
 	};
 	typeVarsImpl(_type, typeVarsImpl);
 	return typeVars;
-
 }
 
+experimental::Type TypeEnvironmentHelpers::substitute(
+	Type const& _type,
+	Type const& _partToReplace,
+	Type const& _replacement
+) const
+{
+	using ranges::views::transform;
+	using ranges::to;
+
+	if (env.typeEquals(_type, _partToReplace))
+		return _replacement;
+
+	auto recurse = [&](Type const& _t) { return substitute(_t, _partToReplace, _replacement); };
+
+	return visit(util::GenericVisitor{
+		[&](TypeConstant const& _typeConstant) -> Type {
+			return TypeConstant{
+				_typeConstant.constructor,
+				_typeConstant.arguments | transform(recurse) | to<std::vector<Type>>,
+			};
+		},
+		[&](auto const& _type) -> Type {
+			return _type;
+		},
+	}, env.resolve(_type));
+}
 
 std::string TypeSystemHelpers::sortToString(Sort _sort) const
 {
diff --git a/libsolidity/experimental/ast/TypeSystemHelper.h b/libsolidity/experimental/ast/TypeSystemHelper.h
index fd55c1bf84..d8a3092d23 100644
--- a/libsolidity/experimental/ast/TypeSystemHelper.h
+++ b/libsolidity/experimental/ast/TypeSystemHelper.h
@@ -55,6 +55,8 @@ struct TypeEnvironmentHelpers
 	std::string typeToString(Type const& _type) const;
 	std::string canonicalTypeName(Type _type) const;
 	std::vector<Type> typeVars(Type _type) const;
+
+	Type substitute(Type const& _type, Type const& _partToReplace, Type const& _replacement) const;
 };
 
 }

From 44ffdb1eaf9693ba0c776a7f3977dac0ff5e3a71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 30 Oct 2023 10:56:26 +0100
Subject: [PATCH 1737/1748] Introduce fixed type variables

---
 libsolidity/experimental/ast/TypeSystem.cpp   | 40 ++++++++++++++-----
 libsolidity/experimental/ast/TypeSystem.h     | 11 +++++
 .../experimental/ast/TypeSystemHelper.cpp     | 13 ++++++
 .../experimental/ast/TypeSystemHelper.h       |  2 +
 4 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/libsolidity/experimental/ast/TypeSystem.cpp b/libsolidity/experimental/ast/TypeSystem.cpp
index 680edce845..fac5073bb0 100644
--- a/libsolidity/experimental/ast/TypeSystem.cpp
+++ b/libsolidity/experimental/ast/TypeSystem.cpp
@@ -50,18 +50,21 @@ std::vector<TypeEnvironment::UnificationFailure> TypeEnvironment::unify(Type _a,
 		[&](TypeVariable _left, TypeVariable _right) {
 			if (_left.index() == _right.index())
 				solAssert(_left.sort() == _right.sort());
+			else if (isFixedTypeVar(_left) && isFixedTypeVar(_right))
+				unificationFailure();
+			else if (isFixedTypeVar(_left))
+				failures += instantiate(_right, _left);
+			else if (isFixedTypeVar(_right))
+				failures += instantiate(_left, _right);
+			else if (_left.sort() <= _right.sort())
+				failures += instantiate(_left, _right);
+			else if (_right.sort() <= _left.sort())
+				failures += instantiate(_right, _left);
 			else
 			{
-				if (_left.sort() <= _right.sort())
-					failures += instantiate(_left, _right);
-				else if (_right.sort() <= _left.sort())
-					failures += instantiate(_right, _left);
-				else
-				{
-					Type newVar = m_typeSystem.freshVariable(_left.sort() + _right.sort());
-					failures += instantiate(_left, newVar);
-					failures += instantiate(_right, newVar);
-				}
+				Type newVar = m_typeSystem.freshVariable(_left.sort() + _right.sort());
+				failures += instantiate(_left, newVar);
+				failures += instantiate(_right, newVar);
 			}
 		},
 		[&](TypeVariable _var, auto) {
@@ -112,6 +115,23 @@ bool TypeEnvironment::typeEquals(Type _lhs, Type _rhs) const
 	}, resolve(_lhs), resolve(_rhs));
 }
 
+
+bool TypeEnvironment::isFixedTypeVar(Type const& _typeVar) const
+{
+	return
+		std::holds_alternative<TypeVariable>(_typeVar) &&
+		m_fixedTypeVariables.count(std::get<TypeVariable>(_typeVar).index()) != 0;
+}
+
+void TypeEnvironment::fixTypeVars(std::vector<Type> const& _typeVars)
+{
+	for (Type const& typeVar: _typeVars)
+	{
+		solAssert(std::holds_alternative<TypeVariable>(typeVar));
+		m_fixedTypeVariables.insert(std::get<TypeVariable>(typeVar).index());
+	}
+}
+
 TypeEnvironment TypeEnvironment::clone() const
 {
 	TypeEnvironment result{m_typeSystem};
diff --git a/libsolidity/experimental/ast/TypeSystem.h b/libsolidity/experimental/ast/TypeSystem.h
index cac0feb81f..c3aa5001a1 100644
--- a/libsolidity/experimental/ast/TypeSystem.h
+++ b/libsolidity/experimental/ast/TypeSystem.h
@@ -74,6 +74,9 @@ class TypeEnvironment
 	TypeSystem& typeSystem() { return m_typeSystem; }
 	TypeSystem const& typeSystem() const { return m_typeSystem; }
 
+	bool isFixedTypeVar(Type const& _typeVar) const;
+	void fixTypeVars(std::vector<Type> const& _typeVars);
+
 private:
 	TypeEnvironment(TypeEnvironment&& _env):
 		m_typeSystem(_env.m_typeSystem),
@@ -83,7 +86,15 @@ class TypeEnvironment
 	[[nodiscard]] std::vector<TypeEnvironment::UnificationFailure> instantiate(TypeVariable _variable, Type _type);
 
 	TypeSystem& m_typeSystem;
+
+	/// For each @a TypeVariable (identified by its index) stores the type is has been successfully
+	/// unified with. Used for type resolution. Note that @a Type may itself be a type variable
+	/// or may contain type variables so resolution must be recursive.
 	std::map<size_t, Type> m_typeVariables;
+
+	/// Type variables marked as fixed free type variables (as opposed to generic type variables).
+	/// Identified by their indices.
+	std::set<size_t> m_fixedTypeVariables;
 };
 
 class TypeSystem
diff --git a/libsolidity/experimental/ast/TypeSystemHelper.cpp b/libsolidity/experimental/ast/TypeSystemHelper.cpp
index 36576d9cd8..0924754cd5 100644
--- a/libsolidity/experimental/ast/TypeSystemHelper.cpp
+++ b/libsolidity/experimental/ast/TypeSystemHelper.cpp
@@ -25,6 +25,7 @@
 
 #include <libsolutil/Visitor.h>
 
+#include <range/v3/algorithm/any_of.hpp>
 #include <range/v3/to_container.hpp>
 #include <range/v3/view/drop_exactly.hpp>
 #include <range/v3/view/drop_last.hpp>
@@ -289,6 +290,18 @@ std::vector<experimental::Type> TypeEnvironmentHelpers::typeVars(Type _type) con
 	return typeVars;
 }
 
+
+bool TypeEnvironmentHelpers::hasGenericTypeVars(Type const& _type) const
+{
+	return ranges::any_of(
+		TypeEnvironmentHelpers{*this}.typeVars(_type),
+		[&](Type const& _maybeTypeVar) {
+			solAssert(std::holds_alternative<TypeVariable>(_maybeTypeVar));
+			return !env.isFixedTypeVar(_maybeTypeVar);
+		}
+	);
+}
+
 experimental::Type TypeEnvironmentHelpers::substitute(
 	Type const& _type,
 	Type const& _partToReplace,
diff --git a/libsolidity/experimental/ast/TypeSystemHelper.h b/libsolidity/experimental/ast/TypeSystemHelper.h
index d8a3092d23..ba395ace3a 100644
--- a/libsolidity/experimental/ast/TypeSystemHelper.h
+++ b/libsolidity/experimental/ast/TypeSystemHelper.h
@@ -56,6 +56,8 @@ struct TypeEnvironmentHelpers
 	std::string canonicalTypeName(Type _type) const;
 	std::vector<Type> typeVars(Type _type) const;
 
+	bool hasGenericTypeVars(Type const& _type) const;
+
 	Type substitute(Type const& _type, Type const& _partToReplace, Type const& _replacement) const;
 };
 

From fd3c393f9a753b491964f3301c7eb4d5357d8a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 30 Oct 2023 10:56:47 +0100
Subject: [PATCH 1738/1748] Use different prefixes when printing fixed and
 generic type variables

---
 .../experimental/ast/TypeSystemHelper.cpp     |   2 +-
 .../builtin/builtin_type_definition.sol       |  20 +--
 .../inference/polymorphic_function_call.sol   |  24 ++--
 .../inference/polymorphic_type.sol            |  42 +++---
 .../polymorphic_type_abs_and_rep.sol          |  42 +++---
 ...rphic_type_instantiation_and_operators.sol | 124 +++++++++---------
 6 files changed, 127 insertions(+), 127 deletions(-)

diff --git a/libsolidity/experimental/ast/TypeSystemHelper.cpp b/libsolidity/experimental/ast/TypeSystemHelper.cpp
index 0924754cd5..9ad18e1608 100644
--- a/libsolidity/experimental/ast/TypeSystemHelper.cpp
+++ b/libsolidity/experimental/ast/TypeSystemHelper.cpp
@@ -419,7 +419,7 @@ std::string TypeEnvironmentHelpers::typeToString(Type const& _type) const
 			while (index /= 26)
 				varName += static_cast<char>('a' + (index%26));
 			reverse(varName.begin(), varName.end());
-			stream << '\'' << varName;
+			stream << (env.isFixedTypeVar(_type) ? "'" : "?") << varName;
 			switch (_type.sort().classes.size())
 			{
 			case 0:
diff --git a/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
index fc4783ceba..fb76e1948b 100644
--- a/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
+++ b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
@@ -40,14 +40,14 @@ contract C {
 // Info 4164: (94-124): Inferred type: word
 // Info 4164: (125-161): Inferred type: integer
 // Info 4164: (162-192): Inferred type: ()
-// Info 4164: (194-228): Inferred type: tfun(('u:type, 'v:type), 'u:type -> 'v:type)
-// Info 4164: (202-208): Inferred type: ('s:type, 't:type)
-// Info 4164: (203-204): Inferred type: 's:type
-// Info 4164: (206-207): Inferred type: 't:type
-// Info 4164: (229-265): Inferred type: tfun(('y:type, 'z:type), ('y:type, 'z:type))
-// Info 4164: (238-244): Inferred type: ('w:type, 'x:type)
-// Info 4164: (239-240): Inferred type: 'w:type
-// Info 4164: (242-243): Inferred type: 'x:type
+// Info 4164: (194-228): Inferred type: tfun((?u:type, ?v:type), ?u:type -> ?v:type)
+// Info 4164: (202-208): Inferred type: (?s:type, ?t:type)
+// Info 4164: (203-204): Inferred type: ?s:type
+// Info 4164: (206-207): Inferred type: ?t:type
+// Info 4164: (229-265): Inferred type: tfun((?y:type, ?z:type), (?y:type, ?z:type))
+// Info 4164: (238-244): Inferred type: (?w:type, ?x:type)
+// Info 4164: (239-240): Inferred type: ?w:type
+// Info 4164: (242-243): Inferred type: ?x:type
 // Info 4164: (284-584): Inferred type: () -> ()
 // Info 4164: (292-294): Inferred type: ()
 // Info 4164: (318-325): Inferred type: void
@@ -84,9 +84,9 @@ contract C {
 // Info 4164: (525-529): Inferred type: word
 // Info 4164: (540-553): Inferred type: bool
 // Info 4164: (540-550): Inferred type: (bool, word) -> bool
-// Info 4164: (540-544): Inferred type: ('bl:type, 'bm:type)
+// Info 4164: (540-544): Inferred type: (?bl:type, ?bm:type)
 // Info 4164: (551-552): Inferred type: (bool, word)
 // Info 4164: (563-577): Inferred type: word
 // Info 4164: (563-574): Inferred type: (bool, word) -> word
-// Info 4164: (563-567): Inferred type: ('bq:type, 'br:type)
+// Info 4164: (563-567): Inferred type: (?bq:type, ?br:type)
 // Info 4164: (575-576): Inferred type: (bool, word)
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
index eacc895202..487aea0905 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
@@ -15,18 +15,18 @@ function run(a: T, b: U(T), c: U(U(T))) {
 // ----
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
 // Info 4164: (31-38): Inferred type: T
-// Info 4164: (39-49): Inferred type: tfun('u:type, U('u:type))
-// Info 4164: (45-48): Inferred type: 't:type
-// Info 4164: (46-47): Inferred type: 't:type
-// Info 4164: (51-82): Inferred type: ('x:type, 'y:type, U('ba:type)) -> ()
-// Info 4164: (61-79): Inferred type: ('x:type, 'y:type, U('ba:type))
-// Info 4164: (62-63): Inferred type: 'x:type
-// Info 4164: (65-69): Inferred type: 'y:type
-// Info 4164: (68-69): Inferred type: 'y:type
-// Info 4164: (71-78): Inferred type: U('ba:type)
-// Info 4164: (74-78): Inferred type: U('ba:type)
-// Info 4164: (74-75): Inferred type: tfun('ba:type, U('ba:type))
-// Info 4164: (76-77): Inferred type: 'ba:type
+// Info 4164: (39-49): Inferred type: tfun(?u:type, U(?u:type))
+// Info 4164: (45-48): Inferred type: ?t:type
+// Info 4164: (46-47): Inferred type: ?t:type
+// Info 4164: (51-82): Inferred type: (?x:type, ?y:type, U(?ba:type)) -> ()
+// Info 4164: (61-79): Inferred type: (?x:type, ?y:type, U(?ba:type))
+// Info 4164: (62-63): Inferred type: ?x:type
+// Info 4164: (65-69): Inferred type: ?y:type
+// Info 4164: (68-69): Inferred type: ?y:type
+// Info 4164: (71-78): Inferred type: U(?ba:type)
+// Info 4164: (74-78): Inferred type: U(?ba:type)
+// Info 4164: (74-75): Inferred type: tfun(?ba:type, U(?ba:type))
+// Info 4164: (76-77): Inferred type: ?ba:type
 // Info 4164: (84-159): Inferred type: (T, U(T), U(U(T))) -> ()
 // Info 4164: (96-123): Inferred type: (T, U(T), U(U(T)))
 // Info 4164: (97-101): Inferred type: T
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
index b597a5b252..fa68ad308a 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
@@ -16,32 +16,32 @@ function run() {
 // compileViaYul: true
 // ----
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// Info 4164: (31-47): Inferred type: tfun(('ba:type, 'bb:type, 'bc:type), T('ba:type, 'bb:type, 'bc:type))
-// Info 4164: (37-46): Inferred type: ('x:type, 'y:type, 'z:type)
-// Info 4164: (38-39): Inferred type: 'x:type
-// Info 4164: (41-42): Inferred type: 'y:type
-// Info 4164: (44-45): Inferred type: 'z:type
+// Info 4164: (31-47): Inferred type: tfun((?ba:type, ?bb:type, ?bc:type), T(?ba:type, ?bb:type, ?bc:type))
+// Info 4164: (37-46): Inferred type: (?x:type, ?y:type, ?z:type)
+// Info 4164: (38-39): Inferred type: ?x:type
+// Info 4164: (41-42): Inferred type: ?y:type
+// Info 4164: (44-45): Inferred type: ?z:type
 // Info 4164: (48-55): Inferred type: U
 // Info 4164: (56-63): Inferred type: V
 // Info 4164: (65-81): Inferred type: C
-// Info 4164: (71-75): Inferred type: 'be:(type, C)
+// Info 4164: (71-75): Inferred type: ?be:(type, C)
 // Info 4164: (82-98): Inferred type: D
-// Info 4164: (88-92): Inferred type: 'bg:(type, D)
+// Info 4164: (88-92): Inferred type: ?bg:(type, D)
 // Info 4164: (100-170): Inferred type: () -> ()
 // Info 4164: (112-114): Inferred type: ()
-// Info 4164: (125-141): Inferred type: T(U, 'bm:type, 'bo:(type, C))
-// Info 4164: (128-141): Inferred type: T(U, 'bm:type, 'bo:(type, C))
-// Info 4164: (128-129): Inferred type: tfun((U, 'bm:type, 'bo:(type, C)), T(U, 'bm:type, 'bo:(type, C)))
+// Info 4164: (125-141): Inferred type: T(U, ?bm:type, ?bo:(type, C))
+// Info 4164: (128-141): Inferred type: T(U, ?bm:type, ?bo:(type, C))
+// Info 4164: (128-129): Inferred type: tfun((U, ?bm:type, ?bo:(type, C)), T(U, ?bm:type, ?bo:(type, C)))
 // Info 4164: (130-131): Inferred type: U
-// Info 4164: (133-134): Inferred type: 'bm:type
-// Info 4164: (136-140): Inferred type: 'bo:(type, C)
-// Info 4164: (136-137): Inferred type: 'bo:(type, C)
-// Info 4164: (139-140): Inferred type: 'bo:(type, C)
-// Info 4164: (151-167): Inferred type: T(V, 'bt:type, 'bv:(type, D))
-// Info 4164: (154-167): Inferred type: T(V, 'bt:type, 'bv:(type, D))
-// Info 4164: (154-155): Inferred type: tfun((V, 'bt:type, 'bv:(type, D)), T(V, 'bt:type, 'bv:(type, D)))
+// Info 4164: (133-134): Inferred type: ?bm:type
+// Info 4164: (136-140): Inferred type: ?bo:(type, C)
+// Info 4164: (136-137): Inferred type: ?bo:(type, C)
+// Info 4164: (139-140): Inferred type: ?bo:(type, C)
+// Info 4164: (151-167): Inferred type: T(V, ?bt:type, ?bv:(type, D))
+// Info 4164: (154-167): Inferred type: T(V, ?bt:type, ?bv:(type, D))
+// Info 4164: (154-155): Inferred type: tfun((V, ?bt:type, ?bv:(type, D)), T(V, ?bt:type, ?bv:(type, D)))
 // Info 4164: (156-157): Inferred type: V
-// Info 4164: (159-160): Inferred type: 'bt:type
-// Info 4164: (162-166): Inferred type: 'bv:(type, D)
-// Info 4164: (162-163): Inferred type: 'bv:(type, D)
-// Info 4164: (165-166): Inferred type: 'bv:(type, D)
+// Info 4164: (159-160): Inferred type: ?bt:type
+// Info 4164: (162-166): Inferred type: ?bv:(type, D)
+// Info 4164: (162-163): Inferred type: ?bv:(type, D)
+// Info 4164: (165-166): Inferred type: ?bv:(type, D)
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol
index 89f3f5f1a8..27631d064d 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol
@@ -24,15 +24,15 @@ function fun() {
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
 // Info 4164: (31-41): Inferred type: uint
 // Info 4164: (42-54): Inferred type: string
-// Info 4164: (56-66): Inferred type: tfun('v:type, T('v:type))
-// Info 4164: (62-65): Inferred type: 'u:type
-// Info 4164: (63-64): Inferred type: 'u:type
-// Info 4164: (67-84): Inferred type: tfun('x:type, U('x:type))
-// Info 4164: (73-76): Inferred type: 'w:type
-// Info 4164: (74-75): Inferred type: 'w:type
-// Info 4164: (79-83): Inferred type: T('w:type)
-// Info 4164: (79-80): Inferred type: tfun('w:type, T('w:type))
-// Info 4164: (81-82): Inferred type: 'w:type
+// Info 4164: (56-66): Inferred type: tfun(?v:type, T(?v:type))
+// Info 4164: (62-65): Inferred type: ?u:type
+// Info 4164: (63-64): Inferred type: ?u:type
+// Info 4164: (67-84): Inferred type: tfun(?x:type, U(?x:type))
+// Info 4164: (73-76): Inferred type: ?w:type
+// Info 4164: (74-75): Inferred type: ?w:type
+// Info 4164: (79-83): Inferred type: T(?w:type)
+// Info 4164: (79-80): Inferred type: tfun(?w:type, T(?w:type))
+// Info 4164: (81-82): Inferred type: ?w:type
 // Info 4164: (86-245): Inferred type: () -> ()
 // Info 4164: (98-100): Inferred type: ()
 // Info 4164: (111-121): Inferred type: U(uint)
@@ -43,13 +43,13 @@ function fun() {
 // Info 4164: (134-141): Inferred type: T(uint)
 // Info 4164: (134-135): Inferred type: tfun(uint, T(uint))
 // Info 4164: (136-140): Inferred type: uint
-// Info 4164: (147-155): Inferred type: T('bi:type)
-// Info 4164: (147-152): Inferred type: U(uint) -> T('bi:type)
-// Info 4164: (147-148): Inferred type: U('bg:type)
+// Info 4164: (147-155): Inferred type: T(?bi:type)
+// Info 4164: (147-152): Inferred type: U(uint) -> T(?bi:type)
+// Info 4164: (147-148): Inferred type: U(?bg:type)
 // Info 4164: (153-154): Inferred type: U(uint)
-// Info 4164: (161-169): Inferred type: U('bm:type)
-// Info 4164: (161-166): Inferred type: T(uint) -> U('bm:type)
-// Info 4164: (161-162): Inferred type: U('bk:type)
+// Info 4164: (161-169): Inferred type: U(?bm:type)
+// Info 4164: (161-166): Inferred type: T(uint) -> U(?bm:type)
+// Info 4164: (161-162): Inferred type: U(?bk:type)
 // Info 4164: (167-168): Inferred type: T(uint)
 // Info 4164: (180-192): Inferred type: U(string)
 // Info 4164: (183-192): Inferred type: U(string)
@@ -59,11 +59,11 @@ function fun() {
 // Info 4164: (205-214): Inferred type: T(string)
 // Info 4164: (205-206): Inferred type: tfun(string, T(string))
 // Info 4164: (207-213): Inferred type: string
-// Info 4164: (220-228): Inferred type: T('bu:type)
-// Info 4164: (220-225): Inferred type: U(string) -> T('bu:type)
-// Info 4164: (220-221): Inferred type: U('bs:type)
+// Info 4164: (220-228): Inferred type: T(?bu:type)
+// Info 4164: (220-225): Inferred type: U(string) -> T(?bu:type)
+// Info 4164: (220-221): Inferred type: U(?bs:type)
 // Info 4164: (226-227): Inferred type: U(string)
-// Info 4164: (234-242): Inferred type: U('by:type)
-// Info 4164: (234-239): Inferred type: T(string) -> U('by:type)
-// Info 4164: (234-235): Inferred type: U('bw:type)
+// Info 4164: (234-242): Inferred type: U(?by:type)
+// Info 4164: (234-239): Inferred type: T(string) -> U(?by:type)
+// Info 4164: (234-235): Inferred type: U(?bw:type)
 // Info 4164: (240-241): Inferred type: T(string)
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
index 25ab330f3b..3bff1f4d0a 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
@@ -51,28 +51,28 @@ function fun(a: T(int: P3), b: T(str: P4)) {
 // ----
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
 // Info 4164: (31-61): Inferred type: bool
-// Info 4164: (63-73): Inferred type: tfun('z:type, T('z:type))
-// Info 4164: (69-72): Inferred type: 'y:type
-// Info 4164: (70-71): Inferred type: 'y:type
+// Info 4164: (63-73): Inferred type: tfun(?z:type, T(?z:type))
+// Info 4164: (69-72): Inferred type: ?y:type
+// Info 4164: (70-71): Inferred type: ?y:type
 // Info 4164: (74-83): Inferred type: int
 // Info 4164: (84-93): Inferred type: str
 // Info 4164: (95-156): Inferred type: C
-// Info 4164: (101-105): Inferred type: 'bd:(type, C)
-// Info 4164: (115-154): Inferred type: ('bd:(type, C), 'bd:(type, C)) -> 'bd:(type, C)
-// Info 4164: (127-145): Inferred type: ('bd:(type, C), 'bd:(type, C))
-// Info 4164: (128-135): Inferred type: 'bd:(type, C)
-// Info 4164: (131-135): Inferred type: 'bd:(type, C)
-// Info 4164: (137-144): Inferred type: 'bd:(type, C)
-// Info 4164: (140-144): Inferred type: 'bd:(type, C)
-// Info 4164: (149-153): Inferred type: 'bd:(type, C)
+// Info 4164: (101-105): Inferred type: ?bd:(type, C)
+// Info 4164: (115-154): Inferred type: (?bd:(type, C), ?bd:(type, C)) -> ?bd:(type, C)
+// Info 4164: (127-145): Inferred type: (?bd:(type, C), ?bd:(type, C))
+// Info 4164: (128-135): Inferred type: ?bd:(type, C)
+// Info 4164: (131-135): Inferred type: ?bd:(type, C)
+// Info 4164: (137-144): Inferred type: ?bd:(type, C)
+// Info 4164: (140-144): Inferred type: ?bd:(type, C)
+// Info 4164: (149-153): Inferred type: ?bd:(type, C)
 // Info 4164: (158-175): Inferred type: P1
-// Info 4164: (164-168): Inferred type: 'bg:(type, P1)
+// Info 4164: (164-168): Inferred type: ?bg:(type, P1)
 // Info 4164: (176-193): Inferred type: P2
-// Info 4164: (182-186): Inferred type: 'bj:(type, P2)
+// Info 4164: (182-186): Inferred type: ?bj:(type, P2)
 // Info 4164: (194-211): Inferred type: P3
-// Info 4164: (200-204): Inferred type: 'bw:(type, P3)
+// Info 4164: (200-204): Inferred type: ?bw:(type, P3)
 // Info 4164: (212-229): Inferred type: P4
-// Info 4164: (218-222): Inferred type: 'by:(type, P4)
+// Info 4164: (218-222): Inferred type: ?by:(type, P4)
 // Info 4164: (231-255): Inferred type: void
 // Info 4164: (256-280): Inferred type: void
 // Info 4164: (281-305): Inferred type: void
@@ -80,56 +80,56 @@ function fun(a: T(int: P3), b: T(str: P4)) {
 // Info 4164: (332-356): Inferred type: void
 // Info 4164: (357-381): Inferred type: void
 // Info 4164: (383-458): Inferred type: void
-// Info 4164: (398-405): Inferred type: 'ca:(type, P1)
-// Info 4164: (399-404): Inferred type: 'ca:(type, P1)
-// Info 4164: (402-404): Inferred type: 'ca:(type, P1)
-// Info 4164: (415-456): Inferred type: (T('ca:(type, P1)), T('ca:(type, P1))) -> T('ca:(type, P1))
-// Info 4164: (427-445): Inferred type: (T('ca:(type, P1)), T('ca:(type, P1)))
-// Info 4164: (428-435): Inferred type: T('ca:(type, P1))
-// Info 4164: (431-435): Inferred type: T('ca:(type, P1))
-// Info 4164: (431-432): Inferred type: tfun('ca:(type, P1), T('ca:(type, P1)))
-// Info 4164: (433-434): Inferred type: 'ca:(type, P1)
-// Info 4164: (437-444): Inferred type: T('ca:(type, P1))
-// Info 4164: (440-444): Inferred type: T('ca:(type, P1))
-// Info 4164: (440-441): Inferred type: tfun('ca:(type, P1), T('ca:(type, P1)))
-// Info 4164: (442-443): Inferred type: 'ca:(type, P1)
-// Info 4164: (449-453): Inferred type: T('ca:(type, P1))
-// Info 4164: (449-450): Inferred type: tfun('ca:(type, P1), T('ca:(type, P1)))
-// Info 4164: (451-452): Inferred type: 'ca:(type, P1)
+// Info 4164: (398-405): Inferred type: ?ca:(type, P1)
+// Info 4164: (399-404): Inferred type: ?ca:(type, P1)
+// Info 4164: (402-404): Inferred type: ?ca:(type, P1)
+// Info 4164: (415-456): Inferred type: (T(?ca:(type, P1)), T(?ca:(type, P1))) -> T(?ca:(type, P1))
+// Info 4164: (427-445): Inferred type: (T(?ca:(type, P1)), T(?ca:(type, P1)))
+// Info 4164: (428-435): Inferred type: T(?ca:(type, P1))
+// Info 4164: (431-435): Inferred type: T(?ca:(type, P1))
+// Info 4164: (431-432): Inferred type: tfun(?ca:(type, P1), T(?ca:(type, P1)))
+// Info 4164: (433-434): Inferred type: ?ca:(type, P1)
+// Info 4164: (437-444): Inferred type: T(?ca:(type, P1))
+// Info 4164: (440-444): Inferred type: T(?ca:(type, P1))
+// Info 4164: (440-441): Inferred type: tfun(?ca:(type, P1), T(?ca:(type, P1)))
+// Info 4164: (442-443): Inferred type: ?ca:(type, P1)
+// Info 4164: (449-453): Inferred type: T(?ca:(type, P1))
+// Info 4164: (449-450): Inferred type: tfun(?ca:(type, P1), T(?ca:(type, P1)))
+// Info 4164: (451-452): Inferred type: ?ca:(type, P1)
 // Info 4164: (460-535): Inferred type: void
-// Info 4164: (475-482): Inferred type: 'ck:(type, P2)
-// Info 4164: (476-481): Inferred type: 'ck:(type, P2)
-// Info 4164: (479-481): Inferred type: 'ck:(type, P2)
-// Info 4164: (493-533): Inferred type: (T('ck:(type, P2)), T('ck:(type, P2))) -> bool
-// Info 4164: (504-522): Inferred type: (T('ck:(type, P2)), T('ck:(type, P2)))
-// Info 4164: (505-512): Inferred type: T('ck:(type, P2))
-// Info 4164: (508-512): Inferred type: T('ck:(type, P2))
-// Info 4164: (508-509): Inferred type: tfun('ck:(type, P2), T('ck:(type, P2)))
-// Info 4164: (510-511): Inferred type: 'ck:(type, P2)
-// Info 4164: (514-521): Inferred type: T('ck:(type, P2))
-// Info 4164: (517-521): Inferred type: T('ck:(type, P2))
-// Info 4164: (517-518): Inferred type: tfun('ck:(type, P2), T('ck:(type, P2)))
-// Info 4164: (519-520): Inferred type: 'ck:(type, P2)
+// Info 4164: (475-482): Inferred type: ?ck:(type, P2)
+// Info 4164: (476-481): Inferred type: ?ck:(type, P2)
+// Info 4164: (479-481): Inferred type: ?ck:(type, P2)
+// Info 4164: (493-533): Inferred type: (T(?ck:(type, P2)), T(?ck:(type, P2))) -> bool
+// Info 4164: (504-522): Inferred type: (T(?ck:(type, P2)), T(?ck:(type, P2)))
+// Info 4164: (505-512): Inferred type: T(?ck:(type, P2))
+// Info 4164: (508-512): Inferred type: T(?ck:(type, P2))
+// Info 4164: (508-509): Inferred type: tfun(?ck:(type, P2), T(?ck:(type, P2)))
+// Info 4164: (510-511): Inferred type: ?ck:(type, P2)
+// Info 4164: (514-521): Inferred type: T(?ck:(type, P2))
+// Info 4164: (517-521): Inferred type: T(?ck:(type, P2))
+// Info 4164: (517-518): Inferred type: tfun(?ck:(type, P2), T(?ck:(type, P2)))
+// Info 4164: (519-520): Inferred type: ?ck:(type, P2)
 // Info 4164: (526-530): Inferred type: bool
 // Info 4164: (537-618): Inferred type: void
-// Info 4164: (552-565): Inferred type: 'bm:(type, P1, P2)
-// Info 4164: (553-564): Inferred type: 'bm:(type, P1, P2)
-// Info 4164: (556-564): Inferred type: 'bm:(type, P1, P2)
-// Info 4164: (557-559): Inferred type: 'bm:(type, P1, P2)
-// Info 4164: (561-563): Inferred type: 'bm:(type, P1, P2)
-// Info 4164: (575-616): Inferred type: (T('bm:(type, P1, P2)), T('bm:(type, P1, P2))) -> T('bm:(type, P1, P2))
-// Info 4164: (587-605): Inferred type: (T('bm:(type, P1, P2)), T('bm:(type, P1, P2)))
-// Info 4164: (588-595): Inferred type: T('bm:(type, P1, P2))
-// Info 4164: (591-595): Inferred type: T('bm:(type, P1, P2))
-// Info 4164: (591-592): Inferred type: tfun('bm:(type, P1, P2), T('bm:(type, P1, P2)))
-// Info 4164: (593-594): Inferred type: 'bm:(type, P1, P2)
-// Info 4164: (597-604): Inferred type: T('bm:(type, P1, P2))
-// Info 4164: (600-604): Inferred type: T('bm:(type, P1, P2))
-// Info 4164: (600-601): Inferred type: tfun('bm:(type, P1, P2), T('bm:(type, P1, P2)))
-// Info 4164: (602-603): Inferred type: 'bm:(type, P1, P2)
-// Info 4164: (609-613): Inferred type: T('bm:(type, P1, P2))
-// Info 4164: (609-610): Inferred type: tfun('bm:(type, P1, P2), T('bm:(type, P1, P2)))
-// Info 4164: (611-612): Inferred type: 'bm:(type, P1, P2)
+// Info 4164: (552-565): Inferred type: ?bm:(type, P1, P2)
+// Info 4164: (553-564): Inferred type: ?bm:(type, P1, P2)
+// Info 4164: (556-564): Inferred type: ?bm:(type, P1, P2)
+// Info 4164: (557-559): Inferred type: ?bm:(type, P1, P2)
+// Info 4164: (561-563): Inferred type: ?bm:(type, P1, P2)
+// Info 4164: (575-616): Inferred type: (T(?bm:(type, P1, P2)), T(?bm:(type, P1, P2))) -> T(?bm:(type, P1, P2))
+// Info 4164: (587-605): Inferred type: (T(?bm:(type, P1, P2)), T(?bm:(type, P1, P2)))
+// Info 4164: (588-595): Inferred type: T(?bm:(type, P1, P2))
+// Info 4164: (591-595): Inferred type: T(?bm:(type, P1, P2))
+// Info 4164: (591-592): Inferred type: tfun(?bm:(type, P1, P2), T(?bm:(type, P1, P2)))
+// Info 4164: (593-594): Inferred type: ?bm:(type, P1, P2)
+// Info 4164: (597-604): Inferred type: T(?bm:(type, P1, P2))
+// Info 4164: (600-604): Inferred type: T(?bm:(type, P1, P2))
+// Info 4164: (600-601): Inferred type: tfun(?bm:(type, P1, P2), T(?bm:(type, P1, P2)))
+// Info 4164: (602-603): Inferred type: ?bm:(type, P1, P2)
+// Info 4164: (609-613): Inferred type: T(?bm:(type, P1, P2))
+// Info 4164: (609-610): Inferred type: tfun(?bm:(type, P1, P2), T(?bm:(type, P1, P2)))
+// Info 4164: (611-612): Inferred type: ?bm:(type, P1, P2)
 // Info 4164: (620-748): Inferred type: (T(int), T(str)) -> ()
 // Info 4164: (632-662): Inferred type: (T(int), T(str))
 // Info 4164: (633-646): Inferred type: T(int)

From fce70ef0e34b7e6cc8d22b0fc08784758503e8d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Mon, 30 Oct 2023 11:09:04 +0100
Subject: [PATCH 1739/1748] Fixing type variables in defined type classes and
 functions

---
 .../experimental/analysis/TypeInference.cpp   |  34 +++--
 .../experimental/analysis/TypeInference.h     |   1 +
 libsolidity/experimental/ast/TypeSystem.cpp   |   2 +
 ...member_type_does_not_match_declaration.sol |  18 +++
 .../inference/polymorphic_function_call.sol   |  18 +--
 .../inference/polymorphic_type.sol            |  32 ++---
 ...rphic_type_instantiation_and_operators.sol | 118 +++++++++---------
 7 files changed, 130 insertions(+), 93 deletions(-)
 create mode 100644 test/libsolidity/syntaxTests/experimental/inference/instantiation_member_type_does_not_match_declaration.sol

diff --git a/libsolidity/experimental/analysis/TypeInference.cpp b/libsolidity/experimental/analysis/TypeInference.cpp
index 9ec7c97867..cb2de35d33 100644
--- a/libsolidity/experimental/analysis/TypeInference.cpp
+++ b/libsolidity/experimental/analysis/TypeInference.cpp
@@ -166,6 +166,13 @@ bool TypeInference::visit(FunctionDefinition const& _functionDefinition)
 	return false;
 }
 
+void TypeInference::endVisit(FunctionDefinition const& _functionDefinition)
+{
+	solAssert(m_expressionContext == ExpressionContext::Term);
+
+	m_env->fixTypeVars(TypeEnvironmentHelpers{*m_env}.typeVars(type(_functionDefinition)));
+}
+
 void TypeInference::endVisit(Return const& _return)
 {
 	solAssert(m_currentFunctionType);
@@ -204,6 +211,8 @@ bool TypeInference::visit(TypeClassDefinition const& _typeClassDefinition)
 	solAssert(m_analysis.annotation<TypeClassRegistration>(_typeClassDefinition).typeClass.has_value());
 	TypeClass typeClass = m_analysis.annotation<TypeClassRegistration>(_typeClassDefinition).typeClass.value();
 	Type typeVar = m_typeSystem.typeClassVariable(typeClass);
+	unify(type(_typeClassDefinition.typeVariable()), typeVar, _typeClassDefinition.location());
+
 	auto& typeMembersAnnotation = annotation().members[typeConstructor(&_typeClassDefinition)];
 
 	for (auto subNode: _typeClassDefinition.subNodes())
@@ -235,7 +244,6 @@ bool TypeInference::visit(TypeClassDefinition const& _typeClassDefinition)
 			m_errorReporter.typeError(1807_error, _typeClassDefinition.location(), "Function " + functionName + " depends on invalid type variable.");
 	}
 
-	unify(type(_typeClassDefinition.typeVariable()), m_typeSystem.freshTypeVariable({{typeClass}}), _typeClassDefinition.location());
 	for (auto instantiation: m_analysis.annotation<TypeRegistration>(_typeClassDefinition).instantiations | ranges::views::values)
 		// TODO: recursion-safety? Order of instantiation?
 		instantiation->accept(*this);
@@ -663,6 +671,7 @@ bool TypeInference::visit(TypeClassInstantiation const& _typeClassInstantiation)
 			}) | ranges::to<std::vector<Sort>>;
 		}
 	}
+	m_env->fixTypeVars(arguments);
 
 	Type instanceType{TypeConstant{*typeConstructor, arguments}};
 
@@ -682,12 +691,8 @@ bool TypeInference::visit(TypeClassInstantiation const& _typeClassInstantiation)
 
 	auto const& classFunctions = annotation().typeClassFunctions.at(typeClass);
 
-	TypeEnvironment newEnv = m_env->clone();
-	if (!newEnv.unify(m_typeSystem.typeClassVariable(typeClass), instanceType).empty())
-	{
-		m_errorReporter.typeError(4686_error, _typeClassInstantiation.location(), "Unification of class and instance variable failed.");
-		return false;
-	}
+	solAssert(std::holds_alternative<TypeVariable>(m_typeSystem.typeClassVariable(typeClass)));
+	TypeVariable classVar = std::get<TypeVariable>(m_typeSystem.typeClassVariable(typeClass));
 
 	for (auto [name, classFunctionType]: classFunctions)
 	{
@@ -696,11 +701,22 @@ bool TypeInference::visit(TypeClassInstantiation const& _typeClassInstantiation)
 			m_errorReporter.typeError(6948_error, _typeClassInstantiation.location(), "Missing function: " + name);
 			continue;
 		}
+		Type instantiatedClassFunctionType = TypeEnvironmentHelpers{*m_env}.substitute(classFunctionType, classVar, instanceType);
+
 		Type instanceFunctionType = functionTypes.at(name);
 		functionTypes.erase(name);
 
-		if (!newEnv.typeEquals(instanceFunctionType, classFunctionType))
-			m_errorReporter.typeError(7428_error, _typeClassInstantiation.location(), "Type mismatch for function " + name + " " + TypeEnvironmentHelpers{newEnv}.typeToString(instanceFunctionType) + " != " + TypeEnvironmentHelpers{newEnv}.typeToString(classFunctionType));
+		if (!m_env->typeEquals(instanceFunctionType, instantiatedClassFunctionType))
+			m_errorReporter.typeError(
+				7428_error,
+				_typeClassInstantiation.location(),
+				fmt::format(
+					"Instantiation function '{}' does not match the declaration in the type class ({} != {}).",
+					name,
+					TypeEnvironmentHelpers{*m_env}.typeToString(instanceFunctionType),
+					TypeEnvironmentHelpers{*m_env}.typeToString(instantiatedClassFunctionType)
+				)
+			);
 	}
 
 	if (!functionTypes.empty())
diff --git a/libsolidity/experimental/analysis/TypeInference.h b/libsolidity/experimental/analysis/TypeInference.h
index df9d0610a9..3eb2ad94cf 100644
--- a/libsolidity/experimental/analysis/TypeInference.h
+++ b/libsolidity/experimental/analysis/TypeInference.h
@@ -57,6 +57,7 @@ class TypeInference: public ASTConstVisitor
 	bool visit(VariableDeclaration const& _variableDeclaration) override;
 
 	bool visit(FunctionDefinition const& _functionDefinition) override;
+	void endVisit(FunctionDefinition const& _functionDefinition) override;
 	bool visit(ParameterList const&) override { return true; }
 	void endVisit(ParameterList const& _parameterList) override;
 	bool visit(SourceUnit const&) override { return true; }
diff --git a/libsolidity/experimental/ast/TypeSystem.cpp b/libsolidity/experimental/ast/TypeSystem.cpp
index fac5073bb0..4ddb2bf7c8 100644
--- a/libsolidity/experimental/ast/TypeSystem.cpp
+++ b/libsolidity/experimental/ast/TypeSystem.cpp
@@ -301,6 +301,8 @@ std::variant<TypeClass, std::string> TypeSystem::declareTypeClass(std::string _n
 	Type typeVariable = (_primitive ? freshVariable({{typeClass}}) : freshTypeVariable({{typeClass}}));
 	solAssert(std::holds_alternative<TypeVariable>(typeVariable));
 
+	m_globalTypeEnvironment.fixTypeVars({typeVariable});
+
 	m_typeClasses.emplace_back(TypeClassInfo{
 		typeVariable,
 		_name,
diff --git a/test/libsolidity/syntaxTests/experimental/inference/instantiation_member_type_does_not_match_declaration.sol b/test/libsolidity/syntaxTests/experimental/inference/instantiation_member_type_does_not_match_declaration.sol
new file mode 100644
index 0000000000..1c845b8eee
--- /dev/null
+++ b/test/libsolidity/syntaxTests/experimental/inference/instantiation_member_type_does_not_match_declaration.sol
@@ -0,0 +1,18 @@
+pragma experimental solidity;
+
+type T;
+type U;
+
+class Self: C {
+    function f(self: Self);
+}
+
+instantiation T: C {
+    function f(self: U) {}
+}
+// ====
+// EVMVersion: >=constantinople
+// compileViaYul: true
+// ----
+// Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
+// TypeError 7428: (95-144): Instantiation function 'f' does not match the declaration in the type class (U -> () != T -> ()).
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
index 487aea0905..f85f7fd412 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
@@ -18,15 +18,15 @@ function run(a: T, b: U(T), c: U(U(T))) {
 // Info 4164: (39-49): Inferred type: tfun(?u:type, U(?u:type))
 // Info 4164: (45-48): Inferred type: ?t:type
 // Info 4164: (46-47): Inferred type: ?t:type
-// Info 4164: (51-82): Inferred type: (?x:type, ?y:type, U(?ba:type)) -> ()
-// Info 4164: (61-79): Inferred type: (?x:type, ?y:type, U(?ba:type))
-// Info 4164: (62-63): Inferred type: ?x:type
-// Info 4164: (65-69): Inferred type: ?y:type
-// Info 4164: (68-69): Inferred type: ?y:type
-// Info 4164: (71-78): Inferred type: U(?ba:type)
-// Info 4164: (74-78): Inferred type: U(?ba:type)
-// Info 4164: (74-75): Inferred type: tfun(?ba:type, U(?ba:type))
-// Info 4164: (76-77): Inferred type: ?ba:type
+// Info 4164: (51-82): Inferred type: ('x:type, 'y:type, U('ba:type)) -> ()
+// Info 4164: (61-79): Inferred type: ('x:type, 'y:type, U('ba:type))
+// Info 4164: (62-63): Inferred type: 'x:type
+// Info 4164: (65-69): Inferred type: 'y:type
+// Info 4164: (68-69): Inferred type: 'y:type
+// Info 4164: (71-78): Inferred type: U('ba:type)
+// Info 4164: (74-78): Inferred type: U('ba:type)
+// Info 4164: (74-75): Inferred type: tfun('ba:type, U('ba:type))
+// Info 4164: (76-77): Inferred type: 'ba:type
 // Info 4164: (84-159): Inferred type: (T, U(T), U(U(T))) -> ()
 // Info 4164: (96-123): Inferred type: (T, U(T), U(U(T)))
 // Info 4164: (97-101): Inferred type: T
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
index fa68ad308a..5aa190ecef 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
@@ -24,24 +24,24 @@ function run() {
 // Info 4164: (48-55): Inferred type: U
 // Info 4164: (56-63): Inferred type: V
 // Info 4164: (65-81): Inferred type: C
-// Info 4164: (71-75): Inferred type: ?be:(type, C)
+// Info 4164: (71-75): Inferred type: 'k:(type, C)
 // Info 4164: (82-98): Inferred type: D
-// Info 4164: (88-92): Inferred type: ?bg:(type, D)
+// Info 4164: (88-92): Inferred type: 'l:(type, D)
 // Info 4164: (100-170): Inferred type: () -> ()
 // Info 4164: (112-114): Inferred type: ()
-// Info 4164: (125-141): Inferred type: T(U, ?bm:type, ?bo:(type, C))
-// Info 4164: (128-141): Inferred type: T(U, ?bm:type, ?bo:(type, C))
-// Info 4164: (128-129): Inferred type: tfun((U, ?bm:type, ?bo:(type, C)), T(U, ?bm:type, ?bo:(type, C)))
+// Info 4164: (125-141): Inferred type: T(U, ?bk:type, ?bm:(type, C))
+// Info 4164: (128-141): Inferred type: T(U, ?bk:type, ?bm:(type, C))
+// Info 4164: (128-129): Inferred type: tfun((U, ?bk:type, ?bm:(type, C)), T(U, ?bk:type, ?bm:(type, C)))
 // Info 4164: (130-131): Inferred type: U
-// Info 4164: (133-134): Inferred type: ?bm:type
-// Info 4164: (136-140): Inferred type: ?bo:(type, C)
-// Info 4164: (136-137): Inferred type: ?bo:(type, C)
-// Info 4164: (139-140): Inferred type: ?bo:(type, C)
-// Info 4164: (151-167): Inferred type: T(V, ?bt:type, ?bv:(type, D))
-// Info 4164: (154-167): Inferred type: T(V, ?bt:type, ?bv:(type, D))
-// Info 4164: (154-155): Inferred type: tfun((V, ?bt:type, ?bv:(type, D)), T(V, ?bt:type, ?bv:(type, D)))
+// Info 4164: (133-134): Inferred type: ?bk:type
+// Info 4164: (136-140): Inferred type: ?bm:(type, C)
+// Info 4164: (136-137): Inferred type: ?bm:(type, C)
+// Info 4164: (139-140): Inferred type: ?bm:(type, C)
+// Info 4164: (151-167): Inferred type: T(V, ?br:type, ?bt:(type, D))
+// Info 4164: (154-167): Inferred type: T(V, ?br:type, ?bt:(type, D))
+// Info 4164: (154-155): Inferred type: tfun((V, ?br:type, ?bt:(type, D)), T(V, ?br:type, ?bt:(type, D)))
 // Info 4164: (156-157): Inferred type: V
-// Info 4164: (159-160): Inferred type: ?bt:type
-// Info 4164: (162-166): Inferred type: ?bv:(type, D)
-// Info 4164: (162-163): Inferred type: ?bv:(type, D)
-// Info 4164: (165-166): Inferred type: ?bv:(type, D)
+// Info 4164: (159-160): Inferred type: ?br:type
+// Info 4164: (162-166): Inferred type: ?bt:(type, D)
+// Info 4164: (162-163): Inferred type: ?bt:(type, D)
+// Info 4164: (165-166): Inferred type: ?bt:(type, D)
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
index 3bff1f4d0a..22c4796e0f 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
@@ -57,22 +57,22 @@ function fun(a: T(int: P3), b: T(str: P4)) {
 // Info 4164: (74-83): Inferred type: int
 // Info 4164: (84-93): Inferred type: str
 // Info 4164: (95-156): Inferred type: C
-// Info 4164: (101-105): Inferred type: ?bd:(type, C)
-// Info 4164: (115-154): Inferred type: (?bd:(type, C), ?bd:(type, C)) -> ?bd:(type, C)
-// Info 4164: (127-145): Inferred type: (?bd:(type, C), ?bd:(type, C))
-// Info 4164: (128-135): Inferred type: ?bd:(type, C)
-// Info 4164: (131-135): Inferred type: ?bd:(type, C)
-// Info 4164: (137-144): Inferred type: ?bd:(type, C)
-// Info 4164: (140-144): Inferred type: ?bd:(type, C)
-// Info 4164: (149-153): Inferred type: ?bd:(type, C)
+// Info 4164: (101-105): Inferred type: 'k:(type, C)
+// Info 4164: (115-154): Inferred type: ('k:(type, C), 'k:(type, C)) -> 'k:(type, C)
+// Info 4164: (127-145): Inferred type: ('k:(type, C), 'k:(type, C))
+// Info 4164: (128-135): Inferred type: 'k:(type, C)
+// Info 4164: (131-135): Inferred type: 'k:(type, C)
+// Info 4164: (137-144): Inferred type: 'k:(type, C)
+// Info 4164: (140-144): Inferred type: 'k:(type, C)
+// Info 4164: (149-153): Inferred type: 'k:(type, C)
 // Info 4164: (158-175): Inferred type: P1
-// Info 4164: (164-168): Inferred type: ?bg:(type, P1)
+// Info 4164: (164-168): Inferred type: 'l:(type, P1)
 // Info 4164: (176-193): Inferred type: P2
-// Info 4164: (182-186): Inferred type: ?bj:(type, P2)
+// Info 4164: (182-186): Inferred type: 'm:(type, P2)
 // Info 4164: (194-211): Inferred type: P3
-// Info 4164: (200-204): Inferred type: ?bw:(type, P3)
+// Info 4164: (200-204): Inferred type: 'n:(type, P3)
 // Info 4164: (212-229): Inferred type: P4
-// Info 4164: (218-222): Inferred type: ?by:(type, P4)
+// Info 4164: (218-222): Inferred type: 'o:(type, P4)
 // Info 4164: (231-255): Inferred type: void
 // Info 4164: (256-280): Inferred type: void
 // Info 4164: (281-305): Inferred type: void
@@ -80,56 +80,56 @@ function fun(a: T(int: P3), b: T(str: P4)) {
 // Info 4164: (332-356): Inferred type: void
 // Info 4164: (357-381): Inferred type: void
 // Info 4164: (383-458): Inferred type: void
-// Info 4164: (398-405): Inferred type: ?ca:(type, P1)
-// Info 4164: (399-404): Inferred type: ?ca:(type, P1)
-// Info 4164: (402-404): Inferred type: ?ca:(type, P1)
-// Info 4164: (415-456): Inferred type: (T(?ca:(type, P1)), T(?ca:(type, P1))) -> T(?ca:(type, P1))
-// Info 4164: (427-445): Inferred type: (T(?ca:(type, P1)), T(?ca:(type, P1)))
-// Info 4164: (428-435): Inferred type: T(?ca:(type, P1))
-// Info 4164: (431-435): Inferred type: T(?ca:(type, P1))
-// Info 4164: (431-432): Inferred type: tfun(?ca:(type, P1), T(?ca:(type, P1)))
-// Info 4164: (433-434): Inferred type: ?ca:(type, P1)
-// Info 4164: (437-444): Inferred type: T(?ca:(type, P1))
-// Info 4164: (440-444): Inferred type: T(?ca:(type, P1))
-// Info 4164: (440-441): Inferred type: tfun(?ca:(type, P1), T(?ca:(type, P1)))
-// Info 4164: (442-443): Inferred type: ?ca:(type, P1)
-// Info 4164: (449-453): Inferred type: T(?ca:(type, P1))
-// Info 4164: (449-450): Inferred type: tfun(?ca:(type, P1), T(?ca:(type, P1)))
-// Info 4164: (451-452): Inferred type: ?ca:(type, P1)
+// Info 4164: (398-405): Inferred type: 'bv:(type, P1)
+// Info 4164: (399-404): Inferred type: 'bv:(type, P1)
+// Info 4164: (402-404): Inferred type: 'bv:(type, P1)
+// Info 4164: (415-456): Inferred type: (T('bv:(type, P1)), T('bv:(type, P1))) -> T('bv:(type, P1))
+// Info 4164: (427-445): Inferred type: (T('bv:(type, P1)), T('bv:(type, P1)))
+// Info 4164: (428-435): Inferred type: T('bv:(type, P1))
+// Info 4164: (431-435): Inferred type: T('bv:(type, P1))
+// Info 4164: (431-432): Inferred type: tfun('bv:(type, P1), T('bv:(type, P1)))
+// Info 4164: (433-434): Inferred type: 'bv:(type, P1)
+// Info 4164: (437-444): Inferred type: T('bv:(type, P1))
+// Info 4164: (440-444): Inferred type: T('bv:(type, P1))
+// Info 4164: (440-441): Inferred type: tfun('bv:(type, P1), T('bv:(type, P1)))
+// Info 4164: (442-443): Inferred type: 'bv:(type, P1)
+// Info 4164: (449-453): Inferred type: T('bv:(type, P1))
+// Info 4164: (449-450): Inferred type: tfun('bv:(type, P1), T('bv:(type, P1)))
+// Info 4164: (451-452): Inferred type: 'bv:(type, P1)
 // Info 4164: (460-535): Inferred type: void
-// Info 4164: (475-482): Inferred type: ?ck:(type, P2)
-// Info 4164: (476-481): Inferred type: ?ck:(type, P2)
-// Info 4164: (479-481): Inferred type: ?ck:(type, P2)
-// Info 4164: (493-533): Inferred type: (T(?ck:(type, P2)), T(?ck:(type, P2))) -> bool
-// Info 4164: (504-522): Inferred type: (T(?ck:(type, P2)), T(?ck:(type, P2)))
-// Info 4164: (505-512): Inferred type: T(?ck:(type, P2))
-// Info 4164: (508-512): Inferred type: T(?ck:(type, P2))
-// Info 4164: (508-509): Inferred type: tfun(?ck:(type, P2), T(?ck:(type, P2)))
-// Info 4164: (510-511): Inferred type: ?ck:(type, P2)
-// Info 4164: (514-521): Inferred type: T(?ck:(type, P2))
-// Info 4164: (517-521): Inferred type: T(?ck:(type, P2))
-// Info 4164: (517-518): Inferred type: tfun(?ck:(type, P2), T(?ck:(type, P2)))
-// Info 4164: (519-520): Inferred type: ?ck:(type, P2)
+// Info 4164: (475-482): Inferred type: 'cf:(type, P2)
+// Info 4164: (476-481): Inferred type: 'cf:(type, P2)
+// Info 4164: (479-481): Inferred type: 'cf:(type, P2)
+// Info 4164: (493-533): Inferred type: (T('cf:(type, P2)), T('cf:(type, P2))) -> bool
+// Info 4164: (504-522): Inferred type: (T('cf:(type, P2)), T('cf:(type, P2)))
+// Info 4164: (505-512): Inferred type: T('cf:(type, P2))
+// Info 4164: (508-512): Inferred type: T('cf:(type, P2))
+// Info 4164: (508-509): Inferred type: tfun('cf:(type, P2), T('cf:(type, P2)))
+// Info 4164: (510-511): Inferred type: 'cf:(type, P2)
+// Info 4164: (514-521): Inferred type: T('cf:(type, P2))
+// Info 4164: (517-521): Inferred type: T('cf:(type, P2))
+// Info 4164: (517-518): Inferred type: tfun('cf:(type, P2), T('cf:(type, P2)))
+// Info 4164: (519-520): Inferred type: 'cf:(type, P2)
 // Info 4164: (526-530): Inferred type: bool
 // Info 4164: (537-618): Inferred type: void
-// Info 4164: (552-565): Inferred type: ?bm:(type, P1, P2)
-// Info 4164: (553-564): Inferred type: ?bm:(type, P1, P2)
-// Info 4164: (556-564): Inferred type: ?bm:(type, P1, P2)
-// Info 4164: (557-559): Inferred type: ?bm:(type, P1, P2)
-// Info 4164: (561-563): Inferred type: ?bm:(type, P1, P2)
-// Info 4164: (575-616): Inferred type: (T(?bm:(type, P1, P2)), T(?bm:(type, P1, P2))) -> T(?bm:(type, P1, P2))
-// Info 4164: (587-605): Inferred type: (T(?bm:(type, P1, P2)), T(?bm:(type, P1, P2)))
-// Info 4164: (588-595): Inferred type: T(?bm:(type, P1, P2))
-// Info 4164: (591-595): Inferred type: T(?bm:(type, P1, P2))
-// Info 4164: (591-592): Inferred type: tfun(?bm:(type, P1, P2), T(?bm:(type, P1, P2)))
-// Info 4164: (593-594): Inferred type: ?bm:(type, P1, P2)
-// Info 4164: (597-604): Inferred type: T(?bm:(type, P1, P2))
-// Info 4164: (600-604): Inferred type: T(?bm:(type, P1, P2))
-// Info 4164: (600-601): Inferred type: tfun(?bm:(type, P1, P2), T(?bm:(type, P1, P2)))
-// Info 4164: (602-603): Inferred type: ?bm:(type, P1, P2)
-// Info 4164: (609-613): Inferred type: T(?bm:(type, P1, P2))
-// Info 4164: (609-610): Inferred type: tfun(?bm:(type, P1, P2), T(?bm:(type, P1, P2)))
-// Info 4164: (611-612): Inferred type: ?bm:(type, P1, P2)
+// Info 4164: (552-565): Inferred type: 'bj:(type, P1, P2)
+// Info 4164: (553-564): Inferred type: 'bj:(type, P1, P2)
+// Info 4164: (556-564): Inferred type: 'bj:(type, P1, P2)
+// Info 4164: (557-559): Inferred type: 'bj:(type, P1, P2)
+// Info 4164: (561-563): Inferred type: 'bj:(type, P1, P2)
+// Info 4164: (575-616): Inferred type: (T('bj:(type, P1, P2)), T('bj:(type, P1, P2))) -> T('bj:(type, P1, P2))
+// Info 4164: (587-605): Inferred type: (T('bj:(type, P1, P2)), T('bj:(type, P1, P2)))
+// Info 4164: (588-595): Inferred type: T('bj:(type, P1, P2))
+// Info 4164: (591-595): Inferred type: T('bj:(type, P1, P2))
+// Info 4164: (591-592): Inferred type: tfun('bj:(type, P1, P2), T('bj:(type, P1, P2)))
+// Info 4164: (593-594): Inferred type: 'bj:(type, P1, P2)
+// Info 4164: (597-604): Inferred type: T('bj:(type, P1, P2))
+// Info 4164: (600-604): Inferred type: T('bj:(type, P1, P2))
+// Info 4164: (600-601): Inferred type: tfun('bj:(type, P1, P2), T('bj:(type, P1, P2)))
+// Info 4164: (602-603): Inferred type: 'bj:(type, P1, P2)
+// Info 4164: (609-613): Inferred type: T('bj:(type, P1, P2))
+// Info 4164: (609-610): Inferred type: tfun('bj:(type, P1, P2), T('bj:(type, P1, P2)))
+// Info 4164: (611-612): Inferred type: 'bj:(type, P1, P2)
 // Info 4164: (620-748): Inferred type: (T(int), T(str)) -> ()
 // Info 4164: (632-662): Inferred type: (T(int), T(str))
 // Info 4164: (633-646): Inferred type: T(int)

From 8e210d2f8aa17a71b9306a232db7f4685b99bd13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Tue, 7 Nov 2023 17:27:06 +0100
Subject: [PATCH 1740/1748] Fixing type variables in type definitions

---
 .../experimental/analysis/TypeInference.cpp   |  17 ++-
 libsolidity/experimental/ast/TypeSystem.cpp   |   1 +
 .../builtin/builtin_type_definition.sol       |  20 ++--
 .../inference/polymorphic_function_call.sol   |  24 ++---
 .../inference/polymorphic_type.sol            |  38 +++----
 .../polymorphic_type_abs_and_rep.sol          |  42 ++++----
 ...rphic_type_instantiation_and_operators.sol | 100 +++++++++---------
 7 files changed, 128 insertions(+), 114 deletions(-)

diff --git a/libsolidity/experimental/analysis/TypeInference.cpp b/libsolidity/experimental/analysis/TypeInference.cpp
index cb2de35d33..63a377f90d 100644
--- a/libsolidity/experimental/analysis/TypeInference.cpp
+++ b/libsolidity/experimental/analysis/TypeInference.cpp
@@ -33,6 +33,7 @@
 #include <libyul/AST.h>
 
 #include <boost/algorithm/string.hpp>
+
 #include <range/v3/view/transform.hpp>
 
 using namespace solidity;
@@ -776,12 +777,21 @@ bool TypeInference::visit(TypeDefinition const& _typeDefinition)
 		return false;
 
 	if (_typeDefinition.arguments())
+	{
+		ScopedSaveAndRestore expressionContext{m_expressionContext, ExpressionContext::Type};
 		_typeDefinition.arguments()->accept(*this);
+	}
 
 	std::vector<Type> arguments;
 	if (_typeDefinition.arguments())
-		for (size_t i = 0; i < _typeDefinition.arguments()->parameters().size(); ++i)
-			arguments.emplace_back(m_typeSystem.freshTypeVariable({}));
+		for (ASTPointer<VariableDeclaration> argumentDeclaration: _typeDefinition.arguments()->parameters())
+		{
+			solAssert(argumentDeclaration);
+			Type typeVar = type(*argumentDeclaration);
+			solAssert(std::holds_alternative<TypeVariable>(typeVar));
+			arguments.emplace_back(typeVar);
+		}
+	m_env->fixTypeVars(arguments);
 
 	Type definedType = type(&_typeDefinition, arguments);
 	if (arguments.empty())
@@ -807,6 +817,9 @@ bool TypeInference::visit(TypeDefinition const& _typeDefinition)
 	solAssert(newlyInserted, fmt::format("Members of type '{}' are already defined.", m_typeSystem.constructorInfo(constructor).name));
 	if (underlyingType)
 	{
+		// Undeclared type variables are not allowed in type definitions and we fixed all the declared ones.
+		solAssert(!TypeEnvironmentHelpers{*m_env}.hasGenericTypeVars(*underlyingType));
+
 		members->second.emplace("abs", TypeMember{helper.functionType(*underlyingType, definedType)});
 		members->second.emplace("rep", TypeMember{helper.functionType(definedType, *underlyingType)});
 	}
diff --git a/libsolidity/experimental/ast/TypeSystem.cpp b/libsolidity/experimental/ast/TypeSystem.cpp
index 4ddb2bf7c8..059054dcdb 100644
--- a/libsolidity/experimental/ast/TypeSystem.cpp
+++ b/libsolidity/experimental/ast/TypeSystem.cpp
@@ -283,6 +283,7 @@ TypeConstructor TypeSystem::declareTypeConstructor(std::string _name, std::strin
 		std::generate_n(std::back_inserter(argumentSorts), _arguments, [&](){ return Sort{{primitiveClass(PrimitiveClass::Type)}}; });
 		std::vector<Type> argumentTypes;
 		std::generate_n(std::back_inserter(argumentTypes), _arguments, [&](){ return freshVariable({}); });
+		m_globalTypeEnvironment.fixTypeVars(argumentTypes);
 		auto error = instantiateClass(type(constructor, argumentTypes), Arity{argumentSorts, primitiveClass(PrimitiveClass::Type)});
 		solAssert(!error, *error);
 	}
diff --git a/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
index fb76e1948b..373d76c339 100644
--- a/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
+++ b/test/libsolidity/syntaxTests/experimental/builtin/builtin_type_definition.sol
@@ -40,14 +40,14 @@ contract C {
 // Info 4164: (94-124): Inferred type: word
 // Info 4164: (125-161): Inferred type: integer
 // Info 4164: (162-192): Inferred type: ()
-// Info 4164: (194-228): Inferred type: tfun((?u:type, ?v:type), ?u:type -> ?v:type)
-// Info 4164: (202-208): Inferred type: (?s:type, ?t:type)
-// Info 4164: (203-204): Inferred type: ?s:type
-// Info 4164: (206-207): Inferred type: ?t:type
-// Info 4164: (229-265): Inferred type: tfun((?y:type, ?z:type), (?y:type, ?z:type))
-// Info 4164: (238-244): Inferred type: (?w:type, ?x:type)
-// Info 4164: (239-240): Inferred type: ?w:type
-// Info 4164: (242-243): Inferred type: ?x:type
+// Info 4164: (194-228): Inferred type: tfun(('s:type, 't:type), 's:type -> 't:type)
+// Info 4164: (202-208): Inferred type: ('s:type, 't:type)
+// Info 4164: (203-204): Inferred type: 's:type
+// Info 4164: (206-207): Inferred type: 't:type
+// Info 4164: (229-265): Inferred type: tfun(('u:type, 'v:type), ('u:type, 'v:type))
+// Info 4164: (238-244): Inferred type: ('u:type, 'v:type)
+// Info 4164: (239-240): Inferred type: 'u:type
+// Info 4164: (242-243): Inferred type: 'v:type
 // Info 4164: (284-584): Inferred type: () -> ()
 // Info 4164: (292-294): Inferred type: ()
 // Info 4164: (318-325): Inferred type: void
@@ -84,9 +84,9 @@ contract C {
 // Info 4164: (525-529): Inferred type: word
 // Info 4164: (540-553): Inferred type: bool
 // Info 4164: (540-550): Inferred type: (bool, word) -> bool
-// Info 4164: (540-544): Inferred type: (?bl:type, ?bm:type)
+// Info 4164: (540-544): Inferred type: (?bh:type, ?bi:type)
 // Info 4164: (551-552): Inferred type: (bool, word)
 // Info 4164: (563-577): Inferred type: word
 // Info 4164: (563-574): Inferred type: (bool, word) -> word
-// Info 4164: (563-567): Inferred type: (?bq:type, ?br:type)
+// Info 4164: (563-567): Inferred type: (?bm:type, ?bn:type)
 // Info 4164: (575-576): Inferred type: (bool, word)
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
index f85f7fd412..c73a857a2f 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_function_call.sol
@@ -15,18 +15,18 @@ function run(a: T, b: U(T), c: U(U(T))) {
 // ----
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
 // Info 4164: (31-38): Inferred type: T
-// Info 4164: (39-49): Inferred type: tfun(?u:type, U(?u:type))
-// Info 4164: (45-48): Inferred type: ?t:type
-// Info 4164: (46-47): Inferred type: ?t:type
-// Info 4164: (51-82): Inferred type: ('x:type, 'y:type, U('ba:type)) -> ()
-// Info 4164: (61-79): Inferred type: ('x:type, 'y:type, U('ba:type))
-// Info 4164: (62-63): Inferred type: 'x:type
-// Info 4164: (65-69): Inferred type: 'y:type
-// Info 4164: (68-69): Inferred type: 'y:type
-// Info 4164: (71-78): Inferred type: U('ba:type)
-// Info 4164: (74-78): Inferred type: U('ba:type)
-// Info 4164: (74-75): Inferred type: tfun('ba:type, U('ba:type))
-// Info 4164: (76-77): Inferred type: 'ba:type
+// Info 4164: (39-49): Inferred type: tfun('t:type, U('t:type))
+// Info 4164: (45-48): Inferred type: 't:type
+// Info 4164: (46-47): Inferred type: 't:type
+// Info 4164: (51-82): Inferred type: ('w:type, 'x:type, U('z:type)) -> ()
+// Info 4164: (61-79): Inferred type: ('w:type, 'x:type, U('z:type))
+// Info 4164: (62-63): Inferred type: 'w:type
+// Info 4164: (65-69): Inferred type: 'x:type
+// Info 4164: (68-69): Inferred type: 'x:type
+// Info 4164: (71-78): Inferred type: U('z:type)
+// Info 4164: (74-78): Inferred type: U('z:type)
+// Info 4164: (74-75): Inferred type: tfun('z:type, U('z:type))
+// Info 4164: (76-77): Inferred type: 'z:type
 // Info 4164: (84-159): Inferred type: (T, U(T), U(U(T))) -> ()
 // Info 4164: (96-123): Inferred type: (T, U(T), U(U(T)))
 // Info 4164: (97-101): Inferred type: T
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
index 5aa190ecef..ca83ca2ec7 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type.sol
@@ -16,11 +16,11 @@ function run() {
 // compileViaYul: true
 // ----
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
-// Info 4164: (31-47): Inferred type: tfun((?ba:type, ?bb:type, ?bc:type), T(?ba:type, ?bb:type, ?bc:type))
-// Info 4164: (37-46): Inferred type: (?x:type, ?y:type, ?z:type)
-// Info 4164: (38-39): Inferred type: ?x:type
-// Info 4164: (41-42): Inferred type: ?y:type
-// Info 4164: (44-45): Inferred type: ?z:type
+// Info 4164: (31-47): Inferred type: tfun(('x:type, 'y:type, 'z:type), T('x:type, 'y:type, 'z:type))
+// Info 4164: (37-46): Inferred type: ('x:type, 'y:type, 'z:type)
+// Info 4164: (38-39): Inferred type: 'x:type
+// Info 4164: (41-42): Inferred type: 'y:type
+// Info 4164: (44-45): Inferred type: 'z:type
 // Info 4164: (48-55): Inferred type: U
 // Info 4164: (56-63): Inferred type: V
 // Info 4164: (65-81): Inferred type: C
@@ -29,19 +29,19 @@ function run() {
 // Info 4164: (88-92): Inferred type: 'l:(type, D)
 // Info 4164: (100-170): Inferred type: () -> ()
 // Info 4164: (112-114): Inferred type: ()
-// Info 4164: (125-141): Inferred type: T(U, ?bk:type, ?bm:(type, C))
-// Info 4164: (128-141): Inferred type: T(U, ?bk:type, ?bm:(type, C))
-// Info 4164: (128-129): Inferred type: tfun((U, ?bk:type, ?bm:(type, C)), T(U, ?bk:type, ?bm:(type, C)))
+// Info 4164: (125-141): Inferred type: T(U, ?bh:type, ?bj:(type, C))
+// Info 4164: (128-141): Inferred type: T(U, ?bh:type, ?bj:(type, C))
+// Info 4164: (128-129): Inferred type: tfun((U, ?bh:type, ?bj:(type, C)), T(U, ?bh:type, ?bj:(type, C)))
 // Info 4164: (130-131): Inferred type: U
-// Info 4164: (133-134): Inferred type: ?bk:type
-// Info 4164: (136-140): Inferred type: ?bm:(type, C)
-// Info 4164: (136-137): Inferred type: ?bm:(type, C)
-// Info 4164: (139-140): Inferred type: ?bm:(type, C)
-// Info 4164: (151-167): Inferred type: T(V, ?br:type, ?bt:(type, D))
-// Info 4164: (154-167): Inferred type: T(V, ?br:type, ?bt:(type, D))
-// Info 4164: (154-155): Inferred type: tfun((V, ?br:type, ?bt:(type, D)), T(V, ?br:type, ?bt:(type, D)))
+// Info 4164: (133-134): Inferred type: ?bh:type
+// Info 4164: (136-140): Inferred type: ?bj:(type, C)
+// Info 4164: (136-137): Inferred type: ?bj:(type, C)
+// Info 4164: (139-140): Inferred type: ?bj:(type, C)
+// Info 4164: (151-167): Inferred type: T(V, ?bo:type, ?bq:(type, D))
+// Info 4164: (154-167): Inferred type: T(V, ?bo:type, ?bq:(type, D))
+// Info 4164: (154-155): Inferred type: tfun((V, ?bo:type, ?bq:(type, D)), T(V, ?bo:type, ?bq:(type, D)))
 // Info 4164: (156-157): Inferred type: V
-// Info 4164: (159-160): Inferred type: ?br:type
-// Info 4164: (162-166): Inferred type: ?bt:(type, D)
-// Info 4164: (162-163): Inferred type: ?bt:(type, D)
-// Info 4164: (165-166): Inferred type: ?bt:(type, D)
+// Info 4164: (159-160): Inferred type: ?bo:type
+// Info 4164: (162-166): Inferred type: ?bq:(type, D)
+// Info 4164: (162-163): Inferred type: ?bq:(type, D)
+// Info 4164: (165-166): Inferred type: ?bq:(type, D)
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol
index 27631d064d..ebebf6dafc 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_abs_and_rep.sol
@@ -24,15 +24,15 @@ function fun() {
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
 // Info 4164: (31-41): Inferred type: uint
 // Info 4164: (42-54): Inferred type: string
-// Info 4164: (56-66): Inferred type: tfun(?v:type, T(?v:type))
-// Info 4164: (62-65): Inferred type: ?u:type
-// Info 4164: (63-64): Inferred type: ?u:type
-// Info 4164: (67-84): Inferred type: tfun(?x:type, U(?x:type))
-// Info 4164: (73-76): Inferred type: ?w:type
-// Info 4164: (74-75): Inferred type: ?w:type
-// Info 4164: (79-83): Inferred type: T(?w:type)
-// Info 4164: (79-80): Inferred type: tfun(?w:type, T(?w:type))
-// Info 4164: (81-82): Inferred type: ?w:type
+// Info 4164: (56-66): Inferred type: tfun('u:type, T('u:type))
+// Info 4164: (62-65): Inferred type: 'u:type
+// Info 4164: (63-64): Inferred type: 'u:type
+// Info 4164: (67-84): Inferred type: tfun('v:type, U('v:type))
+// Info 4164: (73-76): Inferred type: 'v:type
+// Info 4164: (74-75): Inferred type: 'v:type
+// Info 4164: (79-83): Inferred type: T('v:type)
+// Info 4164: (79-80): Inferred type: tfun('v:type, T('v:type))
+// Info 4164: (81-82): Inferred type: 'v:type
 // Info 4164: (86-245): Inferred type: () -> ()
 // Info 4164: (98-100): Inferred type: ()
 // Info 4164: (111-121): Inferred type: U(uint)
@@ -43,13 +43,13 @@ function fun() {
 // Info 4164: (134-141): Inferred type: T(uint)
 // Info 4164: (134-135): Inferred type: tfun(uint, T(uint))
 // Info 4164: (136-140): Inferred type: uint
-// Info 4164: (147-155): Inferred type: T(?bi:type)
-// Info 4164: (147-152): Inferred type: U(uint) -> T(?bi:type)
-// Info 4164: (147-148): Inferred type: U(?bg:type)
+// Info 4164: (147-155): Inferred type: T(uint)
+// Info 4164: (147-152): Inferred type: U(uint) -> T(uint)
+// Info 4164: (147-148): Inferred type: U(?be:type)
 // Info 4164: (153-154): Inferred type: U(uint)
-// Info 4164: (161-169): Inferred type: U(?bm:type)
-// Info 4164: (161-166): Inferred type: T(uint) -> U(?bm:type)
-// Info 4164: (161-162): Inferred type: U(?bk:type)
+// Info 4164: (161-169): Inferred type: U(uint)
+// Info 4164: (161-166): Inferred type: T(uint) -> U(uint)
+// Info 4164: (161-162): Inferred type: U(?bh:type)
 // Info 4164: (167-168): Inferred type: T(uint)
 // Info 4164: (180-192): Inferred type: U(string)
 // Info 4164: (183-192): Inferred type: U(string)
@@ -59,11 +59,11 @@ function fun() {
 // Info 4164: (205-214): Inferred type: T(string)
 // Info 4164: (205-206): Inferred type: tfun(string, T(string))
 // Info 4164: (207-213): Inferred type: string
-// Info 4164: (220-228): Inferred type: T(?bu:type)
-// Info 4164: (220-225): Inferred type: U(string) -> T(?bu:type)
-// Info 4164: (220-221): Inferred type: U(?bs:type)
+// Info 4164: (220-228): Inferred type: T(string)
+// Info 4164: (220-225): Inferred type: U(string) -> T(string)
+// Info 4164: (220-221): Inferred type: U(?bo:type)
 // Info 4164: (226-227): Inferred type: U(string)
-// Info 4164: (234-242): Inferred type: U(?by:type)
-// Info 4164: (234-239): Inferred type: T(string) -> U(?by:type)
-// Info 4164: (234-235): Inferred type: U(?bw:type)
+// Info 4164: (234-242): Inferred type: U(string)
+// Info 4164: (234-239): Inferred type: T(string) -> U(string)
+// Info 4164: (234-235): Inferred type: U(?br:type)
 // Info 4164: (240-241): Inferred type: T(string)
diff --git a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
index 22c4796e0f..c26436e06c 100644
--- a/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
+++ b/test/libsolidity/syntaxTests/experimental/inference/polymorphic_type_instantiation_and_operators.sol
@@ -51,9 +51,9 @@ function fun(a: T(int: P3), b: T(str: P4)) {
 // ----
 // Warning 2264: (0-29): Experimental features are turned on. Do not use experimental features on live deployments.
 // Info 4164: (31-61): Inferred type: bool
-// Info 4164: (63-73): Inferred type: tfun(?z:type, T(?z:type))
-// Info 4164: (69-72): Inferred type: ?y:type
-// Info 4164: (70-71): Inferred type: ?y:type
+// Info 4164: (63-73): Inferred type: tfun('y:type, T('y:type))
+// Info 4164: (69-72): Inferred type: 'y:type
+// Info 4164: (70-71): Inferred type: 'y:type
 // Info 4164: (74-83): Inferred type: int
 // Info 4164: (84-93): Inferred type: str
 // Info 4164: (95-156): Inferred type: C
@@ -80,56 +80,56 @@ function fun(a: T(int: P3), b: T(str: P4)) {
 // Info 4164: (332-356): Inferred type: void
 // Info 4164: (357-381): Inferred type: void
 // Info 4164: (383-458): Inferred type: void
-// Info 4164: (398-405): Inferred type: 'bv:(type, P1)
-// Info 4164: (399-404): Inferred type: 'bv:(type, P1)
-// Info 4164: (402-404): Inferred type: 'bv:(type, P1)
-// Info 4164: (415-456): Inferred type: (T('bv:(type, P1)), T('bv:(type, P1))) -> T('bv:(type, P1))
-// Info 4164: (427-445): Inferred type: (T('bv:(type, P1)), T('bv:(type, P1)))
-// Info 4164: (428-435): Inferred type: T('bv:(type, P1))
-// Info 4164: (431-435): Inferred type: T('bv:(type, P1))
-// Info 4164: (431-432): Inferred type: tfun('bv:(type, P1), T('bv:(type, P1)))
-// Info 4164: (433-434): Inferred type: 'bv:(type, P1)
-// Info 4164: (437-444): Inferred type: T('bv:(type, P1))
-// Info 4164: (440-444): Inferred type: T('bv:(type, P1))
-// Info 4164: (440-441): Inferred type: tfun('bv:(type, P1), T('bv:(type, P1)))
-// Info 4164: (442-443): Inferred type: 'bv:(type, P1)
-// Info 4164: (449-453): Inferred type: T('bv:(type, P1))
-// Info 4164: (449-450): Inferred type: tfun('bv:(type, P1), T('bv:(type, P1)))
-// Info 4164: (451-452): Inferred type: 'bv:(type, P1)
+// Info 4164: (398-405): Inferred type: 'bu:(type, P1)
+// Info 4164: (399-404): Inferred type: 'bu:(type, P1)
+// Info 4164: (402-404): Inferred type: 'bu:(type, P1)
+// Info 4164: (415-456): Inferred type: (T('bu:(type, P1)), T('bu:(type, P1))) -> T('bu:(type, P1))
+// Info 4164: (427-445): Inferred type: (T('bu:(type, P1)), T('bu:(type, P1)))
+// Info 4164: (428-435): Inferred type: T('bu:(type, P1))
+// Info 4164: (431-435): Inferred type: T('bu:(type, P1))
+// Info 4164: (431-432): Inferred type: tfun('bu:(type, P1), T('bu:(type, P1)))
+// Info 4164: (433-434): Inferred type: 'bu:(type, P1)
+// Info 4164: (437-444): Inferred type: T('bu:(type, P1))
+// Info 4164: (440-444): Inferred type: T('bu:(type, P1))
+// Info 4164: (440-441): Inferred type: tfun('bu:(type, P1), T('bu:(type, P1)))
+// Info 4164: (442-443): Inferred type: 'bu:(type, P1)
+// Info 4164: (449-453): Inferred type: T('bu:(type, P1))
+// Info 4164: (449-450): Inferred type: tfun('bu:(type, P1), T('bu:(type, P1)))
+// Info 4164: (451-452): Inferred type: 'bu:(type, P1)
 // Info 4164: (460-535): Inferred type: void
-// Info 4164: (475-482): Inferred type: 'cf:(type, P2)
-// Info 4164: (476-481): Inferred type: 'cf:(type, P2)
-// Info 4164: (479-481): Inferred type: 'cf:(type, P2)
-// Info 4164: (493-533): Inferred type: (T('cf:(type, P2)), T('cf:(type, P2))) -> bool
-// Info 4164: (504-522): Inferred type: (T('cf:(type, P2)), T('cf:(type, P2)))
-// Info 4164: (505-512): Inferred type: T('cf:(type, P2))
-// Info 4164: (508-512): Inferred type: T('cf:(type, P2))
-// Info 4164: (508-509): Inferred type: tfun('cf:(type, P2), T('cf:(type, P2)))
-// Info 4164: (510-511): Inferred type: 'cf:(type, P2)
-// Info 4164: (514-521): Inferred type: T('cf:(type, P2))
-// Info 4164: (517-521): Inferred type: T('cf:(type, P2))
-// Info 4164: (517-518): Inferred type: tfun('cf:(type, P2), T('cf:(type, P2)))
-// Info 4164: (519-520): Inferred type: 'cf:(type, P2)
+// Info 4164: (475-482): Inferred type: 'ce:(type, P2)
+// Info 4164: (476-481): Inferred type: 'ce:(type, P2)
+// Info 4164: (479-481): Inferred type: 'ce:(type, P2)
+// Info 4164: (493-533): Inferred type: (T('ce:(type, P2)), T('ce:(type, P2))) -> bool
+// Info 4164: (504-522): Inferred type: (T('ce:(type, P2)), T('ce:(type, P2)))
+// Info 4164: (505-512): Inferred type: T('ce:(type, P2))
+// Info 4164: (508-512): Inferred type: T('ce:(type, P2))
+// Info 4164: (508-509): Inferred type: tfun('ce:(type, P2), T('ce:(type, P2)))
+// Info 4164: (510-511): Inferred type: 'ce:(type, P2)
+// Info 4164: (514-521): Inferred type: T('ce:(type, P2))
+// Info 4164: (517-521): Inferred type: T('ce:(type, P2))
+// Info 4164: (517-518): Inferred type: tfun('ce:(type, P2), T('ce:(type, P2)))
+// Info 4164: (519-520): Inferred type: 'ce:(type, P2)
 // Info 4164: (526-530): Inferred type: bool
 // Info 4164: (537-618): Inferred type: void
-// Info 4164: (552-565): Inferred type: 'bj:(type, P1, P2)
-// Info 4164: (553-564): Inferred type: 'bj:(type, P1, P2)
-// Info 4164: (556-564): Inferred type: 'bj:(type, P1, P2)
-// Info 4164: (557-559): Inferred type: 'bj:(type, P1, P2)
-// Info 4164: (561-563): Inferred type: 'bj:(type, P1, P2)
-// Info 4164: (575-616): Inferred type: (T('bj:(type, P1, P2)), T('bj:(type, P1, P2))) -> T('bj:(type, P1, P2))
-// Info 4164: (587-605): Inferred type: (T('bj:(type, P1, P2)), T('bj:(type, P1, P2)))
-// Info 4164: (588-595): Inferred type: T('bj:(type, P1, P2))
-// Info 4164: (591-595): Inferred type: T('bj:(type, P1, P2))
-// Info 4164: (591-592): Inferred type: tfun('bj:(type, P1, P2), T('bj:(type, P1, P2)))
-// Info 4164: (593-594): Inferred type: 'bj:(type, P1, P2)
-// Info 4164: (597-604): Inferred type: T('bj:(type, P1, P2))
-// Info 4164: (600-604): Inferred type: T('bj:(type, P1, P2))
-// Info 4164: (600-601): Inferred type: tfun('bj:(type, P1, P2), T('bj:(type, P1, P2)))
-// Info 4164: (602-603): Inferred type: 'bj:(type, P1, P2)
-// Info 4164: (609-613): Inferred type: T('bj:(type, P1, P2))
-// Info 4164: (609-610): Inferred type: tfun('bj:(type, P1, P2), T('bj:(type, P1, P2)))
-// Info 4164: (611-612): Inferred type: 'bj:(type, P1, P2)
+// Info 4164: (552-565): Inferred type: 'bi:(type, P1, P2)
+// Info 4164: (553-564): Inferred type: 'bi:(type, P1, P2)
+// Info 4164: (556-564): Inferred type: 'bi:(type, P1, P2)
+// Info 4164: (557-559): Inferred type: 'bi:(type, P1, P2)
+// Info 4164: (561-563): Inferred type: 'bi:(type, P1, P2)
+// Info 4164: (575-616): Inferred type: (T('bi:(type, P1, P2)), T('bi:(type, P1, P2))) -> T('bi:(type, P1, P2))
+// Info 4164: (587-605): Inferred type: (T('bi:(type, P1, P2)), T('bi:(type, P1, P2)))
+// Info 4164: (588-595): Inferred type: T('bi:(type, P1, P2))
+// Info 4164: (591-595): Inferred type: T('bi:(type, P1, P2))
+// Info 4164: (591-592): Inferred type: tfun('bi:(type, P1, P2), T('bi:(type, P1, P2)))
+// Info 4164: (593-594): Inferred type: 'bi:(type, P1, P2)
+// Info 4164: (597-604): Inferred type: T('bi:(type, P1, P2))
+// Info 4164: (600-604): Inferred type: T('bi:(type, P1, P2))
+// Info 4164: (600-601): Inferred type: tfun('bi:(type, P1, P2), T('bi:(type, P1, P2)))
+// Info 4164: (602-603): Inferred type: 'bi:(type, P1, P2)
+// Info 4164: (609-613): Inferred type: T('bi:(type, P1, P2))
+// Info 4164: (609-610): Inferred type: tfun('bi:(type, P1, P2), T('bi:(type, P1, P2)))
+// Info 4164: (611-612): Inferred type: 'bi:(type, P1, P2)
 // Info 4164: (620-748): Inferred type: (T(int), T(str)) -> ()
 // Info 4164: (632-662): Inferred type: (T(int), T(str))
 // Info 4164: (633-646): Inferred type: T(int)

From 7bf8ff29328de69a443d6e5e90459001f188cfce Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 5 Feb 2024 13:51:40 +0100
Subject: [PATCH 1741/1748] Fix openzeppelin external test

---
 test/externalTests/zeppelin.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/externalTests/zeppelin.sh b/test/externalTests/zeppelin.sh
index 54d7533475..64e6f5f0ec 100755
--- a/test/externalTests/zeppelin.sh
+++ b/test/externalTests/zeppelin.sh
@@ -106,6 +106,10 @@ function zeppelin_test
     force_hardhat_compiler_settings "$config_file" "$(first_word "$SELECTED_PRESETS")"
     npm install
 
+    # TODO: We fix the version to 2.0.3 instead of 2.0.4 since the latter does not work with ethers.js 6.10.0
+    # Maybe related to the use of dynamic imports here: https://github.com/NomicFoundation/hardhat/commit/16ae15642951ac324ef7093a3342f7cf3a2a49a4
+    npm install @nomicfoundation/hardhat-chai-matchers@2.0.3
+
     replace_version_pragmas
 
     for preset in $SELECTED_PRESETS; do

From a3e5f3f43154382118d25a0937dec67d3b062f5a Mon Sep 17 00:00:00 2001
From: Jeason <me@cowpoke.cc>
Date: Fri, 19 Jan 2024 08:13:06 +0000
Subject: [PATCH 1742/1748] feat: add new rule name `usingAliases` for solidity
 `usingDirective`

---
 docs/grammar/SolidityParser.g4 | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docs/grammar/SolidityParser.g4 b/docs/grammar/SolidityParser.g4
index 4a756029c2..c46cefd2fa 100644
--- a/docs/grammar/SolidityParser.g4
+++ b/docs/grammar/SolidityParser.g4
@@ -337,7 +337,14 @@ userDefinableOperator:
  * Using directive to attach library functions and free functions to types.
  * Can occur within contracts and libraries and at the file level.
  */
-usingDirective: Using (identifierPath | (LBrace identifierPath (As userDefinableOperator)? (Comma identifierPath (As userDefinableOperator)?)* RBrace)) For (Mul | typeName) Global? Semicolon;
+usingDirective:
+  Using (
+    identifierPath
+    | (LBrace usingAliases (Comma usingAliases)* RBrace)
+  ) For (Mul | typeName) Global? Semicolon;
+
+usingAliases: identifierPath (As userDefinableOperator)?;
+
 /**
  * A type name can be an elementary type, a function type, a mapping type, a user-defined type
  * (e.g. a contract or struct) or an array type.

From c7db606144fd426d561196f6e38006073cfb18dc Mon Sep 17 00:00:00 2001
From: pgebal <pawel.gebal@imapp.pl>
Date: Tue, 6 Feb 2024 11:43:42 +0100
Subject: [PATCH 1743/1748] Print a warning about function parameter names
 being used instead of values in SMTChecker (#14832)

---
 Changelog.md                                        |  1 +
 libsolidity/formal/Predicate.cpp                    | 11 +++++++++--
 test/libsolidity/smtCheckerTests/types/string_1.sol |  3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7ab13de8fe..d20c266d83 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -23,6 +23,7 @@ Language Features:
 Compiler Features:
  * EVM: Support for the EVM Version "Cancun".
  * SMTChecker: Support `bytes.concat` except when string literals are passed as arguments.
+ * SMTChecker: Print a message that function parameter name was used instead of a concrete value in a counterexample when the concrete value found by the solver is too long to print.
  * Standard JSON Interface: Add experimental support to import EVM assembly in the format used by ``--asm-json``.
  * TypeChecker: Comparison of internal function pointers now yields a warning, as it can produce unexpected results with the legacy pipeline enabled.
 
diff --git a/libsolidity/formal/Predicate.cpp b/libsolidity/formal/Predicate.cpp
index 58a5a5a3e7..01316d75ff 100644
--- a/libsolidity/formal/Predicate.cpp
+++ b/libsolidity/formal/Predicate.cpp
@@ -316,11 +316,14 @@ std::string Predicate::formatSummaryCall(
 
 	auto const& params = fun->parameters();
 	solAssert(params.size() == functionArgsCex.size(), "");
+	bool paramNameInsteadOfValue = false;
 	for (unsigned i = 0; i < params.size(); ++i)
 		if (params.at(i) && functionArgsCex.at(i))
 			functionArgs.emplace_back(*functionArgsCex.at(i));
-		else
+		else {
+			paramNameInsteadOfValue = true;
 			functionArgs.emplace_back(params[i]->name());
+		}
 
 	std::string fName = fun->isConstructor() ? "constructor" :
 		fun->isFallback() ? "fallback" :
@@ -335,7 +338,11 @@ std::string Predicate::formatSummaryCall(
 		solAssert(fun->annotation().contract, "");
 		prefix = fun->annotation().contract->name() + ".";
 	}
-	return prefix + fName + "(" + boost::algorithm::join(functionArgs, ", ") + ")" + txModel;
+
+	std::string summary = prefix + fName + "(" + boost::algorithm::join(functionArgs, ", ") + ")" + txModel;
+	if (paramNameInsteadOfValue)
+		summary += " -- counterexample incomplete; parameter name used instead of value";
+	return summary;
 }
 
 std::vector<std::optional<std::string>> Predicate::summaryStateValues(std::vector<smtutil::Expression> const& _args) const
diff --git a/test/libsolidity/smtCheckerTests/types/string_1.sol b/test/libsolidity/smtCheckerTests/types/string_1.sol
index 8209f99280..3a74a8e1ce 100644
--- a/test/libsolidity/smtCheckerTests/types/string_1.sol
+++ b/test/libsolidity/smtCheckerTests/types/string_1.sol
@@ -6,5 +6,6 @@ contract C
 }
 // ====
 // SMTEngine: all
+// SMTIgnoreCex: no
 // ----
-// Warning 6328: (77-121): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(s1, s2)
+// Warning 6328: (77-121): CHC: Assertion violation happens here.\nCounterexample:\n\n\nTransaction trace:\nC.constructor()\nC.f(s1, s2) -- counterexample incomplete; parameter name used instead of value

From 1c8072a2099e17a2467356fc862cae9b2074a3ff Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Wed, 7 Feb 2024 11:56:50 +0100
Subject: [PATCH 1744/1748] Remove dynamic byte arrays from value types section

---
 docs/types/value-types.rst | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/docs/types/value-types.rst b/docs/types/value-types.rst
index d44d2fd70a..12fcb0b171 100644
--- a/docs/types/value-types.rst
+++ b/docs/types/value-types.rst
@@ -415,14 +415,6 @@ Members:
 .. note::
     Prior to version 0.8.0, ``byte`` used to be an alias for ``bytes1``.
 
-Dynamically-sized byte array
-----------------------------
-
-``bytes``:
-    Dynamically-sized byte array, see :ref:`arrays`. Not a value-type!
-``string``:
-    Dynamically-sized UTF-8-encoded string, see :ref:`arrays`. Not a value-type!
-
 .. index:: address, ! literal;address
 
 .. _address_literals:

From 71a05dfe538c980c8987a5cdb04b273d6f0d755c Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Thu, 11 Jan 2024 13:04:52 +0100
Subject: [PATCH 1745/1748] Purge using namespace std from test/yulPhaser

---
 scripts/check_style.sh               |   1 +
 test/yulPhaser/AlgorithmRunner.cpp   | 125 ++++++++++++------------
 test/yulPhaser/Chromosome.cpp        |  19 ++--
 test/yulPhaser/Common.cpp            |  25 +++--
 test/yulPhaser/FitnessMetrics.cpp    |  35 ++++---
 test/yulPhaser/GeneticAlgorithms.cpp |  83 ++++++++--------
 test/yulPhaser/Mutations.cpp         | 139 +++++++++++++--------------
 test/yulPhaser/PairSelections.cpp    |  52 +++++-----
 test/yulPhaser/Phaser.cpp            |  85 ++++++++--------
 test/yulPhaser/Population.cpp        |  51 +++++-----
 test/yulPhaser/Program.cpp           |  75 +++++++--------
 test/yulPhaser/ProgramCache.cpp      |  39 ++++----
 test/yulPhaser/Selections.cpp        |  93 +++++++++---------
 test/yulPhaser/SimulationRNG.cpp     |  44 ++++-----
 test/yulPhaser/TestHelpers.cpp       |  27 +++---
 test/yulPhaser/TestHelpersTest.cpp   |  19 ++--
 16 files changed, 448 insertions(+), 464 deletions(-)

diff --git a/scripts/check_style.sh b/scripts/check_style.sh
index 7bcd8cca36..fe4d19734f 100755
--- a/scripts/check_style.sh
+++ b/scripts/check_style.sh
@@ -50,6 +50,7 @@ NAMESPACE_STD_FREE_FILES=(
     test/libyul/*
     test/solc/*
     test/tools/yulInterpreter/*
+    test/yulPhaser/*
 )
 
 (
diff --git a/test/yulPhaser/AlgorithmRunner.cpp b/test/yulPhaser/AlgorithmRunner.cpp
index 003403929e..56868f1ce7 100644
--- a/test/yulPhaser/AlgorithmRunner.cpp
+++ b/test/yulPhaser/AlgorithmRunner.cpp
@@ -35,7 +35,6 @@
 #include <regex>
 #include <sstream>
 
-using namespace std;
 using namespace boost::unit_test::framework;
 using namespace boost::test_tools;
 using namespace solidity::langutil;
@@ -74,44 +73,44 @@ class AlgorithmRunnerFixture
 {
 protected:
 	// NOTE: Regexes here should not contain spaces because we strip them before matching
-	regex RoundSummaryRegex{R"(-+ROUND\d+\[round:[0-9.]+s,total:[0-9.]+s\]-+)"};
-	regex InitialPopulationHeaderRegex{"-+INITIALPOPULATION-+"};
+	std::regex RoundSummaryRegex{R"(-+ROUND\d+\[round:[0-9.]+s,total:[0-9.]+s\]-+)"};
+	std::regex InitialPopulationHeaderRegex{"-+INITIALPOPULATION-+"};
 
-	string individualPattern(Individual const& individual) const
+	std::string individualPattern(Individual const& individual) const
 	{
-		ostringstream output;
+		std::ostringstream output;
 		output << individual.fitness << individual.chromosome;
 		return output.str();
 	}
 
-	string topChromosomePattern(size_t roundNumber, Individual const& individual) const
+	std::string topChromosomePattern(size_t roundNumber, Individual const& individual) const
 	{
-		ostringstream output;
+		std::ostringstream output;
 		output << roundNumber << R"(\|[0-9.]+\|)" << individualPattern(individual);
 		return output.str();
 	}
 
-	bool nextLineMatches(stringstream& stream, regex const& pattern) const
+	bool nextLineMatches(std::stringstream& stream, std::regex const& pattern) const
 	{
-		string line;
-		if (getline(stream, line).fail())
+		std::string line;
+		if (std::getline(stream, line).fail())
 			return false;
 
-		return regex_match(stripWhitespace(line), pattern);
+		return std::regex_match(stripWhitespace(line), pattern);
 	}
 
-	shared_ptr<FitnessMetric> m_fitnessMetric = make_shared<ChromosomeLengthMetric>();
+	std::shared_ptr<FitnessMetric> m_fitnessMetric = std::make_shared<ChromosomeLengthMetric>();
 	Population const m_population = Population::makeRandom(m_fitnessMetric, 5, 0, 20);
-	stringstream m_output;
+	std::stringstream m_output;
 	AlgorithmRunner::Options m_options;
 };
 
 class AlgorithmRunnerAutosaveFixture: public AlgorithmRunnerFixture
 {
 public:
-	static vector<string> chromosomeStrings(Population const& _population)
+	static std::vector<std::string> chromosomeStrings(Population const& _population)
 	{
-		vector<string> lines;
+		std::vector<std::string> lines;
 		for (auto const& individual: _population.individuals())
 			lines.push_back(toString(individual.chromosome));
 
@@ -120,7 +119,7 @@ class AlgorithmRunnerAutosaveFixture: public AlgorithmRunnerFixture
 
 protected:
 	TemporaryDirectory m_tempDir;
-	string const m_autosavePath = (m_tempDir.path() / "population-autosave.txt").string();
+	std::string const m_autosavePath = (m_tempDir.path() / "population-autosave.txt").string();
 	RandomisingAlgorithm m_algorithm;
 };
 
@@ -153,12 +152,12 @@ BOOST_FIXTURE_TEST_CASE(run_should_print_round_summary_after_each_round, Algorit
 	runner.run(algorithm);
 	BOOST_TEST(nextLineMatches(m_output, RoundSummaryRegex));
 	for (auto const& individual: runner.population().individuals())
-		BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(individual))));
+		BOOST_TEST(nextLineMatches(m_output, std::regex(individualPattern(individual))));
 
 	runner.run(algorithm);
 	BOOST_TEST(nextLineMatches(m_output, RoundSummaryRegex));
 	for (auto const& individual: runner.population().individuals())
-		BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(individual))));
+		BOOST_TEST(nextLineMatches(m_output, std::regex(individualPattern(individual))));
 	BOOST_TEST(m_output.peek() == EOF);
 }
 
@@ -172,9 +171,9 @@ BOOST_FIXTURE_TEST_CASE(run_should_not_print_round_summary_if_not_requested, Alg
 	RandomisingAlgorithm algorithm;
 
 	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, regex("")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex("")));
 	for (auto const& individual: runner.population().individuals())
-		BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(individual))));
+		BOOST_TEST(nextLineMatches(m_output, std::regex(individualPattern(individual))));
 	BOOST_TEST(m_output.peek() == EOF);
 }
 
@@ -202,7 +201,7 @@ BOOST_FIXTURE_TEST_CASE(run_should_print_only_top_chromosome_if_requested, Algor
 	RandomisingAlgorithm algorithm;
 
 	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, regex(topChromosomePattern(1, runner.population().individuals()[0]))));
+	BOOST_TEST(nextLineMatches(m_output, std::regex(topChromosomePattern(1, runner.population().individuals()[0]))));
 	BOOST_TEST(m_output.peek() == EOF);
 }
 
@@ -216,7 +215,7 @@ BOOST_FIXTURE_TEST_CASE(run_should_not_print_round_number_for_top_chromosome_if_
 	RandomisingAlgorithm algorithm;
 
 	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(runner.population().individuals()[0]))));
+	BOOST_TEST(nextLineMatches(m_output, std::regex(individualPattern(runner.population().individuals()[0]))));
 	BOOST_TEST(m_output.peek() == EOF);
 }
 
@@ -246,7 +245,7 @@ BOOST_FIXTURE_TEST_CASE(run_should_print_initial_population_if_requested, Algori
 
 	BOOST_TEST(nextLineMatches(m_output, InitialPopulationHeaderRegex));
 	for (auto const& individual: m_population.individuals())
-		BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(individual))));
+		BOOST_TEST(nextLineMatches(m_output, std::regex(individualPattern(individual))));
 	BOOST_TEST(m_output.peek() == EOF);
 }
 
@@ -277,7 +276,7 @@ BOOST_FIXTURE_TEST_CASE(run_should_print_whole_initial_population_even_if_only_t
 
 	BOOST_TEST(nextLineMatches(m_output, InitialPopulationHeaderRegex));
 	for (auto const& individual: m_population.individuals())
-		BOOST_TEST(nextLineMatches(m_output, regex(individualPattern(individual))));
+		BOOST_TEST(nextLineMatches(m_output, std::regex(individualPattern(individual))));
 	BOOST_TEST(m_output.peek() == EOF);
 }
 
@@ -290,21 +289,21 @@ BOOST_FIXTURE_TEST_CASE(run_should_print_cache_stats_if_requested, AlgorithmRunn
 	m_options.showCacheStats = true;
 	RandomisingAlgorithm algorithm;
 
-	vector<CharStream> sourceStreams = {
+	std::vector<CharStream> sourceStreams = {
 		CharStream("{mstore(10, 20)}", ""),
 		CharStream("{mstore(10, 20)\nsstore(10, 20)}", ""),
 	};
-	vector<Program> programs = {
+	std::vector<Program> programs = {
 		get<Program>(Program::load(sourceStreams[0])),
 		get<Program>(Program::load(sourceStreams[1])),
 	};
-	vector<shared_ptr<ProgramCache>> caches = {
-		make_shared<ProgramCache>(programs[0]),
-		make_shared<ProgramCache>(programs[1]),
+	std::vector<std::shared_ptr<ProgramCache>> caches = {
+			std::make_shared<ProgramCache>(programs[0]),
+			std::make_shared<ProgramCache>(programs[1]),
 	};
-	shared_ptr<FitnessMetric> fitnessMetric = make_shared<FitnessMetricAverage>(vector<shared_ptr<FitnessMetric>>{
-		make_shared<ProgramSize>(nullopt, caches[0], CodeWeights{}),
-		make_shared<ProgramSize>(nullopt, caches[1], CodeWeights{}),
+	std::shared_ptr<FitnessMetric> fitnessMetric = std::make_shared<FitnessMetricAverage>(std::vector<std::shared_ptr<FitnessMetric>>{
+		std::make_shared<ProgramSize>(std::nullopt, caches[0], CodeWeights{}),
+		std::make_shared<ProgramSize>(std::nullopt, caches[1], CodeWeights{}),
 	});
 	Population population = Population::makeRandom(fitnessMetric, 2, 0, 5);
 
@@ -318,14 +317,14 @@ BOOST_FIXTURE_TEST_CASE(run_should_print_cache_stats_if_requested, AlgorithmRunn
 
 	for (size_t i = 0; i < m_options.maxRounds.value() - 1; ++i)
 	{
-		BOOST_TEST(nextLineMatches(m_output, regex(".*")));
-		BOOST_TEST(nextLineMatches(m_output, regex("-+CACHESTATS-+")));
+		BOOST_TEST(nextLineMatches(m_output, std::regex(".*")));
+		BOOST_TEST(nextLineMatches(m_output, std::regex("-+CACHESTATS-+")));
 		if (i > 0)
-			BOOST_TEST(nextLineMatches(m_output, regex(R"(Round\d+:\d+entries)")));
-		BOOST_TEST(nextLineMatches(m_output, regex(R"(Round\d+:\d+entries)")));
-		BOOST_TEST(nextLineMatches(m_output, regex(R"(Totalhits:\d+)")));
-		BOOST_TEST(nextLineMatches(m_output, regex(R"(Totalmisses:\d+)")));
-		BOOST_TEST(nextLineMatches(m_output, regex(R"(Sizeofcachedcode:\d+)")));
+			BOOST_TEST(nextLineMatches(m_output, std::regex(R"(Round\d+:\d+entries)")));
+		BOOST_TEST(nextLineMatches(m_output, std::regex(R"(Round\d+:\d+entries)")));
+		BOOST_TEST(nextLineMatches(m_output, std::regex(R"(Totalhits:\d+)")));
+		BOOST_TEST(nextLineMatches(m_output, std::regex(R"(Totalmisses:\d+)")));
+		BOOST_TEST(nextLineMatches(m_output, std::regex(R"(Sizeofcachedcode:\d+)")));
 	}
 
 	BOOST_REQUIRE(stats.roundEntryCounts.size() == 2);
@@ -333,13 +332,13 @@ BOOST_FIXTURE_TEST_CASE(run_should_print_cache_stats_if_requested, AlgorithmRunn
 	BOOST_REQUIRE(stats.roundEntryCounts.count(m_options.maxRounds.value()) == 1);
 
 	size_t round = m_options.maxRounds.value();
-	BOOST_TEST(nextLineMatches(m_output, regex(".*")));
-	BOOST_TEST(nextLineMatches(m_output, regex("-+CACHESTATS-+")));
-	BOOST_TEST(nextLineMatches(m_output, regex("Round" + toString(round - 1) + ":" + toString(stats.roundEntryCounts[round - 1]) + "entries")));
-	BOOST_TEST(nextLineMatches(m_output, regex("Round" + toString(round) + ":" + toString(stats.roundEntryCounts[round]) + "entries")));
-	BOOST_TEST(nextLineMatches(m_output, regex("Totalhits:" + toString(stats.hits))));
-	BOOST_TEST(nextLineMatches(m_output, regex("Totalmisses:" + toString(stats.misses))));
-	BOOST_TEST(nextLineMatches(m_output, regex("Sizeofcachedcode:" + toString(stats.totalCodeSize))));
+	BOOST_TEST(nextLineMatches(m_output, std::regex(".*")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex("-+CACHESTATS-+")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex("Round" + toString(round - 1) + ":" + toString(stats.roundEntryCounts[round - 1]) + "entries")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex("Round" + toString(round) + ":" + toString(stats.roundEntryCounts[round]) + "entries")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex("Totalhits:" + toString(stats.hits))));
+	BOOST_TEST(nextLineMatches(m_output, std::regex("Totalmisses:" + toString(stats.misses))));
+	BOOST_TEST(nextLineMatches(m_output, std::regex("Sizeofcachedcode:" + toString(stats.totalCodeSize))));
 	BOOST_TEST(m_output.peek() == EOF);
 }
 
@@ -355,9 +354,9 @@ BOOST_FIXTURE_TEST_CASE(run_should_print_message_if_cache_stats_requested_but_ca
 	AlgorithmRunner runner(m_population, {nullptr}, m_options, m_output);
 	runner.run(algorithm);
 
-	BOOST_TEST(nextLineMatches(m_output, regex(".*")));
-	BOOST_TEST(nextLineMatches(m_output, regex("-+CACHESTATS-+")));
-	BOOST_TEST(nextLineMatches(m_output, regex(stripWhitespace("Program cache disabled"))));
+	BOOST_TEST(nextLineMatches(m_output, std::regex(".*")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex("-+CACHESTATS-+")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex(stripWhitespace("Program cache disabled"))));
 	BOOST_TEST(m_output.peek() == EOF);
 }
 
@@ -371,18 +370,18 @@ BOOST_FIXTURE_TEST_CASE(run_should_print_partial_stats_and_message_if_some_cache
 	RandomisingAlgorithm algorithm;
 
 	CharStream sourceStream = CharStream("{}", "");
-	shared_ptr<ProgramCache> cache = make_shared<ProgramCache>(get<Program>(Program::load(sourceStream)));
+	std::shared_ptr<ProgramCache> cache = std::make_shared<ProgramCache>(std::get<Program>(Program::load(sourceStream)));
 
 	AlgorithmRunner runner(m_population, {cache, nullptr}, m_options, m_output);
 	BOOST_REQUIRE(cache->gatherStats().roundEntryCounts.size() == 0);
 
 	runner.run(algorithm);
-	BOOST_TEST(nextLineMatches(m_output, regex(".*")));
-	BOOST_TEST(nextLineMatches(m_output, regex("-+CACHESTATS-+")));
-	BOOST_TEST(nextLineMatches(m_output, regex(R"(Totalhits:\d+)")));
-	BOOST_TEST(nextLineMatches(m_output, regex(R"(Totalmisses:\d+)")));
-	BOOST_TEST(nextLineMatches(m_output, regex(R"(Sizeofcachedcode:\d+)")));
-	BOOST_TEST(nextLineMatches(m_output, regex(stripWhitespace("Program cache disabled for 1 out of 2 programs"))));
+	BOOST_TEST(nextLineMatches(m_output, std::regex(".*")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex("-+CACHESTATS-+")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex(R"(Totalhits:\d+)")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex(R"(Totalmisses:\d+)")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex(R"(Sizeofcachedcode:\d+)")));
+	BOOST_TEST(nextLineMatches(m_output, std::regex(stripWhitespace("Program cache disabled for 1 out of 2 programs"))));
 	BOOST_TEST(m_output.peek() == EOF);
 }
 
@@ -421,10 +420,10 @@ BOOST_FIXTURE_TEST_CASE(run_should_overwrite_existing_file_if_autosave_file_spec
 	AlgorithmRunner runner(m_population, {}, m_options, m_output);
 	assert(!fs::exists(m_autosavePath));
 
-	vector<string> originalContent = {"Original content"};
+	std::vector<std::string> originalContent = {"Original content"};
 	{
-		ofstream tmpFile(m_autosavePath);
-		tmpFile << originalContent[0] << endl;
+		std::ofstream tmpFile(m_autosavePath);
+		tmpFile << originalContent[0] << std::endl;
 	}
 	assert(fs::exists(m_autosavePath));
 	assert(readLinesFromFile(m_autosavePath) == originalContent);
@@ -438,7 +437,7 @@ BOOST_FIXTURE_TEST_CASE(run_should_overwrite_existing_file_if_autosave_file_spec
 BOOST_FIXTURE_TEST_CASE(run_should_not_save_population_to_file_if_autosave_file_not_specified, AlgorithmRunnerAutosaveFixture)
 {
 	m_options.maxRounds = 5;
-	m_options.populationAutosaveFile = nullopt;
+	m_options.populationAutosaveFile = std::nullopt;
 	AlgorithmRunner runner(m_population, {}, m_options, m_output);
 	assert(!fs::exists(m_autosavePath));
 
@@ -499,9 +498,9 @@ BOOST_FIXTURE_TEST_CASE(run_should_not_randomise_duplicate_chromosomes_if_not_re
 BOOST_FIXTURE_TEST_CASE(run_should_clear_cache_at_the_beginning_and_update_it_before_each_round, AlgorithmRunnerFixture)
 {
 	CharStream sourceStream = CharStream("{}", current_test_case().p_name);
-	vector<shared_ptr<ProgramCache>> caches = {
-		make_shared<ProgramCache>(get<Program>(Program::load(sourceStream))),
-		make_shared<ProgramCache>(get<Program>(Program::load(sourceStream))),
+	std::vector<std::shared_ptr<ProgramCache>> caches = {
+		std::make_shared<ProgramCache>(std::get<Program>(Program::load(sourceStream))),
+		std::make_shared<ProgramCache>(std::get<Program>(Program::load(sourceStream))),
 	};
 
 	m_options.maxRounds = 10;
diff --git a/test/yulPhaser/Chromosome.cpp b/test/yulPhaser/Chromosome.cpp
index 1d12bf18c1..da109086a9 100644
--- a/test/yulPhaser/Chromosome.cpp
+++ b/test/yulPhaser/Chromosome.cpp
@@ -40,14 +40,13 @@
 
 #include <boost/test/unit_test.hpp>
 
-using namespace std;
 using namespace solidity::yul;
 using namespace solidity::util;
 
 namespace solidity::phaser::test
 {
 
-vector<string> const ChrOmOsoMeSteps{
+std::vector<std::string> const ChrOmOsoMeSteps{
 	ConditionalSimplifier::name,
 	FunctionHoister::name,
 	UnusedAssignEliminator::name,
@@ -76,10 +75,10 @@ BOOST_AUTO_TEST_CASE(makeRandom_should_use_every_possible_step_with_the_same_pro
 	constexpr int samplesPerStep = 500;
 	constexpr double relativeTolerance = 0.02;
 
-	map<string, size_t> stepIndices = enumerateOptmisationSteps();
+	std::map<std::string, size_t> stepIndices = enumerateOptmisationSteps();
 	auto chromosome = Chromosome::makeRandom(stepIndices.size() * samplesPerStep);
 
-	vector<size_t> samples;
+	std::vector<size_t> samples;
 	for (auto& step: chromosome.optimisationSteps())
 		samples.push_back(stepIndices.at(step));
 
@@ -97,7 +96,7 @@ BOOST_AUTO_TEST_CASE(constructor_should_store_genes)
 
 BOOST_AUTO_TEST_CASE(constructor_should_store_optimisation_steps)
 {
-	vector<string> steps = {
+	std::vector<std::string> steps = {
 		StructuralSimplifier::name,
 		BlockFlattener::name,
 		UnusedPruner::name,
@@ -108,7 +107,7 @@ BOOST_AUTO_TEST_CASE(constructor_should_store_optimisation_steps)
 
 BOOST_AUTO_TEST_CASE(constructor_should_allow_duplicate_steps)
 {
-	vector<string> steps = {
+	std::vector<std::string> steps = {
 		StructuralSimplifier::name,
 		StructuralSimplifier::name,
 		BlockFlattener::name,
@@ -131,7 +130,7 @@ BOOST_AUTO_TEST_CASE(constructor_should_allow_genes_that_do_not_correspond_to_an
 
 BOOST_AUTO_TEST_CASE(output_operator_should_create_concise_and_unambiguous_string_representation)
 {
-	vector<string> allSteps;
+	std::vector<std::string> allSteps;
 	for (auto const& step: OptimiserSuite::allSteps())
 		allSteps.push_back(step.first);
 	Chromosome chromosome(allSteps);
@@ -152,8 +151,8 @@ BOOST_AUTO_TEST_CASE(randomOptimisationStep_should_return_each_step_with_same_pr
 	constexpr int samplesPerStep = 500;
 	constexpr double relativeTolerance = 0.02;
 
-	map<string, size_t> stepIndices = enumerateOptmisationSteps();
-	vector<size_t> samples;
+	std::map<std::string, size_t> stepIndices = enumerateOptmisationSteps();
+	std::vector<size_t> samples;
 	for (size_t i = 0; i <= stepIndices.size() * samplesPerStep; ++i)
 		samples.push_back(stepIndices.at(Chromosome::randomOptimisationStep()));
 
@@ -172,7 +171,7 @@ BOOST_AUTO_TEST_CASE(stepsToGenes_should_translate_optimisation_step_names_to_ab
 
 BOOST_AUTO_TEST_CASE(genesToSteps_should_translate_optimisation_step_abbreviations_to_names)
 {
-	BOOST_TEST(Chromosome::genesToSteps("") == vector<string>{});
+	BOOST_TEST(Chromosome::genesToSteps("") == std::vector<std::string>{});
 	BOOST_TEST(Chromosome::genesToSteps("ChrOmOsoMe") == ChrOmOsoMeSteps);
 }
 
diff --git a/test/yulPhaser/Common.cpp b/test/yulPhaser/Common.cpp
index 7347384835..c4842045fa 100644
--- a/test/yulPhaser/Common.cpp
+++ b/test/yulPhaser/Common.cpp
@@ -30,7 +30,6 @@
 #include <sstream>
 #include <string>
 
-using namespace std;
 using namespace boost::test_tools;
 using namespace solidity::util;
 
@@ -56,7 +55,7 @@ enum class TestEnum
 	GH,
 };
 
-map<TestEnum, string> const TestEnumToStringMap =
+std::map<TestEnum, std::string> const TestEnumToStringMap =
 {
 	{TestEnum::A, "a"},
 	{TestEnum::B, "b"},
@@ -64,7 +63,7 @@ map<TestEnum, string> const TestEnumToStringMap =
 	{TestEnum::CD, "c-d"},
 	{TestEnum::EF, "e f"},
 };
-map<string, TestEnum> const StringToTestEnumMap = invertMap(TestEnumToStringMap);
+std::map<std::string, TestEnum> const StringToTestEnumMap = invertMap(TestEnumToStringMap);
 
 }
 
@@ -74,29 +73,29 @@ BOOST_AUTO_TEST_SUITE(CommonTest)
 BOOST_FIXTURE_TEST_CASE(readLinesFromFile_should_return_all_lines_from_a_text_file_as_strings_without_newlines, ReadLinesFromFileFixture)
 {
 	{
-		ofstream tmpFile((m_tempDir.path() / "test-file.txt").string());
-		tmpFile << endl << "Line 1" << endl << endl << endl << "Line 2" << endl << "#" << endl << endl;
+		std::ofstream tmpFile((m_tempDir.path() / "test-file.txt").string());
+		tmpFile << std::endl << "Line 1" << std::endl << std::endl << std::endl << "Line 2" << std::endl << "#" << std::endl << std::endl;
 	}
 
-	vector<string> lines = readLinesFromFile((m_tempDir.path() / "test-file.txt").string());
-	BOOST_TEST((lines == vector<string>{"", "Line 1", "", "", "Line 2", "#", ""}));
+	std::vector<std::string> lines = readLinesFromFile((m_tempDir.path() / "test-file.txt").string());
+	BOOST_TEST((lines == std::vector<std::string>{"", "Line 1", "", "", "Line 2", "#", ""}));
 }
 
 BOOST_AUTO_TEST_CASE(deserializeChoice_should_convert_string_to_enum)
 {
-	istringstream aStream("a");
+	std::istringstream aStream("a");
 	TestEnum aResult;
 	deserializeChoice(aStream, aResult, StringToTestEnumMap);
 	BOOST_CHECK(aResult == TestEnum::A);
 	BOOST_TEST(!aStream.fail());
 
-	istringstream bStream("b");
+	std::istringstream bStream("b");
 	TestEnum bResult;
 	deserializeChoice(bStream, bResult, StringToTestEnumMap);
 	BOOST_CHECK(bResult == TestEnum::B);
 	BOOST_TEST(!bStream.fail());
 
-	istringstream cdStream("c-d");
+	std::istringstream cdStream("c-d");
 	TestEnum cdResult;
 	deserializeChoice(cdStream, cdResult, StringToTestEnumMap);
 	BOOST_CHECK(cdResult == TestEnum::CD);
@@ -105,7 +104,7 @@ BOOST_AUTO_TEST_CASE(deserializeChoice_should_convert_string_to_enum)
 
 BOOST_AUTO_TEST_CASE(deserializeChoice_should_set_failbit_if_there_is_no_enum_corresponding_to_string)
 {
-	istringstream xyzStream("xyz");
+	std::istringstream xyzStream("xyz");
 	TestEnum xyzResult;
 	deserializeChoice(xyzStream, xyzResult, StringToTestEnumMap);
 	BOOST_TEST(xyzStream.fail());
@@ -113,13 +112,13 @@ BOOST_AUTO_TEST_CASE(deserializeChoice_should_set_failbit_if_there_is_no_enum_co
 
 BOOST_AUTO_TEST_CASE(deserializeChoice_does_not_have_to_support_strings_with_spaces)
 {
-	istringstream abStream("a b");
+	std::istringstream abStream("a b");
 	TestEnum abResult;
 	deserializeChoice(abStream, abResult, StringToTestEnumMap);
 	BOOST_CHECK(abResult == TestEnum::A);
 	BOOST_TEST(!abStream.fail());
 
-	istringstream efStream("e f");
+	std::istringstream efStream("e f");
 	TestEnum efResult;
 	deserializeChoice(efStream, efResult, StringToTestEnumMap);
 	BOOST_TEST(efStream.fail());
diff --git a/test/yulPhaser/FitnessMetrics.cpp b/test/yulPhaser/FitnessMetrics.cpp
index bde15a537f..7fab2e1893 100644
--- a/test/yulPhaser/FitnessMetrics.cpp
+++ b/test/yulPhaser/FitnessMetrics.cpp
@@ -29,7 +29,6 @@
 
 #include <cmath>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::util;
 using namespace solidity::yul;
@@ -74,22 +73,22 @@ class ProgramBasedMetricFixture
 	}
 
 	CharStream m_sourceStream = CharStream(SampleSourceCode, "");
-	Chromosome m_chromosome{vector<string>{UnusedPruner::name, EquivalentFunctionCombiner::name}};
-	Program m_program = get<Program>(Program::load(m_sourceStream));
+	Chromosome m_chromosome{std::vector<std::string>{UnusedPruner::name, EquivalentFunctionCombiner::name}};
+	Program m_program = std::get<Program>(Program::load(m_sourceStream));
 	Program m_optimisedProgram = optimisedProgram(m_program);
-	shared_ptr<ProgramCache> m_programCache = make_shared<ProgramCache>(m_program);
+	std::shared_ptr<ProgramCache> m_programCache = std::make_shared<ProgramCache>(m_program);
 	static constexpr CodeWeights m_weights{};
 };
 
 class FitnessMetricCombinationFixture: public ProgramBasedMetricFixture
 {
 protected:
-	vector<shared_ptr<FitnessMetric>> m_simpleMetrics = {
-		make_shared<ProgramSize>(m_program, nullptr, m_weights, 1),
-		make_shared<ProgramSize>(m_program, nullptr, m_weights, 2),
-		make_shared<ProgramSize>(m_program, nullptr, m_weights, 3),
+	std::vector<std::shared_ptr<FitnessMetric>> m_simpleMetrics = {
+		std::make_shared<ProgramSize>(m_program, nullptr, m_weights, 1),
+		std::make_shared<ProgramSize>(m_program, nullptr, m_weights, 2),
+		std::make_shared<ProgramSize>(m_program, nullptr, m_weights, 3),
 	};
-	vector<size_t> m_fitness = {
+	std::vector<size_t> m_fitness = {
 		m_simpleMetrics[0]->evaluate(m_chromosome),
 		m_simpleMetrics[1]->evaluate(m_chromosome),
 		m_simpleMetrics[2]->evaluate(m_chromosome),
@@ -102,7 +101,7 @@ BOOST_AUTO_TEST_SUITE(ProgramBasedMetricTest)
 
 BOOST_FIXTURE_TEST_CASE(optimisedProgram_should_return_optimised_program_even_if_cache_not_available, ProgramBasedMetricFixture)
 {
-	string code = toString(DummyProgramBasedMetric(m_program, nullptr, m_weights).optimisedProgram(m_chromosome));
+	std::string code = toString(DummyProgramBasedMetric(m_program, nullptr, m_weights).optimisedProgram(m_chromosome));
 
 	BOOST_TEST(code != toString(m_program));
 	BOOST_TEST(code == toString(m_optimisedProgram));
@@ -110,7 +109,7 @@ BOOST_FIXTURE_TEST_CASE(optimisedProgram_should_return_optimised_program_even_if
 
 BOOST_FIXTURE_TEST_CASE(optimisedProgram_should_use_cache_if_available, ProgramBasedMetricFixture)
 {
-	string code = toString(DummyProgramBasedMetric(nullopt, m_programCache, m_weights).optimisedProgram(m_chromosome));
+	std::string code = toString(DummyProgramBasedMetric(std::nullopt, m_programCache, m_weights).optimisedProgram(m_chromosome));
 
 	BOOST_TEST(code != toString(m_program));
 	BOOST_TEST(code == toString(m_optimisedProgram));
@@ -119,7 +118,7 @@ BOOST_FIXTURE_TEST_CASE(optimisedProgram_should_use_cache_if_available, ProgramB
 
 BOOST_FIXTURE_TEST_CASE(optimisedProgramNoCache_should_return_optimised_program_even_if_cache_not_available, ProgramBasedMetricFixture)
 {
-	string code = toString(DummyProgramBasedMetric(m_program, nullptr, m_weights).optimisedProgramNoCache(m_chromosome));
+	std::string code = toString(DummyProgramBasedMetric(m_program, nullptr, m_weights).optimisedProgramNoCache(m_chromosome));
 
 	BOOST_TEST(code != toString(m_program));
 	BOOST_TEST(code == toString(m_optimisedProgram));
@@ -127,7 +126,7 @@ BOOST_FIXTURE_TEST_CASE(optimisedProgramNoCache_should_return_optimised_program_
 
 BOOST_FIXTURE_TEST_CASE(optimisedProgramNoCache_should_not_use_cache_even_if_available, ProgramBasedMetricFixture)
 {
-	string code = toString(DummyProgramBasedMetric(nullopt, m_programCache, m_weights).optimisedProgramNoCache(m_chromosome));
+	std::string code = toString(DummyProgramBasedMetric(std::nullopt, m_programCache, m_weights).optimisedProgramNoCache(m_chromosome));
 
 	BOOST_TEST(code != toString(m_program));
 	BOOST_TEST(code == toString(m_optimisedProgram));
@@ -147,7 +146,7 @@ BOOST_FIXTURE_TEST_CASE(evaluate_should_compute_size_of_the_optimised_program, P
 
 BOOST_FIXTURE_TEST_CASE(evaluate_should_be_able_to_use_program_cache_if_available, ProgramBasedMetricFixture)
 {
-	size_t fitness = ProgramSize(nullopt, m_programCache, m_weights).evaluate(m_chromosome);
+	size_t fitness = ProgramSize(std::nullopt, m_programCache, m_weights).evaluate(m_chromosome);
 
 	BOOST_TEST(fitness != m_program.codeSize(m_weights));
 	BOOST_TEST(fitness == m_optimisedProgram.codeSize(m_weights));
@@ -190,7 +189,7 @@ BOOST_FIXTURE_TEST_CASE(evaluate_should_compute_the_size_ratio_between_optimised
 BOOST_FIXTURE_TEST_CASE(evaluate_should_be_able_to_use_program_cache_if_available, ProgramBasedMetricFixture)
 {
 	BOOST_TEST(
-		RelativeProgramSize(nullopt, m_programCache, 3, m_weights).evaluate(m_chromosome) ==
+		RelativeProgramSize(std::nullopt, m_programCache, 3, m_weights).evaluate(m_chromosome) ==
 		round(1000.0 * double(m_optimisedProgram.codeSize(m_weights)) / double(m_program.codeSize(m_weights)))
 	);
 	BOOST_TEST(m_programCache->size() == m_chromosome.length());
@@ -219,7 +218,7 @@ BOOST_FIXTURE_TEST_CASE(evaluate_should_return_one_if_number_of_repetitions_is_z
 BOOST_FIXTURE_TEST_CASE(evaluate_should_return_one_if_the_original_program_size_is_zero, ProgramBasedMetricFixture)
 {
 	CharStream sourceStream = CharStream("{}", "");
-	Program program = get<Program>(Program::load(sourceStream));
+	Program program = std::get<Program>(Program::load(sourceStream));
 
 	RelativeProgramSize metric(program, nullptr, 3, m_weights);
 
@@ -264,7 +263,7 @@ BOOST_FIXTURE_TEST_CASE(FitnessMetricMaximum_evaluate_should_compute_maximum_of_
 	FitnessMetricMaximum metric(m_simpleMetrics);
 
 	assert(m_simpleMetrics.size() == 3);
-	BOOST_TEST(metric.evaluate(m_chromosome) == max(m_fitness[0], max(m_fitness[1], m_fitness[2])));
+	BOOST_TEST(metric.evaluate(m_chromosome) == std::max(m_fitness[0], std::max(m_fitness[1], m_fitness[2])));
 	BOOST_TEST(metric.metrics() == m_simpleMetrics);
 }
 
@@ -273,7 +272,7 @@ BOOST_FIXTURE_TEST_CASE(FitnessMetricMinimum_evaluate_should_compute_minimum_of_
 	FitnessMetricMinimum metric(m_simpleMetrics);
 
 	assert(m_simpleMetrics.size() == 3);
-	BOOST_TEST(metric.evaluate(m_chromosome) == min(m_fitness[0], min(m_fitness[1], m_fitness[2])));
+	BOOST_TEST(metric.evaluate(m_chromosome) == std::min(m_fitness[0], std::min(m_fitness[1], m_fitness[2])));
 	BOOST_TEST(metric.metrics() == m_simpleMetrics);
 }
 
diff --git a/test/yulPhaser/GeneticAlgorithms.cpp b/test/yulPhaser/GeneticAlgorithms.cpp
index 29c9cfa2ec..c3b6613344 100644
--- a/test/yulPhaser/GeneticAlgorithms.cpp
+++ b/test/yulPhaser/GeneticAlgorithms.cpp
@@ -29,7 +29,6 @@
 #include <algorithm>
 #include <vector>
 
-using namespace std;
 using namespace boost::unit_test::framework;
 using namespace boost::test_tools;
 using namespace solidity::util;
@@ -40,7 +39,7 @@ namespace solidity::phaser::test
 class GeneticAlgorithmFixture
 {
 protected:
-	shared_ptr<FitnessMetric> m_fitnessMetric = make_shared<ChromosomeLengthMetric>();
+	std::shared_ptr<FitnessMetric> m_fitnessMetric = std::make_shared<ChromosomeLengthMetric>();
 };
 
 class ClassicGeneticAlgorithmFixture: public GeneticAlgorithmFixture
@@ -64,41 +63,41 @@ BOOST_AUTO_TEST_SUITE(RandomAlgorithmTest)
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_preserve_elite_and_randomise_rest_of_population, GeneticAlgorithmFixture)
 {
 	auto population = Population::makeRandom(m_fitnessMetric, 4, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
+	assert((chromosomeLengths(population) == std::vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
 	RandomAlgorithm algorithm({0.5, 1, 1});
 
 	Population newPopulation = algorithm.runNextRound(population);
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{1, 1, 1, 1, 3, 3, 3, 3}));
+	BOOST_TEST((chromosomeLengths(newPopulation) == std::vector<size_t>{1, 1, 1, 1, 3, 3, 3, 3}));
 }
 
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_not_replace_elite_with_worse_individuals, GeneticAlgorithmFixture)
 {
 	auto population = Population::makeRandom(m_fitnessMetric, 4, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
+	assert((chromosomeLengths(population) == std::vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
 	RandomAlgorithm algorithm({0.5, 7, 7});
 
 	Population newPopulation = algorithm.runNextRound(population);
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{3, 3, 3, 3, 7, 7, 7, 7}));
+	BOOST_TEST((chromosomeLengths(newPopulation) == std::vector<size_t>{3, 3, 3, 3, 7, 7, 7, 7}));
 }
 
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_replace_all_chromosomes_if_zero_size_elite, GeneticAlgorithmFixture)
 {
 	auto population = Population::makeRandom(m_fitnessMetric, 4, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
+	assert((chromosomeLengths(population) == std::vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
 	RandomAlgorithm algorithm({0.0, 1, 1});
 
 	Population newPopulation = algorithm.runNextRound(population);
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{1, 1, 1, 1, 1, 1, 1, 1}));
+	BOOST_TEST((chromosomeLengths(newPopulation) == std::vector<size_t>{1, 1, 1, 1, 1, 1, 1, 1}));
 }
 
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_not_replace_any_chromosomes_if_whole_population_is_the_elite, GeneticAlgorithmFixture)
 {
 	auto population = Population::makeRandom(m_fitnessMetric, 4, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
+	assert((chromosomeLengths(population) == std::vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
 	RandomAlgorithm algorithm({1.0, 1, 1});
 
 	Population newPopulation = algorithm.runNextRound(population);
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
+	BOOST_TEST((chromosomeLengths(newPopulation) == std::vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5}));
 }
 
 BOOST_AUTO_TEST_SUITE_END()
@@ -107,7 +106,7 @@ BOOST_AUTO_TEST_SUITE(GenerationalElitistWithExclusivePoolsTest)
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_preserve_elite_and_regenerate_rest_of_population, GeneticAlgorithmFixture)
 {
 	auto population = Population::makeRandom(m_fitnessMetric, 6, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 3, 3, 5, 5, 5, 5}));
+	assert((chromosomeLengths(population) == std::vector<size_t>{3, 3, 3, 3, 3, 3, 5, 5, 5, 5}));
 
 	GenerationalElitistWithExclusivePools::Options options = {
 		/* mutationPoolSize = */ 0.2,
@@ -123,13 +122,13 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_preserve_elite_and_regenerate_rest_o
 
 	Population newPopulation = algorithm.runNextRound(population);
 
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{0, 0, 3, 3, 3, 3, 3, 3, 3, 3}));
+	BOOST_TEST((chromosomeLengths(newPopulation) == std::vector<size_t>{0, 0, 3, 3, 3, 3, 3, 3, 3, 3}));
 }
 
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_not_replace_elite_with_worse_individuals, GeneticAlgorithmFixture)
 {
 	auto population = Population::makeRandom(m_fitnessMetric, 6, 3, 3) + Population::makeRandom(m_fitnessMetric, 4, 5, 5);
-	assert(chromosomeLengths(population) == (vector<size_t>{3, 3, 3, 3, 3, 3, 5, 5, 5, 5}));
+	assert(chromosomeLengths(population) == (std::vector<size_t>{3, 3, 3, 3, 3, 3, 5, 5, 5, 5}));
 
 	GenerationalElitistWithExclusivePools::Options options = {
 		/* mutationPoolSize = */ 0.2,
@@ -145,7 +144,7 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_not_replace_elite_with_worse_individ
 
 	Population newPopulation = algorithm.runNextRound(population);
 
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{3, 3, 3, 3, 3, 3, 3, 3, 7, 7}));
+	BOOST_TEST((chromosomeLengths(newPopulation) == std::vector<size_t>{3, 3, 3, 3, 3, 3, 3, 3, 7, 7}));
 }
 
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_generate_individuals_in_the_crossover_pool_by_mutating_the_elite, GeneticAlgorithmFixture)
@@ -169,7 +168,7 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_generate_individuals_in_the_crossove
 
 	BOOST_TEST((
 		chromosomeLengths(newPopulation) ==
-		vector<size_t>{0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 11, 11, 11}
+		std::vector<size_t>{0, 0, 0, 0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 11, 11, 11}
 	));
 }
 
@@ -179,7 +178,7 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_generate_individuals_in_the_crossove
 		Population(m_fitnessMetric, {Chromosome("aa"), Chromosome("ff")}) +
 		Population::makeRandom(m_fitnessMetric, 8, 6, 6)
 	);
-	assert((chromosomeLengths(population) == vector<size_t>{2, 2, 6, 6, 6, 6, 6, 6, 6, 6}));
+	assert((chromosomeLengths(population) == std::vector<size_t>{2, 2, 6, 6, 6, 6, 6, 6, 6, 6}));
 
 	GenerationalElitistWithExclusivePools::Options options = {
 		/* mutationPoolSize = */ 0.0,
@@ -196,8 +195,8 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_generate_individuals_in_the_crossove
 	SimulationRNG::reset(1);
 	Population newPopulation = algorithm.runNextRound(population);
 
-	vector<Individual> const& newIndividuals = newPopulation.individuals();
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{2, 2, 2, 2, 2, 2, 2, 2, 2, 2}));
+	std::vector<Individual> const& newIndividuals = newPopulation.individuals();
+	BOOST_TEST((chromosomeLengths(newPopulation) == std::vector<size_t>{2, 2, 2, 2, 2, 2, 2, 2, 2, 2}));
 	for (auto& individual: newIndividuals)
 		BOOST_TEST((
 			individual.chromosome == Chromosome("aa") ||
@@ -228,7 +227,7 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_select_individuals_with_probability_
 		Population::makeRandom(m_fitnessMetric, populationSize / 4, 2, 2) +
 		Population::makeRandom(m_fitnessMetric, populationSize / 4, 3, 3);
 
-	map<size_t, double> expectedProbabilities = {
+	std::map<size_t, double> expectedProbabilities = {
 		{0, 4.0 / (4 + 3 + 2 + 1)},
 		{1, 3.0 / (4 + 3 + 2 + 1)},
 		{2, 2.0 / (4 + 3 + 2 + 1)},
@@ -252,9 +251,9 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_select_individuals_with_probability_
 
 	BOOST_TEST(newPopulation.individuals().size() == population.individuals().size());
 
-	vector<size_t> newFitness = chromosomeLengths(newPopulation);
-	BOOST_TEST(abs(mean(newFitness) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(newFitness, expectedValue) - variance) < variance * relativeTolerance);
+	std::vector<size_t> newFitness = chromosomeLengths(newPopulation);
+	BOOST_TEST(std::abs(mean(newFitness) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(newFitness, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_select_only_individuals_existing_in_the_original_population, ClassicGeneticAlgorithmFixture)
@@ -262,7 +261,7 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_select_only_individuals_existing_in_
 	constexpr size_t populationSize = 1000;
 	auto population = Population::makeRandom(m_fitnessMetric, populationSize, 1, 10);
 
-	set<string> originalSteps;
+	std::set<std::string> originalSteps;
 	for (auto const& individual: population.individuals())
 		originalSteps.insert(toString(individual.chromosome));
 
@@ -281,8 +280,8 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_crossover, ClassicGeneticAlgorith
 		Chromosome("gg"), Chromosome("gg"), Chromosome("gg"),
 	});
 
-	set<string> originalSteps{"aa", "ff", "gg"};
-	set<string> crossedSteps{"af", "fa", "fg", "gf", "ga", "ag"};
+	std::set<std::string> originalSteps{"aa", "ff", "gg"};
+	std::set<std::string> crossedSteps{"af", "fa", "fg", "gf", "ga", "ag"};
 
 	m_options.crossoverChance = 0.8;
 	ClassicGeneticAlgorithm algorithm(m_options);
@@ -312,22 +311,22 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_mutation, ClassicGeneticAlgorithm
 	double const variance = m_options.mutationChance * (1 - m_options.mutationChance);
 
 	Chromosome chromosome("aaaaaaaaaa");
-	vector<Chromosome> chromosomes(populationSize, chromosome);
+	std::vector<Chromosome> chromosomes(populationSize, chromosome);
 	Population population(m_fitnessMetric, chromosomes);
 
 	SimulationRNG::reset(1);
 	Population newPopulation = algorithm.runNextRound(population);
 
-	vector<size_t> bernoulliTrials;
+	std::vector<size_t> bernoulliTrials;
 	for (auto const& individual: newPopulation.individuals())
 	{
-		string steps = toString(individual.chromosome);
+		std::string steps = toString(individual.chromosome);
 		for (char step: steps)
 			bernoulliTrials.push_back(static_cast<size_t>(step != 'a'));
 	}
 
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_deletion, ClassicGeneticAlgorithmFixture)
@@ -341,22 +340,22 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_deletion, ClassicGeneticAlgorithm
 	double const variance = m_options.deletionChance * (1 - m_options.deletionChance);
 
 	Chromosome chromosome("aaaaaaaaaa");
-	vector<Chromosome> chromosomes(populationSize, chromosome);
+	std::vector<Chromosome> chromosomes(populationSize, chromosome);
 	Population population(m_fitnessMetric, chromosomes);
 
 	SimulationRNG::reset(1);
 	Population newPopulation = algorithm.runNextRound(population);
 
-	vector<size_t> bernoulliTrials;
+	std::vector<size_t> bernoulliTrials;
 	for (auto const& individual: newPopulation.individuals())
 	{
-		string steps = toString(individual.chromosome);
+		std::string steps = toString(individual.chromosome);
 		for (size_t i = 0; i < chromosome.length(); ++i)
 			bernoulliTrials.push_back(static_cast<size_t>(i >= steps.size()));
 	}
 
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_addition, ClassicGeneticAlgorithmFixture)
@@ -370,16 +369,16 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_addition, ClassicGeneticAlgorithm
 	double const variance = m_options.additionChance * (1 - m_options.additionChance);
 
 	Chromosome chromosome("aaaaaaaaaa");
-	vector<Chromosome> chromosomes(populationSize, chromosome);
+	std::vector<Chromosome> chromosomes(populationSize, chromosome);
 	Population population(m_fitnessMetric, chromosomes);
 
 	SimulationRNG::reset(1);
 	Population newPopulation = algorithm.runNextRound(population);
 
-	vector<size_t> bernoulliTrials;
+	std::vector<size_t> bernoulliTrials;
 	for (auto const& individual: newPopulation.individuals())
 	{
-		string steps = toString(individual.chromosome);
+		std::string steps = toString(individual.chromosome);
 		for (size_t i = 0; i < chromosome.length() + 1; ++i)
 		{
 			BOOST_REQUIRE(chromosome.length() <= steps.size() && steps.size() <= 2 * chromosome.length() + 1);
@@ -387,21 +386,21 @@ BOOST_FIXTURE_TEST_CASE(runNextRound_should_do_addition, ClassicGeneticAlgorithm
 		}
 	}
 
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_FIXTURE_TEST_CASE(runNextRound_should_preserve_elite, ClassicGeneticAlgorithmFixture)
 {
 	auto population = Population::makeRandom(m_fitnessMetric, 4, 3, 3) + Population::makeRandom(m_fitnessMetric, 6, 5, 5);
-	assert((chromosomeLengths(population) == vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5, 5, 5}));
+	assert((chromosomeLengths(population) == std::vector<size_t>{3, 3, 3, 3, 5, 5, 5, 5, 5, 5}));
 
 	m_options.elitePoolSize = 0.5;
 	m_options.deletionChance = 1.0;
 	ClassicGeneticAlgorithm algorithm(m_options);
 	Population newPopulation = algorithm.runNextRound(population);
 
-	BOOST_TEST((chromosomeLengths(newPopulation) == vector<size_t>{0, 0, 0, 0, 0, 3, 3, 3, 3, 5}));
+	BOOST_TEST((chromosomeLengths(newPopulation) == std::vector<size_t>{0, 0, 0, 0, 0, 3, 3, 3, 3, 5}));
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/yulPhaser/Mutations.cpp b/test/yulPhaser/Mutations.cpp
index 8e1d0238b3..a5a715e23a 100644
--- a/test/yulPhaser/Mutations.cpp
+++ b/test/yulPhaser/Mutations.cpp
@@ -30,7 +30,6 @@
 #include <algorithm>
 #include <vector>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::yul;
 
@@ -48,7 +47,7 @@ BOOST_AUTO_TEST_CASE(geneRandomisation_should_iterate_over_genes_and_replace_the
 
 	// Use genes that do not represent valid step abbreviations to be able to easily spot added steps.
 	assert(OptimiserSuite::stepAbbreviationToNameMap().count('.') == 0);
-	Chromosome input = Chromosome(string(inputLength, '.'));
+	Chromosome input = Chromosome(std::string(inputLength, '.'));
 
 	SimulationRNG::reset(1);
 	for (size_t randomisationChancePercent = 20; randomisationChancePercent <= 100; randomisationChancePercent += 20)
@@ -56,7 +55,7 @@ BOOST_AUTO_TEST_CASE(geneRandomisation_should_iterate_over_genes_and_replace_the
 		double const randomisationChance = double(randomisationChancePercent) / 100.0;
 
 		Chromosome output = geneRandomisation(randomisationChance)(input);
-		string outputGenes = output.genes();
+		std::string outputGenes = output.genes();
 		BOOST_REQUIRE(output.length() == input.length());
 
 		double const expectedValue = randomisationChance;
@@ -66,15 +65,15 @@ BOOST_AUTO_TEST_CASE(geneRandomisation_should_iterate_over_genes_and_replace_the
 			(inputLength - randomisedGeneCount) * expectedValue * expectedValue +
 			randomisedGeneCount * (1 - expectedValue) * (1 - expectedValue);
 
-		BOOST_TEST(abs(randomisedGeneCount / inputLength - expectedValue) < tolerance);
-		BOOST_TEST(abs(squaredError / inputLength - variance) < tolerance);
+		BOOST_TEST(std::abs(randomisedGeneCount / inputLength - expectedValue) < tolerance);
+		BOOST_TEST(std::abs(squaredError / inputLength - variance) < tolerance);
 	}
 }
 
 BOOST_AUTO_TEST_CASE(geneRandomisation_should_return_identical_chromosome_if_probability_is_zero)
 {
 	Chromosome chromosome("fcCUnDvejsrmV");
-	function<Mutation> mutation = geneRandomisation(0.0);
+	std::function<Mutation> mutation = geneRandomisation(0.0);
 
 	BOOST_TEST(mutation(chromosome) == chromosome);
 }
@@ -86,7 +85,7 @@ BOOST_AUTO_TEST_CASE(geneDeletion_should_iterate_over_genes_and_delete_them_with
 
 	// Use genes that do not represent valid step abbreviations to be able to easily spot added steps.
 	assert(OptimiserSuite::stepAbbreviationToNameMap().count('.') == 0);
-	Chromosome input = Chromosome(string(inputLength, '.'));
+	Chromosome input = Chromosome(std::string(inputLength, '.'));
 
 	SimulationRNG::reset(1);
 	for (size_t deletionChancePercent = 20; deletionChancePercent < 100; deletionChancePercent += 20)
@@ -94,7 +93,7 @@ BOOST_AUTO_TEST_CASE(geneDeletion_should_iterate_over_genes_and_delete_them_with
 		double const deletionChance = double(deletionChancePercent) / 100.0;
 
 		Chromosome output = geneDeletion(deletionChance)(input);
-		string outputGenes = output.genes();
+		std::string outputGenes = output.genes();
 		BOOST_REQUIRE(output.length() <= input.length());
 		BOOST_REQUIRE(static_cast<size_t>(count(outputGenes.begin(), outputGenes.end(), '.')) == output.length());
 
@@ -105,15 +104,15 @@ BOOST_AUTO_TEST_CASE(geneDeletion_should_iterate_over_genes_and_delete_them_with
 			(double(inputLength) - deletedGeneCount) * expectedValue * expectedValue +
 			deletedGeneCount * (1.0 - expectedValue) * (1.0 - expectedValue);
 
-		BOOST_TEST(abs(deletedGeneCount / double(inputLength) - expectedValue) < tolerance);
-		BOOST_TEST(abs(squaredError / double(inputLength) - variance) < tolerance);
+		BOOST_TEST(std::abs(deletedGeneCount / double(inputLength) - expectedValue) < tolerance);
+		BOOST_TEST(std::abs(squaredError / double(inputLength) - variance) < tolerance);
 	}
 }
 
 BOOST_AUTO_TEST_CASE(geneDeletion_should_return_identical_chromosome_if_probability_is_zero)
 {
 	Chromosome chromosome("fcCUnDvejsrmV");
-	function<Mutation> mutation = geneDeletion(0.0);
+	std::function<Mutation> mutation = geneDeletion(0.0);
 
 	BOOST_TEST(mutation(chromosome) == chromosome);
 }
@@ -121,7 +120,7 @@ BOOST_AUTO_TEST_CASE(geneDeletion_should_return_identical_chromosome_if_probabil
 BOOST_AUTO_TEST_CASE(geneDeletion_should_delete_all_genes_if_probability_is_one)
 {
 	Chromosome chromosome("fcCUnDvejsrmV");
-	function<Mutation> mutation = geneDeletion(1.0);
+	std::function<Mutation> mutation = geneDeletion(1.0);
 
 	BOOST_TEST(mutation(chromosome) == Chromosome(""));
 }
@@ -134,7 +133,7 @@ BOOST_AUTO_TEST_CASE(geneAddition_should_iterate_over_gene_positions_and_insert_
 
 	// Use genes that do not represent valid step abbreviations to be able to easily spot added steps.
 	assert(OptimiserSuite::stepAbbreviationToNameMap().count('.') == 0);
-	Chromosome input = Chromosome(string(inputLength, '.'));
+	Chromosome input = Chromosome(std::string(inputLength, '.'));
 
 	SimulationRNG::reset(1);
 	for (size_t additionChancePercent = 20; additionChancePercent < 100; additionChancePercent += 20)
@@ -145,8 +144,8 @@ BOOST_AUTO_TEST_CASE(geneAddition_should_iterate_over_gene_positions_and_insert_
 		BOOST_REQUIRE(output.length() >= input.length());
 		BOOST_REQUIRE(output.length() <= inputLength + maxAdditions);
 
-		string_view outputGenes = output.genes();
-		size_t preservedGeneCount = static_cast<size_t>(count(outputGenes.begin(), outputGenes.end(), '.'));
+		std::string_view outputGenes = output.genes();
+		size_t preservedGeneCount = static_cast<size_t>(std::count(outputGenes.begin(), outputGenes.end(), '.'));
 		BOOST_REQUIRE(preservedGeneCount == input.length());
 
 		double const expectedValue = additionChance;
@@ -156,8 +155,8 @@ BOOST_AUTO_TEST_CASE(geneAddition_should_iterate_over_gene_positions_and_insert_
 			(double(maxAdditions) - addedGeneCount) * expectedValue * expectedValue +
 			addedGeneCount * (1.0 - expectedValue) * (1.0 - expectedValue);
 
-		BOOST_TEST(abs(addedGeneCount / double(maxAdditions) - expectedValue) < tolerance);
-		BOOST_TEST(abs(squaredError / double(maxAdditions) - variance) < tolerance);
+		BOOST_TEST(std::abs(addedGeneCount / double(maxAdditions) - expectedValue) < tolerance);
+		BOOST_TEST(std::abs(squaredError / double(maxAdditions) - variance) < tolerance);
 	}
 }
 
@@ -165,7 +164,7 @@ BOOST_AUTO_TEST_CASE(geneAddition_should_be_able_to_insert_before_first_position
 {
 	SimulationRNG::reset(7);
 	Chromosome chromosome("fcCUnDvejs");
-	function<Mutation> mutation = geneAddition(0.1);
+	std::function<Mutation> mutation = geneAddition(0.1);
 
 	Chromosome mutatedChromosome = mutation(chromosome);
 	BOOST_TEST(mutatedChromosome.length() > chromosome.length());
@@ -176,7 +175,7 @@ BOOST_AUTO_TEST_CASE(geneAddition_should_be_able_to_insert_after_last_position)
 {
 	SimulationRNG::reset(81);
 	Chromosome chromosome("fcCUnDvejs");
-	function<Mutation> mutation = geneAddition(0.1);
+	std::function<Mutation> mutation = geneAddition(0.1);
 
 	Chromosome mutatedChromosome = mutation(chromosome);
 	BOOST_TEST(mutatedChromosome.length() > chromosome.length());
@@ -186,7 +185,7 @@ BOOST_AUTO_TEST_CASE(geneAddition_should_be_able_to_insert_after_last_position)
 BOOST_AUTO_TEST_CASE(geneAddition_should_return_identical_chromosome_if_probability_is_zero)
 {
 	Chromosome chromosome("fcCUnDvejsrmV");
-	function<Mutation> mutation = geneAddition(0.0);
+	std::function<Mutation> mutation = geneAddition(0.0);
 
 	BOOST_TEST(mutation(chromosome) == chromosome);
 }
@@ -194,12 +193,12 @@ BOOST_AUTO_TEST_CASE(geneAddition_should_return_identical_chromosome_if_probabil
 BOOST_AUTO_TEST_CASE(geneAddition_should_insert_genes_at_all_positions_if_probability_is_one)
 {
 	Chromosome chromosome("fcCUnDvejsrmV");
-	function<Mutation> mutation = geneAddition(1.0);
+	std::function<Mutation> mutation = geneAddition(1.0);
 
 	Chromosome mutatedChromosome = mutation(chromosome);
 	BOOST_TEST(mutatedChromosome.length() == chromosome.length() * 2 + 1);
 
-	vector<string> originalGenes;
+	std::vector<std::string> originalGenes;
 	for (size_t i = 0; i < mutatedChromosome.length() - 1; ++i)
 		if (i % 2 == 1)
 			originalGenes.push_back(mutatedChromosome.optimisationSteps()[i]);
@@ -211,7 +210,7 @@ BOOST_AUTO_TEST_CASE(alternativeMutations_should_choose_between_mutations_with_g
 {
 	SimulationRNG::reset(1);
 	Chromosome chromosome("a");
-	function<Mutation> mutation = alternativeMutations(
+	std::function<Mutation> mutation = alternativeMutations(
 		0.8,
 		wholeChromosomeReplacement(Chromosome("c")),
 		wholeChromosomeReplacement(Chromosome("f"))
@@ -234,7 +233,7 @@ BOOST_AUTO_TEST_CASE(alternativeMutations_should_choose_between_mutations_with_g
 BOOST_AUTO_TEST_CASE(alternativeMutations_should_always_choose_first_mutation_if_probability_is_one)
 {
 	Chromosome chromosome("a");
-	function<Mutation> mutation = alternativeMutations(
+	std::function<Mutation> mutation = alternativeMutations(
 		1.0,
 		wholeChromosomeReplacement(Chromosome("c")),
 		wholeChromosomeReplacement(Chromosome("f"))
@@ -247,7 +246,7 @@ BOOST_AUTO_TEST_CASE(alternativeMutations_should_always_choose_first_mutation_if
 BOOST_AUTO_TEST_CASE(alternativeMutations_should_always_choose_second_mutation_if_probability_is_zero)
 {
 	Chromosome chromosome("a");
-	function<Mutation> mutation = alternativeMutations(
+	std::function<Mutation> mutation = alternativeMutations(
 		0.0,
 		wholeChromosomeReplacement(Chromosome("c")),
 		wholeChromosomeReplacement(Chromosome("f"))
@@ -260,8 +259,8 @@ BOOST_AUTO_TEST_CASE(alternativeMutations_should_always_choose_second_mutation_i
 BOOST_AUTO_TEST_CASE(mutationSequence_should_apply_all_mutations)
 {
 	Chromosome chromosome("aaaaa");
-	vector<string> steps = Chromosome::genesToSteps("gfc");
-	function<Mutation> mutation = mutationSequence({
+	std::vector<std::string> steps = Chromosome::genesToSteps("gfc");
+	std::function<Mutation> mutation = mutationSequence({
 		geneSubstitution(3, steps[0]),
 		geneSubstitution(2, steps[1]),
 		geneSubstitution(1, steps[2]),
@@ -273,8 +272,8 @@ BOOST_AUTO_TEST_CASE(mutationSequence_should_apply_all_mutations)
 BOOST_AUTO_TEST_CASE(mutationSequence_apply_mutations_in_the_order_they_are_given)
 {
 	Chromosome chromosome("aa");
-	vector<string> steps = Chromosome::genesToSteps("gcfo");
-	function<Mutation> mutation = mutationSequence({
+	std::vector<std::string> steps = Chromosome::genesToSteps("gcfo");
+	std::function<Mutation> mutation = mutationSequence({
 		geneSubstitution(0, steps[0]),
 		geneSubstitution(1, steps[1]),
 		geneSubstitution(0, steps[2]),
@@ -287,14 +286,14 @@ BOOST_AUTO_TEST_CASE(mutationSequence_apply_mutations_in_the_order_they_are_give
 BOOST_AUTO_TEST_CASE(mutationSequence_should_return_unmodified_chromosome_if_given_no_mutations)
 {
 	Chromosome chromosome("aa");
-	function<Mutation> mutation = mutationSequence({});
+	std::function<Mutation> mutation = mutationSequence({});
 
 	BOOST_TEST(mutation(chromosome) == chromosome);
 }
 
 BOOST_AUTO_TEST_CASE(randomPointCrossover_should_swap_chromosome_parts_at_random_point)
 {
-	function<Crossover> crossover = randomPointCrossover();
+	std::function<Crossover> crossover = randomPointCrossover();
 
 	SimulationRNG::reset(1);
 	Chromosome result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
@@ -307,22 +306,22 @@ BOOST_AUTO_TEST_CASE(randomPointCrossover_should_swap_chromosome_parts_at_random
 
 BOOST_AUTO_TEST_CASE(symmetricRandomPointCrossover_should_swap_chromosome_parts_at_random_point)
 {
-	function<SymmetricCrossover> crossover = symmetricRandomPointCrossover();
+	std::function<SymmetricCrossover> crossover = symmetricRandomPointCrossover();
 
 	SimulationRNG::reset(1);
-	tuple<Chromosome, Chromosome> result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
-	tuple<Chromosome, Chromosome> expectedPair1 = {Chromosome("aaaccc"), Chromosome("cccaaaaaaa")};
+	std::tuple<Chromosome, Chromosome> result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
+	std::tuple<Chromosome, Chromosome> expectedPair1 = {Chromosome("aaaccc"), Chromosome("cccaaaaaaa")};
 	BOOST_TEST(result1 == expectedPair1);
 
-	tuple<Chromosome, Chromosome> result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
-	tuple<Chromosome, Chromosome> expectedPair2 = {Chromosome("ccccccaaaa"), Chromosome("aaaaaa")};
+	std::tuple<Chromosome, Chromosome> result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
+	std::tuple<Chromosome, Chromosome> expectedPair2 = {Chromosome("ccccccaaaa"), Chromosome("aaaaaa")};
 	BOOST_TEST(result2 == expectedPair2);
 }
 
 BOOST_AUTO_TEST_CASE(randomPointCrossover_should_only_consider_points_available_on_both_chromosomes)
 {
 	SimulationRNG::reset(1);
-	function<Crossover> crossover = randomPointCrossover();
+	std::function<Crossover> crossover = randomPointCrossover();
 
 	for (size_t i = 0; i < 30; ++i)
 	{
@@ -346,7 +345,7 @@ BOOST_AUTO_TEST_CASE(randomPointCrossover_should_only_consider_points_available_
 BOOST_AUTO_TEST_CASE(randomPointCrossover_should_never_split_at_position_zero_if_chromosomes_are_splittable)
 {
 	SimulationRNG::reset(1);
-	function<Crossover> crossover = randomPointCrossover();
+	std::function<Crossover> crossover = randomPointCrossover();
 
 	for (size_t i = 0; i < 30; ++i)
 	{
@@ -360,7 +359,7 @@ BOOST_AUTO_TEST_CASE(randomPointCrossover_should_never_split_at_position_zero_if
 BOOST_AUTO_TEST_CASE(randomPointCrossover_should_never_split_at_position_zero_if_chromosomes_are_not_empty)
 {
 	SimulationRNG::reset(1);
-	function<Crossover> crossover = randomPointCrossover();
+	std::function<Crossover> crossover = randomPointCrossover();
 
 	for (size_t i = 0; i < 30; ++i)
 	{
@@ -373,7 +372,7 @@ BOOST_AUTO_TEST_CASE(randomPointCrossover_should_never_split_at_position_zero_if
 
 BOOST_AUTO_TEST_CASE(randomPointCrossover_should_work_even_if_one_chromosome_is_unsplittable)
 {
-	function<Crossover> crossover = randomPointCrossover();
+	std::function<Crossover> crossover = randomPointCrossover();
 
 	SimulationRNG::reset(1);
 	BOOST_CHECK(crossover(Chromosome("ff"), Chromosome("a")) == Chromosome("f"));
@@ -385,7 +384,7 @@ BOOST_AUTO_TEST_CASE(randomPointCrossover_should_split_at_position_zero_only_if_
 	Chromosome empty("");
 	Chromosome unsplittable("a");
 	Chromosome splittable("aaaa");
-	function<Crossover> crossover = randomPointCrossover();
+	std::function<Crossover> crossover = randomPointCrossover();
 
 	SimulationRNG::reset(1);
 	BOOST_CHECK(crossover(empty, empty) == empty);
@@ -447,13 +446,13 @@ BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_split_at_end_of_shorter_chromoso
 
 BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_select_correct_split_point_for_unsplittable_chromosomes)
 {
-	function<Crossover> crossover00 = fixedPointCrossover(0.0);
+	std::function<Crossover> crossover00 = fixedPointCrossover(0.0);
 	BOOST_CHECK(crossover00(Chromosome("fff"), Chromosome("a")) == Chromosome("a"));
 	BOOST_CHECK(crossover00(Chromosome("a"), Chromosome("fff")) == Chromosome("fff"));
 
 	BOOST_CHECK(crossover00(Chromosome("f"), Chromosome("a")) == Chromosome("a"));
 
-	function<Crossover> crossover10 = fixedPointCrossover(1.0);
+	std::function<Crossover> crossover10 = fixedPointCrossover(1.0);
 	BOOST_CHECK(crossover10(Chromosome("fff"), Chromosome("a")) == Chromosome("f"));
 	BOOST_CHECK(crossover10(Chromosome("a"), Chromosome("fff")) == Chromosome("aff"));
 
@@ -466,14 +465,14 @@ BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_always_use_position_zero_as_spli
 	Chromosome unsplittable("f");
 	Chromosome splittable("aaaa");
 
-	function<Crossover> crossover00 = fixedPointCrossover(0.0);
+	std::function<Crossover> crossover00 = fixedPointCrossover(0.0);
 	BOOST_CHECK(crossover00(empty, empty) == empty);
 	BOOST_CHECK(crossover00(unsplittable, empty) == empty);
 	BOOST_CHECK(crossover00(empty, unsplittable) == unsplittable);
 	BOOST_CHECK(crossover00(splittable, empty) == empty);
 	BOOST_CHECK(crossover00(empty, splittable) == splittable);
 
-	function<Crossover> crossover10 = fixedPointCrossover(1.0);
+	std::function<Crossover> crossover10 = fixedPointCrossover(1.0);
 	BOOST_CHECK(crossover10(empty, empty) == empty);
 	BOOST_CHECK(crossover10(unsplittable, empty) == empty);
 	BOOST_CHECK(crossover10(empty, unsplittable) == unsplittable);
@@ -483,7 +482,7 @@ BOOST_AUTO_TEST_CASE(fixedPointCrossover_should_always_use_position_zero_as_spli
 
 BOOST_AUTO_TEST_CASE(randomTwoPointCrossover_should_swap_chromosome_parts_between_two_random_points)
 {
-	function<Crossover> crossover = randomTwoPointCrossover();
+	std::function<Crossover> crossover = randomTwoPointCrossover();
 
 	SimulationRNG::reset(1);
 	Chromosome result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
@@ -496,21 +495,21 @@ BOOST_AUTO_TEST_CASE(randomTwoPointCrossover_should_swap_chromosome_parts_betwee
 
 BOOST_AUTO_TEST_CASE(symmetricRandomTwoPointCrossover_should_swap_chromosome_parts_at_random_point)
 {
-	function<SymmetricCrossover> crossover = symmetricRandomTwoPointCrossover();
+	std::function<SymmetricCrossover> crossover = symmetricRandomTwoPointCrossover();
 
 	SimulationRNG::reset(1);
-	tuple<Chromosome, Chromosome> result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
-	tuple<Chromosome, Chromosome> expectedPair1 = {Chromosome("aaacccaaaa"), Chromosome("cccaaa")};
+	std::tuple<Chromosome, Chromosome> result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
+	std::tuple<Chromosome, Chromosome> expectedPair1 = {Chromosome("aaacccaaaa"), Chromosome("cccaaa")};
 	BOOST_TEST(result1 == expectedPair1);
 
-	tuple<Chromosome, Chromosome> result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
-	tuple<Chromosome, Chromosome> expectedPair2 = {Chromosome("ccccca"), Chromosome("aaaaacaaaa")};
+	std::tuple<Chromosome, Chromosome> result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
+	std::tuple<Chromosome, Chromosome> expectedPair2 = {Chromosome("ccccca"), Chromosome("aaaaacaaaa")};
 	BOOST_TEST(result2 == expectedPair2);
 }
 
 BOOST_AUTO_TEST_CASE(randomTwoPointCrossover_should_only_consider_points_available_on_both_chromosomes)
 {
-	function<Crossover> crossover = randomTwoPointCrossover();
+	std::function<Crossover> crossover = randomTwoPointCrossover();
 
 	for (size_t i = 0; i < 30; ++i)
 	{
@@ -539,7 +538,7 @@ BOOST_AUTO_TEST_CASE(randomTwoPointCrossover_should_only_consider_points_availab
 
 BOOST_AUTO_TEST_CASE(uniformCrossover_should_swap_randomly_selected_genes)
 {
-	function<Crossover> crossover = uniformCrossover(0.7);
+	std::function<Crossover> crossover = uniformCrossover(0.7);
 
 	SimulationRNG::reset(1);
 	Chromosome result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
@@ -552,23 +551,23 @@ BOOST_AUTO_TEST_CASE(uniformCrossover_should_swap_randomly_selected_genes)
 
 BOOST_AUTO_TEST_CASE(symmetricUniformCrossover_should_swap_randomly_selected_genes)
 {
-	function<SymmetricCrossover> crossover = symmetricUniformCrossover(0.7);
+	std::function<SymmetricCrossover> crossover = symmetricUniformCrossover(0.7);
 
 	SimulationRNG::reset(1);
-	tuple<Chromosome, Chromosome> result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
-	tuple<Chromosome, Chromosome> expectedPair1 = {Chromosome("caaacc"), Chromosome("acccaaaaaa")};
+	std::tuple<Chromosome, Chromosome> result1 = crossover(Chromosome("aaaaaaaaaa"), Chromosome("cccccc"));
+	std::tuple<Chromosome, Chromosome> expectedPair1 = {Chromosome("caaacc"), Chromosome("acccaaaaaa")};
 	BOOST_TEST(result1 == expectedPair1);
 
-	tuple<Chromosome, Chromosome> result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
-	tuple<Chromosome, Chromosome> expectedPair2 = {Chromosome("caaaaaaaaa"), Chromosome("accccc")};
+	std::tuple<Chromosome, Chromosome> result2 = crossover(Chromosome("cccccc"), Chromosome("aaaaaaaaaa"));
+	std::tuple<Chromosome, Chromosome> expectedPair2 = {Chromosome("caaaaaaaaa"), Chromosome("accccc")};
 	BOOST_TEST(result2 == expectedPair2);
 }
 
 BOOST_AUTO_TEST_CASE(uniformCrossover_should_only_consider_points_available_on_both_chromosomes)
 {
-	function<Crossover> crossover = uniformCrossover(0.7);
+	std::function<Crossover> crossover = uniformCrossover(0.7);
 
-	set<string> expectedPatterns = {
+	std::set<std::string> expectedPatterns = {
 		"TTTTTTTTTTTTTTTTTTTT",
 		"aTTTTTTTTTTTTTTTTTTT",
 		"TaTTTTTTTTTTTTTTTTTT",
@@ -616,20 +615,20 @@ BOOST_AUTO_TEST_CASE(uniformCrossover_should_swap_genes_with_uniform_probability
 	double const expectedValue = swapChance;
 	double const variance = swapChance * (1 - swapChance);
 
-	function<Crossover> crossover = uniformCrossover(swapChance);
+	std::function<Crossover> crossover = uniformCrossover(swapChance);
 	Chromosome chromosome1("aaaaaaaaaa");
 	Chromosome chromosome2("cccccccccc");
 
-	vector<size_t> bernoulliTrials;
+	std::vector<size_t> bernoulliTrials;
 	for (size_t i = 0; i < operationCount; ++i)
 	{
-		string genes = toString(crossover(chromosome1, chromosome2));
+		std::string genes = toString(crossover(chromosome1, chromosome2));
 		for (size_t j = 0; j < chromosome1.length(); ++j)
 			bernoulliTrials.push_back(static_cast<size_t>(genes[j] == 'c'));
 	}
 
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_AUTO_TEST_CASE(uniformCrossover_should_swap_tail_with_uniform_probability)
@@ -640,22 +639,22 @@ BOOST_AUTO_TEST_CASE(uniformCrossover_should_swap_tail_with_uniform_probability)
 	double const expectedValue = swapChance;
 	double const variance = swapChance * (1 - swapChance);
 
-	function<Crossover> crossover = uniformCrossover(swapChance);
+	std::function<Crossover> crossover = uniformCrossover(swapChance);
 	Chromosome chromosome1("aaaaa");
 	Chromosome chromosome2("cccccccccc");
 
 	SimulationRNG::reset(1);
 
-	vector<size_t> bernoulliTrials;
+	std::vector<size_t> bernoulliTrials;
 	for (size_t i = 0; i < operationCount; ++i)
 	{
-		string genes = toString(crossover(chromosome1, chromosome2));
+		std::string genes = toString(crossover(chromosome1, chromosome2));
 		BOOST_REQUIRE(genes.size() == 5 || genes.size() == 10);
 		bernoulliTrials.push_back(static_cast<size_t>(genes.size() == 10));
 	}
 
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/yulPhaser/PairSelections.cpp b/test/yulPhaser/PairSelections.cpp
index f3d13a5b3b..82b9a900b6 100644
--- a/test/yulPhaser/PairSelections.cpp
+++ b/test/yulPhaser/PairSelections.cpp
@@ -27,8 +27,6 @@
 #include <tuple>
 #include <vector>
 
-using namespace std;
-
 namespace solidity::phaser::test
 {
 
@@ -45,35 +43,35 @@ BOOST_AUTO_TEST_CASE(materialise_should_return_random_values_with_equal_probabil
 	constexpr double variance = (collectionSize * collectionSize - 1) / 12.0;
 
 	SimulationRNG::reset(1);
-	vector<tuple<size_t, size_t>> pairs = RandomPairSelection(selectionSize).materialise(collectionSize);
-	vector<size_t> samples;
+	std::vector<std::tuple<size_t, size_t>> pairs = RandomPairSelection(selectionSize).materialise(collectionSize);
+	std::vector<size_t> samples;
 	for (auto& [first, second]: pairs)
 	{
 		samples.push_back(first);
 		samples.push_back(second);
 	}
 
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_return_only_values_that_can_be_used_as_collection_indices)
 {
 	const size_t collectionSize = 200;
 
-	vector<tuple<size_t, size_t>> pairs = RandomPairSelection(0.5).materialise(collectionSize);
+	std::vector<std::tuple<size_t, size_t>> pairs = RandomPairSelection(0.5).materialise(collectionSize);
 
 	BOOST_TEST(pairs.size() == 100);
-	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return get<0>(pair) <= collectionSize; }));
-	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return get<1>(pair) <= collectionSize; }));
+	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return std::get<0>(pair) <= collectionSize; }));
+	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return std::get<1>(pair) <= collectionSize; }));
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_never_return_a_pair_of_identical_indices)
 {
-	vector<tuple<size_t, size_t>> pairs = RandomPairSelection(0.5).materialise(100);
+	std::vector<std::tuple<size_t, size_t>> pairs = RandomPairSelection(0.5).materialise(100);
 
 	BOOST_TEST(pairs.size() == 50);
-	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [](auto const& pair){ return get<0>(pair) != get<1>(pair); }));
+	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [](auto const& pair){ return std::get<0>(pair) != std::get<1>(pair); }));
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_return_number_of_pairs_thats_a_fraction_of_collection_size)
@@ -132,18 +130,18 @@ BOOST_AUTO_TEST_CASE(materialise_should_return_random_values_with_equal_probabil
 	constexpr double variance = selectionChance * (1 - selectionChance);
 
 	SimulationRNG::reset(1);
-	vector<tuple<size_t, size_t>> pairs = PairsFromRandomSubset(selectionChance).materialise(collectionSize);
-	vector<double> bernoulliTrials(collectionSize, 0);
+	std::vector<std::tuple<size_t, size_t>> pairs = PairsFromRandomSubset(selectionChance).materialise(collectionSize);
+	std::vector<double> bernoulliTrials(collectionSize, 0);
 	for (auto& pair: pairs)
 	{
-		BOOST_REQUIRE(get<1>(pair) < collectionSize);
-		BOOST_REQUIRE(get<1>(pair) < collectionSize);
-		bernoulliTrials[get<0>(pair)] = 1.0;
-		bernoulliTrials[get<1>(pair)] = 1.0;
+		BOOST_REQUIRE(std::get<1>(pair) < collectionSize);
+		BOOST_REQUIRE(std::get<1>(pair) < collectionSize);
+		bernoulliTrials[std::get<0>(pair)] = 1.0;
+		bernoulliTrials[std::get<1>(pair)] = 1.0;
 	}
 
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_return_only_values_that_can_be_used_as_collection_indices)
@@ -151,10 +149,10 @@ BOOST_AUTO_TEST_CASE(materialise_should_return_only_values_that_can_be_used_as_c
 	const size_t collectionSize = 200;
 	constexpr double selectionChance = 0.5;
 
-	vector<tuple<size_t, size_t>> pairs = PairsFromRandomSubset(selectionChance).materialise(collectionSize);
+	std::vector<std::tuple<size_t, size_t>> pairs = PairsFromRandomSubset(selectionChance).materialise(collectionSize);
 
-	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return get<0>(pair) <= collectionSize; }));
-	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return get<1>(pair) <= collectionSize; }));
+	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return std::get<0>(pair) <= collectionSize; }));
+	BOOST_TEST(all_of(pairs.begin(), pairs.end(), [&](auto const& pair){ return std::get<1>(pair) <= collectionSize; }));
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_use_unique_indices)
@@ -162,12 +160,12 @@ BOOST_AUTO_TEST_CASE(materialise_should_use_unique_indices)
 	constexpr size_t collectionSize = 200;
 	constexpr double selectionChance = 0.5;
 
-	vector<tuple<size_t, size_t>> pairs = PairsFromRandomSubset(selectionChance).materialise(collectionSize);
-	set<size_t> indices;
+	std::vector<std::tuple<size_t, size_t>> pairs = PairsFromRandomSubset(selectionChance).materialise(collectionSize);
+	std::set<size_t> indices;
 	for (auto& pair: pairs)
 	{
-		indices.insert(get<0>(pair));
-		indices.insert(get<1>(pair));
+		indices.insert(std::get<0>(pair));
+		indices.insert(std::get<1>(pair));
 	}
 
 	BOOST_TEST(indices.size() == 2 * pairs.size());
@@ -195,7 +193,7 @@ BOOST_AUTO_TEST_CASE(materialise_should_return_all_pairs_if_selection_chance_is_
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE(PairMosaicSelectionTest)
 
-using IndexPairs = vector<tuple<size_t, size_t>>;
+using IndexPairs = std::vector<std::tuple<size_t, size_t>>;
 
 BOOST_AUTO_TEST_CASE(materialise)
 {
diff --git a/test/yulPhaser/Phaser.cpp b/test/yulPhaser/Phaser.cpp
index feee2269e7..671f755463 100644
--- a/test/yulPhaser/Phaser.cpp
+++ b/test/yulPhaser/Phaser.cpp
@@ -32,7 +32,6 @@
 #include <algorithm>
 #include <fstream>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::yul;
@@ -69,15 +68,15 @@ class GeneticAlgorithmFactoryFixture
 class FixtureWithPrograms
 {
 protected:
-	vector<CharStream> m_sourceStreams = {
+	std::vector<CharStream> m_sourceStreams = {
 		CharStream("{}", ""),
 		CharStream("{{}}", ""),
 		CharStream("{{{}}}", ""),
 	};
-	vector<Program> m_programs = {
-		get<Program>(Program::load(m_sourceStreams[0])),
-		get<Program>(Program::load(m_sourceStreams[1])),
-		get<Program>(Program::load(m_sourceStreams[2])),
+	std::vector<Program> m_programs = {
+		std::get<Program>(Program::load(m_sourceStreams[0])),
+		std::get<Program>(Program::load(m_sourceStreams[1])),
+		std::get<Program>(Program::load(m_sourceStreams[2])),
 	};
 };
 
@@ -96,7 +95,7 @@ class FitnessMetricFactoryFixture: public FixtureWithPrograms
 class PoulationFactoryFixture
 {
 protected:
-	shared_ptr<FitnessMetric> m_fitnessMetric = make_shared<ChromosomeLengthMetric>();
+	std::shared_ptr<FitnessMetric> m_fitnessMetric = std::make_shared<ChromosomeLengthMetric>();
 	PopulationFactory::Options m_options = {
 		/* minChromosomeLength = */ 0,
 		/* maxChromosomeLength = */ 0,
@@ -113,7 +112,7 @@ BOOST_AUTO_TEST_SUITE(GeneticAlgorithmFactoryTest)
 BOOST_FIXTURE_TEST_CASE(build_should_select_the_right_algorithm_and_pass_the_options_to_it, GeneticAlgorithmFactoryFixture)
 {
 	m_options.algorithm = Algorithm::Random;
-	unique_ptr<GeneticAlgorithm> algorithm1 = GeneticAlgorithmFactory::build(m_options, 100);
+	std::unique_ptr<GeneticAlgorithm> algorithm1 = GeneticAlgorithmFactory::build(m_options, 100);
 	BOOST_REQUIRE(algorithm1 != nullptr);
 
 	auto randomAlgorithm = dynamic_cast<RandomAlgorithm*>(algorithm1.get());
@@ -123,7 +122,7 @@ BOOST_FIXTURE_TEST_CASE(build_should_select_the_right_algorithm_and_pass_the_opt
 	BOOST_TEST(randomAlgorithm->options().maxChromosomeLength == m_options.maxChromosomeLength);
 
 	m_options.algorithm = Algorithm::GEWEP;
-	unique_ptr<GeneticAlgorithm> algorithm2 = GeneticAlgorithmFactory::build(m_options, 100);
+	std::unique_ptr<GeneticAlgorithm> algorithm2 = GeneticAlgorithmFactory::build(m_options, 100);
 	BOOST_REQUIRE(algorithm2 != nullptr);
 
 	auto gewepAlgorithm = dynamic_cast<GenerationalElitistWithExclusivePools*>(algorithm2.get());
@@ -139,7 +138,7 @@ BOOST_FIXTURE_TEST_CASE(build_should_select_the_right_algorithm_and_pass_the_opt
 	BOOST_TEST(gewepAlgorithm->options().percentGenesToAddOrDelete == m_options.gewepGenesToAddOrDelete.value());
 
 	m_options.algorithm = Algorithm::Classic;
-	unique_ptr<GeneticAlgorithm> algorithm3 = GeneticAlgorithmFactory::build(m_options, 100);
+	std::unique_ptr<GeneticAlgorithm> algorithm3 = GeneticAlgorithmFactory::build(m_options, 100);
 	BOOST_REQUIRE(algorithm3 != nullptr);
 
 	auto classicAlgorithm = dynamic_cast<ClassicGeneticAlgorithm*>(algorithm3.get());
@@ -156,8 +155,8 @@ BOOST_FIXTURE_TEST_CASE(build_should_select_the_right_algorithm_and_pass_the_opt
 BOOST_FIXTURE_TEST_CASE(build_should_set_random_algorithm_elite_pool_size_based_on_population_size_if_not_specified, GeneticAlgorithmFactoryFixture)
 {
 	m_options.algorithm = Algorithm::Random;
-	m_options.randomElitePoolSize = nullopt;
-	unique_ptr<GeneticAlgorithm> algorithm = GeneticAlgorithmFactory::build(m_options, 100);
+	m_options.randomElitePoolSize = std::nullopt;
+	std::unique_ptr<GeneticAlgorithm> algorithm = GeneticAlgorithmFactory::build(m_options, 100);
 	BOOST_REQUIRE(algorithm != nullptr);
 
 	auto randomAlgorithm = dynamic_cast<RandomAlgorithm*>(algorithm.get());
@@ -168,11 +167,11 @@ BOOST_FIXTURE_TEST_CASE(build_should_set_random_algorithm_elite_pool_size_based_
 BOOST_FIXTURE_TEST_CASE(build_should_set_gewep_mutation_percentages_based_on_maximum_chromosome_length_if_not_specified, GeneticAlgorithmFactoryFixture)
 {
 	m_options.algorithm = Algorithm::GEWEP;
-	m_options.gewepGenesToRandomise = nullopt;
-	m_options.gewepGenesToAddOrDelete = nullopt;
+	m_options.gewepGenesToRandomise = std::nullopt;
+	m_options.gewepGenesToAddOrDelete = std::nullopt;
 	m_options.maxChromosomeLength = 125;
 
-	unique_ptr<GeneticAlgorithm> algorithm = GeneticAlgorithmFactory::build(m_options, 100);
+	std::unique_ptr<GeneticAlgorithm> algorithm = GeneticAlgorithmFactory::build(m_options, 100);
 	BOOST_REQUIRE(algorithm != nullptr);
 
 	auto gewepAlgorithm = dynamic_cast<GenerationalElitistWithExclusivePools*>(algorithm.get());
@@ -188,7 +187,7 @@ BOOST_FIXTURE_TEST_CASE(build_should_create_metric_of_the_right_type, FitnessMet
 {
 	m_options.metric = MetricChoice::RelativeCodeSize;
 	m_options.metricAggregator = MetricAggregatorChoice::Sum;
-	unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, {m_programs[0]}, {nullptr}, m_weights);
+	std::unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, {m_programs[0]}, {nullptr}, m_weights);
 	BOOST_REQUIRE(metric != nullptr);
 
 	auto sumMetric = dynamic_cast<FitnessMetricSum*>(metric.get());
@@ -206,7 +205,7 @@ BOOST_FIXTURE_TEST_CASE(build_should_respect_chromosome_repetitions_option, Fitn
 	m_options.metric = MetricChoice::CodeSize;
 	m_options.metricAggregator = MetricAggregatorChoice::Average;
 	m_options.chromosomeRepetitions = 5;
-	unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, {m_programs[0]}, {nullptr}, m_weights);
+	std::unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, {m_programs[0]}, {nullptr}, m_weights);
 	BOOST_REQUIRE(metric != nullptr);
 
 	auto averageMetric = dynamic_cast<FitnessMetricAverage*>(metric.get());
@@ -224,7 +223,7 @@ BOOST_FIXTURE_TEST_CASE(build_should_set_relative_metric_scale, FitnessMetricFac
 	m_options.metric = MetricChoice::RelativeCodeSize;
 	m_options.metricAggregator = MetricAggregatorChoice::Average;
 	m_options.relativeMetricScale = 10;
-	unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, {m_programs[0]}, {nullptr}, m_weights);
+	std::unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, {m_programs[0]}, {nullptr}, m_weights);
 	BOOST_REQUIRE(metric != nullptr);
 
 	auto averageMetric = dynamic_cast<FitnessMetricAverage*>(metric.get());
@@ -239,10 +238,10 @@ BOOST_FIXTURE_TEST_CASE(build_should_set_relative_metric_scale, FitnessMetricFac
 
 BOOST_FIXTURE_TEST_CASE(build_should_create_metric_for_each_input_program, FitnessMetricFactoryFixture)
 {
-	unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(
+	std::unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(
 		m_options,
 		m_programs,
-		vector<shared_ptr<ProgramCache>>(m_programs.size(), nullptr),
+		std::vector<std::shared_ptr<ProgramCache>>(m_programs.size(), nullptr),
 		m_weights
 	);
 	BOOST_REQUIRE(metric != nullptr);
@@ -255,14 +254,14 @@ BOOST_FIXTURE_TEST_CASE(build_should_create_metric_for_each_input_program, Fitne
 BOOST_FIXTURE_TEST_CASE(build_should_pass_program_caches_to_metrics, FitnessMetricFactoryFixture)
 {
 	assert(m_programs.size() == 3);
-	vector<shared_ptr<ProgramCache>> caches = {
-		make_shared<ProgramCache>(m_programs[0]),
-		make_shared<ProgramCache>(m_programs[1]),
-		make_shared<ProgramCache>(m_programs[2]),
+	std::vector<std::shared_ptr<ProgramCache>> caches = {
+		std::make_shared<ProgramCache>(m_programs[0]),
+		std::make_shared<ProgramCache>(m_programs[1]),
+		std::make_shared<ProgramCache>(m_programs[2]),
 	};
 
 	m_options.metric = MetricChoice::RelativeCodeSize;
-	unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, m_programs, caches, m_weights);
+	std::unique_ptr<FitnessMetric> metric = FitnessMetricFactory::build(m_options, m_programs, caches, m_weights);
 	BOOST_REQUIRE(metric != nullptr);
 
 	auto combinedMetric = dynamic_cast<FitnessMetricCombination*>(metric.get());
@@ -287,7 +286,7 @@ BOOST_FIXTURE_TEST_CASE(build_should_create_an_empty_population_if_no_specific_o
 	m_options.populationFromFile = {};
 	BOOST_TEST(
 		PopulationFactory::build(m_options, m_fitnessMetric) ==
-		Population(m_fitnessMetric, vector<Chromosome>{})
+		Population(m_fitnessMetric, std::vector<Chromosome>{})
 	);
 }
 
@@ -318,7 +317,7 @@ BOOST_FIXTURE_TEST_CASE(build_should_respect_random_population_option, Poulation
 
 BOOST_FIXTURE_TEST_CASE(build_should_respect_population_from_file_option, PoulationFactoryFixture)
 {
-	map<string, vector<string>> fileContent = {
+	std::map<std::string, std::vector<std::string>> fileContent = {
 		{"a.txt", {"a", "fff", "", "jxccLTa"}},
 		{"b.txt", {}},
 		{"c.txt", {""}},
@@ -328,9 +327,9 @@ BOOST_FIXTURE_TEST_CASE(build_should_respect_population_from_file_option, Poulat
 	TemporaryDirectory tempDir;
 	for (auto const& [fileName, chromosomes]: fileContent)
 	{
-		ofstream tmpFile((tempDir.path() / fileName).string());
+		std::ofstream tmpFile((tempDir.path() / fileName).string());
 		for (auto const& chromosome: chromosomes)
-			tmpFile << chromosome << endl;
+			tmpFile << chromosome << std::endl;
 
 		m_options.populationFromFile.push_back((tempDir.path() / fileName).string());
 	}
@@ -361,8 +360,8 @@ BOOST_FIXTURE_TEST_CASE(build_should_combine_populations_from_all_sources, Poula
 {
 	TemporaryDirectory tempDir;
 	{
-		ofstream tmpFile((tempDir.path() / "population.txt").string());
-		tmpFile << "axc" << endl << "fcL" << endl;
+		std::ofstream tmpFile((tempDir.path() / "population.txt").string());
+		tmpFile << "axc" << std::endl << "fcL" << std::endl;
 	}
 
 	m_options.population = {"axc", "fcL"};
@@ -388,7 +387,7 @@ BOOST_AUTO_TEST_SUITE(ProgramCacheFactoryTest)
 BOOST_FIXTURE_TEST_CASE(build_should_create_cache_for_each_input_program_if_cache_enabled, FixtureWithPrograms)
 {
 	ProgramCacheFactory::Options options{/* programCacheEnabled = */ true};
-	vector<shared_ptr<ProgramCache>> caches = ProgramCacheFactory::build(options, m_programs);
+	std::vector<std::shared_ptr<ProgramCache>> caches = ProgramCacheFactory::build(options, m_programs);
 	assert(m_programs.size() >= 2 && "There must be at least 2 programs for this test to be meaningful");
 
 	BOOST_TEST(caches.size() == m_programs.size());
@@ -402,7 +401,7 @@ BOOST_FIXTURE_TEST_CASE(build_should_create_cache_for_each_input_program_if_cach
 BOOST_FIXTURE_TEST_CASE(build_should_return_nullptr_for_each_input_program_if_cache_disabled, FixtureWithPrograms)
 {
 	ProgramCacheFactory::Options options{/* programCacheEnabled = */ false};
-	vector<shared_ptr<ProgramCache>> caches = ProgramCacheFactory::build(options, m_programs);
+	std::vector<std::shared_ptr<ProgramCache>> caches = ProgramCacheFactory::build(options, m_programs);
 	assert(m_programs.size() >= 2 && "There must be at least 2 programs for this test to be meaningful");
 
 	BOOST_TEST(caches.size() == m_programs.size());
@@ -416,7 +415,7 @@ BOOST_AUTO_TEST_SUITE(ProgramFactoryTest)
 BOOST_AUTO_TEST_CASE(build_should_load_programs_from_files)
 {
 	TemporaryDirectory tempDir;
-	vector<string> sources{"{}", "{{}}", "{{{}}}"};
+	std::vector<std::string> sources{"{}", "{{}}", "{{{}}}"};
 	ProgramFactory::Options options{
 		/* inputFiles = */ {
 			(tempDir.path() / "program1.yul").string(),
@@ -428,17 +427,17 @@ BOOST_AUTO_TEST_CASE(build_should_load_programs_from_files)
 
 	for (size_t i = 0; i < sources.size(); ++i)
 	{
-		ofstream tmpFile(options.inputFiles[i]);
-		tmpFile << sources[i] << endl;
+		std::ofstream tmpFile(options.inputFiles[i]);
+		tmpFile << sources[i] << std::endl;
 	}
 
-	vector<Program> programs = ProgramFactory::build(options);
+	std::vector<Program> programs = ProgramFactory::build(options);
 
 	BOOST_TEST(programs.size() == sources.size());
 	for (size_t i = 0; i < sources.size(); ++i)
 	{
 		CharStream sourceStream(sources[i], options.inputFiles[i]);
-		BOOST_TEST(toString(programs[i]) == toString(get<Program>(Program::load(sourceStream))));
+		BOOST_TEST(toString(programs[i]) == toString(std::get<Program>(Program::load(sourceStream))));
 	}
 }
 
@@ -451,17 +450,17 @@ BOOST_AUTO_TEST_CASE(build_should_apply_prefix)
 	};
 
 	CharStream nestedSource("{{{let x:= 1}}}", "");
-	Program nestedProgram = get<Program>(Program::load(nestedSource));
-	Program flatProgram = get<Program>(Program::load(nestedSource));
+	Program nestedProgram = std::get<Program>(Program::load(nestedSource));
+	Program flatProgram = std::get<Program>(Program::load(nestedSource));
 	flatProgram.optimise(Chromosome::genesToSteps("f"));
 	assert(toString(nestedProgram) != toString(flatProgram));
 
 	{
-		ofstream tmpFile(options.inputFiles[0]);
-		tmpFile << nestedSource.source() << endl;
+		std::ofstream tmpFile(options.inputFiles[0]);
+		tmpFile << nestedSource.source() << std::endl;
 	}
 
-	vector<Program> programs = ProgramFactory::build(options);
+	std::vector<Program> programs = ProgramFactory::build(options);
 
 	BOOST_TEST(programs.size() == 1);
 	BOOST_TEST(toString(programs[0]) == toString(flatProgram));
diff --git a/test/yulPhaser/Population.cpp b/test/yulPhaser/Population.cpp
index 13d06b5210..aed014592c 100644
--- a/test/yulPhaser/Population.cpp
+++ b/test/yulPhaser/Population.cpp
@@ -38,7 +38,6 @@
 #include <string>
 #include <sstream>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::yul;
 using namespace boost::unit_test::framework;
@@ -52,12 +51,12 @@ class PopulationFixture
 	static ChromosomePair twoStepSwap(Chromosome const& _chromosome1, Chromosome const& _chromosome2)
 	{
 		return ChromosomePair{
-			Chromosome(vector<string>{_chromosome1.optimisationSteps()[0], _chromosome2.optimisationSteps()[1]}),
-			Chromosome(vector<string>{_chromosome2.optimisationSteps()[0], _chromosome1.optimisationSteps()[1]}),
+			Chromosome(std::vector<std::string>{_chromosome1.optimisationSteps()[0], _chromosome2.optimisationSteps()[1]}),
+			Chromosome(std::vector<std::string>{_chromosome2.optimisationSteps()[0], _chromosome1.optimisationSteps()[1]}),
 		};
 	}
 
-	shared_ptr<FitnessMetric> m_fitnessMetric = make_shared<ChromosomeLengthMetric>();
+	std::shared_ptr<FitnessMetric> m_fitnessMetric = std::make_shared<ChromosomeLengthMetric>();
 };
 
 BOOST_AUTO_TEST_SUITE(Phaser, *boost::unit_test::label("nooptions"))
@@ -95,14 +94,14 @@ BOOST_AUTO_TEST_CASE(isFitter_should_return_false_for_identical_individuals)
 
 BOOST_FIXTURE_TEST_CASE(constructor_should_copy_chromosomes_compute_fitness_and_sort_chromosomes, PopulationFixture)
 {
-	vector<Chromosome> chromosomes = {
+	std::vector<Chromosome> chromosomes = {
 		Chromosome::makeRandom(5),
 		Chromosome::makeRandom(15),
 		Chromosome::makeRandom(10),
 	};
 	Population population(m_fitnessMetric, chromosomes);
 
-	vector<Individual> const& individuals = population.individuals();
+	std::vector<Individual> const& individuals = population.individuals();
 
 	BOOST_TEST(individuals.size() == 3);
 	BOOST_TEST(individuals[0].fitness == 5);
@@ -115,7 +114,7 @@ BOOST_FIXTURE_TEST_CASE(constructor_should_copy_chromosomes_compute_fitness_and_
 
 BOOST_FIXTURE_TEST_CASE(constructor_should_accept_individuals_without_recalculating_fitness, PopulationFixture)
 {
-	vector<Individual> customIndividuals = {
+	std::vector<Individual> customIndividuals = {
 		Individual(Chromosome("aaaccc"), 20),
 		Individual(Chromosome("aaa"), 10),
 		Individual(Chromosome("aaaf"), 30),
@@ -126,7 +125,7 @@ BOOST_FIXTURE_TEST_CASE(constructor_should_accept_individuals_without_recalculat
 
 	Population population(m_fitnessMetric, customIndividuals);
 
-	vector<Individual> expectedIndividuals{customIndividuals[1], customIndividuals[0], customIndividuals[2]};
+	std::vector<Individual> expectedIndividuals{customIndividuals[1], customIndividuals[0], customIndividuals[2]};
 	BOOST_TEST(population.individuals() == expectedIndividuals);
 }
 
@@ -170,13 +169,13 @@ BOOST_FIXTURE_TEST_CASE(makeRandom_should_use_random_chromosome_length, Populati
 	constexpr double relativeTolerance = 0.05;
 
 	auto population = Population::makeRandom(m_fitnessMetric, populationSize, minLength, maxLength);
-	vector<size_t> samples = chromosomeLengths(population);
+	std::vector<size_t> samples = chromosomeLengths(population);
 
 	const double expectedValue = (maxLength + minLength) / 2.0;
 	const double variance = ((maxLength - minLength + 1) * (maxLength - minLength + 1) - 1) / 12.0;
 
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_FIXTURE_TEST_CASE(makeRandom_should_return_population_with_random_chromosomes, PopulationFixture)
@@ -186,10 +185,10 @@ BOOST_FIXTURE_TEST_CASE(makeRandom_should_return_population_with_random_chromoso
 	constexpr int chromosomeLength = 30;
 	constexpr double relativeTolerance = 0.01;
 
-	map<string, size_t> stepIndices = enumerateOptmisationSteps();
+	std::map<std::string, size_t> stepIndices = enumerateOptmisationSteps();
 	auto population = Population::makeRandom(m_fitnessMetric, populationSize, chromosomeLength, chromosomeLength);
 
-	vector<size_t> samples;
+	std::vector<size_t> samples;
 	for (auto& individual: population.individuals())
 		for (auto& step: individual.chromosome.optimisationSteps())
 			samples.push_back(stepIndices.at(step));
@@ -197,8 +196,8 @@ BOOST_FIXTURE_TEST_CASE(makeRandom_should_return_population_with_random_chromoso
 	const double expectedValue = double(stepIndices.size() - 1) / 2.0;
 	const double variance = double(stepIndices.size() * stepIndices.size() - 1) / 12.0;
 
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_FIXTURE_TEST_CASE(makeRandom_should_compute_fitness, PopulationFixture)
@@ -223,7 +222,7 @@ BOOST_FIXTURE_TEST_CASE(select_should_return_population_containing_individuals_i
 {
 	Population population(m_fitnessMetric, {Chromosome("a"), Chromosome("c"), Chromosome("g"), Chromosome("h")});
 	RangeSelection selection(0.25, 0.75);
-	assert(selection.materialise(population.individuals().size()) == (vector<size_t>{1, 2}));
+	assert(selection.materialise(population.individuals().size()) == (std::vector<size_t>{1, 2}));
 
 	BOOST_TEST(
 		population.select(selection) ==
@@ -235,7 +234,7 @@ BOOST_FIXTURE_TEST_CASE(select_should_include_duplicates_if_selection_contains_d
 {
 	Population population(m_fitnessMetric, {Chromosome("a"), Chromosome("c")});
 	MosaicSelection selection({0, 1}, 2.0);
-	assert(selection.materialise(population.individuals().size()) == (vector<size_t>{0, 1, 0, 1}));
+	assert(selection.materialise(population.individuals().size()) == (std::vector<size_t>{0, 1, 0, 1}));
 
 	BOOST_TEST(population.select(selection) == Population(m_fitnessMetric, {
 		population.individuals()[0].chromosome,
@@ -258,7 +257,7 @@ BOOST_FIXTURE_TEST_CASE(mutate_should_return_population_containing_individuals_i
 {
 	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc"), Chromosome("gg"), Chromosome("hh")});
 	RangeSelection selection(0.25, 0.75);
-	assert(selection.materialise(population.individuals().size()) == (vector<size_t>{1, 2}));
+	assert(selection.materialise(population.individuals().size()) == (std::vector<size_t>{1, 2}));
 
 	Population expectedPopulation(m_fitnessMetric, {Chromosome("fc"), Chromosome("fg")});
 
@@ -269,7 +268,7 @@ BOOST_FIXTURE_TEST_CASE(mutate_should_include_duplicates_if_selection_contains_d
 {
 	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("aa")});
 	RangeSelection selection(0.0, 1.0);
-	assert(selection.materialise(population.individuals().size()) == (vector<size_t>{0, 1}));
+	assert(selection.materialise(population.individuals().size()) == (std::vector<size_t>{0, 1}));
 
 	BOOST_TEST(
 		population.mutate(selection, geneSubstitution(0, BlockFlattener::name)) ==
@@ -290,7 +289,7 @@ BOOST_FIXTURE_TEST_CASE(crossover_should_return_population_containing_individual
 {
 	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc"), Chromosome("gg"), Chromosome("hh")});
 	PairMosaicSelection selection({{0, 1}, {2, 1}}, 1.0);
-	assert(selection.materialise(population.individuals().size()) == (vector<tuple<size_t, size_t>>{{0, 1}, {2, 1}, {0, 1}, {2, 1}}));
+	assert(selection.materialise(population.individuals().size()) == (std::vector<std::tuple<size_t, size_t>>{{0, 1}, {2, 1}, {0, 1}, {2, 1}}));
 
 	Population expectedPopulation(m_fitnessMetric, {Chromosome("ac"), Chromosome("ac"), Chromosome("gc"), Chromosome("gc")});
 
@@ -301,7 +300,7 @@ BOOST_FIXTURE_TEST_CASE(crossover_should_include_duplicates_if_selection_contain
 {
 	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("aa")});
 	PairMosaicSelection selection({{0, 0}, {1, 1}}, 2.0);
-	assert(selection.materialise(population.individuals().size()) == (vector<tuple<size_t, size_t>>{{0, 0}, {1, 1}, {0, 0}, {1, 1}}));
+	assert(selection.materialise(population.individuals().size()) == (std::vector<std::tuple<size_t, size_t>>{{0, 0}, {1, 1}, {0, 0}, {1, 1}}));
 
 	BOOST_TEST(
 		population.crossover(selection, fixedPointCrossover(0.5)) ==
@@ -322,14 +321,14 @@ BOOST_FIXTURE_TEST_CASE(symmetricCrossoverWithRemainder_should_return_crossed_po
 {
 	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc"), Chromosome("gg"), Chromosome("hh")});
 	PairMosaicSelection selection({{2, 1}}, 0.25);
-	assert(selection.materialise(population.individuals().size()) == (vector<tuple<size_t, size_t>>{{2, 1}}));
+	assert(selection.materialise(population.individuals().size()) == (std::vector<std::tuple<size_t, size_t>>{{2, 1}}));
 
 	Population expectedCrossedPopulation(m_fitnessMetric, {Chromosome("gc"), Chromosome("cg")});
 	Population expectedRemainder(m_fitnessMetric, {Chromosome("aa"), Chromosome("hh")});
 
 	BOOST_TEST(
 		population.symmetricCrossoverWithRemainder(selection, twoStepSwap) ==
-		(tuple<Population, Population>{expectedCrossedPopulation, expectedRemainder})
+		(std::tuple<Population, Population>{expectedCrossedPopulation, expectedRemainder})
 	);
 }
 
@@ -337,7 +336,7 @@ BOOST_FIXTURE_TEST_CASE(symmetricCrossoverWithRemainder_should_allow_crossing_th
 {
 	Population population(m_fitnessMetric, {Chromosome("aa"), Chromosome("cc"), Chromosome("gg"), Chromosome("hh")});
 	PairMosaicSelection selection({{0, 0}, {2, 1}}, 1.0);
-	assert(selection.materialise(population.individuals().size()) == (vector<tuple<size_t, size_t>>{{0, 0}, {2, 1}, {0, 0}, {2, 1}}));
+	assert(selection.materialise(population.individuals().size()) == (std::vector<std::tuple<size_t, size_t>>{{0, 0}, {2, 1}, {0, 0}, {2, 1}}));
 
 	Population expectedCrossedPopulation(m_fitnessMetric, {
 		Chromosome("aa"), Chromosome("aa"),
@@ -349,7 +348,7 @@ BOOST_FIXTURE_TEST_CASE(symmetricCrossoverWithRemainder_should_allow_crossing_th
 
 	BOOST_TEST(
 		population.symmetricCrossoverWithRemainder(selection, twoStepSwap) ==
-		(tuple<Population, Population>{expectedCrossedPopulation, expectedRemainder})
+		(std::tuple<Population, Population>{expectedCrossedPopulation, expectedRemainder})
 	);
 }
 
@@ -361,7 +360,7 @@ BOOST_FIXTURE_TEST_CASE(symmetricCrossoverWithRemainder_should_return_empty_popu
 
 	BOOST_TEST(
 		population.symmetricCrossoverWithRemainder(selection, twoStepSwap) ==
-		(tuple<Population, Population>{Population(m_fitnessMetric), population})
+		(std::tuple<Population, Population>{Population(m_fitnessMetric), population})
 	);
 }
 
diff --git a/test/yulPhaser/Program.cpp b/test/yulPhaser/Program.cpp
index 2e91926d05..a54bf09af1 100644
--- a/test/yulPhaser/Program.cpp
+++ b/test/yulPhaser/Program.cpp
@@ -34,7 +34,6 @@
 #include <cassert>
 #include <string>
 
-using namespace std;
 using namespace solidity::langutil;
 using namespace solidity::util;
 using namespace solidity::yul;
@@ -47,7 +46,7 @@ namespace
 	/// If the block isn't redundant it just returns it immediately.
 	Block const& skipRedundantBlocks(Block const& _block)
 	{
-		if (_block.statements.size() == 1 && holds_alternative<Block>(_block.statements[0]))
+		if (_block.statements.size() == 1 && std::holds_alternative<Block>(_block.statements[0]))
 			return skipRedundantBlocks(get<Block>(_block.statements[0]));
 		else
 			return _block;
@@ -62,7 +61,7 @@ BOOST_AUTO_TEST_SUITE(ProgramTest)
 
 BOOST_AUTO_TEST_CASE(copy_constructor_should_make_deep_copy_of_ast)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"{\n"
 		"    let x := 1\n"
 		"}\n"
@@ -82,7 +81,7 @@ BOOST_AUTO_TEST_CASE(copy_constructor_should_make_deep_copy_of_ast)
 
 BOOST_AUTO_TEST_CASE(load_should_rewind_the_stream)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"{\n"
 		"    let x := 1\n"
 		"    let y := 2\n"
@@ -98,7 +97,7 @@ BOOST_AUTO_TEST_CASE(load_should_rewind_the_stream)
 
 BOOST_AUTO_TEST_CASE(load_should_disambiguate)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"{\n"
 		"    {\n"
 		"        let x := 1\n"
@@ -126,7 +125,7 @@ BOOST_AUTO_TEST_CASE(load_should_disambiguate)
 
 BOOST_AUTO_TEST_CASE(load_should_do_function_grouping_and_hoisting)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"{\n"
 		"    function foo() -> result\n"
 		"    {\n"
@@ -144,14 +143,14 @@ BOOST_AUTO_TEST_CASE(load_should_do_function_grouping_and_hoisting)
 	Program program = get<Program>(Program::load(sourceStream));
 
 	BOOST_TEST(program.ast().statements.size() == 3);
-	BOOST_TEST(holds_alternative<Block>(program.ast().statements[0]));
-	BOOST_TEST(holds_alternative<FunctionDefinition>(program.ast().statements[1]));
-	BOOST_TEST(holds_alternative<FunctionDefinition>(program.ast().statements[2]));
+	BOOST_TEST(std::holds_alternative<Block>(program.ast().statements[0]));
+	BOOST_TEST(std::holds_alternative<FunctionDefinition>(program.ast().statements[1]));
+	BOOST_TEST(std::holds_alternative<FunctionDefinition>(program.ast().statements[2]));
 }
 
 BOOST_AUTO_TEST_CASE(load_should_do_loop_init_rewriting)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"{\n"
 		"    for { let i := 0 } true {}\n"
 		"    {\n"
@@ -163,35 +162,35 @@ BOOST_AUTO_TEST_CASE(load_should_do_loop_init_rewriting)
 
 	// skipRedundantBlocks() makes the test independent of whether load() includes function grouping or not.
 	Block const& parentBlock = skipRedundantBlocks(program.ast());
-	BOOST_TEST(holds_alternative<VariableDeclaration>(parentBlock.statements[0]));
-	BOOST_TEST(holds_alternative<ForLoop>(parentBlock.statements[1]));
+	BOOST_TEST(std::holds_alternative<VariableDeclaration>(parentBlock.statements[0]));
+	BOOST_TEST(std::holds_alternative<ForLoop>(parentBlock.statements[1]));
 }
 
 BOOST_AUTO_TEST_CASE(load_should_throw_InvalidProgram_if_program_cant_be_parsed)
 {
-	string sourceCode("invalid program\n");
+	std::string sourceCode("invalid program\n");
 	CharStream sourceStream(sourceCode, current_test_case().p_name);
 
-	BOOST_TEST(holds_alternative<ErrorList>(Program::load(sourceStream)));
+	BOOST_TEST(std::holds_alternative<ErrorList>(Program::load(sourceStream)));
 }
 
 BOOST_AUTO_TEST_CASE(load_should_throw_InvalidProgram_if_program_cant_be_analyzed)
 {
 	// This should be parsed just fine but fail the analysis with:
 	//     Error: Variable not found or variable not lvalue.
-	string sourceCode(
+	std::string sourceCode(
 		"{\n"
 		"    x := 1\n"
 		"}\n"
 	);
 	CharStream sourceStream(sourceCode, current_test_case().p_name);
 
-	BOOST_TEST(holds_alternative<ErrorList>(Program::load(sourceStream)));
+	BOOST_TEST(std::holds_alternative<ErrorList>(Program::load(sourceStream)));
 }
 
 BOOST_AUTO_TEST_CASE(load_should_accept_yul_objects_as_input)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"object \"C_178\" {\n"
 		"    code {\n"
 		"        mstore(64, 128)\n"
@@ -203,12 +202,12 @@ BOOST_AUTO_TEST_CASE(load_should_accept_yul_objects_as_input)
 	CharStream sourceStream(sourceCode, current_test_case().p_name);
 	auto programOrErrors = Program::load(sourceStream);
 
-	BOOST_TEST(holds_alternative<Program>(programOrErrors));
+	BOOST_TEST(std::holds_alternative<Program>(programOrErrors));
 }
 
 BOOST_AUTO_TEST_CASE(load_should_return_errors_if_analysis_of_object_code_fails)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"object \"C_178\" {\n"
 		"    code {\n"
 		"        return(0, datasize(\"C_178_deployed\"))\n"
@@ -218,12 +217,12 @@ BOOST_AUTO_TEST_CASE(load_should_return_errors_if_analysis_of_object_code_fails)
 	CharStream sourceStream(sourceCode, current_test_case().p_name);
 	auto programOrErrors = Program::load(sourceStream);
 
-	BOOST_TEST(holds_alternative<ErrorList>(programOrErrors));
+	BOOST_TEST(std::holds_alternative<ErrorList>(programOrErrors));
 }
 
 BOOST_AUTO_TEST_CASE(load_should_return_errors_if_parsing_of_nested_object_fails)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"object \"C_178\" {\n"
 		"    code {\n"
 		"        return(0, datasize(\"C_178_deployed\"))\n"
@@ -243,12 +242,12 @@ BOOST_AUTO_TEST_CASE(load_should_return_errors_if_parsing_of_nested_object_fails
 	CharStream sourceStream(sourceCode, current_test_case().p_name);
 	auto programOrErrors = Program::load(sourceStream);
 
-	BOOST_TEST(holds_alternative<ErrorList>(programOrErrors));
+	BOOST_TEST(std::holds_alternative<ErrorList>(programOrErrors));
 }
 
 BOOST_AUTO_TEST_CASE(load_should_extract_nested_object_with_deployed_suffix_if_present)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"object \"C_178\" {\n"
 		"    code {\n"
 		"        return(0, datasize(\"C_178_deployed\"))\n"
@@ -265,12 +264,12 @@ BOOST_AUTO_TEST_CASE(load_should_extract_nested_object_with_deployed_suffix_if_p
 	CharStream sourceStream(sourceCode, current_test_case().p_name);
 	auto programOrErrors = Program::load(sourceStream);
 
-	BOOST_TEST(holds_alternative<Program>(programOrErrors));
+	BOOST_TEST(std::holds_alternative<Program>(programOrErrors));
 }
 
 BOOST_AUTO_TEST_CASE(load_should_fall_back_to_parsing_the_whole_object_if_there_is_no_subobject_with_the_right_name)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"object \"C_178\" {\n"
 		"    code {\n"
 		"        mstore(64, 128)\n"
@@ -292,16 +291,16 @@ BOOST_AUTO_TEST_CASE(load_should_fall_back_to_parsing_the_whole_object_if_there_
 	CharStream sourceStream(sourceCode, current_test_case().p_name);
 	auto programOrErrors = Program::load(sourceStream);
 
-	BOOST_TEST(holds_alternative<Program>(programOrErrors));
+	BOOST_TEST(std::holds_alternative<Program>(programOrErrors));
 
 	Block const& parentBlock = skipRedundantBlocks(get<Program>(programOrErrors).ast());
 	BOOST_TEST(parentBlock.statements.size() == 1);
-	BOOST_TEST(holds_alternative<ExpressionStatement>(parentBlock.statements[0]));
+	BOOST_TEST(std::holds_alternative<ExpressionStatement>(parentBlock.statements[0]));
 }
 
 BOOST_AUTO_TEST_CASE(load_should_ignore_data_in_objects)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"object \"C_178\" {\n"
 		"    code {\n"
 		"        mstore(64, 128)\n"
@@ -312,12 +311,12 @@ BOOST_AUTO_TEST_CASE(load_should_ignore_data_in_objects)
 	CharStream sourceStream(sourceCode, current_test_case().p_name);
 	auto programOrErrors = Program::load(sourceStream);
 
-	BOOST_TEST(holds_alternative<Program>(programOrErrors));
+	BOOST_TEST(std::holds_alternative<Program>(programOrErrors));
 }
 
 BOOST_AUTO_TEST_CASE(optimise)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"{\n"
 		"    {\n"
 		"        if 1 { let x := 1 }\n"
@@ -330,22 +329,22 @@ BOOST_AUTO_TEST_CASE(optimise)
 
 	[[maybe_unused]] Block const& parentBlockBefore = skipRedundantBlocks(program.ast());
 	assert(parentBlockBefore.statements.size() == 2);
-	assert(holds_alternative<If>(parentBlockBefore.statements[0]));
-	assert(holds_alternative<If>(parentBlockBefore.statements[1]));
+	assert(std::holds_alternative<If>(parentBlockBefore.statements[0]));
+	assert(std::holds_alternative<If>(parentBlockBefore.statements[1]));
 
 	program.optimise({StructuralSimplifier::name, BlockFlattener::name});
 
 	Block const& parentBlockAfter = program.ast();
 	BOOST_TEST(parentBlockAfter.statements.size() == 1);
-	BOOST_TEST(holds_alternative<Block>(parentBlockAfter.statements[0]));
+	BOOST_TEST(std::holds_alternative<Block>(parentBlockAfter.statements[0]));
 	Block const& innerBlock = get<Block>(parentBlockAfter.statements[0]);
 	BOOST_TEST(innerBlock.statements.size() == 1);
-	BOOST_TEST(holds_alternative<VariableDeclaration>(innerBlock.statements[0]));
+	BOOST_TEST(std::holds_alternative<VariableDeclaration>(innerBlock.statements[0]));
 }
 
 BOOST_AUTO_TEST_CASE(output_operator)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"{\n"
 		"    let factor := 13\n"
 		"    {\n"
@@ -369,7 +368,7 @@ BOOST_AUTO_TEST_CASE(output_operator)
 
 BOOST_AUTO_TEST_CASE(toJson)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"{\n"
 		"    let a := 3\n"
 		"    if a\n"
@@ -382,14 +381,14 @@ BOOST_AUTO_TEST_CASE(toJson)
 	Program program = get<Program>(Program::load(sourceStream));
 
 	Json::Value parsingResult;
-	string errors;
+	std::string errors;
 	BOOST_TEST(jsonParseStrict(program.toJson(), parsingResult, &errors));
 	BOOST_TEST(errors.empty());
 }
 
 BOOST_AUTO_TEST_CASE(codeSize)
 {
-	string sourceCode(
+	std::string sourceCode(
 		"{\n"
 		"    function foo() -> result\n"
 		"    {\n"
diff --git a/test/yulPhaser/ProgramCache.cpp b/test/yulPhaser/ProgramCache.cpp
index 2dab86fcda..c4bf7f609e 100644
--- a/test/yulPhaser/ProgramCache.cpp
+++ b/test/yulPhaser/ProgramCache.cpp
@@ -30,7 +30,6 @@
 #include <string>
 #include <set>
 
-using namespace std;
 using namespace solidity::util;
 using namespace solidity::langutil;
 using namespace solidity::yul;
@@ -50,16 +49,16 @@ class ProgramCacheFixture
 		"    }\n"
 		"}\n";
 
-	Program optimisedProgram(Program _program, string _abbreviatedOptimisationSteps) const
+	Program optimisedProgram(Program _program, std::string _abbreviatedOptimisationSteps) const
 	{
 		Program result = std::move(_program);
 		result.optimise(Chromosome::genesToSteps(_abbreviatedOptimisationSteps));
 		return result;
 	}
 
-	static set<string> cachedKeys(ProgramCache const& _programCache)
+	static std::set<std::string> cachedKeys(ProgramCache const& _programCache)
 	{
-		 set<string> keys;
+		 std::set<std::string> keys;
 		for (auto pair = _programCache.entries().begin(); pair != _programCache.entries().end(); ++pair)
 			keys.insert(pair->first);
 
@@ -67,7 +66,7 @@ class ProgramCacheFixture
 	}
 
 	CharStream m_sourceStream = CharStream(SampleSourceCode, "program-cache-test");
-	Program m_program = get<Program>(Program::load(m_sourceStream));
+	Program m_program = std::get<Program>(Program::load(m_sourceStream));
 	ProgramCache m_programCache{m_program};
 };
 
@@ -111,7 +110,7 @@ BOOST_FIXTURE_TEST_CASE(optimiseProgram_should_store_programs_for_all_prefixes,
 
 	BOOST_TEST(toString(cachedProgram) == toString(programIuO));
 
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "IuO"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"I", "Iu", "IuO"}));
 	BOOST_TEST(toString(*m_programCache.find("I")) == toString(programI));
 	BOOST_TEST(toString(*m_programCache.find("Iu")) == toString(programIu));
 	BOOST_TEST(toString(*m_programCache.find("IuO")) == toString(programIuO));
@@ -119,7 +118,7 @@ BOOST_FIXTURE_TEST_CASE(optimiseProgram_should_store_programs_for_all_prefixes,
 
 BOOST_FIXTURE_TEST_CASE(optimiseProgram_should_repeat_the_chromosome_requested_number_of_times, ProgramCacheFixture)
 {
-	string steps = "IuOIuO";
+	std::string steps = "IuOIuO";
 
 	Program cachedProgram = m_programCache.optimiseProgram("IuO", 2);
 
@@ -148,14 +147,14 @@ BOOST_FIXTURE_TEST_CASE(optimiseProgram_should_reuse_the_longest_prefix_and_move
 	m_programCache.startRound(1);
 
 	BOOST_TEST(m_programCache.currentRound() == 1);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "Ia"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"I", "Iu", "Ia"}));
 	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 0);
 	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 0);
 	BOOST_TEST(m_programCache.entries().find("Ia")->second.roundNumber == 0);
 
 	m_programCache.optimiseProgram("IuOI");
 
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "Ia", "IuO", "IuOI"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"I", "Iu", "Ia", "IuO", "IuOI"}));
 	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 1);
 	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 1);
 	BOOST_TEST(m_programCache.entries().find("Ia")->second.roundNumber == 0);
@@ -171,14 +170,14 @@ BOOST_FIXTURE_TEST_CASE(startRound_should_remove_entries_older_than_two_rounds,
 	m_programCache.optimiseProgram("Iu");
 
 	BOOST_TEST(m_programCache.currentRound() == 0);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"I", "Iu"}));
 	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 0);
 	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 0);
 
 	m_programCache.optimiseProgram("a");
 
 	BOOST_TEST(m_programCache.currentRound() == 0);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "a"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"I", "Iu", "a"}));
 	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 0);
 	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 0);
 	BOOST_TEST(m_programCache.entries().find("a")->second.roundNumber == 0);
@@ -186,7 +185,7 @@ BOOST_FIXTURE_TEST_CASE(startRound_should_remove_entries_older_than_two_rounds,
 	m_programCache.startRound(1);
 
 	BOOST_TEST(m_programCache.currentRound() == 1);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "a"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"I", "Iu", "a"}));
 	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 0);
 	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 0);
 	BOOST_TEST(m_programCache.entries().find("a")->second.roundNumber == 0);
@@ -194,7 +193,7 @@ BOOST_FIXTURE_TEST_CASE(startRound_should_remove_entries_older_than_two_rounds,
 	m_programCache.optimiseProgram("af");
 
 	BOOST_TEST(m_programCache.currentRound() == 1);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "a", "af"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"I", "Iu", "a", "af"}));
 	BOOST_TEST(m_programCache.entries().find("I")->second.roundNumber == 0);
 	BOOST_TEST(m_programCache.entries().find("Iu")->second.roundNumber == 0);
 	BOOST_TEST(m_programCache.entries().find("a")->second.roundNumber == 1);
@@ -203,7 +202,7 @@ BOOST_FIXTURE_TEST_CASE(startRound_should_remove_entries_older_than_two_rounds,
 	m_programCache.startRound(2);
 
 	BOOST_TEST(m_programCache.currentRound() == 2);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"a", "af"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"a", "af"}));
 	BOOST_TEST(m_programCache.entries().find("a")->second.roundNumber == 1);
 	BOOST_TEST(m_programCache.entries().find("af")->second.roundNumber == 1);
 
@@ -223,31 +222,31 @@ BOOST_FIXTURE_TEST_CASE(gatherStats_should_return_cache_statistics, ProgramCache
 
 	m_programCache.optimiseProgram("L");
 	m_programCache.optimiseProgram("Iu");
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"L", "I", "Iu"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"L", "I", "Iu"}));
 	CacheStats expectedStats1{0, 3, sizeL + sizeI + sizeIu, {{0, 3}}};
 	BOOST_CHECK(m_programCache.gatherStats() == expectedStats1);
 
 	m_programCache.optimiseProgram("IuO");
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"L", "I", "Iu", "IuO"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"L", "I", "Iu", "IuO"}));
 	CacheStats expectedStats2{2, 4, sizeL + sizeI + sizeIu + sizeIuO, {{0, 4}}};
 	BOOST_CHECK(m_programCache.gatherStats() == expectedStats2);
 
 	m_programCache.startRound(1);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"L", "I", "Iu", "IuO"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"L", "I", "Iu", "IuO"}));
 	BOOST_CHECK(m_programCache.gatherStats() == expectedStats2);
 
 	m_programCache.optimiseProgram("IuO");
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"L", "I", "Iu", "IuO"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"L", "I", "Iu", "IuO"}));
 	CacheStats expectedStats3{5, 4, sizeL + sizeI + sizeIu + sizeIuO, {{0, 1}, {1, 3}}};
 	BOOST_CHECK(m_programCache.gatherStats() == expectedStats3);
 
 	m_programCache.startRound(2);
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"I", "Iu", "IuO"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"I", "Iu", "IuO"}));
 	CacheStats expectedStats4{5, 4, sizeI + sizeIu + sizeIuO, {{1, 3}}};
 	BOOST_CHECK(m_programCache.gatherStats() == expectedStats4);
 
 	m_programCache.optimiseProgram("LT");
-	BOOST_REQUIRE((cachedKeys(m_programCache) == set<string>{"L", "LT", "I", "Iu", "IuO"}));
+	BOOST_REQUIRE((cachedKeys(m_programCache) == std::set<std::string>{"L", "LT", "I", "Iu", "IuO"}));
 	CacheStats expectedStats5{5, 6, sizeL + sizeLT + sizeI + sizeIu + sizeIuO, {{1, 3}, {2, 2}}};
 	BOOST_CHECK(m_programCache.gatherStats() == expectedStats5);
 }
diff --git a/test/yulPhaser/Selections.cpp b/test/yulPhaser/Selections.cpp
index 28c8b8a879..8662349785 100644
--- a/test/yulPhaser/Selections.cpp
+++ b/test/yulPhaser/Selections.cpp
@@ -29,7 +29,6 @@
 #include <set>
 #include <vector>
 
-using namespace std;
 using namespace solidity::util;
 
 namespace solidity::phaser::test
@@ -41,28 +40,28 @@ BOOST_AUTO_TEST_SUITE(RangeSelectionTest)
 
 BOOST_AUTO_TEST_CASE(materialise)
 {
-	BOOST_TEST(RangeSelection(0.0, 1.0).materialise(10) == vector<size_t>({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));
-	BOOST_TEST(RangeSelection(0.0, 0.1).materialise(10) == vector<size_t>({0}));
-	BOOST_TEST(RangeSelection(0.0, 0.2).materialise(10) == vector<size_t>({0, 1}));
-	BOOST_TEST(RangeSelection(0.0, 0.7).materialise(10) == vector<size_t>({0, 1, 2, 3, 4, 5, 6}));
+	BOOST_TEST(RangeSelection(0.0, 1.0).materialise(10) == std::vector<size_t>({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));
+	BOOST_TEST(RangeSelection(0.0, 0.1).materialise(10) == std::vector<size_t>({0}));
+	BOOST_TEST(RangeSelection(0.0, 0.2).materialise(10) == std::vector<size_t>({0, 1}));
+	BOOST_TEST(RangeSelection(0.0, 0.7).materialise(10) == std::vector<size_t>({0, 1, 2, 3, 4, 5, 6}));
 
-	BOOST_TEST(RangeSelection(0.9, 1.0).materialise(10) == vector<size_t>({                           9}));
-	BOOST_TEST(RangeSelection(0.8, 1.0).materialise(10) == vector<size_t>({                        8, 9}));
-	BOOST_TEST(RangeSelection(0.5, 1.0).materialise(10) == vector<size_t>({               5, 6, 7, 8, 9}));
+	BOOST_TEST(RangeSelection(0.9, 1.0).materialise(10) == std::vector<size_t>({                           9}));
+	BOOST_TEST(RangeSelection(0.8, 1.0).materialise(10) == std::vector<size_t>({                        8, 9}));
+	BOOST_TEST(RangeSelection(0.5, 1.0).materialise(10) == std::vector<size_t>({               5, 6, 7, 8, 9}));
 
-	BOOST_TEST(RangeSelection(0.3, 0.6).materialise(10) == vector<size_t>({         3, 4, 5            }));
-	BOOST_TEST(RangeSelection(0.2, 0.7).materialise(10) == vector<size_t>({      2, 3, 4, 5, 6         }));
-	BOOST_TEST(RangeSelection(0.4, 0.7).materialise(10) == vector<size_t>({            4, 5, 6         }));
+	BOOST_TEST(RangeSelection(0.3, 0.6).materialise(10) == std::vector<size_t>({         3, 4, 5            }));
+	BOOST_TEST(RangeSelection(0.2, 0.7).materialise(10) == std::vector<size_t>({      2, 3, 4, 5, 6         }));
+	BOOST_TEST(RangeSelection(0.4, 0.7).materialise(10) == std::vector<size_t>({            4, 5, 6         }));
 
-	BOOST_TEST(RangeSelection(0.4, 0.7).materialise(5) == vector<size_t>({2, 3}));
+	BOOST_TEST(RangeSelection(0.4, 0.7).materialise(5) == std::vector<size_t>({2, 3}));
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_round_indices)
 {
-	BOOST_TEST(RangeSelection(0.01, 0.99).materialise(10) == vector<size_t>({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));
-	BOOST_TEST(RangeSelection(0.04, 0.96).materialise(10) == vector<size_t>({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));
-	BOOST_TEST(RangeSelection(0.05, 0.95).materialise(10) == vector<size_t>({   1, 2, 3, 4, 5, 6, 7, 8, 9}));
-	BOOST_TEST(RangeSelection(0.06, 0.94).materialise(10) == vector<size_t>({   1, 2, 3, 4, 5, 6, 7, 8   }));
+	BOOST_TEST(RangeSelection(0.01, 0.99).materialise(10) == std::vector<size_t>({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));
+	BOOST_TEST(RangeSelection(0.04, 0.96).materialise(10) == std::vector<size_t>({0, 1, 2, 3, 4, 5, 6, 7, 8, 9}));
+	BOOST_TEST(RangeSelection(0.05, 0.95).materialise(10) == std::vector<size_t>({   1, 2, 3, 4, 5, 6, 7, 8, 9}));
+	BOOST_TEST(RangeSelection(0.06, 0.94).materialise(10) == std::vector<size_t>({   1, 2, 3, 4, 5, 6, 7, 8   }));
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_handle_empty_collections)
@@ -93,27 +92,27 @@ BOOST_AUTO_TEST_SUITE(MosaicSelectionTest)
 
 BOOST_AUTO_TEST_CASE(materialise)
 {
-	BOOST_TEST(MosaicSelection({1}, 0.5).materialise(4) == vector<size_t>({1, 1}));
-	BOOST_TEST(MosaicSelection({1}, 1.0).materialise(4) == vector<size_t>({1, 1, 1, 1}));
-	BOOST_TEST(MosaicSelection({1}, 2.0).materialise(4) == vector<size_t>({1, 1, 1, 1, 1, 1, 1, 1}));
-	BOOST_TEST(MosaicSelection({1}, 1.0).materialise(2) == vector<size_t>({1, 1}));
-
-	BOOST_TEST(MosaicSelection({0, 1}, 0.5).materialise(4) == vector<size_t>({0, 1}));
-	BOOST_TEST(MosaicSelection({0, 1}, 1.0).materialise(4) == vector<size_t>({0, 1, 0, 1}));
-	BOOST_TEST(MosaicSelection({0, 1}, 2.0).materialise(4) == vector<size_t>({0, 1, 0, 1, 0, 1, 0, 1}));
-	BOOST_TEST(MosaicSelection({0, 1}, 1.0).materialise(2) == vector<size_t>({0, 1}));
-
-	BOOST_TEST(MosaicSelection({3, 2, 1, 0}, 0.5).materialise(4) == vector<size_t>({3, 2}));
-	BOOST_TEST(MosaicSelection({3, 2, 1, 0}, 1.0).materialise(4) == vector<size_t>({3, 2, 1, 0}));
-	BOOST_TEST(MosaicSelection({3, 2, 1, 0}, 2.0).materialise(4) == vector<size_t>({3, 2, 1, 0, 3, 2, 1, 0}));
-	BOOST_TEST(MosaicSelection({1, 0, 1, 0}, 1.0).materialise(2) == vector<size_t>({1, 0}));
+	BOOST_TEST(MosaicSelection({1}, 0.5).materialise(4) == std::vector<size_t>({1, 1}));
+	BOOST_TEST(MosaicSelection({1}, 1.0).materialise(4) == std::vector<size_t>({1, 1, 1, 1}));
+	BOOST_TEST(MosaicSelection({1}, 2.0).materialise(4) == std::vector<size_t>({1, 1, 1, 1, 1, 1, 1, 1}));
+	BOOST_TEST(MosaicSelection({1}, 1.0).materialise(2) == std::vector<size_t>({1, 1}));
+
+	BOOST_TEST(MosaicSelection({0, 1}, 0.5).materialise(4) == std::vector<size_t>({0, 1}));
+	BOOST_TEST(MosaicSelection({0, 1}, 1.0).materialise(4) == std::vector<size_t>({0, 1, 0, 1}));
+	BOOST_TEST(MosaicSelection({0, 1}, 2.0).materialise(4) == std::vector<size_t>({0, 1, 0, 1, 0, 1, 0, 1}));
+	BOOST_TEST(MosaicSelection({0, 1}, 1.0).materialise(2) == std::vector<size_t>({0, 1}));
+
+	BOOST_TEST(MosaicSelection({3, 2, 1, 0}, 0.5).materialise(4) == std::vector<size_t>({3, 2}));
+	BOOST_TEST(MosaicSelection({3, 2, 1, 0}, 1.0).materialise(4) == std::vector<size_t>({3, 2, 1, 0}));
+	BOOST_TEST(MosaicSelection({3, 2, 1, 0}, 2.0).materialise(4) == std::vector<size_t>({3, 2, 1, 0, 3, 2, 1, 0}));
+	BOOST_TEST(MosaicSelection({1, 0, 1, 0}, 1.0).materialise(2) == std::vector<size_t>({1, 0}));
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_round_indices)
 {
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 0.49).materialise(5) == vector<size_t>({4, 3}));
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 0.50).materialise(5) == vector<size_t>({4, 3, 2}));
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 0.51).materialise(5) == vector<size_t>({4, 3, 2}));
+	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 0.49).materialise(5) == std::vector<size_t>({4, 3}));
+	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 0.50).materialise(5) == std::vector<size_t>({4, 3, 2}));
+	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 0.51).materialise(5) == std::vector<size_t>({4, 3, 2}));
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_handle_empty_collections)
@@ -132,10 +131,10 @@ BOOST_AUTO_TEST_CASE(materialise_should_handle_empty_selections)
 
 BOOST_AUTO_TEST_CASE(materialise_should_clamp_indices_at_collection_size)
 {
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 1.0).materialise(4) == vector<size_t>({3, 3, 2, 1}));
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 2.0).materialise(3) == vector<size_t>({2, 2, 2, 1, 0, 2}));
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 1.0).materialise(1) == vector<size_t>({0}));
-	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 7.0).materialise(1) == vector<size_t>({0, 0, 0, 0, 0, 0, 0}));
+	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 1.0).materialise(4) == std::vector<size_t>({3, 3, 2, 1}));
+	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 2.0).materialise(3) == std::vector<size_t>({2, 2, 2, 1, 0, 2}));
+	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 1.0).materialise(1) == std::vector<size_t>({0}));
+	BOOST_TEST(MosaicSelection({4, 3, 2, 1, 0}, 7.0).materialise(1) == std::vector<size_t>({0, 0, 0, 0, 0, 0, 0}));
 }
 
 BOOST_AUTO_TEST_SUITE_END()
@@ -150,17 +149,17 @@ BOOST_AUTO_TEST_CASE(materialise_should_return_random_values_with_equal_probabil
 	constexpr double variance = (collectionSize * collectionSize - 1) / 12.0;
 
 	SimulationRNG::reset(1);
-	vector<size_t> samples = RandomSelection(selectionSize).materialise(collectionSize);
+	std::vector<size_t> samples = RandomSelection(selectionSize).materialise(collectionSize);
 
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_return_only_values_that_can_be_used_as_collection_indices)
 {
 	const size_t collectionSize = 200;
 
-	vector<size_t> indices = RandomSelection(0.5).materialise(collectionSize);
+	std::vector<size_t> indices = RandomSelection(0.5).materialise(collectionSize);
 
 	BOOST_TEST(indices.size() == 100);
 	BOOST_TEST(all_of(indices.begin(), indices.end(), [&](auto const& index){ return index <= collectionSize; }));
@@ -214,20 +213,20 @@ BOOST_AUTO_TEST_CASE(materialise_should_return_random_values_with_equal_probabil
 	constexpr double variance = selectionChance * (1 - selectionChance);
 
 	SimulationRNG::reset(1);
-	auto indices = convertContainer<set<size_t>>(RandomSubset(selectionChance).materialise(collectionSize));
+	auto indices = convertContainer<std::set<size_t>>(RandomSubset(selectionChance).materialise(collectionSize));
 
-	vector<double> bernoulliTrials(collectionSize);
+	std::vector<double> bernoulliTrials(collectionSize);
 	for (size_t i = 0; i < collectionSize; ++i)
 		bernoulliTrials[i] = double(indices.count(i));
 
-	BOOST_TEST(abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(bernoulliTrials) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(bernoulliTrials, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_AUTO_TEST_CASE(materialise_should_return_only_values_that_can_be_used_as_collection_indices)
 {
 	const size_t collectionSize = 200;
-	vector<size_t> indices = RandomSubset(0.5).materialise(collectionSize);
+	std::vector<size_t> indices = RandomSubset(0.5).materialise(collectionSize);
 
 	BOOST_TEST(all_of(indices.begin(), indices.end(), [&](auto const& index){ return index <= collectionSize; }));
 }
@@ -235,7 +234,7 @@ BOOST_AUTO_TEST_CASE(materialise_should_return_only_values_that_can_be_used_as_c
 BOOST_AUTO_TEST_CASE(materialise_should_return_indices_in_the_same_order_they_are_in_the_container)
 {
 	const size_t collectionSize = 200;
-	vector<size_t> indices = RandomSubset(0.5).materialise(collectionSize);
+	std::vector<size_t> indices = RandomSubset(0.5).materialise(collectionSize);
 
 	for (size_t i = 1; i < indices.size(); ++i)
 		BOOST_TEST(indices[i - 1] < indices[i]);
diff --git a/test/yulPhaser/SimulationRNG.cpp b/test/yulPhaser/SimulationRNG.cpp
index d6e8c3a811..ff91846e30 100644
--- a/test/yulPhaser/SimulationRNG.cpp
+++ b/test/yulPhaser/SimulationRNG.cpp
@@ -24,8 +24,6 @@
 
 #include <cassert>
 
-using namespace std;
-
 namespace solidity::phaser::test
 {
 
@@ -43,12 +41,12 @@ BOOST_AUTO_TEST_CASE(bernoulliTrial_should_produce_samples_with_right_expected_v
 	constexpr double expectedValue = successProbability;
 	constexpr double variance = successProbability * (1 - successProbability);
 
-	vector<uint32_t> samples;
+	std::vector<uint32_t> samples;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples.push_back(static_cast<uint32_t>(SimulationRNG::bernoulliTrial(successProbability)));
 
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_AUTO_TEST_CASE(bernoulliTrial_can_be_reset)
@@ -57,21 +55,21 @@ BOOST_AUTO_TEST_CASE(bernoulliTrial_can_be_reset)
 	constexpr double successProbability = 0.4;
 
 	SimulationRNG::reset(1);
-	vector<uint32_t> samples1;
+	std::vector<uint32_t> samples1;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples1.push_back(static_cast<uint32_t>(SimulationRNG::bernoulliTrial(successProbability)));
 
-	vector<uint32_t> samples2;
+	std::vector<uint32_t> samples2;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples2.push_back(static_cast<uint32_t>(SimulationRNG::bernoulliTrial(successProbability)));
 
 	SimulationRNG::reset(1);
-	vector<uint32_t> samples3;
+	std::vector<uint32_t> samples3;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples3.push_back(static_cast<uint32_t>(SimulationRNG::bernoulliTrial(successProbability)));
 
 	SimulationRNG::reset(2);
-	vector<uint32_t> samples4;
+	std::vector<uint32_t> samples4;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples4.push_back(static_cast<uint32_t>(SimulationRNG::bernoulliTrial(successProbability)));
 
@@ -95,12 +93,12 @@ BOOST_AUTO_TEST_CASE(uniformInt_returns_different_values_when_called_multiple_ti
 	constexpr double expectedValue = (minValue + maxValue) / 2.0;
 	constexpr double variance = ((maxValue - minValue + 1) * (maxValue - minValue + 1) - 1) / 12.0;
 
-	vector<size_t> samples;
+	std::vector<size_t> samples;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples.push_back(SimulationRNG::uniformInt(minValue, maxValue));
 
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_AUTO_TEST_CASE(uniformInt_can_be_reset)
@@ -110,21 +108,21 @@ BOOST_AUTO_TEST_CASE(uniformInt_can_be_reset)
 	constexpr uint32_t maxValue = 80;
 
 	SimulationRNG::reset(1);
-	vector<size_t> samples1;
+	std::vector<size_t> samples1;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples1.push_back(SimulationRNG::uniformInt(minValue, maxValue));
 
-	vector<size_t> samples2;
+	std::vector<size_t> samples2;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples2.push_back(SimulationRNG::uniformInt(minValue, maxValue));
 
 	SimulationRNG::reset(1);
-	vector<size_t> samples3;
+	std::vector<size_t> samples3;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples3.push_back(SimulationRNG::uniformInt(minValue, maxValue));
 
 	SimulationRNG::reset(2);
-	vector<size_t> samples4;
+	std::vector<size_t> samples4;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples4.push_back(SimulationRNG::uniformInt(minValue, maxValue));
 
@@ -148,12 +146,12 @@ BOOST_AUTO_TEST_CASE(binomialInt_should_produce_samples_with_right_expected_valu
 	constexpr double expectedValue = numTrials * successProbability;
 	constexpr double variance = numTrials * successProbability * (1 - successProbability);
 
-	vector<size_t> samples;
+	std::vector<size_t> samples;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples.push_back(SimulationRNG::binomialInt(numTrials, successProbability));
 
-	BOOST_TEST(abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
-	BOOST_TEST(abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
+	BOOST_TEST(std::abs(mean(samples) - expectedValue) < expectedValue * relativeTolerance);
+	BOOST_TEST(std::abs(meanSquaredError(samples, expectedValue) - variance) < variance * relativeTolerance);
 }
 
 BOOST_AUTO_TEST_CASE(binomialInt_can_be_reset)
@@ -163,21 +161,21 @@ BOOST_AUTO_TEST_CASE(binomialInt_can_be_reset)
 	constexpr double successProbability = 0.6;
 
 	SimulationRNG::reset(1);
-	vector<size_t> samples1;
+	std::vector<size_t> samples1;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples1.push_back(SimulationRNG::binomialInt(numTrials, successProbability));
 
-	vector<size_t> samples2;
+	std::vector<size_t> samples2;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples2.push_back(SimulationRNG::binomialInt(numTrials, successProbability));
 
 	SimulationRNG::reset(1);
-	vector<size_t> samples3;
+	std::vector<size_t> samples3;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples3.push_back(SimulationRNG::binomialInt(numTrials, successProbability));
 
 	SimulationRNG::reset(2);
-	vector<size_t> samples4;
+	std::vector<size_t> samples4;
 	for (uint32_t i = 0; i < numSamples; ++i)
 		samples4.push_back(SimulationRNG::binomialInt(numTrials, successProbability));
 
diff --git a/test/yulPhaser/TestHelpers.cpp b/test/yulPhaser/TestHelpers.cpp
index 50afd70a3e..d75b63b4ac 100644
--- a/test/yulPhaser/TestHelpers.cpp
+++ b/test/yulPhaser/TestHelpers.cpp
@@ -22,22 +22,21 @@
 
 #include <regex>
 
-using namespace std;
 using namespace solidity;
 using namespace solidity::yul;
 using namespace solidity::phaser;
 using namespace solidity::phaser::test;
 
-function<Mutation> phaser::test::wholeChromosomeReplacement(Chromosome _newChromosome)
+std::function<Mutation> phaser::test::wholeChromosomeReplacement(Chromosome _newChromosome)
 {
 	return [_newChromosome = std::move(_newChromosome)](Chromosome const&) { return _newChromosome; };
 }
 
-function<Mutation> phaser::test::geneSubstitution(size_t _geneIndex, string _geneValue)
+std::function<Mutation> phaser::test::geneSubstitution(size_t _geneIndex, std::string _geneValue)
 {
 	return [=](Chromosome const& _chromosome)
 	{
-		vector<string> newGenes = _chromosome.optimisationSteps();
+		std::vector<std::string> newGenes = _chromosome.optimisationSteps();
 		assert(_geneIndex < newGenes.size());
 		newGenes[_geneIndex] = _geneValue;
 
@@ -45,18 +44,18 @@ function<Mutation> phaser::test::geneSubstitution(size_t _geneIndex, string _gen
 	};
 }
 
-vector<size_t> phaser::test::chromosomeLengths(Population const& _population)
+std::vector<size_t> phaser::test::chromosomeLengths(Population const& _population)
 {
-	vector<size_t> lengths;
+	std::vector<size_t> lengths;
 	for (auto const& individual: _population.individuals())
 		lengths.push_back(individual.chromosome.length());
 
 	return lengths;
 }
 
-map<string, size_t> phaser::test::enumerateOptmisationSteps()
+std::map<std::string, size_t> phaser::test::enumerateOptmisationSteps()
 {
-	map<string, size_t> stepIndices;
+	std::map<std::string, size_t> stepIndices;
 	size_t i = 0;
 	for (auto const& nameAndAbbreviation: OptimiserSuite::stepNameToAbbreviationMap())
 		stepIndices.insert({nameAndAbbreviation.first, i++});
@@ -67,29 +66,29 @@ map<string, size_t> phaser::test::enumerateOptmisationSteps()
 size_t phaser::test::countDifferences(Chromosome const& _chromosome1, Chromosome const& _chromosome2)
 {
 	size_t count = 0;
-	for (size_t i = 0; i < min(_chromosome1.length(), _chromosome2.length()); ++i)
+	for (size_t i = 0; i < std::min(_chromosome1.length(), _chromosome2.length()); ++i)
 		if (_chromosome1.optimisationSteps()[i] != _chromosome2.optimisationSteps()[i])
 			++count;
 
-	return count + static_cast<size_t>(abs(
+	return count + static_cast<size_t>(std::abs(
 		static_cast<long>(_chromosome1.length()) -
 		static_cast<long>(_chromosome2.length())
 	));
 }
 
-string phaser::test::stripWhitespace(string const& input)
+std::string phaser::test::stripWhitespace(std::string const& input)
 {
-	regex whitespaceRegex("\\s+");
+	std::regex whitespaceRegex("\\s+");
 	return regex_replace(input, whitespaceRegex, "");
 }
 
-size_t phaser::test::countSubstringOccurrences(string const& _inputString, string const& _substring)
+size_t phaser::test::countSubstringOccurrences(std::string const& _inputString, std::string const& _substring)
 {
 	assert(_substring.size() > 0);
 
 	size_t count = 0;
 	size_t lastOccurrence = 0;
-	while ((lastOccurrence = _inputString.find(_substring, lastOccurrence)) != string::npos)
+	while ((lastOccurrence = _inputString.find(_substring, lastOccurrence)) != std::string::npos)
 	{
 		++count;
 		lastOccurrence += _substring.size();
diff --git a/test/yulPhaser/TestHelpersTest.cpp b/test/yulPhaser/TestHelpersTest.cpp
index 89b98ecad7..23be74230c 100644
--- a/test/yulPhaser/TestHelpersTest.cpp
+++ b/test/yulPhaser/TestHelpersTest.cpp
@@ -24,7 +24,6 @@
 
 #include <set>
 
-using namespace std;
 using namespace solidity::yul;
 using namespace boost::test_tools;
 
@@ -43,7 +42,7 @@ BOOST_AUTO_TEST_CASE(ChromosomeLengthMetric_evaluate_should_return_chromosome_le
 
 BOOST_AUTO_TEST_CASE(wholeChromosomeReplacement_should_replace_whole_chromosome_with_another)
 {
-	function<Mutation> mutation = wholeChromosomeReplacement(Chromosome("aaa"));
+	std::function<Mutation> mutation = wholeChromosomeReplacement(Chromosome("aaa"));
 	BOOST_TEST(mutation(Chromosome("ccc")) == Chromosome("aaa"));
 }
 
@@ -51,22 +50,22 @@ BOOST_AUTO_TEST_CASE(geneSubstitution_should_change_a_single_gene_at_a_given_ind
 {
 	Chromosome chromosome("aaccff");
 
-	function<Mutation> mutation1 = geneSubstitution(0, chromosome.optimisationSteps()[5]);
+	std::function<Mutation> mutation1 = geneSubstitution(0, chromosome.optimisationSteps()[5]);
 	BOOST_TEST(mutation1(chromosome) == Chromosome("faccff"));
 
-	function<Mutation> mutation2 = geneSubstitution(5, chromosome.optimisationSteps()[0]);
+	std::function<Mutation> mutation2 = geneSubstitution(5, chromosome.optimisationSteps()[0]);
 	BOOST_TEST(mutation2(chromosome) == Chromosome("aaccfa"));
 }
 
 BOOST_AUTO_TEST_CASE(chromosomeLengths_should_return_lengths_of_all_chromosomes_in_a_population)
 {
-	shared_ptr<FitnessMetric> fitnessMetric = make_shared<ChromosomeLengthMetric>();
+	std::shared_ptr<FitnessMetric> fitnessMetric = std::make_shared<ChromosomeLengthMetric>();
 
 	Population population1(fitnessMetric, {Chromosome(), Chromosome("a"), Chromosome("aa"), Chromosome("aaa")});
-	BOOST_TEST((chromosomeLengths(population1) == vector<size_t>{0, 1, 2, 3}));
+	BOOST_TEST((chromosomeLengths(population1) == std::vector<size_t>{0, 1, 2, 3}));
 
 	Population population2(fitnessMetric);
-	BOOST_TEST((chromosomeLengths(population2) == vector<size_t>{}));
+	BOOST_TEST((chromosomeLengths(population2) == std::vector<size_t>{}));
 }
 
 BOOST_AUTO_TEST_CASE(countDifferences_should_return_zero_for_identical_chromosomes)
@@ -99,11 +98,11 @@ BOOST_AUTO_TEST_CASE(countDifferences_should_count_missing_characters_as_differe
 
 BOOST_AUTO_TEST_CASE(enumerateOptimisationSteps_should_assing_indices_to_all_available_optimisation_steps)
 {
-	map<string, char> stepsAndAbbreviations = OptimiserSuite::stepNameToAbbreviationMap();
-	map<string, size_t> stepsAndIndices = enumerateOptmisationSteps();
+	std::map<std::string, char> stepsAndAbbreviations = OptimiserSuite::stepNameToAbbreviationMap();
+	std::map<std::string, size_t> stepsAndIndices = enumerateOptmisationSteps();
 	BOOST_TEST(stepsAndIndices.size() == stepsAndAbbreviations.size());
 
-	set<string> stepsSoFar;
+	std::set<std::string> stepsSoFar;
 	for (auto& [name, index]: stepsAndIndices)
 	{
 		BOOST_TEST(index >= 0);

From 838658ff36ba542a63f7e9582fdae51d7ac73024 Mon Sep 17 00:00:00 2001
From: Nikola Matic <nikola.matic@ethereum.org>
Date: Fri, 9 Feb 2024 14:50:23 +0100
Subject: [PATCH 1746/1748] Install dependencies and add symbolic link for
 python3

---
 .circleci/config.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 02c15e691b..c06e06e12b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -977,6 +977,9 @@ jobs:
     steps:
       - run: git config --global core.autocrlf false
       - checkout
+      - run:
+          name: Install dependencies
+          command: python -m pip install --user requests
       - run:
           name: Python unit tests
           command: python.exe test/pyscriptTests.py
@@ -1688,7 +1691,7 @@ jobs:
       - run: git config --global core.autocrlf false
       - checkout
       # Ensure windows has python3 alias required by prepare_bytecode_report
-      - run: ln -s /c/tools/miniconda3/python /c/tools/miniconda3/python3
+      - run: ln -s /c/Python312/python /c/Python312/python3
       - attach_workspace:
           at: build
       - prepare_bytecode_report:

From 7c1bdbaa584ced642891894ab98b3bfa9055ea19 Mon Sep 17 00:00:00 2001
From: r0qs <rodrigo.saramago@ethereum.org>
Date: Mon, 12 Feb 2024 11:50:30 +0100
Subject: [PATCH 1747/1748] Remove sha from foundry release tag

---
 .circleci/config.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c06e06e12b..b29c46bf8b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -155,7 +155,7 @@ commands:
             )
             echo "export FOUNDRY_REPO=$FOUNDRY_REPO" >> "$BASH_ENV"
             echo "export FOUNDRY_VERSION=$FOUNDRY_VERSION" >> "$BASH_ENV"
-            echo "export FOUNDRY_RELEASE_TAG='nightly-${FOUNDRY_RELEASE_SHA}'" >> "$BASH_ENV"
+            echo "export FOUNDRY_RELEASE_TAG='${FOUNDRY_VERSION}'" >> "$BASH_ENV"
             # Save commit sha for caching
             echo "$FOUNDRY_RELEASE_SHA" > /tmp/workspace/foundry-release-sha
       - restore_cache:

From c7549de45bbc280055cc433990d13cac608f1d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20=C5=9Aliwak?= <kamil.sliwak@codepoets.it>
Date: Sun, 11 Feb 2024 17:07:13 +0100
Subject: [PATCH 1748/1748] Only warn instead of failing when enforcing gas
 expectations with non-standard settings

---
 test/Common.cpp         | 20 +++++++++-----------
 test/soltest.cpp        |  3 ---
 test/tools/isoltest.cpp |  3 ---
 3 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/test/Common.cpp b/test/Common.cpp
index 6a3c5a2a00..14d90d837e 100644
--- a/test/Common.cpp
+++ b/test/Common.cpp
@@ -143,18 +143,16 @@ void CommonOptions::validate() const
 		"Selected batch has to be less than number of batches."
 	);
 
-	if (enforceGasTest)
+	if (!enforceGasTest)
+		cout << endl << "WARNING :: Gas cost expectations are not being enforced" << endl << endl;
+	else if (evmVersion() != langutil::EVMVersion{} || useABIEncoderV1)
 	{
-		assertThrow(
-			evmVersion() == langutil::EVMVersion{},
-			ConfigException,
-			"Gas costs can only be enforced on latest evm version."
-		);
-		assertThrow(
-			useABIEncoderV1 == false,
-			ConfigException,
-			"Gas costs can only be enforced on abi encoder v2."
-		);
+		cout << endl << "WARNING :: Enforcing gas cost expectations with non-standard settings:" << endl;
+		if (evmVersion() != langutil::EVMVersion{})
+			cout << "- EVM version: " << evmVersion().name() << " (default: " << langutil::EVMVersion{}.name() << ")" << endl;
+		if (useABIEncoderV1)
+			cout << "- ABI coder: v1 (default: v2)" << endl;
+		cout << endl << "DO NOT COMMIT THE UPDATED EXPECTATIONS." << endl << endl;
 	}
 }
 
diff --git a/test/soltest.cpp b/test/soltest.cpp
index 6aa1002488..443c4c5de3 100644
--- a/test/soltest.cpp
+++ b/test/soltest.cpp
@@ -238,9 +238,6 @@ test_suite* init_unit_test_suite(int /*argc*/, char* /*argv*/[])
 		if (solidity::test::CommonOptions::get().disableSemanticTests)
 			cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
 
-		if (!solidity::test::CommonOptions::get().enforceGasTest)
-			cout << endl << "WARNING :: Gas Cost Expectations are not being enforced" << endl << endl;
-
 		Batcher batcher(CommonOptions::get().selectedBatch, CommonOptions::get().batches);
 		if (CommonOptions::get().batches > 1)
 			cout << "Batch " << CommonOptions::get().selectedBatch << " out of " << CommonOptions::get().batches << endl;
diff --git a/test/tools/isoltest.cpp b/test/tools/isoltest.cpp
index 2d93bdbc2b..9d20f1059f 100644
--- a/test/tools/isoltest.cpp
+++ b/test/tools/isoltest.cpp
@@ -448,9 +448,6 @@ int main(int argc, char const *argv[])
 		if (options.disableSemanticTests)
 			cout << endl << "--- SKIPPING ALL SEMANTICS TESTS ---" << endl << endl;
 
-		if (!options.enforceGasTest)
-			cout << "WARNING :: Gas Cost Expectations are not being enforced" << endl << endl;
-
 		TestStats global_stats{0, 0};
 		cout << "Running tests..." << endl << endl;